- Fix plist

Reported by: pointyhat (via pav)
author: glarkin <glarkin@FreeBSD.org> 2012-05-19 08:23:40 +0800
committer: glarkin <glarkin@FreeBSD.org> 2012-05-19 08:23:40 +0800
commit: 23dc2e78ac2d76aae2a4beda7389b1d214e9aa4f (patch)
tree: c7a910e80266d61b4dcd1911a35673db211b5742
parent: 31f85282136555ebd314474757fe8a767798f4e3 (diff)
download: freebsd-ports-gnome-23dc2e78ac2d76aae2a4beda7389b1d214e9aa4f.tar.gz
freebsd-ports-gnome-23dc2e78ac2d76aae2a4beda7389b1d214e9aa4f.tar.zst
freebsd-ports-gnome-23dc2e78ac2d76aae2a4beda7389b1d214e9aa4f.zip
1 files changed, 1 insertions, 0 deletions
diff --git a/sysutils/rubygem-hiera-puppet/Makefile b/sysutils/rubygem-hiera-puppet/Makefile
index 0fce760bd24c..1224c3722469 100644
--- a/sysutils/rubygem-hiera-puppet/Makefile
+++ b/sysutils/rubygem-hiera-puppet/Makefile
@@ -20,5 +20,6 @@ RUN_DEPENDS=	puppet>=0:${PORTSDIR}/sysutils/puppet \
 USE_RUBY=	yes
 USE_RUBYGEMS=	yes
 RUBYGEM_AUTOPLIST=	yes
+PLIST_FILES=	bin/extlookup2hiera
 
 .include <bsd.port.mk>
diff --git a/.cvsignore b/.cvsignore
deleted file mode 100644
index ba126eeb2d..0000000000
--- a/.cvsignore
+++ /dev/null
@@ -1,30 +0,0 @@
-ABOUT-NLS
-Makefile
-Makefile.in
-autom4te*.cache
-aclocal.m4
-config.cache
-config.guess
-config.h
-config.h.in
-config.log
-config.rpath
-config.status
-config.sub
-configure
-depcomp
-install-sh
-intl
-libtool
-ltconfig
-ltmain.sh
-m4
-missing
-mkinstalldirs
-stamp-h*
-stamp.h
-xml-i18n-*
-xlibtool
-xltmain.sh
-intltool-*
-*.pc
diff --git a/AUTHORS b/AUTHORS
deleted file mode 100644
index 75e6a26764..0000000000
--- a/AUTHORS
+++ /dev/null
@@ -1,85 +0,0 @@
-Evolution was written by:
-
-Addressbook
-	Arturo Esponosa <arturo@nuclecu.unam.mx> (Original Gnomecard author)
-	Nat Friedman <nat@ximian.com>
-	Chris Lahey <clahey@ximian.com>
-	Chris Toshok <toshok@ximian.com>
-	Jon Trowbridge <trow@ximian.com>
-
-Artwork
-	Tuomas Kuosmanen <tigert@ximian.com>
-	Jakub Steiner <jimmac@ximian.com>
-
-Calendar
-	Seth Alves <seth@ximian.com>
-	Eric Busboom <eric@softwarestudio.org> (libical author)
-	Arturo Esponosa <arturo@nuclecu.unam.mx> (Gnomecal contributor)
-	Damon Chaplin <damon@ximian.com>
-	Federico Mena-Quintero <federico@ximian.com>
-	Rodrigo Moya <rodrigo@ximian.com>
-	Jesse Pavel <jesse@ximian.com>
-	JP Rosevear <jpr@ximian.com>
-	Russell Steinthal <rms39@columbia.edu> (Gnomecal maintainer)
-
-Documentation
-	Kevin Breit <mrproper@ximian.com>
-	Aaron Weber <aaron@ximian.com>
-
-Mailer
-	Radek Doulik <rodo@ximian.com>
-	Larry Ewing <lewing@ximian.com>
-	Bertrand Guiheneuf <bertrand@ximian.com>
-	Jason Leach <jleach@ximian.com>
-	Matt Loper <matt@ximian.com>
-	Ettore Perazzoli <ettore@ximian.com>
-	Jeffrey Stedfast <fejj@ximian.com>
-	Jon Trowbridge <trow@ximian.com>
-	Peter Williams <peterw@ximian.com>
-	Dan Winship <danw@ximian.com>
-	Michael Zucchi <notzed@ximian.com>
-
-Notes
-	Anders Carlsson <andersca@gnu.org>
-
-Pilot
-	JP Rosevear <jpr@ximian.com>
-
-Shell
-	Miguel de Icaza <miguel@ximian.com>
-	Jason Leach <jleach@ximian.com>
-	Ettore Perazzoli <ettore@ximian.com>
-
-Translations
-	Akira TAGOH <tagoh@gnome.gr.jp>
-	Andraz Tori <andraz.tori1@guest.arnes.si>
-	Andreas Hyden <a.hyden@cyberpoint.se>
-	Arjan Scherpenisse <acscherp@wins.uva.nl>
-	Clara Tattoni <clara.tattoni@libero.it>
-	Fatih Demir <kabalak@gmx.net>
-	Gediminas Paulauskas <menesis@delfi.lt>
-	GNOME PL Team <translators@gnome.pl>
-	Gustavo Maciel Dias Vieira <gdvieira@zaz.com.br>
-	H�ctor Garc�a Alvarez <hector@scouts-es.org>
-	Jes�s Bravo �lvarez <jba@pobox.com>
-	Keld Simonsen <keld@dkuug.dk>
-	Kjartan Maraas <kmaraas@gnome.org>
-	Matthias Warkus <mawa@iname.com>
-	Spiros Papadimitriou <spapadim+@cs.cmu.edu>
-	Sung-Hyun Nam <namsh@kldp.org>
-	Szabolcs BAN <shooby@gnome.hu>
-	Tiago Ant�o <tiagoantao@bigfoot.com>
-	Duarte Loreto <happyguy_pt@hotmail.com>
-	Valek Filippov <frob@df.ru>
-	Vincent Renardias <vincent@redhat.com>
-	Yuri Syrota <rasta@renome.rovno.ua>
-
-UI
-	Anna Dirks <anna@ximian.com>
-
-Widgets
-	Damon Chaplin <damon@ximian.com>
-	Miguel de Icaza <miguel@ximian.com>
-	Chris Lahey <clahey@ximian.com>
-	Federico Mena-Quintero <federico@ximian.com>
-	Chris Toshok <toshok@ximian.com>
diff --git a/COPYING b/COPYING
deleted file mode 100644
index d60c31a97a..0000000000
--- a/COPYING
+++ /dev/null
@@ -1,340 +0,0 @@
-		    GNU GENERAL PUBLIC LICENSE
-		       Version 2, June 1991
-
- Copyright (C) 1989, 1991 Free Software Foundation, Inc.
-     59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
- Everyone is permitted to copy and distribute verbatim copies
- of this license document, but changing it is not allowed.
-
-			    Preamble
-
-  The licenses for most software are designed to take away your
-freedom to share and change it.  By contrast, the GNU General Public
-License is intended to guarantee your freedom to share and change free
-software--to make sure the software is free for all its users.  This
-General Public License applies to most of the Free Software
-Foundation's software and to any other program whose authors commit to
-using it.  (Some other Free Software Foundation software is covered by
-the GNU Library General Public License instead.)  You can apply it to
-your programs, too.
-
-  When we speak of free software, we are referring to freedom, not
-price.  Our General Public Licenses are designed to make sure that you
-have the freedom to distribute copies of free software (and charge for
-this service if you wish), that you receive source code or can get it
-if you want it, that you can change the software or use pieces of it
-in new free programs; and that you know you can do these things.
-
-  To protect your rights, we need to make restrictions that forbid
-anyone to deny you these rights or to ask you to surrender the rights.
-These restrictions translate to certain responsibilities for you if you
-distribute copies of the software, or if you modify it.
-
-  For example, if you distribute copies of such a program, whether
-gratis or for a fee, you must give the recipients all the rights that
-you have.  You must make sure that they, too, receive or can get the
-source code.  And you must show them these terms so they know their
-rights.
-
-  We protect your rights with two steps: (1) copyright the software, and
-(2) offer you this license which gives you legal permission to copy,
-distribute and/or modify the software.
-
-  Also, for each author's protection and ours, we want to make certain
-that everyone understands that there is no warranty for this free
-software.  If the software is modified by someone else and passed on, we
-want its recipients to know that what they have is not the original, so
-that any problems introduced by others will not reflect on the original
-authors' reputations.
-
-  Finally, any free program is threatened constantly by software
-patents.  We wish to avoid the danger that redistributors of a free
-program will individually obtain patent licenses, in effect making the
-program proprietary.  To prevent this, we have made it clear that any
-patent must be licensed for everyone's free use or not licensed at all.
-
-  The precise terms and conditions for copying, distribution and
-modification follow.
-
-		    GNU GENERAL PUBLIC LICENSE
-   TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
-
-  0. This License applies to any program or other work which contains
-a notice placed by the copyright holder saying it may be distributed
-under the terms of this General Public License.  The "Program", below,
-refers to any such program or work, and a "work based on the Program"
-means either the Program or any derivative work under copyright law:
-that is to say, a work containing the Program or a portion of it,
-either verbatim or with modifications and/or translated into another
-language.  (Hereinafter, translation is included without limitation in
-the term "modification".)  Each licensee is addressed as "you".
-
-Activities other than copying, distribution and modification are not
-covered by this License; they are outside its scope.  The act of
-running the Program is not restricted, and the output from the Program
-is covered only if its contents constitute a work based on the
-Program (independent of having been made by running the Program).
-Whether that is true depends on what the Program does.
-
-  1. You may copy and distribute verbatim copies of the Program's
-source code as you receive it, in any medium, provided that you
-conspicuously and appropriately publish on each copy an appropriate
-copyright notice and disclaimer of warranty; keep intact all the
-notices that refer to this License and to the absence of any warranty;
-and give any other recipients of the Program a copy of this License
-along with the Program.
-
-You may charge a fee for the physical act of transferring a copy, and
-you may at your option offer warranty protection in exchange for a fee.
-
-  2. You may modify your copy or copies of the Program or any portion
-of it, thus forming a work based on the Program, and copy and
-distribute such modifications or work under the terms of Section 1
-above, provided that you also meet all of these conditions:
-
-    a) You must cause the modified files to carry prominent notices
-    stating that you changed the files and the date of any change.
-
-    b) You must cause any work that you distribute or publish, that in
-    whole or in part contains or is derived from the Program or any
-    part thereof, to be licensed as a whole at no charge to all third
-    parties under the terms of this License.
-
-    c) If the modified program normally reads commands interactively
-    when run, you must cause it, when started running for such
-    interactive use in the most ordinary way, to print or display an
-    announcement including an appropriate copyright notice and a
-    notice that there is no warranty (or else, saying that you provide
-    a warranty) and that users may redistribute the program under
-    these conditions, and telling the user how to view a copy of this
-    License.  (Exception: if the Program itself is interactive but
-    does not normally print such an announcement, your work based on
-    the Program is not required to print an announcement.)
-
-These requirements apply to the modified work as a whole.  If
-identifiable sections of that work are not derived from the Program,
-and can be reasonably considered independent and separate works in
-themselves, then this License, and its terms, do not apply to those
-sections when you distribute them as separate works.  But when you
-distribute the same sections as part of a whole which is a work based
-on the Program, the distribution of the whole must be on the terms of
-this License, whose permissions for other licensees extend to the
-entire whole, and thus to each and every part regardless of who wrote it.
-
-Thus, it is not the intent of this section to claim rights or contest
-your rights to work written entirely by you; rather, the intent is to
-exercise the right to control the distribution of derivative or
-collective works based on the Program.
-
-In addition, mere aggregation of another work not based on the Program
-with the Program (or with a work based on the Program) on a volume of
-a storage or distribution medium does not bring the other work under
-the scope of this License.
-
-  3. You may copy and distribute the Program (or a work based on it,
-under Section 2) in object code or executable form under the terms of
-Sections 1 and 2 above provided that you also do one of the following:
-
-    a) Accompany it with the complete corresponding machine-readable
-    source code, which must be distributed under the terms of Sections
-    1 and 2 above on a medium customarily used for software interchange; or,
-
-    b) Accompany it with a written offer, valid for at least three
-    years, to give any third party, for a charge no more than your
-    cost of physically performing source distribution, a complete
-    machine-readable copy of the corresponding source code, to be
-    distributed under the terms of Sections 1 and 2 above on a medium
-    customarily used for software interchange; or,
-
-    c) Accompany it with the information you received as to the offer
-    to distribute corresponding source code.  (This alternative is
-    allowed only for noncommercial distribution and only if you
-    received the program in object code or executable form with such
-    an offer, in accord with Subsection b above.)
-
-The source code for a work means the preferred form of the work for
-making modifications to it.  For an executable work, complete source
-code means all the source code for all modules it contains, plus any
-associated interface definition files, plus the scripts used to
-control compilation and installation of the executable.  However, as a
-special exception, the source code distributed need not include
-anything that is normally distributed (in either source or binary
-form) with the major components (compiler, kernel, and so on) of the
-operating system on which the executable runs, unless that component
-itself accompanies the executable.
-
-If distribution of executable or object code is made by offering
-access to copy from a designated place, then offering equivalent
-access to copy the source code from the same place counts as
-distribution of the source code, even though third parties are not
-compelled to copy the source along with the object code.
-
-  4. You may not copy, modify, sublicense, or distribute the Program
-except as expressly provided under this License.  Any attempt
-otherwise to copy, modify, sublicense or distribute the Program is
-void, and will automatically terminate your rights under this License.
-However, parties who have received copies, or rights, from you under
-this License will not have their licenses terminated so long as such
-parties remain in full compliance.
-
-  5. You are not required to accept this License, since you have not
-signed it.  However, nothing else grants you permission to modify or
-distribute the Program or its derivative works.  These actions are
-prohibited by law if you do not accept this License.  Therefore, by
-modifying or distributing the Program (or any work based on the
-Program), you indicate your acceptance of this License to do so, and
-all its terms and conditions for copying, distributing or modifying
-the Program or works based on it.
-
-  6. Each time you redistribute the Program (or any work based on the
-Program), the recipient automatically receives a license from the
-original licensor to copy, distribute or modify the Program subject to
-these terms and conditions.  You may not impose any further
-restrictions on the recipients' exercise of the rights granted herein.
-You are not responsible for enforcing compliance by third parties to
-this License.
-
-  7. If, as a consequence of a court judgment or allegation of patent
-infringement or for any other reason (not limited to patent issues),
-conditions are imposed on you (whether by court order, agreement or
-otherwise) that contradict the conditions of this License, they do not
-excuse you from the conditions of this License.  If you cannot
-distribute so as to satisfy simultaneously your obligations under this
-License and any other pertinent obligations, then as a consequence you
-may not distribute the Program at all.  For example, if a patent
-license would not permit royalty-free redistribution of the Program by
-all those who receive copies directly or indirectly through you, then
-the only way you could satisfy both it and this License would be to
-refrain entirely from distribution of the Program.
-
-If any portion of this section is held invalid or unenforceable under
-any particular circumstance, the balance of the section is intended to
-apply and the section as a whole is intended to apply in other
-circumstances.
-
-It is not the purpose of this section to induce you to infringe any
-patents or other property right claims or to contest validity of any
-such claims; this section has the sole purpose of protecting the
-integrity of the free software distribution system, which is
-implemented by public license practices.  Many people have made
-generous contributions to the wide range of software distributed
-through that system in reliance on consistent application of that
-system; it is up to the author/donor to decide if he or she is willing
-to distribute software through any other system and a licensee cannot
-impose that choice.
-
-This section is intended to make thoroughly clear what is believed to
-be a consequence of the rest of this License.
-
-  8. If the distribution and/or use of the Program is restricted in
-certain countries either by patents or by copyrighted interfaces, the
-original copyright holder who places the Program under this License
-may add an explicit geographical distribution limitation excluding
-those countries, so that distribution is permitted only in or among
-countries not thus excluded.  In such case, this License incorporates
-the limitation as if written in the body of this License.
-
-  9. The Free Software Foundation may publish revised and/or new versions
-of the General Public License from time to time.  Such new versions will
-be similar in spirit to the present version, but may differ in detail to
-address new problems or concerns.
-
-Each version is given a distinguishing version number.  If the Program
-specifies a version number of this License which applies to it and "any
-later version", you have the option of following the terms and conditions
-either of that version or of any later version published by the Free
-Software Foundation.  If the Program does not specify a version number of
-this License, you may choose any version ever published by the Free Software
-Foundation.
-
-  10. If you wish to incorporate parts of the Program into other free
-programs whose distribution conditions are different, write to the author
-to ask for permission.  For software which is copyrighted by the Free
-Software Foundation, write to the Free Software Foundation; we sometimes
-make exceptions for this.  Our decision will be guided by the two goals
-of preserving the free status of all derivatives of our free software and
-of promoting the sharing and reuse of software generally.
-
-			    NO WARRANTY
-
-  11. BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, THERE IS NO WARRANTY
-FOR THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW.  EXCEPT WHEN
-OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR OTHER PARTIES
-PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED
-OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
-MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.  THE ENTIRE RISK AS
-TO THE QUALITY AND PERFORMANCE OF THE PROGRAM IS WITH YOU.  SHOULD THE
-PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF ALL NECESSARY SERVICING,
-REPAIR OR CORRECTION.
-
-  12. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING
-WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY AND/OR
-REDISTRIBUTE THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES,
-INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING
-OUT OF THE USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED
-TO LOSS OF DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY
-YOU OR THIRD PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER
-PROGRAMS), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE
-POSSIBILITY OF SUCH DAMAGES.
-
-		     END OF TERMS AND CONDITIONS
-
-	    How to Apply These Terms to Your New Programs
-
-  If you develop a new program, and you want it to be of the greatest
-possible use to the public, the best way to achieve this is to make it
-free software which everyone can redistribute and change under these terms.
-
-  To do so, attach the following notices to the program.  It is safest
-to attach them to the start of each source file to most effectively
-convey the exclusion of warranty; and each file should have at least
-the "copyright" line and a pointer to where the full notice is found.
-
-    <one line to give the program's name and a brief idea of what it does.>
-    Copyright (C) <year>  <name of author>
-
-    This program is free software; you can redistribute it and/or modify
-    it under the terms of the GNU General Public License as published by
-    the Free Software Foundation; either version 2 of the License, or
-    (at your option) any later version.
-
-    This program is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-    GNU General Public License for more details.
-
-    You should have received a copy of the GNU General Public License
-    along with this program; if not, write to the Free Software
-    Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
-
-
-Also add information on how to contact you by electronic and paper mail.
-
-If the program is interactive, make it output a short notice like this
-when it starts in an interactive mode:
-
-    Gnomovision version 69, Copyright (C) year  name of author
-    Gnomovision comes with ABSOLUTELY NO WARRANTY; for details type `show w'.
-    This is free software, and you are welcome to redistribute it
-    under certain conditions; type `show c' for details.
-
-The hypothetical commands `show w' and `show c' should show the appropriate
-parts of the General Public License.  Of course, the commands you use may
-be called something other than `show w' and `show c'; they could even be
-mouse-clicks or menu items--whatever suits your program.
-
-You should also get your employer (if you work as a programmer) or your
-school, if any, to sign a "copyright disclaimer" for the program, if
-necessary.  Here is a sample; alter the names:
-
-  Yoyodyne, Inc., hereby disclaims all copyright interest in the program
-  `Gnomovision' (which makes passes at compilers) written by James Hacker.
-
-  <signature of Ty Coon>, 1 April 1989
-  Ty Coon, President of Vice
-
-This General Public License does not permit incorporating your program into
-proprietary programs.  If your program is a subroutine library, you may
-consider it more useful to permit linking proprietary applications with the
-library.  If this is what you want to do, use the GNU Library General
-Public License instead of this License.
diff --git a/COPYING-DOCS b/COPYING-DOCS
deleted file mode 100644
index b42936beb3..0000000000
--- a/COPYING-DOCS
+++ /dev/null
@@ -1,355 +0,0 @@
-		GNU Free Documentation License
-		   Version 1.1, March 2000
-
- Copyright (C) 2000  Free Software Foundation, Inc.
-     59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
- Everyone is permitted to copy and distribute verbatim copies
- of this license document, but changing it is not allowed.
-
-
-0. PREAMBLE
-
-The purpose of this License is to make a manual, textbook, or other
-written document "free" in the sense of freedom: to assure everyone
-the effective freedom to copy and redistribute it, with or without
-modifying it, either commercially or noncommercially.  Secondarily,
-this License preserves for the author and publisher a way to get
-credit for their work, while not being considered responsible for
-modifications made by others.
-
-This License is a kind of "copyleft", which means that derivative
-works of the document must themselves be free in the same sense.  It
-complements the GNU General Public License, which is a copyleft
-license designed for free software.
-
-We have designed this License in order to use it for manuals for free
-software, because free software needs free documentation: a free
-program should come with manuals providing the same freedoms that the
-software does.  But this License is not limited to software manuals;
-it can be used for any textual work, regardless of subject matter or
-whether it is published as a printed book.  We recommend this License
-principally for works whose purpose is instruction or reference.
-
-
-1. APPLICABILITY AND DEFINITIONS
-
-This License applies to any manual or other work that contains a
-notice placed by the copyright holder saying it can be distributed
-under the terms of this License.  The "Document", below, refers to any
-such manual or work.  Any member of the public is a licensee, and is
-addressed as "you".
-
-A "Modified Version" of the Document means any work containing the
-Document or a portion of it, either copied verbatim, or with
-modifications and/or translated into another language.
-
-A "Secondary Section" is a named appendix or a front-matter section of
-the Document that deals exclusively with the relationship of the
-publishers or authors of the Document to the Document's overall subject
-(or to related matters) and contains nothing that could fall directly
-within that overall subject.  (For example, if the Document is in part a
-textbook of mathematics, a Secondary Section may not explain any
-mathematics.)  The relationship could be a matter of historical
-connection with the subject or with related matters, or of legal,
-commercial, philosophical, ethical or political position regarding
-them.
-
-The "Invariant Sections" are certain Secondary Sections whose titles
-are designated, as being those of Invariant Sections, in the notice
-that says that the Document is released under this License.
-
-The "Cover Texts" are certain short passages of text that are listed,
-as Front-Cover Texts or Back-Cover Texts, in the notice that says that
-the Document is released under this License.
-
-A "Transparent" copy of the Document means a machine-readable copy,
-represented in a format whose specification is available to the
-general public, whose contents can be viewed and edited directly and
-straightforwardly with generic text editors or (for images composed of
-pixels) generic paint programs or (for drawings) some widely available
-drawing editor, and that is suitable for input to text formatters or
-for automatic translation to a variety of formats suitable for input
-to text formatters.  A copy made in an otherwise Transparent file
-format whose markup has been designed to thwart or discourage
-subsequent modification by readers is not Transparent.  A copy that is
-not "Transparent" is called "Opaque".
-
-Examples of suitable formats for Transparent copies include plain
-ASCII without markup, Texinfo input format, LaTeX input format, SGML
-or XML using a publicly available DTD, and standard-conforming simple
-HTML designed for human modification.  Opaque formats include
-PostScript, PDF, proprietary formats that can be read and edited only
-by proprietary word processors, SGML or XML for which the DTD and/or
-processing tools are not generally available, and the
-machine-generated HTML produced by some word processors for output
-purposes only.
-
-The "Title Page" means, for a printed book, the title page itself,
-plus such following pages as are needed to hold, legibly, the material
-this License requires to appear in the title page.  For works in
-formats which do not have any title page as such, "Title Page" means
-the text near the most prominent appearance of the work's title,
-preceding the beginning of the body of the text.
-
-
-2. VERBATIM COPYING
-
-You may copy and distribute the Document in any medium, either
-commercially or noncommercially, provided that this License, the
-copyright notices, and the license notice saying this License applies
-to the Document are reproduced in all copies, and that you add no other
-conditions whatsoever to those of this License.  You may not use
-technical measures to obstruct or control the reading or further
-copying of the copies you make or distribute.  However, you may accept
-compensation in exchange for copies.  If you distribute a large enough
-number of copies you must also follow the conditions in section 3.
-
-You may also lend copies, under the same conditions stated above, and
-you may publicly display copies.
-
-
-3. COPYING IN QUANTITY
-
-If you publish printed copies of the Document numbering more than 100,
-and the Document's license notice requires Cover Texts, you must enclose
-the copies in covers that carry, clearly and legibly, all these Cover
-Texts: Front-Cover Texts on the front cover, and Back-Cover Texts on
-the back cover.  Both covers must also clearly and legibly identify
-you as the publisher of these copies.  The front cover must present
-the full title with all words of the title equally prominent and
-visible.  You may add other material on the covers in addition.
-Copying with changes limited to the covers, as long as they preserve
-the title of the Document and satisfy these conditions, can be treated
-as verbatim copying in other respects.
-
-If the required texts for either cover are too voluminous to fit
-legibly, you should put the first ones listed (as many as fit
-reasonably) on the actual cover, and continue the rest onto adjacent
-pages.
-
-If you publish or distribute Opaque copies of the Document numbering
-more than 100, you must either include a machine-readable Transparent
-copy along with each Opaque copy, or state in or with each Opaque copy
-a publicly-accessible computer-network location containing a complete
-Transparent copy of the Document, free of added material, which the
-general network-using public has access to download anonymously at no
-charge using public-standard network protocols.  If you use the latter
-option, you must take reasonably prudent steps, when you begin
-distribution of Opaque copies in quantity, to ensure that this
-Transparent copy will remain thus accessible at the stated location
-until at least one year after the last time you distribute an Opaque
-copy (directly or through your agents or retailers) of that edition to
-the public.
-
-It is requested, but not required, that you contact the authors of the
-Document well before redistributing any large number of copies, to give
-them a chance to provide you with an updated version of the Document.
-
-
-4. MODIFICATIONS
-
-You may copy and distribute a Modified Version of the Document under
-the conditions of sections 2 and 3 above, provided that you release
-the Modified Version under precisely this License, with the Modified
-Version filling the role of the Document, thus licensing distribution
-and modification of the Modified Version to whoever possesses a copy
-of it.  In addition, you must do these things in the Modified Version:
-
-A. Use in the Title Page (and on the covers, if any) a title distinct
-   from that of the Document, and from those of previous versions
-   (which should, if there were any, be listed in the History section
-   of the Document).  You may use the same title as a previous version
-   if the original publisher of that version gives permission.
-B. List on the Title Page, as authors, one or more persons or entities
-   responsible for authorship of the modifications in the Modified
-   Version, together with at least five of the principal authors of the
-   Document (all of its principal authors, if it has less than five).
-C. State on the Title page the name of the publisher of the
-   Modified Version, as the publisher.
-D. Preserve all the copyright notices of the Document.
-E. Add an appropriate copyright notice for your modifications
-   adjacent to the other copyright notices.
-F. Include, immediately after the copyright notices, a license notice
-   giving the public permission to use the Modified Version under the
-   terms of this License, in the form shown in the Addendum below.
-G. Preserve in that license notice the full lists of Invariant Sections
-   and required Cover Texts given in the Document's license notice.
-H. Include an unaltered copy of this License.
-I. Preserve the section entitled "History", and its title, and add to
-   it an item stating at least the title, year, new authors, and
-   publisher of the Modified Version as given on the Title Page.  If
-   there is no section entitled "History" in the Document, create one
-   stating the title, year, authors, and publisher of the Document as
-   given on its Title Page, then add an item describing the Modified
-   Version as stated in the previous sentence.
-J. Preserve the network location, if any, given in the Document for
-   public access to a Transparent copy of the Document, and likewise
-   the network locations given in the Document for previous versions
-   it was based on.  These may be placed in the "History" section.
-   You may omit a network location for a work that was published at
-   least four years before the Document itself, or if the original
-   publisher of the version it refers to gives permission.
-K. In any section entitled "Acknowledgements" or "Dedications",
-   preserve the section's title, and preserve in the section all the
-   substance and tone of each of the contributor acknowledgements
-   and/or dedications given therein.
-L. Preserve all the Invariant Sections of the Document,
-   unaltered in their text and in their titles.  Section numbers
-   or the equivalent are not considered part of the section titles.
-M. Delete any section entitled "Endorsements".  Such a section
-   may not be included in the Modified Version.
-N. Do not retitle any existing section as "Endorsements"
-   or to conflict in title with any Invariant Section.
-
-If the Modified Version includes new front-matter sections or
-appendices that qualify as Secondary Sections and contain no material
-copied from the Document, you may at your option designate some or all
-of these sections as invariant.  To do this, add their titles to the
-list of Invariant Sections in the Modified Version's license notice.
-These titles must be distinct from any other section titles.
-
-You may add a section entitled "Endorsements", provided it contains
-nothing but endorsements of your Modified Version by various
-parties--for example, statements of peer review or that the text has
-been approved by an organization as the authoritative definition of a
-standard.
-
-You may add a passage of up to five words as a Front-Cover Text, and a
-passage of up to 25 words as a Back-Cover Text, to the end of the list
-of Cover Texts in the Modified Version.  Only one passage of
-Front-Cover Text and one of Back-Cover Text may be added by (or
-through arrangements made by) any one entity.  If the Document already
-includes a cover text for the same cover, previously added by you or
-by arrangement made by the same entity you are acting on behalf of,
-you may not add another; but you may replace the old one, on explicit
-permission from the previous publisher that added the old one.
-
-The author(s) and publisher(s) of the Document do not by this License
-give permission to use their names for publicity for or to assert or
-imply endorsement of any Modified Version.
-
-
-5. COMBINING DOCUMENTS
-
-You may combine the Document with other documents released under this
-License, under the terms defined in section 4 above for modified
-versions, provided that you include in the combination all of the
-Invariant Sections of all of the original documents, unmodified, and
-list them all as Invariant Sections of your combined work in its
-license notice.
-
-The combined work need only contain one copy of this License, and
-multiple identical Invariant Sections may be replaced with a single
-copy.  If there are multiple Invariant Sections with the same name but
-different contents, make the title of each such section unique by
-adding at the end of it, in parentheses, the name of the original
-author or publisher of that section if known, or else a unique number.
-Make the same adjustment to the section titles in the list of
-Invariant Sections in the license notice of the combined work.
-
-In the combination, you must combine any sections entitled "History"
-in the various original documents, forming one section entitled
-"History"; likewise combine any sections entitled "Acknowledgements",
-and any sections entitled "Dedications".  You must delete all sections
-entitled "Endorsements."
-
-
-6. COLLECTIONS OF DOCUMENTS
-
-You may make a collection consisting of the Document and other documents
-released under this License, and replace the individual copies of this
-License in the various documents with a single copy that is included in
-the collection, provided that you follow the rules of this License for
-verbatim copying of each of the documents in all other respects.
-
-You may extract a single document from such a collection, and distribute
-it individually under this License, provided you insert a copy of this
-License into the extracted document, and follow this License in all
-other respects regarding verbatim copying of that document.
-
-
-7. AGGREGATION WITH INDEPENDENT WORKS
-
-A compilation of the Document or its derivatives with other separate
-and independent documents or works, in or on a volume of a storage or
-distribution medium, does not as a whole count as a Modified Version
-of the Document, provided no compilation copyright is claimed for the
-compilation.  Such a compilation is called an "aggregate", and this
-License does not apply to the other self-contained works thus compiled
-with the Document, on account of their being thus compiled, if they
-are not themselves derivative works of the Document.
-
-If the Cover Text requirement of section 3 is applicable to these
-copies of the Document, then if the Document is less than one quarter
-of the entire aggregate, the Document's Cover Texts may be placed on
-covers that surround only the Document within the aggregate.
-Otherwise they must appear on covers around the whole aggregate.
-
-
-8. TRANSLATION
-
-Translation is considered a kind of modification, so you may
-distribute translations of the Document under the terms of section 4.
-Replacing Invariant Sections with translations requires special
-permission from their copyright holders, but you may include
-translations of some or all Invariant Sections in addition to the
-original versions of these Invariant Sections.  You may include a
-translation of this License provided that you also include the
-original English version of this License.  In case of a disagreement
-between the translation and the original English version of this
-License, the original English version will prevail.
-
-
-9. TERMINATION
-
-You may not copy, modify, sublicense, or distribute the Document except
-as expressly provided for under this License.  Any other attempt to
-copy, modify, sublicense or distribute the Document is void, and will
-automatically terminate your rights under this License.  However,
-parties who have received copies, or rights, from you under this
-License will not have their licenses terminated so long as such
-parties remain in full compliance.
-
-
-10. FUTURE REVISIONS OF THIS LICENSE
-
-The Free Software Foundation may publish new, revised versions
-of the GNU Free Documentation License from time to time.  Such new
-versions will be similar in spirit to the present version, but may
-differ in detail to address new problems or concerns.  See
-http://www.gnu.org/copyleft/.
-
-Each version of the License is given a distinguishing version number.
-If the Document specifies that a particular numbered version of this
-License "or any later version" applies to it, you have the option of
-following the terms and conditions either of that specified version or
-of any later version that has been published (not as a draft) by the
-Free Software Foundation.  If the Document does not specify a version
-number of this License, you may choose any version ever published (not
-as a draft) by the Free Software Foundation.
-
-
-ADDENDUM: How to use this License for your documents
-
-To use this License in a document you have written, include a copy of
-the License in the document and put the following copyright and
-license notices just after the title page:
-
-      Copyright (c)  YEAR  YOUR NAME.
-      Permission is granted to copy, distribute and/or modify this document
-      under the terms of the GNU Free Documentation License, Version 1.1
-      or any later version published by the Free Software Foundation;
-      with the Invariant Sections being LIST THEIR TITLES, with the
-      Front-Cover Texts being LIST, and with the Back-Cover Texts being LIST.
-      A copy of the license is included in the section entitled "GNU
-      Free Documentation License".
-
-If you have no Invariant Sections, write "with no Invariant Sections"
-instead of saying which ones are invariant.  If you have no
-Front-Cover Texts, write "no Front-Cover Texts" instead of
-"Front-Cover Texts being LIST"; likewise for Back-Cover Texts.
-
-If your document contains nontrivial examples of program code, we
-recommend releasing these examples in parallel under your choice of
-free software license, such as the GNU General Public License,
-to permit their use in free software.
diff --git a/ChangeLog b/ChangeLog
deleted file mode 100644
index d2cb220e3f..0000000000
--- a/ChangeLog
+++ /dev/null
@@ -1,1213 +0,0 @@
-2005-03-21  Radek Doulik  <rodo@novell.com>
-
-	* configure.in: require gtkhmtl 3.7.0 with 3.8 package/api version
-
-2005-03-21  Philip Van Hoof  <pvanhoof@gnome.org>
-
-	* configure.in: Fix for #73917
-	
-2005-03-16  Pawan Chitrakar  <pawan@nplinux.org>
-
-	* configure.in: Added ne in ALL_LINGUAS
-
-2005-03-07  JP Rosevear  <jpr@novell.com>
-
-	* configure.in: bump version, requires
-
-2005-02-28  JP Rosevear  <jpr@novell.com>
-
-	* configure.in: bump version, requires
-
-2005-02-28  JP Rosevear  <jpr@novell.com>
-  
-  	* configure.in: add startup wizard plugin
-	
-2005-02-28  JP Rosevear  <jpr@novell.com>
-  
-  	* plugins/Makefile.am: dist standard and experimental plugins
-  
-  	* configure.in: move "all" plugins to standard and experimental
-  	and default to building the standard set
- 		
-2005-02-27  JP Rosevear  <jpr@novell.com>
-
-	* configure.in: add mail/default/de to ac_output to fix the build
-
-2005-02-23  Björn Torkelsson <torkel@acc.umu.se>
-
-	* Makefile.am (DISTCLEANFILES): remove *.pc and intltool-*
-	files generated by configure when running make distclean.
-
-2005-02-23  Hans Petter Jansson  <hpj@novell.com>
-
-	* configure.in: Make mailer depend on libedataserverui.
-
-2005-02-22  Marco Pesenti Gritti  <marco@gnome.org>
-
-	* configure.in: Depend on gnome-vfs >= 2.4
-
-2005-02-22  Rodney Dawes  <dobey@novell.com>
-
-	* data/Makefile.am (CLEANFILES): add new variable with the generated
-	keys and desktop file listed so that they get removed with make clean
-	(EXTRA_DIST): Don't dist the generated keys file
-
-2005-02-01  Priit Laes <amd@store20.com>
-
-	* configure.in : Remove duplicate entries for addressbook-groupwise,
-	groupwise-status-tracking and default-source in plugins list. Fixes
-	make distclean.
-
-2005-02-01  JP Rosevear  <jpr@novell.com>
-
-	* MAINTAINERS: Update
-
-2005-02-01  Priit Laes <amd@store20.com>
-
-	* configure.in : Remove duplicate entry for calendar-file in
-	plugins list.
-
-2005-01-30  Harish Krishnaswamy <kharish@novell.com>
-
-	* configure.in : Correct the typo in plugins_base made in
-	the commit below - let the HEAD to get built again.
-	
-2005-01-29  Sivaiah Nallagatla <snallagatla@novell.com>
-
-	* configure.in : add addressbook-groupwise plguin to the 
-	plguin list 
-
-2005-01-26  Rodney Dawes  <dobey@novell.com>
-
-	* configure.in: Add mail/default/pt/Makefile to AC_OUTPUT
-
-2005-01-24  JP Rosevear  <jpr@novell.com>
-
-	* configure.in: bump version and requires
-
-2005-01-21  JP Rosevear  <jpr@novell.com>
-
-	* configure.in: e-util needs libgnomeprintui now 
-
-2005-01-21  Sivaiah Nallagatla <snallagatla@novell.com>
-                                                                               
-        * configure.in : added addressbook-file plugin 
-
-2005-01-21  Sivaiah Nallagatla <snallagatla@novell.com>
-
-	* configure.in : added default-source plugin  
-
-2005-01-20  Parthasarathi Susarla <sparthasarathi@novell.com>
-	
-	* configure.in : added a plugin for displaying the
-	  groupwise status tracking options
-
-2005-01-13  JP Rosevear  <jpr@novell.com>
-
-	* configure.in: bump version to 2.1.3.2
-
-2005-01-13  Rodney Dawes  <dobey@novell.com>
-
-	* configure.in: Add new-mail-notify to the plugins_all listing
-	so that it gets disted properly
-
-2005-01-12  JP Rosevear  <jpr@novell.com>
-
-	* configure.in: fix plugin listing, bump upgrade revision so
-	weather calendar group appears
-
-2005-01-10  JP Rosevear  <jpr@novell.com>
-
-	* configure.in: make itip-formatter a base plugin
-
-2005-01-11  JP Rosevear  <jpr@novell.com>
-
-	* configure.in: bump version
-
-2005-01-11  Not Zed  <NotZed@Ximian.com>
-
-	* configure.in: added new mail plugin & checks.
-
-2005-01-10  Sushma Rai  <rsushma@novell.com>
-
-	* configure.in: Added Exchange account settings plugin
-
-2005-1-10  Parthasarathi Susarla <sparthasarathi@novell.com>
-        * configure.in : added send options plugin to base plugin list
-
-2005-01-10 Vivek Jain <jvivek@novell.com>
-
-	* configure.in : Add shared-folder to plugin 
-	 and base plugin list. Add corresponding Makfile to AC_OUTPUT section.
-
-2005-01-10 Chenthill Palanisamy <pchenthill@novell.com>
-
-	* configure.in: add send-options plugin
-
-2005-01-09  JP Rosevear  <jpr@novell.com>
-
-	* configure.in: add calendar-file plugin
-
-2005-01-08 Priit Laes <amd@store20.com>
-	
-	* configure.in : Remove duplicate entry for itip-formatter in
-	plugins list.
-
-2005-01-08 Harish Krishnaswamy <kharish@novell.com>
-
-	* configure.in : Add gnome-vfs-module-2.0 to Evo compile flags for
-	the calendar.
-
-2005-01-08  Hans Petter Jansson  <hpj@novell.com>
-
-	* configure.in: Add libedataserverui to the e-util libs and cflags.
-
-2005-01-07  Rodrigo Moya <rodrigo@novell.com>
-
-	* configure.in: removed weatherdatadir definition here.
-
-2005-01-07  David Trowbridge <David.Trowbridge@Colorado.edu>
-
-	* configure.in: added calendar-weather plugin to build.
-
-2005-01-06  JP Rosevear  <jpr@novell.com>
-
-	* data/Makefile.am: add some uninstall rules for local data
-
-2005-01-03  JP Rosevear  <jpr@novell.com>
-
-	* configure.in: add itip-formatter to the "all" list, its not
-	ready to be in the base yet though
-
-2004-12-23  Hans Petter Jansson  <hpj@novell.com>
-
-	* configure.in: Remove select-names from Makefile output list.
-
-2004-12-17  Not Zed  <NotZed@Ximian.com>
-
-	* devel-docs/misc/errors.txt (BUILT_SOURCES): add translation stuff.
-
-2004-12-16  Not Zed  <NotZed@Ximian.com>
-
-	* Makefile.am, configure.in: added evolution-plugin.pc, pkg-config
-	file required for plugin development.
-
-2004-12-20  JP Rosevear  <jpr@novell.com>
-
-	* configure.in: bump version, requires
-
-2004-12-14  JP Rosevear  <jpr@novell.com>
-
-	Fixes #6066
-	
-	* README.translators: New information for translators
-
-	* README: Update slightly for 2.1/2.2
-
-2004-12-14  Rodney Dawes  <dobey@novell.com>
-
-	* configure.in (AC_OUTPUT): Add mail/default/zh_CN/Makefile
-
-2004-12-08  Hans Petter Jansson  <hpj@novell.com>
-
-	* plugins/shared-folder/share-folder-common.c: Include
-	<libebook/e-destination.h> from evolution-data-server.
-
-2004-12-03  Sivaiah Nallagatla <snallagatla@novell.com>
-
-	* configure.in : Add groupwise-account-setup to plguin 
-	 and base plugin list. Add corresponding Makfile to AC_OUTPUT section.
-	
-2004-12-01  Dafydd Harries  <daf@muse.19inch.net>
-
-	* configure.in: Add "cy" (Welsh) to ALL_LINGUAS.
-
-2004-11-29  JP Rosevear  <jpr@novell.com>
-
-	* configure.in: bump version, requires
-
-2004-12-02  Not Zed  <NotZed@Ximian.com>
-
-	* configure.in: Make evolution mail link to camel-provider not
-	camel only.  Removed some camel stuff.
-
-2004-11-16  Not Zed  <NotZed@Ximian.com>
-
-	* Makefile.am (SUBDIRS): removed camel.
-
-	* configure.in: Removed camel building, fixed module includes to
-	use camel via packageconfig.
-
-2004-11-15  Not Zed  <NotZed@Ximian.com>
-
-	* configure.in: Added libeds to camel and mail and filter cflags.
-
-2004-11-09  Rodney Dawes  <dobey@novell.com>
-
-	* configure.in: Add AC_SUBST for plugins_base also
-
-	* plugins/Makefile.am: Add plugins_base to DIST_SUBDIRS so that we
-	dist the plug-ins we actually build by default
-
-2004-11-04  Not Zed  <NotZed@Ximian.com>
-
-	* configure.in: added mailing-list-actions plugin.
-
-2004-11-04  Not Zed  <NotZed@Ximian.com>
-
-	* configure.in: modified base vs optional logic slightly and added
-	a warning if you build with --enable-plugins=no.
-
-2004-11-04  David Trowbridge <David.Trowbridge@Colorado.edu>
-
-	* configure.in: Added calendar-http module, and setup a mechanism
-	for base vs optional plugins.
-
-2004-11-03  JP Rosevear  <jpr@novell.com>
-
-	* configure.in: fix the logic
-	
-2004-11-03  JP Rosevear  <jpr@novell.com>
-
-	* configure.in: handle plain --enable-plugins and
-	--enable-plugins=yes by making it the equivalent of "all"		
-
-2004-11-03  Not Zed  <NotZed@Ximian.com>
-
-	* configure.in: added plugin-manager plugin.
-
-2004-11-01  JP Rosevear  <jpr@novell.com>
-
-	* Makefile.am: dist plugin.mk
-
-2004-10-29  Rodrigo Moya <rodrigo@novell.com>
-
-	* configure.in: added mail-to-meeting plugin.
-
-2004-10-28 Nat Friedman <nat@novell.com>
-
-	* configure.in: Re-enable bbwhatever becuase I think it works now.
-
-2004-10-27  JP Rosevear  <jpr@novell.com>
-
-	* configure.in: revive E_WIDGETS_CFLAGS/LIBS because of needing to
-	add libedataserverui
-
-2004-10-27  Not Zed  <NotZed@Ximian.com>
-
-	* configure.in: removed bbwhatever it is until the makefiles are
-	fixed.
-
-2004-10-25  Radek Doulik  <rodo@ximian.com>
-
-	* configure.in: added audio-inline plugin, added gstreamer check
-	for it
-
-	if gstreamer is not available, remove audio-inline plugin from the
-	plugins list
-
-2004-10-22  Harish K  <kharish@novell.com>
-
-	* configure.in: Added mark-calendar-offline plugin
-
-2004-10-22  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* configure.in: Added folder-unsubscribe plugin
-
-2004-10-22  Nat Friedman <nat@novell.com>
-
-	* configure.in: Added the bbdb plugin.
-
-2004-10-21  Rodrigo Moya <rodrigo@novell.com>
-
-	* configure.in: added save-calendar plugin.
-
-2004-10-21  Not Zed  <NotZed@Ximian.com>
-
-	* configure.in: added copy-tool plugin.
-
-2004-10-20  JP Rosevear  <jpr@novell.com>
-
-	* configure.in: add select-one-source to the plugin list
-
-2004-10-20  Not Zed  <NotZed@Ximian.com>
-
-	* configure.in: added prefer plain plugin.
-	
-2004-10-20  Not Zed  <NotZed@Ximian.com>
-
-	* configure.in: added save attachments plugin.
-
-2004-10-20  JP Rosevear  <jpr@novell.com>
-
-	* Makefile.am: list plugins as a subdir
-
-	* plugins/Makefile.am: build enabled plugins
-
-	* plugin.mk: simple rule for creating .eplug files
-
-	* configure.in: add plugin foo; --enable-plugins=all turns them
-	all on, or you can --enable-plugins="<plugin dir> <plugin dir>" to
-	list specific ones
-
-2004-10-15  Sarfraaz Ahmed <asarfraaz@novell.com>
-	
-	* camel.pc.in : Change gal-2.2 to gal-2.4
-	* evolution-shell.pc.in : Similar
-
-2004-10-13  JP Rosevear  <jpr@novell.com>
-
-	* configure.in: remove plugins from ac output
-	
-2004-10-13  JP Rosevear  <jpr@novell.com>
-
-	* configure.in: pull in libedataserverui as appropriate
-
-2004-10-01  Jeffrey Stedfast  <fejj@novell.com>
-
-	* configure.in (localedir): Enable imap4 plugin by default. We
-	need to get people building this and testing it.
-
-2004-10-01  JP Rosevear  <jpr@novell.com>
-
-	* configure.in: set the GETTEXT_PACKAGE to evolution-2.2
-	
-2004-10-01  JP Rosevear  <jpr@novell.com>
-
-	* configure.in: set a GTKHTML_API_VERSION variable
-
-2004-09-13  Not Zed  <NotZed@Ximian.com>
-
-	* configure.in: change the way ipv6 stuff is done.  separate ipv6
-	setting from getaddrinfo call check, and default to on if the
-	interfaces are available.
-
-2004-09-17  William Jon McCann  <mccann@jhu.edu>
-
-	* configure.in: Fix typos in gal dependency.
-
-2004-09-16  JP Rosevear  <jpr@novell.com>
-
-	* configure.in: use AC_DEFINE properly
-	
-2004-09-16  JP Rosevear  <jpr@novell.com>
-
-	* configure.in: bump EDS and gal requirements
-
-2004-09-16  JP Rosevear  <jpr@novell.com>
-
-	* configure.in: bump version to 2.1.0 and set base version to 2.2;
-	define DEVELOPMENT here so we don't have to alter code to change
-	in future
-
-2004-09-13  Tomasz Kłoczko <kloczek@pld.org.pl>
-
-	* data/evolution.desktop.in: added missing Encoding=UTF-8 field 
-	  (validate desktop file).
-
-2004-09-11  Akagic Amila  <bono@linux.org.ba>
-
-	* configure.in: Added 'bs' to ALL_LINGUAS.
-	
-2004-08-27  JP Rosevear  <jpr@novell.com>
-
-	* configure.in: bump version, requirements
-
-2004-08-23  Jeffrey Stedfast  <fejj@novell.com>
-
-	* configure.in: Added some comments about --enable-openssl
-	(e.g. why it is disabled)
-
-2004-08-18  Kjartan Maraas  <kmaraas@gnome.org>
-
-	* configure.in: Added «nb» to ALL_LINGUAS.
-
-2004-08-13  JP Rosevear  <jpr@novell.com>
-
-	* configure.in: bump version. requires
-
-2004-08-13  Rodney Dawes  <dobey@novell.com>
-
-	* acinclude.m4: Revert previous EVO_LDAP_CHECK changes, aren't working
-	as well as expceted and determined in testing
-
-2004-08-13  Frederic Crozat  <fcrozat@mandrakesoft.com>
-
-	* configure.in:
-	Add option to specify location of kerberos 4/5 libraries and
-	headers directories.
-	Needed for 64bits support.
-
-2004-08-13  Rodney Dawes  <dobey@novell.com>
-
-	* configure.in: Add value and description fields to AC_DEFINE calls
-	for the HAVE_ET_COM_ERR_H and HAVE_COM_ERR_H checks
-
-2004-08-13  Rodney Dawes  <dobey@novell.com>
-
-	* acinclude.m4: Remove EVO_CHECK_LIB
-	Update EVO_LDAP_CHECK to support --with-openldap-{libs,includes}
-	Sync with e-d-s acinclude.m4 (Adds GTK_DOC_CHECK)
-
-2004-08-13  Rodney Dawes  <dobey@novell.com>
-
-	* configure.in: Check for et/comm-err.h and comm_err.h so that
-	we can include the correct one
-
-2004-08-12  Rodney Dawes  <dobey@novell.com>
-
-	* data/evolution.desktop.in.in: Update Name and description to
-	not include "Ximian" or "(Unstable)"
-	Remove the MimeType field since we can't open these types on the
-	command line
-
-2004-08-12  Jeffrey Stedfast  <fejj@novell.com>
-
-	* configure.in: Check for gtk+-2.4 in order to enable the use of
-	GtkFileChooser.
-
-2004-08-09  Ankit Patel <ankit@redhat.com>
-
-	* configure.in: Gujarati & Panjabi Languages added
-
-2004-08-02  JP Rosevear  <jpr@novell.com>
-
-	* configure.in: bump version, requirements
-
-2004-08-01  JP Rosevear  <jpr@novell.com>
-
-	* configure.in: add libedataserver to E_UTIL flags
-
-2004-07-25  Gil Osher  <dolfin@rpg.org.il>
-
-	* configure.in: Added 'he' (Hebrew) to ALL_LINGUAS.
-
-2004-07-21  Ray Strode  <rstrode@redhat.com>
-
-	* evolution/data/evolution.desktop.in.in: Add MimeType line to
-	desktop file new mime sytem.
-
-2004-07-19   JP Rosevear  <jpr@novell.com>
-
-	* configure.in: bump version, requirements
-
-2004-07-07  Chris Toshok  <toshok@ximian.com>
-
-	* configure.in: add CAMEL_GROUPWISE cflags/libs.
-
-2004-07-02  JP Rosevear  <jpr@novell.com>
-
-	* configure.in: bump version, requirements
-
-2004-08-24  JP Rosevear  <jpr@novell.com>
-
-	* configure.in (plugindir): set a plugin dir so we can easily
-	install to the same place everywhere
-	
-2004-08-24  JP Rosevear  <jpr@novell.com>
-
-	* configure.in: Check for mono support properly
-
-2004-07-05  Not Zed  <NotZed@Ximian.com>
-
-	* configure.in: add some mono checks.
-
-2004-06-24  Pablo Saratxaga  <pablo@mandrakesoft.com>
-
-	* configure.in: Added Walloon (wa) to ALL_LINGUAS.
-
-2004-06-20  Arafat Medini <lumina@silverpen.de>
-
-	* configure.in: Added arabic locale ar to ALL_LINGUAS.
-
-2004-06-17  Fernando Herrera  <fherrera@onirica.com>
-
-	* data/evolution.desktop.in.in: Use "Evolution" for 
-	X-GNOME-Bugzilla-Product to match b.x.c product name.
-
-2004-06-09  Dan Winship  <danw@novell.com>
-
-	* configure.in (AC_OUTPUT): Remove shell/glade/Makefile, which has
-	been merged into shell/Makefile
-
-2004-06-03  JP Rosevear  <jpr@novell.com>
-
-	* configure.in: bump version, requirements
-
-2004-06-02  Chris Toshok  <toshok@ximian.com>
-
-	* configure.in (EDS_REQUIRED): bump to 0.0.93.1.
-	(BASE_VERSION): change to 12 for the ESource absolute_uri stuff.
-
-2004-06-01  Not Zed  <NotZed@Ximian.com>
-
-	* configure.in: check for statvfs.
-
-2004-05-24  Chris Toshok  <toshok@ximian.com>
-
-	* configure.in: add addressbook/tools/Makefile.am back to the
-	build.
-
-2004-05-19  Jeffrey Stedfast  <fejj@novell.com>
-
-	* configure.in: Setup the icon install paths (not that we actually
-	use them yet).
-
-2004-05-19  JP Rosevear  <jpr@novell.com>
-
-	* configure.in: bump version
-
-2004-05-12  Not Zed  <NotZed@Ximian.com>
-
-	* configure.in: add some stuff for statfs.
-
-	* devel-docs/misc/errors.txt: updated for xml format and i18n
-	changes.
-
-2004-04-30  Rodney Dawes  <dobey@ximian.com>
-
-	* configure.in: Require intltool 0.30 for the error xml files
-
-2004-04-30  Mike Castle <dalgoda@ix.netcom.com>
-
-	* data/Makefile.am (install-data-local): get the mime file from
-	src dir for srcdir != builddir
-
-2004-04-30  Not Zed  <NotZed@Ximian.com>
-
-	* tools/killev.c (main): use gnome_i18n_get_language_list so we
-	get the right one (LC_MESSAGES).
-
-2004-04-26  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* configure.in (UPGRADE_REVISION): Changed to 11.
-
-2004-04-26  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* configure.in (UPGRADE_REVISION): Changed to 10.
-
-2004-04-26  Radek Doulik  <rodo@ximian.com>
-
-	* configure.in: require newer gtkhtml with new gtk_html_begin's
-	flags
-
-2004-04-21  Rodney Dawes  <dobey@ximian.com>
-
-	* autogen.sh: Require automake 1.6 or neweer, we already do for libsoup
-	and evolution-data-server, there is no reason not to here
-
-2004-04-21  Chris Toshok  <toshok@ximian.com>
-
-	* configure.in (EDS_REQUIRED): bump to 0.0.92.1 for new EContact
-	company phone foo.
-	(UPGRADE_REVISION): bump to 9.
-
-2004-04-21 Sivaiah Nallagatla <snallagatla@novell.com>
-
-	* configure.in : added libegroupwise dependency to CAMEL 
-	 compile flags 
-
-2004-04-19  Rodney Dawes  <dobey@ximian.com>
-
-	* configure.in: Require gnome-icon-theme >= 1.2.0
-
-2004-04-19  Michael Terry  <mike@mterry.name>
-
-	* data/evolution.desktop.in.in: Use the icon theme
-
-2004-04-19  JP Rosevear <jpr@ximian.com>
-
-	* configure.in: bump version, requirements
-
-2004-04-09  Chris Toshok  <toshok@ximian.com>
-
-	* configure.in (UPGRADE_REVISION): bump to 8 for new contact list
-	migration, since there was a bug in the shell that caused all
-	migration to fail, but the key was still updated.
-	
-2004-04-09  Chris Toshok  <toshok@ximian.com>
-
-	* configure.in (UPGRADE_REVISION): bump to 7 for new contact list
-	migration.
-
-2004-04-08  Chris Toshok  <toshok@ximian.com>
-
-	* configure.in (UPGRADE_REVISION): add a new variable that should
-	be bumped whenever a migration change happens in any component.
-
-2004-04-07  Samúel Jón Gunnarsson  <sammi@techattack.nu>
-
-	* configure.in: Added "is" to ALL_LINGUAS
-
-2004-04-02  JP Rosevear  <jpr@ximian.com>
-
-	* configure.in: bump version, requirements
-
-2004-03-22  Radek Doulik  <rodo@ximian.com>
-
-	* configure.in: require gtkhtml 3.1.10, it's needed for composer
-	changes
-
-2004-03-15  Hao Sheng <hao.sheng@sun.com>
-
-	* a11y/addressbook/Makefile.am: make distcheck work
-	* a11y/calendar/Makefile.am: make distcheck work
-
-2004-03-15  Hao sheng  <hao.sheng@sun.com>
-
-	* configure.in: add a11y/addressbook/Makefile	
-
-2004-03-05  JP Rosevear <jpr@ximian.com>
-
-	* configure.in: bump version, requirements
-
-2004-03-02  Dan Winship  <danw@ximian.com>
-
-	* configure.in (DATASERVER_API_VERSION): Define this (the number
-	used in the e-d-s component repo_ids).
-
-	* tools/killev.c (main): Update the repo_ids
-
-2004-02-26  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* configure.in: Fixed the ENABLE_SMIME conditional to work. Fixes
-	the addressbook relocation error.
-
-2004-02-25  Chris Toshok  <toshok@ximian.com>
-
-	* configure.in: add "$xhave_nss = xyes" to the AM_CONDITIONAL for
-	ENABLE_SMIME.
-
-2004-02-24  JP Rosevear <jpr@ximian.com>
-
-	* marshal.mk: make sure to use the srcdir to build the list
-
-2004-02-23  Rodney Dawes  <dobey@ximian.com>
-
-	* configure.in: Fix a typo in the smime check, so it actually works
-
-2004-02-23  Adam Weinberger <adamw@FreeBSD.org>
-
-	* configure.in: Added "en_CA" (Canadian English) to ALL_LINGUAS.
-
-2004-02-19  Chris Toshok  <toshok@ximian.com>
-
-	* configure.in: add AC_ARG_ENABLE(smime...) -- "finally", i can
-	hear the people rejoice.  Only check the --enable-smime status if
-	--enable-ssl is also "yes".  AC_DEFINE (ENABLE_SMIME) if smime is
-	enabled.
-
-2004-02-18  Rodney Dawes  <dobey@ximian.com>
-
-	* configure.in: Require ORBit 2.9.8 or newer
-
-2004-02-12  Dan Winship  <danw@ximian.com>
-
-	* Makefile.am (%-$(BASE_VERSION).pc): cp the unversioned file
-	rather than mv'ing it so it doesn't get regenerated at install
-	time.
-
-2004-02-11  Not Zed  <NotZed@Ximian.com>
-
-	* configure.in (IMPORTERS_*): Added libebook-1.0.  Added back
-	mail/importers/Makefile.am.
-
-2004-02-10  JP Rosevear <jpr@ximian.com>
-
-	* configure.in: Add addressbook/importers to AC_OUTPUT
-
-2004-02-09  JP Rosevear  <jpr@ximian.com>
-
-	* configure.in: bump version, requirements
-
-2004-02-09  Rodney Dawes  <dobey@ximian.com>
-
-	* tools/killev.c: Use the AlarmNotify_Factory for --force-shutdown
-
-	Fixes #54084
-
-2004-02-09  Rodney Dawes  <dobey@ximian.com>
-
-	* data/evolution.desktop.in.in: Updated BugzillaOtherBinaries tag
-
-2004-01-28  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* configure.in: Revert previous change.
-
-2004-01-28  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* configure.in: Update to require glib-2.0 >= 2.3.2 (needed for
-	some GValue usage).
-
-2004-01-28  Rodney Dawes  <dobey@ximian.com>
-
-	* configure.in: Disable the possibility of using OpenSSL until someone
-	decides it is worthy and ends up maintaining the code, though porting
-	to GNUTLS would probably be a better option, if that happens
-
-2004-01-26  David Trowbridge <trowbrds@cs.colorado.edu>
- 
- 	* configure.in: add facilities for installing a help dir
-	
-2004-01-26  JP Rosevear  <jpr@ximian.com>
-
-	* configure.in: bump requirements, version
-
-2004-01-24  Sanlig Badral  <badral@openmn.org>
-
-	* configure.in: added "mn" to ALL_LINGUAS.
-
-2004-01-22  Rodney Dawes  <dobey@ximian.com>
-
-	* data/Makefile.am: Add rule to substitute BASE_VERSION in keys
-	* data/evolution.keys.in: Removed this file from CVS
-	* data/evolution.keys.in.in: Update to use BASE_VERSION and the
-	new addressbook vcard control that replaces the MiniCard control
-
-2004-01-22  Rodney Dawes  <dobey@ximian.com>
-
-	* configure.in: Don't require $LIBBONOBOUI_REQUIRED version of
-	libbonobo
-
-2004-01-16  Not Zed  <NotZed@Ximian.com>
-
-	* configure.in: added mail/default/Makefile and
-	mail/default/C/Makefile.
-
-2004-01-13  Rodney Dawes  <dobey@ximian.com>
-
-	* configure.in: Check for libsoup separately
-
-2004-01-12  JP Rosevear  <jpr@ximian.com>
-
-	* configure.in: bump version and requirements
-
-2004-01-12  JP Rosevear <jpr@ximian.com>
-
-	* configure.in: add soup as a calendar dep
-
-2004-01-12  Meilof Veeningen  <meilof@wanadoo.nl>
-
-	* configure.in: enable NNTP support by default
-
-2004-01-12  JP Rosevear <jpr@ximian.com>
-
-	* configure.in: compile flags for the test component and a
-	conditional compile
-
-2004-01-11  JP Rosevear <jpr@ximian.com>
-
-	* configure.in: dont kill the quote
-
-2004-01-11  JP Rosevear <jpr@ximian.com>
-
-	* configure.in: add enable option to build test component
-
-2004-01-08  Rodney Dawes  <dobey@ximian.com>
-
-	* configure.in: Add BONOBOUI_REQUIRED variable and depend on
-	libbonoboui >= 2.4.3, add an AC_SUBST() for EDS_REQUIRED also
-	* evolution-shell.pc.in: Require the same version of bonoboui that we
-	do in configure.in
-
-2004-01-08 Sivaiah Nallagatla <snallagatla@novell.com>
-
-	* configure.in : add camel/providers/groupwise/Makefile to
-	AC_OUTPUT section
-
-2004-01-08  Robert Sedak  <robert.sedak@sk.htnet.hr>
-
-	* configure.in: Added "hr" (Croatian) to ALL_LINGUAS.
-
-2004-01-05  JP Rosevear <jpr@ximian.com>
-
-	* tools/Makefile.am: Add e-util libs
-
-	* configure.in: try compiling with sys/types for freebsd
-
-	(Joe Marcus Clarke <marcus@freebsd.org>)	
-
-2004-01-05  Laurent Dhima  <laurenti@alblinux.net>
-
-	* configure.in: Added "sq" to ALL_LINGUAS.
-
-2004-01-01  Roozbeh Pournader  <roozbeh@sharif.edu>
-
-	* configure.in: Added "fa" (Persian) to ALL_LINGUAS.
-
-2003-12-30 Nicel KM <mnicel@novell.com>
-
-	* configure.in: removed default_user directory references from AC_OUTPUT
-
-2003-12-29  JP Rosevear <jpr@ximian.com>
-
-	* configure.in: default_user is gone
-
-	* Makefile.am: ditto
-
-2003-12-29  JP Rosevear <jpr@ximian.com>
-
-	* configure.in: bump version and gal, e-d-s and gtkhtml
-	requirements
-
-2003-12-22  Rodrigo Moya <rodrigo@ximian.com>
-
-	* configure.in: added camel/providers/groupwise to the build.
-
-2003-12-15  Chris Toshok  <toshok@ximian.com>
-
-	* Makefile.am (ACLOCAL_AMFLAGS): remove.
-
-2003-12-07  JP Rosevear  <jpr@ximian.com>
-
-	* configure.in: update version reliance
-
-2003-12-06  JP Rosevear <jpr@ximian.com>
-
-	* tools/Makefile.am: Remove hard coded disable deprecated flags
-
-2003-12-05  Radek Doulik  <rodo@ximian.com>
-
-	* configure.in: require gtkhtml 3.1.3 (new gtk_html_flush method
-	to be used in mailer)
-
-2003-12-04  Christian Hammond  <chipx86@gnupdate.org>
-
-	* art/im*.png, art/Makefile.am: Added IM png files from Gaim.
-
-2003-12-02  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* configure.in (EVOLUTION_DIR): Remove the Junk folder
-
-2003-12-01  Rodney Dawes  <dobey@ximian.com>
-
-	* data/Makefile.am: Install evolution.desktop as
-	evolution-$(BASE_VERSION).desktop
-	* data/evolution.desktop.in: Remove generated file
-	* data/evolution.desktop.in.in: Add (Unstable) to name
-	Fix comment to be more correct and have correct capitalization
-
-2003-12-01  Rodney Dawes  <dobey@ximian.com>
-
-	* tools/killev.c: Use BASE_VERSION for repo_ids and OAFIIDs,
-	Update gnome-spell repo_id to correct version,
-	Update gtkhtml editor OAFIID to GtkHTML 3.1
-
-2003-12-01  JP Rosevear <jpr@ximian.com>
-
-	* configure.in: define privconduitdir
-
-2003-11-28  Anders Carlsson  <andersca@gnome.org>
-
-	* configure.in: Look for mozilla-nss.pc, not mozilla.pc.
-
-2003-11-26  JP Rosevear  <jpr@ximian.com>
-
-	* configure.in: make sure the mozilla .pc file exists before
-	checking for it
-
-2003-11-24  Rodrigo Moya <rodrigo@ximian.com>
-
-	* tools/killev.c (main): kill Evo 2.0's alarm daemon, not 1.4's.
-
-2003-11-19  JP Rosevear <jpr@ximian.com>
-	
-	* MAINTAINERS: Update
-
-2003-11-18  JP Rosevear <jpr@ximian.com>
-
-	* configure.in: remove db3 check
-
-2003-11-18  Rodrigo Moya <rodrigo@ximian.com>
-
-	* tools/killev.c (main): kill the alarm notification service, not
-	the factory, which no longer exists.
-
-2003-11-17  JP Rosevear  <jpr@ximian.com>
-
-	* Makefile.am: make sure server.mk is disted
-
-2003-11-17  JP Rosevear <jpr@ximian.com>
-
-	* Makefile.am (EXTRA_DIST): do the right thing for disting
-
-2003-11-17  JP Rosevear <jpr@ximian.com>
-
-	* configure.in: use the server.mk file to get rules for building
-	versioned .server files
-
-	* */Makefile.am: use simplified rule subst
-	
-2003-11-17 JP Rosevear <jpr@ximian.com>
-
-	* Makefile.am: Install versioned package config files
-
-2003-11-14  JP Rosevear <jpr@ximian.com>
-
-	* configure.in: make source selector flags/libs
-
-2003-11-14  JP Rosevear <jpr@ximian.com>
-
-	* MAINTAINERS: Update
-
-2003-11-11  Chris Toshok  <toshok@ximian.com>
-
-	* Makefile.am (SUBDIRS): remove libversit from the build.
-
-	* configure.in (CERT_UI): change the libraries we link.
-	(AC_OUTPUT): remove libversit/Makefile
-
-2003-11-11  JP Rosevear <jpr@ximian.com>
-
-	* configure.in: determine the e-d-s version, version the gettext
-	files properly
-
-2003-11-07  Dan Winship  <danw@ximian.com>
-
-	* configure.in (AC_OUTPUT): Remove e-util/ename/Makefile
-
-2003-11-07  JP Rosevear <jpr@ximian.com>
-
-	* configure.in: we don't have to configure the libical subdir now
-
-2003-11-07  JP Rosevear <jpr@ximian.com>
-
-	* configure.in: pull in evolution-data-server stuff and remove
-	backends from output
-
-2003-10-31  JP Rosevear <jpr@ximian.com>
-
-	* configure.in: set up vars and rules for versioning the .server
-	files
-
-	* Makefile.am's: use rules for versioning .server file, ensure
-	built files are removed before disting
-	
-2003-10-30  Chris Toshok  <toshok@ximian.com>
-
-	* configure.in: (AC_OUTPUT): remove smime/tests for now.
-
-2003-10-30  Chris Toshok  <toshok@ximian.com>
-
-	* configure.in: set enable_smime=yes wherever nss would be
-	enabled..  fixes manually specifying the nss libs and enabling the
-	smime ui.  Also, add a section for generating the correct SMIME UI
-	flags.  gross, but necessary.  it should probably be wrapped in
-	with all the other nss library crap.
-	(AC_OUTPUT): add smime/tests
-
-2003-10-29  Chris Toshok  <toshok@ximian.com>
-
-	* Makefile.am (SUBDIRS): use $SMIME_DIR. instead of explicitly
-	including smime.
-
-	* configure.in: add some smime foo - a status message, an
-	AM_CONDITIONAL (ENABLE_SMIME)
-
-2003-10-17  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* configure.in: added a configure check for AI_ADDRCONFIG
-
-2003-10-24  Dan Winship  <danw@ximian.com>
-
-	* libversit/Makefile.am: Change YFLAGS to AM_YFLAGS to stop an
-	automake 1.7 warning
-
-2003-10-23  Rodney Dawes  <dobey@ximian.com>
-
-	* confiugre.in: Remove mail/importers/Makefile from AC_OUTPUT
-	yet again
-
-2003-10-23  Chris Toshok  <toshok@ximian.com>
-
-	* configure.in: add smime/* dirs. to AC_OUTPUT.
-
-	* Makefile.am (SUBDIRS): add smime/.
-
-2003-10-23  Frederic Crozat  <fcrozat@mandrakesoft.com>
-
-	* configure.in: Check for gnome-thumbnail.h existence 
-	(really committed this time).
-	
-2003-10-22  Ettore Perazzoli  <ettore@ximian.com>
-
-	* configure.in: Set $ACLOCAL to have the $ACLOCAL_FLAGS in it, so
-	it doesn't fail to regenerate the files if you run make without a
-	manual autogen after making changes to configure.in and friends.
-	[Many thanks to Marco Pesenti Gritti for pointing out the fix to
-	me.]
-
-2003-10-22  Rodney Dawes  <dobey@ximian.com>
-
-	* configure.in: Require ORBit 2.8.0 or newer for threading
-
-2003-10-22  Rodney Dawes  <dobey@ximian.com>
-
-	* configure.in: Revert broken previous commit and actually remove
-	mail/importers/Makefile from AC_OUTPUT
-
-2003-10-22  Rodney Dawes  <dobey@ximian.com>
-
-	* configure.in: Removed mail/importers/Makefile from AC_OUTPUT
-
-2003-10-22  Rodney Dawes  <dobey@ximian.com>
-
-	* configure.in: Removed addressbook/tools/Makefile from AC_OUTPUT
-
-2003-10-22  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* configure.in: Removed pedantic pgp/mime configure flag.
-
-2003-10-22  Dan Winship  <danw@ximian.com>
-
-	* executive-summary/*: Removed; this code has not been used since
-	pre-1.0.
-
-	* importers/*: Removed; the actual importers were moved to
-	{mail,calendar}/importers long ago.
-
-	* my-evolution/*: Removed; gone in evolution 2.0.
-
-	* notes/*: Removed; never finished and no one is working on it.
-
-	* omf-install/*: Removed; part of old doc system
-
-	* tests/*: Removed; these are ancient. Camel regression tests are
-	in camel/tests now.
-
-	* configure.in (E_UTIL_{CFLAGS,LIBS}): Remove soup-2.0 since
-	e-proxy is gone.
-	(EVOLUTION_MAIL_{CFLAGS,LIBS}): Remove soup-2.0 since the mailer
-	uses CamelHTTPStream now.
-	(EVOLUTION_EXECUTIVE_SUMMARY_{CFLAGS,LIBS}): Gone
-	(AC_OUTPUT): Remove my-evolution/Makefile
-
-	* README: evolution no longer depends on soup
-
-2003-10-21  Dan Winship  <danw@ximian.com>
-
-	* configure.in (GNOME_COMPILE_WARNINGS): Turn off the annoying
-	"comparison between signed and unsigned" warning in gcc 3.3
-
-	* evolution-calendar.pc.in (Cflags): add
-	-I${privincludedir}/libical
-
-2003-10-08  Frederic Crozat  <fcrozat@mandrakesoft.com>
-
-	* configure.in: Check for gnome-thumbnail.h existence.
-
-2003-09-04  Dan Winship  <danw@ximian.com>
-
-	* camel.pc.in (Requires): 
-	* evolution-addressbook.pc.in (Requires): 
-	* evolution-calendar.pc.in (Requires): 
-	* evolution-shell.pc.in (Requires): Require gal-2.2
-
-2003-08-27  Bolian Yin <bolian.yin@sun.com>
-
-	* configure.in: add a11y/widgets/Makefile
-	* Makefile.am: move a11y directory before widgets directory.
-
-2003-08-21  Not Zed  <NotZed@Ximian.com>
-
-	* HACKING: Wrote one.
-
-2003-08-20  Bolian Yin <bolian.yin@sun.com>
-
-	* configure.in: Add a11y checking, and a11y Makefiles
-	* Makefile.am: add a11y subdirectory
-
-2003-08-13  Mike Kestner  <mkestner@ximian.com>
-
-	* configure.in: don't make 1.5 the default version (ie LN_S)
-	update to use gal-2.2
-
-2003-08-01  Not Zed  <NotZed@Ximian.com>
-
-	* configure.in: Add option for '--enable-imapp', for 'new' imap
-	code.
-
-2003-07-26  Larry Ewing  <lewing@ximian.com>
-
-	* configure.in: use libgtkhtml-3.1 for linking.
-
-2003-07-26  Rodney Dawes  <dobey@ximian.com>
-
-	* configure.in: Bump version to "1.5", so that we end up being
-	parallel installable with 1.4 again, but we can still release
-	a "1.5.0" tarball when we get to that point in 6 months
-	
-2003-07-23  Dan Winship  <danw@ximian.com>
-
-	* configure.in: Define EVO_MARSHAL_RULE, which creates glib
-	marshaller .c and .h files that don't cause gcc warnings
-
-	* marshal.mk: The Makefile fragment used by EVO_MARSHAL_RULE.
-	(Can't include newlines in an AC_SUBST, so we have to use
-	AC_SUBST_FILE)
-
-	* Makefile.am (EXTRA_DIST): add marshal.mk
-
-2003-07-20 Hasbullah Bin Pit <sebol@ikhlas.com>
-
-	*configure.in: Added 'ms' (Malay) to ALL_LINGUAS.
-
-2003-07-10  Rodney Dawes  <dobey@ximian.com>
-
-	* configure.in: Change version to 1.4.99 since HEAD is not the
-	stable 1.4 branch, as evolution-1-4-branch was created post-1.4.1
-	
-2003-07-01  Dan Winship  <danw@ximian.com>
-
-	* configure.in: Check for gnome-icon-lookup.h (which could mean
-	either plain GNOME 2.2 or Sun GNOME 2.0)
-
-2003-06-30  Rodrigo Moya <rodrigo@ximian.com>
-
-	* configure.in:
-	* Makefile.am: removed libwombat from the build.
-
-	* evolution-calendar.pc.in: removed -lwombat.
-
-	* libwombat/*: removed unused directory.
-
-== Version 1.4.1 ==
-
-2003-06-25  Ettore Perazzoli  <ettore@ximian.com>
-
-	* configure.in: Depend on GtkHTML 3.0.6, gal 1.99.8.
-
-	* README: Update
-
-2003-06-23  Ettore Perazzoli  <ettore@ximian.com>
-
-	* data/Makefile.am: Added implicity rule to subst @BASE_VERSION@
-	in evolution.desktop.in.in to generate evolution.desktop.in.
-	(desktop_in_file): Removed.
-	(desktop_in_in_file): New.
-	(kdedesktop_file): Update substitution to use
-	$(desktop_in_in_file) instead of $(desktop_in_file).
-	(noinst_DATA): Add $(desktop_file).
-	(install-data-local): Depend on $(mime_file) and $(keys_file).
-	(EXTRA_DIST): Remove $(desktop_file), replace $(desktop_in_file)
-	with $(desktop_in_in_file).
-
-2003-06-19  Dan Winship  <danw@ximian.com>
-
-	* tools/killev.c (kill_component): clean this up a little and make
-	it deal with "evolution" vs "evolution-1.4"
-
-2003-06-19  Danilo Šegan  <dsegan@gmx.net>
-
-	* configure.in: Added "sr" and "sr@Latn" to ALL_LINGUAS.
-
-2003-06-17  Not Zed  <NotZed@Ximian.com>
-
-	* NEWS: Updated for current mail stuff.
-
-2003-06-13  Ettore Perazzoli  <ettore@ximian.com>
-
-	* tools/Makefile.am: Remove evolution-launch-composer since it's
-	no longer needed.
-
-
diff --git a/ChangeLog.pre-1-4 b/ChangeLog.pre-1-4
deleted file mode 100644
index 944140f011..0000000000
--- a/ChangeLog.pre-1-4
+++ /dev/null
@@ -1,8530 +0,0 @@
-== Version 1.4.0 ==
-
-2003-06-02  Ettore Perazzoli  <ettore@ximian.com>
-
-	* configure.in: Bump version number to 1.4.0.
-	(VERSION_COMMENT): Set to an empty string.
-	(GAL_REQUIRED): Require 1.99.7.
-
-2003-05-28  Rodney Dawes  <dobey@ximian.com>
-
-	* configure.in: AC_SUBST() for GAL_REQUIRED and GTKHTML_REQUIRED
-	
-2003-05-27  Not Zed  <NotZed@Ximian.com>
-
-	* camel.pc.in: make libs/cflags point to privlibdir/includedir,
-	otherwise this just doesn't work.
-
-== Version 1.3.92 ==
-
-2003-05-22  Ettore Perazzoli  <ettore@ximian.com>
-
-	* configure.in: Bump version to 1.3.92.
-
-2003-05-22  Rodney Dawes  <dobey@ximian.com>
-
-	* camel.pc.in:
-	* evolution-addressbook.pc.in:
-	* evolution-calendar.pc.in:
-	* evolution-shell.pc.in: s/GAL_VERSION/GAL_REQUIRED/
-	
-2003-05-22  Dmitry G. Mastrukov  <dmitry@taurussoft.org>
-
-	* configure.in: Added Belarusian to ALL_LINGUAS.
-
-2003-05-21  Ettore Perazzoli  <ettore@ximian.com>
-
-	* configure.in: Bump version to 1.3.91.99.
-
-== Version 1.3.91 ==
-
-2003-05-21  Ettore Perazzoli  <ettore@ximian.com>
-
-	* configure.in: Renamed GAL_VERSION to GAL_REQUIRED; also, made it
-	not AC_SUBST() it anymore since it's only used in configure.
-	Added GTKHTML_REQUIRED and made all the libgtkhtml-3.0 checks use
-	it.
-
-2003-05-19  Ettore Perazzoli  <ettore@ximian.com>
-
-	* configure.in: Remove GNOME_PREFIX stuff.  Add
-	--disable-default-binary command line option, with corresponding
-	DEFAULT_BINARY Automake conditional.
-
-2003-05-19  Not Zed  <notzed@lostzed.mmc.com.au>
-
-	* NEWS: Updated for mail/ camel/ filter/ and e-util/
-
-2003-04-30  Ettore Perazzoli  <ettore@ximian.com>
-
-	* configure.in: Bump version number to 1.3.3.99.
-
-== Version 1.3.3 ==
-
-2003-04-29  Ettore Perazzoli  <ettore@ximian.com>
-
-	* configure.in: 1.3.3.
-
-2003-04-28  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* NEWS: Updated for mailer fixes
-
-2003-04-28  Rodney Dawes  <dobey@ximian.com>
-
-	* data/cde_app_root/: Use $(privdatadir) instead of
-	$(prefix)/share/evolution-$(BASE_VERSION) for the cde stuff
-	
-2003-04-21  Rodney Dawes  <dobey@ximian.com>
-
-	* configure.in: Fix KDE_APPLNK_DIR to not install to a diff prefix,
-	and disable installing the file to the KDE applnk path by default
-	
-2003-04-11  Ettore Perazzoli  <ettore@ximian.com>
-
-	* configure.in: 1.3.2.99.
-
-== Version 1.3.2 ==
-
-2003-04-08  Dan Winship  <danw@ximian.com>
-
-	* tools/Makefile.am (EXTRA_DIST): Fix
-
-2003-04-07  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* configure.in: Oops, don't use a == when comparing strings in
-	shell.
-
-2003-04-07  Chris Toshok  <toshok@ximian.com>
-
-	* tools/Makefile.am (privlibexec_PROGRAMS): remove
-	evolution-addressbook-export.
-
-	* tools/evolution-addressbook-export.c: nuke.
-	
-2003-04-07  Chris Toshok  <toshok@ximian.com>
-
-	* configure.in: add addressbook/tools/Makefile to AC_OUTPUT.
-
-2003-04-07  Dan Winship  <danw@ximian.com>
-
-	* tools/Makefile.am (privlibexec_SCRIPTS, privlibexec_PROGRAMS):
-	Install these in privlibexecdir, not privdatadir. Move killev from
-	SCRIPTS to PROGRAMS.
-	(killev_SOURCES, killev_LDADD): Add
-
-	* tools/killev.c: New C port of killev, since
-	"bonobo-activation-query" does not return as much information as
-	"oaf-client" did. Also has prettier output. (Still shells out to
-	killall/pkill to do the actual killing.)
-
-	* tools/killev: Gone
-
-	* tools/evolution-move-tasks: Removed since the evolution-calendar
-	code that called it is also gone now.
-
-2003-04-07  Not Zed  <NotZed@Ximian.com>
-
-	* NEWS: Updated for mail/camel/composer/filter for 1.3.2
-	
-2003-04-06  Christophe Merlet  <redfox@redfoxcenter.org>
-
-	* data/Makefile.am: Create $(DESTDIR)$(kdedeskdopdir).
-
-2003-04-04  Chris Toshok  <toshok@ximian.com>
-
-	* acinclude.m4 (EVO_LDAP_CHECK): bleah, add "" in for the "no"
-	case in with_static_ldap.
-
-2003-04-03  Chris Toshok  <toshok@ximian.com>
-
-	* acinclude.m4 (EVO_LDAP_CHECK): the existence of libldap.la
-	should have no bearing on whether or not we try to statically link
-	ldap.
-
-2003-03-29  Duarte Loreto <happyguy_pt@hotmail.com>
-
-        * AUTHORS: Added myself as new Portuguese translator.
-
-2003-03-28  Ettore Perazzoli  <ettore@ximian.com>
-
-	* configure.in: Ported check for "killall" vs. "killp" back from
-	1.2.
-
-2003-03-28  Ettore Perazzoli  <ettore@ximian.com>
-
-	* data/Makefile.am: Fix installation of the .desktop file.
-
-2003-03-27  Ettore Perazzoli  <ettore@ximian.com>
-
-	* configure.in: Add gal-2.0 to the list of packages to determine
-	WOMBAT_CFLAGS and WOMBAT_LIBS.
-
-2003-03-26  Ettore Perazzoli  <ettore@ximian.com>
-
-	* configure.in: Autogen help/Makefile.
-
-	* Makefile.am (SUBDIRS): Add help.  [#38234]
-
-2003-03-25  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* configure.in: Fixed Heimdal include path.
-
-2003-03-25  Rodney Dawes  <dobey@ximian.com>
-
-	* data/evolution.desktop.in: Fix 39901 and 40233
-	
-2003-03-21  Rodney Dawes  <dobey@ximian.com>
-
-	* configure.in: Fix the mit krb5+krb4 check to work with --without-kr5
-
-2003-03-19  Ettore Perazzoli  <ettore@ximian.com>
-
-	* README: Updated considerably.
-
-2003-03-18  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* configure.in: Fixed a type-o in the krb5 checks.
-
-2003-03-19  Not Zed  <NotZed@Ximian.com>
-
-	* configure.in (CAMEL_*, E_UTIL_*, ): Add gthread-2.0, to get any
-	thread-specific flags (like -D_REENTRANT).  Duh.  For #39886.
-	(LIBIBEX*): Removed old libibex stuff.
-
-2003-03-14  Chris Toshok  <toshok@ximian.com>
-
-	* tools/evolution-addressbook-export.c (save_cards): use
-	bonobo_main_quit, and clean this up a bit.
-
-2003-03-06  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* configure.in: Added AC_C_INLINE - this should fix bug #39171.
-
-2003-03-05  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* configure.in: Fix kerberos include paths.
-
-2003-03-05  Ettore Perazzoli  <ettore@ximian.com>
-
-	* configure.in: Update version number to 1.3.1.99.
-
-== Version 1.3.1 ==
-
-2003-02-28  Dan Winship  <danw@ximian.com>
-
-	* tools/Makefile.am (evolution_launch_composer_LDADD): Fix
-	dependencies
-
-2003-02-28  Hans Petter Jansson  <hpj@ximian.com>
-
-	* configure.in: Add calendar/importers/Makefile to output.
-
-2003-02-27  Chris Toshok  <toshok@ximian.com>
-
-	* tools/.cvsignore: ignore some stuff, yo.
-	
-	* tools/Makefile.am: add in the evolution-launch-composer stuff.
-
-	* tools/evolution-launch-composer.c: port this from the 1.2 branch.
-
-2003-02-27  JP Rosevear  <jpr@ximian.com>
-
-	* configure.in: export gnome-pilot cflags
-
-2003-02-21  Dan Winship  <danw@ximian.com>
-
-	* libversit/Makefile.am: Make this a shared library to prevent
-	linking portability problems
-
-	* tools/Makefile.am (evolution_addressbook_import_LDADD): cleanup
-
-2003-02-19  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* configure.in (ENABLE_IPv6): AC_DEFINE() ENABLE_IPv6 if it should
-	be enabled.
-
-2003-02-07  Rodney Dawes  <dobey@ximian.com>
-
-	* data/Makefile.am: Fix installation of desktop/mime files
-	
-2003-02-06  Ettore Perazzoli  <ettore@ximian.com>
-
-	* configure.in: Add fr to ALL_LINGUAS again.
-
-2003-02-06  Rodney Dawes  <dobey@ximian.com>
-
-	* configure.in: Fix KRB4_CFLAGS to work correctly
-	* data/Makefile.am: Fix desktop file installation path
-	* data/evolution.desktop.in: Use correct binary and categories, add
-	StartupNotify=1 also, for startup-notification-enabled systems
-	
-2003-02-06  Dan Winship  <danw@ximian.com>
-
-	* configure.in: export priv*dir for libical's configure to use.
-
-	* evolution-addressbook.pc.in (Libs): Remove -L${libdir}.
-	(CFlags): s/includedir/privincludedir/
-
-	* evolution-calendar.pc.in: Likewise
-
-	* evolution-shell.pc.in: Likewise. Also change iconsdir to
-	imagesdir
-
-	* sounds/Makefile.am: remove soundsdir def
-
-	* tools/Makefile.am: subst in $(toolsdir) instead of $(bindir)
-
-	* tools/evolution-addressbook-clean.in:
-	s/EVOLUTION_BINDIR/EVOLUTION_TOOLSDIR/
-
-	* tools/evolution-addressbook-abuse.c (main):
-	s/PACKAGE/GETTEXT_PACKAGE/ in gettext init
-	* tools/evolution-addressbook-export.c (main): Likewise
-	* tools/evolution-addressbook-import.c (main): Likewise
-
-2003-02-05  Dan Winship  <danw@ximian.com>
-
-	* configure.in: Define and AC_SUBST privlibexecdir, privdatadir,
-	privincludedir, serverdir, evolutionuidir, imagesdir, buttonsdir,
-	soundsdir, gladedir, etspecdir, and viewsdir.
-
-	* data/Makefile.am (dtappintegrate, dtappunintegrate): use
-	privdatadir
-
-2003-02-04  Dan Winship  <danw@ximian.com>
-
-	* configure.in: Update AC_DEFINEs to use the new syntax to make
-	acconfig.h unnecessary. (Remove unneeded HAVE_KDE_APPLNK define).
-	Call GNOME_COMPILE_WARNINGS and add $WARN_CFLAGS to CFLAGS to get
-	back to the evo 1.2 behavior of defaulting to -Wall everywhere.
-	Fix up privlibdir definition to avoid undefined variables in
-	evolution-shell.pc.
-
-	* acinclude.m4: Update AC_DEFINE
-
-	* acconfig.h: Gone
-
-2003-02-03  Chris Toshok  <toshok@ximian.com>
-
-	* configure.in (EVOLUTION_MAIL): add gnome-vfs-module-2.0 to the
-	deps so we pick up the right include path.
-
-2003-02-03  Chris Toshok  <toshok@ximian.com>
-
-	* configure.in: remove the --enable-shlib-components stuff.
-
-2003-01-28  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* configure.in (HAVE_KRB5): Updated to add gssapi libs, since this
-	is what we use krb5 for :-)
-
-2003-01-28  Rodney Dawes  <dobey@ximian.com>
-
-	* tools/Makefile.am (EXTRA_DIST): s/bin_SCRIPTS/tools_SCRIPTS/
-	
-2003-01-27  Ettore Perazzoli  <ettore@ximian.com>
-
-	* tools/evolution-addressbook-export.c: #include bonobo-activation
-	instead of oaf.
-	(main): Initialize using gnome_program_init().
-	(save_cards): Use g_main_loop_quit() instead of gtk_exit().
-
-	* tools/evolution-addressbook-import.c: Update include list for
-	GNOME 2.
-	(main): Initialize using gnome_program_init().
-	(unref_executable): Use g_main_loop_quit() instead of gtk_exit().
-	(add_cb): Likewise.
-
-	* tools/evolution-addressbook-abuse.c: Update include list for
-	GNOME 2.
-	(main): Initialize using gnome_program_init().
-	(use_addressbook): Use g_object_unref() instead of
-	gtk_object_unref().
-	(main): Use g_timeout_add() instead of gtk_timeout_add().
-	(add_cb): Use g_main_loop_quit() instead of gtk_exit().
-
-	* configure.in (AC_SUBST): Add tools/Makefile.
-
-	* Makefile.am (SUBDIRS): Add tools/ back into the list.
-
-	* tools/Makefile.am: Install everything in
-	$(datadir)/evolution-$(BASE_VERSION)/tools.
-	(INCLUDES): Add the defines that gnome_program_init() likes and
-	also add the _DISABLE_DEPRECATED stuff.
-
-2003-01-26  Chris Toshok  <toshok@ximian.com>
-
-	* configure.in (AC_OUTPUT): add in the conduit Makefile's.
-	
-2003-01-26  Chris Toshok  <toshok@ximian.com>
-
-	* configure.in: only do the CONDUIT_CFLAGS/LIBS stuff if pilot
-	conduits have been enabled.
-
-2003-01-26  Chris Toshok  <toshok@ximian.com>
-
-	* configure.in: in the --enable-pilot-conduits stanza, use
-	PKG_CHECK_MODULES to get the gnome-pilot-2.0 (and therefore
-	pilot-link) cflags/libs before doing our utf-8 check.  also,
-	enable the addressbook/calendar CONDUIT_{CFLAGS/LIBS} variables.
-
-2003-01-24  Ettore Perazzoli  <ettore@ximian.com>
-
-	* configure.in (evolutionuidir): Define iconsdir.
-
-2003-01-24  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* configure.in (FULL_GNOME_DEPS): Doh. Use the
-	MANUAL_[NSPR,NSS]_[CFLAGS,LIBS] variables where appropriate.
-
-2003-01-23  Ettore Perazzoli  <ettore@ximian.com>
-
-	* configure.in (idldir): Define componentdir instead of
-	COMPONENT_DIR.  Set it to $privlibdir/components instead of
-	$libdir/evolution-$(BASE_VERSION)/components.
-
-2003-01-22  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* configure.in (MOZILLA_NSS): Simplify the whole process into
-	about 8 lines by using pkg-config.
-
-2003-01-22  Ettore Perazzoli  <ettore@ximian.com>
-
-	* data/Makefile.am: For now, do not install the evolution.1
-	manpage.  Install all the other files with a -$(BASE_VERSION)
-	suffix.
-	(dtappintegrate): Update for the new location of cde_app_root.
-	(dtappunintegrate): Likewise.
-
-	* data/cde_app_root/dt/appconfig/appmanager/C/Ximian/Makefile.am
-	(cdeappmanagerdir): Version using $(BASE_VERSION).
-	* data/cde_app_root/dt/appconfig/types/C/Makefile.am
-	(cdetypesdir): Likewise.
-	* data/cde_app_root/dt/appconfig/icons/C/Makefile.am
-	(cdeiconsdir): Likewise.
-
-	* sounds/Makefile.am (soundsdir): Version using $(BASE_VERSION).
-
-	* configure.in: Define BASE_VERSION.  Set idldir to
-	$datadir/idl/evolution-$BASE_VERSION instead of just
-	$datadir/idl/evolution.
-
-2003-01-14  Ettore Perazzoli  <ettore@ximian.com>
-
-	* configure.in (ALL_LINGUAS): Remove fr for now, since it doesn't
-	seem to work.
-	(AC_OUTPUT): Remove calendar/importers/Makefile for now.
-
-2003-01-14  Rodney Dawes  <dobey@ximian.com>
-
-	* Makefile.am (EXTRA_DIST): intltool, not xml-i18n-tools
-	
-2003-01-07  Dan Winship  <danw@ximian.com>
-
-	* Makefile.am (SUBDIRS): add po
-
-	* configure.in: Move ALL_LINGUAS definition to before
-	AM_GLIB_GNU_GETTEXT, or else no linguas for you!
-
-2003-01-06  Dan Winship  <danw@ximian.com>
-
-	* configure.in (AC_INIT): Use "Evolution", not "evolution", since
-	that becomes the value of the PACKAGE variable
-	(privlibdir): parse $VERSION by hand since.
-	EVOLUTION_MAJOR_VERSION, etc aren't defined any more (and trying
-	to pass a variable to AC_INIT won't work). This and the above
-	change fix the problem that privlibdir was being defined as
-	"${libdir}/Evolution/." instead of "${libdir}/evolution/1.3"
-	(GAL_VERSION): AC_SUBST this since it's needed in the .pc files
-	(idldir): define this here rather than in each Makefile.am that
-	needs it.
-	(AC_OUTPUT): Add .pc files
-
-	* Makefile.am (pkgconfig_DATA): Add pc files.
-	(confexec_DATA): Remove this (fooConf.sh files)
-	(SUBDIRS): Move filter earlier in the build. (I think it was
-	calendar that depends on it now?)
-	(%Conf.sh): Remove this. The .pc files are output by configure.in
-	now.
-
-	* camel.pc.in, evolution-addressbook.pc.in,
-	evolution-calendar.pc.in, evolution-shell.pc.in: Replace the
-	*Conf.sh files with these. In addition to the basic variables,
-	include camel_providerdir (in camel.pc) and idldir, IDL_INCLUDES
-	and privlibdir (in the others).
-
-2002-12-04  Ettore Perazzoli  <ettore@ximian.com>
-
-	* configure.in: Define COMPONENT_DIR.
-
-2002-11-22  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* configure.in: Add NSPR CFLAGS and LDFLAGS to the E_UTIL build
-	flags.
-
-2002-11-20  Ettore Perazzoli  <ettore@ximian.com>
-
-	* configure.in: AC_OUTPUT(my-evolution/Makefile).
-
-2002-11-20  Ettore Perazzoli  <ettore@ximian.com>
-
-	* Makefile.am (changelogs): Add my-evolution.
-
-2002-11-20  Not Zed  <NotZed@Ximian.com>
-
-	* libibex/*: cvs removed it all.  Not much use having it around
-	anymore.
-
-2002-11-19  Ettore Perazzoli  <ettore@ximian.com>
-
-	* configure.in: Check for gconftool-2, and added
-	AM_GCONF_SOURCE_2.
-
-2002-11-18  Not Zed  <NotZed@Ximian.com>
-
-	* configure.in: Added back IMPORTERS_CFLAGS and
-	mail/importers/Makefile
-
-2002-11-16  Chris Toshok  <toshok@ximian.com>
-
-	* configure.in: we require >= 0.0.9.99 of gal.
-
-2002-11-15  Ettore Perazzoli  <ettore@ximian.com>
-
-	* configure.in: Set up the my-evolution flags properly, do not
-	AC_SUBST GNOME_Evolution_Mail.server.in.
-
-2002-11-13  Not Zed  <NotZed@Ximian.com>
-
-	* Makefile.am (SUBDIRS): re-added filter, mail, composer
-
-	* configure.in: Added EVOLUTION_MAIL settings, and mail/makefile.
-
-2002-11-11  Joe Shaw  <joe@ximian.com>
-
-	* Makefile.am (SUBDIRS): remove tools for now, it's not in
-	configure.in.
-
-2002-11-11  Chris Toshok  <toshok@ximian.com>
-
-	* Makefile.am (SUBDIRS): add addressbook.
-
-2002-11-08  Chris Toshok  <toshok@ximian.com>
-
-	* configure.in: add some more addressbook paths.
-
-2002-11-08  Not Zed  <NotZed@Ximian.com>
-
-	* configure.in: Added composer/Makefile & gtkhtml-3.0 deps.
-
-2002-11-07  Chris Toshok  <toshok@ximian.com>
-
-	* configure.in (AC_OUTPUT): GNOME_Evolution_Summary.oaf.in = >
-	GNOME_Evolution_Summary.server.in
-
-2002-11-07  JP Rosevear  <jpr@ximian.com>
-
-	* configure.in: update e-util and calendar compile flags
-
-2002-11-07  Rodrigo Moya <rodrigo@ximian.com>
-
-	* configure.in: added libgnome-2.0 to camel requirements.
-
-2002-11-06  Chris Toshok  <toshok@ximian.com>
-
-	* configure.in: add some more addressbook dirs to AC_OUTPUT.
-
-2002-11-05  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* configure.in: Re-enable the filter cflags/libs stuff.
-
-2002-11-05  Chris Toshok  <toshok@ximian.com>
-
-	* Makefile.am (SUBDIRS): add wombat.
-
-2002-11-05  Chris Toshok  <toshok@ximian.com>
-
-	* configure.in: add wombat and addressbook compile flags, and add
-	wombat and some addressbook dirs to AC_OUTPUT.
-
-2002-11-05  Dan Winship  <danw@ximian.com>
-
-	* configure.in: change the commented-out soup check to refer to
-	the new soup 2.0 in the libsoup module
-
-2002-11-05  Rodrigo Moya <rodrigo@ximian.com>
-
-	* configure.in: use correct libgtkhtml-3.0 for calendar and added
-	generation of calendar GUI's directories.
-
-2002-11-05  Rodrigo Moya <rodrigo@ximian.com>
-
-	* configure.in: enabled libwombat.
-
-2002-11-04  Rodrigo Moya <rodrigo@ximian.com>
-
-	* configure.in:
-	* Makefile.am: added libversit directory to build.
-
-2002-11-04  Ettore Perazzoli  <ettore@ximian.com>
-
-	* Makefile.am (SUBDIRS): Add shell.
-
-2002-11-04  Rodrigo Moya <rodrigo@ximian.com>
-
-	* configure.in: added calendar/idl/Makefile to AC_OUTPUT
-
-2002-11-04  Ettore Perazzoli  <ettore@ximian.com>
-
-	* configure.in: Add an AM_GLIB_GNU_GETTEXT.
-
-2002-11-03  Rodrigo Moya <rodrigo@ximian.com>
-
-	* configure.in:
-	* Makefile.am: re-added calendar component (only non-UI stuff).
-
-	* data/Makefile.am: use intltools instead of xml-i18n-tools.
-
-2002-11-03  Ettore Perazzoli  <ettore@ximian.com>
-
-	* configure.in: AC_PROG_INTLTOOL instead of
-	AM_PROG_XML_I18N_TOOLS.
-
-2002-11-01  Ettore Perazzoli  <ettore@ximian.com>
-
-	* configure.in: Update to use Autoconf 2.53.  Remove checks for
-	scrollkeeper.  Remove intl/Makefile and macros/Makefile from
-	AC_OUTPUT list.  Set up GETTEXT_PACKAGE.  Removed
-	AM_ACLOCAL_INCLUDE(macros).  Added AM_PATH_ORBIT2.
-	(EVO_SET_COMPILE_FLAGS): Use PKG_CHECK_MODULES.
-	(IDL_INCLUDES): New, -I params to pass to $(ORBIT_IDL) when
-	compiling IDL files into stubs.
-
-	* autogen.sh: Changed to use gnome-autogen.sh.
-
-2002-10-30  Ettore Perazzoli  <ettore@ximian.com>
-
-	* configure.in: 1.1.90.99.
-
-== Version 1.1.90 (Release Candidate 1) ==
-
-2002-10-28  Ettore Perazzoli  <ettore@ximian.com>
-
-	* configure.in: gal 0.21, GtkHTML 1.1.5.
-
-2002-10-23  Chris Toshok  <toshok@ximian.com>
-
-	* configure.in: Update dep for GAL to 0.21.0.
-
-2002-10-07  Ettore Perazzoli  <ettore@ximian.com>
-
-	* configure.in: Update version number to 1.1.2.99.
-
-== Version 1.1.2 ==
-
-2002-10-07  Ettore Perazzoli  <ettore@ximian.com>
-
-	* configure.in: 1.1.2.  Update deps for GAL and GtkHTML.
-
-2002-09-27  gettextize  <bug-gnu-gettext@gnu.org>
-
-	* Makefile.am (SUBDIRS): Add m4.
-	(ACLOCAL_AMFLAGS): New variable.
-	(EXTRA_DIST): Add config.rpath.
-	* configure.in (AC_OUTPUT): Add po/Makefile.in, m4/Makefile.
-
-2002-09-23  Radek Doulik  <rodo@ximian.com>
-
-	* configure.in: use pkg-config for gtkhtml
-
-2002-09-23  JP Rosevear  <jpr@ximian.com>
-
-	* configure.in: fix kde applnk test to not test for things if
-	disabled
-
-	* configure.in: Fix up mozilla tests and allow static linking of
-	nss/nspr (Frank Belew <frb@ximian.com>)
-	
-2002-09-23  Aaron Weber  <aaron@ximian.com>
-
-	* README: Update URLs for mailing lists, Evolution application
-	page, help information. Remove note that Evolution is beta. In
-	general, changes to the "soft" data.  Also, jeff's commit to this
-	file from 2001-11-21 seems to have been lost, so I re-removed the
-	stuff he took out. And changed libnspr to mozilla-nspr, and
-	libnss3 to mozilla-nss.
-
-	* data/evolution.1: Update with information about where the real
-	help is. Clarify example formatting.
-
-2002-09-16  Ettore Perazzoli  <ettore@ximian.com>
-
-	* data/cde_app_root/Makefile.am: New.
-	* data/cde_app_root/dt/Makefile.am: New.
-	* data/cde_app_root/dt/appconfig/Makefile.am: New.
-	* data/cde_app_root/dt/appconfig/appmanager/Makefile.am: New.
-	* data/cde_app_root/dt/appconfig/appmanager/C/Makefile.am: New.
-	* data/cde_app_root/dt/appconfig/appmanager/C/Ximian/Makefile.am: New.
-	* data/cde_app_root/dt/appconfig/icons/Makefile.am: New.
-	* data/cde_app_root/dt/appconfig/icons/C/Makefile.am: New.
-	* data/cde_app_root/dt/appconfig/types/Makefile.am: New.
-	* data/cde_app_root/dt/appconfig/types/C/Makefile.am: New.
-
-	* configure.in: Add a `--with-cde-path' option.  Check for
-	dtappintegrate in that path.  Define HAVE_DTAPPINTEGRATE and
-	GNOME_PREFIX.  Also, generate
-	data/cde_app_root/dt/appconfig/types/C/Ximian.dt.in and
-	shell/evolution-nognome.
-
-2002-09-12  Ettore Perazzoli  <ettore@ximian.com>
-
-	* configure.in: 1.1.1.99.
-
-2002-09-11  Ettore Perazzoli  <ettore@ximian.com>
-
-	* Makefile.am (SUBDIRS): Put po on the top.
-
-== Version 1.1.1 ==
-
-2002-09-09  Ettore Perazzoli  <ettore@ximian.com>
-
-	* configure.in: 1.1.1.  Also bump some requirements.
-
-	* README: Update according to the new requirements.
-
-2002-09-06  Larry Ewing  <lewing@ximian.com>
-
-	* NEWS: update with some gtkhtml features.
-
-2002-09-05  Ettore Perazzoli  <ettore@ximian.com>
-
-	* NEWS: Updated with the new 1.2 features (unfinished).
-
-	* NEWS-1.0: New, contains the changes up to version 1.0.8.
-
-2002-09-04  Dan Winship  <danw@ximian.com>
-
-	* acinclude.m4 (EVO_CHECK_TIMEZONE): Remove this from here.
-
-	* configure.in: Put it here. (Connector no longer needs to share
-	it). Also, check "tm_gmtoff" before "timezone", and if we have
-	"timezone", check for "altzone" too.
-
-	* acconfig.h: Add HAVE_ALTZONE
-
-2002-08-28  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* configure.in: e-util now requires soup and gconf flags.
-
-2002-08-12  Dan Winship  <danw@ximian.com>
-
-	* tools/evolution-addressbook-import.c (main): Use default book,
-	not local one.
-
-	* tools/evolution-addressbook-export.c (main): Likewise.
-
-	* tools/evolution-addressbook-abuse.c (abuse_timeout): Likewise.
-
-2002-08-11  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* README: Update required gal and gtkhtml dependency information.
-
-2002-08-06  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* configure.in (THREADS_CFLAGS): Need to check for gal 0.19.99.18
-	for e_xml_save_file().
-
-2002-08-01  Ettore Perazzoli  <ettore@ximian.com>
-
-	* README: Update Soup information and remove hard spaces.
-
-	* configure.in: Check for Soup 0.7 or later.  [Hm, we should make
-	sure that it's actually a 0.7.x version.]
-
-2002-07-22  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* configure.in: Add checks for IPv6 support.
-
-2002-07-30  Not Zed  <NotZed@Ximian.com>
-
-	* configure.in (EVOLUTION_MAIL): added soup to compile flags.
-
-2002-07-24  Ettore Perazzoli  <ettore@ximian.com>
-
-	[Patch by Frank Belew <frb@ximian.com>.]
-
-	* configure.in: If no --with-kde-applnk-path is given, try to
-	detect the directory using `kde-config'.
-
-2002-07-22  Dan Winship  <danw@ximian.com>
-
-	* acinclude.m4: Move EVO_CHECK_LIB into here, and also create
-	EVO_PURIFY_SUPPORT, EVO_TIMEZONE_CHECK, and EVO_LDAP_CHECK from
-	stuff in configure.in. (This stuff is also used by Connector.)
-
-	* configure.in: Remove the stuff that was moved to acinclude.m4.
-
-	* evolution_addressbookConf.sh.in: Remove db3 and ldap references
-	since pas-backend-file and pas-backend-ldap are no longer in
-	libpas, and those flags weren't doing anything useful here before
-	anyway. (Our attempts to force static linking to those libraries
-	end up getting mangled when passed through gnome-config.)
-
-	* evolution_calendarConf.sh.in: Likewise, remove db3 references.
-
-2002-07-22  Dan Winship  <danw@ximian.com>
-
-	* configure.in: Check if we're trying to build with the old
-	libversit module borrowed from gnome-pim instead of our own new
-	one, and refuse to build if so.
-
-	* libversit/Makefile.am: Remove libversit.la stuff since we don't
-	want it and it messes up the build slightly.
-
-2002-07-18  Ettore Perazzoli  <ettore@ximian.com>
-
-	* configure.in: Prepend "$(WERROR)" to all the *_CFLAGS variables
-	so you can do `make WERROR=-Werror' to turn all compiler warnings
-	into errors.
-
-2002-07-09  Peter Williams  <peterw@ximian.com>
-
-	* libversit/Makefile.am (privlib_LIBRARIES): Install libversit.a so
-	that people compiling against the addressbook can do so successfully.
-
-	* Makefile.am: create our *Conf.sh files and dist them and install
-	them.
-
-	* configure.in: Define and subst some variables that the Conf.sh
-	file need.
-	
-2002-07-10  Peter Williams  <peterw@ximian.com>
-
-	* configure.in (privlibdir): Define a versioned library directory
-	that we can use for things that are ABI-sensitive: camel
-	providers, importers... Define camel_providerder in terms of this,
-	resulting in a new location for the providers. Camel will have to
-	be rebuilt for it to get the new -D flag.
-
-2002-07-12  Peter Williams  <peterw@ximian.com>
-
-	* configure.in (E_UTIL_LIBS): e-util relies on bonobo-conf
-	in e-passwords.c and e-categories-master-list-wombat.c, so
-	reflect that here. And the e-port code needs THREADS_LIBS.
-
-2002-07-09  Peter Williams  <peterw@ximian.com>
-	
-	* tools/Makefile.am (INCLUDES): Add include lines to get
-	ebook headers relative to <ebook/foo.h>, not "foo.h".
-
-2002-07-09    <jpr@ximian.com>
-
-	* configure.in: re-order nss and nspr flags
-
-2002-07-03  Peter Williams  <peterw@ximian.com>
-
-	* README: Fix the URL for the DB 3.1.17 package; it's moved.
-
-2002-06-28  Ettore Perazzoli  <ettore@ximian.com>
-
-	[As suggested by #24466.]
-
-	* data/evolution.desktop.in (Categories): Added.
-
-2002-06-27  Dan Winship  <danw@ximian.com>
-
-	* libversit/Makefile.am: Hack around a libtool/make problem that
-	was causing libversit.a to be rebuilt at "make install" time,
-	causing further relinking down the line.
-
-2002-06-18  JP Rosevear  <jpr@ximian.com>
-
-	* configure.in: check for libsoftokn3 if we couldn't link the
-	first time
-
-2002-06-14  Chris Toshok  <toshok@ximian.com>
-
-	* libversit/vobject.c (unUseStr): fix a braindead typo that caused
-	us to leak strings in certain circumstances (when the string being
-	freed was second in the list, the head of the list would get
-	lost.)
-
-2002-06-05  Christopher James Lahey  <clahey@ximian.com>
-
-	* configure.in: Changed the required version of gal to 0.19.99.17.
-
-2002-06-04  Christopher James Lahey  <clahey@ximian.com>
-
-	* configure.in: Changed the required version of gal to 0.19.99.16.
-
-2002-06-02  Larry Ewing  <lewing@ximian.com>
-
-	* configure.in: require gtkhtml-1.1.1.1 aka multicite branch.
-
-2002-05-14  Dan Winship  <danw@ximian.com>
-
-	* data/evolution.1: Document "evolution default:mail"
-
-2002-05-08  Ettore Perazzoli  <ettore@ximian.com>
-
-	* README: Add an explanation/warning about why we want Berkeley DB
-	3.1.17 and nothing else.
-
-2002-04-28  Larry Ewing  <lewing@ximian.com>
-
-	* configure.in: require gtkhtml-1.1.1.
-
-2002-04-29  Christopher James Lahey  <clahey@ximian.com>
-
-	* configure.in (EVO_CHECK_LIB): Bumped the required version number
-	of gal to 0.19.99.15.
-
-2002-04-26  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* configure.in: Don't generate libibex/Makefile anymore.
-
-	* Makefile.am: Removed libibex from SUBDIRS.
-
-	* tools/Makefile.am: Don't link with libibex.
-
-	* tests/Makefile.am: Same here.
-
-2002-04-22  Christopher James Lahey  <clahey@ximian.com>
-
-	* configure.in: Require gal 0.19.99.14.
-
-2002-04-17  Ettore Perazzoli  <ettore@ximian.com>
-
-	* configure.in: Require GAL 0.19.99.13.
-
-2002-04-17  Christopher James Lahey  <clahey@ximian.com>
-
-	* configure.in: Bumped required gal version number to 0.19.99.12.
-
-2002-04-17  Christopher James Lahey  <clahey@ximian.com>
-
-	* configure.in: Bumped required gal version number to 0.19.99.11.
-
-2002-04-16  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* configure.in: Add checks for gethostbyaddr_r
-
-2002-04-14  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* configure.in: Check for socklen_t and if it doesn't exist,
-	define it as unsigned int.
-
-2002-04-04  JP Rosevear  <jpr@ximian.com>
-
-	* configure.in: Fix static linking on solaris which doesn't have a
-	static libresolv.
-
-2002-04-01  Chris Toshok  <toshok@ximian.com>
-
-	* libversit/vobject.c (newStrItem): only include if USE_STRTBL is
-	defined.
-	(deleteStrItem): same.
-	(hashStr): same.
-	(lookupStr): if USE_STRTBL is defined, use existing behavior.  if
-	not defined, just dup the string.
-	(unUseStr): if USE_STRTBL is defined, use existing behavior.  if
-	not defined, just free the string.
-
-2002-04-01  Dan Winship  <danw@ximian.com>
-
-	Darwin/OS X portability from Max Horn <max@quendi.de>
-
-	* libversit/vcc.y: Remove #include <malloc.h>.
-
-	* libversit/vobject.c: Likewise, and #include <stdlib.h>
-
-2002-03-30  Ettore Perazzoli  <ettore@ximian.com>
-
-	* configure.in: Add argument `--enable-shlib-components'.  New
-	substitutions OAF_SHLIB_LOCATION, OAF_SHLIB_PREFIX,
-	OAF_SHLIB_SUFFIX.
-
-2002-03-29  Ettore Perazzoli  <ettore@ximian.com>
-
-	* configure.in: Check for GConf.  Add gthreads to LIBIBEX_CFLAGS
-	and LIBIBEX_LIBS.
-
-2002-03-28  Christopher James Lahey  <clahey@ximian.com>
-
-	* configure.in: Bumped the required version of gal to 0.19.99.10.
-
-2002-03-24  Peter Williams  <peterw@ximian.com>
-
-	* tools/killev: Change the OAFIID for the GtkHTML editor to
-	have :1.1 at the end.
-
-2002-03-19  Dan Winship  <danw@ximian.com>
-
-	* tools/Makefile.am (evolution_addressbook_import_LDADD):
-	s/libversit.la/libversit.a/
-
-2002-03-13  Chris Toshok  <toshok@ximian.com>
-
-	* configure.in (EVOLUTION_ADDRESSBOOK_DEPS): add gal.
-
-2002-03-12  Christopher James Lahey  <clahey@ximian.com>
-
-	* configure.in: Bumped the required version of gal.
-
-2002-03-06  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* configure.in: Allow the user to enable OpenSSL over Mozilla NSS
-	using --enable-openssl or --disable-nss.
-
-2002-02-24  jacob berkman  <jacob@ximian.com>
-
-	* sounds/Makefile.am (EXTRA_DIST): add $(sounds_DATA)
-
-2002-02-22  Larry Ewing  <lewing@ximian.com>
-
-	* configure.in: add libglade the to the E_UTIL flags.
-
-2002-02-13  Christopher James Lahey  <clahey@ximian.com>
-
-	* configure.in: Bumped the required version of gal.
-
-2002-02-12  T�ivo Leedj�rv  <leedjarv@interest.ee>
-
-	* configure.in: Added et to ALL_LINGUAS.
-
-2002-02-09  JP Rosevear  <jpr@ximian.com>
-
-	* configure.in: make sure PISOCK cflags are added where
-	appropriate
-
-2002-02-08  Damon Chaplin  <damon@ximian.com>
-
-	* Makefile.am (SUBDIRS): added sounds.
-
-	* configure.in (AC_OUTPUT): added sounds/Makefile.
-
-	* sounds/Makefile.am: new file.
-	* sounds/default_alarm.wav: default alarm sound, currently only used
-	when vCalendar files are imported with audio alarms. We need a better
-	sound.
-
-2002-02-07  Christopher James Lahey  <clahey@ximian.com>
-
-	* configure.in: Bumped the required version of gal.
-
-2002-01-28  Radek Doulik  <rodo@ximian.com>
-
-	* configure.in: added bonobo to filter flags to avoid compile
-	error
-
-2002-01-27  Ettore Perazzoli  <ettore@ximian.com>
-
-	* tools/Makefile.am: Use GNOME_FULL_LIBS and GNOME_FULL_CFLAGS.
-
-	* configure.in: Define the CAMEL_{CFLAGS,LIBS} using
-	EVO_SET_COMPILE_FLAGS.  Likewise define E_UTIL_{CFLAGS,LIBS},
-	E_NAME_{CFLAGS,LIBS}, SHELL_{CFLAGS,LIBS},
-	IMPORTERS_{CFLAGS,LIBS}, WOMBAT_{CFLAGS,LIBS} and
-	E_WIDGETS_{CFLAGS,LIBS}, LIBFILTER_{CFLAGS,LIBS}.  Remove
-	GAL_{LIBS,CFLAGS}.  Add GNOME_FULL_{CFLAGS,LIBS}.  Also, move all
-	this stuff after OpenSSL check so they benefit from all the
-	cflags/ldflags discoveries for the support libraries.
-
-2002-01-25  Ettore Perazzoli  <ettore@ximian.com>
- 
-	* configure.in: Require gal 0.19.99.1.
-
-2002-01-24  Ettore Perazzoli  <ettore@ximian.com>
-
-	* configure.in: Define a new macro EVO_SET_COMPILE_FLAGS.  Define
-	EVOLUTION_ADDRESSBOOK_CFLAGS, EVOLUTION_ADDRESSBOOK_LIBS,
-	EVOLUTION_ADDRESSBOOK_CONDUIT_CFLAGS,
-	EVOLUTION_ADDRESSBOOK_CONDUIT_LIBS, EVOLUTION_SUMMARY_LIBS,
-	EVOLUTION_SUMMARY_CFLAGS, EVOLUTION_CALENDAR_LIBS,
-	EVOLUTION_CALENDAR_CFLAGS, EVOLUTION_CALENDAR_CONDUIT_LIBS,
-	EVOLUTION_CALENDAR_CONDUIT_CFLAGS through it.  Remove SOUP_CFLAGS
-	and SOUP_LIBS.
-
-2002-01-15  Iain Holmes  <iain@ximian.com>
-
-	* configure.in: Add a check for libsoup. Define SOUP_CFLAGS and 
-	SOUP_LIBS
-
-	* README: Update to include the SOUP dependancy.
-
-2002-01-04  Pablo Saratxaga  <pablo@mandrakesoft.com>
-
-        * configure.in: Added "eu" to ALL_LINGUAS
-
-2001-12-17  Dan Winship  <danw@ximian.com>
-
-	* configure.in (camel_providerdir): Define this here, using only
-	EVOLUTION_MAJOR_VERSION and EVOLUTION_MINOR_VERSION (and not MICRO
-	and NANO).
-
-2001-12-13  Chris Toshok  <toshok@ximian.com>
-
-	* configure.in: check for alloca.h.
-
-2001-12-12  Ettore Perazzoli  <ettore@ximian.com>
-
-	[Fix #16358, No man page for Evolution.]
-
-	* data/Makefile.am (man_MANS): Install the man page.
-
-	* data/evolution.1: New man page for Evolution.
-
-2001-12-10  JP Rosevear  <jpr@ximian.com>
- 
-	* configure.in: use UTF-8 as the char set when testing pilot link
- 
-2001-12-11  Ettore Perazzoli  <ettore@ximian.com>
-
-	* data/evolution.desktop.in (_Name): "Ximian Evolution", not
-	"Evolution".
-
-2001-12-11  Ettore Perazzoli  <ettore@ximian.com>
-
-	* configure.in: Up VERSION to 1.1.0.99.
-
-2001-12-06  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* configure.in: s/PREVIEW_VERSION/VERSION_COMMENT
-
-2001-12-04  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* configure.in: Add a AC_DEFINE for PREVIEW_RELEASE which is a
-	string that will be appended to the X-Mailer header.
-
-2001-11-21  Jeffrey Stedfast  <fejj@ximian.com>
- 
-	* README: Updated. Don't say that the user needs to copy their
-	mozilla database files into ~/evolution, since Evolution now
-	builds it's own default database files if they don't exist and
-	also remove instructions for building with OpenSSL.
- 
-	* acconfig.h: Remove HAVE_OPENSSL define
- 
-	* configure.in: Remove checks for OpenSSL libraries.
- 
-2001-11-20  Wang Jian  <lark@linux.net.cn>
-
-	* configure.in(ALL_LINGUAS): Re-Added zh_CN. It is checked 
-	against gettext 0.10.40 and 0.10.35 without any problem. 
-	Please contact me if anyone wants to disable it (AGAIN).
-
-2001-11-19  Abel Cheung  <maddog@linuxhall.org>
-
-	* configure.in: I will keep adding zh_TW to ALL_LINGUAS before
-	  somebody is willing to tell me why it is deleted without
-	  reason. It was checked against newest gettext (0.10.40) and
-	  older gettext (0.10.35) without any problem. A few
-	  translations are not removed from ALL_LINGUAS even though
-	  they failed in msgfmt checking.
-
-2001-11-14  Ettore Perazzoli  <ettore@ximian.com>
-
-	* README: Updated.
-
-	* configure.in: 0.99.2.  Require gtkhtml 0.16.1 and GAL 0.18.1.
-
-2001-11-14  Ettore Perazzoli  <ettore@ximian.com>
-
-	* NEWS: Redone with the bug #s from Bugzilla.
-
-2001-11-14  Federico Mena Quintero  <federico@ximian.com>
-
-	* NEWS: Calendar/tasks NEWS.
-
-2001-11-13  JP Rosevear  <jpr@ximian.com>
-
-	* configure.in: restore cflags and ldflags properly
-
-2001-11-12  JP Rosevear  <jpr@ximian.com>
-
-	* configure.in: save the ldflags properly
-
-2001-11-09  JP Rosevear  <jpr@ximian.com>
-
-	* configure.in: Check to make sure pilot-link has the charset
-	conversion stuff enabled
-
-2001-11-09  Ettore Perazzoli  <ettore@ximian.com>
-
-	* tools/killev: Chop the output from `uname -s'.  Thanks to
-	Michael Gerdts for suggesting the fix.
-
-2001-11-09  Abel Cheung  <maddog@linux.org.hk>
-
-	* configure.in: Re-added zh_TW to ALL_LINGUAS. Translator keep
-	  complaining to me, and waste a month before discovering it was
-	  disabled while I know nothing about it. Please at least complain
-	  to me if it's gettext problem.
-
-2001-11-06  Ettore Perazzoli  <ettore@ximian.com>
-
-	* configure.in: Up to 0.99.1 for snapshot purposes.
-
-2001-11-05  Ettore Perazzoli  <ettore@ximian.com>
-
-	* configure.in: Upgrade version number to 0.99.0.  Require GtkHTML
-	0.16 and GAL 0.18.
-
-2001-11-05  JP Rosevear  <jpr@ximian.com>
-
-	* NEWS: Small update
-
-2001-11-05  Ettore Perazzoli  <ettore@ximian.com>
-
-	* NEWS: Updated.
-
-2001-10-31  Ettore Perazzoli  <ettore@ximian.com>
-
-	* data/evolution.desktop.in (Icon): evolution.png instead of
-	evolution-icon.png.
-
-2001-10-31  Ettore Perazzoli  <ettore@ximian.com>
-
-	* configure.in: Update version to 0.17.100.
-
-2001-10-31  JP Rosevear  <jpr@ximian.com>
-
-	* NEWS (Conduits): update
-
-2001-10-30  Ettore Perazzoli  <ettore@ximian.com>
-
-	* configure.in: Add oaf to MAILER_CFLAGS and MAILER_LIBS too.
-
-2001-10-30  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* NEWS (Mailer): Updated mailer NEWS.
-
-2001-10-30    <NotZed@Ximian.com>
-
-	* NEWS (Mailer): My mailer news.
-
-2001-10-30  Ettore Perazzoli  <ettore@ximian.com>
-
-	* configure.in: Add oaf to the BONOBO_VFS_GNOME_CFLAGS too.
-
-2001-10-30  Federico Mena Quintero  <federico@ximian.com>
-
-	* NEWS (Calendar): Calendar NEWS.
-
-2001-10-30  Ettore Perazzoli  <ettore@ximian.com>
-
-	* configure.in: Add oaf to the BONOBO_GNOME_LIBS,
-	BONOBO_GNOME_CFLAGS, BONOBO_HTML_GNOME_LIBS,
-	BONOBO_HTML_GNOME_CFLAGS.
-
-2001-10-30  Federico Mena Quintero  <federico@ximian.com>
-
-	* configure.in: Require GAL version 0.15.99.10.  I know you all
-	love this.
-
-2001-10-30  Radek Doulik  <rodo@ximian.com>
-
-	* configure.in: require gtkhtml version 0.15.99.2
-
-2001-10-29  Damon Chaplin  <damon@ximian.com>
-
-	* configure.in (ALL_LINGUAS): added en_AU (copied en_GB).
-
-2001-10-30  Christopher James Lahey  <clahey@ximian.com>
-
-	* configure.in: Require gal 0.15.99.9.
-
-2001-10-30  <notzed@ximian.com>
-
-	* configure.in: Move the configure version number check down
-	a bit for gtkhtml/gal, c'ause i'm sick of fixing a manual
-	patch i have every bloody time the version changes.
-
-2001-10-29  Joe Shaw  <joe@ximian.com>
-
-	* configure.in: Require gal 0.15.99.8
-
-	* addressbook/backend/ebook/e-card-simple.c,
-	addressbook/gui/component/addressbook-storage.c,
-	addressbook/gui/widgets/e-addressbook-view.c,
-	calendar/gui/e-calendar-table.c,
-	calendar/gui/e-itip-control.c,
-	calendar/gui/e-meeting-model.c,
-	calendar/gui/itip-utils.c,
-	calendar/gui/print.c,
-	calendar/gui/alarm-notify/alarm-notify-dialog.c,
-	filter/rule-editor.c,
-	mail/mail-config.c,
-	mail/mail-folder-cache.c,
-	mail/mail-format.c,
-	mail/mail-local.c,
-	mail/mail-ops.c,
-	mail/mail-vfolder.c,
-	shell/e-local-storage.c,
-	shell/e-summary-storage.c: Change includes of
-	e-util/e-unicode-i18n.h to gal/util/e-unicode-i18n.h
-
-	* e-util/Makefile.am: Don't build e-unicode-i18n.[ch] anymore.
-
-2001-10-29  Christopher James Lahey  <clahey@ximian.com>
-
-	* NEWS (Addressbook): Added my addressbook changes.
-
-2001-10-29  Ettore Perazzoli  <ettore@ximian.com>
-
-	* AUTHORS: Add Larry and Radek.
-
-2001-10-30  Radek Doulik  <rodo@ximian.com>
-
-	* configure.in: require gtkhtml version 0.15.99.1
-
-2001-10-29  Rodrigo Moya <rodrigo@ximian.com>
-
-	* configure.in: added calendar/importers/Makefile
-
-2001-10-29  Christopher James Lahey  <clahey@ximian.com>
-
-	* configure.in: Bumped required version of gal to 0.15.99.7.
-
-2001-10-28  JP Rosevear  <jpr@ximian.com>
-
-	* data/Makefile.am: no need to use destdir
-
-2001-10-27  Christopher James Lahey  <clahey@ximian.com>
-
-	* configure.in: Bumped required version of gal to 0.15.99.6.
-
-2001-10-27  Dan Winship  <danw@ximian.com>
-
-	* configure.in: Change the help string on "--enable-nntp" to
-	mention the fact that NNTP support is incomplete and unsupported.
-	If the user doesn't pass --enable-nntp, don't mention NNTP at all
-	in the summary at the end. Also, mention which SSL library is
-	being used when SSL support is enabled, and don't mention anything
-	about S/MIME since it doesn't work.
-
-2001-10-26  Ettore Perazzoli  <ettore@ximian.com>
-
-	* configure.in: GAL 0.15.99.5.
-
-2001-10-26  Kevin Breit  <mrproper@ximian.com>
-
-	* AUTHORS: Updated my email address.
-
-2001-10-26    <NotZed@Ximian.com>
-
-	* configure.in: Bump gal requirement.
-
-2001-10-23  Chris Toshok  <toshok@ximian.com>
-
-	* tools/killev: and add a way to get some more spew about the
-	commands we're executing.
-
-2001-10-23  Chris Toshok  <toshok@ximian.com>
-
-	* tools/killev: use eq instead of ==.
-
-2001-10-23  Christopher James Lahey  <clahey@ximian.com>
-
-	* configure.in: Bumped required GAL to 0.15.99.3 so EEntry's
-	"draw_button" argument can be used in
-	addressbook/gui/component/select-names/e-select-names.c.
-
-2001-10-22  Damon Chaplin  <damon@ximian.com>
-
-	* configure.in: bumped required GAL to 0.15.99.2.
-
-2001-10-22  Ettore Perazzoli  <ettore@ximian.com>
-
-	* acconfig.h: HAVE_KDE_APPLNK.
-
-	* configure.in (EVO_CHECK_LIB): AC_DEFINE `HAVE_KDE_APPLNK' in the
-	case in which the kde applnk dir is found.  Also fix the logic
-	with the checking so it doesn't get fooled.
-
-2001-10-22  JP Rosevear  <jpr@ximian.com>
-
-	* data/Makefile.am: include destdir in the path of the kde desktop
-	installation dir
-
-2001-10-20  Ettore Perazzoli  <ettore@ximian.com>
-
-	* data/Makefile.am [HAVE_KDE_APPLNK]: Install `evolution.desktop'
-	in the `KDE_APPLNK_DIR'.
-
-	* configure.in: New option `--with-kde-applnk-path'.  Define the
-	`HAVE_KDE_APPLNK' Automake conditional, and the `KDE_APPLNK_DIR'
-	value.
-
-2001-10-19  Dan Winship  <danw@ximian.com>
-
-	* tools/Makefile.am (EXTRA_DIST): Merge the two EXTRA_DIST
-	declarations together so they both happen.
-
-2001-10-18  Chris Toshok  <toshok@ximian.com>
-
-	* tools/killev: use a new fangled perl script that queries oaf for
-	interfaces we want to kill.
-
-2001-10-18  Christopher James Lahey  <clahey@ximian.com>
-
-	* configure.in: Bumped the required version of gal to 0.15.99.1
-	for use in evolution-addressbook-export.
-
-	* tools/.cvsignore: Added evolution-addressbook-clean,
-	evolution-addressbook-export, evolution-addressbook-import, and
-	.libs.
-
-	* tools/Makefile.am: Added evolution-addressbook-clean,
-	evolution-addressbook-export, and evolution-addressbook-import.
-
-	* tools/evolution-addressbook-clean.in: Main script to clean up
-	the local contact database.
-
-	* tools/evolution-addressbook-export.c: Exports the local
-	addressbook to the specified file
-	(--output-file).  If no --output-file is given, writes out to a
-	unique file in the /tmp directory.  In either case, prints the
-	filename to stdout.
-
-	* tools/evolution-addressbook-import.c: Imports the specified file
-	(--input-file) to the local addressbook.
-
-2001-10-18  Wang Jian  <lark@linux.net.cn>
-
-	* configure.in(ALL_LINGUAS): Added zh_CN for Simplified Chinese.
-
-2001-10-17  Christopher James Lahey  <clahey@ximian.com>
-
-	* NEWS (Addressbook): Wrote Addressbook news.
-
-2001-10-12  Chris Toshok  <toshok@ximian.com>
-
-	* tools/killev: kill evolution-ldif-importer.
-
-2001-10-11  Federico Mena Quintero  <federico@ximian.com>
-
-	* configure.in (AC_OUTPUT): Fix the order of the help/ subdirs.
-	These must be sorted as a preorder walk for a tree!
-
-2001-10-10  Ettore Perazzoli  <ettore@ximian.com>
-
-	* configure.in: 0.16.99.
-
-2001-10-10  Ettore Perazzoli  <ettore@ximian.com>
-
-	* configure.in: 0.16.  Require GtkHTML 0.15 or later and GAL 0.14
-	or later.  Also, make $with_nspr_includes default to
-	`/usr/include/nspr' instead of `/usr/include/mozilla' and
-	$with_nss_includes to `/usr/include/moznss' instead of
-	`/usr/include/mozilla'.
-
-2001-10-10  Ettore Perazzoli  <ettore@ximian.com>
-
-	* NEWS: Added info about the shell, plus some minor fixes for
-	consistency.
-
-2001-10-10  Christopher James Lahey  <clahey@ximian.com>
-
-	* NEWS (Addressbook): Updated.
-
-2001-10-09  Federico Mena Quintero  <federico@ximian.com>
-
-	* NEWS (Calendar): Calendar NEWS.
-
-2001-10-09    <NotZed@Ximian.com>
-
-	* NEWS (Mailer): Updated for beta 6.
-
-2001-10-09  Rodrigo Moya <rodrigo@ximian.com>
-
-	* configure.in: add libart to list of libraries to use in
-	EXTRA_GNOME_CFLAGS/LIBS, which is needed for latest libart versions
-
-2001-10-09  Ettore Perazzoli  <ettore@ximian.com>
-
-	* configure.in: AC_OUTPUT(default_user/local/Makefile) before
-	AC_OUTPUT()ing the other subdirs of `default_user/local'.  Fix
-	pointed out by Dmitry G. Mastrukov <dmitry@fitmark.net>.
-
-2001-10-07  Dan Winship  <danw@ximian.com>
-
-	* configure.in: Remove movemail check, since it's not relevant any
-	more.
-
-2001-10-05  Larry Ewing  <lewing@ximian.com>
-
-	* configure.in: Bumped required version of gtkhtml to 0.14.99.1
-
-2001-10-05  Christopher James Lahey  <clahey@ximian.com>
-
-	* configure.in: Bumped required version of gal to 0.13.99.1.
-
-2001-10-01  Aaron Weber <aaron@ximian.com>
-
-	* help/C/Makefile.am: removed an extraneous tab.
-	
-2001-10-01  Ettore Perazzoli  <ettore@ximian.com>
-
-	* configure.in: 0.15.99.
-
-2001-10-01  Ettore Perazzoli  <ettore@ximian.com>
-
-	* configure.in: 0.15.  Require gal 0.13 and gtkhtml 0.14.
-
-2001-10-01  Christopher James Lahey  <clahey@ximian.com>
-
-	* NEWS (Addressbook): Added more news.
-
-2001-09-30  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* configure.in (nspr_libs): Order the linkline to be the same as
-	the order in Mozilla (it is suggested that they be in this order).
-	(nss_libs): Same.
-
-2001-09-27  Dan Winship  <danw@ximian.com>
-
-	* configure.in: Remove references to the "compose" program, since
-	that functionality went into the shell.
-	(AC_OUTPUT): Sort and remove duplicates.
-
-	* cmdline/*: gone
-
-2001-09-26  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* configure.in: Added a flag to enable pedantic PGP/MIME - this is
-	not recommended for end-users. It is mostly meant for testing
-	purposes.
-
-2001-09-26  Chris Toshok  <toshok@ximian.com>
-
-	* configure.in: make sure the solaris network libs get added to
-	the LDAP link line before we test for openldap.  Thanks to Frank
-	Belew for finding this.
-
-2001-09-22  Christopher James Lahey  <clahey@ximian.com>
-
-	* configure.in: Bumped the required version of gal to 0.12.99.0.
-
-2001-09-21  Nat Friedman  <nat@ximian.com>
-
-	* configure.in (EVOLUTION_MICRO_VERSION): Changed to 99.
-	(VERSION): Added ".$EVOLUTION_MICRO_VERSION" suffix.
-
-2001-09-21  Ettore Perazzoli  <ettore@ximian.com>
-
-	* configure.in: Bump version to 0.14.  Depend on gal >= 0.12,
-	gtkhtml >= 0.13.
-
-2001-09-21  Michael Zucchi  <NotZed@Ximian.com>
-
-	* NEWS (Mail): Updated.
-
-2001-09-21  Christopher James Lahey  <clahey@ximian.com>
-
-	* NEWS (Addressbook): Added more NEWS items here.
-
-2001-09-19  JP Rosevear  <jpr@ximian.com>
-
-	* configure.in: Remove dead directory from AC_OUTPUT
-
-2001-09-16  Christopher James Lahey  <clahey@ximian.com>
-
-	* configure.in: Updated required version of gal to 0.11.99.4.
-
-2001-09-14  JP Rosevear  <jpr@ximian.com>
-
-	* configure.in: remove unneeded conditionals
-
-2001-09-13  Yanko Kaneti  <yaneti@declera.com>
-
-	* configure.in (ALL_LINGUAS): Added bg to ALL_LINGUAS.
-
-2001-09-13  Larry Ewing  <lewing@ximian.com>
-
-	* data/evolution.mime: override the gnome-vfs.mime to match .vcf
-	as text/x-vcard.
-
-2001-09-11  JP Rosevear  <jpr@ximian.com>
-
-	* configure.in: temporarily disable zh_TW
-
-2001-09-10  Abel Cheung  <maddog@linux.org.hk>
-
-	* configure.in: Added "zh_TW" to ALL_LINGUAS.
-
-2001-09-07  Dan Winship  <danw@ximian.com>
-
-	* configure.in: one-line OpenSSL fix from Yanko Kaneti
-	<yaneti@declera.com>
-
-2001-09-05  Ettore Perazzoli  <ettore@ximian.com>
-
-	* README: Updated slightly.
-
-2001-09-04  Ettore Perazzoli  <ettore@ximian.com>
-
-	[Fixes by Neil Conway <neilconway@home.com, as per #8090.]
-
-	* configure.in: Fix the error message if scrollkeeper is not found.
-
-	* README: A bunch of minor fixes, tweaks and cleanups.
-
-2001-09-04  Ettore Perazzoli  <ettore@ximian.com>
-
-	[Fix #8089, Undocumented Scrollkeeper dependency.]
-
-	* README: Add scrollkeeper 0.1.4 to the list of dependencies.
-
-2001-09-04  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* configure.in: Only check for OpenSSL if we were not able to find
-	Mozilla's NSS libraries.
-
-2001-09-04  Peter Williams  <peterw@ximian.com>
-
-	* omf-install/Makefile.am (install-data-local): Don't put
-	$(srcdir) in the file path twice.
-
-2001-09-01  Christopher James Lahey  <clahey@ximian.com>
-
-	* configure.in: Bumped the required version of gal to 0.11.99.2.
-
-2001-08-31  Zbigniew Chyla  <cyba@gnome.pl>
-
-	* configure.in: Bumped required version of GAL to 0.11.3
-	(for g_utf8_collate)
-
-2001-08-24  Ettore Perazzoli  <ettore@ximian.com>
-
-	[Patch from Nike Gerdts <michael.gerdts@usa.alcatel.com> for
-	#6882, DB3_CFLAGS and DB3_LDFLAGS order messes up CPPFLAGS and
-	LDFLAGS.]
-
-	* configure.in: Put DB3_CFLAGS before the already-defined CPPFLAGS
-	instead of after them; likewise, put DB3_LDADD before the already
-	defined LDADD.
-
-2001-08-24  Dan Winship  <danw@ximian.com>
-
-	* configure.in: We don't need to check for both bonobo-conf 0.11
-	AND bonobo-conf 0.2.
-
-2001-08-22  Ettore Perazzoli  <ettore@ximian.com>
-
-	* configure.in: 0.13.99.
-
-2001-08-22  Ettore Perazzoli  <ettore@ximian.com>
-
-	* configure.in: Bump requirements to GAL 0.11, bonobo-conf 0.11,
-	GtkHTML 0.12.  Don't autogen
-	`doc/devel/executive-summary/Makefile'.  Bump version number to
-	0.13.
-
-2001-08-21  Ettore Perazzoli  <ettore@ximian.com>
-
-	* NEWS (Global): Added.
-
-2001-08-21  Christopher James Lahey  <clahey@ximian.com>
-
-	* NEWS (Addressbook): Updated NEWS for addressbook.
-
-2001-08-21  Peter Williams  <peterw@ximian.com>
-
-	* NEWS (Mail): Updated some more.
-
-2001-08-21  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* NEWS: Updated.
-
-2001-08-20  Jon Trowbridge  <trow@ximian.com>
-
-	* configure.in: Require gal 0.10.99.5.
-
-2001-08-19  Aaron Weber  <aaron@ximian.com>
-
-	*Makefile.am: added "help" to subdirs.
-	
-2001-08-19  Chris Toshok  <toshok@ximian.com>
-
-	* omf-install/Makefile.am (scrollkeeper_localstate_dir) use
-	$(SCROLLKEEPER_LOCALSTATE_DIR), and not something based on
-	evolution's local state dir.  this should fix the core dumps
-	during install on freebsd and solaris.
-
-	* configure.in (GLIB_CONFIG): use $GLIB_CONFIG if it's set,
-	otherwise default to glib-config.  a cheap solution to get this
-	working on freebsd (where they have glib12-config, but not
-	glib-config.)  also, switch all `glib-config`s to `$GLIB_CONFIG`.
-	(SCROLLKEEPER_LOCALSTATE_DIR): use scrollkeeper-config to figure
-	this out, and AC_SUBST so omf-install/Makefile.am can use it.
-
-2001-08-17  Iain Holmes  <iain@ximian.com>
-
-	* Makefile.am: Move the libical compile order.
-
-2001-08-16  "Big Iain" Holmes  <iain@ximian.com>
-
-	* configure.in: Add widgets/e-timezone-dialog/Makefile
-
-2001-08-16  Jason Leach  <jleach@ximian.com>
-
-	* AUTHORS: I know what you did last summer!
-
-2001-08-16  Jon Trowbridge  <trow@ximian.com>
-
-	* configure.in: Require gal 0.10.99.3.
-
-2001-08-16  Kjartan Maraas  <kmaraas@gnome.org>
-
-	* README: Some info on adding --localstatedir to the configure
-	options.
-	* Makefile.am: Added omf-install to the build.
-	* configure.in: Adjust for the move of the user docs.
-	
-2001-08-15  Kjartan Maraas  <kmaraas@gnome.org>
-
-	* configure.in: Addded missing dirs to the build. Add checks for
-	scrollkeeper and jw to get the docs building on later Red Hat's.
-	* omf-install/*: Added this for integration with scrollkeeper.
-	
-2001-08-14  Dan Winship  <danw@ximian.com>
-
-	* configure.in (LDAP_LIBS): Remove an obvious typo reported by
-	Miles
-
-2001-08-11  Kjartan Maraas  <kmaraas@gnome.org>
-
-	* README: Be truthful about the versions of libs we need.
-	
-2001-08-10  Chris Toshok  <toshok@ximian.com>
-
-	* configure.in: if libldap.la is there, default to static linking
-	of openldap.  if it's not, default to dynamic.  also, provide
-	--with-static-ldap for users that want to override these defaults.
-
-2001-08-09  Chris Toshok  <toshok@ximian.com>
-
-	* configure.in: link statically with OpenLDAP.
-
-2001-08-09  Jon Trowbridge  <trow@ximian.com>
-
-	* configure.in: Require GAL 0.10.99.2.
-
-2001-08-09  Christopher James Lahey  <clahey@ximian.com>
-
-	* tools/killev: Added #!/bin/sh
-
-2001-08-08  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* configure.in: Don't link to libnssckbi3 when linking to nss.
-
-2001-08-08  JP Rosevear  <jpr@ximian.com>
-
-	* README: Update pilot information
-
-2001-08-07  Ettore Perazzoli  <ettore@ximian.com>
-
-	* configure.in: Require gal 0.10.99.1 or greater.
-
-2001-08-05  Ettore Perazzoli  <ettore@ximian.com>
-
-	[Fixes #5594, "killev doesn't kill all evolution processes".]
-
-	* tools/killev: Added bonobo-moniker-xmldb, gnome-gtkhtml-editor
-	and gnome-spell-component.
-
-2001-07-31  Ettore Perazzoli  <ettore@ximian.com>
-
-	* configure.in: Bump version number to 0.12.99.
-
-2001-07-31  Ettore Perazzoli  <ettore@ximian.com>
-
-	* configure.in: Ooops.  We want GAL >= 0.10.0 and GtkHTML >=
-	0.11.0.
-
-2001-07-31  Ettore Perazzoli  <ettore@ximian.com>
-
-	* configure.in: Remove `$EVOLUTION_MICRO_VERSION' from `VERSION'.
-	(EVO_CHECK_LIB): 
-
-2001-07-31  Ettore Perazzoli  <ettore@ximian.com>
-
-	* configure.in: Bump version number to 0.12.0.
-
-2001-07-31  Ettore Perazzoli  <ettore@ximian.com>
-
-	* NEWS: Added info about the shell changes and slightly changed
-	the formatting for the addressbook ones.
-
-	* configure.in: Require GtkHTML 0.10.0 and GAL 0.9.0.
-
-2001-07-31  Christopher James Lahey  <clahey@ximian.com>
-
-	* NEWS (Addressbook): Updated NEWS for addressbook.
-
-2001-07-31  Larry Ewing  <lewing@ximian.com>
-
-	* configure.in: bump required version of gtkhtml to 0.10.99.
-
-2001-07-20  JP Rosevear  <jpr@ximian.com>
-
-	* configure.in: Bump to 0.11.99
-
-2001-07-17  Dan Winship  <danw@ximian.com>
-
-	* configure.in: Fix up the "exactly version N" case of EVO_CHECK_LIB
-
-2001-07-16  Not Zed  <NotZed@Ximian.com>
-
-	* configure.in: Changed to use test -h instead of -L for checking
-	/var/mail vs /var/spool/mail
-
-2001-07-13  JP Rosevear  <jpr@ximian.com>
-
-	* NEWS: more updates
-
-2001-07-13  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* NEWS (Mail): Merged mine and Peter's entries.
-
-2001-07-12  JP Rosevear  <jpr@ximian.com>
-
-	* NEWS: Start new entry
-
-2001-07-11  Peter Williams  <peterw@ximian.com>
-
-	* acconfig.h: Add HAVE_BROKEN_SPOOL here.
-
-2001-07-10  Peter Williams  <peterw@ximian.com>
-
-	* configure.in (have_nss_includes): Fix nss include check to work.
-
-2001-07-11  Not Zed  <NotZed@Ximian.com>
-
-	* configure.in: Added option --with-broken-spool for solaris mbox
-	spool format.
-
-2001-07-10  Marius Andreiana  <mandreiana@yahoo.com>
-
-	* configure.in: Added ro (Romanian) to ALL_LINGUAS
-
-2001-07-05  Peter Williams  <peterw@ximian.com>
-
-	* configure.in (SYSTEM_MAIL_DIR): Make sure /var/mail
-	isn't a symbolic link such as on Red Hat 7.
-
-2001-07-05  Christopher James Lahey  <clahey@ximian.com>
-
-	* configure.in: Upped the required version of gal.
-
-2001-07-03  Dietmar Maurer  <dietmar@ximian.com>
-
-	* *: use bonobo-conf everywhere
-	
-2001-07-03  Damon Chaplin  <damon@ximian.com>
-
-	* configure.in (MAILER_LIBS):
-	(MAILER_CFLAGS): added bonobo_conf.
-
-2001-07-02  Christopher James Lahey  <clahey@ximian.com>
-
-	* configure.in: Made evolution depend on bonobo-conf 0.2.
-
-2001-07-02  Larry Ewing  <lewing@ximian.com>
-
-	* configure.in: Check for gtkhtml 0.9.99.1. 
-
-2001-07-02  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* configure.in: Check for libGal 0.8.99.7.
-
-2001-07-02  Peter Williams  <peterw@ximian.com>
-
-	* configure.in (evolution_db_version): s,AC_DEFINE,AC_DEFINE_UNQUOTED
-	to make these not totally useless.
-
-2001-07-01  Ettore Perazzoli  <ettore@ximian.com>
-
-	* Makefile.am (SUBDIRS): Build the composer after the addressbook,
-	as it needs some CORBA stuff from the latter.
-
-2001-06-30  Federico Mena Quintero  <federico@ximian.com>
-
-	* tools/killev: Added evolution-alarm-notify.
-
-2001-06-29  Ettore Perazzoli  <ettore@ximian.com>
-
-	* configure.in: Require GAL 0.8.99.6.
-
-2001-06-29  Ettore Perazzoli  <ettore@ximian.com>
-
-	* configure.in: Add `camel/tests/mime-filter/Makefile' to the
-	`AC_OUTPUT()' list.
-
-2001-06-27  Peter Williams  <peterw@ximian.com>
-
-	* configure.in (gal): Bump required gal version for new accessors
-	in ETree.
-
-2001-06-24  Chris Toshok  <toshok@ximian.com>
-
-	* configure.in: add addressbook/gui/contact-list-editor, and
-	correct path of contact-editor.
-
-2001-06-21  Rodrigo Moya <rodrigo@gnome-db.org>
-
-	* libwombat/: added new directory for the libwombat library, which
-	will contain the implementation of all CORBA interfaces defined
-	in the wombat.idl file
-
-2001-06-21  Dan Winship  <danw@ximian.com>
-
-	* configure.in: Fix the OpenLDAP check to default to "no" if you
-	don't specify anything.
-
-2001-06-20  Kevin Breit  <battery841@mediaone.net>
-
-	* docs/C/usage-sync: Reworded a little bit for more descrip.
-
-2001-06-20  Kevin Breit  <battery841@mediaone.net>
-
-	* doc/C/usage-calendar.sgml: Documented categorizing an event.
-
-2001-06-20  Kevin Breit  <battery841@mediaone.net>
-
-	* doc/C/usage-mail.sgml: Updated Bcc: example
-
-2001-06-20  Dan Winship  <danw@ximian.com>
-
-	* configure.in: Change --enable-ldap to --with-openldap, allow a
-	path prefix as an argument. Add some libtooly goodness to the
-	libldap check in case it depends on ssl libraries.
-
-2001-06-19  Dan Winship  <danw@ximian.com>
-
-	* configure.in: Tweak the db3 header check to like our RH7 build
-	machine again.
-
-2001-06-19  Christopher James Lahey  <clahey@ximian.com>
-
-	* libversit/vcc.y (LexBuf): Changed buf to an int here.
-	(lexGetQuotedPrintable): Changed cur to an int here.
-
-2001-06-18  Dan Winship  <danw@ximian.com>
-
-	* configure.in: Add "--with-db3" to fill in both
-	--with-db3-includes and --with-db3-libs. Make them get cached
-	properly so you don't need to specify it every time. Simplify some
-	code.
-
-	* acconfig.h: Add #defines for the current supported db3 version
-	so that when we change it we don't have to hunt all of them down
-
-2001-06-18  Dan Winship  <danw@ximian.com>
-
-	* configure.in: Check the modes on $system_mail_dir and set up
-	variables for camel/Makefile to make camel-lock-helper
-	setuid/setgid.
-
-2001-06-11  JP Rosevear  <jpr@ximian.com>
-
-	* configure.in: One slight db3 check correction
-
-2001-06-11  Chris Toshok  <toshok@ximian.com>
-
-	* configure.in: fix typo in -ldb3 check.
-
-2001-06-11  JP Rosevear  <jpr@ximian.com>
-
-	* configure.in: Update db3 configure checks for RedHat. /me beats
-	a sleeping cat to death
-
-2001-06-09  Christopher James Lahey  <clahey@ximian.com>
-
-	* configure.in: Bumped required version of gal to 0.8.99.2.
-
-2001-06-09  Christopher James Lahey  <clahey@ximian.com>
-
-	* configure.in: Added addressbook/gui/merging/Makefile.
-
-2001-06-08  Jason Leach  <jleach@ximian.com>
-
-	* my-evolution/Makefile.am (INCLUDES): builddir != srcdir fix.
-
-2001-06-08  Iain Holmes  <iain@ximian.com>
-
-	* Makefile.am: Byebye executive-summary, hello my-evolution
-
-	* configure.in: Remove all the executive-summary Makefiles. Add the
-	my-evolution.
-
-2001-06-08  Jon Trowbridge  <trow@ximian.com>
-
-	* AUTHORS: Vanity, thy name is trow.
-
-2001-06-05  JP Rosevear  <jpr@ximian.com>
-
-	* config.log: Bump version to 0.10.99
-
-2001-05-31  Christopher James Lahey  <clahey@ximian.com>
-
-	* README: Included information about db3.
-
-	* acconfig.h: Added HAVE_DB_H and HAVE_DB3_DB_H.
-
-	* configure.in: Added various checks for db3 libraries and
-	includes.  Of note are the new configure options
-	--with-db3-includes=PREFIX and --with-db3-libs=PREFIX to specify
-	the location for your db3 library.
-
-2001-05-31  Christopher James Lahey  <clahey@ximian.com>
-
-	* configure.in (GTKHTML_DATADIR): Use --moddatadir to derive this.
-
-2001-05-30  Dan Winship  <danw@ximian.com>
-
-	* configure.in: Bump gal dependency to 0.8.99.1
-
-2001-05-29  JP Rosevear  <jpr@ximian.com>
-
-	* README: update version requirements
-
-2001-05-23  Dan Winship  <danw@ximian.com>
-
-	* README: Remove reference to verify-evolution-install.sh since it
-	doesn't work any more.
-
-	* configure.in (EVO_CHECK_LIB): allow this to take a max version
-	too, mostly so we can bound the allowable gal versions for
-	releases, but also to require libxml < 2.0.
-	(OpenSSL): Fixicate to work on NetBSD (OpenSSL in /usr, no libdl).
-
-2001-05-23  Kjartan Maraas  <kmaraas@gnome.org>
-
-	* tools/killev: s/evolution-vcard-import/evolution-vcard-importer
-	
-2001-05-22  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* configure.in: Create MAILER_CFLAGS and MAILER_LIBS so that we
-	don't have the same libs multiple times in the libtool
-	command-line.
-
-2001-05-20  Duncan Mak  <duncan@ximian.com>
-
-	* tools/killev (sysname): Add in evolution-vcard-importer as part
-	of the list of processes to kill in killev.
-
-2001-05-18  Jon Trowbridge  <trow@ximian.com>
-
-	* Makefile.am (SUBDIRS): Changed build order.  Now addressbook
-	gets built before mail.
-
-2001-05-15  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* configure.in: Create CAMEL_CFLAGS and CAMEL_LIBS so that we
-	don't have to link in all sorts of unnecessary garbage from GNOME
-	that we don't need.
-
-2001-05-15  Chris Toshok  <toshok@ximian.com>
-
-	* tools/killev: add the importers.
-
-2001-05-14  Kevin Breit  <battery841@mediaone.net>
-
-	* doc/C/evolution-C.omf: added file for Scrollkeeper
-
-2001-05-09  Chris Toshok  <toshok@ximian.com>
-
-	* configure.in: add the nspr includes to the list of includes used
-	to test for NSS headers, and don't assume -lpthread in the
-	nss/nspr libs - use PTHREAD_LIB.
-
-2001-05-09  Iain Holmes  <iain@ximian.com>
-
-	* tools/killev: Added rdf-summary killing stuff from R Burton
-	(r.burton@180sw.com)
-
-2001-05-09  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* configure.in: OpenSSL LDFLAGS also needs to include -lcrypt
-
-2001-05-08  Iain Holmes  <iain@ximian.com>
-
-	* Makefile.am: Add the importers subdir.
-
-	* configure.in: Make the importers/Makefile
-
-2001-05-08  Christopher James Lahey  <clahey@ximian.com>
-
-	* configure.in: Bumped check for gal to 0.7.99.3.
-
-2001-05-04  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* acconfig.h: undef HAVE_SSL and HAVE_OPENSSL
-
-	* configure.in: Check for OpenSSL.
-
-2001-05-05  Gediminas Paulauskas <menesis@delfi.lt>
-
-	* configure.in: upped required gtkhtml version to 0.9.3, even that is
-	not enough for idl changes.
-	* README: you need LIB_XML_1_BRANCH. updated all version requirements
-	from configure.in
-
-2001-04-26  Ettore Perazzoli  <ettore@ximian.com>
-
-	* configure.in: Don't autogen
-	`executive-summary/widgets/Makefile', as that subdir doesn't get
-	distributed anymore.
-
-2001-04-26  Dan Winship  <danw@ximian.com>
-
-	* README: We no longer depend on libunicode.
-
-	* configure.in: Remove check for libunicode. Remove unicode cflags
-	and libs from all CFLAGS and LIBS variables. Add GAL_LIBS for
-	things that need to depend on just gal (for gunicode).
-
-	* configure.in: Check for gethostbyname_r so e_gethostbyname_r
-	will DTRT.
-	
-2001-04-24  Dan Winship  <danw@ximian.com>
-
-	* configure.in: Bump up the gal requirement
-
-2001-04-23  Ettore Perazzoli  <ettore@ximian.com>
-
-	* configure.in: Don't autogen the the Makefile for the importer
-	docs.
-
-	* Makefile.am (SUBDIRS): Build the docs last.
-
-2001-04-21  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* configure.in (have_nspr_libs): We need to link in more than just
-	libnspr4, we also need libpthread.
-	(have_nss_libs): Don't forget to add nsprlibs to the LDFLAGS.
-
-2001-04-21  Duncan Mak  <duncan@ximian.com>
-
-	* art/Makefile.am (images_DATA): Added in composer-message.png.
-
-2001-04-16  Ettore Perazzoli  <ettore@ximian.com>
-
-	* configure.in: `mail/importers/Makefile' must come after
-	`mail/Makefile'.
-
-2001-04-16  Ettore Perazzoli  <ettore@ximian.com>
-
-	* Makefile.am (SUBDIRS): Add `doc'.
-
-	* configure.in: Check for Editor.idl using `$GNOME_PATH' as well.
-
-2001-04-12  Christopher James Lahey  <clahey@ximian.com>
-
-	* configure.in: Updated the required version of gal to 0.6.99.0.
-
-2001-04-11  JP Rosevear  <jpr@ximian.com>
-
-	* configure.in: Check if gethostbyname_r take five params
-
-	* acconfig.h: add GETHOSTBYNAME_R_FIVE_ARGS 
-
-2001-04-10  Gediminas Paulauskas <menesis@delfi.lt>
-
-	* AUTHORS: /me is a translator.
-	* configure.in (EVO_CHECK_LIB): fail with AC_MSG_ERROR, not echo &&
-	exit 1.
-
-2001-04-10  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* configure.in (EVOLUTION_DIR): create the makefile in
-	camel/tests/smime
-
-2001-04-08  Chris Toshok  <toshok@ximian.com>
-
-	* tools/killev (sysname): add some more 16 character versions for
-	freebsd.
-
-2001-04-04  Kjartan Maraas  <kmaraas@gnome.org>
-
-	* AUTHORS: Brag.
-	
-2001-04-04  Gediminas Paulauskas <menesis@delfi.lt>
-
-	* art/evolution-today-mini.png: converted from exec-16-summary.xpm,
-	removed the latter.
-	* art/evolution-trash.png, art/evolution-trash-mini.png: images for
-	trash folder, one converted from deleted_message.xpm, another from mc.
-	* art/Makefile.am: install.
-
-2001-04-02  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* README (SSL): Remind users that they will currently have to copy
-	their cert database from their mozilla directory into ~/evolution.
-
-2001-04-01  Gediminas Paulauskas <menesis@delfi.lt>
-
-	* art/Makefile.am: added missing (new) files.
-
-2001-03-30  Dan Winship  <danw@ximian.com>
-
-	* configure.in (EVOLUTION_MICRO_VERSION): Bump this to 10. (We
-	forgot to do this before branching *again*...)
-
-2001-03-28  Dan Winship  <danw@ximian.com>
-
-	* README: add a bit mentioning that if configure claims you don't
-	have something installed when you think you do, that it's probably
-	because you installed it in the wrong prefix, or because you need
-	a -devel package.
-
-	* configure.in: Add a new macro EVO_CHECK_LIB that checks for a
-	gnome-config-based library of a given version or later, correctly,
-	and if doesn't find it, suggests that you consult the README. Fix
-	the various library checks to use this. Meanwhile, remove a bunch
-	of old cruft and reorganize a little.
-
-	* acconfig.h: Remove cruft
-
-2001-03-28  Jon Trowbridge  <trow@ximian.com>
-
-	* AUTHORS: In a burst of egomania, added myself.
-
-2001-03-26  Radek Doulik  <rodo@ximian.com>
-
-	* configure.in: create camel/misc/Makefile
-
-2001-03-22  Dan Winship  <danw@ximian.com>
-
-	* README: Update xml-i18n-tools version
-
-2001-03-22  Jakub Steiner <jimmac@ximian.com>
-
-	* art/new-message.xpm: file->new->mail message
-	* art/folder.xpm: file->new->folder
-	* art/new_appointment.xpm: file->new->appontment
-	* art/print-preview.xpm: file->print preview
-	* art/configure_16_calendar.xpm: for the tools menu
-
-2001-03-22  Jakub Steiner <jimmac@ximian.com>
-
-	* art/splash.png: move it a bit up so the icons fit better
-
-2001-03-22  Christopher James Lahey  <clahey@ximian.com>
-
-	* configure.in: Bumped gal requirement to 0.5.99.11.
-
-2001-03-22  Jakub Steiner <jimmac@ximian.com>
-
-	* art/configure_16_folder.xpm, configure_16_mail.xpm,
-	copy_16_message.xpm, edit.xpm, encrypt.xpm,
-	evo-16-address-conduit.png, evo-16-calendar-conduit.png,
-	evo-16-todo-conduit.png, exec-16-summary.xpm, import.xpm,
-	print.xpm, reply_to_all.xpm, reply.xpm, save.xpm,
-	send-receive.xpm, work_offline.xpm, find_contact.xpm,
-	send-24-receive.png, evo-48-calendar-conduit.png,
-	evo-48-todo-conduit.png, import.png, send-48-receive.png,
-	move_message.xpm, all_contacts.xpm, forward.xpm,
-	configure_16_addressbook.xpm, Makefile.am,
-	evo-48-address-conduit.png: renamed icons to make Miguel's
-	speedups possible
-	* art/evolution-inbox.png: color coded one
-	* art/envelope.png: reverted back to the non-color coded one
-	* art/evolution-contacts-plain.png: non-color coded one for
-	the "new contact" dialogue
-	
-2001-03-21  Dan Winship  <danw@ximian.com>
-
-	* configure.in: Require bison, not yacc (for vcc.y)
-
-2001-03-20  Miguel de Icaza  <miguel@ximian.com>
-
-	* art/Makefile.am (images_DATA): Added all the new icons to the
-	distribution.
-
-2001-03-20  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* configure.in: More fixes for NSPR and NSS checks - use fixed it
-	to use AC_CHECK_HEADERS instead of AC_CHECK_FILES. Also made it
-	not default the nspr lib path to /usr/lib/mozilla which may not be
-	in the user's library path when checking for nspr libs.
-
-2001-03-20  Jakub Steiner <jimmac@ximian.com>
-
-	* art/48_send-receive.png: send-receive for the s/r dialog
-	* art/24_send-receive.png: send-receive to replace the
-	fetch-mail-doggie
-	* art/16_send-receive.xpm: send-receive for (future) menu
-	item
-	* art/16_import.xpm: for the file menu
-	* art/16_work_offline.xpm: for the file menu
-	* AUTHORS: so I can show off
-	* art/splash.png: making radek famous ;)
-	* art/envelope.png, evolution-calendar.png, evolution-contacts.png, 
-	evolution-tasks.png, evolution-today.png: 
-	 new concept of color coded apps:
-	    - mailer: 		#efb43e
-	    - calendar:		#bab5ab
-	    - contacts: 	#9794ab
-	    - tasks:		#6e9e6e
-	    - exec. summary:	#c4757e
-	
-2001-03-19  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* configure.in: Fix ettore's fix ;-)
-
-2001-03-19  Christopher James Lahey  <clahey@ximian.com>
-
-	* configure.in: Bumped gal requirement to 0.5.99.8.
-
-2001-03-19  Ettore Perazzoli  <ettore@ximian.com>
-
-	* configure.in: Make sure we never define `NSPR_CFLAGS' or
-	`NSS_CFLAGS' as just "-I".
-
-2001-03-19  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* NEWS: pulled from the 0.9 release.
-
-2001-03-18  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* configure.in: Updated the checks for NSS and NSPR
-
-2001-03-16  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* README: Added directions on how to build with SSL support.
-
-	* configure.in: Updated the checks for NSS and NSPR
-
-2001-03-16  Jakub Steiner <jimmac@ximian.com>
-
-	* art/48_import.png: for the import druid
-
-2001-03-15  Dan Winship  <danw@ximian.com>
-
-	* configure.in: Bump gal requirement to 0.5.99.7
-
-2001-03-15  Gediminas Paulauskas <menesis@delfi.lt>
-
-	* configure.in: create doc/devel/executive-summary/Makefile
-	* evolution.png: moved to art/.
-	* evolution.desktop: moved to data/.
-	* Makefile.am: reflect those moves.
-	* art/*.xpm: moved 8 files from calendar/gui here.
-	* art/Makefile.am: added moved files.
-	distribute *.xpm, install *.png and *view.xpm.
-
-2001-03-12  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* configure.in: Updated to AC_SUBST the NSPR/NSS flags.
-
-2001-03-14  Dan Winship  <danw@ximian.com>
-
-	* README: Pull up some of the clarifications from the 0.9 branch
-
-2001-03-13  Chris Toshok  <toshok@ximian.com>
-
-	* configure.in: add -lresolv to LDAP_LIBS if it's there.
-
-2001-03-13  Iain Holmes  <iain@ximian.com>
-
-	* configure.in: Added the mail/importers dir.
-
-2001-03-12  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* README: Rearranged some of the dependencies to try to get them
-	into a more correct order (needed for people building all of these
-	packages by hand).
-
-2001-03-12  JP Rosevear  <jpr@ximian.com>
-
-	* README: Update
-
-2001-03-09  Dan Winship  <danw@ximian.com>
-
-	* configure.in (EVOLUTION_MICRO_VERSION): Hm... probably would be
-	clever to be calling this 0.9 rather than 0.8, since it's almost
-	0.10.
-
-2001-03-09  Christopher James Lahey  <clahey@ximian.com>
-
-	* libversit/vcc.y: Changed int to char when returning a character
-	from a stream (since it needs to be able to hold EOF.)
-
-2001-03-07  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* configure.in: Removed --enable-assbarn-security and replaced it
-	with the real options:
-	--with-nspr-includes=PREFIX
-	--with-nspr-libs=PREFIX
-	--with-nss=PREFIX
-
-	* acconfig.h: #undef HAVE_NSS
-
-2001-03-07  Ettore Perazzoli  <ettore@ximian.com>
-
-	* configure.in: Require GAL 0.5.99.6 or later.
-
-2001-03-07  Kjartan Maraas  <kmaraas@gnome.org>
-
-	* shell/main: /* xgettext:no-c-format */ before the welcome
-	message.
-	* configure.in: Don't try to generate a Makefile in
-	camel/providers/vee as it's empty.
-	
-2001-03-05  JP Rosevear  <jpr@ximian.com>
-
-	* README: Update pilot instructions
-
-2001-03-05  Christopher James Lahey  <clahey@ximian.com>
-
-	* configure.in: Check for gal 0.5.99.4.
-
-2001-03-04  Dan Winship  <danw@ximian.com>
-
-	* configure.in: Reorganize a bit to get rid of warnings about
-	AC_TRY_COMPILE being used before AC_ISC_POSIX
-
-2001-03-04  Christopher James Lahey  <clahey@ximian.com>
-
-	* configure.in: Added views/addressbook/Makefile.
-
-2001-03-02  JP Rosevear  <jpr@ximian.com>
-
-	* art/Makefile.am: install conduit icons
-
-2001-03-02  Chris Toshok  <toshok@ximian.com>
-
-	* configure.in: add logic to make sure we're building against OpenLDAP >= 2
-
-2001-03-01  Christopher James Lahey  <clahey@ximian.com>
-
-	* Makefile.am (SUBDIRS), configure.in: Added views stuff.
-
-2001-03-01  Dan Winship  <danw@ximian.com>
-
-	* configure.in: Redo the Kerberos stuff again to deal with the
-	stuff currently on my machine. I think it should deal with both
-	the MIT and KTH versions of both krb4 and krb5 now.
-
-2001-03-01  Jakub Steiner <jimmac@ximian.com>
-
-	* art/48_evo-address-conduit.png: 48^2 version of the
-	addressbook pilot conduit. (for the new control center)
-	* art/16_evo-address-conduit.png: 16x16 version for current
-	gnomecc
-	* art/48_evo-todo-conduit.png: for new gnomecc
-	* art/16_evo-todo-conduit.png: for old gnomecc
-	* art/48_evo-calendar-conduit.png: for new gnomecc
-	* art/16_evo-calendar-conduit.png: for old gnomecc
-
-2001-03-01  Christopher James Lahey  <clahey@ximian.com>
-
-	* configure.in: Check for gal 0.5.99.2.
-
-2001-02-19  Christopher James Lahey  <clahey@ximian.com>
-
-	* configure.in: Check for gal 0.5.99.1.
-
-2001-02-15  Christopher James Lahey  <clahey@ximian.com>
-
-	* configure.in: Check for gal 0.5.99.0.
-
-2001-02-14  Dan Winship  <danw@ximian.com>
-
-	* various .cvsignore files: Ignore generated .oaf files
-
-2001-02-13  JP Rosevear  <jpr@ximian.com>
-
-	* art/Makefile.am: install new files
-
-	* art/*view.xpm: add files from calendar/gui
-
-2001-02-11  Chris Toshok  <toshok@ximian.com>
-
-	* configure.in: rework ldap check logic so it'll work to
-	--disable-ldap if you've previously configured with --enable-ldap.
-
-2001-02-11  Gediminas Paulauskas <menesis@delfi.lt> 
-
-	* data/evolution.keys, evolution.desktop: removed, they are generated.
-	* data/evolution.keys.in, evolution.desktop.in: new untranslated files.
-	* data/evolution.desktop: removed, it duplicates above. 
-	* Makefile.am, data/Makefile.am: reflect above changes, merge 
-	translations. 
-
-2001-02-09  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* configure.in: Added hacks to check for Mozilla libs like nspr
-	and nss that we will need for SSL and S/MIME.
-
-2001-02-09  Michael Meeks  <michael@ximian.com>
-
-	* configure.in: depend on bonobo >= 0.36
-
-2001-02-08  Christopher James Lahey  <clahey@ximian.com>
-
-	* configure.in: Upped the version number of gal required to 0.5.
-
-2001-02-07  JP Rosevear  <jpr@ximian.com>
-
-	* README: Update to latest requirements
-
-2001-02-05  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* .cvsignore: Added xml-* files.
-
-2001-02-05  Gustavo Maciel Dias Vieira  <gdvieira@zaz.com.br>
-
-	* configure.in (ALL_LINGUAS): Added pt_BR to ALL_LINGUAS.
-
-2001-02-04  Christopher James Lahey  <clahey@ximian.com>
-
-	* configure.in: Require version 0.4.99.8 of gal.
-
-2001-02-03  Federico Mena Quintero  <federico@ximian.com>
-
-	* configure.in: Make sure we have gnome-libs 1.2.9 or higher.
-
-2001-02-01  Chris Toshok  <toshok@ximian.com>
-
-	* configure.in: allow --enable/disable-ldap.
-
-2001-02-01  Jason Leach  <jasonleach@usa.net>
-
-	* tools/killev: Fix this script to make it work with Solaris.
-	Patch from Louise Miller.
-
-2001-01-29  Eskil Heyn Olsen  <eskil@eazel.com>
-
-	reviewed by: JP Rosevear  <jpr@ximian.com>
-
-	* acconfig.h:
-	Added the ENABLE_NNTP define
-	
-	* configure.in:
-	Fixed the NNTP m4 section.
-
-2001-01-29  Stanislav Visnovsky  <visnovsky@nenya.ms.mff.cuni.cz>
-
-	* configure.in: added sk to ALL_LINGUAS.
-	* evolution.desktop: added Slovak messages.
-
-2001-01-27  Jason Leach  <jasonleach@usa.net>
-
-	* configure.in (AC_OUTPUT): remove
-	widgets/shortcut-bar/Makefile from here.
-
-2001-01-25  Christopher James Lahey  <clahey@helixcode.com>
-
-	* configure.in: Upped the required version of gal in evolution.
-
-2001-01-25  Ettore Perazzoli  <ettore@ximian.com>
-
-	* art/Makefile.am (images_DATA): Add the missing .xpm files.
-
-2001-01-25  Ettore Perazzoli  <ettore@ximian.com>
-
-	* art/Makefile.am (images_DATA): Add `24_find_contacts.xpm',
-	`16_print_xpm', `16_configure_addressbook'.
-
-2001-01-25  Ettore Perazzoli  <ettore@ximian.com>
-
-	* art/Makefile.am (images_DATA): Add `24_all_contacts.xpm'.
-
-2001-01-24  Christopher James Lahey  <clahey@helixcode.com>
-
-	* configure.in: Upped the required version of gal in evolution.
-
-2001-01-22  Tuomas Kuosmanen  <tigert@ximian.com>
-
-	* art/splash.png: From the "Ideas from the shower" department:
-	new splash screen.
-
-2001-01-17  JP Rosevear  <jpr@ximian.com>
-
-	* README: Update package requirements
-
-2001-01-19  Jason Leach  <jasonleach@usa.net>
-
-	* configure.in: Changed a leftover $with_x_mailer to
-	$with_sub_version.  Made it so that if $with_sub_version isn't
-	specified, we don't try to output it, and also corrected the way
-	SUB_VERSION is defined.
-
-2001-01-18  Federico Mena Quintero  <federico@ximian.com>
-
-	* Makefile.am: Um, why was the doc directory removed from SUBDIRS?
-
-2001-01-17  Larry Ewing  <lewing@helixcode.com>
-
-	* configure.in (EVOLUTION_DIR): add the
-	doc/devel/importer/Makefile as a target.
-
-2001-01-17  Ettore Perazzoli  <ettore@ximian.com>
-
-	* acconfig.h: Add `SUB_VERSION', remove `XMAILER_VERSION'.
-
-	* configure.in: Removed `--with-x-mailer' option; replaced with a
-	more generic `--with-sub-version' option.  So, don't define
-	`X_MAILER'; instead, define `SUB_VERSION'.
-
-2001-01-16  Chris Toshok  <toshok@helixcode.com>
-
-	* configure.in: add --enable-nntp switch.  default is no.
-
-2001-01-16  Dan Winship  <danw@ximian.com>
-
-	* configure.in, acconfig.h: Add --with-x-mailer to set the version
-	string that appears in the X-Mailer header.
-
-2001-01-15  Christopher James Lahey  <clahey@ximian.com>
-
-	* configure.in: Changed the required version of gal.
-
-2001-01-15  Tuomas Kuosmanen  <tigert@ximian.com>
-
-	* art/16_copy_message.xpm, art/16_move_message.xpm: icons for the 
-	Message->Move/Copy to folder -menu entries.
-
-2001-01-15  Tuomas Kuosmanen  <tigert@ximian.com>
-
-	* art/evolution-calendar-mini.png: New version of calendar icon that
-	looks more like a calendar and not a dictionary or something :)
-
-	Btw, the icons get scaled for some reason, even though that is
-	not necessary as all of those should be 16x16 pixels. Can anyone look 
-	into this? 
-
-2001-01-15  Dietmar Maurer  <dietmar@ximian.com>
-
-	* *.c: changed the signature of the property_bag get/set
-	functions.
-
-2001-01-14  JP Rosevear  <jpr@ximian.com>
-
-	* configure.in: remove old config message
-
-2001-01-14  Damon Chaplin  <damon@helixcode.com>
-
-	* tools/evolution-move-tasks: new script to move tasks from the
-	Calendar folder to the new Tasks folder, so people won't lose tasks.
-	This can be deleted after a few releases.
-
-	* tools/Makefile.am (bin_SCRIPTS): added above.
-
-	* configure.in: added default_user/local/Tasks/Makefile to AC_OUTPUT.
-
-2001-01-12  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* config.h.in: Removed GPG stuff.
-
-	* acconfig.h: Take out all refs to PGP and GPG stuff.
-
-	* configure.in: Take out the PGP/GPG detection stuff.
-
-2001-01-12  Federico Mena Quintero  <federico@ximian.com>
-
-	* configure.in: Suggest what to do if gtk-doc is not found.
-
-2001-01-12  Christopher James Lahey  <clahey@helixcode.com>
-
-	* configure.in: Make evolution depend on the new version of gal.
-
-2001-01-12  Dan Winship  <danw@ximian.com>
-
-	* MAINTAINERS, AUTHORS, README: Ximianize. Also update the README
-	a bit and mention the OAF stable branch.
-
-2001-01-11  Dan Winship  <danw@helixcode.com>
-
-	* art/priority-high.xpm: Add a white outline around the "!" so it
-	still shows up clearly in selected rows when your theme selection
-	color is reddish. (Problem pointed out by Federico.)
-
-2001-01-11  Federico Mena Quintero  <federico@helixcode.com>
-
-	* configure.in: At the end of the configure process, report
-	whether the documentation files will be built or not.
-
-2001-01-10  Tuomas Kuosmanen  <tigert@helixcode.com>
-
-	* art/move-message.png, art/move-message.png: New versions.
-
-2001-01-09  Federico Mena Quintero  <federico@helixcode.com>
-
-	* configure.in (AC_OUTPUT): Added calendar/gui/alarm-notify/Makefile.
-
-2001-01-05  Tuomas Kuosmanen  <tigert@helixcode.com>
-
-	* art/evolution-contacts-mini.png: This looks more pretty.
-
-2001-01-03  Christopher James Lahey  <clahey@helixcode.com>
-
-	* configure.in: Removed camel/providers/mbox/Makefile and
-	camel/providers/mh/Makefile.
-
-2001-01-01  Michael Meeks  <michael@helixcode.com>
-
-	* configure.in: Require bonobo 0.31
-
-2000-12-24  Not Zed  <NotZed@HelixCode.com>
-
-	* configure.in: If we find threads ok, then always turn on
-	ENABLE_THREADS.
-
-2000-12-14  Christopher James Lahey  <clahey@helixcode.com>
-
-	* NEWS (Addressbook): Added a bit of addressbook NEWS.
-
-	* configure.in: Updated the gal check to require gal 0.4.
-
-2000-12-14  Christopher James Lahey  <clahey@helixcode.com>
-
-	* art/mail-new.xpm, art/mail-read.xpm, art/mail-replied.xpm: Moved
-	these images each up one pixel.
-
-2000-12-14  Jeffrey Stedfast  <fejj@helixcode.com>
-
-	* NEWS: Update.
-
-2000-12-14  JP Rosevear  <jpr@helixcode.com>
-
-	* NEWS: Update
-
-2000-12-14  Christopher James Lahey  <clahey@helixcode.com>
-
-	* art/splash.png: New splash from Jimmac.
-
-2000-12-12  Christopher James Lahey  <clahey@helixcode.com>
-
-	* README: Removed mention of ETable and EText in widgets
-	directory.
-
-2000-12-12  Dan Winship  <danw@helixcode.com>
-
-	* README: Mention the gconf stable branch.
-
-2000-12-07  Christopher James Lahey  <clahey@helixcode.com>
-
-	* configure.in: Updated the required version of gal.
-
-2000-12-07  Radek Doulik  <rodo@helixcode.com>
-
-	* configure.in (GTKHTML_LIBS): renamed HTMLEditor.idl to
-	Editor.idl
-
-2000-12-06  Kjartan Maraas  <kmaraas@gnome.org>
-
-	* data/evolution.keys: Added some Norwegian translations.
-	
-2000-12-06  Christopher James Lahey  <clahey@helixcode.com>
-
-	* configure.in: Increased the required version of gal.
-
-2000-12-05  JP Rosevear  <jpr@helixcode.com>
-
-	* README: minor tweak
-
-2000-12-05  Not Zed  <NotZed@HelixCode.com>
-
-	* configure.in: Added camel/tests/stream/Makefile.am.
-
-2000-12-01  Dan Winship  <danw@helixcode.com>
-
-	* README: gnome-vfs depends on gconf, so add that.
-
-2000-11-30  Jeffrey Stedfast  <fejj@helixcode.com>
-
-	* configure.in: Bumped required gal version to 0.2.99.4 for
-	e_str_make_safe.
-
-	* README: Added some necessary :'s in the pilot-link cvs stuff.
-
-2000-11-30  Gediminas Paulauskas <menesis@delfi.lt>
-
-	* calendar/gui/main.c, executive-summary/component/main.c, mail/main.c,
-	shell/main.c, notes/main.c,
-	addressbook/gui/component/addressbook-factory.c:
-	removed #ifdef ENABLE_NLS/#endif on Miguel's request.
-
-2000-11-29  JP Rosevear  <jpr@helixcode.com>
-
-	* README: Update pilot info
-
-2000-11-29  Dan Winship  <danw@helixcode.com>
-
-	* configure.in: Bump required gal version to 0.2.99.3 for iconv
-	changes
-
-2000-11-29  Federico Mena Quintero  <federico@helixcode.com>
-
-	* COPYING-DOCS: Added a copy of the GNU Free Documentation
-	License.
-
-	* Makefile.am (EXTRA_DIST): Added COPYING-DOCS.
-
-2000-11-28  JP Rosevear  <jpr@helixcode.com>
-
-	* acconfig.h: Add USE_FLOCK, USE_FCNTL, USE_FLOCK
-
-	* configure.in: Auto* magic for various camel locking types
-
-2000-11-28  Not Zed  <NotZed@HelixCode.com>
-
-	* configure.in (AC_OUTPUT): Added camel/tests/folder/Makefile
-
-2000-11-27  JP Rosevear  <jpr@helixcode.com>
-
-	* AUTHORS: Update - hopefully I assigned blame correctly :-)
-
-	* MAINTAINERS: ditto
-
-2000-11-27  JP Rosevear  <jpr@helixcode.com>
-
-	* configure.in: Correct the bonobo version error message
-
-	* README: Update
-
-2000-11-24  Not Zed  <NotZed@HelixCode.com>
-
-	* configure.in: Added camel/tests stuff to output macro.
-
-2000-11-14  Not Zed  <NotZed@HelixCode.com>
-
-	* configure.in: Added local provider dir to output macro.
-
-2000-11-21  Dan Winship  <danw@helixcode.com>
-
-	* configure.in: Check for libgpgme. (Support not added to mail
-	yet.)
-
-2000-11-21  Federico Mena Quintero  <federico@helixcode.com>
-
-	* configure.in (EVOLUTION_DIR): Removed the
-	default_user/local/Tasks/Makefile until the relevant files are on
-	CVS.
-
-2000-11-18  Miguel de Icaza  <miguel@helixcode.com>
-
-	* Added widgets/menus that contains the gal-view-menus.c code from
-	Gal that depended on Bonobo.
-
-	* configure.in: Update list of Makefiles;  
-
-	* widgets/Makefile.am: Update.
-
-2000-11-13  Christopher James Lahey  <clahey@helixcode.com>
-
-	* configure.in: Update the gal reqiurement version.
-
-2000-11-10  Michael Meeks  <michael@helixcode.com>
-
-	* configure.in: Require Bonobo >= 0.29, due to the XSync
-	fix.
-
-2000-11-09  Christopher James Lahey  <clahey@helixcode.com>
-
-	* configure.in: Require gal 0.2.99.1.
-
-2000-11-06  Jeffrey Stedfast  <fejj@helixcode.com>
-
-	* configure.in: Require gal 0.2.1.3
-
-2000-11-06  Dan Winship  <danw@helixcode.com>
-
-	* configure.in (GTKHTML_LIBS): ${prefix} doesn't get defaulted
-	until the end of configure, so check if it's "NONE" and use
-	${ac_default_prefix} if so.
-
-2000-11-06  Radek Doulik  <rodo@helixcode.com>
-
-	* configure.in (GTKHTML_LIBS): also look for HTMLEditor.idl in
-	${prefix}/share/gtkhtml
-
-2000-11-03  Radek Doulik  <rodo@helixcode.com>
-
-	* configure.in (BONOBO_HTML_GNOME_CFLAGS): raise required version
-	number to 0.8
-	added check for HTMLEditor.idl file
-
-2000-11-02  Christopher James Lahey  <clahey@helixcode.com>
-
-	* configure.in: Require gal 0.2.1.2.
-
-2000-11-02  Michael Meeks  <michael@helixcode.com>
-
-	* configure.in: Require Bonobo-0.27+
-
-2000-11-01  Gediminas Paulauskas  <menesis@delfi.lt>
-
-	* addressbook/ename/.cvsignore, addressbook/gui/minicard/.cvsignore,
-	calendar/doc/.cvsignore, widgets/e-paned/.cvsignore,
-	widgets/e-table/.cvsignore, widgets/e-text/.cvsignore: added these
-	files.
-	* calendar/gui/.cvsignore, composer/.cvsignore,
-	executive-summary/.cvsignore, executive-summary/component/.cvsignore,
-	po/.cvsignore: added some files to ignore.
-
-	* addressbook/gui/component/addressbook-factory.c, mail/main.c,
-	shell/main.c, calendar/gui/main.c, notes/main.c,
-	executive-summary/component/main.c: call *textdomain() only if
-	ENABLE_NLS is defined.
-
-2000-11-01  Gediminas Paulauskas  <menesis@delfi.lt>
-
-	* configure.in: added lt to ALL_LINGUAS.
-	
-2000-10-30  Dan Winship  <danw@helixcode.com>
-
-	* configure.in: fix up printing of kerberos configuration status
-
-2000-10-27  Christopher James Lahey  <clahey@helixcode.com>
-
-	* configure.in: Require gal cvs version.
-
-2000-10-27    <jpr@helixcode.com>
-
-	* tools/killev: Kill executive summary components
-
-2000-10-25  Iain Holmes  <iain@helixcode.com>
-
-	* configure.in: Added executive-summary stuff
-
-	* Makefile.am: Added the executive-summary subdirs.
-
-2000-10-23  Dan Winship  <danw@helixcode.com>
-
-	* notes/Makefile.am (INCLUDES): Update EVOLUTION_LOCALEDIR
-
-	* configure.in: set localedir here to use in Makefiles.
-	(AM_GNOME_GETTEXT doesn't actually always set it to
-	$(datadir)/locale).
-
-2000-10-23  Christopher James Lahey  <clahey@helixcode.com>
-
-	* configure.in: Updated the gal check to check for gal 0.2.1.
-
-2000-10-22  Robert Brady  <rwb197@zepler.org>
-
-	* configure.in: Added "en_GB" to ALL_LINGUAS.
-
-2000-10-20  Michael Meeks  <michael@helixcode.com>
-
-	* notes/component-factory.c (control_activate_cb): 
-
-2000-10-19  Christopher James Lahey  <clahey@helixcode.com>
-
-	* NEWS (General, Addressbook): Updated NEWS for addressbook and
-	ETable.
-
-2000-10-19  Christopher James Lahey  <clahey@helixcode.com>
-
-	* configure.in: Updated the gal check to check for gal 0.2.
-
-2000-10-19  Ettore Perazzoli  <ettore@helixcode.com>
-
-	* configure.in (EVOLUTION_MICRO_VERSION): 6.
-
-	* Makefile.am (EXTRA_DIST): Remove `evolution.spec.in'.
-	(dist-hook:): Removed.
-
-2000-10-18  Michael Meeks  <michael@helixcode.com>
-
-	* notes/component-factory.c (control_activate, control_deactivate),
-	(create_view): cripple, not worth updating to new UI code.
-
-2000-10-17  Tuomas Kuosmanen  <tigert@helixcode.com>
-
-	* art/splash.png: This looks happier than the dark piece of rusty
-	metal. And the Big Dig in Boston is ugly looking too. Finnish
-	road poles are much more cool!
-
-2000-10-15  Peter Williams  <peterw@helixcode.com>
-
-	* tools/verify-evolution-install.sh (libcamelvee): Check
-	for linkage against version 0.5 libcamelvee, not version 0.3.
-	This should track with the version of Evolution itself.
-	(rm -f $ldddfile): Remove a temporary file.
-
-2000-10-15  Kjartan Maraas  <kmaraas@gnome.org>
-
-	* configure.in: Added "nn" to ALL_LINGUAS.
-	
-2000-10-14  Ettore Perazzoli  <ettore@helixcode.com>
-
-	* art/Makefile.am (images_DATA): Add `splash.png'.
-
-2000-10-14  Tuomas Kuosmanen  <tigert@helixcode.com>
-
-	* art/splash.png: umm.. it's a splash screen image.
-
-2000-10-11  JP Rosevear  <jpr@helixcode.com>
-
-	* configure.in: Fix bonobo error message
-
-2000-10-11  Jesse Pavel		<jpavel@helixcode.com>
-
-	* data/evolution.keys: Added support for the text/calendar and
-	text/x-calendar MIME types.
-
-2000-10-10  Gediminas Paulauskas  <menesis@delfi.lt>
-
-	* configure.in: Added lt to ALL_LINGUAS.
-
-2000-10-10  Tuomas Kuosmanen  <tigert@helixcode.com>
-
-	* calendar/gui/recur.xpm: Updated round-we-go-thingy icon..
-
-2000-10-06  Chris Toshok  <toshok@helixcode.com>
-
-	* art/empty.xpm: make it transparent instead of white.
-
-2000-10-06  Christophe Merlet  <christophe@merlet.net>
-
-	* *.desktop: Added french strings.
-
-2000-10-05  Dan Winship  <danw@helixcode.com>
-
-	* tools/Makefile.am (EXTRA_DIST): Add verify-evolution-install.sh
-	to EXTRA_DIST
-
-2000-10-05  Jeffrey Stedfast  <fejj@helixcode.com>
-
-	* configure.in: Check for isblank
-
-	* config.h.in: 
-	* acconfig.h: #undef HAVE_ISBLANK
-
-2000-10-05  Michael Meeks  <michael@helixcode.com>
-
-	* configure.in: Bump Bonobo requirement to >= 0.20
-
-2000-10-05  Iain Holmes  <iain@helixcode.com>
-
-	* executive-summary/*: Added the executive summary stuff.
-
-	* ui/evolution-executive-summary.xml: New.
-
-	* art/add-service.png: New icon.
-
-2000-10-03  Matt Bissiri  <bissiri@eecs.umich.edu>
-
-	* ui/evolution-addressbook-ldap.xml,
-	* ui/evolution-addressbook.xml,
-	* ui/evolution-calendar.xml,
-	* ui/evolution-contact-editor.xml:
-	Fixed typo `_decr' -> `_descr', so some missing tooltips will appear.
-	Also fixed some typos in descr values.
-
-2000-09-29  Peter Williams  <peterw@helixcode.com>
-
-	* ui/Makefile.am (XML_FILES): Install the new evolution-subscribe.xml
-	file.
-
-2000-09-29  Chris Toshok  <toshok@helixcode.com>
-
-	* ui/evolution-mail.xml: add a Settings/Manage Subscriptions...
-	menu item.
-
-	* ui/evolution-subscribe.xml: add a File/Close menu item.
-
-2000-09-28  Chris Toshok  <toshok@helixcode.com>
-
-	* ui/evolution-subscribe.xml: add a FolderSearch control, and
-	change "Refresh" to "RefreshList".
-
-2000-09-27  Chris Toshok  <toshok@helixcode.com>
-
-	* ui/evolution-subscribe.xml: add an Refresh List button..
-
-2000-09-27  Chris Toshok  <toshok@helixcode.com>
-
-	* ui/Makefile.am (XML_FILES): add evolution-subscribe.xml.
-
-	* ui/evolution-subscribe.xml: new file.
-
-2000-09-25  Jeffrey Stedfast  <fejj@helixcode.com>
-
-	* ui/evolution-mail.xml: Moved the (un)select all menu items over
-	to the Edit menu - this looks nicer.
-
-2000-09-25  Jeffrey Stedfast  <fejj@helixcode.com>
-
-	* ui/evolution-mail.xml: Added some new menu items to the Message
-	menu like (un)select all and moved "mark as read" to the Message
-	menu.
-
-2000-09-25  Jeffrey Stedfast  <fejj@helixcode.com>
-
-	* configure.in: Moved addressbook/ename to e-util/ename so
-	generate e-util/ename/Makefile and don't generate
-	addressbook/ename/Makefile
-
-2000-09-23  Tuomas Kuosmanen  <tigert@localhost>
-
-	* art/attachment.xpm
-	* art/add-attachment.png: OOPS. The attachment.xpm was not the one 
-	I thought, so I accidentally replaced the paperclip icon in the mail
-	list column, which wasnt my intention. I hope this works now. The old 
-	one is back, instead the toolbar icon to add attachment is now called
-	"add-attachment.png" as you can see also from above. Bummer. Sorry :)
-
-2000-09-22  Christopher James Lahey  <clahey@helixcode.com>
-
-	* libversit/vcc.y: Fixed some warnings.  Fixed a bug where quoted
-	printable fields were reading in semi-colons that should have been
-	field separators.
-
-2000-09-22  Christopher James Lahey  <clahey@helixcode.com>
-
-	* ui/Makefile.am: Added evolution-addressbook-ldap.xml.
-
-	* ui/evolution-addressbook-ldap.xml: New file.  (A Variation on
-	evolution-addressbook.xml)
-
-	* ui/evolution-addressbook.xml: Added View All and Stop buttons.
-
-2000-09-21  Federico Mena Quintero  <federico@helixcode.com>
-
-	* ui/evolution-calendar.xml: Removed the AboutCalendar stuff.
-
-	* ui/evolution.xml: Fix mis-spelling of "calendar".
-
-2000-09-21  Michael Meeks  <michael@helixcode.com>
-
-	* notes/component-factory.c (control_activate): upd.
-
-2000-09-20  Christopher James Lahey  <clahey@helixcode.com>
-
-	* ui/.cvsignore: Added a cvsignore file here.
-
-2000-09-20  Christopher James Lahey  <clahey@helixcode.com>
-
-	* ui/Makefile.am (XML_FILES): Added evolution-contact-editor.xml.
-
-	* ui/evolution-contact-editor.xml: New file for the UI for the
-	evolution contact editor.
-
-2000-09-20  Tuomas Kuosmanen  <tigert@gimp.org>
-
-	* art/attachment.xpm
-	* art/send.png: new icons for "compose mail" dialog...
-
-2000-09-19  Dan Winship  <danw@helixcode.com>
-
-	* configure.in: alter the krb4 check a bit to deal with configure
-	cache suckage. (If you do AC_CHECK_LIB with the same library and
-	function name but different LDFLAGS, it will still use the result
-	of the previous check. So use a different function the second
-	time.)
-
-2000-09-18  Dan Winship  <danw@helixcode.com>
-
-	* README: add gal as a dependency
-
-2000-09-18  Jeffrey Stedfast  <fejj@helixcode.com>
-
-	* art/score-*.xpm: stupid looking icons for use with displaying
-	scores in the message-list view. These need a makeover BADLY ;-)
-
-2000-09-18  Christopher James Lahey  <clahey@helixcode.com>
-
-	* configure.in: Added check for gnome-app-lib.  Removed
-	directories that have been moved to gal.
-
-2000-09-15  Dan Winship  <danw@helixcode.com>
-
-	* configure.in, evolution.spec.in: remove spec file. We haven't
-	been keeping it up to date, and it's only good for RH anyway, and
-	if people really want a spec file they can get it from our SRPMs.
-
-2000-09-07  Michael Meeks  <michael@helixcode.com>
-
-	* configure.in: Require Bonobo 0.19
-
-2000-09-13  Christopher James Lahey  <clahey@helixcode.com>
-
-	* configure.in: Added widgets/e-reflow/Makefile.  Replaced
-	addressbook/gui/minicard/Makefile with
-	addressbook/gui/widgets/Makefile.
-
-2000-09-13  Tuomas Kuosmanen  <tigert@localhost>
-
-	* art/pin.png: added icon for the folder tree "pin down" button
-
-2000-09-12  JP Rosevear  <jpr@helixcode.com>
-
-	* NEWS (Calendar): Pilot stuff
-
-2000-09-12  Ettore Perazzoli  <ettore@helixcode.com>
-
-	* configure.in: The notes subdir isn't actually used, so remove
-	it.
-
-2000-09-12  Ettore Perazzoli  <ettore@helixcode.com>
-
-	* configure.in: 0.5.
-
-2000-09-12  Jeffrey Stedfast  <fejj@helixcode.com>
-
-	* NEWS (Mailer): Added Sent/Outbox feature descriptions
-
-2000-09-12  Dan Winship  <danw@helixcode.com>
-
-	* NEWS (Mailer): add most (but not all) 0.5 Mailer features
-
-	* configure.in: s/Sentbox/Sent/
-
-2000-09-12  Ettore Perazzoli  <ettore@helixcode.com>
-
-	* art/Makefile.am (buttonsdir): Install the new button icons into
-	`$(datadir)/images/evolution/buttons'.
-
-2000-09-11  Tuomas Kuosmanen  <tigert@helixcode.com>
-
-	* art/fetch-mail.png
-	* art/compose-message.png
-	* art/reply.png
-	* art/reply-to-all.png
-	* art/forward.png
-	* art/move-message.png
-	* art/copy-message.png: New icons for the main window toolbar
-
-2000-09-11  Christopher James Lahey  <clahey@helixcode.com>
-
-	* NEWS: Added 0.5 changes for ETable and Addressbook.
-
-2000-09-07  Dan Winship  <danw@helixcode.com>
-
-	* README: Add a mention of the verify-evolution-install.sh script
-	in tools/.
-
-2000-09-03  Jeffrey Stedfast  <fejj@helixcode.com>
-
-	Reversed my last change as it broke configure, how do I get it so
-	that we can do folders with spaces in the name!?
-
-2000-09-03  Jeffrey Stedfast  <fejj@helixcode.com>
-
-	* configure.in: Renamed default_user/local/Sentbox to
-	default_user/local/Sent\ Mail as Ettore and Danw are picky about
-	folder names 
-
-2000-09-02  Christopher James Lahey  <clahey@helixcode.com>
-
-	* configure.in: Added calendar/conduits/Makefile,
-	calendar/conduits/calendar/Makefile and
-	calendar/conduits/todo/Makefile to the list of makefiles to
-	output.
-
-2000-09-01  Jeffrey Stedfast  <fejj@helixcode.com>
-
-	* configure.in: Add default_user/local/Sentbox/Makefile to the
-	list of makefiles to output
-
-2000-08-31  Peter Williams  <peterw@helixcode.com>
-
-	* configure.in (kerberos): Check and see if krb_sendauth needs
-	prototyping. (#define NEED_KRB_SENDAUTH_PROTO). Also check
-	for a libkrb that doesn't need -ldes.
-
-	* acconfig.h: #undef it
-
-2000-08-30  Lauris Kaplinski  <lauris@helixcode.com>
-
-	* configure.in: AC_DEFINE(USING_GNOME_PRINT_0_20)
-
-	* acconfig.h: #undef that
-
-2000-08-30  Peter Williams  <peterw@helixcode.com>
-
-	* configure.in: Robustify the kerberos checks.
-
-2000-08-29  Dan Winship  <danw@helixcode.com>
-
-	* configure.in, acconfig.h: decruft
-
-2000-08-28  Jesus Bravo Alvarez  <jba@pobox.com>
-
-	* configure.in: Added Portuguese (pt) to ALL_LINGUAS
-
-2000-08-26  JP Rosevear  <jpr@helixcode.com>
-
-	* configure.in: Require oafized bonobo
-
-2000-08-24  Federico Mena Quintero  <federico@helixcode.com>
-
-	* configure.in: Ahem.  If you add dependencies on libraries, make
-	sure things still build.  Fixed the libunicode foo.
-
-2000-08-22  Lauris Kaplinski  <lauris@helixcode.com>
-
-	* widgets/e-text/e-text.c (_get_position_from_xy): Don't crash on illegal string
-
-2000-08-22  Lauris Kaplinski  <lauris@helixcode.com>
-
-	* widgets/e-text/e-text.c (e_text_event): Use e_utf8_from_gtk_event_key
-	to translate GDK_KEY_PRESS to insertable UTF-8 string
-
-2000-08-22  Christopher James Lahey  <clahey@helixcode.com>
-
-	* announcement-0.4.1.txt: Updated dependency list.
-
-2000-08-22  Lauris Kaplinski  <lauris@helixcode.com>
-
-	* widgets/e-text/e-text.c: Use byte based UTF-8 syntax
-	
-2000-08-22  Christopher James Lahey  <clahey@helixcode.com>
-
-	* announcement-0.4.1.txt: Announcement message
-
-2000-08-19  Mathieu Lacage <mathieu@gnu.org>
-
-	Fixes compile for non-standard prefixes. Mainly in idl
-	compilation where -I`gnome-config --datadir`/idl is replaced
-	by `gnome-config --cflags idl` (ugly but it works at least)
-	and add some random _CFLAGS here and there and _LIBS for linking.
-	* addressbook/gui/component/select-names/Makefile.am
-	* composer/Makefile.am
-	* e-util/Makefile.am
-	* filter/Makefile.am
-	* mail/Makefile.am
-	* shell/Makefile.am
-	* widgets/e-text/Makefile.am
-	
-
-2000-08-21  Christopher James Lahey  <clahey@helixcode.com>
-
-	* widgets/e-paned/e-hpaned.c, widgets/e-paned/e-paned.c,
-	widgets/e-paned/e-paned.h, widgets/e-paned/e-vpaned.c: Added code
-	to make handle position persist across resizes.
-
-2000-08-20  Christopher James Lahey  <clahey@helixcode.com>
-
-	* widgets/e-text/e-text.c: Fixed a warning.
-
-2000-08-20  arik devens  <arik@helixcode.com>
-
-	* widgets/e-text/Makefile.am (INCLUDES): added UNICODE_CFLAGS
-	support so that compiling in an alternate prefix works.
-
-2000-08-19  Lauris Kaplinski  <lauris@helixcode.com>
-
-	* widgets/e-text/e-text.h: Commented out Suckfont, added EFont
-	* widgets/e-text/e-text.c: Ported to UTF-8
-
-2000-08-18  Peter Williams  <peterw@helixcode.com>
-
-	* configure.in (gnome-vfs): Check for new enough gnome-vfs
-	(needs gnome_vfs_mime_get_default_action_without_fallback)
-
-2000-08-14  Federico Mena Quintero  <federico@helixcode.com>
-
-	* configure.in (AC_OUTPUT): Generate
-	doc/devel/calendar/cal-util/Makefile.
-
-2000-08-14  Peter Williams  <peterw@helixcode.com>
-
-	* configure.in: Check for db1/db.h too, which is what
-	RH 7.0 uses for the old db headers. Patch from Kenny Graunke
-	<kwg@teleport.com>
-
-2000-08-13  Chris Toshok  <toshok@helixcode.com>
-
-	* configure.in: offer --enable-pilot-conduits to add pilot
-	conduits if the user wants them.
-
-2000-08-13  Dan Winship  <danw@helixcode.com>
-
-	* configure.in: Fix the name of the binary to look for for PGP5
-
-2000-08-12  Michael Meeks  <michael@helixcode.com>
-
-	* configure.in: Check for Bonobo 0.17
-
-2000-08-12  Christopher James Lahey  <clahey@helixcode.com>
-
-	* configure.in: Added addressbook/gui/search/Makefile.
-
-2000-08-12  Dan Winship  <danw@helixcode.com>
-
-	* configure.in, README: Depend on gnome-vfs 0.3
-
-2000-08-10  Christopher James Lahey  <clahey@helixcode.com>
-
-	* widgets/e-text/.cvsignore, widgets/e-text/Makefile.am,
-	widgets/e-text/e-entry-test.c: Added a test for the EEntry widget.
-
-2000-08-09  Dan Winship  <danw@helixcode.com>
-
-	* data/evolution.keys: New file containing MIME keys for
-	Evolution. Currently just the addressbook minicard display.
-
-	* data/Makefile.am (mime_DATA): add evolution.keys
-
-2000-08-09  Peter Williams  <peterw@helixcode.com>
-
-	* configure.in (EVOLUTION_DIR): Remove the warning about camel-async.
-
-2000-08-08  Peter Williams  <peterw@helixcode.com>
-
-	* Makefile.am (SUBDIRS): Reenable the calendar. Oops.
-
-2000-08-05  Dan Winship  <danw@helixcode.com>
-
-	* tools/verify-evolution-install.sh: Look for oafinfo files in
-	oaf's prefix, not gnome-libs's. Allow binaries to be installed
-	anywhere in $PATH.
-
-	* configure.in, README: Update the README and the text of the
-	Bonobo configure check to match reality. Remove the 0.15 vs
-	0.15-and-a-half check since we require post-0.16 now.
-
-2000-08-03  JP Rosevear  <jpr@helixcode.com>
-
-	* configure.in: Remove gconf check
-
-2000-08-03 Alastair McKinstry <mckinstry@computer.org>
-
-	* configure.in (ALL_LINGUAS): Add Irish translation
-
-2000-08-02  Michael Meeks  <michael@helixcode.com>
-
-	* configure.in: update for BonoboX
-
-2000-08-02  Dan Winship  <danw@helixcode.com>
-
-	* configure.in (AC_OUTPUT): Add camel/providers/nntp
-
-2000-08-02  Christopher James Lahey  <clahey@helixcode.com>
-
-	* widgets/e-text/e-text.c: Made clicking choose the right
-	character even if show_borders is on.
-
-2000-08-01  Dan Winship  <danw@helixcode.com>
-
-	* configure.in, acconfig.h: Add checks for GPG, PGP 5 and PGP 2.
-	Only record the first one found.
-
-2000-08-01  Damon Chaplin  <damon@helixcode.com>
-
-	* configure.in (AC_OUTPUT): removed calendar/doc/*
-
-2000-08-01  Not Zed  <NotZed@HelixCode.com>
-
-	* configure.in: Added mh provider.
-
-2000-07-27  Dan Winship  <danw@helixcode.com>
-
-	* configure.in: Check for gconf_client_get_default (gconf 0.5 vs
-	newer)
-
-2000-07-26  Ettore Perazzoli  <ettore@helixcode.com>
-
-	* configure.in: Bump version number to 0.3.
-
-2000-07-26  Peter Williams  <peterw@helixcode.com>
-
-	* widgets/e-table/e-table-scrolled.c (right_click_proxy): Default
-	the return value to 0.
-
-2000-07-25  Dan Winship  <danw@helixcode.com>
-
-	* configure.in: some unrelated changes: check for mkdtemp,
-	gnome_vfs_mime_get_default_action_without_fallback, and a
-	setuid/setgid movemail binary.
-
-	* acconfig.h: add MOVEMAIL_PATH
-
-2000-07-25  Christopher James Lahey  <clahey@helixcode.com>
-
-	* configure.in: Added addressbook/conduit/Makefile.
-
-2000-07-21  Christopher James Lahey  <clahey@helixcode.com>
-
-	* widgets/e-text/e-text.c: Made focus in not change your selection
-	position.
-
-2000-07-21  Szabolcs BAN <shooby@gnome.hu>
-
-	* calendar/gui/event-editor.c: Typo fix
-
-2000-07-20  Peter Williams  <peterw@helixcode.com>
-
-	* configure.in (THREADS_CFLAGS): Make threads mandatory
-	again.
-
-2000-07-19  Fatih Demir	<kabalak@gmx.net>
-	
-	* evolution.desktop & data/evolution.desktop: Added
-		the Turkish desktop entries.
-
-2000-07-17  Federico Mena Quintero  <federico@helixcode.com>
-
-	* configure.in (EVOLUTION_DIR): Typo fix.
-
-	* configure.in (AC_OUTPUT): Added the doc/devel Makefiles.
-	(EVOLUTION_DIR): Substitute EVOLUTION_DIR for the top_srcdir.
-	Added checks for gtk-doc.
-
-2000-07-13  Peter Williams  <peterw@curious-george.helixcode.com>
-
-	* configure.in (end): Bigass warnings for camel-async branch
-	(remove them later).
-
-2000-07-12  Federico Mena Quintero  <federico@helixcode.com>
-
-	* configure.in: Make gnome-print-0.20 mandatory.  We will bail out
-	with CVS HEAD versions to avoid breakage.
-
-2000-07-10  Ettore Perazzoli  <ettore@helixcode.com>
-
-	* Version 0.2.
-
-	* configure.in: Reverse the GtkHTML check.
-
-2000-07-10  Jeffrey Stedfast <fejj@helixcode.com>
-
-	* configure.in: Updated to check for required GtkHTML and
-	gnome-print
-
-2000-07-10  Ettore Perazzoli  <ettore@helixcode.com>
-
-	* configure.in: Remove the conduits stuff for now.  They depend on
-	CVS gnome-pilot, and this is not good for the release.
-
-2000-07-10  Dan Winship  <danw@helixcode.com>
-
-	* README: updates
-
-2000-07-10  Seth Alves  <alves@hungry.com>
-
-	* configure.in: added makefiles for calendar conduits
-
-2000-07-10  Dan Winship  <danw@helixcode.com>
-
-	* configure.in: Add a check for Bonobo 0.15 vs Bonobo post-0.15
-
-2000-07-09  Christopher James Lahey  <clahey@helixcode.com>
-
-	* widgets/e-text/e-text.c: Don't draw quite as large a "flat_box".
-	If draw_borders is TRUE, cause the cursor to change even if not
-	editing.
-
-2000-07-09  Christopher James Lahey  <clahey@helixcode.com>
-
-	* widgets/e-text/e-entry.c: Removed some border padding and set
-	the "draw_borders" argument of the contained GtkText.
-
-	* widgets/e-text/e-text.c, widget/e-text/e-text.h: Added a
-	"draw_borders" argument which, if set, makes the EText look more
-	like a GtkEntry.
-
-2000-07-09  Tuomas Kuosmanen  <tigert@gimp.org>
-
-	* art/evolution-contacts.png: updated so it has better contrast
-	against the background.
-
-	* art/evolution-contacts-small.png: Fits the style of the new contacts
-	icon, this is a sigle card.
-
-2000-07-09  Christopher James Lahey  <clahey@helixcode.com>
-
-	* widgets/e-text/e-text-model.c (e_text_model_real_get_text):
-	Return "" instead of NULL.
-
-2000-07-07  Christopher James Lahey  <clahey@helixcode.com>
-
-	* art/Makefile.am: Fixed EXTRA_DIST for make distcheck.
-
-2000-07-07  Christopher James Lahey  <clahey@helixcode.com>
-
-	* widgets/e-text/e-entry.c: Set "anchor" and "fill_clip_rectangle"
-	arguments.
-
-	* widgets/e-text/e-text.c, widgets/e-text/e-text.h: Added
-	"fill_clip_rectangle" argument which describes whether to accept
-	clicks throughout the clipping rectangle.
-
-2000-07-07  Christopher James Lahey  <clahey@helixcode.com>
-
-	* widgets/e-text/e-entry.c: Fixed some typos.
-
-2000-07-07  Tuomas Kuosmanen  <tigert@gimp.org>
-
-	* art/evolution-contacts.png: Changed icon (hi ettore)
-	The old handshake one was a little too firm handshake..
-	this is a rolodex icon..
-
-2000-07-07  Dan Winship  <danw@helixcode.com>
-
-	* configure.in: make pthreads not required again, since they
-	aren't, and remove widgets/e-toolbar/Makefile from AC_OUTPUT since
-	that dir doesn't exist any more.
-
-2000-07-06  Chris Toshok  <toshok@helixcode.com>
-
-	* configure.in (AC_OUTPUT): remove the default_user Directories
-	dir.
-
-2000-07-06  Christopher James Lahey  <clahey@helixcode.com>
-
-	* Makefile.am, libical/configure.in: Fixed some make distcheck
-	errors.
-
-2000-07-05  Ettore Perazzoli  <ettore@helixcode.com>
-
-	* configure.in (GNOME_VFS_CFLAGS): Define.
-	(GNOME_VFS_LIBS): Define.
-
-2000-07-03  Ettore Perazzoli  <ettore@helixcode.com>
-
-	* configure.in: Add
-	`addressbook/gui/component/select-names/Makefile' to the
-	`AC_OUTPUT()' list.
-
-2000-07-03  Christopher James Lahey  <clahey@helixcode.com>
-
-	* widgets/e-text/Makefile.am: Added e-entry.c and e-entry.h.
-
-	* widgets/e-text/e-entry.c, widgets/e-text/e-entry.h: New files to
-	be a widget containing a text item.
-
-	* widgets/e-text/e-text.c: Fixed some spacing.
-
-2000-06-29  Ettore Perazzoli  <ettore@helixcode.com>
-
-	* notes/component-factory.c (owner_set_cb): Get an
-	EvolutionShellClient instead of an Evolution_Shell to match the
-	changes in libeshell.
-
-2000-06-29  Peter Williams  <peterw@helixcode.com>
-
-	* configure.in:  Re-enable GNOME_PILOT_CHECK.
-	Change AC_MSG_CHECKING([For...]) to [for...]. It's the little
-	things that matter.
-
-2000-06-28  Ettore Perazzoli  <ettore@helixcode.com>
-
-	* configure.in: `AM_PATH_GCONF'.
-
-2000-06-27  Peter Williams  <peterw@curious-george.helixcode.com>
-
-	* configure.in (ctime_r): Check for whether ctime_r takes
-	two (Linux) or three (Solaris) arguments.
-	(AC_OUTPUT): Don't create notes/Makefile twice.
-
-	* acconfig.h: Add CTIME_R_THREE_ARGS to the list.
-	
-2000-06-26  Christopher James Lahey  <clahey@helixcode.com>
-
-	* widgets/e-text/e-text.c: Calculate height including if
-	clip_height is set to -1.
-	
-2000-06-26  Peter Williams  <peterw@curious-george.helixcode.com>
-
-	* configure.in (THREADS_CFLAGS): Add option --enable-broken-threads
-	to turn on the threading stuff in evolution-mail. Defaults to no.
-
-	* acconfig.h: Add USE_BROKEN_THREADS to the list.
-	
-2000-06-25  Ettore Perazzoli  <ettore@helixcode.com>
-
-	* configure.in: Use `glib-config' instead of `$GLIB_CONFIG' as the
-	latter is not actually defined anywhere.
-
-2000-06-25  Peter Williams  <peterw@helixcode.com>
-
-	* configure.in (pthread stuff): Make threads required due
-	to threaded evolution-mail. Subst in the THREADS_LIBS et
-	al.
-
-	* tests/Makefile.am: Remove USE_THREADS conditional as we
-	always use threads now.
-
-2000-06-21  Christopher James Lahey  <clahey@helixcode.com>
-
-	* widgets/e-text/e-text.c: Fixed some vertical scroll bugs.
-
-2000-06-21  Christopher James Lahey  <clahey@helixcode.com>
-
-	* widgets/e-text/e-text.c: Fix a bug with intial vertical scroll.
-
-2000-06-21  Christopher James Lahey  <clahey@helixcode.com>
-
-	* notes/e-note.c, widgets/meeting-time-sel/e-meeting-time-sel.c,
-	widgets/shortcut-bar/e-icon-bar.c: Removed the usage of "x" and
-	"y" arguments to EText.
-
-	* widgets/e-text/e-text.c, widgets/e-text/e-text.h: Removed the
-	"x" and "y" arguments to EText.   Added vertical scrolling.
-
-2000-06-20  Damon Chaplin  <damon@helixcode.com>
-
-	* widgets/meeting-time-sel/e-meeting-time-sel-item.c: 
-	* widgets/meeting-time-sel/e-meeting-time-sel.c: fixed a few warnings.
-
-2000-06-17  Christopher James Lahey  <clahey@helixcode.com>
-
-	* widgets/e-text/e-text.c: Made EText use the font from the
-	canvas's style if one isn't set.
-
-2000-06-17  Damon Chaplin  <damon@helixcode.com>
-
-	* widgets/meeting-time-sel/*: updated to use EText items rather than
-	GtkEntry widgets and added support for adding new rows.
-
-2000-06-15  Dan Winship  <danw@helixcode.com>
-
-	* README: bye bye goad
-
-2000-06-14  Damon Chaplin  <damon@helixcode.com>
-
-	* README (http): added command to co ORBit.
-
-2000-06-13  Jeffrey Stedfast  <fejj@helixcode.com>
-
-	* configure.in: Added IMAP into the build
-
-2000-06-13  Ettore Perazzoli  <ettore@helixcode.com>
-
-	* notes/Makefile.am (SHELL_OBJS): Removed.
-	(evolution_notes_LDADD): Link with
-	`$(top_builddir)/shell/libeshell.a'.
-
-2000-06-12  Ettore Perazzoli  <ettore@helixcode.com>
-
-	* widgets/Makefile.am (SUBDIRS): build `misc' before everything
-	else.
-
-	* Makefile.am: Install `evolution.png' and `evolution.desktop'
-	where appropriate.
-
-	* evolution.png: New.  For now, it's just a copy of
-	`art/evolution-inbox.png'.
-
-	* evolution.desktop: New.
-
-2000-06-10  Zbigniew Chyla  <chyla@buy.pl>
-
-	* configure.in: Added pl (Polish) to ALL_LINGUAS
-
-2000-06-09  Ettore Perazzoli  <ettore@helixcode.com>
-
-	* configure.in: Added new directory `shell/glade'.
-
-2000-06-07  Christopher James Lahey  <clahey@helixcode.com>
-
-	* widgets/e-paned/e-hpaned.c, widgets/e-paned/e-paned.c,
-	widgets/e-paned/e-paned.h, widgets/e-paned/e-vpaned.c: Added a
-	"quantum" argument for making the panes move in jumps.
-
-2000-06-07  Anders Carlsson  <andersca@gnu.org>
-
-	* configure.in:  Create notes/Makefile
-
-	* notes/*: Add preliminary yellow sticky notes.
-
-2000-06-05	Mathieu Lacage	<mathieu@gnome.org>
-
-	* addressbook/contact-editor/Makefile.am: make it 
-	compile: add proper bonobo linking params.
-	* addressbook/gui/minicard/Makefile.am: idem.
-	* wombat/Makefile.am: add BONOBO_VFS_GNOME_CFLAGS.
-	cleanup some useless includes and libs.
-
-2000-06-02  Ettore Perazzoli  <ettore@helixcode.com>
-
-	* configure.in (ALL_LINGUAS): Add `it' and `de'.
-
-2000-06-02  Christopher James Lahey  <clahey@helixcode.com>
-
-	* configure.in: Released Evolution 0.1.
-
-2000-06-02  Christopher James Lahey  <clahey@helixcode.com>
-
-	* tests/test-movemail.c: Reverted removal of e_setup_base_dir.
-
-2000-06-02  Jesus Bravo Alvarez  <jba@pobox.com>
-
-	* configure.in: Added pt (Portuguese) to ALL_LINGUAS
-
-2000-06-02  Dan Winship  <danw@helixcode.com>
-
-	* README: Update dependencies. Rewrite the GOAD vs OAF thing some
-	more to reflect OAF's new ascendency. Make the fact that you don't
-	need pilot stuff clearer. Add some new directories to the
-	directory layout section.
-
-2000-06-02  Christopher James Lahey  <clahey@helixcode.com>
-
-	* widgets/misc/e-clipped-label.c: Free the finish data.
-
-2000-06-01  Christopher James Lahey  <clahey@helixcode.com>
-
-	* tests/test-movemail.c (main): Don't call e_setup_base_dir.
-
-2000-06-01  Dan Winship  <danw@helixcode.com>
-
-	* configure.in (AC_OUTPUT): add doc, doc/C
-
-	* Makefile.am (SUBDIRS): add doc
-
-2000-05-31  Federico Mena Quintero  <federico@helixcode.com>
-
-	* widgets/misc/e-scroll-frame.[ch]: Imported GtkScrollFrame from
-	EOG and renamed it to EScrollFrame.
-
-	* widgets/misc/Makefile.am (libemiscwidgets_a_SOURCES): Added
-	e-scroll-frame.[ch].
-
-2000-05-30  Ettore Perazzoli  <ettore@helixcode.com>
-
-	* widgets/e-paned/e-vpaned.c (e_vpaned_handle_shown): Show the
-	handle even if the requisition for the child is zero.
-	* widgets/e-paned/e-hpaned.c (e_hpaned_handle_shown): Likewise.
-
-2000-05-26  H�ctor Garc�a Alvarez <hector@scouts-es.org>
-
-        * configure.in: Added Spanish language
-
-2000-05-25  Christopher James Lahey  <clahey@helixcode.com>
-
-	* widgets/e-paned/e-hpaned.c, widgets/e-paned/e-vpaned.c: Fixed a
-	bug where we were resizing a non-existent window.
-
-2000-05-25  Christopher James Lahey  <clahey@helixcode.com>
-
-	* widgets/e-paned/e-hpaned.c, widgets/e-paned/e-paned.c,
-	widgets/e-paned/e-paned.h, widgets/e-paned/e-vpaned.c: Made
-	the handlebar disappear if either side is empty, hidden, or
-	requests 0 size.
-
-2000-05-24  Christopher James Lahey  <clahey@helixcode.com>
-
-	* configure.in: Added widgets/e-paned/Makefile.
-
-	* tests/ui-tests/message-browser.c: Switched from GtkPaned to
-	EPaned.
-
-	* widgets/Makefile.am: Added e-paned directory.
-
-	* widgets/e-paned/, widgets/e-paned/.cvsignore,
-	widgets/e-paned/Makefile.am, widgets/e-paned/e-hpaned.c,
-	widgets/e-paned/e-hpaned.h, widgets/e-paned/e-paned.c,
-	widgets/e-paned/e-paned.h, widgets/e-paned/e-vpaned.c,
-	widgets/e-paned/e-vpaned.h: New widget based completely on
-	GtkPaned from 1.4.  This will be more advanced soon.
-
-2000-05-22  Jeff Stedfast  <fejj@helixcode.com>
-
-	* configure.in: Readded camel/providers/smtp 
-
-2000-05-22  Szabolcs BAN <shooby@gnome.hu>
-
-	* configure.in: Added Hungarian language
-
-2000-05-18  Dan Winship  <danw@helixcode.com>
-
-	* configure.in (AC_OUTPUT): add camel/providers/vee
-
-2000-05-16  Ettore Perazzoli  <ettore@helixcode.com>
-
-	* art/Makefile.am: Install the mini icons.
-
-2000-05-16  Chris Toshok  <toshok@helixcode.com>
-
-	* configure.in: add --with-purify-options support, and default it
-	to what we at helix need
-
-Tue May 16 06:11:40 2000  Tuomas Kuosmanen  <tigert@gimp.org>
-
-	* art/evolution-calendar-mini.png art/evolution-inbox-mini.png
- 	art/evolution-tasks-mini.png art/evolution-contacts-mini.png
- 	art/evolution-notes-mini.png: new mini-icons for the tree view
-	of folders and stuff.
-
-2000-05-14  Federico Mena Quintero  <federico@helixcode.com>
-
-	* configure.in (AC_OUTPUT): Added calendar/gui/dialogs/Makefile.am.
-
-2000-05-10  Matt Loper  <matt@helixcode.com>
-
-	* README: Added version and availability of required libunicode
-	library.
-
-2000-05-10  Dan Winship  <danw@helixcode.com>
-
-	* configure.in: Update versions needed for gnome-print, bonobo,
-	and gtkhtml.
-
-2000-05-10  Christopher James Lahey  <clahey@helixcode.com>
-
-	* HACKING: We need a HACKING file.
-
-2000-05-10  Christopher James Lahey  <clahey@helixcode.com>
-
-	* Makefile.am: Removed dist-hook section.
-
-	* configure.in: Set the version number.  Added a check for gnome
-	window icons.  Removed a bunch of unused Makefiles.
-
-	* tools/Makefile.am: Created a proper EXTRA_DIST section.
-
-	* widgets/e-text/Makefile.am: Added
-	e-text-event-processor-types.h.
-
-2000-05-09  Christopher James Lahey  <clahey@helixcode.com>
-
-	* art/Makefile.am: Added briefcase.png to get installed.
-
-2000-05-09  Christopher James Lahey  <clahey@helixcode.com>
-
-	* widgets/e-text/e-text.c: Remove the tooltip callback when
-	destroyed.
-
-2000-05-09  Matt Loper  <matt@helixcode.com>
-
-	* calendar/pcs/cal-backend.c (cal_backend_add_cal): Return nothing
-	for a 'void' function.
-
-2000-05-08  Christopher James Lahey  <clahey@helixcode.com>
-
-	* widget/e-text/e-text.c, widgets/e-text/e-text.h: Added an
-	activate signal.
-
-2000-05-06  Chris Toshok  <toshok@helixcode.com>
-	
-	* configure.in: Added new Directories section for the default_user.
-
-2000-05-06  Ettore Perazzoli  <ettore@helixcode.com>
-
-	* configure.in: Updated for the new `default_user' directory
-	setup.
-
-2000-05-06  Chris Toshok  <toshok@helixcode.com>
-
-	* configure.in: check for purify.
-
-2000-05-06  Christopher James Lahey  <clahey@helixcode.com>
-
-	* widgets/e-text/e-text.c, widgets/e-text/e-text.h: Added a
-	"changed" signal that gets sent whenever the text changes.
-
-2000-05-05  Ettore Perazzoli  <ettore@helixcode.com>
-
-	* Added `--enable-purify' flag.
-
-2000-05-05  Chris Toshok <toshok@helixcode.com>
-	
-	* shell/Makefile.am: add support for building purified evolution.
-
-	* shell/.cvsignore: ignore evolution.pure
-
-2000-05-05  Chris Toshok <toshok@helixcode.com>
-
-	* addressbook/backend/ebook/.cvsignore,
-	addressbook/contact-editor/.cvsignore,
-	addressbook/gui/component/.cvsignore,
-	addressbook/gui/minicard/.cvsignore,
-	addressbook/printing/.cvsignore,
-	calendar/cal-client/.cvsignore,
-	calendar/gui/.cvsignore,
-	calendar/pcs/.cvsignore,
-	filter/.cvsignore,
-	mail/.cvsignore,
-	shell/.cvsignore,
-	tests/.cvsignore,
-	widgets/e-table/.cvsignore,
-	widgets/e-text/.cvsignore,
-	widgets/meeting-time-sel/.cvsignore,
-	widgets/shortcut-bar/.cvsignore,
-	wombat/.cvsignore: ignore the .pure directory
-
-2000-05-04  Dan Winship  <danw@helixcode.com>
-
-	* configure.in: Oops. The Kerberos check was succeeding when it
-	shouldn't have (and thus breaking the pop3 build for "normal"
-	people). Fix.
-
-2000-05-03  Michael Meeks  <michael@helixcode.com>
-
-	* configure.in (xmlversion): Fix to remove older 'libxml' prefix.
-
-2000-05-02  Ettore Perazzoli  <ettore@helixcode.com>
-
-	* configure.in: Do not output `doc/Makefile' because there is
-	nothing to generate it from.
-
-2000-05-02  Dan Winship  <danw@helixcode.com>
-
-	* configure.in, acconfig.h: add some minimal Kerberos checking.
-	This isn't intended to be generically useful at this point, it's
-	just there to give me a second POP auth mechanism to play with.
-
-	Also remove a bit of cruft, and reorganize configure.in a bit.
-
-2000-05-02  NotZed  <NotZed@HelixCode.com>
-
-	* tests/test13.c: And here too.
-
-	* tests/test2.c (main): REmoved gmime-utils.h
-
-	* tests/Makefile.am (LDADD): Add libeutil to default link line.
-	(test_movemail_LDADD): Fixed order for libutil linking.
-
-2000-05-02  Matt Loper  <matt@helixcode.com>
-
-	* tests/Makefile.am: set G_LOG_DOMAIN.
-	* tests/ui-tests/Makefile.am: same.
-	* widgets/e-text/Makefile.am: same.
-	* widgets/meeting-time-sel/Makefile.am: same.
-
-2000-05-01  NotZed  <NotZed@HelixCode.com>
-
-	* tests/test11.c (main): *sigh* moved back to sync api.
-
-2000-05-01  NotZed  <NotZed@HelixCode.com>
-
-	* tests/test11.c (search_cb): Try deleting messages ...
-	(main): Fix for provider api changes.
-
-2000-05-01  Anders Carlsson  <andersca@gnu.org>
-
-	* configure.in: Check if bonobo uses oaf, so you don't
-	need to specify --enable-oaf.
-
-2000-04-27  Ettore Perazzoli  <ettore@helixcode.com>
-
-	* acconfig.h: New configured #define `USING_OAF'.
-
-	* configure.in: Added `--enable-oaf' option and corresponding
-	`OAF_LIBS' and `OAF_FLAGS' variables.  Code friendly provided by
-	Maciej Stachowiak <mjs@eazel.com>.
-
-2000-04-27  NotZed  <NotZed@HelixCode.com>
-
-	* tests/test10.c: Fix for removal of camelmimebodypart, and changes
-	to recipient stuff.
-
-	* tests/test1.c: Fix for removal of camelmimebodypart, and changes
-	to recipient stuff.
-
-2000-04-27  Christopher James Lahey  <clahey@helixcode.com>
-
-	* configure.in: Added addressbook/ename/Makefile.
-
-2000-04-27  Matt Loper  <matt@helixcode.com>
-
-	* configure.in: added tools/Makefile.
-
-	* Makefile.am: Added tools.
-
-	* tools/: New directory for tools relating to evolution.
-
-	* tools/killev: New script for killing all evolution-related
-	stuff.
-
-        * tools/Makefile.am: New file.
-	
-	* tools/.cvsignore: New file.
-
-2000-04-26  NotZed  <NotZed@HelixCode.com>
-
-	* tests/test13.c (main): And here too.
-
-	* tests/test2.c (main): Same here.
-
-	* tests/test1.c (main): Change for removed simpledatawrapper.
-
-2000-04-26  Matt Loper  <matt@helixcode.com>
-
-	* tests/.cvsignore: Added test13.
-
-	* default_user/.cvsignore: New file.
-
-	* widgets/e-text/e-text.c (e_text_destroy): Kill text->timer and
-	text->timeout on destroy.
-
-2000-04-26  Dan Winship  <danw@helixcode.com>
-
-	* tests: Update for the camel changes.
-
-	* Makefile.am (SUBDIRS): Remove tests. They aren't terribly
-	useful/interesting any more for the most part, and they frequently
-	don't compile.
-
-2000-04-24  Christopher James Lahey  <clahey@helixcode.com>
-
-	* widgets/e-text/e-text.c: Made the tooltip show up in the correct
-	place and configuration when using the "max_lines", "anchor"
-	(untested), or "justification" arguments.
-
-From a patch by Iain Holmes <ih@csd.abdn.ac.uk>
-	
-	* widgets/e-text/e-text-event-processor-emacs-like.c,
-	widget/e-text/e-text-event-processor-types.h,
-	widgets/e-text/e-text.c, widgets/e-text/e-text.h: Changed C-w and
-	C-y to control the X clipboard.  Added double and triple click
-	events.
-
-2000-04-24  Fatih Demir	<kabalak@gmx.net>
-
-	* configure.in : Added tr to ALL_LINGUAS .
-
-2000-04-24  NotZed  <NotZed@HelixCode.com>
-
-	* tests/test13.c (main): Fixed for method movements.
-
-	* tests/test3.c (main): Removed from build, data-wrapper-repository removed.
-
-2000-04-23  NotZed  <NotZed@HelixCode.com>
-
-	* tests/test2.c (main): Changed to use construct_from_stream.
-
-	* tests/test1.c (main): Chagned to use construct_from_stream.
-
-2000-04-24  Matt Loper  <matt@helixcode.com>
-
-	* default_user/Makefile.am: new file.
-
-	* default_user/Main_Shortcuts.xml: New file; is used to fill the
-	shortcut bar's "main shortcuts" pane.
-
-	* default_user/Other_Shortcuts.xml: New file, used to fill the
-	shortcut bar's "other shortcuts" pane.
-
-	* default_user/Inbox.mbox: New file. This is the first message a
-	new user will see when they fire up Evolution. Needs work.
-
-	* Makefile.am: added default_user directory.
-	* configure.in: same.
-
-2000-04-23  NotZed  <NotZed@HelixCode.com>
-
-	* tests/test10.c: Removed some unecessary includes.  From
-	Ali Abdin <aliabdin@aucegypt.edu>
-	(create_sample_mime_message): Changed for date api change.
-
-	* tests/Makefile.am (noinst_PROGRAMS): Put test10 back.
-
-2000-04-22  NotZed  <NotZed@HelixCode.com>
-
-	* tests/test1.c (main): Changed for date api change.
-
-2000-04-20  NotZed  <NotZed@HelixCode.com>
-
-	* tests/test11.c: Fixed some headers.
-
-	* tests/Makefile.am (noinst_PROGRAMS): Removed test9.
-	(noinst_PROGRAMS): Removed test12, temporarirly (nntp not being
-	built).
-	Removed test10.
-
-2000-04-20  Yukihiro Nakai <nakai@gnome.gr.jp>
-
-	* configure.in: Add Japanese to ALL_LINGUAS
-
-2000-04-19  Dan Winship  <danw@helixcode.com>
-
-	* README: More detail on exactly what versions of what libraries
-	are needed.
-
-2000-04-18  Dan Winship  <danw@helixcode.com>
-
-	* tests/*: remove camel-log references
-
-2000-04-17  Dan Winship  <danw@helixcode.com>
-
-	* configure.in (xmlpatch): Require gnome-xml 1.8.7 (or later,
-	but not 2.0). xmlParseMemory's behavior in 1.8.7 is incompatible
-	with its behavior in 1.8.6 and earlier.
-
-	* tests/test-url.c: New program to test CamelURL
-
-2000-04-16  Christopher James Lahey  <clahey@helixcode.com>
-
-	* addressbook/backend/ebook/e-card.c,
-	addressbook/backend/ebook/e-card.h,
-	addressbook/backend/ebook/test-card.c,
-	addressbook/backend/pas/pas-backend-file.c,
-	addressbook/contact-editor/e-contact-editor.c: Added
-	orginizational unit, nickname, and internet free-busy fields.
-
-	* addressbook/contact-editor/contact-editor.glade: Renamed some
-	incorrectly named fields.
-
-2000-04-16  Christopher James Lahey  <clahey@helixcode.com>
-
-	* addressbook/backend/ebook/e-card.c,
-	addressbook/backend/ebook/e-card.h,
-	addressbook/backend/ebook/test-card.c,
-	addressbook/backend/pas/pas-backend-file.c,
-	addressbook/gui/minicard/e-minicard.c: Added orginization and role
-	fields.
-
-	* addressbook/contact-editor/contact-editor.glade,
-	addressbook/contact-editor/e-contact-editor-strings.h: Renamed
-	some incorrectly named fields.
-
-	* addressbook/contact-editor/e-contact-editor.c: Added
-	orginization and role fields as well as hooking up the birth date
-	field.
-
-	* addressbook/gui/minicard/e-minicard-view.c: Added a missing include.
-
-2000-04-15  Matt Loper  <matt@helixcode.com>
-
-	* addressbook/gui/component/addressbook.c
-	(search_entry_activated): New function. Gets called when the quick
-	search entry is called on to perform a search.
-	(make_quick_search_widget): New function; returns a "quick search"
-	widget.
-	(control_activate): During the construction of the toolbar, a
-	"quick search" widget is included.
-
-2000-04-14  Chris Toshok  <toshok@helixcode.com>
-
-	* tests/.cvsignore: add test12
-
-	* tests/test12.c (main): add test for nntp stuff.
-
-	* tests/Makefile.am (noinst_PROGRAMS): same.
-
-
-2000-04-14  Christopher James Lahey  <clahey@helixcode.com>
-
-	* addressbook/backend/ebook/e-card.c,
-	addressbook/backend/ebook/e-card.h,
-	addressbook/backend/pas/pas-backend-file.c,
-	addressbook/backend/pas/pas-backend-ldap.c,
-	addressbook/contact-editor/e-contact-editor.c: Added a note field.
-
-2000-04-15  Ettore Perazzoli  <ettore@helixcode.com>
-
-	* addressbook/backend/ebook/e-card-cursor.h: #include
-	"addressbook/backend/ebook" to make sure we pick up the right
-	addressbook.h.  Butt ugly, but at least it makes it possible for
-	me to build Evolution.
-
-	* addressbook/gui/minicard/Makefile.am (INCLUDES): Use
-	`$(builddir)' so that we pick up the IDL-generated includes
-	correctly.
-	* addressbook/backend/pas/Makefile.am: Likewise.  Also use
-	`$(srcdir)'.
-
-	* addressbook/backend/ebook/Makefile.am: Use `$(srcdir)' so that
-	it works with builddir != srcdir.
-	* addressbook/backend/pas/Makefile.am: Likewise.
-
-2000-04-14  Chris Toshok  <toshok@helixcode.com>
-
-	* addressbook/backend/pas/pas-backend-ldap.c
-	(pas_backend_ldap_ensure_connected): don't ldap_simple_bind_s if
-	the ldap_open failed, and fix warnings.
-	(pas_backend_ldap_build_all_cards_list): don't do search if the
-	ensure_connected failed, and fix warnings.
-	(pas_backend_ldap_search): same.
-	(poll_ldap): fix warnings.
-	(pas_backend_ldap_process_get_book_view): same.
-	(pas_backend_ldap_get_vcard): same.
-	(pas_backend_ldap_load_uri): same.
-
-	* configure.in: quiet configure in the case where it can't find
-	ldap libs.
-
-2000-04-13  Christopher James Lahey  <clahey@helixcode.com>
-
-	* addressbook/contact-editor/e-contact-editor.c (extract_info):
-	Check for 0 length fields when building the outgoing ECard.
-
-2000-04-13  Christopher James Lahey  <clahey@helixcode.com>
-
-	* addressbook/backend/pas/pas-book-view.c: Give correct warnings.
-
-	* addressbook/backend/ebook/e-card.c (e_card_set_arg): g_strdup
-	url and title.
-
-2000-04-13  Chris Toshok  <toshok@helixcode.com>
-
-	* addressbook/contact-editor/e-contact-editor.c
-	(fill_in_info): reflect the title attribute in the contact editor.
-	(extract_info): same.
-
-	* addressbook/backend/pas/pas-backend-ldap.c: add the title attribute.
-
-	* addressbook/gui/minicard/test-reflow.c: add a title.
-
-	* addressbook/gui/minicard/e-minicard.c (remodel): add support for
-	the title attribute.
-
-	* addressbook/backend/ebook/e-card.c (e_card_get_vcard): save out
-	the title to the vcard.
-
-	* addressbook/backend/ebook/test-card.c: add title field foo to
-	the test.
-
-	* addressbook/backend/ebook/e-card.c: reflect the title field.
-
-	* addressbook/backend/ebook/e-card.h: un-#if 0 the title field.
-
-	* addressbook/backend/pas/pas-backend-ldap.c (poll_ldap): new
-	function that polls ldap for more search responses.
-	(pas_backend_ldap_search): use the async search interface and
-	register an idle call to poll for the responses.
-	(view_destroy): make sure to g_source_remove the idle id.
-
-2000-04-12  Chris Toshok  <toshok@helixcode.com>
-
-	* addressbook/backend/pas/pas-backend-file.c (entry_compare):
-	rework this function to use a table mapping search field names to
-	vcard properties and extra information (such as whether or not the
-	property is a list.)
-	
-	* addressbook/backend/pas/pas-backend-ldap.c
-	(construct_email_list): new function, to build the ECardList for
-	email addresses.
-	(construct_phone_list): new function, to build the ECardList for
-	phone numbers.
-	(pas_backend_ldap_search): use a table mapping ldap attributes to
-	ecard properties, and use the special list construction functions
-	if the property calls for it.  general cleanup.  added a comment
-	about not calling ber_free if there was a decoding error.
-
-
-2000-04-12  Matt Loper  <matt@helixcode.com>
-
-	* art/Makefile.am: Add tigert's contact-dlg-related images.
-
-	* addressbook/contact-editor/e-contact-editor.c (_add_images): Add
-	tigert's images.
-
-	* addressbook/contact-editor/Makefile.am: add EVOLUTION_IMAGES.
-
-2000-04-12  Tuomas Kuosmanen  <tigert@gimp.org>
-
-	* art/house.png, art/malehead.png, art/cellphone.png, 
-	art/briefcase.png, art/envelope.png, art/globe.png:
-	New icons for the contact manager.. more to follow once I get 
-	around to do more artist work..
-
-2000-04-12  Chris Toshok  <toshok@helixcode.com>
-
-	* addressbook/backend/pas/pas-backend-ldap.c
-	(pas_backend_ldap_build_all_cards_list): delay the setting of the
-	ldap variable until we've ensured we were connected.  Also, set
-	the search limit to LDAP_MAX_SEARCH_RESPONSES (we'll eventually
-	want a user setting here i assume.)
-	(pas_backend_ldap_search): same here, and also send back lists of
-	CARDS_PER_VIEW_NOTIFICATION length in each
-	pas_book_view_notify_add call.  also, don't call ber_free if there
-	was a decoding error, since the ldap library frees it for us.
-
-2000-04-11  Miguel de Icaza  <miguel@gnu.org>
-
-	* configure.in (have_pthread): Properly use AC_ARG_WITH
-
-2000-04-11  Chris Toshok  <toshok@helixcode.com>
-
-	* wombat/Makefile.am (wombat_LDADD): add LDAP_LIBS here.
-
-	* configure.in: check for -lldap and -llber and if both are
-	present include ldap support in the pas/wombat.
-
-	* addressbook/backend/pas/Makefile.am (libpas_la_SOURCES): include
-	pas-backend.ldap.c if ENABLE_LDAP.
-
-	* addressbook/backend/pas/pas-backend-ldap.c: get searching
-	working (converting between the sexp and ldap stuff.)
-
-	* wombat/wombat.c (setup_pas): register the ldap pas backend if
-	HAVE_LDAP is defined.
-
-2000-04-11  Christopher James Lahey  <clahey@helixcode.com>
-
-	* configure.in: Changed AC_DEFUN to AC_DEFINE.
-
-	* acconfig.h: Added HAVE_TIMEZONE and HAVE_TM_GMTOFF.
-
-2000-04-11  Chris Toshok  <toshok@helixcode.com>
-
-	* configure.in: check for timezone as a variable (as it is in
-	linux, but not in freebsd or netbsd.)
-
-2000-04-11  Larry Ewing  <lewing@helixcode.com>
-
-	* widgets/e-table/e-cell-toggle.c (etog_draw): update for new
-	gdk-pixbuf.  Added a disabled chuck of code to do alpha blending
-	on pixmaps.
-
-2000-04-11  Christopher James Lahey  <clahey@helixcode.com>
-
-	* widgets/e-text/e-text.c: Moved some logic a bit.  Minor changes.
-
-00-04-11  Iain Holmes  <ih@csd.abdn.ac.uk>
-
-	* widgets/e-text/e-text.c
-	(e_text_set_args): Recalculate bounds when width or clip_width changes.
-	(tooltip_event): Forward clicks on the tooltip onto the text item.
-	(_do_tooltip): Correct the origin co-ordinates to the items co-ords.
-	(e_text_point): Return 0 when the mouse is on the item.
-	(_do_tooltip): Make the tooltip obey the parent items
-	line_wrap and max_lines.
-
-00-04-11  Chris Toshok  <toshok@helixcode.com>
-
-	* addressbook/backend/pas/pas-backend-file.c
-	(get_e_card_prop): new function, taking code from func_contains to
-	get string properties.
-	(entry_compare): new function generic, taking strstr-like function
-	as a parameter.
-	(func_contains): rewrite function to use entry_compare.
-	(is_helper): new helper function to map strcmp to a strstr-like
-	function.
-	(func_is): new function, implementing "is" for searches.
-	(endswith_helper): new function.
-	(func_endswith) new function, implementing "endswith" for
-	searches.
-	(beginswith_helper): new function.
-	(func_beginswith): new function, implementing "beginswith" for
-	searches.
-	(compare_email): new function for searching all email addresses of
-	a contact.
-	(compare_phone): new function for searching all phone numbers of a
-	contact.
-	(compare_address): new function for searching all addresses of a
-	contact (unimplemented as yet).
-	(entry_compare): add support for searching the list items "email",
-	"phone" and "address".
-	(vcard_matches_search): free the esexp_result.
-	(entry_compare): we want comparison functions to take 2 args.
-
-2000-04-11  Christopher James Lahey  <clahey@helixcode.com>
-
-	* addressbook/gui/minicard/e-minicard-view.c: This was setting
-	E_REFLOW(view)->items to NULL too soon.  Fixed now.
-
-2000-04-11  Chris Toshok  <toshok@helixcode.com>
-
-	* addressbook/backend/pas/pas-backend-file.c
-	(pas_backend_file_search): remove spew.
-	(pas_backend_file_process_create_card): move the sync to the
-	earliest possible point after the db operation.
-	(pas_backend_file_process_remove_card): same.
-	(pas_backend_file_process_modify_card): same, and call
-	pas_book_respond_modify, not pas_book_respond_remove, here.
-
-	* addressbook/gui/component/addressbook.c (card_deleted_cb): new
-	function.
-	(delete_contact_cb): wire up button to call
-	e_minicard_view_remove_selection.
-
-	* addressbook/gui/minicard/e-minicard-view.c
-	(e_minicard_view_remove_selection): fix warning, and stick "view"
-	in the name.
-
-2000-04-10  Christopher James Lahey  <clahey@helixcode.com>
-
-	* addressbook/backend/ebook/e-book-view.c,
-	addressbook/backend/ebook/e-book.c: Changed some incorrect
-	gtk_object_refs and gtk_object_unrefs into bonobo_object_refs and
-	bonobo_object_unrefs.
-
-	* addressbook/backend/pas/pas-card-cursor.c: Changed a
-	gtk_object_destroy to a gtk_object_unref.
-
-	* addressbook/gui/minicard/e-minicard-view.c,
-	addressbook/gui/minicard/e-minicard-view.h: Set a list pointer to
-	NULL after freeing its contents.  Added
-	e_minicard_view_remove_selection function.
-
-	* addressbook/gui/minicard/e-reflow.c: Set a list pointer to NULL
-	after freeing its contents.
-
-2000-04-11  Chris Toshok  <toshok@helixcode.com>
-
-	* addressbook/gui/component/addressbook.c (find_contact_cb):
-	implement braindead dialog to input the query string for the view.
-
-	also, change all callbacks to get the EMinicardView instead of the
-	EBook.
-
-	* addressbook/gui/minicard/e-minicard-view.c
-	(e_minicard_view_get_arg): add missing break.
-
-2000-04-10  Christopher James Lahey  <clahey@helixcode.com>
-
-	* addressbook/gui/minicard/e-minicard-view.c,
-	addressbook/gui/minicard/e-minicard-view.h: Added a "query"
-	argument to the e-minicard-view.  Documented all the arguments to
-	the e-minicard-view.
-
-2000-04-10  Chris Toshok  <toshok@helixcode.com>
-
-	* addressbook/gui/minicard/e-minicard-view.c (get_view): change
-	the empty search string ("") to the valid (contains "full_name" "").
-
-	* wombat/Makefile.am (wombat_LDADD): reorder so libeutil.la comes
-	after libpas (since it uses the sexp stuff now.)
-
-	* addressbook/backend/pas/Makefile.am (INCLUDES): add
-	-I$(top_srcdir)/addressbook/backend/ebook
-
-	* addressbook/backend/pas/pas-backend-file.c
-	(view_destroy): free the search context and unref the sexp.
-	(string_to_dbt): save the zero byte of strings, so we don't have
-	to g_strndup everywhere.
-	(func_contains): new function, implementing the (contains) search
-	function.
-	(vcard_matches_search): generic predicate to tell whether or not a
-	vcard entry matches the current book view.
-	(pas_backend_file_search): rip some of this code out of
-	get_book_view (the portion building the list of cards) and make it
-	use the e-sexp stuff.
-	(pas_backend_file_process_create_card): use vcard_matches_search
-	to only notify if the card will appear in the view.
-	(pas_backend_file_process_remove_card): use vcard_matches_search
-	to only notify if the card will be removed from the view.
-	(pas_backend_file_process_modify_card): use vcard_matches_search
-	to notify if the modified card was added, removed, or changed in
-	the view.
-	
-2000-04-10  Miguel de Icaza  <miguel@gnu.org>
-
-	* configure.in (GNOME_PRINT_CFLAGS): Update to support
-	--disable-threads correctly.
-
-2000-04-10  Chris Toshok  <toshok@helixcode.com>
-
-	* addressbook/backend/pas/pas-backend-file.c
-	(pas_backend_file_process_get_book_view): use view != NULL instead
-	of checking db_error when we call pas_book_respond_get_book_view)
-
-2000-04-10  Dan Winship  <danw@helixcode.com>
-
-	* configure.in: check for mkstemp
-
-2000-04-10  Damon Chaplin  <damon@helixcode.com>
-
-	* configure.in (AC_OUTPUT): removed libical stuff since it has its
-	own configure.in.
-
-2000-04-10  Christopher James Lahey  <clahey@helixcode.com>
-
-	* addressbook/backend/ebook/e-book-view.c: Fixed a bug where I was
-	sending the wrong information to some callbacks.
-
-	* addressbook/backend/ebook/e-card.c,
-	addressbook/backend/ebook/e-card.h: Added an e_card_duplicate
-	function.  Made ids get stored in vcards.  Made sure to delete the
-	url if it exists.
-
-	* addressbook/backend/pas/Makefile.am: Made pas include
-	addressbook/backend/ebook/ in the search path.
-
-	* addressbook/backend/pas/pas-backend-file.c: Fixed some bugs and
-	made the create card function store the generated id in the card
-	being saved.
-
-	* addressbook/backend/pas/pas-book-view.c: Fixed a double free
-	bug.
-
-	* addressbook/contact-editor/e-contact-editor.c: Fixed some bugs.
-	Made the contact editor actually return a valid card when
-	gtk_object_get(editor, "card", ...) is called.
-
-	* addressbook/contact-editor/e-contact-editor.h: Fixed a copy and
-	paste error.
-
-	* addressbook/gui/component/addressbook.c: Made this get the card
-	properly.
-
-	* addressbook/gui/minicard/Makefile.am: Made this include
-	contact-editor directory in the search path and link against
-	libecontacteditor so that double clicking can open a dialog.
-
-	* addressbook/gui/minicard/e-minicard.c: Fixed some small bugs.
-	Made double clicking open a contact editor dialog if this minicard
-	is contained in a minicard view.  (It needs the minicard view to
-	get the EBook to save to.
-
-	* wombat/Makefile.am: Link wombat against libebook, since
-	pas-backend-file now uses ECard.
-
-2000-04-09  Matt Loper  <matt@helixcode.com>
-
-	* addressbook/gui/component/addressbook.c (control_activate): Make
-	"New Contact" menuitem add a card with new_contact_cb().
-	
-	* addressbook/Makefile.am: Compile contact-editor, _then_ gui,
-	since the gui now depends on the contact editor (shouldn't the
-	contact-editor directory be moved into 'gui'?).
-
-	* addressbook/gui/component/addressbook.c (card_added_cb): New
-	function. Gets called when a card is successfully added via the
-	contact-editor.
-	(new_contact_cb): New function. Gets called when a user clicks the
-	"new contact" button on the toolbar, and creates a contact-editor
-	to edit a new contact entry.
-	(control_activate): Call gnome_app_fill_toolbar_with_data()
-	instead of gnome_app_fill_toolbar(), so that our toolbar can find
-	the right book to add a new card to.
-	(addressbook_factory): On an "activate" signal, send the book up
-	to control_activate_cb.
-
-	* addressbook/gui/component/addressbook-factory.c (init_bonobo):
-	Call glade_gnome_init(), so that our contact-editor (which
-	requires glade) doesn't barf.
-
-	* addressbook/gui/component/Makefile.am: added the contact-editor
-	to our libraries and include files.
-
-	* addressbook/contact-editor/e-contact-editor.c
-	(e_contact_editor_new): Set "card" gtk property to the passed-in
-	card property.
-
-	* addressbook/gui/component/addressbook.c (addressbook_factory):
-	Added gtk_widget_push/pop_colormap/visual, which I assume is
-	necessary for canvas use.
-
-2000-04-08  Christopher James Lahey  <clahey@helixcode.com>
-
-	* addressbook/contact-editor/Makefile.am,
-	addressbook/contact-editor/e-contact-editor.c,
-	addressbook/contact-editor/e-contact-editor.h,
-	addressbook/contact-editor/test-editor.c: Made the contact editor
-	load from an ECard.
-
-	* addressbook/backend/ebook/e-card.c,
-	addressbook/backend/ebook/e-card.h,
-	addressbook/gui/minicard/e-minicard.c: Added support for the URL
-	field.
-
-2000-04-08  Christopher James Lahey  <clahey@helixcode.com>
-
-	* addressbook/backend/ebook/e-card.c (e_card_get_vcard): Fixed a
-	small typo.
-
-2000-04-08  Dan Winship  <danw@helixcode.com>
-
-	* art/Makefile.am: pixmap_DATA should have been images_DATA (after
-	pixmapdir was renamed to imagesdir)
-
-2000-04-08  Christopher James Lahey  <clahey@helixcode.com>
-
-	* addressbook/gui/minicard/.cvsignore,
-	addressbook/gui/minicard/Makefile.am,
-	addressbook/gui/minicard/e-minicard-view.c,
-	addressbook/gui/minicard/e-minicard-view.h,
-	addressbook/gui/minicard/e-minicard.c,
-	addressbook/gui/minicard/e-minicard.h,
-	addressbook/gui/minicard/e-reflow-sorted.c,
-	addressbook/gui/minicard/e-reflow-sorted.h,
-	addressbook/gui/minicard/e-reflow.c,
-	addressbook/gui/minicard/e-reflow.h,
-	addressbook/gui/minicard/test-minicard-view.c,
-	addressbook/gui/minicard/test-reflow.c,
-	widgets/e-minicard/.cvsignore, widgets/e-minicard/Makefile.am,
-	widgets/e-minicard/e-minicard-label.c,
-	widgets/e-minicard/e-minicard-label.h,
-	widgets/e-minicard/e-minicard-view.c,
-	widgets/e-minicard/e-minicard-view.h,
-	widgets/e-minicard/e-minicard.c, widgets/e-minicard/e-minicard.h,
-	widgets/e-minicard/e-reflow-sorted.c,
-	widgets/e-minicard/e-reflow-sorted.h,
-	widgets/e-minicard/e-reflow.c, widgets/e-minicard/e-reflow.h,
-	widgets/e-minicard/test-minicard-label.c,
-	widgets/e-minicard/test-minicard-view.c,
-	widgets/e-minicard/test-minicard.c,
-	widgets/e-minicard/test-reflow.c: CVS move mistake.  Fixed the
-	correct changes in the correct places.
-
-2000-04-08  Christopher James Lahey  <clahey@helixcode.com>
-
-	* art/Makefile.am: pixmap_DATA isn't defined so don't use it as a variable.
-
-	* addressbook/gui/component/,
-	addressbook/gui/component/.cvsignore, addressbook/gui/Makefile.am,
-	addressbook/gui/component/addressbook-factory.c,
-	addressbook/gui/component/addressbook.c,
-	addressbook/gui/component/addressbook.gnorba,
-	addressbook/gui/component/addressbook.h: New directory to proivde
-	the component for contact management.  Simply uses an e-minicard-view.
-
-	* addressbook/gui/minicard/e-minicard-view.c,
-	addressbook/gui/minicard/e-minicard-view.h: New subclass of
-	e-reflow-sorted that takes an EBook and uses it to compute the
-	card data to display.
-
-	* addressbook/gui/minicard/e-minicard.c,
-	addressbook/gui/minicard/e-minicard.h: This now backends to a
-	ECard instead of a ETableModel.
-
-	* addressbook/gui/minicard/e-reflow.c,
-	addressbook/gui/minicard/e-reflow.h: This now has a virtualized
-	add method.
-
-	* addressbook/gui/minicard/e-reflow-sorted.c,
-	addressbook/gui/minicard/e-reflow-sorted.h: New subclass of
-	e-reflow that allows the data to be sorted on the fly.
-
-	* addressbook/gui/minicard/test-minicard-view.c: New test to test
-	the new minicard view.
-
-	* addressbook/gui/minicard/test-reflow.c: Uses the new ECard
-	backend of the e-minicard.
-
-	* addressbook/gui/minicard/.cvsignore,
-	addressbook/gui/minicard/Makefile.am: Added new test.  Fixed
-	dependencies.  Added new files.
-
-	* addressbook/gui/, addressbook/gui/Makefile.am,
-	addressbook/gui/.cvsignore: New directory for addressbook gui
-	bits.  Added subdirectories.  Created an initial .cvsignore.
-
-	* addressbook/Makefile.am (SUBDIRS): Removed demo and added gui.
-
-	* addressbook/backend/pas/pas-backend-file.c: Added code to do
-	notification on bookviews when changes in the backend are made.
-
-	* addressbook/backend/pas/pas-book-view.c,
-	addressbook/backend/pas/pas-book-view.h: Added helper functions to
-	notify the view about the addition or modification of a single
-	card.  Fixed a mistaken extra free.
-
-	* addressbook/backend/ebook/e-card-list-iterator.h: Fixed
-	incorrect parent class.
-
-	* addressbook/backend/ebook/test-client.c: Made this accept an
-	optional parameter that specifies the vcard to add.
-
-	* configure.in: Replaced widgets/e-minicard/Makefile and
-	addressbook/demo/Makefile with addressbook/gui/minicard/Makefile
-	and addressbook/gui/component/Makefile respectively.
-
-	* widgets/Makefile.am: Removed e-minicard since it's being moved
-	to addressbook/gui/minicard.
-
-	* widgets/e-text/e-text.c: Fixed the border width around tooltips
-	and made the main tooltip area yellow.
-
-2000-04-08  Dan Winship  <danw@helixcode.com>
-
-	* configure.in, acconfig.h: add SYSTEM_MAIL_DIR
-
-2000-04-08  Jesus Bravo Alvarez  <jba@pobox.com>
-
-	* configure.in (ALL_LINGUAS): Added Galician (gl).
-
-2000-04-07  Jeffrey Stedfast  <fejj@stampede.org>
-	* configure.in: Modified to create camel/providers/smtp/Makefile
-
-2000-04-07  Christopher James Lahey  <clahey@helixcode.com>
-
-	* widgets/e-text/e-text.c: Made text tooltips appear in place.
-	Iain figured out that to get them to not appear, we hide the
-	tooltip when the mouse leaves the tooltip window, not the canvas
-	item (this works because the tooltip window always covers the
-	canvas item completely.)
-
-2000-04-07  Matt Loper  <matt@helixcode.com>
-
-	* addressbook/demo/addressbook.c (control_activate_cb): New
-	function. Called when the control is (de)activated.
-	(control_activate): New function; called when the control is
-	activated, and sets up toolbar/menu times.
-	(control_deactivate): New function; removes those toolbar/menu
-	items.
-	(do_nothing_cb): Does nothing :-)
-	(addressbook_factory): Hook up to control_activate_cb().
-
-2000-04-07  Chris Toshok  <toshok@laptoph.xtoph.org>
-
-	* addressbook/backend/pas/pas-backend-file.c
-	(pas_backend_file_process_get_book_view): correctly (well,
-	untested) implement.
-	(view_destroy): new function.
-
-2000-04-06  Christopher James Lahey  <clahey@helixcode.com>
-
-	* addressbook/demo/demo.c, addressbook/demo/addressbook-widget.c:
-	Changed calls to e_cell_text_new to match new function signature.
-
-2000-04-06  Miguel de Icaza  <miguel@gnu.org>
-
-	* art/Makefile.am (images_DATA): Renamed from pixmaps to images. 
-
-2000-04-05  Matt Loper  <matt@helixcode.com>
-
-	* README: Added wombat.
-
-2000-04-04  Christopher James Lahey  <clahey@helixcode.com>
-
-	* widgets/e-text/e-text-test.c: Got rid of some runtime errors.
-	Changed to "fixed" font so that it will work on everyone's
-	machine.  Added a white background rectangle.  Made resizing the
-	window resize the contained text item.  Changed to using affines
-	(e_canvas_item_move_absolute) instead of "x" and "y" attributes.
-	Set the text in the entries so that they match the original values
-	of the displayed text object.
-
-2000-04-04  Christopher James Lahey  <clahey@helixcode.com>
-
-	* widgets/e-minicard/e-minicard.c: Fixed some referencing and
-	lifetime issues.
-
-2000-04-04  Christopher James Lahey  <clahey@helixcode.com>
-
-	* widgets/e-text/e-text.c: Removed an unnecessary get_bounds call.
-
-	(From a patch by Iain Holmes <ih@csd.abdn.ac.uk>)
-
-	* widgets/e-text/e-text.c: Made tooltips look more like the
-	underlying text.  Made tooltips show up more consistently.
-
-2000-04-04  Christopher James Lahey  <clahey@helixcode.com>
-
-	* addressbook/demo/Makefile.am, addressbook/demo/e-test-model.c,
-	addressbook/demo/e-test-model.h: Changed this to backend to an
-	ebook.
-
-	* addressbook/backend/ebook/e-card-iterator.c,
-	addressbook/backend/ebook/e-card-iterator.h,
-	addressbook/backend/ebook/e-card-list-iterator.c,
-	addressbook/backend/ebook/e-card-list.c,
-	addressbook/backend/ebook/e-card-list.h,
-	addressbook/backend/ebook/e-card.c,
-	addressbook/backend/ebook/e-card.h: Fixed const correctness and
-	changed a couple of functions to be external.
-	
-	* addressbook/Makefile.am: Fixed subdir ordering.
-
-2000-04-04  Christopher James Lahey  <clahey@helixcode.com>
-
-	* addressbook/backend/ebook/e-book-view.c: Fixed an incorrect
-	function.
-
-	* addressbook/backend/ebook/e-book-view.h,
-	addressbook/backend/ebook/e-book.h: Fixed some incorrect function
-	pointer declarations.
-
-	* addressbook/backend/ebook/e-card-iterator.c,
-	addressbook/backend/ebook/e-card-iterator.h,
-	addressbook/backend/ebook/e-card-list-iterator.c,
-	addressbook/backend/ebook/e-card-list-iterator.h,
-	addressbook/backend/ebook/e-card-list.c,
-	addressbook/backend/ebook/e-card-list.h,
-	addressbook/backend/ebook/e-card.c,
-	addressbook/backend/ebook/e-card.h,
-	addressbook/backend/ebook/test-card.c: Built new iterator system
-	for getting fields with multiple entries.
-
-	* addressbook/backend/ebook/Makefile.am: Added new files
-	addressbook/backend/ebook/e-card-iterator.c,
-	addressbook/backend/ebook/e-card-iterator.h,
-	addressbook/backend/ebook/e-card-list-iterator.c,
-	addressbook/backend/ebook/e-card-list-iterator.h,
-	addressbook/backend/ebook/e-card-list.c, and
-	addressbook/backend/ebook/e-card-list.h.
-
-2000-04-04  Yuri Syrota  <rasta@renome.rovno.ua>
-
-	* configure.in: Added uk to ALL_LINGUAS.
-
-2000-04-04  Andreas Hyden  <a.hyden@cyberpoint.se>
-
-	* configure.in: Added no and sv to ALL_LINGUAS.
-
-2000-04-03  Christopher James Lahey  <clahey@helixcode.com>
-
-	* addressbook/backend/ebook/e-card-cursor.h,
-	addressbook/backend/ebook/e-card.c: A bit of clean up.
-	
-	* addressbook/backend/ebook/e-book-types.h,
-	addressbook/backend/ebook/e-book-view-listener.c,
-	addressbook/backend/ebook/e-book-view-listener.h,
-	addressbook/backend/ebook/e-book-view.c,
-	addressbook/backend/ebook/e-book-view.h,
-	addressbook/backend/pas/pas-book-view.c,
-	addressbook/backend/pas/pas-book-view.h: New files for live views.
-
-	* addressbook/backend/ebook/Makefile.am,
-	addressbook/backend/ebook/e-book-listener.c,
-	addressbook/backend/ebook/e-book-listener.h,
-	addressbook/backend/ebook/e-book.c,
-	addressbook/backend/ebook/e-book.h,
-	addressbook/backend/ebook/test-client-list.c,
-	addressbook/backend/ebook/test-client.c,
-	addressbook/backend/pas/pas-backend-file.c,
-	addressbook/backend/pas/pas-book.c,
-	addressbook/backend/pas/pas-book.h,
-	addressbook/backend/idl/addressbook.idl: Added live views and
-	searching to the interface (neither is working yet.)
-
-2000-04-01  Matt Loper  <matt@helixcode.com>
-
-	* tests/.cvsignore: Added test-movemail.
-
-	* art/.cvsignore: New file.
-
-2000-03-31  Christopher James Lahey  <clahey@helixcode.com>
-
-	* addressbook/demo/demo.c, addressbook/demo/addressbook-widget.c:
-	Added some missing gtk_object_refs.
-
-2000-03-30  Matt Loper  <matt@helixcode.com>
-
-	* addressbook/backend/pas/pas-backend-file.c
-	(pas_backend_file_build_all_cards_list): Get first card (with
-	R_FIRST) on first seq().
-
-2000-03-30  Chris Toshok  <toshok@laptoph.xtoph.org>
-
-	* addressbook/backend/pas/pas-backend-ldap.h: new-file
-	* addressbook/backend/pas/pas-backend-ldap.c: new file
-
-2000-03-30  Dan Winship  <danw@helixcode.com>
-	
-	* configure.in:
-	* Makefile.am:
-	* art/Makefile.am: install new shortcut bar pixmaps.
-
-2000-03-30  Tuomas Kuosmanen  <tigert@gimp.org>
-
-	* art/evolution-calendar.png art/evolution-inbox.png 
-	art/evolution-tasks.png	art/evolution-contacts.png 
-	art/evolution-notes.png evolution-today.png:
-	added some artwork for the main shortcutbar.. someone
-	could stick them in it.
-
-2000-03-29  Christopher James Lahey  <clahey@helixcode.com>
-
-	* addressbook/backend/ebook/e-card-cursor.c: Fixed management of
-	the corba-cursor object by calling CORBA_Object_duplicate on it on
-	e-card-cursor creation and calling CORBA_Object_release on
-	e-card-cursor destruction.  Also, properly free string returned
-	from Evolution_CardCursor_get_nth function.
-
-2000-03-29  Matt Loper  <matt@helixcode.com>
-
-	* addressbook/backend/ebook/test-client.c (get_cursor_cb): Added
-	some debugging.
-
-	* addressbook/backend/ebook/e-book-listener.c: Added inline
-	documentation for exposed functions.
-	* addressbook/backend/ebook/e-card-cursor.c: same.
-	* addressbook/backend/ebook/e-card.c: same.
-
-	* Makefile.am: add calendar compilation back in.
-
-	* addressbook/backend/pas/pas-book-factory.c
-	(PAS_BOOK_FACTORY_GOAD_ID): changed to
-	"evolution:addressbook-server".
-
-	* addressbook/backend/pas/Makefile.am: no need to install a
-	.gnorba file from here, as the wombat.gnorba file in
-	evolution/wombat will do its job.
-
-	* addressbook/backend/ebook/test-client.c (ebook_create): if
-	ebook_new fails, print a warning and return.
-
-	* addressbook/backend/ebook/e-book.c (CARDSERVER_GOAD_ID): changed
-	to "evolution:addressbook-server".
-
-	* wombat/wombat.c: Changed headerfile path.
-
-	* wombat/Makefile.am: Use relative paths to libraries in the build
-	tree, rather than requiring libraries (such as libpcs) to already
-	be installed.
-
-2000-03-28  Matt Loper  <matt@helixcode.com>
-
-	* wombat/Makefile.am: new file.
-
-	* wombat/wombat.gnorba: Cleaned up.
-
-	* wombat/wombat.c (setup_pcs): filled in the rest.
-	
-	* Makefile.am: added wombat.
-
-	* wombat/wombat.gnorba: new file.
-
-	* wombat/.cvsignore: new file.
-
-	* wombat/wombat.c (setup_pcs): fill out this function some.
-
-	* configure.in: added wombat.
-
-2000-03-28  Chris Toshok  <toshok@laptoph.xtoph.org>
-
-	* addressbook/backend/pas/pas-card-cursor.c (create_cursor): use
-	g_new0 to allocate the BonoboObjectServant.
-
-	* addressbook/backend/pas/pas-backend-file.c
-	(pas_backend_file_build_all_cards_list): remove unnecessary
-	strdup/free.
-
-2000-03-28  Christopher James Lahey  <clahey@helixcode.com>
-
-	* addressbook/backend/pas/pas-backend-file.c: Removed an infinite
-	loop.
-
-	* addressbook/backend/ebook/test-client-list.c: New test that
-	doesn't add an extra database item.
-
-	* addressbook/backend/ebook/Makefile.am,
-	addressbook/backend/ebook/.cvsignore: Added test-client-list.
-
-2000-03-28  Christopher James Lahey  <clahey@helixcode.com>
-
-	* addressbook/backend/pas/pas-card-cursor.c: Fixed memory
-	allocation.
-
-	* addressbook/backend/pas/pas-backend-file.c: Fixed memory
-	allocation.  Made database stuff not do an extra entry.
-
-	* addressbook/backend/ebook/test-client.c: Add test for
-	get_all_cards functionality.  Changed database name to test.db.
-
-	* addressbook/backend/ebook/e-card-cursor.c: Changed bonobo_object
-	to gtk_object in a couple of places.
-
-2000-03-28  Chris Toshok  <toshok@laptoph.xtoph.org>
-
-	* addressbook/backend/pas/pas-backend-file.c
-	(pas_backend_file_create_unique_id): create id's for entries using
-	the following format: ("pas-id-%08lX%08X", time(NULL), c++).
-	
-2000-03-27  Dan Winship  <danw@helixcode.com>
-
-	* tests/test-movemail.c: new test program. Can be used to copy POP
-	mail into your evolution inbox.
-
-2000-03-27  Chris Toshok  <toshok@laptoph.xtoph.org>
-
-	* addressbook/backend/pas/pas-backend-file.c
-	(pas_backend_file_get_vcard): remove unneeded g_strdup;
-	(get_length): implement function.
-	(get_nth): implement function.
-	(cursor_destroy): free up the internal glist of vcards, and fix
-	warning.
-	(pas_backend_file_build_all_cards_list): new function, to build up
-	the list of cards in the db.
-	(pas_backend_file_process_get_all_cards): call
-	pas_backend_file_build_+all_cards_list, and fix warning.
-
-2000-03-27  Christopher James Lahey  <clahey@helixcode.com>
-
-	* addressbook/backend/ebook/test-card.c: Fixed some warnings.
-
-	* addressbook/backend/ebook/test-client.c: Added a section to test
-	cursors and returning an id when adding.
-
-	* addressbook/backend/ebook/e-card-pairs.h: Removed the address
-	pairs since they were added to e-card.c.
-
-	* addressbook/backend/ebook/e-card.c,
-	addressbook/backend/ebook/e-card.h: Made the set_id function take
-	a const char *.
-
-	* addressbook/backend/ebook/e-book-listener.c,
-	addressbook/backend/ebook/e-book-listener.h,
-	addressbook/backend/ebook/e-book.c,
-	addressbook/backend/ebook/e-book.h,
-	addressbook/backend/idl/addressbook.idl,
-	addressbook/backend/pas/pas-backend-file.c,
-	addressbook/backend/pas/pas-book.c,
-	addressbook/backend/pas/pas-book.h: Added a get_all_cards function
-	and made the response to the create_card function include the card
-	id.
-
-	* addressbook/backend/ebook/Makefile.am: Added e-card-cursor.c and
-	e-card-cursor.h.
-
-	* addressbook/backend/ebook/e-card-cursor.c,
-	addressbook/backend/ebook/e-card-cursor.h: New class for proxying
-	to an Evolution_CardCursor.
-
-	* addressbook/backend/pas/Makefile.am: Added pas-card-cursor.c and
-	pas-card-cursor.h.
-
-	* addressbook/backend/pas/pas-card-cursor.c,
-	addressbook/backend/pas/pas-card-cursor.h: New bonobo class for
-	making an Evolution_CardCursor server.
-
-2000-03-27  NotZed  <NotZed@HelixCode.com>
-
-	* tests/test9.c (main): This test is basically now invalid.
-	* tests/test11.c (main): Fix for async search api.  Probably works.
-	Removed camel-mbox-*.h headers, should be private.
-
-2000-03-27  Tuomas Kuosmanen  <tigert@gimp.org>
-	* art/attachment.xpm art/mail-new.xpm art/mail-read.xpm
-	art/mail-replied.xpm art/mark.xpm art/meeting.xpm
-	art/priority-high.xpm art/priority-low.xpm
-
-	Added some new icons for the message-list view..
-
-2000-03-26  Chris Toshok  <toshok@laptoph.xtoph.org>
-
-	* configure.in: check for db_185.h (present in newer db
-	distributions.)
-
-	* addressbook/backend/pas/pas-backend-file.c
-	(pas_backend_file_create_unique_id): new function.
-	(pas_backend_file_process_create_card): call
-	pas_backend_file_create_unique_id and pas_book_notify_add (if the
-	db->put was successful).  also, sync out db.
-	(pas_backend_file_process_remove_card): call
-	pas_book_notify_remove if the db->del was successful, and sync out
-	db.
-	(pas_backend_file_process_modify_card): call
-	pas_book_notify_change if db->put was successful, and sync out db.
-	(string_to_dbt): new function.
-	(pas_backend_file_process_create_card): use string_to_dbt
-	(pas_backend_file_process_remove_card): likewise
-	(pas_backend_file_process_modify_card): likewise
-	(pas_backend_file_get_vcard): likewise
-	(pas_backend_file_upgrade_db): new function, to upgrade a db file
-	if we change the data format.
-	(pas_backend_file_maybe_upgrade_db): check db version vs. current
-	code version, and upgrade it necessary.
-	(pas_backend_file_load_uri): call pas_backend_file_maybe_upgrade.
-
-2000-03-26  Christopher James Lahey  <clahey@helixcode.com>
-
-	* addressbook/backend/ebook/test-client.c: Load an ECard instead
-	of a VCard and then get the VCard from that ECard.  Just tests
-	ECard and the client stuff at the same time.  Also, replaces
-	carriage returns with newlines.
-
-	* addressbook/backend/ebook/e-book.c: Fixed a small parity error.
-
-2000-03-25  Chris Toshok  <toshok@laptoph.xtoph.org>
-
-	* addressbook/backend/ebook/test-client.c: create a card and then
-	look it up.
-
-2000-03-26  Chris Toshok  <toshok@laptoph.xtoph.org>
-
-	* addressbook/backend/pas/pas-backend-file.c
-	(pas_backend_file_process_create_card): add db calls to flesh out
-	the interface.  hardcoded id that needs to change, once we decide
-	how we're going to create it.
-	(pas_backend_file_process_remove_card): add db calls to flesh out
-	the interface.
-	(pas_backend_file_process_modify_card): likewise
-	(pas_backend_file_process_check_connection): likewise
-	(pas_backend_file_get_vcard): likewise
-	(pas_backend_file_load_uri): likewise
-
-2000-03-26  Christopher James Lahey  <clahey@helixcode.com>
-
-	* addressbook/backend/ebook/e-book.c: Set the card id properly
-	when retrieving a card.
-
-2000-03-22  NotZed  <NotZed@HelixCode.com>
-
-	* e-util/e-sexp.h: Formatting cleanup.
-
-2000-03-07  NotZed  <NotZed@HelixCode.com>
-
-	* e-util/Makefile.am (libeutil_la_SOURCES): s-sexp.h -> e-sexp.h.
-
-	* addressbook/backend/ebook/e-card.c,
-	addressbook/backend/ebook/e-card.h: Added the ability to set the
-	card's id (and made getting it work correctly also.)
-
-2000-03-25  Chris Toshok  <toshok@laptoph.xtoph.org>
-
-	* addressbook/backend/ebook/e-book.c (e_book_pop_op): pass GList*
-	as second parameter to g_list_remove_link, not the data pointer.
-
-2000-03-26  Christopher James Lahey  <clahey@helixcode.com>
-
-	* addressbook/backend/ebook/e-card-types.h: Removed the
-	address->description field.
-	
-	* addressbook/backend/ebook/e-card.c: Added VCard output and
-	the use of GtkArguments.
-
-	* addressbook/backend/ebook/test-card.c: Updated this to use the
-	GtkArguments.
-
-	* addressbook/backend/ebook/e-book.c: Fixed a memory leak.
-
-2000-03-25  Matt Loper  <matt@helixcode.com>
-
-	* ebook/e-book.c,
-	ebook/e-book.h,	
-	ebook/e-book.h,		
-	ebook/e-card-fields.h,
-	ebook/e-card.h,
-	ebook/e-commerce.h: old, removed. Up-to-date EBook stuff is kept
-	in addressbook/backend/ebook.
-
-2000-03-23  Christopher James Lahey  <clahey@helixcode.com>
-
-	* addressbook/backend/ebook/e-card.c,
-	addressbook/backend/ebook/e-card.h,
-	addressbook/backend/ebook/e-card-types.h,
-	addressbook/backend/ebook/e-card-pairs.h,
-	addressbook/backend/ebook/test-card.c: Added parsing and testing
-	for name, full name, birthday, telephone, email, and street
-	address properties.
-
-2000-03-22  Christopher James Lahey  <clahey@helixcode.com>
-
-	* addressbook/backend/ebook/.cvsignore,
-	addressbook/backend/pas/.cvsignore,
-	addressbook/backend/idl/.cvsignore,
-	addressbook/backend/.cvsignore: Updated .cvsignore files.
-
-2000-03-22  Christopher James Lahey  <clahey@helixcode.com>
-
-	* addressbook/Makefile.am, configure.in: Added the
-	addressbook/backend directory.
-
-	* addressbook/backend/Makefile.am: Removed the libversit directory
-	as it's now included in the base evolution directory.
-
-	* addressbook/backend/ebook/e-card-pairs.h,
-	addressbook/backend/ebook/Makefile.am: Changed the place where
-	libversit is looked for.
-
-	* addressbook/backend/ebook/e-book-listener.c: Fixed some
-	indentation.
-
-	* addressbook/backend/ebook/e-card-pairs.h,
-	addressbook/backend/ebook/e-card-types.h: Commented out some code
-	to get this to compile.
-
-	* addressbook/backend/ebook/e-card.c,
-	addressbook/backend/ebook/e-card.h: Turned this into a GTK+
-	object.
-
-	* addressbook/backend/pas/pas.c,
-	addressbook/backend/ebook/test-client.c: Include gnome.h and
-	gnorba.h.
-
-	* addressbook/backend/idl/addressbook.idl: Include Bonobo.idl
-	instead of bonobo-unknown.idl.
-
-	* addressbook/backend/pas/pas-backend-file.c,
-	addressbook/backend/pas/pas-book.c,
-	addressbook/contact-editor/test-editor.c,
-	addressbook/contact-editor/e-contact-editor.c,
-	addressbook/printing/e-contact-print.c,
-	addressbook/printing/test-contact-print-style-editor.c,
-	addressbook/printing/test-print.c: Killed some warnings.
-
-2000-03-21  Christopher James Lahey  <clahey@helixcode.com>
-
-	* widgets/e-text/e-text.c: Changed gnome_canvas_item_grab_focus to
-	e_canvas_item_grab_focus.
-
-2000-03-21  Christopher James Lahey  <clahey@helixcode.com>
-
-	* addressbook/demo/addressbook-widget.c: Make background pixmap
-	get properly set to NULL.
-
-2000-03-20  Christopher James Lahey  <clahey@helixcode.com>
-
-	* widgets/e-text/e-text.c, widgets/e-text/e-text.h: Added the
-	ability to access the text event processor.
-
-2000-03-13  Christopher James Lahey  <clahey@helixcode.com>
-
-	* addressbook/demo/addressbook-widget.c: Made the addressbook
-	component look in the users home directory for the addressbook.xml
-	file.
-
-2000-03-20  Matt Loper  <matt@helixcode.com>
-
-	* tests/ui-tests/.cvsignore: added filter.
-
-	* addressbook/demo/.cvsignore: added test-addressbook.
-
-2000-03-17 Elliot Lee <sopwith@redhat.com>
-	* calendar/cal-client/Makefile.am,
-	calendar/cal-util/Makefile.am, calendar/gui/Makefile.am,
-	calendar/pcs/Makefile.am, mail/Makefile.am,
-	widgets/e-text/Makefile.am: Fix for srcdir != builddir.
-
-2000-03-14  Dan Winship  <danw@helixcode.com>
-
-	* Makefile.am (SUBDIRS): build shell before mail, since mail
-	relies on the shell idl files being compiled.
-
-2000-03-13  Christopher James Lahey  <clahey@helixcode.com>
-
-	* addressbook/demo/Makefile.am: Added files for addressbook bonobo
-	component.  Changed non bonobo version to compile as
-	test-addressbook.
-
-	* addressbook/demo/addressbook.c,
-	addressbook/demo/addressbook.gnorba,
-	addressbook/demo/addressbook.h,
-	addressbook/demo/addressbook-factory.c,
-	addressbook/demo/addressbook-widget.c,
-	addressbook/demo/addressbook-widget.h: New factory to create an
-	addressbook bonobo component.
-
-2000-03-12  Christopher James Lahey  <clahey@helixcode.com>
-
-	* widgets/e-text/.cvsignore: Added e-text-test.
-
-	* addressbook/demo/e-test-model.c,
-	addressbook/demo/e-test-model.h: A model storing data in an array
-	of Address objects.
-
-	* addressbook/demo/demo.c: Changed to use
-	addressbook/demo/e-test-model.c and
-	addressbook/demo/e-test-model.h.
-
-	* addressbook/demo/Makefile.am: Added e-test-model.c and
-	e-test-model.h.
-
-2000-03-12  Christopher James Lahey  <clahey@helixcode.com>
-
-	* widgets/Makefile.am: Rearranged SUBDIRS for dependencies.
-
-	* widgets/e-text/e-text-model.c, widgets/e-text-model.h: New
-	object which stores a piece of text data.  All methods are
-	virtual.
-
-	* widgets/e-text/e-text.c, widgets/e-text/e-text.h: Modified this
-	to use an ETextModel for its data.
-
-	* widgets/e-text/Makefile.am: Added e-text-model.c and e-text-model.h.
-
-	* widgets/e-minicard/test-minicard-label.c: Made this work again.
-
-	* widgets/e-minicard/e-minicard.c,
-	widgets/e-minicard/e-minicard.h: Made this use an ETableModel to
-	get its data.
-
-	* widgets/e-minicard/e-minicard-label.c,
-	widgets/e-minicard/e-minicard-label.h: Added the ability to set
-	the text model used for the contained text widget.
-
-	* widgets/e-minicard/Makefile.am: Added e-table since e-minicard
-	is now dependent on an e-table-model for its data.
-
-	* addressbook/demo, addressbook/demo/.cvsignore,
-	addressbook/demo/Makefile.am, addressbook/demo/demo.c,
-	addressbook/demo/spec: A new program to test ETable and EMinicard
-	integration.
-
-	* configure.in: Added addressbook/demo/Makefile.
-
-	* addressbook/Makefile.am: Added the demo/ subdirectory.
-
-2000-03-10  Christopher James Lahey  <clahey@helixcode.com>
-
-	* widgets/e-minicard/e-minicard.c,
-	widgets/e-minicard/e-minicard-label.c,
-	widgets/e-minicard/e-minicard-label.h,
-	widgets/e-minicard/e-reflow.c, widgets/e-minicard/test-reflow.c,
-	widgets/e-text/e-text.c, widgets/e-text/e-text.h: Adapted to use
-	the new e-canvas reflow system.
-
-2000-03-07  Christopher James Lahey  <clahey@helixcode.com>
-
-	* widgets/e-text/e-text.c, widgets/e-text/e-text.h: Added a
-	"break_characters" argument.  It lets you define a set of
-	characters which should cause optional linebreaks to occur.  Made
-	setting the "clip_height" argument to -1 mean no height clipping.
-	Moved calling the "resize" signal into an idle handler to avoid
-	reentering the canvas update loop.  Made EText recalc bounds if
-	the affine has changed.  Fixed up tooltip_count (this counts the
-	number of ENTER and LEAVE events.)
-
-	* widgets/e-text/e-text-test.c: Got rid of a few warnings.
-
-	* widgets/e-minicard/e-minicard-label.h: Reindent a few lines.
-
-	* widgets/e-minicard/e-minicard.c,
-	widgets/e-minicard/e-minicard-label.c: Switch from using "x" and
-	"y" to set the children's position to using
-	e_canvas_item_move_absolute.
-
-2000-03-05  Matt Loper  <matt.loper@splashtech.com>
-
-	* tests/ui-tests/message-browser.c: Commenting added.
-	(on_url_data_requested): renamed from "on_url_requested", to
-	reflect that a stream of data is what's actually being asked for.
-	(hydrate_persist_stream_from_gstring): New function.
-	(camel_stream_to_gstring): New function.
-	(on_object_requested): Cleaned up.
-
-2000-03-04  bertrand  <bertrand@helixcode.com>
-
-	* tests/ui-tests/Makefile.am: add bonobo to the build 
-	process.
-
-	* tests/ui-tests/message-browser.c (main): 
-	initialize Bonobo. Use bonobo_main.
-	(get_gtk_html_contents_window): set signal handlers
-	for url requests and objects requests.
-	(on_object_requested): answer to object requests.
-
-2000-03-03  bertrand  <bertrand@helixcode.com>
-
-	* tests/ui-tests/message-browser.c (main): initialize
-	gdkrgb. Push visual/colormap.
-	(on_url_requested): in the case where a camel url is requested, 
-	write the camel stream to gtkhtml. 
-
-	* tests/ui-tests/Makefile.am (filter_LDADD): add
-	gnomeprint in the lib list. 
-
-2000-03-01  Ettore Perazzoli  <ettore@helixcode.com>
-	
-	* configure.in: Build `filter/Makefile'.  Added check for GtkHTML.
-	Set `GTKHTML_CFLAGS' and `GTKHTML_LIBS' to the appropriate values
-	for linking with GtkHTML.
-
-2000-03-01  Federico Mena Quintero  <federico@helixcode.com>
-
-	* configure.in (AC_OUTPUT): Added calendar/idl/Makefile,
-	calendar/cal-client/Makefile, and calendar/pcs/Makefile to the
-	list of files to generate.
-
-2000-02-29  Iain Holmes  <ih@csd.abdn.ac.uk>
-
-	* widgets/e-text/e-text.c: Don't show the tooltip if the text is being
-	editted or isn't clipped. Remove the tooltip when editting starts.
-
-	* widgets/e-text/Makefile.am: Build the test program
-
-2000-02-29  NotZed  <NotZed@HelixCode.com>
-
-	* tests/ui-tests/Makefile.am (filter_LDADD): Added test program.
-
-	* tests/ui-tests/filterdescription.xml, saveoptions.xml: Data
-	files for test program.
-
-	* tests/ui-tests/filter.c (main): Test program for filter ui.
-
-2000-02-28  NotZed  <NotZed@HelixCode.com>
-
-	* widgets/e-minicard/Makefile.am (INCLUDES): Fixed references to
-	eutil.
-
-	* Makefile.am (SUBDIRS): Build e-util before other stuff.
-	(SUBDIRS): Build filter after camel.
-
-2000-02-28  Chris Lahey  <clahey@umich.edu>
-
-	* widgets/e-text/e-text.c: Compilation error.
-
-2000-02-28  Chris Lahey  <clahey@umich.edu>
-
-	* widgets/e-text/e-text.c, widgets/e-text/e-text.h: Updated these
-	to use the canvas ::update system properly.
-
-2000-02-24  Dan Winship  <danw@helixcode.com>
-
-	* acconfig.h:
-	* configure.in: define SENDMAIL_PATH with the path to sendmail.
-
-2000-02-24  Christopher James Lahey  <clahey@helixcode.com>
-
-	* widgets/e-text.c, widgets/e-text.h, e-text-event-processor.c,
-	e-text-event-processor.h, e-text-event-processor-emacs-like.c,
-	e-text-event-processor-emacs-like.h,
-	e-text-event-processor-types.h: This were moved to widgets/e-text/
-	a while ago but never removed.  They have now been removed.
-
-	* widgets/e-text/e-text.c, widgets/e-text/e-text.h: Removed some
-	warnings from this file.  Made tooltips disappear when you're
-	finished with them.
-
-	* widgets/e-minicard/test-reflow.c,
-	widgets/e-minicard/test-minicard.c,
-	widgets/e-minicard/test-minicard-label.c: Commented out unused
-	about_callback functions.
-
-	* widgets/e-minicard/e-reflow.c: Made e-reflow pass an EFocus to
-	its e-minicard children.
-
-	* widgets/e-minicard/e-minicard.c: Made e-minicard take and return
-	an EFocus for its "has_focus" argument.  This makes shift-tab work properly.
-
-	* widgets/e-minicard/e-minicard-label.c: Made e-minicard-label take and return
-	an EFocus for its "has_focus" argument.  Made the font that
-	e-minicard-label uses only be allocated once.
-	
-2000-02-21  Matt Loper  <matt@helixcode.com>
-
-	* tests/ui-tests/message-browser.c (on_link_clicked): stop
-	sscanf() abuse.
-
-	* tests/Makefile.am: changed references to libibex.a to
-	libibex.la.
-
-	* libical/src/libical/.cvsignore: Added *.lo, *.la, and .libs.
-	* libical/src/libicalss/.cvsignore: same.
-
-	* tests/.cvsignore: Added test11.
-
-	* libical/Makefile.in: autogenerated file removed from cvs, and
-	added to .cvsignore.
-	* libical/src/Makefile.in: same.
-	* libical/src/libical/Makefile.in: same.
-	* libical/src/libicalss/Makefile.in: same.
-
-2000-02-22  bertrand  <Bertrand.Guiheneuf@aful.org>
-
-	* tests/ui-tests/message-browser.c (on_link_clicked): 
-	uggly hack to test part saving and
-	b64 streams.
-
-2000-02-21  Dan Winship  <danw@helixcode.com>
-
-	* tests/test10.c:
-	* tests/test11.c: update for camel changes
-
-2000-02-20  Matt Loper  <matt@helixcode.com>
-
-	* tests/Makefile.am: Changed dependencies on libibex.la to
-	libibex.a. In test9_LDADD, placed libcamelmbox.la before
-	libibex.la, as the former requires the latter.
-
-2000-02-20  Iain Holmes  <ih@csd.abdn.ac.uk>
-
-	* widgets/e-text/e-text.[ch] (_do_tooltip): Show the text of the item,
-	in a tooltip style.
-	(e_text_event): Add a timeout on the Enter and remove it on the Leave
-	events.
-
-	* e-text-test.c: New file to test e-text items.
-	
-2000-02-20  Matt Loper  <matt@helixcode.com>
-
-	* .cvsignore: added ABOUT-NLS.  
-	* ABOUT-NLS: removed.
-	
-2000-02-19  Matt Loper  <matt@helixcode.com>
-
-	* tests/ui-tests/message-browser.c (on_link_clicked): When a link
-	is clicked, indicate the link with a dialog.
-
-	* libical/src/test/.cvsignore: Added Makefile.
-
-	* libical/.cvsignore: Added Makefile, configure, config.status.
-
-	* libical/src/.cvsignore: New file.
-
-	* libical/Makefile: autogenerated file removed from cvs.
-	* libical/configure: same. 
-	* libical/config.status: same.
-	* libical/src/Makefile: same.
-	* libical/src/test/Makefile: same.
-
-	* widgets/e-minicard/.cvsignore: Added minicard-label-test,
-	minicard-test, and reflow-test.
-
-	* shell/.cvsignore: added files autogenerated from Evolution.idl.
-
-	* libversit/.cvsignore: Added .libs, vcc.c, vcc.lo, vobject.lo,
-	vcaltmp.lo, libversit.la
-
-	* libical/src/test/.cvsignore: New file.
-
-	* libical/src/libical/.cvsignore: New file.
-
-	* libical/src/libicalss/.cvsignore: New file.
-
-	* libical/.cvsignore: New file, with config.log in it.
-
-	* tests/ui-tests/message-browser.c: minor cleanup.
-
-	* tests/ui-tests/.cvsignore: added message-browser.
-
-2000-02-18  NotZed  <NotZed@HelixCode.com>
-
-	* tests/test11.c (main): Use a relative path to the mbox provider
-	module.
-
-2000-02-18  Matt Loper  <matt@helixcode.com>
-
-	* tests/ui-tests/message-browser.c (filename_to_camel_msg): Call
-	camel_data_wrapper_set_input_stream, rather than
-	camel_data_wrapper_construct_from_stream.  For the whole message,
-	allow someone to see the header ("to", "from", etc.).  Clicking on
-	tree items to see their elements, now works also.
-
-2000-02-18  Miguel de Icaza  <miguel@nuclecu.unam.mx>
-
-	* configure.in: Make gnomeui the last library on the command line,
-	as its path is the one most likely to hold other old libraries
-	(libxml) and we need newer versions.
-	
-	(BONOBO_VFS_GNOME_CFLAGS): Add libical to the
-	AC_CONFIG_SUBDIRS 
-
-	(BONOBO_HTML_GNOME_CFLAGS): VFS checking needs to
-	go before we rquery them. 
-
-	Use the new method for gnome-print
-	checking instead of the old crufty gtk+ based one that nobody can
-	debug.  ever.
-	
-2000-02-16  Matt Loper  <matt@helixcode.com>
-
-	* tests/ui-tests/message-browser.c (tree_selection_changed): New
-	callback function, which will later change the main html window to
-	reflect the newly-selected tree item.
-	(get_gtk_html_contents_window): New function. Gets the content
-	part of a message.
-	(get_gtk_html_header_window): New function. Will get the header
-	part of a message, when applicable.
-
-	* camel/camel-formatter.c (str_tolower): Now returns a new string,
-	rather than changing it in place.
-	(initialize_camel_formatter): New function; gives a root
-	CamelDataWrapper and a stream to a CamelFormatter.
-	(camel_formatter_wrapper_to_html): New function. Translates any
-	CamelDataWrapper into html.
-	(lookup_unique_id): Allows the root object to be a
-	CamelDataWrapper, which is more general than the previously
-	required CamelMimeMessage.
-
-
-2000-02-14  NotZed  <notzed@zedzone.helixcode.com>
-
-	* configure.in (EXTRA_GNOME_CFLAGS): Add libunicode to CFLAGS/LIBS.
-
-2000-02-13  NotZed  <notzed@zedzone.helixcode.com>
-
-	* configure.in: Added check for libunicode.
-
-	* Makefile.am (SUBDIRS): Added libibex.
-
-	* tests/test11.c (main): New test, tests search api.
-
-2000-02-13  Matt Loper  <matt@helixcode.com>
-
-	* tests/ui-tests/test-multipart-mixed.msg: New rfc822 file, which
-	crashes message-browser.
-
-	* tests/ui-tests/message-browser.c (get_gtk_html_window): Takes a
-	CamelMimeMessage as a param, rather than a filename.
-	(main): Puts our windows in an hpane rather than a vbox. Also
-	opens a file dlg box if a filename wasn't given as a first param.
-
-	* camel/camel-stream-fs.c (_init_with_name): Set stream_fs->fd to
-	-1 if we fail to load the file.
-	(camel_stream_fs_new_with_name): If stream_fs->fd is -1, return
-	NULL. These changes make it so that a CamelStreamFs won't be
-	created if you give it a bogus filename; they may be replaced once
-	exception handling is in place.
-
-	* tests/ui-tests/message-browser.c (handle_tree_item): Expand tree
-	items.
-	(mime_message_to_html): New function; translates a
-	CamelMimeMessage into two strings (one for the header, and one for
-	the body).
-	(get_gtk_html_window): New function; fills out a window with
-	html. The html is taken from a processed rfc822 file, via a
-	CamelFormatter.
-
-	* camel/camel-formatter.c: Added assertions.
-	(handle_text_html): Don't call text_to_html on something that's
-	already html.
-	(multipart_foreach): function deleted.
-
-	* tests/ui-tests/message-browser.c: Added preliminary support for
-	the viewing of messages via gtkhtml. Lots of commenting. 
-
-2000-02-11  Christopher James Lahey  <clahey@helixcode.com>
-
-	* addressbook/contact-editor/e-contact-editor.c: Fixed the
-	location the first time you see the drop down menus for changing
-	which phone, email, or snail mail address you see.
-
-2000-02-11  Christopher James Lahey  <clahey@helixcode.com>
-
-	* widgets/e-text/e-text.c (e_text_event): Made a click on a text
-	widget set the cursor properly.
-
-2000-02-11  Christopher James Lahey  <clahey@helixcode.com>
-
-	* widgets/e-text/e-text.h: Removed some arguments from the .h that
-	will never be implemented.
-
-
-2000-02-10  bertrand  <Bertrand.Guiheneuf@aful.org>
-
-	* camel/data-wrapper-repository.c (data_wrapper_repository_init): 
-	default the text/* mime types to CamelSimpleDataWrapper so
-	that Michael can use get_stream. 
-
-2000-02-10  NotZed  <notzed@zedzone.helixcode.com>
-
-	* camel/camel-simple-data-wrapper-stream.h: The superclass is
-	actually a seekable stream, not just a stream.
-
-2000-02-10  bertrand  <Bertrand.Guiheneuf@aful.org>
-
-	* tests/Makefile.am (THREAD_RELATED_TESTS): don't 
-	build thread related tests if evolution has been
-	compiled with no thread support.
-
-	* configure.in (have_pthread): allow user to enable/disable
-	thread support at configure time
-	(EXTRA_GNOME_CFLAGS): 
-	(EXTRA_GNOME_LIBS): thread support is directly 
-	included in this variable if enabled. No more
-	EXTRA_GNOME_CFLAGS_THREADS
-	Other special support should be added in 
-	EXTRA_GNOME_LIBS and EXTRA_GNOME_CFLAGS
-	instead of redefining a new variable 
-	each time we want to add a new lib. 
-	(bonobo, ....)
-
-	* camel/camel.c (camel_init): only try to initialize threads if
-	we enabled threads support. 
-
-	* tests/ui-tests/Makefile.am (message_browser_LDADD): use
-	EXTRA_GNOME_LIBS
-
-	* configure.in (have_pthread): remove HAVE_PTHREADS
-	variable. Define ENABLE_THREADS instead.
-
-	* camel/Makefile.am: use ENABLE_THREADS not HAVE_PTHREADS
-	to test if we build thread relateed code. 
-
-	* tests/Makefile.am: use EXTRA_GNOME_LIBS, 
-	not EXTRA_GNOME_LIBS_THREADS
-
-2000-02-10  NotZed  <notzed@zedzone.helixcode.com>
-
-	* camel/hash-table-utils.c (g_strcase_hash): Removed a bizarre
-	comparison construct for converting case.
-
-2000-02-09  NotZed  <notzed@zedzone.helixcode.com>
-
-	* camel/data-wrapper-repository.c (data_wrapper_repository_init):
-	Uses case-insensitive compares.
-
-	* camel/gmime-content-field.c (gmime_content_field_new): Uses
-	case-insensitive compares.
-
-	* camel/data-wrapper-repository.c (data_wrapper_repository_init):
-	Use case-insensitive mime types.
-
-	* camel/camel-simple-data-wrapper-stream.c (read): Increment the
-	copy source address to match the data read offset.
-	(seek): Actually implement the seek.
-
-	* camel/camel-mime-part-utils.c
-	(camel_mime_part_store_stream_in_buffer): If we get a -1 read,
-	DONT update the total bytes, and try and truncate the array in
-	reverse.  Eek.
-
-	* camel/camel-mime-part.c (camel_mime_part_encoding_from_string):
-	This was DEFINETLEY not the right way to do it. strncmp!=strcmp
-	(camel_mime_part_encoding_to_string): Handle the default case.
-	: include string.h for strcmp() etc.
-
-2000-02-09  Matt Loper  <matt@helixcode.com>
-
-	* tests/ui-tests/test-multipart-alt.msg: New test file; run
-	message-browser on it, and it will crash.
-
-2000-02-09  bertrand  <Bertrand.Guiheneuf@aful.org>
-
-	* tests/ui-tests/message-browser.c (handle_tree_item): 
-	show the item. 
-	(handle_tree_item): show the containers and the containees
-	(get_message_tree_ctrl): call handle_tree_item
-	on the message itself
-
-	* camel/camel-mime-message.c (camel_mime_message_init): 
-	set the mime type to "mime/message".
-	--- THIS IS NOT THE CONTENT TYPE ---
-
-	* camel/camel-mime-body-part.c (camel_mime_body_part_init): 
-	set the mime type to "body-part". 
-	--- THIS IS NOT THE CONTENT TYPE ---
-
-	* camel/camel-data-wrapper.c (camel_data_wrapper_set_mime_type): 
-	mime_type is const. 
-	(_set_input_stream): really set the input stream
-	(_set_output_stream): really set the output stream
-	various other typo fixes.
-
-	* tests/ui-tests/message-browser.c: various typo
-	fixes in the ctree construction. 
-
-	* camel/string-utils.c (string_trim): fix braindead
-	trailing trim bug.
-
-	* camel/gmime-content-field.c (gmime_content_field_construct_from_string): 
-	strip the leading and trailing quotes when constructing the 
-	content field. This should be done in a more generic 
-	RFC822 approach, but this fixes a bug that prevent
-	matt from analysing some multipart messages.
-
-	* camel/camel-data-wrapper.h: reorganize the 
-	deprecated and new methods. 
-
-	* camel/providers/mbox/camel-mbox-folder.c 
-	(_check_get_or_maybe_generate_summary_file): 
-	Use "From " as the message separating string. 
-	
-	* camel/providers/mbox/camel-mbox-folder.c (_append_message): 
-	set the mode when creating the mbox file. 	
-
-	* camel/providers/mbox/camel-mbox-utils.c (camel_mbox_write_xev): 
-	ditto
-	* camel/providers/mbox/camel-mbox-summary.c (camel_mbox_save_summary): 
-	ditto
-
-2000-02-09  Matt Loper  <matt@helixcode.com>
-
-	* tests/ui-tests/message-browser.c (print_usage_and_quit): Minor
-	cleanup.
-
-2000-02-09  NotZed  <notzed@zedzone.helixcode.com>
-
-	* camel/camel-simple-data-wrapper-stream.c (class_init): Actually
-	initialise the class.  It simple couldn't have worked before.
-	(camel_simple_data_wrapper_stream_construct): Commented out code
-	which crashes just to get something working, memory corruption??
-
-2000-02-09  Christopher James Lahey  <clahey@helixcode.com>
-
-	* configure.in: Add new Makefiles to Makefile list.
-
-	* widgets/e-text/Makefile.am: Build libetext.
-
-	* widgets/e-minicard/Makefile.am: Build libeminicard and test
-	programs.
-
-	* widgets/Makefile.am: Remove all e-text and e-minicard code and
-	add them to the SUBDIRS list.
-
-2000-02-08  Matt Loper  <matt@helixcode.com>
-
-	* tests/ui-tests/message-browser.c: New file; shows a message in
-	tree format, where multipart's have multiple leaves.
-
-	* camel/camel-formatter.c: Changed references from
-	'multipart/alternate' to 'multipart/alternative'.
-
-	* tests/test-formatter.c (convert_to_html_and_print): Use the
-	buffer length of the stream to create strings which are then
-	printed, rather than printing the stream (which might not have a
-	trailing \0) directly.
-
-	* camel/camel-formatter.c (str_tolower): New function; makes a
-	string lowercase.
-
-	* tests/test-formatter.c (convert_to_html_and_print): Fixed call
-	to 'camel_formatter_mime_message_to_html' to contain correct
-	params.
-
-	* camel/camel-formatter.c: New member to 'CamelFormatterPrivate',
-	'attachments', will be used to let the caller know which items
-	should be treated as attachments (as opposed to objects which are
-	inline to the body).
-	(text_to_html): name changed from 'encode_entities'. Also now
-	converts newlines to <br> tags.
-	(camel_formatter_mime_message_to_html): Now takes two output
-	streams -- one for the header, and one for the body.
-	(get_bonobo_tag_for_object): New function; tries to make a tag out
-	of (1) the leaf of a mime message and (2) a bonobo object that can
-	handle its mime type, but can return NULL if it fails to find the
-	mime type.
-	(handle_vcard): New function; will write out a vcard as html.
-
-2000-02-07  Christopher James Lahey  <clahey@helixcode.com>
-
-	* widgets/e-text.h, widgets/e-text.c: Added line wrap and a max
-	number of lines (max number of lines is only obeyed if text is not
-	being edited).
-
-2000-02-07  Christopher James Lahey  <clahey@helixcode.com>
-
-	* addressbook/printing/e-contact-print.c: Removed an unneccessary
-	include of libhnj.  All uses of libhnj are commented out.
-
-2000-02-07  Matt Loper  <matt@helixcode.com>
-
-	* camel/camel-formatter.c (mime_part_to_html): function deleted.
-
-	* tests/test-formatter.c (print_usage_and_quit): New function,
-	which gives usage information.
-
-	* camel/camel-formatter.c: made the 'stream' a member of the
-	CamelFormatter class, so that streams don't have to be explicitly
-	sent as a param where a CamelFormatter is also sent..
-	(handle_text_plain): Use 'encode_entities' to change '<' to
-	'&gt;', etc.
-
-2000-02-03  bertrand  <Bertrand.Guiheneuf@aful.org>
-
-	* camel/camel-formatter.c (find_preferred_displayable_body_part_in_multipart_alternative): 
-	(mime_part_to_html): typo fix : 
-	use find_preferred_displayable_body_part_in_multipart_alternative
-	instead of the other names. Allows camel to have no undefined symbols. 
-
-2000-02-02  Matt Loper  <matt@helixcode.com>
-
-	* tests/test-formatter.c: New file; intended to test the
-	CamelFormatter class.
-
-	* camel/camel-formatter.c: Lots of cleanup, commenting, some new
-	functions, and a really basic skeleton for getting bonobo objects
-	into the html.
-	(encode_entities): New function, stolen from Daniel Velliard.
-
-2000-01-28  Christopher James Lahey  <clahey@helixcode.com>
-
-	* addressbook/printing/e-contact-print-style-editor.h,
-	addressbook/printing/e-contact-print-style-editor.c,
-	addressbook/printing/test-contact-print-style-editor.c: Files to
-	load the contact print style editor from the glade file.  Doesn't
-	really do anything yet.
-
-	* addressbook/printing/Makefile.am: Added style editor stuff.
-
-	* addressbook/printing/e-contact-print.glade: Changed a bit.
-	Fixed an out of place widget.
-
-	* addressbook/printing/.cvsignore: Added
-	contact-print-style-editor-test.
-
-	* addressbook/printing/smallbook.ecps: Fixed up the values to
-	match the new types.
-
-	* addressbook/printing/medbook.ecps,
-	addressbook/printing/phonelist.ecps: Added two new printing
-	styles.
-
-	* addressbook/printing/e-contact-print.h: Fixed an incorrect
-	comment.
-	
-	* addressbook/printing/e-contact-print.c: Added columns and letter
-	tabs.  Tweaked spacing all over the place.  Fixed card height
-	function so that column wrapping is always done correctly.  Added
-	pulling of style information from a file.  Added line wrapping
-	within each text field.
-
-	* addressbook/printing/e-contact-print-types.h: Added a type field
-	for different types of print styles.
-
-
-2000-01-28  Christopher James Lahey  <clahey@helixcode.com>
-
-	* widgets/e-text.c (e_text_command): Handle the grab and ungrab
-	command instead of doing focus by hand.  This fixes a problem
-	related to the scroll wheel.
-	(e_text_command): Reset the blink timer in many more command
-	situations so that the cursor blinks less when you're interacting
-	with it.
-
-	* widgets/e-text-event-processor-emacs-like.c: Send the grab focus
-	command when starting a selection and the ungrab focus command
-	when ending it.
-
-	* widgets/e-text-event-processor-types.h: Added grab command type
-	so that the event processor can tell the widget to grab the focus.
-
-	* widgets/e-reflow.c: Redefined all sizes using #defines so that
-	they can be tweaked later.  Added scroll wheel handling and set up
-	adjustment increments so that the scroll bars will work correctly.
-
-	* widgets/e-minicard.h: Added minicard focus type enum.  This
-	doesn't mean anything yet, but it will later be used to say which
-	direction the focus is coming from (below for shift-tab, above for
-	tab.)
-
-2000-01-28  Christopher James Lahey  <clahey@helixcode.com>
-
-	* widgets/e-minicard-label.c, widgets/e-minicard.c: Use
-	e_canvas_item_grab_focus so that it will work with old versions of
-	gnome-canvas.
-
-	* widgets/e-canvas.c, widgets/e-canvas.h: Finished working around
-	focus bugs.
-
-2000-01-28  Christopher James Lahey  <clahey@helixcode.com>
-
-	* widgets/test-reflow.c: Set the minimum_width.
-
-	* widgets/e-reflow.h, widgets/e-reflow.c: Added one more column
-	line so that the right edge of the reflow will have a line.  Also
-	added a minimum_width so that even if the reflow is thinner than
-	the window, when you resize it larger all the lines are drawn.
-
-2000-01-27  Christopher James Lahey  <clahey@helixcode.com>
-
-	* widgets/e-reflow.h, widgets/e-reflow.c: Added an arrow cursor
-	for the draggable columns.  Made the clickable column area
-	larger.  
-
-	* widgets/e-text.h, widgets/e-text.c: Added an I beam cursor for
-	the text item when it is editable.
-
-	* widgets/e-minicard-label.c: Forward enter and leave
-	notifications to the contained editable text item.
-
-2000-01-26  Matt Loper  <matt@helixcode.com>
-
-	* camel/camel-formatter.c: By looking up a mimetype in a
-	hashtable, we can now get a handler function for an arbitrary
-	mimetype.
-
-2000-01-25  Mathieu Lacage <mathieu@advogato.org>
-
-	* .cvsignore s: cvs shutup. 
-
-2000-01-25  Christopher James Lahey  <clahey@helixcode.com>
-
-	* widgets/e-reflow.c, widgets/e-minicard.c: Handle shift-tab
-	properly now.
-
-	* widgets/e-minicard-label.c: Reindented some areas.
-
-	* widgets/test-reflow.c: Use e-canvas.  Set the back pixmap to
-	NULL for the canvas so that scrolling won't flash grey.
-
-	* widgets/e-canvas.c, widgets/e-canvas.h: These subclass
-	GnomeCanvas to work around a few bugs so that evolution will work
-	well with old versions of gnome-libs.
-
-	* widgets/Makefile.am: Added e-canvas.c and e-canvas.h.
-
-	* addressbook/contact-editor/contact-editor.glade: Not much
-	change.  Mostly internal reorganization by glade itself.
-
-2000-01-25  Christopher James Lahey  <clahey@helixcode.com>
-
-	* addressbook/printing/smallbook.ecps: Example contact printing
-	style.  Not used yet.
-
-	* addressbook/printing/e-contact-print.glade: A glade file for
-	editing contact printing styles.  Not used yet.
-
-	* addressbook/printing/test-print.c: Test file for printing.
-
-	* addressbook/printing/e-contact-print.c,
-	addressbook/printing/e-contact-print.h,
-	addressbook/printing/e-contact-print-types.h,
-	addressbook/printing/Makefile.am, addressbook/printing/.cvsignore:
-	New files for contact printing support.
-
-	* addressbook/Makefile.am (SUBDIRS): Add printing.
-
-	* configure.in: Check for gnome-print.  Build the
-	addressbook/printing Makefile.
-
-2000-01-24  bertrand  <bertrand@helixcode.com>
-
-	* camel/camel-data-wrapper.h: 
-	* camel/camel-data-wrapper.c 
-	(_set_input_stream): 
-	(_get_input_stream): 
-	(_set_output_stream): 
-	(_get_output_stream): 
-	The CamelDataWrapper can now be provided with input and
-	output streams, so that nothing has to be kept in memory. 
-	
-	* camel/camel-stream.c (camel_stream_class_init): 
-	added the "data_available" signal.
-	
-
-2000-01-24  Federico Mena Quintero  <federico@helixcode.com>
-
-	* configure.in: Added the gnome-pilot and capplet checks; they
-	will likely be reworked for the Evolution framework, but for now
-	the calendar/ directory needs them.
-
-	* configure.in: Added checks for gnome-vfs.
-
-2000-01-24  bertrand  <bertrand@helixcode.com>
-
-	* camel/camel-seekable-stream.c: 
-	* camel/camel-seekable-stream.h: 
-	new files. 
-	
-	* camel/camel-simple-data-wrapper-stream.h:  parent class is now
-	CamelSeekableStream
-	* camel/camel-stream-buffered-fs.h: idem
-	* camel/camel-stream-buffered-fs.c: idem
-	* camel/camel-stream-mem.h: idem
-	* camel/camel-stream-mem.c: idem
-	(_seek): change declaration
-	* camel/camel-stream-fs.c: parent class is now
-	CamelSeekableStream
-	(_seek): change declaration
-
-	* camel/camel-stream-fs.h: parent class is now
-	CamelSeekableStream
-	
-	* camel/camel-stream-fs.[ch]: converted all 
-	gint64 variables into guint32. 
-	
-	
-	* camel/camel-stream-fs.c (_read): fix stupid bug.
-	(_write): ditto. 
-
-	* camel/camel-exception.c (camel_exception_new): don't
-	forget to clean the exception when creating it. 
-
-	* camel/camel-recipient.c (camel_recipient_table_add_list): 
-	add recipient_list to the recipients, not recipients_list. 
-	I don't know what that variable was doing here. 
-
-
-2000-01-24  Matt Loper  <matt@helixcode.com>
-
-	* camel/camel-formatter.c (write_header_info_to_stream): new
-	function, broken out from 'camel_formatter_make_html'.
-	(write_mimepart_to_stream): same.
-	(find_text_body_part_in_multipart_related): new function.
-	(camel_formatter_make_html): Now tries to deal with
-	multipart/related, multipart/alternate, and text/(plain|html).
-
-
-2000-01-23  bertrand  <bertrand@helixcode.com>
-
-	* camel/camel-store.c (camel_store_get_session): 
-	added a public get_session method.
-
-	* camel/providers/mbox/camel-mbox-summary.c (camel_mbox_save_summary): 
-	(camel_mbox_load_summary): load/save message sizes in the summary file
-
-	* camel/providers/mbox/camel-mbox-summary.h: 
-	added a size field to the message information 
-	structure. 
-
-	* camel/providers/mbox/camel-mbox-utils.c (parsed_information_to_mbox_summary): 
-	copy message size to the mbox summary information too. 
-	
-	* camel/camel-stream-fs.c (_seek): updated to 
-	work with bounded fs streams. 
-	(_write): ditto.
-	(_read): ditto.
-
-	* camel/camel-stream-fs.h (struct ): 
-	added the cur_pos, inf_bound and sup_bound
-	members to allow for bounded fs stream. 
-
-	* camel/camel-stream-fs.c (_set_bounds): new func.
-	(_init_with_fd_and_bounds): idem.
-	(_init_with_name_and_bounds): idem. 
-	New functions to allow the usage of bounded fs streams.
-
-	The bounded fs stream allow, for example, to make a stream
-	from a message stored in an mbox file. 
-	
-	
-2000-01-22  bertrand  <bertrand@helixcode.com>
-
-	* camel/providers/mbox/camel-mbox-folder.c (_check_get_or_maybe_generate_summary_file): 
-	use the real summary file path instead of a 
-	stupid hardcoded one. Fixes yet another bug.
-
-	* camel/providers/mbox/camel-mbox-utils.c (parsed_information_to_mbox_summary): 
-	don't forget to copy the date too. Fix a very annoying bug.
-
-	* camel/providers/mbox/camel-mbox-folder.c (_append_message): 
-	implemented. A lot of fixes too. Works now. 
-	(_get_uid_list): implemented.
-
-2000-01-21  bertrand  <bertrand@helixcode.com>
-
-	* tests/test10.c:
-	test the mbox provider. 
-
-	* camel/camel-folder.c (_set_name): 
-	if camel_folder_get_mode returns an
-	exception, return it instead of
-	overriding it with a new one.
-	(camel_folder_is_open): make the is_open
-	method public.
-	(_set_name): use the is_open instead of
-	get_mode.
-	(_set_name): set the fullname even in the case 
-	where the folder has no parent.
-	(_set_name): use %c, not %d to add the 
-	separator char into the full path.
-
-	* camel/camel-store.c: add exception handling everywhere in
-	the store related functions arguments. 
-	* camel/providers/mbox/camel-mbox-folder.c: idem
-	* camel/providers/mbox/camel-mbox-folder.h: idem
-	* camel/providers/mbox/camel-mbox-store.h: idem
-
-	* camel/providers/mbox/Makefile.am (libcamelmbox_la_SOURCES): 
-	added camel-mbox-provider.c to the mbox provider
-	sources. 
-
-	* camel/providers/mbox/camel-mbox-provider.c: 
-	provider registration code.
-
-	* camel/providers/mbox/camel-mbox-folder.c (_get_message_count): implemented
-	(_append_message): implemented
-
-	* camel/providers/mbox/camel-mbox-parser.c (initialize_buffer): 
-	use \0 to mark the end of the buffer.
-	(read_next_buffer_chunk): ditto.
-	(read_header): test the presence of a \0 instead of
-	reading the eof field
-	(read_message_begining): idem.
-	(camel_mbox_parse_file): idem.
-	Remove the eof field from the parser
-	structure. 
-	(read_next_buffer_chunk): removed some nasty bugs
-	again. 
-
-	
-2000-01-21  Federico Mena Quintero  <federico@helixcode.com>
-	
-	* libversit/vcc.y: Removed the VFS crap; my mistake, it should not
-	go here.
-
-	* configure.in: Added yacc requirements for libversit.
-
-2000-01-21  Matt Loper  <matt@helixcode.com>
-
-	* camel/camel-formatter.c (camel_formatter_make_html): added a
-	CamelMimeMessage as a param to this function, and removed it as a
-	member of the object.
-
-2000-01-21  Federico Mena Quintero  <federico@helixcode.com>
-
-	* configure.in (AC_OUTPUT): Added libversit/Makefile and
-	calendar/Makefile.
-
-	* Makefile.am (SUBDIRS): Added libversit and calendar.
-
-2000-01-20  bertrand  <bertrand@helixcode.com>
-
-	* camel/providers/mbox/camel-mbox-parser.c (camel_mbox_parse_file): 
-	compute and return the file size. 
-
-
-2000-01-20  Matt Loper  <matt@helixcode.com>
-
-	* camel/camel-formatter.c, camel/camel-formatter.h: New
-	files. You'll be able to use a CamelFormatter to get
-	html-formatted versions of a CamelMimeMessage.
-	
-2000-01-20  Christopher James Lahey  <clahey@helixcode.com>
-
-	* widgets/e-text-event-processor-types.h: Changed some line
-	spacing.
-
-	* widgets/test-reflow.c: Connected to the resize signal of the
-	reflow.
-
-	* widgets/e-minicard.c: Made width argument set function only
-	update if width is different.
-
-	* widgets/e-reflow.h, widgets/e-reflow.c: Added draggable column dividers.
-
-	* addressbook/contact-editor/test-editor.c: Open two dialogs for
-	more interesting testing.
-
-	* addressbook/contact-editor/e-contact-editor.h,
-	addressbook/contact-editor/e-contact-editor.c: Modified to use
-	glade.  Added menus to change which phone/address/email entries to
-	view.  Added images to the dialog.
-
-	* addressbook/contact-editor/e-contact-editor-strings.h,
-	addressbook/contact-editor/contact-editor.glade: Glade files for
-	the contact editor dialog.
-
-	* addressbook/contact-editor/Makefile.am: Added images and added
-	glade stuff.
-
-	* addressbook/contact-editor/arrow.png,
-	addressbook/contact-editor/briefcase.png,
-	addressbook/contact-editor/netfreebusy.png,
-	addressbook/contact-editor/netmeeting.png: Image files for the
-	contact editor dialog.
-
-2000-01-19  bertrand  <bertrand@helixcode.com>
-
-	* camel/providers/mbox/camel-mbox-folder.c (_get_message_count): 
-	implemented.
-
-	* camel/providers/mbox/camel-mbox-summary.c (camel_mbox_save_summary): 
-	(camel_mbox_load_summary): save/load the next uid. 
-
-	* camel/providers/mbox/camel-mbox-parser.c (camel_mbox_parse_file): 
-	Compute the next available uid. 
-	* camel/providers/mbox/camel-mbox-folder.c (_create): 
-	(_check_get_or_maybe_generate_summary_file): 
-	Set and use the next_uid field properly. 
-	* camel/providers/mbox/camel-mbox-summary.h: added
-	an extra field to store the next available uid. 
-
-	* camel/providers/mbox/camel-mbox-folder.c 
-	(_check_get_or_maybe_generate_summary_file): 
-	routine called when the folder is opened. 
-	Reads or creates the summary file. 
-	(_create): initialize the internal summary 
-	structure. 
-	(_close): save the summary file on closing. 
-	(_init_with_store): initialize mbox specific
-	folder members. 
-
-2000-01-18  bertrand  <bertrand@helixcode.com>
-
-	* tests/test9.c:
-	tests for summary and parsing process of mbox files. 
-
-	* camel/providers/mbox/camel-mbox-parser.c (camel_mbox_parse_file): do
-	not use case insensitive comp to detect message separators. Kill 
-	some nasty bugs in netscape file parsing,
-
-	* camel/providers/mbox/camel-mbox-utils.c (parsed_information_to_mbox_summary): 
-	don't use g_array_append but write directly inside the
-	array data instead. Better performance and bug fix. 
-
-	* camel/providers/mbox/camel-mbox-summary.c (camel_mbox_load_summary): 
-	fix the name and bugs. 
-
-	* camel/camel-folder-summary.h: update the class
-	method definition to match the public defs. 
-
-	* camel/providers/mbox/camel-mbox-summary.c (camel_mbox_save_summary): 
-	(mbox_load_summary): summary file read/write routines. 
-
-	* camel/providers/mbox/camel-mbox-utils.c (parsed_information_to_mbox_summary): 
-	routine to construct the summary after the mbox
-	file has been parsed and the x-evolution fields
-	inserted. 
-
-2000-01-17  bertrand  <bertrand@helixcode.com>
-
-	* camel/providers/mbox/camel-mbox-utils.c (camel_mbox_write_xev): 
-	dont use the x_evolution field but rather the uid to 
-	determine the presence of "X-Evolution" in the mail. 
-
-	* camel/providers/mbox/camel-mbox-parser.c (camel_mbox_parse_file): 
-	parse the status and uid values if the x-evolution
-	has been found. 
-
-	* camel/providers/mbox/camel-mbox-utils.c (camel_mbox_xev_parse_header_content): 
-	return the parsed status field correctly. 
-
-	* camel/providers/mbox/camel-mbox-utils.h: 
-	fixed bad prototype.
-
-	* camel/providers/mbox/camel-mbox-parser.c (camel_mbox_parse_file): 
-	parse and store the "To:" header.
-
-	* camel/providers/mbox/camel-mbox-parser.h: 
-	added a "to" field 
-
-	* camel/camel-folder-summary.c: 
-	create the arrays here. 
-
-	* camel/camel-folder-summary.h: the list of 
-	summary information is no longer a GList but 
-	rather a GArray.
-
-2000-01-17  Chrsitopher James Lahey  <clahey@helixcode.com>
-
-	* head.png, phone.png, email.png, web.png, snailmail.png: Images
-	for e-contact-editor.c.
-
-	* addressbook/contact-editor/text-editor.c: Test program
-	for contact editor widget.
-
-	* addressbook/contact-editor/e-contact-editor.c,
-	addressbook/contact-editor/e-contact-editor.h: Contact editor
-	widget files.
-
-	* addressbook/contact-editor/.cvsignore,
-	addressbook/contact-editor/Makefile.am: New directory for contact
-	editor files.
-
-	* addressbook/.cvsignore, addressbook/Makefile.am: New directory
-	for addressbook files.
-
-	* widgets/.cvsignore: Added reflow-test.
-
-	* Makefile.am (SUBDIRS): Added addressbook subdirectory.
-
-	* configure.in, widgets/Makefile.am: Removed widgets/toolbar from
-	SUBDIRS since the lack of content was preventing it from
-	compiling.
-
-	* widgets/e-text.c, widgets/e-text.h: Fixed a crashing bug.
-
-2000-01-17  bertrand  <bertrand@helixcode.com>
-
-	* tests/test9.c (main): test for the mbox utils.
-
-2000-01-17  Federico Mena Quintero  <federico@helixcode.com>
-
-	* configure.in: Add the gnomecanvaspixbuf argument to gnome-config
-	invocations.
-
-2000-01-17  bertrand  <bertrand@helixcode.com>
-
-	* camel/providers/mbox/camel-mbox-utils.c (camel_mbox_write_xev): 
-	(copy_file_chunk): 
-	(camel_mbox_xev_write_header_content): 
-	(string_to_flag): 
-	(flag_to_string): 
-	(string_to_uid): 
-	(uid_to_string): 
-	A bunch of new funcs to handle x-evolution 
-	private header field. 
-	(copy_file_chunk): fixed a nasty bug. 
-	(camel_mbox_write_xev): create the copy file descriptor
-	with the proper arguments. Exceptions implememnted.
-	(camel_mbox_write_xev): changed the way bytes are counted. 
-	No more uses the message size cause it did not take into
-	account the message separators characters. 
-	(camel_mbox_write_xev): hopefully fixed the last bugs. 
-	works ok now. 
-	
-
-2000-01-15  bertrand  <bertrand@helixcode.com>
-
-	* camel/providers/mbox/camel-mbox-parser.c 
-	(camel_mbox_parse_file): 
-	store the end of headers position. 
-	
-	* camel/providers/mbox/camel-mbox-parser.h: 
-	added the end_of_header_position to locate the 
-	begining of the mail body. 
-	
-
-	* camel/providers/mbox/camel-mbox-utils.c (uid_to_string): 
-	(string_to_uid): 
-	(flag_to_string): 
-	(string_to_flag): 
-	new functions to handle uids and
-	flags in the X-Evolution header. 
-	(camel_mbox_xev_parse_header_content): 
-	new function to parse an X-Evolution 
-	header. 
-	(camel_mbox_xev_write_header_content): 
-	new function to write the X-Evolution 
-	header. 
-
-2000-01-13  bertrand  <bertrand@helixcode.com>
-
-	* camel/providers/mbox/camel-mbox-parser.c (read_next_buffer_chunk): 
-	eof is true when no more chars are available, not 
-	when we've read the entire file. 
-	(initialize_buffer): ditto.
-	(read_message_begining): documented.
-	(read_header): ditto.
-	(new_message_detected): ditto.
-	(advance_n_chars): ditto.
-	(goto_next_char): ditto.
-	(read_next_buffer_chunk): ditto.
-	(initialize_buffer): ditto.
-	(parser_free): ditto.
-	(new_parser): ditto.
-
-2000-01-12    <clahey@galapagos.helixcode.com>
-
-	* widgets/e-text-event-processor-types.h,
-	widgets/e-text-event-processor-emacs-like.c, widgets/e-text.c,
-	widgets/e-text.h: Added selection and clipboard support.  Added up
-	and down arrow keys.  Fixed choice of font colors for the
-	selection to be based on the current style.
-
-	* widgets/e-minicard.c: Caused a click to grab the focus.  Changed
-	the fake information added.
-
-	* widgets/e-minicard-label.c: Forward mouse events to the field
-	EText item.
-
-2000-01-13  Christopher James Lahey  <clahey@helixcode.com>
-
-	* widgets/e-canvas-utils.c, widgets/e-canvas-utils.h:
-	e_canvas_item_move_absolute is just a helper function not supplied
-	by the gnome_canvas.[ch] I put it here so that multiple items can
-	use it.
-
-	* widgets/e-reflow.c, widgets/e-reflow.h: This item contains a
-	number of other items and places them into multiple columns.  The
-	items contained must support a number of arguments and signals to
-	allow the reflow to interact with them.
-
-	* widgets/test-reflow.c: This is a test program for e-reflow.
-
-	* widgets/e-text.c, widgets/e-text.h: Added properly drawn
-	selected text.  Added some preliminary code for X selection
-	handling and cut & paste.
-
-	* widgets/e-minicard.c, widgets/e-minicard.h: Added ARG_HAS_FOCUS
-	handling.  Made label display random for more interesting tests of
-	multiple cards.  Tweaked sizing information for better display.
-
-	* widgets/e-minicard-label.c, widgets/e-minicard-label.h: Added
-	ARG_HAS_FOCUS handling.
-
-	* widgets/Makefile.am: Added the reflow test and reflow files.
-
-2000-01-12  bertrand  <bertrand@helixcode.com>
-
-	* camel/providers/mbox/camel-mbox-parser.h (camel_mbox_parse_file): 
-	Added the prototype of camel_mbox_parse_file. 
-
-	* camel/providers/mbox/camel-mbox-parser.c (camel_mbox_parse_file): 
-	updated in-line documentation.
-
-	* tests/Makefile.am (noinst_PROGRAMS): 
-	remove non updated tests from the build 
-	process. 
-
-	* corrected a bunch of bugs 
-	
-	* camel/providers/mbox/camel-mbox-parser.c 
-	(camel_mbox_parse_file): 
-	parser the subject and date.
-	
-
-	* camel/providers/mbox/camel-mbox-parser.c 
-	(camel_mbox_parse_file): added the ability to 
-	follow the parsing progression. 
-	
-	* camel/providers/mbox/camel-mbox-parser.h: 
-	parse the x-evolution field. 
-
-	* camel/Makefile.am (libcamel_la_SOURCES): 
-	disabled gmime-rfc2047 as it depends on libunicode
-	and is not used for the moment. 
-
-2000-01-12  Christopher James Lahey  <clahey@helixcode.com>
-
-	* widgets/e-minicard.c, widgets/e-minicard.h: Added a resize
-	signal for when the card changes height.  Made it so that when you
-	press tab inside of a field, it goes to the next field.
-
-	* widgets/e-minicard-label.c, widgets/e-minicard-label.h: Added a
-	resize signal for when the label changes height.
-
-	* widgets/e-text.c, widgets/e-text.h: Added a resize signal for
-	multiple lines.  Added scrolling based on cursor position.
-
-	* widgets/Makefile.am: Removed an extraneous build target.
-
-2000-01-11  Christopher James Lahey  <clahey@helixcode.com>
-
-	* widgets/e-text-event-processor-emacs-like.c: Blocked the tab key
-	from getting inserted into the buffer since the renderer doesn't
-	know what a tab is.
-
-	* widgets/e-text.c, widgets/e-text.h: Fixed a memory leak.  Added
-	a blinking cursor and scrolling for the text item.
-
-2000-01-11  Christopher James Lahey  <clahey@helixcode.com>
-
-	* widgets/test-minicard.c: Removed some code which got in the way
-	of testing properly.
-
-	* widgets/e-minicard-label.c (e_minicard_label_realize): Made the
-	field text item editable.
-
-	* widgets/Makefile.am: Added e-text-event-process*.[ch].
-
-	* widgets/e-text.c, widgets/e-text.h: Changed these to support
-	editing.
-
-	* widgets/e-text-event-processor.c,
-	widgets/e-text-event-processor.h,
-	widgets/e-text-event-processor-types.h,
-	widgets/e-text-event-processor-emacs-like.c,
-	widgets/e-text-event-processor-emacs-like.h: These are a new pair
-	of classes which handle all events from the text item and convert
-	them into commands.
-
-
-2000-01-10  Christopher James Lahey  <clahey@helixcode.com>
-
-	* widgets/Makefile.am: Added minicard and text stuff.
-
-	* widgets/e-minicard.c, widgets/e-minicard.h,
-	widgets/e-minicard-label.c, widgets/e-minicard-label.h: Added
-	canvas items for the minicard view in the contact manager.
-
-	* widgets/test-minicard.c, widgets/test-minicard-label.c: Tests
-	for the minicard items.
-
-	* widgets/e-text.h, widgets/e-text.c: New canvas item.  Based on
-	GnomeCanvasText.  Adds ellipsis capabilities.  Used in
-	e-minicard*.[ch].
-
-	* widgets/.cvsignore: Added minicard-test and minicard-label-test.
-
-2000-01-06  Miguel de Icaza  <miguel@gnu.org>
-
-	* configure.in: Add Bonobo detection, Bonobo flags for compilation
-	for the components and the shell.
-
-2000-01-06 Elliot Lee <sopwith@redhat.com>
-	* composer/Makefile.am, widgets/e-table/Makefile.am: Work with
-	builddir != srcdir
-
-2000-01-05  Miguel de Icaza  <miguel@gnu.org>
-
-	* configure.in (EXTRA_GNOME_CFLAGS_THREADS,
-	EXTRA_GNOME_LIBS_THREADS): New variables that hold the thread
-	version of the compile/link lines.
-
-1999-11-20  Miguel de Icaza  <miguel@gnu.org>
-
-	* configure.in (PACKAGE): Raise warning level.
-
-2000-01-04  bertrand  <Bertrand.Guiheneuf@aful.org>
-
-	* camel/providers/mbox/camel-mbox-folder.c (_list_subfolders): 
-	in the io_error label does not return before the 
-	list has been freed.
-
-2000-01-03  bertrand  <Bertrand.Guiheneuf@aful.org>
-
-	* camel/providers/mbox/camel-mbox-folder.c (_list_subfolders): 
-	detects netscape ".sdb" folders as well as simple 
-	non-suffixed folders (as the ones used in pine).
-	
-
-	* camel/string-utils.c (string_prefix): 
-	finished implementation. 
-	(string_prefix): added a boolean flag to indicate if the 
-	suffix has been found. When the suffix does not match, 
-	return NULL.
-
-1999-12-26 bertrand  <Bertrand.Guiheneuf@aful.org>
-
-	* camel/camel-exception.c (camel_exception_setv): 
-	new function. Allow printf-like description
-	string constructions. 
-
-	* camel/camel-exception.h: cosmetic changes.
-
-        * camel/providers/mbox/camel-mbox-store.h:
-        * camel/providers/mbox/camel-mbox-store.c:
-        * camel/providers/mbox/camel-mbox-folder.h:
-        * camel/providers/mbox/camel-mbox-folder.c:
-        More work on the mbox provider.
-
-
-1999-12-22  bertrand  <Bertrand.Guiheneuf@aful.org>
-
-	* camel/providers/mbox/camel-mbox-store.h: 
-	* camel/providers/mbox/camel-mbox-store.c: 
-	* camel/providers/mbox/camel-mbox-folder.h: 
-	* camel/providers/mbox/camel-mbox-folder.c: 
-	part of the mbox provider.
-
-1999-12-20  bertrand  <Bertrand.Guiheneuf@aful.org>
-
-	* camel/camel-folder.c (_set_name): 
-	check that the folder is closed or raise an exception.
-	(_set_name): unset the name fields as soon as possible, 
-	even if an exception is raised.
-
-	* configure.in:
-	build mbox provider Makefile
-	
-	* camel/Makefile.am (SUBDIRS): 
-	re-enable providers compilation
-
-1999-12-19  Damon Chaplin  <damon@karuna.freeserve.co.uk>
-
-	* configure.in (AC_OUTPUT): added widgets/meeting-time-sel/Makefile
-
-1999-12-19  bertrand  <Bertrand.Guiheneuf@aful.org>
-
-	* camel/camel-folder-utils.c: include camel-log.h
-	to avoid unresolved symbols.
-
-1999-12-18  bertrand  <Bertrand.Guiheneuf@aful.org>
-
-	* camel/camel-folder.c (camel_folder_get_summary): 
-	documented.
-
-	* camel/camel-folder-pt-proxy.c (_append_message): 
-	updated to take the change on append into account.
-
-	* camel/camel-folder.h: 
-	updated class def concerning append.
-	* camel/camel-folder.c 
-	(camel_folder_append_message): documented. 
-	(camel_folder_append_message): don't return the 
-	message number. Use specific methods instead.
-	(_append_message): idem.
-
-	(_delete): use 	exception mechanism.
-	(camel_folder_delete): idem.
-	(_delete_messages): idem.
-	(camel_folder_delete_messages): idem.
-	(_get_parent_folder): idem.
-	(camel_folder_get_parent_folder): idem.
-	(_get_parent_store): idem.
-	(_get_mode): idem.
-	(camel_folder_get_parent_store): idem.
-	(camel_folder_get_mode): idem.
-	(_list_subfolders): idem.
-	(camel_folder_list_subfolders): idem.
-	(_expunge): idem.
-	(camel_folder_expunge): idem.
-	(_has_message_number_capability): idem.
-	(camel_folder_has_message_number_capability): idem.
-	(_get_message_by_number): idem.
-	(camel_folder_get_message_by_number): idem.
-	(camel_folder_get_message_count): idem.
-	(_list_permanent_flags): idem.
-	(camel_folder_list_permanent_flags): idem.
-	(_copy_message_to): idem.
-	(camel_folder_copy_message_to): idem.
-	(camel_folder_has_summary_capability): idem.
-	(camel_folder_get_summary): idem.
-	(camel_folder_has_uid_capability): idem.
-	(camel_folder_get_message_uid): idem.
-	(_get_message_uid_by_number): idem.
-	(camel_folder_get_message_uid_by_number): idem.
-	(camel_folder_get_message_by_uid): idem.
-	(camel_folder_get_uid_list): idem.
-
-1999-12-17  bertrand  <Bertrand.Guiheneuf@aful.org>
-
-	* camel/camel-folder.c (_set_name): 
-	use exception mechanism.
-	(camel_folder_set_name): idem.
-	(camel_folder_set_full_name): idem.
-	(_get_name): idem.
-	(camel_folder_get_name): idem.
-	(_get_full_name): idem.
-	(camel_folder_get_full_name): idem.
-	(_can_hold_folders): idem.
-	(_can_hold_messages): idem.
-	(_exists): idem.
-	(camel_folder_exists): idem.
-	(_is_open): idem.
-	(_get_subfolder): idem.
-	(camel_folder_get_subfolder): idem.
-
-	* camel/camel-exception.c (camel_exception_clear): 
-	New function. Clear an exception.
-	(camel_exception_get_id): 
-	New function. 
-	(camel_exception_get_description): 
-	New function. 
-
-	* camel/camel-folder.c (_set_name): 
-	Use the exception system. When the folder
-	has no parent, don't set its full name 
-	field.
-
-	
-1999-12-16  bertrand  <Bertrand.Guiheneuf@aful.org>
-
-	* camel/camel-folder.c (camel_folder_expunge): 
-	(_expunge): 
-	* camel/camel-folder-pt-proxy.c (_expunge): 
-	changed the return value. Now returns the list 
-	of expunged messages
-
-	* camel/camel-folder.c (_init_with_store): 
-	cleaned up. Use the exception system now.
-	(_open): ditto.
-	(camel_folder_open): ditto.
-	(camel_folder_open_async): ditto.
-	(_close):  ditto.
-	(camel_folder_close):  ditto.
-	(camel_folder_close_async): ditto.
-
-	* camel/camel-exception.c (camel_exception_set): 
-	When no exception is given, do nothing, just
-	return. 
-	(camel_exception_set): documented.
-	(camel_exception_new): idem.
-	(camel_exception_free): idem.
-	(camel_exception_xfer): idem.
-	
-
-	* camel/camel-folder.c:
-	* camel/camel-folder.h: more clean-ups. 
-	Removed message list related code. 
-	This was braindead design. 
-	
-
-	* camel/camel-folder-utils.c (camel_aml_expunge_messages): 
-	implemented. The routines in this file will be
-	called by providers to handle the list of
-	message already standing in memory. 
-
-1999-12-15  bertrand  <Bertrand.Guiheneuf@aful.org>
-
-	* camel/camel-folder-utils.c: 
-	* camel/camel-folder-utils.h: 
-	New files, misc utilities for the 
-	folder providers. Includes active message
-	list utilities. 
-
-	
-	* camel/camel-folder.c (_has_message_number_capability): 
-	(camel_folder_has_message_number_capability): 
-	Added this to know if a folder provides 
-	number-based message access.
-
-	* camel/camel-folder.c (_get_message_count): 
-	added warning when called directly.
-	(_append_message): ditto
-	(_open_async):  ditto
-	(_close_async):  ditto
-	(_delete_messages): ditto 
-	(_expunge):  ditto
-	(_get_message_by_number):  ditto
-	(_get_message_uid):  ditto
-	(_get_message_uid_by_number):  ditto
-	(_get_message_by_uid):  ditto
-	(_get_uid_list):  ditto
-
-	
-	* camel/camel-folder-pt-proxy.c (_open_async): 
-	(_open): 
-	(_close_async): 
-	(_close): 
-	(camel_folder_pt_proxy_class_init): 
-	update 
-	(_get_message_by_number): 
-	Update to reflect changes in CamelFolder
-
-	* camel/camel-folder.h: 
-	* camel/camel-folder.c (_get_subfolder): 
-	(camel_folder_get_subfolder): 
-	The CamelFolder::get_folder is renamed to 
-	get_subfolder as it is more intuitive. 
-
-	* camel/camel-folder.c (_get_message_by_number): 
-	(camel_folder_get_message_by_number): 
-	* camel/camel-folder.h 
-	(camel_folder_get_message_by_number): 
-	The get_message method is now named
-	get_message_by_number for consistency
-	with the _by_uid methods.
-
-	* camel/camel-folder.[ch]: 
-	 clean-ups. 
-
-1999-12-13  Nat Friedman  <nat@helixcode.com>
-
-	* ebook/e-book.h: New file.
-	* ebook/e-book.c: New file.
-	* ebook/e-card.h: New file.
-	* ebook/e-card-fields.h: New file.
-	* ebook/e-commerce.h: New file. :-)
-
-1999-12-08  Ettore Perazzoli  <ettore@gnu.org>
-
-	* tests/test1.c (main): Removed the strdup()s, which are not
-	deeded anymore.
-
-	* camel/camel-mime-message.c (_set_subject): `subject' made const.
-	(camel_mime_message_set_subject): Likewise.
-	(_set_from): `from' made const.
-	(camel_mime_message_set_from): Likewise.
-	(_set_reply_to): Made `reply_to' const.
-	(camel_mime_message_set_reply_to): Likewise.
-	(_set_set_received_date): Made `received_date' const.
-	(camel_mime_message_set_reply_to): Likewise.
-	(_set_field): `value' made const.  Also, strdup the string before
-	assigning.
-
-	* camel/camel-mime-message.h: Virtual methods changed to use const
-	strings when setting header values.
-
-1999-11-17  Ettore Perazzoli  <ettore@gnu.org>
-
-	* composer/Makefile.am (EXTRA_DIST): Added `$(glade_DATA)'.
-
-	* camel/Makefile.am (EXTRA_DIST): Added
-	`$(libcamel_extra_sources)'.
-	(libcamelinclude_HEADERS): Added `gmime-base64.h'.
-
-1999-11-17  Ettore Perazzoli  <ettore@gnu.org>
-
-	* camel/camel-mime-message.c (_write_to_stream): Removed extra ':'
-	in the `Mime-Version' header.
-
-	* tests/ui-tests/msg-composer-test.c: Removed.
-
-	* Makefile.am (SUBDIRS): Added `composer'.
-
-	* configure.in: Create `composer/Makefile'.
-
-	* camel/camel-simple-data-wrapper-stream.c
-	(camel_simple_data_wrapper_stream_construct): Updated accordingly.
-	(camel_simple_data_wrapper_stream_new): Updated accordingly.
-	* camel/camel-stream-data-wrapper.c
-	(camel_stream_data_wrapper_construct): Updated accordingly.
-
-	* camel/camel-data-wrapper.h: Replaced `IS_CAMEL...()' type check
-	macro name with `CAMEL_IS...()'.
-	* camel/camel-folder-pt-proxy.h: Likewise.
-	* camel/camel-folder-summary.h: Likewise. 
-	* camel/camel-folder.h: Likewise. 
-	* camel/camel-medium.h: Likewise. 
-	* camel/camel-mime-body-part.h: Likewise.
-	* camel/camel-mime-message.h: Likewise. 
-	* camel/camel-mime-part.h: Likewise. 
-	* camel/camel-multipart.h: Likewise. 
-	* camel/camel-service.h: Likewise. 
-	* camel/camel-session.h: Likewise. 
-	* camel/camel-simple-data-wrapper-stream.h: Likewise. 
-	* camel/camel-simple-data-wrapper.h: Likewise.
-	* camel/camel-store.h: Likewise.
-	* camel/camel-stream-buffered-fs.h: Likewise.
-	* camel/camel-stream-data-wrapper.h: Likewise. 
-	* camel/camel-stream-fs.h: Likewise. 
-	* camel/camel-stream-mem.h: Likewise. 
-	* camel/camel-stream.h: Likewise. 
-
-	* tests/test1.c (main): Updated to match the `RECIPIENT_TYPE'
-	changes.
-
-	* camel/camel-mime-message.h: Changed `RECIPIENT_TYPE_TO',
-	`RECIPIENT_TYPE_CC' and `RECIPIENT_TYPE_BCC' into
-	`CAMEL_RECIPIENT_TYPE_TO', `CAMEL_RECIPIENT_TYPE_CC' and
-	`CAMEL_RECIPIENT_TYPE_BCC', respectively.
-
-1999-11-17  Ettore Perazzoli  <ettore@gnu.org>
-
-	* camel/camel-mime-message.c (_write_to_stream): Write
-	"Mime-Version: 1.0" to the stream.
-
-	* tests/test1.c: If executed with a file name parameter, attach a
-	file with with that name to the email without loading it into
-	core, thus demonstrating usage of my latest changes.
-
-	* camel/camel-mime-part.c (_set_encoding): Updated to use
-	`CamelMimePartEncodingType'.
-	(camel_mime_part_set_encoding): Likewise.
-	(_get_encoding): Likewise.
-	(camel_mime_part_get_encoding): Likewise.
-	(_write_content_to_stream): Honour the `encoding' member.
-	(_construct_from_stream): Made static.
-	(camel_mime_part_encoding_to_string): New function.
-	(_write_to_stream): Write the encoding string using it.
-	(camel_mime_part_init): Set encoding to
-	`CAMEL_MIME_PART_ENCODING_DEFAULT'.
-	(_finalize): Don't free `encoding' anymore.
-	(camel_mime_part_encoding_from_string): New function.
-	(_parse_header_pair): Use it.
-
-	* camel/camel-mime-part.h: New enum `CamelMimePartEncodingType'.
-	Member `encoding' of `struct _CamelMimePart' changed from `gchar
-	*' to `CamelMimePartEncodingType'.  All the encoding-related
-	methods changed to use this type instead of `gchar *'.
-
-	* camel/gmime-base64.c (gmime_encode_base64): Got it to work.
-
-	* camel/Makefile.am (libcamel_la_SOURCES): Compile
-	`gmime-base64.c'.
-
-	* camel/gmime-base64.h: New, previously missing, header.
-
-	* camel/camel-stream-data-wrapper.c: New file implementing the
-	`CamelStreamDataWrapper' class.
-	* camel/camel-stream-data-wrapper.h: Corresponding header.
-
-	* camel/camel-simple-data-wrapper.c: Implemented the `get_stream'
-	virtual method.
-	(_get_stream): New function implementing the method.
-	(camel_simple_data_wrapper_class_init): Install it in the class
-	struct.
-	(camel_simple_data_wrapper_init): New function initializing the
-	`stream' member to NULL,
-	(camel_simple_data_wrapper_class_init): Set it as the
-	GtkObjectInitFunc.
-
-	* camel/camel-simple-data-wrapper.h: New member `stream' in
-	`struct _CamelSimpleDataWrapper'.
-
-	* camel/camel-simple-data-wrapper-stream.c: New file implementing
-	the `CamelSimpleDataWrapperStream' class.
-	* camel/camel-simple-data-wrapper-stream.h: Corresponding header.
-
-	* camel/camel-data-wrapper.c (camel_data_wrapper_get_stream): New
-	function.
-	(_get_stream): New private function, just returning NULL.
-	(camel_data_wrapper_class_init): Install it as the default
-	`get_stream' virtual method.
-
-	* camel/camel-data-wrapper.h: New virtual method `get_stream' in
-	`CamelDataWrapperClass'.
-	(camel_data_wrapper_get_stream): New function prototype.
-
-1999-11-05  Ettore Perazzoli  <ettore@gnu.org>
-
-	* tests/ui-tests/msg-composer-test.c: New file for testing the
-	`EMsgComposer' widget.
-	* tests/ui-tests/Makefile.am (noinst_PROGRAMS): Compile it.  Do
-	not compile `store_listing' for now because it's currently broken.
-	(INCLUDES): Added the `widgets' source directory to the include
-	path list.
-	(LDADD): Removed the MH dependency; link with
-	`libevolutionwidgets.la' from the `widgets' directory.
-
-	* configure.in: Create `widgets/Makefile'.
-
-	* camel/gmime-rfc2047.c (rfc2047_clean): Removed C++-like comment.
-	* camel/camel-folder.c (camel_folder_get_message_uid_by_number):
-	Likewise.
-	* camel/gmime-content-field.c (gmime_content_field_get_parameter):
-	Likewise.
-	* camel/camel.c (camel_init): Likewise.
-	* camel/camel-provider.c (camel_provider_register): Likewise.
-	* camel/camel-multipart.c (_construct_from_stream): Likewise.
-	* camel/camel-mime-part.c (_write_content_to_stream): Likewise.
-	* camel/camel-medium.c (camel_medium_class_init): Likewise.
-
-	* camel/camel-data-wrapper.h (camel_data_wrapper_get_type): Make
-	prototype non-static.
-
-	* camel/Makefile.am (libcamelinclude_HEADERS): Move
-	`camel-exception-list.def' from `EXTRA_DIST' to
-	`libcamelinclude_HEADERS'.
-
-	* camel/camel.h: Do not #include <config.h>.
-	* camel/data-wrapper-repository.h: Likewise.
-
-1999-11-05  Ettore Perazzoli  <ettore@gnu.org>
-
-	* tests/Makefile.am (INCLUDES): Add `-I$(top_srcdir)'.
-
-1999-10-13  bertrand <Bertrand.Guiheneuf@aful.org>
-
-	* camel/camel-folder.c (camel_folder_close): the 
-	folder->close method is now asynchronous.
-
-	* camel/camel-folder-pt-proxy.c (_folder_open_cb): 
-	(_open): 
-	(_folder_open_cb): 
-	(_open): 
-	open/close method implemented in the thread proxy
-	folder. More to come.
-
-	* camel/camel-exception.c (camel_exception_xfer): 
-	new utility func.
-
-	* camel/camel-marshal-utils.c: some new marshallers
-
-	* camel/camel-folder-pt-proxy.c: Some explanations
-	on the thread proxy system.
-
-1999-10-11  bertrand <Bertrand.Guiheneuf@aful.org>
-
-	* camel/camel-marshal-utils.c: 
-	camel/camel-marshal-utils.h:
-	Handles operation marshalling. 
-	
-	* camel/camel-thread-proxy.c: 
-	camel/camel-thread-proxy.h: 
-	new files. Generic proxy system.
-	  
-	* camel/camel-folder-pt-proxy.c 
-	moved all proxy related code in dedicated files.
-	
-	(camel_folder_pt_proxy_init): 
-	removed proxy initialisation code
-	(_finalize): 
-	removed proxy finalization code
-
-
-	* camel/camel-exception.c 
-	(camel_exception_new): 
-	(camel_exception_set): 
-	(camel_exception_free): 
-	New funcs.
-
-1999-09-21  bertrand  <Bertrand.Guiheneuf@aful.org>
-
-	* camel/camel-folder-pt-proxy.c (_async_close): 
-	implemented.
-
-	* configure.in:
-	Check pthreads.
-
-	* camel/Makefile.am: 
-	camel-folder-pt-proxy.c is only compiled
-	when pthreads are available.
-	
-	* camel/camel-folder-pt-proxy.c:
-	Signal proxying implemenatation. 
-	(_signal_marshaller_server_side): 
-	(_signal_marshaller_client_side): 
-	(_init_signals_proxy): 
-	Code not is tested and has to be best 
-	explained as it uses threads conditions and
-	gtk signal system.
-	(_thread_notification_catch): notify pending signals
-	as well as thread availability.
-
-1999-09-20  bertrand  <Bertrand.Guiheneuf@aful.org>
-
-	* camel/camel-folder-pt-proxy.c (_op_exec_or_plan_for_exec): 
-	completed
-
-	Binch of new funcs:
-	(_maybe_run_next_op): 
-	Called by the watch notification when 
-	a threaded op is completed
-	(_thread_notification_catch): 
-	notification watch call back
-	(_init_notify_system): 
-	set up the notification channel
-	(notify_availability): 
-	called by threads before completion.
-
-1999-09-18  bertrand  <Bertrand.Guiheneuf@aful.org>
-
-	* camel/camel-folder-pt-proxy.c (_op_exec_or_plan_for_exec): 
-	new func. Try to exec an operation in a thread
-	or queue it if a thread is already busy.
-
-	* camel/camel-op-queue.c (camel_op_queue_set_service_availability): 
-	(camel_op_queue_get_service_availability): 
-	new funcs. 
-
-	* camel/camel-op-queue.c (camel_op_new): 
-	(camel_op_free): 
-	new funcs. Uses glib mem chunks.
-	
-
-1999-09-17  bertrand  <Bertrand.Guiheneuf@aful.org>
-
-	* camel/camel-folder-pt-proxy.c (_init_with_store): 
-	added notify io_channel.
-
-	* camel/camel-op-queue.h: 
-	* camel/camel-op-queue.c: 
-	New object. Operation queue. Meant to be used in 
-	non-blocking proxy objects.
-	(camel_op_queue_run_next_op): new func. 
-	run the next operation.
-
-1999-09-14  bertrand  <Bertrand.Guiheneuf@aful.org>
-
-	* camel/Makefile.am (libcamel_la_SOURCES): 
-	added camel-folder-pt-proxy.[ch] to the build
-	process.
-
-	* camel/camel-folder-pt-proxy.c (_init_with_store): 
-	started implementation of the pthread-based 
-	folder proxy.
-	
-
-1999-09-08  bertrand  <Bertrand.Guiheneuf@aful.org>
-
-	* camel/providers/MH/mh-summary.c 
-	(mh_load_summary): 
-	(mh_save_summary): 
-	(mh_create_summary): 
-	implemented summary (files) for MH folders.
-	
-	* camel/providers/MH/camel-mh-folder.c 
-	(_get_message_by_uid): implemented.
-	(camel_mh_folder_class_init): 
-	(_get_message_uid): implemented
-
-	* camel/camel-folder.c (camel_folder_has_uid_capability): 
-	(camel_folder_get_message_uid): 
-	(camel_folder_get_message_uid_by_number): 
-	(camel_folder_get_message_by_uid): 
-	(camel_folder_get_uid_list): 
-	Documented UID methods.
-	(camel_folder_get_message_uid_by_number): 
-	const'ified uid.
-	(camel_folder_get_message_by_uid): idem
-	removed stupid camel_folder_get_message_uid_by_number
-	method.
-	
-	* tests/ui-tests/store_listing.c (close_all): 
-	close all open folders and stores. (necessary
-	for UID list saving ).
-
-	* camel/providers/MH/mh-uid.c (mh_generate_uid_list): 
-	fix: store UID list in CamelMHFolder object.
-
-	* camel/providers/MH/camel-mh-folder.c (_open): 
-	read or create UID list.
-	(_close): save UID list.
-
-1999-09-07  bertrand  <Bertrand.Guiheneuf@aful.org>
-
-	* camel/md5-utils.c (md5_get_digest_from_file): 
-	correct parameter decl (const)
-
-	* camel/md5-utils.h: typo.
-
-	* camel/providers/MH/mh-uid.c 
-	More work on UID stuff for MH.
-	(mh_save_uid_list): 
-	(mh_load_uid_list): 
-	(mh_generate_uid_list): 
-	new funcs. Manage on-disk uid list.
-	
-	* camel/providers/MH/mh-utils.c (mh_is_a_message_file): 
-	Util routines live here now.
-
-	* camel/md5-utils.c 
-	Documented all funcs.
-	
-	(md5_get_digest_from_stream): 
-	correct typo.
-	(md5_get_digest_from_file): 
-	same typo corrected.
-	
-
-	* camel/md5-utils.h : 
-	raw routines are declared public now.
-	Md5 use has to be versatile.
-
-	* camel/providers/MH/mh-uid.c (mh_uid_get_for_file): 
-	new func. Returns an UID for an MH message.
-		
-1999-09-06  bertrand  <Bertrand.Guiheneuf@aful.org>
-
-
-	* camel/md5-utils.h:
-	* camel/md5-utils.c:
-	changed names to follow camel style.
-	(md5_get_digest_from_stream): 
-	new methods.
-	(md5_get_digest_from_file): 
-	new function : get file md5 signature. 
-	To be used in providers code.
-
-	* camel/md5-utils.c: imported md5 coding 
-	routine from rpm. Compiles.
-	
-
-1999-09-05  bertrand  <Bertrand.Guiheneuf@aful.org>
-
-	* camel/camel-folder.c (camel_folder_has_uid_capability): 
-	(camel_folder_get_message_uid): 
-	(camel_folder_get_message_uid_by_number): 
-	(camel_folder_get_message_by_uid): 
-	(camel_folder_get_uid_list): 
-	Basic UID framework.
-	
-	* devel-docs/misc/ref_and_id_proposition.txt:
-	New revision. Some fixes.
-
-	* camel/camel-folder.h (struct _CamelFolder): added 
-	uid_capability field.
-	
-
-	* camel/camel-folder.c (camel_folder_close): publicized
-	the close method.
-
-	* tests/ui-tests/store_listing.c (show_folder_messages): 
-	use folder summary instead of opening all messages.
-	(show_folder_messages): re-enabled old CPU/Mem consumming
-	method. Useful for pop3 for instance.
-
-	* camel/providers/MH/camel-mh-folder.c (_create_summary): 
-	basic and highly non-efficient summary implementation.
-	Should be seen as a proof of concept only.
-	subfolder summary still has to be implemented.
-	
-	* camel/providers/maildir/camel-maildir-folder.c (_init_with_store): 
-	hasn't summary for the moment. 
-	* camel/providers/maildir/camel-maildir-folder.c
-	cosmetic changes.
-	
-
-1999-09-04  bertrand  <Bertrand.Guiheneuf@aful.org>
-
-	* camel/providers/MH/camel-mh-folder.c (_create_summary):
-	started summary implementation.
-	(_open): correct use of open.
-
-	* camel/camel-folder.c (camel_folder_get_summary): 
-	get folder associated summary object.
-
-	* camel/Makefile.am:
-	added summary files build
-
-	* camel/camel-folder-summary.[ch]: 
-	basic summary framework
-
-1999-09-03  bertrand  <Bertrand.Guiheneuf@aful.org>
-
-	* devel-docs/camel/Makefile.am:
-	sgml doc has camel-recipient now.
-
-	* camel/camel-recipient.c (camel_recipient_foreach_recipient_type): 
-	added in-line documentation.
-
-1999-09-02  bertrand  <Bertrand.Guiheneuf@aful.org>
-
-	* camel/providers/maildir: Added (experimental) maildir 
-	provider written by Jukka Zitting <hukka@greywolves.org>
-	
-	* camel/providers/Makefile.am (SUBDIRS): build maildir
-	provider.
-
-	* camel/camel-provider.c (camel_provider_get_for_protocol):
-	bug fix. patch from  Jukka Zitting <hukka@greywolves.org>
-
-	* camel/camel-mime-message.c (_write_one_recipient_to_stream): 
-	changed decl to fit CRLFunc. 
-	(_write_recipients_to_stream): 
-	calls camel_recipient_foreach_recipient_type now.
-
-	* camel/camel-recipient.c (camel_recipient_foreach_recipient_type): 
-	new convinience function. Iterate over all recipient types.
-
-	* camel/gmime-utils.c (gmime_write_header_table_to_stream): 
-	s/write_header_table_to_stream/gmime_write_header_table_to_stream/
-	(gmime_write_header_with_glist_to_stream): 
-	s/write_header_with_glist_to_stream/gmime_write_header_with_glist_to_stream/
-
-1999-09-01  bertrand  <Bertrand.Guiheneuf@aful.org>
-
-	* camel/camel-mime-message.c (_finalize): 
-	(_add_recipient): 
-	(_remove_recipient): 
-	(_get_recipients): now use CamelRecipientTable
-	
-	* camel/gmime-content-field.c: 
-	(gmime_content_field_unref): test if object 
-	to free is non void.
-
-	* camel/camel-folder.c (_finalize): 
-	(_set_name): 
-	* camel/camel-mime-part.c (_finalize): 
-	(_set_description): 
-	(_set_disposition): 
-	* camel/camel-service.c (_finalize): 
-	* camel/camel-stream-fs.c (_finalize): 
-	* camel/gmime-content-field.c: 
-	(gmime_content_field_construct_from_string): 
-
-	* camel/url-util.c (g_url_free): 
-
-	When using g_free (obj) don't test if obj != NULL
-	g_free () already do that. Thanks to elerium for
-	the feedback.
-
-1999-08-30  bertrand  <Bertrand.Guiheneuf@aful.org>
-
-	* camel/camel-recipient.c (camel_recipient_get): 
-	(camel_recipient_remove): 
-	(camel_recipient_add): 
-	new func. More work on new independant recipient code. 
-
-1999-08-29  bertrand  <Bertrand.Guiheneuf@aful.org>
-
-	* MAINTAINERS: updated my e-mail address. 
-
-1999-08-28  bertrand  <Bertrand.Guiheneuf@aful.org>
-
-	* camel/camel-mime-part.c (camel_mime_part_set_text): 
-	text parameter declared const
-
-	* camel/camel-mime-part-utils.c (camel_mime_part_store_stream_in_buffer): 
-	actually test correctly nb_bytes_read_chunk is >0
-
-	* camel/gstring-util.c: 
-	* camel/gmime-content-field.c: 
-	* camel/providers/MH/camel-mh-folder.c:
-	* camel/camel-stream-fs.c:
-	include string.h
-
-	* camel/camel-stream-mem.c (_write): return 
-	the numver of written bytes.
-
-	* camel/camel-stream-buffered-fs.c (_eos): 
-	return sthg
-
-	* camel/camel-stream.c (default_camel_seek): 
-	return something.
-
-1999-08-26  bertrand  <Bertrand.Guiheneuf@aful.org>
-
-	* camel/camel-mime-part.c (_get_content_object): 
-	contruct the content from the buffer before calling
-	CamelMedium implementation.
-	(_construct_from_stream): Do not construct the content 
-	by default, just store the content bytes in 
-	a temporary buffer. Content will be constructed only
-	at caller request (when calling CamelMedium::get_content_object)
-	Providers with better access to the messages (mbox/MH ...)
-	will have to provider lighter implementation, that is
-	shall not read content at all unless the caller asks
-	for it (again with get_content).
-
-	* camel/camel-mime-part-utils.c: new file, groups
-	mime-part related utils. Meant to be used by providers
-	subclassing MimeMessage.
-	(camel_mime_part_construct_headers_from_stream): 
-	(camel_mime_part_construct_content_from_stream): 
-	no more useless temporary hash table. 
-
-	* camel/camel-mime-part.c (_construct_from_stream): calls
-	mime-part-utils functions now.
-
-	* camel/gmime-utils.c (_store_header_pair_from_string): 
-	do not use hash table to store header, use an array instead.
-
-1999-08-25  bertrand  <Bertrand.Guiheneuf@aful.org>
-
-	* camel/camel-mime-part.c: now descend from CamelMedium.
-
-	* tests/test1.c (main): all headers must be strdup'ed
-	(main): unref created objects
-
-	* camel/camel-medium.c (_set_content_object): 
-	(_get_content_object): these methods are 
-	in CamelMedium now.
-
-1999-08-24  bertrand  <Bertrand.Guiheneuf@aful.org>
-
-	* camel/camel-medium.c (camel_medium_class_init): 
-	new class. Will handle all sort of information media 
-	(Mime mail messages, Lotus Notes  mail messages, 
-	postit notes, faxes, who knows .... :)
-	CamelMimePart will inherit from it.
-
-	* camel/camel-mime-part.c (_set_disposition): 
-	(_set_description):
-	description and disposition parameters are now const.
-	 
-
-	* camel/gmime-content-field.c (gmime_content_field_free): added
-	assertion code.
-
-	* camel/providers/MH/camel-mh-folder.c (_get_message): 
-	uses buffered stream.
-
-	* camel/camel-stream-buffered-fs.c:
-	new stream to accelerate file ops.
-
-1999-08-20  bertrand  <Bertrand.Guiheneuf@aful.org>
-
-	* camel/camel-stream-fs.c (camel_stream_fs_new_with_name): 
-	name parameter is const. This fixes a bug in destroy ()
-
-1999-08-18  Robert Brady  <rwb197@ecs.soton.ac.uk>
-
-	* camel/gmime-rfc2047.c: more work on encoder.
-
-1999-08-17  bertrand  <Bertrand.Guiheneuf@aful.org>
-
-	* camel/camel-stream.c (camel_stream_read): 
-	return the number of bytes read. 
-	How can this have ever worked ?
-	(camel_stream_flush): don't return anything.
-
-	* camel/gmime-utils.c (get_header_table_from_stream): 
-	mem leak fixed.
-
-1999-08-16  bertrand  <Bertrand.Guiheneuf@aful.org>
-
-	* tests/ui-tests/store_listing.c:
-	Now has a popup menu on mailbox tree to allow
-	easier tests. Implemented the copy stuff.
-	Works well for the MH provider :)))
-
-	* camel/providers/MH/camel-mh-folder.c (_copy_message_to): 
-	Test MH provider fast copy implemented.
-	
-	
-1999-08-15  bertrand  <Bertrand.Guiheneuf@aful.org>
-
-	* camel/camel-folder.c (camel_folder_expunge): 
-	moved the active list readjustment code here.
-	Much saner, providers won't have to worry about
-	that.
-	(_copy_message_to): new method.
-
-	* camel/providers/MH/camel-mh-folder.c (_expunge): 
-	no more active list readjustment stuff.
-
-	* camel/camel-folder.h: the expunge virtual no more
-	returns a list of expunged messages. Now providers
-	only have to set the expunge flag on the expunged
-	messages.
-
-	* camel/camel-folder.c (camel_folder_get_message): 
-	moved the caching code here. Finally, I don't want
-	providers to crash the libs with a bad message cache
-	implementation. 
-	(_close): do not call the CamelFolder virtual expunge 
-	method directly, use camel_folder_expunge() instead.
-	(camel_folder_expunge): added the want_list param. 
-	The client can decide if it wants the expunged message
-	list or not. If yes, it'll have to unref the messages 
-	itself.
-
-1999-08-14  bertrand  <Bertrand.Guiheneuf@aful.org>
-
-	* tests/ui-tests/store_listing.c (delete_selected_messages): 
-	(expunge_selected_folders): 
-	Implemented deletion/expunge mechanism. 
-
-	* camel/camel-folder.c (_get_message): 
-	Added some debug info.
-
-	* camel/providers/MH/camel-mh-folder.c (_expunge): 
-	implemented and tested.
-
-	* camel/camel-mime-message.c (_set_flag): 
-	changed the old braindead implementation.
-	boolean are inserted in the flag hash 
-	table casted as gpointers.
-	
-
-	* camel/camel-mime-message.c: indentation fix
-	
-
-1999-08-13  bertrand  <Bertrand.Guiheneuf@aful.org>
-
-	* camel/camel-folder.c (_get_message): default implementation
-	to be called first by providers methods. It looks in the
-	folder message list (in memory) to see if the message has
-	not already been retrieved, and in this case, returns 
-	the same CamelMimeMessage object
-
-	* camel/providers/MH/camel-mh-folder.c (_get_message): set
-	message->message_number correctly.
-
-	* camel/camel-folder.h (struct _CamelFolder): 
-	New field (message_list) which will hold a 
-	reference on each message obtained by the folder,
-	which is necessary in order for the caching procedure
-	to work (Getting the same message from a folder twice
-	will return the same CamelMimeMessage object).
-	
-	* camel/camel-folder.c (camel_folder_get_message): 
-	When the store retreives a message put it in its
-	message list.
-	(_finalize): free message list.
-
-	* ChangeLog: fix typo (parmanent)
-
-	* camel/camel-folder.c (_get_permanent_flag_list): 
-	(camel_folder_get_permanent_flag_list): 
-	new method, returns the list of permanent
-	flags supported by the folder.
-
-	* camel/camel-mime-message.c (_get_flag_list): 
-	(camel_mime_message_get_flag_list): new method,
-	return the list of flag name used by this message.
-
-	* camel/hash-table-utils.c (g_strcase_equal): 
-	(g_strcase_hash): those two func go here now.
-
-	* camel/hash_table_utils.c (hash_table_generic_free): 
-	free a (gpointer, gpointer) hash table pair.
-
-	* camel/camel-mime-message.c (camel_mime_message_init): use
-	case insensitive hash table functions. 
-	(_set_flag): 
-	(camel_mime_message_set_flag): 
-	(_get_flag): 
-	(camel_mime_message_get_flag): 
-	Use const for flag name, they are now
-	duplicated.
-
-1999-08-12  bertrand  <Bertrand.Guiheneuf@aful.org>
-
-	* tests/ui-tests/store_listing.c (show_folder_messages): 
-	remove stupid debug code.
-	(add_mail_store): use camel_session_get_store instead
-	of creating MH store directly.
-	(main): load MH provider.
-
-	* camel/camel-provider.c (camel_provider_register_as_module): 
-	register new provider.
-	(camel_provider_get_for_protocol): 
-	Now, implementation is correct.
-
-	* camel/camel-store.c (_finalize): 
-	* camel/camel-store.h (struct _CamelStore): 
-	further disabled url_name field use. 
-	URL will be generated dynamically.
-
-	* camel/camel-session.c (camel_session_get_store_for_protocol): 
-	compilation and runtime fixes.
-
-	* camel/providers/MH/camel-mh-store.c (_init): 
-	synced with CamelStore.
-
-	* camel/camel-store.c (_init): 
-	in CamelStore::init, url_name is now const.
-	disabled url_name copy.
-
-	* camel/camel-session.c (camel_session_get_store): 
-	new function: returns a store for an URL. 
-	(camel_session_get_store_for_protocol): 
-	new functionc: returns a store for a given 
-	store protocol (as IMAP/POP/MH ...)
-	* camel/string-utils.c (g_strcase_equal): 
-	(g_strcase_hash): case insensitive hash table
-	funcs.
-
-	* camel/camel-session.c (camel_session_init): hash table
-	keys are case insensitive.
-
-	* camel/camel-provider.c (camel_provider_get_for_protocol): 
-	new function, returns the last registered 
-	provider for a protocol.
-
-	* camel/providers/MH/camel-mh-provider.c: 
-	new file. MH provider registration stuff.
-
-	* camel/camel-provider.c (camel_provider_register_as_module): 
-	load a provider from a shared object (plugin).
-	(camel_provider_register): register a provider 
-	"by hand". Used for statically defined providers.
-
-	* tests/test7.c: new test.
-	tests providers loading framework.
-
-1999-08-11  
-
-	* camel/camel-service.c (_finalize): 
-	* camel/camel-stream-fs.c (_finalize): 
-	(_destroy): close file descriptor.
-	* camel/camel-stream-mem.c (_finalize): 
-	* camel/camel-store.c (_finalize): 
-	* camel/camel-folder.c (_finalize): 
-	* camel/camel-multipart.c (_finalize): 
-	* camel/camel-simple-data-wrapper.c (_finalize): 
-	* camel/camel-mime-part.c (_finalize): 
-	implemented destructors.
-	
-
-	* camel/gmime-content-field.c (gmime_content_field_ref): 
-	(gmime_content_field_unref): 
-	New reference mechanism for GMimeContentField objects.
-
-	* camel/camel-data-wrapper.c (_finalize): 
-	Started implementing destructors.
-
-	* camel/camel-mime-part.c (_construct_from_stream): 
-	* camel/gmime-content-field.c (gmime_content_field_write_to_stream): 
-	* camel/camel-multipart.c (_construct_from_stream): 
-	removed forgotten anarchic traces.
-
-1999-08-10  bertrand  <Bertrand.Guiheneuf@aful.org>
-
-	* tests/ui-tests/store_listing.c: 
-	* tests/ui-tests/store_listing.glade:
-	Quick and (very) dirty hack to test Camel more
-	easily.
-
-	* camel/camel-folder.c (camel_folder_append_message): 
-	new method.
-
-1999-08-09  bertrand  <Bertrand.Guiheneuf@aful.org>
-
-	* devel-docs/misc/ref_and_id_proposition.txt:
-	new file. Document message UID and vfolder
-	implementation.
-
-1999-08-08  Robert Brady  <rwb197@ecs.soton.ac.uk>
-
-	* camel/gmime-rfc2047.c: more advanced RFC2047 encoder started.
-	
-1999-08-08  bertrand  <Bertrand.Guiheneuf@aful.org>
-
-	* camel/providers/MH/camel-mh-folder.c (_get_message): 
-	fix. In MH, message number is not related to 
-	message position in folder.
-
-	* camel/providers/MH/camel-mh-folder.c (_is_a_message_file): 
-	util func.
-	(_get_message_count): implemented.
-
-1999-08-06  bertrand  <Bertrand.Guiheneuf@aful.org>
-
-	* devel-docs/camel/:
-	updated some autogen doc stuff.
-	Still don't understand warnings :(
-
-	* camel/camel-data-wrapper.c: 
-	* camel/providers/MH/camel-mh-store.c: 
-	* camel/url-util.c: 
-	* camel/gmime-content-field.c: 
-	* camel/camel-store.c: 
-	various inline doc corrections.
-
-	* camel/camel-folder.c (get_message_count): 
-	new method. Returns the number of message 
-	in the folder.
-
-
-
-1999-08-06  Robert Brady  <rwb197@ecs.soton.ac.uk>
-
-	* tests/test6.c: encoder test.
-
-	* camel/gmime-rfc2047.c: Fixed decoder bug : sequence
-	?= is not always the terminator for an encoded-string.
-
-
-1999-08-06  bertrand  <Bertrand.Guiheneuf@aful.org>
-
-	* camel/providers/MH/camel-mh-folder.c (_list_subfolders): 
-	stat was not testing the good file. Fixed.
-	
-	* tests/test4.c (main): added real test for MH folder 
-	provider. All tested things seem to work OK :)
-
-1998-08-06  Robert Brady  <rwb197@ecs.soton.ac.uk>
-	
-	* tests/test5.c: test for RFC2047 decoder.
-
-	* camel/gmime-rfc2047.c: Improved RFC2047 decoder.
-
-1999-08-06  bertrand  <Bertrand.Guiheneuf@aful.org>
-
-	* camel/providers/MH/camel-mh-folder.c (_exists): add debug information
-	(_list_subfolders): test if first char in folder name is not '.'
-	before adding it to the folder list.
-
-	* camel/camel-store.c (_init): 
-	disable session check temporarily
-	(_get_separator): 
-	(_get_folder): new static func. 
-	Fixed several oddities in class definition. 
-
-	* camel/providers/MH/camel-mh-store.c (camel_mh_store_get_type): 
-	parent type is CAMEL_STORE_TYPE not CAMEL_FOLDER_TYPE
-
-	* camel/camel-store.c: 
-	prent class is CamelServiceClass not GtkObjectClass
-
-	* camel/url-util.c : 
-	cosmetic changes + use of const when possible.
-	(find_host):
-	fix a bug: when there is no host and no port don't skip the '/'
-	all static find_* func are now named _func_*  
-	(g_url_free): destructor func.
-	cache field has been disabled. Constructing the url string
-	won't be too slow and will occur rarely enough that we
-	do not need to add complexity to this code. 
-
-	* camel/providers/MH/camel-mh-store.c: 
-	parent class is CamelStorClass not GtkObjectClass
-
-1999-08-05  bertrand  <Bertrand.Guiheneuf@aful.org>
-
-	* tests/test4.c: 
-	test mh provider.
-	
-	* camel/providers/MH/camel-mh-folder.c (_get_message): 
-	implemented
-	
-	* camel/camel-folder.c (_get_message): 
-	new method. 
-	(camel_folder_get_message): 
-	corresponding public call
-	
-	* camel/README.HACKING: 
-	Some notes.
-
-	* camel/CODING.STYLE: 
-	short note about coding style. 
-
-	* camel/README.COPYRIGHT: 
-	Note about copyright policy.
-
-	* camel/providers/MH/camel-mh-folder.c (_list_subfolders): 
-	minor typo fixes.
-
-
-1999-08-04  bertrand  <Bertrand.Guiheneuf@aful.org>
-
-	* camel/gmime-rfc2047.c: 
-	* camel/gmime-rfc2047.h:
-	indentation and cosmetic changes.
-	
-	* camel/providers/MH/camel-mh-folder.c (_list_subfolders): 
-	implemented.
-	* camel/providers/MH/camel-mh-folder.c (_delete): 
-	finshed implementation
-	(_delete_messages): implemented.
-
-
-1999-08-04  Robert Brady  <rwb197@ecs.soton.ac.uk>
-
-	* camel/gmime-rfc2047.[ch]: added an implemention of RFC2047
-	  (support for character sets other than US-ASCII in MIME
-	  headers). Not actually called from anywhere yet.
-
-
-1999-08-03  bertrand  <Bertrand.Guiheneuf@aful.org>
-
-	* camel/providers/MH/camel-mh-folder.c (_create): 
-	implemented.
-	(_delete): started implementation.
-
-	* camel/camel-folder.c (_get_folder): default implementation 
-	calls camel_store_get_folder ().
-
-	* camel/providers/MH/camel-mh-folder.c (_init_with_store): 
-	implemented.
-
-	* camel/camel-folder.h (struct _CamelFolder): 
-	remove useless exist_on_store field.
-
-	* camel/camel-folder.c (_exists): 
-	do not use exist_on_store field.
-
-	* camel/camel-folder.c (camel_folder_set_name): 
-	(camel_folder_get_name): 
-	new public functions 
-	(_set_name): set full_path.
-
-	(_set_full_name): 
-	(camel_folder_set_full_name): 
-	commented out this functions def. 
-	It would make things very difficult to handle, and would not 
-	be very useful. 
-	
-	* camel/providers/MH/camel-mh-store.h: 
-	* camel/providers/MH/camel-mh-store.c (camel_mh_store_set_toplevel_dir): 
-	(camel_mh_store_get_toplevel_dir): 
-	* camel/providers/MH/camel-mh-folder.c (_set_name): 
-	* camel/providers/MH/camel-mh-folder.h: 
-	use (gchar *) instead of (GString *) everywhere.
-	use const when necessary.
-	
-	* camel/camel-folder.h (struct _CamelFolder): 
-	removed unused message_list field.
-	
-	* camel/camel-mime-part.c (_set_content_object): 
-	There is a probleme here. We can not allow mime part
-	content-type field and content_object mime-type to be 
-	different. I thus chosed to set mime part object 
-	content field to be freed (if necessary) and set
-	to be a pointer to content_object mime type
-	field. 
-	(_construct_from_stream): set content_object mime type
-	to be the same as mime_part's one. This is necessary
-	because we use _set_content_type. 
-	
-	This two things are a bit hackish ansd may need
-	to be redesigned.
-	
-	* camel/gmime-utils.c (gmime_write_header_pair_to_stream): 
-	use g_strdup_printf and remove a bug.
-
-	* camel/camel-simple-data-wrapper.c (_construct_from_stream): 
-	more debugging output +  nb_bytes_read is now a signed int 
-	to avoid bug when eos is encountered.
-
-	* camel/camel-mime-part.c (_construct_from_stream): 
-	sync to data_wrapper_repository function name changes. 
-	Use default "text/plain" type when conten-type field
-	is not found. (following RFC 2046 spec).
-
-	* camel/data-wrapper-repository.c (data_wrapper_repository_set_data_wrapper_type): 
-	(data_wrapper_repository_get_data_wrapper_type): 
-	change function name prefix (s/data_wrapper/data_wrapper_repository/)
-
-	* camel/camel-multipart.c (_read_part): 
-	add `\n` at eol but not before boundary.
-
-	* camel/gmime-utils.c (get_header_table_from_stream): 
-	correct implementation of end of stream detection.
-
-1999-08-01  bertrand  <Bertrand.Guiheneuf@aful.org>
-
-	* camel/camel-multipart.c (_read_part): 
-	use a stream to store the part instead of GString. 
-	
-	* camel/camel-mime-part.c (camel_mime_part_set_text): 
-	set data wrapper content type to "text/plain".
-
-	* camel/camel-stream-mem.c:
-	* camel/camel-stream-mem.h:
-	new memory buffer based stream.
-
-	* camel/camel-stream-fs.c (_seek): 
-	implementation for file system based stream.
-
-	* camel/camel-stream.c (camel_stream_seek): 
-	new method.
-
-	* camel/camel-stream-fs.c (camel_stream_fs_class_init): 
-	pass CamelStreamFsClass instead of CamelStreamClass.
-
-1999-08-01 bertrand  <Bertrand.Guiheneuf@aful.org>
-
-	* camel/gmime-utils.c (gmime_write_header_pair_to_stream): 
-	corrected a bug with memory not allocated for '\0' in strtmp
-
-	* camel/gmime-utils.c (gmime_read_line_from_stream): 
-	do not return NULL when line is empty. 
-
-	* camel/camel-multipart.c (_read_part): return true when end
-	of multipart is found, not the opposite
-
-1999-07-31  bertrand  <Bertrand.Guiheneuf@aful.org>
-
-	* camel/gmime-utils.c (gmime_read_line_from_stream): 
-	Don't return crlf at end of line.
-
-1999-07-30  bertrand  <Bertrand.Guiheneuf@aful.org>
-
-	* camel/gmime-utils.c (gmime_read_line_from_stream): 
-	new function: reads a line from a stream.
-	should be in streams utils maybe. 
-
-1999-07-29  bertrand  <Bertrand.Guiheneuf@aful.org>
-
-	* camel/camel-mime-part.c (_construct_from_stream): 
-	Uses data wrapper repository to find what data wrapper
-	to use to construct the content from a stream. When 
-	no object is registered for the mime type found in
-	content type field a CamelSimpleDataWrapper is 
-	used. 
-	
-	* camel/camel-mime-part.c (_get_content_type): 
-	(camel_mime_part_get_content_type): returns
-	a pointer on the content_type field instead 
-	of the gchar * mime "type/subtype".
-
-1999-07-28  bertrand  <Bertrand.Guiheneuf@aful.org>
-
-
-	* camel/data-wrapper-repository.c
-	* camel/data-wrapper-repository.h
-	New files. Handles mime type <-> camel object
-	(for example "multipart" <-> CamelMultipart
-	* tests/tesst3.c: test data repository thing.
-
-1999-07-26  bertrand  <Bertrand.Guiheneuf@aful.org>
-	
-	* camel/camel-multipart.c (_write_to_stream): 
-	implemented output of multipart.
-	
-	* tests/test1.c (main): testing content objects operations. 
-
-1999-07-25  bertrand  <Bertrand.Guiheneuf@aful.org>
-	
-	* camel/camel-mime-part.c (camel_mime_part_set_text): 
-	new util function to set a mime part content to be 
-	a text string.
-
-	* camel/camel-simple-data-wrapper.c (camel_simple_data_wrapper_set_buffer_from_text): 
-	new util func. 
-	(camel_simple_data_wrapper_new): new func.
-
-	* camel/camel-multipart.c (_write_to_stream): 
-	implemented output of multiparts.
-
-1999-07-24  bertrand  <Bertrand.Guiheneuf@aful.org>
-
-	* camel/gmime-content-field.c (gmime_content_field_get_parameter): 
-	New function. Returns the value associated to a 
-	mime parameter. 
-
-
-1999-07-22  bertrand  <Bertrand.Guiheneuf@aful.org>
-
-	* camel/camel-multipart.h: 
-	* camel/camel-multipart.c:
-	New class. Models multipart mime objects.
-	
-	* camel/camel-mime-body-part.h: 
-	* camel/camel-mime-body-part.c: 
-	New class. Body part is a mime part contained in 
-	a multipart object.
-	
-
-1999-07-21  bertrand  <Bertrand.Guiheneuf@aful.org>
-
-	* camel/camel-log.h: 
-	implemented hard log level stuff.
-	* came/*.c use "CAMEL_LOG_*" instead of "CAMEL_LOG (*"
-	in order to allow hard level switch.
-
-	* tests/test1.c: 
-	* tests/test2.c: 
-	updated to use gchar instead of GString. Tests passed.
-
-
-1999-07-19  bertrand  <Bertrand.Guiheneuf@aful.org>
-
-	* camel/camel-stream.c: 
-	* camel/camel-stream.h: 
-	"const"-antified
-	
-
-	* camel/camel-simple-data-wrapper.c: (_construct_from_stream)
-	do not use any limit when constructing the object from a stream
-	
-	* camel/camel-stream-fs.c: 
-	* camel/camel-stream-fs.h: 
-	* camel/camel-mime-message.c: 
-	* camel/camel-mime-message.h: 
-	* camel/camel-session.c: 
-	* camel/camel-session.h: 
-	* camel/camel-service.c: 
-	* camel/camel-service.h:
-	* camel/camel-store.c: 
-	* camel/camel-store.h: 
-	* camel/camel-folder.c: 
-	* camel/camel-folder.h: 
-	* camel/gmime-utils.c: 
-	* camel/gmime-utils.h: 
-	GString -> gchar
-	constantified what had to be.
-	
-	* camel/string-utils.c: 
-	* camel/string-utils.h: 
-	New files. Meant to replace gstring-util for gchar *
-	
-1999-07-16  bertrand  <Bertrand.Guiheneuf@aful.org>
-
-	* camel/gmime-content-field.c (gmime_content_field_construct_from_string): 
-	GString -> gchar
-	use const to indicate copied parameter.
-
-1999-07-15  bertrand  <Bertrand.Guiheneuf@aful.org>
-
-	* camel/camel-simple-data-wrapper.c: 
-	* camel/camel-simple-data-wrapper.h: 
-	Gstring -> gchar
-	
-1999-07-15  bertrand  <Bertrand.Guiheneuf@aful.org>
-
-	* camel/url-util.c:  
-	* camel/url-util.h: 
-	Do not use GStrings any more. 
-	Added assertion code. 
-	Cosmetic reformating
-	
-	* AUTHORS:
-	* ChangeLog:
-	Changed my email address.
-
-	
-1999-07-13  Miguel de Icaza  <miguel@gnu.org>
-
-	* camel/gmime-base64.c (gmime_encode_base64): Implemented base64
-	encoder based on CamelStreams.  Should the encoder/decoder be a
-	Stream itself?
-
-	* camel/gmime-utils.c: include config.h here.
-	* camel/url-util.c: ditto.
-	* camel/gstring-util.c: ditto.
-	* camel/gmime-content-field.c: ditto.
-	* camel/camel-stream.c: ditto.
-	* camel/camel-stream-fs.c: ditto.
-	* camel/camel-store.c: ditto.
-	* camel/camel-simple-data-wrapper.c: ditto.
-	* camel/camel-session.c: ditto.
-	* camel/camel-service.c: ditto.
-	* camel/camel-mime-part.c: ditto.
-	* camel/camel-mime-message.c: ditto.
-	* camel/camel-log.c: ditto.
-	* camel/camel-data-wrapper.c: ditto
-	* camel/camel-folder.c: ditto.
-
-	* camel/camel-stream.c (camel_stream_write): Moved api
-	documentation to the places that they document.
-	(camel_stream_class_init): Virtual classes do not need to have a
-	default implementation.  So null them all.
-	(camel_stream_write): Return value from write.
-	(camel_stream_available): implement.
-	(camel_stream_write_strings): documented.
-
-	* devel-docs/query/virtual-folder-in-depth.sgml: Small
-	reformatting
-
-1999-06-28  bertrand  <Bertrand.Guiheneuf@aful.org>
-
-	* tests/test2.c (main): now use 
-	CamelDataWrapper::contruct_form_stream to test 
-	message parsing
-
-	* camel/camel-data-wrapper.c: 
-	* camel/camel-data-wrapper.h: 
-	construct_from_stream no longer has maximimum size arg.
-
-	* camel/camel-mime-part.c (_construct_from_stream): new.
-	Construct the mime_part from a stream.
-
-	* camel/camel-mime-part.c:
-	new field (content_type) and associated methods.
-	(camel_mime_part_init): initialize content_type field.
-	(_parse_header_pair): now set content_type MimePart field
-	instead of using DataWrapper Mime typing facility.
-
-1999-06-28  bertrand  <Bertrand.Guiheneuf@aful.org>
-
-	* camel/camel-data-wrapper.h: 
-	s/content_type/mime_type/
-
-1999-06-24  bertrand  <Bertrand.Guiheneuf@aful.org>
-
-	* camel/camel-simple-data-wrapper.[ch]:
-	new class. Simple implementation of a data wrapper:
-	simply keeps the stream result in a byte array.
-
-	* camel/camel-mime-part.c (_parse_header_pair): added a warning. 
-	Have to think about the correct way to store content type stuff.
-
-1999-06-24  bertrand  <Bertrand.Guiheneuf@aful.org>
-
-	* camel/camel-mime-message.c (_write_one_recipient_to_stream): 
-	includes gmime-utils header. 
-	patch from Ulrich Drepper <drepper at cygnus.com>
-	set separator string in write_header_with_glist_to_stream()
-	
-	* camel/camel-log.c (camel_log): 
-	patch from Ulrich Drepper <drepper at cygnus.com>
-	Do not use stderr in initialization of logfile descriptor.
-	
-	* camel/camel-stream-fs.c (camel_stream_fs_new_with_name): 
-	patch from Ulrich Drepper <drepper at cygnus.com>
-	initialize mode field in open(). 
-
-1999-06-22  bertrand  <Bertrand.Guiheneuf@aful.org>
-
-	* camel/camel-data-wrapper.c (_get_content_type): 
-	moved all the content-type stuff here.
-	(camel_data_wrapper_init): initialize the instance
-	content-type field.
-
-	* camel/camel-mime-part.c (_parse_header_pair): 
-	parse Content-Type stuff in header. 
-	(_write_to_stream): write the content type stuff to 
-	the stream.
-
-	* camel/gmime-content-field.c (gmime_content_field_get_mime_type): 
-	new function, returns "type/subtype" mime type string.
-	(gmime_content_field_construct_from_string): 
-	new function, construbt a content_field object
-	form a string. be used to set the mime_type from a
-	string.
-
-	* camel/camel-mime-part.c (_set_content_type): 
-	(camel_mime_part_set_content_type): 
-	(_get_content_type): 
-	(_get_content_type): 
-	new methods.
-
-1999-06-21  bertrand  <Bertrand.Guiheneuf@aful.org>
-
-	* camel/gmime-utils.c (get_header_table_from_stream): 
-	replace CR/LF+'\t' with ' ' 
-
-	* camel/camel-mime-message.c (_set_recipient_list_from_string): 
-	trim \t when splitting
-
-	* camel/gmime-utils.c (get_header_table_from_file): 
-	corrected bug in scanning tabulations ('t' -> '\t')
-
-	* tests/test2.c (main): read mail.test instead
-	of mail1.test
-
-	* camel/camel-mime-part.c (_add_header): 
-	added comments 
-
-1999-06-03  bertrand  <Bertrand.Guiheneuf@aful.org>
-
-	* devel-docs/query/virtual-folder-in-depth.sgml: 
-	sgmlized Giao's doc about virtual folders.
-
-1999-05-31  bertrand  <Bertrand.Guiheneuf@aful.org>
-
-	* tests/test2.c (main): 
-	use new stream code instead of raw file * stuff.
-
-	* camel/gmime-utils.c (get_header_table_from_stream): 
-	new func. Will replace get_header_table_from_file and will
-	be used to parse headers from files as well as from 
-	memory buffers.
-
-	* camel/camel-stream-fs.c:
-	CamelStream Subclass. File system based
-	stream.
-	
-
-1999-05-30  bertrand  <Bertrand.Guiheneuf@aful.org>
-
- 	* camel/camel-stream.h: new class. Represents an 
-	abstract stream object.
-
-       * camel/camel-mime-message.c (_set_recipient_list_from_string): 
-	remove leading and trailing spaces in recipient addresses.
-
-	* camel/gmime-utils.c (_store_header_pair_from_gstring): 
-	remove leading and trailing spaces from header values.
-
-	* camel/gstring-util.c (g_string_trim): new
-	func: remove leading or trailng chars from 
-	a specified char set.
-	(g_string_split): allow trimming of substrings.
-
-	* tests/test1.c (main): remove gtk_main call
-
-1999-05-28  bertrand  <Bertrand.Guiheneuf@aful.org>
-
-	* camel/camel-mime-part.c 
-	(_parse_header_pair): 
-	(_init_header_name_table): 
-	More header parsing code.
-
-	
-1999-05-27  bertrand  <Bertrand.Guiheneuf@aful.org>
-
-	* tests/test2.c (main): rewrite message obtained via
-	parsing into a file. Actually, it works pretty well :))
-
-	* camel/camel-mime-message.c (_set_recipient_list_from_string): 
-	create recipient list form a comma separated string.
-	(_parse_header_pair): added recipient lists parsing.
-
-	* camel/camel-mime-part.c (_parse_header_pair): 
-	new (protected) method. Parse a head pair and
-	decides what to do with it.
-	
-	(_add_header): Call in _parse_header_pair
-
-	* camel/camel-mime-message.c (_parse_header_pair): 
-	overload  header parsing MimePart mthod.
-
-	* camel/gstring-util.c (g_string_split): 
-	new func: split a gstring into a GList of
-	substring.
-
-1999-05-26  bertrand  <Bertrand.Guiheneuf@aful.org>
-
-	* camel/gmime-utils.c (get_header_lines_from_file): 
-	new func. Parses message header zone and returns
-	a Glist of all header lines.
-
-	* tests/test2.c: tests message parsing
-
-	* camel/gmime-utils.c (write_header_table_to_file): 
-	new func to write a table of headers.
-
-1999-05-20  bertrand  <Bertrand.Guiheneuf@aful.org>
-
-	* camel/camel-mime-message.c (_write_to_file): 
-	recipient list printing
-	
-	* tests/test1.c (main): more tests.
-
-1999-05-19  bertrand  <Bertrand.Guiheneuf@aful.org>
-
-	* camel/camel-mime-part.c (_write_to_file): test if content
-	exists before calling its write_to method.
-
-	* camel/camel-mime-message.c (_write_to_file): bugs fix.
-
-	* camel/camel-mime-message.c (camel_mime_message_new_with_session): 
-	new func. Creates a message with the session field set
-	up correctly.
-
-1999-05-18  bertrand  <Bertrand.Guiheneuf@aful.org>
-
-	* tests/test1.c (main): tests
-
-	* camel/camel-mime-message.c (_write_to_file): 
-	started write_to framework for mime_messages
-
-	* camel/camel-mime-message.c (*_message_number): 
-	message number funcs.
-	
-1999-05-15  bertrand  <Bertrand.Guiheneuf@aful.org>
-
-	* camel/camel-mime-message.c (*_flag): 
-	flags handling methods
-
-1999-05-14  bertrand  <Bertrand.Guiheneuf@aful.org>
-
-	* camel/camel-mime-message.c (camel_mime_message_class_init): 
-	added recipient handling class funcs.
-
-1999-05-13  bertrand  <Bertrand.Guiheneuf@aful.org>
-        
-	* camel/camel-mime-message.c (camel_mime_message_init): 
-	create recipients hash table
-	(_remove_recipient): 
-	(_add_recipient):
-	(_get_recipients):  new funcs.
-	Internal Recipients data structure is
-	a bit complicated though.
-
-	* camel/camel-mime-part.c (camel_mime_part_init): 
-	create headers hash table
-
-	* camel/camel-mime-message.h: 
-	a bunch of get/set header field
-	method done. Does nothing yet though.
-
-	* camel/camel-mime-message.[ch] :
-	new file. 
-
-1999-05-12  bertrand  <Bertrand.Guiheneuf@aful.org>
-
-	* camel/camel-mime-part.h (struct ): 
-	disposition is now a full GMimeContentField
-	object.
-
-	* camel/gmime-content-field.c: new file
-	handle "type/subtype ;parameter=value ; parameter=value ..."
-	BNF grammar elements
-	(gmime_content_field_write_to_file): new func
-	
-	* camel/gmime-utils.c (gmime_write_header_pair_to_file): 
-	namespace change
-
-1999-05-11  bertrand  <Bertrand.Guiheneuf@aful.org>
-
-	* camel/camel-mime-part.c (_write_to_file): 
-	overload wrapper class method.
-	(_write_to_file): start to write some text in 
-	file.
-
-	* camel/camel-store.c: typo fix.
-
-	* camel/camel-store.c: 
-	* camel/camel-service.c: 
-	* camel/camel-folder.c: 
-	* camel/camel-data-wrapper.c: 
-	* camel/camel-mime-part.c: 
-	static functions naming follows gnome 
-	coding style guide.
-
-	* camel/camel-mime-part.h: implemented public interfaces
-	
-
-1999-05-10  Bertrand Guiheneuf  <Bertrand.Guiheneuf@aful.org>
-
-	* camel/camel-mime-part.c (__camel_mime_part_get_header_lines): 
-	(__camel_mime_part_set_header_lines): 
-	(__camel_mime_part_get_content_languages): 
-	(__camel_mime_part_set_content_languages): 
-	(__camel_mime_part_get_encoding): 
-	(__camel_mime_part_set_encoding): 
-	(__camel_mime_part_get_content_MD5): 
-	(__camel_mime_part_set_content_MD5): 
-	(__camel_mime_part_get_content_id): 
-	(__camel_mime_part_set_content_id): 
-	A bunch of new set/get func.
-
-	* camel/gstring-util.c (g_string_list_free): 
-	convenience function for string list 
-	complete deallocation.
-
-1999-05-09  bertrand <Bertrand.Guiheneuf@aful.org>
-
-	* camel/camel-mime-part.c (__camel_mime_part_add_header): 
-	new method
-
-	* camel/camel-mime-part.h (struct CamelMimePart):
-	added core fields.
-
-1999-05-08  bertrand <Bertrand.Guiheneuf@aful.org>
-
-	* camel/camel-mime-part.[ch]: 
-	new class. models a mime mail part.
-
-	* camel/camel-data-wrapper.c 
-	(camel_data_wrapper_write_to_buffer): method to
-	stream data content in a buffer.
-	(camel_data_wrapper_write_to_file): 
-	(camel_data_wrapper_construct_from_buffer): 
-	(camel_data_wrapper_construct_from_file): 
-	new methods.
-	
-1999-05-07  bertrand <Bertrand.Guiheneuf@aful.org>
-
-	* camel/camel-data-wrapper.[ch]:new class.
-	This should not be a class but rather an 
-	interface. The day Gtk support interfaces, 
-	it dataWrapper should become an interface.
-
-1999-05-04  bertrand <Bertrand.Guiheneuf@aful.org>
-
-	* camel/camel-service.c (camel_service_get_url): 
-	new method.
-
-	* devel-docs/camel/camel-sections.txt: added 
-	function doc references
-
-	* camel/camel-folder.c (__camel_folder_close): 
-	fixed indentation.
-	(camel_folder_expunge): new method.
-	(__camel_folder_close): used expunge flag
-
-1999-05-03  bertrand <Bertrand.Guiheneuf@aful.org>
-
-	* camel/camel-folder.c (camel_folder_get_mode): 
-	typo fix
-
-	* camel/camel-folder.c (__camel_folder_list_subfolders): 
-	new func.
-
-	* some doc stuffs
-	
-
-1999-05-01  bertrand <Bertrand.Guiheneuf@aful.org>
-
-	* camel/camel-folder.c 
-	(__camel_folder_get_mode): 
-	(camel_folder_get_mode): 
-	(camel_folder_get_parent_store): 
-	(__camel_folder_get_parent_store): 
-	(camel_folder_get_parent_folder): 
-	(__camel_folder_get_parent_folder): 
-	new methods
-
-	* camel/camel-service.c: put __ prefix before
-	private virtual funcs.
-
-	* camel/camel-folder.c (camel_folder_delete): 
-	(camel_folder_delete_messages): 
-	new methods.
-
-	* camel/url-util.c (g_url_new): some
-	more comments 
-
-1999-04-27  bertrand <Bertrand.Guiheneuf@aful.org>
-
-	* camel/camel-folder.c (camel_folder_create): 
-	new public function.
-
-1999-04-25  bertrand <Bertrand.Guiheneuf@aful.org>
-
-	* camel/camel-session.c (camel_session_get_store_from_provider): 
-	initialize folder object.
-
-	* camel/camel-store.c (init): new method.
-	called by session object at instantiation time.
-
-	* camel/camel-store.h (struct _CamelStore): 
-	new fields : session and url_name
-
-1999-04-25  bertrand <Bertrand.Guiheneuf@aful.org>
-
-	* camel/camel-session.c (camel_session_set_provider): 
-	new method to set the default provider for a protocol.
-	(camel_session_get_store_from_provider): 
-	new method to instantiate a folder from a provider.
-
-	* camel/camel-provider.h: s/GString/gchar/g
-	+ typo fix.
-
-	* camel/camel-provider.[ch]:
-	basic provider structure. Have to write the
-	code for dynamic loading.
-
-1999-04-24  bertrand <Bertrand.Guiheneuf@aful.org>
-	
-	* camel/url-util.[ch]: s/new_g_url/g_url_new
-
-	* camel/url-util.c (new_g_url): URL 
-	rewritten completely. Error handling not
-	implemented in public functions.
-	But URL scan works pretty well :)))
-
-1999-04-24 bertrand <Bertrand.Guiheneuf@aful.org>
-	
-	* camel/url-util.[ch]: I needed the url 
-	functions to use GString, and I wanted a more
-	general scheme so I finally started rewriting 
-	the whole thing from scratch.
-	No more code from gzilla :(
-	
-1999-04-23  bertrand <Bertrand.Guiheneuf@aful.org>
-
-	* camel/url-util.[ch]:
-	Utility functions to parse URLs.
-	Stolen shamelessly from gzilla (www.gzilla.com)
-	written by Raph Levien <raph@acm.org>
-	
-	* camel/Makefile.am: added url-util.[ch]
-	compilation.
-
-	* Makefile.am (SUBDIRS): removed devel-docs
-	until I come up with a correct Makefile.am
-
-	* camel/camel-store.h: 
-	* camel/camel-folder.h:
-	correct declarations of structs
-
-
-1999-04-22  bertrand <Bertrand.Guiheneuf@aful.org>
-
-	* camel/providers/MH/camel-mh-store.c:
-	more test implementation.
-
-	* camel/camel-store.c (camel_store_get_type): typo fix
-	
-
-1999-04-21  bertrand <Bertrand.Guiheneuf@aful.org>
-
-	* camel/providers/MH/camel-mh-folder.c (camel_mh_folder_get_type): 
-	start test provider.
-
-1999-04-20  bertrand <Bertrand.Guiheneuf@aful.org>
-	
-	* camel/camel-store.h: now CamelStore inherits from
-	CamelService.
-
-	* camel/camel-service.c (camel_service_class_init): 
-	basic abstract service class.
-
-1999-04-19  bertrand <Bertrand.Guiheneuf@aful.org>
-
-	* camel/README: added some (few) explanations.
-
-1999-04-18  bertrand <Bertrand.Guiheneuf@aful.org>
-
-	* camel/camel-store.[ch]: started implementation
-	* camel/camel-folder.c (camel_folder_get_type): typo
-	uncommented the store related code.
-	(camel_folder_create): enable som store relted code. 
-	Not finished. Have to define public methods first.
-
-	* camel/camel-log.h: some explanation about the 
-	log system
-
-1999-04-18   bertrand <Bertrand.Guiheneuf@aful.org>
-
-	* camel/camel-folder.c: 
-	(camel_folder_create): implemented (partially)
-	have to write CamelStore before finishing it.
-
-	* camel/camel-folder.h (CamelFolder): added full_name field
-	(CamelFolderClass): added set/get_full_name methods
-
-1999-04-18  bertrand <Bertrand.Guiheneuf@aful.org>
-
-	* camel/camel-folder.c: some work
-	* camel/camel-log.c: log system for camel
-	* camel/gstring-util.c: some utilities for GString objects
-	
-
-1999-04-18  bertrand <Bertrand.Guiheneuf@aful.org>
-
-	* autogen.sh (PKG_NAME): groomf -> gnome-mailer
-
diff --git a/HACKING b/HACKING
deleted file mode 100644
index ce31d66dac..0000000000
--- a/HACKING
+++ /dev/null
@@ -1,277 +0,0 @@
-
-1 Patch guidelines
-
-This section lists some guidelines for writing a good patch which is
-more likely to be accepted.
-
-Any new features or large scale work should first be discussed on the
-evolution-hackers list first.  This will ensure the idea fits in the
-direction we wish to take Evolution, and also that the effort is not
-duplicated.  See section 3 for details on the mailing lists.
-
-1.1 Patch basics
-
-o The patch should apply cleanly at the time it is made.
-
-o It must compile once applied.
-
-o It must not generate any more compile time warnings than were
-  already there.  This may be platform dependent so simply do your
-  best.
-
-o It must conform to C89/C90 (ANSI/ISO C), and build with gcc using
-  the default compile flags.
-
-  The primary trap is that in C99 you may define variables anywhere in
-  the code, in C89 they must be declared in a declaration block which
-  follows any block start '{'.
-
-  If you wish to ensure the code is C89, try the following.
-
-  From the gcc manual page:
-                                                           "To select
-  this standard in GCC, use one of the options `-ansi', `-std=c89' or
-   `-std=iso9899:1990'; to obtain all the diagnostics required by the
-  standard, you should also specify `-pedantic'" ...
-
-  You may actually have to use '-std=gnu89' if libraries have taken
-  advantage of gcc extensions and where not compiled similarly, as the
-  above options will disable all gnu extensions.
-
-  [FIXME: Add the same option for Forte here]
-
-o It should not add any extra debug printing by default, unless the
-  patch is specifically to add extra debug printing.
-
-o It should not use any gcc extensions, except where they are properly
-  checked for and not used with other compilers.  glib provides some
-  of these features as portable macros and should be used when they
-  cover the required functionality.
-
-1.1 GUI changes
-
-If the change requires non-trivial user interface changes, then they
-will have to be discussed and approved on the evolution-hackers list
-first.  This is highly recommended before embarking on any UI work, or
-large scale work in general.  The Gnome HIG document is the place to
-start on any UI changes or additions.
-
-1.2 Translated string changes
-
-Any changes to translated strings in a stable release must be
-discussed on the hackers list (see section 3), and/or as part of the
-patch submission.  There must be very good reasons for changing the
-strings in this case.
-
-1.3 Coding style
-
-Generally the coding style employed matches the "Linux Kernel" style,
-that is, basically K&R style indenting with 8 space tabs.  Tabs should
-be used rather than space characters.  Reformatting of otherwise
-unchanged code is not acceptable.  Editors should have any automatic
-reformatting features disabled.
-
-K&R style indenting puts braces on the same line.  The opening
-parenthesis of a function call or conditional statement should be on
-the same line as the function.  "else" "} else" and "} else {" must
-always occur on lines by themselves.
-
-A single blank line should follow {} blocks (if not immediately
-followed by the close of another block), and conditional statements,
-and be used to separate logical groups of statements in the same
-block.
-
-A single blank line only should separate functions, and other
-structures at the top level of the file (i.e. outside functions).  The
-same rule applies to variable declarations at the start of a block.
-
-An example of the most-developer-preferred formatting:
-
-TheType
-the_function (int frank)
-{
-        int a = 1;
-
-        if (a == frank) {
-                a = foo (a);
-        } else {
-                do {
-                        a = bob (frank) + a;
-        	} until (a == frank);
-
-                frank = a;
-        }
-
-        return (TheType) a;
-}
-
-Where there are slight stylistic differences, the style in the
-surrounding code should be followed.
-
-1.3.1 Object casts
-
-You can either use C style casts, or Gtk style casts.  Note that Gtk
-style casts can add significant execution overhead, which is not
-adding any extra checking.  e.g. if arguments have already been
-type-checked by preconditions.  Putting a space between a cast and a
-variable is optional, but preferred by most of the developers.
-
-1.3.2 Preconditions
-
-External api entry points should have preconditions (g_return_if_fail,
-etc), although their use varies from case to case.  Internal entry
-points and/or when you are guaranteed the type has already been
-checked, are unecessary.  Object initialisation and other virtual
-method invocations are considered internal entry points.
-
-1.3.3 Line lengths
-
-Do not expend effort and resort to unreadable formatting merely to fit
-any long lines into 80 column widths.  We use 8 space tabs, and
-because of the lack of namespacing other than extending the function
-name, many of the function and type names are too long for this to be
-practical.  We now all uses high resolution displays, and not
-circa-80's VT100 terminals!
-
-On the other hand, lines should generally not exceed 100 characters,
-and absolutely not exceed 160 characters.  If your tab nesting is too
-deep you probably have a poor design that needs rethinking.
-
-1.4 Design
-
-This is a tricky issue to document, but the design of new code should
-`fit' with the existing design of the relevent module.  It should at
-the very least, be no worse.
-
-Code should not cross existing abstraction boundaries or attempt
-to remove or work around them, if required the existing design may
-need adjustment.
-
-Type and method names should follow the existing practice in the
-surrounding code.  Method arguments should follow the same order as
-related methods, and should use the same names for matching
-parameters.
-
-Per file, static class globals are ok, true globals may be ok, but
-should be used sparingly.  Use 'i' for a loop variable, if that's all
-it is, don't use 'the_current_index'.  etc.
-
-If in doubt, ask on the lists.
-
-2. Patch submission guidelines
-
-This section outlines procedures that should be followed when
-submitting patches to evolution, via the evolution-patches mailing
-list.
-
-You must subcribe to the list at
-`http://lists.ximian.com/mailman/listinfo/evolution-patches' before you
-can submit patches to it.
-
-Also note that if you attach a patch to a bug report, it should always
-be sent to the list for attention.
-
-Any non-trival patches (patches of more than 1 or 2 changed lines in
-more than 5 isolated locations) also require copyright assignment.
-See http://developer.ximian.com/projects/evolution/copyright.html for
-details.
-
-If you follow the guidelines listed here, you should generally expect
-a response within 2 working days.  If you re-send the same patch
-repeatedly, you will more likely receive less attention.  Do not
-re-send the same patch repeatedly.
-
-2.1 Subject Lines
-
-If the patch addresses a specific bug in bugzilla.ximian.com, then the
-bug number must be included in the subject line, preferably near the
-beginning of the subject line.  A concise summary of the bug(s) being
-addressed, should be the remainder of the subject.
-
-It is unnecessary to add "[PATCH]", "patch" or similar to the subject
-line, unless it is being cross-posted to other non-patch lists.
-
-It is absolutely unnecessary to add "please consider", "please review",
-or "seeking review", or similar, to the subject line.  Please do not do
-this.
-
-Where the patch does not address a specific bug number, then the subject
-line should simply be a concise summary of the problem/feature it
-addresses.
-
-In all cases the subject line should include the module(s) to which the
-patch applies, and would generally match the component on the bug or
-the top-level module directory (e.g. camel, mail, addressbook, use 'all'
-for more than 3 or 4 modules).
-
-2.2 Message Body
-
-Patches should be attached as attachments, preferably as a single
-diff, when possible, and the changes are related.  The diff must be in
-unified diff format, "-up" is a suitable argument to give to "cvs
-diff" (-p may be dropped if not supported by your diff).  If you have
-added files, then -N should also be used, but if you are using cvs,
-"cvs add" is needed, and requires write access to the repository.
-
-If the patch does not address a specific bug, then the patch email
-should describe which feature or problem it addresses.  If it does
-address a specific bug, then further explanation beyond the bug
-commentary is optional, although often convenient.
-
-It would also be helpful to summarise the module to which it applies
-in the message body.
-
-In all cases you should include which branch, or branches, the patch
-is intended to apply to.  If this is not given it will be assumed to
-be the trunk (HEAD), and such patches will and must not be applied to
-any stable branch without further approval.
-
-2.3 ChangeLogs
-
-All patches must include appropriate ChangeLog diff's, to the
-appropriate ChangeLog(s) for the given change (emacs will automatically
-find the correct one, and format the entry appropriately).  All but
-the most trivial of patches will not be considered or discussed
-without this.  It is ok to contain extra ChangeLog entries for other
-pending patches, but they should not be excessively long - it isn't
-that hard to isolate patch diffs.  If the patch addresses a bug in
-bugzilla.ximian.com, then the ChangeLog entry must include some
-reference to that bug number (either the number, or #number, or 'bug
-xxx').  If it addresses a bug in another bug system, it must also
-indicate which bug system ('gnome bugzilla' 'red-hat bugzilla', etc).
-
-2.4 Stable branches
-
-Generally, any patch to the stable branch from non-core developers
-must address a specific bug in bugzilla.ximian.com.  The patch should
-also be attached to the bug in question, with the keyword 'patch' set
-on the bug report.  The patch email must identify which stable branch
-and version it is to apply to.
-
-3 Mailing lists
-
-3.1 Evolution Hackers
-
-If you wish to discuss patches before they are submitted, or ideas
-before you start to work on them, do it on the evolution-hackers list,
-which may be subscribed and viewed at
-`http://lists.ximian.com/mailman/listinfo/evolution-hackers'.
-
-This is a low-volume list (5-10 posts per day on average).
-
-Some patches may be discussed here to get a wider audience, although
-once a patch has been made it should generally be discussed on
-evolution-patches.
-
-Feature requests, bug reports, and other user related discussions,
-without the intention to write code to address them, will be ignored.
-
-3.2 Evolution Patches
-
-The patch submission list evolution-patches may be subscribed and
-viewed at
-`http://lists.ximian.com/mailman/listinfo/evolution-patches'.  Once a
-patch has been written, it may be submitted here for discussion, as
-well as final approval.
-
-Any non-patch related postings to this list will be ignored.
diff --git a/INSTALL b/INSTALL
deleted file mode 100644
index 54caf7c190..0000000000
--- a/INSTALL
+++ /dev/null
@@ -1,229 +0,0 @@
-Copyright (C) 1994, 1995, 1996, 1999, 2000, 2001, 2002 Free Software
-Foundation, Inc.
-
-   This file is free documentation; the Free Software Foundation gives
-unlimited permission to copy, distribute and modify it.
-
-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, and a
-file `config.log' containing compiler output (useful mainly for
-debugging `configure').
-
-   It can also use an optional file (typically called `config.cache'
-and enabled with `--cache-file=config.cache' or simply `-C') that saves
-the results of its tests to speed up reconfiguring.  (Caching is
-disabled by default to prevent problems with accidental use of stale
-cache files.)
-
-   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 you are using the cache, and at
-some point `config.cache' contains results you don't want to keep, you
-may remove or edit it.
-
-   The file `configure.ac' (or `configure.in') is used to create
-`configure' by a program called `autoconf'.  You only need
-`configure.ac' 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.  Run `./configure --help'
-for details on some of the pertinent environment variables.
-
-   You can give `configure' initial values for configuration parameters
-by setting variables in the command line or in the environment.  Here
-is an example:
-
-     ./configure CC=c89 CFLAGS=-O2 LIBS=-lposix
-
-   *Note Defining Variables::, for more details.
-
-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 support 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' cannot figure out
-automatically, but needs to determine by the type of machine the package
-will run on.  Usually, assuming the package is built to be run on the
-_same_ architectures, `configure' can figure that out, but if it prints
-a message saying it cannot guess the machine type, give it the
-`--build=TYPE' option.  TYPE can either be a short name for the system
-type, such as `sun4', or a canonical name which has the form:
-
-     CPU-COMPANY-SYSTEM
-
-where SYSTEM can have one of these forms:
-
-     OS KERNEL-OS
-
-   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 machine type.
-
-   If you are _building_ compiler tools for cross-compiling, you should
-use the `--target=TYPE' option to select the type of system they will
-produce code for.
-
-   If you want to _use_ a cross compiler, that generates code for a
-platform different from the build platform, you should specify the
-"host" platform (i.e., that on which the generated programs will
-eventually be run) with `--host=TYPE'.
-
-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.
-
-Defining Variables
-==================
-
-   Variables not defined in a site shell script can be set in the
-environment passed to `configure'.  However, some packages may run
-configure again during the build, and the customized values of these
-variables may be lost.  In order to avoid this problem, you should set
-them in the `configure' command line, using `VAR=value'.  For example:
-
-     ./configure CC=/usr/local2/bin/gcc
-
-will cause the specified gcc to be used as the C compiler (unless it is
-overridden in the site shell script).
-
-`configure' Invocation
-======================
-
-   `configure' recognizes the following options to control how it
-operates.
-
-`--help'
-`-h'
-     Print a summary of the options to `configure', and exit.
-
-`--version'
-`-V'
-     Print the version of Autoconf used to generate the `configure'
-     script, and exit.
-
-`--cache-file=FILE'
-     Enable the cache: use and save the results of the tests in FILE,
-     traditionally `config.cache'.  FILE defaults to `/dev/null' to
-     disable caching.
-
-`--config-cache'
-`-C'
-     Alias for `--cache-file=config.cache'.
-
-`--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.
-
-`configure' also accepts some other, not widely useful, options.  Run
-`configure --help' for more details.
-
diff --git a/MAINTAINERS b/MAINTAINERS
deleted file mode 100644
index 28ac3d699a..0000000000
--- a/MAINTAINERS
+++ /dev/null
@@ -1,23 +0,0 @@
-Overall Maintainers:
-JP Rosevear <jpr@novell.com>
-
-Mail:
-Jeff Steadfast <fejj@novell.com>
-Michael Zucchi <notzed@novell.com>
-
-Addressbook:
-Hans Petter Jansson <hpj@novell.com>
-Sivaiah Nallagatla <snallagatla@novell.com>
-
-Calendar
-Harish Krishnaswamy <kharish@novell.com>
-Rodrigo Moya <rodrigo@novell.com>
-
-Composer:
-Radek Doulik <rodo@novell.com>
-
-EPlugin:
-Michael Zucchi <notzed@novell.com>
-
-Documentation:
-Mark Moulder <mmoulder@novell.com>
-\ No newline at end of file
diff --git a/Makefile.am b/Makefile.am
deleted file mode 100644
index f43709a654..0000000000
--- a/Makefile.am
+++ /dev/null
@@ -1,72 +0,0 @@
-changelogs =				\
-	ChangeLog			\
-	ChangeLog.pre-1-4
-
-%-$(BASE_VERSION).pc: %.pc
-	 cp $< $@
-
-pkgconfigdir = $(libdir)/pkgconfig
-pkgconfig_DATA = 				\
-	evolution-shell-$(BASE_VERSION).pc	\
-	evolution-plugin-$(BASE_VERSION).pc
-
-EXTRA_DIST = 			\
-	AUTHORS			\
-	$(changelogs)		\
-	COPYING-DOCS		\
-	README			\
-	HACKING			\
-	MAINTAINERS		\
-	NEWS			\
-	NEWS-1.0		\
-	marshal.mk		\
-	plugin.mk		\
-	server.mk		\
-	intltool-merge.in	\
-	intltool-update.in	\
-	intltool-extract.in	\
-	$(pkgconfig_DATA:-$(BASE_VERSION).pc=.pc.in)
-
-if ENABLE_SMIME
-SMIME_DIR=smime
-endif
-
-SUBDIRS = 			\
-        data                    \
-        e-util                  \
-	a11y			\
-        widgets                 \
-        shell                   \
-	filter			\
-	$(SMIME_DIR)		\
-	addressbook		\
-	calendar		\
-        art                     \
-	composer		\
-	mail			\
-	plugins			\
-	ui			\
-	views			\
-	tools			\
-	help			\
-	po
-
-DISTCLEANFILES = intltool-extract intltool-merge intltool-update $(pkgconfig_DATA)
-
-# CDE Stuff
-
-if HAVE_DTAPPINTEGRATE
-
-# This installs Evolution into the Application Manager on CDE
-dtappintegrate:
-	( cd data && make dtappintegrate )
-
-# ...And this uninstalls it
-dtappunintegrate:
-	( cd data ; make dtappunintegrate )
-
-# Install/uninstall for CDE
-cde-install: install dtappintegrate
-cde-uninstall: dtappunintegrate uninstall
-
-endif
diff --git a/NEWS b/NEWS
deleted file mode 100644
index 7b5d4b2d0e..0000000000
--- a/NEWS
+++ /dev/null
@@ -1,1732 +0,0 @@
-Evolution 2.2.0, 2005-03-07
----------------------------
-
-Bugzilla bugs fixed (see http://bugzilla.ximian.com/show_bug.cgi):
-
- * Addressbook
-   #73152 - Assigning Color To Default Personal Contacts, Creates Duplicate (Siva)
-
- * Calendar
-   #72835 - Alarm notify crashes always (Rodrigo)
-   #73152 - Assigning Color To Default Personal Calendar, Creates Duplicate (Siva)
-
-Other bugs
-
- * Plugins
-   - Fix exchange plugin description for OOF (Sushma)
-
-Updated translations:
-	- pt_BR (Raphael Higino)
-	- hu (Laszlo Dvornik)
-	- sr (Danilo Segan, Igor Nestorovic)
-	- sr@Latn (Danilo Segan, Igor Nestorovic)
-	- nl (Tino Meinen)
-	- lt (Zygimantas Berucka)
-	- sq (Gintautas Miliauskas, Laurent Dhima)
-	- ja (Takeshi AIHANA)
-	- bg (Iassen Pramataro)
-
-Evolution 2.1.6, 2005-02-28
----------------------------
-
-Bugzilla bugs fixed (see http://bugzilla.ximian.com/show_bug.cgi):
-
- * Addressbook
-   #73005 - Cannot cancel 'Contact List Editor' (Siva)
-   #73005 - offline - setting/unsetting folder offline property is not working (Sushma)
-   #70371 - Evolution crashes when adding contact list (Siva)
-   #67724 - When unix user name, callendar points to old username (Siva)
-   #54825 - Freeze on .vcf import from MacOS X AddressBook (Christophe Fergeau)
-   #73013 - 'Right' click on a 'Contact' cannot select 'Cut' (Siva)
-
- * Calendar
-   #72958 - Unable to send delayed meeting (Chen)
-   #72006 - Opened existing appointments with attachment - press cancel - popup info with save / discard / cancel changes (Chen)
-   #63866 - Same name can be entered twice in invitations tab (JP)
-   #67714 - Invitations Tab Allows Entry Of Empty Line (JP)
-   #62089 - adding contact lists to meetings impossible (JP)
-   #47747 - Changes to attendee not updated until click on different row (JP)
-   #61495 - Existing text is placed off screen when editing attendee field (JP)
-   #28947 - adding contact list to attendee list should expand it (JP)
-   #67724 - When unix user name, callendar points to old username (Siva)
-   #72038 - Changes meeting to appoinment after throwing warning invalid mail id (Rodrigo)
-   #69556 - Crash attaching mime parts to calendar events (Harish)
-
- * Mail
-   #66126 - attach File Chooser is modal (Michael)
-   #68549 - Answering to Usenet article doesn't consider the "Followup-To:" field (Michael)
-   #71003 - threads still running at exit (Michael)
-   #62109 - Inconsistent ways of determining 8-bit Subject: and From: header charsets (Jeff)
-   #34153 - Confusing Outbox semantics for deleted outgoing messages (Michael)
-   #71528 - Search Selection Widget Has Repeated Items (Michael)
-   #71967 - Evolution delete mail from POP3 server even is checked the option "leave the mail on server (Michael)
-   #40515 - Signature scripts do not allow switches (Michael)
-   #68866 - Forward button doesn't put newline between headers and body (Michael)
-   #35219 - flag-for-followup crufting (Michael)
-   #64987 - Go to next unread message doesn't work when multiple messages are selected (Michael)
-   #72337 - Evolution crashes if I click OK/Cancel on the password dialog after disabling the IMAP account (Michael)
-   #70718 - Next and previous buttons don't realize there's new mail (Michael)
-   #61363 - Setup wizard, IMAP for receiving server, sending default GW (Michael)
-   #70795 - Next/Previous Message Should Only Display Listed Emails (Michael)
-   #23822 - no copy text option when right-clicking on marked mail text (Rodney)
-   #72266 - You shouldn't be able to open more than one 'Select Folder' dialog in the mail filters (Michael)
-   #71429 - on NLD, menus in wrong order (Michae)l
-   #72228 - cannot store into groupwise sent folder (Michael)
-   #72209 - Evolution is crashing when you move a VFolder to a folder 'on this computer' (Michael)
-   #72275 - Can't use Shift+F10 to popup context menu for link in message (Harry Lu)
-   #54503 - "New" dropdown menu on toolbar has wrong widget style (Rodney)
-   #72676 - Saved filter rule can't be modified if it is selected with GOK. (Harry Lu)
-
- * SMIME
-   #68592 - "Backup" buttons in certificate settings does nothing - work around (Michael)
-
- * Shell
-   #33287 - "send/receive" button not greyed out when starting offline (JP)
-   #48868 - Status bar changes its height when fonts are large (William Jon McCann)
-
- * Plugins
-   #71527 - Save Calendar widget mixup between directory and file (Rodrigo)
-
-Other bugs
-
- * Addressbook
-   - Use new categories dialog in contact editor (Rodrigo)
-   - HIG spacing fixes (Rodney)
-   - Display warning dialog when GW server is old (Vivek)
-
- * Calendar
-   - Always ensure default sources are available (Siva)
-   - Don't look up free/busy unless we need to (Harish)
-   - Make sure new events don't display twice (Chen)
-   - Make sure double click opens attachments (Chen)
-
- * Mail
-   - a11y fixes for composer (Harry Lu)
-   - Use gnome-vfs API to launch external applications (Marco Pesenti Gritti)
-   - New mailer context menus for messages (Rodney)
-
- * Shell
-   - Fix leak (JP)
-   - Use gnome-vfs API to open quick reference (Marco Pesenti Gritti)
-
- * Plugins
-   - Make e-popup more robust (Michael)
-   - Cleanup authors/descriptions (Björn Torkelsson)
-   - out of office exchange fixes (Sushma)
-   - retry send options if invalid session string (Chen)
-   - set proper default port for shared folders (Vivek)
-
- * Miscellaneous
-   - BSD runtime linking fixes (Hans)
-   - distclean fixes (Björn Torkelsson)
-
-Updated translations:
-	- et (Priit Laes)
-	- el (Kostas Papadimas, Nikos Charonitakis)
-	- sv (Christian Rose)
-	- es (Francisco Javier F. Serrador)
-	- it (Luca Ferretti, Marco Ciampa)
-	- da (Martin Willemoes Hansen)
-	- ca (Josep Puigdemont, Xavi Conde)
-	- nb (Kjartan Maraas)
-	- no (Kjartan Maraas)
-	- ru (Leonid Kanter)
-	- gu (Ankit Patel)
-	- cs (Miloslav Trmac)
-	- nl (Vincent van Adrighem)
-	- fi (Ilkka Tuohela)
-	- pt (Duarte Loreto)
-	- uk (Maxim Dziumanenko)
-	- ko (Changwoo Ryu)
-	- de (Frank Arnold)
-	- fr (Vincent Carriere)
-	- en_CA (Adam Weinberger)
-	- cs (Miloslav Trmac)
-	- pl (Artur Flinta)
-	- bg (Vladimir Petkov)
-	- ja (Takeshi AIHANA)
-	- en_GB (David Lodge)
-	- en_CA (Adam Weinberger)
-	- lt (Zygimantas Berucka)
-
-Evolution 2.1.5, 2005-02-07
----------------------------
-
-Bugzilla bugs fixed (see http://bugzilla.ximian.com/show_bug.cgi):
-
- * Addressbook
-   #36137 - Leading %s in addressbook message totally non-obvious (Siva)
-   #57819 - Evolution allows to create several contact lists with same name
-            (Partha)
-   #61060 - Don't split sentences in Evolution (Siva)
-   #61067 - Use translator comment for evolution addressbook message (Siva)
-   #67411 - Crash: create new address book (Hans Petter)
-   #68799 - Evolution doesn't store IM info on the LDAP server (Siva)
-   #70339 - vcard preview doesn't appear to work (Siva)
-
- * Calendar
-   #33078 - No category list for Category searches in Calendar & Tasks (Rodrigo)
-   #56901 - Only one line gets printed when printing Tasks and Appointments (Yong)
-   #61078 - Please avoid using different styles of markup in translateable
-            evolution messages (Priit)
-   #64682 - Moving a appts from one calendar to another sends update (Chenthill)
-   #71265 - Deletion Of Weather Calendar Crashes Evo (Rodrigo)
-   #71452 - Pressing 2 times escape - edited meeting window disappear (JP)
-   #71485 - String issues (JP)
-   #71729 - Gnopernicus should report the full name of week day (Li)
-   #71929 - Whitespace before colons in Evolution calendar a11y messages
-            (Rodrigo)
-   #71924, 71926, 71932 - Don't split sentences (Harry)
-   #71944 - Failed to compile (JP)
-   #72088 - Some calendar a11y functions don't work (Harry)
-   #72090 - Evolution crashed when clicking on 'open calender' in sent items (Rodrigo)
-
- * Mail
-   #65329 - Regression in default folder name localisation (Michael)
-   #67083 - CJK-translated mail header names are line-wrapped with long lined headers
-            (Michael)
-   #68137 - Inconsistent VFolder vs vFolder (Rodney)
-   #68696 - RFE: Simplifications to the "Account Management" page of the Account
-            setup druid (Rodney)
-   #68743 - Button jumps when you click it (Rodney)
-   #69815 - Cannot quit while updating vfolders (Michael)
-   #69850 - Crash: attempting to create a Vfolder based on a message without a Sender
-            (Michael)
-   #70454 - Folder shows unsubscribed, but is subscribed (Jeff)
-   #71310 - Always loses my signature script settings (Michael)
-   #71312 - Double-clicking vFolder of Draft folder doesn't allow editing (Michael)
-   #71520 - Changing server type not displayed immediately in 'Account settings'
-            (Michael)
-   #71521 - 'Account Editor' does not allow to change hostname (Michael)
-   #71774 - Evolution crashes when cancel 'Rename Folder' dialog (Mengjie)
-   #71937 - Spamasssassin typo in Evolution mail schemas (JP)
-
- * Plugins
-   #41235 - Spacing/padding of itip control (Rodney)
-   #71460 - Clicking accept button in appointment - Unable to send item to calender
-            'Calender'. Invalid object (Chenthill)
-   #71512 - Crash: AMD64 Unable to add or import contacts (Siva)
-   #71644 - Empty string marked for translation (Sushma)
-
-Other bugs
-
- * Addressbook
-   - Use new categories dialog in contact editor (Rodrigo)
-   - HIG spacing fixes (Rodney)
-   - Display warning dialog when GW server is old (Vivek)
-
- * Calendar
-   - Fixed sensitation of widgets in recurrence page (Rodrigo)
-   - Fixed IDL duplications (Hans Petter)
-   - Don't build private libraries as modules (Hans Petter)
-   - Fixed popup menu for detached recurrences (Rodrigo)
-   - HIG spacing/padding fixes (Rodney)
-   - Display warning dialog when GW server is old (Vivek)
-   - Clear component preview when updating (Rodrigo)
-   - Added help button to editors (Rodney)
-   - Fix DND issues with calendar attachments (Harish)
-
- * Mail
-   - HIG fixes (Rodney)
-
- * Plugins
-   - Use icon factory in audio-inline plugin (JP)
-   - Fix order of menus in calendar-http plugin (David)
-   - Added missing ID's (JP)
-   - Set weather categories as not searchable (Rodrigo)
-   - Added auth type section in exchange-account-setup plugin (Sushma)
-   - Fixed crash in groupwise-send-options dialog (Chenthill)
-
- * All
-   - Added 'pt' default setup to build (Rodney)
-   - Fixed druid lock on startup (Jeff)
-   - a11y improvements (Mengjie, Li, Harry)
-   - HIG fixes to e-passwords dialogs (Rodney)
-
-Updated translations:
-   - bg (Alexander Shopov)
-   - cs (Miloslav Trmac)
-   - de (Hendrik Richter, Frank Arnold)
-   - el (Kostas Papadimas)
-   - en_CA (Adam Weinberger)
-   - es (Francisco Javier F. Serrador)
-   - et (Priit Laes)
-   - it (Marco Ciampa)
-   - ja (Takeshi AIHANA)
-   - lt (Zygimantas Beruska)
-   - nb (Kjartan Maraas)
-   - no (Kjartan Maraas)
-   - ru (Leonid Kanter)
-   - sk (Marcel Telka)
-   - sv (Christian Rose)
-   - zh_CN (Funda Wang)
-
-Evolution 2.1.4, 2005-01-24
-----------------------------
-
-Bugzilla bugs fixed (see http://bugzilla.ximian.com/show_bug.cgi):
-
- * Mail
-
-   #46287 - Space key should work for checkbox (JP)
-   #57090 - Junk Button Sensitivity needs changes (Radek)
-   #69122 - Make subject || sender contains the default search (Michael)
-   #60664 - message view does not follow theme change (Michael)
-   #55831 - missing warning dialog about opening a lot of selected mails (Michael)
-   #66943 - Crash when saving draft (Michael)
-   #70768 - 'Mark All as Read' marks all the mails which are not in current query as read (Michael)
-   #71105 - When trying to rename a folder containing a slash "/" and spaces, evil stuff happens (Michael)
-   #65178 - newly created folder on local maildir doesn't show until evolution restart (Michael) 
-   #71029 - receiving settings not stored (Michael)
-   #70990 - NNTP without username broken (Michael)
-   #70018 - Signatures don't work (Michael)
-   #68352 - Add post message keybinding (Rodney)
-
- * Calendar
-
-   #71407 - Input Protect Read-Only Calendars (Rodrigo)
-   #65820 - Evolution Calendar weekday names message needs translator comment (JP)
-
- * Addressbook
-
-   #70622 - crash (JP)
-   #71448 - Deleting many contacts is incredibly slow (Siva)
-   #41210 - spacing/padding of "Contact Quick Add" dialog (Rodney)
-   #60852 - "Add address" popup dialog UI is ugly/wrong size, and button is resizable (Rodney)
-   #41228 - spacing/padding of "duplicate contact detected" dialog (Rodney)
-   #70922 - Email address types should show "Other" when importing vcards (Siva)
-   #61973 - add TTYTDD translator comment (JP)
-
- * Plugins
-
-   #71384 - 'Forward' button is disabled while configuring mail id (Sushma)
-   #29985 - Accepted meetings should have a replied-to icon (JP)
-
- * Miscellaneous
-
-   #46404 - not remembering printer definition (JP)
-
-Other bugs
-
- * Address Book
-
-    - set full name appropriately when quick adding (Hans)
-    - fix creation of local addressbooks (Siva)
-    - a11y fixes (Hao Sheng)
-
- * Mail
-
-    - Add items to folder properties correctly (Jeff)
-    - Add async descriptions (Jeff)
-		
- * Calendar
-
-    - for detached instances, disable recurrence UI (Rodrigo)
-    - use receive_objects for importing (Rodrigo)
-    - change free/busy prefs title (Nat)
-    - handle attachment errors better (Harish)
-    - fix possible day view resize crash (Michael)
-	
- * Shell
-
-    - fix offline handler crash (JP)
-    - close import wizard on Esc (Mengjie Yu)
-
- * S/MIME
-
-    - don't remove tree node if deleting cert failed (Michael)
-
-  * Plugins
-
-    - Add addressbook file config plugin so local calendar get set up right (Siva)
-    - In BBDB check the buddy account name not alias (Nat)
-    - In weather calendar fix units spelling (David Trowbridge)
-    - In weather calendar use single metric/imperial specification (David Trowbridge)
-    - Add default source plugin so its easy to set for the user (Siva)
-    - Make exchange account setup simpler (Sushma)
-    - In groupwise account setup simplify the settings for soap only (Siva)
-    - Add groupwise status tracking plugin so the user can see the information they requested (Chen)
-    - In itip-formatter extract the decoded text so non-ascii works (JP)
-    - In itip-formatter handle utc dtstart/dtend correctly (JP)
-    - In new-mail-notify fix DBUS event handling (Miguel Angel Lopez Hernandez)
-    - In groupwise sendoptions, make sure the global send options actually work (Chen)
-    - In groupwise shared folder, improve UI (Vivek)
-    - In groupwise shared folder, add a wizard for shared folder notifications (Vivek)
-
-Updated translations:
-	- es (Francisco Javier F. Serrador)
-	- de (Hendrik Richter, Frank Arnold)
-	- it (Marco Ciampa)
-	- nl (Vincent van Adrighem)
-	- lt (Zygimantas Berucka)
-	- nb (Kjartan Maraas)
-	- no (Kjartan Maraas)
-	- et (Priit Laes)
-	- el (Nikos Charonitakis)
-	- ja (Takeshi AIHANA)
-	- en_CA (Adam Weinberger)
-
-Evolution 2.1.3, 2004-01-10
-----------------------------
-
-Bugzilla bugs fixed (see http://bugzilla.ximian.com/show_bug.cgi):
-
- * Calendar
-
-   #69663 - Task list on the web does not mark tasks as finished (JP)
-   #61076 - Evolution calendar messages unnecessarily marked for translation (JP)
-   #41624 - only the last exception is deleted on palm device (JP)
-
- * Addressbook
-
-   #61068 - Extraneous space in evolution message (Andre Klapper)
-   #61975 - Can't translate string "Reflow test" (JP)
-
- * Plugins
-
-   #30992 - Preferences dialog greys out OK button after Apply (JP)
-
-Other bugs
-
- * Address Book
-
-    - set read only state better for contact editor (Hans)
-    - add UI for marking calendars offline (Siva)
-    - use new name selector api (Hans)
-
- * Mail
-
-    - Display icon for shared folder (Vivek)
-    - New offline folder/store classes (Jeff)
-    - Handle reply in mailto: (Michael)
-    - a11y fixes (Mengjie Yu)
-    -  (Mengjie Yu)
-		
- * Calendar
-
-    - detached instance recurrence handling (Rodrigo)
-    - calendar attachments (Harish)
-    - send options for meeting (Chen)
-    - handle calendar:// uris (JP)
-    - handle different calendars having the same uid (Rodrigo)
-    - add UI for marking calendars offline (Chen)
-    - use new name selector API (Hans)
-    - prevent crash when searching for f/b info (JP)
-    - a11y fixes (Harry)
-    - calendar config cleanup (JP)
-	
- * Shell
-
-    - Make component buttons configurable (JP)
-    - Set offline with gconf key (Siva)
-
-  * Plugins
-
-    - add component.migration event for calendar (David Trowbridge)
-    - fix translations of popup menus (Michael)
-    - HIG config dialog fixes (Rodney)
-    - Add calendar file config plugin so local calendar get set up right (JP)
-    - Add calendar weather config plugin (David Trowbridge)
-    - Add exchange account config plugin (Sushma)
-    - Add groupwise send options plugin (Partha)
-    - Add itip formatter plugin (JP)
-    - Add new-mail-notify plugin that uses DBUS (Miguel Angel Lopez Hernandez)
-    - Use standard error messages in save-calendar plugin (Philip Van Hoof)
-    - Add send options plugin for account editor (Chen)
-    - Add shared folder notification plugin (vivek)
-
-Updated translations:
-  - lt (Zygimantas Berucka)
-  - ja (Takeshi AIHANA)
-  - bg (Vladimir Petkov, Alexander Shopov)
-  - et (Priit Laes, Ivar Smolin)
-
-Evolution 2.1.2, 2004-12-20
-----------------------------
-
-Bugzilla bugs fixed (see http://bugzilla.ximian.com/show_bug.cgi):
-
- * Mail
-
-   #68759 - Evolution Shell can't load modules (JP)
-   #69579 - Moving a message from an IMAP INBOX to an IMAP folder caused crash (Michael)
-   #69339 - postscript and some other attachments not visable (Michael)
-   #69579 - vFolders#UNMATCHED generates errors (Michael)
-   #68958 - current message forgotten in vfolders (Michael)
-   #69446 - Mail shown as attachment if some headers are upper case (Michael)
-   #46229 - Filters dialog - label suggestions (Diego Sevilla Ruiz)
-
- * Calendar
-
-   #47535 - Snooze Time "minutes" string Improperly marked for translation
-    (Rodney)
-   #67403 - wrong alarm time displayed (Rodrigo)
-
- * Shell
-
-   #61065 - Evolution should be spelled with uppercase E in evolution message (Joan Sanfeliu) 
-
-Other bugs
-
- * Address Book
-
-    - Turkish locale fixes (S. Caglar Onur)
-    - Set proper window title for editing addressbook properties (Vivek)
-    - Prevent null UID from causing weird saving problems (Siva)
-    - a11y fixes (Harry Lu, Hao Sheng)
-
- * Mail
-
-    - Add mnemonics everywhere (Mengjie Yu)
-    - Moving a message from an IMAP INBOX to an IMAP folder caused crash (Radek)
-		
- * Calendar
-
-    - let users set a template for fetching free/busy information (James
-      Bowes)
-    - Set proper window title for editing calendar/task properties (Vivek)
-    - Leak fixes (Harish)
-    - Fix 64 bit problem (David Mosberger)
-    - UI Fixes for meetings and assigned tasks (Chen)
-
- * Shell
-
-    - fix 64 bit problem (David Mosberger)
-    - use new window icon (Rodney)
-
-  * Plugins
-
-    - make plugin hooks available for mail even when the mailer is not
-    activated (Michael)
-    - move groupwise config code to a plugin (Siva)
-    - support csv and rdf calendar saving (Philip Van Hoof)   
-
-Updated translations:
-
-  - nl (Vincent van Adrighem)
-  - sv (Christian Rose)
-  - ca (Jordi Mallach)
-  - zh_CN (Funda Wang)
-  - bg (Alexander Shopov)
-  - fi (Ilkka Tuohela)
-  - da (Martin Willemoes Hansen)
-  - tr (Baris Cicek)
-  - lt (Zygimantas Berucka)
-  - cy (Dafydd Harries)
-
-Evolution 2.1.1, 2004-11-28
-----------------------------
-
-Bugzilla bugs fixed (see http://bugzilla.ximian.com/show_bug.cgi):
-
- * Addressbook
-
-   #28725 - should not say "no items in this view" until the backend is done responding (Sushma)
-   #61065 - Evolution should be spelled with uppercase E in evolution message (Joan Sanfeliu)
-   #61976 - Near-identical strings, should be made identical (Rodney)
-   #67656 - almost the same email address are considrered identical (Siva)
-   #61966 - Typo in string: Word "be" missing (Andre Klapper)
-   #69079 - Data repeated after save with bad date format (Siva)
-   #66854 - Some strings are missed to translation (partial, Rodney)
-
- * Mail
-
-   #68787 - Crash when migrating 1.4 data to 2.0.2 (Michael)
-   #69109 - EHLO or HELO with ip addresses does not conform rfc 821 (Michael)
-   #69408 - Evolution hang in message fetching with ima4rev1 (Jeff)
-   #69145 - toplevel message/rfc822 parts are broken for IMAP (Michael)
-   #69241 - base64 attachement holding PGP block (Jeff)
-   #69160 - IMAP4 dont freez on scaning imap folders (Jeff)
-   #67496 - html email not rendered in preview pane (Michael)
-
- * Calendar
-
-   #68624 - Requires URL to have http:// or webcal:// at beginning (Diego Sevilla Ruiz)
-   #47529 - Date in reminder window appears in UTF-8 in non-UTF-8 locale (Rodney)
-   #6767  - Fix hardcode colors in day, week, month views (Li Yuan)
-   #68707 - Events ending at 12:00 AM show as ending at 12:00 pm (JP)
-
- * Shell
-
-   #61065 - Evolution should be spelled with uppercase E in evolution message (Joan Sanfeliu) 
-
-Other bugs
-
- * Address Book
-
-    - Handle required fields (Siva)
-    - a11y fixes (Hao Sheng)
-    - make shift-F10 popup menu (Hao Sheng)
-    - don't show error dialog when cancelling operation (Siva)
-
- * Mail
-
-    - Reduce memory for vfolder operations (Michael)
-    - Use unix sockets for spam checking (Radek)
-		
- * Calendar
-
-    - warn is summary is blank (Chen)
-    - allow creating new calendar with right click on a group (Harish)
-    - EConfigize new calendar and calendar properties (David Trowbridge)
-    - make sure switch between 12/24h time shows immediately (JP)
-
-  * Plugins
-
-    - set "base" plugin target (Michael)
-    - add webcal config plugin (David Trowbridge)
-    - mailing list actions plugin (Meilof Venningen)   
-    - plugin manager plugin (Michael)   
-
-Updated translations:
-
-  - da (Martin Willemoes Hansen)
-  - lt (Žygimantas Beručka)
-  - nl (Vincent van Adrighem)
-  - de (Hendrik Richter)
-  - it (Marco Ciampa)
-  - ca (Jordi Mallach)
-  - fa (Meelad Zakaria)
-  - sq (Laurent Dhima)
-  - fr (Sebastien Bacher)
-  - cs (Juraj Kubelka)
-
-Evolution 2.1.0, 2004-11-01
-----------------------------
-
-Bugzilla bugs fixed (see http://bugzilla.ximian.com/show_bug.cgi):
-
- * Addressbook
-
-   #61069 - Missing space in evolution addressbook message (Andre Klapper)
-   #61972 - Typo in country name: Is "Grena-dines", should be "Grenadines" (Andre Klapper)
-
- * Mail
-
-   #68894 - IMAP4 rev1, error on selecting INBOX (Jeff)
-   #68814 - evo crash while fetching mail using IMAP4 rev1 (Jeff)
-   #44876 - Missing keyboard navigation in the e-mail recipient section (Mengjie Yu)
-
-Other bugs
-
- * Address Book
-
-    - Display multi value attributes in the preview (Nat)
-
- * Mail
-
-    - Enable IMAP4 camel provider by default (Jeff)
-    - IMAP4 offline folder info caching (Jeff)
-		
- * Calendar
-
-    - a11y fixes (Li Yuan)
-    - make free/busy information gathering more efficient (Harish)
-
- * Shell
-
-    - remove deprecated calls (Kjartan Maraas)
-
-  * Plugins
-
-    - convert mail, address book to econfig (Zucchi)
-    - convert all components to e-menu (Zucchi)
-    - add new mail event (Zucchi)
-    - add message replied event (Nat/Zucchi)
-    - add online/offline event (Zucchi)
-    - inline audio via gstreamer (Radek)
-    - big brother database (Nat)
-    - copy address tool (Zucchi)
-    - folder unsubscribe (Jeff)
-    - mail to task (Rodrigo)
-    - mark calendar for offline (Harish)
-    - prefer plain text for messages (Zucchi)
-    - save attachments (Zucchi)
-    - save calendar (Rodrigo)
-    - select one calendar/task (JP)
-    - subject threading (JP/Zucchi)
-
-Updated translations:
-
-  - da (Martin Willemoes Hansen)
-  - it (Marco Ciampa)
-  - sq (Laurent Dhima)
-  - el (Nikos Charonitakis)
-  - ms (Hasbullah Bin Pit)
-  - bg (Vladimir Petkov)
-
-Evolution 2.0.2, 2004-10-11
-----------------------------
-
-Bugzilla bugs fixed (see http://bugzilla.ximian.com/show_bug.cgi):
-
- * Addressbook
-
-   #66520 - Crash deleting addressbooks (Michael)
-   #66369 - VCard import requires blank lines between contacts (Hans)
-   #65537 - Updating Contacts Causes Crash (Hans)
-
- * Calendar
- 	
-   #65932 - Crash when accessing the details of an appointment notification (Rodrigo)
-   #64683 - meeting invite expands to larger than workspace (Rodrigo and JP)
-   #66736 - crash clicking Search Clear button twice (Michael)
-   #61766 - select personal calendar/tasks by default when migrating (JP)
-   #65599 - 'Evolution 1.5' crash in 'Free/Busy' editor (Rodrigo)
-   #62053 - select GroupWise calendar by default (Siva)
-   #66164 - popup date edit drop down in correct place (JP)
-   #45951 - Scroll properly in task description (Rodrigo)
-
- * Mail
-
-   #67170 - Unable to subscribe to the alt hierarchy (Michael)
-   #67028 - 2.0.1 compilation fails on camel-service.c: In function `camel_getaddrinfo' (Jeff)
-   #67257 - evolution busy waits looking up hostname if network down (Michael)
-   #66509 - Evolution Crashes when deleteing a news group (Michael)
-   #65828 - Fix typo in error message (Jeff)
-   #63881 - "Cannot copy or move messages into a Virtual Folder" when
-	     dragging from UNMATCHED vfolder into real folder (Ed Catmur)
-   #63521 - stale / bogus pop cache file (Michael)
-   #66991 - crash creating folders (Michael)
-   #66706 - Evolution Crashes while refreshing Folder Subscriptions (Michael)
-   #67408 - Seg Fault on exit (Michael)
-   #67211 - Evolution crashes when getting summary from folder (Michael)
-   #66703 - S/MIME signing fails randomly (Jeff)
-
- * Shell
-
-   #61285 - use better query for config pages (Michael)
-   #66216 - don't show translator-credits directly in about box (Malcolm Treddinnick)
-
-Other bugs
-
- * Address Book
-
-    - Crash when exiting (Hans)
-
- * Mail
-
-    - Provide error dialogs if host/name lookups fail (Jeff)
-    - Improve NNTP locking (Michael)
-    - Work with complete MBox hierarchy (Michael)
-    - Forward as inline sends attachments (Michael)
-    - Fix possible migration bug from 1.2 (Dave Malcolm)
-	
-  * Other
-
-    - Updated documentation (Rodney and Novell Doc Team)
-    - Don't dereference NULL nickname or emailAddr on certificate (Michael)
-
-Updated translations:
-
-  - el (ta panta rei, Nikos Charonitakis)
-  - ja (Takeshi AIHANA)
-  - hu (Laszlo Dvornik)
-  - pt (Duarte Loreto)
-  - sq (Laurent Dhima)
-  - es (Francisco Javier F. Serrador)
-  - nl (Vincent van Adrighem, Michel Klijmij)
-  - en_CA (Adam Weinberger)
-  - zh_CN (Funda Wang)
-  - cs (Miloslav Trmac)
-  - pl (GNOME PL Team)
-  - pt_BR (Raphael Higino)
-  - sr (Danilo Segan)
-  - sr@Latn (Danilo Segan)
-  - en_GB (David Lodge)
-  - ca (Xavier Conde Rueda)
-  - ko (Changwoo Ryu)
-  - ro (Mugurel Tudor)
-  - fr (Christophe Merlet)
-  - nb (Kjartan Maraas)
-  - no (Kjartan Maraas)
-  - da (Martin Willemoes Hansen)
-  - ru (Leonid Kanter)
-  - fa (Meelad Zakaria)
-
-Evolution 2.0.1, 2004-09-24
-----------------------------
-
-Bugzilla bugs fixed (see http://bugzilla.ximian.com/show_bug.cgi):
-
- * Addressbook
-
-   #61070 - Fix improper grammar (hannah rebekah & fazlu huq)
-   #59725 - Conduit syncing to wrong desktop record (JP)
-   #63191 - Fix contact list editor title (JP)
-   #64080 - addressbook gui component needs to be linked with libcamel (Michael)
-   #64024 - Lower pane doesn't go away when you uncheck "Preview Pane" in Contacts (Siva)
-   #64011 - Remove C99-ism (Vicent Noel)
-   #62856 - in --offline mode, still get prompted for gw addressbook password, work around (Michael)
-
- * Calendar
-
-   #66344 - Evolution crashes added start time column to tasks (JP)
-   #63513 - G/W appointment acceptance fails ('invalid object') (Chen)
-   #60904 - Show all appointments when work week longer than 5 days (JP)
-   #66158 - Completion status is not displayed immediately (JP)
-   #59194 - Crash editing location field in event list (JP)
-   #65682 - get error deleting appointments (Chen)
-   #55172 - sync montly recurrences properly (JP)
-   #62374 - alarms no function if run over night (Rodrigo)
-   #62728 - week day heading in month view does not update after changing week start day in settings (JP)
-   #62392 - Crash on close alarm notification (Rodrigo)
-
- * Mail
-
-   #65329 - translate standar folder names (Michael)
-   #65058 - Specific mails don't display picture but picture data (Michael)
-   #64972 - signature auto-selection in composer with Maildir account is broken (Michael)
-   #65448 - Opening a mail does not mark it read (Jeff)
-   #64974 - Allow selecting of file or folder for maildir and mh accounts (Jeff)
-   #65703 - Display reply to all icon (JP)
-   #59717 - crash checking supported authentication types (Michael)
-   #47821 - try all host names available when connecting (Michael)
-   #66199 - Image loading fails with authenticated proxy (Michael)
-   #64023 - Forget NNTP password if it was wrong (Michael)
-   #64092 - Ambiguity in nomenclature of GW Tasks in Evolution (Siva)
-
- * Shell
-
-   #61285 - use better query for config pages (Michael)
-   #66216 - don't show translator-credits directly in about box (Malcolm Treddinnick)
-
-Other bugs
-
-  * Addressbook
-
-    - point to correct documentation file (Rodney)
-    - check for LABEL supported (Siva)
-
-  * Calendar
-
-    - Don't allow deletion of system calendar or tasks (JP)
-    - Don't allow a task to be changed to an assigned task if the backend doesn't support it (Chen)
-
-  * Mail
-
-    - Fix typo setting the root node in folder tree (Dave Malcolm)
-    - Handle 0 length token read for summary (Michael)
-    - Make SSL connections async and cancellable (Michael)
-
-Updated translations:
-  - fr (Christophe Merlet, Craig Jeffares)
-  - pl (Artur Flinta)
-  - sq (Laurent Dhima)
-  - cs (Miloslav Trmac)
-  - es (Francisco Javier F. Serrador)
-  - nl (Vincent van Adrighem)
-  - zh_CN (Funda Wang)
-  - en_CA (Adam Weinberger)
-  - it (Craig Jeffares)
-  - zh_TW (Craig Jeffares)
-  - en_GB (Gareth Owen)
-  - fa (Roozbeh Pournader)
-  - el (Nikos Charonitakis)
-  - ja (Takeshi AIHANA)
-  - pt_BR (Raphael Higino)
-  - da (Martin Willemoes Hansen)
-  - ko (Changwoo Ryu)
-  - nn (Åsmund Skjæveland)
-  - sr (Danilo Segan)
-  - hu (Laszlo Dvornik)
-  - bs Danilo Segan
-  - id (Mohammad DAMT)
-  - nb (Sigurd Gartmann)
-  - no (Sigurd Gartmann)
-  - ar (Arafat Medini))
-
-Evolution 2.0.0, 2004-09-13
-----------------------------
-
-Bugzilla bugs fixed (see http://bugzilla.ximian.com/show_bug.cgi):
-
- * Addressbook
-
-   #59582 - Contact incompletely updated to LDAP store, address information lost/not editable (Siva)
-   #64084 - addressbook gui component needs to be linked with libcamel (Michael)
-
- * Calendar
-
-   #65454 - Evolution crashes while opening newly received e-mail (JP)
-   #62392 - Crash on close alarm notification (Rodrigo)
-   #64800 - broken timezone selector (Rodney)
-
- * Mail
-
-   #60515 - signature setting is not preserved changing "Autogenerated" to "None"  (Michael)
-   #63377 - Crash when replying to a (specific) message  (Jeff)
-   #62665 - Wrong Folder is deleted (Jeff)
-   #64377 - crash creating new folder (Michael)
-   #63456 - crash replying to E-mail (Michael)
-
-Other bugs
-
-  * Addressbook
-
-    - Confirmation dialog was showing up on contact-editor close,
-      even if there were no changes (Hans Petter)
-
-  * Calendar
-
-    - 64 bit build fix (Rodrigo)
-	
-  * Misc
-    
-    - new documentation (Rodney)
-
-Updated translations:
-
-  - ar (Arafat Medini)
-  - bn (Runa Bhattacharjee)
-  - cs (Miloslav Trmac)
-  - cy (Dafydd Harries, Telsa Gwynne)
-  - da (Martin Willemoes Hansen)
-  - de (Hendrik Richter)
-  - el (Nikos Charonitakis)
-  - en_CA (Adam Weinberger)
-  - en_GB (David Lodge)
-  - es (Francisco Javier F. Serrador)
-  - et (Priit Laes)
-  - fi (Ilkka Tuohela)
-  - hi (Rajesh Ranjan)
-  - hu (Laszlo Dvornik)
-  - id (Mohammad DAMT)
-  - ja (Takeshi AIHANA)
-  - ko (Changwoo Ryu)
-  - ms (Hasbullah Bin Pit)
-  - nb (Sigurd Gartmann)
-  - nl (Vincent van Adrighem)
-  - nn (Åsmund Skjæveland)
-  - no (Kjartan Maraas)
-  - pl (Artur Flinta)
-  - pt (Duarte Loreto)
-  - pt_BR (Raphael Higino)
-  - ro (Mugurel Tudor)
-  - ru (Leonid Kanter)
-  - sq (Laurent Dhima)
-  - sr (Danilo Segan)
-  - sv (Christian Rose)
-  - tr (Baris Cicek)
-  - uk (Maxim Dziumanenko)
-  - zh_CN (Funda Wang)
-  - zh_TW (Abel Cheung)
-
-Evolution 1.5.94, 2004-08-27
-----------------------------
-
-Bugzilla bugs fixed (see http://bugzilla.ximian.com/show_bug.cgi):
-
- * Addressbook
-
-   #61833 - Blank names in name selector (Hans Petter)
-   #62715 - Free-form addresses not loading in contact editor (Hans Petter)
-
- * Calendar
-
-   #62869 - Crash: attempt to access GW tasks from evolution (Siva)
-   #62706 - Changing time-zone doesn't refresh calendar correctly (JP)
-   #62063 - Meeting description does not wrap (Jeff)
-   #58824 - Stray message or failing to open tasks? (Rodrigo)
-   #62911 - ITIP control blocks mailer opening calendar (JP)
-   #54101 - In itip control had "Birthdays & Anniversaries" as calendar (JP)
-
- * Mail
-
-   #63189 - Deleting IMAP folders is too aggressive  (Michael)
-   #63504 - Don't send IMAP commands to a disconnected socket  (Jeff)
-   #63177 - Can't drag folder to "On This Computer"  (Jeff)
-   #62812 - Crash when parent of search window is closed  (Jeff)
-   #62963 - C99-isms in smime/gui/cert-trust-dialog.c  (Michael)
-
-Other bugs
-
-  * Addressbook
-
-    - Confirmation dialog was showing up on contact-editor close,
-      even if there were no changes (Hans Petter)
-
-  * Calendar
-
-    - Fixed problems in alarm daemon (JP, Siva, Rodrigo)
-    - Clean up of stray status messages for tasks (Chen)
-    - Don't remove GtkDialog's separator if using GTK >= 2.4.0 (Frederic)
-    - Fix copy/move problems when pilot syncing (JP)
-    - Don't mark menu accels for translation (Christian)
-
-  * Mail
-
-    - Crash in em-utils on GtkFileChooser with no name selected (Hans Petter)
-
-  * Misc
-
-    - avoid warnings on dialogs with GTK 2.4 (Frederic)
-    - upgrade egg tray icon (Rodrigo)
-    - fix memory corruption when pilot syncing tasks/events (JP)
-   	
-
-Evolution 1.4.1, 2003-06-25
----------------------------
-
-Bugzilla bugs fixed (see http://bugzilla.ximian.com/show_bug.cgi):
-
-  * Addressbook
-
-    #41826 - Focus the first minicard when focusing the view for the
-             first time (gilbert.fang@sun.com)
-    #43841 - Contact editor will not save Web Page address (Toshok)
-    #44477 - Make sure the master category list is upgraded (Toshok)
-
-  * Calendar
-
-    #41582 - Display incorrect after switching between week and day
-             view (Rodrigo)
-    #43585 - Ugly tasks printout (Hans Petter)
-    #45273 - Tab through events in day view (Bolian Yin)
-    #45275 - Shift+F10 to activate Popup menu in ToDo List (Bolian Yin)
-    #45423 - Provide shortcus for "Go to today" and "Go to date" (Bolian Yin)
-
-  * Mail
-
-    #22542 - Creating a folder in the vFolder store fails with a
-             meaningless message (Michael)
-    #31745 - Cannot view mails under '#mh' namespace.  Temporary
-             workaround, strip #'s (Michael)
-    #33593 - Message remains displayed after last message removed from
-             list (Michael)
-    #40788 - Broken POP3 server causing evolution to hang/crash (Jeff)
-    #42630 - collapsed thread always shows as unread (Jeff)
-    #43917 - ECharsetPicker doesn't save user-specified charset strings
-             properly (Jeff)
-    #43972 - Invert selection doesn't work (Jeff)
-    #43974 - Cannot retrieve "Local Delivery" mail (Michael)
-    #44121 - Invalid multipart/signed message showing empty (Michael)
-    #44139 - Composer spacing is not HIG compliant (Jeff)
-    #44322 - Evolution crash with weird IMAP foldername (Michael)
-    #44344 - Dont use quoted-printable encoding on anything but text/*
-             parts, interoperation with Lookout and others (Jeff)
-    #44457 - Crash viewing video content as inline-text (Jeff)
-    #44519 - Popup message view redraws when new mail arrives (Michael)
-    #44609 - HIG issue with vFolder properties editor (Michael)
-    #44991 - Cannot send mail in GB-2312 (Jeff)
-    #45082 - GB18030 BIG5HKSCS and EUC-TW charsets not supported in
-             evolution mail (suresh.chandrasekharan@sun.com)
-    #45063 - Message display refreshes when new mail arrives,
-    	     introducted by #33593 (Michael)
-    #45386 - Warnings when sending mail (Michael)
-    #45368 - Crash when closing the folder browser
-
-  * Summary
-
-    #44111 - Crash on exit (Ettore)
-    #44798 - Crash when closing print preview dialog (Ettore)
-
-  * All
-
-    #42691 - Build, make clean doesn't rebuild bonobo-activation
-             .server files (Michael)
-    #44717 - Tarball cointains generated files (Frederic Crozat)
-
-Other bugs
-
-  * Calendar
-
-    - Fix invalid shared use of list of calendar factories (Rodrigo)
-    - Make the calendar editor window title reflect the summary contents (Rodrigo)
-
-  * Mail
-
-    - Fix bug in indexer string normalisation (they weren't) (Larry)
-    - Major memory leak in message-threading (Larry)
-    - Only try to snoop a content-type if its application/octet-stream
-      when displaying mail parts (Jeff)
-    - Major memory leak in filter-file based filters (Jeff)
-    - Try to make asynchronous dns lookup more asynchronously
-      cancellable (Michael)
-    - Fix a degenerate algorithm case in vFolder shutdown which could
-      cause excessive exit cpu usage (Michael)
-
-  * Shell
-
-    - Wrong version number used for configuration upgrade (Michael)
-
-  * All
-
-    - Lots of miscellaneous memory leaks
-
-Updated translations:
-
-  - cs (Miloslav Trmac, Stanislav Brabec)
-  - el (Kostas Papadimas)
-  - es (Francisco Javier F. Serrador)
-  - hu (Andras Timar)
-  - it (Marco Ciampa)
-  - ko (Kan Jeong-Hee)
-  - mk (Ivan Stojmirov)
-  - nl (Vincent van Adrighem)
-  - pt_BR (Gustavo Maciel Dias Vieira)
-  - sr, sr@Latn (prevod.org)
-  - sv (Christian Rose)
-  - tr (Gorkem Cetin)
-  - zh_CN (Wang Li, Funda Wang)
-
-
-Evolution 1.4, 2003-06-02
--------------------------
-
-Bugzilla bugs fixed (see http://bugzilla.ximian.com/show_bug.cgi):
-
-  * Calendar
-  
-    #43388 - Problems importing appointments  (Rodrigo)
-    #43455 - Crash on exit  (Rodrigo)
-    #43763 - 2 right mouse menus appear in Week & Month views  (Rodrigo)
-    #43775 - Crash under Chinese locale  (JP)
-
-  * Mail
-
-    #42854 - Copying files from one IMAP folder to another makes
-             multiple copies of file  (Jeff)
-    #43862 - First run imap account won't load folders until account
-             is disabled and re-enabled  (Jeff, Michael)
-    #42691 - Server files not regenerated after distclean  (Michael)
-    #43805 - Evolution locked while editing reply to an mail  (Jeff)
-    #43410 - Flag for Followup dialog opens up too small in Evo  (Michael)
-    #43688 - Can't save signatures  (Michael)
-
-  * Summary
-
-    #43506 - Spontaneous crash  (Ettore)
-
-  * Misc
-
-    #43596 - Symlink icon file so it doesn't break existing panel
-             setups  (Ettore)
-
-Other bugs fixed:
-
-  * Addressbook
-
-    - Removed conflicting shortcut for the Print Preview menu item
-      (Rodney)
-
-  * Misc
-
-    - Corrected some problems in the pkgconfig files  (Rodney)
-    - Fixed an issue with GConf schema file installation  (Joe Marcus
-      Clarke)
-
-Updated translations:
-
-  - nl (Vincent van Adrighem)
-  - ru (GNOME Russian Team)
-  - be (GNOME Belarusian Team)
-  - es (Francisco Javier F. Serrador)
-
-
-Evolution 1.3.92, 2003-05-22
-----------------------------
-
-Bugzilla bugs fixed (see http://bugzilla.ximian.com/show_bug.cgi):
-
-  * Addressbook
-
-    #38084 - Rename local folder issue in contacts  (sean.gao@sun.com)
-    #41130 - HIG compliance  (Anna)
-    #41137 - HIG compliance  (Anna)
-    #41140 - HIG compliance  (Anna)
-    #41144 - Use stock buttons in the ldap config page  (Toshok)
-    #41211 - Add icon to "Add" button in "Add to Contacts" dialog  (Toshok)
-    #41229 - HIG compliance  (Anna)
-    #41231 - HIG compliance  (Anna)
-    #41232 - HIG compliance  (Anna)
-    #41245 - HIG compliance  (Toshok)
-    #41248 - HIG compliance  (Anna)
-    #41249 - HIG compliance  (Anna)
-    #41250 - HIG compliance  (Anna)
-    #41251 - HIG compliance  (Anna)
-    #41254 - HIG compliance  (Anna)
-    #41255 - Use stock Add/Remove icons in the contact list editor  (Toshok)
-    #41910 - Crash when deleting addresses from long contact lists  (Toshok)
-    #42048 - "Print" not hooked up in etable view  (Toshok)
-    #42177 - Cannot tab out of date edit widgets in contact editor  (Toshok)
-    #42472 - Selecting a field in a contact highlights entire row  (Toshok)
-    #42596 - Selecting text in a contact address field selects all
-             rows of text (Toshok)
-    #42604 - Display not shifted when cursor moved to next address
-             line (Toshok)
-    #42606 - Not saving information entered in Notes field of Contact
-             editor (Toshok)
-    #42620 - Crash related to mailing address checkbox  (Toshok)
-    #42625 - Clicking in white space of contact brings up empty
-             contact editor  (Toshok)
-    #42780 - Crash on solaris due to missing NULL in g_guild_filename.
-             (sean.gao@sun.com)
-    #42825 - clicking on letters in LDAP address card view does not
-             load selected letter (Dan, Toshok)
-    #43005 - Crash on reply  (Toshok)
-    #43016 - Crash when adding duplicate contact  (Toshok)
-    #43023 - All contacts have disappeared  (Toshok)
-    #43090 - GalView menu missing from the addressbook  (Toshok)
-    #43175 - Evolution crashed pasting large amount of text into
-             address field  (Toshok)
-    #43213 - auto-completion folder list wasn't populated correctly on
-             fresh install  (Toshok)
-
-  * Calendar
-
-    #40972 - connector crashed while evolution was idle  (Rodrigo)
-    #41234 - button order of "Enter Delegate" dialog (Rodrigo)
-    #41329 - Changing Options in scheduling tab causes display time to shift
-    #41579 - Double clicked on meeting in Exchange calendar, Evo
-             crashed  (Rodrigo)
-    #41760 - Alarm dialog does not reappear after snoozing Exchange
-             alarm  (Rodrigo)
-    #41811 - Calendar update failing and crashing  (JP)
-    #41930 - Warning while running gdb includes: "Some clown returned
-             undeclared exception"  (JP)
-    #41935 - day view ignores scroll wheel  (JP)
-    #42056 - Accelerators in meeting selector not working/looks bad
-             (Hans Petter)
-    #42220 - calendar not refreshing correctly after changing meeting
-             times  (Rodrigo)
-    #43029 - When running under valgrind Evolution crashed while
-             exiting  (JP)
-    #43308 - scheduling page alignment (JP)
-
-  * Mail
-
-    #40074 - Thread expansion state not remembered  (Jeff)
-    #41748 - Send/Recv not sending mail in connector Outbox  (Michael)
-    #42000 - Crash selecting a non-selectable folder  (Michael)
-    #42045 - Another workaround for mailers sending out invalid date
-	     formats  (Jeff)
-    #42118 - Edit->Mark as unread doesn't behave the same as right
-	     click->mark as unread  (Jeff)
-    #42170 - Thread expansion state lost on deleting messages  (Jeff)
-    #42212 - Crash entering address in composer  (Rodrigo)
-    #42294 - Custom fixed font setting not applying to composer
-              (Michael)
-    #42333 - Crash opening a mail again that was still being opened
-              (Jeff)
-    #42356 - Adding colour from not working properly  (Jeff)
-    #42456 - Spelling preferences Enable/Disable button inconsisency
-              (Michael)
-    #42540 - Crash when pressing send/recv too quickly  (Michael)
-    #42710 - Invalid 8 bit header data getting to the UI layer
-             generating warnings  (Michael)
-    #42763 - Crash deleting local folder with indexing turned off
-              (Jeff)
-    #42838 - Crash setting up local mail account  (Michael)
-    #42854 - Copying many messages between IMAP folders results in
-             several duplicates  (Jeff)
-    #43214 - changing server settings enables the account  (Jeff)
-    #43234 - crash reading mail  (Michael)
-    #42748 - Check spelling while I type - broken (Larry)
-    #42749 - Composer ignores color for misspelled words (Larry)
-    #43392 - Reproducible crash after searching mail w/ attachment and
-             closing (Jeff)
-    #43406 - Evo crashed during POP download/filtering  (Jeff)
-
-  * Shell
-
-    #36956 - Window title too long  (Ettore)
-    #40391 - Updated contributor list in the about box  (Michael)
-    #42038 - Crash hitting escape or closing window on rename box
-              (Michael, Ettore)
-    #42342 - Send/receive sensitive when startedi in offline mode
-              (Ettore)
-    #42465 - Unread count problem in the shortcut bar  (Ettore)
-    #42491 - Compilation problems on Forte  (Antonio Xu)
-    #42518 - Folder bar selection lost on folder delete  (Ettore)
-    #43079 - Don't crash when an invalid "default:" URI is given on
-    	     the command-line  (Ettore)
-    #43119 - Memory corruption problem in settings dialog  (Ettore)
-    #43216 - Crash on exit  (Ettore)
-    #43322 - Crash on exit  (Ettore)
-
-  * Summary
-
-    #41131 - HIG compliance  (Anna)
-    #41133 - HIG compliance  (Anna)
-    #41849 - Charsets not respected in news feed display  (Michael)
-    #43101 - Crash on exit  (JP)
-    #43117 - Crash on exit  (Ettore)
-
-Other bugs:
-
-  * Addressbook
-
-    - 64bit cleanup and warning fixes  (Jeremy Katz)
-    - Fixed some probable memory corruption (Toshok, Sean Gao)
-
-  * Calendar
-
-    - Fixed crash in cal_client_discard_alarm  (Rodrigo)
-    - Fixed Bonobo unrefing problems on components  (JP)
-    - Fixed multiple initialization in calendar factory  (Rodrigo)
-
-  * Mail
-
-    - Crash on exit if password dialog was open  (Ettore)
-    - Make Ok the default response on the password dialog  (Ettore)
-    - Crash in SMTP if unable to resolve the remote host name  (Jeff)
-    - Fix an automake 1.6 issues with camel-lock-helper  (Dan)
-    - Reload page if citation color changes (Larry)
-    - Made all the composer preferences work (Larry)
-    - Made newly created HTML signatures work again (Radek)
-
-  * Shell
-
-    - HIGified config settings dialog a bit more  (Anna)
-    - Fixed a bunch of reference count problems  (JP)
-    - Improved the look of the "open other user's folder" dialog
-      (Dan)
-
-  * Summary
-
-    - Fixed a typo that caused the summary to not see the default
-      calendar folder  (Ettore)
-    - Made the print dialog close properly  (Ettore)
-    - Reference count fixes  (JP)
-
-  * All
-
-    - Various container referencing issues  (JPR)
-    - 64 bit and portability fixups  (Jeremy Katz)
-    - Cleaned up lots of compile time warnings and run-time debugging
-      output  (everyone)
-
-Updated translations:
-
-  - cs (Miloslav Trmac)
-  - da (Kenneth Rode Christiansen)
-  - de (Christian Neumair)
-  - es (Francisco Javier Fernandez)
-  - fr (Christophe Fergeau)
-  - it (Marco Ciampa)
-  - ja (Takuo Kitame)
-  - no (Kjartan Maraas)
-  - pt (Duarte Loreto)
-  - pt_BR (Gustavo Maciel Das Vieira)
-  - ru (GNOME Russian Team)
-  - sv (Christian Rose, Anders Carlsson)
-
-  - Fixed encoding of the ca, en_AU, en_CB, et, eu, ro catalogs (Abel
-    Cheung)
-
-
-Evolution 1.3.3, 2003-04-29
----------------------------
-
-Bugzilla bugs fixed (see http://bugzilla.ximian.com/show_bug.cgi):
-
-  * Addressbook
-
-    #37351 - Contact List drag-n-drop broken from sorted list view  (Toshok)
-    #40954 - Wombat crashes when opening an appointment  (Toshok)
-    #41843 - Don't use localized field names in the csv exporter  (Gilbert Fang)
-    #41779 - Fix crash when adding emails to existing contacts  (Toshok)
-
-  * Calendar
-
-    #21499 - No docs in snaps (Rodney)
-    #22444 - Deleting recurring meetings menu option (Rodrigo)
-    #34498 - alarm-notify not noticing meetings canceled by organizer (Rodrigo)
-    #35814 - same mnemonic for File:New:Mail Message and :Meeting (Rodney)
-    #37552 - GUI doesn't notice Connector failed to delete task (JP)
-    #39735 - Calendar View settings not persistent between sessions (JP)
-    #40257 - selecting day from calendar control causes window resize (JP)
-    #41129, #41215, #41221, #41256, #41148, #41216, #41235 - gui spacing (Rodrigo, Anna)
-    #41230 - forwarded tasks blank when viewed in a separate window (JP)
-    #41458 - Crash sending meeting invite (Dan)
-    #41459 - remove "Delegate to..." from right click menu in meeting dialog (JP)
-    #41641 - crash opening calendar for the first time (Hans)
-    #41661 - Only one popup dialog for repeated message alarm (Rodrigo)
-    #41671 - audio alarms pop up message dialog instead of playing tune (Rodrigo)
-
-  * Mail
-
-    #21499 - No docs in snaps  (Rodney)
-    #38927 - Signature editor help brings up composer help
-    #40694 - Focus not in To field of new message when From field is
-             visible. (Toshok)
-    #40989 - Deleted sub-folders hang around  (Michael)
-    #41043 - Send/receive accelerators broken  (Michael)
-    #41142 - Message search dialog has questionable button order  (Jeff)
-    #41149 - Spacing/padding of "Filters" dialog  (Jeff)
-    #41150 - Use stock buttons in "Filters" dialog  (Jeff)
-    #41151 - Spacing/padding of "Add/Edit Filters" window  (Jeff)
-    #41152 - Spacing/padding of "Vfolders" dialog  (Jeff)
-    #41153 - Use stock buttons in "VFolders" window  (Jeff)
-    #41155 - Spacing/padding in "Add/Edit Vfolders" dialog  (Jeff)
-    #41156 - Use stock** buttons in "add/edit vfolders" dialog  (Jeff)
-    #41163 - Forwarding HTML mail with inline images results in 
-             misformatted mail  (Michael)
-    #41164 - Can't import mails at all  (Michael)
-    #41190 - Crash cursor navigating Inbox  (Michael)
-    #41199 - Subscribe dialog's toolbar -- why? :)  (Michael)
-    #41205 - Use icons on Add/Edit/Delete buttons in "Search Editor"  (Jeff)
-    #41208 - Spacing/padding in "advanced search" dialog  (Jeff)
-    #41209 - Spacing/padding of "Create VFolder from Search" dialog  (Jeff)
-    #41238 - Crash when opening "attachment properties"  (Jeff)
-    #41239 - Spacing/padding of "attachment properties"  (Jeff)
-    #41241 - Title capitalisation of "Attachment Properties"  (Jeff)
-    #41244 - Spacing/padding of "Reformat Mailbox" dialog  (Jeff)
-    #41389 - Crash creating new Exchange acct  (Jeff)
-    #41398 - vFolder Sources IMAP folder names not being unencoded 
-             correctly  (Michael)
-    #41419 - Variable font key has trailing slash  (katzj@redhat.com)
-    #41448 - Crash on startup  (Michael)
-    #41461 - camel_text_to_html doesn't do as good a job with URLs as 
-             e_text_to_html  (Jeff)
-    #41513 - Plain text attachments not showing up in the composer  (Jeff)
-    #41578 - Up/down buttons broken in vfolder list  (Jeff)
-    #41648 - 1.2 -> 1.3 vfolder conversion  (Michael)
-    #41730 - Empty "Organization" headers  (Jeff)
-    #41789 - Bonobo components can pause/freeze the gui  (Jeff)
-    #41972 - Searching on labels is broken  (Michael)
-    #42024 - Improper use of Error dialog  (Jeff)
-
-  * Shell
-
-    #21499 - Documentation not working in the snapshots  (Rodney)
-    #33919 - Crash when opening other user's folder  (Dan)
-    #41002 - Default folder bar size too narrow  (Ettore)
-    #41008 - HIG compliance  (Anna)
-    #41010 - HIG compliance  (Anna)
-    #41022 - HIG compliance  (Anna)
-    #41024 - HIG compliance  (Anna)
-    #41025 - HIG compliance  (Anna)
-    #41036 - HIG compliance  (Anna)
-    #41059 - Crash connecting to other user's folder  (Ettore)
-    #41013 - Startup wizard display problems  (Michael)
-    #41128 - HIG compliance  (Anna)
-    #41145 - HIG compliance  (Anna)
-    #41146 - HIG compliance  (Anna)
-    #41147 - HIG compliance  (Anna)
-    #41225 - HIG compliance  (Anna)
-    #41227 - HIG compliance  (Anna)
-    #41242 - HIG compliance  (Anna)
-    #41304 - Missing dialog title  (Michael)
-    #41392 - HIG compliance  (Anna)
-    #41413 - Creating folder needs to make sure parent folder is
-             expanded  (Dan)
-    #41468 - New Exchange public folders do not follow type of parent
-             folder  (Dan)
-    #41469 - Upgrade routine crashing on Solaris  (Jeff)
-    #41484 - Make proxies work  (Sanshao Jiang)
-    #41567 - HIG compliance  (Anna)
-    #41569 - HIG compliance  (Anna)
-    #41648 - Vfolder upgrade problem  (Michael)
-    #41916 - Memory corruption in Storage interface  (Rodrigo)
-
-  * Summary
-
-    #39693 - Summary weather settings annoyances  (Ettore)
-    #40902 - HIG compliance  (Ettore)
-
-Other bugs:
-
-  * Addressbook
-
-    - Mostly, if not completely, fixed 33708  (Dan, Toshok)
-    - Fix duplicate entry in exported CSV  (Gilbert Fang)
-    - Use stock buttons  (Rodney)
-
-  * Misc
-
-    - Made Solaris/CDE integration work again  (Rodney)
-    - Removed some debugging spewage  (everyone)
-    - Don't crash on malformed GConf folder settings  (Toshok)
-    - Don't error out if the directory already exists when creating a
-      new folder  (Ettore)
-    - Fixed various memory leaks all over the place  (Hans)
-
-Updated translations:
-
-  - cs (Miloslav Trmac)
-  - de (Christian Neumair)
-  - es (Francisco Javier Fernandez)
-  - it (Marco Ciampa)
-  - nl (Vincent van Adrighem)
-  - no (Kjartan Maraas)
-  - pt (Duarte Loreto)
-  - sv (Christian Rose)
-  - zh_CN (Wang Jian)
-
-
-Evolution 1.3.2, 2003-04-11
----------------------------
-
-Bugzilla bugs fixed (see http://bugzilla.ximian.com/show_bug.cgi):
-
-  * Addressbook
-
-    #7103  - Addressbook doesn't play nice with dark themes.  (Toshok)
-    #19178 - importers only target default contact folder.  (Toshok)
-    #20210 - Cannot save changes when invoked from mailer.  (Toshok)
-    #23036 - Export Contact Data to CSV, XLS, etc.  (for mail merge,
-             etc.) (Gilbert Fang)
-    #25148 - Selected contacts fields are not scrolling properly.
-             (Toshok)
-    #31786 - LDAP config dialog not properly internationalized.
-             (Toshok)
-    #32113 - Problem with UTF8 and contact list.  (Toshok)
-    #34085 - drag+drop not finalizing.  (Toshok)
-    #34651 - Searches with 8bit ascii char. not working in Select
-             Contacts.  (Toshok)
-    #37204 - Ximian, Inc. contact info update.  (Michael)
-    #38202 - Evolution crashed when I clicked the send button.  (Michael)
-    #39170 - void function should not has a 'return' keyword.  (Philip
-             Zhao)
-    #39256 - "Forward Contact", "Send Message to Contact" don't
-             work.  (Michael)
-    #39381 - crash when adding an address from an email to addressbook.
-             (Toshok)
-    #39507 - Select-names search broken.  (Toshok)
-    #39730 - Search Base Callback Not Working.  (Toshok).
-    #39763 - Pasting text into "To:" field doesn't work.  (Toshok)
-    #39788 - Can't add email address to contact.  (Toshok)
-    #40026 - Using pulldown to view multiple emails changes email to
-             random characters.  (Toshok)
-    #40046 - To: and Cc: fields not accepting accented letters.
-             (Toshok)
-    #40403 - can't edit contact lists.  (Toshok)
-    #40715 - Merge email address dialog non functional when adding
-             contact that already exists. .  (Toshok)
-    #40727 - email autocompletion not listing all names.  (Toshok)
-    #40841 - Ctrl-v was being used for both "Save As VCard" and
-             "Paste".  (Toshok)
-    #40901 - HIG-ify the LDAP server editor dialog's button
-             layout.   (Toshok)
-
-  * Calendar
-
-    #17231 - Private settings not retained.  (JP)
-    #31382 - Free/busy retrieval didn't work for http source.  (Rodrigo)
-    #31660 - Appointments with "for" recurrence synced with no end date.
-             (JP)
-    #32248 - Todo items imported from pilot have time set to 00:00.  (JP)
-    #34095 - Memory leaks.  (Hans Petter)
-    #34505 - Duplicate alarm dialogs for appts in exchange calendar.
-             (Rodrigo)
-    #35926 - Contacts entry in appointment editor to be removed.
-             (Hans Petter, Dan)
-    #37935 - Drawing problems in mini-calendar.  (Hans Petter)
-    #39262 - Crash when importing an ics file to local calendar.  (Rodrigo)
-    #39356 - New evo users didn't get calendar.  (Rodrigo)
-    #39692 - File type names should not be OAF component types.  (Ettore)
-    #39735 - View settings not persistent between sessions.  (Jeff)
-    #39736 - Times in day view too large.  (Hans Petter)
-    #39740 - Crash clicking in Attendees field when creating new
-             meeting.  (Rodrigo)
-    #39757 - Couldn't delete reminder for appointment.  (Hans Petter)
-    #39770 - Not meeting request sent.  (Rodrigo)
-    #39803 - Bottom part of text cut off in month view.  (Hans Petter)
-    #39895 - Selection vanishes when day view loses focus.  (Michael/Hans)
-    #39954 - Crash when setting recurrence rule for an appointment.
-             (Hans Petter)
-    #39955 - Crash when forwarding an appointment as icalendar.  (JP)
-    #39961 - Appointment schedule autopick menu displays under File.
-             (Rodrigo)
-    #40133 - wombat startup error. (Toshok)
-    #40195 - Cannot create new calendar folders (JP)
-    #40252 - LOG(e...) syntax error (Michael)
-    #40258 - Recurring event displayed truncated description.  (Hans Petter)
-    #40578 - Event summaries cut off in month view.  (Hans Petter)
-    #40655 - Mini-calendar always showed January 1970.  (Hans Petter)
-    #40661 - Missing header for Forte compilation.  (Rodrigo)
-    #40722 - Crash when closing a meeting.  (JP)
-    #40789 - Didn't remember reminder text.  (JP)
-    #40790 - Didn't launch programs added as reminders.  (JP)
-    #40792 - Buttons in Select File dialog for sound reminder didn't
-             work.  (Ettore)
-    #40876 - Cannot create a meeting with a resource in Exchange 
-	     calendar (JP)
-    #40894 - calendar switching weeks selected in small right subcalendars 
-	     (JP)
-    #41127 - Evolution crashed when sending new meeting invitation (JP)
-
-  * Mail
-
-    #29564 - Message list loses focus when you expunge.  (Michael)
-    #33786 - Crash when invalid expression fed to vFolder.  (Michael)
-    #36245 - Translation string context problem.  (Dan)
-    #37084 - Mailer forgets message list pane size on startup.
-             (Michael)
-    #38227 - Button spacing issues.  (Ettore)
-    #38461 - Mail importers cannot import to non-local folders.
-             (Michael)
-    #38659 - RFC2047 word encoding errors.  (Jeff)
-    #38926 - Configuration dialogs overlap each other. (Ettore, Jeff)
-    #39165 - Losing all vFolder rules after editing them, until
-             restart.  (Michael)
-    #39168 - compiler compatability, empty structs.  (Jeff)
-    #39170 - Compiler compatibility, returning a void return value.
-             (Jeff)
-    #39173 - prototype mismatch.  (Jeff)
-    #39204 - Charset handling problems with broken mails.  (Jeff)
-    #39256 - Send message to contact/forward contact doesn't work.
-             (Michael)
-    #39325 - Allow user to enable/disable account from account list.
-             (Jeff)
-    #39382 - Signature editor dialog buttons messed up.  (Jeff)
-    #39464 - Trying to remove a duplicate vfolder crashes.  (Michael)
-    #39486 - Cancelling send/receive could cause a crash.  (Michael)
-    #39654 - vFolder source remove button doesn't work.  (Jeff)
-    #39696 - Default composer window title is meaningless. (Jeff)
-    #39741 - Configuration dialogs overlap each other. (Ettore, Jeff)
-    #39744 - Sending 8 bit mime to a smtp server which doesn't say it
-             supports it. (Jeff)
-    #39759 - Crash using search dialog.  (Michael)
-    #39800 - Make To: have focus on a new message.  (Jeff)
-    #39809 - Dialog's don't match gnome 2 layout.  (Jeff)
-    #39813 - Crash/noop adding signature script.  (Jeff)
-    #39870 - Message browser button sensitivity not correct.  (Jeff)
-    #39914 - Configuration dialogs overlap each other. (Ettore, Jeff)
-    #39924, and many others - Subject entry box didn't work
-             properly/support i18n very well.  (Jeff)
-    #40043 - A warning dialog wont go away.  (Jeff)
-    #40074 - Threads always open expanded.  (Jeff)
-    #40083 - Search box doesn't work on subscription dialog - it was
-             removed.  (Jeff)
-    #40103 - Deadlock at startup.  (Michael)
-    #40124 - Cannot unsubscribe from folders that aren't selectable.
-             (Jeff)
-    #40188 - Context menu on addresses crashes.  (Michael)
-    #40300 - Files are only detected for recovery when you start an
-             editor.  (Michael)
-    #40314 - Some folders not expandable in subscriptions dialog.
-             (Jeff)
-    #40472 - Crash after entering password.  (Michael)
-    #40522 - Two passphrase dialogues viewing encrypted mail.  (Michael)
-    #40536 - Send/receive dialogue should transient for parent.
-             (Michael)
-    #40608 - Crash saving attachment.  (Jeff)
-    #40679 - Composer crash browsing files to attach.  (Jeff)
-    #40728 - Crash while scrolling.  (Jeff)
-    #40764 - Composer backs up drafts too often.  (Jeff)
-    #40778 - incorrect IMAP BODY parsing/display  (Jeff)
-    #40900 - vfolder creation dialog has wrong button order.  (Michael)
-    #40904 - Spontaneous crash.  (Jeff)
-    #40921 - Cancel subscription dialogue while busy -> crash.  (Michael)
-    #41004 - HIG compliance.  (Jeff)
-
-  * Shell
-
-    #17034 - Use UTF-8 in about box.  (Michael)
-    #34371 - Tries to open other user's folder with blank user field.
-    	     (Ettore)
-    #38775 - Version number hardcoded in warning dialog text.  (Michael)
-    #38974 - Xlib dependency causing linking error on Solaris.  (Ettore)
-    #39096 - Start-up crash on Solaris.  (Ettore) 
-    #39467 - Crash when splash image not found.  (Michael)
-    #39599 - Crash when folder icons missing.  (Ettore)
-    #39692 - OAFIIDs being shown in the importer dialog.  (Ettore)
-    #39706 - Settings window too big.  (Michael)
-    #40377 - Old stale wombat servers not being killed.  (Ettore)
-    #40413 - Problem with closing the folder selector dialog.  (Ettore)
-    #40474 - Summary settings not imported from 1.2.  (Michael)
-    #40590 - Signature settings upgrade problem.  (Michael)    
-    #40652 - Folder bar not resizing after resizing Evolution window.
-            (Michael)
-    #40748 - Cannot resize icons in the shortcut bar.  (Ettore)
-    #40854 - Problem with selecting other user's folder.  (Dan)
-    #40888 - Crash when selecting other user's folder.  (Dan)
-
-  * Summary
-
-     #5344  - Missing weather locations.  (Marten Woxberg)
-     #7153  - Stock folder names not translated.  (Ettore)
-     #12066 - Missing weather locations.  (Dan)
-     #15740 - Missing weather locations.  (Dan)
-     #18015 - Missing weather locations.  (Dan)
-     #19957 - AM/PM setting not being honoured.  (Ettore)
-     #40358 - Summary page not showing properly in non-C locales.
-              (Ettore)
-     #40141 - Preferences settings inconsistency when clicking "Close".
-              (Michael)
-     #32027 - Missing locations.  (Dan)
-
-Other bugs:
-
-  * Addressbook
-
-    - HIG'ify the e-address-popup's buttons layout.  (Toshok)
-    - Add input method support to the minicard view.  (Toshok)
-    - Make the minicard view listen for style changes.  (Toshok)
-    - Fix the select names component to be more friendly to non-shlib
-      components.  (Dan)
-    - Fix various errors in the contact editor caused by parsing
-      addresses when we don't need to - especially after the user has
-      explicitly entered the elements of the address
-      themselves.  (Toshok)
-    - Replace GtkImage based arrow buttons in the contact editor with
-      GtkArrow.  (Toshok)
-
-  * Calendar
-
-    - Replaced all references to GdkFont deprecatedness with Pango.
-      (Hans Petter)
-    - Alarm notification fixes.  (Rodrigo)
-    - Timezone dialog fix.  (Dan)
-    - Use weak refs instead of destroy signal.  (Rodrigo, Hans Petter)
-    - Use GtkMessageDialogs for meeting-related questions.  (Rodrigo)
-    - GtkObject -> GObject fixes.  (Everyone)
-    - Connector-related fixes.  (Dan)
-    - Made meeting/scheduling work correctly.  (JP)
-    - Only remove alarms for backends that request it (Rodrigo)
-    - HIG'ify dialogs (Ettore)
-
-  * Mail
-
-    - Clear passwords didn't work.  (Michael)
-    - Show preview and view threaded were made per-folder, as in
-      1.2.x, 1.3.1 had them global.  (Michael)
-    - Make the printing dialog, and account editor transient for the
-      parent.  (Larry, Jeff)
-    - Check for unique filter/vFolder names in all cases.  (Michael)
-    - Most warnings removed.  (Jeff, Michael)
-    - some text/plain mails detected as text/html, re-do the fix for
-      #16817 to make it pickier.  (Michael)
-    - Imap buffer overflow potential.  (Timo Sirainen)
-    - GSSAPI SASL support.  (Jeff)
-    - Handle broken header charset checking similarly to badly
-      labelled/broken body content.  (Dan)
-    - Various glib deprecation issues, and use non-locale specific
-      string compares in various places.  (Jeff, Michael)
-    - Mail piped to the sendmail transport is canoncalised into Un*x
-      format, using network format (CRLF) confuses some versions of
-      postfix.  (Jeff)
-    - Some work on fixing cut and paste shortcuts in composer.  (Jeff)
-    - Made the EvolutionComposer corba interfaces work again/port to
-      GNOME 2.  (Michael)
-
-  * Shell
-
-    - Fixed some problems with the folder dialogs.  (Dan)
-    - Fixed shell .server files.  (Dan)
-    - Added --force-shutdown to the shell as a killev replacement.
-      (Dan)
-    - Make Evolution use large WM icons.  (Ettore)
-    - Made the offline dialog work again.  (Ettore)
-    - Fixed importer framework to support non-local folders.  (Ettore)
-
-  * Summary
-
-    - Make creation of the summary settings page faster.  (Dan)
-
-  * All
-
-    - A number of compiler portability fixes, varadic macro's,
-      __FUNCTION__ -> G_GNUC_FUNCTION, inline usage, void returns, etc
-      (Everyone)
-    - Fixed druid colors.  (Dan)
-
-
-
-Evolution 1.3.1, 2003-03-05
----------------------------
-
-First release based on GNOME 2.
diff --git a/NEWS-1.0 b/NEWS-1.0
deleted file mode 100644
index b3e5fc7e57..0000000000
--- a/NEWS-1.0
+++ /dev/null
@@ -1,2939 +0,0 @@
-Evolution 1.0.8, 2002-06-23
----------------------------
-
-Bugzilla Bugs Fixed (see http://bugzilla.ximian.com/show_bug.cgi):
-
-  * Addressbook
-
-    #17332 -- Addressbook crashes in LDAP address completion code.
-              (Toshok)
-    #26130 -- Close contact editor before save as crashes. (Toshok)
-
-  * Calendar
-
-    #25757 -- Fix quoting of icalendar properties (JP)
-    #25829, #25830, #26066 
-	   -- Fix a number of meeting usability and interop issues (JP)
-    #25697 -- Exchange reminders still not quite working (Rodrigo)
-    
-Other fixes:
-
-  * Addressbook
-
-    - Some memory leak fixes in the addressbook backends and
-      libversit. (Toshok)
-
-  * Calendar
-	
-    - Update time zone information (Damon)
-
-Updated translations:
-
-  - sk (Stanislav Visnovsky)
-  - sv (Christian Rose)
-
-
-Evolution 1.0.7, 2002-06-07
----------------------------
-
-Bugzilla Bugs Fixed (see http://bugzilla.ximian.com/show_bug.cgi):
-
-  * Addressbook
-
-    #25054 -- "New Contact List" button is no longer active in
-              folders that don't support contact lists.  (Toshok)
-
-  * Calendar
-
-    #16962 -- Make the schedule page use the work hours set in the
-              preferences.  (JP)
-    #23350 -- Crash when refreshing meeting or task.  (JP)
-    #24783 -- Fix crash in wombat.  (Rodrigo)
-
-  * Mail
-
-    #11391 -- Bogus gnome_vfs_file_info_unref() that caused an
-              occasional crash.  (Frederic Crozat)
-    #15185 -- Non-RFC-compliant From/To/Cc being displayed as empty
-              in mail display.  (Dan)
-    #19920 -- Messages hiding in threaded view.  (Michael)
-    #21604 -- Various crashes.  (Michael)
-    #23782 -- Stop button causes a hang.  (Michael)
-    #25056 -- wombat segfaults when scrolling around calendar in month view
-              (Rodrigo)
-    #25456 -- Crash when deleting an account that has not been added
-              to the Evolution storage yet.  (Jeff)
-    #24615 -- VFolders with the UNMATCHED vfolder as a source hang.
-              (Michael)
-
-  * Shell
-
-    #24284 -- Copyright notice inconsistent in the about box.
-              (Ettore)
-
-Other fixes:
-
-  * Misc
-
-    - Fixed some typos in the names of some French locations.
-      (Christophe Merlet)
-
-Updated translations:
-
-  - et (GNOME ET Team)
-  - eu (Josu Wali�o)
-  - sk (Stanislav Visnovsky)
-  - fr (Christophe Merlet)
-  - fi (Sami Pesonen)
-  - vi (pclouds)
-
-
-Evolution 1.0.5, 2002-05-06
----------------------------
-
-Bugzilla Bugs Fixed (see http://bugzilla.ximian.com/show_bug.cgi):
-
-  * Mail
-
-    #24140 -- Crash when downloading a message with invalid header.
-              (Jeff)
-
-    #17174 -- Mail spools appear to be unread forever.  (Michael)
-
-  * Shell
-
-    #23538 -- Intermittent bug when moving folders around.  (Michael)
-
-Other fixes:
-
-  * Calendar
-
-    - Make reminders work with remote backends.  (Rodrigo)
-
-  * Misc
-
-    - Added support for adding an Evolution icon to the CDE
-      Application Manager.  (Ettore)
-
-Updated translations:
-
-  - bg (Borislav Aleksandrov)
-  - pl (GNOME PL Team)
-
-
-Evolution 1.0.4, 2002-04-18
----------------------------
-
-Bugzilla Bugs Fixed (see http://bugzilla.ximian.com/show_bug.cgi):
-
-  * Addressbook
-
-    #22965 -- Comply with RFC 2739 for calCalURI and calFBURL.  (Toshok)
-
-  * Calendar
-
-    #22624 -- Unable to accept meeting request that doesn't list user
-              as attendee.  (JP)
-
-  * Startup Wizard
-
-    #22047 -- Crash after closing the start-up wizard.  (Ettore)
-
-  * Mail
-
-     #8214 -- "Error Synchronizing Folder" on incoming mail spool.
-              (Michael)
-    #18929 -- If we get multiple Content-Type header values, change
-              subsequent headers to X-Invalid-Content-Type so it doesn't 
-              wreck processing.  (Michael)
-    #22363 -- Problems resyncing IMAP folders when going Online.  (Jeff)
-    #21716 -- Fixes to decoding illegally rfc2047 encoded words.  (Michael)
-    #22657 -- Fixes printing for some localizations (Radek)
-    
-
-Other fixes:
-
-  * Calendar
-
-    - Use default tasks folder in calendar view.  (Rodrigo)
-    - Added getQuery method to CalBackend to allow custom queries for
-      each calendar backend.  (Rodrigo)
-
-  * Mail
-
-    - Fixed Daylight-Savings-Time calculations on systems that use 
-      tm.tm_gmtoff rather than 'timezone' (affects BSD systems).  (Jeff)
-    - Fixed the annoying EINPROGRESS error dialogs when connecting 
-      to IMAP/SMTP/POP via SSL.  (Jeff)
-    - Changed the date format used in From-lines in mbox spools to be 
-      the same as those used by Pine to fix interoperability issues.
-      (Michael)
-    - Fixed some filtertypes.xml typos.  (Michael)
-
-  * Summary
-
-    - Change the dot.kde.org url.
-
-Updated translations:
-
-  - fi (Sami Pesonen)
-  - fr (Christophe Merlet, Frederic Riss)
-  - ko (Young-Ho Cha)
-  - nl (Tino Meinen)
-  - no (Kjartan Maraas)
-  - pt_BR (Gustavo Maciel Dias Vieira)
-
-
-Evolution 1.0.3, 2002-03-19
----------------------------
-
-Bugzilla Bugs Fixed (see http://bugzilla.ximian.com/show_bug.cgi):
-
-  * Addressbook
-
-    #16097 -- Need a way to let the user specify the DN to
-              authenticate against.  (Toshok)
-    #16680 -- LDAP performance problem.  (Toshok)
-    #16968 -- Changing search type immediately requeries.  (Toshok)
-    #20089 -- Cannot copy contacts with comma from "Contacts" to LDAP.
-              (Toshok)
-    #20690 -- LDAP contacts dont show when using letter shortcuts.
-              (Toshok)
-    #20740 -- LDAP performance problem.  (Toshok)
-    #20871 -- SelectNames dialog needs search feedback.  (Toshok)
-
-  * Calendar
-
-    #14705 -- iMIP compatibility with versions of Outlook. (Better fix
-              for the pseudo-fix in 1.0.1). We now support Outlook in
-              both Workgroup and Internet-Only modes.  (Dan)
-    #19054 -- Minimum number of alarm repetitions should be
-              1. (Federico)
-    #19234 -- BYMONTH off-by-one in RRULE:FREQ=YEARLY.  (Damon)
-    #20510 -- Load free busy info as attendees are added.  (JP)
-    #20022 -- Itip addresses are case sensitive.  (JP)
-    #20226 -- Timezone data missing from some itip replies.  (JP)
-    #20346 -- Calendar should indicate if backend dies.  (Rodrigo)
-    #20780 -- Better subjects in iMIP messages.  (Dan)
-    #20787 -- Accepted/declined messages aren't always clear.  (JP)
-    #20800 -- Sorting of free busy information in schedule page does
-	      not work.  (JP)
-    #20783 -- Accepting updated meeting request doesn't work.  (Rodrigo)
-    #21198 -- Outlook didn't recognize Evolution's acceptance of an
-	      updated meeting request.  (Dan)
-    #21240 -- Calendar Reminders don't appear for appointments in remote
-              servers.  (Rodrigo)
-
-  * Mail
-
-    #19564 -- Don't crash when changing to disconnected mode.  (Michael)
-    #20779 -- Set a 'name' parameter in the Content-Type header
-              since Outlook doesn't seem to check the filename
-              parameter on the Content-Disposition header. (Jeff)
-
-  * Shell
-
-    #20234 -- Deleting folder gratuitiously causes /local to open.
-	      (Ettore)
-    #20237 -- Shell silently drops xfer errors.  (Ettore)
-    #20311 -- New window from shortcuts should not show the folder 
-              bar and the shortcut bar.  (Ettore)
-
-  * Summary
-
-    #18025 -- Summary crash upon switching to offline mode.  (Ettore)
-
-Other fixes:
-
-  * Calendar
-
-    - Show more descriptive messages on opening errors.  (Rodrigo)
-    - Remove $filename.ics from remote URIs.  (Rodrigo)
-
-  * Addressbook
-
-    - Fix search weirdness in local addressbooks.  (Toshok)
-    - Let backends return general error status from load_uri instead
-      of just TRUE/FALSE.  (Toshok)
-    - EBook(View) handling fixes in ESelectNames and
-      EAddressbookModel.  (Clahey)
-    - Rethink (and change) some of the default queries to ones that
-      are at the same time useful and more easily implemented
-      efficiently by the backends, in both the component's view and in
-      the select-names dialog.  (Toshok)
-    - Change the "beginswith" query implementation on the name field
-      to search both first and last name, so it's a little more useful
-      in the general case.  (Toshok)
-
-Updated translations:
-
-  - es (Carlos Perell� Mar�n)
-  - fr (Christophe Merlet)
-  - jp (Akira TAGOH)
-  - nl (Vincent van Adrighem)
-  - nn (Roy-Magne Mo)
-  - no (Kjartan Maraas)
-  - pt_BR (Gustavo Maciel Dias Vieira)
-
-
-Evolution 1.0.2, 2002-01-24
----------------------------
-
-Bugzilla Bugs Fixed (see http://bugzilla.ximian.com/show_bug.cgi):
-
-  * Addressbook
-
-    #17725 -- Non-ASCII letter headings are black when printing
-              (Zbigniew Chyla)
-
-  * Calendar
-
-    #6544  -- Make Timezone names translatable (Damon)
-    #18801 -- Alarms with specific trigger times are not shown (Damon)
-  
-  * Importers
-
-    #16864 -- LDIF importer chokes on long description field (Toshok)
-    #17441 -- Crash trying to import VCards file into an LDAP folder
-              (Ettore)
-
-  * Mail
-
-    #6896  -- message_list_select() with wraparound won't select very
-              first message (Jeff)
-    #11499 -- All recovered Composer windows have HTML enabled (Jeff)
-    #16947 -- Crash while setting up a new mail account (Jeff)
-    #17205 -- Crash of evolution-mail on start-up (Jeff)
-    #17634 -- Marking a message as unread should undelete it, as well
-              (Jeff)
-    #17694 -- Exchange 5.5 reporting 2 messages as having the same UID
-              breaks Evolution (Jeff)
-    #17759 -- Cancelling Send/Receive can lose mail for local case
-              (Jeff)
-    #18142 -- Mailer crash when trying to send an email (Jeff)
-
-Other fixes:
-
-  * Summary
-
-    - Change the list of items in the mail preferences (Iain)
-
-  * Calendar
-
-    - Make Tasks default to public as in Outlook (Rodrigo)
-
-  * Importers
-
-    - Make the druid as a transient window for the main shell (Iain)
-
-  * Mail
-
-    - Follow symlinks for mbox files (Jeff)
-    - Fixed copy/paste problems in mail-account-gui.c (Ian Goldberg,
-      Jeff)
-    - Make Vfolders work with add-on storages (Dan)
-
-  * Shell
-
-    - Don't crash on missing icon on start-up (Michael Meeks)
-    - Change activation/deactivation order for views in order to
-      reduce flicker in the toolbars (Michael Meeks)
-
-Updated translations:
-
-  - bg (Alexander Shopov)
-  - el (Nick Niktaris, Panayotis Pakos, Simos Xenitellis)
-  - fr (Christophe Merlet)
-  - hu (Andras Timar)
-  - it (Clara Tattoni, Ettore)
-  - lv (Peteris Krisjanis)
-  - nn (Roy-Magne Mo)
-  - no (Kjartan Maraas)
-  - sk (Stanislav Visnovsky)
-  - sv (Christian Rose)
-
-
-Evolution 1.0.1, 2001-12-18
----------------------------
-
-New features:
-
-  * csv2vcard script to convert CSV addressbook files from Outlook
-    into VCard files that the Evolution importer can understand (by
-    Michael MacDonald).
-
-  * Alarms are now properly synced in the calendar conduit.
-
-Bugs fixed:
-
-  * Addressbook
-
-    #10114 -- No icon for Delete in the New Contact List editor
-    #10241 -- Occasional address completion flakiness
-    #10910 -- "Save" in list editor vs. "Save and Close" in contact editor
-    #11776 -- Email addresses are case sensitive
-    #13751 -- AddressBook address entry form usability problem
-    #14002 -- Select names dialog stays up after composer is closed
-    #14074 -- Editing fields under the "Collaboration" LDAP contact
-    #14715 -- Wombat gets locked up when LDAP server is down
-    #14876 -- Modifying LDAP contacts destroys existing objectclass entries
-    #15379 -- Printing from the addressbook totally broken
-    #16156 -- "Save As", "Send As", "Send To" not available in list editor
-    #16176 -- Tab order starts wrong
-    #16510 -- Small contact editor fixes
-    #16744 -- Crash
-    #16852 -- Crash closing empty mail
-    #16910 -- Crashed addressbook when selecting addresses
-    #17109 -- Crashed when editing a contact
-    #17126 -- Adding some addresses does not work
-
-  * Calendar
-
-    #7641  -- Crash in EMap widget when used in Evolution 
-    #8993  -- Attendees not stripped properly from itip replies
-    #13843 -- Deleting tasks causes crash
-    #13952 -- Notifier repeatedly gives alarm after appointment ended
-    #14087 -- Daily repeat event with end-date misses one day
-    #14489 -- UI bug in Calendar Settings
-    #14699 -- gtk_signal_disconnect_by_data warning
-    #14705 -- iMIP compatibility with versions of Outlook. (We now support
-	      Outlook in an Exchange environment by default, but the old
-	      behavior can be turned on with the environment variable
-	      EVOLUTION_SEND_IMIP_AS_ATTACHMENT. This will be fixed better
-	      later.)
-    #15401 -- Use UTF-8-aware gnome-print calls
-    #15456 -- Typo in translatable string
-    #15774 -- Crashed by selecting "decline" in meeting request
-    #15941 -- Location missing for the calendar
-    #15749 -- Empty end time in all-day-event crashes calendar.
-    #15774 -- Selecting decline in schedule meeting request makes evo crash
-    #15798 -- Calendar Date Never Updates         
-    #16232 -- e-itip-control.c - init() doing odd stuff     
-    #16359 -- Calendar Crash
-    #16460 -- Changing a meeting doesn't always offer to send an update
-    #16571 -- Weird URI in meeting request email
-    #16910 -- Crashed when entering a completion percentage
-    #16224 -- remove unsupported columns from Tasks view
-    #16880 -- Cannot import ical (ics) even its own       
-    #17344 -- iCalendar should not be translated   
-    #17526 -- Refreshing request does not show relevant information
-    #17527 -- Refresh requests have wrong menu
-    #17531 -- libical does not build with bison 1.30
-    #17606 -- libical does not build with autoconf 2.52
-    (none) -- Scheduling page did not accurately display no information range
-
-  * Conduits
-
-    #1183  -- Handle alarms in conduits
-    #14452 -- Converting names wrong from Palm
-    #15810 -- Crashed during EAddress sync
-    #15922 -- Crash
-    #16460 -- Changing a meeting doesn't always offer to send an
-              update
-    #16997 -- Pilot compilation with libiconv
-    #17230 -- Custom data on Pilot being over written
-
-  * Importers
-
-    #14701 -- Importing locks up Evolution
-
-  * Mail
-
-    #2233  -- Don't show RTF attachments inline 
-    #5547  -- Crash: Error closing a HTML-mail 
-    #12062 -- Can't use 'n' to skip to next unread if multiple messages 
-  	      are selected
-    #13898 -- Crash: Cannot create emails in evolution
-    #14127 -- Wrong error message 
-    #14348 -- Some things that need open messages... 
-    #14517 -- "Clear" needed twice for non-body+subject searches 
-    #14662 -- GPG signature showing as attachment 
-    #14678 -- Timestamp on outgoing mail incorrect on FreeBSD
-    #14734 -- Evolution-mail crashes while accessing imap servers 
-    #14770 -- Appending messages to other IMAP folder can cause INBOX to
-  	      stop updating
-    #14838 -- Saving passwords doesn't work
-    #14848 -- Forwarding wrong email due to next/prev 
-    #14965 -- Message copy fails with space in folder names
-    #14976 -- Crash when reading a message from an IMAP server
-    #15264 -- Crash: evolution-mail seg fault on exit 
-    #15374 -- "___" in autogenerated name of vfolder created by sender of 
-    #15415 -- Virtual Folders Editor: display of non-ascii symbols is broken 
-    #15449 -- `N' wraps `P' doesn't 
-    #15451 -- Crash when pressing stop during "going offline" 
-    #15489 -- Evolution crashed while deleting my IMAP mail account 
-    #15491 -- Evolution crashes/becomes unusable if ppp connection is lost
-    #15498 -- Crash: Faulty vFolder editor 
-    #15512 -- Hangs while scanning for changed messages on S/IMAP+Exchange
-    #15552 -- Crash
-    #15608 -- RCPT TO: response error: Success 
-    #15647 -- Composer "send" button has wrong tooltip when offline 
-    #15657 -- Empty recipients 
-    #15693 -- Crash: Loading message contents from IMAP and close application 
-    #15745 -- Search edit window widgets disabled. / Mail component crash.
-    #15813 -- Decrypting cuts off initial text
-    #15843 -- Attachments inside attachments 
-    #15946 -- Opening IMAP mailbox made it crash 
-    #15952 -- Mailer crashed after hitting page down key 
-    #16227 -- "Body contains" seems to want a regexp 
-    #16254 -- Add Sender to Addressbook missing from menus 
-    #16284 -- Evolution-mail crashed selecting "create vfolder on subject" 
-    #16371 -- Corrupt Email crashes Mail component 
-    #16416 -- X-Mailer says "Preview Release" 
-    #16501 -- Crash while creating new account
-    #16520 -- Crash
-    #16559 -- Race-condition in the Camel type system
-    #16669 -- Camel 64-bit badness
-    #16695 -- A few dialogs are missing sensible titles 
-    #16698 -- Crash: Can't empty trash; segfault when I try to exit
-    #16722 -- Attachment properties dialog crash
-    #16903 -- Crash: segv retrieving mail
-    #16924 -- Crash on a particular spam message
-    #16936 -- Crash when opening a specific message 
-    #16947 -- Crash: Trouble Setting up a new mail account
-    #17085 -- Bad encoding for subject
-    #17386 -- Crash when reading a specific message
-
-  * Shell
-
-    #7827  -- Switching desktops leaves the folder bar popped up
-    #14518 -- Crashed when starting the program
-    #14701 -- Importing locks up Evolution
-    #15435 -- "Rename folder" dialog: non-ASCII folder names are displayed
-    #16507 -- Right Click -> View does nothing
-    #16693 -- Crash when creating a new folder
-    #17258 -- Shell displays splash even if Evolution is already running
-
-  * Summary
-
-    #8029  -- Locations.h file for translators
-    #11212 -- Degree symbol in weather
-    #14483 -- "Hello"?
-    #14996 -- All-day appointments are displayed incorrectly in the
-              summary view
-    #16417 -- Have a better default than CNN headlines
-    #16772 -- Summary crashes on startup
-    #17249 -- Crash going offline
-  
-  * Misc
-
-    #16358 -- Evolution doesn't have a man page
-    #17377 -- Evolution doesn't work on multi-visual displays
-
-
-Evolution 1.0, 2001-11-14
--------------------------
-
-Misc:
-  Removed OpenSSL support.
-
-Mailer:
-  #14893 -- Mailer hanging if you specify an invalid password
-
-  
-Evolution 0.99.2 (Release Candidate 2), 2001-11-14
---------------------------------------------------
-
-Misc:
-  #14783 -- killev does not check for system type properly
-  #14630 -- HTML docs refer to missing gifs in stylesheet-images
-  #15027 -- Typos in the docs
-  #15028 -- Corrections to the user documentation
-  #15056 -- Spelling Error
-
-Shell:
-
-   #6295 -- Go to folder dialog should have the e-tree focused
-  #13872 -- Crash
-
-Summary
-
-  #13478 -- Summary hangs at startup
-  #14518 -- Crashing while starting the program
-
-Mailer:
-
-  #10560 -- Messages in Korean charset displayed as blank
-  #10735 -- Extra cruft at bottom of Compose window's View menu
-  #11177 -- Closing main window while dialog up, hangs
-  #11647 -- "Body contains" and "Body does not contain" searches are
-            matching strings in the message header
-  #13996 -- Searches not available in IMAP in offline mode
-  #14351 -- pgp 5.5.8 not supported, recognized as 2.6.x
-  #14361 -- IMAP/SSL APPENDs hang
-  #14542 -- Crash pressing ctrl-a ctrl-k
-  #14569 -- Crash when moving a folder
-  #14620 -- Weird font issue in Mdk 7.2
-  #14659 -- GPG messages are truncated
-  #14672 -- evolution-mail crashes on startup
-  #14794 -- PGP signing problem, complaining about 2.6.x when 6.5.1
-            is installed
-  #14826 -- Crashed the editor by using Alt-C (capitalize word)
-  #14838 -- Saving passwords dosen't work
-  #14848 -- Forwarding wrong email in separate window when using prev/next
-            buttons
-  #14861 -- DnD a message from a folder with a space in the name fails
-  #14951 -- Cancelling before IMAP connect causes IMAP to loop forever
-  #14965 -- Message copy fails with space in folder names
-  #15038 -- Can page up or page down off of table
-  #15154 -- Long line rendering bug
-  #15267 -- Outgoing filter move/copy to folder crashes Mailer
-  #15296 -- Mailer hangs when fetching mail
-  #15324 -- Table handling code not rendering centered content when
-	    it should
-  #15374 -- "___" in autogenerated name of vfolder created by sender of message
-  #15393 -- Pointer grab when shift-double clicking
-
-Addressbook:
-
-   #9501 -- Appointment Editor has "Save changes?" confirmation but
-            Contact editor does not
-  #14107 -- Crash: Address auto-complete pop-up appears after sending mail
-  #14646 -- Doesn't handle failure in default_book case
-  #14743 -- Contacts crashes when saving a List
-  #14780 -- Pushing categories in Contact editor crashes Contacts
-  #17355 -- e-select-names/completion from arbitrary storages
-
-Pilot conduits:
-
-  #9465  -- Palm Addressbook sync corrupts character set
-  #14562 -- Crash
-  #15355 -- Bogus warning in calendar conduit
-
-Calendar:
-
-  #10285 -- Problem printing the calendar
-  #13631 -- Left-over debug print
-  #14021 -- Problems entering a task
-  #14335 -- UTF-8 Error in schedule meeting
-  #14337 -- Meeting is added to calender even when selecting decline
-  #14362 -- Appointments (public or private) don't show in the Day
-	    view of the calendar
-  #14392 -- Event editor removes wrong pages when object updated
-  #14524 -- Meeting page dragging broken for all day events
-  #14655 -- evolution-alarm-notify crash on start
-  #14687 -- load_uri failures are not noticed by the client talking
-            to the wombat
-  #14704 -- Free/busy info not in UTC
-  #14765 -- Schedule page timezone problems
-  #14842 -- EWeekView - typing in event & day incorrect
-  #14845 -- Crash assigning category to new task
-  #14941 -- Crash
-  #15137 -- Crash when double clicking on empty appointment
-
-
-Version 0.99.0 (1.0 Release Candidate 1), 2001-11-05
-----------------------------------------------------
-
-Shell:
-
-  - Fixed problems with icons not showing up in the druids.  (Ettore,
-    Anna)
-
-  - Fixed some dnd brokenness.  (Ettore)
-
-  - Fixed some random crashes and made the shell more robust in case
-    of activation problems or components crashing.  (Ettore)
-
-  - Implemented a newer, prettier about box.  (Ettore)
-
-  - Made sure the quit message always gets displayed.  (Ettore)
-
-  - Made sure the shell doesn't allow for folder names with slashes.
-    (Ettore)
-
-  - Made the folder selection and folder creation dialogs play better
-    with the WM for out-of-proc components.  (Ettore)
-
-  - Make sure components don't display dialogs before the shell
-    windows are displayed.  (Ettore)
-
-  - Fixed some problems with copying/transferring/renaming folders.
-    (Ettore)
-
-  - Made the pop-up folder bar have the expected size when popped up.
-    (Ettore)
-
-Mailer:
-
-  - Fixed SMTP truncation, IMAP/SSL truncation/hangs when
-    sending/appending messages.  (Jeff)
-
-  - Implemented rename for imap/maildir folders.  Rename also tracked
-    in vfolder and filter code.  Use rename for local folders when we
-    can instead of copy/delete.  (Michael, Jeff)
-
-  - Fixed startup wizard next page race bugs. (Michael)
-
-  - Fixed toolbars vanishing, Bonobo Suxors. (Michael)
-
-  - Made filter/vfolder on mailing lists honour domains, but also
-    backward compatible.  (Michael)
-
-  - Fixed the password coming up behind the main window.  (Michael,
-    Ettore)
-
-  - Fixed numerous crash on startup/exit/while doing nothing/switching
-    folder/components, many races and other architectural errors.
-    (Michael, Jeff)
-
-  - Bunch of vFolder fixes and feature completion. (Michael)
-
-  - Added a 'index body' option to configure folder.  (Michael)
-
-  - Fixed 'unread' counts, again.  (Michael)
-
-  - Fixed some problems leaking file descriptors and overusing them
-    when not necessary.  (Michael)
-
-  - Implemented iconv() caching and Solaris friendly iconv name
-    converter.  Made override display charset work in more cases.
-    (Michael, Jeff)
-
-  - Various untranslated buttons/menus and other translation issues
-    fixed.  (Michael, Jeff)
-
-  - Offline searching in IMAP. (Michael)
-
-  - Don't warn the user if he drags a message and drops it in the same
-    place.  (Jeff)
-
-  - Fixed replying-to and forwarding messages with attachments to
-    attach the appropriate attachments in the new message.  (Jeff, Larry)
-
-  - Don't allow the user to edit the default searches and keep all the
-    search menus consistant accross all folders.  (Jeff)
-
-  - Allow the user to drag&drop and/or move messages to the Trash
-    folder.  (Jeff)
-
-  - Various fixes to the filtering code.  (Jeff, Michael)
-
-  - Make various dialogs non-modal.  (Jeff)
-
-  - Fixes to POP3 UID caching so users can "leave mail on server" and
-    not get duplicates.  (Jeff)
-
-  - Fixes to IMAP caching code where servers support the UIDPLUS
-    extension. Will also now un-cache a folder when the user deletes
-    it from the IMAP server.  (Jeff)
-
-  - Removed support for PGP 2.6.x due to security issues (pgp would
-    always return 0 suggesting that the signature was valid even when
-    it wasn't).  (Jeff)
-
-  - "Whitespace-only" recipients are now ignored, rather than being
-    flagged as invalid. (Trow)
-
-  - Fixed bugs related to message searching: memory leak, i18n problems,
-    etc. (Trow)
-
-  - We no longer leave stray windows lying around after doing the
-    "Add Sender to Addressbook" operation. (Trow)
-
-  - Bcc: headers are now shown when viewing drafts, sent mail. (Trow)
-
-  - Lots and lots and lots of other little and not so little things.
-    (Michael, Jeff, Dan, Trow)
-
-Addressbook:
-
-  - General bug fixes.  (Everybody)
-
-  - Printing fixes.  (Trow)
-
-  - Fixed the dreaded "this should never happen" bug.  (Trow)
-
-  - Plugged memory leaks.  (Trow)
-
-  - Fixed use-score sort ordering when doing completion.  (Trow)
-
-  - Fixed EAddressPopup race conditions.  (Trow)
-
-  - Implemented transfer function for shell, so moving contact
-    folders now works.  (Trow)
-
-  - Fixed occasional completion flakiness.  (Trow)
-
-  - Fixed contact count on folder bar.  (Trow)
-
-  - Fixes for LDAP/multibook address completion.  (Toshok, Trow)
-
-  - Added a "Do you want to save changes?" dialog to the contact 
-    and contact list editors. (Toshok)
-
-  - Fixed date (birthday and anniversary) handling for LDAP. (Toshok)
-
-  - Fixed nasty LDAP modification bug. (Toshok)
-
-  - Add a config setting (/Addressbook/default_book_uri) to specify where
-    vcards and email addresses from mail messages are stored as contacts.
-    (Toshok)
-
-  - Fixed problem that arose in an earlier beta where some contacts
-    couldn't be modified or deleted from local addressbook.
-    (Chris Toshok)
-
-  - LDIF Importer.  (Chris Toshok, Michael M. Morrison)
-
-  - Fixed Memory Leaks.  (Trow)
-
-  - Always show the correct message about the number of contacts on the
-    message bar.  (Trow)
-
-  - Fixed printing of contacts.  (Trow)
-
-  - Fixed the incredibly annoying bug which caused completed
-    (underlined) contacts to spontaneously revert when edited.
-    (Trow)
-
-  - Better event handling in minicard view.  (Chris Lahey)
-
-  - Fixed Bold font in select names dialog.  (Chris Lahey)
-
-  - Show error dialog if saving a contact to a file fails.  (Chris Lahey)
-
-  - Handle carriage returns in any contact field properly.  (Chris Lahey)
-
-Summary:
-
-  - Worked around gnome-vfs problems that were causing crashes.  (Trow)
-
-  - Set the defaults to be CNN and Boston (Ettore)
-
-  - Move the location of the RDF file to be in a place that will always exist.
-
-  - Fixed numerous bugs (Trow, iain)
-
-  - Made the offline stuff work correctly (iain)
-
-  - Fixed a bug were the summary wouldn't retain settings if all folders,
-    or RDFs, or weather stations were removed. (iain)
-
-Importers:
-
-  - Made the pine importer work for multidepth mail folders. (iain)
-
-Calendar:
-
-  - Underlined accelerators now work in the editor dialogs.  (Damon)
-
-  - Many fixes for scheduling meetings.  (JP)
-
-  - Status bar messages for long queries.  (Rodrigo)
-
-  - Appointments with empty summaries are now deleted from the views.
-    Also, you can press Escape to cancel editing [#780].  (Federico)
-
-  - The alarm daemon no longer displays "old" alarms twice. (Federico)
-
-  - Alarms now handle timezones correctly [#5852].  (Federico)
-
-  - Repeating alarms are now handled [#12163].  (Federico)
-
-  - The alarm daemon is launched as soon as the calendar starts, not
-    when you actually open a folder [#13867].  (Federico)
-
-  - You can now set a default reminder to be added to new appointments
-    [#13649].  (Federico)
-
-  - Fixes for printing week views [#13687, #13688].  (Damon)
-
-  - Tasks printout now matches the task list better [#10280].  (Damon)
-
-  - Better handling of DATE values, as opposed to DATE-TIME ones.  (Damon)
-
-  - Many changes to handle the default timezone better.  (Damon)
-
-  - Recurrence generation fixes [#11525].  (Damon)
-
-  - Fixed merging of complete VCALENDAR components.  (Damon)
-
-  - Fixes to the folder transfer functions.  (Ettore, Federico)
-
-  - Tasks activation fixes.  (Damon)
-
-  - Outlook interoperability fixes.  (Damon, JP)
-
-  - Miscellaneous fixes to the event/task editors.  (Damon, JP, Federico)
-
-  - New iCalendar importer.  (Rodrigo)
-
-  - Fixed problems introduced in Beta 6 due to the changes in the URI
-    management functions.  (Rodrigo)
-
-  - Prettier alarm notification dialog.  (Larry)
-
-  - Session management for the alarm daemon.  (Federico)
-
-  - Added activity bars for long calendar operations.  (Rodrigo)
-
-  - Added iCal file importer.  (Rodrigo)
-
-  - Show error dialogs on calendar failures.  (Rodrigo)
-
-Conduits:
-
-  - Addressbook phone numbers now preserved if they can't all be
-    synced to desktop (JP)
-
-  - Sync addressbook phone numbers from non-english pilots (JP)
-
-  - Various memory leak fixes (JP)
-
-  - Handle multi-day calendar events (without recurrences) (JP)
-
-  - Make sure task records are marked complete in every relevant field
-    (JP)
-
-  - Use new timezone stuff everywhere (JP, Damon)
-
-  - Translate task priorities better (JP)
-
-
-Version 0.16 (Beta 6), 2001-10-10
----------------------------------
-
-Shell:
-
-  - Now the shell restarts stale components from previous sessions
-    properly.  This should reduce the need for oaf-slay to only the
-    cases in which a specific component is completely stuck (which
-    hopefully should never happen).  (Ettore)
-
-  - Fixed the saving of the size of the shortcut bar and the folder
-    bar.  (Ettore)
-
-  - Always display a new default view for the shell, unless the user
-    specified an `evolution:' URI on the command-line.  (Ettore)
-
-  - Fix the weird behavior for right click -> open in new window in a
-    pop-up folder bar.  (Ettore)
-
-  - Make the copy/move and dnd code to detect copying of folders onto
-    themselves correctly.  (Ettore)
-
-Mailer:
-
-  - Bcc: addresses are now visible when browsing messages in
-    the "Sent" folder.  (Trow)
-
-  - Various backend fixes like thread safeness of concurrent
-    triggered events, more forgiving address header decoding,
-    fixes for recent breakage to progress reports, adding a deleted
-    event/state for folders, various deadlocks.  (Michael, Jeff)
-
-  - Fixed quick-searching by receipients to work.  (Michael)
-
-  - Caching of iconv handles to improve performance of many internal
-    mail reading/indexing operations.  (Michael)
-
-  - Major oops in mbox code that caused significant performance
-    problems getting/filtering mail fixed.  (Michael)
-
-  - Message charsets can now be overridden by a user-chosen charset
-    encoding in the mail display.  (Jeff)
-
-  - Report errors when file cannot be attached in the composer.  (Jeff)
-
-  - File->Folder->Properties and Delete Folder now work for VFolders.
-    (Michael)
-
-  - VFolders, Filters and Searches are saved in a safe manner so that
-    they should not be lost with quota/filled disk problems.  (Michael)
- 
-  - VFolders now update with new mail on their sources.  (Michael)
-
-  - Fixed the "Load HTML Images" radio button options in the mail
-    config dialog to work properly.  (Jeff)
-
-  - When an IMAP folder is deleted, removed any cached messages that
-    had been in that folder when it was "alive".  (Jeff)
-
-  - New icons for PGP signature authenticity.  (Jeff, Jimmac)
-
-Addressbook:
-
-  - General fixes.  (Chris Toshok, Trow, Iain, Chris Lahey, JP)
-
-  - LDAP configuration dialog fixes.  (Chris Toshok)
-
-  - New authentication work.  (Chris Toshok)
-
-  - Fixed crashes related to editing the Master Category List.  (Trow)
-
-  - Address completion is no longer confused by whitespace.  (Trow)
-
-  - More work on having multiple wombats.  (Chris Toshok)
-
-  - Contact names no longer mysteriously disappear when using the
-    SelectNames dialog.  (Trow)
-
-Calendar:
-
-  - Backend improvements (Rodrigo)
-
-  - Compilation fixes for latest Bonobo (Rodrigo)
-
-  - Fixed problem with exceptions to recurring events.  (Damon)
-
-  - Fixed handling of UNTIL property in recurring events. (Damon)
-
-  - The alarm daemon will now notify you of alarms that should have
-    occurred while it was not running.  (Federico)
-
-  - Handle monthly-by-day and "last day" recurrences in the conduits.  (JP)
-
-  - Added priorities to the fields in the attendee list.  (Chris)
-
-  - Enhancements to the event editor for meetings.  (JP)
-
-Summary:
-
-  - Bugfixes.  (Iain)
-
-  - Recurring events have the correct time and date.  (Iain)
-
-
-Version 0.15 (Beta 5), 2001-10-02
----------------------------------
-
-Shell:
-
-  - Fixed a problem with shortcuts not appearing when created by the
-    mailer.  (Ettore)
-
-  - Fixed right-click menu behavior for folders in the folder bar.
-    (Ettore)
-
-  - Got Rename to work again.  (Ettore)
-
-  - Fixed some folder copy/move/dnd bugs.  (Ettore)
-
-  - Added a menu item to configure the Pilot settings.  (Ettore)
-
-  - Fixed some other miscellaneous bugs/crashes.  (Ettore)
-
-  - Added ability to run the intelligent importers from the File->Import
-    menu item. (iain)
-
-Mailer:
-
-  - Fixed the multiple error-dialog thing.  (Michael)
-
-  - Fixes to PGP decrypting and verification code.  (Jeff)
-
-  - Made vFolders work a lot better.  (Michael)
-
-  - Added a confirm expunge option to the mail settings dialog.
-    (Jeff)
-
-  - Fixed the update-IMAP-unread-counts bug.  (Jeff)
-
-  - Show messages in the user's preferred charset if the message
-    itself doesn't contain charset information or if the message
-    charset is wrong (ie the system can't convert the text to utf-8).
-    (Jeff)
-
-  - Many backend fixes that users won't notice.  (Michael, Jeff, Dan)
-
-  - Fixed the crash that accompanied the invalid address warning.  (Trow)
-
-  - Properly encode the mailto: links we generate inside of displayed
-    messages.  (Trow)
-
-  - Improve the signature editor. (iain)
-
-Calendar:
-
-  - Backend improvements (JP, Rodrigo).
-
-  - The alarm daemon can now re-enter properly [#10840].  (Federico)
-
-  - Alarms can now have zero-time offsets [#7892].  (Federico)
-
-  - Warning fixes.  (Chris)
-
-  - Fixed custom Glade widgets on non-Linux systems.  (Dan)
-
-  - Fixed crashing problems in the event/task editor.  (Damon)
-
-Addressbook:
-
-  - Miscellaneous bug fixes.  (Trow, Chris Toshok, Chris Lahey, JP,
-    Peter Williams)
-
-  - Better handling of addresses containing commas or other special
-    characters.  (Trow)
-
-  - Fixed bugs related to sending mail by left-clicking on an address
-    inside a message.  (Trow)
-
-  - Auto-completion now matches against contact nicknames.  (Trow)
-
-  - Added help text and generally cleaned up the contact editor.
-    (Anna)
-
-  - Handle multiple wombats properly.  (Chris Toshok)
-
-  - Made which book to use for address completion configurable (no gui
-    for this yet.)  (Chris Toshok)
-
-  - Made Print Preview work in addressbook.  (Chris Lahey)
-
-Pilot:
-
-  - Now syncs exception dates in calendar and addressbook notes.  (JP)
-
-  - Does not overwrite custom data on pilot.  (JP)
-
-  - Address completion no longer marks records as changed.  (JP)
-
-  - Miscellaneous other bug fixes.  (JP)
-
-Summary:
-
-  - Cache images instead of repeatedly reloading them (iain)
-
-  - Only redraw when the summary is visible (iain)
-
-  - Use the encoding specified in the RDF file (Takuo Kitame)
-
-  - Leak fixes (Larry)
-
-  - Show todays tasks works (iain)
-
-  - Make the preferences dialog nicer. (iain)
-
-Importers:
-
-  - Handle cases where the Netscape transport is nothing. (iain)
-
-Version 0.14 (Beta 4), 2001-09-21
----------------------------------
-
-General:
-
-  - Lots of i18n fixes.  (Zbigniew Chyla and others)
-
-  - Made the splash screen use BackingStore.  (Ettore)
-
-  - Added a quit dialog box.  (Ettore)
-
-  - Fixed a shell crash that could happen when launching Evolution
-    before a previously launched instance was done initializing itself.
-    (Ettore)
-
-  - Fixed other random shell crashes.  (Ettore)
-
-  - Got the shell to remember window geometries on exit.  (Ettore)
-
-  - Fixed some things for Automake 1.5 (unfinished).  (Richard
-    Boulton)
-
-  - Add nice highlighting to DnD operations in the folder tree.
-    (Ettore, Clahey)
-
-  - Fixed several leaks.  (Dan)
-
-  - Fixed some problems with folder creation and deletion.  (Toshok)
-
-  - Made the Summary the default folder.  (Ettore)
-
-  - Made the title bar display the unread message count again.
-    (Ettore)
-
-Mail:
-
-  - Had a few beers while sitting back and relaxin'.  (Jeff, Michael)
-
-  - Check for valid addresses before sending. (Trow)
-
-  - Use contact preferences when deciding whether or not to put the
-    composer into HTML mode by default. (Trow)
-
-  - Properly address mail from "hidden" contact lists. (Trow)
-
-  - Redid folder unread counts/folder tree backend code
-    completely. (Michael)
-
-  - Implemented/fixed getfolderinfo in maildir/spool/local
-    folder/vfolder, required to make unread counts work. (Michael)
-
-  - Redid 'local folder' handling code completely. (Michael, Peter)
-    Also fixed the properties dialogue to get the list of supported
-    types dynamically, and set the right one at startup. (Michael)
-
-  - Redid vfolder code in evolution-mail completely.  Main visible
-    change is they open at startup, and the vfolder editor works
-    much better.  (Michael)
-
-  - Made it so fcntl(2) locking failures on filesystems (e.g. NFS)
-    that dont support locking are treated as success. (Michael)
-
-  - Fix imap inbox filtering, then moved it to CamelFolder, and
-    partly implemented it for spool and maildir mailboxes.  (Michael)
-
-  - Made the vfolder UNMATCHED folder's name translatable.  (Michael)
-
-  - Change the way the 'not body contains' filter rule works, so that
-    it runs much more efficiently, particularly on IMAP.  (Michael)
-
-  - Camel will not try and convert charsets of data that contain
-    invalid charset data, thus data will not be tainted by
-    a failed conversion process. (Michael)
-
-  - A few threading scheduling changes to try to optimise the user
-    experience.  Also changed the way threads are terminated,
-    avoiding some possible libpthread bugs.  (Michael)
-
-  - Changed vfolder uri's to not include the query, set it separately.
-
-  - Removed a lot of special case code for vfolder/file uri's, other
-    dead or newly redundant code, cleanups, etc.  (Michael)
-
-  - Fixed a bug in libibex that would overallocate block data and
-    corrupt it and crash, also fail-back and reset the index in
-    more cases.  (Michael)
-
-  - Fix filtering on score so the expression compiles. (Michael)
-
-  - Came to visit USA at a very wrong time.  (Michael)
-
-  - Removed X-Evolution headers before sending messages.  (Jeff)
-
-  - When configuring a new default account, make sure to set it as the
-    default.  (Jeff)
-
-  - Convert all textual parts to 8bit before saving them, this makes
-    saved messages more human readable.  (Jeff)
-
-  - Don't cache PGP passphrases unless the user requests to do so.
-    (Jeff)
-
-  - Unsubscribe from folders before deleting them.  (Jeff)
-
-  - Fixed a number of race conditions in the subscribe dialog.  (Jeff)
-
-  - Save transport (SMTP) passwords if the user has asked us to.  (Jeff)
-
-  - Hide the S/MIME frame in the account editor, we won't be
-    supporting it for 1.0.  (Jeff)
-
-  - Fixed it so that icons are displayed for PGP messages.  (Jeff)
-
-  - Give a description for each of the Source and Transport types when
-    configuring an account. This makes a few things less confusing.
-    (Jeff)
-
-  - When performing a Send & Receive on a disconnected IMAP server, if
-    the user provides a password, connect tot he IMAP server and display
-    it's folders too.  (Jeff)
-
-  - Return a folder info for each IMAP folder created when the user
-    creates a recursive directory structure.  (Jeff)
-
-  - Added support for more charset conversions (including all
-    Windows-cp125x charsets).  (Jeff)
-
-  - When the disk is full, warn the user and don't crash.  (Jeff)
-
-  - Handle POP servers that don't support the UIDL extension.  (Jeff)
-
-  - Several PGP fixes.  (Jeff)
-
-Addressbook:
-
-  - Miscellaneous bug fixes. (Jon Trowbridge, Chris Toshok, Chris Lahey,
-    Ettore Perazzoli, Iain Holmes, Zbigniew Chyla, Jacob Berkman)
-
-  - Fixed race conditions associated with adding/removing contacts.
-    The addressbook should be much more stable now.  (Trow)
-
-  - Fixed reference counting bugs in addressbook & wombat.  (Trow)
-
-  - Made address lookup smarter; cut & paste of address now mostly works.
-    (Trow)
-
-  - Plugged Trow's memory leaks.  (Larry)
-
-  - Name completion now works with one-word names, so it is now much
-    easier to send mail to Cher.  (Trow)
-
-  - Better handling of contact lists in the composer entries.  (Trow,
-    Toshok)
-
-  - SelectNames dialog fixes.  (Trow)
-
-  - Better handling of contact lists in the pilot conduits.  (JP)
-
-  - Added Free busy URL and Calendar URI info to contact editor and
-    ECard.  (JP)
-
-  - Made it so you can select uneditable text in Contact Editor.
-    (Chris Toshok)
-
-  - Worked on LDAP dialog.  (Chris Toshok)
-
-  - General LDAP work.  (Chris Toshok)
-
-  - Fixed charset handling within VCard handling.  (Chris Lahey)
-
-  - Reworked Drag & Drop for card view.
-
-Calendar & Tasks:
-
-  - Free/Busy changes.  (JP, Rodrigo)
-
-  - iTIP fixes (JP)
-
-  - i18n fixes, particularly for printing (Zbigniew Chyla)
-
-  - Added option to confirm deletions (Federico)
-
-  - Improved alarm system (Federico)
-
-  - Fixed crashing bug when deleting a folder (Federico)
-
-  - Added option to hide completed tasks (Damon)
-
-  - Timezone changes for interoperability with Outlook (Damon)
-
-  - Fixed problems displaying/parsing times in locales which don't specify
-    'am' and 'pm' strings (Damon)
-
-  - Added toolbar button to delete the selected calendar event (Damon)
-
-  - Meeting selector integrated (JP)
-
-Summary:
-
-  - Fixed bugs and leaks.  (Iain)
-
-  - Fixed bug with handling of the Slashot RDF files.  (Iain)
-
-  - Made the Addressbook and Tasks links open the editor for
-    them.  (Iain)
-
-  - Mail summary doesn't force all folders to be opened.  (Iain)
-
-  - Calendar summary shows if an alarm is set for an appointment.  (Iain)
-
-  - Timezone fixes.  (Iain, Damon)
-
-Importers:
-
-  - Fixed more bugs.  (Iain)
-
-  - Netscape importer shouldn't crash on Movemail users anymore.
-    (Iain)
-
-  - Pine importer should import addressbooks better.  (Iain)
-
-  - VCard importer will actually import things now.  (Iain)
-
-
-Version 0.13 (Beta 3), 2001-08-21
----------------------------------
-
-Global:
-
-  - New startup assistant to create mail accounts, import mail and set 
-    your timezone.  (Iain, Taylor)
-
-  - Improved the appearance and behavior of the clickable title bar and
-    the folder tree.  (Ettore)
-
-  - "Stock" folders such as Inbox have their names translated now and
-    cannot be removed.  (Ettore)
-
-  - Moved the Summary (formerly known as "My Evolution") to be a
-    normal node instead of being the toplevel node.  (Ettore)
-
-  - Fixed some problems with copying, moving and removing folderes.
-    (Jason)
-
-  - Fixed the handling of documentation files in the Help menu.  It
-    now integrates nicely with Nautilus and Scrollkeeper.  (Aaron,
-    Kjartan)
-
-  - Implemented the `File -> New' menu.  (Ettore)
-
-  - Improved error messages on start-up.  (Ettore)
-
-  - Fixed various crashes and minor bugs.  (Ettore, Jason)
-
-  - Various UI tweaks and improvements.  (Anna, Tuomas, Jakub)
-
-Mail:
-
-  - Fixed creating IMAP folders.  (Jeff)
-
-  - Add a shortcut to the INBOX of IMAP or spool stores when 
-    their accounts are first created. (Peter)
-
-  - Fixed Crash on Exit bugs.  (Jeff)
-
-  - Many more i18n fixes.  (Zbigniew Chyla, Jeff and others)
-
-  - Subscribe dialog UI tweaks. (Peter, Anna)
-
-  - Displaying PGP signed messages now shows icons.  (Jeff)
-
-  - Sensitize menu items based on number of selected messages. (Peter)
-
-  - Always-sign options for PGP.  (Jeff)
-
-  - Fixed keep-on-server for POP servers that don't support UIDL.
-    (Jeff)
-
-  - Several IMAP fixes. (Peter, Jeff, Danw)
-
-  - Fix crash after conversion of an empty folder to another
-    format. (Peter)
-
-  - Ibex now limits its file descriptor usage. (Michael)
-
-  - When deleting an account, remove the shortcuts that point to it. (Peter)
-
-  - Several IMAP fixes. (Peter, Jeff, Danw)
-
-  - Miscellaneous bugfixes all around. (Peter, Jeff, Danw, Michael, others)
-
-Calendar & Tasks:
-
-  - Calendar no longer crashes when you scroll a busy month view
-    (Federico).
-
-  - Performance improvements throughout (Damon).
-
-  - Improved search bar; now handles categories.  (Jon, Federico)
-
-  - The date navigator now reflects the results of the search bar.
-    (Federico)
-
-  - An empty task is no longer added when you have selected a
-    category. (Federico)
-
-  - Internationalization fixes (Zbigniew).
-
-  - Timezone fixes (Damon).
-
-  - Time transparency and component classification support (Damon).
-
-  - Folder bar now displays the selected time range (Damon).
-
-  - Improved settings dialog (Anna, Damon, Federico).
-
-  - iTIP/iMIP fixes for attendees, cancellation. (JP).
-
-  - Category icon drawing fixes. (Rodrigo)
-
-  - Alarm fixes. (Federico)
-
-  - Calendar components can be saved independently. (JP)
-
-  - New icons. (Tuomas)
-
-  - Contacts support. (Damon)
-
-  - You can double-click on appointments to edit them. (Damon)
-
-  - Share more code between the backends. (Rodrigo)
-
-  - Miscellaneous fixes all over the place. (Damon, JP, Rodrigo, Federico)
-
-Addressbook:
-
-  - Various fixes.  (Anna Dirks, Dan Winship, Jason Leach, Jos Dehaes,
-    Kjartan Maraas, Lahey, Nat Friedman, Radek Doulik, Toshok, Trow)
-
-  - Made addressbook menus match the right click menus.  (Lahey)
-
-  - Made addressbook use camel for building email addresses.  (Trow)
-
-  - Fixed up phone number matching to not cause errors.  (Lahey)
-
-  - Made the alphabet bar change the current search.  (Lahey)
-
-  - Made duplicate contact matching less sensitive.  (Lahey)
-
-  - Changed advanced search to match behavior in mailer.  (Toshok)
-
-  - Redesigned LDAP server dialog.  (Anna Dirks)
-
-  - Work on addressbook authentication.  (Toshok)
-
-  - Changes to EDestination.  (Trow)
-
-  - Magic comma work.  (Trow)
-
-  - Redesigned ESelectNames dialog.  (Anna Dirks)
-
-  - Made LDAP changes appear in gui immediately if they're made by the
-    local client.  (Toshok)
-
-  - Made ECard hold a link to its original EBook.  (Lahey, Trow)
-
-  - Adapted for new ESearchBar. (Federico, Trow)
-
-  - Added the ability to create cards from anywhere in evolution.
-    (Lahey)
-
-  - Made searches for completion not use invalid cached data.  (Trow)
-
-  - Encode strings typed in by the user for use in sexps.  (Toshok)
-
-  - Made EContactEditor make the save button active more often.
-    (Toshok)
-
-  - Made ESelectNames handle LDAP storages.  (Toshok)
-
-  - Added full country list to addressbook full address editor.
-    (Lahey)
-
-  - Added the contact count to the folder bar.  (Lahey)
-
-  - Updated icons.  (Damon, Ettore)
-
-  - Worked on addressbook conduit.  (JP)
-
-  - Made ESelectNames only show names on the left that aren't on the
-    right.  (Trow)
-
-  - Fixed up minicard dragging.  (Toshok)
-
-My Evolution:
-
-  - Miscellaneous fixes all over the place. (iain)
-
-  - New icons. (Tuomas and Jakub)
-
-  - Works for people whos text colour was a light colour. (iain)
-
-
-Version 0.12 (Beta 2), 2001-07-31
----------------------------------
-
-Shell:
-
-  - Change the name of the local storage node from "local" to "Local
-    Folders".  (Jason)
-
-  - Fixed a problem with invalid URIs crashing the shell.  (Jason)
-
-  - Hide internal folder types (like "vtrash") from user.  (Ettore)
-
-  - Fixed some crashes that could happen when creating folders.
-    (Ettore)
-
-  - Fixed the URIs for the installed manuals in the help menu.
-    (Ettore)
-
-  - Added a status bar to show components' tasks instead of using
-    pop-up progress dialogs.  (Ettore)
-
-  - Other miscellaneous bug and leak fixes.  (Jason, Ettore)
-
-  - Initialize GConf properly when GtkHTML is built with GConf
-    support.  (Frederic Crozat)
-
-  - Make the shortcut bar not change the current group when renaming
-    it.  (Jason)
-
-Mail:
-
-  - Use new shell ActivityClient interface for progress reporting so
-    the ongoing activities appear at the bottom of the window instead of
-    using a pop-up.  (Michael)
-
-  - "Remember this password" check box added.  (Peter, Jeff)
-
-  - UI for timespan editor cleaned up.  (Peter)
-
-  - UTF8 issues with PGP and mail display addressed.  (Jeff)
-
-  - Translate some more strings.  (Jeff, Zbigniew Chyla)
-
-  - Fix camel_session_*_timeout functions.  (Michael)
-
-  - Fix application/pgp handling.  (Jeff)
-
-  - Fix DnD with no messages selected.  (Jeff)
-
-  - Respect the GTK+ theme when generating the header in the mail
-    display.  (Jeff)
-
-  - Make the default date column smaller.  (Peter)
-
-  - Don't display "0 hidden" messages.  (Peter)
-
-  - 'q' now toggles the message (pre)view.  (Peter)
-
-  - Rename the "Date" column to "Sent".  (Peter)
-
-  - Fix saving of passwords (some passwords were being saved and
-    loaded under different URI's).  (Jeff)
-
-  - Enter now always open the message in a new window.  (Peter)
-
-  - Gray out unsupported authentication mechanisms.  (Jeff)
-
-  - Fix saving/loading of several preferences.  (Peter, Jason)
-
-  - Overwrite attachment files correctly.  (Jeff)
-
-  - Don't lose the selection when deleting the last message.  (Jason)
-
-  - Improve guessing of which address to use when replying.  (Jeff, Jason)
-
-  - If SSL isn't supported, indicate so.  (Peter)
-
-  - Improve handling of NoSelect IMAP folders.  (Peter)
-
-  - Add a browse button for local mailboxes.  (Jason)
-
-  - VTrash handling improvements.  (Jeff, Peter)
-
-  - Display "unsent" in outbox summary.  (Peter)
-
-  - Only have main view folder browsers save view settings.  (Peter)
-
-  - Fixes to POP3 cache.  (Jeff)
-
-  - Handle variants of charset names.  (Jeff)
-
-  - Progress reporting and optimizations for IMAP.  (Dan)
-
-  - Progress reporting for SMTP.  (Michel)
-
-  - Handle unencoded eight-bit headers.  (Jeff)
-
-  - Miscellaneous improvements to Camel backend.  (Michael, Jeff)
-
-  - Several crashes fixed.  (everyone)
-
-Addressbook:
-
-  - Fixed some warnings.  (Chris T.)
-
-  - I18n fixes.  (Zbigniew Chyla)
-
-  - Address quoting in composer bug fixed.  (Jon)
-
-  - Made it so that Other Contacts doesn't show up if you don't have
-    LDAP compiled in.  (Jason)
-
-  - Made it so that Other Contacts doesn't show up if you don't have
-    any LDAP servers configured.  (Jos Dehaes)
-
-  - General bug fixes.  (Chris T., Jon, Frederic Crozat, Jason,
-    JP, Ettore, Chris L.)
-
-  - Some LDAP cleanup.  (Chris T.)
-
-  - Crash fixes.  (Jon, Dan)
-
-  - Work on contact lists.  (Chris T., Jon)
-
-  - Made Contact Editor Save & Close button not active if nothing is
-    changed.  (Chris T.)
-
-  - Added accelerators to a few dialogs.  (Taylor Hayward)
-
-  - Made evolution-vcard-importer.c load the file into the correct directory.
-    (Iain)
-
-Calendar & Tasks:
-
-  - Show icons for categories.  (Rodrigo)
-
-  - Multiple selections for cut/copy/paste in task list.  (Rodrigo)
-
-  - Added missing underlined shortcuts for dialogs.  (Taylor)
-
-  - Many timezone-related fixes.  (Damon, Federico)
-
-  - Alarm notification dialogs.  (Federico)
-
-  - iTIP and iMIP ongoing work.  (JP)
-
-  - Consistency & cosmetic fixes for dialogs and menus.  (Damon,
-    Federico)
-
-  - You can now create new calendar/tasks folders in the shell.
-    (Ettore)
-
-  - Printing fixes.  (Damon)
-
-  - Added a search bar for tasks folders.  (Federico)
-
-  - The task pad in the day view is now filtered as well.  (Federico)
-
-  - Timezone support for conduits.  (JP)
-
-  - General bug fixes.  (Federico, JP, Damon, Rodrigo)
-
-My Evolution:
-
-  - Removed the wipe trackers option.  (Iain)
-
-  - Fix broken links in the Calendar.  (Iain)
-
-  - Added some more German cities.   (Iain)
-
-  - Fixed the New Feed button.  (Iain)
-
-  - Fixed the KDE and Newsforge urls.  (Iain and Jason)
-
-
-Version 0.11 (Beta 1), 2001-07-12
----------------------------------
-
-Shell:
-
-  - Drag and drop handling (Chris T.)
-
-  - Online/Offline operation (Ettore)
-
-  - Numerous code cleanups and bug fixes (Ettore & Jason)
-
-Mail:
-
-  - Added ability to specify a charset in the composer and for the 
-    Preview Pane.  (Jeff, Danw)
-
-  - Auto-save messages during composition and composer 
-    crash-recovery.  (Larry)
-
-  - Better signature file handling.  (Radek)
-
-  - File->Insert menu.  (Larry)
-
-  - Address-completion in the composer.  (Trow)
-
-  - Much improved PGP/GPG.  (Jeff)
-
-  - Cut/Copy/Paste and Drag & Drop.  (Jeff)
-
-  - Disconnected IMAP, IMAP filtering, and other IMAP improvements. (Danw)
-
-  - Empty Trash On Exit.  (Jeff)
-
-  - More informative Folder message counts (new/hidden/total).  (Peter)
-
-  - Implemented "Select Thread".  (Peter)
-
-  - Movemail fixes and improvements.  (Michael)
-
-  - Improved/Configurable Forward/Reply functionality.  (Jeff, Trow, Danw)
-
-  - Improved Message browser window.  (Jeff, Peter)
-
-  - Load HTML images Sometimes/Always/Never.  (Danw)
-
-  - rfc2184 conformance.  (Jeff)
-
-  - Online/Offline modes.  (Ettore, Danw, Jeff)
-
-  - HTML indexing.  (Michael)
-
-  - Spool providers.  (Michael)
-
-  - Many i18n fixes. (Jeff, Trow, Larry, Michael)
-
-  - Fixed saving of html signature preferences. (Peter)
-
-  - Cleaned up exiting by having remote stores sync folders (Peter)
-
-  - Attached binhex files do not cause infinite loops (Peter)
-
-  - Don't send BCC headers when sending via SMTP (Peter)
-
-  - Let you show and hide attached message/rfc822's (Peter)
-
-  - Implemented Create/Remove/Move Folder. (Jason, Jeff)
-
-  - Maildir fixes and improvments, support for subdirectories. (Michael)
-
-  - Progress reporting using via shell activity interface. (Michael)
-
-  - Many bug fixes all around.  (Michael, Jeff, Danw, Peter, Trow and others)
-
-Addressbook:
-
-  - Cut/Copy/Paste (Chris T.)
-
-  - Improvements to address completion, matching and merging (Jon, Chris L.)
-
-  - LDAP improvements (Chris T.)
-
-  - Numerous bug fixing (Jon, Chris L., Chris T.)
-
-Calendar & Tasks:
-
-  - Timezone support (Damon)
-
-  - Cut/Copy/Paste (Rodrigo)
-
-  - Event/Task editor rewrite (Federico & JP)
-
-  - Improved Printing (Damon)
-
-  - Itip/Imip improvements (JP)
-
-Importers: 
-
-  - Fixes, bug fixes and more fixes. (Iain & Jason)
-
-General:
-
-  - New graphics/icons (Jakub & Tuomas)
-
-  - UI Improvements (Anna & Taylor)
-
-  - 'make distcheck' should hopefully be working again (Peter)
-
-  - Have 'make install' work for non-root users in Camel, albeit
-    with a large and important warning message (Peter)
-
-My Evolution:
-
-  - Completely new and prettier My Evolution (nee Executive Summary) 
-
-  - Pretty graphics (Jakub)
-
-  - Mail, Calendar and Task summaries to tell you what you need to do
-    today.
-
-  - Weather forecasts so you don't need to look out the window (I
-    dunno, hackers seem to dislike looking out the window or
-    something...)
-
-  - News feeds so you don't need to go to websites to see what news
-    articles you don't want to read.
-	
-  - Printing, you can print it out and make it look like you've got
-    lots of stuff to do when really you're just trying to pass the 
-    time by playing Aisleriot or GLine all day (Iain)
-
-
-Version 0.10 "Tasmanian Devil", 2001-04-26
-------------------------------------------
-
-Shell:
-
-  - Fixed some usability bugs in the folder selection and creation
-    dialogs.  (Ettore)
-
-  - Added a --debug option.  (Dan)
-
-  - Added support for drag and drop operations.  (Ettore)
-
-Mail: 
-
-  - SSL (S/IMAP, S/POP, and S/SMTP).  (Jeff)
-
-  - Virtual Trash folders in each mail storage and "Empty Trash" menu
-    item to expunge all folders in a store.  (Jeff)
-
-  - Email addresses in mail headers are now right-clickable to add
-    them to the Addressbook (Jon, Radek)
-
-  - Hide deleted messages is now a mode rather than a one-time
-    operation. (Michael)
-
-  - When sending plain text mail, use the new plain text mode of the
-    GtkHTML editor (Larry)
-
-  - Cancellable operations, cancellable/async dns lookup, slightly
-    improved progress reporting.  (Michael)
-
-  - Allow per-identity Draft and Sent folders.  (Dan)
-
-  - Replies quoted with "> " in messages are now displayed dimmed to
-    make it easier to find the new bits of text. (Radek)
-
-  - Saved searches.  Searches now configurable via XML with supporting
-    C code.  (Michael)
-
-  - UNMATCHED vFolder (shows all messages that are in no other
-    vFolder). (Michael)
-
-  - SASL Authentication (Kerberos4, DIGEST-MD5, CRAM-MD5, PLAIN,
-    LOGIN, ANONYMOUS) for IMAP and SMTP (haven't done POP yet)
-    (Jeff, Dan)
-
-  - Filter/vFolder on Mailing List.  (Michael)
-
-  - Resend sent items.  (Jeff)
-
-  - Allow users to turn on/off headers in the composer and added
-    Reply-To header entry in the composer.  (Miguel, Jeff)
-
-  - Numerous OpenPGP (PGP/MIME) fixes.  (Jeff)
-
-  - Replying to a message chooses account based on message
-    addressee's.  (Jeff)
-
-  - Redid Forward Inline and Forward Quoted.  (Jeff)
-
-  - IMAP fixes: greater configurability for faster startup/mail check
-    (Dan), folders should now notice new messages when you switch to
-    them (Dan), copying/moving many messages at once should be much
-    faster (Jeff), better support for old IMAP servers (Dan)
-
-  - IMAP message bodies are now cached to local disk to speed up
-    re-access (Dan)
-
-  - New config dialogs (last time!) (Anna, Dan)
-
-  - Sorting by a text field in the message list no longer generates a
-    random order. (Michael)
-
-  - Fixed "crash when getting new mail from 2 POP servers" bug. (Dan)
-
-  - Numerous bugfixes, cleanups and optimisations. (Everyone)
-
-Addressbook:
-
-  - Added support for non editable sources.  (Toshok)
-
-  - Added address completion for use in contact entries using the
-    select names system.  (Jon Trowbridge)
-
-  - Fixed some major crashes in the addressbook backend.  (Clahey)
-
-  - Updated Ximian's contact information.  (Jason Leach)
-
-  - Finished LDAP support.  (Toshok)
-
-Calendar:
-
-  - Event creation fixes.  (Miguel)
-
-  - Calendar loading fixes and removal of old code.  (Federico)
-
-  - Made the iTIP control have better spacings.  (Anna)
-
-  - i18n fixes.  (Kjartan)
-
-Tasks:
-
-  - Created a popup list item for ETable to select the Status,
-    Classification, Priority, Percent & Transparencey fields.  (Damon)
-
-  - Created a popup date editor item for ETable to set all the dates in the
-    tasks.  (Damon)
-
-Importers: 
-
-  - Created Intelligent Importers that look for certain files on your disk
-    and works out what type of data it is. Currently Intelligent Importers
-    exist for Pine, Elm and Netscape. (Iain)
-
-General:
-
-  - Rewrote ETree in gal.  Changed evolution to support the changes in
-    API.  (Clahey)
-
-  - Lots of Etable/ETree bug fixes.  (Clahey)
-
-  - Lots of i18n/l10n fixes.  (Kjartan Maraas, Gedeminas Paulauskas,
-    and the Evolution gang)
-
-  - Fixed the shell interface so it could correctly create folders. (Iain)
-
-
-Version 0.9 "Platypus", 2001-03-12
-----------------------------------
-
-Shell:
-
-  - Importing framework.  (Iain)
-
-  - Made the splash screen a regular window.  (Miguel)
-
-  - Added a menu item to hide the shortcut bar to the shortuct bar
-    right-click menu.  (Jason)
-
-  - Update the shortcut labels to contain the number of unread
-    messages as well.  (Jason)
-
-  - Pre-select a newly created folder in the folder selection dialog.
-    (Ettore)
-
-Mail:
-
-  - GPG/PGP support is now mostly working and sort of configurable.
-    Except that the pretty pictures are missing.  (Jeff)
-
-  - Exciting new configuration druid (Anna, Jeff) and configuration
-    editor-of-the-month (Jeff). You can now have multiple identities
-    that use different transports.  (Jeff)
-
-  - The folder-tree unread message counts now work much better. But
-    vfolders only display their unread message counts *after you've
-    looked at the folder for the first time*.  (Dan)
-
-  - New mail send/receive stuff with status dialog.  (NotZed)
-
-  - "Stop" button and support for cancelling operations.  (NotZed)
-
-  - Various fixes involving IMAP folders and subscriptions.  (Dan)
-
-  - Fake messages to root threads in the message list are now gone.  (NotZed)
-
-  - NNTP support is no longer configured by default, as this code is
-    not expected to be completed by 1.0.
-
-  - Interface for hiding messages matching certain criteria.  (NotZed)
-
-  - Quick search bar now includes "Sender contains" option (Tuomas? Eek!)
-
-  - The mailer now properly launches "gnome_segv" when it crashes. I
-    mean, if it were to crash.  (Dan)
-
-  - IMAP attachments are now not loaded unless you look at them.  (Dan)
-
-  - The X-Mailer header can now include a compile-time-specified
-    string (for specifying package version, etc).  (Dan)
-
-  - The Date header in the message list now formats dates differently
-    depending on how long ago they are.  (Chris)
-
-  - The composer doesn't ask if you want to save before closing if you
-    haven't changed anything. Also, it has more useful window titles
-    (Jason Leach) And you can now turn off the "are you sure you
-    didn't mean to enter a subject?" dialog box.  (Jeff)
-
-  - The "Menu" key on a Windows keyboard (the one with the picture of
-    a pop-up menu) now pops up the message list right-click menu.
-    (Dan)
-
-  - Lots of internal stuff that doesn't much affect the user-visible
-    functionality, particularly involving multithreading, message
-    threading, filters/searching, and regression testing.  (NotZed)
-
-  - Importers for Outlook Express 4 and mbox (used by most mailers like
-    Netscape, Pine, Elm, Eudora) (Iain & Jeff)
-
-Addressbook:
-
-  - Fixed crashing bug on PPC.  (Clahey)
-
-  - Updated to work with both OpenLDAP 1 and OpenLDAP 2.  (Toshok)
-
-  - Added configuration dialog for LDAP.  (Toshok)
-
-  - Plenty of bug fixes.  (Clahey, Toshok, Meeks, JP, Larry, Jason,
-    Federico, Dan, Zucchi, Gediminas Paulauskas, Ettore)
-
-  - Moved category dialog to gal.  (JP)
-
-  - Worked on LDAP authentication.  (Toshok)
-
-  - Worked on status messages.  (Toshok)
-
-  - Worked on GalView stuff.  (Clahey)
-
-  - Improved the select names dialog GUI.  (Clahey)
-
-Calendar:
-
-  - New "go to date" dialog.  (JP)
-
-  - Categories support for appointments.  (JP)
-
-  - New alarms page in event editor.  (Anna, JP)
-
-  - Weekday picker now follows the week start setting.  (Federico)
-
-  - Date-editing widgets are more consistent with each other.
-    (Federico)
-
-  - Colorization fixes to the views.  (Damon)
-
-  - Optimizations to the views.  (Damon)
-
-  - New, simpler loading interface for calendars in the Wombat.  (Federico)
-
-  - Removal of lots of old Gnomecal code.  (Federico, JP)
-
-  - Alarm instance generation support for the Wombat.  (Federico)
-
-  - Alarm trigger queueing for the GUI.  (Federico)
-
-  - More robust launching and registration of the components.  (Federico)
-
-  - More i18n friendliness.  (JP, Federico)
-
-  - Start of the alarm notification daemon.  (Federico)
-
-  - Cosmetic and focus fixes all over the place.  (Federico, JP)
-
-Tasks:
-
-  - New, stand-alone tasks component.  (Damon)
-
-  - Categories support.  (JP, Damon)
-
-  - Your old tasks are migrated automatically to the new tasks folder.
-    (Federico)
-
-  - You get asked for confirmation when trying to delete a task entry.
-    (Federico)
-
-Conduits:
-
-  - Many bug fixes and cleanups.  (JP)
-
-Executive Summary:
-
-  - Bugfixes and memory leaks removed.  (Iain)
-
-  - Calendar summary component.  (Iain)
-
-  - RDF Summary saves it's state.  (Iain)
-
-  - Mail summary shows vFolder summaries as well.  (Iain)
-
-  - User changable number of columns. (Iain)
-
-
-Version 0.8 "Archaeopteryx", 2000-12-14
----------------------------------------
-
-Shell:
-
-  - Added a `--no-splash' option.  (Ettore)
-
-  - Plugged a number of memory leaks.  (Federico)
-
-  - Added interfaces to display an arbitrary string associated with a
-    folder, and highlight it on demand.  (Ettore, Dan)
-
-  - Changed the Storage IDLs so that you can associate a physical URI
-    to the toplevel node as well.  (Ettore)
-
-  - If a shell is already running, `evolution' will just make it
-    create a new view instead of creating a new shell.  (Ettore)
-
-Mail:
-
-  Display:
-
-  - The folder tree now shows unread message counts for mail
-    folders. For local folders, this updates in real time.  For IMAP, it
-    only updates when you "Get Mail".  To be continued.  (Dan)
-
-  - New "important" column in the message list.  User-settable.  (Dan)
-
-  - The message list "Size" column now displays more prettily and
-    sorts correctly.  (Jeff)
-
-  - New command to view the raw source to a message.  (Jeff)
-
-  - More reliable MIME icon code in the mailer and the composer.
-    (Dan, Iain)
-
-  - Lots of internationalization fixes.  (Dan, Kjartan)
-
-  Composer / Outgoing mail
-
-  - Various fixes to use the best charset and MIME encoding for
-    outgoing messages.  (Michael, Jeff)
-
-  - You can now forward messages inline, instead of attaching them.
-    Forwarding multiple messages now results in a multipart/digest
-    attachment.  (Jeff)
-
-  - Replies are now preceded by "On DATE, PERSON wrote:" (Jeff)
-
-  - Better reply editing, automagically sets indentation and paragraph
-    style to Normal. (Radek)
-
-  - HTML signature support.  (Radek)
-
-  - Inline image support.  (Radek)
-
-  - Fixes for addresses with commas.  (Jeff, Michael)
-
-  - Fix to not allow attaching directories, devices, etc.
-    (Jeff)
-
-  - Fixed the sign of the GMT offset in generated Date headers. 
-    (Michael)
-
-  - Fixed a bug in base64 encoding.  (Michael)
-
-  - Fixed a problem in connecting to non-ESMTP SMTP servers.  (Jeff)
-
-  Miscellaneous Commands / Features:
-
-  - The mailer will now remember your passwords, if you configure
-    that option for a service.  (Dan)
-
-  - New "Apply Filters" command to apply filter rules to selected
-    messages.  (Jeff)
-
-  - No more "No new mail" dialog.  (Jeff)
-
-  - Individual messages can now be saved to disk.  (Jeff)
-
-  - Synced the Message menu with the right-click menu.  (Jeff)
-
-  - Mailer now uses the same search bar as the addressbook.  (Anna,
-    Chris, Jeff)
-
-  Filters:
-
-  - Now supports filtering on system flags (ie Answered, Seen,
-    Unseen).  (Jeff)
-
-  - Regular expression searches are now moved to their own Option
-    menu.  (Jeff)
-
-  - Allows regex searching on the entire message header.  (Jeff)
-
-  - Now has soundex filters (x sounds like y).  (Jeff)
-
-  IMAP:
-
-  - "Get Mail" now scans all folders.  (Dan)
-
-  - IMAP password dialog no longer pops up at startup: click on the
-    server in the folder tree to connect.  (Dan)
-
-  - Folder subscription support.  (Chris Toshok, Dan)
-
-  - Various IMAP folder naming fixes. (May fix Cyrus support) (Dan)
-
-  - Seen/deleted flags are preserved across "Get Mail".  (Jeff)
-
-  - Fixed a bug that could cause messages to be marked as seen
-    even when the UI thought they weren't.  (Dan)
-
-  - Fixes for IMAP folders with spaces in their names (again).
-    (Jeff)
-
-  - IMAP Kerberos 4 authentication support.  (Dan)
-
-  POP3:
-
-  - Fixed a bunch of error cases in POP3 connection.  (Dan)
-
-  - Fixed POP3 to more reliably delete messages when it was supposed
-    to be doing so.  (Dan)
-
-  Local mail:
-
-  - Major local mail rewrite that fixed memory leaks, reduced
-    memory consumption, improved efficiency, etc.  (Michael)
-
-  - Maildir support.  (Michael)
-
-  - Local mail folders are now locked (via dot locking and/or
-    fcntl/flock) while Evolution is modifying them, and it will
-    notice if they've changed while it's not looking. (Michael)
-
-Calendar:
-
-  - To-do and calendar conduits working except for extended
-    character support (ie accented chars) (JP)
-
-  - Updated wombat implementation of change reporting (JP)
-
-  - Majorly kick-ass new recurrence page in the event editor with an
-    easy UI, a preview of what will happen, and lots of love. (Anna)
-
-  - Imported a new libical with the APIs we require for alarms, the
-    start of the timezone code.  This may be the last Evolution
-    release that uses a CVS-imported libical; in the future we should
-    depend on official tarballs. (Federico)
-
-  - Event editor now deals gracefully with iCalendar recurrences we
-    cannot edit. (Federico)
-
-  - Plenty of fixes to the ETable calendar model for the task list
-    (Damon).
-
-  - The task list now saves its state, selected columns and sort order
-    (Damon).
-
-  - Lots of love to the iTIP engine and user interface.  Scheduling
-    appointments via email should be working fine, and they should
-    also work when you receive them. (Jesse)
-
-  - Lots of work on the calendar preferences code. (Damon)
-
-  - Many functional and cosmetic fixes to the day and week
-    views. (Damon)
-
-  - Event and task editors now ask if you try to close them without
-    saving changes. (Damon)
-
-  - You are now prompted if you are sure that you want to delete an
-    appointment. (Federico)
-
-  - Plenty of memory leaks fixed. (JP, Federico)
-
-  - Prettified the event editor a bit by making widget spacings
-    consistent. (Federico)
-
-  - Fixed semantics for handling exception dates (Federico)
-
-  - Some fixes to the recurrence instance generation engine. (Damon)
-
-  - Fixed insertion of new objects via notification into the task
-    list.  (JP, Federico)
-
-  - Misc. polishing for the event editor's innards. (Damon, Federico)
-
-  - Misc. cruft removal from old Gnomecal code (Federico, Miguel)
-
-  - Prettier icons for the task list. (Federico)
-
-Addressbook:
-
-  - Addressbook conduit now working, experimentally, except for
-    extended character support (ie accented chars.) (JP)
-
-  - Extended wombat functionality with getChanges call. (JP)
-
-  - Full name and address dialogs in contact editor fixed. (Chris)
-
-Executive Summary: (iain)
-
-  - Now compiled by default.
-
-  - Prettier default dialogs.
-
-  - Customisable background.
-
-  - RDF Summary, and Mail Summary components.
-
-  - Fixes and optimisations.
-
-  - Can restore state.
-
-Version 0.7, "Loch Ness Monster", ????
---------------------------------------
-
-There have been no verified sightings of this release.
-
-
-Version 0.6, "Procompsognathus", 2000-10-19
--------------------------------------------
-
-General:
-
-  - Split out lots of functionality to gal.  Evolution now depends on
-    gal. (Chris Lahey, Gal Team)
-
-Shell:
-
-  - Added a cute splash screen.  (Ettore, TigerT)
-
-  - Improved the way `~/evolution' is initialized the first time.
-    (Iain)
-
-  - Fixed the problem with the folder bar disappearing too son when
-    clicking on the scrollbar.  (Ettore)
-
-  - Updated to use the new toolbar and UI merging code from Bonobo.
-    (Michael Meeks, Ettore)
-
-Mail:
-
-  - Numerous i18n encoding, decoding, and display fixes. Non-ASCII
-    text should be displayed correctly in most context in the mailer
-    now. The composer no longer sends undeclared 8bit data. (Jeff)
-
-  - The IMAP provider now caches summary info between sessions, so
-    startup should be much faster for large folders. (Dan)
-
-  - Subscribe/unsubscribe UI for newsgroups. (IMAP subscriptions will
-    be supported in a later release.) NNTP authentication support.
-    Various other NNTP fixes. (Chris Toshok)
-
-  - New "full search" button to do more complicated searches. (NotZed)
-
-  - Composer attachment bar improvements. You can now drag files to
-    the composer window to attach them to the message. (Iain)
-
-  - Message list state (columns selected, sorting, etc) is now saved
-    between sessions. (NotZed)
-
-  - "Get Mail" now works for IMAP. IMAP mail no longer arrives
-    asynchronously (although if you delete mail from another client,
-    it will be deleted asynchronously). (Dan)
-
-  - Image attachments now use thumbnail images rather than a generic
-    image icon. (Iain)
-
-  - Various IMAP provider bugs (Dan, Jeff)
-
-  - Filter code cleanup/improvements. (NotZed) Filtering can read and
-    write message scores. (Jeff) On-demand filters no longer expunge
-    the source folder, and don't filter deleted messages. (Jeff)
-    Filters now log their actions. (Jeff)
-
-  - Drafts, Outbox, and Sent folders now default to showing "To"
-    instead of "From" in the header list. Messages output to the Sent
-    folder are marked as "Seen". "Send later" on a reply will mark the
-    message as having been replied to. (Jeff)
-
-  - Message list "attachment" column is now functional. The
-    read/unread state of a fake thread header now matches the state of
-    the thread. (NotZed) Message list sorting is more clever (Jeff)
-
-  - The "Print" toolbar button now opens a Print dialog rather than a
-    Print Preview window. (Miguel)
-
-  - New "Select All" command. "Mark all messages as seen" became "Mark
-    (selected) messages seen". (Jeff)
-
-Calendar:
-
-  - Improved todo list and calendar view gui (Damon)
-
-  - Printing works again (Federico)
-
-  - Config dialog improvement and implementation (Damon)
-
-  - Todo and calendar conduits working, except for archiving (JP)
-
-Addressbook:
-
-  - Lots of internal refactoring of addressbook, including changes due
-    to gal. (Chris, Chris)
-
-  - Lots of bug fixes. (Chris, Chris, Matt Bissiri, Iain, Dan)
-
-  - Added a working field to save whether the contact wants
-    HTML. (Chris Lahey)
-
-  - Added "Stop" and "View All" toolbar buttons. (Chris Lahey)
-
-  - Lots of work on modifiable LDAP. (Chris Toshok)
-
-  - Recognizes a lot more Prefixes and Suffixes when parsing names. (Nat)
-
-  - The card view doesn't write out cards unless they've changed. (Chris Lahey)
-
-  - New layout of address editor dialog. (Anna, Chris Lahey)
-
-Version 0.5.1, "Salamended", 2000-09-15
----------------------------------------
-
-General:
-
-  - Fixed a font-handling problem that would cause Evolution to crash
-    at startup with certain Gtk themes. (Chris)
-
-  - Fixed some build problems. (Chris)
-
-  - We no longer ship an out-of-date Red Hat-only RPM spec file.
-
-Shell:
-
-  - The shell now installs the `Sent' folder at startup if it doesn't
-    exist yet.  (Ettore)
-
-  - If a component crashes unexpectedly, the shell displays a dialog
-    box informing the user of that.  (Ettore)
-
-  - Fixed a bug in the folder selector dialog that would result in
-    crashes while trying to move messages in the mailer. (Dan)
-
-Addressbook:
-
-  - Fixed a bug that would cause the addressbook to crash when
-    embedded in the composer. (Dan)
-
-Mail:
-
-  - Fixed a display problem caused by expunging an IMAP folder. (Dan)
-
-  - Fixed POP mail so that "keep on server" is obeyed correctly. (Dan,
-    Jeff)
-
-  - Fixed replies so that replying to a message twice doesn't turn off
-    the "replied" flag. (Dan)
-
-  - Fixed a bug that prevented "Send later" from working. (Dan)
-
-
-Version 0.5, "Salamander", 2000-09-13
--------------------------------------
-
-Shell:
-
-  - Switched to using ETree for the folder view.  (Chris Toshok,
-    Ettore)
-
-  - Added interfaces to change the string displayed in the tree view
-    as the name of the folder.  (Ettore)
-
-Calendar:
-
-  - Uses only the new iCalendar standard internally; this means future
-    interoperability with new calendaring programs.  (JP, Federico)
-
-  - New ultra-cool date range selector, aka little calendar.  (Damon)
-
-  - Plenty of internal refactoring.  (JP, Damon, Federico)
-
-  - Pilot synch work, mostly on pcs infrastructure and some todo work (JP)
-    <EXPERIMENTAL>
-
-  - Pilot synch work, mostly on pcs infrastructure and some todo work (JP)
-    <EXPERIMENTAL>
-
-Addressbook:
-
-  - New advanced search dialog.  (Michael Zucchi, Chris Lahey)
-
-  - Added parsing of addresses.  (Jesse Pavel)
-
-  - Converted most of addressbook to UTF8.  (Lauris)
-
-Mailer:
-
-  - Filters (but not vfolders) are now more powerful: they can check
-    any message header, and can do regexp searches on the headers and
-    body.  (Jeff)
-
-  - A first draft of an automated mailing list recognizer
-    has been added.  (It will need more/better rules.)  (Ettore)
-
-  - Attachments are handled differently now.  All attachments always
-    have an icon and a header, and you can right-click on the icon to
-    view/hide, save, or launch an external viewer.  (Dan)
-
-  - It is no longer necessary to quit and restart after adding a new
-    IMAP server.  (Peter)
-
-  - Lots of i18n/charset fixing.  (Lauris)
-
-  - Shiny new toolbar icons.  (Tuomas)
-
-  - Giant menu reorganization. Most message operations are now in the
-    "Message" menu, and folder operations in the "Folder" menu.
-    (Ettore, Dan, Peter)
-
-  - "Mark as seen" timeout is now configurable. Mail view remembers
-    the location of the message list/message display split.  (Richard
-    Hult)
-
-  - New filter category: "On-demand", for filters to be applied
-    at arbitrary times rather than during mail incorporation.  (Peter)
-
-  - POP/IMAP config pages allow you to specify a port... this may
-    go away in a later release when we support ssl/ssh tunneling
-    directly.  (Peter)
-
-  - Reply To All will now remove your own addresses from the recipient
-    lists.  (Jesse Pavel)
-
-  - Folders are synced when you switch to another folder now.  (Dan)
-
-  - An IMAP bug that caused all messages to be marked as read before
-    they were read has been fixed.  (Dan)
-
-  - The IMAP provider is now more robust about dealing with other
-    concurrent IMAP clients.  (Jeff)
-
-  - POP and IMAP are better about when they do and don't try to
-    reconnect.  This was part of Camel operation cancellation support,
-    which unfortunately didn't make it into 0.5.  (Peter)
-
-  - Sent and Outbox folders are now functional.  You now have 2
-    options when sending a message - "Send Now" which will send the
-    message imediately and "Send Later" which will queue the message in
-    Outbox for later sending.  When a message is successfully sent, it
-    is copied to the Sent folder for your records.  (Jeff)
-
-ETable:
-
-  - ETree fixes.  (Chris Toshok)
-
-  - Lots of small usability fixes.  (Chris Lahey)
-
-  - Lots of grouping bug fixes.  Specifically, fixed crashes when
-    grouping in trees and made ETable not go crazy when you change
-    data and the table is grouped.  (Chris Lahey)
-
-  - Improved table printing when grouped.  (Chris Lahey)
-
-  - Converted most of ETable to UTF8.  (Lauris)
-
-
-Version 0.4, "Alewife", 2000-08-14
-----------------------------------
-
-Shell:
-
-  - Added interfaces to display messages and a progress bar when the
-    component is busy.  (Ettore)
-
-  - Changed the shell BonoboUIHandler code to allow placing menu items
-    such as "Print" in the right places.  (Ettore)
-
-  - Added code to check if an existing `~/evolution' directory
-    actually has the content we expect and, if not, complain to the
-    user.  (Dan)
-
-  - Fixed some Bonobo-related refcounting problems.  (Michael Meeks)
-
-  - Removed the GConf dependency.  (JP)
-
-  - Improved the API for the folder selection dialog.  (Ettore)
-
-  - Memory leak fixes.  (Peter)
-
-Calendar:
-
-  The calendar is in the middle of major rewrite. Evolution 0.4
-  ships with essentially the same calendar component as 0.3 did.
-
-Addressbook:
-
-  - More work on the Palm Pilot conduits.  (Chris Toshok)
-
-  - Fixed some LDAP-related crashes.  (Chris Toshok)
-
-  - Added support for displaying embedded vCards through a Bonobo
-    component.  (Chris Lahey)
-
-  - Added support for generic fields.  (Chris Lahey)
-
-  - Fixed the navigation order for the Tab key in the contact editor
-    window.  (Chris Lahey)
-
-  - Fixed some Bonobo-related bugs and crashes.  (Chris Lahey, Michael
-    Meeks)
-
-  - Only display entries that have an email address in the address
-    selector dialog.  (Chris Lahey)
-
-  - Added an utility program to import vCards from Gnomecard.  (Chris
-    Lahey)
-
-Mailer:
-
- Generic
-
-  - Long mailer operations (such as fetching new mail) now run
-    asynchronously rather than blocking the UI. This involved
-    a major rewrite of much of the Camel and mailer code.  (Peter)
-
-  - GPG/PGP message decryption support (Nathan Thompson-Amato, Dan)
-
-  - Unfinished messages in the composer can be saved to the "Drafts"
-    folder and finished later.  (Jeff)
-
-  - Double-clicking on a message in the message view now opens it in a
-    separate window.  (Jeff)
-
-  - vCards attached to messages now bring up a minicard view with a
-    button to add the vCard to the addressbook (Chris Lahey, Dan)
-
-  - Inline uuencoded/binhexed "attachment" support (Dan)
-
-  - "Mark All Messages Seen" command.  (Cody Russell)
-
- Filters / VFolders
-
-  - Major filter/vfolder dialog rewrite (Michael Zucchi) VFolders can
-    now search any (searchable) folder, not just Inbox.
-
-  - Auto-filter/auto-vfolder code (right click on a message in the
-    list and pick one of the options at the bottom of the menu to
-    create a filter/vfolder rule for similar messages).  (Michael)
-
-  - You can now set the color of messages in the message list, based
-    on filter rules.  (Local stores can also now store arbitrary user
-    flags, although there is not yet UI code to set/view them.)
-    (Michael)
-
-  - Added "Save" button to the quicksearch bar to save a search as a
-    vfolder.  (Michael)
-
- Configuration
-
-  - Major mail config dialog rewrite (JP).
-
-  - The mailer now remembers your threaded/unthreaded message view
-    setting between sessions.  (Jeremy Wise).
-
-  - Support for multiple identities (JP, Jeff), sources (JP, Peter), and
-    IMAP servers (JP, Dan)
-
- Providers
-
-  - You can now leave POP mail on the server. (This will [currently]
-    only work right with POP servers that support the UIDL command.
-    On other servers, it will never download some messages unless you
-    never delete mail.)
-
-  - There is now an MH-like local store available, and code to convert
-    a folder from one type to the other.  (Michael)
-
-  - The mbox provider now writes out "From " lines that are more
-    compatible with other mailers (like Mutt) that are picky about
-    their exact format.  (Michael)
-
-  - The IMAP provider now supports searching (Jeff). Also various
-    other speed/efficiency/robustness improvements (Jeff), and support
-    for old IMAP4 servers as well as IMAP4rev1 (Jon K Hellan).
-
-
-Version 0.3, "Jellyfish", 2000-07-21
-------------------------------------
-
-Shell:
-
-  - Pop-up folder selection.  (Ettore)
-
-  - Added support for multiple views.  (Ettore)
-
-  - Added support for saving component-specific settings, and
-    some initial code to save the view's configuration.
-    (Ettore)
-
-  - Fixed the Bonobo menu code so that it works with all the
-    locales.  (Ettore)
-
-Mailer:
-
-   - Lots of IMAP fixes.  (Jeff) 
-
-   - You can use an external setuid/setgid movemail program
-    (although we don't ship our own yet). If you have one
-    installed with emacs, the configure script will find
-    that. Otherwise, you can specify --with-movemail=/path.
-    (Dan)
-
-  - You can toggle HTML/plain text for an individual message
-    in the composer now.  (Ettore)
-
-  - Bonobo embedding sort of works again, but there are
-    problems with size allocation somewhere. Attachments can now
-    also be handled by external applications.  (Dan)
-
-  - text/plain mail is now line-wrapped in the mail display,
-    to deal with people who don't put newlines in their mail.
-    (Dan)
-
-  - Allow user to specify IMAP namespace in the mail config
-    dialog.  (Dan, Jeff)
-
-  - Quoted-printable encoder fixes.  (Michael Zucchi)
-
-  - Various NNTP fixes, include a news pane in the config
-    dialog.  (Chris Toshok)
-
-  - Some memory corruption fixes.  (Peter Williams)
-
-  - Fix for message not being re-drawn as deleted.  (Peter
-    Williams, Jeff)
-
-  - Moving a message to another folder copies the flags now
-    (Jeff)
-
-  - Close signature in HTML mail with </PRE>, not <PRE>, and
-    default to ~/.signature.  (Michael Meeks)
-
-  - Fixed some confusing behavior in the message threading
-    algorithm.  (Dan)
-
-  - Improvements to the item selection code.  (Chris Lahey)
-
-Calendar:
-
-  - Added support for a bunch of previously unsupported iCalendar
-    properties.  (Federico)
-
-  - Conduit for synchronizing the calendar with gnome-pilot
-    (requires gnome-pilot from CVS).  (Seth)
-
-  - ETable-based to-do list view ("taskpad"), for your viewing
-    pleasure.
-
-Addressbook:
-
-  - Conduit for synchronizing the addressbook with gnome-pilot
-    (requires gnome-pilot from CVS).  (Chris Toshok)
-
-  - Conduit for synchronizing the addressbook with gnome-pilot
-    (requires gnome-pilot from CVS).  (Chris Toshok)
-
-  - Fixed some random crashes.  (Chris Lahey)
-
-  - Implemented a vCard Bonobo control so that we can support
-    inline vCard viewing in the mailer.  (Chris Lahey)
-
-  - Quick search looks at both the name and the company name now.
-    (Chris Lahey)
-
-  - Added more functionality to the contact editor's toolbar.  (Chris
-    Lahey)
-
-  - Support for printing single cards.  (Chris Lahey)
-
-Version 0.2, "Saccharomyces", 2000-07-11
-----------------------------------------
-
-Shell:
-
-  * Folder selection dialog (Ettore).
-
-  * Folder creation dialog (Ettore).
-
-Addressbook:
-
-  * LDAP server configuration dialog (Chris Toshok).
-  
-  * Integration of LDAP servers in the shell's tree view (Chris Toshok).
-  
-  * ETable-based view (Chris Lahey).
-  
-  * Printing support for the ETable-based view (Chris Lahey).
-  
-  * Address selection dialog integrated with the message composer (Chris
-    Lahey).
-  
-  * Many miscellaneous bugs fixed (everyone).
-
-Calendar:
-
-  * Printing support (Michael, Federico).
-  
-  * Many, many behavior fixes and polishing to the day/week/month view
-    widgets (Damon).
-  
-  * New glade-based event editor.  This is unfinished but usable (Seth,
-    Federico).
-  
-  * Mouse wheel scrolling support (Anders).
-  
-  * We have an awesome new engine for computing recurring events
-    (Damon).  This will be plugged in to the new iCalendar code.
-  
-  * Internal and public API fixes (Federico, Seth).
-  
-  * Shell-related changes (Ettore).
-  
-  * Data model for ETable; this is not used yet (Federico).
-  
-  * New iCalendar support; this is not used yet (Federico).
-  
-  * Pilot syncing updates; this is not used yet (Seth).
-  
-  * Many miscellaneous bugs fixed (everyone).
-
-
-Mailer:
-
-  Major features:
-
-  * Basic IMAP support (Jeff)
-
-  * Threaded message view (Michael, Chris Toshok)
-
-  * Filters now work (original work by Michael, bugfixes by Dan)
-
-
-  Smaller features:
-
-  * Implemented moving messages between folders (Dan)
-
-  * Very basic printing support (Dan, but it was only like 5 lines
-    of code, because gnome-print kicks ass)
-
-  * "Delete", "Forward", and "Refile" operations now work on
-    multiple messages. (Chris Lahey, Peter Williams, Dan)
-
-  * Toggle read/unread flag when the user clicks on the envelope
-    icon (Chris Lahey, Dan).
-
-  * The "New folder" menu item now works (Ettore, Dan).
-
-  * The filter/vfolder druid now uses the new shell folder selection
-    UI (Michael)
-
-  * Added "Cc" to the set of filter/vfolderable headers and make the
-    filter/vfolder "messages to address" rule work with to or cc.
-    (Dan)
-
-  * New key bindings: "Delete" deletes the current message and jumps
-    to the next undeleted message. "N" and "P" go to next/previous
-    unread message. (Dan)
-
-  * Keep asking for POP/IMAP password until the user gets it correct
-    or hits Cancel, and remember the result until the user exits (or
-    chooses "Forget Passwords"). (Dan, Jeff)
-
-  * Kludge Camel to output ISO-8859-1 instead of UTF-8, since
-    neither GtkHTML nor ETable supports UTF-8 still. (Dan)
-
-  * Use the gnome-vfs "sniff buffer" interface to try to identify
-    the MIME type of attachments without useful type information
-    (Dan)
-
-  * Allow saving drafts in the composer (Ettore)
-
-  * Added "Received date" header to the set of possible message list
-    headers. (Dan)
-
-  * Partial gladification of the config dialog (JP Rosevear)
-
-
-  Bug fixes:
-
-  * Message read/unread/deleted flags should now be saved reliably
-    when you exit, and summary should not be rebuilt when a rebuild
-    isn't needed. Expunging should work reliably (Dan, Ettore,
-    Jeff).
-
-  * Fix disappearing toolbar bug (Dan).
-
-  * Fixed a bug that made downloading of very large messages over
-    POP incredibly slow, and various other smaller POP bugs. (Dan)
-
-  * Fixed bugs that made large attachments sometimes get dropped and
-    small ones sometimes get truncated. (Dan)
-
-  * Fixed filter/vfolder "messages to address" rule to correctly
-    match "to" rather than "from". (Michael)
-
-  * Fix some text/plain formatting bugs in the composer. (Dan,
-    Ettore)
-
-  * Turn off search mode when getting new mail (to avoid corrupting
-    the display). Make "get mail" always put unfiltered mail into
-    Inbox rather than the current folder. (Dan)
-
-  * Fixed a bug that caused "Re:" to be prepended even to subjects
-    that started with "Re:" when replying. Added a default subject
-    to forwarded messages. (Dan)
-
-  * Make the "Attach" dialog in the composer remember the last
-    directory it was in. (Dan)
-
-  * Code to parse invalid date formats since some mailers generate
-    them... (Jeff)
-
-  * Fixed various small SMTP bugs (Jeff, Chris Lahey)
-
-  * Fixed some memory leaks (Peter, Jeff)
-
-  * Make replies use the text/plain part of a multipart/alternative
-    if the user configured plain text rather than HTML mail sending.
-    (Dan)
-
-  * Various config dialog fixes (Jeff)
-
-  * Partial filter/vfolder GUI facelift (Jacob)
diff --git a/README b/README
deleted file mode 100644
index 42f9923fea..0000000000
--- a/README
+++ /dev/null
@@ -1,170 +0,0 @@
-Evolution is the integrated mail, calendar and address book suite from
-the Evolution Team.
-
-See http://www.gnome.org/projects/evolution for more information.
-
-If you are using Evolution, you may wish to subscribe to the Evolution
-users mailing list.  If you are interested in contributing to
-development on it, you should certainly subscribe to the Evolution
-Hackers mailing list.  Visit
-
-	http://lists.ximian.com
-
-to subscribe or view archives of the Ximian mailing lists.
-
-If you are planning to work on any part of Evolution, please send mail
-to the mailing list first, to avoid duplicated effort (and to make
-sure that you aren't basing your work on interfaces that are expected
-to change).
-
-There is also a #evolution IRC channel on irc.gnome.org.
-
-Help for Evolution is available in the user manual (select "Help" from
-the menu after running the application), at the Novell knowledge base
-(http://support.novell.com), in the Evolution man page (run "man
-evolution" at the command line), and in the --help strings (run
-"evolution --help" at the command line).
-
-The rest of this file is dedicated to building Evolution.
-
-
-DEPENDENCIES
-------------
-
-In order to build Evolution you need to have the full set of GNOME 2.6
-(or greater) development libraries installed.
-
-GNOME 2.6 or greater comes with most of the modern distributions, so
-in most cases it should be enough to just install all the devel
-packages from your distribution.
-
-Please make sure you have the most recent versions of the libraries
-installed, since bugs in the libraries can cause bugs in Evolution.
-
-Additional dependencies, besides the stock GNOME libraries (the
-dependencies should be compiled in the order they are listed here):
-
-	* gnome-icon-theme 1.2.0 or later
-
-	* ORBit 2.9.8 or later
-
-	     ftp://ftp.gnome.org/pub/gnome/sources/libsoup
-	
-	* libsoup 2.2.1 or later
-
-	     ftp://ftp.gnome.org/pub/gnome/sources/libsoup
-
-	* evolution-data-server 1.1.1 or later
-
-	     ftp://ftp.gnome.org/pub/gnome/sources/evolution-data-server
-
-	* gtkhtml 3.5.0 or later
-
-	     ftp://ftp.gnome.org/pub/gnome/sources/gtkhtml
-
-	* gal 2.4.0 or later
-
-	     ftp://ftp.gnome.org/pub/gnome/sources/gal
-
-	* [Optional] Mozilla NSPR/NSS libraries
-
-	  These are needed if you want to compile Evolution with SSL and S/MIME
-	  support.
-
-	     http://www.mozilla.org/
-
-          Many distributions ship these as Mozilla development
-          packages.
-
-	* [Optional] gnome-pilot 2.0 or later
-
-	  This is only necessary if you want to be able to synchronize
-	  your Palm device with Evolution.
-
-	     ftp://ftp.gnome.org/pub/gnome/sources/gnome-pilot
-	     ftp://ftp.gnome.org/pub/gnome/sources/gnome-pilot-conduits
-
-	* [Optional] gnome-spell 1.0.1 or later
-
-	  This is only necessary if you want to have the spell
-	  checking functionality in Evolution's message composer.
-
-	     ftp://ftp.gnome.org/pub/gnome/sources/gnome-spell
-
-CONFIGURING EVOLUTION
----------------------
-
-First you have to decide whether you want to install Evolution (and
-its dependencies) into the same prefix as the rest of your GNOME
-install, or into a new prefix.
-
-Installing everything into the same prefix as the rest of your GNOME
-install will make it much easier to build and run programs, and easier
-to switch between using packages and building it yourself, but it may
-also make it harder to uninstall later.  Also, it increases the chance
-that something goes wrong and your GNOME installation gets ruined.
-
-If you want to install in a different prefix, you need to do the
-following things:
-
-	* Set the PKG_CONFIG_PATH environment variable to contain a
-          colon-separated list of all the pkg-config directories that
-          will be involved in the build.  This basically means a list
-          of $prefix/lib/pkgconfig directory names, where $prefix is
-          the prefix where a library is installed.
-
-	  For example, if you have GNOME installed in /usr and you
-          are installing Evolution and its dependencies in
-          /opt/evolution, you want to do something like the following
-          (assuming you are using Bash):
-
-	      export PKG_CONFIG_PATH=/usr/lib/pkgconfig:/opt/evolution/lib/pkgconfig
-
-	* Edit the bonobo-activation-config.xml file (which is
-          normally found in /etc/bonobo-activation/) to include the
-          location where you are installing Evolution.
-
-	  In the example given above (GNOME in /usr, Evolution and
-          dependencies in /opt/evolution), your
-          bonobo-activation-config.xml will have to look like this:
-
-	      <?xml version="1.0"?>
-	      <oafconfig>
-	        <searchpath>
-	          <item>/usr/lib/bonobo/servers</item>
-	          <item>/opt/evolution/lib/bonobo/servers</item>
-	        </searchpath>
-	      </oafconfig>
-
-	* Pass an appropriate --prefix parameter to the configure
-          scripts of Evolution and its dependencies, eg:
-
-	      ./configure --prefix=/opt/evolution
-
-More information on how to use the configure script is available in
-the INSTALL file which is part of the Evolution tarball.
-
-
-OPTIONAL FEATURES
------------------
-
-Some optional features can be enabled at compilation time by passing
-appropriate flags to the configure script:
-
-	* GNOME Pilot support.
-
-	  Assuming you have installed gnome-pilot, add the following
-	  options:
-
-	    --with-pisock=<prefix> --enable-pilot-conduits=yes
-
-	  Where <prefix> is the location where pilot-link (a package
-	  that gnome-pilot depends on) was installed.
-
-	* SSL support.
-
-	  Make sure you have Mozilla's NSS nad NSPR libraries
-	  installed and pass the following flag:
-
-	    --enable-nss
-
diff --git a/README.translators b/README.translators
deleted file mode 100644
index 6349fc1f8c..0000000000
--- a/README.translators
+++ /dev/null
@@ -1,9 +0,0 @@
-Evolution is translated like most GNOME projects, by updating the the
-.po files in evolution/po and by translating the help files in
-evolution/help/C and placing them in a locale specific dir, ie
-evolution/help/fr.  In addition, the default welcome message is in
-evolution/mail/default/C/Inbox and can be tranlated by translating the
-message in the file and also putting it in a locale specific dir, ie
-evolution/mail/default/fr/Inbox.  The file name 'Inbox' should not be
-changed, as this is an internally defined string (the name in the
-folder list will still be translated though).
diff --git a/a11y/.cvsignore b/a11y/.cvsignore
deleted file mode 100644
index 282522db03..0000000000
--- a/a11y/.cvsignore
+++ /dev/null
@@ -1,2 +0,0 @@
-Makefile
-Makefile.in
diff --git a/a11y/ChangeLog b/a11y/ChangeLog
deleted file mode 100644
index e9c173661d..0000000000
--- a/a11y/ChangeLog
+++ /dev/null
@@ -1,366 +0,0 @@
-2005-02-23  Li Yuan  <li.yuan@sun.com>
-
-	Fix for 72897 and 72797.
-	* ea-cell-table.c: 
-	(ea_cell_table_destroy): no need to output the information.
-	* widgets/ea-calendar-cell.c: 
-	(ea_calendar_cell_get_type): add instance init function.
-	(ea_calendar_cell_class_init): add ref_state_set function.
-	(ea_calendar_cell_init): instance init function.
-	(ea_calendar_cell_new): change the cell's role to ATK_ROLE_TABLE_CELL.
-	(ea_calendar_cell_ref_state_set): the ref_state_set function.
-	(atk_component_interface_init),
-	(component_interface_get_extents),
-	(component_interface_grab_focus): implement grab focus function.
-	* widgets/ea-calendar-cell.h:
-	add the state_set variable.
-	* widgets/ea-calendar-item.c: 
-	(ea_calendar_item_new): change the item's role to ATK_ROLE_CALENDAR.
-	no need to connect "selection_preview_changed" signal here.
-	(date_range_changed_cb): call ea_calendar_set_focus_object.
-	(ea_calendar_set_focus_object): make the "gail-focus-object" of the item
-	point to the focused cell.
-
-2005-02-21  Harry Lu <harry.lu@sun.com>
-
-	Fix for 72781
-
-	* addressbook/ea-minicard-view.c: (ea_minicard_view_new):
-	set the role to panel.
-	* addressbook/ea-minicard.c: (ea_minicard_new): ditto.
-
-2005-02-02  Harry Lu <harry.lu@sun.com>
-
-	Fix for 72088.
-
-	* calendar/ea-calendar.c: (gnome_calendar_a11y_init): force
-	loading some types so that we can use them.
-
-2005-02-01  Harry Lu <harry.lu@sun.com>
-
-	Fix for 71924, 71926, 71932 
-	Don't split sentences that need translation.
-	Also remove two useless variables.
-
-	* calendar/ea-cal-view-event.c: (ea_cal_view_event_get_name):
-	* calendar/ea-day-view.c: (ea_day_view_get_name):
-	* calendar/ea-week-view.c: (ea_week_view_get_name),
-	(ea_week_view_get_n_children):
-	* widgets/ea-calendar-item.c: (ea_calendar_item_get_name),
-	(e_calendar_item_get_offset_for_date):
-
-2005-01-31  Rodrigo Moya <rodrigo@novell.com>
-
-	Fixes #71929
-	
-	* calendar/ea-day-view.c (ea_day_view_get_name):
-	* calendar/ea-week-view.c (ea_week_view_get_name): don't use spaces
-	before colons.
-
-2005-01-28  Sivaiah Nallagatla <snallagatla@novell.com>
-
-	* addressbook/ea-minicard-view.c 
-	(ea_minicard_view_get_name) : fix a typo present
-	in the string too
-
-2005-01-28  Sivaiah Nallagatla <snallagatla@novell.com>
-
-	* addressbook/ea-minicard-view.c 
-	(ea_minicard_view_get_name) : use ngetext
-	instead of splitting the the sentence to take care
-	of different messages for plural vs singular case 
-	Fixes #61060
- 
-2005-01-15  JP Rosevear  <jpr@novell.com>
-
-	* calendar/ea-calendar-helpers.c
-	(ea_calendar_helpers_get_cal_view_from): use E_CALENDAR_VIEW, not
-	E_CAL_VIEW
-
-	Fixes #71306
-	
-	* calendar/Makefile.am: no need for any idl in this directory, it
-	was not used anywhere
-
-2005-01-04  Harry Lu  <harry.lu@sun.com>
-
-	* widgets/Makefile.am: add ea-combo-button.[ch] to Makefile.
-	* widgets/ea-combo-button.c:
-	* widgets/ea-combo-button.h: implement a11y object for e-combo-button.
-	* widgets/ea-widgets.c: (e_combo_button_a11y_init): set a11y factory.
-	* widgets/ea-widgets.h: add declaration.
-
-2004-12-09  Harry Lu  <harry.lu@sun.com>
-
-	Fix a warning.
-
-	* addressbook/ea-addressbook.c: (ea_addressbook_focus_watcher):
-	use object instead of ATK_OBJECT (minicard).
-
-2004-12-1   Hao Sheng <hao.sheng@sun.com>
-
-	* a11y/addressbook/ea-minicard.c:
-	(atk_action_interface_do_action): Change e_minicard_activiate_editor to
-	e_minicard_activate_editor.
-
-2004-11-08  Steven Zhang <steven.zhang@sun.com>
-
-	Implement accessible feature for e-minicard and e-mini-card-view.
-	Add get_n_children, ref_child, ref_state_set, atk_selection_interface,
-	and action_interface for ea-minicard-view and ea-minicard
-
-	*ea-minicard-view.c:
-	(ea_minicard_view_get_n_children),
-	(ea_minicard_view_ref_child),
-	(ea_minicard_view_ref_state_set),
-	(atk_selection_interface_init),
-	(selection_interface_add_selection),
-	(selection_interface_clear_selection),
-	(selection_interface_ref_selection),
-	(selection_interface_get_selection_count),
-	(selection_interface_is_child_selected),
-	(atk_action_interface_init),
-	(atk_action_interface_do_action),
-	(atk_action_interface_get_n_action),
-	(atk_action_interface_get_description),
-	(atk_action_interface_get_name).
-
-	*ea-minicard.c:
-	(ea_minicard_get_n_children),
-	(ea_minicard_ref_child),
-	(ea_minicard_ref_state_set),
-	(atk_action_interface_init),
-	(atk_action_interface_do_action),
-	(atk_action_interface_get_n_action),
-	(atk_action_interface_get_description),
-	(atk_action_interface_get_name).
-
-2004-11-01  Li Yuan  <li.yuan@sun.com>
-
-	* calendar/ea-day-view.c: (ea_day_view_get_name):
-	use ngettext for n_events.
-	* calendar/ea-week-view.c: (ea_week_view_get_name):
-	ditto.
-
-2004-10-26  Li Yuan  <li.yuan@sun.com>
-
-	* calendar/ea-day-view.c: (ea_day_view_get_name):
-	* calendar/ea-gnome-calendar.c:
-	(ea_gnome_calendar_get_label_description),
-	(ea_gcal_dates_change_cb):
-	* calendar/ea-gnome-calendar.h:
-	* calendar/ea-week-view.c: (ea_week_view_get_name):
-	for calendar_get_text_for_folder_bar_label has been removed form
-	calendar-commands.c, we implement it ourself.
-
-2004-09-23  Li Yuan  <li.yuan@sun.com>
-
-	* calendar/ea-cal-view-event.c: (ea_cal_view_event_get_type),
-	(ea_cal_view_event_get_name), (ea_cal_view_event_get_description):
-	Make accessibility name and description translatable.
-	(atk_action_interface_init), (ea_cal_view_event_do_action),
-	(ea_cal_view_event_get_n_actions),
-	(ea_cal_view_event_action_get_name):
-	Add action interface to ea-cal-view-event so that it can be 
-	UI grabbed by GOK.
-	* calendar/ea-cal-view.c:
-	Make accessibility name and description translatable.
-	* calendar/ea-day-view-cell.c: (ea_day_view_cell_new):
-	Change atk role of ea-day-view-cell from ATK_ROLE_TABLE_CELL 
-	to ATK_ROLE_UNKNOWN so that it can be UI grabbed by GOK.
-	(atk_component_interface_init), (component_interface_grab_focus):
-	Add a component interface function : grab_focus.
-	When grab focus, present the Evolution GUI to the front.
-	* calendar/ea-day-view-main-item.c:
-	(ea_day_view_main_item_get_description):
-	Make accessibility name and description translatable.
-	(ea_day_view_main_item_time_change_cb):
-	Notify the item_cell is selected.
-	* calendar/ea-day-view.c: (ea_day_view_get_name),
-	(ea_day_view_get_description):
-	Make accessibility name and description translatable.
-	* calendar/ea-gnome-calendar.c: (ea_gnome_calendar_get_name),
-	(ea_gnome_calendar_get_description), (ea_gnome_calendar_ref_child):
-	Make accessibility name and description translatable.
-	* calendar/ea-jump-button.c: (ea_jump_button_get_name),
-	(ea_jump_button_get_description):
-	Make accessibility name and description translatable.
-	* calendar/ea-week-view-cell.c: (ea_week_view_cell_get_name),
-	(atk_component_interface_init), (component_interface_get_extents),
-	(component_interface_grab_focus):
-	Add a component interface function : grab_focus.
-       	Add support for different week start days.
-	When grab focus, present the Evolutioon GUI to the front.
-	* calendar/ea-week-view-main-item.c: (ea_week_view_main_item_new):
-	Set the atk role to ATK_ROLE_TABLE.
-	(ea_week_view_main_item_get_description):
-	Make accessibility name and description translatable.
-	(ea_week_view_main_item_time_change_cb):
-	Notify the item_cell is selected.
-	* calendar/ea-week-view.c: (ea_week_view_get_name),
-	(ea_week_view_get_description):
-	Make accessibility name and description translatable.
-	* widgets/ea-calendar-cell.c: (ea_calendar_cell_new):
-	Change atk role of ea-calendar-cell from ATK_ROLE_TABLE_CELL 
-	to ATK_ROLE_UNKNOWN so that it can be UI grabbed by GOK.
-	* widgets/ea-calendar-item.c: (ea_calendar_item_class_init),
-	(ea_calendar_item_get_name), (ea_calendar_item_get_description):
-	Make accessibility name and description translatable.
-	(ea_calendar_item_ref_state_set),:
-	Implement ref_state_set so that ea-calendar-item can be UI 
-	grabbed by GOK.
-	(ea_calendar_item_destory_cell_data):
-	Fix a crash here.
-
-2004-04-29  Rodney Dawes  <dobey@ximian.com>
-
-	* calendar/Makefile.am (INCLUDES): Add $(top_srcdir)/widgets/misc
-	for the e-activity-handler.h stuff
-
-2004-04-22  Kidd Wang  <kidd.wang@sun.com>
-
-	* calendar/ea-week-view.c: (ea_week_view_get_n_children): If the
-	week view has no spans, there is no visible events in the view.
-
-2004-03-15  JP Rosevear  <jpr@ximian.com>
-
-	* calendar/ea-cal-view.h: fix include
-
-2003-03-15  Hao Sheng  <hao.sheng@sun.com>
-
-	* Contritbuted by Leon Zhang <leon.zhang@sun.com>
-	* Makefile.am: add directory addressbook.
-	* implement basic accessbility addressbook's minicard.
-	add new directory and Files below:
-		addressbook/
-		addressbook/Makefile.am
-		addressbook/ea-addressbook.c
-		addressbook/ea-addressbook-view.c
-		addressbook/ea-minicard.c
-		addressbook/ea-minicard-view.c
-		addressbook/ea-addressbook.h
-		addressbook/ea-addressbook-view.h
-		addressbook/ea-minicard.h
-		addressbook/ea-minicard-view.h
-
-2003-12-10  Bolian Yin <bolian.yin@sun.com>
-
-	* calendar/ea-cal-view-event.c (ea_cal_view_event_get_index_in_parent): corret index error in week view.
-	* calendar/ea-day-view-cell.c: impl. get_index_in_parent
-	* calendar/ea-day-view-main-item.c: emit signal "active-descendant-changed", fix error in selection_interface_ref_selection.
-	* widgets/ea-calendar-cell.c: impl. get_index_in_parent.
-	* widgets/ea-calendar-item.c: change signature of e_calendar_item_get_offset_for_date, emit signal "active-descendant-changed".
-
-2003-12-09  Andrew Wu <Yang.Wu@sun.com>
-
-	* calendar/Makefile.am: add entries for new source files
-	* calendar/ea-calendar-helpers.c: add cases for jump button.
-	* calendar/ea-calendar.c: add cases for week view and week view main item.
-	* calendar/ea-jump-button.c: new impl.
-	* calendar/ea-week-view-cell.c: new impl.
-	* calendar/ea-week-view-main-item.c: new impl.
-	* calendar/ea-week-view.c: add main item as first child.
-	
-2003-12-05  Bolian Yin <bolian.yin@sun.com>
-                                                                                
-        * calendar/ea-cal-view-event.c (ea_cal_view_event_new): shortcut when cal_view is NULL.
-        * calendar/ea-cal-view.c: Change an action name.
-        * calendar/ea-calendar.c (ea_calendar_focus_watcher): add check for event atk object.
-        * calendar/ea-week-view.c (ea_week_view_get_n_children): correct impl.
-          (get_visible_text_item_count): removed.
-                                                                                
-2003-12-06  JP Rosevear <jpr@ximian.com>
-
-	* */Makefile.am: Remove hard coded disable deprecated flags
-	
-2003-12-03  Ettore Perazzoli  <ettore@ximian.com>
-
-	* calendar/Makefile.am (SHELL_IDLS): Only get Evolution.idl.
-
-2003-11-11  Bolian Yin <bolian.yin@sun.com>
-                                                                                
-        Fixes #50538
-                                                                                
-        * new files:
-                widgets/ea-calendar-cell.[hc]
-                                                                                
-        * widgets/ea-calendar-item: impl. atk selection and atk table interface.        
-
-	* widgets/Makefile.am : use shared object library (.so)
-                                                                                
-2003-11-07  JP Rosevear <jpr@ximian.com>
-
-	* calendar/Makefile.am (INCLUDES): don't include toplevel libical
-	
-2003-11-07  JP Rosevear <jpr@ximian.com>
-
-	* Handle some more renaming
-	
-2003-11-07  JP Rosevear <jpr@ximian.com>
-
-	* Reflect renaming of ECalView to ECalendarView
-
-2003-11-04  Bolian Yin <bolian.yin@sun.com>
-
-	Fixes # 48509
-
-	* new files:
-		ea-cell-table.h ea-cell-table.c
-	* calendar/Makefile.am: add entries for new files
-	* calendar/New files added:
-		ea-day-view-main-item.c ea-day-view-main-item.h
-		ea-day-view-cell.c ea-day-view-cell.h
-	* Add debug info and remove some non-C99 compilers warnings.
-	* calendar/ea-cal-view: add action interface. 
-
-2003-10-09  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* calendar/Makefile.am: INCLUDE path fixes for changes made to
-	libical build.
-
-2003-08-27  Bolian Yin <bolian.yin@sun.com>
-
-	* Makefile.am: add widgets directory; move calendar idl stuff to
-	calendar directory; stop make a single shared lib for whole a11y
-	stuff.
-
-	* ea-factory.h: make factory macros available to GOBJECT
-
-	* calendar/Makefile.am: add calendar idl stuff
-
-	* calendar/ea-cal-view-event.c: add atkcomponent interface.
-
-	* calendar/ea-gnome-calendar.c (ea_gcal_switch_view_cb): add
-	details for "children_changed".
-
-	* new widgets directory for widgets a11y stuff, new files are:
-		widgets/Makefile.am, widgets/ea-calendar-item.c,
-		widgets/ea-calendar-item.h, widgets/ea-widgets.c,
-		widgets/ea-widgets.h
-
-2003-08-20  Rodrigo Moya <rodrigo@ximian.com>
-
-	* calendar/ea-cal-view-event.c (ea_cal_view_event_get_name):
-	adapted to changes in ECalViewEvent.
-
-2003-08-20  Bolian Yin <bolian.yin@sun.com>
-	setup the a11y directory for evolution accessibility work
-	New files are:
-		ChangeLog
-		ea-factory.h
-		Makefile.am
-		calendar/ea-calendar.c
-		calendar/ea-calendar.h
-		calendar/ea-calendar-helpers.c
-		calendar/ea-calendar-helpers.h
-		calendar/ea-cal-view.c
-		calendar/ea-cal-view.h
-		calendar/ea-cal-view-event.c
-		calendar/ea-cal-view-event.h
-		calendar/ea-day-view.c
-		calendar/ea-day-view.h
-		calendar/ea-week-view.c
-		calendar/ea-week-view.h
-		calendar/ea-gnome-calendar.c
-		calendar/ea-gnome-calendar.h
-		calendar/Makefile.am
diff --git a/a11y/Makefile.am b/a11y/Makefile.am
deleted file mode 100644
index c98e486e7f..0000000000
--- a/a11y/Makefile.am
+++ /dev/null
@@ -1,16 +0,0 @@
-SUBDIRS = . calendar widgets addressbook
-
-# for debug
-#A11Y_CFLAGS += -pedantic -ansi -DACC_DEBUG -Werror
-
-privlib_LTLIBRARIES = libevolution-a11y.la
-
-INCLUDES =                                              \
-        -I$(top_srcdir)/a11y                            \
-        $(A11Y_CFLAGS)
-
-libevolution_a11y_la_SOURCES = 		        \
-        ea-factory.h                            \
-        ea-cell-table.h                         \
-        ea-cell-table.c
-
diff --git a/a11y/addressbook/.cvsignore b/a11y/addressbook/.cvsignore
deleted file mode 100644
index 282522db03..0000000000
--- a/a11y/addressbook/.cvsignore
+++ /dev/null
@@ -1,2 +0,0 @@
-Makefile
-Makefile.in
diff --git a/a11y/addressbook/Makefile.am b/a11y/addressbook/Makefile.am
deleted file mode 100644
index dfabdf27ba..0000000000
--- a/a11y/addressbook/Makefile.am
+++ /dev/null
@@ -1,34 +0,0 @@
-privlib_LTLIBRARIES = libevolution-addressbook-a11y.la
-
-INCLUDES =						\
-	-DG_LOG_DOMAIN=\"evolution-a11y\"		\
-	-I$(top_srcdir)		                        \
-	-I$(top_srcdir)/a11y				\
-	-I$(top_srcdir)/a11y/addressbook		\
-	-I$(top_srcdir)/shell				\
-	-I$(top_srcdir)/addressbook			\
-	-I$(top_srcdir)/addressbook/gui			\
-	-I$(top_srcdir)/addressbook/gui/widgets		\
-	-I$(top_srcdir)/addressbook/gui/contact-editor	\
-	-I$(top_srcdir)/addressbook/backend             \
-	-I$(top_srcdir)/addressbook/backend/ebook       \
-	-DEVOLUTION_DATADIR=\""$(datadir)"\"		\
-	-DEVOLUTION_GLADEDIR=\""$(gladedir)"\"		\
-	-DEVOLUTION_ETSPECDIR=\""$(etspecdir)"\"	\
-	-DEVOLUTION_IMAGESDIR=\""$(imagesdir)"\"	\
-	-DEVOLUTION_GALVIEWSDIR=\""$(viewsdir)"\"	\
-	-DEVOLUTION_UIDIR=\""$(evolutionuidir)"\"	\
-	-DG_DISABLE_DEPRECATED				\
-	-DPREFIX=\""$(prefix)"\"			\
-	$(A11Y_CFLAGS)					\
-	$(EVOLUTION_ADDRESSBOOK_CFLAGS)
-
-libevolution_addressbook_a11y_la_SOURCES =		\
-			ea-minicard.c  			\
-			ea-minicard.h			\
-			ea-minicard-view.c		\
-			ea-minicard-view.h		\
-			ea-addressbook-view.c		\
-			ea-addressbook-view.h		\
-			ea-addressbook.c		\
-			ea-addressbook.h
diff --git a/a11y/addressbook/ea-addressbook-view.c b/a11y/addressbook/ea-addressbook-view.c
deleted file mode 100644
index 1d26767a79..0000000000
--- a/a11y/addressbook/ea-addressbook-view.c
+++ /dev/null
@@ -1,122 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-/* 
- * ea-addressbook-view.c
- * Copyright (C) 2000  Ximian, Inc.
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of version 2 of the GNU General Public
- * License as published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * General Public License for more details.
- *
- * You should have received a copy of the GNU General Public
- * License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
- *
- * Author:  Leon Zhang <leon.zhang@sun.com> Sun Microsystem Inc., 2003
- */
-
-#include <config.h>
-
-#include <libgnome/gnome-i18n.h>
-#include "ea-addressbook-view.h"
-
-static G_CONST_RETURN gchar* ea_ab_view_get_name (AtkObject *accessible);
-static G_CONST_RETURN gchar* ea_ab_view_get_description (AtkObject *accessible);
-
-static void ea_ab_view_class_init (EABViewClass *klass);
-
-static gpointer parent_class = NULL;
-
-GType
-ea_ab_view_get_type (void)
-{
-	static GType type = 0;
-	AtkObjectFactory *factory;
-	GTypeQuery query;
-	GType derived_atk_type;
-
-	if (!type) {
-		static  GTypeInfo tinfo =  {
-			sizeof (EABViewClass),
-			(GBaseInitFunc) NULL,  /* base_init */
-			(GBaseFinalizeFunc) NULL,  /* base_finalize */
-			(GClassInitFunc) ea_ab_view_class_init,
-			(GClassFinalizeFunc) NULL, /* class_finalize */
-			NULL,	/* class_data */
-			sizeof (EaABView),
-			0,	/* n_preallocs */
-			(GInstanceInitFunc) NULL, /* instance init */
-			NULL	/* value table */
-		};
-
-		/*
-		 * Figure out the size of the class and instance
-		 * we are run-time deriving from (GailWidget, in this case) */
-
-		factory = atk_registry_get_factory (atk_get_default_registry (),
-						    GTK_TYPE_EVENT_BOX);
-		derived_atk_type = atk_object_factory_get_accessible_type (factory);
-		g_type_query (derived_atk_type, &query);
-
-		tinfo.class_size = query.class_size;
-		tinfo.instance_size = query.instance_size;
-
-		type = g_type_register_static (derived_atk_type,
-						"EaABView", &tinfo, 0);
-	}
-
-	return type;
-}
-
-static void
-ea_ab_view_class_init (EABViewClass *klass)
-{
-	AtkObjectClass *class = ATK_OBJECT_CLASS (klass);
-
-	parent_class = g_type_class_peek_parent (klass);
-
-	class->get_name = ea_ab_view_get_name;
-	class->get_description = ea_ab_view_get_description;
-}
-
-static G_CONST_RETURN gchar*
-ea_ab_view_get_name (AtkObject *accessible)
-{
-	g_return_val_if_fail (EA_IS_AB_VIEW(accessible), NULL);
-	if (accessible->name)
-		return accessible->name;
-
-	return _("evolution addressbook");
-}
-
-static G_CONST_RETURN gchar*
-ea_ab_view_get_description (AtkObject *accessible)
-{
-	if (accessible->description)
-		return accessible->description;
-
-	return _("evolution addressbook");
-}
-
-AtkObject* 
-ea_ab_view_new (GObject *obj)
-{
-	GObject *object;
-	AtkObject *accessible;
-
-	g_return_val_if_fail(obj != NULL, NULL);
-	g_return_val_if_fail (E_IS_ADDRESSBOOK_VIEW(obj), NULL);
-
-	object = g_object_new (EA_TYPE_AB_VIEW, NULL);
-
-	accessible = ATK_OBJECT (object);
-	atk_object_initialize (accessible, obj);
-	accessible->role = ATK_ROLE_CANVAS;
-
-	return accessible;
-}
diff --git a/a11y/addressbook/ea-addressbook-view.h b/a11y/addressbook/ea-addressbook-view.h
deleted file mode 100644
index 94f6b2b452..0000000000
--- a/a11y/addressbook/ea-addressbook-view.h
+++ /dev/null
@@ -1,61 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-/* 
- * ea-addressbook_view.h
- * Copyright (C) 2000  Ximian, Inc.
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of version 2 of the GNU General Public
- * License as published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * General Public License for more details.
- *
- * You should have received a copy of the GNU General Public
- * License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
- *
- * Author: Leon Zhang <leon.zhang@sun.com> Sun Microsystem Inc., 2003
- */
-#ifndef __EA_ADDRESSBOOK_VIEW_H__
-#define __EA_ADDRESSBOOK_VIEW_H__
-
-#include <gtk/gtkaccessible.h>
-#include "e-addressbook-view.h"
-
-#ifdef __cplusplus
-extern "C" {
-#pragma }
-#endif /* __cplusplus */
-
-#define EA_TYPE_AB_VIEW			(ea_ab_view_get_type ())
-#define EA_AB_VIEW(obj)			(G_TYPE_CHECK_INSTANCE_CAST ((obj), EA_TYPE_AB_VIEW, EaABView))
-#define EA_AB_VIEW_CLASS(klass)		(G_TYPE_CHECK_CLASS_CAST ((klass), EA_TYPE_AB_VIEW, EaABViewClass))
-#define EA_IS_AB_VIEW(obj)		(G_TYPE_CHECK_INSTANCE_TYPE ((obj), EA_TYPE_AB_VIEW))
-#define EA_IS_AB_VIEW_CLASS(klass)	(G_TYPE_CHECK_CLASS_TYPE ((obj), EA_TYPE_AB_VIEW))
-
-typedef struct _EaABView       EaABView;
-typedef struct _EaABViewClass  EaABViewClass;
-
-struct _EaABView
-{
-	GtkAccessible parent;
-};
-
-
-struct _EaABViewClass
-{
-	GtkAccessibleClass parent_class;
-};
-
-GType ea_ab_view_get_type (void);
-AtkObject* ea_ab_view_new(GObject *obj);
-
-#ifdef __cplusplus
-}
-#endif /* __cplusplus */
-
-
-#endif /* __EA_ADDRESSBOOK_VIEW_H__ */
diff --git a/a11y/addressbook/ea-addressbook.c b/a11y/addressbook/ea-addressbook.c
deleted file mode 100644
index 1abe1f2a4d..0000000000
--- a/a11y/addressbook/ea-addressbook.c
+++ /dev/null
@@ -1,87 +0,0 @@
-/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-/* vim:expandtab:shiftwidth=8:tabstop=8:
- */
-/* Evolution Accessibility: ea-addressbook.c
- *
- * Copyright (C) 2003 Ximian, Inc.
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of version 2 of the GNU General Public
- * License as published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * General Public License for more details.
- *
- * You should have received a copy of the GNU General Public
- * License along with this program; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
- *
- * Author: Leon Zhang <leon.zhang@sun.com> Sun Microsystem Inc., 2003
- *
- */
-
-#include <gal/e-text/e-text.h>
-#include "ea-factory.h"
-#include "ea-addressbook.h"
-#include "addressbook/ea-minicard.h"
-#include "addressbook/ea-minicard-view.h"
-#include "addressbook/ea-addressbook-view.h"
-
-EA_FACTORY_GOBJECT (EA_TYPE_MINICARD, ea_minicard, ea_minicard_new);
-EA_FACTORY_GOBJECT (EA_TYPE_MINICARD_VIEW, ea_minicard_view, ea_minicard_view_new);
-EA_FACTORY_GOBJECT (EA_TYPE_AB_VIEW, ea_ab_view, ea_ab_view_new);
-
-static gboolean ea_addressbook_focus_watcher (GSignalInvocationHint *ihint,
-					      guint n_param_values,
-					      const GValue *param_values,
-					      gpointer data);
-
-void e_minicard_a11y_init (void)
-{
-	EA_SET_FACTORY (e_minicard_get_type (), ea_minicard);
-}
-
-void e_minicard_view_a11y_init (void)
-{
-	EA_SET_FACTORY (e_minicard_view_get_type (), ea_minicard_view);
-
-	if (atk_get_root ()) {
-		g_signal_add_emission_hook (g_signal_lookup ("event",
-					    e_minicard_get_type()),
-					    0, ea_addressbook_focus_watcher,
-					    NULL, (GDestroyNotify) NULL);
-	}
-}
-
-void eab_view_a11y_init (void)
-{
-	EA_SET_FACTORY (eab_view_get_type (), ea_ab_view);
-}
-
-gboolean
-ea_addressbook_focus_watcher (GSignalInvocationHint *ihint,
-			   guint n_param_values,
-			   const GValue *param_values,
-			   gpointer data)
-{
-	GObject *object;
-	GdkEvent *event;
-	AtkObject *ea_event = NULL;
-
-	object = g_value_get_object (param_values + 0);
-	event = g_value_get_boxed (param_values + 1);
-
-	if (E_IS_MINICARD (object)) {
-                GnomeCanvasItem *item = GNOME_CANVAS_ITEM (object);
-		ea_event = atk_gobject_accessible_for_object (object);
-		if (event->type == GDK_FOCUS_CHANGE) {
-			if ((event->focus_change.in) && (E_IS_MINICARD (item->canvas->focused_item)))
-				atk_focus_tracker_notify (ea_event);
-		}
-	}
-
-	return TRUE;
-}
diff --git a/a11y/addressbook/ea-addressbook.h b/a11y/addressbook/ea-addressbook.h
deleted file mode 100644
index 437d34f1cc..0000000000
--- a/a11y/addressbook/ea-addressbook.h
+++ /dev/null
@@ -1,36 +0,0 @@
-/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-/* vim:expandtab:shiftwidth=8:tabstop=8:
- */
-/* Evolution Accessibility: ea-addressbook.h
- *
- * Copyright (C) 2003 Ximian, Inc.
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of version 2 of the GNU General Public
- * License as published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * General Public License for more details.
- *
- * You should have received a copy of the GNU General Public
- * License along with this program; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
- *
- * Author: Leon Zhang <leon.zhang@sun.com> Sun Microsystem Inc., 2003
- *
- */
-
-/* Evolution Accessibility
-*/
-
-#ifndef _EA_ADDRESSBOOK_H__
-#define _EA_ADDRESSBOOK_H__
-
-void eab_view_a11y_init (void);
-void e_minicard_view_a11y_init (void);
-void e_minicard_a11y_init (void);
-
-#endif /* _EA_ADDRESSBOOK_H__ */
diff --git a/a11y/addressbook/ea-minicard-view.c b/a11y/addressbook/ea-minicard-view.c
deleted file mode 100644
index 1170448576..0000000000
--- a/a11y/addressbook/ea-minicard-view.c
+++ /dev/null
@@ -1,406 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-/* 
- * ea-minicard-view.c
- * Copyright (C) 2000  Ximian, Inc.
- * Author:  Leon Zhang < leon.zhang@sun.com> 
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of version 2 of the GNU General Public
- * License as published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * General Public License for more details.
- *
- * You should have received a copy of the GNU General Public
- * License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
- */
-
-#include <config.h>
-#include <libgnome/gnome-i18n.h>
-#include <string.h>
-#include <gtk/gtkaccessible.h>
-#include <glib/gstrfuncs.h>
-#include <libgnome/gnome-i18n.h>
-#include "ea-minicard.h"
-#include "ea-minicard-view.h"
-#include "eab-gui-util.h"
-#include "e-addressbook-view.h"
-
-static const char * action_name[] = {
-	N_("New Contact"),
-	N_("New Contact List")
-};
-
-
-static G_CONST_RETURN gchar* ea_minicard_view_get_name (AtkObject *accessible);
-static G_CONST_RETURN gchar* ea_minicard_view_get_description (AtkObject *accessible);
-
-static void ea_minicard_view_class_init (EaMinicardViewClass *klass);
-
-static gint ea_minicard_view_get_n_children (AtkObject *obj);
-static AtkObject *ea_minicard_view_ref_child (AtkObject *obj, gint i);
-
-static AtkStateSet *ea_minicard_view_ref_state_set(AtkObject *obj);
-
-static void atk_selection_interface_init (AtkSelectionIface *iface);
-static gboolean selection_interface_add_selection (AtkSelection *selection,
-						   gint i);
-static gboolean selection_interface_clear_selection (AtkSelection *selection);
-static AtkObject* selection_interface_ref_selection (AtkSelection *selection,
-						     gint i);
-static gint selection_interface_get_selection_count (AtkSelection *selection);
-static gboolean selection_interface_is_child_selected (AtkSelection *selection,
-						       gint i);
-
-static void atk_action_interface_init (AtkActionIface *iface);
-static gboolean atk_action_interface_do_action (AtkAction *iface, gint i);
-static gint atk_action_interface_get_n_action (AtkAction *iface);
-static G_CONST_RETURN gchar* atk_action_interface_get_description (AtkAction *iface, gint i);
-static G_CONST_RETURN gchar* atk_action_interface_get_name (AtkAction *iface, gint i);
-
-static gpointer parent_class = NULL;
-
-GType
-ea_minicard_view_get_type (void)
-{
-	static GType type = 0;
-	AtkObjectFactory *factory;
-	GTypeQuery query;
-	GType derived_atk_type;
-
-	if (!type) {
-		static  GTypeInfo tinfo =  {
-			sizeof (EaMinicardViewClass),
-			(GBaseInitFunc) NULL,  /* base_init */
-			(GBaseFinalizeFunc) NULL,  /* base_finalize */
-			(GClassInitFunc) ea_minicard_view_class_init,
-			(GClassFinalizeFunc) NULL, /* class_finalize */
-			NULL,	   /* class_data */
-			sizeof (EaMinicardView),
-			0,	     /* n_preallocs */
-			(GInstanceInitFunc) NULL, /* instance init */
-			NULL /* value table */
-		};
-
-		static const GInterfaceInfo atk_selection_info = {
-			(GInterfaceInitFunc) atk_selection_interface_init,
-			(GInterfaceFinalizeFunc) NULL,
-			NULL
-		};
-			
-		static const GInterfaceInfo atk_action_info = {
-			(GInterfaceInitFunc) atk_action_interface_init,
-			(GInterfaceFinalizeFunc) NULL,
-			NULL
-		};
-					
-		/*
-		 * Figure out the size of the class and instance
-		 * we are run-time deriving from (GailWidget, in this case) */
-
-		factory = atk_registry_get_factory (atk_get_default_registry (),
-							GNOME_TYPE_CANVAS_GROUP);
-		derived_atk_type = atk_object_factory_get_accessible_type (factory);
-		g_type_query (derived_atk_type, &query);
-
-		tinfo.class_size = query.class_size;
-		tinfo.instance_size = query.instance_size;
-
-		type = g_type_register_static (derived_atk_type,
-						"EaMinicardView", &tinfo, 0);
-		g_type_add_interface_static (type, ATK_TYPE_SELECTION,
-					     &atk_selection_info);
-		g_type_add_interface_static (type, ATK_TYPE_ACTION,
-					     &atk_action_info);
-		
-	}
-
-	return type;
-}
-
-static void
-ea_minicard_view_class_init (EaMinicardViewClass *klass)
-{
-	AtkObjectClass *class = ATK_OBJECT_CLASS (klass);
-
-	parent_class = g_type_class_peek_parent (klass);
-
-	class->get_name = ea_minicard_view_get_name;
-	class->get_description = ea_minicard_view_get_description;
-	class->ref_state_set = ea_minicard_view_ref_state_set;
-	class->get_n_children = ea_minicard_view_get_n_children;
-	class->ref_child = ea_minicard_view_ref_child;
-}
-
-static G_CONST_RETURN gchar*
-ea_minicard_view_get_name (AtkObject *accessible)
-{
-	EReflow *reflow;
-	gchar *string;
-	
-	g_return_val_if_fail (EA_IS_MINICARD_VIEW (accessible), NULL);
-
-	reflow = E_REFLOW(atk_gobject_accessible_get_object (ATK_GOBJECT_ACCESSIBLE (accessible)));
-
-	string = g_strdup_printf (ngettext ("current addressbook folder has %d card", 
-				   "current addressbook folder has %d cards", 
-				   reflow->count), reflow->count);
-	
-
-	ATK_OBJECT_CLASS (parent_class)->set_name (accessible, string);
-	g_free (string);
-	return accessible->name;
-}
-
-static G_CONST_RETURN gchar*
-ea_minicard_view_get_description (AtkObject *accessible)
-{
-	g_return_val_if_fail (EA_IS_MINICARD_VIEW(accessible), NULL);
-	if (accessible->description)
-		return accessible->description;
-
-	return _("evolution addressbook");
-}
-
-AtkObject* 
-ea_minicard_view_new (GObject *obj)
-{
-	GObject *object;
-	AtkObject *accessible;
-
-	g_return_val_if_fail (E_IS_MINICARD_VIEW(obj), NULL);
-	object = g_object_new (EA_TYPE_MINICARD_VIEW, NULL);
-	accessible = ATK_OBJECT (object);
-	atk_object_initialize (accessible, obj);
-	accessible->role = ATK_ROLE_PANEL;
-	return accessible;
-}
-
-static gint
-ea_minicard_view_get_n_children (AtkObject *accessible)
-{
-	EReflow *reflow;
-	
-	gint child_num = 0;
-	
-	g_return_val_if_fail (EA_IS_MINICARD_VIEW (accessible), -1);
-	
-	reflow = E_REFLOW (atk_gobject_accessible_get_object (ATK_GOBJECT_ACCESSIBLE(accessible)));
-
-	if (!reflow)
-		return -1;
-	
-	child_num = reflow->count;
-	
-	return child_num;
-}
-
-static AtkStateSet *ea_minicard_view_ref_state_set (AtkObject *obj)
-{
-	AtkStateSet *state_set = NULL;
-	GObject *gobj = NULL;
-	
-	state_set = ATK_OBJECT_CLASS (parent_class)->ref_state_set (obj);
-	if( !state_set )
-		return NULL;
-	gobj = atk_gobject_accessible_get_object (ATK_GOBJECT_ACCESSIBLE (obj));
-	if( !gobj )
-		return NULL;
-	
-	atk_state_set_add_state (state_set, ATK_STATE_ENABLED);
-	atk_state_set_add_state (state_set, ATK_STATE_SENSITIVE);
-	atk_state_set_add_state (state_set, ATK_STATE_SHOWING);
-
-	return state_set;
-}
-
-static AtkObject *
-ea_minicard_view_ref_child (AtkObject *accessible, gint index)
-{
-	EReflow *reflow;
-	gint child_num;
-	AtkObject *atk_object = NULL;
-	EMinicard *card = NULL;
-
-	g_return_val_if_fail (EA_IS_MINICARD_VIEW (accessible), NULL);
-	
-	child_num = atk_object_get_n_accessible_children (accessible);
-	if (child_num <= 0 || index < 0 || index >= child_num)
-		return NULL;
-	
-	reflow = E_REFLOW (atk_gobject_accessible_get_object (ATK_GOBJECT_ACCESSIBLE (accessible)));
-	if (!reflow)
-		return NULL;
-	if (!reflow->items )
-		return NULL;
-		/* a minicard */
-	if (index < child_num) {
-		card = E_MINICARD (reflow->items[index]);
-		atk_object = atk_gobject_accessible_for_object (G_OBJECT (card));
-	} else {
-		return NULL;
-	}
-
-	g_object_ref (atk_object);
-		return atk_object;
-}
-
-/* atkselection interface */
-
-static void
-atk_selection_interface_init (AtkSelectionIface *iface)
-{
-	g_return_if_fail (iface != NULL);
-
-	iface->add_selection = selection_interface_add_selection;
-	iface->clear_selection = selection_interface_clear_selection;
-	iface->ref_selection = selection_interface_ref_selection;
-	iface->get_selection_count = selection_interface_get_selection_count;
-	iface->is_child_selected = selection_interface_is_child_selected;
-}
-
-static gboolean
-selection_interface_add_selection (AtkSelection *selection, gint i)
-{
-	AtkGObjectAccessible *atk_gobj= NULL;
-	EReflow *reflow = NULL;
-	
-	atk_gobj = ATK_GOBJECT_ACCESSIBLE (selection);
-	reflow = E_REFLOW (atk_gobject_accessible_get_object (atk_gobj));
-	
-	if (!reflow)
-		return FALSE;
-	
-	selection_interface_clear_selection (selection);
-	e_selection_model_select_single_row (reflow->selection, i);
-
-	return TRUE;
-}
-
-static gboolean
-selection_interface_clear_selection (AtkSelection *selection)
-{
-	AtkGObjectAccessible *atk_gobj = NULL;
-	EReflow *reflow = NULL;
-
-	atk_gobj = ATK_GOBJECT_ACCESSIBLE (selection);
-	reflow = E_REFLOW(atk_gobject_accessible_get_object (atk_gobj));
-
-	if( !reflow )
-		return FALSE;
-	
-	e_selection_model_clear (reflow->selection);
-	
-	return TRUE;
-}
-
-static AtkObject*
-selection_interface_ref_selection (AtkSelection *selection, gint i)
-{
-	return ea_minicard_view_ref_child (ATK_OBJECT (selection), i);
-}
-
-static gint
-selection_interface_get_selection_count (AtkSelection *selection)
-{
-	AtkGObjectAccessible *atk_gobj = NULL;
-	EReflow *reflow = NULL;
-
-	atk_gobj = ATK_GOBJECT_ACCESSIBLE (selection);
-	reflow = E_REFLOW (atk_gobject_accessible_get_object (atk_gobj));
-
-	if (!reflow )
-		return FALSE;
-	
-	return e_selection_model_selected_count (reflow->selection);
-}
-
-static gboolean
-selection_interface_is_child_selected (AtkSelection *selection, gint i)
-{
-	AtkGObjectAccessible *atk_gobj = NULL;
-	EReflow *reflow = NULL;
-
-	atk_gobj = ATK_GOBJECT_ACCESSIBLE (selection);
-	reflow = E_REFLOW(atk_gobject_accessible_get_object (atk_gobj));
-
-	if( !reflow )
-		return FALSE;
-
-	return e_selection_model_is_row_selected (reflow->selection, i);
-}
-
-static void atk_action_interface_init (AtkActionIface *iface)
-{
-	g_return_if_fail (iface != NULL);
-
-	iface->do_action = atk_action_interface_do_action;
-	iface->get_n_actions = atk_action_interface_get_n_action;
-	iface->get_description = atk_action_interface_get_description;
-	iface->get_name = atk_action_interface_get_name;
-}
-
-static gboolean atk_action_interface_do_action (AtkAction *action, gint i)
-{
-	gboolean return_value = TRUE;
-	EMinicardView *card_view;
-	EContact *contact = e_contact_new();
-
-	AtkGObjectAccessible *atk_gobj= NULL;
-        EReflow *reflow = NULL;
-	EBook *book;
-
-	atk_gobj = ATK_GOBJECT_ACCESSIBLE (action);
-	reflow = E_REFLOW (atk_gobject_accessible_get_object (atk_gobj));
-
-	if (reflow == NULL)
-		return FALSE;
-
-	card_view = E_MINICARD_VIEW (reflow);
-	g_object_get(card_view,
-		     "book", &book,
-		     NULL);
-	g_assert (E_IS_BOOK (book));
-
-	switch (i) {
-		case 0:
-		/* New Contact */
-			eab_show_contact_editor (book, contact, TRUE, TRUE);
-			break;
-		case 1:
-		/* New Contact List */
-			eab_show_contact_list_editor (book, contact, TRUE, TRUE);
-			break;
-		default:
-                	return_value = FALSE;
-			break;
-	}
-	g_object_unref (book);
-	g_object_unref (contact);
-	return return_value;
-}
-
-static gint atk_action_interface_get_n_action (AtkAction *iface)
-{
-	return G_N_ELEMENTS (action_name);
-}
-
-static G_CONST_RETURN gchar*
-atk_action_interface_get_description (AtkAction *iface, gint i)
-{
-	return atk_action_interface_get_name (iface, i);
-}
-
-static G_CONST_RETURN gchar*
-atk_action_interface_get_name (AtkAction *iface, gint i)
-{
-	if( i >= G_N_ELEMENTS (action_name) || i < 0)
-		return NULL;
-
-	return action_name[i];
-}
-		
diff --git a/a11y/addressbook/ea-minicard-view.h b/a11y/addressbook/ea-minicard-view.h
deleted file mode 100644
index e983ae5229..0000000000
--- a/a11y/addressbook/ea-minicard-view.h
+++ /dev/null
@@ -1,62 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-/* 
- * ea-minicard-view.h
- * Copyright (C) 2000  Ximian, Inc.
- * Author: Leon Zhang <leon.zhang@sun.com> Sun Microsystem Inc., 2003
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of version 2 of the GNU General Public
- * License as published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * General Public License for more details.
- *
- * You should have received a copy of the GNU General Public
- * License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
- */
-#ifndef __EA_MINICARD_VIEW_H__
-#define __EA_MINICARD_VIEW_H__
-
-#include <atk/atkgobjectaccessible.h>
-#include "e-minicard-view.h"
-
-#ifdef __cplusplus
-extern "C" {
-#pragma }
-#endif /* __cplusplus */
-
-#define EA_TYPE_MINICARD_VIEW			(ea_minicard_view_get_type ())
-#define EA_MINICARD_VIEW(obj)			(G_TYPE_CHECK_INSTANCE_CAST ((obj), EA_TYPE_MINICARD_VIEW, EaMinicardView))
-#define EA_MINICARD_VIEW_CLASS(klass)		(G_TYPE_CHECK_CLASS_CAST ((klass), EA_TYPE_MINICARD_VIEW, EaMiniCardViewClass))
-#define EA_IS_MINICARD_VIEW(obj)		(G_TYPE_CHECK_INSTANCE_TYPE ((obj), EA_TYPE_MINICARD_VIEW))
-#define EA_IS_MINICARD_VIEW_CLASS(klass)	(G_TYPE_CHECK_CLASS_TYPE ((obj), EA_TYPE_MINICARD_VIEW))
-
-
-typedef struct _EaMinicardView       EaMinicardView;
-typedef struct _EaMinicardViewClass  EaMinicardViewClass;
-
-struct _EaMinicardView
-{
-	AtkGObjectAccessible parent;
-};
-
-
-struct _EaMinicardViewClass
-{
-	AtkGObjectAccessibleClass parent_class;
-};
-
-GType ea_minicard_view_get_type (void);
-
-AtkObject* ea_minicard_view_new(GObject *obj);
-
-#ifdef __cplusplus
-}
-#endif /* __cplusplus */
-
-
-#endif /* __EA_MINICARD_VIEW_H__ */
diff --git a/a11y/addressbook/ea-minicard.c b/a11y/addressbook/ea-minicard.c
deleted file mode 100644
index ec8b7f2056..0000000000
--- a/a11y/addressbook/ea-minicard.c
+++ /dev/null
@@ -1,269 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-/* 
- * ea-minicard.c
- * Copyright (C) 2000  Ximian, Inc.
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of version 2 of the GNU General Public
- * License as published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * General Public License for more details.
- *
- * You should have received a copy of the GNU General Public
- * License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
- *
- * Author:  Leon Zhang <leon.zhang@sun.com> Sun Microsystem Inc., 2003
- */
-
-#include <config.h>
-#include <string.h>
-#include <libgnome/gnome-i18n.h>
-#include "ea-minicard.h"
-#include "ea-minicard-view.h"
-#include "e-minicard.h"
-
-static const char * action_name[] = {
-	N_("Open")
-};
-
-static G_CONST_RETURN gchar* ea_minicard_get_name (AtkObject *accessible);
-static G_CONST_RETURN gchar* ea_minicard_get_description (AtkObject *accessible);
-
-static void ea_minicard_class_init (EaMinicardClass *klass);
-
-static gint ea_minicard_get_n_children (AtkObject *obj);
-static AtkObject* ea_minicard_ref_child(AtkObject *obj, gint i);
-
-static AtkStateSet *ea_minicard_ref_state_set (AtkObject *obj);
-
-static void atk_action_interface_init (AtkActionIface *iface);
-static gboolean atk_action_interface_do_action (AtkAction *iface, gint i);
-static gint atk_action_interface_get_n_action (AtkAction *iface);
-static G_CONST_RETURN gchar* atk_action_interface_get_description (AtkAction *iface, gint i);
-static G_CONST_RETURN gchar* atk_action_interface_get_name (AtkAction *iface, gint i);
-
-static gpointer parent_class = NULL;
-
-GType
-ea_minicard_get_type (void)
-{
-	static GType type = 0;
-	AtkObjectFactory *factory;
-	GTypeQuery query;
-	GType derived_atk_type;
-
-	if (!type) {
-		static  GTypeInfo tinfo =  {
-			sizeof (EaMinicardClass),
-			(GBaseInitFunc) NULL,  /* base_init */
-			(GBaseFinalizeFunc) NULL,  /* base_finalize */
-			(GClassInitFunc) ea_minicard_class_init,
-			(GClassFinalizeFunc) NULL, /* class_finalize */
-			NULL,	/* class_data */
-			sizeof (EaMinicard),
-			0,	/* n_preallocs */
-			(GInstanceInitFunc) NULL, /* instance init */
-			NULL	/* value table */
-		};
-
-		static const GInterfaceInfo atk_action_info = {
-			(GInterfaceInitFunc) atk_action_interface_init,
-			(GInterfaceFinalizeFunc) NULL,
-			NULL
-		};
-
-		/*
-		 * Figure out the size of the class and instance
-		 * we are run-time deriving from (GailWidget, in this case) 
-		 */
-
-		factory = atk_registry_get_factory (atk_get_default_registry (),
-						    GNOME_TYPE_CANVAS_GROUP);
-		derived_atk_type = atk_object_factory_get_accessible_type (factory);
-		g_type_query (derived_atk_type, &query);
-
-		tinfo.class_size = query.class_size;
-		tinfo.instance_size = query.instance_size;
-
-		type = g_type_register_static ( derived_atk_type,
-						"EaMinicard", &tinfo, 0);
-		g_type_add_interface_static (type, ATK_TYPE_ACTION,
-					     &atk_action_info);	
-	}
-
-	return type;
-}
-
-static void
-ea_minicard_class_init (EaMinicardClass *klass)
-{
-	AtkObjectClass *class = ATK_OBJECT_CLASS (klass);
-
-	parent_class = g_type_class_peek_parent (klass);
-
-	class->get_name = ea_minicard_get_name;
-	class->get_description = ea_minicard_get_description;
-	class->ref_state_set = ea_minicard_ref_state_set;
-	class->get_n_children = ea_minicard_get_n_children;
-	class->ref_child = ea_minicard_ref_child;
-}
-
-/*
- *  we access the main content of current minicard, including 
- *  header text, label(field, field name)
- */
-static G_CONST_RETURN gchar*
-ea_minicard_get_name (AtkObject *accessible)
-{
-#define BUFFERSIZE 500
-	
-	static gchar name[BUFFERSIZE];
-	GString *new_str = g_string_new (NULL);
-	gchar *string;
-	EMinicard *card;
-
-	g_return_val_if_fail (EA_IS_MINICARD(accessible), NULL);
-	memset (name, '\0', BUFFERSIZE);
-
-	card = E_MINICARD(atk_gobject_accessible_get_object 
-			 (ATK_GOBJECT_ACCESSIBLE(accessible)));
-	g_object_get (card->header_text, "text", &string, NULL);
-
-	if (e_contact_get (card->contact, E_CONTACT_IS_LIST))
-		g_string_append (new_str, _("Contact List: "));
-	else    g_string_append (new_str, _("Contact: "));
-	
-	/* get header of current card */
-	g_string_append (new_str, string);
-	g_free (string);
-
-	/* if there exist no enough space for remain info, return */
-	if (new_str->len >= BUFFERSIZE) {
-		strncpy (name, new_str->str, BUFFERSIZE);
-		return name;
-	}
-
-	strcpy (name, new_str->str);
-	g_string_free (new_str, TRUE);
-
-	ATK_OBJECT_CLASS (parent_class)->set_name (accessible, name);
-
-	return accessible->name;
-}
-
-static G_CONST_RETURN gchar*
-ea_minicard_get_description (AtkObject *accessible)
-{
-	if (accessible->description)
-		return accessible->description;
-
-	return _("evolution minicard");
-}
-
-AtkObject* 
-ea_minicard_new (GObject *obj)
-{
-	GObject *object;
-	AtkObject *accessible;
-
-	g_return_val_if_fail(obj != NULL, NULL);
-	g_return_val_if_fail (E_IS_MINICARD(obj), NULL);
-
-	object = g_object_new (EA_TYPE_MINICARD, NULL);
-	accessible = ATK_OBJECT (object);
-	atk_object_initialize (accessible, obj);
-
-	accessible->role = ATK_ROLE_PANEL;
-	return accessible;
-}
-
-static AtkStateSet *ea_minicard_ref_state_set (AtkObject *obj)
-{
-	AtkStateSet *state_set = NULL;
-	GObject *gobj = NULL;
-
-	state_set = ATK_OBJECT_CLASS (parent_class)->ref_state_set (obj);
-	if( !state_set )
-		return NULL;
-	gobj = atk_gobject_accessible_get_object (ATK_GOBJECT_ACCESSIBLE (obj));
-	if( !gobj )
-		return NULL;
-
-	atk_state_set_add_state (state_set, ATK_STATE_SELECTABLE);
-	atk_state_set_add_state (state_set, ATK_STATE_ENABLED);
-	atk_state_set_add_state (state_set, ATK_STATE_SENSITIVE);
-	atk_state_set_add_state (state_set, ATK_STATE_SHOWING);
-
-	return state_set;
-}
-
-static gint
-ea_minicard_get_n_children (AtkObject *accessible)
-{
-	return 0;
-}
-
-static AtkObject *
-ea_minicard_ref_child (AtkObject *accessible, gint index)
-{
-	return NULL;
-}
-
-static void atk_action_interface_init (AtkActionIface *iface)
-{
-	g_return_if_fail (iface != NULL);
-
-	iface->do_action = atk_action_interface_do_action;
-	iface->get_n_actions = atk_action_interface_get_n_action;
-	iface->get_description = atk_action_interface_get_description;
-	iface->get_name = atk_action_interface_get_name;
-}
-
-static gboolean atk_action_interface_do_action (AtkAction *iface, gint i)
-{
-	EMinicard *minicard = NULL;
-
-	minicard = E_MINICARD (atk_gobject_accessible_get_object (ATK_GOBJECT_ACCESSIBLE (iface)));
-	if( minicard == NULL )
-		return FALSE;
-
-	if( i >= G_N_ELEMENTS (action_name) || i < 0 )
-		return FALSE;
-
-	switch (i) {
-		// open card
-		case 0:
-			e_minicard_activate_editor (minicard);
-			break;
-		default:
-			return FALSE;
-	}
-
-	return TRUE;
-}
-
-static gint atk_action_interface_get_n_action (AtkAction *iface)
-{
-	return G_N_ELEMENTS (action_name);
-}
-
-static G_CONST_RETURN gchar*
-atk_action_interface_get_description (AtkAction *iface, gint i)
-{
-	return atk_action_interface_get_name (iface, i);
-}
-
-static G_CONST_RETURN gchar*
-atk_action_interface_get_name (AtkAction *iface, gint i)
-{
-	if( i >= G_N_ELEMENTS (action_name) || i < 0)
-		return NULL;
-	
-	return action_name[i];
-}
-		
diff --git a/a11y/addressbook/ea-minicard.h b/a11y/addressbook/ea-minicard.h
deleted file mode 100644
index 1b09ec6839..0000000000
--- a/a11y/addressbook/ea-minicard.h
+++ /dev/null
@@ -1,62 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-/* 
- * ea-minicard.h
- * Copyright (C) 2000  Ximian, Inc.
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of version 2 of the GNU General Public
- * License as published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * General Public License for more details.
- *
- * You should have received a copy of the GNU General Public
- * License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
- * 
- * Author: Leon Zhang <leon.zhang@sun.com> Sun Microsystem Inc., 2003
- */
-#ifndef __EA_MINICARD_H__
-#define __EA_MINICARD_H__
-
-#include <atk/atkgobjectaccessible.h>
-#include "e-minicard.h"
-#include "e-minicard-label.h"
-
-#ifdef __cplusplus
-extern "C" {
-#pragma }
-#endif /* __cplusplus */
-
-#define EA_TYPE_MINICARD			(ea_minicard_get_type ())
-#define EA_MINICARD(obj)			(G_TYPE_CHECK_INSTANCE_CAST ((obj), EA_TYPE_MINICARD, EaMinicard))
-#define EA_MINICARD_CLASS(klass)		(G_TYPE_CHECK_CLASS_CAST ((klass), EA_TYPE_MINICARD, EaMiniCardClass))
-#define EA_IS_MINICARD(obj)			(G_TYPE_CHECK_INSTANCE_TYPE ((obj), EA_TYPE_MINICARD))
-#define EA_IS_MINICARD_CLASS(klass)		(G_TYPE_CHECK_CLASS_TYPE ((obj), EA_TYPE_MINICARD))
-
-typedef struct _EaMinicard       EaMinicard;
-typedef struct _EaMinicardClass  EaMinicardClass;
-
-struct _EaMinicard
-{
-	AtkGObjectAccessible parent;
-};
-
-
-struct _EaMinicardClass
-{
-	AtkGObjectAccessibleClass parent_class;
-};
-
-GType ea_minicard_get_type (void);
-AtkObject* ea_minicard_new(GObject *obj);
-
-#ifdef __cplusplus
-}
-#endif /* __cplusplus */
-
-
-#endif /* __EA_MINICARD_H__ */
diff --git a/a11y/calendar/.cvsignore b/a11y/calendar/.cvsignore
deleted file mode 100644
index 0e1e389af7..0000000000
--- a/a11y/calendar/.cvsignore
+++ /dev/null
@@ -1,6 +0,0 @@
-Makefile
-Makefile.in
-Evolution-*.c
-Evolution.h
-evolution-calendar-*.c
-evolution-calendar.h
diff --git a/a11y/calendar/Makefile.am b/a11y/calendar/Makefile.am
deleted file mode 100644
index 9688fc7ead..0000000000
--- a/a11y/calendar/Makefile.am
+++ /dev/null
@@ -1,55 +0,0 @@
-# Calendar IDL files
-
-# for debug
-#A11Y_CFLAGS += -pedantic -ansi -DACC_DEBUG -Werror
-
-privlib_LTLIBRARIES = libevolution-calendar-a11y.la
-
-INCLUDES =						\
-	-DG_LOG_DOMAIN=\"evolution-a11y\"		\
-	-I$(top_srcdir)					\
-	-I$(top_srcdir)/shell				\
-	-I$(top_srcdir)/calendar			\
-	-I$(top_srcdir)/calendar/cal-client		\
-	-I$(top_srcdir)/calendar/gui			\
-	-I$(top_srcdir)/widgets				\
-	-I$(top_srcdir)/widgets/misc			\
-	-I$(top_srcdir)/a11y				\
-	-DEVOLUTION_DATADIR=\""$(datadir)"\"		\
-	-DEVOLUTION_GLADEDIR=\""$(gladedir)"\"		\
-	-DEVOLUTION_ETSPECDIR=\""$(etspecdir)"\"	\
-	-DEVOLUTION_IMAGESDIR=\""$(imagesdir)"\"	\
-	-DEVOLUTION_GALVIEWSDIR=\""$(viewsdir)"\"	\
-	-DEVOLUTION_UIDIR=\""$(evolutionuidir)"\"	\
-	-DPREFIX=\""$(prefix)"\"			\
-	$(A11Y_CFLAGS)					\
-	$(EVOLUTION_CALENDAR_CFLAGS)
-
-libevolution_calendar_a11y_la_SOURCES =		\
-	ea-calendar.c				\
-	ea-calendar.h				\
-	ea-calendar-helpers.c			\
-	ea-calendar-helpers.h			\
-	ea-cal-view.c				\
-	ea-cal-view.h				\
-	ea-cal-view-event.c			\
-	ea-cal-view-event.h			\
-	ea-day-view.c				\
-	ea-day-view.h				\
-	ea-day-view-main-item.c			\
-	ea-day-view-main-item.h			\
-	ea-day-view-cell.c			\
-	ea-day-view-cell.h			\
-	ea-week-view.c				\
-	ea-week-view.h				\
-	ea-week-view-main-item.c		\
-	ea-week-view-main-item.h		\
-	ea-week-view-cell.c			\
-	ea-week-view-cell.h			\
-        ea-jump-button.c                        \
-        ea-jump-button.h                        \
-	ea-gnome-calendar.c			\
-	ea-gnome-calendar.h
-
-libevolution_calendar_a11y_la_LIBADD =   \
-        $(top_builddir)/a11y/libevolution-a11y.la
diff --git a/a11y/calendar/ea-cal-view-event.c b/a11y/calendar/ea-cal-view-event.c
deleted file mode 100644
index cbd53f4ebd..0000000000
--- a/a11y/calendar/ea-cal-view-event.c
+++ /dev/null
@@ -1,528 +0,0 @@
-/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-/* vim:expandtab:shiftwidth=8:tabstop=8:
- */
-/* Evolution Accessibility: ea-cal-view-event.c
- *
- * Copyright (C) 2003 Ximian, Inc.
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of version 2 of the GNU General Public
- * License as published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * General Public License for more details.
- *
- * You should have received a copy of the GNU General Public
- * License along with this program; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
- *
- * Author: Bolian Yin <bolian.yin@sun.com> Sun Microsystem Inc., 2003
- *
- */
-
-#include "ea-cal-view-event.h"
-#include "ea-calendar-helpers.h"
-#include "ea-day-view.h"
-#include "ea-week-view.h"
-#include <gal/e-text/e-text.h>
-#include <libgnome/gnome-i18n.h>
-
-static void ea_cal_view_event_class_init (EaCalViewEventClass *klass);
-
-static G_CONST_RETURN gchar* ea_cal_view_event_get_name (AtkObject *accessible);
-static G_CONST_RETURN gchar* ea_cal_view_event_get_description (AtkObject *accessible);
-static AtkObject* ea_cal_view_event_get_parent (AtkObject *accessible);
-static gint ea_cal_view_event_get_index_in_parent (AtkObject *accessible);
-
-/* component interface */
-static void atk_component_interface_init (AtkComponentIface *iface);
-static void ea_cal_view_get_extents (AtkComponent *component,
-				     gint *x, gint *y, gint *width, gint *height,
-				     AtkCoordType coord_type);
-/* action interface */
-static void atk_action_interface_init (AtkActionIface *iface);
-static gboolean ea_cal_view_event_do_action (AtkAction *action, gint i);
-static gint ea_cal_view_event_get_n_actions (AtkAction *action);
-static G_CONST_RETURN gchar* ea_cal_view_event_action_get_name (AtkAction *action, gint i);
-
-
-#ifdef ACC_DEBUG
-static gint n_ea_cal_view_event_created = 0, n_ea_cal_view_event_destroyed = 0;
-static void ea_cal_view_finalize (GObject *object);
-#endif
-
-static gpointer parent_class = NULL;
-
-GType
-ea_cal_view_event_get_type (void)
-{
-	static GType type = 0;
-	AtkObjectFactory *factory;
-	GTypeQuery query;
-	GType derived_atk_type;
-
-
-	if (!type) {
-		static GTypeInfo tinfo = {
-			sizeof (EaCalViewEventClass),
-			(GBaseInitFunc) NULL, /* base init */
-			(GBaseFinalizeFunc) NULL, /* base finalize */
-			(GClassInitFunc) ea_cal_view_event_class_init, /* class init */
-			(GClassFinalizeFunc) NULL, /* class finalize */
-			NULL, /* class data */
-			sizeof (EaCalViewEvent), /* instance size */
-			0, /* nb preallocs */
-			(GInstanceInitFunc) NULL, /* instance init */
-			NULL /* value table */
-		};
-
-		static const GInterfaceInfo atk_component_info = {
-			(GInterfaceInitFunc) atk_component_interface_init,
-			(GInterfaceFinalizeFunc) NULL,
-			NULL
-		};
-
-                static const GInterfaceInfo atk_action_info = {
-                        (GInterfaceInitFunc) atk_action_interface_init,
-                        (GInterfaceFinalizeFunc) NULL,
-                        NULL
-                };
-
-
-		/*
-		 * Figure out the size of the class and instance
-		 * we are run-time deriving from (atk object for E_TEXT, in this case)
-		 */
-
-		factory = atk_registry_get_factory (atk_get_default_registry (),
-						    E_TYPE_TEXT);
-		derived_atk_type = atk_object_factory_get_accessible_type (factory);
-		g_type_query (derived_atk_type, &query);
-
-		tinfo.class_size = query.class_size;
-		tinfo.instance_size = query.instance_size;
-
-		/* we inherit the component, text and other interfaces from E_TEXT */
-		type = g_type_register_static (derived_atk_type,
-					       "EaCalViewEvent", &tinfo, 0);
-		g_type_add_interface_static (type, ATK_TYPE_COMPONENT,
-					     &atk_component_info);
-                g_type_add_interface_static (type, ATK_TYPE_ACTION,
-                                             &atk_action_info);
-
-                
-	}
-
-	return type;
-}
-
-static void
-ea_cal_view_event_class_init (EaCalViewEventClass *klass)
-{
-	AtkObjectClass *class = ATK_OBJECT_CLASS (klass);
-#ifdef ACC_DEBUG
-	GObjectClass *gobject_class = G_OBJECT_CLASS (klass);
-	gobject_class->finalize = ea_cal_view_finalize;
-#endif
-
-	parent_class = g_type_class_peek_parent (klass);
-
-
-	class->get_name = ea_cal_view_event_get_name;
-	class->get_description = ea_cal_view_event_get_description;
-	class->get_parent = ea_cal_view_event_get_parent;
-	class->get_index_in_parent = ea_cal_view_event_get_index_in_parent;
-
-}
-
-#ifdef ACC_DEBUG
-static void ea_cal_view_finalize (GObject *object)
-{
-	++n_ea_cal_view_event_destroyed;
-	printf ("ACC_DEBUG: n_ea_cal_view_event_destroyed = %d\n",
-		n_ea_cal_view_event_destroyed);
-}
-#endif
-
-AtkObject* 
-ea_cal_view_event_new (GObject *obj)
-{
-	AtkObject *atk_obj = NULL;
-	GObject *target_obj;
-	ECalendarView *cal_view;
-
-	g_return_val_if_fail (E_IS_TEXT (obj), NULL);
-	cal_view = ea_calendar_helpers_get_cal_view_from (GNOME_CANVAS_ITEM (obj));
-	if (!cal_view)
-		return NULL;
-
-	if (E_IS_WEEK_VIEW (cal_view)) {
-		gint event_num, span_num;
-		EWeekViewEvent *week_view_event;
-		EWeekViewEventSpan *event_span;
-		EWeekView *week_view = E_WEEK_VIEW (cal_view);
-
-		/* for week view, we need to check if a atkobject exists for
-		 * the first span of the same event
-		 */
-		if (!e_week_view_find_event_from_item (week_view,
-						       GNOME_CANVAS_ITEM (obj),
-						       &event_num,
-						       &span_num))
-			return NULL;
-		week_view_event = &g_array_index (week_view->events,
-						  EWeekViewEvent,
-						  event_num);
-		/* get the first span */
-		event_span = &g_array_index (week_view->spans,
-					     EWeekViewEventSpan,
-					     week_view_event->spans_index);
-		target_obj = G_OBJECT (event_span->text_item);
-		atk_obj = g_object_get_data (target_obj, "accessible-object");
-
-	}
-	else
-		target_obj = obj;
-
-	if (!atk_obj) {
-		static AtkRole event_role = ATK_ROLE_INVALID;
-		atk_obj = ATK_OBJECT (g_object_new (EA_TYPE_CAL_VIEW_EVENT,
-						    NULL));
-		atk_object_initialize (atk_obj, target_obj);
-		if (event_role == ATK_ROLE_INVALID)
-			event_role = atk_role_register ("Calendar Event");
-		atk_obj->role = event_role;
-#ifdef ACC_DEBUG
-		++n_ea_cal_view_event_created;
-		printf ("ACC_DEBUG: n_ea_cal_view_event_created = %d\n",
-			n_ea_cal_view_event_created);
-#endif
-	}
-
-	/* the registered factory for E_TEXT is cannot create a EaCalViewEvent,
-	 * we should save the EaCalViewEvent object in it.
-	 */
-	g_object_set_data (obj, "accessible-object", atk_obj);
-
-	return atk_obj;
-}
-
-static G_CONST_RETURN gchar*
-ea_cal_view_event_get_name (AtkObject *accessible)
-{
-	AtkGObjectAccessible *atk_gobj;
-	GObject *g_obj;
-	ECalendarViewEvent *event;
-	gchar *name_string;
-	gchar *alarm_string, *recur_string, *meeting_string, *summary_string;
-        const char *summary;
-
-
-	g_return_val_if_fail (EA_IS_CAL_VIEW_EVENT (accessible), NULL);
-
-	atk_gobj = ATK_GOBJECT_ACCESSIBLE (accessible);
-	g_obj = atk_gobject_accessible_get_object (atk_gobj);
-	if (!g_obj || !E_IS_TEXT (g_obj))
-		return NULL;
-	event = ea_calendar_helpers_get_cal_view_event_from (GNOME_CANVAS_ITEM(g_obj));
-
-	alarm_string = recur_string = meeting_string = "";
-	if (event && event->comp_data) {
-		if (e_cal_util_component_has_alarms (event->comp_data->icalcomp)) 
-			alarm_string = _("It has alarms.");
-
-		if (e_cal_util_component_has_recurrences (event->comp_data->icalcomp)) 
-			recur_string = _("It has recurrences.");
-
-		if (e_cal_util_component_has_organizer (event->comp_data->icalcomp)) 
-			meeting_string = _("It is a meeting.");
-			
-	}
-
-	summary = icalcomponent_get_summary (event->comp_data->icalcomp);
-	if (summary) 
-		summary_string = g_strdup_printf (_("Calendar Event: Summary is %s."), summary);
-	else 
-		summary_string = g_strdup (_("Calendar Event: It has no summary."));
-
-	name_string = g_strdup_printf ("%s %s %s %s", summary_string, alarm_string, recur_string, meeting_string);
-
-	ATK_OBJECT_CLASS (parent_class)->set_name (accessible, name_string);
-#ifdef ACC_DEBUG
-	printf("EvoAcc:  name for event accobj=%p, is %s\n",
-	       (void *)accessible, new_name);
-#endif
-	g_free (name_string);
-	return accessible->name;
-}
-
-static G_CONST_RETURN gchar*
-ea_cal_view_event_get_description (AtkObject *accessible)
-{
-	if (accessible->description)
-		return accessible->description;
-
-	return _("calendar view event");
-}
-
-static AtkObject *
-ea_cal_view_event_get_parent (AtkObject *accessible)
-{
-	AtkGObjectAccessible *atk_gobj;
-	GObject *g_obj;
-	GnomeCanvasItem *canvas_item;
-	ECalendarView *cal_view;
-
-	g_return_val_if_fail (EA_IS_CAL_VIEW_EVENT (accessible), NULL);
-	atk_gobj = ATK_GOBJECT_ACCESSIBLE (accessible);
-
-	g_obj = atk_gobject_accessible_get_object (atk_gobj);
-	if (g_obj == NULL)
-		/* Object is defunct */
-		return NULL;
-	canvas_item = GNOME_CANVAS_ITEM (g_obj);
-
-	cal_view = ea_calendar_helpers_get_cal_view_from (canvas_item);
-
-	if (!cal_view)
-		return NULL;
-
-	return gtk_widget_get_accessible (GTK_WIDGET (cal_view));
-}
-
-static gint
-ea_cal_view_event_get_index_in_parent (AtkObject *accessible)
-{
-	GObject *g_obj;
-	GnomeCanvasItem *canvas_item;
-	ECalendarView *cal_view;
-	ECalendarViewEvent *cal_view_event;
-
-	g_return_val_if_fail (EA_IS_CAL_VIEW_EVENT (accessible), -1);
-	g_obj = atk_gobject_accessible_get_object (ATK_GOBJECT_ACCESSIBLE(accessible));
-	if (!g_obj)
-		/* defunct object*/
-		return -1;
-
-	canvas_item = GNOME_CANVAS_ITEM (g_obj);
-	cal_view = ea_calendar_helpers_get_cal_view_from (canvas_item);
-	if (!cal_view)
-		return -1;
-
-	cal_view_event = ea_calendar_helpers_get_cal_view_event_from (canvas_item);
-	if (!cal_view_event)
-		return -1;
-
-	if (E_IS_DAY_VIEW (cal_view)) {
-		gint day, event_num, num_before;
-		EDayViewEvent *day_view_event;
-		EDayView *day_view = E_DAY_VIEW (cal_view);
-
-		/* the long event comes first in the order */
-		for (event_num = day_view->long_events->len - 1; event_num >= 0;
-		     --event_num) {
-			day_view_event = &g_array_index (day_view->long_events,
-							 EDayViewEvent, event_num);
-			if (cal_view_event == (ECalendarViewEvent*)day_view_event)
-				return event_num;
-
-		}
-		num_before = day_view->long_events->len;
-
-		for (day = 0; day < day_view->days_shown; ++day) {
-			for (event_num = day_view->events[day]->len - 1; event_num >= 0;
-			     --event_num) {
-				day_view_event = &g_array_index (day_view->events[day],
-							EDayViewEvent, event_num);
-				if (cal_view_event == (ECalendarViewEvent*)day_view_event)
-					return num_before + event_num;
-			}
-			num_before += day_view->events[day]->len;
-		}
-	}
-	else if (E_IS_WEEK_VIEW (cal_view)) {
-		AtkObject *atk_parent, *atk_child;
-		gint index = 0;
-
-		atk_parent = atk_object_get_parent (accessible);
-		while ((atk_child = atk_object_ref_accessible_child (atk_parent,
-								     index)) != NULL) {
-			if (atk_child == accessible) {
-				g_object_unref (atk_child);
-				return index;
-			}
-			g_object_unref (atk_child);
-			++index;
-		}
-	}
-	else {
-		g_assert_not_reached ();
-		return -1;
-	}
-	return -1;
-}
-
-/* Atk Component Interface */
-
-static void 
-atk_component_interface_init (AtkComponentIface *iface)
-{
-  g_return_if_fail (iface != NULL);
-
-  iface->get_extents = ea_cal_view_get_extents;
-}
-
-static void 
-ea_cal_view_get_extents (AtkComponent   *component,
-                         gint           *x,
-                         gint           *y,
-                         gint           *width,
-                         gint           *height,
-                         AtkCoordType   coord_type)
-{
-	GObject *g_obj;
-	GnomeCanvasItem *canvas_item;
-	gint x_window, y_window;
-	gint scroll_x, scroll_y;
-	ECalendarView *cal_view;
-	gint item_x, item_y, item_w, item_h;
-	GtkWidget *canvas = NULL;
-
-	g_return_if_fail (EA_IS_CAL_VIEW_EVENT (component));
-
-	g_obj = atk_gobject_accessible_get_object (ATK_GOBJECT_ACCESSIBLE(component));
-	if (!g_obj)
-		/* defunct object*/
-		return;
-	g_return_if_fail (E_IS_TEXT (g_obj));
-
-	canvas_item = GNOME_CANVAS_ITEM (g_obj);
-	cal_view = ea_calendar_helpers_get_cal_view_from (canvas_item);
-	if (!cal_view)
-		return;
-
-	if (E_IS_DAY_VIEW (cal_view)) {
-		gint day, event_num;
-
-		if (!e_day_view_find_event_from_item (E_DAY_VIEW (cal_view),
-						      canvas_item,
-						      &day, &event_num))
-			return;
-		if (day == E_DAY_VIEW_LONG_EVENT) {
-			gint start_day, end_day;
-			if (!e_day_view_get_long_event_position (E_DAY_VIEW (cal_view),
-								 event_num,
-								 &start_day,
-								 &end_day,
-								 &item_x,
-								 &item_y,
-								 &item_w,
-								 &item_h))
-				return;
-			canvas = E_DAY_VIEW (cal_view)->top_canvas;
-		}
-		else {
-			if (!e_day_view_get_event_position (E_DAY_VIEW (cal_view), day,
-							    event_num,
-							    &item_x, &item_y,
-							    &item_w, &item_h))
-
-				return;
-			canvas = E_DAY_VIEW (cal_view)->main_canvas;
-		}
-	}
-	else if (E_IS_WEEK_VIEW (cal_view)) {
-		gint event_num, span_num;
-		if (!e_week_view_find_event_from_item (E_WEEK_VIEW (cal_view),
-						       canvas_item, &event_num,
-						       &span_num))
-			return;
-
-		if (!e_week_view_get_span_position (E_WEEK_VIEW (cal_view),
-						    event_num, span_num,
-						    &item_x, &item_y, &item_w))
-			return;
-		item_h = E_WEEK_VIEW_ICON_HEIGHT;
-		canvas = E_WEEK_VIEW (cal_view)->main_canvas;
-	}
-	else
-		return;
-
-	if (!canvas)
-		return;
-
-	gdk_window_get_origin (canvas->window,
-			       &x_window, &y_window);
-	gnome_canvas_get_scroll_offsets (GNOME_CANVAS (canvas), &scroll_x, &scroll_y);
-
-	*x = item_x + x_window - scroll_x;
-	*y = item_y + y_window - scroll_y;
-	*width = item_w;
-	*height = item_h;
-
-	if (coord_type == ATK_XY_WINDOW) {
-		GdkWindow *window;
-		gint x_toplevel, y_toplevel;
-
-		window = gdk_window_get_toplevel (GTK_WIDGET (cal_view)->window);
-		gdk_window_get_origin (window, &x_toplevel, &y_toplevel);
-
-		*x -= x_toplevel;
-		*y -= y_toplevel;
-	}
-
-#ifdef ACC_DEBUG
-	printf ("Event Bounds (%d, %d, %d, %d)\n", *x, *y, *width, *height);
-#endif
-}
-
-#define CAL_VIEW_EVENT_ACTION_NUM 1
-
-static const char * action_name [CAL_VIEW_EVENT_ACTION_NUM] = {
-        N_("Grab Focus")
-};
-
-static void
-atk_action_interface_init (AtkActionIface *iface)
-{
-        g_return_if_fail (iface != NULL);
-
-        iface->do_action = ea_cal_view_event_do_action;
-        iface->get_n_actions = ea_cal_view_event_get_n_actions;
-        iface->get_name = ea_cal_view_event_action_get_name;
-}
-
-static gboolean
-ea_cal_view_event_do_action (AtkAction *action, gint i)
-{
-        AtkGObjectAccessible *atk_gobj;
-        AtkComponent *atk_comp;
-
-        atk_gobj = ATK_GOBJECT_ACCESSIBLE (action);
-
-        if (i == 0) {
-                atk_comp = (AtkComponent *)atk_gobj;
-                return atk_component_grab_focus (atk_comp);
-        }
-
-        return FALSE;
-
-}
-
-static gint
-ea_cal_view_event_get_n_actions (AtkAction *action)
-{
-        return CAL_VIEW_EVENT_ACTION_NUM;
-}
-
-static G_CONST_RETURN gchar*
-ea_cal_view_event_action_get_name (AtkAction *action, gint i)
-{
-        if (i >= 0 && i < CAL_VIEW_EVENT_ACTION_NUM)
-                return action_name [i];
-        return NULL;
-}
-
diff --git a/a11y/calendar/ea-cal-view-event.h b/a11y/calendar/ea-cal-view-event.h
deleted file mode 100644
index f139dde9fb..0000000000
--- a/a11y/calendar/ea-cal-view-event.h
+++ /dev/null
@@ -1,64 +0,0 @@
-/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-/* vim:expandtab:shiftwidth=8:tabstop=8:
- */
-/* Evolution Accessibility: ea-cal-view-event.h
- *
- * Copyright (C) 2003 Ximian, Inc.
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of version 2 of the GNU General Public
- * License as published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * General Public License for more details.
- *
- * You should have received a copy of the GNU General Public
- * License along with this program; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
- *
- * Author: Bolian Yin <bolian.yin@sun.com> Sun Microsystem Inc., 2003
- *
- */
-
-#ifndef __EA_CAL_VIEW_EVENT_H__
-#define __EA_CAL_VIEW_EVENT_H__
-
-#include <atk/atkgobjectaccessible.h>
-
-#ifdef __cplusplus
-extern "C" {
-#endif /* __cplusplus */
-
-#define EA_TYPE_CAL_VIEW_EVENT                   (ea_cal_view_event_get_type ())
-#define EA_CAL_VIEW_EVENT(obj)                   (G_TYPE_CHECK_INSTANCE_CAST ((obj), EA_TYPE_CAL_VIEW_EVENT, EaCalViewEvent))
-#define EA_CAL_VIEW_EVENT_CLASS(klass)           (G_TYPE_CHECK_CLASS_CAST ((klass), EA_TYPE_CAL_VIEW_EVENT, EaCalViewEventClass))
-#define EA_IS_CAL_VIEW_EVENT(obj)                (G_TYPE_CHECK_INSTANCE_TYPE ((obj), EA_TYPE_CAL_VIEW_EVENT))
-#define EA_IS_CAL_VIEW_EVENT_CLASS(klass)        (G_TYPE_CHECK_CLASS_TYPE ((klass), EA_TYPE_CAL_VIEW_EVENT))
-#define EA_CAL_VIEW_EVENT_GET_CLASS(obj)         (G_TYPE_INSTANCE_GET_CLASS ((obj), EA_TYPE_CAL_VIEW_EVENT, EaCalViewEventClass))
-
-typedef struct _EaCalViewEvent                   EaCalViewEvent;
-typedef struct _EaCalViewEventClass              EaCalViewEventClass;
-
-struct _EaCalViewEvent
-{
-	AtkGObjectAccessible parent;
-};
-
-GType ea_cal_view_event_get_type (void);
-
-struct _EaCalViewEventClass
-{
-	AtkGObjectAccessibleClass parent_class;
-};
-
-AtkObject *ea_cal_view_event_new (GObject *obj);
-
-#ifdef __cplusplus
-}
-#endif /* __cplusplus */
-
-
-#endif /* __EA_CAL_VIEW_EVENT_H__ */
diff --git a/a11y/calendar/ea-cal-view.c b/a11y/calendar/ea-cal-view.c
deleted file mode 100644
index 31400ca2da..0000000000
--- a/a11y/calendar/ea-cal-view.c
+++ /dev/null
@@ -1,441 +0,0 @@
-/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-/* vim:expandtab:shiftwidth=8:tabstop=8:
- */
-/* Evolution Accessibility: ea-cal-view.c
- *
- * Copyright (C) 2003 Ximian, Inc.
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of version 2 of the GNU General Public
- * License as published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * General Public License for more details.
- *
- * You should have received a copy of the GNU General Public
- * License along with this program; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
- *
- * Author: Bolian Yin <bolian.yin@sun.com> Sun Microsystem Inc., 2003
- *
- */
-
-#include "ea-cal-view.h"
-#include "ea-calendar-helpers.h"
-#include "e-day-view.h"
-#include "e-week-view.h"
-#include "calendar-commands.h"
-#include "goto.h"
-#include <glib/gstrfuncs.h>
-#include <libgnome/gnome-i18n.h>
-
-static void ea_cal_view_class_init (EaCalViewClass *klass);
-
-static AtkObject* ea_cal_view_get_parent (AtkObject *accessible);
-static void ea_cal_view_real_initialize (AtkObject *accessible, gpointer data);
-
-static void ea_cal_view_event_changed_cb (ECalendarView *cal_view,
-                                          ECalendarViewEvent *event, gpointer data);
-static void ea_cal_view_event_added_cb (ECalendarView *cal_view,
-                                        ECalendarViewEvent *event, gpointer data);
-
-static gboolean idle_dates_changed (gpointer data);
-static void ea_cal_view_dates_change_cb (GnomeCalendar *gcal, gpointer data);
-
-static void atk_action_interface_init (AtkActionIface *iface);
-static gboolean action_interface_do_action (AtkAction *action, gint i);
-static gint action_interface_get_n_actions (AtkAction *action);
-static G_CONST_RETURN gchar*
-action_interface_get_description(AtkAction *action, gint i);
-static G_CONST_RETURN gchar*
-action_interface_get_keybinding (AtkAction *action, gint i);
-static G_CONST_RETURN gchar*
-action_interface_action_get_name(AtkAction *action, gint i);
-
-static gpointer parent_class = NULL;
-
-GType
-ea_cal_view_get_type (void)
-{
-	static GType type = 0;
-	AtkObjectFactory *factory;
-	GTypeQuery query;
-	GType derived_atk_type;
-
-	if (!type) {
-		static GTypeInfo tinfo = {
-			sizeof (EaCalViewClass),
-			(GBaseInitFunc) NULL, /* base init */
-			(GBaseFinalizeFunc) NULL, /* base finalize */
-			(GClassInitFunc) ea_cal_view_class_init, /* class init */
-			(GClassFinalizeFunc) NULL, /* class finalize */
-			NULL, /* class data */
-			sizeof (EaCalView), /* instance size */
-			0, /* nb preallocs */
-			(GInstanceInitFunc) NULL, /* instance init */
-			NULL /* value table */
-		};
-
-		static const GInterfaceInfo atk_action_info = {
-			(GInterfaceInitFunc) atk_action_interface_init,
-			(GInterfaceFinalizeFunc) NULL,
-			NULL
-		};
-
-		/*
-		 * Figure out the size of the class and instance
-		 * we are run-time deriving from (GailWidget, in this case)
-		 */
-
-		factory = atk_registry_get_factory (atk_get_default_registry (),
-						    GTK_TYPE_WIDGET);
-		derived_atk_type = atk_object_factory_get_accessible_type (factory);
-		g_type_query (derived_atk_type, &query);
-
-		tinfo.class_size = query.class_size;
-		tinfo.instance_size = query.instance_size;
-
-		type = g_type_register_static (derived_atk_type,
-					       "EaCalView", &tinfo, 0);
-		g_type_add_interface_static (type, ATK_TYPE_ACTION,
-					     &atk_action_info);
-	}
-
-	return type;
-}
-
-static void
-ea_cal_view_class_init (EaCalViewClass *klass)
-{
-	AtkObjectClass *class = ATK_OBJECT_CLASS (klass);
-
-	parent_class = g_type_class_peek_parent (klass);
-
-	class->get_parent = ea_cal_view_get_parent;
-	class->initialize = ea_cal_view_real_initialize;
-}
-
-AtkObject* 
-ea_cal_view_new (GtkWidget *widget)
-{
-	GObject *object;
-	AtkObject *accessible;
-
-	g_return_val_if_fail (E_IS_CALENDAR_VIEW (widget), NULL);
-
-	object = g_object_new (EA_TYPE_CAL_VIEW, NULL);
-
-	accessible = ATK_OBJECT (object);
-	atk_object_initialize (accessible, widget);
-
-	return accessible;
-}
-
-static void
-ea_cal_view_real_initialize (AtkObject *accessible, gpointer data)
-{
-	ECalendarView *cal_view;
-	GnomeCalendar *gcal;
-	static AtkRole role = ATK_ROLE_INVALID;
-
-	g_return_if_fail (EA_IS_CAL_VIEW (accessible));
-	g_return_if_fail (E_IS_CALENDAR_VIEW (data));
-
-        ATK_OBJECT_CLASS (parent_class)->initialize (accessible, data);
-	if (role == ATK_ROLE_INVALID)
-		role = atk_role_register ("Calendar View");
-	accessible->role = role;
-	cal_view = E_CALENDAR_VIEW (data);
-
-	/* add listener for event_changed, event_added
-	 * we don't need to listen on event_removed. When the e_text
-	 * of the event is removed, the cal_view_event will go to the state
-	 * of "defunct" (changed by weak ref callback of atkgobjectaccessible
-	 */
-	g_signal_connect (G_OBJECT(cal_view), "event_changed",
-			  G_CALLBACK (ea_cal_view_event_changed_cb), NULL);
-	g_signal_connect (G_OBJECT(cal_view), "event_added",
-			  G_CALLBACK (ea_cal_view_event_added_cb), NULL);
-
-	/* listen for date changes of calendar */
-	gcal = e_calendar_view_get_calendar (cal_view);
-
-	if (gcal)
-		g_signal_connect (gcal, "dates_shown_changed",
-				  G_CALLBACK (ea_cal_view_dates_change_cb),
-				  accessible);
-}
-
-static AtkObject* 
-ea_cal_view_get_parent (AtkObject *accessible)
-{
-	ECalendarView *cal_view;
-	GnomeCalendar *gnomeCalendar;
-
-	g_return_val_if_fail (EA_IS_CAL_VIEW (accessible), NULL);
-
-	if (!GTK_ACCESSIBLE (accessible)->widget)
-		return NULL;
-	cal_view = E_CALENDAR_VIEW (GTK_ACCESSIBLE (accessible)->widget);
-
-	gnomeCalendar = e_calendar_view_get_calendar (cal_view);
-
-	return gtk_widget_get_accessible (GTK_WIDGET(gnomeCalendar));
-}
-
-static void
-ea_cal_view_event_changed_cb (ECalendarView *cal_view, ECalendarViewEvent *event,
-                              gpointer data)
-{
-	AtkObject *atk_obj;
-	EaCalView *ea_cal_view;
-	AtkObject *event_atk_obj = NULL;
-
-	g_return_if_fail (E_IS_CALENDAR_VIEW (cal_view));
-
-	atk_obj = gtk_widget_get_accessible (GTK_WIDGET(cal_view));
-	if (!EA_IS_CAL_VIEW (atk_obj))
-		return;
-	ea_cal_view = EA_CAL_VIEW (atk_obj);
-
-	if ((E_IS_DAY_VIEW (cal_view)) && event && event->canvas_item) {
-		event_atk_obj =
-			ea_calendar_helpers_get_accessible_for (event->canvas_item);
-	}
-	else if ((E_IS_WEEK_VIEW (cal_view)) && event) {
-		EWeekViewEventSpan *span;
-		EWeekViewEvent *week_view_event = (EWeekViewEvent *)event;
-		EWeekView *week_view = E_WEEK_VIEW (cal_view);
-		/* get the first span of the event */
-		span = &g_array_index (week_view->spans, EWeekViewEventSpan,
-				       week_view_event->spans_index);
-		if (span && span->text_item)
-			event_atk_obj = ea_calendar_helpers_get_accessible_for (span->text_item);
-	}
-	if (event_atk_obj) {
-#ifdef ACC_DEBUG
-		printf ("AccDebug: event=%p changed\n", (void *)event);
-#endif
-		g_object_notify (G_OBJECT(event_atk_obj), "accessible-name");
-		g_signal_emit_by_name (event_atk_obj, "visible_data_changed");
-	}
-
-}
-
-static void
-ea_cal_view_event_added_cb (ECalendarView *cal_view, ECalendarViewEvent *event,
-                            gpointer data)
-{
-	AtkObject *atk_obj;
-	EaCalView *ea_cal_view;
-	AtkObject *event_atk_obj = NULL;
-	gint index;
-
-	g_return_if_fail (E_IS_CALENDAR_VIEW (cal_view));
-
-	atk_obj = gtk_widget_get_accessible (GTK_WIDGET(cal_view));
-	if (!EA_IS_CAL_VIEW (atk_obj))
-		return;
-	ea_cal_view = EA_CAL_VIEW (atk_obj);
-
-	if ((E_IS_DAY_VIEW (cal_view)) && event && event->canvas_item) {
-		event_atk_obj =
-			ea_calendar_helpers_get_accessible_for (event->canvas_item);
-	}
-	else if ((E_IS_WEEK_VIEW (cal_view)) && event) {
-		EWeekViewEventSpan *span;
-		EWeekViewEvent *week_view_event = (EWeekViewEvent *)event;
-		EWeekView *week_view = E_WEEK_VIEW (cal_view);
-		/* get the first span of the event */
-		span = &g_array_index (week_view->spans, EWeekViewEventSpan,
-				       week_view_event->spans_index);
-		if (span && span->text_item)
-			event_atk_obj = ea_calendar_helpers_get_accessible_for (span->text_item);
-
-	}
-	if (event_atk_obj) {
-		index = atk_object_get_index_in_parent (event_atk_obj);
-		if (index < 0)
-			return;
-#ifdef ACC_DEBUG
-		printf ("AccDebug: event=%p added\n", (void *)event);
-#endif
-		g_signal_emit_by_name (atk_obj, "children_changed::add",
-				       index, event_atk_obj, NULL);
-	}
-}
-
-static gboolean
-idle_dates_changed (gpointer data)
-{
-	AtkObject *ea_cal_view;
-
-	g_return_val_if_fail (data, FALSE);
-	g_return_val_if_fail (EA_IS_CAL_VIEW (data), FALSE);
-
-	ea_cal_view = ATK_OBJECT(data);
-
-	if (ea_cal_view->name) {
-		g_free (ea_cal_view->name);
-		ea_cal_view->name = NULL;
-	}
-	g_object_notify (G_OBJECT (ea_cal_view), "accessible-name");
-	g_signal_emit_by_name (ea_cal_view, "visible_data_changed");
-	g_signal_emit_by_name (ea_cal_view, "children_changed", NULL);
-#ifdef ACC_DEBUG
-	printf ("AccDebug: cal view date changed\n");
-#endif
-
-	return FALSE;
-}
-
-static void
-ea_cal_view_dates_change_cb (GnomeCalendar *gcal, gpointer data)
-{
-	g_idle_add (idle_dates_changed, data);
-}
-
-/* atk action interface */
-
-#define CAL_VIEW_ACTION_NUM 5
-
-static const char * action_name [CAL_VIEW_ACTION_NUM] = {
-	N_("New Appointment"),
-	N_("New All Day Event"),
-	N_("New Meeting"),
-	N_("Go to Today"),
-	N_("Go to Date")
-};
-
-static void
-atk_action_interface_init (AtkActionIface *iface)
-{
-	g_return_if_fail (iface != NULL);
-
-	iface->do_action = action_interface_do_action;
-	iface->get_n_actions = action_interface_get_n_actions;
-	iface->get_description = action_interface_get_description;
-	iface->get_keybinding = action_interface_get_keybinding;
-	iface->get_name = action_interface_action_get_name;
-}
-
-static gboolean
-action_interface_do_action (AtkAction *action, gint index)
-{
-	GtkWidget *widget;
-	gboolean return_value = TRUE;
-	time_t dtstart, dtend;
-	ECalendarView *cal_view;
-
-	widget = GTK_ACCESSIBLE (action)->widget;
-	if (widget == NULL)
-		/*
-		 * State is defunct
-		 */
-		return FALSE;
-
-	if (!GTK_WIDGET_IS_SENSITIVE (widget) || !GTK_WIDGET_VISIBLE (widget))
-		return FALSE;
-
-	cal_view = E_CALENDAR_VIEW (widget);
-	 switch (index) {
-	 case 0:
-		 /* New Appointment */
-		 e_calendar_view_new_appointment (cal_view);
-		 break;
-	 case 1:
-		 /* New All Day Event */
-		 e_calendar_view_get_selected_time_range (cal_view,
-						     &dtstart, &dtend);
-		 e_calendar_view_new_appointment_for (cal_view,
-						 dtstart, dtend, TRUE, FALSE);
-		 break;
-	 case 2:
-		 /* New Meeting */
-		 e_calendar_view_get_selected_time_range (cal_view,
-						     &dtstart, &dtend);
-		 e_calendar_view_new_appointment_for (cal_view,
-						 dtstart, dtend, FALSE, TRUE);
-		 break;
-	 case 3:
-		 /* Go to today */
-		 break;
-		 calendar_goto_today (e_calendar_view_get_calendar (cal_view));
-	 case 4:
-		 /* Go to date */
-		 goto_dialog (e_calendar_view_get_calendar (cal_view));
-		 break;
-	 default:
-		 return_value = FALSE;
-		 break;
-	 }
-	 return return_value;
-}
-
-static gint
-action_interface_get_n_actions (AtkAction *action)
-{
-	return CAL_VIEW_ACTION_NUM;
-}
-
-static G_CONST_RETURN gchar*
-action_interface_get_description(AtkAction *action, gint index)
-{
-	return action_interface_action_get_name (action, index);
-}
-
-static G_CONST_RETURN gchar*
-action_interface_get_keybinding (AtkAction *action, gint index)
-{
-	GtkWidget *widget;
-	EaCalView *ea_cal_view;
-
-	widget = GTK_ACCESSIBLE (action)->widget;
-	if (widget == NULL)
-		/*
-		 * State is defunct
-		 */
-		return NULL;
-
-	if (!GTK_WIDGET_IS_SENSITIVE (widget) || !GTK_WIDGET_VISIBLE (widget))
-		return FALSE;
-
-	 ea_cal_view = EA_CAL_VIEW (action);
-
-	 switch (index) {
-	 case 0:
-		 /* New Appointment */
-		 return "<Alt>fna;<Control>n";
-		 break;
-	 case 1:
-		 /* New Event */
-		 return "<Alt>fnd;<Shift><Control>d";
-		 break;
-	 case 2:
-		 /* New Meeting */
-		 return "<Alt>fne;<Shift><Control>e";
-		 break;
-	 case 3:
-		 /* Go to today */
-		 return "<Alt>vt;<Alt><Control>t";
-		 break;
-	 case 4:
-		 /* Go to date */
-		 return "<Alt>vd;<Alt><Control>g";
-		 break;
-	 default:
-		 break;
-	 }
-	 return NULL;
-}
-
-static G_CONST_RETURN gchar*
-action_interface_action_get_name(AtkAction *action, gint i)
-{
-	if (i >= 0 && i < CAL_VIEW_ACTION_NUM)
-		return action_name [i];
-	return NULL;
-}
diff --git a/a11y/calendar/ea-cal-view.h b/a11y/calendar/ea-cal-view.h
deleted file mode 100644
index 193bb3a3cb..0000000000
--- a/a11y/calendar/ea-cal-view.h
+++ /dev/null
@@ -1,64 +0,0 @@
-/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-/* vim:expandtab:shiftwidth=8:tabstop=8:
- */
-/* Evolution Accessibility: ea-cal-view.h
- *
- * Copyright (C) 2003 Ximian, Inc.
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of version 2 of the GNU General Public
- * License as published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * General Public License for more details.
- *
- * You should have received a copy of the GNU General Public
- * License along with this program; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
- *
- * Author: Bolian Yin <bolian.yin@sun.com> Sun Microsystem Inc., 2003
- *
- */
-
-#ifndef __EA_CAL_VIEW_H__
-#define __EA_CAL_VIEW_H__
-
-#include <gtk/gtkaccessible.h>
-#include "e-calendar-view.h"
-
-#ifdef __cplusplus
-extern "C" {
-#endif /* __cplusplus */
-
-#define EA_TYPE_CAL_VIEW                     (ea_cal_view_get_type ())
-#define EA_CAL_VIEW(obj)                     (G_TYPE_CHECK_INSTANCE_CAST ((obj), EA_TYPE_CAL_VIEW, EaCalView))
-#define EA_CAL_VIEW_CLASS(klass)             (G_TYPE_CHECK_CLASS_CAST ((klass), EA_TYPE_CAL_VIEW, EaCalViewClass))
-#define EA_IS_CAL_VIEW(obj)                  (G_TYPE_CHECK_INSTANCE_TYPE ((obj), EA_TYPE_CAL_VIEW))
-#define EA_IS_CAL_VIEW_CLASS(klass)          (G_TYPE_CHECK_CLASS_TYPE ((klass), EA_TYPE_CAL_VIEW))
-#define EA_CAL_VIEW_GET_CLASS(obj)           (G_TYPE_INSTANCE_GET_CLASS ((obj), EA_TYPE_CAL_VIEW, EaCalViewClass))
-
-typedef struct _EaCalView                   EaCalView;
-typedef struct _EaCalViewClass              EaCalViewClass;
-
-struct _EaCalView
-{
-	GtkAccessible parent;
-};
-
-GType ea_cal_view_get_type (void);
-
-struct _EaCalViewClass
-{
-	GtkAccessibleClass parent_class;
-};
-
-AtkObject* ea_cal_view_new (GtkWidget *widget);
-
-#ifdef __cplusplus
-}
-#endif /* __cplusplus */
-
-#endif /* __EA_CAL_VIEW_H__ */
diff --git a/a11y/calendar/ea-calendar-helpers.c b/a11y/calendar/ea-calendar-helpers.c
deleted file mode 100644
index ff3a502a67..0000000000
--- a/a11y/calendar/ea-calendar-helpers.c
+++ /dev/null
@@ -1,159 +0,0 @@
-/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-/* vim:expandtab:shiftwidth=8:tabstop=8:
- */
-/* Evolution Accessibility: ea-calendar-helpers.c
- *
- * Copyright (C) 2003 Ximian, Inc.
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of version 2 of the GNU General Public
- * License as published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * General Public License for more details.
- *
- * You should have received a copy of the GNU General Public
- * License along with this program; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
- *
- * Author: Bolian Yin <bolian.yin@sun.com> Sun Microsystem Inc., 2003
- *
- */
-
-#include "ea-calendar-helpers.h"
-#include "ea-cal-view-event.h"
-#include "ea-jump-button.h"
-#include "e-day-view.h"
-#include "e-week-view.h"
-
-#include <gal/e-text/e-text.h>
-#include <libgnomecanvas/gnome-canvas-pixbuf.h>
-
-/**
- * ea_calendar_helpers_get_accessible_for
- * @canvas_item: the canvas item for a event or a jump button
- * @returns: the atk object for the canvas_item
- * 
- **/
-AtkObject *
-ea_calendar_helpers_get_accessible_for (GnomeCanvasItem *canvas_item)
-{
-	AtkObject *atk_obj = NULL;
-	GObject *g_obj;
-
-	g_return_val_if_fail ((E_IS_TEXT (canvas_item)) || (GNOME_IS_CANVAS_ITEM (canvas_item)), NULL);;
-
-	g_obj = G_OBJECT (canvas_item);
-	/* we cannot use atk_gobject_accessible_for_object here,
-	 * EaDayViewEvent/EaWeekViewEvent cannot be created by the
-	 * registered facotry of E_TEXT
-	 */
-	atk_obj = g_object_get_data (g_obj, "accessible-object");
-	if (!atk_obj) {
-                if (E_IS_TEXT (canvas_item)) {
-		atk_obj = ea_cal_view_event_new (g_obj);
-                }
-                else if (GNOME_IS_CANVAS_PIXBUF(canvas_item)) {
-                        atk_obj = ea_jump_button_new (g_obj);
-                }
-                else
-                        return NULL;
-        }
-	return atk_obj;
-}
-
-/**
- * ea_calendar_helpers_get_view_widget_from:
- * @canvas_item: the canvas item for a event or a jump button
- * @returns: the cal view widget if exists
- *
- * Get the cal view widget contains the canvas_item.
- * 
- **/
-ECalendarView *
-ea_calendar_helpers_get_cal_view_from (GnomeCanvasItem *canvas_item)
-{
-	GnomeCanvas *canvas;
-	GtkWidget *view_widget = NULL;
-
-	g_return_val_if_fail (canvas_item, NULL);
-	g_return_val_if_fail ((E_IS_TEXT (canvas_item)) || (GNOME_IS_CANVAS_ITEM (canvas_item)), NULL);
-
-	/* canvas_item is the e_text for the event */
-	/* canvas_item->canvas is the ECanvas for day view */
-	/* parent of canvas_item->canvas is the EDayView or EWeekView widget */
-	canvas = canvas_item->canvas;
-	view_widget = gtk_widget_get_parent (GTK_WIDGET(canvas));
-	if (!view_widget || !E_IS_CALENDAR_VIEW (view_widget))
-		return NULL;
-
-	return E_CALENDAR_VIEW (view_widget);
-}
-
-/**
- * ea_calendar_helpers_get_cal_view_event_from
- * @canvas_item: the cavas_item (e_text) for the event
- * @returns: the ECalendarViewEvent
- *
- * Get the ECalendarViewEvent for the canvas_item.
- *
- **/
-ECalendarViewEvent *
-ea_calendar_helpers_get_cal_view_event_from (GnomeCanvasItem *canvas_item)
-{
-	ECalendarView *cal_view;
-	gboolean event_found;
-	ECalendarViewEvent *cal_view_event;
-
-	g_return_val_if_fail (E_IS_TEXT (canvas_item), NULL);
-
-	cal_view = ea_calendar_helpers_get_cal_view_from (canvas_item);
-
-	if (!cal_view)
-		return NULL;
-
-	if (E_IS_DAY_VIEW (cal_view)) {
-		gint event_day, event_num;
-		EDayViewEvent *day_view_event;
-		EDayView *day_view = E_DAY_VIEW (cal_view);
-		event_found = e_day_view_find_event_from_item (day_view, canvas_item,
-							       &event_day, &event_num);
-		if (!event_found)
-			return NULL;
-		if (event_day == E_DAY_VIEW_LONG_EVENT) {
-			/* a long event */
-			day_view_event = &g_array_index (day_view->long_events,
-							 EDayViewEvent, event_num);
-		}
-		else {
-			/* a main canvas event */
-			day_view_event = &g_array_index (day_view->events[event_day],
-							 EDayViewEvent, event_num);
-		}
-		cal_view_event = (ECalendarViewEvent *) day_view_event;
-	}
-	else if (E_IS_WEEK_VIEW (cal_view)) {
-		gint event_num, span_num;
-		EWeekViewEvent *week_view_event;
-		EWeekView *week_view = E_WEEK_VIEW (cal_view);
-		event_found = e_week_view_find_event_from_item (week_view,
-								canvas_item,
-								&event_num,
-								&span_num);
-		if (!event_found)
-			return NULL;
-
-		week_view_event = &g_array_index (week_view->events, EWeekViewEvent,
-						  event_num);
-
-		cal_view_event = (ECalendarViewEvent *)week_view_event;
-	}
-	else {
-		g_assert_not_reached ();
-		return NULL;
-	}
-	return cal_view_event;
-}
diff --git a/a11y/calendar/ea-calendar-helpers.h b/a11y/calendar/ea-calendar-helpers.h
deleted file mode 100644
index 50d997d91d..0000000000
--- a/a11y/calendar/ea-calendar-helpers.h
+++ /dev/null
@@ -1,43 +0,0 @@
-/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-/* vim:expandtab:shiftwidth=8:tabstop=8:
- */
-/* Evolution Accessibility: ea-calendar-helpers.h
- *
- * Copyright (C) 2003 Ximian, Inc.
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of version 2 of the GNU General Public
- * License as published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * General Public License for more details.
- *
- * You should have received a copy of the GNU General Public
- * License along with this program; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
- *
- * Author: Bolian Yin <bolian.yin@sun.com> Sun Microsystem Inc., 2003
- *
- */
-
-/* Evolution Accessibility
- */
-
-#ifndef _EA_CALENDAR_HELPERS_H__
-#define _EA_CALENDAR_HELPERS_H__
-
-#include "ea-cal-view.h"
-
-AtkObject *
-ea_calendar_helpers_get_accessible_for (GnomeCanvasItem *canvas_item);
-
-ECalendarView *
-ea_calendar_helpers_get_cal_view_from (GnomeCanvasItem *canvas_item);
-
-ECalendarViewEvent *
-ea_calendar_helpers_get_cal_view_event_from (GnomeCanvasItem *canvas_item);
-
-#endif /* _EA_CALENDAR_HELPERS_H__ */
diff --git a/a11y/calendar/ea-calendar.c b/a11y/calendar/ea-calendar.c
deleted file mode 100644
index 614f81e4c8..0000000000
--- a/a11y/calendar/ea-calendar.c
+++ /dev/null
@@ -1,207 +0,0 @@
-/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-/* vim:expandtab:shiftwidth=8:tabstop=8:
- */
-/* Evolution Accessibility: ea-calendar.c
- *
- * Copyright (C) 2003 Ximian, Inc.
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of version 2 of the GNU General Public
- * License as published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * General Public License for more details.
- *
- * You should have received a copy of the GNU General Public
- * License along with this program; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
- *
- * Author: Bolian Yin <bolian.yin@sun.com> Sun Microsystem Inc., 2003
- *
- */
-
-#include <gal/e-text/e-text.h>
-#include <libgnomecanvas/gnome-canvas-pixbuf.h>
-#include "ea-calendar-helpers.h"
-#include "ea-factory.h"
-#include "ea-calendar.h"
-
-#include "calendar/ea-cal-view.h"
-#include "calendar/ea-cal-view-event.h"
-#include "calendar/ea-day-view.h"
-#include "calendar/ea-day-view-main-item.h"
-#include "calendar/ea-week-view.h"
-#include "calendar/ea-week-view-main-item.h"
-#include "calendar/ea-gnome-calendar.h"
-
-
-EA_FACTORY (EA_TYPE_CAL_VIEW, ea_cal_view, ea_cal_view_new)
-EA_FACTORY (EA_TYPE_DAY_VIEW, ea_day_view, ea_day_view_new)
-EA_FACTORY_GOBJECT (EA_TYPE_DAY_VIEW_MAIN_ITEM, ea_day_view_main_item, ea_day_view_main_item_new)
-EA_FACTORY (EA_TYPE_WEEK_VIEW, ea_week_view, ea_week_view_new)
-EA_FACTORY_GOBJECT (EA_TYPE_WEEK_VIEW_MAIN_ITEM, ea_week_view_main_item, ea_week_view_main_item_new)
-EA_FACTORY (EA_TYPE_GNOME_CALENDAR, ea_gnome_calendar, ea_gnome_calendar_new)
-
-static gboolean ea_calendar_focus_watcher (GSignalInvocationHint *ihint,
-					   guint n_param_values,
-					   const GValue *param_values,
-					   gpointer data);
-
-static gpointer e_text_type, pixbuf_type, e_day_view_type, e_week_view_type;
-static gpointer e_day_view_main_item_type, e_week_view_main_item_type;
-
-void
-gnome_calendar_a11y_init (void)
-{
-	/* we only add focus watcher when accessibility is enabled
-	 */
-	if (atk_get_root ()) {
-		EA_SET_FACTORY (gnome_calendar_get_type(), ea_gnome_calendar);
-
-		/* force loading some types */
-		e_text_type = g_type_class_ref (E_TYPE_TEXT);
-		pixbuf_type = g_type_class_ref (GNOME_TYPE_CANVAS_PIXBUF);
-		e_day_view_type = g_type_class_ref (e_day_view_get_type ());
-		e_week_view_type = g_type_class_ref (e_week_view_get_type ());
-		e_day_view_main_item_type = g_type_class_ref (e_day_view_main_item_get_type ());
-		e_week_view_main_item_type = g_type_class_ref (e_week_view_main_item_get_type ());
-
-		g_signal_add_emission_hook (g_signal_lookup ("event", E_TYPE_TEXT),
-					    0, ea_calendar_focus_watcher,
-					    NULL, (GDestroyNotify) NULL);
-		g_signal_add_emission_hook (g_signal_lookup ("event", GNOME_TYPE_CANVAS_PIXBUF),
-                                            0, ea_calendar_focus_watcher,
-                                            NULL, (GDestroyNotify) NULL);
-		g_signal_add_emission_hook (g_signal_lookup ("event-after",
-							     e_day_view_get_type()),
-					    0, ea_calendar_focus_watcher,
-					    NULL, (GDestroyNotify) NULL);
-		g_signal_add_emission_hook (g_signal_lookup ("event",
-							     e_day_view_main_item_get_type()),
-					    0, ea_calendar_focus_watcher,
-					    NULL, (GDestroyNotify) NULL);
-		g_signal_add_emission_hook (g_signal_lookup ("event-after",
-							     e_week_view_get_type()),
-					    0, ea_calendar_focus_watcher,
-					    NULL, (GDestroyNotify) NULL);
-		g_signal_add_emission_hook (g_signal_lookup ("event",
-							     e_week_view_main_item_get_type()),
-					    0, ea_calendar_focus_watcher,
-					    NULL, (GDestroyNotify) NULL);
-
-	}
-}
-
-void
-e_cal_view_a11y_init (void)
-{
-	EA_SET_FACTORY (e_cal_view_get_type(), ea_cal_view);
-}
-
-void
-e_day_view_a11y_init (void)
-{
-	EA_SET_FACTORY (e_day_view_get_type(), ea_day_view);
-}
-
-void 
-e_day_view_main_item_a11y_init (void)
-{
-	EA_SET_FACTORY (e_day_view_main_item_get_type (), ea_day_view_main_item);
-}
-
-void
-e_week_view_a11y_init (void)
-{
-	EA_SET_FACTORY (e_week_view_get_type(), ea_week_view);
-}
-
-void 
-e_week_view_main_item_a11y_init (void)
-{
-	EA_SET_FACTORY (e_week_view_main_item_get_type (), ea_week_view_main_item);
-}
-
-gboolean
-ea_calendar_focus_watcher (GSignalInvocationHint *ihint,
-                           guint n_param_values,
-                           const GValue *param_values,
-                           gpointer data)
-{
-	GObject *object;
-	GdkEvent *event;
-        AtkObject *ea_event = NULL;
-
-	object = g_value_get_object (param_values + 0);
-	event = g_value_get_boxed (param_values + 1);
-
-	if ((E_IS_TEXT (object)) || (GNOME_IS_CANVAS_PIXBUF (object))) {
-		/* "event" signal on canvas item
-		 */
-		GnomeCanvasItem *canvas_item;
-
-		canvas_item = GNOME_CANVAS_ITEM (object);
-		if (event->type == GDK_FOCUS_CHANGE) {
-			if (event->focus_change.in) {
-				ea_event =
-					ea_calendar_helpers_get_accessible_for (canvas_item);
-				if (!ea_event)
-					/* not canvas item we want */
-					return TRUE;
-
-			}
-			atk_focus_tracker_notify (ea_event);
-		}
-	}
-	else if (E_IS_DAY_VIEW (object)) {
-		EDayView *day_view = E_DAY_VIEW (object);
-		if (event->type == GDK_FOCUS_CHANGE) {
-			if (event->focus_change.in) {
-				/* give main item chance to emit focus */
-				gnome_canvas_item_grab_focus (day_view->main_canvas_item);
-			}
-		}
-	}
-	else if (E_IS_DAY_VIEW_MAIN_ITEM (object)) {
-		if (event->type == GDK_FOCUS_CHANGE) {
-			if (event->focus_change.in) {
-				/* we should emit focus on main item */
-				ea_event = atk_gobject_accessible_for_object (object);
-			}
-			else
-				/* focus out */
-				ea_event = NULL;
-#ifdef ACC_DEBUG
-			printf ("EvoAcc: focus notify on day main item %p\n", (void *)object);
-#endif
-			atk_focus_tracker_notify (ea_event);
-		}
-	} else if (E_IS_WEEK_VIEW (object)) {
-		EWeekView *week_view = E_WEEK_VIEW (object);
-		if (event->type == GDK_FOCUS_CHANGE) {
-			if (event->focus_change.in) {
-				/* give main item chance to emit focus */
-				gnome_canvas_item_grab_focus (week_view->main_canvas_item);
-			}
-		}
-	}
-	else if (E_IS_WEEK_VIEW_MAIN_ITEM (object)) {
-		if (event->type == GDK_FOCUS_CHANGE) {
-			if (event->focus_change.in) {
-				/* we should emit focus on main item */
-				ea_event = atk_gobject_accessible_for_object (object);
-			}
-			else
-				/* focus out */
-				ea_event = NULL;
-#ifdef ACC_DEBUG
-			printf ("EvoAcc: focus notify on week main item %p\n", (void *)object);
-#endif
-			atk_focus_tracker_notify (ea_event);
-		}
-	}
-	return TRUE;
-}
diff --git a/a11y/calendar/ea-calendar.h b/a11y/calendar/ea-calendar.h
deleted file mode 100644
index 92bb80a962..0000000000
--- a/a11y/calendar/ea-calendar.h
+++ /dev/null
@@ -1,39 +0,0 @@
-/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-/* vim:expandtab:shiftwidth=8:tabstop=8:
- */
-/* Evolution Accessibility: ea-calendar.h
- *
- * Copyright (C) 2003 Ximian, Inc.
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of version 2 of the GNU General Public
- * License as published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * General Public License for more details.
- *
- * You should have received a copy of the GNU General Public
- * License along with this program; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
- *
- * Author: Bolian Yin <bolian.yin@sun.com> Sun Microsystem Inc., 2003
- *
- */
-
-/* Evolution Accessibility
-*/
-
-#ifndef _EA_CALENDAR_H__
-#define _EA_CALENDAR_H__
-
-void gnome_calendar_a11y_init (void);
-void e_cal_view_a11y_init (void);
-void e_day_view_a11y_init (void);
-void e_day_view_main_item_a11y_init (void);
-void e_week_view_a11y_init (void);
-void e_week_view_main_item_a11y_init (void);
-
-#endif /* _EA_CALENDAR_H__ */
diff --git a/a11y/calendar/ea-day-view-cell.c b/a11y/calendar/ea-day-view-cell.c
deleted file mode 100644
index 5b1f81ae1a..0000000000
--- a/a11y/calendar/ea-day-view-cell.c
+++ /dev/null
@@ -1,396 +0,0 @@
-/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-/* vim:expandtab:shiftwidth=8:tabstop=8:
- */
-/* Evolution Accessibility: ea-day-view-cell.c
- *
- * Copyright (C) 2003 Ximian, Inc.
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of version 2 of the GNU General Public
- * License as published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * General Public License for more details.
- *
- * You should have received a copy of the GNU General Public
- * License along with this program; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
- *
- * Author: Bolian Yin <bolian.yin@sun.com> Sun Microsystem Inc., 2003
- *
- */
-
-#include "ea-day-view-cell.h"
-#include "ea-day-view-main-item.h"
-#include "ea-day-view.h"
-#include "ea-factory.h"
-
-/* EDayViewCell */
-
-static void e_day_view_cell_class_init (EDayViewCellClass *class);
-
-EA_FACTORY_GOBJECT (EA_TYPE_DAY_VIEW_CELL, ea_day_view_cell, ea_day_view_cell_new)
-
-GType
-e_day_view_cell_get_type (void)
-{
-	static GType type = 0;
-
-	if (!type) {
-		static GTypeInfo tinfo = {
-			sizeof (EDayViewCellClass),
-			(GBaseInitFunc) NULL, /* base init */
-			(GBaseFinalizeFunc) NULL, /* base finalize */
-			(GClassInitFunc) e_day_view_cell_class_init, /* class init */
-			(GClassFinalizeFunc) NULL, /* class finalize */
-			NULL, /* class data */
-			sizeof (EDayViewCell), /* instance size */
-			0, /* nb preallocs */
-			(GInstanceInitFunc) NULL, /* instance init */
-			NULL /* value table */
-		};
-
-		type = g_type_register_static (G_TYPE_OBJECT,
-					       "EDayViewCell", &tinfo, 0);
-	}
-
-	return type;
-}
-
-static void
-e_day_view_cell_class_init (EDayViewCellClass *class)
-{
-    EA_SET_FACTORY (e_day_view_cell_get_type (), ea_day_view_cell);
-}
-
-EDayViewCell *
-e_day_view_cell_new (EDayView *day_view, gint row, gint column)
-{
-	GObject *object;
-	EDayViewCell *cell;
-
-	g_return_val_if_fail (E_IS_DAY_VIEW (day_view), NULL);
-
-	object = g_object_new (E_TYPE_DAY_VIEW_CELL, NULL);
-	cell = E_DAY_VIEW_CELL (object);
-	cell->day_view = day_view;
-	cell->row = row;
-	cell->column = column;
-
-#ifdef ACC_DEBUG
-	printf ("EvoAcc: e_day_view_cell created %p\n", (void *)cell);
-#endif
-
-	return cell;
-}
-
-/* EaDayViewCell */
-
-static void ea_day_view_cell_class_init (EaDayViewCellClass *klass);
-
-static G_CONST_RETURN gchar* ea_day_view_cell_get_name (AtkObject *accessible);
-static G_CONST_RETURN gchar* ea_day_view_cell_get_description (AtkObject *accessible);
-static AtkStateSet* ea_day_view_cell_ref_state_set (AtkObject *obj);
-static AtkObject * ea_day_view_cell_get_parent (AtkObject *accessible);
-static gint ea_day_view_cell_get_index_in_parent (AtkObject *accessible);
-
-/* component interface */
-static void atk_component_interface_init (AtkComponentIface *iface);
-static void component_interface_get_extents (AtkComponent *component,
-					     gint *x, gint *y,
-					     gint *width, gint *height,
-					     AtkCoordType coord_type);
-static gboolean component_interface_grab_focus (AtkComponent *component);
-
-static gpointer parent_class = NULL;
-
-#ifdef ACC_DEBUG
-static gint n_ea_day_view_cell_created = 0, n_ea_day_view_cell_destroyed = 0;
-static void ea_day_view_cell_finalize (GObject *object);
-#endif
-
-GType
-ea_day_view_cell_get_type (void)
-{
-	static GType type = 0;
-
-	if (!type) {
-		static GTypeInfo tinfo = {
-			sizeof (EaDayViewCellClass),
-			(GBaseInitFunc) NULL, /* base init */
-			(GBaseFinalizeFunc) NULL, /* base finalize */
-			(GClassInitFunc) ea_day_view_cell_class_init, /* class init */
-			(GClassFinalizeFunc) NULL, /* class finalize */
-			NULL, /* class data */
-			sizeof (EaDayViewCell), /* instance size */
-			0, /* nb preallocs */
-			(GInstanceInitFunc) NULL, /* instance init */
-			NULL /* value table */
-		};
-
-		static const GInterfaceInfo atk_component_info = {
-			(GInterfaceInitFunc) atk_component_interface_init,
-			(GInterfaceFinalizeFunc) NULL,
-			NULL
-		};
-
-		type = g_type_register_static (ATK_TYPE_GOBJECT_ACCESSIBLE,
-					       "EaDayViewCell", &tinfo, 0);
-		g_type_add_interface_static (type, ATK_TYPE_COMPONENT,
-					     &atk_component_info);
-	}
-
-	return type;
-}
-
-static void
-ea_day_view_cell_class_init (EaDayViewCellClass *klass)
-{
-	AtkObjectClass *class = ATK_OBJECT_CLASS (klass);
-
-#ifdef ACC_DEBUG
-	GObjectClass *gobject_class = G_OBJECT_CLASS (klass);
-	gobject_class->finalize = ea_day_view_cell_finalize;
-#endif
-
-	parent_class = g_type_class_peek_parent (klass);
-
-	class->get_name = ea_day_view_cell_get_name;
-	class->get_description = ea_day_view_cell_get_description;
-	class->ref_state_set = ea_day_view_cell_ref_state_set;
-
-	class->get_parent = ea_day_view_cell_get_parent;
-	class->get_index_in_parent = ea_day_view_cell_get_index_in_parent;
-}
-
-AtkObject* 
-ea_day_view_cell_new (GObject *obj)
-{
-	gpointer object;
-	AtkObject *atk_object;
-
-	g_return_val_if_fail (E_IS_DAY_VIEW_CELL (obj), NULL);
-
-	object = g_object_new (EA_TYPE_DAY_VIEW_CELL, NULL);
-	atk_object = ATK_OBJECT (object);
-	atk_object_initialize (atk_object, obj);
-	atk_object->role = ATK_ROLE_UNKNOWN;
-
-#ifdef ACC_DEBUG
-	++n_ea_day_view_cell_created;
-	printf ("ACC_DEBUG: n_ea_day_view_cell_created = %d\n",
-		n_ea_day_view_cell_created);
-#endif
-	return atk_object;
-}
-
-#ifdef ACC_DEBUG
-static void ea_day_view_cell_finalize (GObject *object)
-{
-	++n_ea_day_view_cell_destroyed;
-	printf ("ACC_DEBUG: n_ea_day_view_cell_destroyed = %d\n",
-		n_ea_day_view_cell_destroyed);
-}
-#endif
-
-static G_CONST_RETURN gchar*
-ea_day_view_cell_get_name (AtkObject *accessible)
-{
-	AtkGObjectAccessible *atk_gobj;
-	GObject *g_obj;
-	EDayViewCell *cell;
-
-	g_return_val_if_fail (EA_IS_DAY_VIEW_CELL (accessible), NULL);
-
-	if (!accessible->name) {
-		AtkObject *ea_main_item;
-		GnomeCanvasItem *main_item;
-		gchar *new_name = g_strdup ("");
-		const gchar *row_label, *column_label;
-
-		atk_gobj = ATK_GOBJECT_ACCESSIBLE (accessible);
-		g_obj = atk_gobject_accessible_get_object (atk_gobj);
-		if (!g_obj)
-			return NULL;
-
-		cell = E_DAY_VIEW_CELL (g_obj);
-		main_item = cell->day_view->main_canvas_item;
-		ea_main_item = atk_gobject_accessible_for_object (G_OBJECT (main_item));
-		column_label = atk_table_get_column_description (ATK_TABLE (ea_main_item),
-								 cell->column);
-		row_label = atk_table_get_row_description (ATK_TABLE (ea_main_item),
-							   cell->row);
-		new_name = g_strconcat (column_label, " ", row_label, NULL);
-		ATK_OBJECT_CLASS (parent_class)->set_name (accessible, new_name);
-		g_free (new_name);
-	}
-	return accessible->name;
-}
-
-static G_CONST_RETURN gchar*
-ea_day_view_cell_get_description (AtkObject *accessible)
-{
-	return ea_day_view_cell_get_name (accessible);
-}
-
-static AtkStateSet*
-ea_day_view_cell_ref_state_set (AtkObject *obj)
-{
-  AtkStateSet *state_set;
-  GObject *g_obj;
-  AtkObject *parent;
-  gint x, y, width, height;
-  gint parent_x, parent_y, parent_width, parent_height;
-
-  state_set = ATK_OBJECT_CLASS (parent_class)->ref_state_set (obj);
-  g_obj = atk_gobject_accessible_get_object (ATK_GOBJECT_ACCESSIBLE(obj));
-  if (!g_obj)
-	  return state_set;
-
-  atk_state_set_add_state (state_set, ATK_STATE_SELECTABLE);
-
-  parent = atk_object_get_parent (obj);
-  atk_component_get_extents (ATK_COMPONENT (obj), &x, &y,
-			     &width, &height, ATK_XY_WINDOW);
-  atk_component_get_extents (ATK_COMPONENT (parent), &parent_x, &parent_y,
-			     &parent_width, &parent_height, ATK_XY_WINDOW);
-
-
-  if (x + width < parent_x || x > parent_x + parent_width ||
-      y + height < parent_y || y > parent_y + parent_height)
-	  /* the cell is out of the main canvas */	  
-	  ;
-  else
-	  atk_state_set_add_state (state_set, ATK_STATE_VISIBLE);
-
-  return state_set;
-}
-
-static AtkObject *
-ea_day_view_cell_get_parent (AtkObject *accessible)
-{
-	AtkGObjectAccessible *atk_gobj;
-	GObject *g_obj;
-	EDayViewCell *cell;
-
-	g_return_val_if_fail (EA_IS_DAY_VIEW_CELL (accessible), NULL);
-
-	atk_gobj = ATK_GOBJECT_ACCESSIBLE (accessible);
-	g_obj = atk_gobject_accessible_get_object (atk_gobj);
-	if (!g_obj)
-		return NULL;
-
-	cell = E_DAY_VIEW_CELL (g_obj);
-	return atk_gobject_accessible_for_object (G_OBJECT (cell->day_view->main_canvas_item));
-}
-
-static gint
-ea_day_view_cell_get_index_in_parent (AtkObject *accessible)
-{
-	AtkGObjectAccessible *atk_gobj;
-	GObject *g_obj;
-	EDayViewCell *cell;
-	AtkObject *parent;
-
-	g_return_val_if_fail (EA_IS_DAY_VIEW_CELL (accessible), -1);
-
-	atk_gobj = ATK_GOBJECT_ACCESSIBLE (accessible);
-	g_obj = atk_gobject_accessible_get_object (atk_gobj);
-	if (!g_obj)
-		return -1;
-
-	cell = E_DAY_VIEW_CELL (g_obj);
-	parent = atk_object_get_parent (accessible);
-	return atk_table_get_index_at (ATK_TABLE (parent),
-				       cell->row, cell->column);
-}
-
-/* Atk Component Interface */
-
-static void 
-atk_component_interface_init (AtkComponentIface *iface)
-{
-	g_return_if_fail (iface != NULL);
-
-	iface->get_extents = component_interface_get_extents;
-	iface->grab_focus = component_interface_grab_focus;
-}
-
-static void 
-component_interface_get_extents (AtkComponent *component,
-				 gint *x, gint *y, gint *width, gint *height,
-				 AtkCoordType coord_type)
-{
-	GObject *g_obj;
-	AtkObject *atk_obj;
-	EDayViewCell *cell;
-	EDayView *day_view;
-	GtkWidget *main_canvas;
-	gint day_view_width, day_view_height;
-	gint scroll_x, scroll_y;
-
-	*x = *y = *width = *height = 0;
-
-	g_return_if_fail (EA_IS_DAY_VIEW_CELL (component));
-
-	g_obj = atk_gobject_accessible_get_object (ATK_GOBJECT_ACCESSIBLE(component));
-	if (!g_obj)
-		/* defunct object*/
-		return;
-
-	cell = E_DAY_VIEW_CELL (g_obj);
-	day_view = cell->day_view;
-	main_canvas = cell->day_view->main_canvas;
-
-	atk_obj = atk_gobject_accessible_for_object (G_OBJECT (main_canvas));
-	atk_component_get_extents (ATK_COMPONENT (atk_obj),
-				   x, y,
-				   &day_view_width, &day_view_height,
-				   coord_type);
-	gnome_canvas_get_scroll_offsets (GNOME_CANVAS (day_view->main_canvas),
-					 &scroll_x, &scroll_y);
-	*x += day_view->day_offsets[cell->column] - scroll_x;
-	*y += day_view->row_height * cell->row
-		- scroll_y;
-	*width = day_view->day_widths[cell->column];
-	*height = day_view->row_height;
-}
-
-static gboolean
-component_interface_grab_focus (AtkComponent *comp)
-{
-        GObject *g_obj;
-        EDayViewCell *cell;
-        EDayView *day_view;
-        GtkWidget *toplevel;
-
-        g_return_val_if_fail (EA_IS_DAY_VIEW_CELL (comp), FALSE);
-
-        g_obj = atk_gobject_accessible_get_object (ATK_GOBJECT_ACCESSIBLE (comp));
-        if (!g_obj)
-                return FALSE;
-
-        cell = E_DAY_VIEW_CELL (g_obj);
-        day_view = cell->day_view;
-
-        day_view->selection_start_day = cell->column;
-        day_view->selection_end_day = cell->column;
-        day_view->selection_start_row = cell->row;
-        day_view->selection_end_row = cell->row;
-
-        e_day_view_ensure_rows_visible (day_view,
-                        day_view->selection_start_row,
-                        day_view->selection_end_row);
-        e_day_view_update_calendar_selection_time (day_view);
-        gtk_widget_queue_draw (day_view->main_canvas);
-
-        toplevel = gtk_widget_get_toplevel (GTK_WIDGET (day_view));
-        if (GTK_WIDGET_TOPLEVEL (toplevel))
-                gtk_window_present (GTK_WINDOW (toplevel));
-
-        return TRUE;
-}
-
diff --git a/a11y/calendar/ea-day-view-cell.h b/a11y/calendar/ea-day-view-cell.h
deleted file mode 100644
index cba2fec15b..0000000000
--- a/a11y/calendar/ea-day-view-cell.h
+++ /dev/null
@@ -1,91 +0,0 @@
-/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-/* vim:expandtab:shiftwidth=8:tabstop=8:
- */
-/* Evolution Accessibility: ea-day-view-cell.h
- *
- * Copyright (C) 2003 Ximian, Inc.
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of version 2 of the GNU General Public
- * License as published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * General Public License for more details.
- *
- * You should have received a copy of the GNU General Public
- * License along with this program; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
- *
- * Author: Bolian Yin <bolian.yin@sun.com> Sun Microsystem Inc., 2003
- *
- */
-
-#ifndef __EA_DAY_VIEW_CELL_H__
-#define __EA_DAY_VIEW_CELL_H__
-
-#include <atk/atkgobjectaccessible.h>
-#include "e-day-view.h"
-
-#ifdef __cplusplus
-extern "C" {
-#endif /* __cplusplus */
-
-#define E_TYPE_DAY_VIEW_CELL                     (e_day_view_cell_get_type ())
-#define E_DAY_VIEW_CELL(obj)                     (G_TYPE_CHECK_INSTANCE_CAST ((obj), E_TYPE_DAY_VIEW_CELL, EDayViewCell))
-#define E_DAY_VIEW_CELL_CLASS(klass)             (G_TYPE_CHECK_CLASS_CAST ((klass), E_TYPE_DAY_VIEW_CELL, EDayViewCellClass))
-#define E_IS_DAY_VIEW_CELL(obj)                  (G_TYPE_CHECK_INSTANCE_TYPE ((obj), E_TYPE_DAY_VIEW_CELL))
-#define E_IS_DAY_VIEW_CELL_CLASS(klass)          (G_TYPE_CHECK_CLASS_TYPE ((klass), E_TYPE_DAY_VIEW_CELL))
-#define E_DAY_VIEW_CELL_GET_CLASS(obj)           (G_TYPE_INSTANCE_GET_CLASS ((obj), E_TYPE_DAY_VIEW_CELL, EDayViewCellClass))
-
-typedef struct _EDayViewCell                   EDayViewCell;
-typedef struct _EDayViewCellClass              EDayViewCellClass;
-
-struct _EDayViewCell
-{
-	GObject parent;
-	EDayView *day_view;
-	gint row;
-	gint column;
-};
-
-GType e_day_view_cell_get_type (void);
-
-struct _EDayViewCellClass
-{
-	GObjectClass parent_class;
-};
-
-EDayViewCell * e_day_view_cell_new (EDayView *day_view, gint row, gint column);
-
-#define EA_TYPE_DAY_VIEW_CELL                     (ea_day_view_cell_get_type ())
-#define EA_DAY_VIEW_CELL(obj)                     (G_TYPE_CHECK_INSTANCE_CAST ((obj), EA_TYPE_DAY_VIEW_CELL, EaDayViewCell))
-#define EA_DAY_VIEW_CELL_CLASS(klass)             (G_TYPE_CHECK_CLASS_CAST ((klass), EA_TYPE_DAY_VIEW_CELL, EaDayViewCellClass))
-#define EA_IS_DAY_VIEW_CELL(obj)                  (G_TYPE_CHECK_INSTANCE_TYPE ((obj), EA_TYPE_DAY_VIEW_CELL))
-#define EA_IS_DAY_VIEW_CELL_CLASS(klass)          (G_TYPE_CHECK_CLASS_TYPE ((klass), EA_TYPE_DAY_VIEW_CELL))
-#define EA_DAY_VIEW_CELL_GET_CLASS(obj)           (G_TYPE_INSTANCE_GET_CLASS ((obj), EA_TYPE_DAY_VIEW_CELL, EaDayViewCellClass))
-
-typedef struct _EaDayViewCell                   EaDayViewCell;
-typedef struct _EaDayViewCellClass              EaDayViewCellClass;
-
-struct _EaDayViewCell
-{
-	AtkGObjectAccessible parent;
-};
-
-GType ea_day_view_cell_get_type (void);
-
-struct _EaDayViewCellClass
-{
-	AtkGObjectAccessibleClass parent_class;
-};
-
-AtkObject*     ea_day_view_cell_new         (GObject *gobj);
-
-#ifdef __cplusplus
-}
-#endif /* __cplusplus */
-
-#endif /* __EA_DAY_VIEW_CELL_H__ */
diff --git a/a11y/calendar/ea-day-view-main-item.c b/a11y/calendar/ea-day-view-main-item.c
deleted file mode 100644
index b65ad63957..0000000000
--- a/a11y/calendar/ea-day-view-main-item.c
+++ /dev/null
@@ -1,1292 +0,0 @@
-/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-/* vim:expandtab:shiftwidth=8:tabstop=8:
- */
-/* Evolution Accessibility: ea-day-view-main-item.c
- *
- * Copyright (C) 2003 Ximian, Inc.
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of version 2 of the GNU General Public
- * License as published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * General Public License for more details.
- *
- * You should have received a copy of the GNU General Public
- * License along with this program; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
- *
- * Author: Bolian Yin <bolian.yin@sun.com> Sun Microsystem Inc., 2003
- *
- */
-
-#include "ea-day-view-main-item.h"
-#include "e-day-view-top-item.h"
-#include "ea-day-view.h"
-#include "ea-day-view-cell.h"
-#include "ea-cell-table.h"
-#include <libgnome/gnome-i18n.h>
-
-/* EaDayViewMainItem */
-static void ea_day_view_main_item_class_init (EaDayViewMainItemClass *klass);
-
-static void ea_day_view_main_item_finalize (GObject *object);
-static G_CONST_RETURN gchar* ea_day_view_main_item_get_name (AtkObject *accessible);
-static G_CONST_RETURN gchar* ea_day_view_main_item_get_description (AtkObject *accessible);
-
-static gint         ea_day_view_main_item_get_n_children (AtkObject *obj);
-static AtkObject*   ea_day_view_main_item_ref_child (AtkObject *obj,
-						     gint i);
-static AtkObject * ea_day_view_main_item_get_parent (AtkObject *accessible);
-static gint ea_day_view_main_item_get_index_in_parent (AtkObject *accessible);
-
-/* callbacks */
-static void ea_day_view_main_item_dates_change_cb (GnomeCalendar *gcal, gpointer data);
-static void ea_day_view_main_item_time_change_cb (EDayView *day_view, gpointer data);
-
-/* component interface */
-static void atk_component_interface_init (AtkComponentIface *iface);
-static void component_interface_get_extents (AtkComponent *component,
-					     gint *x, gint *y,
-					     gint *width, gint *height,
-					     AtkCoordType coord_type);
-/* atk table interface */
-static void atk_table_interface_init (AtkTableIface *iface);
-static gint table_interface_get_index_at (AtkTable *table,
-					  gint     row,
-					  gint     column);
-static gint table_interface_get_column_at_index (AtkTable *table,
-						 gint     index);
-static gint table_interface_get_row_at_index (AtkTable *table,
-					      gint     index);
-static AtkObject* table_interface_ref_at (AtkTable *table,
-					  gint     row, 
-					  gint     column);
-static gint table_interface_get_n_rows (AtkTable *table);
-static gint table_interface_get_n_columns (AtkTable *table);
-static gint table_interface_get_column_extent_at (AtkTable      *table,
-						  gint          row,
-						  gint          column);
-static gint table_interface_get_row_extent_at (AtkTable      *table,
-					       gint          row,
-					       gint          column);
-
-static gboolean table_interface_is_row_selected (AtkTable *table,
-						 gint     row);
-static gboolean table_interface_is_column_selected (AtkTable *table,
-						    gint     row);
-static gboolean table_interface_is_selected (AtkTable *table,
-					     gint     row,
-					     gint     column);
-static gint table_interface_get_selected_rows (AtkTable *table,
-					       gint **rows_selected);
-static gint table_interface_get_selected_columns (AtkTable *table,
-						  gint     **columns_selected);
-static gboolean table_interface_add_row_selection (AtkTable *table, gint row);
-static gboolean table_interface_remove_row_selection (AtkTable *table,
-						      gint row);
-static gboolean table_interface_add_column_selection (AtkTable *table,
-						      gint column);
-static gboolean table_interface_remove_column_selection (AtkTable *table,
-							 gint column);
-static AtkObject* table_interface_get_row_header (AtkTable *table, gint row);
-static AtkObject* table_interface_get_column_header (AtkTable *table,
-						     gint in_col);
-static AtkObject* table_interface_get_caption (AtkTable *table);
-
-static G_CONST_RETURN gchar*
-table_interface_get_column_description (AtkTable *table, gint in_col);
-
-static G_CONST_RETURN gchar*
-table_interface_get_row_description (AtkTable *table, gint row);
-
-static AtkObject* table_interface_get_summary (AtkTable *table);
-
-/* atk selection interface */
-static void atk_selection_interface_init (AtkSelectionIface *iface);
-static gboolean selection_interface_add_selection (AtkSelection *selection,
-						   gint i);
-static gboolean selection_interface_clear_selection (AtkSelection *selection);
-static AtkObject* selection_interface_ref_selection (AtkSelection *selection,
-						     gint i);
-static gint selection_interface_get_selection_count (AtkSelection *selection);
-static gboolean selection_interface_is_child_selected (AtkSelection *selection,
-						       gint i);
-
-/* helpers */
-static EaCellTable *
-ea_day_view_main_item_get_cell_data (EaDayViewMainItem *ea_main_item);
-
-static void
-ea_day_view_main_item_destory_cell_data (EaDayViewMainItem *ea_main_item);
-
-static gint
-ea_day_view_main_item_get_child_index_at (EaDayViewMainItem *ea_main_item,
-					  gint row, gint column);
-static gint
-ea_day_view_main_item_get_row_at_index (EaDayViewMainItem *ea_main_item,
-					gint index);
-static gint
-ea_day_view_main_item_get_column_at_index (EaDayViewMainItem *ea_main_item,
-					   gint index);
-static gint
-ea_day_view_main_item_get_row_label (EaDayViewMainItem *ea_main_item,
-				     gint row, gchar *buffer,
-				     gint buffer_size);
-
-#ifdef ACC_DEBUG
-static gint n_ea_day_view_main_item_created = 0;
-static gint n_ea_day_view_main_item_destroyed = 0;
-#endif
-
-static gpointer parent_class = NULL;
-
-GType
-ea_day_view_main_item_get_type (void)
-{
-	static GType type = 0;
-	AtkObjectFactory *factory;
-	GTypeQuery query;
-	GType derived_atk_type;
-
-	if (!type) {
-		static GTypeInfo tinfo = {
-			sizeof (EaDayViewMainItemClass),
-			(GBaseInitFunc) NULL, /* base init */
-			(GBaseFinalizeFunc) NULL, /* base finalize */
-			(GClassInitFunc) ea_day_view_main_item_class_init,
-			(GClassFinalizeFunc) NULL, /* class finalize */
-			NULL, /* class data */
-			sizeof (EaDayViewMainItem), /* instance size */
-			0, /* nb preallocs */
-			(GInstanceInitFunc) NULL, /* instance init */
-			NULL /* value table */
-		};
-
-		static const GInterfaceInfo atk_component_info = {
-			(GInterfaceInitFunc) atk_component_interface_init,
-			(GInterfaceFinalizeFunc) NULL,
-			NULL
-		};
-
-		static const GInterfaceInfo atk_table_info = {
-			(GInterfaceInitFunc) atk_table_interface_init,
-			(GInterfaceFinalizeFunc) NULL,
-			NULL
-		};
-		static const GInterfaceInfo atk_selection_info = {
-			(GInterfaceInitFunc) atk_selection_interface_init,
-			(GInterfaceFinalizeFunc) NULL,
-			NULL
-		};
-
-
-		/*
-		 * Figure out the size of the class and instance
-		 * we are run-time deriving from (GailCanvasItem, in this case)
-		 *
-		 */
-
-		factory = atk_registry_get_factory (atk_get_default_registry (),
-						    e_day_view_main_item_get_type());
-		derived_atk_type = atk_object_factory_get_accessible_type (factory);
-		g_type_query (derived_atk_type, &query);
-
-		tinfo.class_size = query.class_size;
-		tinfo.instance_size = query.instance_size;
-
-		type = g_type_register_static (derived_atk_type,
-					       "EaDayViewMainItem", &tinfo, 0);
-		g_type_add_interface_static (type, ATK_TYPE_COMPONENT,
-					     &atk_component_info);
-		g_type_add_interface_static (type, ATK_TYPE_TABLE,
-					     &atk_table_info);
-		g_type_add_interface_static (type, ATK_TYPE_SELECTION,
-					     &atk_selection_info);
-	}
-
-	return type;
-}
-
-static void
-ea_day_view_main_item_class_init (EaDayViewMainItemClass *klass)
-{
-	GObjectClass *gobject_class = G_OBJECT_CLASS (klass);
-	AtkObjectClass *class = ATK_OBJECT_CLASS (klass);
-
-	gobject_class->finalize = ea_day_view_main_item_finalize;
-	parent_class = g_type_class_peek_parent (klass);
-
-	class->get_name = ea_day_view_main_item_get_name;
-	class->get_description = ea_day_view_main_item_get_description;
-
-	class->get_n_children = ea_day_view_main_item_get_n_children;
-	class->ref_child = ea_day_view_main_item_ref_child;
-	class->get_parent = ea_day_view_main_item_get_parent;
-	class->get_index_in_parent = ea_day_view_main_item_get_index_in_parent;
-}
-
-AtkObject* 
-ea_day_view_main_item_new (GObject *obj)
-{
-	AtkObject *accessible;
-	GnomeCalendar *gcal;
-	EDayViewMainItem *main_item;
-
-	g_return_val_if_fail (E_IS_DAY_VIEW_MAIN_ITEM (obj), NULL);
-
-	accessible = ATK_OBJECT (g_object_new (EA_TYPE_DAY_VIEW_MAIN_ITEM,
-					       NULL));
-
-	atk_object_initialize (accessible, obj);
-	accessible->role = ATK_ROLE_TABLE;
-
-#ifdef ACC_DEBUG
-	++n_ea_day_view_main_item_created;
-	printf ("ACC_DEBUG: n_ea_day_view_main_item_created = %d\n",
-		n_ea_day_view_main_item_created);
-#endif
-	main_item = E_DAY_VIEW_MAIN_ITEM (obj);
-	g_signal_connect (main_item->day_view, "selected_time_changed",
-			  G_CALLBACK (ea_day_view_main_item_time_change_cb),
-			  accessible);
-
-	/* listen for date changes of calendar */
-	gcal = e_calendar_view_get_calendar (E_CALENDAR_VIEW (main_item->day_view));
-	if (gcal)
-		g_signal_connect (gcal, "dates_shown_changed",
-				  G_CALLBACK (ea_day_view_main_item_dates_change_cb),
-				  accessible);
-
-	return accessible;
-}
-
-static void
-ea_day_view_main_item_finalize (GObject *object)
-{
-	EaDayViewMainItem *ea_main_item;
-
-	g_return_if_fail (EA_IS_DAY_VIEW_MAIN_ITEM (object));
-
-	ea_main_item = EA_DAY_VIEW_MAIN_ITEM (object);
-
-	/* Free the allocated cell data */
-	ea_day_view_main_item_destory_cell_data (ea_main_item);
-
-	G_OBJECT_CLASS (parent_class)->finalize (object);
-#ifdef ACC_DEBUG
-	++n_ea_day_view_main_item_destroyed;
-	printf ("ACC_DEBUG: n_ea_day_view_main_item_destroyed = %d\n",
-		n_ea_day_view_main_item_destroyed);
-#endif
-}
-
-static G_CONST_RETURN gchar*
-ea_day_view_main_item_get_name (AtkObject *accessible)
-{
-	AtkObject *parent;
-	g_return_val_if_fail (EA_IS_DAY_VIEW_MAIN_ITEM (accessible), NULL);
-	parent = atk_object_get_parent (accessible);
-	return atk_object_get_name (parent);
-}
-
-static G_CONST_RETURN gchar*
-ea_day_view_main_item_get_description (AtkObject *accessible)
-{
-	return _("a table to view and select the current time range");
-}
-
-static gint
-ea_day_view_main_item_get_n_children (AtkObject *accessible)
-{
-	AtkGObjectAccessible *atk_gobj;
-	GObject *g_obj;
-	EDayViewMainItem *main_item;
-	EDayView *day_view;
-
-	g_return_val_if_fail (EA_IS_DAY_VIEW_MAIN_ITEM (accessible), -1);
-
-	atk_gobj = ATK_GOBJECT_ACCESSIBLE (accessible);
-	g_obj = atk_gobject_accessible_get_object (atk_gobj);
-	if (!g_obj)
-		return -1;
-
-	main_item = E_DAY_VIEW_MAIN_ITEM (g_obj);
-	day_view = main_item->day_view;
-
-	return day_view->rows * day_view->days_shown;
-}
-
-static AtkObject *
-ea_day_view_main_item_ref_child (AtkObject *accessible, gint index)
-{
-	AtkGObjectAccessible *atk_gobj;
-	GObject *g_obj;
-	EDayViewMainItem *main_item;
-	EDayView *day_view;
-	gint n_children;
-	EDayViewCell *cell;
-	EaCellTable *cell_data;
-	EaDayViewMainItem *ea_main_item;
-
-	g_return_val_if_fail (EA_IS_DAY_VIEW_MAIN_ITEM (accessible), NULL);
-
-	atk_gobj = ATK_GOBJECT_ACCESSIBLE (accessible);
-	g_obj = atk_gobject_accessible_get_object (atk_gobj);
-	if (!g_obj)
-		return NULL;
-
-	main_item = E_DAY_VIEW_MAIN_ITEM (g_obj);
-	day_view = main_item->day_view;
-
-	n_children = ea_day_view_main_item_get_n_children (accessible);
-	if (index < 0 || index >= n_children)
-		return NULL;
-
-	ea_main_item = EA_DAY_VIEW_MAIN_ITEM (accessible);
-	cell_data = ea_day_view_main_item_get_cell_data (ea_main_item);
-	if (!cell_data)
-		return NULL;
-
-	cell = ea_cell_table_get_cell_at_index (cell_data, index);
-	if (!cell) {
-		gint row, column;
-
-		row = ea_day_view_main_item_get_row_at_index (ea_main_item, index);
-		column = ea_day_view_main_item_get_column_at_index (ea_main_item, index);
-		cell = e_day_view_cell_new (day_view, row, column);
-		ea_cell_table_set_cell_at_index (cell_data, index, cell);
-		g_object_unref (cell);
-	}
-	return g_object_ref (atk_gobject_accessible_for_object (G_OBJECT(cell)));
-}
-
-static AtkObject *
-ea_day_view_main_item_get_parent (AtkObject *accessible)
-{
-	AtkGObjectAccessible *atk_gobj;
-	GObject *g_obj;
-	EDayViewMainItem *main_item;
-
-	g_return_val_if_fail (EA_IS_DAY_VIEW_MAIN_ITEM (accessible), NULL);
-
-	atk_gobj = ATK_GOBJECT_ACCESSIBLE (accessible);
-	g_obj = atk_gobject_accessible_get_object (atk_gobj);
-	if (!g_obj)
-		return NULL;
-
-	main_item = E_DAY_VIEW_MAIN_ITEM (g_obj);
-	return gtk_widget_get_accessible (GTK_WIDGET (main_item->day_view));
-}
-
-static gint
-ea_day_view_main_item_get_index_in_parent (AtkObject *accessible)
-{
-	AtkGObjectAccessible *atk_gobj;
-	GObject *g_obj;
-
-	g_return_val_if_fail (EA_IS_DAY_VIEW_MAIN_ITEM (accessible), -1);
-
-	atk_gobj = ATK_GOBJECT_ACCESSIBLE (accessible);
-	g_obj = atk_gobject_accessible_get_object (atk_gobj);
-	if (!g_obj)
-		return -1;
-
-	/* always the first child of ea-day-view */
-	return 0;
-}
-
-/* callbacks */
-
-static void
-ea_day_view_main_item_dates_change_cb (GnomeCalendar *gcal, gpointer data)
-{
-	EaDayViewMainItem *ea_main_item;
-
-	g_return_if_fail (GNOME_IS_CALENDAR (gcal));
-	g_return_if_fail (data);
-	g_return_if_fail (EA_IS_DAY_VIEW_MAIN_ITEM (data));
-
-	ea_main_item = EA_DAY_VIEW_MAIN_ITEM (data);
-
-#ifdef ACC_DEBUG
-	printf ("EvoAcc: ea_day_view_main_item update cb\n");
-#endif
-
-	ea_day_view_main_item_destory_cell_data (ea_main_item);
-}
-
-static void
-ea_day_view_main_item_time_change_cb (EDayView *day_view, gpointer data)
-{
-	EaDayViewMainItem *ea_main_item;
-	AtkObject *item_cell = NULL;
-
-	g_return_if_fail (E_IS_DAY_VIEW (day_view));
-	g_return_if_fail (data);
-	g_return_if_fail (EA_IS_DAY_VIEW_MAIN_ITEM (data));
-
-	ea_main_item = EA_DAY_VIEW_MAIN_ITEM (data);
-
-#ifdef ACC_DEBUG
-	printf ("EvoAcc: ea_day_view_main_item time changed cb\n");
-#endif
-	/* only deal with the first selected child, for now */
-	item_cell = atk_selection_ref_selection (ATK_SELECTION (ea_main_item),
-						 0);
-	if (item_cell) {
-		AtkStateSet *state_set;
-		state_set = atk_object_ref_state_set (item_cell);
-		atk_state_set_add_state (state_set, ATK_STATE_FOCUSED);
-		g_object_unref (state_set);
-
-	        g_signal_emit_by_name (ea_main_item,
-			       "active-descendant-changed",
-			       item_cell);
-        	g_signal_emit_by_name (data, "selection_changed");
-                
-                atk_focus_tracker_notify (item_cell);
-                g_object_unref (item_cell);
-	}
-
-}
-
-/* helpers */
-
-static gint
-ea_day_view_main_item_get_child_index_at (EaDayViewMainItem *ea_main_item,
-					  gint row, gint column)
-{
-	AtkGObjectAccessible *atk_gobj;
-	GObject *g_obj;
-	EDayViewMainItem *main_item;
-	EDayView *day_view;
-
-	g_return_val_if_fail (ea_main_item, -1);
-
-	atk_gobj = ATK_GOBJECT_ACCESSIBLE (ea_main_item);
-	g_obj = atk_gobject_accessible_get_object (atk_gobj);
-	if (!g_obj)
-		return -1;
-
-	main_item = E_DAY_VIEW_MAIN_ITEM (g_obj);
-	day_view = main_item->day_view;
-
-	if (row >= 0 && row < day_view->rows &&
-	    column >= 0 && column < day_view->days_shown)
-		return column * day_view->rows + row;
-	return -1;
-}
-
-static gint
-ea_day_view_main_item_get_row_at_index (EaDayViewMainItem *ea_main_item,
-					gint index)
-{
-	AtkGObjectAccessible *atk_gobj;
-	GObject *g_obj;
-	EDayViewMainItem *main_item;
-	EDayView *day_view;
-	gint n_children;
-
-	g_return_val_if_fail (ea_main_item, -1);
-
-	atk_gobj = ATK_GOBJECT_ACCESSIBLE (ea_main_item);
-	g_obj = atk_gobject_accessible_get_object (atk_gobj);
-	if (!g_obj)
-		return -1;
-
-	main_item = E_DAY_VIEW_MAIN_ITEM (g_obj);
-	day_view = main_item->day_view;
-
-	n_children = ea_day_view_main_item_get_n_children (ATK_OBJECT (ea_main_item));
-	if (index >= 0 && index < n_children)
-		return index % day_view->rows;
-	return -1;
-}
-
-static gint
-ea_day_view_main_item_get_column_at_index (EaDayViewMainItem *ea_main_item,
-					   gint index)
-{
-	AtkGObjectAccessible *atk_gobj;
-	GObject *g_obj;
-	EDayViewMainItem *main_item;
-	EDayView *day_view;
-	gint n_children;
-
-	g_return_val_if_fail (ea_main_item, -1);
-
-	atk_gobj = ATK_GOBJECT_ACCESSIBLE (ea_main_item);
-	g_obj = atk_gobject_accessible_get_object (atk_gobj);
-	if (!g_obj)
-		return -1;
-
-	main_item = E_DAY_VIEW_MAIN_ITEM (g_obj);
-	day_view = main_item->day_view;
-
-	n_children = ea_day_view_main_item_get_n_children (ATK_OBJECT (ea_main_item));
-	if (index >= 0 && index < n_children)
-		return index / day_view->rows;
-	return -1;
-}
-
-static gint
-ea_day_view_main_item_get_row_label (EaDayViewMainItem *ea_main_item,
-				     gint row, gchar *buffer, gint buffer_size)
-{
-	AtkGObjectAccessible *atk_gobj;
-	GObject *g_obj;
-	EDayViewMainItem *main_item;
-	EDayView *day_view;
-	gchar *suffix;
-	gint hour, minute, suffix_width;
-
-	g_return_val_if_fail (ea_main_item, 0);
-
-	atk_gobj = ATK_GOBJECT_ACCESSIBLE (ea_main_item);
-	g_obj = atk_gobject_accessible_get_object (atk_gobj);
-	if (!g_obj)
-		return 0 ;
-
-	main_item = E_DAY_VIEW_MAIN_ITEM (g_obj);
-	day_view = main_item->day_view;
-
-	hour = day_view->first_hour_shown;
-	minute = day_view->first_minute_shown;
-	minute += row * day_view->mins_per_row;
-	hour = (hour + minute / 60) % 24;
-	minute %= 60;
-
-	e_day_view_convert_time_to_display (day_view, hour, &hour,
-					    &suffix, &suffix_width);
-	return g_snprintf (buffer, buffer_size, "%i:%02i %s",
-		    hour, minute, suffix);
-}
-
-static EaCellTable *
-ea_day_view_main_item_get_cell_data (EaDayViewMainItem *ea_main_item)
-{
-	AtkGObjectAccessible *atk_gobj;
-	GObject *g_obj;
-	EDayViewMainItem *main_item;
-	EDayView *day_view;
-	EaCellTable *cell_data;
-
-	g_return_val_if_fail (ea_main_item, NULL);
-
-	atk_gobj = ATK_GOBJECT_ACCESSIBLE (ea_main_item);
-	g_obj = atk_gobject_accessible_get_object (atk_gobj);
-	if (!g_obj)
-		return NULL;
-
-	main_item = E_DAY_VIEW_MAIN_ITEM (g_obj);
-	day_view = main_item->day_view;
-
-	cell_data = g_object_get_data (G_OBJECT(ea_main_item),
-				       "ea-day-view-cell-table");
-	if (!cell_data) {
-		cell_data = ea_cell_table_create (day_view->rows,
-						  day_view->days_shown, TRUE);
-		g_object_set_data (G_OBJECT(ea_main_item),
-				   "ea-day-view-cell-table", cell_data);
-	}
-	return cell_data;
-}
-
-static void
-ea_day_view_main_item_destory_cell_data (EaDayViewMainItem *ea_main_item)
-{
-	EaCellTable *cell_data;
-
-	g_return_if_fail (ea_main_item);
-
-	cell_data = g_object_get_data (G_OBJECT(ea_main_item),
-				       "ea-day-view-cell-table");
-	if (cell_data) {
-		ea_cell_table_destroy (cell_data);
-		g_object_set_data (G_OBJECT(ea_main_item),
-				   "ea-day-view-cell-table", NULL);
-	}
-}
-
-/* Atk Component Interface */
-
-static void 
-atk_component_interface_init (AtkComponentIface *iface)
-{
-	g_return_if_fail (iface != NULL);
-
-	iface->get_extents = component_interface_get_extents;
-}
-
-static void 
-component_interface_get_extents (AtkComponent *component,
-				 gint *x, gint *y, gint *width, gint *height,
-				 AtkCoordType coord_type)
-{
-	GObject *g_obj;
-	AtkObject *ea_canvas;
-	EDayViewMainItem *main_item;
-	EDayView *day_view;
-
-	*x = *y = *width = *height = 0;
-
-	g_return_if_fail (EA_IS_DAY_VIEW_MAIN_ITEM (component));
-
-	g_obj = atk_gobject_accessible_get_object (ATK_GOBJECT_ACCESSIBLE(component));
-	if (!g_obj)
-		/* defunct object*/
-		return;
-	main_item = E_DAY_VIEW_MAIN_ITEM (g_obj);
-	day_view = main_item->day_view;
-
-	ea_canvas = gtk_widget_get_accessible (day_view->main_canvas);
-	atk_component_get_extents (ATK_COMPONENT (ea_canvas), x, y,
-				   width, height, coord_type);
-}
-
-/* atk table interface */
-
-static void 
-atk_table_interface_init (AtkTableIface *iface)
-{
-	g_return_if_fail (iface != NULL);
-
-	iface->ref_at = table_interface_ref_at;
-
-	iface->get_n_rows = table_interface_get_n_rows;
-	iface->get_n_columns = table_interface_get_n_columns;
-	iface->get_index_at = table_interface_get_index_at;
-	iface->get_column_at_index = table_interface_get_column_at_index;
-	iface->get_row_at_index = table_interface_get_row_at_index;
-	iface->get_column_extent_at = table_interface_get_column_extent_at;
-	iface->get_row_extent_at = table_interface_get_row_extent_at;
-
-	iface->is_selected = table_interface_is_selected;
-	iface->get_selected_rows = table_interface_get_selected_rows;
-	iface->get_selected_columns = table_interface_get_selected_columns;
-	iface->is_row_selected = table_interface_is_row_selected;
-	iface->is_column_selected = table_interface_is_column_selected;
-	iface->add_row_selection = table_interface_add_row_selection;
-	iface->remove_row_selection = table_interface_remove_row_selection;
-	iface->add_column_selection = table_interface_add_column_selection;
-	iface->remove_column_selection = table_interface_remove_column_selection;
-
-	iface->get_row_header = table_interface_get_row_header;
-	iface->get_column_header = table_interface_get_column_header;
-	iface->get_caption = table_interface_get_caption;
-	iface->get_summary = table_interface_get_summary;
-	iface->get_row_description = table_interface_get_row_description;
-	iface->get_column_description = table_interface_get_column_description;
-}
-
-static AtkObject* 
-table_interface_ref_at (AtkTable *table,
-			gint     row, 
-			gint     column)
-{
-	gint index;
-
-	EaDayViewMainItem* ea_main_item = EA_DAY_VIEW_MAIN_ITEM (table);
-	index = ea_day_view_main_item_get_child_index_at (ea_main_item,
-							  row, column);
-	return ea_day_view_main_item_ref_child (ATK_OBJECT (ea_main_item), index);
-}
-
-static gint 
-table_interface_get_n_rows (AtkTable *table)
-{
-	AtkGObjectAccessible *atk_gobj;
-	GObject *g_obj;
-	EDayViewMainItem *main_item;
-	EDayView *day_view;
-	EaDayViewMainItem* ea_main_item = EA_DAY_VIEW_MAIN_ITEM (table);
-
-	atk_gobj = ATK_GOBJECT_ACCESSIBLE (ea_main_item);
-	g_obj = atk_gobject_accessible_get_object (atk_gobj);
-	if (!g_obj)
-		return -1;
-
-	main_item = E_DAY_VIEW_MAIN_ITEM (g_obj);
-	day_view = main_item->day_view;
-
-	return day_view->rows;
-}
-
-static gint 
-table_interface_get_n_columns (AtkTable *table)
-{
-	AtkGObjectAccessible *atk_gobj;
-	GObject *g_obj;
-	EDayViewMainItem *main_item;
-	EDayView *day_view;
-	EaDayViewMainItem* ea_main_item = EA_DAY_VIEW_MAIN_ITEM (table);
-
-	atk_gobj = ATK_GOBJECT_ACCESSIBLE (ea_main_item);
-	g_obj = atk_gobject_accessible_get_object (atk_gobj);
-	if (!g_obj)
-		return -1;
-
-	main_item = E_DAY_VIEW_MAIN_ITEM (g_obj);
-	day_view = main_item->day_view;
-
-	return day_view->days_shown;
-}
-
-static gint
-table_interface_get_index_at (AtkTable *table,
-			      gint     row,
-			      gint     column)
-{
-	EaDayViewMainItem* ea_main_item = EA_DAY_VIEW_MAIN_ITEM (table);
-	return ea_day_view_main_item_get_child_index_at (ea_main_item,
-							 row, column);
-}
-
-static gint
-table_interface_get_column_at_index (AtkTable *table,
-				     gint     index)
-{
-	EaDayViewMainItem* ea_main_item = EA_DAY_VIEW_MAIN_ITEM (table);
-	return ea_day_view_main_item_get_column_at_index (ea_main_item, index);
-}
-
-static gint
-table_interface_get_row_at_index (AtkTable *table,
-				  gint     index)
-{
-	EaDayViewMainItem* ea_main_item = EA_DAY_VIEW_MAIN_ITEM (table);
-	return ea_day_view_main_item_get_row_at_index (ea_main_item, index);
-}
-
-static gint
-table_interface_get_column_extent_at (AtkTable      *table,
-				      gint          row,
-				      gint          column)
-{
-	gint index;
-	gint width = 0, height = 0;
-	AtkObject *child;
-	EaDayViewMainItem* ea_main_item = EA_DAY_VIEW_MAIN_ITEM (table);
-
-	index = ea_day_view_main_item_get_child_index_at (ea_main_item,
-							  row, column);
-	child = atk_object_ref_accessible_child (ATK_OBJECT (ea_main_item),
-						 index);
-	if (child)
-		atk_component_get_size (ATK_COMPONENT (child),
-					&width, &height);
-
-	return width;
-}
-
-static gint 
-table_interface_get_row_extent_at (AtkTable      *table,
-				   gint          row,
-				   gint          column)
-{
-	gint index;
-	gint width = 0, height = 0;
-	AtkObject *child;
-	EaDayViewMainItem* ea_main_item = EA_DAY_VIEW_MAIN_ITEM (table);
-
-	index = ea_day_view_main_item_get_child_index_at (ea_main_item,
-							  row, column);
-	child = atk_object_ref_accessible_child (ATK_OBJECT (ea_main_item),
-						 index);
-	if (child)
-		atk_component_get_size (ATK_COMPONENT (child),
-					&width, &height);
-
-	return height;
-}
-
-static gboolean 
-table_interface_is_row_selected (AtkTable *table,
-				 gint     row)
-{
-	AtkGObjectAccessible *atk_gobj;
-	GObject *g_obj;
-	EDayViewMainItem *main_item;
-	EDayView *day_view;
-	EaDayViewMainItem* ea_main_item = EA_DAY_VIEW_MAIN_ITEM (table);
-
-	atk_gobj = ATK_GOBJECT_ACCESSIBLE (ea_main_item);
-	g_obj = atk_gobject_accessible_get_object (atk_gobj);
-	if (!g_obj)
-		return FALSE;
-
-	main_item = E_DAY_VIEW_MAIN_ITEM (g_obj);
-	day_view = main_item->day_view;
-
-	if (day_view->selection_start_day == -1)
-		/* no selection */
-		return FALSE;
-	if (day_view->selection_start_day != day_view->selection_end_day)
-		/* all row is selected */
-		return TRUE;
-	if (row >= day_view->selection_start_row &&
-	    row <= day_view->selection_end_row)
-		return TRUE;
-	return FALSE;
-}
-
-static gboolean 
-table_interface_is_selected (AtkTable *table, 
-			     gint     row, 
-			     gint     column)
-{
-	return table_interface_is_row_selected (table, row) &&
-		table_interface_is_column_selected (table, column);
-}
-
-static gboolean 
-table_interface_is_column_selected (AtkTable *table,
-				    gint     column)
-{
-	AtkGObjectAccessible *atk_gobj;
-	GObject *g_obj;
-	EDayViewMainItem *main_item;
-	EDayView *day_view;
-	EaDayViewMainItem* ea_main_item = EA_DAY_VIEW_MAIN_ITEM (table);
-
-	atk_gobj = ATK_GOBJECT_ACCESSIBLE (ea_main_item);
-	g_obj = atk_gobject_accessible_get_object (atk_gobj);
-	if (!g_obj)
-		return FALSE;
-
-	main_item = E_DAY_VIEW_MAIN_ITEM (g_obj);
-	day_view = main_item->day_view;
-
-	if (column >= day_view->selection_start_day &&
-	    column <= day_view->selection_end_day)
-		return TRUE;
-	return FALSE;
-}
-
-static gint 
-table_interface_get_selected_rows (AtkTable *table,
-				   gint     **rows_selected)
-{
-	AtkGObjectAccessible *atk_gobj;
-	GObject *g_obj;
-	EDayViewMainItem *main_item;
-	EDayView *day_view;
-	EaDayViewMainItem* ea_main_item = EA_DAY_VIEW_MAIN_ITEM (table);
-	gint start_row = -1, n_rows = 0;
-
-	atk_gobj = ATK_GOBJECT_ACCESSIBLE (ea_main_item);
-	g_obj = atk_gobject_accessible_get_object (atk_gobj);
-	if (!g_obj)
-		return -1;
-
-	main_item = E_DAY_VIEW_MAIN_ITEM (g_obj);
-	day_view = main_item->day_view;
-
-	if (day_view->selection_start_day == -1)
-		return 0;
-
-	if (day_view->selection_start_day != day_view->selection_end_day) {
-		/* all the rows should be selected */
-		n_rows = day_view->rows;
-		start_row = 0;
-	}
-	else if (day_view->selection_start_row != -1) {
-		start_row = day_view->selection_start_row;
-		n_rows = day_view->selection_end_row - start_row + 1;
-	}
-	if (n_rows > 0 && start_row != -1 && rows_selected) {
-		gint index;
-
-		*rows_selected = (gint *) g_malloc (n_rows * sizeof (gint));
-		for (index = 0; index < n_rows; ++index)
-			(*rows_selected)[index] = start_row + index;
-	}
-	return n_rows;
-}
-
-static gint 
-table_interface_get_selected_columns (AtkTable *table,
-				      gint **columns_selected)
-{
-	AtkGObjectAccessible *atk_gobj;
-	GObject *g_obj;
-	EDayViewMainItem *main_item;
-	EDayView *day_view;
-	EaDayViewMainItem* ea_main_item = EA_DAY_VIEW_MAIN_ITEM (table);
-	gint start_column = -1, n_columns = 0;
-
-	atk_gobj = ATK_GOBJECT_ACCESSIBLE (ea_main_item);
-	g_obj = atk_gobject_accessible_get_object (atk_gobj);
-	if (!g_obj)
-		return -1;
-
-	main_item = E_DAY_VIEW_MAIN_ITEM (g_obj);
-	day_view = main_item->day_view;
-
-	if (day_view->selection_start_day == -1)
-		return 0;
-
-	start_column = day_view->selection_start_day;
-	n_columns = day_view->selection_end_day - start_column + 1;
-	if (n_columns > 0 && start_column != -1 && columns_selected) {
-		gint index;
-
-		*columns_selected = (gint *) g_malloc (n_columns * sizeof (gint));
-		for (index = 0; index < n_columns; ++index)
-			(*columns_selected)[index] = start_column + index;
-	}
-	return n_columns;
-}
-
-static gboolean 
-table_interface_add_row_selection (AtkTable *table, 
-				   gint row)
-{
-	AtkGObjectAccessible *atk_gobj;
-	GObject *g_obj;
-	EDayViewMainItem *main_item;
-	EDayView *day_view;
-	EaDayViewMainItem* ea_main_item = EA_DAY_VIEW_MAIN_ITEM (table);
-
-	atk_gobj = ATK_GOBJECT_ACCESSIBLE (ea_main_item);
-	g_obj = atk_gobject_accessible_get_object (atk_gobj);
-	if (!g_obj)
-		return FALSE;
-
-	main_item = E_DAY_VIEW_MAIN_ITEM (g_obj);
-	day_view = main_item->day_view;
-
-	/* FIXME: we need multi-selection */
-
-	day_view->selection_start_day = 0;
-	day_view->selection_end_day = 0;
-	day_view->selection_start_row = row;
-	day_view->selection_end_row = row;
-
-	e_day_view_ensure_rows_visible (day_view,
-					day_view->selection_start_row,
-					day_view->selection_end_row);
-	e_day_view_update_calendar_selection_time (day_view);
-	gtk_widget_queue_draw (day_view->main_canvas);
-	return TRUE;
-}
-
-static gboolean 
-table_interface_remove_row_selection (AtkTable *table, 
-				      gint row)
-{
-	return FALSE;
-}
-
-static gboolean 
-table_interface_add_column_selection (AtkTable *table, 
-				      gint column)
-{
-	AtkGObjectAccessible *atk_gobj;
-	GObject *g_obj;
-	EDayViewMainItem *main_item;
-	EDayView *day_view;
-	EaDayViewMainItem* ea_main_item = EA_DAY_VIEW_MAIN_ITEM (table);
-
-	atk_gobj = ATK_GOBJECT_ACCESSIBLE (ea_main_item);
-	g_obj = atk_gobject_accessible_get_object (atk_gobj);
-	if (!g_obj)
-		return FALSE;
-
-	main_item = E_DAY_VIEW_MAIN_ITEM (g_obj);
-	day_view = main_item->day_view;
-
-	/* FIXME: we need multi-selection */
-
-	day_view->selection_start_day = column;
-	day_view->selection_end_day = column;
-	day_view->selection_start_row = 0;
-	day_view->selection_end_row = day_view->rows;
-
-	e_day_view_update_calendar_selection_time (day_view);
-	gtk_widget_queue_draw (day_view->main_canvas);
-	return TRUE;
-}
-
-static gboolean 
-table_interface_remove_column_selection (AtkTable *table, 
-					 gint     column)
-{
-	/* FIXME: NOT IMPLEMENTED */
-	return FALSE;
-}
-
-static AtkObject* 
-table_interface_get_row_header (AtkTable *table, 
-				gint     row)
-{
-	/* FIXME: NOT IMPLEMENTED */
-	return NULL;
-}
-
-static AtkObject* 
-table_interface_get_column_header (AtkTable *table, 
-				   gint     in_col)
-{
-	/* FIXME: NOT IMPLEMENTED */
-	return NULL;
-}
-
-static AtkObject*
-table_interface_get_caption (AtkTable	*table)
-{
-	/* FIXME: NOT IMPLEMENTED */
-	return NULL;
-}
-
-static G_CONST_RETURN gchar*
-table_interface_get_column_description (AtkTable	  *table,
-					gint       in_col)
-{
-	AtkGObjectAccessible *atk_gobj;
-	GObject *g_obj;
-	EDayViewMainItem *main_item;
-	EDayView *day_view;
-	EaDayViewMainItem* ea_main_item = EA_DAY_VIEW_MAIN_ITEM (table);
-	const gchar *description;
-	EaCellTable *cell_data;
-
-	atk_gobj = ATK_GOBJECT_ACCESSIBLE (ea_main_item);
-	g_obj = atk_gobject_accessible_get_object (atk_gobj);
-	if (!g_obj)
-		return NULL;
-
-	main_item = E_DAY_VIEW_MAIN_ITEM (g_obj);
-	day_view = main_item->day_view;
-
-	if (in_col < 0 || in_col >= day_view->days_shown)
-		return NULL;
-	cell_data = ea_day_view_main_item_get_cell_data (ea_main_item);
-	if (!cell_data)
-		return NULL;
-
-	description = ea_cell_table_get_column_label (cell_data, in_col);
-	if (!description) {
-		gchar buffer[128];
-		e_day_view_top_item_get_day_label (day_view, in_col, buffer, 128);
-		ea_cell_table_set_column_label (cell_data, in_col, buffer);
-		description = ea_cell_table_get_column_label (cell_data, in_col);
-	}
-	return description;
-}
-
-static G_CONST_RETURN gchar*
-table_interface_get_row_description (AtkTable    *table,
-				     gint        row)
-{
-	AtkGObjectAccessible *atk_gobj;
-	GObject *g_obj;
-	EDayViewMainItem *main_item;
-	EDayView *day_view;
-	EaDayViewMainItem* ea_main_item = EA_DAY_VIEW_MAIN_ITEM (table);
-	const gchar *description;
-	EaCellTable *cell_data;
-
-	atk_gobj = ATK_GOBJECT_ACCESSIBLE (ea_main_item);
-	g_obj = atk_gobject_accessible_get_object (atk_gobj);
-	if (!g_obj)
-		return NULL;
-
-	main_item = E_DAY_VIEW_MAIN_ITEM (g_obj);
-	day_view = main_item->day_view;
-
-	if (row < 0 || row >= 12 * 24)
-		return NULL;
-	cell_data = ea_day_view_main_item_get_cell_data (ea_main_item);
-	if (!cell_data)
-		return NULL;
-
-	description = ea_cell_table_get_row_label (cell_data, row);
-	if (!description) {
-		gchar buffer[128];
-		ea_day_view_main_item_get_row_label (ea_main_item, row, buffer, sizeof (buffer));
-		ea_cell_table_set_row_label (cell_data, row, buffer);
-		description = ea_cell_table_get_row_label (cell_data,
-								row);
-	}
-	return description;
-}
-
-static AtkObject*
-table_interface_get_summary (AtkTable	*table)
-{
-	/* FIXME: NOT IMPLEMENTED */
-	return NULL;
-}
-
-/* atkselection interface */
-
-static void
-atk_selection_interface_init (AtkSelectionIface *iface)
-{
-	g_return_if_fail (iface != NULL);
-
-	iface->add_selection = selection_interface_add_selection;
-	iface->clear_selection = selection_interface_clear_selection;
-	iface->ref_selection = selection_interface_ref_selection;
-	iface->get_selection_count = selection_interface_get_selection_count;
-	iface->is_child_selected = selection_interface_is_child_selected;
-}
-
-static gboolean
-selection_interface_add_selection (AtkSelection *selection, gint i)
-{
-	AtkGObjectAccessible *atk_gobj;
-	GObject *g_obj;
-	EDayViewMainItem *main_item;
-	EDayView *day_view;
-	EaDayViewMainItem* ea_main_item = EA_DAY_VIEW_MAIN_ITEM (selection);
-	gint column, row;
-
-	atk_gobj = ATK_GOBJECT_ACCESSIBLE (ea_main_item);
-	g_obj = atk_gobject_accessible_get_object (atk_gobj);
-	if (!g_obj)
-		return FALSE;
-
-	main_item = E_DAY_VIEW_MAIN_ITEM (g_obj);
-	day_view = main_item->day_view;
-
-	row = ea_day_view_main_item_get_row_at_index (ea_main_item, i);
-	column = ea_day_view_main_item_get_column_at_index (ea_main_item, i);
-
-	if (row == -1 || column == -1)
-		return FALSE;
-
-	/*FIXME: multi-selection is needed */
-	day_view->selection_start_day = column;
-	day_view->selection_end_day = column;
-	day_view->selection_start_row = row;
-	day_view->selection_end_row = row;
-
-	e_day_view_ensure_rows_visible (day_view,
-					day_view->selection_start_row,
-					day_view->selection_end_row);
-	e_day_view_update_calendar_selection_time (day_view);
-	gtk_widget_queue_draw (day_view->main_canvas);
-	return TRUE;
-}
-
-static gboolean
-selection_interface_clear_selection (AtkSelection *selection)
-{
-	AtkGObjectAccessible *atk_gobj;
-	GObject *g_obj;
-	EDayViewMainItem *main_item;
-	EDayView *day_view;
-	EaDayViewMainItem* ea_main_item = EA_DAY_VIEW_MAIN_ITEM (selection);
-
-	atk_gobj = ATK_GOBJECT_ACCESSIBLE (ea_main_item);
-	g_obj = atk_gobject_accessible_get_object (atk_gobj);
-	if (!g_obj)
-		return FALSE;
-
-	main_item = E_DAY_VIEW_MAIN_ITEM (g_obj);
-	day_view = main_item->day_view;
-
-	day_view->selection_start_row = -1;
-	day_view->selection_start_day = -1;
-	day_view->selection_end_row = -1;
-	day_view->selection_end_day = -1;
-
-	e_day_view_update_calendar_selection_time (day_view);
-	gtk_widget_queue_draw (day_view->main_canvas);
-
-	return TRUE;
-}
-
-static AtkObject*  
-selection_interface_ref_selection (AtkSelection *selection, gint i)
-{
-	gint count;
-	GObject *g_obj;
-	EDayView *day_view;
-	EaDayViewMainItem* ea_main_item = EA_DAY_VIEW_MAIN_ITEM (selection);
-	gint start_index;
-
-	count = selection_interface_get_selection_count (selection);
-	if (i < 0 || i >=count)
-		return NULL;
-
-	g_obj = atk_gobject_accessible_get_object (ATK_GOBJECT_ACCESSIBLE (ea_main_item));
-	day_view = E_DAY_VIEW_MAIN_ITEM (g_obj)->day_view;
-	start_index = ea_day_view_main_item_get_child_index_at (ea_main_item,
-								day_view->selection_start_row,
-								day_view->selection_start_day);
-
-	return ea_day_view_main_item_ref_child (ATK_OBJECT (selection), start_index + i);
-}
-
-static gint
-selection_interface_get_selection_count (AtkSelection *selection)
-{
-	AtkGObjectAccessible *atk_gobj;
-	GObject *g_obj;
-	EDayViewMainItem *main_item;
-	EDayView *day_view;
-	EaDayViewMainItem* ea_main_item = EA_DAY_VIEW_MAIN_ITEM (selection);
-	gint start_index, end_index;
-
-	atk_gobj = ATK_GOBJECT_ACCESSIBLE (ea_main_item);
-	g_obj = atk_gobject_accessible_get_object (atk_gobj);
-	if (!g_obj)
-		return 0;
-
-	main_item = E_DAY_VIEW_MAIN_ITEM (g_obj);
-	day_view = main_item->day_view;
-
-	if (day_view->selection_start_day == -1 ||
-	    day_view->selection_start_row == -1)
-		return 0;
-	start_index = ea_day_view_main_item_get_child_index_at (ea_main_item,
-								day_view->selection_start_row,
-								day_view->selection_start_day);
-	end_index = ea_day_view_main_item_get_child_index_at (ea_main_item,
-								day_view->selection_end_row,
-								day_view->selection_end_day);
-
-	return end_index - start_index + 1;
-}
-
-static gboolean
-selection_interface_is_child_selected (AtkSelection *selection, gint i)
-{
-	AtkGObjectAccessible *atk_gobj;
-	GObject *g_obj;
-	EDayViewMainItem *main_item;
-	EDayView *day_view;
-	EaDayViewMainItem* ea_main_item = EA_DAY_VIEW_MAIN_ITEM (selection);
-	gint column, row;
-
-	atk_gobj = ATK_GOBJECT_ACCESSIBLE (ea_main_item);
-	g_obj = atk_gobject_accessible_get_object (atk_gobj);
-	if (!g_obj)
-		return FALSE;
-
-	main_item = E_DAY_VIEW_MAIN_ITEM (g_obj);
-	day_view = main_item->day_view;
-
-	row = ea_day_view_main_item_get_row_at_index (ea_main_item, i);
-	column = ea_day_view_main_item_get_column_at_index (ea_main_item, i);
-
-	if (column < day_view->selection_start_day ||
-	    column > day_view->selection_end_day)
-		return FALSE;
-
-	if ((column == day_view->selection_start_day ||
-	     column == day_view->selection_end_day) &&
-	    (row < day_view->selection_start_row ||
-	     row > day_view->selection_end_row))
-		return FALSE;
-
-	/* if comes here, the cell is selected */
-	return TRUE;
-}
diff --git a/a11y/calendar/ea-day-view-main-item.h b/a11y/calendar/ea-day-view-main-item.h
deleted file mode 100644
index d22372d064..0000000000
--- a/a11y/calendar/ea-day-view-main-item.h
+++ /dev/null
@@ -1,64 +0,0 @@
-/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-/* vim:expandtab:shiftwidth=8:tabstop=8:
- */
-/* Evolution Accessibility: ea-day-view-main-item.h
- *
- * Copyright (C) 2003 Ximian, Inc.
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of version 2 of the GNU General Public
- * License as published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * General Public License for more details.
- *
- * You should have received a copy of the GNU General Public
- * License along with this program; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
- *
- * Author: Bolian Yin <bolian.yin@sun.com> Sun Microsystem Inc., 2003
- *
- */
-
-#ifndef __EA_DAY_VIEW_MAIN_ITEM_H__
-#define __EA_DAY_VIEW_MAIN_ITEM_H__
-
-#include <atk/atkgobjectaccessible.h>
-#include "e-day-view-main-item.h"
-
-#ifdef __cplusplus
-extern "C" {
-#endif /* __cplusplus */
-
-#define EA_TYPE_DAY_VIEW_MAIN_ITEM                     (ea_day_view_main_item_get_type ())
-#define EA_DAY_VIEW_MAIN_ITEM(obj)                     (G_TYPE_CHECK_INSTANCE_CAST ((obj), EA_TYPE_DAY_VIEW_MAIN_ITEM, EaDayViewMainItem))
-#define EA_DAY_VIEW_MAIN_ITEM_CLASS(klass)             (G_TYPE_CHECK_CLASS_CAST ((klass), EA_TYPE_DAY_VIEW_MAIN_ITEM, EaDayViewMainItemClass))
-#define EA_IS_DAY_VIEW_MAIN_ITEM(obj)                  (G_TYPE_CHECK_INSTANCE_TYPE ((obj), EA_TYPE_DAY_VIEW_MAIN_ITEM))
-#define EA_IS_DAY_VIEW_MAIN_ITEM_CLASS(klass)          (G_TYPE_CHECK_CLASS_TYPE ((klass), EA_TYPE_DAY_VIEW_MAIN_ITEM))
-#define EA_DAY_VIEW_MAIN_ITEM_GET_CLASS(obj)           (G_TYPE_INSTANCE_GET_CLASS ((obj), EA_TYPE_DAY_VIEW_MAIN_ITEM, EaDayViewMainItemClass))
-
-typedef struct _EaDayViewMainItem                   EaDayViewMainItem;
-typedef struct _EaDayViewMainItemClass              EaDayViewMainItemClass;
-
-struct _EaDayViewMainItem
-{
-	AtkGObjectAccessible parent;
-};
-
-GType ea_day_view_main_item_get_type (void);
-
-struct _EaDayViewMainItemClass
-{
-	AtkGObjectAccessibleClass parent_class;
-};
-
-AtkObject*     ea_day_view_main_item_new         (GObject *obj);
-
-#ifdef __cplusplus
-}
-#endif /* __cplusplus */
-
-#endif /* __EA_DAY_VIEW_MAIN_ITEM_H__ */
diff --git a/a11y/calendar/ea-day-view.c b/a11y/calendar/ea-day-view.c
deleted file mode 100644
index cfe96634ba..0000000000
--- a/a11y/calendar/ea-day-view.c
+++ /dev/null
@@ -1,267 +0,0 @@
-/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-/* vim:expandtab:shiftwidth=8:tabstop=8:
- */
-/* Evolution Accessibility: ea-day-view.c
- *
- * Copyright (C) 2003 Ximian, Inc.
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of version 2 of the GNU General Public
- * License as published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * General Public License for more details.
- *
- * You should have received a copy of the GNU General Public
- * License along with this program; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
- *
- * Author: Bolian Yin <bolian.yin@sun.com> Sun Microsystem Inc., 2003
- *
- */
-
-#include "ea-day-view.h"
-#include "ea-cal-view-event.h"
-
-#include "ea-calendar-helpers.h"
-#include "ea-gnome-calendar.h"
-#include "calendar-commands.h"
-#include <glib/gstrfuncs.h>
-#include <libgnome/gnome-i18n.h>
-
-static void ea_day_view_class_init (EaDayViewClass *klass);
-
-static G_CONST_RETURN gchar* ea_day_view_get_name (AtkObject *accessible);
-static G_CONST_RETURN gchar* ea_day_view_get_description (AtkObject *accessible);
-static gint         ea_day_view_get_n_children      (AtkObject *obj);
-static AtkObject*   ea_day_view_ref_child           (AtkObject *obj,
-                                                     gint i);
-static gpointer parent_class = NULL;
-
-GType
-ea_day_view_get_type (void)
-{
-	static GType type = 0;
-	AtkObjectFactory *factory;
-	GTypeQuery query;
-	GType derived_atk_type;
-
-	if (!type) {
-		static GTypeInfo tinfo = {
-			sizeof (EaDayViewClass),
-			(GBaseInitFunc) NULL, /* base init */
-			(GBaseFinalizeFunc) NULL, /* base finalize */
-			(GClassInitFunc) ea_day_view_class_init, /* class init */
-			(GClassFinalizeFunc) NULL, /* class finalize */
-			NULL, /* class data */
-			sizeof (EaDayView), /* instance size */
-			0, /* nb preallocs */
-			(GInstanceInitFunc) NULL, /* instance init */
-			NULL /* value table */
-		};
-
-		/*
-		 * Figure out the size of the class and instance
-		 * we are run-time deriving from (EaCalView, in this case)
-		 *
-		 * Note: we must still use run-time deriving here, because
-		 * our parent class EaCalView is run-time deriving.
-		 */
-
-		factory = atk_registry_get_factory (atk_get_default_registry (),
-						    e_cal_view_get_type());
-		derived_atk_type = atk_object_factory_get_accessible_type (factory);
-		g_type_query (derived_atk_type, &query);
-
-		tinfo.class_size = query.class_size;
-		tinfo.instance_size = query.instance_size;
-
-		type = g_type_register_static (derived_atk_type,
-					       "EaDayView", &tinfo, 0);
-	}
-
-	return type;
-}
-
-static void
-ea_day_view_class_init (EaDayViewClass *klass)
-{
-	AtkObjectClass *class = ATK_OBJECT_CLASS (klass);
-
-	parent_class = g_type_class_peek_parent (klass);
-
-	class->get_name = ea_day_view_get_name;
-	class->get_description = ea_day_view_get_description;
-
-	class->get_n_children = ea_day_view_get_n_children;
-	class->ref_child = ea_day_view_ref_child;
-}
-
-AtkObject* 
-ea_day_view_new (GtkWidget *widget)
-{
-	GObject *object;
-	AtkObject *accessible;
-
-	g_return_val_if_fail (E_IS_DAY_VIEW (widget), NULL);
-
-	object = g_object_new (EA_TYPE_DAY_VIEW, NULL);
-
-	accessible = ATK_OBJECT (object);
-	atk_object_initialize (accessible, widget);
-
-#ifdef ACC_DEBUG
-	printf ("EvoAcc: ea_day_view created %p\n", (void *)accessible);
-#endif
-
-	return accessible;
-}
-
-static G_CONST_RETURN gchar*
-ea_day_view_get_name (AtkObject *accessible)
-{
-	EDayView *day_view;
-	GnomeCalendar *gcal;
-	const gchar *label_text;
-	GnomeCalendarViewType view_type;
-	gint n_events;
-	gchar *event_str, *name_str;
-
-	g_return_val_if_fail (EA_IS_DAY_VIEW (accessible), NULL);
-
-	if (!GTK_ACCESSIBLE (accessible)->widget)
-		return NULL;
-
-	day_view = E_DAY_VIEW (GTK_ACCESSIBLE (accessible)->widget);
-	gcal = e_calendar_view_get_calendar (E_CALENDAR_VIEW (day_view));
-	label_text = ea_gnome_calendar_get_label_description (gcal);
-
-	n_events = atk_object_get_n_accessible_children (accessible);
-	/* the child main item is always there */
-	--n_events;
-	if (n_events >= 1)
-		event_str = g_strdup_printf (ngettext ("It has %d event.", "It has %d events.", n_events), n_events);
-	else
-		event_str = g_strdup (_("It has no events."));
-
-	view_type = gnome_calendar_get_view (gcal);
-	if (view_type == GNOME_CAL_WORK_WEEK_VIEW)
-		name_str = g_strdup_printf (_("Work Week View: %s. %s"),
-						label_text, event_str);
-	else
-		name_str = g_strdup_printf (_("Day View: %s. %s"),
-						label_text, event_str);
-
-	ATK_OBJECT_CLASS (parent_class)->set_name (accessible, name_str);
-	g_free (name_str);
-	g_free (event_str);
-
-	return accessible->name;
-}
-
-static G_CONST_RETURN gchar*
-ea_day_view_get_description (AtkObject *accessible)
-{
-	EDayView *day_view;
-
-	g_return_val_if_fail (EA_IS_DAY_VIEW (accessible), NULL);
-
-	if (!GTK_ACCESSIBLE (accessible)->widget)
-		return NULL;
-	day_view = E_DAY_VIEW (GTK_ACCESSIBLE (accessible)->widget);
-
-	if (accessible->description)
-		return accessible->description;
-	else {
-		GnomeCalendar *gcal;
-		GnomeCalendarViewType view_type;
-
-		gcal = e_calendar_view_get_calendar (E_CALENDAR_VIEW (day_view));
-		view_type = gnome_calendar_get_view (gcal);
-
-		if (view_type == GNOME_CAL_WORK_WEEK_VIEW)
-			return _("calendar view for a work week");
-		else
-			return _("calendar view for one or more days");
-	}
-}
-
-static gint
-ea_day_view_get_n_children (AtkObject *accessible)
-{
-	EDayView *day_view;
-	gint day;
-	gint child_num = 0;
-
-	g_return_val_if_fail (EA_IS_DAY_VIEW (accessible), -1);
-
-	if (!GTK_ACCESSIBLE (accessible)->widget)
-		return -1;
-
-	day_view = E_DAY_VIEW (GTK_ACCESSIBLE (accessible)->widget);
-
-	child_num += day_view->long_events->len;
-
-	for (day = 0; day < day_view->days_shown; day++) {
-		child_num += day_view->events[day]->len;
-	}
-
-	/* "+1" for the main item */
-	return child_num + 1;
-}
-
-static AtkObject *
-ea_day_view_ref_child (AtkObject *accessible, gint index)
-{
-	EDayView *day_view;
-	gint child_num;
-	gint day;
-	AtkObject *atk_object = NULL;
-	EDayViewEvent *event = NULL;
-
-	g_return_val_if_fail (EA_IS_DAY_VIEW (accessible), NULL);
-
-	child_num = atk_object_get_n_accessible_children (accessible);
-	if (child_num <= 0 || index < 0 || index >= child_num)
-		return NULL;
-
-	if (!GTK_ACCESSIBLE (accessible)->widget)
-		return NULL;
-	day_view = E_DAY_VIEW (GTK_ACCESSIBLE (accessible)->widget);
-
-	if (index == 0) {
-		/* index == 0 is the main item */
-		atk_object = atk_gobject_accessible_for_object (G_OBJECT (day_view->main_canvas_item));
-		g_object_ref (atk_object);
-	}
-	else {
-		--index;
-		/* a long event */
-		if (index < day_view->long_events->len) {
-			event = &g_array_index (day_view->long_events,
-						EDayViewEvent, index);
-		}
-		else {
-			index -= day_view->long_events->len;
-			day = 0;
-			while (index >= day_view->events[day]->len) {
-				index -= day_view->events[day]->len;
-				++day;
-			}
-
-			event = &g_array_index (day_view->events[day],
-						EDayViewEvent, index);
-		}
-		if (event && event->canvas_item) {
-			/* Not use atk_gobject_accessible_for_object here,
-			 * we need to do special thing here
-			 */
-			atk_object = ea_calendar_helpers_get_accessible_for (event->canvas_item);
-			g_object_ref (atk_object);
-		}
-	}
-	return atk_object;
-}
diff --git a/a11y/calendar/ea-day-view.h b/a11y/calendar/ea-day-view.h
deleted file mode 100644
index 5ca4614f03..0000000000
--- a/a11y/calendar/ea-day-view.h
+++ /dev/null
@@ -1,64 +0,0 @@
-/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-/* vim:expandtab:shiftwidth=8:tabstop=8:
- */
-/* Evolution Accessibility: ea-day-view.h
- *
- * Copyright (C) 2003 Ximian, Inc.
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of version 2 of the GNU General Public
- * License as published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * General Public License for more details.
- *
- * You should have received a copy of the GNU General Public
- * License along with this program; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
- *
- * Author: Bolian Yin <bolian.yin@sun.com> Sun Microsystem Inc., 2003
- *
- */
-
-#ifndef __EA_DAY_VIEW_H__
-#define __EA_DAY_VIEW_H__
-
-#include "ea-cal-view.h"
-#include "e-day-view.h"
-
-#ifdef __cplusplus
-extern "C" {
-#endif /* __cplusplus */
-
-#define EA_TYPE_DAY_VIEW                     (ea_day_view_get_type ())
-#define EA_DAY_VIEW(obj)                     (G_TYPE_CHECK_INSTANCE_CAST ((obj), EA_TYPE_DAY_VIEW, EaDayView))
-#define EA_DAY_VIEW_CLASS(klass)             (G_TYPE_CHECK_CLASS_CAST ((klass), EA_TYPE_DAY_VIEW, EaDayViewClass))
-#define EA_IS_DAY_VIEW(obj)                  (G_TYPE_CHECK_INSTANCE_TYPE ((obj), EA_TYPE_DAY_VIEW))
-#define EA_IS_DAY_VIEW_CLASS(klass)          (G_TYPE_CHECK_CLASS_TYPE ((klass), EA_TYPE_DAY_VIEW))
-#define EA_DAY_VIEW_GET_CLASS(obj)           (G_TYPE_INSTANCE_GET_CLASS ((obj), EA_TYPE_DAY_VIEW, EaDayViewClass))
-
-typedef struct _EaDayView                   EaDayView;
-typedef struct _EaDayViewClass              EaDayViewClass;
-
-struct _EaDayView
-{
-	EaCalView parent;
-};
-
-GType ea_day_view_get_type (void);
-
-struct _EaDayViewClass
-{
-	EaCalViewClass parent_class;
-};
-
-AtkObject*     ea_day_view_new         (GtkWidget       *widget);
-
-#ifdef __cplusplus
-}
-#endif /* __cplusplus */
-
-#endif /* __EA_DAY_VIEW_H__ */
diff --git a/a11y/calendar/ea-gnome-calendar.c b/a11y/calendar/ea-gnome-calendar.c
deleted file mode 100644
index fc0027008f..0000000000
--- a/a11y/calendar/ea-gnome-calendar.c
+++ /dev/null
@@ -1,353 +0,0 @@
-/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-/* vim:expandtab:shiftwidth=8:tabstop=8:
- */
-/* Evolution Accessibility: ea-gnome-calendar.c
- *
- * Copyright (C) 2003 Ximian, Inc.
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of version 2 of the GNU General Public
- * License as published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * General Public License for more details.
- *
- * You should have received a copy of the GNU General Public
- * License along with this program; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
- *
- * Author: Bolian Yin <bolian.yin@sun.com> Sun Microsystem Inc., 2003
- *
- */
-
-#include "ea-gnome-calendar.h"
-#include "calendar-commands.h"
-#include <string.h>
-#include <gtk/gtknotebook.h>
-#include <libecal/e-cal-time-util.h>
-#include <libgnome/gnome-i18n.h>
-
-static void ea_gnome_calendar_class_init (EaGnomeCalendarClass *klass);
-
-static G_CONST_RETURN gchar* ea_gnome_calendar_get_name (AtkObject *accessible);
-static G_CONST_RETURN gchar* ea_gnome_calendar_get_description (AtkObject *accessible);
-static gint ea_gnome_calendar_get_n_children (AtkObject* obj);
-static AtkObject * ea_gnome_calendar_ref_child (AtkObject *obj, gint i);
-
-static void ea_gcal_switch_view_cb (GtkNotebook *widget, GtkNotebookPage *page,
-				    guint index, gpointer data);
-static void ea_gcal_dates_change_cb (GnomeCalendar *gcal, gpointer data);
-
-static gpointer parent_class = NULL;
-
-GType
-ea_gnome_calendar_get_type (void)
-{
-	static GType type = 0;
-	AtkObjectFactory *factory;
-	GTypeQuery query;
-	GType derived_atk_type;
-
-	if (!type) {
-		static GTypeInfo tinfo = {
-			sizeof (EaGnomeCalendarClass),
-			(GBaseInitFunc) NULL, /* base init */
-			(GBaseFinalizeFunc) NULL, /* base finalize */
-			(GClassInitFunc) ea_gnome_calendar_class_init, /* class init */
-			(GClassFinalizeFunc) NULL, /* class finalize */
-			NULL, /* class data */
-			sizeof (EaGnomeCalendar), /* instance size */
-			0, /* nb preallocs */
-			(GInstanceInitFunc) NULL, /* instance init */
-			NULL /* value table */
-		};
-
-		/*
-		 * Figure out the size of the class and instance
-		 * we are run-time deriving from (GailWidget, in this case)
-		 */
-
-		factory = atk_registry_get_factory (atk_get_default_registry (),
-						    GTK_TYPE_WIDGET);
-		derived_atk_type = atk_object_factory_get_accessible_type (factory);
-		g_type_query (derived_atk_type, &query);
-		tinfo.class_size = query.class_size;
-		tinfo.instance_size = query.instance_size;
-
-		type = g_type_register_static (derived_atk_type,
-					       "EaGnomeCalendar", &tinfo, 0);
-
-	}
-
-	return type;
-}
-
-static void
-ea_gnome_calendar_class_init (EaGnomeCalendarClass *klass)
-{
-	AtkObjectClass *class = ATK_OBJECT_CLASS (klass);
-
-	parent_class = g_type_class_peek_parent (klass);
-
-	class->get_name = ea_gnome_calendar_get_name;
-	class->get_description = ea_gnome_calendar_get_description;
-
-	class->get_n_children = ea_gnome_calendar_get_n_children;
-	class->ref_child = ea_gnome_calendar_ref_child;
-}
-
-AtkObject* 
-ea_gnome_calendar_new (GtkWidget *widget)
-{
-	GObject *object;
-	AtkObject *accessible;
-	GnomeCalendar *gcal;
-	GtkWidget *notebook;
-
-	g_return_val_if_fail (GNOME_IS_CALENDAR (widget), NULL);
-
-	object = g_object_new (EA_TYPE_GNOME_CALENDAR, NULL);
-
-	accessible = ATK_OBJECT (object);
-	atk_object_initialize (accessible, widget);
-
-	accessible->role = ATK_ROLE_FILLER;
-
-	gcal = GNOME_CALENDAR (widget);
-
-	/* listen on view type change
-	 */
-	g_signal_connect (widget, "dates_shown_changed",
-			  G_CALLBACK (ea_gcal_dates_change_cb),
-			  accessible);
-	notebook = gnome_calendar_get_view_notebook_widget (gcal);
-	if (notebook) {
-		g_signal_connect (notebook, "switch_page",
-				  G_CALLBACK (ea_gcal_switch_view_cb),
-				  accessible);
-	}
-
-#ifdef ACC_DEBUG
-	printf ("EvoAcc: ea-gnome-calendar created: %p\n", (void *)accessible);
-#endif
-
-	return accessible;
-}
-
-const gchar *
-ea_gnome_calendar_get_label_description (GnomeCalendar *gcal)
-{
-	icaltimezone *zone;
-	struct icaltimetype start_tt, end_tt;
-	time_t start_time, end_time;
-	struct tm start_tm, end_tm;
-	static char buffer[512];
-	char end_buffer[256];
-	GnomeCalendarViewType view;
-
-	gnome_calendar_get_visible_time_range (gcal, &start_time, &end_time);
-	zone = gnome_calendar_get_timezone (gcal);
-
-	start_tt = icaltime_from_timet_with_zone (start_time, FALSE, zone);
-	start_tm.tm_year = start_tt.year - 1900;
-	start_tm.tm_mon = start_tt.month - 1;
-	start_tm.tm_mday = start_tt.day;
-	start_tm.tm_hour = start_tt.hour;
-	start_tm.tm_min = start_tt.minute;
-	start_tm.tm_sec = start_tt.second;
-	start_tm.tm_isdst = -1;
-	start_tm.tm_wday = time_day_of_week (start_tt.day, start_tt.month - 1,
-					     start_tt.year);
-
-	/* Take one off end_time so we don't get an extra day. */
-	end_tt = icaltime_from_timet_with_zone (end_time - 1, FALSE, zone);
-	end_tm.tm_year = end_tt.year - 1900;
-	end_tm.tm_mon = end_tt.month - 1;
-	end_tm.tm_mday = end_tt.day;
-	end_tm.tm_hour = end_tt.hour;
-	end_tm.tm_min = end_tt.minute;
-	end_tm.tm_sec = end_tt.second;
-	end_tm.tm_isdst = -1;
-	end_tm.tm_wday = time_day_of_week (end_tt.day, end_tt.month - 1,
-					   end_tt.year);
-
-	view = gnome_calendar_get_view (gcal);
-
-	switch (view) {
-	case GNOME_CAL_DAY_VIEW:
-	case GNOME_CAL_WORK_WEEK_VIEW:
-	case GNOME_CAL_WEEK_VIEW:
-		if (start_tm.tm_year == end_tm.tm_year
-		    && start_tm.tm_mon == end_tm.tm_mon
-		    && start_tm.tm_mday == end_tm.tm_mday) {
-			e_utf8_strftime (buffer, sizeof (buffer),
-					_("%A %d %b %Y"), &start_tm);
-		} else if (start_tm.tm_year == end_tm.tm_year) {
-			e_utf8_strftime (buffer, sizeof (buffer),
-					_("%a %d %b"), &start_tm);
-			e_utf8_strftime (end_buffer, sizeof (end_buffer),
-					_("%a %d %b %Y"), &end_tm);
-			strcat (buffer, " - ");
-			strcat (buffer, end_buffer);
-		} else {
-			e_utf8_strftime (buffer, sizeof (buffer),
-					_("%a %d %b %Y"), &start_tm);
-			e_utf8_strftime (end_buffer, sizeof (end_buffer),
-					_("%a %d %b %Y"), &end_tm);
-			strcat (buffer, " - ");
-			strcat (buffer, end_buffer);
-		}
-		break;
-	case GNOME_CAL_MONTH_VIEW:
-	case GNOME_CAL_LIST_VIEW:
-		if (start_tm.tm_year == end_tm.tm_year) {
-			if (start_tm.tm_mon == end_tm.tm_mon) {
-				if (start_tm.tm_mday == end_tm.tm_mday) {
-					buffer [0] = '\0';
-				} else {
-					e_utf8_strftime (buffer, sizeof (buffer),
-							"%d", &start_tm);
-					strcat (buffer, " - ");
-				}
-				e_utf8_strftime (end_buffer, sizeof (end_buffer),
-						_("%d %b %Y"), &end_tm);
-				strcat (buffer, end_buffer);
-			} else {
-				e_utf8_strftime (buffer, sizeof (buffer),
-						_("%d %b"), &start_tm);
-				e_utf8_strftime (end_buffer, sizeof (end_buffer),
-						_("%d %b %Y"), &end_tm);
-				strcat (buffer, " - ");
-				strcat (buffer, end_buffer);
-			}
-		} else {
-			e_utf8_strftime (buffer, sizeof (buffer),
-					_("%d %b %Y"), &start_tm);
-			e_utf8_strftime (end_buffer, sizeof (end_buffer),
-					_("%d %b %Y"), &end_tm);
-			strcat (buffer, " - ");
-			strcat (buffer, end_buffer);
-		}
-		break;
-	default:
-		g_assert_not_reached ();
-		return NULL;
-	}
-	return buffer;
-}
-
-static G_CONST_RETURN gchar*
-ea_gnome_calendar_get_name (AtkObject *accessible)
-{
-	if (accessible->name)
-		return accessible->name;
-	return _("Gnome Calendar");
-}
-
-static G_CONST_RETURN gchar*
-ea_gnome_calendar_get_description (AtkObject *accessible)
-{
-	if (accessible->description)
-		return accessible->description;
-	return _("Gnome Calendar");
-}
-
-static gint
-ea_gnome_calendar_get_n_children (AtkObject* obj)
-{
-	g_return_val_if_fail (EA_IS_GNOME_CALENDAR (obj), 0);
-
-	if (!GTK_ACCESSIBLE (obj)->widget)
-		return -1;
-	return 4;
-}
-
-static AtkObject *
-ea_gnome_calendar_ref_child (AtkObject *obj, gint i)
-{
-	AtkObject * child = NULL;
-	GnomeCalendar * calendarWidget;
-	GtkWidget *childWidget;
-
-	g_return_val_if_fail (EA_IS_GNOME_CALENDAR (obj), NULL);
-	/* valid child index range is [0-3] */
-	if (i < 0 || i >3 )
-		return NULL;
-
-	if (!GTK_ACCESSIBLE (obj)->widget)
-		return NULL;
-	calendarWidget = GNOME_CALENDAR (GTK_ACCESSIBLE (obj)->widget);
-
-	switch (i) {
-	case 0:
-		/* for the search bar */
-		childWidget = gnome_calendar_get_search_bar_widget (calendarWidget);
-		child = gtk_widget_get_accessible (childWidget);
-		atk_object_set_parent (child, obj);
-		atk_object_set_name (child, _("search bar"));
-		atk_object_set_description (child, _("evolution calendar search bar"));
-		break;
-	case 1:
-		/* for the day/week view */
-		childWidget = gnome_calendar_get_current_view_widget (calendarWidget);
-		child = gtk_widget_get_accessible (childWidget);
-		atk_object_set_parent (child, obj);
-		break;
-	case 2:
-		/* for calendar */
-		childWidget = gnome_calendar_get_e_calendar_widget (calendarWidget);
-		child = gtk_widget_get_accessible (childWidget);
-		break;
-	case 3:
-		/* for todo list */
-		childWidget = GTK_WIDGET (gnome_calendar_get_task_pad (calendarWidget));
-		child = gtk_widget_get_accessible (childWidget);
-		break;
-	default:
-		break;
-	}
-	if (child)
-		g_object_ref(child);
-	return child;
-}
-
-static void
-ea_gcal_switch_view_cb (GtkNotebook *widget, GtkNotebookPage *page,
-			guint index, gpointer data)
-{
-	GtkWidget *new_widget;
-
-	new_widget = gtk_notebook_get_nth_page (widget, index);
-
-	/* views are always the second child in gnome calendar
-	 */
-	if (new_widget)
-		g_signal_emit_by_name (G_OBJECT(data), "children_changed::add",
-				       1, gtk_widget_get_accessible (new_widget), NULL);
-
-#ifdef ACC_DEBUG
-	printf ("AccDebug: view switch to widget %p (index=%d) \n",
-		(void *)new_widget, index);
-#endif
-}
-
-static void
-ea_gcal_dates_change_cb (GnomeCalendar *gcal, gpointer data)
-{
-	const gchar *new_name;
-
-	g_return_if_fail (GNOME_IS_CALENDAR (gcal));
-	g_return_if_fail (data);
-	g_return_if_fail (EA_IS_GNOME_CALENDAR (data));
-
-	new_name = ea_gnome_calendar_get_label_description (gcal);
-	atk_object_set_name (ATK_OBJECT(data), new_name);
-	g_signal_emit_by_name (data, "visible_data_changed");
-
-#ifdef ACC_DEBUG
-	printf ("AccDebug: calendar dates changed, label=%s\n", new_name);
-#endif
-}
diff --git a/a11y/calendar/ea-gnome-calendar.h b/a11y/calendar/ea-gnome-calendar.h
deleted file mode 100644
index 130466add3..0000000000
--- a/a11y/calendar/ea-gnome-calendar.h
+++ /dev/null
@@ -1,67 +0,0 @@
-/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-/* vim:expandtab:shiftwidth=8:tabstop=8:
- */
-/* Evolution Accessibility: ea-gnome-calendar.h
- *
- * Copyright (C) 2003 Ximian, Inc.
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of version 2 of the GNU General Public
- * License as published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * General Public License for more details.
- *
- * You should have received a copy of the GNU General Public
- * License along with this program; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
- *
- * Author: Bolian Yin <bolian.yin@sun.com> Sun Microsystem Inc., 2003
- *
- */
-
-#ifndef __EA_GNOME_CALENDAR_H__
-#define __EA_GNOME_CALENDAR_H__
-
-#include <gtk/gtkaccessible.h>
-#include "gnome-cal.h"
-
-#ifdef __cplusplus
-extern "C" {
-#endif /* __cplusplus */
-
-#define EA_TYPE_GNOME_CALENDAR            (ea_gnome_calendar_get_type ())
-#define EA_GNOME_CALENDAR(obj)            (G_TYPE_CHECK_INSTANCE_CAST ((obj), EA_TYPE_GNOME_CALENDAR, EaGnomeCalendar))
-#define EA_GNOME_CALENDAR_CLASS(klass)    (G_TYPE_CHECK_CLASS_CAST ((klass), EA_TYPE_GNOME_CALENDAR, EaGnomeCalendarClass))
-#define EA_IS_GNOME_CALENDAR(obj)         (G_TYPE_CHECK_INSTANCE_TYPE ((obj), EA_TYPE_GNOME_CALENDAR))
-#define EA_IS_GNOME_CALENDAR_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), EA_TYPE_GNOME_CALENDAR))
-#define EA_GNOME_CALENDAR_GET_CLASS(obj)  (G_TYPE_INSTANCE_GET_CLASS ((obj), EA_TYPE_GNOME_CALENDAR, EaGnomeCalendarClass))
-
-typedef struct _EaGnomeCalendar                   EaGnomeCalendar;
-typedef struct _EaGnomeCalendarClass              EaGnomeCalendarClass;
-
-struct _EaGnomeCalendar
-{
-	GtkAccessible parent;
-};
-
-GType ea_gnome_calendar_get_type (void);
-
-struct _EaGnomeCalendarClass
-{
-	GtkAccessibleClass parent_class;
-};
-
-AtkObject*     ea_gnome_calendar_new         (GtkWidget       *widget);
-
-const gchar *	ea_gnome_calendar_get_label_description (GnomeCalendar *gcal);
-
-#ifdef __cplusplus
-}
-#endif /* __cplusplus */
-
-
-#endif /* __EA_GNOME_CALENDAR_H__ */
diff --git a/a11y/calendar/ea-jump-button.c b/a11y/calendar/ea-jump-button.c
deleted file mode 100644
index d9bab31943..0000000000
--- a/a11y/calendar/ea-jump-button.c
+++ /dev/null
@@ -1,226 +0,0 @@
-/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-/* vim:expandtab:shiftwidth=8:tabstop=8:
- */
-/* Evolution Accessibility: ea-jump-button.c
- *
- * Copyright (C) 2003 Ximian, Inc.
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of version 2 of the GNU General Public
- * License as published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * General Public License for more details.
- *
- * You should have received a copy of the GNU General Public
- * License along with this program; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
- *
- * Author: Yang Wu <yang.wu@sun.com> Sun Microsystem Inc., 2003
- *
- */
-
-#include "ea-jump-button.h"
-#include "ea-calendar-helpers.h"
-#include "ea-week-view.h"
-#include "e-week-view.h"
-#include <libgnomecanvas/gnome-canvas.h>
-#include <libgnome/gnome-i18n.h>
-
-static void ea_jump_button_class_init (EaJumpButtonClass *klass);
-
-static G_CONST_RETURN gchar* ea_jump_button_get_name (AtkObject *accessible);
-static G_CONST_RETURN gchar* ea_jump_button_get_description (AtkObject *accessible);
-
-/* action interface */
-static void                  atk_action_interface_init  (AtkActionIface *iface);
-static gboolean              jump_button_do_action      (AtkAction      *action,
-                                                         gint           i);
-static gint                  jump_button_get_n_actions  (AtkAction      *action);
-static G_CONST_RETURN gchar* jump_button_get_keybinding (AtkAction      *action,
-                                                         gint           i);
-
-static gpointer parent_class = NULL;
-
-GType
-ea_jump_button_get_type (void)
-{
-	static GType type = 0;
-	AtkObjectFactory *factory;
-	GTypeQuery query;
-	GType derived_atk_type;
-
-
-	if (!type) {
-		static GTypeInfo tinfo = {
-			sizeof (EaJumpButtonClass),
-			(GBaseInitFunc) NULL, /* base init */
-			(GBaseFinalizeFunc) NULL, /* base finalize */
-			(GClassInitFunc) ea_jump_button_class_init, /* class init */
-			(GClassFinalizeFunc) NULL, /* class finalize */
-			NULL, /* class data */
-			sizeof (EaJumpButton), /* instance size */
-			0, /* nb preallocs */
-			(GInstanceInitFunc) NULL, /* instance init */
-			NULL /* value table */
-		};
-
-		static const GInterfaceInfo atk_action_info =
-			{
-				(GInterfaceInitFunc) atk_action_interface_init,
-				(GInterfaceFinalizeFunc) NULL,
-				NULL
-			};
-
-		/*
-		 * Figure out the size of the class and instance
-		 * we are run-time deriving from (atk object for GNOME_TYPE_CANVAS_ITEM, in this case)
-		 */
-
-		factory = atk_registry_get_factory (atk_get_default_registry (),
-						    GNOME_TYPE_CANVAS_ITEM);
-		derived_atk_type = atk_object_factory_get_accessible_type (factory);
-		g_type_query (derived_atk_type, &query);
-
-		tinfo.class_size = query.class_size;
-		tinfo.instance_size = query.instance_size;
-
-		/* we inherit the component and other interfaces from GNOME_TYPE_CANVAS_ITEM */
-		type = g_type_register_static (derived_atk_type,
-					       "EaJumpButton", &tinfo, 0);
-
-		g_type_add_interface_static (type, ATK_TYPE_ACTION,
-					     &atk_action_info);
-	}
-
-	return type;
-}
-
-static void
-ea_jump_button_class_init (EaJumpButtonClass *klass)
-{
-	AtkObjectClass *class = ATK_OBJECT_CLASS (klass);
-
-	parent_class = g_type_class_peek_parent (klass);
-
-	class->get_name = ea_jump_button_get_name;
-	class->get_description = ea_jump_button_get_description;
-}
-
-AtkObject* 
-ea_jump_button_new (GObject *obj)
-{
-	AtkObject *atk_obj = NULL;
-	GObject *target_obj;
-
-	g_return_val_if_fail (GNOME_IS_CANVAS_ITEM (obj), NULL);
-
-	target_obj = obj;
-	atk_obj = g_object_get_data (target_obj, "accessible-object");
-
-	if (!atk_obj) {
-		static AtkRole event_role = ATK_ROLE_INVALID;
-		atk_obj = ATK_OBJECT (g_object_new (EA_TYPE_JUMP_BUTTON,
-						    NULL));
-		atk_object_initialize (atk_obj, target_obj);
-		if (event_role == ATK_ROLE_INVALID)
-			event_role = atk_role_register ("Jump Button");
-		atk_obj->role = event_role;
-	}
-
-	/* the registered factory for GNOME_TYPE_CANVAS_ITEM is cannot create a EaJumpbutton,
-	 * we should save the EaJumpbutton object in it.
-	 */
-	g_object_set_data (obj, "accessible-object", atk_obj);
-
-	return atk_obj;
-}
-
-static G_CONST_RETURN gchar*
-ea_jump_button_get_name (AtkObject *accessible)
-{
-	g_return_val_if_fail (EA_IS_JUMP_BUTTON (accessible), NULL);
-
-	if (accessible->name)
-		return accessible->name;
-	return _("Jump button");
-}
-
-static G_CONST_RETURN gchar*
-ea_jump_button_get_description (AtkObject *accessible)
-{
-	if (accessible->description)
-		return accessible->description;
-
-	return _("Click here, you can find more events.");
-}
-
-static void
-atk_action_interface_init (AtkActionIface *iface)
-{
-  g_return_if_fail (iface != NULL);
-
-  iface->do_action = jump_button_do_action;
-  iface->get_n_actions = jump_button_get_n_actions;
-  iface->get_keybinding = jump_button_get_keybinding;
-}
-
-static gboolean
-jump_button_do_action (AtkAction *action,
-                       gint      i)
-{
-  gboolean return_value = TRUE;
-  AtkGObjectAccessible *atk_gobj;
-  GObject *g_obj;
-  GnomeCanvasItem *item;
-  ECalendarView *cal_view;
-  EWeekView *week_view;
-
-  atk_gobj = ATK_GOBJECT_ACCESSIBLE (action);
-  g_obj = atk_gobject_accessible_get_object (atk_gobj);
-  if (!g_obj)
-	  return FALSE;
-
-  item = GNOME_CANVAS_ITEM (g_obj);
-  cal_view = ea_calendar_helpers_get_cal_view_from (GNOME_CANVAS_ITEM (item));
-  week_view = E_WEEK_VIEW (cal_view);
-
-  switch (i)
-    {
-    case 0:
-	    e_week_view_jump_to_button_item (week_view, GNOME_CANVAS_ITEM (item));
-	    break;
-    default:
-	    return_value = FALSE;
-      break;
-    }
-  return return_value; 
-}
-
-static gint
-jump_button_get_n_actions (AtkAction *action)
-{
-  return 1;
-}
-
-static G_CONST_RETURN gchar*
-jump_button_get_keybinding (AtkAction *action,
-                            gint      i)
-{
-  gchar *return_value = NULL;
-
-  switch (i)
-    {
-    case 0:
-      {
-	      return_value = "space or enter";
-	      break;
-      }
-    default:
-      break;
-    }
-  return return_value; 
-}
diff --git a/a11y/calendar/ea-jump-button.h b/a11y/calendar/ea-jump-button.h
deleted file mode 100644
index ef1f1efb35..0000000000
--- a/a11y/calendar/ea-jump-button.h
+++ /dev/null
@@ -1,64 +0,0 @@
-/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-/* vim:expandtab:shiftwidth=8:tabstop=8:
- */
-/* Evolution Accessibility: ea-jump-button.h
- *
- * Copyright (C) 2003 Ximian, Inc.
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of version 2 of the GNU General Public
- * License as published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * General Public License for more details.
- *
- * You should have received a copy of the GNU General Public
- * License along with this program; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
- *
- * Author: Yang Wu <yang.wu@sun.com> Sun Microsystem Inc., 2003
- *
- */
-
-#ifndef __EA_JUMP_BUTTON_H__
-#define __EA_JUMP_BUTTON_H__
-
-#include <atk/atkgobjectaccessible.h>
-
-#ifdef __cplusplus
-extern "C" {
-#endif /* __cplusplus */
-
-#define EA_TYPE_JUMP_BUTTON                   (ea_jump_button_get_type ())
-#define EA_JUMP_BUTTON(obj)                   (G_TYPE_CHECK_INSTANCE_CAST ((obj), EA_TYPE_JUMP_BUTTON, EaJumpButton))
-#define EA_JUMP_BUTTON_CLASS(klass)           (G_TYPE_CHECK_CLASS_CAST ((klass), EA_TYPE_JUMP_BUTTON, EaJumpButtonClass))
-#define EA_IS_JUMP_BUTTON(obj)                (G_TYPE_CHECK_INSTANCE_TYPE ((obj), EA_TYPE_JUMP_BUTTON))
-#define EA_IS_JUMP_BUTTON_CLASS(klass)        (G_TYPE_CHECK_CLASS_TYPE ((klass), EA_TYPE_JUMP_BUTTON))
-#define EA_JUMP_BUTTON_GET_CLASS(obj)         (G_TYPE_INSTANCE_GET_CLASS ((obj), EA_TYPE_JUMP_BUTTON, EaJumpButtonClass))
-
-typedef struct _EaJumpButton                   EaJumpButton;
-typedef struct _EaJumpButtonClass              EaJumpButtonClass;
-
-struct _EaJumpButton
-{
-	AtkGObjectAccessible parent;
-};
-
-GType ea_jump_button_get_type (void);
-
-struct _EaJumpButtonClass
-{
-	AtkGObjectAccessibleClass parent_class;
-};
-
-AtkObject *ea_jump_button_new (GObject *obj);
-
-#ifdef __cplusplus
-}
-#endif /* __cplusplus */
-
-
-#endif /* __EA_JUMP_BUTTON_H__ */
diff --git a/a11y/calendar/ea-week-view-cell.c b/a11y/calendar/ea-week-view-cell.c
deleted file mode 100644
index 543b26794a..0000000000
--- a/a11y/calendar/ea-week-view-cell.c
+++ /dev/null
@@ -1,478 +0,0 @@
-/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-/* vim:expandtab:shiftwidth=8:tabstop=8:
- */
-/* Evolution Accessibility: ea-week-view-cell.c
- *
- * Copyright (C) 2003 Ximian, Inc.
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of version 2 of the GNU General Public
- * License as published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * General Public License for more details.
- *
- * You should have received a copy of the GNU General Public
- * License along with this program; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
- *
- * Author: Bolian Yin <bolian.yin@sun.com> Sun Microsystem Inc., 2003
- * Author: Yang Wu <Yang.Wu@sun.com> Sun Microsystem Inc., 2003
- *
- */
-
-#include "ea-week-view-cell.h"
-#include "ea-week-view-main-item.h"
-#include "ea-factory.h"
-
-/* EWeekViewCell */
-
-static void e_week_view_cell_class_init (EWeekViewCellClass *class);
-
-EA_FACTORY_GOBJECT (EA_TYPE_WEEK_VIEW_CELL, ea_week_view_cell, ea_week_view_cell_new)
-
-GType
-e_week_view_cell_get_type (void)
-{
-	static GType type = 0;
-
-	if (!type) {
-		static GTypeInfo tinfo = {
-			sizeof (EWeekViewCellClass),
-			(GBaseInitFunc) NULL, /* base init */
-			(GBaseFinalizeFunc) NULL, /* base finalize */
-			(GClassInitFunc) e_week_view_cell_class_init, /* class init */
-			(GClassFinalizeFunc) NULL, /* class finalize */
-			NULL, /* class data */
-			sizeof (EWeekViewCell), /* instance size */
-			0, /* nb preallocs */
-			(GInstanceInitFunc) NULL, /* instance init */
-			NULL /* value table */
-		};
-
-		type = g_type_register_static (G_TYPE_OBJECT,
-					       "EWeekViewCell", &tinfo, 0);
-	}
-
-	return type;
-}
-
-static void
-e_week_view_cell_class_init (EWeekViewCellClass *class)
-{
-    EA_SET_FACTORY (e_week_view_cell_get_type (), ea_week_view_cell);
-}
-
-EWeekViewCell *
-e_week_view_cell_new (EWeekView *week_view, gint row, gint column)
-{
-	GObject *object;
-	EWeekViewCell *cell;
-
-	g_return_val_if_fail (E_IS_WEEK_VIEW (week_view), NULL);
-
-	object = g_object_new (E_TYPE_WEEK_VIEW_CELL, NULL);
-	cell = E_WEEK_VIEW_CELL (object);
-	cell->week_view = week_view;
-	cell->row = row;
-	cell->column = column;
-
-#ifdef ACC_DEBUG
-	printf ("EvoAcc: e_week_view_cell created %p\n", (void *)cell);
-#endif
-
-	return cell;
-}
-
-/* EaWeekViewCell */
-
-static void ea_week_view_cell_class_init (EaWeekViewCellClass *klass);
-
-static G_CONST_RETURN gchar* ea_week_view_cell_get_name (AtkObject *accessible);
-static G_CONST_RETURN gchar* ea_week_view_cell_get_description (AtkObject *accessible);
-static AtkStateSet* ea_week_view_cell_ref_state_set (AtkObject *obj);
-static AtkObject * ea_week_view_cell_get_parent (AtkObject *accessible);
-static gint ea_week_view_cell_get_index_in_parent (AtkObject *accessible);
-
-/* component interface */
-static void atk_component_interface_init (AtkComponentIface *iface);
-static void component_interface_get_extents (AtkComponent *component,
-					     gint *x, gint *y,
-					     gint *width, gint *height,
-					     AtkCoordType coord_type);
-static gboolean component_interface_grab_focus (AtkComponent *component);
-
-static gpointer parent_class = NULL;
-
-#ifdef ACC_DEBUG
-static gint n_ea_week_view_cell_created = 0, n_ea_week_view_cell_destroyed = 0;
-static void ea_week_view_cell_finalize (GObject *object);
-#endif
-
-GType
-ea_week_view_cell_get_type (void)
-{
-	static GType type = 0;
-
-	if (!type) {
-		static GTypeInfo tinfo = {
-			sizeof (EaWeekViewCellClass),
-			(GBaseInitFunc) NULL, /* base init */
-			(GBaseFinalizeFunc) NULL, /* base finalize */
-			(GClassInitFunc) ea_week_view_cell_class_init, /* class init */
-			(GClassFinalizeFunc) NULL, /* class finalize */
-			NULL, /* class data */
-			sizeof (EaWeekViewCell), /* instance size */
-			0, /* nb preallocs */
-			(GInstanceInitFunc) NULL, /* instance init */
-			NULL /* value table */
-		};
-
-		static const GInterfaceInfo atk_component_info = {
-			(GInterfaceInitFunc) atk_component_interface_init,
-			(GInterfaceFinalizeFunc) NULL,
-			NULL
-		};
-		type = g_type_register_static (ATK_TYPE_GOBJECT_ACCESSIBLE,
-					       "EaWeekViewCell", &tinfo, 0);
-		g_type_add_interface_static (type, ATK_TYPE_COMPONENT,
-					     &atk_component_info);
-
-	}
-
-	return type;
-}
-
-static void
-ea_week_view_cell_class_init (EaWeekViewCellClass *klass)
-{
-	AtkObjectClass *class = ATK_OBJECT_CLASS (klass);
-
-#ifdef ACC_DEBUG
-	GObjectClass *gobject_class = G_OBJECT_CLASS (klass);
-	gobject_class->finalize = ea_week_view_cell_finalize;
-#endif
-
-	parent_class = g_type_class_peek_parent (klass);
-
-	class->get_name = ea_week_view_cell_get_name;
-	class->get_description = ea_week_view_cell_get_description;
-	class->ref_state_set = ea_week_view_cell_ref_state_set;
-
-	class->get_parent = ea_week_view_cell_get_parent;
-	class->get_index_in_parent = ea_week_view_cell_get_index_in_parent;
-
-}
-
-AtkObject* 
-ea_week_view_cell_new (GObject *obj)
-{
-	gpointer object;
-	AtkObject *atk_object;
-
-	g_return_val_if_fail (E_IS_WEEK_VIEW_CELL (obj), NULL);
-	object = g_object_new (EA_TYPE_WEEK_VIEW_CELL, NULL);
-	atk_object = ATK_OBJECT (object);
-	atk_object_initialize (atk_object, obj);
-	atk_object->role = ATK_ROLE_UNKNOWN;
-
-#ifdef ACC_DEBUG
-	++n_ea_week_view_cell_created;
-	printf ("ACC_DEBUG: n_ea_week_view_cell_created = %d\n",
-		n_ea_week_view_cell_created);
-#endif
-	return atk_object;
-}
-
-#ifdef ACC_DEBUG
-static void ea_week_view_cell_finalize (GObject *object)
-{
-	++n_ea_week_view_cell_destroyed;
-	printf ("ACC_DEBUG: n_ea_week_view_cell_destroyed = %d\n",
-		n_ea_week_view_cell_destroyed);
-}
-#endif
-
-static G_CONST_RETURN gchar*
-ea_week_view_cell_get_name (AtkObject *accessible)
-{
-	AtkGObjectAccessible *atk_gobj;
-	GObject *g_obj;
-	EWeekViewCell *cell;
-
-	g_return_val_if_fail (EA_IS_WEEK_VIEW_CELL (accessible), NULL);
-
-	if (!accessible->name) {
-		AtkObject *ea_main_item;
-		GnomeCanvasItem *main_item;
-		gchar *new_name = g_strdup ("");
-		const gchar *row_label, *column_label;
-                gint new_column, new_row;
-                gint start_day;
-
-		atk_gobj = ATK_GOBJECT_ACCESSIBLE (accessible);
-		g_obj = atk_gobject_accessible_get_object (atk_gobj);
-		if (!g_obj)
-			return NULL;
-
-		cell = E_WEEK_VIEW_CELL (g_obj);
-		main_item = cell->week_view->main_canvas_item;
-		ea_main_item = atk_gobject_accessible_for_object (G_OBJECT (main_item));
-
-                start_day = cell->week_view->display_start_day;
-                if (cell->column + start_day >= 7) {
-                        new_column = cell->column + start_day - 7;
-                        new_row = cell->row + 1;
-                } else {
-                        new_column = cell->column + start_day;
-                        new_row = cell->row;
-                }
-                        
-		column_label = atk_table_get_column_description (ATK_TABLE (ea_main_item),
-								 new_column);
-		row_label = atk_table_get_row_description (ATK_TABLE (ea_main_item),
-							   new_row);
-		new_name = g_strconcat (column_label, " ", row_label, NULL);
-		ATK_OBJECT_CLASS (parent_class)->set_name (accessible, new_name);
-		g_free (new_name);
-	}
-	return accessible->name;
-}
-
-static G_CONST_RETURN gchar*
-ea_week_view_cell_get_description (AtkObject *accessible)
-{
-	return ea_week_view_cell_get_name (accessible);
-}
-
-static AtkStateSet*
-ea_week_view_cell_ref_state_set (AtkObject *obj)
-{
-  AtkStateSet *state_set;
-  GObject *g_obj;
-  AtkObject *parent;
-  gint x, y, width, height;
-  gint parent_x, parent_y, parent_width, parent_height;
-
-  state_set = ATK_OBJECT_CLASS (parent_class)->ref_state_set (obj);
-  g_obj = atk_gobject_accessible_get_object (ATK_GOBJECT_ACCESSIBLE(obj));
-  if (!g_obj)
-	  return state_set;
-
-  atk_state_set_add_state (state_set, ATK_STATE_SELECTABLE);
-
-  parent = atk_object_get_parent (obj);
-  atk_component_get_extents (ATK_COMPONENT (obj), &x, &y,
-			     &width, &height, ATK_XY_WINDOW);
-  atk_component_get_extents (ATK_COMPONENT (parent), &parent_x, &parent_y,
-			     &parent_width, &parent_height, ATK_XY_WINDOW);
-
-
-  if (x + width < parent_x || x > parent_x + parent_width ||
-      y + height < parent_y || y > parent_y + parent_height)
-	  /* the cell is out of the main canvas */	  
-	  ;
-  else
-	  atk_state_set_add_state (state_set, ATK_STATE_VISIBLE);
-
-  return state_set;
-}
-
-static AtkObject *
-ea_week_view_cell_get_parent (AtkObject *accessible)
-{
-	AtkGObjectAccessible *atk_gobj;
-	GObject *g_obj;
-	EWeekViewCell *cell;
-
-	g_return_val_if_fail (EA_IS_WEEK_VIEW_CELL (accessible), NULL);
-
-	atk_gobj = ATK_GOBJECT_ACCESSIBLE (accessible);
-	g_obj = atk_gobject_accessible_get_object (atk_gobj);
-	if (!g_obj)
-		return NULL;
-
-	cell = E_WEEK_VIEW_CELL (g_obj);
-	return atk_gobject_accessible_for_object (G_OBJECT (cell->week_view->main_canvas_item));
-}
-
-static gint
-ea_week_view_cell_get_index_in_parent (AtkObject *accessible)
-{
-	AtkGObjectAccessible *atk_gobj;
-	GObject *g_obj;
-	EWeekViewCell *cell;
-	AtkObject *parent;
-
-	g_return_val_if_fail (EA_IS_WEEK_VIEW_CELL (accessible), -1);
-
-	atk_gobj = ATK_GOBJECT_ACCESSIBLE (accessible);
-	g_obj = atk_gobject_accessible_get_object (atk_gobj);
-	if (!g_obj)
-		return -1;
-
-	cell = E_WEEK_VIEW_CELL (g_obj);
-	parent = atk_object_get_parent (accessible);
-	return atk_table_get_index_at (ATK_TABLE (parent),
-				       cell->row, cell->column);
-}
-
-/* Atk Component Interface */
-
-static void 
-atk_component_interface_init (AtkComponentIface *iface)
-{
-	g_return_if_fail (iface != NULL);
-
-	iface->get_extents = component_interface_get_extents;
-        iface->grab_focus = component_interface_grab_focus;
-}
-
-static void 
-component_interface_get_extents (AtkComponent *component,
-				 gint *x, gint *y, gint *width, gint *height,
-				 AtkCoordType coord_type)
-{
-	GObject *g_obj;
-	AtkObject *atk_obj;
-	EWeekViewCell *cell;
-	EWeekView *week_view;
-	GtkWidget *main_canvas;
-	gint week_view_width, week_view_height;
-	gint scroll_x, scroll_y;
-        gint start_day;
-
-	*x = *y = *width = *height = 0;
-
-	g_return_if_fail (EA_IS_WEEK_VIEW_CELL (component));
-
-	g_obj = atk_gobject_accessible_get_object (ATK_GOBJECT_ACCESSIBLE(component));
-	if (!g_obj)
-		/* defunct object*/
-		return;
-
-	cell = E_WEEK_VIEW_CELL (g_obj);
-	week_view = cell->week_view;
-	main_canvas = cell->week_view->main_canvas;
-
-	atk_obj = atk_gobject_accessible_for_object (G_OBJECT (main_canvas));
-	atk_component_get_extents (ATK_COMPONENT (atk_obj),
-				   x, y,
-				   &week_view_width, &week_view_height,
-				   coord_type);
-	gnome_canvas_get_scroll_offsets (GNOME_CANVAS (week_view->main_canvas),
-					 &scroll_x, &scroll_y);
-        start_day = week_view->display_start_day;
-        if (week_view->multi_week_view) {
-                if (week_view->compress_weekend && (cell->column == (5 - start_day))) {
-                        *height = week_view->row_heights[cell->row*2];
-	                *width = week_view->col_widths[cell->column];
-	                *x += week_view->col_offsets[cell->column] - scroll_x;
-	                *y += week_view->row_offsets[cell->row*2]- scroll_y;
-                } else if (week_view->compress_weekend && (cell->column == (6 - start_day))) {
-                        *height = week_view->row_heights[cell->row*2];
-                        *width = week_view->col_widths[cell->column - 1];
-                        *x += week_view->col_offsets[cell->column - 1]- scroll_x;
-                        *y += week_view->row_offsets[cell->row*2 + 1]- scroll_y;
-                } else if (week_view->compress_weekend && (cell->column > (6 - start_day))){
-                        *height = week_view->row_heights[cell->row*2]*2;
-                        *width = week_view->col_widths[cell->column - 1];
-                        *x += week_view->col_offsets[cell->column - 1] - scroll_x;
-                        *y += week_view->row_offsets[cell->row*2]- scroll_y;
-                } else {
-	                *height = week_view->row_heights[cell->row*2]*2;
-                        *width = week_view->col_widths[cell->column];
-	                *x += week_view->col_offsets[cell->column] - scroll_x;
-	                *y += week_view->row_offsets[cell->row*2]- scroll_y;
-                }
-        } else {
-                if (start_day < 3) { 
-                        if (cell->column < 3) {
-                                *height = week_view->row_heights[cell->column*2]*2;
-                                *width = week_view->col_widths[0];
-                                *x += week_view->col_offsets[0] - scroll_x;
-                                *y += week_view->row_offsets[cell->column*2]- scroll_y;
-                        } else {
-                                if (cell->column == 5 - start_day) {
-                                        *height = week_view->row_heights[(cell->column - 3)*2];
-                                        *width = week_view->col_widths[1];
-                                        *x += week_view->col_offsets[1] - scroll_x;
-                                        *y += week_view->row_offsets[(cell->column - 3)*2]- scroll_y;
-                                } else if (cell->column == 6 - start_day) {
-                                        *height = week_view->row_heights[(cell->column - 4)*2];
-                                        *width = week_view->col_widths[1];
-                                        *x += week_view->col_offsets[1] - scroll_x;
-                                        *y += week_view->row_offsets[(cell->column - 3)*2 - 1]- scroll_y;
-                                } else if (cell->column > 6 - start_day) {
-                                        *height = week_view->row_heights[(cell->column - 4)*2]*2;
-                                        *width = week_view->col_widths[1];
-                                        *x += week_view->col_offsets[1] - scroll_x;
-                                        *y += week_view->row_offsets[(cell->column - 4)*2]- scroll_y;
-                                } else {
-                                        *height = week_view->row_heights[(cell->column - 3)*2]*2;
-                                        *width = week_view->col_widths[1];
-                                        *x += week_view->col_offsets[1] - scroll_x;
-                                        *y += week_view->row_offsets[(cell->column - 3)*2]- scroll_y;
-                                }
-                        }
-                } else if (cell->column < 4) {
-                        if (cell->column == 5 - start_day) {
-                                *height = week_view->row_heights[cell->column*2];
-                                *width = week_view->col_widths[0];
-                                *x += week_view->col_offsets[0] - scroll_x;
-                                *y += week_view->row_offsets[cell->column*2]- scroll_y;
-                        } else if (cell->column == 6 - start_day) {
-                                *height = week_view->row_heights[(cell->column - 1)*2];
-                                *width = week_view->col_widths[0];
-                                *x += week_view->col_offsets[0] - scroll_x;
-                                *y += week_view->row_offsets[cell->column*2 - 1]- scroll_y;
-                        } else if (cell->column > 6 - start_day) {
-                                *height = week_view->row_heights[(cell->column - 1)*2]*2;
-                                *width = week_view->col_widths[0];
-                                *x += week_view->col_offsets[0] - scroll_x;
-                                *y += week_view->row_offsets[(cell->column - 1)*2]- scroll_y;
-                        } else {
-                                *height = week_view->row_heights[(cell->column)*2]*2;
-                                *width = week_view->col_widths[0]; 
-                                *x += week_view->col_offsets[0] - scroll_x; 
-                                *y += week_view->row_offsets[cell->column*2]- scroll_y;
-                        }
-                } else {
-                        *height = week_view->row_heights[(cell->column - 4)*2]*2;
-                        *width = week_view->col_widths[1];
-                        *x += week_view->col_offsets[1] - scroll_x;
-                        *y += week_view->row_offsets[(cell->column - 4)*2]- scroll_y;
-                }
-        }
-}
-
-static gboolean
-component_interface_grab_focus (AtkComponent *comp)
-{
-        GObject *g_obj;
-        EWeekViewCell *cell;
-        EWeekView *week_view;
-        GtkWidget *toplevel;
-
-        g_return_val_if_fail (EA_IS_WEEK_VIEW_CELL (comp), FALSE);
-
-        g_obj = atk_gobject_accessible_get_object (ATK_GOBJECT_ACCESSIBLE (comp));
-        if (!g_obj)
-                return FALSE;
-
-        cell = E_WEEK_VIEW_CELL (g_obj);
-        week_view = cell->week_view;
-
-        week_view->selection_start_day = cell->row * 7 + cell->column;
-        week_view->selection_end_day = cell->row * 7 + cell->column;
-        gtk_widget_queue_draw (week_view->main_canvas);
-
-        toplevel = gtk_widget_get_toplevel (GTK_WIDGET (week_view));
-        if (GTK_WIDGET_TOPLEVEL (toplevel))
-                gtk_window_present (GTK_WINDOW (toplevel));
-
-        return TRUE;
-}
diff --git a/a11y/calendar/ea-week-view-cell.h b/a11y/calendar/ea-week-view-cell.h
deleted file mode 100644
index 4fcb0d0890..0000000000
--- a/a11y/calendar/ea-week-view-cell.h
+++ /dev/null
@@ -1,92 +0,0 @@
-/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-/* vim:expandtab:shiftwidth=8:tabstop=8:
- */
-/* Evolution Accessibility: ea-week-view-cell.h
- *
- * Copyright (C) 2003 Ximian, Inc.
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of version 2 of the GNU General Public
- * License as published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * General Public License for more details.
- *
- * You should have received a copy of the GNU General Public
- * License along with this program; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
- *
- * Author: Bolian Yin <bolian.yin@sun.com> Sun Microsystem Inc., 2003
- * Author: Yang Wu <yang.wu@sun.com> Sun Microsystem Inc., 2003
- *
- */
-
-#ifndef __EA_WEEK_VIEW_CELL_H__
-#define __EA_WEEK_VIEW_CELL_H__
-
-#include <atk/atkgobjectaccessible.h>
-#include "e-week-view.h"
-
-#ifdef __cplusplus
-extern "C" {
-#endif /* __cplusplus */
-
-#define E_TYPE_WEEK_VIEW_CELL                     (e_week_view_cell_get_type ())
-#define E_WEEK_VIEW_CELL(obj)                     (G_TYPE_CHECK_INSTANCE_CAST ((obj), E_TYPE_WEEK_VIEW_CELL, EWeekViewCell))
-#define E_WEEK_VIEW_CELL_CLASS(klass)             (G_TYPE_CHECK_CLASS_CAST ((klass), E_TYPE_WEEK_VIEW_CELL, EWeekViewCellClass))
-#define E_IS_WEEK_VIEW_CELL(obj)                  (G_TYPE_CHECK_INSTANCE_TYPE ((obj), E_TYPE_WEEK_VIEW_CELL))
-#define E_IS_WEEK_VIEW_CELL_CLASS(klass)          (G_TYPE_CHECK_CLASS_TYPE ((klass), E_TYPE_WEEK_VIEW_CELL))
-#define E_WEEK_VIEW_CELL_GET_CLASS(obj)           (G_TYPE_INSTANCE_GET_CLASS ((obj), E_TYPE_WEEK_VIEW_CELL, EWeekViewCellClass))
-
-typedef struct _EWeekViewCell                   EWeekViewCell;
-typedef struct _EWeekViewCellClass              EWeekViewCellClass;
-
-struct _EWeekViewCell
-{
-	GObject parent;
-	EWeekView *week_view;
-	gint row;
-	gint column;
-};
-
-GType e_week_view_cell_get_type (void);
-
-struct _EWeekViewCellClass
-{
-	GObjectClass parent_class;
-};
-
-EWeekViewCell * e_week_view_cell_new (EWeekView *week_view, gint row, gint column);
-
-#define EA_TYPE_WEEK_VIEW_CELL                     (ea_week_view_cell_get_type ())
-#define EA_WEEK_VIEW_CELL(obj)                     (G_TYPE_CHECK_INSTANCE_CAST ((obj), EA_TYPE_WEEK_VIEW_CELL, EaWeekViewCell))
-#define EA_WEEK_VIEW_CELL_CLASS(klass)             (G_TYPE_CHECK_CLASS_CAST ((klass), EA_TYPE_WEEK_VIEW_CELL, EaWeekViewCellClass))
-#define EA_IS_WEEK_VIEW_CELL(obj)                  (G_TYPE_CHECK_INSTANCE_TYPE ((obj), EA_TYPE_WEEK_VIEW_CELL))
-#define EA_IS_WEEK_VIEW_CELL_CLASS(klass)          (G_TYPE_CHECK_CLASS_TYPE ((klass), EA_TYPE_WEEK_VIEW_CELL))
-#define EA_WEEK_VIEW_CELL_GET_CLASS(obj)           (G_TYPE_INSTANCE_GET_CLASS ((obj), EA_TYPE_WEEK_VIEW_CELL, EaWeekViewCellClass))
-
-typedef struct _EaWeekViewCell                   EaWeekViewCell;
-typedef struct _EaWeekViewCellClass              EaWeekViewCellClass;
-
-struct _EaWeekViewCell
-{
-	AtkGObjectAccessible parent;
-};
-
-GType ea_week_view_cell_get_type (void);
-
-struct _EaWeekViewCellClass
-{
-	AtkGObjectAccessibleClass parent_class;
-};
-
-AtkObject*     ea_week_view_cell_new         (GObject *gobj);
-
-#ifdef __cplusplus
-}
-#endif /* __cplusplus */
-
-#endif /* __EA_WEEK_VIEW_CELL_H__ */
diff --git a/a11y/calendar/ea-week-view-main-item.c b/a11y/calendar/ea-week-view-main-item.c
deleted file mode 100644
index 2d013dc802..0000000000
--- a/a11y/calendar/ea-week-view-main-item.c
+++ /dev/null
@@ -1,1275 +0,0 @@
-/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-/* vim:expandtab:shiftwidth=8:tabstop=8:
- */
-/* Evolution Accessibility: ea-week-view-main-item.c
- *
- * Copyright (C) 2003 Ximian, Inc.
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of version 2 of the GNU General Public
- * License as published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * General Public License for more details.
- *
- * You should have received a copy of the GNU General Public
- * License along with this program; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
- *
- * Author: Bolian Yin <bolian.yin@sun.com> Sun Microsystem Inc., 2003
- * Author: Yang Wu <Yang.Wu@sun.com> Sun Microsystem Inc., 2003
- *
- */
-
-#include "ea-week-view-main-item.h"
-#include "ea-week-view.h"
-#include "ea-week-view-cell.h"
-#include "ea-cell-table.h"
-#include <libgnome/gnome-i18n.h>
-
-/* EaWeekViewMainItem */
-static void ea_week_view_main_item_class_init (EaWeekViewMainItemClass *klass);
-
-static void ea_week_view_main_item_finalize (GObject *object);
-static G_CONST_RETURN gchar* ea_week_view_main_item_get_name (AtkObject *accessible);
-static G_CONST_RETURN gchar* ea_week_view_main_item_get_description (AtkObject *accessible);
-
-static gint         ea_week_view_main_item_get_n_children (AtkObject *obj);
-static AtkObject*   ea_week_view_main_item_ref_child (AtkObject *obj,
-						     gint i);
-static AtkObject * ea_week_view_main_item_get_parent (AtkObject *accessible);
-static gint ea_week_view_main_item_get_index_in_parent (AtkObject *accessible);
-
-/* callbacks */
-static void ea_week_view_main_item_dates_change_cb (GnomeCalendar *gcal, gpointer data);
-static void ea_week_view_main_item_time_change_cb (EWeekView *week_view, gpointer data);
-
-/* component interface */
-static void atk_component_interface_init (AtkComponentIface *iface);
-static void component_interface_get_extents (AtkComponent *component,
-					     gint *x, gint *y,
-					     gint *width, gint *height,
-					     AtkCoordType coord_type);
-
-/* atk table interface */
-static void atk_table_interface_init (AtkTableIface *iface);
-static gint table_interface_get_index_at (AtkTable *table,
-					  gint     row,
-					  gint     column);
-static gint table_interface_get_column_at_index (AtkTable *table,
-						 gint     index);
-static gint table_interface_get_row_at_index (AtkTable *table,
-					      gint     index);
-static AtkObject* table_interface_ref_at (AtkTable *table,
-					  gint     row, 
-					  gint     column);
-static gint table_interface_get_n_rows (AtkTable *table);
-static gint table_interface_get_n_columns (AtkTable *table);
-static gint table_interface_get_column_extent_at (AtkTable      *table,
-						  gint          row,
-						  gint          column);
-static gint table_interface_get_row_extent_at (AtkTable      *table,
-					       gint          row,
-					       gint          column);
-
-static gboolean table_interface_is_row_selected (AtkTable *table,
-						 gint     row);
-static gboolean table_interface_is_column_selected (AtkTable *table,
-						    gint     row);
-static gboolean table_interface_is_selected (AtkTable *table,
-					     gint     row,
-					     gint     column);
-static gint table_interface_get_selected_rows (AtkTable *table,
-					       gint **rows_selected);
-static gint table_interface_get_selected_columns (AtkTable *table,
-						  gint     **columns_selected);
-static gboolean table_interface_add_row_selection (AtkTable *table, gint row);
-static gboolean table_interface_remove_row_selection (AtkTable *table,
-						      gint row);
-static gboolean table_interface_add_column_selection (AtkTable *table,
-						      gint column);
-static gboolean table_interface_remove_column_selection (AtkTable *table,
-							 gint column);
-static AtkObject* table_interface_get_row_header (AtkTable *table, gint row);
-static AtkObject* table_interface_get_column_header (AtkTable *table,
-						     gint in_col);
-static AtkObject* table_interface_get_caption (AtkTable *table);
-
-static G_CONST_RETURN gchar*
-table_interface_get_column_description (AtkTable *table, gint in_col);
-
-static G_CONST_RETURN gchar*
-table_interface_get_row_description (AtkTable *table, gint row);
-
-static AtkObject* table_interface_get_summary (AtkTable *table);
-
-/* atk selection interface */
-static void atk_selection_interface_init (AtkSelectionIface *iface);
-static gboolean selection_interface_add_selection (AtkSelection *selection,
-						   gint i);
-static gboolean selection_interface_clear_selection (AtkSelection *selection);
-static AtkObject* selection_interface_ref_selection (AtkSelection *selection,
-						     gint i);
-static gint selection_interface_get_selection_count (AtkSelection *selection);
-static gboolean selection_interface_is_child_selected (AtkSelection *selection,
-						       gint i);
-
-/* helpers */
-static EaCellTable *
-ea_week_view_main_item_get_cell_data (EaWeekViewMainItem *ea_main_item);
-
-static void
-ea_week_view_main_item_destory_cell_data (EaWeekViewMainItem *ea_main_item);
-
-static gint
-ea_week_view_main_item_get_child_index_at (EaWeekViewMainItem *ea_main_item,
-					  gint row, gint column);
-static gint
-ea_week_view_main_item_get_row_at_index (EaWeekViewMainItem *ea_main_item,
-					gint index);
-static gint
-ea_week_view_main_item_get_column_at_index (EaWeekViewMainItem *ea_main_item,
-					   gint index);
-static gint
-ea_week_view_main_item_get_row_label (EaWeekViewMainItem *ea_main_item,
-				     gint row, gchar *buffer,
-				     gint buffer_size);
-
-#ifdef ACC_DEBUG
-static gint n_ea_week_view_main_item_created = 0;
-static gint n_ea_week_view_main_item_destroyed = 0;
-#endif
-
-static gpointer parent_class = NULL;
-
-GType
-ea_week_view_main_item_get_type (void)
-{
-	static GType type = 0;
-	AtkObjectFactory *factory;
-	GTypeQuery query;
-	GType derived_atk_type;
-
-	if (!type) {
-		static GTypeInfo tinfo = {
-			sizeof (EaWeekViewMainItemClass),
-			(GBaseInitFunc) NULL, /* base init */
-			(GBaseFinalizeFunc) NULL, /* base finalize */
-			(GClassInitFunc) ea_week_view_main_item_class_init,
-			(GClassFinalizeFunc) NULL, /* class finalize */
-			NULL, /* class data */
-			sizeof (EaWeekViewMainItem), /* instance size */
-			0, /* nb preallocs */
-			(GInstanceInitFunc) NULL, /* instance init */
-			NULL /* value table */
-		};
-
-		static const GInterfaceInfo atk_component_info = {
-			(GInterfaceInitFunc) atk_component_interface_init,
-			(GInterfaceFinalizeFunc) NULL,
-			NULL
-		};
-
-		static const GInterfaceInfo atk_table_info = {
-			(GInterfaceInitFunc) atk_table_interface_init,
-			(GInterfaceFinalizeFunc) NULL,
-			NULL
-		};
-		static const GInterfaceInfo atk_selection_info = {
-			(GInterfaceInitFunc) atk_selection_interface_init,
-			(GInterfaceFinalizeFunc) NULL,
-			NULL
-		};
-		
-
-		/*
-		 * Figure out the size of the class and instance
-		 * we are run-time deriving from (GailCanvasItem, in this case)
-		 *
-		 */
-
-		factory = atk_registry_get_factory (atk_get_default_registry (),
-						    e_week_view_main_item_get_type());
-		derived_atk_type = atk_object_factory_get_accessible_type (factory);
-		g_type_query (derived_atk_type, &query);
-
-		tinfo.class_size = query.class_size;
-		tinfo.instance_size = query.instance_size;
-
-		type = g_type_register_static (derived_atk_type,
-					       "EaWeekViewMainItem", &tinfo, 0);
-		g_type_add_interface_static (type, ATK_TYPE_COMPONENT,
-					     &atk_component_info);
-		g_type_add_interface_static (type, ATK_TYPE_TABLE,
-					     &atk_table_info);
-		g_type_add_interface_static (type, ATK_TYPE_SELECTION,
-					     &atk_selection_info);
-	}
-
-	return type;
-}
-
-static void
-ea_week_view_main_item_class_init (EaWeekViewMainItemClass *klass)
-{
-	GObjectClass *gobject_class = G_OBJECT_CLASS (klass);
-	AtkObjectClass *class = ATK_OBJECT_CLASS (klass);
-
-	gobject_class->finalize = ea_week_view_main_item_finalize;
-	parent_class = g_type_class_peek_parent (klass);
-
-	class->get_name = ea_week_view_main_item_get_name;
-	class->get_description = ea_week_view_main_item_get_description;
-
-	class->get_n_children = ea_week_view_main_item_get_n_children;
-	class->ref_child = ea_week_view_main_item_ref_child;
-	class->get_parent = ea_week_view_main_item_get_parent;
-	class->get_index_in_parent = ea_week_view_main_item_get_index_in_parent;
-}
-
-AtkObject* 
-ea_week_view_main_item_new (GObject *obj)
-{
-	AtkObject *accessible;
-	GnomeCalendar *gcal;
-	EWeekViewMainItem *main_item;
-
-	g_return_val_if_fail (E_IS_WEEK_VIEW_MAIN_ITEM (obj), NULL);
-
-	accessible = ATK_OBJECT (g_object_new (EA_TYPE_WEEK_VIEW_MAIN_ITEM,
-					       NULL));
-
-	atk_object_initialize (accessible, obj);
-        accessible->role = ATK_ROLE_TABLE;
-
-#ifdef ACC_DEBUG
-	++n_ea_week_view_main_item_created;
-	printf ("ACC_DEBUG: n_ea_week_view_main_item_created = %d\n",
-		n_ea_week_view_main_item_created);
-#endif
-	main_item = E_WEEK_VIEW_MAIN_ITEM (obj);
-	g_signal_connect (main_item->week_view, "selected_time_changed",
-			  G_CALLBACK (ea_week_view_main_item_time_change_cb),
-			  accessible);
-
-	/* listen for date changes of calendar */
-	gcal = e_calendar_view_get_calendar (E_CALENDAR_VIEW (main_item->week_view));
-	if (gcal)
-		g_signal_connect (gcal, "dates_shown_changed",
-				  G_CALLBACK (ea_week_view_main_item_dates_change_cb),
-				  accessible);
-
-	return accessible;
-}
-
-static void
-ea_week_view_main_item_finalize (GObject *object)
-{
-	EaWeekViewMainItem *ea_main_item;
-
-	g_return_if_fail (EA_IS_WEEK_VIEW_MAIN_ITEM (object));
-
-	ea_main_item = EA_WEEK_VIEW_MAIN_ITEM (object);
-
-	/* Free the allocated cell data */
-	ea_week_view_main_item_destory_cell_data (ea_main_item);
-
-	G_OBJECT_CLASS (parent_class)->finalize (object);
-#ifdef ACC_DEBUG
-	++n_ea_week_view_main_item_destroyed;
-	printf ("ACC_DEBUG: n_ea_week_view_main_item_destroyed = %d\n",
-		n_ea_week_view_main_item_destroyed);
-#endif
-}
-
-static G_CONST_RETURN gchar*
-ea_week_view_main_item_get_name (AtkObject *accessible)
-{
-	AtkObject *parent;
-	g_return_val_if_fail (EA_IS_WEEK_VIEW_MAIN_ITEM (accessible), NULL);
-	parent = atk_object_get_parent (accessible);
-	return atk_object_get_name (parent);
-
-}
-
-static G_CONST_RETURN gchar*
-ea_week_view_main_item_get_description (AtkObject *accessible)
-{
-	return _("a table to view and select the current time range");
-}
-
-static gint
-ea_week_view_main_item_get_n_children (AtkObject *accessible)
-{
-	AtkGObjectAccessible *atk_gobj;
-	GObject *g_obj;
-	EWeekViewMainItem *main_item;
-	EWeekView *week_view;
-
-	g_return_val_if_fail (EA_IS_WEEK_VIEW_MAIN_ITEM (accessible), -1);
-
-	atk_gobj = ATK_GOBJECT_ACCESSIBLE (accessible);
-	g_obj = atk_gobject_accessible_get_object (atk_gobj);
-	if (!g_obj)
-		return -1;
-
-	main_item = E_WEEK_VIEW_MAIN_ITEM (g_obj);
-	week_view = main_item->week_view;
-	
-	if (week_view->multi_week_view)
-		return 7 * week_view->weeks_shown;
-	else 
-		return 7;
-}
-
-static AtkObject *
-ea_week_view_main_item_ref_child (AtkObject *accessible, gint index)
-{
-	AtkGObjectAccessible *atk_gobj;
-	GObject *g_obj;
-	EWeekViewMainItem *main_item;
-	EWeekView *week_view;
-	gint n_children;
-	EWeekViewCell *cell;
-	EaCellTable *cell_data;
-	EaWeekViewMainItem *ea_main_item;
-
-	g_return_val_if_fail (EA_IS_WEEK_VIEW_MAIN_ITEM (accessible), NULL);
-
-	atk_gobj = ATK_GOBJECT_ACCESSIBLE (accessible);
-	g_obj = atk_gobject_accessible_get_object (atk_gobj);
-	if (!g_obj)
-		return NULL;
-
-	main_item = E_WEEK_VIEW_MAIN_ITEM (g_obj);
-	week_view = main_item->week_view;
-
-	n_children = ea_week_view_main_item_get_n_children (accessible);
-	if (index < 0 || index >= n_children)
-		return NULL;
-
-	ea_main_item = EA_WEEK_VIEW_MAIN_ITEM (accessible);
-	cell_data = ea_week_view_main_item_get_cell_data (ea_main_item);
-	if (!cell_data)
-		return NULL;
-	cell = ea_cell_table_get_cell_at_index (cell_data, index);
-	if (!cell) {
-		gint row, column;
-
-		row = ea_week_view_main_item_get_row_at_index (ea_main_item, index);
-		column = ea_week_view_main_item_get_column_at_index (ea_main_item, index);
-		cell = e_week_view_cell_new (week_view, row, column);
-		ea_cell_table_set_cell_at_index (cell_data, index, cell);
-		g_object_unref (cell);
-	}
-
-	return g_object_ref (atk_gobject_accessible_for_object (G_OBJECT(cell)));
-}
-
-static AtkObject *
-ea_week_view_main_item_get_parent (AtkObject *accessible)
-{
-	AtkGObjectAccessible *atk_gobj;
-	GObject *g_obj;
-	EWeekViewMainItem *main_item;
-
-	g_return_val_if_fail (EA_IS_WEEK_VIEW_MAIN_ITEM (accessible), NULL);
-
-	atk_gobj = ATK_GOBJECT_ACCESSIBLE (accessible);
-	g_obj = atk_gobject_accessible_get_object (atk_gobj);
-	if (!g_obj)
-		return NULL;
-
-	main_item = E_WEEK_VIEW_MAIN_ITEM (g_obj);
-	return gtk_widget_get_accessible (GTK_WIDGET (main_item->week_view));
-}
-
-static gint
-ea_week_view_main_item_get_index_in_parent (AtkObject *accessible)
-{
-	AtkGObjectAccessible *atk_gobj;
-	GObject *g_obj;
-
-	g_return_val_if_fail (EA_IS_WEEK_VIEW_MAIN_ITEM (accessible), -1);
-
-	atk_gobj = ATK_GOBJECT_ACCESSIBLE (accessible);
-	g_obj = atk_gobject_accessible_get_object (atk_gobj);
-	if (!g_obj)
-		return -1;
-
-	/* always the first child of ea-week-view */
-	return 0;
-}
-
-/* callbacks */
-
-static void
-ea_week_view_main_item_dates_change_cb (GnomeCalendar *gcal, gpointer data)
-{
-	EaWeekViewMainItem *ea_main_item;
-
-	g_return_if_fail (GNOME_IS_CALENDAR (gcal));
-	g_return_if_fail (data);
-	g_return_if_fail (EA_IS_WEEK_VIEW_MAIN_ITEM (data));
-
-	ea_main_item = EA_WEEK_VIEW_MAIN_ITEM (data);
-
-#ifdef ACC_DEBUG
-	printf ("EvoAcc: ea_week_view_main_item update cb\n");
-#endif
-
-	ea_week_view_main_item_destory_cell_data (ea_main_item);
-}
-
-static void
-ea_week_view_main_item_time_change_cb (EWeekView *week_view, gpointer data)
-{
-	EaWeekViewMainItem *ea_main_item;
-	AtkObject *item_cell = NULL;
-
-	g_return_if_fail (E_IS_WEEK_VIEW (week_view));
-	g_return_if_fail (data);
-	g_return_if_fail (EA_IS_WEEK_VIEW_MAIN_ITEM (data));
-
-	ea_main_item = EA_WEEK_VIEW_MAIN_ITEM (data);
-
-#ifdef ACC_DEBUG
-	printf ("EvoAcc: ea_week_view_main_item time changed cb\n");
-#endif
-	/* only deal with the first selected child, for now */
-	item_cell = atk_selection_ref_selection (ATK_SELECTION (ea_main_item),
-						 0);
-	if (item_cell) {
-		AtkStateSet *state_set;
-		state_set = atk_object_ref_state_set (item_cell);
-		atk_state_set_add_state (state_set, ATK_STATE_FOCUSED);
-		g_object_unref (state_set);
-
-	        g_signal_emit_by_name (ea_main_item,
-			       "active-descendant-changed",
-			       item_cell);
-        	g_signal_emit_by_name (data, "selection_changed");
-                atk_focus_tracker_notify (item_cell);
-                g_object_unref (item_cell);
-	}
-}
-
-/* helpers */
-
-static gint
-ea_week_view_main_item_get_child_index_at (EaWeekViewMainItem *ea_main_item,
-					  gint row, gint column)
-{
-	AtkGObjectAccessible *atk_gobj;
-	GObject *g_obj;
-	EWeekViewMainItem *main_item;
-	EWeekView *week_view;
-
-	g_return_val_if_fail (ea_main_item, -1);
-
-	atk_gobj = ATK_GOBJECT_ACCESSIBLE (ea_main_item);
-	g_obj = atk_gobject_accessible_get_object (atk_gobj);
-	if (!g_obj)
-		return -1;
-
-	main_item = E_WEEK_VIEW_MAIN_ITEM (g_obj);
-	week_view = main_item->week_view;
-
-	if (row >= 0 && row < week_view->weeks_shown &&
-	    column >= 0 && column < 7)
-		return row * 7 + column;
-
-	return -1;
-}
-
-static gint
-ea_week_view_main_item_get_row_at_index (EaWeekViewMainItem *ea_main_item,
-					gint index)
-{
-	AtkGObjectAccessible *atk_gobj;
-	GObject *g_obj;
-	EWeekViewMainItem *main_item;
-	EWeekView *week_view;
-	gint n_children;
-
-	g_return_val_if_fail (ea_main_item, -1);
-
-	atk_gobj = ATK_GOBJECT_ACCESSIBLE (ea_main_item);
-	g_obj = atk_gobject_accessible_get_object (atk_gobj);
-	if (!g_obj)
-		return -1;
-
-	main_item = E_WEEK_VIEW_MAIN_ITEM (g_obj);
-	week_view = main_item->week_view;
-
-	n_children = ea_week_view_main_item_get_n_children (ATK_OBJECT (ea_main_item));
-	if (index >= 0 && index < n_children)
-		return index / 7;
-	return -1;
-}
-
-static gint
-ea_week_view_main_item_get_column_at_index (EaWeekViewMainItem *ea_main_item,
-					   gint index)
-{
-	AtkGObjectAccessible *atk_gobj;
-	GObject *g_obj;
-	EWeekViewMainItem *main_item;
-	EWeekView *week_view;
-	gint n_children;
-
-	g_return_val_if_fail (ea_main_item, -1);
-
-	atk_gobj = ATK_GOBJECT_ACCESSIBLE (ea_main_item);
-	g_obj = atk_gobject_accessible_get_object (atk_gobj);
-	if (!g_obj)
-		return -1;
-
-	main_item = E_WEEK_VIEW_MAIN_ITEM (g_obj);
-	week_view = main_item->week_view;
-
-	n_children = ea_week_view_main_item_get_n_children (ATK_OBJECT (ea_main_item));
-	if (index >= 0 && index < n_children)
-		return index % 7;
-	return -1;
-}
-
-static gint
-ea_week_view_main_item_get_row_label (EaWeekViewMainItem *ea_main_item,
-				     gint row, gchar *buffer, gint buffer_size)
-{
-	AtkGObjectAccessible *atk_gobj;
-	GObject *g_obj;
-	EWeekViewMainItem *main_item;
-	EWeekView *week_view;
-
-	g_return_val_if_fail (ea_main_item, 0);
-
-	atk_gobj = ATK_GOBJECT_ACCESSIBLE (ea_main_item);
-	g_obj = atk_gobject_accessible_get_object (atk_gobj);
-	if (!g_obj)
-		return 0 ;
-
-	main_item = E_WEEK_VIEW_MAIN_ITEM (g_obj);
-	week_view = main_item->week_view;
-
-	return g_snprintf (buffer, buffer_size, "the %i week",
-			   row + 1);
-
-}
-
-static EaCellTable *
-ea_week_view_main_item_get_cell_data (EaWeekViewMainItem *ea_main_item)
-{
-	AtkGObjectAccessible *atk_gobj;
-	GObject *g_obj;
-	EWeekViewMainItem *main_item;
-	EWeekView *week_view;
-	EaCellTable *cell_data;
-
-	g_return_val_if_fail (ea_main_item, NULL);
-
-	atk_gobj = ATK_GOBJECT_ACCESSIBLE (ea_main_item);
-	g_obj = atk_gobject_accessible_get_object (atk_gobj);
-	if (!g_obj)
-		return NULL;
-
-	main_item = E_WEEK_VIEW_MAIN_ITEM (g_obj);
-	week_view = main_item->week_view;
-
-	cell_data = g_object_get_data (G_OBJECT(ea_main_item),
-				       "ea-week-view-cell-table");
-	if (!cell_data) {
-		cell_data = ea_cell_table_create (week_view->weeks_shown, 7, TRUE);
-		g_object_set_data (G_OBJECT(ea_main_item),
-				   "ea-week-view-cell-table", cell_data);
-	}
-	return cell_data;
-}
-
-static void
-ea_week_view_main_item_destory_cell_data (EaWeekViewMainItem *ea_main_item)
-{
-	EaCellTable *cell_data;
-
-	g_return_if_fail (ea_main_item);
-
-	cell_data = g_object_get_data (G_OBJECT(ea_main_item),
-				       "ea-week-view-cell-table");
-	if (cell_data) {
-		ea_cell_table_destroy (cell_data);
-		g_object_set_data (G_OBJECT(ea_main_item),
-				   "ea-week-view-cell-table", NULL);
-	}
-}
-
-/* Atk Component Interface */
-
-static void 
-atk_component_interface_init (AtkComponentIface *iface)
-{
-	g_return_if_fail (iface != NULL);
-
-	iface->get_extents = component_interface_get_extents;
-}
-
-static void 
-component_interface_get_extents (AtkComponent *component,
-				 gint *x, gint *y, gint *width, gint *height,
-				 AtkCoordType coord_type)
-{
-	GObject *g_obj;
-	AtkObject *ea_canvas;
-	EWeekViewMainItem *main_item;
-	EWeekView *week_view;
-
-	*x = *y = *width = *height = 0;
-
-	g_return_if_fail (EA_IS_WEEK_VIEW_MAIN_ITEM (component));
-
-	g_obj = atk_gobject_accessible_get_object (ATK_GOBJECT_ACCESSIBLE(component));
-	if (!g_obj)
-		/* defunct object*/
-		return;
-	main_item = E_WEEK_VIEW_MAIN_ITEM (g_obj);
-	week_view = main_item->week_view;
-
-	ea_canvas = gtk_widget_get_accessible (week_view->main_canvas);
-	atk_component_get_extents (ATK_COMPONENT (ea_canvas), x, y,
-				   width, height, coord_type);
-}
-
-/* atk table interface */
-
-static void 
-atk_table_interface_init (AtkTableIface *iface)
-{
-	g_return_if_fail (iface != NULL);
-
-	iface->ref_at = table_interface_ref_at;
-
-	iface->get_n_rows = table_interface_get_n_rows;
-	iface->get_n_columns = table_interface_get_n_columns;
-	iface->get_index_at = table_interface_get_index_at;
-	iface->get_column_at_index = table_interface_get_column_at_index;
-	iface->get_row_at_index = table_interface_get_row_at_index;
-	iface->get_column_extent_at = table_interface_get_column_extent_at;
-	iface->get_row_extent_at = table_interface_get_row_extent_at;
-
-	iface->is_selected = table_interface_is_selected;
-	iface->get_selected_rows = table_interface_get_selected_rows;
-	iface->get_selected_columns = table_interface_get_selected_columns;
-	iface->is_row_selected = table_interface_is_row_selected;
-	iface->is_column_selected = table_interface_is_column_selected;
-	iface->add_row_selection = table_interface_add_row_selection;
-	iface->remove_row_selection = table_interface_remove_row_selection;
-	iface->add_column_selection = table_interface_add_column_selection;
-	iface->remove_column_selection = table_interface_remove_column_selection;
-
-	iface->get_row_header = table_interface_get_row_header;
-	iface->get_column_header = table_interface_get_column_header;
-	iface->get_caption = table_interface_get_caption;
-	iface->get_summary = table_interface_get_summary;
-	iface->get_row_description = table_interface_get_row_description;
-	iface->get_column_description = table_interface_get_column_description;
-}
-
-static AtkObject* 
-table_interface_ref_at (AtkTable *table,
-			gint     row, 
-			gint     column)
-{
-	gint index;
-
-	EaWeekViewMainItem* ea_main_item = EA_WEEK_VIEW_MAIN_ITEM (table);
-	index = ea_week_view_main_item_get_child_index_at (ea_main_item,
-							  row, column);
-	return ea_week_view_main_item_ref_child (ATK_OBJECT (ea_main_item), index);
-}
-
-static gint 
-table_interface_get_n_rows (AtkTable *table)
-{
-	AtkGObjectAccessible *atk_gobj;
-	GObject *g_obj;
-	EWeekViewMainItem *main_item;
-	EWeekView *week_view;
-	EaWeekViewMainItem* ea_main_item = EA_WEEK_VIEW_MAIN_ITEM (table);
-
-	atk_gobj = ATK_GOBJECT_ACCESSIBLE (ea_main_item);
-	g_obj = atk_gobject_accessible_get_object (atk_gobj);
-	if (!g_obj)
-		return -1;
-
-	main_item = E_WEEK_VIEW_MAIN_ITEM (g_obj);
-	week_view = main_item->week_view;
-
-	return week_view->weeks_shown;
-}
-
-static gint 
-table_interface_get_n_columns (AtkTable *table)
-{
-	AtkGObjectAccessible *atk_gobj;
-	GObject *g_obj;
-	EWeekViewMainItem *main_item;
-	EWeekView *week_view;
-	EaWeekViewMainItem* ea_main_item = EA_WEEK_VIEW_MAIN_ITEM (table);
-
-	atk_gobj = ATK_GOBJECT_ACCESSIBLE (ea_main_item);
-	g_obj = atk_gobject_accessible_get_object (atk_gobj);
-	if (!g_obj)
-		return -1;
-
-	main_item = E_WEEK_VIEW_MAIN_ITEM (g_obj);
-	week_view = main_item->week_view;
-
-	return 7;
-}
-
-static gint
-table_interface_get_index_at (AtkTable *table,
-			      gint     row,
-			      gint     column)
-{
-	EaWeekViewMainItem* ea_main_item = EA_WEEK_VIEW_MAIN_ITEM (table);
-	return ea_week_view_main_item_get_child_index_at (ea_main_item,
-							 row, column);
-}
-
-static gint
-table_interface_get_column_at_index (AtkTable *table,
-				     gint     index)
-{
-	EaWeekViewMainItem* ea_main_item = EA_WEEK_VIEW_MAIN_ITEM (table);
-	return ea_week_view_main_item_get_column_at_index (ea_main_item, index);
-}
-
-static gint
-table_interface_get_row_at_index (AtkTable *table,
-				  gint     index)
-{
-	EaWeekViewMainItem* ea_main_item = EA_WEEK_VIEW_MAIN_ITEM (table);
-	return ea_week_view_main_item_get_row_at_index (ea_main_item, index);
-}
-
-static gint
-table_interface_get_column_extent_at (AtkTable      *table,
-				      gint          row,
-				      gint          column)
-{
-	gint index;
-	gint width = 0, height = 0;
-	AtkObject *child;
-	EaWeekViewMainItem* ea_main_item = EA_WEEK_VIEW_MAIN_ITEM (table);
-
-	index = ea_week_view_main_item_get_child_index_at (ea_main_item,
-							  row, column);
-	child = atk_object_ref_accessible_child (ATK_OBJECT (ea_main_item),
-						 index);
-	if (child)
-		atk_component_get_size (ATK_COMPONENT (child),
-					&width, &height);
-
-	return width;
-}
-
-static gint 
-table_interface_get_row_extent_at (AtkTable      *table,
-				   gint          row,
-				   gint          column)
-{
-	gint index;
-	gint width = 0, height = 0;
-	AtkObject *child;
-	EaWeekViewMainItem* ea_main_item = EA_WEEK_VIEW_MAIN_ITEM (table);
-
-	index = ea_week_view_main_item_get_child_index_at (ea_main_item,
-							  row, column);
-	child = atk_object_ref_accessible_child (ATK_OBJECT (ea_main_item),
-						 index);
-	if (child)
-		atk_component_get_size (ATK_COMPONENT (child),
-					&width, &height);
-
-	return height;
-}
-
-static gboolean 
-table_interface_is_row_selected (AtkTable *table,
-				 gint     row)
-{
-	AtkGObjectAccessible *atk_gobj;
-	GObject *g_obj;
-	EWeekViewMainItem *main_item;
-	EWeekView *week_view;
-	EaWeekViewMainItem* ea_main_item = EA_WEEK_VIEW_MAIN_ITEM (table);
-
-	atk_gobj = ATK_GOBJECT_ACCESSIBLE (ea_main_item);
-	g_obj = atk_gobject_accessible_get_object (atk_gobj);
-	if (!g_obj)
-		return FALSE;
-
-	main_item = E_WEEK_VIEW_MAIN_ITEM (g_obj);
-	week_view = main_item->week_view;
-
-	if (week_view->selection_start_day == -1)
-		/* no selection */
-		return FALSE;
-	if ((row < 0)&&(row + 1 > week_view->weeks_shown ))
-		return FALSE;
-	if (((week_view->selection_start_day < row*7)&&(week_view->selection_end_day<row*7))
-		||((week_view->selection_start_day > row*7+6)&&(week_view->selection_end_day > row*7+6)))
-		return FALSE;
-	else
-		return TRUE;
-}
-
-static gboolean 
-table_interface_is_selected (AtkTable *table, 
-			     gint     row, 
-			     gint     column)
-{
-	return table_interface_is_row_selected (table, row) && table_interface_is_column_selected(table, column);
-}
-
-static gboolean 
-table_interface_is_column_selected (AtkTable *table,
-				    gint     column)
-{
-	AtkGObjectAccessible *atk_gobj;
-	GObject *g_obj;
-	EWeekViewMainItem *main_item;
-	EWeekView *week_view;
-	EaWeekViewMainItem* ea_main_item = EA_WEEK_VIEW_MAIN_ITEM (table);
-
-	atk_gobj = ATK_GOBJECT_ACCESSIBLE (ea_main_item);
-	g_obj = atk_gobject_accessible_get_object (atk_gobj);
-	if (!g_obj)
-		return FALSE;
-
-	main_item = E_WEEK_VIEW_MAIN_ITEM (g_obj);
-	week_view = main_item->week_view;
-
-	if ((column <0)||(column >6))
-		return FALSE;
-	else {
-		gint i;
-		for (i=0;i<week_view->weeks_shown;i++)
-			if ((column + i*7>= week_view->selection_start_day ) &&
-			    (column + i*7<= week_view->selection_end_day))
-				return TRUE;
-		return FALSE;
-	}
-}
-
-static gint 
-table_interface_get_selected_rows (AtkTable *table,
-				   gint     **rows_selected)
-{
-	AtkGObjectAccessible *atk_gobj;
-	GObject *g_obj;
-	EWeekViewMainItem *main_item;
-	EWeekView *week_view;
-	EaWeekViewMainItem* ea_main_item = EA_WEEK_VIEW_MAIN_ITEM (table);
-	gint start_row = -1, n_rows = 0;
-
-	atk_gobj = ATK_GOBJECT_ACCESSIBLE (ea_main_item);
-	g_obj = atk_gobject_accessible_get_object (atk_gobj);
-	if (!g_obj)
-		return -1;
-
-	main_item = E_WEEK_VIEW_MAIN_ITEM (g_obj);
-	week_view = main_item->week_view;
-
-	if (week_view->selection_start_day == -1)
-		return 0;
-
-	start_row = week_view->selection_start_day;
-	n_rows = week_view->selection_end_day - start_row + 1;
-
-	if (n_rows > 0 && start_row != -1 && rows_selected) {
-		gint index;
-
-		*rows_selected = (gint *) g_malloc (n_rows * sizeof (gint));
-		for (index = 0; index < n_rows; ++index)
-			(*rows_selected)[index] = start_row + index;
-	}
-	return n_rows;
-}
-
-static gint 
-table_interface_get_selected_columns (AtkTable *table,
-				      gint **columns_selected)
-{
-	AtkGObjectAccessible *atk_gobj;
-	GObject *g_obj;
-	EWeekViewMainItem *main_item;
-	EWeekView *week_view;
-	EaWeekViewMainItem* ea_main_item = EA_WEEK_VIEW_MAIN_ITEM (table);
-	gint start_column = -1, n_columns = 0;
-
-	atk_gobj = ATK_GOBJECT_ACCESSIBLE (ea_main_item);
-	g_obj = atk_gobject_accessible_get_object (atk_gobj);
-	if (!g_obj)
-		return -1;
-
-	main_item = E_WEEK_VIEW_MAIN_ITEM (g_obj);
-	week_view = main_item->week_view;
-
-	if (week_view->selection_start_day == -1)
-		return 0;
-	if (week_view->selection_end_day - week_view->selection_start_day >= 6 ) {
-		start_column = 0;
-		n_columns =7;
-	} else {
-		start_column = week_view->selection_start_day % 7;
-		n_columns = (week_view->selection_end_day % 7) - start_column + 1;
-	}
-	if (n_columns > 0 && start_column != -1 && columns_selected) {
-		gint index;
-		
-		*columns_selected = (gint *) g_malloc (n_columns * sizeof (gint));
-		for (index = 0; index < n_columns; ++index)
-			(*columns_selected)[index] = start_column + index;
-	}
-	return n_columns;
-}
-
-static gboolean 
-table_interface_add_row_selection (AtkTable *table, 
-				   gint row)
-{
-	AtkGObjectAccessible *atk_gobj;
-	GObject *g_obj;
-	EWeekViewMainItem *main_item;
-	EWeekView *week_view;
-	EaWeekViewMainItem* ea_main_item = EA_WEEK_VIEW_MAIN_ITEM (table);
-
-	atk_gobj = ATK_GOBJECT_ACCESSIBLE (ea_main_item);
-	g_obj = atk_gobject_accessible_get_object (atk_gobj);
-	if (!g_obj)
-		return FALSE;
-
-	main_item = E_WEEK_VIEW_MAIN_ITEM (g_obj);
-	week_view = main_item->week_view;
-
-	/* FIXME: we need multi-selection */
-
-	week_view->selection_start_day = row * 7;
-	week_view->selection_end_day = row *7 + 6;
-
-	gtk_widget_queue_draw (week_view->main_canvas);
-	return TRUE;
-}
-
-static gboolean 
-table_interface_remove_row_selection (AtkTable *table, 
-				      gint row)
-{
-	return FALSE;
-}
-
-static gboolean 
-table_interface_add_column_selection (AtkTable *table, 
-				      gint column)
-{
-	AtkGObjectAccessible *atk_gobj;
-	GObject *g_obj;
-	EWeekViewMainItem *main_item;
-	EWeekView *week_view;
-	EaWeekViewMainItem* ea_main_item = EA_WEEK_VIEW_MAIN_ITEM (table);
-
-	atk_gobj = ATK_GOBJECT_ACCESSIBLE (ea_main_item);
-	g_obj = atk_gobject_accessible_get_object (atk_gobj);
-	if (!g_obj)
-		return FALSE;
-
-	main_item = E_WEEK_VIEW_MAIN_ITEM (g_obj);
-	week_view = main_item->week_view;
-
-	/* FIXME: we need multi-selection */
-
-	week_view->selection_start_day = column;
-	week_view->selection_end_day = (week_view->weeks_shown - 1)*7+column;
-
-	gtk_widget_queue_draw (week_view->main_canvas);
-	return TRUE;
-}
-
-static gboolean 
-table_interface_remove_column_selection (AtkTable *table, 
-					 gint     column)
-{
-	/* FIXME: NOT IMPLEMENTED */
-	return FALSE;
-}
-
-static AtkObject* 
-table_interface_get_row_header (AtkTable *table, 
-				gint     row)
-{
-	/* FIXME: NOT IMPLEMENTED */
-	return NULL;
-}
-
-static AtkObject* 
-table_interface_get_column_header (AtkTable *table, 
-				   gint     in_col)
-{
-	/* FIXME: NOT IMPLEMENTED */
-	return NULL;
-}
-
-static AtkObject*
-table_interface_get_caption (AtkTable	*table)
-{
-	/* FIXME: NOT IMPLEMENTED */
-	return NULL;
-}
-
-static G_CONST_RETURN gchar*
-table_interface_get_column_description (AtkTable	  *table,
-					gint       in_col)
-{
-	AtkGObjectAccessible *atk_gobj;
-	GObject *g_obj;
-	EWeekViewMainItem *main_item;
-	EWeekView *week_view;
-	EaWeekViewMainItem* ea_main_item = EA_WEEK_VIEW_MAIN_ITEM (table);
-	const gchar *description;
-	EaCellTable *cell_data;
-
-	atk_gobj = ATK_GOBJECT_ACCESSIBLE (ea_main_item);
-	g_obj = atk_gobject_accessible_get_object (atk_gobj);
-	if (!g_obj)
-		return NULL;
-
-	main_item = E_WEEK_VIEW_MAIN_ITEM (g_obj);
-	week_view = main_item->week_view;
-
-	if (in_col < 0 || in_col > 6)
-		return NULL;
-	cell_data = ea_week_view_main_item_get_cell_data (ea_main_item);
-	if (!cell_data)
-		return NULL;
-
-	description = ea_cell_table_get_column_label (cell_data, in_col);
-	if (!description) {
-		gchar buffer[128];
-
-		switch (in_col) {
-		case 0:
-			g_snprintf(buffer,128,"Monday");
-			break;
-		case 1:
-			g_snprintf(buffer,128,"Tuesday");
-			break;
-		case 2:
-			g_snprintf(buffer,128,"Wednesday");
-			break;
-		case 3:
-			g_snprintf(buffer,128,"Thursday");
-			break;
-		case 4:
-			g_snprintf(buffer,128,"Friday");
-			break;
-		case 5:
-			g_snprintf(buffer,128,"Saturday");
-			break;
-		case 6:
-			g_snprintf(buffer,128,"Sunday");
-			break;
-		default:
-			break;
-		}
-			
-		ea_cell_table_set_column_label (cell_data, in_col, buffer);
-		description = ea_cell_table_get_column_label (cell_data, in_col);
-	}
-	return description;
-}
-
-static G_CONST_RETURN gchar*
-table_interface_get_row_description (AtkTable    *table,
-				     gint        row)
-{
-	AtkGObjectAccessible *atk_gobj;
-	GObject *g_obj;
-	EWeekViewMainItem *main_item;
-	EWeekView *week_view;
-	EaWeekViewMainItem* ea_main_item = EA_WEEK_VIEW_MAIN_ITEM (table);
-	const gchar *description;
-	EaCellTable *cell_data;
-
-	atk_gobj = ATK_GOBJECT_ACCESSIBLE (ea_main_item);
-	g_obj = atk_gobject_accessible_get_object (atk_gobj);
-	if (!g_obj)
-		return NULL;
-
-	main_item = E_WEEK_VIEW_MAIN_ITEM (g_obj);
-	week_view = main_item->week_view;
-
-	if (row < 0 || row >= week_view->weeks_shown)
-		return NULL;
-	cell_data = ea_week_view_main_item_get_cell_data (ea_main_item);
-	if (!cell_data)
-		return NULL;
-
-	description = ea_cell_table_get_row_label (cell_data, row);
-	if (!description) {
-		gchar buffer[128];
-		ea_week_view_main_item_get_row_label (ea_main_item, row, buffer, sizeof (buffer));
-		ea_cell_table_set_row_label (cell_data, row, buffer);
-		description = ea_cell_table_get_row_label (cell_data,
-								row);
-	}
-	return description;
-}
-
-static AtkObject*
-table_interface_get_summary (AtkTable	*table)
-{
-	/* FIXME: NOT IMPLEMENTED */
-	return NULL;
-}
-
-/* atkselection interface */
-
-static void
-atk_selection_interface_init (AtkSelectionIface *iface)
-{
-	g_return_if_fail (iface != NULL);
-
-	iface->add_selection = selection_interface_add_selection;
-	iface->clear_selection = selection_interface_clear_selection;
-	iface->ref_selection = selection_interface_ref_selection;
-	iface->get_selection_count = selection_interface_get_selection_count;
-	iface->is_child_selected = selection_interface_is_child_selected;
-}
-
-static gboolean
-selection_interface_add_selection (AtkSelection *selection, gint i)
-{
-	AtkGObjectAccessible *atk_gobj;
-	GObject *g_obj;
-	EWeekViewMainItem *main_item;
-	EWeekView *week_view;
-	EaWeekViewMainItem* ea_main_item = EA_WEEK_VIEW_MAIN_ITEM (selection);
-
-	atk_gobj = ATK_GOBJECT_ACCESSIBLE (ea_main_item);
-	g_obj = atk_gobject_accessible_get_object (atk_gobj);
-	if (!g_obj)
-		return FALSE;
-
-	main_item = E_WEEK_VIEW_MAIN_ITEM (g_obj);
-	week_view = main_item->week_view;
-
-	if (i < 0 || i > week_view->weeks_shown * 7 -1)
-		return FALSE;
-
-	/*FIXME: multi-selection is needed */
-	week_view->selection_start_day = i;
-	week_view->selection_end_day = i;
-
-	gtk_widget_queue_draw (week_view->main_canvas);
-	return TRUE;
-}
-
-static gboolean
-selection_interface_clear_selection (AtkSelection *selection)
-{
-	AtkGObjectAccessible *atk_gobj;
-	GObject *g_obj;
-	EWeekViewMainItem *main_item;
-	EWeekView *week_view;
-	EaWeekViewMainItem* ea_main_item = EA_WEEK_VIEW_MAIN_ITEM (selection);
-
-	atk_gobj = ATK_GOBJECT_ACCESSIBLE (ea_main_item);
-	g_obj = atk_gobject_accessible_get_object (atk_gobj);
-	if (!g_obj)
-		return -1;
-
-	main_item = E_WEEK_VIEW_MAIN_ITEM (g_obj);
-	week_view = main_item->week_view;
-
-	week_view->selection_start_day = -1;
-	week_view->selection_end_day = -1;
-
-	gtk_widget_queue_draw (week_view->main_canvas);
-
-	return TRUE;
-}
-
-static AtkObject*  
-selection_interface_ref_selection (AtkSelection *selection, gint i)
-{
-	gint count;
-	GObject *g_obj;
-	EWeekView *week_view;
-	EaWeekViewMainItem* ea_main_item = EA_WEEK_VIEW_MAIN_ITEM (selection);
-	gint start_index;
-
-	count = selection_interface_get_selection_count (selection);
-	if (i < 0 || i >=count)
-		return NULL;
-
-	g_obj = atk_gobject_accessible_get_object (ATK_GOBJECT_ACCESSIBLE (ea_main_item));
-	week_view = E_WEEK_VIEW_MAIN_ITEM (g_obj)->week_view;
-	start_index = ea_week_view_main_item_get_child_index_at (ea_main_item,
-								week_view->selection_start_day / 7,
-								week_view->selection_start_day % 7);
-
-	return ea_week_view_main_item_ref_child (ATK_OBJECT (selection), start_index + i);
-}
-
-static gint
-selection_interface_get_selection_count (AtkSelection *selection)
-{
-	AtkGObjectAccessible *atk_gobj;
-	GObject *g_obj;
-	EWeekViewMainItem *main_item;
-	EWeekView *week_view;
-	EaWeekViewMainItem* ea_main_item = EA_WEEK_VIEW_MAIN_ITEM (selection);
-
-	atk_gobj = ATK_GOBJECT_ACCESSIBLE (ea_main_item);
-	g_obj = atk_gobject_accessible_get_object (atk_gobj);
-	if (!g_obj)
-		return 0;
-
-	main_item = E_WEEK_VIEW_MAIN_ITEM (g_obj);
-	week_view = main_item->week_view;
-
-	if (week_view->selection_start_day == -1 ||
-	    week_view->selection_end_day == -1)
-		return 0;
-
-	return week_view->selection_end_day - week_view->selection_start_day + 1;
-}
-
-static gboolean
-selection_interface_is_child_selected (AtkSelection *selection, gint i)
-{
-	AtkGObjectAccessible *atk_gobj;
-	GObject *g_obj;
-	EWeekViewMainItem *main_item;
-	EWeekView *week_view;
-	EaWeekViewMainItem* ea_main_item = EA_WEEK_VIEW_MAIN_ITEM (selection);
-
-	atk_gobj = ATK_GOBJECT_ACCESSIBLE (ea_main_item);
-	g_obj = atk_gobject_accessible_get_object (atk_gobj);
-	if (!g_obj)
-		return FALSE;
-
-	main_item = E_WEEK_VIEW_MAIN_ITEM (g_obj);
-	week_view = main_item->week_view;
-
-	if ((week_view->selection_start_day <= i)&&(week_view->selection_end_day >= i))
-		return TRUE;
-	else 
-		return FALSE;
-}
-
diff --git a/a11y/calendar/ea-week-view-main-item.h b/a11y/calendar/ea-week-view-main-item.h
deleted file mode 100644
index fcf8b45fc8..0000000000
--- a/a11y/calendar/ea-week-view-main-item.h
+++ /dev/null
@@ -1,65 +0,0 @@
-/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-/* vim:expandtab:shiftwidth=8:tabstop=8:
- */
-/* Evolution Accessibility: ea-week-view-main-item.h
- *
- * Copyright (C) 2003 Ximian, Inc.
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of version 2 of the GNU General Public
- * License as published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * General Public License for more details.
- *
- * You should have received a copy of the GNU General Public
- * License along with this program; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
- *
- * Author: Bolian Yin <bolian.yin@sun.com> Sun Microsystem Inc., 2003
- * Author: Yang Wu <Yang.Wu@sun.com> Sun Microsystem Inc., 2003
- *
- */
-
-#ifndef __EA_WEEK_VIEW_MAIN_ITEM_H__
-#define __EA_WEEK_VIEW_MAIN_ITEM_H__
-
-#include <atk/atkgobjectaccessible.h>
-#include "e-week-view-main-item.h"
-
-#ifdef __cplusplus
-extern "C" {
-#endif /* __cplusplus */
-
-#define EA_TYPE_WEEK_VIEW_MAIN_ITEM                     (ea_week_view_main_item_get_type ())
-#define EA_WEEK_VIEW_MAIN_ITEM(obj)                     (G_TYPE_CHECK_INSTANCE_CAST ((obj), EA_TYPE_WEEK_VIEW_MAIN_ITEM, EaWeekViewMainItem))
-#define EA_WEEK_VIEW_MAIN_ITEM_CLASS(klass)             (G_TYPE_CHECK_CLASS_CAST ((klass), EA_TYPE_WEEK_VIEW_MAIN_ITEM, EaWeekViewMainItemClass))
-#define EA_IS_WEEK_VIEW_MAIN_ITEM(obj)                  (G_TYPE_CHECK_INSTANCE_TYPE ((obj), EA_TYPE_WEEK_VIEW_MAIN_ITEM))
-#define EA_IS_WEEK_VIEW_MAIN_ITEM_CLASS(klass)          (G_TYPE_CHECK_CLASS_TYPE ((klass), EA_TYPE_WEEK_VIEW_MAIN_ITEM))
-#define EA_WEEK_VIEW_MAIN_ITEM_GET_CLASS(obj)           (G_TYPE_INSTANCE_GET_CLASS ((obj), EA_TYPE_WEEK_VIEW_MAIN_ITEM, EaWeekViewMainItemClass))
-
-typedef struct _EaWeekViewMainItem                   EaWeekViewMainItem;
-typedef struct _EaWeekViewMainItemClass              EaWeekViewMainItemClass;
-
-struct _EaWeekViewMainItem
-{
-	AtkGObjectAccessible parent;
-};
-
-GType ea_week_view_main_item_get_type (void);
-
-struct _EaWeekViewMainItemClass
-{
-	AtkGObjectAccessibleClass parent_class;
-};
-
-AtkObject*     ea_week_view_main_item_new         (GObject *obj);
-
-#ifdef __cplusplus
-}
-#endif /* __cplusplus */
-
-#endif /* __EA_WEEK_VIEW_MAIN_ITEM_H__ */
diff --git a/a11y/calendar/ea-week-view.c b/a11y/calendar/ea-week-view.c
deleted file mode 100644
index 3b36ac246d..0000000000
--- a/a11y/calendar/ea-week-view.c
+++ /dev/null
@@ -1,322 +0,0 @@
-/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-/* vim:expandtab:shiftwidth=8:tabstop=8:
- */
-/* Evolution Accessibility: ea-week-view.c
- *
- * Copyright (C) 2003 Ximian, Inc.
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of version 2 of the GNU General Public
- * License as published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * General Public License for more details.
- *
- * You should have received a copy of the GNU General Public
- * License along with this program; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
- *
- * Author: Bolian Yin <bolian.yin@sun.com> Sun Microsystem Inc., 2003
- *
- */
-
-#include "ea-week-view.h"
-#include "ea-cal-view.h"
-#include "ea-cal-view-event.h"
-#include "ea-calendar-helpers.h"
-#include "ea-gnome-calendar.h"
-#include "calendar-commands.h"
-#include <gal/e-text/e-text.h>
-#include <libgnome/gnome-i18n.h>
-
-static void ea_week_view_class_init (EaWeekViewClass *klass);
-
-static G_CONST_RETURN gchar* ea_week_view_get_name (AtkObject *accessible);
-static G_CONST_RETURN gchar* ea_week_view_get_description (AtkObject *accessible);
-static gint         ea_week_view_get_n_children      (AtkObject *obj);
-static AtkObject*   ea_week_view_ref_child           (AtkObject *obj,
-						      gint i);
-
-static gpointer parent_class = NULL;
-
-GType
-ea_week_view_get_type (void)
-{
-	static GType type = 0;
-	AtkObjectFactory *factory;
-	GTypeQuery query;
-	GType derived_atk_type;
-
-	if (!type) {
-		static GTypeInfo tinfo = {
-			sizeof (EaWeekViewClass),
-			(GBaseInitFunc) NULL, /* base init */
-			(GBaseFinalizeFunc) NULL, /* base finalize */
-			(GClassInitFunc) ea_week_view_class_init, /* class init */
-			(GClassFinalizeFunc) NULL, /* class finalize */
-			NULL, /* class data */
-			sizeof (EaWeekView), /* instance size */
-			0, /* nb preallocs */
-			(GInstanceInitFunc) NULL, /* instance init */
-			NULL /* value table */
-		};
-
-		/*
-		 * Figure out the size of the class and instance
-		 * we are run-time deriving from (EaCalView, in this case)
-		 *
-		 * Note: we must still use run-time deriving here, because
-		 * our parent class EaCalView is run-time deriving.
-		 */
-
-		factory = atk_registry_get_factory (atk_get_default_registry (),
-						    e_calendar_view_get_type());
-		derived_atk_type = atk_object_factory_get_accessible_type (factory);
-		g_type_query (derived_atk_type, &query);
-
-		tinfo.class_size = query.class_size;
-		tinfo.instance_size = query.instance_size;
-
-		type = g_type_register_static (derived_atk_type,
-					       "EaWeekView", &tinfo, 0);
-
-	}
-
-	return type;
-}
-
-static void
-ea_week_view_class_init (EaWeekViewClass *klass)
-{
-	AtkObjectClass *class = ATK_OBJECT_CLASS (klass);
-
-	parent_class = g_type_class_peek_parent (klass);
-
-	class->get_name = ea_week_view_get_name;
-	class->get_description = ea_week_view_get_description;
-
-	class->get_n_children = ea_week_view_get_n_children;
-	class->ref_child = ea_week_view_ref_child;
-}
-
-AtkObject* 
-ea_week_view_new (GtkWidget *widget)
-{
-	GObject *object;
-	AtkObject *accessible;
-
-	g_return_val_if_fail (GTK_IS_WIDGET (widget), NULL);
-
-	object = g_object_new (EA_TYPE_WEEK_VIEW, NULL);
-
-	accessible = ATK_OBJECT (object);
-	atk_object_initialize (accessible, widget);
-
-#ifdef ACC_DEBUG
-	printf ("EvoAcc: ea_week_view created %p\n", (void *)accessible);
-#endif
-
-	return accessible;
-}
-
-static G_CONST_RETURN gchar*
-ea_week_view_get_name (AtkObject *accessible)
-{
-	EWeekView *week_view;
-	GnomeCalendar *gcal;
-	const gchar *label_text;
-	GnomeCalendarViewType view_type;
-	gint n_events;
-	gchar *event_str, *name_str;
-
-	g_return_val_if_fail (EA_IS_WEEK_VIEW (accessible), NULL);
-
-	if (!GTK_ACCESSIBLE (accessible)->widget)
-		return NULL;
-
-	week_view = E_WEEK_VIEW (GTK_ACCESSIBLE (accessible)->widget);
-	gcal = e_calendar_view_get_calendar (E_CALENDAR_VIEW (week_view));
-	label_text = ea_gnome_calendar_get_label_description (gcal);
-
-	n_events = atk_object_get_n_accessible_children (accessible);
-	/* the child main item is always there */
-	--n_events;
-	if (n_events >= 1)
-		event_str = g_strdup_printf (ngettext ("It has %d event.", "It has %d events.", n_events), n_events);
-	else
-		event_str = g_strdup (_("It has no events."));
-
-	view_type = gnome_calendar_get_view (gcal);
-
-	if (view_type == GNOME_CAL_MONTH_VIEW)
-		name_str = g_strdup_printf (_("Month View: %s. %s"),
-						label_text, event_str);
-
-	else
-		name_str = g_strdup_printf (_("Week View: %s. %s"),
-						label_text, event_str);
-
-	ATK_OBJECT_CLASS (parent_class)->set_name (accessible, name_str);
-	g_free (name_str);
-	g_free (event_str);
-
-	return accessible->name;
-}
-
-static G_CONST_RETURN gchar*
-ea_week_view_get_description (AtkObject *accessible)
-{
-	EWeekView *week_view;
-
-	g_return_val_if_fail (EA_IS_WEEK_VIEW (accessible), NULL);
-
-	if (!GTK_ACCESSIBLE (accessible)->widget)
-		return NULL;
-	week_view = E_WEEK_VIEW (GTK_ACCESSIBLE (accessible)->widget);
-
-	if (accessible->description)
-		return accessible->description;
-	else {
-		GnomeCalendar *gcal;
-		GnomeCalendarViewType view_type;
-
-		gcal = e_calendar_view_get_calendar (E_CALENDAR_VIEW (week_view));
-		view_type = gnome_calendar_get_view (gcal);
-
-		if (view_type == GNOME_CAL_MONTH_VIEW)
-			return _("calendar view for a month");
-		else
-			return _("calendar view for one or more weeks");
-	}
-}
-
-static gint
-ea_week_view_get_n_children (AtkObject *accessible)
-{
-	EWeekView *week_view;
-	gint i, count = 0;
-	gint event_index;
-
-	g_return_val_if_fail (EA_IS_WEEK_VIEW (accessible), -1);
-
-	if (!GTK_ACCESSIBLE (accessible)->widget)
-		return -1;
-	week_view = E_WEEK_VIEW (GTK_ACCESSIBLE (accessible)->widget);
-
-	for (event_index = 0; event_index < week_view->events->len;
-	     ++event_index) {
-		EWeekViewEvent *event;
-		EWeekViewEventSpan *span;
-
-                /* If week_view->spans == NULL, there is no visible events. */
-                if (!week_view->spans)
-                        break;
-
-		event = &g_array_index (week_view->events,
-					EWeekViewEvent, event_index);
-		if (!event)
-			continue;
-		span = &g_array_index (week_view->spans, EWeekViewEventSpan,
-				       event->spans_index + 0);
-
-		if (!span)
-			continue;
-
-		/* at least one of the event spans is visible, count it */
-		if (span->text_item)
-			++count;
-	}
-
-	/* add the number of visible jump buttons */
-	for (i = 0; i < E_WEEK_VIEW_MAX_WEEKS * 7; i++) {
-		if (week_view->jump_buttons[i]->object.flags & GNOME_CANVAS_ITEM_VISIBLE)
-			++count;
-	}
-
-	/* "+1" for the main item */
-	count++;
-
-#ifdef ACC_DEBUG
-	printf("AccDebug: week view %p has %d children\n", (void *)week_view, count);
-#endif
-	return count;
-}
-
-static AtkObject *
-ea_week_view_ref_child (AtkObject *accessible, gint index)
-{
-	EWeekView *week_view;
-	gint child_num, max_count;
-	AtkObject *atk_object = NULL;
-	gint event_index;
-	gint jump_button = -1;
-	gint span_num = 0;
-	gint count = 0;
-
-	g_return_val_if_fail (EA_IS_WEEK_VIEW (accessible), NULL);
-
-	child_num = atk_object_get_n_accessible_children (accessible);
- 	if (child_num <= 0 || index < 0 || index >= child_num)
-		return NULL;
-
-	if (!GTK_ACCESSIBLE (accessible)->widget)
-		return NULL;
-	week_view = E_WEEK_VIEW (GTK_ACCESSIBLE (accessible)->widget);
-	max_count = week_view->events->len;
-
-	if (index == 0) {
-		/* index == 0 is the main item */
-		atk_object = atk_gobject_accessible_for_object (G_OBJECT (week_view->main_canvas_item));
-		g_object_ref (atk_object);
- 	} else 
-	for (event_index = 0; event_index < max_count; ++event_index) {
-		EWeekViewEvent *event;
-		EWeekViewEventSpan *span;
-		gint current_day;
-
-		event = &g_array_index (week_view->events,
-					EWeekViewEvent, event_index);
-		if (!event)
-			continue;
-
-		span = &g_array_index (week_view->spans, EWeekViewEventSpan,
-				       event->spans_index + span_num);
-
-		if (!span)
-			continue;
-
-		current_day = span->start_day;
-		if (span->text_item)
-			++count;
-		else if  (current_day != jump_button) {
-			/* we should go to the jump button */
-			jump_button = current_day;
-			++count;
-		}
-		else
-			continue;
-
-			if (count == index) {
-			if (span->text_item) {
-				/* Not use atk_gobject_accessible_for_object for event
-				 * text_item we need to do special thing here
-				 */
-				atk_object = ea_calendar_helpers_get_accessible_for (span->text_item);
-			}
-			else {
-					atk_object = ea_calendar_helpers_get_accessible_for (week_view->jump_buttons[current_day == -1 ? 0 : current_day]);
-			}
-			g_object_ref (atk_object);
-			break;
-		}
-	}
-
-#ifdef ACC_DEBUG
-	printf ("EvoAcc: ea_week_view_ref_child [%d]=%p\n",
-		index, (void *)atk_object);
-#endif
-	return atk_object;
-}
diff --git a/a11y/calendar/ea-week-view.h b/a11y/calendar/ea-week-view.h
deleted file mode 100644
index f0ed117375..0000000000
--- a/a11y/calendar/ea-week-view.h
+++ /dev/null
@@ -1,65 +0,0 @@
-/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-/* vim:expandtab:shiftwidth=8:tabstop=8:
- */
-/* Evolution Accessibility: ea-week-view.h
- *
- * Copyright (C) 2003 Ximian, Inc.
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of version 2 of the GNU General Public
- * License as published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * General Public License for more details.
- *
- * You should have received a copy of the GNU General Public
- * License along with this program; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
- *
- * Author: Bolian Yin <bolian.yin@sun.com> Sun Microsystem Inc., 2003
- *
- */
-
-#ifndef __EA_WEEK_VIEW_H__
-#define __EA_WEEK_VIEW_H__
-
-#include <gtk/gtkaccessible.h>
-#include "e-week-view.h"
-
-#ifdef __cplusplus
-extern "C" {
-#endif /* __cplusplus */
-
-#define EA_TYPE_WEEK_VIEW                     (ea_week_view_get_type ())
-#define EA_WEEK_VIEW(obj)                     (G_TYPE_CHECK_INSTANCE_CAST ((obj), EA_TYPE_WEEK_VIEW, EaWeekView))
-#define EA_WEEK_VIEW_CLASS(klass)             (G_TYPE_CHECK_CLASS_CAST ((klass), EA_TYPE_WEEK_VIEW, EaWeekViewClass))
-#define EA_IS_WEEK_VIEW(obj)                  (G_TYPE_CHECK_INSTANCE_TYPE ((obj), EA_TYPE_WEEK_VIEW))
-#define EA_IS_WEEK_VIEW_CLASS(klass)          (G_TYPE_CHECK_CLASS_TYPE ((klass), EA_TYPE_WEEK_VIEW))
-#define EA_WEEK_VIEW_GET_CLASS(obj)           (G_TYPE_INSTANCE_GET_CLASS ((obj), EA_TYPE_WEEK_VIEW, EaWeekViewClass))
-
-typedef struct _EaWeekView                   EaWeekView;
-typedef struct _EaWeekViewClass              EaWeekViewClass;
-
-struct _EaWeekView
-{
-	GtkAccessible parent;
-};
-
-GType ea_week_view_get_type (void);
-
-struct _EaWeekViewClass
-{
-	GtkAccessibleClass parent_class;
-};
-
-AtkObject*     ea_week_view_new         (GtkWidget       *widget);
-
-#ifdef __cplusplus
-}
-#endif /* __cplusplus */
-
-
-#endif /* __EA_WEEK_VIEW_H__ */
diff --git a/a11y/ea-cell-table.c b/a11y/ea-cell-table.c
deleted file mode 100644
index c87a63023e..0000000000
--- a/a11y/ea-cell-table.c
+++ /dev/null
@@ -1,205 +0,0 @@
-/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-/* vim:expandtab:shiftwidth=8:tabstop=8:
- */
-/* Evolution Accessibility: ea-cell-table.c
- *
- * Copyright (C) 2003 Ximian, Inc.
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of version 2 of the GNU General Public
- * License as published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * General Public License for more details.
- *
- * You should have received a copy of the GNU General Public
- * License along with this program; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
- *
- * Author: Bolian Yin <bolian.yin@sun.com> Sun Microsystem Inc., 2003
- *
- */
-
-#include "ea-cell-table.h"
-
-EaCellTable *
-ea_cell_table_create (gint rows, gint columns, gboolean column_first)
-{
-	EaCellTable * cell_data;
-	gint index;
-
-	g_return_val_if_fail (((columns > 0) && (rows > 0)), NULL);
-
-	cell_data = g_new0 (EaCellTable, 1);
-
-	cell_data->column_first = column_first;
-	cell_data->columns = columns;
-	cell_data->rows = rows;
-
-	cell_data->column_labels = g_new0 (gchar*, columns);
-	for (index = columns -1; index >= 0; --index)
-		cell_data->column_labels [index] = NULL;
-
-	cell_data->row_labels = g_new0 (gchar*, rows);
-	for (index = rows -1; index >= 0; --index)
-		cell_data->row_labels [index] = NULL;
-
-	cell_data->cells = g_new0(gpointer, (columns * rows));
-	for (index = (columns * rows) -1; index >= 0; --index)
-		cell_data->cells [index] = NULL;
-	return cell_data;
-}
-
-void
-ea_cell_table_destroy (EaCellTable * cell_data)
-{
-	gint index;
-	g_return_if_fail (cell_data);
-
-	for (index = 0; index < cell_data->columns; ++index)
-		if (cell_data->column_labels [index])
-			g_free (cell_data->column_labels [index]);
-	g_free (cell_data->column_labels);
-
-	for (index = 0; index < cell_data->rows; ++index)
-		if (cell_data->row_labels [index])
-			g_free (cell_data->row_labels [index]);
-	g_free (cell_data->row_labels);
-
-	for (index = (cell_data->columns * cell_data->rows) -1;
-	     index >= 0; --index)
-		if (cell_data->cells[index] &&
-		    G_IS_OBJECT (cell_data->cells[index]))
-			g_object_unref (cell_data->cells[index]);
-
-	g_free (cell_data->cells);
-}
-
-gpointer
-ea_cell_table_get_cell (EaCellTable * cell_data,
-			gint row, gint column)
-{
-	gint index;
-
-	g_return_val_if_fail (cell_data, NULL);
-
-	index = ea_cell_table_get_index (cell_data, column, row);
-	if (index == -1)
-		return NULL;
-
-	return cell_data->cells[index];
-}
-
-gboolean
-ea_cell_table_set_cell (EaCellTable * cell_data,
-			gint row, gint column, gpointer cell)
-{
-	gint index;
-
-	g_return_val_if_fail (cell_data, FALSE);
-
-	index = ea_cell_table_get_index (cell_data, column, row);
-	if (index == -1)
-		return FALSE;
-
-	if (cell && G_IS_OBJECT(cell))
-		g_object_ref (cell);
-	if (cell_data->cells[index] &&
-	    G_IS_OBJECT (cell_data->cells[index]))
-		g_object_unref (cell_data->cells[index]);
-	cell_data->cells[index] = cell;
-
-	return TRUE;
-}
-
-gpointer
-ea_cell_table_get_cell_at_index (EaCellTable * cell_data,
-				 gint index)
-{
-	g_return_val_if_fail (cell_data, NULL);
-
-	if (index >=0 && index < (cell_data->columns * cell_data->rows))
-		return cell_data->cells [index];
-	return NULL;
-}
-
-gboolean
-ea_cell_table_set_cell_at_index (EaCellTable * cell_data,
-				 gint index, gpointer cell)
-{
-	g_return_val_if_fail (cell_data, FALSE);
-
-	if (index < 0 || index >=cell_data->columns * cell_data->rows)
-		return FALSE;
-
-	if (cell && G_IS_OBJECT(cell))
-		g_object_ref (cell);
-	if (cell_data->cells[index] &&
-	    G_IS_OBJECT (cell_data->cells[index]))
-		g_object_unref (cell_data->cells[index]);
-	cell_data->cells[index] = cell;
-
-	return TRUE;
-}
-
-G_CONST_RETURN gchar*
-ea_cell_table_get_column_label (EaCellTable * cell_data,
-				gint column)
-{
-	g_return_val_if_fail (cell_data, NULL);
-	g_return_val_if_fail ((column >= 0 && column < cell_data->columns), NULL);
-
-	return cell_data->column_labels[column];
-}
-
-void
-ea_cell_table_set_column_label (EaCellTable * cell_data,
-				gint column, const gchar *label)
-{
-	g_return_if_fail (cell_data);
-	g_return_if_fail ((column >= 0 && column < cell_data->columns));
-
-	if (cell_data->column_labels[column])
-		g_free (cell_data->column_labels[column]);
-	cell_data->column_labels[column] = g_strdup(label);
-}
-
-G_CONST_RETURN gchar*
-ea_cell_table_get_row_label (EaCellTable * cell_data,
-			     gint row)
-{
-	g_return_val_if_fail (cell_data, NULL);
-	g_return_val_if_fail ((row >= 0 && row < cell_data->rows), NULL);
-
-	return cell_data->row_labels[row];
-}
-
-void
-ea_cell_table_set_row_label (EaCellTable * cell_data,
-			     gint row, const gchar *label)
-{
-	g_return_if_fail (cell_data);
-	g_return_if_fail ((row >= 0 && row < cell_data->rows));
-
-	if (cell_data->row_labels[row])
-		g_free (cell_data->row_labels[row]);
-	cell_data->row_labels[row] = g_strdup(label);
-}
-
-gint
-ea_cell_table_get_index (EaCellTable *cell_data,
-			 gint row, gint column)
-{
-	g_return_val_if_fail (cell_data, -1);
-	if (row < 0 || row >= cell_data->rows ||
-	    column < 0 || column >= cell_data->columns)
-		return -1;
-
-	if (cell_data->column_first)
-		return column * cell_data->rows + row;
-	else
-		return row * cell_data->columns + column;
-}
diff --git a/a11y/ea-cell-table.h b/a11y/ea-cell-table.h
deleted file mode 100644
index 932fe8b4fd..0000000000
--- a/a11y/ea-cell-table.h
+++ /dev/null
@@ -1,63 +0,0 @@
-/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-/* vim:expandtab:shiftwidth=8:tabstop=8:
- */
-/* Evolution Accessibility: ea-table-cell.c
- *
- * Copyright (C) 2003 Ximian, Inc.
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of version 2 of the GNU General Public
- * License as published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * General Public License for more details.
- *
- * You should have received a copy of the GNU General Public
- * License along with this program; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
- *
- * Author: Bolian Yin <bolian.yin@sun.com> Sun Microsystem Inc., 2003
- *
- */
-
-/* EaCellTable */
-
-#include <glib.h>
-#include <glib-object.h>
-
-struct _EaCellTable {
-	gint columns;
-	gint rows;
-	gboolean column_first;     /* index order */
-	gchar **column_labels;
-	gchar **row_labels;
-	gpointer *cells;
-};
-
-typedef struct _EaCellTable EaCellTable;
-
-EaCellTable * ea_cell_table_create (gint rows, gint columns,
-				    gboolean column_first);
-void ea_cell_table_destroy (EaCellTable * cell_data);
-gpointer ea_cell_table_get_cell (EaCellTable * cell_data,
-				   gint row, gint column);
-gboolean ea_cell_table_set_cell (EaCellTable * cell_data,
-				 gint row, gint column, gpointer cell);
-gpointer ea_cell_table_get_cell_at_index (EaCellTable * cell_data,
-					  gint index);
-gboolean ea_cell_table_set_cell_at_index (EaCellTable * cell_data,
-					  gint index, gpointer cell);
-
-G_CONST_RETURN gchar*
-ea_cell_table_get_column_label (EaCellTable * cell_data, gint column);
-void ea_cell_table_set_column_label (EaCellTable * cell_data,
-				     gint column, const gchar *label);
-G_CONST_RETURN gchar*
-ea_cell_table_get_row_label (EaCellTable * cell_data, gint row);
-void ea_cell_table_set_row_label (EaCellTable * cell_data,
-				  gint row, const gchar *label);
-gint ea_cell_table_get_index (EaCellTable *cell_data,
-			      gint row, gint column);
diff --git a/a11y/ea-factory.h b/a11y/ea-factory.h
deleted file mode 100644
index 06ae612d6f..0000000000
--- a/a11y/ea-factory.h
+++ /dev/null
@@ -1,113 +0,0 @@
-/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-/* vim:expandtab:shiftwidth=8:tabstop=8:
- */
-/* Evolution Accessibility: ea-factory.h
- *
- * Copyright (C) 2003 Ximian, Inc.
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of version 2 of the GNU General Public
- * License as published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * General Public License for more details.
- *
- * You should have received a copy of the GNU General Public
- * License along with this program; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
- *
- * Author: Bolian Yin <bolian.yin@sun.com> Sun Microsystem Inc., 2003
- *
- */
-
-/* Evolution Accessibility
-*/
-
-#ifndef _EA_FACTORY_H__
-#define _EA_FACTORY_H__
-
-#include <glib-object.h>
-#include <atk/atkobject.h>
-
-#define EA_FACTORY_PARTA_GOBJECT(type, type_as_function, opt_create_accessible)	\
-static AtkObject*								\
-type_as_function ## _factory_create_accessible (GObject *obj)			\
-{                                                                               \
-  AtkObject *accessible;							\
-  g_return_val_if_fail (G_IS_OBJECT (obj), NULL);				\
-  accessible = opt_create_accessible (G_OBJECT (obj));	                 	\
-  return accessible;	                                                        \
-}
-
-#define EA_FACTORY_PARTA(type, type_as_function, opt_create_accessible)	        \
-static AtkObject*								\
-type_as_function ## _factory_create_accessible (GObject *obj)			\
-{                                                                               \
-  GtkWidget *widget;								\
-  AtkObject *accessible;							\
-                                                                                \
-  g_return_val_if_fail (GTK_IS_WIDGET (obj), NULL);				\
-										\
-  widget = GTK_WIDGET (obj);							\
-										\
-  accessible = opt_create_accessible (widget);					\
-  return accessible;	                                                        \
-}
-
-#define EA_FACTORY_PARTB(type, type_as_function, opt_create_accessible)	        \
-										\
-static GType									\
-type_as_function ## _factory_get_accessible_type (void)				\
-{										\
-  return type;									\
-}										\
-										\
-										\
-static void									\
-type_as_function ## _factory_class_init (AtkObjectFactoryClass *klass)		\
-{										\
-  klass->create_accessible   = type_as_function ## _factory_create_accessible;	\
-  klass->get_accessible_type = type_as_function ## _factory_get_accessible_type;\
-}										\
-										\
-static GType									\
-type_as_function ## _factory_get_type (void)					\
-{										\
-  static GType t = 0;								\
-										\
-  if (!t)									\
-  {										\
-    char *name;									\
-    static const GTypeInfo tinfo =						\
-    {										\
-      sizeof (AtkObjectFactoryClass),				         	\
-      NULL, NULL, (GClassInitFunc) type_as_function ## _factory_class_init,	\
-      NULL, NULL, sizeof (AtkObjectFactory), 0, NULL, NULL			\
-    };										\
-										\
-    name = g_strconcat (g_type_name (type), "Factory", NULL);			\
-    t = g_type_register_static (						\
-	    ATK_TYPE_OBJECT_FACTORY, name, &tinfo, 0);				\
-    g_free (name);								\
-  }										\
-										\
-  return t;									\
-}
-
-#define EA_FACTORY(type, type_as_function, opt_create_accessible)	        \
-        EA_FACTORY_PARTA(type, type_as_function, opt_create_accessible)	        \
-        EA_FACTORY_PARTB(type, type_as_function, opt_create_accessible)
-
-#define EA_FACTORY_GOBJECT(type, type_as_function, opt_create_accessible)	\
-        EA_FACTORY_PARTA_GOBJECT(type, type_as_function, opt_create_accessible)	\
-        EA_FACTORY_PARTB(type, type_as_function, opt_create_accessible)
-
-#define EA_SET_FACTORY(obj_type, type_as_function)		         	\
-	atk_registry_set_factory_type (atk_get_default_registry (),		\
-				       obj_type,				\
-				       type_as_function ## _factory_get_type ())
-
-#endif /* _EA_FACTORY_H__ */
diff --git a/a11y/widgets/.cvsignore b/a11y/widgets/.cvsignore
deleted file mode 100644
index 282522db03..0000000000
--- a/a11y/widgets/.cvsignore
+++ /dev/null
@@ -1,2 +0,0 @@
-Makefile
-Makefile.in
diff --git a/a11y/widgets/Makefile.am b/a11y/widgets/Makefile.am
deleted file mode 100644
index 6e8e0e4a1d..0000000000
--- a/a11y/widgets/Makefile.am
+++ /dev/null
@@ -1,33 +0,0 @@
-
-# for debug
-#A11Y_CFLAGS += -pedantic -ansi -DACC_DEBUG -Werror
-
-privlib_LTLIBRARIES = libevolution-widgets-a11y.la
-
-INCLUDES =						\
-	-DG_LOG_DOMAIN=\"evolution-a11y\"		\
-	-I$(top_srcdir)/widgets				\
-	-I$(top_srcdir)/a11y				\
-	-DEVOLUTION_DATADIR=\""$(datadir)"\"		\
-	-DEVOLUTION_GLADEDIR=\""$(gladedir)"\"		\
-	-DEVOLUTION_ETSPECDIR=\""$(etspecdir)"\"	\
-	-DEVOLUTION_IMAGESDIR=\""$(imagesdir)"\"	\
-	-DEVOLUTION_GALVIEWSDIR=\""$(viewsdir)"\"	\
-	-DEVOLUTION_UIDIR=\""$(evolutionuidir)"\"	\
-	-DPREFIX=\""$(prefix)"\"			\
-	$(A11Y_CFLAGS)					\
-	$(EVOLUTION_CALENDAR_CFLAGS)
-
-libevolution_widgets_a11y_la_SOURCES =		\
-	ea-calendar-item.c			\
-	ea-calendar-item.h			\
-	ea-calendar-cell.c			\
-	ea-calendar-cell.h			\
-	ea-combo-button.c			\
-	ea-combo-button.h			\
-	ea-widgets.c				\
-	ea-widgets.h
-
-libevolution_widgets_a11y_la_LIBADD =   \
-        $(top_builddir)/a11y/libevolution-a11y.la
-                                                                                
diff --git a/a11y/widgets/ea-calendar-cell.c b/a11y/widgets/ea-calendar-cell.c
deleted file mode 100644
index 9601d0b259..0000000000
--- a/a11y/widgets/ea-calendar-cell.c
+++ /dev/null
@@ -1,387 +0,0 @@
-/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-/* vim:expandtab:shiftwidth=8:tabstop=8:
- */
-/* Evolution Accessibility: ea-calendar-cell.c
- *
- * Copyright (C) 2003 Ximian, Inc.
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of version 2 of the GNU General Public
- * License as published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * General Public License for more details.
- *
- * You should have received a copy of the GNU General Public
- * License along with this program; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
- *
- * Author: Bolian Yin <bolian.yin@sun.com> Sun Microsystem Inc., 2003
- *
- */
-
-#include <gtk/gtk.h>
-#include <gal/util/e-util.h>
-#include "ea-calendar-cell.h"
-#include "ea-calendar-item.h"
-#include "ea-factory.h"
-
-/* ECalendarCell */
-
-static void e_calendar_cell_class_init (ECalendarCellClass *class);
-
-EA_FACTORY_GOBJECT (EA_TYPE_CALENDAR_CELL, ea_calendar_cell, ea_calendar_cell_new)
-
-GType
-e_calendar_cell_get_type (void)
-{
-	static GType type = 0;
-
-	if (!type) {
-		static GTypeInfo tinfo = {
-			sizeof (ECalendarCellClass),
-			(GBaseInitFunc) NULL, /* base init */
-			(GBaseFinalizeFunc) NULL, /* base finalize */
-			(GClassInitFunc) e_calendar_cell_class_init, /* class init */
-			(GClassFinalizeFunc) NULL, /* class finalize */
-			NULL, /* class data */
-			sizeof (ECalendarCell), /* instance size */
-			0, /* nb preallocs */
-			(GInstanceInitFunc) NULL, /* instance init */
-			NULL /* value table */
-		};
-
-		type = g_type_register_static (G_TYPE_OBJECT,
-					       "ECalendarCell", &tinfo, 0);
-	}
-
-	return type;
-}
-
-static void
-e_calendar_cell_class_init (ECalendarCellClass *class)
-{
-    EA_SET_FACTORY (e_calendar_cell_get_type (), ea_calendar_cell);
-}
-
-ECalendarCell *
-e_calendar_cell_new (ECalendarItem *calitem, gint row, gint column)
-{
-	GObject *object;
-	ECalendarCell *cell;
-
-	g_return_val_if_fail (E_IS_CALENDAR_ITEM (calitem), NULL);
-
-	object = g_object_new (E_TYPE_CALENDAR_CELL, NULL);
-	cell = E_CALENDAR_CELL (object);
-	cell->calitem = calitem;
-	cell->row = row;
-	cell->column = column;
-
-#ifdef ACC_DEBUG
-	g_print ("EvoAcc: e_calendar_cell created %p\n", (void *)cell);
-#endif
-
-	return cell;
-}
-
-/* EaCalendarCell */
-
-static void ea_calendar_cell_class_init (EaCalendarCellClass *klass);
-static void ea_calendar_cell_init (EaCalendarCell *a11y);
-
-static G_CONST_RETURN gchar* ea_calendar_cell_get_name (AtkObject *accessible);
-static G_CONST_RETURN gchar* ea_calendar_cell_get_description (AtkObject *accessible);
-static AtkObject * ea_calendar_cell_get_parent (AtkObject *accessible);
-static gint ea_calendar_cell_get_index_in_parent (AtkObject *accessible);
-static AtkStateSet *ea_calendar_cell_ref_state_set (AtkObject *accessible);
-
-/* component interface */
-static void atk_component_interface_init (AtkComponentIface *iface);
-static void component_interface_get_extents (AtkComponent *component,
-					     gint *x, gint *y,
-					     gint *width, gint *height,
-					     AtkCoordType coord_type);
-static gboolean component_interface_grab_focus (AtkComponent *component);
-
-static gpointer parent_class = NULL;
-
-#ifdef ACC_DEBUG
-static gint n_ea_calendar_cell_created = 0, n_ea_calendar_cell_destroyed = 0;
-static void ea_calendar_cell_finalize (GObject *object);
-#endif
-
-GType
-ea_calendar_cell_get_type (void)
-{
-	static GType type = 0;
-
-	if (!type) {
-		static GTypeInfo tinfo = {
-			sizeof (EaCalendarCellClass),
-			(GBaseInitFunc) NULL, /* base init */
-			(GBaseFinalizeFunc) NULL, /* base finalize */
-			(GClassInitFunc) ea_calendar_cell_class_init, /* class init */
-			(GClassFinalizeFunc) NULL, /* class finalize */
-			NULL, /* class data */
-			sizeof (EaCalendarCell), /* instance size */
-			0, /* nb preallocs */
-			(GInstanceInitFunc) ea_calendar_cell_init, /* instance init */
-			NULL /* value table */
-		};
-
-		static const GInterfaceInfo atk_component_info = {
-			(GInterfaceInitFunc) atk_component_interface_init,
-			(GInterfaceFinalizeFunc) NULL,
-			NULL
-		};
-
-		type = g_type_register_static (ATK_TYPE_GOBJECT_ACCESSIBLE,
-					       "EaCalendarCell", &tinfo, 0);
-		g_type_add_interface_static (type, ATK_TYPE_COMPONENT,
-					     &atk_component_info);
-	}
-
-	return type;
-}
-
-static void
-ea_calendar_cell_class_init (EaCalendarCellClass *klass)
-{
-	AtkObjectClass *class = ATK_OBJECT_CLASS (klass);
-
-#ifdef ACC_DEBUG
-	GObjectClass *gobject_class = G_OBJECT_CLASS (klass);
-	gobject_class->finalize = ea_calendar_cell_finalize;
-#endif
-
-	parent_class = g_type_class_peek_parent (klass);
-
-	class->get_name = ea_calendar_cell_get_name;
-	class->get_description = ea_calendar_cell_get_description;
-
-	class->get_parent = ea_calendar_cell_get_parent;
-	class->get_index_in_parent = ea_calendar_cell_get_index_in_parent;
-	class->ref_state_set = ea_calendar_cell_ref_state_set;
-}
-
-static void
-ea_calendar_cell_init (EaCalendarCell *a11y)
-{
-	a11y->state_set = atk_state_set_new ();
-	atk_state_set_add_state (a11y->state_set, ATK_STATE_TRANSIENT);
-	atk_state_set_add_state (a11y->state_set, ATK_STATE_ENABLED);
-	atk_state_set_add_state (a11y->state_set, ATK_STATE_SENSITIVE);
-	atk_state_set_add_state (a11y->state_set, ATK_STATE_SELECTABLE);
-	atk_state_set_add_state (a11y->state_set, ATK_STATE_SHOWING);
-	atk_state_set_add_state (a11y->state_set, ATK_STATE_FOCUSABLE);
-}
-
-AtkObject* 
-ea_calendar_cell_new (GObject *obj)
-{
-	gpointer object;
-	AtkObject *atk_object;
-
-	g_return_val_if_fail (E_IS_CALENDAR_CELL (obj), NULL);
-	object = g_object_new (EA_TYPE_CALENDAR_CELL, NULL);
-	atk_object = ATK_OBJECT (object);
-	atk_object_initialize (atk_object, obj);
-	atk_object->role = ATK_ROLE_TABLE_CELL;
-
-#ifdef ACC_DEBUG
-	++n_ea_calendar_cell_created;
-	g_print ("ACC_DEBUG: n_ea_calendar_cell_created = %d\n",
-		n_ea_calendar_cell_created);
-#endif
-	return atk_object;
-}
-
-#ifdef ACC_DEBUG
-static void ea_calendar_cell_finalize (GObject *object)
-{
-	++n_ea_calendar_cell_destroyed;
-	g_print ("ACC_DEBUG: n_ea_calendar_cell_destroyed = %d\n",
-		n_ea_calendar_cell_destroyed);
-}
-#endif
-
-static G_CONST_RETURN gchar*
-ea_calendar_cell_get_name (AtkObject *accessible)
-{
-	GObject *g_obj;
-
-	g_return_val_if_fail (EA_IS_CALENDAR_CELL (accessible), NULL);
-
-	g_obj = atk_gobject_accessible_get_object (ATK_GOBJECT_ACCESSIBLE(accessible));
-	if (!g_obj)
-		/* defunct object*/
-		return NULL;
-
-	if (!accessible->name) {
-		AtkObject *atk_obj;
-		EaCalendarItem *ea_calitem;
-		ECalendarCell *cell;
-		gint day_index;
-		gint year, month, day;
-		gchar buffer[128];
-
-		cell = E_CALENDAR_CELL (g_obj);
-		atk_obj = ea_calendar_cell_get_parent (accessible);
-		ea_calitem = EA_CALENDAR_ITEM (atk_obj);
-		day_index = atk_table_get_index_at (ATK_TABLE (ea_calitem),
-						    cell->row, cell->column);
-		e_calendar_item_get_date_for_offset (cell->calitem, day_index,
-						     &year, &month, &day);
-
-		g_snprintf (buffer, 128, "%d-%d-%d", year, month + 1, day);
-		ATK_OBJECT_CLASS (parent_class)->set_name (accessible, buffer);
-	}
-	return accessible->name;
-}
-
-static G_CONST_RETURN gchar*
-ea_calendar_cell_get_description (AtkObject *accessible)
-{
-	return ea_calendar_cell_get_name (accessible);
-}
-
-static AtkObject *
-ea_calendar_cell_get_parent (AtkObject *accessible)
-{
-	GObject *g_obj;
-	ECalendarCell *cell;
-	ECalendarItem *calitem;
-
-	g_return_val_if_fail (EA_IS_CALENDAR_CELL (accessible), NULL);
-
-	g_obj = atk_gobject_accessible_get_object (ATK_GOBJECT_ACCESSIBLE(accessible));
-	if (!g_obj)
-		/* defunct object*/
-		return NULL;
-
-	cell = E_CALENDAR_CELL (g_obj);
-	calitem = cell->calitem;
-	return atk_gobject_accessible_for_object (G_OBJECT (calitem));
-}
-
-static gint
-ea_calendar_cell_get_index_in_parent (AtkObject *accessible)
-{
-	GObject *g_obj;
-	ECalendarCell *cell;
-	AtkObject *parent;
-
-	g_return_val_if_fail (EA_IS_CALENDAR_CELL (accessible), -1);
-
-	g_obj = atk_gobject_accessible_get_object (ATK_GOBJECT_ACCESSIBLE(accessible));
-	if (!g_obj)
-		return -1;
-	cell = E_CALENDAR_CELL (g_obj);
-	parent = atk_object_get_parent (accessible);
-	return atk_table_get_index_at (ATK_TABLE (parent),
-				       cell->row, cell->column);
-}
-
-static AtkStateSet *
-ea_calendar_cell_ref_state_set (AtkObject *accessible)
-{
-	EaCalendarCell *atk_cell = EA_CALENDAR_CELL (accessible);
-
-	g_return_val_if_fail (atk_cell->state_set, NULL);
-
-	g_object_ref(atk_cell->state_set);
-
-	return atk_cell->state_set;
-	
-}
-
-/* Atk Component Interface */
-
-static void 
-atk_component_interface_init (AtkComponentIface *iface)
-{
-	g_return_if_fail (iface != NULL);
-
-	iface->get_extents = component_interface_get_extents;
-	iface->grab_focus  = component_interface_grab_focus;
-}
-
-static void 
-component_interface_get_extents (AtkComponent *component,
-				 gint *x, gint *y, gint *width, gint *height,
-				 AtkCoordType coord_type)
-{
-	GObject *g_obj;
-	AtkObject *atk_obj, *atk_canvas;
-	ECalendarCell *cell;
-	ECalendarItem *calitem;
-	EaCalendarItem *ea_calitem;
-	gint day_index;
-	gint year, month, day;
-	gint canvas_x, canvas_y, canvas_width, canvas_height;
-
-	*x = *y = *width = *height = 0;
-
-	g_return_if_fail (EA_IS_CALENDAR_CELL (component));
-
-
-	g_obj = atk_gobject_accessible_get_object (ATK_GOBJECT_ACCESSIBLE(component));
-	if (!g_obj)
-		/* defunct object*/
-		return;
-
-	cell = E_CALENDAR_CELL (g_obj);
-	calitem = cell->calitem;
-	atk_obj = atk_gobject_accessible_for_object (G_OBJECT (calitem));
-	ea_calitem = EA_CALENDAR_ITEM (atk_obj);
-	day_index = atk_table_get_index_at (ATK_TABLE (ea_calitem),
-					    cell->row, cell->column);
-	e_calendar_item_get_date_for_offset (calitem, day_index,
-					     &year, &month, &day);
-
-	if (!e_calendar_item_get_day_extents (calitem,
-					      year, month, day,
-					      x, y, width, height))
-	    return;
-	atk_canvas = atk_object_get_parent (ATK_OBJECT (ea_calitem));
-	atk_component_get_extents (ATK_COMPONENT (atk_canvas),
-					     &canvas_x, &canvas_y,
-					     &canvas_width, &canvas_height,
-					     coord_type);
-	*x += canvas_x;
-	*y += canvas_y;
-}
-
-static gboolean
-component_interface_grab_focus (AtkComponent *component)
-{
-	GObject *g_obj;
-	GtkWidget *toplevel;
-	AtkObject *ea_calitem;
-	ECalendarItem *calitem;
-	EaCalendarCell *a11y;
-	gint index;
-
-	a11y = EA_CALENDAR_CELL (component);
-	ea_calitem = ea_calendar_cell_get_parent (ATK_OBJECT (a11y));
-
-	g_obj = atk_gobject_accessible_get_object (ATK_GOBJECT_ACCESSIBLE(ea_calitem));
-	calitem = E_CALENDAR_ITEM (g_obj);
-
-	index = atk_object_get_index_in_parent (ATK_OBJECT (a11y));
-	
-	atk_selection_clear_selection (ATK_SELECTION (ea_calitem));
-	atk_selection_add_selection (ATK_SELECTION (ea_calitem), index);
-	
-	gtk_widget_grab_focus (GTK_WIDGET (GNOME_CANVAS_ITEM (calitem)->canvas));
-	toplevel = gtk_widget_get_toplevel (GTK_WIDGET (GNOME_CANVAS_ITEM (calitem)->canvas));
-	if (toplevel && GTK_WIDGET_TOPLEVEL (toplevel))
-		gtk_window_present (GTK_WINDOW (toplevel));
-
-	return TRUE;
-
-}
diff --git a/a11y/widgets/ea-calendar-cell.h b/a11y/widgets/ea-calendar-cell.h
deleted file mode 100644
index 9cd1ea31f1..0000000000
--- a/a11y/widgets/ea-calendar-cell.h
+++ /dev/null
@@ -1,93 +0,0 @@
-/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-/* vim:expandtab:shiftwidth=8:tabstop=8:
- */
-/* Evolution Accessibility: ea-calendar-cell.h
- *
- * Copyright (C) 2003 Ximian, Inc.
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of version 2 of the GNU General Public
- * License as published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * General Public License for more details.
- *
- * You should have received a copy of the GNU General Public
- * License along with this program; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
- *
- * Author: Bolian Yin <bolian.yin@sun.com> Sun Microsystem Inc., 2003
- *
- */
-
-#ifndef __EA_CALENDAR_CELL_H__
-#define __EA_CALENDAR_CELL_H__
-
-#include <atk/atkgobjectaccessible.h>
-#include "misc/e-calendar-item.h"
-
-#ifdef __cplusplus
-extern "C" {
-#endif /* __cplusplus */
-
-#define E_TYPE_CALENDAR_CELL                     (e_calendar_cell_get_type ())
-#define E_CALENDAR_CELL(obj)                     (G_TYPE_CHECK_INSTANCE_CAST ((obj), E_TYPE_CALENDAR_CELL, ECalendarCell))
-#define E_CALENDAR_CELL_CLASS(klass)             (G_TYPE_CHECK_CLASS_CAST ((klass), E_TYPE_CALENDAR_CELL, ECalendarCellClass))
-#define E_IS_CALENDAR_CELL(obj)                  (G_TYPE_CHECK_INSTANCE_TYPE ((obj), E_TYPE_CALENDAR_CELL))
-#define E_IS_CALENDAR_CELL_CLASS(klass)          (G_TYPE_CHECK_CLASS_TYPE ((klass), E_TYPE_CALENDAR_CELL))
-#define E_CALENDAR_CELL_GET_CLASS(obj)           (G_TYPE_INSTANCE_GET_CLASS ((obj), E_TYPE_CALENDAR_CELL, ECalendarCellClass))
-
-typedef struct _ECalendarCell                   ECalendarCell;
-typedef struct _ECalendarCellClass              ECalendarCellClass;
-
-struct _ECalendarCell
-{
-	GObject parent;
-	ECalendarItem *calitem;
-	gint row;
-	gint column;
-};
-
-GType e_calendar_cell_get_type (void);
-
-struct _ECalendarCellClass
-{
-	GObjectClass parent_class;
-};
-
-ECalendarCell * e_calendar_cell_new (ECalendarItem *calitem,
-				     gint row, gint column);
-
-#define EA_TYPE_CALENDAR_CELL                     (ea_calendar_cell_get_type ())
-#define EA_CALENDAR_CELL(obj)                     (G_TYPE_CHECK_INSTANCE_CAST ((obj), EA_TYPE_CALENDAR_CELL, EaCalendarCell))
-#define EA_CALENDAR_CELL_CLASS(klass)             (G_TYPE_CHECK_CLASS_CAST ((klass), EA_TYPE_CALENDAR_CELL, EaCalendarCellClass))
-#define EA_IS_CALENDAR_CELL(obj)                  (G_TYPE_CHECK_INSTANCE_TYPE ((obj), EA_TYPE_CALENDAR_CELL))
-#define EA_IS_CALENDAR_CELL_CLASS(klass)          (G_TYPE_CHECK_CLASS_TYPE ((klass), EA_TYPE_CALENDAR_CELL))
-#define EA_CALENDAR_CELL_GET_CLASS(obj)           (G_TYPE_INSTANCE_GET_CLASS ((obj), EA_TYPE_CALENDAR_CELL, EaCalendarCellClass))
-
-typedef struct _EaCalendarCell                   EaCalendarCell;
-typedef struct _EaCalendarCellClass              EaCalendarCellClass;
-
-struct _EaCalendarCell
-{
-	AtkGObjectAccessible parent;
-	AtkStateSet *state_set;
-};
-
-GType ea_calendar_cell_get_type (void);
-
-struct _EaCalendarCellClass
-{
-	AtkGObjectAccessibleClass parent_class;
-};
-
-AtkObject*     ea_calendar_cell_new         (GObject *gobj);
-
-#ifdef __cplusplus
-}
-#endif /* __cplusplus */
-
-#endif /* __EA_CALENDAR_CELL_H__ */
diff --git a/a11y/widgets/ea-calendar-item.c b/a11y/widgets/ea-calendar-item.c
deleted file mode 100644
index 82af38ecbc..0000000000
--- a/a11y/widgets/ea-calendar-item.c
+++ /dev/null
@@ -1,1326 +0,0 @@
-/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-/* vim:expandtab:shiftwidth=8:tabstop=8:
- */
-/* Evolution Accessibility: ea-calendar-item.c
- *
- * Copyright (C) 2003 Ximian, Inc.
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of version 2 of the GNU General Public
- * License as published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * General Public License for more details.
- *
- * You should have received a copy of the GNU General Public
- * License along with this program; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
- *
- * Author: Bolian Yin <bolian.yin@sun.com> Sun Microsystem Inc., 2003
- *
- */
-
-#include <stdio.h>
-#include <time.h>
-#include <string.h>
-#include <libgnomecanvas/gnome-canvas.h>
-#include <glib/gdate.h>
-#include <gal/util/e-util.h>
-#include <libgnome/gnome-i18n.h>
-#include <gal/util/e-util.h>
-#include "ea-calendar-item.h"
-#include "ea-calendar-cell.h"
-#include "ea-cell-table.h"
-
-#define EA_CALENDAR_COLUMN_NUM E_CALENDAR_COLS_PER_MONTH
-
-/* EaCalendarItem */
-static void ea_calendar_item_class_init (EaCalendarItemClass *klass);
-static void ea_calendar_item_finalize (GObject *object);
-
-static G_CONST_RETURN gchar* ea_calendar_item_get_name (AtkObject *accessible);
-static G_CONST_RETURN gchar* ea_calendar_item_get_description (AtkObject *accessible);
-static gint ea_calendar_item_get_n_children (AtkObject *accessible);
-static AtkObject *ea_calendar_item_ref_child (AtkObject *accessible, gint index);
-static AtkStateSet* ea_calendar_item_ref_state_set (AtkObject *accessible);
-
-/* atk table interface */
-static void atk_table_interface_init (AtkTableIface *iface);
-static gint table_interface_get_index_at (AtkTable *table,
-					  gint     row,
-					  gint     column);
-static gint table_interface_get_column_at_index (AtkTable *table,
-						 gint     index);
-static gint table_interface_get_row_at_index (AtkTable *table,
-					      gint     index);
-static AtkObject* table_interface_ref_at (AtkTable *table,
-					  gint     row, 
-					  gint     column);
-static gint table_interface_get_n_rows (AtkTable *table);
-static gint table_interface_get_n_columns (AtkTable *table);
-static gint table_interface_get_column_extent_at (AtkTable      *table,
-						  gint          row,
-						  gint          column);
-static gint table_interface_get_row_extent_at (AtkTable      *table,
-					       gint          row,
-					       gint          column);
-
-static gboolean table_interface_is_row_selected (AtkTable *table,
-						 gint     row);
-static gboolean table_interface_is_column_selected (AtkTable *table,
-						    gint     row);
-static gboolean table_interface_is_selected (AtkTable *table,
-					     gint     row,
-					     gint     column);
-static gint table_interface_get_selected_rows (AtkTable *table,
-					       gint **rows_selected);
-static gint table_interface_get_selected_columns (AtkTable *table,
-						  gint     **columns_selected);
-static gboolean table_interface_add_row_selection (AtkTable *table, gint row);
-static gboolean table_interface_remove_row_selection (AtkTable *table,
-						      gint row);
-static gboolean table_interface_add_column_selection (AtkTable *table,
-						      gint column);
-static gboolean table_interface_remove_column_selection (AtkTable *table,
-							 gint column);
-static AtkObject* table_interface_get_row_header (AtkTable *table, gint row);
-static AtkObject* table_interface_get_column_header (AtkTable *table,
-						     gint in_col);
-static AtkObject* table_interface_get_caption (AtkTable *table);
-
-static G_CONST_RETURN gchar*
-table_interface_get_column_description (AtkTable *table, gint in_col);
-
-static G_CONST_RETURN gchar*
-table_interface_get_row_description (AtkTable *table, gint row);
-
-static AtkObject* table_interface_get_summary (AtkTable *table);
-
-/* atk selection interface */
-static void atk_selection_interface_init (AtkSelectionIface *iface);
-static gboolean selection_interface_add_selection (AtkSelection *selection,
-						   gint i);
-static gboolean selection_interface_clear_selection (AtkSelection *selection);
-static AtkObject* selection_interface_ref_selection (AtkSelection *selection,
-						     gint i);
-static gint selection_interface_get_selection_count (AtkSelection *selection);
-static gboolean selection_interface_is_child_selected (AtkSelection *selection,
-						       gint i);
-
-/* callbacks */
-static void selection_preview_change_cb (ECalendarItem *calitem);
-static void date_range_changed_cb (ECalendarItem *calitem);
-
-/* helpers */
-static EaCellTable *ea_calendar_item_get_cell_data (EaCalendarItem *ea_calitem);
-static void ea_calendar_item_destory_cell_data (EaCalendarItem *ea_calitem);
-static gboolean ea_calendar_item_get_column_label (EaCalendarItem *ea_calitem,
-						   gint column,
-						   gchar *buffer,
-						   gint buffer_size);
-static gboolean ea_calendar_item_get_row_label (EaCalendarItem *ea_calitem,
-						gint row,
-						gchar *buffer,
-						gint buffer_size);
-static gboolean e_calendar_item_get_offset_for_date (ECalendarItem *calitem,
-						     gint year, gint month, gint day,
-						     gint *offset);
-static void ea_calendar_set_focus_object (EaCalendarItem *ea_calitem, 
-					  AtkObject *item_cell);
-
-#ifdef ACC_DEBUG
-static gint n_ea_calendar_item_created = 0;
-static gint n_ea_calendar_item_destroyed = 0;
-#endif
-
-static gpointer parent_class = NULL;
-
-GType
-ea_calendar_item_get_type (void)
-{
-	static GType type = 0;
-	AtkObjectFactory *factory;
-	GTypeQuery query;
-	GType derived_atk_type;
-
-	if (!type) {
-		static GTypeInfo tinfo = {
-			sizeof (EaCalendarItemClass),
-			(GBaseInitFunc) NULL, /* base init */
-			(GBaseFinalizeFunc) NULL, /* base finalize */
-			(GClassInitFunc) ea_calendar_item_class_init, /* class init */
-			(GClassFinalizeFunc) NULL, /* class finalize */
-			NULL, /* class data */
-			sizeof (EaCalendarItem), /* instance size */
-			0, /* nb preallocs */
-			(GInstanceInitFunc) NULL, /* instance init */
-			NULL /* value table */
-		};
-
-		static const GInterfaceInfo atk_table_info = {
-			(GInterfaceInitFunc) atk_table_interface_init,
-			(GInterfaceFinalizeFunc) NULL,
-			NULL
-		};
-		static const GInterfaceInfo atk_selection_info = {
-			(GInterfaceInitFunc) atk_selection_interface_init,
-			(GInterfaceFinalizeFunc) NULL,
-			NULL
-		};
-
-		/*
-		 * Figure out the size of the class and instance
-		 * we are run-time deriving from (GailCanvasItem, in this case)
-		 */
-
-		factory = atk_registry_get_factory (atk_get_default_registry (),
-						    GNOME_TYPE_CANVAS_ITEM);
-		derived_atk_type = atk_object_factory_get_accessible_type (factory);
-		g_type_query (derived_atk_type, &query);
-
-		tinfo.class_size = query.class_size;
-		tinfo.instance_size = query.instance_size;
-
-		type = g_type_register_static (derived_atk_type,
-					       "EaCalendarItem", &tinfo, 0);
-		g_type_add_interface_static (type, ATK_TYPE_TABLE,
-					     &atk_table_info);
-		g_type_add_interface_static (type, ATK_TYPE_SELECTION,
-					     &atk_selection_info);
-	}
-
-	return type;
-}
-
-static void
-ea_calendar_item_class_init (EaCalendarItemClass *klass)
-{
-	GObjectClass *gobject_class = G_OBJECT_CLASS (klass);
-	AtkObjectClass *class = ATK_OBJECT_CLASS (klass);
-
-	gobject_class->finalize = ea_calendar_item_finalize;
-	parent_class = g_type_class_peek_parent (klass);
-
-	class->get_name = ea_calendar_item_get_name;
-	class->get_description = ea_calendar_item_get_description;
-        class->ref_state_set = ea_calendar_item_ref_state_set;
-
-	class->get_n_children = ea_calendar_item_get_n_children;
-	class->ref_child = ea_calendar_item_ref_child;
-}
-
-AtkObject* 
-ea_calendar_item_new (GObject *obj)
-{
-	gpointer object;
-	AtkObject *atk_object;
-	AtkObject *item_cell;
-
-	g_return_val_if_fail (E_IS_CALENDAR_ITEM (obj), NULL);
-	object = g_object_new (EA_TYPE_CALENDAR_ITEM, NULL);
-	atk_object = ATK_OBJECT (object);
-	atk_object_initialize (atk_object, obj);
-	atk_object->role = ATK_ROLE_CALENDAR;
-
-	item_cell = atk_selection_ref_selection (ATK_SELECTION (atk_object),
-							0);
-	if (item_cell)
-		ea_calendar_set_focus_object (EA_CALENDAR_ITEM (atk_object), item_cell);
-
-#ifdef ACC_DEBUG
-	++n_ea_calendar_item_created;
-	g_print ("ACC_DEBUG: n_ea_calendar_item_created = %d\n",
-		n_ea_calendar_item_created);
-#endif
-	/* connect signal handlers */
-	g_signal_connect (obj, "selection_preview_changed",
-			  G_CALLBACK (selection_preview_change_cb),
-			  atk_object);
-	g_signal_connect (obj, "date_range_changed",
-			  G_CALLBACK (date_range_changed_cb),
-			  atk_object);
-
-	return atk_object;
-}
-
-static void
-ea_calendar_item_finalize (GObject *object)
-{
-	EaCalendarItem *ea_calitem;
-
-	g_return_if_fail (EA_IS_CALENDAR_ITEM (object));
-
-	ea_calitem = EA_CALENDAR_ITEM (object);
-
-	/* Free the allocated cell data */
-	ea_calendar_item_destory_cell_data (ea_calitem);
-
-	G_OBJECT_CLASS (parent_class)->finalize (object);
-#ifdef ACC_DEBUG
-	++n_ea_calendar_item_destroyed;
-	printf ("ACC_DEBUG: n_ea_calendar_item_destroyed = %d\n",
-		n_ea_calendar_item_destroyed);
-#endif
-}
-
-static G_CONST_RETURN gchar*
-ea_calendar_item_get_name (AtkObject *accessible)
-{
-	GObject *g_obj;
-	ECalendarItem *calitem;
-	gint start_year, start_month, start_day;
-	gint end_year, end_month, end_day;
-	gchar *name_str = NULL;
-	gchar buffer_start[128] = "";
-	gchar buffer_end[128] = "";
-	struct tm day_start = { 0 };
-	struct tm day_end = { 0 };
-
-	g_return_val_if_fail (EA_IS_CALENDAR_ITEM (accessible), NULL);
-
-	g_obj = atk_gobject_accessible_get_object (ATK_GOBJECT_ACCESSIBLE(accessible));
-	g_return_val_if_fail (E_IS_CALENDAR_ITEM (g_obj), NULL);
-
-	calitem = E_CALENDAR_ITEM (g_obj);
-	if (e_calendar_item_get_date_range (calitem,
-					    &start_year, &start_month, &start_day,
-                                            &end_year, &end_month, &end_day)) {
-
-                day_start.tm_year = start_year - 1900;
-                day_start.tm_mon = start_month;
-                day_start.tm_mday = start_day;
-                day_start.tm_isdst = -1;
-                e_utf8_strftime (buffer_start, sizeof (buffer_start), _("%d %B %Y"), &day_start);
-
-                day_end.tm_year = end_year - 1900;
-                day_end.tm_mon = end_month;
-                day_end.tm_mday = end_day;
-                day_end.tm_isdst = -1;
-                e_utf8_strftime (buffer_end, sizeof (buffer_end), _("%d %B %Y"), &day_end);
-
-		name_str = g_strdup_printf (_("Calendar: from %s to %s"), buffer_start, buffer_end); 
-        }
-
-#if 0
-	if (e_calendar_item_get_selection (calitem, &select_start, &select_end)) {
-		GDate select_start, select_end;
-		gint year1, year2, month1, month2, day1, day2;
-
-		year1 = g_date_get_year (&select_start);
-		month1  = g_date_get_month (&select_start);
-		day1 = g_date_get_day (&select_start);
-
-		year2 = g_date_get_year (&select_end);
-		month2  = g_date_get_month (&select_end);
-		day2 = g_date_get_day (&select_end);
-
-		sprintf (new_name + strlen (new_name),
-			 " : current selection: from %d-%d-%d to %d-%d-%d.",
-			 year1, month1, day1,
-			 year2, month2, day2);
-	}
-#endif
-
-	ATK_OBJECT_CLASS (parent_class)->set_name (accessible, name_str);
-	g_free (name_str);
-
-	return accessible->name;
-}
-
-static G_CONST_RETURN gchar*
-ea_calendar_item_get_description (AtkObject *accessible)
-{
-	if (accessible->description)
-		return accessible->description;
-
-	return _("evolution calendar item");
-}
-
-static AtkStateSet*
-ea_calendar_item_ref_state_set (AtkObject *accessible)
-{
-        AtkStateSet *state_set;
-        GObject *g_obj;
-
-        state_set = ATK_OBJECT_CLASS (parent_class)->ref_state_set (accessible);
-        g_obj = atk_gobject_accessible_get_object (ATK_GOBJECT_ACCESSIBLE(accessible));
-        if (!g_obj)
-                return state_set;
-
-        atk_state_set_add_state (state_set, ATK_STATE_ENABLED);
-        atk_state_set_add_state (state_set, ATK_STATE_SENSITIVE);
-        
-        return state_set;
-}
-
-static gint
-ea_calendar_item_get_n_children (AtkObject *accessible)
-{
-	AtkGObjectAccessible *atk_gobj;
-	GObject *g_obj;
-	ECalendarItem *calitem;
-	gint n_children = 0;
-	gint start_year, start_month, start_day;
-	gint end_year, end_month, end_day;
-	GDate *start_date, *end_date;
-
-	g_return_val_if_fail (EA_IS_CALENDAR_ITEM (accessible), -1);
-
-	atk_gobj = ATK_GOBJECT_ACCESSIBLE (accessible);
-	g_obj = atk_gobject_accessible_get_object (atk_gobj);
-	if (!g_obj)
-		return -1;
-
-	calitem = E_CALENDAR_ITEM (g_obj);
-	if (!e_calendar_item_get_date_range (calitem, &start_year,
-					     &start_month, &start_day,
-					     &end_year, &end_month,
-					     &end_day))
-		return 0;
-
-	start_date = g_date_new_dmy (start_day, start_month + 1, start_year);
-	end_date = g_date_new_dmy (end_day, end_month + 1, end_year);
-
-	n_children = g_date_days_between (start_date, end_date) + 1;
-	g_free (start_date);
-	g_free (end_date);
-	return n_children;
-}
-
-static AtkObject *
-ea_calendar_item_ref_child (AtkObject *accessible, gint index)
-{
-	AtkGObjectAccessible *atk_gobj;
-	GObject *g_obj;
-	ECalendarItem *calitem;
-	gint n_children;
-	ECalendarCell *cell;
-	EaCellTable *cell_data;
-	EaCalendarItem *ea_calitem;
-
-	g_return_val_if_fail (EA_IS_CALENDAR_ITEM (accessible), NULL);
-
-	atk_gobj = ATK_GOBJECT_ACCESSIBLE (accessible);
-	g_obj = atk_gobject_accessible_get_object (atk_gobj);
-	if (!g_obj)
-		return NULL;
-
-	calitem = E_CALENDAR_ITEM (g_obj);
-
-	n_children = ea_calendar_item_get_n_children (accessible);
-	if (index < 0 || index >= n_children)
-		return NULL;
-
-	ea_calitem = EA_CALENDAR_ITEM (accessible);
-	cell_data = ea_calendar_item_get_cell_data (ea_calitem);
-	if (!cell_data)
-		return NULL;
-
-	cell = ea_cell_table_get_cell_at_index (cell_data, index);
-	if (!cell) {
-		cell = e_calendar_cell_new (calitem,
-					    index / EA_CALENDAR_COLUMN_NUM,
-					    index % EA_CALENDAR_COLUMN_NUM);
-		ea_cell_table_set_cell_at_index (cell_data, index, cell);
-		g_object_unref (cell);
-	}
-
-#ifdef ACC_DEBUG
-	g_print ("AccDebug: ea_calendar_item children[%d]=%p\n", index,
-		 (gpointer)cell);
-#endif
-	return g_object_ref (atk_gobject_accessible_for_object (G_OBJECT(cell)));
-}
-
-/* atk table interface */
-
-static void 
-atk_table_interface_init (AtkTableIface *iface)
-{
-	g_return_if_fail (iface != NULL);
-
-	iface->ref_at = table_interface_ref_at;
-
-	iface->get_n_rows = table_interface_get_n_rows;
-	iface->get_n_columns = table_interface_get_n_columns;
-	iface->get_index_at = table_interface_get_index_at;
-	iface->get_column_at_index = table_interface_get_column_at_index;
-	iface->get_row_at_index = table_interface_get_row_at_index;
-	iface->get_column_extent_at = table_interface_get_column_extent_at;
-	iface->get_row_extent_at = table_interface_get_row_extent_at;
-
-	iface->is_selected = table_interface_is_selected;
-	iface->get_selected_rows = table_interface_get_selected_rows;
-	iface->get_selected_columns = table_interface_get_selected_columns;
-	iface->is_row_selected = table_interface_is_row_selected;
-	iface->is_column_selected = table_interface_is_column_selected;
-	iface->add_row_selection = table_interface_add_row_selection;
-	iface->remove_row_selection = table_interface_remove_row_selection;
-	iface->add_column_selection = table_interface_add_column_selection;
-	iface->remove_column_selection = table_interface_remove_column_selection;
-
-	iface->get_row_header = table_interface_get_row_header;
-	iface->get_column_header = table_interface_get_column_header;
-	iface->get_caption = table_interface_get_caption;
-	iface->get_summary = table_interface_get_summary;
-	iface->get_row_description = table_interface_get_row_description;
-	iface->get_column_description = table_interface_get_column_description;
-}
-
-static AtkObject* 
-table_interface_ref_at (AtkTable *table,
-			gint     row, 
-			gint     column)
-{
-	gint index;
-
-	EaCalendarItem* ea_calitem = EA_CALENDAR_ITEM (table);
-	index = EA_CALENDAR_COLUMN_NUM * row + column;
-	return ea_calendar_item_ref_child (ATK_OBJECT (ea_calitem), index);
-}
-
-static gint 
-table_interface_get_n_rows (AtkTable *table)
-{
-	AtkGObjectAccessible *atk_gobj;
-	GObject *g_obj;
-	EaCalendarItem* ea_calitem = EA_CALENDAR_ITEM (table);
-	gint n_children;
-
-	atk_gobj = ATK_GOBJECT_ACCESSIBLE (ea_calitem);
-	g_obj = atk_gobject_accessible_get_object (atk_gobj);
-	if (!g_obj)
-		return -1;
-
-	n_children = ea_calendar_item_get_n_children (ATK_OBJECT (ea_calitem));
-	return (n_children - 1) / EA_CALENDAR_COLUMN_NUM + 1;
-}
-
-static gint 
-table_interface_get_n_columns (AtkTable *table)
-{
-	AtkGObjectAccessible *atk_gobj;
-	GObject *g_obj;
-	EaCalendarItem* ea_calitem = EA_CALENDAR_ITEM (table);
-
-	atk_gobj = ATK_GOBJECT_ACCESSIBLE (ea_calitem);
-	g_obj = atk_gobject_accessible_get_object (atk_gobj);
-	if (!g_obj)
-		return -1;
-
-	return EA_CALENDAR_COLUMN_NUM;
-}
-
-static gint
-table_interface_get_index_at (AtkTable *table,
-			      gint     row,
-			      gint     column)
-{
-	AtkGObjectAccessible *atk_gobj;
-	GObject *g_obj;
-	EaCalendarItem* ea_calitem = EA_CALENDAR_ITEM (table);
-
-	atk_gobj = ATK_GOBJECT_ACCESSIBLE (ea_calitem);
-	g_obj = atk_gobject_accessible_get_object (atk_gobj);
-	if (!g_obj)
-		return -1;
-
-	return row * EA_CALENDAR_COLUMN_NUM + column;
-}
-
-static gint
-table_interface_get_column_at_index (AtkTable *table,
-				     gint index)
-{
-	AtkGObjectAccessible *atk_gobj;
-	GObject *g_obj;
-	EaCalendarItem* ea_calitem = EA_CALENDAR_ITEM (table);
-	gint n_children;
-
-	atk_gobj = ATK_GOBJECT_ACCESSIBLE (ea_calitem);
-	g_obj = atk_gobject_accessible_get_object (atk_gobj);
-	if (!g_obj)
-		return -1;
-
-	n_children = ea_calendar_item_get_n_children (ATK_OBJECT (ea_calitem));
-	if (index >= 0 && index < n_children)
-		return index % EA_CALENDAR_COLUMN_NUM;
-	return -1;
-}
-
-static gint
-table_interface_get_row_at_index (AtkTable *table,
-				  gint     index)
-{
-	AtkGObjectAccessible *atk_gobj;
-	GObject *g_obj;
-	EaCalendarItem* ea_calitem = EA_CALENDAR_ITEM (table);
-	gint n_children;
-
-	atk_gobj = ATK_GOBJECT_ACCESSIBLE (ea_calitem);
-	g_obj = atk_gobject_accessible_get_object (atk_gobj);
-	if (!g_obj)
-		return -1;
-
-	n_children = ea_calendar_item_get_n_children (ATK_OBJECT (ea_calitem));
-	if (index >= 0 && index < n_children)
-		return index / EA_CALENDAR_COLUMN_NUM;
-	return -1;
-}
-
-static gint
-table_interface_get_column_extent_at (AtkTable      *table,
-				      gint          row,
-				      gint          column)
-{
-	AtkGObjectAccessible *atk_gobj;
-	GObject *g_obj;
-	ECalendarItem *calitem;
-	EaCalendarItem* ea_calitem = EA_CALENDAR_ITEM (table);
-
-	atk_gobj = ATK_GOBJECT_ACCESSIBLE (ea_calitem);
-	g_obj = atk_gobject_accessible_get_object (atk_gobj);
-	if (!g_obj)
-		return FALSE;
-
-	calitem = E_CALENDAR_ITEM (g_obj);
-	return calitem->cell_width;
-}
-
-static gint 
-table_interface_get_row_extent_at (AtkTable *table,
-				   gint row, gint column)
-{
-	AtkGObjectAccessible *atk_gobj;
-	GObject *g_obj;
-	ECalendarItem *calitem;
-	EaCalendarItem* ea_calitem = EA_CALENDAR_ITEM (table);
-
-	atk_gobj = ATK_GOBJECT_ACCESSIBLE (ea_calitem);
-	g_obj = atk_gobject_accessible_get_object (atk_gobj);
-	if (!g_obj)
-		return FALSE;
-
-	calitem = E_CALENDAR_ITEM (g_obj);
-	return calitem->cell_height;
-}
-
-/* any day in the row is selected, the row is selected */
-static gboolean 
-table_interface_is_row_selected (AtkTable *table,
-				 gint row)
-{
-	AtkGObjectAccessible *atk_gobj;
-	GObject *g_obj;
-	gint n_rows;
-	ECalendarItem *calitem;
-	gint row_index_start, row_index_end;
-	gint sel_index_start, sel_index_end;
-
-	GDate start_date, end_date;
-
-	g_return_val_if_fail (EA_IS_CALENDAR_ITEM (table), FALSE);
-
-	atk_gobj = ATK_GOBJECT_ACCESSIBLE (table);
-	g_obj = atk_gobject_accessible_get_object (atk_gobj);
-	if (!g_obj)
-		return FALSE;
-
-	n_rows = table_interface_get_n_rows (table);
-	if (row < 0 || row >= n_rows)
-		return FALSE;
-
-	row_index_start = row * EA_CALENDAR_COLUMN_NUM;
-	row_index_end = row_index_start + EA_CALENDAR_COLUMN_NUM - 1;
-
-	calitem = E_CALENDAR_ITEM (g_obj);
-	e_calendar_item_get_selection (calitem, &start_date, &end_date);
-
-	e_calendar_item_get_offset_for_date (calitem,
-					     g_date_get_year (&start_date),
-					     g_date_get_month (&start_date),
-					     g_date_get_day (&start_date),
-					     &sel_index_start);
-	e_calendar_item_get_offset_for_date (calitem,
-					     g_date_get_year (&end_date),
-					     g_date_get_month (&end_date),
-					     g_date_get_day (&end_date),
-					     &sel_index_end);
-
-	if ((sel_index_start < row_index_start &&
-	     sel_index_end >= row_index_start) ||
-	    (sel_index_start >= row_index_start &&
-	     sel_index_start <= row_index_end))
-	    return TRUE;
-	return FALSE;
-}
-
-static gboolean 
-table_interface_is_selected (AtkTable *table, 
-			     gint     row, 
-			     gint     column)
-{
-	AtkGObjectAccessible *atk_gobj;
-	GObject *g_obj;
-	gint n_rows, n_columns;
-	ECalendarItem *calitem;
-	gint index;
-	gint sel_index_start, sel_index_end;
-
-	GDate start_date, end_date;
-
-	g_return_val_if_fail (EA_IS_CALENDAR_ITEM (table), FALSE);
-
-	atk_gobj = ATK_GOBJECT_ACCESSIBLE (table);
-	g_obj = atk_gobject_accessible_get_object (atk_gobj);
-	if (!g_obj)
-		return FALSE;
-
-	n_rows = table_interface_get_n_rows (table);
-	if (row < 0 || row >= n_rows)
-		return FALSE;
-	n_columns = table_interface_get_n_columns (table);
-	if (column < 0 || column >= n_columns)
-		return FALSE;
-
-	index = table_interface_get_index_at (table, row, column);
-
-	calitem = E_CALENDAR_ITEM (g_obj);
-	e_calendar_item_get_selection (calitem, &start_date, &end_date);
-
-	e_calendar_item_get_offset_for_date (calitem,
-					     g_date_get_year (&start_date),
-					     g_date_get_month (&start_date),
-					     g_date_get_day (&start_date),
-					     &sel_index_start);
-	e_calendar_item_get_offset_for_date (calitem,
-					     g_date_get_year (&end_date),
-					     g_date_get_month (&end_date),
-					     g_date_get_day (&end_date), &sel_index_end);
-
-	if (sel_index_start <= index && sel_index_end >= index)
-	    return TRUE;
-	return FALSE;
-}
-
-static gboolean 
-table_interface_is_column_selected (AtkTable *table,
-				    gint column)
-{
-	return FALSE;
-}
-
-static gint 
-table_interface_get_selected_rows (AtkTable *table,
-				   gint **rows_selected)
-{
-	*rows_selected = NULL;
-	return -1;
-}
-
-static gint 
-table_interface_get_selected_columns (AtkTable *table,
-				      gint **columns_selected)
-{
-	*columns_selected = NULL;
-	return -1;
-}
-
-static gboolean 
-table_interface_add_row_selection (AtkTable *table, 
-				   gint row)
-{
-	return FALSE;
-}
-
-static gboolean 
-table_interface_remove_row_selection (AtkTable *table, 
-				      gint row)
-{
-	return FALSE;
-}
-
-static gboolean 
-table_interface_add_column_selection (AtkTable *table, 
-				      gint column)
-{
-	return FALSE;
-}
-
-static gboolean 
-table_interface_remove_column_selection (AtkTable *table, 
-					 gint     column)
-{
-	/* FIXME: NOT IMPLEMENTED */
-	return FALSE;
-}
-
-static AtkObject* 
-table_interface_get_row_header (AtkTable *table, 
-				gint     row)
-{
-	/* FIXME: NOT IMPLEMENTED */
-	return NULL;
-}
-
-static AtkObject* 
-table_interface_get_column_header (AtkTable *table, 
-				   gint     in_col)
-{
-	/* FIXME: NOT IMPLEMENTED */
-	return NULL;
-}
-
-static AtkObject*
-table_interface_get_caption (AtkTable	*table)
-{
-	/* FIXME: NOT IMPLEMENTED */
-	return NULL;
-}
-
-static G_CONST_RETURN gchar*
-table_interface_get_column_description (AtkTable *table, gint in_col)
-{
-	AtkGObjectAccessible *atk_gobj;
-	GObject *g_obj;
-	ECalendarItem *calitem;
-	EaCalendarItem* ea_calitem = EA_CALENDAR_ITEM (table);
-	const gchar *description = NULL;
-	EaCellTable *cell_data;
-	gint n_columns;
-
-	atk_gobj = ATK_GOBJECT_ACCESSIBLE (ea_calitem);
-	g_obj = atk_gobject_accessible_get_object (atk_gobj);
-	if (!g_obj)
-		return NULL;
-
-	calitem = E_CALENDAR_ITEM (g_obj);
-	n_columns = table_interface_get_n_columns (table);
-	if (in_col < 0 || in_col >= n_columns)
-		return NULL;
-	cell_data = ea_calendar_item_get_cell_data (ea_calitem);
-	if (!cell_data)
-		return NULL;
-
-	description = ea_cell_table_get_column_label (cell_data, in_col);
-	if (!description) {
-		gchar buffer[128] = "column description";
-		ea_calendar_item_get_column_label (ea_calitem, in_col,
-						   buffer, sizeof (buffer));
-		ea_cell_table_set_column_label (cell_data, in_col, buffer);
-		description = ea_cell_table_get_column_label (cell_data,
-							      in_col);
-	}
-	return description;
-}
-
-static G_CONST_RETURN gchar*
-table_interface_get_row_description (AtkTable *table, gint row)
-{
-	AtkGObjectAccessible *atk_gobj;
-	GObject *g_obj;
-	ECalendarItem *calitem;
-	EaCalendarItem* ea_calitem = EA_CALENDAR_ITEM (table);
-	const gchar *description = NULL;
-	EaCellTable *cell_data;
-	gint n_rows;
-
-	atk_gobj = ATK_GOBJECT_ACCESSIBLE (ea_calitem);
-	g_obj = atk_gobject_accessible_get_object (atk_gobj);
-	if (!g_obj)
-		return NULL;
-
-	calitem = E_CALENDAR_ITEM (g_obj);
-	n_rows = table_interface_get_n_rows (table);
-	if (row < 0 || row >= n_rows)
-		return NULL;
-	cell_data = ea_calendar_item_get_cell_data (ea_calitem);
-	if (!cell_data)
-		return NULL;
-
-	description = ea_cell_table_get_row_label (cell_data, row);
-	if (!description) {
-		gchar buffer[128] = "row description";
-		ea_calendar_item_get_row_label (ea_calitem, row,
-						buffer, sizeof (buffer));
-		ea_cell_table_set_row_label (cell_data, row, buffer);
-		description = ea_cell_table_get_row_label (cell_data,
-							   row);
-	}
-	return description;
-}
-
-static AtkObject*
-table_interface_get_summary (AtkTable	*table)
-{
-	/* FIXME: NOT IMPLEMENTED */
-	return NULL;
-}
-
-/* atkselection interface */
-
-static void
-atk_selection_interface_init (AtkSelectionIface *iface)
-{
-	g_return_if_fail (iface != NULL);
-
-	iface->add_selection = selection_interface_add_selection;
-	iface->clear_selection = selection_interface_clear_selection;
-	iface->ref_selection = selection_interface_ref_selection;
-	iface->get_selection_count = selection_interface_get_selection_count;
-	iface->is_child_selected = selection_interface_is_child_selected;
-}
-
-static gboolean
-selection_interface_add_selection (AtkSelection *selection, gint index)
-{
-	AtkGObjectAccessible *atk_gobj;
-	GObject *g_obj;
-	ECalendarItem *calitem;
-	EaCalendarItem* ea_calitem = EA_CALENDAR_ITEM (selection);
-	gint year, month, day;
-	GDate start_date, end_date;
-
-	atk_gobj = ATK_GOBJECT_ACCESSIBLE (ea_calitem);
-	g_obj = atk_gobject_accessible_get_object (atk_gobj);
-	if (!g_obj)
-		return FALSE;
-
-	calitem = E_CALENDAR_ITEM (g_obj);
-	if (!e_calendar_item_get_date_for_offset (calitem, index,
-						  &year, &month, &day))
-		return FALSE;
-
-	/* FIXME: not support mulit-selection */
-	g_date_set_dmy (&start_date, day, month + 1, year);
-	end_date = start_date;
-	e_calendar_item_set_selection (calitem, &start_date, &end_date);
-	return TRUE;
-}
-
-static gboolean
-selection_interface_clear_selection (AtkSelection *selection)
-{
-	AtkGObjectAccessible *atk_gobj;
-	GObject *g_obj;
-	ECalendarItem *calitem;
-	EaCalendarItem* ea_calitem = EA_CALENDAR_ITEM (selection);
-
-	atk_gobj = ATK_GOBJECT_ACCESSIBLE (ea_calitem);
-	g_obj = atk_gobject_accessible_get_object (atk_gobj);
-	if (!g_obj)
-		return FALSE;
-
-	calitem = E_CALENDAR_ITEM (g_obj);
-	e_calendar_item_set_selection (calitem, NULL, NULL);
-
-	return TRUE;
-}
-
-static AtkObject*  
-selection_interface_ref_selection (AtkSelection *selection, gint i)
-{
-	GObject *g_obj;
-	ECalendarItem *calitem;
-	EaCalendarItem* ea_calitem = EA_CALENDAR_ITEM (selection);
-	gint count, sel_offset;
-	GDate start_date, end_date;
-
-	count = selection_interface_get_selection_count (selection);
-	if (i < 0 || i >= count)
-		return NULL;
-
-	g_obj = atk_gobject_accessible_get_object (ATK_GOBJECT_ACCESSIBLE (ea_calitem));
-
-	calitem = E_CALENDAR_ITEM (g_obj);
-	e_calendar_item_get_selection (calitem, &start_date, &end_date);
-	if (!e_calendar_item_get_offset_for_date (calitem,
-						  g_date_get_year (&start_date),
-						  g_date_get_month (&start_date) - 1,
-						  g_date_get_day (&start_date),
-						  &sel_offset))
-		return NULL;
-
-	return ea_calendar_item_ref_child (ATK_OBJECT (selection), sel_offset + i);
-}
-
-static gint
-selection_interface_get_selection_count (AtkSelection *selection)
-{
-	AtkGObjectAccessible *atk_gobj;
-	GObject *g_obj;
-	ECalendarItem *calitem;
-	EaCalendarItem* ea_calitem = EA_CALENDAR_ITEM (selection);
-	GDate start_date, end_date;
-
-	atk_gobj = ATK_GOBJECT_ACCESSIBLE (ea_calitem);
-	g_obj = atk_gobject_accessible_get_object (atk_gobj);
-	if (!g_obj)
-		return 0;
-
-	calitem = E_CALENDAR_ITEM (g_obj);
-	e_calendar_item_get_selection (calitem, &start_date, &end_date);
-
-	return g_date_days_between (&start_date, &end_date) + 1;
-}
-
-static gboolean
-selection_interface_is_child_selected (AtkSelection *selection, gint index)
-{
-	AtkGObjectAccessible *atk_gobj;
-	GObject *g_obj;
-	ECalendarItem *calitem;
-	EaCalendarItem* ea_calitem = EA_CALENDAR_ITEM (selection);
-	gint row, column, n_children;
-
-	atk_gobj = ATK_GOBJECT_ACCESSIBLE (ea_calitem);
-	g_obj = atk_gobject_accessible_get_object (atk_gobj);
-	if (!g_obj)
-		return FALSE;
-
-	calitem = E_CALENDAR_ITEM (g_obj);
-	n_children = atk_object_get_n_accessible_children (ATK_OBJECT (selection));
-	if (index < 0 || index >= n_children)
-		return FALSE;
-
-	row = index / EA_CALENDAR_COLUMN_NUM;
-	column = index % EA_CALENDAR_COLUMN_NUM;
-
-	return table_interface_is_selected (ATK_TABLE (selection), row, column);
-}
-
-/* callbacks */
-
-static void
-selection_preview_change_cb (ECalendarItem *calitem)
-{
-	AtkObject *atk_obj;
-	AtkObject *item_cell;
-
-	g_return_if_fail (E_IS_CALENDAR_ITEM (calitem));
-	atk_obj = atk_gobject_accessible_for_object (G_OBJECT (calitem));
-	ea_calendar_item_destory_cell_data (EA_CALENDAR_ITEM (atk_obj));
-
-	/* only deal with the first selected child, for now */
-	item_cell = atk_selection_ref_selection (ATK_SELECTION (atk_obj),
-						 0);
-
-	if (item_cell)
-		ea_calendar_set_focus_object (EA_CALENDAR_ITEM (atk_obj), item_cell);
-
-	g_signal_emit_by_name (atk_obj,
-			       "active-descendant-changed",
-			       item_cell);
-	g_signal_emit_by_name (atk_obj, "selection_changed");
-}
-
-static void
-date_range_changed_cb (ECalendarItem *calitem)
-{
-	AtkObject *atk_obj;
-	AtkObject *item_cell;
-
-	g_return_if_fail (E_IS_CALENDAR_ITEM (calitem));
-	atk_obj = atk_gobject_accessible_for_object (G_OBJECT (calitem));
-	ea_calendar_item_destory_cell_data (EA_CALENDAR_ITEM (atk_obj));
-
-	item_cell = atk_selection_ref_selection (ATK_SELECTION (atk_obj),
-							0);
-	if (item_cell)
-		ea_calendar_set_focus_object (EA_CALENDAR_ITEM (atk_obj), item_cell);
-
-	g_signal_emit_by_name (atk_obj, "model_changed");
-}
-
-/* helpers */
-
-static EaCellTable *
-ea_calendar_item_get_cell_data (EaCalendarItem *ea_calitem)
-{
-	AtkGObjectAccessible *atk_gobj;
-	GObject *g_obj;
-	ECalendarItem *calitem;
-	EaCellTable *cell_data;
-
-	g_return_val_if_fail (ea_calitem, NULL);
-
-	atk_gobj = ATK_GOBJECT_ACCESSIBLE (ea_calitem);
-	g_obj = atk_gobject_accessible_get_object (atk_gobj);
-	if (!g_obj)
-		return NULL;
-
-	calitem = E_CALENDAR_ITEM (g_obj);
-
-	cell_data = g_object_get_data (G_OBJECT(ea_calitem),
-				       "ea-calendar-cell-table");
-
-	if (!cell_data) {
-		gint n_cells = ea_calendar_item_get_n_children (ATK_OBJECT(ea_calitem));
-		cell_data = ea_cell_table_create (n_cells/EA_CALENDAR_COLUMN_NUM,
-						  EA_CALENDAR_COLUMN_NUM,
-						  FALSE);
-		g_object_set_data (G_OBJECT(ea_calitem),
-				   "ea-calendar-cell-table", cell_data);
-	}
-	return cell_data;
-}
-
-static void
-ea_calendar_item_destory_cell_data (EaCalendarItem *ea_calitem)
-{
-	EaCellTable *cell_data;
-
-	g_return_if_fail (ea_calitem);
-
-	cell_data = g_object_get_data (G_OBJECT(ea_calitem),
-				       "ea-calendar-cell-table");
-	if (cell_data) {
-		g_object_set_data (G_OBJECT(ea_calitem),
-				   "ea-calendar-cell-table", NULL);
-		ea_cell_table_destroy (cell_data);
-	}
-}
-
-static gboolean
-ea_calendar_item_get_row_label (EaCalendarItem *ea_calitem, gint row,
-				gchar *buffer, gint buffer_size)
-{
-	AtkGObjectAccessible *atk_gobj;
-	GObject *g_obj;
-	ECalendarItem *calitem;
-	gint index, week_num;
-	gint year, month, day;
-
-	g_return_val_if_fail (ea_calitem, FALSE);
-
-	atk_gobj = ATK_GOBJECT_ACCESSIBLE (ea_calitem);
-	g_obj = atk_gobject_accessible_get_object (atk_gobj);
-	if (!g_obj)
-		return FALSE;
-
-	calitem = E_CALENDAR_ITEM (g_obj);
-
-	index = atk_table_get_index_at (ATK_TABLE (ea_calitem), row, 0);
-	if (!e_calendar_item_get_date_for_offset (calitem, index,
-						  &year, &month, &day))
-		return FALSE;
-
-	week_num = e_calendar_item_get_week_number (calitem,
-						    day, month, year);
-
-	g_snprintf (buffer, buffer_size, "week number : %d", week_num);
-	return TRUE;
-}
-
-static gboolean
-ea_calendar_item_get_column_label (EaCalendarItem *ea_calitem, gint column,
-				   gchar *buffer, gint buffer_size)
-{
-	AtkGObjectAccessible *atk_gobj;
-	GObject *g_obj;
-	ECalendarItem *calitem;
-	gchar *week_char;
-	gint char_size;
-
-	g_return_val_if_fail (ea_calitem, FALSE);
-
-	atk_gobj = ATK_GOBJECT_ACCESSIBLE (ea_calitem);
-	g_obj = atk_gobject_accessible_get_object (atk_gobj);
-	if (!g_obj)
-		return FALSE;
-
-	calitem = E_CALENDAR_ITEM (g_obj);
-	week_char = g_utf8_offset_to_pointer (calitem->days, column);
-	char_size = strlen (calitem->days) -
-		strlen (g_utf8_find_next_char (calitem->days, NULL));
-
-	if (week_char && char_size < buffer_size) {
-		memcpy (buffer, week_char, char_size);
-		buffer[char_size] = '\0';
-		return TRUE;
-	}
-	return FALSE;
-}
-
-/* the coordinate the e-calendar canvas coord */
-gboolean
-e_calendar_item_get_day_extents (ECalendarItem *calitem,
-				 gint year, gint month, gint date,
-				 gint *x, gint *y,
-				 gint *width, gint *height)
-{
-	GnomeCanvasItem *item;
-	GtkWidget *widget;
-	GtkStyle *style;
-	PangoFontDescription *font_desc;
-	PangoContext *pango_context;
-	PangoFontMetrics *font_metrics;
-	gint char_height, xthickness, ythickness, text_y;
-	gint new_year, new_month, num_months, months_offset;
-	gint month_x, month_y, month_cell_x, month_cell_y;
-	gint month_row, month_col;
-	gint day_row, day_col;
-	gint days_from_week_start;
-
-	g_return_val_if_fail (E_IS_CALENDAR_ITEM (calitem), FALSE);
-
-	item = GNOME_CANVAS_ITEM (calitem);
-	widget = GTK_WIDGET (item->canvas);
-	style = widget->style;
-
-	/* Set up Pango prerequisites */
-	font_desc = calitem->font_desc;
-	if (!font_desc)
-		font_desc = style->font_desc;
-	pango_context = gtk_widget_get_pango_context (widget);
-	font_metrics = pango_context_get_metrics (pango_context, font_desc,
-						  pango_context_get_language (pango_context));
-
-	char_height =
-		PANGO_PIXELS (pango_font_metrics_get_ascent (font_metrics)) +
-		PANGO_PIXELS (pango_font_metrics_get_descent (font_metrics));
-
-	xthickness = style->xthickness;
-	ythickness = style->ythickness;
-
-	new_year = year;
-	new_month = month;
-	e_calendar_item_normalize_date	(calitem, &new_year, &new_month);
-	num_months = calitem->rows * calitem->cols;
-	months_offset = (new_year - calitem->year) * 12
-		+ new_month - calitem->month;
-
-	if (months_offset > num_months || months_offset < 0)
-		return FALSE;
-
-	month_row = months_offset / calitem->cols;
-	month_col = months_offset % calitem->cols;
-
-	month_x = item->x1 + xthickness + calitem->x_offset
-		+ month_col * calitem->month_width;
-	month_y = item->y1 + ythickness + month_row * calitem->month_height;
-
-	month_cell_x = month_x + E_CALENDAR_ITEM_XPAD_BEFORE_WEEK_NUMBERS
- 		+ calitem->month_lpad + E_CALENDAR_ITEM_XPAD_BEFORE_CELLS;
-	text_y = month_y + ythickness * 2
-		+ E_CALENDAR_ITEM_YPAD_ABOVE_MONTH_NAME
-		+ char_height + E_CALENDAR_ITEM_YPAD_BELOW_MONTH_NAME
-		+ E_CALENDAR_ITEM_YPAD_ABOVE_DAY_LETTERS + calitem->month_tpad;
-
-	month_cell_y = text_y + char_height
-		+ E_CALENDAR_ITEM_YPAD_BELOW_DAY_LETTERS + 1
-		+ E_CALENDAR_ITEM_YPAD_ABOVE_CELLS;
-
-	days_from_week_start =
-		e_calendar_item_get_n_days_from_week_start (calitem, new_year,
-							    new_month);
-	day_row = (date + days_from_week_start - 1) / EA_CALENDAR_COLUMN_NUM;
-	day_col = (date + days_from_week_start - 1) % EA_CALENDAR_COLUMN_NUM;
-
-	*x = month_cell_x + day_col * calitem->cell_width;
-	*y = month_cell_y + day_row * calitem->cell_height;
-	*width = calitem->cell_width;
-	*height = calitem->cell_height;
-
-	return TRUE;
-}
-
-/* month is from 0 to 11 */
-gboolean
-e_calendar_item_get_date_for_offset (ECalendarItem *calitem, gint day_offset,
-				     gint *year, gint *month, gint *day)
-{
-	gint start_year, start_month, start_day;
-	gint end_year, end_month, end_day;
-	GDate *start_date;
-
-	g_return_val_if_fail (E_IS_CALENDAR_ITEM (calitem), FALSE);
-
-	if (!e_calendar_item_get_date_range (calitem, &start_year,
-					     &start_month, &start_day,
-					     &end_year, &end_month,
-					     &end_day))
-		return FALSE;
-
-	start_date = g_date_new_dmy (start_day, start_month + 1, start_year);
-
-	g_date_add_days (start_date, day_offset);
-
-	*year = g_date_get_year (start_date);
-	*month = g_date_get_month (start_date) - 1;
-	*day = g_date_get_day (start_date);
-
-	return TRUE;
-}
-
-/* the arg month is from 0 to 11 */
-static gboolean
-e_calendar_item_get_offset_for_date (ECalendarItem *calitem,
-				     gint year, gint month, gint day,
-				     gint *offset)
-{
-	gint start_year, start_month, start_day;
-	gint end_year, end_month, end_day;
-	GDate *start_date, *end_date;
-
-	*offset = 0;
-	g_return_val_if_fail (E_IS_CALENDAR_ITEM (calitem), FALSE);
-
-	if (!e_calendar_item_get_date_range (calitem, &start_year,
-					     &start_month, &start_day,
-					     &end_year, &end_month,
-					     &end_day))
-		return FALSE;
-
-	start_date = g_date_new_dmy (start_day, start_month + 1, start_year);
-	end_date = g_date_new_dmy (day, month + 1, year);
-
-	*offset = g_date_days_between (start_date, end_date);
-	g_free (start_date);
-	g_free (end_date);
-
-	return TRUE;
-}
-
-gint
-e_calendar_item_get_n_days_from_week_start (ECalendarItem *calitem,
-					    gint year, gint month)
-{
-	struct tm tmp_tm;
-	gint start_weekday, days_from_week_start;
-
-	memset (&tmp_tm, 0, sizeof (tmp_tm));
-	tmp_tm.tm_year = year - 1900;
-	tmp_tm.tm_mon = month;
-	tmp_tm.tm_mday = 1;
-	tmp_tm.tm_isdst = -1;
-	mktime (&tmp_tm);
-	start_weekday = (tmp_tm.tm_wday + 6) % 7;   /* 0 to 6 */
-	days_from_week_start = (start_weekday + 7 - calitem->week_start_day)
-		% 7;
-	return days_from_week_start;
-}
-
-static void
-ea_calendar_set_focus_object (EaCalendarItem *ea_calitem, AtkObject *item_cell)
-{
-	AtkStateSet *state_set, *old_state_set;
-	AtkObject *old_cell;
-
-	old_cell = (AtkObject *)g_object_get_data (G_OBJECT(ea_calitem), "gail-focus-object");
-	if (old_cell && EA_IS_CALENDAR_CELL (old_cell)) {
-		old_state_set = atk_object_ref_state_set (old_cell);
-		atk_state_set_remove_state (old_state_set, ATK_STATE_FOCUSED);
-		g_object_unref (old_state_set);
-	}
-	if (old_cell)
-		g_object_unref (old_cell);
-
-	state_set = atk_object_ref_state_set (item_cell);
-	atk_state_set_add_state (state_set, ATK_STATE_FOCUSED);
-	g_object_set_data (G_OBJECT(ea_calitem), "gail-focus-object", item_cell);
-	g_object_unref (state_set);
-}
diff --git a/a11y/widgets/ea-calendar-item.h b/a11y/widgets/ea-calendar-item.h
deleted file mode 100644
index 5ba0c2b274..0000000000
--- a/a11y/widgets/ea-calendar-item.h
+++ /dev/null
@@ -1,75 +0,0 @@
-/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-/* vim:expandtab:shiftwidth=8:tabstop=8:
- */
-/* Evolution Accessibility: ea-calendar-item.h
- *
- * Copyright (C) 2003 Ximian, Inc.
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of version 2 of the GNU General Public
- * License as published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * General Public License for more details.
- *
- * You should have received a copy of the GNU General Public
- * License along with this program; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
- *
- * Author: Bolian Yin <bolian.yin@sun.com> Sun Microsystem Inc., 2003
- *
- */
-
-#ifndef __EA_CALENDAR_ITEM_H__
-#define __EA_CALENDAR_ITEM_H__
-
-#include <atk/atkgobjectaccessible.h>
-#include <misc/e-calendar-item.h>
-
-#ifdef __cplusplus
-extern "C" {
-#endif /* __cplusplus */
-
-#define EA_TYPE_CALENDAR_ITEM                   (ea_calendar_item_get_type ())
-#define EA_CALENDAR_ITEM(obj)                   (G_TYPE_CHECK_INSTANCE_CAST ((obj), EA_TYPE_CALENDAR_ITEM, EaCalendarItem))
-#define EA_CALENDAR_ITEM_CLASS(klass)           (G_TYPE_CHECK_CLASS_CAST ((klass), EA_TYPE_CALENDAR_ITEM, EaCalendarItemClass))
-#define EA_IS_CALENDAR_ITEM(obj)                (G_TYPE_CHECK_INSTANCE_TYPE ((obj), EA_TYPE_CALENDAR_ITEM))
-#define EA_IS_CALENDAR_ITEM_CLASS(klass)        (G_TYPE_CHECK_CLASS_TYPE ((klass), EA_TYPE_CALENDAR_ITEM))
-#define EA_CALENDAR_ITEM_GET_CLASS(obj)         (G_TYPE_INSTANCE_GET_CLASS ((obj), EA_TYPE_CALENDAR_ITEM, EaCalendarItemClass))
-
-typedef struct _EaCalendarItem                   EaCalendarItem;
-typedef struct _EaCalendarItemClass              EaCalendarItemClass;
-
-struct _EaCalendarItem
-{
-	AtkGObjectAccessible parent;
-};
-
-GType ea_calendar_item_get_type (void);
-
-struct _EaCalendarItemClass
-{
-	AtkGObjectAccessibleClass parent_class;
-};
-
-AtkObject *ea_calendar_item_new (GObject *obj);
-gboolean e_calendar_item_get_day_extents (ECalendarItem *calitem,
-					  gint year, gint month, gint date,
-					  gint *x, gint *y,
-					  gint *width, gint *height);
-gboolean e_calendar_item_get_date_for_offset (ECalendarItem *calitem,
-					      gint day_offset,
-					      gint *year, gint *month,
-					      gint *day);
-gint e_calendar_item_get_n_days_from_week_start (ECalendarItem *calitem,
-						 gint year, gint month);
-
-#ifdef __cplusplus
-}
-#endif /* __cplusplus */
-
-
-#endif /* __EA_CALENDAR_ITEM_H__ */
diff --git a/a11y/widgets/ea-combo-button.c b/a11y/widgets/ea-combo-button.c
deleted file mode 100644
index aad60c3023..0000000000
--- a/a11y/widgets/ea-combo-button.c
+++ /dev/null
@@ -1,170 +0,0 @@
-/*
- * Authors: Harry Lu  <harry.lu@sun.com>
- *
- * Copyright (C) 2004 Ximian, Inc.
- */
-
-#include <config.h>
-#include "ea-combo-button.h"
-#include <gtk/gtkbutton.h>
-#include <gtk/gtklabel.h>
-#include <glib/gi18n.h>
-
-static AtkObjectClass *parent_class;
-static GType parent_type;
-
-/*Action IDs */
-enum {
-	ACTIVATE_DEFAULT,
-	POPUP_MENU,	
-	LAST_ACTION
-};
-
-/* Static functions */
-static G_CONST_RETURN gchar*
-ea_combo_button_get_name (AtkObject *a11y)
-{
-	GtkWidget *widget;
-	GtkWidget *label;
-	EComboButton *button;
-
-	widget = GTK_ACCESSIBLE (a11y)->widget;
-	if (!widget)
-		return NULL;
-
-	button = E_COMBO_BUTTON (widget);
-	label = e_combo_button_get_label (button);
-	if (label)
-		return gtk_label_get_text (GTK_LABEL (label));
-
-	return _("Combo Button");
-}
-
-/* Action interface */
-static G_CONST_RETURN gchar *
-ea_combo_button_action_get_name (AtkAction *action, gint i)
-{
-	switch (i)
-	{
-		case ACTIVATE_DEFAULT:
-			return _("Activate Default");
-		case POPUP_MENU:
-			return _("Popup Menu");
-		default:
-			return NULL;
-	}
-}
-
-static gboolean
-ea_combo_button_do_action (AtkAction *action,
-                       gint      i)
-{
-	GtkWidget *widget;
-	EComboButton *button;
-
-	widget = GTK_ACCESSIBLE (action)->widget;
-	if (!widget || !GTK_WIDGET_IS_SENSITIVE (widget) || !GTK_WIDGET_VISIBLE (widget))
-		return FALSE;
-
-	button = E_COMBO_BUTTON (widget);
-
-	switch (i)
-	{
-		case ACTIVATE_DEFAULT:
-			g_signal_emit_by_name (button, "activate_default");
-			return TRUE;
-		case POPUP_MENU:
-			return e_combo_button_popup_menu (button);
-		default:
-			return FALSE;
-	}
-}
-
-static gint
-ea_combo_button_get_n_actions (AtkAction *action)
-{
-  return LAST_ACTION;
-}
-
-static void
-atk_action_interface_init (AtkActionIface *iface)
-{
-	g_return_if_fail (iface != NULL);	
-
-	iface->do_action = ea_combo_button_do_action;
-	iface->get_n_actions = ea_combo_button_get_n_actions;
-	iface->get_name = ea_combo_button_action_get_name;
-}
-
-static void
-ea_combo_button_class_init (EaComboButtonClass *klass)
-{
-	AtkObjectClass *atk_object_class = ATK_OBJECT_CLASS (klass);
-
-	parent_class  = g_type_class_ref (parent_type);
-
-	atk_object_class->get_name = ea_combo_button_get_name;
-}
-
-static void
-ea_combo_button_init (EaComboButton *a11y)
-{
-	/* Empty for now */
-}
-
-GType
-ea_combo_button_get_type (void)
-{
-	static GType type = 0;
-
-	if (!type) {
-		AtkObjectFactory *factory;
-		GTypeQuery query;
-
-		GTypeInfo info = {
-			sizeof (EaComboButtonClass),
-			(GBaseInitFunc) NULL,
-			(GBaseFinalizeFunc) NULL,
-			(GClassInitFunc) ea_combo_button_class_init,
-			(GClassFinalizeFunc) NULL,
-			NULL, /* class_data */
-			sizeof (EaComboButton),
-			0,
-			(GInstanceInitFunc) ea_combo_button_init,
-			NULL /* value_tree */
-		};
-
-		static const GInterfaceInfo atk_action_info = {
-			(GInterfaceInitFunc) atk_action_interface_init,
-			(GInterfaceFinalizeFunc) NULL,
-			NULL
-		};
-
-		factory = atk_registry_get_factory (atk_get_default_registry (), GTK_TYPE_BUTTON);
-		parent_type = atk_object_factory_get_accessible_type (factory);
-		g_type_query (parent_type, &query);
-
-		info.class_size = query.class_size;
-		info.instance_size = query.instance_size;
-
-		type = g_type_register_static (parent_type, "EaComboButton", &info, 0);
-		g_type_add_interface_static (type, ATK_TYPE_ACTION,
-					     &atk_action_info);
-
-	}
-
-	return type;
-}
-
-AtkObject *
-ea_combo_button_new (GtkWidget *widget)
-{
-	EaComboButton *a11y;
-
-	a11y = g_object_new (ea_combo_button_get_type (), NULL);
-
-	GTK_ACCESSIBLE (a11y)->widget = GTK_WIDGET (widget);
-	ATK_OBJECT (a11y)->role = ATK_ROLE_PUSH_BUTTON;
-
-	return ATK_OBJECT (a11y);
-}
diff --git a/a11y/widgets/ea-combo-button.h b/a11y/widgets/ea-combo-button.h
deleted file mode 100644
index 8f4c279cba..0000000000
--- a/a11y/widgets/ea-combo-button.h
+++ /dev/null
@@ -1,35 +0,0 @@
-/*
- * Authors: Harry Lu  <harry.lu@sun.com>
- *
- * Copyright (C) 2004 Ximian, Inc.
- */
-
-#ifndef __EA_COMBO_BUTTON_H_
-#define __EA_COMBO_BUTTON_H_
-
-#include <gtk/gtkaccessible.h>
-#include <misc/e-combo-button.h>
-
-#define EA_TYPE_COMBO_BUTTON			(ea_combo_button_get_type ())
-#define EA_COMBO_BUTTON(obj)			(G_TYPE_CHECK_INSTANCE_CAST ((obj), EA_TYPE_COMBO_BUTTON, EaComboButton))
-#define EA_COMBO_BUTTON_CLASS(klass)		(G_TYPE_CHECK_CLASS_CAST ((klass), EA_TYPE_COMBO_BUTTON, EaComboButtonClass))
-#define EA_IS_COMBO_BUTTON(obj)			(G_TYPE_CHECK_INSTANCE_TYPE ((obj), EA_TYPE_COMBO_BUTTON))
-#define EA_IS_COMBO_BUTTON_CLASS(klass)		(G_TYPE_CHECK_CLASS_TYPE ((klass), EA_TYPE_COMBO_BUTTON))
-
-typedef struct _EaComboButton EaComboButton;
-typedef struct _EaComboButtonClass EaComboButtonClass;
-
-struct _EaComboButton {
-	GtkAccessible object;
-};
-
-struct _EaComboButtonClass {
-	GtkAccessibleClass parent_class;
-};
-
-
-/* Standard Glib function */
-GType      ea_combo_button_get_type  (void);
-AtkObject *ea_combo_button_new       (GtkWidget *combo_button);
-
-#endif /* ! __EA_COMBO_BUTTON_H_ */
diff --git a/a11y/widgets/ea-widgets.c b/a11y/widgets/ea-widgets.c
deleted file mode 100644
index feef6d1ef3..0000000000
--- a/a11y/widgets/ea-widgets.c
+++ /dev/null
@@ -1,42 +0,0 @@
-/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-/* vim:expandtab:shiftwidth=8:tabstop=8:
- */
-/* Evolution Accessibility: ea-widgets.c
- *
- * Copyright (C) 2003 Ximian, Inc.
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of version 2 of the GNU General Public
- * License as published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * General Public License for more details.
- *
- * You should have received a copy of the GNU General Public
- * License along with this program; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
- *
- * Author: Bolian Yin <bolian.yin@sun.com> Sun Microsystem Inc., 2003
- *
- */
-
-#include "ea-factory.h"
-#include "widgets/ea-calendar-item.h"
-#include "widgets/ea-combo-button.h"
-#include "ea-widgets.h"
-
-EA_FACTORY_GOBJECT (EA_TYPE_CALENDAR_ITEM, ea_calendar_item, ea_calendar_item_new);
-EA_FACTORY (EA_TYPE_COMBO_BUTTON, ea_combo_button, ea_combo_button_new);
-
-void e_calendar_item_a11y_init (void)
-{
-    EA_SET_FACTORY (e_calendar_item_get_type (), ea_calendar_item);
-}
-
-void e_combo_button_a11y_init (void)
-{
-    EA_SET_FACTORY (e_combo_button_get_type (), ea_combo_button);
-}
diff --git a/a11y/widgets/ea-widgets.h b/a11y/widgets/ea-widgets.h
deleted file mode 100644
index fc8e7f1b90..0000000000
--- a/a11y/widgets/ea-widgets.h
+++ /dev/null
@@ -1,35 +0,0 @@
-/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-/* vim:expandtab:shiftwidth=8:tabstop=8:
- */
-/* Evolution Accessibility: ea-widgets.h
- *
- * Copyright (C) 2003 Ximian, Inc.
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of version 2 of the GNU General Public
- * License as published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * General Public License for more details.
- *
- * You should have received a copy of the GNU General Public
- * License along with this program; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
- *
- * Author: Bolian Yin <bolian.yin@sun.com> Sun Microsystem Inc., 2003
- *
- */
-
-/* Evolution Accessibility
-*/
-
-#ifndef _EA_WIDGETS_H__
-#define _EA_WIDGETS_H__
-
-void e_calendar_item_a11y_init (void);
-void e_combo_button_a11y_init (void);
-
-#endif /* _EA_WIDGETS_H__ */
diff --git a/acinclude.m4 b/acinclude.m4
deleted file mode 100644
index d3f83734d4..0000000000
--- a/acinclude.m4
+++ /dev/null
@@ -1,182 +0,0 @@
-# evolution/acinclude.m4
-# shared configure.in hacks between Evolution and Connector
-
-
-# EVO_PURIFY_SUPPORT
-# Add --enable-purify. If the user turns it on, subst PURIFY and set
-# the automake conditional ENABLE_PURIFY
-AC_DEFUN([EVO_PURIFY_SUPPORT], [
-	AC_ARG_ENABLE(purify, 
-	[  --enable-purify=[no/yes]      Enable support for building executables with Purify.],,enable_purify=no)
-	AC_PATH_PROG(PURIFY, purify, impure)
-	AC_ARG_WITH(purify-options, [  --with-purify-options=OPTIONS      Options passed to the purify command line (defaults to PURIFYOPTIONS variable).])
-	if test "x$with_purify_options" = "xno"; then
-		with_purify_options="-always-use-cache-dir=yes -cache-dir=/gnome/lib/purify"
-	fi
-	if test "x$PURIFYOPTIONS" = "x"; then
-		PURIFYOPTIONS=$with_purify_options
-	fi
-	AC_SUBST(PURIFY)
-	AM_CONDITIONAL(ENABLE_PURIFY, test "x$enable_purify" = "xyes" -a "x$PURIFY" != "ximpure")
-	PURIFY="$PURIFY $PURIFYOPTIONS"
-])
-
-
-# EVO_LDAP_CHECK(default)
-# Add --with-openldap and --with-static-ldap options. --with-openldap
-# defaults to the given value if not specified. If LDAP support is
-# configured, HAVE_LDAP will be defined and the automake conditional
-# ENABLE_LDAP will be set. LDAP_CFLAGS and LDAP_LIBS will be set
-# appropriately.
-AC_DEFUN([EVO_LDAP_CHECK], [
-	default="$1"
-
-	AC_ARG_WITH(openldap,     [  --with-openldap=[no/yes/PREFIX]      Enable LDAP support in evolution])
-	AC_ARG_WITH(static-ldap,  [  --with-static-ldap=[no/yes]          Link LDAP support statically into evolution ])
-	AC_CACHE_CHECK([for OpenLDAP], ac_cv_with_openldap, ac_cv_with_openldap="${with_openldap:=$default}")
-	case $ac_cv_with_openldap in
-	no|"")
-		with_openldap=no
-		;;
-	yes)
-		with_openldap=/usr
-		;;
-	*)
-		with_openldap=$ac_cv_with_openldap
-		LDAP_CFLAGS="-I$ac_cv_with_openldap/include"
-		LDAP_LDFLAGS="-L$ac_cv_with_openldap/lib"
-		;;
-	esac
-
-	if test "$with_openldap" != no; then
-		AC_DEFINE(HAVE_LDAP,1,[Define if you have LDAP support])
-
-		case $with_static_ldap in
-		no|"")
-			with_static_ldap=no
-			;;
-		*)
-			with_static_ldap=yes
-			;;
-		esac
-
-		AC_CACHE_CHECK(if OpenLDAP is version 2.x, ac_cv_openldap_version2, [
-			CPPFLAGS_save="$CPPFLAGS"
-			CPPFLAGS="$CPPFLAGS $LDAP_CFLAGS"
-			AC_EGREP_CPP(yes, [
-				#include "ldap.h"
-				#if LDAP_VENDOR_VERSION > 20000
-				yes
-				#endif
-			], ac_cv_openldap_version2=yes, ac_cv_openldap_version2=no)
-			CPPFLAGS="$CPPFLAGS_save"
-		])
-		if test "$ac_cv_openldap_version2" = no; then
-			AC_MSG_ERROR(evolution requires OpenLDAP version >= 2)
-		fi
-
-		AC_CHECK_LIB(resolv, res_query, LDAP_LIBS="-lresolv")
-		AC_CHECK_LIB(socket, bind, LDAP_LIBS="$LDAP_LIBS -lsocket")
-		AC_CHECK_LIB(nsl, gethostbyaddr, LDAP_LIBS="$LDAP_LIBS -lnsl")
-		AC_CHECK_LIB(lber, ber_get_tag, [
-			if test "$with_static_ldap" = "yes"; then
-				LDAP_LIBS="$with_openldap/lib/liblber.a $LDAP_LIBS"
-
-				# libldap might depend on OpenSSL... We need to pull
-				# in the dependency libs explicitly here since we're
-				# not using libtool for the configure test.
-				if test -f $with_openldap/lib/libldap.la; then
-					LDAP_LIBS="`. $with_openldap/lib/libldap.la; echo $dependency_libs` $LDAP_LIBS"
-				fi
-			else
-				LDAP_LIBS="-llber $LDAP_LIBS"
-			fi
-			AC_CHECK_LIB(ldap, ldap_open, [
-					if test $with_static_ldap = "yes"; then
-						LDAP_LIBS="$with_openldap/lib/libldap.a $LDAP_LIBS"
-					else
-						LDAP_LIBS="-lldap $LDAP_LIBS"
-					fi],
-				LDAP_LIBS="", $LDAP_LDFLAGS $LDAP_LIBS)
-			LDAP_LIBS="$LDAP_LDFLAGS $LDAP_LIBS"
-		], LDAP_LIBS="", $LDAP_LDFLAGS $LDAP_LIBS)
-
-		if test -z "$LDAP_LIBS"; then
-			AC_MSG_ERROR(could not find OpenLDAP libraries)
-		fi
-
-		AC_SUBST(LDAP_CFLAGS)
-		AC_SUBST(LDAP_LIBS)
-	fi
-	AM_CONDITIONAL(ENABLE_LDAP, test $with_openldap != no)
-])
-
-
-# EVO_PTHREAD_CHECK
-AC_DEFUN([EVO_PTHREAD_CHECK],[
-	PTHREAD_LIB=""
-	AC_CHECK_LIB(pthread, pthread_create, PTHREAD_LIB="-lpthread",
-		[AC_CHECK_LIB(pthreads, pthread_create, PTHREAD_LIB="-lpthreads",
-		    [AC_CHECK_LIB(c_r, pthread_create, PTHREAD_LIB="-lc_r",
-			[AC_CHECK_LIB(pthread, __pthread_attr_init_system, PTHREAD_LIB="-lpthread",
-				[AC_CHECK_FUNC(pthread_create)]
-			)]
-		    )]
-		)]
-	)
-	AC_SUBST(PTHREAD_LIB)
-	AC_PROVIDE([EVO_PTHREAD_CHECK])
-])
-dnl -*- mode: autoconf -*-
-
-# serial 1
-
-dnl Usage:
-dnl   GTK_DOC_CHECK([minimum-gtk-doc-version])
-AC_DEFUN([GTK_DOC_CHECK],
-[
-  AC_BEFORE([AC_PROG_LIBTOOL],[$0])dnl setup libtool first
-  AC_BEFORE([AM_PROG_LIBTOOL],[$0])dnl setup libtool first
-  dnl for overriding the documentation installation directory
-  AC_ARG_WITH(html-dir,
-    AC_HELP_STRING([--with-html-dir=PATH], [path to installed docs]),,
-    [with_html_dir='${datadir}/gtk-doc/html'])
-  HTML_DIR="$with_html_dir"
-  AC_SUBST(HTML_DIR)
-
-  dnl enable/disable documentation building
-  AC_ARG_ENABLE(gtk-doc,
-    AC_HELP_STRING([--enable-gtk-doc],
-                   [use gtk-doc to build documentation [default=no]]),,
-    enable_gtk_doc=no)
-
-  have_gtk_doc=no
-  if test -z "$PKG_CONFIG"; then
-    AC_PATH_PROG(PKG_CONFIG, pkg-config, no)
-  fi
-  if test "$PKG_CONFIG" != "no" && $PKG_CONFIG --exists gtk-doc; then
-    have_gtk_doc=yes
-  fi
-
-  dnl do we want to do a version check?
-ifelse([$1],[],,
-  [gtk_doc_min_version=$1
-  if test "$have_gtk_doc" = yes; then
-    AC_MSG_CHECKING([gtk-doc version >= $gtk_doc_min_version])
-    if $PKG_CONFIG --atleast-version $gtk_doc_min_version gtk-doc; then
-      AC_MSG_RESULT(yes)
-    else
-      AC_MSG_RESULT(no)
-      have_gtk_doc=no
-    fi
-  fi
-])
-  if test x$enable_gtk_doc = xyes; then
-    if test "$have_gtk_doc" != yes; then
-      enable_gtk_doc=no
-    fi
-  fi
-
-  AM_CONDITIONAL(ENABLE_GTK_DOC, test x$enable_gtk_doc = xyes)
-  AM_CONDITIONAL(GTK_DOC_USE_LIBTOOL, test -n "$LIBTOOL")
-])
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 586d7a50b2..0000000000
--- a/addressbook/ChangeLog
+++ /dev/null
@@ -1,7496 +0,0 @@
-2005-03-16  Li Yuan  <li.yuan@sun.com>
-
-	* gui/widgets/gal-view-minicard.c: (gal_view_minicard_class_init):
-	remove the edit function.
-
-	Fixes #40762
-
-2005-03-16  Mengjie Yu  <meng-jie.yu@sun.com>
-
-	* gui/widgets/e-addressbook-view.c: (search_menu_activated):
-	make the search field consistent with the Search Dialog.
-
-	Fixes #73270
-
-
-2005-03-03   Sivaiah Nallagatla <snallagatla@novell.com>
-
-	* gui/component/addressbook.c (load_source_auth_cb):
-	Make sure LoadSourceData has call back installed
-	before calling it. cb is NULL when called from 
-	auth_required_cb 
-	Fixes #73206 
-	
-2005-02-26   Sivaiah Nallagatla <snallagatla@novell.com>
-
-	* gui/widgets/e-addressbook-view.c :
-	Change the e-popup item type for "Cut"
-	from E_POPUP_BAR to E_POPUP_ITEM
-	
-	Fixes #73013
-
-2005-02-25   Sivaiah Nallagatla <snallagatla@novell.com>
-
-	* gui/conact-editor/eab-editor.c 
-	(eab_editor_prompt_to_save_changes) : Just close 
-	the editor when user presees cancel or closes the editor
-	when there are no changes. Seems to be broken 
-	by earlier Change for #70371
-
-	Fixes #73005
-	 
-
-2005-02-24  Sushma Rai  <rsushma@novell.com>
-
-	* gui/component/addressbook-config.c (addressbook_config_edit_source):
-	Removed the hack, setting absolute URI to NULL. Fixes #72715
-
-2005-02-23  Hans Petter Jansson  <hpj@novell.com>
-
-	* gui/component/addressbook-view.c:
-	* gui/component/addressbook.c: Include
-	<libedataserverui/e-passwords.h>.
-
-2005-02-19  Sivaiah Nallagatla <snallagatla@novell.com>
-
-       * gui/contact-editor/eab-editor.c
-       (eab_editor_prompt_to_save_changes) : close
-       the editor here in case of save and discard
-       so that callers need not worry about closing
-
-       * gui/contact-list-editor/e-contact-list-editor.c
-       (closed_cb) (app_delete_event_cb) : don't close
-       the editor here as that is handled by _save_changes
-       call. Also no need to check for return value of that
-       function as it does not matter here.
-
-       Fixes #70371
-
-2005-02-19  Sivaiah Nallagatla <snallagatla@novell.com>
-
-	* gui/component/addressbook-component.c 
-	(ensure_sources) : update the base uri 
-	of the "On This Computer" group when user home dir 
-	changes. Also unref personal source if created here.
-
-	Fixes #67724  
-	
-2005-02-09  Sivaiah Nallagatla <snallagatla@novell.com>
-                                                                                
-        * gui/component/addressbook-config.c
-        (eabc_details_limit) : connect to "value_changed"
-        signal of spin button instead of "changed"
-                                                                                
-        Fixes #72369
-
-2005-02-09  Hans Petter Jansson  <hpj@novell.com>
-
-	* gui/contact-editor/Makefile.am:
-	* gui/contact-list-editor/Makefile.am:
-	* util/Makefile.am: Install shared libraries to privlibdir.
-
-2005-02-08  Christophe Fergeau <teuf@users.sourceforge.net>
-
-	* importers/evolution-vcard-importer.c (has_bom)
-	(fix_utf16_endianness) (utf16_to_utf8) 
-	guess_vcard_encoding) : New functions which peeks at 
-	the conents of the file and guesses the encoding and 
-	to convert UTF-16 strings to UTF-8.
-	(load_file_fn) : check the encoding of the file
-	and convert UTF-16 and locale encoding to UTF-8
-
-	Fixes #54825 
-
-2005-02-07  JP Rosevear  <jpr@novell.com>
-
-	* gui/component/apps_evolution_addressbook.schemas.in.in: clean up
-	descriptions
-
-2005-01-06  Sivaiah Nallagatla <snallagatla@novell.com>
-
-	* e-minicard.c (remodel) : changed the loop
-	termination check to E_CONACT_LAST_SIMPLE_STRING -1
-	so that we will avoid displaying revision field
-	value in the minicard 
-
-2005-01-04 vivek jain <jvivek@novell.com>
-	
-	* gui/component/addressbook.c (load_source_auth_cb):
-	display a warning dialog if the server version is not proper
-
-	* addressbook-errors.xml: added warning message for
-	 invalid server version
-
-2004-02-02  Hans Petter Jansson  <hpj@ximian.com>
-
-       * gui/component/addressbook-component.c (ensure_sources): Implement
-       based on the create_groups () function in addressbook-migrate.c.
-       (addressbook_component_init): Call ensure_sources (). This will create
-       the necessary addressbook source groups if they somehow disappeared
-       from GConf.
-
-       * gui/component/addressbook-config.c (addressbook_config_edit_source):
-       If we can't get any source groups, just issue a console warning and
-       return NULL. Creating sources without groups is meaningless.
-	Work around for #67411
-
-2005-02-02  Rodney Dawes  <dobey@novell.com>
-
-	* gui/component/ldap-config.glade: Fix a small spacing issue in the
-	Display section's children, to be HIG compliant
-
-2005-01-31  Hans Petter Jansson  <hpj@novell.com>
-
-	* gui/widgets/eab-config.c (_EABConfigPrivate): Use guint instead of
-	ulong for signal ID.
-
-2004-01-29 Parthasarathi Susarla <sparthasarathi@novell.com>
-	
-	* addressbook/gui/contact-list-editor/e-contact-list-editor.c
-	 (save_contact) : call the eab_merging_* functions instead of
-	 e_book_sync* directly. The merging function check for duplication. 
-	 The following functions have been called:
-	 1. eab_merging_book_add_contact for adding a new entry
-	 2. eab_merging_book_commit_contact for commiting a modified entry
-	
-	 Fixes bug #57819
-
-2005-01-29  Sivaiah Nallagatla <snallagatla@novell.com>
-
-	* gui/contact-editor/e-contact-editor.c 
-	(sensitize_im_types) : new function to sensitize
-	im types based on supported fields
-	
-	(sensitize_im_record) : call sensitize_im_types
-	for each record 
-	(sensitize_im) : if none of the im types 
-	are supported disable the im entries 
-	Fixes #68799
-
-2005-01-28  Sivaiah Nallagatla <snallagatla@novell.com>
-
-	* gui/widgets/eab-vcard-control.c (pstream_load) :
-	Changed a string to make it complete and clear
-	for transaltion 
-	Fixes #61067 
-
-2005-01-26  Sivaiah Nallagatla <snallagatla@novell.com>
-                                                                                                                             
-        * gui/component/addressbook.c (addressbook_authenticate) :
-        Remove leading "%s" from the transalatable string
-        Fixes #36137
-
-2005-01-26  Sivaiah Nallagatla <snallagatla@novell.com>
-
-       * util/eab-book-util.c (strstrcase) :
-       case insesitive version of strstr. Used
-       from camel
-
-       (eab_contact_list_from_string) : do case in sensitive
-       search for "BEGIN:VCARD" and "END:VCARD" to
-       take care of broken vcards
-
-       Fixes #70339
-
-
-2005-01-26 Hao Sheng  <hao.sheng@sun.com>
-
-	* gui/contact-list-editor/e-contact-list-editor.c:
-	(setup_name_selector): add access key to 'Member' Button.
-
-2005-01-25  Rodrigo Moya <rodrigo@novell.com>
-
-	* gui/contact-editor/e-contact-editor.c (categories_clicked): use the
-	new ECategoriesDialog widget.
-
-2005-01-21  JP Rosevear  <jpr@novell.com>
-
-	Fixes #70622
-	
-	* gui/widgets/eab-contact-display.c (eab_contact_display_init):
-	construct the html widget
-
-2005-01-21 Sivaiah Nallagatla <snallagatla@novell.com>
-
-       * gui/widgets/e-addressbook-model.[ch]
-       (eab_model_class_init) : renamed the signal
-       CONTACT_REMOVED to CONTACTS_REMOVED and chaned
-       the param type POINTER from INT
-       (remove_contact) : delete all the contacts
-       from the model and emit CONATCTS_REMOVED
-       signal instead of emitting it many times
-
-       * gui/widgets/e-addressbook-reflow-adpater.c
-       (e_addressbook_reflow_adapter_construct)
-       (remove_contacts) : renamed remove_contact to remove_contacts
-       and when number of conacts is more than 1 use _model_changed
-       instead of _remove_item
-
-       * gui/widgets/e-addressbook-table-adapter.c
-       (eab_table_adapter_construct)
-       (remove_contacts) : ditto
-
-       * gui/widgets/e-addressbook-view.c
-       (eab_view_new) :
-       (contacts_removed) : renamed contact_removed
-       to contacts_removed and traverese over indices
-       to find displayed contact indiex
-
-       fixes #71448
-
-2005-01-21  Rodney Dawes  <dobey@novell.com>
-
-	* gui/contact-editor/e-contact-quick-add.c (build_quick_add_dialog):
-	Change the xpad and ypad to 0 here, we don't need the extra padding
-	Add the GTK_DIALOG_NO_SEPARATOR flag for creating the dialog
-	Set proper border widths on some dialog containers for the HIG
-	Set the row/column spacings for the table widget
-	Create the labels outside of the table packing calls and set the proper
-	alignment for them to be HIG compliant
-	Set the border width of the table widget to 12 for HIG compliance
-	
-	* gui/widgets/eab-popup-control.c (edit_contact_info_cb): Removed
-	(eab_popup_control_display_contact): Just go ahead and open the
-	editor, no need to have an intermittent window with a button for it
-	(add_contacts_cb): Remove this as we don't need it any more
-	(eab_popup_control_no_matches): Just go straight to the quick-add
-	dialog, and don't pop up an intermittent window with a button
-
-	Fixes #41210 #60852 
-
-2005-01-21  Rodney Dawes  <dobey@novell.com>
-
-	* gui/contact-editor/e-contact-editor.c (e_contact_editor_init):
-	Call gtk_widget_ensure_style to ensure that we set the border widths
-	of some dialog containers properly for HIG compliance
-
-2005-01-21  Rodney Dawes  <dobey@novell.com>
-
-	* gui/merging/eab-contact-duplicate-detected.glade:
-	Fix some spacing and remove the separator for HIG compliance
-	* gui/merging/eab-contact-merging.c (match_query_callback): 
-	Set proper border widths on some dialog containers for the HIG
-
-	Fixes #41228
-
-2005-01-21  JP Rosevear  <jpr@novell.com>
-	
-	Fixes #46404	
-	
-	* gui/widgets/e-addressbook-view.c (eab_view_print): just show the
-	dialog, not show all (margin settings aren't supposed to be used);
-	use e_print to get the dialog
-	(eab_view_print_preview): use e_print config for previewing
-
-	* printing/e-contact-print.c (e_contact_print_preview): get the
-	e_print config for previewing
-	(e_contact_print_contact_dialog_new): use e_print to get the
-	print dialog
-
-	* printing/e-contact-print-envelope.c
-	(e_contact_print_envelope_dialog_new): use e_print to get the
-	print dialog
-
-2005-01-21  Hans Petter Jansson  <hpj@novell.com>
-
-	* gui/contact-editor/e-contact-quick-add.c (quick_add_set_name)
-	(quick_add_set_email): Don't set properties on the contact immediately.
-	(clicked_cb): Set the properties on the contact immediately before
-	passing it on. This way, the FULL_NAME will only be set once, and so
-	the FILE_AS field will be updated here.
-
-2005-01-21 Sivaiah Nallagatla <snallagatla@novell.com>
-
-	* gui/component/addressbook-config.c 
-	(eabc_commit) : in case of new book
-	set the uid of the source as the relative 
-	uri. 
-
-2005-01-19  Hao Sheng <hao.sheng@sun.com>
-
-	* gui/contact-editor/contact-editor.glade:
-	add accessable key to the contact editor UI.
-	* gui/contact-list-editor/contact-list-editor.glade:
-	add accessable key to the contact list editor UI.
-
-2005-01-18  Hao Sheng <hao.sheng@sun.com>
-
-	* gui/component/addressbook-view.c:
-	(addressbook_view_init): add a11y name for the contact's
-	treeview.
-
-2005-01-18 Hao Sheng <hao.sheng@sun.com>
-
-	* gui/contact-editor/contact-editor.glade:
-	add a11y names for widgets named "Image","Anniversary" and "Birthday".
-	* gui/contact-editor/e-contact-editor.c:
-	(e_contact_editor_create_date): add string1 as entry's a11y name.
-
-2005-01-17 Sivaiah Nallagatla <snallagatla@novell.com>
-
-	* gui/contact-editor/e-contact-editor.c 
-	(fill_in_email_record) : show "other" when email 
-	does not carry "TYPE"
-	(fill_in_email) : pass deafult email 
-	types instead of -1 when clearing fields 
-	
-	Fixes #70922 
-	
-2005-01-17 Hao Sheng  <hao.sheng@sun.com>
-
-	* gui/contact-editor/contact-editor.glade:
-	add the a11y name for arrow-button named "Telephone".
-
-2005-01-12  JP Rosevear  <jpr@novell.com>
-
-	Fixes #61973
-	
-	* gui/widgets/e-addressbook-view.etspec: add translator comment for TTYTDD 
-
-2005-01-11  Not Zed  <NotZed@Ximian.com>
-
-	* util/eab-book-util.c (eab_name_and_email_query): cast length
-	specifier to int.
-
-2005-01-10  Hans Petter Jansson  <hpj@novell.com>
-
-	* gui/widgets/e-minicard.c (e_minicard_activate_editor): When spawning
-	an editor, set the initial editability from the target book, not from
-	the minicard's own (usually stale, useless) editable state.
-
-2005-01-06  JP Rosevear  <jpr@novell.com>
-
-	* gui/component/Makefile.am: install schemas properly
-
-2004-12-21  Andre Klapper <a9016009@gmx.de>
-       
-       * tools/evolution-addressbook-export.c:
-       Fixing bug 61068 (removing a white space in a string).
-
-2004-12-23  Sivaiah Nallagatla <snallagatla@novell.com>
-
-	Part of merge from offline branch 
-	
-	* gui/widgets/addresbook-config.c (eabc_general_offline) :
-	fix some compile warings
-	(offline_status_changed_cb) : set "0" instead of NULL
-	as e-source property when offline is not checked  
-		
-2004-11-23  Sivaiah Nallagatla <snallagatla@novell.com>
-                                          
-        Part of merge from offline brnach 
-                                                                        
-        * gui/widgets/eab-gui-util.c (eab_load_error_dialog) :
-        added message which gets prompted when user tries
-        to access a book which is not available in offline mode
-                                                                                                                             
-        * gui/component/addressbook-config.c (eabc_general_offline)
-        (offline_status_changed_cb) : added a new check box
-        to properties page to mark a book for offline usage
-                                                                                                                             
-        * gui/component/addressbook.c (load_source_cb) : do no try to
-        authenticate in case of offline mode.
-        (auth_required_cb) : new call back which gets called
-        when backend sends notification for  password to client
-	
-2004-12-23  Hans Petter Jansson  <hpj@novell.com>
-
-	This is the last we see of ESelectNames.
-
-	* gui/component/select-names/Evolution-Addressbook-SelectNames.idl
-	* gui/component/select-names/GNOME_Evolution_Addressbook_SelectNames.server.in.in
-	* gui/component/select-names/Makefile.am
-	* gui/component/select-names/e-select-names-bonobo.c
-	* gui/component/select-names/e-select-names-bonobo.h
-	* gui/component/select-names/e-select-names-completion.c
-	* gui/component/select-names/e-select-names-completion.h
-	* gui/component/select-names/e-select-names-config-keys.h
-	* gui/component/select-names/e-select-names-config.c
-	* gui/component/select-names/e-select-names-config.h
-	* gui/component/select-names/e-select-names-factory.c
-	* gui/component/select-names/e-select-names-factory.h
-	* 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-marshal.list
-	* 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-popup.c
-	* gui/component/select-names/e-select-names-popup.h
-	* gui/component/select-names/e-select-names-section.etspec
-	* 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.etspec
-	* gui/component/select-names/e-select-names.h
-	* gui/component/select-names/recipient.glade
-	* gui/component/select-names/select-names.glade: Begone.
-
-2004-12-23  Hans Petter Jansson  <hpj@novell.com>
-
-	* gui/component/Makefile.am (SUBDIRS): No more select-names.
-	(libevolution_addressbook_la_LIBADD): Remove libeselectnames.la.
-
-	* gui/component/component-factory.c (factory): Remove the select-names
-	component.
-
-	* gui/contact-list-editor/Makefile.am (IDL)
-	(IDL_GENERATED_H)
-	(selectnamesdir): No longer needed, so removed.
-
-2004-12-22  Hans Petter Jansson  <hpj@novell.com>
-
-	* gui/contact-list-editor/e-contact-list-editor.c
-	(e_contact_list_editor_dispose): Unref the name selector.
-	(e_contact_list_editor_save_contact): Fix a warning.
-	(add_to_model): Take a list instead of a vector of destinations.
-	(select_names_ok_cb): Adapt to new name selector.
-	(setup_corba): Renamed to setup_name_selector () and adapted.
-	(select_cb): Adapt to new name selector.
-
-	* gui/contact-list-editor/e-contact-list-editor.h: Adapt to new
-	name selector and remove CORBA/Bonobo.
-
-	* gui/widgets/eab-popup.c (eabp_target_free)
-	(eabp_popup_target_new_select_names): #ifdef out code that
-	depended on the old name selector.
-
-2004-12-17  Not Zed  <NotZed@Ximian.com>
-
-	* util/ea-popup.c (emp_standard_menu_factory): 
-
-	* gui/component/select-names/e-select-names.c (section_right_click_cb): 
-
-	* gui/component/addressbook-view.c (popup_event_callback): 
-
-	* gui/widgets/e-addressbook-view.c (do_popup_menu): api changes.
-
-2004-12-21  JP Rosevear  <jpr@novell.com>
-
-	Fixes #61975
-	
-	* gui/widgets/test-reflow.c: kill translated strings that were #if
-	0'd anyhow
-
-2004-12-21  JP Rosevear  <jpr@novell.com>
-	
-	* gui/search/e-addressbook-search-dialog.c: convert to
-	G_DEFINE_TYPE
-	
-	* gui/widgets/gal-view-factory-minicard.c: ditto
-
-	* gui/widgets/gal-view-factory-treeview.c: ditto
-
-2004-12-13  Vivek Jain <jvivek@novell.com>
-
-	* gui/component/addressbook-config.c (addressbook_config_edit_source): set the
-	window title based upon the source
-
-2004-12-08  Hans Petter Jansson  <hpj@novell.com>
-
-	* gui/component/addressbook-migrate.c
-	* gui/component/select-names/e-select-names-completion.c
-	* gui/component/select-names/e-select-names-manager.c
-	* gui/component/select-names/e-select-names-model.h
-	* gui/contact-list-editor/e-contact-list-editor.h
-	* gui/contact-list-editor/e-contact-list-model.h
-	* gui/widgets/e-minicard.c
-	* gui/widgets/eab-gui-util.c
-	* importers/evolution-ldif-importer.c
-	* importers/evolution-vcard-importer.c: Include
-	<libebook/e-destination.h> from evolution-data-server.
-	* util/Makefile.am: Remove e-destination.[ch] from here.
-	* util/e-destination.[ch]: Removed.
-
-2004-12-08  S. Caglar Onur  <caglar@uludag.org.tr>
-
-	* evolution-2.0.2/addressbook/gui/contact-editor/e-contact-editor.c
-	(get_ui_slot_param)
-	(get_attributes_named): some strcasecmp() calls changed with
-	g_ascii_strcasecmp() for Turkish character conversiton problems
-	[ http://www.i18nguy.com/unicode/turkish-i18n.html ]
-
-2004-12-06  Not Zed  <NotZed@Ximian.com>
-
-	* gui/component/addressbook-config.c (eabc_general_type): set the
-	active item based on the current group.
-
-2004-12-01  Sivaiah Nallagatla <snallagatla@novell.com> 
-
-	* gui/contact-editor/e-contact-editor.c (save_contact) :
-	save the uid and set it again in the contact. Otherwise, there is
-	possibility we trying to save the contact wiht out UID, as we destory the 
-	contact and create new one when data is wrong  
-
-	 
-2004-11-28  Sivaiah Nallagatla <snallagatla@novell.com>
-
-	* gui/contact-editor/e-contact-editor.h : Define
-	new list for storing required fields
-
-	* gui/contact-editor/e-contact-editor.c 
-	(e_contact_editor_class_init) : install new REQUIRED_FIELDS
-	property 
-	(e_contact_editor_set_property)
-	(e_contact_editor_get_property) : added handling 
-	for new RQUIRED_FIELDS_PROPERTY
-	(e_contact_editor_dispose) : unref the new 
-	required_fields member 
-	(required_fields_cb) : call back to set required fields into
-	contact editor
-	(is_non_string_field) : new method to detect
-	whether a particular field in contact is a string or not
-	(e_contact_editor_is_valid) : check for presence of 
-	all required fields
-	(save_contact) : extract all the data before 
-	calling e_contact_editor_is_valid so that
-	it can check for required fields. Clean up the contact
-	if there is an error
-	
-2004-11-27  Sushma Rai  <rsushma@novell.com>
-
-	* gui/widgets/e-minicard-view.c (set_empty_message):
-	Checking for the static capability "do-initial-query",
-	and setting the relevent empty addressbook message.
-
-2004-11-26  JP Rosevear  <jpr@novell.com>
-
-	* gui/component/select-names/e-select-names-popup.c
-	(populate_popup_contact): get image directly from icon factory
-
-	* gui/contact-editor/e-contact-editor-im.c
-	(setup_service_optmenu): ditto
-	
-2004-11-25  Hao Sheng  <hao.sheng@sun.com>
-
-	* gui/contact-editor/contact-editor.glade:
-	add "labelled by" between entry and label,
-	make accessbility work.
-	* gui/contact-editor/e-contact-editor.c:
-	(e_contact_editor_create_web): add accessible name to e_url_entry.
-
-2004-11-22  Joan Sanfeliu  <joan@fibranet.com>
-
-	* gui/component/apps_evolution_addressbook.schemas.in.in:
-	* gui/component/ldap-config.glade : Evolution product name spelled
-	with an uppercase E
-
-	Fixes #61065
-
-2004-11-22  Rodney Dawes  <dobey@novell.com>
-
-	* importers/GNOME_Evolution_Addressbook_VCard_Importer.server.in.in:
-	Fix name attribute values to be identical
-
-	Fixes #61976
-
-2004-11-21  Sivaiah Nallagatla <snallagatla@novell.com>
-
-	* rever last commit , it is supposed to for offline 
-	branch not to HEAD 
-
-2004-11-21  Sivaiah Nallagatla <snallagatla@novell.com>
-
-	* gui/widgets/eab-gui-util.c (eab_load_error_dialog) : 
-	added message which gets prompted when user tries 
-	to access a book which is not available in offline mode
-
-	* gui/component/addressbook-config.c (eabc_general_offline) 
-	(offline_status_changed_cb) : added a new check box
-	to properties page to mark a book for offline usage 
-
-	* gui/component/addressbook.c (load_source_cb) : do no try to
-	authenticate in case of offline mode. 
-	(auth_required_cb) : new call back which gets called
-	when backend sends notification for  password to client
-	
-2004-11-07  Sivaiah Nallagatla <snallagatla@novell.com>
-
-       * util/eab-book-util.c (eab_name_and_email_query) :
-       When name is NULL query against complete email id instead of
-       user name part to take care of users@foo.org not matching
-       against users@bar.org . Also include query based on name always
-
-       Fix for  #67656
-
-
-2004-11-16  Not Zed  <NotZed@Ximian.com>
-
-	* util/Makefile.am (libeabutil_la_LIBADD): remove camel, add
-	ADDRESSBOOK_LIBS.
-
-	* conduit/Makefile.am (libeaddress_conduit_la_LIBADD): remove
-	camel.
-
-	* gui/component/Makefile.am (libevolution_addressbook_la_LIBADD):
-	remove camel.
-
-2004-11-15  Not Zed  <NotZed@Ximian.com>
-
-	* *.c: Moved various things from e-util to libedataserver, where
-	appropriate.
-
-2004-11-08  Andre Klapper  <a901600@gmx.de>
-
-	Fixes bug #61966.
-
-	* addressbook-errors.xml: Add a missing word to a string.
-
-2004-11-08  Steven Zhang <steven.zhang@sun.com>
-
-	* gui/widgets/e-minicard.c: (e_minicard_activate_editor): 
-	rename and make it a public function.
-	(e_minicard_event): change accordingly.
-	* gui/widgets/e-minicard.h: ditto.
-
-2004-11-04  Sivaiah Nallagatla <snallagatla@novell.com>
-	
-	* gui/contact-editor/e-contact-editor.c (save_contact) :
-	populate contact only afte we are sure that data is valid 
-	and we can create that.
-	Fixes #69079
-
-2004-11-07  Rodney Dawes  <dobey@novell.com>
-
-	* gui/contact-editor/e-contact-editor.c
-	(init_email_record_location, init_im_record_location):
-	Translate the category pretty names that we pass for creation of
-	new menu item entries for the E-Mail and IM dropdown selections
-
-	Partially fixes bug #66854
-	
-2004-11-04  mengjie yu  <meng-jie.yu@sun.com>
-
-	fix for bugzilla #44876
-
-	* gui/component/select-names/e-select-names-manager.c:
-       (e_select_names_manager_entry_new):add a atk name for the entry.
-
-2004-11-2   Hao Sheng  <hao.sheng@sun.com>
-
-	* gui/widgets/e-minicard-view.c: popup right-click menu after
-	pressing Shift+F10.
-
-2004-11-01  Sivaiah Nallagatla <snallagatla@novell.com>
-
-	* gui/widgets/eab-gui-util.c 
-	(added_cb) (_modified_cb) : Don't show
-	error dialogs when status code is E_BOOK_ERROR_CANCELLED. We don't
-	wabt to show "Error adding contact,  Cancelled" dialogs when user 
-	cancels duplicated contact detected dialog.   	  
-	
-2004-10-27  Andre Klapper  <a9016009@gmx.de>
-
-       * tools/evolution-addressbook-export.c: 
-       Fixing a typo (bug 61069).
-
-2004-10-26  Andre Klapper <a9016009@gmx.de>
-
-	Fixes #61972.
-
-	* addressbook/gui/contact-editor/e-contact-editor-address.c:
-	Typo in country name: was "Grena-dines", now "Grenadines".
-
-2004-10-25  Nat Friedman  <nat@novell.com>
-
-	* gui/widgets/eab-contact-display.c (accum_multival_attribute):
-	Display mutlivalued contact attributes in the preview.
-	(render_contact): Render all IM fields using the new multival
-	function.
-
-2004-10-21  JP Rosevear  <jpr@novell.com>
-
-	* gui/widgets/eab-config.c (ecph_class_init): correct hook name
-	typo
-
-	* gui/component/addressbook-view.c: add appropriate popup icons
-
-2004-10-21  Not Zed  <NotZed@Ximian.com>
-
-	* gui/component/addressbook-config.c
-	(addressbook_config_edit_source): fix a past-o for no-ldap case.
-
-2004-10-20  Not Zed  <NotZed@Ximian.com>
-
-	* gui/component/addressbook-component.c
-	(addressbook_component_init): register config hook.
-
-	* gui/component/addressbook-config.c: mostly re-written to use econfig.
-	(query_for_supported_bases): convert to gtktreeview.
-
-	* gui/widgets/eab-config.c (ecp_set_target): hook onto source changed.
-	(ecp_source_changed): propagate changed state info.
-	(ecp_class_init): setup private data.
-
-2004-10-19  Not Zed  <NotZed@Ximian.com>
-
-	* gui/widgets/eab-menu.c (eabm_target_free): don't unref null
-	book.
-
-2004-10-19  JP Rosevear  <jpr@novell.com>
-
-	* gui/component/addressbook-view.c,
-	gui/component/select-names/e-select-names.c,
-	gui/widgets/e-addressbook-view.c, gui/widgets/eab-menu.c,
-	gui/widgets/eab-popup.c: convert to org.gnome hook names
-	
-2004-10-15 Sivaiah Nallagatla <snallagatla@novell.com>
-
-	* gui/widgets/e-addressbook-view.c : add EAB_POPUP_SELECT_ANY
-	mask instead of EAB_POPUP_SELECT_MANY, so that 
-	all the options like Save as, Forward etc are enabled even 
-	single contact is selected. 
-
-2004-10-15 Sivaiah Nallagatla <snallagatla@novell.com>
-
-	* gui/widgets/eab-contact-display.c : uncomment 
-	HANDLE_MAILTO_INTERNALLY define so that we will
-	launch composer through bonobo  instead of using 
-	gnome_url_show	
-	
-2004-10-15  Not Zed  <NotZed@Ximian.com>
-
-	* gui/widgets/eab-popup.c: added an any select mask and updated
-	the hook maps.
-
-	* gui/component/addressbook-component.c
-	(addressbook_component_init): register the addressbook hooks.
-
-	* gui/component/addressbook-view.c (addressbook_view_init): setup
-	the menu manager.
-	(control_activate_cb): activate the menu manager.
-	(update_command_state): and update the menu manager.
-
-	* gui/widgets/eab-menu.[ch]: Added menu manager class.
-
-2004-10-13  JP Rosevear  <jpr@novell.com>
-
-	* importers/evolution-vcard-importer.c: find source selector and
-	option menu in libedataserverui
-
-	* importers/evolution-ldif-importer.c: ditto
-
-	* gui/widgets/eab-popup.c: ditto
-
-	* gui/widgets/eab-gui-util.c: ditto
-
-	* gui/contact-list-editor/e-contact-list-editor.c: ditto
-
-	* gui/contact-editor/e-contact-editor.c: ditto
-
-	* gui/component/select-names/e-select-names.h: ditto
-
-	* gui/component/autocompletion-config.c: ditto
-
-	* gui/component/addressbook-view.c: ditto
-
-2004-10-11  Hans Petter Jansson  <hpj@ximian.com>
-
-	* gui/component/addressbook-view.c (source_list_changed_cb): Don't
-	unref the view - removing it from the hash table will do this for us.
-	Remove from hash table after removing the notebook page.
-	(addressbook_view_init): Unref views when removed from the hash
-	table.
-
-2004-10-06  Not Zed  <NotZed@Ximian.com>
-
-	* gui/component/addressbook-view.c (popup_event_callback): 
-	* gui/component/select-names/e-select-names.c (section_right_click_cb):
-	* gui/widgets/e-addressbook-view.c (do_popup_menu): fix for
-	e-popup api changes.  Moved all mask specifiers to visible rather
-	than enable in the menu table.
-
-2004-10-06  Not Zed  <NotZed@Ximian.com>
-
-	* gui/contact-editor/e-contact-editor.c: removed
-	gnome-popup-menu.h (unused).
-
-	* gui/widgets/e-addressbook-reflow-adapter.c: 
-	* gui/widgets/eab-popup-control.c: remove e-popup-menu.h (unused).
-
-	* gui/component/select-names/e-select-names.c
-	(section_right_click_cb): use e-popup.  Somewhat overengineered
-	for this use ...
-	(remove_cb): api changes.
-
-	* gui/widgets/eab-popup.c (eab_popup_target_new_select_names):
-	added pretty useless wrapper for the select names popup.  Added to
-	hook maps.
-
-2004-10-01  Not Zed  <NotZed@Ximian.com>
-
-	* gui/widgets/e-addressbook-view.c (do_popup_menu): convert to
-	using EABPopup.
-	(sources): remove dead code.
-	(has_email_address_1, get_has_email_address): removed now
-	redundant code.
-	(save_as, send_as, send_to, print, copy, paste, cut, delete) 
-	(copy_to_folder, move_to_folder, new_card, new_list): new api.
-	(free_popup_info): dead.
-	(print_envelope): not pining.
-	(get_contact_list): take a popup target instead, don't ref.
-	(get_contact_list_1): not required no more.
-	(contact_and_book_free): same.
-	(delete): call eab_view_delete_selection.
-	(eab_view_delete_selection): do the actual delete here.
-
-	* gui/widgets/eab-popup.c (eab_popup_target_new_select): implement.
-
-2004-10-01  Not Zed  <NotZed@Ximian.com>
-
-	* gui/widgets/eab-popup.[ch]: addressbook popup driver.
-
-	* gui/component/addressbook-view.c (delete_addressbook_cb): use
-	e-error for the message prompt.  don't bother keeping it around,
-	it can never be re-sensitised anyway.
-	(book_removed): no longer destroy the original dialogue.
-
-	* addressbook-errors.xml: add ask-delete for deleting
-	addressbooks.
-
-	* gui/component/addressbook-view.c (addressbook_view_init):
-	connect to popup_event rather than fill_popup_menu now.
-	(fill_popup_menu_callback): renamed to popup_event_callback,
-	changed to use epopup.
-	(add_popup_menu_item): remove, no longer needed.
-
-2004-09-29  Not Zed  <NotZed@Ximian.com>
-
-	Fixes bug #66520.
-
-	* gui/widgets/e-addressbook-view.c (eab_view_dispose): don't unref
-	the contact_display_window, it will be destroyed by being
-	parented.
-
-2004-09-29  Hans Petter Jansson  <hpj@ximian.com>
-
-	Fixes bug #66369.
-
-	* util/eab-book-util.c (eab_contact_list_from_string): Make the
-	vcard splitter work with any amount of blank lines between vcards.
-
-2004-09-29  Hans Petter Jansson  <hpj@ximian.com>
-
-	Fixes bug #65537.
-
-	* gui/merging/eab-contact-compare.c (query_cb): Protect against NULL
-	UIDs, and make fewer calls to e_contact_get_const () as a bonus.
-
-2004-09-24  Hao Sheng  <hao.sheng@sun.com>
-	
-	Fix for #66523
-
-	* gui/contact-list-editor/e-contact-list-model.c:
-	(e_contact_list_model_add_email): estimate the same mail address
-	and popup a warning dialog.
-	* addressbook-errors.xml: add the question message for the warning
-	dialog.
-
-2004-09-23  Pamplona Hackers <gnome-desarrollo@es.gnome.org>
-
-	Fixes #61978
-
-	* tools/evolution-addressbook-export.c (main): use more
-	meaningful error message.
-
-2004-09-23  Fazlu & Hannah <hannah_lins@yahoo.co.in>
-
-	* tools/evolution-addressbook-export.c (main):
-	Changed the string into proper grammar 'In normal mode, there
-	should not need size option.' to 'In normal mode, there is no need
-	for the size option.'
-
-2004-09-23  JP Rosevear  <jpr@novell.com>
- 
- 	* conduit/address-conduit.c (ecard_from_remote_record): only set
- 	the file as address to the company if no full name exists
- 	(delete_record): don't bail out if the record simply isn't found
- 
- 	Fixes #59725
- 	
- 	* conduit/address-conduit.c (local_record_from_uid): remove
- 	extraneous semicolon
- 
-2004-09-21  William Jon McCann  <mccann@jhu.edu>
-
-	* gui/component/component-factory.c (factory): Quiet debug messages.
-
-	* gui/widgets/e-addressbook-view.c (eab_view_new): Remove
-	unnecessary label widget placeholder.  Make vertical scrollbar
-	policy automatic.  Use gtk_paned_add2 instead of
-	gtk_container_add.
-
-	* gui/component/apps_evolution_addressbook.schemas.in.in: Add
-	missing show_preview schema.  Add missing long descriptions.
-
-2004-09-13  Rodney Dawes  <dobey@novell.com>
-
-	* gui/contact-editor/e-contact-editor.c (show_help_cb):
-	Point at the correct XML file for documentation
-
-2004-09-13 Sivaiah Nallagatla <snallagatla@novell.com>
-
-       * gui/contact-editor/e-contact-editor.c
-       (sensitize_address) : check for _LABEL
-       type address fields also in supported fileds
-       while sensitizing the address fields
-
-2004-09-03  JP Rosevear  <jpr@novell.com>
- 
- 	Fixes #63191
- 	
- 	* gui/contact-list-editor/contact-list-editor.glade: set the title
- 	properly
-	
-2004-09-08  Not Zed  <NotZed@Ximian.com>
-
-	** See bug #64080.
-
-	* gui/component/Makefile.am (libevolution_addressbook_la_LIBADD):
-	link addressbook to camel.
-
-2004-09-04 Sivaiah Nallagatla <snallagatla@novell.com>
-
-	* gui/widgets/e-addressbook-view.h : add
-	new widget variable contact_dsiplay_window to _EABView strcut
-	to store. Remove unused scrolled varible
-	* gui/widgets/e-addressbook-view.c (eab_view_init)
-	(eab_view_dispose) : initialize and unref the new widget
-	added 
-	(eab_view_new) : remove the loca variable scrlled_window 
-	instead use eav->contact_display_window
-	(eab_view_show_contact_preview) : show/hide contact_display_window 
-	instead of contact_display
-	Fixes #64024 
-
-
-2004-08-27  Not Zed  <NotZed@Ximian.com>
-
-	** See bug #62856 (workaround).
-
-	* gui/component/addressbook.c (addressbook_authenticate): add
-	online flag to password request.
-
-	** See bug #64011.
-
-	* gui/component/addressbook-view.c (edit_addressbook_cb): Remove
-	double ;; in declaration section (c99 extension).  From Vincent
-	Noel <vnoel@cox.net>.
-
-2004-08-26  Hans Petter Jansson  <hpj@ximian.com>
-
-	Really fixes #61833 and #63697.
-
-	* gui/component/select-names/e-select-names.etspec: Fetch values from
-	column 86 (NAME_OR_ORG), instead of 2 (FILE_AS).
-
-2004-08-26  Chris Toshok  <toshok@ximian.com>
-
-	[ patch for the rest of 60889 ]
-	* gui/merging/eab-contact-merging.c (add_lookup): new function,
-	either start up the query or add it to the queue if we're over the
-	number of simultaneous queries.
-	(finished_lookup): start up enough pending queries to get us to
-	our limit again.
-	(free_lookup): free lookup->avoid.
-	(final_id_cb): call finished_lookup.
-	(eab_merging_book_add_contact): set lookup->avoid to NULL and
-	replace call to eab_contact_locate_match_full with add_lookup.
-	(eab_merging_book_commit_contact): set lookup->avoid to the
-	contact, and make the same
-	s/eab_contact_locate_match_full/add_lookup/ replacement.
-
-2004-08-26  Christian Neumair  <chris@gnome-de.org>
-
-	* gui/component/GNOME_Evolution_Addressbook.server.in.in:
-	Don't mark component menu accel for translation.
-
-2004-08-25  Sivaiah Nallagatla <snallagatla@novell.com>
-
-       * gui/component/addressbook-config.c (source_to_dialog) :
-       disbale the display name widget in case of groupwise as we can not handle renames as
-       of now
-       (dialog_to_source) also copy "use_ssl" property to new source so that
-       new books also use ssl
-
-2004-08-25  Hans Petter Jansson  <hpj@ximian.com>
-
-	May fix #61833.
-
-	* gui/component/select-names/e-select-names-table-model.c
-	(fill_in_info): Get E_CONTACT_NAME_OR_ORG (first found from File As,
-	Full Name, Organization, Email 1) for the "name" field. Hopefully
-	will prevent most cases of blank entries.
-
-2004-08-25  Frederic Crozat  <fcrozat@mandrakesoft.com>
-
-	* gui/component/addressbook-view.c: (delete_addressbook_cb):
-	Don't call gtk_dialog_set_has_separator on Gtk Message Dialog
-        with GTK+ >= 2.4.0.
-
-2004-08-20  Chris Toshok  <toshok@ximian.com>
-
-	* gui/component/component-factory.c (factory): remove the dead
-	ldap config control stuff.
-
-2004-08-20  Hans Petter Jansson  <hpj@ximian.com>
-
-	Fixes bug #62715.
-
-	* gui/contact-editor/e-contact-editor.c
-	(fill_in_address_label_textview): Implement.
-	(fill_in_address_field): If structured address information is not
-	available, try putting the "label" blob in the free-form field.
-
-2004-08-19  Hans Petter Jansson  <hpj@ximian.com>
-
-	Makes the contact image selector use GtkFileChooser if available.
-
-	* gui/contact-editor/e-contact-editor.c (image_selected_cb): Take just
-	the editor as an argument, so we can call from other places without
-	having to supply dummy args. Rename to image_selected, since it's no
-	longer strictly a callback. Include optional code to use the new
-	GtkFileChooser.
-	(image_cleared_cb): Ditto. Rename to image_cleared.
-	(file_chooser_response): Optional response handling for GtkFileChooser.
-	(image_clicked): Include optional code to use the new GtkFileChooser.
-	Move common strings to variables. For GtkFileSelection, swap callback
-	parameters for the modified image_selected () and image_cleared ().
-
-2004-08-19  Chris Toshok  <toshok@ximian.com>
-
-	[ likely fixes #61500 ]
-	* addressbook-errors.xml (remove-addressbook): remove the
-	secondary text, since we don't have the gerror text to supply it
-	anymore.
-
-	* gui/component/addressbook-view.c (book_removed): new function,
-	move the error handling here.
-	(delete_addressbook_cb): create a closure with necessary data, and
-	call the e_book_async_remove instead of e_book_remove.
-
-2004-08-18  Sivaiah Nallagatla <snallagatla@novell.com>
-	
-	* gui/component/select-names/e-select-names.c (e_select_names_init) :
-	select names dialog can not be modal as password dialogs can come up while 
-	user is in this dialog for address books which require authentication
-	like groupwise and LDAP
-	FIxes #63257 
-
-2004-08-11  Hans Petter Jansson  <hpj@ximian.com>
-
-	* gui/contact-editor/e-contact-editor.c (app_delete_event_cb):
-	Remove the custom prompt-to-save dialogs from here - use
-	eab_prompt_save_dialog (), and then only if the contact actually
-	changed.
-
-2004-08-16  Chris Toshok  <toshok@ximian.com>
-
-	* gui/widgets/eab-gui-util.c (eab_show_multiple_contacts):
-	reinstate the ngettext patch that was part of the #53464 commit of
-	2004-03-24 by dsegan@gmx.net.
-
-2004-08-12  Carlos Garnacho Parro  <carlosg@gnome.org>
-
-	* gui/widgets/eab-gui-util.c: Optionally use GtkFileChooser if
-	compiled against Gtk+ >= 2.4.0
-
-2004-08-10  Not Zed  <NotZed@Ximian.com>
-
-	* gui/component/addressbook.c (addressbook_authenticate): e
-	passwords api change/reprompt if we need to.
-
-2004-08-12  Sivaiah nallagatla <snallagatla@novell.com>
-
-	* gui/compoent/addressbook.c : just revering a local change 
-	gone in in the commit i just made 
-
-2004-08-12  Sivaiah Nallagatla <snallagatla@novell.com>
-	
-	* gui/component/addresbook.c (load_source_auth_cb) :
-	when user cancels auth dialog send the anonoymous query
-	only in case of ldap 
-	*gui/component/addresbook-view.c (book_open_cb) : no need to
-	display the error dialog when user cancels that
-
-2004-08-04  Rodney Dawes  <dobey@novell.com>
-
-	* gui/widgets/eab-popup-control.c: #include <gtk/gtkvbox.h>
-
-2004-08-02  Hans Petter Jansson  <hpj@ximian.com>
-
-	Fixes #60529.
-
-	* gui/contact-list-editor/e-contact-list-editor.c
-	(table_drag_drop_cb): Make sure to get the text/x-vcard target.
-
-2004-08-02  Hans Petter Jansson  <hpj@ximian.com>
-
-	Fixes #62085.
-
-	* gui/contact-list-editor/e-contact-list-editor.c
-	(e_contact_list_editor_class_init): Set the save_contact method.
-	(e_contact_list_editor_save_contact): Implement.
-
-2004-08-02  JP Rosevear  <jpr@novell.com>
-
-	* conduit/address-conduit.c (addrconduit_load_configuration): get
-	source uid
-	(addrconduit_dupe_configuration): copy source_uid
-	(addrconduit_destroy_configuration): free source_uid
-	(e_addr_context_new): get the source list
-	(e_addr_context_destroy): unref the source list
-	(pre_sync): open the source that was set earlier
-	(fill_widgets): set the source option menu value
-	(create_settings_window): pass source list to pilot settings
-	(save_settings): save source uid
-
-	* conduit/Makefile.am: link to and include misc. widgets
-
-2004-08-02  Rodney Dawes  <dobey@novell.com>
-
-	* gui/component/ldap-config.glade: Make the main dialog here be
-	an actual GtkDialog instead of a GtkWindow
-	Fix up a few small spacing issues with the UI
-	Change "Contacts Group" to "Address Book"
-
-	* gui/component/addressbook-config.c (query_for_supported_bases):
-	Use gtk_widget_ensure_style instead of gtk_widget_realize
-	(addressbook_add_server_dialog):
-	Use gtk_widget_ensure_style on the dialog and fix the spacing and
-	border width of the dialog containers
-
-	Fixes #61365
-
-2004-07-30  Chris Toshok  <toshok@ximian.com>
-
-	[ fixes #61365 and other misc issues with the addressbook source
-	editors ]
-	
-	* gui/component/ldap-config.glade: change the
-	supported-bases-dialog to be initially hidden.
-
-	* gui/component/addressbook-view.c (editor_weak_notify): new
-	function, remove the editor from our hash.
-	(source_list_changed_cb): destroy the editors for given sources if
-	they're up when the source disappears.
-	(edit_addressbook_cb): add the editor (and some other misc info we
-	need) to our uid_to_editor hash so we can look it up later.  only
-	create the editor if one doesn't exist for the given source.
-	(destroy_editor): GHFunc that destroys the widgets.
-	(addressbook_view_dispose): destroy uid_to_editor.
-	(addressbook_view_init): init uid_to_editor.
-
-	* gui/component/addressbook-config.h: change return values for
-	_edit_source and _new_source - they both return GtkWidget*s now.
-
-	* gui/component/addressbook-config.c (addressbook_ldap_init):
-	attempt set the protocol version to LDAPv3.  This makes the
-	ldap_auth stuff work if the server requires v3.
-	(addressbook_root_dse_query): we don't need the separate window
-	arg, since all of this now happens *before* the supported bases
-	dialog is shown.  we just use the source dialog's window for the
-	various error dialogs.
-	(do_ldap_root_dse_query): same.
-	(query_for_supported_bases): same, and set the supported bases
-	dialog as transient-for the source dialog, and make it modal.
-	Lastly, don't make the editor modal.
-	(addressbook_config_edit_source): return the editor's window.
-	(addressbook_config_create_new_source): same.
-
-2004-07-26  JP Rosevear  <jpr@novell.com>
- 
- 	* gui/component/ldap-config.glade: change contacts group to
- 	address book
- 
- 	* gui/component/addressbook-component.c
- 	(impl__get_userCreatableItems): ditto
-	
-2004-07-19  Radek Doulik  <rodo@ximian.com>
-
-	* gui/widgets/eab-vcard-control.c (eab_vcard_control_new): but
-	buttons to button box, use vbox instead of table
-
-	* gui/widgets/eab-contact-display.c: base this widget directly on
-	gtkhtml
-
-	* gui/widgets/e-addressbook-view.c (eab_view_new): put contact
-	display in scrolled window
-
-2004-07-20  Not Zed  <NotZed@Ximian.com>
-
-	* gui/widgets/eab-contact-display.c: 
-	* gui/contact-editor/eab-editor.c: 
-	* gui/component/addressbook-migrate.c: include config.h #61395.
-
-2004-07-21  Chris Toshok  <toshok@ximian.com>
-
-	[ fixes #60508 ]
-	
-	* gui/component/addressbook-config.h: reorder the Scopes so that
-	they match the option menu.
-
-	* gui/component/ldap-config.glade: change the scope option menu to
-	only display One and Sub, and also set the Login field to Lo_gin
-	in both dialogs.  Add accelerators for the details page as well.
-
-2004-07-21  Rodney Dawes  <dobey@novell.com>
-
-	* gui/contact-editor/contact-editor.glade:
-	Give a reasonable name to the widget for the _Where label
-
-	* gui/contact-editor/e-contact-editor.c (e_contact_editor_init):
-	Set the mnemonic widget for the _Where label
-
-	Fixes #61544
-
-2004-07-20  JP Rosevear  <jpr@novell.com>
-
-	* gui/component/autocompletion-config.c
-	(autocompletion_config_control_new): don't set the toggle
-	selection
-
-2004-07-16  Hans Petter Jansson  <hpj@ximian.com>
-
-	* gui/contact-editor/e-contact-editor.c (contact_added_cb)
-	(save_contact)
-	(app_delete_event_cb): Check source book writeability directly instead
-	of relying on stored state.
-	(e_contact_editor_init): Don't init source_editable.
-	(e_contact_editor_dispose): We don't listen for source writeability
-	anymore.
-	(writable_changed): Source writeability doesn't affect widget
-	status; remove code to check for it.
-	(e_contact_editor_set_property): Do nothing if book being set is
-	the same as currently set book; previously we would end up
-	unreffing then reffing it. Don't watch for source writeability, but
-	do so for target; fixes a warning. Only call sensitize_all() if
-	writeability on target changed.
-
-	* gui/contact-editor/e-contact-editor.h (EContactEditor): We don't
-	need the source_editable and source_editable_id vars anymore.
-
-2004-07-14  Chris Toshok  <toshok@ximian.com>
-
-	[ fixes #60873, and possibly other crashes ]
-	
-	* gui/widgets/e-addressbook-model.c (get_view): don't call
-	free_data before potentially making an async call.  Or rather,
-	don't call free_data without ensure we'll be emitting
-	MODEL_CHANGED shortly after.
-
-2004-07-14  Chris Toshok  <toshok@ximian.com>
-
-	* gui/contact-list-editor/.cvsignore: ignore
-	Evolution-Addressbook-SelectNames.h.
-
-	* gui/contact-list-editor/e-contact-list-editor.c: include our
-	local (in this directory) generated
-	Evolution-Addressbook-SelectNames.h
-
-	* gui/contact-list-editor/Makefile.am: add stuff to generate (and
-	clean up) the select names header we need to include.
-
-2004-07-13  Rodney Dawes  <dobey@novell.com>
-
-	[ fixes #56657 ]
-
-	* gui/component/addressbook-migrate.c (get_source_by_uri):
-	Replace this call with get_source_by_name ()
-	(migrate_completion_folders): Fix the non-local folder migration
-	to look up sources for the migrated folders based on name, instead
-	of using the URI
-
-2004-07-12  Chris Toshok  <toshok@ximian.com>
-
-	[ fixes #61299 ]
-
-	* gui/component/addressbook.c (addressbook_load_default_book):
-	don't pass @closure to load_source_cb, since that expects to get a
-	LoadSourceData*. also, don't always call e_book_async_open.  only
-	do that when the book is non-NULL.
-
-2004-07-12  Chris Toshok  <toshok@ximian.com>
-
-	[ part of fix for bug #56520 ]
-	
-	* gui/contact-list-editor/e-contact-list-editor.c
-	(e_contact_list_editor_init): init allows_contact_lists to TRUE.
-	(list_deleted_cb): nuke, it's unused.
-	(e_contact_list_editor_set_property): check if the book supports
-	contact lists, and desensitize things if it doesn't.
-	(select_names_ok_cb): this isn't valid C.  declarations must come
-	before code.
-	(set_editable): the editable state of the dialog depends on
-	whether or not the backend supports contact lists.
-	(command_state_changed): the ok button needs to depend on
-	allows_contact_lists.
-	(extract_info): quiet compiler warning.
-
-	* gui/contact-list-editor/e-contact-list-editor.h (struct
-	_EContactListEditor): add allow_contact_lists.
-
-2004-07-08  Frederic Crozat  <fcrozat@mandrakesoft.com>
-
-	* gui/component/Makefile.am:
-	tarball should ship .schemas.in.in files, not generated files.
-
-	* gui/component/apps_evolution_addressbook.schemas.in.in:
-	Don't set empty default value on an int, this causes gconf warning.
-	(bug #60859)
-
-2004-09-04  Not Zed  <NotZed@Ximian.com>
-
-	* util/e-destination.c: include gnome-i18n.h since camel-object no
-	longer does(!).
-
-2004-07-02  Hans Petter Jansson  <hpj@ximian.com>
-
-	* gui/contact-list-editor/e-contact-list-editor.c
-	(command_state_changed): Set the source option menu sensitivity here.
-
-2004-06-30  Chris Toshok  <toshok@ximian.com>
-
-	* gui/contact-editor/e-contact-editor.c
-	(e_contact_editor_dispose): disconnect source/target_editable
-	signal ids.
-	(e_contact_editor_set_property): disconnect/connect editable
-	signals.
-	(writable_changed): new function - we need this since writable
-	status is generally communicated asynchronously with the async
-	interface.
-
-	* gui/contact-editor/e-contact-editor.h (struct _EContactEditor):
-	add source/target_editable_id slots.
-
-2004-06-29  Rodney Dawes  <dobey@novell.com>
-
-	* tools/Makefile.am (bin_PROGRAMS): Change to privlibexec_PROGRAMS
-
-	Fixes #60832
-
-2004-06-28  Not Zed  <NotZed@Ximian.com>
-
-	* gui/component/addressbook-component.c
-	(impl__get_userCreatableItems): fix shortcuts. #56746
-
-2004-06-25  Hans Petter Jansson  <hpj@ximian.com>
-
-	* gui/meging/eab-contact-compare.[ch] (eab_contact_compare_file_as):
-	Implement.
-	(eab_contact_compare_name): Don't leak if only one of the strings is
-	NULL.
-	(use_common_book_cb): Include file_as in query.
-
-2004-06-25  Hans Petter Jansson  <hpj@ximian.com>
-
-	* gui/contact-editor/e-contact-editor.c (fill_in_address_textview): Add
-	a newline between street line and rest of extended address.
-	(extract_address_textview): Omit the newline trailing the street line.
-
-2004-06-24  Hans Petter Jansson  <hpj@ximian.com>
-
-	* gui/contact-editor/e-contact-editor.c (address_labels): Add table.
-	(append_to_address_label): Implement.
-	(set_address_label): Implement.
-	(extract_address_record): Set the address label fields.
-
-2004-06-24  Hans Petter Jansson  <hpj@ximian.com>
-
-	* util/eab-book-util.c (eab_contact_list_from_string): Don't accept
-	input that doesn't have at least a "BEGIN:VCARD" in it.
-
-2004-06-24  Radek Doulik  <rodo@ximian.com>
-
-	* gui/component/select-names/e-select-names-model.c
-	(e_select_names_model_get_textification): do not limit the text
-	len to 2047 characters
-
-	See bug #60366
-
-2004-06-23  Hans Petter Jansson  <hpj@ximian.com>
-
-	* gui/contact-editor/contact-editor.glade: Set window to be invisible
-	initially.
-
-	* gui/contact-editor/e-contact-editor.c (e_contact_editor_init): Set
-	the type hint to "normal", and show the window after init.
-
-2004-06-23  Not Zed  <NotZed@Ximian.com>
-
-	* gui/widgets/eab-gui-util.c
-	(eab_send_contact_list_as_attachment): use memcpy not strcpy to
-	copy to memory buffer.  Fixes a UMW.  See #60532.
-
-2004-06-23  Hans Petter Jansson  <hpj@ximian.com>
-
-	* gui/component/addressbook-view.c: Add an x-source-vcard target entry
-	that includes the source book URI.
-	(destroy_merge_context): Implement.
-	(removed_contact_cb): Implement.
-	(merged_contact_cb): Implement.
-	(selector_tree_drag_data_received): Get the source and target books,
-	and see if we need to remove contacts from source after they're added
-	to target. Copy contacts sequentially, not in parallel, with a
-	callback.
-
-	* gui/widgets/e-addressbook-view.c: Add an x-source-vcard target entry
-	that includes the source book URI.
-	(table_drag_data_delete): Remove. This is handled by the drag target.
-	(table_drag_data_get): Handle more than one contact. Supply source.
-	(create_table_view): Don't connect to the delete signal.
-
-	* gui/widgets/e-minicard-view.c: Add an x-source-vcard target entry
-	that includes the source book URI.
-	(e_minicard_view_drag_data_delete): Remove. This is handled by the
-	drag target.
-	(e_minicard_view_drag_data_get): Handle x-source-vcard target.
-	(e_minicard_view_drag_begin): Don't connect to the delete signal.
-	(e_minicard_view_dispose): Don't disconnect from the delete signal.
-	(e_minicard_view_init): Don't init delete_id.
-
-	* gui/widgets/e-minicard-view.h: Remove delete_id from struct.
-
-	* util/eab-book-util.[ch] (eab_contact_list_from_string): Skip the
-	source URI if present.
-	(eab_book_and_contact_list_from_string): Create the source book from
-	the provided URI, if present.
-	(eab_book_and_contact_list_to_string): Include the book URI in
-	generated string.
-
-2004-06-23  Rodney Dawes  <dobey@novell.com>
-
-	* gui/component/select-names/select-names.glade:
-	Move the search bar to the top and add a label _Search so that the
-	entry has a mnemonic for keyboard accessibility
-
-	Fixes #52914 and #58448
-
-2004-06-22  Hans Petter Jansson  <hpj@ximian.com>
-
-	* gui/contact-editor/contact-editor.glade: Name the labels.
-
-	* gui/contact-editor/e-contact-editor.c (sensitize_email_record)
-	(sensitize_phone_record)
-	(sensitize_im_record)
-	(sensitize_address_textview)
-	(sensitize_address_field)
-	(simple_field_map)
-	(sensitize_simple_field): Make entries uneditable and labels
-	insensitive, if field is disabled or read-only.
-
-2004-06-22  Hans Petter Jansson  <hpj@ximian.com>
-
-	Fixes #59622.
-
-	* gui/widgets/e-minicard-view.c (e_minicard_view_init): Clear drag_list
-	and canvas_drag_data_delete_id.
-	(e_minicard_view_dispose): Clear drag_list. Disconnect drag_data_delete
-	signal if connected.
-	(e_minicard_view_drag_begin): Set up drag_data_delete signal if
-	necessary. Clear old data before drag starts.
-	(clear_drag_data): Implement.
-	(e_minicard_view_drag_data_delete): Implement.
-	(e_minicard_view_drag_data_get): Don't clear drag_list here.
-
-2004-06-22  Chris Toshok  <toshok@ximian.com>
-
-	[ should fix #60495, #58635 ]
-	* gui/widgets/eab-popup-control.c (name_only_query_cb): don't free
-	the list of contacts - libebook still owns it.
-	(query_cb): same.
-
-2004-06-22  Larry Ewing  <lewing@ximian.com>
-
-	* gui/contact-list-editor/e-contact-list-editor.c (add_email_cb):
-	don't set the changed flag unless we actually add something.
-
-2004-06-21  Federico Mena Quintero  <federico@ximian.com>
-
-	* gui/contact-editor/contact-editor.glade: Make the scrolled
-	windows around text views use GTK_SHADOW_IN, for consistency with
-	the GtkEntries.
-
-2004-06-21  Chris Toshok  <toshok@ximian.com>
-
-	* gui/component/ldap-config.glade: remove the auth-entry-notebook
-	in the edit dialog, and rename the auth entry to... auth-entry.
-
-	* gui/component/addressbook-config.c (source_to_dialog_new): nuke
-	- it's identical to source_to_dialog.
-	(dialog_to_source): we only have one auth entry now.  fill it in
-	properly.
-	(source_to_dialog): fill in the auth entry properly based on the
-	auth type, and remove auth_entry_notebook references.
-	(auth_optionmenu_activated): remove auth_entry_notebook
-	references.
-	(setup_general_tab): same, and use auth-entry instead of
-	email-entry/dn-entry.
-	(general_tab_check): use auth_principle instead of email/binddn.
-	(add_folder_modify): same.
-	(addressbook_add_server_dialog): put setup_connecting_tab inside
-	the ifdef HAVE_LDAP, and call source_to_dialog instead of
-	source_to_dialog_new.
-	(addressbook_config_edit_source): always call setup_general_tab.
-
-	* gui/component/addressbook-config.h (AddressbookLDAPScopeType):
-	reorder to match order in option menu (we should really remove
-	BASE altogether.. it's useless for searching.)
-
-	* gui/component/addressbook-view.c (update_command_state):
-	macroize this, annoying seeing the same 4 lines repeated 15 times.
-
-2004-06-21  Jeffrey Stedfast  <fejj@novell.com>
-
-	* conduit/address-conduit.c (local_record_from_uid): Make sure the
-	UIDs match. Should fix bug #59725.
-
-2004-06-19 Sivaiah Nallagatla <snallagatla@novell.com>
-
-       * gui/component/addressbook-config.c (dialog_to_source) : 
-       set auth-domain property on groupwise sources, so that 
-       newly created contact groups can share remembered passwords 
-
-2004-06-18  Jeffrey Stedfast  <fejj@novell.com>
-
-	* conduit/address-conduit.c (ecard_from_remote_record): Always set
-	the File_As attribute in case the pilot attrib changed. Fixes bug
-	#59723.
-
-2004-06-18  Chris Toshok  <toshok@ximian.com>
-
-	* gui/component/select-names/e-select-names-model.c
-	(e_select_names_model_load_contacts): only go through the process
-	of creating/loading the EBook if the model has some data in it.
-
-2004-06-18  Chris Toshok  <toshok@ximian.com>
-
-	[ fixes bug #59376 ]
-
-	* gui/component/addressbook-view.c (fill_popup_menu_callback):
-	make this work with absolute uris in sources.  Thanks to Sushma
-	Rai for the initial patch to fix this.
-
-2004-06-17  Chris Toshok  <toshok@ximian.com>
-
-	[ fixes bug #58696 ]
-	
-	* gui/widgets/eab-gui-util.c (eab_transfer_contacts): use
-	addressbook_load instead of e_book_async_open, so we do auth stuff
-	for the destination book.
-
-2004-06-17  Chris Toshok  <toshok@ximian.com>
-
-	* gui/contact-editor/e-contact-editor.c (e_contact_editor_new):
-	EBookFieldsCallback -> EBookEListCallback.
-	(e_contact_editor_set_property): same.
-
-2004-06-17  Chris Toshok  <toshok@ximian.com>
-
-	* util/eab-book-util.c (eab_name_and_email_query):
-	EBookContactsCallback -> EBookListCallback.
-	(eab_nickname_query): same.
-
-	* printing/e-contact-print.c: e-book-async.h -> e-book.h
-
-	* gui/widgets/eab-vcard-control.c: e-book-async.h -> e-book.h.
-
-	* gui/widgets/e-addressbook-model.h: e-book-async.h -> e-book.h.
-
-	* gui/widgets/eab-popup-control.h: e-book-async.h -> e-book.h.
-
-	* gui/widgets/eab-popup-control.c: remove e-book-async.h include.
-	
-	* gui/merging/eab-contact-merging.h: e-book-async.h -> e-book.h.
-
-	* gui/contact-editor/e-contact-editor.h: e-book-async.h ->
-	e-book.h.
-
-	* gui/contact-editor/e-contact-editor.h: same.
-
-	* gui/contact-list-editor/e-contact-list-editor.h: same.
-	
-	* gui/contact-list-editor/e-contact-list-model.h: remove include
-	of e-book-async.h
-	
-	* gui/component/select-names/e-select-names-completion.h: include
-	e-book.h, not e-book-async.h
-	
-	* gui/component/select-names/e-select-names-model.c: same.
-
-	* gui/component/select-names/e-select-names.c: same.
-
-	* gui/component/addressbook-migrate.c: include e-book.h, not
-	e-book-async.h
-
-	* gui/component/addressbook-view.c: same.
-
-	* gui/component/addressbook.h: same.
-
-	* gui/component/addressbook.c: remove include e-book-async.h.
-
-2004-06-17  Sivaiah Nallagatla <snallagatla@novell.com>
-
-        * gui/widgets/e-addressbook-view.etspec : update
-        the model column numbers as new fields like E_CONTACT_EMAIL_4
-        are added to EContact
-        Fixes #59621
-
-2004-06-16  Not Zed  <NotZed@Ximian.com>
-
-	* gui/component/autocompletion-config.c
-	(autocompletion_config_control_new): set the source selector to be
-	able to toggle the current selection.  Fix for #55614.
-
-2004-06-16  Sivaiah Nallagatla <snallagatla@novell.com>
-	
-	* gui/contact-editor/e-contact-editor.c (full_name_clicked) :
-	compare old and new full names and if it is different set the new 
-	the name using gtk_entry_set_text instead of set_entry_text
-	as this function blocks siganls hence preventing ok button being 
-	enabled
-
-2004-06-14  Chris Toshok  <toshok@ximian.com>
-
-	* gui/contact-editor/e-contact-editor.c (extract_im_record): set
-	things to HOME, since we don't offer TYPE=OTHER IM attributes
-	through the EContact api, and one choice is just as good as
-	another if we aren't displaying it anyway.
-
-	* gui/widgets/eab-contact-display.c (render_contact): move the IM
-	stuff out of home/work, since we don't allow people to edit
-	location for them anymore.  Also, change the IM accounts we look
-	up to "HOME", since that's what we hardcode them to in the contact
-	editor.
-
-2004-06-14  Not Zed  <NotZed@Ximian.com>
-
-	* importers/evolution-ldif-importer.c (parseLine): handle LIST
-	field types.
-	(ldif_fields[]): Add a list type. E_CONTACT_EMAIL is a list field
-	type.  See #58855.
-
-2004-06-08  Chris Toshok  <toshok@ximian.com>
-
-	* gui/widgets/e-addressbook-model.c (get_view_idle): new
-	function. do the get_view in an idle handler.
-	(eab_model_set_property): don't call get_view directly from any
-	setter block.  instead just add the idle handler (if it's not
-	already added.)  This keeps us from duplicating queries when both
-	"book" and "query" are set using the same g_object_set.
-
-	* gui/widgets/e-addressbook-model.h: add book_view_idle_id.
-	
-2004-06-07  Hans Petter Jansson  <hpj@ximian.com>
-
-	Fixes #58921.
-
-	* gui/contact-editor/e-contact-editor.c (extract_address_record):
-	Also check if the po box field is non-empty.
-
-2004-06-07  Jon Oberheide  <jon@focalhost.com>
-
-	* gui/contact-list-editor/e-contact-list-model.c: disable editing
-	of cells in the contact table.
-
-2004-06-07  Hans Petter Jansson  <hpj@ximian.com>
-
-	Fixes #57795.
-
-	* gui/component/addressbook-migrate.c (migrate_contacts): Change
-	the "POSTAL" address in 1.4 to "OTHER" in 1.5.
-
-2004-06-07  Hans Petter Jansson  <hpj@ximian.com>
-
-	* gui/Makefile.am (SUBDIRS): Fix order of dependencies.
-
-2004-06-07  H P Nadig  <hpnadig@pacific.net.in>
-
-	* gui/contact-list-editor/e-contact-list-editor.h: Added few
-	headers needed for select names dialog.
-
-	* gui/contact-list-editor/e-contact-list-editor.c
-	(e_contact_list_editor_init): Added select button handler.
-	(select_cb): The callback function for Select Button.
-	(setup_corba): To setup corba for select names dialog.	
-	(select_names_ok_cb): Handle Select names dialog entries.
-	(add_to_model): Adds cards to the model. 
-
-	* gui/contact-list-editor/contact-list-editor.glade: New 'Select'
-	Button. Tooltips added for buttons in button Box.
-
-2004-06-07  Dan Winship  <danw@novell.com>
-
-	* gui/component/addressbook-view.c: s/stock_save_as/stock_save-as/
-
-2004-06-04  Larry Ewing  <lewing@ximian.com>
-
-	* gui/contact-list-editor/e-contact-list-editor.c: remove bonobo
-	menus and cruft add ok/cancel buttons.
-
-	* gui/contact-list-editor/e-contact-list-editor.h: add buttons for
-	ok/cancel.
-
-	* gui/contact-list-editor/contact-list-editor.glade: add fields for
-	ok/cancel reparent to GtkDialog, other minor adjustments.
-
-2004-06-04  JP Rosevear  <jpr@novell.com>
-
-	Fixes #55945
-	
-	* importers/*.server.in.in: ditto
-
-	* importers/evolution-ldif-importer.c: fix OAFIIDs
-
-	* importers/evolution-vcard-importer.c: ditto
-
-2004-06-04  Chris Toshok  <toshok@ximian.com>
-
-	* gui/component/select-names/e-select-names-model.c
-	(name_and_email_simple_query_cb): only resolve destinations
-	against persons, not contact lists.
-
-2004-06-03  Hans Petter Jansson  <hpj@ximian.com>
-
-	Fixes #53643 and #26903.
-
-	* gui/search/addresstypes.xml: category -> category_list
-
-	* gui/search/e-addressbook-search-dialog.c (get_widget): Get
-	filter rule from parent view.
-	(eab_search_dialog_set_property): Implement.
-	(eab_search_dialog_get_property): Impleent.
-	(eab_search_dialog_class_init): Set up property methods.
-	(get_query): Get filter rule from parent view.
-	(eab_search_dialog_init): Don't get the filter widget here,
-	wait until parent view property is set.
-	(eab_search_dialog_new): Don't poke the parent view in, set it
-	as a property instead.
-	(eab_search_dialog_dispose): No longer needs to unref rule.
-
-	* gui/search/e-addressbook-search-dialog.c: EABSearchDialog no
-	longer needs to keep rule internally.
-
-	* gui/widgets/Makefile.am: Set SEARCH_RULE_DIR define.
-
-	* gui/widgets/e-addressbook-view.c (eab_view_new): Set up filter
-	rule and context.
-	(eab_view_peek_search_context): Implement.
-	(eab_view_peek_search_rule): Implement.
-
-	* gui/widgets/e-addressbook-view.h: Keep track of filter rule
-	and context. Add protos for added API.
-
-2004-06-03  Jeffrey Stedfast  <fejj@novell.com>
-
-	* conduit/address-conduit.c (set_status_cleared): Protect against
-	a NULL uid. Fixes bug #57619.
-	(ecard_from_remote_record): Set the full_name of the contact so
-	that we can use that as the FILE_AS rather than the company name,
-	which sucked. Fixes a bug I may or may not have reported months
-	ago. Ahah, fixes bug #57620.
-
-2004-06-02  Hans Petter Jansson  <hpj@ximian.com>
-
-	* gui/component/addressbook-migrate.c
-	(migrate_contact_folder_to_source): Add missing negation that caused
-	a crash.
-
-2004-06-02  Chris Toshok  <toshok@ximian.com>
-
-	* gui/component/addressbook-migrate.c (addressbook_migrate):
-	remove hidden field migration, and add in a phase to clear the
-	absolute_uri properties on ESources.
-
-2004-06-02  Rodney Dawes  <dobey@novell.com>
-
-	* gui/component/addressbook-config.c (focus_help, add_focus_handler):
-	Don't need these two functions any more
-	(source_to_dialog, auth_optionmenu_func):
-	Don't try to change the notebook page or set the widget sensitive,
-	for a notebook that doesn't exist any more
-	(reparent_to_vbox): Don't need this function any more, as the
-	widgets are all contained in the same dialog in the glade now
-	(setup_general_tab, setup_connecting_tab, setup_searching_tab):
-	We don't need to do the focus-based "tooltip" stuff any more
-	We just use tooltips on the widgets now
-	(ssl_optionmenu_selected, add_ssl_activate_cb):
-	We don't need the ssl_optionmenu_selected callback any more, as the
-	tooltips are just set on the necessary widgets now
-	(query_for_supported_bases): Set the border widths on the dialog's
-	vbox and action_area to be compliant with the HIG
-	(addressbook_add_server_dialog): Unref the GConfClient object
-	(addressbook_config_edit_source): Create the source_list so that
-	we can actually save the changes that we make here
-	Create the GladeXML with only the widget subtree that we need to
-	use here, to avoid popping up other visible dialogs
-	Set the border widths on the dialog's vbox and action_area to be
-	compliant with the HIG
-	We don't need to reparent widgets to vboxes any more, as the widgets
-	are now part of the dialog's widget tree
-	If we are without LDAP or not in LDAP mode, then hide the notebook
-	borders, and change the border size of its child to appear as though
-	we are a normal non-LDAP dialog
-	We don't need to set the type hint on the window as we are no a
-	real GtkDialog
-
-	* gui/component/ldap-config.glade: Update the properties dialogs to
-	be compliant with the HIG layout
-	Get rid of some of the extra windows and put their children in the
-	appropriate places in the properties dialog
-	Make the properties dialog be a real GtkDialog
-
-	Fixes #41141
-
-2004-06-01  Larry Ewing  <lewing@ximian.com>
-
-	* gui/contact-list-editor/e-contact-list-editor.c: Add in a source
-	option menu to the dialog and make is sensitive only on new lists.
-
-	* gui/contact-list-editor/e-contact-list-editor.h: add load_book
-	fields for async book loading.
-	
-	* gui/contact-list-editor/contact-list-editor.glade: add the new
-	source selector in a table reorder some of the other widgets.
-	
-2004-05-28  Chris Toshok  <toshok@ximian.com>
-
-	* gui/widgets/eab-contact-display.c (render_contact): render all
-	email addresses, not just the first 3.
-	(eab_contact_display_class_init): use a C comment, not C++.
-
-2004-05-28  Chris Toshok  <toshok@ximian.com>
-
-	* gui/component/select-names/e-select-names-bonobo.c
-	(entry_set_property_fn): call e_select_names_model_load_contacts
-	after setting text/addresses/destinations.
-
-	* gui/component/select-names/e-select-names-model.c
-	(name_and_email_simple_query_cb): new function, ripped from the
-	1.4 e-destination stuff.
-	(book_opened): new function, fire off eab_name_and_email_query for
-	each item in our model (that doesn't represent a contact already).
-	(e_select_names_model_load_contacts): new function, open the
-	default addressbook (yeah yeah, i know we should open something
-	different/more.)
-	(e_select_names_cancel_contacts_load): new (unimplemented, and how
-	do we implement it?) function.
-
-	* gui/component/select-names/e-select-names-model.h: add
-	prototypes for e_select_names_model_load_contacts and
-	e_select_names_cancel_contacts_load.
-
-	* gui/component/select-names/e-select-names.c (set_book): call
-	get_query_string and set the book and query in a single call to
-	g_object_set, just because we can/should.
-	(update_query): reimplement in terms of get_query_string.
-	(get_query_string): new function, build up the query string.
-
-	* gui/component/select-names/Makefile.am (INCLUDES): add
-	$(top_srcdir)/addressbook/util to INCLUDES.
-
-2004-05-28  Hans Petter Jansson  <hpj@ximian.com>
-
-	* gui/contact-editor/contact-editor.glade: Add back office, spouse,
-	web log fields. Allow for 8 phone numbers, of which 4 can be hidden.
-
-	* gui/contact-editor/e-contact-editor.c (phones_default): Add more
-	defaults.
-	(im_service_default): Add more defaults.
-	(expand_phone): Implement.
-	(fill_in_phone_record): Expand if we have any records past 4.
-	(init_im_record_location)
-	(fill_in_im_record)
-	(extract_im_record)
-	(sensitize_im_record): Remove location.
-	(simple_field_map): Add spouse, office, web log.
-	(expand_phone_toggle): Implement.
-	(e_contact_editor_init): Hook up expander button.
-
-2004-05-28  Christophe Fergeau  <teuf@gnome.org>
-
-	* gui/component/addressbook-config.c: added missing #ifdef HAVE_LDAP
-
-2004-05-26  Radek Doulik  <rodo@ximian.com>
-
-	* gui/widgets/e-addressbook-view.c (e_contact_print_button): call
-	gnome_print_beginpage
-	(e_contact_print_button): call gnome_print_beginpage
-
-	Fixes #58977
-
-2004-05-25  Chris Toshok  <toshok@ximian.com>
-
-	* gui/component/select-names/e-select-names-text-model.c
-	(e_select_names_text_model_activate_obj): reenable this function,
-	in a slightly broken manner.  we don't have e_contact_get_book
-	anymore (well, we never had it really... but we lost
-	e_card_get_book).  load the system addressbook and supply that to
-	the editors.  shouldn't be a problem, since it's a read-only
-	editor anyway.
-
-2004-05-25  Chris Toshok  <toshok@ximian.com>
-
-	[ fixes #58654 ]
-	
-	* gui/component/select-names/e-select-names.c (update_query):
-	build up the query using e_book_query calls so we're insulated
-	from field name changes.  also, conjoin if we have more than 1
-	query element, not more than 2 (i *hope* this was an off by 1
-	error...)
-
-2004-05-25 Sivaiah Nallagatla   <snallagatla@novell.com>
-
-        * gui/component/addressbook.c (load_source_auth_cb )
-        (load_source_auth_cb ) : read the "auth-domain" property
-        from e-source and use it as the component name for e_password_*
-        calls if it exists
-
-2004-05-25  Jeffrey Stedfast  <fejj@novell.com>
-
-	* Makefile.am: Generate the addressbook-errors.xml.h file and
-	install the xml file and all that jazz.
-
-	* addressbook-errors.xml: New error xml file.
-
-	* gui/widgets/e-addressbook-view.c (backend_died): Use
-	e_error_run().
-
-	* gui/widgets/eab-gui-util.c (eab_error_dialog): Use
-	e_error_run().
-	(eab_load_error_dialog): Same.
-	(eab_search_result_dialog): Same.
-	(eab_prompt_save_dialog): Same.
-	(save_it): Same.
-
-	* gui/contact-editor/e-contact-editor.c (categories_clicked): Use
-	e_error_run().
-	(e_contact_editor_is_valid): Same.
-	(save_contact): Same.
-
-	* gui/component/addressbook-view.c (delete_addressbook_cb): Use
-	e_error_run().
-
-	* gui/component/addressbook-config.c (addressbook_ldap_init): Use
-	e_error_run().
-	(addressbook_ldap_auth): Same.
-	(addressbook_root_dse_query): Same.
-	(do_ldap_root_dse_query): Same.
-	(do_schema_query): Same.
-
-2004-05-24  Chris Toshok  <toshok@ximian.com>
-
-	* Makefile.am (SUBDIRS): add tools back to the build.
-
-2004-05-24  Chris Toshok  <toshok@ximian.com>
-
-	* tools/Makefile.am: fix this for current build foo.
-
-	* tools/evolution-addressbook-export-list-folders.c,
-	* tools/evolution-addressbook-export-list-cards.c, 
-	* tools/evolution-addressbook-export.c:  revive this.
-
-2004-05-24  Chris Toshok  <toshok@ximian.com>
-
-	[ fixes bug #32194 ]
-	
-	* importers/evolution-vcard-importer.c (process_item_fn): make
-	sure all ADR attributes have HOME/WORK/OTHER.
-
-2004-05-24  Chris Toshok  <toshok@ximian.com>
-
-	[ fixes bug #40013 ]
-	
-	* importers/evolution-vcard-importer.c (process_item_fn): for TEL
-	attribute that don't specify a location (HOME/WORK/OTHER), default
-	to "OTHER".  For TEL attributes that *only* specify a location,
-	default to "VOICE".
-
-2004-05-21  H P Nadig  <hpnadig@pacific.net.in>
-
-	Fixes #58516.
-
-	* gui/contact-editor/contact-editor.glade: 'Job Title' is now called
-	'Title'.
-
-2004-05-20  Hans Petter Jansson  <hpj@ximian.com>
-
-	* importers/evolution-ldif-importer.c (add_to_notes): Add helper
-	func.
-	(process_item_fn): Add undisplayed fields to notes.
-
-	* importers/evolution-vcard-importer.c (add_to_notes): Add helper
-	func.
-	(process_item_fn): Add undisplayed fields to notes.
-
-2004-05-20  Hans Petter Jansson  <hpj@ximian.com>
-
-	* gui/component/addressbook-migrate.c (add_to_notes): Implement.
-	(migrate_contacts_hidden_fields): Implement.
-	(migrate_contacts): Copy fields that are now hidden in the UI,
-	to the notes field.
-
-2004-05-20  Chris Toshok  <toshok@ximian.com>
-
-	* gui/component/addressbook-component.c (impl_requestCreateItem):
-	use the new ebook api here.  missed this one in my earlier commit.
-
-2004-05-20  Radek Doulik  <rodo@ximian.com>
-
-	* printing/e-contact-print.c (complete_sequence): finish pages
-	printing by gnome_print_job_close call before showing preview or
-	calling gnome_print_job_print
-
-	See #54482
-
-	* gui/widgets/e-addressbook-view.c (eab_view_print_preview): added
-	call to begin page, ref printable and sink it to avoid finalizing of
-	floating object
-	(eab_view_print): ref and sink printable to avoid finalizing of
-	floating object
-
-	Fixes #46658
-
-2004-05-19  Chris Toshok  <toshok@ximian.com>
-
-	* importers/evolution-vcard-importer.c (load_file_fn): use the new
-	e_book_new and e_book_open apis.
-
-	* importers/evolution-ldif-importer.c (load_file_fn): use the new
-	e_book_new and e_book_open apis.
-
-	* gui/widgets/eab-gui-util.c (eab_transfer_contacts): use the new
-	e_book_new and e_book_async_open apis.
-
-	* gui/contact-editor/e-contact-editor.c (cancel_load):
-	addressbook_load_source_cancel -> addressbook_load_cancel.
-	(source_selected): use the new e_book_new and addressbook_load.
-
-	* gui/component/select-names/e-select-names.c
-	(addressbook_model_set_source): use the new e_book_new and
-	addressbook_load.
-
-	* gui/component/select-names/e-select-names-manager.c
-	(update_completion_books): use the new e_book_new and
-	addressbook_load.
-
-	* gui/component/addressbook.h: rename
-	addressbook_load_source{_cancel} to addressbook_load{_cancel}, and
-	remove the source arg.
-
-	* gui/component/addressbook.c (addressbook_load): rename since we
-	aren't passing a source anymore.
-	(addressbook_load_cancel): same.
-	(addressbook_load_default_book): use the new e_book_new_* apis.
-
-	* gui/component/addressbook-view.c (delete_addressbook_cb): just
-	use e_book_new, not e_book_load_source.
-	(selector_tree_drag_data_received): switch to new
-	e_book_new_*/e_book_open apis.
-	(activate_source): same, and addressbook_load_source ->
-	addressbook_load.
-
-	* gui/component/addressbook-migrate.c
-	(migrate_contact_folder_to_source): switch to new
-	e_book_new_*/e_book_open apis.
-	(migrate_contact_lists_for_local_folders): same.
-	(migrate_company_phone_for_local_folders): same.
-
-	* conduit/address-conduit.c (pre_sync): switch to new
-	e_book_new_*/e_book_open apis.
-
-2004-05-19  Hans Petter Jansson  <hpj@ximian.com>
-
-	* gui/contact-editor/e-contact-editor.c (sensitize_email): Check
-	if individual email fields are supported.
-
-2004-05-19  Hans Petter Jansson  <hpj@ximian.com>
-
-	* gui/contact-editor/e-contact-editor.c (extract_simple_field):
-	Remove debug output.
-	(real_save_contact): Separate out actual save logic from
-	save_contact ().
-	(save_contact): If the user wants to move the contact from one
-	address book to another, but the source is read-only, as to
-	save a copy instead.
-	(e_contact_editor_is_valid): The dialog should be an error dialog.
-	(app_delete_event_cb): If the target book is read-only, prompt
-	to discard. If the user wants to move but cannot, prompt to save
-	a copy. Also validate.
-
-	* gui/contact-editor/eab-editor.c (eab_editor_prompt_to_save_changes):
-	Remove comment about invalid data dialog, it's not handled here
-	anymore.
-
-2004-05-19  Hans Petter Jansson  <hpj@ximian.com>
-
-	Fixes a number of bugs, adds some unimplemented functionality, and
-	makes code more structured.
-
-	* gui/contact-editor/e-contact-editor.h: Eliminate company,
-	fullname_editable, address_editable fields from EContactEditor.
-
-	* gui/contact-editor/e-contact-editor.c
-	(enable_writable_fields): Removed.
-	(set_editable): Removed.
-	(fill_in_info): Removed.
-	(extract_field): Removed.
-	(extract_info): Removed.
-	(set_fields): Removed.
-	(command_state_changed): Removed.
-	(widget_changed): Removed.
-	(enable_widget): Removed.
-	(nonempty): Invert and rename to STRING_IS_EMPTY().
-	(STRING_MAKE_NON_NULL): Impl.
-	(is_field_supported): Implement.
-	(file_as_get_style): Eliminate editor->company.
-	(file_as_set_style): Ditto. Also don't set empty fields in combo.
-	(update_file_as_combo): Implement.
-	(sensitize_ok): Implement.
-	(object_changed): Implement.
-	(image_chooser_changed): Don't call widget_changed() from here.
-	(set_option_menu_history): Implement.
-	(init_email_record_location): Hook up signals after init.
-	(init_phone_record_type): Ditto.
-	(init_im_record_location): Ditto.
-	(init_im_record_service): Ditto.
-	(init_address_textview): widget_changed -> object_changed
-	(init_address_field): Ditto.
-	(fill_in_email_record): Use set_option_menu_history(), blocking
-	signals.
-	(fill_in_im_record): Ditto.
-	(fill_in_address_field): Use set_entry_text(), blocking signals.
-	(alloc_ui_slot): nonempty -> STRING_IS_EMPTY
-	(extract_email): Ditto.
-	(fill_in_phone_record): Ditto.
-	(extract_im): Ditto.
-	(extract_address_record): Ditto.
-	(sensitize_email_record): Implement.
-	(sensitize_email): Implement.
-	(sensitize_phone_types): Implement.
-	(sensitize_phone_record): Impleent.
-	(sensitize_phone): Implement.
-	(sensitize_im_record): Implement.
-	(sensitize_im): Implement.
-	(sensitize_address_textview): Implement.
-	(sensitize_address_field): Implement.
-	(sensitize_address_record): Implement.
-	(sensitize_address): Implement.
-	(simple_field_map): Add all simple fields/widgets to a table with
-	attributes saying how to handle sensitivity and data transfer.
-	(init_simple_field): Implement.
-	(fill_in_simple_field): Implement.
-	(extract_simple_field): Implement.
-	(sensitize_simple_field): Implement.
-	(init_simple): Implement.
-	(fill_in_simple): Implement.
-	(extract_simple): Implement.
-	(sensitize_simple): Implement.
-	(fill_in_all): Implement.
-	(extract_all): Implement.
-	(sensitize_all): Implement.
-	(set_entry_changed_signal_field): Removed.
-	(set_urlentry_changed_signal_field): Removed.
-	(set_entry_activate_signal_field): Removed.
-	(new_target_cb): Don't signal changes.
-	(set_entry_activate_signals): Removed.
-	(set_entry_changed_signals): Removed.
-	(full_name_clicked): Honor field_supported and target_editable.
-	Use set_entry_text() and block changed signals.
-	(image_selected_cb): widget_changed -> object_changed. Don't clear
-	pointer to file_selector.
-	(image_cleared_cb): Ditto.
-	(contact_moved_cb): command_state_chaned() -> sensitize_all().
-	(contact_added_cb): Ditto.
-	(supported_fields_cb): Ditto.
-	(contact_modified_cb): Ditto.
-	(save_contact): extract_info() -> extract_all().
-	(e_contact_editor_is_valid): Be more verbose. Make sure File As is
-	non-empty.
-	(e_contact_editor_init): Call init_all() in place of lots of setup
-	calls. Remove reference to editor->company.
-	(e_contact_editor_dispose): Remove reference to editor->company.
-	(command_state_changed): Removed.
-	(e_contact_editor_set_property): Axe unneeded complexity, now that
-	we have sensitize_all() and sensitize_ok().
-	(set_fields): Removed.
-	(fill_in_field): Removed.
-	(field_mapping): Removed.
-	(disable_widget_foreach): Removed.
-	(widget_field_mapping): Removed.
-	(num_widget_field_mappings): Removed.
-	(enable_widget): Removed.	
-
-2004-05-05  William Jon McCann  <mccann@jhu.edu>
-
-	* gui/component/GNOME_Evolution_Addressbook.server.in.in:
-	Add menu_label and menu_accelerator.
-
-2004-05-18  Chris Toshok  <toshok@ximian.com>
-
-	* gui/contact-list-editor/e-contact-list-editor.c
-	(file_send_as_cb): pass 0 to eab_send_contact.
-	(file_send_to_cb): same.
-
-2004-05-18  Chris Toshok  <toshok@ximian.com>
-
-	* gui/widgets/eab-gui-util.c
-	(eab_send_to_contact_and_email_num_list): split out the
-	DISPOSITION_AS_TO stuff here, and make it take a GList of
-	ContactAndEmailNum, so we can set it for the single contact case.
-	(eab_send_contact_list_as_attachment): split out the
-	DISPOSITION_AS_ATTACHMENT stuff here.
-	(eab_send_contact_list): call one or the other of the above,
-	munging the list if disposition is set to TO.
-	(eab_send_contact): call eab_send_to_contact_and_email_num_list
-	directly with the supplied email_num, instead of calling
-	eab_send_contact_list.
-
-	* gui/widgets/eab-gui-util.h (eab_send_contact) add "email_num"
-	arg, so we can specify the email address we want to be selected.
-
-	* gui/widgets/eab-contact-display.c (on_link_clicked): add
-	(ifdefed out at the moment) code to handle mailto: urls
-	internally, instead of farming them out to gnome_url_show.
-	(render_contact): same.
-
-2004-05-18  Jerome Lacoste  <jerome@coffeebreaks.org>
-
-	Fixes #57940
-
-	* gui/widgets/e-addressbook-view.c: "Save as VCard" ->
-	"Save as VCard..."
-
-2004-05-17  Hans Petter Jansson  <hpj@ximian.com>
-
-	* gui/contact-editor/e-contact-editor.c (e_contact_editor_init):
-	Hook up image button.
-	(e_contact_editor_dispose): Dispose of file selector if it's around.
-	(image_clicked): Implement.
-	(file_selector_deleted): Implement.
-	(image_cleared_cb): Implement.
-	(image_selected_cb): Implement.
-
-	* gui/contact-editor/contact-editor.glade: Make the contact image
-	be a button that lets you change or discard the image.
-
-2004-05-17  Jeffrey Stedfast  <fejj@novell.com>
-
-	* gui/contact-list-editor/e-contact-list-editor.c: Change E_PIXMAP
-	size args over to E_ICON_SIZE_* values.
-
-	* gui/component/addressbook-view.c: Change E_PIXMAP size args over
-	to E_ICON_SIZE_* values.
-
-	* gui/widgets/e-minicard.c (e_minicard_init): Use an E_ICON_SIZE
-	enum value for the icon_size argument to get_icon.
-
-	* gui/widgets/eab-gui-util.c (eab_create_image_chooser_widget):
-	Use E_ICON_SIZE_DIALOG as the icon_size argument to
-	get_icon_filename.
-
-	* gui/widgets/eab-contact-display.c (on_url_requested): Use an
-	E_ICON_SIZE enum as the icon_size argument to get_icon_filename.
-
-	* gui/contact-editor/e-contact-editor-im.c
-	(setup_service_optmenu): Use E_ICON_SIZE_MENU here.
-
-	* gui/component/select-names/e-select-names-popup.c
-	(populate_popup_contact): Use E_ICON_SIZE_MENU here instead of 16.
-
-	* gui/component/addressbook-view.c (set_status_message): Use the
-	E_ICON_SIZE corresponding to 16x16 pixels.
-
-2004-05-12  Hans Petter Jansson  <hpj@ximian.com>
-
-	* gui/contact-editor/contact-editor.glade: Add PO box entries.
-
-	* gui/contact-editor/e-contact-editor.c (init_address_record): Hook
-	up PO box entry.
-	(fill_in_address_record): Ditto.
-	(extract_address_record): Ditto.
-
-2004-04-18  S N Tejasvi  <tejasvi_sn@gawab.com>
-
-	Fixes bug #55208.
-
-	* gui/contact-editor/e-contact-editor.c (save_contact):
-	Do e_contact_editor_is_valid check to check the birth date and
-	anniversary date format when user wants to save and warn him.
-
-2004-05-11  Not Zed  <NotZed@Ximian.com>
-
-	* gui/component/addressbook-component.c (impl_upgradeFromVersion):
-	set exception properly on failure.
-
-	* gui/component/addressbook-migrate.c (addressbook_migrate): take
-	a GError error return.  Doesn't do anything with it ... but ...
-
-2004-05-11  Dan Winship  <danw@ximian.com>
-
-	* gui/component/GNOME_Evolution_Addressbook.server.in.in: Remove
-	the addressbook control
-
-	* gui/component/component-factory.c (factory): Remove support for
-	the addressbook control
-
-	* gui/component/addressbook-view.c: Remove all the property-bag
-	stuff.
-
-2004-05-11  Sivaiah Nallagatla  <snallagatla@novell.com>
-                                                                                                                             
-       * gui/component/addressbook-config.c (dialog_to_source) : see if the selected
-        group is groupwise one and setup the relative uri and other properties into
-        e-source
-
-2004-05-10  Suresh Chandrasekharan <suresh.chandrasekharan@sun.com>
-
-	Fixes bug #44196 addressbook table view uses ASCII sort
-
-	* addressbook/gui/widgets/e-addressbook-view.c (compare_subitems):
-	Uses g_utf8_collate for right UTF8 sort. Made faster using 
-	g_utf8_collate_key.
-
-	Also fixes a bug in 
-
-	* gui/component/select-names/e-select-names.c (select_entry_changed):
-	Changed g_utf8_collate for strcmp as we are already comparing keys
-	made from g_utf8_collate_key.
-
-2004-05-08  Enver ALTIN  <enver.altin@frontsite.com.tr>
-
-	* gui/component/GNOME_Evolution_Addressbook.server.in.in:
-	  Fix parts of #53466.
-
-2004-05-05  Hans Petter Jansson  <hpj@ximian.com>
-
-	* gui/contact-editor/e-contact-editor.c (init_address_textview):
-	Implement.
-	(init_address_record): Init textview.
-	(fill_in_address_textview): Implement.
-	(fill_in_address_record): Fill in textview.
-	(extract_address_textview): Implement.
-	(extract_address_record): Extract from textview.
-
-	* gui/contact-editor/contact-editor.glade: Combine address-[12] fields
-	into one multiline text view, as per Anna's new design.
-
-2004-05-04  Larry Ewing  <lewing@ximian.com>
-
-	* gui/component/addressbook-config.c (query_for_supported_bases):
-	fixup the dialog initialization.
-
-2004-05-04  Hans Petter Jansson  <hpj@ximian.com>
-
-	* gui/contact-editor/e-contact-editor.c (phones_default): Use defaults
-	from Anna.
-	(im_service_default): Ditto.
-	(email_default): Ditto.
-	(im_location): Renamed to common_location, as it's used by both IM
-	and e-mail.
-	(init_email_record_location): im_location -> common_location
-	(init_im_record_location): Ditto.
-	(email_index_to_location): Ditto.
-	(im_index_to_location): Ditto.
-	(get_email_location): Ditto.
-	(get_im_location): Ditto.
-	(fill_in_email_record): Consult defaults.
-	(fill_in_im_record): Ditto.
-
-2004-05-04  Hans Petter Jansson  <hpj@ximian.com>
-
-	* gui/contact-editor/e-contact-editor.c (set_entry_activate_signals):
-	Remove blog, add home page.
-	(set_entry_changed_signals): Ditto.
-	(setup_tab_order): Ditto.
-	(field_mapping): Ditto.
-	(widget_field_mappings): Ditto.
-
-	* gui/contact-editor/contact-editor.glade: Replace blog with home
-	page.
-
-2004-05-03  Hans Petter Jansson  <hpj@ximian.com>
-
-	* gui/widgets/e-minicard.c (e_minicard_set_property): Do ref, unref
-	in right order, so the same contact can be set twice without ill
-	effects.
-	(e_minicard_finalize): NULL pointers after unreffing their objects.
-
-2004-05-03  Hans Petter Jansson  <hpj@ximian.com>
-
-	* gui/contact-editor/e-contact-editor.c (phones_default): Establish
-	defaults for the phone number option menus.
-	(fill_in_phone_record): Fall back to defaults.
-
-2004-05-03  Hans Petter Jansson  <hpj@ximian.com>
-
-	* gui/contact-editor/e-contact-editor.c (show_help_cb): Implement.
-	(e_contact_editor_init): Hook up the help button.
-
-	* gui/contact-editor/contact-editor.glade: Give the help button a
-	sensible name.
-
-2004-05-03  Larry Ewing  <lewing@ximian.com>
-
-	* gui/component/ldap-config.glade: bump the maximum download limit
-	to 1000.
-
-	* gui/component/addressbook-config.c (add_folder_modify): set the
-	email entry sesitive only when anonymous isn't selected.  Make the
-	details tab insensitive if the method is local.
-
-	* gui/component/ldap-config.glade: remove unused colorpicker.
-
-2004-05-03  JP Rosevear  <jpr@ximian.com>
-
-	* gui/component/GNOME_Evolution_Addressbook.server.in.in: set the
-	config item type
-
-2004-05-02  Sivaiah Nallagatla  <snallagatla@novell.com>
-                                                                                                                             
-        * gui/component/addressbook-config.c (dialog_to_source) : see if the selected
-         group is groupwise one and setup the relative uri and other properties into
-         e-source
-
-2004-05-01  Larry Ewing  <lewing@ximian.com>
-
-	* gui/component/addressbook-config.c: sensitize the details dialog
-	where appropriate.  Don't try to read from widgets that don't
-	exist.
-
-2004-04-30  Chris Toshok  <toshok@ximian.com>
-
-	* util/e-destination.c (e_destination_set_contact): don't use
-	"email" twice for a variable name.. even though they don't really
-	conflict, it's ugly and confusing.
-
-2004-04-30  Enver ALTIN  <enver.altin@frontsite.com.tr>
-
-	* gui/component/GNOME_Evolution_Addressbook.server.in.in: Fixed a
-	type-o.
-
-2004-04-29  Hans Petter Jansson  <hpj@ximian.com>
-
-	* printing/e-contact-print.c: Don't dereference the file_as pointer
-	if it turns out to be NULL.
-
-2004-04-28  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* gui/component/addressbook-migrate.c: We need a migration dialog
-	if the revision <= 10. Fixes bug #57770.
-
-2004-04-27  Larry Ewing  <lewing@ximian.com>
-
-	* gui/component/addressbook-config.c: remove debug spew.
-
-2004-04-27  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* gui/component/addressbook-migrate.c (addressbook_migrate):
-	Migrate pilot data.
-	(migrate_pilot_data): Oops. Apparently the addressbook didn't
-	change the format of the changelog file from db3 to xml, so fix to
-	simply copy the file over.
-
-2004-04-27  Rodney Dawes  <dobey@ximian.com>
-
-	* gui/contact-editor/e-contact-editor-fullname.c:
-	(e_contact_editor_fullname_init):
-	* gui/contact-editor/fullname.glade:
-	* gui/search/e-addressbook-search-dialog.c (eab_search_dialog_init):
-	Update dialog vbox and action area border widths to be HIG compliant
-	Update main child widget border widths to be HIG compliant
-
-2004-04-27  Larry Ewing  <lewing@ximian.com>
-
-	* gui/component/addressbook-config.c (source_to_dialog_new): fix
-	warnings, remove unused code.
-
-	* gui/component/addressbook-config.c: start integrate the new
-	dialog.
-
-	* gui/component/ldap-config.glade: add the new dialog.
-
-2004-04-26  Rodney Dawes  <dobey@ximian.com>
-
-	* gui/contact-editor/contact-editor.glade:
-	* gui/contact-editor/e-contact-editor.c (e_contact_editor_init):
-	Set spacing around notebook widget and the dialog's action area and
-	vbox widgets to be compliant with the HIG dialog specs
-
-2004-04-25  Chris Toshok  <toshok@ximian.com>
-
-	* importers/evolution-ldif-importer.c (ldif_fields): add "mobile"
-	mapping to E_CONTACT_PHONE_MOBILE, which is what thunderbird uses
-	(and really what we should have always been using.)
-
-2004-04-23  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* conduit/address-conduit.c (get_next_mail): The firt EMAIL item
-	is EMAIL_1, not EMAIL (assuming we want simple strings).
-	(local_record_from_ecard): Use e_contact_get() for getting the
-	EContactAddress. Loop from FIRST_ADDRESS_ID up to and *including*
-	LAST_ADDRESS_ID.
-	(ecard_from_remote_record): When searching for an address field,
-	loop from FIRST_ADDRESS_ID up to and *including* LAST_ADDRESS_ID.
-	(pre_sync): Use e_book_query_any_field_contains() rather than
-	e_book_query_from_string ("#t") which doesn't work anyway.
-
-2004-04-20  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* conduit/address-conduit.c (map_name): Updated to use
-	~/.evolution as the evolution directory rather than ~/evolution.
-
-2004-04-23  Dan Winship  <danw@ximian.com>
-
-	* gui/component/component-factory.c (factory): Fix the addressbook
-	control to not crash. (Temporary fix.)
-
-2004-04-23  Chris Toshok  <toshok@ximian.com>
-
-	* gui/widgets/eab-gui-util.c (added_cb): this signal takes an
-	EContact* too.
-	(modified_cb): same.
-	(deleted_cb): same.
-	(eab_error_dialog): pad the table of status messages out with the
-	new status codes, and don't specify gui text for messages that
-	aren't generated by the backends.  This fixes the "U" error
-	messages people were seeing.
-
-2004-04-22  Hans Petter Jansson  <hpj@ximian.com>
-
-	* gui/contact-editor/contact-editor.glade: Correct the dialog's title.
-
-	* gui/contact-editor/e-contact-editor.c (init_email_record_location):
-	Connect to entry's activate signal.
-	(init_phone_record_type): Ditto.
-	(init_im_record_location): Ditto.
-	(init_address_field): Ditto.
-	(set_entry_changed_signal_field): Remove unnecessary checks.
-	(set_urlentry_changed_signal_field): Ditto.
-	(set_entry_changed_signals): Ditto.
-	(set_entry_activate_signal_field): Implement.
-	(set_urlentry_activate_signal_field): Implement.
-	(set_entry_activate_signals): Implement.
-	(e_contact_editor_init): Call set_entry_activate_signals ().
-
-2004-04-22  Hans Petter Jansson  <hpj@ximian.com>
-
-	* gui/contact-editor/e-contact-editor.c (e_contact_editor_class_init):
-	Override the save_contact function.
-	(e_contact_editor_save_contact): Implement.
-	(e_contact_editor_init): Remove some unnecessary checks - if
-	something's the matter with the UI files, that needs to be warned
-	about and fixed, not silently worked around.
-
-2004-04-22  Hans Petter Jansson  <hpj@ximian.com>
-
-	* gui/contact-editor/contact-editor.glade: Make the window be a
-	GtkDialog.
-
-2004-04-21  Hans Petter Jansson  <hpj@ximian.com>
-
-	* gui/contact-editor/e-contact-editor.c (free_attr_list): Implement.
-	(extract_email): Preserve offscreen addresses.
-	(extract_phone): Preserve offscreen phone numbers.
-	(extract_im): Preserve offscreen IM accounts.
-
-2004-04-21  Hans Petter Jansson  <hpj@ximian.com>
-
-	* gui/contact-editor/e-contact-editor.c: Add defines for the slot
-	counts for email, phone, im, address.
-	(phones): Add E_CONTACT_PHONE_COMPANY back in, now that we can
-	differentiate it.
-	(init_email): Use EMAIL_SLOTS and a loop.
-	(init_im): Ditto for IM_SLOTS.
-	(init_phone): Ditto for PHONE_SLOTS.
-	(fill_in_address)
-	(extract_address)
-	(init_address): Ditto for ADDRESS_SLOTS.
-	(get_ui_slot_param): Implement.
-	(get_ui_slot): Implement.
-	(set_ui_slot): Implement.
-	(alloc_ui_slot): Implement.
-	(fill_in_email): Add code to preserve spatial organization.
-	(extract_email): Ditto.
-	(fill_in_phone): Ditto.
-	(extract_phone): Ditto.
-	(fill_in_im): Ditto.
-	(exctract_im): Ditto.
-
-2004-04-21  Chris Toshok  <toshok@ximian.com>
-
-	* gui/component/addressbook-migrate.c (setup_progress_dialog):
-	store off the label as well as the folder name label, so we can
-	reuse the dialog and update the label.  Also, no longer take the
-	string to display here.
-	(dialog_set_label): new function.
-	(migrate_contact_lists_for_local_folders): call
-	dialog_set_folder_name here so we can see the folder being
-	migrated.
-	(migrate_company_phone_for_local_folders): new function for
-	updating the way we store company phone numbers.
-	(addressbook_migrate): split out the logic for setting up/tearing
-	down the dialog from the individual migration points so we can
-	reuse the same dialog and not have get destroyed/recreated for
-	each stage.  Also add a new migration point ( <= 1.5.8) for
-	migrating the company phone numbers.
-
-2004-04-21  Sivaiah Nallagatla   <snallagatla@novell.com>
-
-	* gui/component/addressbook.c (remove_parameters_from_uri) : added
-	a new function to striff off any parameters present after ';' in
-	the uri
-	(load_source_auth_cb) (addressbook_authenticate) : call above
-	function to remove anything after ';' before passing uri to
-	e-password calls
-	
-2004-04-21  Hans Petter Jansson  <hpj@ximian.com>
-
-	* gui/contact-editor/e-contact-editor.h (EContactEditor): Remove
-	unused fields.
-
-	* gui/contact-editor/e-contact-editor.c (emails): Remove.
-	(e_contact_editor_init): Don't init unused fields.
-	(e_contact_editor_dispose): Don't free/clear unused fields.
-	(enable_writable_fields): Don't use email_choice anymore. Enable
-	checkbutton-htmlmail only once.
-
-2004-04-21  Hans Petter Jansson  <hpj@ximian.com>
-
-	* gui/contact-editor/contact-editor.glade: Make the phone type
-	selectors be option menus.
-
-	* gui/contact-editor/e-contact-editor.c (phones): Store the phone
-	param mappings locally.
-	(set_entry_changed_signals): Don't special-case phone entries here.
-	(enable_writable_fields): Don't mess with the phone widgets anymore.
-	(set_fields): Use fill_in_phone ().
-	(extract_info): Use extract_phone ().
-	(phone_index_to_type): Implement.
-	(get_phone_type): Implement.
-	(get_attributes_named): Implement.
-	(set_attributes_named): Implement.
-	(fill_in_phone_record): Implement.
-	(extract_phone_record): Implement.
-	(fill_in_phone): Implement.
-	(extract_phone): Implement.
-	(init_phone_record_type): Implement.
-	(init_phone): Implement.
-	(connect_arrow_button_signal): Remove.
-	(connect_arrow_button_signals): Remove.
-	(phone_entry_changed): Remove.
-	(set_entry_changed_signal_phone): Remove.
-	(_arrow_pressed): Remove.
-	(_phone_arrow_pressed): Remove.
-	(e_contact_editor_build_ui_info): Remove.
-	(e_contact_editor_build_phone_ui): Remove.
-	(set_phone_field): Remove.
-
-2004-04-21  Not Zed  <NotZed@Ximian.com>
-
-	* gui/component/addressbook-view.c (addressbook_view_init): fix
-	for e_user_creatable_items handle api changes.
-
-2004-04-20  Chris Toshok  <toshok@ximian.com>
-
-	* gui/widgets/e-addressbook-view.etspec: use cursor-mode="line" to
-	get rid of the annoying cell cursor.
-
-	* gui/widgets/eab-gui-util.c (eab_create_image_chooser_widget):
-	create the image chooser even if we aren't given an initial
-	filename.
-
-	* gui/contact-editor/e-contact-editor.c (new_target_cb):
-	addressbook_show_load_error_dialog -> eab_load_error_dialog.
-
-2004-04-19  Rodney Dawes  <dobey@ximian.com>
-
-	* gui/contact-editor/contact-editor.glade: Set the default image for
-	the contact photo to be the stock_person image in the icon theme
-
-2004-04-19  Michael Terry  <mike@mterry.name>
-
-	* gui/component/GNOME_Evolution_Addressbook.server.in.in:
-	* gui/component/addressbook-component.c:
-	* gui/component/addressbook-view.c:
-	* gui/component/select-names/e-select-names-popup.c:
-	* gui/contact-editor/e-contact-editor-address.c:
-	* gui/contact-editor/e-contact-editor-fullname.c:
-	* gui/contact-editor/e-contact-editor-im.c:
-	* gui/contact-list-editor/contact-list-editor.glade:
-	* gui/contact-list-editor/e-contact-list-editor.c:
-	* gui/merging/eab-contact-commit-duplicate-detected.glade:
-	* gui/merging/eab-contact-duplicate-detected.glade:
-	* gui/widgets/e-minicard.c:
-	* gui/widgets/eab-contact-display.c:
-	* gui/widgets/eab-gui-util.c: Update the addressbook to use the icon
-	theme via the EIconFactory object in e-util
-
-2004-04-18  Chris Toshok  <toshok@ximian.com>
-
-	* gui/contact-editor/e-contact-editor.c (nonempty): new macro.
-	(extract_email): only create/add the attribute if the email
-	address is nonempty.
-	(extract_im): same, but for im accounts.
-	(extract_address_record): same, but for addresses.
-
-2004-04-16  Hans Petter Jansson  <hpj@ximian.com>
-
-	* gui/contact-editor/contact-editor.glade: Add "wants HTML" checkbox.
-
-	* gui/contact-editor/contact-editor.c (email_location_to_index)
-	(email_entry_changed)
-	(set_entry_changed_signal_email)
-	(file_save_cb)
-	(file_close_cb)
-	(file_save_as_cb)
-	(file_send_as_cb)
-	(file_send_to_cb)
-	(contact_deleted_cb)
-	(delete_cb)
-	(print_cb)
-	(print_envelope_cb)
-	(tb_save_and_close_cb)
-	(verbs)
-	(pixmaps)
-	(create_ui): Remove unused funcs.
-	(command_state_changed): Remove bonobo calls.
-	(e_contact_editor_init): Remove bonobo stuff.
-	(fill_in_email)
-	(fill_in_im): Remove unused vars.
-
-2004-04-16  Chris Toshok  <toshok@ximian.com>
-
-	* gui/component/addressbook-component.c (book_loaded_cb): new
-	function, use the async interface to load the book.
-	(impl_requestCreateItem): use
-	e_book_async_get_default_addressbook.
-
-2004-04-16  Hans Petter Jansson  <hpj@ximian.com>
-
-	* gui/contact-editor/contact-editor.glade: Commit new contact editor
-	UI by Anna.
-
-	* gui/contact-editor/e-contact-editor.c: Comment out bonobo includes.
-	(_email_arrow_pressed)
-	(_address_arrow_pressed)
-	(set_im_fields)
-	(find_address_mailing)
-	(set_address_field)
-	(add_im_clicked)
-	(edit_im_clicked)
-	(remove_im_clicked)
-	(im_button_press_cb)
-	(im_selected_cb)
-	(im_treeview_drag_data_get_cb)
-	(im_treeview_drag_data_rcv_cb)
-	(setup_im_treeview)
-	(email_entry_changed)
-	(address_to_text)
-	(text_to_address)
-	(address_text_changed)
-	(address_mailing_changed)
-	(full_addr_clicked)
-	(e_contact_editor_build_email_ui)
-	(e_contact_editor_build_address_ui)
-	(_email_arrow_pressed)
-	(_address_arrow_pressed)
-	(find_address_mailing)
-	(add_im_field)
-	(set_im_fields)
-	(set_address_field): Removed.
-	(address_name)
-	(im_service)
-	(im_location): Add lookup structs.
-	(init_email_record_location)
-	(init_email)
-	(fill_in_email_record)
-	(extract_email_record)
-	(email_location_to_index)
-	(email_index_to_location)
-	(im_index_to_location)
-	(get_email_location)
-	(get_im_location)
-	(fill_in_email)
-	(extract_email)
-	(init_im_record_location)
-	(init_im_record_service)
-	(init_im)
-	(fill_in_im_record)
-	(fill_in_im)
-	(extract_im_record)
-	(extract_im)
-	(init_address_field)
-	(init_address_record)
-	(init_address)
-	(fill_in_address_field)
-	(fill_in_address_record)
-	(fill_in_address)
-	(extract_address_field)
-	(extract_address_record)
-	(extract_address)
-	(file_save_and_close_cb)
-	(file_cancel_cb)
-	(set_entry_text): Implemented.
-	(connect_arrow_button_signals): Updated some widget names.
-	(set_entry_changed_signals): Removed dead widgets, updated names for
-	others.
-	(print_cb)
-	(tb_save_and_close_cb)
-	(create_ui): Disabled Bonobo toolbar/menus.
-	(e_contact_editor_init): Disabled Bonobo toolbar/menus. Init new
-	UI elements. Remove init of old UI elements.
-	(command_state_changed): Disabled Bonobo toolbar/menus. Act on new
-	ok/cancel buttons.
-	(_phone_arrow_pressed): Updated widget names.
-	(set_phone_field): Use set_entry_text ().
-	(set_fields): Update widget names, remove old address code, call new
-	fill_in_* code.
-	(field_mapping): Remove dead widgets.
-	(widget_field_mapping): Ditto.
-	(enable_writable_fields): Remove calls for old email/address UI.
-	Update some names.
-	(fill_in_info): Don't find_address_mailing() or set_im_fields().
-	(extract_info): Call new extraction funcs.
-
-2004-04-14  Chris Toshok  <toshok@ximian.com>
-
-	* gui/component/addressbook-view.c (book_open_cb): force the info
-	label to update its contents here if the load was successful.
-
-	* gui/component/addressbook-migrate.c (migration_context_new): use
-	e_book_get_addressbooks instead of getting source_list from the
-	component.
-	(migration_context_free): unref the source_list.
-
-	* gui/component/addressbook-config.c (dialog_to_source): sync the
-	dialog->source_list, since we have it.
-
-2004-04-14  Chris Toshok  <toshok@ximian.com>
-
-	* gui/component/addressbook.c: rip out tons of functions - they
-	all live in addressbook-view.c now.  the only thing left in this
-	file is the addressbook_load* calls that do authentication.
-
-	* gui/component/addressbook.h: remove prototypes for
-	addressbook_new_control and addressbook_load_uri (it was #if 0'ed
-	anyway.)
-
-	* gui/component/addressbook-component.h: remove prototypes for
-	_peek_activity_handler and _peek_source_list.
-
-	* gui/component/addressbook-component.c: rip out tons of functions
-	- they all live in addressbook-view.c now.
-	(impl_createControls): simplify this immensely.  we just create an
-	AddressbookView and get the various widgets/controls from it.
-	(impl_requestCreateItem): this function loses slightly - it needs
-	per-window info (the selected source) but there's no way to get
-	it.  So we load the default book.  Also, this uses a synchronous
-	e_book call to load the book, which is not good.
-	(addressbook_component_peek_source_list): nuke, not used by
-	anything anyway.
-	(addressbook_component_peek_activity_handler): nuked, not used by
-	anything - and it's per-window anyway.
-
-	* gui/component/Makefile.am (libevolution_addressbook_la_SOURCES):
-	add addressbook-view.[ch].
-
-	* gui/component/addressbook-view.[ch]: rip out all of the per
-	window stuff from addressbook.[ch] and addressbook-component.[ch]
-	and put it here.
-
-2004-04-13  Chris Toshok  <toshok@ximian.com>
-
-	* gui/widgets/eab-contact-display.c (accum_address): disable the
-	map link for 2.0.
-
-2004-04-13  Larry Ewing  <lewing@ximian.com>
-
-	* gui/widgets/e-addressbook-view.c (create_table_view): add
-	GDK_ACTION_COPY to the supported drag types.  Connect to the
-	table_drag_data_delete callback.
-	(table_drag_data_delete): remove the drag rows.
-
-2004-04-13  Sivaiah Nallagatla <snallagatla@novell.com>
-
-        * gui/component/addressbook.c  (addressbook_authenicate):
-         added a check for new auth type "plain/password"
-         for groupwise in addressbook_authenicate function
-
-2004-04-12  Chris Toshok  <toshok@ximian.com>
-
-	* gui/widgets/eab-popup-control.c (email_menu_add_option): treat
-	"" the same as NULL (don't add it to the list).
-
-2004-04-12  Chris Toshok  <toshok@ximian.com>
-
-	* gui/component/addressbook.c (addressbook_load_default_book):
-	quiet valgrind uninitialized memory warning.
-
-2004-04-12  Chris Toshok  <toshok@ximian.com>
-
-	[ should fix #56537 ]
-	
-	* gui/widgets/eab-popup-control.c (EMPTY_ENTRY): use _(), not N_()
-	here.
-	(email_menu_add_options_from_contact): and g_strdup it here, so
-	that the g_list_foreach (... g_free ..) doesn't cause things to
-	blow up.
-	(email_menu_unset_options): nuke ifdefed function.
-	
-	* gui/widgets/eab-popup-control.h: don't include gtk.h, include
-	just what we need.
-
-2004-04-10  Chris Toshok  <toshok@ximian.com>
-
-	* gui/widgets/eab-gui-util.h: add prototypes for
-	eab_load_error_dialog and eab_search_result_dialog.
-
-	* gui/widgets/eab-gui-util.c (eab_load_error_dialog): the new
-	addressbook_show_load_error_dialog.
-	(eab_search_result_dialog): new function, the old contents of
-	addressbook.c:search_result.
-
-	* gui/component/addressbook.c
-	(addressbook_show_load_error_dialog): move this function to
-	eab-gui-utils.[ch]
-	(search_result): split out the body of this into
-	eab_search_result_dialog in eab-gui-utils.[ch].
-	(book_open_cb): call eab_load_error_dialog.
-
-	* gui/component/addressbook.h: remove prototype for
-	addressbook_show_load_error_dialog.
-
-2004-04-10  Chris Toshok  <toshok@ximian.com>
-
-	* util/e-destination.h: remove the e_destination_get_book api,
-	since the function doesn't exist.
-
-2004-04-09  Chris Toshok  <toshok@ximian.com>
-
-	* gui/component/addressbook-migrate.c (addressbook_migrate): bump
-	version required to 8 for the contact list migration foo.
-
-2004-04-09  Chris Toshok  <toshok@ximian.com>
-
-	* gui/component/addressbook-component.c
-	(selector_tree_drag_motion): pass GDK_CURRENT_TIME instead of a
-	function pointer to "time" to gdk_drag_status.  not sure if this
-	is right, but it's definitely more right than it was :)
-	(impl_createControls): create the info label and add it to the
-	sidebar control.  it's not hooked up yet.
-
-2004-04-09  Chris Toshok  <toshok@ximian.com>
-
-	* importers/evolution-ldif-importer.c (resolve_list_card): use the
-	new e_destination_export_to_vcard_attribute call to build up the
-	attributes.
-
-	* importers/evolution-vcard-importer.c (process_item_fn): if we're
-	importing a vcard that we wrote out previously containing xml in
-	the EMAIL attributes, DTRT and strip it out and use
-	e_destination_export_to_vcard_attribute to build up the proper
-	attribute.
-
-	* util/Makefile.am (libeabutil_la_SOURCES): remove
-	eab-destination.[ch] and add e-destination.[ch].
-
-	* printing/e-contact-print.c (e_contact_print_contact): we don't
-	have to worry about the "<?xml..."  EMAIL fields anymore.
-
-	* gui/widgets/eab-gui-util.c (eab_send_contact_list): just use the
-	value as the address (since that's what it is) in the list case.
-
-	* gui/widgets/eab-contact-display.c (render_contact_list): remove
-	the EABDestination stuff from here.
-	(eab_contact_display_render_compact): same.
-
-	* gui/widgets/e-minicard.c (activiate_editor): fix warnings - use
-	EAB_EDITOR instead of G_OBJECT.
-	(add_field): we don't have to worry about the "<?xml..."  EMAIL
-	fields anymore.
-	(remodel): same.
-
-	* gui/widgets/e-addressbook-treeview-adapter.c
-	(adapter_get_value): we don't have to worry about the "<?xml..."
-	EMAIL fields anymore.
-
-	* gui/widgets/e-addressbook-table-adapter.c
-	(addressbook_value_at): we don't have to worry about the
-	"<?xml..." EMAIL fields anymore.
-
-	* gui/contact-list-editor/e-contact-list-model.c
-	(contact_list_value_at): eab->e.
-	(contact_list_model_dispose): we're not a GtkObject, we're a
-	GObject.  rename _destroy to _dispose, and chain up to the parent
-	class's ::dispose.
-	(e_contact_list_model_class_init): GtkObject -> GObject, and
-	destroy -> dispose.
-	(e_contact_list_model_init): GtkObject -> GObject, and EAB -> E.
-	(e_contact_list_model_add_destination): EAB -> E.
-	(e_contact_list_model_add_email): same.
-	(e_contact_list_model_add_contact): same.
-	(e_contact_list_model_get_destination): same.
-
-	* gui/contact-list-editor/e-contact-list-editor.c
-	(table_drag_data_received_cb): add email num arg to
-	e_contact_list_model_add_contact.
-	(extract_info): fill in the vcard attributes instead of just
-	generating xml.
-	(fill_in_info): extract the values from the vcard attributes.
-
-	* gui/component/select-names/e-select-names-text-model.c
-	(e_select_names_text_model_insert_length): eab->e, and don't
-	sometimes copy, sometimes ::new.  always ::new.
-	(e_select_names_text_model_delete): same.
-	(e_select_names_text_model_obj_count): same.
-	(nth_obj_index): same.
-
-	* gui/component/select-names/e-select-names-table-model.c
-	(fill_in_info): eab -> e.
-
-	* gui/component/select-names/e-select-names-popup.c
-	(make_contact_editor_cb): eab -> e.
-	(change_email_num_cb): same.
-	(toggle_html_mail_cb): same.
-	(populate_popup_contact): same, and remove code that checks for
-	<?xml, then imports the EDestination.
-	(quick_add_cb): eab -> e.
-	(populate_popup_nocontact): same.
-	(e_select_names_populate_popup): same.
-
-	* gui/component/select-names/e-select-names-model.h: eab -> e, and
-	remove prototypes for nuked functions.
-
-	* gui/component/select-names/e-select-names-model.c
-	(destination_changed_proxy, send_changed, connect_destination,
-	disconnect_destination): nuke.
-	(e_select_names_model_duplicate): EAB -> E.
-	(e_select_names_model_get_textification): same.
-	(e_select_names_model_get_address_text): same.
-	(e_select_names_model_get_destination): same.
-	(e_select_names_model_export_destinationv): same.
-	(send_changed): same.
-	(e_select_names_model_import_destinationv): same.
-	(e_select_names_model_get_contact): same.
-	(e_select_names_model_contains): same.
-	(e_select_names_model_insert): same, and remove call to
-	connect_destination.
-	(e_select_names_model_append): same.
-	(e_select_names_model_replace): same, and remove call to
-	disconnect/connect_destination.
-	(e_select_names_model_delete): same.
-	(delete_all_iter): nuke.
-	(e_select_names_model_delete_all): use g_object_unref for the
-	foreach call.
-	(e_select_names_model_merge): EAB -> E.
-	(e_select_names_model_name_pos): same.
-	(e_select_names_model_name_pos): same.
-	(e_select_names_model_load_all_contacts): nuke.
-	(e_select_names_model_cancel_all_contact_load): nuke.
-	
-	* gui/component/select-names/e-select-names-manager.c
-	(clean_cb, focus_in_cb, focus_out_cb, completion_popup_cb): nuke.
-	(completion_handler): EAB -> E, and the signals are gone.
-
-	* gui/component/select-names/e-select-names-completion.c: in
-	general, s/eab_dest/e_dest and s/EABDest/EDest.
-	(e_select_names_completion_got_book_view_cb): move the
-	e_book_view_start to below the assignment of
-	sequence_complete_received, just to put my mind at ease.
-	(e_select_names_completion_stop_query): un-#if notyet the call to
-	e_book_cancel.
-	(e_select_names_completion_start_query): free the waiting_query
-	before assigning to it.
-
-	* gui/component/select-names/e-select-names-bonobo.c
-	(entry_set_property_fn): remove calls to
-	e_select_names_model_load_all_contacts, since that function is
-	dead.
-
-	* gui/component/addressbook-migrate.c (setup_progress_dialog):
-	take the label to display to the user as an arg.
-	(migrate_contact_lists_for_local_folders): loop over all contacts
-	in all local addressbooks looking for ones that have <?xml in
-	their EMAIL attributes.  for the ones we find, call
-	e_destination_export_to_vcard_attribute to build up the proper
-	attribute.
-	(addressbook_migrate): add in a clause for all versions under
-	1.5.7 to convert contact lists.  also, move the unrefs of the
-	sources/groups to outside the if, as they're created outside it.
-
-	* gui/component/Makefile.am (INCLUDES): remove the
-	addressbook/backend/ dirs, since libebook isn't there anymore
-	(nothing is, actually).  Add addressbook/util/.
-
-2004-04-09  Dan Winship  <danw@ximian.com>
-
-	* gui/component/addressbook.c (addressbook_new_control): create an
-	EUserCreatableItemsHandler
-	(addressbook_view_clear): destroy it
-	(control_activate): Activate it
-
-	* gui/component/addressbook-component.c
-	(impl__get_userCreatableItems): Add object/folder flags to the
-	creatable items. Rename "Address Book" to "Contacts Group" per new
-	specs
-
-2004-04-07  Chris Toshok  <toshok@ximian.com>
-
-	* util/e-destination.c (e_destination_copy): we don't have an
-	EBook* anymore.
-	(e_destination_clear): same.
-	(e_destination_set_contact): same.
-	(e_destination_set_book): same, just cache the source_uid.
-	(e_destination_set_book_uri): nuke.
-	(e_destination_set_contact_uid): we don't have an EBook*.
-	(e_destination_xml_decode): same.
-	(e_destination_export_to_vcard_attribute): new function, fill in
-	an EVCardAttribute with EDestination values.
-
-	* util/e-destination.h: add prototype for
-	e_destination_export_to_vcard_attribute.
-
-2004-04-07  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* gui/component/autocompletion-config.c
-	(source_selection_changed): Sync the changes here rather than
-	setting 'changed' on the config control (since that no longer
-	exists).
-	(autocompletion_config_control_new): Don't connect to an apply
-	signal, no such signal.
-
-2004-04-06  Chris Toshok  <toshok@ximian.com>
-
-	* util/e-destination.[ch]: old name, new trimmed down
-	implementation.  This will be replacing eab-destination.[ch].
-
-2004-04-06  Hao Sheng  <hao.sheng@sun.com>
-
-	* gui/widgets/e-minicard.c:
-	(e_minicard_event) : implement keyboard navigation(TAB/shift+TAB)
-	(activaite_editor) : add a new function to activiate contact editor
-	for support "Enter" key
-
-	Fixes #55056
-
-2004-04-05  Chris Toshok  <toshok@ximian.com>
-
-	* util/eab-destination.h: wrap this with the correct #ifdef.
-
-2004-04-05  Chris Toshok  <toshok@ximian.com>
-
-	* gui/merging/eab-contact-merging.c (match_query_callback): use
-	the correct glade filename.
-
-2004-04-01  Hari Prasad Nadig  <hp@ndeepak.info>
-
-	Fixes #53433.
-	
-	* gui/component/addressbook-config.c (searching_tab_check): added
-	the tab check for search tab.
-	(dialog_to_source): added timeout to be saved.
-	(source_to_dialog): just a piece to retrieve timeout from source.
-	(addressbook_root_dse_query): few necessary changes.
-	(do_ldap_root_dse_query): again few changes that were required.
-
-	* gui/component/ldap-config.glade : set right the Hscale to
-	display the selected value.
-	
-2004-03-30  Chris Toshok  <toshok@ximian.com>
-
-	[ fixes bug #34777 ]
-	
-	* gui/contact-editor/e-contact-editor.c (file_as_entry_changed):
-	set the window title to File As if the file as entry has something
-	in it.  "Contact Editor" otherwise.
-	(set_entry_changed_signals): hook up the file-as-entry's "changed"
-	signal.
-
-	* gui/contact-list-editor/e-contact-list-editor.c
-	(list_name_changed_cb): analogous fix, but "List Name" and
-	"Contact List Editor".
-
-2004-03-30  Chris Toshok  <toshok@ximian.com>
-
-	[ fixes bug #53544 ]
-	
-	* gui/component/addressbook-component.c
-	(impl__get_userCreatableItems): add "address_book" to the user
-	creatable items list. complete with incorrect accelerator and
-	shortcut!
-	(impl_requestCreateItem): handle "address_book" here, and plug a
-	memory leak.
-
-2004-03-30  Chris Toshok  <toshok@ximian.com>
-
-	[ part of the fix for #51977, the other part is in e-d-s ]
-	
-	* gui/widgets/e-addressbook-view.c (search_activated): the name of
-	the category list property has changed from "category" to
-	"category" list in 1.5.  track the change here to get category
-	searching working again.
-
-2004-03-30  Chris Toshok  <toshok@ximian.com>
-
-	[ part of the fix for #54528, the other part is in e-d-s ]
-	
-	* importers/evolution-vcard-importer.c (process_item_fn): get and
-	set the PHOTO attribute before storing the contact in the book.
-	this has the affect of making EContact sniff the image format.
-	the apple addressbook doesn't give PHOTO's a TYPE.
-
-
-2004-03-30  Chris Toshok  <toshok@ximian.com>
-
-	[ fixes bug #53094 ]
-	
-	* gui/component/ldap-config.glade: nuke
-	addressbook-sources-window.
-
-	* gui/component/addressbook-config.c (main): nuke, we don't need
-	this test case anymore, and it doesn't really work anyway anymore.
-
-2004-03-30  Chris Toshok  <toshok@ximian.com>
-
-	[ fixes bug #53634 ]
-	
-	* gui/widgets/e-addressbook-view.c (eab_view_new): call
-	e_search_bar_set_menu to add the Advanced... menu item to the
-	search menu, and connect to "menu_activated".
-	(search_menu_activated): new function, pop up the advanced dialog
-	if id == ESB_ADVANCED.
-	(query_changed): use e_search_bar_get_item_id instead of
-	g_object_get.
-
-	* gui/component/addressbook.c (verbs): remove ToolSearch.
-	(pixmaps): remove the ToolSearch pixmap.
-
-2004-03-30  Chris Toshok  <toshok@ximian.com>
-
-	[ gui part of the fix required for #48665 ]
-	
-	* gui/widgets/e-addressbook-model.c (get_view): pass the source's
-	"limit" property (if it exists) to e_book_async_get_book_view.
-
-2004-03-29  Larry Ewing  <lewing@ximian.com>
-
-	* gui/component/addressbook-component.c
-	(selector_tree_drag_data_received): call drag_finish properly.
-	(selector_tree_drag_motion): set the drag status properly.
-
-2004-03-25 Sivaiah Nallagatla <snallagatla@novell.com>
-
-	* gui/component/eab-editor.c (eab_editor_prompt_to_save_changes) : 
-	do  eab_editor_is_valid check only when user wants to save.
-
-2004-03-24  Chris Toshok  <toshok@ximian.com>
-
-	* gui/component/addressbook-component.c
-	(fill_popup_menu_callback): don't let the user delete their
-	Personal addressbook.  This is just a nice UI thingy..  A similar
-	fix needs to be made to e-d-s. so that attempts that circumvent a
-	nice UI will also fail.
-
-2004-03-24  Chris Toshok  <toshok@ximian.com>
-
-	* gui/widgets/eab-gui-util.c (eab_show_multiple_contacts): don't
-	know what I was thinking approving this change.  the _() was only
-	used in the plural case (in fact where n > 5), so a singular case
-	was never necessary, and neither was the call to ngettext.
-
-2004-03-24  Chris Toshok  <toshok@ximian.com>
-
-	* gui/contact-list-editor/e-contact-list-editor.c
-	(e_contact_list_editor_get_type): parent_type == EAB_TYPE_EDITOR.
-	(e_contact_list_editor_class_init): fill in editor_class virtual
-	functions, and remove all the signals.
-	(list_added_cb): call eab_editor_contact_* instead of emitting a
-	signal here.  also call eab_editor_close
-	(list_modified_cb): same.
-	(e_contact_list_editor_is_valid): new function.
-	(e_contact_list_editor_is_changed): same.
-	(e_contact_list_editor_get_window): same.
-	(file_close_cb): call eab_editor_ functions.
-	(list_deleted_cb): call eab_editor_contact_* instead of emitting a
-	signal here.  also call eab_editor_close
-	(delete_cb): call eab_editor_* functions.
-	(contact_list_editor_destroy_notify): call eab_editor_remove.
-	(e_contact_list_editor_new): call eab_editor_add, and remove the
-	g_object_ref/gtk_object_sink two-step.
-	(e_contact_list_editor_show): make static, and make arg EABEditor.
-	(e_contact_list_editor_raise): same.
-	(e_contact_list_editor_close): same.
-	(app_delete_event_cb): call eab_editor_ functions.
-	(command_state_changed): use eab_editor_is_valid instead of
-	is_named.
-	(e_contact_list_editor_request_close_all): nuke.
-	
-	* gui/contact-list-editor/e-contact-list-editor.h: nuke a bunch of
-	prototypes for functions that are now either virtual functions
-	from EABEditor or eab_editor_* functions.
-	(struct _EContactListEditor): we subclass from EABEditor.
-	(struct _EContactListEditorClass): same, and nuke all the signals.
-
-	* gui/contact-editor/e-contact-editor.c
-	(e_contact_editor_get_type): parent_type == EAB_TYPE_EDITOR.
-	(e_contact_editor_class_init): fill in editor_class virtual
-	functions, and remove all the signals.
-	(contact_moved_cb): call eab_editor_contact_* instead of emitting
-	a signal here.  also call eab_editor_close
-	(contact_added_cb): same.
-	(contact_modified_cb): same.
-	(e_contact_editor_close): rename from close_dialog.
-	(e_contact_editor_is_valid): new function.
-	(e_contact_editor_is_changed): new function.
-	(e_contact_editor_get_window): new function.
-	(file_close_cb): use eab_editor_ calls here.
-	(e_contact_editor_confirm_delete): nuke.
-	(contact_deleted_cb): call eab_editor_contact_* instead of
-	emitting a signal here.  also call eab_editor_close
-	(delete_cb): use eab_editor_ functions.
-	(e_contact_editor_dispose): chain up to our parent's ::dispose.
-	(contact_editor_destroy_notify): use eab_editor_remove.
-	(e_contact_editor_new): use eab_editor_add, and remove the
-	g_object_ref/gtk_object_sink two-step.
-	(_popup_position): nuke dead function.
-	(set_fields): i is an index, not a field_id.
-	(e_contact_editor_raise): make this static, and it takes an
-	EABEditor arg now, not a EContactEditor.
-	(e_contact_editor_show): same.
-	(e_contact_editor_request_close_all): nuke.
-	
-	* gui/contact-editor/e-contact-editor.h: nuke a bunch of
-	prototypes for functions that are now either virtual functions
-	from EABEditor or eab_editor_* functions.
-	(struct _EContactEditor): we subclass from EABEditor.
-	(struct _EContactEditorClass): same, and remove the signals.
-
-	* gui/widgets/e-addressbook-view.c (delete): call
-	eab_editor_confirm_delete.
-
-	* gui/widgets/eab-popup-control.c (contact_editor_cb): don't
-	bother calling e_contact_editor_raise since this is a new contact
-	editor anyway.
-
-	* gui/widgets/eab-gui-util.c (eab_show_contact_list_editor): use
-	EABEditor signals, and eab_editor_show.
-
-	* gui/widgets/e-minicard.h: "editor" is now of type EABEditor, not
-	GObject.
-
-	* gui/widgets/e-minicard.c (e_minicard_event): just use
-	eab_editor_raise instead of
-	e_contact_editor_raise/e_contact_list_editor_raise.
-
-	* gui/component/addressbook-component.c (impl_requestQuit):
-	implement this again, calling eab_editor_request_close_all.
-	(addressbook_component_class_init): fill in epv->requestQuit.
-
-2004-03-24  Chris Toshok  <toshok@ximian.com>
-
-	* gui/contact-editor/eab-editor.[ch]: superclass for both
-	EContactEditor and EContactListEditor.  A start toward simplifying
-	the interface to both of them, and a place to abstract code.
-
-	* gui/contact-editor/Makefile.am (libecontacteditor_la_SOURCES):
-	add eab-editor.[ch]
-
-2004-03-24  Danilo Segan  <dsegan@gmx.net>
-
-	* gui/widgets/e-addressbook-model.c (update_folder_bar_message):
-	Use ngettext for handling plural forms (fixes bug #53464).
-	* gui/widgets/eab-gui-util.c (eab_show_multiple_contacts): Likewise.
-	* gui/widgets/eab-vcard-control.c (pstream_load): Likewise.
-
-
-2004-03-22  Chris Toshok  <toshok@ximian.com>
-
-	[ fixes bug #53653, and a couple other instances ]
-	
-	* gui/widgets/eab-gui-util.c (file_exists): REJECT -> CANCEL, so
-	esc works (patch from Pratik V. Parikh <pratikvp@despammed.com>)
-	(save_it): REJECT -> CANCEL.
-	(eab_select_source): same.
-
-2004-03-17  Hans Petter Jansson  <hpj@ximian.com>
-
-	Fixes #53625.
-
-	* gui/widgets/eab-contact-display.c (render_contact): Show home and
-	mobile phone numbers too.
-
-2004-03-15  Sivaiah Nallagatla <snallagatla@novell.com>
-        
-	* gui/contact-editor/e-contact-editor.c (enable_writable_fields) :
-         loop only up to < G_N_ELEMENTS instead of <= G_N_ELEMENTS. Prevents
-         out of bound indexing of addresses array
-
-2004-03-15  Hao Sheng  <hao.sheng@sun.com>
-
-	* gui/component/Makefile.am : build a11y/addressbook dir
-	* gui/widgets/e-addressbook-view.c :
-	(eab_view_class_init) : add the accessibility support for 
-	EAddressbookView
-	* gui/widgets/e-minicard-view.c :
-	(e_minicard_view_class_init) : add the accessibility support for 
-	EMinicardView
-	* gui/widgets/e-minicard.c :
-	(e_minicard_class_init) : add the accessibility support for EMinicard
-                                                                                
-2004-03-10  Chris Toshok  <toshok@ximian.com>
-
-	* gui/widgets/eab-contact-display.c (render_address): #if 0 this,
-	since nothing uses it anymore.
-	(accum_address): new function, build up a GString.
-	(accum_name_value): same.
-	(accum_attribute): same.
-	(render_contact): don't just blindly render the work/personal
-	blocks, since if they're empty it looks stupid.  instead,
-	accumulate each block into a GString and only output the entire
-	block if the string is non-empty.
-
-2004-03-10  Chris Toshok  <toshok@ximian.com>
-
-	* gui/contact-editor/e-contact-editor.c (phone_entry_changed):
-	phone_choice is an index into the phones array.
-	(_phone_arrow_pressed): same.
-	(address_text_changed): address_choice is an index into the
-	addresses array.
-	(_address_arrow_pressed): same.
-	(set_address_field): same.
-	(_email_arrow_pressed): email_choice is an index into the emails
-	array.
-	(full_addr_clicked): same, and same with
-	s/addresses/address_editable.
-	(e_contact_editor_init): initialize the *_choice fields as indices
-	into their respective *es arrays.
-	(e_contact_editor_build_address_ui): initialize the labels from
-	the addresses array.
-	(set_fields): *_choice fields are indices into *es arrays.
-	(enable_writable_fields): same.
-
-2004-03-09  Rodney Dawes  <dobey@ximian.com>
-
-	* gui/contact-editor/e-contact-editor.c (_arrow_pressed): Don't try
-	to calculate the position of the popup menu for the dropdowns
-	
-2004-03-09  Rodney Dawes  <dobey@ximian.com>
-
-	* gui/contact-editor/e-contact-editor-im.c (e_contact_editor_im_edit):
-	Remove the dialog separator, and set appropriate border widths for the
-	button area box and the dialog's vbox
-	* gui/contact-editor/im.glade: Apply patch from Christian Neumair to
-	make the IM editor dialog HIG compliant
-
-2004-03-08  Sivaiah Nallagatla <snallagatla@novell.com>
-	* gui/contact-editor/e-contact-editor.c (enable_writable_fields):
-	fixed a typo, which is causing probelm in building up email ui
-	
-2004-03-04  Sivaiah Nallagatla <snallagatla@novell.com>
-                                                                                                                             
-        * gui/component/addressbook-config.c :
-        (addressbook_add_server_druid) : maintain a list of only those source groups which are added to menu
-        instead of all
-        (source_group_changed_cb) : use the new list to get the selected group
-        (addressbook_source_dialog_destroy) : free the new list
-
-2004-03-04  Not Zed  <NotZed@Ximian.com>
-
-	** See #54991.
-	
-	* gui/component/select-names/e-select-names-completion.c
-	(e_select_names_completion_start_query): dont try to unref a null
-	query.
-	(name_style_query): use a GString to build the query, so we can
-	use e_sexp_encode_string to properly encode the sub terms.
-
-2004-03-03  Hans Petter Jansson  <hpj@ximian.com>
-
-	* gui/component/addressbook-component.c (delete_addressbook_cb):
-	Set error to NULL before using it.
-
-2004-03-03  Hans Petter Jansson  <hpj@ximian.com>
-
-	* gui/component/addressbook-component.c (delete_addressbook_cb):
-	Remove local data, with error reporting on failure.
-
-2004-03-02  Larry Ewing  <lewing@ximian.com>
-
-	* gui/component/addressbook-component.c: add drop support for
-	text/x-vcard to the source list.
-
-2004-02-27  Chris Toshok  <toshok@ximian.com>
-
-	* gui/widgets/eab-contact-display.c
-	(eab_contact_display_render_compact): ref the pixbuf before we
-	close/unref the loader so the pixbuf sticks around, and make the
-	scaling logic a bit more transparent.
-
-2004-02-27  Rodney Dawes  <dobey@ximian.com>
-
-	* gui/contact-editor/contact-editor.glade: Change the button relief
-	back to normal for the drop-down buttons and move the text labels
-	inside the buttons as well
-
-2004-02-27  Chris Toshok  <toshok@ximian.com>
-
-	* gui/widgets/e-addressbook-view.c (eab_view_set_property): add
-	missing "break" to PROP_SOURCE's case.
-
-2004-02-27  Rodney Dawes  <dobey@ximian.com>
-
-	* gui/contact-editor/contact-editor.glade: Get rid of some extraneous
-	event boxes that were not needed/used for anything really
-	Set the button relief for the pop-down buttons to NONE
-	Set the shadow type for the arrows in the pop-down buttons to NONE,
-	so that we look good with themes that actually handle shadow types on
-	arrows, since most things just ignore the shadow type anyway
-
-	Fixes #8516
-
-2004-02-26  Hans Petter Jansson  <hpj@ximian.com>
-
-	* util/eab-destination.c (name_and_email_cb): Move unused variable
-	declaration inside notyet conditional.
-
-	* printing/e-contact-print.c: Include gal/util/e-util.h
-
-	* gui/merging/eab-contact-compare.c (eab_contact_locate_match): Cast
-	callback to an EBookCallback.
-	(eab_contact_locate_match_full): Ditto.
-
-	* gui/contact-editor/e-contact-quick-add.c (quick_add_set_name):
-	Remove unused variable and cast 3rd arg to e_contact_set () (perhaps
-	this should take a gconstpointer?).
-
-	* gui/contact-editor/e-contact-editor-im.c (setup_service_optmenu):
-	Remove unused variable.
-
-	* gui/component/select-names/e-select-names.c (e_select_names_init):
-	Cast the vbox to a GtkBox.
-
-	* gui/component/addressbook-config.c (dialog_to_source): Correctly cast
-	the spin button to a GtkSpinButton, not a GtkEntry.
-
-	* gui/component/addressbook-component.c (load_primary_selection):
-	Remove unused variable.
-
-2004-02-26  Chris Toshok  <toshok@ximian.com>
-
-	* gui/widgets/eab-contact-display.c (render_contact): add the
-	Groupwise IM attributes to the list of those we render.
-
-2004-02-26  Chris Toshok  <toshok@ximian.com>
-
-	* gui/widgets/e-addressbook-view.c (set_view_preview): call
-	eab_view_show_contact_preview here so we maintain the preview
-	state when switching folders.  we don't (yet... won't ever?) have
-	per-addressbook preview settings.
-
-2004-02-26  Chris Toshok  <toshok@ximian.com>
-
-	* gui/widgets/e-addressbook-view.c
-	(eab_view_show_contact_preview): view->scrolled ->
-	view->contact_display.  fixes crash.
-
-2004-02-26  Chris Toshok  <toshok@ximian.com>
-
-	* gui/contact-editor/e-contact-editor.c (edit_im_clicked): fix
-	checks for locations.
-
-2004-02-26  Chris Toshok  <toshok@ximian.com>
-
-	* gui/contact-editor/im.glade: set the location label/option menu
-	to visible.
-
-	* gui/contact-editor/e-contact-editor.c (add_im_clicked): build up
-	the vcard attributes manually so we can set the TYPE= parameter to
-	the location the user specifies.
-	(edit_im_clicked): same.  Also, use COLUMN_IM_LOCATION_TYPE, which
-	is not localized to pass the location to the editor.
-	(remove_im_clicked): reindent.
-	(im_treeview_drag_data_get_cb): same.
-	(im_treeview_drag_data_rcv_cb): same.
-	(setup_im_treeview): add another column for the (non-localized)
-	location type, and reindent.
-	(add_im_field): use the new attribute api for EContact so we can
-	get the location of each account, and set things appropriately on
-	the store.
-
-	* gui/contact-editor/e-contact-editor-im.c
-	(e_contact_editor_im_class_init): reindent.
-	(e_contact_editor_im_new): same.
-	(fill_in_info): same.
-
-2004-02-25 Sivaiah Nallagatla <snallagatla@novell.com>
-
-	* gui/contact-editor/e-contact-editor-im.c : added 
-	groupwise im related label and icon image file name
-	
-	* gui/contact-editor/e-contact-editor.c : 
-	(im_treeview_drag_data_get_cb), (im_treeview_drag_data_rcv_cb) :
-	(set_im_fields) : added code to add Gw Im id to contact-editor 
-	
-
-2004-02-24  Hans petter Jansson  <hpj@ximian.com>
-
-	* gui/contact-editor/e-contact-quick-add.c (quick_add_set_name):
-	Port to new way of setting name in contact.
-
-2004-02-24  JP Rosevear <jpr@ximian.com>
-
-	* gui/component/addressbook-migrate.c (migration_context_new):
-	don't init the dialog here
-	(addressbook_migrate): init it here
-
-	Fixes #54214
-	
-2004-02-20  Chris Toshok  <toshok@ximian.com>
-	* gui/contact-editor/e-contact-editor.c (phone_entry_changed):
-	remove some spew.
-
-2004-02-19  Chris Toshok  <toshok@ximian.com>
-
-	* gui/component/component-factory.c: s/HAVE_NSS/ENABLE_SMIME.
-
-	* gui/component/addressbook-component.c: s/HAVE_NSS/ENABLE_SMIME.
-
-2004-02-19  Chris Toshok  <toshok@ximian.com>
-
-	* gui/component/addressbook.c (activate_source): split out the
-	majority of the set_prop code for PROPERTY_SOURCE_UID_IDX here, so
-	it can be used for both SOURCE_UID and FOLDER_URI.
-	(set_prop): add a setter for "folder_uri".  we sorta fudge things
-	and use the uri for the uid (the uid is only used as a hash key to
-	look up the view associated with the uri/source, so we should be
-	good still.)
-	(get_prop): add getter for "folder_uri".
-	(addressbook_new_control): add the "folder_uri" property to our
-	property bag.
-
-2004-02-19  Hans Petter Jansson  <hpj@ximian.com>
-
-	Fixes #45308 and duplicates.
-
-	* gui/widgets/e-addressbook-model.c (eab_model_set_property): Store
-	the IDs of book signals connected to, so we can disconnect from them
-	later.
-
-2004-02-18  Hao Sheng  <hao.sheng@sun.com>
-
-	[ fixes bug #52765 ]
-
-	* gui/contact-editor/e-contact-editor.c
-	(e_contact_editor_confirm_delete): make delete dialog support
-	ESC press.
-
-2004-02-17  Chris Toshok  <toshok@ximian.com>
-
-	* gui/contact-list-editor/e-contact-list-editor.h (struct
-	_EContactListEditor): add image_set slot.
-
-	* gui/contact-list-editor/e-contact-list-editor.c
-	(list_image_changed_cb): set image_set = TRUE.
-	(e_contact_list_editor_init): init image_set = FALSE
-	(extract_info): only set the LOGO attribute if image_set = TRUE.
-
-	* gui/contact-editor/e-contact-editor.h (struct _EContactEditor):
-	add image_set slot.
-
-	* gui/contact-editor/e-contact-editor.c (extract_info): only set
-	the PHOTO attribute if image_set == TRUE.
-	(image_chooser_changed): new function, set image_set = TRUE and
-	call widget_changed.
-	(e_contact_editor_init): init image_set to FALSE.
-	(_address_arrow_pressed): quiet compiler.
-
-2004-02-17  Chris Toshok  <toshok@ximian.com>
-
-	[ fixes bug #53620 ]
-	
-	* gui/merging/eab-contact-compare.c (eab_contact_compare_name): ""
-	is a valid (and common) value for elements of EContactName now.
-	it's semantically equivalent to NULL in the old ECard foo.
-
-2004-02-12  Chris Toshok  <toshok@ximian.com>
-
-	* gui/component/addressbook-migrate.c (migrate_contacts): free up
-	the list returned by e_book_get_contacts.
-
-2004-01-12  Rodney Dawes  <dobey@ximian.com>
-
-	* gui/component/addressbook-component.c (delete_addressbook_cb):
-	Fix capitalization of Address Book usage in sentence form
-	* gui/component/ldap-config.glade: Use Address Book instead of
-	Addressbook in here (Patch from Aaron Weber <aaron@ximian.com>)
-
-2004-02-11  Rodney Dawes  <dobey@ximian.com>
-
-	* gui/component/addressbook-component.c (delete_addressbook_cb):
-	(fill_popup_menu_callback):
-	* gui/widgets/e-addressbook-view.c (init_collection):
-	* gui/widgets/eab-gui-util.c (eab_error_dialog):
-	* gui/widgets/eab-popup-control.c (eab_popup_control_contstruct):
-	Address Book, not Addressbook
-
-	Fixes #54166 and #54120
-
-2004-02-10  JP Rosevear <jpr@ximian.com>
-
-	* Makefile.am: build importers dir
-
-2004-02-08  Rodney Dawes  <dobey@ximian.com>
-
-	* gui/component/addressbook-migrate.c (create_groups): Initialize the
-	personal_source to NULL
-
-	Fixes #54015
-
-2004-02-08  Sivaiah Nallagatla <snallagatla@novell.com>
-                                                                                
-        * gui/widgets/e-addressbook-view.c (delete) : pass contact
-        as an argument instead of contact id to e_book_async_remove_contact
-
-2004-02-06  Chris Toshok  <toshok@ximian.com>
-
-	* gui/component/addressbook-migrate.c (create_groups): don't
-	bother using a function-wide variable to store the personal
-	source.  also, use g_build_filename properly (because fejj is a
-	whiner.)
-	(migrate_local_folders): same (wrt fejj whining).
-
-2004-02-06  Rodney Dawes  <dobey@ximian.com>
-
-	* gui/component/addressbook.c (addressbook_new_control): Hide the
-	border on the notebook also
-	* gui/widgets/e-addressbook-view.c (eab_view_new): Don't pack another
-	scrolled window inside of a scrolled window, just pack the contact
-	display inside the paned, since it already has a scrolled window
-
-2004-02-06  Rodney Dawes  <dobey@ximian.com>
-
-	* gui/widgets/e-addressbook-view.c: Use "Address Book" instead of
-	"folder" or "Addressbook" for the "Address Book Sources..." and
-	copy/move contact menu items
-
-	Fixes #53654
-
-2004-02-06  Chris Toshok  <toshok@ximian.com>
-
-	* importers/evolution-ldif-importer.c (getNextLDIFEntry): only set
-	the address if something in it's been filled in.
-	(resolve_list_card): build up a separate list representing the xml
-	formatted crud.
-	(process_item_fn): remove FIXME.
-	(factory_fn): use g_new0 since we test for NULL-ness later on.
-
-	* importers/evolution-vcard-importer.c (factory_fn): use g_new0
-	since we test for NULL-ness later on.
-
-2004-02-06  JP Rosevear <jpr@ximian.com>
-
-	* importers/evolution-ldif-importer.c (importer_destroy_cb):
-	implement
-
-2004-02-06  JP Rosevear <jpr@ximian.com>
-
-	* importers/evolution-vcard-importer.c (importer_destroy_cb):
-	implement
-	(load_file_fn): use g_file_get_contents to get a string we can
-	convert to a contact list with eab_contact_list_from_string 
-
-2004-02-06  JP Rosevear <jpr@ximian.com>
-
-	* importers/GNOME_Evolution_Addressbook_LDIF_Importer.server.in.in:
-	shlib importer info
-
-	* importers/GNOME_Evolution_Addressbook_VCard_Importer.server.in.in: 
-	ditto
-	
-	* importers/Makefile.am: build shlib addressbook importers
-
-	* importers/evolution-ldif-importer.c: First crack at resurrecting
-
-	* importers/evolution-vcard-importer.c: ditto
-	
-2004-02-03  Chris Toshok  <toshok@ximian.com>
-
-	* gui/widgets/eab-contact-display.c (on_url_requested): remove
-	some spew, and add an evo-icon: handler, for things in evolution's
-	imagedir.
-	(render_address): hack up the html.
-	(render_name_value): new function, just render a name/value/icon.
-	(render_attribute): split out most of this function into
-	render_name_value.  this just checks to see if the EContact
-	attribute has something in it before passing it along.
-	(render_contact_list): split this out from
-	eab_contact_display_render_normal.
-	(start_block): new function, insert a row of height 20 with a
-	header.
-	(end_block): new function, insert a row of height 20.
-	(render_contact): split this out from
-	eab_contact_display_render_normal, and prettify the contact
-	display.
-	(eab_contact_display_render_normal): call render_contact and
-	render_contact_list.
-	(eab_contact_display_new): create a scrolled window and add the
-	GtkHTML to it so we actually have scrollbars.
-
-2004-02-03  Dan Winship  <danw@ximian.com>
-
-	* gui/component/select-names/Makefile.am (INCLUDES): add
-	widgets/misc for e-activity-handler.h
-
-2004-02-03 Sivaiah Nallagatla <snallagatla@novell.com>
-
-        * gui/component/addressbook-config.c (dialog_to_source)
-        (source_to_dialog) : use gtk_spin_button_* apis to get and set
-        values for download limit spin button instead of gtk_entry
-        Fixes #53432
-
-2004-02-02  Chris Toshok  <toshok@ximian.com>
-
-	* gui/widgets/e-addressbook-view.c (eab_view_new): hook up
-	contact_changed/contact_removed signals.
-	(contact_changed): new function.  if the changed contact is the
-	one we're displaying, re-render it.
-	(contact_removed): new function.  if the removed contact is the
-	one we're displaying, clear the display.
-	(render_contact): set displayed_contact to the row.
-	(eab_view_init): init displayed_contact to -1.
-	(selection_changed): set displayed_contact to -1 when we clear the
-	display.
-	
-	* gui/widgets/e-addressbook-view.h (struct _EABView): add
-	"displayed_contact" so we can update the contact preview when it
-	changes.
-
-2004-01-30  Chris Toshok  <toshok@ximian.com>
-
-	* gui/contact-editor/e-contact-editor.c: enable d&d drop photos.
-
-	* gui/contact-editor/contact-editor.glade: use
-	eab_create_image_chooser_widget for the d&d'able image.
-
-	* gui/contact-list-editor/e-contact-list-editor.c: abstract out
-	all the d&d image support (it's now in
-	widgets/misc/e-image-chooser.[ch]).
-
-	* gui/contact-list-editor/contact-list-editor.glade: use
-	eab_create_image_chooser_widget for the d&d'able image.
-
-	* gui/widgets/eab-gui-util.c (eab_create_image_chooser_widget):
-	new function.
-
-	* gui/widgets/eab-gui-util.h: add prototype for
-	eab_create_image_chooser_widget.
-
-2004-01-29  Hans Petter Jansson  <hpj@ximian.com>
-
-	* gui/widgets/eab-gui-util.c (source_selection_changed_cb): Implement.
-	(eab_select_source): Implement. Public function that prompts user to
-	select a source from a list.
-	(eab_transfer_contacts): Enable and use eab_select_source () and
-	ESource, instead of old shell folder/URI stuff.
-
-2004-01-29  Hans Petter Jansson  <hpj@ximian.com>
-
-	* gui/component/ldap-config.glade: Changed "Finish" to "Apply" in
-	dialog finish page text.
-
-2004-01-29  Hans Petter Jansson  <hpj@ximian.com>
-
-	* gui/component/addressbook-config.c (dialog_to_source): Sync the
-	modified source list.
-
-	* gui/component/addressbook-component.c (delete_addressbook_cb): Sync
-	the modified source list.
-
-2004-01-29  Chris Toshok  <toshok@m198-139.dsl.rawbw.com>
-
-	* gui/component/addressbook-migrate.c (setup_progress_dialog): use
-	the MigrationContext struct.
-	(dialog_close): same.
-	(dialog_set_folder_name): same.
-	(dialog_set_progress): same.
-	(migrate_contacts): same, and pass it along to other functions.
-	(migrate_contact_folder_to_source): same.
-	(migrate_contact_folder): same.  also, add the old path/uid to the
-	folder_uid_map.
-	(migrate_local_folders): same.
-	(create_groups): use the MigrationContext struct.
-	(migrate_completion_folders): if it's a file uri, look up the old
-	path in our hash table for a uid to use.  otherwise use the old
-	behavior.
-	(migration_context_new): new function, initialize the
-	MigrationContext.
-	(migration_context_free): free up everything.
-	(addressbook_migrate): create the context, pass it to everything,
-	destroy the context, shine toshok's shoes, etc.
-
-2004-01-29  Radek Doulik  <rodo@ximian.com>
-
-	* gui/component/addressbook-config.c (dialog_to_temp_source): set
-	group to temporary source
-
-2004-01-28  Hans Petter Jansson  <hpj@ximian.com>
-
-	* gui/component/select-names/e-select-names-table-model.c
-	(fill_in_info): Get file_as instead of full_name.
-
-	* gui/compoent/select-names/e-select-names.etspec: Show the file_as
-	column instead of full_name.
-
-2004-01-27  Hans Petter Jansson  <hpj@ximian.com>
-
-	* gui/contact-editor/e-contact-editor-fullname.c
-	(e_contact_editor_fullname_set_property): Handle NULL name. Fixes
-	#53071.
-
-2004-01-27  Chris Toshok  <toshok@ximian.com>
-
-	* gui/component/addressbook-config.c (dialog_to_source): set the
-	relative_uri of a local source to be its uid.
-
-	* gui/component/addressbook-migrate.c
-	(migrate_contact_folder_to_source): remove the dest_group arg,
-	since we don't use it.
-	(migrate_contact_folder): set the relative uri of the source to be
-	its uid.
-	(PERSONAL_RELATIVE_URI): "Personal" -> "system".
-	(create_groups): don't actually make the directory hierarchy for
-	the personal folder here.  let e-d-s do that.  Also remove
-	OnThisComputer from the base uri.
-	(migrate_local_folders): track change to
-	migrate_contact_folder_to_source.
-
-2004-01-26  Chris Toshok  <toshok@ximian.com>
-
-	[ Should fix #53361 and other migration problems/crashes ]
-	* gui/component/addressbook-migrate.c
-	(migrate_contact_folder_to_source): new function, takes most of
-	migrate_contact_folder's contents.  Fix some of the refcounting
-	problems though, by not unreffing dest_group, and using
-	e_group_add_source instead of e_source_set_group.
-	(migrate_contact_folder): convert to calling
-	migrate_contact_folder_to_source.
-	(create_groups): add an out parameter for *personal_source.
-	(migrate_local_folders): add personal_source as an arg, so we can
-	get the source that create_groups created/found.  Call
-	migrate_contact_folder_to_source for the personal_source.
-	(addressbook_migrate): pass personal_source to
-	migrate_local_folders.
-
-2004-01-26  Chris Toshok  <toshok@ximian.com>
-
-	[ fixes #53238 ]
-	* util/eab-destination.c (nonempty): make this accept NULL's (and
-	return FALSE for them).
-	(eab_destination_is_empty): shorten some of the tests since
-	nonempty takes NULL now.
-	(eab_destination_get_address): only call
-	camel_internet_address_add if both name and email are non-empty.
-	otherwise call camel_address_decode and let camel try to deal with
-	it.
-	(eab_destination_xml_encode): call xmlEncodeEntitiesReentrant on
-	the strings before adding them to the xml, so people that enter
-	[<>&] won't end up with broken EABDestinations.
-
-2004-01-26  Radek Doulik  <rodo@ximian.com>
-
-	* gui/widgets/e-addressbook-view.c (selection_received): make sure
-	we pass \0 terminated string to eab_contact_list_from_string
-	[it may fix #51743]
-
-2004-01-25  Chris Toshok  <toshok@ximian.com>
-
-	[ fixes bug #51171 ]
-	* gui/widgets/eab-gui-util.c (eab_send_contact_list): get this
-	working.
-
-2004-01-24  Rodney Dawes  <dobey@ximian.com>
-
-	* gui/component/select-names/e-select-names.c (e_select_names_init):
-	Select Contacts from Address Book, not Contents
-
-	Fixes #53263
-
-2004-01-24  Chris Toshok  <toshok@ximian.com>
-
-	* gui/component/addressbook-migrate.c (migrate_local_folders):
-	oops.
-	(migrate_contact_folder): fix the unreffing.
-
-2004-01-24  Chris Toshok  <toshok@ximian.com>
-
-	* gui/component/addressbook-migrate.c (migrate_local_folders): use
-	_("Personal"), not "Personal".
-
-2004-01-24  Chris Toshok  <toshok@ximian.com>
-
-	* gui/component/addressbook-migrate.c (migrate_local_folders):
-	don't create/add the source here.  it's done in
-	migrate_contact_folder.
-
-2004-01-24  Chris Toshok  <toshok@ximian.com>
-
-	* gui/component/addressbook-migrate.c (migrate_local_folders): use
-	e_folder_map_local_folders.
-	(find_addressbook_dirs): nuke.
-
-2004-01-24  JP Rosevear <jpr@ximian.com>
-
-	* gui/widgets/e-addressbook-view.c (init_collection): use
-	.evolution to store view info
-
-2004-01-23  Chris Toshok  <toshok@ximian.com>
-
-	[ fixes bug #52571 ]
-	* util/eab-book-util.c (escape): ugh.  name fields that have \"
-	around the name break our queries, because it turns it into (for
-	instance): (contains "full_name" ""Toshok"").  so we need to turn
-	that into: (contains "full_name" "\"Toshok\"").
-	(eab_name_and_email_query): escape both the name and email, and
-	use an EBookQuery instead of passing the string to
-	e_book_async_get_contacts.  Looks like ross missed a couple of
-	spots.
-	(eab_nickname_query): same.
-
-	* gui/component/addressbook.c (free_load_source_data): new
-	function, free up the data and unref the source if there is one.
-	(load_source_auth_cb): call free_load_source_data instead of just
-	g_free'ing the struct.
-	(load_source_cb): same.
-	(default_book_cb): new function, we need this so we can fill in
-	the source for the default book.  get the source, then call
-	load_source_cb to continue processing as normal.
-	(addressbook_load_default_book): use default_book_cb instead of
-	load_source_cb.
-
-2004-01-22  Chris Toshok  <toshok@ximian.com>
-
-	[ fixes bug #53184 ]
-	* gui/component/addressbook-migrate.c (migrate_contacts): handle
-	the fact that the xml 1.4 spits out contains unescaped ';'s in the
-	EMAIL attributes for mailing lists.
-
-2004-01-22  Chris Toshok  <toshok@ximian.com>
-
-	[ fixes bug #52944 ]
-	* gui/component/addressbook-migrate.c (migrate_contacts): do some
-	massaging of contacts as we import them, to fix up the differences
-	between 1.4 and 1.5 vcards.
-
-2004-01-21  Nat Friedman <nat@novell.com>
-
-	* gui/contact-editor/contact-editor.glade: Added missing
-	entry-blog widget.
-
-2004-01-21  Hans Petter Jansson  <hpj@ximian.com>
-
-	* gui/component/addressbook-config.c (create_source_dir): Remove.
-	(dialog_to_source): Don't create source dir, backend takes care of
-	that now.
-
-2004-01-21  Chris Toshok  <toshok@ximian.com>
-
-	* gui/component/addressbook-component.c
-	(addressbook_component_peek_gconf_client): new function.
-
-	* gui/component/addressbook-component.h: add prototype for
-	addressbook_component_peek_gconf_client.
-
-	* gui/component/addressbook-migrate.c
-	(migrate_completion_folders): more gross hacking.  migrate the
-	completion settings.
-	(get_source_by_uri): function to search for an ESource given the
-	entire uri.  used for migrate_completion_folders.
-	(migrate_ldap_servers): get_string_value -> get_string_child.
-	same with get_integer_child.
-	(get_string_child): rename to make it apparent it's a child, not a
-	property.
-	(get_integer_child): same.
-	(addressbook_migrate): call migrate_completion_folders.
-
-2004-01-21  Chris Toshok  <toshok@ximian.com>
-
-	* gui/contact-editor/e-contact-editor.c (new_target_cb): call
-	widget_changed here too, since we're changing the destination.
-
-2004-01-20  Chris Toshok  <toshok@ximian.com>
-
-	[ fixes bug #52955 ]
-	* gui/merging/eab-contact-compare.c (use_common_book_cb): handle
-	the case properly where there are no query parts (p == 0).
-	Instead of passing "" to e_book_query_from_string, just set the
-	query to NULL.
-
-	* util/eab-book-util.c (eab_contact_list_to_string): we need to
-	put a blank line here, so \r\n\r\n, not just \r\n.
-
-2004-01-20  Chris Toshok  <toshok@ximian.com>
-
-	* gui/component/addressbook-migrate.c (create_groups): deal with
-	the groups/sources already being there.  Essentially make this
-	function idempotent.
-	(addressbook_migrate): unconditionally call create_groups now.
-	move the version logic here from ipl_upgradeFromVersion, and
-	include more versions in the set of those we upgrade from.
-
-	* gui/component/addressbook-migrate.h: add major/minor/revision
-	args to addressbook_migrate.
-
-	* gui/component/addressbook-component.c (impl_upgradeFromVersion):
-	remove the version logic from here.
-
-2004-01-20 Sivaiah Nallagatla   <snallagatla@novell.com>
-
-	* printing/e-contact-print.c (e_contact_print_response): do not 
-	try to unref when query is NULL
-
-2004 -01-20 Sivaiah Nallagatla  <snallagatla@novell.com>
-
-	* gui/contact-editor/e-contact-editor.c (edit_im_clicked) : do not call
-	gtk_tree_model_get when nothing in the list is selected 
-
-2004-01-19  Hans Petter Jansson  <hpj@ximian.com>
-
-	* gui/component/select-names/e-select-names.etspec: Get name from
-	correct model column.
-
-2004-01-19  Hans Petter Jansson  <hpj@ximian.com>
-
-	* printing/e-contact-print.c (complete_sequence): Only unref if we
-	have a query.
-
-2004-01-19  Hans Petter Jansson  <hpj@ximian.com>
-
-	* gui/component/addressbook-component.c
-	(get_primary_source): Implement.
-	(load_primary_selection): Use get_primary_source ().
-	(impl_requestCreateItem): Use get_primary_source (), fixing a crash
-	when we're asked to create a new item and we don't have the controls.
-
-2004-01-16  Hans Petter Jansson  <hpj@ximian.com>
-
-	* gui/component/addressbook.c (load_source_auth_cb): Don't run
-	callback if the action was cancelled.
-	(load_source_cb): Ditto.
-	(addressbook_load_source): Return an ID for the load attempt.
-	(addressbook_load_source_cancel): Implement, allows cancelling a
-	load attempt.
-
-	* gui/contact-editor/e-contact-editor.c (new_target_cb): Clear the
-	values for in-progress load operation. Only unref new_book if it's
-	non-NULL.
-	(cancel_load): Implement. Cancels the load operation if one is in
-	progress.
-	(source_selected): Cancel any running load operation before starting
-	a new one. Set up in-progress values.
-	(e_contact_editor_init): Clear the in-progress values.
-	(e_contact_editor_dispose): Cancel load operation.
-	(e_contact_editor_set_property): If a new target book is set, cancel
-	any conflicting load operation in progress.
-
-	* gui/widgets/e-addressbook-view.c (set_paned_position): Remove
-	debug output.
-	(get_paned_position): Ditto.
-
-2004-01-16  JP Rosevear <jpr@ximian.com>
-
-	* gui/component/addressbook.c (set_prop): only set the menus and
-	command state if we actually are already displayed, otherwise wait
-	for activation
-
-2004-01-15  Hans Petter Jansson  <hpj@ximian.com>
-
-	* gui/widgets/e-addressbook-view.c (set_paned_position): Implement.
-	(get_paned_position): Implement.
-	(eab_view_new): Connect signal to get paned position changes.
-	Remove old hack.
-	(display_view): Set paned position properly.
-
-2004-01-12  JP Rosevear <jpr@ximian.com>
-
-	* gui/component/addressbook-component.c (impl_upgradeFromVersion):
-	revert dumb upgrade change
-
-2004-01-12  JP Rosevear <jpr@ximian.com>
-
-	* gui/component/addressbook-component.c (impl_upgradeFromVersion):
-	migrate from 1.5.0 and 1.5.1 properly
-
-2004-01-12  JP Rosevear  <jpr@ximian.com>
-
-	* gui/contact-editor/contact-editor.glade: de-bold ui elements
-
-2004-01-09  Hans Petter Jansson  <hpj@ximian.com>
-
-	* gui/component/addressbook-component.c (add_popup_menu_item): Take a
-	sensitivity flag per menu item, and fall back to stock icons.
-	(delete_addressbook_cb): Implement.
-	(fill_popup_menu_callback): Reorder items, remove "remove" item, set
-	sensitivity.
-
-	* gui/component/ldap-config.glade: "Edit LDAP Server" ->
-	"Addressbook Properties".
-
-2004-01-11  Christian Hammond  <chipx86@gnupdate.org>
-
-	* addressbook/gui/contact-editor/e-contact-editor-im.[ch],
-	  addressbook/gui/contact-editor/im.glade: Added a dialog for
-	  adding a new IM account.
-	* addressbook/gui/contact-editor/Makefile.am: Added the previously
-	  mentioned files, and depend on camel for necessary MIME parsing.
-
-	* addressbook/gui/contact-editor/contact-editor.[ch],
-	  addressbook/gui/contact-editor/contact-editor.glade: Add and implement
-
-2004-01-09  Ross Burton  <ross@burtonini.com>
-
-	* gui/component/select-names/e-select-names-completion.c:
-	* gui/merging/eab-contact-compare.c:
-	* gui/widgets/e-addressbook-model.c:
-	* printing/e-contact-print.c:
-	Update for API changes to e-book-async.
-
-2004-01-08  Ross Burton  <ross@burtonini.com>
-
-	* gui/contact-editor/contact-editor.glade:
-	* gui/contact-editor/e-contact-editor.c:
-	Add the video conferencing field.
-
-2004-01-07  Rodney Dawes  <dobey@ximian.com>
-
-	* gui/component/select-names/e-select-names.c:
-	* gui/component/select-names/select-names.glade: Make the ESelectNames
-	object be a HIG-compliant dialog, change "Folder" to be "Address Book",
-	and fix a mnemonic conflict with "Category" and "Cancel"
-
-	Fixes #51966
-
-2004-01-07  Rodney Dawes  <dobey@ximian.com>
-
-	* gui/component/addressbook-component.c: Move the smime_component_init
-	call to the instance init callback, rather than the class init, and
-	wrap it in #if HAVE_NSS, so the addressbook works without smime support
-
-2004-01-07  JP Rosevear <jpr@ximian.com>
-
-	* gui/component/Makefile.am: link in printer stuff
-
-	Fixes #51172
-
-2004-01-06  Chris Toshok  <toshok@ximian.com>
-
-	* gui/component/addressbook-migrate.c (check_for_conflict): remove
-	spew.
-	(migrate_contacts): same.
-	(migrate_contact_folder): same.
-	(migrate_local_folders): same, and plug a leak.
-
-2004-01-06  Chris Toshok  <toshok@ximian.com>
-
-	* gui/component/Makefile.am (libevolution_addressbook_la_SOURCES):
-	add addressbook-migrate.[ch].
-
-	* gui/component/addressbook-component.c
-	(addressbook_component_init): remove the source creation from
-	here, it's in the migration code now.
-	(impl_upgradeFromVersion): new function, call the
-	addressbook-migration stuff.
-	(addressbook_component_class_init): fill in
-	epv->upgradeFromVersion, and call smime_component_init.
-	(addressbook_component_peek_base_directory): new function.
-	(addressbook_component_peek_source_list): same.
-
-	* gui/component/addressbook-component.h: add prototypes for
-	_peek_base_directory and _peek_source_list.
-
-	* gui/component/addressbook-migrate.[ch]: add migration code to
-	convert stuff from 1.x over to 1.5/2.0.
-
-2004-01-06  Rodney Dawes  <dobey@ximian.com>
-
-	* gui/contact-editor/e-contact-editor-address.c: Apply
-	patch from Roozbeh Pournader to update countries list
-
-	Fixes #48151
-
-2004-01-06  JP Rosevear <jpr@ximian.com>
-
-	* gui/component/select-names/e-select-names-popup.c
-	(popup_info_cleanup): disconnect from selection-done signal
-
-2004-01-05  JP Rosevear <jpr@ximian.com>
-
-	* gui/component/addressbook.c
-	(addressbook_show_load_error_dialog): these line breaks in the
-	error messages should actually be spaces
-
-	Fixes #51732
-	
-2003-12-19  Hans Petter Jansson  <hpj@ximian.com>
-
-	* gui/component/addressbook-component.c (find_first_source): Impl.
-	from calendar.
-	(save_primary_selection): Implement, similar to calendar.
-	(load_primary_selection): Implement, similar to calendar.
-	(primary_source_selection_changed_callback): Save selection.
-	(impl_createControls): Load selection.
-
-2003-12-18  Hans Petter Jansson  <hpj@ximian.com>
-
-	* gui/contact-editor/e-contact-editor.c (widget_changed):
-	editable -> target_editable
-	(e_contact_editor_get_property): Same.
-	(_email_arrow_pressed): Same.
-	(enable_writable_fields): Same.
-	(set_editable): Same.
-	(contact_added_cb): Make sure source book is editable before trying
-	to remove contact from there.
-	(e_contact_editor_init): Set up source/target editability.
-	(command_state_changed): Allow save only if target editable. Allow
-	delete only if source editable.
-	(e_contact_editor_set_property): Set editability flags for
-	source/target.
-
-	* gui/contact-editor/e-contact-editor.h: Add source_editable,
-	target_editable flags in place of old editable flag.
-
-2003-12-17  Chris Toshok  <toshok@ximian.com>
-
-	* gui/widgets/e-addressbook-view.c (eab_view_class_init): install
-	the "source" property.
-	(eab_view_init): init eav->source to NULL.
-	(eab_view_dispose): disconnect the ecml_changed_id and unref
-	source.
-	(eab_view_new): create the search bar here.
-	(view_preview): c&p the mailer's code mostly for this - this is
-	the toggle listener for the Preview Pane menuitem.
-	(setup_menus): add a listener for the ContactsViewPreview toggle.
-	(eab_view_set_property): sensitize the search bar based on whether
-	or not we have a book set.  This makes it so you can't search
-	until the book is loaded.  Also add handling for the "source"
-	attribute and print a warning when it's set multiple times
-	(something that's not supported at the moment.)
-	(eab_view_get_property): add "source" case.
-	(search_activated, query_changed, compare_subitems, make_subitems,
-	ecml_changed, get_master_list, connect_master_list_changed): move
-	this here from addressbook.c
-	(eab_view_show_contact_preview): implement - just show or hide the
-	scrolled window.
-	(eab_view_setup_menus): call e_search_bar_set_ui_component here,
-	kind of a hack.
-
-	* gui/widgets/e-addressbook-view.h: make this inherit from GtkVBox
-	instead of GtkEventBox since we'll be packing children.  Add a
-	prototype for eab_view_show_contact_preview.
-
-	* gui/component/addressbook.c (get_current_view): return the
-	EABView associated with the active notebook page.
-	(save_contact_cb): use the current view.
-	(view_contact_cb): same.
-	(search_cb): same.
-	(delete_contact_cb): same.
-	(print_cb): same.
-	(print_preview_cb): same.
-	(stop_loading_cb): same.
-	(cut_contacts_cb): same.
-	(copy_contacts_cb): same.
-	(paste_contacts_cb): same.
-	(select_all_contacts_cb): same.
-	(send_contact_cb): same.
-	(send_contact_to_cb): same.
-	(copy_contact_to_cb): same.
-	(move_contact_to_cb): same.
-	(update_command_state): same.
-	(change_view_type): nuke, nothing uses this.
-	(control_activate): use the current view.
-	(control_activate_cb): same.
-	(source_list_changed_cb): new function, remove the notebook pages
-	(and destroy the EABView's) for sources that no longer exist.
-	(addressbook_view_clear): dispose of the uid_to_view hash.
-	(book_open_cb): store the ESource on the EABView too.  this
-	function now takes a struct containing both EABView and ESource
-	since we can't store either in the AddressbookView.
-	(set_prop): if we have a view already for this uid, bring it up.
-	otherwise create a new one and start the book loading.
-	(addressbook_search_activated): nuked - this is being moved to
-	e-addressbook-view.
-	(addressbook_query_changed): same.
-	(compare_subitems, make_subitems, ecml_changed,
-	connect_master_list_changed): same.
-	(addressbook_new_control): simplify things a bunch.  create a
-	notebook to store the views in.  the search/vbox stuff is gone.
-	use e_source_list_new_for_gconf_default, and handle the source
-	list's "changed" signal.
-	
-2003-12-17  Rodney Dawes  <dobey@ximian.com>
-
-	* gui/component/autocompletion-config.c:
-	(autocompletion_config_control_new): Embed Tree in GtkScrolledWindow
-
-2003-12-16  Hans Petter Jansson  <hpj@ximian.com>
-
-	* gui/contact-editor/e-contact-editor.c (contact_added_cb): Update
-	the contact's UID after normal add.
-
-2003-12-16  Hans Petter Jansson  <hpj@ximian.com>
-
-	* gui/component/addressbook.c (addressbook_show_load_error_dialog):
-	Make a public function that shows an error dialog, which can be used
-	when a source fails to load.
-	(book_open_cb): Call addressbook_show_load_error_dialog () on error.
-	(set_prop): Don't reuse the book when loading a new source. This was
-	confusing the contact-editor, which gets the book passed in.
-
-	* gui/contact-editor/e-contact-editor.c (e_contact_editor_class_init):
-	Make "source_book" and "target_book" distinct properties.
-	(new_target_cb): Implement.
-	(source_selected): Implement.
-	(contact_moved_cb): Implement.
-	(contact_added_cb): Handle the case where source_book != target_book as
-	a move - if the add was successful, remove contact from source book.
-	(save_contact): Handle case where source_book != target_book.
-	(delete_cb): "book" renamed to "source_book".
-	(e_contact_editor_init): Set up source_selected signal.
-	(e_contact_editor_dispose): Dispose of both source and target books.
-	(e_contact_editor_new): "book" renamed to "source_book".
-	(e_contact_editor_set_property): If a source book is set, and we don't
-	have a target book, make target_book == source_book. Allow setting
-	target book, and base editability on that. If we're editing an existing
-	contact, treat book change as a change, and update command state.
-	(e_contact_editor_get_property): Allow getting target book.
-	(set_source_field): Indicate the selected book.
-
-2003-12-16  Hans Petter Jansson  <hpj@ximian.com>
-
-	* gui/contact-editor/e-contact-editor.c (set_source_field): Implement.
-	Makes the source menu reflect the source for the current book.
-
-2003-12-16  Hans Petter Jansson  <hpj@ximian.com>
-
-	* gui/contact-editor/e-contact-editor.c
-	(e_contact_editor_create_source_option_menu): Implement. Creates
-	source selection option menu.
-
-	* gui/contact-editor/contact-editor.glade: Add source selection custom
-	widget.
-
-2003-12-16  Hans Petter Jansson  <hpj@ximian.com>
-
-	* gui/widgets/e-addressbook-table-adapter.c
-	(addressbook_is_cell_editable): Disable cell editing.
-
-2003-12-15  Hans Petter Jansson  <hpj@ximian.com>
-
-	* gui/contact-editor/e-contact-editor.c (address_to_text): Implement.
-	(text_to_address): Implement, using EAddressWestern.
-	(address_text_changed): Adapt to EContactAddress.
-	(full_addr_clicked): Ditto. Fix field IDs.
-	(e_contact_editor_init): Init address_choice.
-	(_email_arrow_pressed): Fix field IDs.
-	(_address_arrow_pressed): Adapt to EContactAddress and fix field IDs.
-	(find_address_mailing): Leave out for now. Addresses don't have flags
-	anymore...
-	(set_fields): Adapt to EContactAddress and fix field IDs. Make sure
-	changes to other widgets don't make us go back to the first listed
-	address.
-	(set_address_field): Adapt to EContactAddress and fix field IDs.
-	(enable_writable_fields): Ditto.
-	(fill_in_info): Disable find_address_mailing () for now.
-
-2003-12-10  Hans Petter Jansson  <hpj@ximian.com>
-
-	* gui/contact-editor/e-contact-editor-address.c
-	(e_contact_editor_address_class_init): Make "address" a boxed type.
-	(e_contact_editor_address_init): Set address to NULL.
-	(e_contact_editor_address_dispose): Free address.
-	(e_contact_editor_address_new): Take an EContactAddress.
-	(e_contact_editor_address_set_property): Re-implement setting the
-	address property.
-	(e_contact_editor_address_get_property): Ditto for getting.
-	(fill_in_info): Enable, use EContactAddress fields.
-	(extract_info): Ditto.
-
-	* gui/contact-editor/e-contact-editor-address.h:
-	Re-enable the address field, as EContactAddress.
-
-2003-12-09  JP Rosevear <jpr@ximian.com>
-
-	* gui/contact-list-editor/e-contact-list-editor.c (fill_in_info):
-	free email list properly
-
-2003-12-09  JP Rosevear <jpr@ximian.com>
-
-	* gui/contact-list-editor/e-contact-list-editor.c (extract_info):
-	free the list, not unref it, and free the elements
-
-	Fixes #51976
-	
-2003-12-06  Chris Toshok  <toshok@ximian.com>
-
-	* gui/component/select-names/e-select-names-manager.c
-	(open_book_cb): change prototype to fix warning, and change the
-	comment to read load_source instead of load_uri (which isn't what
-	we use anymore.)
-	(update_completion_books): just use our source list for this.
-	check the "completion" source property.
-	(source_list_changed): recreate the completion books.
-	(e_select_names_manager_init): connect to the source_list's
-	changed signal.
-	(e_select_names_manager_dispose): don't need to free the
-	completion_uids list anymore.
-
-	* gui/component/select-names/e-select-names-config.c
-	(e_select_names_config_get_completion_books,
-	e_select_names_config_set_completion_books,
-	e_select_names_config_add_notification_completion_books): remove.
-
-	* gui/component/select-names/e-select-names-config.h: remove the
-	completion books calls, since we can just use the source list.
-
-	* gui/component/component-factory.c (factory): create the
-	autocompletion control.
-
-	* gui/component/autocompletion-config.[ch]: new config control for
-	selecting completion folders.  Uses e-source-selector.  Could
-	probably be beautified a bit.
-	
-	* gui/component/Makefile.am (libevolution_addressbook_la_SOURCES):
-	add autocompletion-config.[ch]
-
-	* gui/component/GNOME_Evolution_Addressbook.server.in.in: remove
-	the ldap config control server, and add the autocompletion one.
-
-2003-12-06  JP Rosevear <jpr@ximian.com>
-
-	* */Makefile.am: Remove hard coded disable deprecated flags
-	
-2003-12-05  JP Rosevear <jpr@ximian.com>
-
-	* gui/component/select-names/select-names.glade: no more custom
-	widget for the selection of the search source
-
-	* gui/component/select-names/e-select-names.h: add member
-
-	* gui/component/select-names/e-select-names.etspec: update model
-	column
-
-	* gui/component/select-names/e-select-names.c (find_first_source):
-	find the first source in the list
-	(addressbook_model_set_source): we have the source to set directly
-	now
-	(source_selected): listen for the source item to change
-	(e_select_names_init): create a source option menu and hook it up
-	(e_select_names_dispose): destroy the source list
-	(e_select_names_new): do away with the config setup here
-
-	* gui/component/select-names/e-select-names-manager.h: update
-	members
-
-	* gui/component/select-names/e-select-names-manager.c
-	(update_completion_books): add books based on source uid
-	(config_completion_books_changed_cb): handle the completion list
-	changing
-	(config_min_query_length_changed_cb): handle minimum query length
-	changing
-	(e_select_names_manager_new): we don't do the settings stuff here
-	any more
-	(e_select_names_manager_init): do the initial set up here for the
-	book loaded and listen for changes
-	(e_select_names_manager_dispose): destroy the new stuff
-
-	* gui/component/select-names/e-select-names-config.[hc]: config
-	information
-
-	* gui/component/select-names/e-select-names-config-keys.h: the
-	config keys
-
-	* gui/component/select-names/e-select-names-bonobo.c
-	(impl_SelectNames_activate_dialog): do away with the shell client
-	stuff
-
-	* gui/component/select-names/Makefile.am: build new files
-
-2003-12-05  Chris Toshok  <toshok@ximian.com>
-
-	* gui/widgets/e-addressbook-model.c (book_view_loaded): call
-	remove_book_view/free_data here as well, to guard against multiple
-	book_view's being loaded.
-
-2003-12-05  Hans Petter Jansson  <hpj@ximian.com>
-
-	* gui/widgets/e-addressbook-view.etspec: Clean up and sync with
-	current model columns.
-
-2003-12-04  Christian Hammond  <chipx86@gnupdate.org>
-
-	* addressbook/gui/contact-editor/e-contact-editor-im.[ch],
-	  addressbook/gui/contact-editor/im.glade: Added a dialog for
-	  adding a new IM account.
-	* addressbook/gui/contact-editor/Makefile.am: Added the previously
-	  mentioned files, and depend on camel for necessary MIME parsing.
-
-	* addressbook/gui/contact-editor/contact-editor.[ch],
-	  addressbook/gui/contact-editor/contact-editor.glade: Add and implement
-	  the Instant Messaging tab.
-
-2003-12-03  Ettore Perazzoli  <ettore@ximian.com>
-
-	* gui/component/addressbook.c
-	(retrieve_shell_view_interface_from_control): Remove.
-	(set_folder_bar_label): Remove.
-	(addressbook_new_control): Don't connect.
-
-2003-12-03  Ettore Perazzoli  <ettore@ximian.com>
-
-	* gui/component/addressbook-config.c: Do not depend on
-	e-folder-list.
-
-	* gui/component/select-names/e-select-names.c: Remove dependency
-	on evolution-folder-selector-button.
-	(e_addressbook_create_folder_selector): Just return a FIXME label
-	for now.
-	(folder_selected): #if 0 out.
-	(e_select_names_init): Do not connect.
-
-	* gui/component/select-names/e-select-names-manager.c
-	(e_select_names_manager_activate_dialog): Don't get a shell_client
-	arg anymore.
-	(load_completion_books): Stub out.
-
-	* gui/component/select-names/e-select-names.c
-	(e_select_names_new): Don't get an EvolutionShellClient anymore.
-	Don't create the folder selector button for now.
-
-	* gui/component/select-names/e-select-names.h: Remove dependency
-	on evolution-shell-client.
-
-	* gui/component/select-names/e-select-names-bonobo.c: Remove
-	dependency on evolution-shell-client.
-	(impl_SelectNames_activate_dialog): Stub out.
-
-	* gui/widgets/eab-gui-util.c: Remove dependency on
-	evolution-shell-client.
-	(eab_transfer_contacts): Stub out.
-
-2003-12-02  Rodney Dawes  <dobey@ximian.com>
-
-	* gui/component/Makefile.am: Version the schemas
-	* gui/component/apps_evolution_addressbook.schemas: Removed
-	* gui/component/apps_evolution_addressbook.schemas.in.in: Added
-
-2003-12-02  Ettore Perazzoli  <ettore@ximian.com>
-
-	* gui/component/addressbook.c (set_status_message): Call
-	e_activity_handler_operation_finished() on the current activity ID
-	when done.
-
-2003-12-01  Ettore Perazzoli  <ettore@ximian.com>
-
-	* gui/component/addressbook.c (struct AddressbookView): Replace
-	activity_client with activity_id.
-	(set_status_message): Use the EActivityHandler from the
-	AddressbookComponent.
-
-	* gui/component/addressbook-component.c (struct
-	_AddressbookComponentPrivate): New member activity_handler.
-	(addressbook_component_init): Init.
-	(impl_dispose): Unref.
-	(addressbook_component_peek_activity_handler): New.
-	(impl_createControls): Return an ETaskBar as the statusbar control
-	and attach it to the activity handler.
-
-2003-12-01  Ettore Perazzoli  <ettore@ximian.com>
-
-	* gui/component/addressbook-component.c (impl_createControls):
-	Pass a label for the status bar control for now.
-
-2003-12-01  Larry Ewing  <lewing@ximian.com>
-
-	* gui/component/Makefile.am (INCLUDES): remove
-	GTK_DISABLED_DEPRECATED so that we can build with gtk-2.3.
-
-2003-12-01  Rodney Dawes  <dobey@ximian.com>
-
-	* gui/component/GNOME_Evolution_Addressbook.server.in.in:
-	* gui/component/addressbook-config.c:
-	* gui/component/addressbook.c:
-	* gui/component/component-factory.c:
-	* gui/component/select-names/GNOME_Evolution_Addressbook_SelectNames.server.in.in:
-	* gui/component/select-names/e-select-names-bonobo.c:
-	* gui/component/select-names/e-select-names-factory.c:
-	* gui/widgets/eab-gui-util.c:
-	* gui/widgets/eab-vcard-control.c: Use BASE_VERSION for repo_ids and
-	  OAFIIDs
-
-2003-12-01  Hans Petter Jansson  <hpj@ximian.com>
-
-	* gui/component/ldap-config.glade: Fix start page text.
-
-2003-12-01  JP Rosevear <jpr@ximian.com>
-
-	* conduit/Makefile.am: use privconduitdir
-
-	* conduit/e-address.conduit.in: subst right thing
-
-2003-12-01  JP Rosevear <jpr@ximian.com>
-
-	* conduit/e-address.conduit.in: specify privlibdir as the location
-
-	* conduit/Makefile.am: install the conduit to privlibdir
-
-2003-12-01  JP Rosvear <jpr@ximian.com>
-
-	* conduit/Makefile.am: version the .conduit file
-
-2003-12-01  Hans Petter Jansson  <hpj@ximian.com>
-
-	* gui/component/new-addressbook.glade: Remove this too.
-
-	* gui/component/Makefile.am (glade_DATA): Remove new-addressbook.glade.
-
-2003-12-01  Hans Petter Jansson  <hpj@ximian.com>
-
-	* gui/component/Makefile.am (libevolution_addressbook_la_SOURCES):
-	Remove addressbook-storage.[ch] and new-addressbook.[ch].
-
-	* gui/component/addressbook-storage.[ch]: Removed from repository.
-
-	* gui/component/new-addressbook.[ch]: Removed from repository.
-
-	* gui/component/addressbook-component.c (load_uri_for_selection):
-	Set source_uid property on view control, not folder_uri.
-	(new_addressbook_cb): Call addressbook_config_create_new_source ().
-	(edit_addressbook_cb): Implement.
-	(fill_popup_menu_callback): Hook up edit_addressbook_cb ().
-	(addressbook_component_init): Create the LDAP source group.
-
-	* gui/component/addressbook-config.c (AddressbookSourceDialog):
-	Take out the NEW_ADVANCED_UI stuff and add ESource related vars.
-	(ldap_unparse_auth)
-	(ldap_parse_auth)
-	(ldap_unparse_scope)
-	(ldap_unparse_ssl)
-	(ldap_parse_ssl): Moved here from addressbook-storage.c.
-	(addressbook_dialog_get_source)
-	(addressbook_dialog_set_source)
-	(objectclasses_create_server_table)
-	(objectclasses_create_evolution_table)
-	(objectclasses_add_foreach)
-	(objectclasses_add)
-	(objectclasses_sever_double_click)
-	(objectclasses_remove_foreach)
-	(objectclasses_remove)
-	(objectclasses_evolution_double_click)
-	(objectclasses_restore_default)
-	(server_selection_model_changed)
-	(evolution_selection_model_changed)
-	(setup_objectclasses_tab): Nuke aging, unfinished NEW_ADVANCED_UI.
-	(add_source_clicked)
-	(edit_source_clicked)
-	(delete_server)
-	(delete_source_clicked)
-	(ldap_config_control_destroy_callback)
-	(ldap_config_control_apply_callback)
-	(sources_selection_changed)
-	(sources_table_row_activated)
-	(ldap_dialog_new)
-	(addressbook_dialog_create_sources_table)
-	(ldap_config_control_new)
-	(addressbook_config_control_new): Nuke config control.
-	(create_source_dir)
-	(dialog_to_source)
-	(dialog_to_temp_source)
-	(source_to_uri_parts)
-	(source_to_dialog)
-	(source_group_changed_cb)
-	(source_group_menu_add_groups)
-	(folder_page_forward)
-	(finish_page_back): Implement.
-	(addressbook_ldap_init): Take ESource instead of AddressbookSource.
-	(addressbook_ldap_auth): Don't take a source, not needed.
-	(addressbook_root_dse_query): Ditto.
-	(addressbook_source_dialog_destroy): Clean up destroy function.
-	(addressbook_add_server_druid_finish): Clean up, create ESource.
-	(general_tab_check): If it's not LDAP, these options don't matter.
-	(do_ldap_root_dse_query): Source no longer needed here.
-	(query_for_supported_bases): Use a temp source generated from
-	current dialog settings.
-	(display_name_page_prepare): Renamed to folder_page_prepare ().
-	(druid_display_name_page_modify_cb): Renamed to
-	druid_folder_page_modify_cb ().
-	(addressbook_add_server_druid): Set up source list, group selector.
-	Make LDAP pages optional, dependent on selected group. Use ESource.
-	(edit_dialog_store_change): Remove config control list stuff,
-	export settings to ESource.
-	(addressbook_edit_server_dialog): Renamed to
-	addressbook_config_edit_source (), which takes an ESource. Remove
-	config control list stuff, make LDAP pages show up only if we have
-	an LDAP source. Remove NEW_ADVANCED_UI cruft.
-	(addressbook_config_create_new_source): Just call
-	addressbook_add_server_druid ().
-
-	* gui/component/addressbook-config.h: Move LDAP enums here, from
-	addressbook-storage.h.
-
-	* gui/component/addressbook.c (control_activate_cb): uri -> source
-	(addressbook_view_clear): Unref source list.
-	(book_open_cb): Use ESource.
-	(load_uri_auth_cb): Renamed to load_source_auth_cb (), manipulate
-	ESource instead of URI.
-	(get_remember_password): Implement.
-	(set_remember_password): Implement.
-	(addressbook_authenticate): Use ESource properties.
-	(load_uri_cb): Renamed to load_source_cb (), ESource adaptation.
-	(addressbook_load_uri): Renamed to addressbook_load_source (), takes
-	ESource.
-	(addressbook_load_default_book): ESource adaptation.
-	(get_prop): folder_uri property -> source_uid property.
-	(set_prop): folder_uri property -> source_uid property. Find ESource
-	by UID.
-	(addressbook_new_control): Set up source_uid property and ESourceList.
-
-	* gui/component/component-factory.c (factory): Disable config control.
-
-	* gui/component/ldap-config.glade: Druid and notebook dialogs
-	generalized to deal with local sources as well as LDAP. This file
-	should probably be renamed...
-
-	* gui/component/select-names/e-select-names-manager.c
-	(load_completion_books): Use addressbook_load_source (). However, this
-	needs a bit more work to get source UIDs instead of URIs.
-
-	* gui/component/select-names/e-select-names.c
-	(addressbook_model_set_uri): Use addressbook_load_source (). However,
-	this needs a bit more work to get source UIDs instead of URIs.
-
-2003-11-26  JP Rosevear  <jpr@ximian.com>
-
-	* gui/widgets/Makefile.am: turn on deprecated gtk and libgnomeui
-	stuff
-
-	* gui/component/select-names/Makefile.am: turn on deprecated gtk
-	stuff
-
-	* gui/contact-editor/Makefile.am: ditto
-	
-2003-11-17  Hans Petter Jansson  <hpj@ximian.com>
-
-	* gui/component/addressbook-component.c (impl_createControls): Store
-	a ref to the source selector.
-	(impl_requestCreateItem): Implement.
-	(impl_dispose): Unref the source selector.
-	(addressbook_component_init): Set up default sources.
-
-	* gui/widgets/e-addressbook-model.c (eab_model_set_property): If
-	the 'book' property is set, and editability changes, emit a signal
-	to that effect.
-
-2003-11-14  JP Rosevear <jpr@ximian.com>
-
-	* gui/component/new-addressbook.c: include e-source from e-d-s
-
-2003-11-13  Hans Petter Jansson  <hpj@ximian.com>
-
-	* gui/contact-list-editor/e-contact-list-model.c
-	(contact_list_is_cell_editable): Return TRUE for all cells, for now.
-
-	* gui/widgets/e-addressbook-table-adapter.c (card_modified_cb):
-	Renamed to contact_modified_cb ().
-	(addressbook_set_value_at): Port to use EContact instead of ECard.
-	(addressbook_is_cell_editable): Ditto.
-	(addressbook_append_row): Ditto.
-
-	* gui/widgets/e-minicard-label.c (e_minicard_label_set_property):
-	Make not editable, ever, and add a comment to this effect.
-	(e_minicard_label_realize): Ditto.
-
-	* gui/widgets/e-minicard.c (e_minicard_set_property): Ditto.
-	(add_field): Ditto.
-
-2003-11-13  Ettore Perazzoli  <ettore@ximian.com>
-
-	* gui/component/addressbook-component.c
-	(impl__get_userCreatableItems): New, implementation for the
-	userCreatableItems property.
-	(impl_requestCreateItem): New, implementation for the
-	requestCreateItem method.
-	(addressbook_component_class_init): Install.
-
-2003-11-12  Ettore Perazzoli  <ettore@ximian.com>
-
-	* gui/component/GNOME_Evolution_Addressbook.server.in.in: Add
-	component_alias of "contacts".
-
-2003-11-08  Hans Petter Jansson  <hpj@ximian.com>
-
-	* gui/component/Makefile.am (libevolution_addressbook_la_SOURCES):
-	Add new-addressbook.[ch].
-	(glade_DATA): Add new-addressbook.glade.
-
-	* gui/component/addressbook-component.c (add_popup_menu_item):
-	Implement.
-	(new_addressbook_cb): Implement.
-	(delete_addressbook_cb): Implement (skeletal).
-	(fill_popup_menu_callback): Implement.
-	(impl_createControls): Hook up fill_popup_menu_callback().
-
-	* gui/component/new-addressbook.[ch]: New files.
-
-	* gui/component/new-addressbook.glade: New file.
-
-2003-11-07  Dan Winship  <danw@ximian.com>
-
-	* util/Makefile.am (INCLUDES): Remove some includes of directories
-	that don't exist any more
-
-2003-11-07  JP Rosevear <jpr@ximian.com>
-
-	* gui/contact-editor/Makefile.am: don't include the c marshaller
-	file twice
-
-	* gui/widgets/Makefile.am: ditto
-	
-2003-11-07  JP Rosevear <jpr@ximian.com>
-
-	* gui/widgets/Makefile.am: make sure the marshal header is in the
-	source list
-
-	* gui/component/select-names/Makefile.am: ditto
-
-	* gui/contact-editor/Makefile.am: ditto
-
-	* gui/contact-list-editor/Makefile.am: ditto
-	
-2003-11-07  JP Rosevear <jpr@ximian.com>
-
-	* util/Makefile.am: dist the marshal list
-
-2003-11-07  JP Rosevear <jpr@ximian.com>
-
-	* gui/widgets/e-addressbook-view.c (change_view_type): don't
-	destroy the widget here - its dead when removed from the paned
-	container
-
-2003-11-07  JP Rosevear <jpr@ximian.com>
-
-	* In the gui this is a search and replace commit for moving the
-	addressbook to evolution-data-server; it also deletes the old
-	backend files
-
-2003-11-05  Larry Ewing  <lewing@ximian.com>
-
-	* gui/widgets/e-addressbook-view.c (create_minicard_view): fix cast.
-
-2003-11-03  Ettore Perazzoli  <ettore@ximian.com>
-
-	* gui/component/select-names/e-select-names-factory.c: Update
-	factory ID.
-
-	* gui/component/select-names/GNOME_Evolution_Addressbook_SelectNames.server.in.in:
-	Version the SelectNames server IDs by appending a "_2".
-
-2003-11-03  Ettore Perazzoli  <ettore@ximian.com>
-
-	* gui/component/GNOME_Evolution_Addressbook.server.in.in: Change
-	"evolution:config_item" into "evolution2:config_item".
-
-2003-10-29  Chris Toshok  <toshok@ximian.com>
-
-	* gui/component/GNOME_Evolution_Addressbook.server.in.in: add the
-	S/MIME config control here.
-
-2003-10-29  Chris Toshok  <toshok@ximian.com>
-
-	* backend/ebook/e-book-listener.c (e_book_listener_new): change
-	the poa hint to PER_REQUEST.  fixes a couple of deadlocks.
-
-2003-10-29  Chris Toshok  <toshok@ximian.com>
-
-	* gui/component/component-factory.c (factory): ifdef the smime
-	code with HAVE_NSS.
-
-	* gui/component/Makefile.am (libevolution_addressbook_la_LIBADD):
-	conditionally include libevolution-smime.la.
-
-2003-10-24  Dan Winship  <danw@ximian.com>
-
-	* backend/pas/Makefile.am (libpas_la_LIBADD): libpas should depend
-	on libebook, but NOT on libpasfile, etc, since it needs to be
-	linked into all backends, not just the wombat.
-	(libpasfile_la_LIBADD): depend on libpas.la and libedb3util.la
-	(libpasvcf_la_LIBADD): depend on libpas.la
-	(libpasldap_la_LIBADD): depend on libpas.la and  $(LDAP_LIBS)
-
-2003-10-23  Dan Winship  <danw@ximian.com>
-
-	* backend/ebook/e-contact.c (e_contact_date_equal): new util func
-
-	* backend/pas/pas-backend-ldap.c (anniversary_compare,
-	birthday_compare): Use it
-
-	* backend/pas/pas-backend-summary.c
-	(pas_backend_summary_check_contact): Check if an ID exists in the
-	summary.
-
-2003-10-23  Chris Toshok  <toshok@ximian.com>
-
-	* tools/Makefile.am: convert 8 spaces to a tab.
-
-	* tools/.cvsignore: ignore evolution-addressbook-abuse and
-	evolution-addressbook-clean.
-
-	* gui/component/Makefile.am (libevolution_addressbook_la_LIBADD):
-	add libevolution-smime.la.
-
-	* gui/component/component-factory.c (factory): add the certificate
-	manager config control stuff here, at least for now.
-
-	* gui/component/GNOME_Evolution_Addressbook.server.in.in: same.
-
-2003-10-23  Rodrigo Moya <rodrigo@ximian.com>
-
-	* gui/component/addressbook-config.c
-	(addressbook_dialog_create_source_table): fixed typo in variable name.
-
-2003-10-22  Ettore Perazzoli  <ettore@ximian.com>
-
-	* gui/component/GNOME_Evolution_Addressbook.server.in.in: Add an
-	"evolution:button_icon" attribute.
-
-2003-10-22  Ettore Perazzoli  <ettore@ximian.com>
-
-	* gui/component/GNOME_Evolution_Addressbook.server.in.in: Add an
-	"evolution:button_sort_order" property.
-
-2003-10-22  Ettore Perazzoli  <ettore@ximian.com>
-
-	* gui/component/addressbook-component.c (impl_createControls):
-	Make the the scrolled window have an "in" shadow.
-	* gui/component/addressbook-config.c
-	(addressbook_dialog_create_sources_table): Likewise.
-	* gui/widgets/e-addressbook-view.c (create_minicard_view): Likewise.
-	(create_treeview_view): Likewise.
-
-2003-10-22  Ettore Perazzoli  <ettore@ximian.com>
-
-	* gui/component/addressbook-component.c (impl_createControls): Set
-	the GtkScrolledWindow scrollbar policy to "automatic" for both the
-	horizontal and the vertical scrollbar.
-
-2003-10-22  Ettore Perazzoli  <ettore@ximian.com>
-
-	* gui/component/GNOME_Evolution_Addressbook.server.in.in: Add an
-	"evolution:button_label" property on the component for use in the
-	shell.
-
-2003-10-21  JP Rosevear <jpr@ximian.com>
- 
- 	* conduit/address-conduit.c: make it work with the new ebook api
- 
- 	* backend/pas/pas-book.c (pas_book_respond_get_changes): put the
- 	vcard in for every change
- 
- 	* backend/pas/pas-backend.c (pas_backend_change_add_new): just use
- 	the vcard field
- 	(pas_backend_change_modify_new): ditto
- 	(pas_backend_change_delete_new): ditto
- 
- 	* backend/pas/pas-backend-file.c
- 	(pas_backend_file_changes_foreach_key): create a fake contact with
- 	the uid
- 	(pas_backend_file_get_changes): add the card to the changes
- 
- 	* backend/ebook/tests/ebook/test-changes.c (main): just print the
- 	uid
- 
- 	* backend/ebook/e-book.c (e_book_free_change_list): unref the
- 	contact
- 
- 	* backend/ebook/e-book-types.h: the change struct contains an
- 	EContact now
- 
- 	* backend/ebook/e-book-listener.c
- 	(impl_BookListener_respond_get_changes): create the contact from
- 	the vcard string
- 
- 	* backend/idl/addressbook.idl: Book change item is no longer a
- 	union, it always gives back a card
-	
-2003-10-21  Chris Toshok  <toshok@ximian.com>
-
-	* tools/evolution-addressbook-abuse.c: use the synchronous api for
-	this.  simplifies it a bunch.
-
-2003-10-21  Chris Toshok  <toshok@ximian.com>
-
-	* backend/pas/pas-book.c
-	(impl_GNOME_Evolution_Addressbook_Book_remove): we can ill afford
-	bad debug spew.
-	(view_listener_died_cb): implement.
-	(impl_GNOME_Evolution_Addressbook_Book_getBookView): hook up an
-	ORBit_small connection listener on the view's listener.
-	(pas_book_respond_create): use e_contact_get_const instead of
-	e_contact_get here.  fixes a leak.
-
-	* backend/pas/pas-book-view.c
-	(impl_GNOME_Evolution_Addressbook_BookView_stop): implement, call
-	pas_backend_stop_book_view.
-	(pas_book_view_get_listener): return the book view's listener.
-	(pas_book_view_class_init): fill in epv->stop.
-	(pas_book_view_init): use a #define for THRESHOLD_MAX instead of
-	the constant.
-
-	* backend/pas/pas-book-view.h: add prototype for
-	pas_book_view_get_listener.
-
-	* backend/pas/pas-backend.c (pas_backend_stop_book_view):
-	implement.
-	(pas_backend_remove_book_view): implement.
-
-	* backend/pas/pas-backend.h: add prototype for stop_book_view and
-	remove_book_view.
-
-	* backend/pas/pas-backend-vcf.c (load_file): pass in the fd and
-	use fdopen here.
-	(foreach_build_list): don't creat EContacts here, because we'll
-	just be converting them back to vcards anyway.
-	(save_file): use char*'s instead of EContacts, and split entries
-	with 2 blank lines.  Also, hold the lock over the entire function.
-	(do_create): hold the lock around uid generation and touching the
-	hash table.
-	(pas_backend_vcf_process_remove_contacts): same.
-	(pas_backend_vcf_process_modify_contact): same.
-	(pas_backend_vcf_stop_book_view): new function, but leave
-	unimplemented for now.
-	(pas_backend_vcf_load_uri): the uri contains the directory name,
-	not the filename.
-	(pas_backend_vcf_dispose): grab the lock here just for sanity's
-	sake.  Also reorder things a bit, and free the hashtable and
-	mutex.
-	(pas_backend_vcf_init): init the mutex.
-
-	* backend/pas/pas-backend-summary.c
-	(pas_backend_summary_add_contact): don't unref the contact here.
-
-	* backend/pas/pas-backend-ldap.c
-	(pas_backend_ldap_process_stop_book_view): new function, but leave
-	unimplemented for now.
-
-	* backend/pas/pas-backend-file.c (build_summary): use an EContact
-	for this call.
-	(do_summary_query): nuke, the contents of this has been moved to
-	start_book_view.
-	(pas_backend_file_search_timeout): same.
-	(pas_backend_file_search): same.
-	(pas_backend_file_start_book_view): glom everything into here
-	involving searching.  This function could (and should) be renamed
-	and reused from both this function and _get_contact_list.
-	(pas_backend_file_stop_book_view): new function.
-	(pas_backend_file_class_init): fill in backend->stop_book_view.
-
-	* backend/pas/Makefile.am (LDAP_BACKEND): libpasldap.a ->
-	libpasldap.la
-	(noinst_LTLIBRARIES): *.a -> *.la.
-	(libpas_la_SOURCES): same.
-	(libpasfile_la_SOURCES): same.
-	(libpasvcf_la_SOURCES): same.
-	(libpasldap_la_SOURCES): same.
-
-	* backend/idl/addressbook.idl: add BookView::stop.
-
-	* backend/ebook/e-vcard.c (read_attribute_value): fix GString
-	related leaks.
-	(read_attribute_params): same.
-	(parse): don't leak the EVCardAttributes corresponding to
-	BEGIN/END:vCard.
-	(free_gstring): new function
-	(e_vcard_attribute_remove_values): free the decoded_values list,
-	using free_gstring.
-
-	* backend/ebook/e-book.c (e_book_response_get_book_view): ref the
-	listener here.
-
-	* backend/ebook/e-book-view.h: add prototype for e_book_view_stop.
-
-	* backend/ebook/e-book-view.c (e_book_view_stop): new function.
-
-	* backend/ebook/e-book-async.c (_get_book_view_response_dtor):
-	unref the book view.
-
-2003-10-20  Dan Winship  <danw@ximian.com>
-
-	* backend/pas/pas-book-view.c: Queue up removes and modifies as
-	well as adds, and remove the calls that took a list of changes
-	rather than a single change, since no one was really using the
-	list versions. Keep a list of IDs currently in the view so we can
-	more easily figure out what changes count as adds, modifies, and
-	removes.
-	(send_pending_adds): Don't reset next_threshold if it's being
-	called from notify_add.
-	(send_pending_changes, send_pending_removes): New
-	(pas_book_view_notify_update): Simplified add/change interface.
-	Takes an EContact and figures out if it's new, modified, or
-	removed relative to this view.
-	(pas_book_view_notify_change, pas_book_view_notify_change_1,
-	pas_book_view_notify_add, pas_book_view_notify_add_1): Gone.
-	(pas_book_view_notify_remove): Now does what remove_1 used to do.
-	(pas_book_view_vcard_matches): Remove this; no longer used.
-
-	* backend/pas/pas-backend.c (pas_backend_notify_update): New.
-	Calls pas_book_view_notify_update() on each of the backend's views.
-	(pas_backend_notify_remove): Likewise for notify_remove().
-	(pas_backend_notify_complete): And notify_complete().
-
-	* backend/pas/pas-book.c (pas_book_respond_create): Take an
-	EContact instead of an id and a vcard. Use
-	pas_backend_notify_update.
-	(pas_book_respond_remove_contacts): Use pas_backend_notify_remove.
-	(pas_book_respond_modify): Take a single EContact instead of two
-	vcards. Use pas_backend_notify_update.
-
-	* backend/pas/pas-backend-sync.c
-	(pas_backend_sync_create_contact): Return an EContact rather than
-	an id.
-	(pas_backend_sync_modify_contact): Return an EContact rather than
-	the old_vcard.
-	(_pas_backend_create_contact, _pas_backend_modify_contact): Update
-
-	* backend/pas/pas-backend-file.c (do_summary_query): Use
-	pas_book_view_notify_update.
-	(pas_backend_file_search_timeout): Likewise
-	(pas_backend_file_create_contact): Update for API changes
-	(pas_backend_file_modify_contact): Likewise.
-
-	* backend/pas/pas-backend-ldap.c (create_contact_handler,
-	pas_backend_ldap_process_create_contact): Update for API changes
-	(modify_contact_modify_handler, modify_contact_search_handler,
-	pas_backend_ldap_process_modify_contact): Likewise
-	(ldap_search_handler): Use pas_book_view_notify_update
-
-	* backend/pas/pas-backend-vcf.c (foreach_search_compare): Use
-	pas_book_view_notify_update.
-	(pas_backend_vcf_process_create_contact): Update for API changes
-	(pas_backend_vcf_process_modify_contact): Likewise
-
-	* backend/pas/pas-backend-summary.c
-	(pas_backend_summary_add_contact): Take an EContact instead of a
-	const char *vcard.
-
-	* backend/ebook/e-contact.c (photo_getter): s/malloc/g_malloc/
-
-2003-10-20  JP Rosevear <jpr@ximian.com>
-
-	* backend/pas/pas-backend-vcf.c (pas_backend_vcf_search): compiler
-	with non-c99 compilers
-
-2003-10-17  Chris Toshok  <toshok@ximian.com>
-
-	* backend/ebook/e-contact.c (fn_getter): new function, just return
-	the full name value.
-	(fn_setter): rather distasteful hack.  set the N attribute if it's
-	not already present.
-	(n_setter): set the X-EVOLUTION-FILE-AS attribute if it's not
-	already set.
-
-	* backend/pas/pas-backend-ldap.c (prop_info): add PROP_WRITE_ONLY
-	flag for properties (right now just 'sn') that we don't want to
-	use when building the EContact - we only use it when storing the
-	contact out to the ldap server.
-	(build_contact_from_entry): skip WRITE_ONLY properties.
-
-2003-10-17  Chris Toshok  <toshok@ximian.com>
-
-	* gui/widgets/e-addressbook-view.c (init_collection): add the
-	minicard factory back in.
-	(display_view): add the minicard case back in.
-	(get_selection_model): same.
-	(minicard_right_click): resurrect.
-	(create_minicard_view): same.
-	(change_view_type): add the minicard case back in.
-	(eab_view_print): same.
-	(eab_view_print_preview): same.
-
-	* gui/widgets/e-addressbook-view.h (EABViewType): add MINICARD
-	back in.
-
-	* gui/widgets/e-addressbook-model.c (eab_model_new):
-	E_TYPE_AB_MODEL -> EAB_TYPE_MODEL.
-
-	* gui/widgets/e-addressbook-model.h: rename E_TYPE_AB_MODEL to
-	EAB_TYPE_MODEL.
-
-	* gui/widgets/Makefile.am (libeabwidgets_la_SOURCES): add the
-	minicard stuff back into the build.
-
-	* gui/widgets/e-addressbook-reflow-adapter.[ch],
-	gui/widgets/e-minicard-label.[ch],
-	gui/widgets/e-minicard-view-widget.[ch],
-	gui/widgets/e-minicard-view.[ch], gui/widgets/e-minicard.[ch],
-	gui/widgets/gal-view-factory-minicard.[ch], gal-view-minicard.h:
-	resurrect the minicard stuff, in a new uneditable,
-	EContact-friendly state.  no in-place editing anymore.
-
-	
-2003-10-10  Chris Toshok  <toshok@ximian.com>
-
-	* gui/contact-editor/e-contact-editor.c (fill_in_info): un-ifdef
-	the date handling code.
-	(extract_info): same.
-
-	* backend/pas/pas-backend-ldap.c (prop_info): add the address
-	labels and dates to the build.
-	(anniversary_populate): un-ifdef and get this working.
-	(anniversary_ber): same.
-	(anniversary_compare): same.
-	(birthday_populate): same.
-	(birthday_ber): same.
-	(birthday_compare): same.
-
-	* backend/ebook/tests/ebook/.cvsignore,
-	backend/ebook/tests/ebook/Makefile.am
-	backend/ebook/tests/ebook/test-date.c: add a test for EContactDate
-	getting/setting.
-	
-	* backend/ebook/e-vcard.h: add EVC_BDAY.
-
-	* backend/ebook/e-contact.h: add prototypes for the
-	e_contact_date_* functions.
-
-	* backend/ebook/e-contact.c (field_info): add
-	BIRTH_DATE/ANNIVERSARY fields.
-	(date_getter): new
-	(date_setter): new
-	(e_contact_date_new): new
-	(e_contact_date_from_string): new
-	(e_contact_date_to_string): new
-	(e_contact_date_free): new
-
-2003-10-10  Not Zed  <NotZed@Ximian.com>
-
-	*
-	gui/component/select-names/GNOME_Evolution_Addressbook_SelectNames.server.in.in:
-	Use the main factory on the .so file, so it can be found.
-
-2003-10-08  Chris Toshok  <toshok@ximian.com>
-
-	* gui/component/select-names/e-select-names.c (contact_key): add a
-	descriptive comment about this "#if notyet".
-
-	* gui/component/select-names/e-select-names-model.h
-	(e_select_names_model_thaw): add prorotype for
-	e_select_names_model_cancel_all_contact_load.
-
-	* gui/component/select-names/e-select-names-bonobo.c
-	(_EntryPropertyID): remove the SIMPLE_CARD_LIST property.
-	(entry_get_property_fn): same.
-	(impl_SelectNames_get_entry_for_section): same.
-
-	* backend/ebook/e-contact.h: add prototype for
-	e_contact_name_to_string.
-
-2003-10-07  Chris Toshok  <toshok@ximian.com>
-
-	* util/eab-book-util.c: remove a bunch of ifdef'ed code (that's
-	going to be living in e-book.c)
-
-	* backend/pas/pas-backend-summary.c
-	(pas_backend_summary_add_contact): un-ifdef some code.
-	(pas_backend_summary_get_summary_vcard): same.
-
-	* backend/pas/pas-backend-ldap.c (prop_info): remove the
-	query_prop field since we can get it from e_contact_field_name.
-	also remove it from all the macros and their uses.
-	(homephone_populate): un-ifdef.
-	(homephone_ber): same.
-	(homephone_compare): same.
-	(business_populate): same.
-	(business_ber): same.
-	(business_compare): same.
-	(query_prop_to_ldap): use e_contact_field_name to get the query
-	prop for a given attribute.
-	(add_oc_attributes_to_supported_fields): same.
-
-	* backend/pas/pas-backend-card-sexp.c (compare_phone): use the new
-	EContactField constants to iterate over the phone list.
-
-	* backend/ebook/e-contact.h (EContactField): add some useful
-	constants for those pieces of code that iterate over
-	email/phones/addresses.
-
-2003-10-07  Chris Toshok  <toshok@ximian.com>
-
-	* gui/widgets/eab-vcard-control.c (book_open_cb): un-ifdef this.
-	(eab_vcard_control_new): put the buttons above the vcard so they
-	don't move when it's expanded.
-
-	* gui/widgets/eab-popup-control.h: remove prototypes for
-	eab_popup_control_set_name and eab_popup_control_set_email.
-
-	* gui/widgets/eab-popup-control.c (email_table_ok_cb): remove the
-	stupid idle function and do the work here.
-	(eab_popup_control_set_name): make this static - noone uses it.
-	(eab_popup_control_set_email): same.
-
-	* gui/widgets/eab-gui-util.c (eab_show_contact_editor):
-	e_contact_editor_new is what we use for the time being.
-
-	* gui/widgets/eab-contact-display.c (render_string): abstract this
-	code out.
-	(render_url): same.
-	(eab_contact_display_render_normal): make use of render_string and
-	render_url.
-
-	* gui/widgets/e-addressbook-view.c (delete): un-ifdef this and get
-	it working.
-	(selection_received): same.
-
-	* gui/widgets/e-addressbook-model.c (get_view): nuke some code
-	that was moved to another function.
-	(eab_model_set_property): get the writable state when we set the
-	book - don't rely on the timing of signals.
-
-	* gui/contact/editor/contact-editor.glade: add the blog field
-	below the homepage url field.
-	
-	* gui/contact/editor/e-contact-editor-address.[ch]: get this
-	building with the new stuff.
-	
-	* gui/contact/editor/e-contact-editor-fullname.[ch]: get this
-	building with the new stuff.
-	
-	* gui/contact-editor/e-contact-editor.[ch]: get this most of the
-	way there.
-	
-	* gui/contact-editor/e-contact-quick-add.[ch]: get this building
-	with the new stuff.
-
-	* gui/contact-editor/Makefile.am (libecontacteditor_la_SOURCES):
-	remove e-contact-save-as.[ch].  They're in
-	addressbook/widgets/eab-gui-util.[ch] now.
-
-	* gui/merging/Makefile.am: track all the naming changes.
-	
-	* gui/merging/*.glade: gratuitous renaming.
-	
-	* gui/merging/eab-contact-compare.[ch]: gratuitous renaming, and
-	move this from the old ebook/
-
-	* gui/merging/eab-contact-merging.[ch]: gratuitous renaming.
-
-	* backend/ebook/e-contact.[ch]: lots of overly complicated changes
-	for an overly complicated piece of code.
-
-	* backend/ebook/e-book-view.c (e_book_view_do_added_event): remove
-	some ifdef'ed code.
-	(e_book_view_do_modified_event): same.
-
-	* backend/ebook/e-vcard.c (parse): plug a memory leak.
-	(escape_string): deal with @s being NULL.
-	(e_vcard_remove_attribute): new function.
-	(e_vcard_attribute_remove_params): same.
-	(e_vcard_attribute_param_free): same.
-	(e_vcard_attribute_param_remove_values): same.
-
-	* backend/ebook/e-vcard.h: add prototypes for
-	e_vcard_remove_attribute, e_vcard_attribute_remove_params, and
-	e_vcard_attribute_param_remove_values.
-
-	* backend/ebook/e-book.c (e_book_handle_response): cache the
-	writable state of the ebook before generating the signal.
-	(e_book_unload_uri): initialize cap to NULL and writable to FALSE.
-
-	* backend/ebook/e-book.h: add prototype for e_book_is_writable.
-
-	* backend/ebook/e-book-async.c (_get_fields_response_handler):
-	don't call the callback if it's NULL.
-	(_get_methods_response_handler): same.
-	(_auth_user_response_handler): same.
-	(_get_contact_response_handler): same.
-	(_remove_contacts_response_handler): same.
-	(_add_contact_response_handler): same.
-	(_commit_contact_response_handler): same.
-	(_get_book_view_response_handler): same.
-	(_get_contacts_response_handler): same.
-	(_remove_contacts_dtor): free the list.
-	(e_book_async_remove_contacts): duplicate the list.
-
-	* backend/pas/pas-backend.c (pas_backend_open): if we successfully
-	load the uri, report the writable status back.
-
-	* backend/pas/pas-backend-sync.c (_pas_backend_remove_contacts):
-	free the list of ids.
-
-	* backend/pas/pas-backend-file.c (do_create): return the contact
-	we create here.
-	(pas_backend_file_create_contact): format the newly created
-	contact as a string to add to the summary.
-	(pas_backend_file_remove_contacts): don't free the list of removed
-	cards here - it happens in pas-backend-sync.
-	(pas_backend_file_load_uri): pass NULL for @contact to do_create.
-
-2003-10-01  Chris Toshok  <toshok@ximian.com>
-
-	* gui/widgets/eab-contact-display.c (render_address): move the :'s
-	inside the <b>'s.  Thanks for pointing this out, guenther. :)
-	(eab_contact_display_render_normal): same.
-	(eab_contact_display_render_compact): same.
-
-	* gui/widgets/eab-vcard-control.c (save_in_addressbook): track
-	change to address_load_default_book.
-
-2003-10-01  Chris Toshok  <toshok@ximian.com>
-
-	* gui/component/Makefile.am: remove some commented out crap about
-	e-address-popup.[ch].
-
-	* gui/component/component-factory.c (factory): use
-	eab_popup_control_new for the AddressPopup iid.
-
-	* gui/widgets/Makefile.am (libeabwidgets_la_SOURCES): add
-	eab-popup-control.[ch].
-
-	* backend/ebook/e-book.c (e_book_get_default_addressbook): hack
-	this so it at least sorta works - hardcode the
-	~/evolution/local/Contacts uri for now.
-
-	* gui/component/addressbook.[ch] (addressbook_load_default_book):
-	remove the EBook argument, and call
-	e_book_async_get_default_addressbook.
-
-	* gui/component/e-address-popup.[ch]: nuke.
-	
-	* gui/widgets/eab-popup-control.c: rename
-	gui/component/e-address-popup.c to this.
-
-	* gui/widgets/eab-popup-control.h: rename
-	gui/component/e-address-popup.h to this.
-
-	* backend/ebook/e-book-async.h: add prototype for
-	e_book_async_get_default_addressbook.
-	
-	* backend/ebook/e-book-async.c
-	(e_book_async_get_default_addressbook): new function.
-
-2003-10-01  Chris Toshok  <toshok@ximian.com>
-
-	* gui/widgets/e-addressbook-view.c (eab_view_new): create the
-	scrolled window to embed the EABContactDisplay widget inside of.
-
-	* gui/widgets/e-addressbook-view.h (struct _EABView): add scrolled;
-
-	* gui/widgets/eab-contact-display.h: add
-	EABContactDisplayRenderMode enum, and add @render_mode arg to
-	eab_contact_display_render.
-
-	* gui/widgets/eab-contact-display.c
-	(eab_contact_display_render_compact): new function, render a
-	compact format suitable for inclusion in the mail display.
-	(eab_contact_display_render_normal): move the previouw contents of
-	eab_contact_display_render here.
-	(eab_contact_display_render): render in either compact or normal
-	mode depending on @mode.
-	(eab_contact_display_new): remove the scrolled window stuff from
-	here, as in the compact mode we don't want it present.  push it up
-	into the e-addressbook-view.c code.
-	
-	* gui/widgets/eab-vcard-control.[ch]: bonobo control that wraps up
-	the EABContactDisplay stuff and lets us display vcards in a pretty
-	format in mail messages.
-	
-	* gui/component/component-factory.c (factory): replace the #if
-	notyet'ed minicard control code with the new vcard control.
-
-	* gui/component/Makefile.am (INCLUDES): remove gui/minicard.
-
-	* gui/component/GNOME_Evolution_Addressbook.server.in.in: remove
-	the MiniCard_Control iid, and replace it with VCard_Control.
-
-2003-10-01  Chris Toshok  <toshok@ximian.com>
-
-	* gui/component/addressbook-component.c
-	(destination_folder_handle_drop): use
-	eab_contact_list_from_string, and un-"#if notyet" this.
-
-	* gui/component/addressbook.c: remove #include
-	"e-contact-save-as.h"
-
-	* gui/contact-list-editor/e-contact-list-editor.c
-	(file_save_as_cb): use eab_contact_save.
-	(file_send_as_cb): use eab_send_contact, un-"#if notyet" this.
-	(file_send_to_cb): same.
-	(table_drag_data_received_cb): use eab_contact_list_from_string.
-
-	* gui/widgets/e-addressbook-reflow-adapter.[ch]: nuke.  last
-	vestiges of the minicard view.
-	
-	* gui/widgets/e-addressbook-view.c (eab_view_init):
-	s/clipboard_cards/cliboard_contacts.
-	(eab_view_dispose): same.
-	(get_contact_list_1): s/card/contact
-	(get_contact_list): same.
-	(save_as): same, and use eab_contact_list_save.
-	(send_as): reenable this code, s/card/contact, and use
-	eab_send_contact_list.
-	(send_to): same.
-	(print): s/card/contact.
-	(delete): same.
-	(new_card): same, and un-"#if notyet" some code.
-	(selection_get): use eab_contact_list_to_string.
-	(selection_clear_event): s/card/contact
-	(selection_received): same.
-	(get_selected_contacts): same.
-	(eab_view_save_as): same, and use eab_contact_list_save.
-	(eab_view_view): same, and use eab_show_multiple_contacts.
-	(eab_view_send): reenable this code, s/card/contact, and use
-	eab_send_contact_list.
-	(eab_view_send_to): same.
-	(eab_view_copy): s/card/contact.
-	(view_transfer_contacts): same.
-	(eab_view_copy_to_folder): same.
-	(eab_view_move_to_folder): same.
-
-	* gui/widgets/e-addressbook-view.h (struct _EABView): rename
-	clipboard_cards to clipboard_contacts.
-
-	* gui/widgets/eab-gui-util.c (view_contacts): un-"#if notyet"
-	(file_exists): moved from e-contact-save-as.c
-	(save_it): same.
-	(close_it): same.
-	(destroy_it): same.
-	(make_safe_filename): same.
-	(eab_contact_save): same, and renamed from e_contact_save_as.
-	(eab_contact_list_save): same, and renamed from
-	e_contact_list_save_as.
-	(contact_deleted_cb): s/card/contact.
-	(do_delete): same, and use e_book_async.
-	(delete_contacts): s/card/contact.
-	(process_unref): same.
-	(contact_added_cb): same.
-	(do_copy): same, and use e_book_async.
-	(got_book_cb): same.
-	(eab_transfer_contacts): same, and use e_book_async.
-	(eab_send_contact_list): s/card/contact
-	(eab_send_contact): same.
-
-	* gui/widgets/eab-gui-util.h: some random s/card/contact work, and
-	move the contents of e-contact-save-as.h here.
-
-	* util/eab-book-util.c (eab_contact_list_from_string): rename
-	eab_load_contacts_from_string to this.
-	(eab_contact_list_to_string): new function.
-
-	* util/eab-book-util.h: add prototype for
-	eab_contact_list_to_string, and rename
-	eab_load_contacts_from_string to eab_contact_list_from_string.
-
-	* gui/contact-editor/e-contact-save-as.[ch]: nuke.  the contents
-	of these files has been wrapped up in
-	gui/widgets/eab-gui-util.[ch].
-	
-2003-09-30  Chris Toshok  <toshok@ximian.com>
-
-	* gui/component/Makefile.am (libevolution_addressbook_la_LIBADD):
-	add libecontactlisteditor.la back into the build.
-
-	* gui/component/addressbook-component.c (new_item_cb): enable the
-	contact list editor portion.
-
-	* util/eab-book-util.c (eab_load_contacts_from_string): new
-	function, return a GList of EContact*'s parsed from the string.
-
-	* util/eab-book-util.h: add prototype for
-	eab_load_contacts_from_string.
-
-	* gui/contact-list-editor/contact-list-editor.glade: set the id of
-	the list-image widget.
-
-	* gui/contact-list-editor/e-contact-list-editor.c
-	(e_contact_list_editor_class_init): PROP_CARD -> PROP_CONTACT.
-	(e_contact_list_editor_init): initialize image_buf to null and
-	card -> contact.  also, hook up the dnd signals on the list_image
-	widget so we can drop images.
-	(e_contact_list_editor_dispose): free the image_buf.
-	(list_added_cb): card -> contact.
-	(list_modified_cb): same.
-	(save_contact): same, and use the ebook-async api.
-	(prompt_to_save_changes): card -> contact.
-	(file_save_cb): same.
-	(file_save_as_cb): same.
-	(file_send_as_cb): #if notyet for now.
-	(file_send_to_cb): same.
-	(tb_save_and_close_cb): card -> contact.
-	(list_deleted_cb): same.
-	(delete_cb): same.
-	(delete_cb): same, and use ebook-async.
-	(e_contact_list_editor_new): card -> contact.
-	(e_contact_list_editor_set_property): same.
-	(table_drag_motion_cb): use GDK_POINTER_TO_ATOM instead of
-	casting.
-	(table_drag_data_received_cb): use eab_load_contacts_from_string,
-	and card -> contact.
-	(set_image_from_data): new function. create a pixbuf from the
-	image data and composite it in an image that's the same size as
-	the initial list_image widget.
-	(image_drag_motion_cb): new function.
-	(image_drag_drop_cb): new function.
-	(image_drag_data_received_cb): new function.
-	(extract_info): port to EContact, and add support for the image.
-	(fill_in_info): same.
-
-	* gui/contact-list-editor/e-contact-list-editor.h (struct
-	_EContactListEditor): add image stuff, and ECard -> EContact.
-
-	* gui/contact-list-editor/e-contact-list-model.c
-	(contact_list_value_at): e_destination -> eab_destination.
-	(e_contact_list_model_init): same.
-	(e_contact_list_model_add_destination): same.
-	(e_contact_list_model_add_email): same.
-	(e_contact_list_model_add_contact): same, and card -> contact.
-	(e_contact_list_model_remove_row): e_destination ->
-	eab_destination.
-	(e_contact_list_model_get_destination): same.
-
-	* gui/contact-list-editor/e-contact-list-model.h: card -> contact,
-	and e-destination -> eab-destination.
-
-	* gui/widgets/e-addressbook-view.etspec: fix a couple of
-	fields.. this needs a completely once-over at some point soon.
-
-	* gui/widgets/e-addressbook-view.c (table_double_click): reenable
-	all of this.
-
-	* gui/widgets/eab-contact-display.c (render_address): use
-	e_text_to_html to convert the \n's to <br>'s.
-	(on_url_requested): get PHOTO if there is one, otherwise LOGO.
-	(eab_contact_display_render): escape all the text we're sending to
-	gtkhtml with e_text_to_html.  also, if it's a contact list, output
-	_("List Members") with the contents of _EMAIL.
-
-	* gui/widgets/eab-gui-util.h: rename eab_send_card{_list} to
-	eab_send_contact{_list}.
-
-2003-09-30  Chris Toshok  <toshok@ximian.com>
-
-	* backend/ebook/tests/ebook/Makefile.am (noinst_PROGRAMS): add
-	test-string.
-
-	* backend/ebook/tests/ebook/test-string.c: test setting/getting a
-	string attribute.
-
-	* backend/ebook/e-contact.c (photo_setter): do gnome-vfs mime type
-	sniffing before we set the attribute value.
-	(e_contact_set_property): implement setting of MULTI list
-	attributes (like MAIL).
-	(e_contact_get_property): rework the ATTR_TYPE attribute handling
-	so we aren't calling g_value_set_pointer on a value that holds a
-	string (and vice versa).
-
-	* backend/ebook/e-vcard.c (e_vcard_remove_attributes): implement.
-	(e_vcard_attribute_add_param): use g_ascii_strcasecmp.
-
-	* backend/ebook/e-vcard.h: rename e_vcard_remove_attribute to
-	e_vcard_remove_attributes, since it removes all matching
-	attributes.
-
-	* backend/ebook/e-book.c (e_book_response_add_contact): we need to
-	strdup the id here since the listener frees it.
-	(e_book_handle_response): implement the WritableStatusEvent part
-	of the switch.
-
-	* backend/ebook/e-book-listener.c
-	(impl_BookListener_report_writable): un-"#if notyet" this.
-
-	* backend/ebook/e-book-async.c (_add_contact_handler): fill in
-	response->id.
-
-2003-09-29  Chris Toshok  <toshok@ximian.com>
-
-	* printing/e-contact-print-envelope.c: card -> contact.
-
-	* printing/e-contact-print-envelope.h: card -> contact.
-
-	* printing/e-contact-print.c: card -> contact.
-
-	* printing/e-contact-print.h: card -> contact.
-
-	* printing/Makefile.am (contact_print_test_LDADD): add
-	libeabutil.la and reorder things so it links.
-	(contact_print_style_editor_test_LDADD): same.
-
-2003-09-29  Chris Toshok  <toshok@ximian.com>
-
-	* gui/component/select-names/e-select-names-text-model.c:
-	e-addressbook-util.h -> eab-gui-util.h.
-
-	* gui/component/select-names/e-select-names-popup.c:
-	e-addressbook-util.h -> eab-gui-util.h.
-
-	* gui/component/e-address-popup.c: e-addressbook-util.h ->
-	eab-gui-util.h.
-
-	* gui/component/component-factory.c: #if notyet the minicard
-	control stuff, since it's been completely nuked from the tree.
-
-	* gui/component/addressbook.c: e-addressbook-util.h ->
-	eab-gui-util.h.
-
-	* gui/component/addressbook-component.c: e-addressbook-util.h ->
-	eab-gui-util.h.
-
-	* gui/component/Makefile.am (libevolution_addressbook_la_LIBADD):
-	rename libeminicard to libeabwidgets.
-
-	* Makefile.am (SUBDIRS): add util/ to the build.
-
-2003-09-29  Chris Toshok  <toshok@ximian.com>
-
-	* gui/widgets/e-addressbook-treeview-adapter.c:
-	e-addressbook-util.h -> eab-gui-util.h, and convert some
-	EDestination code to EABDestination.
-
-	* gui/widgets/e-addressbook-table-adapter.c: e-addressbook-util.h
-	-> eab-gui-util.h, and include util/eab-destination.h.
-	(addressbook_value_at): un-#if 0 some code.
-
-	* gui/widgets/e-addressbook-model.c: e-addressbook-util.h ->
-	eab-gui-util.h
-
-	* gui/widgets/e-addressbook-view.c: e-addressbook-util.h ->
-	eab-gui-util.h
-
-	* gui/widgets/e-minicard-control.c,
-	gui/widgets/e-minicard-control.h, gui/widgets/e-minicard-label.c,
-	gui/widgets/e-minicard-label.h,
-	gui/widgets/e-minicard-view-widget.c,
-	gui/widgets/e-minicard-view-widget.h,
-	gui/widgets/e-minicard-view.c, gui/widgets/e-minicard-view.h,
-	gui/widgets/e-minicard-widget-test.c,
-	gui/widgets/e-minicard-widget.c, gui/widgets/e-minicard-widget.h,
-	gui/widgets/e-minicard.c, gui/widgets/e-minicard.h,
-	test-minicard-label.c, test-minicard-view.c, test-minicard.c: nuke
-	all of the old minicard stuff.
-	
-	* gui/widgets/eab-gui-util.[ch]: rename e-addressbook-util.[ch] to
-	this and nuke e-addressbook-util.[ch].
-	
-	* gui/widgets/Makefile.am (INCLUDES): change G_LOG_DOMAIN to
-	eab-widgets, and add -I$(top_srcdir)/addressbook.
-	(noinst_LTLIBRARIES): rename to libeabwidgets.la
-	(libeabwidgets_la_SOURCES): rename e-addressbook-util.[ch] to
-	eab-gui-util.[ch].
-
-2003-09-29  Chris Toshok  <toshok@ximian.com>
-
-	* gui/widgets/eab-contact-display.c (eab_contact_display_new):
-	track change from E_TYPE_AB_CONTACT_DISPLAY to
-	EAB_TYPE_CONTACT_DISPLAY.
-
-	* gui/widgets/eab-contact-display.h: change from E_* type foo to
-	EAB_* type foo.
-
-2003-09-29  Chris Toshok  <toshok@ximian.com>
-
-	* gui/search/e-addressbook-search-dialog.[ch]: convert everything
-	from e_addressbook_search_dialog to eab_search_dialog, and
-	EAddressbookSearchDialog to EABSearchDialog.
-
-	* gui/component/addressbook.c (search_cb):
-	e_addressbook_search_dialog -> eab_search_dialog.
-	(addressbook_search_activated): same.
-	(addressbook_query_changed): same.
-
-2003-09-29  Chris Toshok  <toshok@ximian.com>
-
-	* backend/pas/pas-book.c (pas_book_respond_get_supported_fields):
-	don't free the fields here - the backends hold onto them.
-	(pas_book_respond_get_supported_auth_methods): don't free the
-	auth_methods here - the backends hold onto them.
-
-	* backend/pas/pas-backend-file.c
-	(pas_backend_file_get_supported_fields): fields go from 1 to
-	E_CONTACT_FIELD_LAST, not 0.
-
-2003-09-29  Chris Toshok  <toshok@ximian.com>
-
-	* gui/component/addressbook.c: e-book-util.h -> eab-book-util.h
-
-	* gui/component/addressbook-component.c: e-book-util.h ->
-	eab-book-util.h.
-	(new_item_cb): enable the contact editor portion of this.
-	(user_create_new_item_cb): convert to async_load_uri api, and
-	ifdef the _use_default_book crap.
-	(ensure_completion_uris_exist): e_book_get_config_database ->
-	eab_get_config_database.
-
-	* gui/component/e-address-widget.h: e-book-util.h ->
-	eab-book-util.h.
-
-	* gui/component/Makefile.am (libevolution_addressbook_la_LIBADD):
-	add selectnames back in, and add util/libeabutil.la.
-
-2003-09-29  Chris Toshok  <toshok@ximian.com>
-
-	* backend/ebook/e-contact.c: my head explodes from so many
-	changes.
-
-	* backend/ebook/e-contact.h: reorder fields such that all the
-	string fields are first in the enum (and add a
-	E_CONTACT_LAST_SIMPLE_STRING value, ala the old e-card-simple
-	stuff.)  Also, add E_CONTACT_LOGO, WANTS_HTML, IS_LIST, and
-	LIST_SHOW_ADDRESSES.  remove E_CONTACT_PHOTO_URI.
-
-	* backend/ebook/e-vcard.c (e_vcard_remove_attribute): rename from
-	e_card_remove_attribute, and add a g_assert_not_reached.
-	(_evc_base64_encode_simple): make this not static (we need it for
-	a test.)
-	(_evc_base64_decode_simple): same.
-
-	* backend/ebook/e-vcard.h: add LOGO, X-MOZILLA-HTML,
-	X-EVOLUTION-LIST, and X-EVOLUTION-LIST-SHOW_ADDRESSES #defines.
-																
-	* backend/ebook/e-book.c (EBookLoadState): change from
-	UriNotLoaded to E_BOOK_URI_NOT_LOADED, etc.
-	(e_book_add_contact): track _URI_ change.
-	(e_book_get_supported_fields): same.
-	(e_book_get_supported_auth_methods): same.
-	(e_book_authenticate_user): same.
-	(e_book_get_contact): same.
-	(e_book_response_get_contact): remove the ifdefed call to
-	e_contact_set_book.
-	(e_book_remove_contacts): track _URI_ change.
-	(e_book_get_book_view): same.
-	(e_book_get_contacts): same.
-	(e_book_get_changes): same.
-	(e_book_remove): same.
-	(e_book_unload_uri): same.
-	(e_book_load_uri): same.
-	(e_book_load_uri): same.
-	(e_book_get_self): start the implementation of this.
-	(e_book_get_default_addressbook): ifdef out a possible
-	implementation of this (it's broken.)
-	(e_book_init): track _URI_ change.
-	(e_book_dispose): same.
-																
-	* backend/ebook/e-book.h: move get_default_addressbook out of the
-	ifdef, and change get_default_addressbook/get_addressbooks to be
-	more like the rest of the api.
-																
-	* backend/ebook/e-book-util.[ch]: nuke.
-																
-	* backend/ebook/e-card-compare.[ch]: nuke.
-																
-	* backend/ebook/e-destination.[ch]: nuke.
-																
-	* backend/ebook/e-book-query.c (func_and): fix valgrind error.
-	(func_or): same.
-																
-	* backend/ebook/e-book-listener.h: drop #include of e-list.h
-																
-	* backend/ebook/e-book-async.c (_get_contacts_response_handler)
-	(_get_contacts_response_dtor, _get_contacts_handler)
-	(_get_contacts_dtor, e_book_async_get_contacts): new functions,
-	implementing e_book_async_get_contacts.
-																
-	* backend/ebook/e-book-async.h: add e_book_async_get_contacts.
-
-2003-09-29  Chris Toshok  <toshok@ximian.com>
-
-	* util/eab-marshal.list: new file.
-
-	* util/eab-destination.[ch]: rename
-	backend/ebook/e-destination.[ch] to this, and change all the entry
-	point names too.
-
-	* util/eab-book-util.[ch]: rename backend/ebook/e-book-util.[ch]
-	to this, and change all the entry point names too.
-
-	* util/Makefile.am: new file, build libeabutil.la
-
-2003-09-29  Chris Toshok  <toshok@ximian.com>
-
-	* gui/component/select-names/e-select-names.c
-	(addressbook_model_set_uri): e_addressbook_model -> eab_model.
-	(contact_key): e-contactify this, and remove the call to
-	e_contact_get_book since we don't have it.
-	(sync_one_model): card -> contact.
-	(real_add_address_cb): track various name changes.
-	(esn_get_key_fn): same.
-	(e_addressbook_create_ebook_table): same.
-	(folder_selected): same.
-	(select_entry_changed): same.
-	(e_select_names_new): same.
-
-	* gui/component/select-names/e-select-names-text-model.c
-	(dump_model): s/card/contact.
-	(e_select_names_text_model_insert_length): e-destination ->
-	eab-destination.
-	(e_select_names_text_model_delete): same.
-	(e_select_names_text_model_obj_count): same.
-	(nth_obj_index): same.
-	(e_select_names_text_model_activate_obj): ifdef this out since we
-	don't have e_contact_get_book in the new api.
-
-	* gui/component/select-names/e-select-names-table-model.c
-	(fill_in_info): convert to e_contact/eab_destination.
-
-	* gui/component/select-names/e-select-names-popup.c
-	(change_email_num_cb): e_destination -> eab_destination.
-	(populate_popup_contact): same, and ECard -> EContact.  Also, the
-	email attribute is a GList, not an EList.  lastly, rename from
-	populate_popup_card.
-	(populate_popup_nocontact): same, and rename from
-	populate_popup_nocard.
-	(e_select_names_populate_popup): same.
-
-	* gui/component/select-names/e-select-names-model.h: track changes
-	to e_destination, and rename the cardify methods to something mode
-	descriptive.
-
-	* gui/component/select-names/e-select-names-model.c
-	(e_select_names_model_duplicate): e_destination ->
-	eab_destination.
-	(e_select_names_model_get_textification): same.
-	(e_select_names_model_get_address_text): same.
-	(e_select_names_model_get_destination): same.
-	(e_select_names_model_export_destinationv): same.
-	(send_changed): same.
-	(e_select_names_model_import_destinationv): same.
-	(e_select_names_model_get_contact): same, and rename from
-	_get_card
-	(e_select_names_model_get_string): same.
-	(connect_destination): same.
-	(disconnect_destination): same.
-	(e_select_names_model_contains): same.
-	(e_select_names_model_insert): same.
-	(e_select_names_model_append): same.
-	(e_select_names_model_replace): same.
-	(e_select_names_model_delete): same.
-	(e_select_names_model_clean): same.
-	(delete_all_iter): same.
-	(e_select_names_model_overwrite_copy): same.
-	(e_select_names_model_merge): same.
-	(e_select_names_model_name_pos): same.
-	(e_select_names_model_text_pos): same.
-	(e_select_names_model_cardify): nuke.
-	(e_select_names_model_uncardify): nuke.
-	(e_select_names_model_cancel_cardify): nuke.
-	(e_select_names_model_load_all_contacts): rename _cardify_all to
-	this.
-	(e_select_names_model_cancel_all_contact_load): rename
-	_cancel_cardify to this.
-
-	* gui/component/select-names/e-select-names-manager.c
-	(focus_in_cb): cancel_cardify_all -> cancel_all_contact_load
-	(focus_out_cb): cardify_all -> load_all_contacts.
-	(completion_popup_cb): same.
-	(load_completion_books): no e_book_expand_uri anymore.
-	(e_select_names_manager_new): e_book_get_config_database ->
-	eab_get_config_database.
-	(e_select_names_manager_dispose): same.
-
-	* gui/component/select-names/e-select-names-completion.h: e-book.h
-	-> e-book-async.h
-
-	* gui/component/select-names/e-select-names-completion.c:
-	EContactify this.
-
-	* gui/component/select-names/e-select-names-bonobo.c
-	(entry_get_property_fn): ifdef out the SIMPLE_CARD_LIST getter,
-	and cardify_all -> load_all_contacts.
-
-	* gui/component/select-names/Evolution-Addressbook-SelectNames.idl:
-	nuke all the SimpleCard stuff.  It's a horribly inefficient way to
-	deal with vcards, and since ebook is platform level now, we can
-	(and should) promote just linking to ebook to do this.
-
-2003-09-19  Gilbert Fang  <gilbert.fang@sun.com>
-
-       * addressbook/gui/component/addressbook-component.c (xfer_folder):
-         remove the "addressbook.db.summary" correctly. #48538
-
-2003-09-11  Dan Winship  <danw@ximian.com>
-
-	* backend/ebook/Makefile.am (privlib_LTLIBRARIES): Remove
-	libebook-static.la
-
-	* conduit/Makefile.am (libeaddress_conduit_la_LIBADD): Use
-	non-static versions of libraries: the static ones were only needed
-	for libtool 1.3.
-
-2003-09-07  Chris Toshok  <toshok@ximian.com>
-
-	* backend/ebook/e-contact.c (e_contact_get_property): implement
-	getters for the address labels.  they aren't really synthetic, but
-	we can't handle them as normal strings because they switch off the
-	TYPE parameter, not the attribute name (go go vcard.)  Also add
-	getters for the structured address fields (ADR).  Also fix a spot
-	where we were using strcmp instead of strcasecmp.
-	(e_contact_address_free): new function.
-
-	* backend/ebook/e-contact.h: Add EContactAddress structure, which
-	will probably go away once i merge in my cool spiffy address
-	editor.  Add LABEL fields for the address labels, and add
-	prototype for e_contact_address_free.
-
-	* backend/ebook/e-vcard.h: add EVC_LABEL and EVC_X_BLOG_URL.
-
-	* backend/ebook/e-vcard.c (read_attribute_value): step to the next
-	character after unescaping \-escaped characters.  keeps commas
-	from multiplying.
-
-	* gui/widgets/eab-contact-display.c (render_address): new function
-	(eab_contact_display_render): display email, delivery addresses,
-	and the blog url.
-
-2003-09-06  Chris Toshok  <toshok@ximian.com>
-
-	* backend/ebook/e-contact.c (e_contact_set_property): implement
-	E_CONTACT_EMAIL_*.
-
-	* backend/pas/pas-backend-ldap.c (email_ber): EContact-ify and
-	re-enable this code.
-	(email_compare): same.
-	(email_populate): same.
-
-	* backend/pas/pas-backend-vcf.c (pas_backend_vcf_load_uri): use
-	XIMIAN_VCARD.
-
-	* backend/pas/pas-backend-file.c (pas_backend_file_load_uri): use
-	XIMIAN_VCARD, and don't fail if the directory already exists.
-	just try to create the db anyway.
-
-	* backend/pas/Makefile.am (libpas_a_SOURCES): add ximian-vcard.h
-
-	* backend/pas/ximian-vcard.h (XIMIAN_VCARD): put the initial vcard
-	here, so we can share 1 #define between file/vcf backends.  Also,
-	add a jpeg photo.
-
-2003-09-06  Chris Toshok  <toshok@ximian.com>
-
-	* gui/widgets/Makefile.am (libeminicard_la_SOURCES): add
-	eab-contact-display.[ch]
-
-	* gui/widgets/e-addressbook-view.c (eab_view_init): just init
-	everything to NULL.
-	(eab_view_new): move a bunch of stuff that was in eab_view_init
-	here.  create a vpaned to hold the contact display, and create the
-	contact display.
-	(render_contact): render the selected contact to the
-	contact_display.
-	(selection_changed): add logic to display the currently selected
-	contact in the preview pane.
-	(create_table_view): add the table to the paned.
-	(create_treeview_view): add the scrolled to the paned.
-	(change_view_type): remove view->widget from the paned.
-
-	* gui/widgets/e-addressbook-view.h: switch from using a GtkTable
-	to a GtkEventBox - we don't need the table logic anymore.
-
-	* gui/widgets/e-addressbook-model.c (create_contact): indent
-	(eab_model_get_contact): same.
-
-	* gui/widgets/eab-contact-display.[ch]: new files - this
-	implements the preview pane.
-	
-2003-09-06  Chris Toshok  <toshok@ximian.com>
-
-	* backend/pas/pas-backend-ldap.c (BINARY_PROP): new type of
-	property, for specifying data coming back from the ldap server
-	with both data/length (like photos).
-	(photo_populate): set the contact's photo.
-	(build_contact_from_entry): add PROP_TYPE_BINARY handling.
-
-	* backend/ebook/e-vcard.c (EVCardEncoding): new enum for use with
-	the ENCODING attribute parameter.  Right now, just "raw",
-	"base64", and "quoted-printable".
-	(struct _EVCardAttribute): add a "decoded_values" list of
-	GString*'s, as well as fields to hold encoding/encoding_set.
-	(e_vcard_class_init): call _evc_base64_init.
-	(e_vcard_attribute_add_value_decoded): based on what encoding the
-	attribute uses, add the value properly.
-	(e_vcard_attribute_add_param): if the parameter is ENCODING, work
-	our magic.
-	(e_vcard_attribute_get_values_decoded): spit out properly decoded
-	values depending on the decoding type.
-	(_evc_base64*): copy the camel base64 routines here.
-
-	* backend/ebook/e-vcard.h: add prototypes for
-	e_vcard_attribute_add_value_decoded and
-	e_vcard_attribute_get_values_decoded.
-
-	* backend/ebook/e-contact.c (e_contact_get_first_attr): move this
-	to above _set_property so we can make use of it there.
-	(e_contact_set_property): fix up the generic STRING field handler,
-	and implement E_CONTACT_PHOTO setting.
-	(e_contact_get_property): add handling for
-	E_CONTACT_PHOTO/E_CONTACT_PHOTO_URI.
-	(e_contact_photo_free): new function.
-
-	* backend/ebook/e-contact.h: add EContactPhoto struct, a prototype
-	for e_contact_photo_free, and two new EContactField elements (PHOTO and
-	PHOTO_URI).
-
-	* backend/ebook/tests/ebook/.cvsignore: ignore test-photo
-
-	* backend/ebook/tests/ebook/Makefile.am (noinst_PROGRAMS): add test-photo
-
-	* backend/ebook/tests/ebook/test-photo.c: test for the photo
-	set/get routines (which do base64 encoding/decoding).
-
-2003-09-02  Chris Toshok  <toshok@ximian.com>
-
-	* gui/component/Makefile.am: comment out a buncha stuff just to
-	get this building.
-
-	* gui/component/select-names/e-select-names.c: #include
-	e-book-async.h
-	(search_result): EAddressbookModel -> EABModel.
-	(addressbook_model_set_uri): same, and don't use
-	e_book_expand_uri, as it's dead.
-	(esn_get_key_fn): EAddressbookModel -> EABModel.
-	(e_addressbook_create_ebook_table): same.
-	(status_message): same.
-
-	* gui/component/select-names/e-select-names.h (struct
-	_ESelectNames): EAddressbookModel -> EABModel.
-
-	* gui/component/addressbook-component.c (new_item_cb): ifdef out
-	for now.
-	(dnd_drop_book_open_cb): s/card/contact.
-	(destination_folder_handle_drop): ifdef out.
-	(request_quit): same.
-
-	* gui/component/addressbook.c: track api changes - e_addressbook_
-	-> eab_, and e_book_* becomes e_book_async_*.
-
-	* gui/component/addressbook.h: #include e-book-async.h
-
-	* gui/component/e-address-widget.c (query_results_cb):
-	e/EBookSimpleQueryStatus/EBookStatus
-
-	* gui/component/e-address-widget.h: s/ECard/EContact.
-
-	* gui/component/e-cardlist-model.[ch]: nuke.
-	
-	* gui/component/e-address-popup.c: s/e-book.h/e-book-async.h
-
-	* gui/component/e-address-popup.h: s/ECard/EContact
-
-2003-09-02  Chris Toshok  <toshok@ximian.com>
-
-	* backend/ebook/Makefile.am (libebook_la_SOURCES): remove
-	e-card.c,e-card.simple.c
-
-	* backend/ebook/tests/ebook/test-ebook.c: remove #include of
-	e-card-simple.h
-
-	* backend/ebook/tests/ebook/test-changes.c: remove #include of
-	e-card-simple.h
-
-	* backend/ebook/e-card.[ch], backend/ebook/e-card-simple.[ch]:
-	nuke.
-
-	* backend/ebook/e-book-util.h: s/card/contact.
-
-	* backend/ebook/e-book-util.c: ifdef out an #include.
-
-	* backend/ebook/e-book-async.[ch]: stop doing the stupid #define
-	renaming trick, and just rename all the prototypes from e_book_*
-	to e_book_async_*. Also, get rid of the *_vcard variants.
-
-2003-09-02  Chris Toshok  <toshok@ximian.com>
-
-	* backend/pas/pas-backend-card-sexp.[ch]
-	(pas_backend_card_sexp_match_contact): rename
-	pas_backend_card_sexp_match_card, and it takes an EContact now.
-	Also, port this file to use EContact instead of ECard, and ifdef
-	out lots of stuff.
-
-	* backend/pas/pas-backend-ldap.c: convert this to use EContact
-	instead of ECard, and ifdef great swaths of code to make it
-	compile.
-
-	* backend/pas/pas-book.c (pas_book_respond_modify): convert this
-	from ECard to EContact.
-
-2003-09-02  Chris Toshok  <toshok@ximian.com>
-
-	* gui/widgets/Makefile.am (libeminicard_la_SOURCES): remove all
-	the reflow/minicard stuff from the build.
-	(e-addressbook-marshal.[ch]): change the prefix on the marshallers to
-	eab_marshal.
-
-	* gui/widgets/e-addressbook-view.etspec: bring this more in line
-	with the field ids for EContact, and comment out a ton of them
-	that aren't there yet.
-
-	* gui/widgets/e-addressbook-view.[ch]: big renaming - rename
-	e_addressbook_view to eab_view, and EAddressbookView to EABView.
-
-	* gui/widgets/e-addressbook-util.c (eab_error_dialog): rename, and
-	change a few of the error strings s/Card/Contact.
-	(added_cb): E_BOOK_STATUS_SUCCESS => E_BOOK_ERROR_OK.
-	(modified_cb): same.
-	(e_addressbook_show_contact_editor): this takes an EContact now,
-	and track the change to the contact editor signal names.
-	(e_addressbook_show_contact_list_editor): this takes an EContact
-	now.
-	(view_contacts): rename view_cards to this, and ifdef the body.
-	(e_addressbook_show_multiple_contacts): rename
-	e_addressbook_show_multiple_cards to this, and s/card/contact.
-
-	* gui/widgets/e-addressbook-util.h: ifdef some things out, and
-	rename e_addressbook_error_dialog to eab_error_dialog.
-
-	* gui/widgets/e-addressbook-table-adapter.[ch]: big renaming -
-	rename e_addressbook_table_adapter to eab_table_adapter, and
-	EAddressbookTableAdapter to EABTableAdapter.  Also, remove the
-	simple mapping - we can do ECardSimple-like operations directly on
-	the EContacts from the EABModel.
-
-	* gui/widgets/e-addressbook-model.[ch]: big renaming - rename
-	e_addressbook_model to eab_model, and EAddressbookModel to
-	EABModel.  Also, convert everything from ECard to EContact.
-
-2003-09-01  Chris Toshok  <toshok@ximian.com>
-
-	* backend/ebook/e-vcard.c (e_vcard_new_from_string): omg i'm dumb.
-	don't call e_vcard_new here since it just turns around and calls
-	e_vcard_new_from_string again.
-
-2003-09-01  Chris Toshok  <toshok@ximian.com>
-
-	* backend/pas/pas-book-view.c (pas_book_view_notify_change): guard
-	pending adds foo.
-	(pas_book_view_notify_remove): same.
-	(pas_book_view_notify_add): same.
-	(pas_book_view_notify_complete): same.
-	(pas_book_view_construct): init mutex
-	(pas_book_view_dispose): free mutex
-
-	* backend/pas/pas-backend-ldap.c (func_exists): new function.
-	(send_pending_adds): remove
-	(ldap_search_handler): let the BookView stuff handle the pending
-	adds for us.
-	(ldap_search_dtor): remove pending adds stuff.
-	(pas_backend_ldap_search): same
-
-	* backend/pas/pas-backend-card-sexp.c (func_exists): new function.
-	
-	* backend/ebook/tests/ebook/test-ebook.c (print_all_emails): use
-	an exists query.
-
-2003-08-31  Chris Toshok  <toshok@ximian.com>
-
-	* backend/ebook/e-book-query.c (func_and, func_or, func_not)
-	(func_contains, func_is, func_beginswith, func_endswith)
-	(e_book_query_from_string): adapt the pas ldap backend sexp
-	parsing code to this, build up an EBookQuery that represents the
-	sexp.
-
-	* backend/ebook/e-contact.h (e_contact_field_id): add prototype.
-
-	* backend/ebook/e-contact.c (e_contact_field_id): new function.
-
-	* backend/ebook/Makefile.am (libebook_la_SOURCES): add
-	e-book-util.c back into the build, if only for the config_database
-	thingy.
-
-2003-08-31  Chris Toshok  <toshok@ximian.com>
-
-	* backend/ebook/e-contact.c (e_contact_duplicate): new function.
-
-	* backend/ebook/e-contact.h: add prototype for
-	e_contact_duplicate.
-
-	* backend/ebook/e-book-util.[ch]: massive ifdeffing.  most of this
-	is either gone or will be unnecessary soon.
-
-	* backend/ebook/e-book-query.c (e_book_query_from_string): hack
-	this so it'll at least generate a query.
-
-	* backend/ebook/e-book-listener.c
-	(impl_BookListener_respond_get_view): add some debug spew and
-	remove a c&p'ed comment.
-
-	* backend/ebook/e-book-async.h: add prototype for
-	e_book_async_unload_uri.
-
-	* backend/ebook/e-book-async.c (e_book_async_unload_uri): new
-	function.
-
-	* backend/pas/pas-book-view.c (pas_book_view_construct): switch to
-	CORBA_Object_duplicate, ala pas_book.
-
-	* backend/pas/pas-backend-sync.c (pas_backend_sync_class_init):
-	fix typo and the build.
-
-2003-08-29  Chris Toshok  <toshok@ximian.com>
-
-	* backend/pas/pas-backend-ldap.c (ldap_error_to_response):
-	s/card/contact.
-	(pas_backend_ldap_process_create_contact): same.
-	(remove_contact_handler): same.
-	(remove_contact_dtor): same.
-	(pas_backend_ldap_process_remove_contacts): same.
-	(modify_contact_modify_handler): same.
-	(modify_contact_dtor): same.
-	(pas_backend_ldap_process_modify_contact): same.
-	(get_contact_handler): same.
-	(get_contact_dtor): same.
-	(pas_backend_ldap_process_get_contact): same.
-	(pas_backend_ldap_class_init): same.
-
-	* backend/pas/pas-backend-summary.c
-	(pas_backend_summary_add_contact): s/card/contact, and mostly
-	switch from ECard{Simple} to EContact.
-	(pas_backend_summary_get_summary_vcard): same.
-	(pas_backend_summary_remove_contact): s/card/contact
-
-	* backend/pas/pas-backend-summary.h: s/card/contact.
-
-	* backend/pas/pas-backend-file.c (build_summary): fix g_warning,
-	and return immediately if the db->cursor call fails.
-	(pas_backend_file_create_contact): s/card/contact
-	(pas_backend_file_remove_contacts): same.
-	(pas_backend_file_modify_contact): same.
-	(pas_backend_file_get_contact): same.
-	(pas_backend_file_get_contact_list): same.
-	(pas_backend_file_class_init): same.
-
-	* backend/pas/pas-backend-vcf.c
-	(pas_backend_vcf_process_create_contact): s/card/contact.
-	(pas_backend_vcf_process_remove_contacts): same.
-	(pas_backend_vcf_process_modify_contact): same.
-	(pas_backend_vcf_process_get_contact): same.
-	(pas_backend_vcf_process_get_contact_list): same.
-	(pas_backend_vcf_class_init): same.
-
-	* backend/pas/pas-backend-sync.c (pas_backend_sync_create_contact): s/card/contact.
-	(pas_backend_sync_remove_contacts): same.
-	(pas_backend_sync_modify_contact): same.
-	(pas_backend_sync_get_contact): same.
-	(pas_backend_sync_get_contact_list): same.
-	(_pas_backend_create_contact): same.
-	(_pas_backend_remove_contacts): same.
-	(_pas_backend_modify_contact): same.
-	(_pas_backend_get_contact): same.
-	(_pas_backend_get_contact_list): same.
-	(pas_backend_sync_class_init): same.
-
-	* backend/pas/pas-backend-sync.h: s/card/contact.
-
-	* backend/pas/pas-backend.c (pas_backend_create_contact): s/card/contact.
-	(pas_backend_remove_contacts): same.
-	(pas_backend_modify_contact): same.
-	(pas_backend_get_contact): same.
-	(pas_backend_get_contact_list): same.
-	(pas_backend_change_add_new): same.
-	(pas_backend_change_modify_new): same.
-	(pas_backend_change_delete_new): same.
-
-	* backend/pas/pas-backend.h: s/card/contact.
-
-	* backend/pas/pas-book-view.c (send_pending_adds): s/card/contact
-	(pas_book_view_notify_change): same.
-	(pas_book_view_notify_remove): same.
-
-	* backend/pas/pas-book.c
-	(impl_GNOME_Evolution_Addressbook_Book_getContact): s/card/contact
-	(impl_GNOME_Evolution_Addressbook_Book_getContactList): same.
-	(impl_GNOME_Evolution_Addressbook_Book_addContact): same.
-	(impl_GNOME_Evolution_Addressbook_Book_removeContacts): same.
-	(impl_GNOME_Evolution_Addressbook_Book_modifyContact): same.
-	(pas_book_respond_create): same.
-	(pas_book_respond_remove_contacts): same.
-	(pas_book_respond_modify): same.
-	(pas_book_respond_get_contact): same.
-	(pas_book_respond_get_contact_list): same.
-	(pas_book_respond_get_changes): same.
-	(pas_book_class_init): same.
-
-	* backend/pas/pas-book.h: s/card/contact
-
-	* backend/ebook/tests/vcard/dump-vcard.c: #include
-	"ebook/e-vcard.h"
-
-	* backend/ebook/tests/vcard/Makefile.am (TEST_LIBS): use
-	top_builddir.
-	(CFLAGS): same.
-
-	* backend/ebook/tests/ebook/Makefile.am (TEST_LIBS): use
-	top_builddir.
-	(CFLAGS): use srcdir
-
-	* backend/ebook/test-card.c, backend/ebook/test-client-list.c,
-	backend/ebook/test-client.c, backend/ebook/test-ebook.c: remove.
-	
-	* backend/ebook/e-card-cursor.[ch]: remove.
-
-	* backend/ebook/e-card-pairs.h: remove.
-	
-	* backend/ebook/e-book.c (e_book_add_contact): s/Card/Contact.
-	(e_book_commit_contact): same
-	(e_book_get_contact): same.
-	(e_book_remove_contacts): same.
-	(e_book_get_contacts): same.
-	(e_book_handle_response): same.
-
-	* backend/ebook/e-book-view.c (e_book_view_do_added_event):
-	s/card/contact
-	(e_book_view_do_modified_event): same.
-	(e_book_view_do_removed_event): same.
-	(e_book_view_handle_response): same.
-	(e_book_view_class_init): same.
-
-	* backend/ebook/e-book-view.h: s/card/contact and pad the class
-	struct.
-
-	* backend/ebook/e-book-view-listener.c
-	(e_book_view_listener_queue_response): s/Card/Contact.
-	(e_book_view_listener_queue_status_event): no need to assign
-	things to NULL, we g_new0.
-	(e_book_view_listener_queue_idlist_event): s/Card/Contact, and no
-	need to assign things to NULL, we g_new0.
-	(e_book_view_listener_queue_sequence_event): same.
-	(e_book_view_listener_queue_message_event): same.
-	(impl_BookViewListener_notify_contacts_added): s/Card/Contact.
-	(impl_BookViewListener_notify_contacts_removed): same.
-	(impl_BookViewListener_notify_contacts_changed): same.
-	(e_book_view_listener_class_init): same.
-
-	* backend/ebook/e-book-view-listener.h: s/Card/Contact
-
-	* backend/ebook/e-book-types.h: s/CARD/CONTACT
-
-	* backend/ebook/e-book-listener.c
-	(e_book_listener_convert_status): s/Card/Contact
-	(impl_BookListener_respond_create_contact): same.
-	(impl_BookListener_respond_remove_contacts): same.
-	(impl_BookListener_respond_modify_contact): same.
-	(impl_BookListener_respond_get_contact): same.
-	(impl_BookListener_respond_get_contact_list): same.
-	(impl_BookListener_respond_get_changes): same.
-	(e_book_listener_class_init): same.
-
-	* backend/ebook/e-book-listener.h: pad the class struct, and
-	s/Card/Contact.
-
-	* backend/ebook/e-book-async.c (_load_uri_handler): GError
-	changes.
-	(_get_fields_handler): same.
-	(_get_methods_handler): same.
-	(_auth_user_handler): same.
-	(_get_card_handler): same.
-	(_remove_cards_handler): same.
-	(_add_vcard_handler): same.
-	(_commit_vcard_handler): same.
-	(_get_book_view_handler): same.
-	(e_book_async_get_book_view): use an EBookQuery instead of a char*.
-
-	* backend/ebook/Makefile.am: remove the test handling.
-	(SUBDIRS): set to ". tests"
-	(libebook_la_SOURCES): add e-book-async.c
-
-	* backend/idl/addressbook.idl: possibly gratuitous renaming, but i
-	was sick of seeing "Card" being used everywhere.  "Contact" is the
-	new "Card".
-
-2003-08-28  Chris Toshok  <toshok@ximian.com>
-
-	* backend/ebook/e-book.c (e_book_op_free): rename from
-	e_book_free_op.
-	(e_book_op_remove): rename from e_book_remove_op.
-	(e_book_clear_op): new function, remove the op, unlock its mutex,
-	and free it.
-	(e_book_add_contact): use e_book_clear_op.
-	(e_book_commit_contact): same.
-	(e_book_get_supported_fields): same.
-	(e_book_get_supported_auth_methods): same.
-	(e_book_authenticate_user): same.
-	(e_book_get_contact): same.
-	(e_book_remove_contacts): same.
-	(e_book_get_book_view): same.
-	(e_book_get_contacts): same.
-	(e_book_get_changes): same.
-	(e_book_load_uri): same.
-	(e_book_remove): new function.
-	(e_book_response_remove): new function.
-	(e_book_handle_response): add handling for RemoveBookResponse.
-	(e_book_load_local_addressbook): pass TRUE for e_book_load_uri
-	@only_if_exists.
-
-	* backend/ebook/e-book.h: add @only_if_exists arg to
-	e_book_load_uri so we can support folder creation at load_uri
-	time, and add prototype for e_book_remove.
-
-	* backend/ebook/e-book-types.h: add an "id" slot in EBookChange.
-
-	* backend/ebook/e-book-listener.c
-	(impl_BookListener_respond_get_changes): handle union in idl.
-	(impl_BookListener_respond_open_book): remove unnecessary
-	exception check.
-	(impl_BookListener_respond_remove_book): new function.
-	(impl_BookListener_respond_get_supported_fields): rename this from
-	_response_.
-	(impl_BookListener_respond_get_supported_auth_methods): same.
-	(e_book_listener_class_init): add _remove_book and track change to
-	get_supported_fields/get_supported_auth_methods names.
-
-	* backend/ebook/e-book-listener.h: add RemoveBookResponse to
-	EBookListenerOperation enum.
-
-	* backend/idl/addressbook.idl: make BookChangeItem a union that
-	switches over BookChangeType.
-
-	* backend/pas/pas-backend.c (pas_backend_change_add_new): new
-	function, create a BookChangeItem representing the addition of a
-	contact.
-	(pas_backend_change_modify_new): same, but for modifications.
-	(pas_backend_change_delete_new): same, but for deletions.
-
-	* backend/pas/pas-backend.h: add prototypes for
-	pas_backend_change_{add,modify,delete}_new
-
-	* backend/pas/pas-backend-file.c (pas_backend_file_changes): nuke.
-	(do_create): fix memory corruption.
-	(pas_backend_file_get_changes): copy the body of
-	pas_backend_file_changes here, and rework so that it's synchronous
-	and return a list instead of the book view hack.
-	(pas_backend_file_load_uri): mkdir the directory (we need a mkdir
-	-p here).
-	(select_changes): new function, scandir helper.
-	(pas_backend_file_remove): NULL out bf->priv->summary to quiet
-	valgrind, and call scandir to accumulate the .changes.db files
-	then unlink them.
-
-	* backend/pas/pas-book.c (pas_book_respond_remove): new function.
-	(pas_book_respond_get_supported_fields): unifdef this, and make it
-	use a glist.
-	(pas_book_respond_get_supported_auth_methods): same.
-	(pas_book_respond_get_changes): this code is kinda gross... lots
-	of copying going on, there's got to be a better way.  but it
-	works.
-
-2003-08-26  Chris Toshok  <toshok@ximian.com>
-
-	* backend/idl/addressbook.idl: add oneway void Book::remove() and
-	oneway void notifyBookRemoved()
-
-2003-08-26  Chris Toshok  <toshok@ximian.com>
-
-	* backend/pas/pas-backend.c (pas_backend_remove): new function.
-	(pas_backend_add_book_view): new function.
-	(pas_backend_add_client): move the "real_add_client" code here.
-	(pas_backend_remove_client): move the "real_remove_client" code
-	here.
-	(pas_backend_class_init): remove assignments of add_client and
-	remove_client vtable entries.
-	(pas_backend_is_removed): new function.
-	(pas_backend_set_is_removed): new function.
-	(pas_backend_init): init clients_mutex and views_mutex.
-
-	* backend/pas/pas-backend.h: remove the vtable entries for
-	add/remove_client, since these are fully handled in PASBackend.
-	Add prototypes for
-	pas_backend_is_removed/pas_backend_add_book_view/pas_backend_set_is_removed.
-
-	* backend/pas/pas-book.c
-	(impl_GNOME_Evolution_Addressbook_Book_remove): new function.
-	(impl_GNOME_Evolution_Addressbook_Book_getBookView): clean things
-	up a bit, and don't use pas_backend_get_book_views as it can't
-	lock the list of views.
-	(pas_book_respond_get_supported_auth_methods): remove the extra
-	unnecessary arg from the corba call.
-	(pas_book_respond_get_changes): same.
-	(pas_book_class_init): fill in epv "remove" slot.
-
-	* backend/pas/pas-book.h: rename pas_book_respond_remove to
-	pas_book_respond_remove_cards, and add a new
-	pas_book_respond_remove for use with removing books.
-
-	* backend/pas/pas-backend-sync.c (pas_backend_sync_remove): new
-	function.
-	(_pas_backend_remove): new function.
-	(pas_backend_sync_class_init): fill in the "remove" vtable entry.
-	(_pas_backend_remove_cards): track change to
-	pas_book_respond_remove_cards (pas_book_respond_remove is used for
-	removing the book, not the cards.)
-
-	* backend/pas/pas-backend-sync.h: add pas_backend_sync_remove
-	prototype and add remove_sync virtual function.
-
-2003-08-26  Chris Toshok  <toshok@ximian.com>
-
-	* backend/pas/pas-backend-file.c (pas_backend_file_create_card,
-	pas_backend_file_remove_cards, pas_backend_file_modify_card,
-	pas_backend_file_get_vcard, pas_backend_file_get_card_list,
-	pas_backend_file_start_book_view, pas_backend_file_get_changes,
-	pas_backend_file_authenticate_user,
-	pas_backend_file_get_supported_fields): rename from
-	pas_backend_file_process_*
-	(pas_backend_file_load_uri): save off the dirname/summary
-	filename.
-	(pas_backend_file_remove): new function, unlink all the files we
-	know about.
-	(pas_backend_file_class_init): track changes to functions, and add
-	pas_backend_file_remove.
-
-2003-08-26  JP Rosevear  <jpr@ximian.com>
- 
-	* conduit/address-conduit.c (ecard_from_remote_record): duplicate
- 	the extra address lines
-	
-2003-08-22  Chris Toshok  <toshok@ximian.com>
-
-	* backend/pas/pas-book.[ch]: switch from using the PASRequest
-	union and a central PASBackend dispatch function.  just call the
-	pas_backend methods directly and expand the args out.
-
-	* backend/pas/pas-backend.[ch]: same.
-	
-	* backend/pas/pas-backend-sync.[ch]: same.
-
-	* backend/pas/pas-backend-vcf.c, backend/pas/pas-backend-file.c,
-	backend/pas/pas-backend-ldap.c: same, and get these all compiling
-	against the rest of the current pas/ebook code.	
-
-2003-08-21  Chris Toshok  <toshok@ximian.com>
-
-	* backend/ebook/test-ebook.c: track GError case.
-
-	* backend/ebook/e-book.[ch]: GError-ify the api, and clean up some
-	cases where we weren't removing the current op.
-
-	* backend/ebook/e-book-view-listener.c
-	(e_book_view_listener_convert_status): track change from
-	E_BOOK_VIEW_STATUS_* to E_BOOK_VIEW_ERROR_*.
-
-	* backend/ebook/e-book-types.h: track change from E_BOOK_STATUS_*
-	to E_BOOK_ERROR_*, and some E_BOOK_VIEW_STATUS_* to
-	E_BOOK_VIEW_ERROR_*.
-
-	* backend/ebook/e-book-listener.c
-	(e_book_listener_convert_status): track change from
-	E_BOOK_STATUS_* to E_BOOK_ERROR_*.
-
-	* backend/ebook/e-book-query.c (e_book_query_any_field_contains):
-	new function.
-	(e_book_query_unref): handle the any_field_contains case.
-	(e_book_query_to_string): same.
-
-	* backend/ebook/e-book-query.h: add prototype for
-	e_book_query_any_field_contains.
-
-	* backend/ebook/e-card.c (e_card_load_uri): ifdef this out for
-	now.
-
-	* backend/ebook/e-contact.[ch] (e_contact_get_const): new
-	function/prototype.
-
-2003-08-20  Gilbert Fang  <gilbert.fang@sun.com>
-
-	* gui/widgets/e-addressbook-util.c
-        (e_addressbook_send_card_list): use memcpy to assign
-        CORBA_char_sequence instead of strcpy. (#46706)
-
-2003-08-18  Ettore Perazzoli  <ettore@ximian.com>
-
-	* gui/component/component-factory.c: Update OAFIIDs.
-
-	* gui/widgets/e-addressbook-util.c (e_addressbook_transfer_cards):
-	Removed extern declaration for global_shell_client [yuck].
-	(e_addressbook_transfer_cards): #if 0 the invocation for
-	evolution_shell_client_user_select_folder(), we need to
-	reimplement this component-side now.
-
-	* gui/component/component-factory.c (factory): Call
-	addressbook_component_peek() here instead of
-	addressbook_component_init() [since the latter is no more].
-
-	* gui/component/addressbook.c (set_status_message): Don't create
-	the activity client for now.
-
-	* gui/component/addressbook-config.c: Removed member shell from
-	struct AddressbookDialog.
-	(ldap_dialog_new): Do not take a shell arg anymore.
-	(ldap_config_control_new): Likewise.
-	(addressbook_config_control_new): No need to get the global shell
-	pointer here anymore.
-
-	* gui/component/addressbook-component.c: Rewritten to support the
-	new ::Component interface.
-	* gui/component/addressbook-component.h: Likewise.
-
-	* gui/component/GNOME_Evolution_Addressbook.server.in.in: Version
-	factory's OAFIID.  Remove ShellComponent server, add Component
-	server.
-
-2003-08-12  Rodrigo Moya <rodrigo@ximian.com>
-
-	* backend/ebook/e-book.c (e_book_dispose): unref the
-	EComponentListener before unloading the CORBA object.
-
-2003-08-12  Hans Petter Jansson  <hpj@ximian.com>
-
-	* backend/ebook/e-destination.c (e_destination_dispose): Chain.
-
-	* gui/component/e-address-widget.c (e_address_widget_destroy): Chain.
-	Prevent double frees. Prevent double GSource removal.
-
-	* gui/component/e-cardlist-model.c (e_cardlist_model_class_init):
-	Store parent class.
-	(e_cardlist_model_dispose): Chain. Prevent double frees and unrefs.
-
-	* gui/contact-editor/e-contact-editor-address.c
-	(e_contact_editor_address_dispose): Chain.
-
-	* gui/contact-editor/e-contact-editor-fullname.c
-	(e_contact_editor_fullname_dispose): Chain.
-
-	* gui/contact-list-editor/e-contact-list-editor.c
-	(e_contact_list_editor_dispose): Chain.
-
-	* gui/contact-list-editor/e-contact-list-model.c
-	(contact_list_model_destroy): Chain. Prevent double frees and unrefs.
-
-	* gui/widgets/e-addressbook-reflow-adapter.c (addressbook_dispose):
-	Chain.
-	(addressbook_finalize): Chain.
-
-	* gui/widgets/e-addressbook-table-adapter.c (addressbook_dispose):
-	Chain.
-
-	* gui/widgets/e-addressbook-treeview-adapter.c (addressbook_destroy):
-	Chain. Prevent double free.
-
-	* gui/widgets/gal-view-minicard.c (gal_view_minicard_dispose):
-	Chain. Prevent double free and detach.
-
-	* gui/widgts/gal-view-treeview.c (gal_view_treeview_dispose):
-	Chain. Prevent double free and detach.
-
-	* printins/e-contact-print-style-editor.c
-	(e_contact_print_stule_editor_destroy): Chain. Prevent double unref.
-
-2003-08-07  Chris Toshok  <toshok@ximian.com>
-
-	* backend/ebook/e-vcard.c (e_vcard_to_string_vcard_21): new,
-	unimplemented, function.
-	(e_vcard_to_string_vcard_30): move the 3.0 vcard export code here.
-	(e_vcard_to_string): call e_vcard_to_string_vcard_21 or
-	e_vcard_to_string_vcard_30 based on @format.
-	(e_vcard_attribute_remove_values): new function.
-
-	* backend/ebook/e-vcard.h: add @format to e_vcard_to_string, and
-	add prototype for e_vcard_attribute_remove_values.  also, add
-	prototype for e_vcard_decode_b_encoding.
-
-2003-08-07  Chris Toshok  <toshok@ximian.com>
-
-	* backend/ebook/e-book-listener.c
-	(impl_BookListener_respond_open_book): remove the book arg.
-
-	* backend/ebook/e-book-listener.h (struct _EBookListenerResponse):
-	remove the corba book.
-
-	* backend/ebook/e-book-async.c (_get_book_view_dtor): free the
-	query string.
-	(e_book_async_get_book_view): dup the query string.
-
-	* backend/ebook/e-book.h: change e_book_get_book_view and
-	e_book_get_contacts to take a const char * query string instead of
-	an EBookQuery.
-
-	* backend/ebook/e-book.c (e_book_add_contact): pass
-	EVC_FORMAT_VCARD_30 to e_vcard_to_string.
-	(e_book_commit_contact): same.
-	(e_book_get_book_view): take a const char* query string instead of
-	an EBookQuery.
-	(e_book_get_contacts): same.
-	(e_book_response_open): track change - the Book is no longer
-	communicated back here.
-	(listener_cb): nuke.
-	(e_book_handle_response): track change to e_book_response_open.
-	(e_book_load_uri): rework this from using BookFactory::openBook to
-	BookFactory::getBook + Book::open.
-	(e_book_get_uri): new function, reimplement from old api.
-	(e_book_get_static_capabilities): same.
-	(e_book_check_static_capability): same.
-	(startup_mainloop): new function, run bonobo_main.
-	(e_book_activate): start up a thread with startup_mainloop as the
-	start func.
-	(e_book_new): call e_book_activate.
-
-	* backend/idl/addressbook.idl: Add Book::open, remove the Book
-	from notifyBookOpened's args, and change BookFactory::openBook to
-	BookFactory::getBook.
-
-	* backend/pas/pas-backend-file.c (pas_backend_file_load_uri): add
-	only_if_exists - stop using the "create-initial" special file.
-
-	* backend/pas/pas-backend-vcf.c (pas_backend_vcf_load_uri): add
-	only_if_exists - stop using the "create-initial" special file.
-
-	* backend/pas/pas-backend.c (pas_backend_load_uri): add
-	@only_if_exists, and pass it along to the virtual method.
-	(pas_backend_open): new function, lock the mutex so only one
-	PASBook can actually call load_uri.  call load_uri with
-	pas_book_get_uri, and req->only_if_exists.
-	(pas_backend_handle_request): rename process_client_request to
-	this, and expose it publicly.  Also add a case statement for
-	"Open".
-	(real_add_client): gut this function, we don't need to create the
-	book anymore, just add the client to the list and do the weak
-	ref/ORBit small stuff.
-	(pas_backend_add_client): track change to signature - BookListener
-	-> PASBook.
-	(pas_backend_init): init open_mutex.
-	(pas_backend_dispose): free open_mutex.
-
-	* backend/pas/pas-backend.h (PASBackendClass): add @only_if_exists
-	to the load_uri virtual method, and change the add_client virtual
-	method to take a PASBook instead of a BookListener.  add the same
-	args to _load_uri and add_client.  Also, add prototypes for
-	pas_backend_handle_request and pas_backend_open.
-
-	* backend/pas/pas-book-factory.c
-	(_pas_book_factory_send_open_book_response): nuke.
-	(pas_book_factory_launch_backend): just return NULL, don't call
-	_pas_book_factory_send_open_book_response, in the error case.
-	(start_backend): nuke
-	(impl_GNOME_Evolution_Addressbook_BookFactory_getBook): rename
-	_openBook to this.  clean up the code a bit.  Create the PASBook
-	here, and always track change to pas_backend_add_client's type (we
-	pass the book now, not the listener).
-	(pas_book_factory_class_init): openBook -> getBook.
-
-	* backend/pas/pas-book.c
-	(impl_GNOME_Evolution_Addressbook_Book_open): new function, call
-	pas_backend_open.
-	(impl_GNOME_Evolution_Addressbook_Book_getVCard): get rid of the
-	signal crap, just call pas_backend_handle_request.
-	(impl_GNOME_Evolution_Addressbook_Book_getCardList): same.
-	(impl_GNOME_Evolution_Addressbook_Book_authenticateUser): same.
-	(impl_GNOME_Evolution_Addressbook_Book_addCard): same.
-	(impl_GNOME_Evolution_Addressbook_Book_removeCards): same.
-	(impl_GNOME_Evolution_Addressbook_Book_modifyCard): same.
-	(impl_GNOME_Evolution_Addressbook_Book_getChanges): same.
-	(impl_GNOME_Evolution_Addressbook_Book_getSupportedFields): same.
-	(impl_GNOME_Evolution_Addressbook_Book_getSupportedAuthMethods):
-	same.
-	(impl_GNOME_Evolution_Addressbook_Book_cancelOperation): same.
-	(pas_book_get_backend): aggregate some g_return_if_fail's.
-	(pas_book_get_listener): new function.
-	(pas_book_get_uri): new function.
-	(pas_book_respond_open): just call BookListener::notifyBookOpened.
-	(pas_book_construct): add @uri, and g_strdup it.
-	(pas_book_new): add @uri, and pass it to pas_book_construct.
-	(pas_book_class_init): remove the "request" signal stuff, and fill
-	in epv->open.
-
-	* backend/pas/pas-book.h: add PASOpenRequest struct/enum entry.
-	Also, add @uri to the pas_book_new args, and add a prototype for
-	pas_book_get_uri.  Also, remove the "request" signal.
-
-2003-08-07  Chris Toshok  <toshok@ximian.com>
-
-	* backend/pas/pas-book-factory.c
-	(pas_book_factory_get_n_backends): lock map_mutex around hash
-	table work.
-	(pas_book_factory_dump_active_backends): same.
-	(backend_last_client_gone_cb): same.
-	(_pas_book_factory_send_open_book_response): track CallStatus idl
-	change.
-	(start_backend): simplify this greatly, since the factory is
-	tagged with HINT_PER_THREAD.
-	(impl_GNOME_Evolution_Addressbook_BookFactory_openBook): lock
-	around hash table.
-	(pas_book_factory_init): initialize map_mutex.
-	(pas_book_factory_dispose): free map_mutex.
-
-2003-08-06  Chris Toshok  <toshok@ximian.com>
-
-	* backend/pas/pas-backend-file.c
-	(pas_backend_file_book_view_copy): nuke.
-	(pas_backend_file_book_view_free): same.
-	(view_destroy): same.
-	(pas_backend_file_changes): #if notyet
-	(do_create): e-card -> e-contact.
-	(pas_backend_file_process_create_card): remove view handling from
-	here.
-	(pas_backend_file_process_remove_cards): same.
-	(pas_backend_file_process_modify_card): convert to e-contact, and
-	remove view handling.
-	(pas_backend_file_get_book_view): nuke.
-	(pas_backend_file_process_get_supported_fields): e-card-simple ->
-	e-contact.
-	(pas_backend_file_upgrade_db): e-card -> e-contact.
-	(pas_backend_file_cancel_operation): implement, just return
-	CouldNotCancel.
-	(pas_backend_file_class_init): assign cancel_operation, and remove
-	get_book_view assignment.
-	(pas_backend_file_init): remove book_views assignment.
-
-2003-08-06  Chris Toshok  <toshok@ximian.com>
-
-	* backend/pas/pas-backend-vcf.c (pas_backend_vcf_book_view_copy):
-	nuke.
-	(pas_backend_vcf_book_view_free): same.
-	(view_destroy): same.
-	(insert_contact): new function, insert the contact into our hash
-	table.
-	(load_file): reimplement without the e_card stuff.
-	(foreach_build_list): e_card -> e_contact.
-	(save_file): mostly reimplement in terms of e-contact.  more error
-	case work needs doing.
-	(do_create): e-card -> e-contact.
-	(pas_backend_vcf_process_create_card): remove the view handling
-	from here.
-	(pas_backend_vcf_process_remove_cards): implement this, just
-	remove it from the hash table and set ourselves to dirty.
-	(pas_backend_vcf_process_modify_card): remove the view handling
-	from here.
-	(pas_backend_vcf_process_get_book_view): nuke.
-	(pas_backend_vcf_process_get_supported_fields): reimplement in
-	terms of e-contact.
-	(INITIAL_VCARD): add in a FN attribute, and remove the quoted
-	printable encoding.
-	(pas_backend_vcf_cancel_operation): implement, just always return
-	CouldNotCancel.
-	(pas_backend_vcf_class_init): fill in cancel_operation, and remove
-	get_book_view_sync.
-	(pas_backend_vcf_init): remove book_views handling.
-
-	* backend/pas/pas-backend-vcf.h: update copyright.
-
-2003-08-06  Chris Toshok  <toshok@ximian.com>
-
-	* backend/pas/pas-backend-sync.c (pas_backend_sync_remove_cards):
-	add out param @ids, so we can call pas_book_respond_remove
-	properly.
-	(_pas_backend_remove_cards): the other half of the change - pass
-	the ids on to pas_book_response_remove.
-	(pas_backend_sync_modify_card): add out param @old_vcard so we can
-	call pas_book_respond_modify properly.
-	(_pas_backend_modify_card): the other half of the change, pass the
-	old_vcard on to pas_book_respond_modify.
-	(pas_backend_sync_get_book_view): nuke.
-	(pas_backend_sync_get_changes): track change (book view -> GList)
-	(_pas_backend_is_threaded): nuke.
-	(_pas_backend_create_card): indent.
-	(_pas_backend_remove_cards): same.
-	(_pas_backend_modify_card): same.
-	(_pas_backend_get_card_list): same.
-	(_pas_backend_get_changes): same.
-	(_pas_backend_authenticate_user): same.
-	(_pas_backend_get_supported_fields): same.
-	(_pas_backend_get_supported_auth_methods): same.
-	(_pas_backend_get_book_view): nuke.
-	(pas_backend_sync_class_init): remove assignment to is_threaded
-	and get_book_view.
-
-	* backend/pas/pas-backend-sync.h: add out-params @ids to
-	remove_cards_sync, @old_vcard to modify_card_sync.
-	get_changes_sync's out-param is a GList instead of a book view,
-	and remove get_book_view_sync.
-
-	* backend/pas/pas-backend.c (pas_backend_get_book_view): nuke.
-	(pas_backend_is_threaded): nuke.
-	(pas_backend_start_threaded): nuke.
-	(pas_backend_init): initialize priv->views.
-	(pas_backend_dispose): free priv->views.
-	(pas_backend_get_book_views): new function, return priv->views.
-
-	* backend/pas/pas-backend.h: remove the get_book_view virtual
-	method, and the pas_backend_get_book_view prototype.  Also, track
-	the CallStatus change, and add a cancel_operation virtual method
-	and prototype, and add pas_backend_get_book_views function, so the
-	PASBook's can get ahold of the list.
-
-	* backend/pas/pas-book-view.h: track collapsing of
-	Addressbook::BookListenerCallStatus and
-	Addressbook::BookView::CallStatus enums into
-	Addressbook::CallStatus.
-
-	* backend/pas/pas-book-view.c: same.
-	
-	* backend/pas/pas-card-cursor.[ch]: nuke
-	
-	* backend/pas/pas-book.c: track collapsing of
-	Addressbook::BookListenerCallStatus and
-	Addressbook::BookView::CallStatus enums into
-	Addressbook::CallStatus.
-	(impl_GNOME_Evolution_Addressbook_Book_getBookView): implement
-	this all here, instead of farming it out to the backends.
-	(impl_GNOME_Evolution_Addressbook_Book_getChanges): track change
-	to signature.  this is no longer a book view, it'll return an
-	actual list.
-	(impl_GNOME_Evolution_Addressbook_Book_cancelOperation): new
-	function, implement.
-	(pas_book_respond_create): iterate over the views, notifying them
-	if the new card matches their query.
-	(pas_book_respond_remove): iterate over the views, telling them to
-	delete the card matching the id.
-	(pas_book_respond_modify): iterate over the views, notifying them
-	if they need to change/add/remove that card.
-	(view_destroy): move this here from the backends.
-	(pas_book_respond_get_book_view): weak-ref the book view.
-	(pas_book_new): remove the is_threaded switch on POA hints, and
-	always use PER_REQUEST.
-	(pas_book_class_init): fill in cancelOperation.
-
-	* backend/pas/pas-book.h: track collapsing of
-	Addressbook::BookListenerCallStatus and
-	Addressbook::BookView::CallStatus enums into
-	Addressbook::CallStatus.
-
-2003-08-01  Chris Toshok  <toshok@ximian.com>
-
-	* backend/ebook/e-book-async.c: mostly finished.
-
-2003-08-01  Chris Toshok  <toshok@ximian.com>
-
-	* backend/ebook/e-book-async.[ch]: new files, create async methods
-	similar to the old ebook api that use GThread/GAsyncQueue to
-	simulate the old async behavior.
-
-2003-07-29  Chris Toshok  <toshok@ximian.com>
-
-	* backend/idl/addressbook.idl: collapse
-	Addressbook::BookListenerCallStatus and
-	Addressbook::BookView::CallStatus enums into
-	Addressbook::CallStatus.
-
-2003-07-29  Chris Toshok  <toshok@ximian.com>
-
-	* backend/ebook/e-book-types.h: add EBookChangeType/EBookChange.
-
-2003-07-29  Chris Toshok  <toshok@ximian.com>
-
-	* backend/ebook/e-book-view-listener.c: track collapsing of
-	Addressbook::BookListenerCallStatus and
-	Addressbook::BookView::CallStatus enums into
-	Addressbook::CallStatus.
-
-	* backend/ebook/e-book-listener.c track collapsing of
-	Addressbook::BookListenerCallStatus and
-	Addressbook::BookView::CallStatus enums into
-	Addressbook::CallStatus.
-	(response_free): nuked
-	(e_book_listener_check_queue): nuked
-	(e_book_listener_queue_response): nuked
-	(e_book_listener_queue_progress): nuked
-	(e_book_listener_queue_get_view_response): nuked
-	(e_book_listener_queue_get_changes_response): nuked
-	(e_book_listener_queue_writable_status): nuked
-	(e_book_listener_queue_authentication_response): nuked
-	(e_book_listener_queue_get_supported_fields_response): nuked
-	(e_book_listener_queue_get_supported_auth_methods_response): nuked
-	(e_book_listener_dispose): nuked
-	
-	* backend/ebook/e-book-listener.h: remove prototypes for
-	check_pending and pop_response.
-
-	* backend/ebook/e-book.c (e_book_get_changes): new function.
-	implement this as more of a getCardList type function, instead of
-	getBookView.
-	(e_book_response_get_changes): new function.
-	(e_book_free_change_list): new function.
-
-	* backend/ebook/e-book.h: add prototype for
-	e_book_free_change_list.
-
-2003-07-23  Chris Toshok  <toshok@ximian.com>
-
-	* backend/ebook/e-book.c (e_book_get_book_view): new function,
-	implement this.
-	(e_book_response_get_book_view): same.
-	(e_book_get_contacts): remove the op so we don't see BUSY after
-	this request.
-	(e_book_handle_response): unifdef a few things.
-	(e_book_unload_uri): fix the assertion about URI_NOT_LOADED, and
-	unifdef some code.
-	(e_book_dispose): fix a typo.
-
-	* backend/ebook/e-book-view.c (e_book_view_handle_response):
-	rename _check_listener_queue to this.  we don't need to pop the
-	response either, it's passed as an arg.
-	(e_book_view_construct): "response_queued" -> "response"
-	(e_book_view_start): new function, call BookView.start.
-	(e_book_view_dispose): track the signal id change.
-
-	* backend/ebook/e-book-view.h: add prototype for
-	e_book_view_start.
-
-	* backend/ebook/e-book-view-listener.c
-	(e_book_view_listener_check_queue): remove.
-	(e_book_view_listener_queue_response): just emit the signal.
-	(impl_BookViewListener_notify_card_added): spew.
-	(impl_BookViewListener_notify_card_changed): spew.
-	(impl_BookViewListener_notify_sequence_complete): spew.
-	(impl_BookViewListener_notify_progress): spew.
-	(e_book_view_listener_check_pending): remove
-	(e_book_view_listener_check_pop_response): remove
-	(e_book_view_listener_new): use the ALL_AT_IDLE poa policy.
-	(e_book_view_listener_init): remove the queue/timeout stuff.
-	(e_book_view_listener_dispose): remove the queue/timeout stuff.
-
-	* backend/ebook/e-book-view-listener.h: remove _check_pending and
-	_pop_response.
-
-2003-07-23  Chris Toshok  <toshok@ximian.com>
-
-	* backend/pas/pas-backend-file.c (do_summary_query): remove the
-	completion_search argument, and remove the aggregating stuff.
-	just call pas_book_view_notify_add_1.
-	(pas_backend_file_book_view_copy): remove card_sexp crap.
-	(pas_backend_file_book_view_free): same.
-	(get_length): remove
-	(get_nth): remove
-	(cursor_destroy): remove
-	(vcard_matches_search): remove
-	(ecard_matches_search): remove
-	(pas_backend_file_search_timeout): remove the aggregating stuff.
-	just call pas_book_view_notify_add_1.
-	(pas_backend_file_search): simplify this a bunch.
-	(do_create): use pas_book_view_vcard_matches.
-	(pas_backend_file_process_get_card_list): add some more error
-	checks.
-	(pas_backend_file_process_get_book_view): unifdef this, and
-	implement it.
-	(pas_backend_file_start_book_view): kick off the search.
-	(pas_backend_file_get_uri): remove.
-	(pas_backend_file_class_init): remove get_uri, add
-	start_book_view.
-
-	* backend/pas/pas-backend-ldap.c (view_destroy): don't need to
-	unref the card_sexp, as the PASBookView owns it now.
-	(create_card_handler): use pas_book_view_vcard_matches.
-	(modify_card_modify_handler): same.
-	(ldap_get_view): initialize the view properly.
-	(pas_backend_ldap_get_uri): remove.
-	(pas_backend_ldap_class_init): remove the get_uri assignment.
-
-	* backend/pas/pas-backend-sync.c (_pas_backend_get_card_list):
-	don't free this, it's freed in the pas_book code.
-
-	* backend/pas/pas-backend-sync.h: make use of pas-types.h and
-	remove some typedefs.
-
-	* backend/pas/pas-backend-summary.h: same.
-
-	* backend/pas/pas-backend-card-sexp.h: same.
-
-2003-07-23  Chris Toshok  <toshok@ximian.com>
-
-	* backend/pas/pas-book.c
-	(impl_GNOME_Evolution_Addressbook_Book_getBookView): spew.
-	(pas_book_respond_create): unifdef this.
-	(pas_book_respond_remove): same.
-	(pas_book_respond_modify): same.
-	(pas_book_respond_authenticate_user): same.
-	(pas_book_respond_get_supported_fields): unref the iterator.
-	(pas_book_respond_get_book_view): unifdef, and add spew.
-
-	* backend/pas/pas-book.h: make use of pas-types.h and remove some
-	typedefs.
-
-2003-07-23  Chris Toshok  <toshok@ximian.com>
-
-	* backend/pas/pas-types.h: new file, all the typedefs shared
-	between files here.
-
-2003-07-23  Chris Toshok  <toshok@ximian.com>
-
-	* backend/pas/pas-book-view.c (send_pending_adds): abstract all
-	the aggregating code to the book view.  backends just call
-	notify_card_added and the superclass does all the aggregating.
-	(pas_book_view_notify_change): if there are pending adds, send
-	them before we send the change.
-	(pas_book_view_notify_remove): same.
-	(pas_book_view_notify_add): the other part of the aggregating
-	code.
-	(pas_book_view_notify_complete): send pending adds if there are
-	any.
-	(impl_GNOME_Evolution_Addressbook_BookView_start): new function,
-	call pas_backend_start_book_view.
-	(pas_book_view_get_card_query): new function.
-	(pas_book_view_get_card_sexp): new function.
-	(pas_book_view_get_backend): new function.
-
-	* backend/pas/pas-book-view.h: add a PASBackend arg to the
-	constructor, as well as the char* query and PASBackendCardSExp
-	form.  also add accessors for card_query, card_sexp, and backend.
-
-	* backend/idl/addressbook.idl
-	(GNOME::Evolution::Addressbook::BookView): add start() method.
-	(GNOME::Evolution::Addressbook::BookListener): remove the oneway
-	tag from notifyBookOpened, notifyViewRequested, and
-	notifyChangesRequested so the call doesn't return until the remote
-	object has gotten the method call.
-
-	* backend/pas/pas-backend.c (pas_backend_load_uri): fill in the
-	uri slot if the load was successful.
-	(pas_backend_get_uri): return the uri, remove the virtual method
-	call.
-	(pas_backend_start_book_view): new function.
-	(process_client_request): ifdef out the threaded foo, since i'm
-	not certain it's at all necessary.
-	(real_add_client): remove the bonobo_object_unref of the book,
-	since it's immortal.
-	(pas_backend_dispose): free the uri.
-
-	* backend/pas/pas-backend.h: remove the get_uri virtual method,
-	and add the start_book_view virtual method and
-	pas_backend_start_book_view prototype.
-
-2003-07-23  Chris Toshok  <toshok@ximian.com>
-
-	* backend/pas/Makefile.am (libpasvcf_a_SOURCES): new.
-	(noinst_LIBRARIES): add libpasvcf.a
-
-	* backend/pas/pas-backend-vcf.[ch]: new files, implement a vcard
-	file backend.  the backend api still needs a little work, but it's
-	getting easier to write backends.
-
-2003-07-23  Chris Toshok  <toshok@ximian.com>
-
-	* printing/e-contact-print.c (e_contact_print_response): deal with
-	"uses_list".  Fixes #30839.
-	(e_contact_print_dialog_new): use GINT_TO_POINTER instead of
-	casting to void*, and set "uses_list" to FALSE.
-	(e_contact_print_card_dialog_new): same.
-	(e_contact_print_card_list_dialog_new): same, but set "uses_list"
-	to TRUE.
-
-2003-07-23  Chris Toshok  <toshok@ximian.com>
-
-	* backend/ebook/e-book.c (e_book_dispose): fix a typo.
-
-2003-07-22  Akira TAGOH  <tagoh@redhat.com>
-
-	* printing/e-contact-print-envelope.c (ecpe_print): Use 'Sans'
-	instead of 'Helvetica' for the font name.
-	* printing/e-contact-print.c (e_contact_build_style): Likewise.
-
-2003-07-23  Dan Winship  <danw@ximian.com>
-
-	* backend/ebook/Makefile.am: use EVO_MARSHAL_RULE
-	* backend/pas/Makefile.am: Likewise
-	* gui/component/select-names/Makefile.am: Likewise
-	* gui/contact-editor/Makefile.am: Likewise
-	* gui/contact-list-editor/Makefile.am: Likewise
-	* gui/widgets/Makefile.am: Likewise
-
-	* gui/contact-editor/e-contact-editor.c
-	(e_contact_editor_class_init):
-	s/ece_marshal/e_contact_editor_marshal/
-
-	* gui/contact-list-editor/e-contact-list-editor.c
-	(e_contact_list_editor_class_init): Likewise for ecle_marshal
-
-	* gui/search/e-addressbook-search-dialog.c
-	(e_addressbook_search_dialog_init): Remove gtk_window_set_policy
-	call since that function is deprecated and it was just setting
-	everything to the default values anyway.
-
-	* gui/widgets/e-addressbook-util.c: #include gal/util/e-util.h for
-	e_free_object_list.
-
-2003-07-22  Dan Winship  <danw@ximian.com>
-
-	* backend/ebook/e-card.c: (e_card_new,
-	e_card_new_with_default_charset): Make the "vcard" arg const.
-	...: add lots and lots of other consts as a side effect
-
-2003-06-30  Dan Winship  <danw@ximian.com>
-
-	* gui/widgets/e-addressbook-view.c (e_addressbook_view_dispose):
-	disconnect from model signals to prevent a race condition at
-	shutdown where the view gets destroyed and then the model notices
-	the backend dying before being destroyed itself.
-
-	* gui/widgets/e-addressbook-reflow-adapter.c
-	(addressbook_finalize): add, to free priv.
-	(e_addressbook_reflow_adapter_class_init): set it up
-
-	* gui/component/e-address-popup.c (e_address_popup_set_free_form):
-	Don't leak strings
-
-	* gui/component/addressbook-storage.c (load_source_data): don't
-	leak xml data.
-
-	* gui/component/addressbook-component.c (new_item_cb): don't leak
-	the new card.
-
-2003-06-25  Gilbert Fang <gilbert.fang@sun.com>
-
-	* gui/widgets/e-minicard-view-widget.c 
-	(e_minicard_view_widget_real_focus_in_event): new function, 
-	override the event handler for focus_in_event, set the first item
-	be focused if no focused item at all.  Fixes bug 41826.
-
-2003-06-18  Chris Toshok  <toshok@ximian.com>
-
-	* gui/contact-editor/e-contact-editor.c (fill_in_field): in the
-	EUrlEntry case just reassign widget.  it'll be handled by the
-	GtkEditable code below.  Fixes #43841.
-
-2003-06-14  Larry Ewing  <lewing@ximian.com>
-
-        * gui/backend/ebook/e-card-simple.c:
-	* gui/backend/ebook/e-card.c:
-	* gui/backend/ebook/evolution-ldif-importer.c:
-	* gui/backend/ebook/load-pine-addressbook.c:
-	* gui/backend/ebook/test-card.c:
-	* gui/backend/pas/pas-backend-card-sexp.c:
-	* gui/backend/pas/pas-backend-ldap.c: Fix lots of leaks, update
-	for correct use of g_object_get. Some cleanups.
-
-2003-06-13  Larry Ewing  <lewing@ximian.com>
-	
-	* gui/component/addressbook.c:
-        * gui/component/e-cardlist-model.c:
-	* gui/component/select-names/e-select-names-text-model.c:
-	* gui/contact-editor/e-contact-editor.c:
-	* gui/contact-editor/e-contact-save-as.c:
-	* gui/contact-list-editor/e-contact-list-editor.c:
-	* gui/widgets/e-addressbook-table-adapter.c:
-	* gui/widgets/e-addressbook-util.c:
-	* gui/widgets/e-addressbook-view.c:
-	* gui/widgets/e-minicard-view.c:
-	* gui/widgets/e-minicard.c:  Fix lots of leaks, update for correct
-	use of g_object_get.  Some misc cleanups.
-
-	* printing/e-contact-print.c: update for correct use of
-	g_object_get.
-
-2003-06-05  Not Zed  <NotZed@Ximian.com>
-
-	** For #42691.
-
-	* gui/component/select-names/Makefile.am (%.server.in): implicit
-	rule for .in file.
-	(BUILT_SOURCES): added server_DATA.
-
-	* gui/component/Makefile.am (%.server.in): use implicit rule for
-	.in file.
-	(BUILT_SOURCES): added, just server_DATA.
-	(CLEANFILES): added
-
-	* backend/ebook/Makefile.am (BUILT_SOURCES): add server_DATA.
-
-2003-06-04  Rodrigo Moya <rodrigo@ximian.com>
-
- 	* backend/ebook/ebook.c (e_book_do_response_open): adapted to
- 	changes in EComponentListener API.
-
-** See ChangeLog.pre-1-4 for older changes
-
diff --git a/addressbook/ChangeLog.pre-1-4 b/addressbook/ChangeLog.pre-1-4
deleted file mode 100644
index b1c12cb82f..0000000000
--- a/addressbook/ChangeLog.pre-1-4
+++ /dev/null
@@ -1,16758 +0,0 @@
-2003-05-19  Chris Toshok  <toshok@ximian.com>
-
-	* backend/pas/pas-backend-ldap.c (func_beginswith): use the more
-	convoluted (but more correct) query if evolutionPerson is
-	supported.  Fixes #42825.
-
-2003-05-19  Chris Toshok  <toshok@ximian.com>
-
-	* backend/ebook/e-destination.c (use_default_book_cb): handle the
-	case where @book == NULL, which can happen if there was a problem
-	opening the default book.  Should fix #43005.
-	
-2003-05-19  Chris Toshok  <toshok@ximian.com>
-
-	* gui/component/addressbook-component.c
-	(ensure_completion_uris_exist): fix the initial run case.  the
-	config upgrade code creates all elements so we can't just check
-	for NULL - we have to check if the string is empty.  Fixes #43213.
-
-2003-05-19  Chris Toshok  <toshok@ximian.com>
-
-	* gui/widgets/e-minicard-label.c (set_colors): if we've got focus,
-	set the background of the rect to bg[NORMAL], and the fill color
-	of the text and label to text[NORMAL].  This will make the
-	background a different color than the canvas, but won't make it
-	use the selected background.  fixes #42472
-
-2003-05-19  Chris Toshok  <toshok@ximian.com>
-
-	* gui/merging/e-card-merging.c (e_card_merging_book_commit_card):
-	add a g_object_ref(card), to match the one in
-	e_card_merging_book_add_card.  Fixes #43175.
-
-2003-05-19  Anna Marie Dirks  <anna@ximian.com>
-
-	* gui/contact-editor/e-contact-quick-add.c: Added HIG-appropriate
-	HIG-appropriate spacing, padding, accelerators. Fixes bug #41210
-
-	* gui/component/ldap-config.glade: HIG-ified the various dialogs
-	(including the settings pages, the config druid, and the edit dialog) 
-	in this glade file. This fixes bugs #41140, #41137, #41130
-
-	* gui/merging/e-card-merging-book-commit-duplicate-detected.glade: 
-	Changed button order, and added HIG-appropriate spacing/padding. 
-	Fixes bug #41232.
-
-	* gui/merging/e-card-duplicate-detected.glade: Changed button 
-	order, and added HIG-appropriate spacing/padding. Fixes bug
-	#41229 and #41231.
-
-2003-05-19  Sean Gao  <sean.gao@sun.com>
-
-	* gui/component/addressbook-component.c (xfer_folder): remove the
-	summary if @remove_source is TRUE.  Fixes 38084.
-
-2003-05-16  Anna Marie Dirks  <anna@ximian.com>
-
-	* gui/contact-list-editor/contact-list-editor.glade:  Added 
-	HIG-appropriate spacing, padding, capitalization and accelerators. 
-	Fixes bug #41254
-
-2003-05-16  Anna Marie Dirks  <anna@ximian.com>
-
-	* gui/contact-editor/fulladdr.glade: Added HIG-appropriate
-	spacing, padding, capitalization and accelerators. Fixes bug #41251	
-2003-05-14  Anna Marie Dirks  <anna@ximian.com>
-
-	* gui/contact-editor/fullname.glade:  Added HIG-appropriate
-	spacing, padding, caps, title and accelerators. Fixes bug #41249, 
-	and also bug #41250..
-
-2003-05-16  Anna Marie Dirks  <anna@ximian.com>
-
-	* gui/contact-editor/contact-editor.glade: Added HIG-appropriate
-	spacing, padding, capitalization and accelerators. Fixes bug #41248.
-
-
-2003-05-16  Rodney Dawes  <dobey@ximian.com>
-
-	* addressbook/backend/ebook/Makefile.am: Move the tools to a
- 	more appropriate directory, privlibexecdir
-	
-2003-05-15  Chris Toshok  <toshok@ximian.com>
-
-	* gui/component/addressbook.c (book_open_cb): backing out a tiny
-	porting of jpr's fix - we need to set the book on the
-	EAddressbookView, or else it won't do queries, and it won't show
-	any cards.  Fixes #43023, #43090.
-
-2003-05-15  Chris Toshok  <toshok@ximian.com>
-
-	* gui/merging/e-card-merging.c (free_lookup): new function, split
-	out the duplicated teardown code from final_cb and final_id_cb.
-	also, unref the card.
-	(final_id_cb): call free_lookup.
-	(final_cb): same.
-	(e_card_merging_book_add_card): ref the card.  fixes bug #43016.
-
-2003-05-14  Chris Toshok  <toshok@ximian.com>
-
-	* gui/contact-editor/e-contact-editor.c (full_addr_clicked):
-	replace the text_buffer_delete/text_buffer_insert with
-	set_buffer_set_text.  call widget_changed if they clicked OK, so
-	we actually mark the dialog changed.
-	(fill_in_field): make this handle GtkTextViews, because for some
-	reason that escapes rational thought GtkTextView's don't implement
-	GtkEditable.  fixes #42606.
-	(extract_field): same.
-
-2003-05-14  Chris Toshok  <toshok@ximian.com>
-
-	* gui/widgets/e-minicard-label.c (e_minicard_label_reflow): set
-	the clip_height on reflow so the name of the field is as high as
-	the field's value.  makes it possible to click anywhere to the
-	left of a tall field (like an address) and have it select the
-	field.  Fixes #42625.
-
-2003-05-14  Chris Toshok  <toshok@ximian.com>
-
-	* gui/contact-editor/e-contact-editor.c (address_mailing_changed):
-	handle the case where we haven't filled in the address yet. fixes
-	#42620.
-
-2003-05-14  JP Rosevear  <jpr@ximian.com>
-
-	* gui/component/addressbook.c (addressbook_view_unref): clear the
-	view
-	(book_open_cb): track the book in the view, don't unref the book
-	(set_prop): set the book
-	(retrieve_shell_view_interface_from_control): get the shell view
-	every time
-	(set_folder_bar_label): release and unref the shell view
-
-	* gui/component/addressbook-storage.h: add proto
-
-	* gui/component/addressbook-storage.c
-	(addressbook_storage_cleanup): unref the storage
-
-	* gui/component/addressbook-component.c (owner_unset_cb): clean up
-	storage
-
-	* backend/ebook/e-book.c (e_book_load_uri): track the listener
-	signal
-	(e_book_dispose): unref the listener and disconnect the signal
-
-2003-05-13  Chris Toshok  <toshok@ximian.com>
-
-	* gui/component/select-names/e-select-names-text-model.c
-	(e_select_names_text_model_set_separator): strlen ->
-	g_utf8_strlen.
-	(e_select_names_text_model_insert): same.
-	(e_select_names_text_model_insert_length): big change, make this
-	work with multibyte utf8.
-	(e_select_names_text_model_delete): same.  this could possibly use
-	a tighter loop + a memmove, but this works.
-
-	* gui/component/select-names/e-select-names-model.c
-	(e_select_names_model_get_textification): make sure our truncation
-	to MAX_LENGTH characters uses utf8 characters, not bytes.
-	(e_select_names_model_name_pos): track e-text-model change.
-	pos/length are now in utf8 character terms, so use g_utf8_strlen
-	instead of strlen.
-	(e_select_names_model_text_pos): same.
-
-2003-05-13  Chris Toshok  <toshok@ximian.com>
-
-	* gui/widgets/e-addressbook-table-adapter.c (addressbook_dispose):
-	rename addressbook_destroy to this, and guard against multiple
-	calls.
-	(e_addressbook_table_adapter_class_init): GtkObject -> GObject,
-	and destroy -> dispose.
-	(e_addressbook_table_adapter_init): GtkObject -> GObject.
-
-2003-05-12  Sean Gao  <sean.gao@sun.com>
-
-	* gui/contact-list-editor/e-contact-list-editor.c
-	(e_contact_list_editor_init): terminate g_build_filename with
-	NULL.
-
-2003-05-11  Chris Toshok  <toshok@ximian.com>
-
-	[ fixes bug #42048 ]
-	* gui/widgets/e-addressbook-view.c (e_contact_print_button):
-	button => response.
-	(e_addressbook_view_print): connect to "response", not "clicked".
-
-2003-05-11  Chris Toshok  <toshok@ximian.com>
-
-	[ fixes bug #41245 ]
-	* gui/component/select-names/select-names.glade: fix
-	spacing/border widths as per HIG.
-
-	* gui/component/select-names/e-select-names.c
-	(e_select_names_init): set the border width/spacing on widgets we
-	create here.
-	
-2003-05-09  Jeremy Katz  <katzj@redhat.com>
-
-	* printing/e-contact-print.c (e_contact_print_response): Use glib
-	macro to case from pointer to int.
-
-	* printing/e-contact-print-envelope.c: Add missing #include.
-
-	* gui/component/select-names/e-select-names-completion.c 
-	(e_select_names_completion_start_query): Use
-	E_SELECT_NAMES_COMPLETION to avoid warning
-
-2003-05-06  Chris Toshok  <toshok@ximian.com>
-
-	[ really commit this, fixes bug #41910 ] 
-	* gui/contact-list-editor/e-contact-list-model.c
-	(e_contact_list_model_remove_row): change from model_changed to
-	row_deleted here.  model_changed causes the table to free its
-	ETableSelection, which is what we iterate over when deleting
-	contacts.
-	(e_contact_list_model_add_destination): no need to be calling
-	model_changed here either.
-
-2003-04-29  Chris Toshok  <toshok@ximian.com>
-
-	[ fixes bug #41255 ]
-	* gui/contact-list-editor/contact-list-editor.glade: use stock
-	buttons for Add/Remove.
-
-2003-04-29  Chris Toshok  <toshok@ximian.com>
-
-	[ fixes bug #41144 ]
-	* gui/component/ldap-config.glade: use stock buttons for the
-	Add/Delete buttons.  Switch from "Delete" to "Remove", though, as
-	"Remove" fits much better with the one for "Add".  Also, add our
-	stock-edit-24.png icon for "Edit".
-	
-2003-04-29  Chris Toshok  <toshok@ximian.com>
-
-	[ fixes bug #41211 ]
-	* gui/component/e-address-popup.c (e_address_popup_no_matches):
-	call e_button_new_with_stock_icon to create our button and give it
-	the right icon.
-
-2003-04-29  Gilbert Fang  <gilbert.fang@sun.com>
-
-	* tools/evolution-addressbook-export-list-cards.c
-	(set_pre_defined_field): remove duplicate HOME_COUNTRY field add.
-
-2003-04-28  Chris Toshok  <toshok@ximian.com>
-
-	[ fixes bug #41843]
-	* tools/evolution-addressbook-export-list-cards.c
-	(e_card_simple_csv_get_name): use e_card_simple_get_ecard_field
-	instead of e_card_simple_get_name, so the return value won't be
-	localized.
-
-2003-04-28  Chris Toshok  <toshok@ximian.com>
-
-	[ fixes bug #41779 ]
-	* gui/component/e-address-popup.c (mini_wizard_container_add): we
-	don't need to call gtk_widget_destroy on the old child, since
-	gtk_container_remove will unref it for us.
-
-2003-04-23  Chris Toshok  <toshok@ximian.com>
-
-	[ fixes bug #37351 ]
-	* gui/widgets/e-addressbook-view.c (table_drag_data_get): the row
-	the signal is called with is already the model row, not the view
-	row, so don't call e_table_view_to_model_row on it.
-
-2003-04-23  Chris Toshok  <toshok@ximian.com>
-
-	[ either mostly or entirely fixes #33708 ]
-	* gui/component/select-names/e-select-names-completion.c
-	(e_select_names_completion_done): new function, factor it out of
-	_seq_complete_cb because we need to run the same code in a couple
-	of places.
-	(e_select_names_completion_got_book_view_cb): treat an error from
-	a book as getting a "sequence_complete", and decrement the count
-	of pending complete signals.
-	(e_select_names_completion_got_book_view_cb): remove the increment
-	of pending_completion_seq from here.
-	(e_select_names_completion_seq_complete_cb): factor out the body
-	of e_select_names_completion_done from here, and call it.
-	(e_select_names_completion_start_query): increment
-	pending_completion_seq here.  remove the async variable, as we can
-	now use pending_completion_seq for that purpose (it's > 0 iff
-	async would have been TRUE).
-
-2003-04-19  Chris Toshok  <toshok@ximian.com>
-
-	[ fixes bug #40954 ]
-	* backend/pas/pas-backend-file.c (pas_backend_file_dispose): guard
-	against NULL bf->priv->summary (happens if the initial load_uri
-	failed).
-	(pas_backend_file_load_uri): always set bf->priv->uri, since it's
-	used in _get_uri, which is called when the backend goes away.
-	This only happened before if you tried to load a folder that
-	didn't exist.
-
-2003-04-19  Chris Toshok  <toshok@ximian.com>
-
-	[ fixes #40694 ]
-	* gui/component/select-names/e-select-names-bonobo.c
-	(control_activate_cb): just grab focus if @activate == TRUE.
-	we'll do all merging/unmerging in the focus handler.
-	(widget_focus_cb): handle the merging here.
-	(e_bonobo_control_automerge_ui): store off the widget (so we can
-	grab focus on it) and connect to "activate".
-
-2003-04-18  Rodney Dawes  <dobey@ximian.com>
-
-	* gui/component/select-names/Makefile.am: Add missing -DPREFIX
-	
-2003-04-18  Rodney Dawes  <dobey@ximian.com>
-
-	[ fixes #21499 ]
-	* gui/component/Makefile.am:
-	* gui/component/addressbook.c:
-	* gui/component/select-names/e-select-names-bonobo.c:
-	* gui/contact-editor/Makefile.am:
-	* gui/contact-editor/e-contact-editor.c:
-	* gui/contact-list-editor/Makefile.am:
-	* gui/contact-list-editor/e-contact-list-editor.c:
-	Use PREFIX instead of EVOLUTION_DATADIR for bonobo_ui_util_set_ui ()
-	
-2003-04-15  Chris Toshok  <toshok@ximian.com>
-
-	[ fixes #41252 ]
-	* gui/contact-editor/fulladdr.glade: change title from "Check
-	Address" to "Full Address".
-
-2003-04-09  Chris Toshok  <toshok@ximian.com>
-
-	[ fixes #40727 ]
-	* gui/component/select-names/e-select-names-completion.c
-	(e_select_names_completion_start_query): if the query text is
-	either shorter than the cached query_text or they don't match,
-	don't just set can_reuse_cached_cards to FALSE.  we also need to
-	invalidate the cache.
-
-2003-04-08  Ettore Perazzoli  <ettore@ximian.com>
-
-	* backend/ebook/e-destination.c (d): Remove all debugging
-	messages.
-
-2003-04-08  Dan Winship  <danw@ximian.com>
-
-	* gui/component/ldap-config.glade: Remove color specifications
-	from the druid so it will use theme colors.
-
-	* gui/component/addressbook-config.c
-	(addressbook_add_server_druid): Use g_signal_connect_after for
-	"prepare" signal (to work around b.g.o 81869)
-
-2003-04-07  Chris Toshok  <toshok@ximian.com>
-
-	[ fixes #7103 ]
-	* gui/widgets/e-minicard-label.c (e_minicard_label_class_init):
-	init style_set. and add the signal.
-	(e_minicard_label_realize): include e_minicard_label_construct's
-	code here, and call set_colors after we create the sub-items.
-	(e_minicard_label_unrealize): indent, and remove dead code.
-	(e_minicard_label_event): indent, and call set_colors instead of
-	setting the colors manually.
-	(set_colors): new function, set our colors based on the current
-	style.
-	(e_minicard_label_style_set): new function, just call set_colors.
-	(e_minicard_label_new): e_minicard_label_construct doesn't exist
-	anymore.
-
-	* gui/widgets/e-minicard-label.h (struct _EMinicardLabelClass):
-	add style_set signal.
-
-	* gui/widgets/e-minicard.c (set_selected): little tweaks in the
-	coloring.
-	(e_minicard_unrealize): reindent, and remove some unused code.
-
-	* gui/widgets/e-minicard-view-widget.h (struct
-	_EMinicardViewWidget): add background.
-
-	* gui/widgets/e-minicard-view-widget.c
-	(e_minicard_view_widget_class_init): init
-	widget_class->style_class.
-	(e_minicard_view_widget_style_set): new function, just set the
-	background's fill_color_gdk to base[GTK_STATE_NORMAL].
-	(e_minicard_view_widget_realize): store off the background canvas
-	item so we can set the color later.
-
-2003-04-07  Chris Toshok  <toshok@ximian.com>
-
-	[ fixes bug #40901 ]
-	* gui/component/ldap-config.glade: HIG-ify the ldap server edit
-	dialog's button layout.
-
-2003-04-07  Chris Toshok  <toshok@ximian.com>
-
-	[ fixes bug #39763 ]
-	* gui/component/select-names/e-select-names-bonobo.c (copy_cb):
-	verb callback for EditCopy
-	(cut_cb): verb callback for EditCut.
-	(paste_cb): verb callback for EditPaste.
-	(select_all_cb): verb callback for SelectAll.
-	(free_closure): new function
-	(merge_menu_items): same
-	(unmerge_menu_items): same
-	(control_set_frame_cb): same
-	(control_activate_cb): same
-	(widget_focus_cb): same
-	(e_bonobo_control_automerge_ui): new function, sets up focus
-	signals on the widget passed in to merge/unmerge the passed in
-	ui/verbs.
-	(impl_SelectNames_get_entry_for_section): call
-	e_bonobo_control_automerge_ui for this entry.
-
-2003-04-07  Chris Toshok  <toshok@ximian.com>
-
-	* gui/component/e-address-popup.c (mini_wizard_new): change the
-	ok/cancel button layout to be higified.
-
-2003-04-07  Chris Toshok  <toshok@ximian.com>
-
-	[ last portion of #40046 fix ]
-	* gui/component/select-names/e-select-names-popup.c
-	(remove_recipient_cb): ifdef this out to quiet the compiler.
-	(remove_all_recipients_cb): same.
-	(toggle_html_mail_cb): same.
-	(populate_popup_card): change the #if 0 to #if
-	TOO_MANY_MENU_ITEMS.
-	(popup_menu_list): nuke, as it's handled by populate_popup_card.
-	(populate_popup_nocard): rename popup_menu_nocard to this, and
-	implement it as in populate_popup_card.
-	(e_select_names_populate_popup): we don't need the card, since we
-	don't check if it's a list here anymore.  also, remove the #if 0
-	surrounding the nocard case.
-
-2003-04-07  Not Zed  <NotZed@Ximian.com>
- 
- 	Fixes #40252.
- 
- 	* conduit/address-conduit.c:  Change the LOG macro to a
- 	single arg macro which copies its arg.  Fix all callers.  Change
- 	WARN and INFO to simply g_warning/g_message.  Init G_LOG_DOMAIN
- 	before including anything.
- 
-2003-04-07  Chris Toshok  <toshok@ximian.com>
-
-	* Makefile.am (SUBDIRS): add tools.
-
-2003-04-07  Gilbert Fang <gilbert.fang@sun.com>
-
-	[ fixes bug #23036 ]
-	* tools/evolution-addressbook-export.c,
-	tools/evolution-addressbook-export-list-cards.c,
-	tools/evolution-addressbook-export-list-folders.c: : new and
-	improved export utility.
-
-2003-04-07  Dan Winship  <danw@ximian.com>
-
-	* gui/component/GNOME_Evolution_Addressbook.server.in.in: Clean up
-	server names.
-
-	* gui/component/select-names/GNOME_Evolution_Addressbook_SelectNames.server.in.in: 
-	Likewise
-
-	* backend/ebook/GNOME_Evolution_Addressbook_LDIF_Importer.server.in.in:
-	Likewise. Also mark the evolution:menu_name for i18n.
-
-	* backend/ebook/GNOME_Evolution_Addressbook_VCard_Importer.server.in.in:
-	Likewise
-
-2003-04-03  Chris Toshok  <toshok@ximian.com>
-
-	* gui/widgets/e-minicard-label.c (e_minicard_label_event): set
-	"handle_popup" on the field to be TRUE if it's got focus, FALSE if
-	not.
-
-2003-04-03  Chris Toshok  <toshok@ximian.com>
-
-	* gui/widgets/e-minicard-label.c (e_minicard_label_construct):
-	doh, set the im_context on the field name too so we get the Input
-	Method submenu in the contxt menu.
-
-2003-04-03  Chris Toshok  <toshok@ximian.com>
-
-	* gui/widgets/e-minicard-label.c (e_minicard_label_construct): set
-	the im_context on the field's EText.
-	(e_minicard_label_event): remove a huge swath of #if 0'd code.
-
-2003-04-03  Chris Toshok  <toshok@ximian.com>
-
-	[ fixes bug #40715 ]
-	* gui/merging/e-card-merging.c (final_id_cb): add this callback,
-	to unref the book/free the closure after calling the user's
-	callback.
-	(final_cb): same.
-	(doit): use final{_id}_cb
-	(cancelit): same.
-	(response): don't free the lookup struct here.
-	(match_query_callback): same.
-	(e_card_merging_book_add_card): ref the book.
-	(e_card_merging_book_commit_card): same.
-
-	* gui/component/e-address-popup.c (card_picker_init): make sure to
-	set the "text" attribute on the cell renderer so the text actually
-	shows up.  also, g_object_connect -> g_signal_connect *sigh*.
-	Lastly, get rid of the scrolled window and just make the window
-	size to show the text.
-	
-	* gui/widgets/e-minicard.c (e_minicard_style_set): only call
-	set_selected if we're realized (we create all the canvas objects
-	that set_selected manipulates in our realize method.)
-
-2003-04-03  Chris Toshok  <toshok@ximian.com>
-
-	* gui/component/select-names/Makefile.am (INCLUDES): add
-	EVOLUTION_IMAGESDIR
-
-2003-04-02  Chris Toshok  <toshok@ximian.com>
-
-	* gui/component/select-names/e-select-names-popup.c: change all
-	this around so that we populate the existing popup.  This means we
-	get the select names popup stuff on top of the normal EEntry popup
-	foo.
-
-	* gui/component/select-names/e-select-names-popup.h
-	(e_select_names_populate_popup): rename e_select_names_popup to
-	this.
-
-	* gui/component/select-names/e-select-names-manager.c
-	(populate_popup_cb): rename popup_cb here, and
-	e_select_names_popup -> e_select_names_populate_popup.
-	(e_select_names_manager_entry_new): popup -> populate_popup.
-
-2003-04-02  Chris Toshok  <toshok@ximian.com>
-
-	* gui/widgets/e-addressbook-marshal.list: add NONE:OBJECT
-
-	* gui/widgets/e-minicard.c (e_minicard_class_init): add style_set
-	signal.
-	(e_minicard_style_set): just call set_selected with the currently
-	selected flag, so we recolor properly.
-
-	* gui/widgets/e-minicard.h (struct _EMinicardClass): add style_set
-	signal.
-
-2003-04-01  Rodrigo Moya <rodrigo@ximian.com>
-
-	* backend/ebook/evolution-ldif-importer.c (load_file_fn):
-	* backend/ebook/evolution-vcard-importer.c (load_file_fn): added
-	"folder_type" parameter to EvolutionImporterLoadFileFn.
-
-2003-03-31  Chris Toshok  <toshok@ximian.com>
-
-	* backend/ebook/e-book-util.c (get_local_book_uri): new function,
-	just return the local uri.
-	(set_default_book_uri_local): use get_local_book_uri.
-	(e_book_default_book_open): only try and reload the default book
-	if it's not already the local book.
-
-2003-03-31  JP Rosevear  <jpr@ximian.com>
-
-	* conduit/address-conduit.c (card_removed): it emits a list now
-
-2003-03-31  Dan Winship  <danw@ximian.com>
-
-	* gui/component/select-names/e-select-names.c
-	(e_select_names_init): Remove folder-selector button
-	initialization.
-	(e_select_names_new): Initialize folder-selector button here,
-	using the passed-in EvolutionShellClient rather than depending on
-	a global variable.
-
-	* gui/component/select-names/e-select-names-manager.c
-	(e_select_names_manager_activate_dialog): take an
-	EvolutionShellClient and pass it to e_select_names_new().
-
-	* gui/component/select-names/e-select-names-bonobo.c
-	(impl_SelectNames_activate_dialog): get a pointer to the shell
-	from bonobo-activation, create a shell_client, and pass it to
-	e_select_names_manager_activate_dialog.
-
-	* backend/ebook/e-book-util.c (e_book_get_default_book_uri):
-	constify return value
-
-2003-03-30  Chris Toshok  <toshok@ximian.com>
-
-	* backend/ebook/e-vcard.[ch]: braindead, and *extremely* forgiving
-	vcard parser.  not for public consumption yet.
-
-2003-03-30  Chris Toshok  <toshok@ximian.com>
-
-	[ fixes bug #39381 (again) ]
-	* gui/component/e-address-popup.c (edit_contact_info_cb): add
-	"GtkWidget *button" first arg, so we don't crash.
-
-2003-03-28  Chris Toshok  <toshok@ximian.com>
-
-	[ fixes bug #40403 ]
-	* backend/ebook/e-card.c (e_card_get_vobject): revert the fix for
-	28945, as was done on the 1.2 branch.  this is because the "fix"
-	actually breaks internal use of contact lists.  We need to make
-	the exporting of contacts DTRT, instead of fixing it here.
-
-2003-03-28  Chris Toshok  <toshok@ximian.com>
-
-	[ fix the contact editor so that the only time the address is
-	parsed is when the user types in the address GtkTextView. ]
-	* gui/contact-editor/e-contact-editor.c (address_mailing_changed):
-	make this use delivery addresses instead of labels.
-	(full_addr_clicked): same.
-	(find_address_mailing): same.
-
-	* backend/ebook/e-card-simple.c
-	(e_card_simple_set_delivery_address): make this operate similar to
-	e_card_simple_set_address: it sets both the delivery address and
-	the label for the address.
-
-2003-03-26  Chris Toshok  <toshok@ximian.com>
-
-	[ fixes bug #19178 ]
-	* backend/ebook/evolution-ldif-importer.c (ebook_open): use
-	e_book_load_address_book_by_uri on the passed in uri.
-	(load_file_fn): pass the uri.
-
-	* backend/ebook/evolution-vcard-importer.c (ebook_open): use
-	e_book_load_address_book_by_uri on the passed in uri.
-	(load_file_fn): pass the uri.
-
-2003-03-26  Chris Toshok  <toshok@ximian.com>
-
-	[ fixes bug #34651 ]
-	* gui/component/select-names/e-select-names.c
-	(select_entry_changed): strcmp -> g_utf8_collate.
-	(update_query): encode the string we pass for the query.
-
-2003-03-26  Chris Toshok  <toshok@ximian.com>
-
-	[ fixes bug #34085 ]
-	* gui/contact-list-editor/e-contact-list-editor.c
-	(table_drag_data_received_cb): only successfully complete the drag
-	if they dropped a valid vcard (or vcard list).  Call
-	gtk_drag_finish.
-
-2003-03-26  Chris Toshok  <toshok@ximian.com>
-
-	* gui/contact-list-editor/Makefile.am (INCLUDES): $evolution_uidir
-	-> $evolutionuidir
-
-2003-03-26  Philip Zhao  <philip.zhao@sun.com>
-
-	[ fixes bug #39170 ]
-	* backend/pas/pas-backend.c (pas_backend_create_card): remove
-	'return'.
-	(pas_backend_remove_cards): same.
-	(pas_backend_modify_card): same.
-	(pas_backend_check_connection): same.
-	(pas_backend_get_vcard): same.
-	(pas_backend_get_cursor): same.
-	(pas_backend_get_book_view): same.
-	(pas_backend_get_completion_view): same.
-	(pas_backend_get_changes): same.
-	(pas_backend_authenticate_user): same.
-	(pas_backend_get_supported_fields): same.
-	(pas_backend_get_supported_auth_methods): same.
-
-2003-03-26  JP Rosevear  <jpr@ximian.com>
-
-	* conduit/address-conduit.c (local_record_from_ecard): append the
-	second line to the address if necessary
-	(ecard_from_remote_record): split the address line in two if
-	necessary
-
-2003-03-23  Chris Toshok  <toshok@ximian.com>
-
-	* gui/contact-list-editor/contact-list-editor.glade: set the
-	dialog to "Visible: No" so it doesn't flash when we bring it up.
-
-2003-03-23  Chris Toshok  <toshok@ximian.com>
-
-	[ fixes bug #40026 ]
-	* gui/contact-editor/e-contact-editor.c (set_field): add
-	EContactEditor arg, and block/unblock signals around the
-	gtk_entry_set_text, since that generates a "changed" signal which
-	causes problems.
-	(set_phone_field): take and pass along an EContactEditor arg.
-	(set_fields): pass editor to set_field.
-
-2003-03-23  Chris Toshok  <toshok@ximian.com>
-
-	* gui/contact-editor/arrow.png: nuke.
-	
-	* gui/contact-editor/Makefile.am (EXTRA_DIST): remove images_DATA
-	(images_DATA): nuke, don't need it anymore.
-	
-	* gui/contact-editor/e-contact-editor.c
-	(connect_arrow_button_signal): rename _replace_button to this.  we
-	no longer create an image, as it's a GtkArrow in the .glade file
-	now.
-	(connect_arrow_button_signals): rename _replace_buttons to this.
-	no longer pass the arrow.png's to _replace_button.
-	(e_contact_editor_init): _replace_buttons ->
-	connect_arrow_button_signals.
-	(_arrow_pressed): remove some dead code, and some args that aren't
-	used.
-	(_phone_arrow_pressed): track change to _arrow_pressed.
-	(_email_arrow_pressed): same.
-	(_address_arrow_pressed): same.
-
-2003-03-23  Chris Toshok  <toshok@ximian.com>
-
-	[ fixes bug #31786 ]
-	* gui/component/addressbook-config.c
-	(addressbook_source_dialog_set_source): fix some gtk warnings.
-	(set_advanced_button_state): the advanced dialog isn't present in
-	the glade file anymore, so ifdef everything dealing with it.
-	(addressbook_edit_server_dialog): same.
-
-	* gui/component/ldap-config.glade: remove all the unused Advanced
-	UI stuff to lessen the amount of strings needing translation.
-
-2003-03-23  Chris Toshok  <toshok@ximian.com>
-
-	[ fixes bug #32113 ]
-	* backend/ebook/e-destination.h: add include_email arg to
-	e_destination_get_textrep.
-
-	* backend/ebook/e-destination.c (e_destination_get_textrep): add
-	include_email arg.  if it's TRUE, and if there's an email address to
-	add
-
-	* gui/contact-list-editor/e-contact-list-model.c
-	(contact_list_value_at): use e_destination_get_textrep so we don't
-	display QP text, and pass TRUE for include_email.
-
-	* gui/widgets/e-minicard.c (add_field): same.
-	(remodel): same.
-
-	* gui/widgets/e-addressbook-treeview-adapter.c (adapter_get_value): same.
-
-	* gui/widgets/e-addressbook-table-adapter.c (addressbook_value_at): same.
-
-	* gui/component/select-names/e-select-names-text-model.c
-	(e_select_names_text_model_insert_length): pass FALSE for
-	include_email.
-
-	* gui/component/select-names/e-select-names-model.c
-	(e_select_names_model_get_textification): pass FALSE for
-	include_email.
-	(e_select_names_model_get_string): same.
-	(e_select_names_model_replace): same.
-	(e_select_names_model_name_pos): same.
-	(e_select_names_model_text_pos): same.
-
-2003-03-19  Ettore Perazzoli  <ettore@ximian.com>
-
-	* backend/ebook/GNOME_Evolution_Addressbook_VCard_Importer.server.in.in:
-	Replace "evolution:menu-name" prop with "evolution:menu_name".  [#39692]
-	* backend/ebook/GNOME_Evolution_Addressbook_LDIF_Importer.server.in.in: Likewise.
-
-2003-03-18  Chris Toshok  <toshok@ximian.com>
-
-	* gui/component/select-names/e-select-names-table-model.c
-	(e_select_names_table_model_col_count): up the column count by one
-	for the underline.
-	(e_select_names_table_model_value_at): add handling for underline.
-
-2003-03-18  Chris Toshok  <toshok@ximian.com>
-
-	* gui/component/e-address-popup.c (email_menu_add_option): fix use
-	of deprecated gtk_menu_append.
-	(card_picker_selection_changed): change this to be used with the
-	"changed" signal on GtkTreeSelection.
-	(free_str): yeah, gross.  i know.
-	(card_picker_init): this needed some fixing, so the strings don't
-	go away after we insert them into the model.  also, connect to the
-	"changed" GtkTreeSelection signal instead of using the nonexistant
-	gtk_tree_selection_set_func.
-	(e_address_popup_construct): gtk_style_unref -> g_object_unref.
-	(popup_size_allocate_cb): nuke.
-	(e_address_popup_ambiguous_email_add): use gtk_window_set_position
-	and let the window manager place the window instead of doing it
-	ourself.
-
-2003-03-18  Chris Toshok  <toshok@ximian.com>
-
-	[ Fixes addressbook bug #39730 ]
-	* gui/component/ldap-config.glade: add response ids to the search
-	base dialog.
-
-	* gui/component/addressbook-config.c
-	(addressbook_source_dialog_destroy): use g_object_unref, not
-	gtk_widget_destroy, on the GladeXML.
-	(addressbook_add_server_druid): call gtk_window_set_type_hint
-	GDK_WINDOW_TYPE_HINT_DIALOG so this window looks like a dialog.
-	(editor_modify_cb): no more apply button.
-	(edit_dialog_apply_clicked): nuked.
-	(edit_dialog_close_clicked): rename to _cancal_clicked.
-	(edit_dialog_ok_clicked): call gtk_widget_destroy here instead of
-	calling _cancel_clicked.
-	(addressbook_edit_server_dialog): no more apply button, and
-	close_button -> cancel_button.  Also, set the hint to
-	GDK_WINDOW_TYPE_HINT_DIALOG.
-	(ldap_dialog_new): fix compiler warning.
-	(addressbook_dialog_create_sources_table): same.
-
-2003-03-18  Chris Toshok  <toshok@ximian.com>
-
-	* gui/component/select-names/e-select-names-section.etspec: use
-	alternating-row-colors="false"
-
-	* gui/component/select-names/e-select-names.h: nuke prototypes for
-	e_select_names_get_source/section.
-
-	* gui/component/select-names/e-select-names.c (set_book): remove
-	the signal disconnect from here.
-	(addressbook_model_set_uri): same.
-	(e_select_names_init): connect to the search_result signal on the
-	addressbook model.
-	(e_select_names_child_free): disconnect the changed_id signal.
-	(e_select_names_add_section): set the underline column so the
-	recipient tables look like they did when they were EEntry.
-	(e_select_names_add_section): store off the changed_id.
-	(e_select_names_get_section): nuke.
-	(e_select_names_get_source): nuke.
-
-2003-03-18  JP Rosevear  <jpr@ximian.com>
-
-	* conduit/address-conduit.c (addrconduit_load_configuration): kill
-	warning by sinking objects
-
-2003-03-18  Not Zed  <NotZed@Ximian.com>
-
-	* gui/component/select-names/e-select-names.c (set_book,
-	addressbook_model_set_uri): disconnect/keep track of search result
-	signal id.
-	(e_select_names_init): Keep track of various signals, particularly
-	status signal.
-	(e_select_names_dispose): disconnect from any signals that are
-	still active.  Fixes crash for #38202.
-
-2003-03-13  Chris Toshok  <toshok@ximian.com>
-
-	* gui/contact-editor/e-contact-editor.c
-	(set_entry_changed_signals): use set_entry_changed_signal_email
-	for the email entry so the email gets saved out.
-	(set_entry_changed_signal_email): new function, analogous to
-	set_entry_changed_signal_phone, but for email.
-
-2003-03-12  Chris Toshok  <toshok@ximian.com>
-
-	[ fixes bug #20210 ]
-	* gui/component/select-names/e-select-names-popup.c
-	(popup_menu_card): change "Edit Contact Info" to "View Contact
-	Info", as you can't always edit the contact (if the book is read
-	only).
-	(popup_menu_list): same, but for a contact list.
-
-2003-03-11  Chris Toshok  <toshok@ximian.com>
-
-	[ fixes bug #39507 ]
-	* gui/component/select-names/e-select-names.c (search_result): new
-	function, sync the models after we do a search.
-	(addressbook_model_set_uri): connect to search_result.
-
-2003-03-11  Chris Toshok  <toshok@ximian.com>
-
-	* gui/component/select-names/e-select-names.c
-	(e_select_names_init): fix compiler warnings about deprecated
-	functions.
-	(e_select_names_child_free): unref the table model.
-	(remove_address): re-enable.
-	(section_right_click_cb): this is an ETable callback now.
-	(e_select_names_add_section): remove a gross gross awful hack, and
-	make the recipient tables ETables instead EEntry's.  We lose the
-	nice underlining, but we can add that back in as another ETable
-	style (like strikeout and bold), and we also fix the longstanding
-	scrolling problems (like bug #25148) and can finally remove
-	addresses by double clicking on them (which is also a bug
-	someplace I think.. dunno the # offhand.)
-
-	* gui/component/select-names/e-select-names-table-model.c
-	(clear_info): always set the count to -1, regardless of what
-	model->data is.
-
-	* gui/component/select-names/e-select-names-model.c: remove some
-	unused enums.
-
-	* gui/component/select-names/Makefile.am (etspec_DATA): add
-	e-select-names-section.etspec
-
-	* gui/component/select-names/e-select-names-section.etspec: new
-	file, spec for the To:/Cc:/Bcc: etable's in the select-names
-	dialog.
-
-2003-03-11  Not Zed  <NotZed@Ximian.com>
-
-	* backend/pas/pas-backend-file.c (INITIAL_VCARD): Updated phone
-	number.  Bug #37204.
-
-	* gui/widgets/e-addressbook-util.c (e_addressbook_send_card_list):
-	re-enable in build, include e-destination.h.  For #39256.
-
-2003-03-06  Ettore Perazzoli  <ettore@ximian.com>
-
-	* backend/ebook/load-pine-addressbook.c (ebook_create): Likewise.
-	* backend/ebook/load-gnomecard-addressbook.c (ebook_create): Likewise.
-	* backend/ebook/evolution-vcard-importer.c (ebook_create): Likewise.
-	* backend/ebook/evolution-ldif-importer.c (ebook_create): Likewise.
-	* backend/ebook/test-client.c (get_cursor_cb): Likewise.
-	(ebook_create): Likewise.
-	* gui/widgets/e-minicard.c (e_minicard_set_property): Likewise.
-	(card_modified_cb): Likewise.
-	(e_minicard_event): Likewise.
-	* gui/widgets/gal-view-minicard.c (column_width_changed): Likewise.
-	* gui/widgets/test-minicard-view.c (ebook_create): Likewise.
-	* gui/widgets/gal-view-treeview.c (column_width_changed): Likewise.
-
-2003-03-05  Not Zed  <NotZed@Ximian.com>
-
-	* gui/component/addressbook-component.c (bonobo_main_quit_cb):
-	removed.
-	(owner_unset_cb): Basically a noop, the shell does the quit, we
-	just note we have no owner anymore.
-
-2003-03-04  JP Rosevear  <jpr@ximian.com>
- 
- 	Fixes #37881
- 	
- 	* gui/component/select-names/e-simple-card-bonobo.c
- 	(impl_SimpleCard_get): if we get a null value, send back the empty
- 	string
- 
-2003-03-04  JP Rosevear  <jpr@ximian.com>
- 
- 	* gui/component/select-names/e-select-names.etspec: reflect prior column addition
- 
- 	* gui/component/select-names/e-select-names-bonobo.c
- 	(entry_get_property_fn): set the arg properly
- 
- 	* gui/component/select-names/Evolution-Addressbook-SelectNames.idl:
- 	add Icscalendar to field list
- 
- 	* backend/pas/pas-backend-ldap.c: add icscalendar to prop list
- 
- 	* backend/ebook/e-card.h: add icscalendar data member
- 
- 	* backend/ebook/e-card.c: add icscalendar to list and its parse
- 	routine
- 	(e_card_get_vobject): add icscalendar prop value
- 	(parse_icscalendar): parse routine
- 	(e_card_class_init): add icscalendar arg
- 	(e_card_destroy): destroy icscalendar member
- 	(e_card_set_arg): set icscalendar
- 	(e_card_init): init icscalendar
- 	(e_card_get_arg): return icscalendar
- 
- 	* backend/ebook/e-card-simple.c (field_data): add icscalendar
- 
- 	* backend/ebook/e-card-simple.h: ditto
-	
-2003-03-03  Ettore Perazzoli  <ettore@ximian.com>
-
-	* gui/component/select-names/e-select-names.c
-	(e_select_names_new): Don't set the "modal" property through
-	g_object_new().
-	(e_select_names_init): Explictly make the dialog modal here.
-
-2003-03-03  Ettore Perazzoli  <ettore@ximian.com>
-
-	* gui/widgets/e-addressbook-view.c (create_minicard_view): No need
-	to do any reparenting here; the widget is created with no parent.
-
-2003-03-03  Ettore Perazzoli  <ettore@ximian.com>
-
-	* gui/component/select-names/e-select-names.c
-	(e_select_names_init): Instead of using gtk_widget_unparent(),
-	remove the widget from the container using gtk_container_remove().
-	This fixes a bunch of crashers in all the places using the
-	ESelectNames widget/control.
-
-2003-02-28  Dan Winship  <danw@ximian.com>
-
-	* gui/contact-editor/Makefile.am: Build libecontacteditor as an
-	uninstalled shared library.
-
-	* gui/contact-list-editor/Makefile.am: Likewise for
-	libecontactlisteditor
-
-	* gui/merging/Makefile.am: and libecardmerging
-
-	* gui/search/Makefile.am: and libeaddressbooksearch
-
-	* gui/widgets/Makefile.am: and libeminicard
-
-	* printing/Makefile.am: and libecontactprint
-
-	* gui/component/Makefile.am (libevolution_addressbook_la_LIBADD):
-	Update for new library names (and get rid of libtool portability
-	warnings).
-
-2003-02-28  Dan Winship  <danw@ximian.com>
-
-	* backend/ebook/e-card.c (e_card_list_send, e_card_send): Remove
-	these from here; talking to the mailer doesn't really belong at
-	the libebook level anyway.
-
-	* backend/ebook/Makefile.am: Remove Evolution-Composer CORBA
-	stuff, which fixes some linking problems on OS X.
-
-	* gui/widgets/e-addressbook-util.c (e_addressbook_send_card_list,
-	e_addressbook_send_card): Move from e-card.c and rename.
-
-	* gui/widgets/Makefile.am: move Evolution-Composer CORBA stuff
-	here
-
-	* gui/widgets/e-addressbook-view.c (send_as, send_to,
-	e_addressbook_view_send, e_addressbook_view_send_to): Update for
-	new function names.
-
-	* gui/contact-list-editor/e-contact-list-editor.c (file_send_as_cb,
-	file_send_to_cb): Likewise
-
-	* gui/contact-editor/e-contact-editor.c (file_send_as_cb,
-	file_send_to_cb): Likewise
-
-2003-02-27  Chris Toshok  <toshok@ximian.com>
-
-	* gui/component/addressbook.c (book_open_cb): use g_signal_connect
-	here, not swapped... although since we pass the widget as the
-	closure it really doesn't matter.
-	(load_uri_auth_cb): use a GtkDialog here.
-	(search_result): same.
-
-	* gui/component/select-names/e-simple-card-bonobo.h: add prototype
-	for e_simple_card_bonobo_construct to fix warning.
-
-	* gui/widgets/e-addressbook-view.c (create_alphabet): remove call
-	to gtk_widget_set_usize.
-
-	* gui/contact-editor/e-contact-editor-address.c
-	(e_contact_editor_address_init): gtk_window_set_policy =>
-	gtk_window_set_resizable.
-
-	* gui/contact-editor/e-contact-editor-fullname.c
-	(e_contact_editor_fullname_init): same.
-
-2003-02-27  JP Rosevear  <jpr@ximian.com>
-
-	* conduit/Makefile.am: link to libversit libtool object
-
-2003-02-27  Rodney Dawes  <dobey@ximian.com>
-
-	* backend/ebook/Makefile.am: Fix for server files from Antonio Xu
-
-2003-02-26  Chris Toshok  <toshok@ximian.com>
-
-	* backend/ebook/e-book.c (e_book_load_uri): if we fail to activate
-	factories for a given protocol, return.
-
-	* gui/component/ldap-config.glade: remove the two unused custom
-	widgets to cut down on gtk warning spam.
-
-2003-02-21  Dan Winship  <danw@ximian.com>
-
-	* backend/ebook/Makefile.am (libebook_la_LIBADD): depend on
-	libversit.la, libcamel.la, libename.la, and libeutil.la.
-	(test_client_LDADD, test_client_list_LDADD, test_card_LDADD,
-	evolution_vcard_importer_LDADD, evolution_ldif_importer_LDADD,
-	load_pine_addressbook_LDADD, load_gnomecard_addressbook_LDADD):
-	Remove those dependencies from here, since they're pulled in by
-	libebook.
-
-	* gui/component/Makefile.am (libevolution_addressbook_la_LIBADD):
-	Remove libebook's dependencies
-
-	* gui/component/select-names/Makefile.am
-	(libeselectnames_la_LIBADD): add this
-
-	* gui/widgets/Makefile.am (various disabled *_test_LDADD): cleanup
-
-	* printing/Makefile.am (contact_print_test_LDADD,
-	contact_print_style_editor_test_LDADD): cleanup
-
-2003-02-20  Dan Winship  <danw@ximian.com>
-
-	* gui/component/Makefile.am (libevolution_addressbook_la_LIBADD):
-	s/libemiscwidgets.a/libemiscwidgets.la/
-
-	* gui/widgets/Makefile.am: Likewise (in a bunch of commented-out
-	test programs)
-
-2003-02-19  Dan Winship  <danw@ximian.com>
-
-	* gui/widgets/e-addressbook-model.c: Make parent_class static.
-
-	* gui/widgets/e-addressbook-reflow-adapter.c: Likewise
-
-	* gui/widgets/e-addressbook-table-adapter.c: Likewise
-
-2003-02-19  Chris Toshok  <toshok@ximian.com>
-
-	[ fix #38074 ]
-	* gui/component/e-address-popup.c (add_contacts_cb): first arg is
-	a GtkWidget.  duh.
-
-2003-02-19  Ettore Perazzoli  <ettore@ximian.com>
-
-	* gui/contact-editor/Makefile.am (INCLUDES): Use $(evolutionuidir)
-	instead of $(evolution_uidir).  [Pointed out by Grzegorz Goawski.]
-
-2003-02-17  Chris Toshok  <toshok@ximian.com>
-
-	* gui/component/select-names/e-select-names-completion.c
-	(e_select_names_completion_start_query): if we can complete solely
-	from our cached cards, call e_completion_end_search from here when
-	we're done.
-
-2003-02-17  Chris Toshok  <toshok@ximian.com>
-
-	* gui/component/addressbook-component.c
-	(ensure_completion_uris_exist): plug memory leak (always free
-	val).
-
-2003-02-16  Chris Toshok  <toshok@ximian.com>
-
-	* backend/pas/pas-backend-file.c
-	(pas_backend_file_search_timeout): move the bulk of the
-	non-summary searching stuff here.  we aggregate up to our
-	threshold, then send them to the front end and register a timeout
-	to do another batch.  This keeps us from totally spamming the UI,
-	making things a bit more responsive.
-	(pas_backend_file_search): set up the closure and call the timeout
-	in an idle func.
-
-2003-02-16  Chris Toshok  <toshok@ximian.com>
-
-	* gui/component/select-names/e-select-names-manager.c
-	(e_select_names_manager_entry_new): indent properly.
-
-2003-02-16  Chris Toshok  <toshok@ximian.com>
-
-	* gui/widgets/e-addressbook-reflow-adapter.c (unlink_model):
-	disconnect search_started and search_result.
-	(addressbook_compare): if we're loading, just compare model
-	positions (so we just append while loading).
-	(remove_card): use e_reflow_model_item_removed.
-	(search_started): new function, set loading = TRUE.
-	(search_result): new function, set loading = FALSE and emit
-	"comparison_changed".
-	(e_addressbook_reflow_adapter_init): init loading and the new
-	signal ids.
-	(e_addressbook_reflow_adapter_construct): connect "search_started"
-	and "search_result".
-
-	* gui/widgets/e-addressbook-model.h (struct
-	_EAddressbookModelClass): add search_started signal.
-
-	* gui/widgets/e-addressbook-model.c
-	(e_addressbook_model_class_init): new signal "search_started".
-	(book_view_loaded): emit "search_started" after "model_changed".
-	(remove_card): simplify this, and use CARD_REMOVED all the time,
-	instead of just in the single card case.
-
-2003-02-10  Chris Toshok  <toshok@ximian.com>
-
-	* backend/pas/pas-backend-file.c
-	(pas_backend_file_search_timeout): split out the bulk of the
-	non-summary searching logic to here.  we do 1 "card_threshold"
-	sized lump per timeout.
-	(pas_backend_file_search): use pas_backend_file_search_timeout.
-
-2003-02-10  Chris Toshok  <toshok@ximian.com>
-
-	[ fixes bug #33066 ]
-	* gui/contact-editor/e-contact-editor.c
-	(set_urlentry_changed_signal_field): new function
-	(set_entry_changed_signals): call
-	set_urlentry_changed_signal_field for entry-web, entry-caluri, and
-	entry-fburl.
-	(fill_in_field): add handling for EUrlEntry's.
-	(extract_field): same.
-	(enable_widget): same.
-	(e_contact_editor_create_date): show the widget.
-	(e_contact_editor_create_web): same, create a url entry.
-	(set_urlentry_changed_signal_field): new function
-
-	* gui/contact-editor/contact-editor.glade: entry-web,
-	entry-caluri, and entry-fburl are all custom widgets now.
-
-2003-02-10  Ettore Perazzoli  <ettore@ximian.com>
-
-	* backend/ebook/Makefile.am: Install load-pine-addressbook and
-	load-gnomecard-addressbook into ${privdatadir}/tools.  Install
-	evolution-vcard-importer and evolution-ldif-importer into
-	${privlibexecdir}.
-
-	* backend/ebook/GNOME_Evolution_Addressbook_VCard_Importer.server.in:
-	Removed.
-
-	* backend/ebook/GNOME_Evolution_Addressbook_LDIF_Importer.server.in:
-	Removed.
-
-	* backend/ebook/GNOME_Evolution_Addressbook_VCard_Importer.server.in.in:
-	New.  Specify an absolute path for the executable, using
-	@LIBEXECDIR@.
-	* backend/ebook/GNOME_Evolution_Addressbook_LDIF_Importer.server.in.in:
-	Likewise.
-
-2003-02-09  Chris Toshok  <toshok@ximian.com>
-
-	* gui/component/select-names/e-select-names-completion.c
-	(sexp_initials): gone.
-	(match_initials): gone.
-	(book_query_sexp): remove the primary handling.
-	(book_query_score): same.
-
-	* backend/ebook/e-card.c (e_card_set_property):
-	g_value_get_pointer => g_value_get_object for "category_list".
-
-	* backend/ebook/e-book.c (struct _EBookPrivate): add a comment.
-
-	* backend/pas/pas-backend-ldap.c (func_beginswith): performance at
-	the cost of a tiny bit of correctness.  If the ldap server doesn't
-	support evolutionPerson don't query on fileAs, use sn (since
-	that's effectively what gets used in the display when fileAs isn't
-	supported.)
-
-2003-02-09  Chris Toshok  <toshok@ximian.com>
-
-	* gui/component/select-names/e-select-names-completion.c: lots of
-	changes here.  should be a big performance gain.  god i hope this
-	is finally right.
-
-2003-02-08  Chris Toshok  <toshok@ximian.com>
-
-	[ huge change, all for 1 little performance problem :) fixes #18207 ]
-	* gui/widgets/e-addressbook-model.c (get_view): use
-	e_book_check_static_capability here to make things a little
-	prettier.
-	(remove_card): complain about my life, and add code to use one
-	"model_changed" signal if we get back a list of cards instead of
-	multiple "card_removed" signals.
-
-	* gui/widgets/e-addressbook-model.h: little clean up.
-
-	* gui/widgets/e-addressbook-view.c (delete): write a bulk-remove
-	case for this.  if the backend supports it, send all the ids at
-	once.  otherwise loop over the ids.
-	(e_addressbook_view_delete_selection): fake a CardAndBook
-	structure and call delete, instead of duplicating the code in 2
-	places.
-
-	* gui/component/addressbook.c (delete_contact_cb): don't call
-	e_contact_editor_confirm_delete here, it's handled by the
-	EAddressbookView.
-
-	* backend/pas/pas-card-cursor.c (pas_card_cursor_construct): fix a
-	compiler warning about a stupid crash.
-
-	* backend/pas/pas-book.h (PASOperation): RemoveCard ->
-	RemoveCards.
-	(PASRemoveCardsReques): char *id -> GList *ids.
-	(PASRequest): PASRemoveCardRequest -> PASRemoveCardsRequest.
-
-	* backend/pas/pas-book.c (pas_book_queue_remove_cards): build up a
-	GList from the id sequence.
-	(pas_book_respond_remove): notifyCardRemoved ->
-	notifyCardsRemoved.
-	(impl_GNOME_Evolution_Addressbook_Book_removeCards): rename.
-	(pas_book_free_request): free the idlist for RemoveCards.
-	(pas_book_class_init): removeCard -> removeCards.
-
-	* backend/pas/pas-book-view.h: change prototype for
-	pas_book_view_notify_remove, and add prototype for
-	pas_book_view_notify_remove_1.
-
-	* backend/pas/pas-book-view.c (pas_book_view_notify_remove_1):
-	build up a list and call pas_book_view_notify_remove.
-	(pas_book_view_notify_remove): build up the corba id sequence and
-	call BookViewListener::notifyCardsRemoved.
-
-	* backend/pas/pas-backend.h: remove_card -> remove_cards.
-
-	* backend/pas/pas-backend.c (pas_backend_remove_cards): rename
-	from _remove_card.
-	(process_client_requests): RemoveCard -> RemoveCards and
-	_remove_card -> _remove_cards.
-
-	* backend/pas/pas-backend-ldap.c (check_schema_support):
-	g_strcasecmp -> g_ascii_strcasecmp.
-	(remove_card_handler): _remove => _remove_1.
-	(modify_card_modify_handler): same.
-	(pas_backend_ldap_process_remove_cards): rename from _remove_card.
-	(pas_backend_ldap_class_init): _remove_card -> _remove_cards.
-
-	* backend/pas/pas-backend-file.c (pas_backend_file_class_init):
-	remove_card -> remove_cards.
-	(pas_backend_file_get_static_capabilities): add "bulk-removes".
-	(pas_backend_file_process_remove_cards): rewrite this function
-	largely, so that it handles lists of ids.  first we loop through
-	and for every successful deletion we build a list of deleted
-	ECards.  Then for each view we build a list (a subset of the
-	deleted ECard list) and pass back that list to the view.
-	(pas_backend_file_process_modify_card): use _remove_1 instead of
-	_remove.
-	(ecard_matches_search): new function.
-
-	* backend/pas/pas-backend-card-sexp.c
-	(pas_backend_card_sexp_match_vcard): rewrite in terms of
-	_match_ecard.
-	(pas_backend_card_sexp_match_ecard): new function, the guts from
-	_match_vcard.
-
-	* backend/pas/pas-backend-card-sexp.h: add prototype for
-	pas_backend_card_sexp_match_ecard.
-
-	* backend/idl/addressbook.idl: the card removal stuff now takes
-	CardIdList.
-
-	* backend/ebook/e-book.c (e_book_get_static_capabilities): cache
-	successful capability queries (since they're static).
-	(e_book_check_static_capability): new, convenience function to
-	check if a particular capability is supported.
-	(e_book_remove_card_by_id): build a single element GList and call
-	e_book_remove_cards.
-	(e_book_remove_cards): build up a CORBA sequence from the GList
-	and call Book::removeCards.
-	(e_book_dispose): free the cached capabilities string.
-
-	* backend/ebook/e-book.h: add new prototypes for
-	e_book_check_static_capability and e_book_remove_cards.
-
-	* backend/ebook/e-book-view.h (struct _EBookViewClass): rename
-	"card_removed" signal to "cards_removed".
-
-	* backend/ebook/e-book-view.c (e_book_view_do_removed_event): id
-	-> ids, and free the id list.
-	(e_book_view_check_listener_queue): CardRemovedEvent ->
-	CardsRemovedEvent.
-
-	* backend/ebook/e-book-view-listener.c
-	(e_book_view_listener_queue_response): free the id list.
-	(e_book_view_listener_queue_idlist_event): new function, used for
-	cards_removed.
-	(e_book_view_listener_queue_status_event): id -> ids.
-	(e_book_view_listener_queue_sequence_event): same.
-	(e_book_view_listener_queue_message_event): same.
-	(impl_BookViewListener_notify_cards_removed): call
-	queue_idlist_event.
-	(e_book_view_listener_dispose): free the id list.
-	(e_book_view_listener_class_init): track change to idl call.
-
-	* backend/ebook/e-book-view-listener.h
-	(EBookViewListenerOperation): CardRemovedEvent ->
-	CardsRemovedEvent.
-	(EBookViewListenerResponse): char *id -> GList *ids.
-
-	* backend/ebook/e-book-listener.c
-	(impl_BookListener_respond_remove_cards): rename from remove_card.
-
-2003-02-06  Chris Toshok  <toshok@ximian.com>
-
-	* gui/component/e-address-popup.c (email_table_save_card_cb):
-	check the status, not the book, and unref the book here.
-	(contact_editor_cb): same.
-	(start_query): unref the book in the failure case.
-	(add_card_idle_cb): addressbook_load_default_book returns void
-	now.
-	(edit_contact_info_cb): same.
-	(e_address_popup_query): same.
-
-	* gui/component/addressbook.c (control_activate_cb): track change
-	to addressbook_load_uri return type.
-	(set_prop): same.
-	(addressbook_load_uri): return type is void now.
-	(addressbook_load_default_book): same.
-
-	* gui/component/addressbook.h:
-	addressbook_load_uri/addressbook_load_default_book return void
-	now.
-
-	* conduit/address-conduit.c (start_addressbook_server):
-	e_book_load_default_book returns void now.
-
-	* backend/ebook/e-book-util.h: track changes to return types.
-	
-	* backend/ebook/e-book-util.c (e_book_load_address_book_by_uri):
-	fallout from change to e_book_load_uri.  return type for this
-	function is void now too.
-	(e_book_use_address_book_by_uri): same.
-	(e_book_use_default_book): same.
-	(e_book_load_default_book): same.
-	(got_uri_book_cb): if unsuccessful and book is non-NULL, unref it
-	here.
-	(got_default_book_cb): same.
-
-	* backend/ebook/e-book.c (e_book_load_uri): no longer return a
-	gboolean.  any error is communicated to the callback.
-	
-	* backend/ebook/e-book.h: e_book_load_uri no longer returns a
-	gboolean (it's void.)
-
-	* backend/ebook/evolution-ldif-importer.c (ebook_create): track
-	change to the e_book_load_uri family of functions.
-	
-	* backend/ebook/test-client-list.c (ebook_create): same.
-
-	* backend/ebook/test-client.c (ebook_create): same.
-
-	* backend/ebook/load-pine-addressbook.c (ebook_create): same.
-
-	* backend/ebook/evolution-vcard-importer.c (ebook_create): same.
-
-2003-02-06  Ettore Perazzoli  <ettore@ximian.com>
-
-	* backend/ebook/Makefile.am (e-book-marshal.c, e-book-marshal.h):
-	Use different tmp file names so these rules can be executed in
-	parallel without interfering with each otehr.
-
-	* backend/pas/Makefile.am: Make the ORBit compilation work
-	properly with parallel makes (i.e. make sure it does not spawn
-	multiple orbit-idl processes on the same IDL file at the same
-	time).
-	* gui/component/select-names/Makefile.am: Likewise.
-	* backend/ebook/Makefile.am: Likewise.
-
-2003-02-06  Dan Winship  <danw@ximian.com>
-
-	* gui/component/addressbook-config.c (main):
-	s/PACKAGE/GETTEXT_PACKAGE/ in gettext setup.
-
-2003-02-05  Dan Winship  <danw@ximian.com>
-
-	* backend/ebook/Makefile.am (INCLUDES): Remove cruft.
-	(libebookincludedir): Use privincludedir.
-
-	* backend/ebook/e-book-util.c: #include <string.h>
-	* backend/ebook/e-card-compare.c: Likewise
-	* backend/ebook/load-pine-addressbook.c: Likewise
-	* backend/ebook/test-client.c: Likewise
-
-	* backend/ebook/evolution-vcard-importer.c: #include
-	<e-book-util.h>
-	(factory_fn): Fix this to actually return the importer.
-
-	* backend/ebook/evolution-ldif-importer.c (parseLine): #include
-	<e-book-util.h> and <bonobo/bonobo-main.h>. Use g_ascii_strcmp.
-	
-	* backend/ebook/e-card.c (e_card_email_match_single_string): 
-	(e_card_email_find_number): s/g_str/g_ascii_str/
-	* backend/ebook/e-destination.c (e_destination_equal): Likewise.
-	Also, add an "else return FALSE;"
-
-
-	* backend/pas/Makefile.am (INCLUDES): Remove cruft
-	(ldapschemadir): Use privdatadir
-	(pasincludedir): Use privincludedir.
-
-	* backend/pas/pas-book-factory.c (pas_book_factory_activate):
-	Remove unused variable.
-	* backend/pas/pas-book-view.c (pas_book_view_new): Likewise
-
-
-	* printing/Makefile.am (ecpsdir): Define in terms of privdatadir.
-	(gladedir): Defined in configure.in now.
-
-	* printing/e-contact-print.c: #include <string.h>
-
-	* printing/test-print.c: #include <bonobo/bonobo-main.h>
-	* printing/test-contact-print-style-editor.c: Likewise
-
-
-	* gui/contact-editor/Makefile.am (INCLUDES): Remove some cruft.
-	rename ICONSDIR to IMAGESDIR.
-	(images_DATA): Install arrow.png in imagesdir instead of
-	privdatadir.
-
-	* gui/contact-editor/e-contact-quick-add.c: #include <string.h>
-
-	* gui/contact-editor/e-contact-editor.c: #include <string.h>
-	(e_contact_editor_init): s/EVOLUTION_ICONSDIR/EVOLUTION_IMAGESDIR/
-	(e_contact_editor_new): s/gtk_object_ref/g_object_ref/
-	(_replace_button): Look in imagesdir, not privdatadir
-	(_phone_arrow_pressed): Remove call to deprecated
-	gtk_check_menu_item_set_show_toggle.
-	(_email_arrow_pressed): Likewise
-	(_address_arrow_pressed): Likewise
-	(set_address_field): Remove unused variable
-	(enable_widget):
-	s/gtk_entry_set_editable/gtk_editable_set_editable/
-
-	* gui/contact-editor/e-contact-editor-address.c
-	(e_contact_editor_address_init):
-	s/EVOLUTION_ICONSDIR/EVOLUTION_IMAGESDIR
-	(e_contact_editor_address_set_property):
-	s/gtk_entry_set_editable/gtk_editable_set_editable/
-
-	* gui/contact-editor/e-contact-editor-fullname.c
-	(e_contact_editor_fullname_init):
-	s/EVOLUTION_ICONSDIR/EVOLUTION_IMAGESDIR
-	(e_contact_editor_fullname_set_property): Likewise.
-
-
-	* gui/contact-list-editor/Makefile.am (INCLUDES): Remove cruft,
-	s/ICONSDIR/IMAGESDIR/
-	(gladedir, etspecdir): Remove definitions.
-
-	* gui/contact-list-editor/e-contact-list-editor.c: #include
-	<string.h>
-	(e_contact_list_editor_init): s/ICONSDIR/IMAGESDIR/
-	(e_contact_list_editor_new): s/gtk_object_ref/g_object_ref/
-
-	* gui/contact-list-editor/e-contact-list-model.c: #include <string.h>
-
-
-	* gui/merging/Makefile.am (INCLUDES): Remove cruft.
-	* gui/search/Makefile.am (ruledir): Define in terms of privdatadir
-
-
-	* gui/widgets/Makefile.am (INCLUDES): Remove cruft.
-	(gladedir, etspecdir): Remove definitions.
-	(glade_DATA): Empty, so remove it.
-
-	* gui/widgets/e-addressbook-reflow-adapter.c: #include <string.h>
-	(addressbook_get_property): Remove unused variable
-
-	* gui/widgets/e-addressbook-view.c: #include <string.h>
-	(get_selection_model): Add a g_return_val_if_reached.
-
-	* gui/widgets/e-minicard.c: #include string.h, gtkmain.h,
-	gnome-canvas-pixbuf.h
-	(field_changed): s/gtk_object_unref/g_object_unref/
-	(get_left_width): Remove unused variable
-
-	* gui/widgets/e-minicard-control.c: #include <string.h>
-	(pstream_load, pstream_save): Use g_ascii_strcasecmp
-
-	* gui/widgets/e-minicard-view.c: #include <string.h>
-
-	* gui/widgets/e-minicard-view-widget.c
-	(e_minicard_view_widget_new): s/gtk_type_new/g_object_new/
-
-
-	* gui/component/select-names/Makefile.am (INCLUDES): Remove cruft.
-	(serverdir, gladedir, etspecdir): Remove definitions
-
-	* gui/component/select-names/e-select-names.c: #include <string.h>
-
-	* gui/component/select-names/e-select-names-popup.c
-	(init_html_mail): Remove deprecated
-	gtk_check_menu_item_set_show_toggle call.
-
-	* gui/component/select-names/e-select-names-manager.c
-	(e_select_names_manager_entry_free):
-	s/gtk_timeout_remove/g_source_remove/
-
-
-	* gui/component/Makefile.am (INCLUDES): Remove cruft, rename
-	ICONSDIR to IMAGESDIR.
-	(serverdir, gladedir): Remove defintions.
-
-	* gui/component/addressbook-component.c (IS_CONTACT_TYPE): use
-	g_ascii_strcasecmp
-	(add_creatable_item): s/ICONSDIR/IMAGESDIR/
-
-	* gui/component/component-factory.c: #include <string.h>
-
-	* gui/component/e-address-widget.c: Likewise.
-	(e_address_widget_destroy): s/gtk_idle_remove/g_source_remove/
-	(e_address_widget_schedule_query): s/gtk_idle_add/g_idle_add/
-
-
-	* conduit/Makefile.am (INCLUDES): Remove cruft
-
-2003-02-05  Dan Winship  <danw@ximian.com>
-
-	* gui/component/addressbook-config.c (main): Replace deprecated
-	glade_gnome_init() with glade_init().
-
-	* gui/contact-editor/test-editor.c (main): Likewise.
-
-	* printing/test-contact-print-style-editor.c (main): Likewise.
-
-	* printing/test-print.c (main): Likewise.
-
-2003-02-03  Chris Toshok  <toshok@ximian.com>
-
-	[ pull forward Jack Jia's fix for #34900 ]
-	* gui/contact-editor/e-contact-save-as.c (e_contact_save_as): use
-	a weak ref for the file selector.
-	(e_contact_list_save_as): same.
-	(destroy_it): rewrite this as a weak ref notify function.
-	(close_it): remove frees of the info (it's freed in the weak ref
-	function).
-	(save_it): same.
-
-2003-02-03  Chris Toshok  <toshok@ximian.com>
-
-	* gui/component/addressbook-component.c (remove_folder): pull
-	forward Jack Jia's fix for #33672, but convert it to use unlink
-	instead of the gnome-vfs stuff.
-
-2003-01-27  Chris Toshok  <toshok@ximian.com>
-
-	* gui/contact-editor/contact-editor.glade: add a scrolled window
-	(SHADOW_IN) around the address textview.
-
-2003-01-26  Chris Toshok  <toshok@ximian.com>
-
-	* gui/contact-editor/contact-editor.glade: rename the category
-	entry to entry-categories.
-
-	* gui/contact-editor/e-contact-editor.c
-	(set_entry_changed_signals): use the specialized "changed" signal
-	handlers for entry-company and entry-fullname.
-
-2003-01-26  Chris Toshok  <toshok@ximian.com>
-
-	* gui/component/Makefile.am: i need to sleep more.
-
-2003-01-26  Chris Toshok  <toshok@ximian.com>
-
-	* gui/component/Makefile.am (componentdir): need to assign this
-	here or else the lib doesn't get built.
-
-2003-01-26  Chris Toshok  <toshok@ximian.com>
-
-	* printing/e-contact-print.c (e_contact_start_new_page): begin the
-	new page after showing the last one.
-	(complete_sequence): beginpage before we start printing.
-	(e_contact_print_response): GtkDialog-ify this.
-	(e_contact_print_dialog_new): "clicked" -> "response".
-	(e_contact_print_card_dialog_new): same.
-	(e_contact_print_card_list_dialog_new): same.
-
-2003-01-26  Chris Toshok  <toshok@ximian.com>
-
-	* Makefile.am (CONDUIT_SUBDIR): enable this, as building the
-	conduit works if you have gnome-pilot2.
-
-2003-01-25  Chris Toshok  <toshok@ximian.com>
-
-	* conduit/address-conduit.c: GObjectify the stuff in here that
-	refers to addressbook objects.  the gnome-pilot stuff is still
-	GtkObject for the moment.
-
-2003-01-24  Ettore Perazzoli  <ettore@ximian.com>
-
-	* gui/component/Makefile.am (iconsdir): Remove definition; this is
-	now in configure.in.
-	* gui/contact-editor/Makefile.am (iconsdir): Likewise.
-	* gui/contact-list-editor/Makefile.am (iconsdir): Likewise.
-
-2003-01-23  Sean Gao  <Sean.Gao@Sun.COM>
-
-	[ fixes bug #34898 ]
-	* gui/widgets/e-minicard.c (field_changed): handle modifications
-	to email addresses in contact lists.
-
-2003-01-23  Sean Gao  <Sean.Gao@Sun.COM>
-
-	[ fixes bug #36375 ]
-	* backend/pas/pas-backend-ldap.c: use PHONE_OTHER_FAX instead of
-	PHONE_OTHER for "other_fax".
-	
-2003-01-23  Chris Toshok  <toshok@ximian.com>
-
-	[ fixes bug #31014, roll this in from the 1.2 branch ]
-	* backend/pas/pas-backend-ldap.c: use "categories" instead of
-	"category" for the ECard field so the UI/get_supported_fields stuff
-	actually thinks its usable in the contact editor..
-
-2003-01-23  Chris Toshok  <toshok@ximian.com>
-
-	* backend/pas/pas-backend-ldap.c (pas_backend_ldap_connect): fix
-	for bug 34883 broke ssl transactions (at least those where we were
-	connecting to port 636).  Move it to after the SSL stanza.
-
-2003-01-23  Ettore Perazzoli  <ettore@ximian.com>
-
-	* gui/component/select-names/Makefile.am (componentdir): Remove
-	definition; no need to set it here since it's now defined in
-	configure.in
-	* gui/component/Makefile.am (componentdir): Likewise.
-
-2003-01-22  Ettore Perazzoli  <ettore@ximian.com>
-
-	* gui/component/select-names/Makefile.am (gladedir): Version using
-	$(BASE_VERSION).
-	(etspecdir): Likewise.
-	(iconsdir): Likewise.
-
-	* gui/contact-list-editor/Makefile.am (iconsdir): Version using
-	$(BASE_VERSION).
-	(gladedir): Likewise.
-
-	* gui/merging/Makefile.am (gladedir): Version using $(BASE_VERSION).
-
-	* gui/search/Makefile.am (ruledir): Version using $(BASE_VERSION).
-
-	* gui/component/Makefile.am (INCLUDES): Update EVOLUTION_IMAGESDIR
-	to be versioned through $(BASE_VERSION).
-
-	* gui/widgets/e-addressbook-view.c (init_collection): Use
-	EVOLUTION_GALVIEWSDIR.
-
-	* gui/widgets/Makefile.am (INCLUDES): Define EVOLUTION_GALVIEWSDIR
-	and update EVOLUTION_IMAGESDIR.
-
-2003-01-21  Radek Doulik  <rodo@ximian.com>
-
-	* printing/e-contact-print.c (e_contact_print_button): don't use
-	gnome_print_multipage_new_from_sizes and add warning
-
-2003-01-14  Ettore Perazzoli  <ettore@ximian.com>
-
-	* gui/widgets/e-addressbook-util.c
-	(e_addressbook_prompt_save_dialog): Change dialog from
-	Yes/No/Cancel to Discard/Cancel/Save to match the HIG.
-
-	* gui/search/e-addressbook-search-dialog.c
-	(e_addressbook_search_dialog_init): Change dialog from OK/Cancel
-	to Cancel/OK to match the HIG.
-
-	* gui/contact-editor/e-contact-save-as.c (file_exists): Change
-	dialog from Overwrite/Cancel to Cancel/Overwrite to match the HIG.
-
-	* gui/contact-editor/e-contact-quick-add.c
-	(build_quick_add_dialog): Fix typo s/reponse/response/.  Also
-	change the dialog to be Edit/Cancel/OK instead of OK/Edit/Cancel
-	to match the HIG.
-
-	* gui/contact-editor/e-contact-editor.c
-	(e_contact_editor_confirm_delete): Make alert cancel/delete
-	instead of delete/cancel to match the HIG.
-
-	* gui/contact-editor/e-contact-editor-fullname.c
-	(e_contact_editor_fullname_init): Make dialog Cancel/OK instead of
-	OK/Cancel to match the HIG.
-
-	* gui/contact-editor/e-contact-editor-address.c
-	(e_contact_editor_address_init): Make dialog Cancel/OK instead of
-	OK/Cancel to match the HIG.
-
-	* gui/component/select-names/e-select-names.c
-	(e_select_names_init): Make dialog Cancel/OK instead of OK/Cancel
-	to match the HIG.
-
-2003-01-14  Ettore Perazzoli  <ettore@ximian.com>
-
-	* gui/component/Makefile.am (EXTRA_DIST): Add $(schema_DATA).
-
-2003-01-09  Chris Toshok  <toshok@ximian.com>
-
-	* gui/component/addressbook.c (control_activate_cb): try to load
-	the uri again if it failed previously.
-	(book_open_cb): set failed_to_load based on the response.
-	(set_prop): initialize failed_to_load to FALSE before we kick off
-	the first load.
-
-	* backend/pas/pas-book-factory.c
-	(pas_book_factory_process_request): if the load_uri fails, remove
-	it from the hashtable and free it, so we'll try to load it again
-	from scratch the next time it's requested instead of serving up a
-	backend that doesn't function.
-
-	* backend/pas/pas-backend.c (pas_backend_get_uri): we need to be
-	able to get the uri from backends that aren't loaded (so we can
-	remove them from the hashtable.)
-
-2003-01-09  Chris Toshok  <toshok@ximian.com>
-
-	* backend/pas/pas-backend-ldap.c (query_ldap_root_dse): doh, fix
-	build error.
-
-2003-01-09  Chris Toshok  <toshok@ximian.com>
-
-	* gui/component/select-names/e-select-names-popup.c: #include
-	gtklabel.h, fixes an unresolved symbol.
-
-2003-01-09  Chris Toshok  <toshok@ximian.com>
-
-	* backend/pas/pas-backend-ldap.c (query_ldap_root_dse): build up
-	the list of supported auth_methods.
-	(pas_backend_ldap_process_get_supported_auth_methods): respond
-	with the list of auth methods we've built up.
-	(pas_backend_ldap_dispose): unref the auth_method list.
-	(pas_backend_ldap_class_init): hook up
-	pas_backend_ldap_process_get_supported_auth_methods.
-
-	* backend/pas/pas-backend.c
-	(pas_backend_get_supported_auth_methods): new function.
-	(process_client_requests): add clause for GetSupportedAuthMethods.
-
-	* backend/pas/pas-backend.h: add prototype for
-	pas_backend_get_supported_auth_methods, and add it to the class
-	vtable.
-
-	* backend/pas/pas-book.h: add GetSupportedAuthMethods enum member
-	and PASGetSupportedAuthMethodsRequest. and add prototype for
-	pas_book_respond_get_supported_auth_methods.
-
-	* backend/pas/pas-book.c
-	(pas_book_queue_get_supported_auth_methods): new function.
-	(impl_GNOME_Evolution_Addressbook_Book_getSupportedAuthMethods):
-	new function.
-	(pas_book_respond_get_supported_auth_methods): new function.
-	(pas_book_free_request): add clause for GetSupportedAuthMethods.
-	(pas_book_class_init): hook up getSupportedAuthMethods.
-
-	* backend/ebook/e-book-listener.c
-	(e_book_listener_queue_get_supported_fields_response): fields ->
-	list.
-	(e_book_listener_queue_get_supported_auth_methods_response): new
-	function.
-	(impl_BookListener_response_get_supported_auth_methods): new
-	function.
-	(e_book_listener_class_init): hook up
-	epv->notifySupportedAuthMethods.
-
-	* backend/ebook/e-book-listener.h: add
-	GetSupportedAuthMethodsResponse enum member, and change the field
-	name from "fields" to list (and use it for both GetSupportedFields
-	and GetSupportedAuthMethods)
-
-	* backend/ebook/e-book.c (e_book_get_supported_auth_methods): new
-	function.
-	(e_book_do_response_get_supported_auth_methods): new function.
-
-	* backend/ebook/e-book.h: add prototype for
-	e_book_get_supported_auth_methods.
-
-	* backend/idl/addressbook.idl: add getSupportedAuthMethods IDL
-	call.
-
-2003-01-09  Chris Toshok  <toshok@ximian.com>
-
-	* backend/pas/pas-book-factory.c (backend_last_client_gone_cb):
-	deal with backends that might not have loaded successfully
-	(they'll have a NULL uri).
-
-2003-01-09  Chris Toshok  <toshok@ximian.com>
-
-	* gui/component/select-names/e-select-names-bonobo.c
-	(e_select_names_bonobo_new): call e_select_names_bonobo_construct
-	on the newly created object.
-
-2003-01-09  Chris Toshok  <toshok@ximian.com>
-
-	* gui/component/Makefile.am: addressbook-config.etspec is gone.
-
-	* gui/component/addressbook-config.c: make the sources table be a
-	gtktreeview instead of an etable.
-
-	* gui/component/ldap-config.glade: remove all references to
-	gnome-hint.png
-
-2003-01-09  Chris Toshok  <toshok@ximian.com>
-
-	* gui/widgets/gal-view-minicard.c (column_width_changed): fix
-	parameter types here (this signal isn't generated from an ETable.)
-
-	* gui/widgets/gal-view-factory-minicard.c: include e-util.h
-
-	* gui/widgets/e-minicard.h: include gnome-canvas.h here.
-
-	* gui/widgets/e-addressbook-table-adapter.c: #include
-	e-destination.h here.
-
-	* gui/widgets/e-minicard.c: same.
-
-2003-01-09  Chris Toshok  <toshok@ximian.com>
-
-	* gui/contact-editor/e-contact-editor.[ch]: remove the select
-	names stuff (the Related Contacts button/entry.)
-
-	* gui/contact-editor/contact-editor.glade: same.
-
-2003-01-09  Chris Toshok  <toshok@ximian.com>
-
-	* gui/component/select-names/GNOME_Evolution_Addressbook_SelectNames.server.in.in:
-	comment out the factory oaf_server, and change the location of the
-	SelectNames controls to be
-	OAFIID:GNOME_Evolution_Addressbook_Factory so the normal
-	addressbook.so will create them.
-
-	* gui/component/select-names/Makefile.am
-	(libeselectnames_la_SOURCES): remove the
-	e-select-names-factory.[ch] stuff for the time being.
-
-	* gui/component/component-factory.c (factory): we're now (for the
-	time being) the factory for the select names control.
-
-2003-01-08  Chris Toshok  <toshok@ximian.com>
-
-	* gui/widgets/e-addressbook-view.c: oops, don't include
-	e-treeview-selection-model.h unless we're building the treeview.
-
-2003-01-08  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* backend/pas/pas-backend-ldap.c
-	(pas_backend_ldap_process_authenticate_user): Fix to build.
-
-2003-01-08  Chris Toshok  <toshok@ximian.com>
-
-	* gui/component/apps_evolution_addressbook.schemas: add in the
-	schema entry for minimum_query_length.
-
-2003-01-08  Chris Toshok  <toshok@ximian.com>
-
-	* gui/widgets/e-addressbook-view.h: add
-	E_ADDRESSBOOK_VIEW_TREEVIEW to the enum, ifdef'ed out.
-
-	* gui/widgets/e-addressbook-view.c
-	(e_addressbook_view_class_init): add ifdefed treeview code.
-	(init_collection): same.
-	(display_view): same.
-	(get_selection_model): same.
-	(treeview_row_activated): same.
-	(create_treeview_view): same.
-	(change_view_type): same.xo
-	(e_addressbook_view_print): same.
-	(e_addressbook_view_print_preview): same.
-
-	* gui/widgets/Makefile.am: add in the treeview sources (commented
-	out).
-
-2003-01-08  Chris Toshok  <toshok@ximian.com>
-
-	* gui/widgets/gal-view-minicard.c (gal_view_minicard_edit): add
-	parent arg.
-
-	* gui/widgets/e-addressbook-treeview-adapter.[ch]: new files, for
-	a GtkTreeView view of contacts.
-	
-	* gui/widgets/gal-view-treeview.[ch]: same
-	
-	* gui/widgets/gal-view-favroty-treeview.[ch]: same
-	
-2003-01-08  Ettore Perazzoli  <ettore@ximian.com>
-
-	* gui/component/Makefile.am: $(datadir)/evolution/images instead
-	of $(datadir)/images/evolution.
-	* gui/contact-editor/Makefile.am: Likewise.
-	* gui/contact-list-editor/Makefile.am (iconsdir): Likewise.
-	* gui/widgets/Makefile.am: Likewise.
-
-2002-01-08  Dan Winship  <danw@ximian.com>
-
-	Move PASBook request handling into PASBackend itself since all
-	existing backends do it exactly the same way. (Part of 32866).
-
-	* backend/pas/pas-backend.h (PASBackendClass): add new methods for
-	the various pas book requests.
-
-	* backend/pas/pas-backend.c: Add a clients list to
-	PASBackendPrivate.
-	(pas_backend_create_card, etc): Add these to invoke the new
-	methods.
-	(process_client_requests, book_destroy_cb): Moved here and
-	slightly rewritten from pas-backend-file.
-	(last_client_gone): Now static.
-	(add_client, remove_client): Default implementations, based on
-	pas-backend-file, that add the client to/remove it from the
-	backend's clients list and connect to its requests_queued signal.
-	(pas_backend_init, pas_backend_dispose): Deal with the clients
-	list.
-
-	* backend/pas/pas-backend-file.c (struct _PASBackendFilePrivate):
-	Remove GList *clients.
-	(pas_backend_file_process_client_requests,
-	pas_backend_file_book_destroy_db, pas_backend_file_add_client,
-	pas_backend_file_remove_client): Gone.
-	(pas_backend_file_class_init): Remove add_client/remove_client
-	method initializations, add initializations for processing the
-	various book requests.
-
-	* backend/pas/pas-backend-ldap.c (struct _PASBackendLDAPPrivate):
-	Remove GList *clients.
-	(pas_backend_ldap_process_create_card, etc): Make these take the
-	specific PAS*Request types rather than a generic PASRequest.
-	(pas_backend_ldap_process_client_requests,
-	pas_backend_ldap_book_destroy_db, pas_backend_ldap_add_client,
-	pas_backend_ldap_remove_client): Gone.
-	(pas_backend_ldap_class_init): Remove add_client/remove_client
-	method initializations, add initializations for processing the
-	various book requests.
-
-2003-01-07  Chris Toshok  <toshok@ximian.com>
-
-	* backend/pas/evolutionperson.schema: fix the SYNTAX for the
-	telephone attributes, and make the fax attributes more closely
-	mirror those from core.schema.  Fixes the schema for openldap-2.1.
-
-2003-01-06  Dan Winship  <danw@ximian.com>
-
-	* backend/idl/Makefile.am: remove idldir def (defined by
-	configure.in now)
-
-	* gui/component/select-names/Makefile.am: Likewise
-
-2003-01-01  Chris Toshok  <toshok@ximian.com>
-
-	[ fixes the non-ui portion of #36183 ]
-	* gui/component/select-names/e-select-names-completion.c
-	(e_select_names_completion_start_query): use the entry's
-	minimum_query_length instead of a constant here.
-	(e_select_names_completion_set_minimum_query_length): new
-	function, set the entry's minimum_query_length.
-
-	* gui/component/select-names/e-select-names-manager.c
-	(e_select_names_manager_entry_new): set the minimum_query length
-	after setting the completion books.
-	(read_completion_settings_from_db): rename
-	read_completion_books_from_db to this, and read the
-	minimum_query_length too.
-	(db_listener): rename uris_listener to this, and listen for
-	changes on both the uris and minimum_query_length settings.
-
-	* gui/component/select-names/e-select-names-completion.h: add
-	prototype for e_select_names_completion_set_minimum_query_length.
-
-	* gui/component/select-names/e-select-names-manager.h: add
-	minimum_query_length to struct _ESelectNamesManager.
-
-2002-12-19  Ettore Perazzoli  <ettore@ximian.com>
-
-	* gui/component/addressbook-config.c
-	(addressbook_config_control_new): Made it return an
-	EvolutionConfigControl instead of a BonoboControl (and removed a
-	bogus EvolutionConfigControl -> BonoboControl cast).
-
-2002-12-17  Chris Toshok  <toshok@ximian.com>
-
-	[ fixes bug #34897 ]
-	* gui/widgets/e-addressbook-table-adapter.c
-	(addressbook_value_at): don't free the return of
-	e_card_simple_get_const, as this causes a double free later on.
-
-2002-12-18  Chris Toshok  <toshok@ximian.com>
-
-	* gui/component/e-address-popup.c: convert the clist in here to a
-	GtkTreeView.  your guess is as good as mine if it works (i can't
-	test it at present) but it compiles.
-
-2002-12-18  Chris Toshok  <toshok@ximian.com>
-
-	* gui/widgets/e-addressbook-view.c (jump_to_letters):
-	g_string_sprintfa -> g_string_append_printf.
-	(create_alphabet): same.
-	(create_minicard_view): remove gtk_widget_{push,pop}_visual.
-
-	* gui/widgets/Makefile.am (INCLUDES): add -D*_DISABLE_DEPRECATED.
-
-2002-12-18  Chris Toshok  <toshok@ximian.com>
-
-	* gui/widgets/e-minicard.c (e_minicard_realize): drop use of
-	"font" arg.
-	(get_left_width): use pango to calculate this instead of a GdkFont.
-
-	* gui/widgets/e-minicard-view.c: drop include of e-unicode.h.
-
-	* gui/widgets/e-minicard-label.c (e_minicard_label_construct):
-	don't need to create the font anymore.
-
-	* gui/search/Makefile.am (INCLUDES): add -D*_DISABLE_DEPRECATED.
-
-	* gui/search/e-addressbook-search-dialog.c
-	(e_addressbook_search_dialog_new): use g_object_new instead of
-	gtk_type_new.
-
-	* gui/merging/Makefile.am (INCLUDES): add -D*_DISABLE_DEPRECATED.
-
-	* gui/contact-list-editor/Makefile.am (INCLUDES): add
-	-D*_DISABLE_DEPRECATED.
-
-	* gui/contact-list-editor/e-contact-list-editor.c (is_named):
-	strdup (or not, if we don't need to save the value) instead of
-	using the e_utf8 functions.
-	(fill_in_info): same.
-
-	* gui/contact-editor/Makefile.am (INCLUDES): add
-	-D*_DISABLE_DEPRECATED.
-
-	* gui/contact-editor/e-contact-save-as.c (e_contact_save_as):
-	strdup (or not, if we don't need to save the value) instead of
-	using the e_utf8 functions.
-	(e_contact_list_save_as): same.
-
-	* gui/contact-editor/e-contact-quick-add.c (clicked_cb): strdup
-	(or not, if we don't need to save the value) instead of using the
-	e_utf8 functions.
-	(build_quick_add_dialog): same.
-
-	* gui/contact-editor/e-contact-editor.c (phone_entry_changed):
-	strdup (or not, if we don't need to save the value) instead of
-	using the e_utf8 functions.
-	(file_as_set_style): same.
-	(name_entry_changed): same.
-	(full_name_clicked): same.
-	(categories_clicked): same.
-	(set_field): same.
-	(fill_in_field): same.
-	(fill_in_single_field): same.
-	(extract_field): same.
-	(extract_single_field): same.
-
-	* gui/contact-editor/e-contact-editor-fullname.c (extract_field):
-	just strdup, it's already utf8.
-
-	* gui/contact-editor/e-contact-editor-address.c (extract_field):
-	they're all entries, use GTK_ENTRY foo here.
-
-	* gui/component/select-names/Makefile.am (INCLUDES): add
-	-D*_DISABLE_DEPRECATED.
-
-	* gui/component/select-names/e-select-names.c
-	(e_select_names_add_section): remove the extra
-	utf8_from_locale_string stuff.
-
-	* gui/component/select-names/e-select-names-popup.c
-	(set_uiinfo_label): gtk_container_children ->
-	gtk_container_get_children, and remove the extra utf8 stuff.
-
-	* gui/component/Makefile.am (INCLUDES): add
-	-D*_DISABLE_DEPRECATED.
-
-	* gui/component/addressbook-storage.c
-	(addressbook_storage_init_source_uri): g_string_sprintfa ->
-	g_string_append_printf.
-
-	* gui/component/addressbook-config.c (focus_help):
-	gtk_notebook_set_page -> gtk_notebook_set_current_page.
-	(addressbook_source_dialog_set_source): same.
-	(auth_optionmenu_activated): gtk_container_children ->
-	gtk_container_get_children.
-	(ssl_optionmenu_activated): same.
-	(ssl_optionmenu_selected): same, and gtk_notebook_set_page ->
-	gtk_notebook_set_current_page.
-	(scope_optionmenu_activated): same.
-	(set_advanced_button_state): same.
-	(addressbook_ldap_init): hook "response" to gtk_widget_destroy to
-	make the dialog go away when clicked.
-	(addressbook_ldap_auth): same.
-	(addressbook_root_dse_query): same.
-	(do_ldap_root_dse_query): same.
-	(addressbook_config_control_new): fix return type and cast.
-	(main): remove call to gtk_widget_push_visual.
-
-	* gui/component/addressbook-config.h:
-	addressbook_config_control_new returns a BonoboObject, not a
-	BonoboControl.
-
-	* gui/component/addressbook.c: remove e-unicode.h include.
-
-	* backend/pas/Makefile.am (INCLUDES): Add
-	-DLIBGNOME_DISABLE_DEPRECATED.
-
-	* backend/ebook/Makefile.am (INCLUDES): Add
-	-DLIBGNOME_DISABLE_DEPRECATED.
-
-	* backend/ebook/e-card.c (e_card_get_property): remove misleading
-	comment.
-
-2002-12-17  Chris Toshok  <toshok@ximian.com>
-
-	* backend/pas/pas-backend-ldap.c (build_card_from_entry):
-	g_strcasecmp -> g_ascii_strcasecmp.
-	(FIND_INSERT): same.
-
-	* backend/pas/pas-backend-file.c (pas_backend_file_load_uri):
-	g_dirname -> g_path_get_dirname.
-
-	* backend/pas/Makefile.am (INCLUDES):  add
-	-DG_DISABLE_DEPRECATED.
-
-	* backend/ebook/Makefile.am (INCLUDES): add
-	-DG_DISABLE_DEPRECATED.
-
-2002-12-17  Chris Toshok  <toshok@ximian.com>
-
-	* gui/component/select-names/e-select-names-manager.c
-	(uris_listener): oops, use strcmp, not !strcmp here.
-
-2002-12-17  Chris Toshok  <toshok@ximian.com>
-
-	[ Fixes bug #35135 ]
-	* backend/ebook/e-book-util.c (set_default_book_uri_local): don't
-	free the default_book_uri here, it's done in set_default_book_uri.
-	(set_default_book_uri): break some stuff out from
-	set_default_book_uri_from_bonobo_conf to here so it can be used
-	both from that function and the bonobo listener.
-	(default_folder_listener): set the new default book uri.
-	(set_default_book_uri_from_bonobo_conf): install the bonobo conf
-	listener so we'll get updates.
-
-2002-12-16  Ettore Perazzoli  <ettore@ximian.com>
-
-	* gui/component/addressbook-config.c
-	(addressbook_config_control_new): Use
-	evolution_shell_client_corba_objref() instead of BONOBO_OBJREF()
-	to get the Shell CORBA object.
-
-2002-12-16  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* gui/component/addressbook-config.c: Don't #include
-	<e-util/e-html-utils.h>
-
-2002-12-09  Chris Toshok  <toshok@ximian.com>
-
-	* gui/search/e-addressbook-search-dialog.[ch]: GObject-ize this.
-
-2002-12-09  Chris Toshok  <toshok@ximian.com>
-
-	* gui/component/addressbook.c (load_uri_auth_cb): pass
-	"Addressbook" to e_passwords*.
-	(addressbook_authenticate): same.
-
-2002-12-09  Chris Toshok  <toshok@ximian.com>
-
-	* gui/component/addressbook.c (search_cb): remove
-	PENDING_PORT_WORK.
-	(addressbook_search_activated): same.
-	(addressbook_query_changed): same.
-
-	* gui/component/Makefile.am (libevolution_addressbook_la_LIBADD):
-	add libfilter.la back in.
-
-2002-12-09  Ettore Perazzoli  <ettore@ximian.com>
-
-	* gui/widgets/e-minicard-control.c: #define MINICARD_CONTROL_ID.
-
-2002-12-08  Chris Toshok  <toshok@ximian.com>
-
-	* gui/widgets/e-addressbook-util.c (e_addressbook_error_dialog):
-	connect ::response to gtk_widget_destroy so the dialog goes away.
-
-	* gui/widgets/e-minicard-label.c (e_minicard_label_construct):
-	don't use font_gdk anymore on EText.  it doesn't exist.
-
-2002-12-08  Chris Toshok  <toshok@ximian.com>
-
-	* gui/widgets/e-addressbook-reflow-adapter.c (text_height): this
-	uses pango now.
-	(addressbook_height): same.
-
-2002-12-06  Chris Toshok  <toshok@ximian.com>
-
-	* backend/ebook/e-book.c (e_book_commit_card): use e_card_set_book
-	instead of basically duplicating its code here.
-	(e_book_add_card): same.
-
-2002-12-06  Ettore Perazzoli  <ettore@ximian.com>
-
-	* gui/component/e-cardlist-model.c: #include <string.h>.
-
-	* gui/component/addressbook-storage.c: #include <string.h>,
-	<ctype.h>, <unistd.h>.
-
-	* gui/component/addressbook-factory.c: Removed.
-
-	* gui/component/addressbook-component.c: #include
-	<bonobo/bonobo-main.h>, <unistd.h> and <string.h>.
-	(create_view): addressbook_new_control() instead of
-	addressbook_factory_new_control().
-
-	* gui/component/select-names/e-select-names.c
-	(e_addressbook_create_ebook_table): Removed unused variable.
-	(e_select_names_add_section): Removed unused variable.
-
-	* gui/component/select-names/e-select-names-manager.c
-	(focus_in_cb): Use g_source_remove() here instead of
-	gtk_timeout_remove().
-
-	* gui/component/component-factory.c: New.
-
-	* gui/widgets/e-minicard-control.c
-	(e_minicard_control_factory_init): Removed.
-	(e_minicard_control_control_factory): Removed.
-	(e_minicard_control_new): New.
-
-	* gui/component/e-address-widget.c
-	(e_address_widget_factory_init): Removed.
-	(e_address_widget_new_control): Renamed from
-	e_address_widget_factory_new_control(), made public.
-	(e_address_widget_factory): Removed.
-
-	* gui/component/e-address-popup.c (e_address_popup_new_control):
-	New.
-	(e_address_popup_factory_new_control): Removed.
-	(e_address_popup_factory): Removed.
-	(e_address_popup_factory_init): Removed.
-
-	* gui/component/addressbook-config.c
-	(addressbook_config_register_factory): Removed.
-	(addressbook_config_create_control): New.
-
-	* gui/component/addressbook-component.c
-	(addressbook_component_factory_init): Removed.
-	(addressbook_component_get_object): New.
-	(owner_set_cb): Do not call addressbok_config_register_factory().
-
-	* gui/component/addressbook.c (addressbook_factory_init): Removed.
-	(addressbook_new_control): Renamed from
-	addressbook_factory_new_control().
-
-2002-12-05  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* gui/component/select-names/e-select-names.etspec: Use collate
-	for sorting rather than the normal string sort. This fixes bug
-	#26335 without causing bug #33933 :-)
-
-2002-11-30  Chris Toshok  <toshok@ximian.com>
-
-	* backend/pas/pas-backend-ldap.c (pas_backend_ldap_connect): only
-	enable the LDAPv3 stuff if TLS is being used.  Also, deal with
-	naming errors returned from query_ldap_root_dse, as some servers
-	(older openldap servers among others i'm sure) don't have a root
-	dse at all.
-	
-2002-12-02  Not Zed  <NotZed@Ximian.com>
-
-	* gui/widgets/e-addressbook-view.c (e_contact_print_button):
-	gnomedialog -> gtkdialog stuff.  print dialog is a gtkdialog now.
-
-	* gui/contact-editor/e-contact-editor.c: include gtkstock.h
-
-
-2002-11-27  Not Zed  <NotZed@Ximian.com>
-
-	* gui/contact-editor/e-contact-editor-address.c: #include gtkstock.h
-
-2002-11-29  Chris Toshok  <toshok@ximian.com>
-
-	* gui/widgets/e-minicard-view-widget.c (column_width_changed): the
-	detail is supposed to go after the signal id, not at the end of
-	the parameter list.
-
-2002-11-28  Chris Toshok  <toshok@ximian.com>
-	[ roll forward from 1.2 branch, partial fix for #31763 ]
-	* gui/component/select-names/select-names.glade: add the Find
-	button back in.
-
-2002-11-28  Chris Toshok  <toshok@ximian.com>
-
-	* gui/widgets/e-addressbook-view.c (create_minicard_view): remove
-	the button_press_event handler (that did nothing).  this makes it
-	so button presses actually get to the canvas (and therefore we can
-	now drag the lines in the reflow widget).
-
-2002-11-26  Chris Toshok  <toshok@ximian.com>
-
-	* gui/contact-editor/e-contact-quick-add.c: add include for
-	gtkstock.h.
-
-	* gui/contact-list-editor/e-contact-list-model.c
-	(e_contact_list_model_add_destination): add pre_change call.
-	(e_contact_list_model_remove_row): same.
-	(e_contact_list_model_remove_all): same.
-
-	* gui/contact-list-editor/e-contact-list-editor.c
-	(e_contact_list_editor_new): ref/sink the contact list editor so
-	we don't get the floating unref warning from gtk.
-
-	* gui/contact-editor/e-contact-editor.c (e_contact_editor_new):
-	ref/sink the contact editor so we don't get the floating unref
-	warning from gtk.
-	(e_contact_editor_init): use g_build_filename instead of
-	g_concat_dir_and_file.
-
-	* gui/widgets/e-minicard-label.c
-	(e_minicard_label_resize_children): use MAX (value, 0) to make
-	sure we aren't passing negative values for clip-widths.
-
-	* gui/widgets/e-minicard.c (e_minicard_realize): use MAX (value,
-	0) to make sure we aren't passing negative values for widths.
-
-	* gui/contact-editor/e-contact-editor.c (e_contact_editor_init):
-	use g_build_filename.
-
-2002-11-26  Chris Toshok  <toshok@ximian.com>
-
-	[ roll forward from 1.2 branch ]
-	* backend/pas/pas-backend-file.c
-	(pas_backend_file_process_get_vcard): never pass NULL as the vcard
-	to the corba call, it causes a crash.  This particular bug bit us
-	when we opened a card that contained an unresolvable related
-	contact.
-
-2002-11-26  Chris Toshok  <toshok@ximian.com>
-
-	[ roll forward from 1.2 branch, Fixes addressbook bug #28945 ]
-	* backend/ebook/e-card.c (e_card_get_vobject): if the email
-	property is xml, get the real address from the e-destination.
-	Fixes saving contact lists.
-
-2002-11-26  Chris Toshok  <toshok@ximian.com>
-
-	* gui/widgets/e-minicard.c (e_minicard_reflow): remove redundant
-	setting of y2.
-
-	* gui/contact-list-editor/e-contact-list-editor.c
-	(e_contact_list_editor_init): show the table.
-
-	* gui/component/select-names/e-select-names-completion.c: remove
-	an unnecessary #include.
-
-	* gui/component/addressbook-storage.c (addressbook_storage_setup):
-	use g_build_filename.
-
-	* gui/component/addressbook-component.c (remove_folder): use
-	g_build_filename.
-	(add_creatable_item): same.
-	(ensure_completion_uris_exist): same, and use the right gconf
-	paths for completion uris.
-
-2002-11-26  Chris Toshok  <toshok@ximian.com>
-
-	* gui/component/select-names/e-select-names-manager.c
-	(read_completion_books_from_db): use new schema for
-	completion/uris.
-	(uris_listener): same.
-
-	* gui/component/select-names/e-select-names.h: Convert to
-	GtkDialog from GnomeDialog.
-	
-	* gui/component/select-names/e-select-names.c: Convert to
-	GtkDialog from GnomeDialog.
-	(folder_selected): use new schema for last_used_uri.
-	(e_select_names_init): same.
-	(e_select_names_set_default): use pango markup to set
-	bold/not-bold.
-	(e_select_names_add_section): don't bother creating an EEntry, we
-	can use pango and a normal label.  This also keeps us from
-	wrapping "contacts ->" at the '-'.
-
-	* gui/component/apps_evolution_addressbook.schemas: new file.
-
-	* gui/component/Makefile.am: add the schema stuff.
-
-2002-11-24  Chris Toshok  <toshok@ximian.com>
-
-	* gui/component/addressbook-config.c (query_for_supported_bases):
-	show the etable.
-	(addressbook_add_server_druid): show_all before returning the
-	dialog, so the druid shows up.
-
-2002-11-23  Chris Toshok  <toshok@ximian.com>
-
-	[ roll forward from the 1.2 branch.  fixes #25540, part of #29630,
-	as well as other selection issues in the contact editor and ACL
-	issues in the ldap backend ]
-	* backend/pas/pas-backend-ldap.c (check_schema_support): reset the
-	schema check state to FALSE if the read returned nothing (and the
-	user had not authenticated).  we'll requery if/when they auth.
-	(query_ldap_root_dse): free the schema dn before assigning over
-	it.
-	(pas_backend_ldap_connect): added a diagnostic warning about the
-	root dse query failing in anonymous mode (if it in fact did fail.)
-	(pas_backend_ldap_process_authenticate_user): if we successfully
-	authed, requery the root dse to pick up any attributes that might
-	be protected, and retry the schema query if that failed before.
-
-	* gui/contact-editor/e-contact-editor.c (full_name_clicked): set
-	the dialog's editable state based on the new field
-	"fullname_editable", and only do the Ok button handling if this
-	flag is TRUE.
-	(full_addr_clicked): set the dialog's editable state based on the
-	editable state for the particular address (from
-	editor->address_editable[]).  also, only do the Ok button handling
-	if this flag is TRUE.
-	(_address_arrow_pressed): use the address_editable array to
-	determine whether the address text and the mailing address
-	checkbutton are sensitive.
-	(enable_writable_fields): figure out if fullname_editable is
-	TRUE/FALSE, also, init the address_editable flags based on the
-	field list, and handle the address checkbutton.
-
-	* gui/contact-editor/fulladdr.glade: change the label names to
-	label-<name> to match {entry,combo}-<name>.
-
-	* gui/contact-editor/fullname.glade: same.
-
-	* gui/contact-editor/e-contact-editor-fullname.c
-	(e_contact_editor_fullname_class_init): rename ARG_IS_READ_ONLY to
-	ARG_EDITABLE, to reflect the correct sense of the flag.
-	(e_contact_editor_fullname_set_arg): same, and make the labels
-	sensitive/insensitive depending on the editable state of the
-	dialog.
-
-	* gui/contact-editor/e-contact-editor-address.c
-	(e_contact_editor_address_class_init): rename ARG_IS_READ_ONLY to
-	ARG_EDITABLE, to reflect the correct sense of the flag.
-	(e_contact_editor_address_set_arg): same, and make the labels
-	sensitive/insensitive depending on the editable state of the
-	dialog.
-	
-2002-11-22  Chris Toshok  <toshok@ximian.com>
-
-	[ roll forward Sean.Gao@sun.com's fix for #16870 from the 1.2
-	branch ] 
-	* backend/ebook/evolution-ldif-importer.c (getNextLDIFEntry):
-	check for both LR and CRLF as empty line markers.
-
-2002-11-22  Chris Toshok  <toshok@ximian.com>
-
-	[ rolling forward fix for #34254 from 1.2 branch ]
-	* backend/ebook/evolution-vcard-importer.c (check_file_is_vcard):
-	use g-ascii_strncasecmp instead of strncmp.
-	(support_format_fn): use g_ascii_strcasecmp instead of strcmp.
-
-2002-11-20  Chris Toshok  <toshok@ximian.com>
-
-	* gui/component/addressbook-storage.h: roll forward the scope fix.
-
-2002-11-20  Chris Toshok  <toshok@ximian.com>
-
-	* gui/contact-editor/e-contact-editor.c: roll forward the fix for
-	the contact editor.
-
-2002-11-21  Not Zed  <NotZed@Ximian.com>
-
-	* gui/component/select-names/e-select-names-bonobo.c
-	(entry_changed): Pass type to bonobo_ctonrol_set_property, and
-	also NULL terminate the valist.
-
-	* gui/component/select-names/e-select-names-text-model.c
-	(changed_cb): Fix signature for signal.
-
-2002-11-19  Ettore Perazzoli  <ettore@ximian.com>
-
-	* gui/component/select-names/GNOME_Evolution_Addressbook_SelectNames.server.in.in,
-	* gui/component/select-names/Makefile.am: Same changes as below
-	for the SelectNames component.
-
-2002-11-18  Chris Toshok  <toshok@ximian.com>
-
-	* gui/component/select-names/e-select-names.c
-	(e_select_names_init): show the custom table.
-
-2002-11-18  Chris Toshok  <toshok@ximian.com>
-
-	* gui/widgets/gal-view-minicard.c (gal_view_minicard_attach):
-	remove the cast to (int) - column_width is a double.
-
-	* gui/widgets/e-minicard.c (e_minicard_class_init): the height
-	property is only readable, not readwrite.
-
-	* gui/widgets/e-minicard-view-widget.c
-	(e_minicard_view_widget_class_init): make column_width a double
-	property.
-	(e_minicard_view_widget_set_property): don't cast to (int).
-	column_width is double in the e-minicard-view.
-	(e_minicard_view_widget_realize): same.
-	(e_minicard_view_widget_get_property): use g_value_set_double for
-	column_width.
-
-2002-11-17  Chris Toshok  <toshok@ximian.com>
-
-	* gui/component/select-names/Makefile.am (servers_DATA): oops,
-	missed some "oaf"'s.
-
-2002-11-16  Chris Toshok  <toshok@ximian.com>
-
-	* gui/contact-editor/e-contact-editor.c
-	(e_contact_editor_build_phone_ui): sink the popup.
-	(e_contact_editor_build_email_ui): same.
-	(e_contact_editor_build_address_ui): same.
-
-	* gui/component/addressbook-config.c (ldap_dialog_new): show
-	everything from dialog->page down, so custom widgets show up.
-
-2002-11-15  Ettore Perazzoli  <ettore@ximian.com>
-
-	* gui/component/Makefile.am: Added rule to generate
-	GNOME_Evolution_Addressbook.server.in from
-	GNOME_Evolution_Addressbook.server.in.in, substituting
-	@LIBEXECDIR@.
-
-	* GNOME_Evolution_Addressbook.server.in.in: Renamed from
-	GNOME_Evolution_Addressbook.server.in.  Added @LIBEXECDIR@ before
-	the location of the executable.
-
-	* gui/component/select-names/select-names.glade: Ported to Glade
-	2.
-
-	* gui/component/select-names/recipient.glade: Ported to Glade 2.
-
-2002-11-15  Rodney Dawes  <dobey@ximian.com>
-
-	* gui/component/addressbook-component.c: Use bonobo_main_quit.
-	
-2002-11-14  Chris Toshok  <toshok@ximian.com>
-
-	* gui/widgets/gal-view-factory-minicard.c: clean this up a tad.
-
-	* gui/widgets/e-addressbook-view.c (init_collection): re-enable
-	this.
-	(setup_menus): same.
-
-	* gui/widgets/gal-view-minicard.[ch]: more GObject work.
-
-2002-11-12  Chris Toshok  <toshok@ximian.com>
-
-	* gui/contact-editor/e-contact-editor.c (_popup_position): push_in
-	= FALSE, no clue why... :)
-	(_arrow_pressed): call g_signal_stop_emission here, seems to fix
-	things.
-
-	* gui/component/select-names/e-select-names.c
-	(e_select_names_init): fix warnings.
-
-	* gui/component/select-names/e-select-names-manager.c
-	(e_select_names_manager_activate_dialog): fix warning.
-
-	* gui/component/addressbook.c (forget_passwords_cb): remove the
-	PENDING_PORT ifdef.
-	(load_uri_auth_cb): same.
-	(addressbook_authenticate): same.
-
-	* gui/component/addressbook-factory.c (main): same.
-
-	* gui/component/addressbook-storage.c (load_source_data): be
-	silent about text nodes if they contain nothing but whitespace.
-
-2002-11-11  Chris Toshok  <toshok@ximian.com>
-
-	* backend/pas/pas-card-cursor.c (pas_card_cursor_dispose): guard
-	against multiple invocations.
-
-	* backend/pas/pas-backend-ldap.c (view_destroy): change signature
-	to that of a weak ref notify function.
-	(cursor_destroy): same.
-	(pas_backend_ldap_book_destroy_cb): same.
-	(get_cursor_handler): ::destroy -> weak_ref.
-	(pas_backend_ldap_process_get_book_view): same.
-	(pas_backend_ldap_add_client): same.
-
-	* backend/pas/pas-backend-file.c (cursor_destroy): change
-	signature to that of a weak ref notify function.
-	(view_destroy): same.
-	(pas_backend_file_book_destroy_cb): same.
-	(pas_backend_file_process_get_cursor): ::destroy -> weak_ref.
-	(pas_backend_file_process_get_book_view): same.
-	(pas_backend_file_process_get_completion_view): same.
-	(pas_backend_file_process_get_changes): same.
-	(pas_backend_file_add_client): same.
-
-	* backend/ebook/test-client.c (get_cursor_cb): unref the book and
-	exit here.
-	(get_card_cb): pass a query string to get_cursor.
-
-	* backend/ebook/e-book-view.c (e_book_view_class_init): correct
-	marshaller for "card_added".
-
-2002-11-11  Chris Toshok  <toshok@ximian.com>
-
-	* gui/widgets/test-reflow.c (destroy_callback): change signature
-	to that of a weak ref notify function.
-	(main): ::destroy -> weak_ref.
-
-	* gui/widgets/test-minicard.c (destroy_callback): change signature
-	to that of a weak ref notify function.
-	(main): ::destroy -> weak_ref.
-
-	* gui/widgets/test-minicard-view.c (destroy_callback): change
-	signature to that of a weak ref notify function.
-	(main): ::destroy -> weak_ref.
-
-	* gui/widgets/test-minicard-label.c (destroy_callback): change
-	signature to that of a weak ref notify function.
-	(main): ::destroy -> weak_ref.
-
-	* gui/widgets/e-minicard-widget.c (e_minicard_widget_init): ifdef
-	out the call to gnome_canvas_set_scroll_region.  It doesn't seem
-	necessary judging from the rest of the code, and it also crashes
-	the addressbook if it's in.
-
-	* gui/widgets/e-minicard-widget-test.c (destroy_callback): change
-	signature to that of a weak ref notify function.
-	(main): ::destroy -> weak_ref.
-
-	* gui/widgets/e-minicard-control.c (free_struct): change signature
-	to that of a weak ref notify function.
-	(e_minicard_control_factory): ::destroy -> weak_ref.
-
-	* gui/widgets/e-addressbook-view.c (e_addressbook_view_init):
-	::destroy -> weak_ref.
-	(e_addressbook_view_print): same.
-	(free_closure): change signature to that of a weak ref notify
-	function.
-	(e_contact_print_destroy): same.
-	(invisible_destroyed): same.
-
-	* gui/widgets/e-addressbook-util.c
-	(e_addressbook_prompt_save_dialog): convert from GnomeDialog to
-	GtkDialog.
-	(e_addressbook_show_multiple_cards): same.
-
-	* gui/contact-list-editor/e-contact-list-editor.c
-	(prompt_to_save_changes): change response ids to use
-	GTK_RESPONSE_.
-
-	* gui/component/select-names/e-select-names-manager.c
-	(clear_widget): new function.
-	(e_select_names_manager_activate_dialog): ::destroy -> weak_ref.
-
-	* gui/component/select-names/e-select-names.c (clear_widget):
-	change signature to that of a weak ref notify function.
-	(e_select_names_init): ::destroy -> weak_ref.
-
-	* gui/component/e-address-popup.c (mini_wizard_destroy_cb): change
-	signature to that of a weak ref notify function.
-	(mini_wizard_new): ::destroy -> weak_ref.
-
-	* gui/component/addressbook-config.c
-	(addressbook_source_dialog_destroy): change signature to that of a
-	weak ref notify function.
-	(ldap_config_control_destroy_callback): same.
-	(addressbook_add_server_druid): ::destroy -> weak_ref.
-	(addressbook_edit_server_dialog): same.
-	(ldap_config_control_new): same.
-
-	* gui/component/addressbook.c (destroy_callback): change signature
-	to that of a a weak ref notify function.
-	(addressbook_factory_new_control): ::destroy -> weak_ref.
-
-	* gui/merging/e-card-merging.c (response): rename clicked to this,
-	and destroy the dialog here.
-	(match_query_callback): ::clicked -> ::response
-
-	* gui/merging/e-card-merging-book-commit-duplicate-detected.glade:
-	convert.
-
-	* gui/merging/e-card-duplicate-detected.glade: same.
-
-2002-11-11  Chris Toshok  <toshok@ximian.com>
-
-	* gui/contact-editor/e-contact-editor.c (_arrow_pressed): change
-	around a little, still ifdefed though.
-
-	* gui/contact-editor/e-contact-save-as.c (file_exists): same.
-	(save_it): deal with the GtkDialog response ids.
-
-	* gui/contact-editor/e-contact-editor.c
-	(e_contact_editor_confirm_delete): just build the dialog here
-	(using gtk_message_dialog*).
-
-	* gui/contact-editor/Makefile.am (glade_DATA): remove
-	file-exists.glade and e-contact-editor-confirm-delete.glade.
-
-2002-11-11  Chris Toshok  <toshok@ximian.com>
-
-	* backend/pas/pas-card-cursor.c (pas_card_cursor_dispose): guard
-	against multiple invocations.
-
-	* backend/pas/pas-backend-ldap.c (view_destroy): change signature
-	to that of weak ref's notify function - also, don't use the type
-	check macros on the freed GObject.
-	(cursor_destroy): same.
-	(pas_backend_ldap_book_destroy_cb): same.
-	(pas_backend_ldap_add_client): use weak_ref insteead of ::destroy.
-	(get_cursor_handler): same.
-	(pas_backend_ldap_process_get_book_view): same.
-
-	* backend/pas/pas-backend-file.c (cursor_destroy): change
-	signature to that of weak ref's notify function - also, don't use
-	the type check macros on the freed GObject.
-	(pas_backend_file_book_destroy_cb): same.
-	(view_destroy): same.
-	(pas_backend_file_process_get_cursor): use weak_ref instead of
-	::destroy.
-	(pas_backend_file_process_get_book_view): same.
-	(pas_backend_file_process_get_completion_view): same.
-	(pas_backend_file_process_get_changes): same.
-	(pas_backend_file_add_client): same.
-
-2002-11-10  Chris Toshok  <toshok@ximian.com>
-
-	* backend/pas/pas-backend-card-sexp.c
-	(pas_backend_card_sexp_dispose): guard against multiple
-	invocations.
-	
-	* backend/pas/pas-card-cursor.c (pas_card_cursor_dispose): same.
-
-	* backend/pas/pas-book.c (pas_book_dispose): same.
-
-	* backend/pas/pas-book-view.c (pas_book_view_dispose): same.
-
-	* backend/pas/pas-book-factory.c (pas_book_factory_dispose): same.
-
-	* backend/pas/pas-backend-summary.c (pas_backend_summary_dispose): same.
-
-	* backend/pas/pas-backend-ldap.c (pas_backend_ldap_dispose): same.
-
-	* backend/pas/pas-backend-file.c (pas_backend_file_dispose): same.
-
-	* backend/ebook/e-book-listener.c (e_book_listener_dispose): guard
-	against multiple invocations.
-
-	* backend/ebook/e-card.c (e_card_dispose): same.
-
-	* backend/ebook/e-card-simple.c (e_card_simple_dispose): same.
-
-	* backend/ebook/e-card-cursor.c (e_card_cursor_dispose): same.
-
-	* backend/ebook/e-book.c (e_book_dispose): same.
-
-	* backend/ebook/e-book-view-listener.c (e_book_view_listener_dispose): same.
-
-2002-11-08  Chris Toshok  <toshok@ximian.com>
-
-	* gui/widgets/e-addressbook-model.c (free_data): guard against
-	multiple invocations.
-	(remove_book_view): same.
-	(addressbook_dispose): same.
-
-	* gui/widgets/e-addressbook-view.c (e_addressbook_view_dispose):
-	same.
-
-	* gui/widgets/e-minicard-view-widget.c
-	(e_minicard_view_widget_dispose): same.
-
-	* gui/widgets/e-minicard-view.c (e_minicard_view_dispose): same.
-
-	* gui/widgets/e-minicard-widget.c (e_minicard_widget_dispose):
-	same.
-
-2002-11-08  Chris Toshok  <toshok@ximian.com>
-
-	* gui/widgets/e-addressbook-reflow-adapter.c
-	(addressbook_get_property): oops, missed these casts.
-
-	* gui/component/addressbook.c (get_master_list): remove the
-	PENDING_PORT_WORK ifdef, just ported ECategoriesMasterList.
-	(make_suboptions): same.
-
-	* gui/contact-editor/e-contact-editor.c (categories_clicked):
-	same.
-
-2002-11-08  Chris Toshok  <toshok@ximian.com>
-
-	* gui/widgets/test-reflow.c: port work.
-
-	* gui/widgets/test-minicard-view.c: port work.
-
-	* gui/widgets/e-minicard.[ch]: port work.
-	
-	* gui/widgets/e-minicard-widget.c: port work.
-
-	* gui/widgets/e-minicard-view.c: port work.
-
-	* gui/widgets/e-minicard-view-widget.c
-	(e_minicard_view_widget_size_allocate): gtk_->g_ change i missed.
-	(e_minicard_view_widget_reflow): same.
-
-	* gui/widgets/e-minicard-label.c: port work.
-
-	* gui/widgets/e-minicard-control.c (get_prop): gtk_->g_ change i
-	missed.
-
-	* gui/widgets/e-addressbook-view.c (setup_menus): ifdef this
-	PENDING_PORT_WORK for now.
-	(has_email_address_1): gtk_->g_ change i missed.
-	(print): remove the PENDING_PORT_WORK from here, as the print_*
-	symbols now resolve.
-	(delete): gtk_->g_ changes.
-	(new_card): same.
-	(new_list): same.
-	(sources): same.
-	(create_minicard_view): same.
-	(table_double_click): same.
-	(create_table_view): same.
-	(e_contact_print_destroy): same.
-	(e_contact_print_button): same.
-	(e_addressbook_view_print): same, and remove the PENDING_PORT_WORK
-	ifdef.
-	(e_addressbook_view_print_preview): same.
-	(do_remove): gtk_->g_ changes.
-	(e_addressbook_view_save_state): same.
-	(view_transfer_cards): same.
-
-	* gui/widgets/e-addressbook-view.h (struct _EAddressbookView):
-	GtkObject -> GObject.
-
-	* gui/widgets/e-addressbook-util.c (e_addressbook_error_dialog):
-	GnomeDialog -> GtkDialog.
-
-	* gui/widgets/e-addressbook-table-adapter.c
-	(addressbook_set_value_at): a gtk_->g_ change i missed.
-	(e_addressbook_table_adapter_class_init): gtk_type_class ->
-	g_type_class_peek_parent.
-
-	* gui/widgets/e-addressbook-reflow-adapter.c
-	(addressbook_get_property): use g_object_get_property for
-	aggregated properties.
-	(e_addressbook_reflow_adapter_class_init): gtk_type_class ->
-	g_type_class_peek_parent.
-
-	* gui/merging/e-card-merging.c (match_query_callback): some misc
-	gtk_->g_ changes i missed.
-
-2002-11-08  Chris Toshok  <toshok@ximian.com>
-
-	* gui/component/select-names/e-select-names-model.h: parent class
-	is GObjectClass.
-
-	* gui/component/select-names/e-simple-card-bonobo.c
-	(impl_dispose): guard against multiple invocations, and chain
-	dispose.
-
-	* gui/component/select-names/e-select-names.c
-	(e_select_names_dispose): guard against multiple invocations.
-
-	* gui/component/select-names/e-select-names-text-model.c
-	(e_select_names_text_model_dispose): guard against multiple
-	invocations.
-	(e_select_names_text_model_set_source): fix casts.
-
-	* gui/component/select-names/e-select-names-table-model.c
-	(e_select_names_table_model_add_source): remove the GTK_OBJECT
-	cast, fixes a warning.
-	(clear_info): guard against multiple invocations from ::dispose.
-
-	* gui/component/select-names/e-select-names-manager.c
-	(e_select_names_manager_dispose): same.
-
-	* gui/component/select-names/e-select-names-completion.c
-	(e_select_names_completion_dispose): same.
-
-	* gui/component/select-names/e-select-names-bonobo.c
-	(impl_dispose): guard against multiple invocations.
-
-2002-11-08  Chris Toshok  <toshok@ximian.com>
-
-	* gui/contact-list-editor/contact-list-editor.glade: convert to glade-2
-
-	* gui/contact-list-editor/e-contact-list-editor.c: port work.
-	
-	* gui/contact-list-editor/e-contact-list-model.[ch]: port work.
-
-2002-11-08  Chris Toshok  <toshok@ximian.com>
-
-	* gui/contact-editor/e-contact-editor-address.[ch]: port work.
-
-	* gui/contact-editor/e-contact-editor-fullname.[ch]: port work.
-
-	* gui/contact-editor/e-contact-editor.[ch]: port work.
-
-	* gui/contact-editor/e-contact-quick-add.c: port work.
-
-	* gui/contact-editor/e-contact-save-as.c: port work.
-
-2002-11-08  Chris Toshok  <toshok@ximian.com>
-
-	* backend/ebook/e-book-util.c
-	(set_default_book_uri_from_config_db): prepend /apps/Evolution to
-	config db paths.
-	
-	* gui/component/select-names/e-select-names-manager.c (read_completion_books_from_db): same.
-	(uris_listener): same.
-
-2002-11-08  Chris Toshok  <toshok@ximian.com>
-
-	* gui/contact-editor/e-contact-editor.c: more porting work.
-
-	* e-contact-editor-fullname.[ch]: more porting work.
-
-	* e-contact-editor.c: more porting work.
-
-	* e-contact-quick-add.c: more porting work.
-
-	* e-contact-save-as.c: more porting work.
-
-	* test-editor.c: more porting work.
-	
-	* e-contact-editor-confirm-delete.glade, file-exists.glade,
-	fulladdr.glade, fullname.glade: run these through
-	libglade-convert.
-
-2002-11-07  Chris Toshok  <toshok@ximian.com>
-
-	* gui/component/Makefile.am (evolution_addressbook_LDADD): add
-	lots of libs back in since they're building now.
-
-	* gui/component/addressbook-config.c: more porting work.
-
-	* gui/component/addressbook.c: more porting work.
-
-	* gui/component/e-address-popup.[ch]: more porting work.
-	
-	* gui/component/e-address-widget.[ch]: more porting work.
-	
-	* gui/component/e-cardlist-model.[ch]: more porting work.
-	
-2002-11-07  Chris Toshok  <toshok@ximian.com>
-
-	* gui/component/select-names/e-select-names-bonobo.[ch]: more
-	porting work.
-
-	* gui/component/select-names/e-select-names-completion.[ch]: more
-	porting work.
-
-	* gui/component/select-names/e-select-names-manager.[ch]: more
-	porting work.
-	
-	* gui/component/select-names/e-select-names-model.[ch]: more
-	porting work.
-	
-	* gui/component/select-names/e-select-names-popup.c: more
-	porting work.
-	
-	* gui/component/select-names/e-select-names-table-model.[ch]: more
-	porting work.
-	
-	* gui/component/select-names/e-select-names-text-model.[ch]: more
-	porting work.
-	
-	* gui/component/select-names/e-select-names.[ch]: more
-	porting work.
-	
-2002-11-07  Chris Toshok  <toshok@ximian.com>
-
-	* backend/ebook/Makefile.am: tests are linking now, and link in
-	libcamel.la.
-
-	* backend/ebook/e-destination.c (e_destination_get_name): un-ifdef
-	since camel is compiling.
-	(e_destination_get_email): same.
-	(e_destination_get_address): same.
-	(e_destination_get_textrep): same.
-
-	* backend/ebook/e-card-compare.c (name_fragment_match): use e_utf8_casefold_*.
-	(name_fragment_match_with_synonyms): same.
-	(e_card_compare_name_to_string_full): same.
-	(e_card_compare_name): same.
-
-2002-11-07  Chris Toshok  <toshok@ximian.com>
-
-	* backend/ebook/e-book-util.h: add prototypes for e_utf8_casefold_collate{_len}
-
-	* backend/ebook/e-book-util.c (e_utf8_casefold_collate_len): move
-	utf8_casefold_collate_len here.
-	(e_utf8_casefold_collate): move utf8_casefold_collate here.
-
-2002-11-06  Chris Toshok  <toshok@ximian.com>
-
-	* printing/e-contact-print-envelope.c: port this to
-	gnome2/gnomeprint2.
-
-	* printing/e-contact-print-style-editor.c: same.
-
-	* printing/e-contact-print.c: same.
-
-	* printing/test-contact-print-style-editor.c: same.
-
-	* printing/test-print.c: same.
-
-	* printing/e-contact-print.glade: libglade-convert to libglade-2.
-	
-	* printing/Makefile.am (contact_print_test_LDADD)
-	(contact_print_style_editor_test_LDADD): remove libcamel.la from
-	these for the time being to get things linking.
-
-2002-11-06  Chris Toshok  <toshok@ximian.com>
-
-	* gui/widgets/gal-view-minicard.[ch]: gobjectify this.
-
-	* gui/widgets/e-minicard.[ch]: gobjectify this.
-	(e_minicard_class_init): change the
-	min/max values of the width/height paramspecs so that they can
-	actually be set to something other than 0.0.
-
-	* gui/widgets/e-minicard-widget.[ch]: gobjectify this.
-
-	* gui/widgets/e-minicard-view.[ch]: gobjectify this.
-	(set_empty_message): don't need e_utf8_from_locale_string anymore.
-
-	* gui/widgets/e-minicard-view-widget.[ch]: gobjectify this.
-
-	* gui/widgets/e-minicard-label.[ch]: gobjectify this.
-
-	* gui/widgets/e-addressbook-view.[ch]: gobjectify this.
-
-	* gui/widgets/e-addressbook-table-adapter.[ch]: gobjectify this.
-
-	* gui/widgets/e-addressbook-reflow-adapter.[ch]: gobjectify this.
-
-	* gui/widgets/e-addressbook-model.[ch]: gobjectify this.
-
-	* gui/widgets/e-minicard-control.c (e_minicard_control_factory):
-	fix bonobo_persist_stream_new api change.
-
-	* gui/contact-list-editor/e-contact-list-model.c
-	(e_contact_list_model_add_destination): get rid of the
-	gtk_object_sink here.
-
-	* gui/component/ldap-config.glade: glade-2 version of this file.
-	
-	* gui/component/e-address-popup.c (e_address_popup_refresh_names):
-	don't need e_utf8_to_gtk_string anymore.
-
-	* gui/component/addressbook.c (make_suboptions): don't need
-	e_utf8_to_locale_string anymore.
-
-	* gui/component/addressbook-config.c
-	(addressbook_dialog_get_source): get rid of the e_utf8 gtk_entry
-	functions.
-	(addressbook_source_dialog_set_source): same.
-	(general_tab_check): same.
-	(port_changed_func): same.
-	(connecting_tab_check): same.
-	(query_for_supported_bases): same.
-	(display_name_check): same.
-	(display_name_page_prepare): same.
-	(edit_source_clicked): same.
-	(addressbook_config_create_new_source): same.
-
-2002-11-06  Chris Toshok  <toshok@ximian.com>
-
-	* backend/pas/pas-backend-card-sexp.c
-	(pas_backend_card_sexp_class_init): use g_type_class_peek_parent.
-
-	* backend/pas/pas-card-cursor.c (pas_card_cursor_class_init): same.
-
-	* backend/pas/pas-book-view.c (pas_book_view_class_init): same.
-
-	* backend/pas/pas-book-factory.c (pas_book_factory_class_init): same.
-
-	* backend/pas/pas-backend-summary.c (pas_backend_summary_class_init): same.
-
-	* backend/pas/pas-backend-ldap.c (pas_backend_ldap_class_init): same.
-
-	* backend/pas/pas-backend-file.c (pas_backend_file_class_init): same.
-
-	* backend/ebook/e-book-marshal.list: ENUM -> INT.
-
-	* backend/ebook/e-book-view.c (e_book_view_dispose): guard against
-	this being called multiple times.
-	(e_book_view_class_init): ENUM -> INT in the sequence_complete
-	signal.
-	
-	* backend/ebook/e-book.c (e_book_do_response_open): un-ifdef the
-	component_died signal stuff.
-
-2002-11-06  Chris Toshok  <toshok@ximian.com>
-
-	* backend/ebook/e-book-util.c (e_book_expand_uri): call
-	g_build_filename, not g_build_path.
-
-2002-11-06  Chris Toshok  <toshok@ximian.com>
-
-	* backend/ebook/e-destination.[ch]: fix the gnome-xml headers.
-
-2002-11-06  Chris Toshok  <toshok@ximian.com>
-
-	* gui/widgets/gal-view-minicard.c: fix the gnome-xml headers.
-
-	* gui/widgets/e-addressbook-view.c
-	(e_addressbook_view_class_init): convert from gtk signals and args
-	to GSignal and GObject properties.
-	(e_addressbook_view_dispose): rename _destroy to this.
-	(e_addressbook_view_set_property): rework _set_arg to this.
-	(e_addressbook_view_get_property): rework _get_arg to this.
-	(display_view): if we're here we need to choose a view, regardless
-	of whether or not the GAL_IS_VIEW_* macros tell us which type it
-	is.
-
-	* gui/widgets/e-addressbook-table-adapter.c: fix the gnome-xml
-	headers.
-
-	* gui/widgets/e-addressbook-model.c
-	(e_addressbook_model_class_init): use INT, not ENUM in the signal here.
-
-	* gui/component/addressbook-config.c: another big gtk_* -> g_*
-	renaming.
-	
-	* gui/component/addressbook.c: same.
-
-	* gui/component/e-address-popup.c: same.
-
-	* gui/component/e-address-widget.c: same.
-	
-	* gui/component/e-cardlist-model.c: fix the gnome-xml headers, and
-	more gtk_* -> g_* renaming.
-	
-	* gui/component/addressbook-component.c (owner_set_cb): use
-	evolution_shell_client_corba_objref as per ettore's change to
-	EvolutionShellClient..
-	(create_view): fix the call to bonobo_control_set_property.
-	(create_component): gtk_signal_connect -> g_signal_connect.
-
-	* gui/component/addressbook-storage.c: fix the gnome-xml
-	headers.
-	(addressbook_storage_setup): use
-	evolution_shell_client_corba_objref as per ettore's change to
-	EvolutionShellClient..
-	(addressbook_get_other_contact_storage): gtk_signal_connect ->
-	g_signal_connect.
-	(load_source_data): root->childs -> root->childrens.
-
-2002-11-06  Chris Toshok  <toshok@ximian.com>
-
-	* gui/search/e-addressbook-search-dialog.c: fix some #include's.
-
-2002-11-06  Chris Toshok  <toshok@ximian.com>
-
-	* Makefile.am (SUBDIRS): only build the backend and gui dirs for
-	now.  printing and conduits are no-man's land at present.
-
-	* addressbook/gui/merging/e-card-merging.[ch]: Port to
-	GObject/gnome2.
-	
-2002-11-05  Chris Toshok  <toshok@ximian.com>
-
-	* gui/component/.cvsignore: ignore the new .server file.
-	
-	* gui/component/Makefile.am: typical port stuff.  switch the .oaf
-	to .server, and leave out a lot of libs so we can actually get
-	things linking.
-	
-	* gui/component/GNOME_Evolution_Addressbook.server.in: rename
-	.oaf.in here.
-	
-	* gui/component/addressbook-component.c: Port to GObject/gnome2.
-	
-	* gui/component/addressbook-config.c: Port to GObject/gnome2.
-
-	* gui/component/addressbook-factory.c: Port to GObject/gnome2.
-
-	* gui/component/addressbook-storage.c: Port to GObject/gnome2.
-
-	* gui/component/addressbook.[ch]: Port to GObject/gnome2.
-
-	* gui/component/e-address-popup.[ch]: Port to GObject/gnome2.
-
-	* gui/component/e-address-widget.[ch]: Port to GObject/gnome2.
-
-	* gui/component/e-cardlist-model.h: Port to GObject/gnome2.
-	
-2002-11-05  Chris Toshok  <toshok@ximian.com>
-
-	* gui/contact-list-editor/.cvsignore: ignore the marshal generated
-	stuff.
-	
-	* gui/contact-list-editor/Makefile.am: typical port stuff.  add
-	marshaller generation foo, dist it...
-	
-	* gui/contact-list-editor/e-contact-list-editor.[ch]: Port to
-	GObject/gnome2.
-	
-	* gui/contact-list-editor/e-contact-list-model.[ch]: Port to
-	GObject/gnome2.
-
-2002-11-05  Chris Toshok  <toshok@ximian.com>
-
-	* gui/contact-editor/.cvsignore: ignore the marshal generated
-	stuff.
-	
-	* gui/contact-editor/Makefile.am: typical port stuff.  add
-	marshaller generation foo, dist it...
-	
-	* gui/contact-editor/e-contact-editor-address.[ch]: Port to GObject/gnome2.
-	
-	* gui/contact-editor/e-contact-editor-fullname.c: Port to GObject/gnome2.
-	
-	* gui/contact-editor/e-contact-editor.c: Port to GObject/gnome2.
-	
-	* gui/contact-editor/e-contact-quick-add.c: Port to GObject/gnome2.
-	
-	* gui/contact-editor/e-contact-save-as.[ch]: Port to GObject/gnome2.
-	
-	* gui/contact-editor/test-editor.c: Port to GObject/gnome2.
-	
-2002-11-05  Chris Toshok  <toshok@ximian.com>
-
-	* gui/widgets/e-addressbook-model.[ch]: Port to GObject/gnome2.
-
-	* gui/widgets/e-addressbook-reflow-adapter.c: Port to
-	GObject/gnome2.
-
-	* gui/widgets/e-addressbook-table-adapter.c: Port to
-	GObject/gnome2.
-
-	* gui/widgets/e-addressbook-util.c: Port to GObject/gnome2.
-
-	* gui/widgets/e-addressbook-view.[ch]: Port to GObject/gnome2.
-
-	* gui/widgets/e-minicard-control.c: Port to GObject/gnome2.
-
-	* gui/widgets/e-minicard-label.[ch]: Port to GObject/gnome2.
-
-	* gui/widgets/e-minicard-view-widget.[ch]: Port to GObject/gnome2.
-
-	* gui/widgets/e-minicard-view.[ch]: Port to GObject/gnome2.
-
-	* gui/widgets/e-minicard-widget-test.c: Port to GObject/gnome2.
-
-	* gui/widgets/e-minicard-widget.c: Port to GObject/gnome2.
-
-	* gui/widgets/e-minicard.[ch]: Port to GObject/gnome2.
-
-	* gui/widgets/gal-view-factory-minicard.c: Port to GObject/gnome2.
-
-	* gui/widgets/gal-view-minicard.c: Port to GObject/gnome2.
-	
-	* gui/widgets/test-minicard-label.c: Port to GObject/gnome2.
-	
-	* gui/widgets/test-minicard-view.c: Port to GObject/gnome2.
-	
-	* gui/widgets/test-minicard.c: Port to GObject/gnome2.
-	
-	* gui/widgets/test-reflow.c: Port to GObject/gnome2.
-	
-	* gui/widgets/Makefile.am: typical port stuff.  add marshaller
-	generation foo, dist it...
-
-	* gui/widgets/.cvsignore: ignore the marshaller stuff.
-
-2002-11-05  Chris Toshok  <toshok@ximian.com>
-
-	* gui/component/select-names/e-simple-card-bonobo.[ch]: Port to
-	GObject/gnome2.
-	
-	* gui/component/select-names/e-select-names.[ch]: Port to
-	GObject/gnome2.
-	
-	* gui/component/select-names/e-select-names-text-model.c: Port to
-	GObject/gnome2.
-	
-	* gui/component/select-names/e-select-names-table-model.c: Port to
-	GObject/gnome2.
-	
-	* gui/component/select-names/e-select-names-popup.[ch]: Port to
-	GObject/gnome2.
-
-	* gui/component/select-names/e-select-names-model.c: Port to
-	GObject/gnome2.
-
-	* gui/component/select-names/e-select-names-manager.[ch]: Port to
-	GObject/gnome2.
-
-	* gui/component/select-names/e-select-names-factory.c: Port to
-	GObject/gnome2.
-
-	* gui/component/select-names/e-select-names-completion.[ch]: Port
-	to GObject/gnome2.
-
-	* gui/component/select-names/e-select-names-bonobo.[ch]: Port to
-	GObject/gnome2.
-
-	* gui/component/select-names/Makefile.am: typical port stuff.  add
-	marshaller generation foo, dist it, and switch the .oaf to .server
-
-	* gui/component/select-names/.cvsignore: ignore the marshaller
-	stuff.
-
-2002-11-05  Chris Toshok  <toshok@ximian.com>
-
-	* backend/ebook/.cvsignore: ignore the generated marshaller files.
-
-	* backend/ebook/e-destination.c (e_destination_dispose): rename
-	e_destination_destroy.
-	(e_destination_equal): ifdef this out for now, PENDING_PORT_WORK.
-	(e_destination_get_name): same.
-	(e_destination_get_email): same.
-	(e_destination_get_address): same.
-	(e_destination_get_textrep): same.
-
-	* backend/ebook/Makefile.am: don't build the executables
-	(importers and loaders) for now.  Also, s/oaf/server, and use
-	INTLTOOL_SERVER_RULE.
-
-	* backend/ebook/e-book-util.c (e_book_get_config_database):
-	un-#ifdef this.
-	(e_book_default_book_open): un-#ifdef ths code in here that relies
-	on the e_config_listener.
-
-2002-11-05  Dan Winship  <danw@ximian.com>
-
-	* backend/pas/pas-backend-ldap.c (send_pending_adds): copy a
-	memleak fix from pas-backend-ad.
-
-2002-11-05  Chris Toshok  <toshok@ximian.com>
-
-	* backend/ebook/e-card.c: g_date_* => g_date_get_*, fixes
-	G_DISABLE_DEPRECATED build.
-
-	* backend/ebook/e-book-listener.[ch]: remove the servant crap i'd
-	c&p'ed and put in here.
-
-	* backend/ebook/e-book-view-listener.[ch]: remove the servant crap
-	i'd c&p'ed and put in here.
-	
-	* backend/pas/pas-book-factory.[ch]: subclass from BonoboObject,
-	and remove the servant crap from here too.  whee.
-
-	* backend/pas/pas-card-cursor.[ch]: remove the servant crap i'd
-	c&p'ed and put in here.
-
-	* backend/pas/pas-book.[ch]: remove the servant crap i'd c&p'ed
-	and put in here.
-
-	* backend/pas/pas-book-view.[ch]: remove the servant crap i'd
-	c&p'ed and put in here.
-
-2002-11-05  Chris Toshok  <toshok@ximian.com>
-
-	* backend/pas/pas-backend-card-sexp.[ch]: port to gnome 2.
-
-	* backend/pas/pas-backend-file.[ch]: same.
-
-	* backend/pas/pas-backend-file.[ch]: same.
-
-	* backend/pas/pas-backend-ldap.[ch]: same.
-
-	* backend/pas/pas-backend-summary.[ch]: same.
-
-	* backend/pas/pas-backend.[ch]: same.
-
-	* backend/pas/pas-book-factory.[ch]: same.
-
-	* backend/pas/pas-book-view.[ch]: same.
-
-	* backend/pas/pas-book.[ch]: same.
-
-	* backend/pas/pas-card-cursor.[ch]: same.
-
-	* backend/pas/pas-marshal.list: list of marshallers.
-
-	* backend/pas/Makefile.am (libpas_a_SOURCES): add pas-marshal.c
-	also add the marshal building foo.
-
-	* backend/pas/.cvsignore: ignore pas-marshal.[ch]
-	
-2002-11-05  Chris Toshok  <toshok@ximian.com>
-
-	* backend/ebook/test-client-list.c (main): don't call
-	bonobo_activation_init directly.
-
-	* backend/ebook/test-client.c (get_card_cb): don't unref the card
-	here since we never reffed it.
-	(main): no need to call bonobo_activation_init, as
-	gnome_program_init did it for us.
-
-	* backend/ebook/e-card-simple.c (e_card_simple_get_property):
-	s/g_value_{set,get}_pointer/g_value_{set,get}_object
-
-	* backend/ebook/e-book-util.c (set_default_book_uri_local): make
-	sure to terminate args with NULL for g_build_filename.
-
-	* backend/ebook/e-book-listener.c: nuke e_book_listener_get_type
-	and use the BONOBO_TYPE_FUNC_FULL macro.
-
-	* backend/ebook/e-book-listener.h: add the epv to
-	EBookListenerClass so BONOBO_TYPE_FUNC_FULL works.
-
-	* backend/ebook/e-book-view-listener.c: nuke
-	e_book_view_listener_get_type and use the BONOBO_TYPE_FUNC_FULL
-	macro.
-
-	* backend/ebook/e-book-view-listener.h: add the epv to
-	EBookViewListenerClass so BONOBO_TYPE_FUNC_FULL works.
-
-2002-11-02  Chris Toshok  <toshok@ximian.com>
-
-	* backend/ebook/e-book-types.h: just include glib.h instead of the
-	gtk stuff.
-
-	* backend/ebook/e-book-listener.[ch]: convert to
-	GObject/bonobo-activation/etc/etc.
-	* e-book-util.[ch]: same.
-	* e-book-view-listener.[ch]: same.
-	* e-book-view.[ch]: same.
-	* e-book.[ch]: same.
-	* e-card-compare.[ch]: same.
-	* e-card-cursor.[ch]: same.
-	* e-card-simple.[ch]: same.
-	* e-card.[ch]: same.
-	* e-destination.[ch]: same.
-	* evolution-ldif-importer.c: same.
-	* evolution-vcard-importer.c: same.
-	* load-gnomecard-addressbook.c: same.
-	* load-pine-addressbok.c: same.
-	* test-card.c: same.
-	* test-client-list.c: same.
-	* test-client.c: same.
-
-	* backend/ebook/Makefile.am: add e-book-marshal.c to SOURCES, add
-	e-book-marshal.[ch] to CLEANFILES, and add e-book-marshal.list to
-	EXTRA_DIST.  Also, remove the camel libs from the test LDADD's,
-	and leave e-destination.[ch] out of the build.
-
-	* backend/ebook/.cvsignore: ignore e-book-marshal.[ch]
-
-	* backend/ebook/e-book-marshal.list: marshallers for e-book.
-
-2002-10-28  Larry Ewing  <lewing@ximian.com>
-
-	* backend/ebook/e-card.c (addPropValueUTF8): never set the charset
-	on an item without also encoding it.  Mime messages don't like
-	parts with multiple charsets. 	
-
-2002-10-25  Dan Winship  <danw@ximian.com>
-
-	* gui/widgets/e-addressbook-model.c (addressbook_destroy):
-	Disconnect from the book's backend_died signal.
-
-2002-10-24  Chris Toshok  <toshok@ximian.com>
-
-       * backend/pas/Makefile.am: install evolutionperson.schema to
-       $(datadir)/evolution.
-
-2002-10-24  Chris Toshok  <toshok@ximian.com>
-
-	[ fixes #29144 ]
-	* gui/component/addressbook-config.c (edit_dialog_store_change):
-	use e_table_memory_storage_change instead of remove/insert, so the
-	selection is maintained.
-
-2002-10-22  Dan Winship  <danw@ximian.com>
-
-	* gui/component/select-names/e-select-names.c
-	(folder_selected): Set /Addressbook/select_names_uri in the
-	configdb to the selected folder.
-	(e_select_names_init): Look for /Addressbook/select_names_uri
-	before /DefaultFolders/contacts_uri for the initial folder. So the
-	select names dialog now starts up using the same folder you used
-	last time, which is useful when you have an LDAP company directory
-	(which can't be your default contacts folder because it's
-	read-only).
-
-2002-10-21  Dan Winship  <danw@ximian.com>
-
-	* gui/component/addressbook-component.c (IS_CONTACT_TYPE): fix the
-	sense of a strcmp
-
-2002-10-20  Chris Toshok  <toshok@ximian.com>
-
-	[ fix for #23764 ]
-	* gui/widgets/e-addressbook-view.c (jump_to_letters): handle
-	multiple letters associated with a single button.
-	(button_toggled): closure->letter -> closure->letters.
-	(free_closure): free closure->letters.
-	(create_alphabet): init closure->letters.
-
-2002-10-20  Chris Toshok  <toshok@ximian.com>
-
-	[ fixes #29067 ] 
-	* backend/pas/pas-backend-file.c (pas_backend_file_search): we
-	need to create a card_sexp even when doing summary queries since
-	it's used to check modifications of cards in the view.
-
-2002-10-20  Chris Toshok  <toshok@ximian.com>
-
-       [ fixes #32144 ]
-	* gui/contact-editor/e-contact-save-as.c (e_contact_save_as):
-	convert the name to the gtk locale before saving.
-	(e_contact_list_save_as): same.
-	
-2002-10-19  Chris Toshok  <toshok@ximian.com>
-
-	[ probable fix for #25477, and memory leak fix ]
-	* gui/contact-editor/e-contact-editor.c (supported_fields_cb): if
-	the dialog isn't in the list of all dialogs it's been destroyed so
-	just return here.
-
-	* backend/ebook/e-book.c
-	(e_book_do_response_get_supported_fields): plug leak of
-	resp->fields.
-
-2002-10-15  Dan Winship  <danw@ximian.com>
-
-	* backend/ebook/e-card.c (e_card_email_match_string): Return right
-	away rather than crashing if card->email is NULL.
-	(e_card_email_find_number): Likewise.
-
-2002-10-10  Kjartan Maraas  <kmaraas@gnome.org>
-
-	[�Fix #7094, #7064, #7095, #31944, #31945 ]
-	* gui/component/Makefile.am: Hook up new etspec file.
-	* gui/component/addressbook-config.c: Remove ETable spec.
-	* gui/component/addressbook-config.etspec: New file.
-	* gui/component/ldap-config.glade: Fix typo.
-	* gui/component/select-names/e-select-names.c: Remove inline spec.
-	* gui/component/select-names/e-select-names.etspec: New file.
-	* gui/contact-list-editor/Makefile.am: Hook up etspec.
-	* gui/contact-list-editor/e-contact-list-editor.c: Remove inline spec.
-	* gui/contact-list-editor/e-contact-list-editor.etspec: New file.
-	* gui/widgets/Makefile.am: Hook up new spec.
-	* gui/widgets/e-addressbook-view.c: Remove inline spec.
-	* gui/widgets/e-addressbook-view.etspec: New file.
-
-2002-10-02  Chris Toshok  <toshok@ximian.com>
-
-	[ Fix #28392 ]
-	* gui/widgets/e-addressbook-view.c (do_popup_menu): #if 0 out the
-	gal_view submenu, since it's not spec'ed to be there anyway (as
-	per bug #16250).
-
-2002-09-30  Chris Toshok  <toshok@ximian.com>
-
-	[ Fixes #31321 ]
-	* backend/ebook/e-card.c (e_card_get_vobject): add VERSION:2.1 to
-	exported vCards.
-
-2002-09-30  Chris Toshok  <toshok@ximian.com>
-
-	[ Fixes #31434 ]
-	* backend/pas/pas-backend-file.c (do_summary_query): always
-	retrieve the card from the db.  use the summary strictly for
-	matching, not for storing all information.  This fixes completion
-	of contact lists, since only 3 addresses were being stored and
-	contact lists can have more.
-
-2002-09-30  Aaron Weber  <aaron@ximian.com>
-
-	* gui/widgets/e-addressbook-util.c (e_addressbook_show_multiple_cards): rephrase string on l. 213
-	
-2002-09-30  Dan Winship  <danw@ximian.com>
-
-	* backend/ebook/e-card.c (e_card_list_send): update for
-	Composer_setHeaders change.
-
-2002-09-27  Chris Toshok  <toshok@ximian.com>
-
-	[ fixes #27521 ]
-	* gui/contact-editor/e-contact-quick-add.c (editor_closed_cb):
-	always unref the contact editor when we get the editor_closed
-	signal.
-
-2002-09-27  Chris Toshok  <toshok@ximian.com>
-
-	* backend/pas/pas-backend-ldap.c (check_schema_support): set the
-	timeout to 30 seconds.
-	(query_ldap_root_dse): same, and also return the ldap_error since
-	this function is the one that actually causes openldap to
-	connect() to the ldap host.
-	(pas_backend_ldap_connect): check the return value of
-	query_ldap_root_dse, and error out if it's not SUCCESS.
-
-2002-09-26  Dan Winship  <danw@ximian.com>
-
-	* gui/component/addressbook-storage.c (load_source_data): Change
-	folder type to "contacts/ldap".
-	(addressbook_storage_add_source): Likewise.
-	(create_ldap_folder): Check for type being "contacts" not
-	ldap contacts, since the ldap-specific type doesn't appear in the
-	menu.
-
-2002-09-25  Dan Winship  <danw@ximian.com>
-
-	* gui/component/addressbook-component.c (folder_types): Rename
-	"ldap-contacts" to "contacts/ldap" and add "contacts/public".
-	(IS_CONTACT_TYPE): update for new types.
-
-	* gui/component/select-names/e-select-names.c
-	(e_select_names_init): Use "contacts/*" for selector_types.
-
-	* gui/widgets/e-addressbook-util.c (e_addressbook_transfer_cards):
-	Likewise.
-
-	* gui/component/GNOME_Evolution_Addressbook.oaf.in: add
-	"evolution:config_item:type" = "contacts/ldap" to the LDAP sources
-	control so it comes up by default when you open Preferences in an
-	LDAP folder.
-
-2002-09-23  Chris Toshok  <toshok@ximian.com>
-
-	* gui/widgets/e-addressbook-table-adapter.c (addressbook_destroy):
-	free adapter->priv.
-
-	* gui/widgets/e-addressbook-model.c (addressbook_destroy): free
-	model->query.
-
-	* gui/component/select-names/e-select-names-manager.c
-	(load_completion_books): use e_book_expand_uri here, and free the
-	expanded uri after calling addressbook_load_uri, plugging a leak.
-
-	* gui/component/select-names/e-select-names.c (set_book): unref
-	esn->model before we unref esn.  fixes an edge case memory
-	corruption bug.
-	(clear_widget): utility function to set a widget's ref to NULL
-	when it's destroyed.
-	(e_select_names_init): hook the status_message, categories option
-	menu, and select_entry to clear_widget.
-	(addressbook_model_set_uri): use e_book_expand_uri.
-
-2002-09-23  JP Rosevear  <jpr@ximian.com>
-
-	* conduit/Makefile.am: add libeutil to the link and link with
-	libcamel instead of libcamel-static.la
-
-2002-09-22  Chris Toshok  <toshok@ximian.com>
-
-	* gui/component/select-names/e-select-names-manager.h: oops, add
-	cached_folder_list to struct _ESelectNamesManager.
-
-2002-09-22  Chris Toshok  <toshok@ximian.com>
-
-	[ Fixes #30481 ] 
-	* gui/component/select-names/e-select-names.c
-	(e_select_names_init): initialize the select names dialog with the
-	default contacts folder.
-
-2002-09-22  Chris Toshok  <toshok@ximian.com>
-
-	[ Fixes #28165, 29171 ]
-	* gui/component/select-names/e-select-names-manager.c
-	(uris_listener): check to see if the value has really changed.
-	the way the preferences dialog works is such that we'll get called
-	when any of the Folder Options are changed (default folders,
-	offline stuff, etc.)  we really only want to tear down and build
-	back up the completion books if the autocomplete folder setting
-	changed.
-	(read_completion_books_from_db): cache the folder list, and call
-	load_completion_books.
-	(load_completion_books): new function, loads from the
-	cached_folder_list.
-	(e_select_names_manager_init): init cached_folder_list to NULL.
-	(e_select_names_manager_destroy): g_free (cached_folder_list).
-
-2002-09-20  Chris Toshok  <toshok@ximian.com>
-
-	[ Fixes #30483 ]
-	* gui/component/select-names/e-select-names-completion.c
-	(name_style_query): argh, contains => beginswith.
-
-2002-09-17  Chris Toshok  <toshok@ximian.com>
-
-	* gui/component/addressbook-component.c (add_creatable_item):
-	don't add the user creatable item for ldap-contact folders atm,
-	since it results in their being duplicate New Contact and New
-	Contact List menu items.
-
-2002-09-17  Kjartan Maraas  <kmaraas@gnome.org>
-
-	* gui/component/ldap-config.glade: Fix a typo.
-	
-2002-09-13  Chris Toshok  <toshok@ximian.com>
-
-	[ Fixes bug #30250 ]
-	* backend/ebook/e-destination.c (e_destination_get_name): handle
-	"Unnamed Lists" here by setting their name to _("Unnamed List').
-
-	* backend/ebook/e-card-simple.c (e_card_simple_get): same.
-
-	* gui/contact-list-editor/e-contact-list-editor.c (is_named): new
-	function, return TRUE if the name field is filled in.
-	(prompt_to_save_changes): return TRUE if the list isn't named
-	(meaning it's not saveable.)
-	(command_state_changed): saving requires a name.
-	(add_email_cb): always call command_state_changed.
-	(remove_entry_cb): same.
-	(list_name_changed_cb): same.
-	(visible_addrs_toggled_cb): same.
-	(table_drag_data_received_cb): same.
-
-2002-09-12  Dan Winship  <danw@ximian.com>
-
-	* backend/ebook/e-card-simple.c (e_card_simple_get): return
-	g_strdup("true"), not "true".
-
-2002-09-11  Chris Toshok  <toshok@ximian.com>
-
-	* gui/component/select-names/e-select-names-completion.c
-	(e_select_names_completion_start_query): institute an arbitrary
-	minimum limit on the number of characters before we actually try
-	to autocomplete.  It's 3, btw.
-
-2002-09-11  Chris Toshok  <toshok@ximian.com>
-
-	[ fixes the other half of #17336 ]
-	* gui/contact-editor/e-contact-quick-add.c (quick_add_set_name):
-	parse the name when we're asked to set it, so the full name
-	doesn't get stored as (potentially) "Last, First" in the card.
-
-2002-09-11  Chris Toshok  <toshok@ximian.com>
-
-	[ fixes part of #17336 ]
-	* gui/contact-editor/e-contact-editor-fullname.c
-	(e_contact_editor_fullname_init): get the window title from the
-	.glade file, and supply a suitable wm icon.
-
-	* gui/contact-editor/e-contact-editor-address.c
-	(e_contact_editor_address_init): same.
-
-2002-09-11  Chris Toshok  <toshok@ximian.com>
-
-	[ fixes #30208 ]
-	* gui/component/addressbook.c (load_uri_auth_cb): if the user
-	clicked cancel in the password dialog, let them off the hook and
-	bind anonymously.  Otherwise (if they failed to auth), prompt them
-	for the password again.
-	(addressbook_authenticate): new function, split out 99% of the
-	auth machinery here so it can be called multiple times.  Also,
-	call the callback with E_BOOK_STATUS_CANCELLED if the user clicked
-	the cancel button in the dialog.
-	(load_uri_cb): call addressbook_authenticate if the book has auth
-	enabled.
-	(addressbook_load_uri): use g_new0.
-
-2002-09-05  Anna Dirks  <anna@ximian.com>
-	* gui/component/GNOME_Evolution_Addressbook.oaf.in : Changed the 
-	description of the Directory Servers page of the settings dialog 
-	to be a little less wordy {This page can be used to configure blah--> 
-	Configure blah.}
-
-
-2002-09-04  Chris Toshok  <toshok@ximian.com>
-
-	[ Fixes #29904 ]
-	* gui/component/select-names/e-select-names-text-model.c
-	(e_select_names_text_model_activate_obj): we need to activate
-	either a contact list editor or contact editor depending on if
-	it's a list (this screams for a utility function.)
-
-2002-09-04  Dan Winship  <danw@ximian.com>
-
-	* gui/component/addressbook-storage.c
-	(addressbook_get_other_contact_storage): Pass FALSE to
-	evolution_storage_new: the Other Contacts storage doesn't support
-	shared folders.
-
-2002-09-04  Ettore Perazzoli  <ettore@ximian.com>
-
-	* gui/component/addressbook-component.c (create_component): Pass
-	NULL as @unpopulate_folder_context_menu_fn to
-	evolution_shell_component_new().
-
-2002-09-03  Mike Kestner  <mkestner@ximian.com>
-
-	* gui/component/select-names/e-select-names.c (e_select_names_destroy):
-	unref the "without", adapter, and model, then chain up the GnomeDialog
-	destroy function.
-
-2002-09-03  Ettore Perazzoli  <ettore@ximian.com>
-
-	* gui/component/GNOME_Evolution_Addressbook.oaf.in: Use
-	ldap-settings.png instead of evolution-contacts.png.
-
-2002-09-03  Chris Toshok  <toshok@ximian.com>
-
-	[ fixes #29699 ]
-	* gui/component/addressbook-config.c
-	(addressbook_add_server_druid): call _set_source with a NULL
-	source to fill in dialog settings that are set from the option
-	menus (like the SSL setting).
-
-2002-09-03  Ettore Perazzoli  <ettore@ximian.com>
-
-	* gui/component/addressbook.c (delete_contact_cb): Fix typo
-	[`view>view' instead of `view->view'].  Also, cast to
-	GTK_WINDOW instead of GTK_WIDGET as it should be.
-
-2002-08-30  Dan Winship  <danw@ximian.com>
-
-	* backend/idl/addressbook.idl (CallStatus): add QueryRefused, for
-	when the backend refuses to perform a query. (part of #25782)
-
-	* backend/ebook/e-book-view-listener.c
-	(e_book_view_listener_convert_status): translate
-	GNOME_Evolution_Addressbook_BookViewListener_QueryRefused.
-
-	* gui/component/addressbook.c (search_result): Handle
-	E_BOOK_VIEW_STATUS_QUERY_REFUSED.
-
-2002-08-30  Chris Toshok  <toshok@ximian.com>
-
-	[ fixes #27923]
-	* backend/pas/pas-backend-summary.c: up the version to 4_0 (4000).
-	(pas_backend_summary_load_item): handle wants_html{_set}, list,
-	and list_show_addresses.
-	(pas_backend_summary_save_item): same.
-	(pas_backend_summary_add_card): same.
-	(pas_backend_summary_get_summary_vcard): same.
-
-2002-08-29  Chris Toshok  <toshok@ximian.com>
-
-	* gui/component/addressbook-component.c (add_creatable_item): call
-	evolution_shell_component_add_user_creatable_item twice here, once
-	for the "contacts" folder type, and once for "ldap-contacts".
-
-2002-08-29  Chris Toshok  <toshok@ximian.com>
-
-	[ fixes #20347 ]
-	* gui/widgets/e-addressbook-view.c (e_addressbook_view_init): hook
-	up the backend_died signal.
-	(backend_died): new function, pop up an error dialog saying the
-	backend died.
-
-	* gui/widgets/e-addressbook-model.c (backend_died): new function,
-	emit the backend_died signal.
-	(e_addressbook_model_class_init): create the backend_died signal.
-	(e_addressbook_model_init): init backend_died_id
-	(e_addressbook_model_set_arg): disconnect the backend_died signal
-	from the old book and hook it up to the new book.
-
-	* gui/widgets/e-addressbook-model.h: add the backend_died signal.
-
-	* backend/ebook/e-book.c (backend_died_cb): new function, emit the
-	backend_died signal.
-	(e_book_do_response_open): create the component listener and hook
-	up the backend_died signal.
-	(e_book_destroy): disconnect the component listener and unref it.
-
-	* backend/ebook/e-book.h: add backend_died signal.
-
-2002-08-29  Chris Toshok  <toshok@ximian.com>
-
-	* backend/pas/pas-backend-card-sexp.c (is_helper): use strcasecmp
-	here, since all the other helpers use case insensitive
-	comparisons.
-
-	* backend/pas/pas-backend-summary.c (is_helper): same.
-
-2002-08-29  Chris Toshok  <toshok@ximian.com>
-
-	* backend/pas/pas-backend-ldap.c (category_ber): return NULL if
-	the list is empty.
-	(pas_backend_ldap_connect): always try to use ldapv3, not just
-	when we want to use tls.
-
-2002-08-29  Chris Toshok  <toshok@ximian.com>
-
-	[ fixes #25038 ]
-	* gui/contact-editor/Makefile.am (INCLUDES): need to have
-	EVOLUTION_ICONSDIR defined.
-
-	* gui/contact-list-editor/Makefile.am (INCLUDES): same.
-
-	* gui/contact-editor/e-contact-editor.c (e_contact_editor_init):
-	set the window icon to the contact mini icon.
-
-	* gui/contact-list-editor/e-contact-list-editor.c
-	(e_contact_list_editor_init): set the window icon to the new
-	contact list icon.
-	
-	* gui/widgets/e-minicard.c (LIST_ICON_FILENAME): change to (the
-	prettier, imo) "contact-list-16.png"
-
-2002-08-28  Chris Toshok  <toshok@ximian.com>
-
-	* backend/pas/pas-backend-ldap.c (pas_backend_ldap_search): spew
-	the filter we're using for the search.
-
-2002-08-28  Mike Kestner  <mkestner@ximian.com>
-
-	* gui/component/select-names/e-select-names-completion.c : stop the
-	EBookViews before unreffing.
-
-2002-08-28  Dan Winship  <danw@ximian.com>
-
-	* gui/component/GNOME_Evolution_Addressbook.oaf.in: Add an
-	evolution:shell_component_launch_order and rename
-	evolution:shell_component_icon.
-
-2002-08-28  Chris Toshok  <toshok@ximian.com>
-
-	[ oops, merged the .h and .glade file back to the HEAD from the
-	1-0 branch, but missed the .c file. ]
-	* gui/component/select-names/e-select-names.c (status_message): set
-	the status label's text.
-	(e_select_names_init): get the status message widget from the
-	glade ui.
-
-2002-08-28  Chris Toshok  <toshok@ximian.com>
-
-	[ fixes #19286 ]
-	* gui/component/addressbook.c (delete_contact_cb): confirm
-	deletion of contacts when using the menubar or toolbar.
-
-2002-08-28  Chris Toshok  <toshok@ximian.com>
-
-	[ fixes #28897 ]
-	* gui/component/select-names/e-select-names-completion.c
-	(e_select_names_completion_clear_book_data): set book_data to NULL
-	after clearing/freeing the list.  fixes a crash.
-
-2002-08-28  Chris Toshok  <toshok@ximian.com>
-
-	[ fixes #20348 ]
-	* backend/pas/evolutionperson.schema: deprecate "categories" in
-	favor of "category".  evolution no longer uses "categories".
-
-	* backend/pas/pas-backend-ldap.c (category_populate): new
-	function, "category" is the new name, and it's multivalued so we
-	need the complex-prop stuff..
-	(category_ber): new function, same.
-	(category_compare): new function, same.
-
-	* gui/component/addressbook.c (addressbook_search_activated): the
-	text is "Category is" so we should use "is" instead of "contains"
-	for the query.
-
-2002-08-27  Chris Toshok  <toshok@ximian.com>
-
-	[ Fixes #14835 ]
-	* backend/pas/pas-backend-ldap.c (pas_backend_ldap_search):
-	notify_complete with InvalidQuery if the parse fails.
-
-2002-08-27  Chris Toshok  <toshok@ximian.com>
-
-	[ fixes #26907 ]
-	* gui/component/addressbook.c (addressbook_search_activated): use
-	beginswith for email.
-
-2002-08-26  Chris Toshok  <toshok@ximian.com>
-
-	* printing/e-contact-print.c (complete_sequence): change prototype
-	for complete_sequence to match sequence_complete.
-	(e_contact_print_button): same.
-
-2002-08-26  Chris Toshok  <toshok@ximian.com>
-
-	[ fixes #29446 ]
-	* gui/component/addressbook-config.c (scope_optionmenu_activated):
-	searching_modify_func can be NULL (since we don't require changes
-	to enable the "Next" button on this page when you create a
-	directory server.)
-
-2002-08-26  Chris Toshok  <toshok@ximian.com>
-
-	[ Fixes (almost certainly) #24649, #25494, #27351, and other LDAP search crashes ]
-	* backend/pas/pas-backend-ldap.c (view_destroy): use an EList
-	instead of a GList to store the book_view's so we don't have weird
-	issues with modifying the list while it's being traversed.
-	(find_book_view): same.
-	(create_card_handler): same.
-	(remove_card_handler): same.
-	(modify_card_modify_handler): same.
-	(poll_ldap): same, and also ref the book_view before calling
-	ldap_search_op_timeout (and therefore send_pending_adds).
-	(ldap_search_handler): same.
-	(ldap_op_add): warn about conflicting ldap msgid's (shouldn't ever
-	happen..)
-	(homephone_populate): make this a bit more robust (if values[0] ==
-	NULL, values[1] won't be valid).
-	(business_populate): same.
-	(build_card_from_entry): break out of the prop_info loop when we
-	get a match, and only set the simple field if the value != NULL.
-	(ldap_search_dtor): free all the pending adds stuff.
-	(pas_backend_ldap_process_get_book_view): g_list_prepend =>
-	e_list_append.
-	(pas_backend_ldap_remove_client): simplify the removing of the
-	book (use g_list_remove instead of searching and then using
-	g_list_remove_link.)
-	(pas_backend_ldap_destroy): unref the book_views list.
-	(pas_backend_ldap_init): initialize the EList for book_views.
-
-2002-08-25  Mike Kestner  <mkestner@ximian.com>
-
-	* gui/widgets/e-addressbook-view.c (remove_book_view): stop the
-	view before unref, in case the listener has pending events.
-
-2002-08-20  Chris Toshok  <toshok@ximian.com>
-
-	* gui/component/addressbook.c (book_open_cb): not sure what i was
-	thinking here... the EBook isn't valid if we couldn't open it, so
-	we can't turn around and query it for its capabilities.
-
-2002-08-19  Chris Toshok  <toshok@ximian.com>
-
-	* gui/component/select-names/e-select-names-manager.h: add the
-	listener_id slot.
-
-	* gui/component/select-names/e-select-names-manager.c
-	(e_select_names_manager_new): store off the listener_id.
-	(e_select_names_manager_destroy): remove the bonobo listener -
-	fixes a crash when modifying the completion folders after you
-	bring up a compose window.
-	(e_select_names_manager_entry_new): another random timeout change
-	- make the completion at 100ms.
-
-2002-08-19  Chris Toshok  <toshok@ximian.com>
-
-	* backend/pas/pas-book-view.c (pas_book_view_notify_complete):
-	take and pass the CallStatus to our listener.
-
-	* backend/pas/pas-book-view.h: change the prototype for
-	notify_complete to include the CallStatus.
-
-	* gui/component/select-names/e-select-names-completion.c
-	(e_select_names_completion_seq_complete_cb): add the status arg.
-
-	* gui/widgets/e-addressbook-view.c
-	(e_addressbook_view_class_init): init the search_result signal.
-	(e_addressbook_view_init): connect to the model's search_result
-	signal.
-	(emit_search_result): emit our search_result signal.
-	(search_result): call emit_search_result.
-
-	* gui/widgets/e-addressbook-view.h (struct
-	_EAddressbookViewClass): add the search_result signal.
-
-	* gui/widgets/e-addressbook-model.c (sequence_complete): emit both
-	a "search_result" as well as the "stop_state_changed" signal.
-	(e_addressbook_model_class_init): init the search_result signal.
-
-	* gui/widgets/e-addressbook-model.h: add search_result signal.
-
-	* gui/component/addressbook.c (search_result): pop up a dialog
-	telling the user why the search failed or was truncated.
-	(addressbook_factory_new_control): connect to the "search_result"
-	signal on the view.
-
-	* conduit/address-conduit.c (sequence_complete): add the status
-	parameter to sequence_complete.
-
-	* backend/idl/addressbook.idl: add BookViewListener_CallStatus,
-	and change notifySequenceComplete to take a CallStatus.
-
-	* backend/pas/pas-backend-ldap.c (create_card_handler): pass
-	status back in the notify_complete call.
-	(remove_card_handler): same.
-	(modify_card_modify_handler): same
-	(ldap_search_handler): same, and parse out the ldap return code so
-	we can report limits being properly.
-
-	* backend/pas/pas-backend-file.c (do_summary_query): pass status
-	back in the notify_complete call.
-	(pas_backend_file_search): same, and get rid of the
-	status_message, as the status is passed back properly.
-	(pas_backend_file_search): pass status
-	back in the notify_complete call.
-	(pas_backend_file_changes): same.
-	(pas_backend_file_process_create_card): same.
-	(pas_backend_file_process_remove_card): same.
-	(pas_backend_file_process_modify_card): same.
-
-	* backend/ebook/e-book-util.c (simple_query_sequence_complete_cb):
-	add status parameter.
-
-	* backend/ebook/e-book-view-listener.c
-	(e_book_view_listener_queue_status_event): change name from
-	_queue_empty_event, and take a status arg.
-	(e_book_view_listener_queue_id_event): init resp->status (to
-	SUCCESS).
-	(e_book_view_listener_queue_sequence_event): same.
-	(e_book_view_listener_queue_message_event): same.
-	(impl_BookViewListener_notify_sequence_complete): call
-	queue_status_event, and convert the corba status to
-	EBookViewStatus.
-	(e_book_view_listener_convert_status): new function, conver the
-	corba status to EBookViewStatus.
-
-	* backend/ebook/e-book-view-listener.h: add a "status" slot to
-	EBookViewListenerResponse.
-
-	* backend/ebook/e-book-view.h: change prototype for
-	sequence_complete signal.
-
-	* backend/ebook/e-book-view.c (e_book_view_do_complete_event):
-	sequence_complete takes a parameter now (EBookViewStatus).
-	(e_book_view_class_init): add the enum arg to the signal.
-
-	* backend/ebook/e-book-types.h: add EBookViewStatus enum.
-
-2002-08-19  Chris Toshok  <toshok@ximian.com>
-
-	* backend/pas/pas-backend-file.c
-	(pas_backend_file_get_static_capabilities): add
-	"cache-completions" here, since file completion results are
-	blanket cached (as they're generated from a summary).
-
-	* backend/pas/pas-backend-ldap.c
-	(pas_backend_ldap_process_get_cursor): there should be no search
-	limit on the get_cursor_request, as it's meant to match every card
-	it can.
-	(ldap_search_handler): parse the ldap result in the
-	RES_SEARCH_RESULT case.  we'll want more here soon, so we can
-	notify the front end if the result was truncated due to either the
-	size or time limit being exceeded.
-	(pas_backend_ldap_process_get_book_view): in the case of a
-	completion view, we hardcode (yeah yeah, i know, but really) the
-	search limit to MIN (100, user-specified-limit).
-	(pas_backend_ldap_search): each view has its own limit now,
-	defaulting from the user specified one for normal searches but
-	possibly different for completion views.  use the view's limit
-	here.
-
-2002-08-19  Dan Winship  <danw@ximian.com>
-
-	* gui/component/select-names/e-select-names-bonobo.c
-	(entry_get_property_fn): add an "addresses" property, to get the
-	"Dan Winship <danw@ximian.com>" form, as opposed to "text", which
-	gets you what's displayed, which might be just "Dan Winship".
-	(entry_set_property_fn): When setting, just reuse the "text" code,
-	since it should properly cardify everything for us anyway.
-	(impl_SelectNames_get_entry_for_section): Add the property.
-
-2002-08-16  Chris Toshok  <toshok@ximian.com>
-
-	* gui/component/addressbook-config.c
-	(addressbook_source_dialog_set_source): fix c&p error that was
-	losing the ssl setting.
-
-2002-08-16  Iain <iain@ximian.com>
-
-	* backends/e-book/evolution-ldif-importer.c (ebook_create): Use the
-	default EBook instead of the local one.
-
-	* backends/e-book/evolution-vcard-importer.c (ebook_create): Ditto.
-
-2002-08-16  Chris Toshok  <toshok@ximian.com>
-
-	* backend/pas/pas-backend-ldap.c (book_view_notify_status): new
-	function to save a little typing.
-	(find_book_view): same.
-	(pas_backend_ldap_connect): reorder things a bit - set the version
-	to VERSION3 *before* doing TLS, as tls requires v3, and if we're
-	doing ldaps://, do tls a little differently (not sure if this is
-	strictly necessary, but the openldap source did it..  *shrug*).
-	also, guard the schema check as this function can be called
-	multiple times for the same server (if the server goes down or
-	times us out.)
-	(pas_backend_ldap_reconnect): new function, reconnect and if
-	necessary reauth the user.
-	(pas_backend_ldap_process_create_card): use
-	find_book_view/book_view_notify_status/pas_backend_ldap_reconnect.
-	(pas_backend_ldap_process_remove_card): same.
-	(pas_backend_ldap_process_modify_card): same.
-	(pas_backend_ldap_process_get_vcard): same.
-	(pas_backend_ldap_process_get_cursor): same.
-	(pas_backend_ldap_search): same.
-	(poll_ldap): reconnect if ldap_result returns -1.
-	(pas_backend_ldap_process_authenticate_user): ick ick ick save off
-	the dn/passwd we auth with so we can use them to reauthenticate.
-
-2002-08-16  Chris Toshok  <toshok@ximian.com>
-
-	[ fix 27333 ]
-	* gui/widgets/e-addressbook-model.c (get_view): "local" ->
-	"do-initial-query".
-
-	* backend/pas/pas-backend-file.c
-	(pas_backend_file_get_static_capabilities): "local" ->
-	"local,do-initial-query".
-
-	* gui/widgets/e-addressbook-model.c (get_view): "local" ->
-	"do-initial-query".
-
-	* gui/component/addressbook.c (book_open_cb): Only assume the
-	addressbook is local if "local" appears in its static
-	capabilities.  We still use the ldap special case, but be nicer to
-	other networked backends.
-
-2002-08-12  Dan Winship  <danw@ximian.com>
-
-	* gui/component/addressbook-component.c (user_create_new_item_cb):
-	If invoked from a non-contact folder, add the contact to the
-	default contact folder, not the local one. If invoked from a
-	contact folder, don't append "addressbook.db" to the URI, let
-	ebook do the right thing. Fixes #28327 and #28325.
-
-	* backend/idl/addressbook.idl (CallStatus): Add NoSuchBook.
-	(Initially intended as part of a fix for #28327, but the other
-	changes make it so the error code never ends up getting used any
-	more, but it's still good to have.)
-
-	* gui/widgets/e-addressbook-util.c (e_addressbook_error_dialog):
-	Handle NO_SUCH_BOOK.
-
-	* backend/ebook/e-book-types.h (EBookStatus): Add
-	E_BOOK_STATUS_NO_SUCH_BOOK.
-
-	* backend/ebook/e-book-listener.c
-	(e_book_listener_convert_status): add case for NoSuchBook.
-
-	* backend/ebook/e-book-util.c (e_book_load_local_address_book):
-	Kill this. Nothing should ever explicitly load the local
-	addressbook.
-	(e_book_use_default_book): Replaces e_book_use_local_address_book,
-	using the default book instead.
-	(e_book_default_book_open): Fall back to local contact folder on
-	E_BOOK_STATUS_NO_SUCH_BOOK too.
-	(e_book_query_address_default): Use default book, not local.
-
-	* gui/component/e-address-widget.c (query_idle_fn): Use the
-	default book, not the local book.
-
-	* gui/component/select-names/e-select-names-popup.c
-	(edit_contact_info_cb): Use the default book, not the local book.
-
-	* backend/ebook/e-destination.c (e_destination_cardify): Use the
-	default book, not the local book.
-	(e_destination_touch): Query the default book, not the local book.
-
-	* backend/ebook/e-card-compare.c (e_card_locate_match,
-	e_card_locate_match_full): Use the default book, not the local
-	book.
-
-2002-08-08  Chris Toshok  <toshok@ximian.com>
-
-	* backend/pas/pas-backend-summary.c (pas_backend_summary_init):
-	initialize summary->upgraded to quiet valgrind.
-
-2002-08-06  Dan Winship  <danw@ximian.com>
-
-	* backend/ebook/test-client.c (TEST_VCARD): Use "\r" rather than
-	including literal CRs in the string, which confuses gcc on OS X.
-
-	* backend/ebook/test-card.c (TEST_VCARD): Likewise.
-
-2002-08-01  Chris Toshok  <toshok@ximian.com>
-
-	[ fixes bug #25958 ]
-	* gui/component/addressbook.c (alphabet_state_changed): use
-	FULL_NAME in the case where we're untoggling a letter, and... well
-	use FULL_NAME in the other case too - we should never pop up the
-	advanced dialog.
-
-2002-08-01  Chris Toshok  <toshok@ximian.com>
-
-	* gui/component/select-names/e-select-names.h (struct
-	_ESelectNames): no more search_entry.
-
-	* gui/component/select-names/e-select-names.c (update_query): no
-	more search_entry, search_entry => select_entry, and add file_as
-	to the query since some entries don't have names (like the Ximian,
-	Inc. default card.)
-	(e_select_names_init): no more search_entry, and add an "activate"
-	handler on select_entry that updates the query.
-
-2002-08-01  Chris Toshok  <toshok@ximian.com>
-
-	* gui/component/select-names/e-select-names.h (struct
-	_ESelectNames): remove folders and folders_by_uri, and the 2
-	listeners.
-
-	* gui/component/select-names/e-select-names.c
-	(e_select_names_destroy): remove the hash_table_destroys of
-	folders and folders_by_uri, since they no longer exist.  same for
-	other_contacts_listener and local_listener.
-
-2002-08-01  Ettore Perazzoli  <ettore@ximian.com>
-
-	* gui/component/addressbook-component.c (create_component): Use
-	"contact-list-16.png" for the "New Contact List" item.
-
-2002-07-31  Ettore Perazzoli  <ettore@ximian.com>
-
-	* gui/component/addressbook-component.c (create_component): Change
-	the order so that "New Contact" is first and "New Contact List" is
-	next.
-
-2002-07-31  Ettore Perazzoli  <ettore@ximian.com>
-
-	* gui/component/addressbook-component.c (add_creatable_item): Pass
-	"contacts" as the @folder_type to
-	evolution_shell_component_add_user_creatable_item().
-
-2002-07-31  Chris Toshok  <toshok@ximian.com>
-
-	[ roll in the following change from the 1.0 branch.]
-	* backend/pas/pas-backend-ldap.c:
-	(prop_info): change the CALURI and FBURL ecard attributes to map to the
-	RFC 2739 specified attributes.
-        (check_schema_support): check to see if calEntry is supported.
-        (add_objectclass_mod): insert calEntry if it's supported.
-	* backend/pas/evolutionperson.schema: deprecate freeBusyURI
-	and calendarURI.
-
-2002-07-31  Ettore Perazzoli  <ettore@ximian.com>
-
-	[Patch by Jacob Berkman <jacob@ximian.com>, fixes #25968]
-
-	* backend/ebook/e-book.c (activate_factories_for_uri): Don't
-	double free protocol and query.
-
-2002-07-27  Chris Toshok  <toshok@ximian.com>
-
-	* backend/pas/pas-backend-summary.c (save_string): don't save
-	empty strings.
-	(pas_backend_summary_save): print out the errno when we fail.
-
-2002-07-26  Ettore Perazzoli  <ettore@ximian.com>
-
-	* gui/component/addressbook.c: Don't set up the ContactNew and
-	ContactNewList verbs.
-	(update_command_state): Don't set the sensitivity of
-	/commands/ContactNew and /commands/ContactNewList anymore.
-	(new_contact_cb): Removed.
-	(new_contact_list_cb): Removed.
-
-2002-07-24  Peter Williams  <peterw@ximian.com>
-
-	* conduit/Makefile.am (libeaddress_conduit_la_LIBADD): Change
-	libversit.la -> libversit.a for danw's changes.
-
-2002-07-24  Dan Winship  <danw@ximian.com>
-
-	* conduit/Makefile.am (libeaddress_conduit_la_LIBADD):
-	s/libversit_lt/libversit/
-
-2002-07-22  Dan Winship  <danw@ximian.com>
-
-	* backend/pas/Makefile.am: Split pas-backend-file and
-	pas-backend-ldap out of libpas and build them as separate (noinst)
-	libraries libpasfile.a and libpasldap.a. This gets the db3 and
-	LDAP dependencies out of libpas, and people trying to create an
-	addressbook backend shouldn't be calling functions from the
-	existing backends anyway so there's no reason to install them.
-
-2002-07-16  Chris Toshok  <toshok@ximian.com>
-
-	* gui/component/select-names/select-names.glade: remove the option
-	menu and browse button, and add a custom widget placeholder for
-	the folder-selector.
-
-	* gui/component/select-names/e-select-names.c
-	(addressbook_model_set_uri): move the "append /addressbook.db"
-	stuff here.
-	(e_addressbook_create_ebook_table): remove the code setting
-	initial uri from here.
-	(e_select_names_folder_free): gone.
-	(e_select_names_option_activated): gone.
-	(add_menu_item): gone.
-	(update_option_menu): gone.
-	(new_folder): gone.
-	(removed_folder): gone.
-	(folder_browse): gone.
-	(hookup_listner): gone.
-	(add_additional_select_names_uris): gone.
-	(e_select_names_hookup_listners): gone.
-	(e_addressbook_create_folder_selector): new function, create the
-	folder selector button.
-	(folder_selected): new function, callback for the folder selector.
-	just calls addresbook_model_set_uri.
-	(e_select_names_init): get the folder selector and initialize it
-	to show /local/Contacts.  also, set the model's uri here to the
-	same folder.  nuke the code involving the old option menu and
-	browse button.
-
-2002-07-08  Peter Williams  <peterw@ximian.com>
-
-	* backend/ebook/Makefile.am: Install libebook-static.la. 
-	Also change --all-static to -all-static, which is the right flag.
-	
-	* backend/pas/Makefile.am: Install the PAS headers in 
-	$(includedir)/evolution/pas. Install libpas.a
-
-2002-07-08  Peter Williams  <peterw@ximian.com>
-
-	* gui/component/select-names/Makefile.am (idl_DATA): Install the
-	SelectNames IDL and ancillary changes.
-
-2002-07-12  Chris Toshok  <toshok@ximian.com>
-
-	* backend/pas/pas-backend-summary.c (free_summary_item): free the
-	full_name (as well as given_name.  oops.)
-	(pas_backend_summary_new): new summaries are version 3.0 now.
-	(pas_backend_summary_load_item): all loaded summaries should be
-	3.0+, as we fail to load versions lower than that.
-	(pas_backend_summary_load_header): if the summary isn't version
-	3.0 fail out, as we need to rebuild the entire file to cache the
-	full_name fields.
-	(pas_backend_summary_save_item): save out the full_name.
-	(pas_backend_summary_add_card): put the item's full_name in the
-	card.
-
-2002-07-12  Dan Winship  <danw@ximian.com>
-
-	* gui/component/select-names/e-select-names-bonobo.c
-	(entry_get_property_fn): Make the
-	ENTRY_PROPERTY_ID_SIMPLE_CARD_LIST case not crash, although
-	there's still something wrong.
-
-2002-07-10  Chris Toshok  <toshok@ximian.com>
-
-	* gui/component/select-names/e-select-names-completion.c
-	(e_select_names_completion_start_query): e_book_get_book_view =>
-	e_book_get_completion_view, so the backends have the option of
-	using a pregenerated summary.
-
-2002-07-10  Chris Toshok  <toshok@ximian.com>
-
-	* backend/pas/pas-backend-summary.c (clear_items): actually remove
-	the items from the pointer array too, so an error while loading
-	doesn't leave the memory summary corrupted.
-	(pas_backend_summary_load_header): bleah, load the num_items and
-	summary_mtime in the right order :) Also, set upgraded to TRUE if
-	we loaded a v1.0 summary.
-	(pas_backend_summary_open): make this return a gboolean, return
-	TRUE if the summary is already open (priv->fp != NULL).  return
-	FALSE in error conditions.
-	(pas_backend_summary_load): if summary_open returns FALSE, return
-	FALSE, also set the dirty flag to FALSE after we load, and if the
-	summary was upgraded write it out.
-	(pas_backend_summary_save): update the in memory mtime to that of
-	the file when we save.
-	(summary_flush_func): if we're not dirty, do nothing and return.
-	(pas_backend_summary_is_up_to_date): make sure we've opened the
-	summary.
-	(pas_backend_summary_get_summary_vcard): fix compiler warning.
-
-2002-07-10  Peter Williams  <peterw@ximian.com>
-
-	* backend/ebook/e-book-view-listener.h: Oops, missed this one.
-
-	* backend/ebook/Makefile.am (libebookinclude_HEADERS): Also
-	put addressbook.h here because several headers reference it.
-
-2002-07-08  Peter Williams  <peterw@ximian.com>
-
-	* backend/ebook/e-book.h: Normalize includes to <ebook/foo.h>, so
-	that the installed headers will work sanely.
-
-	* backend/ebook/e-card-cursor.h:
-	* backend/ebook/e-book-view.h:
-	* backend/ebook/e-card-simple.h:
-	* backend/ebook/e-card.h:
-	* backend/ebook/e-destination.h: Same.
-
-	* printing/Makefile.am (INCLUDES): add -Iaddressbook/backend
-	to access the ebook headers. Also the builddir version to get
-	the generated addressbook.h
-
-	* conduit/Makefile.am (INCLUDES): Same.
-
-	* gui/widgets/Makefile.am (INCLUDES): Same builddir fix.
-
-	* gui/merging/e-card-merging.c: Fix an ebook #include.
-
-	* gui/merging/Makefile.am (INCLUDES): Same idea.
-
-	* gui/contact-list-editor/Makefile.am (INCLUDES): Same.
-
-	* gui/contact-editor/Makefile.am (INCLUDES): Same builddir
-	change.
-
-2002-07-10  Ettore Perazzoli  <ettore@ximian.com>
-
-	* gui/component/addressbook-storage.c (load_source_data): Pass
-	zero as the @sorting_priority to evolution_storage_new_folder().
-	(addressbook_storage_add_source): Likewise.
-
-2002-07-10  Chris Toshok  <toshok@ximian.com>
-
-	* backend/idl/addressbook.idl: add Book.getCompletionView.
-
-	* backend/ebook/e-book.c (e_book_get_completion_view): new
-	function, basically c&p of e_book_get_book_view, but call
-	getCompletionView.
-
-	* backend/ebook/e-book.h: add prototype for
-	e_book_get_completion_view.
-
-	* backend/pas/pas-backend-ldap.c
-	(pas_backend_ldap_process_client_requests): add a
-	GetCompletionView case here that just calls the same code as
-	GetBookView (since we don't build summaries for the ldap backend.)
-
-	* backend/pas/pas-backend-file.c (do_summary_query): add
-	@completion_search.  If it's TRUE, just create the vcards from the
-	summary using pas_backend_summary_get_summary_vcard instead of
-	looking them up from the db.
-	(pas_backend_file_search): add @completion_search and pass it on
-	to do_summary_query.
-	(pas_backend_file_process_get_book_view): pass FALSE to
-	pas_backend_file_search.
-	(pas_backend_file_process_get_completion_view): new function,
-	basically c&p pas_backend_file_process_get_book_view, but pass
-	TRUE to pas_backend_file_search.
-	(pas_backend_file_process_client_requests): add a case for
-	GetCompletionView.
-	(pas_backend_file_load_uri): track the change to the summary api -
-	create the summary filename
-
-	* backend/pas/pas-book.c (pas_book_queue_get_completion_view): new
-	function, queue a GetCompletionView request to our queue.
-	(impl_GNOME_Evolution_Addressbook_Book_getCompletionView): new
-	function, call pas_book_queue_get_completion_view.
-	(pas_book_respond_get_completion_view): new function, just call
-	notifyViewRequested.
-	(pas_book_free_request): add a case for GetCompletionView.
-	(pas_book_get_epv): fill in epv->getCompletionView.
-
-	* backend/pas/pas-book.h: add a GetCompletionView PASOperation,
-	and a new structure (PASGetCompletionViewRequest).  Also, add
-	get_completion_view to PASRequest.
-
-	* backend/pas/pas-backend-summary.c (clear_items): remove the
-	items from the hash table.
-	(pas_backend_summary_new): db_path -> summary_path.
-	(pas_backend_summary_destroy): db_.path -> summary_path, and
-	destroy the hash table.
-	(pas_backend_summary_init): db_path = summary_path, and initialize
-	the id_to_item hashtable.
-	(pas_backend_summary_load_header): handle the upgrading from
-	version 1.0 to version 2.0 (the addition of an mtime field in the
-	header)
-	(pas_backend_summary_load_item): version 1.0 and 2.0 have the same
-	format for items.
-	(pas_backend_summary_open): new function.  open the summary so we
-	can load the header (and get the mtime).
-	(pas_backend_summary_load): rework this a bit since the header has
-	already been loaded, and also add the items to the hashtable.
-	(pas_backend_summary_add_card): add the new item to the hashtable.
-	(pas_backend_summary_remove_card): remove the item from the hash
-	table.
-	(pas_backend_summary_is_up_to_date): new function, chekc @t
-	against the summary's mtime.
-	(pas_backend_summary_get_summary_vcard): create a vcard from the
-	fields we have in the summary.
-
-	* backend/pas/pas-backend-summary.h: add prorotypes for
-	pas_backend_summary_is_up_to_date and
-	pas_backend_summary_get_summary_vcard.
-
-2002-07-09  Ettore Perazzoli  <ettore@ximian.com>
-
-	* gui/component/addressbook-storage.c (load_source_data): Pass
-	NULL @custom_icon_name to evolution_storage_new_folder().
-	(addressbook_storage_add_source): Likewise.  [Note we could be
-	passing a nice custom here. ;-)]
-
-2002-07-02  Ettore Perazzoli  <ettore@ximian.com>
-
-	* gui/component/addressbook-component.c (add_creatable_item): New
-	arg @tooltip; pass it to
-	evolution_shell_component_add_user_creatable_item() [which now has
-	a @tooltip arg].
-
-2002-06-29  Chris Toshok  <toshok@ximian.com>
-
-	* backend/pas/Makefile.am (libpas_a_SOURCES): add
-	pas-backend-summary.[ch].
-
-	* backend/pas/pas-backend-file.c (string_to_dbt): move this to the
-	top of the file so it can be used in..
-	(build_summary): loop over the db, adding cards ot the summary.
-	(do_summary_query): call pas_backend_summary_search and loop over
-	the returned id's looking them up in the db.
-	(pas_backend_file_search): call
-	pas_backend_summary_is_summary_query, and either call
-	do_summary_query if it's a query over just the set of attributes
-	in the summary or use the old, slow method if not.
-	(pas_backend_file_process_create_card): call
-	pas_backend_summary_add_card.
-	(pas_backend_file_process_remove_card): call
-	pas_backend_summary_remove_card.
-	(pas_backend_file_process_modify_card): call remove_card/add_card.
-	(pas_backend_file_load_uri): try to load the summary file, and if
-	it doesn't exist create it.
-	(pas_backend_file_destroy): unref the summary.
-
-	* backend/pas/pas-backend-summary.[ch]: new files, reading and
-	writing (and querying) summaries.
-
-2002-06-27  Sean Atkinson  <sean@cantab.net>
-
-        * gui/component/addressbook-config.c (query_for_supported_bases):
-        don't unref selection_model (otherwise 3 clicks of
-        "Show Supported Bases" crashes if LDAP server isn't running).
-
-2002-06-25  Chris Toshok  <toshok@ximian.com>
-
-	* gui/component/addressbook-component.c (create_component):
-	reorder the adding of creatable items so the default is a new
-	contact, not a new contact list.
-
-2002-06-21  Sean Atkinson  <sean@cantab.net>
-
-	* gui/component/addressbook-config.c (addressbook_edit_server_dialog):
-	remove source argument (get it from the dialog).
-	(edit_source_clicked): same.
-	(sources_table_double_click): added to edit server by double-clicking.
-	(ldap_dialog_new): use sources_table_double_click.
-
-2002-06-17  Chris Toshok  <toshok@ximian.com>
-
-	* gui/widgets/e-addressbook-view.c (e_addressbook_view_save_as):
-	pass NULL to e_contact_list_save_as.  modality sucks.  fixes
-	broken build.
-	(save_as): same.
-
-2002-06-15  Chris Toshok  <toshok@ximian.com>
-
-	[ fixes bug #26130 ]
-	* gui/contact-editor/e-contact-editor.c (file_save_as_cb): pass
-	ce->app as parent_window.
-
-	* gui/contact-list-editor/e-contact-list-editor.c
-	(file_save_as_cb): same .
-
-	* gui/contact-editor/e-contact-save-as.c (e_contact_list_save_as):
-	if a parent_window is specified, the file selector should be
-	modal/transient for that window.
-	(e_contact_save_as): same.
-
-	* gui/contact-editor/e-contact-save-as.h: track prototype changes
-	(addition of GtkWindow *parent_window to both calls.)
-	
-2002-06-15  Chris Toshok  <toshok@ximian.com>
-
-	* backend/pas/pas-backend-ldap.c (pas_backend_ldap_connect): use
-	ldap_unbind_ext.
-	(create_card_handler): don't leak the new vcard.
-	(pas_backend_ldap_process_authenticate_user): don't leak the dn.
-
-2002-06-14  Chris Toshok  <toshok@ximian.com>
-
-	* backend/pas/pas-backend-file.c (pas_backend_file_search): up the
-	max threshold to 3000 cards from 1000 cards.. seems to improve
-	performance a bit.  also remove the g_list_reverse since it
-	doesn't matter what order the cards arrive to the gui.
-	(pas_backend_file_changes): plug memory leaks.
-
-2002-06-14  Christopher James Lahey  <clahey@ximian.com>
-
-	* backend/ebook/e-card-compare.c (compare_email_addresses): Made
-	"" compare as not equal to "" for addresses.
-	(use_common_book_cb): Don't bother checking for nickname here
-	since we don't use it as a match later.  Don't add "" as an
-	address to the list of query parts.
-
-2002-06-13  Christopher James Lahey  <clahey@ximian.com>
-
-	* gui/contact-editor/e-contact-editor.c (enable_writable_fields):
-	Don't enable fields if the editor isn't editable and the
-	widget_field_mappings lists this field as being desensitize for
-	read only.
-
-2002-06-11  Chris Toshok  <toshok@ximian.com>
-
-	[ fixes bug #17332 ]
-	* backend/ebook/e-book.c (e_book_get_static_capabilities): we
-	shouldn't ever return NULL here.  in error cases we need to return
-	g_strdup("");
-
-2002-06-11  Christopher James Lahey  <clahey@ximian.com>
-
-	* gui/widgets/e-minicard-view.c (e_minicard_view_event): Made
-	double clicking on read only folders not do anything.
-
-2002-06-10  Christopher James Lahey  <clahey@ximian.com>
-
-	* backend/ebook/e-book-util.c (e_book_expand_uri): Made expand_uri
-	a bit more robust and readable.
-	(e_book_get_default_book_uri): Made e_book_get_default_book_uri
-	use e_book_expand_uri if using the bonobo_config value.
-
-	* gui/component/e-address-popup.c (start_query): Handle the
-	failure state here by acting as if there are no matches.
-
-2002-06-05  Christopher James Lahey  <clahey@ximian.com>
-
-	* gui/widgets/e-minicard.c (e_minicard_event): Call
-	e_minicard_selected in the GDK_BUTTON_RELEASE case here.
-	(e_minicard_drag_begin): Set E_REFLOW (parent)->maybe_in_drag =
-	FALSE if it's an EReflow.
-
-2002-06-04  Christopher James Lahey  <clahey@ximian.com>
-
-	* gui/component/select-names/e-select-names-completion.c
-	(e_select_names_completion_book_ready): Commented out this unused
-	function.
-
-	* gui/component/select-names/e-select-names-manager.c
-	(open_book_cb): Ref if we're keeping the book.  Don't unref if
-	we're not keeping the book.
-	(clean_cb): Commented out this unused function.
-
-2002-06-04  Christopher James Lahey  <clahey@ximian.com>
-
-	* gui/widgets/e-addressbook-view.c (init_collection): Set the
-	title of our GalVIewCollection.
-
-2002-05-29  Anna Marie Dirks  <anna@ximian.com>
-
-	* gui/component/select-names/select-names.glade: Changed some spacing 
-	and expanding behavior to make this dialog behave more like I intended 
-	to. 
-
-2002-05-24  Chris Toshok  <toshok@ximian.com>
-
-	* gui/component/addressbook-config.c (CONFIG_CONTROL_FACTORY_ID):
-	put this back in, accidentally got snipped with the hacking going
-	on in here.
-
-2002-05-24  Chris Toshok  <toshok@ximian.com>
-
-	[ part of #25047 ]
-	* gui/component/addressbook-config.c: remove the autocompletion
-	config control from here, as it lives in the shell now.
-
-	* gui/component/GNOME_Evolution_Addressbook.oaf.in: same.
-
-2002-05-24  Chris Toshok  <toshok@ximian.com>
-
-	[ #24189 ]
-	* gui/component/select-names/e-select-names-manager.c
-	(focus_out_cb): ifdef out the body of this because it only works
-	with a single completion book.  not sure what to do here, but it
-	doesn't impact most usage scenarios.
-	(completion_popup_cb): same.
-	(e_select_names_manager_entry_new): add the books that have been
-	loaded successfully by the time this entry is created.
-	(open_book_cb): add the opened book to the entries that have
-	already been created, and store it in our list so that entries
-	that are created in the future can catch up.
-	(read_completion_books_from_db): slurp in the folder list from the
-	config db and load all the uris.
-	(uris_listener): listener function - when there's a change it
-	calls _clear_books on all the created entries, and clears our
-	list.  It then re-reads the books from the db.
-	(e_select_names_manager_new): create our bonobo listener and call
-	read_completion_books_from_db.
-	(e_select_names_manager_init): init completion_books.
-	(e_select_names_manager_destroy): free our list of
-	completion_books.
-
-	* gui/component/select-names/e-select-names-manager.h: switch from
-	a single EBook to a GList of completion_books here.
-
-	* gui/component/select-names/e-select-names-completion.c
-	(e_select_names_completion_add_book): deal with the case where
-	there's an active query (by effectively restarting it.)  This is
-	quite a contrived edge case.
-	(e_select_names_completion_clear_books): stop the current query
-	and clear our list of books.
-	(e_select_names_completion_new): track change to prototype, and
-	axe the majority of this method since an EBook* isn't passed
-	anymore.
-	(e_select_names_completion_clear_book_data): split this code out
-	from the destroy method so it can be called from _clear_books.
-
-	* gui/component/select-names/e-select-names-completion.h: the
-	constructor no longer takes an EBook -- pass in as many as you
-	want using _add_book.  Also, add prototype for _clear_books.
-
-	* gui/component/addressbook.c (load_uri_cb): when
-	storing/retrieving passwords, use the cleaned (without params)
-	version of the uri, so changing things like download limit don't
-	cause the user to be prompted for a password again.
-
-	* gui/component/addressbook-component.c
-	(ensure_completion_uris_exist): new function - probably doesn't
-	belong in this file.  Make sure the basic local Contacts folder
-	exists in the completion uris.
-	(addressbook_component_factory_init): call
-	ensure_completion_uris_exist.
-
-	* backend/ebook/e-book-util.h: add prototype for
-	e_book_get_default_book_uri.
-
-	* backend/ebook/e-book-util.c (e_book_get_default_book_uri): new
-	function, just return the default contacts uri.
-	(e_book_load_default_book): change
-	to use e_book_get_default_book_uri.
-
-2002-05-23  Chris Toshok  <toshok@ximian.com>
-
-	* gui/component/addressbook-config.c (addressbook_root_dse_query):
-	fix parameter/local variable overloading.
-
-2002-05-21  Ettore Perazzoli  <ettore@ximian.com>
-
-	* gui/component/addressbook.c (load_uri_cb): Don't try to invoke
-	e_book_get_uri() on NULL.  Fixes #25069.
-
-2002-05-17  Chris Toshok  <toshok@ximian.com>
-
-	* gui/widgets/e-addressbook-util.c (e_addressbook_error_dialog):
-	make sure we map status -> string correctly (add missing strings).
-
-	* backend/ebook/e-book-types.h (EBookStatus): add the missing
-	AUTHENTICATION_REQUIRED status code, to map to the idl response.
-
-	* backend/ebook/e-book-listener.c
-	(e_book_listener_convert_status): make sure we map all idl status
-	codes to EBookStatus statuses.
-
-2002-05-20  Ettore Perazzoli  <ettore@ximian.com>
-
-	* gui/component/addressbook-storage.c (load_source_data): Pass
-	FALSE for @sync_offline to evolution_storage_new_folder().
-	(addressbook_storage_add_source): Pass FALSE for @sync_offline to
-	evolution_storage_new_folder().
-
-2002-05-16  Ettore Perazzoli  <ettore@ximian.com>
-
-	* gui/component/addressbook-component.c (request_quit): New, quit
-	handler for the EvolutionShellComponent.
-	(add_creatable_item): Set it up.
-
-	* gui/contact-editor/e-contact-list-editor.c
-	(e_contact_list_editor_request_close_all): New.
-	(e_contact_list_editor_new): Put the contact editor in a static
-	list and gtk_object_weakref() it.
-	(contact_list_editor_destroy_notify): New, GtkDestroyNotify
-	function for the contact editors.
-
-	* gui/contact-editor/e-contact-editor.c
-	(e_contact_editor_request_close_all): New.
-	(e_contact_editor_new): Put the contact editor in a static list
-	and gtk_object_weakref() it.
-	(contact_editor_destroy_notify): New, GtkDestroyNotify function
-	for the contact editors.
-
-2002-05-15  Ettore Perazzoli  <ettore@ximian.com>
-
-	* gui/component/addressbook-component.c (create_component): Pass
-	NULL as @request_quit_fn.
-
-2002-05-13  Christopher James Lahey  <clahey@ximian.com>
-
-	* backend/idl/addressbook.idl: Removed an incorrect comment here.
-
-2002-05-13  Christopher James Lahey  <clahey@ximian.com>
-
-	* gui/contact-editor/e-contact-editor.c (enable_writable_fields):
-	Enable the dropdown widgets even if the contact is not editable so
-	that you can view any email address, phone number, or postal
-	address on read only contacts.
-
-2002-05-10  Christopher James Lahey  <clahey@ximian.com>
-
-	* gui/component/select-names/Evolution-Addressbook-SelectNames.idl:
-	Added SimpleCard interface.
-
-	* gui/component/select-names/Makefile.am: Added
-	e-simple-card-bonobo.c and e-simple-card-bonobo.h.
-
-	* gui/component/select-names/e-select-names-bonobo.c
-	(entry_get_property_fn): Added SIMPLE_CARD_LIST arg.
-
-	* gui/component/select-names/e-simple-card-bonobo.c,
-	gui/component/select-names/e-simple-card-bonobo.h: New class to
-	represent an ECardSimple across Bonobo.
-
-2002-05-09  Christopher James Lahey  <clahey@ximian.com>
-
-	* gui/component/select-names/e-select-names-bonobo.c
-	(entry_get_property_fn): Added "first_email" property.
-
-2002-05-09  Ettore Perazzoli  <ettore@ximian.com>
-
-	* gui/component/addressbook-storage.c
-	(addressbook_get_other_contact_storage): Pass %FALSE as
-	@has_shared_folders to evolution_storage_new().
-
-2002-05-08  JP Rosevear  <jpr@ximian.com>
-
-	* conduit/Makefile.am: link against the libtool version of
-	libversit
-
-2002-05-07  Chris Toshok  <toshok@ximian.com>
-
-	* gui/component/addressbook-config.c
-	(addressbook_config_control_new): oops, add the NULL back at the
-	end of possible_types.
-
-2002-05-07  Chris Toshok  <toshok@ximian.com>
-
-	* gui/component/addressbook-config.c (addressbook_ldap_init):
-	bleah, need to pass the GtkWindow here so we can pop up the a
-	modal parented dialog (gtk modal dialogs suck?).
-	(addressbook_ldap_auth): same.
-	(addressbook_root_dse_query): same.
-	(do_ldap_root_dse_query): same.
-	(addressbook_config_control_new): add "ldap-contacts" to the list
-	of possible types.
-
-2002-05-07  Dan Winship  <danw@ximian.com>
-
-	* gui/component/addressbook-storage.c (create_ldap_folder):
-	s/ldap_config/addressbook_config/
-
-2002-05-03  Chris Toshok  <toshok@ximian.com>
-
-	* backend/ebook/e-book.c (activate_factories_for_uri): finally
-	remove the #if 0's and use the oaf query stuff to get backends
-	that handle specific protocols.
-
-2002-05-03  Christopher James Lahey  <clahey@ximian.com>
-
-	* gui/component/addressbook-config.c
-	(addressbook_folder_list_changed_callback): Call
-	evolution_config_control_changed when the EFolderList changes.
-
-2002-05-03  Christopher James Lahey  <clahey@ximian.com>
-
-	* gui/component/GNOME_Evolution_Addressbook.oaf.in: Updated this
-	to have the ConfigControlFactory have an addressbookwide generic
-	name and added OAFIID:GNOME_Evolution_Addressbook_ConfigControl.
-
-	* gui/component/Makefile.am (evolution_addressbook_SOURCES),
-	gui/component/addressbook-component.c,
-	gui/component/addressbook-storage.c, gui/component/addressbook.c:
-	Replaced ldap-config.c and ldap-config.h with addressbook-config.c
-	andaddressbook-config.h.
-
-	* gui/component/addressbook-config.c,
-	gui/component/addressbook-config.h: Based on ldap-config.c and
-	ldap-config.h.  Added a folder list control.  Made this a multi
-	factory.
-
-	* gui/component/ldap-config.c, gui/component/ldap-config.h:
-	Replaced these with addressbook-config.c and addressbook-config.h.
-
-2002-05-02  Christopher James Lahey  <clahey@ximian.com>
-
-	* gui/component/select-names/e-select-names.c (selection_change):
-	Desensitize the to, cc, and bcc buttons if there's no selection
-	here.  Fixes Ximian bug #21482.
-
-2002-05-01  Christopher James Lahey  <clahey@ximian.com>
-
-	* gui/contact-list-editor/e-contact-list-editor.c (verbs): Changed
-	some of these to bind to the ContactListEditor verbs since they're
-	marked as that in the ui file.  Fixes Ximian bug #13034.
-
-2002-04-30  JP Rosevear  <jpr@ximian.com>
-
-	* gui/component/Makefile.am (EXTRA_DIST): fix
-
-2002-04-30  Christopher James Lahey  <clahey@ximian.com>
-
-	* gui/widgets/e-addressbook-model.c,
-	gui/widgets/e-addressbook-model.h
-	(e_addressbook_model_peek_card): Added this function so that there
-	would be less duplication of cards during run time when
-	duplication is unnecessary.
-
-	* gui/widgets/e-addressbook-view.c: Cleaned up get_card_list and a
-	number of associated functions to be much more uniform and
-	simpler.
-	(get_has_email_address): Don't show the "Send Message to Contact"
-	menu item if there are no email addresses in the listed contacts.
-	Fixes bug #1298.
-
-2002-04-30  Christopher James Lahey  <clahey@ximian.com>
-
-	* backend/ebook/e-card.c (e_card_list_send): Changed this to set a
-	subject when sending a contact.  This makes the signature be set
-	properly also.
-
-2002-04-26  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* printing/Makefile.am: Don't link to libibex anymore.
-
-	* conduit/Makefile.am: Same.
-
-	* backend/ebook/Makefile.am: Again here.
-
-	* gui/component/Makefile.am: And finally here.
-
-2002-04-26  Christopher James Lahey  <clahey@ximian.com>
-
-	* gui/component/select-names/e-select-names.c
-	(e_select_names_child_free): Unref the text_model here instead of
-	the model, since the model never gets set.  Removed the model
-	field since it's no longer used.
-
-2002-04-24  Christopher James Lahey  <clahey@ximian.com>
-
-	* gui/component/ldap-config.c: Updated this for the new
-	e_table_memory_store_insert function prototype.
-
-2002-04-24  Christopher James Lahey  <clahey@ximian.com>
-
-	* gui/component/select-names/e-select-names.c,
-	gui/component/select-names/e-select-names.h,
-	gui/component/select-names/select-names.glade (folder_browse):
-	Added a "Browse..." button to switch to a different addressbook
-	folder.
-
-	* gui/widgets/e-addressbook-util.c (e_addressbook_transfer_cards):
-	Moved extern EvolutionShellClient out of this function so that
-	it'd be more readable.
-
-2002-04-23  Christopher James Lahey  <clahey@ximian.com>
-
-	* gui/component/select-names/e-select-names.c,
-	gui/component/select-names/e-select-names.h: Coded handling of the
-	select_entry to search within the displayed contacts.
-
-	* gui/component/select-names/select-names.glade: Updated this
-	dialog to have an entry-select instead of an entry-find.
-
-2002-04-23  Christopher James Lahey  <clahey@ximian.com>
-
-	* gui/component/select-names/select-names.glade: Updated this
-	dialog to match the redesign.
-
-2002-04-23  Christopher James Lahey  <clahey@ximian.com>
-
-	* gui/widgets/e-addressbook-view.c (do_popup_menu): Make unused
-	menu items disappear instead of graying out.
-
-2002-04-23  Christopher James Lahey  <clahey@ximian.com>
-
-	* gui/widgets/e-addressbook-reflow-adapter.c,
-	gui/widgets/e-addressbook-reflow-adapter.h: Removed
-	e_addressbook_reflow_adapter_right_click and
-	e_addressbook_reflow_adapter_base_right_click.
-
-	* gui/widgets/e-addressbook-view.c: Handle right click menu for
-	both types of view.  Merged right click on white space with right
-	click on main area.  General clean up.
-
-	* gui/widgets/e-minicard-view-widget.c,
-	gui/widgets/e-minicard-view-widget.h: Removed a couple unnecessary
-	functions.  Added e_minicard_view_widget_get_view.  Added
-	right_click signal.
-
-	* gui/widgets/e-minicard-view.c, gui/widgets/e-minicard-view.h:
-	Added the right_click signal and the e_minicard_view_get_card_list
-	function.
-
-2002-04-22  Christopher James Lahey  <clahey@ximian.com>
-
-	* gui/component/select-names/e-select-names.h: Removed an unused
-	variable here.
-
-	* gui/widgets/e-addressbook-view.c (table_right_click,
-	table_white_space_event): Added a current view submenu to the
-	popup menu here.
-
-2002-04-22  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* gui/widgets/e-minicard-view.c (e_minicard_view_drag_begin):
-	Allow GDK_ACTION_COPY also, since the composer for example does
-	not accept MOVE's. Completes bug #8448.
-
-2002-04-18  Chris Toshok  <toshok@ximian.com>
-
-	* gui/component/ldap-config.glade: change order of scope option
-	menu to match how it's stored.
-
-2002-04-18  Chris Toshok  <toshok@ximian.com>
-
-	* gui/component/GNOME_Evolution_Addressbook.oaf.in: change ldap
-	config control text so it fits in the config dialog.
-
-	* gui/component/ldap-config.c: #ifdef lots of stuff HAVE_LDAP so
-	it'll build/run in either case.
-	(addressbook_source_dialog_destroy): rename
-	addressbook_add_server_druid_destroy to this, and free lots more
-	stuff.
-	(addressbook_add_server_druid):
-	addressbook_add_server_druid_destroy ->
-	addressbook_source_dialog_destroy.
-	(do_schema_query): add 3 second timeout to schema query.
-	(addressbook_edit_server_dialog): hook up destroy signal.
-	(config_control_new): if HAVE_LDAP isn't defined, put up a label
-	saying so.
-
-2002-04-18  Chris Toshok  <toshok@ximian.com>
-
-	* gui/component/Makefile.am (INCLUDES): add LDAP_CFLAGS to INCLUDES
-
-2002-04-18  Chris Toshok  <toshok@ximian.com>
-
-	* gui/component/addressbook.c (book_open_cb): no more
-	source->type.
-
-2002-04-18  Chris Toshok  <toshok@ximian.com>
-
-	* gui/component/ldap-config.c (addressbook_dialog_get_source):
-	fill in source->ssl.
-	(addressbook_source_dialog_set_source): set up auth/scope/ssl
-	option menus properly.
-
-	* gui/component/addressbook-storage.c
-	(addressbook_storage_init_source_uri): always include the
-	limit/ssl in the uri so we don't need to rely on defaults
-	everywhere.
-	(ldap_source_foreach): store the ssl option.
-
-	* gui/component/addressbook-storage.h: reorder SSLType to match
-	the UI.
-
-	* backend/pas/pas-backend-ldap.c: (struct _PASBackendLDAPPrivate)
-	add field for ldap_timeout.
-	(pas_backend_ldap_connect): reorder things a bit - we need to
-	start tls before the root dse query, if we can.
-	(pas_backend_ldap_load_uri): track the way ssl parameters are
-	given in the uri, and parse out the timeout.
-
-	* gui/component/ldap-config.c (port_changed_func): use the
-	symbolic SSL name instead of an integer constant.
-
-2002-04-18  Chris Toshok  <toshok@ximian.com>
-
-	* backend/pas/pas-backend-ldap.c (get_ldap_library_info): fix
-	memory leaks.
-
-	* gui/component/GNOME_Evolution_Addressbook.oaf.in: remove the
-	Addressbook_ConfigControl stuff to LDAP_ConfigControl.
-
-	* gui/component/Makefile.am (evolution_addressbook_SOURCES):
-	remove addressbook-config.* and add ldap-config.*
-	(glade_DATA): same.
-	(evolution_addressbook_LDADD): add LDAP_LIBS.
-
-	* gui/component/addressbook-component.c (owner_set_cb):
-	addressbook_config_register_factory =>
-	ldap_config_register_factory.
-
-	* gui/component/addressbook.c (book_open_cb): remove source->type
-	check - they're always LDAP.
-	(load_uri_cb): same.
-
-	* gui/component/addressbook-storage.c (ldap_unparse_ssl): new
-	function.
-	(ldap_parse_ssl): new function.
-	(addressbook_storage_init_source_uri): use a more flexible scheme
-	to build up the uri's, and add in the ssl parameter.
-	(load_source_data): fill in source->ssl, and remove source->type
-	assignment.
-	(addressbook_source_copy): copy source->ssl, and remove
-	source->type copy.
-	(create_ldap_folder): addressbook_create_new_source =>
-	ldap_config_create_new_source.
-
-	* gui/component/addressbook-storage.h: remove
-	AddressbookSourceType (it was always LDAP), and add
-	AddressbookLDAPSSLType.
-
-2002-04-18  Dan Winship  <danw@ximian.com>
-
-	* backend/ebook/e-book-util.c (e_book_load_default_book): Append
-	/addressbook.db to the end of the default URI if it starts with
-	file:
-
-	* backend/ebook/e-book.c (e_book_load_uri_step): Fix this to not
-	loop forever if you have more than one backend.
-
-2002-04-17  Christopher James Lahey  <clahey@ximian.com>
-
-	* gui/component/select-names/e-select-names.c
-	(e_select_names_create_categories): Changed this to use
-	ECategoriesMasterListOptionMenu.
-
-	* gui/component/select-names/e-select-names.c
-	(section_right_click_cb),
-	gui/widgets/e-addressbook-reflow-adapter.c,
-	gui/widgets/e-addressbook-view.c: Updated these to match the new
-	EPopupMenu.
-
-2002-04-11  Christopher James Lahey  <clahey@ximian.com>
-
-	* gui/component/addressbook-component.c: Include
-	addressbook-config.h here as this file uses it.
-
-	* gui/component/select-names/e-select-names.c (SPEC, SPEC2): Made
-	this dialog searchable by typing in the ETable.
-
-	* gui/widgets/e-addressbook-model.c: Include e-addressbook-util.h
-	here.
-
-	* gui/widgets/e-addressbook-reflow-adapter.c
-	(e_addressbook_reflow_adapter_right_click),
-	gui/widgets/e-addressbook-view.c (table_right_click): Fixed a
-	memory leak here by using "selection-done" signal.
-
-	* gui/widgets/e-addressbook-reflow-adapter.c,
-	gui/widgets/e-addressbook-reflow-adapter.h,
-	gui/widgets/e-addressbook-view.c, gui/widgets/e-minicard-view.c:
-	Added a right click menu for areas that aren't cards.
-
-2002-04-09  Dan Winship  <danw@ximian.com>
-
-	* backend/ebook/e-book-util.c (e_book_load_default_book): Update
-	for new-and-improved consistent default folder uri.
-
-	* gui/component/addressbook.c (addressbook_load_default_book): Use
-	e_book_load_default_book rather than duplicating most of its logic
-	here.
-	(load_uri_cb): Modify to work as a callback for
-	addressbook_load_default_book as well as addressbook_load_uri.
-
-2002-04-08  Dan Winship  <danw@ximian.com>
-
-	* gui/component/addressbook-component.c (create_view): Add
-	view_info arg, but don't do anything with it.
-
-2002-04-06  JP Rosevear  <jpr@ximian.com>
-
-	* gui/component/GNOME_Evolution_Addressbook.oaf.in: add
-	config_item:type
-
-2002-04-04  JP Rosevear  <jpr@ximian.com>
-
-	* conduit/Makefile.am: link to the static libversit
-
-2002-04-04  Dan Winship  <danw@ximian.com>
-
-	* gui/widgets/e-addressbook-util.c (e_addressbook_transfer_cards):
-	Update for evolution_shell_client_user_select_folder API change.
-
-2002-04-04  Ettore Perazzoli  <ettore@ximian.com>
-
-	* gui/component/addressbook.c: Remove AddressbookConfig,
-	ContactNew, ContactNewList EPixmap entries.
-
-	* gui/component/addressbook-factory.c (main): Print out a
-	debugging message just before the main loop starts, for debugging
-	purposes.
-
-2002-04-02  Dan Winship  <danw@ximian.com>
-
-	* backend/ebook/e-card-simple.h: Fix spelling of
-	E_CARD_SIMPLE_PHONE_ID_TTYTDD and E_CARD_SIMPLE_FIELD_PHONE_TTYTDD
-	(they previously ended with "TTD" instead of "TDD")
-
-	* backend/ebook/e-card-simple.c: Update for spelling fix.
-
-	* backend/pas/pas-backend-ldap.c: Likewise
-
-2002-04-01  Dan Winship  <danw@ximian.com>
-
-	* gui/component/select-names/e-select-names-text-model.c:
-	parent_class should be static. (From Max Horn <max@quendi.de>)
-
-2002-03-29  Ettore Perazzoli  <ettore@ximian.com>
-
-	* gui/component/GNOME_Evolution_Addressbook.oaf.in: Add priority
-	for the config page.  Renamed to "Directory Servers".
-
-2002-03-27  Chris Toshok  <toshok@ximian.com>
-
-	* backend/pas/pas-backend-file.c
-	(pas_backend_file_process_create_card): don't free req->vcard.
-	it's freed in pas_book_free_request.
-	(pas_backend_file_process_remove_card): don't free req->id for the
-	same reason.
-	(pas_backend_file_process_modify_card): don't free req->vcard for
-	the same reason.
-	(pas_backend_file_process_get_changes): don't free req->change_id
-	or release_unref the listener for the same reason.
-
-2002-03-27  Chris Toshok  <toshok@ximian.com>
-
-	* backend/pas/pas-backend-ldap.c (check_schema_support): make sure
-	to call ldap_value_free (values);, and ldap_msgfree (resp).
-	(get_ldap_library_info): don't ask me why, but it appears we have
-	to free each extension char*.
-	(query_ldap_root_dse): make sure to free values in the
-	subschemaSubentry code before overwriting it, and call
-	ldap_msgfree(resp) when we're all done.
-	(build_card_from_entry): don't leak the DN, ldap attributes, or
-	the berval the ldap_*_attribute calls use to step through the
-	attributes.  the docs say this berval is freed when
-	ldap_next_attribute returns NULL, but if we don't free it it leaks
-	a substantial amount of memory.
-	(pas_backend_ldap_search): make sure to only allocate *op once,
-	and fix the g_warning since op isn't valid in its scope anymore.
-
-2002-03-19  Dan Winship  <danw@ximian.com>
-
-	* backend/ebook/Makefile.am: Update for libversit change: Use .a
-	rather than .la now.
-
-	* printing/Makefile.am: Likewise
-
-	* gui/component/Makefile.am: Likewise
-
-2002-03-18  Ettore Perazzoli  <ettore@ximian.com>
-
-	* gui/component/addressbook.c (addressbook_menu_activated):
-	Removed.
-	(addressbook_factory_new_control): Don't connect anymore, as this
-	signal has been removed from the ESearchBar.
-	(addressbook_factory_new_control): No more custom menu items here.
-
-2002-03-15  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* gui/widgets/e-addressbook-view.c (table_right_click): Update to
-	use new EPopupMenu API.
-
-	* gui/widgets/e-addressbook-reflow-adapter.c
-	(e_addressbook_reflow_adapter_right_click): Update to use new
-	EPopupMenu API.
-
-	* gui/component/select-names/e-select-names.c
-	(section_right_click_cb): Update to match new EPopupMenu api.
-
-2002-03-15  Ettore Perazzoli  <ettore@ximian.com>
-
-	* gui/component/addressbook.c: Remove the
-	`addressbook_search_menu_items'.
-	(addressbook_menu_activated): Removed.
-	(addressbook_factory_new_control): Don't connect.  No menu items.
-
-2002-03-15  Ettore Perazzoli  <ettore@ximian.com>
-
-	* gui/component/addressbook.c (control_activate): Call
-	`e_search_bar_set_ui_component()' to set the BonoboUIComponent for
-	the search bar.
-
-	* gui/component/GNOME_Evolution_Addressbook.oaf.in: Add an icon
-	for the LDAP sources configuration control.
-
-2002-03-12  Ettore Perazzoli  <ettore@ximian.com>
-
-	* gui/component/addressbook.c: Remove verb "AddressbookConfig".
-	(config_cb): Removed.
-
-	* gui/component/addressbook-config.c: Remove `dialog' member from
-	`AddresbookDialog'.  Instead, add a `config_control' member.
-	(config_control_new): New.
-	(addressbook_config): Removed.
-	(addressbook_config_register_factory): New.
-	(config_control_factory_fn): New, factory function for the
-	ConfigControl page.
-	(addressbook_source_edit_changed): Don't change the sensitivity of
-	the dialog.  Rather, invoke ::changed on the ConfigPage.
-	(auth_checkbutton_changed): No need to manually change the
-	sensitiviness of the buttons here either.
-	(add_source_clicked): Likewise, just invoke
-	evolution_config_control_changed().
-	(edit_source_clicked): Likewise.
-	(addressbook_dialog_close): Removed.
-	(config_control_destroy_callback): New, callback for when the
-	config control gets destroyed.
-	(addressbook_dialog_apply): Removed.
-	(config_control_apply_callback): New callback for
-	EvolutionConfigControl::apply.
-	(addressbook_dialog_ok): Removed.
-	(addressbook_config_control_new): Set up ->config_control and
-	connect the signals.
-
-	* gui/component/addressbook-config.glade: Call the main hbox in
-	the addressbook_sources dialog `addressbook_sources_main_hbox'.
-
-	* gui/component/addressbook-component.c (owner_set_cb): Call
-	`addresbook_config_register_factory'.
-
-	* gui/component/GNOME_Evolution_Addressbook.oaf.in: Add items for
-	OAFIID:GNOME_Evolution_Addresbook_ConfigControl and
-	OAFIID:GNOME_Evolution_Addressbook_ConfigControlFactory.
-
-2002-03-11  Chris Toshok  <toshok@ximian.com>
-
-	* gui/component/select-names/e-select-names.c (update_query):
-	change contains x-evolution-any-field to beginswith on email,
-	full_name, and nickname.  faster, and more applicable to this
-	dialog.
-
-2002-03-09  Chris Toshok  <toshok@ximian.com>
-
-	* backend/idl/addressbook.idl: add TLSNotAvailable to
-	BookLister_CallStatus.
-
-	* backend/ebook/e-book-types.h: add TLS_NOT_AVAILABLE to the EBookStatus enum.
-
-	* backend/ebook/e-book-listener.c
-	(e_book_listener_convert_status): add TLS_NOT_AVAILABLE to the
-	switch.
-
-	* backend/pas/pas-backend-ldap.c
-	(pas_backend_ldap_get_static_capabilities): fix name.
-	(pas_backend_ldap_class_init): fix name.
-	(pas_backend_ldap_connect): change return type to CallStatus so we
-	can return different errors from here.  Also, do STARTTLS if the
-	user has asked for it and the connection supports it, returning
-	TLSNotAvailable (and close the connection) if they chose to
-	require it.
-	(pas_backend_ldap_load_uri): return pas_backend_ldap_connect.
-	(func_beginswith): pull in change from evolution-1-0-branch to
-	make full_name beginswith search both cn and sn.
-
-2002-03-09  Chris Toshok  <toshok@ximian.com>
-
-	* gui/widgets/e-addressbook-view.c (jump_to_letter): since I've
-	gone ahead and made the file backend (by way of
-	pas-backend-card-sexp.c) use case insensitive searches for
-	beginswith, there's no need to list upper and lower case here.
-
-	* gui/component/addressbook.c (addressbook_search_option_items):
-	reorder things to put "Any field contains" at the end, since it's
-	the least efficient search.  Also reorder the enum to the same
-	ordering.  Change "Name contains" to "Name begins with" and change
-	"Email contains" to "Email is".
-	(addressbook_search_activated): change FULL_NAME to beginswith,
-	and change EMAIL to is to match the labels.
-
-	* backend/pas/pas-backend-card-sexp.c (compare_name): new
-	function, so we can compare both full and family names (so
-	beginswith can operate on them both.)
-	(endswith_helper): use e_utf8_strstrcase here, since all the
-	backends backends use case insensitive searching.
-	(func_endswith): same.
-
-2002-03-06  Chris Toshok  <toshok@ximian.com>
-
-	* backend/pas/pas-book.c (pas_book_queue_create_card): track
-	union/struct change.
-	(pas_book_queue_remove_card): same.
-	(pas_book_queue_modify_card): same.
-	(pas_book_queue_get_cursor): same.
-	(pas_book_queue_get_vcard): same.
-	(pas_book_queue_authenticate_user): same.
-	(pas_book_queue_get_book_view): same.
-	(pas_book_queue_get_changes): same.
-	(pas_book_free_request): new function - free everything we need to
-	for each type of request.
-	(pas_book_destroy): call pas_book_free_request here instead of
-	just freeing 3 elements of the old struct.  yay plugging memleaks.
-
-	* backend/pas/pas-book.h: make PASRequest a union and split out
-	members into structs, so it's a little clearer which fields are
-	used by which requests.  Also, add prototype for
-	pas_book_free_request so backends can just free everything at once
-	(usually in their requests_queued signal func.)
-
-	* backend/pas/pas-backend-file.c
-	(pas_backend_file_process_create_card): track struct/union change.
-	(pas_backend_file_process_remove_card): same.
-	(pas_backend_file_process_modify_card): same.
-	(pas_backend_file_build_cards_list): same.
-	(pas_backend_file_process_get_vcard): same.
-	(pas_backend_file_process_get_cursor): same.
-	(pas_backend_file_process_get_book_view): same.
-	(pas_backend_file_process_get_changes): same.
-	(pas_backend_file_process_check_connection): same.
-	(pas_backend_file_process_authenticate_user): same.
-	(pas_backend_file_process_get_supported_fields): same.
-	(pas_backend_file_process_client_requests): case the union to the
-	specific struct and pass it to the process_* functions.  also,
-	call pas_book_free_request here, instead of relying on each of the
-	functions to free their stuff.
-
-2002-03-07  Dan Winship  <danw@ximian.com>
-
-	* gui/component/addressbook-storage.c
-	(addressbook_get_other_contact_storage): Update for
-	evolution_storage_new() change.
-
-2002-03-05  Chris Toshok  <toshok@ximian.com>
-
-	* gui/widgets/e-minicard-view-widget.c
-	(e_minicard_view_widget_realize): don't set "editable" here, as
-	the way things work the backend isn't able to override a setting
-	from the UI, so writable books never show up as writable.
-
-2002-03-04  Chris Toshok  <toshok@ximian.com>
-
-	[fixes bug #20871]
-	* gui/component/select-names/select-names.glade: add the
-	status-message label.
-
-	* gui/component/select-names/e-select-names.h (struct
-	_ESelectNames): add status_message field.
-
-	* gui/component/select-names/e-select-names.c (status_message):
-	new function, set the label's text from the message.
-	(e_select_names_init): get the status-message label, and if it's
-	valid, connect to the status_message signal of the
-	EAddressbookModel.
-
-2002-02-28  Chris Toshok  <toshok@ximian.com>
-
-	* backend/pas/pas-backend-ldap.c (pas_backend_ldap_search): don't
-	ref the view here, since it keeps the view alive until the search
-	is over, which we don't want.  we want the view's death to cancel
-	the search.  This speeds up starting new searches after one is
-	already active (since switching searches actually creates a new
-	book view and destroys the old one.)
-	(ldap_search_dtor): remove the matching unref here.  The unref as
-	it was was incorrect anyway, and caused a crash (we needed
-	search_op->view, not op->view.)
-
-2002-02-27  Chris Toshok  <toshok@ximian.com>
-
-	[fixes bug #20690]
-	* backend/pas/pas-backend-ldap.c (func_and): the data arg is not
-	GList** anymore, it's PASBackendLDAPSExpData*, so use
-	ldap_data->list instead of *list.
-	(func_or): same.
-	(func_not): same.
-	(func_contains): same.
-	(func_is): same.
-	(func_endswith): same.
-	(func_beginswith): same, but also special case the beginswith
-	"fileAs" query type (the one used by the alphabet buttons on the
-	right hand side, so we can deal with entries that don't have
-	fileAs attributes, and return meaningful responses.)
-	(pas_backend_ldap_build_query): initialize the
-	PASBackendLDAPSExpData struct and pass that instead of &list.
-	Also, take the PASBackendLDAP arg to add to the struct in case we
-	need it at some point in the future.
-	(ldap_search_handler): pass in the PASBackendLDAP.
-
-2002-02-26  Chris Toshok  <toshok@ximian.com>
-
-	* backend/pas/pas-backend-file.c (pas_backend_file_search): move
-	card_count++ inside the if that checks to see if a card matches
-	(and adds the card to the list).
-
-2002-02-24  Chris Toshok  <toshok@ximian.com>
-
-	* gui/component/addressbook.c (addressbook_query_changed): only
-	handle the ESB_ADVANCED case here now.  the actual query work is
-	done in addressbook_search_activated.
-	(addressbook_search_activated): split out all the searching
-	functionality here.
-	(addressbook_factory_new_control): hook up "search_activated" to
-	addressbook_search_activated.
-
-2002-02-24  Chris Toshok  <toshok@ximian.com>
-
-	* gui/component/addressbook-config.c
-	(addressbook_source_dialog_set_source): make the right auth page
-	start up open.
-
-	* gui/component/addressbook-storage.c (addressbook_source_free):
-	free the binddn.
-	(addressbook_source_copy): copy the binddn;
-
-2002-02-22  Chris Toshok  <toshok@ximian.com>
-
-	[ Fixes bugs 20740, 16680, and god knows what else :) ]
-	* gui/widgets/e-addressbook-model.c (create_card): double the
-	allocated size every time we need more space instead of using a
-	fixed size increment.  this helps huge queries.  Also, remove the
-	gtk_object_get of "file_as", as it was dead code.
-	(book_view_loaded): handle errors here (by popping up a dialog).
-
-	* backend/pas/pas-backend-ldap.c (view_destroy): search_idle ->
-	search_timeout.
-	(build_card_from_entry): comment out some spew, and unref ecard
-	when we're done to plug a memory leak.
-	(send_pending_adds): send along to the client all the cards we've
-	been saving up.
-	(poll_ldap): use a timeout for ldap_result to keep the backend
-	from blocking (and it turns out keep the frontend from hanging
-	waiting on a ref to complete) on large db's with few matches.
-
-	Also, add some fairly smart, self-tuning aggregating of cards.
-	Keep track of the number of cards we've sent the last time through
-	as well as this time, and estimate the number we want to aggregate
-	the next time based on them (we average them at the moment),
-	subject to maximum/minimum number of cards.  also, we have a
-	maximum aggregation time, after which we force a flush if there
-	are pending cards and recalculate our target pending number.
-	there's a minimum wait time to possibly keep outselves from
-	spamming the ui, although it's 0 at the moment.
-
-	Lastly, make sure to only notify the GUI of status messages when
-	we need to.  this results in a *huge* savings.
-	(ldap_search_handler): initialize all the pending card stuff, and
-	use a timeout instead of an idle function for poll_ldap.
-
-	* backend/ebook/e-book-view-listener.c
-	(e_book_view_listener_queue_response): performance optimization
-	for large adds.  If we're a CardAddedEvent and there's an existing
-	CardAddedEvent at the end of the queue, just concat the lists of
-	cards together.  This is to keep the gui from falling further and
-	further behind the ldap backend, which is merrily spewing updates
-	at the gui.
-
-2002-02-21  Ettore Perazzoli  <ettore@ximian.com>
-
-	* gui/component/Makefile.am: Define $(iconsdir).
-
-	* gui/component/addressbook-component.c (add_creatable_item): New
-	helper function.
-	(create_component): Add the icons for the user creatable items as
-	well.
-
-2002-02-20  Chris Toshok  <toshok@ximian.com>
-
-	* backend/pas/pas-backend-file.c (pas_backend_file_load_uri):
-	track change to signature, and (for now) just change all the
-	return FALSE's to _RepositoryOffline (what FALSE used to map to in
-	pas_book_factory_process_request), and change TRUE to _Success.
-
-	* backend/pas/pas-backend-ldap.c (pas_backend_ldap_load_uri):
-	track change to signature, and differentiate between
-	pas_backend_ldap_connect failing (RepositoryOffline), and
-	ldap_url_parse failing (OtherError).
-	
-	* backend/pas/pas-book-factory.c
-	(pas_book_factory_process_request): since pas_backend_load_uri
-	returns status now, use it to nodify the BookListener if there's a
-	failure.
-
-	* backend/pas/pas-backend.c (pas_backend_load_uri): track change
-	to signature.
-
-	* backend/pas/pas-backend.h: change return type of
-	pas_backend_load_uri to
-	GNOME_Evolution_Addressbook_BookListener_CallStatus to allow
-	differentiation between failure types.
-
-	* backend/ebook/e-book-listener.c
-	(e_book_listener_convert_status): handle _AUTHENTICATION_FAILED.
-
-	* backend/ebook/e-book-types.h (EBookStatus): add
-	_AUTHENTICATION_FAILED.
-
-2002-02-18  Chris Toshok  <toshok@ximian.com>
-
-	* backend/pas/pas-book-factory.c
-	(pas_book_factory_process_request): if the load_uri fails, notify
-	the listener that the repository is offline.  (partial fix for bug
-	20347)
-
-2002-02-18  Chris Toshok  <toshok@ximian.com>
-
-	* backend/pas/pas-backend-ldap.c (create_dn_from_ecard): escape
-	commas in the dn, since they're used by ldap to specify the node's
-	placement in the tree. (fixes bug 20089)
-	(rfc2254_escape): just use sprintf and %02X instead.
-
-2002-02-13  Christopher James Lahey  <clahey@ximian.com>
-
-	* gui/component/select-names/e-select-names.c (set_book): Keep a
-	ref of the model in this case as well.
-
-2002-02-13  Christopher James Lahey  <clahey@ximian.com>
-
-	* gui/component/select-names/e-select-names.c (set_book): Make
-	sure to only set the query once when creating a new book and not
-	at all on addressbook model creation.  This prevents an accidental
-	pair of changes from making the addressbook model load a remote
-	addressbook.
-
-	* gui/widgets/e-addressbook-model.c (get_view): If this is the
-	first_get_view and the addressbook is remote, empty the view
-	instead of leaving it in the state it used to be in.  This only
-	occurs if you set the book after the model has existed for a
-	while.
-	(e_addressbook_model_set_arg): When setting the book, set
-	first_get_view to TRUE.
-
-2002-02-13  Christopher James Lahey  <clahey@ximian.com>
-
-	* gui/widgets/e-addressbook-view.c (display_view): Attach to the
-	emvw instead of the emv here.
-
-	* gui/widgets/e-minicard-view-widget.c, e-minicard-view-widget.h:
-	Made this object have a "column_width" argument and a
-	"column_width_changed" signal which are a simple layer down to the
-	EMinicardView contained within.
-
-	* gui/widgets/gal-view-minicard.c, gui/widgets/gal-view-minicard.h
-	(gal_view_minicard_attach): Made this attach to an
-	EMinicardViewWidget instead of a EMinicardView.
-
-2002-02-13  Christopher James Lahey  <clahey@ximian.com>
-
-	* backend/ebook/e-book-util.c, backend/ebook/e-book-util.h
-	(e_book_expand_uri, e_book_load_address_book_by_uri,
-	e_book_use_address_book_by_uri): New functions that take a file://
-	url ending in the directory name and automatically append the
-	addressbook.db and do the appropriate thing.
-
-	* backend/pas/pas-backend-card-sexp.c,
-	backend/pas/pas-backend-card-sexp.h: Added copyright notice here.
-
-	* gui/component/addressbook-component.c
-	(destination_folder_handle_drop), gui/component/addressbook.c
-	(set_prop): Use e_book_expand_uri instead of
-	addressbook_expand_uri.
-
-	* gui/component/addressbook-storage.c: Fixed the fcntl include
-	here.
-
-	* gui/component/addressbook.c (ContactsCopyToFolder,
-	ContactsMoveToFolder): Added handlers for these two verbs.
-
-	* gui/component/addressbook.h: Removed addressbook_expand_uri in
-	favor of e_book_expand_uri.
-
-	* gui/widgets/e-addressbook-reflow-adapter.c (transfer_cards):
-	Added code to handle Move to and Copy to right click menu items.
-
-	* gui/widgets/e-addressbook-util.c,
-	gui/widgets/e-addressbook-util.h (e_addressbook_transfer_cards):
-	New function to pop up a dialog and transfer a set of cards to the
-	given folder.
-
-	* gui/widgets/e-addressbook-view.c,
-	gui/widgets/e-addressbook-view.h (display_view): Don't attach to
-	the view if it doesn't exist yet.  We have to make this then
-	attach later.
-	(e_addressbook_view_copy_to_folder,
-	e_addressbook_view_move_to_folder): New functions utilizing
-	e_addressbook_transfer_cards.
-	(table_right_click): Add copy_to_folder and move_to_folder to the
-	right click menu for tables here.
-	(e_addressbook_view_discard_menus): Handle menu unmerging here.
-
-	* gui/widgets/e-minicard-view-widget.h (struct
-	_EMinicardViewWidget): Removed unused field.
-
-2002-02-13  Christopher James Lahey  <clahey@ximian.com>
-
-	* gui/widgets/e-addressbook-view.c (display_view): Attach the
-	GalViewMinicard to the EMinicardView here.
-
-	* gui/widgets/gal-view-minicard.c, gui/widgets/gal-view-minicard.h
-	(gal_view_minicard_load, gal_view_minicard_save): Made these save
-	the column width of the view.
-	(gal_view_minicard_attach, gal_view_minicard_detach): Added these
-	functions to allow the GalViewMinicard to set the column width of
-	a EMinicardView and to monitor its changes.
-
-2002-02-12  Christopher James Lahey  <clahey@ximian.com>
-
-	* gui/widgets/e-addressbook-reflow-adapter.c
-	(addressbook_get_arg): Added an argument to get the model.
-
-	* gui/widgets/e-addressbook-view.c (writable_status): Don't bother
-	connecting to the writable_status callback on the book, simply
-	rely on the writable_status callback on the addressbook model.
-
-	* gui/widgets/e-minicard-view.c, gui/widgets/e-minicard-view.h
-	(set_empty_message): Handle the case of a read only view here.
-
-2002-02-07  JP Rosevear  <jpr@ximian.com>
-
-	* gui/component/addressbook-component.c (create_component): remove
-	"New" from user creatable menu items
-
-2002-02-07  Christopher James Lahey  <clahey@ximian.com>
-
-	* gui/widgets/e-addressbook-view.c,
-	gui/widgets/e-addressbook-view.h
-	(e_addressbook_view_setup_menus): Changed this function to use the
-	new GalViewMenus which takes a GalViewInstance, instead of a
-	GalViewCollection.
-
-2002-02-04  JP Rosevear  <jpr@ximian.com>
-
-	* gui/contact-editor/e-contact-editor.c (find_address_mailing): tidy
-
-	* conduit/address-conduit.c (addrconduit_load_configuration): load
-	default address setting
-	(addrconduit_save_configuration): save default address setting
-	(e_addr_gui_new): new gui routine for conduit settings
-	(e_addr_gui_fill_widgets): ditto
-	(e_addr_gui_fill_config): ditto
-	(e_addr_gui_destroy): ditto
-	(e_addr_context_destroy): destroy the gui and new_cfg
-	(local_record_from_ecard): reinstate commented out bits, determine
-	which address to sync to pilot
-	(ecard_from_remote_record): determine which address to sync from
-	pilot
-	(fill_widgets): put the gui widgets in
-	(create_settings_window): create gui
-	(save_settings): fill gui
-
-2002-02-04  JP Rosevear  <jpr@ximian.com>
-	
-	* gui/contact-editor/e-contact-editor.c (address_text_changed): if
-	the shown address in the mailing address or there is no mailing
-	address, set the default flag and make sure the button is checked
-	(address_mailing_changed): set the flags properly when the mailing
-	address changes
-	(e_contact_editor_init): listen for the check button being toggled
-	(find_address_mailing): find the address (if any) with the default
-	flag
-	(set_address_field): set the mailing address button appropriately
-	(fill_in_info): find the mailing address
-
-	* gui/contact-editor/e-contact-editor.h: add new class data member
-
-	* gui/contact-editor/contact-editor.glade: show mailing address
-	check button
-
-2002-02-01  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* backend/ebook/e-destination.c (e_destination_is_auto_recipient):
-	New function to find out if a destination was one which was
-	auto-matically set by Evolution.
-	(e_destination_set_auto_recipient): Set whether or not the dest is
-	an auto-recipient.
-	(e_destination_touch): Don't touch the address if it is an
-	auto_recipient.
-	(e_destination_list_to_vector_sized): New function to avoid having
-	to calculate the length of the list ourselves. Allows for a bit of
-	optimization if our caller knows the length of the list.
-	(e_destination_xml_encode): Encode the auto_recipient bit.
-	(e_destination_xml_decode): Decode the auto_recipient bit.
-
-2002-02-01  Christopher James Lahey  <clahey@ximian.com>
-
-	* backend/ebook/e-card-simple.c (e_card_simple_sync_card): Made
-	this preserve addressbook flags other than the first three.
-
-	* backend/ebook/e-card-types.h: Added E_CARD_ADDR_MASK and
-	E_CARD_ADDR_DEFAULT.
-
-	* backend/ebook/e-card.c (get_address_flags): Added "PREF" to
-	E_CARD_ADDR_DEFAULT mapping.
-
-	* backend/ebook/test-client.c: Added #include "e-book-util.h".
-
-2002-01-30  Chris Toshok  <toshok@ximian.com>
-
-	* backend/pas/pas-backend-file.c (pas_backend_file_changes):
-	compute the change db filename based on our contact db filename.
-	(pas_backend_file_load_uri): store the filename in
-	bf->priv->filename.
-	(pas_backend_file_destroy): free the filename, and (!) free
-	bf->priv too.
-
-2002-01-28  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* backend/ebook/e-destination.c (e_destination_is_valid): Revert
-	my previous change as trow says this will break auto-completion
-	stuff.
-
-2002-01-27  Ettore Perazzoli  <ettore@ximian.com>
-
-	* gui/contact-editor/Makefile.am: Use EVOLUTION_ADDRESSBOOK_CFLAGS.
-	* gui/contact-list-editor/Makefile.am: Likewise.
-	* gui/merging/Makefile.am: Likewise.
-	* gui/search/Makefile.am: Likewise.
-	* gui/component/select-names/Makefile.am: Likewise.
-
-2002-01-25  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* backend/ebook/e-destination.c (e_destination_is_valid): Don't
-	check for an @ in the email address. This is to fix bug #10960.
-
-2002-01-24  Chris Toshok  <toshok@ximian.com>
-
-	[ fixes bug 16097 ]
-	* gui/component/addressbook-config.glade: gui love for the new
-	auth stuff.
-	
-	* gui/component/addressbook.c (load_uri_cb): track change to auth,
-	and offer up different prompt strings depending on which method
-	(binddn or email) we're using.
-	
-	* gui/component/addressbook-storage.c (ldap_unparse_auth): use the
-	new auth types for ldap.
-	(ldap_parse_auth): same.
-	(addressbook_storage_auth_type_to_string): new function.
-	(load_source_data): get the binddn too.
-	(ldap_source_foreach): store out binddn or emailaddr, depending on
-	the auth type chosen.
-
-	* gui/component/addressbook-storage.h: add the more detailed auth
-	types, add "binddn" to the source structure, and add a prototype
-	for addressbook_storage_auth_type_to_string.
-	
-	* gui/component/addressbook-config.c (auth_checkbutton_changed):
-	set the auth stuff  (in)sensitive.
-	(auth_optionmenu_activated): new function.
-	(addressbook_source_dialog_set_source): track UI change.
-	(addressbook_source_dialog_get_source): same.
-	(add_scope_activate_cb): rename add_activate_cb to this to
-	distinguish it from the auth stuff.
-	(add_auth_activate_cb): new function.
-	(addressbook_source_dialog): track change to auth UI stuff.
-	(addressbook_storage_auth_type_to_string): new function.
-
-	* backend/ebook/e-book.h: add auth_method arg to
-	e_book_authenticate_user.
-
-	* backend/ebook/e-book.c (e_book_authenticate_user): track change
-	to prototype - add auth_method arg, and pass it along to the CORBA
-	call.
-
-	* backend/ebook/test-client.c (book_open_cb): track api change -
-	keep this building.
-
-	* backend/pas/pas-book.h: add auth_method slot in PASRequest.
-
-	* backend/pas/pas-book.c (pas_book_queue_authenticate_user): add
-	auth_method arg and add it to the PASRequest.
-	(impl_GNOME_Evolution_Addressbook_Book_authenticateUser): track
-	idl change, add auth_method and pass it along to
-	pas_book_queue_authenticate_user.
-
-	* backend/pas/pas-backend-ldap.c
-	(pas_backend_ldap_process_authenticate_user): support both
-	"ldap/simple-email" and "ldap/simple-binddn" auth methods.
-
-	* backend/idl/addressbook.idl: add "in string authMethod" to
-	authenticateUser.
-
-2002-01-24  Ettore Perazzoli  <ettore@ximian.com>
-
-	* conduit/Makefile.am: Use EVOLUTION_ADDRESSBOOK_CONDUIT_CFLAGS
-	and EVOLUTION_ADDRESSBOOK_CONDUIT_LIBS and remove unused flags
-
-	* gui/component/Makefile.am: Use EVOLUTION_ADDRESSBOOK_CFLAGS and
-	EVOLUTION_ADDRESSBOOK_LIBS and remove unused flags.
-	* backend/pas/Makefile.am: Likewise.
-	* backend/ebook/Makefile.am: Likewise.
-	* printing/Makefile.am: Likewise.
-	* backend/ebook/Makefile.am: Likewise.
-	* gui/widgets/Makefile.am (INCLUDES): Likewise.
-
-2002-01-23  Ettore Perazzoli  <ettore@ximian.com>
-
-	* gui/component/addressbook-component.c (create_component): Pass a
-	NULL @icon to
-	`evolution_shell_component_add_user_creatable_item()'.
-
-2002-01-23  Ettore Perazzoli  <ettore@ximian.com>
-
-	* gui/contact-editor/e-contact-editor-address.c: #include
-	<locale.h>.
-
-2002-01-22  Chris Toshok  <toshok@ximian.com>
-
-	[ fixes bug # 16864 ]
-	* backend/ebook/evolution-ldif-importer.c (getValue): create and
-	return a GString here, instead of writing to a fixed size buffer.
-	(parseLine): use a GString here instead of a fixed size buffer.
-
-2002-01-21  Christopher James Lahey  <clahey@ximian.com>
-
-	* backend/pas/pas-backend-ldap.c (ldap_search_handler): Set the
-	number of cards to return to the value specified in the ldap uri,
-	leaving the default at 100.  Fixes Ximian bug #13953.
-
-	* gui/component/addressbook-config.c (addressbook_source_dialog),
-	gui/component/addressbook-config.glade: Added a limit entry here
-	to edit the limit field of the source.
-
-	* gui/component/addressbook-storage.c,
-	gui/component/addressbook-storage.h
-	(addressbook_storage_init_source_uri): Added a limit field to this
-	class and pass that value through in the uri that's generated.
-
-2002-01-18  Christopher James Lahey  <clahey@ximian.com>
-
-	* backend/ebook/e-card-compare.c: Made username match with no
-	domain match be vague instead of partial.  Fixes Ximian bug
-	#13612.
-
-2002-01-18  Christopher James Lahey  <clahey@ximian.com>
-
-	* gui/component/addressbook.c (view_contact_cb): New verb to open
-	a bunch of cards.
-
-	* gui/widgets/e-addressbook-reflow-adapter.c (open_card): Call
-	e_addressbook_show_multiple_cards instead of doing this ourselves.
-
-	* gui/widgets/e-addressbook-util.c,
-	gui/widgets/e-addressbook-util.h
-	(e_addressbook_show_multiple_cards): Added this function to show a
-	bunch of cards, including a dialog if lots of windows are going to
-	appear.
-
-	* gui/widgets/e-addressbook-view.c (e_addressbook_view_view,
-	e_addressbook_view_can_view): e_addressbook_view_view calls
-	e_addressbook_show_multiple_cards on the appropriate list of
-	cards.
-
-2002-01-18  Christopher James Lahey  <clahey@ximian.com>
-
-	* gui/contact-editor/e-contact-editor-address.c
-	(fill_in_countries), gui/contact-editor/fulladdr.glade: Sort
-	country list.  Country list moves from fulladdr.glade to
-	e-contact-editor-address.c, but only a few country names have
-	actually changed.  Fixes Ximian bug #16545.
-
-2001-12-20  Zbigniew Chyla  <cyba@gnome.pl>
-
-	Fixes #17725
-
-	* evolution/addressbook/printing/e-contact-print.c (complete_sequence):
-	Do not assume that the first byte of file_as is the first letter, use
-	utf8 functions instead.
-
-2002-01-16  JP Rosevear  <jpr@ximian.com>
-
-	* conduit/address-conduit.c: move all functions here, get rid of
-	header files, use e-pilot-settings to display gui
-
-2002-01-15  JP Rosevear  <jpr@ximian.com>
-
-	* gui/component/select-names/select-names.glade: remove misleading
-	title and fix spacing
-
-2002-01-11  Christopher James Lahey  <clahey@ximian.com>
-
-	* gui/component/addressbook.c (alphabet_state_changed): Handle
-	setting the search bar to "Advanced..." when the alphabet buttons
-	are pushed and back when they're cleared.  Fixes Ximian bug
-	#12904.
-	(addressbook_menu_activated): When the user calls Search->clear,
-	set the search to ESB_ANY and "", don't just set the text.  This
-	is especially useful when it's set to ESB_ADVANCED.
-
-	* gui/widgets/e-addressbook-view.c,
-	gui/widgets/e-addressbook-view.h (alphabet_state_change): Added
-	this signal which gets emitted when the alphabet buttons are
-	pushed.
-	(command_state_change): Removed the ref pair here.  It's not
-	necessary.  gtk_signal_emit refs the object itself.
-
-2002-01-11  Christopher James Lahey  <clahey@ximian.com>
-
-	* backend/ebook/e-card-compare.c (name_synonyms): Added a couple
-	of names here.
-
-	* gui/component/select-names/e-select-names-text-model.c
-	(e_select_names_text_model_get_nth_obj): Removed an unused
-	variable.
-
-2002-01-11  Christopher James Lahey  <clahey@ximian.com>
-
-	* gui/widgets/e-addressbook-view.c,
-	gui/widgets/e-addressbook-view.h (create_alphabet): Use toggle
-	buttons here.  Fixes Ximian bug #10734.
-
-2002-01-09  Christopher James Lahey  <clahey@ximian.com>
-
-	* gui/contact-editor/e-contact-editor.c (set_fields): Choose the
-	first filled in address field here.  Fixes Ximian bug #2222.
-
-2002-01-03  Joe Shaw  <joe@ximian.com>
-
-	* backend/ebook/test-card.c: Add a test for getting arbitrary
-        fields.
-
-	* backend/pas/pas-backend-card-sexp.c (compare_arbitrary): Added.
-	(prop_info_table): Add a LIST_PROP for arbitrary fields.
-
-2002-01-03  Nat Friedman  <nat@ximian.com>
-
-	* backend/ebook/e-book.c (activate_factories_for_uri): Free the
-	query if the oaf response is of zero length.
-
-2001-12-27  Jon Trowbridge  <trow@ximian.com>
-
-	* gui/component/select-names/e-select-names.c
-	(real_add_address_cb): When we clean, don't clean the model's last
-	element.  This helps keep things working properly when we have
-	signal-character separators.
-	(section_right_click_cb): Changed to work properly with our
-	EText-emitted popup signal.
-	(e_select_names_add_section): Use ETexts for the recipient
-	sections, rather than tables.  This lets us make them directly
-	editable. (Bug #1721)
-
-	* gui/component/select-names/e-select-names-popup.c
-	(popup_info_new): Pass in a ESelectNamesTextModel, not a
-	ESelectNamesModel.
-	(e_select_names_popup): Adjust for the new signature for
-	e_select_names_model_text_pos.
-
-	* gui/component/select-names/e-select-names-manager.c
-	(focus_out_cb): Schedule a cleaning when we focus out.
-	(focus_in_cb): Cancel pending cleaning when we get focus.  This
-	helps us avoid bad things happening during the fast focus out/ins
-	that happen when the completion dropdown appears.
-	(completion_handler): Adjust for new signatures of
-	e_select_names_model_text_pos and e_select_names_model_name_pos.
-	(e_select_names_manager_entry_new): Pass in our
-	ESelectNamesTextModel when constructing the
-	ESelectNamesCompletion.
-	(e_select_names_manager_entry_free): Cancel any pending clean-ups.
-
-	* gui/component/select-names/e-select-names-bonobo.c
-	(entry_get_property_fn): Get the text off of the text model.
-	Which is the only way that really makes sense when you think about
-	it.
-
-	* gui/component/select-names/e-select-names-completion.c: Added a
-	copy of the associated ESelectNamesTextModel to
-	ESelectNamesCompletionPrivate.  This replaces the
-	ESelectNamesModel.
-	(e_select_names_completion_destroy): Unref ->text_model.
-	(e_select_names_completion_handle_request): Pass in our text
-	model's separator info when calling e_select_names_model_text_pos.
-	(e_select_names_completion_new): Pass in the text model as an arg
-	instead of the model, and ref it as needed.
-
-	* gui/component/select-names/e-select-names-text-model.c
-	(e_select_names_text_model_init): Set separator as either ", " or
-	",", depending on the value of the EVOLUTION_DISABLE_MAGIC_COMMA
-	environment variable.
-	(e_select_names_text_model_destroy): Free the separator.
-	(changed_cb): Flush our cached text on changed.
-	(e_select_names_text_model_set_source): Use our own changed_cb
-	callback on changed, rather than just connecting up
-	e_text_model_changed.
-	(e_select_names_text_model_set_separator): Added.  Lets the
-	separator between recipients be specified.
-	(e_select_names_text_model_get_text): Cache the text we get from
-	calling e_select_names_model_get_textification.
-	(e_select_names_text_model_insert_length): A bunch of small
-	changes to properly support generic separators, rather than
-	(implicit and explicitly) assuming ", ".
-	(e_select_names_text_model_delete): More small tweaks to handle
-	generic separators.
-	(e_select_names_text_model_get_nth_obj): Use new signature when
-	calling e_select_names_model_name_pos, and use our cached text.
-
-	* gui/component/select-names/e-select-names-model.c
-	(e_select_names_model_destroy): We don't cache the text or
-	addr_text anymore, so no need to free them here.
-	(e_select_names_model_changed): ...and no need to reset our text
-	and addr_text caches here.
-	(e_select_names_model_get_textification): Take a separator as an
-	arg, rather than just using ", ".  Also, no caching.
-	(e_select_names_model_get_address_text): Take a separator as an
-	arg, rather than just using ", ".  And no caching here either.
-	(e_select_names_model_clean): Add arg that give us control over
-	whether or not the last entry should get cleaned.  We need this
-	when using a one-character separator, so that new destinations
-	that get tacked onto the end don't get immediately cleaned away
-	for being empty.
-	(e_select_names_model_name_pos): Take the separator length as an
-	argument, remove implicit assumption of length 2.
-	(e_select_names_model_text_pos): Take the separator length as an
-	argument, remove implicit assumption of length 2.
-
-2001-12-20  Ettore Perazzoli  <ettore@ximian.com>
-
-	[Fix #17377, Evolution doesn't work on multi-depth displays.]
-
-	* gui/component/addressbook-factory.c (main): Push GdkRGB visual
-	and colormap.
-
-2001-12-19  Jon Trowbridge  <trow@ximian.com>
-
-	* gui/widgets/e-addressbook-reflow-adapter.c
-	(e_addressbook_reflow_adapter_right_click): Add cut/copy/paste to
-	right-click menu.
-
-	* gui/widgets/e-addressbook-view.c (table_right_click): Add
-	cut/copy/paste to right-click menu.  (Fixes bug #14528.)  Also,
-	disable some right-click options if our addressbook isn't
-	editable.
-
-2001-12-18  JP Rosevear  <jpr@ximian.com>
-
-	* conduit/address-conduit.c (check_for_slow_setting): go slow and
-	clear the map if the last uri and the current uri do not match
-	(post_sync): save the last uri
-
-	* conduits/address-conduit-config.h: handle a last uri config
-	option
-
-2001-12-18  Chris Toshok  <toshok@ximian.com>
-
-	* gui/component/addressbook.c (addressbook_default_book_open):
-	change this to match its e-book counterpart, and only failover to
-	the local addressbook if the protocol wasn't supported.  that way
-	errors like "failure to connect" are still reported to the user.
-
-	* backend/ebook/e-book-util.h: add prototypes for
-	e_book_load_default_book and e_book_get_config_database.
-
-	* backend/ebook/e-book-util.c (e_book_default_book_open): new
-	function, basically cut and paste addressbook_default_book_open
-	from addressbook.c here.
-	(e_book_load_default_book): cut and past
-	addressbook_load_default_book here, pretty much, except leave off
-	the auth stuff.
-	(e_book_get_config_database): new function, returns the
-	Bonobo_ConfigDatabase for e_book_load_default_book to use.
-
-	* conduit/address-conduit.c (start_addressbook_server): use
-	e_book_load_default_book here.
-	
-2001-12-17  Chris Toshok  <toshok@ximian.com>
-
-	[ fixes bug 17355 ]
-	* gui/component/select-names/e-select-names.c (new_folder): if
-	we're dealing with an LDAP folder, prepend [LDAP] to it.  Now that
-	we have 3 different places where folders are coming from, it helps
-	to be able to differentiate "Contacts" in ~/evolution and a
-	"Contacts" ldap server and a "Contacts" exchange folder.
-	(add_additional_select_names_uris): loop through the bonobo conf
-	settings for additional folders, adding them to the option menu.
-	(e_select_names_hookup_shell_listeners): call
-	add_additional_select_names_uris.
-
-2001-11-28  Christopher James Lahey  <clahey@ximian.com>
- 
- 	* gui/widgets/e-minicard-view-widget.c
-	(e_minicard_view_widget_realize): Use an #ECanvasBackground here
-	instead of a #GnomeCanvasRect.
- 
-2001-12-16  Jon Trowbridge  <trow@ximian.com>
-
-	* gui/component/select-names/e-select-names-completion.c: Added
-	'cache_complete' flag to ESelectNamesCompletionPrivate.
-	(e_select_names_completion_seq_complete_cb): Set cache_complete
-	to TRUE if our query wasn't interrupted.
-	(e_select_names_completion_start_query): Set cache_complete to
-	FALSE at the beginning of a potentially-cached query.
-	(e_select_names_completion_do_query): Only reuse cached cards
-	if cache_complete is TRUE.  (Fixes bug #10241)
-
-2001-12-15  JP Rosevear  <jpr@ximian.com>
- 
- 	* conduit/address-conduit.c (e_addr_context_destroy): don't free
- 	the hash table keys, we didn't allocate them and free the change
- 	objects and unref the associated cards
- 	(local_record_from_uid): unref the temp card we create
- 	(replace_record): ref the new card associated with the card change
- 	and unref the old one
-
-2001-12-13  JP Rosevear  <jpr@ximian.com>
- 
- 	* conduit/address-conduit.c (local_record_from_ecard): Make sure
- 	to copy the custom fields so they are not overwritten
-
-2001-12-13  Jon Trowbridge  <trow@ximian.com>
-
-	* backend/ebook/e-book-util.c (simple_query_new): Used
-	g_strdup_printf to dup a string.  Doh!  Changed to g_strdup.
-	(Bug #17126)
-
-2001-12-07  Jon Trowbridge  <trow@ximian.com>
-
-	* gui/component/select-names/e-select-names-manager.c
-	(e_select_names_manager_entry_new): Remove a reference to code
-	I don't want to commit yet. :-)
-
-	* gui/component/select-names/e-select-names-manager.c: Extensively
-	refactored -- this code had gotten _really_ ugly.  Untangle things
-	to the point where our reference counting problems are fixable.
-
-	* gui/component/select-names/e-select-names-bonobo.c
-	(impl_destroy): Remove all of the ugly hacks to work around our
-	memory management problems, and just unref the manager.
-	(Fixes #14412)
-
-2001-12-05  Chris Toshok  <toshok@ximian.com>
-
-	* backend/pas/pas-backend-ldap.c
-	(search_for_dn_with_objectclasses): move search_for_dn's contents
-	here, and add an "existing_objectclasses" parameter that we pass
-	on to build_card_from_entry.
-	(search_for_dn): call search_for_dn_with_objectclasses with NULL
-	for existing_objectclasses.
-	(build_card_from_entry): if existing_objectclasses is non-NULL,
-	fill it in with the list of existing objectclass values for this
-	entry.
-	(add_objectclass_mod): if existing_objectclasses is non-NULL,
-	meaning we're modifying an entry, search in the existing
-	objectclasses for the ones we want to be there, and only add
-	what's missing.  If none are missing, don't add objectclass_mod to
-	the list of mods.
-	(create_card_handler): track change to add_objectclass_mod (pass
-	NULL).
-	(modify_card_handler): use search_for_dn_with_objectclasses
-	instead of search_for_dn, and pass the existing objectclasses to
-	add_objectclass_mod.  also, free the list when we're done.
-	(poll_ldap): track change to build_card_from_entry (pass NULL).
-
-2001-12-05  Chris Toshok  <toshok@ximian.com>
-
-	* gui/contact-editor/e-contact-editor.c (enable_writable_fields):
-	we need to be able to disable non-labels here as well.  since
-	we're using enable_widget and not gtk_widget_set_sensitive, it's
-	okay to handle entries/text's, etc, here.
-	(widget_field_mappings): add label-caluri and label-fburl here.
-
-	* gui/contact-editor/contact-editor.glade: change the label names
-	for the freebusy/calendar urls to have more descriptive names,
-	since we use them in e-contact-editor.c now.
-
-	* backend/pas/pas-backend-ldap.c: add support for
-	caluri/calendarURI, fburl/freeBusyURI.
-
-	* backend/pas/evolutionperson.schema: add calendarURI and
-	freeBusyURI.
-
-2001-12-04  Christopher James Lahey  <clahey@ximian.com>
-
-	* gui/contact-editor/contact-editor.glade: Fixed up the
-	accelerators and such here.
-
-	* gui/contact-editor/e-contact-editor.c (file_save_as_cb):
-	Translate this string.
-	(pixmaps): Added a pixmap for the ContactEditorSaveClose command.
-	(setup_tab_order): Fixed up the tab order here.
-
-	* gui/contact-editor/fulladdr.glade: Made the country combo
-	focusable here.
-
-2001-12-03  Jon Trowbridge  <trow@ximian.com>
-
-	* backend/ebook/e-destination.c (e_destination_equal): Make address
-	comparisons case-insensitive. (Fixes 11776)
-
-	* backend/ebook/e-card.c (e_card_email_match_single_string): Make address
-	host comparisons case-insensitive. (Fixes 11776)
-
-	* gui/component/select-names/e-select-names-manager.c (focus_out_cb): Clean
-	ESelectNamesModel on focus-out. (Half of a fix for 15656)
-
-	* backend/ebook/e-destination.c (nonempty): Fix this function
-	and make it utf8-safe. (The other half of the fix for 15656)
-
-2001-11-28  Christopher James Lahey  <clahey@ximian.com>
-
-	* gui/contact-list-editor/e-contact-list-editor.c: Consistency
-	fixes with standard contact editor.  Added Save As, Send As, and
-	Send To.  Replaced Save toolbar with Save and Close and added Save
-	and Close menu item.  Added a trash icon.
-
-2001-11-28  Christopher James Lahey  <clahey@ximian.com>
-
-	* gui/contact-editor/e-contact-editor-address.c (setup_tab_order):
-	Setup the tab order here.  Fixes Ximian bug #13751.
-
-2001-11-28  Christopher James Lahey  <clahey@ximian.com>
-
-	* gui/component/addressbook.c (connect_master_list_changed,
-	make_suboptions): Changed how this list of categories gets
-	computed.  Fixes Ximian bugs #7707 and #7708.
-
-2001-11-15  Zbigniew Chyla  <cyba@gnome.pl>
-
-	* printing/e-contact-print-envelope.c (ecpe_linelist_dimensions),
-	printing/e-contact-print.c (e_contact_divide_text, e_contact_output,
-	e_contact_rectangle, e_contact_print_letter_tab,
-	e_contact_print_letter_heading, e_contact_get_card_size,
-	e_contact_print_card, e_contact_print_phone_list):
-	s/gnome_font_get_width_string/gnome_font_get_width_utf8/
-	s/gnome_font_get_width_string_n/gnome_font_get_width_utf8_sized/
-
-2001-11-14  Chris Toshok  <toshok@ximian.com>
-
-	* backend/pas/pas-backend-ldap.c (search_for_dn): check against
-	LDAP_SUCCESS as the return value, not -1.
-	(pas_backend_ldap_build_all_cards_list): same.
-	(pas_backend_ldap_process_authenticate_user): same.
-
-2001-11-12  Chris Toshok  <toshok@ximian.com>
-
-	[ Fixes Ximian bug #14843 ]
-	* backend/pas/pas-backend-ldap.c (func_and): don't crash if a
-	subexpression wasn't filled in.
-
-	* backend/pas/pas-backend-ldap.c (func_or): same.
-
-2001-11-12  Jon Trowbridge  <trow@ximian.com>
-
-	* gui/contact-list-editor/e-contact-list-editor.c (list_added_cb):
-	Release callback's reference to EContactListEditor.
-	(list_modified_cb): Release callback's reference to
-	EContactListEditor.
-	(save_card): Ref the EContactListEditor on behalf of the
-	e_book_foo callback. (Fixes bug #14743)
-	(save_card): Set changed to false once we've saved.
-	(list_deleted_cb): Release callback's reference.
-	(delete_cb): Hold reference for the callback.
-
-2001-11-12  Jon Trowbridge  <trow@ximian.com>
-
-	* gui/contact-editor/e-contact-editor.c (categories_clicked): If
-	our call to e_categories_new returns NULL, put up an error dialog
-	and return.  (Fixed #14780)
-		
-2001-11-09  Chris Toshok  <toshok@ximian.com>
-
-	[ Fixes Ximian bug #14687 ]
-	* backend/pas/pas-backend-file.c
-
-	* backend/pas/pas-book-factory.c
-	(pas_book_factory_process_request): do load_uri before add_client,
-	so we know if the load actually worked (add_client uses this
-	information to respond to the new client.)  before this change,
-	the client would still think the book was in a useful state even
-	if the load_uri failed.
-
-	* backend/pas/pas-backend-ldap.c (pas_backend_ldap_add_client): if
-	the we're not connected, say so.
-
-	* backend/pas/pas-backend-file.c (pas_backend_file_add_client):
-	same.
-	(pas_backend_file_load_uri): don't report_writable here,
-	add_client does it.  was only needed before because of the
-	improper ordering in pas-book-factory.c above.
-
-2001-11-09  Chris Toshok  <toshok@ximian.com>
-
-	[ Fixes Ximian bug #14646 ]
-	* gui/component/addressbook.c (addressbook_default_book_open): new
-	function.  if the default_book failed to load, load the local
-	addressbook in its place.
-	addressbook_load_default_book): if we're loading the default_book
-	uri, use addressbook_default_book_open as the open_response.
-
-	* backend/ebook/e-book.c (e_book_load_uri_step): reset the
-	load_state to NotLoaded so we can attempt another load_uri on
-	the book if it fails.
-
-2001-11-08  Jon Trowbridge  <trow@ximian.com>
-
-	* gui/component/select-names/e-select-names-bonobo.c
-	(impl_destroy): Explicitly destroy entries.  Part of the fix for
-	the lingering completion window bug.
-
-2001-11-04  JP Rosevear  <jpr@ximian.com>
-
-	* conduit/address-conduit.c: Use ordering of the pilot's phone
-	label list to find fields we sync in order to avoid strcmp'ing the
-	pilot's labels rendering phone syncing usable only for english
-	language pilots
-
-2001-11-03  Chris Toshok  <toshok@ximian.com>
-
-	[ Fixes Ximian bug #14410 ]
-	* gui/contact-editor/e-contact-editor.c (e_contact_editor_init):
-	init in_async_call to FALSE.
-	(card_added_cb): turn the UI back on and set in_async_call to
-	FALSE.
-	(card_modified_cb): same.
-	(card_deleted_cb): same.
-	(save_card): turn off the UI by setting the dialog insensitive,
-	and set in_async_call to TRUE.
-	(delete_cb): same.
-	(app_delete_event_cb): if we're in an async call don't let the
-	window get deleted.
-
-	* gui/contact-editor/e-contact-editor.h (struct _EContactEditor):
-	add in_async_call flag for when we make a wombat call and need to
-	disable the UI.
-
-	* gui/contact-list-editor/e-contact-list-editor.c
-	(e_contact_list_editor_init): init in_async_call to FALSE.
-	(list_added_cb): turn the UI back on and set in_async_call to
-	FALSE.
-	(list_modified_cb): same.
-	(list_deleted_cb): same.
-	(save_card): turn off the UI by setting the dialog insensitive,
-	and set in_async_call to TRUE.
-	(delete_cb): same.
-	(app_delete_event_cb): if we're in an async call don't let the
-	window get deleted.
-
-	* gui/contact-list-editor/e-contact-list-editor.h (struct
-	_EContactListEditor): add in_async_call flag for when we make a
-	wombat call and need to disable the UI.
-
-2001-11-02  Christopher James Lahey  <clahey@ximian.com>
-
-	* backend/ebook/e-card-simple.c (e_card_simple_get): Check for
-	NULL dates before converting them to strings.  Fixes Ximian bug
-	#14394.
-
-2001-11-02  Jon Trowbridge  <trow@ximian.com>
-
-	* gui/component/select-names/e-select-names-bonobo.c
-	(impl_destroy): Leak select-names related data structures until
-	the memory management issues get sorted out.  Fixed bug #14086.
-
-2001-10-31  Christopher James Lahey  <clahey@ximian.com>
-
-	* gui/component/e-cardlist-model.c,
-	gui/component/select-names/e-select-names-table-model.c,
-	gui/widgets/e-addressbook-table-adapter.c: Make the pre_changes
-	and changes match here.
-
-2001-10-31  Jon Trowbridge  <trow@ximian.com>
-
-	* gui/component/select-names/e-select-names.c
-	(e_select_names_destroy): Check that local_listener and
-	other_contacts_listener are non-NULL before
-	disconnecting/unrefing.
-
-	* gui/component/select-names/e-select-names-manager.c
-	(entry_destroyed): The entry shouldn't unref the manager.
-	(e_select_names_manager_create_entry): The entry shouldn't hold a
-	ref to the manager.  It becomes circular.
-	(e_select_names_manager_create_entry): On the other hand, we
-	should hold a ref to the entry we create.
-
-	* gui/component/select-names/e-select-names-bonobo.c
-	(impl_destroy): Remove the explicit dialog destroy hack.
-
-2001-10-30  Jon Trowbridge  <trow@ximian.com>
-
-	* gui/component/select-names/e-select-names-bonobo.c
-	(impl_destroy): Force the select names dialog to be destroyed.
-	This is a hack to fix bug #14002 -- I'll clean up the refcounting
-	issues post-freeze.  At least now it won't crash.
-
-2001-10-30  JP Rosevear  <jpr@ximian.com>
-
-	* conduit/address-conduit.c (ecard_from_remote_record): make sure
-	to translate the character sets of the names
-
-2001-10-30  JP Rosevear  <jpr@ximian.com>
-	
-	* gui/component/select-names/e-select-names-bonobo.c
-	(manager_ok_cb): send a null bonobo arg to prevent explosion
-
-2001-10-30  JP Rosevear  <jpr@ximian.com>
-	
-	* gui/widgets/e-addressbook-view.c: correct include typo
-
-2001-10-29  Jon Trowbridge  <trow@ximian.com.
-
-	* gui/widgets/e-minicard.c (add_field): Five characters, not four!
-	
-	* gui/widgets/e-addressbook-table-adapter.c
-	(addressbook_value_at): Convert xml-ified destinations into proper
-	addresses.
-
-2001-10-29  Jon Trowbridge  <trow@ximian.com.
-
-	* gui/component/select-names/e-select-names-bonobo.c (init):
-	Connect to manager's "ok" signal.
-	(manager_ok_cb): Emit "ok" bonobo-signal.
-
-	* gui/component/select-names/e-select-names-manager.c
-	(e_select_names_manager_class_init): Added "ok" signal.
-	(e_select_names_clicked): Emit 'ok' signal.
-
-2001-10-29  Chris Toshok  <toshok@ximian.com>
-
-	* gui/widgets/e-addressbook-util.c
-	(e_addressbook_prompt_save_dialog): new function, a "Do you want
-	to save changes?" dialog.
-
-	* gui/widgets/e-addressbook-util.h: add prototype for
-	e_addressbook_prompt_save_dialog.
-
-	* gui/contact-editor/e-contact-editor.c (prompt_to_save_changes):
-	call e_addressbook_prompt_save_dialog and save the card if they
-	select save.  return TRUE if the dialog should be closed, FALSE
-	otherwise.
-	(file_close_cb): check prompt_to_save_changes before closing the
-	dialog.
-	(app_delete_event_cb): same.
-
-	* gui/contact-list-editor/e-contact-list-editor.c
-	(prompt_to_save_changes): call e_addressbook_prompt_save_dialog
-	and save the card if they select save.  return TRUE if the dialog
-	should be closed, FALSE otherwise.
-	(file_close_cb): check prompt_to_save_changes before closing the
-	dialog.
-	(app_delete_event_cb): same.
-
-2001-10-29  Chris Toshok  <toshok@ximian.com>
-
-	* backend/pas/pas-backend-ldap.c (add_objectclass_mod): overload
-	this function for modifying objectclasses too, so we can make sure
-	evolutionPerson shows up in the objectclasses of an entry if it
-	shows up in the schema for the server.
-	(create_card_handler): add @replace = FALSE in the call to
-	add_objectclass_mod.
-	(modify_card_handler): call add_objectclass_mod with @replace =
-	TRUE.
-	(anniversary_compare): fix typo - return "equal", not "TRUE".
-	(birthday_compare): same.
-
-2001-10-29  Jon Trowbridge  <trow@ximian.com>
-
-	* conduit/address-conduit.c (pre_sync): Comment out spew.
-
-	* gui/contact-list-editor/e-contact-list-editor.c (fill_in_info):
-	Comment out spew.
-
-	* gui/component/addressbook-component.c
-	(destination_folder_handle_drop): Comment out spew.
-	(get_dnd_selection): Comment out spew.
-
-	* gui/widgets/e-addressbook-table-adapter.c
-	(addressbook_set_value_at): Comment out spew.
-
-2001-10-29  Jon Trowbridge  <trow@ximian.com>
-
-	* gui/component/addressbook.c (update_command_state): Check that
-	our BonoboUIComponent has a container so we don't get a lot of
-	annoying debug spew.
-
-	* printing/smallbook.ecps: Fixed fonts.
-
-	* printing/phonelist.ecps: Fixed fonts.
-
-	* printing/medbook.ecps: Fixed fonts.
-
-	* printing/e-contact-print.c (e_contact_get_card_size): Commented
-	out spew.
-
-	* gui/widgets/e-minicard.c (remodel): Check that e_minicard->card
-	!= NULL.
-
-2001-10-29  Jon Trowbridge  <trow@ximian.com>
-
-	* gui/component/select-names/e-select-names-completion.c
-	(e_select_names_completion_destroy): We were using
-	book_data->book_view immediately after unrefing it.  Reordered the
-	code a bit to avoid this.
-
-2001-10-29  Chris Toshok  <toshok@ximian.com>
-
-	* backend/pas/pas-book-factory.h: add prototype for
-	pas_book_factory_dump_active_backends.
-
-	* backend/pas/pas-book-factory.c
-	(pas_book_factory_dump_active_backends): new function.
-	(dump_active_server_map_entry): new function.
-
-2001-10-29  Jon Trowbridge  <trow@ximian.com>
-
-	* gui/component/select-names/e-select-names-completion.c
-	(make_match): Drop a match if either of the text fields is NULL.
-	This could happen if any of the utf-8 involved is invalid, for
-	example. (Bug #13757)
-
-2001-10-29  JP Rosevear  <jpr@ximian.com>
-
-	* conduit/address-conduit.c (is_syncable): fix bug that allowed
-	for phone's not to be in priority order and the item to still be
-	syncable
-
-	* conduit/address-conduit-config.h
-	(addrconduit_load_configuration): get management by id
-
-2001-10-29  JP Rosevear  <jpr@ximian.com>
-	
-	* conduit/address-conduit.c (is_syncable): a card also needs to
-	have its phone nums in priority order to be "syncable"
-	
-2001-10-29  JP Rosevear  <jpr@ximian.com>
-
-	* conduit/address-conduit.c (is_syncable): move the syncable
-	checking code to a different function
-	(ecard_from_remote_record): set the name parts individually
-	(local_record_from_ecard): use is_syncable
-
-2001-10-29  Christopher James Lahey  <clahey@ximian.com>
-
-	* backend/ebook/e-card-simple.c (file_as_get_style,
-	file_as_set_style): Use the actual ECardName in the ECard instead
-	of parsing the full_name here.
-
-2001-10-29  Christopher James Lahey  <clahey@ximian.com>
-
-	* backend/ebook/e-card-simple.c, backend/ebook/e-card-simple.h
-	(e_card_simple_set_name): New function to set the ECardName on
-	this card and fix the file_as if necessary.
-
-2001-10-29  Christopher James Lahey  <clahey@ximian.com>
-
-	* backend/ebook/e-card-simple.c, backend/ebook/e-card-simple.h
-	(e_card_simple_get): Handle returning dates here.
-	(e_card_simple_get_allow_newlines): New function.  Returns whether
-	it makes much sense to have newlines in this string.
-
-	* gui/component/addressbook-config.c,
-	gui/component/addressbook-config.h
-	(addressbook_create_new_source): The first argument here should
-	be const.
-
-	* gui/component/addressbook-storage.c: Added #include
-	"addressbook-config.h".
-
-	* gui/widgets/e-minicard-label.c (e_minicard_label_event): On an
-	escape here, cancel editing and remove the focus from the text.
-
-	* gui/widgets/e-minicard.c (add_field): Set allow_newlines here.
-	(field_activated): Stop editing on the activate signal and remove
-	the focus from the text.  Fixes Ximian bug #12286.
-
-2001-10-28  JP Rosevear  <jpr@ximian.com>
-
-	* conduit/address-conduit.h: tidy
-
-	* conduit/address-conduit-config.h: ditto
-
-	* conduit/address-conduit.c (add_record): unref ecard when done
-
-2001-10-28  Jon Trowbridge  <trow@ximian.com>
-
-	* backend/ebook/e-card.c (e_card_date_from_string): Expose this
-	function.
-	(e_card_date_to_string): ...and this one.  Fixes build problem in
-	pas-backend-ldap.c.
-
-2001-10-28  Jon Trowbridge  <trow@ximian.com>
-
-	* gui/component/select-names/e-select-names.c
-	(e_select_names_hookup_shell_listeners): Change "this should never
-	happen" dialog to not give my name/e-mail.  Sorry translators.
-	But this really should never happen, thanks to my fix below.
-
-	* gui/component/addressbook-component.c: Initialize
-	global_shell_client to NULL. (Bug #6625)
-
-2001-10-27  Chris Toshok  <toshok@ximian.com>
-
-	[ bug #12979 ]
-	* backend/pas/pas-backend-ldap.c (anniversary_populate): new
-	function.
-	(anniversary_ber): new function.
-	(anniversary_compare): new function.
-	(birthday_populate): new function.
-	(birthday_ber): new function.
-	(birthday_compare): new function.
-
-2001-10-27  Chris Toshok  <toshok@ximian.com>
-
-	* gui/component/select-names/e-select-names-completion.c
-	(e_select_names_completion_destroy): free up all the book_data
-	list stuff.
-	(e_select_names_completion_got_book_view_cb): deal with book_data
-	being passed as the closure, and increment the
-	pending_completion_seq counter.
-	(e_select_names_completion_card_added_cb): deal with book_data
-	being passwd as the closure.
-	(e_select_names_completion_seq_complete_cb): same, and decrement
-	the pending_completion_seq if we haven't gotten one for this book
-	view before.
-	(e_select_names_completion_stop_query): cancel all the
-	book_data's.
-	(e_select_names_completion_start_query): use the books_not_ready
-	counter instead of book_ready.  also, do e_book_get_book_view on
-	each of the book's in our list.
-	(e_select_names_completion_do_query): change to deal with our
-	list.
-	(e_select_names_completion_book_ready): decrement the
-	book_not_ready counter.
-	(e_select_names_completion_new): add the book we're created with
-	to our list.
-	(e_select_names_completion_add_book): implement.
-
-	* gui/component/select-names/e-select-names-completion.h: add
-	prototype for e_select_names_completion_add_book.
-
-	* gui/component/select-names/e-select-names-manager.c
-	(e_select_names_manager_new): use addressbook_config_data, and
-	don't unref the db.
-	(e_select_names_manager_create_entry): always add NULL for a book
-	(which corresponds to the local book), and if the completion_book
-	is present, add it to the list of books to complete again.
-
-2001-10-27  Chris Toshok  <toshok@ximian.com>
-
-	* gui/contact-editor/e-contact-quick-add.c (merge_cb): change to
-	EBookCallback signature, and unref the book.
-	(quick_add_merge_card): use addressbook_load_default_book.
-	(ce_have_book): change to EBookCallback signature, and unref the
-	book.
-	(edit_card): use addressbook_load_default_book.
-
-	* gui/component/e-address-popup.c (email_table_save_card_cb):
-	change to EBookCallback signature, and unref the book.
-	(add_card_idle_cb): use addressbook_load_default_book, and call
-	the cb if it fails.
-	(e_address_popup_cleanup): fix type -- should be "pop->card =
-	NULL", not "pop = NULL".
-	(contact_editor_cb): change to EBookCallback signature.
-	(edit_contact_info_cb): use addressbook_load_default_book.
-	(start_query): change to EBookCallback signature.
-	(e_address_popup_query): use addressbook_load_default_book.
-
-	* gui/widgets/e-minicard-control.c (book_open_cb): change to
-	EBookCallback signature, and unref the book.
-	(save_in_addressbook): use addressbook_load_default_book instead
-	of e_book_use_local_address_book.
-
-	* gui/widgets/Makefile.am (INCLUDES): change includes since we're
-	including addressbook.h which has it's own set of funky include
-	path requirements.
-
-2001-10-27  Jon Trowbridge  <trow@ximian.com>
-
-	* backend/ebook/e-book.c (activate_factories_for_uri): Don't leak
-	stuff. (Bug #13709)
-
-2001-10-27  Christopher James Lahey  <clahey@ximian.com>
-
-	* backend/ebook/e-destination.c (name_and_email_simple_query_cb,
-	nickname_simple_query_cb): Set book_uri when cardification occurs.
-
-2001-10-27  Christopher James Lahey  <clahey@ximian.com>
-
-	* gui/component/select-names/e-select-names.c
-	(e_select_names_add_section): Turned off use_ellipsis (it breaks
-	emulate_label_resize) and on emulate_label_resize.  Fixes Ximian
-	bug #13693.
-
-2001-10-27  Jon Trowbridge  <trow@ximian.com>
-
-	* gui/component/select-names/e-select-names-completion.c
-	(make_match): Doh!  We should be sorting our contacts so that the
-	most frequently used ones are at the top of the list, not the
-	bottom.
-
-	* backend/pas/pas-book.c (pas_book_check_queue): That should be a
-	bonobo_object_unref, not a gtk_object_unref.
-	(pas_book_queue_request): Likewise, we need to bonobo_object_ref
-	here.
-	(pas_book_destroy): If our pas_book_check_queue timeout is still
-	active, disable it.  This should never happen, but it never hurts
-	to be careful.
-	(pas_book_destroy): Set book->priv to NULL after we free it.
-
-2001-10-27  JP Rosevear  <jpr@ximian.com>
-
-	* conduit/address-conduit.c (local_record_from_ecard): copy phone
-	labels and show phone as well, clear correct entry text and
-	correctly detect unsyncable cases
-
-2001-10-27  JP Rosevear  <jpr@ximian.com>
-
-	* conduit/address-conduit.c (local_record_from_ecard): touch the
-	record on lookup
-	(check_for_slow_setting): write touched only if we are doing a
-	slow sync
-	(card_removed): don't touch on lookup
-	(match): touch on lookup
-
-2001-10-27  Jon Trowbridge  <trow@ximian.com>
-
-	* backend/pas/pas-book.c (pas_book_check_queue): Added paranoid
-	reentrancy guards.
-	(pas_book_queue_request): Changed our idle handler into a timeout,
-	so as to work w/ reentrancy guards.
-	(pas_book_init): Explicit initialization.
-
-2001-10-26  Chris Toshok  <toshok@ximian.com>
-
-	* gui/component/addressbook.h: add prototypes for
-	addressbook_config_database, and addressbook_load_default_book.
-
-	* gui/component/addressbook.c (addressbook_config_database): new
-	function, so we aren't activating the db everywhere we need to use
-	it.
-	(addressbook_load_default_book): load the default book, after
-	getting the uri from bonobo-config.
-
-2001-10-26  Jon Trowbridge  <trow@ximian.com>
-
-	* backend/ebook/e-book-util.c (simple_query_card_added_cb): Return
-	on cancellation.
-	(simple_query_sequence_complete_cb): Act if not cancelled.
-	(simple_query_book_view_cb): Free & return on cancellation.
-	(e_book_simple_query_cancel): Set cancellation flag.
-
-	* gui/component/e-address-popup.c (e_address_popup_query): Hold a
-	reference to ourselves for the duration of our addressbook fetch.
-	(start_query): Release when we've fetched our addressbook.
-	(e_address_popup_cleanup): Break out most of what we do in
-	_destroy into a separate function.
-	(e_address_popup_destroy): Class cleanup.
-	(contact_editor_cb): Paranoid clean-up.
-	(add_contacts_cb): Paranoid clean-up.
-	(e_address_popup_ambiguous_email_add): Paranoid clean-up.
-
-2001-10-26  JP Rosevear  <jpr@ximian.com>
-
-	* conduit/e-address.conduit.in: remove the merges as valid sync
-	types
-
-	* conduit/address-conduit.c (pre_sync): write out only the touched
-	records if we are doing copies
-
-	* conduit/address-conduit-config.h
-	(addrconduit_load_configuration): get the sync type
-
-2001-10-26  Jon Trowbridge  <trow@ximian.com>
-
-	* gui/component/e-address-popup.c (e_address_popup_destroy):
-	Cancel any pending queries.
-
-	* gui/contact-editor/e-contact-editor.c (close_dialog): Don't
-	assert, but check if ce->app != NULL, since this function can
-	(apparently) get called multiple times.
-
-	* gui/contact-editor/e-contact-save-as.c (file_exists): Remove bad
-	dialog ref-counting crap.
-
-	* gui/contact-editor/e-contact-editor.c (save_card): Ref our
-	EContactEditor, since we are holding a pointer to it in
-	EditorCloseStruct.
-	(card_modified_cb): Unref our EContactEditor when we free our
-	EditorCloseStruct.
-	(card_added_cb): Unref our EContactEditor when we free our
-	EditorCloseStruct.
-
-2001-10-26  JP Rosevear  <jpr@ximian.com>
-	
-	* conduit/address-conduit.c (check_for_slow_setting): make debug
-	info more accurate
-	
-2001-10-26  JP Rosevear  <jpr@ximian.com>
-
-	* conduit/address-conduit.c (e_addr_context_destroy): prevent
-	double unref
-	(cursor_cb): correct typo
-	(card_removed): remove the card from the map if was archived and
-	is now deleted
-
-2001-10-26  JP Rosevear  <jpr@ximian.com>
-	
-	* conduit/address-conduit.h: new member
-
-	* conduit/address-conduit.c (print_remote): free the struct after
-	using it
-	(e_addr_context_new): make consistent with other conduits
-	(e_addr_context_destroy): properly destroy the context
-	(cursor_cb): no need to ref the card, its done for us
-	(clear_entry_text): util function to free a field
-	(free_local): free a local record
-	(local_record_to_pilot_record): use a static buffer so we don't
-	have to free it later
-	(local_record_from_ecard): only fill in the fields we might not
-	sync, clear a field before replacing the contents
-	(for_each): track locals
-	(for_each_modified): ditto
-	(free_match): use free_local
-
-2001-10-26  Christopher James Lahey  <clahey@ximian.com>
-
-	* gui/widgets/e-minicard.c, gui/widgets/e-minicard.h
-	(set_has_cursor): Added has_cursor argument.  Setting the argument
-	to TRUE if the minicard doesn't have focus will grab the focus.
-	Fixes Ximian bug #3024.
-
-2001-10-24  Jon Trowbridge  <trow@ximian.com>
-
-	* gui/component/addressbook-factory.c (main): Initialize
-	gnome-vfs.
-
-	* gui/component/addressbook-component.c (xfer_file): Added.
-	(Copied from the calendar.)
-	(xfer_folder): Fixed to allow renaming of contact folders.
-
-2001-10-24  Christopher James Lahey  <clahey@ximian.com>
-
-	* gui/widgets/e-addressbook-view.c
-	(e_addressbook_view_class_init): Removed key_press handler here
-	since delete and backspace are now handled by keybindings.
-
-2001-10-23  Jon Trowbridge  <trow@ximian.com>
-
-	* gui/component/addressbook.c: Fix command paths when we specify
-	our pixmaps, so we don't get a lot of totally useless & very ugly
-	bonobo-ui spew.
-
-	* backend/ebook/e-book-util.c (e_book_nickname_query): The empty
-	string as an arg shouldn't generate a warning.
-
-	* gui/component/select-names/e-select-names-completion.c: Removed
-	our cancelled flag and e_select_names_completion_cancel function,
-	since we were just duplicating stuff that had ended up in
-	ECompletion.
-	(match_name): Form our menu_text properly on an additional-name
-	match.
-	(e_select_names_completion_got_book_view_cb): Store handles for
-	our signals, disconnect them properly when we switch book views.
-	(e_select_names_completion_stop_query): Disconnect signals when we
-	stop our query.
-	(check_capabilities): Spew if we are using LDAP for completion.
-	(e_select_names_completion_destroy): Disconnect our signals when
-	we destroy.
-	This all should fix bug #10241.
-
-2001-10-23  Christopher James Lahey  <clahey@ximian.com>
-
-	* gui/component/select-names/e-select-names.c
-	(e_select_names_add_section): Set "draw_button" argument to TRUE
-	on this EEntry.
-
-2001-10-22  Christopher James Lahey  <clahey@ximian.com>
-
-	* gui/contact-editor/e-contact-save-as.c (save_it): Put up an
-	error dialog if there's an error while saving.  If the person hits
-	cancel on the "file exists" dialog, don't close the file selection
-	dialog.  Fixes Ximian bug #7055.
-
-2001-10-21  Christopher James Lahey  <clahey@ximian.com>
-
-	* gui/widgets/e-addressbook-reflow-adapter.c
-	(model_and_selection_free): right_click_up here when we let go of
-	the popup.
-
-	* gui/widgets/e-minicard-view.c (e_minicard_view_selection_event):
-	right_click_up here.
-
-2001-10-21  Christopher James Lahey  <clahey@ximian.com>
-
-	* gui/component/select-names/e-select-names.c
-	(e_select_names_add_section, e_select_names_set_default): Use an
-	EEntry here instead of a GtkLabel.  Fixes Ximian bug #7067.
-
-2001-10-21  Jon Trowbridge  <trow@ximian.com>
-
-	* gui/component/addressbook.c (control_activate_cb): Call
-	e_addressbook_model_force_folder_bar_message when we activate the
-	component. (Fixes bug #11749)
-
-	* gui/widgets/e-addressbook-model.c
-	(e_addressbook_model_force_folder_bar_message): Added.  Forces
-	emission of a folder_bar_message.
-
-2001-10-20  Larry Ewing  <lewing@ximian.com>
-
-	* gui/component/select-names/e-select-names.c
-	(e_select_names_set_default): stick with the style font if the
-	efont bold font does not exist.	
-	(e_select_names_set_default): don't forget to unref the oldstyle.
-
-2001-10-20  Jon Trowbridge  <trow@ximian.com>
-
-	* gui/component/select-names/e-select-names-completion.c
-	(name_style_query): Fix memory leak.
-
-	* gui/widgets/e-addressbook-view.c (jump_to_letter): Free our
-	string vector letter_v when we are done with it.
-
-	* gui/contact-editor/e-contact-quick-add.c (edit_card): Unref our
-	QuickAdd structure.
-
-	* gui/component/e-address-popup.c (e_address_popup_construct):
-	Unref our style after we are done with it.
-
-2001-10-20  Jon Trowbridge  <trow@ximian.com>
-
-	* backend/ebook/e-book.c (activate_factories_for_uri): We
-	shouldn't leak the info returned by oaf_query.
-
-	* gui/contact-editor/e-contact-quick-add.c (card_added_cb): Remove
-	superfluous call to quick_add_unref.
-	(editor_closed_cb): Remove superfluous call to quick_add_unref.
-
-	* gui/component/select-names/e-select-names.c (esn_get_key_fn): We
-	need to unref the card returned by e_addressbook_model_get_card.
-
-2001-10-20  Ettore Perazzoli  <ettore@ximian.com>
-
-	* gui/component/addressbook-component.c: Make LDAP servers
-	non-user-creatable.
-
-2001-10-20  Jon Trowbridge  <trow@ximian.com>
-
-	* printing/e-contact-print.c (e_contact_print_card): Check that the
-	string we are checking for xml-ness is non-NULL.
-
-	* backend/ebook/e-destination.c (e_destination_importv): Filter
-	out empty destinations. (also Bug #13036)
-
-	* printing/e-contact-print.c (e_contact_build_style): Use
-	gnome_font_new_closest; if gnome_font_new fails and returns NULL,
-	our spacing gets all messed up. (Bug #10785)
-	
-	* gui/widgets/e-addressbook-view.c (e_addressbook_view_can_print):
-	Allow printing if there are any cards in our view.  The selection
-	has nothing to do with it.
-
-	* backend/ebook/e-destination.c (e_destination_is_empty): Check
-	for strings that contain non-whitespace, rather than just looking
-	for a non-zero first character. (Bug #13036)
-
-2001-10-20  Christopher James Lahey  <clahey@ximian.com>
-
-	* gui/widgets/e-minicard-view.c (e_minicard_view_selection_event):
-	Handle focus_change in event by selecting that contact.  Fixes
-	Ximian bug #3024.
-
-	* gui/component/addressbook-component.c (owner_unset_cb):
-	Repeatedly call gtk_main_quit here as long as there is a main loop
-	around.  This is an ugly hack around Ximian bug #11760.
-
-2001-10-20  Christopher James Lahey  <clahey@ximian.com>
-
-	* gui/component/select-names/e-select-names.c: Added #include
-	<gal/widgets/e-unicode.h>.
-
-	* gui/widgets/e-minicard-control.c: Made this display the number
-	of extra cards in the attachment as well as made it save them all
-	to the local addressbook if the person selects the button.  Fixes
-	Ximian bug #9507.
-
-2001-10-20  Christopher James Lahey  <clahey@ximian.com>
-
-	* gui/widgets/e-minicard.c (e_minicard_event): Changed this to not
-	grab on a right click.  Fixes Ximian bug #12660.
-
-2001-10-19  Ettore Perazzoli  <ettore@ximian.com>
-
-	* gui/component/addressbook-component.c
-	(destination_folder_handle_motion): Get @folder_type here too [to
-	match the changes in the EvolutionShellComponentDnd interface].
-	Also, remove a debugging message.
-	(destination_folder_handle_drop): Likewise.
-
-2001-10-18  Jon Trowbridge  <trow@ximian.com>
-
-	* gui/component/select-names/e-select-names.c (add_menu_item):
-	Translate labels in select-names option menu. (Bug #9604)
-
-	* gui/search/e-addressbook-search-dialog.c
-	(e_addressbook_search_dialog_init): Made the default window size
-	slightly wider. (Bug #7516)
-
-2001-10-18  Christopher James Lahey  <clahey@ximian.com>
-
-	* backend/ebook/e-card.c, backend/ebook/e-card.h
-	(e_card_list_get_vcard): Made this take a const GList.
-
-2001-10-18  Jon Trowbridge  <trow@ximian.com>
-
-	* gui/component/select-names/e-select-names-completion.c
-	(check_capabilities): Added.  Check if our book is local or
-	networked.
-	(e_select_names_completion_book_ready): Call check_capabilities.
-	(e_select_names_completion_new): Call check_capabilities.
-	(e_select_names_completion_do_query): If we have a networked book,
-	keep trying if we haven't been able to cache any cards --- our
-	earlier attempts could have failed due to too many matches. (Bug
-	#12932)
-
-	* gui/component/select-names/e-select-names-manager.c
-	(focus_out_cb): Lag our cardification on focus-out.  This seems to
-	help with the unintended cardifications that can result from the
-	weird focus-out/focus-in events that get generated when the popup
-	disappears.
-
-	* backend/ebook/e-card-compare.c: Removed some debug spew.
-
-2001-10-17  Chris Toshok  <toshok@ximian.com>
-
-	* gui/component/addressbook-config.c (addressbook_source_dialog):
-	grab focus in the Account entry when preparing the dialog, fixes
-	#10406.
-
-2001-10-17  Chris Toshok  <toshok@ximian.com>
-
-	* gui/component/select-names/e-select-names.c (new_folder): make
-	sure to also add "ldap-contacts" folders to the option menu.
-
-2001-10-17  JP Rosevear  <jpr@ximian.com>
-
-	* conduit/address-conduit.c (ecard_from_remote_record): sync all
-	the fields we can, with out overwriting
-	(local_record_from_ecard): write the fields to the pilot in
-	priority order unless there are fields on the pilot we can't
-	store, then fill in the fields as they are on the pilot
-
-2001-10-17  Christopher James Lahey  <clahey@ximian.com>
-
-	* backend/ebook/e-card.c (e_card_get_vobject): Did a bit of clean
-	up here.  Might fix some crashes, specifically Ximian bug #10164.
-
-	* gui/widgets/e-addressbook-view.c (SPEC): Updated the model
-	column numbers here.  Fixes Ximian bug #12308.
-
-2001-10-17  Chris Toshok  <toshok@ximian.com>
-
-	* backend/pas/pas-backend-file.c (pas_backend_file_upgrade_db):
-	add upgrade from 0.1 to 0.2, where we make sure id dbt's match
-	vcard id's, fixes longstanding bug (#7406) where cards were not
-	modifiable or removable after having been created during a 1-2
-	week long window in early betas.
-	(PAS_BACKEND_FILE_VERSION): change to 0.2
-	(PAS_ID_PREFIX): #define this here.
-	(pas_backend_file_create_unique_id): use PAS_ID_PREFIX instead of
-	the string.
-
-2001-10-16  Iain Holmes  <iain@ximian.com>
-
-	* backend/ebook/evolution-ldif-importer.c (support_format_fn): Return
-	FALSE if no extension.
-
-2001-10-16  Jon Trowbridge  <trow@ximian.com>
-
-	* backend/ebook/e-card.c (e_card_get_id): If card->id is NULL,
-	return an empty string.
-	(e_card_set_id): Don't allow the card id to be set to NULL; use
-	the empty string instead.
-	(e_card_get_vobject): When building our vcard, pass in the empty
-	string as the id if card->id is NULL. (Bug #10164)
-
-2001-10-16  JP Rosevear  <jpr@ximian.com>
-
-	* conduit/address-conduit.c (local_record_from_ecard): don't set
-	the phone info if it is blank
-	(ecard_from_remote_record): save up to 3 fax numbers
-
-2001-10-15  Chris Toshok  <toshok@ximian.com>
-
-	* backend/pas/pas-backend-ldap.c (pas_backend_ldap_add_client):
-	unref the book after we pass it off to evolution-addressbook.
-
-2001-10-15  Chris Toshok  <toshok@ximian.com>
-
-	* backend/pas/pas-backend-ldap.c (create_card_dtor): unref
-	op->view.
-	(pas_backend_ldap_process_create_card): ref op->view.
-	(remove_card_dtor): unref op->view.
-	(pas_backend_ldap_process_remove_card): ref op->view.
-	(modify_card_dtor): unref op->view.
-	(pas_backend_ldap_process_modify_card): ref op->view.
-	(ldap_search_dtor): unref op->view.
-	(pas_backend_ldap_search): ref op->view.
-
-2001-10-15  Chris Toshok  <toshok@ximian.com>
-	
-	* backend/pas/pas-backend-ldap.c
-	(pas_backend_ldap_process_get_book_view): make sure to unref the
-	book_view here so we don't leak them.
-
-2001-10-12  Chris Toshok  <toshok@ximian.com>
-
-	* gui/component/addressbook-factory.c (main): call
-	e_passwords_init and e_passwords_shutdown.
-
-2001-10-15  Christopher James Lahey  <clahey@ximian.com>
-
-	* backend/ebook/e-card.c (addPropValueQP, addPropValueSets,
-	e_card_get_vobject): Properly decide whether a property needs to
-	be marked as QP by searching for '\n'.  Fixes Ximian bug #3021.
-
-2001-10-15  Christopher James Lahey  <clahey@ximian.com>
-
-	* gui/contact-editor/e-contact-save-as.c (e_contact_save_as,
-	e_contact_list_save_as): Set the default file name here.  Fixes
-	Ximian bug #7053.
-
-2001-10-14  Jon Trowbridge  <trow@ximian.com>
-
-	* gui/component/select-names/e-select-names.c
-	(e_select_names_hookup_shell_listeners): Added linebreaks to our
-	"this shouldn't happen" dialog message. (Bug #12498)
-
-2001-10-12  Jon Trowbridge  <trow@ximian.com>
-
-	* gui/component/addressbook-factory.c (main): Add a component name
-	to the e_passwords_init() call.
-
-2001-10-12  Chris Toshok  <toshok@ximian.com>
-
-	* backend/ebook/evolution-ldif-importer.c: commit the importer
-	originally from Michael M. Morrison, with fixups by toshok.
-
-	* backend/ebook/Makefile.am (bin_PROGRAMS): add
-	evolution-ldif-importer.
-	(oaf_in_files): add
-	GNOME_Evolution_Addressbook_LDIF_Importer.oaf.in.
-
-	* backend/ebook/e-card-simple.h: add WANTS_HTML and IS_LIST.
-
-	* backend/ebook/e-card-simple.c (field_data): add WANTS_HTML and
-	IS_LIST.
-	(e_card_simple_set): fix typo.
-
-	* backend/ebook/.cvsignore: ignore
-	GNOME_Evolution_Addressbook_LDIF_Importer.oaf and
-	evolution-ldif-importer.
-
-	* backend/ebook/GNOME_Evolution_Addressbook_LDIF_Importer.oaf.in:
-	ldif importer oafinfo.
-
-2001-10-12  Christopher James Lahey  <clahey@ximian.com>
-
-	* backend/ebook/e-card-simple.c, backend/ebook/e-card-simple.h:
-	Added a boolean type here.
-
-2001-10-12  Jon Trowbridge  <trow@ximian.com>
-
-	* gui/component/select-names/e-select-names.c
-	(addressbook_model_set_uri): Check to see if the uri we are
-	setting is the same as the current uri.  If so, do nothing.
-	(Bug #11324)
-
-2001-10-11  Jon Trowbridge  <trow@ximian.com>
-
-	* backend/ebook/e-destination.c
-	(e_destination_reverting_is_a_good_idea): Added.  Heuristic for
-	whether or not we want to revert to an earlier cardified state.
-	(e_destination_cardify): Don't be quite as aggressive about
-	reverting to previous cardified states. (Bug #11890)
-
-2001-10-11  Christopher James Lahey  <clahey@ximian.com>
-
-	* backend/ebook/e-card-simple.c (e_card_simple_destroy,
-	fill_in_info, e_card_simple_sync_card, e_card_simple_set_phone,
-	e_card_simple_set_address, e_card_simple_set_delivery_address,
-	file_as_get_style, file_as_set_style, e_card_simple_set,
-	e_card_simple_set_arbitrary),
-	gui/contact-editor/e-contact-editor-address.c
-	(e_contact_editor_address_destroy,
-	e_contact_editor_address_set_arg,
-	e_contact_editor_address_get_arg),
-	gui/contact-editor/e-contact-editor-fullname.c
-	(e_contact_editor_fullname_destroy,
-	e_contact_editor_fullname_set_arg,
-	e_contact_editor_fullname_get_arg),
-	gui/contact-editor/e-contact-editor.c (phone_entry_changed,
-	address_text_changed, name_entry_changed, full_name_clicked,
-	full_addr_clicked, fill_in_info): Changed these to use the new ref
-	and unref functions for ECard auxillary types.
-
-	* backend/ebook/e-card-simple.h: Added a comment.
-
-	* backend/ebook/e-card-types.h: Added ref_count field to all the
-	types.
-
-	* backend/ebook/e-card.c, backend/ebook/e-card.h: Added ref and
-	unref functions here for all the ECard auxillary types.  Removed
-	the corresponding free functions.  Switched to using these
-	functions where appropriate.
-
-	* gui/component/addressbook-factory.c: #include
-	<e-util/e-passwords.h>
-
-	* gui/component/addressbook.c (load_uri_cb): const correctify.
-
-	* gui/component/select-names/e-select-names-manager.c,
-	gui/component/select-names/e-select-names.c: #include
-	<addressbook/gui/component/addressbook.h>
-
-	* gui/widgets/e-addressbook-model.c (modify_card): Removed an
-	unnecessary ref here.
-
-2001-10-11  Dan Winship  <danw@ximian.com>
-
-	* gui/component/select-names/e-select-names.c (update_folder):
-	Don't need this any more.
-
-2001-10-11  Jon Trowbridge  <trow@ximian.com>
-
-	* gui/component/addressbook.c (new_contact_cb): Check that
-	view->view != NULL.
-	(save_contact_cb): Check that view->view != NULL.
-	(search_cb): Check that view->view != NULL.
-	(delete_contact_cb): Check that view->view != NULL.
-	(print_cb): Check that view->view != NULL.
-	(print_preview_cb): Check that view->view != NULL.
-	(stop_loading_cb): Check that view->view != NULL.
-	(cut_contacts_cb): Check that view->view != NULL.
-	(copy_contacts_cb): Check that view->view != NULL.
-	(paste_contacts_cb): Check that view->view != NULL.
-	(select_all_contacts_cb): Check that view->view != NULL.
-	(send_contact_cb): Check that view->view != NULL.
-	(send_contact_to_cb): Check that view->view != NULL.
-	(update_command_state): Check that view->view != NULL.  Hold a
-	reference to the AddressbookView for the duration of the function,
-	in case we exit during bonobo-reentrancy.
-	(addressbook_view_ref): Added.
-	(addressbook_view_unref): Added.  Simple ref counting for
-	AddressbookView objects.
-	(addressbook_view_clear): Zero out an AddressbookView.  This is
-	now separated from the deallocation of the AddressbookView object,
-	so that we don't leave a dangling pointer if we exit during
-	bonobo-reentrancy in update_command_state. (Which often seems to
-	happen if we exit while addressbook operations are going on.)
-	(destroy_callback): Replace previous call to addressbook_view_free
-	with addressbook_view_clear/addressbook_view_unref calls.
-	(addressbook_factory_new_control): Initialize the reference count
-	in the AddressbookView object.
-
-	* gui/widgets/e-addressbook-view.c (e_addressbook_view_destroy):
-	Carefully zero out our destroyed object.
-	(command_state_change): Hold a reference to ourselves during the
-	signal emission.
-	(get_selected_cards): Ref cards as we add them to the list.
-	(e_addressbook_view_stop): Check for view != NULL.
-	(e_addressbook_view_can_create): Check for view != NULL.
-	(e_addressbook_view_can_print): Check for view != NULL.
-	(e_addressbook_view_can_save_as): Check for view != NULL.
-	(e_addressbook_view_can_send): Check for view != NULL.
-	(e_addressbook_view_can_send_to): Check for view != NULL.
-	(e_addressbook_view_can_delete): Check for view != NULL.
-	(e_addressbook_view_can_cut): Check for view != NULL.
-	(e_addressbook_view_can_copy): Check for view != NULL.
-	(e_addressbook_view_can_paste): Check for view != NULL.
-	(e_addressbook_view_can_select_all): Check for view != NULL.
-	(e_addressbook_view_can_stop): Check for view != NULL.
-
-	* gui/widgets/e-addressbook-model.c (addressbook_destroy): Be
-	careful about zeroing out our destroyed object.
-	
-	* backend/ebook/e-book-view.c (e_book_view_stop): Added.  Stops
-	event processing in the underlying listener.
-
-2001-10-10  Jon Trowbridge  <trow@ximian.com>
-
-	* gui/component/select-names/e-select-names-manager.c
-	(e_select_names_manager_destroy): If our select names dialog is
-	still around, destroy it.  Otherwise, the dialog will hang around
-	after our composer goes away.
-
-2001-10-06  Chris Toshok  <toshok@ximian.com>
-
-	* gui/component/addressbook-config.glade: add an Email Address
-	field/label/help text.
-
-	* gui/component/addressbook-config.c
-	(addressbook_source_dialog_set_source): fill in the email entry
-	from the source.  also, set the initial state of the email
-	label/entry.
-	(auth_checkbutton_changed): set the email label/entry
-	sensitive/editable if auth is turned on, and
-	insensitive/uneditable if it's off.
-	(addressbook_source_dialog_get_source): get the email address from
-	the email entry.
-	(addressbook_source_dialog): hook up the email entry to the
-	changed signal foo, as well as the focus handler for displaying
-	help text.
-
-2001-10-06  Jon Trowbridge  <trow@ximian.com>
-
-	* gui/component/select-names/e-select-names-manager.c
-	(e_select_names_manager_new): db isn't a BonoboObject, so don't
-	bonobo_object_unref it!
-
-2001-10-05  Chris Toshok  <toshok@ximian.com>
-
-	* gui/component/select-names/e-select-names.c
-	(addressbook_model_set_uri): e_book_load_uri ->
-	addressbook_load_uri.
-
-	* gui/component/select-names/e-select-names-manager.c
-	(e_select_names_manager_new): e_book_load_uri ->
-	addressbook_load_uri.
-
-	* gui/component/addressbook.c (forget_passwords_cb): new function,
-	call e_passwords_forget_passwords.
-	(verbs): Add ContactsForgetPasswords.
-	(load_uri_auth_cb): new function, call the callback and free up
-	our closure stuff.
-	(load_uri_cb): once the uri is loaded, check if we're configured
-	to authenticate for it, and do so, using the e_passwords stuff.
-	(addressbook_load_uri): wrapper around e_book_load_uri.  save off
-	the parameters and start the load-with-auth machinery.
-	(book_open_cb): remove all the auth stuff from here, as it's
-	handled elsewhere now.
-
-	* gui/component/addressbook-factory.c (main): call
-	e_passwords_init.
-
-	* gui/component/addressbook-component.c (user_create_new_item_cb):
-	e_book_load_uri -> addressbook_load_uri.
-	(destination_folder_handle_drop): same.
-
-	* gui/component/addressbook.h: add prototype for
-	addressbook_load_uri (a wrapper around e_book_load_uri that also
-	handles authentication if the user selects it.)
-
-2001-10-05  Jon Trowbridge  <trow@ximian.com>
-
-	* gui/component/select-names/e-select-names.c
-	(real_add_address_cb): Check to make sure our call to
-	e_addressbook_model_get_card doesn't return NULL.
-
-	* gui/widgets/e-addressbook-model.c
-	(e_addressbook_model_get_card): Chek that we aren't requesting a
-	negative row.
-
-	* gui/contact-list-editor/e-contact-list-editor.c (add_email_cb):
-	Move to the bottom of the scrolled window, so we can see the
-	address we just added.
-	(table_drag_data_received_cb): Move to the bottom of the scrolled
-	window, so we can see the contact we just dropped.
-
-	* gui/component/addressbook.c (addressbook_factory_new_control):
-	We don't own the string returned by e_categories_master_list_nth,
-	so terrible things will happen if we free it. (Bug 10916)
-
-2001-10-05  Chris Toshok  <toshok@ximian.com>
-
-	* gui/widgets/e-addressbook-view.c (e_addressbook_view_set_arg):
-	don't set the editable field on the model - let the book do that.
-	(book_writable_cb): call writable_status to propagate a ui-change
-	event up (and sensitize the write-only toolbar buttons after you
-	authenticate with ldap.)
-
-2001-10-04  Chris Toshok  <toshok@ximian.com>
-
-	* backend/ebook/e-book.c (activate_factories_for_uri): for some
-	reason, matching on protocol is causing problems for me.
-	disabling it for now.
-
-2001-10-04  Chris Toshok  <toshok@ximian.com>
-
-	* gui/component/addressbook-component.c: use ldap.png for ldap
-	contacts.
-
-2001-10-03  Iain Holmes  <iain@ximian.com>
-
-	* addressbook/gui/component/addressbook-storage.c 
-	(addressbook_storage_setup): Only load_storages if you have LDAP.
-	(load_source_data): Only do stuff if you have LDAP.
-
-2001-10-03  Christopher James Lahey  <clahey@ximian.com>
-
-	* gui/widgets/e-addressbook-reflow-adapter.c (addressbook_height),
-	gui/widgets/e-minicard.c (remodel): Fixed these to determine the
-	fields to use properly.
-
-2001-10-02  Jon Trowbridge  <trow@ximian.com>
-
-	* gui/component/select-names/e-select-names-completion.c
-	(name_style_query): Strip out commas before forming our query.
-	(match_name): Use e_card_compare_name_to_string_full, rather
-	than our crufty old matching code.  Not only is this cleaner,
-	but that crufty old code was very broken when it came to 
-	handling strings with whitespace. (Bug 8988)
-	(match_nickname): utf8 and bug fixes.
-
-	* backend/ebook/e-card-compare.c
-	(e_card_compare_name_to_string_full): Added.  This is basically
-	e_card_compare_name_to_string with a bunch of extra options, so
-	that it can more readily be reused in other contexts.
-	(e_card_compare_name_to_string): This is now just a call to
-	e_card_compare_name_to_string_full with the extra args filled in
-	to defaults that simulate the old behavior.
-
-2001-10-02  Chris Toshok  <toshok@ximian.com>
-
-        * backend/ebook/e-book.c (e_book_construct): remove most of the
-	oaf stuff from here.  we do it in load_uri, where we'll have more
-	information (namely, the protocol we're using.)
-	(activate_factories_for_uri): do an oaf query to get a list of all
-	objects implementing our BookFactory interface and also supporting
-	the protocol used in the uri.
-        (e_book_load_uri): try activating book factories to handle this
-	uri, and start the iteration over the list.
-        (e_book_load_uri_from_factory): try and load the uri.
-        (e_book_load_uri_open_cb): callback function for the
-	BookFactory_openBook call - if it succeeds, call the user's
-	callback.  otherwise step to the next factory.
-        (e_book_load_uri_step): go to the next factory in our list, and
-	error out if there are no more.
-	
-2001-10-02  Christopher James Lahey  <clahey@ximian.com>
-
-	* gui/component/select-names/e-select-names-model.c
-	(e_select_names_model_get_textification): Made the max length of
-	the textification be 2047 characters.  Fixes Ximian bug #3021.
-
-2001-10-01  JP Rosevear  <jpr@ximian.com>
-
-	* conduit/address-conduit.c (ecard_from_remote_record): if there
-	was no first name or last name, file as the company.
-
-2001-10-01  JP Rosevear  <jpr@ximian.com>
-	
-	* backend/pas/pas-backend-file.c
-	(pas_backend_file_changes_foreach_key): if there is a db error,
-	assume deletion
-	(pas_backend_file_changes): write after all is done for efficiency
-
-2001-09-28  JP Rosevear  <jpr@ximian.com>
-
-	* backend/pas/pas-backend-file.c
-	(pas_backend_file_changes_foreach_key): g_strdup
-	(pas_backend_file_changes): ditto, make sure to free all data and
-	do a hash write after each add/remove
-
-	* conduit/address-conduit.c (local_record_to_pilot_record): use
-	the local record category
-	(local_record_from_ecard): ndle the fields and category we don't
-	sync by making sure we don't overwrite them
-
-2001-09-27  Chris Toshok  <toshok@ximian.com>
-
-	* backend/ebook/e-book.c (e_book_construct): do an oaf query to
-	get a list of all objects implementing our BookFactory interface,
-	instead of just activating the one IID.  this should really be a
-	global list, not a per EBook.
-	(e_book_load_uri): start the iteration over our list of
-	BookFactory's.
-	(e_book_load_uri_from_factory): try and load the uri.
-	(e_book_load_uri_open_cb): callback function for the
-	BookFactory_openBook call - if it succeeds, call the user's
-	callback.  otherwise step to the next factory.
-	(e_book_load_uri_step): go to the next factory in our list, and
-	error out if there are no more.
-
-2001-09-27  JP Rosevear  <jpr@ximian.com>
-
-	* conduit/address-conduit.c (local_record_from_ecard): use the old
-	record (if there was one) so as not to overwrite fields we don't
-	sync
-	(pre_sync): store the dbi in the context and don't make it object
-	data
-
-2001-09-26  Chris Toshok  <toshok@ximian.com>
-
-	* backend/pas/pas-book-factory.c (pas_book_factory_destroy): use
-	priv->iid instead of the hardcoded string here.
-	(pas_book_factory_activate): parameterize the factory's iid, as in
-	the calendar server, and provide a default if iid == NULL.
-
-	* backend/pas/pas-book-factory.h: add iid parameter for
-	pas_book_factory_activate.
-
-2001-09-26  Jon Trowbridge  <trow@ximian.com>
-
-	* backend/ebook/e-destination.c (e_destination_get_textrep): Use
-	camel_address_format, not camel_address_encode.
-
-2001-09-26  Anna Marie Dirks  <anna@ximian.com>
-
-	* gui/contact-editor/contact-editor.glade: Added help text (thanks 
-	to Aaron) and re-worded the labels, and fixed the shortcuts on the 
-	brand-spanking-new Collaboration tab.
-	
-
-2001-09-26  Chris Toshok  <toshok@ximian.com>
-
-	* gui/component/select-names/e-select-names-manager.h: add
-	completion_book.
-
-	* gui/component/select-names/e-select-names-manager.c
-	(e_select_names_manager_new): get /Addressbook/Completion/uri, and
-	if it's present, use the corresponding EBook for completing
-	addresses.
-	(focus_out_cb): use manager->completion_book here instead of NULL,
-	which corresponds to the local addressbook.
-	(completion_popup_cb): same.
-	(e_select_names_manager_create_entry): same.
-
-2001-09-26  Jon Trowbridge  <trow@ximian.com>
-
-	* backend/ebook/e-card-compare.c (e_card_compare_name_to_string):
-	Properly handle names when the individual elements (given,
-	addition, family) contain whitespace.  (Bug #10502)
-
-	* backend/ebook/e-destination.c (e_destination_set_name): Reset
-	textrep when we change the name.
-	(e_destination_set_email): Reset textrep when we change the email.
-	(e_destination_get_textrep): Make sure that the textrep version of
-	the address is properly quoted if it contains unsafe characters.
-	(All related to bug #10796)
-
-	* gui/component/select-names/e-select-names-completion.c
-	(match_nickname): Fix nickname matching. (bug #9698)
-	(make_match): Use e_completion_match_new when building our match,
-	rather than ad hoc manipulation of the struct.
-
-2001-09-26  JP Rosevear  <jpr@ximian.com>
-
-	* backend/pas/pas-backend-file.c (pas_backend_file_changes): set
-	the last_use and use_score fields of the card to known values so
-	the card doesn't register as changed when only they have changed
-
-2001-09-26  Peter Williams  <peterw@ximian.com>
- 
- 	* conduit/address-conduit.c (ecard_from_remote_record): Fix this function
- 	to set email addresses properly, and handle multiple occurrences of
- 	email addresses, home phone numbers, and business phone numbers.
-	
-2001-09-25  Christopher James Lahey  <clahey@ximian.com>
-
-	* gui/component/addressbook-component.c (user_create_new_item_cb):
-	Handle creating the new contact in the current folder if it's a
-	contacts folder.  Fixes Ximian bug #7814.
-
-2001-09-24  Chris Toshok  <toshok@ximian.com>
-
-	* backend/pas/Makefile.am (LDAP_SCHEMA): add
-	evolutionperson.schema
-	(EXTRA_DIST): add LDAP_SCHEMA to the dist (but don't install it).
-
-2001-09-23  JP Rosevear  <jpr@ximian.com>
-
-	* conduit/address-conduit.c (ecard_from_remote_record): sync the
-	note the to pilot and make sure to blank fields when appropriate
-	(local_record_from_ecard): sync the note to the desktop
-
-2001-09-22  Chris Toshok  <toshok@ximian.com>
-
-	* backend/pas/pas-backend-file.c (do_create): g_free (id) in the
-	error case to plug a memory leak.
-
-2001-09-22  Chris Toshok  <toshok@ximian.com>
-
-	* gui/widgets/e-minicard.c (remodel): when creating the cards,
-	don't display any of the subname fields (surname, given, middle,
-	suffix, etc.)
-
-2001-09-22  Chris Toshok  <toshok@ximian.com>
-
-	* backend/ebook/e-card-simple.c
-	(e_card_simple_get): add getters for the additional name fields.
-	(field_data): move FAMILY_NAME to the end of the list, and add
-	GIVEN_NAME, ADDITIONAL_NAME (middle name), and NAME_SUFFIX.
-	
-	* backend/ebook/e-card-simple.h: same.
-
-2001-09-21  Christopher James Lahey  <clahey@ximian.com>
-
-	* gui/component/addressbook.c (print_preview_cb): Hooked up print
-	preview button.
-
-	* gui/widgets/e-addressbook-view.c,
-	gui/widgets/e-addressbook-view.h
-	(e_addressbook_view_print_preview): Added this function.
-
-	* printing/e-contact-print.c, printing/e-contact-print.h
-	(e_contact_print_preview): Added this function.
-
-2001-09-19  Jon Trowbridge  <trow@ximian.com>
-
-	* backend/ebook/e-destination.c (name_and_email_simple_query_cb):
-	Use the default e-mail address if we have nothing else to go on.
-	Previously we just failed, which basically meant that name-only
-	searches would never work properly.
-	(nickname_simple_query_cb): The logic was a bit tangled here; if
-	our query status isn't SUCCESS, always give up but don't leak the
-	destination.  And if our nickname query fails and we try the
-	name-and-email query, use the textrep for a name-only search.  The
-	only reason we are doing a nickname query in the first place is if
-	we have an obviously invalid e-mail.
-	(launch_cardify_query): Use e_destination_is_valid to determine
-	if we should try a nickname query first.
-	These changes basically fix bug 7728, and generally make the
-	auto-cardification of addresses a lot more clever and robust.
-
-	* backend/ebook/e-book-util.c (name_and_email_cb): Use
-	e_card_compare_name_to_string instead of e_card_name_match_string.
-	(e_book_name_and_email_query): The arguments to g_strsplit were
-	in the wrong order.  Doh!
-
-	* backend/ebook/e-card-compare.c (e_card_compare_name_to_string):
-	Added.  Replaces e_card_name_match_string, and actually works.
-
-	* backend/ebook/e-card.c: Removed e_card_name_match_string
-	function, which didn't work particularly well.
-
-2001-09-19  JP Rosevear  <jpr@ximian.com>
-
-	* conduit/address-conduit.c (cursor_cb): don't add to the complete
-	list of cards if the card is a list
-	(card_added): don't add to the list of changes if the card is a
-	list
-	(card_changed): ditto
-	(card_removed): ditto
-
-2001-09-19  Jon Trowbridge  <trow@ximian.com>
-
-	* gui/component/select-names/e-select-names.c
-	(e_select_names_hookup_shell_listeners): Change the "this should
-	never happen" message into a request for people to e-mail me
-	directly with info if they encounter that error.
-
-	* backend/ebook/e-book-util.c (e_book_name_and_email_query):
-	Freeing name[i] instead of namev[i] is a bad idea. (bug #10270)
-
-	* gui/component/select-names/e-select-names-popup.c
-	(popup_menu_card): Properly handle our GnomeUIInfo labels so that
-	they won't be leaked if they are dynamic strings, so that they
-	will be i18n-correct, and so that underscores won't be interpreted
-	as key accelerators.  What a PITA.  Also, don't leak our
-	iterators.  (Bug #10200.)
-	(popup_menu_list): The same GnomeUIInfo tweaking as in
-	popup_menu_card.
-	(popup_menu_nocard): Ditto.
-
-2001-09-18  JP Rosevear  <jpr@ximian.com>
- 
- 	* backend/ebook/e-card-simple.c (field_data): add caluri field data
- 
- 	* backend/ebook/e-card.c (e_card_get_vobject): add the caluri
- 	property when appropriate
- 	(parse_caluri): handle read caluri
- 	(e_card_class_init): add caluri arg
- 	(e_card_destroy): free the caluri
- 	(e_card_get_arg): return caluri arg
- 	(e_card_set_arg): set caluri from arg
- 	(e_card_init): init caluri to null
- 
- 	* backend/ebook/e-card-simple.h: new simple field
- 
- 	* backend/ebook/e-card.h: new member
- 
- 	* gui/contact-editor/e-contact-editor.c (field_changed): util
- 	callback to change the command state
- 	(set_entry_changed_signal_field): hook up a change signal to above
- 	(set_entry_changed_signals): use above function
- 
- 	* gui/contact-editor/e-contact-editor.glade: Add collaboration
- 	page and fields
-	
-2001-09-18  JP Rosevear  <jpr@ximian.com>
-
-	* backend/pas/pas-backend-file.c
-	(pas_backend_file_build_cards_list): create a sexp and check if
-	the cards match before adding them to the list
-	(pas_backend_file_process_get_cursor): send extra param
-
-2001-09-18  Larry Ewing  <lewing@ximian.com>
-
-	* gui/component/select-names/e-select-names-completion.c
-	(book_query_process_card_list): unref the destination regardless
-	of whether we get an email addresss.
-
-2001-09-17  Larry Ewing  <lewing@ximian.com>
-
-	* gui/component/select-names/e-select-names-completion.c
-	(name_style_query): use g_strfreev.
-	(match_name): s/g_free/g_strfreev.
-	(match_file_as): s/g_free/g_strfreev.
-
-	* backend/ebook/e-book-util.c (e_book_name_and_email_query): fix
-	the memory handling here.  All there members of the vector need to
-	be freed all the time.
-
-	* backend/ebook/load-pine-addressbook.c (parse_line): free the
-	string outside of the test that makes sure there are three
-	entries.
-
-	* gui/component/select-names/e-select-names-completion.c
-	(match_nickname): don't malloc a match we will never use.
-
-	* gui/widgets/e-addressbook-model.c (get_view): free the dup'd
-	capabilities.
-
-2001-09-17  Jon Trowbridge  <trow@ximian.com>
-
-	* backend/ebook/e-destination.c (e_destination_is_valid): We want
-	to assume that a destination that comes from a card is
-	automatically valid, but the right way to check that is by calling
-	e_destination_from_card, not by checking if dest->priv->card !=
-	NULL.  (Fixed bug #10017)
-
-	* gui/component/select-names/e-select-names-completion.c
-	(match_name): Fixed a stupid bug was causing completion to fail
-	for contacts who have only one name.  (The classic example we all
-	know and love is 'George <jirka@5z.com>')  (bug #8353)
-
-	* backend/ebook/e-card.c (e_card_list_send): Do the right thing if
-	the card we are trying to send to has no valid e-mail addresses.
-	(bug #10137)
-
-	* gui/widgets/e-minicard.c (e_minicard_event): Code implicitly
-	assumed that event->button.button is 1, 2, or 3, causing disaster
-	when using a wheel-mouse.  Fixed. (bug #9400)
-
-2001-09-16  Chris Toshok  <toshok@ximian.com>
-
-	* gui/contact-editor/e-contact-editor.c (_phone_arrow_pressed):
-	use enable_widget instead of gtk_widget_set_sensitive.
-	(_email_arrow_pressed): same.
-	(_address_arrow_pressed): same.
-	(disable_widget_foreach): same.
-	(enable_writable_fields): same.
-	(set_editable): same.
-	(enable_widget): new function, using both gtk_widget_set_sensitive
-	and *_set_editable to allow the user to select text in GtkEntry's
-	and GtkText's.
-
-	* gui/contact-editor/e-contact-editor-fullname.c
-	(e_contact_editor_fullname_set_arg): use set_editable as well as
-	set_sensitive, to allow the user to select text in GtkEntry's.
-
-	* gui/contact-editor/e-contact-editor-address.c
-	(e_contact_editor_address_set_arg): same.
-
-2001-09-16  Chris Toshok  <toshok@ximian.com>
-
-	* backend/pas/evolutionperson.schema: fix syntax errors (which are
-	broken, imo...)
-
-2001-09-16  Chris Toshok  <toshok@ximian.com>
-
-	* gui/component/addressbook-storage.h: reorder the LDAP scopes so
-	that they match the order of the option menus in the glade file.
-
-	* gui/component/addressbook-config.c (auth_checkbutton_changed):
-	new function, mostly there to house some #ifdef'ed out code.
-	(option_menuitem_activated): new function, to keep track of
-	changes to the ldap scope optionmenu.
-	(addressbook_source_dialog_set_source): set the menu history as
-	well as the dialog's copy of the scope.
-	(addressbook_source_dialog_get_source): fill in the source's scope
-	from the dialog's copy, and add more #if the_ui_gods_smile_on_me
-	code.
-	(add_activate_cb): new function, add an activate callback for the
-	optionmenu's items.
-	(addressbook_source_dialog): more #if the_ui_gods_smile_on_me
-	code, always start the dialog on page 0, and hook up the
-	scope optionmenu's items.
-
-2001-09-15  Jon Trowbridge  <trow@ximian.com>
-
-	* backend/ebook/e-card-compare.c (e_card_compare_name): No
-	loose name matches on family names. (#8802)
-
-	* gui/component/select-names/e-select-names-text-model.c
-	(e_select_names_text_model_activate_obj): We can't use NULL as the
-	first arg for e_addressbook_show_contact_editor anymore.  Damn.
-	(#8535)
-
-	* backend/ebook/e-book-listener.c (e_book_listener_stop): Make
-	"stop" do nothing but set the stopped flag, as in
-	e-book-view-listener.c.
-	(e_book_listener_destroy): Clean up our queue here, rather than in
-	e_book_listener_stop.
-	(response_free): Added.  Move the rather lengthy bit of code
-	needed to free a EBookListenerResponse into one place.
-	(e_book_listener_check_queue): Properly deal with the stopped
-	flag.
-	(e_book_listener_queue_response): If the stopped flag is set, just
-	drop the incoming response.
-
-	* backend/ebook/e-book-view-listener.c
-	(e_book_view_listener_stop): Make "stop" do nothing but set the
-	stopped flag.
-	(e_book_view_listener_destroy): Move all of the clean-up that used
-	to be in e_book_view_listener_stop here.  This considerably simplifies
-	the logic required to avoid various race conditions.
-	(e_book_view_listener_check_queue): Properly deal with the stopped flag.
-	(e_book_view_listener_queue_response): Drop all incoming responses if
-	we are stopped.
-
-2001-09-14  Jon Trowbridge  <trow@ximian.com>
-
-	* backend/pas/pas-book.c (pas_book_queue_request): Hold a
-	reference to the book on behalf of our idle function.
-	(pas_book_check_queue): When we are finished, drop the reference
-	we've been holding on behalf of the idle function.
-
-	* backend/pas/pas-backend-file.c
-	(pas_backend_file_process_create_card): Hold a reference to the
-	book_view while sending our notifications.
-	(pas_backend_file_process_remove_card): Hold a reference to the
-	book_view while sending our notifications.
-
-	* gui/contact-editor/e-contact-quick-add.c (quick_add_unref): Remove
-	debugging spew.
-
-	* backend/ebook/e-book-util.c: Remove a lot of unused code that
-	worked around bugs that have long since been fixed.
-	(simple_query_disconnect): Added.  Breaks out the part of
-	simple_query_free that disconnect signals.
-	(simple_query_free): Replace code w/ a call to
-	simple_query_disconnect.
-	(simple_query_sequence_complete_cb): Call simple_query_disconnect
-	before executing the callback, so that our callbacks don't get
-	triggered by any book changes that might occur during that
-	callback.
-
-	* backend/ebook/e-book-view-listener.c
-	(e_book_view_listener_check_queue): Changed to be consistent with
-	e_book_listener_check_queue.
-	(e_book_view_listener_queue_response): Also changed to use a
-	high-frequency timeout.
-
-	* backend/ebook/e-book-listener.c (e_book_listener_check_queue):
-	OK, I've agonized over this stupid little function, and it should
-	now be race-free.
-	(e_book_listener_queue_response): We process our response queue in
-	a high-frequency timeout rather than an idle.  Using an idle
-	function leads to some tricky race conditions and bad interactions
-	with bonobo's semi-broken attempts to take over event processing.
-	(e_book_view_listener_stop): Manually disable our timeout and
-	clean up.
-
-2001-09-14  Ettore Perazzoli  <ettore@ximian.com>
-
-	[Automake 1.5 fixes pointed out by Richard Boulton
-	<richard@tartarus.org>, as per #9258.]
-
-	* gui/component/select-names/Makefile.am: Set CLEANFILES directly
-	instead of using `+='.
-
-	* backend/pas/Makefile.am: Rename `LDAP_BACKEND_SOURCES' to
-	`LDAP_BACKEND_FILES'.
-
-	* backend/ebook/Makefile.am: Set CLEANFILES directly instead of
-	using `+='.
-
-2001-09-13  Chris Toshok  <toshok@ximian.com>
-
-	* backend/pas/pas-backend-ldap.c (pas_backend_ldap_connect): use
-	ldap_init.  ldap_open is deprecated in openldap 2.x.
-
-2001-09-12  Iain Holmes  <iain@ximian.com>
-
-	* backends/ebook/evolution-vcard-importer.c (check_file_is_vcard):
-	Fix the check.
-
-2001-09-12  Larry Ewing  <lewing@ximian.com>
-
-	* backend/ebook/e-destination.c: free the values that are being
-	leaked here.
-
-2001-09-12  Jon Trowbridge  <trow@ximian.com>
-
-	* gui/component/select-names/e-select-names-completion.c (match_email): 
-	printf arguments were reversed by mistake.  Fixed bug #9693.
-
-2001-09-09  Jon Trowbridge  <trow@ximian.com>
-
-	* gui/component/select-names/e-select-names-popup.c
-	(popup_menu_list): Added.  Treat right-clicks on a contact list as
-	a special case.
-	(e_select_names_popup): Check if we are dealing with a contact
-	list.
-
-	* backend/ebook/e-book-view-listener.c
-	(e_book_view_listener_check_queue): See
-	e_book_listener_check_queue below.
-	(e_book_view_listener_queue_response): See
-	e_book_listener_queue_response below.
-
-	* backend/ebook/e-book-listener.c (e_book_listener_check_queue):
-	Explicitly prohibit reentrancy.  Use gtk-unref rather than
-	bobobo-unref.
-	(e_book_listener_queue_response): Hold a gtk-ref to the listener
-	while the idle function runs, not a bonobo-ref.  As far as I can
-	tell, it is impossible to avoid a race condition here when we have
-	to worry about bonobo reentrancy.
-
-	* gui/component/select-names/e-select-names-text-model.c
-	(e_select_names_text_model_insert_length): Alter a copy of the
-	original EDestination, rather than just using a new one.  We need
-	to do this to preserve prior-card information for possible
-	reversion later.
-	(e_select_names_text_model_delete): Ditto.
-
-	* backend/ebook/e-destination.c (e_destination_clear_card): When
-	clearing a destination where ->card != NULL, store it for possible
-	reversion later.
-	(e_destination_revert): If we have an old card stored, go back to
-	using it for the destination.
-	(e_destination_is_valid): Tries to detect obviously broken
-	addresses.
-	(e_destination_cardify): If our destination is invalid, first try
-	to cardify simply by reverting to an older card.
-	(e_destination_destroy): Unref any cached old card.
-	(e_destination_copy): Copy the old card information.
-
-2001-09-07  Jon Trowbridge  <trow@ximian.com>
-
-	* gui/component/select-names/e-select-names.c
-	(sync_table_and_models): Show all rows in the table, and then
-	remove the rows that correspond to entries in the
-	ESelectNamesModels in the children.
-	(real_add_address): Freeze/thaw our ESelectNamesModel, so that we
-	don't change our table while we are in the middle of iterating
-	over the selection.
-	(remove_address): Just delete the address from the
-	ESelectNamesModel, the signal handler will do the rest.
-	(selected_rows_foreach_cb): Call remove_address to do our dirty
-	work.
-	(e_select_names_add_section): Connect to the 'changed' signal from
-	the ESelectNamesModel, and call sync_table_and_models explicitly to
-	get our initial state correct.
-
-	* gui/component/select-names/e-select-names-table-model.c
-	(fill_in_info): Deal with EDestinations in our table that don't
-	come from cards.
-
-	* gui/component/select-names/e-select-names-manager.c: Added
-	another ESelectNamesModel* to the ESelectNamesManagerSection
-	struct.  Called 'original_model', this contains a copy of the
-	model as it is when we begin using the SelectNames dialog.
-	(section_copy): Copy the original model.
-	(section_free): Free the original model.
-	(e_select_names_manager_add_section_with_limit): Initialize the
-	original model.
-	(e_select_names_clicked): I've changed the semantics of this
-	dialog quite a bit... no UI freeze can stop me!  If OK is clicked,
-	we do nothing.  If Cancel is clicked, we revert to the
-	'original_model' copy of our address entry state before we started
-	editting.  Finally, we close the dialog before any of thing. Doing
-	it last caused problems, because signals were being triggered
-	which had dangling pointers as their closures.
-	(e_select_names_manager_activate_dialog): Copy our current state
-	to the original model, and share the same ESelectNamesModel
-	between the dialog and the address entry in the composer..
-	(e_select_names_manager_get_cards): Removed.  It had been
-	#if 0/#endif-ed out for a while.
-
-	* gui/component/select-names/e-select-names-model.c
-	(e_select_names_model_freeze): Added.
-	(e_select_names_model_thaw): Added.
-	(e_select_names_model_uncardify): Added.  If possible,
-	"uncardifies" a specific model entry.
-	(e_select_names_model_changed): Changed to pay attention
-	to the freeze count.
-
-	* gui/component/select-names/e-select-names-completion.c
-	(clean_query_text): Strip leading/trailing whitespace from
-	queries.
-
-	* backend/ebook/e-destination.c (e_destination_uncardify): Added.
-	Converts a card-associated destination into a text-associated
-	destination w/ the e-mail address.
-	(e_destination_list_to_vector): Added.  A convenience routine.
-	(e_destination_freev): Added.  A convenience routine.
-	(e_destination_touchv): Added.  I'm lazy.
-
-2001-09-08  Chris Toshok  <toshok@ximian.com>
-
-	(make_contact_editor_cb): show the right contact editor (the list
-	editor for list cards).
-	
-2001-09-08  Chris Toshok  <toshok@ximian.com>
-
-	* gui/component/select-names/e-select-names-popup.c
-	(popup_menu_card): do the EDestination xml magic on email
-	addresses we put in the popup.
-
-2001-08-27  Zbigniew Chyla  <cyba@gnome.pl>
-
-	* gui/component/addressbook.c (addressbook_factory_new_control):
-	For every category:
-	- set .translate to FALSE (e_categories_master_list_nth returns
-	translated category name)
-	- convert category name in UTF-8 to locale's encoding
-
-2001-08-23  Zbigniew Chyla  <cyba@gnome.pl>
-
-	* gui/component/select-names/e-select-names-popup.c
-	(popup_menu_card): Fixed two bugs:
-	- missing coversion of contact name to GTK+ locale,
-	- passing dynamically created string (contact name) inside uiinfo struct
-	to gnome-app-helper functions.
-	Remember: these functions may change strings, trying to translate them!
-	(popup_menu_nocard): Ditto
-
-2001-09-07  Christopher James Lahey  <clahey@ximian.com>
-
-	* gui/component/addressbook-component.c: Removed unused factory
-	variable.
-
-2001-09-06  Chris Toshok  <toshok@ximian.com>
-
-	* gui/component/addressbook-storage.c (notify_listener): new
-	function, notify the bonobo listener.
-	(remove_ldap_folder): track change to EvolutionStorage signal.
-	(create_ldap_folder): same, and make sure the type is
-	"ldap-contacts".
-	(load_source_data): folders that we create should have
-	"ldap-contacts" as their type.
-	(addressbook_storage_add_source): same.
-
-	* gui/component/addressbook-component.c: (folder_types): add
-	"ldap-contacts", for display of ldap servers (they get their own
-	icon, and their own name in the Create New Folder dialog.
-	(create_view): use IS_CONTACT_TYPE since we support two folder
-	types now.
-	(create_folder): same.
-	(remove_folder): same.
-	(xfer_folder): same.
-
-2001-09-06  Chris Toshok  <toshok@ximian.com>
-
-	* gui/contact-editor/e-contact-editor.c: (pixmaps): change
-	/Toolbar/ContactEditorSave to /Toolbar/ContactEditorSaveClose.
-
-2001-09-06  Chris Toshok  <toshok@ximian.com>
-
-	* gui/component/Makefile.am (INCLUDES): add -DEVOLUTION_IMAGESDIR.
-
-	* gui/widgets/e-addressbook-view.c (card_deleted_cb): remove
-	status messages from here.
-	(e_addressbook_view_delete_selection): same.
-
-	* gui/widgets/e-addressbook-model.c (sequence_complete): emit a
-	NULL status message along with the stop_state_changed.  The null
-	status message will clear the status bar for this view.
-
-	* gui/component/addressbook.c (set_status_message): use the
-	EvolutionActivityClient stuff.
-
-	* backend/pas/pas-backend-ldap.c (view_destroy): remove status
-	message for abandoning a search.
-	(ldap_op_process_current): wrap status messages in _().
-	(ldap_op_process): same.
-	(create_card_handler): same, and remove the notify_status for ""
-	and add a notify_complete call after the card is added.
-	(remove_card_handler): same.
-	(modify_card_handler): same.
-	(poll_ldap): wrap status messages with _(), and remove the "Search
-	Complete" message.
-	(ldap_search_handler): wrap status message.
-
-	* backend/pas/pas-backend-file.c (pas_backend_file_search): use
-	_() on status messages, and make sure the last notify_* called is
-	notify_complete.
-
-2001-09-05  Ettore Perazzoli  <ettore@ximian.com>
-
-	[Fix #958, ShellComponents should not be created by factories, for
-	the addressbook.]
-
-	* gui/component/addressbook-component.c
-	(GNOME_EVOLUTION_ADDRESSBOOK_COMPONENT_FACTORY_ID): Removed.
-	(GNOME_EVOLUTION_ADDRESSBOOK_COMPONENT_ID): New.
-	(create_component): Renamed from `factory_fn'.  Just register the
-	thing on OAF.
-	(addressbook_component_factory_init): Just call it.
-
-	* gui/component/GNOME_Evolution_Addressbook.oaf.in: Remove the
-	ShellComponentFactory.
-
-2001-09-04  Iain Holmes  <iain@ximian.com>
-
-	* backend/ebook/evolution-vcard-importer.c (load_file_fn): Return FALSE
-	if the file isn't a valid VCard file.
-
-2001-08-05  Zbigniew Chyla  <cyba@gnome.pl>
-
-	I18n fixes (mainly making buttons on the right side less Anglocentric :-)
-
-	* backend/ebook/e-card-simple.c
-	(field_data): Marked "name" and "short_name" fields for translation.
-	(e_card_simple_get_name, e_card_simple_get_short_name): Return
-	localized version of the name (using U_() macro).
-
-	* gui/contact-editor/e-contact-editor.c (set_entry_changed_signals):
-	Connect "changed" signal from "entry-web" entry to widget_changed.
-	(changing this field wasn't making "Save and Close" button sensitive)
-
-	* gui/widgets/Makefile.am (glade_DATA): Removed alphabet.glade.
-
-	* gui/widgets/e-addressbook-view.c
-	(button_labels, button_letters): New strings containing a list of
-	labels and "values" of all buttons placed on the right side of the
-	addressbook view (intended for localization).
-	(struct LetterClosure): Changed the type of letter field to gunichar.
-	(e_utf8_split): New function, similar to g_strsplit, but operates on
-	UTF-8 strings.
-	(jump_to_letter): Don't hardcode letters, build queries dynamically
-	using UTF-8 and localized letters stored in button_letters.
-	(connect_button): Removed.
-	(create_alphabet): Don't use glade file, build buttons manually using
-	(localized) labels from button_labels. Use (localized) values from
-	button_letters when creating LetterClosure.
-
-	* gui/widgets/e-minicard-view-widget.[ch]
-	(e_minicard_view_widget_jump_to_letter): Changed the type of the
-	second argument from char to gunichar.
-
-	* gui/widgets/e-minicard-view.c
-	(compare_to_utf_str): Renamed from compare_to_letter, now operates on
-	UTF-8 string.
-	(e_minicard_view_jump_to_letter): Changed the type of the second
-	argument from char to gunichar + conversion to UTF-8 string.
-
-	* gui/widgets/e-minicard-view.h
-	(e_minicard_view_jump_to_letter): Changed the type of the second
-	argument from char to gunichar.
-
-2001-09-02  Christopher James Lahey  <clahey@ximian.com>
-
-	* backend/ebook/e-book.c (e_book_add_card, e_book_commit_card),
-	backend/pas/pas-backend-file.c (do_create),
-	backend/pas/pas-backend-ldap.c
-	(create_card_handler, remove_card_handler, modify_card_handler,
-	pas_backend_ldap_process_get_vcard, poll_ldap): Use
-	e_card_get_vcard_assume_utf8 instead of e_card_get_vcard here
-	since all internal communications and database storage are assumed
-	to be utf8.
-
-	* backend/ebook/e-card-simple.c, backend/ebook/e-card-simple.h
-	(e_card_simple_duplicate): Simplified this function considerably.
-	(e_card_simple_get_vcard_assume_utf8): Added this function.
-
-	* backend/ebook/e-card.c, backend/ebook/e-card.h (e_card_new,
-	e_card_load_cards_from_file, e_card_load_cards_from_string): Made
-	these functions pay attention to charset attributes.
-	(e_card_new_with_default_charset,
-	e_card_load_cards_from_file_with_default_charset,
-	e_card_load_cards_from_string_with_default_charset): New functions
-	that let you change the default charset from UTF-8.
-	(e_card_get_vcard): Made this write out charset attributes when
-	necessary.
-	(e_card_get_vcard_assume_utf8): New function that writes out a
-	card without writing out charset attributes.
-
-	* backend/ebook/evolution-vcard-importer.c (book_open_cb),
-	backend/ebook/load-gnomecard-addressbook.c (book_open_cb),
-	backend/ebook/test-card.c (main),
-	gui/component/addressbook-component.c
-	(destination_folder_handle_drop), gui/contact-editor/test-editor.c
-	(main), gui/contact-list-editor/e-contact-list-editor.c
-	(table_drag_data_received_cb), gui/widgets/e-addressbook-view.c
-	(selection_received), gui/widgets/e-minicard-control.c
-	(pstream_load): Changed the default charset to be used here to
-	ISO-8859-1.
-
-	* backend/ebook/load-gnomecard-addressbook.c (add_card_cb),
-	backend/ebook/load-pine-addressbook.c (add_card_cb),
-	backend/ebook/test-client-list.c (get_cursor_cb),
-	backend/ebook/test-client.c (get_cursor_cb, get_card_cb): Use
-	e_card_get_vcard_assume_utf8 to print out testing strings.
-
-	* gui/component/select-names/e-select-names-model.c,
-	gui/component/select-names/e-select-names-model.h
-	(e_select_names_model_contains): Changed this to be const
-	EDestination *dest to fix a warning.
-
-	* gui/contact-editor/e-contact-editor.c (e_contact_editor_init):
-	Translate window title here.
-
-2001-08-31  Zbigniew Chyla  <cyba@gnome.pl>
-
-	* gui/component/addressbook-storage.c
-	(addressbook_get_other_contact_storage): s/_/U_/
-
-	* gui/widgets/e-addressbook-reflow-adapter.c (addressbook_compare):
-	Use g_utf8_collate.
-
-	* gui/widgets/e-minicard.c (e_minicard_compare):
-	Ditto.
-
-	* printing/e-contact-print.c (card_compare):
-	Ditto.
-
-2001-08-29  Jon Trowbridge  <trow@ximian.com>
-
-	* gui/component/select-names/e-select-names-manager.c
-	(e_select_names_clicked): Use e_select_names_model_merge to
-	combine the selected names with any existing ones.  This causes
-	you to not lose addresses typed directly into the entry while the
-	SelectNames dialog is up. (Bug #8058)
-
-	* gui/component/select-names/e-select-names-model.c
-	(e_select_names_model_merge): Merge the contents of one
-	ESelectNamesModel into another, avoiding duplicates.
-
-	* backend/ebook/e-destination.c (e_destination_equal): Added.
-	Determines if two destinations appear to refer to the same
-	recipient.
-
-	* backend/ebook/e-card.c (e_card_list_send): Added cast to
-	g_free args to silence compiler warnings.
-
-	* gui/contact-editor/e-contact-quick-add.c (quick_add_set_name):
-	Paranoia.  Check that name != qa->name.
-	(quick_add_set_email): Check that email != qa->email.
-	(ce_have_book): Store the QuickAdd data structure in object data,
-	so that we can be extra-careful and avoid having a dangling
-	pointer floating around out somewhere as the closure for a signal.
-	Fixes bug #8155, I think.
-	(card_added_cb): Clear object data to ensure single unref.
-	(editor_closed_cb): Clear object data to ensure single unref.
-
-	* gui/component/select-names/e-select-names-completion.c
-	(book_query_score): Make sure that comp->priv->query_text isn't
-	NULL.  (Fixes bug #8195)
-
-	* backend/ebook/e-book-listener.c (e_book_listener_check_queue):
-	This function can be re-entrant during the signal emission; Added
-	extra ref/unrefs and checks to avoid problems if this happens.
-	This is similar to my recent changes to
-	e_book_view_listener_check_queue.  (Fixes bug #7400)
-
-2001-08-27  Ettore Perazzoli  <ettore@ximian.com>
-
-	* gui/component/addressbook-component.c: Get rid of a warning by
-	initializing the closing NULL element in folder_types correctly.
-
-	* gui/component/select-names/e-select-names.c: Updated to match
-	the studlyCapsification of attributes in shell/Evolution*.idl.
-
-2001-08-27  Jon Trowbridge  <trow@ximian.com>
-
-	* gui/component/select-names/e-select-names-completion.c
-	(sexp_file_as): Added.  Generated queries against file_as.
-	(match_file_as): Added.  Match results of queries against
-	file_as. (Bug #8152)
-
-	* backend/ebook/e-book-view-listener.c
-	(e_book_view_listener_check_queue): Added ref/unref pair to make
-	sure that our listener doesn't get finalized during the signal
-	emission and leave us with a dangling pointer. (Bug #7661)
-
-	* backend/ebook/e-card.c (e_card_list_send): Removed some debugging
-	spew that I left in by mistake.
-
-	* gui/widgets/e-addressbook-model.c (create_card): Removed debugging
-	spew.
-
-	* backend/ebook/e-card.c (e_card_list_send): Do the right thing if
-	the card we are trying to send to is a contact list. (Bug #6580)
-
-2001-08-27  Zbigniew Chyla  <cyba@gnome.pl>
-
-	* gui/widgets/e-addressbook-util.c (e_addressbook_error_dialog):
-	Display localized status string (added missing _()).
-
-2001-08-24  Jon Trowbridge  <trow@ximian.com>
-
-	* backend/ebook/e-destination.c (e_destination_set_card): Put a
-	freeze/thaw around our the set of operations that changes the
-	internal state of our card, so 'changed' signal callbacks won't be
-	invoked on a card in an intermediary state.  This fixes the bug
-	that was causing the e-mail addresses in cards to be blank when
-	replying to a message.  (An unexpected side-effect of toshok's
-	change on 8/22 to make sure that priv->email != NULL).
-	(e_destination_get_name): Code slightly rearranged for (IMO)
-	clarity.
-
-2001-08-23  Chris Toshok  <toshok@ximian.com>
-
-	* gui/widgets/e-minicard.c (e_minicard_event): add
-	BUTTON_PRESS_MASK so double clicks still work.
-
-2001-08-23  Chris Toshok  <toshok@ximian.com>
-
-	* gui/component/addressbook.c (addressbook_query_changed): switch
-	"full_name" to "x-evolution-any-field" in all the queries where we
-	want to match all cards, since the backends universally handle
-	this special case more efficiently.
-
-2001-08-22  Jon Trowbridge  <trow@ximian.com>
-
-	* gui/contact-list-editor/e-contact-list-editor.c (extract_info):
-	In the GUI, the toggle is labelled "hide addresses", not "show
-	addresses" -- so we have to reverse the boolean value we read in.
-	(fill_in_info): Same bug as before: since the GUI reads "hide", we
-	have to initialize the toggle to '!show_addresses', not
-	'show_addresses'.
-
-	* backend/ebook/e-destination.c
-	(e_destination_list_show_addresses): Added.
-	(e_destination_xml_encode): Encode the value of
-	e_destination_list_show_addresses into the XML.
-	(e_destination_xml_decode): Read and store the "show_addresses"
-	flag.
-
-2001-08-22  jacob berkman  <jacob@ximian.com>
-
-	* gui/component/e-address-popup.c (emit_event): emit an event from
-	our event source
-	(contact_editor_cb): emit a destroy event so our control frame can
-	be destroyed.
-	(edit_contact_info_cb): emit a hide event so our control frame can
-	be hidden
-	(e_address_popup_cardify):
-	(add_contacts_cb): emit the destroy event
-	(e_address_popup_factory_new_control): don't unref our object at
-	widget destroy time as that was really really broken
-	(e_address_popup_factory_new_control): create an event source and
-	aggregate ourself with it
-
-	* gui/contact-editor/e-contact-editor.c (enable_writable_fields):
-	display a nicer warning when we can't find a widget for a given
-	field
-	(e_contact_editor_raise): only raise if there is a window
-
-	* gui/contact-editor/contact-editor.glade: name some widgets that
-	got unnamed, and set the first entry as defaultable
-
-	* gui/contact-editor/e-contact-editor.c: envelope printing is
-	disabled in 1.0
-
-2001-08-22  Chris Toshok  <toshok@ximian.com>
-
-	* backend/ebook/e-destination.c (e_destination_get_email): make
-	sure we don't get into a situation where priv->email == NULL.
-
-2001-08-21  Chris Toshok  <toshok@ximian.com>
-
-	* gui/widgets/e-minicard.c (e_minicard_event): if we're dragging,
-	drag_button_down won't be true in the BUTTON_RELEASE case, since
-	we set it to false in MOTION_NOTIFY once the threshold is reached.
-	(e_minicard_drag_end): remove this function, since it was needed
-	to work around a bug in gnome-canvas.
-	
-2001-08-20  Jon Trowbridge  <trow@ximian.com>
-
-	* gui/component/select-names/e-select-names.c
-	(e_addressbook_create_ebook_table): Wrap our addressbook table
-	adapter in an ETableWithout, so that we can make addresses appear
-	and disappear when we remove/add them to the section lists
-	(To/Cc/Bcc) on the right of the dialog.
-	(real_add_address_cb): When we add an address, hide it in the main
-	list.
-	(e_select_names_init): Get pointer to our without table from the
-	table's object data, and store it.
-	(remove_address): When we remove an address, show it in the main
-	list.
-	(card_key): Added.  Allocate a unique key from an ECard.
-	(esn_get_key_fn): Added.  Callback for ETableWithout.
-	(esn_dup_key_fn): Added.  Callback for ETableWithout.
-	(esn_free_gotten_key_fn): Added.  Callback for ETableWithout.
-	(esn_free_duped_key_fn): Added.  Callback for ETableWithout.
-
-	* backend/ebook/e-card-simple.c (e_card_simple_get): Changed
-	E_CARD_SIMPLE_FIELD_NAME_OR_ORG to first try the FILE_AS
-	type.  This allows the cards in the ESelectName dialog to
-	appear in proper sort order (i.e. as 'Doe, John' rather than
-	'John Doe').  Fixes ximian #6002.
-
-2001-08-20  Chris Toshok  <toshok@ximian.com>
-
-	* gui/widgets/e-addressbook-reflow-adapter.c
-	(e_addressbook_reflow_adapter_class_init): fix arg info - we're
-	only passing 1 GTK_TYPE_POINTER arg, not 2.
-
-	* gui/widgets/e-minicard.c (e_minicard_event): lots of fixes for
-	DnD.  For GDK_BUTTON_PRESS, we grab immediately.  For
-	GDK_BUTTON_MOTION, we start the drag after a certain threshold,
-	and connect to the "drag_end" signal on our canvas so we'll know
-	when the drag is complete.  For GDK_BUTTON_RELEASE, we release the
-	grab if we were dragging and get the event.
-	(e_minicard_drag_end): new function, just remove the pointer/gtk
-	grabs and disconnect.
-
-	* gui/widgets/e-minicard.h (struct _EMinicard): add "gint
-	drag_button"
-
-2001-08-20  JP Rosevear  <jpr@ximian.com>
-
-	* backend/pas/pas-backend-file.c
-	(pas_backend_file_changes_foreach_key): use DB_NOTFOUND const
-	
-2001-08-20  JP Rosevear  <jpr@ximian.com>
-
-	* backend/pas/pas-backend-file.c
-	(pas_backend_file_process_get_changes): null out card_sexp so that
-	we don't crash when copying
-
-2001-08-20  JP Rosevear  <jpr@ximian.com>
-
-	* conduit/address-conduit.c: fix warnings, get compiling again
-
-	* conduit/address-conduit-config.h: remove c/p typos
-
-	* conduit/address-conduit.h: ditto
-
-	* conduit/Makefile.am: link against the static camel
-
-2001-08-20  Damon Chaplin  <damon@ximian.com>
-
-	* gui/contact-editor/e-contact-editor.c: use bigger Save icon for
-	toolbar. Used Delete icon in menu.
-
-	* gui/component/addressbook.c: use 'Save As' icon rather than 'Save'
-	as it seems more appropriate. Also added delete icon for menu.
-
-2001-08-19  Ettore Perazzoli  <ettore@ximian.com>
-
-	* gui/component/addressbook-component.c: Update the folder list to
-	include a display name and a description.
-
-2001-08-19  Damon Chaplin  <damon@ximian.com>
-
-	* gui/component/addressbook.c: use new Cut/Copy/Paste/Save/Search
-	icons.
-
-2001-08-19  Christopher James Lahey  <clahey@ximian.com>
-
-	* gui/component/addressbook.c (set_folder_bar_label),
-	gui/widgets/e-addressbook-model.c,
-	gui/widgets/e-addressbook-model.h (update_folder_bar_message),
-	gui/widgets/e-addressbook-view.c, gui/widgets/e-addressbook-view.h
-	(folder_bar_message): Set the folder bar message here.  Fixes
-	Ximian bug #4670.
-
-	* gui/component/select-names/e-select-names-model.c (SEPLEN): Use
-	strlen(SEPARATOR) here so that if the separator changes the length
-	will work properly.
-
-2001-08-19  Christopher James Lahey  <clahey@ximian.com>
-
-	* gui/contact-editor/fulladdr.glade: Added full country list.
-	Fixes Ximian bug #5123.
-
-2001-08-18  Ettore Perazzoli  <ettore@ximian.com>
-
-	* gui/component/addressbook.c: Hook up `delete-message.png' as the
-	icon for "ContactDelete".
-	* gui/contact-editor/e-contact-editor.c: Likewise.
-
-2001-08-17  Chris Toshok  <toshok@ximian.com>
-
-	* gui/component/addressbook-storage.h: add prototype for
-	addressbook_get_other_contact_storage.
-
-	* gui/component/addressbook-storage.c
-	(addressbook_get_other_contact_storage): rename register_storage
-	to this, and return the EvolutionStorage.
-	(load_source_data): register_storage =>
-	addressbook_get_other_contact_storage.
-	(addressbook_storage_add_source): register_storage =>
-	addressbook_get_other_contact_storage.
-
-2001-08-17  Chris Toshok  <toshok@ximian.com>
-
-	* gui/contact-editor/e-contact-editor.c
-	(set_entry_changed_signals): connect to the "changed" signal on
-	"entry-web" to update command state.
-
-2001-08-17  Chris Toshok  <toshok@ximian.com>
-
-	* gui/contact-list-editor/e-contact-list-editor.c (list_added_cb):
-	call e_card_set_id on the list's card so we can continue to use
-	this dialog.  also, call command_state_changed if we aren't
-	closing the dialog so the toolbar is properly sensitized.
-	(list_deleted_cb): always close the dialog after we successfully
-	delete a list.
-
-	* gui/contact-editor/e-contact-editor.c (card_added_cb): call
-	e_card_set_id on the card so we can continue to use this dialog
-	(to modify or delete the card.)
-	(card_deleted_cb): always close the dialog after we successfully
-	delete a card.
-
-2001-08-17  Chris Toshok  <toshok@ximian.com>
-
-	* gui/component/addressbook.c (addressbook_query_changed): call
-	e_sexp_encode_string on the search string the user types in so it
-	doesn't break sexp parsing in the wombat.
-
-2001-08-17  Damon Chaplin  <damon@ximian.com>
-
-	* gui/component/addressbook.c: changed to new print icon.
-
-2001-08-17  Chris Toshok  <toshok@ximian.com>
-
-	* gui/component/select-names/e-select-names.c: (struct
-	ESelectNamesFolder): rename physical_uri to uri, since it includes
-	the addressbook.db for file: uris.
-	(e_select_names_folder_free): physical_uri => uri.
-	(e_select_names_option_activated): physical_uri => uri, and we
-	don't need to strdup_printf "addressbook.db" onto the end anymore.
-	(new_folder): if the physical_uri is a file: uri, append
-	/addressbook.db onto it.
-	(hookup_listener): new function, split out lots of code from
-	e_select_names_hookup_shell_listener.
-	(e_select_names_hookup_shell_listeners): rename
-	e_select_names_hookup_shell_listener to this, and hookup both the
-	local and "Other Contacts" listener, using hookup_listener.
-	(e_select_names_destroy): disconnect from the
-	other_contacts_listener and unref it.
-
-	* gui/component/select-names/e-select-names.h (struct
-	_ESelectNames): add a listener for Other Contacts, and rename
-	"listener" to "local_listener."
-
-2001-08-17  Jon Trowbridge  <trow@ximian.com>
-
-	* gui/component/select-names/e-select-names-completion.c
-	(e_select_names_completion_seq_complete_cb): If we get the
-	"sequence_complete" signal when we aren't searching, it means the
-	addressbook changed out from under us.  Clear the search cache, so
-	that future completion requests won't use the out-of-date cached
-	data.  Also, don't unref book_view... we leave the EBookView open
-	so that we can catch these addressbook changes.
-	(e_select_names_completion_do_query): Don't use the book_view
-	being non-NULL as a sign that another query is still running.
-	(e_select_names_completion_got_book_view_cb): Properly unref any
-	previous value in book_view.
-
-2001-08-17  Christopher James Lahey  <clahey@ximian.com>
-
-	* gui/widgets/e-addressbook-reflow-adapter.c
-	(e_addressbook_reflow_adapter_right_click),
-	gui/widgets/e-addressbook-view.c (table_right_click): Changed the
-	messages here in the right click menus.
-
-2001-08-17  Chris Toshok  <toshok@ximian.com>
-
-	* backend/pas/pas-backend-ldap.c (view_destroy): unref our
-	card_sexp.
-	(create_card_handler): make sure to set the id of the vcard so it
-	gets properly transmitted back to the BookView, and notify all
-	matching BookViews to add the created card.
-	(remove_card_handler): notify all matching BookViews to remove the
-	card.
-	(modify_card_handler): notify all matching BookViews to modify the
-	card.
-	(pas_backend_ldap_process_get_book_view): init card_sexp based on
-	the view's search.
-
-2001-08-17  Chris Toshok  <toshok@ximian.com>
-
-	* backend/pas/pas-backend-file.c
-	(pas_backend_file_book_view_copy): use card_sexp.
-	(pas_backend_file_book_view_free): same.
-	(vcard_matches_search): use the new pas_backend_card_sexp_match_vcard call.
-	(pas_backend_file_search): use card_sexp.
-	(pas_backend_file_process_get_book_view): same.
-
-	* backend/pas/Makefile.am (libpas_a_SOURCES): add
-	pas-backend-card-sexp.[ch].
-
-2001-08-17  Christopher James Lahey  <clahey@ximian.com>
-
-	* gui/component/addressbook-component.c (factory_fn): Added code
-	so the user can create a new contact or contact list from anywhere
-	in evolution.
-
-2001-08-16  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* backend/pas/evolutionperson.schema: Added a closing paren.
-
-2001-08-16  Jon Trowbridge  <trow@ximian.com>
-
-	* gui/component/select-names/e-select-names-completion.c
-	(e_select_names_completion_handle_request): Renamed from _begin to
-	match changes in gal 0.10.99.3.
-
-	* gui/contact-editor/e-contact-quick-add.c (e_contact_quick_add): 
-	Check that name != NULL before we start messing with it.
-	(Fixes bug #7329)
-
-2001-08-16  Jon Trowbridge  <trow@ximian.com>
-
-	* gui/component/select-names/e-select-names-completion.c
-	(match_nickname): Boost scoring on an exact nickname match.
-	Manually addressify match.
-	(match_name): Manually addressify matches.
-	(book_query_score): Remove automatic addressification.
-
-	* gui/component/addressbook.c (addressbook_query_changed): Minor
-	tweak to avoid a crash if we have a negative subid with id
-	ESB_CATEGORY.  This should never happen.
-	(addressbook_menu_activated): Reset the entry/option when we
-	select "Clear".
-	Some changes to reflect renaming in ESearchBar.
-
-	* gui/component/select-names/e-select-names-bonobo.c
-	(entry_set_property_fn): Cardify after importing destinations.
-	This might fix a problem that Damon is having.
- 
-2001-08-15  Chris Toshok  <toshok@ximian.com>
-
-	* gui/component/addressbook-config.glade: set title of initial
-	dialog to Addressbook Sources (bug #6704).
-
-2001-08-15  Chris Toshok  <toshok@ximian.com>
-
-	* gui/component/addressbook-storage.c (create_ldap_folder): don't
-	let people add subdirs in the ldap server storage - everything is
-	toplevel there.
-
-2001-08-14  Chris Toshok  <toshok@ximian.com>
-
-	* backend/pas/pas-backend-ldap.c
-	(pas_backend_ldap_process_get_vcard): implement using
-	search_for_dn.
-
-2001-08-14  Federico Mena Quintero  <federico@ximian.com>
-
-	* gui/component/addressbook.c (addressbook_factory_new_control):
-	Tell the search bar to translate the subitem texts.
-
-2001-08-14  Jon Trowbridge  <trow@ximian.com>
-
-	* gui/component/addressbook.c (addressbook_factory_new_control):
-	Add "Any Category" option for category searches.
-	(addressbook_query_changed): Do the right thing on an
-	"Any Category" search.
-
-2001-08-14  Dan Winship  <danw@ximian.com>
-
-	* backend/pas/pas-backend-ldap.c: Fix up to match the
-	pas_book_new/get_vcard changes.
-
-2001-08-14  Christopher James Lahey  <clahey@ximian.com>
-
-	* gui/merging/e-card-merging-book-commit-duplicate-detected.glade:
-	Got rid of an extraneous _ here.
-
-	* gui/widgets/e-addressbook-util.c (e_addressbook_error_dialog):
-	Changed Canceled to Cancelled here.  Fixes Ximian bug #2465.
-
-2001-08-14  Christopher James Lahey  <clahey@ximian.com>
-
-	* backend/pas/pas-book.c (pas_book_respond_get_vcard): Oops,
-	forgot to write this function.
-
-2001-08-14  Christopher James Lahey  <clahey@ximian.com>
-
-	* gui/contact-editor/contact-editor.glade: Added focus targets
-	here.  Fixes part of Ximian bug #5843.
-
-2001-08-14  Christopher James Lahey  <clahey@ximian.com>
-
-	* gui/contact-editor/e-contact-editor.c (e_contact_editor_init):
-	Grab focus here.  Fixes Ximian bug #2265.
-
-2001-08-14  Christopher James Lahey  <clahey@ximian.com>
-
-	* gui/component/addressbook.c (addressbook_factory_new_control): 
-	(addressbook_query_changed): Fixed two const warnings here.
-
-	* printing/e-contact-print-envelope.c,
-	printing/e-contact-print-envelope.h: Fixed some missing includes
-	here.
-
-2001-08-14  Christopher James Lahey  <clahey@ximian.com>
-
-	* backend/ebook/e-book-view.c (add_book_iterator): Call
-	e_card_set_book here.
-
-	* backend/ebook/e-book.c (e_book_do_response_get_vcard): Call
-	e_card_set_book here.
-
-	* backend/ebook/e-card.c, backend/ebook/e-card.h: Pulled out the
-	part where the uri is made part of the uid.  Made uri a separate
-	field.  Fixes Ximian bug #6490.
-
-	* backend/ebook/e-destination.c, backend/ebook/e-destination.h:
-	Change this to use ECard's split uids and uris.
-
-2001-08-13  Chris Toshok  <toshok@ximian.com>
-
-	* backend/pas/pas-backend-ldap.c (add_to_supported_fields): don't
-	g_strdup the stuff we're passing into e_list_append, since it does
-	the copy for us.
-	(check_schema_support): don't initialize supported_fields list
-	here, since there's a gross case where the programmer/user can
-	bring up the contact editor before the connection stuff is
-	finished, and we don't want to crash.
-	(pas_backend_ldap_init): move it here to we can guarantee it's
-	there. (bug #6546).
-
-2001-08-13  Chris Toshok  <toshok@ximian.com>
-
-	* gui/component/addressbook-config.c
-	(addressbook_source_dialog_set_source): don't access source->auth
-	if source == NULL (bug #7086).
-
-2001-08-13  Christopher James Lahey  <clahey@ximian.com>
-
-	* backend/ebook/e-book-listener.c,
-	backend/ebook/e-book-listener.h, backend/ebook/e-book.c,
-	backend/ebook/e-book.h, backend/idl/addressbook.idl,
-	backend/pas/pas-backend-file.c, backend/pas/pas-book.c,
-	backend/pas/pas-book.h: Changed get_card to be asyncronous.
-
-	* backend/ebook/e-card.c, backend/ebook/test-client.c: Changed
-	these to deal with the new get_card functionality.
-
-2001-08-11  Kjartan Maraas  <kmaraas@gnome.org>
-
-	* gui/component/select-names/e-select-names.c: Mark a string for translation.
-	* This fixes bug #7052
-	* printing/e-contact-print.h: Add headers to make it stand on itw own.
-	* printing/e-contact-print.c: Marked some strings for translation.
-	* printing/e-contact-print-envelope.c: Same here.
-	
-2001-08-10  Jon Trowbridge  <trow@ximian.com>
-
-	* gui/contact-editor/e-contact-quick-add.c (e_contact_quick_add):
-	Remove single- or double-quotes from names before sticking them
-	into the addressbook. (Bug #6499)
-
-	* gui/component/addressbook.c (addressbook_query_changed):
-	Properly handle "Category is" queries by checking the search bar
-	suboption.
-	(addressbook_factory_new_control): Attach subitems corresponding
-	to all wombat categories to the "Category is" ESearchBarItem.
-
-	* gui/component/addressbook.c: Set the ESearchBarItem
-	subitems explicitly to NULL.
-
-2001-08-10  Anna Marie Dirks <anna@ximian.com>
-	 * gui/component/select-names/select-names.glade: did a little
-	packing-magic to get the two tables at bottom of this dialog
-	to seem to line up. 
-
-	*gui/component/select-names/e-select-names.c: changed the title
-	of this dialog to "Select Contacts from Addressbook". 
-
-2001-08-09  Anna Marie Dirks <anna@ximian.com>
-        * gui/component/select-names/select-names.glade: redesigned
-        this dialog to fix bug #6815. 
-
-	*gui/component/select-names/e-select-names.c: connected the
-	widgets (or one of them anyway. clahey did the rest) for my
-	new and lovely glade file.
-	
-2001-08-09  Chris Toshok  <toshok@ximian.com>
-
-	* gui/component/addressbook.c: remove passwd_cb.
-
-2001-08-09  Jon Trowbridge  <trow@ximian.com>
-
-	* gui/component/select-names/e-select-names-text-model.c
-	This change is dedicated to Jacob Berkman.
-	(e_select_names_text_model_insert_length): If the last character
-	we inserted was a "magic comma", remember its position.
-	(e_select_names_text_model_delete): If the last character we
-	inserted was a "magic comma", and if the next thing we do is to
-	hit backspace, delete both the comma and the extra whitespace we
-	added.
-	(e_select_names_text_model_init): Initialize our last magic comma
-	position.
-
-2001-08-09  Jon Trowbridge  <trow@ximian.com>
-
-	* gui/component/select-names/e-select-names-manager.c
-	(e_select_names_manager_create_entry): Hook up some magic to
-	(basically) cardify an entry on focus-out.  (What we do is actually
-	more complicated than that.)
-
-	* gui/component/select-names/e-select-names-bonobo.c
-	(entry_set_property_fn): After we set an entry's text, try to
-	cardify it.  We need to do this so that (for example) reply
-	e-mails get properly cardified.
-
-	* gui/component/select-names/e-select-names-model.c
-	(e_select_names_model_duplicate): Use e_select_names_model_append,
-	rather than manipulating lists directly.
-	(e_select_names_model_insert): Connect "changed" signal proxy for
-	added EDestination.
-	(e_select_names_model_append): Ditto.
-	(e_select_names_model_replace): Ditto, and disconnect signals for
-	replaced EDestination.
-	(e_select_names_model_delete): Ditto on the disconnection.
-	(e_select_names_model_delete_all): Ditto.
-	(e_select_names_model_cardify): Added.  Try to cardify a specified
-	EDestination.
-	(e_select_names_model_cancel_cardify): Added.  Cancel the pending
-	cardification of a single EDestination.
-	(e_select_names_model_cardify_all): Added.  Cardify all of the
-	EDestinations in the model.
-	(e_select_names_model_cancel_cardify_all): Added.  Cancel's any
-	and all pending cardifications.
-
-	* backend/ebook/e-destination.c (e_destination_class_init): Added
-	"changed" and "cardified" signals.
-	(e_destination_freeze): Added (static).
-	(e_destination_thaw): Added (static).
-	(e_destination_clear_card): Reset allow_cardify and
-	cannot_cardify, cancel any pending cardifications, and emit the
-	"changed" signal.
-	(e_destination_clear_strings): Emit the "changed" signal.
-	(e_destination_clear): Do freeze/thaw to prevent multiple signal
-	emissions.
-	(e_destination_set_card): Check that the card we are setting is
-	not equal to the current card, and emit the "changed" signal if we
-	are actually changing.
-	(e_destination_set_card_uri): Emit "changed" signal, if necessary.
-	(e_destination_set_name): Emit "changed" signal, if necessary.
-	(e_destination_set_email): Emit "changed" signal, if necessary.
-	(e_destination_set_html_mail_pref): Emit "changed" signal, if
-	necessary.
-	(use_card_cb): If we've just loaded/set the ECard, emit the
-	"changed" signal.
-	(e_destination_set_raw): Emit "changed" signal, if necessary.
-	(e_destination_allow_cardification): Added.
-	(e_destination_set_allow_cardification): Added.
-	(e_destination_cardify): Added.  Tries to automatically convert
-	a string-based EDestination to one based on an ECard.
-	(e_destination_cardify_delayed): Added.  Cardifies in a timeout.
-	(e_destination_cancel_cardify): Added.  Cancels any pending
-	cardifications.
-	(e_destination_xml_decode): Added freeze/thaw.
-
-	* backend/ebook/e-book-util.c (e_book_nickname_query): Added.  A
-	canned simple query for nicknames.
-
-	* backend/ebook/e-card.c (e_card_email_find_number): Added.  Given
-	a card and an string containing an email address, return the index
-	number of the address inside of the card, or -1 if the address is
-	not found.
-
-2001-08-09  Chris Toshok  <toshok@ximian.com>
-
-	[ Fixes ximian bugs #5080, #6021, #6704, #6705 ] 
-	
-	* gui/component/addressbook.c (book_open_cb): create our own
-	dialog that prompts for both the email address and the password.
-	the email address is stored in the source and filled in for the
-	user after the first time they enter one and press OK.
-
-	* gui/component/addressbook-storage.c (create_ldap_folder): has a
-	return value, not a int* parameter.
-	(create_ldap_folder): new function, we can create ldap servers
-	from the File->New->Folder menu item now.
-	(register_storage): hook up the "create_folder" signal.
-	(addressbook_storage_init_source_uri): remove the file case, we
-	only build ldap uris here.
-	(load_source_data): remove the file source stuff, and handle
-	"emailaddr".
-	(save_source_data): call ldap_source_foreach directly.
-	(addressbook_source_free): remove file source stuff.
-	(addressbook_source_copy): same.
-
-	* gui/component/addressbook-storage.h: get rid of all the file
-	source stuff from AddressbookSource, since this is only being used
-	for ldap servers.
-
-	* backend/pas/pas-backend-ldap.c
-	(pas_backend_ldap_process_authenticate_user): look up the ldap
-	entry based on the provided email address and use the resulting
-	DN/passwd to authenticate.
-
-	* gui/component/addressbook-config.c: pretty much gutted to make
-	it work with the new UI.
-
-	* gui/component/addressbook-config.glade: new version from anna.
-	
-2001-08-09  Christopher James Lahey  <clahey@ximian.com>
-
-	* gui/widgets/e-addressbook-view.c (SPEC): Upped the minimum width
-	on all addressbook columns to 75.  Fixes Ximian bug #2773.
-
-2001-08-08  Chris Toshok  <toshok@ximian.com>
-
-	* gui/contact-editor/e-contact-quick-add.c (ce_have_book): mark
-	the dialog as changed so the save button is immediately available.
-
-	* gui/contact-editor/e-contact-editor.c (card_modified_cb): once
-	we save reset the change flag to false if we aren't closing the
-	dialog.
-	(card_added_cb): same.
-	(e_contact_editor_class_init): add a "changed" arg.
-	(e_contact_editor_set_arg): add setter for "changed".
-	(e_contact_editor_get_arg): add getter for "changed".
-
-2001-08-08  Chris Toshok  <toshok@ximian.com>
-
-	* gui/contact-editor/e-contact-quick-add.c (ce_have_book): better
-	to assume that we can write to the local addressbook than that we
-	can't write to it :)
-
-2001-08-08  Chris Toshok  <toshok@ximian.com>
-
-	* gui/contact-list-editor/e-contact-list-editor.c (create_ui):
-	call e_pixmap_update so we can use the same save/save-as pixmaps
-	as the contact editor.
-
-2001-08-08  Chris Toshok  <toshok@ximian.com>
-
-	* gui/widgets/e-addressbook-reflow-adapter.c (open_card): new
-	function, used by the context menu.
-	(e_addressbook_reflow_adapter_right_click): put "Open" at the top
-	of the menu.  also, disable "Delete" if the addressbook isn't
-	writable.
-
-2001-08-08  Chris Toshok  <toshok@ximian.com>
-
-	* backend/pas/pas-backend-ldap.c (rfc2254_escape): escape *, \, (,
-	and ), as per rfc2254.
-	(func_contains): escape the string.
-	(func_is): same.
-	(func_beginswith): same.
-	(func_endswith): same.
-
-2001-08-08  Nat Friedman  <nat@ximian.com>
-
-	* gui/widgets/e-addressbook-reflow-adapter.c (print_envelope): If 0'd out
-	since Envelope printing is disabled for 1.0.	
-	* gui/widgets/e-addressbook-view.c (print_envelope): Likewise.
-	* gui/contact-editor/e-contact-editor.c (print_envelope_cb): Likewise.
-
-	* gui/widgets/e-addressbook-reflow-adapter.c
-	(e_addressbook_reflow_adapter_right_click): Removed "Print
-	Envelope" menu item.
-	* gui/widgets/e-addressbook-view.c (table_right_click): Likewise.
-	* gui/contact-editor/e-contact-editor.c	(verbs): Likewise.
-
-2001-08-07  Chris Toshok  <toshok@ximian.com>
-
-	* gui/component/addressbook-storage.c (remove_ldap_folder): ifdef
-	this HAVE_LDAP.
-
-2001-08-07  Chris Toshok  <toshok@ximian.com>
-
-	* gui/search/e-addressbook-search-dialog.c
-	(e_addressbook_search_dialog_init): set the title of the window to
-	"Advanced Search".
-
-2001-08-07  Chris Toshok  <toshok@ximian.com>
-
-	* gui/component/addressbook.c (search_cb): pass view->view instead
-	of the EBook.
-	(addressbook_search_menu_items): remove E_FILTERBAR_ADVANCED.
-	(addressbook_menu_activated): remove E_FILTERBAR_ADVANCED.
-	(addressbook_search_option_items): add "Advanced..." here.
-	(addressbook_query_changed): add special handling for Advanced...
-
-	* gui/search/e-addressbook-search-dialog.h (struct
-	_EAddressbookSearchDialog): add EAddressbookView and remove the
-	model/adapter fields.  Also fix prototype of
-	e_addressbook_search_dialog_new.
-
-	* gui/search/e-addressbook-search-dialog.c
-	(e_addressbook_search_dialog_class_init): get rid of
-	set_arg/get_arg.
-	(button_press): set the query on the EAddressbookView, and always
-	close the dialog.
-	(e_addressbook_search_dialog_init): get rid of the minicard view,
-	and pack the other widgets accordingly.
-	(e_addressbook_search_dialog_new): pass EAddressbookView instead
-	of EBook.
-	(e_addressbook_search_dialog_destroy): remove model/adapter stuff.
-
-2001-08-07  Chris Toshok  <toshok@ximian.com>
-
-	[ Fixes bug #5066 ]
-	* gui/component/addressbook-storage.c (remove_ldap_folder): new
-	function, remove the source.
-	(register_storage): connect to the "remove_folder" signal so we
-	know when to remove the folder.
-
-2001-08-07  Chris Toshok  <toshok@ximian.com>
-
-	* backend/pas/pas-backend-ldap.c (build_card_from_entry): use
-	g_strcasecmp since ldap attribute names are not case sensitive.
-
-2001-08-07  Chris Toshok  <toshok@ximian.com>
-
-	* gui/contact-list-editor/e-contact-list-editor.c
-	(table_drag_data_received_cb): make sure we update the changed
-	state if a successful drop happens.
-
-2001-08-07  Jason Leach  <jleach@ximian.com>
-
-	* gui/component/select-names/e-select-names.c
-	(e_select_names_init): Make the OK button the keyboard default
-	instead of Cancel.  Bug #4942.
-
-2001-08-06  Radek Doulik  <rodo@ximian.com>
-
-	* backend/ebook/e-book.c (e_book_op_free): new EBookOp destructor
-	(e_book_unqueue_op): use e_book_op_free
-	(e_book_do_response_create_card): ditto
-	(e_book_do_response_generic): ditto
-	(e_book_do_response_get_cursor): ditto
-	(e_book_do_response_get_view): ditto
-	(e_book_do_response_get_changes): ditto
-	(e_book_do_response_open): ditto
-	(e_book_do_response_get_supported_fields): ditto
-
-2001-08-05  Radek Doulik  <rodo@ximian.com>
-
-	* backend/ebook/e-book.c (e_book_do_response_get_view): set
-	op->listener to NULL to catch possible use of freed op
-	(e_book_do_response_get_changes): ditto
-
-	* backend/ebook/e-book-view-listener.c
-	   (e_book_view_listener_check_queue): this callback could be (and
-	   indeed is) called from signal emited above, 
-	   signal handler could call e_book_view_listener_stop, so we need to check
-	   if idle is still set and if not we don't want to unref again
-
-2001-08-04  Christopher James Lahey  <clahey@ximian.com>
-
-	* backend/ebook/e-card-compare.c (e_card_compare_name): Made it so
-	that if there's one less match than possible compares are
-	considered more VAGUE.  Fixes Ximian bug #3400.
-
-2001-08-03  Christopher James Lahey  <clahey@ximian.com>
-
-	* gui/component/select-names/e-select-names.c
-	(e_select_names_hookup_shell_listener): Check for storage != NULL
-	here.  This shouldn't come up unless addressbook has crashed
-	previously within this session of evolution, but this is just a
-	bit of insurance.  Fixes Ximian bug #3699.
-
-2001-08-03  Christopher James Lahey  <clahey@ximian.com>
-
-	* backend/ebook/e-card.c (e_card_name_match_string): Changed the
-	criteria of whether the first part of each iteration matched or
-	the second one did.  Before it got it wrong sometimes and caused
-	the pointer to jump off the end of the array.  Fixes Ximian bug
-	#4674.
-
-2001-08-03  Jason Leach  <jleach@ximian.com>
-
-	* gui/component/addressbook-storage.c (load_source_data): Update
-	for EvolutionStorage API changes.
-	(addressbook_storage_add_source): Ditto.
-
-2001-08-03  Christopher James Lahey  <clahey@ximian.com>
-
-	* gui/widgets/e-addressbook-view.c (jump_to_letter): Made this
-	change the query based on which letter is clicked.  Fixes Ximian
-	bug #2202.
-
-2001-08-03  Christopher James Lahey  <clahey@ximian.com>
-
-	* gui/component/addressbook.c (addressbook_factory_new_control):
-	Fixed warnings here.
-
-	* gui/component/select-names/e-select-names-completion.c
-	(hash_cleanup_fn): Removed this unused function.
-
-2001-08-03  Christopher James Lahey  <clahey@ximian.com>
-
-	* backend/ebook/e-card-simple.c (e_card_simple_sync_card,
-	fill_in_info): Made the list of E_CARD_PHONE types in
-	phone_correspondences more complete by adding the new 5
-	E_CARD_PHONE types.  Also, made it a bit less restrictive for some
-	types (E_CARD_PHONE_HOME will actually match
-	E_CARD_SIMPLE_PHONE_ID_HOME now.)  Made e_card_simple_sync_card
-	and fill_in_info search for an exact match in the list of
-	phone_correspondences and then look for a partial match.  Got rid
-	of not going forward when doing a remove from an EList since EList
-	handles this case automatically.
-
-	* backend/ebook/e-card-types.h: Added E_CARD_PHONE types for
-	assistant, callback, radio, telex, and ttytdd.
-
-	* backend/ebook/e-card.c (get_phone_flags, set_phone_flags):
-	Handle the new E_CARD_PHONE types.
-
-2001-08-02  Jon Trowbridge  <trow@ximian.com>
-
-	* printing/Makefile.am (ecpsdir): Add camel dependency.
-
-	* gui/component/Makefile.am: Add camel dependency.
-
-	* backend/ebook/Makefile.am: Add camel dependency.
-
-	* gui/component/addressbook-factory.c (main): Properly init camel.
-
-	* backend/ebook/e-destination.c (e_destination_clear_strings):
-	Clear ->raw.
-	(e_destination_is_empty): We aren't empty if ->raw is set..
-	(e_destination_set_raw): Replaces e_destination_set_string.
-	(e_destination_get_name): Use camel's parser to extract the name
-	from ->raw.
-	(e_destination_get_email): Use camel's parser to extract the email
-	address from ->raw.
-	(e_destination_get_address): Use camel to produce properly quoted,
-	RFC-compliant addresses.  Thanks camel! (Bug #5860)
-
-	* gui/component/select-names/e-select-names-completion.c
-	(emailify_match): Always append an e-mail address, as long as it
-	doesn't have one already at it's beginning or end.  Don't limit
-	self to just emailifying entries tied to cards with multiple
-	addresses.  (I didn't really want to do this, but people seem to
-	like keeping multiple cards for the same person, and other
-	solutions (like scanning all matches for duplicate names, and only
-	emailifying those) just seemed like way too much work for such a
-	limited payoff.)
-
-	* gui/component/select-names/e-select-names-text-model.c:
-	s/e_destination_set_string/e_destination_set_raw/.
-
-	* gui/component/select-names/e-select-names-popup.c
-	(popup_menu_card): Quote _'s in our popup menus, so that "foo_bar"
-	doesn't get displayed as "foobar" w/ the 'b' underlined. (Bug
-	#5558)
-	(popup_menu_nocard): Ditto.
-
-2001-08-02  Jason Leach  <jleach@ximian.com>
-
-	* gui/component/addressbook.c (addressbook_factory_new_control):
-	Removed some extra padding and pack the addressbook view into a
-	frame with inward shadowing, just because it looks prettier.
-
-	* gui/contact-editor/e-contact-editor.c: Use the updated Save,
-	Save As, and Print icons for the menus and toolbar.
-
-2001-08-02  Christopher James Lahey  <clahey@ximian.com>
-
-	* gui/component/addressbook.c: Added ContactsSaveAsVCard,
-	ContactsSendContactToOther, and ContactsSendMessageToContact verbs
-	here.
-
-	* gui/widgets/e-addressbook-view.c,
-	gui/widgets/e-addressbook-view.h (e_addressbook_view_save_as,
-	e_addressbook_view_send, e_addressbook_view_send_to): New
-	functions to allow outside users to cause the addressbook to save,
-	send, or send a message to its selection.
-
-2001-08-01  Christopher James Lahey  <clahey@ximian.com>
-
-	* contact-editor/.cvsignore: Removed this file from this unused
-	directory.
-
-2001-08-01  Christopher James Lahey  <clahey@ximian.com>
-
-	* gui/contact-editor/Makefile.am: Added file-exists.glade.
-
-	* gui/contact-editor/e-contact-save-as.c (file_exists),
-	gui/contact-editor/file-exists.glade: Added a dialog to ask the
-	user whether to replace an already existing file.  Mostly from a
-	patch by Jos Dehaes.  Fixes Ximian bug #2231.
-
-2001-08-01  Christopher James Lahey  <clahey@ximian.com>
-
-	* backend/ebook/e-book-view-listener.c
-	(e_book_view_listener_check_queue): Removed thrash checking code
-	here since thrashing shouldn't happen now that we've cleaned this
-	up some.
-
-	* backend/ebook/e-book.c (e_book_do_response_get_view): Properly
-	handle cases where construction fails.
-
-2001-07-30  Christopher James Lahey  <clahey@ximian.com>
-
-	* backend/ebook/evolution-vcard-importer.c: Added #include
-	<e-util/e-path.h>.
-
-2001-07-23  Zbigniew Chyla  <cyba@gnome.pl>
-
-	* gui/component/addressbook-config.c (addressbook_source_dialog):
-	Convert translated string to UTF8 before calling put_html.
-
-2001-07-30  Jon Trowbridge  <trow@ximian.com>
-
-	* gui/component/select-names/e-select-names-completion.c
-	(e_select_names_completion_do_query): Properly handle the case
-	where our "cleaned" completion is the empty string.  This happens,
-	for example, if the query text is the string "\"".  (Bug #5610).
-
-	* backend/ebook/e-destination.c (e_destination_get_address_textv):
-	Reassure fejj that I'm not doing something stupid here.
-	(e_destination_get_address): Fix address quoting.  This is a
-	stop-gap measure until I can change this code to use Camel's
-	superior address-handling routines.  (Also Bug #5610)
-
-2001-07-30  Jason Leach  <jleach@ximian.com>
-
-	* gui/component/addressbook-storage.c (load_source_data): Fix a
-	return value bug, to make it so if it fails to load an
-	addressbook-sources.xml file (either a parse error or it doesn't
-	exist for example), it deregisters the storage.
-	(register_storage): Don't make a storage for users who don't have
-	LDAP support built in.  Bug #1950.
-
-2001-07-30  Frederic Crozat  <fcrozat@mandrakesoft.com>
-
-	* addressbook/gui/component/addressbook-factory.c: Fix crashes
-	when gtkhtml is compiled with gconf support
-
-2001-07-27  JP Rosevear  <jpr@ximian.com>
-
-	* conduit/Makefile.am: Tidy ldadds
-
-2001-07-26  Jon Trowbridge  <trow@ximian.com>
-
-	* gui/component/select-names/e-select-names-bonobo.c: Fixing a
-	small, stupid mistake; use e_select_names_model_get_textification
-	for the getter for "text".
-
-	* backend/ebook/e-card.c: Removed some debugging chatter.
-
-	* gui/component/select-names/e-select-names-manager.c
-	(e_select_names_manager_create_entry): Store the completion
-	handler in the entry's object data.
-
-	* gui/component/select-names/e-select-names-bonobo.c
-	(entry_get_property_fn): Added support for getting "destinations"
-	and "allow_contact_lists" properties.
-	(entry_set_property_fn): Added support for setting "destinations"
-	and "allow_contact_lists" properties.
-	(impl_SelectNames_get_entry_for_section): Added definitions for
-	"destinations" and "allow_contact_lists" properties.
-
-	* gui/component/select-names/e-select-names-completion.c
-	(e_select_names_completion_get_match_contact_lists): Added.
-	(e_select_names_completion_set_match_contact_lists): Added.
-	Controls whether contact lists are offered as options during
-	completion.
-	(book_query_process_card_list): Check if match_contact_lists
-	is set before (duh!) matching on a contact list.
-	(e_select_names_completion_init): Set match_contact_lists
-	to TRUE by default.
-
-2001-07-25  Chris Toshok  <toshok@ximian.com>
-
-	* backend/pas/pas-backend-ldap.c (func_contains): change the way
-	x-evolution-any-field is converted to an ldap query.  it used to
-	be we'd nest queries like: (|(|(|(foo=*x*))(bar=*x*))(baz=*x*)).
-	now we build it like: (|(foo=*x*)(bar=*x*)(baz=*x*)).  much more
-	efficient (both in the building, and on the server side no doubt).
-
-2001-07-25  Jon Trowbridge  <trow@ximian.com>
-
-	* backend/ebook/e-destination.c (e_destination_get_name): Properly dup
-	the results of e_destination_get_email.
-
-	* gui/component/select-names/e-select-names-popup.c
-	(e_select_names_popup): Check that our destination isn't empty
-	before building our popup. (Bug #5250)
-
-	* backend/ebook/e-destination.c (e_destination_is_empty): Made
-	argument const.
-
-2001-07-24  Jon Trowbridge  <trow@ximian.com>
-
-	* gui/contact-list-editor/e-contact-list-model.c: Added checks
-	for all of the args of the exposed functions, so that
-	we won't crash on bad inputs.  (Related to bug #4856.)
-
-2001-07-24  Jason Leach  <jleach@ximian.com>
-
-	* gui/merging/e-card-duplicate-detected.glade: "_Add Anyway" to
-	"Add Anyway".
-
-2001-07-24  Jon Trowbridge  <trow@ximian.com>
-
-	* backend/ebook/e-destination.c (e_destination_get_name): Added
-	fallbacks for the name in the case of an e-card, to avoid the
-	"nameless contact" bug.
-
-2001-07-24  Chris Toshok  <toshok@ximian.com>
-
-	* gui/widgets/e-minicard.c (remodel): need the EDestination magic
-	here too for when we modify an already shown card.
-
-	* gui/contact-list-editor/e-contact-list-model.c: make
-	parent_class static, just to be anal.
-
-	* gui/contact-list-editor/e-contact-list-editor.c
-	(remove_entry_cb): removing entries changes the list, so flag it.
-	(table_drag_data_received_cb): restrict cards we add to lists to
-	be non-list cards.
-	(extract_info): clear out the email list in the card before we
-	repopulate it from the contact list model.
-	(fill_in_info): set the checkbox to active/inactive based on
-	thecard.
-
-2001-07-24  Chris Toshok  <toshok@ximian.com>
-
-	* gui/contact-editor/e-contact-editor.c (wants_html_changed): call
-	widget_changed.
-	(phone_entry_changed): same.
-	(email_entry_changed): same.
-	(address_text_changed): same.
-	(name_entry_changed): same.
-	(company_entry_changed): same.
-	(widget_changed): new function that we can either call or set as a
-	signal to change the "changed" flag on the dialog.
-	(set_entry_changed_signals): connect lots of "changed" signals on
-	widgets to widget_changed.
-	(add_lists): connect "changed" to widget_changed.
-
-2001-07-24  Jon Trowbridge  <trow@ximian.com>
-
-	* gui/component/select-names/e-select-names.c
-	(e_select_names_hookup_shell_listener): Check if
-	evolution_shell_client_get_local_storage returns CORBA_OBJECT_NIL,
-	which it should never do.  If it does, print a warning in a dialog
-	and try to recover w/o crashing.  (Bug #5193)
-
-2001-07-24  Dan Winship  <danw@ximian.com>
-
-	* backend/ebook/e-book-listener.c (e_book_listener_stop): Don't
-	stop the idle_queue and unref from here, since this might be
-	called from inside e_book_listener_check_queue, and we don't want
-	to return to that function with the listener having been
-	destroyed.
-	(e_book_listener_check_queue): Don't exit early if the queue is
-	stopped. Proceed through the check if the queue is NULL (which is
-	must be if the queue is stopped), and then reach the existing code
-	to remove the idle handler. Combined with the above, this fixes
-	ximian #4485 (again). This is not a plot to boost my
-	showstopper-bugfixing count by fixing the same bug over and over
-	again.
-
-2001-07-23  Dan Winship  <danw@ximian.com>
-
-	Re-fix for my 07-18 not-quite-fix.
-
-	* backend/ebook/e-book-listener.c: Add a "stopped" flag like
-	EBookViewListener.
-	(e_book_listener_check_queue): Don't emit signals if the listener
-	is stopped.
-	(e_book_listener_queue_generic_response, etc): Don't queue
-	responses if the listener is stopped.
-	(e_book_listener_stop): Flush the queue and stop queue/emitting
-	further responses.
-
-	* backend/ebook/e-book.c (e_book_unload_uri): Revert the previous
-	change and call e_book_listener_stop() instead.
-
-	* backend/ebook/e-book-view-listener.c
-	(e_book_view_listener_stop): When removing an idle handler, unref
-	the listener as well, since e_book_view_listener_queue_response
-	will have ref'ed it.
-
-2001-07-22  Ettore Perazzoli  <ettore@ximian.com>
-
-	* gui/component/addressbook-component.c (remove_folder): Add a
-	@type arg.  If the type is not "contacts", report an
-	`UNSUPPORTED_TYPE' error through the listener.  Also, remove
-	`g_print()' debugging messages.
-	(xfer_folder): Likewise.
-
-2001-07-21  Ettore Perazzoli  <ettore@ximian.com>
-
-	* gui/component/addressbook-component.c: Make the "contacts"
-	folders user-creatable by setting `user_creatable' to %TRUE in the
-	`EvolutionShellComponentFolderType's.
-
-2001-07-18  Chris Toshok  <toshok@ximian.com>
-
-	[ patch contributed by Jos Dehaes <jos.dehaes@bigfoot.com> ]
-	
-	* gui/component/addressbook-storage.c (register_storage): new
-	function, register our evolution_storage.
-	(addressbook_storage_setup): remove storage registration from
-	here.
-	(load_source_data): register the storage here before we load
-	addressbook-sources.xml, and deregister it if there are no sources
-	listed.
-	(addressbook_storage_remove_source): unregister the storage if the
-	list of sources hits 0 length.
-
-2001-07-18  Dan Winship  <danw@ximian.com>
-
-	* backend/ebook/e-book.c (e_book_unload_uri): Flush the listener's
-	queue before unreffing it to ensure that it doesn't emit any more
-	"responses_queued" signals after the EBook is destroyed.
-
-	* backend/ebook/e-book-listener.c (e_book_listener_check_queue,
-	e_book_listener_queue_response, e_book_listener_new): Use
-	bonobo_object_ref/unref rather than gtk_object_ref/unref.
-
-	* backend/ebook/e-book-view-listener.c
-	(e_book_view_listener_queue_response, e_book_view_listener_new):
-	Likewise.
-
-2001-07-18  Chris Toshok  <toshok@ximian.com>
-
-	* backend/ebook/e-card-compare.c (simple_query_cb): prune the list
-	of cards that match our query using the avoid list here, instead
-	of using the avoid list in the query itself, since ldap can't
-	handle that.
-	(use_common_book_cb): remove the block of code including the avoid
-	list in the query sent to wombat.
-
-2001-07-17  Chris Toshok  <toshok@ximian.com>
-
-	[ Fixes bugs #4611 - crash searching in the name field at Bigfoot for "\"
-	        and  #4554 - general ldap search crash ]
-	
-	* backend/pas/pas-backend-ldap.c (func_contains): the length of
-	the big query string needs to take into account the length of the
-	footer as well as the header - fix random memory corruption here.
-
-	* backend/pas/pas-backend-ldap.c (pas_backend_ldap_build_query):
-	list can be NULL, specifically if there's a parsing error in the
-	sexp, so deal with it.
-
-2001-07-17  Jon Trowbridge  <trow@ximian.com>
-
-	* backend/ebook/e-book-view-listener.c
-	(e_book_view_listener_queue_response): Hold a reference to our
-	listener while the idle function is active.
-	(e_book_view_listener_check_queue): Only unref the listener when
-	the idle function is finished.
-
-	* gui/component/select-names/e-select-names-manager.c
-	(e_select_names_clicked): Instead of replacing section->model with
-	source, copy source onto section->model with
-	e_select_names_model_overwrite_copy.  #if 0/#endif out all of the
-	stuff related to ETextModels, because it doesn't make any sense to
-	me, and everything appears to work without it.
-	(Die bug #2059.  Die! Die! Die!)
-
-	* gui/component/select-names/e-select-names-model.c
-	(e_select_names_model_overwrite_copy): Added.  Copies the contents
-	of one ESelectNamesModel onto another.
-
-	* backend/ebook/e-destination.c (e_destination_copy): Made the argument
-	const.
-
-	* backend/ebook/e-destination.c (e_destination_set_string): Removed
-	old, broken code and annoying g_messages.
-
-	* backend/ebook/e-book-listener.c
-	(e_book_listener_queue_response): Hold a reference to the listener
-	while the idle function is active.
-	(e_book_listener_check_queue): Only release our reference to the
-	listener when the queue is empty.  These two changes fix a race
-	condition, since the listener could be unrefed while the listener
-	was still active. (Seems to fix bug #4485)
-
-2001-07-17  Christopher James Lahey  <clahey@ximian.com>
-
-	* gui/contact-editor/contact-editor.glade,
-	gui/merging/e-card-duplicate-detected.glade,
-	gui/merging/e-card-merging-book-commit-duplicate-detected.glade,
-	printing/e-contact-print.glade: Patch from Taylor Hayward
-	<thayward@gjpc.com>.  Added accelerators to a few dialogs.
-
-2001-07-16  Jon Trowbridge  <trow@ximian.com>
-
-	* gui/component/select-names/Evolution-Addressbook-SelectNames.idl:
-	Added addSectionWithLimit to the SelectNames interface.
-
-	* gui/component/select-names/e-select-names-bonobo.c
-	(impl_SelectNames_add_section_with_limit): Added.  Implements
-	addSectionWithLimit.
-	(e_select_names_bonobo_construct): Set up as a BonoboEventSource.
-	(init): Listen for "changed" signals from our manager.
-	(manager_changed_cb): Notify our listeners if we get a changed
-	signal from our manager.
-
-	* gui/component/select-names/e-select-names-manager.c
-	(e_select_names_manager_class_init): Added a "changed" signal".
-	(section_copy): Propogate the signal connection.
-	(section_free): Disconnect the changed handler.
-	(e_select_names_manager_add_section_with_limit): Connect to the
-	new section's model, listening for changes.
-	(e_select_names_manager_activate_dialog): Connect to the "working
-	copy" model, listening for changes.
-	(e_select_names_manager_add_section_with_limit): Added.
-	(e_select_names_manager_add_section): Changed to just be a special
-	case of e_select_names_manager_add_section_with_limit.
-
-	* gui/component/select-names/e-select-names-model.c
-	(e_select_names_model_set_limit): Added.  Allows a max number of
-	names allowed in the model.
-	(e_select_names_model_get_limit): Added.  Returns the limit.
-	(e_select_names_model_at_limit): Added.  Returns TRUE if the
-	model is "full".
-	(e_select_names_model_insert): Check that we aren't at the
-	limit before inserting.  Silently return if we are.
-	(e_select_names_model_append): Check that we aren't at the
-	limit before appending.  Silently return if we are.
-
-2001-07-16  Chris Toshok  <toshok@ximian.com>
-
-	[ Fix bug #4705 - LDAP storage gets saved with corrupted binddn]
-	
-	* gui/component/addressbook-config.c (addressbook_dialog_apply):
-	call addressbook_storage_write_sources here after we're done
-	rebuilding them.
-
-	* gui/component/addressbook-storage.c
-	(addressbook_storage_clear_sources): don't write the source file
-	here.
-	(addressbook_storage_add_source): same.
-	(addressbook_storage_remove_source): same.
-	(addressbook_storage_write_sources): new function, write the
-	source file out.
-	(addressbook_source_copy): g_strdup the binddn so we don't end up
-	free'ing it multiple times thanks to copies freeing theirs.
-
-	* gui/component/addressbook-storage.h: add prototype for
-	address_storage_write_sources.
-
-2001-07-16  Iain Holmes  <iain@ximian.com>
-
-	* backend/pas/evolution-vcard-importer.c (ebook_create): Don't just 
-	use the default directory. Use the directory that is passed into the
-	load file function.
-
-2001-07-15  Christopher James Lahey  <clahey@ximian.com>
-
-	* backend/ebook/e-destination.c (e_destination_set_string):
-	Commented out some unused variables and labels.
-	(e_destination_importv): Check for the xml not parsing correctly
-	and just return NULL here.
-
-	* gui/component/select-names/e-select-names-model.c
-	(e_select_names_model_import_destinationv): Handle a NULL destv
-	here.
-
-2001-07-15  Christopher James Lahey  <clahey@ximian.com>
-
-	* gui/widgets/e-addressbook-view.c (table_drag_data_get): Added a
-	call to e_table_view_to_model_row here.
-	(e_addressbook_view_can_print, e_addressbook_view_can_delete,
-	e_addressbook_view_can_copy): If the selection model is NULL here,
-	return NULL (this was done before in a g_return_val_if_fail which
-	is only conditionally included.)
-
-2001-07-13  Christopher James Lahey  <clahey@ximian.com>
-
-	* gui/contact-editor/contact-editor.glade: Changed Company to
-	Organization here.
-
-2001-07-12  JP Rosevear  <jpr@ximian.com>
-
-	* backend/pas/Makefile.am: add ldap cflags
-
-2001-07-12  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* backend/ebook/e-destination.c (e_destination_xml_decode):
-	Oops. I introduced my own bug, accidently set `email' to a
-	g_free'd pointer - eek!
-
-2001-07-12  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* backend/ebook/e-destination.c (e_destination_importv): Optimized
-	the same way I optimized g_strsplit. If you use a GPtrArray
-	instead of a linked list, you save yourself from having to iterate
-	through the list an extra 3 times.
-	(e_destination_xml_decode): Do NOT, I repeat: do NOT!
-	e_utf8_xml1_decode something which is already in UTF-8 or you'll
-	corrupt it!! I smack thee who hath done this evil deed!
-
-2001-07-12  Iain Holmes  <iain@ximian.com>
-
-	* backend/e-book/evolution-vcard-importer.c (support_format_fn):
-	Check for no extension. Actually same as Jason's fix below :) but
-	also check the file contents.
-
-2001-07-12  JP Rosevear  <jpr@ximian.com>
-
-	* gui/component/addressbook-config.glade: add accelerators,
-	taylor's patch
-
-2001-07-12  Jason Leach  <jleach@ximian.com>
-
-	* backend/ebook/evolution-vcard-importer.c (support_format_fn):
-	Crash fix because strcmp() hates NULL arguments.  Bug #3777.
-
-2001-07-11  Jason Leach  <jleach@ximian.com>
-
-	* gui/component/select-names/e-select-names.c (remove_cb): Added
-	some comments for clarity and fixed a pretty noticable bug with
-	how right click "Remove" was deleting more than it should with
-	consecutive runs.
-
-2001-07-10  Chris Toshok  <toshok@ximian.com>
-
-	* backend/pas/evolutionperson.schema: assign OID's to the schema
-	entries, and add schema support for contact lists.
-
-2001-07-10  Christopher James Lahey  <clahey@ximian.com>
-
-	* backend/pas/pas-backend-file.c (pas_backend_file_load_uri): Set
-	bf->priv->file_db before calling do_create.
-
-2001-07-06  Christopher James Lahey  <clahey@ximian.com>
-
-	* gui/component/addressbook-component.c (factory_fn): Fixed order
-	of arguments to evolution_shell_component_new.
-
-2001-07-08  Jon Trowbridge  <trow@ximian.com>
-
-	* gui/component/select-names/e-select-names-text-model.c
-	(e_select_names_text_model_insert_length): Check that str isn't
-	the empty string before doing an insert.
-
-	* backend/ebook/e-destination.c (e_destination_set_string): We were
-	being too smart for our own good here, and causing problems for
-	the completion code... (bug #4253, bug #4255, bug #4280)
-	(e_destination_set_name): Clear any cached address.
-	(e_destination_set_email): Clear any cached address.
-	(e_destination_get_address): Handle the cases where the name
-	contains some e-mail information.
-
-2001-07-09  Kjartan Maraas  <kmaraas@gnome.org>
-
-	* gui/contact-list-editor/e-contact-list-editor.c: Marked a
-	string for translation. Also add the neccesary includes to make
-	_() macros work.
-	
-2001-07-07  Jon Trowbridge  <trow@ximian.com>
-
-	* gui/widgets/e-minicard.c (add_field): Detect the embedded
-	EDestination XML, and convert it to a nice-looking e-mail address.
-
-	* gui/contact-list-editor/e-contact-list-editor.c: Adjusted to
-	reflect changes to EContactListModel.  (Yeah, this is vague,
-	but the changes are _really_ obvious and boring.)
-
-	* gui/contact-list-editor/e-contact-list-model.c: Revamped
-	to make everything an EDestination, rather than storing either
-	cards or strings.
-
-	* gui/component/select-names/e-select-names-text-model.c
-	(e_select_names_text_model_insert_length): Use
-	e_destination_get_textrep.
-
-	* gui/component/select-names/e-select-names-table-model.c
-	(fill_in_info): Use e_destination_get_name and
-	e_destination_get_email.
-
-	* gui/component/select-names/e-select-names-popup.c
-	(popup_menu_card): Use e_destination_get_name instead of
-	e_card_name_to_string.
-	(quick_add_cb): Use e_destination_get_address.
-	(popup_menu_nocard): Use e_destination_get_name.
-
-	* gui/component/select-names/e-select-names-model.c
-	(e_select_names_model_changed): Removed obsolete debugging code.
-	(e_select_names_model_get_textification): Use e_destination_get_textrep.
-	(e_select_names_model_get_address_text): Use e_destination_get_address.
-	(e_select_names_model_get_string): Use e_destination_get_textrep.
-	(e_select_names_model_replace): Use e_destination_get_textrep.
-	(e_select_names_model_name_pos): Use e_destination_get_textrep.
-
-	* gui/component/select-names/e-select-names-completion.c
-	(emailify_match): Match only if this isn't a contact list.
-	(match_email): Match only if this isn't a contact list.
-	(match_name): Do the right thing in the case of a contact list.
-	(book_query_process_card_list): Don't construct a match for
-	each possible e-mail address if this is a contact list.
-
-	* backend/ebook/e-destination.c: Major-league de-crufting and
-	rationalization, combined with lots of hacks to make things work
-	properly with contact lists.
-	(e_destination_copy): Copy contact list info.
-	(e_destination_clear_card): Clear contact list info.
-	(e_destination_is_empty): If we contain a contact list, we aren't
-	empty.
-	(e_destination_set_card_uri): Added.  Allows us to set a
-	destination by card URI.
-	(e_destination_set_name): Allows the contact's name only ("Jane
-	Smith") to be set.
-	(e_destination_set_email): Allows the contact's e-mail only
-	("jane@assbarn.com") to be set.
-	(e_destination_set_string): Takes a free-form string containing a
-	contact's name and/or e-mail, and tries to do the right thing with
-	it.
-	(e_destination_contains_card): Renamed.  Used to be
-	e_destination_has_card.
-	(e_destination_from_card): Added.  Returns TRUE if the
-	EDestination comes from either a ECard (which we presently hold)
-	or is specified by an ECard URI.
-	(e_destination_use_card): Allows an EDestination's ECard to be
-	accessed, via a callback.  If we only are holding the URI, the
-	card will be loaded and stored in the EDestination.
-	(e_destination_get_name): Returns the name only ("Jane Smith"), or
-	NULL.
-	(e_destination_get_email): Returns the email only
-	("jane@assbarn.com"), or NULL.
-	(e_destination_get_address): Added.  Returns a "full address" if
-	both the name & e-mail are available ("Jane Smith
-	<jane@assbarn.com>"), or just the e-mail if the name is unknown
-	("jane@assbarn.com>").  If the destination is a contact list,
-	returns a comma-separated list of addresses.
-	(e_destination_get_textrep): Added.  Returns a "text
-	representation" of the EDestination.  This is what is now
-	displayed for completed, "cardified" destinations in addressbook
-	entries.
-	(e_destination_is_evolution_list): Check to see if this
-	destination is for a contact list.
-	(e_destination_xml_encode): Added.  Build an XML data structure
-	representing an EDestination.
-	(e_destination_xml_decode): Added.  Parse an XML data structure,
-	constructing an EDestination.
-	(e_destination_export): Added.  Returns a null-terminated string
-	containing an XML representation of the EDestination, with
-	newlines and excess whitespace removed.
-	(e_destination_import): Added.  Parses a string containing an XML
-	representation of an EDestination.
-	(e_destination_exportv): Added.  Returns a null-terminated string
-	containing an XML representation of a collection of EDestinations,
-	with newlines and excess whitespace removed.
-	(e_destination_importv): Added.  Takes an XML representation of a
-	collection of destinations, parses it, and returns a vector of
-	EDestinations.
-
-	* backend/ebook/e-card.c (e_card_duplicate): Copy the ->book
-	pointer.
-	(e_card_get_id): Check that the argument is valid.
-	(e_card_set_id): Check that the argument is valid.
-	(e_card_get_book): Added.  Return the EBook the ECard came from.
-	(e_card_get_uri): Added.  Tries to returns a URI for the ECard,
-	which is of the form (EBook URI)/(ECard unique ID).  Returns NULL
-	if the EBook URI or the ID are unknown/not set.
-	(e_card_get_vobject): If we have the URI, use it as the
-	VCUniqueStringProp, rather than just the ID.  This is a hack to
-	make DnD work properly.
-	(parse_id): Detect if the unique ID we've been passed is a URI or
-	just a plain card ID, and do the right thing in either case.
-	(e_card_uri_extract_book_uri): Added.  Convenience function for
-	parsing card URIs.
-	(e_card_uri_extract_card_id): Added.  Convenience function for
-	parsing card URIs.
-	(e_card_load_uri): Added.  Allows an ECard to be loaded by its
-	URI.
-
-	* backend/ebook/e-book-view.c: Added a EBook * to the
-	_EBookViewPrivate struct.  This is meant to contain the EBook the
-	EBookView is associated with.
-	(add_book_iterator): Added.  A convenience function for attaching
-	the EBook to a GList of cards (if no EBook is already stored).
-	(e_book_view_do_added_event): Record the EBook in the added
-	ECards.
-	(e_book_view_do_modified_event): Record the EBook in the modified
-	ECards.
-	(e_book_view_set_book): Added.  Stores a pointer to the
-	EBookView's "parent" EBook.
-	(e_book_view_init): Init book_view->priv->book to NULL.
-	(e_book_view_destroy): Unref book_view->priv->book.
-
-	* backend/ebook/e-book.c: Added a uri field to _EBookPrivate.
-	(e_book_unqueue_op): Removed debugging spew.
-	(e_book_do_response_get_view): Attach the current EBook to the
-	created EBookView.
-	(e_book_do_response_get_changes): Attach the current EBook to the
-	created EBookView.
-	(e_book_load_uri): Save a copy of the uri in the EBook.
-	(e_book_get_uri): Added.  Just returns book->priv->uri.
-	(e_book_get_card): Attach a pointer to the Ebook to the
-	newly-loaded ECard.
-	(e_book_add_card): Attach a pointer to the EBook to the
-	newly-added ECard.
-	(e_book_commit_card): Attach a pointer to the EBook to the
-	committed ECard.
-	(e_book_init): Initialize the uri to NULL.
-	(e_book_destroy): Free the uri string on destruction.
-
-2001-07-06  Ettore Perazzoli  <ettore@ximian.com>
-
-	* gui/component/addressbook-component.c (populate_context_menu):
-	Removed.  [It was just bogus testing code for the right-click menu
-	populating interface in the shell].
-	(factory_fn): Pass NULL as the PopulateContextMenuFn.
-
-2001-07-05  Anna Marie Dirks  <anna@ximian.com>
-
-	* gui/contact-list-editor/contact-list-editor.glade: 
-	Added some accelerators, padding, and a "memebers" frame;
-	also fixed spacing and growth behaviour of this dialog. 
-
-2001-07-05  Christopher James Lahey  <clahey@ximian.com>
-
-	* backend/pas/pas-backend-file.c (compare_category): Fix a memory
-	leak here.
-
-2001-07-05  Christopher James Lahey  <clahey@ximian.com>
-
-	* backend/ebook/e-card-compare.c (match_search_info_free): Set
-	info->avoid = NULL.  This shouldn't make a difference, but it
-	can't hurt.
-
-2001-07-05  Christopher James Lahey  <clahey@ximian.com>
-
-	* gui/widgets/e-addressbook-table-adapter.c
-	(addressbook_is_cell_editable): Check if the row is within our
-	table and return from this function as if the card is a standard
-	card, not a list.
-
-2001-07-03  Damon Chaplin  <damon@ximian.com>
-
-	* backend/ebook/Makefile.am (evolution_vcard_importer_LDADD): 
-	added $(BONOBO_CONF_LIBS) to get it to compile.
-
-2001-07-02  Christopher James Lahey  <clahey@ximian.com>
-
-	* gui/component/Makefile.am (evolution_addressbook_LDADD): Added
-	$(BONOBO_CONF_LIBS).
-
-	* gui/component/select-names/e-select-names.c
-	(e_select_names_create_categories),
-	gui/contact-editor/e-contact-editor.c (categories_clicked):
-	Switched to an ECategoriesMasterListWombat instead of an
-	ECategoriesMasterListArray here.
-
-2001-07-02  Peter Williams  <peterw@ximian.com>
-
-	* gui/contact-editor/Makefile.am (INCLUDES): srcdir !=
-	builddir compile fix.
-
-	* gui/contact-list-editor/Makefile.am (INCLUDES): Same.
-
-	* gui/widgets/Makefile.am (INCLUDES): Same.
-
-	* gui/search/Makefile.am (INCLUDES): Same.
-
-2001-07-02  Christopher James Lahey  <clahey@ximian.com>
-
-	* gui/contact-editor/e-contact-editor.c (categories_clicked):
-	Turned off wombatification of the categories master list here.
-
-2001-07-01  Chris Toshok  <toshok@ximian.com>
-
-	* gui/contact-list-editor/e-contact-list-editor.c (fill_in_info):
-	use ECARD_UID_LINK_PREFIX.
-
-	* gui/contact-list-editor/e-contact-list-model.c
-	(e_contact_list_model_get_email): use ECARD_UID_LINK_PREFIX.
-
-	* backend/ebook/e-destination.h: add prototype for
-	e_destination_importv_list.
-
-	* backend/ebook/e-destination.c (e_destination_importv_list): new
-	function, take an ECard corresponding to an address list and
-	resolve any linked cards, returning an EDestination vector.
-
-	* backend/ebook/e-card.h (ECARD_UID_LINK_PREFIX): #define this here,
-	since we need to use it in a few places.
-
-2001-07-02  Christopher James Lahey  <clahey@ximian.com>
-
-	* backend/ebook/e-card.c, backend/ebook/e-card.h: Added
-	related_contacts field.
-
-	* gui/component/select-names/e-select-names-model.c,
-	gui/component/select-names/e-select-names-model.h
-	(e_select_names_model_import_destinationv): Added this function.
-
-	* gui/contact-editor/contact-editor.glade: Replaced the entry here
-	for related contacts with a table which is filled in in the C code.
-
-	* gui/contact-editor/e-contact-editor.c,
-	gui/contact-editor/e-contact-editor.h (add_lists): Added a select
-	names entry here for the related contacts field.
-
-	* gui/widgets/Makefile.am: Removed all the test programs here
-	since there are circular dependencies now.
-
-2001-07-01  Jon Trowbridge  <trow@ximian.com>
-
-	* backend/ebook/e-destination.c (e_destination_get_string): Fall
-	back to use the name field if all else fails (which can happen
-	with imported EDestinations).
-
-	* backend/ebook/e-destination.c (e_destination_is_empty): Fix for the
-	"recipient not specified" bug --- we were not correctly checking
-	for whether or not an EDestination was actually empty.
-
-2001-06-30  Jon Trowbridge  <trow@ximian.com>
-
-	* backend/ebook/e-card.c (e_card_evolution_list): Check args.
-	Somewhere in the code (somewhere in the minicard stuff) this can
-	be called with a NULL arg, which was causing crashes.
-	(e_card_evolution_list_show_addresses): Check args.
-
-	* backend/ebook/e-destination.c (build_field): I was accidentally
-	comparing characters and strings here, and didn't see the compiler
-	warning.  Fixed.
-	(e_destination_exportv): Don't export any empty destinations.
-	(bug#3825).
-
-2001-06-30  Zbigniew Chyla  <cyba@gnome.pl>
-
-	* gui/component/e-address-popup.c (e_address_popup_construct): Marked
-	strings for translation.
-
-2001-06-30  Jon Trowbridge  <trow@ximian.com>
-
-	* gui/merging/e-card-merging.c (match_query_callback): Make the
-	standard for considering two cards to be match stricter.
-
-	* gui/component/select-names/e-select-names-completion.c
-	(make_match): Use the card's use-score to set the match's
-	sort_major value.
-	(match_name): Removed obsolete code.
-	(e_select_names_completion_begin): Added (double) cast to make
-	match->score calculation come out properly.
-
-	* backend/ebook/e-card.c: Added X-EVOLUTION-LAST-USE and
-	X-EVOLUTION-USE-SCORE to attribute_jump_array.
-	(e_card_get_today): Added.  A convenience routine for getting
-	today's date and putting it in a GDate.
-	(e_card_get_use_score): Added.  Compute the current, time-decayed,
-	use-score for the card.
-	(e_card_touch): Increment the use-score by one; update the last
-	used date.
-	(e_card_date_to_string): Added as a convenience routine, getting
-	rid of some code duplication.
-	(e_card_get_vobject): Add handlers for X-EVOLUTION-USE-SCORE and
-	X-EVOLUTION-LAST-USE.
-	(parse_last_use): Added.
-	(parse_use_score): Added.
-	(e_card_class_init): Added args for last-use and use-score.
-	(e_card_get_arg): Added handlers for last-use and use-score.
-	o
-	(e_card_set_arg): Added handlers for last-use and use-score.
-
-	* backend/ebook/e-destination.c: Added pending_card_id to
-	EDestinationPrivate struct.
-	(e_destination_copy): Copy the pending_card_id.
-	(e_destination_is_empty): Check for a pending_card_id.  We are
-	non-empty if we have one.
-	(e_destination_clear_card): Clear pending_card_id.
-	(e_destination_set_card): Clear pending_card_id.
-	(e_destination_has_pending_card): Added.
-	(e_destination_use_card): Added.  An asynchronous way to load a
-	pending card and then apply a callback to it.
-	(build_field): Be paranoid, map our special characters to '_'.
-	(e_destination_export): Use EXPORT_MAX_FIELDS symbol rather than a
-	hard-wired array size.  Added the "card" entry.
-	(e_destination_import): Fix bug in handling of the "name" field.
-	Process the "card" field.
-	(e_destination_touch): "Touch" and commit the ECard corresponding
-	to the e-mail address in the destination.  (A query against the
-	local addressbook is actually performed, in case the destination
-	isn't cardified.
-
-	* backend/ebook/e-card-compare.c (e_card_compare_name): Revamp the
-	way E_CARD_MATCH_FOO results are mapped to comparison results.
-	Report better matches when the family name is matched.
-
-2001-06-29  Christopher James Lahey  <clahey@ximian.com>
-
-	* gui/component/select-names/e-select-names.c (update_query):
-	Added a search field to the query here.
-	(e_select_names_init): Update the query on a number of signals here.
-
-	* gui/component/select-names/e-select-names.h: Added search_entry
-	here.
-
-	* gui/component/select-names/select-names.glade: Added the search
-	entry here.  Added some labels.  Removed the update button.
-
-2001-06-29  Christopher James Lahey  <clahey@ximian.com>
-
-	* gui/component/select-names/e-select-names.c
-	(e_select_names_option_activated): Change the uri here to have
-	addressbook.db at the end.
-
-	* gui/component/select-names/select-names.glade: Changed the name
-	of the folder option menu here to match the name used in the code.
-
-2001-06-29  Christopher James Lahey  <clahey@ximian.com>
-
-	* gui/component/select-names/e-select-names.c (update_query):
-	Change the query when the "Update List" button is pushed.
-
-	* gui/component/select-names/e-select-names.h: Removed
-	currently_selected field.  Added categories_entry field.
-
-	* gui/component/select-names/select-names.glade: Added "Update
-	List" button.
-
-2001-06-29  Chris Toshok  <toshok@ximian.com>
-
-	* gui/widgets/Makefile.am (INCLUDES): add EVOLUTION_IMAGESDIR
-	define.
-
-	* gui/widgets/e-minicard.h (struct _EMinicard): add our pixbuf and
-	pixbuf size.
-
-	* gui/widgets/e-minicard.c (e_minicard_init): init the icon pixbuf
-	and its size.
-	(e_minicard_destroy): unref the list_icon_pixbuf.
-	(e_minicard_realize): create the list_icon GnomeCanvasPixbuf.
-	(e_minicard_resize_children): clip the header_text by the
-	list_icon, and place the list_icon in the right spot.
-	(remodel): show the list_icon if we're a list, and hide it
-	otherwise.
-
-2001-06-28  Chris Toshok  <toshok@ximian.com>
-
-	* gui/widgets/e-addressbook-view.c (table_double_click): pop up
-	list editor for lists, contact editor otherwise.
-
-	* gui/widgets/e-minicard.c (e_minicard_event): same.
-
-	* gui/widgets/e-minicard.h (struct _EMinicard): change "editor" to
-	GtkOjbect, since it can be either a contact editor or contact list
-	editor.
-
-	* gui/widgets/e-addressbook-table-adapter.c
-	(addressbook_is_cell_editable): don't allow editting of any fields
-	except the name and file_as for lists.
-
-2001-06-28  Chris Toshok  <toshok@ximian.com>
-
-	* gui/contact-list-editor/Makefile.am (INCLUDES): remove ancient
-	e-table include, and add include for contact-editor so we can
-	reuse the confirm_delete dialog.
-
-	* gui/contact-list-editor/e-contact-list-editor.h (struct
-	_EContactListEditor): remove prototype for
-	e_contact_list_editor_close, since the function no longer exists.
-
-	* gui/contact-list-editor/e-contact-list-editor.c
-	(list_deleted_cb): new function, emit our "list_deleted" signal.
-	(delete_cb): new function, called from the Delete toolbar item.
-	(e_contact_list_editor_raise): flesh out function.
-	(extract_info): "evolution_list" => "list".
-	(fill_in_info): same.
-
-2001-06-28  Chris Toshok  <toshok@ximian.com>
-
-	* backend/ebook/e-card.c (e_card_get_vobject): add support for
-	X-EVOLUTION-LIST and X-EVOLUTION-LIST-SHOW-ADDRESSES.
-	(parse_list): new function, parse the boolean X-EVOLUTION-LIST.
-	(parse_list_show_addresses): new function, parse the boolean
-	X-EVOLUTION-LIST-SHOW-ADDRESSES.
-	(e_card_class_init): add args for "list" and
-	"list_show_addresses".
-	(e_card_set_arg): add support for list and list_show_addresses.
-	(e_card_get_arg): same.
-	(e_card_init): init list and list_show_addresses.
-
-2001-06-27  Ettore Perazzoli  <ettore@ximian.com>
-
-	* gui/component/addressbook-component.c (factory_fn): Pass NULL as
-	the @external_uri_schemas argument to
-	`evolution_shell_component_new()'.
-
-2001-06-27  Chris Toshok  <toshok@ximian.com>
-
-	* gui/contact-list-editor/e-contact-list-model.c
-	(contact_list_row_count): track storage change - we're only using
-	1 array now.
-	(contact_list_value_at): same.
-	(contact_list_model_destroy): same.
-	(e_contact_list_model_init): same.
-	(e_contact_list_model_add_email): same.
-	(e_contact_list_model_add_card): same.
-	(e_contact_list_model_remove_row): same.
-	(e_contact_list_model_remove_all): new function - just free/unref
-	all existing rows.
-	(e_contact_list_model_get_email): new function, returns the
-	alloc'ed string containing either an email address or an encoded
-	ECardId.
-
-	* gui/contact-list-editor/e-contact-list-model.h: remove the 2
-	separate arrays for email and cards, and store them in the same
-	array.
-
-	* gui/contact-list-editor/e-contact-list-editor.h (struct
-	_EContactListEditor): add the visible_addr_checkbutton widget.
-
-	* gui/contact-list-editor/e-contact-list-editor.c
-	(visible_addrs_toggled_cb): new function.
-	(e_contact_list_editor_init): connect to "toggled" on
-	visible_addrs_checkbutton.
-	(file_save_cb): new function.
-	(tb_save_and_close_cb): new function.
-	(verbs): add Save and Save & Close.
-	(list_added_cb): new function.
-	(list_modified_cb): new function.
-	(save_card): new function - we do *not* use e_card_merging_* calls
-	here.
-	(e_contact_list_editor_get_arg): un-#if 0 code in the "card"
-	getter.
-	(e_contact_list_editor_set_arg): same for the "card" setter.
-	(extract_info): new function.
-	(fill_in_info): new function.
-
-	* gui/contact-list-editor/contact-list-editor.glade: add a
-	checkbutton at the bottom to determine whether to visibly include
-	mail addresses in mail sent to this list.
-
-2001-06-26  Christopher James Lahey  <clahey@ximian.com>
-
-	* gui/component/select-names/e-select-names.c
-	(e_select_names_create_categories): Oops.  Can't use the wombat
-	version of the master categories list yet.
-
-2001-06-26  Christopher James Lahey  <clahey@ximian.com>
-
-	* gui/widgets/e-addressbook-table-adapter.c (create_card): memmove
-	counts were off in this function.
-	(remove_card, modify_card): Moved the table notifications around a
-	bit here.
-
-2001-06-26  Christopher James Lahey  <clahey@ximian.com>
-
-	* gui/component/select-names/e-select-names.c,
-	gui/component/select-names/e-select-names.h,
-	gui/component/select-names/select-names.glade
-	(e_select_names_create_categories): Added a categories combo here.
-	It's not used yet.
-
-2001-06-26  Christopher James Lahey  <clahey@ximian.com>
-
-	* gui/search/addresstypes.xml: Added category searching to the
-	advanced search dialog here.
-	
-2001-06-26  Christopher James Lahey  <clahey@ximian.com>
-
-	* backend/pas/pas-backend-file.c (compare_category): Added
-	category searching to the file backend.
-
-	* gui/component/addressbook.c (addressbook_query_changed): Added
-	category searching to the search bar.
-
-2001-06-25  Peter Williams  <peterw@ximian.com>
-
-	* conduit/Makefile.am (INCLUDES): Fix for srcdir != builddir.
-
-2001-06-25  Chris Toshok  <toshok@ximian.com>
-
-	* gui/contact-list-editor/contact-list-editor.glade: change layout
-	slightly, the icon no longer pushes everything to the left, and
-	make the buttons on the right smaller and more in line with the
-	other widgets.
-
-	* gui/contact-list-editor/e-contact-list-model.c
-	(contact_list_value_at): return the SimpleAndString->string
-	instead of querying the ecardsimple.
-	(e_contact_list_model_init): initially allocate 10 of each type
-	(email and simple).
-	(e_contact_list_model_add_email): realloc if need be.
-	(e_contact_list_model_add_card): same, and initialize the string
-	displayed to be "[Name] [<email>]".
-	(e_contact_list_model_remove_row): change for SimpleAndString.
-	(contact_list_model_destroy): free our 2 arrays.
-
-	* gui/contact-list-editor/e-contact-list-model.h: add alloc counts
-	and the SimpleAndString struct.
-
-	* gui/contact-list-editor/e-contact-list-editor.c: Helix Code =>
-	Ximian.
-	(e_contact_list_editor_init): hook up d&d destination signals, and
-	un-#if 0 the delete_event signal.
-	(table_drag_motion_cb): new function.
-	(table_drag_drop_cb): new function.
-	(table_drag_data_received_cb): new function.
-	(file_close_cb): new function.
-	(verbs) uncomment the close verb.
-	(close_dialog): new function.
-	(app_delete_event_cb): new function.
-
-	* gui/contact-list-editor/e-contact-list-editor.h: Helix Code =>
-	Ximian.
-
-2001-06-25  Jon Trowbridge  <trow@ximian.com>
-
-	* gui/component/e-address-popup.c: Add a huge steaming pile of
-	code to handle the case of single-address merging.  In other
-	words, if you go to "harvest" an address by right-clicking on it
-	in the mail viewer, and you already have a closely-matching
-	contact (w/ a different e-mail address), this gives you the
-	option of editting that contact's e-mail addresses to add the
-	one you just clicked on.
-
-	* backend/ebook/e-card-compare.c (match_search_info_free): It is
-	amazing how much better things work when you don't try to
-	dereference the pointer you just freed.
-
-2001-06-24  Chris Toshok  <toshok@ximian.com>
-
-	* gui/widgets/Makefile.am (minicard_test_LDADD): correct path to
-	libecontacteditor.a.
-	(minicard_widget_test_LDADD): same.
-	(INCLUDES): same, for the includes.
-
-	* gui/widgets/e-minicard.h: correct e-contact-editor.h path.
-
-	* gui/widgets/e-addressbook-util.h: correct path to
-	e-contact-editor.h, and add e-contact-list-editor.h.  Add
-	prototype for e_addressbook_show_contact_list_editor.
-
-	* gui/widgets/e-addressbook-util.c: remove #include
-	"e-contact-editor.h" (our header includes it.)
-	(added_cb): rename card_added_cb to this, and make it so it can be
-	reused in both the list and card cases.  remove the g_print too.
-	(modified_cb): same for modified case.
-	(deleted_cb): same for deleted case.
-	(editor_closed_cb): change first arg to GtkObject* so we can reuse
-	this for both list and card.
-	(e_addressbook_show_contact_editor): use added_cb, modified_cb,
-	deleted_cb, and pass FALSE as user_data.
-	(e_addressbook_show_contact_list_editor): new function, same as
-	above but creating a contact-list-editor, and pass TRUE as
-	user_data.
-
-	* gui/component/e-address-popup.c: correct path to contact-editor.
-
-	* gui/component/e-address-widget.c: same.
-	
-	* gui/component/select-names/e-select-names-popup.c: same.
-
-	* gui/component/select-names/e-select-names-text-model.c: same.
-
-	* gui/component/addressbook.c (new_contact_list_cb): new function.
-	(update_command_state): update ContactNewList command.
-	(verbs): remove ViewAll from the toolbar from the verb list.  Add
-	ContactNewList.
-	(pixmaps): same for pixmaps.
-	
-	* gui/component/Makefile.am (evolution_addressbook_LDADD): new
-	path for contact-editor.
-	(INCLUDES): same.
-
-	* gui/contact-list-editor/e-contact-list-model.h:
-	* gui/contact-list-editor/e-contact-list-model.c:
-	* gui/contact-list-editor/e-contact-list-editor.h:
-	* gui/contact-list-editor/e-contact-list-editor.c:
-	* gui/contact-list-editor/Makefile.am: Initial contact-list editor
-	  commit.
-
-	* gui/Makefile.am (SUBDIRS): add contact-editor.
-
-	* Makefile.am: (SUBDIRS): remove contact-editor.
-
-2001-06-21  Jon Trowbridge  <trow@ximian.com>
-
-	* gui/component/select-names/e-select-names-popup.c
-	(make_contact_editor_cb): Renamed.  (The old name,
-	edit_contact_info_have_book_cb was a hold-over from before, when
-	we weren't using e_book_use_local_address_book.)
-
-	* gui/component/e-address-popup.c
-	(e_address_popup_schedule_refresh): A Added.  We now do the name
-	refreshes in an idle function, rather than in the setters.
-	(e_address_popup_set_free_form): Added.  Properly handle inputs of
-	the form "Foo <bar@zar.com>", extracting the name and e-mail
-	address.
-	(e_address_popup_set_name): Check to make sure that the free-form
-	handler shouldn't be used to handle the input.  Schedule a refresh
-	after making any changes.
-	(e_address_popup_set_email): Check to make sure that the free-form
-	handler shouldn't be used to handle the input.  Schedule a refresh
-	after making any changes.
-	(e_address_popup_name_only_matches): Temporary place-holder for
-	handling name-only matches.
-	(query_cb): If our initial query fails (and included e-mail
-	information), do a name-only query.  This is to handle the case of
-	adding new e-mail addresses to existing contacts.
-	(e_address_popup_query): Eliminated the "common_book" crap; using
-	e_book_use_local_address_book instead.
-
-	* backend/ebook/e-card-compare.c (match_search_info_free): Make
-	sure that the ->avoid list gets properly freed.
-
-2001-06-20  Chris Toshok  <toshok@ximian.com>
-
-	* backend/pas/pas-backend-file.c
-	(pas_backend_file_process_get_supported_fields): fix a refcounting
-	memleak.
-
-2001-06-20  Chris Toshok  <toshok@ximian.com>
-
-	* backend/ebook/e-book-listener.c
-	(e_book_listener_queue_get_supported_fields_response): fix memory
-	leak.
-
-2001-06-20  Chris Toshok  <toshok@ximian.com>
-
-	* contact-editor/e-contact-editor.c: add prototype for
-	close_dialog to remove warnings.
-
-2001-06-20  Dave Camp  <dave@ximian.com>
-
-	* backend/ebook/e-card.c (e_card_list_send): Changed attach_data
-	to be a GNOME_Evolution_Composer_AttachmentData rather than a
-	CORBA_char*.
-
-2001-06-19  Chris Toshok  <toshok@ximian.com>
-
-	* gui/widgets/e-addressbook-view.c (table_double_click): track
-	change to e_addressbook_show_contact_editor signature.
-
-	* gui/widgets/e-minicard-view.c (e_minicard_view_event): same.
-
-	* gui/widgets/e-minicard.c (e_minicard_event): same.
-
-	* gui/widgets/e-addressbook-util.c (e_addressbook_error_dialog):
-	add an entry for "Card ID already exists".
-	(e_addressbook_show_contact_editor): track the change to signal
-	names and e_contact_editor_new signature here.
-
-	* gui/widgets/e-addressbook-util.h: change
-	e_addressbook_show_contact_editor's signature to match
-	e_contact_editor_new more closely.
-
-	* gui/widgets/e-addressbook-table-adapter.c (unlink_model): free
-	up the simple mapping to plug a potentially sizeable memory leak.
-
-	* gui/component/select-names/e-select-names-text-model.c
-	(e_select_names_text_model_activate_obj): call
-	e_addressbook_show_contact_editor here.
-
-	* gui/component/select-names/e-select-names-popup.c
-	(edit_contact_info_have_book_cb): remove the get_supported_fields
-	stuff, since the contact editor handles it for us now, and call
-	e_addressbook_show_contact_editor.
-
-	* gui/component/e-address-popup.c (edit_contact_info_cb): same.
-
-	* gui/component/addressbook.c (new_contact_cb): track change to
-	e_addressbook_show_contact_editor.
-
-2001-06-19  Chris Toshok  <toshok@ximian.com>
-
-	* contact-editor/e-contact-quick-add.c (ce_have_book): rename
-	ce_book_found_fields to this, remove the fetching of fields (the
-	contact editor code handles that now.), and change the add_card
-	signal to card_added.
-	(card_added_cb): copied somewhat from merge_cb above.  we don't
-	need to do the merge here, just call the callback.
-
-	* contact-editor/e-contact-editor.c (e_contact_editor_class_init):
-	track signal change.  add book arg, and is_read_only -> editable.
-	(wants_html_changed): if the card isn't already changed, flag it
-	as such (and update the commands.)
-	(phone_entry_changed): same.
-	(email_entry_changed): same.
-	(address_text_changed): same.
-	(name_entry_changed): same.
-	(company_entry_changed): same.
-	(full_name_clicked): is_read_only -> editable.
-	(full_addr_clicked): same.
-	(card_added_cb): new function, emit our card_added signal, and
-	close the dialog if we're supposed to.  properly deal with error
-	status here.
-	(card_modified_cb): same, modulo card_added -> card_modified.
-	(save_card): actually call e_card_merging_book_{add/commit}_card
-	instead of using a signal.  Also, add a gboolean arg to tell
-	whether or not to close the dialog after saving the card.
-	(card_deleted_cb): new function, just emit our "card_deleted"
-	signal.
-	(delete_cb): actually call e_book_remove_card here, instead of
-	using a signal.
-	(tb_save_and_close_cb): call save_card with TRUE for should_close.
-	(e_contact_editor_init): init changed = FALSE;
-	(e_contact_editor_destroy): unref our book if we have one.
-	(e_contact_editor_new): new signature, set the "book" arg, and
-	call e_book_get_supported_fields here.
-	(supported_fields_cb): new function, show the contact editor.
-	(e_contact_editor_set_arg): initialize changed to FALSE when
-	setting the card (but *after*, since the changed callbacks will
-	set it to TRUE.)  also, call command_state_changed if editable
-	changes.  also handle setting "book".  oh, and is_read_only ->
-	editable.
-	(command_state_changed): new function - set the state of the
-	commands we care about.
-	(e_contact_editor_get_arg): add "book" handling, and is_read_only
-	-> editable.
-	(_phone_arrow_pressed): is_read_only -> editable.
-	(_email_arrow_pressed): same.
-	(_address_arrow_pressed): same.
-	(enable_writable_fields): same.
-	(set_editable): rename set_read_only to this, and is_read_only ->
-	editable.
-
-	* contact-editor/e-contact-editor.h (struct _EContactEditor):
-	is_read_only -> editable, add a "changed" flag so we can sensitize
-	commands correctly, and add an EBook* arg to e_contact_editor_new
-	and to the EContactEditor struct.  Also, change all the signals to
-	past tense, and send the EBookStatus in them.
-
-	* contact-editor/e-contact-editor-address.c
-	(e_contact_editor_address_class_init): is_read_only -> editable.
-	(e_contact_editor_address_set_arg): same.
-	(e_contact_editor_address_get_arg): same.
-
-	* contact-editor/e-contact-editor-address.h (struct
-	_EContactEditorAddress): same.
-
-	* contact-editor/e-contact-editor-fullname.c
-	(e_contact_editor_fullname_class_init): same.
-	(e_contact_editor_fullname_set_arg): same.
-	(e_contact_editor_fullname_get_arg): same.
-
-	* contact-editor/e-contact-editor-fullname.h (struct
-	_EContactEditorFullname): same.
-
-	* contact-editor/Makefile.am: don't build contact-editor-test now,
-	until contact-editor gets moved to gui/ and we can more easily
-	depend on the e_card_merging_* calls.
-
-	* backend/pas/pas-backend-ldap.c (ldap_error_to_response): return
-	CardIdAlreadyExists for LDAP_ALREADY_EXISTS.
-
-	* backend/idl/addressbook.idl: Add CardIdAlreadyExists to the
-	BookListener status enum.
-
-	* backend/ebook/e-book-types.h: add
-	E_BOOK_STATUS_CARD_ID_ALREADY_EXISTS.
-
-	* backend/ebook/e-book-listener.c
-	(e_book_listener_convert_status): add support for
-	CardIdAlreadyExists.
-
-2001-06-19  Jon Trowbridge  <trow@ximian.com>
-
-	* contact-editor/e-contact-quick-add.c: Serious de-crufting,
-	removal of gtk_object_set_data() hacks, simplified by using
-	some of the newer ebook convenience routines, etc.
-	(ce_book_found_fields):
-	s/e_contact_editor_raise/e_contact_editor_show/, to accomodate the
-	small changes in the contact editor API.
-
-2001-06-18  Eskil Heyn Olsen  <eskil@eskil.dk>
-
-	* conduit/address-conduit.c: (check_for_slow_setting),
-	(conduit_get_gpilot_conduit):
-	Tweaked for some gnome-pilot api changes
-
-2001-06-15  Chris Toshok  <toshok@ximian.com>
-
-	* backend/pas/pas-backend-ldap.c (search_for_dn): implement this
-	properly, using base and (objectclass=*).
-
-2001-06-14  Chris Toshok  <toshok@ximian.com>
-
-	* contact-editor/e-contact-editor.c (delete_cb): save ourselves a
-	function call - call close_dialog instead of file_close_cb.
-
-2001-06-14  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* gui/component/addressbook-component.c: Set the
-	"expoted_dnd_types" to NULL in the folder_types.
-
-2001-06-11  Dan Winship  <danw@ximian.com>
-
-	* gui/component/select-names/e-select-names-completion.c
-	(search_override_check): Add a workaround for an EText bug.
-	(e_select_names_completion_begin): Fix up the match scoring in the
-	search_override case so the lines are offered in the correct
-	order.
-
-2001-06-11  Christopher James Lahey  <clahey@ximian.com>
-
-	* gui/merging/Makefile.am (glade_DATA): Added
-	e-card-merging-book-commit-duplicate-detected.glade here.
-
-	* gui/merging/e-card-merging-book-commit-duplicate-detected.glade:
-	Added this file.  The GUI for asking whether to commit a modified
-	card.
-
-	* gui/merging/e-card-merging.c, gui/merging/e-card-merging.h
-	(e_card_merging_book_commit_card): Added this function.
-
-	* gui/widgets/e-addressbook-table-adapter.c
-	(addressbook_set_value_at), gui/widgets/e-addressbook-util.c
-	(commit_card_cb), gui/widgets/e-minicard.c (e_minicard_event): Use
-	e_card_merging_book_commit_card instead of e_book_commit_card here.
-
-2001-06-11  Christopher James Lahey  <clahey@ximian.com>
-
-	* backend/ebook/e-card-simple.c, backend/ebook/e-card-simple.h:
-	Made e_card_simple_get_id return const char *.
-
-	* backend/ebook/e-card.c, backend/ebook/e-card.h: Made
-	e_card_get_id return const char *.
-
-	* gui/component/e-cardlist-model.c (e_cardlist_model_add): Made id
-	variable const here.  Added a break to make it slightly more
-	efficient.
-
-	* gui/widgets/e-minicard.c, gui/widgets/e-minicard.h: Made
-	e_minicard_get_card_id return const char *.
-
-2001-06-11  Christopher James Lahey  <clahey@ximian.com>
-
-	* backend/pas/pas-backend-file.c (entry_compare): Made this handle
-	the "id" property in searches.
-	(pas_backend_file_process_modify_card): Made id variable const
-	here.
-
-	* backend/pas/pas-backend-ldap.c (modify_card_handler): Made id
-	variable const here.
-
-2001-06-11  Christopher James Lahey  <clahey@ximian.com>
-
-	* backend/ebook/e-book-listener.c,
-	backend/ebook/e-book-listener.h, backend/ebook/e-book.c: Rolled
-	back the change 2 ago, dated 06/11/2001 01:51 in CVS, involving
-	e-book-listener.[ch] and e-book.c.
-
-2001-06-11  Christopher James Lahey  <clahey@ximian.com>
-
-	* backend/ebook/e-book.c (e_book_load_uri,
-	e_book_get_supported_fields, e_book_authenticate_user,
-	e_book_remove_card_by_id, e_book_add_vcard, e_book_commit_vcard,
-	e_book_get_cursor, e_book_get_book_view, e_book_get_changes): Made
-	it so that all of these functions queue their ops before calling
-	their CORBA functions.  This way, if the response is sent back
-	before the CORBA function returns there's no problem.  Added
-	e_book_unqueue_op so that the op could be unqueued if the CORBA
-	call fails.
-
-2001-06-11  Christopher James Lahey  <clahey@ximian.com>
-
-	* backend/ebook/e-book-listener.c, backend/ebook/e-book-listener.h
-	(e_book_listener_unpop_response): Added this function to put a
-	response back into the queue.
-
-	* backend/ebook/e-book.c (e_book_check_listener_queue,
-	e_book_queue_op): Handle the case where the op hasn't been queued
-	yet when we get the response.  In this case we unpop the response.
-	Also, when queueing an op, we check to see if there are any
-	responses waiting.
-
-	* This change has been reverted.
-
-2001-06-11  Christopher James Lahey  <clahey@ximian.com>
-
-	* backend/ebook/e-card-compare.c, backend/ebook/e-card-compare.h
-	(e_card_locate_match_full): Added this function to let you do
-	slightly more complicated searches.
-
-	* gui/merging/e-card-merging.c (e_card_merging_book_add_card): Use
-	e_card_locate_match_full to check if the card exists in the book
-	it's being added to instead of in the default book.
-
-2001-06-09  Christopher James Lahey  <clahey@ximian.com>
-
-	* gui/component/select-names/e-select-names-completion.c
-	(match_name): Removed unused email variable.
-
-2001-06-09  Christopher James Lahey  <clahey@ximian.com>
-
-	* backend/ebook/e-card-compare.c (use_common_book_cb): Null
-	terminate the strv here.
-	(e_card_locate_match): ref here instead of unref.
-
-	* backend/ebook/e-card-simple.c (e_card_simple_get): Handle a NULL
-	card here.
-
-	* contact-editor/Makefile.am (INCLUDES), gui/widgets/Makefile.am
-	(INCLUDES): Added addressbook/gui/merging here.
-
-	* contact-editor/e-contact-quick-add.c (book_ready_cb),
-	gui/component/addressbook-component.c (dnd_drop_book_open_cb),
-	gui/widgets/e-addressbook-table-adapter.c
-	(addressbook_append_row), gui/widgets/e-addressbook-util.c
-	(add_card_cb), gui/widgets/e-addressbook-view.c
-	(selection_received), gui/widgets/e-minicard-control.c
-	(book_open_cb): Use e_card_merging_book_add_card instead of
-	e_book_add_card here.
-
-	* gui/Makefile.am (SUBDIRS): Added merging.
-
-	* gui/component/Makefile.am (evolution_addressbook_LDADD),
-	gui/widgets/Makefile.am (minicard_test_LDADD,
-	minicard_widget_test_LDADD): Added libecardmerging.a here.
-
-	* gui/merging/, gui/merging/.cvsignore, gui/merging/Makefile.am:
-	New addressbook library.
-
-	* gui/merging/e-card-duplicate-detected.glade: Glade file for
-	duplicate detected dialog.
-
-	* gui/merging/e-card-merging.c, gui/merging/e-card-merging.h: New
-	files for detecting duplicates before adding and putting up a
-	dialog if duplicates are found.
-
-	* gui/widgets/e-minicard-view.c: Include e-addressbook-util.h
-	here.
-
-2001-06-08  Chris Toshok  <toshok@ximian.com>
-
-	* contact-editor/e-contact-editor.c (e_contact_editor_new): remove
-	the gtk_widget_show call...
-	(e_contact_editor_show): and put it here.
-
-	* contact-editor/e-contact-editor.h: add prototype for
-	e_contact_editor_show.
-
-	* gui/widgets/e-minicard.c (e_minicard_event): call
-	e_addressbook_show_contact_editor.
-	(card_modified_cb): call e_addressbook_error_dialog if status !=
-	SUCCESS.
-
-	* gui/widgets/e-minicard-view.c (e_minicard_view_event): call
-	e_addressbook_show_contact_editor.  also, use card_modified_cb as
-	the commit_card callback.
-
-	* gui/widgets/e-addressbook-view.c (table_double_click): clean
-	this area up alot, call e_addressbook_show_contact_editor.
-	(card_deleted_cb): call e_addressbook_error_dialog.
-
-	* gui/widgets/e-addressbook-table-adapter.c
-	(card_modified_cb): new function, call e_addressbook_error_dialog
-	if the status != SUCCESS.
-	(addressbook_set_value_at): use card_modified_cb as the callback
-	for e_book_commit_card.
-
-	* gui/widgets/Makefile.am (libeminicard_a_SOURCES): add
-	e-addressbook-util.[ch].
-
-	* gui/component/addressbook.c (new_contact_cb): use
-	e_addressbook_show_contact_editor here.
-
-2001-06-05  Christopher James Lahey  <clahey@ximian.com>
-
-	* contact-editor/e-contact-editor.c (categories_clicked): Remove
-	references to ECategoryMasterListWombat.
-
-2001-06-05  Jason Leach  <jleach@ximian.com>
-
-	* gui/component/select-names/e-select-names.c (remove_cb): Make
-	this work when multiple names are selected then right
-	click->Remove.
-
-2001-06-05  Christopher James Lahey  <clahey@ximian.com>
-
-	* backend/ebook/e-card.c (e_card_set_arg): Copy dates as they come
-	in.
-
-	* backend/pas/pas-backend-file.c
-	(pas_backend_file_changes_foreach_key, pas_backend_file_changes,
-	pas_backend_file_process_remove_card,
-	pas_backend_file_process_modify_card,
-	pas_backend_file_build_all_cards_list, pas_backend_file_get_vcard,
-	pas_backend_file_maybe_upgrade_db): memset DBTs to 0 before using
-	them.
-	(pas_backend_file_build_all_cards_list): Reindented.
-
-	* contact-editor/contact-editor.glade: Replaced GnomeDateEdits
-	with a custom widget that creates an EDateEdit.
-
-	* contact-editor/e-contact-editor.c: Use an EDateEdit here instead
-	of a GnomeDateEdit.
-
-2001-06-05  Jason Leach  <jleach@ximian.com>
-
-	(Fix bug #655: SelectNames doesn't let you remove addresses after
-	 you add them)
-	
-	* gui/component/select-names/e-select-names.c
-	(section_right_click_cb): New function, provides a popup menu with
-	just "Remove" in it.
-	(remove_cb): New callback to do the remove.
-	(e_select_names_add_section): Attach the "right_click" signal to
-	the section_right_click_cb above.
-
-2001-06-05  Jon Trowbridge  <trow@ximian.com>
-
-	* gui/component/select-names/e-select-names-manager.c
-	(completion_handler): Change the completion handler to use the
-	ECompletionMatch.
-
-	* gui/component/select-names/e-select-names-completion.c
-	General changes to convert for ECompletionMatch use.
-	(emailify_match): Use extra sort keys in ECompletionMatch to let
-	us ensure that the primary email address is always the first
-	option, the secondary comes second, etc.  There was no nice way to
-	do this previously.
-	(match_name): Removed code that adjusted score based on
-	similarities between the "real name" and the e-mail address.  It
-	seemed like a good idea at the time, but produced unexpected and
-	confusing results.
-
-2001-06-04  Jon Trowbridge  <trow@ximian.com>
-
-	* backend/ebook/e-card-compare.c: Added.  Code for testing
-	if two ECards appear to pertain to the same contact (using loose
-	matching rules, as opposed to requiring exact equality) and to
-	query the addressbook for the "best match" to ECard.
-
-2001-06-03  Chris Toshok  <toshok@ximian.com>
-
-	* gui/component/addressbook.c (set_status_message): remove spew,
-	and don't call the ShellView CORBA method if the interface doesn't
-	exist (for whatever reason.)
-
-	* gui/widgets/e-addressbook-view.c (e_addressbook_view_destroy):
-	unref the EAddressbookModel.
-	(create_minicard_view): unref the adapter.
-	(card_added_cb): call e_book_error_dialog if status != SUCCESS.
-	(card_modified_cb): same.
-	(card_removed_cb): new function, and same.
-	(delete_card_cb): pass card_removed_cb as the callback.
-	(emit_status_message): new function, just emit status_message.
-	(status_message): change to call emit_status_message.
-	(card_deleted_cb): emit_status_message ("Done."), and call
-	e_book_error_dialog if status != SUCCESS.
-	(do_remove): pass view in the closure arg.
-	(e_addressbook_view_delete_selection): emit status "Removing
-	cards..." before starting the removal.
-	(e_book_error_dialog): new function - pop up a (possibly) helpful
-	message about why an operation failed.
-
-	* gui/widgets/e-minicard-view-widget.c
-	(e_minicard_view_widget_new): ref the EAddressbookReflowAdapter.
-	(e_minicard_view_widget_destroy): unref the adapter.
-	(e_minicard_view_widget_get_selection_model): if there isn't a
-	minicard view return NULL.
-
-	* gui/widgets/e-addressbook-table-adapter.c
-	(e_addressbook_table_adapter_construct): ref the
-	EAddressbookModel.
-
-	* gui/widgets/e-addressbook-reflow-adapter.c
-	(addressbook_finalize): rename this from addressbook_destroy, to
-	reflect the method change.
-	(e_addressbook_reflow_adapter_class_init): same.
-	(e_addressbook_reflow_adapter_construct): ref the
-	EAddressbookModel.
-
-	* gui/widgets/e-addressbook-model.h: add editable_set flag.
-
-	* gui/widgets/e-addressbook-model.c (writable_status): only record
-	the writable state of the addressbook if the user hasn't set it.
-	(e_addressbook_model_init): init editable_set to FALSE.
-	(e_addressbook_model_set_arg): set editable_set to TRUE.
-
-2001-06-03  Ettore Perazzoli  <ettore@ximian.com>
-
-	* backend/ebook/Makefile.am (evolution_vcard_importer_LDADD): Move
-	`$(DB3_LDADD)' before libeutil.
-
-2001-06-01  Ettore Perazzoli  <ettore@ximian.com>
-
-	* backend/ebook/Makefile.am (evolution_vcard_importer_LDADD): Add
-	$(DB3_LDADD)'.
-
-2001-05-31  Christopher James Lahey  <clahey@ximian.com>
-
-	* backend/pas/Makefile.am (INCLUDES): Added db3 cflags.
-
-	* backend/pas/pas-backend-file.c: Updated this to use db3.
-
-2001-05-31  Federico Mena Quintero  <federico@ximian.com>
-
-	* gui/widgets/e-addressbook-view.h (EAddressbookView): Added
-	fields for the GalViewMenus and GalViewCollection; we need to keep
-	them around while the component is active.
-
-	* gui/widgets/e-addressbook-view.c
-	(e_addressbook_view_setup_menus): Plug leak; unref the spec.
-	Unref the factories.  Do not unref the collection, since we need
-	it for the signal emission (okay, so the views object adds a
-	reference to it, but if we are interested in it we should keep a
-	reference anyways).
-	(e_addressbook_view_setup_menus): Create the collection and views
-	on the EAddressbookView's fields so that we can keep them around.
-	(e_addressbook_view_discard_menus): New function; gets rid of the
-	collection and views objects.
-
-	* gui/component/addressbook.c (control_activate_cb): Call
-	e_addressbook_view_discard_menus().
-
-2001-05-31  Chris Toshok  <toshok@ximian.com>
-
-	* gui/component/select-names/e-select-names.h (struct
-	_ESelectNames): add the EAddressbookModel* and change the
-	ETableModel's name to "adapter".
-
-	* gui/component/select-names/e-select-names.c (set_book),
-	(addressbook_model_set_uri): these two things take an
-	EAddressbookModel* instead of an ETableModel now.
-	(e_addressbook_create_ebook_table): don't case the
-	EAddressbookModel* to ETableModel*, create an EAddressbookTableAdapter
-	on the EAddressbookModel instead.
-	(e_select_names_init): set e_select_names->adapter.
-
-2001-05-31  Chris Toshok  <toshok@ximian.com>
-
-	* gui/widgets/e-addressbook-model.c (remove_card): decrement
-	data_count before emitting the card_removed signal, and break
-	after we've removed the matching card.
-	(e_addressbook_model_class_init): change signature of
-	"card_removed" signal to match what we emit (and what is
-	expected.)
-
-	* gui/widgets/e-addressbook-view.c (e_addressbook_view_init): the
-	signal name is "destroy", not "destroyed".
-	(do_remove): new function, actually remove the card.
-	(e_addressbook_view_delete_selection): get this working for both
-	view types.
-
-2001-05-31  Chris Toshok  <toshok@ximian.com>
-
-	* gui/component/addressbook.c: Print Preview =>
-	ContactsPrintPreview.  Changed peter's change so that the node
-	name is more in line with "Print.."'s
-
-2001-05-30  Peter Williams  <peterw@ximian.com>
-
-	* gui/component/addressbook.c: Use the correct path to the print
-	preview menu item.
-
-2001-05-30  Chris Toshok  <toshok@ximian.com>
-
-	* gui/component/addressbook.c (cut_contacts_cb): new function, for
-	the Cut verb.
-	(copy_contacts_cb): new function, for the Copy verb.
-	(paste_contacts_cb): new function, for the Paste verb.
-	(select_all_contacts_cb): new function, for the Select All verb.
-	(update_command_state): add handling for sensitivity of
-	Cut/Copy/Paste/Select All.
-
-	* gui/widgets/e-addressbook-view.c (e_addressbook_view_init): init
-	the invisible and set up selection/destroy signals.
-	(get_selection_model): new function, so we can get the
-	ETableSelectionModel from either view type.  makes lots of the
-	other functions easier, since we can get the list of selected
-	cards using the same code regardless of view type.
-	(invisible_destroyed): new function.
-	(selection_get): new function.  convert the clipboard list to
-	string.
-	(selection_clear_event): new function - free up the list of
-	ECards.
-	(selection_received): if the selection data is valid and
-	well-formed, add the corresponding cards to the ebook.
-	(add_to_list): new function.
-	(get_selected_cards): new function.
-	(e_addressbook_view_cut): new function, implement in terms of
-	_copy and _delete_selection.
-	(e_addressbook_view_copy): claim ownership of the CLIPBOARD
-	selection after saving the list of selected ECards.
-	(e_addressbook_view_paste): call gtk_selection_convert.
-	(e_addressbook_view_select_all): new function, using
-	e_selection_model_select_all.
-	(e_addressbook_view_can_print): re-implement in terms of
-	get_selection_model.
-	(e_addressbook_view_can_delete): same.
-	(e_addressbook_view_can_cut): new function.
-	(e_addressbook_view_can_copy): new function.
-	(e_addressbook_view_can_paste): new function.  hmm, always return
-	TRUE here.
-	(e_addressbook_view_can_select_all): new function.
-
-	* gui/widgets/e-addressbook-view.h (struct _EAddressbookView): add
-	selection stuff - the list of selected cards, and the GtkInvisible
-	selection owner, and add prototypes for
-	e_addressbook_view_[can]_{cut,copy,paste,select_all}.
-	
-	* gui/widgets/e-minicard-view-widget.h: add a prototype for
-	e_minicard_view_widget_get_selection_model.
-
-	* gui/widgets/e-minicard-view-widget.c
-	(e_minicard_view_widget_get_selection_model): new function.
-
-2001-05-27  Dan Winship  <danw@ximian.com>
-
-	* gui/component/addressbook.c: #include
-	"evolution-shell-component-utils.h" rather than "e-gui-utils.h"
-	for e_pixmaps_update.
-
-2001-05-25  Peter Williams  <peterw@ximian.com>
-
-	* gui/component/Makefile.am: Reference libeshell.la instead of
-	libeshell.a.
-
-2001-05-25  Christopher James Lahey  <clahey@ximian.com>
-
-	* gui/widgets/e-addressbook-reflow-adapter.c (addressbook_height):
-	Correct the height calculation here to not include the
-	E_CARD_SIMPLE_FIELD_FAMILY_NAME since it won't be displayed.
-
-	* gui/widgets/e-minicard.c (remodel): Changed this to continue to
-	be more consistent and simpler.
-
-2001-05-23  Chris Toshok  <toshok@ximian.com>
-
-	* backend/pas/pas-backend-ldap.c (view_destroy): fix strings such
-	that ones that happening at the beginning or during an operation
-	are followed by "..." and those that stop the operation are
-	followed by "."
-	(create_card_handler): same.
-	(ldap_op_process_current): same, and also call _notify_complete if
-	we can't connect to ldap server.
-	(poll_ldap): same, and change "Polling for LDAP search result" to
-	"Receiving LDAP search results"
-
-	* backend/pas/pas-backend-file.c (pas_backend_file_search): call
-	notify_status_message at the beginning of this function, and
-	whenever we call _notify_complete.
-
-2001-05-23  Chris Toshok  <toshok@ximian.com>
-
-	* gui/widgets/e-addressbook-model.h: add sequence_complete_id to
-	EAddressbookModel and stop_state_changed to
-	EAddressbookModelClass.  also, add prototype for
-	e_addressbook_model_can_stop.
-
-	* gui/widgets/e-addressbook-model.c (remove_book_view): disconnect
-	from "sequence_complete", and set search_in_progress to FALSE.
-	(sequence_complete): set search_in_progress to FALSE and emit
-	"stop_state_changed."
-	(e_addressbook_model_class_init): create the "stop_state_changed"
-	signal.
-	(e_addressbook_model_init): init stuff.
-	(book_view_loaded): connect to "sequence_complete" signal.
-	(book_view_loaded): set search_in_progress to TRUE and emit
-	"stop_state_changed"
-	(e_addressbook_model_stop): set search_in_progress to false, emit
-	"stop_state_changed", and set our status to "Search Interrupted."
-	(e_addressbook_model_can_stop): return search_in_progress.
-
-	* gui/widgets/e-addressbook-view.c (e_addressbook_view_init):
-	connect to the stop_state_changed signal on EAddressbookModel.
-	(stop_state_changed): new function.
-	(e_addressbook_view_can_stop): call e_addressbook_model_can_stop.
-
-	* gui/component/addressbook.c (update_command_state): use
-	e_addressbook_view_can_stop to set the sensitivity of the stop
-	button.
-
-2001-05-22  Dan Winship  <danw@ximian.com>
-
-	* backend/ebook/e-book-listener.c (e_book_listener_check_queue):
-	ref the listener for the duration of this function, since emitting
-	"responses_queued" may cause it to be unreffed by its EBook in
-	some cases, which could cause the second response_queue check to
-	look at garbage data if it got destroyed.
-	(e_book_listener_destroy): Call g_source_remove if idle_id is set.
-
-2001-05-22  Chris Toshok  <toshok@ximian.com>
-
-	* gui/component/addressbook.c: track the change in
-	evolution-addressbook.xml's bonobo ui path's.
-
-2001-05-21  Chris Toshok  <toshok@ximian.com>
-
-	* gui/component/addressbook.c (change_view_type): update_view_type
-	is gone, since the menu item is gone.
-
-	* gui/widgets/e-addressbook-table-adapter.c (create_card): use
-	e_table_model_rows_inserted here.
-
-2001-05-20  Christopher James Lahey  <clahey@ximian.com>
-
-	* gui/component/addressbook-config.c
-	(addressbook_source_item_new): Removed an unused variable.
-
-	* gui/component/select-names/e-select-names-bonobo.c
-	(entry_get_property_fn): Made text here non-const.
-
-	* gui/component/select-names/e-select-names-popup.c
-	(edit_contact_info_cb): Cast to a gpointer here.
-
-	* gui/component/select-names/e-select-names.c
-	(e_addressbook_create_ebook_table): Cast to E_TABLE_MODEL here.
-
-2001-05-18  Jon Trowbridge  <trow@ximian.com>
-
-	* gui/component/select-names/e-select-names-completion.c
-	(match_name): Do a better job constructing match strings, so we
-	never try to use a segment of the name that isn't there (resulting
-	in ugly (null)'s in the string).  Boost our score if some part of
-	the name also matches the front part of the e-mail address, so the
-	name match will always trump the e-mail match.
-
-	* gui/component/select-names/e-select-names-bonobo.c
-	(entry_get_property_fn): Return the serialized EDestinations
-	(rather than just a string w/ e-mail addresses) through the bonobo
-	component's property bag.
-
-	* gui/component/select-names/e-select-names-model.c
-	(e_select_names_model_export_destinationv): Added.  A convenience routine
-	for serializing the model's EDestinations into a string.
-
-	* gui/component/select-names/e-select-names-popup.c
-	(add_html_mail): Added.  Puts in a check menu item for whether or
-	not the recipient wants HTML mail.
-	(popup_menu_card): Add menu item for HTML mail.  Enable edit
-	contact info item.
-	(popup_menu_nocard): Add menu item for HTML mail.  Enable edit
-	contact info item.
-
-	* backend/ebook/e-book-util.c (e_book_use_local_address_book):
-	Added.  Fetches the local addressbook and caches it on the first
-	call.  This is meant to be an easy and efficient way to get at the
-	local addressbook with the minimum of code.
-	(e_book_query_address_locally): Added.  Convenience code that
-	does an e-mail only e_book_name_and_email_query against the
-	local address book.
-
-	* backend/ebook/e-destination.c
-	(e_destination_set_html_mail_pref): Added.  Allows the intended
-	recipient's HTML mail preference to be manipulated.
-	(e_destination_get_email_verbose): Added.  Cleaned up to use
-	e_destination_get_name.
-	(e_destination_get_html_mail_pref): Added.  Read the recipient's HTML mail
-	preference.  If the destination is linked to a card, the
-	preference is taken from the card (unless it has been explicitly
-	overridden by a called to e_destination_set_html_mail_pref).
-	(e_destination_get_address_textv): Added.  Form a unified address string
-	from a NULL-terminated vector of EDestinations.
-	(e_destination_export): Added.  Serialize an EDestination to a string.
-	(e_destination_import): Added.  Unserialize a string to build an
-	EDestination.
-	(e_destination_exportv): Added.  Serialize a NULL-terminated vector of
-	EDestinations to a string.
-	(e_destination_importv): Added.  Unserialize a string to build a
-	NULL-terminated vector of EDestinations.
-
-	* gui/component/select-names/e-select-names-completion.c:
-	Implemented local versions of g_strcasecmp and g_strncasecmp
-	(which should really be in glib, I think...) for utf8, and used
-	them to make this code utf8-safe.
-
-2001-05-17  Chris Toshok  <toshok@ximian.com>
-
-	* gui/component/addressbook.c (update_command_state): no more
-	ContactFind command.
-
-2001-05-17  Chris Toshok  <toshok@ximian.com>
-
-	* gui/widgets/e-minicard-view-widget.c
-	(e_minicard_view_widget_class_init): add our selection_change
-	signal.
-	(e_minicard_view_widget_realize): connect to the ESelectionModel's
-	selection_changed signal.
-	(e_minicard_view_widget_selected_count): new function.
-	(selection_change): new function - emit our "selection_change"
-	signal.
-
-	* gui/widgets/e-minicard-view-widget.h (struct
-	_EMinicardViewWidgetClass): add selection_change signal.  also,
-	add prototype for e_minicard_view_widget_selected_count.  
-
-	* gui/widgets/e-addressbook-view.c
-	(e_addressbook_view_class_init): add our command_state_change
-	signal.
-	(e_addressbook_view_init): connect to the writable_status signal
-	on the EAddressbookModel.
-	(minicard_selection_change): new function - calls
-	command_state_change.
-	(create_minicard_view): connect to selection_change on the
-	minicard_view so we know when to update command state.
-	(table_selection_change): new function - calls
-	command_state_change.
-	(writable_status): new function - calls command_state_change.
-	(command_state_change): new function - emits our
-	"command_state_change" signal.
-	(create_table_view): connect to the selection_change signal so we
-	know to update the command state.
-	(change_view_type): update the command state every time we change
-	view types.
-	(e_addressbook_view_can_create): new function.
-	(e_addressbook_view_can_print): new function.
-	(e_addressbook_view_can_delete): new function.
-	(e_addressbook_view_can_stop): new function.
-
-	* gui/widgets/e-addressbook-view.h (struct
-	_EAddressbookViewClass): add command_state_change signal, and
-	prototypes of functions the component can use to test the state of
-	commands.
-
-	* gui/widgets/e-addressbook-model.c (addressbook_destroy): unlink
-	the writable_status signal on the EBook.
-	(writable_status): new function.
-	(e_addressbook_model_class_init): add our writable_status signal.
-	(e_addressbook_model_init): init writable_status_id.
-	(e_addressbook_model_set_arg): unlink the writable_status signal
-	on the old EBook, and connect it on the new one.
-
-	* gui/widgets/e-addressbook-model.h: add writable_status signal.
-
-	* gui/component/addressbook.c (update_command_state): new
-	function, set the sensitivity of the bonobo commands.
-	(control_activate): update our command state immediately upon
-	activating the control.
-	(addressbook_factory_new_control): register command_state_change
-	to update the commands.
-
-2001-05-15  Chris Toshok  <toshok@ximian.com>
-
-	* gui/search/e-addressbook-search-dialog.c
-	(e_addressbook_search_dialog_init): initialize the model and
-	adapter.
-	(button_press): set on the model.
-	(e_addressbook_search_dialog_new): same.
-	(e_addressbook_search_dialog_set_arg): same.
-	(e_addressbook_search_dialog_destroy): unref the model and
-	adapter.
-
-	* gui/search/e-addressbook-search-dialog.h (struct
-	_EAddressbookSearchDialog): add our model and reflow adapter.
-
-2001-05-16  Christopher James Lahey  <clahey@ximian.com>
-
-	* gui/widgets/e-minicard-view.c: (e_minicard_view_destroy): Fixed
-	up the lifetime of the drag_data_get signal a bit.
-
-2001-05-15  Chris Toshok  <toshok@ximian.com>
-
-	* gui/widgets/e-minicard-view.c (add_to_list): MinicardViewModel
-	-> ReflowAdapter name change.
-	(get_card_list): same.
-	(e_minicard_view_drag_begin): same.
-	(supported_fields_cb): model -> adapter.
-	(adapter_changed): hook up signals and set the empty message on
-	our adapter.
-	(e_minicard_view_set_arg): add support for "adapter", and set
-	model -> adapter.
-	(e_minicard_view_get_arg): same.
-	(disconnect_signals): no more status_message.
-	(do_remove): track to use adapter.
-	(e_minicard_view_class_init): add adapter arg, and remove
-	status_message.
-	(e_minicard_view_init): all the code here is in adapter_changed
-	now.
-
-	* gui/widgets/e-minicard-view.h (struct _EMinicardView):
-	EMinicardViewModel -> EAddressbookReflowAdapter.
-	(struct _EMinicardViewClass): get rid of status_message.
-
-	* gui/widgets/e-minicard-view-widget.c
-	(e_minicard_view_widget_class_init): remove the status_message
-	signal.
-	(e_minicard_view_widget_new): take the adapter as our argument,
-	and store it away for when we create the view.
-	(e_minicard_view_widget_realize): when we create the view just set
-	the adapter field on it.  also, don't connect to status_message.
-
-	* gui/widgets/e-minicard-view-widget.h (struct
-	_EMinicardViewWidget): add our adapter here, so we can pass it
-	into the view when we create it.
-	(struct _EMinicardViewWidgetClass): remove status_message.
-
-	* gui/widgets/e-addressbook-view.c (status_message): new function,
-	no more propagating status messages!
-	(e_addressbook_view_init): create our model and conenct to its
-	status_message signal.
-	(book_writable_cb): set "editable" on the model, not our object.
-	(e_addressbook_view_set_arg): same, but with "book" and "query" as
-	well.
-	(create_minicard_view): create our reflow adapter and pass it to
-	the minicard view widget.  also, call e_reflow_model_changed so
-	it'll pick up any already present cards.
-	(table_double_click): ADDRESSBOOK_MODEL -> TABLE_ADAPTER.
-	(get_card_list_1): remove the cast, since we don't need it any
-	longer.
-	(table_right_click): ADDRESSBOOK_MODEL -> TABLE_ADAPTER.
-	(table_drag_data_get): same.
-	(create_table_view): create the table adapter, and use it as our
-	ETableModel.
-	(change_view_type): remove the status_message hook up and setting
-	of query/book/editable.
-	(e_addressbook_view_stop): just call e_addressbook_model_stop here
-	instead of switching on the view type.
-
-	* gui/widgets/e-addressbook-view.h (struct _EAddressbookView): add
-	our EAddressbookModel.
-
-	* gui/widgets/Makefile.am (libeminicard_a_SOURCES): add the
-	adapter files, and remove e-minicard-view-model.[ch].
-
-	* gui/widgets/e-minicard-view-model.[ch]: removed.
-	
-	* gui/widgets/e-addressbook-table-adapter.c: new file.
-
-	* gui/widgets/e-addressbook-table-adapter.h: new file.
-
-	* gui/widgets/e-addressbook-reflow-adapter.c: new file.
-
-	* gui/widgets/e-addressbook-reflow-adapter.h: new file.
-
-	* gui/widgets/e-addressbook-model.c: rework this class to now
-	subclass from ETableModel anymore.  It not subclasses from
-	GtkObject, and we use table and reflow adapters to get at the
-	data.
-
-	* gui/widgets/e-addressbook-model.h: same.
-
-2001-05-14  Christopher James Lahey  <clahey@ximian.com>
-
-	* gui/widgets/e-minicard-view-model.c (remove_card): Fix a small
-	error not decreasing the data_count here.
-
-2001-05-13  Chris Toshok  <toshok@ximian.com>
-
-	* gui/component/addressbook.h: add prototype for
-	addressbook_expand_uri.
-
-	* gui/component/addressbook-component.c
-	(destination_folder_handle_drop): create an EBook for
-	@physical_uri.
-	(dnd_drop_book_open_cb): actually add the dropped cards.
-
-	* gui/component/addressbook.c (addressbook_expand_uri): abstract
-	this code out from the set_prop method so we can use it in the
-	component.
-	(set_prop): call addressbook_expand_uri.
-
-	* backend/ebook/e-card.c (e_card_load_cards_from_string): new
-	function.
-
-	* backend/ebook/e-card.h: add prototype for
-	e_card_load_cards_from_string.
-
-2001-05-12  Chris Toshok  <toshok@ximian.com>
-
-	* gui/component/addressbook-component.c
-	(destination_folder_handle_drop): spew the data passed to us.
-	(destination_folder_handle_motion): the suggested_action is not an
-	ActionSet, but an Action, so don't or together multiple actions.
-
-2001-05-11  Chris Toshok  <toshok@ximian.com>
-
-	* gui/component/addressbook-config.c (addressbook_source_dialog):
-	correct bug causing the Ok button to never be enabled.
-
-2001-05-11  Chris Toshok  <toshok@ximian.com>
-
-	* gui/component/addressbook-component.c (populate_context_menu):
-	example.
-
-2001-05-11  Chris Toshok  <toshok@ximian.com>
-
-	* gui/widgets/e-minicard-view.c (e_minicard_view_drag_data_get):
-	use e_card_list_get_vcard to build up the data to send.
-	(e_minicard_view_init): connect to the model's drag_begin signal.
-	(e_minicard_view_drag_begin): gather the list of cards being
-	dragged and call gtk_drag_begin.
-	(add_to_list): new function.
-	(get_card_list): same.
-	(disconnect_signals): disconnect the drag_data_get signal.
-	(e_minicard_view_init): connect to the drag_begin signal on our
-	model.
-
-	* gui/widgets/e-minicard-view.h (struct _EMinicardView): change
-	drag_card to drag_list.
-	
-	* gui/widgets/e-minicard-view-model.c (minicard_drag_begin): new
-	function, emit our drag_begin signal.
-	(addressbook_incarnate): connect to the item's drag_begin signal.
-	(e_minicard_view_model_class_init): init our drag_begin signal.
-
-	* gui/widgets/e-minicard-view-model.h: add drag_begin signal.
-
-	* gui/component/addressbook-config.c (addressbook_source_dialog):
-	always loop through all source types here, making LDAP first so
-	it's forces as the first notebook item.
-	(addressbook_config_auth_label): remove SASL case.
-	(addressbook_source_edit_changed): same.
-	(addressbook_source_item_new): flag the area of code that needs to
-	go into the advanced dialog (if we add one before someone
-	graciously redesigns the entire addressbook gui :)
-
-
-	* gui/component/addressbook-storage.c (ldap_unparse_auth): remove
-	SASL case.
-	(ldap_parse_auth): same.
-
-	* gui/component/addressbook-storage.h: make LDAP come first in our
-	source type enumeration, and remove the SASL auth type.
-
-2001-05-11  Christopher James Lahey  <clahey@ximian.com>
-
-	* backend/ebook/e-card.c (e_card_set_arg): If the name is set and
-	the full_name or file_as haven't been yet, set them.
-
-2001-05-11  Christopher James Lahey  <clahey@ximian.com>
-
-	* backend/pas/pas-backend-file.c: Reordered the includes here.
-	(string_to_dbt): The sleepycat libdb documentation suggests
-	memseting the DBT to 0 so we do that here.
-
-	* gui/widgets/e-minicard-view-model.c (addressbook_height): Skip
-	the E_CARD_SIMPLE_FIELD_FAMILY_NAME field.
-
-	* gui/widgets/e-minicard.c (remodel): Skip the
-	E_CARD_SIMPLE_FIELD_FAMILY_NAME field.
-
-2001-05-11  Chris Toshok  <toshok@ximian.com>
-
-	* backend/pas/pas-backend-ldap.c (pas_backend_ldap_connect): only
-	check schema support if we've connected.
-
-2001-05-11  Chris Toshok  <toshok@ximian.com>
-
-	* contact-editor/e-contact-editor.c (enable_writable_fields):
-	don't leak the ECard or ECardSimple.
-
-2001-05-08  Iain Holmes  <iain@ximian.com>
-
-	* backend/ebook/GNOME_Evolution_Addressbook_VCard_Importer.oaf.in:
-	Renamed the GnomeCard_Importer.oaf.in to this, and change the IID.
-
-	* Makefile.am: Rename all the GnomeCard to VCard.
-
-	* evolution-vcard-importer.c: Make the GnomeCard a generic 
-	vcard importer.
-
-2001-05-08  Christopher James Lahey  <clahey@ximian.com>
-
-	* backend/ebook/Makefile.am (libebookinclude_HEADERS): Removed
-	e-card-pairs.h since we're not using it.
-
-	* backend/ebook/e-book-view.c (e_book_view_check_listener_queue):
-	Added break; to default: case here.
-
-	* backend/ebook/e-card-simple.c, backend/ebook/e-card-simple.h:
-	Added changed variable so as to avoid sync_card when possible.
-	(e_card_simple_destroy): Free all the data here properly.
-	(e_card_simple_get_arg): Slight simplification here.
-	(fill_in_info, e_card_simple_arbitrary_foreach,
-	e_card_simple_get_arbitrary): Call e_card_free_empty_lists here to
-	save a bit of memory.
-
-	* backend/ebook/e-card.c, backend/ebook/e-card.h: Fixed up
-	includes a bit.
-	(e_card_list_get_vcard, e_card_list_send): Added these functions
-	for acting on a group of cards.
-	(parse_org): Cleaned up this function a bit.
-	(e_card_free_empty_lists): Added this function to delete
-	unnecessary ELists and save a bit of memory.
-	(e_v_object_get_child_value): Made this return NULL if not found
-	instead of g_strdup("").
-
-	* contact-editor/e-contact-save-as.c,
-	contact-editor/e-contact-save-as.h (e_contact_list_save_as): Added
-	this function to save multiple contacts.
-
-	* gui/widgets/Makefile.am: Commented out reflow test.
-	(libeminicard_a_SOURCES): Added e-minicard-view-model.c and
-	e-minicard-view-model.h.
-
-	* gui/widgets/e-minicard-view-model.c,
-	gui/widgets/e-minicard-view-model.h: Model for use in
-	EMinicardView.
-
-	* gui/widgets/e-minicard-view.c, gui/widgets/e-minicard-view.h:
-	Reworked this to use the new EReflow stuff.
-
-	* gui/widgets/e-minicard.c (e_minicard_event): Doesn't handle
-	right click menus now.  Emits a signal on the parent canvas item
-	instead.
-
-	* printing/e-contact-print-envelope.c,
-	printing/e-contact-print-envelope.h
-	(e_contact_print_envelope_list_dialog_new): Added this function to
-	print multiple envelopes (only prints first for now.)
-
-	* printing/e-contact-print.c, printing/e-contact-print.h
-	(e_contact_print_card_list_dialog_new): Added this function to
-	print multiple cards.  Only prints the first for now.
-
-2001-05-07  Chris Toshok  <toshok@ximian.com>
-
-	* gui/component/addressbook-component.c (remove_folder): flesh out
-	the function more.  It should work now, but there's no way to
-	invoke this method from the ui at the moment, heh.
-
-2001-05-07  Chris Toshok  <toshok@ximian.com>
-
-	* gui/component/addressbook.c (book_open_cb): Use a different
-	error message in the ldap support/no ldap support/file cases.
-
-2001-05-07  Gediminas Paulauskas <menesis@delfi.lt>
-
-	* gui/component/addressbook.c: use define from
-	widgets/misc/e-filter-bar.h instead of own enumeration and search menu
-	names.
-
-	* gui/component/Makefile.am, gui/component/select-names/Makefile.am:
-	removed EVOLUTION_VERSION.
-
-2001-05-04  Chris Toshok  <toshok@ximian.com>
-
-	* gui/component/addressbook-component.c (remove_folder): un-#if 0
-	this.
-	(xfer_folder): add skeleton code to validate xfer request.  always
-	notifies with PERMISSION_DENIED at present.
-	(populate_context_menu): un-#if 0 this.
-	(get_dnd_selection): same.
-	(destination_folder_handle_motion): new function.
-	(destination_folder_handle_drop): new function.
-	(factory_fn): create a EvolutionShellComponentDndDestinationFolder
-	interface, and add it to our shell component.
-
-2001-05-04  JP Rosevear  <jpr@ximian.com>
-
-	* backend/pas/pas-backend-file.c
-	(pas_backend_file_process_get_book_view): init change_id to NULL
-
-2001-05-02  JP Rosevear  <jpr@ximian.com>
-
-	* gui/component/addressbook.c (addressbook_view_free): unref the
-	book if the view is being destroyed
-
-	* backend/pas/pas-backend-file.c
-	(pas_backend_file_process_get_book_view): unref the book_view when
-	we are finished, it is only interesting if someone else has reffed
-	it now (weak reference)
-	(pas_backend_file_add_client): unref the book for the same reason
-	as above
-
-	* Fixes bug #2255
-
-2001-04-30  JP Rosevear  <jpr@ximian.com>
-
-	* backend/pas/pas-backend-file.c (vcard_matches_search): if the
-	view does not contain a search context, the result is by default
-	false fixes #2470
-
-2001-04-25  Dan Winship  <danw@ximian.com>
-
-	* gui/component/addressbook-factory.c (main): Remove call to
-	unicode_init.
-
-2001-04-23  Jon Trowbridge  <trow@ximian.com>
-
-	* gui/component/e-address-popup.c: Lots of code has been
-	simplified here.
-	(e_address_popup_factory_new_control): Rather than directly pop
-	our control up in a window (via the e_address_popup_popup
-	function, which is now gone), just return the widget and let the
-	caller do the popping.  This works better, since it means we don't
-	have to work around the vagaries of bonobo focus & event handling.
-	(e_address_popup_set_name): Refresh when both name & email have
-	been set, rather than checking a stupid counter.
-	(e_address_popup_set_email): Ditto.
-
-2001-04-22  Christopher James Lahey  <clahey@ximian.com>
-
-	* gui/component/addressbook-storage.c
-	(addressbook_storage_clear_sources): Added save_source_data here.
-
-2001-04-21  Jon Trowbridge  <trow@ximian.com>
-
-	* contact-editor/e-contact-quick-add.c (clicked_cb): Properly
-	convert to utf8. (Bug #2256)
-	(build_quick_add_dialog): Properly convert from utf8. (Bug #2256)
-
-2001-04-16  Jon Trowbridge  <trow@ximian.com>
-
-	* backend/ebook/e-destination.c (e_destination_get_name): Added.
-
-	* gui/component/select-names/e-select-names.c
-	(real_add_address_cb): Use e_select_names_model_append.  It's
-	nicer.
-
-	* gui/component/select-names/e-select-names-model.c
-	(e_select_names_model_append): Added.
-
-	* gui/component/select-names/e-select-names-completion.c
-	(book_query_process_card_list): Filter out completion matches that
-	don't have an associated e-mail address.
-	(book_query_score): Give a bonus to the primary address, so that
-	it always comes up first in the completion results.
-
-	* gui/component/e-address-popup.c (e_address_popup_refresh_names):
-	Convert utf8 strings into gtk strings before displaying.
-
-2001-04-14  Christopher James Lahey  <clahey@ximian.com>
-
-	* backend/ebook/e-book-view-listener.c,
-	backend/ebook/e-book-view-listener.h: Added the function
-	e_book_view_listener_stop to tell the book view listener to stop
-	sending signals.
-
-	* backend/ebook/e-book-view.c (e_book_view_destroy): Tell the
-	EBookViewListener to stop when we're destroyed.
-
-	* backend/pas/pas-backend-file.c (view_destroy,
-	pas_backend_file_process_get_book_view,
-	pas_backend_file_process_get_changes): Cleaned these up a bit
-	using bonobo_object_ref and bonobo_object_unref.
-	(pas_backend_file_process_get_book_view,
-	pas_backend_file_process_get_changes): bonobo_object_release_unref
-	the EBookListener here.
-
-	* backend/pas/pas-backend-ldap.c
-	(pas_backend_ldap_process_get_book_view): Cleaned this up a bit
-	using bonobo_object_ref.  Make sure to unref the listener when
-	we're done with it.  Put the new book_view in the list before
-	telling the book_listener that it's ready.
-
-	* backend/pas/pas-book-view.c (pas_book_view_construct): Cleaned
-	this up a bit using bonobo_object_dup_ref.
-	(pas_book_view_destroy): Cleaned this up a bit using
-	bonobo_object_release_unref.
-
-	* backend/pas/pas-book.c (pas_book_queue_get_book_view,
-	pas_book_queue_get_changes): bonobo_object_dup_ref here instead of
-	just duplicating.
-
-2001-04-14  Christopher James Lahey  <clahey@ximian.com>
-
-	* backend/ebook/e-book-listener.c
-	(impl_BookListener_respond_get_cursor): Ref the cursor here when
-	we receive it.
-	(impl_BookListener_respond_get_view,
-	impl_BookListener_respond_get_changes): Ref the book_view here
-	when we receive it.
-	(impl_BookListener_respond_open_book): Ref the book here when we
-	receive it.
-	(e_book_listener_destroy): Unref the objects in our queue here.
-
-	* backend/ebook/e-book-view.c (e_book_view_construct): Cleaned
-	this up using bonobo_object_dup_ref.
-	(e_book_view_destroy): Cleaned this up using
-	bonobo_object_release_unref.
-
-	* backend/ebook/e-book.c (e_book_do_response_get_cursor,
-	e_book_do_response_get_view, e_book_do_response_get_changes,
-	e_book_unload_uri): Cleaned this up using
-	bonobo_object_release_unref.
-
-2001-04-13  Christopher James Lahey  <clahey@ximian.com>
-
-	* gui/component/select-names/e-select-names-bonobo.c
-	(entry_get_property_fn): Get the ESelectNamesModel from the
-	widget's text model instead of storing it as a gtk_object_set_data
-	since it may change.
-
-2001-04-12  Jason Leach  <jasonleach@usa.net>
-
-	* backend/pas/pas-backend-file.c (INITIAL_VCARD): Update the Voice
-	and Fax phone numbers too, finishing off bug #1667.
-
-2001-04-11  Christopher James Lahey  <clahey@ximian.com>
-
-	* backend/pas/pas-backend-file.c (INITIAL_VCARD): Update the built
-	in VCard.
-
-2001-04-12  JP Rosevear  <jpr@ximian.com>
-
-	* conduit/address-conduit.c (local_record_from_ecard): put the
-	business address into the pilot record as that is what we put into
-	the desktop record
-	(ecard_from_remote_record): set both the address label and
-	delivery address to avoid bad parser guessing, fixes #2143
-
-	* backend/ebook/e-card-types.h: remove deprecated pilot code
-
-	* backend/ebook/e-card.c: ditto
-
-	* backend/ebook/e-card.h: ditto
-	
-2001-04-11  JP Rosevear  <jpr@ximian.com>
-
-	* conduit/address-conduit.c (local_record_from_ecard): Don't add
-	more than five phone numbers and set the remaining blank entries
-	to some reasonable defaults
-
-2001-04-11  Christopher James Lahey  <clahey@ximian.com>
-
-	* backend/ebook/e-card-simple.h: Added
-	E_CARD_SIMPLE_FIELD_LAST_SIMPLE_STRING.
-
-	* gui/component/addressbook-component.c (accepted_dnd_types):
-	Fixed a warning here.
-
-	* gui/widgets/e-addressbook-model.c: Modified this to have more
-	columns, but not let them be edited if they're not a simple
-	string.
-
-	* gui/widgets/e-minicard-view.c (e_minicard_view_init): Fixed a
-	warning and a memory leak here.
-
-2001-04-10  Gediminas Paulauskas <menesis@delfi.lt>
-
-	* backend/ebook/evolution-gnomecard-importer.c: added missing #include.
-	* contact-editor/e-contact-editor.c (_arrow_pressed): popup menu items were
-	not translated after selecting one of them.
-	* gui/widgets/e-addressbook-view.c: mark popup menu items with N_().
-	Updated list[] for translators.
-	* gui/widgets/e-minicard.c: same.
-	* gui/widgets/e-minicard-view-widget.c (e_minicard_view_widget_set_arg): fix warning
-	for "editable" arg.
-	* gui/widgets/e-minicard-view.c: convert "empty_message" to utf8.
-
-2001-04-09  Chris Toshok  <toshok@ximian.com>
-
-	* gui/component/addressbook-component.c (remove_folder): stubbed,
-	#if 0'ed
-	(xfer_folder): same.
-	(populate_context_menu): same.
-	(get_dnd_selection): same.
-	(factory_fn): add the accepted drag types ("text/x-vard") to
-	folder_types.
-
-2001-04-09  Chris Toshok  <toshok@ximian.com>
-
-	* gui/widgets/e-minicard.c (e_minicard_event): on BUTTON_PRESS: if
-	it's button 1, store the button x, y, and set drag_button_down to
-	TRUE.  on BUTTON_RELEASE: always set drag_button_down to FALSE.
-	for MOTION_NOTIFY: initiate drag if the pointer has moved 3
-	pixels.
-
-	* gui/widgets/e-minicard.h (struct _EMinicard): add fields for
-	button x, y, and a bit for if the button has been pressed so we
-	can tell whether a motion should be a drag.
-	(struct _EMinicardClass): add drag_begin signal.
-
-	* gui/widgets/e-minicard-view.c (e_minicard_view_drag_begin): new
-	function, starts the drag.
-	(book_view_loaded): connect the "drag_data_get" signal.
-	(e_minicard_view_drag_data_get): new function.
-
-	* gui/widgets/e-minicard-view.h (struct _EMinicardView): add
-	drag_card and id for canvas_drag_data_get_id.
-
-	* gui/widgets/e-addressbook-view.c (table_drag_data_get): new
-	function.
-	(create_table_view): add d&d stuff.
-
-2001-04-08  Chris Toshok  <toshok@ximian.com>
-
-	* printing/e-contact-print.c: add #include <sys/types.h> since
-	gnome-print.h uses time_t without including it.  this really
-	should be fixed in gnome-print.
-
-2001-04-08  Chris Toshok  <toshok@ximian.com>
-
-	* backend/pas/pas-backend-ldap.c (pas_backend_ldap_add_client):
-	make sure to notify new clients to the writable status of an
-	already open (and authenticated) book.
-
-2001-04-04  Kjartan Maraas  <kmaraas@gnome.org>
-
-	* contact-editor/e-contact-editor.[ch]: Fix headers.
-	* component/addressbook-storage.c: Same here.
-	* gui/search/e-addressbook-search-dialog.c: Same here.
-	* gui/widgets/e-addressbook-view.c: Same here.
-	* gui/widgets/e-minicard-label.c: Same here.
-	* gui/widgets/e-minicard-view-widget.c: Same here.
-	* gui/widgets/e-minicard-view.c: Same here.
-	* gui/widgets/e-minicard-widget-test.c: Same here.
-	* gui/widgets/e-minicard-widget.c: Same here.
-	* gui/widgets/e-minicard.c: Same here.
-	* gui/widgets/test-minicard-label.c: Same here.
-
-2001-04-03  Christopher James Lahey  <clahey@ximian.com>
-
-	* gui/widgets/e-addressbook-view.c (table_double_click): Fixed a
-	crash here.
-
-2001-04-03  Christopher James Lahey  <clahey@ximian.com>
-
-	* gui/widgets/e-addressbook-model.c (COLS): Made this table model
-	more consistent in the number of columns it has.
-	(addressbook_append_row): Fixed this function.  We removed the col
-	offset.
-
-2001-04-02  Iain Holmes  <iain@ximian.com>
-
-	* backend/ebook/evolution-gnomecard-importer.c (importer_init): Shut
-	down and unregister the factory on exit. 
-
-2001-04-01  Gediminas Paulauskas <menesis@delfi.lt>
-
-	* contact-editor/contact-editor.glade: changed icon to
-	evolution-contacts-plain.png.
-	* gui/component/addressbook.c: use new pixmap cache. Added icon for new
-	contact, print, print preview, changed filenames of renamed icons.
-
-2001-03-31  Jon Trowbridge  <trow@ximian.com>
-
-	* gui/component/select-names/e-select-names.c
-	(real_add_address_cb): Call e_select_names_model_clean after
-	adding address.  This should deal with the bug reports related
-	to stray commas.
-
-	* gui/component/select-names/e-select-names-model.c
-	(e_select_names_model_clean): Added.  Remove all empty destinations.
-
-	* backend/ebook/e-destination.c (e_destination_is_empty): Added.  Check
-	if an EDestination is in essentially a null state.
-
-2001-03-30  Christopher James Lahey  <clahey@ximian.com>
-
-	* backend/pas/pas-backend-file.c (pas_backend_file_add_client):
-	Tell new clients that are added whether they're writable.
-
-2001-03-29  Jon Trowbridge  <trow@ximian.com>
-
-	* printing/e-contact-print.c: Added #include <libgnome/gnome-paper.h>
-	
-	* printing/e-contact-print-envelope.c: Added #include <time.h>
-	and #include <libgnome/gnome-paper.h>
-
-2001-04-03  Christopher James Lahey  <clahey@ximian.com>
-
-	* gui/component/select-names/e-select-names-completion.c
-	(match_email): Better handle matching of "nameless" contacts.
-
-	* backend/ebook/e-destination.c (e_destination_get_string): Better
-	handle the case of a "nameless" contact.
-
-2001-03-29  Kjartan Maraas  <kmaraas@gnome.org>
-
-	* *.*: Clean up #includes. Replace <gnome.h>, <bonobo.h> and
-	<gtk/gtk.h> with more finegrained headers where needed.
-
-2001-03-28  Christopher James Lahey  <clahey@ximian.com>
-
-	* backend/ebook/e-card.c (e_card_set_arg): Fixed some crashes.
-
-2001-03-28  Christopher James Lahey  <clahey@ximian.com>
-
-	* gui/component/select-names/e-select-names-table-model.c
-	(fill_in_info): Use E_CARD_SIMPLE_FIELD_NAME_OR_ORG instead of
-	getting the NAME and then the ORG.  That way if we expand
-	NAME_OR_ORG, this will use it.
-
-	* gui/component/select-names/e-select-names.c
-	(e_addressbook_create_ebook_table, SPEC): Use the correct column
-	in the SPEC.
-
-2001-03-25  Jon Trowbridge  <trow@ximian.com>
-
-	* gui/component/select-names/e-select-names-completion.c
-	(e_select_names_completion_seq_complete_cb): Rather than starting
-	the pending query by directly calling
-	e_select_names_completion_do_query, call
-	e_completion_begin_search.  Circumventing the ECompletion API was
-	causing it to get confused in some cases.
-
-2001-03-23  Jon Trowbridge  <trow@ximian.com>
-
-	* gui/widgets/e-minicard-widget.c (e_minicard_widget_set_card):
-	Added.  Call me old-fashioned, but I just prefer to have a real
-	API rather than doing everything via gtk_object_get/set-type
-	calls.
-	(e_minicard_widget_set_arg): Changed to call
-	e_minicard_widget_set_card.
-
-	* backend/ebook/e-book-util.c: Small changes to get rid of
-	compiler warnings.  (Casting out const, removed unused variables,
-	etc.)  Removed some debugging messages.
-
-	* gui/component/addressbook-factory.c (main): Added call
-	to e_address_popup_factory_init.
-
-	* gui/component/e-address-popup.c: Added.  A popup gadget that is
-	invoked (as a bonobo control) when an address is left-clicked in
-	the mailer.  The addressbook is queries, and the address is either
-	displayed as a minicard (if it already exists) or in a "generic
-	format".  A button is provided for editting/adding the contact.
-	Some of the semantics of this widget are a bit... non-standard,
-	because of bonobo issues.  I can't really seem to replicate
-	popup-menu behavior because of how bonobo propogates events, etc.
-	so I've tried to produce something that I think is non-annoying.
-	YMMV.
-
-2001-03-22  Iain Holmes  <iain@ximian.com>
-
-	* backend/ebook/evolution-gnomecard-importer.c: Update to the new
-	IDL.
-
-2001-03-20  Miguel de Icaza  <miguel@ximian.com>
-
-	* gui/component/addressbook.c (update_pixmaps): Added artwork from
-	Jakub. 
-
-2001-03-19  Christopher James Lahey  <clahey@ximian.com>
-
-	* Merged branch:
-
-2001-03-14  Christopher James Lahey  <clahey@ximian.com>
-
-	* gui/widgets/e-minicard-view.c: Call
-	e_selection_model_simple_insert_rows and
-	e_selection_model_simple_delete_rows instead of
-	e_selection_model_simple_insert_row and
-	e_selection_model_simple_delete_row.
-
-End of branch
-
-2001-03-17  Jon Trowbridge  <trow@ximian.com>
-
-	* gui/component/select-names/e-select-names-completion.c: Brutally
-	refactored to boost performance in large-addressbook situations.
-	These fixes give accepable performance (even with the suboptimal
-	pas-backend-file searching) using tigert's addressbook-of-death.
-
-	* backend/pas/pas-backend-file.c (pas_backend_file_search): 
-	Start feeding query matches back to the caller before the
-	entire search is complete; this gives us some "instant feedback"
-	rather than causing evolution to totally lock up...
-
-	* backend/ebook/e-book.c (e_book_queue_op): Tag all queued ops.
-	(e_book_cancel_op): Added.  Search for a pending op with a given
-	tag, and mark it as inactive.
-	(e_book_do_response_get_cursor): Don't execute callback if this
-	operations has been cancelled.
-	(e_book_do_response_get_view): Ditto.
-	(e_book_do_response_get_changes): Ditto.
-	(e_book_do_response_get_supported_fields): Ditto.
-	(e_book_get_supported_fields): Return an operation tag (that can
-	be used to cancel the operation) rather than just TRUE/FALSE.
-	Zero is always an invalid tag and is returned in the case of an
-	error, so this shouldn't break any code that looked at the return
-	value (unless it did so in a particularly stupid way, of course).
-	(e_book_get_cursor): Ditto.
-	(e_book_get_book_view): Ditto.
-	(e_book_get_changes): Ditto.
-	(e_book_cancel): Added.  Cancel a pending operation.  (Basically
-	a call to e_book_cancel_op with error checking, etc.)
-
-	* backend/ebook/e-book-types.h: Added E_BOOK_STATUS_CANCELLED.
-
-2001-03-17  Chris Toshok  <toshok@ximian.com>
-
-	* backend/ebook/e-book-listener.c
-	(e_book_listener_queue_writable_status): new function.
-	(impl_BookListener_report_writable): new function.
-	(e_book_listener_get_epv): fill in epv->notifyWritable.
-
-	* backend/ebook/e-book-listener.h: add writable status entries.
-
-	* backend/ebook/e-book.c (e_book_do_writable_event): new function.
-	(e_book_check_listener_queue): add WritableStatusEvent to the
-	switch.
-	(e_book_class_init): register writable_status signal.
-
-	* backend/ebook/e-book.h: add writable_status signal.
-
-	* backend/idl/addressbook.idl: add notifyWritable method to
-	BookListener.
-
-	* gui/widgets/e-minicard.c (e_minicard_class_init): add "editable"
-	arg.
-	(e_minicard_init): init editable.
-	(e_minicard_set_arg): loop over the minicard fields setting their
-	"editable".
-	(e_minicard_get_arg): add editable.
-	(supported_fields_cb): use editable when creating the
-	contact_editor.
-	(add_field): set "editable" when creatin the e_minicard.
-
-	* gui/widgets/e-minicard.h (struct _EMinicard): add "editable".
-
-	* gui/widgets/e-minicard-view.c (e_minicard_view_class_init): add
-	editable arg.
-	(e_minicard_view_init): init editable.
-	(create_card): pass editable to e_minicard canvas item.
-	(e_minicard_view_set_arg): bit of a hack - loop over all the
-	canvas items setting their "editable."
-	(e_minicard_view_get_arg): add editable.
-	(supported_fields_cb): use editable when creating the contact
-	editor.
-
-	* gui/widgets/e-minicard-view.h (struct _EMinicardView): add
-	"editable."
-
-	* gui/widgets/e-minicard-view-widget.c
-	(e_minicard_view_widget_class_init): add "editable" field.
-	(e_minicard_view_widget_init): init editable to FALSE.
-	(e_minicard_view_widget_set_arg): save editable, and pass it along
-	the e-minicard-view.
-	(e_minicard_view_widget_realize): same.
-	(e_minicard_view_widget_get_arg): add editable.
-
-	* gui/widgets/e-minicard-view-widget.h (struct
-	_EMinicardViewWidget): add "editable" field.
-
-	* gui/widgets/e-minicard-label.h (struct _EMinicardLabel): add
-	"editable" field.
-
-	* gui/widgets/e-minicard-label.c (e_minicard_label_class_init):
-	add "editable" arg.
-	(e_minicard_label_set_arg): editable, set it on the e_text too.
-	(e_minicard_label_get_arg): editable.
-	(e_minicard_label_construct): set the "editable" field when we
-	create the e_text cavas item
-
-	* gui/widgets/e-addressbook-view.c (e_addressbook_view_init):
-	default editable to FALSE.
-	(book_writable_cb): new function, set our editable field and
-	gtk_object_set it on the active view.
-	(e_addressbook_view_set_arg): set the active view's editable when
-	we set the view's book, and connect the "writable_status" signal
-	to book_writable_cb.
-	(change_view_type): same.
-	(supported_fields_cb): use our "editable" when creating the
-	contact editor.
-
-	* gui/widgets/e-addressbook-view.h (struct _EAddressbookView): add
-	editable field.
-
-	* gui/widgets/e-addressbook-model.c (e_addressbook_model_init):
-	change the default of editable to FALSE.
-
-	* backend/pas/pas-book.c (pas_book_report_writable): new function.
-
-	* backend/pas/pas-book.h: prototype for pas_book_report_writable.
-
-	* backend/pas/pas-backend-file.c (pas_backend_file_load_uri): if
-	we open the file O_RDWR (or create it) report it as writable.  if
-	we can't open it as O_RDWR, try opening it read-only before we
-	attempt to create it.
-
-	* backend/pas/pas-backend-ldap.c
-	(pas_backend_ldap_process_authenticate_user): if we authenticate
-	successfully, grant write permissions (this is lacking but there's
-	really nothing we can do to determine the extent of the access
-	afforded a user.)
-
-
-2001-03-15  Jon Trowbridge  <trow@ximian.com>
-
-	* gui/component/e-address-widget.c: Added addressbook querying and
-	"cardification" functions, which are turned off by default for now
-	because of addressbook bugs.  Added a popup menu option to turn
-	queries on, so that others can enjoy the thrill of massive flaming
-	death.
-
-	* gui/component/addressbook-factory.c (main): Made warnings always
-	be fatal.
-
-	* backend/pas/pas-book-view.c: Added some debugging spew.
-
-	* backend/pas/pas-backend-file.c (pas_backend_file_search): Added
-	a little experimental code to try to make file searches scale
-	better.  #if 0/#endif-ed out for now.
-
-	* contact-editor/e-contact-quick-add.c: #included e-book-util.h.
-
-	* backend/ebook/e-card.c (e_card_name_match_string): Added.
-	Looser name-matching function.
-	(e_card_email_match_string): Added.  Loose e-mail matching.
-
-	* backend/ebook/e-book-view-listener.c
-	(e_book_view_listener_check_queue): Added code to cause us to
-	abort rather than get trapped in a 100%-CPU-consuming loop in
-	certain situations.  Now we just need to figure out how to avoid
-	these situations altogether.
-
-	* backend/ebook/e-book-util.c: Added.  Now contains the simple
-	query stuff and the open local addressbook functions.
-
-	* backend/ebook/e-book.c: Moved simple query stuff and open local
-	addressbook functions into e-book-util.c.
-
-2001-03-15  Dan Winship  <danw@ximian.com>
-
-	* gui/widgets/e-minicard-label.c (e_minicard_label_set_arg): 
-	* gui/widgets/e-minicard.c (e_minicard_set_arg, e_minicard_event):
-	Update arguments to e_canvas_item_grab_focus.
-
-2001-03-13  Christopher James Lahey  <clahey@ximian.com>
-
-	* gui/component/addressbook.c (update_pixmaps): Fix a warning
-	here.
-
-2001-03-13  Christopher James Lahey  <clahey@ximian.com>
-
-	* gui/widgets/Makefile.am (minicard_label_test_LDADD): Change to
-	ld order from Greg Williams.
-
-2001-03-13  Christopher James Lahey  <clahey@ximian.com>
-
-	* backend/pas/pas-backend-file.c
-	(pas_backend_file_process_get_book_view): Moved where we call
-	pas_book_respond_get_book_view.
-
-2001-03-12  Chris Toshok  <toshok@ximian.com>
-
-	* backend/pas/pas-backend-ldap.c: add E_STRING_PROP for
-	categories.
-
-	* backend/pas/evolutionperson.schema: add categories attribute.
-
-	* backend/ebook/e-card-simple.c (field_data): add
-	E_CARD_SIMPLE_FIELD_CATEGORIES.
-
-	* backend/ebook/e-card-simple.h: add
-	E_CARD_SIMPLE_FIELD_CATEGORIES.
-
-2001-03-12  Chris Toshok  <toshok@ximian.com>
-
-	* gui/widgets/e-minicard.c (supported_fields_cb): add is_read_only
-	param.
-
-	* gui/widgets/e-minicard-view.c (supported_fields_cb): add
-	is_read_only param.
-
-	* gui/widgets/e-addressbook-view.c (supported_fields_cb): add
-	is_read_only param.
-
-	* gui/component/select-names/e-select-names-text-model.c
-	(e_select_names_text_model_activate_obj): add is_read_only param.
-	also, include a little policy here and make it TRUE, as the user
-	shouldn't be editting in this context anyway (imo).
-
-	* gui/component/addressbook.c (supported_fields_cb): add
-	is_read_only param.
-
-	* contact-editor/test-editor.c (main): add is_read_only param.
-
-	* contact-editor/e-contact-editor.c (set_read_only): new function,
-	that either enables or disables all the text fields, combo boxes,
-	and some buttons, depending on the state of is_read_only.
-	(e_contact_editor_class_init): add read/write arg "is_read_only".
-	(full_name_clicked): set the is_read_only of the fullname dialog
-	to the editor's.
-	(full_addr_clicked): same.
-	(e_contact_editor_new): add is_read_only param, that gets set
-	along with the other params.
-	(e_contact_editor_set_arg): add setter for is_read_only.
-	(e_contact_editor_get_arg): add getter for is_read_only.
-	(_phone_arrow_pressed): change TRUE to !editor->is_read_only for
-	entry.
-	(_email_arrow_pressed): same.
-	(_address_arrow_pressed): same.
-	(enable_writable_fields): same.
-
-	* contact-editor/e-contact-editor-fullname.c
-	(e_contact_editor_fullname_class_init): add read/write arg
-	"is_read_only".
-	(e_contact_editor_fullname_set_arg): add setter for is_read_only
-	that enables/disables all the entries/combos.
-	(e_contact_editor_fullname_get_arg): add getter for is_read_only.
-
-	* contact-editor/e-contact-editor-fullname.h (struct
-	_EContactEditorFullname): add is_read_only flag.
-
-	* contact-editor/e-contact-editor-address.c
-	(e_contact_editor_address_class_init): add read/write arg
-	"is_read_only".
-	(e_contact_editor_address_set_arg): add setter for is_read_only
-	that disables/enables all the entries/combos.
-	(e_contact_editor_address_get_arg): add getter for is_read_only.
-
-	* contact-editor/e-contact-editor-address.h (struct
-	_EContactEditorAddress): add is_read_only flag.
-
-2001-03-13  Iain Holmes  <iain@ximian.com>
-
-	* backend/ebook/Makefile.am: Change the importer includes around a bit.
-
-	* backend/ebook/evolution-gnomecard-importer.c: Correctly add the includes.
-
-2001-03-09  JP Rosevear  <jpr@ximian.com>
-
-	* conduit/Makefile.am: PISOCK_INCLUDEDIR has become
-	PISOCK_CFLAGS in gnome-pilot.m4 and remove capplet foo
-
-2001-03-11  Jon Trowbridge  <trow@ximian.com>
-
-	* backend/ebook/e-book.c (e_book_simple_query): Added. A
-	simplified, cancellable query mechanism that lets you avoid
-	dealing with EBookView.
-	(e_book_simple_query_cancel): Added. Cancels a running query.
-
-	* backend/ebook/e-book-types.h: Add enum EBookSimpleQueryStatus.
-
-2001-03-08  Jon Trowbridge  <trow@ximian.com>
-
-	* gui/component/select-names/e-select-names-popup.c
-	(quick_add_cb): Switched to use e_contact_quick_add_free_form.
-	Removed debugging code, hopefully without introducing any bugs
-	in the process.
-
-	* gui/component/select-names/e-select-names-text-model.c
-	(e_select_names_text_model_insert_length): Fix bug with commas
-	inside of name/address combos.  As long as the comma is inside of
-	quotes, it will be treated as part of the name rather than as a
-	break between addresses.
-
-	* gui/component/select-names/e-select-names-completion.c
-	(match_nickname): Use e_card_name_to_string for nickname match
-	strings.
-	(match_email): Use e_card_name_to_string for email match strings.
-	(e_select_names_completion_begin): Strip quotes out of query text,
-	so we don't produce malformed sexps.
-	Added William Blake quote easter egg.
-
-	* contact-editor/e-contact-quick-add.c: Further attempts to fix...
-	mostly unsuccessful.
-	(e_contact_quick_add_free_form): Added.  Takes a single string
-	and tries to parse out (using some simple, loose rules) the
-	name and e-mail -- then calls e_contact_quick_add.  An attempt to 
-	get the computer to automatically Do The Right Thing.
-
-	* backend/ebook/e-book.c: Fixed some broken indentation.  Yes, I'm
-	anal.
-
-	* gui/component/GNOME_Evolution_Addressbook.oafinfo: Added oaf_server
-	info for EAddressWidget.
-
-	* gui/component/GNOME_Evolution_Addressbook.oaf.in: Added oaf_server
-	info for EAddressWidget.
-
-	* gui/component/addressbook-factory.c (main): Add call to
-	e_address_widget_factory_init.
-
-	* gui/component/e-address-widget.h: 
-	* gui/component/e-address-widget.c: Added.  A little widget (and a
-	Bonobo control, BTW) for displaying addresses, with a left-click
-	menu.  Used to display addresses in the mail viewer (as embedded
-	GtkHTML objects, replacing the text previously used).  Still quite
-	incomplete.
-
-2001-03-08  Ettore Perazzoli  <ettore@ximian.com>
-
-	* gui/component/addressbook-component.c (factory_fn): Specify a
-	NULL `EvolutionShellComponentGetDndSelectionFn'.
-
-2001-03-06  Jon Trowbridge  <trow@ximian.com>
-
-	* gui/component/select-names/e-select-names-text-model.c
-	(e_select_names_text_model_insert_length): Fix glitch with
-	inserting comma-delimited stuff when length > 1.
-
-2001-03-06  Jon Trowbridge  <trow@ximian.com>
-
-	* backend/ebook/e-book.c (e_book_load_local_address_book): Added.
-	Just encapsulates opening
-	file://~username/evolution/local/Contactes/addressbook.db, so that
-	path doesn't need to be hardwired in throughout the code.
-
-2001-03-06  Benjamin Kahn  <xkahn@cybersites.com>
-
-	* contact-editor/e-contact-quick-add.c (clicked_cb): 
-	Added the third argument to e_contact_editor_new.  (Cheated
-	and send NULL for the field argument, which is probably
-	troublesome.  It will be fixed soon by either clahey or 
-	toshok.)
-
-2001-03-06  Jon Trowbridge  <trow@ximian.com>
-
-	* gui/component/select-names/e-select-names-model.c
-	(e_select_names_model_replace): Fix a reference counting bug.
-
-	* gui/component/select-names/e-select-names-manager.c (popup_cb):
-	A callback for creating the appropriate popup by calling
-	e_select_names_popup.
-	(e_select_names_manager_create_entry): Connect popup_cb to the
-	entry's popup signal
-
-	* gui/component/select-names/e-select-names-popup.c: Added.  Code
-	for popup right-click menus for recipient entries.  Still a bit
-	incomplete.
-
-	* backend/ebook/e-destination.c (e_destination_get_email_num):
-	Added.
-
-	* contact-editor/e-contact-quick-add.c: Added.  Some code and a
-	dialog for very quickly adding entries to the address book.
-	Still not fully working.
-
-2001-03-04  Christopher James Lahey  <clahey@ximian.com>
-
-	* backend/ebook/e-card-simple.c: Cleaned up the formatting in this
-	file a bit.
-
-	* contact-editor/e-contact-editor.c (e_contact_editor_set_arg):
-	Made it so that passing in NULL to the writable_fields arg sets
-	the set of writable fields to the empty set.
-
-	* gui/component/select-names/e-select-names-text-model.c
-	(e_select_names_text_model_activate_obj): Pass NULL as the
-	writable_fields argument here.
-
-	* gui/widgets/e-addressbook-model.c: Don't offset by one here.
-	This way we will get the file_as field as one of our
-	ETableColumns.
-
-	* gui/widgets/e-addressbook-view.c (SPEC): Updated this for the
-	changes in ECardSimple.
-
-	* gui/widgets/e-minicard.c (remodel): Don't remodel if the item
-	isn't realized.
-
-2001-03-02  Chris Toshok  <toshok@ximian.com>
-
-	* backend/pas/pas-backend-ldap.c: doh, track renaming of
-	objectclass from evolvePerson to evolutionPerson.
-
-2001-03-02  Chris Toshok  <toshok@ximian.com>
-
-	* backend/pas/evolutionperson.schema: rename evolveperson.schema
-	to this, and add remaining attributes.
-
-	* backend/pas/pas-backend-ldap.c: add remaining fields, and fix up
-	ones that were incorrent (either the ldap_attr or the query prop).
-
-2001-03-02  JP Rosevear  <jpr@ximian.com>
-
-	* conduit/Makefile.am: update sed script
-
-	* conduit/e-address.conduit.in: update for new pilot foo
-
-2001-03-02  Chris Toshok  <toshok@ximian.com>
-
-	* gui/component/select-names/e-select-names-text-model.c
-	(e_select_names_text_model_activate_obj): track change to
-	e_contact_editor_new.
-
-2001-03-02  Chris Toshok  <toshok@ximian.com>
-
-	* backend/pas/pas-backend-ldap.c (add_objectclass_mod): add
-	objectclasses for "person", "organizationalPerson", and "top" as
-	well, just to be complete.
-	(check_schema_support): rename check_for_evolve_person to this, to
-	reflect that we're doing more than just checking for that
-	objectClass.
-	(add_oc_attributes_to_supported_fields): new function.
-	(add_to_supported_fields): new function.
-	(pas_backend_ldap_destroy): unref supported_fields.
-
-2001-03-02  Chris Toshok  <toshok@ximian.com>
-
-	* gui/widgets/e-minicard-view.c (supported_fields_cb): new
-	function.
-	(e_minicard_view_event): split out the creation of the contact
-	editor to the supported_fields callback.
-
-	* gui/widgets/e-minicard.c (supported_fields_cb): new function.
-	(e_minicard_event): split out the creation of the contact editor
-	to the supported_fields callback.
-
-	* gui/widgets/e-addressbook-view.c (table_double_click): split
-	function into two functions, since e_book_get_supported_fields
-	requires a callback now.
-	(supported_fields_cb): new function.
-
-	* gui/component/addressbook.c (new_contact_cb): split this into
-	two functions, since e_book_get_supported_fields requires a
-	callback now.
-	(supported_fields_cb): new function.
-
-	* contact-editor/test-editor.c (main): track change to
-	e_contact_editor_new (pass NULL for the writable_fields arg.)
-
-	* contact-editor/contact-editor.glade: fix several labels so they
-	make better sense (since we look them up in e-contact-editor.c.)
-
-	* contact-editor/e-contact-editor.h (struct _EContactEditor): add
-	writable_fields.  also, add it to e_contact_editor_new.
-	
-	* contact-editor/e-contact-editor.c (e_contact_editor_class_init):
-	add writable_fields arg.
-	(e_contact_editor_destroy): unref the writable_fields list.
-	(e_contact_editor_new): pass @fields as the writable_fields arg.
-	(e_contact_editor_set_arg): add writable_fields support.
-	(enable_writable_fields): new (very hairy) function, to disable
-	everything and reenable just the fields listed in the
-	writable_fields list.
-	(_email_arrow_pressed): set label-email1, entry-email1, and
-	checkbutton-htmlmail to be sensitive since the only way to get
-	here is to activate a writable field in the menu.
-	(_address_arrow_pressed): set label-address, button-fulladdr, and
-	text-address to be sensitive for the same reason.
-	(_phone_arrow_pressed): sensitize the label and entry for the same
-	reason.
-
-2001-03-02  Chris Toshok  <toshok@ximian.com>
-
-	* backend/ebook/e-card-simple.c (field_data): add new entries for
-	phone enums, and fill in the ecard_field with (bogus in all but a
-	few cases) strings.  these are the strings sent from wombat to
-	evolution-addressbook for supported_fields.
-	(e_card_simple_get_ecard_field): new function.
-	(e_card_simple_map_phone_to_field): new function.
-	(e_card_simple_map_email_to_field): new function.
-	(e_card_simple_map_address_to_field): new function.
-
-	* backend/ebook/e-card-simple.h: add a few phone entries to the
-	ECardSimpleField enum, and add prototypes for mapping the list
-	types (phone, email, address) to ECardSimpleField.  Also, add
-	prototype for e_card_simple_get_ecard_field.
-
-	* backend/ebook/e-book.c
-	(e_book_do_response_get_supported_fields): don't build the EList
-	here, it's already built.
-
-	* backend/ebook/e-book-listener.h: change fields from the CORBA
-	sequence to the EList in our reponse struct.
-
-	* backend/ebook/e-book-listener.c
-	(e_book_listener_queue_get_supported_fields_response): we make the
-	EList here, since after we return the CORBA list is freed up.
-
-2001-03-02  Chris Toshok  <toshok@ximian.com>
-
-	* backend/pas/pas-backend-file.c
-	(pas_backend_file_process_get_supported_fields): implement
-	properly, we support everything.
-
-2001-03-01  Jon Trowbridge  <trow@ximian.com>
-
-	* gui/component/select-names/e-select-names-bonobo.c
-	(entry_set_property_fn): Oops, we do need to be able to write to
-	"text" after all (for things like Reply-to: to work properly).
-	Fixed.
-	(impl_SelectNames_get_entry_for_section): Made "text" a writeable
-	property again.
-
-	* gui/component/select-names/e-select-names-text-model.c
-	(e_select_names_text_model_insert_length): Increment pos so that
-	we don't reverse strings when length > 1 (a particularly amusing
-	bug).
-
-	* gui/component/select-names/e-select-names-completion.c
-	(e_select_names_completion_destroy): Check for NULL before calling
-	gtk_object_unref (GTK_OBJECT (---)), to get rid of annoying error
-	messages.
-
-2001-03-01  Jon Trowbridge  <trow@ximian.com>
-	
-	* gui/component/select-names/e-select-names-completion.c: I am an
-	idiot.
-
-2001-03-01  Jon Trowbridge  <trow@ximian.com>
-
-	* gui/component/select-names/e-select-names-table-model.c
-	(fill_in_info): Change for new EDestination/ESelectNamesModel API.
-
-	* gui/component/select-names/e-select-names-manager.c
-	(e_select_names_manager_get_source): Added.  A function for
-	looking up the ESelectNamesModel by id.  (I didn't end up using
-	this function, but it might come in handy later.)
-	(e_select_names_manager_get_cards): #if 0/#endif out this
-	function.
-	(e_select_names_manager_create_entry): Modified to attach an
-	ESelectNamesCompletion to the entry we create.
-	(completion_handler): A post-completion handler for our EEntry, to
-	take the completion's extra data (an EDestination) and properly
-	stick it into our ESelectNamesModel.
-
-	* gui/component/select-names/e-select-names.c
-	(real_add_address_cb): Changed to operate on EDestinations rather
-	than ECards and to use the new ESelectNamesModel API.  This leads
-	to a rather nice code simplication.
-	(remove_address): Changed for new ESelectNamesModel API.
-
-	* gui/component/select-names/e-select-names-bonobo.c
-	(entry_get_property_fn): Rather than just passing the entry's text
-	through the property bag, get the "address text" from the model.
-	This returns a nice, verbose string of addresses with names
-	expanded when the address is tied to an ECard (i.e. "Jon
-	Trowbridge <trow@ximian.com>").
-	(impl_SelectNames_get_entry_for_section): Make the text property
-	read-only.
-	(entry_set_property_fn): ...and since it is read-only now, chop
-	out the setter code.
-	
-	* gui/component/select-names/e-select-names-text-model.h: 
-	* gui/component/select-names/e-select-names-text-model.c: Again,
-	this code has been (pretty much) totally rewritten to convert all
-	text operations into changes on the ESelectNamesModel.  This lets
-	us give the associated EEntry some (IMHO) nice semantics regarding
-	whitespace, etc.  Includes object activation, so destinations tied
-	to ECards are underlined and can be double-clicked to bring up a
-	contact editor.
-
-	* gui/component/select-names/e-select-names-model.h: 
-	* gui/component/select-names/e-select-names-model.c: I've heavily
-	modified this object to both hide all implementation details
-	(which the old version exposed a bit too much for my peculiar
-	tastes) and to act as an EDestination container.  The old code put
-	the text model operations here.  I've moved them all to
-	ESelectNamesTextModel --- so the text model actions (insert,
-	delete, etc.) are all done through the API rather than operating on
-	ESelectNamesModel internals.
-
-	* gui/component/select-names/e-select-names-completion.c: Added.  A
-	fairly complicated object derived from ECompletion that searches
-	our local addressbook in various and sundry ways.
-
-	* gui/component/select-names/e-select-names-completion.h: 
-
-	* backend/ebook/e-destination.h: 
-	* backend/ebook/e-destination.c: Added.  This object encapsulates
-	a place to sent an email to, which can either be just a address as
-	a string ("trow@ximian.com"), a fancier string ("Jon Trowbridge
-	<trow@ximian.com>"), or an ECard and a specific address within
-	that ECard.
-
-2001-03-01  Christopher James Lahey  <clahey@ximian.com>
-
-	* gui/widgets/e-minicard-view.c, gui/widgets/e-minicard-view.h,
-	gui/widgets/e-minicard.c, gui/widgets/e-minicard.h: Used
-	ESelectionModelSimple and the changes to EReflow and EReflowSorted
-	to get multiple selection in the minicard view.
-
-	* gui/widgets/test-reflow.c: Changed this to get it to compile
-	with the changes to EReflow.
-
-2001-02-21  Christopher James Lahey  <clahey@ximian.com>
-
-	* backend/pas/pas-backend-file.c (pas_backend_file_search): Made
-	this pay attention to the return value of e_sexp_parse.
-
-	* gui/component/select-names/e-select-names-text-model.c
-	(e_select_names_text_model_activate_obj): Fixed a const
-	inconsistency here.
-
-2001-02-21  Chris Toshok  <toshok@ximian.com>
-
-	* backend/pas/pas-book.c (pas_book_queue_get_supported_fields):
-	new function.
-	(impl_GNOME_Evolution_Addressbook_Book_getSupportedFields): track
-	change to idl.
-	(pas_book_respond_get_supported_fields): new function.
-
-	* backend/pas/pas-book.h: add GetSupportedFields to the
-	PASOperation enum.  Also, add a stringlist field to the PASRequest
-	struct.  lastly, add a prototype for
-	pas_book_respond_get_supported_fields.
-	
-	* backend/pas/pas-backend.h: remove prototype for
-	pas_backend_get_supported_fields, and remove it from the vtable.
-
-	* backend/pas/pas-backend.c (pas_backend_get_supported_fields):
-	remove.
-	(pas_backend_class_init): no vtable entry for get_supported_fields
-	anymore.
-
-	* backend/pas/pas-backend-ldap.c
-	(pas_backend_ldap_process_get_supported_fields): new function.
-	(pas_backend_ldap_process_client_requests): add case for
-	GetSupportedFields.
-	(pas_backend_ldap_class_init): get_supported_fields isn't in
-	vtable anymore.
-
-	* backend/pas/pas-backend-file.c
-	(pas_backend_file_process_get_supported_fields): new function.
-	(pas_backend_file_process_client_requests): add case for
-	GetSupportedFields.
-	(pas_backend_file_class_init): get_supported_fields isn't in
-	vtable anymore.
-
-	* backend/idl/addressbook.idl: Book::getSupportedFields now
-	returns void and add BookListener::notifySupportedFields.
-
-	* backend/ebook/test-client.c (get_fields_cb): new function.
-	(auth_user_cb): track change to e_book_get_supported_fields.
-
-	* backend/ebook/e-book.c
-	(e_book_do_response_get_supported_fields): new function.
-	(e_book_check_listener_queue): add case
-	GetSupportedFieldsResponse.
-	(e_book_get_supported_fields): switch to async model.
-
-	* backend/ebook/e-book.h: switch e_book_get_supported_fields to an
-	async model.
-
-	* backend/ebook/e-book-listener.c
-	(e_book_listener_queue_get_supported_fields_response): new
-	function.
-	(impl_BookListener_response_get_supported_fields): new function.
-	(e_book_listener_get_epv): fill in epv's "notifySupportedFields"
-
-	* backend/ebook/e-book-listener.h: add an async response for
-	GetSupportedFields and add a stringlist member to the
-	EBookListenerResponse struct.
-
-2001-02-20  Federico Mena Quintero  <federico@ximian.com>
-
-	* backend/pas/pas-book-factory.c (pas_book_factory_activate):
-	Moved the register_factory() code to here, since it was the only
-	thing being called anyways.
-	(PasBookFactoryPrivate): Added a "registered" flag.
-	(pas_book_factory_activate): Set the registered flag.
-	(pas_book_factory_destroy): Deactivate the factory when we go away.
-
-2001-02-20  Chris Toshok  <toshok@ximian.com>
-
-	* backend/ebook/e-book.c (e_book_get_supported_fields): new function.
-
-	* backend/ebook/e-book.h: add e-book interface to getting
-	supported fields.
-
-	* backend/ebook/test-client.c (auth_user_cb): shoe-horn in some
-	spew about supported fields.
-
-2001-02-19  JP Rosevear  <jpr@ximian.com>
-
-	* conduit/Makefile.am: Remove PISOCK_LIBDIR
-
-2001-02-19  Jon Trowbridge  <trow@ximian.com>
-
-	* gui/component/select-names/e-select-names-manager.c
-	(e_select_names_manager_create_entry): When creating the entry,
-	open up an ebook (corresponding to the local addressbook) and make
-	the entry use an EAddressCompletion.
-	(completion_handler): Added; this is the actual completion
-	handler, which manipulates the entry when the user selects
-	something from the drop-down.
-
-	* gui/component/select-names/e-select-names-model.c: Various hacks
-	by clahey to unbreak e_select_names_model_add_item,
-	e_select_names_model_replace_item (which I added) and
-	e_select_names_model_remove_item.
-	
-	* gui/component/select-names/e-select-names-text-model.c
-	(e_select_names_text_model_obj_count,
-	e_select_names_text_model_get_nth_obj): Make chunks of text that
-	correspond to ECards in the ESelectNamesModel be embedded objects.
-	(e_select_names_text_model_activate_obj): On activation, pop up a
-	contact editor for the embedded object's card.
-	(e_select_names_text_model_model_changed): Fixed to work with
-	ETextModel API changes.
-	(e_select_names_text_model_set_text): Make const correct.
-	(e_select_names_text_model_insert): Make const correct.
-	(e_select_names_text_model_insert_length): Make const correct.
-
-	* backend/ebook/e-address-completion.h,
-	backend/ebook/e-address-completion.c: Added.  EAddressCompletion
-	is a derived class of ECompletion that does asynchronous address
-	lookups for completions.
-
-2001-02-17  Chris Toshok  <toshok@ximian.com>
-
-	* backend/idl/addressbook.idl: add sequence<string> typedef, and
-	add getSupportedFields method.
-
-	* backend/pas/pas-book.c
-	(impl_GNOME_Evolution_Addressbook_Book_getSupportedFields): new
-	function.
-
-	* backend/pas/pas-backend.c (pas_backend_class_init): init
-	get_supported_fields = NULL.
-	(pas_backend_get_supported_fields): new function.
-
-	* backend/pas/pas-backend.h: add prototype for
-	pas_backend_get_supported_fields.
-
-	* backend/pas/pas-backend-file.c
-	(pas_backend_file_get_supported_fields): new function.
-	(pas_backend_file_class_init): fill in get_supported_fields.
-
-	* backend/pas/pas-backend-ldap.c
-	(pas_backend_ldap_get_supported_fields): new function.
-	(pas_backend_ldap_class_init): fill in get_supported_fields.
-
-2001-02-14  Christopher James Lahey  <clahey@ximian.com>
-
-	* backend/pas/pas-backend-ldap.c: Undefine E_STRING_PROP and
-	E_LIST_PROP here.
-
-	* contact-editor/e-contact-editor.c,
-	contact-editor/e-contact-editor.h (e_contact_editor_raise): Added
-	this function.
-
-	* gui/widgets/e-minicard.c, gui/widgets/e-minicard.h
-	(e_minicard_event): Added an editor field to the EMinicard object.
-	Made it so that if you double click on the same card twice, it
-	doesn't open a new window, but instead raises the old.
-
-2001-02-08  Iain Holmes  <iain@ximian.com>
-
-	* gui/component/addressbook-storage.c (addressbook_source_free):
-	Free the ldap.binddn.
-
-	* gui/widgets/e-addressbook-view.c
-	(e_addressbook_view_setup_menus): Free the dir strings.
-
-2001-02-08  Christopher James Lahey  <clahey@ximian.com>
-
-	* contact-editor/e-contact-editor.c (categories_clicked): Set the
-	header on the category dialog we pop up.
-
-2001-02-12  Kjartan Maraas  <kmaraas@gnome.org>
-
-	* backend/ebook/GNOME_Evolution_Addressbook_GnomeCard_Importer.oaf.in: Translations.
-	* gui/component/select-names/GNOME_Evolution_Addressbook_SelectNames.oaf.in:
-	Marked strings for translation in this newly created file.
-	* gui/component/select-names/Makefile.am: Hook up the .oaf.in files in the
-	xml-i18n-tools framework.
-	* gui/component/Makefile.am: Same as above.
-	* gui/component/GNOME_Evolution_Addressbook.oaf.in: Marked stuff for translation here
-	too.
-	
-2001-02-11  Jason Leach  <jasonleach@usa.net>
-
-	* gui/component/addressbook.c: Removed an ancient #include
-	<libgnorba/gnorba.h>
-
-2001-02-11  Gediminas Paulauskas <menesis@delfi.lt>
-
-	Really use xml-i18n-tools.
-	
-	* conduit/e-address-conduit-control-applet.desktop: removed.
-	* conduit/e-address-conduit-control-applet.desktop.in: added empty.
-	* conduit/Makefile.am: reflect above changes, merge translations.
-	
-	* contact-editor/e-contact-editor-strings.h,
-	contact-editor/fulladdr.glade.h, contact-editor/fullname-strings.h,
-	contact-editor/e-contact-editor-confirm-delete.glade.h,
-	gui/component/select-names/select-names.glade.h:
-	removed these files, xml-i18n-extract takes care of strings itself.
-	
-	* contact-editor/*.glade,
-	gui/component/select-names/select-names.glade,
-	gui/widgets/alphabet.glade, printing/e-contact-print.glade:
-	changed project options to not output_translatable_strings.
-	
-	* contact-editor/Makefile.am, gui/widgets/Makefile.am,
-	gui/component/select-names/Makefile.am, printing/Makefile.am:
-	do not include removed files in EXTRA_DIST.
-
-2001-02-07  Chris Toshok  <toshok@ximian.com>
-
-	* backend/pas/pas-backend-ldap.c (check_for_evolve_person): flesh
-	out this check.  #ifdef the entire thing OPENLDAP2, as it only
-	works with the new schema stuff in openldap 2.x (both on server
-	and client, so upgrade your server.)
-	
-2001-02-07  Christopher James Lahey  <clahey@ximian.com>
-
-	* gui/widgets/e-addressbook-view.c: Added N_("* Click here to add
-	a contact *").
-
-2001-02-07  Chris Toshok  <toshok@ximian.com>
-
-	* backend/pas/pas-backend-ldap.c (pas_backend_ldap_connect): only
-	set the DEBUG_LEVEL if we're OPENLDAP2.
-
-2001-02-06  Chris Toshok  <toshok@ximian.com>
-
-	* backend/pas/pas-backend-ldap.c (email_compare): return TRUE if
-	equal, FALSE otherwise.
-	(business_compare): same.
-	(homephone_compare): same.
-	(email_ber): return NULL if there are no elements in our list.
-	(homephone_ber): same.
-	(business_ber): same.
-	(build_mods_from_ecards): add smarts to handle list elements
-	properly (like email, business_phone, home_phone.)  now we'll
-	properly send updates if any element in the list changes.
-
-2001-02-06  Christopher James Lahey  <clahey@ximian.com>
-
-	* gui/widgets/Makefile.am (INCLUDES): Added
-	-DEVOLUTION_DATADIR=\""$(datadir)"\".
-
-	* gui/widgets/e-addressbook-view.c
-	(e_addressbook_view_setup_menus): Changed the local and system
-	directories.
-
-2001-02-06  Chris Toshok  <toshok@ximian.com>
-
-	* backend/pas/pas-backend-ldap.c (create_card_handler): doh,
-	didn't mean to commit this.
-	
-2001-02-06  Chris Toshok  <toshok@ximian.com>
-
-	* backend/pas/evolveperson.schema: new file.  this will eventually
-	form the suggested additions to an existing openldap server that,
-	along with support for inetorgperson, will allow people to store
-	all evolution attributes in ldap.
-	
-2001-02-06  Chris Toshok  <toshok@ximian.com>
-
-	* backend/pas/pas-backend-ldap.c (pas_backend_ldap_init): don't
-	need the = NULL's since we g_new0.
-	(check_for_evolve_person): new function.
-	(pas_backend_ldap_connect): check to see if the evolvePerson
-	objectclass is there.
-	(build_mods_from_ecards): right now, just silently skip the extra
-	attributes if we don't support evolvePerson.
-	(add_objectclass_mod): new function, add both inetOrgPerson and
-	(if it's available) evolvePerson as objectclasses.
-	(pas_backend_ldap_process_authenticate_user): also check to see if
-	evolvePerson is there, if we couldn't do it (due to auth reasons)
-	in the connect method.
-	(prop_info): change the telephoneNumber LDAP attribute to be used
-	for evolution's business phone numbers.  the primary phone number
-	will be a single valued attribute on evolvePerson.
-	(business_populate): new function.
-	(business_ber): new function.
-	(business_compare): new function.
-
-2001-02-05  Chris Toshok  <toshok@ximian.com>
-
-	* backend/pas/pas-backend-ldap.c (create_card_handler): err,
-	allocate 2 char*s when i assign 2 char*s.
-
-2001-02-05  Chris Toshok  <toshok@ximian.com>
-
-	* backend/pas/pas-backend-ldap.c (modify_card_handler): switch to
-	ldap_modify_ext_s if OPENLDAP2, as ldap_modify_s is deprecated.
-	(build_mods_from_ecards): don't include the mod if the value is ""
-	- this isn't valid on schema checking ldap servers.
-	(homephone_populate): new function.
-	(homephone_ber): new function.
-	(homephone_compare): new function.
-	(create_card_handler): add spew when adding cards so I can see
-	what's going on.
-2001-02-05  Christopher James Lahey  <clahey@helixcode.com>
-
-	* gui/component/addressbook-config.c (table_add_elem): Save the
-	help_text in the closure.
-
-2001-02-05  Christopher James Lahey  <clahey@helixcode.com>
-
-	* gui/widgets/Makefile.am (libeminicard_a_SOURCES): Added
-	gal-view-factory-minicard.c, gal-view-factory-minicard.h,
-	gal-view-minicard.c, and gal-view-minicard.h.
-
-	* gui/widgets/gal-view-factory-minicard.c,
-	gui/widgets/gal-view-factory-minicard.h,
-	gui/widgets/gal-view-minicard.c, and
-	gui/widgets/gal-view-minicard.h: New classes for minicard view
-	type.
-
-	* gui/widgets/e-addressbook-view.c: Deploy gal-view stuff
-	properly.
-	
-2001-02-05  Christopher James Lahey  <clahey@helixcode.com>
-
-	* backend/ebook/e-card.c (e_card_get_vcard): Make the Note field
-	be quoted printable.
-
-2001-01-27  Christopher James Lahey  <clahey@helixcode.com>
-
-	* gui/search/e-addressbook-search-dialog.c
-	(e_addressbook_search_dialog_init): This should be a close button,
-	not a cancel button.
-
-2001-02-04  Christopher James Lahey  <clahey@ximian.com>
-
-	* gui/component/select-names/e-select-names-manager.c
-	(e_select_names_manager_activate_dialog): Call
-	e_select_names_set_default when appropriate.
-
-	* gui/component/select-names/e-select-names.c,
-	gui/component/select-names/e-select-names.h: Added support for
-	double clicking sending the selected contacts to the default
-	section.  Added a set_default function.  Made multiple selection
-	work.
-
-2001-01-29  Chris Toshok  <toshok@ximian.com>
-
-	* gui/component/addressbook-config.c
-	(addressbook_config_source_label): #ifdef INCLUDE_FILE_SOURCE.
-	(table_add_elem): add help_text parameter and set up focus_in
-	events to display the help in the dialog's html area.
-	(focus_help): new function, calls put_html on the help text.
-	(addressbook_ldap_auth_item_new): add help texts.
-	(addressbook_source_item_new): add help texts.
-	(addressbook_source_dialog): add help texts.
-
-2001-01-27  Ettore Perazzoli  <ettore@ximian.com>
-
-	* gui/component/select-names/e-select-names.c
-	(e_select_names_add_section): Remove the butt-ugly arrow icon and
-	replace it with a less invasive "->" icon.
-
-2001-01-25  Chris Toshok  <toshok@ximian.com>
-
-	* backend/pas/pas-backend-ldap.c (build_mods_from_ecards): add
-	comment about the else block here.
-	(prop_info): add home_address, business_address, business_fax,
-	assistant, and isdn.
-
-2001-01-25  Christopher James Lahey  <clahey@helixcode.com>
-
-	* backend/pas/pas-backend-file.c (pas_backend_file_load_uri): Made
-	this only add the initial VCard if it finds a file
-	"create-initial" in the directory it's creating the database in.
-
-	* gui/component/addressbook-component.c (factory_fn): Added a
-	create_folder function.
-
-	* gui/search/e-addressbook-search-dialog.c
-	(e_addressbook_search_dialog_init): Fixed an unused variable
-	warning.
-
-2001-01-25  Christopher James Lahey  <clahey@helixcode.com>
-
-	* gui/widgets/e-addressbook-view.c
-	(e_addressbook_view_setup_menus): Setup the view collection
-	properly and handle the "display_view" signal.
-
-2001-01-25  Ettore Perazzoli  <ettore@ximian.com>
-	
-	* gui/component/addressbook.c (update_pixmaps): Consider the
-	placeholder in the path for the "Print" item.
-
-2001-01-25  Ettore Perazzoli  <ettore@ximian.com>
-
-	* gui/component/addressbook.c (update_pixmaps): Set the icon for
-	"/Toolbar/Find" to "24_find_contact.xpm".
-
-2001-01-25  Ettore Perazzoli  <ettore@ximian.com>
-
-	* gui/component/addressbook.c (set_pixmap): New.
-	(update_pixmaps): New function, setting the pixmaps for the items
-	of type "pixbuf", using `set_pixmap'.
-	(control_activate): Call it.
-
-2001-01-25  Not Zed  <NotZed@Ximian.com>
-
-	* backend/pas/pas-backend-ldap.c: esexp api change fixes.
-
-	* backend/pas/pas-backend-file.c (entry_compare): Fix for e_sexp api changes.
-	(vcard_matches_search): esexp api fixes.
-	(pas_backend_file_search): Ouch, unref the e-sexp properly (not gtk object).
-
-2001-01-24  Chris Toshok  <toshok@ximian.com>
-
-	* backend/pas/pas-backend-ldap.c (email_ber_func): make sure to
-	add the lengths here (include the \0?  anyone?).
-	(build_mods_from_ecards): if we're filling in mod->mod_bvalues,
-	set mod_op |= LDAP_MOD_BVALUES.
-
-2001-01-23  Jason Leach  <jasonleach@usa.net>
-	
-	(Fix #1225: advanced search cancel/close)
-	
-	* gui/search/e-addressbook-search-dialog.c
-	(e_addressbook_search_dialog_init): Set it up with Search and a
-	Cancel button, Search is still the default.
-
-2001-01-23  JP Rosevear  <jpr@ximian.com>
-
-	* conduit/address-conduit.c (local_record_from_ecard): properly ref
-	the ecard. still need to kill some memory leaks.
-
-2001-01-22  JP Rosevear  <jpr@ximian.com>
-
-	* conduit/Makefile.am: remove vfs dependency
-
-2001-01-21  JP Rosevear  <jpr@ximian.com>
-
-	* conduit/address-conduit.c (delete_record):  Remove
-	deleted records from the pilot map so we don't have dupes in the future
-	
-2001-01-19  Dan Winship  <danw@ximian.com>
-
-	* gui/widgets/e-addressbook-view.c (table_right_click): 
-	* gui/widgets/e-minicard.c (e_minicard_event): Update for
-	e_popup_menu_run prototype change.
-
-2001-01-19  Jason Leach  <jasonleach@usa.net>
-
-	(Adding a boolean "entry_changed" BonoboPropertyBag arg)
-	
-	* gui/component/select-names/e-select-names-bonobo.c
-	(entry_set_property_fn): Use a gtk_object_set_data to set the
-	property to TRUE here.
-
-	(entry_changed): New function, calls bonobo_control_set_property
-	if entry_changed hasn't been set to TRUE yet.
-	
-	(impl_SelectNames_get_entry_for_section): Connect "changed" on
-	each entry_widget to the new entry_changed() func.
-
-2001-01-19  JP Rosevear  <jpr@ximian.com>
-
-	* conduit/address-conduit.c (ecard_from_remote_record): always free 
-	the delivery elements and correct embarrassingly stupid memory error 
-	that was causing the addressbook conduit problems.
-
-	* backend/ebook/e-book-view-listener.c 
-	(e_book_view_listener_check_queue): ref/unref ourself when processing 
-	in case someone we signal unrefs us.
-
-	* conduit/address-conduit.c (sequence_complete): disconnect signals
-	when complete
-
-2001-01-17  Federico Mena Quintero  <federico@ximian.com>
-
-	* backend/pas/pas-book-factory.c (pas_book_factory_activate): Made
-	it return a gboolean; it was completely ignoring the return value
-	from register_factory().
-
-2001-01-17  Larry Ewing  <lewing@helixcode.com>
-
-	* backend/ebook/.cvsignore: add evolution-gnomecard-importer.
-
-	* backend/ebook/Makefile.am (oaf_DATA): don't require the pine
-	oainfo file until it is actually added to the repository.  We need
-	to keep the build working for nightlies to work.
-
-2001-01-16  Jason Leach  <jasonleach@usa.net>
-
-	* backend/pas/pas-backend-file.c (INITIAL_VCARD): s/Helix
-	Code/Ximian/ for the initial contact card.
-
-2001-01-15  JP Rosevear  <jpr@ximian.com>
-
-	* conduit/address-conduit.c (print_local): prevent segfaults and 
-	buffer overflows
-	(print_remote): ditto
-
-2001-01-14  JP Rosevear  <jpr@ximian.com>
-
-	* conduit/Makefile.am: pass -module and -avoid-version to conduit
-	linker
-
-2001-01-12  Ettore Perazzoli  <ettore@helixcode.com>
-
-	* gui/component/addressbook-component.c (factory_fn): Pass NULL as
-	the @copy_folder_fn arg to `evolution_shell_component_new'.
-
-2001-01-12  Miguel de Icaza  <miguel@ximian.com>
-
-	* gui/widgets/e-addressbook-view.c: added i18n for etable.
-
-2001-01-11  Chris Toshok  <toshok@helixcode.com>
-
-	* backend/pas/pas-backend-ldap.c
-	(pas_backend_ldap_process_create_card): get a book view from
-	somewhere so we can give status messages - choose the first one in
-	the list.
-	(pas_backend_ldap_process_modify_card): same.
-	(pas_backend_ldap_process_remove_card): same.
-	(prop_info): add more properties, like home_phone, mobile, pager,
-	uri, org_unit, office, title, and manager.
-
-2001-01-09  Miguel de Icaza  <miguel@gnu.org>
-
-	* gui/widgets/Makefile.am (minicard_widget_test_LDADD): Put GNOME
-	libraries at the end to make the thing compile.
-
-	* printing/Makefile.am: Order LDADD flags correctly so it compiles.
-
-2001-01-09  Chris Toshok  <toshok@helixcode.com>
-
-	* gui/component/addressbook.c (addressbook_factory_new_control):
-	connect with the EAddressbookView's status_message signal.
-	(set_status_message): set the status message on the ShellView
-	Interface associated with our control.
-	(retrieve_shell_view_interface_from_control): new function.  get
-	the shell view inteface associated with a control.
-
-	* gui/widgets/e-addressbook-view.c
-	(e_addressbook_view_class_init): register status_message signal.
-	(status_message): new function, emit our status_message signal.
-	(change_view_type): connect with the view->object's
-	"status_message" signal.
-
-	* gui/widgets/e-addressbook-view.h (struct
-	_EAddressbookViewClass): add status_message signal.
-
-2001-01-09  Chris Toshok  <toshok@helixcode.com>
-
-	* gui/widgets/e-minicard-view-widget.c
-	(e_minicard_view_widget_class_init): register our status_message
-	signal.
-	(status_message): new function, emit our status_message signal.
-	(e_minicard_view_widget_realize): connect to the EMinicardView's
-	status_message signal.
-
-	* gui/widgets/e-minicard-view-widget.h: add status_message signal.
-
-	* gui/widgets/e-minicard-view.c (e_minicard_view_class_init):
-	register our status_message signal.
-	(e_minicard_view_init): init status_message_id.
-	(status_message): new function, emit our status_message signal.
-	(book_view_loaded): connect to the EBookView's status_message
-	signal.
-	(disconnect_signals): disconnect status_message_id.
-
-	* gui/widgets/e-minicard-view.h: add status_mesage_id, and
-	status_message signal.
-
-	* gui/widgets/e-addressbook-model.c (status_message): new
-	function, emit our status_message.
-	(e_addressbook_model_class_init): register our "status_message"
-	signal.
-	(book_view_loaded): connect to the EBookView's status_message
-	signal, so we can chain it to our parent.
-	(e_addressbook_model_init): init status_message_id.
-	(remove_book_view): disconnect status_message_id.
-
-	* gui/widgets/e-addressbook-model.h: add status_message_id, and
-	status_message signal.
-
-	* backend/pas/pas-backend-ldap.c change the objectclass we create
-	objects with to "inetOrgPerson" as it encompasses the fields we
-	use.
-	(create_dn_from_ecard): remove the mail/org handling from
-	here.  we just prepend cn=$cn onto the base dn.
-	(create_card_handler): remove the NULL that build_mods_from_ecards
-	adds at the end, and insert our objectClass.
-	(modify_card_handler): call search_for_dn to get the ECardSimple
-	of the old card, since it might (and does in the current code)
-	doing a brute force search.
-	(search_for_dn): new function, to search for an entry by its dn.
-	right now we brute force (objectclass=*) under the base dn and
-	compare dn's.  going to add a first pass that explodes the dn and
-	searches that way, using (objectclass=*) as a last resort.  also,
-	here's where we'd put the extensibleMatch code if we want to go
-	that route.
-
-	* backend/ebook/e-card.c (e_card_set_arg): if we're setting the
-	full name regenerate ecard->name.
-
-2001-01-04  Chris Toshok  <toshok@helixcode.com>
-
-	* backend/ebook/e-book-listener.c
-	(e_book_listener_queue_authentication_response): new function.
-	(impl_BookListener_respond_authentication_result): new function.
-	(e_book_listener_get_epv): fill in
-	epv->notifyAuthenticationResult.
-
-	* backend/ebook/e-book-listener.h: add AuthenticationResponse to
-	EBookListenerOperation.
-
-	* backend/ebook/e-book.c (e_book_authenticate_user): new function.
-
-	* backend/ebook/e-book.h: add prototype for
-	e_book_authenticate_user.
-
-	* backend/idl/addressbook.idl (GNOME:Evolution:Addressbook:Book):
-	add authenticateUser method.
-	(GNOME:Evolution:Addressbook:BookListener): add
-	AuthenticationFailed and AuthenticationRequired to CallStatus.
-	also add notifyAuthenticationResult method.
-
-	* backend/pas/pas-backend-file.c
-	(pas_backend_file_process_authenticate_user): dummy
-	authenticate_user function that always succeeds.
-	(pas_backend_file_process_client_requests): respond to the
-	AuthenticateUser request.
-
-	* backend/pas/pas-backend-ldap.c (pas_backend_ldap_build_query):
-	gtk_object_unref(sexp) => s_exp_unref(sexp).
-	(pas_backend_ldap_process_authenticate_user): fill in to use
-	ldap_simple_bind_s.
-	(pas_backend_ldap_process_client_requests): respond to the
-	AuthenticateUser request.
-
-	* backend/pas/pas-book.c (pas_book_queue_authenticate_user): new
-	function.
-	(impl_GNOME_Evolution_Addressbook_Book_authenticateUser): new
-	function.
-	(pas_book_respond_authenticate_user): new function.
-	(pas_book_get_epv): fill in epv->authenticateUser.
-
-	* backend/pas/pas-book.h: add AuthenticateUser operation type, and
-	add user/passwd to the PASRequest struct.
-
-	* gui/component/addressbook-storage.c
-	(addressbook_storage_get_source_by_uri): new function.  should use
-	a hashtable, perhaps, but the lists will generally be small
-	anyway.
-
-	* gui/component/addressbook-storage.h: add prototype for
-	addressbook_storage_get_source_by_uri.
-
-	* gui/component/addressbook-config.c
-	(addressbook_source_dialog_set_source): fill in the binddn if the
-	auth page is shown.
-
-	* gui/component/addressbook.c (book_open_cb): shoe-horn
-	authentication in here.  if the source was configured to use
-	authentication, authenticate the user after opening the ebook.
-	also, be paranoid and clear out the password after authenticating.
-	(book_auth_cb): callback for auth.  set the "book" arg on the
-	view->view here.
-	(passwd_cb): set the view's passwd that'll be used in
-	book_open_cb.
-	(addressbook_view_free): g_free view->passwd.
-
-2001-01-04  Christopher James Lahey  <clahey@helixcode.com>
-
-	* gui/component/addressbook-component.c,
-	gui/component/addressbook-component.h
-	(addressbook_component_get_shell_client): Added this function.
-
-	* gui/component/select-names/e-select-names.c,
-	gui/component/select-names/e-select-names.h: Added code for the
-	ability to switch between different folders.  This doesn't work
-	yet.
-
-	* gui/component/select-names/select-names.glade,
-	gui/component/select-names/select-names.glade.h: Added an option
-	menu to this dialog.
-
-2001-01-04  JP Rosevear  <jpr@helixcode.com>
-
-	* conduit/Makefile.am: Fix hard coded library names that were 
-	accidentally committed (i'm looking at you miggie)
-
-	* contact-editor/e-contact-editor.c (categories_clicked): Reflect
-	renaming.
-
-	* contact-editor/e-contact-editor-categories.[hc]: These are
-	living in gal now
-	
-2001-01-04  JP Rosevear  <jpr@helixcode.com>
-
-	* backend/pas/pas-backend-file.c (pas_backend_file_book_view_free): 
-	Need to e_sexp_unref the the sexp, not gtk_object_unref it.
-
-2001-01-03  Michael Meeks  <michael@helixcode.com>
-
-	* gui/widgets/e-addressbook-model.c (get_view): check
-	capabilities is valid before doing a strstr.
-
-2001-01-03  Michael Meeks  <michael@helixcode.com>
-
-	* backend/pas/pas-backend-file.c (pas_backend_file_search):
-	g_strdup things we g_free.
-
-2001-01-02  Christopher James Lahey  <clahey@helixcode.com>
-
-	* contact-editor/e-contact-editor.c (delete_cb): Make sure this
-	won't crash if the given contact is removed from the database
-	while this function is being called.
-
-	* gui/widgets/e-minicard.c: Made sure this won't crash if the
-	given contact is removed from the database while the right click
-	menu is being displayed.
-
-2000-12-30  Chris Toshok  <toshok@helixcode.com>
-
-	* gui/component/addressbook-config.c (edit_source_clicked): copy
-	the dialog's source, destroy the dialog after we're done, and make
-	sure to update both columns in the clist.
-	(add_source_clicked): copy the dialog's source, and destroy the
-	dialog when we're done.
-	(addressbook_source_dialog_destroy): free up all the dialog's
-	memory.
-
-	* gui/component/addressbook.c (set_prop): allow file: uri's that
-	point to files, not just dirs that contain addressbook.db.  The
-	rule is the addressbook file has to end in .db.
-
-	* gui/component/addressbook-storage.c (file_source_foreach):
-	contactserver => contactfile.  cut and paste error.
-	(addressbook_storage_init_source_uri): use file://%s to build the
-	uri.
-
-	* gui/component/e-ldap-server-dialog.[ch]: forgot to remove these
-	in my last commit.
-
-2000-12-29  Chris Toshok  <toshok@helixcode.com>
-
-	* gui/component/addressbook.c (config_cb): new function, calling
-	our new config ui code.
-	(control_activate): no longer load evolution-addressbook-ldap.xml,
-	as it's not there.
-
-	* gui/component/addressbook-component.c (owner_set_cb):
-	setup_ldap_storage => addressbook_storage_setup.
-
-	* gui/component/Makefile.am (evolution_addressbook_SOURCES):
-	remove e-ldap-storage.[ch] and add addressbook-storage.[ch].
-	(glade_DATA): remove ldap-server-dialog.glade and add
-	addressbook-config.glade.
-	(EXTRA_DIST): same.
-
-	* gui/component/addressbook-config.[ch]: add another dialog to
-	give a list of our sources and offer the Add/Delete/Edit
-	interface.  This plugs into the previous dialog work (the source
-	editor.)
-
-	* gui/component/addressbook-storage.[ch]: new files, containing
-	the remains of e-ldap-storage.[ch] and adding the new
-	AddressbookSource type and it's subordinates.  Also, the xml
-	format has changed slightly and the file name is no longer
-	~/evolution/ldap-servers.xml - it's
-	~/evolution/addressbook-sources.xml.
-
-	* gui/component/addressbook-config.glade: new file, new config
-	interface.
-
-	* gui/component/ldap-server-dialog.glade: removed.
-
-	* gui/component/e-ldap-storage.[ch]: removed.
-
-2000-12-28  Chris Toshok  <toshok@helixcode.com>
-
-	* gui/component/Makefile.am (evolution_addressbook_SOURCES): add
-	addressbook-config.[ch].
-
-	* gui/component/addressbook-config.c,
-	gui/component/addressbook-config.h: new files, containing at the
-	moment a beautiful "new/edit source dialog" inspired by the
-	mail-config-gui code.  It'll be ready for prime time after rev'ing
-	the .xml file the addressbook uses to store it's "other sources"
-	to include files, and the addition of the ldap auth stuff.
-
-2000-12-25  Miguel de Icaza  <miguel@helixcode.com>
-
-	* gui/widgets/e-minicard.c (e_minicard_realize): Set draw
-	background to FALSE.
-	
-	* gui/widgets/e-minicard-label.c (e_minicard_label_construct): ditto.
-	(e_minicard_label_construct): ditto
-
-2000-12-23  Christopher James Lahey  <clahey@helixcode.com>
-
-	* contact-editor/fullname-strings.h,
-	contact-editor/fullname.glade: Added Ms. and Miss to the prefix
-	drop down box.  Patch submitted by Martin Hicks <mort@bork.org>.
-
-2000-12-21  JP Rosevear  <jpr@helixcode.com>
-
-	* conduit/address-conduit.c (cursor_cb): Ref the cards that get put
-	in the change list
-	(next_changed_item): util function to get the real next changed item
-	(compute_status): really compute the status of the record
-	(local_record_from_uid): Set the id of the temporary card
-	(check_for_slow_setting): Make this check a little saner
-	(card_added): Only record the CardObjectChange if the card is not
-	archived
-	(card_changed): ditto
-	(card_removed): ditto
-	(set_status_cleared): actually clear the status
-	(for_each_modified): Clean out cruft and use next_changed_item
-	(add_record): Set the new id properly in our local card copy
-	(replace_record): handle the case where the record has been deleted
-	and we need to call add.  need to update the changed_hash entry
-	(delete_record): Don't panic if the card is not found, its already
-	been deleted.
-
-	* backend/pas/pas-backend-file.c (pas_backend_file_book_view_copy): 
-	The change_context no longer has a del_cards member
-	(pas_backend_file_book_view_free): ditto
-	(pas_backend_file_process_get_changes): ditto
-	(pas_backend_file_changes_foreach_key): just record the id
-	(pas_backend_file_changes): notify_remove needs an id not a vcard
-
-2000-12-20  JP Rosevear  <jpr@helixcode.com>
-
-	* conduit/address-conduit.c (match): Use my own wrapper
-	functions instead of trying to *directly* access the the data 
-	structures my self
-	(post_sync): Put in hack to prevent syncing the same records twice
-	(local_record_from_uid): set the card id when creating a blank one
-	(add_record): Set the id of the card we have and don't go to the
-	server to get the latest version
-
-2000-12-19  JP Rosevear  <jpr@helixcode.com>
-
-	* conduit/address-conduit.c (ecard_from_remote_record): Convert
-	pilot strings to utf for the e-cards.
-	
-2000-12-19  JP Rosevear  <jpr@helixcode.com>
-
-	* conduit/address-conduit.c (local_record_from_ecard): Convert ecard
-	strings to pilot encodings
-
-2000-12-19  Christopher James Lahey  <clahey@helixcode.com>
-
-	* gui/widgets/e-addressbook-view.c (delete): Made it so that if
-	you select multiple contacts, the right click menu to delete
-	deletes them all.
-
-2000-12-18  Chris Toshok  <toshok@helixcode.com>
-
-	* backend/pas/pas-backend-ldap.c (ldap_error_to_response): always
-	use LDAP_NAME_ERROR (in the openldap1 case it's #defined to
-	NAME_ERROR).
-	(build_card_from_entry): ldap_get_values can return NULL.  also,
-	openldap2 keeps us from getting at ldap->ld_errno, so we can't
-	tell if there was a decoding error like we used to.  the double
-	free problem where ldap would free the ber if there was a decoding
-	problem might be fixed now..  further investigation is needed.
-	for now we leak in openldap2.
-	(ldap_search_handler): the ldap structure is opaque, so use
-	ldap_search_ext to give the extra information (the max responses,
-	timeout, etc.) in the openldap2 case.
-
-2000-12-13  Christopher James Lahey  <clahey@helixcode.com>
-
-	* backend/pas/pas-backend-ldap.c (ldap_error_to_response): Test
-	for the existance of LDAP_NAME_ERROR and if it exists as a macro,
-	use it instead of NAME_ERROR.
-
-2000-12-14  Michael Meeks  <michael@helixcode.com>
-
-	* gui/component/GNOME_Evolution_Addressbook.oafinfo: update cut
-	and paste description error.
-
-2000-12-13  Dan Winship  <danw@helixcode.com>
-
-	* gui/widgets/e-minicard-control.c (stream_read): NULL-terminate
-	the returned vcard so we don't sometimes end up with trailing
-	junk that makes libversit unhappy.
-
-2000-12-13  Iain Holmes  <iain@helixcode.com>
-
-	* gui/component/select-names/e-select-names.c 
-	(e_select_names_add_section): Make the -> into a GNOME stock image.
-
-2000-12-09  Christopher James Lahey  <clahey@helixcode.com>
-
-	* gui/component/select-names/e-select-names.c
-	(e_select_names_init): Connect to the "cursor_change" signal on
-	the ETable here instead of the ETableScrolled.
-	(remove_address): Added the col and event parameters to this
-	callback to match the added parameters to the double click signal.
-	(e_select_names_add_section): Connect to the "double_click" signal
-	on the ETable here instead of the ETableScrolled.
-
-2000-12-09  Christopher James Lahey  <clahey@helixcode.com>
-
-	* backend/ebook/e-card.c (e_card_set_arg): When setting the "name"
-	argument, copy the incoming name.  This fixes a crash.
-
-2000-12-09  Christopher James Lahey  <clahey@helixcode.com>
-
-	* contact-editor/e-contact-editor.c: Made editing the name using
-	the full name button set the file as entry properly.  Made it
-	so that the address parse that the user chooses after
-	clicking on the Full Address... button gets saved.
-
-2000-12-08  Christopher James Lahey  <clahey@helixcode.com>
-
-	* contact-editor/e-contact-editor.c (full_name_clicked): Made it
-	so that the editor->name is set after the entry is changed.  This
-	means that the reparse that the person chose is saved.
-
-2000-12-07  Ettore Perazzoli  <ettore@helixcode.com>
-
-	* gui/component/e-ldap-storage.c (setup_ldap_storage): Pass NULL
-	as the @toplevel_node_handler_id argument to
-	`evolution_storage_new'.
-
-2000-12-08  Christopher James Lahey  <clahey@helixcode.com>
-
-	* backend/ebook/e-card.c: Fixed some formatting.
-
-	* contact-editor/e-contact-editor-categories.h: Removed an
-	unneeded #include.
-
-	* gui/widgets/e-addressbook-view.c: Connect to the signals on the
-	ETable instead of the ETableScrolled.
-
-2000-12-07  JP Rosevear  <jpr@helixcode.com>
-
-	* conduit/address-conduit.c (local_record_from_uid): Pass "" rather
-	than NULL to e_card_new.
-	(local_record_from_ecard): Make sure ecard->name is valid
-	(check_for_slow_setting): Remove hard coded test value
-	(card_added): g_strdup the resul of e_card_get_id
-	(card_changed): ditto
-
-2000-12-07  Christopher James Lahey  <clahey@helixcode.com>
-
-	* gui/widgets/e-addressbook-view.c: Got rid of code referencing
-	the ETableScrolled proxy functions.
-
-2000-12-06  Christopher James Lahey  <clahey@helixcode.com>
-
-	* gui/component/addressbook.c: Moved the gal view menu stuff from
-	here to EAddressbookView.
-
-	* gui/widgets/e-addressbook-view.c,
-	gui/widgets/e-addressbook-view.h: New function to set up the menus
-	for the EAddressbookView.
-
-2000-12-06  JP Rosevear  <jpr@helixcode.com>
-
-	* conduit/Makefile.am: Another conduit build fix
-
-2000-12-05  JP Rosevear  <jpr@helixcode.com>
-
-	* backend/pas/pas-backend-file.c (pas_backend_file_changes_foreach_key): 
-	Create an empty vcard with the appropriate id for deleted cards
-
-	* conduit/address-conduit.c (ecard_from_remote_record): Ensure the
-	address fields are added sensibly
-
-2000-12-05  Ettore Perazzoli  <ettore@helixcode.com>
-
-	* gui/component/e-ldap-storage.c (setup_ldap_storage): Updated the
-	call to `evolution_storage_new()': pass NULL for
-	@toplevel_node_uri.
-
-2000-11-28  JP Rosevear  <jpr@helixcode.com>
-
-	* conduit/address-conduit.c (local_record_to_pilot_record): Return
-	a struct rather than a pointer to a struct
-	(view_cb): kill warning
-	(compare): local_record_to_pilot_record now returns a struct
-	(prepare): ditto
-	(free_prepare): remove as per gnome-pilot changes
-	(conduit_get_gpilot_conduit): don't listen for free_prepare signal
-
-2000-11-27  JP Rosevear  <jpr@helixcode.com>
-
-	* conduit/address-conduit.h: Remove "complete" field
-
-	* conduit/address-conduit.c (print_local): Make it print useful debug
-	info
-	(print_remote): ditto
-	(local_record_from_ecard): Make sure phone numbers get out to the pilot
-	(ecard_from_remote_record): Set phone strings to "" if they are null
-	(sequence_complete): unref the book view
-	(view_cb): ref the book view
-	(free_prepare): do nothing
-
-	* backend/pas/pas-backend-file.c (pas_backend_file_book_view_free): 
-	Destroy the card lists with the rest of the view.
-	(pas_backend_file_changes): Don't destroy the card lists here
-	(pas_backend_file_book_view_free): Free the card/id lists in the
-	change context here, the correct place.
-	(pas_backend_file_changes): instead of here...
-
-2000-11-22  Christopher James Lahey  <clahey@helixcode.com>
-
-	* backend/pas/pas-backend-file.c: Set view.change_context to NULL
-	in pas_backend_file_process_get_book_view.  Changed
-	pas_backend_file_book_view_copy a bit.
-
-	* backend/pas/pas-backend-ldap.c: Got rid of a warning.
-
-2000-11-18  Matt Bissiri  <matt@bissiri.org>
-
-	* gui/component/Makefile.am:
-	Add widgets/menus/libmenus.la to evolution_addressbook_LDADD
-	so that it will link properly now that gal-view-menus.[ch]
-	was moved from gal into evolution.
-
-2000-11-15  JP Rosevear  <jpr@helixcode.com>
-
-	* backend/pas/pas-backend-file.c (pas_backend_file_book_view_copy): 
-	Initialize destination struct with '0's.
-
-2000-11-12  Christopher James Lahey  <clahey@helixcode.com>
-
-	* backend/ebook/e-card.c: Changed the mime type from "text/vcard"
-	to "text/x-vcard".
-
-2000-11-11  Matt Bissiri  <bissiri@eecs.umich.edu>
-
-	* backend/ebook/.cvsignore: Add idl-generated files.
-	* backend/ebook/e-book.c: (e_book_do_response_get_changes):
-	* backend/ebook/e-card.c: (e_card_send):
-	s/Evolution_/GNOME_Evolution_/g;
-
-2000-11-11  Christopher James Lahey  <clahey@helixcode.com>
-
-	* backend/ebook/Makefile.am: Link in composer bonobo code.
-
-	* backend/ebook/e-card.c, backend/ebook/e-card.h: Added code to
-	send mail to an ECard or send an ECard as a VCard attachment.
-
-	* contact-editor/e-contact-editor.c: Add verbs to send the contact
-	as a VCard or send mail to the contact.
-
-	* gui/search/e-addressbook-search-dialog.c: Removed some unused
-	variables.
-
-	* gui/widgets/e-addressbook-view.c, gui/widgets/e-minicard.c:
-	Added menu items to send the contact as a VCard or send mail to
-	the contact.
-
-2000-11-11  Matt Bissiri  <bissiri@eecs.umich.edu>
-
-	* gui/component/addressbook.oafinfo:
-	* gui/component/select-names/evolution-addressbook-select-names.oafinfo:
-	Update the remaining "IDL:Evolution*" to "IDL:GNOME/Evolution*"
-	to sync up with yesterday's IDL re-scoping.
-
-2000-11-09  Christopher James Lahey  <clahey@helixcode.com>
-
-	* backend/pas/pas-backend-ldap.c: Fixed a warning.
-
-	* gui/component/addressbook.c: Put in gal view menus for testing
-	purposes.
-
-	* printing/e-contact-print-envelope.c: Fixed up envelope printing
-	a bit.  Added code for printing return addresses.
-
-2000-11-09  JP Rosevear  <jpr@helixcode.com>
-
-	* conduit/address-conduit.h: Add changed_hash, change list and complete bool
-
-	* conduit/address-conduit.c (local_record_from_ecard): Add empty field checks
-	(card_added): callback for book view
-	(card_changed): ditto
-	(card_removed): ditto
-	(sequence_complete): ditto
-	(view_cb): callback for the get changes call
-	(pre_sync): force synchronous loading of book view
-	(for_each): we already have the card so create the local record directly
-	(for_each_modified): Uncomment and fix
-	(delete_record): ditto
-
-	* conduit/Makefile.am: link against gal for ebook - needs fixing
-
-	* backend/ebook/e-book.c (e_book_do_response_get_changes): Properly respond
-	to a get_changes call
-	(e_book_check_listener_queue): define the get changes response operation
-
-	* backend/ebook/e-book-listener.c (e_book_listener_queue_get_changes_response):
-	Queue up a get changes response
-	(impl_BookListener_respond_get_changes): Implement the get_changes method
-	(e_book_listener_get_epv): add get_changes implementation to epv
-
-	* backend/pas/pas-backend-file.c (pas_backend_file_book_view_copy): Only
-	copy the search_context and change_context elements if they actually exist
-	(pas_backend_file_changes): Hard code a path for now, only notify if
-	there is something to notify about
-
-2000-11-07  JP Rosevear  <jpr@helixcode.com>
-
-	* backend/pas/pas-book.h: Update PASRequest structure
-
-	* backend/pas/pas-book.c (impl_Evolution_Book_get_changes): update param name
-	(pas_book_queue_get_changes): Use PASRequest change_id slot
-
-	* backend/pas/pas-backend-file.c (pas_backend_file_book_view_copy): 
-	Properly copy change_id and change_context
-	(pas_backend_file_book_view_free): Free change_id/change_context
-	(pas_backend_file_changes_foreach_key): Callback to figure out the
-	deleted cards
-	(pas_backend_file_changes): Use new e-dbhash stuff to implement.
-	Write out updated hash
-
-	* backend/idl/addressbook.idl: Rename get_changes param
-
-2000-11-06  Christopher James Lahey  <clahey@helixcode.com>
-
-	* gui/component/addressbook.c: Switched from EAddressbookSearch to
-	ESearchBar.
-
-	* gui/widgets/Makefile.am, gui/widgets/e-addressbook-search.c,
-	gui/widgets/e-addressbook-search.h: Removed EAddressbookSearch.
-	This has been moved to filter/ and renamed ESearchBar.
-
-	* printing/e-contact-print-envelope.c: Forgot to set the font.
-	This works for me now.
-
-2000-11-06  Ettore Perazzoli  <ettore@helixcode.com>
-
-	* gui/component/select-names/e-select-names-bonobo.c
-	(impl_SelectNames_get_entry_for_section): Duplicate the object
-	reference before returning.
-
-2000-11-05  Christopher James Lahey  <clahey@helixcode.com>
-
-	* contact-editor/e-contact-editor.c,
-	gui/widgets/e-addressbook-view.c, gui/widgets/e-minicard.c: Add
-	menus items to the envelope printing stuff.
-
-	* gui/component/addressbook.c: Hook up the search menu.
-
-	* gui/widgets/e-addressbook-search.c,
-	gui/widgets/e-addressbook-search.h: Add the search menu.
-
-	* printing/Makefile.am: Add e-contact-print-envelope.c and
-	e-contact-print-envelope.h.
-
-	* printing/e-contact-print-envelope.c,
-	printing/e-contact-print-envelope.h: Added envelope printing.
-
-2000-11-03  Federico Mena Quintero  <federico@helixcode.com>
-
-	* gui/component/select-names/Makefile.am: Clean the idl-generated
-	files properly.
-
-2000-11-02  Christopher James Lahey  <clahey@helixcode.com>
-
-	* ename/.cvsignore, gui/minicard/.cvsignore: Removed these
-	unnecessary .cvsignores.
-
-	* gui/component/addressbook.c: Switch to using EAddressbookSearch
-	instead of custom quick search widget.
-
-	* gui/component/select-names/e-select-names.c: Made this do a
-	slightly better job of rendering names.
-
-	* gui/widgets/Makefile.am: Added e-addressbook-search.c and
-	e-addressbook-search.h.
-
-	* gui/widgets/e-addressbook-search.c,
-	gui/widgets/e-addressbook-search.h: New class that puts up an
-	entry and a combo box.
-
-2000-11-01  Dan Winship  <danw@helixcode.com>
-
-	* gui/component/e-ldap-storage.c (load_ldap_data): 
-	(e_ldap_storage_add_server): Add "highlighted" flag to
-	evolution_storage_new_folder
-
-2000-10-31  JP Rosevear  <jpr@helixcode.com>
-
-	* conduit/address-conduit.c (cursor_cb): Let the warning make sense
-	(compute_pid): remove
-	(local_record_from_ecard): Create local record from ecard - not finished
-	(local_record_from_uid): Obtain local_record from uid with the proper
-	e-book way
-	(set_status_cleared): Add empty callback
-	(add_archive_record): kill
-	(delete_archive_record): kill
-	(archive_record): Add empty callback
-	(conduit_get_gpilot_conduit): Update signal connects
-
-	* backend/pas/pas-backend-file.c (vcard_change_type): Function to determine
-	the type of change - not finished
-	(pas_backend_file_search_changes): Create a view and callback based on 
-	how the cards have changed
-	(pas_backend_file_process_get_changes): Implement the get changes operation
-	for files
-	(pas_backend_file_process_client_requests): Add GetChanges method for
-	processing
-
-	* backend/pas/pas-book.c (pas_book_queue_get_changes): Add changes to
-	the list
-	(impl_Evolution_Book_get_changes): implement object method
-	(pas_book_get_epv): Add get changes to epv
-	(pas_book_respond_get_changes): Respond to the get changes operation
-
-	* backend/pas/pas-book.h: Add GetChanges PASOperation
-
-	* backend/idl/addressbook.idl: add get_changes and respond_get_changes
-	methods
-
-	* backend/ebook/e-book.c (e_book_get_changes): Client function
-	to a view of the changed objects
-
-	* backend/ebook/e-book.h: New prototype
-
-2000-10-30  Kjartan Maraas  <kmaraas@gnome.org>
-
-	* backend/e-book/e-card.c: Fixed marking of strings
-	for translation. Use "_(" instead of "_ (".
-	* gui/component/addressbook-factory.c: Add missing
-	calls to bindtextdomain() and textdomain noticed by
-	Dan Winship.
-	* gui/component/addressbook.c: Marked string for translation.
-	
-2000-10-27  Christopher James Lahey  <clahey@helixcode.com>
-
-	* backend/pas/Makefile.am, gui/search/Makefile.am,
-	printing/Makefile.am: Fixed these to include EXTRA_GNOME_CFLAGS.
-
-	* gui/component/select-names/e-select-names-manager.c: Turned off
-	newlines in header fields.
-
-2000-10-26  Michael Meeks  <michael@helixcode.com>
-
-	* printing/e-contact-print.c (e_contact_print_letter_tab),
-	(complete_sequence, e_contact_do_print_phone_list, lowify):
-	unsigned charness.
-
-2000-10-25  Chris Toshok  <toshok@helixcode.com>
-
-	* backend/pas/pas-backend-ldap.c (ldap_op_process_current): only
-	call the handler if the if we're connected, and if we fail to
-	connect finish the op and post a message.
-	(pas_backend_ldap_connect): add debug spew if DEBUG is defined.
-	(modify_card_handler): LDAP_RES_SEARCH_ENTRY => LDAP_SUCCESS.
-	(modify_card_handler): only perform the ldap_modify_s if we have a
-	list of modifications.
-	(get_cursor_handler): use ldap_error_to_response here.
-	(pas_backend_ldap_load_uri): use LDAP_PORT instead of the constant
-	389.
-
-2000-10-23  Dan Winship  <danw@helixcode.com>
-
-	* gui/component/select-names/Makefile.am (INCLUDES): 
-	* gui/component/Makefile.am (INCLUDES): Update EVOLUTION_LOCALEDIR
-
-	* backend/pas/Makefile.am (INCLUDES): 
-	* backend/ebook/Makefile.am (INCLUDES): Update GNOMELOCALEDIR.
-
-2000-10-23  JP Rosevear  <jpr@helixcode.com>
-
-	* conduit/address-conduit.h: Use new libeconduit calls and
-	abstraction
-
-	* conduit/address-conduit.c: ditto
-	
-2000-10-23  JP Rosevear  <jpr@helixcode.com>
-
-	* conduit/address-conduit.c (pre_sync): Use e_pilot_map_read
-	(post_sync): Use e_pilot_map_write
-
-	* conduit/Makefile.am: Link libeconduit and not libical
-
-2000-10-20  Michael Meeks  <michael@helixcode.com>
-
-	* contact-editor/e-contact-editor.c (tb_save_and_close_cb): 
-
-	* gui/component/addressbook.c (toggle_view_as_cb): 
-
-2000-10-20  JP Rosevear  <jpr@helixcode.com>
-
-	* conduit/address-conduit.h: New structure of file - similar
-	to calendar/todo conduits
-
-	* conduit/address-conduit.c: ditto
-
-	* conduit/address-conduit-config.h: Config stuff for conduit
-
-	* conduit/.cvsignore: Update
-
-	* conduit/Makefile.am: Build fixes
-
-	* conduit/address-conduit-control-applet.desktop: Renamed
-	to e-address-conduit-control-applet.desktop
-
-	* conduit/address.conduit.in: Renamed to e-address.conduit.in
-
-2000-10-19  Christopher James Lahey  <clahey@helixcode.com>
-
-	* gui/widgets/e-addressbook-view.c (SPEC): Remove Family name
-	column since it's a bit weird.  This also fixes the initial state
-	since all of the column choices were off by one.
-
-2000-10-19  Ettore Perazzoli  <ettore@helixcode.com>
-
-	* printing/Makefile.am (glade_DATA): Remove
-	`e-contact-print.glade.h'.
-	(EXTRA_DIST): Move here.
-
-	* gui/component/Makefile.am (glade_DATA): Remove
-	`ldap-server-dialog.glade.h'.
-	(EXTRA_DIST): Move here.
-
-2000-10-19  Christopher James Lahey  <clahey@helixcode.com>
-
-	* backend/ebook/e-card.c: Change how the extension field acts when
-	converting delivery addresses to labels.
-
-2000-10-18  Christopher James Lahey  <clahey@helixcode.com>
-
-	* backend/ebook/e-card.c, backend/ebook/e-card.h: Added the
-	function e_card_delivery_address_to_label.
-
-	* contact-editor/e-contact-editor-address.c: Fixed a potential
-	crash.
-
-	* contact-editor/e-contact-editor.c: Made this save the changed
-	data to the string version of the address.
-
-2000-10-19  Michael Meeks  <michael@helixcode.com>
-
-	* gui/component/addressbook.c (change_view_type): update to new
-	UI handler.
-	(update_view_type): split from (change_view_type).
-	(control_activate): add an update_view_type.
-
-2000-10-18  Christopher James Lahey  <clahey@helixcode.com>
-
-	* backend/ebook/e-card-simple.c: Change NAME_OR_ORG to return the
-	email address if both name and organization are taken.
-
-	* gui/component/select-names/e-select-names.c: Fixed up the spec
-	strings in this class.  Removed the "cursor_mode" argument to
-	ETable since it's part of the spec now.
-
-2000-10-17  Iain Holmes  <iain@helixcode.com>
-
-	* contact-editor/contact-editor.glade: Change the initial dialog 
-	visibility to FALSE
-	so the contact editor doesn't flash when it appears.
-
-2000-10-16  Iain Holmes  <iain@helixcode.com>
-
-	* gui/component/select-names/e-select-names-manager.c 
-	(e_select_names_manager_activate_dialog): Only allow one dialog
-	per manager.
-
-2000-10-16  Christopher James Lahey  <clahey@helixcode.com>
-
-	* contact-editor/fulladdr.glade: Fixed a typo.  Made this look a
-	bit better.
-
-2000-10-15  Dan Winship  <danw@helixcode.com>
-
-	* gui/component/select-names/Makefile.am:
-	* gui/component/Makefile.am: Remove CPPFLAGS since they just
-	duplicate flags that were already in INCLUDES.
-
-	* printing/Makefile.am (ecpsdir): 
-	* gui/widgets/Makefile.am:
-	* contact-editor/Makefile.am: Move -D flags from CPPFLAGS to
-	INCLUDES so they don't override any CPPFLAGS set at configure
-	time.
-
-2000-10-14  Michael Meeks  <michael@helixcode.com>
-
-	* gui/component/addressbook.c (control_activate): if we are in
-	LDAP mode then merge in the extra few items, otherwise just merge
-	the standard thing; saves duplication.
-
-2000-10-14  Ettore Perazzoli  <ettore@helixcode.com>
-
-	* gui/component/addressbook.oafinfo: Added
-	"evolution:shell-component-icon" property.
-
-2000-10-14  Iain Holmes  <iain@helixcode.com>
-
-	* gui/component/select-names/e-select-names.c 
-	(e_select_names_manager_activate_dialog): Only allow one dialog
-	per id.
-	(e_select_names_manager_destroy): Destroy the hashtable.
-	(e_select_names_manager_init): Init the hashtable.
-
-2000-10-13  Christopher James Lahey  <clahey@helixcode.com>
-
-	* contact-editor/fulladdr.glade, contact-editor/fulladdr.glade.h:
-	Rearranged these fields a bit more.
-
-2000-10-13  Christopher James Lahey  <clahey@helixcode.com>
-
-	* contact-editor/e-contact-editor-categories.c,
-	gui/component/select-names/e-select-names.c,
-	gui/widgets/e-addressbook-view.c: Changed these for boolean
-	ascending attribute instead of int ascending attribute.  Fixed
-	e-select-names to not use a column past the end of its array.
-
-	* contact-editor/e-contact-editor-address.c,
-	contact-editor/fulladdr.glade, contact-editor/fulladdr.glade.h:
-	Rearranged the address editor dialog.
-
-2000-10-11  Christopher James Lahey  <clahey@helixcode.com>
-
-	* contact-editor/e-contact-editor-categories.c: Fixed the column
-	elements, the no-headers attribute and added a cursor-mode=line
-	attribute.
-
-	* gui/component/select-names/e-select-names.c,
-	gui/widgets/e-addressbook-view.c: Fixed the column elements here.
-
-2000-10-11  Christopher James Lahey  <clahey@helixcode.com>
-
-	* contact-editor/e-contact-editor-categories.c,
-	gui/component/select-names/e-select-names.c,
-	gui/widgets/e-addressbook-view.c: Updated these to the new style
-	ETables.
-
-2000-10-06  Not Zed  <NotZed@HelixCode.com>
-
-	* gui/search/e-addressbook-search-dialog.c (get_widget): Removed
-	ondemand callback nonsense from rule_context_load().
-
-2000-10-05  Michael Meeks  <michael@helixcode.com>
-
-	* contact-editor/e-contact-editor.c (create_ui): upd.
-	(e_contact_editor_init): upd.
-
-	* gui/component/addressbook.c (control_activate_cb): upd.
-	(control_deactivate): kill.
-	(control_activate): upd.
-
-2000-09-22  Michael Meeks  <michael@helixcode.com>
-
-	* gui/component/addressbook.c (control_activate): update.
-
-	* contact-editor/e-contact-editor.c (create_ui): upd.
-
-Fri Sep 29 07:33:54 2000  Christopher James Lahey  <clahey@helixcode.com>
-
-	* gui/widgets/e-minicard.c, gui/widgets/e-minicard.h: Made it so
- 	that minicard doesn't write out changes to the backend unless
- 	something's actually changed.
-
-Tue Sep 26 16:28:47 2000  Christopher James Lahey  <clahey@helixcode.com>
-
-	* backend/ebook/e-card.c: Make sure that card->name and
- 	card->full_name are always valid.
-
-	* contact-editor/e-contact-editor.c: Removed some unused
- 	variables.
-
-2000-09-22  Matt Bissiri  <bissiri@eecs.umich.edu>
-
-	* contact-editor/e-contact-editor-fullname.c (extract_info): If
-	(editor->name == NULL), store ptr to newly allocated ECardName in
- 	editor->name, not just in a stack variable.  This fixes a crash
- 	which happened when you click "New", then click "Full Name...",
- 	then enter name, then click "OK".
-
-	* backend/ebook/e-card.c (e_card_name_to_string): Add
- 	g_return_val_if_fail.
-
-2000-09-25  Jeffrey Stedfast  <fejj@helixcode.com>
-
-	* gui/widgets/Makefile.am:
-	* gui/component/Makefile.am:
-	* contact-editor/Makefile.am:
-	* printing/Makefile.am: Look for ename in /e-util/ename instead of
-	/addressbook/ename
-	
-	* backend/ebook/e-card.c: Updated to include e-util/ename/*.h
-
-	* ename: Moved to /e-util so it could be shared
-
-	* Makefile.am (SUBDIRS): took out ename
-
-2000-09-25  Nat Friedman  <nat@helixcode.com>
-
-	* ename/e-name-western-tables.h: Added a ton of new prefixes and
-	suffixes.
-
-2000-09-22  Michael Meeks  <michael@helixcode.com>
-
-	* gui/component/addressbook.c (control_activate): update.
-
-	* contact-editor/e-contact-editor.c (create_ui): upd.
-
-2000-09-22  Chris Toshok  <toshok@helixcode.com>
-
-	* backend/pas/pas-backend-ldap.c: lots of changes.  flesh out the
- 	remove/modify/create functions.  add another flag for the property
- 	table, PROP_DN, which makes it easy for us to determine when we
- 	need to create a new DN for a record when we're modifying.  also
- 	add a ber_func to the table for PROP_TYPE_LIST fields, which fills
- 	in the list of bvalues that we send to the ldap server.  The
- 	add/modify/delete stuff hasn't been tested yet, and it hopelessly
- 	complex (yay ldap).
-	(ldap_search_handler): act synchronous when ldap_search responds
- 	with -1.
-	(view_destroy): use pas_book_view_notify_status_message.
-	(ldap_op_process_current): same
-	(ldap_op_process): same
-	(poll_ldap): same
-	(ldap_search_handler): same
-
-2000-09-22  Chris Toshok  <toshok@helixcode.com>
-
-	* backend/ebook/e-card-simple.h: add
- 	E_CARD_SIMPLE_FIELD_FAMILY_NAME to the enum.
-
-	* backend/ebook/e-card-simple.c (field_data): add
- 	E_CARD_SIMPLE_FIELD_FAMILY_NAME.
-	(e_card_simple_get): add getter for FAMILY_NAME.
-
-2000-09-22  Christopher James Lahey  <clahey@helixcode.com>
-
-	* backend/ebook/e-card.c: Made addresses be quoted printable again
- 	so that they will encode properly if they have carriage returns in
- 	them.  This is possible now because of a fix in libversit.
-
-2000-09-22  Christopher James Lahey  <clahey@helixcode.com>
-
-	* backend/ebook/e-book-view-listener.c,
- 	backend/ebook/e-book-view-listener.h, backend/ebook/e-book-view.c,
- 	backend/ebook/e-book-view.h, backend/idl/addressbook.idl,
- 	backend/pas/pas-book-view.c, backend/pas/pas-book-view.h: Added a
- 	function to set the status message associated with a given view.
-  	This is not yet implemented in the gui.
-
-2000-09-22  Christopher James Lahey  <clahey@helixcode.com>
-
-	* backend/ebook/e-book.c, backend/ebook/e-book.h,
-	backend/idl/addressbook.idl, backend/pas/pas-backend-file.c,
-	backend/pas/pas-backend-ldap.c, backend/pas-backend.c,
-	backend/pas/pas-backend.h, backend/pas/pas-book.c,
-	backend/pas/pas-book.h: Added a function to query static
-	capabilities (capabilities that can be reported immediately) and
-	implemented them in the 2 servers.
-
-	* gui/component/addressbook.c: Added a View All button and a Stop
-	button.  Sorted out the new directory server stuff a bit.
-
-	* gui/widgets/e-addressbook-model.c,
-	gui/widgets/e-addressbook-model.h: Cleaned up a bit.  Added a stop
-	function.  Check for capabilities before deciding whether to load
-	all cards when initially viewed.
-
-	* gui/widgets/e-addressbook-view.c,
-	gui/widgets/e-addressbook-view.h: Added stop and view all
-	functions.
-
-	* gui/widgets/e-minicard-view-widget.c,
-	gui/widgets/e-minicard-view-widget.h,
-	gui/widgets/e-minicard-view.c, gui/widgets/e-minicard-view.h:
-	Added a stop function.  Check for capabilities before deciding
-	whether to load all cards when initially viewed.
-
-2000-09-21  Michael Meeks  <michael@helixcode.com>
-
-	* gui/component/addressbook.c (control_activate): remove _UIHandler
-
-2000-09-21  Christopher James Lahey  <clahey@helixcode.com>
-
-	* backend/ebook/load-pine-addressbook.c: Added a missing include
-	of ctype.h.
-
-	* backend/pas/pas-backend-file.c: Fixed a problem where using a
-	GList was causing us to not be reentrant.  We now use an EList
-	here and so now this is reentrant.  This should fix the "wombat
-	crashes every time you run evolution" bug.
-
-	* contact-editor/e-contact-editor.c: Fixed a type mismatch.
-
-2000-09-21  Christopher James Lahey  <clahey@helixcode.com>
-
-	* backend/ebook/load-pine-addressbook.c: Make this work when a
-	field is spread across multiple lines.
-
-2000-09-20  Christopher James Lahey  <clahey@helixcode.com>
-
-	* backend/ebook/e-card.c, backend/ebook/e-card.h: Added a
-	wants_html field to cards.  Uses "x-mozilla-html".
-
-	* contact-editor/Makefile.am: Added definition of
-	EVOLUTION_DATADIR.
-
-	* contact-editor/contact-editor.glade: Make Wants HTML check
-	button visible.
-
-	* contact-editor/e-contact-editor.c,
-	contact-editor/e-contact-editor.h: Make Wants HTML check button
-	active.  Fix UI stuff to use XML.  Set parent window of
-	confirm_delete dialog.
-
-	* gui/widgets/e-addressbook-view.c, gui/widgets/e-minicard.c: Set
-	the parent window of the confirm_delete dialog.
-	
-2000-09-20  Christopher James Lahey  <clahey@helixcode.com>
-
-	* gui/widgets/e-addressbook-view.c: Fixed display of the minicards
-	when the addressbook was first loading.  (It was overwriting a
-	string with NULL during init.)
-
-2000-09-19  Dan Winship  <danw@helixcode.com>
-
-	* gui/search/Makefile.am (ruledir): Use $(datadir), not
-	$(prefix)/share
-
-2000-09-18  Christopher James Lahey  <clahey@helixcode.com>
-
-	* backend/ebook/Makefile.am, contact-editor/Makefile.am,
-	ename/Makefile.am, gui/component/Makefile.am,
-	gui/widgets/Makefile.am: Added $(EXTRA_GNOME_CFLAGS) and
-	$(EXTRA_GNOME_LIBS).  Removed unneeded libraries.
-
-	* backend/ebook/e-card.c, backend/pas/pas-backend-file.c,
-	contact-editor/e-contact-editor-address.c,
-	contact-editor/e-contact-editor-categories.c,
-	contact-editor/e-contact-editor-categories.h,
-	contact-editor/e-contact-editor-fullname.c,
-	contact-editor/e-contact-editor.c,
-	contact-editor/e-contact-save-as.c, ename/e-address-western.c,
-	ename/test-ename-western-gtk.c,
-	gui/component/addressbook-factory.c, gui/component/addressbook.c,
-	gui/component/e-cardlist-model.h, gui/component/e-ldap-storage.c,
-	gui/component/select-names/e-select-names-bonobo.c,
-	gui/component/select-names/e-select-names-manager.c,
-	gui/component/select-names/e-select-names-model.c,
-	gui/component/select-names/e-select-names-table-model.c,
-	gui/component/select-names/e-select-names-table-model.h,
-	gui/component/select-names/e-select-names-text-model.h,
-	gui/component/select-names/e-select-names.c,
-	gui/component/select-names/e-select-names.h,
-	gui/search/e-addressbook-search-dialog.c,
-	gui/widgets/e-addressbook-model.h,
-	gui/widgets/e-addressbook-view.c, gui/widgets/e-minicard-label.c,
-	gui/widgets/e-minicard-view-widget.c,
-	gui/widgets/e-minicard-view-widget.h,
-	gui/widgets/e-minicard-view.c, gui/widgets/e-minicard-view.h,
-	gui/widgets/e-minicard-widget.h, gui/widgets/e-minicard.c,
-	gui/widgets/test-minicard-label.c, gui/widgets/test-reflow.c,
-	printing/e-contact-print.c: Fixed the #include lines to deal
-	properly with gal.
-	
-2000-09-15  Christopher James Lahey  <clahey@helixcode.com>
-
-	* contact-editor/e-contact-editor.h,
-	contact-editor/e-contact-save-as.h,
-	gui/widgets/e-addressbook-model.h,
-	gui/widgets/e-minicard-view-widget.h,
-	gui/widgets/e-minicard-view.h, gui/widgets/e-minicard.c,
-	gui/widgets/e-minicard.h: Fixed the paths of some .h #includes.
-
-	* gui/component/addressbook.c: Removed all of the code to actually
-	create and display the correct view of the addressbook and moved
-	it to the new class gui/widgets/e-addressbook-view.c.
-
-	* gui/widgets/Makefile.am: Added everything necessary for
-	e-addressbook-view.c and e-addressbook-view.h.
-
-	* gui/widgets/e-addressbook-view.c,
-	gui/widgets/e-addressbook-view.h: New class to deal with actual
-	display of addresses and switching between card view and table
-	view.
-
-	* gui/widgets/e-minicard-view-widget.c: Made this deal more
-	gracefully with having the book set to NULL.
-
-2000-09-16  Michael Meeks  <michael@helixcode.com>
-
-	* gui/component/select-names/e-select-names.c: fix broken include.
-
-	* gui/component/Makefile.am (INCLUDES): define datadir.
-	(evolution_addressbook_SOURCES): remove e-addressbook-model.[ch]
-
-	* gui/component/addressbook.c (control_activate): use datadir.
-
-2000-09-16  Ettore Perazzoli  <ettore@helixcode.com>
-
-	* gui/widgets/Makefile.am (gladedir): Define.
-	(glade_DATA): Install `alphabet.glade'.
-	(EXTRA_DIST): Define.
-
-	* gui/component/Makefile.am (glade_DATA): Remove `alphabet.glade'.
-	(EXTRA_DIST): Remove `alphabet.glade.h'.
-
-	* gui/widgets/Makefile.am (libeminicard_a_SOURCES): Add
-	`e-addressbook-model.c' and `e-addressbook-model.h'.  I hope this
-	is what Chris meant to do.
-
-	* gui/component/Makefile.am (INCLUDES): Add
-	`-I$(top_srcdir)/addressbook/gui/widgets'.
-	(evolution_addressbook_SOURCES): Remove `e-addressbook-model.c'
-	and `e-addressbook-model.h'.
-
-	* gui/component/select-names/e-select-names.c: #include
-	"e-addressbook-model.h" from "addressbook/gui/widgets" instead of
-	"addressbook/gui/component", as it has been moved there.
-
-2000-09-15  Chris Toshok  <toshok@helixcode.com>
-
-	* backend/pas/pas-backend-ldap.c: split all the ldap operations
-	into 2 halves, a handler, and destructor, and create a structure
-	containing two function pointers and any data they need.  this
-	allows us queue up pending operations (since the LDAP*'s are no
-	longer view specific.  there's one per backend.)  also, add
-	support for restarting async operations if the SERVER DOWN error
-	isn't communicated until sometime after the handler is called (as
-	is the case with the async search stuff.)
-
-2000-09-14  Dan Winship  <danw@helixcode.com>
-
-	* gui/component/addressbook-factory.c (main): Call unicode_init
-	for e-font stuff.
-
-2000-09-14  Christopher James Lahey  <clahey@helixcode.com>
-
-	* contact-editor/Makefile.am, gui/widgets/Makefile.am: Added
-	$(GNOME_PRINT_LIBS) to all of the test files in these directories.
-
-2000-09-14  Michael Meeks  <michael@helixcode.com>
-
-	* gui/component/Makefile.am (evolution_addressbook_LDADD): fix path.
-
-	* gui/component/addressbook.c: update include.
-
-	* gui/component/addressbook-factory.c: update include.
-
-	* gui/widgets/e-minicard-view.h: update include.
-
-	* gui/search/e-addressbook-search-dialog.c: update include path.
-
-2000-09-13  Michael Meeks  <michael@helixcode.com>
-
-	* contact-editor/e-contact-editor.c (e_contact_editor_init): hack.
-	(create_toolbar): ditto.
-
-2000-09-07  Michael Meeks  <michael@helixcode.com>
-
-	* gui/component/addressbook.c: Radicaly update UI handler code.
-
-2000-09-13  Christopher James Lahey  <clahey@helixcode.com>
-
-	* gui/widgets/*, gui/minicard/*: Moved gui/minicard to
-	gui/widgets, except for e-reflow.c, e-reflow.h, e-reflow-sorted.c,
-	and e-reflow-sorted.h.
-
-	* gui/widgets/Makefile.am: Added e-reflow to the INCLUDES list and
-	libereflow.a to a bunch of LDADD lines.
-
-	* gui/component/Makefile.am (evolution_addressbook_LDADD): Added
-	libereflow.a here.
-
-	* gui/Makefile.am (SUBDIRS): Replaced minicard with widgets.
-
-2000-09-12  Ettore Perazzoli  <ettore@helixcode.com>
-
-	* gui/component/select-names/Makefile.am: Add space after `-I'
-	when invoking `orbit-idl'.
-
-2000-09-12  Ettore Perazzoli  <ettore@helixcode.com>
-
-	* gui/component/Makefile.am (EXTRA_DIST): Remove `ui.xml'.
-
-2000-09-11  Christopher James Lahey  <clahey@helixcode.com>
-
-	* contact-editor/e-contact-editor.c: Fixed a crash error.
-
-2000-09-11  Christopher James Lahey  <clahey@helixcode.com>
-
-	* ename/e-address-western.c: Fixed some warnings.
-
-2000-09-11  Jesse Pavel <jpavel@helixcode.com>
-
-	* ename/e-address-western.c: fixed certain address parsing
-	problems.
-
-2000-09-11  Christopher James Lahey  <clahey@helixcode.com>
-
-	* contact-editor/fulladdr.glade: Made this a bit better balanced.
-
-	* gui/component/addressbook.c: Make the toolbar button for find do
-	the same thing that the menu item for search does.
-
-	* gui/search/e-addressbook-search-dialog.c: Made the top half of
-	this not expand.
-
-2000-09-11  Christopher James Lahey  <clahey@helixcode.com>
-
-	* backend/ebook/e-card-simple.c, backend/ebook/e-card-simple.h:
-	Removed a bunch of redundant code.  Made it so that when you set
-	an address label, it sets the delivery address as well.  Added
-	functions to set and get the delivery address.
-
-	* backend/ebook/e-card.c, backend/ebook/e-card.h: Added code to
-	convert and address label to a delivery address.
-
-	* contact-editor/Makefile.am: Added e-contact-editor-address.[ch],
-	fulladdr.glade, fulladdr.glade.h.
-
-	* contact-editor/contact-editor.glade,
-	contact-editor/e-contact-editor-strings.h: Switched from a label
-	to a button to show the parsed address.
-
-	* contact-editor/e-contact-editor-address.c,
-	contact-editor/e-contact-editor-address.h: New class to implement
-	the parsed address dialog.
-
-	* contact-editor/e-contact-editor-fullname.c,
-	contact-editor/e-contact-editor-fullname.h: Added const to the
-	_new function.
-
-	* contact-editor/e-contact-editor.c: Implemented clicking on the
-	address button.
-
-	* contact-editor/fulladdr.glade, contact-editor/fulladdr.glade.h:
-	New glade files for the parsed address dialog.
-
-	* contact-editor/fullname-strings.h, fullname.glade: Changed these
-	accellabels to labels.
-
-	* ename/Makefile.am: Added e-address-western.c.
-
-	* ename/e-address-western.c: Fixed some warnings.
-
-2000-09-10  Christopher James Lahey  <clahey@helixcode.com>
-
-	* ename/e-address-western.c: Added by Jesse.
-
-2000-09-08  Lauris Kaplinski  <lauris@helixcode.com>
-
-	* gui/minicard/e-minicard-label.c (e_minicard_label_construct):
-	Use canvas default font
-
-	* gui/minicard/e-minicard.c (e_minicard_realize): Ditto
-	(get_left_width): Ditto
-
-2000-09-08  Christopher James Lahey  <clahey@helixcode.com>
-
-	* contact-editor/e-contact-editor-categories.c: Fixed a few warnings.
-
-2000-09-02  Lauris kaplinski  <lauris@helixcode.com>
-
-	* contact-editor/e-contact-editor-categories.c: e_utf8 wrappers
-
-	* contact-editor/e-contact-editor.c: e_utf8 wrappers
-
-2000-09-01  Ettore Perazzoli  <ettore@helixcode.com>
-
-	* gui/component/e-ldap-storage.c (load_ldap_data): Updated for the
-	extra arg now needed by `evolution_storage_new_folder()'.
-	(e_ldap_storage_add_server): Likewise.
-
-2000-08-31  Ettore Perazzoli  <ettore@helixcode.com>
-
-	* conduit/Makefile.am (INCLUDES): Add `BONOBO_GNOME_CFLAGS' and
-	`-I$(top_srcdir)'.
-
-2000-08-31  Christopher James Lahey  <clahey@helixcode.com>
-
-	* backend/ebook/Makefile.am: Install load-gnomecard-addressbook
-	and load-pine-addressbook.
-
-2000-08-30  Lauris Kaplinski  <lauris@helixcode.com>
-
-	* printing/e-contact-print.c: Countless small changes for gnome-print 0.21+
-
-2000-08-30  Dan Winship  <danw@helixcode.com>
-
-	* gui/component/addressbook.oafinfo: Add a name to the minicard
-	viewer.
-
-2000-08-29  Dan Winship  <danw@helixcode.com>
-
-	* backend/ebook/e-book.c: 
-	* backend/ebook/test-client.c: 
-	* backend/ebook/test-client-list.c: 
-	* backend/ebook/load-gnomecard-addressbook.c: 
-	* backend/ebook/load-pine-addressbook.c: 
-	* backend/pas/pas-book-factory.c: 
-	* conduit/address-conduit.h: Remove USING_OAF checks
-
-2000-08-28  Christopher James Lahey  <clahey@helixcode.com>
-
-	* gui/component/addressbook.c: Use the right argument name to turn
-	on grid lines.
-
-2000-08-26  JP Rosevear  <jpr@helixcode.com>
-
-	* gui/minicard/Makefile.am: Comment out minicard-view-test
-	since its gnorba dependent
-	
-2000-08-26  JP Rosevear  <jpr@helixcode.com>
-
-	* gui/component/addressbook-component.c: Remove gnorba stuff
-
-	* gui/minicard/e-minicard-control.c (e_minicard_control_factory_init):
-	ditto
-
-	* gui/component/addressbook.c: ditto
-
-	* gui/component/addressbook-factory.c: ditto
-
-2000-08-25  Christopher James Lahey  <clahey@helixcode.com>
-
-	* demo/* Removed the demo directory since it's no longer used.
-
-2000-08-26  JP Rosevear  <jpr@helixcode.com>
-
-	* gui/minicard/Makefile.am: Remove gnorba stuff
-
-	* gui/minicard/e-minicard-control.gnorba: Kill
-	
-2000-08-26  JP Rosevear  <jpr@helixcode.com>
-
-	* gui/component/addressbook.gnorba: Kill
-
-	* gui/component/Makefile.am:  Remove gnorba stuff
-
-2000-08-25  Dan Winship  <danw@helixcode.com>
-
-	* gui/component/Makefile.am (evolution_addressbook_LDFLAGS): Add
-	-export-dynamic so libglade will be able to resolve custom widget
-	callbacks.
-
-2000-08-23  Lauris Kaplinski  <lauris@helixcode.com>
-
-	* backend/pas/pas-backend-file.c (func_contains): Use e_utf8_strstrcase
-
-	* contact-editor/e-contact-editor-fullname.c (fill_in_field): Use e_utf8 wrapper
-	(extract_field): Same
-
-	* contact-editor/e-contact-editor.c (full_name_clicked): Don't crash
-
-	* ename/Makefile.am: Link demo with libeutil.la
-
-	* ename/test-ename-western-gtk.c (full_changed_cb): Use e_utf8 wrapper
-
-	* gui/component/addressbook.c (find_contact_cb): Use e_utf8 wrapper
-	(search_entry_activated): Same
-
-2000-08-22  Christopher James Lahey  <clahey@helixcode.com>
-
-	* gui/search/e-addressbook-search-dialog.c: Fix an error in the
-	arguments to rule_context_load.
-
-	* backend/ebook/e-card.c: Fix this to not mess up if the person
-	passes a VCard with a carriage return in the mailing address.
-
-2000-08-14  Not Zed  <NotZed@HelixCode.com>
-
-	* gui/search/addresstypes.xml: Fixed fullname->full_name for
-	search field.
-
-	* gui/search/e-addressbook-search-dialog.c (get_widget): Check we
-	actually got any parts to build the dialogue with.
-
-2000-08-13  Not Zed  <NotZed@HelixCode.com>
-
-	* gui/component/addressbook-component.c (owner_set_cb): Set the
-	global_shell_client nastyhack when we know it.
-	This is only required to link with the filter code ...
-
-	* gui/component/Makefile.am (evolution_addressbook_LDADD): Added
-	libfilter.a to the link line.
-
-	* gui/search/Makefile.am (noinst_LIBRARIES): Change library name
-	from libaddressbooksearchdialog to libaddressbooksearch, as used
-	elsewhere.
-
-	* gui/search/e-addressbook-search-dialog.c (get_widget):
-	Implement.
-	(get_query): Likewise.
-	(e_addressbook_search_dialog_destroy): Unref filter stuff when
-	done.
-
-	* gui/component/addressbook.c (control_deactivate): Added chris's
-	patch to put the meny in
-
-2000-08-22  Lauris Kaplinski  <lauris@helixcode.com>
-
-	* contact-editor/e-contact-editor.c: Use e_utf8 wrappers everywhere
-
-2000-08-22  Christopher James Lahey  <clahey@helixcode.com>
-
-	* backend/e-card.h: Started adding a time zone field to ECard.
-
-	* gui/component/e-addressbook-model.c: Added
-	e_table_model_pre_change where appropriate.
-
-	* gui/minicard/e-minicard-control.c: Added a ref and unref pair.
-
-2000-08-22  Christopher James Lahey  <clahey@helixcode.com>
-
-	* gui/component/addressbook.c: Linked in the search dialog again.
-	It looks like some changes in the shell made this not work.
-
-2000-08-19  Christopher James Lahey  <clahey@helixcode.com>
-
-	* conduit/address-conduit.c, conduit/address-conduit.h: Changed
-	this to use ECardSimple.
-
-	* contact-editor/e-contact-editor.c: Fixed a memory leak.
-
-	* gui/component/addressbook.c: Added stuff to the right click
-	menu.  Activated the new search dialog that doesn't quite work
-	yet.
-
-	* gui/minicard/e-minicard-view.c: Fixed some run time warnings.
-
-2000-08-15  Larry Ewing  <lewing@helixcode.com>
-
-	* gui/minicard/e-minicard.c (e_minicard_event): use style colors
-	for the selected state.  This doesn't properly redraw the minicard
-	when there is a style_change event, that is next.
-	(e_minicard_realize): use style colors.
-
-2000-08-14  Peter Williams  <peterw@helixcode.com>
-
-	* backend/pas/pas-backend-file.c: Include the proper db1/db.h
-	as in RedHat 7.0 -- patch from Kenny Graunke <kwg@teleport.com>
-
-2000-08-13  Chris Toshok  <toshok@helixcode.com>
-
-	* conduit/Makefile.am (libaddress_conduit_la_SOURCES): add
-	address-conduit.h
-
-	* Makefile.am (CONDUIT_SUBDIR): only set subdir if
-	ENABLE_PILOT_CONDUITS is set.
-
-2000-08-13  Chris Toshok  <toshok@helixcode.com>
-
-	* Makefile.am (SUBDIRS): add conduit subdir.
-
-2000-08-13  Chris Toshok  <toshok@helixcode.com>
-
-	* conduit/address-conduit.c (conduit_get_gpilot_conduit): add
-	special oaf initialization hack so conduit can find wombat, and
-	accept all cookies so that we can actually talk to oaf.
-
-2000-08-13  Christopher James Lahey  <clahey@helixcode.com>
-
-	* backend/pas/pas-backend-file.c: Fixed a typo that cause the
-	wrong field to be searched.
-
-	* gui/component/select-names/e-select-names.c: Made the select
-	names dialog only display entries with email addresses.
-
-2000-08-12  Christopher James Lahey  <clahey@helixcode.com>
-
-	* contact-editor/contact-editor.glade: Fixed a typo in the name of
-	the first phone entry.
-
-2000-08-12  Christopher James Lahey  <clahey@helixcode.com>
-
-	* gui/search/Makefile.am,
-	gui/search/e-addressbook-search-dialog.c,
-	gui/search/e-addressbook-search-dialog.h: A few small interface
-	fixes.
-
-	* gui/component/Makefile.am: Link in the addressbook search
-	dialog.
-
-2000-08-12  Christopher James Lahey  <clahey@helixcode.com>
-
-	* gui/Makefile.am: Added the search directory.
-
-	* backend/ebook/e-book.c: Fixed a potential crash.
-
-	* gui/minicard/e-reflow-sorted.h: Fixed an include line.
-
-	* gui/search/.cvsignore, gui/search/Makefile.am: New files.
-
-	* gui/search/e-addressbook-search-dialog.c: Fixed compilation.
-
-2000-08-12  Christopher James Lahey  <clahey@helixcode.com>
-
-	* printing/Makefile.am: Ettore fixed compilation.
-
-2000-08-12  Christopher James Lahey  <clahey@helixcode.com>
-
-	* backend/ebook/.cvsignore: Added load-gnomecard-addressbook.
-
-2000-08-12  Christopher James Lahey  <clahey@helixcode.com>
-
-	* gui/search/e-addressbook-search-dialog.c,
-	gui/search/e-addressbook-search-dialog.h: Made this into a Gtk
-	object.
-
-2000-08-12  Christopher James Lahey  <clahey@helixcode.com>
-
-	* backend/pas/pas-book-view.c: Ref our book view listener.
-
-	* gui/component/addressbook.c: Updated to use new minicard view
-	widget.
-
-	* gui/minicard/Makefile.am: Added e-minicard-view-widget.c and
-	e-minicard-view-widget.h.
-
-	* gui/minicard/e-minicard-view-widget.c,
-	gui/minicard/e-minicard-view-widget.h: New class that's just a
-	minicard view in an ECanvas.
-
-	* gui/search/e-addressbook-search-dialog.c: New file for
-	implementing a search dialog.
-
-2000-08-11  Chris Toshok  <toshok@helixcode.com>
-
-	* conduit/address-conduit.c (transmit): implement code to encode
-	the first email address and send to the pilot.
-	(get_phone_label_by_flag): rename find_phone_label_for_flags to
-	this, and implement by calling get_phone_label_by_name.
-
-2000-08-11  Chris Toshok  <toshok@helixcode.com>
-
-	* conduit/address-conduit.c (ecard_from_remote_record): add code
-	for handling email addresses from pilot (which stores it as a
-	phone number entry.  go figure.)
-	(check_for_slow_setting): #if 0 out, since we don't use it (yet).
-	(update_record): un #if 0 the code to handle the case where the
-	pilot info has changed for a local record.
-	(merge_ecard_with_remote_record): implement function, but for now
-	just return the existing (desktop) record - we still don't allow
-	merge from the pilot.
-
-
-2000-08-10  Christopher James Lahey  <clahey@helixcode.com>
-
-	* gui/search/addresstypes.xml: Changed a couple of input field
-	names.
-
-2000-08-10  Ettore Perazzoli  <ettore@helixcode.com>
-
-	* gui/component/addressbook-component.c: Remove prototype for
-	`setup_ldap_storage()', which shouldn't be here anyway.
-
-2000-08-10  Christopher James Lahey  <clahey@helixcode.com>
-
-	* gui/search/, gui/search/addresstypes.xml: New search dialog for
-	addressbook.
-
-2000-08-10  Dan Winship  <danw@helixcode.com>
-
-	* gui/component/addressbook-component.c (owner_set_cb): Update for
-	changed prototype, pass evolution_homedir arg to
-	setup_ldap_storage.
-
-	* gui/component/e-ldap-storage.c (setup_ldap_storage): Now takes
-	an evolution_homedir arg, uses that to generate the path to the
-	ldapservers.xml file, and stores the result in a static variable.
-	(e_ldap_storage_add_server, e_ldap_storage_remove_server): Use that
-	static variable rather than hardcoding the path to the file.
-
-2000-08-10  Christopher James Lahey  <clahey@helixcode.com>
-
-	* backend/pas/pas-backend-file.c: Fixed any search to not crash on
-	missing phone numbers or email addresses.
-
-2000-08-09  Christopher James Lahey  <clahey@helixcode.com>
-
-	* gui/minicard/e-minicard-control.c: Added a button to save to
-	your addressbook.
-
-2000-08-09  Cody Russell  <bratsche@gnome.org>
-
-	* gui/component/addressbook.c: Make the toolbar honor the user's
-	gnomecc settings for detachable toolbars.
-
-2000-08-09  Nat Friedman  <nat@helixcode.com>
-
-	* ename/e-name-western-tables.h: Added some military prefixes.
-
-2000-08-09  Christopher James Lahey  <clahey@helixcode.com>
-
-	* gui/component/addressbook.c: Fixed a warning.
-
-2000-08-09  Ettore Perazzoli  <ettore@helixcode.com>
-
-	* gui/component/addressbook.c (control_activate): Add the stock
-	print icon to the print item.
-
-2000-08-09  Ettore Perazzoli  <ettore@helixcode.com>
-
-	* gui/component/addressbook.c (control_activate): Put the print
-	item in the right placeholder so that it gets the right position
-	in the "File" menu.
-	(control_deactivate): Updated accordingly.
-
-2000-08-09  Christopher James Lahey  <clahey@helixcode.com>
-
-	* gui/component/addressbook.c, gui/minicard/e-minicard.c: Changed
-	e_popup_menu_run call to match the new arguments.
-
-	* gui/component/addressbook.oafinfo: Fixed this file to work
-	properly.
-
-	* gui/minicard/e-minicard-control.c: Use the correct oafinfo ID
-	here.  Also cleaned up the code a bit with the help of Michael
-	Meeks.
-
-2000-08-08  Chris Toshok  <toshok@helixcode.com>
-
-	* gui/component/e-addressbook-model.c (e_addressbook_model_init):
-	use x-evolution-any-field.
-
-	* gui/component/addressbook.c (search_entry_activated): use
-	x-evolution-any-field.
-	(change_view_type): same.
-
-	* gui/minicard/e-minicard-view.c (e_minicard_view_init): set query
-	to x-evolution-any-field.
-
-	* backend/pas/pas-backend-ldap.c (func_contains): support
-	x-evolution-any-field for matching any evolution supported field.
-
-	* backend/pas/pas-backend-file.c (compare_email): switch to using
-	ECardSimple calls.
-	(compare_phone): same.
-	(compare_address): same.
-	(entry_compare): switch to using ECardSimple calls, and support a
-	'x-evolution-any-field' wildcard field.
-	(vcard_matches_search): use an ECardSimple.
-
-2000-08-07  Christopher James Lahey  <clahey@helixcode.com>
-
-	* contact-editor/e-contact-editor.c: Removed the next and prev
-	toolbar buttons since they don't do anything.
-
-2000-08-07  Christopher James Lahey  <clahey@helixcode.com>
-
-	* contact-editor/contact-editor.glade,
-	contact-editor/e-contact-editor.c: Fixed the tab order to not
-	repeat the web page address field.
-
-2000-08-07  Christopher James Lahey  <clahey@helixcode.com>
-
-	* contact-editor/e-contact-editor.c: Fixed the tab order for this
-	dialog.
-
-2000-08-05  Christopher James Lahey  <clahey@helixcode.com>
-
-	* backend/ebook/e-card-simple.c: Fixed a warning.
-
-	* backend/ebook/e-card.c: Cast to (char *) in
-	e_card_load_cards_from_file since libversit isn't const correct.
-
-	* backend/pas/pas-backend-file.c: Fixed a warning.
-
-2000-08-04  Michael Meeks  <michael@helixcode.com>
-
-	* gui/component/addressbook.c (control_activate): unref.
-
-	* demo/addressbook.c (control_activate): unref.
-
-2000-08-02  Christopher James Lahey  <clahey@helixcode.com>
-
-	* contact-editor/e-contact-editor-categories.c,
-	gui/component/e-addressbook-model.c: Emit "model_pre_change"
-	signal as appropriate.
-
-2000-08-02  Christopher James Lahey  <clahey@helixcode.com>
-
-	* gui/component/e-addressbook-model.c: Adapted this to supply the
-	new append_row API of ETableModel.
-
-2000-07-31  Christopher James Lahey  <clahey@helixcode.com>
-
-	* gui/component/addressbook.c: Changed the default set of columns.
-
-2000-07-29  Christopher James Lahey  <clahey@helixcode.com>
-
-	* backend/ebook/Makefile.am: Added load-gnomecard-addressbook
-	compilation.
-
-	* backend/ebook/e-card.c, backend/ebook/e-card.h: Added
-	e_card_load_cards_from_file helper function to load multiple cards
-	from a single file.
-
-	* backend/ebook/load-gnomecard-addressbook.c: New file to load
-	vcard files.  I think this is the format that gnomecard uses so if
-	you copy your gnomecard file to gnomecard.vcf and then run this
-	program in the same directory, it'll copy all your gnome contacts
-	into evolution.  It needs to be changed to take a filename as a
-	parameter.  Some fields (phone and address information, for
-	example) aren't displayed properly, but are saved.  This is new
-	code, so some other than phone and address may be lost.
-
-2000-07-28  Ettore Perazzoli  <ettore@helixcode.com>
-
-	* backend/pas/Makefile.am: Add `pas-backend-ldap.c' and
-	`pas-backend-ldap.h' to `EXTRA_DIST' so they get distributed even
-	if the OpenLDAP support is not enabled.
-
-2000-07-27  Christopher James Lahey  <clahey@helixcode.com>
-
-	* backend/ebook/load-pine-addressbook.c: Changed the URI to load
-	to.
-
-2000-07-26  Christopher James Lahey  <clahey@helixcode.com>
-
-	* gui/minicard/e-minicard-widget-test.c: Fixed a warning.
-
-2000-07-26  Chris Toshok  <toshok@helixcode.com>
-
-	* backend/pas/pas-backend-ldap.c (view_destroy): wait to free the
-	view until we've taken care of freeing its internals.  also, close
-	the ldap connection here.
-	(pas_backend_ldap_connect): rename p_b_l_ensure_connected to this,
-	since it's always called when we create a view.
-	(pas_backend_ldap_build_all_cards_list): open an ldap connection
-	in this function and close it at the end.
-	(poll_ldap): make sure to call ldap_unbind to close the view's
-	connection here.
-	(pas_backend_ldap_search): call pas_backend_ldap_connect here -
-	ldap_unbind will either be called from poll_ldap or from
-	view_destroy.
-	(pas_backend_ldap_get_vcard): the PASBackendLDAP no longer has an
-	LDAP*.
-
-2000-07-26  Chris Toshok  <toshok@helixcode.com>
-
-	* backend/pas/pas-backend-ldap.c
-	(pas_backend_ldap_build_all_cards_list): add support for user settable scope.
-	(pas_backend_ldap_search): same.
-	(pas_backend_ldap_load_uri): same.
-
-2000-07-26  Dan Winship  <danw@helixcode.com>
-
-	* gui/component/addressbook.oafinfo: lowercasify the
-	supported_mime_types
-
-2000-07-25  Chris Toshok  <toshok@helixcode.com>
-
-	* backend/ebook/e-card-types.h: add enum for e-card pilot status.
-
-	* conduit/address-conduit.c: #ifdef out all the archiving code with SUPPORT_ARCHIVING.
-	(purge): implement correctly - deleting ecards whose pilot status is DELETED.
-	(set_status): implement.
-	(set_pilot_id): add gtk_main call here to change commit_card into a synchronous
-	(delete_all): implement correctly - don't delete the records, just set their status to DELETED.
-	(local_record_from_ecard): get the current status from the ecard.
-
-	* backend/ebook/e-card.c (e_card_get_vcard): add vcard support for pilot status.
-	(parse_pilot_status): new function.
-	(e_card_class_init): add pilot status object arg.
-	(e_card_set_arg): add pilot status support.
-	(e_card_get_arg): same.
-	(e_card_init): initialize pilot_status to 0.
-
-2000-07-25  Chris Toshok  <toshok@helixcode.com>
-
-	* conduit/address-conduit.c: add comment headers to signals that
-	didn't have any.
-	
-2000-07-25  Chris Toshok  <toshok@helixcode.com>
-
-	* conduit/address-conduit.c (start_address_server): use the user's
-	Contact db.  not toshok's.
-
-2000-07-25  Michael Meeks  <michael@helixcode.com>
-
-	* backend/ebook/load-pine-addressbook.c (book_open_cb): check we
-	opened ok.
-
-2000-07-25  Seth Alves  <alves@hungry.com>
-
-	* ename/Makefile.am (libename_static_la_LDFLAGS): build static
-	version of the library for address conduit to use
-
-	* backend/ebook/Makefile.am: build a static version of the library
-	to link into the conduit
-
-2000-07-25  Christopher James Lahey  <clahey@helixcode.com>
-
-	* backend/ebook/e-card.c: Added a #define for
-	"X-EVOLUTION-PILOTID".  Added a parse_pilot_id to read pilot id's
-	in properly from VCards.  Rearranged some field orders.  Added a
-	get_arg case for ARG_PILOTID.  Initialize pilot_id field to 0.
-
-2000-07-24  Chris Toshok  <toshok@helixcode.com>
-
-	* backend/ebook/e-card.h: add pilot_id.
-
-	* backend/ebook/e-card.c (e_card_get_vcard): add support for
-	X-EVOLUTION-PILOTD vcard field.
-	(e_card_class_init): add pilot_id arg.
-	(e_card_set_arg): handle pilot_id arg.
-
-2000-07-23  Christopher James Lahey  <clahey@helixcode.com>
-
-	* backend/ebook/e-book-view-listener.c: Remove the idle handler
-	when we're destroyed.
-
-	* printing/e-contact-print.c: Fixed the spacing on the card
-	header.
-
-2000-07-20  Christopher James Lahey  <clahey@helixcode.com>
-
-	* gui/component/addressbook.oafinfo: Fixed the oaf info.
-
-	* gui/minicard/.cvsignore, gui/minicard/Makefile.am,
-	gui/minicard/e-minicard-widget-test.c: Added a test for the
-	minicard widget.
-
-	* gui/minicard/e-minicard-control.c: Fixed the mime type.
-
-	* gui/minicard/e-minicard.c: Fixed some crashes if your parent
-	isn't a minicard view.
-
-	* gui/minicard/e-minicard-control.oafinfo: Removed.
-
-2000-07-20  Ettore Perazzoli  <ettore@helixcode.com>
-
-	* gui/component/addressbook-component.c (factory_fn): Update for
-	the new `evolution_shell_component_new()'.
-
-2000-07-19  Fatih Demir	<kabalak@gmx.net>
-	
-	* conduit/address-conduit-control-applet.desktop:
-		Added the Turkish desktop entry.
-
-2000-07-18  Christopher James Lahey  <clahey@helixcode.com>
-
-	* gui/minicard/e-minicard-control.c: Added "text/vCard" to the
-	list of mime types we support.
-
-2000-07-18  Christopher James Lahey  <clahey@helixcode.com>
-
-	* gui/minicard/Makefile.am: Added
-	gui/minicard/e-minicard-control.c,
-	gui/minicard/e-minicard-control.h,
-	gui/minicard/e-minicard-widget.c, and
-	gui/minicard/e-minicard-widget.h.
-
-	* gui/minicard/e-minicard-control.c,
-	gui/minicard/e-minicard-control.h,
-	gui/minicard/e-minicard-widget.c,
-	gui/minicard/e-minicard-widget.h: Got these to compile.
-
-	* gui/minicard/e-minicard-control.gnorba,
-	gui/minicard/e-minicard-control.oafinfo: Copied directly from
-	bonobo-clock-control.  These aren't done yet.
-
-2000-07-18  Christopher James Lahey  <clahey@helixcode.com>
-
-	* gui/minicard/e-minicard-control.c,
-	gui/minicard/e-minicard-control.h,
-	gui/minicard/e-minicard-widget.c,
-	gui/minicard/e-minicard-widget.h: New files for using a minicard
-	as a widget or a bonobo control.
-
-2000-07-14  Chris Toshok  <toshok@helixcode.com>
-
-	* gui/component/e-ldap-storage.c (ldap_server_foreach): duh.
-	don't save the port in the host slot either.
-
-2000-07-13  Christopher James Lahey  <clahey@helixcode.com>
-
-	* contact-editor/e-contact-editor-confirm-delete.glade,
-	contact-editor/e-contact-editor-confirm-delete.glade.h: Added
-	these.
-
-2000-07-13  Christopher James Lahey  <clahey@helixcode.com>
-
-	* Makefile.am: Switched the order of compilation of printing and
-	contact-editor.
-
-	* contact-editor/Makefile.am: Added printing libraries and a
-	confirm delete dialog glade file.
-
-	* contact-editor/e-contact-editor.c,
-	contact-editor/e-contact-editor.h: Enabled the delete and print
-	functions as well as providing a confirm delete dialog to the
-	outside world.
-
-	* gui/component/addressbook.c: Made the delete button on new cards
-	active.
-
-	* gui/minicard/Makefile.am: Added printing libraries to a number
-	of test programs.
-
-	* gui/minicard/e-minicard.c: Added print and delete to the right
-	click menu.  Made the delete button on the card editor active.
-
-	* printing/e-contact-print.c, printing/e-contact-print.h: Added a
-	function to print a single card.
-
-2000-07-12  Chris Toshok  <toshok@helixcode.com>
-
-	* gui/component/e-ldap-storage.c (ldap_server_foreach): oops.  fix
-	typo that was saving the port in the rootdn spot.
-	(save_ldap_data): make this a bit safer - writing to a new file
-	and renaming it.
-	(load_ldap_data): make this a bit smarter - if parsing the
-	ldapservers.xml file fails and there's a .new file there,
-	rename it.
-	
-2000-07-12  Christopher James Lahey  <clahey@helixcode.com>
-
-	* backend/pas/pas-backend-file.c: Do case insensitive compares.
-
-	* addressbook/gui/component/addressbook.c: Make quick search
-	search both name and company name.
-
-2000-07-12  Christopher James Lahey  <clahey@helixcode.com>
-
-	* contact-editor/e-contact-editor.c: Add icons to the toolbars.
-
-2000-07-12  Christopher James Lahey  <clahey@helixcode.com>
-
-	* contact-editor/Makefile.am: Added installation of arrow.png.
-
-	* contact-editor/e-contact-editor.c: Use EVOLUTIONDIR #define.
-
-2000-07-11  Christopher James Lahey  <clahey@helixcode.com>
-
-	* gui/component/addressbook.c: Removed an unused function
-
-2000-07-10  Dan Winship  <danw@helixcode.com>
-
-	* gui/component/select-names/Makefile.am (EXTRA_DIST): add idl
-	file to EXTRA_DIST
-
-2000-07-10  Ettore Perazzoli  <ettore@helixcode.com>
-
-	* gui/component/addressbook.c (control_activate): Remove the
-	SelectNames test.
-
-2000-07-10  Peter Williams  <peterw@curious-george.helixcode.com>
-
-	* gui/component/select-names/e-select-names-model.c: (Clahey's fix)
-	Make multiple addresses be concatenated correctly.
-
-2000-07-09  Christopher James Lahey  <clahey@helixcode.com>
-
-	* gui/component/addressbook.c,
-	gui/component/select-names/e-select-names.c,
-	gui/component/select-names/e-select-names.h: Switched from ETable
-	to ETableScrolled.
-
-	* addressbook/gui/minicard/e-minicard.c: Don't display mailer or
-	"name or org" fields.
-
-2000-07-09  Christopher James Lahey  <clahey@helixcode.com>
-
-	* backend/ebook/e-card-simple.c, backend/ebook/e-card-simple.h:
-	Added a field that gives the name if it exists and the company
-	name otherwise.
-
-	* gui/component/e-addressbook-model.c: Formatting changes.
-
-	* gui/component/select-names/e-select-names-table-model.c: Added
-	stripping of names and display of company name if name doesn't
-	exist.
-
-	* gui/component/select-names/e-select-names.c: Fixed up the
-	display so that we display both name and email address.
-
-2000-07-09  Christopher James Lahey  <clahey@helixcode.com>
-
-	* gui/component/select-names/e-select-names-model.c: Fixed a small
-	off by one error that was causing an extra character to get
-	deleted sometimes.
-
-2000-07-09  Anders Carlsson  <andersca@gnu.org>
-
-	* gui/minicard/test-reflow.c (allocate_callback): Fix off by one bug with
-	scroll region setting.
-	(resize): Likewise.
-	(main): Put the contacts list in an EScrolledFrame instead of using a
-	separate GtkScrollbar.
-
-	* gui/minicard/e-reflow.c (e_reflow_event): Don't change mouse cursor and
-	don't allow drags on dividers that aren't visible.
-
-	* gui/component/addressbook.c (allocate_callback): Fix off by one bug with
-	scroll region setting.
-	(resize): Likewise.
-	(create_minicard_view): Put the contacts list in an EScrolledFrame instead of
-	using a separate GtkScrollbar.
-
-2000-07-09  Christopher James Lahey  <clahey@helixcode.com>
-
-	* gui/component/addressbook.c: Removed unused do_nothing_cb
-	function.
-
-	* gui/component/select-names/e-select-names-manager.c,
-	gui/component/select-names/e-select-names-manager.h: Made the OK
-	and Cancel buttons in the ESelectNames dialog we create work
-	properly.
-	
-	* gui/component/select-names/e-select-names-model.c,
-	gui/component/select-names/e-select-names-model.h: Added
-	e_select_names_model_duplicate.
-
-	* gui/component/select-names/e-select-names-text-model.c: Made the
-	text be set correctly if there's already data in the source when
-	the text model is created.
-
-	* gui/component/select-names/e-select-names.c,
-	gui/component/select-names/e-select-names.h: Removed handling of
-	the buttons (the user of this dialog will have to handle them.)
-	Added e_select_names_get_source.  Fixed some typos.
-
-2000-07-09  Not Zed  <NotZed@HelixCode.com>
-
-	* gui/component/addressbook.c: Link the toolbar print button to
-	the print callback.
-
-2000-07-08  Christopher James Lahey  <clahey@helixcode.com>
-
-	* gui/component/select-names/e-select-names.c
-	(e_select_names_clicked): Hitting OK or Cancel at least closes the
-	dialog now.
-
-2000-07-08  Christopher James Lahey  <clahey@helixcode.com>
-
-	* gui/component/select-names/e-select-names-manager.c
-	(e_select_names_manager_create_entry): Set the returned entry to
-	use the ellipsis.
-
-2000-07-08  Christopher James Lahey  <clahey@helixcode.com>
-
-	* gui/component/addressbook-factory.c: Include
-	e-select-names-factory.h.
-
-	* gui/component/select-names/e-select-names-model.c: Handle a NULL
-	iterator properly in the replace function.
-
-	* gui/component/select-names/e-select-names-table-model.c: Fill in
-	info properly in the value_at function.
-
-	* gui/component/select-names/e-select-names-text-model.c: Don't
-	strlen a NULL text object.
-
-	* gui/component/select-names/e-select-names.c: Close if the person
-	hits ok or cancel (doesn't yet actually undo changes if Cancel is
-	hit.)  Handle removing addresses when they're double clicked on.
-
-	* gui/component/select-names/select-names.glade,
-	gui/component/select-names/select-names.glade.h: Hid some unused
-	fields and changed the text at the top of the dialog.
-
-2000-07-08  Jeffrey Stedfast  <fejj@helixcode.com>
-
-	* gui/component/select-names/.cvsignore: Ignore dynamically 
-	created source files
-
-2000-07-08  Ettore Perazzoli  <ettore@helixcode.com>
-
-	* gui/component/select-names/e-select-names-bonobo.c
-	(entry_get_property_fn): New function to set the properties.
-
-2000-07-08  Ettore Perazzoli  <ettore@helixcode.com>
-
-	* gui/component/addressbook-factory.c (main): Start up the factory
-	for `Evolution::Addressbook::SelectNames'.
-
-	* gui/component/select-names/evolution-addressbook-select-names.oafinfo:
-	New.
-
-	* gui/component/select-names/e-select-names-factory.c: New.
-	* gui/component/select-names/e-select-names-factory.h: New.
-
-	* gui/component/select-names/e-select-names-bonobo.c: New.
-	* gui/component/select-names/e-select-names-bonobo.h: New.
-
-	* gui/component/addressbook-factory.c (main): Call
-	`e_select_names_factory_init()'.
-
-	* gui/component/select-names/e-select-names-manager.c
-	(e_select_names_manager_add_section): Made const-aware.
-	(e_select_names_manager_create_entry): Made const-aware.
-	(e_select_names_manager_activate_dialog): Made const-aware.
-
-	* gui/component/select-names/Evolution-Addressbook-SelectNames.idl:
-	New.
-
-2000-07-08  Christopher James Lahey  <clahey@helixcode.com>
-
-	* gui/component/e-addressbook-model.c,
-	gui/component/e-addressbook-model.h: Added an "editable" argument.
-
-	* gui/component/select-names/e-select-names.c: Set our
-	EAddressModel to not be editable.
-
-2000-07-07  Christopher James Lahey  <clahey@helixcode.com>
-
-	* gui/component/select-names/e-select-names.c: Changed to line
-	mode.
-
-2000-07-07  Christopher James Lahey  <clahey@helixcode.com>
-
-	* gui/component/select-names/e-select-names-manager.c,
-	gui/component/select-names/e-select-names-model.c: Implemented the
-	get_cards function.
-
-	* gui/component/select-names/e-select-names.c: Implemented adding
-	cards through the interface.
-
-2000-07-07  Christopher James Lahey  <clahey@helixcode.com>
-
-	* gui/component/select-names/e-select-names-manager.c: Make the
-	entry widgets we create editable.
-
-	* gui/component/select-names/e-select-names-model.c: Use
-	e_strsplit instead of g_strsplit.  Fixed an off by 1 error.
-
-	* gui/component/select-names/e-select-names-table-model.c: When
-	the model changes, send a model changed signal.
-
-	* gui/component/select-names/e-select-names-text-model.c: Made
-	changing this work correctly if it's empty.  Made change signals
-	propagate properly.  Is a bit better about freeing iterators when
-	done.
-
-	* gui/component/select-names/e-select-names.c: Made the finished
-	lists be in order instead of being sorted.
-
-2000-07-07  Christopher James Lahey  <clahey@helixcode.com>
-
-	* gui/component/addressbook.c (new_server_cb): Since
-	ELDAPServer->port is a char *, allocate a string with the number
-	389 contained.
-
-	* gui/component/addressbook.c: Make the select names test test the
-	new code instead of the old way of getting to an ESelectNames
-	dialog.
-
-	* gui/component/select-names/e-select-names-manager.c: Coded
-	storing the model for each section, creating an entry and
-	returning it, and for activating the dialog.  Wrote a bit of the
-	get_cards code, but not all of it.
-
-	* gui/component/select-names/e-select-names-model.c,
-	gui/component/select-names/e-select-names-model.h: Coded all of
-	the code needed to make ESelectNamesTextModel work (it doesn't
-	yet, but all the code should be there.)  Removed
-	E_SELECT_NAMES_MODEL_DATA_TYPE_SEPARATION_MATERIAL.
-
-	* gui/component/select-names/e-select-names-table-model.c,
-	gui/component/select-names/e-select-names-text-model.c: Changed
-	these to compensate for removal of
-	E_SELECT_NAMES_MODEL_DATA_TYPE_SEPARATION_MATERIAL.
-
-	* gui/component/select-names/e-select-names-table-model.h,
-	gui/component/select-names/e-select-names-text-model.h: Fixed some
-	silly typos.
-
-	* gui/component/select-names/e-select-names.c,
-	gui/component/select-names/e-select-names.h: Added a parameter to
-	add_section that lets you specify the source ESelectNamesModel.
-	
-2000-07-06  Chris Toshok  <toshok@helixcode.com>
-
-	* gui/component/e-ldap-storage.h: add scope to ELDAPServer, and
-	make port a string.
-
-	* gui/component/e-ldap-storage.c (load_ldap_data): don't load a
-	uri, load all the bits and pieces and build up the uri when
-	creating the folder, according to the openldap url format.
-	(ldap_server_foreach): store out each of the individual uri
-	pieces.
-	(e_ldap_storage_remove_server): free the new fields.
-	(get_string_value): if the text is empty, return the empty string
-	instead of NULL.
-
-	* gui/component/e-ldap-server-dialog.c (extract_server_info): port is a string now.
-	(fill_in_server_info): port is a string now.
-
-2000-07-06  Christopher James Lahey  <clahey@helixcode.com>
-
-	* contact-editor/e-contact-editor.c: Changed "FIXME: Save and
-	Close" to "Save and Close".  Removed some toolbar items that will
-	never be used.
-
-	* gui/component/select-names/e-select-names-model.c,
-	gui/component/select-names/e-select-names-model.h: Added functions
-	to allow you to modify the model (not implemented yet.)
-
-	* gui/component/select-names/e-select-names-table-model.c,
-	gui/component/select-names/e-select-names-table-model.h: Finished
-	this.  Doesn't support changing the model at all.
-
-	* gui/component/select-names/e-select-names-text-model.c: Finished
-	this.  Changing the model by typing is done, but doesn't work
-	since none of the functions in the base model are implemented.
-
-2000-07-05  Chris Toshok  <toshok@helixcode.com>
-
-	* gui/component/addressbook.c (new_server_cb): call
-	e_ldap_storage_add_server call.
-
-	* gui/component/ldap-server-dialog.glade: add name row.
-
-	* gui/component/e-ldap-server-dialog.h: remove the ELDAPServer type.
-
-	* gui/component/e-ldap-server-dialog.c (extract_server_info): add
-	support for the name-entry.
-
-	* gui/component/e-ldap-server-dialog.c (fill_in_server_info): same.
-
-	* gui/component/e-ldap-storage.h: add ELDAPServer type, and add
-	prototypes for e_ldap_storage_add_server and
-	e_ldap_storage_remove_server.
-
-	* gui/component/e-ldap-storage.c (e_ldap_storage_add_server): new
-	function, add it to our hash table, add a shell folder, and save
-	out the metadata.
-	(ldap_server_foreach): add the ldap server info under a
-	"contactserver" node.
-	(setup_ldap_storage): create our hashtable.
-
-2000-07-05  Chris Toshok  <toshok@helixcode.com>
-
-	* gui/component/addressbook.c (set_prop): remove hack to read
-	"uri" file from local directory.
-
-	* gui/component/Makefile.am (evolution_addressbook_SOURCES): add
-	e-ldap-storage.{c,h}
-
-	* gui/component/addressbook-component.c (owner_set_cb): call
-	setup_ldap_storage.
-
-	* gui/component/e-ldap-storage.c (setup_ldap_storage): Register
-	the LDAP storage and load the .xml file.
-	(load_ldap_data): function to load our xml file.
-	(save_ldap_data): function to save our xml file.
-
-	* gui/component/e-ldap-storage.h: new file.
-
-2000-07-03  Christopher James Lahey  <clahey@helixcode.com>
-
-	* gui/component/select-names/e-select-names-manager.c,
-	gui/component/select-names/e-select-names-text-model.c,
-	gui/component/select-names/e-select-names.c: Fixed more compile
-	errors.
-
-2000-07-03  Christopher James Lahey  <clahey@helixcode.com>
-
-	* gui/component/select-names/Makefile.am: Fixed compile error.
-
-2000-07-03  Christopher James Lahey  <clahey@helixcode.com>
-
-	* backend/ebook/Makefile.am: Removed e-card-iterator.c,
-	e-card-iterator.h, e-card-list-iterator.c, e-card-list-iterator.h,
-	e-card-list.c, e-card-list.h.
-
-	* backend/ebook/e-card-iterator.c,
-	backend/ebook/e-card-iterator.h,
-	backend/ebook/e-card-list-iterator.c,
-	backend/ebook/e-card-list-iterator.h, backend/ebook/e-card-list.c,
-	backend/ebook/e-card-list.h: Removed in favor or versions without
-	the -card in the e-util directory since these classes are not
-	specific to cards at all.
-
-	* backend/ebook/e-card-simple.c, backend/ebook/e-card-simple.h,
-	backend/ebook/e-card.c, backend/ebook/e-card.h,
-	backend/ebook/load-pine-addressbook.c, backend/ebook/test-card.c,
-	backend/pas/pas-backend-file.c: Changed the references to
-	e-card-list.c and friends to e-list.c and friends.
-
-	* contact-editor/e-contact-editor.c: Added #include
-	<e-contact-save-as.h> to fix a warning.
-
-	* gui/component/Makefile.am: Moved a number of classes associated
-	with the select-names object to the new select-names directory.
-
-	* gui/component/addressbook.c: Changed the reference to
-	e-select-names.h.
-
-	* gui/component/e-select-names.c, gui/component/e-select-names.h,
-	gui/component/select-names.glade,
-	gui/component/select-names.glade.h: Moved these files into
-	select-names/.
-
-	* gui/component/select-names/.cvsignore,
-	gui/component/select-names/Makefile.am,
-	gui/component/select-names/e-select-names-manager.c,
-	gui/component/select-names/e-select-names-manager.h,
-	gui/component/select-names/e-select-names-model.c,
-	gui/component/select-names/e-select-names-model.h,
-	gui/component/select-names/e-select-names-table-model.c,
-	gui/component/select-names/e-select-names-table-model.h,
-	gui/component/select-names/e-select-names-text-model.c,
-	gui/component/select-names/e-select-names-text-model.h,
-	gui/component/select-names/e-select-names.c,
-	gui/component/select-names/e-select-names.h,
-	gui/component/select-names/recipient.glade,
-	gui/component/select-names/select-names.glade,
-	gui/component/select-names/select-names.glade.h: New files for
-	select names dialog (e-select-names.c, e-select-names.h,
-	select-names.glade, select-names.glade.h and recipient.glade moved
-	from gui/component/.)
-
-2000-06-29  Ettore Perazzoli  <ettore@helixcode.com>
-
-	* gui/component/addressbook-component.c (owner_set_cb): Get an
-	EvolutionShellClient instead of an Evolution_Shell to match the
-	changes in libeshell.
-
-2000-06-28  Christopher James Lahey  <clahey@helixcode.com>
-
-	* gui/component/select-names/,
-	gui/component/select-names/e-select-names-manager.c,
-	gui/component/select-names/e-select-names-manager.h: New select
-	names manager interface (Not complete.)
-
-2000-06-26  Christopher James Lahey  <clahey@helixcode.com>
-
-	* contact-editor/e-contact-editor-categories.c,
-	addressbook/gui/component/e-cardlist-model.c: Added
-	value_to_string handlers.
-
-	* demo/addressbook-widget.c, demo/demo.c: Removed usage of "x" and
-	"y" arguments.
-
-	* addressbook/gui/component/addressbook.c: Activated Click To Add
-	and set the click to add message.
-
-	* addressbook/gui/component/e-addressbook-model.c: Added
-	value_to_string and append_row handlers.
-
-	* addressbook/gui/component/e-select-names.c: Added a column.
-
-2000-06-26  Chris Toshok  <toshok@helixcode.com>
-
-	* backend/pas/pas-backend-ldap.c (poll_ldap): remove spew.
-	(pas_backend_ldap_ensure_connected): duh, don't access a pointer
-	we know to be NULL.
-	(query_prop_to_ldap): rename map_e_card_prop_to_ldap to this.
-	easier to type.
-
-2000-06-21  Christopher James Lahey  <clahey@helixcode.com>
-
-	* gui/minicard/test-minicard-label.c,
-	gui/minicard/test-minicard.c, gui/minicard/test-reflow.c: Remove
-	usage of "x" and "y" arguments.
-
-2000-06-18    <ettore@helixcode.com>
-
-	* contact-editor/Makefile.am (INCLUDES): Use
-	`$(BONOBO_GNOME_CFLAGS)' so that we compile when Bonobo is not in
-	the default GNOME prefix.
-
-2000-06-17  Christopher James Lahey  <clahey@helixcode.com>
-
-	* gui/minicard/e-minicard-label.c,
-	gui/minicard/e-minicard-label.h, gui/minicard/e-minicard.c: Made
-	the left column of minicards not get any wider than the widest
-	possible name.
-
-2000-06-13  Ettore Perazzoli  <ettore@helixcode.com>
-
-	* gui/component/Makefile.am (SHELL_OBJS): Removed.
-	(evolution_addressbook_LDADD): Link with
-	`$(top_builddir)/shell/libeshell.a'.
-
-2000-06-12  Federico Mena Quintero  <federico@helixcode.com>
-
-	* contact-editor/e-contact-editor-categories.c: Removed the
-	ETableModel thaw handler.
-	* gui/component/e-cardlist-model.c: Likewise.
-
-2000-06-11  Christopher James Lahey  <clahey@helixcode.com>
-
-	* gui/component/e-select-names.c: Fixed the widget reparenting.
-
-2000-06-11  Christopher James Lahey  <clahey@helixcode.com>
-
-	* gui/component/Makefile.am: Added glade files.
-
-	* gui/component/addressbook.c: Added a test of the Select Names
-	functionality.
-
-	* gui/component/e-addressbook-model.c: Made this class_init
-	function a bit cleaner.
-
-	* gui/component/e-select-names.c: Tested this and fixed some
-	obvious errors.
-
-	* gui/component/select-names.glade: The main window shouldn't be
-	visible by default.
-
-2000-06-11  Ettore Perazzoli  <ettore@helixcode.com>
-
-	* contact-editor/Makefile.am (contact_editor_test_LDADD): Link
-	with libemiscwidgets.a.
-	* gui/component/Makefile.am (evolution_addressbook_LDADD): Likewise.
-	* gui/minicard/Makefile.am (minicard_test_LDADD): Likewise.
-	(reflow_test_LDADD): Likewise.
-	(minicard_view_test_LDADD): Likewise.
-
-2000-06-10  Christopher James Lahey  <clahey@helixcode.com>
-
-	* gui/component/e-cardlist-model.c: Renamed a bunch of functions
-	for better readability.
-
-	* gui/component/e-select-names.c, gui/component/e-select-names.h:
-	This should be a working dialog now.
-
-	* gui/component/select-names.glade: Changed the name & creation
-	function of the ETable here.
-
-2000-06-10  Christopher James Lahey  <clahey@helixcode.com>
-
-	* gui/component/select-names.glade,
-	gui/component/select-names.glade.h: Glade files for Select Names
-	dialog.
-
-2000-06-10  Christopher James Lahey  <clahey@helixcode.com>
-
-	* contact-editor/e-contact-editor.c: Do e_card_simple_sync and
-	extract_info more often.
-
-	* gui/component/addressbook.c: Added table printing code.
-
-2000-06-09  Ettore Perazzoli  <ettore@helixcode.com>
-
-	* gui/component/addressbook-component.c (factory_fn): Pass NULL
-	for the new args @create_folder_fn and @remove_folder_fn.
-
-2000-06-08  Ettore Perazzoli  <ettore@helixcode.com>
-
-	* gui/component/addressbook-component.c (create_view): Updated for
-	the new `EvolutionShellComponentCreateViewFn'.  Return
-	`EVOLUTION_SHELL_COMPONENT_UNSUPPORTEDTYPE' if @type is not
-	"contacts".
-
-2000-06-08  Christopher James Lahey  <clahey@helixcode.com>
-
-	* contact-editor/e-contact-editor.c: Bind Save As to save the
-	current view of the contact as a vcard.
-
-2000-06-08  Federico Mena Quintero  <federico@helixcode.com>
-
-	* contact-editor/e-contact-editor.c (save_card): Doh, sync the
-	card simple and extract the card info.
-
-2000-06-08  Federico Mena Quintero  <federico@helixcode.com>
-
-	* contact-editor/e-contact-editor.h (EContactEditor): Now this
-	derives from GtkObject.  It follows the same strategy as the
-	EventEditor in the calendar.
-	(EContactEditor): Added an is_new_card field so that we can know
-	whether to add() or commit() the card.
-
-	* contact-editor/e-contact-editor.c (e_contact_editor_get_type):
-	Derive from GtkObject.
-	(e_contact_editor_class_init): Likewise.
-	(e_contact_editor_class_init): Added an "is_new_card" argument.
-	(e_contact_editor_set_arg): Handle ARG_IS_NEW_CARD.
-	(e_contact_editor_get_arg): Likewise.
-	(e_contact_editor_new): Take in an is_new_arg argument and set it
-	on the object.
-	(e_contact_editor_init): Load the app widget into the app field of
-	the EContactEditor structure.  Create its UIHandler as well.
-	(e_contact_editor_class_init): New "add_card", "commit_card", and
-	"editor_closed" signals.
-
-	* contact-editor/test-editor.c (main): Modified for the new API.
-	(editor_closed_cb): Tweaked for the new API.
-	Since this test program does not use Bonobo, it doesn't work,
-	though.
-
-	* gui/component/addressbook.c (new_contact_cb): Use the new
-	contact editor API.
-	(table_double_click): Ditto.
-
-	* gui/minicard/e-minicard-view.c (e_minicard_view_event): Use the
-	new contact editor API.
-
-	* gui/minicard/e-minicard.c (e_minicard_event): Use the new
-	contact editor API.
-
-2000-06-08  Ettore Perazzoli  <ettore@helixcode.com>
-
-	* contact-editor/Makefile.am (contact_editor_test_LDADD): Remove
-	the `$(srcdir)/' prefix from `libecontacteditor.a' because [of
-	course] the library is built in the build directory, not in the
-	source directory.
-	* gui/minicard/Makefile.am (minicard_test_LDADD): Likewise with
-	`libeminicard.a'.
-	(minicard_label_test_LDADD): Likewise.
-	(reflow_test_LDADD): Likewise.
-	(minicard_view_test_LDADD): Likewise.
-
-2000-06-06  Christopher James Lahey  <clahey@helixcode.com>
-
-	* gui/component/addressbook.c: Bind right click on the ETable to
-	"Save to VCard."
-
-2000-06-02  Christopher James Lahey  <clahey@helixcode.com>
-
-	* contact-editor/e-contact-editor.c: Made phone/email/address
-	labels change correctly again.
-
-2000-06-02  Christopher James Lahey  <clahey@helixcode.com>
-
-	* gui/component/addressbook-component.c: Made
-	evolution-addressbook shut down when the shell is done with it.
-
-2000-06-02  Christopher James Lahey  <clahey@helixcode.com>
-
-	* gui/minicard/e-minicard-view.c, gui/minicard/e-minicard.c: Made
-	double click only work on the first button.
-
-2000-06-01  Christopher James Lahey  <clahey@helixcode.com>
-
-	* gui/minicard/e-minicard.c: return TRUE if opening a contact
-	editor so that we don't get a "new dialog" contact editor.
-
-2000-06-01  Ettore Perazzoli  <ettore@helixcode.com>
-
-	* gui/component/addressbook.c (new_contact_cb): Use the stock
-	cancel button for the dialog.
-	(table_double_click): Likewise.
-	(find_contact_cb): Likewise.
-
-2000-05-31  Miguel de Icaza  <miguel@helixcode.com>
-
-	* contact-editor/contact-editor.glade: Added accelerators for
-	the remaining items.
-
-	Add spacing, beautify the dialogs.
-
-2000-06-01  Ettore Perazzoli  <ettore@helixcode.com>
-
-	* gui/component/addressbook.c (control_activate): Put the toolbar
-	into a frame to make it look like standard GNOME toolbars.  Also,
-	set `GNOME_DOCK_ITEM_BEH_NEVER_VERTICAL' so that it does not do
-	evil things when its moved to the left or the right of the window.
-
-2000-05-30  Christopher James Lahey  <clahey@helixcode.com>
-
-	* gui/component/e-cardlist-model.c,
-	gui/component/e-cardlist-model.h: New files for card list.
-
-2000-05-30  Christopher James Lahey  <clahey@helixcode.com>
-
-	* gui/component/addressbook.c: Fixed a memory leak.
-
-2000-05-30  Christopher James Lahey  <clahey@helixcode.com>
-
-	* gui/component/alphabet.glade: Made the alphabet buttons not
-	focusable.
-
-	* gui/minicard/e-minicard-view.c: Made the "123" button work.
-
-	* gui/minicard/e-reflow-sorted.c: Made all buttons past the last
-	letter available work.
-
-2000-05-30  Christopher James Lahey  <clahey@helixcode.com>
-
-	* gui/component/alphabet.glade: Added a bit of space around the
-	alphabet bar.
-
-2000-05-30  Christopher James Lahey  <clahey@helixcode.com>
-
-	* gui/component/Makefile.am: Added alphabet.glade and
-	alphabet.glade.h.
-
-	* gui/component/addressbook.c, gui/component/alphabet.glade,
-	gui/component/alphabet.glade.h: Added an alphabet bar.
-
-	* gui/minicard/e-minicard-view.c, gui/minicard/e-minicard-view.h,
-	gui/minicard/e-reflow-sorted.c, gui/minicard/e-reflow-sorted.h:
-	Added the ability to just to a particular spot in the reflow.
-
-2000-05-30  Christopher James Lahey  <clahey@helixcode.com>
-
-	* printing/Makefile.am: Added BONOBO_GNOME_CFLAGS to CPPFLAGS.
-
-2000-05-30  Christopher James Lahey  <clahey@helixcode.com>
-
-	* gui/minicard/e-minicard-view.c: Made double clicking create a
-	new card.  Set the empty message.
-
-	* gui/minicard/e-minicard.c: Made sorting be case insensitive.
-
-	* gui/minicard/e-reflow-sorted.c, e-reflow.c, e-reflow.h: Added a
-	message for when the reflow is empty.
-
-	* printing/e-contact-print.c, printing/medbook.ecps: Made the
-	default printout be full page.  Made sorting case insensitive.
-
-2000-05-30  Christopher James Lahey  <clahey@helixcode.com>
-
-	* backend/ebook/e-book-view-listener.c,
-	backend/ebook/e-book-view-listener.h, backend/ebook/e-book-view.c,
-	backend/ebook/e-book-view.h, backend/idl/addressbook.idl,
-	backend/pas/pas-backend-file.c, backend/pas/pas-backend-ldap.c,
-	backend/pas/pas-book-factory.c, backend/pas/pas-book-view.c,
-	backend/pas/pas-book-view.h: Added "sequence_complete" signal.
-
-	* printing/e-contact-print.c: Made printing wait for
-	"sequence_complete" signal and made it sort.
-
-2000-05-25  Christopher James Lahey  <clahey@helixcode.com>
-
-	* gui/component/addressbook.c,
-	gui/component/e-addressbook-model.c,
-	gui/component/e-addressbook-model.h: Added double click to open
-	contact editor.
-
-2000-05-25  Christopher James Lahey  <clahey@helixcode.com>
-
-	* gui/component/addressbook.c: Removed some columns.
-
-2000-05-25  Ettore Perazzoli  <ettore@helixcode.com>
-
-	* gui/component/addressbook.c (addressbook_factory_new_control):
-	New function.
-	(addressbook_factory): Use it.
-
-	* Makefile.am (evolution_addressbook_LDADD): Link with
-	`evolution-shell-component.o' from the shell directory.
-
-	* gui/component/addressbook-component.c: New.
-	* gui/component/addressbook-component.h: New.
-
-2000-05-23  Christopher James Lahey  <clahey@helixcode.com>
-
-	* Makefile.am: Switched printing and gui.
-
-	* backend/ebook/e-book-view-listener.h,
-	backend/ebook/e-book-view.h, backend/ebook/e-book.h,
-	backend/ebook/e-card-cursor.h, backend/ebook/e-card-list.h,
-	backend/ebook/e-card-simple.h, backend/ebook/e-card.h: Fixed the
-	#defines to work elsewhere in evolution.
-
-	* gui/component/Makefile.am: Added linking to libecontactprint.
-
-	* gui/component/addressbook.c: Added a menu item to print the
-	current query.
-
-	* printing/Makefile.am: Add linking to libebook and requirements.
-	Add installation of ecps files.
-
-	* printing/e-contact-print.c, printing/e-contact-print.h: Changed
-	this to use real data from an EBook.
-
-	* printing/test-print.c: Made this pass NULL, NULL to
-	e_contact_print_dialog_new so that it will compile.
-
-2000-05-23  Christopher James Lahey  <clahey@helixcode.com>
-
-	* contact-editor/e-contact-save-as.c: Fixed some memory leaks.
-
-2000-05-23  Christopher James Lahey  <clahey@helixcode.com>
-
-	* contact-editor/Makefile.am: Added e-contact-editor-save-as.c and
-	e-contact-editor-save-as.h.
-
-	* contact-editor/e-contact-save-as.c,
-	contact-editor/e-contact-save-as.h: New files that display a save
-	as dialog and then save the given card to that file.
-
-	* gui/minicard/e-minicard.c: Call e_contact_save_as in a right
-	click menu.
-
-2000-05-19  Christopher James Lahey  <clahey@helixcode.com>
-
-	* contact-editor/e-contact-editor-categories.c,
-	gui/component/e-addressbook-model.c: Added initialize_value and
-	value_is_empty callbacks.
-
-2000-05-19  Christopher James Lahey  <clahey@helixcode.com>
-
-	* contact-editor/e-contact-editor.c: Fixed a bug that broke
-	address field support.
-
-2000-05-19  Christopher James Lahey  <clahey@helixcode.com>
-
-	* contact-editor/e-contact-editor.c,
-	contact-editor/e-contact-editor.h: Added support for arbitrary
-	fields in the contact editor.
-
-2000-05-18  Christopher James Lahey  <clahey@helixcode.com>
-
-	* backend/ebook/e-card.c: Fixed e_card_name_copy and
-	e_card_arbitrary_copy to deal correctly with a passed NULL.
-
-	* contact-editor/Makefile.am: Removed imagesdir stuff.
-
-	* contact-editor/arrow.png: Made this transparent.
-
-	* contact-editor/contact-editor.glade,
-	contact-editor/e-contact-editor-strings.h: Renamed some widgets
-	and added custom widgets for all of the images.
-
-	* contact-editor/e-contact-editor.c: Worked on making this work
-	decently well with messed up glade files.  Cleaned up a lot of code.
-
-2000-05-18  Christopher James Lahey  <clahey@helixcode.com>
-
-	* backend/ebook/e-card.c: Fixed the code to write out and read in
-	arbitrary fields.
-
-2000-05-18  Christopher James Lahey  <clahey@helixcode.com>
-
-	* backend/ebook/e-card-simple.c, backend/ebook/e-card-simple.h,
-	backend/ebook/e-card-types.h, backend/ebook/e-card.c,
-	backend/ebook/e-card.h: Implemented "MAILER" field.  Added
-	arbitrary field support.
-
-	* contact-editor/e-contact-editor-categories.c: Fixed a warning.
-
-2000-05-16  Christopher James Lahey  <clahey@helixcode.com>
-
-	* backend/ebook/e-card-simple.c, backend/ebook/e-card-simple.h:
-	Added E_CARD_SIMPLE_FIELD_MAILER.  Not implemented yet.
-
-2000-05-16  Chris Toshok  <toshok@helixcode.com>
-
-	* backend/pas/pas-backend-ldap.c (construct_email_list): convert to use ECardSimple.
-	(poll_ldap): same.
-
-2000-05-16  Chris Toshok  <toshok@helixcode.com>
-
-	* backend/pas/pas-book.h: add typedefs for the can_write
-	functions, and add parameters to pas_book_new.
-
-	* backend/pas/pas-book.c (pas_book_construct): add can_write/can_write_card params.
-	(pas_book_new): same.
-	(impl_Evolution_Book_can_write): new function.
-	(impl_Evolution_Book_can_write_card): same.
-	(pas_book_get_epv): assign the can_write/can_write_card slots in the epv.
-
-	* backend/pas/pas-backend-ldap.c (pas_backend_ldap_can_write): new function.
-	(pas_backend_ldap_can_write_card): same.
-	(pas_backend_ldap_add_client): add can_write/can_write_card to pas_book_new call.
-
-	* backend/pas/pas-backend-file.c (pas_backend_file_can_write_card): new function, calls can_write.
-	(pas_backend_file_can_write): same.
-	(can_write): return TRUE if we can write to the addressbook file.
-	(pas_backend_file_add_client): add can_write/can_write_card to pas_book_new call.
-
-	* backend/idl/addressbook.idl (Evolution): add can_write and
-	can_write_card permission requests.
-
-2000-05-16  Christopher James Lahey  <clahey@helixcode.com>
-
-	* backend/ebook/e-card.c (e_card_get_vcard): Fixed a large memory leak.
-
-2000-05-16  Christopher James Lahey  <clahey@helixcode.com>
-
-	* backend/ebook/e-card.c (add_list_unique): Fixed another memory
-	leak.
-
-2000-05-16  Christopher James Lahey  <clahey@helixcode.com>
-
-	* backend/ebook/e-card-simple.c, backend/pas/pas-backend-file.c,
-	contact-editor/e-contact-editor.c, ename/e-name-western.c,
-	gui/component/addressbook.c, gui/minicard/e-minicard-view.c: Fixed
-	some memory leaks.
-
-	* backend/ebook/e-card.c: Rearranged some code.
-
-2000-05-16  Christopher James Lahey  <clahey@helixcode.com>
-
-	* contact-editor/e-contact-editor-categories.c: Fixed a reference
-	leak.
-
-2000-05-16  Christopher James Lahey  <clahey@helixcode.com>
-
-	* contact-editor/e-contact-editor-categories.c: Fixed a compile
-	error.
-
-2000-05-16  Christopher James Lahey  <clahey@helixcode.com>
-
-	* contact-editor/e-contact-editor-categories.c: Got rid of a
-	memory leak.  Rearranged a couple functions.
-	
-	* gui/minicard/e-minicard-view.c, gui/minicard/e-minicard-view.h:
-	Added some code to stop watching the EBook when the canvas is
-	destroyed (apparently the canvas is destroyed before our widget is
-	destroyed.)
-
-2000-05-14  Christopher James Lahey  <clahey@helixcode.com>
-
-	* contact-editor/e-contact-editor-categories.c: Use the correct
-	policy for resize.
-
-2000-05-14  Christopher James Lahey  <clahey@helixcode.com>
-
-	* backend/ebook/Makefile.am: Added libeutil for e-card's support
-	for categories.
-
-	* backend/ebook/e-card-list.c, backend/ebook/e-card-list.h: Added
-	a function to get the length.
-
-	* backend/ebook/e-card.c, backend/ebook/e-card.h: Added categories
-	support (accessible either as "categories" or "category_list".)
-
-	* contact-editor/Makefile.am: Added e-table and all of the
-	categories files.
-
-	* contact-editor/categories.glade,
-	contact-editor/categories-strings.h,
-	contact-editor/e-contact-editor-categories.c,
-	contact-editor/e-contact-editor-categories.h:
-
-	* contact-editor/contact-editor.glade,
-	contact-editor/e-contact-editor-strings.h: Rearranged this dialog.
-
-	* contact-editor/e-contact-editor.c: Rearranged dialog a bit.
-	Added opening of categories dialog.
-
-	* gui/component/Makefile.am: Rearranged libraries so that
-	libetable would be available for the contact editor categories
-	dialog.
-
-	* gui/component/addressbook.c: Fix for new ETable resizing.  Make
-	contact editor dialog resizable.
-
-	* gui/minicard/Makefile.am: Added libetable contact editor
-	categories dialog.
-
-	* gui/minicard/e-minicard.c: Make contact editor dialog resizable.
-
-2000-05-12  Miguel de Icaza  <miguel@gnu.org>
-
-	* contact-editor/fulname.glade: Use accelerators here.
-
-2000-05-13  Valek Filippov  <frob@df.ru>
-
-	* gui/component/ldap-server-dialog.glade: save translatable strings
-	* gui/component/ldap-server-dialog.glade.h: file with strings
-	* printing/e-contact-print.glade: save translatable strings
-	* printing/e-contact-print.glade.h: file with strings
-		
-2000-05-11  Dan Winship  <danw@helixcode.com>
-
-	* gui/component/addressbook.c (control_activate): Now that we
-	depend on recent gnome-libs we can make the toolbar detachable
-	again.
-
-2000-05-10  Christopher James Lahey  <clahey@helixcode.com>
-
-	* gui/component/addressbook.c: Make the table view be sorted by
-	name initially.
-
-2000-05-10  Christopher James Lahey  <clahey@helixcode.com>
-
-	* backend/pas/pas-book-factory.c: Send a proper response when you
-	can't find the ldap URI.
-
-	* gui/component/addressbook.c: Cleaned up the open error dialog a
-	bit.
-
-2000-05-10  Christopher James Lahey  <clahey@helixcode.com>
-
-	* gui/component/addressbook.c: Added a dialog for when you can't
-	open an addressbook.
-
-2000-05-10  Christopher James Lahey  <clahey@helixcode.com>
-
-	* backend/ebook/Makefile.am: Added e-book-types.h, e-card-pairs.h,
-	e-card-types.h.
-
-	* backend/pas/Makefile.am: Added pas-backend-ldap.h.
-
-	* contact-editor/Makefile.am: Added a proper EXTRA_DIST section.
-	Removed some old defines.
-
-	* ename/Makefile.am: Added e-name-western-tables.h.
-
-	* gui/component/Makefile.am: Added e-ldap-server-dialog.h.  Added
-	a proper EXTRA_DIST section.
-
-	* gui/minicard/e-reflow.c: Added a missed cast.
-
-	* printing/Makefile.am: Added a proper EXTRA_DIST section.
-	
-2000-05-09  Christopher James Lahey  <clahey@helixcode.com>
-
-	* contact-editor/e-contact-editor.c: Make sure that the canvas
-	doesn't intercept keyboard focus.
-
-2000-05-09  Christopher James Lahey  <clahey@helixcode.com>
-
-	* contact-editor/e-contact-editor.c: Use new art.
-
-2000-05-09  Christopher James Lahey  <clahey@helixcode.com>
-
-	* contact-editor/contact-editor.glade,
-	contact-editor/e-contact-editor-strings.h: Replaced the Address
-	button with a label and rearranged the address area a bit.
-
-2000-05-09  Christopher James Lahey  <clahey@helixcode.com>
-
-	* gui/minicard/e-minicard.c: Reenable editting.
-
-	* gui/minicard/e-reflow-sorted.c: Make reflow flow on deletion.
-
-2000-05-09  Christopher James Lahey  <clahey@helixcode.com>
-
-	* gui/component/addressbook.c: Destroy the view object when
-	leaving the minicard view.
-
-2000-05-09  Christopher James Lahey  <clahey@helixcode.com>
-
-	* gui/minicard/e-reflow-sorted.c: Fixed reflow sorting to call
-	reflow_request when sorting on an item changes.
-
-2000-05-09  Christopher James Lahey  <clahey@helixcode.com>
-
-	* backend/ebook/e-card-simple.c: Make File As change if name or
-	company are changed pretty much anywhere.
-
-	* gui/minicard/e-minicard.c: Turned off having minicard editing
-	effect anything since it's so crashy.
-
-2000-05-09  Christopher James Lahey  <clahey@helixcode.com>
-
-	* backend/pas/pas-backend-ldap.c: Enabled a couple more fields
-
-2000-05-09  Christopher James Lahey  <clahey@helixcode.com>
-
-	* backend/pas/pas-backend-file.c: Added a default card to all new
-	file backends.
-
-2000-05-09  Christopher James Lahey  <clahey@helixcode.com>
-
-	* gui/component/e-addressbook-model.c: Rearranged order of things
-	getting destroyed.
-
-	* gui/minicard/e-minicard-view.c: Rearranged order of things
-	getting destroyed.  Don't set attributes of non-null or destroyed
-	items.  Destroy parent object when destroyed.  Maintain ref_count
-	of items in list.
-
-	* gui/minicard/e-minicard.c: Don't set attributes of non-null
-	items.
-
-	* gui/minicard/e-reflow-sorted.c: Maintain ref_count of items in
-	list.
-
-	* gui/minicard/e-reflow.c: Maintain ref_count of items in list.
-	Destroy parent object when destroyed.
-
-2000-05-09  Christopher James Lahey  <clahey@helixcode.com>
-
-	* backend/ebook/e-card-simple.c: Fixed some indentation.
-
-	* contact-editor/contact-editor.glade,
-	contact-editor/e-contact-editor-strings.h: Changed Email to
-	Primary Email.
-
-	* contact-editor/e-contact-editor.c: Added checkmarks to indicate
-	if data exists in the pull down menus for the phone, address, and
-	email fields.
-
-2000-05-09  Christopher James Lahey  <clahey@helixcode.com>
-
-	* backend/ebook/e-card-simple.c: Fixed the string duplication
-	problem.  Fixed the business/home address string mix up.
-
-	* gui/component/addressbook.c: Made the minicard view the default
-	view.
-
-2000-05-08  Christopher James Lahey  <clahey@helixcode.com>
-
-	* backend/ebook/e-card-simple.c: Fixed this up a bit.  Syncing
-	should work better now.
-
-2000-05-08  Christopher James Lahey  <clahey@helixcode.com>
-
-	* gui/minicard/e-minicard-view.c, gui/minicard/e-minicard.c,
-	gui/minicard/e-minicard.h, gui/minicard/e-reflow-sorted.c,
-	gui/minicard/e-reflow-sorted.h: Made a minimal number of things be
-	destroyed and recreated when updating a field.
-
-2000-05-07    <toshok@the-dot-in.helixcode.com>
-
-	* gui/minicard/e-minicard.c (remodel): make sure to free the
-	return value of e_card_simple_get.
-
-	* gui/component/addressbook.c (teardown_table_view): destroy the
-	ECardSimple here, plug memory leak.
-	(create_table_view): use view->simple so we can destroy the
-	ECardSimple later on.
-
-2000-05-07  Chris Toshok  <toshok@helixcode.com>
-
-	* ename/e-name-western.c (e_name_western_extract_middle): comment
-	function, and fix an ABR.
-
-2000-05-07  Chris Toshok  <toshok@helixcode.com>
-
-	* ename/e-name-western.c (e_name_western_cleanup_string): comment
-	function, and fix an ABR.
-
-2000-05-08  Christopher James Lahey  <clahey@helixcode.com>
-
-	* gui/minicard/e-minicard.c: Added saving in minicard view.
-
-2000-05-07  Christopher James Lahey  <clahey@helixcode.com>
-
-	* backend/pas/pas-backend-file.c: Fixed an off by 2 error.
-
-2000-05-07  Chris Toshok  <toshok@helixcode.com>
-
-	* gui/component/addressbook.c (set_prop): don't create a new
-	ebook.  instead, unload the current uri (if there is one) and load
-	the new one.
-	(addressbook_factory): create the ebook once.
-
-2000-05-07  Christopher James Lahey  <clahey@helixcode.com>
-
-	* gui/component/e-addressbook-model.c: Replaced some model_changed
-	calls with row_inserted calls.
-
-2000-05-07  Christopher James Lahey  <clahey@helixcode.com>
-
-	* backend/pas/pas-backend-file.c, backend/pas/pas-backend-ldap.c:
-	Removed some code that was notifying too many clients at the wrong
-	times.
-
-	* gui/component/addressbook.c: Set view->book.  Unreffed
-	view->book.  Unreffed the model instead of destroying it.  Removed
-	the /tmp/test.db stuff.
-
-2000-05-07  Christopher James Lahey  <clahey@helixcode.com>
-
-	* gui/component/addressbook.c: Make the addressbook create the
-	correct file uri.  Added a default query.  Initialize view->model
-	and view->view to NULL.
-
-	* gui/component/e-addressbook-model.c,
-	gui/minicard/e-minicard-view.c: Only call get_book_view if both
-	book and query and non-null.
-
-2000-05-06  Chris Toshok  <toshok@helixcode.com>
-
-	* gui/component/addressbook.c (control_deactivate): remove the
-	separator and toggle view items as well.
-	(toggle_view_as_cb): callback for the "/View/Toggle View" menu
-	item.
-	(get_query): getter for the query string that takes into account
-	the two view types.
-	(set_query): setter for the query string that takes into account
-	the two view types.
-	(set_book): setter for the EBook type - not really a setter, since
-	the book is kept in the AddressbookView, but this method actually
-	sets the "book" property on the current view.
-	(find_contact_cb): make use of get/set_query
-	(search_entry_activated): make use of set_query.
-	(control_activate): add a menu separator and an item to toggle
-	between view types.
-	(book_open_cb): make use of set_book.
-	(ebook_create): no longer needs to return the EBook, since we set
-	the book field in our view.
-	(teardown_minicard_view): destructor function for the minicard
-	specific ui.
-	(create_minicard_view): constructor function for the minicard
-	specific ui.
-	(teardown_table_view): destructor function for the e-table
-	specific ui.
-	(create_table_view): constructor function for the e-table specific
-	ui.
-	(change_view_type): destroy the old and create the new view ui,
-	change the label of the Toggle View menu item, and reset the book
-	and query on the new view type.
-	(addressbook_factory): create an all-encompassing vbox that the
-	view uses to create the bonobo control, which contains 1 widget
-	per ui specific view (the e-table in the table case, and another
-	vbox in the minicard case.)  use change_view_type to create the
-	initial view.
-
-2000-05-07  Christopher James Lahey  <clahey@helixcode.com>
-
-	* backend/ebook/e-book.c: Made a NULL callback just mean to not
-	call back.
-
-	* backend/ebook/e-card-simple.c, backend/ebook/e-card-simple.h:
-	Reordered fields.  Added a get_const function to get a constant
-	string that persists until the simple is destroyed.
-
-	* gui/component/Makefile.am: Added e-addressbook-model.c and
-	e-addressbook-model.h and all of the libraries and includes that
-	they are dependent on.
-
-	* gui/component/addressbook-factory.c: Initialize e cursors.
-
-	* gui/component/addressbook.c: Added inactive code to display an
-	ETable view of the addressbook.
-
-	* gui/component/e-addressbook-model.c,
-	gui/component/e-addressbook-model.h: New files to implement an
-	ETable model with a EBook back end.
-	
-2000-05-06  Christopher James Lahey  <clahey@helixcode.com>
-
-	* backend/ebook/e-card-simple.c, backend/ebook/e-card-simple.h:
-	Mostly finished ECardSimple.
-
-	* contact-editor/e-contact-editor.c: Changed this to match with
-	some of the changes to ECardSimple.
-
-	* gui/component/addressbook.c: Changed this to look for
-	"addressbook.db" in the given directory if it doesn't find the
-	file "uri".
-
-	* gui/minicard/e-minicard.c, gui/minicard/e-minicard.h: Changed
-	this to use ECardSimple.
-
-2000-05-06  Chris Toshok  <toshok@helixcode.com>
-	
-	* gui/component/.cvsignore: ignore evolution-addressbook.pure
-
-	* gui/component/Makefile.am: add support for generating 
-	evolution-addressbook.pure.
-
-2000-05-06  Chris Toshok  <toshok@helixcode.com>
-
-	* backend/pas/pas-backend-ldap.c (pas_backend_ldap_load_uri): if a
-	port isn't specified in the uri default to 389.
-
-2000-05-06  Christopher James Lahey  <clahey@helixcode.com>
-
-	* gui/component/addressbook.c: Made this take a uri through its
-	property bag.
-
-2000-05-05  Christopher James Lahey  <clahey@helixcode.com>
-
-	* backend/ebook/Makefile.am: Added e-card-simple.c and
-	e-card-simple.h.
-
-	* backend/ebook/e-card-simple.c, backend/ebook/e-card-simple.h:
-	New card wrapper class to simplify things.
-
-	* contact-editor/e-contact-editor.c,
-	contact-editor/e-contact-editor.h: Changed e-contact-editor to use
-	ECardSimple a bit.
-
-2000-05-03  Chris Toshok  <toshok@helixcode.com>
-
-	* gui/component/addressbook.c (control_deactivate): #ifdef
-	HAVE_LDAP the ldap specific stuff.
-	(null_cb): same.
-	(control_activate): same.
-
-2000-05-02  Ettore Perazzoli  <ettore@helixcode.com>
-
-	* backend/ebook/Makefile.am (INCLUDES): Add
-	`-I$(top_srcdir)/addressbook/ename'.
-
-2000-05-02  Matt Loper  <matt@helixcode.com>
-
-	* demo/Makefile.am: set G_LOG_DOMAIN.
-	* printing/Makefile.am: same.
-
-2000-05-01  Christopher James Lahey  <clahey@helixcode.com>
-
-	* backend/pas/pas-book-factory.c: Add back in the
-	CORBA_Object_release.
-
-	* backend/pas/pas-book.c: Properly duplicate and release the
-	listener passed to us.
-
-2000-05-01  Christopher James Lahey  <clahey@helixcode.com>
-
-	* backend/pas/pas-backend-file.c, backend/pas/pas-backend-ldap.c:
-	Made uri slightly better managed.
-	
-	* backend/pas/pas-book-factory.c
-	(pas_book_factory_process_request): Remove this
-	CORBA_Object_release that causes things not to work.  This is just
-	a temporary fix until we figure out what's actually wrong.
-
-	* backend/pas/pas-book.c: Fixed a copy and paste error in a warning.
-	
-2000-05-01  Christopher James Lahey  <clahey@helixcode.com>
-
-	* Makefile.am: Switched the subdirs order since backend depends on
-	ename.
-
-2000-05-01  Larry Ewing  <lewing@helixcode.com>
-
-	* backend/pas/pas-backend-ldap.c (pas_backend_ldap_remove_client):
-	fix a typo in the for loop.
-
-2000-05-01  Michael Meeks  <michael@helixcode.com>
-
-	* backend/pas/pas-book-factory.c: include gtk.
-
-2000-04-30  Federico Mena Quintero  <federico@helixcode.com>
-
-	* backend/ebook/e-book-types.h (EBookStatus): Added new status
-	values for the IDL stuff.
-
-	* backend/pas/pas-book-factory.h (PASBookFactoryClass): New
-	"last_book_gone" signal.
-
-	* backend/pas/pas-book-factory.c
-	(pas_book_factory_launch_backend): Better error handling.
-	(pas_book_factory_process_queue): Let
-	pas_book_factory_process_request() free the request.
-	(pas_book_factory_process_request): Free the request here.
-	Perform better error handling.
-	(free_active_server_map_entry): Free an active server map entry;
-	free the URI key and unref the backend value.  This function was
-	renamed; the old one was trying to CORBA_Object_unref() a GTK+
-	object!
-	(remove_backends_entry): Free a backend table entry; free the URI
-	key.
-	(backend_last_client_gone_cb): Remove the backend from the active
-	server map and emit the "last_book_gone" signal if appropriate.
-	(pas_book_factory_get_n_backends): New function to query the
-	number of running backends in an addressbook factory.
-
-	* backend/idl/addressbook.idl (BookListener::CallStatus): Added a
-	ProtocolNotSupported code.  This is for when the addressbook
-	factory cannot find a provider for the requested URI.
-
-	* backend/pas/pas-backend.h (PASBackendClass): New
-	"last_client_gone" signal.
-	(PASBackendClass): New get_uri virtual method.
-
-	* backend/pas/pas-backend.c (pas_backend_load_uri): Return a
-	gboolean success code.
-	(pas_backend_add_client): Return a gboolean success code.
-	(pas_backend_last_client_gone): New function used by backend
-	implementations to notify upwards when the backend's last client
-	is destroyed.
-	(pas_backend_get_uri): New function to get the URI of a backend.
-
-	* backend/pas/pas-backend-file.c (pas_backend_file_add_client):
-	Pass the backend as the closure data to the "destroy" handler of
-	the book.  We cannot call pas_book_get_backend() in the callback
-	since the book's private data has already been destroyed when the
-	callback is invoked.  Alternatively, we could move the private
-	data destruction step to the book's ::finalize() method.
-	(pas_backend_file_book_destroy_cb): Get the backend from the
-	callback's data, not from the book.
-	(pas_backend_file_remove_client): Remove the book from the list of
-	clients.  When all clients go away, call
-	pas_backend_last_client_gone().
-	(PASBackendFilePrivate): Added an uri field.
-	(pas_backend_file_get_uri): Implement the get_uri method.
-	(pas_backend_file_load_uri): Return a gboolean success code.
-	Also, store the URI in the private structure.
-	(pas_backend_file_add_client): Return a gboolean success code.
-	Also, call pas_backend_last_client_gone() if appropriate.
-	(pas_backend_file_destroy): Free the bf->priv->uri.
-
-	* backend/pas/pas-backend-ldap.c (pas_backend_ldap_add_client):
-	Pass the backend as the closure data to the "destroy" handler of
-	the book.  See above for rationale.
-	(pas_backend_ldap_book_destroy_cb): Get the backend from the
-	callback's data.
-	(pas_backend_ldap_remove_client): Remove the book from the list of
-	clients.  When all clients go away, call
-	pas_backend_last_client_gone().
-	(pas_backend_ldap_load_uri): Return a gboolean success code.
-	(pas_backend_ldap_add_client): Return a gboolean success code.
-	Also, call pas_backend_last_client_gone() if appropriate.
-	(PASBackendLDAPPrivate): New uri field.
-	(pas_backend_ldap_get_uri): Implement the get_uri method.
-	(pas_backend_ldap_load_uri): Store the uri in the private
-	structure.
-	(pas_backend_ldap_destroy): Free the bl->priv->uri.
-
-2000-04-30  Chris Toshok  <toshok@helixcode.com>
-
-	* gui/component/Makefile.am (evolution_addressbook_SOURCES): added
-	e-ldap-server-dialog.c
-	(glade_DATA): added ldap-server-dialog.glade
-
-	* gui/component/ldap-server-dialog.glade: new file.
-
-	* gui/component/e-ldap-server-dialog.h: new file.
-
-	* gui/component/e-ldap-server-dialog.c: new file, contains logic
-	associated with ldap server dialog.
-
-	* gui/component/addressbook.c (control_deactivate): remove the
-	directory server menu item.
-	(null_cb): do nothing callback for e_book_load_uri call.  should
-	change to (at the very least) pop up a dialog if there was an
-	error.
-	(new_server_cb): new function - really just switches to a
-	particular ldap server, since the information isn't saved
-	anywhere.
-	(control_activate): add directory server menu item.
-
-2000-04-30  Chris Toshok  <toshok@helixcode.com>
-
-	* backend/ebook/e-book.c (e_book_load_uri): create the book
-	listener here, since it's destroyed in unload_uri.
-	(e_book_construct): remove the book listener construction here.
-
-2000-04-30  Christopher James Lahey  <clahey@helixcode.com>
-
-	* backend/ebook/.cvsignore: Added load-pine-addressbook.
-
-2000-04-30  Christopher James Lahey  <clahey@helixcode.com>
-
-	* contact-editor/contact-editor.glade,
-	contact-editor/e-contact-editor.c, gui/minicard/e-minicard.c: Made
-	some fields invisible that were visible before.
-
-2000-04-30  Christopher James Lahey  <clahey@helixcode.com>
-
-	* backend/ebook/e-card.c: Make file as not have the : after it if
-	it's empty.  If there's no name, or file_as, fill in these fields
-	with defaults based on full_name or name respectively.
-
-	* backend/ebook/load-pine-addressbook.c: New file to do import of
-	pine .addressbook files.
-
-	* backend/pas/pas-backend-file.c: Made empty fields act as the
-	empty string for searches.
-
-	* contact-editor/e-contact-editor.c,
-	contact-editor/e-contact-editor.h: Made the File As field update
-	properly as you edit the name and company fields.  Added the pull
-	down list of File As choices.  Made sure that all fields will
-	be set to NULL if they are deleted to the empty string.
-
-	* gui/minicard/e-minicard.c: Use the File As field instead of the
-	Full Name field for the header.  Make identical compares on the
-	File As field do a compare on the uid.
-
-2000-04-30  Christopher James Lahey  <clahey@helixcode.com>
-
-	* contact-editor/e-contact-editor-fullname.c,
-	contact-editor/fullname.glade: Fixed a string mismatch.
-
-2000-04-30  Christopher James Lahey  <clahey@helixcode.com>
-
-	* backend/ebook/Makefile.am: Added ename includes and libs.
-
-	* backend/ebook/e-card.c, backend/ebook/e-card.h: Added
-	e_card_name_from_string.  Added header for
-	e_card_delivery_address_from_string, even though it's not
-	implemented yet.
-
-	* contact-editor/Makefile.am: Removed the ename includes since we
-	no longer use ename directly here.
-
-	* contact-editor/e-contact-editor.c: Fixed this to properly save
-	the address labels displayed.  Updated this to use the function
-	e_card_name_from_string instead of doing it by hand.
-
-	* contact-editor/fullname-strings.h,
-	contact-editor/fullname.glade: Deleted an unused field.  Changed
-	the set of prefixes and suffixes.
-
-2000-04-30  Chris Toshok  <toshok@helixcode.com>
-
-	* backend/pas/pas-backend-ldap.c
-	(pas_backend_ldap_ensure_connected): add support for a rootdn in
-	the uri.
-	(pas_backend_ldap_build_all_cards_list): make use of the rootdn in
-	the call to ldap_search_s.
-	(pas_backend_ldap_search): same.
-	(pas_backend_ldap_load_uri): get the rootdn out of the passed in uri.
-
-2000-04-29  Christopher James Lahey  <clahey@helixcode.com>
-
-	* backend/ebook/e-card.c, backend/ebook/e-card.h: Added
-	e_card_phone_new e_card_delivery_address_new,
-	e_card_delivery_address_to_string, e_card_name_copy,
-	e_card_name_new, e_card_name_to_string, and made e_card_name_free
-	public.  Removed some unused code.
-
-	* backend/pas/pas-backend-file.c: Fixed a warning.
-
-	* contact-editor/Makefile.am: Added e-contact-editor-fullname.[ch]
-	and fullname.glade.  Added e-name libs and includes.
-
-	* contact-editor/e-contact-editor-fullname.c,
-	contact-editor/e-contact-editor-fullname.h,
-	contact-editor/fullname-strings.h, contact-editor/fullname.glade:
-	New dialog for editing the fields of a name separately.
-
-	* contact-editor/e-contact-editor.c,
-	contact-editor/e-contact-editor.h: Create an
-	EContactEditorFullname when you click on the Full Name button.
-	Maintain a parsed name at all times.
-
-	* gui/component/Makefile.am, gui/minicard/Makefile.am: Added
-	e-name libs.
-
-2000-04-28  Larry Ewing  <lewing@helixcode.com>
-
-	* backend/pas/pas-book-factory.c (register_factory): fix the
-	`USING_OAF' changes so that they work for when we are not using
-	oaf.
-
-2000-04-27  Ettore Perazzoli  <ettore@helixcode.com>
-
-	* ename/Makefile.am
-	(gnome_libs): Use `BONOBO_GNOME_LIBS'.
-	(INCLUDES): Add `-I$(srcdir)/..'.
-
-	* backend/pas/pas-book-factory.c
-	(register_factory): New function to register the factory.
-	Implementation different according to `USING_OAF'.
-	(pas_book_factory_activate): Use `register_factory()'.
-
-	* gui/component/addressbook.c: New #define `CONTROL_FACTORY_ID',
-	varying depending on whether we are `USING_OAF'.
-	(addressbook_factory_init): Use `CONTROL_FACTORY_ID'.
-
-	* backend/ebook/test-client.c (init_corba): New function,
-	implemented differently according to the `USING_OAF' #define.
-
-	* backend/ebook/e-book.c: New #define `CARDSERVER_OAF_ID'.
-	(e_book_construct): Work with OAF #if `USING_OAF'.
-
-	* backend/ebook/Makefile.am (gnome_libs): Removed.
-	(corbadir): Removed.
-	(ebook_libs): Removed.
-	(test_client_LDADD): Just add `libebook.la'.
-	(test_card_LDADD): Likewise.
-	(test_client_list_LDADD): Likewise.
-
-	* gui/component/addressbook-factory.c
-	(init_corba): New helper function, implemented differently
-	according to `USING_OAF'.
-	(main): Call `init_corba()'.
-
-2000-04-27  Christopher James Lahey  <clahey@helixcode.com>
-
-	* backend/ebook/e-card.c, backend/ebook/e-card.h: Added file as,
-	office, manager, assistant, spouse, and anniversary fields.  These
-	all use "X-EVOLUTION-" fields in the VCards.
-
-	* backend/pas/pas-backend-file.c: Added all the new fields (except
-	anniversary) to the list of fields.
-
-	* contact-editor/contact-editor.glade,
-	contact-editor/e-contact-editor-strings.h: Fixed some misnamed
-	fields and fixed the placement of the comments field.
-
-	* contact-editor/e-contact-editor.c: Made the newly added fields
-	display properly.
-
-	* Makefile.am: Added ename.
-
-	* ename/e-name-western.h, ename/test-ename-western-gtk.c,
-	ename/test-ename-western.c: Fixed up some #includes.
-
-	* ename/.cvsignore: Added .cvsignore.
-
-2000-04-26  Christopher James Lahey  <clahey@helixcode.com>
-
-	* backend/ebook/e-card-types.h, backend/ebook/e-card.c,
-	backend/ebook/e-card.h: Added an address label field.
-
-	* contact-editor/contact-editor.glade,
-	contact-editor/e-contact-editor-strings.h: Got rid of some unused
-	fields.
-
-	* contact-editor/e-contact-editor.c,
-	contact-editor/e-contact-editor.h: Added the address label field.
-	Load only.  Editing these fields seems to mess things up.
-
-2000-04-26  Christopher James Lahey  <clahey@helixcode.com>
-
-	* contact-editor/e-contact-editor.c: Added proper handling of the
-	email field.
-
-2000-04-26  Christopher James Lahey  <clahey@helixcode.com>
-
-	* backend/ebook/e-card-types.h, backend/ebook/e-card.c,
-	gui/minicard/e-minicard.c: Prefixed the ADDR_ flags.
-
-	* contact-editor/contact-editor.glade,
-	contact-editor/e-contact-editor-strings.h: Edited the glade file.
-	Removed all the fields that we don't use.
-
-	* contact-editor/e-contact-editor.c,
-	contact-editor/e-contact-editor.h: Made the phone fields work
-	properly.  The address and email fields are temporarily turned off
-	until they can be made to work as the phone fields do.
-
-2000-04-25  Ettore Perazzoli  <ettore@helixcode.com>
-
-	* gui/minicard/Makefile.am (INCLUDES): Use
-	`$(BONOBO_GNOME_CFLAGS)'.
-
-	* backend/pas/Makefile.am (idl_flags): Add `-I $(datadir)/idl' to
-	pick up IDL files in the installation prefix as well.
-	(INCLUDES): Use `$(BONOBO_GNOME_CFLAGS)'.
-
-	* backend/ebook/Makefile.am (ORBIT_IDL): Use `-I $(datadir)/idl'
-	to get the IDLs from the installation prefix as well.
-	(INCLUDES): Add `$(BONOBO_GNOME_CFLAGS)'.
-	(test_client_LDADD): Use `$(BONOBO_GNOME_LIBS)' instead of
-	hardcoding `-lbonobo'!  Also get rid of some other useless flags,
-	as `$(BONOBO_GNOME_LIBS)' really has all what we need.
-	(test_client_list_LDADD): Likewise.
-	(test_card_LDADD): Likewise.
-
-2000-04-18  Federico Mena Quintero  <federico@helixcode.com>
-
-	* gui/minicard/Makefile.am (INCLUDES): Use "e-minicard" as the log
-	domain.
-
-	* gui/component/Makefile.am (INCLUDES): Use
-	"evolution-addressbook" as the log domain.
-
-	* backend/pas/Makefile.am: Build libpas.a, not a shared library.
-	Do not install any header files.
-	(INCLUDES): Remove spurious include paths.
-
-	* backend/pas/*.[ch]: Fix includes.
-
-	* backend/ebook/Makefile.am: Do not install the test programs.
-	Fixed some include weirdness.
-
-	* backend/ebook/*.[ch]: Fix includes.
-
-	* contact-editor/Makefile.am (INCLUDES): Set the log domain to
-	"contact-editor".
-	(INCLUDES): Fix.
-
-	* contact-editor/*.[ch]: Fix includes.
-
-	* gui/minicard/*.[ch]: Fix includes.
-
-	* ChangeLog: Started a ChangeLog here.
diff --git a/addressbook/Makefile.am b/addressbook/Makefile.am
deleted file mode 100644
index 4fde08a4a9..0000000000
--- a/addressbook/Makefile.am
+++ /dev/null
@@ -1,23 +0,0 @@
-if ENABLE_PILOT_CONDUITS
-CONDUIT_SUBDIR=conduit
-endif
-
-SUBDIRS =	\
-	util printing gui importers tools $(CONDUIT_SUBDIR)
-
-error_DATA = addressbook-errors.xml
-error_i18n = $(error_DATA:.xml=.xml.h)
-errordir = $(privdatadir)/errors
-%.xml.h: %.xml
-	$(top_builddir)/e-util/e-error-tool $^
-
-EXTRA_DIST =			\
-	ChangeLog.pre-1-4	\
-	$(error_DATA)
-
-dist-hook:
-	cd $(distdir); rm -f $(BUILT_SOURCES)
-
-BUILT_SOURCES = $(error_i18n)
-
-CLEANFILES = $(BUILT_SOURCES)
diff --git a/addressbook/addressbook-errors.xml b/addressbook/addressbook-errors.xml
deleted file mode 100644
index 3bb5c93e01..0000000000
--- a/addressbook/addressbook-errors.xml
+++ /dev/null
@@ -1,100 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<error-list domain="addressbook">
-
- <error id="ldap-init" type="error" modal="true">
-  <primary>This addressbook could not be opened.</primary>
-  <secondary>This addressbook server might be unreachable or the server name may be misspelled or your network connection could be down.</secondary>
- </error>
-
- <error id="ldap-auth" type="error" modal="true">
-  <primary>Failed to authenticate with LDAP server.</primary>
-  <secondary>Check to make sure your password is spelled correctly and that you are using a supported login method. Remember that many passwords are case sensitive; your caps lock might be on.</secondary>
- </error>
-
- <error id="ldap-search-base" type="error" modal="true">
-  <primary>This addressbook server does not have any suggested search bases.</primary>
-  <secondary>This LDAP server may use an older version of LDAP, which does not support this functionality or it may be misconfigured. Ask your administrator for supported search bases.</secondary>
- </error>
-
- <error id="ldap-v3-schema" type="error" modal="true">
-  <primary>This server does not support LDAPv3 schema information.</primary>
- </error>
-
- <error id="ldap-get-schema" type="error" modal="true">
-  <primary>Could not get schema information for LDAP server.</primary>
- </error>
-
- <error id="ldap-invalid-schema" type="error" modal="true">
-  <primary>LDAP server did not respond with valid schema information.</primary>
- </error>
-
- <error id="remove-addressbook" type="error" modal="true">
-  <primary>Could not remove addressbook.</primary>
- </error>
-
- <error id="ask-delete-addressbook" type="question" modal="true" default="GTK_RESPONSE_CANCEL">
-  <primary>Delete address book '{0}'?</primary>
-  <secondary>This address book will be removed permanently.</secondary>
-  <button stock="gtk-cancel" response="GTK_RESPONSE_CANCEL"/>
-  <button stock="gtk-delete" response="GTK_RESPONSE_YES"/>
- </error>
-
- <error id="edit-categories" type="error">
-  <primary>Category editor not available.</primary>
- </error>
-
- <error id="generic-error" type="error">
-  <primary>{0}</primary>
-  <secondary>{1}</secondary>
- </error>
-
- <error id="load-error" type="error">
-  <title>Unable to open addressbook</title>
-  <primary>Error loading addressbook.</primary>
-  <secondary>{0}</secondary>
- </error>
-
- <error id="search-error" type="error">
-  <primary>Unable to perform search.</primary>
-  <secondary>{0}</secondary>
- </error>
-
- <error id="prompt-save" type="question" default="GTK_RESPONSE_YES">
-  <primary>Would you like to save your changes?</primary>
-  <secondary>You have made modifications to this contact. Do you want to save these changes?</secondary>
-  <button label="_Discard" response="GTK_RESPONSE_NO"/>
-  <button stock="gtk-cancel" response="GTK_RESPONSE_CANCEL"/>
-  <button stock="gtk-save" response="GTK_RESPONSE_YES"/>
- </error>
-
- <error id="prompt-move" type="question" default="GTK_RESPONSE_NO">
-  <primary>Cannot move contact.</primary>
-  <secondary>You are attempting to move a contact from one addressbook to another but it cannot be removed from the source. Do you want to save a copy instead?</secondary>
-  <button stock="gtk-no" response="GTK_RESPONSE_NO"/>
-  <button stock="gtk-yes" response="GTK_RESPONSE_YES"/>
- </error>
-
- <error id="save-error" type="error">
-  <primary>Unable to save contact(s).</primary>
-  <secondary>Error saving contacts to {0}: {1}</secondary>
- </error>
-
- <error id="backend-died" type="error">
-  <primary>The Evolution addressbook has quit unexpectedly.</primary>
-  <secondary>Your contacts for {0} will not be available until Evolution is restarted.</secondary>
- </error>
-
- <error id="ask-list-add-exists" type="question" default="GTK_RESPONSE_NO">
-  <primary>Address '{0}' already exists.</primary>
-  <secondary>A contact already exists with this address.  Would you like to add a new card with the same address anyway?</secondary>
-  <button stock="gtk-cancel" response="GTK_RESPONSE_CANCEL"/>
-  <button stock="gtk-ok" label="_Add" response="GTK_RESPONSE_YES"/>
- </error>
- 
- <error id="server-version" type="warning">
-  <title>Server Version</title> 
-  <primary>Your server needs to be updated</primary> 
-  <secondary>Some features may not work correctly with your current server version</secondary>
- </error>
-
-</error-list>
diff --git a/addressbook/addressbook-errors.xml.h b/addressbook/addressbook-errors.xml.h
deleted file mode 100644
index 69f5077682..0000000000
--- a/addressbook/addressbook-errors.xml.h
+++ /dev/null
@@ -1,68 +0,0 @@
-/* addressbook:ldap-init primary */
-char *s = N_("This addressbook could not be opened.");
-/* addressbook:ldap-init secondary */
-char *s = N_("This addressbook server might be unreachable or the server name may be misspelled or your network connection could be down.");
-/* addressbook:ldap-auth primary */
-char *s = N_("Failed to authenticate with LDAP server.");
-/* addressbook:ldap-auth secondary */
-char *s = N_("Check to make sure your password is spelled correctly and that you are using a supported login method. Remember that many passwords are case sensitive; your caps lock might be on.");
-/* addressbook:ldap-search-base primary */
-char *s = N_("This addressbook server does not have any suggested search bases.");
-/* addressbook:ldap-search-base secondary */
-char *s = N_("This LDAP server may use an older version of LDAP, which does not support this functionality or it may be misconfigured. Ask your administrator for supported search bases.");
-/* addressbook:ldap-v3-schema primary */
-char *s = N_("This server does not support LDAPv3 schema information.");
-/* addressbook:ldap-get-schema primary */
-char *s = N_("Could not get schema information for LDAP server.");
-/* addressbook:ldap-invalid-schema primary */
-char *s = N_("LDAP server did not respond with valid schema information.");
-/* addressbook:remove-addressbook primary */
-char *s = N_("Could not remove addressbook.");
-/* addressbook:ask-delete-addressbook primary */
-char *s = N_("Delete address book '{0}'?");
-/* addressbook:ask-delete-addressbook secondary */
-char *s = N_("This address book will be removed permanently.");
-/* addressbook:edit-categories primary */
-char *s = N_("Category editor not available.");
-/* addressbook:generic-error primary */
-char *s = N_("{0}");
-/* addressbook:generic-error secondary */
-char *s = N_("{1}");
-/* addressbook:load-error title */
-char *s = N_("Unable to open addressbook");
-/* addressbook:load-error primary */
-char *s = N_("Error loading addressbook.");
-/* addressbook:load-error secondary */
-char *s = N_("{0}");
-/* addressbook:search-error primary */
-char *s = N_("Unable to perform search.");
-/* addressbook:search-error secondary */
-char *s = N_("{0}");
-/* addressbook:prompt-save primary */
-char *s = N_("Would you like to save your changes?");
-/* addressbook:prompt-save secondary */
-char *s = N_("You have made modifications to this contact. Do you want to save these changes?");
-char *s = N_("_Discard");
-/* addressbook:prompt-move primary */
-char *s = N_("Cannot move contact.");
-/* addressbook:prompt-move secondary */
-char *s = N_("You are attempting to move a contact from one addressbook to another but it cannot be removed from the source. Do you want to save a copy instead?");
-/* addressbook:save-error primary */
-char *s = N_("Unable to save contact(s).");
-/* addressbook:save-error secondary */
-char *s = N_("Error saving contacts to {0}: {1}");
-/* addressbook:backend-died primary */
-char *s = N_("The Evolution addressbook has quit unexpectedly.");
-/* addressbook:backend-died secondary */
-char *s = N_("Your contacts for {0} will not be available until Evolution is restarted.");
-/* addressbook:ask-list-add-exists primary */
-char *s = N_("Address '{0}' already exists.");
-/* addressbook:ask-list-add-exists secondary */
-char *s = N_("A contact already exists with this address.  Would you like to add a new card with the same address anyway?");
-char *s = N_("_Add");
-/* addressbook:server-version title */
-char *s = N_("Server Version");
-/* addressbook:server-version primary */
-char *s = N_("Your server needs to be updated");
-/* addressbook:server-version secondary */
-char *s = N_("Some features may not work correctly with your current server version");
diff --git a/addressbook/conduit/.cvsignore b/addressbook/conduit/.cvsignore
deleted file mode 100644
index 594beaac72..0000000000
--- a/addressbook/conduit/.cvsignore
+++ /dev/null
@@ -1,9 +0,0 @@
-.deps
-.libs
-*.lo
-Makefile.in
-Makefile
-libeaddress_conduit.la
-e-address-conduit-control-applet
-e-address-conduit-control-applet.desktop
-e-address*.conduit
diff --git a/addressbook/conduit/Makefile.am b/addressbook/conduit/Makefile.am
deleted file mode 100644
index f93b9bce1b..0000000000
--- a/addressbook/conduit/Makefile.am
+++ /dev/null
@@ -1,41 +0,0 @@
-INCLUDES = 					\
-	-I$(top_srcdir)				\
-	-I$(top_srcdir)/addressbook		\
-	-I$(top_srcdir)/addressbook/backend	\
-	-I$(top_builddir)/addressbook/backend	\
-	-I$(top_srcdir)/e-util			\
-	-I$(top_builddir)/e-util		\
-	-I$(top_srcdir)/widgets/misc		\
-	-I$(top_builddir)/widgets/misc		\
-	$(EVOLUTION_ADDRESSBOOK_CONDUIT_CFLAGS)
-
-# Address Conduit
-privconduit_LTLIBRARIES = libeaddress_conduit.la
-
-libeaddress_conduit_la_SOURCES = \
-	address-conduit.c
-
-libeaddress_conduit_la_LDFLAGS = -module -avoid-version
-libeaddress_conduit_la_LIBADD = 					\
-	$(top_builddir)/e-util/libeutil.la				\
-	$(top_builddir)/e-util/libeconduit.la		 		\
-	$(top_builddir)/widgets/misc/libemiscwidgets.la		 	\
-	$(EVOLUTION_ADDRESSBOOK_CONDUIT_LIBS)
-
-e-address-$(BASE_VERSION).conduit: e-address.conduit.in
-	sed -e 's^\@privconduitdir\@^$(privconduitdir)^g' 		\
-	    -e 's^\@datadir\@^$(datadir)^g' 				\
-	    -e 's^\@BASE_VERSION\@^$(BASE_VERSION)^g' 			\
-	    $< > $@
-
-conduitdir = $(datadir)/gnome-pilot/conduits/
-conduit_DATA = e-address-$(BASE_VERSION).conduit
-
-BUILT_SOURCES = $(conduit_DATA)
-CLEANFILES = $(BUILT_SOURCES)
-
-EXTRA_DIST = \
-	e-address.conduit.in
-
-dist-hook:
-	cd $(distdir); rm -f $(BUILT_SOURCES)
diff --git a/addressbook/conduit/address-conduit.c b/addressbook/conduit/address-conduit.c
deleted file mode 100644
index 15573c190b..0000000000
--- a/addressbook/conduit/address-conduit.c
+++ /dev/null
@@ -1,1766 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-/* Evolution addressbook - Address Conduit
- *
- * Copyright (C) 1998 Free Software Foundation
- * Copyright (C) 2000 Ximian, Inc.
- *
- * Authors: Eskil Heyn Olsen <deity@eskil.dk> 
- *          JP Rosevear <jpr@ximian.com>
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of version 2 of the GNU General Public
- * License as published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307, USA.
- */
-
-
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
-
-#define G_LOG_DOMAIN "eaddrconduit"
-
-#include <bonobo.h>
-#include <libxml/parser.h>
-#include <pi-source.h>
-#include <pi-socket.h>
-#include <pi-dlp.h>
-#include <pi-address.h>
-#include <libebook/e-book.h>
-#include <gpilotd/gnome-pilot-conduit.h>
-#include <gpilotd/gnome-pilot-conduit-sync-abs.h>
-#include <libgpilotdCM/gnome-pilot-conduit-management.h>
-#include <libgpilotdCM/gnome-pilot-conduit-config.h>
-#include <e-dialog-widgets.h>
-#include <e-pilot-map.h>
-#include <e-pilot-settings.h>
-#include <e-pilot-util.h>
-
-GnomePilotConduit * conduit_get_gpilot_conduit (guint32);
-void conduit_destroy_gpilot_conduit (GnomePilotConduit*);
-
-#define CONDUIT_VERSION "0.1.2"
-
-#define DEBUG_CONDUIT 1
-/* #undef DEBUG_CONDUIT */
-
-#ifdef DEBUG_CONDUIT
-#define LOG(x) x
-#else
-#define LOG(x)
-#endif 
-
-#define WARN g_warning
-#define INFO g_message
-
-enum {
-	LABEL_WORK,
-	LABEL_HOME,
-	LABEL_FAX,
-	LABEL_OTHER,
-	LABEL_EMAIL,
-	LABEL_MAIN,
-	LABEL_PAGER,
-	LABEL_MOBILE
-};
-
-static EContactField priority [] = {
-	E_CONTACT_PHONE_BUSINESS,
-	E_CONTACT_PHONE_HOME,
-	E_CONTACT_PHONE_BUSINESS_FAX,
-	E_CONTACT_EMAIL_1,
-	E_CONTACT_PHONE_PAGER,
-	E_CONTACT_PHONE_MOBILE,
-	E_CONTACT_PHONE_BUSINESS_2,
-	E_CONTACT_PHONE_HOME_2,
-	E_CONTACT_PHONE_HOME_FAX,
-	E_CONTACT_EMAIL_2,
-	E_CONTACT_PHONE_OTHER,
-	E_CONTACT_PHONE_PRIMARY,
-	E_CONTACT_PHONE_OTHER_FAX,
-	E_CONTACT_EMAIL_3,
-	E_CONTACT_FIELD_LAST
-};
-
-static int priority_label [] = {
-	LABEL_WORK,
-	LABEL_HOME,
-	LABEL_FAX,
-	LABEL_EMAIL,
-	LABEL_PAGER,
-	LABEL_MOBILE,
-	LABEL_WORK,
-	LABEL_HOME,
-	LABEL_FAX,
-	LABEL_EMAIL,
-	LABEL_OTHER,
-	LABEL_MAIN,
-	LABEL_FAX,
-	LABEL_EMAIL,
-	-1
-};
-
-typedef struct _EAddrLocalRecord EAddrLocalRecord;
-typedef struct _EAddrConduitCfg EAddrConduitCfg;
-typedef struct _EAddrConduitGui EAddrConduitGui;
-typedef struct _EAddrConduitContext EAddrConduitContext;
-
-/* Local Record */
-struct _EAddrLocalRecord {
-	/* The stuff from gnome-pilot-conduit-standard-abs.h
-	   Must be first in the structure, or instances of this
-	   structure cannot be used by gnome-pilot-conduit-standard-abs.
-	*/
-	GnomePilotDesktopRecord local;
-
-	/* The corresponding ECard object */
-	EContact *contact;
-
-        /* pilot-link address structure, used for implementing Transmit. */
-	struct Address *addr;
-};
-
-
-static void
-addrconduit_destroy_record (EAddrLocalRecord *local) 
-{
-	g_object_unref (local->contact);
-	free_Address (local->addr);
-	g_free (local->addr);
-	g_free (local);
-}
-
-/* Configuration */
-struct _EAddrConduitCfg {
-	guint32 pilot_id;
-	GnomePilotConduitSyncType  sync_type;
-
-	ESourceList *source_list;
-	ESource *source;
-	gboolean secret;
-	EContactField default_address;
-
-	gchar *last_uri;
-};
-
-static EAddrConduitCfg *
-addrconduit_load_configuration (guint32 pilot_id) 
-{
-	EAddrConduitCfg *c;
-	GnomePilotConduitManagement *management;
-	GnomePilotConduitConfig *config;
-	gchar *address, prefix[256];
-	g_snprintf (prefix, 255, "/gnome-pilot.d/e-address-conduit/Pilot_%u/",
-		    pilot_id);
-	
-	c = g_new0 (EAddrConduitCfg,1);
-	g_assert (c != NULL);
-
-	c->pilot_id = pilot_id;
-	management = gnome_pilot_conduit_management_new ("e_address_conduit", GNOME_PILOT_CONDUIT_MGMT_ID);
-	gtk_object_ref (GTK_OBJECT (management));
-	gtk_object_sink (GTK_OBJECT (management));
-	config = gnome_pilot_conduit_config_new (management, pilot_id);
-	gtk_object_ref (GTK_OBJECT (config));
-	gtk_object_sink (GTK_OBJECT (config));
-	if (!gnome_pilot_conduit_config_is_enabled (config, &c->sync_type))
-		c->sync_type = GnomePilotConduitSyncTypeNotSet;
-	gtk_object_unref (GTK_OBJECT (config));
-	gtk_object_unref (GTK_OBJECT (management));
-
-	/* Custom settings */
-	gnome_config_push_prefix (prefix);
-
-	if (!e_book_get_addressbooks (&c->source_list, NULL))
-		c->source_list = NULL;
-	if (c->source_list) {
-		c->source = e_pilot_get_sync_source (c->source_list);
-		if (!c->source)
-			c->source = e_source_list_peek_source_any (c->source_list);
-		if (c->source) {
-			g_object_ref (c->source);
-		} else {
-			g_object_unref (c->source_list);
-			c->source_list = NULL;
-		}
-	}
-	
-	c->secret = gnome_config_get_bool ("secret=FALSE");
-	address = gnome_config_get_string ("default_address=business");
-	if (!strcmp (address, "business"))
-		c->default_address = E_CONTACT_ADDRESS_WORK;
-	else if (!strcmp (address, "home"))
-		c->default_address = E_CONTACT_ADDRESS_HOME;
-	else if (!strcmp (address, "other"))
-		c->default_address = E_CONTACT_ADDRESS_OTHER;
-	g_free (address);
-	c->last_uri = gnome_config_get_string ("last_uri");
-
-	gnome_config_pop_prefix ();
-
-	return c;
-}
-
-static void
-addrconduit_save_configuration (EAddrConduitCfg *c) 
-{
-	gchar prefix[256];
-
-	g_snprintf (prefix, 255, "/gnome-pilot.d/e-address-conduit/Pilot_%u/",
-		    c->pilot_id);
-
-	gnome_config_push_prefix (prefix);
-	e_pilot_set_sync_source (c->source_list, c->source);
-	gnome_config_set_bool ("secret", c->secret);
-	switch (c->default_address) {
-	case E_CONTACT_ADDRESS_WORK:
-		gnome_config_set_string ("default_address", "business");
-		break;
-	case E_CONTACT_ADDRESS_HOME:
-		gnome_config_set_string ("default_address", "home");
-		break;
-	case E_CONTACT_ADDRESS_OTHER:
-		gnome_config_set_string ("default_address", "other");
-		break;
-	default:
-		g_warning ("Unknown default_address value");
-	}
-	gnome_config_set_string ("last_uri", c->last_uri);
-	gnome_config_pop_prefix ();
-
-	gnome_config_sync ();
-	gnome_config_drop_all ();
-}
-
-static EAddrConduitCfg*
-addrconduit_dupe_configuration (EAddrConduitCfg *c) 
-{
-	EAddrConduitCfg *retval;
-
-	g_return_val_if_fail (c != NULL, NULL);
-
-	retval = g_new0 (EAddrConduitCfg, 1);
-	retval->sync_type = c->sync_type;
-	retval->pilot_id = c->pilot_id;
-
-	if (c->source_list)	
-		retval->source_list = g_object_ref (c->source_list);
-	if (c->source)
-		retval->source = g_object_ref (c->source);
-	retval->secret = c->secret;
-	retval->default_address = c->default_address;
-	retval->last_uri = g_strdup (c->last_uri);
-
-	return retval;
-}
-
-static void 
-addrconduit_destroy_configuration (EAddrConduitCfg *c) 
-{
-	g_return_if_fail (c != NULL);
-
-	g_object_unref (c->source_list);
-	g_object_unref (c->source);
-	g_free (c->last_uri);
-	g_free (c);
-}
-
-/* Gui */
-struct _EAddrConduitGui {
-	GtkWidget *default_address;
-};
-
-static EAddrConduitGui *
-e_addr_gui_new (EPilotSettings *ps) 
-{
-	EAddrConduitGui *gui;
-	GtkWidget *lbl, *menu;
-	gint rows, i;
-	static const char *items[] = {"Business", "Home", "Other", NULL};
-	
-	g_return_val_if_fail (ps != NULL, NULL);
-	g_return_val_if_fail (E_IS_PILOT_SETTINGS (ps), NULL);
-
-	gtk_table_resize (GTK_TABLE (ps), E_PILOT_SETTINGS_TABLE_ROWS + 1, 
-			  E_PILOT_SETTINGS_TABLE_COLS);
-
-	gui = g_new0 (EAddrConduitGui, 1);
-
-	rows = E_PILOT_SETTINGS_TABLE_ROWS;
-	lbl = gtk_label_new (_("Default Sync Address:"));
-	gtk_misc_set_alignment (GTK_MISC (lbl), 0.0, 0.5);
-	gui->default_address = gtk_option_menu_new ();
-	menu = gtk_menu_new ();
-	for (i = 0; items[i] != NULL; i++) {
-		GtkWidget *item;
-
-		item = gtk_menu_item_new_with_label (items[i]);
-		gtk_widget_show (item);
-		
-		gtk_menu_append (GTK_MENU (menu), item);
-	}
-	gtk_widget_show (menu);
-	gtk_option_menu_set_menu (GTK_OPTION_MENU (gui->default_address), menu);
-	gtk_table_attach_defaults (GTK_TABLE (ps), lbl, 0, 1, rows, rows + 1);
-        gtk_table_attach_defaults (GTK_TABLE (ps), gui->default_address, 1, 2, rows, rows + 1);
-	gtk_widget_show (lbl);
-	gtk_widget_show (gui->default_address);
-	
-	return gui;
-}
-
-static const int default_address_map[] = {
-	E_CONTACT_ADDRESS_WORK,
-	E_CONTACT_ADDRESS_HOME,
-	E_CONTACT_ADDRESS_OTHER,
-	-1
-};
-
-static void
-e_addr_gui_fill_widgets (EAddrConduitGui *gui, EAddrConduitCfg *cfg) 
-{
-	g_return_if_fail (gui != NULL);
-	g_return_if_fail (cfg != NULL);
-
-	e_dialog_option_menu_set (gui->default_address, 
-				  cfg->default_address, 
-				  default_address_map);
-}
-
-static void
-e_addr_gui_fill_config (EAddrConduitGui *gui, EAddrConduitCfg *cfg) 
-{
-	g_return_if_fail (gui != NULL);
-	g_return_if_fail (cfg != NULL);
-
-	cfg->default_address = e_dialog_option_menu_get (gui->default_address, 
-							 default_address_map);
-}
-
-static void
-e_addr_gui_destroy (EAddrConduitGui *gui) 
-{
-	g_free (gui);
-}
-
-/* Context */
-struct _EAddrConduitContext {
-	GnomePilotDBInfo *dbi;
-
-	EAddrConduitCfg *cfg;
-	EAddrConduitCfg *new_cfg;
-	EAddrConduitGui *gui;
-	GtkWidget *ps;
-	
-	struct AddressAppInfo ai;
-
-	EBook *ebook;
-	GList *cards;
-	GList *changed;
-	GHashTable *changed_hash;
-	GList *locals;
-
-	EPilotMap *map;
-};
-
-static EAddrConduitContext *
-e_addr_context_new (guint32 pilot_id) 
-{
-	EAddrConduitContext *ctxt = g_new0 (EAddrConduitContext, 1);
-
-	ctxt->cfg = addrconduit_load_configuration (pilot_id);
-	ctxt->new_cfg = addrconduit_dupe_configuration (ctxt->cfg);
-	ctxt->gui = NULL;
-	ctxt->ps = NULL;
-	ctxt->ebook = NULL;
-	ctxt->cards = NULL;
-	ctxt->changed_hash = NULL;
-	ctxt->changed = NULL;
-	ctxt->locals = NULL;
-	ctxt->map = NULL;
-
-	return ctxt;
-}
-
-static void
-e_addr_context_destroy (EAddrConduitContext *ctxt)
-{
-	GList *l;
-	
-	g_return_if_fail (ctxt != NULL);
-
-	if (ctxt->cfg != NULL)
-		addrconduit_destroy_configuration (ctxt->cfg);
-	if (ctxt->new_cfg != NULL)
-		addrconduit_destroy_configuration (ctxt->new_cfg);
-	if (ctxt->gui != NULL)
-		e_addr_gui_destroy (ctxt->gui);
-	
-	if (ctxt->ebook != NULL)
-		g_object_unref (ctxt->ebook);
-
-	if (ctxt->cards != NULL) {
-		for (l = ctxt->cards; l != NULL; l = l->next)
-			g_object_unref (l->data);
-		g_list_free (ctxt->cards);
-	}
-	
-	if (ctxt->changed_hash != NULL)
-		g_hash_table_destroy (ctxt->changed_hash);
-	
-	if (ctxt->changed != NULL)
-		e_book_free_change_list (ctxt->changed);
-	
-	if (ctxt->locals != NULL) {
-		for (l = ctxt->locals; l != NULL; l = l->next)
-			addrconduit_destroy_record (l->data);
-		g_list_free (ctxt->locals);
-	}
-
-	if (ctxt->map != NULL)
-		e_pilot_map_destroy (ctxt->map);
-
-	g_free (ctxt);
-}
-
-/* Debug routines */
-static char *
-print_local (EAddrLocalRecord *local)
-{
-	static char buff[ 4096 ];
-
-	if (local == NULL) {
-		sprintf (buff, "[NULL]");
-		return buff;
-	}
-
-	if (local->addr) {
-		g_snprintf (buff, 4096, "['%s' '%s' '%s']",
-			    local->addr->entry[entryLastname] ?
-			    local->addr->entry[entryLastname] : "",
-			    local->addr->entry[entryFirstname] ?
-			    local->addr->entry[entryFirstname] : "",
-			    local->addr->entry[entryCompany] ?
-			    local->addr->entry[entryCompany] : "");
-		return buff;
-	}
-
-	return "";
-}
-
-static char *print_remote (GnomePilotRecord *remote)
-{
-	static char buff[ 4096 ];
-	struct Address addr;
-
-	if (remote == NULL) {
-		sprintf (buff, "[NULL]");
-		return buff;
-	}
-
-	memset (&addr, 0, sizeof (struct Address));
-	unpack_Address (&addr, remote->record, remote->length);
-
-	g_snprintf (buff, 4096, "['%s' '%s' '%s']",
-		    addr.entry[entryLastname] ?
-		    addr.entry[entryLastname] : "",
-		    addr.entry[entryFirstname] ?
-		    addr.entry[entryFirstname] : "",
-		    addr.entry[entryCompany] ?
-		    addr.entry[entryCompany] : "");
-
-	free_Address (&addr);
-
-	return buff;
-}
-
-/* Utility routines */
-static char *
-map_name (EAddrConduitContext *ctxt) 
-{
-	char *filename = NULL;
-	
-	filename = g_strdup_printf ("%s/.evolution/addressbook/local/system/pilot-map-%d.xml", g_get_home_dir (), ctxt->cfg->pilot_id);
-	
-	return filename;
-}
-
-static GList *
-next_changed_item (EAddrConduitContext *ctxt, GList *changes) 
-{
-	EBookChange *ebc;
-	GList *l;
-	
-	for (l = changes; l != NULL; l = l->next) {		
-		ebc = l->data;
-		
-		if (g_hash_table_lookup (ctxt->changed_hash, e_contact_get_const (ebc->contact, E_CONTACT_UID)))
-			return l;
-	}
-	
-	return NULL;
-}
-
-static EContactField
-get_next_mail (EContactField *field)
-{
-	if (field == NULL)
-		return E_CONTACT_EMAIL_1;
-	
-	switch (*field) {
-	case E_CONTACT_EMAIL_1:
-		return E_CONTACT_EMAIL_2;
-	case E_CONTACT_EMAIL_2:
-		return E_CONTACT_EMAIL_3;
-	default:
-		break;
-	}
-
-	return E_CONTACT_FIELD_LAST;
-}
-
-static EContactField
-get_next_home (EContactField *field)
-{
-	if (field == NULL)
-		return E_CONTACT_PHONE_HOME;
-	
-	switch (*field) {
-	case E_CONTACT_PHONE_HOME:
-		return E_CONTACT_PHONE_HOME_2;
-	default:
-		break;
-	}
-
-	return E_CONTACT_FIELD_LAST;
-}
-
-static EContactField
-get_next_work (EContactField *field)
-{
-	if (field == NULL)
-		return E_CONTACT_PHONE_BUSINESS;
-	
-	switch (*field) {
-	case E_CONTACT_PHONE_BUSINESS:
-		return E_CONTACT_PHONE_BUSINESS_2;
-	default:
-		break;
-	}
-
-	return E_CONTACT_FIELD_LAST;
-}
-
-static EContactField
-get_next_fax (EContactField *field)
-{
-	if (field == NULL)
-		return E_CONTACT_PHONE_BUSINESS_FAX;
-	
-	switch (*field) {
-	case E_CONTACT_PHONE_BUSINESS_FAX:
-		return E_CONTACT_PHONE_HOME_FAX;
-	case E_CONTACT_PHONE_HOME_FAX:
-		return E_CONTACT_PHONE_OTHER_FAX;
-	default:
-		break;
-	}
-
-	return E_CONTACT_FIELD_LAST;
-}
-
-static EContactField
-get_next_other (EContactField *field)
-{
-	if (field == NULL)
-		return E_CONTACT_PHONE_OTHER;
-
-	return E_CONTACT_FIELD_LAST;
-}
-
-static EContactField
-get_next_main (EContactField *field)
-{
-	if (field == NULL)
-		return E_CONTACT_PHONE_PRIMARY;
-
-	return E_CONTACT_FIELD_LAST;
-}
-
-static EContactField
-get_next_pager (EContactField *field)
-{
-	if (field == NULL)
-		return E_CONTACT_PHONE_PAGER;
-
-	return E_CONTACT_FIELD_LAST;
-}
-
-static EContactField
-get_next_mobile (EContactField *field)
-{
-	if (field == NULL)
-		return E_CONTACT_PHONE_MOBILE;
-
-	return E_CONTACT_FIELD_LAST;
-}
-
-static void
-get_next_init (EContactField *next_mail,
-	       EContactField *next_home,
-	       EContactField *next_work,
-	       EContactField *next_fax,
-	       EContactField *next_other,
-	       EContactField *next_main,
-	       EContactField *next_pager,
-	       EContactField *next_mobile)
-{	
-	*next_mail = get_next_mail (NULL);
-	*next_home = get_next_home (NULL);
-	*next_work = get_next_work (NULL);
-	*next_fax = get_next_fax (NULL);
-	*next_other = get_next_other (NULL);
-	*next_main = get_next_main (NULL);
-	*next_pager = get_next_pager (NULL);
-	*next_mobile = get_next_mobile (NULL);
-}
-
-static gboolean
-is_next_done (EContactField field)
-{
-	if (field == E_CONTACT_FIELD_LAST)
-		return TRUE;
-	
-	return FALSE;
-}
-
-static gboolean
-is_syncable (EAddrConduitContext *ctxt, EAddrLocalRecord *local) 
-{	
-	EContactField next_mail, next_home, next_work, next_fax;
-	EContactField next_other, next_main, next_pager, next_mobile;
-	gboolean syncable = TRUE;
-	int i, l = 0;
-
-	/* See if there are fields we can't sync or not in priority order */
-	get_next_init (&next_mail, &next_home, &next_work, &next_fax,
-		       &next_other, &next_main, &next_pager, &next_mobile);
-	
-	for (i = entryPhone1; i <= entryPhone5 && syncable; i++) {
-		int phonelabel = local->addr->phoneLabel[i - entryPhone1];
-		const char *phone_str = local->addr->entry[i];
-		gboolean empty = !(phone_str && *phone_str);
-		
-		if (empty)
-			continue;
-		
-		for ( ; priority_label[l] != -1; l++)
-			if (phonelabel == priority_label[l])
-				break;
-
-		if (priority_label[l] == -1) {
-			syncable = FALSE;
-			continue;
-		}
-		
-		if (phonelabel == LABEL_EMAIL) {
-			if (is_next_done (next_mail) || next_mail != priority[l]) {
-				syncable = FALSE;
-				break;
-			}
-			next_mail = get_next_mail (&next_mail);
-		} else if (phonelabel == LABEL_HOME) {
-			if (is_next_done (next_home) || next_home != priority[l]) {
-				syncable = FALSE;
-				break;
-			}
-			next_home = get_next_home (&next_home);
-		} else if (phonelabel == LABEL_WORK) {
-			if (is_next_done (next_work) || next_work != priority[l]) {
-				syncable = FALSE;
-				break;
-			}
-			next_work = get_next_work (&next_work);
-		} else if (phonelabel == LABEL_FAX) {
-			if (is_next_done (next_fax) || next_fax != priority[l]) {
-				syncable = FALSE;
-				break;
-			}
-			next_fax = get_next_fax (&next_fax);
-		} else if (phonelabel == LABEL_OTHER) {
-			if (is_next_done (next_other) || next_other != priority[l]) {
-				syncable = FALSE;
-				break;
-			}
-			next_other = get_next_other (&next_other);
-		} else if (phonelabel == LABEL_MAIN) {
-			if (is_next_done (next_main) || next_main != priority[l]) {
-				syncable = FALSE;
-				break;
-			}
-			next_main = get_next_main (&next_main);
-		} else if (phonelabel == LABEL_PAGER) {
-			if (is_next_done (next_pager) || next_pager != priority[l]) {
-				syncable = FALSE;
-				break;
-			}
-			next_pager = get_next_pager (&next_pager);
-		} else if (phonelabel == LABEL_MOBILE) {
-			if (is_next_done (next_mobile) || next_mobile != priority[l]) {
-				syncable = FALSE;
-				break;
-			}
-			next_mobile = get_next_mobile (&next_mobile);
-		}
-	}
-
-	return syncable;
-}
-
-static void
-set_contact_text (EContact *contact, EContactField field, struct Address address, int entry)
-{
-	char *text = NULL;
-	
-	if (address.entry[entry])
-		text = e_pilot_utf8_from_pchar (address.entry[entry]);
-
-	e_contact_set (contact, field, text);
-	
-	g_free (text);
-}
-
-static char *
-get_entry_text (struct Address address, int entry)
-{
-	if (address.entry[entry])
-		return e_pilot_utf8_from_pchar (address.entry[entry]);
-
-	return NULL;	
-}
-
-static void
-clear_entry_text (struct Address address, int field) 
-{
-	if (address.entry[field]) {
-		free (address.entry[field]);
-		address.entry[field] = NULL;
-	}
-}
-
-static void
-compute_status (EAddrConduitContext *ctxt, EAddrLocalRecord *local, const char *uid)
-{
-	EBookChange *ebc;
-
-	local->local.archived = FALSE;
-	local->local.secret = FALSE;
-
-	ebc = g_hash_table_lookup (ctxt->changed_hash, uid);
-	
-	if (ebc == NULL) {
-		local->local.attr = GnomePilotRecordNothing;
-		return;
-	}
-	
-	switch (ebc->change_type) {
-	case E_BOOK_CHANGE_CARD_ADDED:
-		local->local.attr = GnomePilotRecordNew;
-		break;	
-	case E_BOOK_CHANGE_CARD_MODIFIED:
-		local->local.attr = GnomePilotRecordModified;
-		break;
-	case E_BOOK_CHANGE_CARD_DELETED:
-		local->local.attr = GnomePilotRecordDeleted;
-		break;
-	}
-}
-
-static GnomePilotRecord
-local_record_to_pilot_record (EAddrLocalRecord *local,
-			      EAddrConduitContext *ctxt)
-{
-	GnomePilotRecord p;
-	static char record[0xffff];
-	
-	g_assert (local->addr != NULL );
-	
-	LOG (g_message ( "local_record_to_pilot_record\n" ));
-
-	p.ID = local->local.ID;
-	p.category = local->local.category;
-	p.attr = local->local.attr;
-	p.archived = local->local.archived;
-	p.secret = local->local.secret;
-
-	/* Generate pilot record structure */
-	p.record = record;
-	p.length = pack_Address (local->addr, p.record, 0xffff);
-
-	return p;	
-}
-
-static void
-local_record_from_ecard (EAddrLocalRecord *local, EContact *contact, EAddrConduitContext *ctxt)
-{
-	EContactAddress *address = NULL;
-	int phone = entryPhone1;
-	EContactField field;
-	gboolean syncable;
-	int i;
-	
-	g_return_if_fail (local != NULL);
-	g_return_if_fail (contact != NULL);
-
-	local->contact = g_object_ref (contact);
-	local->local.ID = e_pilot_map_lookup_pid (ctxt->map, e_contact_get_const (contact, E_CONTACT_UID), TRUE);
-
-	compute_status (ctxt, local, e_contact_get_const (contact, E_CONTACT_UID));
-
-	local->addr = g_new0 (struct Address, 1);
-
-	/* Handle the fields and category we don't sync by making sure
-         * we don't overwrite them 
-	 */
-	if (local->local.ID != 0) {
-		struct Address addr;
-		char record[0xffff];
-		int cat = 0;
-		
-		if (dlp_ReadRecordById (ctxt->dbi->pilot_socket, 
-					ctxt->dbi->db_handle,
-					local->local.ID, &record, 
-					NULL, NULL, NULL, &cat) > 0) {
-			local->local.category = cat;
-			memset (&addr, 0, sizeof (struct Address));
-			unpack_Address (&addr, record, 0xffff);
-			for (i = 0; i < 5; i++) {
-				if (addr.entry[entryPhone1 + i])
-					local->addr->entry[entryPhone1 + i] = 
-						strdup (addr.entry[entryPhone1 + i]);
-				local->addr->phoneLabel[i] = addr.phoneLabel[i];
-			}
-			local->addr->showPhone = addr.showPhone;
-			for (i = 0; i < 4; i++) {
-				if (addr.entry[entryCustom1 + i])
-					local->addr->entry[entryCustom1 + i] = 
-						strdup (addr.entry[entryCustom1 + i]);
-			}
-			free_Address (&addr);
-		}
-	}
-
-	local->addr->entry[entryFirstname] = e_pilot_utf8_to_pchar (e_contact_get_const (contact, E_CONTACT_GIVEN_NAME));
-	local->addr->entry[entryLastname] = e_pilot_utf8_to_pchar (e_contact_get_const (contact, E_CONTACT_FAMILY_NAME));
-	local->addr->entry[entryCompany] = e_pilot_utf8_to_pchar (e_contact_get_const (contact, E_CONTACT_ORG));
-	local->addr->entry[entryTitle] = e_pilot_utf8_to_pchar (e_contact_get_const (contact, E_CONTACT_TITLE));
-	
-	/* See if the default has something in it */
-	if ((address = e_contact_get (contact, ctxt->cfg->default_address))) {
-		field = ctxt->cfg->default_address;
-	} else {
-		/* Try to find a non-empty address field */
-		for (field = E_CONTACT_FIRST_ADDRESS_ID; field <= E_CONTACT_LAST_ADDRESS_ID; field++) {
-			if ((address = e_contact_get (contact, field)))
-				break;
-		}
-	}
-	
-	if (address) {
-		char *add;
-		
-		/* If the address has 2 lines, make sure both get added */
-		if (address->ext != NULL)
-			add = g_strconcat (address->street, "\n", address->ext, NULL);
-		else
-			add = g_strdup (address->street);
-		local->addr->entry[entryAddress] = e_pilot_utf8_to_pchar (add);
-		g_free (add);
-		
-		local->addr->entry[entryCity] = e_pilot_utf8_to_pchar (address->locality);
-		local->addr->entry[entryState] = e_pilot_utf8_to_pchar (address->region);
-		local->addr->entry[entryZip] = e_pilot_utf8_to_pchar (address->code);
-		local->addr->entry[entryCountry] = e_pilot_utf8_to_pchar (address->country);
-		
-		e_contact_address_free (address);
-	}
-	
-	/* Phone numbers */
-
-	/* See if everything is syncable */
-	syncable = is_syncable (ctxt, local);
-	
-	if (syncable) {
-		INFO ("Syncable");
-
-		/* Sync by priority */
-		for (i = 0, phone = entryPhone1; 
-		     priority[i] != E_CONTACT_FIELD_LAST && phone <= entryPhone5; i++) {
-			const char *phone_str;
-			
-			phone_str = e_contact_get_const (contact, priority[i]);
-			if (phone_str && *phone_str) {
-				clear_entry_text (*local->addr, phone);
-				local->addr->entry[phone] = e_pilot_utf8_to_pchar (phone_str);
-				local->addr->phoneLabel[phone - entryPhone1] = priority_label[i];
-				phone++;
-			}
-		}
-		for ( ; phone <= entryPhone5; phone++)
-			local->addr->phoneLabel[phone - entryPhone1] = phone - entryPhone1;
-		local->addr->showPhone = 0;
-	} else {
-		EContactField next_mail, next_home, next_work, next_fax;
-		EContactField next_other, next_main, next_pager, next_mobile;
-
-		INFO ("Not Syncable");
-		get_next_init (&next_mail, &next_home, &next_work, &next_fax,
-			       &next_other, &next_main, &next_pager, &next_mobile);
-
-		/* Not completely syncable, so do the best we can */
-		for (i = entryPhone1; i <= entryPhone5; i++) {
-			int phonelabel = local->addr->phoneLabel[i - entryPhone1];
-			const char *phone_str = NULL;
-			
-			if (phonelabel == LABEL_EMAIL && !is_next_done (next_mail)) {
-				phone_str = e_contact_get_const (contact, next_mail);
-				next_mail = get_next_mail (&next_mail);
-			} else if (phonelabel == LABEL_HOME && !is_next_done (next_home)) {
-  				phone_str = e_contact_get_const (contact, next_home);
-				next_home = get_next_home (&next_home);
-			} else if (phonelabel == LABEL_WORK && !is_next_done (next_work)) {
-				phone_str = e_contact_get_const (contact, next_work);
-				next_work = get_next_work (&next_work);
-			} else if (phonelabel == LABEL_FAX && !is_next_done (next_fax)) {
-				phone_str = e_contact_get_const (contact, next_fax);
-				next_fax = get_next_fax (&next_fax);
-			} else if (phonelabel == LABEL_OTHER && !is_next_done (next_other)) {
-				phone_str = e_contact_get_const (contact, next_other);
-				next_other = get_next_other (&next_other);
-			} else if (phonelabel == LABEL_MAIN && !is_next_done (next_main)) {
-				phone_str = e_contact_get_const (contact, next_main);
-				next_main = get_next_main (&next_main);
-			} else if (phonelabel == LABEL_PAGER && !is_next_done (next_pager)) {
-				phone_str = e_contact_get_const (contact, next_pager);
-				next_pager = get_next_pager (&next_pager);
-			} else if (phonelabel == LABEL_MOBILE && !is_next_done (next_mobile)) {
-				phone_str = e_contact_get_const (contact, next_mobile);
-				next_mobile = get_next_mobile (&next_mobile);
-			}
-			
-			if (phone_str && *phone_str) {
-				clear_entry_text (*local->addr, i);
-				local->addr->entry[i] = e_pilot_utf8_to_pchar (phone_str);
-			}
-		}
-	}
-	
-	/* Note */
-	local->addr->entry[entryNote] = e_pilot_utf8_to_pchar (e_contact_get_const (contact, E_CONTACT_NOTE));
-}
-
-static void 
-local_record_from_uid (EAddrLocalRecord *local,
-		       const char *uid,
-		       EAddrConduitContext *ctxt)
-{
-	EContact *contact = NULL;
-	const char *cuid;
-	GList *l;
-	
-	g_assert (local != NULL);
-
-	for (l = ctxt->cards; l != NULL; l = l->next) {
-		contact = l->data;
-		
-		/* FIXME Do we need to check for the empty string? */
-		if ((cuid = e_contact_get_const (contact, E_CONTACT_UID)) && !strcmp (cuid, uid))
-			break;
-
-		contact = NULL;
-	}
-
-	if (contact != NULL) {
-		local_record_from_ecard (local, contact, ctxt);
-	} else {
-		contact = e_contact_new ();
-		e_contact_set (contact, E_CONTACT_UID, (gpointer) uid);
-		local_record_from_ecard (local, contact, ctxt);
-		g_object_unref (contact);
-	}
-}
-
-static EContact *
-ecard_from_remote_record(EAddrConduitContext *ctxt,
-			 GnomePilotRecord *remote,
-			 EContact *in_contact)
-{
-	struct Address address;
-	EContact *contact;
-	EContactName *name;
-	EContactAddress *eaddress;
-	EContactField mailing_address;
-	char *txt, *find, *full_name;
-	EContactField next_mail, next_home, next_work, next_fax;
-	EContactField next_other, next_main, next_pager, next_mobile;
-	int i;
-
-	g_return_val_if_fail(remote!=NULL,NULL);
-	memset (&address, 0, sizeof (struct Address));
-	unpack_Address (&address, remote->record, remote->length);
-
-	if (in_contact == NULL)
-		contact = e_contact_new ();
-	else
-		contact = e_contact_duplicate (in_contact);
-
-	/* Name */
-	name = e_contact_name_new ();
-	name->given = get_entry_text (address, entryFirstname);
-	name->family = get_entry_text (address, entryLastname);
-	
-	full_name = e_contact_name_to_string (name);
-	e_contact_set (contact, E_CONTACT_FULL_NAME, full_name);
-	e_contact_name_free (name);
-	
-	/* File As */
-	if (!full_name || !*full_name)
-		set_contact_text (contact, E_CONTACT_FILE_AS, address, entryCompany);
-	
-	g_free (full_name);
-
-	/* Title and Company */
-	set_contact_text (contact, E_CONTACT_TITLE, address, entryTitle);
-	set_contact_text (contact, E_CONTACT_ORG, address, entryCompany);
-
-	/* Address */
-	mailing_address = -1;
-	if ((eaddress = e_contact_get (contact, ctxt->cfg->default_address))) {
-		mailing_address = ctxt->cfg->default_address;
-		e_contact_address_free (eaddress);
-	} else {
-		for (i = E_CONTACT_FIRST_ADDRESS_ID; i <= E_CONTACT_LAST_ADDRESS_ID; i++) {
-			if ((eaddress = e_contact_get (contact, i))) {
-				e_contact_address_free (eaddress);
-				mailing_address = i;
-				break;
-			}
-		}
-	}
-	
-	if (mailing_address == -1)
-		mailing_address = ctxt->cfg->default_address;
-	
-	eaddress = g_new0 (EContactAddress, 1);
-
-	txt = get_entry_text (address, entryAddress);
-	if (txt && (find = strchr (txt, '\n')) != NULL) {
-		*find = '\0';
-		find++;
-	} else {
-		find = NULL;
-	}
-	
-	eaddress->street = txt;
-	eaddress->ext = find != NULL ? g_strdup (find) : g_strdup ("");
-	eaddress->locality = get_entry_text (address, entryCity);
-	eaddress->region = get_entry_text (address, entryState);
-	eaddress->country = get_entry_text (address, entryCountry);
-	eaddress->code = get_entry_text (address, entryZip);
-	
-	e_contact_set (contact, mailing_address, eaddress);
-	e_contact_address_free (eaddress);
-	
-	/* Phone numbers */
-	get_next_init (&next_mail, &next_home, &next_work, &next_fax,
-		       &next_other, &next_main, &next_pager, &next_mobile);
-
-	for (i = entryPhone1; i <= entryPhone5; i++) {
-		int phonelabel = address.phoneLabel[i - entryPhone1];
-		char *phonenum = get_entry_text (address, i);
-		
-		if (phonelabel == LABEL_EMAIL && !is_next_done (next_mail)) {
-			e_contact_set (contact, next_mail, phonenum);
-			next_mail = get_next_mail (&next_mail);
-		} else if (phonelabel == LABEL_HOME && !is_next_done (next_home)) {
-			e_contact_set (contact, next_home, phonenum);
-			next_home = get_next_home (&next_home);
-		} else if (phonelabel == LABEL_WORK && !is_next_done (next_work)) {
-			e_contact_set (contact, next_work, phonenum);
-			next_work = get_next_work (&next_work);
-		} else if (phonelabel == LABEL_FAX && !is_next_done (next_fax)) {
-			e_contact_set (contact, next_fax, phonenum);
-			next_fax = get_next_fax (&next_fax);
-		} else if (phonelabel == LABEL_OTHER && !is_next_done (next_other)) {
-			e_contact_set (contact, next_other, phonenum);
-			next_other = get_next_other (&next_other);
-		} else if (phonelabel == LABEL_MAIN && !is_next_done (next_main)) {
-			e_contact_set (contact, next_main, phonenum);
-			next_main = get_next_main (&next_main);
-		} else if (phonelabel == LABEL_PAGER && !is_next_done (next_pager)) {
-			e_contact_set (contact, next_pager, phonenum);
-			next_pager = get_next_pager (&next_pager);
-		} else if (phonelabel == LABEL_MOBILE && !is_next_done (next_mobile)) {
-			e_contact_set (contact, next_mobile, phonenum);
-			next_mobile = get_next_mobile (&next_mobile);
-		}
-		
-		g_free (phonenum);
-	}
-
-	/* Note */
-	set_contact_text (contact, E_CONTACT_NOTE, address, entryNote);
-
-	free_Address(&address);
-
-	return contact;
-}
-
-static void
-check_for_slow_setting (GnomePilotConduit *c, EAddrConduitContext *ctxt)
-{
-	GnomePilotConduitStandard *conduit = GNOME_PILOT_CONDUIT_STANDARD (c);
-	int map_count;
-	const char *uri;
-	
-	map_count = g_hash_table_size (ctxt->map->pid_map);	
-	if (map_count == 0)
-		gnome_pilot_conduit_standard_set_slow (conduit, TRUE);
-
-	/* Or if the URI's don't match */
-	uri = e_book_get_uri (ctxt->ebook);
-	LOG (g_message ("  Current URI %s (%s)\n", uri, ctxt->cfg->last_uri ? ctxt->cfg->last_uri : "<NONE>"));
-	if (ctxt->cfg->last_uri != NULL && strcmp (ctxt->cfg->last_uri, uri)) {
-		gnome_pilot_conduit_standard_set_slow (conduit, TRUE);
-		e_pilot_map_clear (ctxt->map);
-	}
-
-	if (gnome_pilot_conduit_standard_get_slow (conduit)) {
-		ctxt->map->write_touched_only = TRUE;
-		LOG (g_message ( "    doing slow sync\n" ));
-	} else {
-		LOG (g_message ( "    doing fast sync\n" ));
-	}
-}
-
-/* Pilot syncing callbacks */
-static gint
-pre_sync (GnomePilotConduit *conduit,
-	  GnomePilotDBInfo *dbi,
-	  EAddrConduitContext *ctxt)
-{
-	GnomePilotConduitSyncAbs *abs_conduit;
-	EBookQuery *query;
-    	GList *l;
-	int len;
-	unsigned char *buf;
-	char *filename;
-	char *change_id;
-	gint num_records, add_records = 0, mod_records = 0, del_records = 0;
-
-	abs_conduit = GNOME_PILOT_CONDUIT_SYNC_ABS (conduit);
-
-	LOG (g_message ( "---------------------------------------------------------\n" ));
-	LOG (g_message ( "pre_sync: Addressbook Conduit v.%s", CONDUIT_VERSION ));
-	/* g_message ("Addressbook Conduit v.%s", CONDUIT_VERSION); */
-
-	ctxt->dbi = dbi;
-	
-	if (ctxt->cfg->source) {
-		ctxt->ebook = e_book_new (ctxt->cfg->source, NULL);
-	} else {
-		ctxt->ebook = e_book_new_default_addressbook (NULL);
-	}
-	if (!ctxt->ebook || !e_book_open (ctxt->ebook, TRUE, NULL)) {
-		WARN(_("Could not load addressbook"));
-		gnome_pilot_conduit_error (conduit, _("Could not load addressbook"));
-		
-		return -1;
-	}
-
-	/* Load the uid <--> pilot id mappings */
-	filename = map_name (ctxt);
-	e_pilot_map_read (filename, &ctxt->map);
-	g_free (filename);
-
-	/* Get a list of all contacts */
-	if (!(query = e_book_query_any_field_contains (""))) {
-		LOG (g_warning ("Failed to get EBookQuery"));
-		return -1;
-	}
-	
-	if (!e_book_get_contacts (ctxt->ebook, query, &ctxt->cards, NULL)) {
-		LOG (g_warning ("Failed to get Contacts"));
-		e_book_query_unref (query);
-		return -1;
-	}
-	
-	e_book_query_unref (query);
-	
-	/* Count and hash the changes */
-	change_id = g_strdup_printf ("pilot-sync-evolution-addressbook-%d", ctxt->cfg->pilot_id);
-	if (!e_book_get_changes (ctxt->ebook, change_id, &ctxt->changed, NULL))
-		return -1;
-	ctxt->changed_hash = g_hash_table_new (g_str_hash, g_str_equal);
-	g_free (change_id);	
-
-	for (l = ctxt->changed; l != NULL; l = l->next) {
-		EBookChange *ebc = l->data;
-		const char *uid;
-		
-		uid = e_contact_get_const (ebc->contact, E_CONTACT_UID);
-		if (!e_pilot_map_uid_is_archived (ctxt->map, uid)) {
-
-			g_hash_table_insert (ctxt->changed_hash, g_strdup (uid), ebc);
-
-			switch (ebc->change_type) {
-			case E_BOOK_CHANGE_CARD_ADDED:
-				add_records++;
-				break;
-			case E_BOOK_CHANGE_CARD_MODIFIED:
-				mod_records++;
-				break;
-			case E_BOOK_CHANGE_CARD_DELETED:
-				del_records++;
-				break;
-			}
-		} else if (ebc->change_type == E_BOOK_CHANGE_CARD_DELETED) {
-			e_pilot_map_remove_by_uid (ctxt->map, uid);
-		}
-	}
-	
-	/* Set the count information */
-  	num_records = g_list_length (ctxt->cards);
-  	gnome_pilot_conduit_sync_abs_set_num_local_records(abs_conduit, num_records);
-  	gnome_pilot_conduit_sync_abs_set_num_new_local_records (abs_conduit, add_records);
-  	gnome_pilot_conduit_sync_abs_set_num_updated_local_records (abs_conduit, mod_records);
-  	gnome_pilot_conduit_sync_abs_set_num_deleted_local_records(abs_conduit, del_records);
-
-	buf = (unsigned char*)g_malloc (0xffff);
-	len = dlp_ReadAppBlock (dbi->pilot_socket, dbi->db_handle, 0,
-			      (unsigned char *)buf, 0xffff);
-	
-	if (len < 0) {
-		WARN (_("Could not read pilot's Address application block"));
-		WARN ("dlp_ReadAppBlock(...) = %d", len);
-		gnome_pilot_conduit_error (conduit,
-					   _("Could not read pilot's Address application block"));
-		return -1;
-	}
-	unpack_AddressAppInfo (&(ctxt->ai), buf, len);
-	g_free (buf);
-
-  	check_for_slow_setting (conduit, ctxt);
-	if (ctxt->cfg->sync_type == GnomePilotConduitSyncTypeCopyToPilot
-	    || ctxt->cfg->sync_type == GnomePilotConduitSyncTypeCopyFromPilot)
-		ctxt->map->write_touched_only = TRUE;
-
-	return 0;
-}
-
-static gint
-post_sync (GnomePilotConduit *conduit,
-	   GnomePilotDBInfo *dbi,
-	   EAddrConduitContext *ctxt)
-{
-	GList *changed;
-	gchar *filename, *change_id;
-	
-	LOG (g_message ( "post_sync: Address Conduit v.%s", CONDUIT_VERSION ));
-
-	g_free (ctxt->cfg->last_uri);
-	ctxt->cfg->last_uri = g_strdup (e_book_get_uri (ctxt->ebook));
-	addrconduit_save_configuration (ctxt->cfg);
-
-	filename = map_name (ctxt);
-	e_pilot_map_write (filename, ctxt->map);
-	g_free (filename);
-
-	/* FIX ME ugly hack - our changes musn't count, this does introduce
-	 * a race condition if anyone changes a record elsewhere during sycnc
-         */	
-	change_id = g_strdup_printf ("pilot-sync-evolution-addressbook-%d", ctxt->cfg->pilot_id);
-	if (e_book_get_changes (ctxt->ebook, change_id, &changed, NULL))
-		e_book_free_change_list (changed);
-	g_free (change_id);
-
-	LOG (g_message ( "---------------------------------------------------------\n" ));
-	
-	return 0;
-}
-
-static gint
-set_pilot_id (GnomePilotConduitSyncAbs *conduit,
-	      EAddrLocalRecord *local,
-	      guint32 ID,
-	      EAddrConduitContext *ctxt)
-{
-	LOG (g_message ( "set_pilot_id: setting to %d\n", ID ));
-	
-	e_pilot_map_insert (ctxt->map, ID, e_contact_get_const (local->contact, E_CONTACT_UID), FALSE);
-
-        return 0;
-}
-
-static gint
-set_status_cleared (GnomePilotConduitSyncAbs *conduit,
-		    EAddrLocalRecord *local,
-		    EAddrConduitContext *ctxt)
-{
-	const char *uid;
-	
-	LOG (g_message ( "set_status_cleared: clearing status\n" ));
-	
-	if ((uid = e_contact_get_const (local->contact, E_CONTACT_UID)))
-		g_hash_table_remove (ctxt->changed_hash, uid);
-	
-        return 0;
-}
-
-static gint
-for_each (GnomePilotConduitSyncAbs *conduit,
-	  EAddrLocalRecord **local,
-	  EAddrConduitContext *ctxt)
-{
-  	static GList *cards, *iterator;
-  	static int count;
-
-  	g_return_val_if_fail (local != NULL, -1);
-
-	if (*local == NULL) {
-		LOG (g_message ( "beginning for_each" ));
-
-		cards = ctxt->cards;
-		count = 0;
-		
-		if (cards != NULL) {
-			LOG (g_message ( "iterating over %d records", g_list_length (cards) ));
-
-			*local = g_new0 (EAddrLocalRecord, 1);
-  			local_record_from_ecard (*local, cards->data, ctxt);
-			g_list_prepend (ctxt->locals, *local);
-
-			iterator = cards;
-		} else {
-			LOG (g_message ( "no events" ));
-			(*local) = NULL;
-			return 0;
-		}
-	} else {
-		count++;
-		if (g_list_next (iterator)) {
-			iterator = g_list_next (iterator);
-
-			*local = g_new0 (EAddrLocalRecord, 1);
-			local_record_from_ecard (*local, iterator->data, ctxt);
-			g_list_prepend (ctxt->locals, *local);
-		} else {
-			LOG (g_message ( "for_each ending" ));
-
-  			/* Tell the pilot the iteration is over */
-			*local = NULL;
-
-			return 0;
-		}
-	}
-
-	return 0;
-}
-
-static gint
-for_each_modified (GnomePilotConduitSyncAbs *conduit,
-		   EAddrLocalRecord **local,
-		   EAddrConduitContext *ctxt)
-{
-	static GList *iterator;
-	static int count;
-
-	g_return_val_if_fail (local != NULL, 0);
-
-	if (*local == NULL) {
-		LOG (g_message ( "for_each_modified beginning\n" ));
-		
-		iterator = ctxt->changed;
-		
-		count = 0;
-		
-		iterator = next_changed_item (ctxt, iterator);
-		if (iterator != NULL) {
-			EBookChange *ebc = iterator->data;
-			
-			LOG (g_message ( "iterating over %d records", g_hash_table_size (ctxt->changed_hash)));
-			 
-			*local = g_new0 (EAddrLocalRecord, 1);
-			local_record_from_ecard (*local, ebc->contact, ctxt);
-			g_list_prepend (ctxt->locals, *local);
-		} else {
-			LOG (g_message ( "no events" ));
-
-			*local = NULL;
-		}
-	} else {
-		count++;
-		iterator = g_list_next (iterator);
-		if (iterator && (iterator = next_changed_item (ctxt, iterator))) {
-			EBookChange *ebc = iterator->data;
-
-			*local = g_new0 (EAddrLocalRecord, 1);
-			local_record_from_ecard (*local, ebc->contact, ctxt);
-			g_list_prepend (ctxt->locals, *local);
-		} else {
-			LOG (g_message ( "for_each_modified ending" ));
-
-    			/* Signal the iteration is over */
-			*local = NULL;
-
-			return 0;
-		}
-	}
-
-	return 0;
-}
-
-static gint
-compare (GnomePilotConduitSyncAbs *conduit,
-	 EAddrLocalRecord *local,
-	 GnomePilotRecord *remote,
-	 EAddrConduitContext *ctxt)
-{
-	GnomePilotRecord local_pilot;
-	int retval = 0;
-
-	LOG (g_message ("compare: local=%s remote=%s...\n",
-			print_local (local), print_remote (remote)));
-
-	g_return_val_if_fail (local != NULL, -1);
-	g_return_val_if_fail (remote != NULL, -1);
-
-	local_pilot = local_record_to_pilot_record (local, ctxt);
-
-	if (remote->length != local_pilot.length
-	    || memcmp (local_pilot.record, remote->record, remote->length))
-		retval = 1;
-	
-	if (retval == 0)
-		LOG (g_message ( "    equal" ));
-	else
-		LOG (g_message ( "    not equal" ));
-	
-	return retval;
-}
-
-static gint
-add_record (GnomePilotConduitSyncAbs *conduit,
-	    GnomePilotRecord *remote,
-	    EAddrConduitContext *ctxt)
-{
-	EContact *contact;
-	int retval = 0;
-	
-	g_return_val_if_fail (remote != NULL, -1);
-
-	LOG (g_message ( "add_record: adding %s to desktop\n", print_remote (remote) ));
-
-	contact = ecard_from_remote_record (ctxt, remote, NULL);
-	
-	/* add the ecard to the server */
-	if (!e_book_add_contact (ctxt->ebook, contact, NULL)) {
-		WARN ("add_record: failed to add card to ebook\n");
-		g_object_unref (contact);
-		
-		return -1;
-	}
-
-	e_pilot_map_insert (ctxt->map, remote->ID, e_contact_get (contact, E_CONTACT_UID), FALSE);
-
-	g_object_unref (contact);
-
-	return retval;
-}
-
-static gint
-replace_record (GnomePilotConduitSyncAbs *conduit,
-		EAddrLocalRecord *local,
-		GnomePilotRecord *remote,
-		EAddrConduitContext *ctxt)
-{
-	EContact *new_contact;
-	EBookChange *ebc;
-	char *old_id;
-	int retval = 0;
-	
-	g_return_val_if_fail (remote != NULL, -1);
-
-	LOG (g_message ("replace_record: replace %s with %s\n",
-	     print_local (local), print_remote (remote)));
-
-	old_id = e_contact_get (local->contact, E_CONTACT_UID);
-	ebc = g_hash_table_lookup (ctxt->changed_hash, old_id);
-	
-	new_contact = ecard_from_remote_record (ctxt, remote, local->contact);
-	g_object_unref (local->contact);
-	local->contact = new_contact;
-
-	if (ebc && ebc->change_type == E_BOOK_CHANGE_CARD_DELETED) {
-		if (!e_book_add_contact (ctxt->ebook, local->contact, NULL)) {
-			WARN (G_STRLOC ": failed to add card\n");
-
-			return -1;
-		}
-		
-	} else {
-		if (!e_book_commit_contact (ctxt->ebook, local->contact, NULL)) {
-			WARN (G_STRLOC ": failed to commit card\n");
-
-			return -1;
-		}		
-	}
-
-	/* Adding a record causes wombat to assign a new uid so we must tidy */
-	if (ebc && ebc->change_type == E_BOOK_CHANGE_CARD_DELETED) {
-		const char *uid = e_contact_get_const (local->contact, E_CONTACT_UID);
-		gboolean arch;
-		
-		arch = e_pilot_map_uid_is_archived (ctxt->map, uid);
-		e_pilot_map_insert (ctxt->map, remote->ID, uid, arch);
-
-		ebc = g_hash_table_lookup (ctxt->changed_hash, old_id);
-		if (ebc) {
-			g_hash_table_remove (ctxt->changed_hash, old_id);
-			g_object_unref (ebc->contact);
-			g_object_ref (local->contact);
-			ebc->contact = local->contact;
-			/* FIXME We should possibly be duplicating the uid */
-			g_hash_table_insert (ctxt->changed_hash, (gpointer) uid, ebc);
-		}
-	}
-
-	return retval;
-}
-
-static gint
-delete_record (GnomePilotConduitSyncAbs *conduit,
-	       EAddrLocalRecord *local,
-	       EAddrConduitContext *ctxt)
-{
-	GError *error = NULL;
-	int retval = 0;
-	
-	g_return_val_if_fail (local != NULL, -1);
-	g_return_val_if_fail (local->contact != NULL, -1);
-
-	LOG (g_message ( "delete_record: delete %s\n", print_local (local) ));
-
-	e_pilot_map_remove_by_uid (ctxt->map, e_contact_get_const (local->contact, E_CONTACT_UID));
-	if (!e_book_remove_contact (ctxt->ebook, e_contact_get_const (local->contact, E_CONTACT_UID), &error) && error->code != E_BOOK_ERROR_CONTACT_NOT_FOUND) {
-		WARN ("delete_record: failed to delete card in ebook\n");
-		g_error_free (error);
-
-		retval = -1;
-	}
-	
-	return retval;
-}
-
-static gint
-archive_record (GnomePilotConduitSyncAbs *conduit,
-		EAddrLocalRecord *local,
-		gboolean archive,
-		EAddrConduitContext *ctxt)
-{
-	int retval = 0;
-	
-	g_return_val_if_fail (local != NULL, -1);
-
-	LOG (g_message ( "archive_record: %s\n", archive ? "yes" : "no" ));
-
-	e_pilot_map_insert (ctxt->map, local->local.ID, e_contact_get_const (local->contact, E_CONTACT_UID), archive);
-	
-        return retval;
-}
-
-static gint
-match (GnomePilotConduitSyncAbs *conduit,
-       GnomePilotRecord *remote,
-       EAddrLocalRecord **local,
-       EAddrConduitContext *ctxt)
-{
-  	const char *uid;
-	
-	LOG (g_message ("match: looking for local copy of %s\n",
-	     print_remote (remote)));
-	
-	g_return_val_if_fail (local != NULL, -1);
-	g_return_val_if_fail (remote != NULL, -1);
-
-	*local = NULL;
-	uid = e_pilot_map_lookup_uid (ctxt->map, remote->ID, TRUE);
-	
-	if (!uid)
-		return 0;
-
-	LOG (g_message ( "  matched\n" ));
-	
-	*local = g_new0 (EAddrLocalRecord, 1);
-	local_record_from_uid (*local, uid, ctxt);
-	
-	return 0;
-}
-
-static gint
-free_match (GnomePilotConduitSyncAbs *conduit,
-	    EAddrLocalRecord *local,
-	    EAddrConduitContext *ctxt)
-{
-	LOG (g_message ( "free_match: freeing\n" ));
-
-	g_return_val_if_fail (local != NULL, -1);
-
-	addrconduit_destroy_record (local);
-
-	return 0;
-}
-
-static gint
-prepare (GnomePilotConduitSyncAbs *conduit,
-	 EAddrLocalRecord *local,
-	 GnomePilotRecord *remote,
-	 EAddrConduitContext *ctxt)
-{
-	LOG (g_message ( "prepare: encoding local %s\n", print_local (local) ));
-	
-	*remote = local_record_to_pilot_record (local, ctxt);
-	
-	return 0;
-}
-
-/* Pilot Settings Callbacks */
-static void
-fill_widgets (EAddrConduitContext *ctxt)
-{
-	if (ctxt->cfg->source)
-		e_pilot_settings_set_source (E_PILOT_SETTINGS (ctxt->ps),
-					     ctxt->cfg->source);
-	e_pilot_settings_set_secret (E_PILOT_SETTINGS (ctxt->ps),
-				     ctxt->cfg->secret);
-
-	e_addr_gui_fill_widgets (ctxt->gui, ctxt->cfg);
-}
-
-static gint
-create_settings_window (GnomePilotConduit *conduit,
-			GtkWidget *parent,
-			EAddrConduitContext *ctxt)
-{
-	LOG (g_message ( "create_settings_window" ));
-	
-	if (!ctxt->cfg->source_list)
-		return -1;
-
-	ctxt->ps = e_pilot_settings_new (ctxt->cfg->source_list);
-	ctxt->gui = e_addr_gui_new (E_PILOT_SETTINGS (ctxt->ps));
-
-	gtk_container_add (GTK_CONTAINER (parent), ctxt->ps);
-	gtk_widget_show (ctxt->ps);
-
-	fill_widgets (ctxt);
-	
-	return 0;
-}
-static void
-display_settings (GnomePilotConduit *conduit, EAddrConduitContext *ctxt)
-{
-	LOG (g_message ( "display_settings" ));
-	
-	fill_widgets (ctxt);
-}
-
-static void
-save_settings    (GnomePilotConduit *conduit, EAddrConduitContext *ctxt)
-{
-        LOG (g_message ( "save_settings" ));
-
-       if (ctxt->new_cfg->source)
-               g_object_unref (ctxt->new_cfg->source);
-	ctxt->new_cfg->source = e_pilot_settings_get_source (E_PILOT_SETTINGS (ctxt->ps));
-	g_object_ref (ctxt->new_cfg->source);
-	ctxt->new_cfg->secret =
-		e_pilot_settings_get_secret (E_PILOT_SETTINGS (ctxt->ps));
-	e_addr_gui_fill_config (ctxt->gui, ctxt->new_cfg);
-
-	addrconduit_save_configuration (ctxt->new_cfg);
-}
-
-static void
-revert_settings  (GnomePilotConduit *conduit, EAddrConduitContext *ctxt)
-{
-	LOG (g_message ( "revert_settings" ));
-
-	addrconduit_save_configuration (ctxt->cfg);
-	addrconduit_destroy_configuration (ctxt->new_cfg);
-	ctxt->new_cfg = addrconduit_dupe_configuration (ctxt->cfg);
-}
-
-GnomePilotConduit *
-conduit_get_gpilot_conduit (guint32 pilot_id)
-{
-	GtkObject *retval;
-	EAddrConduitContext *ctxt;
-
-	LOG (g_message ( "in address's conduit_get_gpilot_conduit\n" ));
-
-	retval = gnome_pilot_conduit_sync_abs_new ("AddressDB", 0x61646472);
-	g_assert (retval != NULL);
-
-	ctxt = e_addr_context_new (pilot_id);
-	gtk_object_set_data (GTK_OBJECT (retval), "addrconduit_context", ctxt);
-
-	gtk_signal_connect (retval, "pre_sync", (GtkSignalFunc) pre_sync, ctxt);
-	gtk_signal_connect (retval, "post_sync", (GtkSignalFunc) post_sync, ctxt);
-
-  	gtk_signal_connect (retval, "set_pilot_id", (GtkSignalFunc) set_pilot_id, ctxt);
-  	gtk_signal_connect (retval, "set_status_cleared", (GtkSignalFunc) set_status_cleared, ctxt);
-
-  	gtk_signal_connect (retval, "for_each", (GtkSignalFunc) for_each, ctxt);
-  	gtk_signal_connect (retval, "for_each_modified", (GtkSignalFunc) for_each_modified, ctxt);
-  	gtk_signal_connect (retval, "compare", (GtkSignalFunc) compare, ctxt);
-
-  	gtk_signal_connect (retval, "add_record", (GtkSignalFunc) add_record, ctxt);
-  	gtk_signal_connect (retval, "replace_record", (GtkSignalFunc) replace_record, ctxt);
-  	gtk_signal_connect (retval, "delete_record", (GtkSignalFunc) delete_record, ctxt);
-  	gtk_signal_connect (retval, "archive_record", (GtkSignalFunc) archive_record, ctxt);
-
-  	gtk_signal_connect (retval, "match", (GtkSignalFunc) match, ctxt);
-  	gtk_signal_connect (retval, "free_match", (GtkSignalFunc) free_match, ctxt);
-
-  	gtk_signal_connect (retval, "prepare", (GtkSignalFunc) prepare, ctxt);
-
-	/* Gui Settings */
-	gtk_signal_connect (retval, "create_settings_window", (GtkSignalFunc) create_settings_window, ctxt);
-	gtk_signal_connect (retval, "display_settings", (GtkSignalFunc) display_settings, ctxt);
-	gtk_signal_connect (retval, "save_settings", (GtkSignalFunc) save_settings, ctxt);
-	gtk_signal_connect (retval, "revert_settings", (GtkSignalFunc) revert_settings, ctxt);
-
-	return GNOME_PILOT_CONDUIT (retval);
-}
-
-void
-conduit_destroy_gpilot_conduit (GnomePilotConduit *conduit)
-{ 
-	EAddrConduitContext *ctxt;
-
-	ctxt = gtk_object_get_data (GTK_OBJECT (conduit), 
-				    "addrconduit_context");
-
-	e_addr_context_destroy (ctxt);
-
-	gtk_object_destroy (GTK_OBJECT (conduit));
-}
diff --git a/addressbook/conduit/e-address.conduit.in b/addressbook/conduit/e-address.conduit.in
deleted file mode 100644
index 669a506001..0000000000
--- a/addressbook/conduit/e-address.conduit.in
+++ /dev/null
@@ -1,9 +0,0 @@
-<gnome-pilot-conduit version="1.0">
-	<conduit id="e_address_conduit" type="shlib" location="@privconduitdir@/libeaddress_conduit.so"/>
-	<name value="EAddress"/>
-	<conduit-attribute name="description" value="Synchronizes Addressbook with Evolution"/>
-	<conduit-attribute name="default-synctype" value="synchronize"/>
-	<conduit-attribute name="valid-synctypes" value="synchronize copy_from_pilot copy_to_pilot"/>
-     	<conduit-attribute name="settings" value="TRUE"/>
-	<conduit-attribute name="icon" value="@datadir@/images/evolution/conduits/48_evo-address-conduit.png"/>
-</gnome-pilot-conduit>
diff --git a/addressbook/gui/.cvsignore b/addressbook/gui/.cvsignore
deleted file mode 100644
index 09980ae6ba..0000000000
--- a/addressbook/gui/.cvsignore
+++ /dev/null
@@ -1,6 +0,0 @@
-.deps
-.libs
-Makefile
-Makefile.in
-*.lo
-*.la
diff --git a/addressbook/gui/Makefile.am b/addressbook/gui/Makefile.am
deleted file mode 100644
index 4e049a7116..0000000000
--- a/addressbook/gui/Makefile.am
+++ /dev/null
@@ -1 +0,0 @@
-SUBDIRS = merging contact-editor contact-list-editor widgets search component
diff --git a/addressbook/gui/component/.cvsignore b/addressbook/gui/component/.cvsignore
deleted file mode 100644
index 847efaf29c..0000000000
--- a/addressbook/gui/component/.cvsignore
+++ /dev/null
@@ -1,15 +0,0 @@
-.deps
-.libs
-.pure
-Makefile
-Makefile.in
-*.lo
-*.la
-evolution-addressbook
-evolution-addressbook.pure
-test-addressbook
-GNOME_Evolution_Addressbook*.server
-GNOME_Evolution_Addressbook*.server.in
-addressbook-marshal.c
-addressbook-marshal.h
-*.schemas
-\ No newline at end of file
diff --git a/addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in b/addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in
deleted file mode 100644
index f57fcb7f09..0000000000
--- a/addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in
+++ /dev/null
@@ -1,135 +0,0 @@
-<oaf_info>
-
-<oaf_server iid="OAFIID:GNOME_Evolution_Addressbook_Factory:@VERSION@"
-            type="shlib"
-            location="@COMPONENTDIR@/libevolution-addressbook.so">
-
-	<oaf_attribute name="repo_ids" type="stringv">
-		<item value="IDL:GNOME/ObjectFactory:1.0"/>
-	</oaf_attribute>
-
-	<oaf_attribute name="name" type="string"
-                       _value="Evolution Addressbook"/>
-
-</oaf_server>
-
-<oaf_server iid="OAFIID:GNOME_Evolution_Addressbook_VCard_Control:@VERSION@"
-            type="factory"
-            location="OAFIID:GNOME_Evolution_Addressbook_Factory:@VERSION@">
-
-	<oaf_attribute name="repo_ids" type="stringv">
-		<item value="IDL:Bonobo/Control:1.0"/>
-	        <item value="IDL:Bonobo/PersistStream:1.0"/>
-	</oaf_attribute>
-
-	<oaf_attribute name="bonobo:supported_mime_types" type="stringv">
-		<item value="text/vcard"/>
-		<item value="text/x-vcard"/>
-	</oaf_attribute>
-
-	<oaf_attribute name="name" type="string"
-		       _value="Evolution Addressbook card viewer"/>
-
-</oaf_server>
-
-<oaf_server iid="OAFIID:GNOME_Evolution_Addressbook_Component:@VERSION@"
-            type="factory"
-            location="OAFIID:GNOME_Evolution_Addressbook_Factory:@VERSION@">
-
-	<oaf_attribute name="repo_ids" type="stringv">
-		<item value="IDL:GNOME/Evolution/Component:@VERSION@"/>
-	</oaf_attribute>
-
-	<oaf_attribute name="name" type="string"
-	               _value="Evolution Addressbook component"/>
-
-	<oaf_attribute name="evolution:component_alias" type="string" value="contacts"/>
-
-        <oaf_attribute name="evolution:menu_label" type="string" _value="C_ontacts"/>
-        <oaf_attribute name="evolution:menu_accelerator" type="string" value="*Control*F2"/>
-        <oaf_attribute name="evolution:button_label" type="string" _value="Contacts"/>
-        <oaf_attribute name="evolution:button_sort_order" type="string" value="-9"/>
-        <oaf_attribute name="evolution:button_icon" type="string" value="stock_addressbook"/>
-
-</oaf_server>
-
-<oaf_server iid="OAFIID:GNOME_Evolution_Addressbook_AddressWidget:@VERSION@"
-	    type="factory"
-	    location="OAFIID:GNOME_Evolution_Addressbook_Factory:@VERSION@">
-
-	<oaf_attribute name="repo_ids" type="stringv">
-		<item value="IDL:BonoboControl/address-widget:@VERSION@"/>
-		<item value="IDL:GNOME/Control:1.0"/>
-	</oaf_attribute>
-
-	<oaf_attribute name="name" type="string"
-		       _value="Evolution Addressbook address viewer"/>
-
-</oaf_server>
-
-<oaf_server iid="OAFIID:GNOME_Evolution_Addressbook_AddressPopup:@VERSION@"
-	    type="factory"
-	    location="OAFIID:GNOME_Evolution_Addressbook_Factory:@VERSION@">
-
-	<oaf_attribute name="repo_ids" type="stringv">
-		<item value="IDL:BonoboControl/address-widget:@VERSION@"/>
-		<item value="IDL:GNOME/Control:1.0"/>
-	</oaf_attribute>
-
-	<oaf_attribute name="name" type="string"
-		       _value="Evolution Addressbook address pop-up"/>
-
-</oaf_server>
-
-<oaf_server iid="OAFIID:GNOME_Evolution_SMime_CertificateManager_ConfigControl:@VERSION@"
-            type="factory"
-            location="OAFIID:GNOME_Evolution_Addressbook_Factory:@VERSION@">
-                                                                                          
-        <oaf_attribute name="repo_ids" type="stringv">
-                <item value="IDL:GNOME/Evolution/ConfigControl:@VERSION@"/>
-        </oaf_attribute>
-                                                                                          
-        <oaf_attribute name="evolution2:config_item:title" type="string"
-                       _value="Certificates"/>
-                                                                                          
-        <oaf_attribute name="evolution2:config_item:description" type="string"
-                       _value="Manage your S/MIME certificates here"/>
-                                                                                          
-        <oaf_attribute name="evolution2:config_item:icon_name" type="string"
-                       value="stock_lock-ok"/>
-                                                                                          
-        <oaf_attribute name="evolution2:config_item:priority" type="string" value="-6"/>
-                                                                                          
-        <oaf_attribute name="name" type="string"
-                       _value="Evolution S/Mime Certificate Management Control"/>
-                                                                                          
-</oaf_server>
-
-<oaf_server iid="OAFIID:GNOME_Evolution_Addressbook_Autocompletion_ConfigControl:@VERSION@"
-	    type="factory"
-	    location="OAFIID:GNOME_Evolution_Addressbook_Factory:@VERSION@">
-
-	<oaf_attribute name="repo_ids" type="stringv">
-		<item value="IDL:GNOME/Evolution/ConfigControl:@VERSION@"/>
-	</oaf_attribute>
-
-	<oaf_attribute name="evolution2:config_item:title" type="string"
-		_value="Autocompletion"/>
-
-	<oaf_attribute name="evolution2:config_item:description" type="string"
-		_value="Configure autocomplete here"/>
-
-	<oaf_attribute name="evolution2:config_item:icon_name" type="string"
-		value="stock_contact"/>
-
-	<oaf_attribute name="evolution2:config_item:type" type="stringv">
-		<item value="contacts"/>
-	</oaf_attribute>
-
-	<oaf_attribute name="evolution2:config_item:priority" type="string" value="-9"/>
-
-	<oaf_attribute name="name" type="string"
-		_value="Evolution folder settings configuration control"/>
-</oaf_server>
-
-</oaf_info>
diff --git a/addressbook/gui/component/Makefile.am b/addressbook/gui/component/Makefile.am
deleted file mode 100644
index a2798ec665..0000000000
--- a/addressbook/gui/component/Makefile.am
+++ /dev/null
@@ -1,111 +0,0 @@
-INCLUDES =									\
-	-DG_LOG_DOMAIN=\"evolution-addressbook\"		\
-	-I$(top_srcdir)						\
-	-I$(top_builddir)					\
-	-I$(top_srcdir)/shell					\
-	-I$(top_builddir)/shell					\
-	-I$(top_srcdir)/widgets/misc				\
-	-I$(top_srcdir)/addressbook/util			\
-	-I$(top_srcdir)/addressbook/gui/contact-editor		\
-	-I$(top_srcdir)/addressbook/gui/contact-list-editor	\
-	-I$(top_srcdir)/addressbook/gui/widgets			\
-	-I$(top_builddir)/a11y/addressbook			\
-	-DEVOLUTION_DATADIR=\""$(datadir)"\"			\
-	-DEVOLUTION_GLADEDIR=\""$(gladedir)"\"			\
-	-DEVOLUTION_ETSPECDIR=\""$(etspecdir)"\"		\
-	-DEVOLUTION_IMAGESDIR=\""$(imagesdir)"\"		\
-	-DEVOLUTION_LOCALEDIR=\""$(localedir)"\"		\
-	-DEVOLUTION_UIDIR=\""$(evolutionuidir)"\"		\
-	-DPREFIX=\""$(prefix)"\"				\
-	$(LDAP_CFLAGS)						\
-	$(EVOLUTION_ADDRESSBOOK_CFLAGS)
-
-component_LTLIBRARIES = libevolution-addressbook.la
-
-libevolution_addressbook_la_SOURCES = 	\
-	addressbook-component.c		\
-	addressbook-component.h		\
-	addressbook-config.c		\
-	addressbook-config.h		\
-	addressbook-migrate.c		\
-	addressbook-migrate.h		\
-	autocompletion-config.c		\
-	autocompletion-config.h		\
-	addressbook.c			\
-	addressbook.h			\
-	addressbook-view.c		\
-	addressbook-view.h		\
-	component-factory.c
-
-#	$(top_builddir)/addressbook/printing/libecontactprint.la
-
-if ENABLE_SMIME
-SMIME_LIB=$(top_builddir)/smime/gui/libevolution-smime.la
-endif
-
-libevolution_addressbook_la_LIBADD =							\
-	$(SMIME_LIB)									\
-	$(top_builddir)/addressbook/printing/libecontactprint.la			\
-	$(top_builddir)/shell/libeshell.la						\
-	$(top_builddir)/addressbook/gui/merging/libeabbookmerging.la			\
-	$(top_builddir)/addressbook/gui/widgets/libeabwidgets.la			\
-	$(top_builddir)/addressbook/gui/search/libeaddressbooksearch.la			\
-	$(top_builddir)/filter/libfilter.la						\
-	$(top_builddir)/addressbook/util/libeabutil.la					\
-	$(top_builddir)/addressbook/gui/contact-editor/libecontacteditor.la		\
-	$(top_builddir)/addressbook/gui/contact-list-editor/libecontactlisteditor.la	\
-	$(top_builddir)/widgets/misc/libemiscwidgets.la					\
-	$(top_builddir)/widgets/menus/libmenus.la					\
-	$(top_builddir)/a11y/addressbook/libevolution-addressbook-a11y.la		\
-	$(EVOLUTION_ADDRESSBOOK_LIBS) $(LDAP_LIBS)
-
-
-
-libevolution_addressbook_la_LDFLAGS = -module -avoid-version
-
-# GConf schemas
-
-schemadir   = $(GCONF_SCHEMA_FILE_DIR)
-schema_in_files = apps_evolution_addressbook.schemas.in.in
-schema_DATA = $(schema_in_files:.schemas.in.in=-$(BASE_VERSION).schemas)
-%-$(BASE_VERSION).schemas.in: %.schemas.in.in
-	cp $< $@
-
-@INTLTOOL_SCHEMAS_RULE@
-
-install-data-local:
-	if test -z "$(DESTDIR)" ; then \
-		for p in $(schema_DATA) ; do \
-			GCONF_CONFIG_SOURCE=$(GCONF_SCHEMA_CONFIG_SOURCE) $(GCONFTOOL) --makefile-install-rule $$p; \
-		done \
-	fi
-
-server_in_files = GNOME_Evolution_Addressbook.server.in.in
-server_DATA = $(server_in_files:.server.in.in=_$(BASE_VERSION).server)
-@EVO_SERVER_RULE@
-@INTLTOOL_SERVER_RULE@
-
-glade_DATA =			\
-	ldap-config.glade
-
-BUILT_SOURCES = $(server_DATA)
-CLEANFILES    = $(BUILT_SOURCES)
-
-EXTRA_DIST =			\
-	$(glade_DATA)		\
-	$(schema_in_files)	\
-	$(server_in_files)
-
-dist-hook:
-	cd $(distdir); rm -f $(BUILT_SOURCES)
-
-if ENABLE_PURIFY
-PLINK = $(LIBTOOL) --mode=link $(PURIFY) $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(LDFLAGS) -o $@
-
-all-local: evolution-addressbook.pure
-
-evolution-addressbook.pure: evolution-addressbook
-	@rm -f evolution-addressbook.pure
-	$(PLINK) $(evolution_addressbook_LDFLAGS) $(evolution_addressbook_OBJECTS) $(evolution_addressbook_LDADD) $(LIBS)
-
-endif
diff --git a/addressbook/gui/component/addressbook-component.c b/addressbook/gui/component/addressbook-component.c
deleted file mode 100644
index fdcb4c9c9d..0000000000
--- a/addressbook/gui/component/addressbook-component.c
+++ /dev/null
@@ -1,407 +0,0 @@
-/* -*- Mode: C; indent-tabs-mode: t; c-basic-offset: 8; tab-width: 8 -*- */
-/* addressbook-component.c
- *
- * Copyright (C) 2003  Ettore Perazzoli
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of version 2 of the GNU General Public
- * License as published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * General Public License for more details.
- *
- * You should have received a copy of the GNU General Public
- * License along with this program; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
- *
- * Author: Ettore Perazzoli <ettore@ximian.com>
- */
-
-/* EPFIXME: Add autocompletion setting.  */
-
-
-#include <config.h>
-
-#include "addressbook-component.h"
-#include "addressbook-config.h"
-#include "addressbook-migrate.h"
-#include "addressbook-view.h"
-#include "addressbook/gui/contact-editor/eab-editor.h"
-#include "addressbook/gui/widgets/eab-gui-util.h"
-#include "e-util/e-plugin.h"
-#include "addressbook/gui/widgets/eab-popup.h"
-#include "addressbook/gui/widgets/eab-menu.h"
-#include "addressbook/gui/widgets/eab-config.h"
-
-#include "widgets/misc/e-task-bar.h"
-#include "widgets/misc/e-info-label.h"
-
-#include <string.h>
-#include <bonobo/bonobo-i18n.h>
-#include <gtk/gtkimage.h>
-#include <gconf/gconf-client.h>
-#include <gal/util/e-util.h>
-
-#ifdef ENABLE_SMIME
-#include "smime/gui/component.h"
-#endif
-
-#define LDAP_BASE_URI "ldap://"
-#define PERSONAL_RELATIVE_URI "system"
-
-#define PARENT_TYPE bonobo_object_get_type ()
-static BonoboObjectClass *parent_class = NULL;
-
-struct _AddressbookComponentPrivate {
-	GConfClient *gconf_client;
-	char *base_directory;
-};
-
-static void
-ensure_sources (AddressbookComponent *component)
-{
-	GSList *groups;
-	ESourceList *source_list;
-	ESourceGroup *group;
-	ESourceGroup *on_this_computer;
-	ESourceGroup *on_ldap_servers;
-	ESource *personal_source;
-	char *base_uri, *base_uri_proto;
-
-	on_this_computer = NULL;
-	on_ldap_servers = NULL;
-	personal_source = NULL;
-
-	if (!e_book_get_addressbooks (&source_list, NULL)) {
-		g_warning ("Could not get addressbook source list from GConf!");
-		return;
-	}
-
-	base_uri = g_build_filename (addressbook_component_peek_base_directory (component),
-				     "addressbook", "local",
-				     NULL);
-
-	base_uri_proto = g_strconcat ("file://", base_uri, NULL);
-
-	groups = e_source_list_peek_groups (source_list);
-	if (groups) {
-		/* groups are already there, we need to search for things... */
-		GSList *g;
-
-		for (g = groups; g; g = g->next) {
-
-			group = E_SOURCE_GROUP (g->data);
-
-			/* compare only file:// part. If user home dir name changes we do not want to create 
-			   one more group  */
-
-			if (!on_this_computer && !strncmp (base_uri_proto, e_source_group_peek_base_uri (group), 7))
-				on_this_computer = group;
-			else if (!on_ldap_servers && !strcmp (LDAP_BASE_URI, e_source_group_peek_base_uri (group)))
-				on_ldap_servers = group;
-		}
-	}
-
-	if (on_this_computer) {
-		/* make sure "Personal" shows up as a source under
-		   this group */
-		GSList *sources = e_source_group_peek_sources (on_this_computer);
-		GSList *s;
-		for (s = sources; s; s = s->next) {
-			ESource *source = E_SOURCE (s->data);
-			if (!strcmp (PERSONAL_RELATIVE_URI, e_source_peek_relative_uri (source))) {
-				personal_source = source;
-				break;
-			}
-		}
-		/* Make sure we have the correct base uri. This can change when user's
-		   homedir name changes */
-		if (strcmp (base_uri_proto, e_source_group_peek_base_uri (on_this_computer))) {
-		    e_source_group_set_base_uri (on_this_computer, base_uri_proto);
-		    
-		    /* *sigh* . We shouldn't  need this sync call here as set_base_uri
-		       call results in synching to gconf, but that happens in idle loop
-		       and too late to prevent user seeing "Can not Open ... because of invalid uri" error.*/
-		    e_source_list_sync (source_list,NULL);
-		}
-	}
-	else {
-		/* create the local source group */
-		group = e_source_group_new (_("On This Computer"), base_uri_proto);
-		e_source_list_add_group (source_list, group, -1);
-
-		on_this_computer = group;
-	}
-
-	if (!personal_source) {
-		/* Create the default Person addressbook */
-		ESource *source = e_source_new (_("Personal"), PERSONAL_RELATIVE_URI);
-		e_source_group_add_source (on_this_computer, source, -1);
-
-		personal_source = source;
-	}
-
-	if (!on_ldap_servers) {
-		/* Create the LDAP source group */
-		group = e_source_group_new (_("On LDAP Servers"), LDAP_BASE_URI);
-		e_source_list_add_group (source_list, group, -1);
-
-		on_ldap_servers = group;
-	}
-	if (personal_source)
-		g_object_unref (personal_source);
-	g_free (base_uri_proto);
-	g_free (base_uri);
-}
-
-/* Evolution::Component CORBA methods.  */
-
-static void
-impl_createControls (PortableServer_Servant servant,
-		     Bonobo_Control *corba_sidebar_control,
-		     Bonobo_Control *corba_view_control,
-		     Bonobo_Control *corba_statusbar_control,
-		     CORBA_Environment *ev)
-{
-	AddressbookView *view = addressbook_view_new ();
-	BonoboControl *sidebar_control;
-	BonoboControl *view_control;
-	BonoboControl *statusbar_control;
-
-	sidebar_control = bonobo_control_new (addressbook_view_peek_sidebar (view));
-	view_control = addressbook_view_peek_folder_view (view);
-	statusbar_control = bonobo_control_new (addressbook_view_peek_statusbar (view));
-
-	*corba_sidebar_control = CORBA_Object_duplicate (BONOBO_OBJREF (sidebar_control), ev);
-	*corba_view_control = CORBA_Object_duplicate (BONOBO_OBJREF (view_control), ev);
-	*corba_statusbar_control = CORBA_Object_duplicate (BONOBO_OBJREF (statusbar_control), ev);
-}
-
-static GNOME_Evolution_CreatableItemTypeList *
-impl__get_userCreatableItems (PortableServer_Servant servant,
-			      CORBA_Environment *ev)
-{
-	GNOME_Evolution_CreatableItemTypeList *list = GNOME_Evolution_CreatableItemTypeList__alloc ();
-
-	list->_length  = 3;
-	list->_maximum = list->_length;
-	list->_buffer  = GNOME_Evolution_CreatableItemTypeList_allocbuf (list->_length);
-
-	CORBA_sequence_set_release (list, FALSE);
-
-	list->_buffer[0].id = "contact";
-	list->_buffer[0].description = _("New Contact");
-	list->_buffer[0].menuDescription = _("_Contact");
-	list->_buffer[0].tooltip = _("Create a new contact");
-	list->_buffer[0].menuShortcut = 'c';
-	list->_buffer[0].iconName = "stock_contact";
-	list->_buffer[0].type = GNOME_Evolution_CREATABLE_OBJECT;
-
-	list->_buffer[1].id = "contact_list";
-	list->_buffer[1].description = _("New Contact List");
-	list->_buffer[1].menuDescription = _("Contact _List");
-	list->_buffer[1].tooltip = _("Create a new contact list");
-	list->_buffer[1].menuShortcut = 'l';
-	list->_buffer[1].iconName = "stock_contact-list";
-	list->_buffer[1].type = GNOME_Evolution_CREATABLE_OBJECT;
-
-	list->_buffer[2].id = "address_book";
-	list->_buffer[2].description = _("New Address Book");
-	list->_buffer[2].menuDescription = _("Address _Book");
-	list->_buffer[2].tooltip = _("Create a new address book");
-	list->_buffer[2].menuShortcut = 'b';
-	list->_buffer[2].iconName = "stock_addressbook";
-	list->_buffer[2].type = GNOME_Evolution_CREATABLE_FOLDER;
-
-	return list;
-}
-
-static void
-book_loaded_cb (EBook *book, EBookStatus status, gpointer data)
-{
-	EContact *contact;
-	char *item_type_name = data;
-
-	if (status != E_BOOK_ERROR_OK) {
-		/* XXX we really need a dialog here, but we don't have
-		   access to the ESource so we can't use
-		   eab_load_error_dialog.  fun! */
-		return;
-	}
-
-	contact = e_contact_new ();
-
-	if (!strcmp (item_type_name, "contact")) {
-		eab_show_contact_editor (book, contact, TRUE, TRUE);
-	}
-	else if (!strcmp (item_type_name, "contact_list")) {
-		eab_show_contact_list_editor (book, contact, TRUE, TRUE);
-	}
-
-	g_object_unref (book);
-	g_object_unref (contact);
-
-	g_free (item_type_name);
-}
-
-static void
-impl_requestCreateItem (PortableServer_Servant servant,
-			const CORBA_char *item_type_name,
-			CORBA_Environment *ev)
-{
-	AddressbookComponent *addressbook_component = ADDRESSBOOK_COMPONENT (bonobo_object_from_servant (servant));
-	AddressbookComponentPrivate *priv;
-	EBook *book;
-
-	priv = addressbook_component->priv;
-
-	if (!item_type_name ||
-	    (strcmp (item_type_name, "address_book") &&
-	     strcmp (item_type_name, "contact") &&
-	     strcmp (item_type_name, "contact_list"))) {
-		CORBA_exception_set (ev, CORBA_USER_EXCEPTION, ex_GNOME_Evolution_Component_UnknownType, NULL);
-		return;
-	}
-
-	if (!strcmp (item_type_name, "address_book")) {
-		addressbook_config_create_new_source (NULL);
-		return;
-	}
-
-	book = e_book_new_default_addressbook (NULL);
-	e_book_async_open (book, FALSE, book_loaded_cb, g_strdup (item_type_name));
-}
-
-static void
-impl_upgradeFromVersion (PortableServer_Servant servant, short major, short minor, short revision, CORBA_Environment *ev)
-{
-	GError *err = NULL;
-
-	if (!addressbook_migrate (addressbook_component_peek (), major, minor, revision, &err)) {
-		GNOME_Evolution_Component_UpgradeFailed *failedex;
-
-		failedex = GNOME_Evolution_Component_UpgradeFailed__alloc();
-		failedex->what = CORBA_string_dup(_("Failed upgrading Addressbook settings or folders."));
-		failedex->why = CORBA_string_dup(err->message);
-		CORBA_exception_set(ev, CORBA_USER_EXCEPTION, ex_GNOME_Evolution_Component_UpgradeFailed, failedex);
-	}
-
-	if (err)
-		g_error_free(err);
-}
-
-static CORBA_boolean
-impl_requestQuit (PortableServer_Servant servant, CORBA_Environment *ev)
-{
-	return eab_editor_request_close_all ();
-}
-
-/* GObject methods.  */
-
-static void
-impl_dispose (GObject *object)
-{
-	AddressbookComponentPrivate *priv = ADDRESSBOOK_COMPONENT (object)->priv;
-
-	if (priv->gconf_client != NULL) {
-		g_object_unref (priv->gconf_client);
-		priv->gconf_client = NULL;
-	}
-
-	(* G_OBJECT_CLASS (parent_class)->dispose) (object);
-}
-
-static void
-impl_finalize (GObject *object)
-{
-	AddressbookComponentPrivate *priv = ADDRESSBOOK_COMPONENT (object)->priv;
-
-	g_free (priv);
-
-	(* G_OBJECT_CLASS (parent_class)->finalize) (object);
-}
-
-
-/* Initialization.  */
-
-static void
-addressbook_component_class_init (AddressbookComponentClass *class)
-{
-	POA_GNOME_Evolution_Component__epv *epv = &class->epv;
-	GObjectClass *object_class = G_OBJECT_CLASS (class);
-
-	epv->createControls          = impl_createControls;
-	epv->_get_userCreatableItems = impl__get_userCreatableItems;
-	epv->requestCreateItem       = impl_requestCreateItem;
-	epv->upgradeFromVersion      = impl_upgradeFromVersion;
-	epv->requestQuit             = impl_requestQuit;
-
-	object_class->dispose  = impl_dispose;
-	object_class->finalize = impl_finalize;
-
-	parent_class = g_type_class_peek_parent (class);
-}
-
-static void
-addressbook_component_init (AddressbookComponent *component)
-{
-	AddressbookComponentPrivate *priv;
-	static int first = TRUE;
-
-	priv = g_new0 (AddressbookComponentPrivate, 1);
-
-	/* EPFIXME: Should use a custom one instead? */
-	priv->gconf_client = gconf_client_get_default ();
-
-	priv->base_directory = g_build_filename (g_get_home_dir (), ".evolution", NULL);
-
-	component->priv = priv;
-
-	ensure_sources (component);
-
-#ifdef ENABLE_SMIME
-	smime_component_init ();
-#endif
-
-	if (first) {
-		first = FALSE;
-		e_plugin_hook_register_type(eab_popup_hook_get_type());
-		e_plugin_hook_register_type(eab_menu_hook_get_type());
-		e_plugin_hook_register_type(eab_config_hook_get_type());
-	}
-}
-
-
-/* Public API.  */
-
-AddressbookComponent *
-addressbook_component_peek (void)
-{
-	static AddressbookComponent *component = NULL;
-
-	if (component == NULL)
-		component = g_object_new (addressbook_component_get_type (), NULL);
-
-	return component;
-}
-
-GConfClient*
-addressbook_component_peek_gconf_client (AddressbookComponent *component)
-{
-	g_return_val_if_fail (ADDRESSBOOK_IS_COMPONENT (component), NULL);
-
-	return component->priv->gconf_client;
-}
-
-const char *
-addressbook_component_peek_base_directory (AddressbookComponent *component)
-{
-	g_return_val_if_fail (ADDRESSBOOK_IS_COMPONENT (component), NULL);
-
-	return component->priv->base_directory;
-}
-
-BONOBO_TYPE_FUNC_FULL (AddressbookComponent, GNOME_Evolution_Component, PARENT_TYPE, addressbook_component)
diff --git a/addressbook/gui/component/addressbook-component.h b/addressbook/gui/component/addressbook-component.h
deleted file mode 100644
index de92637a59..0000000000
--- a/addressbook/gui/component/addressbook-component.h
+++ /dev/null
@@ -1,63 +0,0 @@
-/* -*- Mode: C; indent-tabs-mode: t; c-basic-offset: 8; tab-width: 8 -*- */
-/* addressbook-component.h
- *
- * Copyright (C) 2003  Ximian, Inc.
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of version 2 of the GNU General Public
- * License as published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * General Public License for more details.
- *
- * You should have received a copy of the GNU General Public
- * License along with this program; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
- *
- * Author: Ettore Perazzoli <ettore@ximian.com>
- */
-
-#ifndef _ADDRESSBOOK_COMPONENT_H_
-#define _ADDRESSBOOK_COMPONENT_H_
-
-#include <bonobo/bonobo-object.h>
-
-#include "Evolution.h"
-#include "e-activity-handler.h"
-#include <libedataserver/e-source-list.h>
-
-#define ADDRESSBOOK_TYPE_COMPONENT			(addressbook_component_get_type ())
-#define ADDRESSBOOK_COMPONENT(obj)			(G_TYPE_CHECK_INSTANCE_CAST ((obj), ADDRESSBOOK_TYPE_COMPONENT, AddressbookComponent))
-#define ADDRESSBOOK_COMPONENT_CLASS(klass)		(G_TYPE_CHECK_CLASS_CAST ((klass), ADDRESSBOOK_TYPE_COMPONENT, AddressbookComponentClass))
-#define ADDRESSBOOK_IS_COMPONENT(obj)			(G_TYPE_CHECK_INSTANCE_TYPE ((obj), ADDRESSBOOK_TYPE_COMPONENT))
-#define ADDRESSBOOK_IS_COMPONENT_CLASS(klass)		(G_TYPE_CHECK_CLASS_TYPE ((obj), ADDRESSBOOK_TYPE_COMPONENT))
-
-
-typedef struct _AddressbookComponent        AddressbookComponent;
-typedef struct _AddressbookComponentPrivate AddressbookComponentPrivate;
-typedef struct _AddressbookComponentClass   AddressbookComponentClass;
-
-struct _AddressbookComponent {
-	BonoboObject parent;
-
-	AddressbookComponentPrivate *priv;
-};
-
-struct _AddressbookComponentClass {
-	BonoboObjectClass parent_class;
-
-	POA_GNOME_Evolution_Component__epv epv;
-};
-
-
-GType addressbook_component_get_type (void);
-
-AddressbookComponent *addressbook_component_peek (void);
-
-GConfClient       *addressbook_component_peek_gconf_client     (AddressbookComponent *component);
-const char        *addressbook_component_peek_base_directory   (AddressbookComponent *component);
-
-#endif /* _ADDRESSBOOK_COMPONENT_H_ */
diff --git a/addressbook/gui/component/addressbook-config.c b/addressbook/gui/component/addressbook-config.c
deleted file mode 100644
index 4cc2bab348..0000000000
--- a/addressbook/gui/component/addressbook-config.c
+++ /dev/null
@@ -1,1128 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-/*
- * Authors:
- * Chris Toshok <toshok@ximian.com>
- * Chris Lahey <clahey@ximian.com>
- * Michael Zucchi <notzed@ximian.com>
- *  And no doubt others ...
- **/
-
-/*#define STANDALONE*/
-
-#include <config.h>
-
-#include <string.h>
-#include <stdlib.h>
-#include <sys/time.h>
-
-#include <gtk/gtkcombo.h>
-#include <gtk/gtkdialog.h>
-#include <gtk/gtkentry.h>
-#include <gtk/gtkrange.h>
-#include <gtk/gtktreeview.h>
-#include <gtk/gtkliststore.h>
-#include <gtk/gtkscrolledwindow.h>
-#include <gtk/gtktreeselection.h>
-#include <gtk/gtkcellrenderertext.h>
-#include <gtk/gtkcombobox.h>
-#include <gtk/gtkoptionmenu.h>
-#include <gtk/gtkspinbutton.h>
-#include <gtk/gtkcelllayout.h>
-#include <gtk/gtklabel.h>
-#include <gtk/gtk.h>
-#include <libgnome/gnome-i18n.h>
-
-#include <bonobo/bonobo-generic-factory.h>
-
-#include <glade/glade.h>
-
-#include "addressbook.h"
-#include "addressbook-component.h"
-#include "addressbook-config.h"
-
-#include "widgets/misc/e-error.h"
-
-#include "evolution-config-control.h"
-
-#include "addressbook/gui/widgets/eab-config.h"
-
-#define d(x)
-
-#ifdef HAVE_LDAP
-#include "ldap.h"
-#include "ldap_schema.h"
-#endif
-
-#define LDAP_PORT_STRING "389"
-#define LDAPS_PORT_STRING "636"
-
-#define GLADE_FILE_NAME "ldap-config.glade"
-#define CONFIG_CONTROL_FACTORY_ID "OAFIID:GNOME_Evolution_Addressbook_ConfigControlFactory:" BASE_VERSION
-#define LDAP_CONFIG_CONTROL_ID "OAFIID:GNOME_Evolution_LDAPStorage_ConfigControl:" BASE_VERSION
-
-GtkWidget* supported_bases_create_table (char *name, char *string1, char *string2,
-					 int num1, int num2);
-
-/* default objectclasses */
-#define TOP                  "top"
-#define PERSON               "person"
-#define ORGANIZATIONALPERSON "organizationalPerson"
-#define INETORGPERSON        "inetOrgPerson"
-#define EVOLUTIONPERSON      "evolutionPerson"
-#define CALENTRY             "calEntry"
-
-
-typedef struct _AddressbookSourceDialog AddressbookSourceDialog;
-
-struct _AddressbookSourceDialog {
-	GladeXML  *gui;
-
-	EABConfig *config;	/* the config manager */
-
-	GtkWidget *window;
-
-	/* Source selection (druid only) */
-	ESourceList *source_list;
-	GSList *menu_source_groups;
-	GtkWidget *group_optionmenu;
-
-	/* ESource we're currently editing */
-	ESource *source;
-	/* The original source in edit mode.  Also used to flag when we are in edit mode. */
-	ESource *original_source;
-
-	/* Source group we're creating/editing a source in */
-	ESourceGroup *source_group;
-
-	/* info page fields */
-	GtkWidget *host;
-	GtkWidget *auth_optionmenu;
-	AddressbookLDAPAuthType auth; 
-	GtkWidget *auth_principal;
-
-	/* connecting page fields */
-	GtkWidget *port_combo;
-	GtkWidget *ssl_optionmenu;
-	AddressbookLDAPSSLType ssl;
-
-	/* searching page fields */
-	GtkWidget *rootdn;
-	AddressbookLDAPScopeType scope;
-	GtkWidget *scope_optionmenu;
-	GtkWidget *timeout_scale;
-	GtkWidget *limit_spinbutton;
-
-	/* display name page fields */
-	GtkWidget *display_name;
-};
-
-
-
-#ifdef HAVE_LDAP
-
-static char *
-ldap_unparse_auth (AddressbookLDAPAuthType auth_type)
-{
-	switch (auth_type) {
-	case ADDRESSBOOK_LDAP_AUTH_NONE:
-		return "none";
-	case ADDRESSBOOK_LDAP_AUTH_SIMPLE_EMAIL:
-		return "ldap/simple-email";
-	case ADDRESSBOOK_LDAP_AUTH_SIMPLE_BINDDN:
-		return "ldap/simple-binddn";
-	default:
-		g_assert(0);
-		return "none";
-	}
-}
-
-static AddressbookLDAPAuthType
-ldap_parse_auth (const char *auth)
-{
-	if (!auth)
-		return ADDRESSBOOK_LDAP_AUTH_NONE;
-
-	if (!strcmp (auth, "ldap/simple-email") || !strcmp (auth, "simple"))
-		return ADDRESSBOOK_LDAP_AUTH_SIMPLE_EMAIL;
-	else if (!strcmp (auth, "ldap/simple-binddn"))
-		return ADDRESSBOOK_LDAP_AUTH_SIMPLE_BINDDN;
-	else
-		return ADDRESSBOOK_LDAP_AUTH_NONE;
-}
-
-static char *
-ldap_unparse_scope (AddressbookLDAPScopeType scope_type)
-{
-	switch (scope_type) {
-	case ADDRESSBOOK_LDAP_SCOPE_BASE:
-		return "base";
-	case ADDRESSBOOK_LDAP_SCOPE_ONELEVEL:
-		return "one";
-	case ADDRESSBOOK_LDAP_SCOPE_SUBTREE:
-		return "sub";
-	default:
-		g_assert(0);
-		return "";
-	}
-}
-
-static char *
-ldap_unparse_ssl (AddressbookLDAPSSLType ssl_type)
-{
-	switch (ssl_type) {
-	case ADDRESSBOOK_LDAP_SSL_NEVER:
-		return "never";
-	case ADDRESSBOOK_LDAP_SSL_WHENEVER_POSSIBLE:
-		return "whenever_possible";
-	case ADDRESSBOOK_LDAP_SSL_ALWAYS:
-		return "always";
-	default:
-		g_assert(0);
-		return "";
-	}
-}
-
-static AddressbookLDAPSSLType
-ldap_parse_ssl (const char *ssl)
-{
-	if (!ssl)
-		return ADDRESSBOOK_LDAP_SSL_WHENEVER_POSSIBLE; /* XXX good default? */
-
-	if (!strcmp (ssl, "always"))
-		return ADDRESSBOOK_LDAP_SSL_ALWAYS;
-	else if (!strcmp (ssl, "never"))
-		return ADDRESSBOOK_LDAP_SSL_NEVER;
-	else
-		return ADDRESSBOOK_LDAP_SSL_WHENEVER_POSSIBLE;
-}
-
-static gboolean
-source_to_uri_parts (ESource *source, gchar **host, gchar **rootdn, AddressbookLDAPScopeType *scope, gint *port)
-{
-	gchar       *uri;
-	LDAPURLDesc *lud;
-	gint         ldap_error;
-
-	g_assert (source);
-
-	uri = e_source_get_uri (source);
-	ldap_error = ldap_url_parse ((gchar *) uri, &lud);
-	g_free (uri);
-
-	if (ldap_error != LDAP_SUCCESS)
-		return FALSE;
-
-	if (host)
-		*host = g_strdup (lud->lud_host ? lud->lud_host : "");
-	if (rootdn)
-		*rootdn = g_strdup (lud->lud_dn ? lud->lud_dn : "");
-	if (port)
-		*port = lud->lud_port ? lud->lud_port : LDAP_PORT;
-	if (scope)
-		*scope = lud->lud_scope == LDAP_SCOPE_BASE     ? ADDRESSBOOK_LDAP_SCOPE_BASE :
-			 lud->lud_scope == LDAP_SCOPE_ONELEVEL ? ADDRESSBOOK_LDAP_SCOPE_ONELEVEL :
-			 lud->lud_scope == LDAP_SCOPE_SUBTREE  ? ADDRESSBOOK_LDAP_SCOPE_SUBTREE :
-			 ADDRESSBOOK_LDAP_SCOPE_ONELEVEL;
-
-	ldap_free_urldesc (lud);
-	return TRUE;
-}
-
-static gboolean
-source_group_is_remote (ESourceGroup *group)
-{
-	return strncmp ("ldap:", e_source_group_peek_base_uri (group), 5) == 0;
-}
-
-/* ldap api foo */
-static LDAP *
-addressbook_ldap_init (GtkWidget *window, ESource *source)
-{
-	LDAP  *ldap;
-	gchar *host;
-	gint   port;
-	int ldap_error;
-	int protocol_version = LDAP_VERSION3;
-
-	if (!source_to_uri_parts (source, &host, NULL, NULL, &port))
-		return NULL;
-
-	if (!(ldap = ldap_init (host, port))) {
-		e_error_run ((GtkWindow *) window, "addressbook:ldap-init", NULL);
-		goto done;
-	}
-
-	ldap_error = ldap_set_option (ldap, LDAP_OPT_PROTOCOL_VERSION, &protocol_version);
-	if (LDAP_OPT_SUCCESS != ldap_error)
-		g_warning ("failed to set protocol version to LDAPv3");
-
-	/* XXX do TLS if it's configured in */
-
- done:
-	g_free (host);
-	return ldap;
-}
-
-static gint
-addressbook_ldap_auth (GtkWidget *window, LDAP *ldap)
-{
-	gint ldap_error;
-
-	/* XXX use auth info from source */
-	ldap_error = ldap_simple_bind_s (ldap, NULL, NULL);
-	if (LDAP_SUCCESS != ldap_error)
-		e_error_run ((GtkWindow *) window, "addressbook:ldap-auth", NULL);
-	
-	return ldap_error;
-}
-
-static int
-addressbook_root_dse_query (AddressbookSourceDialog *dialog, LDAP *ldap,
-			    char **attrs, LDAPMessage **resp)
-{
-	int ldap_error;
-	struct timeval timeout;
-
-	timeout.tv_sec = (gint) gtk_adjustment_get_value (GTK_RANGE(dialog->timeout_scale)->adjustment);
-	timeout.tv_usec = 0;
-
-	ldap_error = ldap_search_ext_s (ldap,
-					LDAP_ROOT_DSE, LDAP_SCOPE_BASE,
-					"(objectclass=*)",
-					attrs, 0, NULL, NULL, &timeout, LDAP_NO_LIMIT, resp);
-	if (LDAP_SUCCESS != ldap_error)
-		e_error_run (GTK_WINDOW (dialog->window), "addressbook:ldap-search-base", NULL);
-	
-	return ldap_error;
-}
-
-/* searching page */
-GtkWidget*
-supported_bases_create_table (char *name, char *string1, char *string2, int num1, int num2)
-{
-	GtkWidget *table, *scrolled;
-	GtkTreeSelection *selection;
-	GtkCellRenderer *renderer;
-	GtkListStore *model;
-
-	scrolled = gtk_scrolled_window_new (NULL, NULL);
-	gtk_scrolled_window_set_policy (GTK_SCROLLED_WINDOW (scrolled), GTK_POLICY_AUTOMATIC, GTK_POLICY_AUTOMATIC);
-	gtk_scrolled_window_set_shadow_type (GTK_SCROLLED_WINDOW (scrolled), GTK_SHADOW_IN);
-
-	model = gtk_list_store_new (1, G_TYPE_STRING);
-	table = gtk_tree_view_new_with_model ((GtkTreeModel *) model);
-	renderer = gtk_cell_renderer_text_new ();
-	gtk_tree_view_insert_column_with_attributes ((GtkTreeView *) table, -1, _("Base"), renderer, "text", 0, NULL);
-	gtk_tree_view_set_headers_visible ((GtkTreeView *) table, FALSE);
-	selection = gtk_tree_view_get_selection ((GtkTreeView *) table);
-	gtk_tree_selection_set_mode (selection, GTK_SELECTION_SINGLE);
-
-	gtk_container_add (GTK_CONTAINER (scrolled), table);
-	g_object_set_data((GObject *)scrolled, "table", table);
-
-	return scrolled;
-}
-
-static gboolean
-do_ldap_root_dse_query (AddressbookSourceDialog *sdialog, GtkListStore *model, ESource *source)
-{
-	LDAP *ldap;
-	char *attrs[2];
-	int ldap_error;
-	char **values;
-	LDAPMessage *resp;
-	int i;
-
-	ldap = addressbook_ldap_init (sdialog->window, source);
-	if (!ldap)
-		return FALSE;
-
-	if (LDAP_SUCCESS != addressbook_ldap_auth (sdialog->window, ldap))
-		goto fail;
-
-	attrs[0] = "namingContexts";
-	attrs[1] = NULL;
-
-	ldap_error = addressbook_root_dse_query (sdialog, ldap, attrs, &resp);
-
-	if (ldap_error != LDAP_SUCCESS)
-		goto fail;
-
-	values = ldap_get_values (ldap, resp, "namingContexts");
-	if (!values || values[0] == NULL) {
-		e_error_run (GTK_WINDOW (sdialog->window), "addressbook:ldap-search-base", NULL);
-		goto fail;
-	}
-
-	for (i = 0; values[i]; i++) {
-		GtkTreeIter iter;
-
-		gtk_list_store_append (model, &iter);
-		gtk_list_store_set (model, &iter, 0, values[i], -1);
-	}
-
-	ldap_value_free (values);
-	ldap_unbind_s (ldap);
-	return TRUE;
-
- fail:
-	ldap_unbind_s (ldap);
-	return FALSE;
-}
-
-static void
-search_base_selection_model_changed (GtkTreeSelection *selection, GtkWidget *dialog)
-{
-	gtk_dialog_set_response_sensitive (GTK_DIALOG (dialog),
-					   GTK_RESPONSE_OK,
-					   gtk_tree_selection_get_selected(selection, NULL, NULL));
-}
-
-static void
-query_for_supported_bases (GtkWidget *button, AddressbookSourceDialog *sdialog)
-{
-	GtkTreeSelection *selection;
-	GtkListStore *model;
-	GtkTreeView *table;
-	GtkWidget *dialog;
-	GtkWidget *supported_bases_table;
-	GladeXML *gui;
-	GtkTreeIter iter;
-
-	gui = glade_xml_new (EVOLUTION_GLADEDIR "/" GLADE_FILE_NAME, "supported-bases-dialog", NULL);
-	dialog = glade_xml_get_widget (gui, "supported-bases-dialog");
-
-	gtk_window_set_transient_for (GTK_WINDOW (dialog), GTK_WINDOW (sdialog->window));
-	gtk_window_set_modal (GTK_WINDOW (dialog), TRUE);
-
-	gtk_widget_ensure_style (dialog);
-	gtk_container_set_border_width (GTK_CONTAINER (GTK_DIALOG (dialog)->vbox), 0);
-	gtk_container_set_border_width (GTK_CONTAINER (GTK_DIALOG (dialog)->action_area), 12);
-
-	supported_bases_table = glade_xml_get_widget (gui, "supported-bases-table");
-	gtk_widget_show_all (supported_bases_table);
-
-	table = g_object_get_data((GObject *)supported_bases_table, "table");
-	model = (GtkListStore *)gtk_tree_view_get_model(table);
-	selection = gtk_tree_view_get_selection (table);
-	g_signal_connect (selection, "changed", G_CALLBACK (search_base_selection_model_changed), dialog);
-	search_base_selection_model_changed (selection, dialog);
-
-	if (do_ldap_root_dse_query (sdialog, model, sdialog->source)) {
-		gtk_widget_show (dialog);
-
-		if (gtk_dialog_run (GTK_DIALOG (dialog)) == GTK_RESPONSE_OK
-		    && gtk_tree_selection_get_selected(selection, (GtkTreeModel **)&model, &iter)) {
-			char *dn;
-
-			gtk_tree_model_get ((GtkTreeModel *)model, &iter, 0, &dn, -1);
-			gtk_entry_set_text((GtkEntry *)sdialog->rootdn, dn);
-			g_free(dn);
-		}
-	}
-
-	gtk_widget_destroy (dialog);
-}
-
-#endif /* HAVE_LDAP */
-
-GtkWidget*
-addressbook_config_create_new_source (GtkWidget *parent)
-{
-	return addressbook_config_edit_source(parent, NULL);
-}
-
-/* ********************************************************************** */
-
-static void
-eabc_type_changed(GtkComboBox *dropdown, AddressbookSourceDialog *sdialog)
-{
-	int id = gtk_combo_box_get_active(dropdown);
-	GtkTreeModel *model;
-	GtkTreeIter iter;
-
-	model = gtk_combo_box_get_model(dropdown);
-	if (id == -1 || !gtk_tree_model_iter_nth_child(model, &iter, NULL, id))
-		return;
-
-	/* TODO: when we change the group type, we lose all of the pre-filled dialog info */
-
-	gtk_tree_model_get(model, &iter, 1, &sdialog->source_group, -1);
-	/* HACK: doesn't work if you don't do this */
-	e_source_set_absolute_uri(sdialog->source, NULL);
-	e_source_set_group(sdialog->source, sdialog->source_group);
-
-	/* BIG HACK: We load the defaults for each type here.
-	   I guess plugins will have to use the do it in their factory callbacks */
-	if (!strncmp(e_source_group_peek_base_uri(sdialog->source_group), "groupwise:", 10)) {
-		GSList *l;
-		ESource *source;
-		char *tmp;
-
-		l = e_source_group_peek_sources(sdialog->source_group);
-		if (l && l->data ) {
-			source = l->data;
-			e_source_set_property(sdialog->source, "auth", e_source_get_property(source, "auth"));
-			e_source_set_property(sdialog->source, "user", e_source_get_property(source, "user"));
-			e_source_set_property(sdialog->source, "user_ssl", e_source_get_property(source, "use_ssl"));
-		}
-
-		e_source_set_property(sdialog->source, "auth-domain", "Groupwise");
-		tmp = g_strconcat (";", e_source_peek_name(sdialog->source), NULL);
-		e_source_set_relative_uri (sdialog->source, tmp);
-		g_free (tmp);
-#ifdef HAVE_LDAP
-	} else if (!strncmp(e_source_group_peek_base_uri(sdialog->source_group), "ldap:", 5)) {
-		char *tmp;
-
-		tmp = g_strdup_printf ("%s:%s/%s?" /* trigraph prevention */ "?%s",
-				       "", LDAP_PORT_STRING,
-				       "",
-				       "one");
-		e_source_set_relative_uri (sdialog->source, tmp);
-		g_free (tmp);
-		e_source_set_property(sdialog->source, "timeout", "3");
-		e_source_set_property(sdialog->source, "limit", "100");
-#endif
-	} else {
-		e_source_set_relative_uri (sdialog->source, e_source_peek_uid (sdialog->source));
-	}
-
-	e_config_target_changed((EConfig *)sdialog->config, E_CONFIG_TARGET_CHANGED_REBUILD);
-}
-
-static GtkWidget *
-eabc_general_type(EConfig *ec, EConfigItem *item, struct _GtkWidget *parent, struct _GtkWidget *old, void *data)
-{
-	AddressbookSourceDialog *sdialog = data;
-	GtkComboBox *dropdown;
-	GtkCellRenderer *cell;
-	GtkListStore *store;
-	GtkTreeIter iter;
-	GSList *l;
-	GtkWidget *w, *label;
-	int i, row;
-
-	if (old)
-		return old;
-
-	w = gtk_hbox_new(FALSE, 6);
-	label = gtk_label_new_with_mnemonic(_("_Type:"));
-	gtk_box_pack_start((GtkBox *)w, label, FALSE, FALSE, 0);
-
-	dropdown = (GtkComboBox *)gtk_combo_box_new();	
-	cell = gtk_cell_renderer_text_new();
-	store = gtk_list_store_new(2, G_TYPE_STRING, G_TYPE_POINTER);
-	i = 0;
-	for (l=sdialog->menu_source_groups;l;l=g_slist_next(l)) {
-		ESourceGroup *group = l->data;
-
-		gtk_list_store_append(store, &iter);
-		gtk_list_store_set(store, &iter, 0, e_source_group_peek_name(group), 1, group, -1);
-		if (e_source_peek_group(sdialog->source) == group)
-			row = i;
-		i++;
-	}
-
-	gtk_cell_layout_pack_start((GtkCellLayout *)dropdown, cell, TRUE);
-	gtk_cell_layout_set_attributes((GtkCellLayout *)dropdown, cell, "text", 0, NULL);
-	gtk_combo_box_set_model(dropdown, (GtkTreeModel *)store);
-	gtk_combo_box_set_active(dropdown, -1);
-	gtk_combo_box_set_active(dropdown, row);
-	g_signal_connect(dropdown, "changed", G_CALLBACK(eabc_type_changed), sdialog);
-	gtk_widget_show((GtkWidget *)dropdown);
-	gtk_box_pack_start((GtkBox *)w, (GtkWidget *)dropdown, TRUE, TRUE, 0);
-	gtk_label_set_mnemonic_widget((GtkLabel *)label, (GtkWidget *)dropdown);
-
-	gtk_box_pack_start((GtkBox *)parent, (GtkWidget *)w, FALSE, FALSE, 0);
-
-	gtk_widget_show_all(w);
-
-	return (GtkWidget *)w;
-}
-
-static void
-name_changed_cb(GtkWidget *w, AddressbookSourceDialog *sdialog)
-{
-	e_source_set_name (sdialog->source, gtk_entry_get_text (GTK_ENTRY (sdialog->display_name)));
-}
-
-static void 
-offline_status_changed_cb (GtkWidget *widget, AddressbookSourceDialog *sdialog)
-{
-	if (gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (widget)))
-		e_source_set_property (sdialog->source, "offline_sync", "1");
-	else 
-		e_source_set_property (sdialog->source, "offline_sync", "0");	
-	    
-}
-
-static GtkWidget *
-eabc_general_name(EConfig *ec, EConfigItem *item, struct _GtkWidget *parent, struct _GtkWidget *old, void *data)
-{
-	AddressbookSourceDialog *sdialog = data;
-	const char *uri;
-	GtkWidget *w;
-	GladeXML *gui;
-	
-
-	if (old)
-		return old;
-
-	gui = glade_xml_new (EVOLUTION_GLADEDIR "/" GLADE_FILE_NAME, item->label, NULL);
-	w = glade_xml_get_widget(gui, item->label);
-	gtk_box_pack_start((GtkBox *)parent, w, FALSE, FALSE, 0);
-
-	sdialog->display_name = glade_xml_get_widget (gui, "account-editor-display-name-entry");
-	g_signal_connect(sdialog->display_name, "changed", G_CALLBACK(name_changed_cb), sdialog);
-	gtk_entry_set_text((GtkEntry *)sdialog->display_name, e_source_peek_name(sdialog->source));
-
-	/* Hardcoded: groupwise can't edit the name (or anything else) */
-	if (sdialog->original_source) {
-		uri = e_source_group_peek_base_uri (sdialog->source_group);
-		if (uri && strncmp(uri, "groupwise:", 10) == 0) {
-			gtk_widget_set_sensitive (GTK_WIDGET(sdialog->display_name), FALSE);
-		}
-	}
-	
-	g_object_unref(gui);
-
-	return w;
-}
-
-
-static GtkWidget *
-eabc_general_offline(EConfig *ec, EConfigItem *item, struct _GtkWidget *parent, struct _GtkWidget *old, void *data)
-{
-	AddressbookSourceDialog *sdialog = data;
-	GtkWidget *offline_setting;
-	const char *offline_sync;
-	int row;
-	gboolean is_local_book;
-	
-	is_local_book = g_str_has_prefix (e_source_group_peek_base_uri (sdialog->source_group), "file:");
-	offline_sync =  e_source_get_property (sdialog->source, "offline_sync");
-	if (old) 
-		return old;
-	else {
-		row = ((GtkTable*)parent)->nrows;
-		offline_setting = gtk_check_button_new_with_label (N_("Copy book content locally for offline operation"));
-		gtk_widget_show (offline_setting);
-		gtk_container_add (GTK_CONTAINER (parent), offline_setting);
-		g_signal_connect (offline_setting, "toggled", G_CALLBACK (offline_status_changed_cb), sdialog);
-		
-	}
-	gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (offline_setting), (offline_sync && g_str_equal (offline_sync, "1"))  ? TRUE : FALSE);
-	if (is_local_book)
-		gtk_widget_hide (offline_setting);
-	return offline_setting;
-
-}
-
-#ifdef HAVE_LDAP
-static void
-url_changed(AddressbookSourceDialog *sdialog)
-{
-	char *str;
-
-	str = g_strdup_printf ("%s:%s/%s?" /* trigraph prevention */ "?%s",
-			       gtk_entry_get_text (GTK_ENTRY (sdialog->host)),
-			       gtk_entry_get_text (GTK_ENTRY (GTK_COMBO (sdialog->port_combo)->entry)),
-			       gtk_entry_get_text (GTK_ENTRY (sdialog->rootdn)),
-			       ldap_unparse_scope (sdialog->scope));
-	e_source_set_relative_uri (sdialog->source, str);
-	g_free (str);
-}
-
-static void
-host_changed_cb(GtkWidget *w, AddressbookSourceDialog *sdialog)
-{
-	url_changed(sdialog);
-}
-
-static void
-port_entry_changed_cb(GtkWidget *w, AddressbookSourceDialog *sdialog)
-{
-	const char *port = gtk_entry_get_text((GtkEntry *)w);
-
-	if (!strcmp (port, LDAPS_PORT_STRING)) {
-		sdialog->ssl = ADDRESSBOOK_LDAP_SSL_ALWAYS;
-		gtk_option_menu_set_history (GTK_OPTION_MENU(sdialog->ssl_optionmenu), sdialog->ssl);
-		gtk_widget_set_sensitive (sdialog->ssl_optionmenu, FALSE);
-	} else {
-		gtk_widget_set_sensitive (sdialog->ssl_optionmenu, TRUE);
-	}
-
-	url_changed(sdialog);
-}
-
-static void
-ssl_optionmenu_changed_cb(GtkWidget *w, AddressbookSourceDialog *sdialog)
-{
-	sdialog->ssl = gtk_option_menu_get_history((GtkOptionMenu *)w);
-	e_source_set_property (sdialog->source, "ssl", ldap_unparse_ssl (sdialog->ssl));
-}
-
-
-static GtkWidget *
-eabc_general_host(EConfig *ec, EConfigItem *item, struct _GtkWidget *parent, struct _GtkWidget *old, void *data)
-{
-	AddressbookSourceDialog *sdialog = data;
-	const char *tmp;
-	GtkWidget *w;
-	char *uri, port[16];
-	LDAPURLDesc *lud;
-	GladeXML *gui;
-
-	if (!source_group_is_remote(sdialog->source_group))
-		return NULL;
-
-	gui = glade_xml_new (EVOLUTION_GLADEDIR "/" GLADE_FILE_NAME, item->label, NULL);
-	w = glade_xml_get_widget(gui, item->label);
-	gtk_box_pack_start((GtkBox *)parent, w, FALSE, FALSE, 0);
-
-	uri = e_source_get_uri(sdialog->source);
-	if (ldap_url_parse(uri, &lud) != LDAP_SUCCESS)
-		lud = NULL;
-	g_free(uri);
-
-	sdialog->host = glade_xml_get_widget (gui, "server-name-entry");
-	gtk_entry_set_text((GtkEntry *)sdialog->host, lud && lud->lud_host ? lud->lud_host : "");
-	g_signal_connect (sdialog->host, "changed", G_CALLBACK (host_changed_cb), sdialog);
-
-	sdialog->port_combo = glade_xml_get_widget (gui, "port-combo");	
-	sprintf(port, "%u", lud && lud->lud_port? lud->lud_port : LDAP_PORT);
-	gtk_entry_set_text (GTK_ENTRY (GTK_COMBO (sdialog->port_combo)->entry), port);
-	g_signal_connect (GTK_COMBO(sdialog->port_combo)->entry, "changed", G_CALLBACK (port_entry_changed_cb), sdialog);
-
-	if (lud)
-		ldap_free_urldesc (lud);
-
-	sdialog->ssl_optionmenu = glade_xml_get_widget (gui, "ssl-optionmenu");
-	tmp = e_source_get_property (sdialog->source, "ssl");
-	sdialog->ssl = tmp ? ldap_parse_ssl (tmp) : ADDRESSBOOK_LDAP_SSL_WHENEVER_POSSIBLE;
-	gtk_option_menu_set_history (GTK_OPTION_MENU(sdialog->ssl_optionmenu), sdialog->ssl);
-	g_signal_connect(sdialog->ssl_optionmenu, "changed", G_CALLBACK(ssl_optionmenu_changed_cb), sdialog);
-
-	g_object_unref(gui);
-
-	return w;
-}
-
-static void
-auth_entry_changed_cb(GtkWidget *w, AddressbookSourceDialog *sdialog)
-{
-	const char *principal = gtk_entry_get_text((GtkEntry *)w);
-
-	/* seems messy ... but the api is */
-	switch (sdialog->auth) {
-	case ADDRESSBOOK_LDAP_AUTH_SIMPLE_BINDDN:
-		e_source_set_property(sdialog->source, "email_addr", NULL);
-		e_source_set_property(sdialog->source, "binddn", principal);
-		break;
-	case ADDRESSBOOK_LDAP_AUTH_SIMPLE_EMAIL:
-		e_source_set_property(sdialog->source, "binddn", NULL);
-		e_source_set_property(sdialog->source, "email_addr", principal);
-		break;
-	case ADDRESSBOOK_LDAP_AUTH_NONE:
-	default:
-		e_source_set_property(sdialog->source, "email_addr", NULL);
-		e_source_set_property(sdialog->source, "binddn", NULL);
-		break;
-	}
-}
-
-static void
-auth_optionmenu_changed_cb(GtkWidget *w, AddressbookSourceDialog *sdialog)
-{
-	sdialog->auth = gtk_option_menu_get_history((GtkOptionMenu *)w);
-	e_source_set_property (sdialog->source, "auth", ldap_unparse_auth (sdialog->auth));
-
-	/* make sure the right property is set for the auth - ugh, funny api */
-	auth_entry_changed_cb(sdialog->auth_principal, sdialog);
-}
-
-static GtkWidget *
-eabc_general_auth(EConfig *ec, EConfigItem *item, struct _GtkWidget *parent, struct _GtkWidget *old, void *data)
-{
-	AddressbookSourceDialog *sdialog = data;
-	GtkWidget *w;
-	const char *tmp;
-	GladeXML *gui;
-
-	if (!source_group_is_remote(sdialog->source_group))
-		return NULL;
-
-	gui = glade_xml_new (EVOLUTION_GLADEDIR "/" GLADE_FILE_NAME, item->label, NULL);
-	w = glade_xml_get_widget(gui, item->label);
-	gtk_box_pack_start((GtkBox *)parent, w, FALSE, FALSE, 0);
-
-	sdialog->auth_optionmenu = glade_xml_get_widget (gui, "auth-optionmenu");
-	tmp = e_source_get_property(sdialog->source, "auth");
-	sdialog->auth = tmp ? ldap_parse_auth(tmp) : ADDRESSBOOK_LDAP_AUTH_NONE;
-	gtk_option_menu_set_history (GTK_OPTION_MENU(sdialog->auth_optionmenu), sdialog->auth);	
-	g_signal_connect(sdialog->auth_optionmenu, "changed", G_CALLBACK(auth_optionmenu_changed_cb), sdialog);
-
-	sdialog->auth_principal = glade_xml_get_widget (gui, "auth-entry");
-	switch (sdialog->auth) {
-	case ADDRESSBOOK_LDAP_AUTH_SIMPLE_EMAIL:
-		tmp = e_source_get_property(sdialog->source, "email_addr");
-		break;
-	case ADDRESSBOOK_LDAP_AUTH_SIMPLE_BINDDN:
-		tmp = e_source_get_property(sdialog->source, "binddn");
-		break;
-	case ADDRESSBOOK_LDAP_AUTH_NONE:
-	default:
-		tmp = "";
-		break;
-	}
-	gtk_entry_set_text((GtkEntry *)sdialog->auth_principal, tmp?tmp:"");
-	g_signal_connect (sdialog->auth_principal, "changed", G_CALLBACK (auth_entry_changed_cb), sdialog);
-
-	g_object_unref(gui);
-
-	return w;
-}
-
-static void
-rootdn_changed_cb(GtkWidget *w, AddressbookSourceDialog *sdialog)
-{
-	url_changed(sdialog);
-}
-
-static void
-scope_optionmenu_changed_cb(GtkWidget *w, AddressbookSourceDialog *sdialog)
-{
-	sdialog->scope = gtk_option_menu_get_history((GtkOptionMenu *)w);
-	url_changed(sdialog);
-}
-
-static GtkWidget *
-eabc_details_search(EConfig *ec, EConfigItem *item, struct _GtkWidget *parent, struct _GtkWidget *old, void *data)
-{
-	AddressbookSourceDialog *sdialog = data;
-	GtkWidget *w;
-	LDAPURLDesc *lud;
-	char *uri;
-	GladeXML *gui;
-
-	if (!source_group_is_remote(sdialog->source_group))
-		return NULL;
-
-	gui = glade_xml_new (EVOLUTION_GLADEDIR "/" GLADE_FILE_NAME, item->label, NULL);
-	w = glade_xml_get_widget(gui, item->label);
-	gtk_box_pack_start((GtkBox *)parent, w, FALSE, FALSE, 0);
-
-	uri = e_source_get_uri(sdialog->source);
-	if (ldap_url_parse(uri, &lud) != LDAP_SUCCESS)
-		lud = NULL;
-	g_free(uri);
-
-	sdialog->rootdn = glade_xml_get_widget (gui, "rootdn-entry");
-	gtk_entry_set_text((GtkEntry *)sdialog->rootdn, lud && lud->lud_dn ? lud->lud_dn : "");
-	g_signal_connect (sdialog->rootdn, "changed", G_CALLBACK (rootdn_changed_cb), sdialog);
-
-	sdialog->scope_optionmenu = glade_xml_get_widget (gui, "scope-optionmenu");
-	switch (lud->lud_scope) {
-	case LDAP_SCOPE_BASE:
-		sdialog->scope = ADDRESSBOOK_LDAP_SCOPE_BASE;
-		break;
-	default:
-	case LDAP_SCOPE_ONELEVEL:
-		sdialog->scope = ADDRESSBOOK_LDAP_SCOPE_ONELEVEL;
-		break;
-	case LDAP_SCOPE_SUBTREE:
-		sdialog->scope = ADDRESSBOOK_LDAP_SCOPE_SUBTREE;
-		break;
-	}
-	gtk_option_menu_set_history (GTK_OPTION_MENU(sdialog->scope_optionmenu), sdialog->scope);
-	g_signal_connect(sdialog->scope_optionmenu, "changed", G_CALLBACK(scope_optionmenu_changed_cb), sdialog);
-
-	g_signal_connect (glade_xml_get_widget(gui, "rootdn-button"), "clicked",
-			  G_CALLBACK(query_for_supported_bases), sdialog);
-
-	if (lud)
-		ldap_free_urldesc (lud);
-
-	g_object_unref(gui);
-
-	return w;
-}
-
-static void
-timeout_changed_cb(GtkWidget *w, AddressbookSourceDialog *sdialog)
-{
-	char *timeout;
-
-	timeout = g_strdup_printf("%f", gtk_adjustment_get_value(((GtkRange *)sdialog->timeout_scale)->adjustment));
-	e_source_set_property(sdialog->source, "timeout", timeout);
-	g_free(timeout);
-}
-
-static void
-limit_changed_cb(GtkWidget *w, AddressbookSourceDialog *sdialog)
-{
-	char limit[16];
-
-	sprintf(limit, "%d", gtk_spin_button_get_value_as_int((GtkSpinButton *)sdialog->limit_spinbutton));
-	e_source_set_property(sdialog->source, "limit", limit);
-}
-
-static GtkWidget *
-eabc_details_limit(EConfig *ec, EConfigItem *item, struct _GtkWidget *parent, struct _GtkWidget *old, void *data)
-{
-	AddressbookSourceDialog *sdialog = data;
-	GtkWidget *w;
-	const char *tmp;
-	GladeXML *gui;
-
-	if (!source_group_is_remote(sdialog->source_group))
-		return NULL;
-
-	gui = glade_xml_new (EVOLUTION_GLADEDIR "/" GLADE_FILE_NAME, item->label, NULL);
-	w = glade_xml_get_widget(gui, item->label);
-	gtk_box_pack_start((GtkBox *)parent, w, FALSE, FALSE, 0);
-
-	sdialog->timeout_scale = glade_xml_get_widget (gui, "timeout-scale");
-	tmp = e_source_get_property(sdialog->source, "timeout");
-	gtk_adjustment_set_value(((GtkRange *)sdialog->timeout_scale)->adjustment, tmp?g_strtod(tmp, NULL):3.0);
-	g_signal_connect (GTK_RANGE(sdialog->timeout_scale)->adjustment, "value_changed", G_CALLBACK (timeout_changed_cb), sdialog);
-
-	sdialog->limit_spinbutton = glade_xml_get_widget (gui, "download-limit-spinbutton");
-	tmp = e_source_get_property(sdialog->source, "limit");
-	gtk_spin_button_set_value((GtkSpinButton *)sdialog->limit_spinbutton, tmp?g_strtod(tmp, NULL):100.0);
-	g_signal_connect (sdialog->limit_spinbutton, "value_changed", G_CALLBACK (limit_changed_cb), sdialog);
-
-	g_object_unref(gui);
-
-	return w;
-}
-#endif
-
-static EConfigItem eabc_items[] = {
-	{ E_CONFIG_BOOK, "", },
-	{ E_CONFIG_PAGE, "00.general", N_("General") },
-	{ E_CONFIG_SECTION, "00.general/10.display", N_("Addressbook") },
-	{ E_CONFIG_ITEM, "00.general/10.display/10.name", "hbox122", eabc_general_name },
-	{ E_CONFIG_ITEM, "00.general/10.display/20.offline", NULL, eabc_general_offline },
-#ifdef HAVE_LDAP
-	{ E_CONFIG_SECTION, "00.general/20.server", N_("Server Information") },
-	{ E_CONFIG_ITEM, "00.general/20.server/00.host", "table31", eabc_general_host },
-	{ E_CONFIG_SECTION, "00.general/30.auth", N_("Authentication") },
-	{ E_CONFIG_ITEM, "00.general/30.auth/00.auth", "table32", eabc_general_auth },
-
-	{ E_CONFIG_PAGE, "10.details", N_("Details") },
-	{ E_CONFIG_SECTION, "10.details/00.search", N_("Searching") },
-	{ E_CONFIG_ITEM, "10.details/00.search/00.search", "table33", eabc_details_search },
-	{ E_CONFIG_SECTION, "10.details/10.limit", N_("Downloading") },
-	{ E_CONFIG_ITEM, "10.details/10.limit/00.limit", "table34", eabc_details_limit },
-#endif
-	{ 0 },
-};
-
-/* items needed for the 'new addressbook' window */
-static EConfigItem eabc_new_items[] = {
-	{ E_CONFIG_ITEM, "00.general/10.display/00.type", NULL, eabc_general_type },
-	{ 0 },
-};
-
-static void
-eabc_commit(EConfig *ec, GSList *items, void *data)
-{
-	AddressbookSourceDialog *sdialog = data;
-	xmlNodePtr xml;
-#if d(!)0
-	char *txt;
-#endif
-	if (sdialog->original_source) {
-		d(printf("committing addressbook changes\n"));
-
-		/* these api's kinda suck */
-		xml = xmlNewNode(NULL, "dummy");
-		e_source_dump_to_xml_node(sdialog->source, xml);
-		e_source_update_from_xml_node(sdialog->original_source, xml->children, NULL);
-		xmlFreeNode(xml);
-#if d(!)0
-		txt = e_source_to_standalone_xml(sdialog->original_source);
-		printf("source is now:\n%s\n", txt);
-		g_free(txt);
-#endif
-	} else {
-		d(printf("committing new source\n"));
-		e_source_group_add_source(sdialog->source_group, sdialog->source, -1);
-		e_source_list_sync(sdialog->source_list, NULL);
-	}
-
-#if d(!)0
-	txt = e_source_to_standalone_xml(sdialog->source);
-	printf("running source is now:\n%s\n", txt);
-	g_free(txt);
-#endif
-}
-
-static void
-eabc_free(EConfig *ec, GSList *items, void *data)
-{
-	AddressbookSourceDialog *sdialog = data;
-
-	g_slist_free(items);
-
-	g_object_unref(sdialog->source);
-	if (sdialog->original_source)
-		g_object_unref(sdialog->original_source);
-	if (sdialog->source_list)
-		g_object_unref(sdialog->source_list);
-	g_slist_free(sdialog->menu_source_groups);
-
-	g_object_unref(sdialog->gui);
-
-	g_free(sdialog);
-}
-
-static gboolean
-eabc_check_complete(EConfig *ec, const char *pageid, void *data)
-{
-	AddressbookSourceDialog *sdialog = data;
-	int valid = TRUE;
-	const char *tmp;
-	ESource *source;
-
-	d(printf("check complete, pageid = '%s'\n", pageid?pageid:"<all>"));
-	/* have name, and unique */
-	tmp = e_source_peek_name(sdialog->source);
-	valid = tmp && tmp[0] != 0
-		&& ((source = e_source_group_peek_source_by_name(sdialog->source_group, tmp)) == NULL
-		    || source == sdialog->original_source);
-
-#ifdef HAVE_LDAP
-	if (valid && source_group_is_remote(sdialog->source_group)) {
-		char *uri = e_source_get_uri(sdialog->source);
-		LDAPURLDesc *lud;
-
-		/* check host and port set */
-		if (ldap_url_parse(uri, &lud) == LDAP_SUCCESS) {
-			valid = lud->lud_host != NULL
-				&& lud->lud_host[0] != 0
-				&& lud->lud_port != 0;
-			ldap_free_urldesc (lud);
-		} else
-			valid = FALSE;
-		g_free(uri);
-
-		/* check auth name provided if auth set */
-		if (valid && (tmp = e_source_get_property(sdialog->source, "auth"))) {
-			switch (ldap_parse_auth(tmp)) {
-			case ADDRESSBOOK_LDAP_AUTH_SIMPLE_EMAIL:
-				tmp = e_source_get_property(sdialog->source, "email_addr");
-				break;
-			case ADDRESSBOOK_LDAP_AUTH_SIMPLE_BINDDN:
-				tmp = e_source_get_property(sdialog->source, "binddn");
-				break;
-			default:
-				tmp = "dummy";
-				break;
-			}
-			valid = tmp && tmp[0];
-		}
-
-		/* check timeout isn't too short (why don't we just force it?) */
-		if (valid) {
-			tmp = e_source_get_property(sdialog->source, "timeout");
-			valid = tmp && g_strtod(tmp, NULL) > 0.0;
-		}
-	}
-#endif
-	return valid;
-}
-
-/* debug only: */
-#if d(!)0
-static void
-source_changed(ESource *source, AddressbookSourceDialog *sdialog)
-{
-	char *xml;
-
-	xml = e_source_to_standalone_xml(source);
-	printf("source changed:\n%s\n", xml);
-	g_free(xml);
-}
-#endif
-
-GtkWidget*
-addressbook_config_edit_source (GtkWidget *parent, ESource *source)
-{
-	AddressbookSourceDialog *sdialog = g_new0 (AddressbookSourceDialog, 1);
-	EABConfig *ec;
-	int i;
-	GSList *items = NULL;
-	EABConfigTargetSource *target;
-	char *xml;
-
-	sdialog->gui = glade_xml_new (EVOLUTION_GLADEDIR "/" GLADE_FILE_NAME, "account-editor-notebook", NULL);
-
-	if (source) {
-		sdialog->original_source = source;
-		g_object_ref(source);
-		sdialog->source_group = e_source_peek_group (source);
-		xml = e_source_to_standalone_xml(source);
-		sdialog->source = e_source_new_from_standalone_xml(xml);
-		g_free(xml);
-	} else {
-		GConfClient *gconf;
-		GSList *l;
-
-		sdialog->source = e_source_new("", "");
-		gconf = gconf_client_get_default();
-		sdialog->source_list = e_source_list_new_for_gconf(gconf, "/apps/evolution/addressbook/sources");
-		l = e_source_list_peek_groups(sdialog->source_list);
-		if (!l) {
-			g_warning ("Addressbook source groups are missing! Check your GConf setup.");
-			g_free (sdialog);
-			return NULL;
-		}
-
-		sdialog->menu_source_groups = g_slist_copy(l);
-#ifndef HAVE_LDAP
-		for (;l;l = g_slist_next(l))
-			if (!strncmp("ldap:", e_source_group_peek_base_uri(l->data), 5))
-				sdialog->menu_source_groups = g_slist_remove (sdialog->menu_source_groups, l->data);
-#endif
-		sdialog->source_group = (ESourceGroup *)sdialog->menu_source_groups->data;
-		for (i=0;eabc_new_items[i].path;i++)
-			items = g_slist_prepend(items, &eabc_new_items[i]);
-		g_object_unref(gconf);
-	}
-
-	/* HACK: doesn't work if you don't do this */
-	e_source_set_group(sdialog->source, sdialog->source_group);
-
-#if d(!)0
-	xml = e_source_to_standalone_xml(sdialog->source);
-	printf("but working standalone xml: %s\n", xml);
-	g_free(xml);
-	g_signal_connect(sdialog->source, "changed", source_changed, sdialog);
-#endif
-
-	sdialog->config = ec = eab_config_new(E_CONFIG_BOOK, "com.novell.evolution.addressbook.config.accountEditor");
-
-	for (i=0;eabc_items[i].path;i++)
-		items = g_slist_prepend(items, &eabc_items[i]);
-
-	e_config_add_items((EConfig *)ec, items, eabc_commit, NULL, eabc_free, sdialog);
-	e_config_add_page_check((EConfig *)ec, NULL, eabc_check_complete, sdialog);
-
-	target = eab_config_target_new_source(ec, sdialog->source);
-	e_config_set_target((EConfig *)ec, (EConfigTarget *)target);
-
-	if(source)
-		sdialog->window = e_config_create_window((EConfig *)ec, NULL, _("Address Book Properties"));
-	else
-		sdialog->window = e_config_create_window((EConfig *)ec, NULL, _("New Address Book"));
-
-
-	/* forces initial validation */
-	if (!sdialog->original_source)
-		e_config_target_changed((EConfig *)ec, E_CONFIG_TARGET_CHANGED_STATE);
-
-	return sdialog->window;
-}
diff --git a/addressbook/gui/component/addressbook-config.h b/addressbook/gui/component/addressbook-config.h
deleted file mode 100644
index 8818fd08d7..0000000000
--- a/addressbook/gui/component/addressbook-config.h
+++ /dev/null
@@ -1,52 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-/* addressbook-storage.h
- *
- * Copyright (C) 2000  Ximian, Inc.
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of version 2 of the GNU General Public
- * License as published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * General Public License for more details.
- *
- * You should have received a copy of the GNU General Public
- * License along with this program; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
- *
- * Authors:
- * Chris Toshok <toshok@ximian.com>
- * Chris Lahey <clahey@ximian.com>
- **/
-
-#ifndef __ADDRESSBOOK_CONFIG_H__
-#define __ADDRESSBOOK_CONFIG_H__
-
-#include "evolution-config-control.h"
-
-typedef enum {
-	ADDRESSBOOK_LDAP_AUTH_NONE,
-	ADDRESSBOOK_LDAP_AUTH_SIMPLE_EMAIL,
-	ADDRESSBOOK_LDAP_AUTH_SIMPLE_BINDDN,
-} AddressbookLDAPAuthType;
-
-typedef enum {
-	ADDRESSBOOK_LDAP_SCOPE_ONELEVEL,
-	ADDRESSBOOK_LDAP_SCOPE_SUBTREE,
-	ADDRESSBOOK_LDAP_SCOPE_BASE,
-	ADDRESSBOOK_LDAP_SCOPE_LAST
-} AddressbookLDAPScopeType;
-
-typedef enum {
-	ADDRESSBOOK_LDAP_SSL_ALWAYS,
-	ADDRESSBOOK_LDAP_SSL_WHENEVER_POSSIBLE,
-	ADDRESSBOOK_LDAP_SSL_NEVER
-} AddressbookLDAPSSLType;
-
-GtkWidget* addressbook_config_edit_source        (GtkWidget *parent, ESource *source);
-GtkWidget* addressbook_config_create_new_source  (GtkWidget *parent);
-
-#endif /* __ADDRESSBOOK_CONFIG_H__ */
diff --git a/addressbook/gui/component/addressbook-migrate.c b/addressbook/gui/component/addressbook-migrate.c
deleted file mode 100644
index e2933c2de6..0000000000
--- a/addressbook/gui/component/addressbook-migrate.c
+++ /dev/null
@@ -1,1201 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-/* 
- * Copyright (C) 2004, Novell, Inc.
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of version 2 of the GNU General Public
- * License as published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * General Public License for more details.
- *
- * You should have received a copy of the GNU General Public
- * License along with this program; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
- *
- * Author: Chris Toshok (toshok@ximian.com)
- */
-
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
-
-#include <glib.h>
-#include <string.h>
-#include <sys/types.h>
-#include <sys/stat.h>
-#include <unistd.h>
-#include <dirent.h>
-#include <fcntl.h>
-#include <errno.h>
-
-#include "addressbook-migrate.h"
-#include <libebook/e-destination.h>
-#include <libebook/e-book.h>
-#include <libgnome/gnome-i18n.h>
-#include <gal/util/e-util.h>
-#include <gal/util/e-xml-utils.h>
-#include <gtk/gtkwidget.h>
-#include <gtk/gtkvbox.h>
-#include <gtk/gtkmain.h>
-#include <gtk/gtklabel.h>
-#include <gtk/gtkprogressbar.h>
-#include <e-util/e-folder-map.h>
-
-/*#define SLOW_MIGRATION*/
-
-typedef struct {
-	/* this hash table maps old folder uris to new uids.  It's
-	   build in migrate_contact_folder and it's used in
-	   migrate_completion_folders. */
-	GHashTable *folder_uid_map;
-
-	ESourceList *source_list;
-
-	AddressbookComponent *component;
-
-	GtkWidget *window;
-	GtkWidget *label;
-	GtkWidget *folder_label;
-	GtkWidget *progress;
-} MigrationContext;
-
-static void
-setup_progress_dialog (MigrationContext *context)
-{
-	GtkWidget *vbox, *hbox;
-
-	context->window = gtk_window_new (GTK_WINDOW_TOPLEVEL);
-	gtk_window_set_title (GTK_WINDOW (context->window), _("Migrating..."));
-	gtk_window_set_modal (GTK_WINDOW (context->window), TRUE);
-	gtk_container_set_border_width (GTK_CONTAINER (context->window), 6);
-	
-	vbox = gtk_vbox_new (FALSE, 6);
-	gtk_widget_show (vbox);
-	gtk_container_add (GTK_CONTAINER (context->window), vbox);
-	
-	context->label = gtk_label_new ("");
-	gtk_label_set_line_wrap (GTK_LABEL (context->label), TRUE);
-	gtk_widget_show (context->label);
-	gtk_box_pack_start_defaults (GTK_BOX (vbox), context->label);
-	
-	hbox = gtk_hbox_new (FALSE, 6);
-	gtk_widget_show (hbox);
-	gtk_box_pack_start_defaults (GTK_BOX (vbox), hbox);
-	
-	context->folder_label = gtk_label_new ("");
-	gtk_widget_show (context->folder_label);
-	gtk_box_pack_start_defaults (GTK_BOX (hbox), context->folder_label);
-	
-	context->progress = gtk_progress_bar_new ();
-	gtk_widget_show (context->progress);
-	gtk_box_pack_start_defaults (GTK_BOX (hbox), context->progress);
-	
-	gtk_widget_show (context->window);
-}
-
-static void
-dialog_close (MigrationContext *context)
-{
-	gtk_widget_destroy (context->window);
-}
-
-static void
-dialog_set_label (MigrationContext *context, const char *str)
-{
-	gtk_label_set_text (GTK_LABEL (context->label), str);
-
-	while (gtk_events_pending ())
-		gtk_main_iteration ();
-
-#ifdef SLOW_MIGRATION
-	sleep (1);
-#endif
-}
-
-static void
-dialog_set_folder_name (MigrationContext *context, const char *folder_name)
-{
-	char *text;
-	
-	text = g_strdup_printf (_("Migrating `%s':"), folder_name);
-	gtk_label_set_text (GTK_LABEL (context->folder_label), text);
-	g_free (text);
-	
-	gtk_progress_bar_set_fraction (GTK_PROGRESS_BAR (context->progress), 0.0);
-	
-	while (gtk_events_pending ())
-		gtk_main_iteration ();
-
-#ifdef SLOW_MIGRATION
-	sleep (1);
-#endif
-}
-
-static void
-dialog_set_progress (MigrationContext *context, double percent)
-{
-	char text[5];
-	
-	snprintf (text, sizeof (text), "%d%%", (int) (percent * 100.0f));
-	
-	gtk_progress_bar_set_fraction (GTK_PROGRESS_BAR (context->progress), percent);
-	gtk_progress_bar_set_text (GTK_PROGRESS_BAR (context->progress), text);
-	
-	while (gtk_events_pending ())
-		gtk_main_iteration ();
-
-#ifdef SLOW_MIGRATION
-	sleep (1);
-#endif
-}
-
-static gboolean
-check_for_conflict (ESourceGroup *group, char *name)
-{
-	GSList *sources;
-	GSList *s;
-
-	sources = e_source_group_peek_sources (group);
-
-	for (s = sources; s; s = s->next) {
-		ESource *source = E_SOURCE (s->data);
-
-		if (!strcmp (e_source_peek_name (source), name))
-			return TRUE;
-	}
-
-	return FALSE;
-}
-
-static char *
-get_source_name (ESourceGroup *group, const char *path)
-{
-	char **p = g_strsplit (path, "/", 0);
-	int i, j, starting_index;
-	int num_elements;
-	gboolean conflict;
-	GString *s = g_string_new ("");
-
-	for (i = 0; p[i]; i ++) ;
-
-	num_elements = i;
-	i--;
-
-	/* p[i] is now the last path element */
-
-	/* check if it conflicts */
-	starting_index = i;
-	do {
-		g_string_assign (s, "");
-		for (j = starting_index; j < num_elements; j += 2) {
-			if (j != starting_index)
-				g_string_append_c (s, '_');
-			g_string_append (s, p[j]);
-		}
-
-		conflict = check_for_conflict (group, s->str);
-
-
-		/* if there was a conflict back up 2 levels (skipping the /subfolder/ element) */
-		if (conflict)
-			starting_index -= 2;
-
-		/* we always break out if we can't go any further,
-		   regardless of whether or not we conflict. */
-		if (starting_index < 0)
-			break;
-
-	} while (conflict);
-
-	return g_string_free (s, FALSE);
-}
-
-static void
-add_to_notes (EContact *contact, EContactField field)
-{
-	const gchar *old_text;
-	const gchar *field_text;
-	gchar       *new_text;
-
-	old_text = e_contact_get_const (contact, E_CONTACT_NOTE);
-	if (old_text && strstr (old_text, e_contact_pretty_name (field)))
-		return;
-
-	field_text = e_contact_get_const (contact, field);
-	if (!field_text || !*field_text)
-		return;
-
-	new_text = g_strdup_printf ("%s%s%s: %s",
-				    old_text ? old_text : "",
-				    old_text && *old_text &&
-				    *(old_text + strlen (old_text) - 1) != '\n' ? "\n" : "",
-				    e_contact_pretty_name (field), field_text);
-	e_contact_set (contact, E_CONTACT_NOTE, new_text);
-	g_free (new_text);
-}
-
-static void
-migrate_contacts (MigrationContext *context, EBook *old_book, EBook *new_book)
-{
-	EBookQuery *query = e_book_query_any_field_contains ("");
-	GList *l, *contacts;
-	int num_added = 0;
-	int num_contacts;
-
-	/* both books are loaded, start the actual migration */
-	e_book_get_contacts (old_book, query, &contacts, NULL);
-
-	num_contacts = g_list_length (contacts);
-	for (l = contacts; l; l = l->next) {
-		EContact *contact = l->data;
-		GError *e = NULL;
-		GList *attrs, *attr;
-
-		/* do some last minute massaging of the contact's attributes */
-
-		attrs = e_vcard_get_attributes (E_VCARD (contact));
-		for (attr = attrs; attr;) {
-			EVCardAttribute *a = attr->data;
-
-			/* evo 1.4 used the non-standard X-EVOLUTION-OFFICE attribute,
-			   evo 1.5 uses the third element in the ORG list attribute. */
-			if (!strcmp ("X-EVOLUTION-OFFICE", e_vcard_attribute_get_name (a))) {
-				GList *v = e_vcard_attribute_get_values (a);
-				GList *next_attr;
-
-				if (v && v->data)
-					e_contact_set (contact, E_CONTACT_OFFICE, v->data);
-
-				next_attr = attr->next;
-				e_vcard_remove_attribute (E_VCARD (contact), a);
-				attr = next_attr;
-			}
-			/* evo 1.4 didn't put TYPE=VOICE in for phone numbers.
-			   evo 1.5 does.
-
-			   so we search through the attribute params for
-			   either TYPE=VOICE or TYPE=FAX.  If we find
-			   either we do nothing.  If we find neither, we
-			   add TYPE=VOICE.
-			*/
-			else if (!strcmp ("TEL", e_vcard_attribute_get_name (a))) {
-				GList *params, *param;
-				gboolean found = FALSE;
-
-				params = e_vcard_attribute_get_params (a);
-				for (param = params; param; param = param->next) {
-					EVCardAttributeParam *p = param->data;
-					if (!strcmp (EVC_TYPE, e_vcard_attribute_param_get_name (p))) {
-						GList *v = e_vcard_attribute_param_get_values (p);
-						if (v && v->data)
-							if (!strcmp ("VOICE", v->data)
-							    || !strcmp ("FAX", v->data))
-								found = TRUE;
-					}
-				}
-
-				if (!found)
-					e_vcard_attribute_add_param_with_value (a,
-										e_vcard_attribute_param_new (EVC_TYPE),
-										"VOICE");
-				attr = attr->next;
-			}
-			/* Replace "POSTAL" (1.4) addresses with "OTHER" (1.5) */
-			else if (!strcmp ("ADR", e_vcard_attribute_get_name (a))) {
-				GList *params, *param;
-				gboolean found = FALSE;
-				EVCardAttributeParam *p;
-
-				params = e_vcard_attribute_get_params (a);
-				for (param = params; param; param = param->next) {
-					p = param->data;
-					if (!strcmp (EVC_TYPE, e_vcard_attribute_param_get_name (p))) {
-						GList *v = e_vcard_attribute_param_get_values (p);
-						if (v && v->data && !strcmp ("POSTAL", v->data)) {
-							found = TRUE;
-							break;
-						}
-					}
-				}
-
-				if (found) {
-					e_vcard_attribute_param_remove_values (p);
-					e_vcard_attribute_param_add_value (p, "OTHER");
-				}
-
-				attr = attr->next;
-			}
-			/* this is kinda gross.  The new vcard parser
-			   needs ';'s to be escaped by \'s.  but the
-			   1.4 vcard generator would put unescaped xml
-			   (including entities like &gt;) in the value
-			   of attributes, so we need to go through and
-			   escape those ';'s. */
-			else if (!strcmp ("EMAIL", e_vcard_attribute_get_name (a))) {
-				GList *v = e_vcard_attribute_get_values (a);
-
-				if (v && v->data) {
-					if (!strncmp ((char*)v->data, "<?xml", 5)) {
-						/* k, this is the nasty part.  we glomb all the
-						   value strings back together again (if there is
-						   more than one), then work our magic */
-						GString *str = g_string_new ("");
-						while (v) {
-							g_string_append (str, v->data);
-							if (v->next)
-								g_string_append_c (str, ';');
-							v = v->next;
-						}
-
-						e_vcard_attribute_remove_values (a);
-						e_vcard_attribute_add_value (a, str->str);
-						g_string_free (str, TRUE);
-					}
-				}
-
-				attr = attr->next;
-			}
-			else {
-				attr = attr->next;
-			}
-		}
-
-		if (!e_book_add_contact (new_book,
-					 contact,
-					 &e))
-			g_warning ("contact add failed: `%s'", e->message);
-
-		num_added ++;
-
-		dialog_set_progress (context, (double)num_added / num_contacts);
-	}
-
-	g_list_foreach (contacts, (GFunc)g_object_unref, NULL);
-	g_list_free (contacts);
-}
-
-static void
-migrate_contact_folder_to_source (MigrationContext *context, char *old_path, ESource *new_source)
-{
-	char *old_uri = g_strdup_printf ("file://%s", old_path);
-	GError *e = NULL;
-
-	EBook *old_book = NULL, *new_book = NULL;
-	ESource *old_source;
-	ESourceGroup *group;
-
-	group = e_source_group_new ("", old_uri);
-	old_source = e_source_new ("", "");
-	e_source_group_add_source (group, old_source, -1);
-
-	dialog_set_folder_name (context, e_source_peek_name (new_source));
-
-	old_book = e_book_new (old_source, &e);
-	if (!old_book
-	    || !e_book_open (old_book, TRUE, &e)) {
-		g_warning ("failed to load source book for migration: `%s'", e->message);
-		goto finish;
-	}
-
-	new_book = e_book_new (new_source, &e);
-	if (!new_book
-	    || !e_book_open (new_book, FALSE, &e)) {
-		g_warning ("failed to load destination book for migration: `%s'", e->message);
-		goto finish;
-	}
-
-	migrate_contacts (context, old_book, new_book);
-
- finish:
-	g_object_unref (old_source);
-	g_object_unref (group);
-	if (old_book)
-		g_object_unref (old_book);
-	if (new_book)
-		g_object_unref (new_book);
-	g_free (old_uri);
-}
-
-static void
-migrate_contact_folder (MigrationContext *context, char *old_path, ESourceGroup *dest_group, char *source_name)
-{
-	ESource *new_source;
-
-	new_source = e_source_new (source_name, source_name);
-	e_source_set_relative_uri (new_source, e_source_peek_uid (new_source));
-	e_source_group_add_source (dest_group, new_source, -1);
-
-	g_hash_table_insert (context->folder_uid_map, g_strdup (old_path), g_strdup (e_source_peek_uid (new_source)));
-
-	migrate_contact_folder_to_source (context, old_path, new_source);
-
-	g_object_unref (new_source);
-}
-
-#define LDAP_BASE_URI "ldap://"
-#define PERSONAL_RELATIVE_URI "system"
-
-static void
-create_groups (MigrationContext *context,
-	       ESourceGroup **on_this_computer,
-	       ESourceGroup **on_ldap_servers,
-	       ESource      **personal_source)
-{
-	GSList *groups;
-	ESourceGroup *group;
-	char *base_uri, *base_uri_proto;
-
-	*on_this_computer = NULL;
-	*on_ldap_servers = NULL;
-	*personal_source = NULL;
-
-	base_uri = g_build_filename (addressbook_component_peek_base_directory (context->component),
-				     "addressbook", "local",
-				     NULL);
-
-	base_uri_proto = g_strconcat ("file://", base_uri, NULL);
-
-	groups = e_source_list_peek_groups (context->source_list);
-	if (groups) {
-		/* groups are already there, we need to search for things... */
-		GSList *g;
-
-		for (g = groups; g; g = g->next) {
-
-			group = E_SOURCE_GROUP (g->data);
-
-			if (!*on_this_computer && !strcmp (base_uri_proto, e_source_group_peek_base_uri (group)))
-				*on_this_computer = g_object_ref (group);
-			else if (!*on_ldap_servers && !strcmp (LDAP_BASE_URI, e_source_group_peek_base_uri (group)))
-				*on_ldap_servers = g_object_ref (group);
-		}
-	}
-
-	if (*on_this_computer) {
-		/* make sure "Personal" shows up as a source under
-		   this group */
-		GSList *sources = e_source_group_peek_sources (*on_this_computer);
-		GSList *s;
-		for (s = sources; s; s = s->next) {
-			ESource *source = E_SOURCE (s->data);
-			if (!strcmp (PERSONAL_RELATIVE_URI, e_source_peek_relative_uri (source))) {
-				*personal_source = g_object_ref (source);
-				break;
-			}
-		}
-	}
-	else {
-		/* create the local source group */
-		group = e_source_group_new (_("On This Computer"), base_uri_proto);
-		e_source_list_add_group (context->source_list, group, -1);
-
-		*on_this_computer = group;
-	}
-
-	if (!*personal_source) {
-		/* Create the default Person addressbook */
-		ESource *source = e_source_new (_("Personal"), PERSONAL_RELATIVE_URI);
-		e_source_group_add_source (*on_this_computer, source, -1);
-
-		*personal_source = source;
-	}
-
-	if (!*on_ldap_servers) {
-		/* Create the LDAP source group */
-		group = e_source_group_new (_("On LDAP Servers"), LDAP_BASE_URI);
-		e_source_list_add_group (context->source_list, group, -1);
-
-		*on_ldap_servers = group;
-	}
-
-	g_free (base_uri_proto);
-	g_free (base_uri);
-}
-
-static gboolean
-migrate_local_folders (MigrationContext *context, ESourceGroup *on_this_computer, ESource *personal_source)
-{
-	char *old_path = NULL;
-	GSList *dirs, *l;
-	char *local_contact_folder = NULL;
-
-	old_path = g_strdup_printf ("%s/evolution/local", g_get_home_dir ());
-
-	dirs = e_folder_map_local_folders (old_path, "contacts");
-
-	/* migrate the local addressbook first, to local/system */
-	local_contact_folder = g_build_filename (g_get_home_dir (),
-						 "evolution", "local", "Contacts",
-						 NULL);
-
-	for (l = dirs; l; l = l->next) {
-		char *source_name;
-		/* we handle the system folder differently */
-		if (personal_source && !strcmp ((char*)l->data, local_contact_folder)) {
-			g_hash_table_insert (context->folder_uid_map, g_strdup (l->data), g_strdup (e_source_peek_uid (personal_source)));
-			migrate_contact_folder_to_source (context, local_contact_folder, personal_source);
-			continue;
-		}
-
-		source_name = get_source_name (on_this_computer, (char*)l->data);
-		migrate_contact_folder (context, l->data, on_this_computer, source_name);
-		g_free (source_name);
-	}
-
-	g_slist_foreach (dirs, (GFunc)g_free, NULL);
-	g_slist_free (dirs);
-	g_free (local_contact_folder);
-	g_free (old_path);
-
-	return TRUE;
-}
-
-static char *
-get_string_child (xmlNode *node,
-		  const char *name)
-{
-	xmlNode *p;
-	xmlChar *xml_string;
-	char *retval;
-
-	p = e_xml_get_child_by_name (node, (xmlChar *) name);
-	if (p == NULL)
-		return NULL;
-
-	p = e_xml_get_child_by_name (p, (xmlChar *) "text");
-	if (p == NULL) /* there's no text between the tags, return the empty string */
-		return g_strdup("");
-
-	xml_string = xmlNodeListGetString (node->doc, p, 1);
-	retval = g_strdup ((char *) xml_string);
-	xmlFree (xml_string);
-
-	return retval;
-}
-
-static int
-get_integer_child (xmlNode *node,
-		   const char *name,
-		   int defval)
-{
-	xmlNode *p;
-	xmlChar *xml_string;
-	int retval;
-
-	p = e_xml_get_child_by_name (node, (xmlChar *) name);
-	if (p == NULL)
-		return defval;
-
-	p = e_xml_get_child_by_name (p, (xmlChar *) "text");
-	if (p == NULL) /* there's no text between the tags, return the default */
-		return defval;
-
-	xml_string = xmlNodeListGetString (node->doc, p, 1);
-	retval = atoi (xml_string);
-	xmlFree (xml_string);
-
-	return retval;
-}
-
-static gboolean
-migrate_ldap_servers (MigrationContext *context, ESourceGroup *on_ldap_servers)
-{
-	char *sources_xml = g_strdup_printf ("%s/evolution/addressbook-sources.xml",
-					     g_get_home_dir ());
-
-	printf ("trying to migrate from %s\n", sources_xml);
-
-	if (g_file_test (sources_xml, G_FILE_TEST_EXISTS)) {
-		xmlDoc  *doc = xmlParseFile (sources_xml);
-		xmlNode *root;
-		xmlNode *child;
-		int num_contactservers;
-		int servernum;
-
-		if (!doc)
-			return FALSE;
-
-		root = xmlDocGetRootElement (doc);
-		if (root == NULL || strcmp (root->name, "addressbooks") != 0) {
-			xmlFreeDoc (doc);
-			return FALSE;
-		}
-
-		/* count the number of servers, so we can give progress */
-		num_contactservers = 0;
-		for (child = root->children; child; child = child->next) {
-			if (!strcmp (child->name, "contactserver")) {
-				num_contactservers++;
-			}
-		}
-		printf ("found %d contact servers to migrate\n", num_contactservers);
-
-		dialog_set_folder_name (context, _("LDAP Servers"));
-
-		servernum = 0;
-		for (child = root->children; child; child = child->next) {
-			if (!strcmp (child->name, "contactserver")) {
-				char *port, *host, *rootdn, *scope, *authmethod, *ssl;
-				char *emailaddr, *binddn, *limitstr;
-				int limit;
-				char *name, *description;
-				GString *uri = g_string_new ("");
-				ESource *source;
-
-				name        = get_string_child (child, "name");
-				description = get_string_child (child, "description");
-				port        = get_string_child (child, "port");
-				host        = get_string_child (child, "host");
-				rootdn      = get_string_child (child, "rootdn");
-			        scope       = get_string_child (child, "scope");
-				authmethod  = get_string_child (child, "authmethod");
-				ssl         = get_string_child (child, "ssl");
-				emailaddr   = get_string_child (child, "emailaddr");
-				binddn      = get_string_child (child, "binddn");
-				limit       = get_integer_child (child, "limit", 100);
-				limitstr    = g_strdup_printf ("%d", limit);
-
-				g_string_append_printf (uri,
-							"%s:%s/%s?"/*trigraph prevention*/"?%s",
-							host, port, rootdn, scope);
-
-				source = e_source_new (name, uri->str);
-				e_source_set_property (source, "description", description);
-				e_source_set_property (source, "limit", limitstr);
-				e_source_set_property (source, "ssl", ssl);
-				e_source_set_property (source, "auth", authmethod);
-				if (emailaddr)
-					e_source_set_property (source, "email_addr", emailaddr);
-				if (binddn)
-					e_source_set_property (source, "binddn", binddn);
-
-				e_source_group_add_source (on_ldap_servers, source, -1);
-
-				g_string_free (uri, TRUE);
-				g_free (port);
-				g_free (host);
-				g_free (rootdn);
-				g_free (scope);
-				g_free (authmethod);
-				g_free (ssl);
-				g_free (emailaddr);
-				g_free (binddn);
-				g_free (limitstr);
-				g_free (name);
-				g_free (description);
-
-				servernum++;
-				dialog_set_progress (context, (double)servernum/num_contactservers);
-			}
-		}
-
-		xmlFreeDoc (doc);
-	}
-
-	g_free (sources_xml);
-
-	return TRUE;
-}
-
-static ESource*
-get_source_by_name (ESourceList *source_list, const char *name)
-{
-	GSList *groups;
-	GSList *g;
-
-	groups = e_source_list_peek_groups (source_list);
-	if (!groups)
-		return NULL;
-
-	for (g = groups; g; g = g->next) {
-		GSList *sources;
-		GSList *s;
-		ESourceGroup *group = E_SOURCE_GROUP (g->data);
-
-		sources = e_source_group_peek_sources (group);
-		if (!sources)
-			continue;
-
-		for (s = sources; s; s = s->next) {
-			ESource *source = E_SOURCE (s->data);
-			const char *source_name = e_source_peek_name (source);
-
-			if (!strcmp (name, source_name))
-				return source;
-		}
-	}
-
-	return NULL;
-}
-
-static gboolean
-migrate_completion_folders (MigrationContext *context)
-{
-	char *uris_xml = gconf_client_get_string (addressbook_component_peek_gconf_client (context->component),
-						  "/apps/evolution/addressbook/completion/uris",
-						  NULL);
-
-	printf ("trying to migrate completion folders\n");
-
-	if (uris_xml) {
-		xmlDoc  *doc = xmlParseMemory (uris_xml, strlen (uris_xml));
-		xmlNode *root;
-		xmlNode *child;
-
-		if (!doc)
-			return FALSE;
-
-		dialog_set_folder_name (context, _("Autocompletion Settings"));
-
-		root = xmlDocGetRootElement (doc);
-		if (root == NULL || strcmp (root->name, "EvolutionFolderList") != 0) {
-			xmlFreeDoc (doc);
-			return FALSE;
-		}
-
-		for (child = root->children; child; child = child->next) {
-			if (!strcmp (child->name, "folder")) {
-				char *physical_uri = e_xml_get_string_prop_by_name (child, "physical-uri");
-				ESource *source = NULL;
-
-				/* if the physical uri is file://...
-				   we look it up in our folder_uid_map
-				   hashtable.  If it's a folder we
-				   converted over, we should get back
-				   a uid we can search for.
-
-				   if the physical_uri is anything
-				   else, we strip off the args
-				   (anything after ;) before searching
-				   for the uri. */
-
-				if (!strncmp (physical_uri, "file://", 7)) {
-					char *uid = g_hash_table_lookup (context->folder_uid_map,
-									 physical_uri + 7);
-
-					if (uid)
-						source = e_source_list_peek_source_by_uid (context->source_list, uid);
-				}
-				else {
-					char *name = e_xml_get_string_prop_by_name (child, "display-name");
-
-					source = get_source_by_name (context->source_list, name);
-
-					g_free (name);
-				}
-
-				if (source) {
-					e_source_set_property (source, "completion", "true");
-				}
-				else {
-					g_warning ("found completion folder with uri `%s' that "
-						   "doesn't correspond to anything we migrated.", physical_uri);
-				}
-
-				g_free (physical_uri);
-			}
-		}
-
-		g_free (uris_xml);
-	}
-	else {
-		g_message ("no completion folder settings to migrate");
-	}
-
-	return TRUE;
-}
-
-static void
-migrate_contact_lists_for_local_folders (MigrationContext *context, ESourceGroup *on_this_computer)
-{
-	GSList *sources, *s;
-
-	sources = e_source_group_peek_sources (on_this_computer);
-	for (s = sources; s; s = s->next) {
-		ESource *source = s->data;
-		EBook *book;
-		EBookQuery *query;
-		GList *l, *contacts;
-		int num_contacts, num_converted;
-
-		dialog_set_folder_name (context, e_source_peek_name (source));
-
-		book = e_book_new (source, NULL);
-		if (!book
-		    || !e_book_open (book, TRUE, NULL)) {
-			char *uri = e_source_get_uri (source);
-			g_warning ("failed to migrate contact lists for source %s", uri);
-			g_free (uri);
-			continue;
-		}
-
-		query = e_book_query_any_field_contains ("");
-
-		e_book_get_contacts (book, query, &contacts, NULL);
-
-		num_converted = 0;
-		num_contacts = g_list_length (contacts);
-		for (l = contacts; l; l = l->next) {
-			EContact *contact = l->data;
-			GError *e = NULL;
-			GList *attrs, *attr;
-			gboolean converted = FALSE;
-
-			attrs = e_contact_get_attributes (contact, E_CONTACT_EMAIL);
-			for (attr = attrs; attr; attr = attr->next) {
-				EVCardAttribute *a = attr->data;
-				GList *v = e_vcard_attribute_get_values (a);
-
-				if (v && v->data) {
-					if (!strncmp ((char*)v->data, "<?xml", 5)) {
-						EDestination *dest = e_destination_import ((char*)v->data);
-
-						e_destination_export_to_vcard_attribute (dest, a);
-
-						g_object_unref (dest);
-
-						converted = TRUE;
-					}
-				}
-			}
-
-			if (converted) {
-				e_contact_set_attributes (contact, E_CONTACT_EMAIL, attrs);
-
-				if (!e_book_commit_contact (book,
-							    contact,
-							    &e))
-					g_warning ("contact commit failed: `%s'", e->message);
-			}
-
-			num_converted ++;
-
-			dialog_set_progress (context, (double)num_converted / num_contacts);
-		}
-
-		g_list_foreach (contacts, (GFunc)g_object_unref, NULL);
-		g_list_free (contacts);
-
-		g_object_unref (book);
-	}
-}
-
-static void
-migrate_company_phone_for_local_folders (MigrationContext *context, ESourceGroup *on_this_computer)
-{
-	GSList *sources, *s;
-
-	sources = e_source_group_peek_sources (on_this_computer);
-	for (s = sources; s; s = s->next) {
-		ESource *source = s->data;
-		EBook *book;
-		EBookQuery *query;
-		GList *l, *contacts;
-		int num_contacts, num_converted;
-
-		dialog_set_folder_name (context, e_source_peek_name (source));
-
-		book = e_book_new (source, NULL);
-		if (!book
-		    || !e_book_open (book, TRUE, NULL)) {
-			char *uri = e_source_get_uri (source);
-			g_warning ("failed to migrate company phone numbers for source %s", uri);
-			g_free (uri);
-			continue;
-		}
-
-		query = e_book_query_any_field_contains ("");
-
-		e_book_get_contacts (book, query, &contacts, NULL);
-
-		num_converted = 0;
-		num_contacts = g_list_length (contacts);
-		for (l = contacts; l; l = l->next) {
-			EContact *contact = l->data;
-			GError *e = NULL;
-			GList *attrs, *attr;
-			gboolean converted = FALSE;
-			int num_work_voice = 0;
-
-			attrs = e_vcard_get_attributes (E_VCARD (contact));
-			for (attr = attrs; attr;) {
-				EVCardAttribute *a = attr->data;
-				GList *next_attr = attr->next;
-
-				if (!strcmp ("TEL", e_vcard_attribute_get_name (a))) {
-					GList *params, *param;
-					gboolean found_voice = FALSE;
-					gboolean found_work = FALSE;
-
-					params = e_vcard_attribute_get_params (a);
-					for (param = params; param; param = param->next) {
-						EVCardAttributeParam *p = param->data;
-						if (!strcmp (EVC_TYPE, e_vcard_attribute_param_get_name (p))) {
-							GList *v = e_vcard_attribute_param_get_values (p);
-							if (v && v->data) {
-								if (!strcmp ("VOICE", v->data))
-									found_voice = TRUE;
-								else if (!strcmp ("WORK", v->data))
-									found_work = TRUE;
-							}
-						}
-
-						if (found_work && found_voice)
-							num_work_voice++;
-
-						if (num_work_voice == 3) {
-							GList *v = e_vcard_attribute_get_values (a);
-
-							if (v && v->data)
-								e_contact_set (contact, E_CONTACT_PHONE_COMPANY, v->data);
-
-							e_vcard_remove_attribute (E_VCARD (contact), a);
-
-							converted = TRUE;
-							break;
-						}
-					}
-				}
-
-				attr = next_attr;
-				
-				if (converted)
-					break;
-			}
-
-			if (converted) {
-				if (!e_book_commit_contact (book,
-							    contact,
-							    &e))
-					g_warning ("contact commit failed: `%s'", e->message);
-			}
-
-			num_converted ++;
-
-			dialog_set_progress (context, (double)num_converted / num_contacts);
-		}
-
-		g_list_foreach (contacts, (GFunc)g_object_unref, NULL);
-		g_list_free (contacts);
-
-		g_object_unref (book);
-	}
-}
-
-static void
-migrate_pilot_data (const char *old_path, const char *new_path)
-{
-	struct dirent *dent;
-	const char *ext;
-	char *filename;
-	DIR *dir;
-	
-	if (!(dir = opendir (old_path)))
-		return;
-	
-	while ((dent = readdir (dir))) {
-		if ((!strncmp (dent->d_name, "pilot-map-", 10) &&
-		     ((ext = strrchr (dent->d_name, '.')) && !strcmp (ext, ".xml"))) ||
-		    (!strncmp (dent->d_name, "pilot-sync-evolution-addressbook-", 33) &&
-		     ((ext = strrchr (dent->d_name, '.')) && !strcmp (ext, ".db")))) {
-			/* src and dest file formats are identical for both map and changelog files */
-			unsigned char inbuf[4096];
-			size_t nread, nwritten;
-			int fd0, fd1;
-			ssize_t n;
-			
-			filename = g_build_filename (old_path, dent->d_name, NULL);
-			if ((fd0 = open (filename, O_RDONLY)) == -1) {
-				g_free (filename);
-				continue;
-			}
-			
-			g_free (filename);
-			filename = g_build_filename (new_path, dent->d_name, NULL);
-			if ((fd1 = open (filename, O_WRONLY | O_CREAT | O_TRUNC, 0666)) == -1) {
-				g_free (filename);
-				close (fd0);
-				continue;
-			}
-			
-			do {
-				do {
-					n = read (fd0, inbuf, sizeof (inbuf));
-				} while (n == -1 && errno == EINTR);
-				
-				if (n < 1)
-					break;
-				
-				nread = n;
-				nwritten = 0;
-				do {
-					do {
-						n = write (fd1, inbuf + nwritten, nread - nwritten);
-					} while (n == -1 && errno == EINTR);
-					
-					if (n > 0)
-						nwritten += n;
-				} while (nwritten < nread && n != -1);
-				
-				if (n == -1)
-					break;
-			} while (1);
-			
-			if (n != -1)
-				n = fsync (fd1);
-			
-			if (n == -1) {
-				g_warning ("Failed to migrate %s: %s", dent->d_name, strerror (errno));
-				unlink (filename);
-			}
-			
-			close (fd0);
-			close (fd1);
-			g_free (filename);
-		}
-	}
-	
-	closedir (dir);
-}
-
-static MigrationContext*
-migration_context_new (AddressbookComponent *component)
-{
-	MigrationContext *context = g_new (MigrationContext, 1);
-	
-	/* set up the mapping from old uris to new uids */
-	context->folder_uid_map = g_hash_table_new_full (g_str_hash, g_str_equal, (GDestroyNotify)g_free, (GDestroyNotify)g_free);
-
-	e_book_get_addressbooks (&context->source_list, NULL);
-
-	context->component = component;
-
-	return context;
-}
-
-static void
-migration_context_free (MigrationContext *context)
-{
-	e_source_list_sync (context->source_list, NULL);
-
-	g_hash_table_destroy (context->folder_uid_map);
-
-	g_object_unref (context->source_list);
-
-	g_free (context);
-}
-
-int
-addressbook_migrate (AddressbookComponent *component, int major, int minor, int revision, GError **err)
-{
-	ESourceGroup *on_this_computer;
-	ESourceGroup *on_ldap_servers;
-	ESource *personal_source;
-	MigrationContext *context = migration_context_new (component);
-	gboolean need_dialog = FALSE;
-
-	printf ("addressbook_migrate (%d.%d.%d)\n", major, minor, revision);
-
-	/* we call this unconditionally now - create_groups either
-	   creates the groups/sources or it finds the necessary
-	   groups/sources. */
-	create_groups (context, &on_this_computer, &on_ldap_servers, &personal_source);
-
-	/* figure out if we need the dialog displayed */
-	if (major == 1
-	    /* we only need the most recent upgrade point here.
-	       further decomposition will happen below. */
-	    && (minor < 5 || (minor == 5 && revision <= 10)))
-		need_dialog = TRUE;
-	
-	if (need_dialog)
-		setup_progress_dialog (context);
-
-	if (major == 1) {
-		
-		if (minor < 5 || (minor == 5 && revision <= 2)) {
-			/* initialize our dialog */
-			dialog_set_label (context,
-					  _("The location and hierarchy of the Evolution contact "
-					    "folders has changed since Evolution 1.x.\n\nPlease be "
-					    "patient while Evolution migrates your folders..."));
-
-			if (on_this_computer)
-				migrate_local_folders (context, on_this_computer, personal_source);
-			if (on_ldap_servers)
-				migrate_ldap_servers (context, on_ldap_servers);
-
-			migrate_completion_folders (context);
-		}
-
-		if (minor < 5 || (minor == 5 && revision <= 7)) {
-			dialog_set_label (context,
-					  _("The format of mailing list contacts has changed.\n\n"
-					    "Please be patient while Evolution migrates your "
-					    "folders..."));
-
-			migrate_contact_lists_for_local_folders (context, on_this_computer);
-		}
-
-		if (minor < 5 || (minor == 5 && revision <= 8)) {
-			dialog_set_label (context,
-					  _("The way Evolution stores some phone numbers has changed.\n\n"
-					    "Please be patient while Evolution migrates your "
-					    "folders..."));
-
-			migrate_company_phone_for_local_folders (context, on_this_computer);
-		}
-		
-		if (minor < 5 || (minor == 5 && revision <= 10)) {
-			char *old_path, *new_path;
-			
-			dialog_set_label (context, _("Evolution's Palm Sync changelog and map files have changed.\n\n"
-						     "Please be patient while Evolution migrates your Pilot Sync data..."));
-			
-			old_path = g_build_filename (g_get_home_dir (), "evolution", "local", "Contacts", NULL);
-			new_path = g_build_filename (addressbook_component_peek_base_directory (component),
-						     "addressbook", "local", "system", NULL);
-			migrate_pilot_data (old_path, new_path);
-			g_free (new_path);
-			g_free (old_path);
-		}
-
-		/* we only need to do this next step if people ran
-		   older versions of 1.5.  We need to clear out the
-		   absolute URI's that were assigned to ESources
-		   during one phase of development, as they take
-		   precedent over relative uris (but aren't updated
-		   when editing an ESource). */
-		if (minor == 5 && revision <= 11) {
-			GSList *g;
-			for (g = e_source_list_peek_groups (context->source_list); g; g = g->next) {
-				ESourceGroup *group = g->data;
-				GSList *s;
-
-				for (s = e_source_group_peek_sources (group); s; s = s->next) {
-					ESource *source = s->data;
-					e_source_set_absolute_uri (source, NULL);
-				}
-			}
-		}
-	}
-
-	if (need_dialog)
-		dialog_close (context);
-
-	if (on_this_computer)
-		g_object_unref (on_this_computer);
-	if (on_ldap_servers)
-		g_object_unref (on_ldap_servers);
-	if (personal_source)
-		g_object_unref (personal_source);
-		
-
-	migration_context_free (context);
-
-	return TRUE;
-}
diff --git a/addressbook/gui/component/addressbook-migrate.h b/addressbook/gui/component/addressbook-migrate.h
deleted file mode 100644
index dc7c473e12..0000000000
--- a/addressbook/gui/component/addressbook-migrate.h
+++ /dev/null
@@ -1,31 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-/* 
- * Copyright (C) 2004, Novell, Inc.
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of version 2 of the GNU General Public
- * License as published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * General Public License for more details.
- *
- * You should have received a copy of the GNU General Public
- * License along with this program; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
- *
- * Author: Chris Toshok (toshok@ximian.com)
- */
-
-#ifndef _ADDRESSBOOK_MIGRATE_H_
-#define _ADDRESSBOOK_MIGRATE_H_
-
-#include "addressbook-component.h"
-
-struct _GError;
-
-int addressbook_migrate (AddressbookComponent *component, int major, int minor, int revision, struct _GError **err);
-
-#endif /* _ADDRESSBOOK_MIGRATE_H_ */
diff --git a/addressbook/gui/component/addressbook-view.c b/addressbook/gui/component/addressbook-view.c
deleted file mode 100644
index c4dcc00d40..0000000000
--- a/addressbook/gui/component/addressbook-view.c
+++ /dev/null
@@ -1,1399 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-/* addressbook-view.c
- *
- * Copyright (C) 2000, 2001, 2002, 2003 Ximian, Inc.
- * Copyright (C) 2004 Novell, Inc.
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of version 2 of the GNU General Public
- * License as published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * General Public License for more details.
- *
- * You should have received a copy of the GNU General Public
- * License along with this program; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
- *
- * Author: Chris Toshok (toshok@ximian.com)
- */
-
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
-
-#include <string.h>
-#include <glib.h>
-#include <gtk/gtkvbox.h>
-#include <gtk/gtknotebook.h>
-#include <gtk/gtkwidget.h>
-#include <gtk/gtkmessagedialog.h>
-#include <libgnome/gnome-i18n.h>
-#include <libgnomeui/gnome-app.h>
-#include <libgnomeui/gnome-href.h>
-#include <libgnomeui/gnome-uidefs.h>
-#include <bonobo/bonobo-generic-factory.h>
-#include <bonobo/bonobo-ui-util.h>
-#include <bonobo/bonobo-exception.h>
-#include <gal/util/e-util.h>
-#include <libedataserverui/e-source-selector.h>
-#include <libedataserverui/e-passwords.h>
-
-#include "widgets/misc/e-error.h"
-#include "widgets/misc/e-task-bar.h"
-#include "widgets/misc/e-info-label.h"
-
-
-#include "e-util/e-icon-factory.h"
-#include "shell/e-user-creatable-items-handler.h"
-
-#include "evolution-shell-component-utils.h"
-#include "e-activity-handler.h"
-#include "e-contact-editor.h"
-#include "addressbook-config.h"
-#include "addressbook.h"
-#include "addressbook-view.h"
-#include "addressbook-component.h"
-#include "addressbook/gui/search/e-addressbook-search-dialog.h"
-#include "addressbook/gui/widgets/e-addressbook-view.h"
-#include "addressbook/gui/widgets/eab-gui-util.h"
-#include "addressbook/gui/merging/eab-contact-merging.h"
-#include "addressbook/printing/e-contact-print.h"
-#include "addressbook/util/eab-book-util.h"
-#include "addressbook/gui/widgets/eab-popup.h"
-#include "addressbook/gui/widgets/eab-menu.h"
-
-#define PARENT_TYPE G_TYPE_OBJECT
-static GObjectClass *parent_class = NULL;
-
-/* This is used for the addressbook status bar */
-#define EVOLUTION_CONTACTS_PROGRESS_IMAGE "stock_contact"
-static GdkPixbuf *progress_icon = NULL;
-
-#define d(x)
-
-struct _AddressbookViewPrivate {
-	GtkWidget *notebook;
-	BonoboControl *folder_view_control;
-
-	GtkWidget *statusbar_widget;
-	EActivityHandler *activity_handler;
-
-	GtkWidget *info_widget;
-	GtkWidget *sidebar_widget;
-	GtkWidget *selector;
-
-	GConfClient *gconf_client;
-
-	GHashTable *uid_to_view;
-	GHashTable *uid_to_editor;
-
-	EBook *book;
-	guint activity_id;
-	ESourceList *source_list;
-	char *passwd;
-	EUserCreatableItemsHandler *creatable_items_handler;
-
-	EABMenu *menu;
-};
-
-enum DndTargetType {
-	DND_TARGET_TYPE_VCARD_LIST,
-	DND_TARGET_TYPE_SOURCE_VCARD_LIST
-};
-#define VCARD_TYPE        "text/x-vcard"
-#define SOURCE_VCARD_TYPE "text/x-source-vcard"
-static GtkTargetEntry drag_types[] = {
-	{ SOURCE_VCARD_TYPE, 0, DND_TARGET_TYPE_SOURCE_VCARD_LIST },
-	{ VCARD_TYPE, 0, DND_TARGET_TYPE_VCARD_LIST }
-};
-static gint num_drag_types = sizeof(drag_types) / sizeof(drag_types[0]);
-
-static void set_status_message (EABView *eav, const char *message, AddressbookView *view);
-static void search_result (EABView *eav, EBookViewStatus status, AddressbookView *view);
-
-static void activate_source (AddressbookView *view, ESource *source);
-
-static void addressbook_view_init	(AddressbookView      *view);
-static void addressbook_view_class_init	(AddressbookViewClass *klass);
-static void addressbook_view_dispose    (GObject *object);
-
-typedef struct {
-	GtkWidget *editor;
-	char *uid;
-	AddressbookView *view;
-} EditorUidClosure;
-
-static void
-editor_weak_notify (gpointer data, GObject *o)
-{
-	EditorUidClosure *closure = data;
-	AddressbookViewPrivate *priv = closure->view->priv;
-
-	g_hash_table_remove (priv->uid_to_editor,
-			     closure->uid);
-}
-
-static EABView *
-get_current_view (AddressbookView *view)
-{
-	AddressbookViewPrivate *priv = view->priv;
-
-	return EAB_VIEW (gtk_notebook_get_nth_page (GTK_NOTEBOOK (priv->notebook),
-						    gtk_notebook_get_current_page (GTK_NOTEBOOK (priv->notebook))));
-}
-
-static void
-save_contact_cb (BonoboUIComponent *uih, void *user_data, const char *path)
-{
-	AddressbookView *view = (AddressbookView *) user_data;
-	EABView *v = get_current_view (view);
-	if (v)
-		eab_view_save_as(v);
-}
-
-static void
-view_contact_cb (BonoboUIComponent *uih, void *user_data, const char *path)
-{
-	AddressbookView *view = (AddressbookView *) user_data;
-	EABView *v = get_current_view (view);
-	if (v)
-		eab_view_view(v);
-}
-
-static void
-search_cb (BonoboUIComponent *uih, void *user_data, const char *path)
-{
-	AddressbookView *view = (AddressbookView *) user_data;
-	EABView *v = get_current_view (view);
-	if (v)
-		gtk_widget_show(eab_search_dialog_new(v));
-}
-
-static void
-delete_contact_cb (BonoboUIComponent *uih, void *user_data, const char *path)
-{
-	AddressbookView *view = (AddressbookView *) user_data;
-	EABView *v = get_current_view (view);
-	if (v)
-		eab_view_delete_selection(v);
-}
-
-static void
-print_cb (BonoboUIComponent *uih, void *user_data, const char *path)
-{
-	AddressbookView *view = (AddressbookView *) user_data;
-	EABView *v = get_current_view (view);
-	if (v)
-		eab_view_print(v);
-}
-
-static void
-print_preview_cb (BonoboUIComponent *uih, void *user_data, const char *path)
-{
-	AddressbookView *view = (AddressbookView *) user_data;
-	EABView *v = get_current_view (view);
-	if (v)
-		eab_view_print_preview(v);
-}
-
-static void
-stop_loading_cb (BonoboUIComponent *uih, void *user_data, const char *path)
-{
-	AddressbookView *view = (AddressbookView *) user_data;
-	EABView *v = get_current_view (view);
-	if (v)
-		eab_view_stop(v);
-}
-
-static void
-cut_contacts_cb (BonoboUIComponent *uih, void *user_data, const char *path)
-{
-	AddressbookView *view = (AddressbookView *) user_data;
-	EABView *v = get_current_view (view);
-	if (v)
-		eab_view_cut(v);
-}
-
-static void
-copy_contacts_cb (BonoboUIComponent *uih, void *user_data, const char *path)
-{
-	AddressbookView *view = (AddressbookView *) user_data;
-	EABView *v = get_current_view (view);
-	if (v)
-		eab_view_copy(v);
-}
-
-static void
-paste_contacts_cb (BonoboUIComponent *uih, void *user_data, const char *path)
-{
-	AddressbookView *view = (AddressbookView *) user_data;
-	EABView *v = get_current_view (view);
-	if (v)
-		eab_view_paste(v);
-}
-
-static void
-select_all_contacts_cb (BonoboUIComponent *uih, void *user_data, const char *path)
-{
-	AddressbookView *view = (AddressbookView *) user_data;
-	EABView *v = get_current_view (view);
-	if (v)
-		eab_view_select_all (v);
-}
-
-static void
-send_contact_cb (BonoboUIComponent *uih, void *user_data, const char *path)
-{
-	AddressbookView *view = (AddressbookView *) user_data;
-	EABView *v = get_current_view (view);
-	if (v)
-		eab_view_send (v);
-}
-
-static void
-send_contact_to_cb (BonoboUIComponent *uih, void *user_data, const char *path)
-{
-	AddressbookView *view = (AddressbookView *) user_data;
-	EABView *v = get_current_view (view);
-	if (v)
-		eab_view_send_to (v);
-}
-
-static void
-copy_contact_to_cb (BonoboUIComponent *uih, void *user_data, const char *path)
-{
-	AddressbookView *view = (AddressbookView *) user_data;
-	EABView *v = get_current_view (view);
-	if (v)
-		eab_view_copy_to_folder (v);
-}
-
-static void
-move_contact_to_cb (BonoboUIComponent *uih, void *user_data, const char *path)
-{
-	AddressbookView *view = (AddressbookView *) user_data;
-	EABView *v = get_current_view (view);
-	if (v)
-		eab_view_move_to_folder (v);
-}
-
-static void
-forget_passwords_cb (BonoboUIComponent *uih, void *user_data, const char *path)
-{
-	e_passwords_forget_passwords();
-}
-
-static void
-set_status_message (EABView *eav, const char *message, AddressbookView *view)
-{
-	AddressbookViewPrivate *priv = view->priv;
-	EActivityHandler *activity_handler = priv->activity_handler;
-
-	if (!message || !*message) {
-		if (priv->activity_id != 0) {
-			e_activity_handler_operation_finished (activity_handler, priv->activity_id);
-			priv->activity_id = 0;
-		}
-	} else if (priv->activity_id == 0) {
-		char *clientid = g_strdup_printf ("%p", view);
-
-		if (progress_icon == NULL)
-			progress_icon = e_icon_factory_get_icon (EVOLUTION_CONTACTS_PROGRESS_IMAGE, E_ICON_SIZE_STATUS);
-
-		priv->activity_id = e_activity_handler_operation_started (activity_handler, clientid,
-									  progress_icon, message, TRUE);
-
-		g_free (clientid);
-	} else {
-		e_activity_handler_operation_progressing (activity_handler, priv->activity_id, message, -1.0);
-	}
-
-}
-
-static void
-set_folder_bar_message (EABView *eav, const char *message, AddressbookView *view)
-{
-	AddressbookViewPrivate *priv = view->priv;
-	EABView *current_view = get_current_view (view);
-
-	if (eav == current_view) {
-		ESource *source = eav->source;
-
-		if (source) {
-			const char *name = e_source_peek_name (source);
-
-			e_info_label_set_info((EInfoLabel*)priv->info_widget, name, message);
-		}
-	}
-}
-
-static void
-search_result (EABView *eav, EBookViewStatus status, AddressbookView *view)
-{
-	eab_search_result_dialog (NULL /* XXX */, status);
-}
-
-static void
-update_command_state (EABView *eav, AddressbookView *view)
-{
-	AddressbookViewPrivate *priv = view->priv;
-	BonoboUIComponent *uic;
-	EABMenuTargetSelect *target;
-
-	if (eav != get_current_view (view))
-		return;
-
-	g_object_ref (view);
-
-	target = eab_view_get_menu_target(eav, priv->menu);
-	e_menu_update_target((EMenu *)priv->menu, target);
-
-	uic = bonobo_control_get_ui_component (priv->folder_view_control);
-
-	/* TODO: this stuff can mostly be made to use the target bits instead */
-
-	if (bonobo_ui_component_get_container (uic) != CORBA_OBJECT_NIL) {
-#define SET_SENSITIVE(verb,f) \
-	bonobo_ui_component_set_prop (uic, (verb), "sensitive", (f)(eav) ? "1" : "0", NULL)
-
-		SET_SENSITIVE ("/commands/ContactsSaveAsVCard", eab_view_can_save_as);
-		SET_SENSITIVE ("/commands/ContactsView", eab_view_can_view);
-
-		/* Print Contact */
-		SET_SENSITIVE ("/commands/ContactsPrint", eab_view_can_print);
-		SET_SENSITIVE ("/commands/ContactsPrintPreview", eab_view_can_print);
-
-		/* Delete Contact */
-		SET_SENSITIVE ("/commands/ContactDelete", eab_view_can_delete);
-		SET_SENSITIVE ("/commands/ContactsCut", eab_view_can_cut);
-
-		SET_SENSITIVE ("/commands/ContactsCopy", eab_view_can_copy);
-		SET_SENSITIVE ("/commands/ContactsPaste", eab_view_can_paste);
-		SET_SENSITIVE ("/commands/ContactsSelectAll", eab_view_can_select_all);
-		SET_SENSITIVE ("/commands/ContactsSendContactToOther", eab_view_can_send);
-		SET_SENSITIVE ("/commands/ContactsSendMessageToContact", eab_view_can_send_to);
-		SET_SENSITIVE ("/commands/ContactsMoveToFolder", eab_view_can_move_to_folder);
-		SET_SENSITIVE ("/commands/ContactsCopyToFolder", eab_view_can_copy_to_folder);
-
-		/* Stop */
-		SET_SENSITIVE ("/commands/ContactStop", eab_view_can_stop);
-#undef SET_SENSITIVE
-	}
-
-	g_object_unref (view);
-}
-
-static BonoboUIVerb verbs [] = {
-	BONOBO_UI_UNSAFE_VERB ("ContactsPrint", print_cb),
-	BONOBO_UI_UNSAFE_VERB ("ContactsPrintPreview", print_preview_cb),
-	BONOBO_UI_UNSAFE_VERB ("ContactsSaveAsVCard", save_contact_cb),
-	BONOBO_UI_UNSAFE_VERB ("ContactsView", view_contact_cb),
-
-	BONOBO_UI_UNSAFE_VERB ("ContactDelete", delete_contact_cb),
-	BONOBO_UI_UNSAFE_VERB ("ContactStop", stop_loading_cb),
-
-	BONOBO_UI_UNSAFE_VERB ("ContactsCut", cut_contacts_cb),
-	BONOBO_UI_UNSAFE_VERB ("ContactsCopy", copy_contacts_cb),
-	BONOBO_UI_UNSAFE_VERB ("ContactsPaste", paste_contacts_cb),
-	BONOBO_UI_UNSAFE_VERB ("ContactsSelectAll", select_all_contacts_cb),
-
-	BONOBO_UI_UNSAFE_VERB ("ContactsSendContactToOther", send_contact_cb),
-	BONOBO_UI_UNSAFE_VERB ("ContactsSendMessageToContact", send_contact_to_cb),
-	BONOBO_UI_UNSAFE_VERB ("ContactsMoveToFolder", move_contact_to_cb),
-	BONOBO_UI_UNSAFE_VERB ("ContactsCopyToFolder", copy_contact_to_cb),
-	BONOBO_UI_UNSAFE_VERB ("ContactsForgetPasswords", forget_passwords_cb),
-	/* ContactsViewPreview is a toggle */
-
-	BONOBO_UI_VERB_END
-};
-
-static EPixmap pixmaps [] = {
-	E_PIXMAP ("/menu/File/FileOps/ContactsSaveAsVCard", "stock_save-as", E_ICON_SIZE_MENU),
-	E_PIXMAP ("/menu/File/Print/ContactsPrint", "stock_print", E_ICON_SIZE_MENU),
-	E_PIXMAP ("/menu/File/Print/ContactsPrintPreview", "stock_print-preview", E_ICON_SIZE_MENU),
-
-	E_PIXMAP ("/menu/EditPlaceholder/Edit/ContactsCut", "stock_cut", E_ICON_SIZE_MENU),
-	E_PIXMAP ("/menu/EditPlaceholder/Edit/ContactsCopy", "stock_copy", E_ICON_SIZE_MENU),
-	E_PIXMAP ("/menu/EditPlaceholder/Edit/ContactsPaste", "stock_paste", E_ICON_SIZE_MENU),
-	E_PIXMAP ("/menu/EditPlaceholder/Edit/ContactDelete", "stock_delete", E_ICON_SIZE_MENU),
-
-	E_PIXMAP ("/Toolbar/ContactsPrint", "stock_print", E_ICON_SIZE_LARGE_TOOLBAR),
-	E_PIXMAP ("/Toolbar/ContactDelete", "stock_delete", E_ICON_SIZE_LARGE_TOOLBAR),
-
-	E_PIXMAP_END
-};
-
-static void
-control_activate (BonoboControl     *control,
-		  BonoboUIComponent *uic,
-		  AddressbookView   *view)
-{
-	AddressbookViewPrivate *priv = view->priv;
-	Bonobo_UIContainer remote_ui_container;
-	EABView *v = get_current_view (view);
-
-	remote_ui_container = bonobo_control_get_remote_ui_container (control, NULL);
-	bonobo_ui_component_set_container (uic, remote_ui_container, NULL);
-	bonobo_object_release_unref (remote_ui_container, NULL);
-
-	bonobo_ui_component_add_verb_list_with_data (
-		uic, verbs, view);
-	
-	bonobo_ui_component_freeze (uic, NULL);
-
-	bonobo_ui_util_set_ui (uic, PREFIX,
-			       EVOLUTION_UIDIR "/evolution-addressbook.xml",
-			       "evolution-addressbook", NULL);
-
-	if (v)
-		eab_view_setup_menus (v, uic);
-
-	e_pixmaps_update (uic, pixmaps);
-
-	e_user_creatable_items_handler_activate (priv->creatable_items_handler, uic);
-
-	bonobo_ui_component_thaw (uic, NULL);
-
-	if (v)
-		update_command_state (v, view);
-}
-
-static void
-control_activate_cb (BonoboControl *control, 
-		     gboolean activate, 
-		     AddressbookView *view)
-{
-	BonoboUIComponent *uic;
-	EABView *v = get_current_view (view);
-
-	uic = bonobo_control_get_ui_component (control);
-	g_assert (uic != NULL);
-
-	if (activate) {
-		control_activate (control, uic, view);
-		e_menu_activate((EMenu *)view->priv->menu, uic, activate);
-		if (activate && v && v->model)
-			eab_model_force_folder_bar_message (v->model);
-	} else {
-		e_menu_activate((EMenu *)view->priv->menu, uic, activate);
-		bonobo_ui_component_unset_container (uic, NULL);
-		eab_view_discard_menus (v);
-	}
-}
-
-static void
-gather_uids_foreach (char *key,
-		     gpointer value,
-		     GList **list)
-{
-	(*list) = g_list_prepend (*list, key);
-}
-
-static void
-source_list_changed_cb (ESourceList *source_list, AddressbookView *view)
-{
-	AddressbookViewPrivate *priv = view->priv;
-	GList *uids, *l;
-	EABView *v;
-
-	uids = NULL;
-	g_hash_table_foreach (priv->uid_to_view, (GHFunc)gather_uids_foreach, &uids);
-	for (l = uids; l; l = l->next) {
-		char *uid = l->data;
-		if (e_source_list_peek_source_by_uid (source_list, uid)) {
-			/* the source still exists, do nothing */
-		}
-		else {
-			/* the source no longer exists, remove its
-			   view remove it from our hash table. */
-			v = g_hash_table_lookup (priv->uid_to_view,
-						 uid);
-			gtk_notebook_remove_page (GTK_NOTEBOOK (priv->notebook),
-						  gtk_notebook_page_num (GTK_NOTEBOOK (priv->notebook),
-									 GTK_WIDGET (v)));
-			g_hash_table_remove (priv->uid_to_view, uid);
-		}
-	}
-	g_list_free (uids);
-
-	uids = NULL;
-	g_hash_table_foreach (priv->uid_to_editor, (GHFunc)gather_uids_foreach, &uids);
-	for (l = uids; l; l = l->next) {
-		char *uid = l->data;
-		if (e_source_list_peek_source_by_uid (source_list, uid)) {
-			/* the source still exists, do nothing */
-		}
-		else {
-			/* the source no longer exists, remove its
-			   editor remove it from our hash table. */
-			EditorUidClosure *closure = g_hash_table_lookup (priv->uid_to_editor,
-									 uid);
-			g_object_weak_unref (G_OBJECT (closure->editor),
-					     editor_weak_notify, closure);
-			gtk_widget_destroy (closure->editor);
-			g_hash_table_remove (priv->uid_to_editor, uid);
-		}
-	}
-	g_list_free (uids);
-
-	/* make sure we've got the current view selected and updated
-	   properly */
-	v = get_current_view (view);
-	if (v) {
-		eab_view_setup_menus (v, bonobo_control_get_ui_component (priv->folder_view_control));
-		update_command_state (v, view);
-	}
-}
-
-static void
-load_uri_for_selection (ESourceSelector *selector,
-			AddressbookView *view)
-{
-	ESource *selected_source = e_source_selector_peek_primary_selection (E_SOURCE_SELECTOR (selector));
-
-	if (selected_source != NULL)
-		activate_source (view, selected_source);
-}
-
-static ESource *
-find_first_source (ESourceList *source_list)
-{
-	GSList *groups, *sources, *l, *m;
-			
-	groups = e_source_list_peek_groups (source_list);
-	for (l = groups; l; l = l->next) {
-		ESourceGroup *group = l->data;
-				
-		sources = e_source_group_peek_sources (group);
-		for (m = sources; m; m = m->next) {
-			ESource *source = m->data;
-
-			return source;
-		}				
-	}
-
-	return NULL;
-}
-
-static void
-save_primary_selection (AddressbookView *view)
-{
-	AddressbookViewPrivate *priv = view->priv;
-	ESource *source;
-
-	source = e_source_selector_peek_primary_selection (E_SOURCE_SELECTOR (priv->selector));
-	if (!source)
-		return;
-
-	/* Save the selection for next time we start up */
-	gconf_client_set_string (priv->gconf_client,
-				 "/apps/evolution/addressbook/display/primary_addressbook",
-				 e_source_peek_uid (source), NULL);
-}
-
-static ESource *
-get_primary_source (AddressbookView *view)
-{
-	AddressbookViewPrivate *priv = view->priv;
-	ESource *source;
-	char *uid;
-
-	uid = gconf_client_get_string (priv->gconf_client,
-				       "/apps/evolution/addressbook/display/primary_addressbook",
-				       NULL);
-	if (uid) {
-		source = e_source_list_peek_source_by_uid (priv->source_list, uid);
-		g_free (uid);
-	} else {
-		/* Try to create a default if there isn't one */
-		source = find_first_source (priv->source_list);
-	}
-
-	return source;
-}
-
-static void
-load_primary_selection (AddressbookView *view)
-{
-	AddressbookViewPrivate *priv = view->priv;
-	ESource *source;
-
-	source = get_primary_source (view);
-	if (source)
-		e_source_selector_set_primary_selection (E_SOURCE_SELECTOR (priv->selector), source);
-}
-
-/* Folder popup menu callbacks */
-typedef struct {
-	AddressbookView *view;
-	ESource *selected_source;
-	GtkWidget *toplevel;
-} BookRemovedClosure;
-
-static void
-book_removed (EBook *book, EBookStatus status, gpointer data)
-{
-	BookRemovedClosure *closure = data;
-	AddressbookView *view = closure->view;
-	AddressbookViewPrivate *priv = view->priv;
-	ESource *source = closure->selected_source;
-	GtkWidget *toplevel = closure->toplevel;
-
-	g_free (closure);
-
-	g_object_unref (book);
-
-	if (E_BOOK_ERROR_OK == status) {
-		/* Remove source */
-		if (e_source_selector_source_is_selected (E_SOURCE_SELECTOR (priv->selector),
-							  source))
-			e_source_selector_unselect_source (E_SOURCE_SELECTOR (priv->selector),
-							   source);
-		
-		e_source_group_remove_source (e_source_peek_group (source), source);
-
-		e_source_list_sync (priv->source_list, NULL);
-	}
-	else {
-		e_error_run (GTK_WINDOW (toplevel),
-			     "addressbook:remove-addressbook",
-			     NULL);
-	}
-}
-
-static void
-delete_addressbook_cb(EPopup *ep, EPopupItem *pitem, void *data)
-{
-	AddressbookView *view = data;
-	AddressbookViewPrivate *priv = view->priv;
-	ESource *selected_source;
-	EBook  *book;
-	GError *error = NULL;
-	GtkWindow *toplevel;
-
-	selected_source = e_source_selector_peek_primary_selection (E_SOURCE_SELECTOR (priv->selector));
-	if (!selected_source)
-		return;
-
-	toplevel = (GtkWindow *)gtk_widget_get_toplevel(ep->target->widget);
-
-	if (e_error_run(toplevel, "addressbook:ask-delete-addressbook", e_source_peek_name(selected_source)) != GTK_RESPONSE_YES)
-		return;
-
-	/* Remove local data */
-	book = e_book_new (selected_source, &error);
-	if (book) {
-		BookRemovedClosure *closure = g_new (BookRemovedClosure, 1);
-
-		closure->toplevel = (GtkWidget *)toplevel;
-		closure->view = view;
-		closure->selected_source = selected_source;
-
-		if (e_book_async_remove (book, book_removed, closure)) {
-			e_error_run (toplevel, "addressbook:remove-addressbook", NULL);
-			g_free (closure);
-			g_object_unref (book);
-		}
-	}
-}
-
-static void
-new_addressbook_cb(EPopup *ep, EPopupItem *pitem, void *data)
-{
-	addressbook_config_create_new_source (gtk_widget_get_toplevel(ep->target->widget));
-}
-
-static void
-edit_addressbook_cb(EPopup *ep, EPopupItem *pitem, void *data)
-{
-	AddressbookView *view = data;
-	AddressbookViewPrivate *priv = view->priv;
-	ESource *selected_source;
-	const char *uid;
-	EditorUidClosure *closure;
-
-	selected_source =
-		e_source_selector_peek_primary_selection (E_SOURCE_SELECTOR (priv->selector));
-	if (!selected_source)
-		return;
-
-	uid = e_source_peek_uid (selected_source);
-
-	closure = g_hash_table_lookup (priv->uid_to_editor, uid);
-	if (!closure) {
-		char *uid_copy = g_strdup (uid);
-
-		closure = g_new (EditorUidClosure, 1);
-		closure->editor = addressbook_config_edit_source (gtk_widget_get_toplevel(ep->target->widget), selected_source);
-		closure->uid = uid_copy;
-		closure->view = view;
-
-		g_hash_table_insert (priv->uid_to_editor,
-				     uid_copy,
-				     closure);
-
-		g_object_weak_ref (G_OBJECT (closure->editor),
-				   editor_weak_notify, closure);
-	}
-
-	gtk_window_present (GTK_WINDOW (closure->editor));
-}
-
-/* Callbacks.  */
-
-static void
-primary_source_selection_changed_callback (ESourceSelector *selector,
-					   AddressbookView *view)
-{
-	load_uri_for_selection (selector, view);
-	save_primary_selection (view);
-}
-
-static EPopupItem abv_source_popups[] = {
-	{ E_POPUP_ITEM, "10.new", N_("New Address Book"), new_addressbook_cb, NULL, "stock_contact", 0, 0 },
-	{ E_POPUP_ITEM, "20.delete", N_("Delete"), delete_addressbook_cb, NULL, "stock_delete", 0, EAB_POPUP_SOURCE_USER|EAB_POPUP_SOURCE_PRIMARY },
-	{ E_POPUP_BAR,  "30.bar"},
-	{ E_POPUP_ITEM, "30.properties", N_("Properties..."), edit_addressbook_cb, NULL,"stock_folder-properties", 0, EAB_POPUP_SOURCE_PRIMARY },
-};
-
-static void
-abv_source_popup_free(EPopup *ep, GSList *list, void *data)
-{
-	g_slist_free(list);
-}
-
-static gboolean
-popup_event_callback(ESourceSelector *selector, ESource *source, GdkEventButton *event, AddressbookView *view)
-{
-	EABPopup *ep;
-	EABPopupTargetSource *t;
-	GSList *menus = NULL;
-	int i;
-	GtkMenu *menu;
-
-	ep = eab_popup_new("org.gnome.evolution.addressbook.source.popup");
-	t = eab_popup_target_new_source(ep, selector);
-	t->target.widget = (GtkWidget *)view->priv->notebook;
-
-	for (i=0;i<sizeof(abv_source_popups)/sizeof(abv_source_popups[0]);i++)
-		menus = g_slist_prepend(menus, &abv_source_popups[i]);
-
-	e_popup_add_items((EPopup *)ep, menus, NULL, abv_source_popup_free, view);
-
-	menu = e_popup_create_menu_once((EPopup *)ep, (EPopupTarget *)t, 0);
-	gtk_menu_popup(menu, NULL, NULL, NULL, NULL, event?event->button:0, event?event->time:gtk_get_current_event_time());
-
-	return TRUE;
-}
-
-static gboolean
-selector_tree_drag_drop (GtkWidget *widget, 
-			 GdkDragContext *context, 
-			 int x, 
-			 int y, 
-			 guint time, 
-			 AddressbookView *view)
-{
-	GtkTreeViewColumn *column;
-	int cell_x;
-	int cell_y;
-	GtkTreePath *path;
-	GtkTreeModel *model;
-	GtkTreeIter iter;
-	gpointer data;
-	
-	if (!gtk_tree_view_get_path_at_pos  (GTK_TREE_VIEW (widget), x, y, &path, &column, &cell_x, &cell_y))
-		return FALSE;
-	
-	model = gtk_tree_view_get_model (GTK_TREE_VIEW (widget));
-
-	if (!gtk_tree_model_get_iter (model, &iter, path)) {
-		gtk_tree_path_free (path);
-		return FALSE;
-	}
-
-	gtk_tree_model_get (model, &iter, 0, &data, -1);
-	
-	if (E_IS_SOURCE_GROUP (data)) {
-		g_object_unref (data);
-		gtk_tree_path_free (path);
-		return FALSE;
-	}
-	
-	gtk_tree_path_free (path);
-	return TRUE;
-}
-	
-static gboolean
-selector_tree_drag_motion (GtkWidget *widget,
-			   GdkDragContext *context,
-			   int x,
-			   int y)
-{
-	GtkTreePath *path = NULL;
-	gpointer data = NULL;
-	GtkTreeViewDropPosition pos;
-	GtkTreeModel *model;
-	GtkTreeIter iter;
-	GdkDragAction action;
-	
-	if (!gtk_tree_view_get_dest_row_at_pos (GTK_TREE_VIEW (widget),
-						x, y, &path, &pos))
-		goto finish;
-	
-	model = gtk_tree_view_get_model (GTK_TREE_VIEW (widget));
-	
-	if (!gtk_tree_model_get_iter (model, &iter, path))
-		goto finish;
-	
-	gtk_tree_model_get (model, &iter, 0, &data, -1);
-
-	if (E_IS_SOURCE_GROUP (data) || e_source_get_readonly (data))
-		goto finish;
-	
-	gtk_tree_view_set_drag_dest_row(GTK_TREE_VIEW (widget), path, GTK_TREE_VIEW_DROP_INTO_OR_BEFORE);
-	action = context->suggested_action;
-
- finish:
-	if (path)
-		gtk_tree_path_free (path);
-	if (data)
-		g_object_unref (data);
-      
-	gdk_drag_status (context, action, GDK_CURRENT_TIME);
-	return TRUE;
-}
-
-typedef struct
-{
-	guint     remove_from_source : 1;
-	guint     copy_done          : 1;
-	gint      pending_removals;
-
-	EContact *current_contact;
-	GList    *remaining_contacts;
-
-	EBook    *source_book;
-	EBook    *target_book;
-}
-MergeContext;
-
-static void
-destroy_merge_context (MergeContext *merge_context)
-{
-	if (merge_context->source_book)
-		g_object_unref (merge_context->source_book);
-	if (merge_context->target_book)
-		g_object_unref (merge_context->target_book);
-
-	g_free (merge_context);
-}
-
-static void
-removed_contact_cb (EBook *book, EBookStatus status, gpointer closure)
-{
-	MergeContext *merge_context = closure;
-
-	merge_context->pending_removals--;
-
-	if (merge_context->copy_done && merge_context->pending_removals == 0) {
-		/* Finished */
-
-		destroy_merge_context (merge_context);
-	}
-}
-
-static void
-merged_contact_cb (EBook *book, EBookStatus status, const char *id, gpointer closure)
-{
-	MergeContext *merge_context = closure;
-
-	if (merge_context->remove_from_source && status == E_BOOK_ERROR_OK) {
-		/* Remove previous contact from source */
-
-		e_book_async_remove_contact (merge_context->source_book, merge_context->current_contact,
-					     removed_contact_cb, merge_context);
-		merge_context->pending_removals++;
-	}
-
-	g_object_unref (merge_context->current_contact);
-
-	if (merge_context->remaining_contacts) {
-		/* Copy next contact */
-
-		merge_context->current_contact = merge_context->remaining_contacts->data;
-		merge_context->remaining_contacts = g_list_delete_link (merge_context->remaining_contacts,
-									merge_context->remaining_contacts);
-		eab_merging_book_add_contact (merge_context->target_book, merge_context->current_contact,
-					      merged_contact_cb, merge_context);
-	} else if (merge_context->pending_removals == 0) {
-		/* Finished */
-
-		destroy_merge_context (merge_context);
-	} else {
-		/* Finished, but have pending removals */
-
-		merge_context->copy_done = TRUE;
-	}
-}
-
-static gboolean 
-selector_tree_drag_data_received (GtkWidget *widget, 
-				  GdkDragContext *context, 
-				  gint x, 
-				  gint y, 
-				  GtkSelectionData *data,
-				  guint info,
-				  guint time,
-				  gpointer user_data)
-{
-	GtkTreePath *path = NULL;
-	GtkTreeViewDropPosition pos;
-	gpointer target = NULL;
-	GtkTreeModel *model;
-	GtkTreeIter iter;
-	gboolean success = FALSE;
-	EBook *source_book, *target_book;
-	MergeContext *merge_context;
-	GList *contactlist;
-
-	if (!gtk_tree_view_get_dest_row_at_pos (GTK_TREE_VIEW (widget),
-						x, y, &path, &pos))
-		goto finish;
-	
-	model = gtk_tree_view_get_model (GTK_TREE_VIEW (widget));
-	
-	if (!gtk_tree_model_get_iter (model, &iter, path))
-		goto finish;
-	
-	gtk_tree_model_get (model, &iter, 0, &target, -1);
-
-	if (E_IS_SOURCE_GROUP (target) || e_source_get_readonly (target))
-		goto finish;
-	
-	target_book = e_book_new (target, NULL);
-	if (!target_book) {
-		g_message (G_STRLOC ":Couldn't create EBook.");
-		return FALSE;
-	}
-	e_book_open (target_book, TRUE, NULL);
-
-	eab_book_and_contact_list_from_string (data->data, &source_book, &contactlist);
-
-	if (source_book) {
-		if (!e_book_open (source_book, FALSE, NULL)) {
-			g_warning (G_STRLOC ": Couldn't open source EBook.");
-			g_object_unref (source_book);
-			source_book = NULL;
-		}
-	} else {
-		g_warning (G_STRLOC ": No source EBook provided.");
-	}
-
-	/* Set up merge context */
-
-	merge_context = g_new0 (MergeContext, 1);
-
-	merge_context->source_book = source_book;
-	merge_context->target_book = target_book;
-
-	merge_context->current_contact = contactlist->data;
-	merge_context->remaining_contacts = g_list_delete_link (contactlist, contactlist);
-
-	merge_context->remove_from_source = context->suggested_action == GDK_ACTION_MOVE ? TRUE : FALSE;
-
-	/* Start merge */
-
-	eab_merging_book_add_contact (target_book, merge_context->current_contact,
-				      merged_contact_cb, merge_context);
-
- finish:
-	if (path)
-		gtk_tree_path_free (path);
-	if (target)
-		g_object_unref (target);
-		       
-	gtk_drag_finish (context, success, context->action == GDK_ACTION_MOVE, time);
-
-	return TRUE;
-}	
-
-static void
-selector_tree_drag_leave (GtkWidget *widget, GdkDragContext *context, guint time, gpointer data)
-{
-	gtk_tree_view_set_drag_dest_row(GTK_TREE_VIEW (widget), NULL, GTK_TREE_VIEW_DROP_BEFORE);
-}
-
-
-static void
-destroy_callback(gpointer data, GObject *where_object_was)
-{
-	AddressbookView *view = data;
-	g_object_unref (view);
-}
-
-GType
-addressbook_view_get_type (void)
-{
-	static GType type = 0;
-
-	if (!type) {
-		static const GTypeInfo info =  {
-			sizeof (AddressbookViewClass),
-			NULL,           /* base_init */
-			NULL,           /* base_finalize */
-			(GClassInitFunc) addressbook_view_class_init,
-			NULL,           /* class_finalize */
-			NULL,           /* class_data */
-			sizeof (EABView),
-			0,             /* n_preallocs */
-			(GInstanceInitFunc) addressbook_view_init,
-		};
-
-		type = g_type_register_static (PARENT_TYPE, "AddressbookView", &info, 0);
-	}
-
-	return type;
-}
-
-static void
-addressbook_view_class_init (AddressbookViewClass *klass)
-{
-	GObjectClass *object_class = G_OBJECT_CLASS (klass);
-
-	object_class->dispose = addressbook_view_dispose;
-
-	parent_class = g_type_class_peek_parent (klass);
-}
-
-static void
-addressbook_view_init (AddressbookView *view)
-{
-	AddressbookViewPrivate *priv;
-	GtkWidget *selector_scrolled_window;
-	AtkObject *a11y;
-
-	view->priv = 
-		priv = g_new0 (AddressbookViewPrivate, 1);
-
-	priv->gconf_client = addressbook_component_peek_gconf_client (addressbook_component_peek ());
-
-	priv->uid_to_view = g_hash_table_new_full (g_str_hash, g_str_equal, (GDestroyNotify)g_free, (GDestroyNotify)g_object_unref);
-	priv->uid_to_editor = g_hash_table_new_full (g_str_hash, g_str_equal, (GDestroyNotify)g_free, (GDestroyNotify)g_free);
-
-	priv->notebook = gtk_notebook_new ();
-	gtk_notebook_set_show_tabs (GTK_NOTEBOOK (priv->notebook), FALSE);
-	gtk_notebook_set_show_border (GTK_NOTEBOOK (priv->notebook), FALSE);
-
-	g_object_weak_ref (G_OBJECT (priv->notebook), destroy_callback, view);
-
-	/* Create the control. */
-	priv->folder_view_control = bonobo_control_new (priv->notebook);
-
-	gtk_widget_show (priv->notebook);
-
-	e_book_get_addressbooks (&priv->source_list, NULL);
-	g_signal_connect (priv->source_list,
-			  "changed",
-			  G_CALLBACK (source_list_changed_cb), view);
-
-	priv->creatable_items_handler = e_user_creatable_items_handler_new ("contacts", NULL, NULL);
-	priv->menu = eab_menu_new("org.gnome.evolution.addressbook.view");
-
-	g_signal_connect (priv->folder_view_control, "activate",
-			  G_CALLBACK (control_activate_cb), view);
-
-	priv->activity_handler = e_activity_handler_new ();
-
-	priv->statusbar_widget = e_task_bar_new ();
-	gtk_widget_show (priv->statusbar_widget);
-
-	e_activity_handler_attach_task_bar (priv->activity_handler,
-					    E_TASK_BAR (priv->statusbar_widget));
-
-	priv->info_widget = e_info_label_new("stock_contact");
-	e_info_label_set_info((EInfoLabel*)priv->info_widget, _("Contacts"), "");
-	gtk_widget_show (priv->info_widget);
-
-	priv->selector = e_source_selector_new (priv->source_list);
-
-	g_signal_connect  (priv->selector, "drag-motion", G_CALLBACK (selector_tree_drag_motion), view);
-	g_signal_connect  (priv->selector, "drag-leave", G_CALLBACK (selector_tree_drag_leave), view);
-	g_signal_connect  (priv->selector, "drag-drop", G_CALLBACK (selector_tree_drag_drop), view);
-	g_signal_connect  (priv->selector, "drag-data-received", G_CALLBACK (selector_tree_drag_data_received), view);
-	gtk_drag_dest_set (priv->selector, GTK_DEST_DEFAULT_ALL, drag_types, num_drag_types, GDK_ACTION_COPY | GDK_ACTION_MOVE);
-	a11y = gtk_widget_get_accessible (GTK_WIDGET (priv->selector));
-	atk_object_set_name (a11y, _("Contact Source Selector"));
-
-	e_source_selector_show_selection (E_SOURCE_SELECTOR (priv->selector), FALSE);
-	gtk_widget_show (priv->selector);
-
-	selector_scrolled_window = gtk_scrolled_window_new (NULL, NULL);
-	gtk_scrolled_window_set_shadow_type (GTK_SCROLLED_WINDOW (selector_scrolled_window), GTK_SHADOW_IN);
-	gtk_scrolled_window_set_policy (GTK_SCROLLED_WINDOW (selector_scrolled_window),
-					GTK_POLICY_AUTOMATIC, GTK_POLICY_AUTOMATIC);
-	gtk_container_add (GTK_CONTAINER (selector_scrolled_window), priv->selector);
-	gtk_widget_show (selector_scrolled_window);
-
-	priv->sidebar_widget = gtk_vbox_new(FALSE, 0);
-	gtk_box_pack_start(GTK_BOX (priv->sidebar_widget), priv->info_widget, FALSE, TRUE, 0);
-	gtk_box_pack_start(GTK_BOX (priv->sidebar_widget), selector_scrolled_window, TRUE, TRUE, 0);
-	gtk_widget_show (priv->sidebar_widget);
-
-	g_signal_connect_object (priv->selector, "primary_selection_changed",
-				 G_CALLBACK (primary_source_selection_changed_callback),
-				 G_OBJECT (view), 0);
-	g_signal_connect_object (priv->selector, "popup_event",
-				 G_CALLBACK (popup_event_callback),
-				 G_OBJECT (view), 0);
-
-	load_primary_selection (view);
-	load_uri_for_selection (E_SOURCE_SELECTOR (priv->selector), view);
-}
-
-static void
-destroy_editor (char *key,
-		gpointer value,
-		gpointer nada)
-{
-	EditorUidClosure *closure = value;
-
-	g_object_weak_unref (G_OBJECT (closure->editor),
-			     editor_weak_notify, closure);
-
-	gtk_widget_destroy (GTK_WIDGET (closure->editor));
-}
-
-static void
-addressbook_view_dispose (GObject *object)
-{
-	AddressbookView *view = ADDRESSBOOK_VIEW (object);
-	AddressbookViewPrivate *priv = view->priv;
-
-	if (view->priv) {
-		if (priv->book)
-			g_object_unref (priv->book);
-	
-		g_free(priv->passwd);
-
-		if (priv->source_list)
-			g_object_unref (priv->source_list);
-
-		if (priv->uid_to_view)
-			g_hash_table_destroy (priv->uid_to_view);
-
-		if (priv->uid_to_editor) {
-			g_hash_table_foreach (priv->uid_to_editor, (GHFunc)destroy_editor, NULL);
-			g_hash_table_destroy (priv->uid_to_editor);
-		}
-
-		if (priv->creatable_items_handler)
-			g_object_unref (priv->creatable_items_handler);
-
-		if (priv->menu)
-			g_object_unref (priv->menu);
-
-		g_free (view->priv);
-		view->priv = NULL;
-	}
-
-	if (G_OBJECT_CLASS (parent_class)->dispose)
-		(* G_OBJECT_CLASS (parent_class)->dispose) (object);
-}
-
-typedef struct {
-	EABView *view;
-	ESource *source;
-} BookOpenData;
-
-static void
-book_open_cb (EBook *book, EBookStatus status, gpointer closure)
-{
-	BookOpenData *data = closure;
-	EABView *view = data->view;
-	ESource *source = data->source;
-
-	g_free (data);
-
-	/* we always set the "source" property on the EABView, since
-	   we use it to reload a previously failed book. */
-	g_object_set(view,
-		     "source", source,
-		     NULL);
-
-	if (status == E_BOOK_ERROR_OK) {
-		g_object_set(view,
-			     "book", book,
-			     NULL);
-
-		if (view->model)
-			eab_model_force_folder_bar_message (view->model);
-	}
-	else if (status != E_BOOK_ERROR_CANCELLED) {
-		eab_load_error_dialog (NULL /* XXX */, source, status);
-	}
-
-
-	g_object_unref (source);
-}
-
-static void
-activate_source (AddressbookView *view,
-		 ESource *source)
-{
-	AddressbookViewPrivate *priv = view->priv;
-	const char *uid;
-	GtkWidget *uid_view;
-	EBook *book;
-	BookOpenData *data;
-
-	uid = e_source_peek_uid (source);
-	uid_view = g_hash_table_lookup (priv->uid_to_view, uid);
-
-	if (uid_view) {
-		/* there is a view for this uid.  make
-		   sure that the view actually
-		   contains an EBook (if it doesn't
-		   contain an EBook a previous load
-		   failed.  try to load it again */
-		g_object_get (uid_view,
-			      "book", &book,
-			      NULL);
-
-		if (book) {
-			g_object_unref (book);
-		}
-		else {
-			g_object_get (uid_view,
-				      "source", &source,
-				      NULL);
-
-			/* source can be NULL here, if
-			   a previous load hasn't
-			   actually made it to
-			   book_open_cb yet. */
-			if (source) {
-				book = e_book_new (source, NULL);
-
-				if (!book) {
-					g_object_unref (source);
-				}
-				else {
-					data = g_new (BookOpenData, 1);
-					data->view = g_object_ref (uid_view);
-					data->source = source; /* transfer the ref we get back from g_object_get */
-
-					addressbook_load (book, book_open_cb, data);
-				}
-			}
-		}
-	}
-	else {
-		/* we don't have a view for this uid already
-		   set up. */
-		GtkWidget *label = gtk_label_new (uid);
-		GError *error = NULL;
-
-		uid_view = eab_view_new ();
-
-		gtk_widget_show (uid_view);
-		gtk_widget_show (label);
-
-		g_object_set (uid_view, "type", EAB_VIEW_TABLE, NULL);
-
-		gtk_notebook_append_page (GTK_NOTEBOOK (priv->notebook),
-					  uid_view,
-					  label);
-
-		g_hash_table_insert (priv->uid_to_view, g_strdup (uid), uid_view);
-
-		g_signal_connect (uid_view, "status_message",
-				  G_CALLBACK(set_status_message), view);
-
-		g_signal_connect (uid_view, "search_result",
-				  G_CALLBACK(search_result), view);
-
-		g_signal_connect (uid_view, "folder_bar_message",
-				  G_CALLBACK(set_folder_bar_message), view);
-
-		g_signal_connect (uid_view, "command_state_change",
-				  G_CALLBACK(update_command_state), view);
-
-		book = e_book_new (source, &error);
-
-		if (book) {
-			data = g_new (BookOpenData, 1);
-			data->view = g_object_ref (uid_view);
-			data->source = g_object_ref (source);
-
-			addressbook_load (book, book_open_cb, data);
-		}
-		else {
-			g_warning ("error loading addressbook : %s", error->message);
-			g_error_free (error);
-		}
-	}
-
-	gtk_notebook_set_current_page (GTK_NOTEBOOK (priv->notebook),
-				       gtk_notebook_page_num (GTK_NOTEBOOK (priv->notebook),
-							      uid_view));
-
-	if (EAB_VIEW (uid_view)->model)
-		eab_model_force_folder_bar_message (EAB_VIEW (uid_view)->model);
-
-	/* change menus/toolbars to reflect the new view, assuming we are already displayed */
-	if (bonobo_ui_component_get_container (bonobo_control_get_ui_component (priv->folder_view_control)) != CORBA_OBJECT_NIL) {
-		eab_view_setup_menus (EAB_VIEW (uid_view), bonobo_control_get_ui_component (priv->folder_view_control));
-		update_command_state (EAB_VIEW (uid_view), view);
-	}
-}
-
-AddressbookView *
-addressbook_view_new (void)
-{
-	return g_object_new (ADDRESSBOOK_TYPE_VIEW, NULL);
-}
-
-EActivityHandler*
-addressbook_view_peek_activity_handler (AddressbookView *view)
-{
-	g_return_val_if_fail (ADDRESSBOOK_IS_VIEW (view), NULL);
-
-	return view->priv->activity_handler;
-}
-
-GtkWidget*
-addressbook_view_peek_info_label (AddressbookView *view)
-{
-	g_return_val_if_fail (ADDRESSBOOK_IS_VIEW (view), NULL);
-
-	return view->priv->info_widget;
-}
-
-GtkWidget*
-addressbook_view_peek_sidebar (AddressbookView *view)
-{
-	g_return_val_if_fail (ADDRESSBOOK_IS_VIEW (view), NULL);
-
-	return view->priv->sidebar_widget;
-}
-
-GtkWidget*
-addressbook_view_peek_statusbar (AddressbookView *view)
-{
-	g_return_val_if_fail (ADDRESSBOOK_IS_VIEW (view), NULL);
-
-	return view->priv->statusbar_widget;
-}
-
-BonoboControl*
-addressbook_view_peek_folder_view (AddressbookView *view)
-{
-	g_return_val_if_fail (ADDRESSBOOK_IS_VIEW (view), NULL);
-
-	return view->priv->folder_view_control;
-}
diff --git a/addressbook/gui/component/addressbook-view.h b/addressbook/gui/component/addressbook-view.h
deleted file mode 100644
index e2292c4527..0000000000
--- a/addressbook/gui/component/addressbook-view.h
+++ /dev/null
@@ -1,60 +0,0 @@
-/* -*- Mode: C; indent-tabs-mode: t; c-basic-offset: 8; tab-width: 8 -*- */
-/* addressbook-view.h
- *
- * Copyright (C) 2004  Novell, Inc.
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of version 2 of the GNU General Public
- * License as published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * General Public License for more details.
- *
- * You should have received a copy of the GNU General Public
- * License along with this program; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
- *
- * Author: Chris Toshok <toshok@ximian.com>
- */
-
-#ifndef _ADDRESSBOOK_VIEW_H_
-#define _ADDRESSBOOK_VIEW_H_
-
-#include <bonobo/bonobo-control.h>
-
-#define ADDRESSBOOK_TYPE_VIEW			(addressbook_view_get_type ())
-#define ADDRESSBOOK_VIEW(obj)			(G_TYPE_CHECK_INSTANCE_CAST ((obj), ADDRESSBOOK_TYPE_VIEW, AddressbookView))
-#define ADDRESSBOOK_VIEW_CLASS(klass)		(G_TYPE_CHECK_CLASS_CAST ((klass), ADDRESSBOOK_TYPE_VIEW, AddressbookViewClass))
-#define ADDRESSBOOK_IS_VIEW(obj)			(G_TYPE_CHECK_INSTANCE_TYPE ((obj), ADDRESSBOOK_TYPE_VIEW))
-#define ADDRESSBOOK_IS_VIEW_CLASS(klass)		(G_TYPE_CHECK_CLASS_TYPE ((obj), ADDRESSBOOK_TYPE_VIEW))
-
-
-typedef struct _AddressbookView        AddressbookView;
-typedef struct _AddressbookViewPrivate AddressbookViewPrivate;
-typedef struct _AddressbookViewClass   AddressbookViewClass;
-
-struct _AddressbookView {
-	GObject parent;
-
-	AddressbookViewPrivate *priv;
-};
-
-struct _AddressbookViewClass {
-	GObjectClass parent_class;
-};
-
-
-GType addressbook_view_get_type (void);
-
-AddressbookView   *addressbook_view_new                   (void);
-
-EActivityHandler  *addressbook_view_peek_activity_handler (AddressbookView *view);
-GtkWidget         *addressbook_view_peek_info_label       (AddressbookView *view);
-GtkWidget         *addressbook_view_peek_sidebar          (AddressbookView *view);
-GtkWidget         *addressbook_view_peek_statusbar        (AddressbookView *view);
-BonoboControl     *addressbook_view_peek_folder_view      (AddressbookView *view);
-
-#endif /* _ADDRESSBOOK_VIEW_H_ */
diff --git a/addressbook/gui/component/addressbook.c b/addressbook/gui/component/addressbook.c
deleted file mode 100644
index 4e5ad6ac8e..0000000000
--- a/addressbook/gui/component/addressbook.c
+++ /dev/null
@@ -1,326 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-/* addressbook.c
- *
- * Copyright (C) 2000, 2001, 2002 Ximian, Inc.
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of version 2 of the GNU General Public
- * License as published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * General Public License for more details.
- *
- * You should have received a copy of the GNU General Public
- * License along with this program; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
- *
- * Author: Chris Lahey (clahey@ximian.com)
- */
-
-#include <config.h>
-
-#include <string.h>
-
-#include <gtk/gtkmessagedialog.h>
-#include <libgnome/gnome-i18n.h>
-#include <libebook/e-book.h>
-#include <libedataserverui/e-passwords.h>
-
-#include "widgets/misc/e-error.h"
-#include "addressbook.h"
-
-#define d(x)
-
-static void addressbook_authenticate (EBook *book, gboolean previous_failure,
-				      ESource *source, EBookCallback cb, gpointer closure);
-
-typedef struct {
-	EBookCallback cb;
-	ESource *source;
-	gpointer closure;
-	guint cancelled : 1;
-} LoadSourceData;
-
-static void
-free_load_source_data (LoadSourceData *data)
-{
-	if (data->source)
-		g_object_unref (data->source);
-	g_free (data);
-}
-
-/*this function removes of anything present after semicolon
-in uri*/
-
-static gchar*
-remove_parameters_from_uri (gchar *uri)
-{
-  gchar **components;
-  gchar *new_uri = NULL;
-                                                                                                                             
-  components = g_strsplit (uri, ";", 2);
-  if (components[0])
-        new_uri = g_strdup (components[0]);
-   g_strfreev (components);
-   return new_uri;
-}
-
-static void
-load_source_auth_cb (EBook *book, EBookStatus status, gpointer closure)
-{
-	LoadSourceData *data = closure;
-
-	if (data->cancelled) {
-		free_load_source_data (data);
-		return;
-	}
-
-	if (status != E_BOOK_ERROR_OK) {
-
-		/* the user clicked cancel in the password dialog */
-		if (status == E_BOOK_ERROR_CANCELLED) {
-
-			if (e_book_check_static_capability (book, "anon-access")) {
-
-				GtkWidget *dialog;
-
-				/* XXX "LDAP" has to be removed from the folowing message
-				   so that it wil valid for other servers which provide 
-				   anonymous access*/
-
-				dialog = gtk_message_dialog_new (NULL,
-						0,
-						GTK_MESSAGE_WARNING,
-						GTK_BUTTONS_OK,
-						_("Accessing LDAP Server anonymously"));
-				g_signal_connect (dialog, "response", G_CALLBACK(gtk_widget_destroy), NULL);
-				gtk_widget_show (dialog);
-				if (data->cb)
-					data->cb (book, E_BOOK_ERROR_OK, data->closure);
-				free_load_source_data (data);
-				return;
-			}
-		} else if (status == E_BOOK_ERROR_INVALID_SERVER_VERSION) {
-			e_error_run (NULL, "addressbook:server-version", NULL);
-			status = E_BOOK_ERROR_OK;
-			if (data->cb)
-				data->cb (book, status, data->closure);
-			free_load_source_data (data);
-			return;
-
-		} else {
-			gchar *uri = e_source_get_uri (data->source);
-			gchar *stripped_uri = remove_parameters_from_uri (uri);
-			const gchar *auth_domain = e_source_get_property (data->source, "auth-domain");
-			const gchar *component_name;
-
-			component_name = auth_domain ? auth_domain : "Addressbook";
-
-			e_passwords_forget_password (component_name, stripped_uri);
-			addressbook_authenticate (book, TRUE, data->source, load_source_auth_cb, closure);
-
-			g_free (stripped_uri);
-			g_free (uri);
-			return;
-		}
-	}
-
-	if (data->cb)
-		data->cb (book, status, data->closure);
-
-	free_load_source_data (data);
-}
-
-static gboolean
-get_remember_password (ESource *source)
-{
-	const gchar *value;
-
-	value = e_source_get_property (source, "remember_password");
-	if (value && !strcasecmp (value, "true"))
-		return TRUE;
-
-	return FALSE;
-}
-
-static void
-set_remember_password (ESource *source, gboolean value)
-{
-	e_source_set_property (source, "remember_password",
-			       value ? "true" : "false");
-}
-
-static void
-addressbook_authenticate (EBook *book, gboolean previous_failure, ESource *source,
-			  EBookCallback cb, gpointer closure)
-{
-	const char *password = NULL;
-	char *pass_dup = NULL;
-	const gchar *auth;
-	const gchar *user;
-	gchar *uri = e_source_get_uri (source);
-        gchar *stripped_uri = remove_parameters_from_uri (uri);
-	const gchar *auth_domain = e_source_get_property (source, "auth-domain");
-	const gchar *component_name;
-			
-	component_name = auth_domain ? auth_domain : "Addressbook";
-	g_free (uri);
-	uri = stripped_uri;
-
-	password = e_passwords_get_password (component_name, uri);
-
-	auth = e_source_get_property (source, "auth");
-
-	if (auth && !strcmp ("ldap/simple-binddn", auth))
-		user = e_source_get_property (source, "binddn");
-	else if (auth && !strcmp ("plain/password", auth))
-		user = e_source_get_property (source, "user");
-	else
-		user = e_source_get_property (source, "email_addr");
-	if (!user)
-		user = "";
-
-	if (!password) {
-		char *prompt;
-		char *password_prompt;
-		gboolean remember;
-		char *failed_auth;
-		guint32 flags = E_PASSWORDS_REMEMBER_FOREVER|E_PASSWORDS_SECRET|E_PASSWORDS_ONLINE;
-
-		if (previous_failure) {
-			failed_auth = _("Failed to authenticate.\n");
-			flags |= E_PASSWORDS_REPROMPT;
-		}
-		else {
-			failed_auth = "";
-		}
-
-		password_prompt = g_strdup_printf (_("Enter password for %s (user %s)"),
-					   e_source_peek_name (source), user);
-
-		prompt = g_strconcat (failed_auth, password_prompt, NULL);
-		g_free (password_prompt);
-
-		remember = get_remember_password (source);
-		pass_dup = e_passwords_ask_password (prompt, component_name, uri, prompt,
-						     flags, &remember,
-						     NULL);
-		if (remember != get_remember_password (source))
-			set_remember_password (source, remember);
-
-		g_free (prompt);
-	}
-
-	if (password || pass_dup) {
-		e_book_async_authenticate_user (book, user, password ? password : pass_dup,
-						e_source_get_property (source, "auth"),
-						cb, closure);
-		g_free (pass_dup);
-	}
-	else {
-		/* they hit cancel */
-	
-			cb (book, E_BOOK_ERROR_CANCELLED, closure);
-	}
-
-	g_free (uri);
-}
-
-
-
-static void
-auth_required_cb (EBook *book, gpointer data)
-{
-	LoadSourceData *load_source_data = g_new0(LoadSourceData, 1);
-	
-	load_source_data->source = g_object_ref (g_object_ref (e_book_get_source (book)));
-	load_source_data->cancelled = FALSE;
-	addressbook_authenticate (book, FALSE, load_source_data->source,
-				  load_source_auth_cb, load_source_data);
-	
-	
-	
-}
-static void
-load_source_cb (EBook *book, EBookStatus status, gpointer closure)
-{
-	LoadSourceData *load_source_data = closure;
-
-	if (load_source_data->cancelled) {
-		free_load_source_data (load_source_data);
-		return;
-	}
-
-	if (status == E_BOOK_ERROR_OK && book != NULL) {
-		const gchar *auth;
-
-		auth = e_source_get_property (load_source_data->source, "auth");
-		if (auth && strcmp (auth, "none")) {
-			g_signal_connect (book, "auth_required", auth_required_cb, NULL);
-			
-			if (e_book_is_online (book)) {
-				addressbook_authenticate (book, FALSE, load_source_data->source,
-							  load_source_auth_cb, closure);
-				return;
-		}
-		}
-	}
-	load_source_data->cb (book, status, load_source_data->closure);
-	free_load_source_data (load_source_data);
-}
-
-guint
-addressbook_load (EBook *book,
-		  EBookCallback cb, gpointer closure)
-{
-	LoadSourceData *load_source_data = g_new0 (LoadSourceData, 1);
-
-	load_source_data->cb = cb;
-	load_source_data->closure = closure;
-	load_source_data->source = g_object_ref (g_object_ref (e_book_get_source (book)));
-	load_source_data->cancelled = FALSE;
-
-	e_book_async_open (book, FALSE, load_source_cb, load_source_data);
-
-	return GPOINTER_TO_UINT (load_source_data);
-}
-
-void
-addressbook_load_cancel (guint id)
-{
-	LoadSourceData *load_source_data = GUINT_TO_POINTER (id);
-
-	load_source_data->cancelled = TRUE;
-}
-
-static void
-default_book_cb (EBook *book, EBookStatus status, gpointer closure)
-{
-	LoadSourceData *load_source_data = closure;
-
-	if (status == E_BOOK_ERROR_OK)
-		load_source_data->source = g_object_ref (e_book_get_source (book));
-
-	load_source_cb (book, status, closure);
-}
-
-void
-addressbook_load_default_book (EBookCallback cb, gpointer closure)
-{
-	LoadSourceData *load_source_data = g_new (LoadSourceData, 1);
-	EBook *book;
-
-	load_source_data->cb = cb;
-	load_source_data->source = NULL;
-	load_source_data->closure = closure;
-	load_source_data->cancelled = FALSE;
-
-	book = e_book_new_default_addressbook (NULL);
-	if (!book)
-		load_source_cb (NULL, E_BOOK_ERROR_OTHER_ERROR, load_source_data); /* XXX we should just use a GError and it's error code here */
-	else
-		e_book_async_open (book, FALSE, default_book_cb, load_source_data);
-}
diff --git a/addressbook/gui/component/addressbook.h b/addressbook/gui/component/addressbook.h
deleted file mode 100644
index a2a475951a..0000000000
--- a/addressbook/gui/component/addressbook.h
+++ /dev/null
@@ -1,14 +0,0 @@
-#ifndef __ADDRESSBOOK_H__
-#define __ADDRESSBOOK_H__
-
-#include <bonobo/bonobo-control.h>
-#include <e-util/e-config-listener.h>
-#include <bonobo/bonobo-object.h>
-#include <bonobo/bonobo-moniker-util.h>
-#include <libebook/e-book.h>
-
-guint      addressbook_load                 (EBook *book, EBookCallback cb, gpointer closure);
-void       addressbook_load_cancel          (guint id);
-void       addressbook_load_default_book    (EBookCallback open_response, gpointer closure);
-
-#endif /* __ADDRESSBOOK_H__ */
diff --git a/addressbook/gui/component/apps_evolution_addressbook.schemas.in.in b/addressbook/gui/component/apps_evolution_addressbook.schemas.in.in
deleted file mode 100644
index 010073331e..0000000000
--- a/addressbook/gui/component/apps_evolution_addressbook.schemas.in.in
+++ /dev/null
@@ -1,70 +0,0 @@
-<gconfschemafile>
-  <schemalist>
-
-    <!-- Completion uris -->
-
-    <schema>
-      <key>/schemas/apps/evolution/addressbook/completion/uris</key>
-      <applyto>/apps/evolution/addressbook/completion/uris</applyto>
-      <owner>evolution-addressbook</owner>
-      <type>string</type>
-      <default></default>
-      <locale name="C">
-        <short>EFolderList XML for the list of completion URIs</short>
-        <long>EFolderList XML for the list of completion URIs.</long>
-      </locale>
-    </schema>
-
-    <schema>
-      <key>/schemas/apps/evolution/addressbook/completion/minimum_query_length</key>
-      <applyto>/apps/evolution/addressbook/completion/minimum_query_length</applyto>
-      <owner>evolution-addressbook</owner>
-      <type>int</type>
-      <default>3</default>
-      <locale name="C">
-        <short>Autocomplete length</short>
-        <long>The number of characters that must be typed before Evolution will attempt to autocomplete.</long>
-      </locale>
-    </schema>
-
-    <!-- Select names last used uri -->
-
-    <schema>
-      <key>/schemas/apps/evolution/addressbook/select_names/last_used_uri</key>
-      <applyto>/apps/evolution/addressbook/select_names/last_used_uri</applyto>
-      <owner>evolution-addressbook</owner>
-      <type>string</type>
-      <default></default>
-      <locale name="C">
-        <short>URI for the folder last used in the select names dialog</short>
-        <long>URI for the folder last used in the select names dialog.</long>
-      </locale>
-    </schema>
-
-    <!-- View state -->
-
-    <schema>
-      <key>/schemas/apps/evolution/addressbook/display/vpane_position</key>
-      <applyto>/apps/evolution/addressbook/display/vpane_position</applyto>
-      <owner>evolution-addressbook</owner>
-      <type>int</type>
-      <locale name="C">
-        <short>Vertical pane position</short>
-        <long>Position of the vertical pane, between the card and list views and the preview pane, in pixels.</long>
-      </locale>
-    </schema>
-
-    <schema>
-      <key>/schemas/apps/evolution/addressbook/display/show_preview</key>
-      <applyto>/apps/evolution/addressbook/display/show_preview</applyto>
-      <owner>evolution-addressbook</owner>
-      <type>bool</type>
-      <default>true</default>
-      <locale name="C">
-         <short>Show preview pane</short> 
-         <long>Whether to show the preview pane.</long>
-      </locale>
-    </schema>
-
-  </schemalist>
-</gconfschemafile>
diff --git a/addressbook/gui/component/autocompletion-config.c b/addressbook/gui/component/autocompletion-config.c
deleted file mode 100644
index 0324ad838e..0000000000
--- a/addressbook/gui/component/autocompletion-config.c
+++ /dev/null
@@ -1,154 +0,0 @@
-/* -*- Mode: C; indent-tabs-mode: t; c-basic-offset: 8; tab-width: 8 -*- */
-/* e-shell-config-autocompletion.h - Configuration page for addressbook autocompletion.
- *
- * Copyright (C) 2003 Novell, Inc.
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of version 2 of the GNU General Public
- * License as published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * General Public License for more details.
- *
- * You should have received a copy of the GNU General Public
- * License along with this program; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
- *
- * Authors: Chris Toshok <toshok@ximian.com>
- */
-
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
-
-
-#include "autocompletion-config.h"
-
-#include "Evolution.h"
-
-#include <bonobo/bonobo-exception.h>
-
-#include <libedataserver/e-source-list.h>
-#include <libedataserverui/e-source-selector.h>
-#include <libgnome/gnome-i18n.h>
-#include <gtk/gtkscrolledwindow.h>
-#include <gtk/gtktreeselection.h>
-#include <gtk/gtkwidget.h>
-#include <gtk/gtksignal.h>
-
-
-typedef struct {
-	EvolutionConfigControl *config_control;
-
-	GtkWidget *control_widget;
-
-	ESourceList *source_list;
-} AutocompletionConfig;
-
-static void
-source_selection_changed (ESourceSelector *selector,
-			  AutocompletionConfig *ac)
-{
-	GSList *selection;
-	GSList *l;
-	GSList *groups;
-
-	/* first we clear all the completion flags from all sources */
-	for (groups = e_source_list_peek_groups (ac->source_list); groups; groups = groups->next) {
-		ESourceGroup *group = E_SOURCE_GROUP (groups->data);
-		GSList *sources;
-		for (sources = e_source_group_peek_sources (group); sources; sources = sources->next) {
-			ESource *source = E_SOURCE (sources->data);
-
-			e_source_set_property (source, "completion", NULL);
-		}
-	}
-
-	/* then we loop over the selector's selection, setting the
-	   property on those sources */
-	selection = e_source_selector_get_selection (selector);
-	for (l = selection; l; l = l->next) {
-		e_source_set_property (E_SOURCE (l->data), "completion", "true");
-	}
-	e_source_selector_free_selection (selection);
-
-	e_source_list_sync (ac->source_list, NULL); /* XXX we should pop up a dialog if this fails */
-}
-
-static void
-config_control_destroy_notify (void *data,
-			       GObject *where_the_config_control_was)
-{
-	AutocompletionConfig *ac = (AutocompletionConfig *) data;
-
-	g_object_unref (ac->source_list);
-
-	g_free (ac);
-}
-
-static void
-initialize_selection (AutocompletionConfig *ac)
-{
-	GSList *groups;
-
-	for (groups = e_source_list_peek_groups (ac->source_list); groups; groups = groups->next) {
-		ESourceGroup *group = E_SOURCE_GROUP (groups->data);
-		GSList *sources;
-		for (sources = e_source_group_peek_sources (group); sources; sources = sources->next) {
-			ESource *source = E_SOURCE (sources->data);
-			const char *completion = e_source_get_property (source, "completion");
-			if (completion && !g_ascii_strcasecmp (completion, "true"))
-				e_source_selector_select_source (E_SOURCE_SELECTOR (ac->control_widget),
-								 source);
-		}
-	}
-}
-
-EvolutionConfigControl*
-autocompletion_config_control_new (void)
-{
-	AutocompletionConfig *ac;
-	CORBA_Environment ev;
-	GtkWidget *scrolledwin;
-
-	ac = g_new0 (AutocompletionConfig, 1);
-
-	CORBA_exception_init (&ev);
-
-	ac->source_list =  e_source_list_new_for_gconf_default ("/apps/evolution/addressbook/sources");
-	/* XXX should we watch for the source list to change and
-	   update it in the control?  what about our local changes? */
-	/*	g_signal_connect (ac->source_list, "changed", G_CALLBACK (source_list_changed), ac); */
-
-	scrolledwin = gtk_scrolled_window_new (NULL, NULL);
-
-	gtk_scrolled_window_set_policy (GTK_SCROLLED_WINDOW (scrolledwin),
-					GTK_POLICY_AUTOMATIC,
-					GTK_POLICY_AUTOMATIC);
-	gtk_scrolled_window_set_shadow_type (GTK_SCROLLED_WINDOW (scrolledwin),
-					     GTK_SHADOW_IN);
-
-	ac->control_widget = e_source_selector_new (ac->source_list);
-	
-	gtk_container_add (GTK_CONTAINER (scrolledwin), ac->control_widget);
-
-	initialize_selection (ac);
-
-	gtk_widget_show (ac->control_widget);
-	gtk_widget_show (scrolledwin);
-
-	ac->config_control = evolution_config_control_new (scrolledwin);
-
-	g_signal_connect (ac->control_widget, "selection_changed",
-			  G_CALLBACK (source_selection_changed), ac);
-	
-	g_object_weak_ref (G_OBJECT (ac->config_control), config_control_destroy_notify, ac);
-
-	CORBA_exception_free (&ev);
-
-	return ac->config_control;
-}
-
diff --git a/addressbook/gui/component/autocompletion-config.h b/addressbook/gui/component/autocompletion-config.h
deleted file mode 100644
index 86f056477e..0000000000
--- a/addressbook/gui/component/autocompletion-config.h
+++ /dev/null
@@ -1,30 +0,0 @@
-/* -*- Mode: C; indent-tabs-mode: t; c-basic-offset: 8; tab-width: 8 -*- */
-/* e-shell-config-autocompletion.h - Configuration page for addressbook autocompletion.
- *
- * Copyright (C) 2003 Novell, Inc.
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of version 2 of the GNU General Public
- * License as published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * General Public License for more details.
- *
- * You should have received a copy of the GNU General Public
- * License along with this program; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
- *
- * Authors: Chris Toshok <toshok@ximian.com>
- */
-
-#ifndef _AUTOCOMPLETION_CONFIG_H
-#define _AUTOCOMPLETION_CONFIG_H
-
-#include "evolution-config-control.h"
-
-EvolutionConfigControl* autocompletion_config_control_new (void);
-
-#endif /* _AUTOCOMPLETION_CONFIG_H */
diff --git a/addressbook/gui/component/component-factory.c b/addressbook/gui/component/component-factory.c
deleted file mode 100644
index 4aaee9637b..0000000000
--- a/addressbook/gui/component/component-factory.c
+++ /dev/null
@@ -1,77 +0,0 @@
-/* -*- Mode: C; indent-tabs-mode: t; c-basic-offset: 8; tab-width: 8 -*- */
-/* component-factory.c - Factory for Evolution's Addressbook component.
- *
- * Copyright (C) 2002 Ximian, Inc.
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of version 2 of the GNU General Public
- * License as published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * General Public License for more details.
- *
- * You should have received a copy of the GNU General Public
- * License along with this program; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
- *
- * Author: Ettore Perazzoli <ettore@ximian.com>
- */
-
-#include <config.h>
-
-#include <string.h>
-#include "addressbook.h"
-#include "addressbook-component.h"
-#include "addressbook-config.h"
-#include "addressbook-view.h"
-#include "autocompletion-config.h"
-#include "eab-popup-control.h"
-#include "eab-vcard-control.h"
-#ifdef ENABLE_SMIME
-#include "smime/gui/certificate-manager.h"
-#endif
-#include <bonobo/bonobo-shlib-factory.h>
-
-
-#define FACTORY_ID "OAFIID:GNOME_Evolution_Addressbook_Factory:" BASE_VERSION
-
-#define VCARD_CONTROL_ID               "OAFIID:GNOME_Evolution_Addressbook_VCard_Control:" BASE_VERSION
-#define COMPONENT_ID                   "OAFIID:GNOME_Evolution_Addressbook_Component:" BASE_VERSION
-#define ADDRESS_POPUP_ID               "OAFIID:GNOME_Evolution_Addressbook_AddressPopup:" BASE_VERSION
-#define COMPLETION_CONFIG_CONTROL_ID "OAFIID:GNOME_Evolution_Addressbook_Autocompletion_ConfigControl:" BASE_VERSION
-#define CERTIFICATE_MANAGER_CONFIG_CONTROL_ID "OAFIID:GNOME_Evolution_SMime_CertificateManager_ConfigControl:" BASE_VERSION
-
-#define d(x)
-
-
-static BonoboObject *
-factory (BonoboGenericFactory *factory,
-	 const char *component_id,
-	 void *closure)
-{
-	d(printf ("asked to activate component_id `%s'\n", component_id));
-
-	if (strcmp (component_id, VCARD_CONTROL_ID) == 0)
-		return BONOBO_OBJECT (eab_vcard_control_new ());
-	if (strcmp (component_id, COMPONENT_ID) == 0) {
-		BonoboObject *object = BONOBO_OBJECT (addressbook_component_peek ());
-		bonobo_object_ref (object);
-		return object;
-	}
-	if (strcmp (component_id, ADDRESS_POPUP_ID) == 0)
-		return BONOBO_OBJECT (eab_popup_control_new ());
-	if (strcmp (component_id, COMPLETION_CONFIG_CONTROL_ID) == 0)
-		return BONOBO_OBJECT (autocompletion_config_control_new ());
-#ifdef ENABLE_SMIME
-        if (strcmp (component_id, CERTIFICATE_MANAGER_CONFIG_CONTROL_ID) == 0)
-                return BONOBO_OBJECT (certificate_manager_config_control_new ());
-#endif
-
-	g_warning (FACTORY_ID ": Don't know what to do with %s", component_id);
-	return NULL;
-}
-
-BONOBO_ACTIVATION_SHLIB_FACTORY (FACTORY_ID, "Evolution Addressbook component factory", factory, NULL)
diff --git a/addressbook/gui/component/ldap-config.glade b/addressbook/gui/component/ldap-config.glade
deleted file mode 100644
index 32ef5a6f72..0000000000
--- a/addressbook/gui/component/ldap-config.glade
+++ /dev/null
@@ -1,2676 +0,0 @@
-<?xml version="1.0" standalone="no"?> <!--*- mode: xml -*-->
-<!DOCTYPE glade-interface SYSTEM "http://glade.gnome.org/glade-2.0.dtd">
-
-<glade-interface>
-
-<widget class="GtkDialog" id="account-editor-window">
-  <property name="visible">True</property>
-  <property name="title" translatable="yes">Address Book Properties</property>
-  <property name="type">GTK_WINDOW_TOPLEVEL</property>
-  <property name="window_position">GTK_WIN_POS_NONE</property>
-  <property name="modal">False</property>
-  <property name="resizable">True</property>
-  <property name="destroy_with_parent">False</property>
-  <property name="decorated">True</property>
-  <property name="skip_taskbar_hint">False</property>
-  <property name="skip_pager_hint">False</property>
-  <property name="type_hint">GDK_WINDOW_TYPE_HINT_DIALOG</property>
-  <property name="gravity">GDK_GRAVITY_NORTH_WEST</property>
-  <property name="has_separator">False</property>
-
-  <child internal-child="vbox">
-    <widget class="GtkVBox" id="dialog-vbox7">
-      <property name="visible">True</property>
-      <property name="homogeneous">False</property>
-      <property name="spacing">0</property>
-
-      <child internal-child="action_area">
-	<widget class="GtkHButtonBox" id="dialog-action_area7">
-	  <property name="visible">True</property>
-	  <property name="layout_style">GTK_BUTTONBOX_END</property>
-
-	  <child>
-	    <widget class="GtkButton" id="account-editor-cancel-button">
-	      <property name="visible">True</property>
-	      <property name="can_default">True</property>
-	      <property name="can_focus">True</property>
-	      <property name="label">gtk-cancel</property>
-	      <property name="use_stock">True</property>
-	      <property name="relief">GTK_RELIEF_NORMAL</property>
-	      <property name="focus_on_click">True</property>
-	      <property name="response_id">-6</property>
-	    </widget>
-	  </child>
-
-	  <child>
-	    <widget class="GtkButton" id="account-editor-ok-button">
-	      <property name="visible">True</property>
-	      <property name="can_default">True</property>
-	      <property name="can_focus">True</property>
-	      <property name="label">gtk-ok</property>
-	      <property name="use_stock">True</property>
-	      <property name="relief">GTK_RELIEF_NORMAL</property>
-	      <property name="focus_on_click">True</property>
-	      <property name="response_id">-5</property>
-	    </widget>
-	  </child>
-	</widget>
-	<packing>
-	  <property name="padding">0</property>
-	  <property name="expand">False</property>
-	  <property name="fill">True</property>
-	  <property name="pack_type">GTK_PACK_END</property>
-	</packing>
-      </child>
-
-      <child>
-	<widget class="GtkNotebook" id="account-editor-notebook">
-	  <property name="border_width">12</property>
-	  <property name="visible">True</property>
-	  <property name="can_focus">True</property>
-	  <property name="show_tabs">True</property>
-	  <property name="show_border">True</property>
-	  <property name="tab_pos">GTK_POS_TOP</property>
-	  <property name="scrollable">False</property>
-	  <property name="enable_popup">False</property>
-
-	  <child>
-	    <widget class="GtkVBox" id="account-editor-general-vbox">
-	      <property name="border_width">12</property>
-	      <property name="visible">True</property>
-	      <property name="homogeneous">False</property>
-	      <property name="spacing">12</property>
-
-	      <child>
-		<widget class="GtkLabel" id="label564">
-		  <property name="visible">True</property>
-		  <property name="label" translatable="yes">&lt;b&gt;Display&lt;/b&gt;</property>
-		  <property name="use_underline">False</property>
-		  <property name="use_markup">True</property>
-		  <property name="justify">GTK_JUSTIFY_LEFT</property>
-		  <property name="wrap">False</property>
-		  <property name="selectable">False</property>
-		  <property name="xalign">0</property>
-		  <property name="yalign">0.5</property>
-		  <property name="xpad">0</property>
-		  <property name="ypad">0</property>
-		</widget>
-		<packing>
-		  <property name="padding">0</property>
-		  <property name="expand">False</property>
-		  <property name="fill">False</property>
-		</packing>
-	      </child>
-
-	      <child>
-		<widget class="GtkHBox" id="hbox122">
-		  <property name="visible">True</property>
-		  <property name="homogeneous">False</property>
-		  <property name="spacing">6</property>
-
-		  <child>
-		    <widget class="GtkLabel" id="label563">
-		      <property name="visible">True</property>
-		      <property name="label" translatable="yes"></property>
-		      <property name="use_underline">False</property>
-		      <property name="use_markup">False</property>
-		      <property name="justify">GTK_JUSTIFY_LEFT</property>
-		      <property name="wrap">False</property>
-		      <property name="selectable">False</property>
-		      <property name="xalign">0.5</property>
-		      <property name="yalign">0.5</property>
-		      <property name="xpad">0</property>
-		      <property name="ypad">0</property>
-		    </widget>
-		    <packing>
-		      <property name="padding">0</property>
-		      <property name="expand">False</property>
-		      <property name="fill">False</property>
-		    </packing>
-		  </child>
-
-		  <child>
-		    <widget class="GtkLabel" id="label431">
-		      <property name="visible">True</property>
-		      <property name="label" translatable="yes">_Name:</property>
-		      <property name="use_underline">True</property>
-		      <property name="use_markup">False</property>
-		      <property name="justify">GTK_JUSTIFY_CENTER</property>
-		      <property name="wrap">False</property>
-		      <property name="selectable">False</property>
-		      <property name="xalign">0</property>
-		      <property name="yalign">0.5</property>
-		      <property name="xpad">0</property>
-		      <property name="ypad">0</property>
-		      <property name="mnemonic_widget">account-editor-display-name-entry</property>
-		    </widget>
-		    <packing>
-		      <property name="padding">0</property>
-		      <property name="expand">False</property>
-		      <property name="fill">False</property>
-		    </packing>
-		  </child>
-
-		  <child>
-		    <widget class="GtkEntry" id="account-editor-display-name-entry">
-		      <property name="visible">True</property>
-		      <property name="tooltip" translatable="yes">This is the name for this server that will appear in your Evolution folder list. It is for display purposes only. </property>
-		      <property name="can_focus">True</property>
-		      <property name="editable">True</property>
-		      <property name="visibility">True</property>
-		      <property name="max_length">0</property>
-		      <property name="text" translatable="yes"></property>
-		      <property name="has_frame">True</property>
-		      <property name="invisible_char" translatable="yes">*</property>
-		      <property name="activates_default">False</property>
-		    </widget>
-		    <packing>
-		      <property name="padding">0</property>
-		      <property name="expand">True</property>
-		      <property name="fill">True</property>
-		    </packing>
-		  </child>
-		</widget>
-		<packing>
-		  <property name="padding">0</property>
-		  <property name="expand">False</property>
-		  <property name="fill">False</property>
-		</packing>
-	      </child>
-
-	      <child>
-		<widget class="GtkVBox" id="account-editor-connecting-vbox">
-		  <property name="homogeneous">False</property>
-		  <property name="spacing">12</property>
-
-		  <child>
-		    <widget class="GtkLabel" id="label557">
-		      <property name="visible">True</property>
-		      <property name="label" translatable="yes">&lt;b&gt;Server Information&lt;/b&gt;</property>
-		      <property name="use_underline">False</property>
-		      <property name="use_markup">True</property>
-		      <property name="justify">GTK_JUSTIFY_LEFT</property>
-		      <property name="wrap">False</property>
-		      <property name="selectable">False</property>
-		      <property name="xalign">0</property>
-		      <property name="yalign">0.5</property>
-		      <property name="xpad">0</property>
-		      <property name="ypad">0</property>
-		    </widget>
-		    <packing>
-		      <property name="padding">0</property>
-		      <property name="expand">False</property>
-		      <property name="fill">False</property>
-		    </packing>
-		  </child>
-
-		  <child>
-		    <widget class="GtkHBox" id="hbox123">
-		      <property name="visible">True</property>
-		      <property name="homogeneous">False</property>
-		      <property name="spacing">12</property>
-
-		      <child>
-			<widget class="GtkLabel" id="label558">
-			  <property name="visible">True</property>
-			  <property name="label" translatable="yes"></property>
-			  <property name="use_underline">False</property>
-			  <property name="use_markup">False</property>
-			  <property name="justify">GTK_JUSTIFY_LEFT</property>
-			  <property name="wrap">False</property>
-			  <property name="selectable">False</property>
-			  <property name="xalign">0.5</property>
-			  <property name="yalign">0.5</property>
-			  <property name="xpad">0</property>
-			  <property name="ypad">0</property>
-			</widget>
-			<packing>
-			  <property name="padding">0</property>
-			  <property name="expand">False</property>
-			  <property name="fill">False</property>
-			</packing>
-		      </child>
-
-		      <child>
-			<widget class="GtkTable" id="table31">
-			  <property name="visible">True</property>
-			  <property name="n_rows">3</property>
-			  <property name="n_columns">2</property>
-			  <property name="homogeneous">False</property>
-			  <property name="row_spacing">6</property>
-			  <property name="column_spacing">6</property>
-
-			  <child>
-			    <widget class="GtkLabel" id="label554">
-			      <property name="visible">True</property>
-			      <property name="label" translatable="yes">_Port:</property>
-			      <property name="use_underline">True</property>
-			      <property name="use_markup">False</property>
-			      <property name="justify">GTK_JUSTIFY_LEFT</property>
-			      <property name="wrap">False</property>
-			      <property name="selectable">False</property>
-			      <property name="xalign">0</property>
-			      <property name="yalign">0.5</property>
-			      <property name="xpad">0</property>
-			      <property name="ypad">0</property>
-			      <property name="mnemonic_widget">entry27</property>
-			    </widget>
-			    <packing>
-			      <property name="left_attach">0</property>
-			      <property name="right_attach">1</property>
-			      <property name="top_attach">1</property>
-			      <property name="bottom_attach">2</property>
-			      <property name="x_options">fill</property>
-			      <property name="y_options"></property>
-			    </packing>
-			  </child>
-
-			  <child>
-			    <widget class="GtkLabel" id="label556">
-			      <property name="visible">True</property>
-			      <property name="label" translatable="yes">_Server:</property>
-			      <property name="use_underline">True</property>
-			      <property name="use_markup">False</property>
-			      <property name="justify">GTK_JUSTIFY_LEFT</property>
-			      <property name="wrap">False</property>
-			      <property name="selectable">False</property>
-			      <property name="xalign">0</property>
-			      <property name="yalign">0.5</property>
-			      <property name="xpad">0</property>
-			      <property name="ypad">0</property>
-			      <property name="mnemonic_widget">server-name-entry</property>
-			    </widget>
-			    <packing>
-			      <property name="left_attach">0</property>
-			      <property name="right_attach">1</property>
-			      <property name="top_attach">0</property>
-			      <property name="bottom_attach">1</property>
-			      <property name="x_options">fill</property>
-			      <property name="y_options"></property>
-			    </packing>
-			  </child>
-
-			  <child>
-			    <widget class="GtkHBox" id="hbox123">
-			      <property name="visible">True</property>
-			      <property name="homogeneous">False</property>
-			      <property name="spacing">6</property>
-
-			      <child>
-				<widget class="GtkLabel" id="label555">
-				  <property name="visible">True</property>
-				  <property name="label" translatable="yes">_Use secure connection:</property>
-				  <property name="use_underline">True</property>
-				  <property name="use_markup">False</property>
-				  <property name="justify">GTK_JUSTIFY_LEFT</property>
-				  <property name="wrap">False</property>
-				  <property name="selectable">False</property>
-				  <property name="xalign">0.5</property>
-				  <property name="yalign">0.5</property>
-				  <property name="xpad">0</property>
-				  <property name="ypad">0</property>
-				  <property name="mnemonic_widget">ssl-optionmenu</property>
-				</widget>
-				<packing>
-				  <property name="padding">0</property>
-				  <property name="expand">False</property>
-				  <property name="fill">False</property>
-				</packing>
-			      </child>
-
-			      <child>
-				<widget class="GtkOptionMenu" id="ssl-optionmenu">
-				  <property name="visible">True</property>
-				  <property name="can_focus">True</property>
-				  <property name="history">0</property>
-
-				  <child internal-child="menu">
-				    <widget class="GtkMenu" id="convertwidget41">
-				      <property name="visible">True</property>
-
-				      <child>
-					<widget class="GtkMenuItem" id="convertwidget42">
-					  <property name="visible">True</property>
-					  <property name="tooltip" translatable="yes">Selecting this option means that Evolution will only connect to your LDAP server if your LDAP server supports SSL or TLS.</property>
-					  <property name="label" translatable="yes">Always</property>
-					  <property name="use_underline">True</property>
-					</widget>
-				      </child>
-
-				      <child>
-					<widget class="GtkMenuItem" id="convertwidget43">
-					  <property name="visible">True</property>
-					  <property name="tooltip" translatable="yes">Selecting this option means that Evolution will only try to use SSL/TLS if you are in a insecure environment. For example, if you and your LDAP server are behind a firewall at work, then Evolution doesn't need to use SSL/TLS because your connection is already secure.</property>
-					  <property name="label" translatable="yes">Whenever Possible</property>
-					  <property name="use_underline">True</property>
-					</widget>
-				      </child>
-
-				      <child>
-					<widget class="GtkMenuItem" id="convertwidget44">
-					  <property name="visible">True</property>
-					  <property name="tooltip" translatable="yes">Selecting this option means that your server does not support either SSL or TLS.  This means that your connection will be insecure, and that you will be vulnerable to security exploits. </property>
-					  <property name="label" translatable="yes">Never</property>
-					  <property name="use_underline">True</property>
-					</widget>
-				      </child>
-				    </widget>
-				  </child>
-				</widget>
-				<packing>
-				  <property name="padding">0</property>
-				  <property name="expand">True</property>
-				  <property name="fill">True</property>
-				</packing>
-			      </child>
-			    </widget>
-			    <packing>
-			      <property name="left_attach">0</property>
-			      <property name="right_attach">2</property>
-			      <property name="top_attach">2</property>
-			      <property name="bottom_attach">3</property>
-			      <property name="x_options">expand|shrink|fill</property>
-			      <property name="y_options">shrink|fill</property>
-			    </packing>
-			  </child>
-
-			  <child>
-			    <widget class="GtkCombo" id="port-combo">
-			      <property name="visible">True</property>
-			      <property name="value_in_list">False</property>
-			      <property name="allow_empty">True</property>
-			      <property name="case_sensitive">False</property>
-			      <property name="enable_arrow_keys">True</property>
-			      <property name="enable_arrows_always">False</property>
-
-			      <child internal-child="entry">
-				<widget class="GtkEntry" id="entry27">
-				  <property name="visible">True</property>
-				  <property name="tooltip" translatable="yes">This is the port on the LDAP server that Evolution will try to connect to. A list of standard ports has been provided. Ask your system administrator what port you should specify.</property>
-				  <property name="can_focus">True</property>
-				  <property name="has_focus">True</property>
-				  <property name="editable">True</property>
-				  <property name="visibility">True</property>
-				  <property name="max_length">0</property>
-				  <property name="text" translatable="yes"></property>
-				  <property name="has_frame">True</property>
-				  <property name="invisible_char" translatable="yes">*</property>
-				  <property name="activates_default">False</property>
-				</widget>
-			      </child>
-
-			      <child internal-child="list">
-				<widget class="GtkList" id="convertwidget32">
-				  <property name="visible">True</property>
-				  <property name="selection_mode">GTK_SELECTION_BROWSE</property>
-
-				  <child>
-				    <widget class="GtkListItem" id="listitem16">
-				      <property name="visible">True</property>
-				      <property name="can_focus">True</property>
-				      <property name="label" translatable="yes">389</property>
-				    </widget>
-				  </child>
-
-				  <child>
-				    <widget class="GtkListItem" id="listitem17">
-				      <property name="visible">True</property>
-				      <property name="can_focus">True</property>
-				      <property name="label" translatable="yes">636</property>
-				    </widget>
-				  </child>
-
-				  <child>
-				    <widget class="GtkListItem" id="listitem18">
-				      <property name="visible">True</property>
-				      <property name="can_focus">True</property>
-				      <property name="label" translatable="yes">3268</property>
-				    </widget>
-				  </child>
-				</widget>
-			      </child>
-			    </widget>
-			    <packing>
-			      <property name="left_attach">1</property>
-			      <property name="right_attach">2</property>
-			      <property name="top_attach">1</property>
-			      <property name="bottom_attach">2</property>
-			      <property name="y_options"></property>
-			    </packing>
-			  </child>
-
-			  <child>
-			    <widget class="GtkEntry" id="server-name-entry">
-			      <property name="visible">True</property>
-			      <property name="tooltip" translatable="yes">This is the full name of your ldap server. For example, &quot;ldap.mycompany.com&quot;.</property>
-			      <property name="can_focus">True</property>
-			      <property name="has_focus">True</property>
-			      <property name="editable">True</property>
-			      <property name="visibility">True</property>
-			      <property name="max_length">0</property>
-			      <property name="text" translatable="yes"></property>
-			      <property name="has_frame">True</property>
-			      <property name="invisible_char" translatable="yes">*</property>
-			      <property name="activates_default">False</property>
-			    </widget>
-			    <packing>
-			      <property name="left_attach">1</property>
-			      <property name="right_attach">2</property>
-			      <property name="top_attach">0</property>
-			      <property name="bottom_attach">1</property>
-			      <property name="y_options"></property>
-			    </packing>
-			  </child>
-			</widget>
-			<packing>
-			  <property name="padding">0</property>
-			  <property name="expand">True</property>
-			  <property name="fill">True</property>
-			</packing>
-		      </child>
-		    </widget>
-		    <packing>
-		      <property name="padding">0</property>
-		      <property name="expand">True</property>
-		      <property name="fill">True</property>
-		    </packing>
-		  </child>
-
-		  <child>
-		    <widget class="GtkLabel" id="label559">
-		      <property name="visible">True</property>
-		      <property name="label" translatable="yes">&lt;b&gt;Authentication&lt;/b&gt;</property>
-		      <property name="use_underline">False</property>
-		      <property name="use_markup">True</property>
-		      <property name="justify">GTK_JUSTIFY_LEFT</property>
-		      <property name="wrap">False</property>
-		      <property name="selectable">False</property>
-		      <property name="xalign">0</property>
-		      <property name="yalign">0.5</property>
-		      <property name="xpad">0</property>
-		      <property name="ypad">0</property>
-		    </widget>
-		    <packing>
-		      <property name="padding">0</property>
-		      <property name="expand">False</property>
-		      <property name="fill">False</property>
-		    </packing>
-		  </child>
-
-		  <child>
-		    <widget class="GtkHBox" id="hbox124">
-		      <property name="visible">True</property>
-		      <property name="homogeneous">False</property>
-		      <property name="spacing">12</property>
-
-		      <child>
-			<widget class="GtkLabel" id="label562">
-			  <property name="visible">True</property>
-			  <property name="label" translatable="yes"></property>
-			  <property name="use_underline">False</property>
-			  <property name="use_markup">False</property>
-			  <property name="justify">GTK_JUSTIFY_LEFT</property>
-			  <property name="wrap">False</property>
-			  <property name="selectable">False</property>
-			  <property name="xalign">0.5</property>
-			  <property name="yalign">0.5</property>
-			  <property name="xpad">0</property>
-			  <property name="ypad">0</property>
-			</widget>
-			<packing>
-			  <property name="padding">0</property>
-			  <property name="expand">False</property>
-			  <property name="fill">False</property>
-			</packing>
-		      </child>
-
-		      <child>
-			<widget class="GtkTable" id="table32">
-			  <property name="visible">True</property>
-			  <property name="n_rows">2</property>
-			  <property name="n_columns">2</property>
-			  <property name="homogeneous">False</property>
-			  <property name="row_spacing">6</property>
-			  <property name="column_spacing">6</property>
-
-			  <child>
-			    <widget class="GtkLabel" id="label560">
-			      <property name="visible">True</property>
-			      <property name="label" translatable="yes">_Log in method:</property>
-			      <property name="use_underline">True</property>
-			      <property name="use_markup">False</property>
-			      <property name="justify">GTK_JUSTIFY_LEFT</property>
-			      <property name="wrap">False</property>
-			      <property name="selectable">False</property>
-			      <property name="xalign">0</property>
-			      <property name="yalign">0.5</property>
-			      <property name="xpad">0</property>
-			      <property name="ypad">0</property>
-			      <property name="mnemonic_widget">auth-optionmenu</property>
-			    </widget>
-			    <packing>
-			      <property name="left_attach">0</property>
-			      <property name="right_attach">1</property>
-			      <property name="top_attach">0</property>
-			      <property name="bottom_attach">1</property>
-			      <property name="x_options">fill</property>
-			      <property name="y_options"></property>
-			    </packing>
-			  </child>
-
-			  <child>
-			    <widget class="GtkLabel" id="label561">
-			      <property name="visible">True</property>
-			      <property name="label" translatable="yes">Lo_gin:</property>
-			      <property name="use_underline">True</property>
-			      <property name="use_markup">False</property>
-			      <property name="justify">GTK_JUSTIFY_LEFT</property>
-			      <property name="wrap">False</property>
-			      <property name="selectable">False</property>
-			      <property name="xalign">0</property>
-			      <property name="yalign">0.5</property>
-			      <property name="xpad">0</property>
-			      <property name="ypad">0</property>
-			      <property name="mnemonic_widget">auth-entry</property>
-			    </widget>
-			    <packing>
-			      <property name="left_attach">0</property>
-			      <property name="right_attach">1</property>
-			      <property name="top_attach">1</property>
-			      <property name="bottom_attach">2</property>
-			      <property name="x_options">fill</property>
-			      <property name="y_options"></property>
-			    </packing>
-			  </child>
-
-			  <child>
-			    <widget class="GtkOptionMenu" id="auth-optionmenu">
-			      <property name="visible">True</property>
-			      <property name="tooltip" translatable="yes">This is the method Evolution will use to authenticate you.  Note that setting this to &quot;Email Address&quot; requires anonymous access to your ldap server.</property>
-			      <property name="can_focus">True</property>
-			      <property name="history">0</property>
-
-			      <child internal-child="menu">
-				<widget class="GtkMenu" id="convertwidget28">
-				  <property name="visible">True</property>
-
-				  <child>
-				    <widget class="GtkMenuItem" id="convertwidget29">
-				      <property name="visible">True</property>
-				      <property name="label" translatable="yes">Anonymously</property>
-				      <property name="use_underline">True</property>
-				    </widget>
-				  </child>
-
-				  <child>
-				    <widget class="GtkMenuItem" id="convertwidget30">
-				      <property name="visible">True</property>
-				      <property name="label" translatable="yes">Using email address</property>
-				      <property name="use_underline">True</property>
-				    </widget>
-				  </child>
-
-				  <child>
-				    <widget class="GtkMenuItem" id="convertwidget31">
-				      <property name="visible">True</property>
-				      <property name="label" translatable="yes">Using distinguished name (DN)</property>
-				      <property name="use_underline">True</property>
-				    </widget>
-				  </child>
-				</widget>
-			      </child>
-			    </widget>
-			    <packing>
-			      <property name="left_attach">1</property>
-			      <property name="right_attach">2</property>
-			      <property name="top_attach">0</property>
-			      <property name="bottom_attach">1</property>
-			      <property name="x_options">expand|shrink|fill</property>
-			      <property name="y_options">shrink</property>
-			    </packing>
-			  </child>
-
-			  <child>
-			    <widget class="GtkEntry" id="auth-entry">
-			      <property name="visible">True</property>
-			      <property name="tooltip" translatable="yes">Evolution will use this email address to authenticate you with the server.</property>
-			      <property name="can_focus">True</property>
-			      <property name="editable">True</property>
-			      <property name="visibility">True</property>
-			      <property name="max_length">0</property>
-			      <property name="text" translatable="yes"></property>
-			      <property name="has_frame">True</property>
-			      <property name="invisible_char" translatable="yes">*</property>
-			      <property name="activates_default">False</property>
-			    </widget>
-			    <packing>
-			      <property name="left_attach">1</property>
-			      <property name="right_attach">2</property>
-			      <property name="top_attach">1</property>
-			      <property name="bottom_attach">2</property>
-			      <property name="y_options"></property>
-			    </packing>
-			  </child>
-			</widget>
-			<packing>
-			  <property name="padding">0</property>
-			  <property name="expand">True</property>
-			  <property name="fill">True</property>
-			</packing>
-		      </child>
-		    </widget>
-		    <packing>
-		      <property name="padding">0</property>
-		      <property name="expand">True</property>
-		      <property name="fill">True</property>
-		    </packing>
-		  </child>
-		</widget>
-		<packing>
-		  <property name="padding">0</property>
-		  <property name="expand">False</property>
-		  <property name="fill">False</property>
-		</packing>
-	      </child>
-	    </widget>
-	    <packing>
-	      <property name="tab_expand">False</property>
-	      <property name="tab_fill">False</property>
-	    </packing>
-	  </child>
-
-	  <child>
-	    <widget class="GtkLabel" id="label334">
-	      <property name="visible">True</property>
-	      <property name="label" translatable="yes">General</property>
-	      <property name="use_underline">False</property>
-	      <property name="use_markup">False</property>
-	      <property name="justify">GTK_JUSTIFY_CENTER</property>
-	      <property name="wrap">False</property>
-	      <property name="selectable">False</property>
-	      <property name="xalign">0.5</property>
-	      <property name="yalign">0.5</property>
-	      <property name="xpad">0</property>
-	      <property name="ypad">0</property>
-	    </widget>
-	    <packing>
-	      <property name="type">tab</property>
-	    </packing>
-	  </child>
-
-	  <child>
-	    <widget class="GtkVBox" id="account-editor-searching-vbox">
-	      <property name="border_width">12</property>
-	      <property name="homogeneous">False</property>
-	      <property name="spacing">12</property>
-
-	      <child>
-		<widget class="GtkLabel" id="label565">
-		  <property name="visible">True</property>
-		  <property name="label" translatable="yes">&lt;b&gt;Searching&lt;/b&gt;</property>
-		  <property name="use_underline">False</property>
-		  <property name="use_markup">True</property>
-		  <property name="justify">GTK_JUSTIFY_LEFT</property>
-		  <property name="wrap">False</property>
-		  <property name="selectable">False</property>
-		  <property name="xalign">0</property>
-		  <property name="yalign">0.5</property>
-		  <property name="xpad">0</property>
-		  <property name="ypad">0</property>
-		</widget>
-		<packing>
-		  <property name="padding">0</property>
-		  <property name="expand">False</property>
-		  <property name="fill">False</property>
-		</packing>
-	      </child>
-
-	      <child>
-		<widget class="GtkHBox" id="hbox125">
-		  <property name="visible">True</property>
-		  <property name="homogeneous">False</property>
-		  <property name="spacing">12</property>
-
-		  <child>
-		    <widget class="GtkLabel" id="label571">
-		      <property name="visible">True</property>
-		      <property name="label" translatable="yes"></property>
-		      <property name="use_underline">False</property>
-		      <property name="use_markup">False</property>
-		      <property name="justify">GTK_JUSTIFY_LEFT</property>
-		      <property name="wrap">False</property>
-		      <property name="selectable">False</property>
-		      <property name="xalign">0.5</property>
-		      <property name="yalign">0.5</property>
-		      <property name="xpad">0</property>
-		      <property name="ypad">0</property>
-		    </widget>
-		    <packing>
-		      <property name="padding">0</property>
-		      <property name="expand">False</property>
-		      <property name="fill">False</property>
-		    </packing>
-		  </child>
-
-		  <child>
-		    <widget class="GtkTable" id="table33">
-		      <property name="visible">True</property>
-		      <property name="n_rows">3</property>
-		      <property name="n_columns">3</property>
-		      <property name="homogeneous">False</property>
-		      <property name="row_spacing">6</property>
-		      <property name="column_spacing">6</property>
-
-		      <child>
-			<widget class="GtkLabel" id="label569">
-			  <property name="visible">True</property>
-			  <property name="label" translatable="yes"></property>
-			  <property name="use_underline">False</property>
-			  <property name="use_markup">False</property>
-			  <property name="justify">GTK_JUSTIFY_LEFT</property>
-			  <property name="wrap">False</property>
-			  <property name="selectable">False</property>
-			  <property name="xalign">0</property>
-			  <property name="yalign">0.5</property>
-			  <property name="xpad">0</property>
-			  <property name="ypad">0</property>
-			</widget>
-			<packing>
-			  <property name="left_attach">0</property>
-			  <property name="right_attach">1</property>
-			  <property name="top_attach">1</property>
-			  <property name="bottom_attach">2</property>
-			  <property name="x_options">fill</property>
-			  <property name="y_options"></property>
-			</packing>
-		      </child>
-
-		      <child>
-			<widget class="GtkLabel" id="label566">
-			  <property name="visible">True</property>
-			  <property name="label" translatable="yes">Search _base:</property>
-			  <property name="use_underline">True</property>
-			  <property name="use_markup">False</property>
-			  <property name="justify">GTK_JUSTIFY_LEFT</property>
-			  <property name="wrap">False</property>
-			  <property name="selectable">False</property>
-			  <property name="xalign">0</property>
-			  <property name="yalign">0.5</property>
-			  <property name="xpad">0</property>
-			  <property name="ypad">0</property>
-			  <property name="mnemonic_widget">rootdn-entry</property>
-			</widget>
-			<packing>
-			  <property name="left_attach">0</property>
-			  <property name="right_attach">1</property>
-			  <property name="top_attach">0</property>
-			  <property name="bottom_attach">1</property>
-			  <property name="x_options">expand|shrink|fill</property>
-			  <property name="y_options">shrink|fill</property>
-			</packing>
-		      </child>
-
-		      <child>
-			<widget class="GtkLabel" id="label567">
-			  <property name="visible">True</property>
-			  <property name="label" translatable="yes">_Search scope:</property>
-			  <property name="use_underline">True</property>
-			  <property name="use_markup">False</property>
-			  <property name="justify">GTK_JUSTIFY_LEFT</property>
-			  <property name="wrap">False</property>
-			  <property name="selectable">False</property>
-			  <property name="xalign">0</property>
-			  <property name="yalign">0.5</property>
-			  <property name="xpad">0</property>
-			  <property name="ypad">0</property>
-			  <property name="mnemonic_widget">scope-optionmenu</property>
-			</widget>
-			<packing>
-			  <property name="left_attach">0</property>
-			  <property name="right_attach">1</property>
-			  <property name="top_attach">2</property>
-			  <property name="bottom_attach">3</property>
-			  <property name="x_options">expand|shrink|fill</property>
-			  <property name="y_options">shrink|fill</property>
-			</packing>
-		      </child>
-
-		      <child>
-			<widget class="GtkOptionMenu" id="scope-optionmenu">
-			  <property name="visible">True</property>
-			  <property name="tooltip" translatable="yes">The search scope defines how deep you would like the search to extend down the directory tree. A search scope of &quot;sub&quot; will include all entries below your search base. A search scope of &quot;one&quot; will only include the entries one level beneath your base.</property>
-			  <property name="can_focus">True</property>
-			  <property name="history">0</property>
-
-			  <child>
-			    <widget class="GtkMenu" id="menu12">
-
-			      <child>
-				<widget class="GtkMenuItem" id="menuitem7">
-				  <property name="visible">True</property>
-				  <property name="label" translatable="yes">One</property>
-				  <property name="use_underline">True</property>
-				</widget>
-			      </child>
-
-			      <child>
-				<widget class="GtkMenuItem" id="menuitem8">
-				  <property name="visible">True</property>
-				  <property name="label" translatable="yes">Sub</property>
-				  <property name="use_underline">True</property>
-				</widget>
-			      </child>
-			    </widget>
-			  </child>
-			</widget>
-			<packing>
-			  <property name="left_attach">1</property>
-			  <property name="right_attach">3</property>
-			  <property name="top_attach">2</property>
-			  <property name="bottom_attach">3</property>
-			  <property name="x_options">expand|shrink|fill</property>
-			  <property name="y_options">shrink|fill</property>
-			</packing>
-		      </child>
-
-		      <child>
-			<widget class="GtkEntry" id="rootdn-entry">
-			  <property name="visible">True</property>
-			  <property name="tooltip" translatable="yes">The search base is the distinguished name (DN)  of the entry where your searches will begin. If you leave this blank, the search will begin at the root of the directory tree.</property>
-			  <property name="can_focus">True</property>
-			  <property name="has_focus">True</property>
-			  <property name="editable">True</property>
-			  <property name="visibility">True</property>
-			  <property name="max_length">0</property>
-			  <property name="text" translatable="yes"></property>
-			  <property name="has_frame">True</property>
-			  <property name="invisible_char" translatable="yes">*</property>
-			  <property name="activates_default">False</property>
-			</widget>
-			<packing>
-			  <property name="left_attach">1</property>
-			  <property name="right_attach">3</property>
-			  <property name="top_attach">0</property>
-			  <property name="bottom_attach">1</property>
-			  <property name="x_options">expand|shrink|fill</property>
-			  <property name="y_options">shrink|fill</property>
-			</packing>
-		      </child>
-
-		      <child>
-			<widget class="GtkButton" id="rootdn-button">
-			  <property name="visible">True</property>
-			  <property name="can_focus">True</property>
-			  <property name="relief">GTK_RELIEF_NORMAL</property>
-			  <property name="focus_on_click">True</property>
-
-			  <child>
-			    <widget class="GtkAlignment" id="alignment61">
-			      <property name="visible">True</property>
-			      <property name="xalign">0.5</property>
-			      <property name="yalign">0.5</property>
-			      <property name="xscale">0</property>
-			      <property name="yscale">0</property>
-			      <property name="top_padding">0</property>
-			      <property name="bottom_padding">0</property>
-			      <property name="left_padding">0</property>
-			      <property name="right_padding">0</property>
-
-			      <child>
-				<widget class="GtkHBox" id="hbox126">
-				  <property name="visible">True</property>
-				  <property name="homogeneous">False</property>
-				  <property name="spacing">2</property>
-
-				  <child>
-				    <widget class="GtkImage" id="image10">
-				      <property name="visible">True</property>
-				      <property name="stock">gtk-find</property>
-				      <property name="icon_size">4</property>
-				      <property name="xalign">0.5</property>
-				      <property name="yalign">0.5</property>
-				      <property name="xpad">0</property>
-				      <property name="ypad">0</property>
-				    </widget>
-				    <packing>
-				      <property name="padding">0</property>
-				      <property name="expand">False</property>
-				      <property name="fill">False</property>
-				    </packing>
-				  </child>
-
-				  <child>
-				    <widget class="GtkLabel" id="label568">
-				      <property name="visible">True</property>
-				      <property name="label" translatable="yes">_Find Possible Search Bases</property>
-				      <property name="use_underline">True</property>
-				      <property name="use_markup">False</property>
-				      <property name="justify">GTK_JUSTIFY_LEFT</property>
-				      <property name="wrap">False</property>
-				      <property name="selectable">False</property>
-				      <property name="xalign">0.5</property>
-				      <property name="yalign">0.5</property>
-				      <property name="xpad">0</property>
-				      <property name="ypad">0</property>
-				    </widget>
-				    <packing>
-				      <property name="padding">0</property>
-				      <property name="expand">False</property>
-				      <property name="fill">False</property>
-				    </packing>
-				  </child>
-				</widget>
-			      </child>
-			    </widget>
-			  </child>
-			</widget>
-			<packing>
-			  <property name="left_attach">1</property>
-			  <property name="right_attach">2</property>
-			  <property name="top_attach">1</property>
-			  <property name="bottom_attach">2</property>
-			  <property name="x_options">expand|shrink|fill</property>
-			  <property name="y_options">shrink|fill</property>
-			</packing>
-		      </child>
-		    </widget>
-		    <packing>
-		      <property name="padding">0</property>
-		      <property name="expand">True</property>
-		      <property name="fill">True</property>
-		    </packing>
-		  </child>
-		</widget>
-		<packing>
-		  <property name="padding">0</property>
-		  <property name="expand">False</property>
-		  <property name="fill">False</property>
-		</packing>
-	      </child>
-
-	      <child>
-		<widget class="GtkLabel" id="label572">
-		  <property name="visible">True</property>
-		  <property name="label" translatable="yes">&lt;b&gt;Downloading&lt;/b&gt;</property>
-		  <property name="use_underline">False</property>
-		  <property name="use_markup">True</property>
-		  <property name="justify">GTK_JUSTIFY_LEFT</property>
-		  <property name="wrap">False</property>
-		  <property name="selectable">False</property>
-		  <property name="xalign">0</property>
-		  <property name="yalign">0.5</property>
-		  <property name="xpad">0</property>
-		  <property name="ypad">0</property>
-		</widget>
-		<packing>
-		  <property name="padding">0</property>
-		  <property name="expand">False</property>
-		  <property name="fill">False</property>
-		</packing>
-	      </child>
-
-	      <child>
-		<widget class="GtkHBox" id="hbox127">
-		  <property name="visible">True</property>
-		  <property name="homogeneous">False</property>
-		  <property name="spacing">12</property>
-
-		  <child>
-		    <widget class="GtkLabel" id="label579">
-		      <property name="visible">True</property>
-		      <property name="label" translatable="yes"></property>
-		      <property name="use_underline">False</property>
-		      <property name="use_markup">False</property>
-		      <property name="justify">GTK_JUSTIFY_LEFT</property>
-		      <property name="wrap">False</property>
-		      <property name="selectable">False</property>
-		      <property name="xalign">0.5</property>
-		      <property name="yalign">0.5</property>
-		      <property name="xpad">0</property>
-		      <property name="ypad">0</property>
-		    </widget>
-		    <packing>
-		      <property name="padding">0</property>
-		      <property name="expand">False</property>
-		      <property name="fill">False</property>
-		    </packing>
-		  </child>
-
-		  <child>
-		    <widget class="GtkTable" id="table34">
-		      <property name="visible">True</property>
-		      <property name="n_rows">2</property>
-		      <property name="n_columns">3</property>
-		      <property name="homogeneous">False</property>
-		      <property name="row_spacing">6</property>
-		      <property name="column_spacing">6</property>
-
-		      <child>
-			<widget class="GtkHBox" id="hbox128">
-			  <property name="visible">True</property>
-			  <property name="homogeneous">False</property>
-			  <property name="spacing">6</property>
-
-			  <child>
-			    <widget class="GtkLabel" id="label575">
-			      <property name="visible">True</property>
-			      <property name="label" translatable="yes">1</property>
-			      <property name="use_underline">False</property>
-			      <property name="use_markup">False</property>
-			      <property name="justify">GTK_JUSTIFY_LEFT</property>
-			      <property name="wrap">False</property>
-			      <property name="selectable">False</property>
-			      <property name="xalign">0.5</property>
-			      <property name="yalign">0.5</property>
-			      <property name="xpad">0</property>
-			      <property name="ypad">0</property>
-			    </widget>
-			    <packing>
-			      <property name="padding">0</property>
-			      <property name="expand">False</property>
-			      <property name="fill">False</property>
-			    </packing>
-			  </child>
-
-			  <child>
-			    <widget class="GtkHScale" id="timeout-scale">
-			      <property name="visible">True</property>
-			      <property name="can_focus">True</property>
-			      <property name="draw_value">False</property>
-			      <property name="value_pos">GTK_POS_TOP</property>
-			      <property name="digits">1</property>
-			      <property name="update_policy">GTK_UPDATE_CONTINUOUS</property>
-			      <property name="inverted">False</property>
-			      <property name="adjustment">3 1 5 0.5 1 0</property>
-			    </widget>
-			    <packing>
-			      <property name="padding">0</property>
-			      <property name="expand">True</property>
-			      <property name="fill">True</property>
-			    </packing>
-			  </child>
-
-			  <child>
-			    <widget class="GtkLabel" id="label576">
-			      <property name="visible">True</property>
-			      <property name="label" translatable="yes">5</property>
-			      <property name="use_underline">False</property>
-			      <property name="use_markup">False</property>
-			      <property name="justify">GTK_JUSTIFY_LEFT</property>
-			      <property name="wrap">False</property>
-			      <property name="selectable">False</property>
-			      <property name="xalign">0.5</property>
-			      <property name="yalign">0.5</property>
-			      <property name="xpad">0</property>
-			      <property name="ypad">0</property>
-			    </widget>
-			    <packing>
-			      <property name="padding">0</property>
-			      <property name="expand">False</property>
-			      <property name="fill">False</property>
-			    </packing>
-			  </child>
-			</widget>
-			<packing>
-			  <property name="left_attach">1</property>
-			  <property name="right_attach">2</property>
-			  <property name="top_attach">0</property>
-			  <property name="bottom_attach">1</property>
-			  <property name="x_options">expand|shrink|fill</property>
-			  <property name="y_options">shrink|fill</property>
-			</packing>
-		      </child>
-
-		      <child>
-			<widget class="GtkLabel" id="label574">
-			  <property name="visible">True</property>
-			  <property name="label" translatable="yes">minutes</property>
-			  <property name="use_underline">False</property>
-			  <property name="use_markup">False</property>
-			  <property name="justify">GTK_JUSTIFY_LEFT</property>
-			  <property name="wrap">False</property>
-			  <property name="selectable">False</property>
-			  <property name="xalign">0</property>
-			  <property name="yalign">0.5</property>
-			  <property name="xpad">0</property>
-			  <property name="ypad">0</property>
-			</widget>
-			<packing>
-			  <property name="left_attach">2</property>
-			  <property name="right_attach">3</property>
-			  <property name="top_attach">0</property>
-			  <property name="bottom_attach">1</property>
-			  <property name="x_options">shrink|fill</property>
-			  <property name="y_options">shrink|fill</property>
-			</packing>
-		      </child>
-
-		      <child>
-			<widget class="GtkLabel" id="label578">
-			  <property name="visible">True</property>
-			  <property name="label" translatable="yes">cards</property>
-			  <property name="use_underline">False</property>
-			  <property name="use_markup">False</property>
-			  <property name="justify">GTK_JUSTIFY_LEFT</property>
-			  <property name="wrap">False</property>
-			  <property name="selectable">False</property>
-			  <property name="xalign">0</property>
-			  <property name="yalign">0.5</property>
-			  <property name="xpad">0</property>
-			  <property name="ypad">0</property>
-			</widget>
-			<packing>
-			  <property name="left_attach">2</property>
-			  <property name="right_attach">3</property>
-			  <property name="top_attach">1</property>
-			  <property name="bottom_attach">2</property>
-			  <property name="x_options">shrink|fill</property>
-			  <property name="y_options">shrink|fill</property>
-			</packing>
-		      </child>
-
-		      <child>
-			<widget class="GtkLabel" id="label573">
-			  <property name="visible">True</property>
-			  <property name="label" translatable="yes">_Timeout:</property>
-			  <property name="use_underline">True</property>
-			  <property name="use_markup">False</property>
-			  <property name="justify">GTK_JUSTIFY_LEFT</property>
-			  <property name="wrap">False</property>
-			  <property name="selectable">False</property>
-			  <property name="xalign">0</property>
-			  <property name="yalign">0.5</property>
-			  <property name="xpad">0</property>
-			  <property name="ypad">0</property>
-			  <property name="mnemonic_widget">timeout-scale</property>
-			</widget>
-			<packing>
-			  <property name="left_attach">0</property>
-			  <property name="right_attach">1</property>
-			  <property name="top_attach">0</property>
-			  <property name="bottom_attach">1</property>
-			  <property name="x_options">shrink|fill</property>
-			  <property name="y_options">shrink|fill</property>
-			</packing>
-		      </child>
-
-		      <child>
-			<widget class="GtkLabel" id="label577">
-			  <property name="visible">True</property>
-			  <property name="label" translatable="yes">_Download limit:</property>
-			  <property name="use_underline">True</property>
-			  <property name="use_markup">False</property>
-			  <property name="justify">GTK_JUSTIFY_LEFT</property>
-			  <property name="wrap">False</property>
-			  <property name="selectable">False</property>
-			  <property name="xalign">0</property>
-			  <property name="yalign">0.5</property>
-			  <property name="xpad">0</property>
-			  <property name="ypad">0</property>
-			  <property name="mnemonic_widget">download-limit-spinbutton</property>
-			</widget>
-			<packing>
-			  <property name="left_attach">0</property>
-			  <property name="right_attach">1</property>
-			  <property name="top_attach">1</property>
-			  <property name="bottom_attach">2</property>
-			  <property name="x_options">shrink|fill</property>
-			  <property name="y_options">shrink|fill</property>
-			</packing>
-		      </child>
-
-		      <child>
-			<widget class="GtkSpinButton" id="download-limit-spinbutton">
-			  <property name="visible">True</property>
-			  <property name="tooltip" translatable="yes">This is the maximum number of entries to download. Setting this number to be too large will slow down your address book.</property>
-			  <property name="can_focus">True</property>
-			  <property name="climb_rate">1</property>
-			  <property name="digits">0</property>
-			  <property name="numeric">False</property>
-			  <property name="update_policy">GTK_UPDATE_ALWAYS</property>
-			  <property name="snap_to_ticks">False</property>
-			  <property name="wrap">False</property>
-			  <property name="adjustment">0 0 1000 1 10 10</property>
-			</widget>
-			<packing>
-			  <property name="left_attach">1</property>
-			  <property name="right_attach">2</property>
-			  <property name="top_attach">1</property>
-			  <property name="bottom_attach">2</property>
-			  <property name="x_options">expand|shrink|fill</property>
-			  <property name="y_options">shrink|fill</property>
-			</packing>
-		      </child>
-		    </widget>
-		    <packing>
-		      <property name="padding">0</property>
-		      <property name="expand">True</property>
-		      <property name="fill">True</property>
-		    </packing>
-		  </child>
-		</widget>
-		<packing>
-		  <property name="padding">0</property>
-		  <property name="expand">False</property>
-		  <property name="fill">False</property>
-		</packing>
-	      </child>
-	    </widget>
-	    <packing>
-	      <property name="tab_expand">False</property>
-	      <property name="tab_fill">False</property>
-	    </packing>
-	  </child>
-
-	  <child>
-	    <widget class="GtkLabel" id="label344">
-	      <property name="visible">True</property>
-	      <property name="label" translatable="yes">Details</property>
-	      <property name="use_underline">False</property>
-	      <property name="use_markup">False</property>
-	      <property name="justify">GTK_JUSTIFY_CENTER</property>
-	      <property name="wrap">False</property>
-	      <property name="selectable">False</property>
-	      <property name="xalign">0.5</property>
-	      <property name="yalign">0.5</property>
-	      <property name="xpad">0</property>
-	      <property name="ypad">0</property>
-	    </widget>
-	    <packing>
-	      <property name="type">tab</property>
-	    </packing>
-	  </child>
-	</widget>
-	<packing>
-	  <property name="padding">0</property>
-	  <property name="expand">True</property>
-	  <property name="fill">True</property>
-	</packing>
-      </child>
-    </widget>
-  </child>
-</widget>
-
-<widget class="GtkDialog" id="supported-bases-dialog">
-  <property name="title" translatable="yes">Supported Search Bases</property>
-  <property name="type">GTK_WINDOW_TOPLEVEL</property>
-  <property name="window_position">GTK_WIN_POS_CENTER</property>
-  <property name="modal">False</property>
-  <property name="default_width">320</property>
-  <property name="default_height">200</property>
-  <property name="resizable">True</property>
-  <property name="destroy_with_parent">False</property>
-  <property name="decorated">True</property>
-  <property name="skip_taskbar_hint">False</property>
-  <property name="skip_pager_hint">False</property>
-  <property name="type_hint">GDK_WINDOW_TYPE_HINT_DIALOG</property>
-  <property name="gravity">GDK_GRAVITY_NORTH_WEST</property>
-  <property name="has_separator">False</property>
-
-  <child internal-child="vbox">
-    <widget class="GtkVBox" id="dialog-vbox8">
-      <property name="visible">True</property>
-      <property name="homogeneous">False</property>
-      <property name="spacing">0</property>
-
-      <child internal-child="action_area">
-	<widget class="GtkHButtonBox" id="dialog-action_area8">
-	  <property name="visible">True</property>
-	  <property name="layout_style">GTK_BUTTONBOX_END</property>
-
-	  <child>
-	    <widget class="GtkButton" id="cancelbutton1">
-	      <property name="visible">True</property>
-	      <property name="can_default">True</property>
-	      <property name="can_focus">True</property>
-	      <property name="label">gtk-cancel</property>
-	      <property name="use_stock">True</property>
-	      <property name="relief">GTK_RELIEF_NORMAL</property>
-	      <property name="focus_on_click">True</property>
-	      <property name="response_id">-6</property>
-	    </widget>
-	  </child>
-
-	  <child>
-	    <widget class="GtkButton" id="okbutton1">
-	      <property name="visible">True</property>
-	      <property name="can_default">True</property>
-	      <property name="can_focus">True</property>
-	      <property name="label">gtk-ok</property>
-	      <property name="use_stock">True</property>
-	      <property name="relief">GTK_RELIEF_NORMAL</property>
-	      <property name="focus_on_click">True</property>
-	      <property name="response_id">-5</property>
-	    </widget>
-	  </child>
-	</widget>
-	<packing>
-	  <property name="padding">0</property>
-	  <property name="expand">False</property>
-	  <property name="fill">True</property>
-	  <property name="pack_type">GTK_PACK_END</property>
-	</packing>
-      </child>
-
-      <child>
-	<widget class="GtkVBox" id="vbox40">
-	  <property name="border_width">12</property>
-	  <property name="visible">True</property>
-	  <property name="homogeneous">False</property>
-	  <property name="spacing">0</property>
-
-	  <child>
-	    <widget class="Custom" id="supported-bases-table">
-	      <property name="visible">True</property>
-	      <property name="creation_function">supported_bases_create_table</property>
-	      <property name="int1">0</property>
-	      <property name="int2">0</property>
-	      <property name="last_modification_time">Fri, 12 Apr 2002 20:06:45 GMT</property>
-	    </widget>
-	    <packing>
-	      <property name="padding">0</property>
-	      <property name="expand">True</property>
-	      <property name="fill">True</property>
-	    </packing>
-	  </child>
-	</widget>
-	<packing>
-	  <property name="padding">0</property>
-	  <property name="expand">True</property>
-	  <property name="fill">True</property>
-	</packing>
-      </child>
-    </widget>
-  </child>
-</widget>
-
-<widget class="GtkDialog" id="account-add-window">
-  <property name="visible">True</property>
-  <property name="title" translatable="yes">Add Address Book</property>
-  <property name="type">GTK_WINDOW_TOPLEVEL</property>
-  <property name="window_position">GTK_WIN_POS_NONE</property>
-  <property name="modal">False</property>
-  <property name="resizable">True</property>
-  <property name="destroy_with_parent">False</property>
-  <property name="decorated">True</property>
-  <property name="skip_taskbar_hint">False</property>
-  <property name="skip_pager_hint">False</property>
-  <property name="type_hint">GDK_WINDOW_TYPE_HINT_DIALOG</property>
-  <property name="gravity">GDK_GRAVITY_NORTH_WEST</property>
-  <property name="has_separator">False</property>
-
-  <child internal-child="vbox">
-    <widget class="GtkVBox" id="dialog-vbox10">
-      <property name="visible">True</property>
-      <property name="homogeneous">False</property>
-      <property name="spacing">0</property>
-
-      <child internal-child="action_area">
-	<widget class="GtkHButtonBox" id="dialog-action_area10">
-	  <property name="visible">True</property>
-	  <property name="layout_style">GTK_BUTTONBOX_END</property>
-
-	  <child>
-	    <widget class="GtkButton" id="cancel-button">
-	      <property name="visible">True</property>
-	      <property name="can_default">True</property>
-	      <property name="can_focus">True</property>
-	      <property name="label">gtk-cancel</property>
-	      <property name="use_stock">True</property>
-	      <property name="relief">GTK_RELIEF_NORMAL</property>
-	      <property name="focus_on_click">True</property>
-	      <property name="response_id">-6</property>
-	    </widget>
-	  </child>
-
-	  <child>
-	    <widget class="GtkButton" id="ok-button">
-	      <property name="visible">True</property>
-	      <property name="can_default">True</property>
-	      <property name="can_focus">True</property>
-	      <property name="relief">GTK_RELIEF_NORMAL</property>
-	      <property name="focus_on_click">True</property>
-	      <property name="response_id">0</property>
-
-	      <child>
-		<widget class="GtkAlignment" id="alignment62">
-		  <property name="visible">True</property>
-		  <property name="xalign">0.5</property>
-		  <property name="yalign">0.5</property>
-		  <property name="xscale">0</property>
-		  <property name="yscale">0</property>
-		  <property name="top_padding">0</property>
-		  <property name="bottom_padding">0</property>
-		  <property name="left_padding">0</property>
-		  <property name="right_padding">0</property>
-
-		  <child>
-		    <widget class="GtkHBox" id="hbox129">
-		      <property name="visible">True</property>
-		      <property name="homogeneous">False</property>
-		      <property name="spacing">2</property>
-
-		      <child>
-			<widget class="GtkImage" id="image11">
-			  <property name="visible">True</property>
-			  <property name="stock">gtk-add</property>
-			  <property name="icon_size">4</property>
-			  <property name="xalign">0.5</property>
-			  <property name="yalign">0.5</property>
-			  <property name="xpad">0</property>
-			  <property name="ypad">0</property>
-			</widget>
-			<packing>
-			  <property name="padding">0</property>
-			  <property name="expand">False</property>
-			  <property name="fill">False</property>
-			</packing>
-		      </child>
-
-		      <child>
-			<widget class="GtkLabel" id="label580">
-			  <property name="visible">True</property>
-			  <property name="label" translatable="yes">_Add Address Book</property>
-			  <property name="use_underline">True</property>
-			  <property name="use_markup">False</property>
-			  <property name="justify">GTK_JUSTIFY_LEFT</property>
-			  <property name="wrap">False</property>
-			  <property name="selectable">False</property>
-			  <property name="xalign">0.5</property>
-			  <property name="yalign">0.5</property>
-			  <property name="xpad">0</property>
-			  <property name="ypad">0</property>
-			</widget>
-			<packing>
-			  <property name="padding">0</property>
-			  <property name="expand">False</property>
-			  <property name="fill">False</property>
-			</packing>
-		      </child>
-		    </widget>
-		  </child>
-		</widget>
-	      </child>
-	    </widget>
-	  </child>
-	</widget>
-	<packing>
-	  <property name="padding">0</property>
-	  <property name="expand">False</property>
-	  <property name="fill">True</property>
-	  <property name="pack_type">GTK_PACK_END</property>
-	</packing>
-      </child>
-
-      <child>
-	<widget class="GtkNotebook" id="notebook1">
-	  <property name="border_width">12</property>
-	  <property name="visible">True</property>
-	  <property name="can_focus">True</property>
-	  <property name="show_tabs">True</property>
-	  <property name="show_border">True</property>
-	  <property name="tab_pos">GTK_POS_TOP</property>
-	  <property name="scrollable">False</property>
-	  <property name="enable_popup">False</property>
-
-	  <child>
-	    <widget class="GtkVBox" id="vbox5">
-	      <property name="border_width">12</property>
-	      <property name="visible">True</property>
-	      <property name="homogeneous">False</property>
-	      <property name="spacing">12</property>
-
-	      <child>
-		<widget class="GtkHBox" id="hbox19">
-		  <property name="border_width">6</property>
-		  <property name="visible">True</property>
-		  <property name="homogeneous">False</property>
-		  <property name="spacing">6</property>
-
-		  <child>
-		    <widget class="GtkLabel" id="label64">
-		      <property name="visible">True</property>
-		      <property name="label" translatable="yes">&lt;b&gt;Type:&lt;/b&gt;</property>
-		      <property name="use_underline">False</property>
-		      <property name="use_markup">True</property>
-		      <property name="justify">GTK_JUSTIFY_LEFT</property>
-		      <property name="wrap">False</property>
-		      <property name="selectable">False</property>
-		      <property name="xalign">0.5</property>
-		      <property name="yalign">0.5</property>
-		      <property name="xpad">0</property>
-		      <property name="ypad">0</property>
-		    </widget>
-		    <packing>
-		      <property name="padding">0</property>
-		      <property name="expand">False</property>
-		      <property name="fill">False</property>
-		    </packing>
-		  </child>
-
-		  <child>
-		    <widget class="GtkOptionMenu" id="group-optionmenu">
-		      <property name="visible">True</property>
-		      <property name="can_focus">True</property>
-		      <property name="history">-1</property>
-
-		      <child>
-			<widget class="GtkMenu" id="menu11">
-			</widget>
-		      </child>
-		    </widget>
-		    <packing>
-		      <property name="padding">0</property>
-		      <property name="expand">False</property>
-		      <property name="fill">False</property>
-		    </packing>
-		  </child>
-		</widget>
-		<packing>
-		  <property name="padding">0</property>
-		  <property name="expand">True</property>
-		  <property name="fill">True</property>
-		</packing>
-	      </child>
-
-	      <child>
-		<widget class="GtkFrame" id="frame1">
-		  <property name="visible">True</property>
-		  <property name="label_xalign">0</property>
-		  <property name="label_yalign">0.5</property>
-		  <property name="shadow_type">GTK_SHADOW_NONE</property>
-
-		  <child>
-		    <widget class="GtkTable" id="table7">
-		      <property name="border_width">12</property>
-		      <property name="visible">True</property>
-		      <property name="n_rows">1</property>
-		      <property name="n_columns">2</property>
-		      <property name="homogeneous">False</property>
-		      <property name="row_spacing">6</property>
-		      <property name="column_spacing">6</property>
-
-		      <child>
-			<widget class="GtkEntry" id="display-name-entry">
-			  <property name="visible">True</property>
-			  <property name="can_focus">True</property>
-			  <property name="editable">True</property>
-			  <property name="visibility">True</property>
-			  <property name="max_length">0</property>
-			  <property name="text" translatable="yes"></property>
-			  <property name="has_frame">True</property>
-			  <property name="invisible_char" translatable="yes">*</property>
-			  <property name="activates_default">False</property>
-			</widget>
-			<packing>
-			  <property name="left_attach">1</property>
-			  <property name="right_attach">2</property>
-			  <property name="top_attach">0</property>
-			  <property name="bottom_attach">1</property>
-			  <property name="y_options"></property>
-			</packing>
-		      </child>
-
-		      <child>
-			<widget class="GtkLabel" id="label41">
-			  <property name="visible">True</property>
-			  <property name="label" translatable="yes">_Name:</property>
-			  <property name="use_underline">True</property>
-			  <property name="use_markup">False</property>
-			  <property name="justify">GTK_JUSTIFY_LEFT</property>
-			  <property name="wrap">False</property>
-			  <property name="selectable">False</property>
-			  <property name="xalign">0</property>
-			  <property name="yalign">0.5</property>
-			  <property name="xpad">0</property>
-			  <property name="ypad">0</property>
-			  <property name="mnemonic_widget">display-name-entry</property>
-			</widget>
-			<packing>
-			  <property name="left_attach">0</property>
-			  <property name="right_attach">1</property>
-			  <property name="top_attach">0</property>
-			  <property name="bottom_attach">1</property>
-			  <property name="x_options">fill</property>
-			  <property name="y_options"></property>
-			</packing>
-		      </child>
-		    </widget>
-		  </child>
-
-		  <child>
-		    <widget class="GtkLabel" id="label38">
-		      <property name="visible">True</property>
-		      <property name="label" translatable="yes">&lt;b&gt;Display&lt;/b&gt;</property>
-		      <property name="use_underline">False</property>
-		      <property name="use_markup">True</property>
-		      <property name="justify">GTK_JUSTIFY_LEFT</property>
-		      <property name="wrap">False</property>
-		      <property name="selectable">False</property>
-		      <property name="xalign">0.5</property>
-		      <property name="yalign">0.5</property>
-		      <property name="xpad">0</property>
-		      <property name="ypad">0</property>
-		    </widget>
-		    <packing>
-		      <property name="type">label_item</property>
-		    </packing>
-		  </child>
-		</widget>
-		<packing>
-		  <property name="padding">0</property>
-		  <property name="expand">False</property>
-		  <property name="fill">True</property>
-		</packing>
-	      </child>
-
-	      <child>
-		<widget class="GtkFrame" id="server-frame">
-		  <property name="visible">True</property>
-		  <property name="label_xalign">0</property>
-		  <property name="label_yalign">0.5</property>
-		  <property name="shadow_type">GTK_SHADOW_NONE</property>
-
-		  <child>
-		    <widget class="GtkTable" id="table8">
-		      <property name="border_width">12</property>
-		      <property name="visible">True</property>
-		      <property name="n_rows">3</property>
-		      <property name="n_columns">2</property>
-		      <property name="homogeneous">False</property>
-		      <property name="row_spacing">6</property>
-		      <property name="column_spacing">6</property>
-
-		      <child>
-			<widget class="GtkEntry" id="server-name-entry">
-			  <property name="visible">True</property>
-			  <property name="can_focus">True</property>
-			  <property name="editable">True</property>
-			  <property name="visibility">True</property>
-			  <property name="max_length">0</property>
-			  <property name="text" translatable="yes"></property>
-			  <property name="has_frame">True</property>
-			  <property name="invisible_char" translatable="yes">*</property>
-			  <property name="activates_default">False</property>
-			</widget>
-			<packing>
-			  <property name="left_attach">1</property>
-			  <property name="right_attach">2</property>
-			  <property name="top_attach">0</property>
-			  <property name="bottom_attach">1</property>
-			  <property name="y_options"></property>
-			</packing>
-		      </child>
-
-		      <child>
-			<widget class="GtkLabel" id="label44">
-			  <property name="visible">True</property>
-			  <property name="label" translatable="yes">_Port:</property>
-			  <property name="use_underline">True</property>
-			  <property name="use_markup">False</property>
-			  <property name="justify">GTK_JUSTIFY_LEFT</property>
-			  <property name="wrap">False</property>
-			  <property name="selectable">False</property>
-			  <property name="xalign">0</property>
-			  <property name="yalign">0.5</property>
-			  <property name="xpad">0</property>
-			  <property name="ypad">0</property>
-			  <property name="mnemonic_widget">port-entry</property>
-			</widget>
-			<packing>
-			  <property name="left_attach">0</property>
-			  <property name="right_attach">1</property>
-			  <property name="top_attach">1</property>
-			  <property name="bottom_attach">2</property>
-			  <property name="x_options">fill</property>
-			  <property name="y_options"></property>
-			</packing>
-		      </child>
-
-		      <child>
-			<widget class="GtkCombo" id="port-combo">
-			  <property name="visible">True</property>
-			  <property name="value_in_list">False</property>
-			  <property name="allow_empty">True</property>
-			  <property name="case_sensitive">False</property>
-			  <property name="enable_arrow_keys">True</property>
-			  <property name="enable_arrows_always">False</property>
-
-			  <child internal-child="entry">
-			    <widget class="GtkEntry" id="port-entry">
-			      <property name="visible">True</property>
-			      <property name="can_focus">True</property>
-			      <property name="editable">True</property>
-			      <property name="visibility">True</property>
-			      <property name="max_length">0</property>
-			      <property name="text" translatable="yes"></property>
-			      <property name="has_frame">True</property>
-			      <property name="invisible_char" translatable="yes">*</property>
-			      <property name="activates_default">False</property>
-			    </widget>
-			  </child>
-
-			  <child internal-child="list">
-			    <widget class="GtkList" id="combo-list1">
-			      <property name="visible">True</property>
-			      <property name="selection_mode">GTK_SELECTION_BROWSE</property>
-
-			      <child>
-				<widget class="GtkListItem" id="listitem11">
-				  <property name="visible">True</property>
-				  <property name="can_focus">True</property>
-				  <property name="label" translatable="yes">389</property>
-				</widget>
-			      </child>
-
-			      <child>
-				<widget class="GtkListItem" id="listitem12">
-				  <property name="visible">True</property>
-				  <property name="can_focus">True</property>
-				  <property name="label" translatable="yes">636</property>
-				</widget>
-			      </child>
-
-			      <child>
-				<widget class="GtkListItem" id="listitem13">
-				  <property name="visible">True</property>
-				  <property name="can_focus">True</property>
-				  <property name="label" translatable="yes">3268</property>
-				</widget>
-			      </child>
-			    </widget>
-			  </child>
-			</widget>
-			<packing>
-			  <property name="left_attach">1</property>
-			  <property name="right_attach">2</property>
-			  <property name="top_attach">1</property>
-			  <property name="bottom_attach">2</property>
-			  <property name="y_options"></property>
-			</packing>
-		      </child>
-
-		      <child>
-			<widget class="GtkHBox" id="hbox15">
-			  <property name="visible">True</property>
-			  <property name="homogeneous">False</property>
-			  <property name="spacing">6</property>
-
-			  <child>
-			    <widget class="GtkLabel" id="label50">
-			      <property name="visible">True</property>
-			      <property name="label" translatable="yes">_Use secure connection:</property>
-			      <property name="use_underline">True</property>
-			      <property name="use_markup">False</property>
-			      <property name="justify">GTK_JUSTIFY_LEFT</property>
-			      <property name="wrap">False</property>
-			      <property name="selectable">False</property>
-			      <property name="xalign">0.5</property>
-			      <property name="yalign">0.5</property>
-			      <property name="xpad">0</property>
-			      <property name="ypad">0</property>
-			      <property name="mnemonic_widget">ssl-optionmenu</property>
-			    </widget>
-			    <packing>
-			      <property name="padding">0</property>
-			      <property name="expand">False</property>
-			      <property name="fill">False</property>
-			    </packing>
-			  </child>
-
-			  <child>
-			    <widget class="GtkOptionMenu" id="ssl-optionmenu">
-			      <property name="visible">True</property>
-			      <property name="can_focus">True</property>
-			      <property name="history">0</property>
-
-			      <child>
-				<widget class="GtkMenu" id="menu9">
-
-				  <child>
-				    <widget class="GtkMenuItem" id="always1">
-				      <property name="visible">True</property>
-				      <property name="label" translatable="yes">Always</property>
-				      <property name="use_underline">True</property>
-				      <signal name="activate" handler="on_always1_activate" last_modification_time="Mon, 29 Mar 2004 21:37:12 GMT"/>
-				    </widget>
-				  </child>
-
-				  <child>
-				    <widget class="GtkMenuItem" id="">
-				      <property name="visible">True</property>
-				      <property name="label" translatable="yes">Whenever Possible</property>
-				      <property name="use_underline">True</property>
-				      <signal name="activate" handler="on_whenever_possible1_activate" last_modification_time="Mon, 29 Mar 2004 21:37:12 GMT"/>
-				    </widget>
-				  </child>
-
-				  <child>
-				    <widget class="GtkMenuItem" id="never1">
-				      <property name="visible">True</property>
-				      <property name="label" translatable="yes">Never</property>
-				      <property name="use_underline">True</property>
-				      <signal name="activate" handler="on_never1_activate" last_modification_time="Mon, 29 Mar 2004 21:37:12 GMT"/>
-				    </widget>
-				  </child>
-				</widget>
-			      </child>
-			    </widget>
-			    <packing>
-			      <property name="padding">0</property>
-			      <property name="expand">False</property>
-			      <property name="fill">False</property>
-			    </packing>
-			  </child>
-			</widget>
-			<packing>
-			  <property name="left_attach">0</property>
-			  <property name="right_attach">2</property>
-			  <property name="top_attach">2</property>
-			  <property name="bottom_attach">3</property>
-			  <property name="x_options">fill</property>
-			</packing>
-		      </child>
-
-		      <child>
-			<widget class="GtkLabel" id="server-name-label">
-			  <property name="visible">True</property>
-			  <property name="label" translatable="yes">_Server:</property>
-			  <property name="use_underline">True</property>
-			  <property name="use_markup">False</property>
-			  <property name="justify">GTK_JUSTIFY_LEFT</property>
-			  <property name="wrap">False</property>
-			  <property name="selectable">False</property>
-			  <property name="xalign">0</property>
-			  <property name="yalign">0.5</property>
-			  <property name="xpad">0</property>
-			  <property name="ypad">0</property>
-			  <property name="mnemonic_widget">server-name-entry</property>
-			</widget>
-			<packing>
-			  <property name="left_attach">0</property>
-			  <property name="right_attach">1</property>
-			  <property name="top_attach">0</property>
-			  <property name="bottom_attach">1</property>
-			  <property name="x_options">fill</property>
-			  <property name="y_options"></property>
-			</packing>
-		      </child>
-		    </widget>
-		  </child>
-
-		  <child>
-		    <widget class="GtkLabel" id="label39">
-		      <property name="visible">True</property>
-		      <property name="label" translatable="yes">&lt;b&gt;Server Information&lt;/b&gt;</property>
-		      <property name="use_underline">False</property>
-		      <property name="use_markup">True</property>
-		      <property name="justify">GTK_JUSTIFY_LEFT</property>
-		      <property name="wrap">False</property>
-		      <property name="selectable">False</property>
-		      <property name="xalign">0.5</property>
-		      <property name="yalign">0.5</property>
-		      <property name="xpad">0</property>
-		      <property name="ypad">0</property>
-		    </widget>
-		    <packing>
-		      <property name="type">label_item</property>
-		    </packing>
-		  </child>
-		</widget>
-		<packing>
-		  <property name="padding">0</property>
-		  <property name="expand">False</property>
-		  <property name="fill">True</property>
-		</packing>
-	      </child>
-
-	      <child>
-		<widget class="GtkFrame" id="authentication-frame">
-		  <property name="visible">True</property>
-		  <property name="label_xalign">0</property>
-		  <property name="label_yalign">0.5</property>
-		  <property name="shadow_type">GTK_SHADOW_NONE</property>
-
-		  <child>
-		    <widget class="GtkTable" id="table9">
-		      <property name="border_width">12</property>
-		      <property name="visible">True</property>
-		      <property name="n_rows">2</property>
-		      <property name="n_columns">2</property>
-		      <property name="homogeneous">False</property>
-		      <property name="row_spacing">6</property>
-		      <property name="column_spacing">6</property>
-
-		      <child>
-			<widget class="GtkLabel" id="label46">
-			  <property name="visible">True</property>
-			  <property name="label" translatable="yes">_Log in method:</property>
-			  <property name="use_underline">True</property>
-			  <property name="use_markup">False</property>
-			  <property name="justify">GTK_JUSTIFY_LEFT</property>
-			  <property name="wrap">False</property>
-			  <property name="selectable">False</property>
-			  <property name="xalign">0</property>
-			  <property name="yalign">0.5</property>
-			  <property name="xpad">0</property>
-			  <property name="ypad">0</property>
-			  <property name="mnemonic_widget">auth-optionmenu</property>
-			</widget>
-			<packing>
-			  <property name="left_attach">0</property>
-			  <property name="right_attach">1</property>
-			  <property name="top_attach">0</property>
-			  <property name="bottom_attach">1</property>
-			  <property name="x_options">fill</property>
-			  <property name="y_options"></property>
-			</packing>
-		      </child>
-
-		      <child>
-			<widget class="GtkLabel" id="label47">
-			  <property name="visible">True</property>
-			  <property name="label" translatable="yes">Lo_gin:</property>
-			  <property name="use_underline">True</property>
-			  <property name="use_markup">False</property>
-			  <property name="justify">GTK_JUSTIFY_LEFT</property>
-			  <property name="wrap">False</property>
-			  <property name="selectable">False</property>
-			  <property name="xalign">0</property>
-			  <property name="yalign">0.5</property>
-			  <property name="xpad">0</property>
-			  <property name="ypad">0</property>
-			  <property name="mnemonic_widget">auth-entry</property>
-			</widget>
-			<packing>
-			  <property name="left_attach">0</property>
-			  <property name="right_attach">1</property>
-			  <property name="top_attach">1</property>
-			  <property name="bottom_attach">2</property>
-			  <property name="x_options">fill</property>
-			  <property name="y_options"></property>
-			</packing>
-		      </child>
-
-		      <child>
-			<widget class="GtkEntry" id="auth-entry">
-			  <property name="visible">True</property>
-			  <property name="can_focus">True</property>
-			  <property name="editable">True</property>
-			  <property name="visibility">True</property>
-			  <property name="max_length">0</property>
-			  <property name="text" translatable="yes"></property>
-			  <property name="has_frame">True</property>
-			  <property name="invisible_char" translatable="yes">*</property>
-			  <property name="activates_default">False</property>
-			</widget>
-			<packing>
-			  <property name="left_attach">1</property>
-			  <property name="right_attach">2</property>
-			  <property name="top_attach">1</property>
-			  <property name="bottom_attach">2</property>
-			  <property name="y_options"></property>
-			</packing>
-		      </child>
-
-		      <child>
-			<widget class="GtkOptionMenu" id="auth-optionmenu">
-			  <property name="visible">True</property>
-			  <property name="can_focus">True</property>
-			  <property name="history">0</property>
-
-			  <child>
-			    <widget class="GtkMenu" id="menu8">
-
-			      <child>
-				<widget class="GtkMenuItem" id="anonymously1">
-				  <property name="visible">True</property>
-				  <property name="label" translatable="yes">Anonymously</property>
-				  <property name="use_underline">True</property>
-				  <signal name="activate" handler="on_anonymously1_activate" last_modification_time="Mon, 29 Mar 2004 21:27:10 GMT"/>
-				</widget>
-			      </child>
-
-			      <child>
-				<widget class="GtkMenuItem" id="email_address2">
-				  <property name="visible">True</property>
-				  <property name="label" translatable="yes">Email address</property>
-				  <property name="use_underline">True</property>
-				  <signal name="activate" handler="on_email_address2_activate" last_modification_time="Mon, 29 Mar 2004 21:27:10 GMT"/>
-				</widget>
-			      </child>
-
-			      <child>
-				<widget class="GtkMenuItem" id="distinguished_name2">
-				  <property name="visible">True</property>
-				  <property name="label" translatable="yes">Distinguished name</property>
-				  <property name="use_underline">True</property>
-				  <signal name="activate" handler="on_distinguished_name2_activate" last_modification_time="Mon, 29 Mar 2004 21:27:10 GMT"/>
-				</widget>
-			      </child>
-			    </widget>
-			  </child>
-			</widget>
-			<packing>
-			  <property name="left_attach">1</property>
-			  <property name="right_attach">2</property>
-			  <property name="top_attach">0</property>
-			  <property name="bottom_attach">1</property>
-			  <property name="x_options">fill</property>
-			  <property name="y_options"></property>
-			</packing>
-		      </child>
-		    </widget>
-		  </child>
-
-		  <child>
-		    <widget class="GtkLabel" id="label49">
-		      <property name="visible">True</property>
-		      <property name="label" translatable="yes">&lt;b&gt;Authentication&lt;/b&gt;</property>
-		      <property name="use_underline">False</property>
-		      <property name="use_markup">True</property>
-		      <property name="justify">GTK_JUSTIFY_LEFT</property>
-		      <property name="wrap">False</property>
-		      <property name="selectable">False</property>
-		      <property name="xalign">0.5</property>
-		      <property name="yalign">0.5</property>
-		      <property name="xpad">0</property>
-		      <property name="ypad">0</property>
-		    </widget>
-		    <packing>
-		      <property name="type">label_item</property>
-		    </packing>
-		  </child>
-		</widget>
-		<packing>
-		  <property name="padding">0</property>
-		  <property name="expand">True</property>
-		  <property name="fill">True</property>
-		</packing>
-	      </child>
-	    </widget>
-	    <packing>
-	      <property name="tab_expand">False</property>
-	      <property name="tab_fill">True</property>
-	    </packing>
-	  </child>
-
-	  <child>
-	    <widget class="GtkLabel" id="basic-label">
-	      <property name="visible">True</property>
-	      <property name="label" translatable="yes">Basic</property>
-	      <property name="use_underline">False</property>
-	      <property name="use_markup">False</property>
-	      <property name="justify">GTK_JUSTIFY_LEFT</property>
-	      <property name="wrap">False</property>
-	      <property name="selectable">False</property>
-	      <property name="xalign">0.5</property>
-	      <property name="yalign">0.5</property>
-	      <property name="xpad">0</property>
-	      <property name="ypad">0</property>
-	    </widget>
-	    <packing>
-	      <property name="type">tab</property>
-	    </packing>
-	  </child>
-
-	  <child>
-	    <widget class="GtkVBox" id="details-vbox">
-	      <property name="border_width">12</property>
-	      <property name="visible">True</property>
-	      <property name="homogeneous">False</property>
-	      <property name="spacing">12</property>
-
-	      <child>
-		<widget class="GtkFrame" id="searching-frame">
-		  <property name="visible">True</property>
-		  <property name="label_xalign">0</property>
-		  <property name="label_yalign">0.5</property>
-		  <property name="shadow_type">GTK_SHADOW_NONE</property>
-
-		  <child>
-		    <widget class="GtkTable" id="table10">
-		      <property name="border_width">12</property>
-		      <property name="visible">True</property>
-		      <property name="n_rows">3</property>
-		      <property name="n_columns">3</property>
-		      <property name="homogeneous">False</property>
-		      <property name="row_spacing">6</property>
-		      <property name="column_spacing">6</property>
-
-		      <child>
-			<widget class="GtkLabel" id="label53">
-			  <property name="visible">True</property>
-			  <property name="label" translatable="yes">Search _base:</property>
-			  <property name="use_underline">True</property>
-			  <property name="use_markup">False</property>
-			  <property name="justify">GTK_JUSTIFY_LEFT</property>
-			  <property name="wrap">False</property>
-			  <property name="selectable">False</property>
-			  <property name="xalign">0</property>
-			  <property name="yalign">0.5</property>
-			  <property name="xpad">0</property>
-			  <property name="ypad">0</property>
-			  <property name="mnemonic_widget">rootdn-entry</property>
-			</widget>
-			<packing>
-			  <property name="left_attach">0</property>
-			  <property name="right_attach">1</property>
-			  <property name="top_attach">0</property>
-			  <property name="bottom_attach">1</property>
-			  <property name="x_options">fill</property>
-			  <property name="y_options"></property>
-			</packing>
-		      </child>
-
-		      <child>
-			<widget class="GtkLabel" id="label54">
-			  <property name="visible">True</property>
-			  <property name="label" translatable="yes">_Search scope:</property>
-			  <property name="use_underline">True</property>
-			  <property name="use_markup">False</property>
-			  <property name="justify">GTK_JUSTIFY_LEFT</property>
-			  <property name="wrap">False</property>
-			  <property name="selectable">False</property>
-			  <property name="xalign">0</property>
-			  <property name="yalign">0.5</property>
-			  <property name="xpad">0</property>
-			  <property name="ypad">0</property>
-			  <property name="mnemonic_widget">scope-optionmenu</property>
-			</widget>
-			<packing>
-			  <property name="left_attach">0</property>
-			  <property name="right_attach">1</property>
-			  <property name="top_attach">2</property>
-			  <property name="bottom_attach">3</property>
-			  <property name="x_options">fill</property>
-			  <property name="y_options"></property>
-			</packing>
-		      </child>
-
-		      <child>
-			<widget class="GtkEntry" id="rootdn-entry">
-			  <property name="visible">True</property>
-			  <property name="can_focus">True</property>
-			  <property name="editable">True</property>
-			  <property name="visibility">True</property>
-			  <property name="max_length">0</property>
-			  <property name="text" translatable="yes"></property>
-			  <property name="has_frame">True</property>
-			  <property name="invisible_char" translatable="yes">*</property>
-			  <property name="activates_default">False</property>
-			</widget>
-			<packing>
-			  <property name="left_attach">1</property>
-			  <property name="right_attach">3</property>
-			  <property name="top_attach">0</property>
-			  <property name="bottom_attach">1</property>
-			  <property name="y_options"></property>
-			</packing>
-		      </child>
-
-		      <child>
-			<widget class="GtkButton" id="rootdn-button">
-			  <property name="visible">True</property>
-			  <property name="can_focus">True</property>
-			  <property name="relief">GTK_RELIEF_NORMAL</property>
-			  <property name="focus_on_click">True</property>
-
-			  <child>
-			    <widget class="GtkAlignment" id="alignment13">
-			      <property name="visible">True</property>
-			      <property name="xalign">0.5</property>
-			      <property name="yalign">0.5</property>
-			      <property name="xscale">0</property>
-			      <property name="yscale">0</property>
-			      <property name="top_padding">0</property>
-			      <property name="bottom_padding">0</property>
-			      <property name="left_padding">0</property>
-			      <property name="right_padding">0</property>
-
-			      <child>
-				<widget class="GtkHBox" id="hbox16">
-				  <property name="visible">True</property>
-				  <property name="homogeneous">False</property>
-				  <property name="spacing">2</property>
-
-				  <child>
-				    <widget class="GtkImage" id="image9">
-				      <property name="visible">True</property>
-				      <property name="stock">gtk-find</property>
-				      <property name="icon_size">4</property>
-				      <property name="xalign">0.5</property>
-				      <property name="yalign">0.5</property>
-				      <property name="xpad">0</property>
-				      <property name="ypad">0</property>
-				    </widget>
-				    <packing>
-				      <property name="padding">0</property>
-				      <property name="expand">False</property>
-				      <property name="fill">False</property>
-				    </packing>
-				  </child>
-
-				  <child>
-				    <widget class="GtkLabel" id="label57">
-				      <property name="visible">True</property>
-				      <property name="label" translatable="yes">Find Possible Search Bases</property>
-				      <property name="use_underline">True</property>
-				      <property name="use_markup">False</property>
-				      <property name="justify">GTK_JUSTIFY_LEFT</property>
-				      <property name="wrap">False</property>
-				      <property name="selectable">False</property>
-				      <property name="xalign">0.5</property>
-				      <property name="yalign">0.5</property>
-				      <property name="xpad">0</property>
-				      <property name="ypad">0</property>
-				    </widget>
-				    <packing>
-				      <property name="padding">0</property>
-				      <property name="expand">False</property>
-				      <property name="fill">False</property>
-				    </packing>
-				  </child>
-				</widget>
-			      </child>
-			    </widget>
-			  </child>
-			</widget>
-			<packing>
-			  <property name="left_attach">1</property>
-			  <property name="right_attach">2</property>
-			  <property name="top_attach">1</property>
-			  <property name="bottom_attach">2</property>
-			  <property name="x_options">fill</property>
-			  <property name="y_options"></property>
-			</packing>
-		      </child>
-
-		      <child>
-			<widget class="GtkOptionMenu" id="scope-optionmenu">
-			  <property name="visible">True</property>
-			  <property name="can_focus">True</property>
-			  <property name="history">0</property>
-
-			  <child>
-			    <widget class="GtkMenu" id="menu10">
-
-			      <child>
-				<widget class="GtkMenuItem" id="one">
-				  <property name="visible">True</property>
-				  <property name="label" translatable="yes">One</property>
-				  <property name="use_underline">True</property>
-				</widget>
-			      </child>
-
-			      <child>
-				<widget class="GtkMenuItem" id="sub">
-				  <property name="visible">True</property>
-				  <property name="label" translatable="yes">Sub</property>
-				  <property name="use_underline">True</property>
-				</widget>
-			      </child>
-			    </widget>
-			  </child>
-			</widget>
-			<packing>
-			  <property name="left_attach">1</property>
-			  <property name="right_attach">3</property>
-			  <property name="top_attach">2</property>
-			  <property name="bottom_attach">3</property>
-			  <property name="x_options">fill</property>
-			  <property name="y_options"></property>
-			</packing>
-		      </child>
-
-		      <child>
-			<widget class="GtkLabel" id="label55">
-			  <property name="visible">True</property>
-			  <property name="label" translatable="yes"></property>
-			  <property name="use_underline">False</property>
-			  <property name="use_markup">False</property>
-			  <property name="justify">GTK_JUSTIFY_LEFT</property>
-			  <property name="wrap">False</property>
-			  <property name="selectable">False</property>
-			  <property name="xalign">0</property>
-			  <property name="yalign">0.5</property>
-			  <property name="xpad">0</property>
-			  <property name="ypad">0</property>
-			</widget>
-			<packing>
-			  <property name="left_attach">0</property>
-			  <property name="right_attach">1</property>
-			  <property name="top_attach">1</property>
-			  <property name="bottom_attach">2</property>
-			  <property name="x_options">fill</property>
-			  <property name="y_options"></property>
-			</packing>
-		      </child>
-
-		      <child>
-			<widget class="GtkLabel" id="label56">
-			  <property name="visible">True</property>
-			  <property name="label" translatable="yes"></property>
-			  <property name="use_underline">False</property>
-			  <property name="use_markup">False</property>
-			  <property name="justify">GTK_JUSTIFY_LEFT</property>
-			  <property name="wrap">False</property>
-			  <property name="selectable">False</property>
-			  <property name="xalign">0</property>
-			  <property name="yalign">0.5</property>
-			  <property name="xpad">0</property>
-			  <property name="ypad">0</property>
-			</widget>
-			<packing>
-			  <property name="left_attach">2</property>
-			  <property name="right_attach">3</property>
-			  <property name="top_attach">1</property>
-			  <property name="bottom_attach">2</property>
-			  <property name="x_options">fill</property>
-			  <property name="y_options"></property>
-			</packing>
-		      </child>
-		    </widget>
-		  </child>
-
-		  <child>
-		    <widget class="GtkLabel" id="label51">
-		      <property name="visible">True</property>
-		      <property name="label" translatable="yes">&lt;b&gt;Searching&lt;/b&gt;</property>
-		      <property name="use_underline">False</property>
-		      <property name="use_markup">True</property>
-		      <property name="justify">GTK_JUSTIFY_LEFT</property>
-		      <property name="wrap">False</property>
-		      <property name="selectable">False</property>
-		      <property name="xalign">0.5</property>
-		      <property name="yalign">0.5</property>
-		      <property name="xpad">0</property>
-		      <property name="ypad">0</property>
-		    </widget>
-		    <packing>
-		      <property name="type">label_item</property>
-		    </packing>
-		  </child>
-		</widget>
-		<packing>
-		  <property name="padding">0</property>
-		  <property name="expand">False</property>
-		  <property name="fill">False</property>
-		</packing>
-	      </child>
-
-	      <child>
-		<widget class="GtkFrame" id="downloading-frame">
-		  <property name="visible">True</property>
-		  <property name="label_xalign">0</property>
-		  <property name="label_yalign">0.5</property>
-		  <property name="shadow_type">GTK_SHADOW_NONE</property>
-
-		  <child>
-		    <widget class="GtkTable" id="table11">
-		      <property name="border_width">12</property>
-		      <property name="visible">True</property>
-		      <property name="n_rows">2</property>
-		      <property name="n_columns">3</property>
-		      <property name="homogeneous">False</property>
-		      <property name="row_spacing">6</property>
-		      <property name="column_spacing">6</property>
-
-		      <child>
-			<widget class="GtkLabel" id="label58">
-			  <property name="visible">True</property>
-			  <property name="label" translatable="yes">_Timeout:</property>
-			  <property name="use_underline">True</property>
-			  <property name="use_markup">False</property>
-			  <property name="justify">GTK_JUSTIFY_LEFT</property>
-			  <property name="wrap">False</property>
-			  <property name="selectable">False</property>
-			  <property name="xalign">0</property>
-			  <property name="yalign">0.5</property>
-			  <property name="xpad">0</property>
-			  <property name="ypad">0</property>
-			  <property name="mnemonic_widget">timeout-scale</property>
-			</widget>
-			<packing>
-			  <property name="left_attach">0</property>
-			  <property name="right_attach">1</property>
-			  <property name="top_attach">0</property>
-			  <property name="bottom_attach">1</property>
-			  <property name="x_options">fill</property>
-			  <property name="y_options"></property>
-			</packing>
-		      </child>
-
-		      <child>
-			<widget class="GtkLabel" id="label59">
-			  <property name="visible">True</property>
-			  <property name="label" translatable="yes">minutes</property>
-			  <property name="use_underline">False</property>
-			  <property name="use_markup">False</property>
-			  <property name="justify">GTK_JUSTIFY_LEFT</property>
-			  <property name="wrap">False</property>
-			  <property name="selectable">False</property>
-			  <property name="xalign">0</property>
-			  <property name="yalign">0.5</property>
-			  <property name="xpad">0</property>
-			  <property name="ypad">0</property>
-			</widget>
-			<packing>
-			  <property name="left_attach">2</property>
-			  <property name="right_attach">3</property>
-			  <property name="top_attach">0</property>
-			  <property name="bottom_attach">1</property>
-			  <property name="x_options">fill</property>
-			  <property name="y_options"></property>
-			</packing>
-		      </child>
-
-		      <child>
-			<widget class="GtkHBox" id="hbox17">
-			  <property name="visible">True</property>
-			  <property name="homogeneous">False</property>
-			  <property name="spacing">6</property>
-
-			  <child>
-			    <widget class="GtkLabel" id="label60">
-			      <property name="visible">True</property>
-			      <property name="label" translatable="yes">1</property>
-			      <property name="use_underline">False</property>
-			      <property name="use_markup">False</property>
-			      <property name="justify">GTK_JUSTIFY_LEFT</property>
-			      <property name="wrap">False</property>
-			      <property name="selectable">False</property>
-			      <property name="xalign">0.5</property>
-			      <property name="yalign">0.5</property>
-			      <property name="xpad">0</property>
-			      <property name="ypad">0</property>
-			    </widget>
-			    <packing>
-			      <property name="padding">0</property>
-			      <property name="expand">False</property>
-			      <property name="fill">False</property>
-			    </packing>
-			  </child>
-
-			  <child>
-			    <widget class="GtkHScale" id="timeout-scale">
-			      <property name="visible">True</property>
-			      <property name="can_focus">True</property>
-			      <property name="draw_value">False</property>
-			      <property name="value_pos">GTK_POS_TOP</property>
-			      <property name="digits">1</property>
-			      <property name="update_policy">GTK_UPDATE_CONTINUOUS</property>
-			      <property name="inverted">False</property>
-			      <property name="adjustment">3 1 5 0.5 1 0</property>
-			    </widget>
-			    <packing>
-			      <property name="padding">0</property>
-			      <property name="expand">True</property>
-			      <property name="fill">True</property>
-			    </packing>
-			  </child>
-
-			  <child>
-			    <widget class="GtkLabel" id="label61">
-			      <property name="visible">True</property>
-			      <property name="label" translatable="yes">5</property>
-			      <property name="use_underline">False</property>
-			      <property name="use_markup">False</property>
-			      <property name="justify">GTK_JUSTIFY_LEFT</property>
-			      <property name="wrap">False</property>
-			      <property name="selectable">False</property>
-			      <property name="xalign">0.5</property>
-			      <property name="yalign">0.5</property>
-			      <property name="xpad">0</property>
-			      <property name="ypad">0</property>
-			    </widget>
-			    <packing>
-			      <property name="padding">0</property>
-			      <property name="expand">False</property>
-			      <property name="fill">False</property>
-			    </packing>
-			  </child>
-			</widget>
-			<packing>
-			  <property name="left_attach">1</property>
-			  <property name="right_attach">2</property>
-			  <property name="top_attach">0</property>
-			  <property name="bottom_attach">1</property>
-			  <property name="y_options">fill</property>
-			</packing>
-		      </child>
-
-		      <child>
-			<widget class="GtkLabel" id="label62">
-			  <property name="visible">True</property>
-			  <property name="label" translatable="yes">_Download limit:</property>
-			  <property name="use_underline">True</property>
-			  <property name="use_markup">False</property>
-			  <property name="justify">GTK_JUSTIFY_LEFT</property>
-			  <property name="wrap">False</property>
-			  <property name="selectable">False</property>
-			  <property name="xalign">0</property>
-			  <property name="yalign">0.5</property>
-			  <property name="xpad">0</property>
-			  <property name="ypad">0</property>
-			  <property name="mnemonic_widget">download-limit-spinbutton</property>
-			</widget>
-			<packing>
-			  <property name="left_attach">0</property>
-			  <property name="right_attach">1</property>
-			  <property name="top_attach">1</property>
-			  <property name="bottom_attach">2</property>
-			  <property name="x_options">fill</property>
-			  <property name="y_options"></property>
-			</packing>
-		      </child>
-
-		      <child>
-			<widget class="GtkLabel" id="label63">
-			  <property name="visible">True</property>
-			  <property name="label" translatable="yes">cards</property>
-			  <property name="use_underline">False</property>
-			  <property name="use_markup">False</property>
-			  <property name="justify">GTK_JUSTIFY_LEFT</property>
-			  <property name="wrap">False</property>
-			  <property name="selectable">False</property>
-			  <property name="xalign">0</property>
-			  <property name="yalign">0.5</property>
-			  <property name="xpad">0</property>
-			  <property name="ypad">0</property>
-			</widget>
-			<packing>
-			  <property name="left_attach">2</property>
-			  <property name="right_attach">3</property>
-			  <property name="top_attach">1</property>
-			  <property name="bottom_attach">2</property>
-			  <property name="x_options">fill</property>
-			  <property name="y_options"></property>
-			</packing>
-		      </child>
-
-		      <child>
-			<widget class="GtkSpinButton" id="download-limit-spinbutton">
-			  <property name="visible">True</property>
-			  <property name="can_focus">True</property>
-			  <property name="climb_rate">1</property>
-			  <property name="digits">0</property>
-			  <property name="numeric">False</property>
-			  <property name="update_policy">GTK_UPDATE_ALWAYS</property>
-			  <property name="snap_to_ticks">False</property>
-			  <property name="wrap">False</property>
-			  <property name="adjustment">0 0 1000 1 10 10</property>
-			</widget>
-			<packing>
-			  <property name="left_attach">1</property>
-			  <property name="right_attach">2</property>
-			  <property name="top_attach">1</property>
-			  <property name="bottom_attach">2</property>
-			  <property name="y_options"></property>
-			</packing>
-		      </child>
-		    </widget>
-		  </child>
-
-		  <child>
-		    <widget class="GtkLabel" id="label52">
-		      <property name="visible">True</property>
-		      <property name="label" translatable="yes">&lt;b&gt;Downloading&lt;/b&gt;</property>
-		      <property name="use_underline">False</property>
-		      <property name="use_markup">True</property>
-		      <property name="justify">GTK_JUSTIFY_LEFT</property>
-		      <property name="wrap">False</property>
-		      <property name="selectable">False</property>
-		      <property name="xalign">0.5</property>
-		      <property name="yalign">0.5</property>
-		      <property name="xpad">0</property>
-		      <property name="ypad">0</property>
-		    </widget>
-		    <packing>
-		      <property name="type">label_item</property>
-		    </packing>
-		  </child>
-		</widget>
-		<packing>
-		  <property name="padding">0</property>
-		  <property name="expand">True</property>
-		  <property name="fill">True</property>
-		</packing>
-	      </child>
-	    </widget>
-	    <packing>
-	      <property name="tab_expand">False</property>
-	      <property name="tab_fill">True</property>
-	    </packing>
-	  </child>
-
-	  <child>
-	    <widget class="GtkLabel" id="details-label">
-	      <property name="visible">True</property>
-	      <property name="label" translatable="yes">Details</property>
-	      <property name="use_underline">False</property>
-	      <property name="use_markup">False</property>
-	      <property name="justify">GTK_JUSTIFY_LEFT</property>
-	      <property name="wrap">False</property>
-	      <property name="selectable">False</property>
-	      <property name="xalign">0.5</property>
-	      <property name="yalign">0.5</property>
-	      <property name="xpad">0</property>
-	      <property name="ypad">0</property>
-	    </widget>
-	    <packing>
-	      <property name="type">tab</property>
-	    </packing>
-	  </child>
-	</widget>
-	<packing>
-	  <property name="padding">0</property>
-	  <property name="expand">True</property>
-	  <property name="fill">True</property>
-	</packing>
-      </child>
-    </widget>
-  </child>
-</widget>
-
-</glade-interface>
diff --git a/addressbook/gui/component/select-names/.cvsignore b/addressbook/gui/component/select-names/.cvsignore
deleted file mode 100644
index 1520453f86..0000000000
--- a/addressbook/gui/component/select-names/.cvsignore
+++ /dev/null
@@ -1,15 +0,0 @@
-.deps
-.libs
-.pure
-Makefile
-Makefile.in
-*.lo
-*.la
-Evolution-Addressbook-SelectNames-stubs.c
-Evolution-Addressbook-SelectNames-skels.c
-Evolution-Addressbook-SelectNames-common.c
-Evolution-Addressbook-SelectNames.h
-GNOME_Evolution_Addressbook_SelectNames*.server
-GNOME_Evolution_Addressbook_SelectNames*.server.in
-e-select-names-marshal.c
-e-select-names-marshal.h
diff --git a/addressbook/gui/contact-editor/.cvsignore b/addressbook/gui/contact-editor/.cvsignore
deleted file mode 100644
index ddbd38bb6e..0000000000
--- a/addressbook/gui/contact-editor/.cvsignore
+++ /dev/null
@@ -1,11 +0,0 @@
-.deps
-.libs
-.pure
-Makefile
-Makefile.in
-*.lo
-*.la
-contact-editor-test
-contact-editor.gladep
-e-contact-editor-marshal.c
-e-contact-editor-marshal.h
diff --git a/addressbook/gui/contact-editor/Makefile.am b/addressbook/gui/contact-editor/Makefile.am
deleted file mode 100644
index c43937752f..0000000000
--- a/addressbook/gui/contact-editor/Makefile.am
+++ /dev/null
@@ -1,50 +0,0 @@
-INCLUDES =						\
-	-I$(top_srcdir)					\
-	-I$(top_srcdir)/addressbook/			\
-	-I$(top_srcdir)/addressbook/backend		\
-	-I$(top_builddir)/addressbook/backend		\
-	-I$(top_srcdir)/addressbook/gui/merging		\
-	-I$(top_srcdir)/widgets/e-table			\
-	-I$(top_builddir)/shell				\
-	-I$(top_srcdir)/camel				\
-	-I$(top_builddir)/camel				\
-	-DEVOLUTION_GLADEDIR=\""$(gladedir)"\"		\
-	-DEVOLUTION_DATADIR=\""$(datadir)"\"		\
-	-DEVOLUTION_IMAGESDIR=\""$(imagesdir)"\"	\
-	-DEVOLUTION_UIDIR=\""$(evolutionuidir)\""	\
-	-DPREFIX=\""$(prefix)"\"			\
-	-DG_LOG_DOMAIN=\"contact-editor\"		\
-	$(EVOLUTION_ADDRESSBOOK_CFLAGS)
-
-privlib_LTLIBRARIES =				\
-	libecontacteditor.la
-
-libecontacteditor_la_SOURCES = 			\
-	$(MARSHAL_GENERATED)			\
-	eab-editor.c				\
-	eab-editor.h				\
-	e-contact-editor-im.c			\
-	e-contact-editor-im.h			\
-	e-contact-editor-address.c		\
-	e-contact-editor-address.h		\
-	e-contact-editor-fullname.c		\
-	e-contact-editor-fullname.h		\
-	e-contact-editor.c			\
-	e-contact-editor.h			\
-	e-contact-quick-add.c			\
-	e-contact-quick-add.h
-
-MARSHAL_GENERATED = e-contact-editor-marshal.c e-contact-editor-marshal.h
-@EVO_MARSHAL_RULE@
-
-glade_DATA = 				\
-	im.glade				\
-	contact-editor.glade		\
-	fulladdr.glade			\
-	fullname.glade
-
-BUILT_SOURCES = $(MARSHAL_GENERATED)
-CLEANFILES = $(BUILT_SOURCES)
-
-EXTRA_DIST=	$(glade_DATA)		\
-		e-contact-editor-marshal.list
diff --git a/addressbook/gui/contact-editor/contact-editor.glade b/addressbook/gui/contact-editor/contact-editor.glade
deleted file mode 100644
index f396def9f1..0000000000
--- a/addressbook/gui/contact-editor/contact-editor.glade
+++ /dev/null
@@ -1,3769 +0,0 @@
-<?xml version="1.0" standalone="no"?> <!--*- mode: xml -*-->
-<!DOCTYPE glade-interface SYSTEM "http://glade.gnome.org/glade-2.0.dtd">
-
-<glade-interface>
-
-<widget class="GtkDialog" id="contact editor">
-  <property name="title" translatable="yes">Contact Editor</property>
-  <property name="type">GTK_WINDOW_TOPLEVEL</property>
-  <property name="window_position">GTK_WIN_POS_NONE</property>
-  <property name="modal">False</property>
-  <property name="resizable">True</property>
-  <property name="destroy_with_parent">False</property>
-  <property name="decorated">True</property>
-  <property name="skip_taskbar_hint">False</property>
-  <property name="skip_pager_hint">False</property>
-  <property name="type_hint">GDK_WINDOW_TYPE_HINT_DIALOG</property>
-  <property name="gravity">GDK_GRAVITY_NORTH_WEST</property>
-  <property name="has_separator">False</property>
-
-  <child internal-child="vbox">
-    <widget class="GtkVBox" id="dialog-vbox1">
-      <property name="visible">True</property>
-      <property name="homogeneous">False</property>
-      <property name="spacing">0</property>
-
-      <child internal-child="action_area">
-	<widget class="GtkHButtonBox" id="dialog-action_area1">
-	  <property name="visible">True</property>
-	  <property name="layout_style">GTK_BUTTONBOX_END</property>
-
-	  <child>
-	    <widget class="GtkButton" id="button-help">
-	      <property name="visible">True</property>
-	      <property name="can_default">True</property>
-	      <property name="can_focus">True</property>
-	      <property name="label">gtk-help</property>
-	      <property name="use_stock">True</property>
-	      <property name="relief">GTK_RELIEF_NORMAL</property>
-	      <property name="focus_on_click">True</property>
-	      <property name="response_id">-11</property>
-	    </widget>
-	  </child>
-
-	  <child>
-	    <widget class="GtkButton" id="button-cancel">
-	      <property name="visible">True</property>
-	      <property name="can_default">True</property>
-	      <property name="can_focus">True</property>
-	      <property name="label">gtk-cancel</property>
-	      <property name="use_stock">True</property>
-	      <property name="relief">GTK_RELIEF_NORMAL</property>
-	      <property name="focus_on_click">True</property>
-	      <property name="response_id">-6</property>
-	    </widget>
-	  </child>
-
-	  <child>
-	    <widget class="GtkButton" id="button-ok">
-	      <property name="visible">True</property>
-	      <property name="can_default">True</property>
-	      <property name="has_default">True</property>
-	      <property name="can_focus">True</property>
-	      <property name="label">gtk-ok</property>
-	      <property name="use_stock">True</property>
-	      <property name="relief">GTK_RELIEF_NORMAL</property>
-	      <property name="focus_on_click">True</property>
-	      <property name="response_id">-5</property>
-	    </widget>
-	  </child>
-	</widget>
-	<packing>
-	  <property name="padding">0</property>
-	  <property name="expand">False</property>
-	  <property name="fill">True</property>
-	  <property name="pack_type">GTK_PACK_END</property>
-	</packing>
-      </child>
-
-      <child>
-	<widget class="GtkNotebook" id="notebook11">
-	  <property name="border_width">12</property>
-	  <property name="visible">True</property>
-	  <property name="can_focus">True</property>
-	  <property name="show_tabs">True</property>
-	  <property name="show_border">True</property>
-	  <property name="tab_pos">GTK_POS_TOP</property>
-	  <property name="scrollable">False</property>
-	  <property name="enable_popup">False</property>
-
-	  <child>
-	    <widget class="GtkVBox" id="vbox33">
-	      <property name="border_width">12</property>
-	      <property name="visible">True</property>
-	      <property name="homogeneous">False</property>
-	      <property name="spacing">1</property>
-
-	      <child>
-		<widget class="GtkHBox" id="hbox55">
-		  <property name="visible">True</property>
-		  <property name="homogeneous">False</property>
-		  <property name="spacing">6</property>
-
-		  <child>
-		    <widget class="GtkButton" id="button-image">
-		      <property name="visible">True</property>
-		      <property name="can_focus">True</property>
-		      <property name="relief">GTK_RELIEF_NORMAL</property>
-		      <property name="focus_on_click">True</property>
-		      <accessibility>
-			<atkproperty name="AtkObject::accessible_name" translatable="yes">Image</atkproperty>
-		      </accessibility>
-
-		      <child>
-			<widget class="Custom" id="image-chooser">
-			  <property name="visible">True</property>
-			  <property name="creation_function">eab_create_image_chooser_widget</property>
-			  <property name="string1">stock_person</property>
-			  <property name="int1">0</property>
-			  <property name="int2">0</property>
-			  <property name="last_modification_time">Tue, 13 Apr 2004 20:51:33 GMT</property>
-			</widget>
-		      </child>
-		    </widget>
-		    <packing>
-		      <property name="padding">0</property>
-		      <property name="expand">False</property>
-		      <property name="fill">True</property>
-		    </packing>
-		  </child>
-
-		  <child>
-		    <widget class="GtkTable" id="table83">
-		      <property name="visible">True</property>
-		      <property name="n_rows">3</property>
-		      <property name="n_columns">4</property>
-		      <property name="homogeneous">False</property>
-		      <property name="row_spacing">6</property>
-		      <property name="column_spacing">6</property>
-
-		      <child>
-			<widget class="GtkLabel" id="label-nickname">
-			  <property name="visible">True</property>
-			  <property name="label" translatable="yes">Ni_ckname:</property>
-			  <property name="use_underline">True</property>
-			  <property name="use_markup">False</property>
-			  <property name="justify">GTK_JUSTIFY_LEFT</property>
-			  <property name="wrap">False</property>
-			  <property name="selectable">False</property>
-			  <property name="xalign">1</property>
-			  <property name="yalign">0.5</property>
-			  <property name="xpad">0</property>
-			  <property name="ypad">0</property>
-			  <property name="mnemonic_widget">entry-nickname</property>
-			</widget>
-			<packing>
-			  <property name="left_attach">2</property>
-			  <property name="right_attach">3</property>
-			  <property name="top_attach">0</property>
-			  <property name="bottom_attach">1</property>
-			  <property name="x_options">fill</property>
-			  <property name="y_options"></property>
-			</packing>
-		      </child>
-
-		      <child>
-			<widget class="GtkEntry" id="entry-fullname">
-			  <property name="visible">True</property>
-			  <property name="can_focus">True</property>
-			  <property name="editable">True</property>
-			  <property name="visibility">True</property>
-			  <property name="max_length">0</property>
-			  <property name="text" translatable="yes"></property>
-			  <property name="has_frame">True</property>
-			  <property name="invisible_char" translatable="yes">*</property>
-			  <property name="activates_default">False</property>
-			  <accessibility>
-			    <atkrelation target="button-fullname" type="labelled-by"/>
-			  </accessibility>
-			</widget>
-			<packing>
-			  <property name="left_attach">1</property>
-			  <property name="right_attach">2</property>
-			  <property name="top_attach">0</property>
-			  <property name="bottom_attach">1</property>
-			  <property name="y_options"></property>
-			</packing>
-		      </child>
-
-		      <child>
-			<widget class="GtkLabel" id="accellabel-fileas">
-			  <property name="visible">True</property>
-			  <property name="label" translatable="yes">_File under:</property>
-			  <property name="use_underline">True</property>
-			  <property name="use_markup">False</property>
-			  <property name="justify">GTK_JUSTIFY_LEFT</property>
-			  <property name="wrap">False</property>
-			  <property name="selectable">False</property>
-			  <property name="xalign">1</property>
-			  <property name="yalign">0.5</property>
-			  <property name="xpad">0</property>
-			  <property name="ypad">0</property>
-			  <property name="mnemonic_widget">entry-file-as</property>
-			</widget>
-			<packing>
-			  <property name="left_attach">0</property>
-			  <property name="right_attach">1</property>
-			  <property name="top_attach">1</property>
-			  <property name="bottom_attach">2</property>
-			  <property name="x_options">fill</property>
-			  <property name="y_options"></property>
-			</packing>
-		      </child>
-
-		      <child>
-			<widget class="GtkLabel" id="where-label">
-			  <property name="visible">True</property>
-			  <property name="label" translatable="yes">_Where:</property>
-			  <property name="use_underline">True</property>
-			  <property name="use_markup">False</property>
-			  <property name="justify">GTK_JUSTIFY_LEFT</property>
-			  <property name="wrap">False</property>
-			  <property name="selectable">False</property>
-			  <property name="xalign">1</property>
-			  <property name="yalign">0.5</property>
-			  <property name="xpad">0</property>
-			  <property name="ypad">0</property>
-			</widget>
-			<packing>
-			  <property name="left_attach">2</property>
-			  <property name="right_attach">3</property>
-			  <property name="top_attach">1</property>
-			  <property name="bottom_attach">2</property>
-			  <property name="x_options">fill</property>
-			  <property name="y_options"></property>
-			</packing>
-		      </child>
-
-		      <child>
-			<widget class="GtkButton" id="button-categories">
-			  <property name="visible">True</property>
-			  <property name="can_focus">True</property>
-			  <property name="label" translatable="yes">_Categories</property>
-			  <property name="use_underline">True</property>
-			  <property name="relief">GTK_RELIEF_NORMAL</property>
-			  <property name="focus_on_click">True</property>
-			</widget>
-			<packing>
-			  <property name="left_attach">0</property>
-			  <property name="right_attach">1</property>
-			  <property name="top_attach">2</property>
-			  <property name="bottom_attach">3</property>
-			  <property name="x_options">fill</property>
-			  <property name="y_options"></property>
-			</packing>
-		      </child>
-
-		      <child>
-			<widget class="GtkEntry" id="entry-categories">
-			  <property name="visible">True</property>
-			  <property name="can_focus">True</property>
-			  <property name="editable">True</property>
-			  <property name="visibility">True</property>
-			  <property name="max_length">0</property>
-			  <property name="text" translatable="yes"></property>
-			  <property name="has_frame">True</property>
-			  <property name="invisible_char" translatable="yes">*</property>
-			  <property name="activates_default">False</property>
-			  <accessibility>
-			    <atkrelation target="button-categories" type="labelled-by"/>
-			  </accessibility>
-			</widget>
-			<packing>
-			  <property name="left_attach">1</property>
-			  <property name="right_attach">4</property>
-			  <property name="top_attach">2</property>
-			  <property name="bottom_attach">3</property>
-			  <property name="y_options"></property>
-			</packing>
-		      </child>
-
-		      <child>
-			<widget class="GtkEntry" id="entry-nickname">
-			  <property name="visible">True</property>
-			  <property name="can_focus">True</property>
-			  <property name="editable">True</property>
-			  <property name="visibility">True</property>
-			  <property name="max_length">0</property>
-			  <property name="text" translatable="yes"></property>
-			  <property name="has_frame">True</property>
-			  <property name="invisible_char" translatable="yes">*</property>
-			  <property name="activates_default">False</property>
-			</widget>
-			<packing>
-			  <property name="left_attach">3</property>
-			  <property name="right_attach">4</property>
-			  <property name="top_attach">0</property>
-			  <property name="bottom_attach">1</property>
-			  <property name="y_options"></property>
-			</packing>
-		      </child>
-
-		      <child>
-			<widget class="GtkCombo" id="combo-file-as">
-			  <property name="visible">True</property>
-			  <property name="value_in_list">False</property>
-			  <property name="allow_empty">True</property>
-			  <property name="case_sensitive">False</property>
-			  <property name="enable_arrow_keys">True</property>
-			  <property name="enable_arrows_always">False</property>
-			  <accessibility>
-			    <atkrelation target="accellabel-fileas" type="labelled-by"/>
-			  </accessibility>
-
-			  <child internal-child="entry">
-			    <widget class="GtkEntry" id="entry-file-as">
-			      <property name="visible">True</property>
-			      <property name="can_focus">True</property>
-			      <property name="editable">True</property>
-			      <property name="visibility">True</property>
-			      <property name="max_length">0</property>
-			      <property name="text" translatable="yes"></property>
-			      <property name="has_frame">True</property>
-			      <property name="invisible_char" translatable="yes">*</property>
-			      <property name="activates_default">False</property>
-			    </widget>
-			  </child>
-
-			  <child internal-child="list">
-			    <widget class="GtkList" id="list14">
-			      <property name="visible">True</property>
-			      <property name="selection_mode">GTK_SELECTION_BROWSE</property>
-			    </widget>
-			  </child>
-			</widget>
-			<packing>
-			  <property name="left_attach">1</property>
-			  <property name="right_attach">2</property>
-			  <property name="top_attach">1</property>
-			  <property name="bottom_attach">2</property>
-			  <property name="y_options"></property>
-			</packing>
-		      </child>
-
-		      <child>
-			<widget class="Custom" id="source-option-menu-source">
-			  <property name="visible">True</property>
-			  <property name="creation_function">e_contact_editor_create_source_option_menu</property>
-			  <property name="int1">0</property>
-			  <property name="int2">0</property>
-			  <property name="last_modification_time">Tue, 13 Apr 2004 20:47:50 GMT</property>
-			</widget>
-			<packing>
-			  <property name="left_attach">3</property>
-			  <property name="right_attach">4</property>
-			  <property name="top_attach">1</property>
-			  <property name="bottom_attach">2</property>
-			  <property name="x_options">fill</property>
-			  <property name="y_options">fill</property>
-			</packing>
-		      </child>
-
-		      <child>
-			<widget class="GtkButton" id="button-fullname">
-			  <property name="visible">True</property>
-			  <property name="can_focus">True</property>
-			  <property name="label" translatable="yes">Full _Name...</property>
-			  <property name="use_underline">True</property>
-			  <property name="relief">GTK_RELIEF_NORMAL</property>
-			  <property name="focus_on_click">True</property>
-			</widget>
-			<packing>
-			  <property name="left_attach">0</property>
-			  <property name="right_attach">1</property>
-			  <property name="top_attach">0</property>
-			  <property name="bottom_attach">1</property>
-			  <property name="x_options">fill</property>
-			  <property name="y_options"></property>
-			</packing>
-		      </child>
-		    </widget>
-		    <packing>
-		      <property name="padding">0</property>
-		      <property name="expand">True</property>
-		      <property name="fill">True</property>
-		    </packing>
-		  </child>
-		</widget>
-		<packing>
-		  <property name="padding">0</property>
-		  <property name="expand">False</property>
-		  <property name="fill">False</property>
-		</packing>
-	      </child>
-
-	      <child>
-		<widget class="GtkHSeparator" id="hseparator10">
-		  <property name="visible">True</property>
-		</widget>
-		<packing>
-		  <property name="padding">6</property>
-		  <property name="expand">False</property>
-		  <property name="fill">False</property>
-		</packing>
-	      </child>
-
-	      <child>
-		<widget class="GtkVBox" id="vbox34">
-		  <property name="visible">True</property>
-		  <property name="homogeneous">False</property>
-		  <property name="spacing">10</property>
-
-		  <child>
-		    <widget class="GtkFrame" id="frame65">
-		      <property name="visible">True</property>
-		      <property name="label_xalign">0</property>
-		      <property name="label_yalign">0.5</property>
-		      <property name="shadow_type">GTK_SHADOW_NONE</property>
-
-		      <child>
-			<widget class="GtkTable" id="table85">
-			  <property name="border_width">12</property>
-			  <property name="visible">True</property>
-			  <property name="n_rows">3</property>
-			  <property name="n_columns">4</property>
-			  <property name="homogeneous">False</property>
-			  <property name="row_spacing">6</property>
-			  <property name="column_spacing">6</property>
-
-			  <child>
-			    <widget class="GtkOptionMenu" id="optionmenu-email-1">
-			      <property name="visible">True</property>
-			      <property name="can_focus">True</property>
-			      <property name="history">0</property>
-
-			      <child>
-				<widget class="GtkMenu" id="menu169">
-
-				  <child>
-				    <widget class="GtkMenuItem" id="menuitem380">
-				      <property name="visible">True</property>
-				      <property name="label" translatable="yes">Work</property>
-				      <property name="use_underline">True</property>
-				      <signal name="activate" handler="on_work2_activate" last_modification_time="Fri, 12 Mar 2004 19:27:14 GMT"/>
-				    </widget>
-				  </child>
-
-				  <child>
-				    <widget class="GtkMenuItem" id="menuitem381">
-				      <property name="visible">True</property>
-				      <property name="label" translatable="yes">Personal</property>
-				      <property name="use_underline">True</property>
-				      <signal name="activate" handler="on_personal2_activate" last_modification_time="Fri, 12 Mar 2004 19:27:14 GMT"/>
-				    </widget>
-				  </child>
-				</widget>
-			      </child>
-			    </widget>
-			    <packing>
-			      <property name="left_attach">0</property>
-			      <property name="right_attach">1</property>
-			      <property name="top_attach">0</property>
-			      <property name="bottom_attach">1</property>
-			      <property name="x_options">fill</property>
-			      <property name="y_options"></property>
-			    </packing>
-			  </child>
-
-			  <child>
-			    <widget class="GtkOptionMenu" id="optionmenu-email-2">
-			      <property name="visible">True</property>
-			      <property name="can_focus">True</property>
-			      <property name="history">0</property>
-
-			      <child>
-				<widget class="GtkMenu" id="menu170">
-
-				  <child>
-				    <widget class="GtkMenuItem" id="menuitem382">
-				      <property name="visible">True</property>
-				      <property name="label" translatable="yes">Work</property>
-				      <property name="use_underline">True</property>
-				      <signal name="activate" handler="on_work2_activate" last_modification_time="Fri, 12 Mar 2004 19:27:14 GMT"/>
-				    </widget>
-				  </child>
-
-				  <child>
-				    <widget class="GtkMenuItem" id="menuitem383">
-				      <property name="visible">True</property>
-				      <property name="label" translatable="yes">Personal</property>
-				      <property name="use_underline">True</property>
-				      <signal name="activate" handler="on_personal2_activate" last_modification_time="Fri, 12 Mar 2004 19:27:14 GMT"/>
-				    </widget>
-				  </child>
-				</widget>
-			      </child>
-			    </widget>
-			    <packing>
-			      <property name="left_attach">0</property>
-			      <property name="right_attach">1</property>
-			      <property name="top_attach">1</property>
-			      <property name="bottom_attach">2</property>
-			      <property name="x_options">fill</property>
-			      <property name="y_options"></property>
-			    </packing>
-			  </child>
-
-			  <child>
-			    <widget class="GtkEntry" id="entry-email-2">
-			      <property name="visible">True</property>
-			      <property name="can_focus">True</property>
-			      <property name="editable">True</property>
-			      <property name="visibility">True</property>
-			      <property name="max_length">0</property>
-			      <property name="text" translatable="yes"></property>
-			      <property name="has_frame">True</property>
-			      <property name="invisible_char" translatable="yes">*</property>
-			      <property name="activates_default">False</property>
-			      <accessibility>
-				<atkrelation target="optionmenu-email-2" type="labelled-by"/>
-			      </accessibility>
-			    </widget>
-			    <packing>
-			      <property name="left_attach">1</property>
-			      <property name="right_attach">2</property>
-			      <property name="top_attach">1</property>
-			      <property name="bottom_attach">2</property>
-			      <property name="y_options"></property>
-			    </packing>
-			  </child>
-
-			  <child>
-			    <widget class="GtkOptionMenu" id="optionmenu-email-3">
-			      <property name="visible">True</property>
-			      <property name="can_focus">True</property>
-			      <property name="history">0</property>
-
-			      <child>
-				<widget class="GtkMenu" id="menu171">
-
-				  <child>
-				    <widget class="GtkMenuItem" id="menuitem384">
-				      <property name="visible">True</property>
-				      <property name="label" translatable="yes">Work</property>
-				      <property name="use_underline">True</property>
-				      <signal name="activate" handler="on_work2_activate" last_modification_time="Fri, 12 Mar 2004 19:27:14 GMT"/>
-				    </widget>
-				  </child>
-
-				  <child>
-				    <widget class="GtkMenuItem" id="menuitem385">
-				      <property name="visible">True</property>
-				      <property name="label" translatable="yes">Personal</property>
-				      <property name="use_underline">True</property>
-				      <signal name="activate" handler="on_personal2_activate" last_modification_time="Fri, 12 Mar 2004 19:27:14 GMT"/>
-				    </widget>
-				  </child>
-				</widget>
-			      </child>
-			    </widget>
-			    <packing>
-			      <property name="left_attach">2</property>
-			      <property name="right_attach">3</property>
-			      <property name="top_attach">0</property>
-			      <property name="bottom_attach">1</property>
-			      <property name="x_options">fill</property>
-			      <property name="y_options"></property>
-			    </packing>
-			  </child>
-
-			  <child>
-			    <widget class="GtkOptionMenu" id="optionmenu-email-4">
-			      <property name="visible">True</property>
-			      <property name="can_focus">True</property>
-			      <property name="history">0</property>
-
-			      <child>
-				<widget class="GtkMenu" id="menu172">
-
-				  <child>
-				    <widget class="GtkMenuItem" id="menuitem386">
-				      <property name="visible">True</property>
-				      <property name="label" translatable="yes">Work</property>
-				      <property name="use_underline">True</property>
-				      <signal name="activate" handler="on_work2_activate" last_modification_time="Fri, 12 Mar 2004 19:27:14 GMT"/>
-				    </widget>
-				  </child>
-
-				  <child>
-				    <widget class="GtkMenuItem" id="menuitem387">
-				      <property name="visible">True</property>
-				      <property name="label" translatable="yes">Personal</property>
-				      <property name="use_underline">True</property>
-				      <signal name="activate" handler="on_personal2_activate" last_modification_time="Fri, 12 Mar 2004 19:27:14 GMT"/>
-				    </widget>
-				  </child>
-				</widget>
-			      </child>
-			    </widget>
-			    <packing>
-			      <property name="left_attach">2</property>
-			      <property name="right_attach">3</property>
-			      <property name="top_attach">1</property>
-			      <property name="bottom_attach">2</property>
-			      <property name="x_options">fill</property>
-			      <property name="y_options"></property>
-			    </packing>
-			  </child>
-
-			  <child>
-			    <widget class="GtkEntry" id="entry-email-1">
-			      <property name="visible">True</property>
-			      <property name="can_focus">True</property>
-			      <property name="editable">True</property>
-			      <property name="visibility">True</property>
-			      <property name="max_length">0</property>
-			      <property name="text" translatable="yes"></property>
-			      <property name="has_frame">True</property>
-			      <property name="invisible_char" translatable="yes">*</property>
-			      <property name="activates_default">False</property>
-			      <accessibility>
-				<atkrelation target="optionmenu-email-1" type="labelled-by"/>
-			      </accessibility>
-			    </widget>
-			    <packing>
-			      <property name="left_attach">1</property>
-			      <property name="right_attach">2</property>
-			      <property name="top_attach">0</property>
-			      <property name="bottom_attach">1</property>
-			      <property name="y_options"></property>
-			    </packing>
-			  </child>
-
-			  <child>
-			    <widget class="GtkEntry" id="entry-email-3">
-			      <property name="visible">True</property>
-			      <property name="can_focus">True</property>
-			      <property name="editable">True</property>
-			      <property name="visibility">True</property>
-			      <property name="max_length">0</property>
-			      <property name="text" translatable="yes"></property>
-			      <property name="has_frame">True</property>
-			      <property name="invisible_char" translatable="yes">*</property>
-			      <property name="activates_default">False</property>
-			      <accessibility>
-				<atkrelation target="optionmenu-email-3" type="labelled-by"/>
-			      </accessibility>
-			    </widget>
-			    <packing>
-			      <property name="left_attach">3</property>
-			      <property name="right_attach">4</property>
-			      <property name="top_attach">0</property>
-			      <property name="bottom_attach">1</property>
-			      <property name="y_options"></property>
-			    </packing>
-			  </child>
-
-			  <child>
-			    <widget class="GtkEntry" id="entry-email-4">
-			      <property name="visible">True</property>
-			      <property name="can_focus">True</property>
-			      <property name="editable">True</property>
-			      <property name="visibility">True</property>
-			      <property name="max_length">0</property>
-			      <property name="text" translatable="yes"></property>
-			      <property name="has_frame">True</property>
-			      <property name="invisible_char" translatable="yes">*</property>
-			      <property name="activates_default">False</property>
-			      <accessibility>
-				<atkrelation target="optionmenu-email-4" type="labelled-by"/>
-			      </accessibility>
-			    </widget>
-			    <packing>
-			      <property name="left_attach">3</property>
-			      <property name="right_attach">4</property>
-			      <property name="top_attach">1</property>
-			      <property name="bottom_attach">2</property>
-			      <property name="y_options"></property>
-			    </packing>
-			  </child>
-
-			  <child>
-			    <widget class="GtkCheckButton" id="checkbutton-htmlmail">
-			      <property name="visible">True</property>
-			      <property name="can_focus">True</property>
-			      <property name="label" translatable="yes">_Wants to receive HTML mail</property>
-			      <property name="use_underline">True</property>
-			      <property name="relief">GTK_RELIEF_NORMAL</property>
-			      <property name="focus_on_click">True</property>
-			      <property name="active">False</property>
-			      <property name="inconsistent">False</property>
-			      <property name="draw_indicator">True</property>
-			    </widget>
-			    <packing>
-			      <property name="left_attach">0</property>
-			      <property name="right_attach">4</property>
-			      <property name="top_attach">2</property>
-			      <property name="bottom_attach">3</property>
-			      <property name="x_options">fill</property>
-			      <property name="y_options"></property>
-			    </packing>
-			  </child>
-			</widget>
-		      </child>
-
-		      <child>
-			<widget class="GtkLabel" id="label400">
-			  <property name="visible">True</property>
-			  <property name="label" translatable="yes">&lt;b&gt;Email&lt;/b&gt;</property>
-			  <property name="use_underline">False</property>
-			  <property name="use_markup">True</property>
-			  <property name="justify">GTK_JUSTIFY_LEFT</property>
-			  <property name="wrap">False</property>
-			  <property name="selectable">False</property>
-			  <property name="xalign">0.5</property>
-			  <property name="yalign">0.5</property>
-			  <property name="xpad">0</property>
-			  <property name="ypad">0</property>
-			</widget>
-			<packing>
-			  <property name="type">label_item</property>
-			</packing>
-		      </child>
-		    </widget>
-		    <packing>
-		      <property name="padding">0</property>
-		      <property name="expand">False</property>
-		      <property name="fill">False</property>
-		    </packing>
-		  </child>
-
-		  <child>
-		    <widget class="GtkVBox" id="vbox38">
-		      <property name="visible">True</property>
-		      <property name="homogeneous">False</property>
-		      <property name="spacing">0</property>
-
-		      <child>
-			<widget class="GtkFrame" id="frame64">
-			  <property name="visible">True</property>
-			  <property name="label_xalign">0</property>
-			  <property name="label_yalign">0.5</property>
-			  <property name="shadow_type">GTK_SHADOW_NONE</property>
-
-			  <child>
-			    <widget class="GtkVBox" id="vbox37">
-			      <property name="border_width">12</property>
-			      <property name="visible">True</property>
-			      <property name="homogeneous">False</property>
-			      <property name="spacing">6</property>
-
-			      <child>
-				<widget class="GtkTable" id="table84">
-				  <property name="visible">True</property>
-				  <property name="n_rows">2</property>
-				  <property name="n_columns">4</property>
-				  <property name="homogeneous">False</property>
-				  <property name="row_spacing">6</property>
-				  <property name="column_spacing">6</property>
-
-				  <child>
-				    <widget class="GtkEntry" id="entry-phone-1">
-				      <property name="visible">True</property>
-				      <property name="can_focus">True</property>
-				      <property name="editable">True</property>
-				      <property name="visibility">True</property>
-				      <property name="max_length">0</property>
-				      <property name="text" translatable="yes"></property>
-				      <property name="has_frame">True</property>
-				      <property name="invisible_char" translatable="yes">*</property>
-				      <property name="activates_default">False</property>
-				      <accessibility>
-					<atkrelation target="optionmenu-phone-1" type="labelled-by"/>
-				      </accessibility>
-				    </widget>
-				    <packing>
-				      <property name="left_attach">1</property>
-				      <property name="right_attach">2</property>
-				      <property name="top_attach">0</property>
-				      <property name="bottom_attach">1</property>
-				      <property name="y_options"></property>
-				    </packing>
-				  </child>
-
-				  <child>
-				    <widget class="GtkEntry" id="entry-phone-2">
-				      <property name="visible">True</property>
-				      <property name="can_focus">True</property>
-				      <property name="editable">True</property>
-				      <property name="visibility">True</property>
-				      <property name="max_length">0</property>
-				      <property name="text" translatable="yes"></property>
-				      <property name="has_frame">True</property>
-				      <property name="invisible_char" translatable="yes">*</property>
-				      <property name="activates_default">False</property>
-				      <accessibility>
-					<atkrelation target="optionmenu-phone-2" type="labelled-by"/>
-				      </accessibility>
-				    </widget>
-				    <packing>
-				      <property name="left_attach">1</property>
-				      <property name="right_attach">2</property>
-				      <property name="top_attach">1</property>
-				      <property name="bottom_attach">2</property>
-				      <property name="y_options"></property>
-				    </packing>
-				  </child>
-
-				  <child>
-				    <widget class="GtkEntry" id="entry-phone-4">
-				      <property name="visible">True</property>
-				      <property name="can_focus">True</property>
-				      <property name="editable">True</property>
-				      <property name="visibility">True</property>
-				      <property name="max_length">0</property>
-				      <property name="text" translatable="yes"></property>
-				      <property name="has_frame">True</property>
-				      <property name="invisible_char" translatable="yes">*</property>
-				      <property name="activates_default">False</property>
-				      <accessibility>
-					<atkrelation target="optionmenu-phone-4" type="labelled-by"/>
-				      </accessibility>
-				    </widget>
-				    <packing>
-				      <property name="left_attach">3</property>
-				      <property name="right_attach">4</property>
-				      <property name="top_attach">1</property>
-				      <property name="bottom_attach">2</property>
-				      <property name="y_options"></property>
-				    </packing>
-				  </child>
-
-				  <child>
-				    <widget class="GtkEntry" id="entry-phone-3">
-				      <property name="visible">True</property>
-				      <property name="can_focus">True</property>
-				      <property name="editable">True</property>
-				      <property name="visibility">True</property>
-				      <property name="max_length">0</property>
-				      <property name="text" translatable="yes"></property>
-				      <property name="has_frame">True</property>
-				      <property name="invisible_char" translatable="yes">*</property>
-				      <property name="activates_default">False</property>
-				      <accessibility>
-					<atkrelation target="optionmenu-phone-3" type="labelled-by"/>
-				      </accessibility>
-				    </widget>
-				    <packing>
-				      <property name="left_attach">3</property>
-				      <property name="right_attach">4</property>
-				      <property name="top_attach">0</property>
-				      <property name="bottom_attach">1</property>
-				      <property name="y_options"></property>
-				    </packing>
-				  </child>
-
-				  <child>
-				    <widget class="GtkOptionMenu" id="optionmenu-phone-1">
-				      <property name="visible">True</property>
-				      <property name="can_focus">True</property>
-				      <property name="history">0</property>
-
-				      <child>
-					<widget class="GtkMenu" id="menu179">
-
-					  <child>
-					    <widget class="GtkMenuItem" id="menuitem412">
-					      <property name="visible">True</property>
-					      <property name="label" translatable="yes">Work</property>
-					      <property name="use_underline">True</property>
-					      <signal name="activate" handler="on_work2_activate" last_modification_time="Fri, 12 Mar 2004 19:27:14 GMT"/>
-					    </widget>
-					  </child>
-
-					  <child>
-					    <widget class="GtkMenuItem" id="menuitem413">
-					      <property name="visible">True</property>
-					      <property name="label" translatable="yes">Personal</property>
-					      <property name="use_underline">True</property>
-					      <signal name="activate" handler="on_personal2_activate" last_modification_time="Fri, 12 Mar 2004 19:27:14 GMT"/>
-					    </widget>
-					  </child>
-					</widget>
-				      </child>
-				    </widget>
-				    <packing>
-				      <property name="left_attach">0</property>
-				      <property name="right_attach">1</property>
-				      <property name="top_attach">0</property>
-				      <property name="bottom_attach">1</property>
-				      <property name="x_options">fill</property>
-				      <property name="y_options"></property>
-				    </packing>
-				  </child>
-
-				  <child>
-				    <widget class="GtkOptionMenu" id="optionmenu-phone-2">
-				      <property name="visible">True</property>
-				      <property name="can_focus">True</property>
-				      <property name="history">0</property>
-
-				      <child>
-					<widget class="GtkMenu" id="menu180">
-
-					  <child>
-					    <widget class="GtkMenuItem" id="menuitem414">
-					      <property name="visible">True</property>
-					      <property name="label" translatable="yes">Work</property>
-					      <property name="use_underline">True</property>
-					      <signal name="activate" handler="on_work2_activate" last_modification_time="Fri, 12 Mar 2004 19:27:14 GMT"/>
-					    </widget>
-					  </child>
-
-					  <child>
-					    <widget class="GtkMenuItem" id="menuitem415">
-					      <property name="visible">True</property>
-					      <property name="label" translatable="yes">Personal</property>
-					      <property name="use_underline">True</property>
-					      <signal name="activate" handler="on_personal2_activate" last_modification_time="Fri, 12 Mar 2004 19:27:14 GMT"/>
-					    </widget>
-					  </child>
-					</widget>
-				      </child>
-				    </widget>
-				    <packing>
-				      <property name="left_attach">0</property>
-				      <property name="right_attach">1</property>
-				      <property name="top_attach">1</property>
-				      <property name="bottom_attach">2</property>
-				      <property name="x_options">fill</property>
-				      <property name="y_options"></property>
-				    </packing>
-				  </child>
-
-				  <child>
-				    <widget class="GtkOptionMenu" id="optionmenu-phone-3">
-				      <property name="visible">True</property>
-				      <property name="can_focus">True</property>
-				      <property name="history">0</property>
-
-				      <child>
-					<widget class="GtkMenu" id="menu181">
-
-					  <child>
-					    <widget class="GtkMenuItem" id="menuitem416">
-					      <property name="visible">True</property>
-					      <property name="label" translatable="yes">Work</property>
-					      <property name="use_underline">True</property>
-					      <signal name="activate" handler="on_work2_activate" last_modification_time="Fri, 12 Mar 2004 19:27:14 GMT"/>
-					    </widget>
-					  </child>
-
-					  <child>
-					    <widget class="GtkMenuItem" id="menuitem417">
-					      <property name="visible">True</property>
-					      <property name="label" translatable="yes">Personal</property>
-					      <property name="use_underline">True</property>
-					      <signal name="activate" handler="on_personal2_activate" last_modification_time="Fri, 12 Mar 2004 19:27:14 GMT"/>
-					    </widget>
-					  </child>
-					</widget>
-				      </child>
-				    </widget>
-				    <packing>
-				      <property name="left_attach">2</property>
-				      <property name="right_attach">3</property>
-				      <property name="top_attach">0</property>
-				      <property name="bottom_attach">1</property>
-				      <property name="x_options">fill</property>
-				      <property name="y_options"></property>
-				    </packing>
-				  </child>
-
-				  <child>
-				    <widget class="GtkOptionMenu" id="optionmenu-phone-4">
-				      <property name="visible">True</property>
-				      <property name="can_focus">True</property>
-				      <property name="history">0</property>
-
-				      <child>
-					<widget class="GtkMenu" id="menu182">
-
-					  <child>
-					    <widget class="GtkMenuItem" id="menuitem418">
-					      <property name="visible">True</property>
-					      <property name="label" translatable="yes">Work</property>
-					      <property name="use_underline">True</property>
-					      <signal name="activate" handler="on_work2_activate" last_modification_time="Fri, 12 Mar 2004 19:27:14 GMT"/>
-					    </widget>
-					  </child>
-
-					  <child>
-					    <widget class="GtkMenuItem" id="menuitem419">
-					      <property name="visible">True</property>
-					      <property name="label" translatable="yes">Personal</property>
-					      <property name="use_underline">True</property>
-					      <signal name="activate" handler="on_personal2_activate" last_modification_time="Fri, 12 Mar 2004 19:27:14 GMT"/>
-					    </widget>
-					  </child>
-					</widget>
-				      </child>
-				    </widget>
-				    <packing>
-				      <property name="left_attach">2</property>
-				      <property name="right_attach">3</property>
-				      <property name="top_attach">1</property>
-				      <property name="bottom_attach">2</property>
-				      <property name="x_options">fill</property>
-				      <property name="y_options"></property>
-				    </packing>
-				  </child>
-				</widget>
-				<packing>
-				  <property name="padding">0</property>
-				  <property name="expand">False</property>
-				  <property name="fill">True</property>
-				</packing>
-			      </child>
-
-			      <child>
-				<widget class="GtkTable" id="table-phone-extended">
-				  <property name="n_rows">2</property>
-				  <property name="n_columns">4</property>
-				  <property name="homogeneous">False</property>
-				  <property name="row_spacing">6</property>
-				  <property name="column_spacing">6</property>
-
-				  <child>
-				    <widget class="GtkOptionMenu" id="optionmenu-phone-5">
-				      <property name="visible">True</property>
-				      <property name="can_focus">True</property>
-				      <property name="history">0</property>
-
-				      <child>
-					<widget class="GtkMenu" id="menu187">
-
-					  <child>
-					    <widget class="GtkMenuItem" id="menuitem430">
-					      <property name="visible">True</property>
-					      <property name="label" translatable="yes">Work</property>
-					      <property name="use_underline">True</property>
-					      <signal name="activate" handler="on_work2_activate" last_modification_time="Fri, 12 Mar 2004 19:27:14 GMT"/>
-					    </widget>
-					  </child>
-
-					  <child>
-					    <widget class="GtkMenuItem" id="menuitem431">
-					      <property name="visible">True</property>
-					      <property name="label" translatable="yes">Personal</property>
-					      <property name="use_underline">True</property>
-					      <signal name="activate" handler="on_personal2_activate" last_modification_time="Fri, 12 Mar 2004 19:27:14 GMT"/>
-					    </widget>
-					  </child>
-					</widget>
-				      </child>
-				    </widget>
-				    <packing>
-				      <property name="left_attach">0</property>
-				      <property name="right_attach">1</property>
-				      <property name="top_attach">0</property>
-				      <property name="bottom_attach">1</property>
-				      <property name="x_options">fill</property>
-				      <property name="y_options"></property>
-				    </packing>
-				  </child>
-
-				  <child>
-				    <widget class="GtkOptionMenu" id="optionmenu-phone-6">
-				      <property name="visible">True</property>
-				      <property name="can_focus">True</property>
-				      <property name="history">0</property>
-
-				      <child>
-					<widget class="GtkMenu" id="menu188">
-
-					  <child>
-					    <widget class="GtkMenuItem" id="menuitem432">
-					      <property name="visible">True</property>
-					      <property name="label" translatable="yes">Work</property>
-					      <property name="use_underline">True</property>
-					      <signal name="activate" handler="on_work2_activate" last_modification_time="Fri, 12 Mar 2004 19:27:14 GMT"/>
-					    </widget>
-					  </child>
-
-					  <child>
-					    <widget class="GtkMenuItem" id="menuitem433">
-					      <property name="visible">True</property>
-					      <property name="label" translatable="yes">Personal</property>
-					      <property name="use_underline">True</property>
-					      <signal name="activate" handler="on_personal2_activate" last_modification_time="Fri, 12 Mar 2004 19:27:14 GMT"/>
-					    </widget>
-					  </child>
-					</widget>
-				      </child>
-				    </widget>
-				    <packing>
-				      <property name="left_attach">0</property>
-				      <property name="right_attach">1</property>
-				      <property name="top_attach">1</property>
-				      <property name="bottom_attach">2</property>
-				      <property name="x_options">fill</property>
-				      <property name="y_options"></property>
-				    </packing>
-				  </child>
-
-				  <child>
-				    <widget class="GtkEntry" id="entry-phone-5">
-				      <property name="visible">True</property>
-				      <property name="can_focus">True</property>
-				      <property name="editable">True</property>
-				      <property name="visibility">True</property>
-				      <property name="max_length">0</property>
-				      <property name="text" translatable="yes"></property>
-				      <property name="has_frame">True</property>
-				      <property name="invisible_char" translatable="yes">*</property>
-				      <property name="activates_default">False</property>
-				      <accessibility>
-					<atkrelation target="optionmenu-phone-5" type="labelled-by"/>
-				      </accessibility>
-				    </widget>
-				    <packing>
-				      <property name="left_attach">1</property>
-				      <property name="right_attach">2</property>
-				      <property name="top_attach">0</property>
-				      <property name="bottom_attach">1</property>
-				      <property name="y_options"></property>
-				    </packing>
-				  </child>
-
-				  <child>
-				    <widget class="GtkEntry" id="entry-phone-6">
-				      <property name="visible">True</property>
-				      <property name="can_focus">True</property>
-				      <property name="editable">True</property>
-				      <property name="visibility">True</property>
-				      <property name="max_length">0</property>
-				      <property name="text" translatable="yes"></property>
-				      <property name="has_frame">True</property>
-				      <property name="invisible_char" translatable="yes">*</property>
-				      <property name="activates_default">False</property>
-				      <accessibility>
-					<atkrelation target="optionmenu-phone-6" type="labelled-by"/>
-				      </accessibility>
-				    </widget>
-				    <packing>
-				      <property name="left_attach">1</property>
-				      <property name="right_attach">2</property>
-				      <property name="top_attach">1</property>
-				      <property name="bottom_attach">2</property>
-				      <property name="y_options"></property>
-				    </packing>
-				  </child>
-
-				  <child>
-				    <widget class="GtkOptionMenu" id="optionmenu-phone-7">
-				      <property name="visible">True</property>
-				      <property name="can_focus">True</property>
-				      <property name="history">0</property>
-
-				      <child>
-					<widget class="GtkMenu" id="menu189">
-
-					  <child>
-					    <widget class="GtkMenuItem" id="menuitem434">
-					      <property name="visible">True</property>
-					      <property name="label" translatable="yes">Work</property>
-					      <property name="use_underline">True</property>
-					      <signal name="activate" handler="on_work2_activate" last_modification_time="Fri, 12 Mar 2004 19:27:14 GMT"/>
-					    </widget>
-					  </child>
-
-					  <child>
-					    <widget class="GtkMenuItem" id="menuitem435">
-					      <property name="visible">True</property>
-					      <property name="label" translatable="yes">Personal</property>
-					      <property name="use_underline">True</property>
-					      <signal name="activate" handler="on_personal2_activate" last_modification_time="Fri, 12 Mar 2004 19:27:14 GMT"/>
-					    </widget>
-					  </child>
-					</widget>
-				      </child>
-				    </widget>
-				    <packing>
-				      <property name="left_attach">2</property>
-				      <property name="right_attach">3</property>
-				      <property name="top_attach">0</property>
-				      <property name="bottom_attach">1</property>
-				      <property name="x_options">fill</property>
-				      <property name="y_options"></property>
-				    </packing>
-				  </child>
-
-				  <child>
-				    <widget class="GtkOptionMenu" id="optionmenu-phone-8">
-				      <property name="visible">True</property>
-				      <property name="can_focus">True</property>
-				      <property name="history">0</property>
-
-				      <child>
-					<widget class="GtkMenu" id="menu190">
-
-					  <child>
-					    <widget class="GtkMenuItem" id="menuitem436">
-					      <property name="visible">True</property>
-					      <property name="label" translatable="yes">Work</property>
-					      <property name="use_underline">True</property>
-					      <signal name="activate" handler="on_work2_activate" last_modification_time="Fri, 12 Mar 2004 19:27:14 GMT"/>
-					    </widget>
-					  </child>
-
-					  <child>
-					    <widget class="GtkMenuItem" id="menuitem437">
-					      <property name="visible">True</property>
-					      <property name="label" translatable="yes">Personal</property>
-					      <property name="use_underline">True</property>
-					      <signal name="activate" handler="on_personal2_activate" last_modification_time="Fri, 12 Mar 2004 19:27:14 GMT"/>
-					    </widget>
-					  </child>
-					</widget>
-				      </child>
-				    </widget>
-				    <packing>
-				      <property name="left_attach">2</property>
-				      <property name="right_attach">3</property>
-				      <property name="top_attach">1</property>
-				      <property name="bottom_attach">2</property>
-				      <property name="x_options">fill</property>
-				      <property name="y_options"></property>
-				    </packing>
-				  </child>
-
-				  <child>
-				    <widget class="GtkEntry" id="entry-phone-7">
-				      <property name="visible">True</property>
-				      <property name="can_focus">True</property>
-				      <property name="editable">True</property>
-				      <property name="visibility">True</property>
-				      <property name="max_length">0</property>
-				      <property name="text" translatable="yes"></property>
-				      <property name="has_frame">True</property>
-				      <property name="invisible_char" translatable="yes">*</property>
-				      <property name="activates_default">False</property>
-				      <accessibility>
-					<atkrelation target="optionmenu-phone-7" type="labelled-by"/>
-				      </accessibility>
-				    </widget>
-				    <packing>
-				      <property name="left_attach">3</property>
-				      <property name="right_attach">4</property>
-				      <property name="top_attach">0</property>
-				      <property name="bottom_attach">1</property>
-				      <property name="y_options"></property>
-				    </packing>
-				  </child>
-
-				  <child>
-				    <widget class="GtkEntry" id="entry-phone-8">
-				      <property name="visible">True</property>
-				      <property name="can_focus">True</property>
-				      <property name="editable">True</property>
-				      <property name="visibility">True</property>
-				      <property name="max_length">0</property>
-				      <property name="text" translatable="yes"></property>
-				      <property name="has_frame">True</property>
-				      <property name="invisible_char" translatable="yes">*</property>
-				      <property name="activates_default">False</property>
-				      <accessibility>
-					<atkrelation target="optionmenu-phone-8" type="labelled-by"/>
-				      </accessibility>
-				    </widget>
-				    <packing>
-				      <property name="left_attach">3</property>
-				      <property name="right_attach">4</property>
-				      <property name="top_attach">1</property>
-				      <property name="bottom_attach">2</property>
-				      <property name="y_options"></property>
-				    </packing>
-				  </child>
-				</widget>
-				<packing>
-				  <property name="padding">0</property>
-				  <property name="expand">False</property>
-				  <property name="fill">True</property>
-				</packing>
-			      </child>
-			    </widget>
-			  </child>
-
-			  <child>
-			    <widget class="GtkHBox" id="hbox56">
-			      <property name="visible">True</property>
-			      <property name="homogeneous">False</property>
-			      <property name="spacing">4</property>
-
-			      <child>
-				<widget class="GtkLabel" id="label399">
-				  <property name="visible">True</property>
-				  <property name="label" translatable="yes">&lt;b&gt;Telephone&lt;/b&gt;</property>
-				  <property name="use_underline">False</property>
-				  <property name="use_markup">True</property>
-				  <property name="justify">GTK_JUSTIFY_LEFT</property>
-				  <property name="wrap">False</property>
-				  <property name="selectable">False</property>
-				  <property name="xalign">0.5</property>
-				  <property name="yalign">0.5</property>
-				  <property name="xpad">0</property>
-				  <property name="ypad">0</property>
-				</widget>
-				<packing>
-				  <property name="padding">0</property>
-				  <property name="expand">False</property>
-				  <property name="fill">False</property>
-				</packing>
-			      </child>
-
-			      <child>
-				<widget class="GtkButton" id="button-phone-expand">
-				  <property name="width_request">20</property>
-				  <property name="height_request">20</property>
-				  <property name="visible">True</property>
-				  <property name="can_focus">True</property>
-				  <property name="relief">GTK_RELIEF_NONE</property>
-				  <property name="focus_on_click">True</property>
-				  <accessibility>
-				    <atkproperty name="AtkObject::accessible_name" translatable="yes">Telephone</atkproperty>
-				  </accessibility>
-
-				  <child>
-				    <widget class="GtkArrow" id="arrow-phone-expand">
-				      <property name="visible">True</property>
-				      <property name="arrow_type">GTK_ARROW_RIGHT</property>
-				      <property name="shadow_type">GTK_SHADOW_NONE</property>
-				      <property name="xalign">0.5</property>
-				      <property name="yalign">0.5</property>
-				      <property name="xpad">0</property>
-				      <property name="ypad">0</property>
-				    </widget>
-				  </child>
-				</widget>
-				<packing>
-				  <property name="padding">0</property>
-				  <property name="expand">True</property>
-				  <property name="fill">True</property>
-				</packing>
-			      </child>
-			    </widget>
-			    <packing>
-			      <property name="type">label_item</property>
-			    </packing>
-			  </child>
-			</widget>
-			<packing>
-			  <property name="padding">0</property>
-			  <property name="expand">False</property>
-			  <property name="fill">True</property>
-			</packing>
-		      </child>
-		    </widget>
-		    <packing>
-		      <property name="padding">0</property>
-		      <property name="expand">False</property>
-		      <property name="fill">True</property>
-		    </packing>
-		  </child>
-
-		  <child>
-		    <widget class="GtkFrame" id="frame66">
-		      <property name="visible">True</property>
-		      <property name="label_xalign">0</property>
-		      <property name="label_yalign">0.5</property>
-		      <property name="shadow_type">GTK_SHADOW_NONE</property>
-
-		      <child>
-			<widget class="GtkTable" id="table86">
-			  <property name="border_width">12</property>
-			  <property name="visible">True</property>
-			  <property name="n_rows">2</property>
-			  <property name="n_columns">4</property>
-			  <property name="homogeneous">False</property>
-			  <property name="row_spacing">6</property>
-			  <property name="column_spacing">6</property>
-
-			  <child>
-			    <widget class="GtkOptionMenu" id="optionmenu-im-service-1">
-			      <property name="visible">True</property>
-			      <property name="can_focus">True</property>
-			      <property name="history">0</property>
-
-			      <child>
-				<widget class="GtkMenu" id="menu173">
-
-				  <child>
-				    <widget class="GtkMenuItem" id="menuitem388">
-				      <property name="visible">True</property>
-				      <property name="label" translatable="yes">AIM</property>
-				      <property name="use_underline">True</property>
-				      <signal name="activate" handler="on_aim1_activate" last_modification_time="Fri, 12 Mar 2004 18:38:59 GMT"/>
-				    </widget>
-				  </child>
-
-				  <child>
-				    <widget class="GtkMenuItem" id="menuitem389">
-				      <property name="visible">True</property>
-				      <property name="label" translatable="yes">Novell Groupwise</property>
-				      <property name="use_underline">True</property>
-				      <signal name="activate" handler="on_novell_groupwise1_activate" last_modification_time="Fri, 12 Mar 2004 18:38:59 GMT"/>
-				    </widget>
-				  </child>
-
-				  <child>
-				    <widget class="GtkMenuItem" id="menuitem390">
-				      <property name="visible">True</property>
-				      <property name="label" translatable="yes">MSN Messenger</property>
-				      <property name="use_underline">True</property>
-				      <signal name="activate" handler="on_msn_messenger1_activate" last_modification_time="Fri, 12 Mar 2004 18:38:59 GMT"/>
-				    </widget>
-				  </child>
-				</widget>
-			      </child>
-			    </widget>
-			    <packing>
-			      <property name="left_attach">0</property>
-			      <property name="right_attach">1</property>
-			      <property name="top_attach">0</property>
-			      <property name="bottom_attach">1</property>
-			      <property name="x_options">fill</property>
-			      <property name="y_options"></property>
-			    </packing>
-			  </child>
-
-			  <child>
-			    <widget class="GtkEntry" id="entry-im-name-1">
-			      <property name="visible">True</property>
-			      <property name="can_focus">True</property>
-			      <property name="editable">True</property>
-			      <property name="visibility">True</property>
-			      <property name="max_length">0</property>
-			      <property name="text" translatable="yes"></property>
-			      <property name="has_frame">True</property>
-			      <property name="invisible_char" translatable="yes">*</property>
-			      <property name="activates_default">False</property>
-			      <accessibility>
-				<atkrelation target="optionmenu-im-service-1" type="labelled-by"/>
-			      </accessibility>
-			    </widget>
-			    <packing>
-			      <property name="left_attach">1</property>
-			      <property name="right_attach">2</property>
-			      <property name="top_attach">0</property>
-			      <property name="bottom_attach">1</property>
-			      <property name="y_options"></property>
-			    </packing>
-			  </child>
-
-			  <child>
-			    <widget class="GtkOptionMenu" id="optionmenu-im-service-2">
-			      <property name="visible">True</property>
-			      <property name="can_focus">True</property>
-			      <property name="history">0</property>
-
-			      <child>
-				<widget class="GtkMenu" id="menu174">
-
-				  <child>
-				    <widget class="GtkMenuItem" id="menuitem391">
-				      <property name="visible">True</property>
-				      <property name="label" translatable="yes">AIM</property>
-				      <property name="use_underline">True</property>
-				      <signal name="activate" handler="on_aim1_activate" last_modification_time="Fri, 12 Mar 2004 18:38:59 GMT"/>
-				    </widget>
-				  </child>
-
-				  <child>
-				    <widget class="GtkMenuItem" id="menuitem392">
-				      <property name="visible">True</property>
-				      <property name="label" translatable="yes">Novell Groupwise</property>
-				      <property name="use_underline">True</property>
-				      <signal name="activate" handler="on_novell_groupwise1_activate" last_modification_time="Fri, 12 Mar 2004 18:38:59 GMT"/>
-				    </widget>
-				  </child>
-
-				  <child>
-				    <widget class="GtkMenuItem" id="menuitem393">
-				      <property name="visible">True</property>
-				      <property name="label" translatable="yes">MSN Messenger</property>
-				      <property name="use_underline">True</property>
-				      <signal name="activate" handler="on_msn_messenger1_activate" last_modification_time="Fri, 12 Mar 2004 18:38:59 GMT"/>
-				    </widget>
-				  </child>
-				</widget>
-			      </child>
-			    </widget>
-			    <packing>
-			      <property name="left_attach">0</property>
-			      <property name="right_attach">1</property>
-			      <property name="top_attach">1</property>
-			      <property name="bottom_attach">2</property>
-			      <property name="x_options">fill</property>
-			      <property name="y_options"></property>
-			    </packing>
-			  </child>
-
-			  <child>
-			    <widget class="GtkEntry" id="entry-im-name-2">
-			      <property name="visible">True</property>
-			      <property name="can_focus">True</property>
-			      <property name="editable">True</property>
-			      <property name="visibility">True</property>
-			      <property name="max_length">0</property>
-			      <property name="text" translatable="yes"></property>
-			      <property name="has_frame">True</property>
-			      <property name="invisible_char" translatable="yes">*</property>
-			      <property name="activates_default">False</property>
-			      <accessibility>
-				<atkrelation target="optionmenu-im-service-2" type="labelled-by"/>
-			      </accessibility>
-			    </widget>
-			    <packing>
-			      <property name="left_attach">1</property>
-			      <property name="right_attach">2</property>
-			      <property name="top_attach">1</property>
-			      <property name="bottom_attach">2</property>
-			      <property name="y_options"></property>
-			    </packing>
-			  </child>
-
-			  <child>
-			    <widget class="GtkOptionMenu" id="optionmenu-im-service-3">
-			      <property name="visible">True</property>
-			      <property name="can_focus">True</property>
-			      <property name="history">0</property>
-
-			      <child>
-				<widget class="GtkMenu" id="menu175">
-
-				  <child>
-				    <widget class="GtkMenuItem" id="menuitem394">
-				      <property name="visible">True</property>
-				      <property name="label" translatable="yes">AIM</property>
-				      <property name="use_underline">True</property>
-				      <signal name="activate" handler="on_aim1_activate" last_modification_time="Fri, 12 Mar 2004 18:38:59 GMT"/>
-				    </widget>
-				  </child>
-
-				  <child>
-				    <widget class="GtkMenuItem" id="menuitem395">
-				      <property name="visible">True</property>
-				      <property name="label" translatable="yes">Novell Groupwise</property>
-				      <property name="use_underline">True</property>
-				      <signal name="activate" handler="on_novell_groupwise1_activate" last_modification_time="Fri, 12 Mar 2004 18:38:59 GMT"/>
-				    </widget>
-				  </child>
-
-				  <child>
-				    <widget class="GtkMenuItem" id="menuitem396">
-				      <property name="visible">True</property>
-				      <property name="label" translatable="yes">MSN Messenger</property>
-				      <property name="use_underline">True</property>
-				      <signal name="activate" handler="on_msn_messenger1_activate" last_modification_time="Fri, 12 Mar 2004 18:38:59 GMT"/>
-				    </widget>
-				  </child>
-				</widget>
-			      </child>
-			    </widget>
-			    <packing>
-			      <property name="left_attach">2</property>
-			      <property name="right_attach">3</property>
-			      <property name="top_attach">0</property>
-			      <property name="bottom_attach">1</property>
-			      <property name="x_options">fill</property>
-			      <property name="y_options"></property>
-			    </packing>
-			  </child>
-
-			  <child>
-			    <widget class="GtkEntry" id="entry-im-name-3">
-			      <property name="visible">True</property>
-			      <property name="can_focus">True</property>
-			      <property name="editable">True</property>
-			      <property name="visibility">True</property>
-			      <property name="max_length">0</property>
-			      <property name="text" translatable="yes"></property>
-			      <property name="has_frame">True</property>
-			      <property name="invisible_char" translatable="yes">*</property>
-			      <property name="activates_default">False</property>
-			      <accessibility>
-				<atkrelation target="optionmenu-im-service-3" type="labelled-by"/>
-			      </accessibility>
-			    </widget>
-			    <packing>
-			      <property name="left_attach">3</property>
-			      <property name="right_attach">4</property>
-			      <property name="top_attach">0</property>
-			      <property name="bottom_attach">1</property>
-			      <property name="y_options"></property>
-			    </packing>
-			  </child>
-
-			  <child>
-			    <widget class="GtkOptionMenu" id="optionmenu-im-service-4">
-			      <property name="visible">True</property>
-			      <property name="can_focus">True</property>
-			      <property name="history">0</property>
-
-			      <child>
-				<widget class="GtkMenu" id="menu183">
-
-				  <child>
-				    <widget class="GtkMenuItem" id="menuitem420">
-				      <property name="visible">True</property>
-				      <property name="label" translatable="yes">AIM</property>
-				      <property name="use_underline">True</property>
-				      <signal name="activate" handler="on_aim1_activate" last_modification_time="Fri, 12 Mar 2004 18:38:59 GMT"/>
-				    </widget>
-				  </child>
-
-				  <child>
-				    <widget class="GtkMenuItem" id="menuitem421">
-				      <property name="visible">True</property>
-				      <property name="label" translatable="yes">Novell Groupwise</property>
-				      <property name="use_underline">True</property>
-				      <signal name="activate" handler="on_novell_groupwise1_activate" last_modification_time="Fri, 12 Mar 2004 18:38:59 GMT"/>
-				    </widget>
-				  </child>
-
-				  <child>
-				    <widget class="GtkMenuItem" id="menuitem422">
-				      <property name="visible">True</property>
-				      <property name="label" translatable="yes">MSN Messenger</property>
-				      <property name="use_underline">True</property>
-				      <signal name="activate" handler="on_msn_messenger1_activate" last_modification_time="Fri, 12 Mar 2004 18:38:59 GMT"/>
-				    </widget>
-				  </child>
-				</widget>
-			      </child>
-			    </widget>
-			    <packing>
-			      <property name="left_attach">2</property>
-			      <property name="right_attach">3</property>
-			      <property name="top_attach">1</property>
-			      <property name="bottom_attach">2</property>
-			      <property name="x_options">fill</property>
-			      <property name="y_options"></property>
-			    </packing>
-			  </child>
-
-			  <child>
-			    <widget class="GtkEntry" id="entry-im-name-4">
-			      <property name="visible">True</property>
-			      <property name="can_focus">True</property>
-			      <property name="editable">True</property>
-			      <property name="visibility">True</property>
-			      <property name="max_length">0</property>
-			      <property name="text" translatable="yes"></property>
-			      <property name="has_frame">True</property>
-			      <property name="invisible_char" translatable="yes">*</property>
-			      <property name="activates_default">False</property>
-			      <accessibility>
-				<atkrelation target="optionmenu-im-service-4" type="labelled-by"/>
-			      </accessibility>
-			    </widget>
-			    <packing>
-			      <property name="left_attach">3</property>
-			      <property name="right_attach">4</property>
-			      <property name="top_attach">1</property>
-			      <property name="bottom_attach">2</property>
-			      <property name="y_options"></property>
-			    </packing>
-			  </child>
-			</widget>
-		      </child>
-
-		      <child>
-			<widget class="GtkLabel" id="label404">
-			  <property name="visible">True</property>
-			  <property name="label" translatable="yes">&lt;b&gt;Instant Messaging&lt;/b&gt;</property>
-			  <property name="use_underline">False</property>
-			  <property name="use_markup">True</property>
-			  <property name="justify">GTK_JUSTIFY_LEFT</property>
-			  <property name="wrap">False</property>
-			  <property name="selectable">False</property>
-			  <property name="xalign">0.5</property>
-			  <property name="yalign">0.5</property>
-			  <property name="xpad">0</property>
-			  <property name="ypad">0</property>
-			</widget>
-			<packing>
-			  <property name="type">label_item</property>
-			</packing>
-		      </child>
-		    </widget>
-		    <packing>
-		      <property name="padding">0</property>
-		      <property name="expand">False</property>
-		      <property name="fill">True</property>
-		    </packing>
-		  </child>
-		</widget>
-		<packing>
-		  <property name="padding">0</property>
-		  <property name="expand">True</property>
-		  <property name="fill">True</property>
-		</packing>
-	      </child>
-	    </widget>
-	    <packing>
-	      <property name="tab_expand">True</property>
-	      <property name="tab_fill">True</property>
-	    </packing>
-	  </child>
-
-	  <child>
-	    <widget class="GtkLabel" id="label405">
-	      <property name="visible">True</property>
-	      <property name="label" translatable="yes">Contact</property>
-	      <property name="use_underline">False</property>
-	      <property name="use_markup">False</property>
-	      <property name="justify">GTK_JUSTIFY_LEFT</property>
-	      <property name="wrap">False</property>
-	      <property name="selectable">False</property>
-	      <property name="xalign">0.5</property>
-	      <property name="yalign">0.5</property>
-	      <property name="xpad">0</property>
-	      <property name="ypad">0</property>
-	    </widget>
-	    <packing>
-	      <property name="type">tab</property>
-	    </packing>
-	  </child>
-
-	  <child>
-	    <widget class="GtkVBox" id="vbox35">
-	      <property name="border_width">12</property>
-	      <property name="visible">True</property>
-	      <property name="homogeneous">False</property>
-	      <property name="spacing">12</property>
-
-	      <child>
-		<widget class="GtkFrame" id="frame67">
-		  <property name="visible">True</property>
-		  <property name="label_xalign">0</property>
-		  <property name="label_yalign">0.5</property>
-		  <property name="shadow_type">GTK_SHADOW_NONE</property>
-
-		  <child>
-		    <widget class="GtkTable" id="table87">
-		      <property name="border_width">12</property>
-		      <property name="visible">True</property>
-		      <property name="n_rows">5</property>
-		      <property name="n_columns">2</property>
-		      <property name="homogeneous">False</property>
-		      <property name="row_spacing">6</property>
-		      <property name="column_spacing">6</property>
-
-		      <child>
-			<widget class="GtkLabel" id="accellabel-homepage">
-			  <property name="visible">True</property>
-			  <property name="label" translatable="yes">_Home Page:</property>
-			  <property name="use_underline">True</property>
-			  <property name="use_markup">False</property>
-			  <property name="justify">GTK_JUSTIFY_LEFT</property>
-			  <property name="wrap">False</property>
-			  <property name="selectable">False</property>
-			  <property name="xalign">0</property>
-			  <property name="yalign">0.5</property>
-			  <property name="xpad">0</property>
-			  <property name="ypad">0</property>
-			  <property name="mnemonic_widget">entry-homepage</property>
-			</widget>
-			<packing>
-			  <property name="left_attach">0</property>
-			  <property name="right_attach">1</property>
-			  <property name="top_attach">0</property>
-			  <property name="bottom_attach">1</property>
-			  <property name="x_options">fill</property>
-			  <property name="y_options"></property>
-			</packing>
-		      </child>
-
-		      <child>
-			<widget class="GtkLabel" id="label-caluri">
-			  <property name="visible">True</property>
-			  <property name="label" translatable="yes">_Calendar:</property>
-			  <property name="use_underline">True</property>
-			  <property name="use_markup">False</property>
-			  <property name="justify">GTK_JUSTIFY_LEFT</property>
-			  <property name="wrap">False</property>
-			  <property name="selectable">False</property>
-			  <property name="xalign">0</property>
-			  <property name="yalign">0.5</property>
-			  <property name="xpad">0</property>
-			  <property name="ypad">0</property>
-			  <property name="mnemonic_widget">entry-caluri</property>
-			</widget>
-			<packing>
-			  <property name="left_attach">0</property>
-			  <property name="right_attach">1</property>
-			  <property name="top_attach">2</property>
-			  <property name="bottom_attach">3</property>
-			  <property name="x_options">fill</property>
-			  <property name="y_options"></property>
-			</packing>
-		      </child>
-
-		      <child>
-			<widget class="GtkLabel" id="label-fburl">
-			  <property name="visible">True</property>
-			  <property name="label" translatable="yes">_Free/Busy:</property>
-			  <property name="use_underline">True</property>
-			  <property name="use_markup">False</property>
-			  <property name="justify">GTK_JUSTIFY_LEFT</property>
-			  <property name="wrap">False</property>
-			  <property name="selectable">False</property>
-			  <property name="xalign">0</property>
-			  <property name="yalign">0.5</property>
-			  <property name="xpad">0</property>
-			  <property name="ypad">0</property>
-			  <property name="mnemonic_widget">entry-fburl</property>
-			</widget>
-			<packing>
-			  <property name="left_attach">0</property>
-			  <property name="right_attach">1</property>
-			  <property name="top_attach">3</property>
-			  <property name="bottom_attach">4</property>
-			  <property name="x_options">fill</property>
-			  <property name="y_options"></property>
-			</packing>
-		      </child>
-
-		      <child>
-			<widget class="GtkLabel" id="label-videourl">
-			  <property name="visible">True</property>
-			  <property name="label" translatable="yes">_Video Chat:</property>
-			  <property name="use_underline">True</property>
-			  <property name="use_markup">False</property>
-			  <property name="justify">GTK_JUSTIFY_LEFT</property>
-			  <property name="wrap">False</property>
-			  <property name="selectable">False</property>
-			  <property name="xalign">0</property>
-			  <property name="yalign">0.5</property>
-			  <property name="xpad">0</property>
-			  <property name="ypad">0</property>
-			  <property name="mnemonic_widget">entry-videourl</property>
-			</widget>
-			<packing>
-			  <property name="left_attach">0</property>
-			  <property name="right_attach">1</property>
-			  <property name="top_attach">4</property>
-			  <property name="bottom_attach">5</property>
-			  <property name="x_options">fill</property>
-			  <property name="y_options"></property>
-			</packing>
-		      </child>
-
-		      <child>
-			<widget class="Custom" id="entry-homepage">
-			  <property name="visible">True</property>
-			  <property name="creation_function">e_contact_editor_create_web</property>
-			  <property name="string1">Home Page:</property>
-			  <property name="int1">0</property>
-			  <property name="int2">0</property>
-			  <property name="last_modification_time">Tue, 13 Apr 2004 22:04:21 GMT</property>
-			</widget>
-			<packing>
-			  <property name="left_attach">1</property>
-			  <property name="right_attach">2</property>
-			  <property name="top_attach">0</property>
-			  <property name="bottom_attach">1</property>
-			  <property name="y_options">fill</property>
-			</packing>
-		      </child>
-
-		      <child>
-			<widget class="Custom" id="entry-caluri">
-			  <property name="visible">True</property>
-			  <property name="creation_function">e_contact_editor_create_web</property>
-			  <property name="string1">Calendar:</property>
-			  <property name="int1">0</property>
-			  <property name="int2">0</property>
-			  <property name="last_modification_time">Tue, 13 Apr 2004 22:04:51 GMT</property>
-			</widget>
-			<packing>
-			  <property name="left_attach">1</property>
-			  <property name="right_attach">2</property>
-			  <property name="top_attach">2</property>
-			  <property name="bottom_attach">3</property>
-			  <property name="y_options">fill</property>
-			</packing>
-		      </child>
-
-		      <child>
-			<widget class="Custom" id="entry-fburl">
-			  <property name="visible">True</property>
-			  <property name="creation_function">e_contact_editor_create_web</property>
-			  <property name="string1">Free/Busy:</property>
-			  <property name="int1">0</property>
-			  <property name="int2">0</property>
-			  <property name="last_modification_time">Tue, 13 Apr 2004 22:05:05 GMT</property>
-			</widget>
-			<packing>
-			  <property name="left_attach">1</property>
-			  <property name="right_attach">2</property>
-			  <property name="top_attach">3</property>
-			  <property name="bottom_attach">4</property>
-			  <property name="y_options">fill</property>
-			</packing>
-		      </child>
-
-		      <child>
-			<widget class="Custom" id="entry-videourl">
-			  <property name="visible">True</property>
-			  <property name="creation_function">e_contact_editor_create_web</property>
-			  <property name="string1">Video Chat:</property>
-			  <property name="int1">0</property>
-			  <property name="int2">0</property>
-			  <property name="last_modification_time">Tue, 13 Apr 2004 22:05:30 GMT</property>
-			</widget>
-			<packing>
-			  <property name="left_attach">1</property>
-			  <property name="right_attach">2</property>
-			  <property name="top_attach">4</property>
-			  <property name="bottom_attach">5</property>
-			  <property name="y_options">fill</property>
-			</packing>
-		      </child>
-
-		      <child>
-			<widget class="GtkLabel" id="label-weblog">
-			  <property name="visible">True</property>
-			  <property name="label" translatable="yes">_Web Log:</property>
-			  <property name="use_underline">True</property>
-			  <property name="use_markup">False</property>
-			  <property name="justify">GTK_JUSTIFY_LEFT</property>
-			  <property name="wrap">False</property>
-			  <property name="selectable">False</property>
-			  <property name="xalign">0</property>
-			  <property name="yalign">0.5</property>
-			  <property name="xpad">0</property>
-			  <property name="ypad">0</property>
-			  <property name="mnemonic_widget">entry-weblog</property>
-			</widget>
-			<packing>
-			  <property name="left_attach">0</property>
-			  <property name="right_attach">1</property>
-			  <property name="top_attach">1</property>
-			  <property name="bottom_attach">2</property>
-			  <property name="x_options">fill</property>
-			  <property name="y_options"></property>
-			</packing>
-		      </child>
-
-		      <child>
-			<widget class="Custom" id="entry-weblog">
-			  <property name="visible">True</property>
-			  <property name="creation_function">e_contact_editor_create_web</property>
-			  <property name="string1">Web Log:</property>
-			  <property name="int1">0</property>
-			  <property name="int2">0</property>
-			  <property name="last_modification_time">Tue, 13 Apr 2004 22:04:21 GMT</property>
-			</widget>
-			<packing>
-			  <property name="left_attach">1</property>
-			  <property name="right_attach">2</property>
-			  <property name="top_attach">1</property>
-			  <property name="bottom_attach">2</property>
-			  <property name="x_options">fill</property>
-			  <property name="y_options">fill</property>
-			</packing>
-		      </child>
-		    </widget>
-		  </child>
-
-		  <child>
-		    <widget class="GtkLabel" id="label410">
-		      <property name="visible">True</property>
-		      <property name="label" translatable="yes">&lt;b&gt;Web Addresses&lt;/b&gt;</property>
-		      <property name="use_underline">False</property>
-		      <property name="use_markup">True</property>
-		      <property name="justify">GTK_JUSTIFY_LEFT</property>
-		      <property name="wrap">False</property>
-		      <property name="selectable">False</property>
-		      <property name="xalign">0.5</property>
-		      <property name="yalign">0.5</property>
-		      <property name="xpad">0</property>
-		      <property name="ypad">0</property>
-		    </widget>
-		    <packing>
-		      <property name="type">label_item</property>
-		    </packing>
-		  </child>
-		</widget>
-		<packing>
-		  <property name="padding">0</property>
-		  <property name="expand">False</property>
-		  <property name="fill">True</property>
-		</packing>
-	      </child>
-
-	      <child>
-		<widget class="GtkFrame" id="frame68">
-		  <property name="visible">True</property>
-		  <property name="label_xalign">0</property>
-		  <property name="label_yalign">0.5</property>
-		  <property name="shadow_type">GTK_SHADOW_NONE</property>
-
-		  <child>
-		    <widget class="GtkTable" id="table88">
-		      <property name="border_width">12</property>
-		      <property name="visible">True</property>
-		      <property name="n_rows">3</property>
-		      <property name="n_columns">4</property>
-		      <property name="homogeneous">False</property>
-		      <property name="row_spacing">6</property>
-		      <property name="column_spacing">6</property>
-
-		      <child>
-			<widget class="GtkLabel" id="label-profession">
-			  <property name="visible">True</property>
-			  <property name="label" translatable="yes">_Profession:</property>
-			  <property name="use_underline">True</property>
-			  <property name="use_markup">False</property>
-			  <property name="justify">GTK_JUSTIFY_LEFT</property>
-			  <property name="wrap">False</property>
-			  <property name="selectable">False</property>
-			  <property name="xalign">0</property>
-			  <property name="yalign">0.5</property>
-			  <property name="xpad">0</property>
-			  <property name="ypad">0</property>
-			  <property name="mnemonic_widget">entry-profession</property>
-			</widget>
-			<packing>
-			  <property name="left_attach">0</property>
-			  <property name="right_attach">1</property>
-			  <property name="top_attach">0</property>
-			  <property name="bottom_attach">1</property>
-			  <property name="x_options">fill</property>
-			  <property name="y_options"></property>
-			</packing>
-		      </child>
-
-		      <child>
-			<widget class="GtkEntry" id="entry-profession">
-			  <property name="visible">True</property>
-			  <property name="can_focus">True</property>
-			  <property name="editable">True</property>
-			  <property name="visibility">True</property>
-			  <property name="max_length">0</property>
-			  <property name="text" translatable="yes"></property>
-			  <property name="has_frame">True</property>
-			  <property name="invisible_char" translatable="yes">*</property>
-			  <property name="activates_default">False</property>
-			  <accessibility>
-			    <atkrelation target="label-profession" type="labelled-by"/>
-			  </accessibility>
-			</widget>
-			<packing>
-			  <property name="left_attach">1</property>
-			  <property name="right_attach">2</property>
-			  <property name="top_attach">0</property>
-			  <property name="bottom_attach">1</property>
-			  <property name="y_options"></property>
-			</packing>
-		      </child>
-
-		      <child>
-			<widget class="GtkLabel" id="label-jobtitle">
-			  <property name="visible">True</property>
-			  <property name="label" translatable="yes">_Title:</property>
-			  <property name="use_underline">True</property>
-			  <property name="use_markup">False</property>
-			  <property name="justify">GTK_JUSTIFY_LEFT</property>
-			  <property name="wrap">False</property>
-			  <property name="selectable">False</property>
-			  <property name="xalign">0</property>
-			  <property name="yalign">0.5</property>
-			  <property name="xpad">0</property>
-			  <property name="ypad">0</property>
-			  <property name="mnemonic_widget">entry-jobtitle</property>
-			</widget>
-			<packing>
-			  <property name="left_attach">2</property>
-			  <property name="right_attach">3</property>
-			  <property name="top_attach">0</property>
-			  <property name="bottom_attach">1</property>
-			  <property name="x_options">fill</property>
-			  <property name="y_options"></property>
-			</packing>
-		      </child>
-
-		      <child>
-			<widget class="GtkEntry" id="entry-jobtitle">
-			  <property name="visible">True</property>
-			  <property name="can_focus">True</property>
-			  <property name="editable">True</property>
-			  <property name="visibility">True</property>
-			  <property name="max_length">0</property>
-			  <property name="text" translatable="yes"></property>
-			  <property name="has_frame">True</property>
-			  <property name="invisible_char" translatable="yes">*</property>
-			  <property name="activates_default">False</property>
-			  <accessibility>
-			    <atkrelation target="label-jobtitle" type="labelled-by"/>
-			  </accessibility>
-			</widget>
-			<packing>
-			  <property name="left_attach">3</property>
-			  <property name="right_attach">4</property>
-			  <property name="top_attach">0</property>
-			  <property name="bottom_attach">1</property>
-			  <property name="y_options"></property>
-			</packing>
-		      </child>
-
-		      <child>
-			<widget class="GtkLabel" id="label-company">
-			  <property name="visible">True</property>
-			  <property name="label" translatable="yes">_Company:</property>
-			  <property name="use_underline">True</property>
-			  <property name="use_markup">False</property>
-			  <property name="justify">GTK_JUSTIFY_LEFT</property>
-			  <property name="wrap">False</property>
-			  <property name="selectable">False</property>
-			  <property name="xalign">0</property>
-			  <property name="yalign">0.5</property>
-			  <property name="xpad">0</property>
-			  <property name="ypad">0</property>
-			  <property name="mnemonic_widget">entry-company</property>
-			</widget>
-			<packing>
-			  <property name="left_attach">0</property>
-			  <property name="right_attach">1</property>
-			  <property name="top_attach">1</property>
-			  <property name="bottom_attach">2</property>
-			  <property name="x_options">fill</property>
-			  <property name="y_options"></property>
-			</packing>
-		      </child>
-
-		      <child>
-			<widget class="GtkEntry" id="entry-company">
-			  <property name="visible">True</property>
-			  <property name="can_focus">True</property>
-			  <property name="editable">True</property>
-			  <property name="visibility">True</property>
-			  <property name="max_length">0</property>
-			  <property name="text" translatable="yes"></property>
-			  <property name="has_frame">True</property>
-			  <property name="invisible_char" translatable="yes">*</property>
-			  <property name="activates_default">False</property>
-			  <accessibility>
-			    <atkrelation target="label-company" type="labelled-by"/>
-			  </accessibility>
-			</widget>
-			<packing>
-			  <property name="left_attach">1</property>
-			  <property name="right_attach">2</property>
-			  <property name="top_attach">1</property>
-			  <property name="bottom_attach">2</property>
-			  <property name="y_options"></property>
-			</packing>
-		      </child>
-
-		      <child>
-			<widget class="GtkLabel" id="label-department">
-			  <property name="visible">True</property>
-			  <property name="label" translatable="yes">_Department:</property>
-			  <property name="use_underline">True</property>
-			  <property name="use_markup">False</property>
-			  <property name="justify">GTK_JUSTIFY_LEFT</property>
-			  <property name="wrap">False</property>
-			  <property name="selectable">False</property>
-			  <property name="xalign">0</property>
-			  <property name="yalign">0.5</property>
-			  <property name="xpad">0</property>
-			  <property name="ypad">0</property>
-			  <property name="mnemonic_widget">entry-department</property>
-			</widget>
-			<packing>
-			  <property name="left_attach">2</property>
-			  <property name="right_attach">3</property>
-			  <property name="top_attach">1</property>
-			  <property name="bottom_attach">2</property>
-			  <property name="x_options">fill</property>
-			  <property name="y_options"></property>
-			</packing>
-		      </child>
-
-		      <child>
-			<widget class="GtkEntry" id="entry-department">
-			  <property name="visible">True</property>
-			  <property name="can_focus">True</property>
-			  <property name="editable">True</property>
-			  <property name="visibility">True</property>
-			  <property name="max_length">0</property>
-			  <property name="text" translatable="yes"></property>
-			  <property name="has_frame">True</property>
-			  <property name="invisible_char" translatable="yes">*</property>
-			  <property name="activates_default">False</property>
-			  <accessibility>
-			    <atkrelation target="label-department" type="labelled-by"/>
-			  </accessibility>
-			</widget>
-			<packing>
-			  <property name="left_attach">3</property>
-			  <property name="right_attach">4</property>
-			  <property name="top_attach">1</property>
-			  <property name="bottom_attach">2</property>
-			  <property name="y_options"></property>
-			</packing>
-		      </child>
-
-		      <child>
-			<widget class="GtkLabel" id="label-manager">
-			  <property name="visible">True</property>
-			  <property name="label" translatable="yes">_Manager:</property>
-			  <property name="use_underline">True</property>
-			  <property name="use_markup">False</property>
-			  <property name="justify">GTK_JUSTIFY_LEFT</property>
-			  <property name="wrap">False</property>
-			  <property name="selectable">False</property>
-			  <property name="xalign">0</property>
-			  <property name="yalign">0.5</property>
-			  <property name="xpad">0</property>
-			  <property name="ypad">0</property>
-			  <property name="mnemonic_widget">entry-manager</property>
-			</widget>
-			<packing>
-			  <property name="left_attach">0</property>
-			  <property name="right_attach">1</property>
-			  <property name="top_attach">2</property>
-			  <property name="bottom_attach">3</property>
-			  <property name="x_options">fill</property>
-			  <property name="y_options"></property>
-			</packing>
-		      </child>
-
-		      <child>
-			<widget class="GtkEntry" id="entry-manager">
-			  <property name="visible">True</property>
-			  <property name="can_focus">True</property>
-			  <property name="editable">True</property>
-			  <property name="visibility">True</property>
-			  <property name="max_length">0</property>
-			  <property name="text" translatable="yes"></property>
-			  <property name="has_frame">True</property>
-			  <property name="invisible_char" translatable="yes">*</property>
-			  <property name="activates_default">False</property>
-			  <accessibility>
-			    <atkrelation target="label-manager" type="labelled-by"/>
-			  </accessibility>
-			</widget>
-			<packing>
-			  <property name="left_attach">1</property>
-			  <property name="right_attach">2</property>
-			  <property name="top_attach">2</property>
-			  <property name="bottom_attach">3</property>
-			  <property name="y_options"></property>
-			</packing>
-		      </child>
-
-		      <child>
-			<widget class="GtkLabel" id="label-assistant">
-			  <property name="visible">True</property>
-			  <property name="label" translatable="yes">_Assistant:</property>
-			  <property name="use_underline">True</property>
-			  <property name="use_markup">False</property>
-			  <property name="justify">GTK_JUSTIFY_LEFT</property>
-			  <property name="wrap">False</property>
-			  <property name="selectable">False</property>
-			  <property name="xalign">0</property>
-			  <property name="yalign">0.5</property>
-			  <property name="xpad">0</property>
-			  <property name="ypad">0</property>
-			  <property name="mnemonic_widget">entry-assistant</property>
-			</widget>
-			<packing>
-			  <property name="left_attach">2</property>
-			  <property name="right_attach">3</property>
-			  <property name="top_attach">2</property>
-			  <property name="bottom_attach">3</property>
-			  <property name="x_options">fill</property>
-			  <property name="y_options"></property>
-			</packing>
-		      </child>
-
-		      <child>
-			<widget class="GtkEntry" id="entry-assistant">
-			  <property name="visible">True</property>
-			  <property name="can_focus">True</property>
-			  <property name="editable">True</property>
-			  <property name="visibility">True</property>
-			  <property name="max_length">0</property>
-			  <property name="text" translatable="yes"></property>
-			  <property name="has_frame">True</property>
-			  <property name="invisible_char" translatable="yes">*</property>
-			  <property name="activates_default">False</property>
-			  <accessibility>
-			    <atkrelation target="label-assistant" type="labelled-by"/>
-			  </accessibility>
-			</widget>
-			<packing>
-			  <property name="left_attach">3</property>
-			  <property name="right_attach">4</property>
-			  <property name="top_attach">2</property>
-			  <property name="bottom_attach">3</property>
-			  <property name="y_options"></property>
-			</packing>
-		      </child>
-		    </widget>
-		  </child>
-
-		  <child>
-		    <widget class="GtkLabel" id="label417">
-		      <property name="visible">True</property>
-		      <property name="label" translatable="yes">&lt;b&gt;Job&lt;/b&gt;</property>
-		      <property name="use_underline">False</property>
-		      <property name="use_markup">True</property>
-		      <property name="justify">GTK_JUSTIFY_LEFT</property>
-		      <property name="wrap">False</property>
-		      <property name="selectable">False</property>
-		      <property name="xalign">0.5</property>
-		      <property name="yalign">0.5</property>
-		      <property name="xpad">0</property>
-		      <property name="ypad">0</property>
-		    </widget>
-		    <packing>
-		      <property name="type">label_item</property>
-		    </packing>
-		  </child>
-		</widget>
-		<packing>
-		  <property name="padding">0</property>
-		  <property name="expand">False</property>
-		  <property name="fill">True</property>
-		</packing>
-	      </child>
-
-	      <child>
-		<widget class="GtkFrame" id="frame69">
-		  <property name="visible">True</property>
-		  <property name="label_xalign">0</property>
-		  <property name="label_yalign">0.5</property>
-		  <property name="shadow_type">GTK_SHADOW_NONE</property>
-
-		  <child>
-		    <widget class="GtkTable" id="table89">
-		      <property name="border_width">12</property>
-		      <property name="visible">True</property>
-		      <property name="n_rows">3</property>
-		      <property name="n_columns">4</property>
-		      <property name="homogeneous">False</property>
-		      <property name="row_spacing">6</property>
-		      <property name="column_spacing">6</property>
-
-		      <child>
-			<widget class="GtkScrolledWindow" id="scrolledwindow41">
-			  <property name="height_request">38</property>
-			  <property name="visible">True</property>
-			  <property name="can_focus">True</property>
-			  <property name="hscrollbar_policy">GTK_POLICY_AUTOMATIC</property>
-			  <property name="vscrollbar_policy">GTK_POLICY_AUTOMATIC</property>
-			  <property name="shadow_type">GTK_SHADOW_IN</property>
-			  <property name="window_placement">GTK_CORNER_TOP_LEFT</property>
-
-			  <child>
-			    <widget class="GtkTextView" id="text-comments">
-			      <property name="visible">True</property>
-			      <property name="can_focus">True</property>
-			      <property name="editable">True</property>
-			      <property name="overwrite">False</property>
-			      <property name="accepts_tab">True</property>
-			      <property name="justification">GTK_JUSTIFY_LEFT</property>
-			      <property name="wrap_mode">GTK_WRAP_NONE</property>
-			      <property name="cursor_visible">True</property>
-			      <property name="pixels_above_lines">0</property>
-			      <property name="pixels_below_lines">0</property>
-			      <property name="pixels_inside_wrap">0</property>
-			      <property name="left_margin">0</property>
-			      <property name="right_margin">0</property>
-			      <property name="indent">0</property>
-			      <property name="text" translatable="yes"></property>
-			      <accessibility>
-				<atkrelation target="label-comments" type="labelled-by"/>
-			      </accessibility>
-			    </widget>
-			  </child>
-			</widget>
-			<packing>
-			  <property name="left_attach">1</property>
-			  <property name="right_attach">4</property>
-			  <property name="top_attach">2</property>
-			  <property name="bottom_attach">3</property>
-			</packing>
-		      </child>
-
-		      <child>
-			<widget class="GtkLabel" id="label-comments">
-			  <property name="visible">True</property>
-			  <property name="label" translatable="yes">_Notes:</property>
-			  <property name="use_underline">True</property>
-			  <property name="use_markup">False</property>
-			  <property name="justify">GTK_JUSTIFY_LEFT</property>
-			  <property name="wrap">False</property>
-			  <property name="selectable">False</property>
-			  <property name="xalign">0</property>
-			  <property name="yalign">0</property>
-			  <property name="xpad">0</property>
-			  <property name="ypad">0</property>
-			  <property name="mnemonic_widget">text-comments</property>
-			</widget>
-			<packing>
-			  <property name="left_attach">0</property>
-			  <property name="right_attach">1</property>
-			  <property name="top_attach">2</property>
-			  <property name="bottom_attach">3</property>
-			  <property name="x_options">fill</property>
-			  <property name="y_options">fill</property>
-			</packing>
-		      </child>
-
-		      <child>
-			<widget class="GtkLabel" id="label-office">
-			  <property name="visible">True</property>
-			  <property name="label" translatable="yes">_Office:</property>
-			  <property name="use_underline">True</property>
-			  <property name="use_markup">False</property>
-			  <property name="justify">GTK_JUSTIFY_LEFT</property>
-			  <property name="wrap">False</property>
-			  <property name="selectable">False</property>
-			  <property name="xalign">0</property>
-			  <property name="yalign">0.5</property>
-			  <property name="xpad">0</property>
-			  <property name="ypad">0</property>
-			  <property name="mnemonic_widget">entry-office</property>
-			</widget>
-			<packing>
-			  <property name="left_attach">0</property>
-			  <property name="right_attach">1</property>
-			  <property name="top_attach">0</property>
-			  <property name="bottom_attach">1</property>
-			  <property name="x_options">fill</property>
-			  <property name="y_options"></property>
-			</packing>
-		      </child>
-
-		      <child>
-			<widget class="GtkLabel" id="label-spouse">
-			  <property name="visible">True</property>
-			  <property name="label" translatable="yes">_Spouse:</property>
-			  <property name="use_underline">True</property>
-			  <property name="use_markup">False</property>
-			  <property name="justify">GTK_JUSTIFY_LEFT</property>
-			  <property name="wrap">False</property>
-			  <property name="selectable">False</property>
-			  <property name="xalign">0</property>
-			  <property name="yalign">0.5</property>
-			  <property name="xpad">0</property>
-			  <property name="ypad">0</property>
-			  <property name="mnemonic_widget">entry-spouse</property>
-			</widget>
-			<packing>
-			  <property name="left_attach">0</property>
-			  <property name="right_attach">1</property>
-			  <property name="top_attach">1</property>
-			  <property name="bottom_attach">2</property>
-			  <property name="x_options">fill</property>
-			  <property name="y_options"></property>
-			</packing>
-		      </child>
-
-		      <child>
-			<widget class="GtkEntry" id="entry-office">
-			  <property name="visible">True</property>
-			  <property name="can_focus">True</property>
-			  <property name="editable">True</property>
-			  <property name="visibility">True</property>
-			  <property name="max_length">0</property>
-			  <property name="text" translatable="yes"></property>
-			  <property name="has_frame">True</property>
-			  <property name="invisible_char" translatable="yes">*</property>
-			  <property name="activates_default">False</property>
-			  <accessibility>
-			    <atkrelation target="label-office" type="labelled-by"/>
-			  </accessibility>
-			</widget>
-			<packing>
-			  <property name="left_attach">1</property>
-			  <property name="right_attach">2</property>
-			  <property name="top_attach">0</property>
-			  <property name="bottom_attach">1</property>
-			  <property name="y_options"></property>
-			</packing>
-		      </child>
-
-		      <child>
-			<widget class="GtkEntry" id="entry-spouse">
-			  <property name="visible">True</property>
-			  <property name="can_focus">True</property>
-			  <property name="editable">True</property>
-			  <property name="visibility">True</property>
-			  <property name="max_length">0</property>
-			  <property name="text" translatable="yes"></property>
-			  <property name="has_frame">True</property>
-			  <property name="invisible_char" translatable="yes">*</property>
-			  <property name="activates_default">False</property>
-			  <accessibility>
-			    <atkrelation target="label-spouse" type="labelled-by"/>
-			  </accessibility>
-			</widget>
-			<packing>
-			  <property name="left_attach">1</property>
-			  <property name="right_attach">2</property>
-			  <property name="top_attach">1</property>
-			  <property name="bottom_attach">2</property>
-			  <property name="y_options"></property>
-			</packing>
-		      </child>
-
-		      <child>
-			<widget class="GtkLabel" id="label-birthday">
-			  <property name="visible">True</property>
-			  <property name="label" translatable="yes">_Birthday:</property>
-			  <property name="use_underline">True</property>
-			  <property name="use_markup">False</property>
-			  <property name="justify">GTK_JUSTIFY_LEFT</property>
-			  <property name="wrap">False</property>
-			  <property name="selectable">False</property>
-			  <property name="xalign">0</property>
-			  <property name="yalign">0.5</property>
-			  <property name="xpad">0</property>
-			  <property name="ypad">0</property>
-			  <property name="mnemonic_widget">dateedit-birthday</property>
-			</widget>
-			<packing>
-			  <property name="left_attach">2</property>
-			  <property name="right_attach">3</property>
-			  <property name="top_attach">0</property>
-			  <property name="bottom_attach">1</property>
-			  <property name="x_options">fill</property>
-			  <property name="y_options"></property>
-			</packing>
-		      </child>
-
-		      <child>
-			<widget class="GtkLabel" id="label-anniversary">
-			  <property name="visible">True</property>
-			  <property name="label" translatable="yes">_Anniversary:</property>
-			  <property name="use_underline">True</property>
-			  <property name="use_markup">False</property>
-			  <property name="justify">GTK_JUSTIFY_LEFT</property>
-			  <property name="wrap">False</property>
-			  <property name="selectable">False</property>
-			  <property name="xalign">1</property>
-			  <property name="yalign">0.5</property>
-			  <property name="xpad">0</property>
-			  <property name="ypad">0</property>
-			  <property name="mnemonic_widget">dateedit-anniversary</property>
-			</widget>
-			<packing>
-			  <property name="left_attach">2</property>
-			  <property name="right_attach">3</property>
-			  <property name="top_attach">1</property>
-			  <property name="bottom_attach">2</property>
-			  <property name="x_options">fill</property>
-			  <property name="y_options"></property>
-			</packing>
-		      </child>
-
-		      <child>
-			<widget class="Custom" id="dateedit-anniversary">
-			  <property name="visible">True</property>
-			  <property name="creation_function">e_contact_editor_create_date</property>
-			  <property name="string1">Anniversary</property>
-			  <property name="int1">0</property>
-			  <property name="int2">0</property>
-			  <property name="last_modification_time">Tue, 13 Apr 2004 23:56:03 GMT</property>
-			</widget>
-			<packing>
-			  <property name="left_attach">3</property>
-			  <property name="right_attach">4</property>
-			  <property name="top_attach">1</property>
-			  <property name="bottom_attach">2</property>
-			  <property name="x_options">fill</property>
-			  <property name="y_options">fill</property>
-			</packing>
-		      </child>
-
-		      <child>
-			<widget class="Custom" id="dateedit-birthday">
-			  <property name="visible">True</property>
-			  <property name="creation_function">e_contact_editor_create_date</property>
-			  <property name="string1">Birthday</property>
-			  <property name="int1">0</property>
-			  <property name="int2">0</property>
-			  <property name="last_modification_time">Tue, 13 Apr 2004 23:55:46 GMT</property>
-			</widget>
-			<packing>
-			  <property name="left_attach">3</property>
-			  <property name="right_attach">4</property>
-			  <property name="top_attach">0</property>
-			  <property name="bottom_attach">1</property>
-			  <property name="x_options">fill</property>
-			  <property name="y_options">fill</property>
-			</packing>
-		      </child>
-		    </widget>
-		  </child>
-
-		  <child>
-		    <widget class="GtkLabel" id="label421">
-		      <property name="visible">True</property>
-		      <property name="label" translatable="yes">&lt;b&gt;Miscellaneous&lt;/b&gt;</property>
-		      <property name="use_underline">False</property>
-		      <property name="use_markup">True</property>
-		      <property name="justify">GTK_JUSTIFY_LEFT</property>
-		      <property name="wrap">False</property>
-		      <property name="selectable">False</property>
-		      <property name="xalign">0.5</property>
-		      <property name="yalign">0.5</property>
-		      <property name="xpad">0</property>
-		      <property name="ypad">0</property>
-		    </widget>
-		    <packing>
-		      <property name="type">label_item</property>
-		    </packing>
-		  </child>
-		</widget>
-		<packing>
-		  <property name="padding">0</property>
-		  <property name="expand">True</property>
-		  <property name="fill">True</property>
-		</packing>
-	      </child>
-	    </widget>
-	    <packing>
-	      <property name="tab_expand">False</property>
-	      <property name="tab_fill">True</property>
-	    </packing>
-	  </child>
-
-	  <child>
-	    <widget class="GtkLabel" id="label422">
-	      <property name="visible">True</property>
-	      <property name="label" translatable="yes">Personal Information</property>
-	      <property name="use_underline">False</property>
-	      <property name="use_markup">False</property>
-	      <property name="justify">GTK_JUSTIFY_LEFT</property>
-	      <property name="wrap">False</property>
-	      <property name="selectable">False</property>
-	      <property name="xalign">0.5</property>
-	      <property name="yalign">0.5</property>
-	      <property name="xpad">0</property>
-	      <property name="ypad">0</property>
-	    </widget>
-	    <packing>
-	      <property name="type">tab</property>
-	    </packing>
-	  </child>
-
-	  <child>
-	    <widget class="GtkVBox" id="vbox36">
-	      <property name="border_width">12</property>
-	      <property name="visible">True</property>
-	      <property name="homogeneous">False</property>
-	      <property name="spacing">12</property>
-
-	      <child>
-		<widget class="GtkFrame" id="frame70">
-		  <property name="visible">True</property>
-		  <property name="label_xalign">0</property>
-		  <property name="label_yalign">0.5</property>
-		  <property name="shadow_type">GTK_SHADOW_NONE</property>
-
-		  <child>
-		    <widget class="GtkTable" id="table90">
-		      <property name="border_width">12</property>
-		      <property name="visible">True</property>
-		      <property name="n_rows">4</property>
-		      <property name="n_columns">4</property>
-		      <property name="homogeneous">False</property>
-		      <property name="row_spacing">6</property>
-		      <property name="column_spacing">6</property>
-
-		      <child>
-			<widget class="GtkLabel" id="label-home-city">
-			  <property name="visible">True</property>
-			  <property name="label" translatable="yes">_City:</property>
-			  <property name="use_underline">True</property>
-			  <property name="use_markup">False</property>
-			  <property name="justify">GTK_JUSTIFY_LEFT</property>
-			  <property name="wrap">False</property>
-			  <property name="selectable">False</property>
-			  <property name="xalign">1</property>
-			  <property name="yalign">0.5</property>
-			  <property name="xpad">0</property>
-			  <property name="ypad">0</property>
-			  <property name="mnemonic_widget">entry-home-city</property>
-			</widget>
-			<packing>
-			  <property name="left_attach">2</property>
-			  <property name="right_attach">3</property>
-			  <property name="top_attach">0</property>
-			  <property name="bottom_attach">1</property>
-			  <property name="x_options">fill</property>
-			  <property name="y_options"></property>
-			</packing>
-		      </child>
-
-		      <child>
-			<widget class="GtkEntry" id="entry-home-city">
-			  <property name="visible">True</property>
-			  <property name="can_focus">True</property>
-			  <property name="editable">True</property>
-			  <property name="visibility">True</property>
-			  <property name="max_length">0</property>
-			  <property name="text" translatable="yes"></property>
-			  <property name="has_frame">True</property>
-			  <property name="invisible_char" translatable="yes">*</property>
-			  <property name="activates_default">False</property>
-			  <accessibility>
-			    <atkrelation target="label-home-city" type="labelled-by"/>
-			  </accessibility>
-			</widget>
-			<packing>
-			  <property name="left_attach">3</property>
-			  <property name="right_attach">4</property>
-			  <property name="top_attach">0</property>
-			  <property name="bottom_attach">1</property>
-			  <property name="y_options"></property>
-			</packing>
-		      </child>
-
-		      <child>
-			<widget class="GtkLabel" id="label-home-zip">
-			  <property name="visible">True</property>
-			  <property name="label" translatable="yes">_Zip/Postal Code:</property>
-			  <property name="use_underline">True</property>
-			  <property name="use_markup">False</property>
-			  <property name="justify">GTK_JUSTIFY_LEFT</property>
-			  <property name="wrap">False</property>
-			  <property name="selectable">False</property>
-			  <property name="xalign">0</property>
-			  <property name="yalign">0.5</property>
-			  <property name="xpad">0</property>
-			  <property name="ypad">0</property>
-			  <property name="mnemonic_widget">entry-home-zip</property>
-			</widget>
-			<packing>
-			  <property name="left_attach">2</property>
-			  <property name="right_attach">3</property>
-			  <property name="top_attach">1</property>
-			  <property name="bottom_attach">2</property>
-			  <property name="x_options">fill</property>
-			  <property name="y_options"></property>
-			</packing>
-		      </child>
-
-		      <child>
-			<widget class="GtkEntry" id="entry-home-zip">
-			  <property name="visible">True</property>
-			  <property name="can_focus">True</property>
-			  <property name="editable">True</property>
-			  <property name="visibility">True</property>
-			  <property name="max_length">0</property>
-			  <property name="text" translatable="yes"></property>
-			  <property name="has_frame">True</property>
-			  <property name="invisible_char" translatable="yes">*</property>
-			  <property name="activates_default">False</property>
-			  <accessibility>
-			    <atkrelation target="label-home-zip" type="labelled-by"/>
-			  </accessibility>
-			</widget>
-			<packing>
-			  <property name="left_attach">3</property>
-			  <property name="right_attach">4</property>
-			  <property name="top_attach">1</property>
-			  <property name="bottom_attach">2</property>
-			  <property name="y_options"></property>
-			</packing>
-		      </child>
-
-		      <child>
-			<widget class="GtkLabel" id="label-home-state">
-			  <property name="visible">True</property>
-			  <property name="label" translatable="yes">_State/Province:</property>
-			  <property name="use_underline">True</property>
-			  <property name="use_markup">False</property>
-			  <property name="justify">GTK_JUSTIFY_LEFT</property>
-			  <property name="wrap">False</property>
-			  <property name="selectable">False</property>
-			  <property name="xalign">1</property>
-			  <property name="yalign">0.5</property>
-			  <property name="xpad">0</property>
-			  <property name="ypad">0</property>
-			  <property name="mnemonic_widget">entry-home-state</property>
-			</widget>
-			<packing>
-			  <property name="left_attach">2</property>
-			  <property name="right_attach">3</property>
-			  <property name="top_attach">2</property>
-			  <property name="bottom_attach">3</property>
-			  <property name="x_options">fill</property>
-			  <property name="y_options"></property>
-			</packing>
-		      </child>
-
-		      <child>
-			<widget class="GtkEntry" id="entry-home-state">
-			  <property name="visible">True</property>
-			  <property name="can_focus">True</property>
-			  <property name="editable">True</property>
-			  <property name="visibility">True</property>
-			  <property name="max_length">0</property>
-			  <property name="text" translatable="yes"></property>
-			  <property name="has_frame">True</property>
-			  <property name="invisible_char" translatable="yes">*</property>
-			  <property name="activates_default">False</property>
-			  <accessibility>
-			    <atkrelation target="label-home-state" type="labelled-by"/>
-			  </accessibility>
-			</widget>
-			<packing>
-			  <property name="left_attach">3</property>
-			  <property name="right_attach">4</property>
-			  <property name="top_attach">2</property>
-			  <property name="bottom_attach">3</property>
-			  <property name="y_options"></property>
-			</packing>
-		      </child>
-
-		      <child>
-			<widget class="GtkLabel" id="label-home-country">
-			  <property name="visible">True</property>
-			  <property name="label" translatable="yes">_Country:</property>
-			  <property name="use_underline">True</property>
-			  <property name="use_markup">False</property>
-			  <property name="justify">GTK_JUSTIFY_LEFT</property>
-			  <property name="wrap">False</property>
-			  <property name="selectable">False</property>
-			  <property name="xalign">1</property>
-			  <property name="yalign">0.5</property>
-			  <property name="xpad">0</property>
-			  <property name="ypad">0</property>
-			  <property name="mnemonic_widget">entry-home-country</property>
-			</widget>
-			<packing>
-			  <property name="left_attach">2</property>
-			  <property name="right_attach">3</property>
-			  <property name="top_attach">3</property>
-			  <property name="bottom_attach">4</property>
-			  <property name="x_options">fill</property>
-			  <property name="y_options"></property>
-			</packing>
-		      </child>
-
-		      <child>
-			<widget class="GtkEntry" id="entry-home-country">
-			  <property name="visible">True</property>
-			  <property name="can_focus">True</property>
-			  <property name="editable">True</property>
-			  <property name="visibility">True</property>
-			  <property name="max_length">0</property>
-			  <property name="text" translatable="yes"></property>
-			  <property name="has_frame">True</property>
-			  <property name="invisible_char" translatable="yes">*</property>
-			  <property name="activates_default">False</property>
-			  <accessibility>
-			    <atkrelation target="label-home-country" type="labelled-by"/>
-			  </accessibility>
-			</widget>
-			<packing>
-			  <property name="left_attach">3</property>
-			  <property name="right_attach">4</property>
-			  <property name="top_attach">3</property>
-			  <property name="bottom_attach">4</property>
-			  <property name="y_options"></property>
-			</packing>
-		      </child>
-
-		      <child>
-			<widget class="GtkLabel" id="label-home-address">
-			  <property name="visible">True</property>
-			  <property name="label" translatable="yes">_Address:</property>
-			  <property name="use_underline">True</property>
-			  <property name="use_markup">False</property>
-			  <property name="justify">GTK_JUSTIFY_LEFT</property>
-			  <property name="wrap">False</property>
-			  <property name="selectable">False</property>
-			  <property name="xalign">1</property>
-			  <property name="yalign">0.5</property>
-			  <property name="xpad">0</property>
-			  <property name="ypad">0</property>
-			  <property name="mnemonic_widget">textview-home-address</property>
-			</widget>
-			<packing>
-			  <property name="left_attach">0</property>
-			  <property name="right_attach">1</property>
-			  <property name="top_attach">0</property>
-			  <property name="bottom_attach">1</property>
-			  <property name="x_options">fill</property>
-			  <property name="y_options">fill</property>
-			</packing>
-		      </child>
-
-		      <child>
-			<widget class="GtkScrolledWindow" id="scrolledwindow42">
-			  <property name="visible">True</property>
-			  <property name="can_focus">True</property>
-			  <property name="hscrollbar_policy">GTK_POLICY_AUTOMATIC</property>
-			  <property name="vscrollbar_policy">GTK_POLICY_AUTOMATIC</property>
-			  <property name="shadow_type">GTK_SHADOW_IN</property>
-			  <property name="window_placement">GTK_CORNER_TOP_LEFT</property>
-
-			  <child>
-			    <widget class="GtkTextView" id="textview-home-address">
-			      <property name="visible">True</property>
-			      <property name="can_focus">True</property>
-			      <property name="editable">True</property>
-			      <property name="overwrite">False</property>
-			      <property name="accepts_tab">True</property>
-			      <property name="justification">GTK_JUSTIFY_LEFT</property>
-			      <property name="wrap_mode">GTK_WRAP_NONE</property>
-			      <property name="cursor_visible">True</property>
-			      <property name="pixels_above_lines">0</property>
-			      <property name="pixels_below_lines">0</property>
-			      <property name="pixels_inside_wrap">0</property>
-			      <property name="left_margin">0</property>
-			      <property name="right_margin">0</property>
-			      <property name="indent">0</property>
-			      <property name="text" translatable="yes"></property>
-			      <accessibility>
-				<atkrelation target="label-home-address" type="labelled-by"/>
-			      </accessibility>
-			    </widget>
-			  </child>
-			</widget>
-			<packing>
-			  <property name="left_attach">1</property>
-			  <property name="right_attach">2</property>
-			  <property name="top_attach">0</property>
-			  <property name="bottom_attach">3</property>
-			  <property name="y_options">fill</property>
-			</packing>
-		      </child>
-
-		      <child>
-			<widget class="GtkEntry" id="entry-home-pobox">
-			  <property name="visible">True</property>
-			  <property name="can_focus">True</property>
-			  <property name="editable">True</property>
-			  <property name="visibility">True</property>
-			  <property name="max_length">0</property>
-			  <property name="text" translatable="yes"></property>
-			  <property name="has_frame">True</property>
-			  <property name="invisible_char" translatable="yes">*</property>
-			  <property name="activates_default">False</property>
-			  <accessibility>
-			    <atkrelation target="label-home-pobox" type="labelled-by"/>
-			  </accessibility>
-			</widget>
-			<packing>
-			  <property name="left_attach">1</property>
-			  <property name="right_attach">2</property>
-			  <property name="top_attach">3</property>
-			  <property name="bottom_attach">4</property>
-			  <property name="y_options"></property>
-			</packing>
-		      </child>
-
-		      <child>
-			<widget class="GtkLabel" id="label-home-pobox">
-			  <property name="visible">True</property>
-			  <property name="label" translatable="yes">_PO Box:</property>
-			  <property name="use_underline">True</property>
-			  <property name="use_markup">False</property>
-			  <property name="justify">GTK_JUSTIFY_LEFT</property>
-			  <property name="wrap">False</property>
-			  <property name="selectable">False</property>
-			  <property name="xalign">1</property>
-			  <property name="yalign">0.5</property>
-			  <property name="xpad">0</property>
-			  <property name="ypad">0</property>
-			  <property name="mnemonic_widget">entry-home-pobox</property>
-			</widget>
-			<packing>
-			  <property name="left_attach">0</property>
-			  <property name="right_attach">1</property>
-			  <property name="top_attach">3</property>
-			  <property name="bottom_attach">4</property>
-			  <property name="x_options">fill</property>
-			  <property name="y_options"></property>
-			</packing>
-		      </child>
-		    </widget>
-		  </child>
-
-		  <child>
-		    <widget class="GtkLabel" id="label429">
-		      <property name="visible">True</property>
-		      <property name="label" translatable="yes">&lt;b&gt;Home&lt;/b&gt;</property>
-		      <property name="use_underline">False</property>
-		      <property name="use_markup">True</property>
-		      <property name="justify">GTK_JUSTIFY_LEFT</property>
-		      <property name="wrap">False</property>
-		      <property name="selectable">False</property>
-		      <property name="xalign">0.5</property>
-		      <property name="yalign">0.5</property>
-		      <property name="xpad">0</property>
-		      <property name="ypad">0</property>
-		    </widget>
-		    <packing>
-		      <property name="type">label_item</property>
-		    </packing>
-		  </child>
-		</widget>
-		<packing>
-		  <property name="padding">0</property>
-		  <property name="expand">False</property>
-		  <property name="fill">True</property>
-		</packing>
-	      </child>
-
-	      <child>
-		<widget class="GtkFrame" id="frame71">
-		  <property name="visible">True</property>
-		  <property name="label_xalign">0</property>
-		  <property name="label_yalign">0.5</property>
-		  <property name="shadow_type">GTK_SHADOW_NONE</property>
-
-		  <child>
-		    <widget class="GtkTable" id="table91">
-		      <property name="border_width">12</property>
-		      <property name="visible">True</property>
-		      <property name="n_rows">4</property>
-		      <property name="n_columns">4</property>
-		      <property name="homogeneous">False</property>
-		      <property name="row_spacing">6</property>
-		      <property name="column_spacing">6</property>
-
-		      <child>
-			<widget class="GtkLabel" id="label-work-city">
-			  <property name="visible">True</property>
-			  <property name="label" translatable="yes">_City:</property>
-			  <property name="use_underline">True</property>
-			  <property name="use_markup">False</property>
-			  <property name="justify">GTK_JUSTIFY_LEFT</property>
-			  <property name="wrap">False</property>
-			  <property name="selectable">False</property>
-			  <property name="xalign">1</property>
-			  <property name="yalign">0.5</property>
-			  <property name="xpad">0</property>
-			  <property name="ypad">0</property>
-			  <property name="mnemonic_widget">entry-work-city</property>
-			</widget>
-			<packing>
-			  <property name="left_attach">2</property>
-			  <property name="right_attach">3</property>
-			  <property name="top_attach">0</property>
-			  <property name="bottom_attach">1</property>
-			  <property name="x_options">fill</property>
-			  <property name="y_options"></property>
-			</packing>
-		      </child>
-
-		      <child>
-			<widget class="GtkEntry" id="entry-work-city">
-			  <property name="visible">True</property>
-			  <property name="can_focus">True</property>
-			  <property name="editable">True</property>
-			  <property name="visibility">True</property>
-			  <property name="max_length">0</property>
-			  <property name="text" translatable="yes"></property>
-			  <property name="has_frame">True</property>
-			  <property name="invisible_char" translatable="yes">*</property>
-			  <property name="activates_default">False</property>
-			  <accessibility>
-			    <atkrelation target="label-work-city" type="labelled-by"/>
-			  </accessibility>
-			</widget>
-			<packing>
-			  <property name="left_attach">3</property>
-			  <property name="right_attach">4</property>
-			  <property name="top_attach">0</property>
-			  <property name="bottom_attach">1</property>
-			  <property name="y_options"></property>
-			</packing>
-		      </child>
-
-		      <child>
-			<widget class="GtkLabel" id="label-work-state">
-			  <property name="visible">True</property>
-			  <property name="label" translatable="yes">_State/Province:</property>
-			  <property name="use_underline">True</property>
-			  <property name="use_markup">False</property>
-			  <property name="justify">GTK_JUSTIFY_LEFT</property>
-			  <property name="wrap">False</property>
-			  <property name="selectable">False</property>
-			  <property name="xalign">1</property>
-			  <property name="yalign">0.5</property>
-			  <property name="xpad">0</property>
-			  <property name="ypad">0</property>
-			  <property name="mnemonic_widget">entry-work-state</property>
-			</widget>
-			<packing>
-			  <property name="left_attach">2</property>
-			  <property name="right_attach">3</property>
-			  <property name="top_attach">2</property>
-			  <property name="bottom_attach">3</property>
-			  <property name="x_options">fill</property>
-			  <property name="y_options"></property>
-			</packing>
-		      </child>
-
-		      <child>
-			<widget class="GtkEntry" id="entry-work-state">
-			  <property name="visible">True</property>
-			  <property name="can_focus">True</property>
-			  <property name="editable">True</property>
-			  <property name="visibility">True</property>
-			  <property name="max_length">0</property>
-			  <property name="text" translatable="yes"></property>
-			  <property name="has_frame">True</property>
-			  <property name="invisible_char" translatable="yes">*</property>
-			  <property name="activates_default">False</property>
-			  <accessibility>
-			    <atkrelation target="label-work-state" type="labelled-by"/>
-			  </accessibility>
-			</widget>
-			<packing>
-			  <property name="left_attach">3</property>
-			  <property name="right_attach">4</property>
-			  <property name="top_attach">2</property>
-			  <property name="bottom_attach">3</property>
-			  <property name="y_options"></property>
-			</packing>
-		      </child>
-
-		      <child>
-			<widget class="GtkLabel" id="label-work-zip">
-			  <property name="visible">True</property>
-			  <property name="label" translatable="yes">_Zip/Postal Code:</property>
-			  <property name="use_underline">True</property>
-			  <property name="use_markup">False</property>
-			  <property name="justify">GTK_JUSTIFY_LEFT</property>
-			  <property name="wrap">False</property>
-			  <property name="selectable">False</property>
-			  <property name="xalign">0</property>
-			  <property name="yalign">0.5</property>
-			  <property name="xpad">0</property>
-			  <property name="ypad">0</property>
-			  <property name="mnemonic_widget">entry-work-zip</property>
-			</widget>
-			<packing>
-			  <property name="left_attach">2</property>
-			  <property name="right_attach">3</property>
-			  <property name="top_attach">1</property>
-			  <property name="bottom_attach">2</property>
-			  <property name="x_options">fill</property>
-			  <property name="y_options"></property>
-			</packing>
-		      </child>
-
-		      <child>
-			<widget class="GtkEntry" id="entry-work-zip">
-			  <property name="visible">True</property>
-			  <property name="can_focus">True</property>
-			  <property name="editable">True</property>
-			  <property name="visibility">True</property>
-			  <property name="max_length">0</property>
-			  <property name="text" translatable="yes"></property>
-			  <property name="has_frame">True</property>
-			  <property name="invisible_char" translatable="yes">*</property>
-			  <property name="activates_default">False</property>
-			  <accessibility>
-			    <atkrelation target="label-work-zip" type="labelled-by"/>
-			  </accessibility>
-			</widget>
-			<packing>
-			  <property name="left_attach">3</property>
-			  <property name="right_attach">4</property>
-			  <property name="top_attach">1</property>
-			  <property name="bottom_attach">2</property>
-			  <property name="y_options"></property>
-			</packing>
-		      </child>
-
-		      <child>
-			<widget class="GtkLabel" id="label-work-country">
-			  <property name="visible">True</property>
-			  <property name="label" translatable="yes">_Country:</property>
-			  <property name="use_underline">True</property>
-			  <property name="use_markup">False</property>
-			  <property name="justify">GTK_JUSTIFY_LEFT</property>
-			  <property name="wrap">False</property>
-			  <property name="selectable">False</property>
-			  <property name="xalign">1</property>
-			  <property name="yalign">0.5</property>
-			  <property name="xpad">0</property>
-			  <property name="ypad">0</property>
-			  <property name="mnemonic_widget">entry-work-country</property>
-			</widget>
-			<packing>
-			  <property name="left_attach">2</property>
-			  <property name="right_attach">3</property>
-			  <property name="top_attach">3</property>
-			  <property name="bottom_attach">4</property>
-			  <property name="x_options">fill</property>
-			  <property name="y_options"></property>
-			</packing>
-		      </child>
-
-		      <child>
-			<widget class="GtkEntry" id="entry-work-country">
-			  <property name="visible">True</property>
-			  <property name="can_focus">True</property>
-			  <property name="editable">True</property>
-			  <property name="visibility">True</property>
-			  <property name="max_length">0</property>
-			  <property name="text" translatable="yes"></property>
-			  <property name="has_frame">True</property>
-			  <property name="invisible_char" translatable="yes">*</property>
-			  <property name="activates_default">False</property>
-			  <accessibility>
-			    <atkrelation target="label-work-country" type="labelled-by"/>
-			  </accessibility>
-			</widget>
-			<packing>
-			  <property name="left_attach">3</property>
-			  <property name="right_attach">4</property>
-			  <property name="top_attach">3</property>
-			  <property name="bottom_attach">4</property>
-			  <property name="y_options"></property>
-			</packing>
-		      </child>
-
-		      <child>
-			<widget class="GtkLabel" id="label-work-address">
-			  <property name="visible">True</property>
-			  <property name="label" translatable="yes">_Address:</property>
-			  <property name="use_underline">True</property>
-			  <property name="use_markup">False</property>
-			  <property name="justify">GTK_JUSTIFY_LEFT</property>
-			  <property name="wrap">False</property>
-			  <property name="selectable">False</property>
-			  <property name="xalign">1</property>
-			  <property name="yalign">0.5</property>
-			  <property name="xpad">0</property>
-			  <property name="ypad">0</property>
-			  <property name="mnemonic_widget">textview-work-address</property>
-			</widget>
-			<packing>
-			  <property name="left_attach">0</property>
-			  <property name="right_attach">1</property>
-			  <property name="top_attach">0</property>
-			  <property name="bottom_attach">1</property>
-			  <property name="x_options">fill</property>
-			  <property name="y_options">fill</property>
-			</packing>
-		      </child>
-
-		      <child>
-			<widget class="GtkScrolledWindow" id="scrolledwindow43">
-			  <property name="visible">True</property>
-			  <property name="can_focus">True</property>
-			  <property name="hscrollbar_policy">GTK_POLICY_AUTOMATIC</property>
-			  <property name="vscrollbar_policy">GTK_POLICY_AUTOMATIC</property>
-			  <property name="shadow_type">GTK_SHADOW_IN</property>
-			  <property name="window_placement">GTK_CORNER_TOP_LEFT</property>
-
-			  <child>
-			    <widget class="GtkTextView" id="textview-work-address">
-			      <property name="visible">True</property>
-			      <property name="can_focus">True</property>
-			      <property name="editable">True</property>
-			      <property name="overwrite">False</property>
-			      <property name="accepts_tab">True</property>
-			      <property name="justification">GTK_JUSTIFY_LEFT</property>
-			      <property name="wrap_mode">GTK_WRAP_NONE</property>
-			      <property name="cursor_visible">True</property>
-			      <property name="pixels_above_lines">0</property>
-			      <property name="pixels_below_lines">0</property>
-			      <property name="pixels_inside_wrap">0</property>
-			      <property name="left_margin">0</property>
-			      <property name="right_margin">0</property>
-			      <property name="indent">0</property>
-			      <property name="text" translatable="yes"></property>
-			      <accessibility>
-				<atkrelation target="label-work-address" type="labelled-by"/>
-			      </accessibility>
-			    </widget>
-			  </child>
-			</widget>
-			<packing>
-			  <property name="left_attach">1</property>
-			  <property name="right_attach">2</property>
-			  <property name="top_attach">0</property>
-			  <property name="bottom_attach">3</property>
-			  <property name="y_options">fill</property>
-			</packing>
-		      </child>
-
-		      <child>
-			<widget class="GtkEntry" id="entry-work-pobox">
-			  <property name="visible">True</property>
-			  <property name="can_focus">True</property>
-			  <property name="editable">True</property>
-			  <property name="visibility">True</property>
-			  <property name="max_length">0</property>
-			  <property name="text" translatable="yes"></property>
-			  <property name="has_frame">True</property>
-			  <property name="invisible_char" translatable="yes">*</property>
-			  <property name="activates_default">False</property>
-			  <accessibility>
-			    <atkrelation target="label-work-pobox" type="labelled-by"/>
-			  </accessibility>
-			</widget>
-			<packing>
-			  <property name="left_attach">1</property>
-			  <property name="right_attach">2</property>
-			  <property name="top_attach">3</property>
-			  <property name="bottom_attach">4</property>
-			  <property name="y_options"></property>
-			</packing>
-		      </child>
-
-		      <child>
-			<widget class="GtkLabel" id="label-work-pobox">
-			  <property name="visible">True</property>
-			  <property name="label" translatable="yes">_PO Box:</property>
-			  <property name="use_underline">True</property>
-			  <property name="use_markup">False</property>
-			  <property name="justify">GTK_JUSTIFY_LEFT</property>
-			  <property name="wrap">False</property>
-			  <property name="selectable">False</property>
-			  <property name="xalign">1</property>
-			  <property name="yalign">0.5</property>
-			  <property name="xpad">0</property>
-			  <property name="ypad">0</property>
-			  <property name="mnemonic_widget">entry-work-pobox</property>
-			</widget>
-			<packing>
-			  <property name="left_attach">0</property>
-			  <property name="right_attach">1</property>
-			  <property name="top_attach">3</property>
-			  <property name="bottom_attach">4</property>
-			  <property name="x_options">fill</property>
-			  <property name="y_options"></property>
-			</packing>
-		      </child>
-		    </widget>
-		  </child>
-
-		  <child>
-		    <widget class="GtkLabel" id="label436">
-		      <property name="visible">True</property>
-		      <property name="label" translatable="yes">&lt;b&gt;Work&lt;/b&gt;</property>
-		      <property name="use_underline">False</property>
-		      <property name="use_markup">True</property>
-		      <property name="justify">GTK_JUSTIFY_LEFT</property>
-		      <property name="wrap">False</property>
-		      <property name="selectable">False</property>
-		      <property name="xalign">0.5</property>
-		      <property name="yalign">0.5</property>
-		      <property name="xpad">0</property>
-		      <property name="ypad">0</property>
-		    </widget>
-		    <packing>
-		      <property name="type">label_item</property>
-		    </packing>
-		  </child>
-		</widget>
-		<packing>
-		  <property name="padding">0</property>
-		  <property name="expand">False</property>
-		  <property name="fill">True</property>
-		</packing>
-	      </child>
-
-	      <child>
-		<widget class="GtkFrame" id="frame72">
-		  <property name="visible">True</property>
-		  <property name="label_xalign">0</property>
-		  <property name="label_yalign">0.5</property>
-		  <property name="shadow_type">GTK_SHADOW_NONE</property>
-
-		  <child>
-		    <widget class="GtkTable" id="table92">
-		      <property name="border_width">12</property>
-		      <property name="visible">True</property>
-		      <property name="n_rows">4</property>
-		      <property name="n_columns">4</property>
-		      <property name="homogeneous">False</property>
-		      <property name="row_spacing">6</property>
-		      <property name="column_spacing">6</property>
-
-		      <child>
-			<widget class="GtkLabel" id="label-other-city">
-			  <property name="visible">True</property>
-			  <property name="label" translatable="yes">_City:</property>
-			  <property name="use_underline">True</property>
-			  <property name="use_markup">False</property>
-			  <property name="justify">GTK_JUSTIFY_LEFT</property>
-			  <property name="wrap">False</property>
-			  <property name="selectable">False</property>
-			  <property name="xalign">1</property>
-			  <property name="yalign">0.5</property>
-			  <property name="xpad">0</property>
-			  <property name="ypad">0</property>
-			  <property name="mnemonic_widget">entry-other-city</property>
-			</widget>
-			<packing>
-			  <property name="left_attach">2</property>
-			  <property name="right_attach">3</property>
-			  <property name="top_attach">0</property>
-			  <property name="bottom_attach">1</property>
-			  <property name="x_options">fill</property>
-			  <property name="y_options"></property>
-			</packing>
-		      </child>
-
-		      <child>
-			<widget class="GtkEntry" id="entry-other-city">
-			  <property name="visible">True</property>
-			  <property name="can_focus">True</property>
-			  <property name="editable">True</property>
-			  <property name="visibility">True</property>
-			  <property name="max_length">0</property>
-			  <property name="text" translatable="yes"></property>
-			  <property name="has_frame">True</property>
-			  <property name="invisible_char" translatable="yes">*</property>
-			  <property name="activates_default">False</property>
-			  <accessibility>
-			    <atkrelation target="label-other-city" type="labelled-by"/>
-			  </accessibility>
-			</widget>
-			<packing>
-			  <property name="left_attach">3</property>
-			  <property name="right_attach">4</property>
-			  <property name="top_attach">0</property>
-			  <property name="bottom_attach">1</property>
-			  <property name="y_options"></property>
-			</packing>
-		      </child>
-
-		      <child>
-			<widget class="GtkLabel" id="label-other-address">
-			  <property name="visible">True</property>
-			  <property name="label" translatable="yes">_Address:</property>
-			  <property name="use_underline">True</property>
-			  <property name="use_markup">False</property>
-			  <property name="justify">GTK_JUSTIFY_LEFT</property>
-			  <property name="wrap">False</property>
-			  <property name="selectable">False</property>
-			  <property name="xalign">1</property>
-			  <property name="yalign">0.5</property>
-			  <property name="xpad">0</property>
-			  <property name="ypad">0</property>
-			  <property name="mnemonic_widget">textview-other-address</property>
-			</widget>
-			<packing>
-			  <property name="left_attach">0</property>
-			  <property name="right_attach">1</property>
-			  <property name="top_attach">0</property>
-			  <property name="bottom_attach">1</property>
-			  <property name="x_options">fill</property>
-			  <property name="y_options"></property>
-			</packing>
-		      </child>
-
-		      <child>
-			<widget class="GtkEntry" id="entry-other-state">
-			  <property name="visible">True</property>
-			  <property name="can_focus">True</property>
-			  <property name="editable">True</property>
-			  <property name="visibility">True</property>
-			  <property name="max_length">0</property>
-			  <property name="text" translatable="yes"></property>
-			  <property name="has_frame">True</property>
-			  <property name="invisible_char" translatable="yes">*</property>
-			  <property name="activates_default">False</property>
-			  <accessibility>
-			    <atkrelation target="label-other-state" type="labelled-by"/>
-			  </accessibility>
-			</widget>
-			<packing>
-			  <property name="left_attach">3</property>
-			  <property name="right_attach">4</property>
-			  <property name="top_attach">2</property>
-			  <property name="bottom_attach">3</property>
-			  <property name="y_options"></property>
-			</packing>
-		      </child>
-
-		      <child>
-			<widget class="GtkLabel" id="label-other-state">
-			  <property name="visible">True</property>
-			  <property name="label" translatable="yes">_State/Province:</property>
-			  <property name="use_underline">True</property>
-			  <property name="use_markup">False</property>
-			  <property name="justify">GTK_JUSTIFY_LEFT</property>
-			  <property name="wrap">False</property>
-			  <property name="selectable">False</property>
-			  <property name="xalign">1</property>
-			  <property name="yalign">0.5</property>
-			  <property name="xpad">0</property>
-			  <property name="ypad">0</property>
-			  <property name="mnemonic_widget">entry-other-state</property>
-			</widget>
-			<packing>
-			  <property name="left_attach">2</property>
-			  <property name="right_attach">3</property>
-			  <property name="top_attach">2</property>
-			  <property name="bottom_attach">3</property>
-			  <property name="x_options">fill</property>
-			  <property name="y_options"></property>
-			</packing>
-		      </child>
-
-		      <child>
-			<widget class="GtkLabel" id="label-other-zip">
-			  <property name="visible">True</property>
-			  <property name="label" translatable="yes">_Zip/Postal Code:</property>
-			  <property name="use_underline">True</property>
-			  <property name="use_markup">False</property>
-			  <property name="justify">GTK_JUSTIFY_LEFT</property>
-			  <property name="wrap">False</property>
-			  <property name="selectable">False</property>
-			  <property name="xalign">0</property>
-			  <property name="yalign">0.5</property>
-			  <property name="xpad">0</property>
-			  <property name="ypad">0</property>
-			  <property name="mnemonic_widget">entry-other-zip</property>
-			</widget>
-			<packing>
-			  <property name="left_attach">2</property>
-			  <property name="right_attach">3</property>
-			  <property name="top_attach">1</property>
-			  <property name="bottom_attach">2</property>
-			  <property name="x_options">fill</property>
-			  <property name="y_options"></property>
-			</packing>
-		      </child>
-
-		      <child>
-			<widget class="GtkEntry" id="entry-other-zip">
-			  <property name="visible">True</property>
-			  <property name="can_focus">True</property>
-			  <property name="editable">True</property>
-			  <property name="visibility">True</property>
-			  <property name="max_length">0</property>
-			  <property name="text" translatable="yes"></property>
-			  <property name="has_frame">True</property>
-			  <property name="invisible_char" translatable="yes">*</property>
-			  <property name="activates_default">False</property>
-			  <accessibility>
-			    <atkrelation target="label-other-zip" type="labelled-by"/>
-			  </accessibility>
-			</widget>
-			<packing>
-			  <property name="left_attach">3</property>
-			  <property name="right_attach">4</property>
-			  <property name="top_attach">1</property>
-			  <property name="bottom_attach">2</property>
-			  <property name="y_options"></property>
-			</packing>
-		      </child>
-
-		      <child>
-			<widget class="GtkLabel" id="label-other-country">
-			  <property name="visible">True</property>
-			  <property name="label" translatable="yes">_Country:</property>
-			  <property name="use_underline">True</property>
-			  <property name="use_markup">False</property>
-			  <property name="justify">GTK_JUSTIFY_LEFT</property>
-			  <property name="wrap">False</property>
-			  <property name="selectable">False</property>
-			  <property name="xalign">1</property>
-			  <property name="yalign">0.5</property>
-			  <property name="xpad">0</property>
-			  <property name="ypad">0</property>
-			  <property name="mnemonic_widget">entry-other-country</property>
-			</widget>
-			<packing>
-			  <property name="left_attach">2</property>
-			  <property name="right_attach">3</property>
-			  <property name="top_attach">3</property>
-			  <property name="bottom_attach">4</property>
-			  <property name="x_options">fill</property>
-			  <property name="y_options"></property>
-			</packing>
-		      </child>
-
-		      <child>
-			<widget class="GtkEntry" id="entry-other-country">
-			  <property name="visible">True</property>
-			  <property name="can_focus">True</property>
-			  <property name="editable">True</property>
-			  <property name="visibility">True</property>
-			  <property name="max_length">0</property>
-			  <property name="text" translatable="yes"></property>
-			  <property name="has_frame">True</property>
-			  <property name="invisible_char" translatable="yes">*</property>
-			  <property name="activates_default">False</property>
-			  <accessibility>
-			    <atkrelation target="label-other-country" type="labelled-by"/>
-			  </accessibility>
-			</widget>
-			<packing>
-			  <property name="left_attach">3</property>
-			  <property name="right_attach">4</property>
-			  <property name="top_attach">3</property>
-			  <property name="bottom_attach">4</property>
-			  <property name="y_options"></property>
-			</packing>
-		      </child>
-
-		      <child>
-			<widget class="GtkScrolledWindow" id="scrolledwindow44">
-			  <property name="visible">True</property>
-			  <property name="can_focus">True</property>
-			  <property name="hscrollbar_policy">GTK_POLICY_AUTOMATIC</property>
-			  <property name="vscrollbar_policy">GTK_POLICY_AUTOMATIC</property>
-			  <property name="shadow_type">GTK_SHADOW_IN</property>
-			  <property name="window_placement">GTK_CORNER_TOP_LEFT</property>
-
-			  <child>
-			    <widget class="GtkTextView" id="textview-other-address">
-			      <property name="visible">True</property>
-			      <property name="can_focus">True</property>
-			      <property name="editable">True</property>
-			      <property name="overwrite">False</property>
-			      <property name="accepts_tab">True</property>
-			      <property name="justification">GTK_JUSTIFY_LEFT</property>
-			      <property name="wrap_mode">GTK_WRAP_NONE</property>
-			      <property name="cursor_visible">True</property>
-			      <property name="pixels_above_lines">0</property>
-			      <property name="pixels_below_lines">0</property>
-			      <property name="pixels_inside_wrap">0</property>
-			      <property name="left_margin">0</property>
-			      <property name="right_margin">0</property>
-			      <property name="indent">0</property>
-			      <property name="text" translatable="yes"></property>
-			      <accessibility>
-				<atkrelation target="label-other-address" type="labelled-by"/>
-			      </accessibility>
-			    </widget>
-			  </child>
-			</widget>
-			<packing>
-			  <property name="left_attach">1</property>
-			  <property name="right_attach">2</property>
-			  <property name="top_attach">0</property>
-			  <property name="bottom_attach">3</property>
-			  <property name="y_options">fill</property>
-			</packing>
-		      </child>
-
-		      <child>
-			<widget class="GtkEntry" id="entry-other-pobox">
-			  <property name="visible">True</property>
-			  <property name="can_focus">True</property>
-			  <property name="editable">True</property>
-			  <property name="visibility">True</property>
-			  <property name="max_length">0</property>
-			  <property name="text" translatable="yes"></property>
-			  <property name="has_frame">True</property>
-			  <property name="invisible_char" translatable="yes">*</property>
-			  <property name="activates_default">False</property>
-			  <accessibility>
-			    <atkrelation target="label-other-pobox" type="labelled-by"/>
-			  </accessibility>
-			</widget>
-			<packing>
-			  <property name="left_attach">1</property>
-			  <property name="right_attach">2</property>
-			  <property name="top_attach">3</property>
-			  <property name="bottom_attach">4</property>
-			  <property name="y_options"></property>
-			</packing>
-		      </child>
-
-		      <child>
-			<widget class="GtkLabel" id="label-other-pobox">
-			  <property name="visible">True</property>
-			  <property name="label" translatable="yes">_PO Box:</property>
-			  <property name="use_underline">True</property>
-			  <property name="use_markup">False</property>
-			  <property name="justify">GTK_JUSTIFY_LEFT</property>
-			  <property name="wrap">False</property>
-			  <property name="selectable">False</property>
-			  <property name="xalign">1</property>
-			  <property name="yalign">0.5</property>
-			  <property name="xpad">0</property>
-			  <property name="ypad">0</property>
-			  <property name="mnemonic_widget">entry-other-pobox</property>
-			</widget>
-			<packing>
-			  <property name="left_attach">0</property>
-			  <property name="right_attach">1</property>
-			  <property name="top_attach">3</property>
-			  <property name="bottom_attach">4</property>
-			  <property name="x_options">fill</property>
-			  <property name="y_options"></property>
-			</packing>
-		      </child>
-		    </widget>
-		  </child>
-
-		  <child>
-		    <widget class="GtkLabel" id="label444">
-		      <property name="visible">True</property>
-		      <property name="label" translatable="yes">&lt;b&gt;Other&lt;/b&gt;</property>
-		      <property name="use_underline">False</property>
-		      <property name="use_markup">True</property>
-		      <property name="justify">GTK_JUSTIFY_LEFT</property>
-		      <property name="wrap">False</property>
-		      <property name="selectable">False</property>
-		      <property name="xalign">0.5</property>
-		      <property name="yalign">0.5</property>
-		      <property name="xpad">0</property>
-		      <property name="ypad">0</property>
-		    </widget>
-		    <packing>
-		      <property name="type">label_item</property>
-		    </packing>
-		  </child>
-		</widget>
-		<packing>
-		  <property name="padding">0</property>
-		  <property name="expand">False</property>
-		  <property name="fill">False</property>
-		</packing>
-	      </child>
-	    </widget>
-	    <packing>
-	      <property name="tab_expand">False</property>
-	      <property name="tab_fill">True</property>
-	    </packing>
-	  </child>
-
-	  <child>
-	    <widget class="GtkLabel" id="label437">
-	      <property name="visible">True</property>
-	      <property name="label" translatable="yes">Mailing Address</property>
-	      <property name="use_underline">False</property>
-	      <property name="use_markup">False</property>
-	      <property name="justify">GTK_JUSTIFY_LEFT</property>
-	      <property name="wrap">False</property>
-	      <property name="selectable">False</property>
-	      <property name="xalign">0.5</property>
-	      <property name="yalign">0.5</property>
-	      <property name="xpad">0</property>
-	      <property name="ypad">0</property>
-	    </widget>
-	    <packing>
-	      <property name="type">tab</property>
-	    </packing>
-	  </child>
-	</widget>
-	<packing>
-	  <property name="padding">0</property>
-	  <property name="expand">True</property>
-	  <property name="fill">True</property>
-	</packing>
-      </child>
-    </widget>
-  </child>
-</widget>
-
-</glade-interface>
diff --git a/addressbook/gui/contact-editor/e-contact-editor-address.c b/addressbook/gui/contact-editor/e-contact-editor-address.c
deleted file mode 100644
index 1fc4994594..0000000000
--- a/addressbook/gui/contact-editor/e-contact-editor-address.c
+++ /dev/null
@@ -1,627 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-/* 
- * e-contact-editor-address.c
- * Copyright (C) 2000  Ximian, Inc.
- * Author: Chris Lahey <clahey@ximian.com>
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of version 2 of the GNU General Public
- * License as published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * General Public License for more details.
- *
- * You should have received a copy of the GNU General Public
- * License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
- */
-
-#include <config.h>
-
-#include <e-contact-editor-address.h>
-#include <e-util/e-icon-factory.h>
-
-#include <glib.h>
-#include <libgnome/gnome-i18n.h>
-#include <libgnome/gnome-util.h>
-#include <gal/widgets/e-gui-utils.h>
-#include <gtk/gtkcombo.h>
-#include <gtk/gtkentry.h>
-#include <gtk/gtkstock.h>
-#include <gtk/gtklabel.h>
-#include <string.h>
-#include <stdlib.h>
-#include <locale.h>
-
-static void e_contact_editor_address_init		(EContactEditorAddress		 *card);
-static void e_contact_editor_address_class_init	(EContactEditorAddressClass	 *klass);
-static void e_contact_editor_address_set_property (GObject *object, guint prop_id, const GValue *value, GParamSpec *pspec);
-static void e_contact_editor_address_get_property (GObject *object, guint prop_id, GValue *value, GParamSpec *pspec);
-static void e_contact_editor_address_dispose (GObject *object);
-
-static void fill_in_info(EContactEditorAddress *editor);
-static void extract_info(EContactEditorAddress *editor);
-
-static GtkDialogClass *parent_class = NULL;
-
-/* The arguments we take */
-enum {
-	PROP_0,
-	PROP_ADDRESS,
-	PROP_EDITABLE
-};
-
-GType
-e_contact_editor_address_get_type (void)
-{
-	static GType contact_editor_address_type = 0;
-
-	if (!contact_editor_address_type) {
-		static const GTypeInfo contact_editor_address_info =  {
-			sizeof (EContactEditorAddressClass),
-			NULL,           /* base_init */
-			NULL,           /* base_finalize */
-			(GClassInitFunc) e_contact_editor_address_class_init,
-			NULL,           /* class_finalize */
-			NULL,           /* class_data */
-			sizeof (EContactEditorAddress),
-			0,             /* n_preallocs */
-			(GInstanceInitFunc) e_contact_editor_address_init,
-		};
-
-		contact_editor_address_type = g_type_register_static (GTK_TYPE_DIALOG, "EContactEditorAddress", &contact_editor_address_info, 0);
-	}
-
-	return contact_editor_address_type;
-}
-
-static void
-e_contact_editor_address_class_init (EContactEditorAddressClass *klass)
-{
-	GObjectClass *object_class;
-
-	object_class = G_OBJECT_CLASS (klass);
-
-	parent_class = g_type_class_ref (GTK_TYPE_DIALOG);
-
-	object_class->set_property = e_contact_editor_address_set_property;
-	object_class->get_property = e_contact_editor_address_get_property;
-	object_class->dispose = e_contact_editor_address_dispose;
-
-	g_object_class_install_property (object_class, PROP_ADDRESS, 
-					 g_param_spec_boxed ("address",
-							     _("Address"),
-							     /*_( */"XXX blurb" /*)*/,
-							     e_contact_address_get_type (),
-							     G_PARAM_READWRITE));
-
-	g_object_class_install_property (object_class, PROP_EDITABLE, 
-					 g_param_spec_boolean ("editable",
-							       _("Editable"),
-							       /*_( */"XXX blurb" /*)*/,
-							       FALSE,
-							       G_PARAM_READWRITE));
-}
-
-static GList *
-add_to_tab_order(GList *list, GladeXML *gui, char *name)
-{
-	GtkWidget *widget = glade_xml_get_widget(gui, name);
-	return g_list_prepend(list, widget);
-}
-
-static void
-setup_tab_order(GladeXML *gui)
-{
-	GtkWidget *container;
-	GList *list = NULL;
-
-	container = glade_xml_get_widget(gui, "table-checkaddress");
-
-	if (container) {
-		list = add_to_tab_order(list, gui, "entry-city");
-		list = add_to_tab_order(list, gui, "entry-region");
-		list = add_to_tab_order(list, gui, "entry-code");
-		list = add_to_tab_order(list, gui, "combo-country");
-		list = g_list_reverse(list);
-		e_container_change_tab_order(GTK_CONTAINER(container), list);
-		g_list_free(list);
-	}
-}
-
-static char * countries [] = {
-	N_("United States"),
-	N_("Afghanistan"),
-	N_("Albania"),
-	N_("Algeria"),
-	N_("American Samoa"),
-	N_("Andorra"),
-	N_("Angola"),
-	N_("Anguilla"),
-	N_("Antarctica"),
-	N_("Antigua And Barbuda"),
-	N_("Argentina"),
-	N_("Armenia"),
-	N_("Aruba"),
-	N_("Australia"),
-	N_("Austria"),
-	N_("Azerbaijan"),
-	N_("Bahamas"),
-	N_("Bahrain"),
-	N_("Bangladesh"),
-	N_("Barbados"),
-	N_("Belarus"),
-	N_("Belgium"),
-	N_("Belize"),
-	N_("Benin"),
-	N_("Bermuda"),
-	N_("Bhutan"),
-	N_("Bolivia"),
-	N_("Bosnia And Herzegowina"),
-	N_("Botswana"),
-	N_("Bouvet Island"),
-	N_("Brazil"),
-	N_("British Indian Ocean Territory"),
-	N_("Brunei Darussalam"),
-	N_("Bulgaria"),
-	N_("Burkina Faso"),
-	N_("Burundi"),
-	N_("Cambodia"),
-	N_("Cameroon"),
-	N_("Canada"),
-	N_("Cape Verde"),
-	N_("Cayman Islands"),
-	N_("Central African Republic"),
-	N_("Chad"),
-	N_("Chile"),
-	N_("China"),
-	N_("Christmas Island"),
-	N_("Cocos (Keeling) Islands"),
-	N_("Colombia"),
-	N_("Comoros"),
-	N_("Congo"),
-	N_("Congo, The Democratic Republic Of The"),
-	N_("Cook Islands"),
-	N_("Costa Rica"),
-	N_("Cote d'Ivoire"),
-	N_("Croatia"),
-	N_("Cuba"),
-	N_("Cyprus"),
-	N_("Czech Republic"),
-	N_("Denmark"),
-	N_("Djibouti"),
-	N_("Dominica"),
-	N_("Dominican Republic"),
-	N_("Ecuador"),
-	N_("Egypt"),
-	N_("El Salvador"),
-	N_("Equatorial Guinea"),
-	N_("Eritrea"),
-	N_("Estonia"),
-	N_("Ethiopia"),
-	N_("Falkland Islands"),
-	N_("Faroe Islands"),
-	N_("Fiji"),
-	N_("Finland"),
-	N_("France"),
-	N_("French Guiana"),
-	N_("French Polynesia"),
-	N_("French Southern Territories"),
-	N_("Gabon"),
-	N_("Gambia"),
-	N_("Georgia"),
-	N_("Germany"),
-	N_("Ghana"),
-	N_("Gibraltar"),
-	N_("Greece"),
-	N_("Greenland"),
-	N_("Grenada"),
-	N_("Guadeloupe"),
-	N_("Guam"),
-	N_("Guatemala"),
-	N_("Guernsey"),
-	N_("Guinea"),
-	N_("Guinea-bissau"),
-	N_("Guyana"),
-	N_("Haiti"),
-	N_("Heard And McDonald Islands"),
-	N_("Holy See"),
-	N_("Honduras"),
-	N_("Hong Kong"),
-	N_("Hungary"),
-	N_("Iceland"),
-	N_("India"),
-	N_("Indonesia"),
-	N_("Iran"),
-	N_("Iraq"),
-	N_("Ireland"),
-	N_("Isle of Man"),
-	N_("Israel"),
-	N_("Italy"),
-	N_("Jamaica"),
-	N_("Japan"),
-	N_("Jersey"),
-	N_("Jordan"),
-	N_("Kazakhstan"),
-	N_("Kenya"),
-	N_("Kiribati"),
-	N_("Korea, Democratic People's Republic Of"),
-	N_("Korea, Republic Of"),
-	N_("Kuwait"),
-	N_("Kyrgyzstan"),
-	N_("Laos"),
-	N_("Latvia"),
-	N_("Lebanon"),
-	N_("Lesotho"),
-	N_("Liberia"),
-	N_("Libya"),
-	N_("Liechtenstein"),
-	N_("Lithuania"),
-	N_("Luxembourg"),
-	N_("Macao"),
-	N_("Macedonia"),
-	N_("Madagascar"),
-	N_("Malawi"),
-	N_("Malaysia"),
-	N_("Maldives"),
-	N_("Mali"),
-	N_("Malta"),
-	N_("Marshall Islands"),
-	N_("Martinique"),
-	N_("Mauritania"),
-	N_("Mauritius"),
-	N_("Mayotte"),
-	N_("Mexico"),
-	N_("Micronesia"),
-	N_("Moldova, Republic Of"),
-	N_("Monaco"),
-	N_("Mongolia"),
-	N_("Montserrat"),
-	N_("Morocco"),
-	N_("Mozambique"),
-	N_("Myanmar"),
-	N_("Namibia"),
-	N_("Nauru"),
-	N_("Nepal"),
-	N_("Netherlands"),
-	N_("Netherlands Antilles"),
-	N_("New Caledonia"),
-	N_("New Zealand"),
-	N_("Nicaragua"),
-	N_("Niger"),
-	N_("Nigeria"),
-	N_("Niue"),
-	N_("Norfolk Island"),
-	N_("Northern Mariana Islands"),
-	N_("Norway"),
-	N_("Oman"),
-	N_("Pakistan"),
-	N_("Palau"),
-	N_("Palestinian Territory"),
-	N_("Panama"),
-	N_("Papua New Guinea"),
-	N_("Paraguay"),
-	N_("Peru"),
-	N_("Philippines"),
-	N_("Pitcairn"),
-	N_("Poland"),
-	N_("Portugal"),
-	N_("Puerto Rico"),
-	N_("Qatar"),
-	N_("Reunion"),
-	N_("Romania"),
-	N_("Russian Federation"),
-	N_("Rwanda"),
-	N_("Saint Kitts And Nevis"),
-	N_("Saint Lucia"),
-	N_("Saint Vincent And The Grenadines"),
-	N_("Samoa"),
-	N_("San Marino"),
-	N_("Sao Tome And Principe"),
-	N_("Saudi Arabia"),
-	N_("Senegal"),
-	N_("Serbia And Montenegro"),
-	N_("Seychelles"),
-	N_("Sierra Leone"),
-	N_("Singapore"),
-	N_("Slovakia"),
-	N_("Slovenia"),
-	N_("Solomon Islands"),
-	N_("Somalia"),
-	N_("South Africa"),
-	N_("South Georgia And The South Sandwich Islands"),
-	N_("Spain"),
-	N_("Sri Lanka"),
-	N_("St. Helena"),
-	N_("St. Pierre And Miquelon"),
-	N_("Sudan"),
-	N_("Suriname"),
-	N_("Svalbard And Jan Mayen Islands"),
-	N_("Swaziland"),
-	N_("Sweden"),
-	N_("Switzerland"),
-	N_("Syria"),
-	N_("Taiwan"),
-	N_("Tajikistan"),
-	N_("Tanzania, United Republic Of"),
-	N_("Thailand"),
-	N_("Timor-Leste"),
-	N_("Togo"),
-	N_("Tokelau"),
-	N_("Tonga"),
-	N_("Trinidad And Tobago"),
-	N_("Tunisia"),
-	N_("Turkey"),
-	N_("Turkmenistan"),
-	N_("Turks And Caicos Islands"),
-	N_("Tuvalu"),
-	N_("Uganda"),
-	N_("Ukraine"),
-	N_("United Arab Emirates"),
-	N_("United Kingdom"),
-	N_("United States Minor Outlying Islands"),
-	N_("Uruguay"),
-	N_("Uzbekistan"),
-	N_("Vanuatu"),
-	N_("Venezuela"),
-	N_("Viet Nam"),
-	N_("Virgin Islands, British"),
-	N_("Virgin Islands, U.S."),
-	N_("Wallis And Futuna Islands"),
-	N_("Western Sahara"),
-	N_("Yemen"),
-	N_("Zambia"),
-	N_("Zimbabwe"),
-	NULL
-};
-
-static int
-compare_func (const void *voida, const void *voidb)
-{
-	char * const *stringa = voida, * const *stringb = voidb;
-
-	return strcoll (*stringa, *stringb);
-}
-
-static void
-fill_in_countries (GladeXML *gui)
-{
-	GtkCombo *combo;
-	combo = (GtkCombo *) glade_xml_get_widget(gui, "combo-country");
-	if (combo && GTK_IS_COMBO (combo)) {
-		static gboolean sorted = FALSE;
-		static GList *country_list;
-		if (!sorted) {
-			int i;
-			char *locale;
-
-			for (i = 0; countries[i]; i++) {
-				countries[i] = _(countries[i]);
-			}
-
-			locale = setlocale (LC_COLLATE, NULL);
-			qsort (countries + 1, i - 1, sizeof (countries[0]), compare_func);
-			country_list = NULL;
-			for (i = 0; countries[i]; i++) {
-				country_list = g_list_prepend (country_list, countries[i]);
-			}
-			country_list = g_list_reverse (country_list);
-			sorted = TRUE;
-		}
-		gtk_combo_set_popdown_strings (combo, country_list);
-	}
-}
-
-static void
-e_contact_editor_address_init (EContactEditorAddress *e_contact_editor_address)
-{
-	GladeXML *gui;
-	GtkWidget *widget;
-	GList *icon_list;
-
-	gtk_dialog_add_buttons (GTK_DIALOG (e_contact_editor_address),
-				GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL,
-				GTK_STOCK_OK, GTK_RESPONSE_OK,
-				NULL);
-
-	gtk_window_set_resizable(GTK_WINDOW(e_contact_editor_address), TRUE);
-
-	e_contact_editor_address->address = NULL;
-
-	gui = glade_xml_new (EVOLUTION_GLADEDIR "/fulladdr.glade", NULL, NULL);
-	e_contact_editor_address->gui = gui;
-
-	setup_tab_order (gui);
-	fill_in_countries (gui);
-
-	widget = glade_xml_get_widget(gui, "dialog-checkaddress");
-	gtk_window_set_title (GTK_WINDOW (e_contact_editor_address),
-			      GTK_WINDOW (widget)->title);
-
-	widget = glade_xml_get_widget(gui, "table-checkaddress");
-	g_object_ref(widget);
-	gtk_container_remove(GTK_CONTAINER(widget->parent), widget);
-	gtk_box_pack_start (GTK_BOX (GTK_DIALOG (e_contact_editor_address)->vbox), widget, TRUE, TRUE, 0);
-	g_object_unref(widget);
-
-	icon_list = e_icon_factory_get_icon_list ("stock_contact");
-	if (icon_list) {
-		gtk_window_set_icon_list (GTK_WINDOW (e_contact_editor_address), icon_list);
-		g_list_foreach (icon_list, (GFunc) g_object_unref, NULL);
-		g_list_free (icon_list);
-	}
-}
-
-void
-e_contact_editor_address_dispose (GObject *object)
-{
-	EContactEditorAddress *e_contact_editor_address = E_CONTACT_EDITOR_ADDRESS(object);
-
-	if (e_contact_editor_address->gui) {
-		g_object_unref(e_contact_editor_address->gui);
-		e_contact_editor_address->gui = NULL;
-	}
-
-	if (e_contact_editor_address->address) {
-		e_contact_address_free (e_contact_editor_address->address);
-		e_contact_editor_address->address = NULL;
-	}
-
-	if (G_OBJECT_CLASS (parent_class)->dispose)
-		(* G_OBJECT_CLASS (parent_class)->dispose) (object);
-}
-
-GtkWidget*
-e_contact_editor_address_new (const EContactAddress *address)
-{
-	GtkWidget *widget = g_object_new (E_TYPE_CONTACT_EDITOR_ADDRESS, NULL);
-
-	g_object_set (widget,
-		      "address", address,
-		      NULL);
-
-	return widget;
-}
-
-static void
-e_contact_editor_address_set_property (GObject *object, guint prop_id,
-				       const GValue *value, GParamSpec *pspec)
-{
-	EContactEditorAddress *e_contact_editor_address;
-
-	e_contact_editor_address = E_CONTACT_EDITOR_ADDRESS (object);
-	
-	switch (prop_id){
-	case PROP_ADDRESS:
-		if (e_contact_editor_address->address)
-			g_boxed_free (e_contact_address_get_type (), e_contact_editor_address->address);
-
-		e_contact_editor_address->address = g_value_dup_boxed (value);
-		fill_in_info (e_contact_editor_address);
-		break;
-	case PROP_EDITABLE: {
-		int i;
-		char *widget_names[] = {
-			"entry-street",
-			"entry-city",
-			"entry-ext",
-			"entry-po",
-			"entry-region",
-			"combo-country",
-			"entry-code",
-			"label-street",
-			"label-city",
-			"label-ext",
-			"label-po",
-			"label-region",
-			"label-country",
-			"label-code",
-			NULL
-		};
-		e_contact_editor_address->editable = g_value_get_boolean (value) ? TRUE : FALSE;
-		for (i = 0; widget_names[i] != NULL; i ++) {
-			GtkWidget *w = glade_xml_get_widget(e_contact_editor_address->gui, widget_names[i]);
-			if (GTK_IS_ENTRY (w)) {
-				gtk_editable_set_editable (GTK_EDITABLE (w),
-							   e_contact_editor_address->editable);
-			}
-			else if (GTK_IS_COMBO (w)) {
-				gtk_editable_set_editable (GTK_EDITABLE (GTK_COMBO (w)->entry),
-							   e_contact_editor_address->editable);
-				gtk_widget_set_sensitive (GTK_COMBO (w)->button, e_contact_editor_address->editable);
-			}
-			else if (GTK_IS_LABEL (w)) {
-				gtk_widget_set_sensitive (w, e_contact_editor_address->editable);
-			}
-		}
-		break;
-	}
-	default:
-		G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
-		break;
-	}
-}
-
-static void
-e_contact_editor_address_get_property (GObject *object, guint prop_id,
-				       GValue *value, GParamSpec *pspec)
-{
-	EContactEditorAddress *e_contact_editor_address;
-
-	e_contact_editor_address = E_CONTACT_EDITOR_ADDRESS (object);
-
-	switch (prop_id) {
-	case PROP_ADDRESS:
-		extract_info (e_contact_editor_address);
-		g_value_set_static_boxed (value, e_contact_editor_address->address);
-		break;
-	case PROP_EDITABLE:
-		g_value_set_boolean (value, e_contact_editor_address->editable ? TRUE : FALSE);
-		break;
-	default:
-		G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
-		break;
-	}
-}
-
-static void
-fill_in_field(EContactEditorAddress *editor, char *field, char *string)
-{
-	GtkEntry *entry = GTK_ENTRY(glade_xml_get_widget(editor->gui, field));
-	if (entry) {
-		if (string)
-			gtk_entry_set_text(entry, string);
-		else
-			gtk_entry_set_text(entry, "");
-	}
-}
-
-static void
-fill_in_info(EContactEditorAddress *editor)
-{
-	EContactAddress *address = editor->address;
-
-	if (address) {
-		fill_in_field (editor, "entry-street" , address->street  );
-		fill_in_field (editor, "entry-po"     , address->po      );
-		fill_in_field (editor, "entry-ext"    , address->ext     );
-		fill_in_field (editor, "entry-city"   , address->locality);
-		fill_in_field (editor, "entry-region" , address->region  );
-		fill_in_field (editor, "entry-code"   , address->code    );
-		fill_in_field (editor, "entry-country", address->country );
-	}
-}
-
-static char *
-extract_field(EContactEditorAddress *editor, char *field)
-{
-	GtkEntry *entry = GTK_ENTRY(glade_xml_get_widget(editor->gui, field));
-	if (entry)
-		return g_strdup (gtk_entry_get_text(entry));
-	else
-		return NULL;
-}
-
-static void
-extract_info(EContactEditorAddress *editor)
-{
-	EContactAddress *address = editor->address;
-
-	if (address) {
-		g_boxed_free (e_contact_address_get_type (), address);
-	}
-
-	address = g_new0 (EContactAddress, 1);
-	editor->address = address;
-
-	address->street   = extract_field(editor, "entry-street" );
-	address->po       = extract_field(editor, "entry-po"     );
-	address->ext      = extract_field(editor, "entry-ext"    );
-	address->locality = extract_field(editor, "entry-city"   );
-	address->region   = extract_field(editor, "entry-region" );
-	address->code     = extract_field(editor, "entry-code"   );
-	address->country  = extract_field(editor, "entry-country");
-}
diff --git a/addressbook/gui/contact-editor/e-contact-editor-address.h b/addressbook/gui/contact-editor/e-contact-editor-address.h
deleted file mode 100644
index 30fefa0e56..0000000000
--- a/addressbook/gui/contact-editor/e-contact-editor-address.h
+++ /dev/null
@@ -1,71 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-/* e-contact-editor-address.h
- * Copyright (C) 2000  Ximian, Inc.
- * Author: Chris Lahey <clahey@ximian.com>
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of version 2 of the GNU General Public
- * License as published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * General Public License for more details.
- *
- * You should have received a copy of the GNU General Public
- * License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
- */
-#ifndef __E_CONTACT_EDITOR_ADDRESS_H__
-#define __E_CONTACT_EDITOR_ADDRESS_H__
-
-#include <gtk/gtkdialog.h>
-#include <glade/glade.h>
-#include <libebook/e-contact.h>
-
-G_BEGIN_DECLS
-
-/* EContactEditorAddress - A dialog displaying information about a contact.
- *
- * The following arguments are available:
- *
- * name		type		read/write	description
- * --------------------------------------------------------------------------------
- * name         ECardName *     RW              The card currently being edited. Returns a copy.
- */
-
-#define E_TYPE_CONTACT_EDITOR_ADDRESS			(e_contact_editor_address_get_type ())
-#define E_CONTACT_EDITOR_ADDRESS(obj)			(G_TYPE_CHECK_INSTANCE_CAST ((obj), E_TYPE_CONTACT_EDITOR_ADDRESS, EContactEditorAddress))
-#define E_CONTACT_EDITOR_ADDRESS_CLASS(klass)		(G_TYPE_CHECK_CLASS_CAST ((klass), E_TYPE_CONTACT_EDITOR_ADDRESS, EContactEditorAddressClass))
-#define E_IS_CONTACT_EDITOR_ADDRESS(obj)		(G_TYPE_CHECK_INSTANCE_TYPE ((obj), E_TYPE_CONTACT_EDITOR_ADDRESS))
-#define E_IS_CONTACT_EDITOR_ADDRESS_CLASS(klass)	(G_TYPE_CHECK_CLASS_TYPE ((obj), E_TYPE_CONTACT_EDITOR_ADDRESS))
-
-
-typedef struct _EContactEditorAddress       EContactEditorAddress;
-typedef struct _EContactEditorAddressClass  EContactEditorAddressClass;
-
-struct _EContactEditorAddress
-{
-	GtkDialog parent;
-
-	/* item specific fields */
-	EContactAddress *address;
-
-	guint editable : 1;
-
-	GladeXML *gui;
-};
-
-struct _EContactEditorAddressClass
-{
-	GtkDialogClass parent_class;
-};
-
-
-GtkWidget *e_contact_editor_address_new      (const EContactAddress *address);
-GType      e_contact_editor_address_get_type (void);
-
-G_END_DECLS
-
-#endif /* __E_CONTACT_EDITOR_ADDRESS_H__ */
diff --git a/addressbook/gui/contact-editor/e-contact-editor-fullname.c b/addressbook/gui/contact-editor/e-contact-editor-fullname.c
deleted file mode 100644
index 1847a463f1..0000000000
--- a/addressbook/gui/contact-editor/e-contact-editor-fullname.c
+++ /dev/null
@@ -1,303 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-/* 
- * eab-contact-editor-phones.c
- * Copyright (C) 2003  Ximian, Inc.
- * Author: Chris Toshok <toshok@ximian.com>
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of version 2 of the GNU General Public
- * License as published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * General Public License for more details.
- *
- * You should have received a copy of the GNU General Public
- * License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
- */
-
-#include <config.h>
-#include "e-contact-editor-fullname.h"
-#include <e-util/e-icon-factory.h>
-#include <libgnome/gnome-util.h>
-#include <libgnome/gnome-i18n.h>
-#include <gtk/gtkcombo.h>
-#include <gtk/gtkstock.h>
-#include <gtk/gtkentry.h>
-#include <gtk/gtklabel.h>
-
-static void e_contact_editor_fullname_init		(EContactEditorFullname		 *card);
-static void e_contact_editor_fullname_class_init	(EContactEditorFullnameClass	 *klass);
-static void e_contact_editor_fullname_set_property (GObject *object, guint prop_id, const GValue *value, GParamSpec *pspec);
-static void e_contact_editor_fullname_get_property (GObject *object, guint prop_id, GValue *value, GParamSpec *pspec);
-static void e_contact_editor_fullname_dispose (GObject *object);
-
-static void fill_in_info(EContactEditorFullname *editor);
-static void extract_info(EContactEditorFullname *editor);
-
-static GtkDialogClass *parent_class = NULL;
-
-/* The arguments we take */
-enum {
-	PROP_0,
-	PROP_NAME,
-	PROP_EDITABLE
-};
-
-GType
-e_contact_editor_fullname_get_type (void)
-{
-	static GType contact_editor_fullname_type = 0;
-
-	if (!contact_editor_fullname_type) {
-		static const GTypeInfo contact_editor_fullname_info =  {
-			sizeof (EContactEditorFullnameClass),
-			NULL,           /* base_init */
-			NULL,           /* base_finalize */
-			(GClassInitFunc) e_contact_editor_fullname_class_init,
-			NULL,           /* class_finalize */
-			NULL,           /* class_data */
-			sizeof (EContactEditorFullname),
-			0,             /* n_preallocs */
-			(GInstanceInitFunc) e_contact_editor_fullname_init,
-		};
-
-		contact_editor_fullname_type = g_type_register_static (GTK_TYPE_DIALOG, "EContactEditorFullname", &contact_editor_fullname_info, 0);
-	}
-
-	return contact_editor_fullname_type;
-}
-
-static void
-e_contact_editor_fullname_class_init (EContactEditorFullnameClass *klass)
-{
-	GObjectClass *object_class;
-
-	object_class = G_OBJECT_CLASS (klass);
-
-	parent_class = g_type_class_ref (GTK_TYPE_DIALOG);
-
-	object_class->set_property = e_contact_editor_fullname_set_property;
-	object_class->get_property = e_contact_editor_fullname_get_property;
-	object_class->dispose = e_contact_editor_fullname_dispose;
-
-	g_object_class_install_property (object_class, PROP_NAME, 
-					 g_param_spec_pointer ("name",
-							       _("Name"),
-							       /*_( */"XXX blurb" /*)*/,
-							       G_PARAM_READWRITE));
-
-	g_object_class_install_property (object_class, PROP_EDITABLE, 
-					 g_param_spec_boolean ("editable",
-							       _("Editable"),
-							       /*_( */"XXX blurb" /*)*/,
-							       FALSE,
-							       G_PARAM_READWRITE));
-}
-
-static void
-e_contact_editor_fullname_init (EContactEditorFullname *e_contact_editor_fullname)
-{
-	GladeXML *gui;
-	GtkWidget *widget;
-	GList *icon_list;
-
-	gtk_widget_realize (GTK_WIDGET (e_contact_editor_fullname));
-	gtk_dialog_set_has_separator (GTK_DIALOG (e_contact_editor_fullname),
-				      FALSE);
-	gtk_container_set_border_width (GTK_CONTAINER (GTK_DIALOG (e_contact_editor_fullname)->vbox), 0);
-	gtk_container_set_border_width (GTK_CONTAINER (GTK_DIALOG (e_contact_editor_fullname)->action_area), 12);
-
-	gtk_dialog_add_buttons (GTK_DIALOG (e_contact_editor_fullname),
-				GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL,
-				GTK_STOCK_OK, GTK_RESPONSE_OK,
-				NULL);
-
-	gtk_window_set_resizable(GTK_WINDOW(e_contact_editor_fullname), TRUE);
-
-	e_contact_editor_fullname->name = NULL;
-	gui = glade_xml_new (EVOLUTION_GLADEDIR "/fullname.glade", NULL, NULL);
-	e_contact_editor_fullname->gui = gui;
-
-	widget = glade_xml_get_widget(gui, "dialog-checkfullname");
-	gtk_window_set_title (GTK_WINDOW (e_contact_editor_fullname),
-			      GTK_WINDOW (widget)->title);
-
-	widget = glade_xml_get_widget(gui, "table-checkfullname");
-	g_object_ref(widget);
-	gtk_container_remove(GTK_CONTAINER(widget->parent), widget);
-	gtk_box_pack_start (GTK_BOX (GTK_DIALOG (e_contact_editor_fullname)->vbox), widget, TRUE, TRUE, 0);
-	g_object_unref(widget);
-
-	icon_list = e_icon_factory_get_icon_list ("stock_contact");
-	if (icon_list) {
-		gtk_window_set_icon_list (GTK_WINDOW (e_contact_editor_fullname), icon_list);
-		g_list_foreach (icon_list, (GFunc) g_object_unref, NULL);
-		g_list_free (icon_list);
-	}
-}
-
-void
-e_contact_editor_fullname_dispose (GObject *object)
-{
-	EContactEditorFullname *e_contact_editor_fullname = E_CONTACT_EDITOR_FULLNAME(object);
-
-	if (e_contact_editor_fullname->gui) {
-		g_object_unref(e_contact_editor_fullname->gui);
-		e_contact_editor_fullname->gui = NULL;
-	}
-	
-	if (e_contact_editor_fullname->name) {
-		e_contact_name_free(e_contact_editor_fullname->name);
-		e_contact_editor_fullname->name = NULL;
-	}
-
-	if (G_OBJECT_CLASS (parent_class)->dispose)
-		(* G_OBJECT_CLASS (parent_class)->dispose) (object);
-}
-
-GtkWidget*
-e_contact_editor_fullname_new (const EContactName *name)
-{
-	GtkWidget *widget = g_object_new (E_TYPE_CONTACT_EDITOR_FULLNAME, NULL);
-
-	g_object_set (widget,
-		      "name", name,
-		      NULL);
-	return widget;
-}
-
-static void
-e_contact_editor_fullname_set_property (GObject *object, guint prop_id,
-					const GValue *value, GParamSpec *pspec)
-{
-	EContactEditorFullname *e_contact_editor_fullname;
-
-	e_contact_editor_fullname = E_CONTACT_EDITOR_FULLNAME (object);
-	
-	switch (prop_id){
-	case PROP_NAME:
-		e_contact_name_free(e_contact_editor_fullname->name);
-
-		if (g_value_get_pointer (value) != NULL) {
-			e_contact_editor_fullname->name = e_contact_name_copy(g_value_get_pointer (value));
-			fill_in_info(e_contact_editor_fullname);
-		}
-		else {
-			e_contact_editor_fullname->name = NULL;
-		}
-		break;
-	case PROP_EDITABLE: {
-		int i;
-		char *widget_names[] = {
-			"combo-title",
-			"combo-suffix",
-			"entry-first",
-			"entry-middle",
-			"entry-last",
-			"label-title",
-			"label-suffix",
-			"label-first",
-			"label-middle",
-			"label-last",
-			NULL
-		};
-		e_contact_editor_fullname->editable = g_value_get_boolean (value) ? TRUE : FALSE;
-		for (i = 0; widget_names[i] != NULL; i ++) {
-			GtkWidget *w = glade_xml_get_widget(e_contact_editor_fullname->gui, widget_names[i]);
-			if (GTK_IS_ENTRY (w)) {
-				gtk_editable_set_editable (GTK_EDITABLE (w),
-							   e_contact_editor_fullname->editable);
-			}
-			else if (GTK_IS_COMBO (w)) {
-				gtk_editable_set_editable (GTK_EDITABLE (GTK_COMBO (w)->entry),
-							   e_contact_editor_fullname->editable);
-				gtk_widget_set_sensitive (GTK_COMBO (w)->button, e_contact_editor_fullname->editable);
-			}
-			else if (GTK_IS_LABEL (w)) {
-				gtk_widget_set_sensitive (w, e_contact_editor_fullname->editable);
-			}
-		}
-		break;
-	}
-	default:
-		G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
-		break;
-	}
-}
-
-static void
-e_contact_editor_fullname_get_property (GObject *object, guint prop_id,
-					GValue *value, GParamSpec *pspec)
-{
-	EContactEditorFullname *e_contact_editor_fullname;
-
-	e_contact_editor_fullname = E_CONTACT_EDITOR_FULLNAME (object);
-
-	switch (prop_id) {
-	case PROP_NAME:
-		extract_info(e_contact_editor_fullname);
-		g_value_set_pointer (value, e_contact_name_copy(e_contact_editor_fullname->name));
-		break;
-	case PROP_EDITABLE:
-		g_value_set_boolean (value, e_contact_editor_fullname->editable ? TRUE : FALSE);
-		break;
-	default:
-		G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
-		break;
-	}
-}
-
-static void
-fill_in_field(EContactEditorFullname *editor, char *field, char *string)
-{
-	GtkEntry *entry = GTK_ENTRY(glade_xml_get_widget(editor->gui, field));
-	if (entry) {
-		if (string)
-			gtk_entry_set_text(entry, string);
-		else
-			gtk_entry_set_text(entry, "");
-	}
-}
-
-static void
-fill_in_info(EContactEditorFullname *editor)
-{
-	EContactName *name = editor->name;
-	if (name) {
-		fill_in_field(editor, "entry-title",  name->prefixes);
-		fill_in_field(editor, "entry-first",  name->given);
-		fill_in_field(editor, "entry-middle", name->additional);
-		fill_in_field(editor, "entry-last",   name->family);
-		fill_in_field(editor, "entry-suffix", name->suffixes);
-	}
-}
-
-static char *
-extract_field(EContactEditorFullname *editor, char *field)
-{
-	GtkEntry *entry = GTK_ENTRY(glade_xml_get_widget(editor->gui, field));
-	if (entry)
-		return g_strdup (gtk_entry_get_text(entry));
-	else
-		return NULL;
-}
-
-static void
-extract_info(EContactEditorFullname *editor)
-{
-	EContactName *name = editor->name;
-	if (!name) {
-		name = e_contact_name_new();
-		editor->name = name;
-	}
-
-	name->prefixes   = extract_field(editor, "entry-title" );
-	name->given      = extract_field(editor, "entry-first" );
-	name->additional = extract_field(editor, "entry-middle");
-	name->family     = extract_field(editor, "entry-last"  );
-	name->suffixes   = extract_field(editor, "entry-suffix");
-}
diff --git a/addressbook/gui/contact-editor/e-contact-editor-fullname.h b/addressbook/gui/contact-editor/e-contact-editor-fullname.h
deleted file mode 100644
index 0b254c789c..0000000000
--- a/addressbook/gui/contact-editor/e-contact-editor-fullname.h
+++ /dev/null
@@ -1,71 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-/* e-contact-editor-fullname.h
- * Copyright (C) 2000  Ximian, Inc.
- * Author: Chris Lahey <clahey@ximian.com>
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of version 2 of the GNU General Public
- * License as published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * General Public License for more details.
- *
- * You should have received a copy of the GNU General Public
- * License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
- */
-#ifndef __E_CONTACT_EDITOR_FULLNAME_H__
-#define __E_CONTACT_EDITOR_FULLNAME_H__
-
-#include <gtk/gtkdialog.h>
-#include <glade/glade.h>
-#include <libebook/e-contact.h>
-
-G_BEGIN_DECLS
-
-/* EContactEditorFullname - A dialog displaying information about a contact.
- *
- * The following arguments are available:
- *
- * name		type		read/write	description
- * --------------------------------------------------------------------------------
- * name         ECardName *     RW              The card currently being edited. Returns a copy.
- */
-
-#define E_TYPE_CONTACT_EDITOR_FULLNAME			(e_contact_editor_fullname_get_type ())
-#define E_CONTACT_EDITOR_FULLNAME(obj)			(G_TYPE_CHECK_INSTANCE_CAST ((obj), E_TYPE_CONTACT_EDITOR_FULLNAME, EContactEditorFullname))
-#define E_CONTACT_EDITOR_FULLNAME_CLASS(klass)		(G_TYPE_CHECK_CLASS_CAST ((klass), E_TYPE_CONTACT_EDITOR_FULLNAME, EContactEditorFullnameClass))
-#define E_IS_CONTACT_EDITOR_FULLNAME(obj)		(G_TYPE_CHECK_INSTANCE_TYPE ((obj), E_TYPE_CONTACT_EDITOR_FULLNAME))
-#define E_IS_CONTACT_EDITOR_FULLNAME_CLASS(klass)	(G_TYPE_CHECK_CLASS_TYPE ((obj), E_TYPE_CONTACT_EDITOR_FULLNAME))
-
-
-typedef struct _EContactEditorFullname       EContactEditorFullname;
-typedef struct _EContactEditorFullnameClass  EContactEditorFullnameClass;
-
-struct _EContactEditorFullname
-{
-	GtkDialog parent;
-	
-	/* item specific fields */
-	EContactName *name;
-	GladeXML *gui;
-
-	/* Whether the dialog will accept modifications */
-	guint editable : 1;
-};
-
-struct _EContactEditorFullnameClass
-{
-	GtkDialogClass parent_class;
-};
-
-
-GtkWidget *e_contact_editor_fullname_new(const EContactName *name);
-GType      e_contact_editor_fullname_get_type (void);
-
-G_END_DECLS
-
-#endif /* __E_CONTACT_EDITOR_FULLNAME_H__ */
diff --git a/addressbook/gui/contact-editor/e-contact-editor-im.c b/addressbook/gui/contact-editor/e-contact-editor-im.c
deleted file mode 100644
index 2c1c89af9a..0000000000
--- a/addressbook/gui/contact-editor/e-contact-editor-im.c
+++ /dev/null
@@ -1,481 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-/* 
- * e-contact-editor-im.c
- * Copyright (C) 2003  Ximian, Inc.
- * Author: Christian Hammond <chipx86@gnupdate.org>
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of version 2 of the GNU General Public
- * License as published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * General Public License for more details.
- *
- * You should have received a copy of the GNU General Public
- * License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
- */
-
-#include <config.h>
-#include "e-contact-editor-im.h"
-#include <libgnome/gnome-util.h>
-#include <libgnome/gnome-i18n.h>
-#include <gtk/gtkbox.h>
-#include <gtk/gtkentry.h>
-#include <gtk/gtkhbox.h>
-#include <gtk/gtkimage.h>
-#include <gtk/gtklabel.h>
-#include <gtk/gtkmenuitem.h>
-#include <gtk/gtkoptionmenu.h>
-#include <gtk/gtksizegroup.h>
-#include <gtk/gtkstock.h>
-#include <string.h>
-#include <e-util/e-icon-factory.h>
-
-static void e_contact_editor_im_init		(EContactEditorIm		 *card);
-static void e_contact_editor_im_class_init	(EContactEditorImClass	 *klass);
-static void e_contact_editor_im_set_property (GObject *object, guint prop_id, const GValue *value, GParamSpec *pspec);
-static void e_contact_editor_im_get_property (GObject *object, guint prop_id, GValue *value, GParamSpec *pspec);
-static void e_contact_editor_im_dispose (GObject *object);
-
-static void fill_in_info(EContactEditorIm *editor);
-static void extract_info(EContactEditorIm *editor);
-
-static GtkDialogClass *parent_class = NULL;
-
-/* The arguments we take */
-enum {
-	PROP_0,
-	PROP_SERVICE,
-	PROP_LOCATION,
-	PROP_USERNAME,
-	PROP_EDITABLE
-};
-
-#define FIRST_IM_TYPE E_CONTACT_IM_AIM
-#define LAST_IM_TYPE  E_CONTACT_IM_ICQ
-
-static const char *im_labels[] = {
-	N_("AOL Instant Messenger"),
-        N_("Novell Groupwise"),
-	N_("Jabber"),
-	N_("Yahoo Messenger"),
-	N_("MSN Messenger"),
-	N_("ICQ")
-};
-
-static const char *im_images[] = {
-	"im-aim",
-	"im-nov",
-	"im-jabber",
-	"im-yahoo",
-	"im-msn",
-	"im-icq"
-};
-
-GType
-e_contact_editor_im_get_type (void)
-{
-	static GType contact_editor_im_type = 0;
-
-	if (!contact_editor_im_type) {
-		static const GTypeInfo contact_editor_im_info =  {
-			sizeof (EContactEditorImClass),
-			NULL,           /* base_init */
-			NULL,           /* base_finalize */
-			(GClassInitFunc) e_contact_editor_im_class_init,
-			NULL,           /* class_finalize */
-			NULL,           /* class_data */
-			sizeof (EContactEditorIm),
-			0,             /* n_preallocs */
-			(GInstanceInitFunc) e_contact_editor_im_init,
-		};
-
-		contact_editor_im_type = g_type_register_static (GTK_TYPE_DIALOG, "EContactEditorIm", &contact_editor_im_info, 0);
-	}
-
-	return contact_editor_im_type;
-}
-
-static void
-e_contact_editor_im_class_init (EContactEditorImClass *klass)
-{
-	GObjectClass *object_class;
-
-	object_class = G_OBJECT_CLASS (klass);
-
-	parent_class = g_type_class_ref (GTK_TYPE_DIALOG);
-
-	object_class->set_property = e_contact_editor_im_set_property;
-	object_class->get_property = e_contact_editor_im_get_property;
-	object_class->dispose = e_contact_editor_im_dispose;
-
-	g_object_class_install_property (object_class, PROP_SERVICE, 
-					 g_param_spec_int ("service",
-							   _("Service"),
-							   /*_( */"XXX blurb" /*)*/,
-							   FIRST_IM_TYPE,
-							   LAST_IM_TYPE,
-							   FIRST_IM_TYPE,
-							   G_PARAM_READWRITE));
-
-	g_object_class_install_property (object_class, PROP_LOCATION, 
-					 g_param_spec_string ("location",
-							      _("Location"),
-							      /*_( */"XXX blurb" /*)*/,
-							      "HOME",
-							      G_PARAM_READWRITE));
-
-	g_object_class_install_property (object_class, PROP_USERNAME, 
-					 g_param_spec_string ("username",
-							      _("Username"),
-							      /*_( */"XXX blurb" /*)*/,
-							      NULL,
-							      G_PARAM_READWRITE));
-
-	g_object_class_install_property (object_class, PROP_EDITABLE, 
-					 g_param_spec_boolean ("editable",
-							       _("Editable"),
-							       /*_( */"XXX blurb" /*)*/,
-							       FALSE,
-							       G_PARAM_READWRITE));
-}
-
-static void
-service_changed_cb(GtkWidget *optmenu, EContactEditorIm *editor)
-{
-	editor->service = gtk_option_menu_get_history(GTK_OPTION_MENU(optmenu)) + FIRST_IM_TYPE;
-}
-
-static void
-location_changed_cb(GtkWidget *optmenu, EContactEditorIm *editor)
-{
-	int i = gtk_option_menu_get_history(GTK_OPTION_MENU(optmenu));
-
-	if (editor->location != NULL)
-		g_free(editor->location);
-
-	if (i == 0)
-		editor->location = g_strdup("HOME");
-	else if (i == 1)
-		editor->location = g_strdup("WORK");
-	else
-		editor->location = NULL;
-}
-
-static void
-setup_service_optmenu(EContactEditorIm *editor)
-{
-	GtkWidget *optmenu;
-	GtkWidget *menu;
-	GtkWidget *hbox;
-	GtkWidget *item;
-	GtkWidget *label;
-	GtkWidget *image;
-	GtkSizeGroup *sg;
-	int i;
-
-	optmenu = glade_xml_get_widget(editor->gui, "optmenu-service");
-	g_signal_connect(G_OBJECT(optmenu), "changed",
-					 G_CALLBACK(service_changed_cb), editor);
-
-	menu = gtk_menu_new();
-	gtk_option_menu_set_menu(GTK_OPTION_MENU(optmenu), menu);
-	gtk_widget_show(menu);
-
-	sg = gtk_size_group_new(GTK_SIZE_GROUP_HORIZONTAL);
-
-	for (i = 0; i < G_N_ELEMENTS(im_labels); i++) {
-		item = gtk_menu_item_new();
-
-		hbox = gtk_hbox_new(FALSE, 4);
-		gtk_container_add(GTK_CONTAINER(item), hbox);
-		gtk_widget_show(hbox);
-
-		image = e_icon_factory_get_image (im_images[i], E_ICON_SIZE_MENU);
-
-		gtk_size_group_add_widget(sg, image);
-
-		gtk_box_pack_start(GTK_BOX(hbox), image, FALSE, FALSE, 0);
-		gtk_widget_show(image);
-
-		label = gtk_label_new(im_labels[i]);
-		gtk_misc_set_alignment(GTK_MISC(label), 0, 0.5);
-		gtk_box_pack_start(GTK_BOX(hbox), label, TRUE, TRUE, 0);
-		gtk_widget_show(label);
-
-		gtk_menu_shell_append(GTK_MENU_SHELL(menu), item);
-		gtk_widget_show(item);
-	}
-}
-
-static void
-setup_location_optmenu(EContactEditorIm *editor)
-{
-	GtkWidget *item;
-	GtkWidget *optmenu;
-	GtkWidget *menu;
-
-	optmenu = glade_xml_get_widget(editor->gui, "optmenu-location");
-
-	g_signal_connect(G_OBJECT(optmenu), "changed",
-					 G_CALLBACK(location_changed_cb), editor);
-
-	menu = gtk_menu_new();
-	gtk_option_menu_set_menu(GTK_OPTION_MENU(optmenu), menu);
-	gtk_widget_show(menu);
-
-	item = gtk_menu_item_new_with_label(_("Home"));
-	gtk_menu_shell_append(GTK_MENU_SHELL(menu), item);
-	gtk_widget_show(item);
-
-	item = gtk_menu_item_new_with_label(_("Work"));
-	gtk_menu_shell_append(GTK_MENU_SHELL(menu), item);
-	gtk_widget_show(item);
-
-	item = gtk_menu_item_new_with_label(_("Other"));
-	gtk_menu_shell_append(GTK_MENU_SHELL(menu), item);
-	gtk_widget_show(item);
-}
-
-static void
-e_contact_editor_im_init (EContactEditorIm *e_contact_editor_im)
-{
-	GladeXML *gui;
-	GtkWidget *widget;
-	GList *icon_list;
-
-	gtk_dialog_add_buttons (GTK_DIALOG (e_contact_editor_im),
-				GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL,
-				GTK_STOCK_OK, GTK_RESPONSE_OK,
-				NULL);
-	gtk_dialog_set_has_separator (GTK_DIALOG (e_contact_editor_im), FALSE);
-
-	gtk_container_set_border_width (GTK_CONTAINER (GTK_DIALOG (e_contact_editor_im)->action_area), 12);
-	gtk_container_set_border_width (GTK_CONTAINER (GTK_DIALOG (e_contact_editor_im)->vbox), 0);
-
-	gtk_window_set_resizable(GTK_WINDOW(e_contact_editor_im), TRUE);
-
-	e_contact_editor_im->service = FIRST_IM_TYPE;
-	e_contact_editor_im->location = g_strdup("HOME");
-	e_contact_editor_im->username = NULL;
-	gui = glade_xml_new (EVOLUTION_GLADEDIR "/im.glade", NULL, NULL);
-	e_contact_editor_im->gui = gui;
-
-	widget = glade_xml_get_widget(gui, "dialog-im");
-	gtk_window_set_title (GTK_WINDOW (e_contact_editor_im),
-			      GTK_WINDOW (widget)->title);
-
-	widget = glade_xml_get_widget(gui, "table-im");
-	g_object_ref(widget);
-	gtk_container_remove(GTK_CONTAINER(widget->parent), widget);
-	gtk_box_pack_start (GTK_BOX (GTK_DIALOG (e_contact_editor_im)->vbox), widget, TRUE, TRUE, 0);
-	g_object_unref(widget);
-
-	setup_service_optmenu(e_contact_editor_im);
-	setup_location_optmenu(e_contact_editor_im);
-
-	gtk_widget_grab_focus(glade_xml_get_widget(gui, "entry-username"));
-
-	/* set the icon */
-	icon_list = e_icon_factory_get_icon_list ("stock_contact");
-	if (icon_list) {
-		gtk_window_set_icon_list (GTK_WINDOW (e_contact_editor_im), icon_list);
-		g_list_foreach (icon_list, (GFunc) g_object_unref, NULL);
-		g_list_free (icon_list);
-	}
-}
-
-void
-e_contact_editor_im_dispose (GObject *object)
-{
-	EContactEditorIm *e_contact_editor_im = E_CONTACT_EDITOR_IM(object);
-
-	if (e_contact_editor_im->gui) {
-		g_object_unref(e_contact_editor_im->gui);
-		e_contact_editor_im->gui = NULL;
-	}
-
-	if (e_contact_editor_im->location) {
-		g_free(e_contact_editor_im->location);
-		e_contact_editor_im->location = NULL;
-	}
-
-	if (e_contact_editor_im->username) {
-		g_free(e_contact_editor_im->username);
-		e_contact_editor_im->username = NULL;
-	}
-
-	if (G_OBJECT_CLASS (parent_class)->dispose)
-		(* G_OBJECT_CLASS (parent_class)->dispose) (object);
-}
-
-GtkWidget*
-e_contact_editor_im_new (EContactField service, const char *location, const char *username)
-{
-	GtkWidget *widget = g_object_new (E_TYPE_CONTACT_EDITOR_IM, NULL);
-	g_object_set (widget,
-		      "service", GINT_TO_POINTER(service),
-		      "location", location,
-		      "username", username,
-		      NULL);
-	return widget;
-}
-
-static void
-e_contact_editor_im_set_property (GObject *object, guint prop_id,
-					const GValue *value, GParamSpec *pspec)
-{
-	EContactEditorIm *e_contact_editor_im;
-	const char *str;
-
-	e_contact_editor_im = E_CONTACT_EDITOR_IM (object);
-
-	switch (prop_id){
-	case PROP_SERVICE:
-		e_contact_editor_im->service = g_value_get_int(value);
-		fill_in_info(e_contact_editor_im);
-		break;
-
-	case PROP_LOCATION:
-		if (e_contact_editor_im->location != NULL)
-			g_free(e_contact_editor_im->location);
-
-		str = g_value_get_string(value);
-
-		if (str == NULL)
-			e_contact_editor_im->location = NULL;
-		else if (!g_ascii_strcasecmp(str, "HOME"))
-			e_contact_editor_im->location = g_strdup("HOME");
-		else if (!g_ascii_strcasecmp(str, "WORK"))
-			e_contact_editor_im->location = g_strdup("WORK");
-		else
-			e_contact_editor_im->location = NULL;
-
-		fill_in_info(e_contact_editor_im);
-		break;
-
-	case PROP_USERNAME:
-		if (e_contact_editor_im->username != NULL)
-			g_free(e_contact_editor_im->username);
-
-		e_contact_editor_im->username = g_strdup(g_value_get_string(value));
-		fill_in_info(e_contact_editor_im);
-		break;
-
-	case PROP_EDITABLE: {
-		int i;
-		char *widget_names[] = {
-			"optmenu-service",
-			"optmenu-location",
-			"entry-username",
-			"label-service",
-			"label-location",
-			"label-username",
-			NULL
-		};
-		e_contact_editor_im->editable = g_value_get_boolean (value) ? TRUE : FALSE;
-		for (i = 0; widget_names[i] != NULL; i ++) {
-			GtkWidget *w = glade_xml_get_widget(e_contact_editor_im->gui, widget_names[i]);
-			if (GTK_IS_ENTRY (w)) {
-				gtk_editable_set_editable (GTK_EDITABLE (w),
-							   e_contact_editor_im->editable);
-			}
-			else {
-				gtk_widget_set_sensitive (w, e_contact_editor_im->editable);
-			}
-		}
-		break;
-	}
-	default:
-		G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
-		break;
-	}
-}
-
-static void
-e_contact_editor_im_get_property (GObject *object, guint prop_id,
-					GValue *value, GParamSpec *pspec)
-{
-	EContactEditorIm *e_contact_editor_im;
-
-	e_contact_editor_im = E_CONTACT_EDITOR_IM (object);
-
-	switch (prop_id) {
-	case PROP_SERVICE:
-		g_value_set_int (value, e_contact_editor_im->service);
-		break;
-	case PROP_LOCATION:
-		g_value_set_string (value, e_contact_editor_im->location);
-		break;
-	case PROP_USERNAME:
-		extract_info(e_contact_editor_im);
-		g_value_set_string (value, e_contact_editor_im->username);
-		break;
-	case PROP_EDITABLE:
-		g_value_set_boolean (value, e_contact_editor_im->editable ? TRUE : FALSE);
-		break;
-	default:
-		G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
-		break;
-	}
-}
-
-static void
-fill_in_field(EContactEditorIm *editor, char *field, char *string)
-{
-	GtkEntry *entry = GTK_ENTRY(glade_xml_get_widget(editor->gui, field));
-	if (entry) {
-		if (string)
-			gtk_entry_set_text(entry, string);
-		else
-			gtk_entry_set_text(entry, "");
-	}
-}
-
-static void
-fill_in_info(EContactEditorIm *editor)
-{
-	GtkWidget *optmenu;
-
-	fill_in_field(editor, "entry-username",  editor->username);
-
-	optmenu = glade_xml_get_widget(editor->gui, "optmenu-service");
-
-	if (optmenu != NULL)
-		gtk_option_menu_set_history(GTK_OPTION_MENU(optmenu), editor->service - FIRST_IM_TYPE);
-
-	optmenu = glade_xml_get_widget(editor->gui, "optmenu-location");
-
-	if (optmenu != NULL)
-		gtk_option_menu_set_history(GTK_OPTION_MENU(optmenu),
-					    (editor->location == NULL ? 2 :
-					     !strcmp(editor->location, "WORK") ? 1 : 0));
-}
-
-static char *
-extract_field(EContactEditorIm *editor, char *field)
-{
-	GtkEntry *entry = GTK_ENTRY(glade_xml_get_widget(editor->gui, field));
-	if (entry)
-		return g_strdup (gtk_entry_get_text(entry));
-	else
-		return NULL;
-}
-
-static void
-extract_info(EContactEditorIm *editor)
-{
-	if (editor->username != NULL)
-		g_free(editor->username);
-
-	editor->username = extract_field(editor, "entry-username");
-
-	/*
-	 * NOTE: We don't need to handle the option menus.
-	 *       These are set by the callbacks.
-	 */
-}
diff --git a/addressbook/gui/contact-editor/e-contact-editor-im.h b/addressbook/gui/contact-editor/e-contact-editor-im.h
deleted file mode 100644
index da5bd652b2..0000000000
--- a/addressbook/gui/contact-editor/e-contact-editor-im.h
+++ /dev/null
@@ -1,76 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-/* e-contact-editor-add-im.h
- * Copyright (C) 2003  Ximian, Inc.
- * Author: Christian Hammond <chipx86@gnupdate.org>
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of version 2 of the GNU General Public
- * License as published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * General Public License for more details.
- *
- * You should have received a copy of the GNU General Public
- * License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
- */
-#ifndef __E_CONTACT_EDITOR_IM_H__
-#define __E_CONTACT_EDITOR_IM_H__
-
-#include <gtk/gtkdialog.h>
-#include <glade/glade.h>
-#include <libebook/e-contact.h>
-
-G_BEGIN_DECLS
-
-/* EContactEditorIm - A dialog allowing the user to add an IM account to a contact.
- *
- * The following arguments are available:
- *
- * name		type		read/write	description
- * --------------------------------------------------------------------------------
- * service      EContactField   RW              The field of the IM service.
- * location     char *          RW              The location type.
- * username     char *          RW              The username of the account.
- */
-
-#define E_TYPE_CONTACT_EDITOR_IM			(e_contact_editor_im_get_type ())
-#define E_CONTACT_EDITOR_IM(obj)			(G_TYPE_CHECK_INSTANCE_CAST ((obj), E_TYPE_CONTACT_EDITOR_IM, EContactEditorIm))
-#define E_CONTACT_EDITOR_IM_CLASS(klass)		(G_TYPE_CHECK_CLASS_CAST ((klass), E_TYPE_CONTACT_EDITOR_IM, EContactEditorImClass))
-#define E_IS_CONTACT_EDITOR_IM(obj)		(G_TYPE_CHECK_INSTANCE_TYPE ((obj), E_TYPE_CONTACT_EDITOR_IM))
-#define E_IS_CONTACT_EDITOR_IM_CLASS(klass)	(G_TYPE_CHECK_CLASS_TYPE ((obj), E_TYPE_CONTACT_EDITOR_IM))
-
-
-typedef struct _EContactEditorIm       EContactEditorIm;
-typedef struct _EContactEditorImClass  EContactEditorImClass;
-
-struct _EContactEditorIm
-{
-	GtkDialog parent;
-	
-	/* item specific fields */
-	EContactField service;
-	char *location;
-	char *username;
-	GladeXML *gui;
-
-	/* Whether the dialog will accept modifications */
-	guint editable : 1;
-};
-
-struct _EContactEditorImClass
-{
-	GtkDialogClass parent_class;
-};
-
-
-GtkWidget *e_contact_editor_im_new(EContactField service, const char *location, const char *username);
-GType      e_contact_editor_im_get_type (void);
-
-G_END_DECLS
-
-#endif /* __E_CONTACT_EDITOR_IM_H__ */
-
diff --git a/addressbook/gui/contact-editor/e-contact-editor-marshal.list b/addressbook/gui/contact-editor/e-contact-editor-marshal.list
deleted file mode 100644
index 58b2640de5..0000000000
--- a/addressbook/gui/contact-editor/e-contact-editor-marshal.list
+++ /dev/null
@@ -1,2 +0,0 @@
-NONE:INT,OBJECT
-NONE:NONE
diff --git a/addressbook/gui/contact-editor/e-contact-editor.c b/addressbook/gui/contact-editor/e-contact-editor.c
deleted file mode 100644
index 2cd7984337..0000000000
--- a/addressbook/gui/contact-editor/e-contact-editor.c
+++ /dev/null
@@ -1,3553 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-/* 
- * e-contact-editor.c
- * Copyright (C) 2000  Ximian, Inc.
- * Author: Chris Lahey <clahey@ximian.com>
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of version 2 of the GNU General Public
- * License as published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * General Public License for more details.
- *
- * You should have received a copy of the GNU General Public
- * License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
- */
-
-#include <config.h>
-
-#include "eab-editor.h"
-#include "e-contact-editor.h"
-
-#include <string.h>
-#include <time.h>
-#include <gtk/gtkcheckbutton.h>
-#include <gtk/gtkcheckmenuitem.h>
-#include <gtk/gtkcombo.h>
-#include <gtk/gtktextview.h>
-#include <gtk/gtkmessagedialog.h>
-#include <gtk/gtkstock.h>
-#include <gtk/gtkentry.h>
-#include <gtk/gtklabel.h>
-#include <libgnomeui/gnome-window-icon.h>
-#include <libgnome/gnome-util.h>
-#include <libgnome/gnome-i18n.h>
-#include <libgnome/gnome-help.h>
-
-#include <gdk-pixbuf/gdk-pixbuf.h>
-#include <libedataserverui/e-categories-dialog.h>
-#include <gal/widgets/e-gui-utils.h>
-#include <gal/e-text/e-entry.h>
-
-#include <libebook/e-address-western.h>
-#include <libedataserverui/e-source-option-menu.h>
-
-#include <camel/camel.h>
-
-#include "addressbook/gui/component/addressbook.h"
-#include "addressbook/printing/e-contact-print.h"
-#include "addressbook/printing/e-contact-print-envelope.h"
-#include "addressbook/gui/widgets/eab-gui-util.h"
-#include "e-util/e-gui-utils.h"
-#include "widgets/misc/e-error.h"
-#include "widgets/misc/e-dateedit.h"
-#include "widgets/misc/e-image-chooser.h"
-#include "widgets/misc/e-url-entry.h"
-#include "shell/evolution-shell-component-utils.h"
-#include "e-util/e-icon-factory.h"
-
-#include "eab-contact-merging.h"
-
-#include "e-contact-editor-address.h"
-#include "e-contact-editor-im.h"
-#include "e-contact-editor-fullname.h"
-#include "e-contact-editor-marshal.h"
-
-#define EMAIL_SLOTS   4
-#define PHONE_SLOTS   8
-#define IM_SLOTS      4
-#define ADDRESS_SLOTS 3
-
-#define EVOLUTION_UI_SLOT_PARAM "X-EVOLUTION-UI-SLOT"
-
-/* IM columns */
-enum {
-	COLUMN_IM_ICON,
-	COLUMN_IM_SERVICE,
-	COLUMN_IM_SCREENNAME,
-	COLUMN_IM_LOCATION,
-	COLUMN_IM_LOCATION_TYPE,
-	COLUMN_IM_SERVICE_FIELD,
-	NUM_IM_COLUMNS
-};
-
-
-static void e_contact_editor_init		(EContactEditor		 *editor);
-static void e_contact_editor_class_init	(EContactEditorClass	 *klass);
-static void e_contact_editor_set_property (GObject *object, guint prop_id, const GValue *value, GParamSpec *pspec);
-static void e_contact_editor_get_property (GObject *object, guint prop_id, GValue *value, GParamSpec *pspec);
-static void e_contact_editor_dispose (GObject *object);
-
-static void e_contact_editor_raise 	    (EABEditor *editor);
-static void e_contact_editor_show  	    (EABEditor *editor);
-static void e_contact_editor_save_contact   (EABEditor *editor, gboolean should_close);
-static void e_contact_editor_close 	    (EABEditor *editor);
-static gboolean e_contact_editor_is_valid   (EABEditor *editor);
-static gboolean e_contact_editor_is_changed (EABEditor *editor);
-static GtkWindow* e_contact_editor_get_window (EABEditor *editor);
-
-static void save_contact (EContactEditor *ce, gboolean should_close);
-static void entry_activated (EContactEditor *editor);
-
-static void set_entry_text(EContactEditor *editor, GtkEntry *entry, const char *string);
-
-static EABEditorClass *parent_class = NULL;
-
-/* The arguments we take */
-enum {
-	PROP_0,
-	PROP_SOURCE_BOOK,
-	PROP_TARGET_BOOK,
-	PROP_CONTACT,
-	PROP_IS_NEW_CONTACT,
-	PROP_EDITABLE,
-	PROP_CHANGED,
-	PROP_WRITABLE_FIELDS,
-	PROP_REQUIRED_FIELDS
-};
-
-enum {
-	DYNAMIC_LIST_EMAIL,
-	DYNAMIC_LIST_PHONE,
-	DYNAMIC_LIST_ADDRESS
-};
-
-static struct {
-	EContactField field_id;
-	const gchar *type_1;
-	const gchar *type_2;
-}
-phones [] = {
-	{ E_CONTACT_PHONE_ASSISTANT,    EVC_X_ASSISTANT,       NULL    },
-	{ E_CONTACT_PHONE_BUSINESS,     "WORK",                "VOICE" },
-	{ E_CONTACT_PHONE_BUSINESS_FAX, "WORK",                "FAX"   },
-	{ E_CONTACT_PHONE_CALLBACK,     EVC_X_CALLBACK,        NULL    },
-	{ E_CONTACT_PHONE_CAR,          "CAR",                 NULL    },
-	{ E_CONTACT_PHONE_COMPANY,      "X-EVOLUTION-COMPANY", NULL    },
-	{ E_CONTACT_PHONE_HOME,         "HOME",                "VOICE" },
-	{ E_CONTACT_PHONE_HOME_FAX,     "HOME",                "FAX"   },
-	{ E_CONTACT_PHONE_ISDN,         "ISDN",                NULL    },
-	{ E_CONTACT_PHONE_MOBILE,       "CELL",                NULL    },
-	{ E_CONTACT_PHONE_OTHER,        "VOICE",               NULL    },
-	{ E_CONTACT_PHONE_OTHER_FAX,    "FAX",                 NULL    },
-	{ E_CONTACT_PHONE_PAGER,        "PAGER",               NULL    },
-	{ E_CONTACT_PHONE_PRIMARY,      "PREF",                NULL    },
-	{ E_CONTACT_PHONE_RADIO,        EVC_X_RADIO,           NULL    },
-	{ E_CONTACT_PHONE_TELEX,        EVC_X_TELEX,           NULL    },
-	{ E_CONTACT_PHONE_TTYTDD,       EVC_X_TTYTDD,          NULL    }
-};
-
-/* Defaults from the table above */
-gint phones_default [] = { 1, 6, 9, 2, 7, 12, 10, 10 };
-
-static EContactField addresses [] = {
-	E_CONTACT_ADDRESS_WORK,
-	E_CONTACT_ADDRESS_HOME,
-	E_CONTACT_ADDRESS_OTHER
-};
-
-static EContactField address_labels [] = {
-	E_CONTACT_ADDRESS_LABEL_WORK,
-	E_CONTACT_ADDRESS_LABEL_HOME,
-	E_CONTACT_ADDRESS_LABEL_OTHER
-};
-
-static gchar *address_name [] = {
-	"work",
-	"home",
-	"other"
-};
-
-static struct {
-	EContactField  field;
-	gchar         *pretty_name;
-}
-im_service [] =
-{
-	{ E_CONTACT_IM_AIM,       N_ ("AIM")       },
-	{ E_CONTACT_IM_JABBER,    N_ ("Jabber")    },
-	{ E_CONTACT_IM_YAHOO,     N_ ("Yahoo")     },
-	{ E_CONTACT_IM_MSN,       N_ ("MSN")       },
-	{ E_CONTACT_IM_ICQ,       N_ ("ICQ")       },
-	{ E_CONTACT_IM_GROUPWISE, N_ ("GroupWise") }
-};
-
-/* Defaults from the table above */
-gint im_service_default [] = { 0, 2, 4, 5 };
-
-static struct {
-	gchar *name;
-	gchar *pretty_name;
-}
-common_location [] =
-{
-	{ "WORK",  N_ ("Work")  },
-	{ "HOME",  N_ ("Home")  },
-	{ "OTHER", N_ ("Other") }
-};
-
-/* Default from the table above */
-gint email_default [] = { 0, 1, 2, 2 };
-
-#define STRING_IS_EMPTY(x)      (!(x) || !(*(x)))
-#define STRING_MAKE_NON_NULL(x) ((x) ? (x) : "")
-
-GType
-e_contact_editor_get_type (void)
-{
-	static GType contact_editor_type = 0;
-
-	if (!contact_editor_type) {
-		static const GTypeInfo contact_editor_info =  {
-			sizeof (EContactEditorClass),
-			NULL,           /* base_init */
-			NULL,           /* base_finalize */
-			(GClassInitFunc) e_contact_editor_class_init,
-			NULL,           /* class_finalize */
-			NULL,           /* class_data */
-			sizeof (EContactEditor),
-			0,             /* n_preallocs */
-			(GInstanceInitFunc) e_contact_editor_init,
-		};
-
-		contact_editor_type = g_type_register_static (EAB_TYPE_EDITOR, "EContactEditor", &contact_editor_info, 0);
-	}
-
-	return contact_editor_type;
-}
-
-static void
-e_contact_editor_class_init (EContactEditorClass *klass)
-{
-	GObjectClass *object_class = G_OBJECT_CLASS (klass);
-	EABEditorClass *editor_class = EAB_EDITOR_CLASS (klass);
-
-	parent_class = g_type_class_ref (EAB_TYPE_EDITOR);
-
-	object_class->set_property = e_contact_editor_set_property;
-	object_class->get_property = e_contact_editor_get_property;
-	object_class->dispose = e_contact_editor_dispose;
-
-	editor_class->raise = e_contact_editor_raise;
-	editor_class->show = e_contact_editor_show;
-	editor_class->close = e_contact_editor_close;
-	editor_class->is_valid = e_contact_editor_is_valid;
-	editor_class->save_contact = e_contact_editor_save_contact;
-	editor_class->is_changed = e_contact_editor_is_changed;
-	editor_class->get_window = e_contact_editor_get_window;
-
-	g_object_class_install_property (object_class, PROP_SOURCE_BOOK, 
-					 g_param_spec_object ("source_book",
-							      _("Source Book"),
-							      /*_( */"XXX blurb" /*)*/,
-							      E_TYPE_BOOK,
-							      G_PARAM_READWRITE));
-
-	g_object_class_install_property (object_class, PROP_TARGET_BOOK, 
-					 g_param_spec_object ("target_book",
-							      _("Target Book"),
-							      /*_( */"XXX blurb" /*)*/,
-							      E_TYPE_BOOK,
-							      G_PARAM_READWRITE));
-
-	g_object_class_install_property (object_class, PROP_CONTACT, 
-					 g_param_spec_object ("contact",
-							      _("Contact"),
-							      /*_( */"XXX blurb" /*)*/,
-							      E_TYPE_CONTACT,
-							      G_PARAM_READWRITE));
-
-	g_object_class_install_property (object_class, PROP_IS_NEW_CONTACT, 
-					 g_param_spec_boolean ("is_new_contact",
-							       _("Is New Contact"),
-							       /*_( */"XXX blurb" /*)*/,
-							       FALSE,
-							       G_PARAM_READWRITE));
-
-	g_object_class_install_property (object_class, PROP_WRITABLE_FIELDS, 
-					 g_param_spec_object ("writable_fields",
-							      _("Writable Fields"),
-							      /*_( */"XXX blurb" /*)*/,
-							      E_TYPE_LIST,
-							      G_PARAM_READWRITE));
-
-	g_object_class_install_property (object_class, PROP_REQUIRED_FIELDS, 
-					 g_param_spec_object ("required_fields",
-							      _("Required Fields"),
-							      /*_( */"XXX blurb" /*)*/,
-							      E_TYPE_LIST,
-							      G_PARAM_READWRITE));
-
-	g_object_class_install_property (object_class, PROP_EDITABLE, 
-					 g_param_spec_boolean ("editable",
-							       _("Editable"),
-							       /*_( */"XXX blurb" /*)*/,
-							       FALSE,
-							       G_PARAM_READWRITE));
-
-	g_object_class_install_property (object_class, PROP_CHANGED, 
-					 g_param_spec_boolean ("changed",
-							       _("Changed"),
-							       /*_( */"XXX blurb" /*)*/,
-							       FALSE,
-							       G_PARAM_READWRITE));
-}
-
-static void
-entry_activated (EContactEditor *editor)
-{
-	save_contact (editor, TRUE);
-}
-
-/* FIXME: Linear time... */
-static gboolean
-is_field_supported (EContactEditor *editor, EContactField field_id)
-{
-	EList       *fields;
-	const gchar *field;
-	EIterator   *iter;
-
-	fields = editor->writable_fields;
-	if (!fields)
-		return FALSE;
-
-	field = e_contact_field_name (field_id);
-	if (!field)
-		return FALSE;
-
-	for (iter = e_list_get_iterator (fields);
-	     e_iterator_is_valid (iter);
-	     e_iterator_next (iter)) {
-		const gchar *this_field = e_iterator_get (iter);
-
-		if (!this_field)
-			continue;
-
-		if (!strcmp (field, this_field))
-			return TRUE;
-	}
-
-	return FALSE;
-}
-
-/* This function tells you whether name_to_style will make sense.  */
-static gboolean
-style_makes_sense (const EContactName *name, const gchar *company, int style)
-{
-	switch (style) {
-	case 0: /* Fall Through */
-	case 1:
-		return TRUE;
-	case 2:
-		if (company && *company)
-			return TRUE;
-		else
-			return FALSE;
-	case 3: /* Fall Through */
-	case 4:
-		if (company && *company && name && ((name->given && *name->given) || (name->family && *name->family)))
-			return TRUE;
-		else
-			return FALSE;
-	default:
-		return FALSE;
-	}
-}
-
-static char *
-name_to_style (const EContactName *name, const gchar *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"));
-	GtkEntry *company_w = GTK_ENTRY (glade_xml_get_widget (editor->gui, "entry-company"));
-	char *filestring;
-	char *trystring;
-	EContactName *name = editor->name;
-	const gchar *company;
-	int i;
-	int style;
-
-	if (!(file_as && GTK_IS_ENTRY(file_as)))
-		return -1;
-
-	company = gtk_entry_get_text (GTK_ENTRY (company_w));
-	filestring = g_strdup (gtk_entry_get_text (file_as));
-
-	style = -1;
-	for (i = 0; i < 5; i++) {
-		trystring = name_to_style (name, 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"));
-	GtkEntry *company_w = GTK_ENTRY (glade_xml_get_widget (editor->gui, "entry-company"));
-	GtkWidget *widget;
-	const gchar *company;
-
-	if (!(file_as && GTK_IS_ENTRY (file_as)))
-		return;
-
-	company = gtk_entry_get_text (GTK_ENTRY (company_w));
-
-	if (style == -1) {
-		string = g_strdup (gtk_entry_get_text(file_as));
-		strings = g_list_append (strings, string);
-	}
-
-	widget = glade_xml_get_widget (editor->gui, "combo-file-as");
-
-	for (i = 0; i < 5; i++) {
-		if (style_makes_sense (editor->name, company, i)) {
-			char *u;
-			u = name_to_style (editor->name, company, i);
-			if (!STRING_IS_EMPTY (u))
-				strings = g_list_append (strings, u);
-			else
-				g_free (u);
-		}
-	}
-
-	if (widget && GTK_IS_COMBO (widget)) {
-		GtkCombo *combo = GTK_COMBO (widget);
-		gtk_combo_set_popdown_strings (combo, strings);
-		g_list_foreach (strings, (GFunc) g_free, NULL);
-		g_list_free (strings);
-	}
-
-	if (style != -1) {
-		string = name_to_style (editor->name, company, style);
-		set_entry_text (editor, file_as, string);
-		g_free (string);
-	}
-}
-
-static void
-name_entry_changed (GtkWidget *widget, EContactEditor *editor)
-{
-	int style = 0;
-	const char *string;
-
-	style = file_as_get_style (editor);
-	e_contact_name_free (editor->name);
-	string = gtk_entry_get_text (GTK_ENTRY (widget));
-	editor->name = e_contact_name_from_string (string);
-	file_as_set_style (editor, style);
-}
-
-static void
-file_as_entry_changed (GtkWidget *widget, EContactEditor *editor)
-{
-	char *string = gtk_editable_get_chars (GTK_EDITABLE (widget), 0, -1);
-	char *title;
-
-	if (string && *string)
-		title = string;
-	else
-		title = _("Contact Editor");
-
-	gtk_window_set_title (GTK_WINDOW (editor->app), title);
-	g_free (string);
-}
-
-static void
-company_entry_changed (GtkWidget *widget, EContactEditor *editor)
-{
-	int style = 0;
-
-	style = file_as_get_style (editor);
-	file_as_set_style (editor, style);
-}
-
-static void
-update_file_as_combo (EContactEditor *editor)
-{
-	file_as_set_style (editor, file_as_get_style (editor));
-}
-
-static void
-fill_in_source_field (EContactEditor *editor)
-{
-	GtkWidget *source_menu;
-	ESource   *source;
-
-	if (!editor->target_book)
-		return;
-
-	source_menu = glade_xml_get_widget (editor->gui, "source-option-menu-source");
-	source = e_book_get_source (editor->target_book);
-
-	e_source_option_menu_select (E_SOURCE_OPTION_MENU (source_menu), source);
-}
-
-static void
-sensitize_ok (EContactEditor *ce)
-{
-	GtkWidget *widget;
-	gboolean   allow_save;
-
-	allow_save = ce->target_editable && ce->changed ? TRUE : FALSE;
-
-	widget = glade_xml_get_widget (ce->gui, "button-ok");
-	gtk_widget_set_sensitive (widget, allow_save);
-}
-
-static void
-object_changed (GObject *object, EContactEditor *editor)
-{
-	if (!editor->target_editable) {
-		g_warning ("non-editable contact editor has an editable field in it.");
-		return;
-	}
-
-	if (!editor->changed) {
-		editor->changed = TRUE;
-		sensitize_ok (editor);
-	}
-}
-
-static void
-image_chooser_changed (GtkWidget *widget, EContactEditor *editor)
-{
-	editor->image_set = TRUE;
-}
-
-static void
-set_entry_text (EContactEditor *editor, GtkEntry *entry, const gchar *string)
-{
-	const char *oldstring = gtk_entry_get_text (entry);
-
-	if (!string)
-		string = "";
-
-	if (strcmp (string, oldstring)) {
-		g_signal_handlers_block_matched (entry, G_SIGNAL_MATCH_DATA,
-						 0, 0, NULL, NULL, editor);
-		gtk_entry_set_text (entry, string);
-		g_signal_handlers_unblock_matched (entry, G_SIGNAL_MATCH_DATA,
-						   0, 0, NULL, NULL, editor);
-	}
-}
-
-static void
-set_option_menu_history (EContactEditor *editor, GtkOptionMenu *option_menu, gint history)
-{
-	g_signal_handlers_block_matched (option_menu, G_SIGNAL_MATCH_DATA,
-					 0, 0, NULL, NULL, editor);
-	gtk_option_menu_set_history (option_menu, history);
-	g_signal_handlers_unblock_matched (option_menu, G_SIGNAL_MATCH_DATA,
-					   0, 0, NULL, NULL, editor);
-}
-
-static void
-init_email_record_location (EContactEditor *editor, gint record)
-{
-	GtkWidget *location_option_menu;
-	GtkWidget *location_menu;
-	GtkWidget *email_entry;
-	gchar     *widget_name;
-	gint       i;
-
-	widget_name = g_strdup_printf ("entry-email-%d", record);
-	email_entry = glade_xml_get_widget (editor->gui, widget_name);
-	g_free (widget_name);
-
-	widget_name = g_strdup_printf ("optionmenu-email-%d", record);
-	location_option_menu = glade_xml_get_widget (editor->gui, widget_name);
-	g_free (widget_name);
-
-	location_menu = gtk_menu_new ();
-
-	for (i = 0; i < G_N_ELEMENTS (common_location); i++) {
-		GtkWidget *item;
-
-		item = gtk_menu_item_new_with_label (_(common_location [i].pretty_name));
-		gtk_menu_shell_append (GTK_MENU_SHELL (location_menu), item);
-	}
-
-	gtk_widget_show_all (location_menu);
-	gtk_option_menu_set_menu (GTK_OPTION_MENU (location_option_menu), location_menu);
-
-	g_signal_connect (location_option_menu, "changed", G_CALLBACK (object_changed), editor);
-	g_signal_connect (email_entry, "changed", G_CALLBACK (object_changed), editor);
-	g_signal_connect_swapped (email_entry, "activate", G_CALLBACK (entry_activated), editor);
-}
-
-static void
-init_email (EContactEditor *editor)
-{
-	gint i;
-
-	for (i = 1; i <= EMAIL_SLOTS; i++)
-		init_email_record_location (editor, i);
-}
-
-static void
-fill_in_email_record (EContactEditor *editor, gint record, const gchar *address, gint location)
-{
-	GtkWidget *location_option_menu;
-	GtkWidget *email_entry;
-	gchar     *widget_name;
-
-	widget_name = g_strdup_printf ("optionmenu-email-%d", record);
-	location_option_menu = glade_xml_get_widget (editor->gui, widget_name);
-	g_free (widget_name);
-
-	widget_name = g_strdup_printf ("entry-email-%d", record);
-	email_entry = glade_xml_get_widget (editor->gui, widget_name);
-	g_free (widget_name);
-
-	set_option_menu_history (editor, GTK_OPTION_MENU (location_option_menu),
-				 location >= 0 ? location : email_default [2]);
-	set_entry_text (editor, GTK_ENTRY (email_entry), address ? address : "");
-}
-
-static void
-extract_email_record (EContactEditor *editor, gint record, gchar **address, gint *location)
-{
-	GtkWidget *location_option_menu;
-	GtkWidget *email_entry;
-	gchar     *widget_name;
-
-	widget_name = g_strdup_printf ("optionmenu-email-%d", record);
-	location_option_menu = glade_xml_get_widget (editor->gui, widget_name);
-	g_free (widget_name);
-
-	widget_name = g_strdup_printf ("entry-email-%d", record);
-	email_entry = glade_xml_get_widget (editor->gui, widget_name);
-	g_free (widget_name);
-
-	*address  = g_strdup (gtk_entry_get_text (GTK_ENTRY (email_entry)));
-	*location = gtk_option_menu_get_history (GTK_OPTION_MENU (location_option_menu));
-}
-
-static const gchar *
-email_index_to_location (gint index)
-{
-	return common_location [index].name;
-}
-
-static const gchar *
-im_index_to_location (gint index)
-{
-	return common_location [index].name;
-}
-
-static void
-phone_index_to_type (gint index, const gchar **type_1, const gchar **type_2)
-{
-	*type_1 = phones [index].type_1;
-	*type_2 = phones [index].type_2;
-}
-
-static gint
-get_email_location (EVCardAttribute *attr)
-{
-	gint i;
-
-	for (i = 0; i < G_N_ELEMENTS (common_location); i++) {
-		if (e_vcard_attribute_has_type (attr, common_location [i].name))
-			return i;
-	}
-
-	return -1;
-}
-
-static gint
-get_im_location (EVCardAttribute *attr)
-{
-	gint i;
-
-	for (i = 0; i < G_N_ELEMENTS (common_location); i++) {
-		if (e_vcard_attribute_has_type (attr, common_location [i].name))
-			return i;
-	}
-
-	return -1;
-}
-
-static gint
-get_phone_type (EVCardAttribute *attr)
-{
-	gint i;
-
-	for (i = 0; i < G_N_ELEMENTS (phones); i++) {
-		if (e_vcard_attribute_has_type (attr, phones [i].type_1) &&
-		    (phones [i].type_2 == NULL || e_vcard_attribute_has_type (attr, phones [i].type_2)))
-			return i;
-	}
-
-	return -1;
-}
-
-static EVCardAttributeParam *
-get_ui_slot_param (EVCardAttribute *attr)
-{
-	EVCardAttributeParam *param = NULL;
-	GList                *param_list;
-	GList                *l;
-
-	param_list = e_vcard_attribute_get_params (attr);
-
-	for (l = param_list; l; l = g_list_next (l)) {
-		const gchar *str;
-
-		param = l->data;
-
-		str = e_vcard_attribute_param_get_name (param);
-		if (!g_ascii_strcasecmp (str, EVOLUTION_UI_SLOT_PARAM))
-			break;
-
-		param = NULL;
-	}
-
-	return param;
-}
-
-static gint
-get_ui_slot (EVCardAttribute *attr)
-{
-	EVCardAttributeParam *param;
-	gint                  slot = -1;
-
-	param = get_ui_slot_param (attr);
-
-	if (param) {
-		GList *value_list;
-
-		value_list = e_vcard_attribute_param_get_values (param);
-		slot = atoi (value_list->data);
-	}
-
-	return slot;
-}
-
-static void
-set_ui_slot (EVCardAttribute *attr, gint slot)
-{
-	EVCardAttributeParam *param;
-	gchar                *slot_str;
-
-	param = get_ui_slot_param (attr);
-	if (!param) {
-		param = e_vcard_attribute_param_new (EVOLUTION_UI_SLOT_PARAM);
-		e_vcard_attribute_add_param (attr, param);
-	}
-
-	e_vcard_attribute_param_remove_values (param);
-
-	slot_str = g_strdup_printf ("%d", slot);
-	e_vcard_attribute_param_add_value (param, slot_str);
-	g_free (slot_str);
-}
-
-static gint
-alloc_ui_slot (EContactEditor *editor, const gchar *widget_base, gint preferred_slot, gint num_slots)
-{
-	gchar       *widget_name;
-	GtkWidget   *widget;
-	const gchar *entry_contents;
-	gint         i;
-
-	/* See if we can get the preferred slot */
-
-	if (preferred_slot >= 1) {
-		widget_name = g_strdup_printf ("%s-%d", widget_base, preferred_slot);
-		widget = glade_xml_get_widget (editor->gui, widget_name);
-		entry_contents = gtk_entry_get_text (GTK_ENTRY (widget));
-		g_free (widget_name);
-
-		if (STRING_IS_EMPTY (entry_contents))
-			return preferred_slot;
-	}
-
-	/* Find first empty slot */
-
-	for (i = 1; i <= num_slots; i++) {
-		widget_name = g_strdup_printf ("%s-%d", widget_base, i);
-		widget = glade_xml_get_widget (editor->gui, widget_name);
-		entry_contents = gtk_entry_get_text (GTK_ENTRY (widget));
-		g_free (widget_name);
-
-		if (STRING_IS_EMPTY (entry_contents))
-			return i;
-	}
-
-	return -1;
-}
-
-static void
-free_attr_list (GList *attr_list)
-{
-	GList *l;
-
-	for (l = attr_list; l; l = g_list_next (l)) {
-		EVCardAttribute *attr = l->data;
-		e_vcard_attribute_free (attr);
-	}
-
-	g_list_free (attr_list);
-}
-
-static void
-fill_in_email (EContactEditor *editor)
-{
-	GList *email_attr_list;
-	GList *l;
-	gint   record_n;
-
-	/* Clear */
-
-	for (record_n = 1; record_n <= EMAIL_SLOTS; record_n++) {
-		fill_in_email_record (editor, record_n, NULL, email_default [record_n - 1]);
-	}
-
-	/* Fill in */
-
-	email_attr_list = e_contact_get_attributes (editor->contact, E_CONTACT_EMAIL);
-
-	for (record_n = 1, l = email_attr_list; l && record_n <= EMAIL_SLOTS; l = g_list_next (l)) {
-		EVCardAttribute *attr = l->data;
-		gchar           *email_address;
-		gint             slot;
-
-		email_address = e_vcard_attribute_get_value (attr);
-		slot = alloc_ui_slot (editor, "entry-email", get_ui_slot (attr), EMAIL_SLOTS);
-		if (slot < 1)
-			break;
-
-		fill_in_email_record (editor, slot, email_address,
-				      get_email_location (attr));
-
-		record_n++;
-	}
-}
-
-static void
-extract_email (EContactEditor *editor)
-{
-	GList *attr_list = NULL;
-	GList *old_attr_list;
-	GList *l, *l_next;
-	gint   i;
-
-	for (i = 1; i <= EMAIL_SLOTS; i++) {
-		gchar *address;
-		gint   location;
-
-		extract_email_record (editor, i, &address, &location);
-
-		if (!STRING_IS_EMPTY (address)) {
-			EVCardAttribute *attr;
-			attr = e_vcard_attribute_new ("", e_contact_vcard_attribute (E_CONTACT_EMAIL));
-
-			if (location >= 0)
-				e_vcard_attribute_add_param_with_value (attr,
-									e_vcard_attribute_param_new (EVC_TYPE),
-									email_index_to_location (location));
-
-			e_vcard_attribute_add_value (attr, address);
-			set_ui_slot (attr, i);
-
-			attr_list = g_list_append (attr_list, attr);
-		}
-
-		g_free (address);
-	}
-
-	/* Splice in the old attributes, minus the EMAIL_SLOTS first */
-
-	old_attr_list = e_contact_get_attributes (editor->contact, E_CONTACT_EMAIL);
-	for (l = old_attr_list, i = 1; l && i <= EMAIL_SLOTS; l = l_next, i++) {
-		l_next = g_list_next (l);
-
-		e_vcard_attribute_free (l->data);
-		g_list_delete_link (l, l);
-	}
-
-	old_attr_list = l;
-	attr_list = g_list_concat (attr_list, old_attr_list);
-
-	e_contact_set_attributes (editor->contact, E_CONTACT_EMAIL, attr_list);
-
-	free_attr_list (attr_list);
-}
-
-static void
-sensitize_email_record (EContactEditor *editor, gint record, gboolean enabled)
-{
-	GtkWidget *location_option_menu;
-	GtkWidget *email_entry;
-	gchar     *widget_name;
-
-	widget_name = g_strdup_printf ("optionmenu-email-%d", record);
-	location_option_menu = glade_xml_get_widget (editor->gui, widget_name);
-	g_free (widget_name);
-
-	widget_name = g_strdup_printf ("entry-email-%d", record);
-	email_entry = glade_xml_get_widget (editor->gui, widget_name);
-	g_free (widget_name);
-
-	gtk_widget_set_sensitive (location_option_menu, enabled);
-	gtk_editable_set_editable (GTK_EDITABLE (email_entry), enabled);
-}
-
-static void
-sensitize_email (EContactEditor *editor)
-{
-	gint i;
-
-	for (i = 1; i <= EMAIL_SLOTS; i++) {
-		gboolean enabled = TRUE;
-
-		if (!editor->target_editable)
-			enabled = FALSE;
-
-		if (E_CONTACT_FIRST_EMAIL_ID + i - 1 <= E_CONTACT_LAST_EMAIL_ID &&
-		    !is_field_supported (editor, E_CONTACT_FIRST_EMAIL_ID + i - 1))
-			enabled = FALSE;
-
-		sensitize_email_record (editor, i, enabled);
-	}
-}
-
-/* EContact can get attributes by field ID only, and there is none for TEL, so we need this */
-static GList *
-get_attributes_named (EVCard *vcard, const gchar *attr_name)
-{
-	GList *attr_list_in;
-	GList *attr_list_out = NULL;
-	GList *l;
-
-	attr_list_in = e_vcard_get_attributes (vcard);
-
-	for (l = attr_list_in; l; l = g_list_next (l)) {
-		EVCardAttribute *attr = l->data;
-		const gchar *name;
-
-		name = e_vcard_attribute_get_name (attr);
-
-		if (!g_ascii_strcasecmp (attr_name, name)) {
-			attr_list_out = g_list_append (attr_list_out, e_vcard_attribute_copy (attr));
-		}
-	}
-
-	return attr_list_out;
-}
-
-/* EContact can set attributes by field ID only, and there is none for TEL, so we need this */
-static void
-set_attributes_named (EVCard *vcard, const gchar *attr_name, GList *attr_list)
-{
-	GList *l;
-
-	e_vcard_remove_attributes (vcard, NULL, attr_name);
-
-	for (l = attr_list; l; l = g_list_next (l)) {
-		EVCardAttribute *attr = l->data;
-
-		e_vcard_add_attribute (vcard, e_vcard_attribute_copy (attr));
-	}
-}
-
-static void
-expand_phone (EContactEditor *editor, gboolean expanded)
-{
-	GtkWidget *phone_ext_table;
-	GtkWidget *phone_ext_arrow;
-
-	phone_ext_table = glade_xml_get_widget (editor->gui, "table-phone-extended");
-	phone_ext_arrow = glade_xml_get_widget (editor->gui, "arrow-phone-expand");
-
-	if (expanded) {
-		gtk_arrow_set (GTK_ARROW (phone_ext_arrow), GTK_ARROW_DOWN, GTK_SHADOW_NONE);
-		gtk_widget_show (phone_ext_table);
-	} else {
-		gtk_arrow_set (GTK_ARROW (phone_ext_arrow), GTK_ARROW_RIGHT, GTK_SHADOW_NONE);
-		gtk_widget_hide (phone_ext_table);
-	}
-}
-
-static void
-fill_in_phone_record (EContactEditor *editor, gint record, const gchar *phone, gint phone_type)
-{
-	GtkWidget *phone_type_option_menu;
-	GtkWidget *phone_entry;
-	gchar     *widget_name;
-
-	widget_name = g_strdup_printf ("optionmenu-phone-%d", record);
-	phone_type_option_menu = glade_xml_get_widget (editor->gui, widget_name);
-	g_free (widget_name);
-
-	widget_name = g_strdup_printf ("entry-phone-%d", record);
-	phone_entry = glade_xml_get_widget (editor->gui, widget_name);
-	g_free (widget_name);
-
-	set_option_menu_history (editor, GTK_OPTION_MENU (phone_type_option_menu),
-				 phone_type >= 0 ? phone_type :
-				 phones_default [record - 1]);
-	set_entry_text (editor, GTK_ENTRY (phone_entry), phone ? phone : "");
-
-	if (phone && *phone && record >= 5)
-		expand_phone (editor, TRUE);
-}
-
-static void
-extract_phone_record (EContactEditor *editor, gint record, gchar **phone, gint *phone_type)
-{
-	GtkWidget *phone_type_option_menu;
-	GtkWidget *phone_entry;
-	gchar     *widget_name;
-
-	widget_name = g_strdup_printf ("optionmenu-phone-%d", record);
-	phone_type_option_menu = glade_xml_get_widget (editor->gui, widget_name);
-	g_free (widget_name);
-
-	widget_name = g_strdup_printf ("entry-phone-%d", record);
-	phone_entry = glade_xml_get_widget (editor->gui, widget_name);
-	g_free (widget_name);
-
-	*phone      = g_strdup (gtk_entry_get_text (GTK_ENTRY (phone_entry)));
-	*phone_type = gtk_option_menu_get_history (GTK_OPTION_MENU (phone_type_option_menu));
-}
-
-static void
-fill_in_phone (EContactEditor *editor)
-{
-	GList *phone_attr_list;
-	GList *l;
-	gint   record_n;
-
-	/* Clear */
-
-	for (record_n = 1; record_n <= PHONE_SLOTS; record_n++) {
-		fill_in_phone_record (editor, record_n, NULL, -1);
-	}
-
-	/* Fill in */
-
-	phone_attr_list = get_attributes_named (E_VCARD (editor->contact), "TEL");
-
-	for (record_n = 1, l = phone_attr_list; l && record_n <= PHONE_SLOTS; l = g_list_next (l)) {
-		EVCardAttribute *attr = l->data;
-		gchar           *phone;
-		gint             slot;
-
-		phone = e_vcard_attribute_get_value (attr);
-		slot = alloc_ui_slot (editor, "entry-phone", get_ui_slot (attr), PHONE_SLOTS);
-		if (slot < 1)
-			break;
-
-		fill_in_phone_record (editor, slot, phone,
-				      get_phone_type (attr));
-
-		record_n++;
-	}
-}
-
-static void
-extract_phone (EContactEditor *editor)
-{
-	GList *attr_list = NULL;
-	GList *old_attr_list;
-	GList *l, *l_next;
-	gint   i;
-
-	for (i = 1; i <= PHONE_SLOTS; i++) {
-		gchar *phone;
-		gint   phone_type;
-
-		extract_phone_record (editor, i, &phone, &phone_type);
-
-		if (!STRING_IS_EMPTY (phone)) {
-			EVCardAttribute *attr;
-
-			attr = e_vcard_attribute_new ("", "TEL");
-
-			if (phone_type >= 0) {
-				const gchar *type_1;
-				const gchar *type_2;
-
-				phone_index_to_type (phone_type, &type_1, &type_2);
-
-				e_vcard_attribute_add_param_with_value (
-					attr, e_vcard_attribute_param_new (EVC_TYPE), type_1);
-
-				if (type_2)
-					e_vcard_attribute_add_param_with_value (
-						attr, e_vcard_attribute_param_new (EVC_TYPE), type_2);
-
-			}
-
-			e_vcard_attribute_add_value (attr, phone);
-			set_ui_slot (attr, i);
-
-			attr_list = g_list_append (attr_list, attr);
-		}
-
-		g_free (phone);
-	}
-
-	/* Splice in the old attributes, minus the PHONE_SLOTS first */
-
-	old_attr_list = get_attributes_named (E_VCARD (editor->contact), "TEL");
-	for (l = old_attr_list, i = 1; l && i <= PHONE_SLOTS; l = l_next, i++) {
-		l_next = g_list_next (l);
-
-		e_vcard_attribute_free (l->data);
-		g_list_delete_link (l, l);
-	}
-
-	old_attr_list = l;
-	attr_list = g_list_concat (attr_list, old_attr_list);
-
-	set_attributes_named (E_VCARD (editor->contact), "TEL", attr_list);
-
-	free_attr_list (attr_list);
-}
-
-static void
-init_phone_record_type (EContactEditor *editor, gint record)
-{
-	GtkWidget *phone_type_option_menu;
-	GtkWidget *phone_type_menu;
-	GtkWidget *phone_entry;
-	gchar     *widget_name;
-	gint       i;
-
-	widget_name = g_strdup_printf ("entry-phone-%d", record);
-	phone_entry = glade_xml_get_widget (editor->gui, widget_name);
-	g_free (widget_name);
-
-	widget_name = g_strdup_printf ("optionmenu-phone-%d", record);
-	phone_type_option_menu = glade_xml_get_widget (editor->gui, widget_name);
-	g_free (widget_name);
-
-	phone_type_menu = gtk_menu_new ();
-
-	for (i = 0; i < G_N_ELEMENTS (phones); i++) {
-		GtkWidget *item;
-
-		item = gtk_menu_item_new_with_label (e_contact_pretty_name (phones [i].field_id));
-		gtk_menu_shell_append (GTK_MENU_SHELL (phone_type_menu), item);
-	}
-
-	gtk_widget_show_all (phone_type_menu);
-	gtk_option_menu_set_menu (GTK_OPTION_MENU (phone_type_option_menu), phone_type_menu);
-
-	g_signal_connect (phone_type_option_menu, "changed", G_CALLBACK (object_changed), editor);
-	g_signal_connect (phone_entry, "changed", G_CALLBACK (object_changed), editor);
-	g_signal_connect_swapped (phone_entry, "activate", G_CALLBACK (entry_activated), editor);
-}
-
-static void
-init_phone (EContactEditor *editor)
-{
-	gint i;
-
-	expand_phone (editor, FALSE);
-
-	for (i = 1; i <= PHONE_SLOTS; i++)
-		init_phone_record_type (editor, i);
-}
-
-static void
-sensitize_phone_types (EContactEditor *editor, GtkWidget *option_menu)
-{
-	GtkWidget *menu;
-	GList     *item_list, *l;
-	gint       i;
-
-	menu = gtk_option_menu_get_menu (GTK_OPTION_MENU (option_menu));
-	l = item_list = gtk_container_get_children (GTK_CONTAINER (menu));
-
-	for (i = 0; i < G_N_ELEMENTS (phones); i++) {
-		GtkWidget *widget;
-
-		if (!l) {
-			g_warning (G_STRLOC ": Unexpected end of phone items in option menu");
-			return;
-		}
-
-		widget = l->data;
-		gtk_widget_set_sensitive (widget, is_field_supported (editor, phones [i].field_id));
-
-		l = g_list_next (l);
-	}
-}
-
-static void
-sensitize_phone_record (EContactEditor *editor, gint record, gboolean enabled)
-{
-	GtkWidget *phone_type_option_menu;
-	GtkWidget *phone_entry;
-	gchar     *widget_name;
-
-	widget_name = g_strdup_printf ("optionmenu-phone-%d", record);
-	phone_type_option_menu = glade_xml_get_widget (editor->gui, widget_name);
-	g_free (widget_name);
-
-	widget_name = g_strdup_printf ("entry-phone-%d", record);
-	phone_entry = glade_xml_get_widget (editor->gui, widget_name);
-	g_free (widget_name);
-
-	gtk_widget_set_sensitive (phone_type_option_menu, enabled);
-	gtk_editable_set_editable (GTK_EDITABLE (phone_entry), enabled);
-
-	sensitize_phone_types (editor, phone_type_option_menu);
-}
-
-static void
-sensitize_phone (EContactEditor *editor)
-{
-	gint i;
-
-	for (i = 1; i <= PHONE_SLOTS; i++) {
-		gboolean enabled = TRUE;
-
-		if (!editor->target_editable)
-			enabled = FALSE;
-
-		sensitize_phone_record (editor, i, enabled);
-	}
-}
-
-static void
-init_im_record_location (EContactEditor *editor, gint record)
-{
-	GtkWidget *location_option_menu;
-	GtkWidget *location_menu;
-	GtkWidget *name_entry;
-	gchar     *widget_name;
-	gint       i;
-
-	widget_name = g_strdup_printf ("entry-im-name-%d", record);
-	name_entry = glade_xml_get_widget (editor->gui, widget_name);
-	g_free (widget_name);
-
-#ifdef ENABLE_IM_LOCATION
-	widget_name = g_strdup_printf ("optionmenu-im-location-%d", record);
-	location_option_menu = glade_xml_get_widget (editor->gui, widget_name);
-	g_free (widget_name);
-
-	location_menu = gtk_menu_new ();
-
-	for (i = 0; i < G_N_ELEMENTS (common_location); i++) {
-		GtkWidget *item;
-
-		item = gtk_menu_item_new_with_label (_(common_location [i].pretty_name));
-		gtk_menu_shell_append (GTK_MENU_SHELL (location_menu), item);
-	}
-
-	gtk_widget_show_all (location_menu);
-	gtk_option_menu_set_menu (GTK_OPTION_MENU (location_option_menu), location_menu);
-
-	g_signal_connect (location_option_menu, "changed", G_CALLBACK (object_changed), editor);
-#endif
-
-	g_signal_connect (name_entry, "changed", G_CALLBACK (object_changed), editor);
-	g_signal_connect_swapped (name_entry, "activate", G_CALLBACK (entry_activated), editor);
-}
-
-static void
-init_im_record_service (EContactEditor *editor, gint record)
-{
-	GtkWidget *service_option_menu;
-	GtkWidget *service_menu;
-	gchar     *widget_name;
-	gint       i;
-
-	widget_name = g_strdup_printf ("optionmenu-im-service-%d", record);
-	service_option_menu = glade_xml_get_widget (editor->gui, widget_name);
-	g_free (widget_name);
-
-	service_menu = gtk_menu_new ();
-
-	for (i = 0; i < G_N_ELEMENTS (im_service); i++) {
-		GtkWidget *item;
-
-		item = gtk_menu_item_new_with_label (im_service [i].pretty_name);
-		gtk_menu_shell_append (GTK_MENU_SHELL (service_menu), item);
-	}
-
-	gtk_widget_show_all (service_menu);
-	gtk_option_menu_set_menu (GTK_OPTION_MENU (service_option_menu), service_menu);
-
-	g_signal_connect (service_option_menu, "changed", G_CALLBACK (object_changed), editor);
-}
-
-static void
-init_im (EContactEditor *editor)
-{
-	gint i;
-
-	for (i = 1; i <= IM_SLOTS; i++) {
-		init_im_record_service  (editor, i);
-		init_im_record_location (editor, i);
-	}
-}
-
-static void
-fill_in_im_record (EContactEditor *editor, gint record, gint service, const gchar *name, gint location)
-{
-	GtkWidget *service_option_menu;
-#ifdef ENABLE_IM_LOCATION
-	GtkWidget *location_option_menu;
-#endif
-	GtkWidget *name_entry;
-	gchar     *widget_name;
-
-	widget_name = g_strdup_printf ("optionmenu-im-service-%d", record);
-	service_option_menu = glade_xml_get_widget (editor->gui, widget_name);
-	g_free (widget_name);
-
-#ifdef ENABLE_IM_LOCATION
-	widget_name = g_strdup_printf ("optionmenu-im-location-%d", record);
-	location_option_menu = glade_xml_get_widget (editor->gui, widget_name);
-	g_free (widget_name);
-#endif
-
-	widget_name = g_strdup_printf ("entry-im-name-%d", record);
-	name_entry = glade_xml_get_widget (editor->gui, widget_name);
-	g_free (widget_name);
-
-#ifdef ENABLE_IM_LOCATION
-	set_option_menu_history (editor, GTK_OPTION_MENU (location_option_menu),
-				 location >= 0 ? location : 0);
-#endif
-	set_option_menu_history (editor, GTK_OPTION_MENU (service_option_menu),
-				 service >= 0 ? service : im_service_default [record - 1]);
-	set_entry_text (editor, GTK_ENTRY (name_entry), name ? name : "");
-}
-
-static void
-fill_in_im (EContactEditor *editor)
-{
-	GList *im_attr_list;
-	GList *l;
-	gint   record_n;
-	gint   i;
-
-	/* Clear */
-
-	for (record_n = 1 ; record_n <= IM_SLOTS; record_n++) {
-		fill_in_im_record (editor, record_n, -1, NULL, -1);
-	}
-
-	/* Fill in */
-
-	for (record_n = 1, i = 0; i < G_N_ELEMENTS (im_service); i++) {
-		im_attr_list = e_contact_get_attributes (editor->contact, im_service [i].field);
-
-		for (l = im_attr_list; l && record_n <= IM_SLOTS; l = g_list_next (l)) {
-			EVCardAttribute *attr = l->data;
-			gchar           *im_name;
-			gint             slot;
-
-			im_name = e_vcard_attribute_get_value (attr);
-			slot = alloc_ui_slot (editor, "entry-im-name", get_ui_slot (attr), IM_SLOTS);
-			if (slot < 1)
-				break;
-
-			fill_in_im_record (editor, slot, i, im_name,
-					   get_im_location (attr));
-
-			record_n++;
-		}
-	}
-}
-
-static void
-extract_im_record (EContactEditor *editor, gint record, gint *service, gchar **name, gint *location)
-{
-	GtkWidget *service_option_menu;
-#ifdef ENABLE_IM_LOCATION
-	GtkWidget *location_option_menu;
-#endif
-	GtkWidget *name_entry;
-	gchar     *widget_name;
-
-	widget_name = g_strdup_printf ("optionmenu-im-service-%d", record);
-	service_option_menu = glade_xml_get_widget (editor->gui, widget_name);
-	g_free (widget_name);
-
-#ifdef ENABLE_IM_LOCATION
-	widget_name = g_strdup_printf ("optionmenu-im-location-%d", record);
-	location_option_menu = glade_xml_get_widget (editor->gui, widget_name);
-	g_free (widget_name);
-#endif
-
-	widget_name = g_strdup_printf ("entry-im-name-%d", record);
-	name_entry = glade_xml_get_widget (editor->gui, widget_name);
-	g_free (widget_name);
-
-	*name  = g_strdup (gtk_entry_get_text (GTK_ENTRY (name_entry)));
-	*service = gtk_option_menu_get_history (GTK_OPTION_MENU (service_option_menu));
-#ifdef ENABLE_IM_LOCATION
-	*location = gtk_option_menu_get_history (GTK_OPTION_MENU (location_option_menu));
-#else
-	*location = 1; /* set everything to HOME */
-#endif
-}
-
-static void
-extract_im (EContactEditor *editor)
-{
-	GList **service_attr_list;
-	gint    remaining_slots = IM_SLOTS;
-	gint    i;
-
-	service_attr_list = g_new0 (GList *, G_N_ELEMENTS (im_service));
-
-	for (i = 1; i <= IM_SLOTS; i++) {
-		EVCardAttribute *attr;
-		gchar           *name;
-		gint             service;
-		gint             location;
-
-		extract_im_record (editor, i, &service, &name, &location);
-
-		if (!STRING_IS_EMPTY (name)) {
-			attr = e_vcard_attribute_new ("", e_contact_vcard_attribute (im_service [service].field));
-
-			if (location >= 0)
-				e_vcard_attribute_add_param_with_value (attr,
-									e_vcard_attribute_param_new (EVC_TYPE),
-									im_index_to_location (location));
-
-			e_vcard_attribute_add_value (attr, name);
-			set_ui_slot (attr, i);
-
-			service_attr_list [service] = g_list_append (service_attr_list [service], attr);
-		}
-
-		g_free (name);
-	}
-
-	for (i = 0; i < G_N_ELEMENTS (im_service); i++) {
-		GList *old_service_attr_list;
-		gint   filled_in_slots;
-		GList *l, *l_next;
-		gint   j;
-
-		/* Splice in the old attributes, minus the filled_in_slots first */
-
-		old_service_attr_list = e_contact_get_attributes (editor->contact, im_service [i].field);
-		filled_in_slots = MIN (remaining_slots, g_list_length (old_service_attr_list));
-		remaining_slots -= filled_in_slots;
-
-		for (l = old_service_attr_list, j = 0; l && j < filled_in_slots; l = l_next, j++) {
-			l_next = g_list_next (l);
-
-			e_vcard_attribute_free (l->data);
-			g_list_delete_link (l, l);
-		}
-
-		old_service_attr_list = l;
-		service_attr_list [i] = g_list_concat (service_attr_list [i], old_service_attr_list);
-
-		e_contact_set_attributes (editor->contact, im_service [i].field,
-					  service_attr_list [i]);
-
-		free_attr_list (service_attr_list [i]);
-	}
-
-	g_free (service_attr_list);
-}
-static void
-sensitize_im_types (EContactEditor *editor, GtkWidget *option_menu)
-{
-	GtkWidget *menu;
-	GList     *item_list, *l;
-	gint       i;
-
-	menu = gtk_option_menu_get_menu (GTK_OPTION_MENU (option_menu));
-	l = item_list = gtk_container_get_children (GTK_CONTAINER (menu));
-
-	for (i = 0; i < G_N_ELEMENTS (im_service); i++) {
-		GtkWidget *widget;
-
-		if (!l) {
-			g_warning (G_STRLOC ": Unexpected end of im items in option menu");
-			return;
-		}
-
-		widget = l->data;
-		gtk_widget_set_sensitive (widget, is_field_supported (editor, im_service [i].field));
-
-		l = g_list_next (l);
-	}
-}
-
-static void
-sensitize_im_record (EContactEditor *editor, gint record, gboolean enabled)
-{
-	GtkWidget *service_option_menu;
-#ifdef ENABLE_IM_LOCATION
-	GtkWidget *location_option_menu;
-#endif
-	GtkWidget *name_entry;
-	gchar     *widget_name;
-
-	widget_name = g_strdup_printf ("optionmenu-im-service-%d", record);
-	service_option_menu = glade_xml_get_widget (editor->gui, widget_name);
-	g_free (widget_name);
-
-#ifdef ENABLE_IM_LOCATION
-	widget_name = g_strdup_printf ("optionmenu-im-location-%d", record);
-	location_option_menu = glade_xml_get_widget (editor->gui, widget_name);
-	g_free (widget_name);
-#endif
-
-	widget_name = g_strdup_printf ("entry-im-name-%d", record);
-	name_entry = glade_xml_get_widget (editor->gui, widget_name);
-	g_free (widget_name);
-
-	gtk_widget_set_sensitive (service_option_menu, enabled);
-#ifdef ENABLE_IM_LOCATION
-	gtk_widget_set_sensitive (location_option_menu, enabled);
-#endif
-	gtk_editable_set_editable (GTK_EDITABLE (name_entry), enabled);
-	sensitize_im_types (editor, service_option_menu);
-}
-
-static void
-sensitize_im (EContactEditor *editor)
-{
-	gint i;
-	gboolean enabled; 
-	gboolean no_ims_supported;
-	
-	enabled = editor->target_editable;
-	no_ims_supported = TRUE;
-
-	for (i = 0; i < G_N_ELEMENTS (im_service); i++) 
-		if (is_field_supported (editor, im_service[i].field)) {
-			no_ims_supported = FALSE;
-			break;
-		}
-
-	if (no_ims_supported)
-		enabled = FALSE;
-	
-	for (i = 1; i <= IM_SLOTS; i++) {
-		sensitize_im_record (editor, i, enabled);
-	}
-}
-
-static void
-init_address_textview (EContactEditor *editor, gint record)
-{
-	gchar         *textview_name;
-	GtkWidget     *textview;
-	GtkTextBuffer *text_buffer;
-
-	textview_name = g_strdup_printf ("textview-%s-address", address_name [record]);
-	textview = glade_xml_get_widget (editor->gui, textview_name);
-	g_free (textview_name);
-
-	text_buffer = gtk_text_view_get_buffer (GTK_TEXT_VIEW (textview));
-	g_signal_connect (text_buffer, "changed", G_CALLBACK (object_changed), editor);
-}
-
-static void
-init_address_field (EContactEditor *editor, gint record, const gchar *widget_field_name)
-{
-	gchar     *entry_name;
-	GtkWidget *entry;
-
-	entry_name = g_strdup_printf ("entry-%s-%s", address_name [record], widget_field_name);
-	entry = glade_xml_get_widget (editor->gui, entry_name);
-	g_free (entry_name);
-
-	g_signal_connect (entry, "changed", G_CALLBACK (object_changed), editor);
-	g_signal_connect_swapped (entry, "activate", G_CALLBACK (entry_activated), editor);
-}
-
-static void
-init_address_record (EContactEditor *editor, gint record)
-{
-	init_address_textview (editor, record);
-	init_address_field (editor, record, "city");
-	init_address_field (editor, record, "state");
-	init_address_field (editor, record, "zip");
-	init_address_field (editor, record, "country");
-	init_address_field (editor, record, "pobox");
-}
-
-static void
-init_address (EContactEditor *editor)
-{
-	gint i;
-
-	for (i = 0; i < ADDRESS_SLOTS; i++)
-		init_address_record (editor, i);
-}
-
-static void
-fill_in_address_textview (EContactEditor *editor, gint record, EContactAddress *address)
-{
-	gchar         *textview_name;
-	GtkWidget     *textview;
-	GtkTextBuffer *text_buffer;
-	GtkTextIter    iter;
-
-	textview_name = g_strdup_printf ("textview-%s-address", address_name [record]);
-	textview = glade_xml_get_widget (editor->gui, textview_name);
-	g_free (textview_name);
-
-	text_buffer = gtk_text_view_get_buffer (GTK_TEXT_VIEW (textview));
-	gtk_text_buffer_set_text (text_buffer, address->street ? address->street : "", -1);
-
-	gtk_text_buffer_get_end_iter (text_buffer, &iter);
-	gtk_text_buffer_insert (text_buffer, &iter, "\n", -1);
-	gtk_text_buffer_insert (text_buffer, &iter, address->ext ? address->ext : "", -1);
-}
-
-static void
-fill_in_address_label_textview (EContactEditor *editor, gint record, const gchar *label)
-{
-	gchar         *textview_name;
-	GtkWidget     *textview;
-	GtkTextBuffer *text_buffer;
-
-	textview_name = g_strdup_printf ("textview-%s-address", address_name [record]);
-	textview = glade_xml_get_widget (editor->gui, textview_name);
-	g_free (textview_name);
-
-	text_buffer = gtk_text_view_get_buffer (GTK_TEXT_VIEW (textview));
-	gtk_text_buffer_set_text (text_buffer, label ? label : "", -1);
-}
-
-static void
-fill_in_address_field (EContactEditor *editor, gint record, const gchar *widget_field_name,
-		       const gchar *string)
-{
-	gchar     *entry_name;
-	GtkWidget *entry;
-
-	entry_name = g_strdup_printf ("entry-%s-%s", address_name [record], widget_field_name);
-	entry = glade_xml_get_widget (editor->gui, entry_name);
-	g_free (entry_name);
-
-	set_entry_text (editor, GTK_ENTRY (entry), string);
-}
-
-static void
-fill_in_address_record (EContactEditor *editor, gint record)
-{
-	EContactAddress *address;
-	gchar           *address_label;
-
-	address = e_contact_get (editor->contact, addresses [record]);
-	address_label = e_contact_get (editor->contact, address_labels [record]);
-
-	if (address &&
-	    (!STRING_IS_EMPTY (address->street)   ||
-	     !STRING_IS_EMPTY (address->ext)      ||
-	     !STRING_IS_EMPTY (address->locality) ||
-	     !STRING_IS_EMPTY (address->region)   ||
-	     !STRING_IS_EMPTY (address->code)     ||
-	     !STRING_IS_EMPTY (address->po)       ||
-	     !STRING_IS_EMPTY (address->country))) {
-		fill_in_address_textview (editor, record, address);
-		fill_in_address_field (editor, record, "city", address->locality);
-		fill_in_address_field (editor, record, "state", address->region);
-		fill_in_address_field (editor, record, "zip", address->code);
-		fill_in_address_field (editor, record, "country", address->country);
-		fill_in_address_field (editor, record, "pobox", address->po);
-	} else if (!STRING_IS_EMPTY (address_label)) {
-		fill_in_address_label_textview (editor, record, address_label);
-	}
-
-	g_free (address_label);
-	if (address)
-		g_boxed_free (e_contact_address_get_type (), address);
-}
-
-static void
-fill_in_address (EContactEditor *editor)
-{
-	gint i;
-
-	for (i = 0; i < ADDRESS_SLOTS; i++)
-		fill_in_address_record (editor, i);
-}
-
-static void
-extract_address_textview (EContactEditor *editor, gint record, EContactAddress *address)
-{
-	gchar         *textview_name;
-	GtkWidget     *textview;
-	GtkTextBuffer *text_buffer;
-	GtkTextIter    iter_1, iter_2;
-
-	textview_name = g_strdup_printf ("textview-%s-address", address_name [record]);
-	textview = glade_xml_get_widget (editor->gui, textview_name);
-	g_free (textview_name);
-
-	text_buffer = gtk_text_view_get_buffer (GTK_TEXT_VIEW (textview));
-	gtk_text_buffer_get_start_iter (text_buffer, &iter_1);
-
-	/* Skip blank lines */
-	while (gtk_text_iter_get_chars_in_line (&iter_1) < 1 &&
-	       !gtk_text_iter_is_end (&iter_1))
-		gtk_text_iter_forward_line (&iter_1);
-
-	if (gtk_text_iter_is_end (&iter_1))
-		return;
-
-	iter_2 = iter_1;
-	gtk_text_iter_forward_to_line_end (&iter_2);
-
-	/* Extract street (first line of text) */
-	address->street = gtk_text_iter_get_text (&iter_1, &iter_2);
-
-	iter_1 = iter_2;
-	gtk_text_iter_forward_line (&iter_1);
-
-	if (gtk_text_iter_is_end (&iter_1))
-		return;
-
-	gtk_text_iter_forward_to_end (&iter_2);
-
-	/* Extract extended address (remaining lines of text) */
-	address->ext = gtk_text_iter_get_text (&iter_1, &iter_2);
-}
-
-static gchar *
-extract_address_field (EContactEditor *editor, gint record, const gchar *widget_field_name)
-{
-	gchar     *entry_name;
-	GtkWidget *entry;
-
-	entry_name = g_strdup_printf ("entry-%s-%s", address_name [record], widget_field_name);
-	entry = glade_xml_get_widget (editor->gui, entry_name);
-	g_free (entry_name);
-
-	return g_strdup (gtk_entry_get_text (GTK_ENTRY (entry)));
-}
-
-static gchar *
-append_to_address_label (gchar *address_label, const gchar *part, gboolean newline)
-{
-	gchar *new_address_label;
-
-	if (STRING_IS_EMPTY (part))
-		return address_label;
-
-	if (address_label)
-		new_address_label = g_strjoin (newline ? "\n" : ", ", address_label, part, NULL);
-	else
-		new_address_label = g_strdup (part);
-
-	g_free (address_label);
-	return new_address_label;
-}
-
-static void
-set_address_label (EContact *contact, EContactField field, EContactAddress *address)
-{
-	gchar *address_label = NULL;
-
-	if (address) {
-		address_label = append_to_address_label (address_label, address->street, TRUE);
-		address_label = append_to_address_label (address_label, address->ext, TRUE);
-		address_label = append_to_address_label (address_label, address->locality, TRUE);
-		address_label = append_to_address_label (address_label, address->region, FALSE);
-		address_label = append_to_address_label (address_label, address->code, TRUE);
-		address_label = append_to_address_label (address_label, address->po, TRUE);
-		address_label = append_to_address_label (address_label, address->country, TRUE);
-	}
-
-	e_contact_set (contact, field, address_label);
-	g_free (address_label);
-}
-
-static void
-extract_address_record (EContactEditor *editor, gint record)
-{
-	EContactAddress *address;
-
-	address = g_new0 (EContactAddress, 1);
-
-	extract_address_textview (editor, record, address);
-	address->locality = extract_address_field (editor, record, "city");
-	address->region   = extract_address_field (editor, record, "state");
-	address->code     = extract_address_field (editor, record, "zip");
-	address->country  = extract_address_field (editor, record, "country");
-	address->po       = extract_address_field (editor, record, "pobox");
-
-	if (!STRING_IS_EMPTY (address->street)   ||
-	    !STRING_IS_EMPTY (address->ext)      ||
-	    !STRING_IS_EMPTY (address->locality) ||
-	    !STRING_IS_EMPTY (address->region)   ||
-	    !STRING_IS_EMPTY (address->code)     ||
-	    !STRING_IS_EMPTY (address->po)       ||
-	    !STRING_IS_EMPTY (address->country)) {
-		e_contact_set (editor->contact, addresses [record], address);
-		set_address_label (editor->contact, address_labels [record], address);
-	}
-	else {
-		e_contact_set (editor->contact, addresses [record], NULL);
-		set_address_label (editor->contact, address_labels [record], NULL);
-	}
-
-	g_boxed_free (e_contact_address_get_type (), address);
-}
-
-static void
-extract_address (EContactEditor *editor)
-{
-	gint i;
-
-	for (i = 0; i < ADDRESS_SLOTS; i++)
-		extract_address_record (editor, i);
-}
-
-static void
-sensitize_address_textview (EContactEditor *editor, gint record, gboolean enabled)
-{
-	gchar         *widget_name;
-	GtkWidget     *textview;
-	GtkWidget     *label;
-
-	widget_name = g_strdup_printf ("textview-%s-address", address_name [record]);
-	textview = glade_xml_get_widget (editor->gui, widget_name);
-	g_free (widget_name);
-
-	widget_name = g_strdup_printf ("label-%s-address", address_name [record]);
-	label = glade_xml_get_widget (editor->gui, widget_name);
-	g_free (widget_name);
-
-	gtk_text_view_set_editable (GTK_TEXT_VIEW (textview), enabled);
-	gtk_widget_set_sensitive (label, enabled);
-}
-
-static void
-sensitize_address_field (EContactEditor *editor, gint record, const gchar *widget_field_name,
-			 gboolean enabled)
-{
-	gchar     *widget_name;
-	GtkWidget *entry;
-	GtkWidget *label;
-
-	widget_name = g_strdup_printf ("entry-%s-%s", address_name [record], widget_field_name);
-	entry = glade_xml_get_widget (editor->gui, widget_name);
-	g_free (widget_name);
-
-	widget_name = g_strdup_printf ("label-%s-%s", address_name [record], widget_field_name);
-	label = glade_xml_get_widget (editor->gui, widget_name);
-	g_free (widget_name);
-
-	gtk_editable_set_editable (GTK_EDITABLE (entry), enabled);
-	gtk_widget_set_sensitive (label, enabled);
-}
-
-static void
-sensitize_address_record (EContactEditor *editor, gint record, gboolean enabled)
-{
-	sensitize_address_textview (editor, record, enabled);
-	sensitize_address_field (editor, record, "city", enabled);
-	sensitize_address_field (editor, record, "state", enabled);
-	sensitize_address_field (editor, record, "zip", enabled);
-	sensitize_address_field (editor, record, "country", enabled);
-	sensitize_address_field (editor, record, "pobox", enabled);
-}
-
-static void
-sensitize_address (EContactEditor *editor)
-{
-	gint i;
-
-	for (i = 0; i < ADDRESS_SLOTS; i++) {
-		gboolean enabled = TRUE;
-
-		if (!editor->target_editable ||
-		    !(is_field_supported (editor, addresses [i]) || 
-		      is_field_supported (editor, address_labels[i])))
-			enabled = FALSE;
-
-		sensitize_address_record (editor, i, enabled);
-	}
-}
-
-typedef struct {
-	char          *widget_name;
-	gint           field_id;      /* EContactField or -1 */
-	gboolean       process_data;  /* If we should extract/fill in contents */
-	gboolean       desensitize_for_read_only;
-}
-FieldMapping;
-
-/* Table of widgets that interact with simple fields. This table is used to:
- * 
- * - Fill in data.
- * - Extract data.
- * - Set sensitivity based on backend capabilities.
- * - Set sensitivity based on book writeability. */
-
-static FieldMapping simple_field_map [] = {
-	{ "entry-homepage",       E_CONTACT_HOMEPAGE_URL, TRUE,  TRUE  },
-	{ "accellabel-homepage",  E_CONTACT_HOMEPAGE_URL, FALSE, TRUE  },
-
-	{ "entry-jobtitle",       E_CONTACT_TITLE,        TRUE,  TRUE  },
-	{ "label-jobtitle",       E_CONTACT_TITLE,        FALSE, TRUE  },
-
-	{ "entry-company",        E_CONTACT_ORG,          TRUE,  TRUE  },
-	{ "label-company",        E_CONTACT_ORG,          FALSE, TRUE  },
-
-	{ "entry-department",     E_CONTACT_ORG_UNIT,     TRUE,  TRUE  },
-	{ "label-department",     E_CONTACT_ORG_UNIT,     FALSE, TRUE  },
-
-	{ "entry-profession",     E_CONTACT_ROLE,         TRUE,  TRUE  },
-	{ "label-profession",     E_CONTACT_ROLE,         FALSE, TRUE  },
-
-	{ "entry-manager",        E_CONTACT_MANAGER,      TRUE,  TRUE  },
-	{ "label-manager",        E_CONTACT_MANAGER,      FALSE, TRUE  },
-
-	{ "entry-assistant",      E_CONTACT_ASSISTANT,    TRUE,  TRUE  },
-	{ "label-assistant",      E_CONTACT_ASSISTANT,    FALSE, TRUE  },
-
-	{ "entry-nickname",       E_CONTACT_NICKNAME,     TRUE,  TRUE  },
-	{ "label-nickname",       E_CONTACT_NICKNAME,     FALSE, TRUE  },
-
-	{ "dateedit-birthday",    E_CONTACT_BIRTH_DATE,   TRUE,  TRUE  },
-	{ "label-birthday",       E_CONTACT_BIRTH_DATE,   FALSE, TRUE  },
-
-	{ "dateedit-anniversary", E_CONTACT_ANNIVERSARY,  TRUE,  TRUE  },
-	{ "label-anniversary",    E_CONTACT_ANNIVERSARY,  FALSE, TRUE  },
-
-	{ "entry-spouse",         E_CONTACT_SPOUSE,       TRUE,  TRUE  },
-	{ "label-spouse",         E_CONTACT_SPOUSE,       FALSE, TRUE  },
-
-	{ "entry-office",         E_CONTACT_OFFICE,       TRUE,  TRUE  },
-	{ "label-office",         E_CONTACT_OFFICE,       FALSE, TRUE  },
-
-	{ "text-comments",        E_CONTACT_NOTE,         TRUE,  TRUE  },
-	{ "label-comments",       E_CONTACT_NOTE,         FALSE, TRUE  },
-
-	{ "entry-fullname",       E_CONTACT_FULL_NAME,    TRUE,  TRUE  },
-	{ "button-fullname",      E_CONTACT_FULL_NAME,    FALSE, TRUE  },
-
-	{ "entry-categories",     E_CONTACT_CATEGORIES,   TRUE,  TRUE  },
-	{ "button-categories",    E_CONTACT_CATEGORIES,   FALSE, TRUE  },
-
-	{ "entry-weblog",         E_CONTACT_BLOG_URL,     TRUE,  TRUE  },
-	{ "label-weblog",         E_CONTACT_BLOG_URL,     FALSE, TRUE  },
-
-	{ "entry-caluri",         E_CONTACT_CALENDAR_URI, TRUE,  TRUE  },
-	{ "label-caluri",         E_CONTACT_CALENDAR_URI, FALSE, TRUE  },
-
-	{ "entry-fburl",          E_CONTACT_FREEBUSY_URL, TRUE,  TRUE  },
-	{ "label-fburl",          E_CONTACT_FREEBUSY_URL, FALSE, TRUE  },
-
-	{ "entry-videourl",       E_CONTACT_VIDEO_URL,    TRUE,  TRUE  },
-	{ "label-videourl",       E_CONTACT_VIDEO_URL,    FALSE, TRUE  },
-
-	{ "checkbutton-htmlmail", E_CONTACT_WANTS_HTML,   TRUE,  TRUE  },
-
-	{ "image-chooser",        E_CONTACT_PHOTO,        TRUE,  TRUE  },
-	{ "button-image",         E_CONTACT_PHOTO,        FALSE, TRUE  },
-
-	{ "combo-file-as",        E_CONTACT_FILE_AS,      FALSE, TRUE  },
-	{ "entry-file-as",        E_CONTACT_FILE_AS,      TRUE,  TRUE  },
-	{ "accellabel-fileas",    E_CONTACT_FILE_AS,      FALSE, TRUE  },
-};
-
-static void
-init_simple_field (EContactEditor *editor, GtkWidget *widget)
-{
-	GObject *changed_object = NULL;
-
-	if (GTK_IS_ENTRY (widget)) {
-		changed_object = G_OBJECT (widget);
-		g_signal_connect_swapped (widget, "activate", G_CALLBACK (entry_activated), editor);
-	}
-	else if (GTK_IS_TEXT_VIEW (widget)) {
-		changed_object = G_OBJECT (gtk_text_view_get_buffer (GTK_TEXT_VIEW (widget)));
-	}
-	else if (E_IS_URL_ENTRY (widget)) {
-		changed_object = G_OBJECT (e_url_entry_get_entry (E_URL_ENTRY (widget)));
-		g_signal_connect_swapped (GTK_WIDGET (changed_object), "activate",
-					  G_CALLBACK (entry_activated), editor);
-	}
-	else if (E_IS_DATE_EDIT (widget)) {
-		changed_object = G_OBJECT (widget);
-	}
-	else if (E_IS_IMAGE_CHOOSER (widget)) {
-		changed_object = G_OBJECT (widget);
-		g_signal_connect (widget, "changed", G_CALLBACK (image_chooser_changed), editor);
-	}
-	else if (GTK_IS_TOGGLE_BUTTON (widget)) {
-		g_signal_connect (widget, "toggled", G_CALLBACK (object_changed), editor);
-	}
-
-	if (changed_object)
-		g_signal_connect (changed_object, "changed", G_CALLBACK (object_changed), editor);
-}
-
-static void
-fill_in_simple_field (EContactEditor *editor, GtkWidget *widget, gint field_id)
-{
-	EContact *contact;
-
-	contact = editor->contact;
-
-	g_signal_handlers_block_matched (widget, G_SIGNAL_MATCH_DATA,
-					 0, 0, NULL, NULL, editor);
-
-	if (GTK_IS_ENTRY (widget)) {
-		gchar *text = e_contact_get (contact, field_id);
-		gtk_entry_set_text (GTK_ENTRY (widget), STRING_MAKE_NON_NULL (text));
-		g_free (text);
-	}
-	else if (GTK_IS_TEXT_VIEW (widget)) {
-		GtkTextBuffer *buffer = gtk_text_view_get_buffer (GTK_TEXT_VIEW (widget));
-		gchar         *text   = e_contact_get (contact, field_id);
-		gtk_text_buffer_set_text (buffer, STRING_MAKE_NON_NULL (text), -1);
-		g_free (text);
-	}
-	else if (E_IS_URL_ENTRY (widget)) {
-		GtkWidget *entry = e_url_entry_get_entry (E_URL_ENTRY (widget));
-		gchar     *text  = e_contact_get (contact, field_id);
-		gtk_entry_set_text (GTK_ENTRY (entry), STRING_MAKE_NON_NULL (text));
-		g_free (text);
-	}
-	else if (E_IS_DATE_EDIT (widget)) {
-		EContactDate *date = e_contact_get (contact, field_id);
-		if (date)
-			e_date_edit_set_date (E_DATE_EDIT (widget),
-					      date->year,
-					      date->month,
-					      date->day);
-		else
-			e_date_edit_set_time (E_DATE_EDIT (widget), -1);
-
-		e_contact_date_free (date);
-	}
-	else if (E_IS_IMAGE_CHOOSER (widget)) {
-		EContactPhoto *photo = e_contact_get (contact, field_id);
-		if (photo) {
-			e_image_chooser_set_image_data (E_IMAGE_CHOOSER (widget),
-							photo->data,
-							photo->length);
-			editor->image_set = TRUE;
-		}
-		else {
-			gchar *file_name = e_icon_factory_get_icon_filename ("stock_person", 48);
-			e_image_chooser_set_from_file (E_IMAGE_CHOOSER (widget), file_name);
-			editor->image_set = FALSE;
-			g_free (file_name);
-		}
-
-		e_contact_photo_free (photo);
-	}
-	else if (GTK_IS_TOGGLE_BUTTON (widget)) {
-		gboolean val = (gboolean) e_contact_get (contact, field_id);
-		gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (widget), val);
-	}
-	else {
-		g_warning (G_STRLOC ": Unhandled widget class in mappings!");
-	}
-
-	g_signal_handlers_unblock_matched (widget, G_SIGNAL_MATCH_DATA,
-					   0, 0, NULL, NULL, editor);
-}
-
-static void
-extract_simple_field (EContactEditor *editor, GtkWidget *widget, gint field_id)
-{
-	EContact *contact;
-
-	contact = editor->contact;
-
-	if (GTK_IS_ENTRY (widget)) {
-		const gchar *text = gtk_entry_get_text (GTK_ENTRY (widget));
-		e_contact_set (contact, field_id, (gchar *) text);
-	}
-	else if (GTK_IS_TEXT_VIEW (widget)) {
-		GtkTextBuffer *buffer = gtk_text_view_get_buffer (GTK_TEXT_VIEW (widget));
-		GtkTextIter    start, end;
-		gchar         *text;
-
-		gtk_text_buffer_get_start_iter (buffer, &start);
-		gtk_text_buffer_get_end_iter   (buffer, &end);
-		text = gtk_text_buffer_get_text (buffer, &start, &end, FALSE);
-		e_contact_set (contact, field_id, text);
-		g_free (text);
-	}
-	else if (E_IS_URL_ENTRY (widget)) {
-		GtkWidget   *entry = e_url_entry_get_entry (E_URL_ENTRY (widget));
-		const gchar *text  = gtk_entry_get_text (GTK_ENTRY (entry));
-		e_contact_set (contact, field_id, (gchar *) text);
-	}
-	else if (E_IS_DATE_EDIT (widget)) {
-		EContactDate date;
-		if (e_date_edit_get_date (E_DATE_EDIT (widget),
-					  &date.year,
-					  &date.month,
-					  &date.day))
-			e_contact_set (contact, field_id, &date);
-		else
-			e_contact_set (contact, field_id, NULL);
-	}
-	else if (E_IS_IMAGE_CHOOSER (widget)) {
-		EContactPhoto photo;
-
-		if (editor->image_set &&
-		    e_image_chooser_get_image_data (E_IMAGE_CHOOSER (widget),
-						    &photo.data, &photo.length)) {
-			e_contact_set (contact, field_id, &photo);
-			g_free (photo.data);
-		}
-		else {
-			e_contact_set (contact, E_CONTACT_PHOTO, NULL);
-		}
-	}
-	else if (GTK_IS_TOGGLE_BUTTON (widget)) {
-		gboolean val = gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (widget));
-		e_contact_set (contact, field_id, (gpointer) val);
-	}
-	else {
-		g_warning (G_STRLOC ": Unhandled widget class in mappings!");
-	}
-}
-
-static void
-sensitize_simple_field (GtkWidget *widget, gboolean enabled)
-{
-	if (GTK_IS_ENTRY (widget))
-		gtk_editable_set_editable (GTK_EDITABLE (widget), enabled);
-	else if (GTK_IS_TEXT_VIEW (widget))
-		gtk_text_view_set_editable (GTK_TEXT_VIEW (widget), enabled);
-	else if (E_IS_URL_ENTRY (widget)) {
-		GtkWidget *entry = e_url_entry_get_entry (E_URL_ENTRY (widget));
-		gtk_editable_set_editable (GTK_EDITABLE (entry), enabled);
-	}
-	else if (E_IS_DATE_EDIT (widget))
-		e_date_edit_set_editable (E_DATE_EDIT (widget), enabled);
-	else
-		gtk_widget_set_sensitive (widget, enabled);
-}
-
-static void
-init_simple (EContactEditor *editor)
-{
-	GtkWidget *widget;
-	gint       i;
-
-	for (i = 0; i < G_N_ELEMENTS (simple_field_map); i++) {
-		GtkWidget *widget;
-
-		widget = glade_xml_get_widget (editor->gui, simple_field_map [i].widget_name);
-		if (!widget)
-			continue;
-
-		init_simple_field (editor, widget);
-	}
-
-	/* --- Special cases --- */
-
-	/* Update file_as */
-
-	widget = glade_xml_get_widget (editor->gui, "entry-fullname");
-	g_signal_connect (widget, "changed", G_CALLBACK (name_entry_changed), editor);
-	widget = glade_xml_get_widget (editor->gui, "entry-file-as");
-	g_signal_connect (widget, "changed", G_CALLBACK (file_as_entry_changed), editor);
-	widget = glade_xml_get_widget (editor->gui, "entry-company");
-	g_signal_connect (widget, "changed", G_CALLBACK (company_entry_changed), editor);
-}
-
-static void
-fill_in_simple (EContactEditor *editor)
-{
-	EContactName *name;
-	gint          i;
-
-	for (i = 0; i < G_N_ELEMENTS (simple_field_map); i++) {
-		GtkWidget *widget;
-
-		if (simple_field_map [i].field_id < 0 ||
-		    !simple_field_map [i].process_data)
-			continue;
-
-		widget = glade_xml_get_widget (editor->gui, simple_field_map [i].widget_name);
-		if (!widget)
-			continue;
-
-		fill_in_simple_field (editor, widget, simple_field_map [i].field_id);
-	}
-
-	/* --- Special cases --- */
-
-	/* Update broken-up name */
-
-	g_object_get (editor->contact,
-		      "name", &name,
-		      NULL);
-
-	if (editor->name)
-		e_contact_name_free (editor->name);
-
-	editor->name = name;
-
-	/* Update file_as combo options */
-
-	update_file_as_combo (editor);
-}
-
-static void
-extract_simple (EContactEditor *editor)
-{
-	gint i;
-
-	for (i = 0; i < G_N_ELEMENTS (simple_field_map); i++) {
-		GtkWidget *widget;
-
-		if (simple_field_map [i].field_id < 0 ||
-		    !simple_field_map [i].process_data)
-			continue;
-
-		widget = glade_xml_get_widget (editor->gui, simple_field_map [i].widget_name);
-		if (!widget)
-			continue;
-
-		extract_simple_field (editor, widget, simple_field_map [i].field_id);
-	}
-
-	/* Special cases */
-
-	e_contact_set (editor->contact, E_CONTACT_NAME, editor->name);
-}
-
-static void
-sensitize_simple (EContactEditor *editor)
-{
-	gint i;
-
-	for (i = 0; i < G_N_ELEMENTS (simple_field_map); i++) {
-		GtkWidget *widget;
-		gboolean   enabled = TRUE;
-
-		widget = glade_xml_get_widget (editor->gui, simple_field_map [i].widget_name);
-		if (!widget)
-			continue;
-
-		if (simple_field_map [i].field_id >= 0 &&
-		    !is_field_supported (editor, simple_field_map [i].field_id))
-			enabled = FALSE;
-
-		if (simple_field_map [i].desensitize_for_read_only &&
-		    !editor->target_editable)
-			enabled = FALSE;
-
-		sensitize_simple_field (widget, enabled);
-	}
-}
-
-static void
-fill_in_all (EContactEditor *editor)
-{
-	fill_in_source_field (editor);
-	fill_in_simple       (editor);
-	fill_in_email        (editor);
-	fill_in_phone        (editor);
-	fill_in_im           (editor);
-	fill_in_address      (editor);
-}
-
-static void
-extract_all (EContactEditor *editor)
-{
-	extract_simple  (editor);
-	extract_email   (editor);
-	extract_phone   (editor);
-	extract_im      (editor);
-	extract_address (editor);
-}
-
-static void
-sensitize_all (EContactEditor *editor)
-{
-	sensitize_ok      (editor);
-	sensitize_simple  (editor);
-	sensitize_email   (editor);
-	sensitize_phone   (editor);
-	sensitize_im      (editor);
-	sensitize_address (editor);
-}
-
-static void
-init_all (EContactEditor *editor)
-{
-	init_simple  (editor);
-	init_email   (editor);
-	init_phone   (editor);
-	init_im      (editor);
-	init_address (editor);
-}
-
-static void
-new_target_cb (EBook *new_book, EBookStatus status, EContactEditor *editor)
-{
-	editor->load_source_id = 0;
-	editor->load_book      = NULL;
-
-	if (status != E_BOOK_ERROR_OK || new_book == NULL) {
-		GtkWidget *source_option_menu;
-
-		eab_load_error_dialog (NULL, e_book_get_source (new_book), status);
-
-		source_option_menu = glade_xml_get_widget (editor->gui, "source-option-menu-source");
-		e_source_option_menu_select (E_SOURCE_OPTION_MENU (source_option_menu),
-					     e_book_get_source (editor->target_book));
-
-		if (new_book)
-			g_object_unref (new_book);
-		return;
-	}
-
-	g_object_set (editor, "target_book", new_book, NULL);
-	g_object_unref (new_book);
-}
-
-static void
-cancel_load (EContactEditor *editor)
-{
-	if (editor->load_source_id) {
-		addressbook_load_cancel (editor->load_source_id);
-		editor->load_source_id = 0;
-
-		g_object_unref (editor->load_book);
-		editor->load_book = NULL;
-	}
-}
-
-static void
-source_selected (GtkWidget *source_option_menu, ESource *source, EContactEditor *editor)
-{
-	cancel_load (editor);
-
-	if (e_source_equal (e_book_get_source (editor->target_book), source))
-		return;
-
-	if (e_source_equal (e_book_get_source (editor->source_book), source)) {
-		g_object_set (editor, "target_book", editor->source_book, NULL);
-		return;
-	}
-
-	editor->load_book = e_book_new (source, NULL);
-	editor->load_source_id = addressbook_load (editor->load_book,
-						   (EBookCallback) new_target_cb, editor);
-}
-
-static void
-full_name_clicked (GtkWidget *button, EContactEditor *editor)
-{
-	GtkDialog *dialog = GTK_DIALOG (e_contact_editor_fullname_new (editor->name));
-	gboolean fullname_supported;
-	int result;
-
-	fullname_supported = is_field_supported (editor, E_CONTACT_FULL_NAME);
-
-	g_object_set (dialog,
-		      "editable", fullname_supported & editor->target_editable,
-		      NULL);
-	gtk_widget_show (GTK_WIDGET(dialog));
-	result = gtk_dialog_run (dialog);
-	gtk_widget_hide (GTK_WIDGET (dialog));
-
-	if (fullname_supported && editor->target_editable && result == GTK_RESPONSE_OK) {
-		EContactName *name;
-		GtkWidget *fname_widget;
-		int style = 0;
-
-		g_object_get (dialog,
-			      "name", &name,
-			      NULL);
-
-		style = file_as_get_style(editor);
-
-		fname_widget = glade_xml_get_widget(editor->gui, "entry-fullname");
-		if (fname_widget && GTK_IS_ENTRY (fname_widget)) {
-			char *full_name = e_contact_name_to_string(name);
-			const char *old_full_name = gtk_entry_get_text (GTK_ENTRY(fname_widget));
-
-			if (strcmp (full_name, old_full_name))
-				gtk_entry_set_text (GTK_ENTRY (fname_widget), full_name);
-			g_free(full_name);
-		}
-
-		e_contact_name_free(editor->name);
-		editor->name = name;
-
-		file_as_set_style(editor, style);
-	}
-	gtk_widget_destroy (GTK_WIDGET (dialog));
-}
-
-static void
-categories_clicked (GtkWidget *button, EContactEditor *editor)
-{
-	char *categories = NULL;
-	GtkDialog *dialog;
-	int result;
-	GtkWidget *entry = glade_xml_get_widget(editor->gui, "entry-categories");
-
-	if (entry && GTK_IS_ENTRY(entry))
-		categories = g_strdup (gtk_entry_get_text(GTK_ENTRY(entry)));
-	else if (editor->contact)
-		categories = e_contact_get (editor->contact, E_CONTACT_CATEGORIES);
-
-	if (!(dialog = GTK_DIALOG (e_categories_dialog_new (categories)))) {
-		e_error_run (NULL, "addressbook:edit-categories", NULL);
-		g_free (categories);
-		return;
-	}
-	
-	gtk_widget_show(GTK_WIDGET(dialog));
-	result = gtk_dialog_run (dialog);
-	g_free (categories);
-	if (result == GTK_RESPONSE_OK) {
-		categories = e_categories_dialog_get_categories (E_CATEGORIES_DIALOG (dialog));
-		if (entry && GTK_IS_ENTRY(entry))
-			gtk_entry_set_text (GTK_ENTRY (entry), categories);
-		else
-			e_contact_set (editor->contact, E_CONTACT_CATEGORIES, categories);
-	}
-	gtk_widget_destroy(GTK_WIDGET(dialog));
-}
-
-static void
-image_selected (EContactEditor *editor)
-{
-	gchar     *file_name;
-	GtkWidget *image_chooser;
-
-#ifdef USE_GTKFILECHOOSER
-	file_name = gtk_file_chooser_get_filename (GTK_FILE_CHOOSER (editor->file_selector));
-#else
-	file_name = (gchar *) gtk_file_selection_get_filename (GTK_FILE_SELECTION (editor->file_selector));
-#endif
-
-	if (!file_name)
-		return;
-
-	image_chooser = glade_xml_get_widget (editor->gui, "image-chooser");
-
-	g_signal_handlers_block_by_func (image_chooser, image_chooser_changed, editor);
-	e_image_chooser_set_from_file (E_IMAGE_CHOOSER (image_chooser), file_name);
-	g_signal_handlers_unblock_by_func (image_chooser, image_chooser_changed, editor);
-
-	editor->image_set = TRUE;
-	object_changed (G_OBJECT (image_chooser), editor);
-}
-
-static void
-image_cleared (EContactEditor *editor)
-{
-	GtkWidget *image_chooser;
-	gchar     *file_name;
-
-	image_chooser = glade_xml_get_widget (editor->gui, "image-chooser");
-
-	file_name = e_icon_factory_get_icon_filename ("stock_person", 48);
-
-	g_signal_handlers_block_by_func (image_chooser, image_chooser_changed, editor);
-	e_image_chooser_set_from_file (E_IMAGE_CHOOSER (image_chooser), file_name);
-	g_signal_handlers_unblock_by_func (image_chooser, image_chooser_changed, editor);
-
-	g_free (file_name);
-
-	editor->image_set = FALSE;
-	object_changed (G_OBJECT (image_chooser), editor);
-}
-
-#ifdef USE_GTKFILECHOOSER
-
-static void
-file_chooser_response (GtkWidget *widget, gint response, EContactEditor *editor)
-{
-	if (response == GTK_RESPONSE_ACCEPT)
-		image_selected (editor);
-	else if (response == GTK_RESPONSE_NO)
-		image_cleared (editor);
-
-	gtk_widget_hide (editor->file_selector);
-}
-
-#endif
-
-static gboolean
-file_selector_deleted (GtkWidget *widget)
-{
-	gtk_widget_hide (widget);
-	return TRUE;
-}
-
-static void
-image_clicked (GtkWidget *button, EContactEditor *editor)
-{
-	GtkWidget *clear_button;
-	GtkWidget *dialog;
-	const gchar *title = _("Please select an image for this contact");
-	const gchar *no_image = _("No image");
-
-	if (!editor->file_selector) {
-#ifdef USE_GTKFILECHOOSER
-		editor->file_selector = gtk_file_chooser_dialog_new (title,
-								     GTK_WINDOW (editor->app),
-								     GTK_FILE_CHOOSER_ACTION_OPEN,
-								     GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL,
-								     GTK_STOCK_OPEN, GTK_RESPONSE_ACCEPT,
-								     no_image, GTK_RESPONSE_NO,
-								     NULL);
-		gtk_dialog_set_default_response (GTK_DIALOG (editor->file_selector), GTK_RESPONSE_ACCEPT);
-
-		gtk_file_chooser_set_current_folder (GTK_FILE_CHOOSER (editor->file_selector), g_get_home_dir ());
-
-		g_signal_connect (editor->file_selector, "response",
-				  G_CALLBACK (file_chooser_response), editor);
-#else
-		/* Create the selector */
-
-		editor->file_selector = gtk_file_selection_new (title);
-
-		dialog = GTK_FILE_SELECTION (editor->file_selector)->fileop_dialog;
-
-		clear_button = gtk_dialog_add_button (GTK_DIALOG (editor->file_selector), no_image, 0);
-
-		g_signal_connect_swapped (GTK_OBJECT (GTK_FILE_SELECTION (editor->file_selector)->ok_button),
-					  "clicked", G_CALLBACK (image_selected), editor);
-
-		g_signal_connect_swapped (clear_button,
-					  "clicked", G_CALLBACK (image_cleared), editor);
-
-		/* Ensure that the dialog box gets hidden when the user clicks a button */
-
-		g_signal_connect_swapped (GTK_OBJECT (GTK_FILE_SELECTION (editor->file_selector)->ok_button),
-					  "clicked", G_CALLBACK (gtk_widget_hide), editor->file_selector); 
-
-		g_signal_connect_swapped (GTK_OBJECT (GTK_FILE_SELECTION (editor->file_selector)->cancel_button),
-					  "clicked", G_CALLBACK (gtk_widget_hide), editor->file_selector); 
-
-		g_signal_connect_swapped (clear_button,
-					  "clicked", G_CALLBACK (gtk_widget_hide), editor->file_selector); 
-#endif
-
-		g_signal_connect_after (editor->file_selector,
-					"delete-event", G_CALLBACK (file_selector_deleted),
-					editor->file_selector);
-	}
-
-	/* Display the dialog */
-
-	gtk_window_present (GTK_WINDOW (editor->file_selector));
-}
-
-typedef struct {
-	EContactEditor *ce;
-	gboolean should_close;
-	gchar *new_id;
-} EditorCloseStruct;
-
-static void
-contact_moved_cb (EBook *book, EBookStatus status, EditorCloseStruct *ecs)
-{
-	EContactEditor *ce = ecs->ce;
-	gboolean should_close = ecs->should_close;
-
-	gtk_widget_set_sensitive (ce->app, TRUE);
-	ce->in_async_call = FALSE;
-
-	e_contact_set (ce->contact, E_CONTACT_UID, ecs->new_id);
-
-	eab_editor_contact_deleted (EAB_EDITOR (ce), status, ce->contact);
-
-	ce->is_new_contact = FALSE;
-
-	if (should_close) {
-		eab_editor_close (EAB_EDITOR (ce));
-	}
-	else {
-		ce->changed = FALSE;
-
-		g_object_ref (ce->target_book);
-		g_object_unref (ce->source_book);
-		ce->source_book = ce->target_book;
-
-		sensitize_all (ce);
-	}
-
-	g_object_unref (ce);
-	g_free (ecs->new_id);
-	g_free (ecs);
-}
-
-static void
-contact_added_cb (EBook *book, EBookStatus status, const char *id, EditorCloseStruct *ecs)
-{
-	EContactEditor *ce = ecs->ce;
-	gboolean should_close = ecs->should_close;
-
-	if (ce->source_book != ce->target_book && e_book_is_writable (ce->source_book) &&
-	    status == E_BOOK_ERROR_OK && ce->is_new_contact == FALSE) {
-		ecs->new_id = g_strdup (id);
-		e_book_async_remove_contact (ce->source_book, ce->contact,
-					     (EBookCallback) contact_moved_cb, ecs);
-		return;
-	}
-
-	gtk_widget_set_sensitive (ce->app, TRUE);
-	ce->in_async_call = FALSE;
-
-	e_contact_set (ce->contact, E_CONTACT_UID, (char *) id);
-
-	eab_editor_contact_added (EAB_EDITOR (ce), status, ce->contact);
-
-	if (status == E_BOOK_ERROR_OK) {
-		ce->is_new_contact = FALSE;
-
-		if (should_close) {
-			eab_editor_close (EAB_EDITOR (ce));
-		}
-		else {
-			ce->changed = FALSE;
-			sensitize_all (ce);
-		}
-	}
-
-	g_object_unref (ce);
-	g_free (ecs);
-}
-
-static void
-contact_modified_cb (EBook *book, EBookStatus status, EditorCloseStruct *ecs)
-{
-	EContactEditor *ce = ecs->ce;
-	gboolean should_close = ecs->should_close;
-
-	gtk_widget_set_sensitive (ce->app, TRUE);
-	ce->in_async_call = FALSE;
-
-	eab_editor_contact_modified (EAB_EDITOR (ce), status, ce->contact);
-
-	if (status == E_BOOK_ERROR_OK) {
-		if (should_close) {
-			eab_editor_close (EAB_EDITOR (ce));
-		}
-		else {
-			ce->changed = FALSE;
-			sensitize_all (ce);
-		}
-	}
-
-	g_object_unref (ce);
-	g_free (ecs);
-}
-
-/* Emits the signal to request saving a contact */
-static void
-real_save_contact (EContactEditor *ce, gboolean should_close)
-{
-	EditorCloseStruct *ecs;
-
-	ecs = g_new0 (EditorCloseStruct, 1);
-	ecs->ce = ce;
-	g_object_ref (ecs->ce);
-
-	ecs->should_close = should_close;
-
-	gtk_widget_set_sensitive (ce->app, FALSE);
-	ce->in_async_call = TRUE;
-
-	if (ce->source_book != ce->target_book) {
-		/* Two-step move; add to target, then remove from source */
-		eab_merging_book_add_contact (ce->target_book, ce->contact,
-					      (EBookIdCallback) contact_added_cb, ecs);
-	} else {
-		if (ce->is_new_contact)
-			eab_merging_book_add_contact (ce->target_book, ce->contact,
-						      (EBookIdCallback) contact_added_cb, ecs);
-		else
-			eab_merging_book_commit_contact (ce->target_book, ce->contact,
-							 (EBookCallback) contact_modified_cb, ecs);
-	}
-}
-
-static void
-save_contact (EContactEditor *ce, gboolean should_close)
-{
-	char *uid;
-	
-	if (!ce->target_book)
-		return;
-	
-
-	if (ce->target_editable && !e_book_is_writable (ce->source_book)) {
-		if (e_error_run (GTK_WINDOW (ce->app), "addressbook:prompt-move", NULL) == GTK_RESPONSE_NO)
-			return;
-	}
-	extract_all (ce);
-	
-	if (!e_contact_editor_is_valid (EAB_EDITOR (ce))) {
-		uid = e_contact_get (ce->contact, E_CONTACT_UID);
-		g_object_unref (ce->contact);
-		ce->contact = e_contact_new ();
-		if (uid) {
-			e_contact_set (ce->contact, E_CONTACT_UID, uid);
-			g_free (uid);
-		}
-		return;
-	}
-		
-	real_save_contact (ce, should_close);
-}
-
-static void
-e_contact_editor_save_contact (EABEditor *editor, gboolean should_close)
-{
-	save_contact (E_CONTACT_EDITOR (editor), should_close);
-}
-
-/* Closes the dialog box and emits the appropriate signals */
-static void
-e_contact_editor_close (EABEditor *editor)
-{
-	EContactEditor *ce = E_CONTACT_EDITOR (editor);
-
-	if (ce->app != NULL) {
-		gtk_widget_destroy (ce->app);
-		ce->app = NULL;
-		eab_editor_closed (editor);
-	}
-}
-
-EContactField  non_string_fields [] = {
-	E_CONTACT_FULL_NAME,
-	E_CONTACT_ADDRESS,
-	E_CONTACT_ADDRESS_HOME,
-	E_CONTACT_ADDRESS_WORK,
-	E_CONTACT_ADDRESS_OTHER,
-	E_CONTACT_EMAIL,
-	E_CONTACT_IM_AIM,
-	E_CONTACT_IM_GROUPWISE,
-	E_CONTACT_IM_JABBER,
-	E_CONTACT_IM_YAHOO,
-	E_CONTACT_IM_MSN,
-	E_CONTACT_IM_ICQ,
-	E_CONTACT_PHOTO,
-	E_CONTACT_LOGO,
-	E_CONTACT_X509_CERT,
-	E_CONTACT_CATEGORY_LIST,
-	E_CONTACT_BIRTH_DATE,
-	E_CONTACT_ANNIVERSARY
-    
-	
-};
-
-static gboolean 
-is_non_string_field (EContactField id)
-{
-	int count = sizeof (non_string_fields) / sizeof (EContactField);
-	int i;
-	for (i = 0; i < count; i++)
-		if (id == non_string_fields[i])
-			return TRUE;
-	return FALSE;
-
-}
-          
-
-/* insert checks here (date format, for instance, etc.) */
-static gboolean
-e_contact_editor_is_valid (EABEditor *editor)
-{
-	EContactEditor *ce = E_CONTACT_EDITOR (editor);
-	GtkWidget *widget;
-	gboolean validation_error = FALSE;
-	EIterator *iter;
-	GString *errmsg = g_string_new (_("The contact data is invalid:\n\n"));
-
-	widget = glade_xml_get_widget (ce->gui, "dateedit-birthday");
-	if (!(e_date_edit_date_is_valid (E_DATE_EDIT (widget)))) {
-		g_string_append_printf (errmsg, "'%s' has an invalid format",
-					e_contact_pretty_name (E_CONTACT_BIRTH_DATE));
-		validation_error = TRUE;
-	}
-
-	widget = glade_xml_get_widget (ce->gui, "dateedit-anniversary");
-	if (!(e_date_edit_date_is_valid (E_DATE_EDIT (widget)))) {
-		g_string_append_printf (errmsg, "%s'%s' has an invalid format",
-					validation_error ? ",\n" : "",
-					e_contact_pretty_name (E_CONTACT_ANNIVERSARY));
-		validation_error = TRUE;
-	}
-
-	iter = e_list_get_iterator (ce->required_fields);
-	for (e_iterator_last (iter);
-	     e_iterator_is_valid (iter);
-	     e_iterator_prev (iter)) {
-		const char *field_name = e_iterator_get (iter);
-		EContactField  field_id = e_contact_field_id (field_name);
-	
-		if (is_non_string_field (field_id)) {
-			if (e_contact_get_const (ce->contact, field_id) == NULL) {
-				g_string_append_printf (errmsg, "%s'%s' is empty",
-							validation_error ? ",\n" : "",
-							e_contact_pretty_name (field_id));
-				validation_error = TRUE;
-				break;
-			}
-			
-		} else {
-			
-			char *text = e_contact_get_const (ce->contact, field_id);
-			if (STRING_IS_EMPTY (text)) {
-				g_string_append_printf (errmsg, "%s'%s' is empty",
-							validation_error ? ",\n" : "",
-							e_contact_pretty_name (field_id));
-				validation_error = TRUE;
-				break;
-			}
-				
-			
-		}
-	}
-		       
-	
-	if (validation_error) {
-		g_string_append (errmsg, ".");
-		e_error_run (GTK_WINDOW (ce->app), "addressbook:generic-error",
-			     _("Invalid contact."), errmsg->str, NULL);
-		g_string_free (errmsg, TRUE);
-		return FALSE;
-	}
-	else {
-		g_string_free (errmsg, TRUE);
-		return TRUE;
-	}
-}
-
-static gboolean
-e_contact_editor_is_changed (EABEditor *editor)
-{
-	return E_CONTACT_EDITOR (editor)->changed;
-}
-
-static GtkWindow*
-e_contact_editor_get_window (EABEditor *editor)
-{
-	return GTK_WINDOW (E_CONTACT_EDITOR (editor)->app);
-}
-
-static void
-file_save_and_close_cb (GtkWidget *widget, gpointer data)
-{
-	EContactEditor *ce;
-
-	ce = E_CONTACT_EDITOR (data);
-	save_contact (ce, TRUE);
-}
-
-static void
-file_cancel_cb (GtkWidget *widget, gpointer data)
-{
-	EContactEditor *ce = E_CONTACT_EDITOR (data);
-
-	eab_editor_close (EAB_EDITOR (ce));
-}
-
-/* Callback used when the dialog box is destroyed */
-static gint
-app_delete_event_cb (GtkWidget *widget, GdkEvent *event, gpointer data)
-{
-	EContactEditor *ce;
-
-	ce = E_CONTACT_EDITOR (data);
-
-	/* if we're saving, don't allow the dialog to close */
-	if (ce->in_async_call)
-		return TRUE;
-
-	if (ce->changed) {
-		switch (eab_prompt_save_dialog (GTK_WINDOW (ce->app))) {
-			case GTK_RESPONSE_YES:
-				if (!eab_editor_is_valid (EAB_EDITOR (ce)))
-					return TRUE;
-
-				eab_editor_save_contact (EAB_EDITOR (ce), TRUE);
-				return TRUE;
-
-			case GTK_RESPONSE_NO:
-				break;
-
-			case GTK_RESPONSE_CANCEL:
-			default:
-				return TRUE;
-
-		}
-	}
-
-	eab_editor_close (EAB_EDITOR (ce));
-	return TRUE;
-}
-
-static void
-show_help_cb (GtkWidget *widget, gpointer data)
-{
-	GError *error = NULL;
-
-	gnome_help_display_desktop (NULL,
-				    "evolution-" BASE_VERSION,
-				    "evolution-" BASE_VERSION ".xml",
-				    "usage-contact-cards",
-				    &error);
-	if (error != NULL)
-		g_warning ("%s", error->message);
-}
-
-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-phone-1");
-		list = add_to_tab_order(list, gui, "entry-phone-2");
-		list = add_to_tab_order(list, gui, "entry-phone-3");
-		list = add_to_tab_order(list, gui, "entry-phone-4");
-
-		list = add_to_tab_order(list, gui, "entry-email1");
-		list = add_to_tab_order(list, gui, "alignment-htmlmail");
-		list = add_to_tab_order(list, gui, "entry-web");
-		list = add_to_tab_order(list, gui, "entry-homepage");
-		list = add_to_tab_order(list, gui, "button-fulladdr");
-		list = add_to_tab_order(list, gui, "text-address");
-		list = g_list_reverse(list);
-		e_container_change_tab_order(GTK_CONTAINER(container), list);
-		g_list_free(list);
-	}
-}
-
-static void
-expand_phone_toggle (EContactEditor *ce)
-{
-	GtkWidget *phone_ext_table;
-
-	phone_ext_table = glade_xml_get_widget (ce->gui, "table-phone-extended");
-	expand_phone (ce, GTK_WIDGET_VISIBLE (phone_ext_table) ? FALSE : TRUE);
-}
-
-static void
-e_contact_editor_init (EContactEditor *e_contact_editor)
-{
-	GladeXML *gui;
-	GtkWidget *widget, *label;
-	char *icon_path;
-
-	e_contact_editor->name = e_contact_name_new();
-
-	e_contact_editor->contact = NULL;
-	e_contact_editor->changed = FALSE;
-	e_contact_editor->image_set = FALSE;
-	e_contact_editor->in_async_call = FALSE;
-	e_contact_editor->target_editable = TRUE;
-
-	e_contact_editor->load_source_id = 0;
-	e_contact_editor->load_book = NULL;
-
-	gui = glade_xml_new (EVOLUTION_GLADEDIR "/contact-editor.glade", NULL, NULL);
-	e_contact_editor->gui = gui;
-
-	setup_tab_order(gui);
-
-	e_contact_editor->app = glade_xml_get_widget (gui, "contact editor");
-	widget = e_contact_editor->app;
-
-	gtk_widget_ensure_style (widget);
-	gtk_window_set_type_hint (GTK_WINDOW (widget), GDK_WINDOW_TYPE_HINT_NORMAL);
-	gtk_container_set_border_width (GTK_CONTAINER (GTK_DIALOG (widget)->vbox), 0);
-	gtk_container_set_border_width (GTK_CONTAINER (GTK_DIALOG (widget)->action_area), 12);
-
-	init_all (e_contact_editor);
-
-	widget = glade_xml_get_widget (e_contact_editor->gui, "button-image");
-	g_signal_connect (widget, "clicked", G_CALLBACK (image_clicked), e_contact_editor);
-
-	widget = glade_xml_get_widget(e_contact_editor->gui, "button-fullname");
-	g_signal_connect (widget, "clicked", G_CALLBACK (full_name_clicked), e_contact_editor);
-	widget = glade_xml_get_widget(e_contact_editor->gui, "button-categories");
-	g_signal_connect (widget, "clicked", G_CALLBACK (categories_clicked), e_contact_editor);
-	widget = glade_xml_get_widget (e_contact_editor->gui, "source-option-menu-source");
-	g_signal_connect (widget, "source_selected", G_CALLBACK (source_selected), e_contact_editor);
-	label = glade_xml_get_widget (e_contact_editor->gui, "where-label");
-	gtk_label_set_mnemonic_widget (GTK_LABEL (label), widget);
-	widget = glade_xml_get_widget (e_contact_editor->gui, "button-ok");
-	g_signal_connect (widget, "clicked", G_CALLBACK (file_save_and_close_cb), e_contact_editor);
-	widget = glade_xml_get_widget (e_contact_editor->gui, "button-cancel");
-	g_signal_connect (widget, "clicked", G_CALLBACK (file_cancel_cb), e_contact_editor);
-	widget = glade_xml_get_widget (e_contact_editor->gui, "button-help");
-	g_signal_connect (widget, "clicked", G_CALLBACK (show_help_cb), e_contact_editor);
-	widget = glade_xml_get_widget (e_contact_editor->gui, "button-phone-expand");
-	g_signal_connect_swapped (widget, "clicked", G_CALLBACK (expand_phone_toggle), e_contact_editor);
-
-	widget = glade_xml_get_widget (e_contact_editor->gui, "entry-fullname");
-	if (widget)
-		gtk_widget_grab_focus (widget);
-
-	/* Connect to the deletion of the dialog */
-
-	g_signal_connect (e_contact_editor->app, "delete_event",
-			    GTK_SIGNAL_FUNC (app_delete_event_cb), e_contact_editor);
-
-	/* set the icon */
-	icon_path = g_build_filename (EVOLUTION_IMAGESDIR, "evolution-contacts-mini.png", NULL);
-	gnome_window_icon_set_from_file (GTK_WINDOW (e_contact_editor->app), icon_path);
-	g_free (icon_path);
-
-	/* show window */
-	gtk_widget_show (e_contact_editor->app);
-}
-
-void
-e_contact_editor_dispose (GObject *object)
-{
-	EContactEditor *e_contact_editor = E_CONTACT_EDITOR(object);
-
-	if (e_contact_editor->file_selector != NULL) {
-		gtk_widget_destroy (e_contact_editor->file_selector);
-		e_contact_editor->file_selector = NULL;
-	}
-
-	if (e_contact_editor->writable_fields) {
-		g_object_unref(e_contact_editor->writable_fields);
-		e_contact_editor->writable_fields = NULL;
-	}
-	if (e_contact_editor->required_fields) {
-		g_object_unref (e_contact_editor->required_fields);
-		e_contact_editor->required_fields = NULL;
-	}
-	if (e_contact_editor->contact) {
-		g_object_unref(e_contact_editor->contact);
-		e_contact_editor->contact = NULL;
-	}
-	
-	if (e_contact_editor->source_book) {
-		g_object_unref(e_contact_editor->source_book);
-		e_contact_editor->source_book = NULL;
-	}
-
-	if (e_contact_editor->target_book) {
-		g_signal_handler_disconnect (e_contact_editor->target_book, e_contact_editor->target_editable_id);
-		g_object_unref(e_contact_editor->target_book);
-		e_contact_editor->target_book = NULL;
-	}
-
-	if (e_contact_editor->name) {
-		e_contact_name_free(e_contact_editor->name);
-		e_contact_editor->name = NULL;
-	}
-
-	if (e_contact_editor->gui) {
-		g_object_unref(e_contact_editor->gui);
-		e_contact_editor->gui = NULL;
-	}
-
-	cancel_load (e_contact_editor);
-
-	if (G_OBJECT_CLASS (parent_class)->dispose)
-		(* G_OBJECT_CLASS (parent_class)->dispose) (object);
-}
-
-static void
-supported_fields_cb (EBook *book, EBookStatus status,
-		     EList *fields, EContactEditor *ce)
-{
-	if (!g_slist_find ((GSList*)eab_editor_get_all_editors (), ce)) {
-		g_warning ("supported_fields_cb called for book that's still around, but contact editor that's been destroyed.");
-		return;
-	}
-
-	g_object_set (ce,
-		      "writable_fields", fields,
-		      NULL);
-
-	eab_editor_show (EAB_EDITOR (ce));
-
-	sensitize_all (ce);
-}
-
-static void
-required_fields_cb (EBook *book, EBookStatus status,
-		    EList *fields, EContactEditor *ce)
-{
-
-	if (!g_slist_find ((GSList*)eab_editor_get_all_editors (), ce)) {
-		g_warning ("supported_fields_cb called for book that's still around, but contact editor that's been destroyed.");
-		return;
-	}
-
-	g_object_set (ce,
-		      "required_fields", fields,
-		      NULL);
-
-
-}
-
-
-static void
-contact_editor_destroy_notify (void *data,
-			       GObject *where_the_object_was)
-{
-	eab_editor_remove (EAB_EDITOR (data));
-}
-
-EContactEditor *
-e_contact_editor_new (EBook *book,
-		      EContact *contact,
-		      gboolean is_new_contact,
-		      gboolean editable)
-{
-	EContactEditor *ce;
-
-	g_return_val_if_fail (E_IS_BOOK (book), NULL);
-	g_return_val_if_fail (E_IS_CONTACT (contact), NULL);
-
-	ce = g_object_new (E_TYPE_CONTACT_EDITOR, NULL);
-
-	eab_editor_add (EAB_EDITOR (ce));
-	g_object_weak_ref (G_OBJECT (ce), contact_editor_destroy_notify, ce);
-
-	g_object_set (ce,
-		      "source_book", book,
-		      "contact", contact,
-		      "is_new_contact", is_new_contact,
-		      "editable", editable,
-		      NULL);
-
-	if (book)
-		e_book_async_get_supported_fields (book, (EBookEListCallback)supported_fields_cb, ce);
-
-	return ce;
-}
-
-static void
-writable_changed (EBook *book, gboolean writable, EContactEditor *ce)
-{
-	int new_target_editable;
-	gboolean changed = FALSE;
-
-	new_target_editable = e_book_is_writable (ce->target_book);
-
-	if (ce->target_editable != new_target_editable)
-		changed = TRUE;
-
-	ce->target_editable = new_target_editable;
-
-	if (changed)
-		sensitize_all (ce);
-}
-
-static void
-e_contact_editor_set_property (GObject *object, guint prop_id, const GValue *value, GParamSpec *pspec)
-{
-	EContactEditor *editor;
-
-	editor = E_CONTACT_EDITOR (object);
-	
-	switch (prop_id){
-	case PROP_SOURCE_BOOK: {
-		gboolean  writable;
-		gboolean  changed = FALSE;
-		EBook    *source_book;
-
-		source_book = E_BOOK (g_value_get_object (value));
-
-		if (source_book == editor->source_book)
-			break;
-
-		if (editor->source_book)
-			g_object_unref(editor->source_book);
-
-		editor->source_book = source_book;
-		g_object_ref (editor->source_book);
- 
-		if (!editor->target_book) {
-			editor->target_book = editor->source_book;
-			g_object_ref (editor->target_book);
-
-			editor->target_editable_id = g_signal_connect (editor->target_book, "writable_status",
-								       G_CALLBACK (writable_changed), editor);
-
-			e_book_async_get_supported_fields (editor->target_book,
-							   (EBookEListCallback) supported_fields_cb, editor);
-			e_book_async_get_required_fields (editor->target_book,
-							  (EBookEListCallback)  required_fields_cb, editor);
-		}
-
-		writable = e_book_is_writable (editor->target_book);
-		if (writable != editor->target_editable) {
-			editor->target_editable = writable;
-			changed = TRUE;
-		}
-
-		if (changed)
-			sensitize_all (editor);
-
-		break;
-	}
-
-	case PROP_TARGET_BOOK: {
-		gboolean  writable;
-		gboolean  changed = FALSE;
-		EBook    *target_book;
-
-		target_book = E_BOOK (g_value_get_object (value));
-
-		if (target_book == editor->target_book)
-			break;
-
-		if (editor->target_book) {
-			g_signal_handler_disconnect (editor->target_book, editor->target_editable_id);
-			g_object_unref(editor->target_book);
-		}
-
-		editor->target_book = target_book;
-		g_object_ref (editor->target_book);
-
-		editor->target_editable_id = g_signal_connect (editor->target_book, "writable_status",
-							       G_CALLBACK (writable_changed), editor);
-
-		e_book_async_get_supported_fields (editor->target_book,
-						   (EBookEListCallback) supported_fields_cb, editor);
-
-		e_book_async_get_required_fields (editor->target_book,
-							  (EBookEListCallback)  required_fields_cb, editor);
-		if (!editor->is_new_contact)
-			editor->changed = TRUE;
-
-		writable = e_book_is_writable (editor->target_book);
-
-		if (writable != editor->target_editable) {
-			editor->target_editable = writable;
-			changed = TRUE;
-		}
-
-		if (changed)
-			sensitize_all (editor);
-
-		/* If we're trying to load a new target book, cancel that here. */
-		cancel_load (editor);
-		break;
-	}
-
-	case PROP_CONTACT:
-		if (editor->contact)
-			g_object_unref(editor->contact);
-		editor->contact = e_contact_duplicate(E_CONTACT(g_value_get_object (value)));
-		fill_in_all (editor);
-		editor->changed = FALSE;
-		break;
-
-	case PROP_IS_NEW_CONTACT:
-		editor->is_new_contact = g_value_get_boolean (value) ? TRUE : FALSE;
-		break;
-
-	case PROP_EDITABLE: {
-		gboolean new_value = g_value_get_boolean (value) ? TRUE : FALSE;
-		gboolean changed = (editor->target_editable != new_value);
-
-		editor->target_editable = new_value;
-
-		if (changed)
-			sensitize_all (editor);
-		break;
-	}
-
-	case PROP_CHANGED: {
-		gboolean new_value = g_value_get_boolean (value) ? TRUE : FALSE;
-		gboolean changed = (editor->changed != new_value);
-
-		editor->changed = new_value;
-
-		if (changed)
-			sensitize_ok (editor);
-		break;
-	}
-	case PROP_WRITABLE_FIELDS:
-		if (editor->writable_fields)
-			g_object_unref(editor->writable_fields);
-
-		editor->writable_fields = g_value_get_object (value);
-		if (editor->writable_fields)
-			g_object_ref (editor->writable_fields);
-		else
-			editor->writable_fields = e_list_new(NULL, NULL, NULL);
-
-		sensitize_all (editor);
-		break;
-	case PROP_REQUIRED_FIELDS:
-		if (editor->required_fields)
-			g_object_unref (editor->required_fields);
-		editor->required_fields = g_value_get_object (value);
-		if (editor->required_fields)
-			g_object_ref (editor->required_fields);
-		else 
-			editor->required_fields = e_list_new (NULL, NULL, NULL);
-		break;
-	default:
-		G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
-		break;
-	}
-}
-
-static void
-e_contact_editor_get_property (GObject *object, guint prop_id, GValue *value, GParamSpec *pspec)
-{
-	EContactEditor *e_contact_editor;
-
-	e_contact_editor = E_CONTACT_EDITOR (object);
-
-	switch (prop_id) {
-	case PROP_SOURCE_BOOK:
-		g_value_set_object (value, e_contact_editor->source_book);
-		break;
-
-	case PROP_TARGET_BOOK:
-		g_value_set_object (value, e_contact_editor->target_book);
-		break;
-
-	case PROP_CONTACT:
-		extract_all (e_contact_editor);
-		g_value_set_object (value, e_contact_editor->contact);
-		break;
-
-	case PROP_IS_NEW_CONTACT:
-		g_value_set_boolean (value, e_contact_editor->is_new_contact ? TRUE : FALSE);
-		break;
-
-	case PROP_EDITABLE:
-		g_value_set_boolean (value, e_contact_editor->target_editable ? TRUE : FALSE);
-		break;
-
-	case PROP_CHANGED:
-		g_value_set_boolean (value, e_contact_editor->changed ? TRUE : FALSE);
-		break;
-
-	case PROP_WRITABLE_FIELDS:
-		if (e_contact_editor->writable_fields)
-			g_value_set_object (value, e_list_duplicate (e_contact_editor->writable_fields));
-		else
-			g_value_set_object (value, NULL);
-		break;
-	case PROP_REQUIRED_FIELDS:
-		if (e_contact_editor->required_fields)
-			g_value_set_object (value, e_list_duplicate (e_contact_editor->required_fields));
-		else
-			g_value_set_object (value, NULL);
-		break;
-	default:
-		G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
-		break;
-	}
-}
-
-/**
- * e_contact_editor_raise:
- * @config: The %EContactEditor object.
- *
- * Raises the dialog associated with this %EContactEditor object.
- */
-static void
-e_contact_editor_raise (EABEditor *editor)
-{
-	EContactEditor *ce = E_CONTACT_EDITOR (editor);
-
-	if (GTK_WIDGET (ce->app)->window)
-		gdk_window_raise (GTK_WIDGET (ce->app)->window);
-}
-
-/**
- * e_contact_editor_show:
- * @ce: The %EContactEditor object.
- *
- * Shows the dialog associated with this %EContactEditor object.
- */
-static void
-e_contact_editor_show (EABEditor *editor)
-{
-	EContactEditor *ce = E_CONTACT_EDITOR (editor);
-	gtk_widget_show (ce->app);
-}
-
-GtkWidget *
-e_contact_editor_create_date(gchar *name,
-			     gchar *string1, gchar *string2,
-			     gint int1, gint int2);
-
-GtkWidget *
-e_contact_editor_create_date(gchar *name,
-			     gchar *string1, gchar *string2,
-			     gint int1, gint int2)
-{
-	GtkWidget *widget = e_date_edit_new ();
-	AtkObject *a11y;
-
-	e_date_edit_set_allow_no_date_set (E_DATE_EDIT (widget),
-					   TRUE);
-	e_date_edit_set_show_time (E_DATE_EDIT (widget), FALSE);
-	e_date_edit_set_time (E_DATE_EDIT (widget), -1);
-
-	a11y = gtk_widget_get_accessible (e_date_edit_get_entry (E_DATE_EDIT(widget)));
-	if (a11y != NULL) {
-		atk_object_set_name (a11y, string1);
-	}
-
-	gtk_widget_show (widget);
-	return widget;
-}
-
-GtkWidget *
-e_contact_editor_create_web(gchar *name,
-			    gchar *string1, gchar *string2,
-			    gint int1, gint int2);
-
-GtkWidget *
-e_contact_editor_create_web(gchar *name,
-			    gchar *string1, gchar *string2,
-			    gint int1, gint int2)
-{
-	GtkWidget *widget = e_url_entry_new ();
-	AtkObject *a11y = gtk_widget_get_accessible (e_url_entry_get_entry (widget));
-
-	if (a11y != NULL) {
-		atk_object_set_name (a11y, string1);
-	}
-	
-	gtk_widget_show (widget);
-	return widget;
-}
-
-GtkWidget *
-e_contact_editor_create_source_option_menu (gchar *name,
-					    gchar *string1, gchar *string2,
-					    gint int1, gint int2);
-
-GtkWidget *
-e_contact_editor_create_source_option_menu (gchar *name,
-					    gchar *string1, gchar *string2,
-					    gint int1, gint int2)
-{
-	GtkWidget   *menu;
-	GConfClient *gconf_client;
-	ESourceList *source_list;
-
-	gconf_client = gconf_client_get_default ();
-	source_list = e_source_list_new_for_gconf (gconf_client, "/apps/evolution/addressbook/sources");
-
-	menu = e_source_option_menu_new (source_list);
-	g_object_unref (source_list);
-
-	gtk_widget_show (menu);
-	return menu;
-}
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 b27790d32a..0000000000
--- a/addressbook/gui/contact-editor/e-contact-editor.h
+++ /dev/null
@@ -1,116 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-/* e-contact-editor.h
- * Copyright (C) 2000  Ximian, Inc.
- * Author: Chris Lahey <clahey@ximian.com>
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of version 2 of the GNU General Public
- * License as published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * General Public License for more details.
- *
- * You should have received a copy of the GNU General Public
- * License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
- */
-#ifndef __E_CONTACT_EDITOR_H__
-#define __E_CONTACT_EDITOR_H__
-
-#include <libgnomeui/gnome-app.h>
-#include <libgnomeui/gnome-app-helper.h>
-#include <bonobo/bonobo-ui-component.h>
-#include <glade/glade.h>
-
-#include "addressbook/gui/contact-editor/eab-editor.h"
-
-#include <libebook/e-book.h>
-#include <libebook/e-contact.h>
-
-#include <gtk/gtktreeview.h>
-#include <gtk/gtkliststore.h>
-
-G_BEGIN_DECLS
-
-/* EContactEditor - A dialog displaying information about a contact.
- *
- * The following arguments are available:
- *
- * name		type		read/write	description
- * --------------------------------------------------------------------------------
- * card         ECard *         RW              The card currently being edited
- */
-
-#define E_TYPE_CONTACT_EDITOR			(e_contact_editor_get_type ())
-#define E_CONTACT_EDITOR(obj)			(G_TYPE_CHECK_INSTANCE_CAST ((obj), E_TYPE_CONTACT_EDITOR, EContactEditor))
-#define E_CONTACT_EDITOR_CLASS(klass)		(G_TYPE_CHECK_CLASS_CAST ((klass), E_TYPE_CONTACT_EDITOR, EContactEditorClass))
-#define E_IS_CONTACT_EDITOR(obj)		(G_TYPE_CHECK_INSTANCE_TYPE ((obj), E_TYPE_CONTACT_EDITOR))
-#define E_IS_CONTACT_EDITOR_CLASS(klass)	(G_TYPE_CHECK_CLASS_TYPE ((obj), E_TYPE_CONTACT_EDITOR))
-
-
-typedef struct _EContactEditor       EContactEditor;
-typedef struct _EContactEditorClass  EContactEditorClass;
-
-struct _EContactEditor
-{
-	EABEditor object;
-	
-	/* item specific fields */
-	EBook *source_book;
-	EBook *target_book;
-	EContact *contact;
-
-	/* UI handler */
-	BonoboUIComponent *uic;
-	
-	GladeXML *gui;
-	GtkWidget *app;
-
-	GtkWidget *file_selector;
-
-	EContactName *name;
-
-	/* Whether we are editing a new contact or an existing one */
-	guint is_new_contact : 1;
-
-	/* Whether the image chooser widget has been changed. */
-	guint image_set : 1;
-
-	/* Whether the contact has been changed since bringing up the contact editor */
-	guint changed : 1;
-
-	/* Whether the contact editor will accept modifications, save */
-	guint target_editable : 1;
-
-	/* Whether an async wombat call is in progress */
-	guint in_async_call : 1;
-
-	EList *writable_fields;
-	
-	EList *required_fields;
-
-	/* ID for async load_source call */
-	guint  load_source_id;
-	EBook *load_book;
-
-	/* signal ids for "writable_status" */
-	int target_editable_id;
-};
-
-struct _EContactEditorClass
-{
-	EABEditorClass parent_class;
-};
-
-EContactEditor *e_contact_editor_new                (EBook          *book,
-						     EContact       *contact,
-						     gboolean        is_new_contact,
-						     gboolean        editable);
-GType           e_contact_editor_get_type           (void);
-
-G_END_DECLS
-
-#endif /* __E_CONTACT_EDITOR_H__ */
diff --git a/addressbook/gui/contact-editor/e-contact-quick-add.c b/addressbook/gui/contact-editor/e-contact-quick-add.c
deleted file mode 100644
index d3765314ba..0000000000
--- a/addressbook/gui/contact-editor/e-contact-quick-add.c
+++ /dev/null
@@ -1,457 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-
-/*
- * e-contact-quick-add.c
- *
- * Copyright (C) 2001 Ximian, Inc.
- *
- * Developed by Jon Trowbridge <trow@ximian.com>
- */
-
-/*
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of version 2 of the GNU General Public
- * License as published by the Free Software Foundation.
- * 
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- * 
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
- * USA.
- */
-
-#include <config.h>
-#include <ctype.h>
-#include <string.h>
-#include <glib.h>
-#include <gtk/gtkentry.h>
-#include <gtk/gtklabel.h>
-#include <gtk/gtktable.h>
-#include <gtk/gtkdialog.h>
-#include <gtk/gtkstock.h>
-#include <libgnome/gnome-i18n.h>
-#include <libgnomeui/gnome-app.h>
-#include <libebook/e-book.h>
-#include <libebook/e-contact.h>
-#include <addressbook/gui/component/addressbook.h>
-#include <addressbook/util/eab-book-util.h>
-#include "e-contact-editor.h"
-#include "e-contact-quick-add.h"
-#include "eab-contact-merging.h"
-
-typedef struct _QuickAdd QuickAdd;
-struct _QuickAdd {
-	gchar *name;
-	gchar *email;
-	EContact *contact;
-
-	EContactQuickAddCallback cb;
-	gpointer closure;
-
-	GtkWidget *name_entry;
-	GtkWidget *email_entry;
-
-	gint refs;
-
-};
-
-static QuickAdd *
-quick_add_new (void)
-{
-	QuickAdd *qa = g_new0 (QuickAdd, 1);
-	qa->contact = e_contact_new ();
-	qa->refs = 1;
-	return qa;
-}
-
-static void
-quick_add_ref (QuickAdd *qa)
-{
-	if (qa) {
-		++qa->refs;
-	}
-}
-
-static void
-quick_add_unref (QuickAdd *qa)
-{
-	if (qa) {
-		--qa->refs;
-		if (qa->refs == 0) {
-			g_free (qa->name);
-			g_free (qa->email);
-			g_object_unref (qa->contact);
-			g_free (qa);
-		}
-	}
-}
-
-static void
-quick_add_set_name (QuickAdd *qa, const gchar *name)
-{
-	if (name == qa->name)
-		return;
-
-	g_free (qa->name);
-	qa->name = g_strdup (name);
-}
-
-static void
-quick_add_set_email (QuickAdd *qa, const gchar *email)
-{
-	if (email == qa->email)
-		return;
-
-	g_free (qa->email);
-	qa->email = g_strdup (email);
-}
-
-static void
-merge_cb (EBook *book, EBookStatus status, gpointer closure)
-{
-	QuickAdd *qa = (QuickAdd *) closure;
-
-	if (status == E_BOOK_ERROR_OK) {
-		eab_merging_book_add_contact (book, qa->contact, NULL, NULL);
-		if (qa->cb)
-			qa->cb (qa->contact, qa->closure);
-		g_object_unref (book);
-	} else {
-		/* Something went wrong. */
-		if (book)
-			g_object_unref (book);
-		if (qa->cb)
-			qa->cb (NULL, qa->closure);
-	}
-	
-	quick_add_unref (qa);
-}
-
-static void
-quick_add_merge_contact (QuickAdd *qa)
-{
-	quick_add_ref (qa);
-
-	addressbook_load_default_book (merge_cb, qa);
-}
-
-
-/*
- * Raise a contact editor with all fields editable, and hook up all signals accordingly.
- */
-
-static void
-contact_added_cb (EContactEditor *ce, EBookStatus status, EContact *contact, gpointer closure)
-{
-	QuickAdd *qa = (QuickAdd *) g_object_get_data (G_OBJECT (ce), "quick_add");
-
-	if (qa) {
-
-		if (qa->cb)
-			qa->cb (qa->contact, qa->closure);
-	
-		/* We don't need to unref qa because we set_data_full below */
-		g_object_set_data (G_OBJECT (ce), "quick_add", NULL);
-	}
-}
-
-static void
-editor_closed_cb (GtkWidget *w, gpointer closure)
-{
-	QuickAdd *qa = (QuickAdd *) g_object_get_data (G_OBJECT (w), "quick_add");
-
-	if (qa)
-		/* We don't need to unref qa because we set_data_full below */
-		g_object_set_data (G_OBJECT (w), "quick_add", NULL);
-
-	g_object_unref (w);
-}
-
-static void
-ce_have_book (EBook *book, EBookStatus status, gpointer closure)
-{
-	QuickAdd *qa = (QuickAdd *) closure;
-
-	if (status != E_BOOK_ERROR_OK) {
-		if (book)
-			g_object_unref (book);
-		g_warning ("Couldn't open local address book.");
-		quick_add_unref (qa);
-	} else {
-		EContactEditor *contact_editor = e_contact_editor_new (book, qa->contact, TRUE, TRUE /* XXX */);
-
-		/* mark it as changed so the Save buttons are enabled when we bring up the dialog. */
-		g_object_set (contact_editor,
-				"changed", TRUE,
-				NULL);
-
-		/* We pass this via object data, so that we don't get a dangling pointer referenced if both
-		   the "contact_added" and "editor_closed" get emitted.  (Which, based on a backtrace in bugzilla,
-		   I think can happen and cause a crash. */
-		g_object_set_data_full (G_OBJECT (contact_editor), "quick_add", qa,
-					(GDestroyNotify) quick_add_unref);
-
-		g_signal_connect (contact_editor,
-				  "contact_added",
-				  G_CALLBACK (contact_added_cb),
-				  NULL);
-		g_signal_connect (contact_editor,
-				  "editor_closed",
-				  G_CALLBACK (editor_closed_cb),
-				  NULL);
-
-		g_object_unref (book);
-	}
-}
-
-static void
-edit_contact (QuickAdd *qa)
-{
-	addressbook_load_default_book (ce_have_book, qa);
-}
-
-#define QUICK_ADD_RESPONSE_EDIT_FULL 2
-
-static void
-clicked_cb (GtkWidget *w, gint button, gpointer closure)
-{
-	QuickAdd *qa = (QuickAdd *) closure;
-
-	/* Get data out of entries. */
-	if (button == GTK_RESPONSE_OK || button == QUICK_ADD_RESPONSE_EDIT_FULL) {
-		gchar *name = NULL;
-		gchar *email = NULL;
-
-		if (qa->name_entry) {
-			gchar *tmp;
-			tmp = gtk_editable_get_chars (GTK_EDITABLE (qa->name_entry), 0, -1);
-			name = tmp;
-		}
-
-		if (qa->email_entry) {
-			gchar *tmp;
-			tmp = gtk_editable_get_chars (GTK_EDITABLE (qa->email_entry), 0, -1);
-			email = tmp;
-		}
-
-		e_contact_set (qa->contact, E_CONTACT_FULL_NAME, (char *) name ? name : "");
-		e_contact_set (qa->contact, E_CONTACT_EMAIL_1,   (char *) email ? email : "");
-
-		g_free (name);
-		g_free (email);
-	}
-
-	gtk_widget_destroy (w);
-
-	if (button == GTK_RESPONSE_OK) {
-
-		/* OK */
-		quick_add_merge_contact (qa);
-
-	} else if (button == QUICK_ADD_RESPONSE_EDIT_FULL) {
-		
-		/* EDIT FULL */
-		edit_contact (qa);
-
-	} else {
-		/* CANCEL */
-		quick_add_unref (qa);
-	}
-
-}
-
-static GtkWidget *
-build_quick_add_dialog (QuickAdd *qa)
-{
-	GtkWidget *dialog;
-	GtkWidget *label;
-	GtkTable *table;
-	const gint xpad=0, ypad=0;
-
-	g_return_val_if_fail (qa != NULL, NULL);
-
-	dialog = gtk_dialog_new_with_buttons (_("Contact Quick-Add"),
-					      NULL, /* XXX */
-					      GTK_DIALOG_NO_SEPARATOR,
-					      _("_Edit Full"), QUICK_ADD_RESPONSE_EDIT_FULL,
-					      GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL,
-					      GTK_STOCK_OK, GTK_RESPONSE_OK,
-					      NULL);
-
-	gtk_widget_ensure_style (dialog);
-	gtk_container_set_border_width (GTK_CONTAINER (GTK_DIALOG (dialog)->vbox), 
-					0);
-	gtk_container_set_border_width (GTK_CONTAINER (GTK_DIALOG (dialog)->action_area), 
-					12);
-
-	g_signal_connect (dialog, "response", G_CALLBACK (clicked_cb), qa);
-
-	qa->name_entry = gtk_entry_new ();
-	if (qa->name)
-		gtk_entry_set_text (GTK_ENTRY (qa->name_entry), qa->name);
-
-
-	qa->email_entry = gtk_entry_new ();
-	if (qa->email)
-		gtk_entry_set_text (GTK_ENTRY (qa->email_entry), qa->email);
-
-	table = GTK_TABLE (gtk_table_new (2, 2, FALSE));
-	gtk_table_set_row_spacings (table, 6);
-	gtk_table_set_col_spacings (table, 12);
-
-	label = gtk_label_new_with_mnemonic (_("_Full name:"));
-	gtk_misc_set_alignment (GTK_MISC (label), 0.0, 0.5);
-
-	gtk_table_attach (table, label,
-			  0, 1, 0, 1,
-			  GTK_FILL, 0, xpad, ypad);
-	gtk_table_attach (table, qa->name_entry,
-			  1, 2, 0, 1,
-			  GTK_EXPAND | GTK_FILL, 0, xpad, ypad);
-
-	label = gtk_label_new_with_mnemonic (_("E-_mail:"));
-	gtk_misc_set_alignment (GTK_MISC (label), 0.0, 0.5);
-
-	gtk_table_attach (table, label,
-			  0, 1, 1, 2,
-			  GTK_FILL, 0, xpad, ypad);
-	gtk_table_attach (table, qa->email_entry,
-			  1, 2, 1, 2,
-			  GTK_EXPAND | GTK_FILL, 0, xpad, ypad);
-
-	gtk_container_set_border_width (GTK_CONTAINER (table), 
-					12);
-	gtk_box_pack_start (GTK_BOX (GTK_DIALOG (dialog)->vbox),
-			    GTK_WIDGET (table),
-			    FALSE, FALSE, 0);
-	gtk_widget_show_all (GTK_WIDGET (table));
-			  
-	
-	return dialog;
-}
-
-void
-e_contact_quick_add (const gchar *in_name, const gchar *email,
-		     EContactQuickAddCallback cb, gpointer closure)
-{
-	QuickAdd *qa;
-	GtkWidget *dialog;
-	gchar *name = NULL;
-	gint len;
-
-	/* We need to have *something* to work with. */
-	if (in_name == NULL && email == NULL) {
-		if (cb)
-			cb (NULL, closure);
-		return;
-	}
-
-	if (in_name) {
-		name = g_strdup (in_name);
-
-		/* Remove extra whitespace and the quotes some mailers put around names. */
-		g_strstrip (name);
-		len = strlen (name);
-		if ((name[0] == '\'' && name[len-1] == '\'') || (name[0] == '"' && name[len-1] == '"')) {
-			name[0] = ' ';
-			name[len-1] = ' ';
-		}
-		g_strstrip (name);
-	}
-
-	qa = quick_add_new ();
-	qa->cb = cb;
-	qa->closure = closure;
-	if (name)
-		quick_add_set_name (qa, name);
-	if (email)
-		quick_add_set_email (qa, email);
-
-	dialog = build_quick_add_dialog (qa);
-	gtk_widget_show_all (dialog);
-
-	g_free (name);
-}
-
-void
-e_contact_quick_add_free_form (const gchar *text, EContactQuickAddCallback cb, gpointer closure)
-{
-	gchar *name=NULL, *email=NULL;
-	const gchar *last_at, *s;
-	gboolean in_quote;
-
-	if (text == NULL) {
-		e_contact_quick_add (NULL, NULL, cb, closure);
-		return;
-	}
-
-	/* Look for things that look like e-mail addresses embedded in text */
-	in_quote = FALSE;
-	last_at = NULL;
-	for (s = text; *s; ++s) {
-		if (*s == '@' && !in_quote)
-			last_at = s;
-		else if (*s == '"')
-			in_quote = !in_quote;
-	}
-
-	
-	if (last_at == NULL) {
-		/* No at sign, so we treat it all as the name */
-		name = g_strdup (text);
-	} else {
-		gboolean bad_char = FALSE;
-		
-		/* walk backwards to whitespace or a < or a quote... */
-		while (last_at >= text && !bad_char
-		       && !(isspace ((gint) *last_at) || *last_at == '<' || *last_at == '"')) {
-			/* Check for some stuff that can't appear in a legal e-mail address. */
-			if (*last_at == '['
-			    || *last_at == ']'
-			    || *last_at == '('
-			    || *last_at == ')')
-				bad_char = TRUE;
-			--last_at;
-		}
-		if (last_at < text)
-			last_at = text;
-
-		/* ...and then split the text there */
-		if (!bad_char) {
-			if (text < last_at)
-				name = g_strndup (text, last_at-text);
-			email = g_strdup (last_at);
-		}
-	}
-
-	/* If all else has failed, make it the name. */
-	if (name == NULL && email == NULL) 
-		name = g_strdup (text);
-		
-
-
-	/* Clean up email, remove bracketing <>s */
-	if (email && *email) {
-		gboolean changed = FALSE;
-		g_strstrip (email);
-		if (*email == '<') {
-			*email = ' ';
-			changed = TRUE;
-		}
-		if (email[strlen (email)-1] == '>') {
-			email[strlen (email)-1] = ' ';
-			changed = TRUE;
-		}
-		if (changed)
-			g_strstrip (email);
-	}
-	
-
-	e_contact_quick_add (name, email, cb, closure);
-	g_free (name);
-	g_free (email);
-}
diff --git a/addressbook/gui/contact-editor/e-contact-quick-add.h b/addressbook/gui/contact-editor/e-contact-quick-add.h
deleted file mode 100644
index a969211915..0000000000
--- a/addressbook/gui/contact-editor/e-contact-quick-add.h
+++ /dev/null
@@ -1,40 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-
-/*
- * e-contact-quick-add.h
- *
- * Copyright (C) 2001 Ximian, Inc.
- *
- * Developed by Jon Trowbridge <trow@ximian.com>
- */
-
-/*
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of version 2 of the GNU General Public
- * License as published by the Free Software Foundation.
- * 
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- * 
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
- * USA.
- */
-
-#ifndef __E_CONTACT_QUICK_ADD_H__
-#define __E_CONTACT_QUICK_ADD_H__
-
-#include <libebook/e-contact.h>
-
-typedef void (*EContactQuickAddCallback) (EContact *new_contact, gpointer closure);
-
-void e_contact_quick_add (const gchar *name, const gchar *email, 
-			  EContactQuickAddCallback cb, gpointer closure);
-
-void e_contact_quick_add_free_form (const gchar *text, EContactQuickAddCallback cb, gpointer closure);
-
-#endif /* __E_CONTACT_QUICK_ADD_H__ */
-
diff --git a/addressbook/gui/contact-editor/eab-editor.c b/addressbook/gui/contact-editor/eab-editor.c
deleted file mode 100644
index 8f03352af0..0000000000
--- a/addressbook/gui/contact-editor/eab-editor.c
+++ /dev/null
@@ -1,397 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-/* eab-editor.c
- * Copyright (C) 2004  Novell, Inc.
- * Author: Chris Toshok <toshok@ximian.com>
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of version 2 of the GNU General Public
- * License as published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * General Public License for more details.
- *
- * You should have received a copy of the GNU General Public
- * License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
- */
-
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
-
-#include <gtk/gtkstock.h>
-#include <gtk/gtkmessagedialog.h>
-#include <libgnome/gnome-i18n.h>
-
-#include "eab-editor.h"
-#include "addressbook/gui/widgets/eab-gui-util.h"
-#include "e-contact-editor-marshal.h"
-
-static void eab_editor_default_show  (EABEditor *editor);
-static void eab_editor_default_raise (EABEditor *editor);
-static void eab_editor_default_close (EABEditor *editor);
-static void eab_editor_class_init    (EABEditorClass *klass);
-static void eab_editor_init          (EABEditor *editor);
-
-/* Signal IDs */
-enum {
-	CONTACT_ADDED,
-	CONTACT_MODIFIED,
-	CONTACT_DELETED,
-	EDITOR_CLOSED,
-	LAST_SIGNAL
-};
-
-static GSList *all_editors = NULL;
-
-static GtkObjectClass *parent_class = NULL;
-
-static guint editor_signals[LAST_SIGNAL];
-
-GType
-eab_editor_get_type (void)
-{
-	static GType editor_type = 0;
-
-	if (!editor_type) {
-		static const GTypeInfo editor_info =  {
-			sizeof (EABEditorClass),
-			NULL,           /* base_init */
-			NULL,           /* base_finalize */
-			(GClassInitFunc) eab_editor_class_init,
-			NULL,           /* class_finalize */
-			NULL,           /* class_data */
-			sizeof (EABEditor),
-			0,             /* n_preallocs */
-			(GInstanceInitFunc) eab_editor_init,
-		};
-
-		editor_type = g_type_register_static (G_TYPE_OBJECT, "EABEditor", &editor_info, 0);
-	}
-
-	return editor_type;
-}
-
-static void
-eab_editor_default_show (EABEditor *editor)
-{
-	g_warning ("abstract eab_editor_show called");
-}
-
-static void
-eab_editor_default_close (EABEditor *editor)
-{
-	g_warning ("abstract eab_editor_close called");
-}
-
-static void
-eab_editor_default_raise (EABEditor *editor)
-{
-	g_warning ("abstract eab_editor_raise called");
-}
-
-static void
-eab_editor_default_save_contact (EABEditor *editor, gboolean should_close)
-{
-	g_warning ("abstract eab_editor_save_contact called");
-}
-
-static gboolean
-eab_editor_default_is_valid (EABEditor *editor)
-{
-	g_warning ("abstract eab_editor_is_valid called");
-	return FALSE;
-}
-
-static gboolean
-eab_editor_default_is_changed (EABEditor *editor)
-{
-	g_warning ("abstract eab_editor_is_changed called");
-	return FALSE;
-}
-
-static GtkWindow*
-eab_editor_default_get_window (EABEditor *editor)
-{
-	g_warning ("abstract eab_editor_get_window called");
-	return NULL;
-}
-
-static void
-eab_editor_class_init (EABEditorClass *klass)
-{
-	GObjectClass *object_class = G_OBJECT_CLASS (klass);
-
-	parent_class = g_type_class_ref (G_TYPE_OBJECT);
-
-	klass->show = eab_editor_default_show;
-	klass->close = eab_editor_default_close;
-	klass->raise = eab_editor_default_raise;
-	klass->save_contact = eab_editor_default_save_contact;
-	klass->is_valid = eab_editor_default_is_valid;
-	klass->is_changed = eab_editor_default_is_changed;
-	klass->get_window = eab_editor_default_get_window;
-
-	editor_signals[CONTACT_ADDED] =
-		g_signal_new ("contact_added",
-			      G_OBJECT_CLASS_TYPE (object_class),
-			      G_SIGNAL_RUN_FIRST,
-			      G_STRUCT_OFFSET (EABEditorClass, contact_added),
-			      NULL, NULL,
-			      e_contact_editor_marshal_NONE__INT_OBJECT,
-			      G_TYPE_NONE, 2,
-			      G_TYPE_INT, G_TYPE_OBJECT);
-
-	editor_signals[CONTACT_MODIFIED] =
-		g_signal_new ("contact_modified",
-			      G_OBJECT_CLASS_TYPE (object_class),
-			      G_SIGNAL_RUN_FIRST,
-			      G_STRUCT_OFFSET (EABEditorClass, contact_modified),
-			      NULL, NULL,
-			      e_contact_editor_marshal_NONE__INT_OBJECT,
-			      G_TYPE_NONE, 2,
-			      G_TYPE_INT, G_TYPE_OBJECT);
-
-	editor_signals[CONTACT_DELETED] =
-		g_signal_new ("contact_deleted",
-			      G_OBJECT_CLASS_TYPE (object_class),
-			      G_SIGNAL_RUN_FIRST,
-			      G_STRUCT_OFFSET (EABEditorClass, contact_deleted),
-			      NULL, NULL,
-			      e_contact_editor_marshal_NONE__INT_OBJECT,
-			      G_TYPE_NONE, 2,
-			      G_TYPE_INT, G_TYPE_OBJECT);
-
-	editor_signals[EDITOR_CLOSED] =
-		g_signal_new ("editor_closed",
-			      G_OBJECT_CLASS_TYPE (object_class),
-			      G_SIGNAL_RUN_FIRST,
-			      G_STRUCT_OFFSET (EABEditorClass, editor_closed),
-			      NULL, NULL,
-			      e_contact_editor_marshal_NONE__NONE,
-			      G_TYPE_NONE, 0);
-}
-
-static void
-eab_editor_init (EABEditor *editor)
-{
-}
-
-
-
-void
-eab_editor_show (EABEditor *editor)
-{
-	g_return_if_fail (EAB_IS_EDITOR (editor));
-
-	if (EAB_EDITOR_GET_CLASS(editor)->show)
-		EAB_EDITOR_GET_CLASS(editor)->show (editor);
-}
-
-void
-eab_editor_close (EABEditor *editor)
-{
-	g_return_if_fail (EAB_IS_EDITOR (editor));
-
-	if (EAB_EDITOR_GET_CLASS(editor)->close)
-		EAB_EDITOR_GET_CLASS(editor)->close (editor);
-}
-
-void
-eab_editor_raise (EABEditor *editor)
-{
-	g_return_if_fail (EAB_IS_EDITOR (editor));
-
-	if (EAB_EDITOR_GET_CLASS(editor)->raise)
-		EAB_EDITOR_GET_CLASS(editor)->raise (editor);
-}
-
-void
-eab_editor_save_contact (EABEditor *editor, gboolean should_close)
-{
-	g_return_if_fail (EAB_IS_EDITOR (editor));
-
-	if (EAB_EDITOR_GET_CLASS(editor)->save_contact)
-		EAB_EDITOR_GET_CLASS(editor)->save_contact (editor, should_close);
-}
-
-gboolean
-eab_editor_is_changed (EABEditor *editor)
-{
-	g_return_val_if_fail (EAB_IS_EDITOR (editor), FALSE);
-
-	if (EAB_EDITOR_GET_CLASS(editor)->is_changed)
-		return EAB_EDITOR_GET_CLASS(editor)->is_changed (editor);
-	else
-		return FALSE;
-}
-
-gboolean
-eab_editor_is_valid (EABEditor *editor)
-{
-	g_return_val_if_fail (EAB_IS_EDITOR (editor), FALSE);
-	
-	if (EAB_EDITOR_GET_CLASS(editor)->is_valid)
-		return EAB_EDITOR_GET_CLASS(editor)->is_valid (editor);
-	else
-		return FALSE;
-}
-
-GtkWindow*
-eab_editor_get_window (EABEditor *editor)
-{
-	g_return_val_if_fail (EAB_IS_EDITOR (editor), NULL);
-	
-	if (EAB_EDITOR_GET_CLASS(editor)->get_window)
-		return EAB_EDITOR_GET_CLASS(editor)->get_window (editor);
-	else
-		return NULL;
-}
-/* This function prompts for saving if editor conents are in changed state and
-   save or discards or cancels(just returns with out doing anything) according to user input. 
-   Editor gets destoryed in case of save and discard case. 
-   */
-   
-gboolean
-eab_editor_prompt_to_save_changes (EABEditor *editor, GtkWindow *window)
-{
-	if (!eab_editor_is_changed (editor)) {
-		eab_editor_close (EAB_EDITOR (editor));
-		return TRUE;
-	}
-
-	switch (eab_prompt_save_dialog (window)) {
-	case GTK_RESPONSE_YES:
-		if (!eab_editor_is_valid (editor)) {
-			return FALSE;
-		}
-		eab_editor_save_contact (editor, TRUE);
-		return TRUE;
-	case GTK_RESPONSE_NO:
-		eab_editor_close (EAB_EDITOR (editor));
-		return TRUE;
-	case GTK_RESPONSE_CANCEL:
-	default:
-		return FALSE;
-	}
-}
-
-gboolean
-eab_editor_request_close_all (void)
-{
-	GSList *p;
-	GSList *pnext;
-	gboolean retval;
-
-	retval = TRUE;
-	for (p = all_editors; p != NULL; p = pnext) {
-		EABEditor *editor = EAB_EDITOR (p->data);
-		GtkWindow *window = eab_editor_get_window (editor);
-
-		pnext = p->next;
-
-		eab_editor_raise (editor);
-		if (! eab_editor_prompt_to_save_changes (editor, window)) {
-			retval = FALSE;
-			break;
-		}
-		eab_editor_close (editor);
-	}
-
-	return retval;
-}
-
-const GSList*
-eab_editor_get_all_editors (void)
-{
-	return all_editors;
-}
-
-gboolean
-eab_editor_confirm_delete (GtkWindow *parent)
-{
-	GtkWidget *dialog;
-	gint result;
-
-	dialog = gtk_message_dialog_new (parent,
-					 0,
-					 GTK_MESSAGE_QUESTION,
-					 GTK_BUTTONS_NONE,
-#if notyet
-					 /* XXX we really need to handle the plural case here.. */
-					 (plural
-					  ? _("Are you sure you want\n"
-					      "to delete these contacts?"))
-#endif
-					  _("Are you sure you want\n"
-					    "to delete this contact?"));
-
-	gtk_dialog_add_buttons (GTK_DIALOG (dialog),
-				GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL,
-				GTK_STOCK_DELETE, GTK_RESPONSE_ACCEPT,
-				NULL);
-
-	result = gtk_dialog_run(GTK_DIALOG (dialog));
-
-	gtk_widget_destroy (dialog);
-
-	return (result == GTK_RESPONSE_ACCEPT);
-}
-
-
-void
-eab_editor_contact_added (EABEditor *editor, EBookStatus status, EContact *contact)
-{
-	g_return_if_fail (EAB_IS_EDITOR (editor));
-	g_return_if_fail (E_IS_CONTACT (contact));
-
-	g_signal_emit (editor, editor_signals[CONTACT_ADDED], 0,
-		       status, contact);
-}
-
-void
-eab_editor_contact_modified (EABEditor *editor, EBookStatus status, EContact *contact)
-{
-	g_return_if_fail (EAB_IS_EDITOR (editor));
-	g_return_if_fail (E_IS_CONTACT (contact));
-
-	g_signal_emit (editor, editor_signals[CONTACT_MODIFIED], 0,
-		       status, contact);
-}
-
-void
-eab_editor_contact_deleted (EABEditor *editor, EBookStatus status, EContact *contact)
-{
-	g_return_if_fail (EAB_IS_EDITOR (editor));
-	g_return_if_fail (E_IS_CONTACT (contact));
-
-	g_signal_emit (editor, editor_signals[CONTACT_DELETED], 0,
-		       status, contact);
-}
-
-void
-eab_editor_closed (EABEditor *editor)
-{
-	g_return_if_fail (EAB_IS_EDITOR (editor));
-
-	g_signal_emit (editor, editor_signals[EDITOR_CLOSED], 0);
-}
-
-void
-eab_editor_add (EABEditor *editor)
-{
-	g_return_if_fail (EAB_IS_EDITOR (editor));
-
-	all_editors = g_slist_prepend (all_editors, editor);
-}
-
-void
-eab_editor_remove (EABEditor *editor)
-{
-	g_return_if_fail (EAB_IS_EDITOR (editor));
-
-	all_editors = g_slist_remove (all_editors, editor);
-}
diff --git a/addressbook/gui/contact-editor/eab-editor.h b/addressbook/gui/contact-editor/eab-editor.h
deleted file mode 100644
index 6c1afccf21..0000000000
--- a/addressbook/gui/contact-editor/eab-editor.h
+++ /dev/null
@@ -1,110 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-/* eab-editor.h
- * Copyright (C) 2004  Novell, Inc.
- * Author: Chris Toshok <toshok@ximian.com>
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of version 2 of the GNU General Public
- * License as published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * General Public License for more details.
- *
- * You should have received a copy of the GNU General Public
- * License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
- */
-#ifndef __EAB_EDITOR_H__
-#define __EAB_EDITOR_H__
-
-#include <libgnomeui/gnome-app.h>
-#include <libgnomeui/gnome-app-helper.h>
-#include <bonobo/bonobo-ui-component.h>
-#include <glade/glade.h>
-
-#include <libebook/e-book.h>
-#include <libebook/e-contact.h>
-
-#include <gtk/gtktreeview.h>
-#include <gtk/gtkliststore.h>
-
-G_BEGIN_DECLS
-
-/* EABEditor - 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 EAB_TYPE_EDITOR			(eab_editor_get_type ())
-#define EAB_EDITOR(obj)			(G_TYPE_CHECK_INSTANCE_CAST ((obj), EAB_TYPE_EDITOR, EABEditor))
-#define EAB_EDITOR_CLASS(klass)		(G_TYPE_CHECK_CLASS_CAST ((klass), EAB_TYPE_EDITOR, EABEditorClass))
-#define EAB_IS_EDITOR(obj)		(G_TYPE_CHECK_INSTANCE_TYPE ((obj), EAB_TYPE_EDITOR))
-#define EAB_IS_EDITOR_CLASS(klass)	(G_TYPE_CHECK_CLASS_TYPE ((obj), EAB_TYPE_EDITOR))
-#define EAB_EDITOR_GET_CLASS(o)         (G_TYPE_INSTANCE_GET_CLASS ((o), EAB_EDITOR_TYPE, EABEditorClass))
-
-
-typedef struct _EABEditor       EABEditor;
-typedef struct _EABEditorClass  EABEditorClass;
-
-struct _EABEditor
-{
-	GObject parent;
-};
-
-struct _EABEditorClass
-{
-	GObjectClass parent_class;
-
-	/* virtual functions */
-	void (* show)             (EABEditor *editor);
-	void (* close) 	          (EABEditor *editor);
-	void (* raise) 	          (EABEditor *editor);
-	void (* save_contact)     (EABEditor *editor, gboolean should_close);
-	gboolean (* is_valid)     (EABEditor *editor);
-	gboolean (* is_changed)   (EABEditor *editor);
-	GtkWindow* (* get_window) (EABEditor *editor);
-
-	/* signals */
-	void (* contact_added)    (EABEditor *editor, EBookStatus status, EContact *contact);
-	void (* contact_modified) (EABEditor *editor, EBookStatus status, EContact *contact);
-	void (* contact_deleted)  (EABEditor *editor, EBookStatus status, EContact *contact);
-	void (* editor_closed)    (EABEditor *editor);
-};
-
-GType           eab_editor_get_type          (void);
-
-/* virtual functions */
-void            eab_editor_show              (EABEditor *editor);
-void            eab_editor_close             (EABEditor *editor);
-void            eab_editor_raise             (EABEditor *editor);
-void            eab_editor_save_contact      (EABEditor *editor, gboolean should_close);
-gboolean        eab_editor_is_valid          (EABEditor *editor);
-gboolean        eab_editor_is_changed        (EABEditor *editor);
-GtkWindow*      eab_editor_get_window        (EABEditor *editor);
-
-gboolean        eab_editor_prompt_to_save_changes (EABEditor *editor, GtkWindow *window);
-gboolean        eab_editor_confirm_delete    (GtkWindow *parent);
-
-/* these four generate EABEditor signals */
-void 		eab_editor_contact_added     (EABEditor *editor, EBookStatus status, EContact *contact);
-void 		eab_editor_contact_modified  (EABEditor *editor, EBookStatus status, EContact *contact);
-void 		eab_editor_contact_deleted   (EABEditor *editor, EBookStatus status, EContact *contact);
-void 		eab_editor_closed            (EABEditor *editor);
-
-/* these maintain the global list of editors so we can prompt the user
-   if there are unsaved changes when they exit. */
-void            eab_editor_add               (EABEditor *editor);
-void            eab_editor_remove            (EABEditor *editor);
-gboolean        eab_editor_request_close_all (void);
-const GSList*   eab_editor_get_all_editors   (void);
-
-G_END_DECLS
-
-#endif /* __E_CONTACT_EDITOR_H__ */
diff --git a/addressbook/gui/contact-editor/fulladdr.glade b/addressbook/gui/contact-editor/fulladdr.glade
deleted file mode 100644
index c7767b9751..0000000000
--- a/addressbook/gui/contact-editor/fulladdr.glade
+++ /dev/null
@@ -1,446 +0,0 @@
-<?xml version="1.0" standalone="no"?> <!--*- mode: xml -*-->
-<!DOCTYPE glade-interface SYSTEM "http://glade.gnome.org/glade-2.0.dtd">
-
-<glade-interface>
-
-<widget class="GtkDialog" id="dialog-checkaddress">
-  <property name="title" translatable="yes">Full Address</property>
-  <property name="type">GTK_WINDOW_TOPLEVEL</property>
-  <property name="window_position">GTK_WIN_POS_NONE</property>
-  <property name="modal">True</property>
-  <property name="resizable">True</property>
-  <property name="destroy_with_parent">False</property>
-  <property name="has_separator">True</property>
-
-  <child internal-child="vbox">
-    <widget class="GtkVBox" id="vbox-container">
-      <property name="visible">True</property>
-      <property name="homogeneous">False</property>
-      <property name="spacing">8</property>
-
-      <child internal-child="action_area">
-	<widget class="GtkHButtonBox" id="hbuttonbox1">
-	  <property name="visible">True</property>
-	  <property name="layout_style">GTK_BUTTONBOX_END</property>
-
-	  <child>
-	    <widget class="GtkButton" id="button1">
-	      <property name="visible">True</property>
-	      <property name="can_default">True</property>
-	      <property name="has_default">True</property>
-	      <property name="can_focus">True</property>
-	      <property name="label">gtk-ok</property>
-	      <property name="use_stock">True</property>
-	      <property name="relief">GTK_RELIEF_NORMAL</property>
-	      <property name="response_id">0</property>
-	    </widget>
-	  </child>
-
-	  <child>
-	    <widget class="GtkButton" id="button2">
-	      <property name="visible">True</property>
-	      <property name="can_default">True</property>
-	      <property name="can_focus">True</property>
-	      <property name="label">gtk-cancel</property>
-	      <property name="use_stock">True</property>
-	      <property name="relief">GTK_RELIEF_NORMAL</property>
-	      <property name="response_id">0</property>
-	    </widget>
-	  </child>
-	</widget>
-	<packing>
-	  <property name="padding">0</property>
-	  <property name="expand">False</property>
-	  <property name="fill">True</property>
-	  <property name="pack_type">GTK_PACK_END</property>
-	</packing>
-      </child>
-
-      <child>
-	<widget class="GtkTable" id="table-checkaddress">
-	  <property name="border_width">6</property>
-	  <property name="visible">True</property>
-	  <property name="n_rows">4</property>
-	  <property name="n_columns">4</property>
-	  <property name="homogeneous">False</property>
-	  <property name="row_spacing">6</property>
-	  <property name="column_spacing">6</property>
-
-	  <child>
-	    <widget class="GtkLabel" id="label-street">
-	      <property name="visible">True</property>
-	      <property name="label" translatable="yes">_Address:</property>
-	      <property name="use_underline">True</property>
-	      <property name="use_markup">False</property>
-	      <property name="justify">GTK_JUSTIFY_LEFT</property>
-	      <property name="wrap">False</property>
-	      <property name="selectable">False</property>
-	      <property name="xalign">1</property>
-	      <property name="yalign">0.5</property>
-	      <property name="xpad">0</property>
-	      <property name="ypad">0</property>
-	      <property name="mnemonic_widget">entry-street</property>
-	    </widget>
-	    <packing>
-	      <property name="left_attach">0</property>
-	      <property name="right_attach">1</property>
-	      <property name="top_attach">0</property>
-	      <property name="bottom_attach">1</property>
-	      <property name="x_options">fill</property>
-	      <property name="y_options">fill</property>
-	    </packing>
-	  </child>
-
-	  <child>
-	    <widget class="GtkLabel" id="label-city">
-	      <property name="visible">True</property>
-	      <property name="label" translatable="yes">Ci_ty:</property>
-	      <property name="use_underline">True</property>
-	      <property name="use_markup">False</property>
-	      <property name="justify">GTK_JUSTIFY_CENTER</property>
-	      <property name="wrap">False</property>
-	      <property name="selectable">False</property>
-	      <property name="xalign">1</property>
-	      <property name="yalign">0.5</property>
-	      <property name="xpad">0</property>
-	      <property name="ypad">0</property>
-	      <property name="mnemonic_widget">entry-city</property>
-	    </widget>
-	    <packing>
-	      <property name="left_attach">0</property>
-	      <property name="right_attach">1</property>
-	      <property name="top_attach">2</property>
-	      <property name="bottom_attach">3</property>
-	      <property name="x_options">fill</property>
-	      <property name="y_options">fill</property>
-	    </packing>
-	  </child>
-
-	  <child>
-	    <widget class="GtkEntry" id="entry-city">
-	      <property name="visible">True</property>
-	      <property name="can_focus">True</property>
-	      <property name="editable">True</property>
-	      <property name="visibility">True</property>
-	      <property name="max_length">0</property>
-	      <property name="text" translatable="yes"></property>
-	      <property name="has_frame">True</property>
-	      <property name="invisible_char" translatable="yes">*</property>
-	      <property name="activates_default">False</property>
-	    </widget>
-	    <packing>
-	      <property name="left_attach">1</property>
-	      <property name="right_attach">2</property>
-	      <property name="top_attach">2</property>
-	      <property name="bottom_attach">3</property>
-	      <property name="y_options">fill</property>
-	    </packing>
-	  </child>
-
-	  <child>
-	    <widget class="GtkEntry" id="entry-ext">
-	      <property name="visible">True</property>
-	      <property name="can_focus">True</property>
-	      <property name="editable">True</property>
-	      <property name="visibility">True</property>
-	      <property name="max_length">0</property>
-	      <property name="text" translatable="yes"></property>
-	      <property name="has_frame">True</property>
-	      <property name="invisible_char" translatable="yes">*</property>
-	      <property name="activates_default">False</property>
-	    </widget>
-	    <packing>
-	      <property name="left_attach">1</property>
-	      <property name="right_attach">2</property>
-	      <property name="top_attach">1</property>
-	      <property name="bottom_attach">2</property>
-	      <property name="y_options">fill</property>
-	    </packing>
-	  </child>
-
-	  <child>
-	    <widget class="GtkLabel" id="label-po">
-	      <property name="visible">True</property>
-	      <property name="label" translatable="yes">_PO Box:</property>
-	      <property name="use_underline">True</property>
-	      <property name="use_markup">False</property>
-	      <property name="justify">GTK_JUSTIFY_CENTER</property>
-	      <property name="wrap">False</property>
-	      <property name="selectable">False</property>
-	      <property name="xalign">1</property>
-	      <property name="yalign">0.5</property>
-	      <property name="xpad">0</property>
-	      <property name="ypad">0</property>
-	      <property name="mnemonic_widget">entry-po</property>
-	    </widget>
-	    <packing>
-	      <property name="left_attach">2</property>
-	      <property name="right_attach">3</property>
-	      <property name="top_attach">1</property>
-	      <property name="bottom_attach">2</property>
-	      <property name="x_options">fill</property>
-	      <property name="y_options">fill</property>
-	    </packing>
-	  </child>
-
-	  <child>
-	    <widget class="GtkLabel" id="label-ext">
-	      <property name="visible">True</property>
-	      <property name="label" translatable="yes">Address _2:</property>
-	      <property name="use_underline">True</property>
-	      <property name="use_markup">False</property>
-	      <property name="justify">GTK_JUSTIFY_CENTER</property>
-	      <property name="wrap">False</property>
-	      <property name="selectable">False</property>
-	      <property name="xalign">1</property>
-	      <property name="yalign">0.5</property>
-	      <property name="xpad">0</property>
-	      <property name="ypad">0</property>
-	      <property name="mnemonic_widget">entry-ext</property>
-	    </widget>
-	    <packing>
-	      <property name="left_attach">0</property>
-	      <property name="right_attach">1</property>
-	      <property name="top_attach">1</property>
-	      <property name="bottom_attach">2</property>
-	      <property name="x_options">fill</property>
-	      <property name="y_options">fill</property>
-	    </packing>
-	  </child>
-
-	  <child>
-	    <widget class="GtkEntry" id="entry-po">
-	      <property name="visible">True</property>
-	      <property name="can_focus">True</property>
-	      <property name="editable">True</property>
-	      <property name="visibility">True</property>
-	      <property name="max_length">0</property>
-	      <property name="text" translatable="yes"></property>
-	      <property name="has_frame">True</property>
-	      <property name="invisible_char" translatable="yes">*</property>
-	      <property name="activates_default">False</property>
-	    </widget>
-	    <packing>
-	      <property name="left_attach">3</property>
-	      <property name="right_attach">4</property>
-	      <property name="top_attach">1</property>
-	      <property name="bottom_attach">2</property>
-	      <property name="x_options">fill</property>
-	      <property name="y_options">fill</property>
-	    </packing>
-	  </child>
-
-	  <child>
-	    <widget class="GtkEntry" id="entry-street">
-	      <property name="visible">True</property>
-	      <property name="can_focus">True</property>
-	      <property name="has_focus">True</property>
-	      <property name="editable">True</property>
-	      <property name="visibility">True</property>
-	      <property name="max_length">0</property>
-	      <property name="text" translatable="yes"></property>
-	      <property name="has_frame">True</property>
-	      <property name="invisible_char" translatable="yes">*</property>
-	      <property name="activates_default">False</property>
-	    </widget>
-	    <packing>
-	      <property name="left_attach">1</property>
-	      <property name="right_attach">4</property>
-	      <property name="top_attach">0</property>
-	      <property name="bottom_attach">1</property>
-	      <property name="y_options">fill</property>
-	    </packing>
-	  </child>
-
-	  <child>
-	    <widget class="GtkLabel" id="label-region">
-	      <property name="visible">True</property>
-	      <property name="label" translatable="yes">_State/Province:</property>
-	      <property name="use_underline">True</property>
-	      <property name="use_markup">False</property>
-	      <property name="justify">GTK_JUSTIFY_CENTER</property>
-	      <property name="wrap">False</property>
-	      <property name="selectable">False</property>
-	      <property name="xalign">1</property>
-	      <property name="yalign">0.5</property>
-	      <property name="xpad">0</property>
-	      <property name="ypad">0</property>
-	      <property name="mnemonic_widget">entry-region</property>
-	    </widget>
-	    <packing>
-	      <property name="left_attach">0</property>
-	      <property name="right_attach">1</property>
-	      <property name="top_attach">3</property>
-	      <property name="bottom_attach">4</property>
-	      <property name="x_options">fill</property>
-	      <property name="y_options">fill</property>
-	    </packing>
-	  </child>
-
-	  <child>
-	    <widget class="GtkEntry" id="entry-region">
-	      <property name="visible">True</property>
-	      <property name="can_focus">True</property>
-	      <property name="editable">True</property>
-	      <property name="visibility">True</property>
-	      <property name="max_length">0</property>
-	      <property name="text" translatable="yes"></property>
-	      <property name="has_frame">True</property>
-	      <property name="invisible_char" translatable="yes">*</property>
-	      <property name="activates_default">False</property>
-	    </widget>
-	    <packing>
-	      <property name="left_attach">1</property>
-	      <property name="right_attach">2</property>
-	      <property name="top_attach">3</property>
-	      <property name="bottom_attach">4</property>
-	      <property name="y_options">fill</property>
-	    </packing>
-	  </child>
-
-	  <child>
-	    <widget class="GtkCombo" id="combo-country">
-	      <property name="visible">True</property>
-	      <property name="can_focus">True</property>
-	      <property name="value_in_list">False</property>
-	      <property name="allow_empty">True</property>
-	      <property name="case_sensitive">False</property>
-	      <property name="enable_arrow_keys">True</property>
-	      <property name="enable_arrows_always">False</property>
-
-	      <child internal-child="entry">
-		<widget class="GtkEntry" id="entry-country">
-		  <property name="visible">True</property>
-		  <property name="can_focus">True</property>
-		  <property name="editable">True</property>
-		  <property name="visibility">True</property>
-		  <property name="max_length">0</property>
-		  <property name="text" translatable="yes"></property>
-		  <property name="has_frame">True</property>
-		  <property name="invisible_char" translatable="yes">*</property>
-		  <property name="activates_default">False</property>
-		</widget>
-	      </child>
-
-	      <child internal-child="list">
-		<widget class="GtkList" id="convertwidget1">
-		  <property name="visible">True</property>
-		  <property name="selection_mode">GTK_SELECTION_BROWSE</property>
-
-		  <child>
-		    <widget class="GtkListItem" id="convertwidget2">
-		      <property name="visible">True</property>
-
-		      <child>
-			<widget class="GtkLabel" id="convertwidget3">
-			  <property name="visible">True</property>
-			  <property name="label" translatable="yes"></property>
-			  <property name="use_underline">False</property>
-			  <property name="use_markup">False</property>
-			  <property name="justify">GTK_JUSTIFY_LEFT</property>
-			  <property name="wrap">False</property>
-			  <property name="selectable">False</property>
-			  <property name="xalign">0</property>
-			  <property name="yalign">0.5</property>
-			  <property name="xpad">0</property>
-			  <property name="ypad">0</property>
-			</widget>
-		      </child>
-		    </widget>
-		  </child>
-		</widget>
-	      </child>
-	    </widget>
-	    <packing>
-	      <property name="left_attach">3</property>
-	      <property name="right_attach">4</property>
-	      <property name="top_attach">3</property>
-	      <property name="bottom_attach">4</property>
-	      <property name="x_options">fill</property>
-	      <property name="y_options">fill</property>
-	    </packing>
-	  </child>
-
-	  <child>
-	    <widget class="GtkEntry" id="entry-code">
-	      <property name="visible">True</property>
-	      <property name="can_focus">True</property>
-	      <property name="editable">True</property>
-	      <property name="visibility">True</property>
-	      <property name="max_length">0</property>
-	      <property name="text" translatable="yes"></property>
-	      <property name="has_frame">True</property>
-	      <property name="invisible_char" translatable="yes">*</property>
-	      <property name="activates_default">False</property>
-	    </widget>
-	    <packing>
-	      <property name="left_attach">3</property>
-	      <property name="right_attach">4</property>
-	      <property name="top_attach">2</property>
-	      <property name="bottom_attach">3</property>
-	      <property name="x_options">fill</property>
-	      <property name="y_options">fill</property>
-	    </packing>
-	  </child>
-
-	  <child>
-	    <widget class="GtkLabel" id="label-code">
-	      <property name="visible">True</property>
-	      <property name="label" translatable="yes">_ZIP Code:</property>
-	      <property name="use_underline">True</property>
-	      <property name="use_markup">False</property>
-	      <property name="justify">GTK_JUSTIFY_CENTER</property>
-	      <property name="wrap">False</property>
-	      <property name="selectable">False</property>
-	      <property name="xalign">1</property>
-	      <property name="yalign">0.5</property>
-	      <property name="xpad">0</property>
-	      <property name="ypad">0</property>
-	      <property name="mnemonic_widget">entry-code</property>
-	    </widget>
-	    <packing>
-	      <property name="left_attach">2</property>
-	      <property name="right_attach">3</property>
-	      <property name="top_attach">2</property>
-	      <property name="bottom_attach">3</property>
-	      <property name="x_options">fill</property>
-	      <property name="y_options">fill</property>
-	    </packing>
-	  </child>
-
-	  <child>
-	    <widget class="GtkLabel" id="label-country">
-	      <property name="visible">True</property>
-	      <property name="label" translatable="yes">Countr_y:</property>
-	      <property name="use_underline">True</property>
-	      <property name="use_markup">False</property>
-	      <property name="justify">GTK_JUSTIFY_CENTER</property>
-	      <property name="wrap">False</property>
-	      <property name="selectable">False</property>
-	      <property name="xalign">1</property>
-	      <property name="yalign">0.5</property>
-	      <property name="xpad">0</property>
-	      <property name="ypad">0</property>
-	      <property name="mnemonic_widget">entry-country</property>
-	    </widget>
-	    <packing>
-	      <property name="left_attach">2</property>
-	      <property name="right_attach">3</property>
-	      <property name="top_attach">3</property>
-	      <property name="bottom_attach">4</property>
-	      <property name="x_options">fill</property>
-	      <property name="y_options">fill</property>
-	    </packing>
-	  </child>
-	</widget>
-	<packing>
-	  <property name="padding">0</property>
-	  <property name="expand">True</property>
-	  <property name="fill">True</property>
-	</packing>
-      </child>
-    </widget>
-  </child>
-</widget>
-
-</glade-interface>
diff --git a/addressbook/gui/contact-editor/fullname.glade b/addressbook/gui/contact-editor/fullname.glade
deleted file mode 100644
index f2ae7c92eb..0000000000
--- a/addressbook/gui/contact-editor/fullname.glade
+++ /dev/null
@@ -1,681 +0,0 @@
-<?xml version="1.0" standalone="no"?> <!--*- mode: xml -*-->
-<!DOCTYPE glade-interface SYSTEM "http://glade.gnome.org/glade-2.0.dtd">
-
-<glade-interface>
-
-<widget class="GtkDialog" id="dialog-checkfullname">
-  <property name="title" translatable="yes">Full Name</property>
-  <property name="type">GTK_WINDOW_TOPLEVEL</property>
-  <property name="window_position">GTK_WIN_POS_NONE</property>
-  <property name="modal">True</property>
-  <property name="resizable">True</property>
-  <property name="destroy_with_parent">False</property>
-  <property name="decorated">True</property>
-  <property name="skip_taskbar_hint">False</property>
-  <property name="skip_pager_hint">False</property>
-  <property name="type_hint">GDK_WINDOW_TYPE_HINT_DIALOG</property>
-  <property name="gravity">GDK_GRAVITY_NORTH_WEST</property>
-  <property name="has_separator">False</property>
-
-  <child internal-child="vbox">
-    <widget class="GtkVBox" id="vbox-container">
-      <property name="visible">True</property>
-      <property name="homogeneous">False</property>
-      <property name="spacing">8</property>
-
-      <child internal-child="action_area">
-	<widget class="GtkHButtonBox" id="hbuttonbox1">
-	  <property name="visible">True</property>
-	  <property name="layout_style">GTK_BUTTONBOX_END</property>
-
-	  <child>
-	    <widget class="GtkButton" id="button1">
-	      <property name="visible">True</property>
-	      <property name="can_default">True</property>
-	      <property name="can_focus">True</property>
-	      <property name="label">gtk-ok</property>
-	      <property name="use_stock">True</property>
-	      <property name="relief">GTK_RELIEF_NORMAL</property>
-	      <property name="focus_on_click">True</property>
-	      <property name="response_id">0</property>
-	    </widget>
-	  </child>
-
-	  <child>
-	    <widget class="GtkButton" id="button2">
-	      <property name="visible">True</property>
-	      <property name="can_default">True</property>
-	      <property name="can_focus">True</property>
-	      <property name="label">gtk-cancel</property>
-	      <property name="use_stock">True</property>
-	      <property name="relief">GTK_RELIEF_NORMAL</property>
-	      <property name="focus_on_click">True</property>
-	      <property name="response_id">0</property>
-	    </widget>
-	  </child>
-	</widget>
-	<packing>
-	  <property name="padding">0</property>
-	  <property name="expand">False</property>
-	  <property name="fill">True</property>
-	  <property name="pack_type">GTK_PACK_END</property>
-	</packing>
-      </child>
-
-      <child>
-	<widget class="GtkTable" id="table-checkfullname">
-	  <property name="border_width">12</property>
-	  <property name="visible">True</property>
-	  <property name="n_rows">5</property>
-	  <property name="n_columns">3</property>
-	  <property name="homogeneous">False</property>
-	  <property name="row_spacing">6</property>
-	  <property name="column_spacing">6</property>
-
-	  <child>
-	    <widget class="GtkCombo" id="combo-title">
-	      <property name="visible">True</property>
-	      <property name="value_in_list">False</property>
-	      <property name="allow_empty">True</property>
-	      <property name="case_sensitive">False</property>
-	      <property name="enable_arrow_keys">True</property>
-	      <property name="enable_arrows_always">False</property>
-
-	      <child internal-child="entry">
-		<widget class="GtkEntry" id="entry-title">
-		  <property name="visible">True</property>
-		  <property name="can_focus">True</property>
-		  <property name="editable">True</property>
-		  <property name="visibility">True</property>
-		  <property name="max_length">0</property>
-		  <property name="text" translatable="yes"></property>
-		  <property name="has_frame">True</property>
-		  <property name="invisible_char" translatable="yes">*</property>
-		  <property name="activates_default">False</property>
-		</widget>
-	      </child>
-
-	      <child internal-child="list">
-		<widget class="GtkList" id="convertwidget1">
-		  <property name="visible">True</property>
-		  <property name="selection_mode">GTK_SELECTION_BROWSE</property>
-
-		  <child>
-		    <widget class="GtkListItem" id="convertwidget2">
-		      <property name="visible">True</property>
-
-		      <child>
-			<widget class="GtkLabel" id="convertwidget3">
-			  <property name="visible">True</property>
-			  <property name="label" translatable="yes"></property>
-			  <property name="use_underline">False</property>
-			  <property name="use_markup">False</property>
-			  <property name="justify">GTK_JUSTIFY_LEFT</property>
-			  <property name="wrap">False</property>
-			  <property name="selectable">False</property>
-			  <property name="xalign">0</property>
-			  <property name="yalign">0.5</property>
-			  <property name="xpad">0</property>
-			  <property name="ypad">0</property>
-			</widget>
-		      </child>
-		    </widget>
-		  </child>
-
-		  <child>
-		    <widget class="GtkListItem" id="convertwidget4">
-		      <property name="visible">True</property>
-
-		      <child>
-			<widget class="GtkLabel" id="convertwidget5">
-			  <property name="visible">True</property>
-			  <property name="label" translatable="yes">Mr.</property>
-			  <property name="use_underline">False</property>
-			  <property name="use_markup">False</property>
-			  <property name="justify">GTK_JUSTIFY_LEFT</property>
-			  <property name="wrap">False</property>
-			  <property name="selectable">False</property>
-			  <property name="xalign">0</property>
-			  <property name="yalign">0.5</property>
-			  <property name="xpad">0</property>
-			  <property name="ypad">0</property>
-			</widget>
-		      </child>
-		    </widget>
-		  </child>
-
-		  <child>
-		    <widget class="GtkListItem" id="convertwidget6">
-		      <property name="visible">True</property>
-
-		      <child>
-			<widget class="GtkLabel" id="convertwidget7">
-			  <property name="visible">True</property>
-			  <property name="label" translatable="yes">Mrs.</property>
-			  <property name="use_underline">False</property>
-			  <property name="use_markup">False</property>
-			  <property name="justify">GTK_JUSTIFY_LEFT</property>
-			  <property name="wrap">False</property>
-			  <property name="selectable">False</property>
-			  <property name="xalign">0</property>
-			  <property name="yalign">0.5</property>
-			  <property name="xpad">0</property>
-			  <property name="ypad">0</property>
-			</widget>
-		      </child>
-		    </widget>
-		  </child>
-
-		  <child>
-		    <widget class="GtkListItem" id="convertwidget8">
-		      <property name="visible">True</property>
-
-		      <child>
-			<widget class="GtkLabel" id="convertwidget9">
-			  <property name="visible">True</property>
-			  <property name="label" translatable="yes">Ms.</property>
-			  <property name="use_underline">False</property>
-			  <property name="use_markup">False</property>
-			  <property name="justify">GTK_JUSTIFY_LEFT</property>
-			  <property name="wrap">False</property>
-			  <property name="selectable">False</property>
-			  <property name="xalign">0</property>
-			  <property name="yalign">0.5</property>
-			  <property name="xpad">0</property>
-			  <property name="ypad">0</property>
-			</widget>
-		      </child>
-		    </widget>
-		  </child>
-
-		  <child>
-		    <widget class="GtkListItem" id="convertwidget10">
-		      <property name="visible">True</property>
-
-		      <child>
-			<widget class="GtkLabel" id="convertwidget11">
-			  <property name="visible">True</property>
-			  <property name="label" translatable="yes">Miss</property>
-			  <property name="use_underline">False</property>
-			  <property name="use_markup">False</property>
-			  <property name="justify">GTK_JUSTIFY_LEFT</property>
-			  <property name="wrap">False</property>
-			  <property name="selectable">False</property>
-			  <property name="xalign">0</property>
-			  <property name="yalign">0.5</property>
-			  <property name="xpad">0</property>
-			  <property name="ypad">0</property>
-			</widget>
-		      </child>
-		    </widget>
-		  </child>
-
-		  <child>
-		    <widget class="GtkListItem" id="convertwidget12">
-		      <property name="visible">True</property>
-
-		      <child>
-			<widget class="GtkLabel" id="convertwidget13">
-			  <property name="visible">True</property>
-			  <property name="label" translatable="yes">Dr.</property>
-			  <property name="use_underline">False</property>
-			  <property name="use_markup">False</property>
-			  <property name="justify">GTK_JUSTIFY_LEFT</property>
-			  <property name="wrap">False</property>
-			  <property name="selectable">False</property>
-			  <property name="xalign">0</property>
-			  <property name="yalign">0.5</property>
-			  <property name="xpad">0</property>
-			  <property name="ypad">0</property>
-			</widget>
-		      </child>
-		    </widget>
-		  </child>
-
-		  <child>
-		    <widget class="GtkListItem" id="convertwidget14">
-		      <property name="visible">True</property>
-
-		      <child>
-			<widget class="GtkLabel" id="convertwidget15">
-			  <property name="visible">True</property>
-			  <property name="label" translatable="yes"></property>
-			  <property name="use_underline">False</property>
-			  <property name="use_markup">False</property>
-			  <property name="justify">GTK_JUSTIFY_LEFT</property>
-			  <property name="wrap">False</property>
-			  <property name="selectable">False</property>
-			  <property name="xalign">0</property>
-			  <property name="yalign">0.5</property>
-			  <property name="xpad">0</property>
-			  <property name="ypad">0</property>
-			</widget>
-		      </child>
-		    </widget>
-		  </child>
-		</widget>
-	      </child>
-	    </widget>
-	    <packing>
-	      <property name="left_attach">1</property>
-	      <property name="right_attach">2</property>
-	      <property name="top_attach">0</property>
-	      <property name="bottom_attach">1</property>
-	      <property name="y_options"></property>
-	    </packing>
-	  </child>
-
-	  <child>
-	    <widget class="GtkCombo" id="combo-suffix">
-	      <property name="visible">True</property>
-	      <property name="value_in_list">False</property>
-	      <property name="allow_empty">True</property>
-	      <property name="case_sensitive">False</property>
-	      <property name="enable_arrow_keys">True</property>
-	      <property name="enable_arrows_always">False</property>
-
-	      <child internal-child="entry">
-		<widget class="GtkEntry" id="entry-suffix">
-		  <property name="visible">True</property>
-		  <property name="can_focus">True</property>
-		  <property name="editable">True</property>
-		  <property name="visibility">True</property>
-		  <property name="max_length">0</property>
-		  <property name="text" translatable="yes"></property>
-		  <property name="has_frame">True</property>
-		  <property name="invisible_char" translatable="yes">*</property>
-		  <property name="activates_default">False</property>
-		</widget>
-	      </child>
-
-	      <child internal-child="list">
-		<widget class="GtkList" id="convertwidget16">
-		  <property name="visible">True</property>
-		  <property name="selection_mode">GTK_SELECTION_BROWSE</property>
-
-		  <child>
-		    <widget class="GtkListItem" id="convertwidget17">
-		      <property name="visible">True</property>
-
-		      <child>
-			<widget class="GtkLabel" id="convertwidget18">
-			  <property name="visible">True</property>
-			  <property name="label" translatable="yes"></property>
-			  <property name="use_underline">False</property>
-			  <property name="use_markup">False</property>
-			  <property name="justify">GTK_JUSTIFY_LEFT</property>
-			  <property name="wrap">False</property>
-			  <property name="selectable">False</property>
-			  <property name="xalign">0</property>
-			  <property name="yalign">0.5</property>
-			  <property name="xpad">0</property>
-			  <property name="ypad">0</property>
-			</widget>
-		      </child>
-		    </widget>
-		  </child>
-
-		  <child>
-		    <widget class="GtkListItem" id="convertwidget19">
-		      <property name="visible">True</property>
-
-		      <child>
-			<widget class="GtkLabel" id="convertwidget20">
-			  <property name="visible">True</property>
-			  <property name="label" translatable="yes">Sr.</property>
-			  <property name="use_underline">False</property>
-			  <property name="use_markup">False</property>
-			  <property name="justify">GTK_JUSTIFY_LEFT</property>
-			  <property name="wrap">False</property>
-			  <property name="selectable">False</property>
-			  <property name="xalign">0</property>
-			  <property name="yalign">0.5</property>
-			  <property name="xpad">0</property>
-			  <property name="ypad">0</property>
-			</widget>
-		      </child>
-		    </widget>
-		  </child>
-
-		  <child>
-		    <widget class="GtkListItem" id="convertwidget21">
-		      <property name="visible">True</property>
-
-		      <child>
-			<widget class="GtkLabel" id="convertwidget22">
-			  <property name="visible">True</property>
-			  <property name="label" translatable="yes">Jr.</property>
-			  <property name="use_underline">False</property>
-			  <property name="use_markup">False</property>
-			  <property name="justify">GTK_JUSTIFY_LEFT</property>
-			  <property name="wrap">False</property>
-			  <property name="selectable">False</property>
-			  <property name="xalign">0</property>
-			  <property name="yalign">0.5</property>
-			  <property name="xpad">0</property>
-			  <property name="ypad">0</property>
-			</widget>
-		      </child>
-		    </widget>
-		  </child>
-
-		  <child>
-		    <widget class="GtkListItem" id="convertwidget23">
-		      <property name="visible">True</property>
-
-		      <child>
-			<widget class="GtkLabel" id="convertwidget24">
-			  <property name="visible">True</property>
-			  <property name="label" translatable="yes">I</property>
-			  <property name="use_underline">False</property>
-			  <property name="use_markup">False</property>
-			  <property name="justify">GTK_JUSTIFY_LEFT</property>
-			  <property name="wrap">False</property>
-			  <property name="selectable">False</property>
-			  <property name="xalign">0</property>
-			  <property name="yalign">0.5</property>
-			  <property name="xpad">0</property>
-			  <property name="ypad">0</property>
-			</widget>
-		      </child>
-		    </widget>
-		  </child>
-
-		  <child>
-		    <widget class="GtkListItem" id="convertwidget25">
-		      <property name="visible">True</property>
-
-		      <child>
-			<widget class="GtkLabel" id="convertwidget26">
-			  <property name="visible">True</property>
-			  <property name="label" translatable="yes">II</property>
-			  <property name="use_underline">False</property>
-			  <property name="use_markup">False</property>
-			  <property name="justify">GTK_JUSTIFY_LEFT</property>
-			  <property name="wrap">False</property>
-			  <property name="selectable">False</property>
-			  <property name="xalign">0</property>
-			  <property name="yalign">0.5</property>
-			  <property name="xpad">0</property>
-			  <property name="ypad">0</property>
-			</widget>
-		      </child>
-		    </widget>
-		  </child>
-
-		  <child>
-		    <widget class="GtkListItem" id="convertwidget27">
-		      <property name="visible">True</property>
-
-		      <child>
-			<widget class="GtkLabel" id="convertwidget28">
-			  <property name="visible">True</property>
-			  <property name="label" translatable="yes">III</property>
-			  <property name="use_underline">False</property>
-			  <property name="use_markup">False</property>
-			  <property name="justify">GTK_JUSTIFY_LEFT</property>
-			  <property name="wrap">False</property>
-			  <property name="selectable">False</property>
-			  <property name="xalign">0</property>
-			  <property name="yalign">0.5</property>
-			  <property name="xpad">0</property>
-			  <property name="ypad">0</property>
-			</widget>
-		      </child>
-		    </widget>
-		  </child>
-
-		  <child>
-		    <widget class="GtkListItem" id="convertwidget29">
-		      <property name="visible">True</property>
-
-		      <child>
-			<widget class="GtkLabel" id="convertwidget30">
-			  <property name="visible">True</property>
-			  <property name="label" translatable="yes">Esq.</property>
-			  <property name="use_underline">False</property>
-			  <property name="use_markup">False</property>
-			  <property name="justify">GTK_JUSTIFY_LEFT</property>
-			  <property name="wrap">False</property>
-			  <property name="selectable">False</property>
-			  <property name="xalign">0</property>
-			  <property name="yalign">0.5</property>
-			  <property name="xpad">0</property>
-			  <property name="ypad">0</property>
-			</widget>
-		      </child>
-		    </widget>
-		  </child>
-
-		  <child>
-		    <widget class="GtkListItem" id="convertwidget31">
-		      <property name="visible">True</property>
-
-		      <child>
-			<widget class="GtkLabel" id="convertwidget32">
-			  <property name="visible">True</property>
-			  <property name="label" translatable="yes"></property>
-			  <property name="use_underline">False</property>
-			  <property name="use_markup">False</property>
-			  <property name="justify">GTK_JUSTIFY_LEFT</property>
-			  <property name="wrap">False</property>
-			  <property name="selectable">False</property>
-			  <property name="xalign">0</property>
-			  <property name="yalign">0.5</property>
-			  <property name="xpad">0</property>
-			  <property name="ypad">0</property>
-			</widget>
-		      </child>
-		    </widget>
-		  </child>
-		</widget>
-	      </child>
-	    </widget>
-	    <packing>
-	      <property name="left_attach">1</property>
-	      <property name="right_attach">2</property>
-	      <property name="top_attach">4</property>
-	      <property name="bottom_attach">5</property>
-	      <property name="y_options"></property>
-	    </packing>
-	  </child>
-
-	  <child>
-	    <widget class="GtkEntry" id="entry-first">
-	      <property name="visible">True</property>
-	      <property name="can_focus">True</property>
-	      <property name="editable">True</property>
-	      <property name="visibility">True</property>
-	      <property name="max_length">0</property>
-	      <property name="text" translatable="yes"></property>
-	      <property name="has_frame">True</property>
-	      <property name="invisible_char" translatable="yes">*</property>
-	      <property name="activates_default">False</property>
-	    </widget>
-	    <packing>
-	      <property name="left_attach">1</property>
-	      <property name="right_attach">3</property>
-	      <property name="top_attach">1</property>
-	      <property name="bottom_attach">2</property>
-	      <property name="y_options"></property>
-	    </packing>
-	  </child>
-
-	  <child>
-	    <widget class="GtkEntry" id="entry-middle">
-	      <property name="visible">True</property>
-	      <property name="can_focus">True</property>
-	      <property name="editable">True</property>
-	      <property name="visibility">True</property>
-	      <property name="max_length">0</property>
-	      <property name="text" translatable="yes"></property>
-	      <property name="has_frame">True</property>
-	      <property name="invisible_char" translatable="yes">*</property>
-	      <property name="activates_default">False</property>
-	    </widget>
-	    <packing>
-	      <property name="left_attach">1</property>
-	      <property name="right_attach">3</property>
-	      <property name="top_attach">2</property>
-	      <property name="bottom_attach">3</property>
-	      <property name="y_options"></property>
-	    </packing>
-	  </child>
-
-	  <child>
-	    <widget class="GtkEntry" id="entry-last">
-	      <property name="visible">True</property>
-	      <property name="can_focus">True</property>
-	      <property name="editable">True</property>
-	      <property name="visibility">True</property>
-	      <property name="max_length">0</property>
-	      <property name="text" translatable="yes"></property>
-	      <property name="has_frame">True</property>
-	      <property name="invisible_char" translatable="yes">*</property>
-	      <property name="activates_default">False</property>
-	    </widget>
-	    <packing>
-	      <property name="left_attach">1</property>
-	      <property name="right_attach">3</property>
-	      <property name="top_attach">3</property>
-	      <property name="bottom_attach">4</property>
-	      <property name="y_options"></property>
-	    </packing>
-	  </child>
-
-	  <child>
-	    <widget class="GtkLabel" id="label-first">
-	      <property name="visible">True</property>
-	      <property name="label" translatable="yes">_First:</property>
-	      <property name="use_underline">True</property>
-	      <property name="use_markup">False</property>
-	      <property name="justify">GTK_JUSTIFY_CENTER</property>
-	      <property name="wrap">False</property>
-	      <property name="selectable">False</property>
-	      <property name="xalign">1</property>
-	      <property name="yalign">0.5</property>
-	      <property name="xpad">0</property>
-	      <property name="ypad">0</property>
-	      <property name="mnemonic_widget">entry-first</property>
-	    </widget>
-	    <packing>
-	      <property name="left_attach">0</property>
-	      <property name="right_attach">1</property>
-	      <property name="top_attach">1</property>
-	      <property name="bottom_attach">2</property>
-	      <property name="x_options">fill</property>
-	      <property name="y_options">fill</property>
-	    </packing>
-	  </child>
-
-	  <child>
-	    <widget class="GtkLabel" id="label-title">
-	      <property name="visible">True</property>
-	      <property name="label" translatable="yes">_Title:</property>
-	      <property name="use_underline">True</property>
-	      <property name="use_markup">False</property>
-	      <property name="justify">GTK_JUSTIFY_CENTER</property>
-	      <property name="wrap">False</property>
-	      <property name="selectable">False</property>
-	      <property name="xalign">1</property>
-	      <property name="yalign">0.5</property>
-	      <property name="xpad">0</property>
-	      <property name="ypad">0</property>
-	      <property name="mnemonic_widget">entry-title</property>
-	    </widget>
-	    <packing>
-	      <property name="left_attach">0</property>
-	      <property name="right_attach">1</property>
-	      <property name="top_attach">0</property>
-	      <property name="bottom_attach">1</property>
-	      <property name="x_options">fill</property>
-	      <property name="y_options">fill</property>
-	    </packing>
-	  </child>
-
-	  <child>
-	    <widget class="GtkLabel" id="label-middle">
-	      <property name="visible">True</property>
-	      <property name="label" translatable="yes">_Middle:</property>
-	      <property name="use_underline">True</property>
-	      <property name="use_markup">False</property>
-	      <property name="justify">GTK_JUSTIFY_CENTER</property>
-	      <property name="wrap">False</property>
-	      <property name="selectable">False</property>
-	      <property name="xalign">1</property>
-	      <property name="yalign">0.5</property>
-	      <property name="xpad">0</property>
-	      <property name="ypad">0</property>
-	      <property name="mnemonic_widget">entry-middle</property>
-	    </widget>
-	    <packing>
-	      <property name="left_attach">0</property>
-	      <property name="right_attach">1</property>
-	      <property name="top_attach">2</property>
-	      <property name="bottom_attach">3</property>
-	      <property name="x_options">fill</property>
-	      <property name="y_options">fill</property>
-	    </packing>
-	  </child>
-
-	  <child>
-	    <widget class="GtkLabel" id="label-last">
-	      <property name="visible">True</property>
-	      <property name="label" translatable="yes">_Last:</property>
-	      <property name="use_underline">True</property>
-	      <property name="use_markup">False</property>
-	      <property name="justify">GTK_JUSTIFY_CENTER</property>
-	      <property name="wrap">False</property>
-	      <property name="selectable">False</property>
-	      <property name="xalign">1</property>
-	      <property name="yalign">0.5</property>
-	      <property name="xpad">0</property>
-	      <property name="ypad">0</property>
-	      <property name="mnemonic_widget">entry-last</property>
-	    </widget>
-	    <packing>
-	      <property name="left_attach">0</property>
-	      <property name="right_attach">1</property>
-	      <property name="top_attach">3</property>
-	      <property name="bottom_attach">4</property>
-	      <property name="x_options">fill</property>
-	      <property name="y_options">fill</property>
-	    </packing>
-	  </child>
-
-	  <child>
-	    <widget class="GtkLabel" id="label-suffix">
-	      <property name="visible">True</property>
-	      <property name="label" translatable="yes">_Suffix:</property>
-	      <property name="use_underline">True</property>
-	      <property name="use_markup">False</property>
-	      <property name="justify">GTK_JUSTIFY_CENTER</property>
-	      <property name="wrap">False</property>
-	      <property name="selectable">False</property>
-	      <property name="xalign">1</property>
-	      <property name="yalign">0.5</property>
-	      <property name="xpad">0</property>
-	      <property name="ypad">0</property>
-	      <property name="mnemonic_widget">entry-suffix</property>
-	    </widget>
-	    <packing>
-	      <property name="left_attach">0</property>
-	      <property name="right_attach">1</property>
-	      <property name="top_attach">4</property>
-	      <property name="bottom_attach">5</property>
-	      <property name="x_options">fill</property>
-	      <property name="y_options">fill</property>
-	    </packing>
-	  </child>
-	</widget>
-	<packing>
-	  <property name="padding">0</property>
-	  <property name="expand">True</property>
-	  <property name="fill">True</property>
-	</packing>
-      </child>
-    </widget>
-  </child>
-</widget>
-
-</glade-interface>
diff --git a/addressbook/gui/contact-editor/im.glade b/addressbook/gui/contact-editor/im.glade
deleted file mode 100644
index eb8832e8f1..0000000000
--- a/addressbook/gui/contact-editor/im.glade
+++ /dev/null
@@ -1,206 +0,0 @@
-<?xml version="1.0" standalone="no"?> <!--*- mode: xml -*-->
-<!DOCTYPE glade-interface SYSTEM "http://glade.gnome.org/glade-2.0.dtd">
-
-<glade-interface>
-
-<widget class="GtkDialog" id="dialog-im">
-  <property name="title" translatable="yes">Add IM Account</property>
-  <property name="type">GTK_WINDOW_TOPLEVEL</property>
-  <property name="window_position">GTK_WIN_POS_NONE</property>
-  <property name="modal">True</property>
-  <property name="resizable">True</property>
-  <property name="destroy_with_parent">False</property>
-  <property name="has_separator">False</property>
-
-  <child internal-child="vbox">
-    <widget class="GtkVBox" id="dialog-vbox1">
-      <property name="visible">True</property>
-      <property name="homogeneous">False</property>
-      <property name="spacing">2</property>
-
-      <child internal-child="action_area">
-	<widget class="GtkHButtonBox" id="dialog-action_area1">
-	  <property name="visible">True</property>
-	  <property name="layout_style">GTK_BUTTONBOX_END</property>
-
-	  <child>
-	    <widget class="GtkButton" id="cancelbutton1">
-	      <property name="visible">True</property>
-	      <property name="can_default">True</property>
-	      <property name="can_focus">True</property>
-	      <property name="label">gtk-cancel</property>
-	      <property name="use_stock">True</property>
-	      <property name="relief">GTK_RELIEF_NORMAL</property>
-	      <property name="response_id">-6</property>
-	    </widget>
-	  </child>
-
-	  <child>
-	    <widget class="GtkButton" id="okbutton1">
-	      <property name="visible">True</property>
-	      <property name="can_default">True</property>
-	      <property name="can_focus">True</property>
-	      <property name="label">gtk-ok</property>
-	      <property name="use_stock">True</property>
-	      <property name="relief">GTK_RELIEF_NORMAL</property>
-	      <property name="response_id">-5</property>
-	    </widget>
-	  </child>
-	</widget>
-	<packing>
-	  <property name="padding">0</property>
-	  <property name="expand">False</property>
-	  <property name="fill">True</property>
-	  <property name="pack_type">GTK_PACK_END</property>
-	</packing>
-      </child>
-
-      <child>
-	<widget class="GtkTable" id="table-im">
-	  <property name="border_width">6</property>
-	  <property name="visible">True</property>
-	  <property name="n_rows">3</property>
-	  <property name="n_columns">2</property>
-	  <property name="homogeneous">False</property>
-	  <property name="row_spacing">6</property>
-	  <property name="column_spacing">12</property>
-
-	  <child>
-	    <widget class="GtkLabel" id="label-service">
-	      <property name="visible">True</property>
-	      <property name="label" translatable="yes">_IM Service:</property>
-	      <property name="use_underline">True</property>
-	      <property name="use_markup">False</property>
-	      <property name="justify">GTK_JUSTIFY_LEFT</property>
-	      <property name="wrap">False</property>
-	      <property name="selectable">False</property>
-	      <property name="xalign">0</property>
-	      <property name="yalign">0.5</property>
-	      <property name="xpad">0</property>
-	      <property name="ypad">0</property>
-	      <property name="mnemonic_widget">optmenu-service</property>
-	    </widget>
-	    <packing>
-	      <property name="left_attach">0</property>
-	      <property name="right_attach">1</property>
-	      <property name="top_attach">0</property>
-	      <property name="bottom_attach">1</property>
-	      <property name="x_options">fill</property>
-	      <property name="y_options"></property>
-	    </packing>
-	  </child>
-
-	  <child>
-	    <widget class="GtkOptionMenu" id="optmenu-service">
-	      <property name="visible">True</property>
-	      <property name="can_focus">True</property>
-	      <property name="history">-1</property>
-	    </widget>
-	    <packing>
-	      <property name="left_attach">1</property>
-	      <property name="right_attach">2</property>
-	      <property name="top_attach">0</property>
-	      <property name="bottom_attach">1</property>
-	      <property name="x_options">fill</property>
-	      <property name="y_options"></property>
-	    </packing>
-	  </child>
-
-	  <child>
-	    <widget class="GtkLabel" id="label-username">
-	      <property name="visible">True</property>
-	      <property name="label" translatable="yes">_Account name:</property>
-	      <property name="use_underline">True</property>
-	      <property name="use_markup">False</property>
-	      <property name="justify">GTK_JUSTIFY_LEFT</property>
-	      <property name="wrap">False</property>
-	      <property name="selectable">False</property>
-	      <property name="xalign">0</property>
-	      <property name="yalign">0.5</property>
-	      <property name="xpad">0</property>
-	      <property name="ypad">0</property>
-	      <property name="mnemonic_widget">entry-username</property>
-	    </widget>
-	    <packing>
-	      <property name="left_attach">0</property>
-	      <property name="right_attach">1</property>
-	      <property name="top_attach">2</property>
-	      <property name="bottom_attach">3</property>
-	      <property name="x_options">fill</property>
-	      <property name="y_options"></property>
-	    </packing>
-	  </child>
-
-	  <child>
-	    <widget class="GtkEntry" id="entry-username">
-	      <property name="visible">True</property>
-	      <property name="can_focus">True</property>
-	      <property name="editable">True</property>
-	      <property name="visibility">True</property>
-	      <property name="max_length">0</property>
-	      <property name="text" translatable="yes"></property>
-	      <property name="has_frame">True</property>
-	      <property name="invisible_char" translatable="yes">*</property>
-	      <property name="activates_default">False</property>
-	    </widget>
-	    <packing>
-	      <property name="left_attach">1</property>
-	      <property name="right_attach">2</property>
-	      <property name="top_attach">2</property>
-	      <property name="bottom_attach">3</property>
-	      <property name="y_options"></property>
-	    </packing>
-	  </child>
-
-	  <child>
-	    <widget class="GtkLabel" id="label-location">
-	      <property name="visible">True</property>
-	      <property name="label" translatable="yes">_Location:</property>
-	      <property name="use_underline">True</property>
-	      <property name="use_markup">False</property>
-	      <property name="justify">GTK_JUSTIFY_LEFT</property>
-	      <property name="wrap">False</property>
-	      <property name="selectable">False</property>
-	      <property name="xalign">0</property>
-	      <property name="yalign">0.5</property>
-	      <property name="xpad">0</property>
-	      <property name="ypad">0</property>
-	      <property name="mnemonic_widget">optmenu-location</property>
-	    </widget>
-	    <packing>
-	      <property name="left_attach">0</property>
-	      <property name="right_attach">1</property>
-	      <property name="top_attach">1</property>
-	      <property name="bottom_attach">2</property>
-	      <property name="x_options">fill</property>
-	      <property name="y_options"></property>
-	    </packing>
-	  </child>
-
-	  <child>
-	    <widget class="GtkOptionMenu" id="optmenu-location">
-	      <property name="visible">True</property>
-	      <property name="can_focus">True</property>
-	      <property name="history">-1</property>
-	    </widget>
-	    <packing>
-	      <property name="left_attach">1</property>
-	      <property name="right_attach">2</property>
-	      <property name="top_attach">1</property>
-	      <property name="bottom_attach">2</property>
-	      <property name="x_options">fill</property>
-	      <property name="y_options"></property>
-	    </packing>
-	  </child>
-	</widget>
-	<packing>
-	  <property name="padding">0</property>
-	  <property name="expand">True</property>
-	  <property name="fill">True</property>
-	</packing>
-      </child>
-    </widget>
-  </child>
-</widget>
-
-</glade-interface>
diff --git a/addressbook/gui/contact-editor/test-editor.c b/addressbook/gui/contact-editor/test-editor.c
deleted file mode 100644
index 4a8c111563..0000000000
--- a/addressbook/gui/contact-editor/test-editor.c
+++ /dev/null
@@ -1,142 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-/*
- * test-editor.c
- * Copyright (C) 2000  Ximian, Inc.
- * Author: Chris Lahey <clahey@ximian.com>
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of version 2 of the GNU General Public
- * License as published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * General Public License for more details.
- *
- * You should have received a copy of the GNU General Public
- * License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
- */
-
-#include "config.h"
-
-#include <stdlib.h>
-#include <gtk/gtkmain.h>
-#include <libgnomeui/gnome-app.h>
-#include <libgnomeui/gnome-ui-init.h>
-#include <glade/glade.h>
-#include "e-contact-editor.h"
-#include "ebook/e-card.h"
-
-#define TEST_VCARD                   \
-"BEGIN:VCARD
-"                      \
-"FN:Nat
-"                           \
-"N:Friedman;Nat;D;Mr.
-"             \
-"BDAY:1977-08-06
-"                  \
-"TEL;WORK:617 679 1984
-"            \
-"TEL;CELL:123 456 7890
-"            \
-"EMAIL;INTERNET:nat@nat.org
-"       \
-"EMAIL;INTERNET:nat@ximian.com
-" \
-"ADR;WORK;POSTAL:P.O. Box 101;;;Any Town;CA;91921-1234;
-" \
-"ADR;HOME;POSTAL;INTL:P.O. Box 202;;;Any Town 2;MI;12344-4321;USA
-" \
-"END:VCARD
-"                        \
-"
-"
-
-static char *
-read_file (char *name)
-{
-	int  len;
-	char buff[65536];
-	char line[1024];
-	FILE *f;
-
-	f = fopen (name, "r");
-	if (f == NULL)
-		g_error ("Unable to open %s!\n", name);
-
-	len  = 0;
-	while (fgets (line, sizeof (line), f) != NULL) {
-		strcpy (buff + len, line);
-		len += strlen (line);
-	}
-
-	fclose (f);
-
-	return g_strdup (buff);
-}
-
-/* Callback used when a contact editor is closed */
-static void
-editor_closed_cb (EContactEditor *ce, gpointer data)
-{
-	static int count = 2;
-
-	count--;
-	g_object_unref (ce);
-
-	if (count == 0)
-		exit (0);
-}
-
-#if 0
-static void about_callback( GtkWidget *widget, gpointer data )
-{
-
-  const gchar *authors[] =
-  {
-    "Christopher James Lahey <clahey@umich.edu>",
-    NULL
-  };
-
-  GtkWidget *about =
-    gnome_about_new ( _( "Contact Editor Test" ), VERSION,
-		      _( "Copyright (C) 2000, Ximian, Inc." ),
-		      authors,
-		      _( "This should test the contact editor canvas item" ),
-		      NULL);
-  gtk_widget_show (about);
-}
-#endif
-
-int main( int argc, char *argv[] )
-{
-	char *cardstr;
-	EContactEditor *ce;
-
-	gnome_program_init("Contact Editor Test", VERSION, LIBGNOMEUI_MODULE, argc, argv, NULL);
-
-	glade_init ();
-
-	cardstr = NULL;
-	if (argc == 2)
-		cardstr = read_file (argv [1]);
-
-	if (cardstr == NULL)
-		cardstr = TEST_VCARD;
-
-	ce = e_contact_editor_new (NULL, e_card_new_with_default_charset (cardstr, "ISO-8859-1"), TRUE, FALSE);
-	g_signal_connect (ce, "editor_closed",
-			  G_CALLBACK (editor_closed_cb), NULL);
-
-	ce = e_contact_editor_new (NULL, e_card_new_with_default_charset (cardstr, "ISO-8859-1"), TRUE, FALSE);
-	g_signal_connect (ce, "editor_closed",
-			  G_CALLBACK (editor_closed_cb), NULL);
-
-	gtk_main();
-
-	/* Not reached. */
-	return 0;
-}
diff --git a/addressbook/gui/contact-list-editor/.cvsignore b/addressbook/gui/contact-list-editor/.cvsignore
deleted file mode 100644
index 1fe141cc30..0000000000
--- a/addressbook/gui/contact-list-editor/.cvsignore
+++ /dev/null
@@ -1,7 +0,0 @@
-Evolution-Addressbook-SelectNames.h
-Makefile.in
-Makefile
-.deps
-.pure
-e-contact-list-editor-marshal.c
-e-contact-list-editor-marshal.h
diff --git a/addressbook/gui/contact-list-editor/Makefile.am b/addressbook/gui/contact-list-editor/Makefile.am
deleted file mode 100644
index de604ea6f5..0000000000
--- a/addressbook/gui/contact-list-editor/Makefile.am
+++ /dev/null
@@ -1,39 +0,0 @@
-INCLUDES =						\
-	-I$(top_srcdir)					\
-	-I$(top_srcdir)/addressbook/			\
-	-I$(top_srcdir)/addressbook/backend		\
-	-I$(top_builddir)/addressbook/backend		\
-	-I$(top_srcdir)/addressbook/gui/merging		\
-	-I$(top_srcdir)/addressbook/gui/contact-editor	\
-	-I$(top_builddir)/shell				\
-	-DEVOLUTION_GLADEDIR=\""$(gladedir)"\"		\
-	-DEVOLUTION_ETSPECDIR=\""$(etspecdir)"\"	\
-	-DEVOLUTION_DATADIR=\""$(datadir)"\"		\
-	-DEVOLUTION_IMAGESDIR=\""$(imagesdir)"\"	\
-	-DEVOLUTION_UIDIR=\""$(evolutionuidir)\""	\
-	-DPREFIX=\""$(prefix)"\"			\
-	-DG_LOG_DOMAIN=\"contact-list-editor\"		\
-	$(EVOLUTION_ADDRESSBOOK_CFLAGS)
-
-privlib_LTLIBRARIES =				\
-	libecontactlisteditor.la
-
-libecontactlisteditor_la_SOURCES = 		\
-	$(MARSHAL_GENERATED)			\
-	e-contact-list-editor.c			\
-	e-contact-list-editor.h			\
-	e-contact-list-model.c			\
-	e-contact-list-model.h
-
-MARSHAL_GENERATED = e-contact-list-editor-marshal.c e-contact-list-editor-marshal.h
-@EVO_MARSHAL_RULE@
-
-glade_DATA  = contact-list-editor.glade
-etspec_DATA = e-contact-list-editor.etspec
-
-BUILT_SOURCES = $(MARSHAL_GENERATED)
-CLEANFILES = $(BUILT_SOURCES)
-
-EXTRA_DIST = $(glade_DATA)	\
-	     $(etspec_DATA)	\
-	     e-contact-list-editor-marshal.list
diff --git a/addressbook/gui/contact-list-editor/contact-list-editor.glade b/addressbook/gui/contact-list-editor/contact-list-editor.glade
deleted file mode 100644
index bc5c2c18ee..0000000000
--- a/addressbook/gui/contact-list-editor/contact-list-editor.glade
+++ /dev/null
@@ -1,436 +0,0 @@
-<?xml version="1.0" standalone="no"?> <!--*- mode: xml -*-->
-<!DOCTYPE glade-interface SYSTEM "http://glade.gnome.org/glade-2.0.dtd">
-
-<glade-interface>
-
-<widget class="GtkDialog" id="contact list editor">
-  <property name="visible">True</property>
-  <property name="title" translatable="yes">Contact List Editor</property>
-  <property name="type">GTK_WINDOW_TOPLEVEL</property>
-  <property name="window_position">GTK_WIN_POS_NONE</property>
-  <property name="modal">False</property>
-  <property name="resizable">True</property>
-  <property name="destroy_with_parent">False</property>
-  <property name="decorated">True</property>
-  <property name="skip_taskbar_hint">False</property>
-  <property name="skip_pager_hint">False</property>
-  <property name="type_hint">GDK_WINDOW_TYPE_HINT_DIALOG</property>
-  <property name="gravity">GDK_GRAVITY_NORTH_WEST</property>
-  <property name="has_separator">True</property>
-
-  <child internal-child="vbox">
-    <widget class="GtkVBox" id="dialog-vbox1">
-      <property name="visible">True</property>
-      <property name="homogeneous">False</property>
-      <property name="spacing">0</property>
-
-      <child internal-child="action_area">
-	<widget class="GtkHButtonBox" id="dialog-action_area1">
-	  <property name="visible">True</property>
-	  <property name="layout_style">GTK_BUTTONBOX_END</property>
-
-	  <child>
-	    <widget class="GtkButton" id="cancel-button">
-	      <property name="visible">True</property>
-	      <property name="can_default">True</property>
-	      <property name="can_focus">True</property>
-	      <property name="label">gtk-cancel</property>
-	      <property name="use_stock">True</property>
-	      <property name="relief">GTK_RELIEF_NORMAL</property>
-	      <property name="focus_on_click">True</property>
-	      <property name="response_id">-6</property>
-	    </widget>
-	  </child>
-
-	  <child>
-	    <widget class="GtkButton" id="ok-button">
-	      <property name="visible">True</property>
-	      <property name="can_default">True</property>
-	      <property name="can_focus">True</property>
-	      <property name="label">gtk-ok</property>
-	      <property name="use_stock">True</property>
-	      <property name="relief">GTK_RELIEF_NORMAL</property>
-	      <property name="focus_on_click">True</property>
-	      <property name="response_id">-5</property>
-	    </widget>
-	  </child>
-	</widget>
-	<packing>
-	  <property name="padding">0</property>
-	  <property name="expand">False</property>
-	  <property name="fill">True</property>
-	  <property name="pack_type">GTK_PACK_END</property>
-	</packing>
-      </child>
-
-      <child>
-	<widget class="GtkVBox" id="vbox8">
-	  <property name="border_width">6</property>
-	  <property name="visible">True</property>
-	  <property name="homogeneous">False</property>
-	  <property name="spacing">6</property>
-
-	  <child>
-	    <widget class="GtkHBox" id="hbox6">
-	      <property name="border_width">6</property>
-	      <property name="visible">True</property>
-	      <property name="homogeneous">False</property>
-	      <property name="spacing">6</property>
-
-	      <child>
-		<widget class="GtkTable" id="table1">
-		  <property name="visible">True</property>
-		  <property name="n_rows">2</property>
-		  <property name="n_columns">2</property>
-		  <property name="homogeneous">False</property>
-		  <property name="row_spacing">6</property>
-		  <property name="column_spacing">6</property>
-
-		  <child>
-		    <widget class="GtkLabel" id="label10">
-		      <property name="visible">True</property>
-		      <property name="label" translatable="yes">_List name:</property>
-		      <property name="use_underline">True</property>
-		      <property name="use_markup">False</property>
-		      <property name="justify">GTK_JUSTIFY_LEFT</property>
-		      <property name="wrap">False</property>
-		      <property name="selectable">False</property>
-		      <property name="xalign">0</property>
-		      <property name="yalign">0.5</property>
-		      <property name="xpad">0</property>
-		      <property name="ypad">0</property>
-		      <property name="mnemonic_widget">list-name-entry</property>
-		    </widget>
-		    <packing>
-		      <property name="left_attach">0</property>
-		      <property name="right_attach">1</property>
-		      <property name="top_attach">0</property>
-		      <property name="bottom_attach">1</property>
-		      <property name="x_options">fill</property>
-		      <property name="y_options"></property>
-		    </packing>
-		  </child>
-
-		  <child>
-		    <widget class="GtkEntry" id="list-name-entry">
-		      <property name="visible">True</property>
-		      <property name="can_focus">True</property>
-		      <property name="has_focus">True</property>
-		      <property name="editable">True</property>
-		      <property name="visibility">True</property>
-		      <property name="max_length">0</property>
-		      <property name="text" translatable="yes"></property>
-		      <property name="has_frame">True</property>
-		      <property name="invisible_char" translatable="yes">*</property>
-		      <property name="activates_default">False</property>
-		    </widget>
-		    <packing>
-		      <property name="left_attach">1</property>
-		      <property name="right_attach">2</property>
-		      <property name="top_attach">0</property>
-		      <property name="bottom_attach">1</property>
-		      <property name="y_options"></property>
-		    </packing>
-		  </child>
-
-		  <child>
-		    <widget class="GtkLabel" id="source-label">
-		      <property name="visible">True</property>
-		      <property name="label" translatable="yes">_Where:</property>
-		      <property name="use_underline">True</property>
-		      <property name="use_markup">False</property>
-		      <property name="justify">GTK_JUSTIFY_LEFT</property>
-		      <property name="wrap">False</property>
-		      <property name="selectable">False</property>
-		      <property name="xalign">0.5</property>
-		      <property name="yalign">0.5</property>
-		      <property name="xpad">0</property>
-		      <property name="ypad">0</property>
-		    </widget>
-		    <packing>
-		      <property name="left_attach">0</property>
-		      <property name="right_attach">1</property>
-		      <property name="top_attach">1</property>
-		      <property name="bottom_attach">2</property>
-		      <property name="x_options">fill</property>
-		      <property name="y_options"></property>
-		    </packing>
-		  </child>
-
-		  <child>
-		    <widget class="Custom" id="source-option-menu-source">
-		      <property name="visible">True</property>
-		      <property name="creation_function">e_contact_list_editor_create_source_option_menu</property>
-		      <property name="int1">0</property>
-		      <property name="int2">0</property>
-		      <property name="last_modification_time">Tue, 01 Jun 2004 18:22:38 GMT</property>
-		    </widget>
-		    <packing>
-		      <property name="left_attach">1</property>
-		      <property name="right_attach">2</property>
-		      <property name="top_attach">1</property>
-		      <property name="bottom_attach">2</property>
-		      <property name="x_options">fill</property>
-		      <property name="y_options">fill</property>
-		    </packing>
-		  </child>
-		</widget>
-		<packing>
-		  <property name="padding">0</property>
-		  <property name="expand">True</property>
-		  <property name="fill">True</property>
-		</packing>
-	      </child>
-
-	      <child>
-		<widget class="Custom" id="list-image">
-		  <property name="visible">True</property>
-		  <property name="creation_function">eab_create_image_chooser_widget</property>
-		  <property name="string1">stock_addressbook</property>
-		  <property name="int1">0</property>
-		  <property name="int2">0</property>
-		  <property name="last_modification_time">Sat, 23 Jun 2001 05:59:21 GMT</property>
-		</widget>
-		<packing>
-		  <property name="padding">0</property>
-		  <property name="expand">False</property>
-		  <property name="fill">False</property>
-		</packing>
-	      </child>
-	    </widget>
-	    <packing>
-	      <property name="padding">0</property>
-	      <property name="expand">False</property>
-	      <property name="fill">False</property>
-	    </packing>
-	  </child>
-
-	  <child>
-	    <widget class="GtkFrame" id="frame3">
-	      <property name="border_width">3</property>
-	      <property name="visible">True</property>
-	      <property name="label_xalign">0</property>
-	      <property name="label_yalign">0.5</property>
-	      <property name="shadow_type">GTK_SHADOW_ETCHED_IN</property>
-
-	      <child>
-		<widget class="GtkHBox" id="hbox7">
-		  <property name="border_width">6</property>
-		  <property name="visible">True</property>
-		  <property name="homogeneous">False</property>
-		  <property name="spacing">6</property>
-
-		  <child>
-		    <widget class="GtkVBox" id="vbox9">
-		      <property name="visible">True</property>
-		      <property name="homogeneous">False</property>
-		      <property name="spacing">6</property>
-
-		      <child>
-			<widget class="GtkLabel" id="label11">
-			  <property name="visible">True</property>
-			  <property name="label" translatable="yes">_Type an email address or drag a contact into the list below:</property>
-			  <property name="use_underline">True</property>
-			  <property name="use_markup">False</property>
-			  <property name="justify">GTK_JUSTIFY_CENTER</property>
-			  <property name="wrap">False</property>
-			  <property name="selectable">False</property>
-			  <property name="xalign">0</property>
-			  <property name="yalign">0.5</property>
-			  <property name="xpad">0</property>
-			  <property name="ypad">0</property>
-			  <property name="mnemonic_widget">email-entry</property>
-			</widget>
-			<packing>
-			  <property name="padding">0</property>
-			  <property name="expand">False</property>
-			  <property name="fill">False</property>
-			</packing>
-		      </child>
-
-		      <child>
-			<widget class="GtkEntry" id="email-entry">
-			  <property name="visible">True</property>
-			  <property name="can_focus">True</property>
-			  <property name="editable">True</property>
-			  <property name="visibility">True</property>
-			  <property name="max_length">0</property>
-			  <property name="text" translatable="yes"></property>
-			  <property name="has_frame">True</property>
-			  <property name="invisible_char" translatable="yes">*</property>
-			  <property name="activates_default">False</property>
-			</widget>
-			<packing>
-			  <property name="padding">0</property>
-			  <property name="expand">False</property>
-			  <property name="fill">False</property>
-			</packing>
-		      </child>
-
-		      <child>
-			<widget class="Custom" id="contact-list-table">
-			  <property name="visible">True</property>
-			  <property name="creation_function">e_contact_list_editor_create_table</property>
-			  <property name="int1">0</property>
-			  <property name="int2">0</property>
-			  <property name="last_modification_time">Sat, 23 Jun 2001 06:00:16 GMT</property>
-			</widget>
-			<packing>
-			  <property name="padding">0</property>
-			  <property name="expand">True</property>
-			  <property name="fill">True</property>
-			</packing>
-		      </child>
-
-		      <child>
-			<widget class="GtkCheckButton" id="visible-addrs-checkbutton">
-			  <property name="visible">True</property>
-			  <property name="can_focus">True</property>
-			  <property name="label" translatable="yes">_Hide addresses when sending mail to this list</property>
-			  <property name="use_underline">True</property>
-			  <property name="relief">GTK_RELIEF_NORMAL</property>
-			  <property name="focus_on_click">True</property>
-			  <property name="active">False</property>
-			  <property name="inconsistent">False</property>
-			  <property name="draw_indicator">True</property>
-			</widget>
-			<packing>
-			  <property name="padding">0</property>
-			  <property name="expand">False</property>
-			  <property name="fill">False</property>
-			</packing>
-		      </child>
-		    </widget>
-		    <packing>
-		      <property name="padding">0</property>
-		      <property name="expand">True</property>
-		      <property name="fill">True</property>
-		    </packing>
-		  </child>
-
-		  <child>
-		    <widget class="GtkVBox" id="vbox10">
-		      <property name="visible">True</property>
-		      <property name="homogeneous">False</property>
-		      <property name="spacing">0</property>
-
-		      <child>
-			<widget class="GtkLabel" id="label12">
-			  <property name="visible">True</property>
-			  <property name="label" translatable="yes">
-</property>
-			  <property name="use_underline">False</property>
-			  <property name="use_markup">False</property>
-			  <property name="justify">GTK_JUSTIFY_CENTER</property>
-			  <property name="wrap">False</property>
-			  <property name="selectable">False</property>
-			  <property name="xalign">0.5</property>
-			  <property name="yalign">0.5</property>
-			  <property name="xpad">0</property>
-			  <property name="ypad">0</property>
-			</widget>
-			<packing>
-			  <property name="padding">0</property>
-			  <property name="expand">False</property>
-			  <property name="fill">False</property>
-			</packing>
-		      </child>
-
-		      <child>
-			<widget class="GtkVButtonBox" id="vbuttonbox4">
-			  <property name="visible">True</property>
-			  <property name="layout_style">GTK_BUTTONBOX_START</property>
-			  <property name="spacing">6</property>
-
-			  <child>
-			    <widget class="GtkButton" id="add-email-button">
-			      <property name="visible">True</property>
-			      <property name="tooltip" translatable="yes">Add an email to the List</property>
-			      <property name="can_default">True</property>
-			      <property name="can_focus">True</property>
-			      <property name="label">gtk-add</property>
-			      <property name="use_stock">True</property>
-			      <property name="relief">GTK_RELIEF_NORMAL</property>
-			      <property name="focus_on_click">True</property>
-			    </widget>
-			  </child>
-
-			  <child>
-			    <widget class="GtkButton" id="remove-button">
-			      <property name="visible">True</property>
-			      <property name="tooltip" translatable="yes">Remove an email address from the List</property>
-			      <property name="can_default">True</property>
-			      <property name="can_focus">True</property>
-			      <property name="label">gtk-remove</property>
-			      <property name="use_stock">True</property>
-			      <property name="relief">GTK_RELIEF_NORMAL</property>
-			      <property name="focus_on_click">True</property>
-			    </widget>
-			  </child>
-
-			  <child>
-			    <widget class="GtkButton" id="select-button">
-			      <property name="visible">True</property>
-			      <property name="tooltip" translatable="yes">Insert email adresses from Adress Book</property>
-			      <property name="can_default">True</property>
-			      <property name="can_focus">True</property>
-			      <property name="label" translatable="yes">_Select</property>
-			      <property name="use_underline">True</property>
-			      <property name="relief">GTK_RELIEF_NORMAL</property>
-			      <property name="focus_on_click">True</property>
-			    </widget>
-			  </child>
-			</widget>
-			<packing>
-			  <property name="padding">0</property>
-			  <property name="expand">True</property>
-			  <property name="fill">True</property>
-			</packing>
-		      </child>
-		    </widget>
-		    <packing>
-		      <property name="padding">0</property>
-		      <property name="expand">False</property>
-		      <property name="fill">False</property>
-		    </packing>
-		  </child>
-		</widget>
-	      </child>
-
-	      <child>
-		<widget class="GtkLabel" id="label11">
-		  <property name="visible">True</property>
-		  <property name="label" translatable="yes">Members</property>
-		  <property name="use_underline">False</property>
-		  <property name="use_markup">False</property>
-		  <property name="justify">GTK_JUSTIFY_LEFT</property>
-		  <property name="wrap">False</property>
-		  <property name="selectable">False</property>
-		  <property name="xalign">0.5</property>
-		  <property name="yalign">0.5</property>
-		  <property name="xpad">0</property>
-		  <property name="ypad">0</property>
-		</widget>
-		<packing>
-		  <property name="type">label_item</property>
-		</packing>
-	      </child>
-	    </widget>
-	    <packing>
-	      <property name="padding">0</property>
-	      <property name="expand">True</property>
-	      <property name="fill">True</property>
-	    </packing>
-	  </child>
-	</widget>
-	<packing>
-	  <property name="padding">0</property>
-	  <property name="expand">True</property>
-	  <property name="fill">True</property>
-	</packing>
-      </child>
-    </widget>
-  </child>
-</widget>
-
-</glade-interface>
diff --git a/addressbook/gui/contact-list-editor/e-contact-list-editor-marshal.list b/addressbook/gui/contact-list-editor/e-contact-list-editor-marshal.list
deleted file mode 100644
index 8d94a0bf3b..0000000000
--- a/addressbook/gui/contact-list-editor/e-contact-list-editor-marshal.list
+++ /dev/null
@@ -1,4 +0,0 @@
-INT:OBJECT
-NONE:INT,OBJECT
-NONE:INT,OBJECT
-NONE:NONE
diff --git a/addressbook/gui/contact-list-editor/e-contact-list-editor.c b/addressbook/gui/contact-list-editor/e-contact-list-editor.c
deleted file mode 100644
index c4a5acd170..0000000000
--- a/addressbook/gui/contact-list-editor/e-contact-list-editor.c
+++ /dev/null
@@ -1,1127 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-/* e-contact-list-editor.c
- * Copyright (C) 2001  Ximian, Inc.
- * Author: Chris Toshok <toshok@ximian.com>
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of version 2 of the GNU General Public
- * License as published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * General Public License for more details.
- *
- * You should have received a copy of the GNU General Public
- * License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
- */
-
-#include <config.h>
-
-#include "e-contact-list-editor.h"
-#include <e-util/e-icon-factory.h>
-
-#include <string.h>
-
-#include <libgnome/gnome-i18n.h>
-#include <libgnomeui/gnome-window-icon.h>
-#include <gtk/gtkentry.h>
-#include <gtk/gtktogglebutton.h>
-#include <gtk/gtkdialog.h>
-
-#include <libedataserverui/e-source-option-menu.h>
-
-#include <gal/e-table/e-table-scrolled.h>
-#include <libgnomevfs/gnome-vfs-ops.h>
-
-#include "shell/evolution-shell-component-utils.h"
-
-#include "widgets/misc/e-image-chooser.h"
-
-#include "addressbook/gui/component/addressbook.h"
-#include "addressbook/gui/widgets/eab-gui-util.h"
-#include "addressbook/util/eab-book-util.h"
-
-#include "eab-editor.h"
-#include "e-contact-editor.h"
-#include "e-contact-list-model.h"
-#include "e-contact-list-editor-marshal.h"
-#include "eab-contact-merging.h"
-
-static void e_contact_list_editor_init		(EContactListEditor		 *editor);
-static void e_contact_list_editor_class_init	(EContactListEditorClass	 *klass);
-static void e_contact_list_editor_set_property (GObject *object, guint prop_id, const GValue *value, GParamSpec *pspec);
-static void e_contact_list_editor_get_property (GObject *object, guint prop_id, GValue *value, GParamSpec *pspec);
-static void e_contact_list_editor_dispose (GObject *object);
-
-static void     e_contact_list_editor_show       (EABEditor *editor);
-static void     e_contact_list_editor_raise      (EABEditor *editor);
-static void     e_contact_list_editor_close      (EABEditor *editor);
-static void     e_contact_list_editor_save_contact (EABEditor *editor, gboolean should_close);
-static gboolean e_contact_list_editor_is_valid   (EABEditor *editor);
-static gboolean e_contact_list_editor_is_changed (EABEditor *editor);
-static GtkWindow* e_contact_list_editor_get_window (EABEditor *editor);
-
-static void set_editable (EContactListEditor *editor);
-static void command_state_changed (EContactListEditor *editor);
-static void extract_info(EContactListEditor *editor);
-static void fill_in_info(EContactListEditor *editor);
-
-static void add_email_cb (GtkWidget *w, EContactListEditor *editor);
-static void remove_entry_cb (GtkWidget *w, EContactListEditor *editor);
-static void select_cb (GtkWidget *w, EContactListEditor *editor);
-static void list_name_changed_cb (GtkWidget *w, EContactListEditor *editor);
-static void list_image_changed_cb (GtkWidget *w, EContactListEditor *editor);
-static void visible_addrs_toggled_cb (GtkWidget *w, EContactListEditor *editor);
-static void source_selected (GtkWidget *source_option_menu, ESource *source, EContactListEditor *editor);
-
-static void close_cb (GtkWidget *widget, EContactListEditor *editor);
-static void save_and_close_cb (GtkWidget *widget, EContactListEditor *editor);
-
-static gint app_delete_event_cb (GtkWidget *widget, GdkEvent *event, gpointer data);
-static gboolean table_drag_drop_cb (ETable *table, int row, int col, GdkDragContext *context,
-				    gint x, gint y, guint time, EContactListEditor *editor);
-static gboolean table_drag_motion_cb (ETable *table, int row, int col, GdkDragContext *context,
-				      gint x, gint y, guint time, EContactListEditor *editor);
-static void table_drag_data_received_cb (ETable *table, int row, int col,
-					 GdkDragContext *context,
-					 gint x, gint y,
-					 GtkSelectionData *selection_data, guint info, guint time,
-					 EContactListEditor *editor);
-
-static EABEditorClass *parent_class = NULL;
-
-enum DndTargetType {
-	DND_TARGET_TYPE_VCARD,
-};
-#define VCARD_TYPE "text/x-vcard"
-
-static GtkTargetEntry list_drag_types[] = {
-	{ VCARD_TYPE, 0, DND_TARGET_TYPE_VCARD },
-};
-static const int num_list_drag_types = sizeof (list_drag_types) / sizeof (list_drag_types[0]);
-
-/* The arguments we take */
-enum {
-	PROP_0,
-	PROP_BOOK,
-	PROP_CONTACT,
-	PROP_IS_NEW_LIST,
-	PROP_EDITABLE
-};
-
-GType
-e_contact_list_editor_get_type (void)
-{
-	static GType cle_type = 0;
-
-	if (!cle_type) {
-		static const GTypeInfo cle_info =  {
-			sizeof (EContactListEditorClass),
-			NULL,           /* base_init */
-			NULL,           /* base_finalize */
-			(GClassInitFunc) e_contact_list_editor_class_init,
-			NULL,           /* class_finalize */
-			NULL,           /* class_data */
-			sizeof (EContactListEditor),
-			0,             /* n_preallocs */
-			(GInstanceInitFunc) e_contact_list_editor_init,
-		};
-
-		cle_type = g_type_register_static (EAB_TYPE_EDITOR, "EContactListEditor", &cle_info, 0);
-	}
-
-	return cle_type;
-}
-
-
-static void
-e_contact_list_editor_class_init (EContactListEditorClass *klass)
-{
-	GObjectClass *object_class = G_OBJECT_CLASS (klass);
-	EABEditorClass *editor_class = EAB_EDITOR_CLASS (klass);
-
-	parent_class = g_type_class_ref (EAB_TYPE_EDITOR);
-
-	editor_class->show = e_contact_list_editor_show;
-	editor_class->raise = e_contact_list_editor_raise;
-	editor_class->close = e_contact_list_editor_close;
-	editor_class->save_contact = e_contact_list_editor_save_contact;
-	editor_class->is_valid = e_contact_list_editor_is_valid;
-	editor_class->is_changed = e_contact_list_editor_is_changed;
-	editor_class->get_window = e_contact_list_editor_get_window;
-
-	object_class->set_property = e_contact_list_editor_set_property;
-	object_class->get_property = e_contact_list_editor_get_property;
-	object_class->dispose = e_contact_list_editor_dispose;
-
-	g_object_class_install_property (object_class, PROP_BOOK, 
-					 g_param_spec_object ("book",
-							      _("Book"),
-							      /*_( */"XXX blurb" /*)*/,
-							      E_TYPE_BOOK,
-							      G_PARAM_READWRITE));
-
-	g_object_class_install_property (object_class, PROP_CONTACT, 
-					 g_param_spec_object ("contact",
-							      _("Contact"),
-							      /*_( */"XXX blurb" /*)*/,
-							      E_TYPE_CONTACT,
-							      G_PARAM_READWRITE));
-
-	g_object_class_install_property (object_class, PROP_IS_NEW_LIST, 
-					 g_param_spec_boolean ("is_new_list",
-							       _("Is New List"),
-							       /*_( */"XXX blurb" /*)*/,
-							       FALSE,
-							       G_PARAM_READWRITE));
-
-	g_object_class_install_property (object_class, PROP_EDITABLE, 
-					 g_param_spec_boolean ("editable",
-							       _("Editable"),
-							       /*_( */"XXX blurb" /*)*/,
-							       FALSE,
-							       G_PARAM_READWRITE));
-}
-
-static void
-e_contact_list_editor_init (EContactListEditor *editor)
-{
-	GladeXML *gui;
-	GList *icon_list;
-
-	editor->contact = NULL;
-	editor->changed = FALSE;
-	editor->image_set = FALSE;
-	editor->editable = TRUE;
-	editor->allows_contact_lists = TRUE;
-	editor->in_async_call = FALSE;
-	editor->is_new_list = FALSE;
-
-	editor->load_source_id = 0;
-	editor->load_book = NULL;
-
-	gui = glade_xml_new (EVOLUTION_GLADEDIR "/contact-list-editor.glade", NULL, NULL);
-	editor->gui = gui;
-
-	editor->app = glade_xml_get_widget (gui, "contact list editor");
-
-	editor->table = glade_xml_get_widget (gui, "contact-list-table");
-	editor->model = g_object_get_data (G_OBJECT(editor->table), "model");
-
-	/* XXX need this for libglade-2 it seems */
-	gtk_widget_show (editor->table);
-
-	editor->add_button = glade_xml_get_widget (editor->gui, "add-email-button");
-	editor->remove_button = glade_xml_get_widget (editor->gui, "remove-button");
-	editor->select_button = glade_xml_get_widget (editor->gui, "select-button");
-
-	editor->email_entry = glade_xml_get_widget (gui, "email-entry");
-	editor->list_name_entry = glade_xml_get_widget (gui, "list-name-entry");
-	editor->list_image = glade_xml_get_widget (gui, "list-image");
-	editor->visible_addrs_checkbutton = glade_xml_get_widget (gui, "visible-addrs-checkbutton");
-	editor->source_menu = glade_xml_get_widget (gui, "source-option-menu-source");
-
-	editor->ok_button = glade_xml_get_widget (gui, "ok-button");
-	editor->cancel_button = glade_xml_get_widget (gui, "cancel-button");
-
-	/* connect signals */
-	g_signal_connect (editor->add_button,
-			  "clicked", G_CALLBACK(add_email_cb), editor);
-	g_signal_connect (editor->email_entry,
-			  "activate", G_CALLBACK(add_email_cb), editor);
-	g_signal_connect (editor->remove_button,
-			  "clicked", G_CALLBACK(remove_entry_cb), editor);
-	g_signal_connect (editor->select_button,
-			  "clicked", G_CALLBACK(select_cb), editor);
-	g_signal_connect (editor->list_name_entry,
-			  "changed", G_CALLBACK(list_name_changed_cb), editor);
-	g_signal_connect (editor->visible_addrs_checkbutton,
-			  "toggled", G_CALLBACK(visible_addrs_toggled_cb), editor);
-
-	e_table_drag_dest_set (e_table_scrolled_get_table (E_TABLE_SCROLLED (editor->table)),
-			       0, list_drag_types, num_list_drag_types, GDK_ACTION_LINK);
-
-	g_signal_connect (e_table_scrolled_get_table (E_TABLE_SCROLLED (editor->table)),
-			  "table_drag_motion", G_CALLBACK(table_drag_motion_cb), editor);
-	g_signal_connect (e_table_scrolled_get_table (E_TABLE_SCROLLED (editor->table)),
-			  "table_drag_drop", G_CALLBACK (table_drag_drop_cb), editor);
-	g_signal_connect (e_table_scrolled_get_table (E_TABLE_SCROLLED (editor->table)),
-			  "table_drag_data_received", G_CALLBACK(table_drag_data_received_cb), editor);
-
-	g_signal_connect (editor->ok_button,
-			  "clicked", G_CALLBACK(save_and_close_cb), editor);
-	g_signal_connect (editor->cancel_button,
-			  "clicked", G_CALLBACK(close_cb), editor);
-	
-
-	g_signal_connect (editor->list_image,
-			  "changed", G_CALLBACK(list_image_changed_cb), editor);
-
-	g_signal_connect (editor->source_menu,
-			  "source_selected", G_CALLBACK (source_selected), editor);
-
-	command_state_changed (editor);
-
-	/* Connect to the deletion of the dialog */
-	g_signal_connect (editor->app, "delete_event",
-			  G_CALLBACK (app_delete_event_cb), editor);
-
-	gtk_dialog_set_has_separator (GTK_DIALOG (editor->app), FALSE);
-
-	/* set the icon */
-	icon_list = e_icon_factory_get_icon_list ("stock_contact-list");
-	if (icon_list) {
-		gtk_window_set_icon_list (GTK_WINDOW (editor->app), icon_list);
-		g_list_foreach (icon_list, (GFunc) g_object_unref, NULL);
-		g_list_free (icon_list);
-	}
-
-	gtk_widget_show_all (editor->app);
-}
-
-static void
-new_target_cb (EBook *new_book, EBookStatus status, EContactListEditor *editor)
-{
-	editor->load_source_id = 0;
-	editor->load_book      = NULL;
-
-	if (status != E_BOOK_ERROR_OK || new_book == NULL) {
-		eab_load_error_dialog (NULL, e_book_get_source (new_book), status);
-
-		e_source_option_menu_select (E_SOURCE_OPTION_MENU (editor->source_menu),
-					     e_book_get_source (editor->book));
-
-		if (new_book)
-			g_object_unref (new_book);
-		return;
-	}
-
-	g_object_set (editor, "book", new_book, NULL);
-	g_object_unref (new_book);
-}
-
-static void
-cancel_load (EContactListEditor *editor)
-{
-	if (editor->load_source_id) {
-		addressbook_load_cancel (editor->load_source_id);
-		editor->load_source_id = 0;
-
-		g_object_unref (editor->load_book);
-		editor->load_book = NULL;
-	}
-}
-
-static void
-source_selected (GtkWidget *source_option_menu, ESource *source, EContactListEditor *editor)
-{
-	cancel_load (editor);
-
-	if (e_source_equal (e_book_get_source (editor->book), source))
-		return;
-
-	editor->load_book = e_book_new (source, NULL);
-	editor->load_source_id = addressbook_load (editor->load_book,
-						   (EBookCallback) new_target_cb, editor);
-}
-
-static void
-e_contact_list_editor_dispose (GObject *object)
-{
-	EContactListEditor *editor = E_CONTACT_LIST_EDITOR (object);
-
-	cancel_load (editor);
-
-	if (editor->name_selector) {
-		g_object_unref (editor->name_selector);
-		editor->name_selector = NULL;
-	}
-
-	if (G_OBJECT_CLASS (parent_class)->dispose)
-		(* G_OBJECT_CLASS (parent_class)->dispose) (object);
-}
-
-typedef struct {
-	EContactListEditor *cle;
-	gboolean should_close;
-} EditorCloseStruct;
-
-static void
-list_added_cb (EBook *book, EBookStatus status, const char *id, EditorCloseStruct *ecs)
-{
-	EContactListEditor *cle = ecs->cle;
-	gboolean should_close = ecs->should_close;
-
-	if (cle->app)
-		gtk_widget_set_sensitive (cle->app, TRUE);
-	cle->in_async_call = FALSE;
-
-	e_contact_set (cle->contact, E_CONTACT_UID, (char*)id);
-
-	eab_editor_contact_added (EAB_EDITOR (cle), status, cle->contact);
-
-	if (status == E_BOOK_ERROR_OK) {
-		cle->is_new_list = FALSE;
-
-		if (should_close)
-			eab_editor_close (EAB_EDITOR (cle));
-		else
-			command_state_changed (cle);
-	}
-
-	g_object_unref (cle);
-	g_free (ecs);
-}
-
-static void
-list_modified_cb (EBook *book, EBookStatus status, EditorCloseStruct *ecs)
-{
-	EContactListEditor *cle = ecs->cle;
-	gboolean should_close = ecs->should_close;
-
-	if (cle->app)
-		gtk_widget_set_sensitive (cle->app, TRUE);
-	cle->in_async_call = FALSE;
-
-	eab_editor_contact_modified (EAB_EDITOR (cle), status, cle->contact);
-
-	if (status == E_BOOK_ERROR_OK) {
-		if (should_close)
-			eab_editor_close (EAB_EDITOR (cle));
-	}
-
-	g_object_unref (cle); /* release ref held for ebook callback */
-	g_free (ecs);
-}
-
-static void
-save_contact (EContactListEditor *cle, gboolean should_close)
-{
-	extract_info (cle);
-
-	if (cle->book) {
-		EditorCloseStruct *ecs = g_new(EditorCloseStruct, 1);
-		
-		ecs->cle = cle;
-		g_object_ref (cle);
-		ecs->should_close = should_close;
-
-		if (cle->app)
-			gtk_widget_set_sensitive (cle->app, FALSE);
-		cle->in_async_call = TRUE;
-
-		if (cle->is_new_list)
-			eab_merging_book_add_contact (cle->book, cle->contact, (EBookIdCallback)list_added_cb, ecs);
-		else
-			eab_merging_book_commit_contact (cle->book, cle->contact, (EBookCallback)list_modified_cb, ecs);
-
-		cle->changed = FALSE;
-	}
-}
-
-static gboolean
-is_named (EContactListEditor *editor)
-{
-	char *string = gtk_editable_get_chars(GTK_EDITABLE (editor->list_name_entry), 0, -1);
-	gboolean named = FALSE;
-
-	if (string && *string) {
-		named = TRUE;
-	}
-
-	g_free (string);
-
-	return named;
-}
-
-static void
-e_contact_list_editor_save_contact (EABEditor *editor, gboolean should_close)
-{
-	EContactListEditor *cle = E_CONTACT_LIST_EDITOR (editor);
-
-	save_contact (cle, should_close);
-}
-
-static gboolean
-e_contact_list_editor_is_valid (EABEditor *editor)
-{
-	EContactListEditor *cle = E_CONTACT_LIST_EDITOR (editor);
-
-	return is_named (cle);
-}
-
-static gboolean
-e_contact_list_editor_is_changed (EABEditor *editor)
-{
-	EContactListEditor *cle = E_CONTACT_LIST_EDITOR (editor);
-
-	return cle->changed;
-}
-
-static GtkWindow*
-e_contact_list_editor_get_window (EABEditor *editor)
-{
-	return GTK_WINDOW (E_CONTACT_LIST_EDITOR (editor)->app);
-}
-
-static void
-close_cb (GtkWidget *widget, EContactListEditor *cle)
-{
-	eab_editor_prompt_to_save_changes (EAB_EDITOR (cle), GTK_WINDOW (cle->app));
-}
-
-static void
-save_and_close_cb (GtkWidget *widget, EContactListEditor *cle)
-{
-	save_contact (cle, TRUE);
-}
-
-static void
-contact_list_editor_destroy_notify (gpointer data,
-				    GObject *where_the_object_was)
-{
-	eab_editor_remove (EAB_EDITOR (data));
-}
-
-EContactListEditor *
-e_contact_list_editor_new (EBook *book,
-			   EContact *list_contact,
-			   gboolean is_new_list,
-			   gboolean editable)
-{
-	EContactListEditor *ce = g_object_new (E_TYPE_CONTACT_LIST_EDITOR, NULL);
-
-	eab_editor_add (EAB_EDITOR (ce));
-	g_object_weak_ref (G_OBJECT (ce), contact_list_editor_destroy_notify, ce);
-
-	g_object_set (ce,
-		      "book", book,
-		      "contact", list_contact,
-		      "is_new_list", is_new_list,
-		      "editable", editable,
-		      NULL);
-
-	return ce;
-}
-
-static void
-e_contact_list_editor_set_property (GObject *object, guint prop_id,
-				    const GValue *value, GParamSpec *pspec)
-{
-	EContactListEditor *editor;
-
-	editor = E_CONTACT_LIST_EDITOR (object);
-	
-	switch (prop_id){
-	case PROP_BOOK: {
-		gboolean changed;
-
-		if (editor->book)
-			g_object_unref (editor->book);
-		editor->book = E_BOOK(g_value_get_object (value));
-		g_object_ref (editor->book);
-		/* XXX more here about editable/etc. */
-
-		changed = (editor->allows_contact_lists != e_book_check_static_capability (editor->book,
-											   "contact-lists"));
-		editor->allows_contact_lists = e_book_check_static_capability (editor->book,
-									       "contact-lists");
-
-		if (changed) {
-			set_editable (editor);
-			command_state_changed (editor);
-		}
-		break;
-	}
-	case PROP_CONTACT:
-		if (editor->contact)
-			g_object_unref (editor->contact);
-		editor->contact = e_contact_duplicate(E_CONTACT(g_value_get_object (value)));
-		fill_in_info(editor);
-		editor->changed = FALSE;
-		command_state_changed (editor);
-		break;
-	case PROP_IS_NEW_LIST: {
-		gboolean new_value = g_value_get_boolean (value);
-		gboolean changed = (editor->is_new_list != new_value);
-
-		editor->is_new_list = new_value;
-		
-		if (changed)
-			command_state_changed (editor);
-		break;
-	}
-	case PROP_EDITABLE: {
-		gboolean new_value = g_value_get_boolean (value);
-		gboolean changed = (editor->editable != new_value);
-
-		editor->editable = new_value;
-
-		if (changed) {
-			set_editable (editor);
-			command_state_changed (editor);
-		}
-		break;
-	}
-	default:
-		G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
-		break;
-	}
-}
-
-static void
-e_contact_list_editor_get_property (GObject *object, guint prop_id,
-				    GValue *value, GParamSpec *pspec)
-{
-	EContactListEditor *editor;
-
-	editor = E_CONTACT_LIST_EDITOR (object);
-
-	switch (prop_id) {
-	case PROP_BOOK:
-		g_value_set_object (value, editor->book);
-		break;
-
-	case PROP_CONTACT:
-		extract_info(editor);
-		g_value_set_object (value, editor->contact);
-		break;
-
-	case PROP_IS_NEW_LIST:
-		g_value_set_boolean (value, editor->is_new_list);
-		break;
-
-	case PROP_EDITABLE:
-		g_value_set_boolean (value, editor->editable);
-		break;
-	default:
-		G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
-		break;
-	}
-}
-
-static void
-e_contact_list_editor_show (EABEditor *editor)
-{
-	EContactListEditor *cle = E_CONTACT_LIST_EDITOR (editor);
-	gtk_widget_show (cle->app);
-}
-
-static void
-e_contact_list_editor_raise (EABEditor *editor)
-{
-	EContactListEditor *cle = E_CONTACT_LIST_EDITOR (editor);
-	gdk_window_raise (GTK_WIDGET (cle->app)->window);
-}
-
-static void
-e_contact_list_editor_close (EABEditor *editor)
-{
-	EContactListEditor *cle = E_CONTACT_LIST_EDITOR (editor);
-	g_assert (cle->app != NULL);
-
-	gtk_widget_destroy (cle->app);
-	cle->app = NULL;
-
-	eab_editor_closed (EAB_EDITOR (cle));
-}
-
-GtkWidget *
-e_contact_list_editor_create_table(gchar *name,
-				   gchar *string1, gchar *string2,
-				   gint int1, gint int2);
-
-GtkWidget *
-e_contact_list_editor_create_table(gchar *name,
-				   gchar *string1, gchar *string2,
-				   gint int1, gint int2)
-{
-	
-	ETableModel *model;
-	GtkWidget *table;
-
-	model = e_contact_list_model_new ();
-
-	table = e_table_scrolled_new_from_spec_file (model,
-				      NULL,
-				      EVOLUTION_ETSPECDIR "/e-contact-list-editor.etspec",
-				      NULL);
-
-	g_object_set_data(G_OBJECT(table), "model", model);
-
-	return table;
-}
-
-static void
-add_to_model (EContactListEditor *editor, GList *destinations)
-{
-	GList *l;
-
-	for (l = destinations; l; l = g_list_next (l)) {
-		EDestination *destination = l->data;
-		e_contact_list_model_add_destination (E_CONTACT_LIST_MODEL(editor->model), destination);
-	}
-}
-
-static void
-select_names_ok_cb (GtkWidget *widget, gint response, gpointer data)
-{
-	EContactListEditor  *ce;
-	ENameSelectorDialog *name_selector_dialog;
-	ENameSelectorModel  *name_selector_model;
-	EDestinationStore   *destination_store;
-	GList               *destinations;
-
-	ce = E_CONTACT_LIST_EDITOR (data);
-
-	name_selector_dialog = e_name_selector_peek_dialog (ce->name_selector);
-	gtk_widget_hide (GTK_WIDGET (name_selector_dialog));
-
-	name_selector_model = e_name_selector_peek_model (ce->name_selector);
-	e_name_selector_model_peek_section (name_selector_model, "Members", NULL, &destination_store);
-	destinations = e_destination_store_list_destinations (destination_store);
-
-	add_to_model (ce, destinations);
-
-	g_list_free (destinations);
-
-	ce->changed = TRUE;
-	command_state_changed (ce);
-}
-
-static void
-setup_name_selector (EContactListEditor *editor)
-{
-	ENameSelectorModel  *name_selector_model;
-	ENameSelectorDialog *name_selector_dialog;
-
-	if (editor->name_selector)
-		return;
-
-	editor->name_selector = e_name_selector_new ();
-
-	name_selector_model = e_name_selector_peek_model (editor->name_selector);
-	e_name_selector_model_add_section (name_selector_model, "Members", gettext ("_Members"), NULL);
-
-	name_selector_dialog = e_name_selector_peek_dialog (editor->name_selector);
-	gtk_window_set_title (GTK_WINDOW (name_selector_dialog), _("Contact List Members"));
-	g_signal_connect (name_selector_dialog, "response",
-			  G_CALLBACK (select_names_ok_cb), editor);
-}
-
-static void
-select_cb (GtkWidget *w, EContactListEditor *editor)
-{
-	ENameSelectorModel  *name_selector_model;
-	ENameSelectorDialog *name_selector_dialog;
-	EDestinationStore   *destination_store;
-	GList               *destinations;
-	GList               *l;
-
-	setup_name_selector (editor);
-
-	/* We need to empty out the destination store, since we copy its contents every time.
-	 * This sucks, we should really be wired directly to the EDestinationStore that
-	 * the name selector uses in true MVC fashion. */
-
-	name_selector_model = e_name_selector_peek_model (editor->name_selector);
-	e_name_selector_model_peek_section (name_selector_model, "Members", NULL, &destination_store);
-	destinations = e_destination_store_list_destinations (destination_store);
-
-	for (l = destinations; l; l = g_list_next (l)) {
-		EDestination *destination = l->data;
-		e_destination_store_remove_destination (destination_store, destination);
-	}
-
-	g_list_free (destinations);
-
-	name_selector_dialog = e_name_selector_peek_dialog (editor->name_selector);
-	gtk_widget_show (GTK_WIDGET (name_selector_dialog));
-}
-
-GtkWidget *
-e_contact_list_editor_create_source_option_menu (gchar *name,
-						 gchar *string1, gchar *string2,
-						 gint int1, gint int2);
-
-GtkWidget *
-e_contact_list_editor_create_source_option_menu (gchar *name,
-						 gchar *string1, gchar *string2,
-						 gint int1, gint int2)
-{
-
-	GtkWidget   *menu;
-	GConfClient *gconf_client;
-	ESourceList *source_list;
-
-	gconf_client = gconf_client_get_default ();
-	source_list = e_source_list_new_for_gconf (gconf_client, "/apps/evolution/addressbook/sources");
-
-	menu = e_source_option_menu_new (source_list);
-	g_object_unref (source_list);
-
-	gtk_widget_show (menu);
-	return menu;
-}
-
-static void
-add_email_cb (GtkWidget *w, EContactListEditor *editor)
-{
-	GtkAdjustment *adj = gtk_scrolled_window_get_vadjustment (GTK_SCROLLED_WINDOW (editor->table));
-	const char *text = gtk_entry_get_text (GTK_ENTRY(editor->email_entry));
-
-	if (text && *text) {
-		e_contact_list_model_add_email (E_CONTACT_LIST_MODEL(editor->model), text);
-
-		/* Skip to the end of the list */
-		if (adj->upper - adj->lower > adj->page_size)
-			gtk_adjustment_set_value (adj, adj->upper);
-		
-		editor->changed = TRUE;
-
-	}
-
-	gtk_entry_set_text (GTK_ENTRY(editor->email_entry), "");
-	command_state_changed (editor);
-}
-
-static void
-remove_row (int model_row, EContactListEditor *editor)
-{
-	e_contact_list_model_remove_row (E_CONTACT_LIST_MODEL (editor->model), model_row);
-}
-
-static void
-remove_entry_cb (GtkWidget *w, EContactListEditor *editor)
-{
-	e_table_selected_row_foreach (e_table_scrolled_get_table(E_TABLE_SCROLLED(editor->table)),
-				      (EForeachFunc)remove_row, editor);
-	editor->changed = TRUE;
-	command_state_changed (editor);
-}
-
-static void
-list_name_changed_cb (GtkWidget *w, EContactListEditor *editor)
-{
-	char *string = gtk_editable_get_chars(GTK_EDITABLE (w), 0, -1);
-	char *title;
-
-	editor->changed = TRUE;
-
-	if (string && *string)
-		title = string;
-	else
-		title = _("Contact List Editor");
-
-	gtk_window_set_title (GTK_WINDOW (editor->app), title);
-
-	g_free (string);
-
-	command_state_changed (editor);
-}
-
-static void
-list_image_changed_cb (GtkWidget *w, EContactListEditor *editor)
-{
-	editor->image_set = TRUE;
-	editor->changed = TRUE;
-	command_state_changed (editor);
-}
-
-static void
-visible_addrs_toggled_cb (GtkWidget *w, EContactListEditor *editor)
-{
-	editor->changed = TRUE;
-	command_state_changed (editor);
-}
-
-static void
-set_editable (EContactListEditor *editor)
-{
-	gtk_widget_set_sensitive (editor->email_entry, editor->editable && editor->allows_contact_lists);
-	gtk_widget_set_sensitive (editor->list_name_entry, editor->editable && editor->allows_contact_lists);
-	gtk_widget_set_sensitive (editor->add_button, editor->editable && editor->allows_contact_lists);
-	gtk_widget_set_sensitive (editor->remove_button, editor->editable && editor->allows_contact_lists);
-	gtk_widget_set_sensitive (editor->select_button, editor->editable && editor->allows_contact_lists);
-	gtk_widget_set_sensitive (editor->table, editor->editable && editor->allows_contact_lists);
-}
-
-/* Callback used when the editor is destroyed */
-static gint
-app_delete_event_cb (GtkWidget *widget, GdkEvent *event, gpointer data)
-{
-	EContactListEditor *ce;
-
-	ce = E_CONTACT_LIST_EDITOR (data);
-
-	/* if we're in an async call, don't allow the dialog to close */
-	if (ce->in_async_call)
-		return TRUE;
-
-	eab_editor_prompt_to_save_changes (EAB_EDITOR (ce), GTK_WINDOW (ce->app));
-	return TRUE;
-}
-
-static gboolean
-table_drag_motion_cb (ETable *table, int row, int col,
-		      GdkDragContext *context,
-		      gint x, gint y, guint time, EContactListEditor *editor)
-{
-	GList *p;
-
-	for (p = context->targets; p != NULL; p = p->next) {
-		char *possible_type;
-
-		possible_type = gdk_atom_name (GDK_POINTER_TO_ATOM (p->data));
-		if (!strcmp (possible_type, VCARD_TYPE)) {
-			g_free (possible_type);
-			gdk_drag_status (context, GDK_ACTION_LINK, time);
-			return TRUE;
-		}
-
-		g_free (possible_type);
-	}
-
-	return FALSE;
-}
-
-static gboolean
-table_drag_drop_cb (ETable *table, int row, int col,
-		    GdkDragContext *context,
-		    gint x, gint y, guint time, EContactListEditor *editor)
-{
-	GList *p;
-
-	for (p = context->targets; p != NULL; p = p->next) {
-		char *possible_type;
-
-		possible_type = gdk_atom_name (GDK_POINTER_TO_ATOM (p->data));
-		if (!strcmp (possible_type, VCARD_TYPE)) {
-			g_free (possible_type);
-			break;
-		}
-
-		g_free (possible_type);
-	}
-
-
-	if (p) {
-		gtk_drag_get_data (GTK_WIDGET (table), context,
-				   GDK_POINTER_TO_ATOM (p->data),
-				   time);
-		return TRUE;
-	}
-
-	return FALSE;
-}
-
-static void
-table_drag_data_received_cb (ETable *table, int row, int col,
-			     GdkDragContext *context,
-			     gint x, gint y,
-			     GtkSelectionData *selection_data,
-			     guint info, guint time, EContactListEditor *editor)
-{
-	GtkAdjustment *adj = gtk_scrolled_window_get_vadjustment (GTK_SCROLLED_WINDOW (editor->table));
-	char *target_type;
-	gboolean changed = FALSE;
-	gboolean handled = FALSE;
-
-	target_type = gdk_atom_name (selection_data->target);
-
-	if (!strcmp (target_type, VCARD_TYPE)) {
-
-		GList *contact_list = eab_contact_list_from_string (selection_data->data);
-		GList *c;
-
-		if (contact_list)
-			handled = TRUE;
-
-		for (c = contact_list; c; c = c->next) {
-			EContact *contact = c->data;
-
-			if (!e_contact_get (contact, E_CONTACT_IS_LIST)) {
-				e_contact_list_model_add_contact (E_CONTACT_LIST_MODEL (editor->model),
-								  contact,
-								  0  /* Hard-wired for default e-mail */);
-
-				changed = TRUE;
-			}
-		}
-		g_list_foreach (contact_list, (GFunc)g_object_unref, NULL);
-		g_list_free (contact_list);
-
-		/* Skip to the end of the list */
-		if (adj->upper - adj->lower > adj->page_size)
-			gtk_adjustment_set_value (adj, adj->upper);
-
-		if (changed) {
-			editor->changed = TRUE;
-			command_state_changed (editor);
-		}
-	}
-
-	gtk_drag_finish (context, handled, FALSE, time);
-}
-
-static void
-command_state_changed (EContactListEditor *editor)
-{
-	gboolean valid = eab_editor_is_valid (EAB_EDITOR (editor));
-
-	/* FIXME set the ok button to ok */
-	gtk_widget_set_sensitive (editor->ok_button, valid && editor->allows_contact_lists);
-	gtk_widget_set_sensitive (editor->source_menu, editor->is_new_list);
-	gtk_widget_set_sensitive (glade_xml_get_widget (editor->gui, "source-label"), editor->is_new_list);
-}
-
-static void
-extract_info(EContactListEditor *editor)
-{
-	EContact *contact = editor->contact;
-	if (contact) {
-		int i;
-		char *image_data;
-		gsize image_data_len;
-		char *string = gtk_editable_get_chars(GTK_EDITABLE (editor->list_name_entry), 0, -1);
-
-		if (string && *string) {
-			e_contact_set (contact, E_CONTACT_FILE_AS, string);
-			e_contact_set (contact, E_CONTACT_FULL_NAME, string);
-		}
-
-		g_free (string);
-
-		e_contact_set (contact, E_CONTACT_IS_LIST, GINT_TO_POINTER (TRUE));
-		e_contact_set (contact, E_CONTACT_LIST_SHOW_ADDRESSES,
-			       GINT_TO_POINTER (!gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON(editor->visible_addrs_checkbutton))));
-
-		e_vcard_remove_attributes (E_VCARD (contact), "", EVC_EMAIL);
-
-		/* then refill it from the contact list model */
-		for (i = 0; i < e_table_model_row_count (editor->model); i ++) {
-			const EDestination *dest = e_contact_list_model_get_destination (E_CONTACT_LIST_MODEL (editor->model), i);
-			EVCardAttribute *attr;
-
-			attr = e_vcard_attribute_new (NULL, EVC_EMAIL);
-
-			e_vcard_add_attribute (E_VCARD (contact), attr);
-
-			e_destination_export_to_vcard_attribute ((EDestination*)dest, attr);
-		}
-
-		if (editor->image_set
-		    && e_image_chooser_get_image_data (E_IMAGE_CHOOSER (editor->list_image),
-						       &image_data,
-						       &image_data_len)) {
-			EContactPhoto photo;
-
-			photo.data = image_data;
-			photo.length = image_data_len;
-
-			e_contact_set (contact, E_CONTACT_LOGO, &photo);
-			g_free (image_data);
-		}
-		else {
-			e_contact_set (contact, E_CONTACT_LOGO, NULL);
-		}
-	}
-}
-
-static void
-fill_in_info(EContactListEditor *editor)
-{
-	if (editor->contact) {
-		EContactPhoto *photo;
-		char *file_as;
-		gboolean show_addresses = FALSE;
-		gboolean is_evolution_list = FALSE;
-		GList *email_list;
-		GList *iter;
-
-		file_as = e_contact_get_const (editor->contact, E_CONTACT_FILE_AS);
-		email_list = e_contact_get_attributes (editor->contact, E_CONTACT_EMAIL);
-		is_evolution_list = GPOINTER_TO_INT (e_contact_get (editor->contact, E_CONTACT_IS_LIST));
-		show_addresses = GPOINTER_TO_INT (e_contact_get (editor->contact, E_CONTACT_LIST_SHOW_ADDRESSES));
-
-		gtk_editable_delete_text (GTK_EDITABLE (editor->list_name_entry), 0, -1);
-		if (file_as) {
-			int position = 0;
-			gtk_editable_insert_text (GTK_EDITABLE (editor->list_name_entry), file_as, strlen (file_as), &position);
-			g_free (file_as);
-		}
-
-		gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON(editor->visible_addrs_checkbutton), !show_addresses);
-
-		e_contact_list_model_remove_all (E_CONTACT_LIST_MODEL (editor->model));
-
-		for (iter = email_list; iter; iter = iter->next) {
-			EVCardAttribute *attr = iter->data;
-			GList *p;
-			EDestination *list_dest = e_destination_new ();
-			char *contact_uid = NULL;
-			char *email = NULL;
-			char *name = NULL;
-			int email_num = -1;
-			gboolean html_pref = FALSE;
-
-			for (p = e_vcard_attribute_get_params (attr); p; p = p->next) {
-				EVCardAttributeParam *param = p->data;
-				const char *param_name = e_vcard_attribute_param_get_name (param);
-				if (!g_ascii_strcasecmp (param_name,
-							 EVC_X_DEST_CONTACT_UID)) {
-					GList *v = e_vcard_attribute_param_get_values (param);
-					contact_uid = v ? v->data : NULL;
-				}
-				else if (!g_ascii_strcasecmp (param_name,
-							      EVC_X_DEST_EMAIL_NUM)) {
-					GList *v = e_vcard_attribute_param_get_values (param);
-					email_num = v ? atoi (v->data) : -1;
-				}
-				else if (!g_ascii_strcasecmp (param_name,
-							      EVC_X_DEST_NAME)) {
-					GList *v = e_vcard_attribute_param_get_values (param);
-					name = v ? v->data : NULL;
-				}
-				else if (!g_ascii_strcasecmp (param_name,
-							      EVC_X_DEST_EMAIL)) {
-					GList *v = e_vcard_attribute_param_get_values (param);
-					email = v ? v->data : NULL;
-				}
-				else if (!g_ascii_strcasecmp (param_name,
-							      EVC_X_DEST_HTML_MAIL)) {
-					GList *v = e_vcard_attribute_param_get_values (param);
-					html_pref = v ? !g_ascii_strcasecmp (v->data, "true") : FALSE;
-				}
-			}
-
-			if (contact_uid) e_destination_set_contact_uid (list_dest, contact_uid, email_num);
-			if (name) e_destination_set_name (list_dest, name);
-			if (email) e_destination_set_email (list_dest, email);
-			e_destination_set_html_mail_pref (list_dest, html_pref);
-			
-			e_contact_list_model_add_destination (E_CONTACT_LIST_MODEL (editor->model), list_dest);
-		}
-
-		g_list_foreach (email_list, (GFunc) e_vcard_attribute_free, NULL);
-		g_list_free (email_list);
-
-		photo = e_contact_get (editor->contact, E_CONTACT_LOGO);
-		if (photo) {
-			e_image_chooser_set_image_data (E_IMAGE_CHOOSER (editor->list_image), photo->data, photo->length);
-			e_contact_photo_free (photo);
-		}
-	}
-	
-	if (editor->book) {
-		ESource   *source;
-
-		source = e_book_get_source (editor->book);		
-		e_source_option_menu_select (E_SOURCE_OPTION_MENU (editor->source_menu), source);
-		gtk_widget_set_sensitive (editor->source_menu, editor->is_new_list);
-		gtk_widget_set_sensitive (glade_xml_get_widget (editor->gui, "source-label"), editor->is_new_list);
-	}
-}
diff --git a/addressbook/gui/contact-list-editor/e-contact-list-editor.etspec b/addressbook/gui/contact-list-editor/e-contact-list-editor.etspec
deleted file mode 100644
index 6d5f4f2514..0000000000
--- a/addressbook/gui/contact-list-editor/e-contact-list-editor.etspec
+++ /dev/null
@@ -1,7 +0,0 @@
-<ETableSpecification no-headers="true" cursor-mode="line" selection-mode="single">
-<ETableColumn model_col= "0" _title="Contact" expansion="1.0" minimum_width="20" resizable="true" cell="string" compare="string" />
-	<ETableState>
-		<column source="0"/>
-	        <grouping> </grouping>
-	</ETableState>
-</ETableSpecification>
diff --git a/addressbook/gui/contact-list-editor/e-contact-list-editor.h b/addressbook/gui/contact-list-editor/e-contact-list-editor.h
deleted file mode 100644
index af1f8e1163..0000000000
--- a/addressbook/gui/contact-list-editor/e-contact-list-editor.h
+++ /dev/null
@@ -1,113 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-/* e-contact-list-editor.h
- * Copyright (C) 2001  Ximian, Inc.
- * Author: Chris Toshok <toshok@ximian.com>
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of version 2 of the GNU General Public
- * License as published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * General Public License for more details.
- *
- * You should have received a copy of the GNU General Public
- * License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
- */
-#ifndef __E_CONTACT_LIST_EDITOR_H__
-#define __E_CONTACT_LIST_EDITOR_H__
-
-#include <libgnomeui/gnome-app.h>
-#include <libgnomeui/gnome-app-helper.h>
-#include <glade/glade.h>
-#include <gal/e-table/e-table-model.h>
-#include <libedataserverui/e-name-selector.h>
-
-#include "addressbook/gui/contact-editor/eab-editor.h"
-
-#include <libebook/e-book.h>
-#include <libebook/e-contact.h>
-#include <libebook/e-destination.h>
-
-G_BEGIN_DECLS
-
-#define E_TYPE_CONTACT_LIST_EDITOR	   (e_contact_list_editor_get_type ())
-#define E_CONTACT_LIST_EDITOR(obj)	   (G_TYPE_CHECK_INSTANCE_CAST ((obj), E_TYPE_CONTACT_LIST_EDITOR, EContactListEditor))
-#define E_CONTACT_LIST_EDITOR_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), E_TYPE_CONTACT_LIST_EDITOR, EContactListEditorClass))
-#define E_IS_CONTACT_LIST_EDITOR(obj)	   (G_TYPE_CHECK_INSTANCE_TYPE ((obj), E_TYPE_CONTACT_LIST_EDITOR))
-#define E_IS_CONTACT_LIST_EDITOR_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((obj), E_TYPE_CONTACT_LIST_EDITOR))
-
-typedef struct _EContactListEditor       EContactListEditor;
-typedef struct _EContactListEditorClass  EContactListEditorClass;
-
-struct _EContactListEditor
-{
-	EABEditor parent;
-
-	/* item specific fields */
-	EBook *book;
-
-	EContact *contact;
-
-	GladeXML *gui;
-	GtkWidget *app;
-
-	GtkWidget *table;
-	ETableModel *model;
-	GtkWidget *email_entry;
-	GtkWidget *list_name_entry;
-	GtkWidget *add_button;
-	GtkWidget *remove_button;
-	GtkWidget *select_button;
-	GtkWidget *list_image_button;
-	GtkWidget *visible_addrs_checkbutton;
-	GtkWidget *list_image;
-	GtkWidget *source_menu;
-	GtkWidget *ok_button;
-	GtkWidget *cancel_button;
-
-	ENameSelector *name_selector;
-
-	/* Whether we are editing a new contact or an existing one */
-	guint is_new_list : 1;
-
-	/* Whether the image chooser widget has been changed. */
-	guint image_set : 1;
-
-	/* Whether the contact has been changed since bringing up the contact editor */
-	guint changed : 1;
-
-	/* Whether the contact editor will accept modifications */
-	guint editable : 1;
-
-	/* Whether the target book accepts storing of contact lists */
-	guint allows_contact_lists : 1;
-
-	/* Whether an async wombat call is in progress */
-	guint in_async_call : 1;
-
-	/* ID for async load_source call */
-	guint  load_source_id;
-	EBook *load_book;
-};
-
-struct _EContactListEditorClass
-{
-	EABEditorClass parent_class;
-};
-
-EContactListEditor *e_contact_list_editor_new                (EBook *book,
-							      EContact *list_contact,
-							      gboolean is_new_list,
-							      gboolean editable);
-GType               e_contact_list_editor_get_type           (void);
-
-gboolean            e_contact_list_editor_request_close_all  (void);
-
-G_END_DECLS
-
-
-#endif /* __E_CONTACT_LIST_EDITOR_H__ */
diff --git a/addressbook/gui/contact-list-editor/e-contact-list-model.c b/addressbook/gui/contact-list-editor/e-contact-list-model.c
deleted file mode 100644
index 4560413c19..0000000000
--- a/addressbook/gui/contact-list-editor/e-contact-list-model.c
+++ /dev/null
@@ -1,284 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-
-#include <config.h>
-#include <string.h>
-#include "e-contact-list-model.h"
-#include "widgets/misc/e-error.h"
-
-#include <gtk/gtkmessagedialog.h>
-#define PARENT_TYPE e_table_model_get_type()
-static ETableModelClass *parent_class;
-
-#define COLS 1
-
-/* This function returns the number of columns in our ETableModel. */
-static int
-contact_list_col_count (ETableModel *etc)
-{
-	return COLS;
-}
-
-/* This function returns the number of rows in our ETableModel. */
-static int
-contact_list_row_count (ETableModel *etc)
-{
-	EContactListModel *model = E_CONTACT_LIST_MODEL (etc);
-	return model->data_count;
-}
-
-/* This function returns the value at a particular point in our ETableModel. */
-static void *
-contact_list_value_at (ETableModel *etc, int col, int row)
-{
-	EContactListModel *model = E_CONTACT_LIST_MODEL (etc);
-
-	return (void *) e_destination_get_textrep (model->data[row], TRUE);
-}
-
-/* This function sets the value at a particular point in our ETableModel. */
-static void
-contact_list_set_value_at (ETableModel *etc, int col, int row, const void *val)
-{
-	/* nothing */
-}
-
-/* This function returns whether a particular cell is editable. */
-static gboolean
-contact_list_is_cell_editable (ETableModel *etc, int col, int row)
-{
-	return FALSE;
-}
-
-/* This function duplicates the value passed to it. */
-static void *
-contact_list_duplicate_value (ETableModel *etc, int col, const void *value)
-{
-	return g_strdup(value);
-}
-
-/* This function frees the value passed to it. */
-static void
-contact_list_free_value (ETableModel *etc, int col, void *value)
-{
-	g_free(value);
-}
-
-static void *
-contact_list_initialize_value (ETableModel *etc, int col)
-{
-	return g_strdup("");
-}
-
-static gboolean
-contact_list_value_is_empty (ETableModel *etc, int col, const void *value)
-{
-	return !(value && *(char *)value);
-}
-
-static char *
-contact_list_value_to_string (ETableModel *etc, int col, const void *value)
-{
-	return g_strdup(value);
-}
-
-static void
-contact_list_model_dispose (GObject *o)
-{
-	EContactListModel *model = E_CONTACT_LIST_MODEL (o);
-	int i;
-
-	if (model->data != NULL) {
-		for (i = 0; i < model->data_count; i ++) {
-			g_object_unref (model->data[i]);
-		}
-		g_free (model->data);
-		model->data = NULL;
-	}
-
-	model->data_count = 0;
-	model->data_alloc = 0;
-
-	(* G_OBJECT_CLASS (parent_class)->dispose) (o);
-}
-
-static void
-e_contact_list_model_class_init (GObjectClass *object_class)
-{
-	ETableModelClass *model_class = (ETableModelClass *) object_class;
-
-	parent_class = g_type_class_ref (PARENT_TYPE);
-
-	object_class->dispose = contact_list_model_dispose;
-
-	model_class->column_count = contact_list_col_count;
-	model_class->row_count = contact_list_row_count;
-	model_class->value_at = contact_list_value_at;
-	model_class->set_value_at = contact_list_set_value_at;
-	model_class->is_cell_editable = contact_list_is_cell_editable;
-	model_class->duplicate_value = contact_list_duplicate_value;
-	model_class->free_value = contact_list_free_value;
-	model_class->initialize_value = contact_list_initialize_value;
-	model_class->value_is_empty = contact_list_value_is_empty;
-	model_class->value_to_string = contact_list_value_to_string;
-}
-
-static void
-e_contact_list_model_init (GObject *object)
-{
-	EContactListModel *model = E_CONTACT_LIST_MODEL(object);
-
-	model->data_alloc = 10;
-	model->data_count = 0;
-	model->data = g_new (EDestination*, model->data_alloc);
-}
-
-GType
-e_contact_list_model_get_type (void)
-{
-	static GType cle_type = 0;
-
-	if (!cle_type) {
-		static const GTypeInfo cle_info =  {
-			sizeof (EContactListModelClass),
-			NULL,           /* base_init */
-			NULL,           /* base_finalize */
-			(GClassInitFunc) e_contact_list_model_class_init,
-			NULL,           /* class_finalize */
-			NULL,           /* class_data */
-			sizeof (EContactListModel),
-			0,             /* n_preallocs */
-			(GInstanceInitFunc) e_contact_list_model_init,
-		};
-
-		cle_type = g_type_register_static (E_TABLE_MODEL_TYPE, "EContactListModel", &cle_info, 0);
-	}
-
-	return cle_type;
-}
-
-void
-e_contact_list_model_construct (EContactListModel *model)
-{
-}
-
-ETableModel *
-e_contact_list_model_new ()
-{
-	EContactListModel *model;
-
-	model = g_object_new (E_TYPE_CONTACT_LIST_MODEL, NULL);
-
-	e_contact_list_model_construct (model);
-
-	return E_TABLE_MODEL(model);
-}
-
-void
-e_contact_list_model_add_destination (EContactListModel *model, EDestination *dest)
-{
-	g_return_if_fail (E_IS_CONTACT_LIST_MODEL (model));
-	g_return_if_fail (E_IS_DESTINATION (dest));
-
-	e_table_model_pre_change (E_TABLE_MODEL (model));
-
-	if (model->data_count + 1 >= model->data_alloc) {
-		model->data_alloc *= 2;
-		model->data = g_renew (EDestination*, model->data, model->data_alloc);
-	}
-
-	model->data[model->data_count ++] = dest;
-	g_object_ref (dest);
-
-	e_table_model_row_inserted (E_TABLE_MODEL (model), model->data_count - 1);
-}
-
-void
-e_contact_list_model_add_email (EContactListModel *model,
-				const char *email)
-{
-	EDestination *new_dest;
-	char *list_email;
-	int row;
-	int row_count;
-
-	g_return_if_fail (E_IS_CONTACT_LIST_MODEL (model));
-	g_return_if_fail (email != NULL);
-
-	row_count = e_table_model_row_count (E_TABLE_MODEL (model));
-
-	for (row = 0; row < row_count; row++) {
-		list_email = (char *) e_table_model_value_at (E_TABLE_MODEL (model), 1, row);
-		
-		if (strcmp (list_email, email) == 0) {
-			if (e_error_run (NULL, "addressbook:ask-list-add-exists", 
-					 email) != GTK_RESPONSE_YES)
-				return;
-			break;
-		}
-	}
-
-	new_dest = e_destination_new ();
-	e_destination_set_email (new_dest, email);
-
-	e_contact_list_model_add_destination (model, new_dest);
-}
-
-void
-e_contact_list_model_add_contact (EContactListModel *model,
-				  EContact *contact,
-				  int email_num)
-{
-	EDestination *new_dest;
-
-	g_return_if_fail (E_IS_CONTACT_LIST_MODEL (model));
-	g_return_if_fail (E_IS_CONTACT (contact));
-
-	new_dest = e_destination_new ();
-	e_destination_set_contact (new_dest, contact, email_num);
-
-	e_contact_list_model_add_destination (model, new_dest);
-}
-
-void
-e_contact_list_model_remove_row (EContactListModel *model, int row)
-{
-	g_return_if_fail (E_IS_CONTACT_LIST_MODEL (model));
-	g_return_if_fail (0 <= row && row < model->data_count);
-
-	e_table_model_pre_change (E_TABLE_MODEL (model));
-
-	g_object_unref (model->data[row]);
-	memmove (model->data + row, model->data + row + 1, sizeof (EDestination*) * (model->data_count - row - 1));
-	model->data_count --;
-
-	e_table_model_row_deleted (E_TABLE_MODEL (model), row);
-}
-
-void
-e_contact_list_model_remove_all (EContactListModel *model)
-{
-	int i;
-
-	g_return_if_fail (E_IS_CONTACT_LIST_MODEL (model));
-
-	e_table_model_pre_change (E_TABLE_MODEL (model));
-
-	for (i = 0; i < model->data_count; i ++) {
-		g_object_unref (model->data[i]);
-		model->data[i] = NULL;
-	}
-
-	model->data_count = 0;
-
-	e_table_model_changed (E_TABLE_MODEL (model));
-}
-
-
-const EDestination *
-e_contact_list_model_get_destination (EContactListModel *model, int row)
-{
-	g_return_val_if_fail (E_IS_CONTACT_LIST_MODEL (model), NULL);
-	g_return_val_if_fail (0 <= row && row < model->data_count, NULL);
-
-	return model->data[row];
-}
diff --git a/addressbook/gui/contact-list-editor/e-contact-list-model.h b/addressbook/gui/contact-list-editor/e-contact-list-model.h
deleted file mode 100644
index f7d2c50ced..0000000000
--- a/addressbook/gui/contact-list-editor/e-contact-list-model.h
+++ /dev/null
@@ -1,49 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-#ifndef _E_CONTACT_LIST_MODEL_H_
-#define _E_CONTACT_LIST_MODEL_H_
-
-#include <gal/e-table/e-table-model.h>
-#include <libebook/e-contact.h>
-#include <libebook/e-destination.h>
-
-G_BEGIN_DECLS
-
-#define E_TYPE_CONTACT_LIST_MODEL        (e_contact_list_model_get_type ())
-#define E_CONTACT_LIST_MODEL(o)          (G_TYPE_CHECK_INSTANCE_CAST ((o), E_TYPE_CONTACT_LIST_MODEL, EContactListModel))
-#define E_CONTACT_LIST_MODEL_CLASS(k)    (G_TYPE_CHECK_CLASS_CAST((k), E_TYPE_CONTACT_LIST_MODEL, EContactListModelClass))
-#define E_IS_CONTACT_LIST_MODEL(o)       (G_TYPE_CHECK_INSTANCE_TYPE ((o), E_TYPE_CONTACT_LIST_MODEL))
-#define E_IS_CONTACT_LIST_MODEL_CLASS(k) (G_TYPE_CHECK_CLASS_TYPE ((k), E_TYPE_CONTACT_LIST_MODEL))
-
-typedef struct _EContactListModel EContactListModel;
-typedef struct _EContactListModelClass EContactListModelClass;
-
-struct _EContactListModel {
-	ETableModel parent;
-
-	EDestination **data;
-	int data_count;
-	int data_alloc;
-};
-
-
-struct _EContactListModelClass {
-	ETableModelClass parent_class;
-};
-
-
-GType      e_contact_list_model_get_type (void);
-void         e_contact_list_model_construct (EContactListModel *model);
-ETableModel *e_contact_list_model_new (void);
-
-void         e_contact_list_model_add_destination (EContactListModel *model, EDestination *dest);
-void         e_contact_list_model_add_email       (EContactListModel *model, const char *email);
-void         e_contact_list_model_add_contact     (EContactListModel *model, EContact *contact, int email_num);
-
-void	     e_contact_list_model_remove_row (EContactListModel *model, int row);
-void         e_contact_list_model_remove_all (EContactListModel *model);
-
-const EDestination *e_contact_list_model_get_destination (EContactListModel *model, int row);
-
-G_END_DECLS
-
-#endif /* _E_CONTACT_LIST_MODEL_H_ */
diff --git a/addressbook/gui/merging/.cvsignore b/addressbook/gui/merging/.cvsignore
deleted file mode 100644
index b6fa83ca4c..0000000000
--- a/addressbook/gui/merging/.cvsignore
+++ /dev/null
@@ -1,8 +0,0 @@
-.deps
-.libs
-.pure
-Makefile
-Makefile.in
-*.lo
-*.la
-*.gladep
diff --git a/addressbook/gui/merging/Makefile.am b/addressbook/gui/merging/Makefile.am
deleted file mode 100644
index f1d589ad00..0000000000
--- a/addressbook/gui/merging/Makefile.am
+++ /dev/null
@@ -1,24 +0,0 @@
-INCLUDES =						\
-	-DG_LOG_DOMAIN=\"eab-contact-merging\"		\
-	-DEVOLUTION_GLADEDIR=\""$(gladedir)"\"		\
-	-I$(top_srcdir)					\
-	-I$(top_srcdir)/addressbook			\
-	-I$(top_srcdir)/addressbook/backend		\
-	-I$(top_builddir)/addressbook/backend		\
-	$(EVOLUTION_ADDRESSBOOK_CFLAGS)
-
-noinst_LTLIBRARIES =				\
-	libeabbookmerging.la
-
-libeabbookmerging_la_SOURCES =			\
-	eab-contact-compare.c			\
-	eab-contact-compare.h			\
-	eab-contact-merging.c			\
-	eab-contact-merging.h
-
-
-glade_DATA = eab-contact-duplicate-detected.glade				\
-	     eab-contact-commit-duplicate-detected.glade
-
-EXTRA_DIST = 			\
-	 $(glade_DATA)
diff --git a/addressbook/gui/merging/eab-contact-commit-duplicate-detected.glade b/addressbook/gui/merging/eab-contact-commit-duplicate-detected.glade
deleted file mode 100644
index 3ad86b40ba..0000000000
--- a/addressbook/gui/merging/eab-contact-commit-duplicate-detected.glade
+++ /dev/null
@@ -1,212 +0,0 @@
-<?xml version="1.0" standalone="no"?> <!--*- mode: xml -*-->
-<!DOCTYPE glade-interface SYSTEM "http://glade.gnome.org/glade-2.0.dtd">
-
-<glade-interface>
-
-<widget class="GtkDialog" id="dialog-duplicate-contact">
-  <property name="border_width">6</property>
-  <property name="visible">True</property>
-  <property name="title" translatable="yes">Duplicate Contact Detected</property>
-  <property name="type">GTK_WINDOW_TOPLEVEL</property>
-  <property name="window_position">GTK_WIN_POS_NONE</property>
-  <property name="modal">False</property>
-  <property name="resizable">True</property>
-  <property name="destroy_with_parent">False</property>
-  <property name="has_separator">True</property>
-
-  <child internal-child="vbox">
-    <widget class="GtkVBox" id="dialog-vbox1">
-      <property name="visible">True</property>
-      <property name="homogeneous">False</property>
-      <property name="spacing">6</property>
-
-      <child internal-child="action_area">
-	<widget class="GtkHButtonBox" id="dialog-action_area1">
-	  <property name="visible">True</property>
-	  <property name="layout_style">GTK_BUTTONBOX_END</property>
-
-	  <child>
-	    <widget class="GtkButton" id="button3">
-	      <property name="visible">True</property>
-	      <property name="can_default">True</property>
-	      <property name="can_focus">True</property>
-	      <property name="label">gtk-cancel</property>
-	      <property name="use_stock">True</property>
-	      <property name="relief">GTK_RELIEF_NORMAL</property>
-	      <property name="response_id">1</property>
-	    </widget>
-	  </child>
-
-	  <child>
-	    <widget class="GtkButton" id="button4">
-	      <property name="visible">True</property>
-	      <property name="can_default">True</property>
-	      <property name="can_focus">True</property>
-	      <property name="label">gtk-add</property>
-	      <property name="use_stock">True</property>
-	      <property name="relief">GTK_RELIEF_NORMAL</property>
-	      <property name="response_id">0</property>
-	    </widget>
-	  </child>
-	</widget>
-	<packing>
-	  <property name="padding">0</property>
-	  <property name="expand">False</property>
-	  <property name="fill">True</property>
-	  <property name="pack_type">GTK_PACK_END</property>
-	</packing>
-      </child>
-
-      <child>
-	<widget class="GtkTable" id="table1">
-	  <property name="border_width">6</property>
-	  <property name="visible">True</property>
-	  <property name="n_rows">5</property>
-	  <property name="n_columns">2</property>
-	  <property name="homogeneous">False</property>
-	  <property name="row_spacing">6</property>
-	  <property name="column_spacing">6</property>
-
-	  <child>
-	    <widget class="Custom" id="custom-old-contact">
-	      <property name="visible">True</property>
-	      <property name="creation_function">_eab_contact_merging_create_contact_display</property>
-	      <property name="int1">0</property>
-	      <property name="int2">0</property>
-	      <property name="last_modification_time">Sun, 05 Oct 2003 03:54:20 GMT</property>
-	    </widget>
-	    <packing>
-	      <property name="left_attach">1</property>
-	      <property name="right_attach">2</property>
-	      <property name="top_attach">4</property>
-	      <property name="bottom_attach">5</property>
-	    </packing>
-	  </child>
-
-	  <child>
-	    <widget class="GtkLabel" id="label1">
-	      <property name="visible">True</property>
-	      <property name="label" translatable="yes">The changed email or name of this contact already
-exists in this folder.  Would you like to add it anyway?</property>
-	      <property name="use_underline">False</property>
-	      <property name="use_markup">False</property>
-	      <property name="justify">GTK_JUSTIFY_LEFT</property>
-	      <property name="wrap">False</property>
-	      <property name="selectable">False</property>
-	      <property name="xalign">0</property>
-	      <property name="yalign">0.5</property>
-	      <property name="xpad">0</property>
-	      <property name="ypad">0</property>
-	    </widget>
-	    <packing>
-	      <property name="left_attach">1</property>
-	      <property name="right_attach">2</property>
-	      <property name="top_attach">0</property>
-	      <property name="bottom_attach">1</property>
-	      <property name="y_options">fill</property>
-	    </packing>
-	  </child>
-
-	  <child>
-	    <widget class="GtkLabel" id="label3">
-	      <property name="visible">True</property>
-	      <property name="label" translatable="yes">Conflicting Contact:</property>
-	      <property name="use_underline">False</property>
-	      <property name="use_markup">False</property>
-	      <property name="justify">GTK_JUSTIFY_CENTER</property>
-	      <property name="wrap">False</property>
-	      <property name="selectable">False</property>
-	      <property name="xalign">0</property>
-	      <property name="yalign">0.5</property>
-	      <property name="xpad">0</property>
-	      <property name="ypad">0</property>
-	    </widget>
-	    <packing>
-	      <property name="left_attach">1</property>
-	      <property name="right_attach">2</property>
-	      <property name="top_attach">3</property>
-	      <property name="bottom_attach">4</property>
-	      <property name="y_options">fill</property>
-	    </packing>
-	  </child>
-
-	  <child>
-	    <widget class="GtkLabel" id="label4">
-	      <property name="visible">True</property>
-	      <property name="label" translatable="yes">Changed Contact:</property>
-	      <property name="use_underline">False</property>
-	      <property name="use_markup">False</property>
-	      <property name="justify">GTK_JUSTIFY_CENTER</property>
-	      <property name="wrap">False</property>
-	      <property name="selectable">False</property>
-	      <property name="xalign">0</property>
-	      <property name="yalign">0.5</property>
-	      <property name="xpad">0</property>
-	      <property name="ypad">0</property>
-	    </widget>
-	    <packing>
-	      <property name="left_attach">1</property>
-	      <property name="right_attach">2</property>
-	      <property name="top_attach">1</property>
-	      <property name="bottom_attach">2</property>
-	      <property name="x_options">fill</property>
-	      <property name="y_options"></property>
-	    </packing>
-	  </child>
-
-	  <child>
-	    <widget class="Custom" id="custom-new-contact">
-	      <property name="visible">True</property>
-	      <property name="creation_function">_eab_contact_merging_create_contact_display</property>
-	      <property name="int1">0</property>
-	      <property name="int2">0</property>
-	      <property name="last_modification_time">Sun, 05 Oct 2003 03:53:42 GMT</property>
-	    </widget>
-	    <packing>
-	      <property name="left_attach">1</property>
-	      <property name="right_attach">2</property>
-	      <property name="top_attach">2</property>
-	      <property name="bottom_attach">3</property>
-	    </packing>
-	  </child>
-
-	  <child>
-	    <widget class="GtkAlignment" id="alignment1">
-	      <property name="visible">True</property>
-	      <property name="xalign">0.5</property>
-	      <property name="yalign">0</property>
-	      <property name="xscale">1</property>
-	      <property name="yscale">0</property>
-
-	      <child>
-		<widget class="Custom" id="custom2">
-		  <property name="visible">True</property>
-		  <property name="creation_function">e_create_image_widget</property>
-		  <property name="string1">stock_person</property>
-		  <property name="int1">0</property>
-		  <property name="int2">0</property>
-		  <property name="last_modification_time">Fri, 08 Jun 2001 00:18:39 GMT</property>
-		</widget>
-	      </child>
-	    </widget>
-	    <packing>
-	      <property name="left_attach">0</property>
-	      <property name="right_attach">1</property>
-	      <property name="top_attach">0</property>
-	      <property name="bottom_attach">5</property>
-	      <property name="x_options">fill</property>
-	      <property name="y_options">fill</property>
-	    </packing>
-	  </child>
-	</widget>
-	<packing>
-	  <property name="padding">0</property>
-	  <property name="expand">True</property>
-	  <property name="fill">True</property>
-	</packing>
-      </child>
-    </widget>
-  </child>
-</widget>
-
-</glade-interface>
diff --git a/addressbook/gui/merging/eab-contact-compare.c b/addressbook/gui/merging/eab-contact-compare.c
deleted file mode 100644
index 4244f3fbff..0000000000
--- a/addressbook/gui/merging/eab-contact-compare.c
+++ /dev/null
@@ -1,798 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-
-/*
- * eab-contact-compare.c
- *
- * Copyright (C) 2001, 2002, 2003 Ximian, Inc.
- *
- * Authors: Jon Trowbridge <trow@ximian.com>
- *          Chris Toshok <toshok@ximian.com>
- */
-
-/*
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of version 2 of the GNU General Public
- * License as published by the Free Software Foundation.
- * 
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- * 
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
- * USA.
- */
-
-#include <config.h>
-#include <ctype.h>
-#include <string.h>
-#include "util/eab-book-util.h"
-#include "../component/addressbook.h"
-#include "eab-contact-compare.h"
-
-/* This is an "optimistic" combiner: the best of the two outcomes is
-   selected. */
-static EABContactMatchType
-combine_comparisons (EABContactMatchType prev,
-		     EABContactMatchType new_info)
-{
-	if (new_info == EAB_CONTACT_MATCH_NOT_APPLICABLE)
-		return prev;
-	return (EABContactMatchType) MAX ((gint) prev, (gint) new_info);
-}
-
-
-/*** Name comparisons ***/
-
-/* This *so* doesn't belong here... at least not implemented in a
-   sucky way like this.  But it can be fixed later. */
-
-/* This is very Anglocentric. */
-static gchar *name_synonyms[][2] = {
-	{ "jon", "john" },   /* Ah, the hacker's perogative */
-	{ "joseph", "joe" },
-	{ "robert", "bob" },
-	{ "gene", "jean" },
-	{ "jesse", "jessie" },
-	{ "ian", "iain" },
-	{ "richard", "dick" },
-	{ "william", "bill" },
-	{ "william", "will" },
-	{ "anthony", "tony" },
-	{ "michael", "mike" },
-	{ "eric", "erik" },
-	{ "elizabeth", "liz" },
-	{ "jeff", "geoff" },
-	{ "jeff", "geoffrey" },
-	{ "tom", "thomas" },
-	{ "dave", "david" },
-	{ "jim", "james" },
-	{ "abigal", "abby" },
-	{ "amanda", "amy" },
-	{ "amanda", "manda" },
-	{ "jennifer", "jenny" },
-	{ "christopher", "chris" },
-	{ "rebecca", "becca" },
-	{ "rebecca", "becky" },
-	{ "anderson", "andersen" },
-	{ "johnson", "johnsen" },
-	/* We could go on and on... */
-	/* We should add soundex here. */
-	{ NULL, NULL }
-};
-
-static gboolean
-name_fragment_match (const gchar *a, const gchar *b, gboolean strict)
-{
-	gint len;
-
-	if (!(a && b && *a && *b))
-		return FALSE;
-
-	/* If we are in 'strict' mode, b must match the beginning of a.
-	   So "Robert", "Rob" would match, but "Robert", "Robbie" wouldn't.
-
-	   If strict is FALSE, it is sufficient for the strings to share
-	   some leading characters.  In this case, "Robert" and "Robbie"
-	   would match, as would "Dave" and "Dan". */
-	
-	if (strict) {
-		len = g_utf8_strlen (b, -1);
-	} else {
-		len = MIN (g_utf8_strlen (a, -1), g_utf8_strlen (b, -1));
-	}
-
-	return !e_utf8_casefold_collate_len (a, b, len);
-}
-
-static gboolean
-name_fragment_match_with_synonyms (const gchar *a, const gchar *b, gboolean strict)
-{
-	gint i;
-
-	if (!(a && b && *a && *b))
-		return FALSE;
-
-	if (name_fragment_match (a, b, strict))
-		return TRUE;
-
-	/* Check for nicknames.  Yes, the linear search blows. */
-	for (i=0; name_synonyms[i][0]; ++i) {
-
-		if (!e_utf8_casefold_collate (name_synonyms[i][0], a)
-		    && !e_utf8_casefold_collate (name_synonyms[i][1], b))
-			return TRUE;
-		
-		if (!e_utf8_casefold_collate (name_synonyms[i][0], b)
-		    && !e_utf8_casefold_collate (name_synonyms[i][1], a))
-			return TRUE;
-	}
-
-	return FALSE;
-}
-
-EABContactMatchType
-eab_contact_compare_name_to_string (EContact *contact, const gchar *str)
-{
-	return eab_contact_compare_name_to_string_full (contact, str, FALSE, NULL, NULL, NULL);
-}
-
-EABContactMatchType
-eab_contact_compare_name_to_string_full (EContact *contact, const gchar *str, gboolean allow_partial_matches,
-					 gint *matched_parts_out, EABContactMatchPart *first_matched_part_out, gint *matched_character_count_out)
-{
-	gchar **namev, **givenv = NULL, **addv = NULL, **familyv = NULL;
-
-	gint matched_parts = EAB_CONTACT_MATCH_PART_NONE;
-	EABContactMatchPart first_matched_part = EAB_CONTACT_MATCH_PART_NONE;
-	EABContactMatchPart this_part_match = EAB_CONTACT_MATCH_PART_NOT_APPLICABLE;
-	EABContactMatchType match_type;
-	EContactName *contact_name;
-
-	gint match_count = 0, matched_character_count = 0, fragment_count;
-	gint i, j;
-	gchar *str_cpy, *s;
-
-	g_return_val_if_fail (E_IS_CONTACT (contact), EAB_CONTACT_MATCH_NOT_APPLICABLE);
-
-	if (!e_contact_get_const (contact, E_CONTACT_FULL_NAME))
-		return EAB_CONTACT_MATCH_NOT_APPLICABLE;
-	if (str == NULL)
-		return EAB_CONTACT_MATCH_NOT_APPLICABLE;
-
-	str_cpy = s = g_strdup (str);
-	while (*s) {
-		if (*s == ',' || *s == '"')
-			*s = ' ';
-		++s;
-	}
-	namev   = g_strsplit (str_cpy, " ", 0);
-	g_free (str_cpy);
-
-	contact_name = e_contact_get (contact, E_CONTACT_NAME);
-
-	if (contact_name->given)
-		givenv = g_strsplit (contact_name->given, " ", 0);
-	if (contact_name->additional)
-		addv = g_strsplit (contact_name->additional, " ", 0);
-	if (contact_name->family)
-		familyv = g_strsplit (contact_name->family, " ", 0);
-
-	e_contact_name_free (contact_name);
-
-	fragment_count = 0;
-	for (i = 0; givenv && givenv[i]; ++i)
-		++fragment_count;
-	for (i = 0; addv && addv[i]; ++i)
-		++fragment_count;
-	for (i = 0; familyv && familyv[i]; ++i)
-		++fragment_count;
-	
-	for (i = 0; namev[i] && this_part_match != EAB_CONTACT_MATCH_PART_NONE; ++i) {
-
-		if (*namev[i]) {
-
-			this_part_match = EAB_CONTACT_MATCH_PART_NONE;
-
-			/* When we are allowing partials, we are strict about the matches we allow.
-			   Does this make sense?  Not really, but it does the right thing for the purposes
-			   of completion. */
-
-			if (givenv && this_part_match == EAB_CONTACT_MATCH_PART_NONE) {
-				for (j = 0; givenv[j]; ++j) {
-					if (name_fragment_match_with_synonyms (givenv[j], namev[i], allow_partial_matches)) {
-
-						this_part_match = EAB_CONTACT_MATCH_PART_GIVEN_NAME;
-
-						/* We remove a piece of a name once it has been matched against, so
-						   that "john john" won't match "john doe". */
-						g_free (givenv[j]);
-						givenv[j] = g_strdup ("");
-						break;
-					}
-				}
-			}
-
-			if (addv && this_part_match == EAB_CONTACT_MATCH_PART_NONE) {
-				for (j = 0; addv[j]; ++j) {
-					if (name_fragment_match_with_synonyms (addv[j], namev[i], allow_partial_matches)) {
-						
-						this_part_match = EAB_CONTACT_MATCH_PART_ADDITIONAL_NAME;
-
-						g_free (addv[j]);
-						addv[j] = g_strdup ("");
-						break;
-					}
-				}
-			}
-
-			if (familyv && this_part_match == EAB_CONTACT_MATCH_PART_NONE) {
-				for (j = 0; familyv[j]; ++j) {
-					if (allow_partial_matches ? name_fragment_match_with_synonyms (familyv[j], namev[i], allow_partial_matches)
-					    : !e_utf8_casefold_collate (familyv[j], namev[i])) {
-
-						this_part_match = EAB_CONTACT_MATCH_PART_FAMILY_NAME;
-
-						g_free (familyv[j]);
-						familyv[j] = g_strdup ("");
-						break;
-					}
-				}
-			}
-
-			if (this_part_match != EAB_CONTACT_MATCH_PART_NONE) {
-				++match_count;
-				matched_character_count += g_utf8_strlen (namev[i], -1);
-				matched_parts |= this_part_match;
-				if (first_matched_part == EAB_CONTACT_MATCH_PART_NONE)
-					first_matched_part = this_part_match;
-			}
-		}
-	}
-
-	match_type = EAB_CONTACT_MATCH_NONE;
-
-	if (this_part_match != EAB_CONTACT_MATCH_PART_NONE) {
-
-		if (match_count > 0)
-			match_type = EAB_CONTACT_MATCH_VAGUE;
-		
-		if (fragment_count == match_count) {
-
-			match_type = EAB_CONTACT_MATCH_EXACT;
-
-		} else if (fragment_count == match_count + 1) {
-
-			match_type = EAB_CONTACT_MATCH_PARTIAL;
-
-		}
-	}
-
-	if (matched_parts_out)
-		*matched_parts_out = matched_parts;
-	if (first_matched_part_out)
-		*first_matched_part_out = first_matched_part;
-	if (matched_character_count_out)
-		*matched_character_count_out = matched_character_count;
-
-	g_strfreev (namev);
-	g_strfreev (givenv);
-	g_strfreev (addv);
-	g_strfreev (familyv);
-
-	return match_type;
-}
-
-EABContactMatchType
-eab_contact_compare_file_as (EContact *contact1, EContact *contact2)
-{
-	EABContactMatchType match_type;
-	gchar *a, *b;
-
-	g_return_val_if_fail (E_IS_CONTACT (contact1), EAB_CONTACT_MATCH_NOT_APPLICABLE);
-	g_return_val_if_fail (E_IS_CONTACT (contact2), EAB_CONTACT_MATCH_NOT_APPLICABLE);
-
-	a = e_contact_get (contact1, E_CONTACT_FILE_AS);
-	b = e_contact_get (contact2, E_CONTACT_FILE_AS);
-
-	if (a == NULL || b == NULL) {
-		g_free (a);
-		g_free (b);
-		return EAB_CONTACT_MATCH_NOT_APPLICABLE;
-	}
-
-	if (!strcmp (a, b))
-		match_type = EAB_CONTACT_MATCH_EXACT;
-	else if (g_utf8_validate (a, -1, NULL) && g_utf8_validate (b, -1, NULL) &&
-		 !g_utf8_collate (a, b))
-		match_type = EAB_CONTACT_MATCH_PARTIAL;
-	else
-		match_type = EAB_CONTACT_MATCH_NONE;
-
-	g_free (a);
-	g_free (b);
-	return match_type;
-}
-
-EABContactMatchType
-eab_contact_compare_name (EContact *contact1, EContact *contact2)
-{
-	EContactName *a, *b;
-	gint matches=0, possible=0;
-	gboolean given_match = FALSE, additional_match = FALSE, family_match = FALSE;
-
-	g_return_val_if_fail (E_IS_CONTACT (contact1), EAB_CONTACT_MATCH_NOT_APPLICABLE);
-	g_return_val_if_fail (E_IS_CONTACT (contact2), EAB_CONTACT_MATCH_NOT_APPLICABLE);
-
-	a = e_contact_get (contact1, E_CONTACT_NAME);
-	b = e_contact_get (contact2, E_CONTACT_NAME);
-
-	if (a == NULL || b == NULL) {
-		g_free (a);
-		g_free (b);
-		return EAB_CONTACT_MATCH_NOT_APPLICABLE;
-	}
-
-	if (a->given && b->given && *a->given && *b->given) {
-		++possible;
-		if (name_fragment_match_with_synonyms (a->given, b->given, FALSE /* both inputs are complete */)) {
-			++matches;
-			given_match = TRUE;
-		}
-	}
-
-	if (a->additional && b->additional && *a->additional && *b->additional) {
-		++possible;
-		if (name_fragment_match_with_synonyms (a->additional, b->additional, FALSE /* both inputs are complete */)) {
-			++matches;
-			additional_match = TRUE;
-		}
-	}
-
-	if (a->family && b->family && *a->family && *b->family) {
-		++possible;
-		/* We don't allow "loose matching" (i.e. John vs. Jon) on family names */
-		if (! e_utf8_casefold_collate (a->family, b->family)) {
-			++matches;
-			family_match = TRUE;
-		}
-	}
-
-	e_contact_name_free (a);
-	e_contact_name_free (b);
-
-	/* Now look at the # of matches and try to intelligently map
-	   an EAB_CONTACT_MATCH_* type to it.  Special consideration is given
-	   to family-name matches. */
-
-	if (possible == 0)
-		return EAB_CONTACT_MATCH_NOT_APPLICABLE;
-
-	if (possible == 1)
-		return family_match ? EAB_CONTACT_MATCH_VAGUE : EAB_CONTACT_MATCH_NONE;
-
-	if (possible == matches)
-		return family_match ? EAB_CONTACT_MATCH_EXACT : EAB_CONTACT_MATCH_PARTIAL;
-
-	if (possible == matches+1)
-		return family_match ? EAB_CONTACT_MATCH_VAGUE : EAB_CONTACT_MATCH_NONE;
-
-	return EAB_CONTACT_MATCH_NONE;
-}
-
-
-/*** Nickname Comparisons ***/
-
-EABContactMatchType
-eab_contact_compare_nickname (EContact *contact1, EContact *contact2)
-{
-	g_return_val_if_fail (contact1 && E_IS_CONTACT (contact1), EAB_CONTACT_MATCH_NOT_APPLICABLE);
-	g_return_val_if_fail (contact2 && E_IS_CONTACT (contact2), EAB_CONTACT_MATCH_NOT_APPLICABLE);
-
-	return EAB_CONTACT_MATCH_NOT_APPLICABLE;
-}
-
-
-
-/*** E-mail Comparisons ***/
-
-static gboolean
-match_email_username (const gchar *addr1, const gchar *addr2)
-{
-	gint c1, c2;
-	if (addr1 == NULL || addr2 == NULL)
-		return FALSE;
-
-	while (*addr1 && *addr2 && *addr1 != '@' && *addr2 != '@') {
-		c1 = isupper (*addr1) ? tolower (*addr1) : *addr1;
-		c2 = isupper (*addr2) ? tolower (*addr2) : *addr2;
-		if (c1 != c2)
-			return FALSE;
-		++addr1;
-		++addr2;
-	}
-
-	return *addr1 == *addr2;
-}
-
-static gboolean
-match_email_hostname (const gchar *addr1, const gchar *addr2)
-{
-	gint c1, c2;
-	gboolean seen_at1, seen_at2;
-	if (addr1 == NULL || addr2 == NULL)
-		return FALSE;
-
-	/* Walk to the end of each string. */
-	seen_at1 = FALSE;
-	if (*addr1) {
-		while (*addr1) {
-			if (*addr1 == '@')
-				seen_at1 = TRUE;
-			++addr1;
-		}
-		--addr1;
-	}
-
-	seen_at2 = FALSE;
-	if (*addr2) {
-		while (*addr2) {
-			if (*addr2 == '@')
-				seen_at2 = TRUE;
-			++addr2;
-		}
-		--addr2;
-	}
-
-	if (!seen_at1 && !seen_at2)
-		return TRUE;
-	if (!seen_at1 || !seen_at2)
-		return FALSE;
-
-	while (*addr1 != '@' && *addr2 != '@') {
-		c1 = isupper (*addr1) ? tolower (*addr1) : *addr1;
-		c2 = isupper (*addr2) ? tolower (*addr2) : *addr2;
-		if (c1 != c2)
-			return FALSE;
-		--addr1;
-		--addr2;
-	}
-
-	/* This will match bob@foo.ximian.com and bob@ximian.com */
-	return *addr1 == '.' || *addr2 == '.';
-}
-
-static EABContactMatchType
-compare_email_addresses (const gchar *addr1, const gchar *addr2)
-{
-	if (addr1 == NULL || *addr1 == 0 ||
-	    addr2 == NULL || *addr2 == 0)
-		return EAB_CONTACT_MATCH_NOT_APPLICABLE;
-
-	if (match_email_username (addr1, addr2)) 
-		return match_email_hostname (addr1, addr2) ? EAB_CONTACT_MATCH_EXACT : EAB_CONTACT_MATCH_VAGUE;
-
-	return EAB_CONTACT_MATCH_NONE;
-}
-
-EABContactMatchType
-eab_contact_compare_email (EContact *contact1, EContact *contact2)
-{
-	EABContactMatchType match = EAB_CONTACT_MATCH_NOT_APPLICABLE;
-	GList *contact1_email, *contact2_email;
-	GList *i1, *i2;
-
-	g_return_val_if_fail (contact1 && E_IS_CONTACT (contact1), EAB_CONTACT_MATCH_NOT_APPLICABLE);
-	g_return_val_if_fail (contact2 && E_IS_CONTACT (contact2), EAB_CONTACT_MATCH_NOT_APPLICABLE);
-
-	contact1_email = e_contact_get (contact1, E_CONTACT_EMAIL);
-	contact2_email = e_contact_get (contact2, E_CONTACT_EMAIL);
-
-	if (contact1_email == NULL || contact2_email == NULL) {
-		g_list_foreach (contact1_email, (GFunc)g_free, NULL);
-		g_list_free (contact1_email);
-
-		g_list_foreach (contact2_email, (GFunc)g_free, NULL);
-		g_list_free (contact2_email);
-		return EAB_CONTACT_MATCH_NOT_APPLICABLE;
-	}
-
-	i1 = contact1_email;
-
-	/* Do pairwise-comparisons on all of the e-mail addresses.  If
-	   we find an exact match, there is no reason to keep
-	   checking. */
-	while (i1 && match != EAB_CONTACT_MATCH_EXACT) {
-		char *addr1 = (char *) i1->data;
-
-		i2 = contact2_email;
-		while (i2 && match != EAB_CONTACT_MATCH_EXACT) {
-			char *addr2 = (char *) i2->data;
-
-			match = combine_comparisons (match, compare_email_addresses (addr1, addr2));
-			
-			i2 = i2->next;
-		}
-
-		i1 = i1->next;
-	}
-
-	g_list_foreach (contact1_email, (GFunc)g_free, NULL);
-	g_list_free (contact1_email);
-
-	g_list_foreach (contact2_email, (GFunc)g_free, NULL);
-	g_list_free (contact2_email);
-
-	return match;
-}
-
-EABContactMatchType
-eab_contact_compare_address (EContact *contact1, EContact *contact2)
-{
-	g_return_val_if_fail (contact1 && E_IS_CONTACT (contact1), EAB_CONTACT_MATCH_NOT_APPLICABLE);
-	g_return_val_if_fail (contact2 && E_IS_CONTACT (contact2), EAB_CONTACT_MATCH_NOT_APPLICABLE);
-
-	/* Unimplemented */
-
-	return EAB_CONTACT_MATCH_NOT_APPLICABLE;
-}
-
-EABContactMatchType
-eab_contact_compare_telephone (EContact *contact1, EContact *contact2)
-{
-	g_return_val_if_fail (contact1 && E_IS_CONTACT (contact1), EAB_CONTACT_MATCH_NOT_APPLICABLE);
-	g_return_val_if_fail (contact2 && E_IS_CONTACT (contact2), EAB_CONTACT_MATCH_NOT_APPLICABLE);
-
-	/* Unimplemented */
-
-	return EAB_CONTACT_MATCH_NOT_APPLICABLE;
-}
-
-EABContactMatchType
-eab_contact_compare (EContact *contact1, EContact *contact2)
-{
-	EABContactMatchType result;
-
-	g_return_val_if_fail (contact1 && E_IS_CONTACT (contact1), EAB_CONTACT_MATCH_NOT_APPLICABLE);
-	g_return_val_if_fail (contact2 && E_IS_CONTACT (contact2), EAB_CONTACT_MATCH_NOT_APPLICABLE);
-
-	result = EAB_CONTACT_MATCH_NONE;
-	result = combine_comparisons (result, eab_contact_compare_name      (contact1, contact2));
-	result = combine_comparisons (result, eab_contact_compare_nickname  (contact1, contact2));
-	result = combine_comparisons (result, eab_contact_compare_email     (contact1, contact2));
-	result = combine_comparisons (result, eab_contact_compare_address   (contact1, contact2));
-	result = combine_comparisons (result, eab_contact_compare_telephone (contact1, contact2));
-	result = combine_comparisons (result, eab_contact_compare_file_as   (contact1, contact2));
-
-	return result;
-}
-
-typedef struct _MatchSearchInfo MatchSearchInfo;
-struct _MatchSearchInfo {
-	EContact *contact;
-	GList *avoid;
-	EABContactMatchQueryCallback cb;
-	gpointer closure;
-};
-
-static void
-match_search_info_free (MatchSearchInfo *info)
-{
-	if (info) {
-		g_object_unref (info->contact);
-
-		/* This should already have been deallocated, but just in case... */
-		if (info->avoid) {
-			g_list_foreach (info->avoid, (GFunc) g_object_unref, NULL);
-			g_list_free (info->avoid);
-			info->avoid = NULL;
-		}
-
-		g_free (info);
-	}
-}
-
-static void
-query_cb (EBook *book, EBookStatus status, GList *contacts, gpointer closure)
-{
-	/* XXX we need to free contacts */
-	MatchSearchInfo *info = (MatchSearchInfo *) closure;
-	EABContactMatchType best_match = EAB_CONTACT_MATCH_NONE;
-	EContact *best_contact = NULL;
-	GList *remaining_contacts = NULL;
-	const GList *i;
-
-	if (status != E_BOOK_ERROR_OK) {
-		info->cb (info->contact, NULL, EAB_CONTACT_MATCH_NONE, info->closure);
-		match_search_info_free (info);
-		return;
-	}
-
-	/* remove the contacts we're to avoid from the list, if they're present */
-	for (i = contacts; i != NULL; i = g_list_next (i)) {
-		EContact *this_contact = E_CONTACT (i->data);
-		const gchar *this_uid;
-		GList *iterator;
-		gboolean avoid = FALSE;
-
-		this_uid = e_contact_get_const (this_contact, E_CONTACT_UID);
-		if (!this_uid)
-			continue;
-
-		for (iterator = info->avoid; iterator; iterator = iterator->next) {
-			const gchar *avoid_uid;
-
-			avoid_uid = e_contact_get_const (iterator->data, E_CONTACT_UID);
-			if (!avoid_uid)
-				continue;
-
-			if (!strcmp (avoid_uid, this_uid)) {
-				avoid = TRUE;
-				break;
-			}
-		}
-		if (!avoid)
-			remaining_contacts = g_list_prepend (remaining_contacts, this_contact);
-	}
-
-	remaining_contacts = g_list_reverse (remaining_contacts);
-
-	for (i = remaining_contacts; i != NULL; i = g_list_next (i)) {
-		EContact *this_contact = E_CONTACT (i->data);
-		EABContactMatchType this_match = eab_contact_compare (info->contact, this_contact);
-		if ((gint)this_match > (gint)best_match) {
-			best_match = this_match;
-			best_contact  = this_contact;
-		}
-	}
-
-	g_list_free (remaining_contacts);
-
-	info->cb (info->contact, best_contact, best_match, info->closure);
-	match_search_info_free (info);
-}
-
-#define MAX_QUERY_PARTS 10
-static void
-use_common_book_cb (EBook *book, gpointer closure)
-{
-	MatchSearchInfo *info = (MatchSearchInfo *) closure;
-	EContact *contact = info->contact;
-	EContactName *contact_name;
-	GList *contact_email;
-	gchar *query_parts[MAX_QUERY_PARTS];
-	gint p=0;
-	gchar *contact_file_as, *qj;
-	EBookQuery *query = NULL;
-	int i;
-
-	if (book == NULL) {
-		info->cb (info->contact, NULL, EAB_CONTACT_MATCH_NONE, info->closure);
-		match_search_info_free (info);
-		return;
-	}
-
-	contact_file_as = e_contact_get (contact, E_CONTACT_FILE_AS);
-	if (contact_file_as) {
-		query_parts [p++] = g_strdup_printf ("(contains \"file_as\" \"%s\")", contact_file_as);
-		g_free (contact_file_as);
-	}
-
-	contact_name = e_contact_get (contact, E_CONTACT_NAME);
-	if (contact_name) {
-		if (contact_name->given && *contact_name->given)
-			query_parts[p++] = g_strdup_printf ("(contains \"full_name\" \"%s\")", contact_name->given);
-
-		if (contact_name->additional && *contact_name->additional)
-			query_parts[p++] = g_strdup_printf ("(contains \"full_name\" \"%s\")", contact_name->additional);
-
-		if (contact_name->family && *contact_name->family)
-			query_parts[p++] = g_strdup_printf ("(contains \"full_name\" \"%s\")", contact_name->family);
-
-		e_contact_name_free (contact_name);
-	}
-
-	contact_email = e_contact_get (contact, E_CONTACT_EMAIL);
-	if (contact_email) {
-		GList *iter;
-		for (iter = contact_email; iter && p < MAX_QUERY_PARTS; iter = iter->next) {
-			gchar *addr = g_strdup (iter->data);
-			if (addr && *addr) {
-				gchar *s = addr;
-				while (*s) {
-					if (*s == '@') {
-						*s = '\0';
-						break;
-					}
-					++s;
-				}
-				query_parts[p++] = g_strdup_printf ("(beginswith \"email\" \"%s\")", addr);
-				g_free (addr);
-			}
-		}
-	}
-	g_list_foreach (contact_email, (GFunc)g_free, NULL);
-	g_list_free (contact_email);
-	
-	
-	/* Build up our full query from the parts. */
-	query_parts[p] = NULL;
-	qj = g_strjoinv (" ", query_parts);
-	for(i = 0; query_parts[i] != NULL; i++)
-		g_free(query_parts[i]);
-	if (p > 1) {
-		char *s;
-		s = g_strdup_printf ("(or %s)", qj);
-		query = e_book_query_from_string (s);
-		g_free (s);
-	}
-	else if (p == 1) {
-		query = e_book_query_from_string (qj);
-	}
-	else {
-		query = NULL;
-	}
-
-	if (query)
-		e_book_async_get_contacts (book, query, query_cb, info);
-	else
-		query_cb (book, E_BOOK_ERROR_OK, NULL, info);
-
-	g_free (qj);
-	if (query)
-		e_book_query_unref (query);
-}
-
-void
-eab_contact_locate_match (EContact *contact, EABContactMatchQueryCallback cb, gpointer closure)
-{
-	MatchSearchInfo *info;
-
-	g_return_if_fail (contact && E_IS_CONTACT (contact));
-	g_return_if_fail (cb != NULL);
-
-	info = g_new (MatchSearchInfo, 1);
-	info->contact = contact;
-	g_object_ref (contact);
-	info->cb = cb;
-	info->closure = closure;
-	info->avoid = NULL;
-
-	addressbook_load_default_book ((EBookCallback) use_common_book_cb, info);
-}
-
-/**
- * e_contact_locate_match_full:
- * @book: The book to look in.  If this is NULL, use the default
- * addressbook.
- * @contact: The contact to compare to.
- * @avoid: A list of contacts to not match.  These will not show up in the search.
- * @cb: The function to call.
- * @closure: The closure to add to the call.
- * 
- * Look for the best match and return it using the EABContactMatchQueryCallback.
- **/
-void
-eab_contact_locate_match_full (EBook *book, EContact *contact, GList *avoid, EABContactMatchQueryCallback cb, gpointer closure)
-{
-	MatchSearchInfo *info;
-
-	g_return_if_fail (contact && E_IS_CONTACT (contact));
-	g_return_if_fail (cb != NULL);
-
-	info = g_new (MatchSearchInfo, 1);
-	info->contact = contact;
-	g_object_ref (contact);
-	info->cb = cb;
-	info->closure = closure;
-	info->avoid = g_list_copy (avoid);
-	g_list_foreach (info->avoid, (GFunc) g_object_ref, NULL);
-
-	if (book)
-		use_common_book_cb (book, info);
-	else
-		addressbook_load_default_book ((EBookCallback) use_common_book_cb, info);
-}
-
diff --git a/addressbook/gui/merging/eab-contact-compare.h b/addressbook/gui/merging/eab-contact-compare.h
deleted file mode 100644
index 153e44aef1..0000000000
--- a/addressbook/gui/merging/eab-contact-compare.h
+++ /dev/null
@@ -1,74 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-
-/*
- * eab-contact-compare.h
- *
- * Copyright (C) 2001,2002,2003 Ximian, Inc.
- *
- * Authors: Jon Trowbridge <trow@ximian.com>
- *          Chris Toshok <toshok@ximian.com>
- */
-
-/*
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of version 2 of the GNU General Public
- * License as published by the Free Software Foundation.
- * 
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- * 
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
- * USA.
- */
-
-#ifndef __EAB_CONTACT_COMPARE_H__
-#define __EAB_CONTACT_COMPARE_H__
-
-#include <libebook/e-book.h>
-#include <libebook/e-contact.h>
-
-typedef enum {
-	EAB_CONTACT_MATCH_NOT_APPLICABLE = 0,
-	EAB_CONTACT_MATCH_NONE           = 1,
-	EAB_CONTACT_MATCH_VAGUE          = 2,
-	EAB_CONTACT_MATCH_PARTIAL        = 3,
-	EAB_CONTACT_MATCH_EXACT          = 4
-} EABContactMatchType;
-
-typedef enum {
-	EAB_CONTACT_MATCH_PART_NOT_APPLICABLE   = -1,
-	EAB_CONTACT_MATCH_PART_NONE             = 0,
-	EAB_CONTACT_MATCH_PART_GIVEN_NAME       = 1<<0,
-	EAB_CONTACT_MATCH_PART_ADDITIONAL_NAME  = 1<<2,
-	EAB_CONTACT_MATCH_PART_FAMILY_NAME      = 1<<3
-} EABContactMatchPart;
-
-typedef void (*EABContactMatchQueryCallback) (EContact *contact, EContact *match, EABContactMatchType type, gpointer closure);
-
-EABContactMatchType eab_contact_compare_name_to_string      (EContact *contact, const gchar *str);
-
-EABContactMatchType eab_contact_compare_name_to_string_full (EContact *contact, const gchar *str,
-							     gboolean allow_partial_matches,
-							     gint *matched_parts, EABContactMatchPart *first_matched_part,
-							     gint *matched_character_count);
-
-EABContactMatchType eab_contact_compare_file_as   (EContact *contact1, EContact *contact2);
-EABContactMatchType eab_contact_compare_name      (EContact *contact1, EContact *contact2);
-EABContactMatchType eab_contact_compare_nickname  (EContact *contact1, EContact *contact2);
-EABContactMatchType eab_contact_compare_email     (EContact *contact1, EContact *contact2);
-EABContactMatchType eab_contact_compare_address   (EContact *contact1, EContact *contact2);
-EABContactMatchType eab_contact_compare_telephone (EContact *contact1, EContact *contact2);
-
-EABContactMatchType eab_contact_compare           (EContact *contact1, EContact *contact2);
-
-void                eab_contact_locate_match      (EContact *contact, EABContactMatchQueryCallback cb, gpointer closure);
-void                eab_contact_locate_match_full (EBook *book, EContact *contact, GList *avoid, EABContactMatchQueryCallback cb, gpointer closure);
-
-
-
-#endif /* __E_CONTACT_COMPARE_H__ */
-
diff --git a/addressbook/gui/merging/eab-contact-duplicate-detected.glade b/addressbook/gui/merging/eab-contact-duplicate-detected.glade
deleted file mode 100644
index 0aea834b5c..0000000000
--- a/addressbook/gui/merging/eab-contact-duplicate-detected.glade
+++ /dev/null
@@ -1,222 +0,0 @@
-<?xml version="1.0" standalone="no"?> <!--*- mode: xml -*-->
-<!DOCTYPE glade-interface SYSTEM "http://glade.gnome.org/glade-2.0.dtd">
-
-<glade-interface>
-
-<widget class="GtkDialog" id="dialog-duplicate-contact">
-  <property name="visible">True</property>
-  <property name="title" translatable="yes">Duplicate Contact Detected</property>
-  <property name="type">GTK_WINDOW_TOPLEVEL</property>
-  <property name="window_position">GTK_WIN_POS_NONE</property>
-  <property name="modal">False</property>
-  <property name="resizable">True</property>
-  <property name="destroy_with_parent">False</property>
-  <property name="decorated">True</property>
-  <property name="skip_taskbar_hint">False</property>
-  <property name="skip_pager_hint">False</property>
-  <property name="type_hint">GDK_WINDOW_TYPE_HINT_DIALOG</property>
-  <property name="gravity">GDK_GRAVITY_NORTH_WEST</property>
-  <property name="has_separator">False</property>
-
-  <child internal-child="vbox">
-    <widget class="GtkVBox" id="dialog-vbox1">
-      <property name="visible">True</property>
-      <property name="homogeneous">False</property>
-      <property name="spacing">0</property>
-
-      <child internal-child="action_area">
-	<widget class="GtkHButtonBox" id="dialog-action_area1">
-	  <property name="visible">True</property>
-	  <property name="layout_style">GTK_BUTTONBOX_END</property>
-
-	  <child>
-	    <widget class="GtkButton" id="button4">
-	      <property name="visible">True</property>
-	      <property name="can_default">True</property>
-	      <property name="can_focus">True</property>
-	      <property name="label">gtk-cancel</property>
-	      <property name="use_stock">True</property>
-	      <property name="relief">GTK_RELIEF_NORMAL</property>
-	      <property name="focus_on_click">True</property>
-	      <property name="response_id">1</property>
-	    </widget>
-	  </child>
-
-	  <child>
-	    <widget class="GtkButton" id="button3">
-	      <property name="visible">True</property>
-	      <property name="can_default">True</property>
-	      <property name="can_focus">True</property>
-	      <property name="label">gtk-add</property>
-	      <property name="use_stock">True</property>
-	      <property name="relief">GTK_RELIEF_NORMAL</property>
-	      <property name="focus_on_click">True</property>
-	      <property name="response_id">0</property>
-	    </widget>
-	  </child>
-	</widget>
-	<packing>
-	  <property name="padding">0</property>
-	  <property name="expand">False</property>
-	  <property name="fill">True</property>
-	  <property name="pack_type">GTK_PACK_END</property>
-	</packing>
-      </child>
-
-      <child>
-	<widget class="GtkTable" id="table1">
-	  <property name="border_width">12</property>
-	  <property name="visible">True</property>
-	  <property name="n_rows">5</property>
-	  <property name="n_columns">2</property>
-	  <property name="homogeneous">False</property>
-	  <property name="row_spacing">6</property>
-	  <property name="column_spacing">12</property>
-
-	  <child>
-	    <widget class="Custom" id="custom-old-contact">
-	      <property name="visible">True</property>
-	      <property name="creation_function">_eab_contact_merging_create_contact_display</property>
-	      <property name="int1">0</property>
-	      <property name="int2">0</property>
-	      <property name="last_modification_time">Sun, 05 Oct 2003 03:55:10 GMT</property>
-	    </widget>
-	    <packing>
-	      <property name="left_attach">1</property>
-	      <property name="right_attach">2</property>
-	      <property name="top_attach">4</property>
-	      <property name="bottom_attach">5</property>
-	    </packing>
-	  </child>
-
-	  <child>
-	    <widget class="GtkLabel" id="label1">
-	      <property name="visible">True</property>
-	      <property name="label" translatable="yes">The name or email address of this contact already exists
-in this folder.  Would you like to add it anyway?</property>
-	      <property name="use_underline">False</property>
-	      <property name="use_markup">False</property>
-	      <property name="justify">GTK_JUSTIFY_LEFT</property>
-	      <property name="wrap">False</property>
-	      <property name="selectable">False</property>
-	      <property name="xalign">0</property>
-	      <property name="yalign">0.5</property>
-	      <property name="xpad">0</property>
-	      <property name="ypad">0</property>
-	    </widget>
-	    <packing>
-	      <property name="left_attach">1</property>
-	      <property name="right_attach">2</property>
-	      <property name="top_attach">0</property>
-	      <property name="bottom_attach">1</property>
-	      <property name="y_options">fill</property>
-	    </packing>
-	  </child>
-
-	  <child>
-	    <widget class="GtkLabel" id="label3">
-	      <property name="visible">True</property>
-	      <property name="label" translatable="yes">Original Contact:</property>
-	      <property name="use_underline">False</property>
-	      <property name="use_markup">False</property>
-	      <property name="justify">GTK_JUSTIFY_CENTER</property>
-	      <property name="wrap">False</property>
-	      <property name="selectable">False</property>
-	      <property name="xalign">0</property>
-	      <property name="yalign">0.5</property>
-	      <property name="xpad">0</property>
-	      <property name="ypad">0</property>
-	    </widget>
-	    <packing>
-	      <property name="left_attach">1</property>
-	      <property name="right_attach">2</property>
-	      <property name="top_attach">3</property>
-	      <property name="bottom_attach">4</property>
-	      <property name="y_options">fill</property>
-	    </packing>
-	  </child>
-
-	  <child>
-	    <widget class="GtkLabel" id="label4">
-	      <property name="visible">True</property>
-	      <property name="label" translatable="yes">New Contact:</property>
-	      <property name="use_underline">False</property>
-	      <property name="use_markup">False</property>
-	      <property name="justify">GTK_JUSTIFY_CENTER</property>
-	      <property name="wrap">False</property>
-	      <property name="selectable">False</property>
-	      <property name="xalign">0</property>
-	      <property name="yalign">0.5</property>
-	      <property name="xpad">0</property>
-	      <property name="ypad">0</property>
-	    </widget>
-	    <packing>
-	      <property name="left_attach">1</property>
-	      <property name="right_attach">2</property>
-	      <property name="top_attach">1</property>
-	      <property name="bottom_attach">2</property>
-	      <property name="x_options">fill</property>
-	      <property name="y_options"></property>
-	    </packing>
-	  </child>
-
-	  <child>
-	    <widget class="Custom" id="custom-new-contact">
-	      <property name="visible">True</property>
-	      <property name="creation_function">_eab_contact_merging_create_contact_display</property>
-	      <property name="int1">0</property>
-	      <property name="int2">0</property>
-	      <property name="last_modification_time">Sun, 05 Oct 2003 03:54:50 GMT</property>
-	    </widget>
-	    <packing>
-	      <property name="left_attach">1</property>
-	      <property name="right_attach">2</property>
-	      <property name="top_attach">2</property>
-	      <property name="bottom_attach">3</property>
-	    </packing>
-	  </child>
-
-	  <child>
-	    <widget class="GtkAlignment" id="alignment1">
-	      <property name="visible">True</property>
-	      <property name="xalign">0.5</property>
-	      <property name="yalign">0</property>
-	      <property name="xscale">1</property>
-	      <property name="yscale">0</property>
-	      <property name="top_padding">0</property>
-	      <property name="bottom_padding">0</property>
-	      <property name="left_padding">0</property>
-	      <property name="right_padding">0</property>
-
-	      <child>
-		<widget class="Custom" id="custom2">
-		  <property name="visible">True</property>
-		  <property name="creation_function">e_create_image_widget</property>
-		  <property name="string1">stock_person</property>
-		  <property name="int1">0</property>
-		  <property name="int2">0</property>
-		  <property name="last_modification_time">Fri, 08 Jun 2001 00:18:39 GMT</property>
-		</widget>
-	      </child>
-	    </widget>
-	    <packing>
-	      <property name="left_attach">0</property>
-	      <property name="right_attach">1</property>
-	      <property name="top_attach">0</property>
-	      <property name="bottom_attach">5</property>
-	      <property name="x_options">fill</property>
-	      <property name="y_options">fill</property>
-	    </packing>
-	  </child>
-	</widget>
-	<packing>
-	  <property name="padding">0</property>
-	  <property name="expand">True</property>
-	  <property name="fill">True</property>
-	</packing>
-      </child>
-    </widget>
-  </child>
-</widget>
-
-</glade-interface>
diff --git a/addressbook/gui/merging/eab-contact-merging.c b/addressbook/gui/merging/eab-contact-merging.c
deleted file mode 100644
index a43c56043d..0000000000
--- a/addressbook/gui/merging/eab-contact-merging.c
+++ /dev/null
@@ -1,246 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-/*
- * Code for checking for duplicates when doing EContact work.
- *
- * Authors:
- *   Christopher James Lahey <clahey@ximian.com>
- *   Chris Toshok <toshok@ximian.com>
- *
- * Copyright (C) 2001, 2002, 2003, Ximian, Inc.
- */
-
-#include <config.h>
-
-#include "eab-contact-merging.h"
-#include "eab-contact-compare.h"
-#include <glade/glade.h>
-#include <gtk/gtksignal.h>
-#include <gtk/gtkdialog.h>
-#include <gtk/gtkcontainer.h>
-#include "addressbook/gui/widgets/eab-contact-display.h"
-
-typedef enum {
-	E_CONTACT_MERGING_ADD,
-	E_CONTACT_MERGING_COMMIT
-} EContactMergingOpType;
-
-typedef struct {
-	EContactMergingOpType op;
-	EBook *book;
-	EContact *contact;
-	GList *avoid;
-	EBookIdCallback id_cb;
-	EBookCallback   cb;
-	gpointer closure;
-} EContactMergingLookup;
-
-static void match_query_callback (EContact *contact, EContact *match, EABContactMatchType type, gpointer closure);
-
-#define SIMULTANEOUS_MERGING_REQUESTS 20
-
-static GList *merging_queue = NULL;
-static int running_merge_requests = 0;
-
-
-static void
-add_lookup (EContactMergingLookup *lookup)
-{
-	if (running_merge_requests < SIMULTANEOUS_MERGING_REQUESTS) {
-		running_merge_requests++;
-		eab_contact_locate_match_full (lookup->book, lookup->contact, lookup->avoid, match_query_callback, lookup);
-	}
-	else {
-		merging_queue = g_list_append (merging_queue, lookup);
-	}
-}
-
-static void
-finished_lookup (void)
-{
-	running_merge_requests--;
-
-	while (running_merge_requests < SIMULTANEOUS_MERGING_REQUESTS) {
-		EContactMergingLookup *lookup;
-		
-		if (!merging_queue)
-			break;
-
-		lookup = merging_queue->data;
-
-		merging_queue = g_list_remove_link (merging_queue, merging_queue);
-
-		running_merge_requests++;
-		eab_contact_locate_match_full (lookup->book, lookup->contact, lookup->avoid, match_query_callback, lookup);
-	}
-}
-
-static void
-free_lookup (EContactMergingLookup *lookup)
-{
-	g_object_unref (lookup->book);
-	g_object_unref (lookup->contact);
-	g_list_free (lookup->avoid);
-
-	g_free (lookup);
-}
-
-static void
-final_id_cb (EBook *book, EBookStatus status, const char *id, gpointer closure)
-{
-	EContactMergingLookup *lookup = closure;
-
-	if (lookup->id_cb)
-		lookup->id_cb (lookup->book, status, id, lookup->closure);
-
-	free_lookup (lookup);
-
-	finished_lookup ();
-}
-
-static void
-final_cb (EBook *book, EBookStatus status, gpointer closure)
-{
-	EContactMergingLookup *lookup = closure;
-
-	if (lookup->cb)
-		lookup->cb (lookup->book, status, lookup->closure);
-
-	free_lookup (lookup);
-
-	finished_lookup ();
-}
-
-static void
-doit (EContactMergingLookup *lookup)
-{
-	if (lookup->op == E_CONTACT_MERGING_ADD)
-		e_book_async_add_contact (lookup->book, lookup->contact, final_id_cb, lookup);
-	else if (lookup->op == E_CONTACT_MERGING_COMMIT)
-		e_book_async_commit_contact (lookup->book, lookup->contact, final_cb, lookup);
-}
-
-static void
-cancelit (EContactMergingLookup *lookup)
-{
-	if (lookup->op == E_CONTACT_MERGING_ADD) {
-		if (lookup->id_cb)
-			final_id_cb (lookup->book, E_BOOK_ERROR_CANCELLED, NULL, lookup);
-	} else if (lookup->op == E_CONTACT_MERGING_COMMIT) {
-		if (lookup->cb)
-			final_cb (lookup->book, E_BOOK_ERROR_CANCELLED, lookup);
-	}
-}
-
-static void
-response (GtkWidget *dialog, int response, EContactMergingLookup *lookup)
-{
-	gtk_widget_destroy (dialog);
-
-	switch (response) {
-	case 0:
-		doit (lookup);
-		break;
-	case 1:
-		cancelit (lookup);
-		break;
-	}
-}
-
-static void
-match_query_callback (EContact *contact, EContact *match, EABContactMatchType type, gpointer closure)
-{
-	EContactMergingLookup *lookup = closure;
-
-	if ((gint) type <= (gint) EAB_CONTACT_MATCH_VAGUE) {
-		doit (lookup);
-	} else {
-		GladeXML *ui;
-		
-		GtkWidget *widget;
-
-		if (lookup->op == E_CONTACT_MERGING_ADD)
-			ui = glade_xml_new (EVOLUTION_GLADEDIR "/eab-contact-duplicate-detected.glade", NULL, NULL);
-		else if (lookup->op == E_CONTACT_MERGING_COMMIT)
-			ui = glade_xml_new (EVOLUTION_GLADEDIR "/eab-contact-commit-duplicate-detected.glade", NULL, NULL);
-		else {
-			doit (lookup);
-			return;
-		}
-
-		widget = glade_xml_get_widget (ui, "custom-old-contact");
-		eab_contact_display_render (EAB_CONTACT_DISPLAY (widget),
-					    match, EAB_CONTACT_DISPLAY_RENDER_COMPACT);
-
-		widget = glade_xml_get_widget (ui, "custom-new-contact");
-		eab_contact_display_render (EAB_CONTACT_DISPLAY (widget),
-					    contact, EAB_CONTACT_DISPLAY_RENDER_COMPACT);
-
-		widget = glade_xml_get_widget (ui, "dialog-duplicate-contact");
-
-		gtk_widget_ensure_style (widget);
-		gtk_container_set_border_width (GTK_CONTAINER (GTK_DIALOG (widget)->vbox), 0);
-		gtk_container_set_border_width (GTK_CONTAINER (GTK_DIALOG (widget)->action_area), 12);
-
-		g_signal_connect (widget, "response",
-				  G_CALLBACK (response), lookup);
-
-		gtk_widget_show_all (widget);
-	}
-}
-
-gboolean
-eab_merging_book_add_contact (EBook           *book,
-			      EContact           *contact,
-			      EBookIdCallback  cb,
-			      gpointer         closure)
-{
-	EContactMergingLookup *lookup;
-
-	lookup = g_new (EContactMergingLookup, 1);
-
-	lookup->op = E_CONTACT_MERGING_ADD;
-	lookup->book = g_object_ref (book);
-	lookup->contact = g_object_ref (contact);
-	lookup->id_cb = cb;
-	lookup->closure = closure;
-	lookup->avoid = NULL;
-
-	add_lookup (lookup);
-
-	return TRUE;
-}
-
-gboolean
-eab_merging_book_commit_contact (EBook                 *book,
-				 EContact                 *contact,
-				 EBookCallback          cb,
-				 gpointer               closure)
-{
-	EContactMergingLookup *lookup;
-	
-	lookup = g_new (EContactMergingLookup, 1);
-
-	lookup->op = E_CONTACT_MERGING_COMMIT;
-	lookup->book = g_object_ref (book);
-	lookup->contact = g_object_ref (contact);
-	lookup->cb = cb;
-	lookup->closure = closure;
-	lookup->avoid = g_list_append (NULL, contact);
-
-	add_lookup (lookup);
-
-	return TRUE;
-}
-
-GtkWidget *
-_eab_contact_merging_create_contact_display(gchar *name,
-					    gchar *string1, gchar *string2,
-					    gint int1, gint int2);
-
-GtkWidget *
-_eab_contact_merging_create_contact_display(gchar *name,
-					    gchar *string1, gchar *string2,
-					    gint int1, gint int2)
-{
-	return eab_contact_display_new();
-}
diff --git a/addressbook/gui/merging/eab-contact-merging.h b/addressbook/gui/merging/eab-contact-merging.h
deleted file mode 100644
index 80a7717ce8..0000000000
--- a/addressbook/gui/merging/eab-contact-merging.h
+++ /dev/null
@@ -1,30 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-/*
- * The Evolution addressbook client object.
- *
- * Authors:
- *   Christopher James Lahey <clahey@ximian.com>
- *   Chris Toshok <toshok@ximian.com>
- *
- * Copyright (C) 2001, 2002, 2003 Ximian, Inc.
- */
-
-#ifndef __E_CONTACT_MERGING_H__
-#define __E_CONTACT_MERGING_H__
-
-#include <libebook/e-book.h>
-
-G_BEGIN_DECLS
-
-gboolean  eab_merging_book_add_contact    (EBook           *book,
-					   EContact        *contact,
-					   EBookIdCallback  cb,
-					   gpointer         closure);
-gboolean  eab_merging_book_commit_contact (EBook           *book,
-					   EContact        *contact,
-					   EBookCallback    cb,
-					   gpointer         closure);
-
-G_END_DECLS
-
-#endif /* ! __EAB_CONTACT_MERGING_H__ */
diff --git a/addressbook/gui/search/.cvsignore b/addressbook/gui/search/.cvsignore
deleted file mode 100644
index d6c55c7345..0000000000
--- a/addressbook/gui/search/.cvsignore
+++ /dev/null
@@ -1,7 +0,0 @@
-.deps
-.libs
-.pure
-Makefile
-Makefile.in
-*.lo
-*.la
diff --git a/addressbook/gui/search/Makefile.am b/addressbook/gui/search/Makefile.am
deleted file mode 100644
index 391039d81f..0000000000
--- a/addressbook/gui/search/Makefile.am
+++ /dev/null
@@ -1,23 +0,0 @@
-ruledir = $(privdatadir)
-rule_DATA = addresstypes.xml
-
-EXTRA_DIST = addresstypes.xml
-
-INCLUDES =						\
-	-DG_LOG_DOMAIN=\"e-addressbook-search\"		\
-	-I$(top_srcdir)					\
-	-I$(top_srcdir)/addressbook/backend		\
-	-I$(top_builddir)/addressbook/backend		\
-	-I$(top_srcdir)/addressbook/contact-editor	\
-	-I$(top_srcdir)/widgets/e-text			\
-	-I$(top_srcdir)/widgets/misc			\
-	-I$(top_builddir)/shell				\
-	-DSEARCH_RULE_DIR=\"$(ruledir)\"		\
-	$(EVOLUTION_ADDRESSBOOK_CFLAGS)
-
-noinst_LTLIBRARIES =				\
-	libeaddressbooksearch.la
-
-libeaddressbooksearch_la_SOURCES =		\
-	e-addressbook-search-dialog.c		\
-	e-addressbook-search-dialog.h
diff --git a/addressbook/gui/search/addresstypes.xml b/addressbook/gui/search/addresstypes.xml
deleted file mode 100644
index 4adbfd694b..0000000000
--- a/addressbook/gui/search/addresstypes.xml
+++ /dev/null
@@ -1,83 +0,0 @@
-<?xml version="1.0"?>
-<filterdescription>
-<partset>
- <part name="name">
-  <title>Name</title>
-   <input type="optionlist" name="name-type">
-    <option value="contains">
-        <title>contains</title>
-	<code>(contains "full_name" ${name})</code>
-    </option>
-    <option value="not contains">
-        <title>does not contain</title>
-	<code>(not (contains "full_name" ${name}))</code>
-    </option>
-    <option value="is">
-        <title>is</title>
-	<code>(is "full_name" ${name})))</code>
-    </option>
-    <option value="is not">
-        <title>is not</title>
-	<code>(not (is "full_name" ${name}))</code>
-    </option>
-    <option value="begin">
-        <title>begins with</title>
-	<code>(beginswith "full_name" ${name})</code>
-    </option>
-    <option value="end">
-        <title>ends in</title>
-	<code>(endswith "full_name" ${name})</code>
-    </option>
-   </input>
-   <input type="string" name="name"/>
- </part>
- <part name="email">
-  <title>Email</title>
-   <input type="optionlist" name="email-type">
-    <option value="contains">
-        <title>contains</title>
-	<code>(contains "email" ${email})</code>
-    </option>
-    <option value="not contains">
-        <title>does not contain</title>
-	<code>(not (contains "email" ${email}))</code>
-    </option>
-    <option value="is">
-        <title>is</title>
-	<code>(is "email" ${email})</code>
-    </option>
-    <option value="is not">
-        <title>is not</title>
-	<code>(not (is "email" ${email}))</code>
-    </option>
-   </input>
-   <input type="address" name="email"/>
- </part>
- <part name="category">
-  <title>Category</title>
-   <input type="optionlist" name="category-type">
-    <option value="contains">
-        <title>contains</title>
-	<code>(contains "category_list" ${category})</code>
-    </option>
-    <option value="not contains">
-        <title>does not contain</title>
-	<code>(not (contains "category_list" ${category}))</code>
-    </option>
-    <option value="is">
-        <title>is</title>
-	<code>(is "category_list" ${category})</code>
-    </option>
-    <option value="is not">
-        <title>is not</title>
-	<code>(not (is "category_list" ${category}))</code>
-    </option>
-   </input>
-   <input type="string" name="category"/>
- </part>
- <part name="sexp">
-   <title>Expression</title>
-   <input type="code" name="code"/>
-  </part>
-</partset>
-</filterdescription>
diff --git a/addressbook/gui/search/e-addressbook-search-dialog.c b/addressbook/gui/search/e-addressbook-search-dialog.c
deleted file mode 100644
index 2c66a931e6..0000000000
--- a/addressbook/gui/search/e-addressbook-search-dialog.c
+++ /dev/null
@@ -1,190 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-/* 
- * e-addressbook-search-dialog.c
- * Copyright (C) 2000  Ximian, Inc.
- * Author: Chris Lahey <clahey@ximian.com>
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of version 2 of the GNU General Public
- * License as published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * General Public License for more details.
- *
- * You should have received a copy of the GNU General Public
- * License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
- */
-
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
-
-#include <gtk/gtkbox.h>
-#include <gtk/gtkentry.h>
-#include <gtk/gtkstock.h>
-#include <libgnome/gnome-i18n.h>
-
-#include "e-addressbook-search-dialog.h"
-
-
-static void eab_search_dialog_init             (EABSearchDialog          *widget);
-static void eab_search_dialog_class_init       (EABSearchDialogClass     *klass);
-static void eab_search_dialog_dispose          (GObject *object);
-
-G_DEFINE_TYPE (EABSearchDialog, eab_search_dialog, GTK_TYPE_DIALOG)
-
-enum
-{
-	PROP_VIEW = 1
-};
-
-static GtkWidget *
-get_widget (EABSearchDialog *view)
-{
-	RuleContext *context;
-	FilterRule  *rule;
-
-	context = eab_view_peek_search_context (view->view);
-	rule    = eab_view_peek_search_rule    (view->view);
-
-	if (!context || !rule) {
-		g_warning ("Could not get search context.");
-		return gtk_entry_new ();
-	}
-
-	return filter_rule_get_widget (rule, context);
-}
-
-static void
-eab_search_dialog_set_property (GObject *object, guint property_id, const GValue *value, GParamSpec *pspec)
-{
-	EABSearchDialog *search_dialog;
-
-	search_dialog = EAB_SEARCH_DIALOG (object);
-	
-	switch (property_id) {
-	case PROP_VIEW:
-		search_dialog->view = g_value_get_object (value);
-		search_dialog->search = get_widget (search_dialog);
-		gtk_container_set_border_width (GTK_CONTAINER (search_dialog->search), 12);
-		gtk_box_pack_start (GTK_BOX (GTK_DIALOG (search_dialog)->vbox),
-				    search_dialog->search, TRUE, TRUE, 0);
-		gtk_widget_show (search_dialog->search);
-		break;
-	default:
-		G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec);
-		break;
-	}
-}
-
-static void
-eab_search_dialog_get_property (GObject *object, guint property_id, GValue *value, GParamSpec *pspec)
-{
-	EABSearchDialog *search_dialog;
-
-	search_dialog = EAB_SEARCH_DIALOG (object);
-
-	switch (property_id) {
-	case PROP_VIEW:
-		g_value_set_object (value, search_dialog->view);
-		break;
-	default:
-		G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec);
-		break;
-	}
-}
-
-static void
-eab_search_dialog_class_init (EABSearchDialogClass *klass)
-{
-	GObjectClass *object_class;
-
-	object_class = (GObjectClass*) klass;
-
-	object_class->set_property = eab_search_dialog_set_property;
-	object_class->get_property = eab_search_dialog_get_property;
-	object_class->dispose = eab_search_dialog_dispose;
-
-	g_object_class_install_property (object_class, PROP_VIEW,
-					 g_param_spec_object ("view", NULL, NULL, E_TYPE_AB_VIEW,
-							      G_PARAM_READWRITE | G_PARAM_CONSTRUCT_ONLY));
-}
-
-static char *
-get_query (EABSearchDialog *view)
-{
-	FilterRule *rule;
-	GString *out = g_string_new("");
-	char *ret;
-
-	rule = eab_view_peek_search_rule (view->view);
-
-	filter_rule_build_code(rule, out);
-	ret = out->str;
-	printf("Searching using %s\n", ret);
-	g_string_free(out, FALSE);
-	return ret;
-}
-
-static void
-dialog_response (GtkWidget *widget, int response_id, EABSearchDialog *dialog)
-{
-	char *query;
-
-	if (response_id == GTK_RESPONSE_OK) {
-		query = get_query(dialog);
-		g_object_set(dialog->view,
-			     "query", query,
-			     NULL);
-		g_free(query);
-	}
-
-	gtk_widget_destroy(GTK_WIDGET (dialog));
-}
-
-static void
-eab_search_dialog_init (EABSearchDialog *view)
-{
-	GtkDialog *dialog = GTK_DIALOG (view);
-
-	gtk_widget_realize (GTK_WIDGET (dialog));
-	gtk_dialog_set_has_separator (dialog, FALSE);
-	gtk_container_set_border_width (GTK_CONTAINER (dialog->vbox), 0);
-	gtk_container_set_border_width (GTK_CONTAINER (dialog->action_area), 12);
-
-	gtk_window_set_default_size (GTK_WINDOW (view), 550, 400);
-	gtk_window_set_title(GTK_WINDOW(view), _("Advanced Search"));
-
-	gtk_dialog_add_buttons (dialog,
-				GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL,
-				/*GTK_STOCK_SAVE, GTK_RESPONSE_APPLY,*/
-				GTK_STOCK_OK, GTK_RESPONSE_OK,
-				NULL);
-	
-	gtk_dialog_set_default_response (dialog, GTK_RESPONSE_OK);
-
-	g_signal_connect(dialog, "response",
-			 G_CALLBACK(dialog_response), view);
-}
-
-GtkWidget *
-eab_search_dialog_new (EABView *addr_view)
-{
-	EABSearchDialog *view = g_object_new (EAB_SEARCH_DIALOG_TYPE, "view", addr_view, NULL);
-
-	return GTK_WIDGET(view);
-}
-
-static void
-eab_search_dialog_dispose (GObject *object)
-{
-	EABSearchDialog *view;
-
-	view = EAB_SEARCH_DIALOG (object);
-
-	G_OBJECT_CLASS(eab_search_dialog_parent_class)->dispose (object);
-}
diff --git a/addressbook/gui/search/e-addressbook-search-dialog.h b/addressbook/gui/search/e-addressbook-search-dialog.h
deleted file mode 100644
index 1321409f94..0000000000
--- a/addressbook/gui/search/e-addressbook-search-dialog.h
+++ /dev/null
@@ -1,62 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-/* e-minicard-view-widget.h
- * Copyright (C) 2000  Ximian, Inc.
- * Author: Chris Lahey <clahey@ximian.com>
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of version 2 of the GNU General Public
- * License as published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * General Public License for more details.
- *
- * You should have received a copy of the GNU General Public
- * License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
- */
-
-#ifndef __EAB_SEARCH_DIALOG_H__
-#define __EAB_SEARCH_DIALOG_H__
-
-#include <libebook/e-book.h>
-
-#include "addressbook/gui/widgets/e-addressbook-view.h"
-#include "filter/rule-context.h"
-#include "filter/filter-rule.h"
-#include <gtk/gtkdialog.h>
-
-G_BEGIN_DECLS
-
-#define EAB_SEARCH_DIALOG_TYPE		(eab_search_dialog_get_type ())
-#define EAB_SEARCH_DIALOG(obj)		(G_TYPE_CHECK_INSTANCE_CAST ((obj), EAB_SEARCH_DIALOG_TYPE, EABSearchDialog))
-#define EAB_SEARCH_DIALOG_CLASS(klass)	(G_TYPE_CHECK_CLASS_CAST ((klass), EAB_SEARCH_DIALOG_TYPE, EABSearchDialogClass))
-#define E_IS_ADDRESSBOOK_SEARCH_DIALOG(obj) 		(G_TYPE_CHECK_INSTANCE_TYPE ((obj), EAB_SEARCH_DIALOG_TYPE))
-#define E_IS_ADDRESSBOOK_SEARCH_DIALOG_CLASS(klass) 	(G_TYPE_CHECK_CLASS_TYPE ((obj), EAB_SEARCH_DIALOG_TYPE))
-
-
-typedef struct _EABSearchDialog       EABSearchDialog;
-typedef struct _EABSearchDialogClass  EABSearchDialogClass;
-
-struct _EABSearchDialog
-{
-	GtkDialog parent;
-
-	GtkWidget *search;
-	EABView *view;
-};
-
-struct _EABSearchDialogClass
-{
-	GtkDialogClass parent_class;
-};
-
-GType      eab_search_dialog_get_type (void);
-
-GtkWidget *eab_search_dialog_new (EABView *view);
-
-G_END_DECLS
-
-#endif /* __EAB_SEARCH_DIALOG_H__ */
diff --git a/addressbook/gui/widgets/.cvsignore b/addressbook/gui/widgets/.cvsignore
deleted file mode 100644
index b67f65e6c3..0000000000
--- a/addressbook/gui/widgets/.cvsignore
+++ /dev/null
@@ -1,19 +0,0 @@
-.deps
-.libs
-.pure
-Makefile
-Makefile.in
-*.lo
-*.la
-minicard-label-test
-minicard-test
-minicard-view-test
-minicard-widget-test
-reflow-test
-eab-marshal.c
-eab-marshal.h
-Evolution-Composer-stubs.c
-Evolution-Composer-skels.c
-Evolution-Composer-common.c
-Evolution-Composer.h
-
diff --git a/addressbook/gui/widgets/Makefile.am b/addressbook/gui/widgets/Makefile.am
deleted file mode 100644
index da204a4f06..0000000000
--- a/addressbook/gui/widgets/Makefile.am
+++ /dev/null
@@ -1,98 +0,0 @@
-ruledir = $(privdatadir)
-
-INCLUDES =										\
-	-DG_LOG_DOMAIN=\"eab-widgets\"			\
-	-DEVOLUTION_ETSPECDIR=\""$(etspecdir)"\"	\
-	-DEVOLUTION_IMAGESDIR=\""$(imagesdir)"\"	\
-	-DEVOLUTION_GALVIEWSDIR=\""$(viewsdir)"\"	\
-	-I$(top_srcdir)					\
-	-I$(top_srcdir)/addressbook			\
-	-I$(top_srcdir)/addressbook/backend		\
-	-I$(top_builddir)/addressbook/backend		\
-	-I$(top_srcdir)/addressbook/gui/contact-editor	\
-	-I$(top_srcdir)/addressbook/gui/merging		\
-	-I$(top_srcdir)/addressbook/gui/component	\
-	-I$(top_srcdir)/widgets/misc			\
-	-I$(top_builddir)/shell				\
-	-DSEARCH_RULE_DIR=\"$(ruledir)\"		\
-	$(EVOLUTION_ADDRESSBOOK_CFLAGS)
-
-CORBA_COMPOSER_SOURCE_H	=			\
-	Evolution-Composer.h
-CORBA_COMPOSER_SOURCE_C =			\
-	Evolution-Composer-common.c		\
-	Evolution-Composer-skels.c		\
-	Evolution-Composer-stubs.c
-CORBA_COMPOSER_IDL = $(srcdir)/../../../composer/Evolution-Composer.idl
-
-$(CORBA_COMPOSER_SOURCE_H): $(CORBA_COMPOSER_IDL)
-	$(ORBIT_IDL) -I $(srcdir) $(IDL_INCLUDES) $(CORBA_COMPOSER_IDL)
-
-$(CORBA_COMPOSER_SOURCE_C): $(CORBA_COMPOSER_SOURCE_H)
-
-CORBA_SOURCE_H = $(CORBA_COMPOSER_SOURCE_H)
-CORBA_SOURCE_C = $(CORBA_COMPOSER_SOURCE_C)
-CORBA_SOURCE = $(CORBA_SOURCE_H) $(CORBA_SOURCE_C)
-
-noinst_LTLIBRARIES =				\
-	libeabwidgets.la
-
-libeabwidgets_la_SOURCES =			\
-	$(CORBA_SOURCE)				\
-	$(MARSHAL_GENERATED)			\
-	eab-config.c				\
-	eab-config.h				\
-	eab-contact-display.c			\
-	eab-contact-display.h			\
-	eab-gui-util.c				\
-	eab-gui-util.h				\
-	eab-menu.c				\
-	eab-menu.h				\
-	eab-popup.c				\
-	eab-popup.h				\
-	eab-popup-control.c			\
-	eab-popup-control.h			\
-	eab-vcard-control.c			\
-	eab-vcard-control.h			\
-	e-minicard.c				\
-	e-minicard.h				\
-	e-minicard-label.c			\
-	e-minicard-label.h			\
-	e-minicard-view.c			\
-	e-minicard-view.h			\
-	e-minicard-view-widget.c		\
-	e-minicard-view-widget.h		\
-	e-addressbook-reflow-adapter.c		\
-	e-addressbook-reflow-adapter.h		\
-	e-addressbook-table-adapter.c		\
-	e-addressbook-table-adapter.h		\
-	e-addressbook-model.c			\
-	e-addressbook-model.h			\
-	e-addressbook-view.c			\
-	e-addressbook-view.h			\
-	gal-view-minicard.c			\
-	gal-view-minicard.h			\
-	gal-view-factory-minicard.c		\
-	gal-view-factory-minicard.h
-
-#TREEVIEW_SOURCES=	e-addressbook-treeview-adapter.c	\
-#			e-addressbook-treeview-adapter.h	\
-#			gal-view-factory-treeview.c		\
-#			gal-view-factory-treeview.h		\
-#			gal-view-treeview.c			\
-#			gal-view-treeview.h
-
-MARSHAL_GENERATED = eab-marshal.c eab-marshal.h
-@EVO_MARSHAL_RULE@
-
-BUILT_SOURCES = $(CORBA_SOURCE) $(MARSHAL_GENERATED)
-CLEANFILES = $(BUILT_SOURCES)
-
-dist-hook:
-	cd $(distdir); rm -f $(BUILT_SOURCES)
-
-etspec_DATA= e-addressbook-view.etspec
-
-EXTRA_DIST = 			\
-	$(etspec_DATA)		\
-	eab-marshal.list
diff --git a/addressbook/gui/widgets/e-addressbook-model.c b/addressbook/gui/widgets/e-addressbook-model.c
deleted file mode 100644
index da029adb19..0000000000
--- a/addressbook/gui/widgets/e-addressbook-model.c
+++ /dev/null
@@ -1,721 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-/*
- *
- * Author:
- *   Christopher James Lahey <clahey@ximian.com>
- *
- * (C) 1999 Ximian, Inc.
- */
-
-#include <config.h>
-#include "eab-marshal.h"
-#include "e-addressbook-model.h"
-#include <libxml/tree.h>
-#include <libxml/parser.h>
-#include <libxml/xmlmemory.h>
-#include <gnome.h>
-#include <gal/widgets/e-gui-utils.h>
-#include "eab-gui-util.h"
-
-#define PARENT_TYPE G_TYPE_OBJECT
-static GObjectClass *parent_class;
-
-/*
- * EABModel callbacks
- * These are the callbacks that define the behavior of our custom model.
- */
-static void eab_model_set_property (GObject *object, guint prop_id, const GValue *value, GParamSpec *pspec);
-static void eab_model_get_property (GObject *object, guint prop_id, GValue *value, GParamSpec *pspec);
-
-
-enum {
-	PROP_0,
-	PROP_BOOK,
-	PROP_QUERY,
-	PROP_EDITABLE,
-};
-
-enum {
-	WRITABLE_STATUS,
-	STATUS_MESSAGE,
-	SEARCH_STARTED,
-	SEARCH_RESULT,
-	FOLDER_BAR_MESSAGE,
-	CONTACT_ADDED,
-	CONTACTS_REMOVED,
-	CONTACT_CHANGED,
-	MODEL_CHANGED,
-	STOP_STATE_CHANGED,
-	BACKEND_DIED,
-	LAST_SIGNAL
-};
-
-static guint eab_model_signals [LAST_SIGNAL] = {0, };
-
-static void
-free_data (EABModel *model)
-{
-	if (model->data) {
-		int i;
-
-		for ( i = 0; i < model->data_count; i++ ) {
-			g_object_unref (model->data[i]);
-		}
-
-		g_free(model->data);
-		model->data = NULL;
-		model->data_count = 0;
-		model->allocated_count = 0;
-	}
-}
-
-static void
-remove_book_view(EABModel *model)
-{
-	if (model->book_view && model->create_contact_id)
-		g_signal_handler_disconnect (model->book_view,
-					     model->create_contact_id);
-	if (model->book_view && model->remove_contact_id)
-		g_signal_handler_disconnect (model->book_view,
-					     model->remove_contact_id);
-	if (model->book_view && model->modify_contact_id)
-		g_signal_handler_disconnect (model->book_view,
-					     model->modify_contact_id);
-	if (model->book_view && model->status_message_id)
-		g_signal_handler_disconnect (model->book_view,
-					     model->status_message_id);
-	if (model->book_view && model->sequence_complete_id)
-		g_signal_handler_disconnect (model->book_view,
-					     model->sequence_complete_id);
-
-	model->create_contact_id = 0;
-	model->remove_contact_id = 0;
-	model->modify_contact_id = 0;
-	model->status_message_id = 0;
-	model->sequence_complete_id = 0;
-
-	model->search_in_progress = FALSE;
-
-	if (model->book_view) {
-		e_book_view_stop (model->book_view);
-		g_object_unref (model->book_view);
-		model->book_view = NULL;
-	}
-}
-
-static void
-addressbook_dispose(GObject *object)
-{
-	EABModel *model = EAB_MODEL(object);
-
-	remove_book_view(model);
-	free_data (model);
-
-	if (model->book) {
-		if (model->writable_status_id)
-			g_signal_handler_disconnect (model->book,
-						     model->writable_status_id);
-		model->writable_status_id = 0;
-
-		if (model->backend_died_id)
-			g_signal_handler_disconnect (model->book,
-						     model->backend_died_id);
-		model->backend_died_id = 0;
-
-		g_object_unref (model->book);
-		model->book = NULL;
-	}
-
-	if (model->query) {
-		e_book_query_unref (model->query);
-		model->query = NULL;
-	}
-
-	if (G_OBJECT_CLASS(parent_class)->dispose)
-		G_OBJECT_CLASS(parent_class)->dispose(object);
-}
-
-static void
-update_folder_bar_message (EABModel *model)
-{
-	int count;
-	char *message;
-
-	count = model->data_count;
-
-	switch (count) {
-	case 0:
-		message = g_strdup (_("No contacts"));
-		break;
-	default:
-		message = g_strdup_printf (ngettext("%d contact", "%d contacts", count), count);
-		break;
-	}
-
-	g_signal_emit (model,
-		       eab_model_signals [FOLDER_BAR_MESSAGE], 0,
-		       message);
-
-	g_free (message);
-}
-
-static void
-create_contact(EBookView *book_view,
-	       const GList *contacts,
-	       EABModel *model)
-{
-	int old_count = model->data_count;
-	int length = g_list_length ((GList *)contacts);
-
-	if (model->data_count + length > model->allocated_count) {
-		while (model->data_count + length > model->allocated_count)
-			model->allocated_count = model->allocated_count * 2 + 1;
-		model->data = g_renew(EContact *, model->data, model->allocated_count);
-	}
-
-	for ( ; contacts; contacts = contacts->next) {
-		model->data[model->data_count++] = contacts->data;
-		g_object_ref (contacts->data);
-	}
-
-	g_signal_emit (model,
-		       eab_model_signals [CONTACT_ADDED], 0,
-		       old_count, model->data_count - old_count);
-
-	update_folder_bar_message (model);
-}
-
-static void
-remove_contact(EBookView *book_view,
-	       GList *ids,
-	       EABModel *model)
-{
-	/* XXX we should keep a hash around instead of this O(n*m) loop */
-	gint i = 0;
-	GList *l;
-	GArray *indices;
-
-	indices = g_array_new (FALSE, FALSE, sizeof (gint));
-	for (l = ids; l; l = l->next) {
-		char *id = l->data;
-		for ( i = 0; i < model->data_count; i++) {
-			if ( !strcmp(e_contact_get_const (model->data[i], E_CONTACT_UID), id) ) {
-				g_object_unref (model->data[i]);
-				memmove(model->data + i, model->data + i + 1, (model->data_count - i - 1) * sizeof (EContact *));
-				model->data_count--;
-				g_array_append_val (indices, i);
-				break;
-			}
-		}
-	}
-	g_signal_emit (model,
-		       eab_model_signals [CONTACTS_REMOVED], 0,
-		       indices);
-	g_array_free (indices, FALSE);
-	update_folder_bar_message (model);
-}
-
-static void
-modify_contact(EBookView *book_view,
-	       const GList *contacts,
-	       EABModel *model)
-{
-	for ( ; contacts; contacts = contacts->next) {
-		int i;
-		for ( i = 0; i < model->data_count; i++) {
-			if ( !strcmp(e_contact_get_const(model->data[i], E_CONTACT_UID),
-				     e_contact_get_const(E_CONTACT(contacts->data), E_CONTACT_UID)) ) {
-				g_object_unref (model->data[i]);
-				model->data[i] = e_contact_duplicate(E_CONTACT(contacts->data));
-				g_signal_emit (model,
-					       eab_model_signals [CONTACT_CHANGED], 0,
-					       i);
-				break;
-			}
-		}
-	}
-}
-
-static void
-status_message (EBookView *book_view,
-		char* status,
-		EABModel *model)
-{
-	g_signal_emit (model,
-		       eab_model_signals [STATUS_MESSAGE], 0,
-		       status);
-}
-
-static void
-sequence_complete (EBookView *book_view,
-		   EBookViewStatus status,
-		   EABModel *model)
-{
-	model->search_in_progress = FALSE;
-	status_message (book_view, NULL, model);
-	g_signal_emit (model,
-		       eab_model_signals [SEARCH_RESULT], 0,
-		       status);
-	g_signal_emit (model,
-		       eab_model_signals [STOP_STATE_CHANGED], 0);
-}
-
-static void
-writable_status (EBook *book,
-		 gboolean writable,
-		 EABModel *model)
-{
-	if (!model->editable_set) {
-		model->editable = writable;
-
-		g_signal_emit (model,
-			       eab_model_signals [WRITABLE_STATUS], 0,
-			       writable);
-	}
-}
-
-static void
-backend_died (EBook *book,
-	      EABModel *model)
-{
-	g_signal_emit (model,
-		       eab_model_signals [BACKEND_DIED], 0);
-}
-
-static void
-eab_model_class_init (GObjectClass *object_class)
-{
-	parent_class = g_type_class_ref (PARENT_TYPE);
-
-	object_class->dispose = addressbook_dispose;
-	object_class->set_property   = eab_model_set_property;
-	object_class->get_property   = eab_model_get_property;
-
-	g_object_class_install_property (object_class, PROP_BOOK,
-					 g_param_spec_object ("book",
-							      _("Book"),
-							      /*_( */"XXX blurb" /*)*/,
-							      E_TYPE_BOOK,
-							      G_PARAM_READWRITE));
-
-	g_object_class_install_property (object_class, PROP_QUERY,
-					 g_param_spec_string ("query",
-							      _("Query"),
-							      /*_( */"XXX blurb" /*)*/,
-							      NULL,
-							      G_PARAM_READWRITE));
-
-	g_object_class_install_property (object_class, PROP_EDITABLE,
-					 g_param_spec_boolean ("editable",
-							       _("Editable"),
-							       /*_( */"XXX blurb" /*)*/,
-							       FALSE,
-							       G_PARAM_READWRITE));
-
-	eab_model_signals [WRITABLE_STATUS] =
-		g_signal_new ("writable_status",
-			      G_OBJECT_CLASS_TYPE (object_class),
-			      G_SIGNAL_RUN_LAST,
-			      G_STRUCT_OFFSET (EABModelClass, writable_status),
-			      NULL, NULL,
-			      eab_marshal_NONE__BOOL,
-			      G_TYPE_NONE,
-			      1, G_TYPE_BOOLEAN);
-
-	eab_model_signals [STATUS_MESSAGE] =
-		g_signal_new ("status_message",
-			      G_OBJECT_CLASS_TYPE (object_class),
-			      G_SIGNAL_RUN_LAST,
-			      G_STRUCT_OFFSET (EABModelClass, status_message),
-			      NULL, NULL,
-			      eab_marshal_NONE__POINTER,
-			      G_TYPE_NONE,
-			      1, G_TYPE_POINTER);
-
-	eab_model_signals [SEARCH_STARTED] =
-		g_signal_new ("search_started",
-			      G_OBJECT_CLASS_TYPE (object_class),
-			      G_SIGNAL_RUN_LAST,
-			      G_STRUCT_OFFSET (EABModelClass, search_started),
-			      NULL, NULL,
-			      eab_marshal_NONE__NONE,
-			      G_TYPE_NONE, 0);
-	
-	eab_model_signals [SEARCH_RESULT] =
-		g_signal_new ("search_result",
-			      G_OBJECT_CLASS_TYPE (object_class),
-			      G_SIGNAL_RUN_LAST,
-			      G_STRUCT_OFFSET (EABModelClass, search_result),
-			      NULL, NULL,
-			      eab_marshal_NONE__INT,
-			      G_TYPE_NONE, 1, G_TYPE_INT);
-	
-	eab_model_signals [FOLDER_BAR_MESSAGE] =
-		g_signal_new ("folder_bar_message",
-			      G_OBJECT_CLASS_TYPE (object_class),
-			      G_SIGNAL_RUN_LAST,
-			      G_STRUCT_OFFSET (EABModelClass, folder_bar_message),
-			      NULL, NULL,
-			      eab_marshal_NONE__POINTER,
-			      G_TYPE_NONE, 1, G_TYPE_POINTER);
-
-	eab_model_signals [CONTACT_ADDED] =
-		g_signal_new ("contact_added",
-			      G_OBJECT_CLASS_TYPE (object_class),
-			      G_SIGNAL_RUN_LAST,
-			      G_STRUCT_OFFSET (EABModelClass, contact_added),
-			      NULL, NULL,
-			      eab_marshal_NONE__INT_INT,
-			      G_TYPE_NONE, 2, G_TYPE_INT, G_TYPE_INT);
-
-	eab_model_signals [CONTACTS_REMOVED] =
-		g_signal_new ("contacts_removed",
-			      G_OBJECT_CLASS_TYPE (object_class),
-			      G_SIGNAL_RUN_LAST,
-			      G_STRUCT_OFFSET (EABModelClass, contacts_removed),
-			      NULL, NULL,
-			      eab_marshal_NONE__POINTER,
-			      G_TYPE_NONE, 1, G_TYPE_POINTER);
-
-	eab_model_signals [CONTACT_CHANGED] =
-		g_signal_new ("contact_changed",
-			      G_OBJECT_CLASS_TYPE (object_class),
-			      G_SIGNAL_RUN_LAST,
-			      G_STRUCT_OFFSET (EABModelClass, contact_changed),
-			      NULL, NULL,
-			      eab_marshal_NONE__INT,
-			      G_TYPE_NONE, 1, G_TYPE_INT);
-
-	eab_model_signals [MODEL_CHANGED] =
-		g_signal_new ("model_changed",
-			      G_OBJECT_CLASS_TYPE (object_class),
-			      G_SIGNAL_RUN_LAST,
-			      G_STRUCT_OFFSET (EABModelClass, model_changed),
-			      NULL, NULL,
-			      eab_marshal_NONE__NONE,
-			      G_TYPE_NONE, 0);
-
-	eab_model_signals [STOP_STATE_CHANGED] =
-		g_signal_new ("stop_state_changed",
-			      G_OBJECT_CLASS_TYPE (object_class),
-			      G_SIGNAL_RUN_LAST,
-			      G_STRUCT_OFFSET (EABModelClass, stop_state_changed),
-			      NULL, NULL,
-			      eab_marshal_NONE__NONE,
-			      G_TYPE_NONE, 0);
-
-	eab_model_signals [BACKEND_DIED] =
-		g_signal_new ("backend_died",
-			      G_OBJECT_CLASS_TYPE (object_class),
-			      G_SIGNAL_RUN_LAST,
-			      G_STRUCT_OFFSET (EABModelClass, backend_died),
-			      NULL, NULL,
-			      eab_marshal_NONE__NONE,
-			      G_TYPE_NONE, 0);
-}
-
-static void
-eab_model_init (GObject *object)
-{
-	EABModel *model = EAB_MODEL(object);
-	model->book = NULL;
-	model->query = e_book_query_any_field_contains ("");
-	model->book_view = NULL;
-	model->create_contact_id = 0;
-	model->remove_contact_id = 0;
-	model->modify_contact_id = 0;
-	model->status_message_id = 0;
-	model->writable_status_id = 0;
-	model->backend_died_id = 0;
-	model->sequence_complete_id = 0;
-	model->data = NULL;
-	model->data_count = 0;
-	model->allocated_count = 0;
-	model->search_in_progress = FALSE;
-	model->editable = FALSE;
-	model->editable_set = FALSE;
-	model->first_get_view = TRUE;
-}
-
-static void
-book_view_loaded (EBook *book, EBookStatus status, EBookView *book_view, gpointer closure)
-{
-	EABModel *model = closure;
-
-	if (status != E_BOOK_ERROR_OK) {
-		eab_error_dialog (_("Error getting book view"), status);
-		return;
-	}
-
-	remove_book_view (model);
-	free_data (model);
-
-	model->book_view = book_view;
-	if (model->book_view)
-		g_object_ref (model->book_view);
-	model->create_contact_id = g_signal_connect(model->book_view,
-						    "contacts_added",
-						    G_CALLBACK (create_contact),
-						    model);
-	model->remove_contact_id = g_signal_connect(model->book_view,
-						    "contacts_removed",
-						    G_CALLBACK (remove_contact),
-						    model);
-	model->modify_contact_id = g_signal_connect(model->book_view,
-						    "contacts_changed",
-						    G_CALLBACK(modify_contact),
-						    model);
-	model->status_message_id = g_signal_connect(model->book_view,
-						    "status_message",
-						    G_CALLBACK(status_message),
-						    model);
-	model->sequence_complete_id = g_signal_connect(model->book_view,
-						       "sequence_complete",
-						       G_CALLBACK(sequence_complete),
-						       model);
-
-	model->search_in_progress = TRUE;
-	g_signal_emit (model,
-		       eab_model_signals [MODEL_CHANGED], 0);
-	g_signal_emit (model,
-		       eab_model_signals [SEARCH_STARTED], 0);
-	g_signal_emit (model,
-		       eab_model_signals [STOP_STATE_CHANGED], 0);
-
-	e_book_view_start (model->book_view);
-}
-
-static void
-get_view (EABModel *model)
-{
-	gboolean success;
-
-	if (model->book && model->query) {
-		ESource *source;
-		const char *limit_str;
-		int limit = -1;
-
-		source = e_book_get_source (model->book);
-
-		limit_str = e_source_get_property (source, "limit");
-		if (limit_str && *limit_str)
-			limit = atoi (limit_str);
-
-		remove_book_view(model);
-
-		if (model->first_get_view) {
-			model->first_get_view = FALSE;
-
-			if (e_book_check_static_capability (model->book, "do-initial-query")) {
-				success = e_book_async_get_book_view (model->book, model->query, NULL, limit, book_view_loaded, model);
-			} else {
-				free_data (model);
-
-				g_signal_emit (model,
-					       eab_model_signals [MODEL_CHANGED], 0);
-				g_signal_emit (model,
-					       eab_model_signals [STOP_STATE_CHANGED], 0);
-				return;
-			}
-		}
-		else
-			success = e_book_async_get_book_view (model->book, model->query, NULL, limit, book_view_loaded, model);
-
-	}
-}
-
-static gboolean
-get_view_idle (EABModel *model)
-{
-	model->book_view_idle_id = 0;
-	get_view (model);
-	g_object_unref (model);
-	return FALSE;
-}
-
-
-EContact *
-eab_model_get_contact(EABModel *model,
-		      int       row)
-{
-	if (model->data && 0 <= row && row < model->data_count) {
-		return e_contact_duplicate (model->data[row]);
-	}
-	return NULL;
-}
-
-static void
-eab_model_set_property (GObject *object, guint prop_id, const GValue *value, GParamSpec *pspec)
-{
-	EABModel *model;
-	gboolean need_get_book_view = FALSE;
-
-	model = EAB_MODEL (object);
-	
-	switch (prop_id){
-	case PROP_BOOK:
-		if (model->book) {
-			if (model->writable_status_id)
-				g_signal_handler_disconnect (model->book,
-							     model->writable_status_id);
-			model->writable_status_id = 0;
-
-			if (model->backend_died_id)
-				g_signal_handler_disconnect (model->book,
-							     model->backend_died_id);
-			model->backend_died_id = 0;
-
-			g_object_unref (model->book);
-		}
-		model->book = E_BOOK(g_value_get_object (value));
-		if (model->book) {
-			model->writable_status_id =
-				g_signal_connect (model->book,
-						  "writable_status",
-						  G_CALLBACK (writable_status), model);
-			model->backend_died_id =
-				g_signal_connect (model->book,
-						  "backend_died",
-						  G_CALLBACK (backend_died), model);
-
-			if (!model->editable_set) {
-				model->editable = e_book_is_writable (model->book);
-
-				g_signal_emit (model,
-					       eab_model_signals [WRITABLE_STATUS], 0,
-					       model->editable);
-			}
-
-			model->first_get_view = TRUE;
-			g_object_ref (model->book);
-			need_get_book_view = TRUE;
-		}
-		break;
-	case PROP_QUERY:
-		if (model->query)
-			e_book_query_unref (model->query);
-		model->query = e_book_query_from_string (g_value_get_string (value));
-		need_get_book_view = TRUE;
-		break;
-	case PROP_EDITABLE:
-		model->editable = g_value_get_boolean (value);
-		model->editable_set = TRUE;
-		break;
-	default:
-		G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
-		break;
-	}
-
-	if (need_get_book_view) {
-		if (!model->book_view_idle_id) {
-			g_object_ref (model);
-			model->book_view_idle_id = g_idle_add ((GSourceFunc)get_view_idle, model);
-		}
-	}
-
-}
-
-static void
-eab_model_get_property (GObject *object, guint prop_id, GValue *value, GParamSpec *pspec)
-{
-	EABModel *eab_model;
-
-	eab_model = EAB_MODEL (object);
-
-	switch (prop_id) {
-	case PROP_BOOK:
-		g_value_set_object (value, eab_model->book);
-		break;
-	case PROP_QUERY: {
-		char *query_string = e_book_query_to_string (eab_model->query);
-		g_value_set_string (value, query_string);
-		break;
-	}
-	case PROP_EDITABLE:
-		g_value_set_boolean (value, eab_model->editable);
-		break;
-	default:
-		G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
-		break;
-	}
-}
-
-GType
-eab_model_get_type (void)
-{
-	static GType type = 0;
-
-	if (!type) {
-		static const GTypeInfo info =  {
-			sizeof (EABModelClass),
-			NULL,           /* base_init */
-			NULL,           /* base_finalize */
-			(GClassInitFunc) eab_model_class_init,
-			NULL,           /* class_finalize */
-			NULL,           /* class_data */
-			sizeof (EABModel),
-			0,             /* n_preallocs */
-			(GInstanceInitFunc) eab_model_init,
-		};
-
-		type = g_type_register_static (PARENT_TYPE, "EABModel", &info, 0);
-	}
-
-	return type;
-}
-
-EABModel*
-eab_model_new (void)
-{
-	EABModel *et;
-
-	et = g_object_new (EAB_TYPE_MODEL, NULL);
-	
-	return et;
-}
-
-void   eab_model_stop    (EABModel *model)
-{
-	remove_book_view(model);
-	g_signal_emit (model,
-		       eab_model_signals [STOP_STATE_CHANGED], 0);
-	g_signal_emit (model,
-		       eab_model_signals [STATUS_MESSAGE], 0,
-		       "Search Interrupted.");
-}
-
-gboolean
-eab_model_can_stop (EABModel *model)
-{
-	return model->search_in_progress;
-}
-
-void
-eab_model_force_folder_bar_message (EABModel *model)
-{
-	update_folder_bar_message (model);
-}
-
-int
-eab_model_contact_count (EABModel *model)
-{
-	return model->data_count;
-}
-
-const EContact *
-eab_model_contact_at (EABModel *model, int index)
-{
-	return model->data[index];
-}
-
-gboolean
-eab_model_editable (EABModel *model)
-{
-	return model->editable;
-}
-
-EBook *
-eab_model_get_ebook (EABModel *model)
-{
-	return model->book;
-}
diff --git a/addressbook/gui/widgets/e-addressbook-model.h b/addressbook/gui/widgets/e-addressbook-model.h
deleted file mode 100644
index 8ccc4f0693..0000000000
--- a/addressbook/gui/widgets/e-addressbook-model.h
+++ /dev/null
@@ -1,82 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-#ifndef _EAB_MODEL_H_
-#define _EAB_MODEL_H_
-
-#include <glib.h>
-#include <glib-object.h>
-#include <libebook/e-book.h>
-#include <libebook/e-book-view.h>
-
-#define EAB_TYPE_MODEL                  (eab_model_get_type ())
-#define EAB_MODEL(o)                    (G_TYPE_CHECK_INSTANCE_CAST ((o), EAB_TYPE_MODEL, EABModel))
-#define EAB_MODEL_CLASS(k)              (G_TYPE_CHECK_CLASS_CAST((k), EAB_TYPE_MODEL, EABModelClass))
-#define E_IS_ADDRESSBOOK_MODEL(o)       (G_TYPE_CHECK_INSTANCE_TYPE ((o), EAB_TYPE_MODEL))
-#define E_IS_ADDRESSBOOK_MODEL_CLASS(k) (G_TYPE_CHECK_CLASS_TYPE ((k), EAB_TYPE_MODEL))
-
-typedef struct _EABModel EABModel;
-typedef struct _EABModelClass EABModelClass;
-
-struct _EABModel {
-	GObject parent;
-
-	/* item specific fields */
-	EBook *book;
-	EBookQuery *query;
-	EBookView *book_view;
-
-	int book_view_idle_id;
-
-	EContact **data;
-	int data_count;
-	int allocated_count;
-
-	int create_contact_id, remove_contact_id, modify_contact_id;
-	int status_message_id, writable_status_id, sequence_complete_id;
-	int backend_died_id;
-
-	guint search_in_progress : 1;
-	guint editable : 1;
-	guint editable_set : 1;
-	guint first_get_view : 1;
-};
-
-
-struct _EABModelClass {
-	GObjectClass parent_class;
-
-	/*
-	 * Signals
-	 */
-	void (*writable_status)    (EABModel *model, gboolean writable);
-	void (*search_started)     (EABModel *model);
-	void (*search_result)      (EABModel *model, EBookViewStatus status);
-	void (*status_message)     (EABModel *model, const gchar *message);
-	void (*folder_bar_message) (EABModel *model, const gchar *message);
-	void (*contact_added)      (EABModel *model, gint index, gint count);
-	void (*contacts_removed)    (EABModel *model, gpointer id_list);
-	void (*contact_changed)    (EABModel *model, gint index);
-	void (*model_changed)      (EABModel *model);
-	void (*stop_state_changed) (EABModel *model);
-	void (*backend_died)       (EABModel *model);
-};
-
-
-GType              eab_model_get_type                  (void);
-EABModel          *eab_model_new                       (void);
-
-/* Returns object with ref count of 1. */
-EContact          *eab_model_get_contact               (EABModel *model,
-							int                row);
-EBook             *eab_model_get_ebook                 (EABModel *model);
-
-void               eab_model_stop                      (EABModel *model);
-gboolean           eab_model_can_stop                  (EABModel *model);
-
-void               eab_model_force_folder_bar_message  (EABModel *model);
-
-int                eab_model_contact_count             (EABModel *model);
-const EContact    *eab_model_contact_at                (EABModel *model,
-							int                index);
-gboolean           eab_model_editable                  (EABModel *model);
-
-#endif /* _EAB_MODEL_H_ */
diff --git a/addressbook/gui/widgets/e-addressbook-reflow-adapter.c b/addressbook/gui/widgets/e-addressbook-reflow-adapter.c
deleted file mode 100644
index 96a7ceaa91..0000000000
--- a/addressbook/gui/widgets/e-addressbook-reflow-adapter.c
+++ /dev/null
@@ -1,523 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-
-
-#include <config.h>
-#include <string.h>
-
-#include <libgnome/gnome-i18n.h>
-#include "eab-marshal.h"
-#include "e-addressbook-reflow-adapter.h"
-#include "e-addressbook-model.h"
-#include "e-addressbook-view.h"
-#include "eab-gui-util.h"
-
-#include "e-minicard.h"
-#include <gal/widgets/e-gui-utils.h>
-#include "addressbook/printing/e-contact-print.h"
-#include "addressbook/printing/e-contact-print-envelope.h"
-
-
-struct _EAddressbookReflowAdapterPrivate {
-	EABModel *model;
-
-	gboolean loading;
-
-	int create_contact_id, remove_contact_id, modify_contact_id, model_changed_id;
-	int search_started_id, search_result_id;
-};
-
-#define PARENT_TYPE e_reflow_model_get_type()
-static EReflowModel *parent_class;
-
-#define d(x)
-
-enum {
-	PROP_0,
-	PROP_BOOK,
-	PROP_QUERY,
-	PROP_EDITABLE,
-	PROP_MODEL,
-};
-
-enum {
-	DRAG_BEGIN,
-	LAST_SIGNAL
-};
-
-static guint e_addressbook_reflow_adapter_signals [LAST_SIGNAL] = {0, };
-
-static void
-unlink_model(EAddressbookReflowAdapter *adapter)
-{
-	EAddressbookReflowAdapterPrivate *priv = adapter->priv;
-
-	if (priv->model && priv->create_contact_id)
-		g_signal_handler_disconnect (priv->model,
-					     priv->create_contact_id);
-	if (priv->model && priv->remove_contact_id)
-		g_signal_handler_disconnect (priv->model,
-					     priv->remove_contact_id);
-	if (priv->model && priv->modify_contact_id)
-		g_signal_handler_disconnect (priv->model,
-					     priv->modify_contact_id);
-	if (priv->model && priv->model_changed_id)
-		g_signal_handler_disconnect (priv->model,
-					     priv->model_changed_id);
-	if (priv->model && priv->search_started_id)
-		g_signal_handler_disconnect (priv->model,
-					     priv->search_started_id);
-	if (priv->model && priv->search_result_id)
-		g_signal_handler_disconnect (priv->model,
-					     priv->search_result_id);
-
-	priv->create_contact_id = 0;
-	priv->remove_contact_id = 0;
-	priv->modify_contact_id = 0;
-	priv->model_changed_id = 0;
-	priv->search_started_id = 0;
-	priv->search_result_id = 0;
-
-	if (priv->model)
-		g_object_unref (priv->model);
-
-	priv->model = NULL;
-}
-
-
-static int
-text_height (PangoLayout *layout, const gchar *text)
-{
-	int height;
-
-	pango_layout_set_text (layout, text, -1);
-
-	pango_layout_get_pixel_size (layout, NULL, &height);
-
-	return height;
-}
-
-static void
-addressbook_dispose(GObject *object)
-{
-	EAddressbookReflowAdapter *adapter = E_ADDRESSBOOK_REFLOW_ADAPTER(object);
-
-	unlink_model (adapter);
-}
-
-static void
-addressbook_set_width (EReflowModel *erm, int width)
-{
-}
-
-/* This function returns the number of items in our EReflowModel. */
-static int
-addressbook_count (EReflowModel *erm)
-{
-	EAddressbookReflowAdapter *adapter = E_ADDRESSBOOK_REFLOW_ADAPTER(erm);
-	EAddressbookReflowAdapterPrivate *priv = adapter->priv;
-
-	return eab_model_contact_count (priv->model);
-}
-
-/* This function returns the height of the minicontact in question */
-static int
-addressbook_height (EReflowModel *erm, int i, GnomeCanvasGroup *parent)
-{
-	EAddressbookReflowAdapter *adapter = E_ADDRESSBOOK_REFLOW_ADAPTER(erm);
-	EAddressbookReflowAdapterPrivate *priv = adapter->priv;
-	EContactField field;
-	int count = 0;
-	char *string;
-	EContact *contact = (EContact*)eab_model_contact_at (priv->model, i);
-	PangoLayout *layout = gtk_widget_create_pango_layout (GTK_WIDGET (GNOME_CANVAS_ITEM (parent)->canvas), "");
-	int height;
-
-	string = e_contact_get(contact, E_CONTACT_FILE_AS);
-	height = text_height (layout, string ? string : "") + 10.0;
-	g_free(string);
-
-	for(field = E_CONTACT_FULL_NAME; field != E_CONTACT_LAST_SIMPLE_STRING && count < 5; field++) {
-
-		if (field == E_CONTACT_FAMILY_NAME || field == E_CONTACT_GIVEN_NAME)
-			continue;
-
-		string = e_contact_get(contact, field);
-		if (string && *string) {
-			int this_height;
-			int field_text_height;
-
-			this_height = text_height (layout, e_contact_pretty_name(field));
-
-			field_text_height = text_height (layout, string);
-			if (this_height < field_text_height)
-				this_height = field_text_height;
-
-			this_height += 3;
-
-			height += this_height;
-			count ++;
-		}
-		g_free (string);
-	}
-	height += 2;
-
-	g_object_unref (layout);
-
-	return height;
-}
-
-static int
-addressbook_compare (EReflowModel *erm, int n1, int n2)
-{
-	EAddressbookReflowAdapter *adapter = E_ADDRESSBOOK_REFLOW_ADAPTER(erm);
-	EAddressbookReflowAdapterPrivate *priv = adapter->priv;
-	EContact *contact1, *contact2;
-
-	if (priv->loading) {
-		return n1-n2;
-	}
-	else {
-		contact1 = (EContact*)eab_model_contact_at (priv->model, n1);
-		contact2 = (EContact*)eab_model_contact_at (priv->model, n2);
-
-		if (contact1 && contact2) {
-			const char *file_as1, *file_as2;
-			file_as1 = e_contact_get_const (contact1, E_CONTACT_FILE_AS);
-			file_as2 = e_contact_get_const (contact2, E_CONTACT_FILE_AS);
-			if (file_as1 && file_as2)
-				return g_utf8_collate(file_as1, file_as2);
-			if (file_as1)
-				return -1;
-			if (file_as2)
-				return 1;
-			return strcmp(e_contact_get_const (contact1, E_CONTACT_UID),
-				      e_contact_get_const (contact2, E_CONTACT_UID));
-		}
-		if (contact1)
-			return -1;
-		if (contact2)
-			return 1;
-		return 0;
-	}
-}
-
-static int
-adapter_drag_begin (EMinicard *card, GdkEvent *event, EAddressbookReflowAdapter *adapter)
-{
-	gint ret_val = 0;
-
-	g_signal_emit (adapter,
-		       e_addressbook_reflow_adapter_signals[DRAG_BEGIN], 0,
-		       event, &ret_val);
-
-	return ret_val;
-}
-
-static GnomeCanvasItem *
-addressbook_incarnate (EReflowModel *erm, int i, GnomeCanvasGroup *parent)
-{
-	EAddressbookReflowAdapter *adapter = E_ADDRESSBOOK_REFLOW_ADAPTER(erm);
-	EAddressbookReflowAdapterPrivate *priv = adapter->priv;
-	GnomeCanvasItem *item;
-
-	item = gnome_canvas_item_new(parent,
-				     e_minicard_get_type(),
-				     "contact", eab_model_contact_at (priv->model, i),
-				     "editable", eab_model_editable (priv->model),
-				     NULL);
-
-#if 0
-	g_signal_connect (item, "selected",
-			  G_CALLBACK(card_selected), 0, emvm);
-#endif
-
-	g_signal_connect (item, "drag_begin",
-			  G_CALLBACK(adapter_drag_begin), adapter);
-	
-	return item;
-}
-
-static void
-addressbook_reincarnate (EReflowModel *erm, int i, GnomeCanvasItem *item)
-{
-	EAddressbookReflowAdapter *adapter = E_ADDRESSBOOK_REFLOW_ADAPTER(erm);
-	EAddressbookReflowAdapterPrivate *priv = adapter->priv;
-
-	gnome_canvas_item_set(item,
-			      "contact", eab_model_contact_at (priv->model, i),
-			      NULL);
-}
-
-static void
-create_contact (EABModel *model,
-		gint index, gint count,
-		EAddressbookReflowAdapter *adapter)
-{
-	e_reflow_model_items_inserted (E_REFLOW_MODEL (adapter),
-				       index,
-				       count);
-}
-
-static void
-remove_contacts (EABModel *model,
-		gpointer data,
-		EAddressbookReflowAdapter *adapter)
-{
-	GArray *indices = (GArray *) data;
-	int count = indices->len;
-	
-	if (count == 1)
-		e_reflow_model_item_removed (E_REFLOW_MODEL (adapter), g_array_index (indices, gint, 0));
-	else 
-		e_reflow_model_changed (E_REFLOW_MODEL (adapter));
-	
-}
-
-static void
-modify_contact (EABModel *model,
-		gint index,
-		EAddressbookReflowAdapter *adapter)
-{
-	e_reflow_model_item_changed (E_REFLOW_MODEL (adapter), index);
-}
-
-static void
-model_changed (EABModel *model,
-	       EAddressbookReflowAdapter *adapter)
-{
-	e_reflow_model_changed (E_REFLOW_MODEL (adapter));
-}
-
-static void
-search_started (EABModel *model,
-		EAddressbookReflowAdapter *adapter)
-{
-	EAddressbookReflowAdapterPrivate *priv = adapter->priv;
-
-	priv->loading = TRUE;
-}
-
-static void
-search_result (EABModel *model,
-	       EBookViewStatus status,
-	       EAddressbookReflowAdapter *adapter)
-{
-	EAddressbookReflowAdapterPrivate *priv = adapter->priv;
-
-	priv->loading = FALSE;
-
-	e_reflow_model_comparison_changed (E_REFLOW_MODEL (adapter));
-}
-
-static void
-addressbook_set_property (GObject *object, guint prop_id, const GValue *value, GParamSpec *pspec)
-{
-	EAddressbookReflowAdapter *adapter = E_ADDRESSBOOK_REFLOW_ADAPTER(object);
-	EAddressbookReflowAdapterPrivate *priv = adapter->priv;
-
-	switch (prop_id) {
-	case PROP_BOOK:
-		g_object_set (priv->model,
-			      "book", g_value_get_object (value),
-			      NULL);
-		break;
-	case PROP_QUERY:
-		g_object_set (priv->model,
-			      "query", g_value_get_string (value),
-			      NULL);
-		break;
-	case PROP_EDITABLE:
-		g_object_set (priv->model,
-			      "editable", g_value_get_boolean (value),
-			      NULL);
-		break;
-	default:
-		G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
-		break;
-	}
-}
-
-static void
-addressbook_get_property (GObject *object, guint prop_id, GValue *value, GParamSpec *pspec)
-{
-	EAddressbookReflowAdapter *adapter = E_ADDRESSBOOK_REFLOW_ADAPTER(object);
-	EAddressbookReflowAdapterPrivate *priv = adapter->priv;
-
-	switch (prop_id) {
-	case PROP_BOOK: {
-		g_object_get_property (G_OBJECT (priv->model),
-				       "book", value);
-		break;
-	}
-	case PROP_QUERY: {
-		g_object_get_property (G_OBJECT (priv->model),
-				       "query", value);
-		break;
-	}
-	case PROP_EDITABLE: {
-		g_object_get_property (G_OBJECT (priv->model),
-				       "editable", value);
-		break;
-	}
-	case PROP_MODEL:
-		g_value_set_object (value, priv->model);
-		break;
-	default:
-		G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
-		break;
-	}
-}
-
-static void
-e_addressbook_reflow_adapter_class_init (GObjectClass *object_class)
-{
-	EReflowModelClass *model_class = (EReflowModelClass *) object_class;
-
-	parent_class = g_type_class_peek_parent (object_class);
-
-	object_class->set_property = addressbook_set_property;
-	object_class->get_property = addressbook_get_property;
-	object_class->dispose = addressbook_dispose;
-
-	g_object_class_install_property (object_class, PROP_BOOK, 
-					 g_param_spec_object ("book",
-							      _("Book"),
-							      /*_( */"XXX blurb" /*)*/,
-							      E_TYPE_BOOK,
-							      G_PARAM_READWRITE));
-
-	g_object_class_install_property (object_class, PROP_QUERY,
-					 g_param_spec_string ("query",
-							      _("Query"),
-							      /*_( */"XXX blurb" /*)*/,
-							      NULL,
-							      G_PARAM_READWRITE));
-
-	g_object_class_install_property (object_class, PROP_EDITABLE,
-					 g_param_spec_boolean ("editable",
-							       _("Editable"),
-							       /*_( */"XXX blurb" /*)*/,
-							       FALSE,
-							       G_PARAM_READWRITE));
-
-	g_object_class_install_property (object_class, PROP_MODEL,
-					 g_param_spec_object ("model",
-							       _("Model"),
-							      /*_( */"XXX blurb" /*)*/,
-							      EAB_TYPE_MODEL,
-							      G_PARAM_READABLE));
-
-	e_addressbook_reflow_adapter_signals [DRAG_BEGIN] =
-		g_signal_new ("drag_begin",
-			      G_OBJECT_CLASS_TYPE(object_class),
-			      G_SIGNAL_RUN_LAST,
-			      G_STRUCT_OFFSET (EAddressbookReflowAdapterClass, drag_begin),
-			      NULL, NULL,
-			      eab_marshal_INT__POINTER,
-			      G_TYPE_INT, 1, G_TYPE_POINTER);
-
-	model_class->set_width = addressbook_set_width;
-	model_class->count = addressbook_count;
-	model_class->height = addressbook_height;
-	model_class->compare = addressbook_compare;
-	model_class->incarnate = addressbook_incarnate;
-	model_class->reincarnate = addressbook_reincarnate;
-}
-
-static void
-e_addressbook_reflow_adapter_init (GtkObject *object)
-{
-	EAddressbookReflowAdapter *adapter = E_ADDRESSBOOK_REFLOW_ADAPTER(object);
-	EAddressbookReflowAdapterPrivate *priv;
-
-	priv = adapter->priv = g_new0 (EAddressbookReflowAdapterPrivate, 1);
-
-	priv->loading = FALSE;
-	priv->create_contact_id = 0;
-	priv->remove_contact_id = 0;
-	priv->modify_contact_id = 0;
-	priv->model_changed_id = 0;
-	priv->search_started_id = 0;
-	priv->search_result_id = 0;
-}
-
-GType
-e_addressbook_reflow_adapter_get_type (void)
-{
-	static GType type = 0;
-
-	if (!type) {
-		static const GTypeInfo info =  {
-			sizeof (EAddressbookReflowAdapterClass),
-			NULL,           /* base_init */
-			NULL,           /* base_finalize */
-			(GClassInitFunc) e_addressbook_reflow_adapter_class_init,
-			NULL,           /* class_finalize */
-			NULL,           /* class_data */
-			sizeof (EAddressbookReflowAdapter),
-			0,             /* n_preallocs */
-			(GInstanceInitFunc) e_addressbook_reflow_adapter_init,
-		};
-
-		type = g_type_register_static (PARENT_TYPE, "EAddressbookReflowAdapter", &info, 0);
-	}
-
-	return type;
-}
-
-void
-e_addressbook_reflow_adapter_construct (EAddressbookReflowAdapter *adapter,
-					EABModel *model)
-{
-	EAddressbookReflowAdapterPrivate *priv = adapter->priv;
-
-	priv->model = model;
-	g_object_ref (priv->model);
-
-	priv->create_contact_id = g_signal_connect(priv->model,
-						"contact_added",
-						G_CALLBACK(create_contact),
-						adapter);
-	priv->remove_contact_id = g_signal_connect(priv->model,
-						"contacts_removed",
-						G_CALLBACK(remove_contacts),
-						adapter);
-	priv->modify_contact_id = g_signal_connect(priv->model,
-						"contact_changed",
-						G_CALLBACK(modify_contact),
-						adapter);
-	priv->model_changed_id = g_signal_connect(priv->model,
-						  "model_changed",
-						  G_CALLBACK(model_changed),
-						  adapter);
-	priv->search_started_id = g_signal_connect(priv->model,
-						   "search_started",
-						   G_CALLBACK(search_started),
-						   adapter);
-	priv->search_result_id = g_signal_connect(priv->model,
-						  "search_result",
-						  G_CALLBACK(search_result),
-						  adapter);
-}
-
-EReflowModel *
-e_addressbook_reflow_adapter_new (EABModel *model)
-{
-	EAddressbookReflowAdapter *et;
-
-	et = g_object_new (E_TYPE_ADDRESSBOOK_REFLOW_ADAPTER, NULL);
-
-	e_addressbook_reflow_adapter_construct (et, model);
-
-	return E_REFLOW_MODEL(et);
-}
-
-
-EContact *
-e_addressbook_reflow_adapter_get_contact (EAddressbookReflowAdapter *adapter,
-					  int index)
-{
-	EAddressbookReflowAdapterPrivate *priv = adapter->priv;
-
-	return eab_model_get_contact (priv->model, index);
-}
diff --git a/addressbook/gui/widgets/e-addressbook-reflow-adapter.h b/addressbook/gui/widgets/e-addressbook-reflow-adapter.h
deleted file mode 100644
index 1321b27bb4..0000000000
--- a/addressbook/gui/widgets/e-addressbook-reflow-adapter.h
+++ /dev/null
@@ -1,44 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-#ifndef _E_ADDRESSBOOK_REFLOW_ADAPTER_H_
-#define _E_ADDRESSBOOK_REFLOW_ADAPTER_H_
-
-#include <gal/widgets/e-reflow-model.h>
-#include <libebook/e-contact.h>
-#include "e-addressbook-model.h"
-
-#define E_TYPE_ADDRESSBOOK_REFLOW_ADAPTER        (e_addressbook_reflow_adapter_get_type ())
-#define E_ADDRESSBOOK_REFLOW_ADAPTER(o)          (G_TYPE_CHECK_INSTANCE_CAST ((o), E_TYPE_ADDRESSBOOK_REFLOW_ADAPTER, EAddressbookReflowAdapter))
-#define E_ADDRESSBOOK_REFLOW_ADAPTER_CLASS(k)    (G_TYPE_CHECK_CLASS_CAST((k), E_TYPE_ADDRESSBOOK_REFLOW_ADAPTER, EAddressbookReflowAdapterClass))
-#define E_IS_ADDRESSBOOK_REFLOW_ADAPTER(o)       (G_TYPE_CHECK_INSTANCE_TYPE ((o), E_TYPE_ADDRESSBOOK_REFLOW_ADAPTER))
-#define E_IS_ADDRESSBOOK_REFLOW_ADAPTER_CLASS(k) (G_TYPE_CHECK_CLASS_TYPE ((k), E_TYPE_ADDRESSBOOK_REFLOW_ADAPTER))
-
-typedef struct _EAddressbookReflowAdapter EAddressbookReflowAdapter;
-typedef struct _EAddressbookReflowAdapterPrivate EAddressbookReflowAdapterPrivate;
-typedef struct _EAddressbookReflowAdapterClass EAddressbookReflowAdapterClass;
-
-struct _EAddressbookReflowAdapter {
-	EReflowModel parent;
-
-	EAddressbookReflowAdapterPrivate *priv;
-};
-
-
-struct _EAddressbookReflowAdapterClass {
-	EReflowModelClass parent_class;
-
-	/*
-	 * Signals
-	 */
-	gint (* drag_begin) (EAddressbookReflowAdapter *adapter, GdkEvent *event);
-};
-
-
-GType         e_addressbook_reflow_adapter_get_type          (void);
-void          e_addressbook_reflow_adapter_construct         (EAddressbookReflowAdapter *adapter,
-							      EABModel         *model);
-EReflowModel *e_addressbook_reflow_adapter_new               (EABModel         *model);
-
-/* Returns object with ref count of 1. */
-EContact     *e_addressbook_reflow_adapter_get_contact       (EAddressbookReflowAdapter *adapter,
-							      int                        index);
-#endif /* _E_ADDRESSBOOK_REFLOW_ADAPTER_H_ */
diff --git a/addressbook/gui/widgets/e-addressbook-table-adapter.c b/addressbook/gui/widgets/e-addressbook-table-adapter.c
deleted file mode 100644
index a11f749523..0000000000
--- a/addressbook/gui/widgets/e-addressbook-table-adapter.c
+++ /dev/null
@@ -1,354 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-
-#include <config.h>
-#include "e-addressbook-model.h"
-#include "e-addressbook-table-adapter.h"
-#include "eab-contact-merging.h"
-#include "eab-gui-util.h"
-#include <libxml/tree.h>
-#include <libxml/parser.h>
-#include <libxml/xmlmemory.h>
-#include <gnome.h>
-
-struct _EAddressbookTableAdapterPrivate {
-	EABModel *model;
-
-	int create_contact_id, remove_contact_id, modify_contact_id, model_changed_id;
-};
-
-#define PARENT_TYPE e_table_model_get_type()
-static ETableModelClass *parent_class;
-
-#define COLS (E_CONTACT_FIELD_LAST)
-
-static void
-unlink_model(EAddressbookTableAdapter *adapter)
-{
-	EAddressbookTableAdapterPrivate *priv = adapter->priv;
-
-	g_signal_handler_disconnect (priv->model,
-				     priv->create_contact_id);
-	g_signal_handler_disconnect (priv->model,
-				     priv->remove_contact_id);
-	g_signal_handler_disconnect (priv->model,
-				     priv->modify_contact_id);
-	g_signal_handler_disconnect (priv->model,
-				     priv->model_changed_id);
-
-	priv->create_contact_id = 0;
-	priv->remove_contact_id = 0;
-	priv->modify_contact_id = 0;
-	priv->model_changed_id = 0;
-
-	g_object_unref (priv->model);
-
-	priv->model = NULL;
-}
-
-static void
-addressbook_dispose(GObject *object)
-{
-	EAddressbookTableAdapter *adapter = EAB_TABLE_ADAPTER(object);
-
-	if (adapter->priv) {
-		unlink_model(adapter);
-
-		g_free (adapter->priv);
-		adapter->priv = NULL;
-	}
-
-	if (G_OBJECT_CLASS (parent_class)->dispose)
-		(* G_OBJECT_CLASS (parent_class)->dispose) (object);
-}
-
-/* This function returns the number of columns in our ETableModel. */
-static int
-addressbook_col_count (ETableModel *etc)
-{
-	return COLS;
-}
-
-/* This function returns the number of rows in our ETableModel. */
-static int
-addressbook_row_count (ETableModel *etc)
-{
-	EAddressbookTableAdapter *adapter = EAB_TABLE_ADAPTER(etc);
-	EAddressbookTableAdapterPrivate *priv = adapter->priv;
-
-	return eab_model_contact_count (priv->model);
-}
-
-/* This function returns the value at a particular point in our ETableModel. */
-static void *
-addressbook_value_at (ETableModel *etc, int col, int row)
-{
-	EAddressbookTableAdapter *adapter = EAB_TABLE_ADAPTER(etc);
-	EAddressbookTableAdapterPrivate *priv = adapter->priv;
-	const char *value;
-
-	if ( col >= COLS || row >= eab_model_contact_count (priv->model) )
-		return NULL;
-
-	value = e_contact_get_const((EContact*)eab_model_contact_at (priv->model, row), col);
-
-	return (void *)(value ? value : "");
-}
-
-/* This function sets the value at a particular point in our ETableModel. */
-static void
-contact_modified_cb (EBook* book, EBookStatus status,
-		     gpointer user_data)
-{
-	if (status != E_BOOK_ERROR_OK)
-		eab_error_dialog (_("Error modifying card"), status);
-}
-
-static void
-addressbook_set_value_at (ETableModel *etc, int col, int row, const void *val)
-{
-	EAddressbookTableAdapter *adapter = EAB_TABLE_ADAPTER(etc);
-	EAddressbookTableAdapterPrivate *priv = adapter->priv;
-
-	if (eab_model_editable (priv->model)) {
-		EContact *contact;
-
-		if (col >= COLS || row >= eab_model_contact_count (priv->model))
-			return;
-
-		contact = eab_model_get_contact (priv->model, row);
-		if (!contact)
-			return;
-
-		e_table_model_pre_change(etc);
-
-		e_contact_set(contact, col, (void *) val);
-		eab_merging_book_commit_contact (eab_model_get_ebook (priv->model),
-						 contact, contact_modified_cb, NULL);
-
-		g_object_unref (contact);
-
-		/* XXX do we need this?  shouldn't the commit_contact generate a changed signal? */
-		e_table_model_cell_changed(etc, col, row);
-	}
-}
-
-/* This function returns whether a particular cell is editable. */
-static gboolean
-addressbook_is_cell_editable (ETableModel *etc, int col, int row)
-{
-#if 0
-	EAddressbookTableAdapter *adapter = EAB_TABLE_ADAPTER(etc);
-	EAddressbookTableAdapterPrivate *priv = adapter->priv;
-	const EContact *contact;
-
-	if (row >= 0 && row < eab_model_contact_count (priv->model))
-		contact = eab_model_contact_at (priv->model, row);
-	else
-		contact = NULL;
-
-	if (!eab_model_editable(priv->model))
-		return FALSE;
-	else if (contact && e_contact_get ((EContact *) contact, E_CONTACT_IS_LIST))
-		/* we only allow editing of the name and file as for
-                   lists */
-		return col == E_CONTACT_FULL_NAME || col == E_CONTACT_FILE_AS; 
-	else
-		return col < E_CONTACT_LAST_SIMPLE_STRING;
-#endif
-
-	return FALSE;
-}
-
-static void
-addressbook_append_row (ETableModel *etm, ETableModel *source, gint row)
-{
-	EAddressbookTableAdapter *adapter = EAB_TABLE_ADAPTER(etm);
-	EAddressbookTableAdapterPrivate *priv = adapter->priv;
-	EContact *contact;
-	int col;
-
-	contact = e_contact_new ();
-
-	for (col = 1; col < E_CONTACT_LAST_SIMPLE_STRING; col++) {
-		const void *val = e_table_model_value_at (source, col, row);
-		e_contact_set (contact, col, (void *) val);
-	}
-
-	eab_merging_book_add_contact (eab_model_get_ebook (priv->model), contact, NULL, NULL);
-
-	g_object_unref (contact);
-}
-
-/* This function duplicates the value passed to it. */
-static void *
-addressbook_duplicate_value (ETableModel *etc, int col, const void *value)
-{
-	return g_strdup(value);
-}
-
-/* This function frees the value passed to it. */
-static void
-addressbook_free_value (ETableModel *etc, int col, void *value)
-{
-	g_free(value);
-}
-
-static void *
-addressbook_initialize_value (ETableModel *etc, int col)
-{
-	return g_strdup("");
-}
-
-static gboolean
-addressbook_value_is_empty (ETableModel *etc, int col, const void *value)
-{
-	return !(value && *(char *)value);
-}
-
-static char *
-addressbook_value_to_string (ETableModel *etc, int col, const void *value)
-{
-	return g_strdup(value);
-}
-
-static void
-eab_table_adapter_class_init (GObjectClass *object_class)
-{
-	ETableModelClass *model_class = (ETableModelClass *) object_class;
-
-	parent_class = g_type_class_peek_parent (object_class);
-
-	object_class->dispose = addressbook_dispose;
-
-	model_class->column_count = addressbook_col_count;
-	model_class->row_count = addressbook_row_count;
-	model_class->value_at = addressbook_value_at;
-	model_class->set_value_at = addressbook_set_value_at;
-	model_class->is_cell_editable = addressbook_is_cell_editable;
-	model_class->append_row = addressbook_append_row;
-	model_class->duplicate_value = addressbook_duplicate_value;
-	model_class->free_value = addressbook_free_value;
-	model_class->initialize_value = addressbook_initialize_value;
-	model_class->value_is_empty = addressbook_value_is_empty;
-	model_class->value_to_string = addressbook_value_to_string;
-}
-
-static void
-eab_table_adapter_init (GObject *object)
-{
-	EAddressbookTableAdapter *adapter = EAB_TABLE_ADAPTER(object);
-	EAddressbookTableAdapterPrivate *priv;
-
-	priv = adapter->priv = g_new0 (EAddressbookTableAdapterPrivate, 1);
-
-	priv->create_contact_id = 0;
-	priv->remove_contact_id = 0;
-	priv->modify_contact_id = 0;
-	priv->model_changed_id = 0;
-}
-
-
-static void
-create_contact (EABModel *model,
-		gint index, gint count,
-		EAddressbookTableAdapter *adapter)
-{
-	e_table_model_pre_change (E_TABLE_MODEL (adapter));
-	e_table_model_rows_inserted (E_TABLE_MODEL (adapter), index, count);
-}
-
-static void
-remove_contacts (EABModel *model,
-		gpointer data,
-		EAddressbookTableAdapter *adapter)
-{
-	GArray *indices = (GArray *) data;
-	int count = indices->len;
-	
-	
-	e_table_model_pre_change (E_TABLE_MODEL (adapter));
-	if (count == 1) 
-		e_table_model_rows_deleted (E_TABLE_MODEL (adapter), g_array_index (indices, gint, 0), 1);
-	else
-		e_table_model_changed (E_TABLE_MODEL (adapter));
-}
-
-static void
-modify_contact (EABModel *model,
-		gint index,
-		EAddressbookTableAdapter *adapter)
-{
-	e_table_model_pre_change (E_TABLE_MODEL (adapter));
-	e_table_model_row_changed (E_TABLE_MODEL (adapter), index);
-}
-
-static void
-model_changed (EABModel *model,
-	       EAddressbookTableAdapter *adapter)
-{
-	e_table_model_pre_change (E_TABLE_MODEL (adapter));
-	e_table_model_changed (E_TABLE_MODEL (adapter));
-}
-
-GType
-eab_table_adapter_get_type (void)
-{
-	static GType type = 0;
-
-	if (!type) {
-		static const GTypeInfo info =  {
-			sizeof (EAddressbookTableAdapterClass),
-			NULL,           /* base_init */
-			NULL,           /* base_finalize */
-			(GClassInitFunc) eab_table_adapter_class_init,
-			NULL,           /* class_finalize */
-			NULL,           /* class_data */
-			sizeof (EAddressbookTableAdapter),
-			0,             /* n_preallocs */
-			(GInstanceInitFunc) eab_table_adapter_init,
-		};
-
-		type = g_type_register_static (PARENT_TYPE, "EAddressbookTableAdapter", &info, 0);
-	}
-
-	return type;
-}
-
-void
-eab_table_adapter_construct (EAddressbookTableAdapter *adapter,
-				       EABModel *model)
-{
-	EAddressbookTableAdapterPrivate *priv = adapter->priv;
-
-	priv->model = model;
-	g_object_ref (priv->model);
-
-	priv->create_contact_id = g_signal_connect(priv->model,
-						   "contact_added",
-						   G_CALLBACK(create_contact),
-						   adapter);
-	priv->remove_contact_id = g_signal_connect(priv->model,
-						   "contacts_removed",
-						   G_CALLBACK(remove_contacts),
-						   adapter);
-	priv->modify_contact_id = g_signal_connect(priv->model,
-						   "contact_changed",
-						   G_CALLBACK(modify_contact),
-						   adapter);
-	priv->model_changed_id = g_signal_connect(priv->model,
-						  "model_changed",
-						  G_CALLBACK(model_changed),
-						  adapter);
-}
-
-ETableModel *
-eab_table_adapter_new (EABModel *model)
-{
-	EAddressbookTableAdapter *et;
-
-	et = g_object_new(E_TYPE_AB_TABLE_ADAPTER, NULL);
-
-	eab_table_adapter_construct (et, model);
-
-	return E_TABLE_MODEL(et);
-}
diff --git a/addressbook/gui/widgets/e-addressbook-table-adapter.h b/addressbook/gui/widgets/e-addressbook-table-adapter.h
deleted file mode 100644
index cf139e2bee..0000000000
--- a/addressbook/gui/widgets/e-addressbook-table-adapter.h
+++ /dev/null
@@ -1,36 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-#ifndef _EAB_TABLE_ADAPTER_H_
-#define _EAB_TABLE_ADAPTER_H_
-
-#include <gal/e-table/e-table-model.h>
-#include <libebook/e-book.h>
-#include <libebook/e-book-view.h>
-
-#define E_TYPE_AB_TABLE_ADAPTER                 (eab_table_adapter_get_type ())
-#define EAB_TABLE_ADAPTER(o)                    (G_TYPE_CHECK_INSTANCE_CAST ((o), E_TYPE_AB_TABLE_ADAPTER, EAddressbookTableAdapter))
-#define EAB_TABLE_ADAPTER_CLASS(k)              (G_TYPE_CHECK_CLASS_CAST((k), E_TYPE_AB_TABLE_ADAPTER, EAddressbookTableAdapterClass))
-#define E_IS_ADDRESSBOOK_TABLE_ADAPTER(o)       (G_TYPE_CHECK_INSTANCE_TYPE ((o), E_TYPE_AB_TABLE_ADAPTER))
-#define E_IS_ADDRESSBOOK_TABLE_ADAPTER_CLASS(k) (G_TYPE_CHECK_CLASS_TYPE ((k), E_TYPE_AB_TABLE_ADAPTER))
-
-typedef struct _EAddressbookTableAdapter EAddressbookTableAdapter;
-typedef struct _EAddressbookTableAdapterPrivate EAddressbookTableAdapterPrivate;
-typedef struct _EAddressbookTableAdapterClass EAddressbookTableAdapterClass;
-
-struct _EAddressbookTableAdapter {
-	ETableModel parent;
-
-	EAddressbookTableAdapterPrivate *priv;
-};
-
-
-struct _EAddressbookTableAdapterClass {
-	ETableModelClass parent_class;
-};
-
-
-GType        eab_table_adapter_get_type (void);
-void         eab_table_adapter_construct (EAddressbookTableAdapter *adapter,
-					  EABModel *model);
-ETableModel *eab_table_adapter_new (EABModel *model);
-
-#endif /* _EAB_TABLE_ADAPTER_H_ */
diff --git a/addressbook/gui/widgets/e-addressbook-treeview-adapter.c b/addressbook/gui/widgets/e-addressbook-treeview-adapter.c
deleted file mode 100644
index 2d0c4b8c93..0000000000
--- a/addressbook/gui/widgets/e-addressbook-treeview-adapter.c
+++ /dev/null
@@ -1,621 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-
-#include <config.h>
-#include "e-addressbook-model.h"
-#include "e-addressbook-treeview-adapter.h"
-#include "e-card-merging.h"
-#include "eab-gui-util.h"
-#include <gtk/gtktreednd.h>
-#include <libxml/tree.h>
-#include <libxml/parser.h>
-#include <libxml/xmlmemory.h>
-
-struct _EAddressbookTreeViewAdapterPrivate {
-	EAddressbookModel *model;
-
-	gint stamp;
-
-	ECardSimple **simples;
-	int count;
-
-	int create_card_id, remove_card_id, modify_card_id, model_changed_id;
-};
-
-#define PARENT_TYPE G_TYPE_OBJECT
-GObjectClass *parent_class;
-
-#define COLS (E_CARD_SIMPLE_FIELD_LAST)
-
-static void
-unlink_model(EAddressbookTreeViewAdapter *adapter)
-{
-	EAddressbookTreeViewAdapterPrivate *priv = adapter->priv;
-	int i;
-
-	g_signal_handler_disconnect (priv->model,
-				     priv->create_card_id);
-	g_signal_handler_disconnect (priv->model,
-				     priv->remove_card_id);
-	g_signal_handler_disconnect (priv->model,
-				     priv->modify_card_id);
-	g_signal_handler_disconnect (priv->model,
-				     priv->model_changed_id);
-
-	priv->create_card_id = 0;
-	priv->remove_card_id = 0;
-	priv->modify_card_id = 0;
-	priv->model_changed_id = 0;
-
-	/* free up the existing mapping if there is one */
-	if (priv->simples) {
-		for (i = 0; i < priv->count; i ++)
-			g_object_unref (priv->simples[i]);
-		g_free (priv->simples);
-		priv->simples = NULL;
-	}
-
-	g_object_unref (priv->model);
-
-	priv->model = NULL;
-}
-
-static void
-build_simple_mapping(EAddressbookTreeViewAdapter *adapter)
-{
-	EAddressbookTreeViewAdapterPrivate *priv = adapter->priv;
-	int i;
-
-	/* free up the existing mapping if there is one */
-	if (priv->simples) {
-		for (i = 0; i < priv->count; i ++)
-			g_object_unref (priv->simples[i]);
-		g_free (priv->simples);
-	}
-
-	/* build up our mapping to ECardSimple*'s */
-	priv->count = e_addressbook_model_card_count (priv->model);
-	priv->simples = g_new (ECardSimple*, priv->count);
-	for (i = 0; i < priv->count; i ++) {
-		priv->simples[i] = e_card_simple_new (e_addressbook_model_card_at (priv->model, i));
-		g_object_ref (priv->simples[i]);
-	}
-}
-
-static void
-addressbook_destroy(GtkObject *object)
-{
-	EAddressbookTreeViewAdapter *adapter = E_ADDRESSBOOK_TREEVIEW_ADAPTER(object);
-
-	unlink_model(adapter);
-
-	g_free (adapter->priv);
-	adapter->priv = NULL;
-
-	(* GTK_OBJECT_CLASS (parent_class)->destroy) (object);
-}
-
-#if 0
-static void
-addressbook_set_value_at (ETableModel *etc, int col, int row, const void *val)
-{
-	EAddressbookTreeViewAdapter *adapter = E_ADDRESSBOOK_TABLE_ADAPTER(etc);
-	EAddressbookTableAdapterPrivate *priv = adapter->priv;
-	if (e_addressbook_model_editable (priv->model)) {
-		ECard *card;
-
-		if ( col >= COLS|| row >= e_addressbook_model_card_count (priv->model) )
-			return;
-
-		e_table_model_pre_change(etc);
-
-		e_card_simple_set(priv->simples[row],
-				  col,
-				  val);
-		g_object_get(priv->simples[row],
-			     "card", &card,
-			     NULL);
-
-		e_card_merging_book_commit_card(e_addressbook_model_get_ebook(priv->model),
-						card, card_modified_cb, NULL);
-
-		/* XXX do we need this?  shouldn't the commit_card generate a changed signal? */
-		e_table_model_cell_changed(etc, col, row);
-	}
-}
-
-/* This function returns whether a particular cell is editable. */
-static gboolean
-addressbook_is_cell_editable (ETableModel *etc, int col, int row)
-{
-	EAddressbookTableAdapter *adapter = E_ADDRESSBOOK_TABLE_ADAPTER(etc);
-	EAddressbookTableAdapterPrivate *priv = adapter->priv;
-	ECard *card;
-
-	if (row >= 0 && row < e_addressbook_model_card_count (priv->model))
-		card = e_addressbook_model_card_at (priv->model, row);
-	else
-		card = NULL;
-
-	if (!e_addressbook_model_editable(priv->model))
-		return FALSE;
-	else if (card && e_card_evolution_list (card))
-		/* we only allow editing of the name and file as for
-                   lists */
-		return col == E_CARD_SIMPLE_FIELD_FULL_NAME || col == E_CARD_SIMPLE_FIELD_FILE_AS; 
-	else
-		return col < E_CARD_SIMPLE_FIELD_LAST_SIMPLE_STRING;
-}
-
-static void
-addressbook_append_row (ETableModel *etm, ETableModel *source, gint row)
-{
-	EAddressbookTableAdapter *adapter = E_ADDRESSBOOK_TABLE_ADAPTER(etm);
-	EAddressbookTableAdapterPrivate *priv = adapter->priv;
-	ECard *card;
-	ECardSimple *simple;
-	int col;
-
-	card = e_card_new("");
-	simple = e_card_simple_new(card);
-
-	for (col = 0; col < E_CARD_SIMPLE_FIELD_LAST_SIMPLE_STRING; col++) {
-		const void *val = e_table_model_value_at(source, col, row);
-		e_card_simple_set(simple, col, val);
-	}
-	e_card_simple_sync_card(simple);
-	e_card_merging_book_add_card (e_addressbook_model_get_ebook (priv->model), card, NULL, NULL);
-	g_object_unref (simple);
-	g_object_unref (card);
-}
-#endif
-
-static void
-e_addressbook_treeview_adapter_class_init (GtkObjectClass *object_class)
-{
-	parent_class = g_type_class_peek_parent (object_class);
-
-	object_class->destroy = addressbook_destroy;
-}
-
-static void
-e_addressbook_treeview_adapter_init (GtkObject *object)
-{
-	EAddressbookTreeViewAdapter *adapter = E_ADDRESSBOOK_TREEVIEW_ADAPTER(object);
-	EAddressbookTreeViewAdapterPrivate *priv;
-
-	priv = adapter->priv = g_new0 (EAddressbookTreeViewAdapterPrivate, 1);
-
-	priv->create_card_id = 0;
-	priv->remove_card_id = 0;
-	priv->modify_card_id = 0;
-	priv->model_changed_id = 0;
-	priv->simples = NULL;
-	priv->count = 0;
-}
-
-static void
-get_iter (EAddressbookTreeViewAdapter *adapter, gint index, GtkTreeIter *iter)
-{
-	EAddressbookTreeViewAdapterPrivate *priv = adapter->priv;
-
-	iter->stamp = priv->stamp;
-	iter->user_data = GINT_TO_POINTER (index);
-}
-
-static void
-create_card (EAddressbookModel *model,
-	     gint index, gint count,
-	     EAddressbookTreeViewAdapter *adapter)
-{
-	EAddressbookTreeViewAdapterPrivate *priv = adapter->priv;
-	int i;
-
-	priv->count += count;
-	priv->simples = g_renew(ECardSimple *, priv->simples, priv->count);
-	memmove (priv->simples + index + count, priv->simples + index, (priv->count - index - count) * sizeof (ECardSimple *));
-
-	for (i = 0; i < count; i ++) {
-		GtkTreeIter iter;
-		GtkTreePath *path;
-
-		priv->simples[index + i] = e_card_simple_new (e_addressbook_model_card_at (priv->model, index + i));
-
-		get_iter (adapter, index + i, &iter);
-		path = gtk_tree_model_get_path (GTK_TREE_MODEL (adapter), &iter);
-
-		gtk_tree_model_row_inserted (GTK_TREE_MODEL (adapter), path, &iter);
-		gtk_tree_model_row_changed (GTK_TREE_MODEL (adapter), path, &iter);
-
-		gtk_tree_path_free (path);
-	}
-}
-
-static void
-remove_card (EAddressbookModel *model,
-	     gint index,
-	     EAddressbookTreeViewAdapter *adapter)
-{
-	EAddressbookTreeViewAdapterPrivate *priv = adapter->priv;
-	GtkTreeIter iter;
-	GtkTreePath *path;
-
-	g_object_unref (priv->simples[index]);
-	memmove (priv->simples + index, priv->simples + index + 1, (priv->count - index - 1) * sizeof (ECardSimple *));
-	priv->count --;
-	get_iter (adapter, index, &iter);
-	path = gtk_tree_model_get_path (GTK_TREE_MODEL (adapter), &iter);
-
-	gtk_tree_model_row_deleted (GTK_TREE_MODEL (adapter), path);
-
-	gtk_tree_path_free (path);
-}
-
-static void
-modify_card (EAddressbookModel *model,
-	     gint index,
-	     EAddressbookTreeViewAdapter *adapter)
-{
-	EAddressbookTreeViewAdapterPrivate *priv = adapter->priv;
-	GtkTreeIter iter;
-	GtkTreePath *path;
-
-	g_object_unref (priv->simples[index]);
-	priv->simples[index] = e_card_simple_new (e_addressbook_model_card_at (priv->model, index));
-
-	get_iter (adapter, index, &iter);
-	path = gtk_tree_model_get_path (GTK_TREE_MODEL (adapter), &iter);
-
-	gtk_tree_model_row_changed (GTK_TREE_MODEL (adapter), path, &iter);
-
-	gtk_tree_path_free (path);
-}
-
-static void
-model_changed (EAddressbookModel *model,
-	       EAddressbookTreeViewAdapter *adapter)
-{
-	int i;
-
-	/* there has *got* to be an easier/faster way to do this... */
-	for (i = 0; i < adapter->priv->count; i++) {
-		remove_card (model, i, adapter);
-	}
-
-	build_simple_mapping (adapter);
-
-	if (adapter->priv->count) {
-		printf ("AIIEEEEEE\n");
-	}
-
-	/* XXX this isn't right either, we need to add the new cards */
-}
-
-static GtkTreeModelFlags
-adapter_get_flags (GtkTreeModel *tree_model)
-{
-  g_return_val_if_fail (E_IS_ADDRESSBOOK_TREEVIEW_ADAPTER (tree_model), 0);
-
-  return GTK_TREE_MODEL_LIST_ONLY;
-}
-
-static gint
-adapter_get_n_columns (GtkTreeModel *tree_model)
-{
-  g_return_val_if_fail (E_IS_ADDRESSBOOK_TREEVIEW_ADAPTER (tree_model), 0);
-
-  return COLS;
-}
-
-static GType
-adapter_get_column_type (GtkTreeModel *tree_model,
-			 gint          index)
-{
-  g_return_val_if_fail (E_IS_ADDRESSBOOK_TREEVIEW_ADAPTER (tree_model), G_TYPE_INVALID);
-  g_return_val_if_fail (index < COLS && index >= 0, G_TYPE_INVALID);
-  
-  return G_TYPE_STRING;
-}
-
-static gboolean
-adapter_get_iter (GtkTreeModel *tree_model,
-		  GtkTreeIter  *iter,
-		  GtkTreePath  *path)
-{
-	EAddressbookTreeViewAdapter *adapter;
-	GSList *list;
-	gint i;
-
-	g_return_val_if_fail (E_IS_ADDRESSBOOK_TREEVIEW_ADAPTER (tree_model), FALSE);
-	g_return_val_if_fail (gtk_tree_path_get_depth (path) > 0, FALSE);
-
-	adapter = E_ADDRESSBOOK_TREEVIEW_ADAPTER (tree_model);
-
-	i = gtk_tree_path_get_indices (path)[0];
-
-	if (i >= adapter->priv->count)
-		return FALSE;
-
-	iter->stamp = adapter->priv->stamp;
-	iter->user_data = GINT_TO_POINTER (i);
-
-	return TRUE;
-}
-
-static GtkTreePath *
-adapter_get_path (GtkTreeModel *tree_model,
-		  GtkTreeIter  *iter)
-{
-	EAddressbookTreeViewAdapter *adapter = E_ADDRESSBOOK_TREEVIEW_ADAPTER (tree_model);
-	GtkTreePath *retval;
-
-	g_return_val_if_fail (E_IS_ADDRESSBOOK_TREEVIEW_ADAPTER (tree_model), NULL);
-	g_return_val_if_fail (iter->stamp == adapter->priv->stamp, NULL);
-
-
-	if (GPOINTER_TO_INT (iter->user_data) >= adapter->priv->count)
-		return NULL;
-
-	retval = gtk_tree_path_new ();
-	gtk_tree_path_append_index (retval, GPOINTER_TO_INT (iter->user_data));
-	return retval;
-}
-
-static void
-adapter_get_value (GtkTreeModel *tree_model,
-		   GtkTreeIter  *iter,
-		   gint          column,
-		   GValue       *value)
-{
-	EAddressbookTreeViewAdapter *adapter = E_ADDRESSBOOK_TREEVIEW_ADAPTER (tree_model);
-	ECardSimple *simple;
-	gint tmp_column = column;
-	const char *v;
-
-	g_return_if_fail (E_IS_ADDRESSBOOK_TREEVIEW_ADAPTER (tree_model));
-	g_return_if_fail (column < COLS);
-	g_return_if_fail (adapter->priv->stamp == iter->stamp);
-
-	simple = adapter->priv->simples [ GPOINTER_TO_INT (iter->user_data) ];
-
-	v = e_card_simple_get_const(simple, column);
-
-	g_value_init (value, G_TYPE_STRING);
-	g_value_set_string (value, (v ? v : ""));
-}
-
-static gboolean
-adapter_iter_next (GtkTreeModel  *tree_model,
-		   GtkTreeIter   *iter)
-{
-	EAddressbookTreeViewAdapter *adapter;
-
-	g_return_val_if_fail (E_IS_ADDRESSBOOK_TREEVIEW_ADAPTER (tree_model), FALSE);
-	g_return_val_if_fail (E_ADDRESSBOOK_TREEVIEW_ADAPTER (tree_model)->priv->stamp == iter->stamp, FALSE);
-
-	adapter = E_ADDRESSBOOK_TREEVIEW_ADAPTER (tree_model);
-
-	iter->user_data = GINT_TO_POINTER (GPOINTER_TO_INT (iter->user_data) + 1);
-
-	return (GPOINTER_TO_INT (iter->user_data) < adapter->priv->count);
-}
-
-static gboolean
-adapter_iter_children (GtkTreeModel *tree_model,
-		       GtkTreeIter  *iter,
-		       GtkTreeIter  *parent)
-{
-	EAddressbookTreeViewAdapter *adapter = E_ADDRESSBOOK_TREEVIEW_ADAPTER (tree_model);
-
-	/* this is a list, nodes have no children */
-	if (parent)
-		return FALSE;
-
-	/* but if parent == NULL we return the list itself as children of the
-	 * "root"
-	 */
-	if (adapter->priv->count) {
-		iter->stamp = adapter->priv->stamp;
-		iter->user_data = GINT_TO_POINTER (0);
-		return TRUE;
-	}
-	else
-		return FALSE;
-}
-
-static gboolean
-adapter_iter_has_child (GtkTreeModel *tree_model,
-			GtkTreeIter  *iter)
-{
-	return FALSE;
-}
-
-static gint
-adapter_iter_n_children (GtkTreeModel *tree_model,
-			 GtkTreeIter  *iter)
-{
-	EAddressbookTreeViewAdapter *adapter = E_ADDRESSBOOK_TREEVIEW_ADAPTER (tree_model);
-
-	g_return_val_if_fail (E_IS_ADDRESSBOOK_TREEVIEW_ADAPTER (tree_model), -1);
-	if (iter == NULL)
-		return adapter->priv->count;
-			
-	g_return_val_if_fail (adapter->priv->stamp == iter->stamp, -1);
-	return 0;
-}
-
-static gboolean
-adapter_iter_nth_child (GtkTreeModel *tree_model,
-			GtkTreeIter  *iter,
-			GtkTreeIter  *parent,
-			gint          n)
-{
-	EAddressbookTreeViewAdapter *adapter = E_ADDRESSBOOK_TREEVIEW_ADAPTER (tree_model);
-
-	g_return_val_if_fail (E_IS_ADDRESSBOOK_TREEVIEW_ADAPTER (tree_model), FALSE);
-
-	if (parent)
-		return FALSE;
-
-	if (n < adapter->priv->count) {
-		iter->stamp = adapter->priv->stamp;
-		iter->user_data = GINT_TO_POINTER (n);
-		return TRUE;
-	}
-	else
-		return FALSE;
-}
-
-static gboolean
-adapter_iter_parent (GtkTreeModel *tree_model,
-		     GtkTreeIter  *iter,
-		     GtkTreeIter  *child)
-{
-	return FALSE;
-}
-
-static void
-adapter_tree_model_init (GtkTreeModelIface *iface)
-{
-	iface->get_flags = adapter_get_flags;
-	iface->get_n_columns = adapter_get_n_columns;
-	iface->get_column_type = adapter_get_column_type;
-	iface->get_iter = adapter_get_iter;
-	iface->get_path = adapter_get_path;
-	iface->get_value = adapter_get_value;
-	iface->iter_next = adapter_iter_next;
-	iface->iter_children = adapter_iter_children;
-	iface->iter_has_child = adapter_iter_has_child;
-	iface->iter_n_children = adapter_iter_n_children;
-	iface->iter_nth_child = adapter_iter_nth_child;
-	iface->iter_parent = adapter_iter_parent;
-}
-
-static gboolean
-adapter_drag_data_delete   (GtkTreeDragSource *drag_source,
-			    GtkTreePath       *path)
-{
-	g_return_val_if_fail (E_IS_ADDRESSBOOK_TREEVIEW_ADAPTER (drag_source), FALSE);
-
-	return FALSE;
-}
-
-static gboolean
-adapter_drag_data_get      (GtkTreeDragSource *drag_source,
-			    GtkTreePath       *path,
-			    GtkSelectionData  *selection_data)
-{
-	g_return_val_if_fail (E_IS_ADDRESSBOOK_TREEVIEW_ADAPTER (drag_source), FALSE);
-
-	/* Note that we don't need to handle the GTK_TREE_MODEL_ROW
-	 * target, because the default handler does it for us, but
-	 * we do anyway for the convenience of someone maybe overriding the
-	 * default handler.
-	 */
-
-	if (gtk_tree_set_row_drag_data (selection_data,
-					GTK_TREE_MODEL (drag_source),
-					path)) {
-		return TRUE;
-	}
-	else {
-		if (selection_data->target == gdk_atom_intern ("text/x-vcard", FALSE)) {
-			printf ("HI THERE\n");
-		}
-	}
-
-	return FALSE;
-}
-
-static void
-adapter_drag_source_init (GtkTreeDragSourceIface *iface)
-{
-	iface->drag_data_delete = adapter_drag_data_delete;
-	iface->drag_data_get = adapter_drag_data_get;
-}
-
-GType
-e_addressbook_treeview_adapter_get_type (void)
-{
-	static GType type = 0;
-
-	if (!type) {
-		static const GTypeInfo adapter_info =  {
-			sizeof (EAddressbookTreeViewAdapterClass),
-			NULL,           /* base_init */
-			NULL,           /* base_finalize */
-			(GClassInitFunc) e_addressbook_treeview_adapter_class_init,
-			NULL,           /* class_finalize */
-			NULL,           /* class_data */
-			sizeof (EAddressbookTreeViewAdapter),
-			0,             /* n_preallocs */
-			(GInstanceInitFunc) e_addressbook_treeview_adapter_init,
-		};
-
-		static const GInterfaceInfo tree_model_info = {
-			(GInterfaceInitFunc) adapter_tree_model_init,
-			NULL,
-			NULL
-		};
-
-		static const GInterfaceInfo drag_source_info = {
-			(GInterfaceInitFunc) adapter_drag_source_init,
-			NULL,
-			NULL
-		};
-
-		type = g_type_register_static (PARENT_TYPE, "EAddressbookTreeViewAdapter", &adapter_info, 0);
-
-		g_type_add_interface_static (type,
-					     GTK_TYPE_TREE_MODEL,
-					     &tree_model_info);
-
-		g_type_add_interface_static (type,
-					     GTK_TYPE_TREE_DRAG_SOURCE,
-					     &drag_source_info);
-	}
-
-	return type;
-}
-
-void
-e_addressbook_treeview_adapter_construct (EAddressbookTreeViewAdapter *adapter,
-					  EAddressbookModel *model)
-{
-	EAddressbookTreeViewAdapterPrivate *priv = adapter->priv;
-
-	priv->model = model;
-	g_object_ref (priv->model);
-
-	priv->stamp = g_random_int ();
-
-	priv->create_card_id = g_signal_connect(priv->model,
-						"card_added",
-						G_CALLBACK(create_card),
-						adapter);
-	priv->remove_card_id = g_signal_connect(priv->model,
-						"card_removed",
-						G_CALLBACK(remove_card),
-						adapter);
-	priv->modify_card_id = g_signal_connect(priv->model,
-						"card_changed",
-						G_CALLBACK(modify_card),
-						adapter);
-	priv->model_changed_id = g_signal_connect(priv->model,
-						  "model_changed",
-						  G_CALLBACK(model_changed),
-						  adapter);
-
-	build_simple_mapping (adapter);
-}
-
-GtkTreeModel *
-e_addressbook_treeview_adapter_new (EAddressbookModel *model)
-{
-	EAddressbookTreeViewAdapter *et;
-
-	et = g_object_new(E_TYPE_ADDRESSBOOK_TREEVIEW_ADAPTER, NULL);
-
-	e_addressbook_treeview_adapter_construct (et, model);
-
-	return (GtkTreeModel*)et;
-}
diff --git a/addressbook/gui/widgets/e-addressbook-treeview-adapter.h b/addressbook/gui/widgets/e-addressbook-treeview-adapter.h
deleted file mode 100644
index 2c4370dee3..0000000000
--- a/addressbook/gui/widgets/e-addressbook-treeview-adapter.h
+++ /dev/null
@@ -1,44 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-#ifndef _E_ADDRESSBOOK_TREEVIEW_ADAPTER_H_
-#define _E_ADDRESSBOOK_TREEVIEW_ADAPTER_H_
-
-#include <gtk/gtktreemodel.h>
-#include "addressbook/backend/ebook/e-book.h"
-#include "addressbook/backend/ebook/e-book-view.h"
-#include "addressbook/backend/ebook/e-card-simple.h"
-
-#define E_TYPE_ADDRESSBOOK_TREEVIEW_ADAPTER        (e_addressbook_treeview_adapter_get_type ())
-#define E_ADDRESSBOOK_TREEVIEW_ADAPTER(o)          (G_TYPE_CHECK_INSTANCE_CAST ((o), E_TYPE_ADDRESSBOOK_TREEVIEW_ADAPTER, EAddressbookTreeViewAdapter))
-#define E_ADDRESSBOOK_TREEVIEW_ADAPTER_CLASS(k)    (G_TYPE_CHECK_CLASS_CAST((k), E_TYPE_ADDRESSBOOK_TREEVIEW_ADAPTER, EAddressbookTreeViewAdapterClass))
-#define E_IS_ADDRESSBOOK_TREEVIEW_ADAPTER(o)       (G_TYPE_CHECK_INSTANCE_TYPE ((o), E_TYPE_ADDRESSBOOK_TREEVIEW_ADAPTER))
-#define E_IS_ADDRESSBOOK_TREEVIEW_ADAPTER_CLASS(k) (G_TYPE_CHECK_CLASS_TYPE ((k), E_TYPE_ADDRESSBOOK_TREEVIEW_ADAPTER))
-
-/* Virtual Column list:
-   0   Email
-   1   Full Name
-   2   Street
-   3   Phone
-*/
-
-typedef struct _EAddressbookTreeViewAdapter EAddressbookTreeViewAdapter;
-typedef struct _EAddressbookTreeViewAdapterPrivate EAddressbookTreeViewAdapterPrivate;
-typedef struct _EAddressbookTreeViewAdapterClass EAddressbookTreeViewAdapterClass;
-
-struct _EAddressbookTreeViewAdapter {
-	GObject parent;
-
-	EAddressbookTreeViewAdapterPrivate *priv;
-};
-
-
-struct _EAddressbookTreeViewAdapterClass {
-	GObjectClass parent_class;
-};
-
-
-GType         e_addressbook_treeview_adapter_get_type (void);
-void          e_addressbook_treeview_adapter_construct (EAddressbookTreeViewAdapter *adapter,
-							EAddressbookModel *model);
-GtkTreeModel *e_addressbook_treeview_adapter_new (EAddressbookModel *model);
-
-#endif /* _E_ADDRESSBOOK_TABLE_ADAPTER_H_ */
diff --git a/addressbook/gui/widgets/e-addressbook-view.c b/addressbook/gui/widgets/e-addressbook-view.c
deleted file mode 100644
index 3d2e9fdef5..0000000000
--- a/addressbook/gui/widgets/e-addressbook-view.c
+++ /dev/null
@@ -1,2206 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-/* 
- * e-addressbook-view.c
- * Copyright (C) 2000  Ximian, Inc.
- * Author: Chris Lahey <clahey@ximian.com>
- *         Chris Toshok <toshok@ximian.com>
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of version 2 of the GNU General Public
- * License as published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * General Public License for more details.
- *
- * You should have received a copy of the GNU General Public
- * License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
- */
-
-#include <config.h>
-
-#include <gtk/gtk.h>
-
-#include <libgnome/gnome-i18n.h>
-#include <libgnome/gnome-util.h>
-#include <gtk/gtkscrolledwindow.h>
-#include <gal/e-table/e-table-scrolled.h>
-#include <gal/e-table/e-table-model.h>
-#include <gal/widgets/e-gui-utils.h>
-#include <gal/menus/gal-view-factory-etable.h>
-#include <gal/menus/gal-view-etable.h>
-#include <gal/util/e-xml-utils.h>
-#include <libgnomeui/gnome-dialog-util.h>
-
-#include <libgnomeprint/gnome-print.h>
-#include <libgnomeprint/gnome-print-job.h>
-#include <libgnomeprintui/gnome-print-dialog.h>
-#include <libgnomeprintui/gnome-print-job-preview.h>
-
-#include "addressbook/printing/e-contact-print.h"
-#include "addressbook/printing/e-contact-print-envelope.h"
-#include "addressbook/gui/search/e-addressbook-search-dialog.h"
-#include "addressbook/gui/widgets/eab-popup.h"
-#include "addressbook/gui/widgets/eab-menu.h"
-
-#include "e-util/e-categories-master-list-wombat.h"
-#include "e-util/e-print.h"
-#include "libedataserver/e-sexp.h"
-
-#ifdef WITH_ADDRESSBOOK_VIEW_TREEVIEW
-#include <gal/widgets/e-treeview-selection-model.h>
-#include "gal-view-factory-treeview.h"
-#include "gal-view-treeview.h"
-#endif
-#include "gal-view-minicard.h"
-#include "gal-view-factory-minicard.h"
-
-#include "eab-marshal.h"
-#include "e-addressbook-view.h"
-#include "e-addressbook-model.h"
-#include "eab-gui-util.h"
-#include "util/eab-book-util.h"
-#include "e-addressbook-table-adapter.h"
-#ifdef WITH_ADDRESSBOOK_VIEW_TREEVIEW
-#include "e-addressbook-treeview-adapter.h"
-#endif
-#include "eab-contact-merging.h"
-
-#include "widgets/misc/e-error.h"
-
-#include "e-contact-editor.h"
-#include <gdk/gdkkeysyms.h>
-#include <ctype.h>
-#include <string.h>
-
-#include <libxml/tree.h>
-#include <libxml/parser.h>
-
-#define SHOW_ALL_SEARCH "(contains \"x-evolution-any-field\" \"\")"
-
-#define d(x)
-
-static void eab_view_init		(EABView		 *card);
-static void eab_view_class_init	(EABViewClass	 *klass);
-
-static void eab_view_set_property (GObject *object, guint prop_id, const GValue *value, GParamSpec *pspec);
-static void eab_view_get_property (GObject *object, guint prop_id, GValue *value, GParamSpec *pspec);
-
-static void eab_view_dispose (GObject *object);
-static void change_view_type (EABView *view, EABViewType view_type);
-
-static void status_message     (GtkObject *object, const gchar *status, EABView *eav);
-static void search_result      (GtkObject *object, EBookViewStatus status, EABView *eav);
-static void folder_bar_message (GtkObject *object, const gchar *status, EABView *eav);
-static void stop_state_changed (GtkObject *object, EABView *eav);
-static void writable_status    (GtkObject *object, gboolean writable, EABView *eav);
-static void backend_died       (GtkObject *object, EABView *eav);
-static void contact_changed    (EABModel *model, gint index, EABView *eav);
-static void contacts_removed    (EABModel *model, gpointer data, EABView *eav);
-static GList *get_selected_contacts (EABView *view);
-
-static void command_state_change (EABView *eav);
-
-static void selection_clear_event (GtkWidget *invisible, GdkEventSelection *event,
-				   EABView *view);
-static void selection_received (GtkWidget *invisible, GtkSelectionData *selection_data,
-				guint time, EABView *view);
-static void selection_get (GtkWidget *invisible, GtkSelectionData *selection_data,
-			   guint info, guint time_stamp, EABView *view);
-static void invisible_destroyed (gpointer data, GObject *where_object_was);
-
-static void make_suboptions             (EABView *view);
-static void query_changed               (ESearchBar *esb, EABView *view);
-static void search_activated            (ESearchBar *esb, EABView *view);
-static void search_menu_activated       (ESearchBar *esb, int id, EABView *view);
-static void connect_master_list_changed (EABView *view);
-static ECategoriesMasterList *get_master_list (void);
-
-#define PARENT_TYPE GTK_TYPE_VBOX
-static GtkVBoxClass *parent_class = NULL;
-
-/* The arguments we take */
-enum {
-	PROP_0,
-	PROP_BOOK,
-	PROP_SOURCE,
-	PROP_QUERY,
-	PROP_TYPE,
-};
-
-enum {
-	STATUS_MESSAGE,
-	SEARCH_RESULT,
-	FOLDER_BAR_MESSAGE,
-	COMMAND_STATE_CHANGE,
-	LAST_SIGNAL
-};
-
-enum DndTargetType {
-	DND_TARGET_TYPE_SOURCE_VCARD,
-	DND_TARGET_TYPE_VCARD
-};
-#define VCARD_TYPE "text/x-vcard"
-#define SOURCE_VCARD_TYPE "text/x-source-vcard"
-static GtkTargetEntry drag_types[] = {
-	{ SOURCE_VCARD_TYPE, 0, DND_TARGET_TYPE_SOURCE_VCARD },
-	{ VCARD_TYPE, 0, DND_TARGET_TYPE_VCARD }
-};
-static const int num_drag_types = sizeof (drag_types) / sizeof (drag_types[0]);
-
-static guint eab_view_signals [LAST_SIGNAL] = {0, };
-
-static GdkAtom clipboard_atom = GDK_NONE;
-
-static GalViewCollection *collection = NULL;
-
-enum {
-	ESB_FULL_NAME,
-	ESB_EMAIL,
-	ESB_CATEGORY,
-	ESB_ANY,
-	ESB_ADVANCED
-};
-
-static ESearchBarItem addressbook_search_option_items[] = {
-	{ N_("Name begins with"), ESB_FULL_NAME, NULL },
-	{ N_("Email begins with"), ESB_EMAIL, NULL },
-	{ N_("Category is"), ESB_CATEGORY, NULL }, /* We attach subitems below */
-	{ N_("Any field contains"), ESB_ANY, NULL },
-	{ N_("Advanced..."), ESB_ADVANCED, NULL },
-	{ NULL, -1, NULL }
-};
-
-static ESearchBarItem addressbook_search_items[] = {
-	{ N_("Advanced..."), ESB_ADVANCED, NULL },
-	{ NULL, -1, NULL },
-};
-
-GType
-eab_view_get_type (void)
-{
-	static GType type = 0;
-
-	if (!type) {
-		static const GTypeInfo info =  {
-			sizeof (EABViewClass),
-			NULL,           /* base_init */
-			NULL,           /* base_finalize */
-			(GClassInitFunc) eab_view_class_init,
-			NULL,           /* class_finalize */
-			NULL,           /* class_data */
-			sizeof (EABView),
-			0,             /* n_preallocs */
-			(GInstanceInitFunc) eab_view_init,
-		};
-
-		type = g_type_register_static (PARENT_TYPE, "EABView", &info, 0);
-	}
-
-	return type;
-}
-
-static void
-eab_view_class_init (EABViewClass *klass)
-{
-	GObjectClass *object_class;
-	GtkWidgetClass *widget_class;
-
-	object_class = G_OBJECT_CLASS(klass);
-	widget_class = GTK_WIDGET_CLASS(klass);
-
-	parent_class = gtk_type_class (PARENT_TYPE);
-
-	object_class->set_property = eab_view_set_property;
-	object_class->get_property = eab_view_get_property;
-	object_class->dispose = eab_view_dispose;
-
-	g_object_class_install_property (object_class, PROP_BOOK, 
-					 g_param_spec_object ("book",
-							      _("Book"),
-							      /*_( */"XXX blurb" /*)*/,
-							      E_TYPE_BOOK,
-							      G_PARAM_READWRITE));
-
-	g_object_class_install_property (object_class, PROP_SOURCE, 
-					 g_param_spec_object ("source",
-							      _("Source"),
-							      /*_( */"XXX blurb" /*)*/,
-							      E_TYPE_SOURCE,
-							      G_PARAM_READWRITE));
-
-	g_object_class_install_property (object_class, PROP_QUERY, 
-					 g_param_spec_string ("query",
-							      _("Query"),
-							      /*_( */"XXX blurb" /*)*/,
-							      NULL,
-							      G_PARAM_READWRITE));
-
-	g_object_class_install_property (object_class, PROP_TYPE, 
-					 g_param_spec_int ("type",
-							   _("Type"),
-							   /*_( */"XXX blurb" /*)*/,
-							   EAB_VIEW_NONE, 
-							   EAB_VIEW_TABLE,
-							   EAB_VIEW_NONE,
-							   G_PARAM_READWRITE));
-
-	eab_view_signals [STATUS_MESSAGE] =
-		g_signal_new ("status_message",
-			      G_OBJECT_CLASS_TYPE (object_class),
-			      G_SIGNAL_RUN_LAST,
-			      G_STRUCT_OFFSET (EABViewClass, status_message),
-			      NULL, NULL,
-			      eab_marshal_NONE__POINTER,
-			      G_TYPE_NONE, 1, G_TYPE_POINTER);
-
-	eab_view_signals [SEARCH_RESULT] =
-		g_signal_new ("search_result",
-			      G_OBJECT_CLASS_TYPE (object_class),
-			      G_SIGNAL_RUN_LAST,
-			      G_STRUCT_OFFSET (EABViewClass, search_result),
-			      NULL, NULL,
-			      eab_marshal_NONE__INT,
-			      G_TYPE_NONE, 1, G_TYPE_INT);
-
-	eab_view_signals [FOLDER_BAR_MESSAGE] =
-		g_signal_new ("folder_bar_message",
-			      G_OBJECT_CLASS_TYPE (object_class),
-			      G_SIGNAL_RUN_LAST,
-			      G_STRUCT_OFFSET (EABViewClass, folder_bar_message),
-			      NULL, NULL,
-			      eab_marshal_NONE__POINTER,
-			      G_TYPE_NONE, 1, G_TYPE_POINTER);
-
-	eab_view_signals [COMMAND_STATE_CHANGE] =
-		g_signal_new ("command_state_change",
-			      G_OBJECT_CLASS_TYPE (object_class),
-			      G_SIGNAL_RUN_LAST,
-			      G_STRUCT_OFFSET (EABViewClass, command_state_change),
-			      NULL, NULL,
-			      eab_marshal_NONE__NONE,
-			      G_TYPE_NONE, 0);
-
-	if (!clipboard_atom)
-		clipboard_atom = gdk_atom_intern ("CLIPBOARD", FALSE);
-
-	/* init the accessibility support for e_addressbook_view */
-	eab_view_a11y_init();
-}
-
-static void
-eab_view_init (EABView *eav)
-{
-	eav->view_type = EAB_VIEW_NONE;
-
-	eav->model = NULL;
-	eav->object = NULL;
-	eav->widget = NULL;
-	eav->contact_display_window = NULL;
-	eav->contact_display = NULL;
-	eav->displayed_contact = -1;
-
-	eav->view_instance = NULL;
-	eav->view_menus = NULL;
-	eav->current_view = NULL;
-	eav->uic = NULL;
-
-	eav->book = NULL;
-	eav->source = NULL;
-	eav->query = NULL;
-
-	eav->invisible = NULL;
-	eav->clipboard_contacts = NULL;
-}
-
-static void
-eab_view_dispose (GObject *object)
-{
-	EABView *eav = EAB_VIEW(object);
-
-	if (eav->model) {
-		g_signal_handlers_disconnect_matched (eav->model,
-						      G_SIGNAL_MATCH_DATA,
-						      0, 0, NULL, NULL,
-						      object);
-		g_object_unref (eav->model);
-		eav->model = NULL;
-	}
-
-	if (eav->book) {
-		g_object_unref (eav->book);
-		eav->book = NULL;
-	}
-
-	if (eav->source) {
-		g_object_unref (eav->source);
-		eav->source = NULL;
-	}
-
-	if (eav->query) {
-		g_free(eav->query);
-		eav->query = NULL;
-	}
-
-	eav->uic = NULL;
-
-	if (eav->view_instance) {
-		g_object_unref (eav->view_instance);
-		eav->view_instance = NULL;
-	}
-
-	if (eav->view_menus) {
-		g_object_unref (eav->view_menus);
-		eav->view_menus = NULL;
-	}
-
-	if (eav->clipboard_contacts) {
-		g_list_foreach (eav->clipboard_contacts, (GFunc)g_object_unref, NULL);
-		g_list_free (eav->clipboard_contacts);
-		eav->clipboard_contacts = NULL;
-	}
-
-	if (eav->invisible) {
-		gtk_widget_destroy (eav->invisible);
-		eav->invisible = NULL;
-	}
-
-	if (eav->ecml_changed_id != 0) {
-		g_signal_handler_disconnect (get_master_list(),
-					     eav->ecml_changed_id);
-		eav->ecml_changed_id = 0;
-	}
-
-	if (G_OBJECT_CLASS(parent_class)->dispose)
-		G_OBJECT_CLASS(parent_class)->dispose(object);
-}
-
-static void
-set_paned_position (EABView *eav)
-{
-	GConfClient *gconf_client;
-	gint         pos;
-
-	/* XXX this should use the addressbook's global gconf client */
-	gconf_client = gconf_client_get_default ();
-	pos = gconf_client_get_int (gconf_client, "/apps/evolution/addressbook/display/vpane_position", NULL);
-	if (pos < 1)
-		pos = 144;
-
-	gtk_paned_set_position (GTK_PANED (eav->paned), pos);
-
-	g_object_unref (gconf_client);
-}
-
-static gboolean
-get_paned_position (EABView *eav)
-{
-	GConfClient *gconf_client;
-	gint pos;
-
-	/* XXX this should use the addressbook's global gconf client */
-	gconf_client = gconf_client_get_default ();
-
-	pos = gtk_paned_get_position (GTK_PANED (eav->paned));
-	gconf_client_set_int (gconf_client, "/apps/evolution/addressbook/display/vpane_position", pos, NULL);
-
-	g_object_unref (gconf_client);
-
-	return FALSE;
-}
-
-GtkWidget*
-eab_view_new (void)
-{
-	GtkWidget *widget = GTK_WIDGET (g_object_new (E_TYPE_AB_VIEW, NULL));
-	EABView *eav = EAB_VIEW (widget);
-	FilterPart *part;
-
-	/* create our model */
-	eav->model = eab_model_new ();
-
-	g_signal_connect (eav->model, "status_message",
-			  G_CALLBACK (status_message), eav);
-	g_signal_connect (eav->model, "search_result",
-			  G_CALLBACK (search_result), eav);
-	g_signal_connect (eav->model, "folder_bar_message",
-			  G_CALLBACK (folder_bar_message), eav);
-	g_signal_connect (eav->model, "stop_state_changed",
-			  G_CALLBACK (stop_state_changed), eav);
-	g_signal_connect (eav->model, "writable_status",
-			  G_CALLBACK (writable_status), eav);
-	g_signal_connect (eav->model, "backend_died",
-			  G_CALLBACK (backend_died), eav);
-	g_signal_connect (eav->model, "contact_changed",
-			  G_CALLBACK (contact_changed), eav);
-	g_signal_connect (eav->model, "contacts_removed",
-			  G_CALLBACK (contacts_removed), eav);
-
-	eav->editable = FALSE;
-	eav->query = g_strdup (SHOW_ALL_SEARCH);
-
-	/* create our search bar */
-	eav->search = E_SEARCH_BAR (e_search_bar_new (NULL, addressbook_search_option_items));
-	e_search_bar_set_menu (eav->search, addressbook_search_items);
-	make_suboptions (eav);
-	connect_master_list_changed (eav);
-	g_signal_connect (eav->search, "query_changed",
-			  G_CALLBACK (query_changed), eav);
-	g_signal_connect (eav->search, "search_activated",
-			  G_CALLBACK (search_activated), eav);
-	g_signal_connect (eav->search, "menu_activated",
-			  G_CALLBACK (search_menu_activated), eav);
-	gtk_box_pack_start (GTK_BOX (eav), GTK_WIDGET (eav->search), FALSE, FALSE, 0);
-	gtk_widget_show (GTK_WIDGET (eav->search));
-	gtk_widget_set_sensitive (GTK_WIDGET (eav->search), FALSE);
-
-	/* create the search context */
-	eav->search_context = rule_context_new ();
-	rule_context_add_part_set (eav->search_context, "partset", filter_part_get_type (),
-				   rule_context_add_part, rule_context_next_part);
-	rule_context_load (eav->search_context, SEARCH_RULE_DIR "/addresstypes.xml", "");
-
-	eav->search_rule = filter_rule_new ();
-	part = rule_context_next_part (eav->search_context, NULL);
-
-	if (part == NULL)
-		g_warning ("Could not load addressbook search; no parts.");
-	else
-		filter_rule_add_part (eav->search_rule, filter_part_clone (part));
-
-	/* create the paned window and contact display */
-	eav->paned = gtk_vpaned_new ();
-	gtk_box_pack_start (GTK_BOX (eav), eav->paned, TRUE, TRUE, 0);
-	g_signal_connect_swapped (eav->paned, "button_release_event",
-				  G_CALLBACK (get_paned_position), eav);
-
-	eav->contact_display = eab_contact_display_new ();
-	eav->contact_display_window = gtk_scrolled_window_new (NULL, NULL);
-	gtk_scrolled_window_set_policy (GTK_SCROLLED_WINDOW (eav->contact_display_window), GTK_POLICY_AUTOMATIC, GTK_POLICY_AUTOMATIC);
-	gtk_scrolled_window_set_shadow_type (GTK_SCROLLED_WINDOW (eav->contact_display_window), GTK_SHADOW_IN);
-	gtk_container_add (GTK_CONTAINER (eav->contact_display_window), eav->contact_display);
-	gtk_paned_add2 (GTK_PANED (eav->paned), eav->contact_display_window);
-	gtk_widget_show (eav->contact_display);
-	gtk_widget_show (eav->contact_display_window);
-	gtk_widget_show (eav->paned);
-
-	/* gtk selection crap */
-	eav->invisible = gtk_invisible_new ();
-
-	gtk_selection_add_target (eav->invisible,
-				  clipboard_atom,
-				  GDK_SELECTION_TYPE_STRING,
-				  0);
-		
-	g_signal_connect (eav->invisible, "selection_get",
-			  G_CALLBACK (selection_get), 
-			  eav);
-	g_signal_connect (eav->invisible, "selection_clear_event",
-			  G_CALLBACK (selection_clear_event),
-			  eav);
-	g_signal_connect (eav->invisible, "selection_received",
-			  G_CALLBACK (selection_received),
-			  eav);
-	g_object_weak_ref (G_OBJECT (eav->invisible), invisible_destroyed, eav);
-
-	return widget;
-}
-
-RuleContext *
-eab_view_peek_search_context (EABView *view)
-{
-	return view->search_context;
-}
-
-FilterRule *
-eab_view_peek_search_rule (EABView *view)
-{
-	return view->search_rule;
-}
-
-static void
-writable_status (GtkObject *object, gboolean writable, EABView *eav)
-{
-	eav->editable = writable;
-	command_state_change (eav);
-}
-
-static void
-init_collection (void)
-{
-	GalViewFactory *factory;
-	ETableSpecification *spec;
-	char *galview;
-
-	if (collection == NULL) {
-		collection = gal_view_collection_new();
-
-		gal_view_collection_set_title (collection, _("Address Book"));
-
-		galview = gnome_util_prepend_user_home("/.evolution/addressbook/views");
-		gal_view_collection_set_storage_directories
-			(collection,
-			 EVOLUTION_GALVIEWSDIR "/addressbook/",
-			 galview);
-		g_free(galview);
-
-		spec = e_table_specification_new();
-		e_table_specification_load_from_file (spec, EVOLUTION_ETSPECDIR "/e-addressbook-view.etspec");
-
-		factory = gal_view_factory_etable_new (spec);
-		g_object_unref (spec);
-		gal_view_collection_add_factory (collection, factory);
-		g_object_unref (factory);
-
-		factory = gal_view_factory_minicard_new();
-		gal_view_collection_add_factory (collection, factory);
-		g_object_unref (factory);
-
-#ifdef WITH_ADDRESSBOOK_VIEW_TREEVIEW
-		factory = gal_view_factory_treeview_new ();
-		gal_view_collection_add_factory (collection, factory);
-		g_object_unref (factory);
-#endif
-
-		gal_view_collection_load(collection);
-	}
-}
-
-static void
-set_view_preview (EABView *view)
-{
-	/* XXX this should use the addressbook's global gconf client */
-	GConfClient *gconf_client;
-	gboolean state;
-
-	gconf_client = gconf_client_get_default();
-	state = gconf_client_get_bool(gconf_client, "/apps/evolution/addressbook/display/show_preview", NULL);
-	bonobo_ui_component_set_prop (view->uic,
-				      "/commands/ContactsViewPreview",
-				      "state",
-				      state ? "1" : "0", NULL);
-
-	eab_view_show_contact_preview (view, state);
-	
-	g_object_unref (gconf_client);
-}
-
-static void
-display_view(GalViewInstance *instance,
-	     GalView *view,
-	     gpointer data)
-{
-	EABView *address_view = data;
-	if (GAL_IS_VIEW_ETABLE(view)) {
-		change_view_type (address_view, EAB_VIEW_TABLE);
-		gal_view_etable_attach_table (GAL_VIEW_ETABLE(view), e_table_scrolled_get_table(E_TABLE_SCROLLED(address_view->widget)));
-	}
-	else if (GAL_IS_VIEW_MINICARD(view)) {
-		change_view_type (address_view, EAB_VIEW_MINICARD);
-		gal_view_minicard_attach (GAL_VIEW_MINICARD (view), E_MINICARD_VIEW_WIDGET (address_view->object));
-	}
-#ifdef WITH_ADDRESSBOOK_VIEW_TREEVIEW
-	else if (GAL_IS_VIEW_TREEVIEW (view)) {
-		change_view_type (address_view, EAB_VIEW_TREEVIEW);
-		gal_view_treeview_attach (GAL_VIEW_TREEVIEW(view), GTK_TREE_VIEW (address_view->object));
-	}
-#endif
-	address_view->current_view = view;
-
-	set_paned_position (address_view);
-	set_view_preview (address_view);
-}
-
-static void
-view_preview(BonoboUIComponent *uic, const char *path, Bonobo_UIComponent_EventType type, const char *state, void *data)
-{
-	/* XXX this should use the addressbook's global gconf client */
-	GConfClient *gconf_client;
-	EABView *view = EAB_VIEW (data);
-
-	if (type != Bonobo_UIComponent_STATE_CHANGED)
-		return;
-
-	gconf_client = gconf_client_get_default();
-	gconf_client_set_bool(gconf_client, "/apps/evolution/addressbook/display/show_preview", state[0] != '0', NULL);
-
-	eab_view_show_contact_preview(view, state[0] != '0');
-
-	g_object_unref (gconf_client);
-}
-
-static void
-setup_menus (EABView *view)
-{
-	if (view->book && view->view_instance == NULL) {
-		init_collection ();
-		view->view_instance = gal_view_instance_new (collection, e_book_get_uri (view->book));
-	}
-
-	if (view->view_instance && view->uic) {
-		view->view_menus = gal_view_menus_new(view->view_instance);
-		gal_view_menus_apply(view->view_menus, view->uic, NULL);
-
-		display_view (view->view_instance, gal_view_instance_get_current_view (view->view_instance), view);
-
-		g_signal_connect(view->view_instance, "display_view",
-				 G_CALLBACK (display_view), view);
-	}
-
-	bonobo_ui_component_add_listener(view->uic, "ContactsViewPreview", view_preview, view);
-
-	set_view_preview (view);
-}
-
-static void
-eab_view_set_property (GObject *object, guint prop_id, const GValue *value, GParamSpec *pspec)
-{
-	EABView *eav = EAB_VIEW(object);
-
-	switch (prop_id){
-	case PROP_BOOK:
-		if (eav->book) {
-			g_object_unref (eav->book);
-		}
-		if (g_value_get_object (value)) {
-			eav->book = E_BOOK(g_value_get_object (value));
-			g_object_ref (eav->book);
-			gtk_widget_set_sensitive (GTK_WIDGET (eav->search), TRUE);
-		}
-		else {
-			eav->book = NULL;
-			gtk_widget_set_sensitive (GTK_WIDGET (eav->search), FALSE);
-		}
-
-		if (eav->view_instance) {
-			g_object_unref (eav->view_instance);
-			eav->view_instance = NULL;
-		}
-
-		g_object_set(eav->model,
-			     "book", eav->book,
-			     NULL);
-
-		setup_menus (eav);
-
-		break;
-	case PROP_SOURCE:
-		if (eav->source) {
-			g_warning ("EABView at present does not support multiple writes on the \"source\" property.");
-			break;
-		}
-		else {
-			if (g_value_get_object (value)) {
-				eav->source = E_SOURCE(g_value_get_object (value));
-				g_object_ref (eav->source);
-			}
-			else {
-				eav->source = NULL;
-			}
-		}
-		break;
-	case PROP_QUERY:
-#if 0 /* This code will mess up ldap a bit.  We need to think about the ramifications of this more. */
-		if ((g_value_get_string (value) == NULL && !strcmp (eav->query, SHOW_ALL_SEARCH)) ||
-		    (g_value_get_string (value) != NULL && !strcmp (eav->query, g_value_get_string (value))))
-			break;
-#endif
-		g_free(eav->query);
-		eav->query = g_strdup(g_value_get_string (value));
-		if (!eav->query)
-			eav->query = g_strdup (SHOW_ALL_SEARCH);
-		g_object_set(eav->model,
-			     "query", eav->query,
-			     NULL);
-		break;
-	case PROP_TYPE:
-		change_view_type(eav, g_value_get_int (value));
-		break;
-	default:
-		G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
-		break;
-	}
-}
-
-static void
-eab_view_get_property (GObject *object, guint prop_id, GValue *value, GParamSpec *pspec)
-{
-	EABView *eav = EAB_VIEW(object);
-
-	switch (prop_id) {
-	case PROP_BOOK:
-		if (eav->book)
-			g_value_set_object (value, eav->book);
-		else
-			g_value_set_object (value, NULL);
-		break;
-	case PROP_SOURCE:
-		if (eav->source)
-			g_value_set_object (value, eav->source);
-		else
-			g_value_set_object (value, NULL);
-		break;
-
-	case PROP_QUERY:
-		g_value_set_string (value, eav->query);
-		break;
-	case PROP_TYPE:
-		g_value_set_int (value, eav->view_type);
-		break;
-	default:
-		G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
-		break;
-	}
-}
-
-static ESelectionModel*
-get_selection_model (EABView *view)
-{
-	if (view->view_type == EAB_VIEW_TABLE)
-		return e_table_get_selection_model (e_table_scrolled_get_table (E_TABLE_SCROLLED(view->widget)));
-	else if (view->view_type == EAB_VIEW_MINICARD)
-		return e_minicard_view_widget_get_selection_model (E_MINICARD_VIEW_WIDGET(view->object));
-#ifdef WITH_ADDRESSBOOK_VIEW_TREEVIEW
-	else if (view->view_type == EAB_VIEW_TREEVIEW)
-		return e_treeview_get_selection_model (GTK_TREE_VIEW (view->object));
-#endif
-	g_return_val_if_reached (NULL);
-}
-
-/* Popup menu stuff */
-typedef struct {
-	EABView *view;
-	gpointer closure;
-} ContactAndBook;
-
-static ESelectionModel*
-contact_and_book_get_selection_model (ContactAndBook *contact_and_book)
-{
-	return get_selection_model (contact_and_book->view);
-}
-
-static GList *
-get_contact_list (EABPopupTargetSelect *t)
-{
-	GList *list = NULL;
-	int i;
-
-	for (i=0;i<t->cards->len;i++)
-		list = g_list_prepend(list, t->cards->pdata[i]);
-
-	return list;
-}
-
-static void
-save_as (EPopup *ep, EPopupItem *pitem, void *data)
-{
-	/*ContactAndBook *contact_and_book = data;*/
-	GList *contacts = get_contact_list ((EABPopupTargetSelect *)ep->target);
-
-	if (contacts) {
-		eab_contact_list_save(_("Save as VCard..."), contacts, NULL);
-		g_list_free(contacts);
-	}
-}
-
-static void
-send_as (EPopup *ep, EPopupItem *pitem, void *data)
-{
-	/*ContactAndBook *contact_and_book = data;*/
-	GList *contacts = get_contact_list ((EABPopupTargetSelect *)ep->target);
-
-	if (contacts) {
-		eab_send_contact_list(contacts, EAB_DISPOSITION_AS_ATTACHMENT);
-		g_list_free(contacts);
-	}
-}
-
-static void
-send_to (EPopup *ep, EPopupItem *pitem, void *data)
-{
-	/*ContactAndBook *contact_and_book = data;*/
-	GList *contacts = get_contact_list ((EABPopupTargetSelect *)ep->target);
-
-	if (contacts) {
-		eab_send_contact_list(contacts, EAB_DISPOSITION_AS_TO);
-		g_list_free(contacts);
-	}
-}
-
-static void
-print (EPopup *ep, EPopupItem *pitem, void *data)
-{
-	/*ContactAndBook *contact_and_book = data;*/
-	EABPopupTargetSelect *t = (EABPopupTargetSelect *)ep->target;
-
-	if (t->cards->len == 1) {
-		gtk_widget_show(e_contact_print_contact_dialog_new(t->cards->pdata[0]));
-	} else {
-		GList *contacts = get_contact_list(t);
-
-		gtk_widget_show(e_contact_print_contact_list_dialog_new(contacts));
-		g_list_free(contacts);
-	}
-}
-
-static void
-copy (EPopup *ep, EPopupItem *pitem, void *data)
-{
-	ContactAndBook *contact_and_book = data;
-
-	eab_view_copy (contact_and_book->view);
-}
-
-static void
-paste (EPopup *ep, EPopupItem *pitem, void *data)
-{
-	ContactAndBook *contact_and_book = data;
-
-	eab_view_paste (contact_and_book->view);
-}
-
-static void
-cut (EPopup *ep, EPopupItem *pitem, void *data)
-{
-	ContactAndBook *contact_and_book = data;
-
-	eab_view_cut (contact_and_book->view);
-}
-
-static void
-delete (EPopup *ep, EPopupItem *pitem, void *data)
-{
-	ContactAndBook *contact_and_book = data;
-
-	eab_view_delete_selection(contact_and_book->view);
-}
-
-static void
-copy_to_folder (EPopup *ep, EPopupItem *pitem, void *data)
-{
-	ContactAndBook *contact_and_book = data;
-
-	eab_view_copy_to_folder (contact_and_book->view);
-}
-
-static void
-move_to_folder (EPopup *ep, EPopupItem *pitem, void *data)
-{
-	ContactAndBook *contact_and_book = data;
-
-	eab_view_move_to_folder (contact_and_book->view);
-}
-
-static void
-new_card (EPopup *ep, EPopupItem *pitem, void *data)
-{
-	/*ContactAndBook *contact_and_book = data;*/
-	EContact *contact = e_contact_new();
-
-	eab_show_contact_editor (((EABPopupTargetSelect *)ep->target)->book, contact, TRUE, TRUE);
-	g_object_unref (contact);
-}
-
-static void
-new_list (EPopup *ep, EPopupItem *pitem, void *data)
-{
-	/*ContactAndBook *contact_and_book = data;*/
-	EContact *contact = e_contact_new ();
-
-	eab_show_contact_list_editor (((EABPopupTargetSelect *)ep->target)->book, contact, TRUE, TRUE);
-	g_object_unref(contact);
-}
-
-static EPopupItem eabv_popup_items[] = {
-	{ E_POPUP_ITEM, "10.new",  N_("New Contact..."), new_card, NULL, "stock_contact", 0, EAB_POPUP_SELECT_EDITABLE},
-	{ E_POPUP_ITEM, "15.newlist", N_("New Contact List..."), new_list, NULL, "stock_contact-list", 0, EAB_POPUP_SELECT_EDITABLE },
-
-	{ E_POPUP_BAR, "20.bar" },
-	{ E_POPUP_ITEM, "30.saveas", N_("Save as VCard..."), save_as, NULL, "stock_save-as", 0, EAB_POPUP_SELECT_ANY },
-	{ E_POPUP_ITEM, "40.forward", N_("Forward Contact"), send_as, NULL, "stock_mail-forward", 0, EAB_POPUP_SELECT_ANY },
-	{ E_POPUP_ITEM, "50.mailto", N_("Send Message to Contact"), send_to, NULL, "stock_mail-send", 0, EAB_POPUP_SELECT_ANY|EAB_POPUP_SELECT_EMAIL },
-	{ E_POPUP_ITEM, "60.print", N_("Print"), print, NULL, "stock_print", 0, EAB_POPUP_SELECT_ANY },
-
-	{ E_POPUP_BAR, "70.bar" },
-	{ E_POPUP_ITEM, "80.copyto", N_("Copy to Address Book..."), copy_to_folder, NULL, NULL, 0, EAB_POPUP_SELECT_ANY },
-	{ E_POPUP_ITEM, "90.moveto", N_("Move to Address Book..."), move_to_folder, NULL, NULL, 0, EAB_POPUP_SELECT_ANY|EAB_POPUP_SELECT_EDITABLE },
-
-	{ E_POPUP_BAR, "a0.bar" },
-	{ E_POPUP_ITEM, "b0.cut", N_("Cut"), cut, NULL, "stock_cut", 0, EAB_POPUP_SELECT_ANY|EAB_POPUP_SELECT_EDITABLE },
-	{ E_POPUP_ITEM, "c0.copy", N_("Copy"), copy, NULL, "stock_copy", 0, EAB_POPUP_SELECT_ANY },
-	{ E_POPUP_ITEM, "d0.paste", N_("Paste"), paste, NULL, "stock_paste", 0, EAB_POPUP_SELECT_EDITABLE },
-	{ E_POPUP_ITEM, "e0.delete", N_("Delete"), delete, NULL, "stock_delete", 0, EAB_POPUP_SELECT_EDITABLE|EAB_POPUP_SELECT_ANY },
-};
-
-static void
-get_card_1(gint model_row, void *data)
-{
-	ContactAndBook *contact_and_book = data;
-	EContact *contact;
-
-	contact = eab_model_get_contact(contact_and_book->view->model, model_row);
-	if (contact)
-		g_ptr_array_add((GPtrArray *)contact_and_book->closure, contact);
-}
-
-static void
-eabv_popup_free(EPopup *ep, GSList *list, void *data)
-{
-	ContactAndBook *cab = data;
-	ESelectionModel *selection;
-
-	/* NB: this looks strange to me */
-	selection = contact_and_book_get_selection_model(cab);
-	if (selection)
-		e_selection_model_right_click_up(selection);
-
-	g_slist_free(list);
-	g_object_unref(cab->view);
-	g_free(cab);
-}
-
-static void
-do_popup_menu(EABView *view, GdkEvent *event)
-{
-	EABPopup *ep;
-	EABPopupTargetSelect *t;
-	GSList *menus = NULL;
-	int i;
-	GtkMenu *menu;
-	GPtrArray *cards = g_ptr_array_new();
-	ContactAndBook *contact_and_book;
-	ESelectionModel *selection_model;
-
-	contact_and_book = g_new(ContactAndBook, 1);
-	contact_and_book->view = view;
-	g_object_ref(contact_and_book->view);
-
-	selection_model = contact_and_book_get_selection_model(contact_and_book);
-	if (selection_model) {
-		contact_and_book->closure = cards;
-		e_selection_model_foreach(selection_model, get_card_1, contact_and_book);
-	}
-
-	ep = eab_popup_new("org.gnome.evolution.addressbook.view.popup");
-	t = eab_popup_target_new_select(ep, view->book, !eab_model_editable(view->model), cards);
-	t->target.widget = (GtkWidget *)view;
-
-	for (i=0;i<sizeof(eabv_popup_items)/sizeof(eabv_popup_items[0]);i++)
-		menus = g_slist_prepend(menus, &eabv_popup_items[i]);
-
-	e_popup_add_items((EPopup *)ep, menus, NULL, eabv_popup_free, contact_and_book);
-
-	menu = e_popup_create_menu_once((EPopup *)ep, (EPopupTarget *)t, 0);
-	gtk_menu_popup(menu, NULL, NULL, NULL, NULL, event?event->button.button:0, event?event->button.time:gtk_get_current_event_time());
-}
-
-static void
-render_contact (int row, EABView *view)
-{
-	EContact *contact = eab_model_get_contact (view->model, row);
-
-	view->displayed_contact = row;
-
-	eab_contact_display_render (EAB_CONTACT_DISPLAY (view->contact_display), contact,
-				    EAB_CONTACT_DISPLAY_RENDER_NORMAL);
-}
-
-static void
-selection_changed (GObject *o, EABView *view)
-{
-	ESelectionModel *selection_model;
-
-	command_state_change (view);
-
-	selection_model = get_selection_model (view);
-
-	if (e_selection_model_selected_count (selection_model) == 1)
-		e_selection_model_foreach (selection_model,
-					   (EForeachFunc)render_contact, view);
-	else {
-		view->displayed_contact = -1;
-		eab_contact_display_render (EAB_CONTACT_DISPLAY (view->contact_display), NULL,
-					    EAB_CONTACT_DISPLAY_RENDER_NORMAL);
-	}
-					    
-}
-
-static void
-table_double_click(ETableScrolled *table, gint row, gint col, GdkEvent *event, EABView *view)
-{
-	if (E_IS_ADDRESSBOOK_TABLE_ADAPTER(view->object)) {
-		EABModel *model = view->model;
-		EContact *contact = eab_model_get_contact (model, row);
-		EBook *book;
-
-		g_object_get(model,
-			     "book", &book,
-			     NULL);
-		
-		g_assert (E_IS_BOOK (book));
-
-		if (e_contact_get (contact, E_CONTACT_IS_LIST))
-			eab_show_contact_list_editor (book, contact, FALSE, view->editable);
-		else
-			eab_show_contact_editor (book, contact, FALSE, view->editable);
-
-		g_object_unref (book);
-		g_object_unref (contact);
-	}
-}
-
-static gint
-table_right_click(ETableScrolled *table, gint row, gint col, GdkEvent *event, EABView *view)
-{
-	do_popup_menu(view, event);
-	return TRUE;
-}
-
-static gint
-table_white_space_event(ETableScrolled *table, GdkEvent *event, EABView *view)
-{
-	if (event->type == GDK_BUTTON_PRESS && ((GdkEventButton *)event)->button == 3) {
-		do_popup_menu(view, event);
-		return TRUE;
-	} else {
-		return FALSE;
-	}
-}
-
-static void
-table_drag_data_get (ETable             *table,
-		     int                 row,
-		     int                 col,
-		     GdkDragContext     *context,
-		     GtkSelectionData   *selection_data,
-		     guint               info,
-		     guint               time,
-		     gpointer            user_data)
-{
-	EABView *view = user_data;
-	GList *contact_list;
-
-	if (!E_IS_ADDRESSBOOK_TABLE_ADAPTER(view->object))
-		return;
-
-	contact_list = get_selected_contacts (view);
-
-	switch (info) {
-	case DND_TARGET_TYPE_VCARD: {
-		char *value;
-
-		value = eab_contact_list_to_string (contact_list);
-
-		gtk_selection_data_set (selection_data,
-					selection_data->target,
-					8,
-					value, strlen (value));
-		break;
-	}
-	case DND_TARGET_TYPE_SOURCE_VCARD: {
-		char *value;
-
-		value = eab_book_and_contact_list_to_string (view->book, contact_list);
-
-		gtk_selection_data_set (selection_data,
-					selection_data->target,
-					8,
-					value, strlen (value));
-		break;
-	}
-	}
-
-	g_list_foreach (contact_list, (GFunc) g_object_unref, NULL);
-	g_list_free (contact_list);
-}
-
-static void
-emit_status_message (EABView *eav, const gchar *status)
-{
-	g_signal_emit (eav,
-		       eab_view_signals [STATUS_MESSAGE], 0,
-		       status);
-}
-
-static void
-emit_search_result (EABView *eav, EBookViewStatus status)
-{
-	g_signal_emit (eav,
-		       eab_view_signals [SEARCH_RESULT], 0,
-		       status);
-}
-
-static void
-emit_folder_bar_message (EABView *eav, const gchar *message)
-{
-	g_signal_emit (eav,
-		       eab_view_signals [FOLDER_BAR_MESSAGE], 0,
-		       message);
-}
-
-static void
-status_message (GtkObject *object, const gchar *status, EABView *eav)
-{
-	emit_status_message (eav, status);
-}
-
-static void
-search_result (GtkObject *object, EBookViewStatus status, EABView *eav)
-{
-	emit_search_result (eav, status);
-}
-
-static void
-folder_bar_message (GtkObject *object, const gchar *status, EABView *eav)
-{
-	emit_folder_bar_message (eav, status);
-}
-
-static void
-stop_state_changed (GtkObject *object, EABView *eav)
-{
-	command_state_change (eav);
-}
-
-static void
-command_state_change (EABView *eav)
-{
-	/* Reffing during emission is unnecessary.  Gtk automatically refs during an emission. */
-	g_signal_emit (eav, eab_view_signals [COMMAND_STATE_CHANGE], 0);
-}
-
-static void
-backend_died (GtkObject *object, EABView *eav)
-{
-	e_error_run (GTK_WINDOW (gtk_widget_get_toplevel (GTK_WIDGET (eav))),
-		     "addressbook:backend-died", e_book_get_uri (eav->book), NULL);
-}
-
-static void
-contact_changed (EABModel *model, gint index, EABView *eav)
-{
-	if (eav->displayed_contact == index) {
-		/* if the contact that's presently displayed is changed, re-render it */
-		render_contact (index, eav);
-	}
-}
-
-static void
-contacts_removed (EABModel *model, gpointer data, EABView *eav)
-{
-	GArray *indices = (GArray *) data;
-	int count = indices->len;
-	gint i;
-
-	for (i = 0; i < count; i ++) {
-	
-		
-		if (eav->displayed_contact == g_array_index (indices, gint, i)) {
-			
-			/* if the contact that's presently displayed is changed, clear the display */
-			eab_contact_display_render (EAB_CONTACT_DISPLAY (eav->contact_display), NULL,
-						    EAB_CONTACT_DISPLAY_RENDER_NORMAL);
-			eav->displayed_contact = -1;
-			break;
-		}
-	}
-}
-
-static void
-minicard_right_click (EMinicardView *minicard_view_item, GdkEvent *event, EABView *view)
-{
-       do_popup_menu(view, event);
-}
-
-static void
-create_minicard_view (EABView *view)
-{
-	GtkWidget *scrolled_window;
-	GtkWidget *minicard_view;
-	EAddressbookReflowAdapter *adapter;
-
-	adapter = E_ADDRESSBOOK_REFLOW_ADAPTER(e_addressbook_reflow_adapter_new (view->model));
-	minicard_view = e_minicard_view_widget_new(adapter);
-
-	g_signal_connect(minicard_view, "selection_change",
-			 G_CALLBACK(selection_changed), view);
-
-	g_signal_connect(minicard_view, "right_click",
-			 G_CALLBACK(minicard_right_click), view);
-
-	scrolled_window = gtk_scrolled_window_new (NULL, NULL);
-	gtk_scrolled_window_set_shadow_type (GTK_SCROLLED_WINDOW (scrolled_window), GTK_SHADOW_IN);
-	gtk_scrolled_window_set_policy (GTK_SCROLLED_WINDOW (scrolled_window),
-					GTK_POLICY_AUTOMATIC,
-					GTK_POLICY_AUTOMATIC);
-
-	view->object = G_OBJECT(minicard_view);
-	view->widget = scrolled_window;
-
-	gtk_container_add (GTK_CONTAINER (scrolled_window), minicard_view);
-	gtk_widget_show (minicard_view);
-
-	gtk_widget_show_all( GTK_WIDGET(scrolled_window) );
-
-	gtk_paned_add1 (GTK_PANED (view->paned), scrolled_window);
-
-	e_reflow_model_changed (E_REFLOW_MODEL (adapter));
-}
-
-static void
-create_table_view (EABView *view)
-{
-	ETableModel *adapter;
-	GtkWidget *table;
-	
-	adapter = eab_table_adapter_new(view->model);
-
-	/* Here we create the table.  We give it the three pieces of
-	   the table we've created, the header, the model, and the
-	   initial layout.  It does the rest.  */
-	table = e_table_scrolled_new_from_spec_file (adapter, NULL, EVOLUTION_ETSPECDIR "/e-addressbook-view.etspec", NULL);
-
-	view->object = G_OBJECT(adapter);
-	view->widget = table;
-
-	g_signal_connect(e_table_scrolled_get_table(E_TABLE_SCROLLED(table)), "double_click",
-			 G_CALLBACK(table_double_click), view);
-	g_signal_connect(e_table_scrolled_get_table(E_TABLE_SCROLLED(table)), "right_click",
-			 G_CALLBACK(table_right_click), view);
-	g_signal_connect(e_table_scrolled_get_table(E_TABLE_SCROLLED(table)), "white_space_event",
-			 G_CALLBACK(table_white_space_event), view);
-	g_signal_connect(e_table_scrolled_get_table(E_TABLE_SCROLLED(table)), "selection_change",
-			 G_CALLBACK(selection_changed), view);
-
-	/* drag & drop signals */
-	e_table_drag_source_set (E_TABLE(E_TABLE_SCROLLED(table)->table), GDK_BUTTON1_MASK,
-				 drag_types, num_drag_types, GDK_ACTION_MOVE | GDK_ACTION_COPY);
-	
-	g_signal_connect (E_TABLE_SCROLLED(table)->table,
-			  "table_drag_data_get",
-			  G_CALLBACK (table_drag_data_get),
-			  view);
-
-	gtk_paned_add1 (GTK_PANED (view->paned), table);
-
-	gtk_widget_show( GTK_WIDGET(table) );
-}
-
-#ifdef WITH_ADDRESSBOOK_VIEW_TREEVIEW
-static void
-treeview_row_activated(GtkTreeView *treeview,
-		       GtkTreePath *path, GtkTreeViewColumn *column,
-		       EABView *view)
-{
-	EABModel *model = view->model;
-	int row = gtk_tree_path_get_indices (path)[0];
-	ECard *card = eab_model_get_card(model, row);
-	EBook *book;
-
-	g_object_get(model,
-		     "book", &book,
-		     NULL);
-		
-	g_assert (E_IS_BOOK (book));
-
-	if (e_card_evolution_list (card))
-		eab_show_contact_list_editor (book, card, FALSE, view->editable);
-	else
-		eab_show_contact_editor (book, card, FALSE, view->editable);
-
-	g_object_unref (book);
-	g_object_unref (card);
-}
-
-static void
-create_treeview_view (EABView *view)
-{
-	GtkTreeModel *adapter;
-	ECardSimple *simple;
-	GtkWidget *treeview;
-	GtkWidget *scrolled;
-	int i;
-
-	simple = e_card_simple_new(NULL);
-
-	adapter = eab_treeview_adapter_new(view->model);
-
-	scrolled = gtk_scrolled_window_new (NULL, NULL);
-	gtk_scrolled_window_set_shadow (GTK_SCROLLED_WINDOW (scrolled), GTK_SHADOW_IN);
-	treeview = gtk_tree_view_new_with_model (adapter);
-
-	gtk_widget_show (treeview);
-
-	gtk_container_add (GTK_CONTAINER (scrolled), treeview);
-
-	for (i = 0; i < 15; i ++) {
-		GtkTreeViewColumn *column =
-			gtk_tree_view_column_new_with_attributes (e_card_simple_get_name (simple, i),
-								  gtk_cell_renderer_text_new (),
-								  "text", i,
-								  NULL);
-
-		gtk_tree_view_append_column (GTK_TREE_VIEW (treeview), column);
-	}
-
-	view->object = G_OBJECT(treeview);
-	view->widget = scrolled;
-
-	gtk_tree_selection_set_mode (gtk_tree_view_get_selection (GTK_TREE_VIEW (treeview)), GTK_SELECTION_MULTIPLE);
-	gtk_tree_view_enable_model_drag_source (GTK_TREE_VIEW (treeview), 
-						GDK_BUTTON1_MASK,
-						drag_types,
-						num_drag_types,
-						GDK_ACTION_MOVE);
-
-	g_signal_connect(treeview, "row_activated",
-			 G_CALLBACK (treeview_row_activated), view);
-#if 0
-	g_signal_connect(e_table_scrolled_get_table(E_TABLE_SCROLLED(table)), "right_click",
-			 G_CALLBACK(table_right_click), view);
-
-	/* drag & drop signals */
-	e_table_drag_source_set (E_TABLE(E_TABLE_SCROLLED(table)->table), GDK_BUTTON1_MASK,
-				 drag_types, num_drag_types, GDK_ACTION_MOVE);
-	
-	g_signal_connect (E_TABLE_SCROLLED(table)->table,
-			  "table_drag_data_get",
-			  G_CALLBACK (table_drag_data_get),
-			  view);
-#endif
-
-
-	g_signal_connect(e_treeview_get_selection_model (GTK_TREE_VIEW (treeview)), "selection_changed",
-			 G_CALLBACK(selection_changed), view);
-
-	gtk_paned_add1 (GTK_PANED (view->paned), scrolled);
-
-	gtk_widget_show( GTK_WIDGET(scrolled) );
-
-	g_object_unref (simple);
-}
-#endif
-
-static void
-change_view_type (EABView *view, EABViewType view_type)
-{
-	if (view_type == view->view_type)
-		return;
-
-	if (view->widget) {
-		gtk_container_remove (GTK_CONTAINER (view->paned), view->widget);
-		view->widget = NULL;
-	}
-	view->object = NULL;
-
-	switch (view_type) {
-	case EAB_VIEW_TABLE:
-		create_table_view (view);
-		break;
-	case EAB_VIEW_MINICARD:
-		create_minicard_view (view);
-		break;
-#ifdef WITH_ADDRESSBOOK_VIEW_TREEVIEW
-	case EAB_VIEW_TREEVIEW:
-		create_treeview_view (view);
-		break;
-#endif
-	default:
-		g_warning ("view_type not recognized.");
-		return;
-	}
-
-	view->view_type = view_type;
-
-	command_state_change (view);
-}
-
-
-
-static void
-search_activated (ESearchBar *esb, EABView *v)
-{
-	ECategoriesMasterList *master_list;
-	char *search_word, *search_query;
-	const char *category_name;
-	int search_type, subid;
-
-	g_message ("in search_activated");
-
-	g_object_get(esb,
-		     "text", &search_word,
-		     "item_id", &search_type,
-		     NULL);
-
-	if (search_type == ESB_ADVANCED) {
-		gtk_widget_show(eab_search_dialog_new(v));
-	}
-	else {
-		if ((search_word && strlen (search_word)) || search_type == ESB_CATEGORY) {
-			GString *s = g_string_new ("");
-			e_sexp_encode_string (s, search_word);
-			switch (search_type) {
-			case ESB_ANY:
-				search_query = g_strdup_printf ("(contains \"x-evolution-any-field\" %s)",
-								s->str);
-				break;
-			case ESB_FULL_NAME:
-				search_query = g_strdup_printf ("(beginswith \"full_name\" %s)",
-								s->str);
-				break;
-			case ESB_EMAIL:
-				search_query = g_strdup_printf ("(beginswith \"email\" %s)",
-								s->str);
-				break;
-			case ESB_CATEGORY:
-				subid = e_search_bar_get_subitem_id (esb);
-
-				if (subid < 0 || subid == G_MAXINT) {
-					/* match everything */
-					search_query = g_strdup ("(contains \"x-evolution-any-field\" \"\")");
-				} else {
-					master_list = get_master_list ();
-					category_name = e_categories_master_list_nth (master_list, subid);
-					search_query = g_strdup_printf ("(is \"category_list\" \"%s\")", category_name);
-				}
-				break;
-			default:
-				search_query = g_strdup ("(contains \"x-evolution-any-field\" \"\")");
-				break;
-			}
-			g_string_free (s, TRUE);
-		} else
-			search_query = g_strdup ("(contains \"x-evolution-any-field\" \"\")");
-
-		if (search_query)
-			g_object_set (v,
-				      "query", search_query,
-				      NULL);
-
-		g_free (search_query);
-	}
-
-	g_free (search_word);
-}
-
-static void
-search_menu_activated (ESearchBar *esb, int id, EABView *view)
-{
-	if (id == ESB_ADVANCED)
-		e_search_bar_set_item_id (esb, id);
-}
-
-static void
-query_changed (ESearchBar *esb, EABView *view)
-{
-	int search_type;
-
-	search_type = e_search_bar_get_item_id(esb);
-	if (search_type == ESB_ADVANCED)
-		gtk_widget_show(eab_search_dialog_new(view));
-}
-
-static int
-compare_subitems (const void *a, const void *b)
-{
-	const ESearchBarSubitem *subitem_a = a;
-	const ESearchBarSubitem *subitem_b = b;
-	char *collate_a, *collate_b;
-	int ret;
-
-	collate_a = g_utf8_collate_key (subitem_a->text, -1);
-	collate_b = g_utf8_collate_key (subitem_b->text, -1);
-
-	ret =  strcmp (collate_a, collate_b);
-
-	g_free (collate_a);
-	g_free (collate_b);
-	
-	return ret;
-}
-
-static void
-make_suboptions (EABView *view)
-{
-	ESearchBarSubitem *subitems, *s;
-	ECategoriesMasterList *master_list;
-	gint i, N;
-
-	master_list = get_master_list ();
-	N = e_categories_master_list_count (master_list);
-	subitems = g_new (ESearchBarSubitem, N+2);
-
-	subitems[0].id = G_MAXINT;
-	subitems[0].text = g_strdup (_("Any Category"));
-	subitems[0].translate = FALSE;
-
-	for (i=0; i<N; ++i) {
-		const char *category = e_categories_master_list_nth (master_list, i);
-
-		subitems[i+1].id = i;
-		subitems[i+1].text = g_strdup (category);
-		subitems[i+1].translate = FALSE;
-	}
-	subitems[N+1].id = -1;
-	subitems[N+1].text = NULL;
-
-	qsort (subitems + 1, N, sizeof (subitems[0]), compare_subitems);
-
-	e_search_bar_set_suboption (view->search, ESB_CATEGORY, subitems);
-
-	for (s = subitems; s->id != -1; s++) {
-		if (s->text)
-			g_free (s->text);
-	}
-	g_free (subitems);
-}
-
-static void
-ecml_changed (ECategoriesMasterList *ecml, EABView *view)
-{
-	make_suboptions (view);
-}
-
-static ECategoriesMasterList *
-get_master_list (void)
-{
-	static ECategoriesMasterList *category_list = NULL;
-
-	if (category_list == NULL)
-		category_list = e_categories_master_list_wombat_new ();
-	return category_list;
-}
-
-static void
-connect_master_list_changed (EABView *view)
-{
-	view->ecml_changed_id =
-		g_signal_connect (get_master_list(), "changed",
-				  G_CALLBACK (ecml_changed), view);
-}
-
-
-
-typedef struct {
-	GtkWidget *table;
-	GObject *printable;
-} EContactPrintDialogWeakData;
-
-static void
-e_contact_print_destroy(gpointer data, GObject *where_object_was)
-{
-	EContactPrintDialogWeakData *weak_data = data;
-	g_object_unref (weak_data->printable);
-	g_object_unref (weak_data->table);
-	g_free (weak_data);
-}
-
-static void
-e_contact_print_button(GtkDialog *dialog, gint response, gpointer data)
-{
-	GnomePrintJob *master;
-	GnomePrintContext *pc;
-	EPrintable *printable = g_object_get_data(G_OBJECT(dialog), "printable");
-	GtkWidget *preview;
-	switch( response ) {
-	case GNOME_PRINT_DIALOG_RESPONSE_PRINT:
-		master = gnome_print_job_new(gnome_print_dialog_get_config ( GNOME_PRINT_DIALOG(dialog) ));
-		pc = gnome_print_job_get_context( master );
-		e_printable_reset(printable);
-		while (e_printable_data_left(printable)) {
-			gnome_print_beginpage (pc, "Contacts");
-			if (gnome_print_gsave(pc) == -1)
-				/* FIXME */;
-			if (gnome_print_translate(pc, 72, 72) == -1)
-				/* FIXME */;
-			e_printable_print_page(printable,
-					       pc,
-					       6.5 * 72,
-					       5 * 72,
-					       TRUE);
-			if (gnome_print_grestore(pc) == -1)
-				/* FIXME */;
-			if (gnome_print_showpage(pc) == -1)
-				/* FIXME */;
-		}
-		gnome_print_job_close(master);
-		gnome_print_job_print(master);
-		g_object_unref (master);
-		gtk_widget_destroy((GtkWidget *)dialog);
-		break;
-	case GNOME_PRINT_DIALOG_RESPONSE_PREVIEW:
-		master = gnome_print_job_new (gnome_print_dialog_get_config ( GNOME_PRINT_DIALOG(dialog) ));
-		pc = gnome_print_job_get_context( master );
-		e_printable_reset(printable);
-		while (e_printable_data_left(printable)) {
-			gnome_print_beginpage (pc, "Contacts");
-			if (gnome_print_gsave(pc) == -1)
-				/* FIXME */;
-			if (gnome_print_translate(pc, 72, 72) == -1)
-				/* FIXME */;
-			e_printable_print_page(printable,
-					       pc,
-					       6.5 * 72,
-					       9 * 72,
-					       TRUE);
-			if (gnome_print_grestore(pc) == -1)
-				/* FIXME */;
-			if (gnome_print_showpage(pc) == -1)
-				/* FIXME */;
-		}
-		gnome_print_job_close(master);
-		preview = GTK_WIDGET(gnome_print_job_preview_new(master, "Print Preview"));
-		gtk_widget_show_all(preview);
-		g_object_unref (master);
-		break;
-	case GNOME_PRINT_DIALOG_RESPONSE_CANCEL:
-	default:
-		gtk_widget_destroy((GtkWidget *)dialog);
-		break;
-	}
-}
-
-void
-eab_view_show_contact_preview (EABView *view, gboolean show)
-{
-	g_return_if_fail (view && E_IS_ADDRESSBOOK_VIEW (view));
-
-	if (show)
-		gtk_widget_show (view->contact_display_window);
-	else
-		gtk_widget_hide (view->contact_display_window);
-}
-
-void
-eab_view_setup_menus (EABView *view,
-		      BonoboUIComponent *uic)
-{
-
-	g_return_if_fail (view != NULL);
-	g_return_if_fail (E_IS_ADDRESSBOOK_VIEW (view));
-	g_return_if_fail (uic != NULL);
-	g_return_if_fail (BONOBO_IS_UI_COMPONENT (uic));
-
-	init_collection ();
-
-	view->uic = uic;
-
-	setup_menus (view);
-
-	/* XXX toshok - yeah this really doesn't belong here, but it
-	   needs to happen at the same time and takes the uic */
-	e_search_bar_set_ui_component (view->search, uic);
-}
-
-/**
- * eab_view_discard_menus:
- * @view: An addressbook view.
- * 
- * Makes an addressbook view discard its GAL view menus and its views instance
- * objects.  This should be called when the corresponding Bonobo component is
- * deactivated.
- **/
-void
-eab_view_discard_menus (EABView *view)
-{
-	g_return_if_fail (view != NULL);
-	g_return_if_fail (E_IS_ADDRESSBOOK_VIEW (view));
-	g_return_if_fail (view->view_instance);
-
-	if (view->view_menus) {
-		gal_view_menus_unmerge (view->view_menus, NULL);
-
-		g_object_unref (view->view_menus);
-		view->view_menus = NULL;
-	}
-
-	if (view->view_instance) {
-		g_object_unref (view->view_instance);
-		view->view_instance = NULL;
-	}
-
-	view->uic = NULL;
-}
-
-void
-eab_view_print(EABView *view)
-{
-	if (view->view_type == EAB_VIEW_MINICARD) {
-		char *query;
-		EBook *book;
-		GtkWidget *print;
-
-		g_object_get (view->model,
-			      "query", &query,
-			      "book", &book,
-			      NULL);
-		print = e_contact_print_dialog_new(book, query);
-		g_free(query);
-		gtk_widget_show(print);
-	}
-	else if (view->view_type == EAB_VIEW_TABLE) {
-		GtkWidget *dialog;
-		EPrintable *printable;
-		ETable *etable;
-		EContactPrintDialogWeakData *weak_data;
-
-		dialog = e_print_get_dialog (_("Print cards"), GNOME_PRINT_DIALOG_RANGE | GNOME_PRINT_DIALOG_COPIES);
-		gnome_print_dialog_construct_range_any(GNOME_PRINT_DIALOG(dialog), GNOME_PRINT_RANGE_ALL | GNOME_PRINT_RANGE_SELECTION,
-						       NULL, NULL, NULL);
-
-		g_object_get(view->widget, "table", &etable, NULL);
-		printable = e_table_get_printable(etable);
-		g_object_ref (printable);
-		gtk_object_sink (GTK_OBJECT (printable));
-		g_object_unref(etable);
-		g_object_ref (view->widget);
-
-		g_object_set_data (G_OBJECT (dialog), "table", view->widget);
-		g_object_set_data (G_OBJECT (dialog), "printable", printable);
-		
-		g_signal_connect(dialog,
-				 "response", G_CALLBACK(e_contact_print_button), NULL);
-
-		weak_data = g_new (EContactPrintDialogWeakData, 1);
-
-		weak_data->table = view->widget;
-		weak_data->printable = G_OBJECT (printable);
-
-		g_object_weak_ref (G_OBJECT (dialog), e_contact_print_destroy, weak_data);
-
-		gtk_widget_show(dialog);
-	}
-#ifdef WITH_ADDRESSBOOK_VIEW_TREEVIEW
-	else if (view->view_type == EAB_VIEW_TREEVIEW) {
-		/* XXX */
-	}
-#endif
-}
-
-void
-eab_view_print_preview(EABView *view)
-{
-	if (view->view_type == EAB_VIEW_MINICARD) {
-		char *query;
-		EBook *book;
-
-		g_object_get (view->model,
-			      "query", &query,
-			      "book", &book,
-			      NULL);
-		e_contact_print_preview(book, query);
-		g_free(query);
-	} else if (view->view_type == EAB_VIEW_TABLE) {
-		EPrintable *printable;
-		ETable *etable;
-		GnomePrintJob *master;
-		GnomePrintContext *pc;
-		GnomePrintConfig *config;
-		GtkWidget *preview;
-
-		g_object_get(view->widget, "table", &etable, NULL);
-		printable = e_table_get_printable(etable);
-		g_object_unref(etable);
-		g_object_ref (printable);
-		gtk_object_sink (GTK_OBJECT (printable));
-
-		config = e_print_load_config ();
-		master = gnome_print_job_new (config);
-		pc = gnome_print_job_get_context( master );
-		e_printable_reset(printable);
-		while (e_printable_data_left(printable)) {
-			gnome_print_beginpage (pc, "Contacts");
-			if (gnome_print_gsave(pc) == -1)
-				/* FIXME */;
-			if (gnome_print_translate(pc, 72, 72) == -1)
-				/* FIXME */;
-			e_printable_print_page(printable,
-					       pc,
-					       6.5 * 72,
-					       9 * 72,
-					       TRUE);
-			if (gnome_print_grestore(pc) == -1)
-				/* FIXME */;
-			if (gnome_print_showpage(pc) == -1)
-				/* FIXME */;
-		}
-		gnome_print_job_close(master);
-		preview = GTK_WIDGET(gnome_print_job_preview_new(master, "Print Preview"));
-		gtk_widget_show_all(preview);
-		g_object_unref (master);
-		g_object_unref (printable);
-	}
-#ifdef WITH_ADDRESSBOOK_VIEW_TREEVIEW
-	else if (view->view_type == EAB_VIEW_TREEVIEW) {
-		/* XXX */
-	}
-#endif
-}
-
-void
-eab_view_delete_selection(EABView *view)
-{
-	GList *list, *l;
-
-	if (!eab_editor_confirm_delete(GTK_WINDOW(gtk_widget_get_toplevel(view->widget))))
-		return;
-
-	list = get_selected_contacts(view);
-	if (e_book_check_static_capability (view->book, "bulk-remove")) {
-		GList *ids = NULL;
-
-		for (l=list;l;l=g_list_next(l)) {
-			EContact *contact = l->data;
-
-			ids = g_list_prepend (ids, (char*)e_contact_get_const (contact, E_CONTACT_UID));
-		}
-
-		/* Remove the cards all at once. */
-		/* XXX no callback specified... ugh */
-		e_book_async_remove_contacts (view->book,
-					      ids,
-					      NULL,
-					      NULL);
-			
-		g_list_free (ids);
-	}
-	else {
-		for (l=list;l;l=g_list_next(l)) {
-			EContact *contact = l->data;
-			/* Remove the card. */
-			/* XXX no callback specified... ugh */
-			e_book_async_remove_contact (view->book,
-						     contact,
-						     NULL,
-						     NULL);
-		}
-	}
-
-	e_free_object_list(list);
-}
-
-static void
-invisible_destroyed (gpointer data, GObject *where_object_was)
-{
-	EABView *view = data;
-	view->invisible = NULL;
-}
-
-static void
-selection_get (GtkWidget *invisible,
-	       GtkSelectionData *selection_data,
-	       guint info,
-	       guint time_stamp,
-	       EABView *view)
-{
-	char *value;
-
-	value = eab_contact_list_to_string (view->clipboard_contacts);
-
-	gtk_selection_data_set (selection_data, GDK_SELECTION_TYPE_STRING,
-				8, value, strlen (value));
-				
-}
-
-static void
-selection_clear_event (GtkWidget *invisible,
-		       GdkEventSelection *event,
-		       EABView *view)
-{
-	if (view->clipboard_contacts) {
-		g_list_foreach (view->clipboard_contacts, (GFunc)g_object_unref, NULL);
-		g_list_free (view->clipboard_contacts);
-		view->clipboard_contacts = NULL;
-	}
-}
-
-static void
-selection_received (GtkWidget *invisible,
-		    GtkSelectionData *selection_data,
-		    guint time,
-		    EABView *view)
-{
-	if (selection_data->length <= 0 || selection_data->type != GDK_SELECTION_TYPE_STRING) {
-		return;
-	} else {
-		GList *contact_list;
-		GList *l;
-		char *str = NULL;
-
-		if (selection_data->data [selection_data->length - 1] != 0) {
-			str = g_malloc0 (selection_data->length + 1);
-			memcpy (str, selection_data->data, selection_data->length);
-			contact_list = eab_contact_list_from_string (str);
-		} else
-			contact_list = eab_contact_list_from_string (selection_data->data);
-		
-		for (l = contact_list; l; l = l->next) {
-			EContact *contact = l->data;
-
-			/* XXX NULL for a callback /sigh */
-			eab_merging_book_add_contact (view->book, contact, NULL /* XXX */, NULL);
-		}
-
-		g_list_foreach (contact_list, (GFunc)g_object_unref, NULL);
-		g_list_free (contact_list);
-		g_free (str);
-	}
-}
-
-static void
-add_to_list (int model_row, gpointer closure)
-{
-	GList **list = closure;
-	*list = g_list_prepend (*list, GINT_TO_POINTER (model_row));
-}
-
-static GList *
-get_selected_contacts (EABView *view)
-{
-	GList *list;
-	GList *iterator;
-	ESelectionModel *selection = get_selection_model (view);
-
-	list = NULL;
-	e_selection_model_foreach (selection, add_to_list, &list);
-
-	for (iterator = list; iterator; iterator = iterator->next) {
-		iterator->data = eab_model_get_contact (view->model, GPOINTER_TO_INT (iterator->data));
-	}
-	list = g_list_reverse (list);
-	return list;
-}
-
-void
-eab_view_save_as (EABView *view)
-{
-	GList *list = get_selected_contacts (view);
-	if (list)
-		eab_contact_list_save (_("Save as VCard..."), list, NULL);
-	e_free_object_list(list);
-}
-
-void
-eab_view_view (EABView *view)
-{
-	GList *list = get_selected_contacts (view);
-	eab_show_multiple_contacts (view->book, list, view->editable);
-	e_free_object_list(list);
-}
-
-void
-eab_view_send (EABView *view)
-{
-	GList *list = get_selected_contacts (view);
-	if (list)
-		eab_send_contact_list (list, EAB_DISPOSITION_AS_ATTACHMENT);
-	e_free_object_list(list);
-}
-
-void
-eab_view_send_to (EABView *view)
-{
-	GList *list = get_selected_contacts (view);
-	if (list)
-		eab_send_contact_list (list, EAB_DISPOSITION_AS_TO);
-	e_free_object_list(list);
-}
-
-void
-eab_view_cut (EABView *view)
-{
-	eab_view_copy (view);
-	eab_view_delete_selection (view);
-}
-
-void
-eab_view_copy (EABView *view)
-{
-	view->clipboard_contacts = get_selected_contacts (view);
-
-	gtk_selection_owner_set (view->invisible, clipboard_atom, GDK_CURRENT_TIME);
-}
-
-void
-eab_view_paste (EABView *view)
-{
-	gtk_selection_convert (view->invisible, clipboard_atom,
-			       GDK_SELECTION_TYPE_STRING,
-			       GDK_CURRENT_TIME);
-}
-
-void
-eab_view_select_all (EABView *view)
-{
-	ESelectionModel *model = get_selection_model (view);
-
-	g_return_if_fail (model);
-
-	e_selection_model_select_all (model);
-}
-
-void
-eab_view_show_all(EABView *view)
-{
-	g_object_set(view,
-		     "query", NULL,
-		     NULL);
-}
-
-void
-eab_view_stop(EABView *view)
-{
-	if (view)
-		eab_model_stop (view->model);
-}
-
-static void
-view_transfer_contacts (EABView *view, gboolean delete_from_source)
-{
-	EBook *book;
-	GList *contacts;
-	GtkWindow *parent_window;
-
-	g_object_get(view->model, 
-		     "book", &book,
-		     NULL);
-	contacts = get_selected_contacts (view);
-	parent_window = GTK_WINDOW (gtk_widget_get_toplevel (GTK_WIDGET (view)));
-
-	eab_transfer_contacts (book, contacts, delete_from_source, parent_window);
-	g_object_unref(book);
-}
-
-void
-eab_view_copy_to_folder (EABView *view)
-{
-	view_transfer_contacts (view, FALSE);
-}
-
-void
-eab_view_move_to_folder (EABView *view)
-{
-	view_transfer_contacts (view, TRUE);
-}
-
-
-static gboolean
-eab_view_selection_nonempty (EABView  *view)
-{
-	ESelectionModel *selection_model;
-
-	selection_model = get_selection_model (view);
-	if (selection_model == NULL)
-		return FALSE;
-
-	return e_selection_model_selected_count (selection_model) != 0;
-}
-
-gboolean
-eab_view_can_create (EABView  *view)
-{
-	return view ? eab_model_editable (view->model) : FALSE;
-}
-
-gboolean
-eab_view_can_print (EABView  *view)
-{
-	return view && view->model ? eab_model_contact_count (view->model) : FALSE;
-}
-
-gboolean
-eab_view_can_save_as (EABView  *view)
-{
-	return view ? eab_view_selection_nonempty (view) : FALSE;
-}
-
-gboolean
-eab_view_can_view (EABView  *view)
-{
-	return view ? eab_view_selection_nonempty (view) : FALSE;
-}
-
-gboolean 
-eab_view_can_send (EABView  *view)
-{
-	return view ? eab_view_selection_nonempty (view) : FALSE;
-}
-
-gboolean   
-eab_view_can_send_to (EABView  *view)
-{
-	return view ? eab_view_selection_nonempty (view) : FALSE;
-}
-
-gboolean
-eab_view_can_delete (EABView  *view)
-{
-	return view ? eab_view_selection_nonempty (view) && eab_model_editable (view->model) : FALSE;
-}
-
-gboolean
-eab_view_can_cut (EABView *view)
-{
-	return view ? eab_view_selection_nonempty (view) && eab_model_editable (view->model) : FALSE;
-}
-
-gboolean
-eab_view_can_copy (EABView *view)
-{
-	return view ? eab_view_selection_nonempty (view) : FALSE;
-}
-
-gboolean
-eab_view_can_paste (EABView *view)
-{
-	return view ? eab_model_editable (view->model) : FALSE;
-}
-
-gboolean
-eab_view_can_select_all (EABView *view)
-{
-	return view ? eab_model_contact_count (view->model) != 0 : FALSE;
-}
-
-gboolean
-eab_view_can_stop (EABView  *view)
-{
-	return view ? eab_model_can_stop (view->model) : FALSE;
-}
-
-gboolean
-eab_view_can_copy_to_folder (EABView *view)
-{
-	return view ? eab_view_selection_nonempty (view) : FALSE;
-}
-
-gboolean
-eab_view_can_move_to_folder (EABView *view)
-{
-	return view ? eab_view_selection_nonempty (view) && eab_model_editable (view->model) : FALSE;
-}
-
-EABMenuTargetSelect *
-eab_view_get_menu_target (EABView *view, EABMenu *menu)
-{
-	GPtrArray *cards = g_ptr_array_new();
-	ESelectionModel *selection_model;
-	EABMenuTargetSelect *t;
-
-	selection_model = get_selection_model (view);
-	if (selection_model) {
-		ContactAndBook cab;
-
-		cab.view = view;
-		cab.closure = cards;
-		e_selection_model_foreach(selection_model, get_card_1, &cab);
-	}
-
-	t = eab_menu_target_new_select(menu, view->book, !eab_model_editable(view->model), cards);
-	t->target.widget = (GtkWidget *)view;
-
-	return t;
-}
diff --git a/addressbook/gui/widgets/e-addressbook-view.etspec b/addressbook/gui/widgets/e-addressbook-view.etspec
deleted file mode 100644
index a74a53e798..0000000000
--- a/addressbook/gui/widgets/e-addressbook-view.etspec
+++ /dev/null
@@ -1,65 +0,0 @@
-<ETableSpecification draw-grid="true" cursor-mode="line">
-  <ETableColumn model_col= "2" _title="File As"           expansion="1.0" minimum_width="75" resizable="true" cell="string" compare="string"/>
-  <ETableColumn model_col= "3" _title="Full Name"         expansion="1.0" minimum_width="75" resizable="true" cell="string" compare="string"/>
-  <ETableColumn model_col= "4" _title="Given Name"        expansion="1.0" minimum_width="75" resizable="true" cell="string" compare="string"/>
-  <ETableColumn model_col= "5" _title="Family Name"       expansion="1.0" minimum_width="75" resizable="true" cell="string" compare="string"/>
-  <ETableColumn model_col= "6" _title="Nickname"          expansion="1.0" minimum_width="75" resizable="true" cell="string" compare="string"/>
-
-  <ETableColumn model_col= "7" _title="Email"             expansion="1.0" minimum_width="75" resizable="true" cell="string" compare="string"/>
-  <ETableColumn model_col= "8" _title="Email 2"           expansion="1.0" minimum_width="75" resizable="true" cell="string" compare="string"/>
-  <ETableColumn model_col= "9" _title="Email 3"           expansion="1.0" minimum_width="75" resizable="true" cell="string" compare="string"/>
-
-  <ETableColumn model_col= "15" _title="Assistant Phone"  expansion="1.0" minimum_width="75" resizable="true" cell="string" compare="string"/>
-  <ETableColumn model_col= "16" _title="Business Phone"   expansion="1.0" minimum_width="75" resizable="true" cell="string" compare="string"/>
-  <ETableColumn model_col= "17" _title="Business Phone 2" expansion="1.0" minimum_width="75" resizable="true" cell="string" compare="string"/>
-  <ETableColumn model_col="18" _title="Business Fax"      expansion="1.0" minimum_width="75" resizable="true" cell="string" compare="string"/>
-  <ETableColumn model_col="19" _title="Callback Phone"    expansion="1.0" minimum_width="75" resizable="true" cell="string" compare="string"/>
-  <ETableColumn model_col="20" _title="Car Phone"         expansion="1.0" minimum_width="75" resizable="true" cell="string" compare="string"/>
-  <ETableColumn model_col="21" _title="Company Phone"     expansion="1.0" minimum_width="75" resizable="true" cell="string" compare="string"/>
-  <ETableColumn model_col="22" _title="Home Phone"        expansion="1.0" minimum_width="75" resizable="true" cell="string" compare="string"/>
-  <ETableColumn model_col="23" _title="Home Phone 2"      expansion="1.0" minimum_width="75" resizable="true" cell="string" compare="string"/>
-  <ETableColumn model_col="24" _title="Home Fax"          expansion="1.0" minimum_width="75" resizable="true" cell="string" compare="string"/>
-  <ETableColumn model_col="25" _title="ISDN Phone"        expansion="1.0" minimum_width="75" resizable="true" cell="string" compare="string"/>
-  <ETableColumn model_col="26" _title="Mobile Phone"      expansion="1.0" minimum_width="75" resizable="true" cell="string" compare="string"/>
-  <ETableColumn model_col="27" _title="Other Phone"       expansion="1.0" minimum_width="75" resizable="true" cell="string" compare="string"/>
-  <ETableColumn model_col="28" _title="Other Fax"         expansion="1.0" minimum_width="75" resizable="true" cell="string" compare="string"/>
-  <ETableColumn model_col="29" _title="Pager"             expansion="1.0" minimum_width="75" resizable="true" cell="string" compare="string"/>
-  <ETableColumn model_col="30" _title="Primary Phone"     expansion="1.0" minimum_width="75" resizable="true" cell="string" compare="string"/>
-  <ETableColumn model_col="31" _title="Radio"             expansion="1.0" minimum_width="75" resizable="true" cell="string" compare="string"/>
-  <ETableColumn model_col="32" _title="Telex"             expansion="1.0" minimum_width="75" resizable="true" cell="string" compare="string"/>
-
-<!-- Translators: This is a vcard standard and stands for the type of
-    phone used by the hearing impaired. TTY stands for "teletype"
-    (familiar from Unix device names), and TDD is "Telecommunications
-    Device for Deaf". However, you probably want to leave this
-    abbreviation unchanged unless you know that there is actually a
-    different and established translation for this in your language. -->	
-  <ETableColumn model_col="33" _title="TTYTDD"            expansion="1.0" minimum_width="75" resizable="true" cell="string" compare="string"/>
-
-  <ETableColumn model_col="34" _title="Organization"      expansion="1.0" minimum_width="75" resizable="true" cell="string" compare="string"/>
-  <ETableColumn model_col="35" _title="Unit"              expansion="1.0" minimum_width="75" resizable="true" cell="string" compare="string"/>
-  <ETableColumn model_col="36" _title="Office"            expansion="1.0" minimum_width="75" resizable="true" cell="string" compare="string"/>
-  <ETableColumn model_col="37" _title="Title"             expansion="1.0" minimum_width="75" resizable="true" cell="string" compare="string"/>
-  <ETableColumn model_col="38" _title="Role"              expansion="1.0" minimum_width="75" resizable="true" cell="string" compare="string"/>
-  <ETableColumn model_col="39" _title="Manager"           expansion="1.0" minimum_width="75" resizable="true" cell="string" compare="string"/>
-  <ETableColumn model_col="40" _title="Assistant"         expansion="1.0" minimum_width="75" resizable="true" cell="string" compare="string"/>
-
-  <ETableColumn model_col="41" _title="Web Site"          expansion="1.0" minimum_width="75" resizable="true" cell="string" compare="string"/>
-  <ETableColumn model_col="42" _title="Journal"           expansion="1.0" minimum_width="75" resizable="true" cell="string" compare="string"/>
-
-  <ETableColumn model_col="43" _title="Categories"        expansion="1.0" minimum_width="75" resizable="true" cell="string" compare="string"/>
-
-  <ETableColumn model_col="48" _title="Spouse"            expansion="1.0" minimum_width="75" resizable="true" cell="string" compare="string"/>
-  <ETableColumn model_col="49" _title="Note"              expansion="1.0" minimum_width="75" resizable="true" cell="string" compare="string"/>
-
-  <ETableState>
-    <column source="0"/>
-    <column source="1"/>
-    <column source="5"/>
-    <column source="23"/>
-    <column source="36"/>
-    <grouping>
-      <leaf column="0" ascending="true"/>
-    </grouping>
-  </ETableState>
-</ETableSpecification>
diff --git a/addressbook/gui/widgets/e-addressbook-view.h b/addressbook/gui/widgets/e-addressbook-view.h
deleted file mode 100644
index a55406915e..0000000000
--- a/addressbook/gui/widgets/e-addressbook-view.h
+++ /dev/null
@@ -1,164 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-/* e-addressbook-view.h
- * Copyright (C) 2000  Ximian, Inc.
- * Author: Chris Lahey <clahey@ximian.com>
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of version 2 of the GNU General Public
- * License as published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * General Public License for more details.
- *
- * You should have received a copy of the GNU General Public
- * License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
- */
-#ifndef __EAB_VIEW_H__
-#define __EAB_VIEW_H__
-
-#include <gtk/gtkvbox.h>
-#include <bonobo/bonobo-ui-component.h>
-#include <gal/menus/gal-view-instance.h>
-#include <libebook/e-book.h>
-#include "e-addressbook-model.h"
-#include "eab-contact-display.h"
-#include "widgets/menus/gal-view-menus.h"
-#include "widgets/misc/e-search-bar.h"
-#include "widgets/misc/e-filter-bar.h"
-
-G_BEGIN_DECLS
-
-struct _EABMenu;
-struct _EABMenuTargetSelect;
-
-/* EABView - A card displaying information about a contact.
- *
- * The following arguments are available:
- *
- * name		type		read/write	description
- * --------------------------------------------------------------------------------
- */
-
-#define E_TYPE_AB_VIEW                          (eab_view_get_type ())
-#define EAB_VIEW(obj)                           (G_TYPE_CHECK_INSTANCE_CAST ((obj), E_TYPE_AB_VIEW, EABView))
-#define EAB_VIEW_CLASS(klass)                   (G_TYPE_CHECK_CLASS_CAST ((klass), E_TYPE_AB_VIEW, EABViewClass))
-#define E_IS_ADDRESSBOOK_VIEW(obj)              (G_TYPE_CHECK_INSTANCE_TYPE ((obj), E_TYPE_AB_VIEW))
-#define E_IS_ADDRESSBOOK_VIEW_CLASS(klass)      (G_TYPE_CHECK_CLASS_TYPE ((obj), E_TYPE_AB_VIEW))
-
-typedef enum {
-	EAB_VIEW_NONE, /* initialized to this */
-	EAB_VIEW_MINICARD,
-	EAB_VIEW_TABLE,
-#ifdef WITH_ADDRESSBOOK_VIEW_TREEVIEW
-	,EAB_VIEW_TREEVIEW
-#endif
-} EABViewType;
-
-
-typedef struct _EABView       EABView;
-typedef struct _EABViewClass  EABViewClass;
-
-struct _EABView
-{
-	GtkVBox parent;
-	
-	/* item specific fields */
-	EABViewType view_type;
-
-	EABModel   *model;
-
-	GtkWidget *invisible;
-	GList *clipboard_contacts;
-
-	EBook *book;
-	ESource *source;
-	char  *query;
-	guint editable : 1;
-
-	gint displayed_contact;
-
-	GObject *object;
-	GtkWidget *widget;
-
-	GtkWidget *contact_display_window;
-	GtkWidget *contact_display;
-	GtkWidget *paned;
-
-	/* Menus handler and the view instance */
-	GalViewInstance *view_instance;
-	GalViewMenus *view_menus;
-	GalView *current_view;
-	BonoboUIComponent *uic;
-
-	/* the search bar and related machinery */
-	ESearchBar  *search;
-	gint         ecml_changed_id;
-	RuleContext *search_context;
-	FilterRule  *search_rule;
-};
-
-struct _EABViewClass
-{
-	GtkVBoxClass parent_class;
-
-	/*
-	 * Signals
-	 */
-	void (*status_message)        (EABView *view, const gchar *message);
-	void (*search_result)         (EABView *view, EBookViewStatus status);
-	void (*folder_bar_message)    (EABView *view, const gchar *message);
-	void (*command_state_change)  (EABView *view);
-};
-
-GtkWidget *eab_view_new                 (void);
-GType      eab_view_get_type            (void);
-
-void       eab_view_show_contact_preview (EABView *view, gboolean show);
-
-void       eab_view_setup_menus         (EABView  *view,
-					 BonoboUIComponent *uic);
-void       eab_view_discard_menus       (EABView  *view);
-
-RuleContext *eab_view_peek_search_context (EABView *view);
-FilterRule  *eab_view_peek_search_rule    (EABView *view);
-
-void       eab_view_save_as             (EABView  *view);
-void       eab_view_view                (EABView  *view);
-void       eab_view_send                (EABView  *view);
-void       eab_view_send_to             (EABView  *view);
-void       eab_view_print               (EABView  *view);
-void       eab_view_print_preview       (EABView  *view);
-void       eab_view_delete_selection    (EABView  *view);
-void       eab_view_cut                 (EABView  *view);
-void       eab_view_copy                (EABView  *view);
-void       eab_view_paste               (EABView  *view);
-void       eab_view_select_all          (EABView  *view);
-void       eab_view_show_all            (EABView  *view);
-void       eab_view_stop                (EABView  *view);
-void       eab_view_copy_to_folder      (EABView  *view);
-void       eab_view_move_to_folder      (EABView  *view);
-
-gboolean   eab_view_can_create          (EABView  *view);
-gboolean   eab_view_can_print           (EABView  *view);
-gboolean   eab_view_can_save_as         (EABView  *view);
-gboolean   eab_view_can_view            (EABView  *view);
-gboolean   eab_view_can_send            (EABView  *view);
-gboolean   eab_view_can_send_to         (EABView  *view);
-gboolean   eab_view_can_delete          (EABView  *view);
-gboolean   eab_view_can_cut             (EABView  *view);
-gboolean   eab_view_can_copy            (EABView  *view);
-gboolean   eab_view_can_paste           (EABView  *view);
-gboolean   eab_view_can_select_all      (EABView  *view);
-gboolean   eab_view_can_stop            (EABView  *view);
-gboolean   eab_view_can_copy_to_folder  (EABView  *view);
-gboolean   eab_view_can_move_to_folder  (EABView  *view);
-
-struct _EABMenuTargetSelect *eab_view_get_menu_target (EABView *view, struct _EABMenu *menu);
-
-G_END_DECLS;
-
-#endif /* __EAB_VIEW_H__ */
diff --git a/addressbook/gui/widgets/e-minicard-label.c b/addressbook/gui/widgets/e-minicard-label.c
deleted file mode 100644
index df1465349e..0000000000
--- a/addressbook/gui/widgets/e-minicard-label.c
+++ /dev/null
@@ -1,508 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-/* 
- * e-minicard-label.c
- * Copyright (C) 2000  Ximian, Inc.
- * Author: Chris Lahey <clahey@ximian.com>
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of version 2 of the GNU General Public
- * License as published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * General Public License for more details.
- *
- * You should have received a copy of the GNU General Public
- * License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
- */
-
-#include <config.h>
-
-#include "e-minicard-label.h"
-#include "eab-marshal.h"
-
-#include <gtk/gtksignal.h>
-#include <libgnomecanvas/gnome-canvas-rect-ellipse.h>
-#include <libgnome/gnome-i18n.h>
-#include <gal/util/e-util.h>
-#include <gal/e-text/e-text.h>
-#include <gal/widgets/e-canvas.h>
-#include <gal/widgets/e-canvas-utils.h>
-#include <gdk/gdkkeysyms.h>
-
-static void e_minicard_label_init		(EMinicardLabel		 *card);
-static void e_minicard_label_class_init	(EMinicardLabelClass	 *klass);
-static void e_minicard_label_set_property  (GObject *object, guint prop_id, const GValue *value, GParamSpec *pspec);
-static void e_minicard_label_get_property  (GObject *object, guint prop_id, GValue *value, GParamSpec *pspec);
-static gboolean e_minicard_label_event (GnomeCanvasItem *item, GdkEvent *event);
-static void e_minicard_label_realize (GnomeCanvasItem *item);
-static void e_minicard_label_unrealize (GnomeCanvasItem *item);
-static void e_minicard_label_reflow(GnomeCanvasItem *item, int flags);
-static void e_minicard_label_style_set (EMinicardLabel *label, GtkStyle *previous_style);
-
-static void e_minicard_label_resize_children( EMinicardLabel *e_minicard_label );
-
-static void set_colors (EMinicardLabel *label);
-
-static GnomeCanvasGroupClass *parent_class = NULL;
-
-/* The arguments we take */
-enum {
-	PROP_0,
-	PROP_WIDTH,
-	PROP_HEIGHT,
-	PROP_HAS_FOCUS,
-	PROP_FIELD,
-	PROP_FIELDNAME,
-	PROP_TEXT_MODEL,
-	PROP_MAX_FIELD_NAME_WIDTH,
-	PROP_EDITABLE
-};
-
-enum {
-	STYLE_SET,
-	LAST_SIGNAL
-};
-
-static guint e_minicard_label_signals [LAST_SIGNAL] = {0, };
-
-GType
-e_minicard_label_get_type (void)
-{
-	static GType type = 0;
-
-	if (!type) {
-		static const GTypeInfo info =  {
-			sizeof (EMinicardLabelClass),
-			NULL,           /* base_init */
-			NULL,           /* base_finalize */
-			(GClassInitFunc) e_minicard_label_class_init,
-			NULL,           /* class_finalize */
-			NULL,           /* class_data */
-			sizeof (EMinicardLabel),
-			0,             /* n_preallocs */
-			(GInstanceInitFunc) e_minicard_label_init,
-		};
-
-		type = g_type_register_static (gnome_canvas_group_get_type (), "EMinicardLabel", &info, 0);
-	}
-
-	return type;
-}
-
-static void
-e_minicard_label_class_init (EMinicardLabelClass *klass)
-{
-	GObjectClass *object_class;
-	GnomeCanvasItemClass *item_class;
-
-	object_class = G_OBJECT_CLASS (klass);
-	item_class = (GnomeCanvasItemClass *) klass;
-
-	klass->style_set = e_minicard_label_style_set;
-
-	parent_class = g_type_class_peek_parent (klass);
-
-	object_class->set_property = e_minicard_label_set_property;
-	object_class->get_property = e_minicard_label_get_property;
-	/*  object_class->destroy = e_minicard_label_destroy; */
-
-	g_object_class_install_property (object_class, PROP_WIDTH,
-					 g_param_spec_double ("width",
-							      _("Width"),
-							      /*_( */"XXX blurb" /*)*/,
-							      0.0, G_MAXDOUBLE, 10.0,
-							      G_PARAM_READWRITE));
-
-	g_object_class_install_property (object_class, PROP_HEIGHT,
-					 g_param_spec_double ("height",
-							      _("Height"),
-							      /*_( */"XXX blurb" /*)*/,
-							      0.0, G_MAXDOUBLE, 10.0,
-							      G_PARAM_READWRITE));
-
-	g_object_class_install_property (object_class, PROP_HAS_FOCUS,
-					 g_param_spec_boolean ("has_focus",
-							       _("Has Focus"),
-							       /*_( */"XXX blurb" /*)*/,
-							       FALSE,
-							       G_PARAM_READWRITE));
-
-	g_object_class_install_property (object_class, PROP_FIELD,
-					 g_param_spec_string ("field",
-							      _("Field"),
-							      /*_( */"XXX blurb" /*)*/,
-							      NULL,
-							      G_PARAM_READWRITE));
-
-	g_object_class_install_property (object_class, PROP_FIELDNAME,
-					 g_param_spec_string ("fieldname",
-							      _("Field Name"),
-							      /*_( */"XXX blurb" /*)*/,
-							      NULL,
-							      G_PARAM_READWRITE));
-
-	g_object_class_install_property (object_class, PROP_TEXT_MODEL,
-					 g_param_spec_object ("text_model",
-							      _("Text Model"),
-							      /*_( */"XXX blurb" /*)*/,
-							      E_TYPE_TEXT_MODEL,
-							      G_PARAM_READWRITE));
-
-	g_object_class_install_property (object_class, PROP_MAX_FIELD_NAME_WIDTH,
-					 g_param_spec_double ("max_field_name_length",
-							      _("Max field name length"),
-							      /*_( */"XXX blurb" /*)*/,
-							      -1.0, G_MAXDOUBLE, -1.0,
-							      G_PARAM_READWRITE));
-
-	g_object_class_install_property (object_class, PROP_EDITABLE,
-					 g_param_spec_boolean ("editable",
-							       _("Editable"),
-							       /*_( */"XXX blurb" /*)*/,
-							       FALSE,
-							       G_PARAM_READWRITE));
-
-	e_minicard_label_signals [STYLE_SET] =
-		g_signal_new ("style_set",
-			      G_TYPE_FROM_CLASS (object_class),
-			      G_SIGNAL_RUN_FIRST,
-			      G_STRUCT_OFFSET (EMinicardLabelClass, style_set),
-			      NULL, NULL,
-			      eab_marshal_VOID__OBJECT,
-			      G_TYPE_NONE, 1,
-			      GTK_TYPE_STYLE);
-
-	/* GnomeCanvasItem method overrides */
-	item_class->realize     = e_minicard_label_realize;
-	item_class->unrealize   = e_minicard_label_unrealize;
-	item_class->event       = e_minicard_label_event;
-}
-
-static void
-e_minicard_label_init (EMinicardLabel *minicard_label)
-{
-  minicard_label->width = 10;
-  minicard_label->height = 10;
-  minicard_label->rect = NULL;
-  minicard_label->fieldname = NULL;
-  minicard_label->field = NULL;
-
-  minicard_label->max_field_name_length = -1;
-
-  e_canvas_item_set_reflow_callback(GNOME_CANVAS_ITEM(minicard_label), e_minicard_label_reflow);
-}
-
-static void
-e_minicard_label_set_property  (GObject *object, guint prop_id, const GValue *value, GParamSpec *pspec)
-{
-	EMinicardLabel *e_minicard_label;
-	GnomeCanvasItem *item;
-
-	e_minicard_label = E_MINICARD_LABEL (object);
-	item = GNOME_CANVAS_ITEM (object);	
-
-	switch (prop_id){
-	case PROP_WIDTH:
-		e_minicard_label->width = g_value_get_double (value);
-		e_minicard_label_resize_children(e_minicard_label);
-		e_canvas_item_request_reflow (item);
-		break;
-	case PROP_HAS_FOCUS:
-		if (e_minicard_label->field && (g_value_get_boolean (value) != E_FOCUS_NONE))
-			e_canvas_item_grab_focus(e_minicard_label->field, FALSE);
-		break;
-	case PROP_FIELD:
-		gnome_canvas_item_set( e_minicard_label->field, "text", g_value_get_string (value), NULL );
-		break;
-	case PROP_FIELDNAME:
-		gnome_canvas_item_set( e_minicard_label->fieldname, "text", g_value_get_string (value), NULL );
-		break;
-	case PROP_TEXT_MODEL:
-		gnome_canvas_item_set( e_minicard_label->field, "model", g_value_get_object (value), NULL);
-		break;
-	case PROP_MAX_FIELD_NAME_WIDTH:
-		e_minicard_label->max_field_name_length = g_value_get_double (value);
-		break;
-	case PROP_EDITABLE:
-		e_minicard_label->editable = g_value_get_boolean (value);
-		g_object_set (e_minicard_label->field, "editable", FALSE /* e_minicard_label->editable */, NULL);
-		break;
-	default:
-		G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
-		break;
-	}
-}
-
-static void
-e_minicard_label_get_property  (GObject *object, guint prop_id, GValue *value, GParamSpec *pspec)
-{
-	EMinicardLabel *e_minicard_label;
-
-	e_minicard_label = E_MINICARD_LABEL (object);
-
-	switch (prop_id) {
-	case PROP_WIDTH:
-		g_value_set_double (value, e_minicard_label->width);
-		break;
-	case PROP_HEIGHT:
-		g_value_set_double (value, e_minicard_label->height);
-		break;
-	case PROP_HAS_FOCUS:
-		g_value_set_boolean (value, e_minicard_label->has_focus ? E_FOCUS_CURRENT : E_FOCUS_NONE);
-		break;
-	case PROP_FIELD:
-		g_object_get_property (G_OBJECT (e_minicard_label->field),
-				       "text", value);
-		break;
-	case PROP_FIELDNAME:
-		g_object_get_property (G_OBJECT (e_minicard_label->fieldname),
-				       "text", value);
-		break;
-	case PROP_TEXT_MODEL:
-		g_object_get_property (G_OBJECT (e_minicard_label->field),
-				       "model", value);
-		break;
-	case PROP_MAX_FIELD_NAME_WIDTH:
-		g_value_set_double (value, e_minicard_label->max_field_name_length);
-		break;
-	case PROP_EDITABLE:
-		g_value_set_boolean (value, e_minicard_label->editable);
-		break;
-	default:
-		G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
-		break;
-	}
-}
-
-static void
-e_minicard_label_realize (GnomeCanvasItem *item)
-{
-	EMinicardLabel *e_minicard_label;
-	GnomeCanvasGroup *group;
-
-	e_minicard_label = E_MINICARD_LABEL (item);
-	group = GNOME_CANVAS_GROUP( item );
-
-	if (GNOME_CANVAS_ITEM_CLASS( parent_class )->realize)
-		(* GNOME_CANVAS_ITEM_CLASS( parent_class )->realize) (item);
-
-	e_canvas_item_request_reflow(item);
-
-	e_minicard_label->rect =
-	  gnome_canvas_item_new( group,
-				 gnome_canvas_rect_get_type(),
-				 "x1", (double) 0,
-				 "y1", (double) 0,
-				 "x2", (double) e_minicard_label->width - 1,
-				 "y2", (double) e_minicard_label->height - 1,
-				 "outline_color", NULL,
-				 NULL );
-	e_minicard_label->fieldname =
-	  gnome_canvas_item_new( group,
-				 e_text_get_type(),
-				 "anchor", GTK_ANCHOR_NW,
-				 "clip_width", (double) ( e_minicard_label->width / 2 - 4 ),
-				 "clip", TRUE,
-				 "use_ellipsis", TRUE,
-				 "fill_color", "black",
-				 "draw_background", FALSE,
-				 "im_context", E_CANVAS (item->canvas)->im_context,
-				 NULL );
-	e_canvas_item_move_absolute(e_minicard_label->fieldname, 2, 1);
-
-	e_minicard_label->field =
-	  gnome_canvas_item_new( group,
-				 e_text_get_type(),
-				 "anchor", GTK_ANCHOR_NW,
-				 "clip_width", (double) ( ( e_minicard_label->width + 1 ) / 2 - 4 ),
-				 "clip", TRUE,
-				 "use_ellipsis", TRUE,
-				 "fill_color", "black",
-				 "editable", FALSE, /* e_minicard_label->editable, */
-				 "draw_background", FALSE,
-				 "im_context", E_CANVAS (item->canvas)->im_context,
-				 NULL );
-	e_canvas_item_move_absolute(e_minicard_label->field, ( e_minicard_label->width / 2 + 2), 1);
-
-	set_colors (e_minicard_label);
-
-	e_canvas_item_request_reflow(item);
-}
-
-static void
-e_minicard_label_unrealize (GnomeCanvasItem *item)
-{
-	EMinicardLabel *e_minicard_label;
-
-	e_minicard_label = E_MINICARD_LABEL (item);
-
-	if (GNOME_CANVAS_ITEM_CLASS( parent_class )->unrealize)
-		(* GNOME_CANVAS_ITEM_CLASS( parent_class )->unrealize) (item);
-}
-
-static gboolean
-e_minicard_label_event (GnomeCanvasItem *item, GdkEvent *event)
-{
-	EMinicardLabel *e_minicard_label;
- 
-	e_minicard_label = E_MINICARD_LABEL (item);
-
-	switch( event->type ) {
-	case GDK_KEY_PRESS:
-		if (event->key.keyval == GDK_Escape) {
-			GnomeCanvasItem *parent;
-
-			e_text_cancel_editing (E_TEXT (e_minicard_label->field));
-
-			parent = GNOME_CANVAS_ITEM (e_minicard_label)->parent;
-			if (parent)
-				e_canvas_item_grab_focus(parent, FALSE);
-		}
-		break;
-	case GDK_FOCUS_CHANGE: {
-		GdkEventFocus *focus_event = (GdkEventFocus *) event;
-
-		e_minicard_label->has_focus = focus_event->in;
-		set_colors (e_minicard_label);
-
-		g_object_set (e_minicard_label->field,
-			      "handle_popup", e_minicard_label->has_focus,
-			      NULL);
-		break;
-	}
-	case GDK_BUTTON_PRESS:
-	case GDK_BUTTON_RELEASE: 
-	case GDK_MOTION_NOTIFY:
-	case GDK_ENTER_NOTIFY:
-	case GDK_LEAVE_NOTIFY: {
-		gboolean return_val;
-		g_signal_emit_by_name(e_minicard_label->field, "event", event, &return_val);
-		return return_val;
-	}
-	default:
-		break;
-	}
-  
-	if (GNOME_CANVAS_ITEM_CLASS( parent_class )->event)
-		return (* GNOME_CANVAS_ITEM_CLASS( parent_class )->event) (item, event);
-	else
-		return 0;
-}
-
-static void
-e_minicard_label_resize_children(EMinicardLabel *e_minicard_label)
-{
-	double left_width;
-	if (e_minicard_label->max_field_name_length != -1 && ((e_minicard_label->width / 2) - 4 > e_minicard_label->max_field_name_length))
-		left_width = e_minicard_label->max_field_name_length;
-	else
-		left_width = e_minicard_label->width / 2 - 4;
-
-	gnome_canvas_item_set( e_minicard_label->fieldname,
-			       "clip_width", (double) MAX ( left_width, 0 ),
-			       NULL );
-	gnome_canvas_item_set( e_minicard_label->field,
-			       "clip_width", (double) MAX ( e_minicard_label->width - 8 - left_width, 0 ),
-			       NULL );
-}
-
-static void
-set_colors (EMinicardLabel *label)
-{
-	if ( (GTK_OBJECT_FLAGS( label ) & GNOME_CANVAS_ITEM_REALIZED) ) {
-		GtkWidget *canvas = GTK_WIDGET (GNOME_CANVAS_ITEM (label)->canvas);
-		GtkStyle *style = gtk_widget_get_style (canvas);
-		if (label->has_focus) {
-			gnome_canvas_item_set (label->rect, 
-					       "outline_color_gdk", &style->mid[GTK_STATE_SELECTED],
-					       "fill_color_gdk", &style->bg[GTK_STATE_NORMAL],
-					       NULL);
-
-			gnome_canvas_item_set (label->field,
-					       "fill_color_gdk", &canvas->style->text[GTK_STATE_NORMAL],
-					       NULL);
-
-			gnome_canvas_item_set (label->fieldname,
-					       "fill_color_gdk", &canvas->style->text[GTK_STATE_NORMAL],
-					       NULL);
-		}
-		else {
-			gnome_canvas_item_set (label->rect,
-					       "outline_color_gdk", NULL,
-					       "fill_color_gdk", NULL,
-					       NULL);
-
-			gnome_canvas_item_set (label->field,
-					       "fill_color_gdk", &canvas->style->text[GTK_STATE_NORMAL],
-					       NULL);
-
-			gnome_canvas_item_set (label->fieldname,
-					       "fill_color_gdk", &canvas->style->text[GTK_STATE_NORMAL],
-					       NULL);
-		}
-	}
-}
-
-static void
-e_minicard_label_style_set (EMinicardLabel *label, GtkStyle *previous_style)
-{
-	set_colors (label);
-}
-
-static void
-e_minicard_label_reflow(GnomeCanvasItem *item, int flags)
-{
-	EMinicardLabel *e_minicard_label = E_MINICARD_LABEL(item);
-	
-	gint old_height;
-	gdouble text_height;
-	gdouble left_width;
-
-	old_height = e_minicard_label->height;
-
-	g_object_get(e_minicard_label->fieldname, 
-		     "text_height", &text_height,
-		     NULL);
-
-	e_minicard_label->height = text_height;
-
-
-	g_object_get(e_minicard_label->field, 
-		     "text_height", &text_height,
-		     NULL);
-
-	if (e_minicard_label->height < text_height)
-		e_minicard_label->height = text_height;
-	e_minicard_label->height += 3;
-
-	gnome_canvas_item_set( e_minicard_label->rect,
-			       "x2", (double) e_minicard_label->width - 1,
-			       "y2", (double) e_minicard_label->height - 1,
-			       NULL );
-
-	gnome_canvas_item_set( e_minicard_label->fieldname,
-			       "clip_height", (double) e_minicard_label->height - 3,
-			       NULL );
-
-	if (e_minicard_label->max_field_name_length != -1 && ((e_minicard_label->width / 2) - 4 > e_minicard_label->max_field_name_length))
-		left_width = e_minicard_label->max_field_name_length;
-	else
-		left_width = e_minicard_label->width / 2 - 4;
-
-	e_canvas_item_move_absolute(e_minicard_label->field, left_width + 6, 1);
-
-	if (old_height != e_minicard_label->height)
-		e_canvas_item_request_parent_reflow(item);
-}
-
-GnomeCanvasItem *
-e_minicard_label_new(GnomeCanvasGroup *parent)
-{
-	GnomeCanvasItem *item = gnome_canvas_item_new(parent, e_minicard_label_get_type(), NULL);
-	return item;
-}
-
diff --git a/addressbook/gui/widgets/e-minicard-label.h b/addressbook/gui/widgets/e-minicard-label.h
deleted file mode 100644
index d914cb30bb..0000000000
--- a/addressbook/gui/widgets/e-minicard-label.h
+++ /dev/null
@@ -1,86 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-/* e-minicard-label.h
- * Copyright (C) 2000  Ximian, Inc.
- * Author: Chris Lahey <clahey@ximian.com>
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of version 2 of the GNU General Public
- * License as published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * General Public License for more details.
- *
- * You should have received a copy of the GNU General Public
- * License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
- */
-#ifndef __E_MINICARD_LABEL_H__
-#define __E_MINICARD_LABEL_H__
-
-#include <glib.h>
-#include <libgnomecanvas/gnome-canvas.h>
-
-#ifdef __cplusplus
-extern "C" {
-#pragma }
-#endif /* __cplusplus */
-
-/* EMinicardLabel - A label doing focus with non-marching ants.
- *
- * The following arguments are available:
- *
- * name		type		read/write	description
- * --------------------------------------------------------------------------------
- * width        double          RW              width of the label
- * height       double          R               height of the label
- * field        string          RW              text in the field label
- * fieldname    string          RW              text in the fieldname label
- */
-
-#define E_TYPE_MINICARD_LABEL			(e_minicard_label_get_type ())
-#define E_MINICARD_LABEL(obj)			(G_TYPE_CHECK_INSTANCE_CAST ((obj), E_TYPE_MINICARD_LABEL, EMinicardLabel))
-#define E_MINICARD_LABEL_CLASS(klass)		(G_TYPE_CHECK_CLASS_CAST ((klass), E_TYPE_MINICARD_LABEL, EMiniCardLabelClass))
-#define E_IS_MINICARD_LABEL(obj)		(G_TYPE_CHECK_INSTANCE_TYPE ((obj), E_TYPE_MINICARD_LABEL))
-#define E_IS_MINICARD_LABEL_CLASS(klass)	(G_TYPE_CHECK_CLASS_TYPE ((obj), E_TYPE_MINICARD_LABEL))
-
-
-typedef struct _EMinicardLabel       EMinicardLabel;
-typedef struct _EMinicardLabelClass  EMinicardLabelClass;
-
-struct _EMinicardLabel
-{
-	GnomeCanvasGroup parent;
-	
-	/* item specific fields */
-	double width;
-	double height;
-	double max_field_name_length;
-	guint editable : 1;
-	GnomeCanvasItem *fieldname;
-	GnomeCanvasItem *field;
-	GnomeCanvasItem *rect;
-
-	gboolean has_focus;
-};
-
-struct _EMinicardLabelClass
-{
-	GnomeCanvasGroupClass parent_class;
-
-	void (* style_set) (EMinicardLabel *label, GtkStyle *previous_style);
-};
-
-
-GType      e_minicard_label_get_type (void);
-GnomeCanvasItem *e_minicard_label_new(GnomeCanvasGroup *parent);
-void e_minicard_label_construct (GnomeCanvasItem *item);
-
-#ifdef __cplusplus
-}
-#endif /* __cplusplus */
-
-
-#endif /* __E_MINICARD_LABEL_H__ */
diff --git a/addressbook/gui/widgets/e-minicard-view-widget.c b/addressbook/gui/widgets/e-minicard-view-widget.c
deleted file mode 100644
index ff1bdc1f06..0000000000
--- a/addressbook/gui/widgets/e-minicard-view-widget.c
+++ /dev/null
@@ -1,440 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-/* 
- * e-minicard-view-widget.c
- * Copyright (C) 2000  Ximian, Inc.
- * Author: Chris Lahey <clahey@ximian.com>
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of version 2 of the GNU General Public
- * License as published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * General Public License for more details.
- *
- * You should have received a copy of the GNU General Public
- * License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
- */
-
-#include <config.h>
-
-#include <gtk/gtksignal.h>
-#include <gal/widgets/e-canvas-background.h>
-#include <gal/widgets/e-canvas.h>
-#include <libgnome/gnome-i18n.h>
-
-#include "eab-marshal.h"
-#include "e-minicard-view-widget.h"
-
-static void e_minicard_view_widget_init		 (EMinicardViewWidget		 *widget);
-static void e_minicard_view_widget_class_init	 (EMinicardViewWidgetClass	 *klass);
-static void e_minicard_view_widget_set_property  (GObject *object, guint prop_id, const GValue *value, GParamSpec *pspec);
-static void e_minicard_view_widget_get_property  (GObject *object, guint prop_id, GValue *value, GParamSpec *pspec);
-static void e_minicard_view_widget_dispose       (GObject *object);
-static void e_minicard_view_widget_reflow        (ECanvas *canvas);
-static void e_minicard_view_widget_size_allocate (GtkWidget *widget, GtkAllocation *allocation);
-static void e_minicard_view_widget_style_set     (GtkWidget *widget, GtkStyle *previous_style);
-static void e_minicard_view_widget_realize       (GtkWidget *widget);
-
-static ECanvasClass *parent_class = NULL;
-
-/* The arguments we take */
-enum {
-	PROP_0,
-	PROP_BOOK,
-	PROP_QUERY,
-	PROP_EDITABLE,
-	PROP_COLUMN_WIDTH
-};
-
-enum {
-	SELECTION_CHANGE,
-	COLUMN_WIDTH_CHANGED,
-	RIGHT_CLICK,
-	LAST_SIGNAL
-};
-
-static guint signals [LAST_SIGNAL] = {0, };
-
-GType
-e_minicard_view_widget_get_type (void)
-{
-	static GType type = 0;
-
-	if (!type) {
-		static const GTypeInfo info =  {
-			sizeof (EMinicardViewWidgetClass),
-			NULL,           /* base_init */
-			NULL,           /* base_finalize */
-			(GClassInitFunc) e_minicard_view_widget_class_init,
-			NULL,           /* class_finalize */
-			NULL,           /* class_data */
-			sizeof (EMinicardViewWidget),
-			0,             /* n_preallocs */
-			(GInstanceInitFunc) e_minicard_view_widget_init,
-		};
-
-		type = g_type_register_static (e_canvas_get_type (), "EMinicardViewWidget", &info, 0);
-	}
-
-	return type;
-}
-
-static void
-e_minicard_view_widget_class_init (EMinicardViewWidgetClass *klass)
-{
-	GObjectClass *object_class;
-	GtkWidgetClass *widget_class;
-	ECanvasClass *canvas_class;
-
-	object_class = (GObjectClass*) klass;
-	widget_class = GTK_WIDGET_CLASS (klass);
-	canvas_class = E_CANVAS_CLASS (klass);
-
-	parent_class = gtk_type_class (e_canvas_get_type ());
-
-	object_class->set_property       = e_minicard_view_widget_set_property;
-	object_class->get_property       = e_minicard_view_widget_get_property;
-	object_class->dispose            = e_minicard_view_widget_dispose;
-
-	g_object_class_install_property (object_class, PROP_BOOK, 
-					 g_param_spec_object ("book",
-							      _("Book"),
-							      /*_( */"XXX blurb" /*)*/,
-							      E_TYPE_BOOK,
-							      G_PARAM_READWRITE));
-
-	g_object_class_install_property (object_class, PROP_QUERY, 
-					 g_param_spec_string ("query",
-							      _("Query"),
-							      /*_( */"XXX blurb" /*)*/,
-							      NULL,
-							      G_PARAM_READWRITE));
-
-	g_object_class_install_property (object_class, PROP_EDITABLE, 
-					 g_param_spec_boolean ("editable",
-							       _("Editable"),
-							       /*_( */"XXX blurb" /*)*/,
-							       FALSE,
-							       G_PARAM_READWRITE));
-
-	g_object_class_install_property (object_class, PROP_COLUMN_WIDTH, 
-					 g_param_spec_double ("column_width",
-							      _("Column Width"),
-							      /*_( */"XXX blurb" /*)*/,
-							      0.0, G_MAXDOUBLE, 150.0,
-							      G_PARAM_READWRITE));
-
-	signals [SELECTION_CHANGE] =
-		g_signal_new ("selection_change",
-			      G_OBJECT_CLASS_TYPE (object_class),
-			      G_SIGNAL_RUN_LAST,
-			      G_STRUCT_OFFSET (EMinicardViewWidgetClass, selection_change),
-			      NULL, NULL,
-			      eab_marshal_NONE__NONE,
-			      G_TYPE_NONE, 0);
-
-	signals [COLUMN_WIDTH_CHANGED] =
-		g_signal_new ("column_width_changed",
-			      G_OBJECT_CLASS_TYPE (object_class),
-			      G_SIGNAL_RUN_LAST,
-			      G_STRUCT_OFFSET (EMinicardViewWidgetClass, column_width_changed),
-			      NULL, NULL,
-			      eab_marshal_NONE__DOUBLE,
-			      G_TYPE_NONE, 1, G_TYPE_DOUBLE);
-
-	signals [RIGHT_CLICK] =
-		g_signal_new ("right_click",
-			      G_OBJECT_CLASS_TYPE (object_class),
-			      G_SIGNAL_RUN_LAST,
-			      G_STRUCT_OFFSET (EMinicardViewWidgetClass, right_click),
-			      NULL, NULL,
-			      eab_marshal_INT__POINTER,
-			      G_TYPE_INT, 1, G_TYPE_POINTER);
-
-	widget_class->style_set     = e_minicard_view_widget_style_set;
-	widget_class->realize       = e_minicard_view_widget_realize;
-	widget_class->size_allocate = e_minicard_view_widget_size_allocate;
-
-	canvas_class->reflow        = e_minicard_view_widget_reflow;
-
-	klass->selection_change     = NULL;
-	klass->column_width_changed = NULL;
-	klass->right_click          = NULL;
-}
-
-static void
-e_minicard_view_widget_init (EMinicardViewWidget *view)
-{
-	view->emv = NULL;
-
-	view->book = NULL;
-	view->query = NULL;
-	view->editable = FALSE;
-	view->column_width = 150;
-}
-
-GtkWidget *
-e_minicard_view_widget_new (EAddressbookReflowAdapter *adapter)
-{
-	EMinicardViewWidget *widget = E_MINICARD_VIEW_WIDGET (g_object_new (e_minicard_view_widget_get_type (), NULL));
-
-	widget->adapter = adapter;
-	g_object_ref (widget->adapter);
-
-	return GTK_WIDGET (widget);
-}
-
-static void
-e_minicard_view_widget_set_property (GObject *object,
-				     guint prop_id,
-				     const GValue *value,
-				     GParamSpec *pspec)
-{
-	EMinicardViewWidget *emvw;
-
-	emvw = E_MINICARD_VIEW_WIDGET (object);
-
-	switch (prop_id){
-	case PROP_BOOK:
-		if (emvw->book)
-			g_object_unref (emvw->book);
-		if (g_value_get_object (value)) {
-			emvw->book = E_BOOK(g_value_get_object (value));
-			if (emvw->book)
-				g_object_ref(emvw->book);
-		} else
-			emvw->book = NULL;
-		if (emvw->emv)
-			g_object_set(emvw->emv,
-				     "book", emvw->book,
-				       NULL);
-		break;
-	case PROP_QUERY:
-		emvw->query = g_strdup(g_value_get_string (value));
-		if (emvw->emv)
-			g_object_set(emvw->emv,
-				     "query", emvw->query,
-				     NULL);
-		break;
-	case PROP_EDITABLE:
-		emvw->editable = g_value_get_boolean (value);
-		if (emvw->emv)
-			g_object_set (emvw->emv,
-				      "editable", emvw->editable,
-				      NULL);
-		break;
-	case PROP_COLUMN_WIDTH:
-		emvw->column_width = g_value_get_double (value);
-		if (emvw->emv) {
-			g_object_set (emvw->emv,
-				      "column_width", emvw->column_width,
-				      NULL);
-		}
-		break;
-	default:
-		G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
-		break;
-	}
-}
-
-static void
-e_minicard_view_widget_get_property (GObject *object,
-				     guint prop_id,
-				     GValue *value,
-				     GParamSpec *pspec)
-{
-	EMinicardViewWidget *emvw;
-
-	emvw = E_MINICARD_VIEW_WIDGET (object);
-
-	switch (prop_id) {
-	case PROP_BOOK:
-		g_value_set_object (value, emvw->book);
-		break;
-	case PROP_QUERY:
-		g_value_set_string (value, emvw->query);
-		break;
-	case PROP_EDITABLE:
-		g_value_set_boolean (value, emvw->editable);
-		break;
-	case PROP_COLUMN_WIDTH:
-		g_value_set_double (value, emvw->column_width);
-		break;
-	default:
-		G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
-		break;
-	}
-}
-
-static void
-e_minicard_view_widget_dispose (GObject *object)
-{
-	EMinicardViewWidget *view = E_MINICARD_VIEW_WIDGET(object);
-
-	if (view->book) {
-		g_object_unref (view->book);
-		view->book = NULL;
-	}
-	if (view->query) {
-		g_free(view->query);
-		view->query = NULL;
-	}
-
-	if (view->adapter) {
-		g_object_unref (view->adapter);
-		view->adapter = NULL;
-	}
-
-	if (G_OBJECT_CLASS(parent_class)->dispose)
-		G_OBJECT_CLASS(parent_class)->dispose (object);
-}
-
-static void
-selection_change (ESelectionModel *esm, EMinicardViewWidget *widget)
-{
-	g_signal_emit (widget,
-		       signals [SELECTION_CHANGE], 0);
-}
-
-static void
-selection_row_change (ESelectionModel *esm, int row, EMinicardViewWidget *widget)
-{
-	gboolean selected = e_selection_model_is_row_selected (esm, row);
-
-	/* we only handle the selected case here */
-	if (!selected)
-		return;
-
-	selection_change (esm, widget);
-}
-
-static void
-column_width_changed (ESelectionModel *esm, double width, EMinicardViewWidget *widget)
-{
-	g_signal_emit (widget,
-		       signals [COLUMN_WIDTH_CHANGED], 0, width);
-}
-
-static guint
-right_click (EMinicardView *view, GdkEvent *event, EMinicardViewWidget *widget)
-{
-	guint ret_val;
-	g_signal_emit (widget,
-		       signals [RIGHT_CLICK], 0,
-		       event, &ret_val);
-	return ret_val;
-}
-
-static void
-e_minicard_view_widget_style_set (GtkWidget *widget, GtkStyle *previous_style)
-{
-	EMinicardViewWidget *view = E_MINICARD_VIEW_WIDGET(widget);
-
-	if (view->background)
-		gnome_canvas_item_set (view->background,
-				       "fill_color_gdk", &widget->style->base[GTK_STATE_NORMAL],
-				       NULL );
-
-	if (GTK_WIDGET_CLASS(parent_class)->style_set)
-		GTK_WIDGET_CLASS(parent_class)->style_set (widget, previous_style);
-}
-
-
-static void
-e_minicard_view_widget_realize (GtkWidget *widget)
-{
-	EMinicardViewWidget *view = E_MINICARD_VIEW_WIDGET(widget);
-	GtkStyle *style = gtk_widget_get_style (widget);
-
-	view->background = gnome_canvas_item_new(gnome_canvas_root( GNOME_CANVAS(view) ),
-						 e_canvas_background_get_type(),
-						 "fill_color_gdk", &style->base[GTK_STATE_NORMAL],
-						 NULL );
-
-	view->emv = gnome_canvas_item_new(
-		gnome_canvas_root( GNOME_CANVAS(view) ),
-		e_minicard_view_get_type(),
-		"height", (double) 100,
-		"minimum_width", (double) 100,
-		"adapter", view->adapter,
-		"column_width", view->column_width,
-		NULL );
-
-	g_signal_connect (E_REFLOW(view->emv)->selection,
-			  "selection_changed",
-			  G_CALLBACK (selection_change), view);
-	g_signal_connect (E_REFLOW(view->emv)->selection,
-			  "selection_row_changed",
-			  G_CALLBACK (selection_row_change), view);
-	g_signal_connect (view->emv,
-			  "column_width_changed",
-			  G_CALLBACK (column_width_changed), view);
-	g_signal_connect (view->emv,
-			  "right_click",
-			  G_CALLBACK (right_click), view);
-
-	if (GTK_WIDGET_CLASS(parent_class)->realize)
-		GTK_WIDGET_CLASS(parent_class)->realize (widget);
-}
-
-static void
-e_minicard_view_widget_size_allocate(GtkWidget *widget, GtkAllocation *allocation)
-{
-	if (GTK_WIDGET_CLASS(parent_class)->size_allocate)
-		GTK_WIDGET_CLASS(parent_class)->size_allocate (widget, allocation);
-	
-	if (GTK_WIDGET_REALIZED(widget)) {
-		double width;
-		EMinicardViewWidget *view = E_MINICARD_VIEW_WIDGET(widget);
-
-		gnome_canvas_item_set( view->emv,
-				       "height", (double) allocation->height,
-				       NULL );
-		gnome_canvas_item_set( view->emv,
-				       "minimum_width", (double) allocation->width,
-				       NULL );
-		g_object_get(view->emv,
-			     "width", &width,
-			     NULL);
-		width = MAX(width, allocation->width);
-		gnome_canvas_set_scroll_region (GNOME_CANVAS (view), 0, 0, width - 1, allocation->height - 1);
-	}
-}
-
-static void
-e_minicard_view_widget_reflow(ECanvas *canvas)
-{
-	double width;
-	EMinicardViewWidget *view = E_MINICARD_VIEW_WIDGET(canvas);
-
-	if (E_CANVAS_CLASS(parent_class)->reflow)
-		E_CANVAS_CLASS(parent_class)->reflow (canvas);
-
-	g_object_get(view->emv,
-		     "width", &width,
-		     NULL);
-	width = MAX(width, GTK_WIDGET(canvas)->allocation.width);
-	gnome_canvas_set_scroll_region(GNOME_CANVAS(canvas), 0, 0, width - 1, GTK_WIDGET(canvas)->allocation.height - 1);
-}
-
-ESelectionModel *
-e_minicard_view_widget_get_selection_model (EMinicardViewWidget *view)
-{
-	if (view->emv)
-		return E_SELECTION_MODEL (E_REFLOW (view->emv)->selection);
-	else
-		return NULL;
-}
-
-EMinicardView *
-e_minicard_view_widget_get_view             (EMinicardViewWidget       *view)
-{
-	if (view->emv)
-		return E_MINICARD_VIEW (view->emv);
-	else
-		return NULL;
-}
diff --git a/addressbook/gui/widgets/e-minicard-view-widget.h b/addressbook/gui/widgets/e-minicard-view-widget.h
deleted file mode 100644
index ef8401b88c..0000000000
--- a/addressbook/gui/widgets/e-minicard-view-widget.h
+++ /dev/null
@@ -1,73 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-/* e-minicard-view-widget.h
- * Copyright (C) 2000  Ximian, Inc.
- * Author: Chris Lahey <clahey@ximian.com>
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of version 2 of the GNU General Public
- * License as published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * General Public License for more details.
- *
- * You should have received a copy of the GNU General Public
- * License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
- */
-#ifndef __E_MINICARD_VIEW_WIDGET_H__
-#define __E_MINICARD_VIEW_WIDGET_H__
-
-#include <gal/widgets/e-canvas.h>
-#include <libebook/e-book.h>
-#include "e-minicard-view.h"
-
-G_BEGIN_DECLS
-
-#define E_TYPE_MINICARD_VIEW_WIDGET		(e_minicard_view_widget_get_type ())
-#define E_MINICARD_VIEW_WIDGET(obj)		(G_TYPE_CHECK_INSTANCE_CAST ((obj), E_TYPE_MINICARD_VIEW_WIDGET, EMinicardViewWidget))
-#define E_MINICARD_VIEW_WIDGET_CLASS(klass)	(G_TYPE_CHECK_CLASS_CAST ((klass), E_TYPE_MINICARD_VIEW_WIDGET, EMinicardViewWidgetClass))
-#define E_IS_MINICARD_VIEW_WIDGET(obj) 		(G_TYPE_CHECK_INSTANCE_TYPE ((obj), E_TYPE_MINICARD_VIEW_WIDGET))
-#define E_IS_MINICARD_VIEW_WIDGET_CLASS(klass) 	(G_TYPE_CHECK_CLASS_TYPE ((obj), E_TYPE_MINICARD_VIEW_WIDGET))
-
-
-typedef struct _EMinicardViewWidget       EMinicardViewWidget;
-typedef struct _EMinicardViewWidgetClass  EMinicardViewWidgetClass;
-
-struct _EMinicardViewWidget
-{
-	ECanvas parent;
-
-	GnomeCanvasItem *background;
-	GnomeCanvasItem *emv;
-
-	EAddressbookReflowAdapter *adapter;
-
-	EBook *book;
-	char *query;
-	guint editable : 1;
-
-	double column_width;
-};
-
-struct _EMinicardViewWidgetClass
-{
-	ECanvasClass parent_class;
-	void         (*selection_change)     (EMinicardViewWidget *emvw);
-	void         (*column_width_changed) (EMinicardViewWidget *emvw, double width);
-	guint        (*right_click)          (EMinicardViewWidget *emvw);
-};
-
-
-GType            e_minicard_view_widget_get_type             (void);
-GtkWidget       *e_minicard_view_widget_new                  (EAddressbookReflowAdapter *adapter);
-
-/* Get parts of the view widget. */
-ESelectionModel *e_minicard_view_widget_get_selection_model  (EMinicardViewWidget       *view);
-EMinicardView   *e_minicard_view_widget_get_view             (EMinicardViewWidget       *view);
-
-G_END_DECLS
-
-#endif /* __E_MINICARD_VIEW_WIDGET_H__ */
diff --git a/addressbook/gui/widgets/e-minicard-view.c b/addressbook/gui/widgets/e-minicard-view.c
deleted file mode 100644
index e66bb6047a..0000000000
--- a/addressbook/gui/widgets/e-minicard-view.c
+++ /dev/null
@@ -1,630 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-/* 
- * e-minicard-view.c
- * Copyright (C) 2000  Ximian, Inc.
- * Author: Chris Lahey <clahey@ximian.com>
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of version 2 of the GNU General Public
- * License as published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * General Public License for more details.
- *
- * You should have received a copy of the GNU General Public
- * License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
- */
-
-#include <config.h>
-
-#include "e-minicard-view.h"
-
-#include "eab-gui-util.h"
-#include "eab-marshal.h"
-#include "util/eab-book-util.h"
-
-#include <gtk/gtkselection.h>
-#include <gtk/gtkdnd.h>
-#include <gdk/gdkkeysyms.h>
-#include <gal/widgets/e-canvas.h>
-#include <libgnome/gnome-i18n.h>
-#include <string.h>
-
-static void e_minicard_view_drag_data_get(GtkWidget *widget,
-					  GdkDragContext *context,
-					  GtkSelectionData *selection_data,
-					  guint info,
-					  guint time,
-					  EMinicardView *view);
-
-static EReflowClass *parent_class = NULL;
-#define PARENT_TYPE (E_REFLOW_TYPE)
-
-/* The arguments we take */
-enum {
-	PROP_0,
-	PROP_ADAPTER,
-	PROP_BOOK,
-	PROP_QUERY,
-	PROP_EDITABLE
-};
-
-
-enum {
-	RIGHT_CLICK,
-	LAST_SIGNAL
-};
-
-static guint signals [LAST_SIGNAL] = {0, };
-
-enum DndTargetType {
-	DND_TARGET_TYPE_VCARD_LIST,
-	DND_TARGET_TYPE_SOURCE_VCARD_LIST
-};
-#define VCARD_LIST_TYPE "text/x-vcard"
-#define SOURCE_VCARD_LIST_TYPE "text/x-source-vcard"
-static GtkTargetEntry drag_types[] = {
-	{ SOURCE_VCARD_LIST_TYPE, 0, DND_TARGET_TYPE_SOURCE_VCARD_LIST },
-	{ VCARD_LIST_TYPE, 0, DND_TARGET_TYPE_VCARD_LIST }
-};
-static gint num_drag_types = sizeof(drag_types) / sizeof(drag_types[0]);
-
-static void
-e_minicard_view_drag_data_get(GtkWidget *widget,
-			      GdkDragContext *context,
-			      GtkSelectionData *selection_data,
-			      guint info,
-			      guint time,
-			      EMinicardView *view)
-{
-	if (!E_IS_MINICARD_VIEW(view))
-		return;
-
-	switch (info) {
-	case DND_TARGET_TYPE_VCARD_LIST: {
-		char *value;
-		
-		value = eab_contact_list_to_string (view->drag_list);
-
-		gtk_selection_data_set (selection_data,
-					selection_data->target,
-					8,
-					value, strlen (value));
-		break;
-	}
-	case DND_TARGET_TYPE_SOURCE_VCARD_LIST: {
-		EBook *book;
-		char *value;
-		
-		g_object_get (view->adapter, "book", &book, NULL);
-		value = eab_book_and_contact_list_to_string (book, view->drag_list);
-
-		gtk_selection_data_set (selection_data,
-					selection_data->target,
-					8,
-					value, strlen (value));
-		break;
-	}
-	}
-}
-
-static void
-clear_drag_data (EMinicardView *view)
-{
-	g_list_foreach (view->drag_list, (GFunc)g_object_unref, NULL);
-	g_list_free (view->drag_list);
-	view->drag_list = NULL;
-}
-
-static int
-e_minicard_view_drag_begin (EAddressbookReflowAdapter *adapter, GdkEvent *event, EMinicardView *view)
-{
-	GdkDragContext *context;
-	GtkTargetList *target_list;
-	GdkDragAction actions = GDK_ACTION_MOVE | GDK_ACTION_COPY;
-
-	clear_drag_data (view);
-	
-	view->drag_list = e_minicard_view_get_card_list (view);
-
-	g_print ("dragging %d card(s)\n", g_list_length (view->drag_list));
-
-	target_list = gtk_target_list_new (drag_types, num_drag_types);
-
-	context = gtk_drag_begin (GTK_WIDGET (GNOME_CANVAS_ITEM (view)->canvas),
-				  target_list, actions, 1/*XXX*/, event);
-
-	if (!view->canvas_drag_data_get_id)
-		view->canvas_drag_data_get_id = g_signal_connect (GNOME_CANVAS_ITEM (view)->canvas,
-								  "drag_data_get",
-								  G_CALLBACK (e_minicard_view_drag_data_get),
-								  view);
-
-	gtk_drag_set_icon_default (context);
-
-	return TRUE;
-}
-
-static void
-set_empty_message (EMinicardView *view)
-{
-	char *empty_message;
-	gboolean editable = FALSE, perform_initial_query = FALSE;
-	EBook *book;
-
-	if (view->adapter) {
-		g_object_get (view->adapter,
-			      "editable", &editable,
-			      NULL);
-
-		g_object_get (view->adapter, "book", &book, NULL);
-		if (!e_book_check_static_capability (book, "do-initial-query"))
-			perform_initial_query = TRUE;
-	}
-
-	if (editable) {
-		if (perform_initial_query)
-			empty_message = _("\n\nSearch for the Contact\n\n"
-					  "or double-click here to create a new Contact.");
-		else
-			empty_message = _("\n\nThere are no items to show in this view.\n\n"
-					  "Double-click here to create a new Contact.");
-	}
-	else {
-		if (perform_initial_query)
-			empty_message = _("\n\nSearch for the Contact.");
-		else
-			empty_message = _("\n\nThere are no items to show in this view.");
-	}
-
-	g_object_set (view,
-		      "empty_message", empty_message,
-		      NULL);
-}
-
-static void
-writable_status_change (EABModel *model, gboolean writable, EMinicardView *view)
-{
-	set_empty_message (view);
-}
-
-static void
-adapter_changed (EMinicardView *view)
-{
-	set_empty_message (view);
-
-	g_signal_connect (view->adapter, "drag_begin",
-			  G_CALLBACK (e_minicard_view_drag_begin), view);
-}
-
-static void
-e_minicard_view_set_property (GObject *object,
-			      guint prop_id,
-			      const GValue *value,
-			      GParamSpec *pspec)
-{
-	EMinicardView *view;
-
-	view = E_MINICARD_VIEW (object);
-	
-	switch (prop_id){
-	case PROP_ADAPTER:
-		if (view->adapter) {
-			if (view->writable_status_id) {
-				EABModel *model;
-				g_object_get (view->adapter,
-					      "model", &model,
-					      NULL);
-				if (model) {
-					g_signal_handler_disconnect (model, view->writable_status_id);
-				}
-			}
-
-			g_object_unref (view->adapter);
-		}
-		view->writable_status_id = 0;
-		view->adapter = g_value_get_object (value);
-		g_object_ref (view->adapter);
-		adapter_changed (view);
-		g_object_set (view,
-			      "model", view->adapter,
-			      NULL);
-		if (view->adapter) {
-			EABModel *model;
-			g_object_get (view->adapter,
-				      "model", &model,
-				      NULL);
-			if (model) {
-				view->writable_status_id =
-					g_signal_connect (model, "writable_status",
-							  G_CALLBACK (writable_status_change), view);
-			}
-							    
-		}
-		break;
-	case PROP_BOOK:
-		g_object_set (view->adapter,
-			      "book", g_value_get_object (value),
-			      NULL);
-		set_empty_message (view);
-		break;
-	case PROP_QUERY:
-		g_object_set (view->adapter,
-			      "query", g_value_get_string (value),
-			      NULL);
-		break;
-	case PROP_EDITABLE:
-		g_object_set (view->adapter,
-			      "editable", g_value_get_boolean (value),
-			      NULL);
-		set_empty_message (view);
-		break;
-	default:
-		G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
-		break;
-	}
-}
-
-static void
-e_minicard_view_get_property (GObject *object,
-			      guint prop_id,
-			      GValue *value,
-			      GParamSpec *pspec)
-{
-	EMinicardView *view;
-
-	view = E_MINICARD_VIEW (object);
-
-	switch (prop_id) {
-	case PROP_ADAPTER:
-		g_value_set_object (value, view->adapter);
-		break;
-	case PROP_BOOK:
-		g_object_get_property (G_OBJECT (view->adapter),
-				       "book", value);
-		break;
-	case PROP_QUERY:
-		g_object_get_property (G_OBJECT (view->adapter),
-				       "query", value);
-		break;
-	case PROP_EDITABLE:
-		g_object_get_property (G_OBJECT (view->adapter),
-				       "editable", value);
-		break;
-	default:
-		G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
-		break;
-	}
-}
-
-static void
-e_minicard_view_dispose (GObject *object)
-{
-	EMinicardView *view = E_MINICARD_VIEW(object);
-
-	clear_drag_data (view);
-
-	if (view->canvas_drag_data_get_id) {
-		g_signal_handler_disconnect (GNOME_CANVAS_ITEM (view)->canvas,
-					     view->canvas_drag_data_get_id);
-		view->canvas_drag_data_get_id = 0;
-	}
-
-	if (view->adapter) {
-		if (view->writable_status_id) {
-			EABModel *model;
-			g_object_get (view->adapter,
-				      "model", &model,
-				      NULL);
-			if (model) {
-				g_signal_handler_disconnect (model, view->writable_status_id);
-			}
-		}
-
-		g_object_unref (view->adapter);
-	}
-	view->writable_status_id = 0;
-	view->adapter = NULL;
-
-	if (G_OBJECT_CLASS(parent_class)->dispose)
-		G_OBJECT_CLASS(parent_class)->dispose (object);
-}
-
-static guint
-e_minicard_view_right_click (EMinicardView *view, GdkEvent *event)
-{
-	guint ret_val = 0;
-	g_signal_emit (view, signals[RIGHT_CLICK], 0,
-		       event, &ret_val);
-	return ret_val;
-}
-
-static gboolean
-e_minicard_view_event (GnomeCanvasItem *item, GdkEvent *event)
-{
-	EMinicardView *view;
- 
-	view = E_MINICARD_VIEW (item);
-
-	switch( event->type ) {
-	case GDK_2BUTTON_PRESS:
-		if (((GdkEventButton *)event)->button == 1) {
-			gboolean editable;
-
-			g_object_get(view->adapter, "editable", &editable, NULL);
-  
-			if (editable) {
-				EBook *book;
-				g_object_get(view, "book", &book, NULL);
- 
-				if (book && E_IS_BOOK (book))
-					eab_show_contact_editor (book, e_contact_new(), TRUE, editable);
-			}
-			return TRUE;
-		}
-	case GDK_BUTTON_PRESS:
-		if (event->button.button == 3) {
-			e_minicard_view_right_click (view, event);
-		}
-		break;
-	case GDK_KEY_PRESS:
-		if (event->key.keyval & GDK_SHIFT_MASK &&
-			event->key.keyval == GDK_F10) {
-			e_minicard_view_right_click (view, event);
-		}
-		break;
-	default:
-		break;
-	}
-
-	if (GNOME_CANVAS_ITEM_CLASS(parent_class)->event)
-		return GNOME_CANVAS_ITEM_CLASS(parent_class)->event(item, event);
-	else
-		return FALSE;
-}
-
-static gint
-e_minicard_view_selection_event (EReflow *reflow, GnomeCanvasItem *item, GdkEvent *event)
-{
-	EMinicardView *view;
-	int return_val = FALSE;
-
-	view = E_MINICARD_VIEW (reflow);
-	if (parent_class->selection_event) {
-		return_val = parent_class->selection_event (reflow, item, event);
-	}
-
-	switch (event->type) {
-	case GDK_FOCUS_CHANGE:
-		if (event->focus_change.in) {
-			int i;
-			for (i = 0; i < reflow->count; i++) {
-				if (reflow->items[i] == item) {
-					e_selection_model_maybe_do_something(reflow->selection, i, 0, 0);
-					break;
-				}
-			}
-		}
-		break;
-	case GDK_BUTTON_PRESS:
-		if (event->button.button == 3) {
-			return_val = e_minicard_view_right_click (view, event);
-			if (!return_val)
-				e_selection_model_right_click_up(reflow->selection);
-		}
-		break;
-	default:
-		break;
-	}
-	return return_val;
-}
-
-typedef struct {
-	EMinicardView *view;
-	EBookCallback cb;
-	gpointer closure;
-} ViewCbClosure;
-
-static void
-do_remove (int i, gpointer user_data)
-{
-	EBook *book;
-	EContact *contact;
-	ViewCbClosure *viewcbclosure = user_data;
-	EMinicardView *view = viewcbclosure->view;
-	EBookCallback cb = viewcbclosure->cb;
-	gpointer closure = viewcbclosure->closure;
-
-	g_object_get (view->adapter,
-		      "book", &book,
-		      NULL);
-
-	contact = e_addressbook_reflow_adapter_get_contact (view->adapter, i);
-
-	e_book_async_remove_contact(book, contact, cb, closure);
-
-	g_object_unref (contact);
-}
-
-#if 0
-static int
-compare_to_utf_str (EMinicard *card, const char *utf_str)
-{
-	g_return_val_if_fail(card != NULL, 0);
-	g_return_val_if_fail(E_IS_MINICARD(card), 0);
-
-	if (g_unichar_isdigit (g_utf8_get_char (utf_str))) {
-		return 1;
-	}
-
-	if (card->card) {
-		char *file_as;
-		g_object_get(card->card,
-			     "file_as", &file_as,
-			     NULL);
-		if (file_as)
-			return g_utf8_strcasecmp (file_as, utf_str);
-		else
-			return 0;
-	} else {
-		return 0;
-	}
-}
-#endif
-
-static void
-e_minicard_view_class_init (EMinicardViewClass *klass)
-{
-	GObjectClass *object_class;
-	GnomeCanvasItemClass *item_class;
-	EReflowClass *reflow_class;
-	
-	object_class = G_OBJECT_CLASS (klass);
-	item_class = (GnomeCanvasItemClass *) klass;
-	reflow_class = (EReflowClass *) klass;
-	
-	parent_class = g_type_class_peek_parent (klass);
-	
-	object_class->set_property    = e_minicard_view_set_property;
-	object_class->get_property    = e_minicard_view_get_property;
-	object_class->dispose         = e_minicard_view_dispose;
-
-	g_object_class_install_property (object_class, PROP_ADAPTER, 
-					 g_param_spec_object ("adapter",
-							      _("Adapter"),
-							      /*_( */"XXX blurb" /*)*/,
-							      E_TYPE_ADDRESSBOOK_REFLOW_ADAPTER,
-							      G_PARAM_READWRITE));
-
-	g_object_class_install_property (object_class, PROP_BOOK, 
-					 g_param_spec_object ("book",
-							      _("Book"),
-							      /*_( */"XXX blurb" /*)*/,
-							      E_TYPE_BOOK,
-							      G_PARAM_READWRITE));
-
-	g_object_class_install_property (object_class, PROP_QUERY, 
-					 g_param_spec_string ("query",
-							      _("Query"),
-							      /*_( */"XXX blurb" /*)*/,
-							      NULL,
-							      G_PARAM_READWRITE));
-
-	g_object_class_install_property (object_class, PROP_EDITABLE, 
-					 g_param_spec_boolean ("editable",
-							       _("Editable"),
-							       /*_( */"XXX blurb" /*)*/,
-							       FALSE,
-							       G_PARAM_READWRITE));
-
-	signals [RIGHT_CLICK] =
-		g_signal_new ("right_click",
-			      G_OBJECT_CLASS_TYPE (object_class),
-			      G_SIGNAL_RUN_LAST,
-			      G_STRUCT_OFFSET (EMinicardViewClass, right_click),
-			      NULL, NULL,
-			      eab_marshal_INT__POINTER,
-			      G_TYPE_INT, 1, G_TYPE_POINTER);
-
-	item_class->event             = e_minicard_view_event;
-
-	reflow_class->selection_event = e_minicard_view_selection_event;
-	/* GnomeCanvasItem method overrides */
-
-	/* init the accessibility support for e_minicard_view */
-	e_minicard_view_a11y_init();
-}
-
-static void
-e_minicard_view_init (EMinicardView *view)
-{
-	view->drag_list = NULL;
-	view->adapter = NULL;
-	view->canvas_drag_data_get_id = 0;
-	view->writable_status_id = 0;
-
-	set_empty_message (view);
-}
-
-GType
-e_minicard_view_get_type (void)
-{
-	static GType reflow_type = 0;
-
-	if (!reflow_type) {
-		static const GTypeInfo reflow_info =  {
-			sizeof (EMinicardViewClass),
-			NULL,           /* base_init */
-			NULL,           /* base_finalize */
-			(GClassInitFunc) e_minicard_view_class_init,
-			NULL,           /* class_finalize */
-			NULL,           /* class_data */
-			sizeof (EMinicardView),
-			0,             /* n_preallocs */
-			(GInstanceInitFunc) e_minicard_view_init,
-		};
-
-		reflow_type = g_type_register_static (PARENT_TYPE, "EMinicardView", &reflow_info, 0);
-	}
-
-	return reflow_type;
-}
-
-void
-e_minicard_view_remove_selection(EMinicardView *view,
-				 EBookCallback  cb,
-				 gpointer       closure)
-{
-	ViewCbClosure viewcbclosure;
-	viewcbclosure.view = view;
-	viewcbclosure.cb = cb;
-	viewcbclosure.closure = closure;
-
-	e_selection_model_foreach (E_REFLOW (view)->selection,
-				   do_remove,
-				   &viewcbclosure);
-}
-
-void
-e_minicard_view_jump_to_letter (EMinicardView *view,
-                                gunichar letter)
-{
-#if 0
-	char uft_str[6 + 1];
-
-	utf_str [g_unichar_to_utf8 (letter, utf_str)] = '\0';
-	e_reflow_sorted_jump (E_REFLOW_SORTED (view),
-	                      (GCompareFunc) compare_to_utf_str,
-	                      utf_str);
-#endif
-}
-
-typedef struct {
-	GList *list;
-	EAddressbookReflowAdapter *adapter;
-} ModelAndList;
-
-static void
-add_to_list (int index, gpointer closure)
-{
-	ModelAndList *mal = closure;
-	mal->list = g_list_prepend (mal->list, e_addressbook_reflow_adapter_get_contact (mal->adapter, index));
-}
-
-GList *
-e_minicard_view_get_card_list (EMinicardView *view)
-{
-	ModelAndList mal;
-
-	mal.adapter = view->adapter;
-	mal.list = NULL;
-
-	e_selection_model_foreach (E_REFLOW (view)->selection, add_to_list, &mal);
-
-	mal.list = g_list_reverse (mal.list);
-	return mal.list;
-}
diff --git a/addressbook/gui/widgets/e-minicard-view.h b/addressbook/gui/widgets/e-minicard-view.h
deleted file mode 100644
index 50964568cf..0000000000
--- a/addressbook/gui/widgets/e-minicard-view.h
+++ /dev/null
@@ -1,93 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-/* e-minicard-view.h
- * Copyright (C) 2000  Ximian, Inc.
- * Author: Chris Lahey <clahey@ximian.com>
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of version 2 of the GNU General Public
- * License as published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * General Public License for more details.
- *
- * You should have received a copy of the GNU General Public
- * License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
- */
-#ifndef __E_MINICARD_VIEW_H__
-#define __E_MINICARD_VIEW_H__
-
-#include "e-minicard.h"
-
-#include <gal/widgets/e-reflow.h>
-#include <gal/widgets/e-selection-model-simple.h>
-#include <libebook/e-book.h>
-#include "e-addressbook-reflow-adapter.h"
-
-G_BEGIN_DECLS
-
-/* EMinicardView - A canvas item container.
- *
- * The following arguments are available:
- *
- * name		type		read/write	description
- * --------------------------------------------------------------------------------
- * book         EBook           RW              book to query
- * query        string          RW              query string
- *
- * From EReflowSorted:   (you should really know what you're doing if you set these.)
- * compare_func  GCompareFunc   RW              compare function
- * string_func   EReflowStringFunc RW           string function
- *
- * From EReflow:
- * minimum_width double         RW              minimum width of the reflow.  width >= minimum_width
- * width        double          R               width of the reflow
- * height       double          RW              height of the reflow
- */
-
-#define E_TYPE_MINICARD_VIEW			(e_minicard_view_get_type ())
-#define E_MINICARD_VIEW(obj)			(G_TYPE_CHECK_INSTANCE_CAST ((obj), E_TYPE_MINICARD_VIEW, EMinicardView))
-#define E_MINICARD_VIEW_CLASS(klass)		(G_TYPE_CHECK_CLASS_CAST ((klass), E_TYPE_MINICARD_VIEW, EMinicardViewClass))
-#define E_IS_MINICARD_VIEW(obj) 		(G_TYPE_CHECK_INSTANCE_TYPE ((obj), E_TYPE_MINICARD_VIEW))
-#define E_IS_MINICARD_VIEW_CLASS(klass) 	(G_TYPE_CHECK_CLASS_TYPE ((obj), E_TYPE_MINICARD_VIEW))
-
-
-typedef struct _EMinicardView       EMinicardView;
-typedef struct _EMinicardViewClass  EMinicardViewClass;
-
-struct _EMinicardView
-{
-	EReflow parent;
-
-	EAddressbookReflowAdapter *adapter;
-	
-	/* item specific fields */
-
-	GList *drag_list;
-
-	guint canvas_drag_data_get_id;
-	guint writable_status_id;
-};
-
-struct _EMinicardViewClass
-{
-	EReflowClass parent_class;
-
-	void (*right_click) (EMinicardView *view, GdkEvent *event);
-};
-
-GType    e_minicard_view_get_type          (void);
-void     e_minicard_view_remove_selection  (EMinicardView *view,
-					    EBookCallback  cb,
-					    gpointer       closure);
-void     e_minicard_view_jump_to_letter    (EMinicardView *view,
-					    gunichar       letter);
-GList   *e_minicard_view_get_card_list     (EMinicardView *view);
-
-
-G_END_DECLS
-
-#endif /* __E_MINICARD_VIEW_H__ */
diff --git a/addressbook/gui/widgets/e-minicard.c b/addressbook/gui/widgets/e-minicard.c
deleted file mode 100644
index 2e0579c24d..0000000000
--- a/addressbook/gui/widgets/e-minicard.c
+++ /dev/null
@@ -1,1015 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-/* 
- * e-minicard.c
- * Copyright (C) 2000  Ximian, Inc.
- * Author: Chris Lahey <clahey@ximian.com>
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of version 2 of the GNU General Public
- * License as published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * General Public License for more details.
- *
- * You should have received a copy of the GNU General Public
- * License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
- */
-
-#include <config.h>
-#include <string.h>
-#include <glib.h>
-#include <gtk/gtkdnd.h>
-#include <gtk/gtkmain.h>
-#include <gdk/gdkkeysyms.h>
-#include <libgnome/gnome-i18n.h>
-#include <libgnomecanvas/gnome-canvas-rect-ellipse.h>
-#include <libgnomecanvas/gnome-canvas-pixbuf.h>
-#include <gal/e-text/e-text.h>
-#include <gal/util/e-util.h>
-#include <gal/widgets/e-canvas-utils.h>
-#include <gal/widgets/e-canvas.h>
-#include <libebook/e-book.h>
-#include "eab-marshal.h"
-#include "eab-gui-util.h"
-#include "e-minicard.h"
-#include "e-minicard-label.h"
-#include "e-minicard-view.h"
-#include "e-contact-editor.h"
-#include <e-util/e-icon-factory.h>
-#include <libebook/e-destination.h>
-
-static void e_minicard_init		(EMinicard		 *card);
-static void e_minicard_class_init	(EMinicardClass	 *klass);
-static void e_minicard_set_property  (GObject *object, guint prop_id, const GValue *value, GParamSpec *pspec);
-static void e_minicard_get_property  (GObject *object, guint prop_id, GValue *value, GParamSpec *pspec);
-static void e_minicard_dispose (GObject *object);
-static void e_minicard_finalize (GObject *object);
-static gboolean e_minicard_event (GnomeCanvasItem *item, GdkEvent *event);
-static void e_minicard_realize (GnomeCanvasItem *item);
-static void e_minicard_unrealize (GnomeCanvasItem *item);
-static void e_minicard_reflow ( GnomeCanvasItem *item, int flags );
-static void e_minicard_style_set (EMinicard *minicard, GtkStyle *previous_style);
-
-static void e_minicard_resize_children( EMinicard *e_minicard );
-static void remodel( EMinicard *e_minicard );
-
-static gint e_minicard_drag_begin (EMinicard *minicard, GdkEvent *event);
-
-static GnomeCanvasGroupClass *parent_class = NULL;
-
-#define d(x)
-
-#define LIST_ICON_NAME "stock_contact-list"
-
-static void
-e_minicard_field_destroy(EMinicardField *field)
-{
-	gtk_object_destroy(GTK_OBJECT(field->label));
-	g_free(field);
-}
-
-/* The arguments we take */
-enum {
-	PROP_0,
-	PROP_WIDTH,
-	PROP_HEIGHT,
-	PROP_HAS_FOCUS,
-	PROP_SELECTED,
-	PROP_HAS_CURSOR,
-	PROP_EDITABLE,
-	PROP_CONTACT
-};
-
-enum {
-	SELECTED,
-	DRAG_BEGIN,
-	STYLE_SET,
-	LAST_SIGNAL
-};
-
-static guint e_minicard_signals [LAST_SIGNAL] = {0, };
-
-GType
-e_minicard_get_type (void)
-{
-	static GType type = 0;
-
-	if (!type) {
-		static const GTypeInfo info =  {
-			sizeof (EMinicardClass),
-			NULL,           /* base_init */
-			NULL,           /* base_finalize */
-			(GClassInitFunc) e_minicard_class_init,
-			NULL,           /* class_finalize */
-			NULL,           /* class_data */
-			sizeof (EMinicard),
-			0,             /* n_preallocs */
-			(GInstanceInitFunc) e_minicard_init,
-		};
-
-		type = g_type_register_static (gnome_canvas_group_get_type (), "EMinicard", &info, 0);
-	}
-
-	return type;
-}
-
-static void
-e_minicard_class_init (EMinicardClass *klass)
-{
-	GObjectClass *object_class = (GObjectClass*) klass;
-	GnomeCanvasItemClass *item_class = (GnomeCanvasItemClass *) klass;
-
-	object_class->set_property  = e_minicard_set_property;
-	object_class->get_property  = e_minicard_get_property;
-	object_class->dispose    = e_minicard_dispose;
-	object_class->finalize      = e_minicard_finalize;
-
-	klass->style_set = e_minicard_style_set;
-
-	parent_class = gtk_type_class (gnome_canvas_group_get_type ());
-
-	g_object_class_install_property (object_class, PROP_WIDTH,
-					 g_param_spec_double ("width",
-							      _("Width"),
-							      /*_( */"XXX blurb" /*)*/,
-							      0.0, G_MAXDOUBLE, 10.0,
-							      G_PARAM_READWRITE));
-
-	g_object_class_install_property (object_class, PROP_HEIGHT,
-					 g_param_spec_double ("height",
-							      _("Height"),
-							      /*_( */"XXX blurb" /*)*/,
-							      0.0, G_MAXDOUBLE, 10.0,
-							      G_PARAM_READABLE));
-
-	g_object_class_install_property (object_class, PROP_HAS_FOCUS,
-					 /* XXX should be _enum */
-					 g_param_spec_int ("has_focus",
-							   _("Has Focus"),
-							   /*_( */"XXX blurb" /*)*/,
-							   E_MINICARD_FOCUS_TYPE_START, E_MINICARD_FOCUS_TYPE_END,
-							   E_MINICARD_FOCUS_TYPE_START,
-							   G_PARAM_READWRITE));
-
-	g_object_class_install_property (object_class, PROP_SELECTED,
-					 g_param_spec_boolean ("selected",
-							       _("Selected"),
-							       /*_( */"XXX blurb" /*)*/,
-							       FALSE,
-							       G_PARAM_READWRITE));
-
-	g_object_class_install_property (object_class, PROP_HAS_CURSOR,
-					 g_param_spec_boolean ("has_cursor",
-							       _("Has Cursor"),
-							       /*_( */"XXX blurb" /*)*/,
-							       FALSE,
-							       G_PARAM_READWRITE));
-
-	g_object_class_install_property (object_class, PROP_EDITABLE,
-					 g_param_spec_boolean ("editable",
-							       _("Editable"),
-							       /*_( */"XXX blurb" /*)*/,
-							       FALSE,
-							       G_PARAM_READWRITE));
-  
-	g_object_class_install_property (object_class, PROP_CONTACT,
-					 g_param_spec_object ("contact",
-							      _("Contact"),
-							      /*_( */"XXX blurb" /*)*/,
-							      E_TYPE_CONTACT,
-							      G_PARAM_READWRITE));
-  
-	e_minicard_signals [SELECTED] =
-		g_signal_new ("selected",
-			      G_OBJECT_CLASS_TYPE (object_class),
-			      G_SIGNAL_RUN_LAST,
-			      G_STRUCT_OFFSET (EMinicardClass, selected),
-			      NULL, NULL,
-			      eab_marshal_INT__POINTER,
-			      G_TYPE_INT, 1, G_TYPE_POINTER);
-
-	e_minicard_signals [DRAG_BEGIN] =
-		g_signal_new ("drag_begin",
-			      G_OBJECT_CLASS_TYPE (object_class),
-			      G_SIGNAL_RUN_LAST,
-			      G_STRUCT_OFFSET (EMinicardClass, drag_begin),
-			      NULL, NULL,
-			      eab_marshal_INT__POINTER,
-			      G_TYPE_INT, 1, G_TYPE_POINTER);
-
-	e_minicard_signals [STYLE_SET] =
-		g_signal_new ("style_set",
-			      G_TYPE_FROM_CLASS (object_class),
-			      G_SIGNAL_RUN_FIRST,
-			      G_STRUCT_OFFSET (EMinicardClass, style_set),
-			      NULL, NULL,
-			      eab_marshal_VOID__OBJECT,
-			      G_TYPE_NONE, 1,
-			      GTK_TYPE_STYLE);
-
-	/* GnomeCanvasItem method overrides */
-	item_class->realize    = e_minicard_realize;
-	item_class->unrealize  = e_minicard_unrealize;
-	item_class->event      = e_minicard_event;
-
-	klass->selected        = NULL;
-
-	/* init the accessibility support for e_minicard */
-	e_minicard_a11y_init();
-}
-
-static void
-e_minicard_init (EMinicard *minicard)
-{
-	minicard->rect             = NULL;
-	minicard->fields           = NULL;
-	minicard->width            = 10;
-	minicard->height           = 10;
-	minicard->has_focus        = FALSE;
-	minicard->selected         = FALSE;
-	minicard->editable         = FALSE;
-	minicard->has_cursor       = FALSE;
-
-	minicard->contact          = NULL;
-
-	minicard->list_icon_pixbuf = e_icon_factory_get_icon (LIST_ICON_NAME, E_ICON_SIZE_MENU);
-	minicard->list_icon_size   = gdk_pixbuf_get_height (minicard->list_icon_pixbuf);
-
-	minicard->editor           = NULL;
-
-	minicard->changed          = FALSE;
-
-	e_canvas_item_set_reflow_callback(GNOME_CANVAS_ITEM(minicard), e_minicard_reflow);
-}
-
-static void
-set_selected (EMinicard *minicard, gboolean selected)
-{
-	GtkWidget *canvas = GTK_WIDGET(GNOME_CANVAS_ITEM(minicard)->canvas);
-	if (selected) {
-		gnome_canvas_item_set (minicard->rect, 
-				       "outline_color_gdk", &canvas->style->bg[GTK_STATE_ACTIVE],
-				       NULL);
-		gnome_canvas_item_set (minicard->header_rect, 
-				       "fill_color_gdk", &canvas->style->bg[GTK_STATE_SELECTED],
-				       NULL);
-		gnome_canvas_item_set (minicard->header_text, 
-				       "fill_color_gdk", &canvas->style->text[GTK_STATE_SELECTED],
-				       NULL);
-	} else {
-		gnome_canvas_item_set (minicard->rect, 
-				       "outline_color", NULL, 
-				       NULL);
-		gnome_canvas_item_set (minicard->header_rect, 
-				       "fill_color_gdk", &canvas->style->bg[GTK_STATE_NORMAL],
-				       NULL);
-		gnome_canvas_item_set (minicard->header_text, 
-				       "fill_color_gdk", &canvas->style->text[GTK_STATE_NORMAL],
-				       NULL);
-	}
-	minicard->selected = selected;
-}
-
-static void
-set_has_cursor (EMinicard *minicard, gboolean has_cursor)
-{
-	if (!minicard->has_focus && has_cursor)
-		e_canvas_item_grab_focus(GNOME_CANVAS_ITEM (minicard), FALSE);
-	minicard->has_cursor = has_cursor;
-}
-
-
-static void
-e_minicard_set_property  (GObject *object, guint prop_id, const GValue *value, GParamSpec *pspec)
-{
-	GnomeCanvasItem *item;
-	EMinicard *e_minicard;
-	EContact *contact;
-	GList *l;
-
-	item = GNOME_CANVAS_ITEM (object);
-	e_minicard = E_MINICARD (object);
-	
-	switch (prop_id){
-	case PROP_WIDTH:
-		if (e_minicard->width != g_value_get_double (value)) {
-			e_minicard->width = g_value_get_double (value);
-			e_minicard_resize_children(e_minicard);
-			if ( GTK_OBJECT_FLAGS( e_minicard ) & GNOME_CANVAS_ITEM_REALIZED )
-				e_canvas_item_request_reflow(item);
-		}
-	  break;
-	case PROP_HAS_FOCUS:
-		if (e_minicard->fields) {
-			if ( g_value_get_int(value) == E_FOCUS_START ||
-			     g_value_get_int(value) == E_FOCUS_CURRENT) {
-				gnome_canvas_item_set(E_MINICARD_FIELD(e_minicard->fields->data)->label,
-						      "has_focus", g_value_get_int (value),
-						      NULL);
-			} else if ( g_value_get_int (value) == E_FOCUS_END ) {
-				gnome_canvas_item_set(E_MINICARD_FIELD(g_list_last(e_minicard->fields)->data)->label,
-						      "has_focus", g_value_get_int (value),
-						      NULL);
-			}
-		}
-		else {
-			if (!e_minicard->has_focus)
-				e_canvas_item_grab_focus(item, FALSE);
-		}
-		break;
-	case PROP_SELECTED:
-		if (e_minicard->selected != g_value_get_boolean (value))
-			set_selected (e_minicard, g_value_get_boolean (value));
-		break;
-	case PROP_EDITABLE:
-		e_minicard->editable = g_value_get_boolean (value);
-		for (l = e_minicard->fields; l; l = l->next) {
-			g_object_set (E_MINICARD_FIELD (l->data)->label,
-				      "editable", FALSE /* e_minicard->editable */,
-				      NULL);
-		}
-		break;
-	case PROP_HAS_CURSOR:
-		d(g_print("%s: PROP_HAS_CURSOR\n", G_GNUC_FUNCTION));
-		if (e_minicard->has_cursor != g_value_get_boolean (value))
-			set_has_cursor (e_minicard, g_value_get_boolean (value));
-		break;
-	case PROP_CONTACT:
-		contact = E_CONTACT (g_value_get_object (value));
-		if (contact)
-			g_object_ref (contact);
-
-		if (e_minicard->contact)
-			g_object_unref (e_minicard->contact);
-
-		e_minicard->contact = contact;
-
-		remodel(e_minicard);
-		e_canvas_item_request_reflow(item);
-		e_minicard->changed = FALSE;
-		break;
-	default:
-		G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
-		break;
-	}
-}
-
-static void
-e_minicard_get_property  (GObject *object, guint prop_id, GValue *value, GParamSpec *pspec)
-{
-	EMinicard *e_minicard;
-
-	e_minicard = E_MINICARD (object);
-
-	switch (prop_id) {
-	case PROP_WIDTH:
-		g_value_set_double (value, e_minicard->width);
-		break;
-	case PROP_HEIGHT:
-		g_value_set_double (value, e_minicard->height);
-		break;
-	case PROP_HAS_FOCUS:
-		g_value_set_int (value, e_minicard->has_focus ? E_FOCUS_CURRENT : E_FOCUS_NONE);
-		break;
-	case PROP_SELECTED:
-		g_value_set_boolean (value, e_minicard->selected);
-		break;
-	case PROP_HAS_CURSOR:
-		g_value_set_boolean (value, e_minicard->has_cursor);
-		break;
-	case PROP_EDITABLE:
-		g_value_set_boolean (value, e_minicard->editable);
-		break;
-	case PROP_CONTACT:
-		g_value_set_object (value, e_minicard->contact);
-		break;
-	default:
-		G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
-		break;
-	}
-}
-
-static void
-e_minicard_dispose (GObject *object)
-{
-	EMinicard *e_minicard;
-
-	g_return_if_fail (object != NULL);
-	g_return_if_fail (E_IS_MINICARD (object));
-
-	e_minicard = E_MINICARD (object);
-	
-	if (e_minicard->fields) {
-		g_list_foreach(e_minicard->fields, (GFunc) e_minicard_field_destroy, NULL);
-		g_list_free(e_minicard->fields);
-		e_minicard->fields = NULL;
-	}
-
-	if (e_minicard->list_icon_pixbuf) {
-		gdk_pixbuf_unref (e_minicard->list_icon_pixbuf);
-		e_minicard->list_icon_pixbuf = NULL;
-	}
-
-	if (G_OBJECT_CLASS (parent_class)->dispose)
-		(* G_OBJECT_CLASS (parent_class)->dispose) (object);
-}
-
-
-
-static void
-e_minicard_finalize (GObject *object)
-{
-	EMinicard *e_minicard;
-
-	g_return_if_fail (object != NULL);
-	g_return_if_fail (E_IS_MINICARD (object));
-
-	e_minicard = E_MINICARD (object);
-	
-	if (e_minicard->contact) {
-		g_object_unref (e_minicard->contact);
-		e_minicard->contact = NULL;
-	}
-	
-	if (e_minicard->list_icon_pixbuf) {
-		g_object_unref (e_minicard->list_icon_pixbuf);
-		e_minicard->list_icon_pixbuf = NULL;
-	}
-
-	if (G_OBJECT_CLASS (parent_class)->finalize)
-		(* G_OBJECT_CLASS (parent_class)->finalize) (object);
-}
-
-static void
-e_minicard_style_set (EMinicard *minicard, GtkStyle *previous_style)
-{
-	if ( (GTK_OBJECT_FLAGS( minicard ) & GNOME_CANVAS_ITEM_REALIZED) )
-		set_selected (minicard, minicard->selected);
-}
-
-static void
-e_minicard_realize (GnomeCanvasItem *item)
-{
-	EMinicard *e_minicard;
-	GnomeCanvasGroup *group;
-	GtkWidget *canvas;
-
-	e_minicard = E_MINICARD (item);
-	group = GNOME_CANVAS_GROUP( item );
-	canvas = GTK_WIDGET (GNOME_CANVAS_ITEM (item)->canvas);
-
-	if (GNOME_CANVAS_ITEM_CLASS(parent_class)->realize)
-		(* GNOME_CANVAS_ITEM_CLASS(parent_class)->realize) (item);
-	
-	e_minicard->rect =
-	  gnome_canvas_item_new( group,
-				 gnome_canvas_rect_get_type(),
-				 "x1", (double) 0,
-				 "y1", (double) 0,
-				 "x2", (double) MAX (e_minicard->width - 1, 0),
-				 "y2", (double) MAX (e_minicard->height - 1, 0),
-				 "outline_color", NULL,
-				 NULL );
-
-	e_minicard->header_rect =
-	  gnome_canvas_item_new( group,
-				 gnome_canvas_rect_get_type(),
-				 "x1", (double) 2,
-				 "y1", (double) 2,
-				 "x2", (double) MAX (e_minicard->width - 3, 0),
-				 "y2", (double) MAX (e_minicard->height - 3, 0),
-				 "fill_color_gdk", &canvas->style->bg[GTK_STATE_NORMAL],
-				 NULL );
-
-	e_minicard->header_text =
-	  gnome_canvas_item_new( group,
-				 e_text_get_type(),
-				 "anchor", GTK_ANCHOR_NW,
-				 "width", (double) MAX( e_minicard->width - 12, 0 ),
-				 "clip", TRUE,
-				 "use_ellipsis", TRUE,
-				 "fill_color_gdk", &canvas->style->fg[GTK_STATE_NORMAL],
-				 "text", "",
-				 "draw_background", FALSE,
-				 NULL );
-
-	e_canvas_item_move_absolute(e_minicard->header_text, 6, 6);
-
-	e_minicard->list_icon = 
-		gnome_canvas_item_new ( group,
-					gnome_canvas_pixbuf_get_type(),
-					"pixbuf", e_minicard->list_icon_pixbuf,
-					NULL);
-
-	set_selected (e_minicard, e_minicard->selected);
-
-	remodel(e_minicard);
-	e_canvas_item_request_reflow(item);
-}
-
-static void
-e_minicard_unrealize (GnomeCanvasItem *item)
-{
-	EMinicard *e_minicard;
-
-	e_minicard = E_MINICARD (item);
-
-	if (GNOME_CANVAS_ITEM_CLASS(parent_class)->unrealize)
-		(* GNOME_CANVAS_ITEM_CLASS(parent_class)->unrealize) (item);
-}
-
-/* Callback used when the contact editor is closed */
-static void
-editor_closed_cb (GtkObject *editor, gpointer data)
-{
-	EMinicard *minicard = data;
-	g_object_unref (editor);
-	minicard->editor = NULL;
-}
-
-gboolean
-e_minicard_activate_editor(EMinicard *minicard)
-{
-	GnomeCanvasItem *item = NULL;
-	item = minicard;
-      
-	if (minicard->editor) {
-		eab_editor_raise (minicard->editor);
-	}
-	else {
-		EBook *book = NULL;
-		if (E_IS_MINICARD_VIEW(item->parent)) {
-			g_object_get(item->parent, "book", &book, NULL);
-		}
-
-		if (book != NULL) {
-			if (e_contact_get (minicard->contact, E_CONTACT_IS_LIST)) {
-				EContactListEditor *editor = eab_show_contact_list_editor (book, minicard->contact,
-											   FALSE, e_book_is_writable (book));
-				minicard->editor = EAB_EDITOR (editor);
-			}
-			else {
-				EContactEditor *editor = eab_show_contact_editor (book, minicard->contact,
-										  FALSE, e_book_is_writable (book));
-				minicard->editor = EAB_EDITOR (editor);
-			}
-
-			g_object_ref (minicard->editor);
-			g_signal_connect (minicard->editor, "editor_closed",
-							G_CALLBACK (editor_closed_cb), minicard);
-
-			g_object_unref (book);
-		}
-	}
-
-	return TRUE;
-}
-
-static gboolean
-e_minicard_event (GnomeCanvasItem *item, GdkEvent *event)
-{
-	EMinicard *e_minicard;
-	GtkWidget *canvas;
-	
-	e_minicard = E_MINICARD (item);
-	canvas = GTK_WIDGET (GNOME_CANVAS_ITEM (item)->canvas);
-
-	switch( event->type ) {
-	case GDK_FOCUS_CHANGE:
-		{
-			GdkEventFocus *focus_event = (GdkEventFocus *) event;
-			d(g_print("%s: GDK_FOCUS_CHANGE: %s\n", G_GNUC_FUNCTION, focus_event->in?"in":"out"));
-			if (focus_event->in) {
-				/* Chris: When EMinicard gets the cursor, if it doesn't have the focus, it should take it.  */
-				e_minicard->has_focus = TRUE;
-				if (!e_minicard->selected) {
-					e_minicard_selected(e_minicard, event);
-				}
-			}
-			else {
-				e_minicard->has_focus = FALSE;
-			}
-		}
-		break;
-	case GDK_BUTTON_PRESS: {
-		if (1 <= event->button.button && event->button.button <= 2) {
-			int ret_val = e_minicard_selected(e_minicard, event);
-			GdkEventMask mask = ((1 << (4 + event->button.button)) |
-					     GDK_POINTER_MOTION_MASK |
-					     GDK_BUTTON_PRESS_MASK |
-					     GDK_BUTTON_RELEASE_MASK);
-			
-			e_canvas_item_grab_focus(item, TRUE);
-
-			if (gnome_canvas_item_grab (GNOME_CANVAS_ITEM (e_minicard),
-						    mask, NULL, event->button.time)) {
-				return FALSE;
-			}
-			gtk_grab_add (GTK_WIDGET (GNOME_CANVAS_ITEM (e_minicard)->canvas));
-			e_minicard->button_x = event->button.x;
-			e_minicard->button_y = event->button.y;
-			e_minicard->drag_button = event->button.button;
-			e_minicard->drag_button_down = TRUE;
-			return ret_val;
-		} else if (event->button.button == 3) {
-			int ret_val = e_minicard_selected(e_minicard, event);
-			if (ret_val != 0)
-				return ret_val;
-		}
-		break;
-	}
-	case GDK_BUTTON_RELEASE:
-		e_minicard_selected(e_minicard, event);
-		if (e_minicard->drag_button == event->button.button) {
-			e_minicard->drag_button = 0;
-			e_minicard->drag_button_down = FALSE;
-			e_minicard->button_x = -1;
-			e_minicard->button_y = -1;
-
-			if (GTK_WIDGET_HAS_GRAB (GNOME_CANVAS_ITEM (e_minicard)->canvas)) {
-				gtk_grab_remove (GTK_WIDGET (GNOME_CANVAS_ITEM (e_minicard)->canvas));
-				gnome_canvas_item_ungrab (GNOME_CANVAS_ITEM (e_minicard), event->button.time);
-			}
-		}
-		break;
-	case GDK_MOTION_NOTIFY:
-		if (e_minicard->drag_button_down && event->motion.state & GDK_BUTTON1_MASK) {
-			if (MAX (abs (e_minicard->button_x - event->motion.x),
-				 abs (e_minicard->button_y - event->motion.y)) > 3) {
-				gint ret_val;
-
-				ret_val = e_minicard_drag_begin(e_minicard, event);
-
-				e_minicard->drag_button_down = FALSE;
-
-				return ret_val;
-			}
-		}
-		break;
-	case GDK_2BUTTON_PRESS:
-		if (event->button.button == 1 && E_IS_MINICARD_VIEW (item->parent)) {
-			return e_minicard_activate_editor (e_minicard);
-		}
-		break;
-	case GDK_KEY_PRESS:
-		if (event->key.keyval == GDK_Tab ||
-			event->key.keyval == GDK_KP_Tab ||
-			event->key.keyval == GDK_ISO_Left_Tab) {
-
-			EMinicardView *view = E_MINICARD_VIEW (item->parent);
-			EReflow *reflow = E_REFLOW(view);
-
-			if (reflow == NULL) {
-				return FALSE;
-			}
-
-			if (event->key.state & GDK_SHIFT_MASK) {
-				if (event->key.state & GDK_CONTROL_MASK) {
-					return FALSE;
-				}
-				else {
-					int row_count = e_selection_model_row_count (reflow->selection);
-					int model_index = e_selection_model_cursor_row (reflow->selection);
-					int view_index = e_sorter_model_to_sorted (reflow->selection->sorter, model_index);
-
-					if (view_index == 0)
-						view_index = row_count-1;
-					else
-						view_index--;
-
-					model_index = e_sorter_sorted_to_model (E_SORTER (reflow->sorter), view_index);
-					e_canvas_item_grab_focus (reflow->items[model_index], FALSE);
-					return TRUE;
-				}
-			}
-			else {
-				if (event->key.state & GDK_CONTROL_MASK) {
-					return FALSE;
-				}
-				else {
-					int row_count = e_selection_model_row_count(reflow->selection);
-					int model_index = e_selection_model_cursor_row (reflow->selection);
-					int view_index = e_sorter_model_to_sorted (reflow->selection->sorter, model_index);
-
-					if (view_index == row_count-1)
-						view_index = 0;
-					else
-						view_index++;
-
-					model_index = e_sorter_sorted_to_model (E_SORTER (reflow->sorter), view_index);
-					e_canvas_item_grab_focus(reflow->items[model_index], FALSE);
-					return TRUE;
-				}
-			}
-		}
-		else if (event->key.keyval == GDK_Return ||
-				event->key.keyval == GDK_KP_Enter) {
-				return e_minicard_activate_editor (e_minicard);
-		}
-		break;
-	default:
-		break;
-	}
-	
-	if (GNOME_CANVAS_ITEM_CLASS( parent_class )->event)
-		return (* GNOME_CANVAS_ITEM_CLASS( parent_class )->event) (item, event);
-	else
-		return 0;
-}
-
-static void
-e_minicard_resize_children( EMinicard *e_minicard )
-{
-	GList *list;
-	gboolean is_list = GPOINTER_TO_INT (e_contact_get (e_minicard->contact, E_CONTACT_IS_LIST));
-
-	if (e_minicard->header_text) {
-		gnome_canvas_item_set( e_minicard->header_text,
-				       "width", ((double) e_minicard->width - 12 
-						 - (is_list ? e_minicard->list_icon_size : 0.0)),
-				       NULL );
-	}
-	if (e_minicard->list_icon) {
-		e_canvas_item_move_absolute(e_minicard->list_icon,
-					    e_minicard->width - e_minicard->list_icon_size - 3,
-					    3);
-	}
-	for ( list = e_minicard->fields; list; list = g_list_next( list ) ) {
-		gnome_canvas_item_set( E_MINICARD_FIELD( list->data )->label,
-				       "width", (double) e_minicard->width - 4.0,
-				       NULL );
-	}
-}
-
-static void
-add_field (EMinicard *e_minicard, EContactField field, gdouble left_width)
-{
-	GnomeCanvasItem *new_item;
-	GnomeCanvasGroup *group;
-	EMinicardField *minicard_field;
-	char *name;
-	char *string;
-	
-	group = GNOME_CANVAS_GROUP( e_minicard );
-	
-	name = g_strdup_printf("%s:", e_contact_pretty_name (field));
-	string = e_contact_get (e_minicard->contact, field);
-
-	new_item = e_minicard_label_new(group);
-	gnome_canvas_item_set( new_item,
-			       "width", e_minicard->width - 4.0,
-			       "fieldname", name,
-			       "field", string,
-			       "max_field_name_length", left_width,
-			       "editable", FALSE /* e_minicard->editable */,
-			       NULL );
-#if notyet
-	g_object_set(E_MINICARD_LABEL(new_item)->field,
-		     "allow_newlines", e_card_simple_get_allow_newlines (e_minicard->contact, field),
-		     NULL);
-#endif
-	g_object_set_data(G_OBJECT (E_MINICARD_LABEL(new_item)->field),
-			  "EMinicard:field",
-			  GINT_TO_POINTER(field));
-
-	minicard_field = g_new(EMinicardField, 1);
-	minicard_field->field = field;
-	minicard_field->label = new_item;
-
-	e_minicard->fields = g_list_append( e_minicard->fields, minicard_field);
-	e_canvas_item_move_absolute(new_item, 2, e_minicard->height);
-	g_free(name);
-	g_free(string);
-}
-
-static int
-get_left_width(EMinicard *e_minicard)
-{
-	gchar *name;
-	EContactField field;
-	int width = -1;
-	PangoLayout *layout;
-
-	layout = gtk_widget_create_pango_layout (GTK_WIDGET (GNOME_CANVAS_ITEM (e_minicard)->canvas), "");
-	for(field = E_CONTACT_FULL_NAME; field != E_CONTACT_LAST_SIMPLE_STRING; field++) {
-		int this_width;
-
-		if (field == E_CONTACT_FAMILY_NAME || field == E_CONTACT_GIVEN_NAME)
-			continue;
-
-		name = g_strdup_printf("%s:", e_contact_pretty_name (field));
-		pango_layout_set_text (layout, name, -1);
-		pango_layout_get_pixel_size (layout, &this_width, NULL);
-		if (width < this_width)
-			width = this_width;
-		g_free(name);
-	}
-	g_object_unref (layout);
-	return width;
-}
-
-static void
-remodel( EMinicard *e_minicard )
-{
-	int count = 0;
-	if ( !(GTK_OBJECT_FLAGS( e_minicard ) & GNOME_CANVAS_ITEM_REALIZED) )
-		return;
-	if (e_minicard->contact) {
-		EContactField field;
-		GList *list;
-		char *file_as;
-		int left_width = -1;
-
-		if (e_minicard->header_text) {
-			file_as = e_contact_get (e_minicard->contact, E_CONTACT_FILE_AS);
-			gnome_canvas_item_set (e_minicard->header_text,
-					       "text", file_as ? file_as : "",
-					       NULL );
-			g_free(file_as);
-		}
-
-		if (e_minicard->contact && e_contact_get (e_minicard->contact, E_CONTACT_IS_LIST))
-			gnome_canvas_item_show (e_minicard->list_icon);
-		else
-			gnome_canvas_item_hide (e_minicard->list_icon);
-
-		list = e_minicard->fields;
-		e_minicard->fields = NULL;
-
-		for(field = E_CONTACT_FULL_NAME; field != (E_CONTACT_LAST_SIMPLE_STRING -1) && count < 5; field++) {
-			EMinicardField *minicard_field = NULL;
-
-			if (field == E_CONTACT_FAMILY_NAME || field == E_CONTACT_GIVEN_NAME)
-				continue;
-
-			if (list)
-				minicard_field = list->data;
-			if (minicard_field && minicard_field->field == field) {
-				GList *this_list = list;
-				char *string;
-
-				string = e_contact_get(e_minicard->contact, field);
-				if (string && *string) {
-					e_minicard->fields = g_list_append(e_minicard->fields, minicard_field);
-					g_object_set(minicard_field->label,
-						     "field", string,
-						     NULL);
-					count ++;
-				} else {
-					e_minicard_field_destroy(minicard_field);
-				}
-				list = g_list_remove_link(list, this_list);
-				g_list_free_1(this_list);
-				g_free(string);
-			} else {
-				char *string;
-				if (left_width == -1) {
-					left_width = get_left_width(e_minicard);
-				}
-
-				string = e_contact_get(e_minicard->contact, field);
-				if (string && *string) {
-					add_field(e_minicard, field, left_width);
-					count++;
-				}
-				g_free(string);
-			}
-		}
-
-		g_list_foreach(list, (GFunc) e_minicard_field_destroy, NULL);
-		g_list_free(list);
-	}
-}
-
-static void
-e_minicard_reflow( GnomeCanvasItem *item, int flags )
-{
-	EMinicard *e_minicard = E_MINICARD(item);
-	if ( GTK_OBJECT_FLAGS( e_minicard ) & GNOME_CANVAS_ITEM_REALIZED ) {
-		GList *list;
-		gdouble text_height;
-		gint old_height;
-		
-		old_height = e_minicard->height;
-
-		g_object_get( e_minicard->header_text,
-			      "text_height", &text_height,
-			      NULL );
-		
-		e_minicard->height = text_height + 10.0;
-		
-		gnome_canvas_item_set( e_minicard->header_rect,
-				       "y2", text_height + 9.0,
-				       NULL );
-		
-		for(list = e_minicard->fields; list; list = g_list_next(list)) {
-			EMinicardField *field = E_MINICARD_FIELD(list->data);
-			GnomeCanvasItem *item = field->label;
-			g_object_get (item,
-				      "height", &text_height,
-				      NULL);
-			e_canvas_item_move_absolute(item, 2, e_minicard->height);
-			e_minicard->height += text_height;
-		}
-		e_minicard->height += 2;
-		
-		gnome_canvas_item_set( e_minicard->rect,
-				       "x2", (double) e_minicard->width - 1.0,
-				       "y2", (double) e_minicard->height - 1.0,
-				       NULL );
-		gnome_canvas_item_set( e_minicard->header_rect,
-				       "x2", (double) e_minicard->width - 3.0,
-				       NULL );
-
-		if (old_height != e_minicard->height)
-			e_canvas_item_request_parent_reflow(item);
-	}
-}
-
-const char *
-e_minicard_get_card_id (EMinicard *minicard)
-{
-	g_return_val_if_fail(minicard != NULL, NULL);
-	g_return_val_if_fail(E_IS_MINICARD(minicard), NULL);
-
-	if (minicard->contact) {
-		return e_contact_get_const (minicard->contact, E_CONTACT_UID);
-	} else {
-		return "";
-	}
-}
-
-int
-e_minicard_compare (EMinicard *minicard1, EMinicard *minicard2)
-{
-	int cmp = 0;
-	
-	g_return_val_if_fail(minicard1 != NULL, 0);
-	g_return_val_if_fail(E_IS_MINICARD(minicard1), 0);
-	g_return_val_if_fail(minicard2 != NULL, 0);
-	g_return_val_if_fail(E_IS_MINICARD(minicard2), 0);
-
-	if (minicard1->contact && minicard2->contact) {
-		char *file_as1, *file_as2;
-		g_object_get(minicard1->contact,
-			     "file_as", &file_as1,
-			     NULL);
-		g_object_get(minicard2->contact,
-			     "file_as", &file_as2,
-			     NULL);
-
-		if (file_as1 && file_as2) 
-			cmp = g_utf8_collate(file_as1, file_as2);
-		else if (file_as1)
-			cmp = -1;
-		else if (file_as2)
-			cmp = 1;
-		else 
-			cmp = strcmp(e_minicard_get_card_id(minicard1), e_minicard_get_card_id(minicard2));
-
-		g_free (file_as1);
-		g_free (file_as2);
-	}
-
-	return cmp;
-}
-
-int
-e_minicard_selected (EMinicard *minicard, GdkEvent *event)
-{
-	gint ret_val = 0;
-	GnomeCanvasItem *item = GNOME_CANVAS_ITEM (minicard);
-	if (item->parent) {
-		guint signal_id = g_signal_lookup ("selection_event", G_OBJECT_TYPE (item->parent));
-		/* We should probably check the signature here, but I
-		 * don't think it's worth the time required to code
-		 * it.
-		 */
-		if (signal_id != 0) {
-			g_signal_emit(item->parent,
-				      signal_id, 0,
-				      item, event, &ret_val);
-		}
-	}
-	return ret_val;
-}
-
-static gint
-e_minicard_drag_begin (EMinicard *minicard, GdkEvent *event)
-{
-	gint ret_val = 0;
-	GnomeCanvasItem *parent;
-	g_signal_emit (minicard,
-		       e_minicard_signals[DRAG_BEGIN], 0,
-		       event, &ret_val);
-
-	parent = GNOME_CANVAS_ITEM (minicard)->parent;
-	if (parent && E_IS_REFLOW (parent)) {
-		E_REFLOW (parent)->maybe_in_drag = FALSE;
-	}
-	return ret_val;
-}
diff --git a/addressbook/gui/widgets/e-minicard.h b/addressbook/gui/widgets/e-minicard.h
deleted file mode 100644
index 3ce1754edd..0000000000
--- a/addressbook/gui/widgets/e-minicard.h
+++ /dev/null
@@ -1,132 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-/* e-minicard.h
- * Copyright (C) 2000  Ximian, Inc.
- * Author: Chris Lahey <clahey@ximian.com>
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of version 2 of the GNU General Public
- * License as published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * General Public License for more details.
- *
- * You should have received a copy of the GNU General Public
- * License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
- */
-#ifndef __E_MINICARD_H__
-#define __E_MINICARD_H__
-
-#include <gdk-pixbuf/gdk-pixbuf.h>
-#include "addressbook/gui/contact-editor/eab-editor.h"
-#include <libgnomecanvas/gnome-canvas.h>
-#include <libebook/e-contact.h>
-
-#ifdef __cplusplus
-extern "C" {
-#pragma }
-#endif /* __cplusplus */
-
-/* EMinicard - A small card displaying information about a contact.
- *
- * The following arguments are available:
- *
- * name		type		read/write	description
- * --------------------------------------------------------------------------------
- * width        double          RW              width of the card
- * height       double          R               height of the card
- * card		ECard*		RW		Pointer to the ECard
- */
-
-#define E_TYPE_MINICARD			(e_minicard_get_type ())
-#define E_MINICARD(obj)			(G_TYPE_CHECK_INSTANCE_CAST ((obj), E_TYPE_MINICARD, EMinicard))
-#define E_MINICARD_CLASS(klass)		(G_TYPE_CHECK_CLASS_CAST ((klass), E_TYPE_MINICARD, EMinicardClass))
-#define E_IS_MINICARD(obj)		(G_TYPE_CHECK_INSTANCE_TYPE ((obj), E_TYPE_MINICARD))
-#define E_IS_MINICARD_CLASS(klass)	(G_TYPE_CHECK_CLASS_TYPE ((obj), E_TYPE_MINICARD))
-
-
-typedef struct _EMinicard       EMinicard;
-typedef struct _EMinicardClass  EMinicardClass;
-typedef enum _EMinicardFocusType EMinicardFocusType;
-
-enum _EMinicardFocusType {
-	E_MINICARD_FOCUS_TYPE_START,
-	E_MINICARD_FOCUS_TYPE_END
-};
-
-struct _EMinicard
-{
-	GnomeCanvasGroup parent;
-	
-	/* item specific fields */
-	EContact *contact;
-	
-	GnomeCanvasItem *rect;
-	GnomeCanvasItem *header_rect;
-	GnomeCanvasItem *header_text;
-	GnomeCanvasItem *list_icon;
-
-	GdkPixbuf *list_icon_pixbuf;
-	double list_icon_size;
-
-	EABEditor *editor;
-
-	GList *fields; /* Of type EMinicardField */
-	guint needs_remodeling : 1;
-
-	guint changed : 1;
-
-	guint selected : 1;
-	guint has_cursor : 1;
-
-	guint has_focus : 1;
-
-	guint editable : 1;
-
-	guint drag_button_down : 1;
-	gint drag_button;
-
-	gint button_x;
-	gint button_y;
-
-	double width;
-	double height;
-};
-
-struct _EMinicardClass
-{
-	GnomeCanvasGroupClass parent_class;
-
-	gint (* selected) (EMinicard *minicard, GdkEvent *event);
-	gint (* drag_begin) (EMinicard *minicard, GdkEvent *event);
-
-	void (* style_set) (EMinicard *minicard, GtkStyle *previous_style);
-};
-
-typedef struct _EMinicardField EMinicardField;
-                                                                               
-struct _EMinicardField {
-	EContactField field;
-	GnomeCanvasItem *label;
-};
-
-#define E_MINICARD_FIELD(field) ((EMinicardField *)(field))
-
-GType       e_minicard_get_type     (void);
-const char *e_minicard_get_card_id  (EMinicard *minicard);
-int         e_minicard_compare      (EMinicard *minicard1,
-				     EMinicard *minicard2);
-
-int         e_minicard_selected     (EMinicard *minicard,
-				     GdkEvent  *event);
-gboolean    e_minicard_activate_editor	(EMinicard *minicard);
-
-#ifdef __cplusplus
-}
-#endif /* __cplusplus */
-
-
-#endif /* __E_MINICARD_H__ */
diff --git a/addressbook/gui/widgets/eab-config.c b/addressbook/gui/widgets/eab-config.c
deleted file mode 100644
index 0670b5d5e0..0000000000
--- a/addressbook/gui/widgets/eab-config.c
+++ /dev/null
@@ -1,189 +0,0 @@
-/*
- * Authors: David Trowbridge <trowbrds@cs.colorado.edu>
- *
- * Copyright (C) 2004 Novell, Inc (www.novell.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 "eab-config.h"
-
-static GObjectClass *ecp_parent_class;
-static GObjectClass *ecph_parent_class;
-
-struct _EABConfigPrivate {
-	guint source_changed_id;
-};
-
-#define _PRIVATE(o) (g_type_instance_get_private((GTypeInstance *)o, eab_config_get_type()))
-
-static void
-ecp_init (GObject *o)
-{
-}
-
-static void
-ecp_target_free (EConfig *ec, EConfigTarget *t)
-{
-	struct _EABConfigPrivate *p = _PRIVATE(ec);
-
-	if (ec->target == t) {
-		switch (t->type) {
-		case EAB_CONFIG_TARGET_SOURCE: {
-			EABConfigTargetSource *s = (EABConfigTargetSource *)t;
-
-			if (p->source_changed_id) {
-				g_signal_handler_disconnect(s->source, p->source_changed_id);
-				p->source_changed_id = 0;
-			}
-			break; }
-		}
-	}
-
-	switch (t->type) {
-	case EAB_CONFIG_TARGET_SOURCE: {
-		EABConfigTargetSource *s = (EABConfigTargetSource *)t;
-
-		if (s->source)
-			g_object_unref (s->source);
-		break; }
-	}
-
-	((EConfigClass *) ecp_parent_class)->target_free (ec, t);
-}
-
-static void
-ecp_source_changed(struct _ESource *source, EConfig *ec)
-{
-	e_config_target_changed(ec, E_CONFIG_TARGET_CHANGED_STATE);
-}
-
-static void
-ecp_set_target (EConfig *ec, EConfigTarget *t)
-{
-	struct _EABConfigPrivate *p = _PRIVATE(ec);
-
-	((EConfigClass *)ecp_parent_class)->set_target(ec, t);
-
-	if (t) {
-		switch (t->type) {
-		case EAB_CONFIG_TARGET_SOURCE: {
-			EABConfigTargetSource *s = (EABConfigTargetSource *)t;
-
-			p->source_changed_id = g_signal_connect(s->source, "changed", G_CALLBACK(ecp_source_changed), ec);
-			break; }
-		}
-	}
-}
-
-static void
-ecp_class_init (GObjectClass *klass)
-{
-	((EConfigClass *)klass)->set_target = ecp_set_target;
-	((EConfigClass *)klass)->target_free = ecp_target_free;
-
-	g_type_class_add_private(klass, sizeof(struct _EABConfigPrivate));
-}
-
-GType
-eab_config_get_type (void)
-{
-	static GType type = 0;
-
-	if (!type) {
-		static const GTypeInfo info = {
-			sizeof (EABConfigClass),
-			NULL, NULL,
-			(GClassInitFunc) ecp_class_init,
-			NULL, NULL,
-			sizeof (EABConfig), 0,
-			(GInstanceInitFunc) ecp_init
-		};
-
-		ecp_parent_class = g_type_class_ref (e_config_get_type ());
-		type = g_type_register_static (e_config_get_type (), "EABConfig", &info, 0);
-	}
-
-	return type;
-}
-
-EABConfig *
-eab_config_new (int type, const char *menuid)
-{
-	EABConfig *ecp = g_object_new (eab_config_get_type(), 0);
-	e_config_construct (&ecp->config, type, menuid);
-	return ecp;
-}
-
-EABConfigTargetSource *
-eab_config_target_new_source (EABConfig *ecp, struct _ESource *source)
-{
-	EABConfigTargetSource *t = e_config_target_new (&ecp->config, EAB_CONFIG_TARGET_SOURCE, sizeof (*t));
-
-	t->source = source;
-	g_object_ref (source);
-
-	return t;
-}
-
-static const EConfigHookTargetMask ecph_no_masks[] = {
-	{ 0 }
-};
-
-static const EConfigHookTargetMap ecph_targets[] = {
-	{ "source", EAB_CONFIG_TARGET_SOURCE, ecph_no_masks },
-	{ 0 },
-};
-
-static void
-ecph_class_init (EPluginHookClass *klass)
-{
-	int i;
-
-	klass->id = "org.gnome.evolution.addressbook.config:1.0";
-
-	for (i = 0; ecph_targets[i].type; i++) {
-		e_config_hook_class_add_target_map ((EConfigHookClass *)klass, &ecph_targets[i]);
-	}
-
-	((EConfigHookClass *)klass)->config_class = g_type_class_ref (eab_config_get_type ());
-}
-
-GType
-eab_config_hook_get_type (void)
-{
-	static GType type = 0;
-
-	if (!type) {
-		static const GTypeInfo info = {
-			sizeof (EABConfigHookClass),
-			NULL, NULL,
-			(GClassInitFunc) ecph_class_init,
-			NULL, NULL,
-			sizeof (EABConfigHook), 0,
-			(GInstanceInitFunc) NULL
-		};
-
-		ecph_parent_class = g_type_class_ref (e_config_hook_get_type ());
-		type = g_type_register_static (e_config_hook_get_type (), "EABConfigHook", &info, 0);
-	}
-
-	return type;
-}
diff --git a/addressbook/gui/widgets/eab-config.h b/addressbook/gui/widgets/eab-config.h
deleted file mode 100644
index 93d26abf1c..0000000000
--- a/addressbook/gui/widgets/eab-config.h
+++ /dev/null
@@ -1,83 +0,0 @@
-/*
- * Authors: David Trowbridge <trowbrds@cs.colorado.edu>
- *
- * Copyright (C) 2004 Novell, Inc (www.novell.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 __EAB_CONFIG_H__
-#define __EAB_CONFIG_H__
-
-#include <glib-object.h>
-
-#include "e-util/e-config.h"
-
-#ifdef __cplusplus
-extern "C" {
-#pragma }
-#endif
-
-typedef struct _EABConfig EABConfig;
-typedef struct _EABConfigClass EABConfigClass;
-
-struct _EABConfig {
-	EConfig config;
-};
-
-struct _EABConfigClass {
-	EConfigClass config_class;
-};
-
-enum _eab_config_target_t {
-	EAB_CONFIG_TARGET_SOURCE,
-};
-
-typedef struct _EABConfigTargetSource EABConfigTargetSource;
-
-struct _EABConfigTargetSource {
-	EConfigTarget target;
-
-	struct _ESource *source;
-};
-
-typedef struct _EConfigItem EABConfigItem;
-
-GType eab_config_get_type (void);
-EABConfig *eab_config_new (int type, const char *menuid);
-
-EABConfigTargetSource *eab_config_target_new_source (EABConfig *ecp, struct _ESource *source);
-
-/* ********************************************************************** */
-
-typedef struct _EABConfigHook EABConfigHook;
-typedef struct _EABConfigHookClass EABConfigHookClass;
-
-struct _EABConfigHook {
-	EConfigHook hook;
-};
-
-struct _EABConfigHookClass {
-	EConfigHookClass hook_class;
-};
-
-GType eab_config_hook_get_type (void);
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif
diff --git a/addressbook/gui/widgets/eab-contact-display.c b/addressbook/gui/widgets/eab-contact-display.c
deleted file mode 100644
index 145b755781..0000000000
--- a/addressbook/gui/widgets/eab-contact-display.c
+++ /dev/null
@@ -1,693 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-/*
- *  Authors: Chris Toshok <toshok@ximian.com>
- *
- *  Copyright (C) 2003 Ximian, Inc. (www.ximian.com)
- *
- *  This program is free software; you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation; either version 2 of the License, or
- *  (at your option) any later version.
- *
- *  This program is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with this program; if not, write to the Free Software
- *  Foundation, Inc., 59 Temple Street #330, Boston, MA 02111-1307, USA.
- *
- */
-
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
-
-#include "eab-contact-display.h"
-
-#include "eab-gui-util.h"
-#include "e-util/e-html-utils.h"
-#include "e-util/e-icon-factory.h"
-
-#include <string.h>
-#include <libgnome/gnome-i18n.h>
-#include <libgnome/gnome-url.h>
-#include <gtkhtml/gtkhtml.h>
-#include <gtkhtml/gtkhtml-stream.h>
-
-#define HANDLE_MAILTO_INTERNALLY 1
-
-#define PARENT_TYPE (GTK_TYPE_HTML)
-
-struct _EABContactDisplayPrivate {
-	EContact *contact;
-};
-
-
-#define HTML_HEADER "<!doctype html public \"-//W3C//DTD HTML 4.0 TRANSITIONAL//EN\">\n<html>\n"  \
-                    "<head>\n<meta name=\"generator\" content=\"Evolution Addressbook Component\">\n</head>\n"
-
-#define HEADER_COLOR      "#7f7f7f"
-#define IMAGE_COL_WIDTH   "20"
-#define CONTACT_LIST_ICON "stock_contact-list"
-#define AIM_ICON          "im-aim"
-#define GROUPWISE_ICON    "im-nov"
-#define ICQ_ICON          "im-icq"
-#define JABBER_ICON       "im-jabber"
-#define MSN_ICON          "im-msn"
-#define YAHOO_ICON        "im-yahoo"
-#define VIDEOCONF_ICON    "stock_video-conferencing"
-
-#define MAX_COMPACT_IMAGE_DIMENSION 48
-
-static void
-on_url_requested (GtkHTML *html, const char *url, GtkHTMLStream *handle,
-		  EABContactDisplay *display)
-{
-	if (!strcmp (url, "internal-contact-photo:")) {
-		EContactPhoto *photo;
-
-		photo = e_contact_get (display->priv->contact, E_CONTACT_PHOTO);
-		if (!photo)
-			photo = e_contact_get (display->priv->contact, E_CONTACT_LOGO);
-
-		gtk_html_stream_write (handle, photo->data, photo->length);
-
-		gtk_html_end (html, handle, GTK_HTML_STREAM_OK);
-	}
-	else if (!strncmp (url, "evo-icon:", strlen ("evo-icon:"))) {
-		gchar *data;
-		gsize data_length;
-		gchar *filename;
-
-		filename = e_icon_factory_get_icon_filename (url + strlen ("evo-icon:"), E_ICON_SIZE_MENU);
-		if (g_file_get_contents (filename, &data, &data_length, NULL)) {
-			gtk_html_stream_write (handle, data, data_length);
-			g_free (data);
-		}
-
-		gtk_html_stream_close (handle, GTK_HTML_STREAM_OK);
-
-		g_free (filename);
-	}
-}
-
-static void
-on_link_clicked (GtkHTML *html, const char *url, EABContactDisplay *display)
-{
-	GError *err = NULL;
-
-#ifdef HANDLE_MAILTO_INTERNALLY
-	if (!strncmp (url, "internal-mailto:", strlen ("internal-mailto:"))) {
-		int mail_num = atoi (url + strlen ("internal-mailto:"));
-
-		if (mail_num == -1)
-			return;
-
-		eab_send_contact (display->priv->contact, mail_num, EAB_DISPOSITION_AS_TO);
-
-		return;
-	}
-#endif
-
-	gnome_url_show (url, &err);
-		
-	if (err) {
-		g_warning ("gnome_url_show: %s", err->message);
-		g_error_free (err);
-	}
-}
-
-#if 0
-static void
-render_address (GtkHTMLStream *html_stream, EContact *contact, const char *html_label, EContactField adr_field, EContactField label_field)
-{
-	EContactAddress *adr;
-	const char *label;
-
-	label = e_contact_get_const (contact, label_field);
-	if (label) {
-		char *html = e_text_to_html (label, E_TEXT_TO_HTML_CONVERT_NL);
-
-		gtk_html_stream_printf (html_stream, "<tr><td valign=\"top\" width=\"" IMAGE_COL_WIDTH "\"></td><td valign=\"top\" width=\"100\"><font color=" HEADER_COLOR ">%s:</font><br><a href=\"http://www.mapquest.com/\">%s</a></td><td valign=\"top\">%s</td></tr>", html_label, _("(map)"), html);
-
-		g_free (html);
-		return;
-	}
-
-	adr = e_contact_get (contact, adr_field);
-	if (adr &&
-	    (adr->po || adr->ext || adr->street || adr->locality || adr->region || adr->code || adr->country)) {
-
-		gtk_html_stream_printf (html_stream, "<tr><td valign=\"top\" width=\"" IMAGE_COL_WIDTH "\"></td><td valign=\"top\" width=\"100\"><font color=" HEADER_COLOR ">%s:</font><br><a href=\"http://www.mapquest.com/\">%s</a></td><td valign=\"top\">", html_label, _("map"));
-
-		if (adr->po && *adr->po) gtk_html_stream_printf (html_stream, "%s<br>", adr->po);
-		if (adr->ext && *adr->ext) gtk_html_stream_printf (html_stream, "%s<br>", adr->ext);
-		if (adr->street && *adr->street) gtk_html_stream_printf (html_stream, "%s<br>", adr->street);
-		if (adr->locality && *adr->locality) gtk_html_stream_printf (html_stream, "%s<br>", adr->locality);
-		if (adr->region && *adr->region) gtk_html_stream_printf (html_stream, "%s<br>", adr->region);
-		if (adr->code && *adr->code) gtk_html_stream_printf (html_stream, "%s<br>", adr->code);
-		if (adr->country && *adr->country) gtk_html_stream_printf (html_stream, "%s<br>", adr->country);
-
-		gtk_html_stream_printf (html_stream, "</td></tr>");
-	}
-	if (adr)
-		e_contact_address_free (adr);
-}
-#endif
-
-static void
-render_name_value (GtkHTMLStream *html_stream, const char *label, const char *str, const char *icon, unsigned int html_flags)
-{
-	char *value = e_text_to_html (str, html_flags);
-
-	gtk_html_stream_printf (html_stream, "<tr><td valign=\"top\" width=\"" IMAGE_COL_WIDTH "\">");
-	if (icon)
-		gtk_html_stream_printf (html_stream, "<img width=\"16\" height=\"16\" src=\"evo-icon:%s\">", icon);
-	gtk_html_stream_printf (html_stream, "</td><td valign=\"top\" width=\"100\" nowrap><font color=" HEADER_COLOR ">%s:</font></td> <td valign=\"top\">%s</td></tr>", label, value);
-
-	g_free (value);
-}
-
-static void
-render_attribute (GtkHTMLStream *html_stream, EContact *contact, const char *html_label, EContactField field, const char *icon, unsigned int html_flags)
-{
-	const char *str;
-
-	str = e_contact_get_const (contact, field);
-
-	if (str && *str) {
-		render_name_value (html_stream, html_label, str, icon, html_flags);
-	}
-}
-
-static void
-accum_address (GString *gstr, EContact *contact, const char *html_label, EContactField adr_field, EContactField label_field)
-{
-	EContactAddress *adr;
-	const char *label;
-
-	label = e_contact_get_const (contact, label_field);
-	if (label) {
-		char *html = e_text_to_html (label, E_TEXT_TO_HTML_CONVERT_NL);
-
-#if mapping_works
-		g_string_append_printf (gstr, "<tr><td valign=\"top\" width=\"" IMAGE_COL_WIDTH "\"></td><td valign=\"top\" width=\"100\"><font color=" HEADER_COLOR ">%s:</font><br><a href=\"http://www.mapquest.com/\">%s</a></td><td valign=\"top\">%s</td></tr>", html_label, _("(map)"), html);
-#else
-		g_string_append_printf (gstr, "<tr><td valign=\"top\" width=\"" IMAGE_COL_WIDTH "\"></td><td valign=\"top\" width=\"100\"><font color=" HEADER_COLOR ">%s:</font></td><td valign=\"top\">%s</td></tr>", html_label, html);
-#endif
-
-		g_free (html);
-		return;
-	}
-
-	adr = e_contact_get (contact, adr_field);
-	if (adr &&
-	    (adr->po || adr->ext || adr->street || adr->locality || adr->region || adr->code || adr->country)) {
-
-		g_string_append_printf (gstr, "<tr><td valign=\"top\" width=\"" IMAGE_COL_WIDTH "\"></td><td valign=\"top\" width=\"100\"><font color=" HEADER_COLOR ">%s:</font><br><a href=\"http://www.mapquest.com/\">%s</a></td><td valign=\"top\">", html_label, _("map"));
-
-		if (adr->po && *adr->po) g_string_append_printf (gstr, "%s<br>", adr->po);
-		if (adr->ext && *adr->ext) g_string_append_printf (gstr, "%s<br>", adr->ext);
-		if (adr->street && *adr->street) g_string_append_printf (gstr, "%s<br>", adr->street);
-		if (adr->locality && *adr->locality) g_string_append_printf (gstr, "%s<br>", adr->locality);
-		if (adr->region && *adr->region) g_string_append_printf (gstr, "%s<br>", adr->region);
-		if (adr->code && *adr->code) g_string_append_printf (gstr, "%s<br>", adr->code);
-		if (adr->country && *adr->country) g_string_append_printf (gstr, "%s<br>", adr->country);
-
-		g_string_append_printf (gstr, "</td></tr>");
-	}
-	if (adr)
-		e_contact_address_free (adr);
-}
-
-static void
-accum_name_value (GString *gstr, const char *label, const char *str, const char *icon, unsigned int html_flags)
-{
-	char *value = e_text_to_html (str, html_flags);
-
-	g_string_append_printf (gstr, "<tr><td valign=\"top\" width=\"" IMAGE_COL_WIDTH "\">");
-	if (icon)
-		g_string_append_printf (gstr, "<img width=\"16\" height=\"16\" src=\"evo-icon:%s\">", icon);
-	g_string_append_printf (gstr, "</td><td valign=\"top\" width=\"100\" nowrap><font color=" HEADER_COLOR ">%s:</font></td> <td valign=\"top\">%s</td></tr>", label, value);
-
-	g_free (value);
-}
-
-
-static void
-accum_attribute (GString *gstr, EContact *contact, const char *html_label, EContactField field, const char *icon, unsigned int html_flags)
-{
-	const char *str;
-
-	str = e_contact_get_const (contact, field);
-
-	if (str && *str) {
-		accum_name_value (gstr, html_label, str, icon, html_flags);
-	}
-}
-
-static void
-accum_multival_attribute (GString *gstr, EContact *contact, const char *html_label, EContactField field, const char *icon, unsigned int html_flags)
-{
-	GList *val_list, *l;
-
-	val_list = e_contact_get (contact, field);
-	for (l = val_list; l; l = l->next) {
-		const char *str = (const char *) l->data;
-		accum_name_value (gstr, html_label, str, icon, html_flags);
-	}
-	g_list_foreach (val_list, (GFunc) g_free, NULL);
-	g_list_free (val_list);
-}
-
-static void
-render_contact_list (GtkHTMLStream *html_stream, EContact *contact)
-{
-	GList *email_list;
-	GList *l;
-
-	gtk_html_stream_printf (html_stream, "<table border=\"0\" cellspacing=\"0\" cellpadding=\"0\"><tr>");
-	gtk_html_stream_printf (html_stream, "<td valign=\"top\" width=\"" IMAGE_COL_WIDTH "\">");
-	gtk_html_stream_printf (html_stream, "<img width=\"16\" height=\"16\" src=\"evo-icon:" CONTACT_LIST_ICON "\">");
-	gtk_html_stream_printf (html_stream, "</td><td valign=\"top\" width=\"100\" nowrap><font color=" HEADER_COLOR ">%s:</font></td> <td valign=\"top\">", _("List Members"));
-
-	email_list = e_contact_get (contact, E_CONTACT_EMAIL);
-	for (l = email_list; l; l = l->next) {
-		char *html = e_text_to_html (l->data, E_TEXT_TO_HTML_CONVERT_ADDRESSES);
-		gtk_html_stream_printf (html_stream, "%s<br>", html);
-		g_free (html);
-	}
-	gtk_html_stream_printf (html_stream, "</td></tr></table>");
-}
-
-static void
-start_block (GtkHTMLStream *html_stream, const char *label)
-{
-	gtk_html_stream_printf (html_stream, "<tr><td height=\"20\" colspan=\"3\"><font color=" HEADER_COLOR "><b>%s</b></font></td></tr>", label);
-}
-
-static void
-end_block (GtkHTMLStream *html_stream)
-{
-	gtk_html_stream_printf (html_stream, "<tr><td height=\"20\">&nbsp;</td></tr>");
-}
-
-static void
-render_contact (GtkHTMLStream *html_stream, EContact *contact)
-{
-	GString *accum;
-	GList *email_list, *l;
-#ifdef HANDLE_MAILTO_INTERNALLY
-	int email_num = 0;
-#endif
-	char *nl;
-
-	gtk_html_stream_printf (html_stream, "<table border=\"0\">");
-
-	accum = g_string_new ("");
-	nl = "";
-
-	start_block (html_stream, "");
-
-	email_list = e_contact_get (contact, E_CONTACT_EMAIL);
-	for (l = email_list; l; l = l->next) {
-#ifdef HANDLE_MAILTO_INTERNALLY
-		char *html = e_text_to_html (l->data, 0);
-		g_string_append_printf (accum, "%s<a href=\"internal-mailto:%d\">%s</a>", nl, email_num, html);
-		email_num ++;
-		g_free (html);
-		nl = "<br>";
-		
-#else
-		g_string_append_printf (accum, "%s%s", nl, (char*)l->data);
-		nl = "\n";
-#endif
-	}
-	g_list_foreach (email_list, (GFunc)g_free, NULL);
-	g_list_free (email_list);
-
-	if (accum->len) {
-
-#ifdef HANDLE_MAILTO_INTERNALLY
-		gtk_html_stream_printf (html_stream, "<tr><td valign=\"top\" width=\"" IMAGE_COL_WIDTH "\">");
-		gtk_html_stream_printf (html_stream,
-					"</td><td valign=\"top\" width=\"100\" nowrap><font color=" HEADER_COLOR ">%s:</font></td> <td valign=\"top\">%s</td></tr>",
-					_("E-mail"), accum->str);
-#else
-		render_name_value (html_stream, _("E-mail"), accum->str, NULL,
-				   E_TEXT_TO_HTML_CONVERT_ADDRESSES | E_TEXT_TO_HTML_CONVERT_NL);
-#endif
-	}
-
-	g_string_assign (accum, "");
-
-	accum_multival_attribute (accum, contact, _("AIM"), E_CONTACT_IM_AIM, AIM_ICON, 0);
-	accum_multival_attribute (accum, contact, _("GroupWise"), E_CONTACT_IM_GROUPWISE, GROUPWISE_ICON, 0);
-	accum_multival_attribute (accum, contact, _("ICQ"), E_CONTACT_IM_ICQ, ICQ_ICON, 0);
-	accum_multival_attribute (accum, contact, _("Jabber"), E_CONTACT_IM_JABBER, JABBER_ICON, 0);
-	accum_multival_attribute (accum, contact, _("MSN"), E_CONTACT_IM_MSN, MSN_ICON, 0);
-	accum_multival_attribute (accum, contact, _("Yahoo"), E_CONTACT_IM_YAHOO, YAHOO_ICON, 0);
-
-	if (accum->len > 0)
-		gtk_html_stream_printf (html_stream, accum->str);
-
-	end_block (html_stream);
-
-	g_string_assign (accum, "");
-
-	accum_attribute (accum, contact, _("Organization"), E_CONTACT_ORG, NULL, 0);
-	accum_attribute (accum, contact, _("Position"), E_CONTACT_TITLE, NULL, 0);
-	accum_attribute (accum, contact, _("Video Conferencing"), E_CONTACT_VIDEO_URL, VIDEOCONF_ICON, E_TEXT_TO_HTML_CONVERT_URLS);
-	accum_attribute (accum, contact, _("Phone"), E_CONTACT_PHONE_BUSINESS, NULL, 0);
-	accum_attribute (accum, contact, _("Fax"), E_CONTACT_PHONE_BUSINESS_FAX, NULL, 0);
-	accum_address   (accum, contact, _("Address"), E_CONTACT_ADDRESS_WORK, E_CONTACT_ADDRESS_LABEL_WORK);
-
-	if (accum->len > 0) {
-		start_block (html_stream, _("work"));
-		gtk_html_stream_printf (html_stream, accum->str);
-		end_block (html_stream);
-	}
-
-	g_string_assign (accum, "");
-
-	accum_attribute (accum, contact, _("WWW"), E_CONTACT_HOMEPAGE_URL, NULL, E_TEXT_TO_HTML_CONVERT_URLS);
-	accum_attribute (accum, contact, _("Blog"), E_CONTACT_BLOG_URL, NULL, E_TEXT_TO_HTML_CONVERT_URLS);
-
-	accum_attribute (accum, contact, _("Phone"), E_CONTACT_PHONE_HOME, NULL, 0);
-	accum_attribute (accum, contact, _("Mobile Phone"), E_CONTACT_PHONE_MOBILE, NULL, 0);
-	accum_address   (accum, contact, _("Address"), E_CONTACT_ADDRESS_HOME, E_CONTACT_ADDRESS_LABEL_HOME);
-
-	if (accum->len > 0) {
-		start_block (html_stream, _("personal"));
-		gtk_html_stream_printf (html_stream, accum->str);
-		end_block (html_stream);
-	}
-
-	start_block (html_stream, "");
-
-	render_attribute (html_stream, contact, _("Note"), E_CONTACT_NOTE, NULL,
-			  E_TEXT_TO_HTML_CONVERT_ADDRESSES | E_TEXT_TO_HTML_CONVERT_URLS | E_TEXT_TO_HTML_CONVERT_NL);
-	end_block (html_stream);
-
-	gtk_html_stream_printf (html_stream, "</table>");
-}
-
-static void
-eab_contact_display_render_normal (EABContactDisplay *display, EContact *contact)
-{
-	GtkHTMLStream *html_stream;
-
-	if (display->priv->contact)
-		g_object_unref (display->priv->contact);
-	display->priv->contact = contact;
-	if (display->priv->contact)
-		g_object_ref (display->priv->contact);
-
-	html_stream = gtk_html_begin (GTK_HTML (display));
-	gtk_html_stream_write (html_stream, HTML_HEADER, sizeof (HTML_HEADER) - 1);
-	gtk_html_stream_write (html_stream, "<body>\n", 7);
-
-	if (contact) {
-		char *str, *html;
-		EContactPhoto *photo;
-
-		gtk_html_stream_printf (html_stream, "<table cellspacing=\"20\" border=\"0\"><td valign=\"top\">");
-		photo = e_contact_get (contact, E_CONTACT_PHOTO);
-		if (!photo)
-			photo = e_contact_get (contact, E_CONTACT_LOGO);
-		if (photo) {
-			gtk_html_stream_printf (html_stream, "<img border=\"1\" src=\"internal-contact-photo:\">");
-			e_contact_photo_free (photo);
-		}
-		
-		gtk_html_stream_printf (html_stream, "</td><td valign=\"top\">\n");
-
-		str = e_contact_get_const (contact, E_CONTACT_FILE_AS);
-		if (!str)
-			str = e_contact_get_const (contact, E_CONTACT_FULL_NAME);
-
-		if (str) {
-			html = e_text_to_html (str, 0);
-			gtk_html_stream_printf (html_stream, "<h2>%s</h2>", html);
-			g_free (html);
-		}
-
-
-		if (e_contact_get (contact, E_CONTACT_IS_LIST))
-			render_contact_list (html_stream, contact);
-		else
-			render_contact (html_stream, contact);
-
-		gtk_html_stream_printf (html_stream, "</td></tr></table>\n");
-	}
-
-	gtk_html_stream_write (html_stream, "</body></html>\n", 15);
-	gtk_html_end (GTK_HTML (display), html_stream, GTK_HTML_STREAM_OK);
-}
-
-static void
-eab_contact_display_render_compact (EABContactDisplay *display, EContact *contact)
-{
-	GtkHTMLStream *html_stream;
-
-	if (display->priv->contact)
-		g_object_unref (display->priv->contact);
-	display->priv->contact = contact;
-	if (display->priv->contact)
-		g_object_ref (display->priv->contact);
-
-	html_stream = gtk_html_begin (GTK_HTML (display));
-	gtk_html_stream_write (html_stream, HTML_HEADER, sizeof (HTML_HEADER) - 1);
-	gtk_html_stream_write (html_stream, "<body>\n", 7);
-
-	if (contact) {
-		char *str, *html;
-		EContactPhoto *photo;
-
-		gtk_html_stream_printf (html_stream,
-					"<table width=\"100%%\" cellpadding=1 cellspacing=0 bgcolor=\"#000000\">"
-					"<tr><td valign=\"top\">"
-					"<table width=\"100%%\" cellpadding=0 cellspacing=0 bgcolor=\"#eeeeee\">"
-					"<tr><td valign=\"top\">"
-					"<table>"
-					"<tr><td valign=\"top\">");
-
-		photo = e_contact_get (contact, E_CONTACT_PHOTO);
-		if (!photo)
-			photo = e_contact_get (contact, E_CONTACT_LOGO);
-		if (photo) {
-			int calced_width = MAX_COMPACT_IMAGE_DIMENSION, calced_height = MAX_COMPACT_IMAGE_DIMENSION;
-			GdkPixbufLoader *loader = gdk_pixbuf_loader_new ();
-			GdkPixbuf *pixbuf;
-
-			/* figure out if we need to downscale the
-			   image here.  we don't scale the pixbuf
-			   itself, just insert width/height tags in
-			   the html */
-			gdk_pixbuf_loader_write (loader, photo->data, photo->length, NULL);
-			pixbuf = gdk_pixbuf_loader_get_pixbuf (loader);
-			if (pixbuf)
-				gdk_pixbuf_ref (pixbuf);
-			gdk_pixbuf_loader_close (loader, NULL);
-			g_object_unref (loader);
-			if (pixbuf) {
-				int max_dimension;
-
-				calced_width = gdk_pixbuf_get_width (pixbuf);
-				calced_height = gdk_pixbuf_get_height (pixbuf);
-
-				max_dimension = calced_width;
-				if (max_dimension < calced_height)
-					max_dimension = calced_height;
-
-				if (max_dimension > MAX_COMPACT_IMAGE_DIMENSION) {
-					calced_width *= ((float)MAX_COMPACT_IMAGE_DIMENSION / max_dimension);
-					calced_height *= ((float)MAX_COMPACT_IMAGE_DIMENSION / max_dimension);
-				}
-			}
-
-			gdk_pixbuf_unref (pixbuf);
-			gtk_html_stream_printf (html_stream, "<img width=\"%d\" height=\"%d\" src=\"internal-contact-photo:\">",
-						calced_width, calced_height);
-			e_contact_photo_free (photo);
-		}
-		
-		gtk_html_stream_printf (html_stream, "</td><td valign=\"top\">\n");
-
-		str = e_contact_get_const (contact, E_CONTACT_FILE_AS);
-		if (str) {
-			html = e_text_to_html (str, 0);
-			gtk_html_stream_printf (html_stream, "<b>%s</b>", html);
-			g_free (html);
-		}
-		else {
-			str = e_contact_get_const (contact, E_CONTACT_FULL_NAME);
-			if (str) {
-				html = e_text_to_html (str, 0);
-				gtk_html_stream_printf (html_stream, "<b>%s</b>", html);
-				g_free (html);
-			}
-		}
-
-		gtk_html_stream_write (html_stream, "<hr>", 4);
-		
-		if (e_contact_get (contact, E_CONTACT_IS_LIST)) {
-			GList *email_list;
-			GList *l;
-
-			gtk_html_stream_printf (html_stream, "<table border=\"0\" cellspacing=\"0\" cellpadding=\"0\"><tr><td valign=\"top\">");
-			gtk_html_stream_printf (html_stream, "<b>%s:</b>&nbsp;<td>", _("List Members"));
-
-			email_list = e_contact_get (contact, E_CONTACT_EMAIL);
-			for (l = email_list; l; l = l->next) {
-				char *html = e_text_to_html (l->data, 0);
-				gtk_html_stream_printf (html_stream, "%s, ", html);
-				g_free (html);
-			}
-			gtk_html_stream_printf (html_stream, "</td></tr></table>");
-		}
-		else {
-			gboolean comma = FALSE;
-			str = e_contact_get_const (contact, E_CONTACT_TITLE);
-			if (str) {
-				html = e_text_to_html (str, 0);
-				gtk_html_stream_printf (html_stream, "<b>%s:</b> %s<br>", _("Job Title"), str);
-				g_free (html);
-			}
-
-			gtk_html_stream_printf (html_stream, "<b>%s:</b> ", _("Email"));
-			str = e_contact_get_const (contact, E_CONTACT_EMAIL_1);
-			if (str) {
-				html = e_text_to_html (str, 0);
-				gtk_html_stream_printf (html_stream, "%s", str);
-				g_free (html);
-				comma = TRUE;
-			}
-			str = e_contact_get_const (contact, E_CONTACT_EMAIL_2);
-			if (str) {
-				html = e_text_to_html (str, 0);
-				gtk_html_stream_printf (html_stream, "%s%s", comma ? ", " : "", str);
-				g_free (html);
-				comma = TRUE;
-			}
-			str = e_contact_get_const (contact, E_CONTACT_EMAIL_3);
-			if (str) {
-				html = e_text_to_html (str, 0);
-				gtk_html_stream_printf (html_stream, "%s%s", comma ? ", " : "", str);
-				g_free (html);
-			}
-			gtk_html_stream_write (html_stream, "<br>", 4);
-			
-			str = e_contact_get_const (contact, E_CONTACT_HOMEPAGE_URL);
-			if (str) {
-				html = e_text_to_html (str, E_TEXT_TO_HTML_CONVERT_URLS);
-				gtk_html_stream_printf (html_stream, "<b>%s:</b> %s<br>",
-							_("Home page"), html);
-				g_free (html);
-			}
-
-			str = e_contact_get_const (contact, E_CONTACT_BLOG_URL);
-			if (str) {
-				html = e_text_to_html (str, E_TEXT_TO_HTML_CONVERT_URLS);
-				gtk_html_stream_printf (html_stream, "<b>%s:</b> %s<br>",
-							_("Blog"), html);
-			}
-		}
-
-		gtk_html_stream_printf (html_stream, "</td></tr></table></td></tr></table></td></tr></table>\n");
-	}
-
-	gtk_html_stream_write (html_stream, "</body></html>\n", 15);
-	gtk_html_end (GTK_HTML (display), html_stream, GTK_HTML_STREAM_OK);
-}
-
-void
-eab_contact_display_render (EABContactDisplay *display, EContact *contact,
-			    EABContactDisplayRenderMode mode)
-{
-	switch (mode) {
-	case EAB_CONTACT_DISPLAY_RENDER_NORMAL:
-		eab_contact_display_render_normal (display, contact);
-		break;
-	case EAB_CONTACT_DISPLAY_RENDER_COMPACT:
-		eab_contact_display_render_compact (display, contact);
-		break;
-	}
-}
-
-GtkWidget*
-eab_contact_display_new (void)
-{
-	EABContactDisplay *display;
-
-	display = g_object_new (EAB_TYPE_CONTACT_DISPLAY, NULL);
-	
-	display->priv = g_new0 (EABContactDisplayPrivate, 1);
-
-	gtk_html_set_default_content_type (GTK_HTML (display), "text/html; charset=utf-8");
-	
-	gtk_html_set_editable (GTK_HTML (display), FALSE);
-
-	g_signal_connect (display, "url_requested",
-			  G_CALLBACK (on_url_requested),
-			  display);
-	g_signal_connect (display, "link_clicked",
-			  G_CALLBACK (on_link_clicked),
-			  display);
-#if 0
-	g_signal_connect (display, "object_requested",
-			  G_CALLBACK (on_object_requested),
-			  mail_display);
-	g_signal_connect (display, "button_press_event",
-			  G_CALLBACK (html_button_press_event), mail_display);
-	g_signal_connect (display, "motion_notify_event",
-			  G_CALLBACK (html_motion_notify_event), mail_display);
-	g_signal_connect (display, "enter_notify_event",
-			  G_CALLBACK (html_enter_notify_event), mail_display);
-	g_signal_connect (display, "iframe_created",
-			  G_CALLBACK (html_iframe_created), mail_display);
-	g_signal_connect (display, "on_url",
-			  G_CALLBACK (html_on_url), mail_display);
-#endif
-
-	return GTK_WIDGET (display);
-}
-
-
-static void
-eab_contact_display_init (GObject *object)
-{
-	gtk_html_construct (object);
-}
-
-static void
-eab_contact_display_class_init (GtkObjectClass *object_class)
-{
-	/*	object_class->destroy = mail_display_destroy;*/
-}
-
-GType
-eab_contact_display_get_type (void)
-{
-	static GType type = 0;
-
-	if (!type) {
-		static const GTypeInfo info =  {
-			sizeof (EABContactDisplayClass),
-			NULL,           /* base_init */
-			NULL,           /* base_finalize */
-			(GClassInitFunc) eab_contact_display_class_init,
-			NULL,           /* class_finalize */
-			NULL,           /* class_data */
-			sizeof (EABContactDisplay),
-			0,             /* n_preallocs */
-			(GInstanceInitFunc) eab_contact_display_init,
-		};
-
-		type = g_type_register_static (PARENT_TYPE, "EABContactDisplay", &info, 0);
-	}
-
-	return type;
-}
diff --git a/addressbook/gui/widgets/eab-contact-display.h b/addressbook/gui/widgets/eab-contact-display.h
deleted file mode 100644
index 08c3936cad..0000000000
--- a/addressbook/gui/widgets/eab-contact-display.h
+++ /dev/null
@@ -1,60 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-/*
- *  Authors: Chris Toshok <toshok@ximian.com>
- *
- *  Copyright 2003 Ximian, Inc. (www.ximian.com)
- *
- *  This program is free software; you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation; either version 2 of the License, or
- *  (at your option) any later version.
- *
- *  This program is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with this program; if not, write to the Free Software
- *  Foundation, Inc., 59 Temple Street #330, Boston, MA 02111-1307, USA.
- *
- */
-
-#ifndef _EAB_CONTACT_DISPLAY_H_
-#define _EAB_CONTACT_DISPLAY_H_
-
-#include <gtkhtml/gtkhtml.h>
-#include <libebook/e-contact.h>
-
-#define EAB_TYPE_CONTACT_DISPLAY        (eab_contact_display_get_type ())
-#define EAB_CONTACT_DISPLAY(o)          (G_TYPE_CHECK_INSTANCE_CAST ((o), EAB_TYPE_CONTACT_DISPLAY, EABContactDisplay))
-#define EAB_CONTACT_DISPLAY_CLASS(k)    (G_TYPE_CHECK_CLASS_CAST ((k), EAB_TYPE_CONTACT_DISPLAY, EABContactDisplayClass))
-#define IS_EAB_CONTACT_DISPLAY(o)       (G_TYPE_CHECK_INSTANCE_TYPE ((o), EAB_TYPE_CONTACT_DISPLAY))
-#define IS_EAB_CONTACT_DISPLAY_CLASS(k) (G_TYPE_CHECK_CLASS_TYPE ((k), EAB_TYPE_CONTACT_DISPLAY))
-
-typedef struct _EABContactDisplay EABContactDisplay;
-typedef struct _EABContactDisplayPrivate EABContactDisplayPrivate;
-typedef struct _EABContactDisplayClass EABContactDisplayClass;
-
-typedef enum {
-	EAB_CONTACT_DISPLAY_RENDER_NORMAL,  /* for use in the preview pane */
-	EAB_CONTACT_DISPLAY_RENDER_COMPACT  /* for use with embedded vcards (e.g, the EABVCardControl) */
-} EABContactDisplayRenderMode;
-
-struct _EABContactDisplay {
-	GtkHTML parent;
-	
-	EABContactDisplayPrivate *priv;
-};
-
-struct _EABContactDisplayClass {
-	GtkHTMLClass parent_class;
-};
-
-GtkType        eab_contact_display_get_type    (void);
-GtkWidget *    eab_contact_display_new         (void);
-
-void           eab_contact_display_render      (EABContactDisplay *display, EContact *contact,
-						EABContactDisplayRenderMode render_mode);
-
-#endif /* _EAB_CONTACT_DISPLAY_H_ */
diff --git a/addressbook/gui/widgets/eab-gui-util.c b/addressbook/gui/widgets/eab-gui-util.c
deleted file mode 100644
index 24bbe248d4..0000000000
--- a/addressbook/gui/widgets/eab-gui-util.c
+++ /dev/null
@@ -1,1097 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-/* 
- * e-table-field-chooser.c
- * Copyright (C) 2001  Ximian, Inc.
- * Author: Chris Toshok <toshok@ximian.com>
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of version 2 of the GNU General Public
- * License as published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * General Public License for more details.
- *
- * You should have received a copy of the GNU General Public
- * License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
- */
-
-#include <config.h>
-
-#include <unistd.h>
-#include <fcntl.h>
-#include <errno.h>
-#include <string.h>
-
-#include <libedataserverui/e-source-selector.h>
-#include <gal/util/e-util.h>
-#include "eab-gui-util.h"
-#include "util/eab-book-util.h"
-#include <libebook/e-destination.h>
-#include "widgets/misc/e-error.h"
-#include "widgets/misc/e-image-chooser.h"
-#include <e-util/e-icon-factory.h>
-
-#include <gnome.h>
-
-#include "addressbook/gui/contact-editor/eab-editor.h"
-#include "addressbook/gui/contact-editor/e-contact-editor.h"
-#include "addressbook/gui/contact-list-editor/e-contact-list-editor.h"
-#include "addressbook/gui/component/addressbook-component.h"
-#include "addressbook/gui/component/addressbook.h"
-
-/* the NULL's in this table correspond to the status codes
-   that should *never* be generated by a backend */
-static const char *status_to_string[] = {
-	/* E_BOOK_ERROR_OK */                        		N_("Success"),
-	/* E_BOOK_ERROR_INVALID_ARG */               		NULL,
-	/* E_BOOK_ERROR_BUSY */                      		N_("Backend busy"),
-	/* E_BOOK_ERROR_REPOSITORY_OFFLINE */        		N_("Repository offline"),
-	/* E_BOOK_ERROR_NO_SUCH_BOOK */              		N_("Address Book does not exist"),
-	/* E_BOOK_ERROR_NO_SELF_CONTACT */           		N_("No Self Contact defined"),
-	/* E_BOOK_ERROR_URI_NOT_LOADED */            		NULL,
-	/* E_BOOK_ERROR_URI_ALREADY_LOADED */        		NULL,
-	/* E_BOOK_ERROR_PERMISSION_DENIED */         		N_("Permission denied"),
-	/* E_BOOK_ERROR_CONTACT_NOT_FOUND */         		N_("Contact not found"),
-	/* E_BOOK_ERROR_CONTACT_ID_ALREADY_EXISTS */ 		N_("Contact ID already exists"),
-	/* E_BOOK_ERROR_PROTOCOL_NOT_SUPPORTED */    		N_("Protocol not supported"),
-	/* E_BOOK_ERROR_CANCELLED */                 		N_("Cancelled"),
-	/* E_BOOK_ERROR_COULD_NOT_CANCEL */                     N_("Could not cancel"),
-	/* E_BOOK_ERROR_AUTHENTICATION_FAILED */                N_("Authentication Failed"),
-	/* E_BOOK_ERROR_AUTHENTICATION_REQUIRED */              N_("Authentication Required"),
-	/* E_BOOK_ERROR_TLS_NOT_AVAILABLE */                    N_("TLS not Available"),
-	/* E_BOOK_ERROR_CORBA_EXCEPTION */                      NULL,
-	/* E_BOOK_ERROR_NO_SUCH_SOURCE */                       N_("No such source"),
-	/* E_BOOK_ERROR_OTHER_ERROR */                          N_("Other error")
-};
-
-void
-eab_error_dialog (const char *msg, EBookStatus status)
-{
-	const char *status_str = status_to_string [status];
-	
-	if (status_str)
-		e_error_run (NULL, "addressbook:generic-error", msg, status_str, NULL);
-}
-
-void
-eab_load_error_dialog (GtkWidget *parent, ESource *source, EBookStatus status)
-{
-	char *label_string, *uri;
-	
-	g_return_if_fail (source != NULL);
-
-	uri = e_source_get_uri (source);
-
-	if (status == E_BOOK_ERROR_OFFLINE_UNAVAILABLE) {
-		label_string = _("We were unable to open this addressbook. This either means "
-                                 "this book is not marked for offline usage or not yet downloaded "
-                                 "for offline usage. Please load the addressbook once in online mode "
-                                 "to download its contents");
-	}
-		
-	else if (!strncmp (uri, "file:", 5)) {
-		label_string = 
-			_("We were unable to open this addressbook.  Please check that the "
-			  "path exists and that you have permission to access it.");
-	}
-	else if (!strncmp (uri, "ldap:", 5)) {
-		/* special case for ldap: contact folders so we can tell the user about openldap */
-#if HAVE_LDAP
-		label_string = 
-			_("We were unable to open this addressbook.  This either "
-			  "means you have entered an incorrect URI, or the LDAP server "
-			  "is unreachable.");
-#else
-		label_string =
-			_("This version of Evolution does not have LDAP support "
-			  "compiled in to it.  If you want to use LDAP in Evolution, "
-			  "you must install an LDAP-enabled Evolution package.");
-#endif
-	} else {
-		/* other network folders */
-		label_string =
-			_("We were unable to open this addressbook.  This either "
-			  "means you have entered an incorrect URI, or the server "
-			  "is unreachable.");
-	}
-	
-	e_error_run ((GtkWindow *) parent, "addressbook:load-error", label_string, NULL);
-	
-	g_free (uri);
-}
-
-void
-eab_search_result_dialog      (GtkWidget *parent,
-			       EBookViewStatus status)
-{
-	char *str = NULL;
-
-	switch (status) {
-	case E_BOOK_VIEW_STATUS_OK:
-		return;
-	case E_BOOK_VIEW_STATUS_SIZE_LIMIT_EXCEEDED:
-		str = _("More cards matched this query than either the server is \n"
-			"configured to return or Evolution is configured to display.\n"
-			"Please make your search more specific or raise the result limit in\n"
-			"the directory server preferences for this addressbook.");
-		break;
-	case E_BOOK_VIEW_STATUS_TIME_LIMIT_EXCEEDED:
-		str = _("The time to execute this query exceeded the server limit or the limit\n"
-			"you have configured for this addressbook.  Please make your search\n"
-			"more specific or raise the time limit in the directory server\n"
-			"preferences for this addressbook.");
-		break;
-	case E_BOOK_VIEW_ERROR_INVALID_QUERY:
-		str = _("The backend for this addressbook was unable to parse this query.");
-		break;
-	case E_BOOK_VIEW_ERROR_QUERY_REFUSED:
-		str = _("The backend for this addressbook refused to perform this query.");
-		break;
-	case E_BOOK_VIEW_ERROR_OTHER_ERROR:
-		str = _("This query did not complete successfully.");
-		break;
-	default:
-		g_assert_not_reached ();
-	}
-	
-	e_error_run ((GtkWindow *) parent, "addressbook:search-error", str, NULL);
-}
-
-gint
-eab_prompt_save_dialog (GtkWindow *parent)
-{
-	return e_error_run (parent, "addressbook:prompt-save", NULL);
-}
-
-static void
-added_cb (EBook* book, EBookStatus status, EContact *contact,
-	  gpointer data)
-{
-	gboolean is_list = GPOINTER_TO_INT (data);
-
-	if (status != E_BOOK_ERROR_OK && status != E_BOOK_ERROR_CANCELLED) {
-		eab_error_dialog (is_list ? _("Error adding list") : _("Error adding contact"), status);
-	}
-}
-
-static void
-modified_cb (EBook* book, EBookStatus status, EContact *contact,
-	     gpointer data)
-{
-	gboolean is_list = GPOINTER_TO_INT (data);
-
-	if (status != E_BOOK_ERROR_OK && status != E_BOOK_ERROR_CANCELLED) {
-		eab_error_dialog (is_list ? _("Error modifying list") : _("Error modifying contact"),
-				  status);
-	}
-}
-
-static void
-deleted_cb (EBook* book, EBookStatus status, EContact *contact,
-	    gpointer data)
-{
-	gboolean is_list = GPOINTER_TO_INT (data);
-
-	if (status != E_BOOK_ERROR_OK) {
-		eab_error_dialog (is_list ? _("Error removing list") : _("Error removing contact"),
-				  status);
-	}
-}
-
-static void
-editor_closed_cb (GtkObject *editor, gpointer data)
-{
-	g_object_unref (editor);
-}
-
-EContactEditor *
-eab_show_contact_editor (EBook *book, EContact *contact,
-			 gboolean is_new_contact,
-			 gboolean editable)
-{
-	EContactEditor *ce;
-
-	ce = e_contact_editor_new (book, contact, is_new_contact, editable);
-
-	g_signal_connect (ce, "contact_added",
-			  G_CALLBACK (added_cb), GINT_TO_POINTER (FALSE));
-	g_signal_connect (ce, "contact_modified",
-			  G_CALLBACK (modified_cb), GINT_TO_POINTER (FALSE));
-	g_signal_connect (ce, "contact_deleted",
-			  G_CALLBACK (deleted_cb), GINT_TO_POINTER (FALSE));
-	g_signal_connect (ce, "editor_closed",
-			  G_CALLBACK (editor_closed_cb), NULL);
-
-	return ce;
-}
-
-EContactListEditor *
-eab_show_contact_list_editor (EBook *book, EContact *contact,
-			      gboolean is_new_contact,
-			      gboolean editable)
-{
-	EContactListEditor *ce;
-
-	ce = e_contact_list_editor_new (book, contact, is_new_contact, editable);
-
-	g_signal_connect (ce, "contact_added",
-			  G_CALLBACK (added_cb), GINT_TO_POINTER (TRUE));
-	g_signal_connect (ce, "contact_modified",
-			  G_CALLBACK (modified_cb), GINT_TO_POINTER (TRUE));
-	g_signal_connect (ce, "contact_deleted",
-			  G_CALLBACK (deleted_cb), GINT_TO_POINTER (TRUE));
-	g_signal_connect (ce, "editor_closed",
-			  G_CALLBACK (editor_closed_cb), GINT_TO_POINTER (TRUE));
-
-	eab_editor_show (EAB_EDITOR (ce));
-
-	return ce;
-}
-
-static void
-view_contacts (EBook *book, GList *list, gboolean editable)
-{
-	for (; list; list = list->next) {
-		EContact *contact = list->data;
-		if (e_contact_get (contact, E_CONTACT_IS_LIST))
-			eab_show_contact_list_editor (book, contact, FALSE, editable);
-		else
-			eab_show_contact_editor (book, contact, FALSE, editable);
-	}
-}
-
-void
-eab_show_multiple_contacts (EBook *book,
-			    GList *list,
-			    gboolean editable)
-{
-	if (list) {
-		int length = g_list_length (list);
-		if (length > 5) {
-			GtkWidget *dialog;
-			gint response;
-
-			dialog = gtk_message_dialog_new (NULL,
-							 0,
-							 GTK_MESSAGE_QUESTION,
-							 GTK_BUTTONS_YES_NO,
-							 ngettext("Opening %d contact will open %d new window as well.\n"
-								  "Do you really want to display this contact?",
-								  "Opening %d contacts will open %d new windows as well.\n"
-								  "Do you really want to display all of these contacts?",
-								  length),
-							 length,
-							 length);
-
-			response = gtk_dialog_run (GTK_DIALOG (dialog));
-			gtk_widget_destroy (dialog);
-			if (response == GTK_RESPONSE_YES)
-				view_contacts (book, list, editable);
-		} else {
-			view_contacts (book, list, editable);
-		}
-	}
-}
-
-
-static gint
-file_exists(GtkWindow *window, const char *filename)
-{
-	GtkWidget *dialog;
-	gint response;
-
-	dialog = gtk_message_dialog_new (window,
-					 0,
-					 GTK_MESSAGE_QUESTION,
-					 GTK_BUTTONS_NONE,
-					 _("%s already exists\nDo you want to overwrite it?"), filename);
-
-	gtk_dialog_add_buttons (GTK_DIALOG (dialog),
-				GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL,
-				_("Overwrite"), GTK_RESPONSE_ACCEPT,
-				NULL);
-
-	response = gtk_dialog_run (GTK_DIALOG (dialog));
-	gtk_widget_destroy (dialog);
-	return response;
-}
-
-typedef struct {
-	GtkWidget *filesel;
-	char *vcard;
-} SaveAsInfo;
-
-static void
-save_it(GtkWidget *widget, SaveAsInfo *info)
-{
-	const char *filename;
-	gint error = 0;
-	gint response = 0;
-	
-
-#ifdef USE_GTKFILECHOOSER
-	filename = gtk_file_chooser_get_filename (GTK_FILE_CHOOSER (info->filesel));
-#else
-	filename = gtk_file_selection_get_filename (GTK_FILE_SELECTION (info->filesel));
-#endif
-
-	error = e_write_file (filename, info->vcard, O_WRONLY | O_CREAT | O_EXCL | O_TRUNC);
-
-	if (error == EEXIST) {
-		response = file_exists(GTK_WINDOW (info->filesel), filename);
-		switch (response) {
-			case GTK_RESPONSE_ACCEPT : /* Overwrite */
-				e_write_file(filename, info->vcard, O_WRONLY | O_CREAT | O_TRUNC);
-				break;
-			case GTK_RESPONSE_CANCEL : /* cancel */
-				return;
-		}
-	} else if (error != 0) {
-		e_error_run (GTK_WINDOW (info->filesel), "addressbook:save-error", filename, g_strerror (errno));
-		return;
-	}
-	
-	gtk_widget_destroy(GTK_WIDGET(info->filesel));
-}
-
-static void
-close_it(GtkWidget *widget, SaveAsInfo *info)
-{
-	gtk_widget_destroy (GTK_WIDGET (info->filesel));
-}
-
-static void
-destroy_it(void *data, GObject *where_the_object_was)
-{
-	SaveAsInfo *info = data;
-	g_free (info->vcard);
-	g_free (info);
-}
-
-#ifdef USE_GTKFILECHOOSER
-static void
-filechooser_response (GtkWidget *widget, gint response_id, SaveAsInfo *info)
-{
-	if (response_id == GTK_RESPONSE_ACCEPT)
-		save_it  (widget, info);
-	else
-		close_it (widget, info);
-}
-#endif
-
-static char *
-make_safe_filename (char *name)
-{
-	char *safe;
-
-	if (!name) {
-		/* This is a filename. Translators take note. */
-		name = _("card.vcf");
-	}
-
-	if (!g_strrstr (name, ".vcf"))
-		safe = g_strdup_printf ("%s%s", name, ".vcf");
-	else
-		safe = g_strdup (name);
-
-	e_filename_make_safe (safe);
-	
-	return safe;
-}
-
-static void
-source_selection_changed_cb (GtkWidget *selector, GtkWidget *ok_button)
-{
-	gtk_widget_set_sensitive (ok_button,
-				  e_source_selector_peek_primary_selection (E_SOURCE_SELECTOR (selector)) ?
-				  TRUE : FALSE);
-}
-
-ESource *
-eab_select_source (const gchar *title, const gchar *message, const gchar *select_uid, GtkWindow *parent)
-{
-	ESource *source;
-	ESourceList *source_list;
-	GtkWidget *dialog;
-	GtkWidget *ok_button;
-	GtkWidget *cancel_button;
-	GtkWidget *label;
-	GtkWidget *selector;
-	GtkWidget *scrolled_window;
-	gint response;
-
-	if (!e_book_get_addressbooks (&source_list, NULL))
-		return NULL;
-
-	dialog = gtk_dialog_new_with_buttons (title, parent,
-					      GTK_DIALOG_MODAL | GTK_DIALOG_DESTROY_WITH_PARENT,
-					      NULL);
-	gtk_window_set_default_size (GTK_WINDOW (dialog), 200, 350);
-
-	cancel_button = gtk_dialog_add_button (GTK_DIALOG (dialog), GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL);
-	ok_button = gtk_dialog_add_button (GTK_DIALOG (dialog), GTK_STOCK_OK, GTK_RESPONSE_ACCEPT);
-	gtk_widget_set_sensitive (ok_button, FALSE);
-
-	label = gtk_label_new (message);
-
-	selector = e_source_selector_new (source_list);
-	e_source_selector_show_selection (E_SOURCE_SELECTOR (selector), FALSE);
-	g_signal_connect (selector, "primary_selection_changed",
-			  G_CALLBACK (source_selection_changed_cb), ok_button);
-
-	if (select_uid) {
-		source = e_source_list_peek_source_by_uid (source_list, select_uid);
-		if (source)
-			e_source_selector_set_primary_selection (E_SOURCE_SELECTOR (selector), source);
-	}
-
-	scrolled_window = gtk_scrolled_window_new (NULL, NULL);
-	gtk_scrolled_window_set_shadow_type (GTK_SCROLLED_WINDOW (scrolled_window), GTK_SHADOW_IN);
-	gtk_container_add (GTK_CONTAINER (scrolled_window), selector);
-
-	gtk_box_pack_start (GTK_BOX (GTK_DIALOG (dialog)->vbox), label, FALSE, FALSE, 4);
-	gtk_box_pack_start (GTK_BOX (GTK_DIALOG (dialog)->vbox), scrolled_window, TRUE, TRUE, 4);
-
-	gtk_widget_show_all (dialog);
-	response = gtk_dialog_run (GTK_DIALOG (dialog));
-
-	if (response == GTK_RESPONSE_ACCEPT)
-		source = e_source_selector_peek_primary_selection (E_SOURCE_SELECTOR (selector));
-	else
-		source = NULL;
-
-	gtk_widget_destroy (dialog);
-	return source;
-}
-
-void
-eab_contact_save (char *title, EContact *contact, GtkWindow *parent_window)
-{
-	GtkWidget *filesel;
-	char *file, *full_filename;
-	char *name;
-	SaveAsInfo *info = g_new(SaveAsInfo, 1);
-
-	name = e_contact_get (contact, E_CONTACT_FILE_AS);
-	file = make_safe_filename (name);
-
-#ifdef USE_GTKFILECHOOSER
-	filesel = gtk_file_chooser_dialog_new (title,
-					       parent_window,
-					       GTK_FILE_CHOOSER_ACTION_SAVE,
-					       GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL,
-					       GTK_STOCK_SAVE, GTK_RESPONSE_ACCEPT,
-					       NULL);
-	gtk_dialog_set_default_response (GTK_DIALOG (filesel), GTK_RESPONSE_ACCEPT);
-
-	gtk_file_chooser_set_current_folder (GTK_FILE_CHOOSER (filesel), g_get_home_dir ());
-	gtk_file_chooser_set_current_name (GTK_FILE_CHOOSER (filesel), file);
-	
-	info->filesel = filesel;
-	info->vcard = e_vcard_to_string (E_VCARD (contact), EVC_FORMAT_VCARD_30);
-
-	g_signal_connect (G_OBJECT (filesel), "response",
-			  G_CALLBACK (filechooser_response), info);
-	g_object_weak_ref (G_OBJECT (filesel), destroy_it, info);
-#else
-	filesel = gtk_file_selection_new (title);
-
-	full_filename = g_strdup_printf ("%s/%s", g_get_home_dir (), file);
-	gtk_file_selection_set_filename (GTK_FILE_SELECTION (filesel), full_filename);
-	g_free (full_filename);
-	
-	info->filesel = filesel;
-	info->vcard = e_vcard_to_string (E_VCARD (contact), EVC_FORMAT_VCARD_30);
-
-	g_signal_connect(G_OBJECT (GTK_FILE_SELECTION (filesel)->ok_button), "clicked",
-			 G_CALLBACK (save_it), info);
-	g_signal_connect(G_OBJECT (GTK_FILE_SELECTION (filesel)->cancel_button), "clicked",
-			 G_CALLBACK (close_it), info);
-	g_object_weak_ref (G_OBJECT (filesel), destroy_it, info);
-#endif
-
-	if (parent_window) {
-		gtk_window_set_transient_for (GTK_WINDOW (filesel),
-					      parent_window);
-		gtk_window_set_modal (GTK_WINDOW (filesel), TRUE);
-	}
-
-	gtk_widget_show(GTK_WIDGET(filesel));
-	g_free (file);
-}
-
-void
-eab_contact_list_save (char *title, GList *list, GtkWindow *parent_window)
-{
-	GtkWidget *filesel;
-	SaveAsInfo *info = g_new(SaveAsInfo, 1);
-	char *file, *full_filename;
-
-#ifdef USE_GTKFILECHOOSER
-	filesel = gtk_file_chooser_dialog_new (title,
-					       parent_window,
-					       GTK_FILE_CHOOSER_ACTION_SAVE,
-					       GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL,
-					       GTK_STOCK_SAVE, GTK_RESPONSE_ACCEPT,
-					       NULL);
-	gtk_dialog_set_default_response (GTK_DIALOG (filesel), GTK_RESPONSE_ACCEPT);
-#else
-	filesel = gtk_file_selection_new(title);
-#endif
-
-	/* This is a filename. Translators take note. */
-	if (list && list->data && list->next == NULL) {
-		char *name;
-		name = e_contact_get (E_CONTACT (list->data), E_CONTACT_FILE_AS);
-		if (!name)
-			name = e_contact_get (E_CONTACT (list->data), E_CONTACT_FULL_NAME);
-
-		file = make_safe_filename (name);
-	} else {
-		file = make_safe_filename (_("list"));
-	}
-
-#ifdef USE_GTKFILECHOOSER
-	gtk_file_chooser_set_current_folder (GTK_FILE_CHOOSER (filesel), g_get_home_dir ());
-	gtk_file_chooser_set_current_name (GTK_FILE_CHOOSER (filesel), file);
-#else
-	full_filename = g_strdup_printf ("%s/%s", g_get_home_dir (), file);
-	gtk_file_selection_set_filename (GTK_FILE_SELECTION (filesel), full_filename);
-	g_free (full_filename);
-#endif
-
-	info->filesel = filesel;
-	info->vcard = eab_contact_list_to_string (list);
-
-#ifdef USE_GTKFILECHOOSER
-	g_signal_connect (G_OBJECT (filesel), "response",
-			  G_CALLBACK (filechooser_response), info);
-	g_object_weak_ref (G_OBJECT (filesel), destroy_it, info);
-#else
-	g_signal_connect(G_OBJECT (GTK_FILE_SELECTION (filesel)->ok_button), "clicked",
-			 G_CALLBACK (save_it), info);
-	g_signal_connect(G_OBJECT (GTK_FILE_SELECTION (filesel)->cancel_button), "clicked",
-			 G_CALLBACK (close_it), info);
-	g_object_weak_ref (G_OBJECT (filesel), destroy_it, info);
-#endif
-
-	if (parent_window) {
-		gtk_window_set_transient_for (GTK_WINDOW (filesel),
-					      parent_window);
-		gtk_window_set_modal (GTK_WINDOW (filesel), TRUE);
-	}
-
-	gtk_widget_show(GTK_WIDGET(filesel));
-	g_free (file);
-}
-
-typedef struct ContactCopyProcess_ ContactCopyProcess;
-
-typedef void (*ContactCopyDone) (ContactCopyProcess *process);
-
-struct ContactCopyProcess_ {
-	int count;
-	GList *contacts;
-	EBook *source;
-	EBook *destination;
-	ContactCopyDone done_cb;
-};
-
-static void
-contact_deleted_cb (EBook* book, EBookStatus status, gpointer user_data)
-{
-	if (status != E_BOOK_ERROR_OK) {
-		eab_error_dialog (_("Error removing contact"), status);
-	}
-}
-
-static void
-do_delete (gpointer data, gpointer user_data)
-{
-	EBook *book = user_data;
-	EContact *contact = data;
-
-	e_book_async_remove_contact(book, contact, contact_deleted_cb, NULL);
-}
-
-static void
-delete_contacts (ContactCopyProcess *process)
-{
-	g_list_foreach (process->contacts,
-			do_delete,
-			process->source);
-}
-
-static void
-process_unref (ContactCopyProcess *process)
-{
-	process->count --;
-	if (process->count == 0) {
-		if (process->done_cb) {
-			process->done_cb (process);
-		}
-		e_free_object_list(process->contacts);
-		g_object_unref (process->source);
-		g_object_unref (process->destination);
-		g_free (process);
-	}
-}
-
-static void
-contact_added_cb (EBook* book, EBookStatus status, const char *id, gpointer user_data)
-{
-	ContactCopyProcess *process = user_data;
-
-	if (status != E_BOOK_ERROR_OK) {
-		eab_error_dialog (_("Error adding contact"), status);
-	} else {
-		process_unref (process);
-	}
-}
-
-static void
-do_copy (gpointer data, gpointer user_data)
-{
-	EBook *book;
-	EContact *contact;
-	ContactCopyProcess *process;
-
-	process = user_data;
-	contact = data;
-
-	book = process->destination;
-
-	process->count ++;
-	e_book_async_add_contact(book, contact, contact_added_cb, process);
-}
-
-static void
-got_book_cb (EBook *book, EBookStatus status, gpointer closure)
-{
-	ContactCopyProcess *process;
-	process = closure;
-	if (status == E_BOOK_ERROR_OK) {
-		process->destination = book;
-		g_object_ref (book);
-		g_list_foreach (process->contacts,
-				do_copy,
-				process);
-	}
-	process_unref (process);
-}
-
-void
-eab_transfer_contacts (EBook *source, GList *contacts /* adopted */, gboolean delete_from_source, GtkWindow *parent_window)
-{
-	EBook *dest;
-	ESource *destination_source;
-	static char *last_uid = NULL;
-	ContactCopyProcess *process;
-	char *desc;
-
-	if (contacts == NULL)
-		return;
-
-	if (last_uid == NULL)
-		last_uid = g_strdup ("");
-
-	if (contacts->next == NULL) {
-		if (delete_from_source)
-			desc = _("Move contact to");
-		else
-			desc = _("Copy contact to");
-	} else {
-		if (delete_from_source)
-			desc = _("Move contacts to");
-		else
-			desc = _("Copy contacts to");
-	}
-
-	destination_source = eab_select_source (desc, _("Select target addressbook."),
-						last_uid, parent_window);
-
-	if (!destination_source)
-		return;
-
-	if (strcmp (last_uid, e_source_peek_uid (destination_source)) != 0) {
-		g_free (last_uid);
-		last_uid = g_strdup (e_source_peek_uid (destination_source));
-	}
-
-	process = g_new (ContactCopyProcess, 1);
-	process->count = 1;
-	process->source = source;
-	g_object_ref (source);
-	process->contacts = contacts;
-	process->destination = NULL;
-
-	if (delete_from_source)
-		process->done_cb = delete_contacts;
-	else
-		process->done_cb = NULL;
-
-	dest = e_book_new (destination_source, NULL);
-	addressbook_load (dest, got_book_cb, process);
-}
-
-#include <Evolution-Composer.h>
-
-#define COMPOSER_OAFID "OAFIID:GNOME_Evolution_Mail_Composer:" BASE_VERSION
-
-typedef struct {
-	EContact *contact;
-	int email_num; /* if the contact is a person (not a list), the email address to use */
-} ContactAndEmailNum;
-
-static void
-eab_send_to_contact_and_email_num_list (GList *c)
-{
-	GNOME_Evolution_Composer composer_server;
-	CORBA_Environment ev;
-	GNOME_Evolution_Composer_RecipientList *to_list, *cc_list, *bcc_list;
-	CORBA_char *subject;
-	int to_i, bcc_i;
-	GList *iter;
-	gint to_length = 0, bcc_length = 0;
-
-	if (c == NULL)
-		return;
-
-	CORBA_exception_init (&ev);
-	
-	composer_server = bonobo_activation_activate_from_id (COMPOSER_OAFID, 0, NULL, &ev);
-
-	/* Figure out how many addresses of each kind we have. */
-	for (iter = c; iter != NULL; iter = g_list_next (iter)) {
-		ContactAndEmailNum *ce = iter->data;
-		EContact *contact = ce->contact;
-		GList *emails = e_contact_get (contact, E_CONTACT_EMAIL);
-		if (e_contact_get (contact, E_CONTACT_IS_LIST)) {
-			gint len = g_list_length (emails);
-			if (e_contact_get (contact, E_CONTACT_LIST_SHOW_ADDRESSES))
-				to_length += len;
-			else
-				bcc_length += len;
-		} else {
-			if (emails != NULL)
-				++to_length;
-		}
-		g_list_foreach (emails, (GFunc)g_free, NULL);
-		g_list_free (emails);
-	}
-
-	/* Now I have to make a CORBA sequences that represents a recipient list with
-	   the right number of entries, for the contacts. */
-	to_list = GNOME_Evolution_Composer_RecipientList__alloc ();
-	to_list->_maximum = to_length;
-	to_list->_length = to_length;
-	if (to_length > 0) {
-		to_list->_buffer = CORBA_sequence_GNOME_Evolution_Composer_Recipient_allocbuf (to_length);
-	}
-
-	cc_list = GNOME_Evolution_Composer_RecipientList__alloc ();
-	cc_list->_maximum = cc_list->_length = 0;
-		
-	bcc_list = GNOME_Evolution_Composer_RecipientList__alloc ();
-	bcc_list->_maximum = bcc_length;
-	bcc_list->_length = bcc_length;
-	if (bcc_length > 0) {
-		bcc_list->_buffer = CORBA_sequence_GNOME_Evolution_Composer_Recipient_allocbuf (bcc_length);
-	}
-
-	to_i = 0;
-	bcc_i = 0;
-	while (c != NULL) {
-		ContactAndEmailNum *ce = c->data;
-		EContact *contact = ce->contact;
-		int nth = ce->email_num;
-		char *name, *addr;
-		gboolean is_list, is_hidden;
-		GNOME_Evolution_Composer_Recipient *recipient;
-		GList *emails = e_contact_get (contact, E_CONTACT_EMAIL);
-		GList *iterator;
-
-		if (emails != NULL) {
-
-			is_list = (gboolean)e_contact_get (contact, E_CONTACT_IS_LIST);
-			is_hidden = is_list && !e_contact_get (contact, E_CONTACT_LIST_SHOW_ADDRESSES);
-
-			if (is_list) {
-				for (iterator = emails; iterator; iterator = iterator->next) {
-					
-					if (is_hidden) {
-						recipient = &(bcc_list->_buffer[bcc_i]);
-						++bcc_i;
-					} else {
-						recipient = &(to_list->_buffer[to_i]);
-						++to_i;
-					}
-					
-					name = NULL;
-					addr = NULL;
-					if (iterator && iterator->data) {
-						/* XXX we should probably try to get the name from the attribute parameter here.. */
-						addr = g_strdup ((char*)iterator->data);
-					}
-
-					recipient->name    = CORBA_string_dup (name ? name : "");
-					recipient->address = CORBA_string_dup (addr ? addr : "");
-					
-					g_free (name);
-					g_free (addr);
-				}
-			}
-			else {
-				EContactName *contact_name = e_contact_get (contact, E_CONTACT_NAME);
-				int length = g_list_length (emails);
-
-				if (is_hidden) {
-					recipient = &(bcc_list->_buffer[bcc_i]);
-					++bcc_i;
-				} else {
-					recipient = &(to_list->_buffer[to_i]);
-					++to_i;
-				}
-
-				if (nth >= length)
-					nth = 0;
-					
-				if (contact_name) {
-					name = e_contact_name_to_string (contact_name);
-					e_contact_name_free (contact_name);
-				}
-				else
-					name = NULL;
-
-				addr = g_strdup (g_list_nth_data (emails, nth));
-					
-
-				recipient->name    = CORBA_string_dup (name ? name : "");
-				recipient->address = CORBA_string_dup (addr ? addr : "");
-
-				g_free (name);
-				g_free (addr);
-			}
-
-			g_list_foreach (emails, (GFunc)g_free, NULL);
-			g_list_free (emails);
-		}
-
-		c = c->next;
-	}
-
-	subject = CORBA_string_dup ("");
-
-	GNOME_Evolution_Composer_setHeaders (composer_server, "", to_list, cc_list, bcc_list, subject, &ev);
-	if (ev._major != CORBA_NO_EXCEPTION) {
-		g_printerr ("gui/e-meeting-edit.c: I couldn't set the composer headers via CORBA! Aagh.\n");
-		CORBA_exception_free (&ev);
-		return;
-	}
-
-	CORBA_free (to_list);
-	CORBA_free (cc_list);
-	CORBA_free (bcc_list);
-	CORBA_free (subject);
-
-	GNOME_Evolution_Composer_show (composer_server, &ev);
-
-	if (ev._major != CORBA_NO_EXCEPTION) {
-		g_printerr ("gui/e-meeting-edit.c: I couldn't show the composer via CORBA! Aagh.\n");
-		CORBA_exception_free (&ev);
-		return;
-	}
-
-	CORBA_exception_free (&ev);
-}
-
-static void
-eab_send_contact_list_as_attachment (GList *contacts)
-{
-	GNOME_Evolution_Composer composer_server;
-	CORBA_Environment ev;
-	CORBA_char *content_type, *filename, *description;
-	GNOME_Evolution_Composer_AttachmentData *attach_data;
-	CORBA_boolean show_inline;
-	char *tempstr;
-	GNOME_Evolution_Composer_RecipientList *to_list, *cc_list, *bcc_list;
-	CORBA_char *subject;
-
-	if (contacts == NULL)
-		return;
-
-	CORBA_exception_init (&ev);
-	
-	composer_server = bonobo_activation_activate_from_id (COMPOSER_OAFID, 0, NULL, &ev);
-
-
-		
-	content_type = CORBA_string_dup ("text/x-vcard");
-	filename = CORBA_string_dup ("");
-
-	if (contacts->next) {
-		description = CORBA_string_dup (_("Multiple VCards"));
-	} else {
-		char *file_as = e_contact_get (E_CONTACT (contacts->data), E_CONTACT_FILE_AS);
-		tempstr = g_strdup_printf (_("VCard for %s"), file_as);
-		description = CORBA_string_dup (tempstr);
-		g_free (tempstr);
-		g_free (file_as);
-	}
-
-	show_inline = FALSE;
-
-	tempstr = eab_contact_list_to_string (contacts);
-	attach_data = GNOME_Evolution_Composer_AttachmentData__alloc();
-	attach_data->_maximum = attach_data->_length = strlen (tempstr);
-	attach_data->_buffer = CORBA_sequence_CORBA_char_allocbuf (attach_data->_length);
-	memcpy (attach_data->_buffer, tempstr, attach_data->_length);
-	g_free (tempstr);
-
-	GNOME_Evolution_Composer_attachData (composer_server, 
-					     content_type, filename, description,
-					     show_inline, attach_data,
-					     &ev);
-	
-	if (ev._major != CORBA_NO_EXCEPTION) {
-		g_printerr ("gui/e-meeting-edit.c: I couldn't attach data to the composer via CORBA! Aagh.\n");
-		CORBA_exception_free (&ev);
-		return;
-	}
-	
-	CORBA_free (content_type);
-	CORBA_free (filename);
-	CORBA_free (description);
-	CORBA_free (attach_data);
-
-	to_list = GNOME_Evolution_Composer_RecipientList__alloc ();
-	to_list->_maximum = to_list->_length = 0;
-		
-	cc_list = GNOME_Evolution_Composer_RecipientList__alloc ();
-	cc_list->_maximum = cc_list->_length = 0;
-
-	bcc_list = GNOME_Evolution_Composer_RecipientList__alloc ();
-	bcc_list->_maximum = bcc_list->_length = 0;
-
-	if (!contacts || contacts->next) {
-		subject = CORBA_string_dup ("Contact information");
-	} else {
-		EContact *contact = contacts->data;
-		const gchar *tempstr2;
-
-		tempstr2 = e_contact_get_const (contact, E_CONTACT_FILE_AS);
-		if (!tempstr2 || !*tempstr2)
-			tempstr2 = e_contact_get_const (contact, E_CONTACT_FULL_NAME);
-		if (!tempstr2 || !*tempstr2)
-			tempstr2 = e_contact_get_const (contact, E_CONTACT_ORG);
-		if (!tempstr2 || !*tempstr2)
-			tempstr2 = e_contact_get_const (contact, E_CONTACT_EMAIL_1);
-		if (!tempstr2 || !*tempstr2)
-			tempstr2 = e_contact_get_const (contact, E_CONTACT_EMAIL_2);
-		if (!tempstr2 || !*tempstr2)
-			tempstr2 = e_contact_get_const (contact, E_CONTACT_EMAIL_3);
-
-		if (!tempstr2 || !*tempstr2)
-			tempstr = g_strdup_printf ("Contact information");
-		else
-			tempstr = g_strdup_printf ("Contact information for %s", tempstr2);
-		subject = CORBA_string_dup (tempstr);
-		g_free (tempstr);
-	}
-		
-	GNOME_Evolution_Composer_setHeaders (composer_server, "", to_list, cc_list, bcc_list, subject, &ev);
-
-	CORBA_free (to_list);
-	CORBA_free (cc_list);
-	CORBA_free (bcc_list);
-	CORBA_free (subject);
-
-	GNOME_Evolution_Composer_show (composer_server, &ev);
-
-	if (ev._major != CORBA_NO_EXCEPTION) {
-		g_printerr ("gui/e-meeting-edit.c: I couldn't show the composer via CORBA! Aagh.\n");
-		CORBA_exception_free (&ev);
-		return;
-	}
-
-	CORBA_exception_free (&ev);
-}
-
-void
-eab_send_contact_list (GList *contacts, EABDisposition disposition)
-{
-	switch (disposition) {
-	case EAB_DISPOSITION_AS_TO: {
-		GList *list = NULL, *l;
-
-		for (l = contacts; l; l = l->next) {
-			ContactAndEmailNum *ce = g_new (ContactAndEmailNum, 1);
-			ce->contact = l->data;
-			ce->email_num = 0; /* hardcode this */
-
-			list = g_list_append (list, ce);
-		}
-
-		eab_send_to_contact_and_email_num_list (list);
-
-		g_list_foreach (list, (GFunc)g_free, NULL);
-		g_list_free (list);
-		break;
-	}
-	case EAB_DISPOSITION_AS_ATTACHMENT:
-		eab_send_contact_list_as_attachment (contacts);
-		break;
-	}
-}
-
-void
-eab_send_contact (EContact *contact, int email_num, EABDisposition disposition)
-{
-	GList *list = NULL;
-
-	switch (disposition) {
-	case EAB_DISPOSITION_AS_TO: {
-		ContactAndEmailNum ce;
-
-		ce.contact = contact;
-		ce.email_num = email_num;
-
-		list = g_list_prepend (NULL, &ce);
-		eab_send_to_contact_and_email_num_list (list);
-		break;
-	}
-	case EAB_DISPOSITION_AS_ATTACHMENT: {
-		list = g_list_prepend (NULL, contact);
-		eab_send_contact_list_as_attachment (list);
-		break;
-	}
-	}
-
-	g_list_free (list);
-}
-
-GtkWidget *
-eab_create_image_chooser_widget(gchar *name,
-				gchar *string1, gchar *string2,
-				gint int1, gint int2)
-{
-	char *filename;
-	GtkWidget *w = NULL;
-
-	w = e_image_chooser_new ();
-	gtk_widget_show_all (w);
-
-	if (string1) {
-		filename = e_icon_factory_get_icon_filename (string1, E_ICON_SIZE_DIALOG);
-
-		e_image_chooser_set_from_file (E_IMAGE_CHOOSER (w), filename);
-
-		g_free (filename);
-	}
-
-	return w;
-}
diff --git a/addressbook/gui/widgets/eab-gui-util.h b/addressbook/gui/widgets/eab-gui-util.h
deleted file mode 100644
index 4a3dffba0b..0000000000
--- a/addressbook/gui/widgets/eab-gui-util.h
+++ /dev/null
@@ -1,82 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-/* eab-gui-util.h
- * Copyright (C) 2001-2003  Ximian, Inc.
- * Author: Chris Toshok <toshok@ximian.com>
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of version 2 of the GNU General Public
- * License as published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * General Public License for more details.
- *
- * You should have received a copy of the GNU General Public
- * License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
- */
-#ifndef __E_ADDRESSBOOK_UTIL_H__
-#define __E_ADDRESSBOOK_UTIL_H__
-
-#include <gtk/gtkwindow.h>
-#include <libebook/e-book.h>
-#include "addressbook/gui/contact-editor/e-contact-editor.h"
-#include "addressbook/gui/contact-list-editor/e-contact-list-editor.h"
-
-G_BEGIN_DECLS
-
-void                eab_error_dialog              (const gchar *msg,
-						   EBookStatus  status);
-void                eab_load_error_dialog         (GtkWidget *parent,
-						   ESource *source,
-						   EBookStatus status);
-void                eab_search_result_dialog      (GtkWidget *parent,
-						   EBookViewStatus status);
-gint                eab_prompt_save_dialog        (GtkWindow   *parent);
-
-EContactEditor     *eab_show_contact_editor       (EBook       *book,
-						   EContact    *contact,
-						   gboolean     is_new_contact,
-						   gboolean     editable);
-EContactListEditor *eab_show_contact_list_editor  (EBook       *book,
-						   EContact    *contact,
-						   gboolean     is_new_contact,
-						   gboolean     editable);
-void                eab_show_multiple_contacts    (EBook       *book,
-						   GList       *list,
-						   gboolean     editable);
-void                eab_transfer_contacts         (EBook       *source,
-						   GList       *contacts, /* adopted */
-						   gboolean     delete_from_source,
-						   GtkWindow   *parent_window);
-
-void                eab_contact_save              (char *title,
-						   EContact *contact,
-						   GtkWindow *parent_window);
-
-void                eab_contact_list_save         (char *title,
-						   GList *list,
-						   GtkWindow *parent_window);
-
-typedef enum {
-	EAB_DISPOSITION_AS_ATTACHMENT,
-	EAB_DISPOSITION_AS_TO,
-} EABDisposition;
-
-void                eab_send_contact              (EContact       *contact,
-						   int             email_num,
-						   EABDisposition  disposition);
-void                eab_send_contact_list         (GList          *contacts,
-						   EABDisposition  disposition);
-
-GtkWidget *eab_create_image_chooser_widget (gchar *name, gchar *string1, gchar *string2, gint int1, gint int2);
-
-
-ESource            *eab_select_source             (const gchar *title, const gchar *message,
-						   const gchar *select_uid, GtkWindow *parent);
-
-G_END_DECLS
-
-#endif /* __E_ADDRESSBOOK_UTIL_H__ */
diff --git a/addressbook/gui/widgets/eab-marshal.list b/addressbook/gui/widgets/eab-marshal.list
deleted file mode 100644
index 2b34707dbb..0000000000
--- a/addressbook/gui/widgets/eab-marshal.list
+++ /dev/null
@@ -1,11 +0,0 @@
-INT:POINTER
-NONE:NONE
-NONE:BOOL
-NONE:POINTER
-NONE:OBJECT
-NONE:ENUM
-NONE:INT,INT
-NONE:INT
-NONE:UINT
-NONE:DOUBLE
-INT:POINTER
diff --git a/addressbook/gui/widgets/eab-menu.c b/addressbook/gui/widgets/eab-menu.c
deleted file mode 100644
index fd6c94c81e..0000000000
--- a/addressbook/gui/widgets/eab-menu.c
+++ /dev/null
@@ -1,258 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-/*
- *  Authors: Michael Zucchi <notzed@ximian.com>
- *
- *  Copyright 2004 Ximian, Inc. (www.ximian.com)
- *
- *  This program is free software; you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation; either version 2 of the License, or
- *  (at your option) any later version.
- *
- *  This program is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with this program; if not, write to the Free Software
- *  Foundation, Inc., 59 Temple Street #330, Boston, MA 02111-1307, USA.
- *
- */
-
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
-
-#include <string.h>
-#include <stdlib.h>
-
-#include <glib.h>
-
-#include <libebook/e-contact.h>
-
-#include "eab-menu.h"
-
-static void eabm_standard_menu_factory(EMenu *emp, void *data);
-
-static GObjectClass *eabm_parent;
-
-static void
-eabm_init(GObject *o)
-{
-	/*EABMenu *emp = (EABMenu *)o; */
-}
-
-static void
-eabm_finalise(GObject *o)
-{
-	((GObjectClass *)eabm_parent)->finalize(o);
-}
-
-static void
-eabm_target_free(EMenu *ep, EMenuTarget *t)
-{
-	switch (t->type) {
-	case EAB_MENU_TARGET_SELECT: {
-		EABMenuTargetSelect *s = (EABMenuTargetSelect *)t;
-		int i;
-
-		for (i=0;i<s->cards->len;i++)
-			g_object_unref(s->cards->pdata[i]);
-		g_ptr_array_free(s->cards, TRUE);
-		if (s->book)
-			g_object_unref(s->book);
-		break; }
-	}
-
-	((EMenuClass *)eabm_parent)->target_free(ep, t);
-}
-
-static void
-eabm_class_init(GObjectClass *klass)
-{
-	klass->finalize = eabm_finalise;
-	((EMenuClass *)klass)->target_free = eabm_target_free;
-
-	e_menu_class_add_factory((EMenuClass *)klass, NULL, (EMenuFactoryFunc)eabm_standard_menu_factory, NULL);
-}
-
-GType
-eab_menu_get_type(void)
-{
-	static GType type = 0;
-
-	if (type == 0) {
-		static const GTypeInfo info = {
-			sizeof(EABMenuClass),
-			NULL, NULL,
-			(GClassInitFunc)eabm_class_init,
-			NULL, NULL,
-			sizeof(EABMenu), 0,
-			(GInstanceInitFunc)eabm_init
-		};
-		eabm_parent = g_type_class_ref(e_menu_get_type());
-		type = g_type_register_static(e_menu_get_type(), "EABMenu", &info, 0);
-	}
-
-	return type;
-}
-
-EABMenu *eab_menu_new(const char *menuid)
-{
-	EABMenu *emp = g_object_new(eab_menu_get_type(), 0);
-
-	e_menu_construct(&emp->menu, menuid);
-
-	return emp;
-}
-
-/**
- * eab_menu_target_new_select - create a menu target of the current selection.
- * @eabp: Address book menu.
- * @book: Book the cards belong to.  May be NULL in which case cards must be an empty GPtrArray.
- * @readonly: Book is read-only mode.  FIXME: Why can't we just get this off the book?
- * @cards: Cards selected.  This will be freed on completion and the array indices unreferenced.
- *
- * Create a new selection menu target.
- * 
- * Return value: 
- **/
-EABMenuTargetSelect *
-eab_menu_target_new_select(EABMenu *eabp, struct _EBook *book, int readonly, GPtrArray *cards)
-{
-	EABMenuTargetSelect *t = e_menu_target_new(&eabp->menu, EAB_MENU_TARGET_SELECT, sizeof(*t));
-	guint32 mask = ~0;
-	int has_email = FALSE, i;
-
-	/* FIXME: duplicated in eab-popup.c */
-
-	t->book = book;
-	if (book)
-		g_object_ref(book);
-	t->cards = cards;
-
-	for (i=0;i<cards->len && !has_email;i++) {
-		EContact *contact = cards->pdata[i];
-		GList *email;
-
-		email = e_contact_get(E_CONTACT(contact), E_CONTACT_EMAIL);
-		if (email) {
-			has_email = TRUE;
-			
-			g_list_foreach(email, (GFunc)g_free, NULL);
-			g_list_free(email);
-		}
-	}
-
-	if (has_email)
-		mask &= ~EAB_MENU_SELECT_EMAIL;
-
-	if (!readonly)
-		mask &= ~EAB_MENU_SELECT_EDITABLE;
-
-	if (cards->len == 1)
-		mask &= ~EAB_MENU_SELECT_ONE;
-
-	if (cards->len > 1)
-		mask &= ~EAB_MENU_SELECT_MANY;
-
-	if (cards->len >= 1)
-		mask &= ~EAB_MENU_SELECT_ANY;
-
-	t->target.mask = mask;
-
-	return t;
-}
-
-static void
-eabm_standard_menu_factory(EMenu *emp, void *data)
-{
-	/* noop */
-}
-
-/* ********************************************************************** */
-
-/* menu plugin handler */
-
-/*
-<e-plugin
-  class="org.gnome.mail.plugin.popup:1.0"
-  id="org.gnome.mail.plugin.popup.item:1.0"
-  type="shlib"
-  location="/opt/gnome2/lib/camel/1.0/libcamelimap.so"
-  name="imap"
-  description="IMAP4 and IMAP4v1 mail store">
-  <hook class="org.gnome.mail.popupMenu:1.0"
-        handler="HandlePopup">
-  <menu id="any" target="select">
-   <item
-    type="item|toggle|radio|image|submenu|bar"
-    active
-    path="foo/bar"
-    label="label"
-    icon="foo"
-    mask="select_one"
-    activate="eabm_view_emacs"/>
-  </menu>
-  </extension>
-
-*/
-
-static void *eabmph_parent_class;
-#define eabmph ((EABMenuHook *)eph)
-
-static const EMenuHookTargetMask eabmph_select_masks[] = {
-	{ "one", EAB_MENU_SELECT_ONE },
-	{ "many", EAB_MENU_SELECT_MANY },
-	{ "any", EAB_MENU_SELECT_ANY },
-	{ "editable", EAB_MENU_SELECT_EDITABLE },
-	{ "email", EAB_MENU_SELECT_EMAIL },
-	{ 0 }
-};
-
-static const EMenuHookTargetMap eabmph_targets[] = {
-	{ "select", EAB_MENU_TARGET_SELECT, eabmph_select_masks },
-	{ 0 }
-};
-
-static void
-eabmph_finalise(GObject *o)
-{
-	/*EPluginHook *eph = (EPluginHook *)o;*/
-
-	((GObjectClass *)eabmph_parent_class)->finalize(o);
-}
-
-static void
-eabmph_class_init(EPluginHookClass *klass)
-{
-	int i;
-
-	((GObjectClass *)klass)->finalize = eabmph_finalise;
-	((EPluginHookClass *)klass)->id = "org.gnome.evolution.addressbook.bonobomenu:1.0";
-
-	for (i=0;eabmph_targets[i].type;i++)
-		e_menu_hook_class_add_target_map((EMenuHookClass *)klass, &eabmph_targets[i]);
-
-	/* FIXME: leaks parent set class? */
-	((EMenuHookClass *)klass)->menu_class = g_type_class_ref(eab_menu_get_type());
-}
-
-GType
-eab_menu_hook_get_type(void)
-{
-	static GType type = 0;
-	
-	if (!type) {
-		static const GTypeInfo info = {
-			sizeof(EABMenuHookClass), NULL, NULL, (GClassInitFunc) eabmph_class_init, NULL, NULL,
-			sizeof(EABMenuHook), 0, (GInstanceInitFunc) NULL,
-		};
-
-		eabmph_parent_class = g_type_class_ref(e_menu_hook_get_type());
-		type = g_type_register_static(e_menu_hook_get_type(), "EABMenuHook", &info, 0);
-	}
-	
-	return type;
-}
diff --git a/addressbook/gui/widgets/eab-menu.h b/addressbook/gui/widgets/eab-menu.h
deleted file mode 100644
index 0427d43fe1..0000000000
--- a/addressbook/gui/widgets/eab-menu.h
+++ /dev/null
@@ -1,109 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*-
- *
- *  Authors: Michel Zucchi <notzed@ximian.com>
- *
- *  Copyright 2004 Novell Inc. (www.novell.com)
- *
- *  This program is free software; you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation; either version 2 of the License, or
- *  (at your option) any later version.
- *
- *  This program is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with this program; if not, write to the Free Software
- *  Foundation, Inc., 59 Temple Street #330, Boston, MA 02111-1307, USA.
- *
- */
-
-#ifndef __EAB_MENU_H__
-#define __EAB_MENU_H__
-
-#include <glib-object.h>
-
-#include "e-util/e-menu.h"
-
-#ifdef __cplusplus
-extern "C" {
-#pragma }
-#endif /* __cplusplus */
-
-struct _EBook;
-
-typedef struct _EABMenu EABMenu;
-typedef struct _EABMenuClass EABMenuClass;
-
-/* Current target description */
-enum _eab_menu_target_t {
-	EAB_MENU_TARGET_SELECT,
-};
-
-/**
- * enum _eab_menu_target_select_t - EABMenuTargetSelect qualifiers.
- * 
- * @EAB_MENU_SELECT_ONE: Only one item is selected.
- * @EAB_MENU_SELECT_MANY: More than one item selected.
- * @EAB_MENU_SELECT_ANY: One or more items selected.
- * @EAB_MENU_SELECT_EDITABLE: Editable addressbook.
- * @EAB_MENU_SELECT_EMAIL: Has an email address.
- **/
-enum _eab_menu_target_select_t {
-	EAB_MENU_SELECT_ONE = 1<<0,
-	EAB_MENU_SELECT_MANY = 1<<1,
-	EAB_MENU_SELECT_ANY = 1<<2,
-	EAB_MENU_SELECT_EDITABLE = 1<<3,
-	EAB_MENU_SELECT_EMAIL = 1<<4,
-};
-
-typedef struct _EABMenuTargetSelect EABMenuTargetSelect;
-
-struct _EABMenuTargetSelect {
-	EMenuTarget target;
-
-	struct _EBook *book;
-	GPtrArray *cards;
-};
-
-typedef struct _EMenuItem EABMenuItem;
-
-/* The object */
-struct _EABMenu {
-	EMenu menu;
-
-	struct _EABMenuPrivate *priv;
-};
-
-struct _EABMenuClass {
-	EMenuClass menu_class;
-};
-
-GType eab_menu_get_type(void);
-
-EABMenu *eab_menu_new(const char *menuid);
-
-EABMenuTargetSelect *eab_menu_target_new_select(EABMenu *eabp, struct _EBook *book, int readonly, GPtrArray *cards);
-
-/* ********************************************************************** */
-
-typedef struct _EABMenuHook EABMenuHook;
-typedef struct _EABMenuHookClass EABMenuHookClass;
-
-struct _EABMenuHook {
-	EMenuHook hook;
-};
-
-struct _EABMenuHookClass {
-	EMenuHookClass hook_class;
-};
-
-GType eab_menu_hook_get_type(void);
-
-#ifdef __cplusplus
-}
-#endif /* __cplusplus */
-
-#endif /* __EAB_MENU_H__ */
diff --git a/addressbook/gui/widgets/eab-popup-control.c b/addressbook/gui/widgets/eab-popup-control.c
deleted file mode 100644
index 6b114a9950..0000000000
--- a/addressbook/gui/widgets/eab-popup-control.c
+++ /dev/null
@@ -1,1206 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-
-/*
- * eab-popup-control.c
- *
- * Copyright (C) 2001-2003, Ximian, Inc.
- *
- * Authors: Jon Trowbridge <trow@ximian.com>
- *          Chris Toshok <toshok@ximian.com>
- */
-
-/*
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of version 2 of the GNU General Public
- * License as published by the Free Software Foundation.
- * 
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- * 
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
- * USA.
- */
-
-/*
- * This file is too big and this widget is too complicated.  Forgive me.
- */
-
-#include <config.h>
-#include <string.h>
-#include "addressbook.h"
-#include "eab-popup-control.h"
-#include <gtk/gtkbutton.h>
-#include <gtk/gtkcellrenderertext.h>
-#include <gtk/gtkframe.h>
-#include <gtk/gtkhbbox.h>
-#include <gtk/gtkhseparator.h>
-#include <gtk/gtklabel.h>
-#include <gtk/gtkoptionmenu.h>
-#include <gtk/gtkstock.h>
-#include <gtk/gtktable.h>
-#include <gtk/gtktreeselection.h>
-#include <gtk/gtktreeview.h>
-#include <gtk/gtkvbox.h>
-#include <bonobo/bonobo-control.h>
-#include <bonobo/bonobo-property-bag.h>
-#include <bonobo/bonobo-generic-factory.h>
-#include <addressbook/util/eab-book-util.h>
-#include <addressbook/gui/contact-editor/e-contact-editor.h>
-#include <addressbook/gui/contact-editor/e-contact-quick-add.h>
-#include <addressbook/gui/widgets/eab-contact-display.h>
-#include <addressbook/gui/widgets/eab-gui-util.h>
-#include "e-util/e-gui-utils.h"
-
-static void eab_popup_control_set_name (EABPopupControl *pop, const gchar *name);
-static void eab_popup_control_set_email (EABPopupControl *pop, const gchar *email);
-
-/*
- * Some general scaffolding for our widgets.  Think of this as a really, really
- * lame implementation of a wizard (...which is still somewhat more general that
- * we really need it to be).
- */
-
-typedef struct _MiniWizard MiniWizard;
-struct _MiniWizard {
-	GtkWidget *body;
-
-	GtkWidget *vbox;
-	GtkWidget *ok_button;
-	GtkWidget *cancel_button;
-
-	void (*ok_cb) (MiniWizard *, gpointer);
-	void (*cleanup_cb) (gpointer);
-	gpointer closure;
-
-	void (*destroy_cb) (MiniWizard *, gpointer);
-	gpointer destroy_closure;
-};
-
-static void
-mini_wizard_container_add (MiniWizard *wiz, GtkWidget *w)
-{
-	GList *iter = gtk_container_get_children (GTK_CONTAINER (wiz->vbox));
-	while (iter != NULL) {
-		GtkWidget *oldw = (GtkWidget *) iter->data;
-		iter = g_list_next (iter);
-		gtk_container_remove (GTK_CONTAINER (wiz->vbox), oldw);
-	}
-	gtk_container_add (GTK_CONTAINER (wiz->vbox), w);
-}
-
-static void
-mini_wizard_destroy (MiniWizard *wiz)
-{
-	if (wiz->cleanup_cb)
-		wiz->cleanup_cb (wiz->closure);
-	wiz->cleanup_cb = NULL;
-
-	if (wiz->destroy_cb)
-		wiz->destroy_cb (wiz, wiz->destroy_closure);
-}
-
-static void
-mini_wizard_ok_cb (GtkWidget *b, gpointer closure)
-{
-	MiniWizard *wiz = (MiniWizard *) closure;
-
-	gpointer old_closure = wiz->closure;
-	void (*old_cleanup) (gpointer) = wiz->cleanup_cb;
-
-	wiz->cleanup_cb = NULL;
-
-	if (wiz->ok_cb)
-		wiz->ok_cb (wiz, wiz->closure);
-
-	if (old_cleanup)
-		old_cleanup (old_closure);
-
-}
-
-static void
-mini_wizard_cancel_cb (GtkWidget *b, gpointer closure)
-{
-	mini_wizard_destroy ((MiniWizard *) closure);
-}
-
-static void
-mini_wizard_destroy_cb (gpointer closure, GObject *where_object_was)
-{
-	MiniWizard *wiz = (MiniWizard *) closure;
-	if (wiz->cleanup_cb)
-		wiz->cleanup_cb (wiz->closure);
-	g_free (wiz);
-}
-
-static MiniWizard *
-mini_wizard_new (void)
-{
-	MiniWizard *wiz = g_new (MiniWizard, 1);
-	GtkWidget *bbox;
-
-	wiz->body          = gtk_vbox_new (FALSE, 2);
-	wiz->vbox          = gtk_vbox_new (FALSE, 2);
-	wiz->ok_button     = gtk_button_new_from_stock (GTK_STOCK_OK);
-	wiz->cancel_button = gtk_button_new_from_stock (GTK_STOCK_CANCEL);
-
-	wiz->ok_cb      = NULL;
-	wiz->cleanup_cb = NULL;
-	wiz->closure    = NULL;
-
-	wiz->destroy_cb      = NULL;
-	wiz->destroy_closure = NULL;
-
-	bbox = gtk_hbutton_box_new ();
-	gtk_button_box_set_layout (GTK_BUTTON_BOX (bbox),
-				   GTK_BUTTONBOX_END);
-
-	gtk_box_pack_start (GTK_BOX (bbox), wiz->cancel_button, FALSE, TRUE, 0);
-	gtk_box_pack_start (GTK_BOX (bbox), wiz->ok_button, FALSE, TRUE, 0);
-
-	gtk_box_set_spacing (GTK_BOX (bbox),
-			     10 /* ugh */);
-
-	gtk_box_pack_start (GTK_BOX (wiz->body), wiz->vbox, TRUE, TRUE, 2);
-	gtk_box_pack_start (GTK_BOX (wiz->body), gtk_hseparator_new (), FALSE, TRUE, 2);
-	gtk_box_pack_start (GTK_BOX (wiz->body), bbox, FALSE, TRUE, 2);
-
-	gtk_widget_show_all (wiz->body);
-
-	g_signal_connect (wiz->ok_button,
-			  "clicked",
-			  G_CALLBACK (mini_wizard_ok_cb),
-			  wiz);
-	g_signal_connect (wiz->cancel_button,
-			  "clicked",
-			  G_CALLBACK (mini_wizard_cancel_cb),
-			  wiz);
-
-	g_object_weak_ref (G_OBJECT (wiz->body),
-			   mini_wizard_destroy_cb,
-			   wiz);
-
-	return wiz;
-	
-}
-
-
-
-/*
- * This is the code for the UI thingie that lets you manipulate the e-mail
- * addresses (and *only* the e-mail addresses) associated with an existing
- * contact.
- */
-
-#define EMPTY_ENTRY _("(none)")
-
-typedef struct _EMailMenu EMailMenu;
-struct _EMailMenu {
-	GtkWidget *option_menu;
-	GList *options;
-	gchar *current_selection;
-};
-
-static void
-email_menu_free (EMailMenu *menu)
-{
-	if (menu == NULL)
-		return;
-
-	g_list_foreach (menu->options, (GFunc) g_free, NULL);
-	g_list_free (menu->options);
-	g_free (menu);
-}
-
-static EMailMenu *
-email_menu_new (void)
-{
-	EMailMenu *menu = g_new (EMailMenu, 1);
-
-	menu->option_menu = gtk_option_menu_new ();
-	menu->options = NULL;
-	menu->current_selection = NULL;
-
-	gtk_option_menu_set_menu (GTK_OPTION_MENU (menu->option_menu), gtk_menu_new ());
-
-	return menu;
-}
-
-static void
-menu_activate_cb (GtkWidget *w, gpointer closure)
-{
-	EMailMenu *menu = (EMailMenu *) closure;
-	gchar *addr = (gchar *) g_object_get_data (G_OBJECT (w), "addr");
-
-	menu->current_selection = addr;
-}
-
-static void
-email_menu_add_option (EMailMenu *menu, char *addr)
-{
-	GtkWidget *menu_item;
-
-	g_return_if_fail (menu != NULL);
-	if (!addr || !*addr)
-		return;
-
-	menu->options = g_list_append (menu->options, addr);
-
-	menu_item = gtk_menu_item_new_with_label (addr);
-	g_object_set_data (G_OBJECT (menu_item), "addr", addr);
-	gtk_widget_show_all (menu_item);
-	gtk_menu_shell_append (GTK_MENU_SHELL (gtk_option_menu_get_menu (GTK_OPTION_MENU (menu->option_menu))), menu_item);
-
-	g_signal_connect (menu_item,
-			  "activate",
-			  G_CALLBACK (menu_activate_cb),
-			  menu);
-}
-
-static void
-email_menu_add_options_from_contact (EMailMenu *menu, EContact *contact, const gchar *extra_addr)
-{
-	g_return_if_fail (contact && E_IS_CONTACT (contact));
-
-	/* If any of these three e-mail fields are NULL, email_menu_add_option will just
-	   return without doing anything. */
-	email_menu_add_option (menu, e_contact_get (contact, E_CONTACT_EMAIL_1));
-	email_menu_add_option (menu, e_contact_get (contact, E_CONTACT_EMAIL_2));
-	email_menu_add_option (menu, e_contact_get (contact, E_CONTACT_EMAIL_3));
-	email_menu_add_option (menu, g_strdup (extra_addr));
-	email_menu_add_option (menu, g_strdup (EMPTY_ENTRY));
-}
-
-static void
-email_menu_set_option (EMailMenu *menu, const gchar *addr)
-{
-	guint count = 0;
-	GList *iter;
-
-	g_return_if_fail (menu != NULL);
-
-	if (addr == NULL) {
-		email_menu_set_option (menu, EMPTY_ENTRY);
-		return;
-	}
-
-	iter = menu->options;
-	while (iter && strcmp (addr, (gchar *) iter->data)) {
-		++count;
-		iter = g_list_next (iter);
-	}
-
-	if (iter) {
-		gtk_option_menu_set_history (GTK_OPTION_MENU (menu->option_menu), count);
-		menu->current_selection = (gchar *) iter->data;
-	} 
-}
-
-typedef struct _EMailTable EMailTable;
-struct _EMailTable {
-	GtkWidget *table;
-	EContact *contact;
-	EMailMenu *primary;
-	EMailMenu *email2;
-	EMailMenu *email3;
-};
-
-static void
-email_table_cleanup_cb (gpointer closure)
-{
-	EMailTable *et = (EMailTable *) closure;
-
-	if (et == NULL)
-		return;
-
-	g_object_unref (et->contact);
-	email_menu_free (et->primary);
-	email_menu_free (et->email2);
-	email_menu_free (et->email3);
-
-	g_free (et);
-}
-
-static void
-email_table_from_contact (EMailTable *et)
-{
-	g_return_if_fail (et != NULL);
-
-	email_menu_set_option (et->primary, e_contact_get_const (et->contact, E_CONTACT_EMAIL_1));
-	email_menu_set_option (et->email2,  e_contact_get_const (et->contact, E_CONTACT_EMAIL_2));
-	email_menu_set_option (et->email3,  e_contact_get_const (et->contact, E_CONTACT_EMAIL_3));
-}
-
-static void
-email_table_to_contact (EMailTable *et)
-{
-	gchar *curr;
-
-	g_return_if_fail (et != NULL);
-
-	curr = et->primary->current_selection;
-	if (curr && !strcmp (curr, _(EMPTY_ENTRY)))
-		curr = NULL;
-	e_contact_set (et->contact, E_CONTACT_EMAIL_1, curr);
-
-	curr = et->email2->current_selection;
-	if (curr && !strcmp (curr, _(EMPTY_ENTRY)))
-		curr = NULL;
-	e_contact_set (et->contact, E_CONTACT_EMAIL_2, curr);
-
-	curr = et->email3->current_selection;
-	if (curr && !strcmp (curr, _(EMPTY_ENTRY)))
-		curr = NULL;
-	e_contact_set (et->contact, E_CONTACT_EMAIL_3, curr);
-}
-
-static void
-email_table_save_contact_cb (EBook *book, EBookStatus status, gpointer closure)
-{
-	EContact *contact = E_CONTACT (closure);
-
-	if (status == E_BOOK_ERROR_OK) {
-		e_book_async_commit_contact (book, contact, NULL, NULL);
-	}
-	if (book)
-		g_object_unref (book);
-	g_object_unref (contact);
-}
-
-static void
-email_table_ok_cb (MiniWizard *wiz, gpointer closure)
-{
-	EMailTable *et = (EMailTable *) closure;
-
-	email_table_to_contact (et);
-
-	g_object_ref (et->contact);
-
-	addressbook_load_default_book (email_table_save_contact_cb, et->contact);
-
-	mini_wizard_destroy (wiz);
-}
-
-static void
-email_table_init (MiniWizard *wiz, EContact *contact, const gchar *extra_address)
-{
-	EMailTable *et;
-
-	gchar *name_str;
-	gint xpad, ypad;
-	GtkAttachOptions label_x_opts, label_y_opts;
-	GtkAttachOptions menu_x_opts, menu_y_opts;
-
-	g_return_if_fail (contact && E_IS_CONTACT (contact));
-
-	et = g_new (EMailTable, 1);
-
-	et->contact = contact;
-	g_object_ref (et->contact);
-
-	et->table = gtk_table_new (4, 2, FALSE);
-
-	et->primary = email_menu_new ();
-	et->email2  = email_menu_new ();
-	et->email3  = email_menu_new ();
-
-	email_menu_add_options_from_contact (et->primary, et->contact, extra_address);
-	email_menu_add_options_from_contact (et->email2,  et->contact, extra_address);
-	email_menu_add_options_from_contact (et->email3,  et->contact, extra_address);
-
-	email_table_from_contact (et);
-
-	label_x_opts = GTK_FILL;
-	label_y_opts = GTK_FILL;
-	menu_x_opts = GTK_EXPAND | GTK_FILL;
-	menu_y_opts = GTK_EXPAND | GTK_FILL;
-	xpad = 3;
-	ypad = 3;
-
-	name_str = e_contact_get (et->contact, E_CONTACT_FULL_NAME);
-	gtk_table_attach (GTK_TABLE (et->table),
-			  gtk_label_new (name_str),
-			  0, 2, 0, 1, 
-			  label_x_opts, label_y_opts, xpad, ypad);
-	g_free (name_str);
-
-	gtk_table_attach (GTK_TABLE (et->table),
-			  gtk_label_new (_("Primary Email")),
-			  0, 1, 1, 2, 
-			  label_x_opts, label_y_opts, xpad, ypad);
-
-	gtk_table_attach (GTK_TABLE (et->table),
-			  et->primary->option_menu,
-			  1, 2, 1, 2, 
-			  menu_x_opts, menu_y_opts, xpad, ypad);
-
-	gtk_table_attach (GTK_TABLE (et->table),
-			  gtk_label_new (_("Email 2")),
-			  0, 1, 2, 3,
-			  label_x_opts, label_y_opts, xpad, ypad);
-
-	gtk_table_attach (GTK_TABLE (et->table),
-			  et->email2->option_menu,
-			  1, 2, 2, 3,
-			  menu_x_opts, menu_y_opts, xpad, ypad);
-
-	gtk_table_attach (GTK_TABLE (et->table),
-			  gtk_label_new (_("Email 3")),
-			  0, 1, 3, 4,
-			  label_x_opts, label_y_opts, xpad, ypad);
-
-	gtk_table_attach (GTK_TABLE (et->table),
-			  et->email3->option_menu,
-			  1, 2, 3, 4,
-			  menu_x_opts, menu_y_opts, xpad, ypad);
-
-	gtk_widget_show_all (et->primary->option_menu);
-	gtk_widget_show_all (et->email2->option_menu);
-	gtk_widget_show_all (et->email3->option_menu);
-
-	gtk_widget_show_all (et->table);
-	mini_wizard_container_add (wiz, et->table);
-	wiz->ok_cb      = email_table_ok_cb;
-	wiz->cleanup_cb = email_table_cleanup_cb;
-	wiz->closure    = et;
-}
-
-/*
- * This code is for the little UI thing that lets you pick from a set of contacts
- * and decide which one you want to add the e-mail address to.
- */
-
-typedef struct _ContactPicker ContactPicker;
-struct _ContactPicker {
-	GtkWidget *body;
-	GtkWidget *list;
-	GtkListStore *model;
-	GList *contacts;
-	gchar *new_name;
-	gchar *new_email;
-
-	EContact *current_contact;
-};
-
-enum {
-	COLUMN_ACTION,
-	COLUMN_CONTACT
-};
-
-static void
-contact_picker_selection_changed (GtkTreeSelection *selection, gpointer closure)
-{
-	MiniWizard *wiz = (MiniWizard *) closure;
-	ContactPicker *pick = (ContactPicker *) wiz->closure;
-	gboolean selected;
-	GtkTreeIter iter;
-
-	selected = gtk_tree_selection_get_selected (selection, NULL, &iter);
-
-	gtk_widget_set_sensitive (wiz->ok_button, selected);
-
-	if (selected) {
-		gtk_tree_model_get (GTK_TREE_MODEL (pick->model), &iter,
-				    COLUMN_CONTACT, &pick->current_contact,
-				    -1);
-	}
-	else {
-		pick->current_contact = NULL;
-	}
-}
-
-static void
-contact_picker_ok_cb (MiniWizard *wiz, gpointer closure)
-{
-	ContactPicker *pick = (ContactPicker *) closure;
-
-	if (pick->current_contact == NULL) {
-		e_contact_quick_add (pick->new_name, pick->new_email, NULL, NULL);
-		mini_wizard_destroy (wiz);
-	} else {
-		email_table_init (wiz, pick->current_contact, pick->new_email);
-	}
-}
-
-static void
-contact_picker_cleanup_cb (gpointer closure)
-{
-	ContactPicker *pick = (ContactPicker *) closure;
-
-	g_list_foreach (pick->contacts, (GFunc) g_object_unref, NULL);
-	g_list_free (pick->contacts);
-
-	g_free (pick->new_name);
-	g_free (pick->new_email);
-}
-
-static void
-free_str (gpointer      data,
-	  GObject      *where_the_object_was)
-{
-	g_free (data);
-}
-
-static void
-contact_picker_init (MiniWizard *wiz, const GList *contacts, const gchar *new_name, const gchar *new_email)
-{
-	ContactPicker *pick;
-	gchar *str;
-	GtkWidget *w;
-	GtkTreeIter iter;
-
-	pick = g_new (ContactPicker, 1);
-
-	pick->body  = gtk_vbox_new (FALSE, 2);
-
-	pick->model = gtk_list_store_new (2, G_TYPE_STRING, G_TYPE_POINTER);
-
-	pick->list = gtk_tree_view_new_with_model (GTK_TREE_MODEL (pick->model));
-
-	gtk_tree_view_set_headers_visible (GTK_TREE_VIEW (pick->list), TRUE);
-
-	gtk_tree_view_insert_column_with_attributes (GTK_TREE_VIEW (pick->list),
-						     COLUMN_ACTION,
-						     _("Select an Action"),
-						     gtk_cell_renderer_text_new (),
-						     "text", COLUMN_ACTION,
-						     NULL);
-
-	gtk_tree_selection_set_mode (gtk_tree_view_get_selection (GTK_TREE_VIEW (pick->list)),
-				     GTK_SELECTION_SINGLE);
-
-	str = g_strdup_printf (_("Create a new contact \"%s\""), new_name);
-	gtk_list_store_append (pick->model, &iter);
-	gtk_list_store_set (pick->model, &iter,
-			    COLUMN_ACTION, str,
-			    COLUMN_CONTACT, NULL,
-			    -1);
-	g_object_weak_ref (G_OBJECT (pick->model), free_str, str);
-
-	pick->contacts = NULL;
-	while (contacts) {
-		EContact *contact = (EContact *) contacts->data;
-		gchar *name_str = e_contact_get (contact, E_CONTACT_FULL_NAME);
-
-		pick->contacts = g_list_append (pick->contacts, contact);
-		g_object_ref (contact);
-
-		str = g_strdup_printf (_("Add address to existing contact \"%s\""), name_str);
-		gtk_list_store_append (pick->model, &iter);
-		gtk_list_store_set (pick->model, &iter,
-				    COLUMN_ACTION, str,
-				    COLUMN_CONTACT, contact,
-				    -1);
-		g_free (name_str);
-
-		g_object_weak_ref (G_OBJECT (pick->model), free_str, str);
-
-		contacts = g_list_next (contacts);
-	}
-
-	pick->new_name  = g_strdup (new_name);
-	pick->new_email = g_strdup (new_email);
-
-	pick->current_contact = NULL;
-	gtk_widget_set_sensitive (wiz->ok_button, FALSE);
-
-	/* Connect some signals & callbacks */
-
-	wiz->ok_cb      = contact_picker_ok_cb;
-	wiz->cleanup_cb = contact_picker_cleanup_cb;
-
-	g_signal_connect (gtk_tree_view_get_selection (GTK_TREE_VIEW (pick->list)),
-			  "changed", G_CALLBACK (contact_picker_selection_changed),
-			  wiz);
-
-	/* Build our widget */
-
-	w = gtk_label_new (new_email);
-	gtk_box_pack_start (GTK_BOX (pick->body), w, FALSE, TRUE, 3);
-
-	gtk_box_pack_start (GTK_BOX (pick->body), pick->list, TRUE, TRUE, 2);
-	gtk_widget_show_all (pick->body);
-
-
-	/* Put it in our mini-wizard */
-
-	wiz->closure = pick;
-	mini_wizard_container_add (wiz, pick->body);
-}
-
-/* ** ** ** ** ** ** ** ** ** ** ** ** ** ** ** ** ** ** ** ** ** ** ** ** */
-
-/*
- * The code for the actual EABPopupControl widget begins here.
- */
-
-/* ** ** ** ** ** ** ** ** ** ** ** ** ** ** ** ** ** ** ** ** ** ** ** ** */
-
-
-static GtkObjectClass *parent_class;
-
-static void eab_popup_control_dispose (GObject *);
-static void eab_popup_control_query   (EABPopupControl *);
-
-
-static void
-eab_popup_control_class_init (EABPopupControlClass *klass)
-{
-	GObjectClass *object_class = G_OBJECT_CLASS (klass);
-
-	parent_class = g_type_class_peek_parent (klass);
-
-	object_class->dispose = eab_popup_control_dispose;
-}
-
-static void
-eab_popup_control_init (EABPopupControl *pop)
-{
-	pop->transitory = TRUE;
-}
-
-static void
-eab_popup_control_cleanup (EABPopupControl *pop)
-{
-	if (pop->contact) {
-		g_object_unref (pop->contact);
-		pop->contact = NULL;
-	}
-
-	if (pop->scheduled_refresh) {
-		g_source_remove (pop->scheduled_refresh);
-		pop->scheduled_refresh = 0;
-	}
-
-	if (pop->query_tag) {
-#if notyet
-		e_book_simple_query_cancel (pop->book, pop->query_tag);
-#endif
-		pop->query_tag = 0;
-	}
-
-	if (pop->book) {
-		g_object_unref (pop->book);
-		pop->book = NULL;
-	}
-
-	g_free (pop->name);
-	pop->name = NULL;
-
-	g_free (pop->email);
-	pop->email = NULL;
-}
-
-static void
-eab_popup_control_dispose (GObject *obj)
-{
-	EABPopupControl *pop = EAB_POPUP_CONTROL (obj);
-
-	eab_popup_control_cleanup (pop);
-
-	if (G_OBJECT_CLASS (parent_class)->dispose)
-		G_OBJECT_CLASS (parent_class)->dispose (obj);
-}
-
-GType
-eab_popup_control_get_type (void)
-{
-	static GType pop_type = 0;
-
-	if (!pop_type) {
-		static const GTypeInfo pop_info =  {
-			sizeof (EABPopupControlClass),
-			NULL,           /* base_init */
-			NULL,           /* base_finalize */
-			(GClassInitFunc) eab_popup_control_class_init,
-			NULL,           /* class_finalize */
-			NULL,           /* class_data */
-			sizeof (EABPopupControl),
-			0,             /* n_preallocs */
-			(GInstanceInitFunc) eab_popup_control_init,
-		};
-
-		pop_type = g_type_register_static (gtk_event_box_get_type (), "EABPopupControl", &pop_info, 0);
-	}
-
-	return pop_type;
-}
-
-static void
-eab_popup_control_refresh_names (EABPopupControl *pop)
-{
-	if (pop->name_widget) {
-		if (pop->name && *pop->name) {
-			gtk_label_set_text (GTK_LABEL (pop->name_widget), pop->name);
-			gtk_widget_show (pop->name_widget);
-		} else {
-			gtk_widget_hide (pop->name_widget);
-		}
-	}
-
-	if (pop->email_widget) {
-		if (pop->email && *pop->email) {
-			gtk_label_set_text (GTK_LABEL (pop->email_widget), pop->email);
-			gtk_widget_show (pop->email_widget);
-		} else {
-			gtk_widget_hide (pop->email_widget);
-		}
-	}
-
-	eab_popup_control_query (pop);
-}
-
-static gint
-refresh_timeout_cb (gpointer ptr)
-{
-	EABPopupControl *pop = EAB_POPUP_CONTROL (ptr);
-	eab_popup_control_refresh_names (pop);
-	pop->scheduled_refresh = 0;
-	return 0;
-}
-
-static void
-eab_popup_control_schedule_refresh (EABPopupControl *pop)
-{
-	if (pop->scheduled_refresh == 0)
-		pop->scheduled_refresh = g_timeout_add (20, refresh_timeout_cb, pop);
-}
-
-/* If we are handed something of the form "Foo <bar@bar.com>",
-   do the right thing. */
-static gboolean
-eab_popup_control_set_free_form (EABPopupControl *pop, const gchar *txt)
-{
-	gchar *lt, *gt = NULL;
-
-	g_return_val_if_fail (pop && EAB_IS_POPUP_CONTROL (pop), FALSE);
-
-	if (txt == NULL)
-		return FALSE;
-
-	lt = strchr (txt, '<');
-	if (lt)
-		gt = strchr (txt, '>');
-
-	if (lt && gt && lt+1 < gt) {
-		gchar *name  = g_strndup (txt,  lt-txt);
-		gchar *email = g_strndup (lt+1, gt-lt-1);
-		eab_popup_control_set_name (pop, name);
-		eab_popup_control_set_email (pop, email);
-
-		return TRUE;
-	}
-	
-	return FALSE;
-}
-
-static void
-eab_popup_control_set_name (EABPopupControl *pop, const gchar *name)
-{
-	g_return_if_fail (pop && EAB_IS_POPUP_CONTROL (pop));
-
-	/* We only allow the name to be set once. */
-	if (pop->name)
-		return;
-
-	if (!eab_popup_control_set_free_form (pop, name)) {
-		pop->name = g_strdup (name);
-		if (pop->name)
-			g_strstrip (pop->name);
-	}
-
-	eab_popup_control_schedule_refresh (pop);
-}
-
-static void
-eab_popup_control_set_email (EABPopupControl *pop, const gchar *email)
-{
-	g_return_if_fail (pop && EAB_IS_POPUP_CONTROL (pop));
-
-	/* We only allow the e-mail to be set once. */
-	if (pop->email)
-		return;
-
-	if (!eab_popup_control_set_free_form (pop, email)) {
-		pop->email = g_strdup (email);
-		if (pop->email)
-			g_strstrip (pop->email);
-	}
-
-	eab_popup_control_schedule_refresh (pop);
-}
-
-void
-eab_popup_control_construct (EABPopupControl *pop)
-{
-	GtkWidget *vbox, *name_holder;
-	GdkColor color = { 0x0, 0xffff, 0xffff, 0xffff };
-
-	g_return_if_fail (pop && EAB_IS_POPUP_CONTROL (pop));
-
-	pop->main_vbox = gtk_vbox_new (FALSE, 0);
-
-	/* Build Generic View */
-
-	name_holder = gtk_event_box_new ();
-	vbox = gtk_vbox_new (FALSE, 2);
-	pop->name_widget = gtk_label_new ("");
-	pop->email_widget = gtk_label_new ("");
-
-	gtk_box_pack_start (GTK_BOX (vbox), pop->name_widget, TRUE, TRUE, 2);
-	gtk_box_pack_start (GTK_BOX (vbox), pop->email_widget, TRUE, TRUE, 2);
-	gtk_container_add (GTK_CONTAINER (name_holder), GTK_WIDGET (vbox));
-
-	if (gdk_colormap_alloc_color (gtk_widget_get_colormap (GTK_WIDGET (name_holder)), &color, FALSE, TRUE)) {
-		GtkStyle *style = gtk_style_copy (gtk_widget_get_style (GTK_WIDGET (name_holder)));
-		style->bg[0] = color;
-		gtk_widget_set_style (GTK_WIDGET (name_holder), style);
-		g_object_unref (style);
-	}
-
-	pop->generic_view = gtk_frame_new (NULL);
-	gtk_container_add (GTK_CONTAINER (pop->generic_view), name_holder);
-	gtk_box_pack_start (GTK_BOX (pop->main_vbox), pop->generic_view, TRUE, TRUE, 0);
-	gtk_widget_show_all (pop->generic_view);
-
-	pop->query_msg = gtk_label_new (_("Querying Address Book..."));
-	gtk_box_pack_start (GTK_BOX (pop->main_vbox), pop->query_msg, TRUE, TRUE, 0);
-	gtk_widget_show (pop->query_msg);
-
-	/* Build ContactDisplay */
-	pop->contact_display = eab_contact_display_new ();
-	gtk_box_pack_start (GTK_BOX (pop->main_vbox), pop->contact_display, TRUE, TRUE, 0);
-
-
-	/* Final assembly */
-
-	gtk_container_add (GTK_CONTAINER (pop), pop->main_vbox);
-	gtk_widget_show (pop->main_vbox);
-
-	gtk_container_set_border_width (GTK_CONTAINER (vbox), 3);
-	gtk_container_set_border_width (GTK_CONTAINER (pop), 2);
-}
-
-static GtkWidget *
-eab_popup_new (void)
-{
-	EABPopupControl *pop = g_object_new (EAB_TYPE_POPUP_CONTROL, NULL);
-	eab_popup_control_construct (pop);
-	return GTK_WIDGET (pop);
-}
-
-static void
-emit_event (EABPopupControl *pop, const char *event)
-{
-	if (pop->es) {
-		BonoboArg *arg;
-
-		arg = bonobo_arg_new (BONOBO_ARG_BOOLEAN);
-		BONOBO_ARG_SET_BOOLEAN (arg, TRUE);
-		bonobo_event_source_notify_listeners_full (pop->es,
-							   "GNOME/Evolution/Addressbook/AddressPopup",
-							   "Event",
-							   event,
-							   arg, NULL);
-		bonobo_arg_release (arg);
-	}	
-}
-
-static void
-contact_editor_cb (EBook *book, EBookStatus status, gpointer closure)
-{
-	if (status == E_BOOK_ERROR_OK) {
-		EABPopupControl *pop = EAB_POPUP_CONTROL (closure);
-		eab_show_contact_editor (book, pop->contact, FALSE, TRUE);
-		eab_popup_control_cleanup (pop);
-		emit_event (pop, "Destroy");
-	}
-
-	if (book)
-		g_object_unref (book);
-}
-
-static void
-eab_popup_control_display_contact (EABPopupControl *pop, EContact *contact)
-{
-	GtkWidget *b;
-
-	g_return_if_fail (pop && EAB_IS_POPUP_CONTROL (pop));
-	g_return_if_fail (contact && E_IS_CONTACT (contact));
-	g_return_if_fail (pop->contact == NULL);
-
-	pop->contact = contact;
-	g_object_ref (pop->contact);
-
-	addressbook_load_default_book (contact_editor_cb, pop);
-}
-
-static void
-eab_popup_control_no_matches (EABPopupControl *pop)
-{
-	if (pop->email && *pop->email) {
-		if (pop->name && *pop->name)
-			e_contact_quick_add (pop->name, pop->email, NULL, NULL);
-		else
-			e_contact_quick_add_free_form (pop->email, NULL, NULL);
-
-	}
-	eab_popup_control_cleanup (pop);
-	emit_event (pop, "Destroy");
-}
-
-static void
-wizard_destroy_cb (MiniWizard *wiz, gpointer closure)
-{
-	gtk_widget_destroy (GTK_WIDGET (closure));
-}
-
-static void
-eab_popup_control_ambiguous_email_add (EABPopupControl *pop, const GList *contacts)
-{
-	MiniWizard *wiz = mini_wizard_new ();
-	GtkWidget *win = gtk_window_new (GTK_WINDOW_TOPLEVEL);
-	
-	wiz->destroy_cb      = wizard_destroy_cb;
-	wiz->destroy_closure = win;
-
-	gtk_window_set_title (GTK_WINDOW (win),  _("Merge E-Mail Address"));
-	gtk_window_set_position (GTK_WINDOW (win), GTK_WIN_POS_MOUSE);
-
-	contact_picker_init (wiz, contacts, pop->name, pop->email);
-
-	eab_popup_control_cleanup (pop);
-	emit_event (pop, "Destroy");
-
-	gtk_container_add (GTK_CONTAINER (win), wiz->body);
-	gtk_widget_show_all (win);
-}
-
-static void
-eab_popup_control_multiple_matches (EABPopupControl *pop, const GList *contacts)
-{
-	pop->multiple_matches = TRUE;
-
-	eab_popup_control_ambiguous_email_add (pop, contacts);
-}
-
-/** ** ** ** ** ** ** ** ** ** ** ** ** ** ** ** ** ** ** ** ** ** ** ** ** ** ** ** ** ** ** ** ** ** ** ** ** ** ** ** ** ** ** ** ** ** ** ** ** ** ** **/
-
-/*
- *  Addressbook Query Fun
- */
-
-static GList*
-remove_contact_lists (GList *contacts)
-{
-	GList *contacts_copy = g_list_copy (contacts);
-	GList *temp;
-	GPtrArray *indices = g_ptr_array_new ();
-	int i = 0;
-	
-	
-	for (temp = contacts_copy; temp != NULL; temp = g_list_next (temp), i++) {
-		if (e_contact_get (temp->data, E_CONTACT_IS_LIST))
-			g_ptr_array_add (indices, temp);
-	}
-	
-	for (i =0; i < indices->len; i++) {
-		GList *link = indices->pdata[i];
-		contacts_copy = g_list_remove_link (contacts_copy, link);
-		
-	}
-	g_ptr_array_free (indices, FALSE);
-	return contacts_copy;
-}
-
-
-static void
-name_only_query_cb (EBook *book, EBookStatus status, GList *contacts, gpointer closure)
-{
-	EABPopupControl *pop;
-
-	if (status != E_BOOK_ERROR_OK)
-		return;
-
-	pop = EAB_POPUP_CONTROL (closure);
-
-	pop->query_tag = 0;
-       	if (contacts == NULL) {
-		eab_popup_control_no_matches (pop);
-	} else {
-		eab_popup_control_ambiguous_email_add (pop, contacts);
-	}
-}
-
-static void
-query_cb (EBook *book, EBookStatus status, GList *contacts, gpointer closure)
-{
-	EABPopupControl *pop;
-	GList *filtered_contacts;
-
-	if (status != E_BOOK_ERROR_OK)
-		return;
-
-	pop = EAB_POPUP_CONTROL (closure);
-
-	pop->query_tag = 0;
-	gtk_widget_hide (pop->query_msg);
-
-	/* remove contact lists from the search results to avoid
-	cases like http://bugzilla.ximian.com/show_bug.cgi?id=68745*/
-
-	filtered_contacts = remove_contact_lists (contacts);
-
-	if (filtered_contacts == NULL) {
-		
-		/* Do a name-only query if:
-		   (1) The name is non-empty.
-		   (2) The e-mail is also non-empty (so that the query we just did wasn't actually a name-only query.
-		*/
-		if (pop->name && *pop->name && pop->email && *pop->email) {
-			pop->query_tag = eab_name_and_email_query (book, pop->name, NULL, name_only_query_cb, pop);
-		} else {
-			eab_popup_control_no_matches (pop);
-		}
-		
-	} else {
-			
-		if (g_list_length (filtered_contacts) == 1)
-			eab_popup_control_display_contact (pop, E_CONTACT (filtered_contacts->data));
-		else
-			eab_popup_control_multiple_matches (pop, filtered_contacts);
-		g_list_free (filtered_contacts);
-	}
-	
-}
-
-static void
-start_query (EBook *book, EBookStatus status, gpointer closure)
-{
-	EABPopupControl *pop = EAB_POPUP_CONTROL (closure);
-
-	if (status != E_BOOK_ERROR_OK) {
-		eab_popup_control_no_matches (pop);
-		if (book)
-			g_object_unref (book);
-		return;
-	}
-	
-#if notyet
-	if (pop->query_tag)
-		e_book_simple_query_cancel (book, pop->query_tag);
-#endif
-
-	if (pop->book != book) {
-		g_object_ref (book);
-		if (pop->book)
-			g_object_unref (pop->book);
-		pop->book = book;
-	}
-		
-	pop->query_tag = eab_name_and_email_query (book, pop->name, pop->email, query_cb, pop);
-
-	g_object_unref (pop);
-}
-
-static void
-eab_popup_control_query (EABPopupControl *pop)
-{
-	g_return_if_fail (pop && EAB_IS_POPUP_CONTROL (pop));
-
-	g_object_ref (pop);
-
-	addressbook_load_default_book (start_query, pop);
-}
-
-/** ** ** ** ** ** ** ** ** ** ** ** ** ** ** ** ** ** ** ** ** ** ** ** ** ** ** ** ** ** ** ** ** ** ** ** ** ** ** ** ** ** ** ** ** ** ** ** ** ** ** **/
-
-enum {
-	PROPERTY_NAME,
-	PROPERTY_EMAIL,
-	PROPERTY_TRANSITORY
-};
-
-static void
-set_prop (BonoboPropertyBag *bag, const BonoboArg *arg, guint arg_id, CORBA_Environment *ev, gpointer user_data)
-{
-	EABPopupControl *pop = EAB_POPUP_CONTROL (user_data);
-
-	switch (arg_id) {
-
-	case PROPERTY_NAME:
-		eab_popup_control_set_name (pop, BONOBO_ARG_GET_STRING (arg));
-		break;
-
-	case PROPERTY_EMAIL:
-		eab_popup_control_set_email (pop, BONOBO_ARG_GET_STRING (arg));
-		break;
-
-	default:
-		g_assert_not_reached ();
-	}
-}
-
-static void
-get_prop (BonoboPropertyBag *bag, BonoboArg *arg, guint arg_id, CORBA_Environment *ev, gpointer user_data)
-{
-	EABPopupControl *pop = EAB_POPUP_CONTROL (user_data);
-
-	switch (arg_id) {
-
-	case PROPERTY_NAME:
-		BONOBO_ARG_SET_STRING (arg, pop->name);
-		break;
-
-	case PROPERTY_EMAIL:
-		BONOBO_ARG_SET_STRING (arg, pop->email);
-		break;
-
-	case PROPERTY_TRANSITORY:
-		BONOBO_ARG_SET_BOOLEAN (arg, pop->transitory);
-		break;
-
-	default:
-		g_assert_not_reached ();
-	}
-}
-
-BonoboControl *
-eab_popup_control_new (void)
-{
-        BonoboControl *control;
-        BonoboPropertyBag *bag;
-	EABPopupControl *addy;
-	GtkWidget *w;
-
-	w = eab_popup_new ();
-	addy = EAB_POPUP_CONTROL (w);
-
-	control = bonobo_control_new (w);
-	gtk_widget_show (w);
-
-        bag = bonobo_property_bag_new (get_prop, set_prop, w);
-        bonobo_property_bag_add (bag, "name", PROPERTY_NAME,
-                                 BONOBO_ARG_STRING, NULL, NULL,
-                                 BONOBO_PROPERTY_WRITEABLE | BONOBO_PROPERTY_READABLE);
-
-        bonobo_property_bag_add (bag, "email", PROPERTY_EMAIL,
-                                 BONOBO_ARG_STRING, NULL, NULL,
-                                 BONOBO_PROPERTY_WRITEABLE | BONOBO_PROPERTY_READABLE);
-
-	bonobo_property_bag_add (bag, "transitory", PROPERTY_TRANSITORY,
-				 BONOBO_ARG_BOOLEAN, NULL, NULL,
-				 BONOBO_PROPERTY_READABLE);
-
-        bonobo_control_set_properties (control, bonobo_object_corba_objref (BONOBO_OBJECT (bag)), NULL);
-        bonobo_object_unref (BONOBO_OBJECT (bag));
-
-	addy->es = bonobo_event_source_new ();
-	bonobo_object_add_interface (BONOBO_OBJECT (control),
-				     BONOBO_OBJECT (addy->es));
-
-        return control;
-}
diff --git a/addressbook/gui/widgets/eab-popup-control.h b/addressbook/gui/widgets/eab-popup-control.h
deleted file mode 100644
index 1f4f22558f..0000000000
--- a/addressbook/gui/widgets/eab-popup-control.h
+++ /dev/null
@@ -1,86 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-
-/*
- * eab-popup-control.h
- *
- * Copyright (C) 2001-2003, Ximian, Inc.
- *
- * Authors: Jon Trowbridge <trow@ximian.com>
- *          Chris Toshok <toshok@ximian.com>
- */
-
-/*
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of version 2 of the GNU General Public
- * License as published by the Free Software Foundation.
- * 
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- * 
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
- * USA.
- */
-
-#ifndef __EAB_POPUP_CONTROL_H__
-#define __EAB_POPUP_CONTROL_H__
-
-#include <bonobo/bonobo-event-source.h>
-#include <libebook/e-book.h>
-#include <libebook/e-contact.h>
-
-#include <gtk/gtkeventbox.h>
-
-G_BEGIN_DECLS
-
-#define EAB_TYPE_POPUP_CONTROL        (eab_popup_control_get_type ())
-#define EAB_POPUP_CONTROL(o)          (G_TYPE_CHECK_INSTANCE_CAST ((o), EAB_TYPE_POPUP_CONTROL, EABPopupControl))
-#define EAB_POPUP_CONTROL_CLASS(k)    (G_TYPE_CHECK_CLASS_CAST ((k), EAB_TYPE_POPUP_CONTROL, EABPopupControlClass))
-#define EAB_IS_POPUP_CONTROL(o)       (G_TYPE_CHECK_INSTANCE_TYPE ((o), EAB_TYPE_POPUP_CONTROL))
-#define EAB_IS_POPUP_CONTROL_CLASS(k) (G_TYPE_CHECK_CLASS_TYPE ((k), EAB_TYPE_POPUP_CONTROL))
-
-typedef struct _EABPopupControl EABPopupControl;
-typedef struct _EABPopupControlClass EABPopupControlClass;
-
-struct _EABPopupControl {
-	GtkEventBox parent;
-
-	gchar *name;
-	gchar *email;
-
-	GtkWidget *name_widget;
-	GtkWidget *email_widget;
-	GtkWidget *query_msg;
-	
-	GtkWidget *main_vbox;
-	GtkWidget *generic_view;
-	GtkWidget *contact_display;
-
-	gboolean transitory;
-
-	guint scheduled_refresh;
-	EBook *book;
-	guint query_tag;
-	gboolean multiple_matches;
-	EContact *contact;
-
-	BonoboEventSource *es;
-};
-
-struct _EABPopupControlClass {
-	GtkEventBoxClass parent_class;
-};
-
-GType eab_popup_control_get_type (void);
-
-void eab_popup_control_construct (EABPopupControl *);
-
-BonoboControl *eab_popup_control_new (void);
-
-G_END_DECLS
-
-#endif /* __EAB_POPUP_CONTROL_H__ */
-
diff --git a/addressbook/gui/widgets/eab-popup.c b/addressbook/gui/widgets/eab-popup.c
deleted file mode 100644
index 8a292b745f..0000000000
--- a/addressbook/gui/widgets/eab-popup.c
+++ /dev/null
@@ -1,321 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-/*
- *  Authors: Michael Zucchi <notzed@ximian.com>
- *
- *  Copyright 2004 Novell, Inc. (www.novell.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; version 2 of the License.
- *
- *  This program is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *
- *  You should have 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.
- *
- */
-
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
-
-#include <string.h>
-#include <stdlib.h>
-
-#include <glib.h>
-
-#include "eab-popup.h"
-#include <libedataserverui/e-source-selector.h>
-#include <libebook/e-contact.h>
-
-static GObjectClass *eabp_parent;
-
-static void
-eabp_init(GObject *o)
-{
-	/*EABPopup *eabp = (EABPopup *)o; */
-}
-
-static void
-eabp_finalise(GObject *o)
-{
-	((GObjectClass *)eabp_parent)->finalize(o);
-}
-
-static void
-eabp_target_free(EPopup *ep, EPopupTarget *t)
-{
-	switch (t->type) {
-	case EAB_POPUP_TARGET_SELECT: {
-		EABPopupTargetSelect *s = (EABPopupTargetSelect *)t;
-		int i;
-
-		for (i=0;i<s->cards->len;i++)
-			g_object_unref(s->cards->pdata[i]);
-		g_ptr_array_free(s->cards, TRUE);
-		g_object_unref(s->book);
-
-		break; }
-	case EAB_POPUP_TARGET_SOURCE: {
-		EABPopupTargetSource *s = (EABPopupTargetSource *)t;
-
-		g_object_unref(s->selector);
-		break; }
-
-#ifdef ADAPTED_TO_E_NAME_SELECTOR
-
-	case EAB_POPUP_TARGET_SELECT_NAMES: {
-		EABPopupTargetSelectNames *s = (EABPopupTargetSelectNames *)t;
-
-		g_object_unref(s->model);
-		break; }
-
-#endif
-
-	}
-
-	((EPopupClass *)eabp_parent)->target_free(ep, t);
-}
-
-static void
-eabp_class_init(GObjectClass *klass)
-{
-	klass->finalize = eabp_finalise;
-	((EPopupClass *)klass)->target_free = eabp_target_free;
-}
-
-GType
-eab_popup_get_type(void)
-{
-	static GType type = 0;
-
-	if (type == 0) {
-		static const GTypeInfo info = {
-			sizeof(EABPopupClass),
-			NULL, NULL,
-			(GClassInitFunc)eabp_class_init,
-			NULL, NULL,
-			sizeof(EABPopup), 0,
-			(GInstanceInitFunc)eabp_init
-		};
-		eabp_parent = g_type_class_ref(e_popup_get_type());
-		type = g_type_register_static(e_popup_get_type(), "EABPopup", &info, 0);
-	}
-
-	return type;
-}
-
-EABPopup *eab_popup_new(const char *menuid)
-{
-	EABPopup *eabp = g_object_new(eab_popup_get_type(), 0);
-
-	e_popup_construct(&eabp->popup, menuid);
-
-	return eabp;
-}
-
-/**
- * eab_popup_target_new_select:
- * @eabp: Address book popup.
- * @book: Book the cards belong to.
- * @readonly: Book is read-only mode.  FIXME: Why can't we just get this off the book?
- * @cards: Cards selected.  This will be freed on completion.
- *
- * Create a new selection popup target.
- * 
- * Return value: 
- **/
-EABPopupTargetSelect *
-eab_popup_target_new_select(EABPopup *eabp, struct _EBook *book, int readonly, GPtrArray *cards)
-{
-	EABPopupTargetSelect *t = e_popup_target_new(&eabp->popup, EAB_POPUP_TARGET_SELECT, sizeof(*t));
-	guint32 mask = ~0;
-	int has_email = FALSE, i;
-
-	/* FIXME: duplicated in eab-menu.c */
-
-	t->book = book;
-	g_object_ref(book);
-	t->cards = cards;
-
-	for (i=0;i<cards->len && !has_email;i++) {
-		EContact *contact = cards->pdata[i];
-		GList *email;
-
-		email = e_contact_get(E_CONTACT(contact), E_CONTACT_EMAIL);
-		if (email) {
-			has_email = TRUE;
-			
-			g_list_foreach(email, (GFunc)g_free, NULL);
-			g_list_free(email);
-		}
-	}
-
-	if (has_email)
-		mask &= ~EAB_POPUP_SELECT_EMAIL;
-
-	if (!readonly)
-		mask &= ~EAB_POPUP_SELECT_EDITABLE;
-
-	if (cards->len == 1)
-		mask &= ~EAB_POPUP_SELECT_ONE;
-
-	if (cards->len > 1)
-		mask &= ~EAB_POPUP_SELECT_MANY;
-
-	if (cards->len >= 1)
-		mask &= ~EAB_POPUP_SELECT_ANY;
-
-	t->target.mask = mask;
-
-	return t;
-}
-
-EABPopupTargetSource *
-eab_popup_target_new_source(EABPopup *eabp, ESourceSelector *selector)
-{
-	EABPopupTargetSource *t = e_popup_target_new(&eabp->popup, EAB_POPUP_TARGET_SOURCE, sizeof(*t));
-	guint32 mask = ~0;
-	const char *source_uri;
-	ESource *source;
-
-	/* TODO: this is duplicated for calendar and tasks too */
-
-	t->selector = selector;
-	g_object_ref(selector);
-
-	/* TODO: perhaps we need to copy this so it doesn't change during the lifecycle */
-	source = e_source_selector_peek_primary_selection(selector);
-	if (source)
-		mask &= ~EAB_POPUP_SOURCE_PRIMARY;
-
-	/* FIXME Gross hack, should have a property or something */
-	source_uri = e_source_peek_relative_uri(source);
-	if (source_uri && !strcmp("system", source_uri))
-		mask &= ~EAB_POPUP_SOURCE_SYSTEM;
-	else
-		mask &= ~EAB_POPUP_SOURCE_USER;
-
-	t->target.mask = mask;
-
-	return t;
-}
-
-#ifdef ADAPTED_TO_E_NAME_SELECTOR
-
-EABPopupTargetSelectNames *
-eab_popup_target_new_select_names(EABPopup *eabp, struct _ESelectNamesModel *model, int row)
-{
-	EABPopupTargetSelectNames *t = e_popup_target_new(&eabp->popup, EAB_POPUP_TARGET_SELECT_NAMES, sizeof(*t));
-
-	/* TODO: this is sort of not very useful, maybe the popup which uses it doesn't
-	   need to be pluggable */
-
-	t->model = model;
-	g_object_ref(model);
-	t->row = row;
-
-	return t;
-}
-
-#endif
-
-/* ********************************************************************** */
-/* Popup menu plugin handler */
-
-/*
-<e-plugin
-  class="org.gnome.mail.plugin.popup:1.0"
-  id="org.gnome.mail.plugin.popup.iteab:1.0"
-  type="shlib"
-  location="/opt/gnome2/lib/camel/1.0/libcamelimap.so"
-  name="imap"
-  description="IMAP4 and IMAP4v1 mail store">
-  <hook class="org.gnome.mail.popupMenu:1.0"
-        handler="HandlePopup">
-  <menu id="any" target="select">
-   <iteab
-    type="iteab|toggle|radio|image|submenu|bar"
-    active
-    path="foo/bar"
-    label="label"
-    icon="foo"
-    mask="select_one"
-    activate="eabp_view_eabacs"/>
-  </menu>
-  </extension>
-
-*/
-
-static void *eabph_parent_class;
-#define eabph ((EABPopupHook *)eph)
-
-static const EPopupHookTargetMask eabph_select_masks[] = {
-	{ "one", EAB_POPUP_SELECT_ONE },
-	{ "many", EAB_POPUP_SELECT_MANY },
-	{ "any", EAB_POPUP_SELECT_ANY },
-	{ "editable", EAB_POPUP_SELECT_EDITABLE },
-	{ "email", EAB_POPUP_SELECT_EMAIL },
-	{ 0 }
-};
-
-static const EPopupHookTargetMask eabph_source_masks[] = {
-	{ "primary", EAB_POPUP_SOURCE_PRIMARY },
-	{ "system", EAB_POPUP_SOURCE_SYSTEM },
-	{ 0 }
-};
-
-static const EPopupHookTargetMask eabph_select_names_masks[] = {
-	{ 0 }
-};
-
-static const EPopupHookTargetMap eabph_targets[] = {
-	{ "select", EAB_POPUP_TARGET_SELECT, eabph_select_masks },
-	{ "source", EAB_POPUP_TARGET_SOURCE, eabph_source_masks },
-	{ "select-names", EAB_POPUP_TARGET_SELECT_NAMES, eabph_select_names_masks },
-	{ 0 }
-};
-
-static void
-eabph_finalise(GObject *o)
-{
-	/*EPluginHook *eph = (EPluginHook *)o;*/
-
-	((GObjectClass *)eabph_parent_class)->finalize(o);
-}
-
-static void
-eabph_class_init(EPluginHookClass *klass)
-{
-	int i;
-
-	((GObjectClass *)klass)->finalize = eabph_finalise;
-	((EPluginHookClass *)klass)->id = "org.gnome.evolution.addressbook.popup:1.0";
-
-	for (i=0;eabph_targets[i].type;i++)
-		e_popup_hook_class_add_target_map((EPopupHookClass *)klass, &eabph_targets[i]);
-
-	((EPopupHookClass *)klass)->popup_class = g_type_class_ref(eab_popup_get_type());
-}
-
-GType
-eab_popup_hook_get_type(void)
-{
-	static GType type = 0;
-	
-	if (!type) {
-		static const GTypeInfo info = {
-			sizeof(EABPopupHookClass), NULL, NULL, (GClassInitFunc) eabph_class_init, NULL, NULL,
-			sizeof(EABPopupHook), 0, (GInstanceInitFunc) NULL,
-		};
-
-		eabph_parent_class = g_type_class_ref(e_popup_hook_get_type());
-		type = g_type_register_static(e_popup_hook_get_type(), "EABPopupHook", &info, 0);
-	}
-	
-	return type;
-}
diff --git a/addressbook/gui/widgets/eab-popup.h b/addressbook/gui/widgets/eab-popup.h
deleted file mode 100644
index 20aab2edfe..0000000000
--- a/addressbook/gui/widgets/eab-popup.h
+++ /dev/null
@@ -1,184 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-/*
- *  Authors: Michael Zucchi <notzed@ximian.com>
- *
- *  Copyright 2004 Novell, Inc. (www.novell.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; version 2 of the License.
- *
- *  This program is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with this program; if not, write to the Free Software
- *  Foundation, Inc., 59 Temple Street #330, Boston, MA 02111-1307, USA.
- *
- */
-
-#ifndef __EAB_POPUP_H__
-#define __EAB_POPUP_H__
-
-#include <glib-object.h>
-
-#include "e-util/e-popup.h"
-
-#ifdef __cplusplus
-extern "C" {
-#pragma }
-#endif /* __cplusplus */
-
-#define ADAPTED_TO_E_NAME_SELECTOR 1
-
-typedef struct _EABPopup EABPopup;
-typedef struct _EABPopupClass EABPopupClass;
-
-/**
- * enum _eab_popup_target_t - A list of mail popup target types.
- * 
- * @EAB_POPUP_TARGET_SELECT: A selection of cards
- * @EAB_POPUP_TARGET_SOURCE: A source selection.
- *
- * Defines the value of the targetid for all EABPopup target types.
- **/
-enum _eab_popup_target_t {
-	EAB_POPUP_TARGET_SELECT,
-	EAB_POPUP_TARGET_SOURCE,
-	EAB_POPUP_TARGET_SELECT_NAMES,
-};
-
-/**
- * enum _eab_popup_target_select_t - EABPopupTargetSelect qualifiers.
- * 
- * @EAB_POPUP_SELECT_ONE: Only one item is selected.
- * @EAB_POPUP_SELECT_MANY: Two or more items are selected.
- * @EAB_POPUP_SELECT_ANY: One or more items are selected.
- * @EAB_POPUP_SELECT_EDITABLE: Read/writable source.
- * @EAB_POPUP_SELECT_EMAIL: Has an email address.
- **/
-enum _eab_popup_target_select_t {
-	EAB_POPUP_SELECT_ONE = 1<<0,
-	EAB_POPUP_SELECT_MANY = 1<<1,
-	EAB_POPUP_SELECT_ANY = 1<<2,
-	EAB_POPUP_SELECT_EDITABLE = 1<<3,
-	EAB_POPUP_SELECT_EMAIL = 1<<4,
-};
-
-/**
- * enum _eab_popup_target_source_t - EABPopupTargetSource qualifiers.
- * 
- * @EAB_POPUP_SOURCE_PRIMARY: Has a primary selection.
- * @EAB_POPUP_SOURCE_SYSTEM: Is a 'system' folder.
- * 
- **/
-enum _eab_popup_target_source_t {
-	EAB_POPUP_SOURCE_PRIMARY = 1<<0,
-	EAB_POPUP_SOURCE_SYSTEM = 1<<1,	/* system folder */
-	EAB_POPUP_SOURCE_USER = 1<<2, /* user folder (!system) */
-};
-
-typedef struct _EABPopupTargetSelect EABPopupTargetSelect;
-typedef struct _EABPopupTargetSource EABPopupTargetSource;
-typedef struct _EABPopupTargetSelectNames EABPopupTargetSelectNames;
-
-/**
- * struct _EABPopupTargetSelect - A list of address cards.
- * 
- * @target: Superclass.
- * @book: Book the cards belong to.
- * @cards: All selected cards.
- *
- * Used to represent a selection of cards as context for a popup
- * menu.
- **/
-struct _EABPopupTargetSelect {
-	EPopupTarget target;
-
-	struct _EBook *book;
-	GPtrArray *cards;
-};
-
-/**
- * struct _EABPopupTargetSource - A source target.
- * 
- * @target: Superclass.
- * @selector: Selector holding the source selection.
- *
- * This target is used to represent a source selection.
- **/
-struct _EABPopupTargetSource {
-	EPopupTarget target;
-
-	struct _ESourceSelector *selector;
-};
-
-#ifdef ADAPTED_TO_E_NAME_SELECTOR
-
-/**
- * struct _EABPopupTargetSelectNames - A select names target.
- * 
- * @target: Superclass.
- * @model: Select names model.
- * @row: Row of item selected.
- *
- * This target is used to represent an item selected in an
- * ESelectNames model.
- **/
-struct _EABPopupTargetSelectNames {
-	EPopupTarget target;
-
-	struct _ESelectNamesModel *model;
-	int row;
-};
-
-#endif
-
-typedef struct _EPopupItem EABPopupItem;
-
-/* The object */
-struct _EABPopup {
-	EPopup popup;
-
-	struct _EABPopupPrivate *priv;
-};
-
-struct _EABPopupClass {
-	EPopupClass popup_class;
-};
-
-GType eab_popup_get_type(void);
-
-EABPopup *eab_popup_new(const char *menuid);
-
-EABPopupTargetSelect *eab_popup_target_new_select(EABPopup *eabp, struct _EBook *book, int readonly, GPtrArray *cards);
-EABPopupTargetSource *eab_popup_target_new_source(EABPopup *eabp, struct _ESourceSelector *selector);
-
-#ifdef ADAPTED_TO_E_NAME_SELECTOR
-
-EABPopupTargetSelectNames *eab_popup_target_new_select_names(EABPopup *eabp, struct _ESelectNamesModel *model, int row);
-
-#endif
-
-/* ********************************************************************** */
-
-typedef struct _EABPopupHook EABPopupHook;
-typedef struct _EABPopupHookClass EABPopupHookClass;
-
-struct _EABPopupHook {
-	EPopupHook hook;
-};
-
-struct _EABPopupHookClass {
-	EPopupHookClass hook_class;
-};
-
-GType eab_popup_hook_get_type(void);
-
-#ifdef __cplusplus
-}
-#endif /* __cplusplus */
-
-#endif /* __EAB_POPUP_H__ */
diff --git a/addressbook/gui/widgets/eab-vcard-control.c b/addressbook/gui/widgets/eab-vcard-control.c
deleted file mode 100644
index 77497767ca..0000000000
--- a/addressbook/gui/widgets/eab-vcard-control.c
+++ /dev/null
@@ -1,311 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-/*
- * eab-vcard-control.c
- *
- * Copyright (C) 1999, 2000, 2001, 2002, 2003, Ximian, Inc.
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of version 2 of the GNU General Public
- * License as published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * General Public License for more details.
- *
- * You should have received a copy of the GNU General Public
- * License along with this program; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
- *
- * Authors:
- *    Chris Lahey <clahey@ximian.com>
- *    Chris Toshok <toshok@ximian.com>
- */
-
-#include <config.h>
-#include <string.h>
-
-#include <gtk/gtk.h>
-#include <bonobo/bonobo-generic-factory.h>
-#include <bonobo/bonobo-persist.h>
-#include <bonobo/bonobo-persist-stream.h>
-#include <bonobo/bonobo-stream-client.h>
-#include <gal/util/e-util.h>
-
-#include <libebook/e-book.h>
-#include <libebook/e-contact.h>
-#include <addressbook/gui/component/addressbook.h>
-#include <addressbook/gui/widgets/eab-contact-display.h>
-#include <addressbook/util/eab-book-util.h>
-
-#include "eab-vcard-control.h"
-#include "eab-contact-merging.h"
-
-typedef struct {
-	EABContactDisplay *display;
-	GList *card_list;
-	GtkWidget *label;
-	EABContactDisplayRenderMode render_mode;
-} EABVCardControl;
-
-#define VCARD_CONTROL_ID "OAFIID:GNOME_Evolution_Addressbook_VCard_Control:" BASE_VERSION
-
-/*
- * Bonobo::PersistStream
- *
- * These two functions implement the Bonobo::PersistStream load and
- * save methods which allow data to be loaded into and out of the
- * BonoboObject.
- */
-static char *
-stream_read (Bonobo_Stream stream)
-{
-	Bonobo_Stream_iobuf *buffer;
-	CORBA_Environment    ev;
-	char *data = NULL;
-	gint length = 0;
-
-	CORBA_exception_init (&ev);
-	do {
-#define READ_CHUNK_SIZE 65536
-		Bonobo_Stream_read (stream, READ_CHUNK_SIZE,
-				    &buffer, &ev);
-
-		if (ev._major != CORBA_NO_EXCEPTION) {
-			CORBA_exception_free (&ev);
-			return NULL;
-		}
-
-		if (buffer->_length <= 0)
-			break;
-
-		data = g_realloc (data, length + buffer->_length + 1);
-
-		memcpy (data + length, buffer->_buffer, buffer->_length);
-
-		length += buffer->_length;
-
-		CORBA_free (buffer);
-	} while (1);
-
-	CORBA_free (buffer);
-	CORBA_exception_free (&ev);
-
-	if (data)
-		data[length] = '\0';
-	else
-		data = g_strdup("");
-
-	return data;
-} /* stream_read */
-
-/*
- * This function implements the Bonobo::PersistStream:load method.
- */
-static void
-pstream_load (BonoboPersistStream *ps, const Bonobo_Stream stream,
-	      Bonobo_Persist_ContentType type, void *data,
-	      CORBA_Environment *ev)
-{
-	GList *list;
-	char *vcard;
-	EABVCardControl *vcard_control = data;
-
-	if (type && g_ascii_strcasecmp (type, "text/vCard") != 0 &&	    
-	    g_ascii_strcasecmp (type, "text/x-vCard") != 0) {	    
-		CORBA_exception_set (ev, CORBA_USER_EXCEPTION,
-				     ex_Bonobo_Persist_WrongDataType, NULL);
-		return;
-	}
-
-	if ((vcard = stream_read (stream)) == NULL) {
-		CORBA_exception_set (ev, CORBA_USER_EXCEPTION,
-				     ex_Bonobo_Persist_FileNotFound, NULL);
-		return;
-	}
-
-	e_free_object_list (vcard_control->card_list);
-	list = eab_contact_list_from_string (vcard);
-	g_free(vcard);
-	vcard_control->card_list = list;
-	if (list) {
-		eab_contact_display_render (vcard_control->display, E_CONTACT (list->data),
-					    vcard_control->render_mode);
-	}
-	if (list && list->next) {
-		char *message;
-		int length = g_list_length (list) - 1;
-		message = g_strdup_printf (ngettext("There is one other contact.", 
-						    "There are %d other contacts.", length), 
-					   length);
-		gtk_label_set_text (GTK_LABEL (vcard_control->label), message);
-		g_free (message);
-		gtk_widget_show (vcard_control->label);
-	} else {
-		gtk_widget_hide (vcard_control->label);
-	}
-} /* pstream_load */
-
-/*
- * This function implements the Bonobo::PersistStream:save method.
- */
-static void
-pstream_save (BonoboPersistStream *ps, const Bonobo_Stream stream,
-	      Bonobo_Persist_ContentType type, void *data,
-	      CORBA_Environment *ev)
-{
-	EABVCardControl *vcard_control = data;
-	char             *vcard;
-	int               length;
-
-	if (type && g_ascii_strcasecmp (type, "text/vCard") != 0 &&	    
-	    g_ascii_strcasecmp (type, "text/x-vCard") != 0) {	    
-		CORBA_exception_set (ev, CORBA_USER_EXCEPTION,
-				     ex_Bonobo_Persist_WrongDataType, NULL);
-		return;
-	}
-
-	vcard = eab_contact_list_to_string (vcard_control->card_list);
-	length = strlen (vcard);
-	bonobo_stream_client_write (stream, vcard, length, ev);
-	g_free (vcard);
-} /* pstream_save */
-
-static Bonobo_Persist_ContentTypeList *
-pstream_get_content_types (BonoboPersistStream *ps, void *closure,
-			   CORBA_Environment *ev)
-{
-	return bonobo_persist_generate_content_types (2, "text/vCard", "text/x-vCard");
-}
-
-static void
-book_open_cb (EBook *book, EBookStatus status, gpointer closure)
-{
-	GList *list = closure;
-	if (status == E_BOOK_ERROR_OK) {
-		GList *p;
-		for (p = list; p; p = p->next) {
-			/* XXX argh, more passing of NULL's for callbacks */
-			eab_merging_book_add_contact (book, E_CONTACT (p->data), NULL, NULL);
-		}
-	}
-	if (book)
-		g_object_unref (book);
-	e_free_object_list (list);
-}
-
-static void
-save_in_addressbook(GtkWidget *button, gpointer data)
-{
-	EABVCardControl *vcard_control = data;
-	GList *list, *p;
-
-	list = g_list_copy (vcard_control->card_list);
-
-	for (p = list; p; p = p->next)
-		g_object_ref (p->data);
-
-	addressbook_load_default_book (book_open_cb, list);
-}
-
-static void
-toggle_full_vcard(GtkWidget *button, gpointer data)
-{
-	EABVCardControl *vcard_control = data;
-	char *label;
-
-	if (!vcard_control->card_list)
-		return;
-
-	if (vcard_control->render_mode == EAB_CONTACT_DISPLAY_RENDER_NORMAL) {
-		vcard_control->render_mode = EAB_CONTACT_DISPLAY_RENDER_COMPACT;
-		label = _("Show Full VCard");
-	}
-	else {
-		vcard_control->render_mode = EAB_CONTACT_DISPLAY_RENDER_NORMAL;
-		label = _("Show Compact VCard");
-	}
-
-	gtk_button_set_label (GTK_BUTTON (button), label);
-	eab_contact_display_render (vcard_control->display, E_CONTACT (vcard_control->card_list->data),
-				    vcard_control->render_mode);
-}
-
-static void
-free_struct (gpointer data, GObject *where_object_was)
-{
-	EABVCardControl *vcard_control = data;
-	e_free_object_list (vcard_control->card_list);
-	g_free (vcard_control);
-}
-
-BonoboControl *
-eab_vcard_control_new (void)
-{
-	BonoboControl       *control;
-	BonoboPersistStream *stream;
-	GtkWidget	    *display;
-	GtkWidget           *button1, *button2;
-	GtkWidget           *bbox;
-	GtkWidget           *vbox;
-
-	EABVCardControl    *vcard_control = g_new (EABVCardControl, 1);
-
-	printf ("inside eab_vcard_control_new\n");
-
-	vcard_control->card_list = NULL;
-	vcard_control->display = NULL;
-	vcard_control->label = NULL;
-
-	vcard_control->render_mode = EAB_CONTACT_DISPLAY_RENDER_COMPACT;
-
-	/* Create the control. */
-
-	display = eab_contact_display_new ();
-	vcard_control->display = EAB_CONTACT_DISPLAY (display);
-
-	bbox = gtk_hbutton_box_new ();
-	gtk_button_box_set_layout (GTK_BUTTON_BOX (bbox), GTK_BUTTONBOX_START);
-	gtk_box_set_spacing (GTK_BOX (bbox), 12);
-
-	button1 = gtk_button_new_with_label(_("Show Full VCard"));
-	g_signal_connect (button1, "clicked",
-			  G_CALLBACK (toggle_full_vcard), vcard_control);
-	gtk_box_pack_start (GTK_BOX (bbox), button1, FALSE, FALSE, 0);
-
-	button2 = gtk_button_new_with_label(_("Save in addressbook"));
-	g_signal_connect (button2, "clicked",
-			  G_CALLBACK (save_in_addressbook), vcard_control);
-	gtk_box_pack_start (GTK_BOX (bbox), button2, FALSE, FALSE, 0);
-
-	/* This is intentionally not shown. */
-	vcard_control->label = gtk_label_new ("");
-
-	vbox = gtk_vbox_new (FALSE, 0);
-	gtk_box_pack_start (GTK_BOX (vbox), bbox, FALSE, FALSE, 0);
-	gtk_box_pack_start (GTK_BOX (vbox), display, TRUE, TRUE, 0);
-	gtk_box_pack_start (GTK_BOX (vbox), vcard_control->label, TRUE, TRUE, 0);
-	gtk_widget_show_all (bbox);
-	gtk_widget_show (display);
-	gtk_widget_show (vbox);
-
-	control = bonobo_control_new (vbox);
-
-	g_object_weak_ref (G_OBJECT (control), free_struct, vcard_control);
-
-	stream = bonobo_persist_stream_new (pstream_load, pstream_save,
-					    pstream_get_content_types,
-					    VCARD_CONTROL_ID,
-					    vcard_control);
-
-	if (stream == NULL) {
-		bonobo_object_unref (BONOBO_OBJECT (control));
-		return NULL;
-	}
-
-	bonobo_object_add_interface (BONOBO_OBJECT (control),
-				    BONOBO_OBJECT (stream));
-
-	return control;
-}
diff --git a/addressbook/gui/widgets/eab-vcard-control.h b/addressbook/gui/widgets/eab-vcard-control.h
deleted file mode 100644
index 5f6643c1ca..0000000000
--- a/addressbook/gui/widgets/eab-vcard-control.h
+++ /dev/null
@@ -1,8 +0,0 @@
-#ifndef __EAB_VCARD_CONTROL_H__
-#define __EAB_VCARD_CONTROL_H__
-
-#include <bonobo/bonobo-control.h>
-
-BonoboControl *eab_vcard_control_new (void);
-
-#endif /* __EAB_VCARD_CONTROL_H__ */
diff --git a/addressbook/gui/widgets/gal-view-factory-minicard.c b/addressbook/gui/widgets/gal-view-factory-minicard.c
deleted file mode 100644
index 6e8df82a4a..0000000000
--- a/addressbook/gui/widgets/gal-view-factory-minicard.c
+++ /dev/null
@@ -1,85 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-/*
- * gal-view-factory-minicard.c: A View Factory
- *
- * Authors:
- *   Chris Lahey <clahey@ximian.com>
- *
- * (C) 2000, 2001 Ximian, Inc.
- */
-
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
-
-#include <glib.h>
-#include <libgnome/gnome-i18n.h>
-#include "gal-view-factory-minicard.h"
-#include "gal-view-minicard.h"
-
-G_DEFINE_TYPE (GalViewFactoryMinicard, gal_view_factory_minicard, GAL_VIEW_FACTORY_TYPE)
-
-static const char *
-gal_view_factory_minicard_get_title       (GalViewFactory *factory)
-{
-	return _("Card View");
-}
-
-static GalView *
-gal_view_factory_minicard_new_view        (GalViewFactory *factory,
-					   const char     *name)
-{
-	return gal_view_minicard_new(name);
-}
-
-static const char *
-gal_view_factory_minicard_get_type_code (GalViewFactory *factory)
-{
-	return "minicard";
-}
-
-static void
-gal_view_factory_minicard_class_init      (GalViewFactoryMinicardClass *minicard_class)
-{
-	GalViewFactoryClass *view_factory_class = GAL_VIEW_FACTORY_CLASS(minicard_class);
-
-	view_factory_class->get_title           = gal_view_factory_minicard_get_title;
-	view_factory_class->new_view            = gal_view_factory_minicard_new_view;
-	view_factory_class->get_type_code       = gal_view_factory_minicard_get_type_code;
-}
-
-static void
-gal_view_factory_minicard_init            (GalViewFactoryMinicard *factory)
-{
-}
-
-/**
- * gal_view_minicard_new
- *
- * A new GalViewFactory for creating Minicard views.  Create one of
- * these and pass it to GalViewCollection for use.
- *
- * Returns: The new GalViewFactoryMinicard.
- */
-GalViewFactory *
-gal_view_factory_minicard_new        (void)
-{
-	return gal_view_factory_minicard_construct (g_object_new (GAL_TYPE_VIEW_FACTORY_MINICARD, NULL));
-}
-
-/**
- * gal_view_minicard_construct
- * @factory: The factory to construct
- *
- * constructs the GalViewFactoryMinicard.  To be used by subclasses and
- * language bindings.
- *
- * Returns: The GalViewFactoryMinicard.
- */
-GalViewFactory *
-gal_view_factory_minicard_construct  (GalViewFactoryMinicard *factory)
-{
-	return GAL_VIEW_FACTORY(factory);
-}
-
-
diff --git a/addressbook/gui/widgets/gal-view-factory-minicard.h b/addressbook/gui/widgets/gal-view-factory-minicard.h
deleted file mode 100644
index 02eea99e47..0000000000
--- a/addressbook/gui/widgets/gal-view-factory-minicard.h
+++ /dev/null
@@ -1,35 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-/*
- * gal-view-factory-minicard.c: A View Factory
- *
- * Authors:
- *   Chris Lahey <clahey@ximian.com>
- *
- * (C) 2000, 2001 Ximian, Inc.
- */
-#ifndef _GAL_VIEW_FACTORY_MINICARD_H_
-#define _GAL_VIEW_FACTORY_MINICARD_H_
-
-#include <gtk/gtkobject.h>
-#include <gal/menus/gal-view-factory.h>
-
-#define GAL_TYPE_VIEW_FACTORY_MINICARD        (gal_view_factory_minicard_get_type ())
-#define GAL_VIEW_FACTORY_MINICARD(o)          (G_TYPE_CHECK_INSTANCE_CAST ((o), GAL_TYPE_VIEW_FACTORY_MINICARD, GalViewFactoryMinicard))
-#define GAL_VIEW_FACTORY_MINICARD_CLASS(k)    (G_TYPE_CHECK_CLASS_CAST((k), GAL_TYPE_VIEW_FACTORY_MINICARD, GalViewFactoryMinicardClass))
-#define GAL_IS_VIEW_FACTORY_MINICARD(o)       (G_TYPE_CHECK_INSTANCE_TYPE ((o), GAL_TYPE_VIEW_FACTORY_MINICARD))
-#define GAL_IS_VIEW_FACTORY_MINICARD_CLASS(k) (G_TYPE_CHECK_CLASS_TYPE ((k), GAL_TYPE_VIEW_FACTORY_MINICARD))
-
-typedef struct {
-	GalViewFactory base;
-} GalViewFactoryMinicard;
-
-typedef struct {
-	GalViewFactoryClass parent_class;
-} GalViewFactoryMinicardClass;
-
-/* Standard functions */
-GType           gal_view_factory_minicard_get_type   (void);
-GalViewFactory *gal_view_factory_minicard_new        (void);
-GalViewFactory *gal_view_factory_minicard_construct  (GalViewFactoryMinicard *factory);
-
-#endif /* _GAL_VIEW_FACTORY_MINICARD_H_ */
diff --git a/addressbook/gui/widgets/gal-view-factory-treeview.c b/addressbook/gui/widgets/gal-view-factory-treeview.c
deleted file mode 100644
index d983a636d1..0000000000
--- a/addressbook/gui/widgets/gal-view-factory-treeview.c
+++ /dev/null
@@ -1,84 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8
-       -*- */
-/*
- * gal-view-factory-treeview.c: A View Factory
- *
- * Authors:
- *   Chris Lahey <clahey@ximian.com>
- *
- * (C) 2000, 2001 Ximian, Inc.
- */
-
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
-
-#include <glib.h>
-#include <libgnome/gnome-i18n.h>
-#include "gal-view-factory-treeview.h"
-#include "gal-view-treeview.h"
-
-G_DEFINE_TYPE(GalViewFactoryTreeView, gal_view_factory_treeview, GAL_VIEW_FACTORY_TYPE)
-
-static const char *
-gal_view_factory_treeview_get_title       (GalViewFactory *factory)
-{
-	return _("GTK Tree View");
-}
-
-static GalView *
-gal_view_factory_treeview_new_view        (GalViewFactory *factory,
-					   const char     *name)
-{
-	return gal_view_treeview_new(name);
-}
-
-static const char *
-gal_view_factory_treeview_get_type_code (GalViewFactory *factory)
-{
-	return "treeview";
-}
-
-static void
-gal_view_factory_treeview_class_init      (GalViewFactoryTreeViewClass *treeview_class)
-{
-	GalViewFactoryClass *view_factory_class = GAL_VIEW_FACTORY_CLASS(treeview_class);
-
-	view_factory_class->get_title           = gal_view_factory_treeview_get_title;
-	view_factory_class->new_view            = gal_view_factory_treeview_new_view;
-	view_factory_class->get_type_code       = gal_view_factory_treeview_get_type_code;
-}
-
-static void
-gal_view_factory_treeview_init            (GalViewFactoryTreeView *factory)
-{
-}
-
-/**
- * gal_view_treeview_new
- *
- * A new GalViewFactory for creating TreeView views.  Create one of
- * these and pass it to GalViewCollection for use.
- *
- * Returns: The new GalViewFactoryTreeView.
- */
-GalViewFactory *
-gal_view_factory_treeview_new        (void)
-{
-	return gal_view_factory_treeview_construct (g_object_new (GAL_TYPE_VIEW_FACTORY_TREEVIEW, NULL));
-}
-
-/**
- * gal_view_treeview_construct
- * @factory: The factory to construct
- *
- * constructs the GalViewFactoryTreeView.  To be used by subclasses and
- * language bindings.
- *
- * Returns: The GalViewFactoryTreeView.
- */
-GalViewFactory *
-gal_view_factory_treeview_construct  (GalViewFactoryTreeView *factory)
-{
-	return GAL_VIEW_FACTORY(factory);
-}
diff --git a/addressbook/gui/widgets/gal-view-factory-treeview.h b/addressbook/gui/widgets/gal-view-factory-treeview.h
deleted file mode 100644
index 4795c6d3aa..0000000000
--- a/addressbook/gui/widgets/gal-view-factory-treeview.h
+++ /dev/null
@@ -1,35 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-/*
- * gal-view-factory-treeview.c: A View Factory
- *
- * Authors:
- *   Chris Toshok <toshok@ximian.com>
- *
- * (C) 2000, 2001 Ximian, Inc.
- */
-#ifndef _GAL_VIEW_FACTORY_TREEVIEW_H_
-#define _GAL_VIEW_FACTORY_TREEVIEW_H_
-
-#include <gtk/gtkobject.h>
-#include <gal/menus/gal-view-factory.h>
-
-#define GAL_TYPE_VIEW_FACTORY_TREEVIEW        (gal_view_factory_treeview_get_type ())
-#define GAL_VIEW_FACTORY_TREEVIEW(o)          (G_TYPE_CHECK_INSTANCE_CAST ((o), GAL_TYPE_VIEW_FACTORY_TREEVIEW, GalViewFactoryTreeView))
-#define GAL_VIEW_FACTORY_TREEVIEW_CLASS(k)    (G_TYPE_CHECK_CLASS_CAST((k), GAL_TYPE_VIEW_FACTORY_TREEVIEW, GalViewFactoryTreeViewClass))
-#define GAL_IS_VIEW_FACTORY_TREEVIEW(o)       (G_TYPE_CHECK_INSTANCE_TYPE ((o), GAL_TYPE_VIEW_FACTORY_TREEVIEW))
-#define GAL_IS_VIEW_FACTORY_TREEVIEW_CLASS(k) (G_TYPE_CHECK_CLASS_TYPE ((k), GAL_TYPE_VIEW_FACTORY_TREEVIEW))
-
-typedef struct {
-	GalViewFactory base;
-} GalViewFactoryTreeView;
-
-typedef struct {
-	GalViewFactoryClass parent_class;
-} GalViewFactoryTreeViewClass;
-
-/* Standard functions */
-GType           gal_view_factory_treeview_get_type   (void);
-GalViewFactory *gal_view_factory_treeview_new        (void);
-GalViewFactory *gal_view_factory_treeview_construct  (GalViewFactoryTreeView *factory);
-
-#endif /* _GAL_VIEW_FACTORY_TREEVIEW_H_ */
diff --git a/addressbook/gui/widgets/gal-view-minicard.c b/addressbook/gui/widgets/gal-view-minicard.c
deleted file mode 100644
index 7f07d2d81d..0000000000
--- a/addressbook/gui/widgets/gal-view-minicard.c
+++ /dev/null
@@ -1,221 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-/*
- * gal-view-minicard.c: An Minicard View
- *
- * Authors:
- *   Chris Lahey <clahey@ximian.com>
- *
- * (C) 2000, 2001 Ximian, Inc.
- */
-#include <config.h>
-#include "gal-view-minicard.h"
-#include <libxml/parser.h>
-#include <gal/util/e-xml-utils.h>
-
-#define PARENT_TYPE gal_view_get_type ()
-#define d(x) x
-
-static GalViewClass *gal_view_minicard_parent_class;
-
-static void  
-gal_view_minicard_load (GalView *view,
-			const char *filename)
-{
-	xmlDoc *doc;
-	doc = xmlParseFile (filename);
-	if (doc) {
-		xmlNode *root = xmlDocGetRootElement(doc);
-		GAL_VIEW_MINICARD (view)->column_width = e_xml_get_double_prop_by_name_with_default (root, "column_width", 150);
-		xmlFreeDoc(doc);
-	}
-}
-
-static void
-gal_view_minicard_save (GalView *view,
-			const char *filename)
-{
-	xmlDoc *doc;
-	xmlNode *root;
-
-	doc = xmlNewDoc("1.0");
-	root = xmlNewNode (NULL, "EMinicardViewState");
-	e_xml_set_double_prop_by_name (root, "column_width", GAL_VIEW_MINICARD (view)->column_width);
-	xmlDocSetRootElement(doc, root);
-	xmlSaveFile(filename, doc);
-	xmlFreeDoc(doc);
-}
-
-static const char *
-gal_view_minicard_get_title       (GalView *view)
-{
-	return GAL_VIEW_MINICARD(view)->title;
-}
-
-static void
-gal_view_minicard_set_title       (GalView *view,
-				 const char *title)
-{
-	g_free(GAL_VIEW_MINICARD(view)->title);
-	GAL_VIEW_MINICARD(view)->title = g_strdup(title);
-}
-
-static const char *
-gal_view_minicard_get_type_code (GalView *view)
-{
-	return "minicard";
-}
-
-static GalView *
-gal_view_minicard_clone       (GalView *view)
-{
-	GalViewMinicard *gvm, *new;
-
-	gvm = GAL_VIEW_MINICARD(view);
-
-	new               = g_object_new (GAL_TYPE_VIEW_MINICARD, NULL);
-	new->title        = g_strdup (gvm->title);
-	new->column_width = gvm->column_width;
-
-	return GAL_VIEW(new);
-}
-
-static void
-gal_view_minicard_dispose         (GObject *object)
-{
-	GalViewMinicard *view = GAL_VIEW_MINICARD(object);
-
-	if (view->title != NULL) {
-		gal_view_minicard_detach (view);
-		g_free(view->title);
-		view->title = NULL;
-	}
-
-	if (G_OBJECT_CLASS (gal_view_minicard_parent_class)->dispose)
-		(* G_OBJECT_CLASS (gal_view_minicard_parent_class)->dispose) (object);
-}
-
-static void
-gal_view_minicard_class_init      (GObjectClass *object_class)
-{
-	GalViewClass *gal_view_class  = GAL_VIEW_CLASS(object_class);
-	gal_view_minicard_parent_class  = g_type_class_ref (PARENT_TYPE);
-
-	gal_view_class->edit          = NULL			       ;
-	gal_view_class->load          = gal_view_minicard_load         ;
-	gal_view_class->save          = gal_view_minicard_save         ;
-	gal_view_class->get_title     = gal_view_minicard_get_title    ;
-	gal_view_class->set_title     = gal_view_minicard_set_title    ;
-	gal_view_class->get_type_code = gal_view_minicard_get_type_code;
-	gal_view_class->clone         = gal_view_minicard_clone        ;
-
-	object_class->dispose         = gal_view_minicard_dispose      ;
-}
-
-static void
-gal_view_minicard_init      (GalViewMinicard *gvm)
-{
-	gvm->title = NULL;
-	gvm->column_width = 150.0;
-
-	gvm->emvw = NULL;
-	gvm->emvw_column_width_changed_id = 0;
-}
-
-/**
- * gal_view_minicard_new
- * @title: The name of the new view.
- *
- * Returns a new GalViewMinicard.  This is primarily for use by
- * GalViewFactoryMinicard.
- *
- * Returns: The new GalViewMinicard.
- */
-GalView *
-gal_view_minicard_new (const gchar *title)
-{
-	return gal_view_minicard_construct (g_object_new (GAL_TYPE_VIEW_MINICARD, NULL), title);
-}
-
-/**
- * gal_view_minicard_construct
- * @view: The view to construct.
- * @title: The name of the new view.
- *
- * constructs the GalViewMinicard.  To be used by subclasses and
- * language bindings.
- *
- * Returns: The GalViewMinicard.
- */
-GalView *
-gal_view_minicard_construct  (GalViewMinicard *view,
-			      const gchar *title)
-{
-	view->title = g_strdup(title);
-	return GAL_VIEW(view);
-}
-
-GType
-gal_view_minicard_get_type        (void)
-{
-	static GType type = 0;
-
-	if (!type) {
-		static const GTypeInfo info =  {
-			sizeof (GalViewMinicardClass),
-			NULL,           /* base_init */
-			NULL,           /* base_finalize */
-			(GClassInitFunc) gal_view_minicard_class_init,
-			NULL,           /* class_finalize */
-			NULL,           /* class_data */
-			sizeof (GalViewMinicard),
-			0,             /* n_preallocs */
-			(GInstanceInitFunc) gal_view_minicard_init,
-		};
-
-		type = g_type_register_static (PARENT_TYPE, "GalViewMinicard", &info, 0);
-	}
-
-	return type;
-}
-
-static void
-column_width_changed (EMinicardViewWidget *w, double width, GalViewMinicard *view)
-{
-	d(g_print("%s: Old width = %f, New width = %f\n", G_GNUC_FUNCTION, view->column_width, width));
-	if (view->column_width != width) {
-		view->column_width = width;
-		gal_view_changed(GAL_VIEW(view));
-	}
-}
-
-void
-gal_view_minicard_attach (GalViewMinicard *view, EMinicardViewWidget *emvw)
-{
-	gal_view_minicard_detach (view);
-
-	view->emvw = emvw;
-
-	g_object_ref (view->emvw);
-
-	g_object_set (view->emvw,
-		      "column_width", view->column_width,
-		      NULL);
-
-	view->emvw_column_width_changed_id =
-		g_signal_connect(view->emvw, "column_width_changed",
-				 G_CALLBACK (column_width_changed), view);
-}
-
-void
-gal_view_minicard_detach (GalViewMinicard *view)
-{
-	if (view->emvw == NULL)
-		return;
-	if (view->emvw_column_width_changed_id) {
-		g_signal_handler_disconnect (view->emvw,
-					     view->emvw_column_width_changed_id);
-		view->emvw_column_width_changed_id = 0;
-	}
-	g_object_unref (view->emvw);
-	view->emvw = NULL;
-}
diff --git a/addressbook/gui/widgets/gal-view-minicard.h b/addressbook/gui/widgets/gal-view-minicard.h
deleted file mode 100644
index e586012f73..0000000000
--- a/addressbook/gui/widgets/gal-view-minicard.h
+++ /dev/null
@@ -1,45 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-/*
- * gal-view-minicard.h: An Minicard View
- *
- * Authors:
- *   Chris Lahey <clahey@ximian.com>
- *
- * (C) 2000, 2001 Ximian, Inc.
- */
-#ifndef _GAL_VIEW_MINICARD_H_
-#define _GAL_VIEW_MINICARD_H_
-
-#include <gal/menus/gal-view.h>
-#include <e-minicard-view-widget.h>
-
-#define GAL_TYPE_VIEW_MINICARD        (gal_view_minicard_get_type ())
-#define GAL_VIEW_MINICARD(o)          (G_TYPE_CHECK_INSTANCE_CAST ((o), GAL_TYPE_VIEW_MINICARD, GalViewMinicard))
-#define GAL_VIEW_MINICARD_CLASS(k)    (G_TYPE_CHECK_CLASS_CAST((k), GAL_TYPE_VIEW_MINICARD, GalViewMinicardClass))
-#define GAL_IS_VIEW_MINICARD(o)       (G_TYPE_CHECK_INSTANCE_TYPE ((o), GAL_TYPE_VIEW_MINICARD))
-#define GAL_IS_VIEW_MINICARD_CLASS(k) (G_TYPE_CHECK_CLASS_TYPE ((k), GAL_TYPE_VIEW_MINICARD))
-
-typedef struct {
-	GalView              base;
-
-	char                *title;
-	double               column_width;
-
-	EMinicardViewWidget *emvw;
-	guint                emvw_column_width_changed_id;
-} GalViewMinicard;
-
-typedef struct {
-	GalViewClass parent_class;
-} GalViewMinicardClass;
-
-/* Standard functions */
-GType    gal_view_minicard_get_type   (void);
-GalView *gal_view_minicard_new        (const gchar         *title);
-GalView *gal_view_minicard_construct  (GalViewMinicard     *view,
-				       const gchar         *title);
-void     gal_view_minicard_attach     (GalViewMinicard     *view,
-				       EMinicardViewWidget *emvw);
-void     gal_view_minicard_detach     (GalViewMinicard     *view);
-
-#endif /* _GAL_VIEW_MINICARD_H_ */
diff --git a/addressbook/gui/widgets/gal-view-treeview.c b/addressbook/gui/widgets/gal-view-treeview.c
deleted file mode 100644
index e18ae6341b..0000000000
--- a/addressbook/gui/widgets/gal-view-treeview.c
+++ /dev/null
@@ -1,234 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-/*
- * gal-view-treeview.c: An TreeView View
- *
- * Authors:
- *   Chris Lahey <clahey@ximian.com>
- *
- * (C) 2000, 2001 Ximian, Inc.
- */
-#include <config.h>
-#include "gal-view-treeview.h"
-#include <libxml/parser.h>
-#include <gal/util/e-xml-utils.h>
-
-#define PARENT_TYPE gal_view_get_type ()
-#define d(x) x
-
-static GalViewClass *gal_view_treeview_parent_class;
-
-static void
-gal_view_treeview_edit            (GalView *view, GtkWindow *parent_window)
-{
-	/* GalViewTreeView *treeview_view = GAL_VIEW_TREEVIEW(view); */
-}
-
-static void  
-gal_view_treeview_load (GalView *view,
-			const char *filename)
-{
-#if 0
-	xmlDoc *doc;
-	doc = xmlParseFile (filename);
-	if (doc) {
-		xmlNode *root = xmlDocGetRootElement(doc);
-		GAL_VIEW_TREEVIEW (view)->column_width = e_xml_get_double_prop_by_name_with_default (root, "column_width", 150);
-		xmlFreeDoc(doc);
-	}
-#endif
-}
-
-static void
-gal_view_treeview_save (GalView *view,
-			const char *filename)
-{
-#if 0
-	xmlDoc *doc;
-	xmlNode *root;
-
-	doc = xmlNewDoc("1.0");
-	root = xmlNewNode (NULL, "ETreeViewViewState");
-	e_xml_set_double_prop_by_name (root, "column_width", GAL_VIEW_TREEVIEW (view)->column_width);
-	xmlDocSetRootElement(doc, root);
-	xmlSaveFile(filename, doc);
-	xmlFreeDoc(doc);
-#endif
-}
-
-static const char *
-gal_view_treeview_get_title       (GalView *view)
-{
-	return GAL_VIEW_TREEVIEW(view)->title;
-}
-
-static void
-gal_view_treeview_set_title       (GalView *view,
-				 const char *title)
-{
-	g_free(GAL_VIEW_TREEVIEW(view)->title);
-	GAL_VIEW_TREEVIEW(view)->title = g_strdup(title);
-}
-
-static const char *
-gal_view_treeview_get_type_code (GalView *view)
-{
-	return "treeview";
-}
-
-static GalView *
-gal_view_treeview_clone       (GalView *view)
-{
-	GalViewTreeView *gvm, *new;
-
-	gvm = GAL_VIEW_TREEVIEW(view);
-
-	new               = g_object_new (GAL_TYPE_VIEW_TREEVIEW, NULL);
-	new->title        = g_strdup (gvm->title);
-
-	return GAL_VIEW(new);
-}
-
-static void
-gal_view_treeview_dispose         (GObject *object)
-{
-	GalViewTreeView *view = GAL_VIEW_TREEVIEW(object);
-
-	if (view->title != NULL) {
-		gal_view_treeview_detach (view);
-		g_free(view->title);
-		view->title = NULL;
-	}
-
-	if (G_OBJECT_CLASS (gal_view_treeview_parent_class)->dispose)
-		(* G_OBJECT_CLASS (gal_view_treeview_parent_class)->dispose) (object);
-}
-
-static void
-gal_view_treeview_class_init      (GObjectClass *object_class)
-{
-	GalViewClass *gal_view_class  = GAL_VIEW_CLASS(object_class);
-	gal_view_treeview_parent_class  = g_type_class_ref (PARENT_TYPE);
-
-	gal_view_class->edit          = gal_view_treeview_edit         ;
-	gal_view_class->load          = gal_view_treeview_load         ;
-	gal_view_class->save          = gal_view_treeview_save         ;
-	gal_view_class->get_title     = gal_view_treeview_get_title    ;
-	gal_view_class->set_title     = gal_view_treeview_set_title    ;
-	gal_view_class->get_type_code = gal_view_treeview_get_type_code;
-	gal_view_class->clone         = gal_view_treeview_clone        ;
-
-	object_class->dispose         = gal_view_treeview_dispose      ;
-}
-
-static void
-gal_view_treeview_init      (GalViewTreeView *gvm)
-{
-	gvm->title = NULL;
-
-	gvm->tree = NULL;
-}
-
-/**
- * gal_view_treeview_new
- * @title: The name of the new view.
- *
- * Returns a new GalViewTreeView.  This is primarily for use by
- * GalViewFactoryTreeView.
- *
- * Returns: The new GalViewTreeView.
- */
-GalView *
-gal_view_treeview_new (const gchar *title)
-{
-	return gal_view_treeview_construct (g_object_new (GAL_TYPE_VIEW_TREEVIEW, NULL), title);
-}
-
-/**
- * gal_view_treeview_construct
- * @view: The view to construct.
- * @title: The name of the new view.
- *
- * constructs the GalViewTreeView.  To be used by subclasses and
- * language bindings.
- *
- * Returns: The GalViewTreeView.
- */
-GalView *
-gal_view_treeview_construct  (GalViewTreeView *view,
-			      const gchar *title)
-{
-	view->title = g_strdup(title);
-	return GAL_VIEW(view);
-}
-
-GType
-gal_view_treeview_get_type        (void)
-{
-	static GType type = 0;
-
-	if (!type) {
-		static const GTypeInfo info =  {
-			sizeof (GalViewTreeViewClass),
-			NULL,           /* base_init */
-			NULL,           /* base_finalize */
-			(GClassInitFunc) gal_view_treeview_class_init,
-			NULL,           /* class_finalize */
-			NULL,           /* class_data */
-			sizeof (GalViewTreeView),
-			0,             /* n_preallocs */
-			(GInstanceInitFunc) gal_view_treeview_init,
-		};
-
-		type = g_type_register_static (PARENT_TYPE, "GalViewTreeView", &info, 0);
-	}
-
-	return type;
-}
-
-#if 0
-static void
-column_width_changed (ETable *table, double width, GalViewMinicard *view)
-{
-	d(g_print("%s: Old width = %f, New width = %f\n", G_GNUC_FUNCTION, view->column_width, width));
-	if (view->column_width != width) {
-		view->column_width = width;
-		gal_view_changed(GAL_VIEW(view));
-	}
-}
-#endif
-
-void
-gal_view_treeview_attach (GalViewTreeView *view, GtkTreeView *tree)
-{
-#if 0
-	gal_view_treeview_detach (view);
-
-	view->emvw = emvw;
-
-	g_object_ref (view->emvw);
-
-	g_object_set (view->emvw,
-		      "column_width", view->column_width,
-		      NULL);
-
-	view->emvw_column_width_changed_id =
-		g_signal_connect(view->emvw, "column_width_changed",
-				 G_CALLBACK (column_width_changed), view);
-#endif
-}
-
-void
-gal_view_treeview_detach (GalViewTreeView *view)
-{
-#if 0
-	if (view->emvw == NULL)
-		return;
-	if (view->emvw_column_width_changed_id) {
-		g_signal_handler_disconnect (view->emvw,
-					     view->emvw_column_width_changed_id);
-		view->emvw_column_width_changed_id = 0;
-	}
-	g_object_unref (view->emvw);
-	view->emvw = NULL;
-#endif
-}
diff --git a/addressbook/gui/widgets/gal-view-treeview.h b/addressbook/gui/widgets/gal-view-treeview.h
deleted file mode 100644
index a0313856a6..0000000000
--- a/addressbook/gui/widgets/gal-view-treeview.h
+++ /dev/null
@@ -1,43 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-/*
- * gal-view-treeview.h: An TreeView View
- *
- * Authors:
- *   Chris Toshok <toshok@ximian.com>
- *
- * (C) 2000, 2001 Ximian, Inc.
- */
-#ifndef _GAL_VIEW_TREEVIEW_H_
-#define _GAL_VIEW_TREEVIEW_H_
-
-#include <gal/menus/gal-view.h>
-#include <gtk/gtktreeview.h>
-
-#define GAL_TYPE_VIEW_TREEVIEW        (gal_view_treeview_get_type ())
-#define GAL_VIEW_TREEVIEW(o)          (G_TYPE_CHECK_INSTANCE_CAST ((o), GAL_TYPE_VIEW_TREEVIEW, GalViewTreeView))
-#define GAL_VIEW_TREEVIEW_CLASS(k)    (G_TYPE_CHECK_CLASS_CAST((k), GAL_TYPE_VIEW_TREEVIEW, GalViewTreeViewClass))
-#define GAL_IS_VIEW_TREEVIEW(o)       (G_TYPE_CHECK_INSTANCE_TYPE ((o), GAL_TYPE_VIEW_TREEVIEW))
-#define GAL_IS_VIEW_TREEVIEW_CLASS(k) (G_TYPE_CHECK_CLASS_TYPE ((k), GAL_TYPE_VIEW_TREEVIEW))
-
-typedef struct {
-	GalView              base;
-
-	char                *title;
-
-	GtkTreeView         *tree;
-} GalViewTreeView;
-
-typedef struct {
-	GalViewClass parent_class;
-} GalViewTreeViewClass;
-
-/* Standard functions */
-GType    gal_view_treeview_get_type   (void);
-GalView *gal_view_treeview_new        (const gchar         *title);
-GalView *gal_view_treeview_construct  (GalViewTreeView     *view,
-				       const gchar         *title);
-void     gal_view_treeview_attach     (GalViewTreeView     *view,
-				       GtkTreeView *tree);
-void     gal_view_treeview_detach     (GalViewTreeView     *view);
-
-#endif /* _GAL_VIEW_TREEVIEW_H_ */
diff --git a/addressbook/gui/widgets/test-reflow.c b/addressbook/gui/widgets/test-reflow.c
deleted file mode 100644
index 081c061f3e..0000000000
--- a/addressbook/gui/widgets/test-reflow.c
+++ /dev/null
@@ -1,179 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-/* test-reflow.c
- *
- * Copyright (C) 2000 Ximian, Inc.
- * Author: Chris Lahey <clahey@ximian.com>
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of version 2 of the GNU General Public
- * License as published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * General Public License for more details.
- *
- * You should have received a copy of the GNU General Public
- * License along with this program; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
- */
-
-#define TEST_VCARD                   \
-"BEGIN:VCARD
-"                      \
-"FN:Nat
-"                           \
-"N:Friedman;Nat;D;Mr.
-"             \
-"TITLE:Head Geek
-"                  \
-"BDAY:1977-08-06
-"                  \
-"TEL;WORK:617 679 1984
-"            \
-"TEL;CELL:123 456 7890
-"            \
-"EMAIL;INTERNET:nat@nat.org
-"       \
-"EMAIL;INTERNET:nat@ximian.com
-" \
-"ADR;WORK;POSTAL:P.O. Box 101;;;Any Town;CA;91921-1234;
-" \
-"ADR;HOME;POSTAL;INTL:P.O. Box 202;;;Any Town 2;MI;12344-4321;USA
-" \
-"END:VCARD
-"                        \
-"
-"
-
-
-#include "config.h"
-
-#include <gtk/gtkmain.h>
-#include <gtk/gtkvbox.h>
-#include <libgnomeui/gnome-canvas-rect-ellipse.h>
-#include <libgnomeui/gnome-init.h>
-#include <gal/widgets/e-canvas.h>
-#include <gal/widgets/e-reflow.h>
-#include <gal/widgets/e-scroll-frame.h>
-
-#include "e-minicard.h"
-
-/* This is a horrible thing to do, but it is just a test. */
-GnomeCanvasItem *reflow;
-GnomeCanvasItem *rect;
-GtkAllocation last_alloc;
-
-static void destroy_callback(gpointer data, GObject *where_object_was)
-{
-  exit(0);
-}
-
-static void allocate_callback(GtkWidget *canvas, GtkAllocation *allocation, gpointer data)
-{
-  double width;
-  last_alloc = *allocation;
-  gnome_canvas_item_set( reflow,
-			 "height", (double) allocation->height,
-			 NULL );
-  gnome_canvas_item_set( reflow,
-			 "minimum_width", (double) allocation->width,
-			 NULL );
-  g_object_get(reflow,
-	       "width", &width,
-	       NULL);
-  width = MAX(width, allocation->width);
-  gnome_canvas_set_scroll_region(GNOME_CANVAS( canvas ), 0, 0, width - 1, allocation->height - 1);
-  gnome_canvas_item_set( rect,
-			 "x2", (double) width,
-			 "y2", (double) allocation->height,
-			 NULL );
-}
-
-static void resize(GnomeCanvas *canvas, gpointer data)
-{
-	double width;
-	g_object_get(reflow,
-		     "width", &width,
-		     NULL);
-	width = MAX(width, last_alloc.width);
-	gnome_canvas_set_scroll_region(canvas , 0, 0, width - 1, last_alloc.height - 1);
-	gnome_canvas_item_set( rect,
-			       "x2", (double) width,
-			       "y2", (double) last_alloc.height,
-			       NULL );	
-}
-
-int main( int argc, char *argv[] )
-{
-  GtkWidget *app;
-  GtkWidget *canvas;
-  GtkWidget *vbox;
-  GtkWidget *scrollframe;
-  int i;
-
-  /*  bindtextdomain (PACKAGE, GNOMELOCALEDIR);
-      textdomain (PACKAGE);*/
-
-  gnome_init( "Reflow Test", VERSION, argc, argv);
-  app = gnome_app_new("Reflow Test", NULL);
-
-  vbox = gtk_vbox_new(FALSE, 0);
-
-  canvas = e_canvas_new();
-  rect = gnome_canvas_item_new( gnome_canvas_root( GNOME_CANVAS( canvas ) ),
-				gnome_canvas_rect_get_type(),
-				"x1", (double) 0,
-				"y1", (double) 0,
-				"x2", (double) 100,
-				"y2", (double) 100,
-				"fill_color", "white",
-				NULL );
-  reflow = gnome_canvas_item_new( gnome_canvas_root( GNOME_CANVAS( canvas ) ),
-				  e_reflow_get_type(),
-				  "height", (double) 100,
-				  "minimum_width", (double) 100,
-				  NULL );
-  g_signal_connect( canvas, "reflow",
-		    G_CALLBACK ( resize ),
-		    ( gpointer ) app);
-  for ( i = 0; i < 200; i++ )
-    {
-      GnomeCanvasItem *item;
-      ECard *card = e_card_new (TEST_VCARD);
-      item = gnome_canvas_item_new( GNOME_CANVAS_GROUP(reflow),
-				    e_minicard_get_type(),
-				    "card", card,
-				    NULL);
-      e_reflow_add_item(E_REFLOW(reflow), item, NULL);
-    }
-  gnome_canvas_set_scroll_region ( GNOME_CANVAS( canvas ),
-				   0, 0,
-				   100, 100 );
-
-  scrollframe = e_scroll_frame_new (gtk_layout_get_hadjustment(GTK_LAYOUT(canvas)),
-				    gtk_layout_get_vadjustment(GTK_LAYOUT(canvas)));
-  e_scroll_frame_set_policy (E_SCROLL_FRAME (scrollframe),
-			     GTK_POLICY_AUTOMATIC,
-			     GTK_POLICY_NEVER);
-  
-  gtk_container_add (GTK_CONTAINER (scrollframe), canvas);
-
-  gnome_app_set_contents( GNOME_APP( app ), scrollframe );
-
-  /* Connect the signals */
-  g_object_weak_ref (app, destroy_callback, app);
-
-  g_signal_connect( canvas, "size_allocate",
-		    G_CALLBACK ( allocate_callback ),
-		    ( gpointer ) app );
-
-  gtk_widget_show_all( app );
-  gdk_window_set_back_pixmap( GTK_LAYOUT(canvas)->bin_window, NULL, FALSE);
-
-  gtk_main(); 
-
-  /* Not reached. */
-  return 0;
-}
diff --git a/addressbook/importers/.cvsignore b/addressbook/importers/.cvsignore
deleted file mode 100644
index 665a07cc24..0000000000
--- a/addressbook/importers/.cvsignore
+++ /dev/null
@@ -1,8 +0,0 @@
-.deps
-.libs
-Makefile
-Makefile.in
-*.lo
-*.la
-GNOME_Evolution_Addressbook*.server
-GNOME_Evolution_Addressbook*.server.in
diff --git a/addressbook/importers/GNOME_Evolution_Addressbook_LDIF_Importer.server.in.in b/addressbook/importers/GNOME_Evolution_Addressbook_LDIF_Importer.server.in.in
deleted file mode 100644
index 954ff9eece..0000000000
--- a/addressbook/importers/GNOME_Evolution_Addressbook_LDIF_Importer.server.in.in
+++ /dev/null
@@ -1,29 +0,0 @@
-<oaf_info>
-
-<oaf_server iid="OAFIID:GNOME_Evolution_Addressbook_LDIF_ImporterFactory:@VERSION@"
-	    type="shlib"
-	    location="@IMPORTERSDIR@/libevolution-addressbook-ldif-importer.so">
-
-	<oaf_attribute name="repo_ids" type="stringv">
-		<item value="IDL:GNOME/ObjectFactory:1.0"/>
-	</oaf_attribute>
-
-	<oaf_attribute name="name" type="string"
-		       _value="Evolution LDIF importer"/>
-</oaf_server>
-
-<oaf_server iid="OAFIID:GNOME_Evolution_Addressbook_LDIF_Importer:@VERSION@"
-	    type="factory"
-	    location="OAFIID:GNOME_Evolution_Addressbook_LDIF_ImporterFactory:@VERSION@">
-
-	<oaf_attribute name="repo_ids" type="stringv">
-		<item value="IDL:GNOME/Evolution/Importer:@VERSION@"/>
-	</oaf_attribute>
-
-	<oaf_attribute name="evolution:menu_name" type="string"
-		       _value="LDAP Data Interchange Format (.ldif)"/>
-	<oaf_attribute name="name" type="string"
-		       _value="Evolution LDIF importer"/>
-</oaf_server>
-
-</oaf_info>
diff --git a/addressbook/importers/GNOME_Evolution_Addressbook_VCard_Importer.server.in.in b/addressbook/importers/GNOME_Evolution_Addressbook_VCard_Importer.server.in.in
deleted file mode 100644
index ead2acb5f3..0000000000
--- a/addressbook/importers/GNOME_Evolution_Addressbook_VCard_Importer.server.in.in
+++ /dev/null
@@ -1,29 +0,0 @@
-<oaf_info>
-
-<oaf_server iid="OAFIID:GNOME_Evolution_Addressbook_VCard_ImporterFactory:@VERSION@"
-	    type="shlib"
-	    location="@IMPORTERSDIR@/libevolution-addressbook-vcard-importer.so">
-
-	<oaf_attribute name="repo_ids" type="stringv">
-		<item value="IDL:GNOME/ObjectFactory:1.0"/>
-	</oaf_attribute>
-
-	<oaf_attribute name="name" type="string"
-		       _value="Evolution VCard Importer"/>
-</oaf_server>
-
-<oaf_server iid="OAFIID:GNOME_Evolution_Addressbook_VCard_Importer:@VERSION@"
-	    type="factory"
-	    location="OAFIID:GNOME_Evolution_Addressbook_VCard_ImporterFactory:@VERSION@">
-
-	<oaf_attribute name="repo_ids" type="stringv">
-		<item value="IDL:GNOME/Evolution/Importer:@VERSION@"/>
-	</oaf_attribute>
-
-	<oaf_attribute name="evolution:menu_name" type="string"
-		       _value="VCard (.vcf, .gcrd)"/>
-	<oaf_attribute name="name" type="string"
-		       _value="Evolution VCard Importer"/>
-</oaf_server>
-
-</oaf_info>
diff --git a/addressbook/importers/Makefile.am b/addressbook/importers/Makefile.am
deleted file mode 100644
index 3c04c22f37..0000000000
--- a/addressbook/importers/Makefile.am
+++ /dev/null
@@ -1,53 +0,0 @@
-importersdir = $(privlibdir)/evolution-addressbook-importers
-
-importers_LTLIBRARIES = 				\
-	libevolution-addressbook-ldif-importer.la	\
-	libevolution-addressbook-vcard-importer.la
-
-INCLUDES = 						\
-	-DEVOLUTION_LOCALEDIR=\""$(localedir)"\"	\
-	-DEVOLUTION_SOUNDDIR=\""$(soundsdir)"\"		\
-	-DG_LOG_DOMAIN=\"Evolution-Importer\"		\
-	-I$(top_srcdir)					\
-	-I$(top_builddir)/shell				\
-	-I$(top_srcdir)/shell				\
-	-I$(top_srcdir)/addressbook			\
-	-I$(top_builddir)/addressbook			\
-	$(EVOLUTION_ADDRESSBOOK_CFLAGS)
-
-# VCard Importer
-libevolution_addressbook_vcard_importer_la_SOURCES =	\
-	evolution-vcard-importer.c
-
-libevolution_addressbook_vcard_importer_la_LDFLAGS = -avoid-version -module
-
-libevolution_addressbook_vcard_importer_la_LIBADD = \
-	$(top_builddir)/shell/importer/libevolution-importer.la 	\
-	$(top_builddir)/e-util/libeutil.la 				\
-	$(IMPORTERS_LIBS)
-
-# LDIF Importer
-libevolution_addressbook_ldif_importer_la_SOURCES =	\
-	evolution-ldif-importer.c
-
-libevolution_addressbook_ldif_importer_la_LDFLAGS = -avoid-version -module
-
-libevolution_addressbook_ldif_importer_la_LIBADD = \
-	$(top_builddir)/shell/importer/libevolution-importer.la 	\
-	$(top_builddir)/e-util/libeutil.la 				\
-	$(IMPORTERS_LIBS)
-
-server_in_files = 						\
-	GNOME_Evolution_Addressbook_LDIF_Importer.server.in.in	\
-	GNOME_Evolution_Addressbook_VCard_Importer.server.in.in
-server_DATA = $(server_in_files:.server.in.in=_$(BASE_VERSION).server)
-@EVO_SERVER_RULE@
-@INTLTOOL_SERVER_RULE@
-
-BUILT_SOURCES = $(server_DATA)
-CLEANFILES = $(BUILT_SOURCES)
-
-EXTRA_DIST = $(server_in_files)
-
-dist-hook:
-	cd $(distdir); rm -f $(BUILT_SOURCES)
diff --git a/addressbook/importers/evolution-ldif-importer.c b/addressbook/importers/evolution-ldif-importer.c
deleted file mode 100644
index a2203f7e8b..0000000000
--- a/addressbook/importers/evolution-ldif-importer.c
+++ /dev/null
@@ -1,655 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-
-/* 
- * LDIF importer.  LDIF is the file format of an exported Netscape
- * addressbook.
- *
- * Framework copied from evolution-gnomecard-importer.c
- *
- * Michael M. Morrison (mmorrison@kqcorp.com)
- *
- * Multi-line value support, mailing list support, base64 support, and
- * various fixups: Chris Toshok (toshok@ximian.com)
- */
-
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
-
-#include <stdio.h>
-#include <ctype.h>
-#include <string.h>
-
-#include <gtk/gtkwidget.h>
-#include <gtk/gtkvbox.h>
-#include <libgnome/gnome-init.h>
-#include <bonobo/bonobo-shlib-factory.h>
-#include <bonobo/bonobo-main.h>
-#include <bonobo/bonobo-control.h>
-
-#include <libebook/e-book.h>
-#include <libedataserverui/e-source-selector.h>
-
-#include <importer/evolution-importer.h>
-#include <importer/GNOME_Evolution_Importer.h>
-#include <libebook/e-destination.h>
-
-#define COMPONENT_FACTORY_IID "OAFIID:GNOME_Evolution_Addressbook_LDIF_ImporterFactory:" BASE_VERSION
-#define COMPONENT_IID "OAFIID:GNOME_Evolution_Addressbook_LDIF_Importer:" BASE_VERSION
-
-static GHashTable *dn_contact_hash;
-
-typedef struct {
-	ESource *primary;
-	
-	GList *contactlist;
-	GList *iterator;
-	EBook *book;
-	gboolean ready;
-} LDIFImporter;
-
-static struct {
-	char *ldif_attribute;
-	EContactField contact_field;
-#define FLAG_ADDRESS 0x01
-#define FLAG_LIST 0x02
-	int flags;
-}
-ldif_fields[] = {
-	{ "cn", E_CONTACT_FULL_NAME },
-	{ "mail", E_CONTACT_EMAIL, FLAG_LIST },
-#if 0
-	{ "givenname", E_CONTACT_GIVEN_NAME },
-#endif
-	{ "sn", E_CONTACT_FAMILY_NAME },
-	{ "xmozillanickname", E_CONTACT_NICKNAME },
-	{ "o", E_CONTACT_ORG },
-	{ "locality", 0, FLAG_ADDRESS},
-	{ "st", 0, FLAG_ADDRESS },
-	{ "streetaddress", 0, FLAG_ADDRESS },
-	{ "title", E_CONTACT_TITLE },
-	{ "postalcode", 0, FLAG_ADDRESS },
-	{ "countryname", 0, FLAG_ADDRESS },
-	{ "telephonenumber", E_CONTACT_PHONE_BUSINESS},
-	{ "homephone", E_CONTACT_PHONE_HOME },
-	{ "facsimiletelephonenumber", E_CONTACT_PHONE_BUSINESS_FAX },
-	{ "ou", E_CONTACT_ORG_UNIT },
-	{ "pagerphone", E_CONTACT_PHONE_PAGER },
-	{ "cellphone", E_CONTACT_PHONE_MOBILE },
-	{ "mobile", E_CONTACT_PHONE_MOBILE },
-	{ "homeurl", E_CONTACT_HOMEPAGE_URL },
-	{ "description", E_CONTACT_NOTE },
-	{ "xmozillausehtmlmail", E_CONTACT_WANTS_HTML }
-};
-static int num_ldif_fields = sizeof(ldif_fields) / sizeof (ldif_fields[0]);
-
-static unsigned char base64_rank[256] = {
-	255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,
-	255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,
-	255,255,255,255,255,255,255,255,255,255,255, 62,255,255,255, 63,
-	 52, 53, 54, 55, 56, 57, 58, 59, 60, 61,255,255,255,  0,255,255,
-	255,  0,  1,  2,  3,  4,  5,  6,  7,  8,  9, 10, 11, 12, 13, 14,
-	 15, 16, 17, 18, 19, 20, 21, 22, 23, 24, 25,255,255,255,255,255,
-	255, 26, 27, 28, 29, 30, 31, 32, 33, 34, 35, 36, 37, 38, 39, 40,
-	 41, 42, 43, 44, 45, 46, 47, 48, 49, 50, 51,255,255,255,255,255,
-	255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,
-	255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,
-	255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,
-	255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,
-	255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,
-	255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,
-	255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,
-	255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,
-};
-
-/**
- * base64_decode_step: decode a chunk of base64 encoded data
- * @in: input stream
- * @len: max length of data to decode
- * @out: output stream
- * @state: holds the number of bits that are stored in @save
- * @save: leftover bits that have not yet been decoded
- *
- * Decodes a chunk of base64 encoded data
- **/
-static int
-base64_decode_step(unsigned char *in, int len, unsigned char *out, int *state, unsigned int *save)
-{
-	register unsigned char *inptr, *outptr;
-	unsigned char *inend, c;
-	register unsigned int v;
-	int i;
-
-	inend = in+len;
-	outptr = out;
-
-	/* convert 4 base64 bytes to 3 normal bytes */
-	v=*save;
-	i=*state;
-	inptr = in;
-	while (inptr<inend) {
-		c = base64_rank[*inptr++];
-		if (c != 0xff) {
-			v = (v<<6) | c;
-			i++;
-			if (i==4) {
-				*outptr++ = v>>16;
-				*outptr++ = v>>8;
-				*outptr++ = v;
-				i=0;
-			}
-		}
-	}
-
-	*save = v;
-	*state = i;
-
-	/* quick scan back for '=' on the end somewhere */
-	/* fortunately we can drop 1 output char for each trailing = (upto 2) */
-	i=2;
-	while (inptr>in && i) {
-		inptr--;
-		if (base64_rank[*inptr] != 0xff) {
-			if (*inptr == '=')
-				outptr--;
-			i--;
-		}
-	}
-
-	/* if i!= 0 then there is a truncation error! */
-	return outptr-out;
-}
-
-static int
-base64_decode_simple (char *data, int len)
-{
-	int state = 0;
-	unsigned int save = 0;
-
-	return base64_decode_step ((unsigned char *)data, len,
-				   (unsigned char *)data, &state, &save);
-}
-
-static GString *
-getValue( char **src )
-{
-	GString *dest = g_string_new("");
-	char *s = *src;
-	gboolean need_base64 = (*s == ':');
-
- copy_line:
-	while( *s != 0 && *s != '\n' && *s != '\r' )
-		dest = g_string_append_c (dest, *s++);
-
-	if (*s == '\r') s++;
-	if (*s == '\n')	s++;
-
-	/* check for continuation here */
-	if (*s == ' ') {
-		s++;
-		goto copy_line;
-	}
-
-	if (need_base64) {
-		int new_len;
-		/* it's base64 encoded */
-		dest = g_string_erase (dest, 0, 2);
-		new_len = base64_decode_simple (dest->str, strlen (dest->str));
-		dest = g_string_truncate (dest, new_len);
-	}
-
-	*src = s;
-
-	return dest;
-}
-
-static gboolean
-parseLine (EContact *contact, EContactAddress *address, char **buf)
-{
-	char *ptr;
-	char *colon, *value;
-	gboolean field_handled;
-	GString *ldif_value;
-
-	ptr = *buf;
-
-	/* if the string is empty, return */
-	if (*ptr == '\0') {
-		*buf = NULL;
-		return TRUE;
-	}
-
-	/* skip comment lines */
-	if (*ptr == '#') {
-		ptr = strchr (ptr, '\n');
-		if (!ptr)
-			*buf = NULL;
-		else
-			*buf = ptr + 1;
-		return TRUE;
-	}
-
-	/* first, check for a 'continuation' line */
-	if( ptr[0] == ' ' && ptr[1] != '\n' ) {
-		g_warning ("unexpected continuation line");
-		return FALSE;
-	}
-
-	colon = (char *)strchr( ptr, ':' );
-	if (colon) {
-		int i;
-
-		*colon = 0;
-		value = colon + 1;
-		while ( isspace(*value) )
-			value++;
-
-		ldif_value = getValue(&value );
-
-		field_handled = FALSE;
-		for (i = 0; i < num_ldif_fields; i ++) {
-			if (!g_ascii_strcasecmp (ptr, ldif_fields[i].ldif_attribute)) {
-				if (ldif_fields[i].flags & FLAG_ADDRESS) {
-					if (!g_ascii_strcasecmp (ptr, "locality"))
-						address->locality = g_strdup (ldif_value->str);
-					else if (!g_ascii_strcasecmp (ptr, "countryname"))
-						address->country = g_strdup (ldif_value->str);
-					else if (!g_ascii_strcasecmp (ptr, "postalcode"))
-						address->code = g_strdup (ldif_value->str);
-					else if (!g_ascii_strcasecmp (ptr, "st"))
-						address->region = g_strdup (ldif_value->str);
-					else if (!g_ascii_strcasecmp (ptr, "streetaddress"))
-						address->street = g_strdup (ldif_value->str);
-				}
-				else if (ldif_fields[i].flags & FLAG_LIST) {
-					GList *list;
-
-					list = e_contact_get (contact, ldif_fields[i].contact_field);
-					list = g_list_append (list, g_strdup (ldif_value->str));
-					e_contact_set (contact, ldif_fields[i].contact_field, list);
-
-					g_list_foreach (list, (GFunc) g_free, NULL);
-					g_list_free (list);
-				}
-				else {
-					/* FIXME is everything a string? */
-					e_contact_set (contact, ldif_fields[i].contact_field, ldif_value->str);
-					g_message ("set %s to %s", ptr, ldif_value->str);
-				}
-				field_handled = TRUE;
-				break;
-			}
-		}
-
-		/* handle objectclass/dn/member out here */
-		if (!field_handled) {
-			if (!g_ascii_strcasecmp (ptr, "dn"))
-				g_hash_table_insert (dn_contact_hash, g_strdup(ldif_value->str), contact);
-			else if (!g_ascii_strcasecmp (ptr, "objectclass") && !g_ascii_strcasecmp (ldif_value->str, "groupofnames")) {
-				e_contact_set (contact, E_CONTACT_IS_LIST, GINT_TO_POINTER (TRUE));
-			}
-			else if (!g_ascii_strcasecmp (ptr, "member")) {
-				GList *email;
-
-				email = e_contact_get (contact, E_CONTACT_EMAIL);
-				email = g_list_append (email, g_strdup (ldif_value->str));
-				e_contact_set (contact, E_CONTACT_EMAIL, email);
-
-				g_list_foreach (email, (GFunc) g_free, NULL);
-				g_list_free (email);
-			}
-		}
-
-		/* put the colon back the way it was, just for kicks */
-		*colon = ':';
-
-		g_string_free (ldif_value, TRUE);
-	}
-	else {
-		g_warning ("unrecognized entry %s", ptr);
-		return FALSE;
-	}
-
-	*buf = value;
-
-	return TRUE;
-}
-
-static EContact *
-getNextLDIFEntry( FILE *f )
-{
-	EContact *contact;
-	EContactAddress *address;
-	GString *str;
-	char line[1024];
-	char *buf;
-
-	str = g_string_new ("");
-	/* read from the file until we get to a blank line (or eof) */
-	while (!feof (f)) {
-		if (!fgets (line, sizeof(line), f))
-			break;
-		if (line[0] == '\n' || (line[0] == '\r' && line[1] == '\n'))
-			break;
-		str = g_string_append (str, line);
-	}
-
-	if (strlen (str->str) == 0) {
-		g_string_free (str, TRUE);
-		return NULL;
-	}
-
-	/* now parse that entry */
-	contact = e_contact_new ();
-	address = g_new0 (EContactAddress, 1);
-
-	buf = str->str;
-	while (buf) {
-		if (!parseLine (contact, address, &buf)) {
-			/* parsing error */
-			g_object_unref (contact);
-			return NULL;
-		}
-	}
-
-	/* fill in the address */
-	if (address->locality || address->country ||
-	    address->code || address->region || address->street)
-		e_contact_set (contact, E_CONTACT_ADDRESS_HOME, address);
-
-	g_string_free (str, TRUE);
-
-	return contact;
-}
-
-static void
-resolve_list_card (LDIFImporter *gci, EContact *contact)
-{
-	GList *email, *l;
-	GList *email_attrs = NULL;
-	char *full_name;
-
-	/* set file_as to full_name so we don't later try and figure
-           out a first/last name for the list. */
-	full_name = e_contact_get (contact, E_CONTACT_FULL_NAME);
-	if (full_name)
-		e_contact_set (contact, E_CONTACT_FILE_AS, full_name);
-	g_free (full_name);
-
-	/* FIMXE getting might not be implemented in ebook */
-	email = e_contact_get (contact, E_CONTACT_EMAIL);
-	for (l = email; l; l = l->next) {
-		/* mozilla stuffs dn's in the EMAIL list for contact lists */
-		char *dn = l->data;
-		EContact *dn_contact = g_hash_table_lookup (dn_contact_hash, dn);
-
-		/* break list chains here, since we don't support them just yet */
-		if (dn_contact && !e_contact_get (dn_contact, E_CONTACT_IS_LIST)) {
-			EDestination *dest;
-			EVCardAttribute *attr = e_vcard_attribute_new (NULL, EVC_EMAIL);
-
-			/* Hard-wired for default e-mail, since netscape only exports 1 email address */
-			dest = e_destination_new ();
-			e_destination_set_contact (dest, dn_contact, 0);
-
-			e_destination_export_to_vcard_attribute (dest, attr);
-
-			g_object_unref (dest);
-
-			email_attrs = g_list_append (email_attrs, attr);
-		}
-	}		
-	e_contact_set_attributes (contact, E_CONTACT_EMAIL, email_attrs);
-
-	g_list_foreach (email, (GFunc) g_free, NULL);
-	g_list_free (email);
-	g_list_foreach (email_attrs, (GFunc) e_vcard_attribute_free, NULL);
-	g_list_free (email_attrs);
-}
-
-static GList *
-create_contacts_from_ldif (const char *filename)
-{
-	GList * list = NULL;
-	GList * list_list = NULL;
-	FILE * file;
-	EContact *contact;
-
-	if(!( file = fopen( filename, "r" ) )) {
-		g_warning("Can't open .ldif file");
-		return NULL;
-	}
-
-	dn_contact_hash = g_hash_table_new (g_str_hash, g_str_equal);
-
-	while ((contact = getNextLDIFEntry (file))) {
-
-		if (e_contact_get (contact, E_CONTACT_IS_LIST))
-			list_list = g_list_append (list_list, contact);
-		else
-			list = g_list_append (list, contact);
-	}
-
-	fclose (file);
-
-	list = g_list_reverse (list);
-	list_list = g_list_reverse (list_list);
-	list = g_list_concat (list, list_list);
-
-	return list;
-}
-
-static void
-add_to_notes (EContact *contact, EContactField field)
-{
-	const gchar *old_text;
-	const gchar *field_text;
-	gchar       *new_text;
-
-	old_text = e_contact_get_const (contact, E_CONTACT_NOTE);
-	if (old_text && strstr (old_text, e_contact_pretty_name (field)))
-		return;
-
-	field_text = e_contact_get_const (contact, field);
-	if (!field_text || !*field_text)
-		return;
-
-	new_text = g_strdup_printf ("%s%s%s: %s",
-				    old_text ? old_text : "",
-				    old_text && *old_text &&
-				    *(old_text + strlen (old_text) - 1) != '\n' ? "\n" : "",
-				    e_contact_pretty_name (field), field_text);
-	e_contact_set (contact, E_CONTACT_NOTE, new_text);
-	g_free (new_text);
-}
-
-/* EvolutionImporter methods */
-static void
-process_item_fn (EvolutionImporter *importer,
-		 CORBA_Object listener,
-		 void *closure,
-		 CORBA_Environment *ev)
-{
-	LDIFImporter *gci = (LDIFImporter *) closure;
-	EContact *contact;
-
-	if (gci->iterator == NULL)
-		gci->iterator = gci->contactlist;
-
-	if (gci->ready == FALSE) {
-		GNOME_Evolution_ImporterListener_notifyResult (listener,
-							       GNOME_Evolution_ImporterListener_NOT_READY,
-							       gci->iterator ? TRUE : FALSE, 
-							       ev);
-		return;
-	}
-	
-	if (gci->iterator == NULL) {
-		GNOME_Evolution_ImporterListener_notifyResult (listener,
-							       GNOME_Evolution_ImporterListener_UNSUPPORTED_OPERATION,
-							       FALSE, ev);
-		return;
-	}
-
-	contact = gci->iterator->data;
-	if (e_contact_get (contact, E_CONTACT_IS_LIST))
-		resolve_list_card (gci, contact);
-	else {
-		/* Work around the fact that these fields no longer show up in the UI */
-		add_to_notes (contact, E_CONTACT_OFFICE);
-		add_to_notes (contact, E_CONTACT_SPOUSE);
-		add_to_notes (contact, E_CONTACT_BLOG_URL);
-	}
-
-	/* FIXME Error checking */
-	e_book_add_contact (gci->book, contact, NULL);
-
-	gci->iterator = gci->iterator->next;
-
-	GNOME_Evolution_ImporterListener_notifyResult (listener,
-						       GNOME_Evolution_ImporterListener_OK,
-						       gci->iterator ? TRUE : FALSE, 
-						       ev);
-	if (ev->_major != CORBA_NO_EXCEPTION) {
-		g_warning ("Error notifying listeners.");
-	}
-	
-	return;
-}
-
-static void
-primary_selection_changed_cb (ESourceSelector *selector, gpointer data)
-{
-	LDIFImporter *gci = data;
-
-	if (gci->primary)
-		g_object_unref (gci->primary);
-	gci->primary = g_object_ref (e_source_selector_peek_primary_selection (selector));
-}
-
-static void
-create_control_fn (EvolutionImporter *importer, Bonobo_Control *control, void *closure)
-{
-	LDIFImporter *gci = closure;
-	GtkWidget *vbox, *selector;
-	ESource *primary;
-	ESourceList *source_list;	
-	
-	vbox = gtk_vbox_new (FALSE, FALSE);
-	
-	/* FIXME Better error handling */
-	if (!e_book_get_addressbooks (&source_list, NULL))
-		return;		
-
-	selector = e_source_selector_new (source_list);
-	e_source_selector_show_selection (E_SOURCE_SELECTOR (selector), FALSE);
-	gtk_box_pack_start (GTK_BOX (vbox), selector, FALSE, TRUE, 6);
-	
-	/* FIXME What if no sources? */
-	primary = e_source_list_peek_source_any (source_list);
-	e_source_selector_set_primary_selection (E_SOURCE_SELECTOR (selector), primary);
-	if (!gci->primary)
-		gci->primary = g_object_ref (primary);
-	g_object_unref (source_list);
-		
-	g_signal_connect (G_OBJECT (selector), "primary_selection_changed",
-			  G_CALLBACK (primary_selection_changed_cb), gci);
-
-	gtk_widget_show_all (vbox);
-	
-	*control = BONOBO_OBJREF (bonobo_control_new (vbox));
-}
-
-static char *supported_extensions[2] = {
-	".ldif", NULL
-};
-
-static gboolean
-support_format_fn (EvolutionImporter *importer,
-		   const char *filename,
-		   void *closure)
-{
-	char *ext;
-	int i;
-
-	ext = strrchr (filename, '.');
-	if (ext == NULL) {
-		return FALSE;
-	}
-
-	for (i = 0; supported_extensions[i] != NULL; i++) {
-		if (strcmp (supported_extensions[i], ext) == 0)
-			return TRUE;
-	}
-
-	return FALSE;
-}
-
-static void
-importer_destroy_cb (gpointer data,
-		     GObject *where_object_was)
-{
-	LDIFImporter *gci = data;
-
-	if (gci->primary)
-		g_object_unref (gci->primary);
-	
-	if (gci->book)
-		g_object_unref (gci->book);
-
-	g_list_foreach (gci->contactlist, (GFunc) g_object_unref, NULL);
-	g_list_free (gci->contactlist);
-
-	g_free (gci);
-}
-
-static gboolean
-load_file_fn (EvolutionImporter *importer,
-	      const char *filename,
-	      void *closure)
-{
-	LDIFImporter *gci;
-
-	gci = (LDIFImporter *) closure;
-	gci->contactlist = NULL;
-	gci->iterator = NULL;
-	gci->ready = FALSE;
-
-	/* Load the book and the cards */
-	gci->book = e_book_new (gci->primary, NULL);
-	if (!gci->book) {
-		g_message (G_STRLOC ":Couldn't create EBook.");
-		return FALSE;
-	}
-	e_book_open (gci->book, TRUE, NULL);
-	gci->contactlist = create_contacts_from_ldif (filename);
-	gci->ready = TRUE;
-
-	return TRUE;
-}
-					   
-static BonoboObject *
-factory_fn (BonoboGenericFactory *_factory,
-	    const char *component_id,
-	    void *closure)
-{
-	EvolutionImporter *importer;
-	LDIFImporter *gci;
-
-	if (!strcmp (component_id, COMPONENT_IID)) {
-		gci = g_new0 (LDIFImporter, 1);
-		importer = evolution_importer_new (create_control_fn, support_format_fn, 
-						   load_file_fn, process_item_fn, NULL, gci);
-	
-		g_object_weak_ref (G_OBJECT (importer),
-				   importer_destroy_cb, gci);
-	
-		return BONOBO_OBJECT (importer);
-	}
-	else {
-		g_warning (COMPONENT_FACTORY_IID ": Don't know what to do with %s", component_id);
-		return NULL;
-	}
-}
-
-BONOBO_ACTIVATION_SHLIB_FACTORY (COMPONENT_FACTORY_IID, "Evolution LDIF importer Factory", factory_fn, NULL)
diff --git a/addressbook/importers/evolution-vcard-importer.c b/addressbook/importers/evolution-vcard-importer.c
deleted file mode 100644
index 8a141466eb..0000000000
--- a/addressbook/importers/evolution-vcard-importer.c
+++ /dev/null
@@ -1,552 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-/* Evolution calendar importer component
- *
- * Copyright (C) 2004  Novell, Inc.
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of version 2 of the GNU General Public
- * License as published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * General Public License for more details.
- *
- * You should have received a copy of the GNU General Public
- * License along with this program; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
- *
- * Authors: Chris Toshok <toshok@ximian.com>
- *          JP Rosevear <jpr@ximian.com>
- *
- */
-
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
-
-#include <stdio.h>
-#include <string.h>
-
-#include <gtk/gtkcheckbutton.h>
-#include <gtk/gtkhbox.h>
-#include <gtk/gtkvbox.h>
-#include <gtk/gtkmain.h>
-#include <gtk/gtklabel.h>
-#include <gtk/gtkradiobutton.h>
-#include <gtk/gtknotebook.h>
-#include <bonobo/bonobo-context.h>
-#include <bonobo/bonobo-shlib-factory.h>
-#include <bonobo/bonobo-control.h>
-
-#include <libebook/e-book.h>
-#include <libedataserverui/e-source-selector.h>
-
-#include <importer/evolution-importer.h>
-#include <importer/GNOME_Evolution_Importer.h>
-#include <util/eab-book-util.h>
-#include <libebook/e-destination.h>
-
-#define COMPONENT_FACTORY_IID "OAFIID:GNOME_Evolution_Addressbook_VCard_ImporterFactory:" BASE_VERSION
-#define COMPONENT_IID "OAFIID:GNOME_Evolution_Addressbook_VCard_Importer:" BASE_VERSION
-
-typedef struct {
-	ESource *primary;
-	
-	GList *contactlist;
-	GList *iterator;
-	EBook *book;
-	gboolean ready;
-} VCardImporter;
-
-static void
-add_to_notes (EContact *contact, EContactField field)
-{
-	const gchar *old_text;
-	const gchar *field_text;
-	gchar       *new_text;
-
-	old_text = e_contact_get_const (contact, E_CONTACT_NOTE);
-	if (old_text && strstr (old_text, e_contact_pretty_name (field)))
-		return;
-
-	field_text = e_contact_get_const (contact, field);
-	if (!field_text || !*field_text)
-		return;
-
-	new_text = g_strdup_printf ("%s%s%s: %s",
-				    old_text ? old_text : "",
-				    old_text && *old_text &&
-				    *(old_text + strlen (old_text) - 1) != '\n' ? "\n" : "",
-				    e_contact_pretty_name (field), field_text);
-	e_contact_set (contact, E_CONTACT_NOTE, new_text);
-	g_free (new_text);
-}
-
-/* EvolutionImporter methods */
-static void
-process_item_fn (EvolutionImporter *importer,
-		 CORBA_Object listener,
-		 void *closure,
-		 CORBA_Environment *ev)
-{
-	VCardImporter *gci = (VCardImporter *) closure;
-	EContact *contact;
-	EContactPhoto *photo;
-	GList *attrs, *attr;
-
-	if (gci->iterator == NULL)
-		gci->iterator = gci->contactlist;
-	
-	if (gci->ready == FALSE) {
-		GNOME_Evolution_ImporterListener_notifyResult (listener,
-							       GNOME_Evolution_ImporterListener_NOT_READY,
-							       gci->iterator ? TRUE : FALSE, 
-							       ev);
-		return;
-	}
-	
-	if (gci->iterator == NULL) {
-		GNOME_Evolution_ImporterListener_notifyResult (listener,
-							       GNOME_Evolution_ImporterListener_UNSUPPORTED_OPERATION,
-							       FALSE, ev);
-		return;
-	}
-	
-	contact = gci->iterator->data;
-
-	/* Apple's addressbook.app exports PHOTO's without a TYPE
-	   param, so let's figure out the format here if there's a
-	   PHOTO attribute missing a TYPE param.
-
-	   this is sort of a hack, as EContact sets the type for us if
-	   we use the setter.  so let's e_contact_get + e_contact_set
-	   on E_CONTACT_PHOTO.
-	*/
-	photo = e_contact_get (contact, E_CONTACT_PHOTO);
-	if (photo) {
-		e_contact_set (contact, E_CONTACT_PHOTO, photo);
-		e_contact_photo_free (photo);
-	}
-
-	/* Deal with our XML EDestination stuff in EMAIL attributes, if there is any. */
-	attrs = e_contact_get_attributes (contact, E_CONTACT_EMAIL);
-	for (attr = attrs; attr; attr = attr->next) {
-		EVCardAttribute *a = attr->data;
-		GList *v = e_vcard_attribute_get_values (a);
-
-		if (v && v->data) {
-			if (!strncmp ((char*)v->data, "<?xml", 5)) {
-				EDestination *dest = e_destination_import ((char*)v->data);
-
-				e_destination_export_to_vcard_attribute (dest, a);
-
-				g_object_unref (dest);
-
-			}
-		}
-	}
-	e_contact_set_attributes (contact, E_CONTACT_EMAIL, attrs);
-
-	/*
-	  Deal with TEL attributes that don't conform to what we need.
-
-	  1. if there's no location (HOME/WORK/OTHER), default to OTHER.
-	  2. if there's *only* a location specified, default to VOICE.
-	*/
-	attrs = e_vcard_get_attributes (E_VCARD (contact));
-	for (attr = attrs; attr; attr = attr->next) {
-		EVCardAttribute *a = attr->data;
-		gboolean location_only = TRUE;
-		gboolean no_location = TRUE;
-		GList *params, *param;
-
-		if (g_ascii_strcasecmp (e_vcard_attribute_get_name (a),
-					EVC_TEL))
-			continue;
-
-		params = e_vcard_attribute_get_params (a);
-		for (param = params; param; param = param->next) {
-			EVCardAttributeParam *p = param->data;
-			GList *vs, *v;
-
-			if (g_ascii_strcasecmp (e_vcard_attribute_param_get_name (p),
-						EVC_TYPE))
-				continue;
-
-			vs = e_vcard_attribute_param_get_values (p);
-			for (v = vs; v; v = v->next) {
-				if (!g_ascii_strcasecmp ((char*)v->data, "WORK") ||
-				    !g_ascii_strcasecmp ((char*)v->data, "HOME") ||
-				    !g_ascii_strcasecmp ((char*)v->data, "OTHER"))
-					no_location = FALSE;
-				else
-					location_only = FALSE;
-			}
-		}
-
-		if (location_only) {
-			/* add VOICE */
-			e_vcard_attribute_add_param_with_value (a,
-								e_vcard_attribute_param_new (EVC_TYPE),
-								"VOICE");
-		}
-		if (no_location) {
-			/* add OTHER */
-			e_vcard_attribute_add_param_with_value (a,
-								e_vcard_attribute_param_new (EVC_TYPE),
-								"OTHER");
-		}
-	}
-
-	/*
-	  Deal with ADR attributes that don't conform to what we need.
-
-	  if HOME or WORK isn't specified, add TYPE=OTHER.
-	*/
-	attrs = e_vcard_get_attributes (E_VCARD (contact));
-	for (attr = attrs; attr; attr = attr->next) {
-		EVCardAttribute *a = attr->data;
-		gboolean no_location = TRUE;
-		GList *params, *param;
-
-		if (g_ascii_strcasecmp (e_vcard_attribute_get_name (a),
-					EVC_ADR))
-			continue;
-
-		params = e_vcard_attribute_get_params (a);
-		for (param = params; param; param = param->next) {
-			EVCardAttributeParam *p = param->data;
-			GList *vs, *v;
-
-			if (g_ascii_strcasecmp (e_vcard_attribute_param_get_name (p),
-						EVC_TYPE))
-				continue;
-
-			vs = e_vcard_attribute_param_get_values (p);
-			for (v = vs; v; v = v->next) {
-				if (!g_ascii_strcasecmp ((char*)v->data, "WORK") ||
-				    !g_ascii_strcasecmp ((char*)v->data, "HOME"))
-					no_location = FALSE;
-			}
-		}
-
-		if (no_location) {
-			/* add OTHER */
-			e_vcard_attribute_add_param_with_value (a,
-								e_vcard_attribute_param_new (EVC_TYPE),
-								"OTHER");
-		}
-	}
-
-	/* Work around the fact that these fields no longer show up in the UI */
-	add_to_notes (contact, E_CONTACT_OFFICE);
-	add_to_notes (contact, E_CONTACT_SPOUSE);
-	add_to_notes (contact, E_CONTACT_BLOG_URL);
-
-	/* FIXME Error checking */
-	e_book_add_contact (gci->book, contact, NULL);
-	
-	gci->iterator = gci->iterator->next;
-	
-	GNOME_Evolution_ImporterListener_notifyResult (listener,
-						       GNOME_Evolution_ImporterListener_OK,
-						       gci->iterator ? TRUE : FALSE, 
-						       ev);
-	if (ev->_major != CORBA_NO_EXCEPTION) {
-		g_warning ("Error notifying listeners.");
-	}
-	
-	return;
-}
-
-static char *supported_extensions[3] = {
-	".vcf",
-	".gcrd",
-	NULL
-};
-
-#define BOM (gunichar2)0xFEFF
-#define ANTIBOM (gunichar2)0xFFFE
-
-static gboolean
-has_bom (const gunichar2 *utf16)
-{
-	
-	if ((utf16 == NULL) || (*utf16 == '\0')) {
-		return FALSE;
-	}
-
-	return ((*utf16 == BOM) || (*utf16 == ANTIBOM));
-}
-
-static void
-fix_utf16_endianness (gunichar2 *utf16)
-{
-	gunichar2 *it;
-
-
-	if ((utf16 == NULL) || (*utf16 == '\0')) {
-		return;		
-	}
-
-	if (*utf16 != ANTIBOM) {
-		return;
-	}
-
-	for (it = utf16; *it != '\0'; it++) {
-		*it = GUINT16_SWAP_LE_BE (*it);
-	}
-}
-
-/* Converts an UTF-16 string to an UTF-8 string removing the BOM character 
- * WARNING: this may modify the utf16 argument if the function detects the
- * string isn't using the local endianness
- */
-static gchar *
-utf16_to_utf8 (gunichar2 *utf16)
-{
-	
-	if (utf16 == NULL) {
-		return NULL;
-	}
-
-	fix_utf16_endianness (utf16);
-
-	if (*utf16 == BOM) {
-		utf16++;
-	}
-
-	return g_utf16_to_utf8 (utf16, -1, NULL, NULL, NULL);
-}
-
-
-enum _VCardEncoding {
-	VCARD_ENCODING_NONE,
-	VCARD_ENCODING_UTF8,
-	VCARD_ENCODING_UTF16,
-	VCARD_ENCODING_LOCALE
-};
-
-typedef enum _VCardEncoding VCardEncoding;
-
-
-/* Actually check the contents of this file */
-static VCardEncoding
-guess_vcard_encoding (const char *filename)
-{
-	FILE *handle;
-	char line[4096];
-	char *line_utf8;
-	VCardEncoding encoding = VCARD_ENCODING_NONE;
-
-	handle = fopen (filename, "r");
-	if (handle == NULL) {
-		g_print ("\n");
-		return VCARD_ENCODING_NONE;
-	}
-		
-	fgets (line, 4096, handle);
-	if (line == NULL) {
-		fclose (handle);
-		g_print ("\n");
-		return VCARD_ENCODING_NONE;
-	}
-	fclose (handle);
-	
-	if (has_bom ((gunichar2*)line)) {
-		gunichar2 *utf16 = (gunichar2*)line;
-		/* Check for a BOM to try to detect UTF-16 encoded vcards
-		 * (MacOSX address book creates such vcards for example)
-		 */
-		line_utf8 = utf16_to_utf8 (utf16);
-		if (line_utf8 == NULL) {
-			return VCARD_ENCODING_NONE;
-		}
-		encoding = VCARD_ENCODING_UTF16;
-	} else if (g_utf8_validate (line, -1, NULL)) {
-		line_utf8 = g_strdup (line);
-		encoding = VCARD_ENCODING_UTF8;
-	} else {
-		line_utf8 = g_locale_to_utf8 (line, -1, NULL, NULL, NULL);
-		if (line_utf8 == NULL) {
-			return VCARD_ENCODING_NONE;
-		}
-		encoding = VCARD_ENCODING_LOCALE;
-	}
-
-	if (g_ascii_strncasecmp (line_utf8, "BEGIN:VCARD", 11) != 0) {
-		encoding = VCARD_ENCODING_NONE;
-	}
-
-	g_free (line_utf8);
-	return encoding;
-}
-
-static gboolean 
-check_file_is_vcard (const char *filename)
-{
-	return guess_vcard_encoding (filename) != VCARD_ENCODING_NONE;
-}
-
-static void
-primary_selection_changed_cb (ESourceSelector *selector, gpointer data)
-{
-	VCardImporter *gci = data;
-
-	if (gci->primary)
-		g_object_unref (gci->primary);
-	gci->primary = g_object_ref (e_source_selector_peek_primary_selection (selector));
-}
-
-static void
-create_control_fn (EvolutionImporter *importer, Bonobo_Control *control, void *closure)
-{
-	VCardImporter *gci = closure;
-	GtkWidget *vbox, *selector;
-	ESource *primary;
-	ESourceList *source_list;	
-	
-	vbox = gtk_vbox_new (FALSE, FALSE);
-	
-	/* FIXME Better error handling */
-	if (!e_book_get_addressbooks (&source_list, NULL))
-		return;		
-
-	selector = e_source_selector_new (source_list);
-	e_source_selector_show_selection (E_SOURCE_SELECTOR (selector), FALSE);
-	gtk_box_pack_start (GTK_BOX (vbox), selector, FALSE, TRUE, 6);
-	
-	/* FIXME What if no sources? */
-	primary = e_source_list_peek_source_any (source_list);
-	e_source_selector_set_primary_selection (E_SOURCE_SELECTOR (selector), primary);
-	if (!gci->primary)
-		gci->primary = g_object_ref (primary);
-	g_object_unref (source_list);
-		
-	g_signal_connect (G_OBJECT (selector), "primary_selection_changed",
-			  G_CALLBACK (primary_selection_changed_cb), gci);
-
-	gtk_widget_show_all (vbox);
-	
-	*control = BONOBO_OBJREF (bonobo_control_new (vbox));
-}
-
-static gboolean
-support_format_fn (EvolutionImporter *importer,
-		   const char *filename,
-		   void *closure)
-{
-	char *ext;
-	int i;
-
-	ext = strrchr (filename, '.');
-	if (ext == NULL) {
-		return check_file_is_vcard (filename);
-	}
-	for (i = 0; supported_extensions[i] != NULL; i++) {
-		if (g_ascii_strcasecmp (supported_extensions[i], ext) == 0) {
-			return check_file_is_vcard (filename);
-		}
-	}
-
-	return FALSE;
-}
-
-static void
-importer_destroy_cb (gpointer data,
-		     GObject *where_object_was)
-{
-	VCardImporter *gci = data;
-
-	if (gci->primary)
-		g_object_unref (gci->primary);
-	
-	if (gci->book)
-		g_object_unref (gci->book);
-
-	g_list_foreach (gci->contactlist, (GFunc) g_object_unref, NULL);
-	g_list_free (gci->contactlist);
-
-	g_free (gci);
-}
-
-static gboolean
-load_file_fn (EvolutionImporter *importer,
-	      const char *filename,
-	      void *closure)
-{
-	VCardImporter *gci;
-	char *contents;
-	VCardEncoding encoding;
-
-	encoding = guess_vcard_encoding (filename);
-	if (encoding == VCARD_ENCODING_NONE) {
-		return FALSE;
-	}
-
-	gci = (VCardImporter *) closure;
-	gci->contactlist = NULL;
-	gci->iterator = NULL;
-	gci->ready = FALSE;
-	
-	/* Load the book */
-	gci->book = e_book_new (gci->primary, NULL);
-	if (!gci->book) {
-		g_message (G_STRLOC ":Couldn't create EBook.");
-		return FALSE;
-	}
-	e_book_open (gci->book, TRUE, NULL);
-
-	/* Load the file and the contacts */
-	if (!g_file_get_contents (filename, &contents, NULL, NULL)) {
-		g_message (G_STRLOC ":Couldn't read file.");
-		return FALSE;
-	}
-
-	if (encoding == VCARD_ENCODING_UTF16) {
-		gchar *tmp;
-		gunichar2 *contents_utf16 = (gunichar2*)contents;
-		tmp = utf16_to_utf8 (contents_utf16);
-		g_free (contents);
-		contents = tmp;
-	} else if (encoding == VCARD_ENCODING_LOCALE) {
-		gchar *tmp;
-		tmp = g_locale_to_utf8 (contents, -1, NULL, NULL, NULL);
-		g_free (contents);
-		contents = tmp;
-	}
-
-	gci->contactlist = eab_contact_list_from_string (contents);
-	g_free (contents);
-
-	gci->ready = TRUE;
-
-	return TRUE;
-}
-					   
-static BonoboObject *
-factory_fn (BonoboGenericFactory *_factory,
-	    const char *component_id,
-	    void *closure)
-{
-	EvolutionImporter *importer;
-	VCardImporter *gci;
-
-	if (!strcmp (component_id, COMPONENT_IID)) {
-		gci = g_new0 (VCardImporter, 1);
-		importer = evolution_importer_new (create_control_fn, support_format_fn, 
-						   load_file_fn, process_item_fn, NULL, gci);
-	
-		g_object_weak_ref (G_OBJECT (importer),
-				   importer_destroy_cb, gci);
-		return BONOBO_OBJECT (importer);
-	}
-	else {
-		g_warning (COMPONENT_FACTORY_IID ": Don't know what to do with %s", component_id);
-		return NULL;
-	}
-}
-
-BONOBO_ACTIVATION_SHLIB_FACTORY (COMPONENT_FACTORY_IID, "Evolution VCard Importer Factory", factory_fn, NULL)
diff --git a/addressbook/printing/.cvsignore b/addressbook/printing/.cvsignore
deleted file mode 100644
index 96194f7fd7..0000000000
--- a/addressbook/printing/.cvsignore
+++ /dev/null
@@ -1,9 +0,0 @@
-.deps
-.libs
-.pure
-Makefile
-Makefile.in
-*.lo
-*.la
-contact-print-test
-contact-print-style-editor-test
diff --git a/addressbook/printing/Makefile.am b/addressbook/printing/Makefile.am
deleted file mode 100644
index 8da93df0b8..0000000000
--- a/addressbook/printing/Makefile.am
+++ /dev/null
@@ -1,57 +0,0 @@
-ecpsdir    = $(privdatadir)/ecps
-ecps_DATA  =				\
-	smallbook.ecps			\
-	medbook.ecps			\
-	phonelist.ecps
-
-glade_DATA = 				\
-	e-contact-print.glade
-
-INCLUDES =					\
-	$(GNOME_INCLUDEDIR)			\
-	-DG_LOG_DOMAIN=\"addressbook-printing\"	\
-	-I$(top_srcdir)/addressbook		\
-	-I$(top_srcdir)/addressbook/backend	\
-	-I$(top_builddir)/addressbook/backend	\
-	-I$(top_srcdir)				\
-        -DEVOLUTION_GLADEDIR=\""$(gladedir)"\"	\
-	-DEVOLUTION_ECPSDIR=\""$(ecpsdir)"\"	\
-	$(EVOLUTION_ADDRESSBOOK_CFLAGS)
-
-noinst_LTLIBRARIES =				\
-	libecontactprint.la
-
-libecontactprint_la_SOURCES = 			\
-	e-contact-print-envelope.c		\
-	e-contact-print-envelope.h		\
-	e-contact-print-style-editor.c		\
-	e-contact-print-style-editor.h		\
-	e-contact-print-types.h			\
-	e-contact-print.c			\
-	e-contact-print.h
-
-noinst_PROGRAMS =			\
-	contact-print-test		\
-	contact-print-style-editor-test
-
-contact_print_test_SOURCES = 	\
-	test-print.c
-
-contact_print_test_LDADD =	\
-	libecontactprint.la					\
-	$(top_builddir)/addressbook/util/libeabutil.la		\
-	$(EVOLUTION_ADDRESSBOOK_LIBS)
-
-contact_print_style_editor_test_SOURCES = 	\
-	test-contact-print-style-editor.c
-
-contact_print_style_editor_test_LDADD =	\
-	libecontactprint.la					\
-	$(top_builddir)/addressbook/util/libeabutil.la		\
-	$(EVOLUTION_ADDRESSBOOK_LIBS)
-
-
-
-EXTRA_DIST = 		\
-	$(glade_DATA)	\
-	$(ecps_DATA)
diff --git a/addressbook/printing/e-contact-print-envelope.c b/addressbook/printing/e-contact-print-envelope.c
deleted file mode 100644
index 38532720fa..0000000000
--- a/addressbook/printing/e-contact-print-envelope.c
+++ /dev/null
@@ -1,243 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-/* 
- * e-contact-print-envelope.c
- * Copyright (C) 2000  Ximian, Inc.
- * Author: Chris Lahey <clahey@ximian.com>
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of version 2 of the GNU General Public
- * License as published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * General Public License for more details.
- *
- * You should have received a copy of the GNU General Public
- * License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
- */
-
-#include <config.h>
-#include "addressbook/printing/e-contact-print-envelope.h"
-#include <glib.h>
-#include <libgnome/gnome-i18n.h>
-#include <libgnomeui/gnome-dialog.h>
-#include <time.h>
-#include <libgnomeprintui/gnome-print-dialog.h>
-#include <libgnomeprint/gnome-print.h>
-#include <libgnomeprint/gnome-print-job.h>
-#include <libgnomeprintui/gnome-print-job-preview.h>
-#include <e-util/e-print.h>
-
-#define ENVELOPE_HEIGHT (72.0 * 4.0)
-#define ENVELOPE_WIDTH (72.0 * 9.5)
-
-typedef struct {
-	int start;
-	int length;
-} EcpeLine;
-
-static void
-startset(void *pointer, EcpeLine **iterator)
-{
-	(*iterator)--;
-	(*iterator)->start = GPOINTER_TO_INT(pointer);
-}
-
-static void
-lengthset(void *pointer, EcpeLine **iterator)
-{
-	(*iterator)--;
-	(*iterator)->length = GPOINTER_TO_INT(pointer);
-}
-
-static EcpeLine *
-ecpe_break(char *address)
-{
-	int i;
-	int length = 0;
-	int laststart = 0;
-	GList *startlist = NULL;
-	GList *lengthlist = NULL;
-	EcpeLine *ret_val;
-	EcpeLine *iterator;
-
-	for (i = 0; address[i]; i++) {
-		if (address[i] == '\n') {
-			startlist = g_list_prepend (startlist, GINT_TO_POINTER(laststart));
-			lengthlist = g_list_prepend (lengthlist, GINT_TO_POINTER(i - laststart));
-			length ++;
-			laststart = i + 1;
-		}
-	}
-	startlist = g_list_prepend (startlist, GINT_TO_POINTER(laststart));
-	lengthlist = g_list_prepend (lengthlist, GINT_TO_POINTER(i - laststart));
-	length ++;
-
-	ret_val = g_new(EcpeLine, length + 1);
-
-	iterator = ret_val + length;
-	g_list_foreach(startlist, (GFunc) startset, &iterator);
-	g_list_free(startlist);
-
-	iterator = ret_val + length;
-	g_list_foreach(lengthlist, (GFunc) lengthset, &iterator);
-	g_list_free(lengthlist);
-
-	ret_val[length].start = -1;
-	ret_val[length].length = -1;
-
-	return ret_val;
-}
-
-static void
-ecpe_linelist_dimensions(GnomeFont *font, char *address, EcpeLine *linelist, double *widthp, double *heightp)
-{
-	double width = 0;
-	int i;
-	if (widthp) {
-		for (i = 0; linelist[i].length != -1; i++) {
-			width = MAX(width, gnome_font_get_width_utf8_sized (font, address + linelist[i].start, linelist[i].length));
-		}
-		*widthp = width;
-	} else {
-		for (i = 0; linelist[i].length != -1; i++)
-			/* Intentionally empty */;
-	}
-	if (heightp) {
-		*heightp = gnome_font_get_size(font) * i;
-	}
-}
-
-static void
-ecpe_linelist_print(GnomePrintContext *pc, GnomeFont *font, char *address, EcpeLine *linelist, double x, double y)
-{
-	int i;
-	gnome_print_setfont(pc, font);
-	for (i = 0; linelist[i].length != -1; i++) {
-		gnome_print_moveto(pc, x, y + gnome_font_get_ascender(font));
-		gnome_print_show_sized (pc, address + linelist[i].start, linelist[i].length);
-		y -= gnome_font_get_size(font);
-	}
-}
-
-static gint
-e_contact_print_envelope_close(GnomeDialog *dialog, gpointer data)
-{
-	return FALSE;
-}
-
-static void
-ecpe_print(GnomePrintContext *pc, EContact *contact, gboolean as_return)
-{
-	char *address;
-	EcpeLine *linelist;
-	double x;
-	double y;
-	GnomeFont *font;
-	
-
-	gnome_print_rotate(pc, 90);
-	gnome_print_translate(pc, 72.0 * 11.0 - ENVELOPE_WIDTH, -72.0 * 8.5 + (72.0 * 8.5 - ENVELOPE_HEIGHT) / 2);
-
-	address = e_contact_get(contact, E_CONTACT_ADDRESS_LABEL_WORK);
-	linelist = ecpe_break(address);
-	if (as_return)
-		font = gnome_font_find ("Sans", 9);
-	else
-		font = gnome_font_find ("Sans", 12);
-	ecpe_linelist_dimensions(font, address, linelist, NULL, &y);
-	if (as_return) {
-		x = 36;
-		y = ENVELOPE_HEIGHT - 36;
-	} else {
-		x = ENVELOPE_WIDTH / 2;
-		y = (ENVELOPE_HEIGHT - y) / 2;
-	}
-	ecpe_linelist_print(pc, font, address, linelist, x, y);
-	g_object_unref(font);
-	g_free(linelist);
-
-	g_free(address);
-
-	gnome_print_showpage(pc);
-	gnome_print_context_close(pc);
-}
-
-static void
-e_contact_print_envelope_button(GnomeDialog *dialog, gint button, gpointer data)
-{
-	GnomePrintJob *master;
-	GnomePrintContext *pc;
-	GnomePrintConfig *config;
-	EContact *contact = NULL;
-	GtkWidget *preview;
-
-	contact = g_object_get_data(G_OBJECT(dialog), "contact");
-
-	switch( button ) {
-	case GNOME_PRINT_DIALOG_RESPONSE_PRINT:
-		config = gnome_print_dialog_get_config (GNOME_PRINT_DIALOG (dialog));
-		master = gnome_print_job_new (config);
-		pc = gnome_print_job_get_context( master );
-
-		ecpe_print(pc, contact, FALSE);
-		
-		gnome_print_job_print(master);
-		gnome_dialog_close(dialog);
-		break;
-	case GNOME_PRINT_DIALOG_RESPONSE_PREVIEW:
-		config = gnome_print_dialog_get_config (GNOME_PRINT_DIALOG (dialog));
-		master = gnome_print_job_new (config);
-		pc = gnome_print_job_get_context( master );
-
-		ecpe_print(pc, contact, FALSE);
-		
-		preview = GTK_WIDGET(gnome_print_job_preview_new(master, "Print Preview"));
-		gtk_widget_show_all(preview);
-		break;
-	case GNOME_PRINT_DIALOG_RESPONSE_CANCEL:
-		g_object_unref(contact);
-		gnome_dialog_close(dialog);
-		break;
-	}
-}
-
-GtkWidget *
-e_contact_print_envelope_dialog_new(EContact *contact)
-{
-	GtkWidget *dialog;
-	
-	dialog = e_print_get_dialog (_("Print envelope"), GNOME_PRINT_DIALOG_COPIES);
-
-	contact = e_contact_duplicate(contact);
-	g_object_set_data(G_OBJECT(dialog), "contact", contact);
-	g_signal_connect(dialog,
-			 "clicked", G_CALLBACK(e_contact_print_envelope_button), NULL);
-	g_signal_connect(dialog,
-			 "close", G_CALLBACK(e_contact_print_envelope_close), NULL);
-	return dialog;
-}
-
-/* FIXME: Print all the contacts selected. */
-GtkWidget *
-e_contact_print_envelope_list_dialog_new(GList *list)
-{
-	GtkWidget *dialog;
-	EContact *contact;
-
-	if (list == NULL)
-		return NULL;
-
-	dialog = e_print_get_dialog(_("Print envelope"), GNOME_PRINT_DIALOG_COPIES);
-
-	contact = e_contact_duplicate(list->data);
-	g_object_set_data(G_OBJECT(dialog), "contact", contact);
-	g_signal_connect(dialog,
-			 "clicked", G_CALLBACK(e_contact_print_envelope_button), NULL);
-	g_signal_connect(dialog,
-			 "close", G_CALLBACK(e_contact_print_envelope_close), NULL);
-	return dialog;
-}
diff --git a/addressbook/printing/e-contact-print-envelope.h b/addressbook/printing/e-contact-print-envelope.h
deleted file mode 100644
index a7a8492638..0000000000
--- a/addressbook/printing/e-contact-print-envelope.h
+++ /dev/null
@@ -1,32 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-/* 
- * e-contact-print-envelope.h
- * Copyright (C) 2000  Ximian, Inc.
- * Author: Chris Lahey <clahey@ximian.com>
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of version 2 of the GNU General Public
- * License as published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * General Public License for more details.
- *
- * You should have received a copy of the GNU General Public
- * License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
- */
-
-#ifndef E_CONTACT_PRINT_ENVELOPE_H
-#define E_CONTACT_PRINT_ENVELOPE_H
-
-#include <gtk/gtkwidget.h>
-#include <libebook/e-contact.h>
-#include "e-contact-print-types.h"
-
-GtkWidget *e_contact_print_envelope_dialog_new(EContact *contact);
-GtkWidget *e_contact_print_envelope_list_dialog_new(GList *list);
-
-#endif /* E_CONTACT_PRINT_ENVELOPE_H */
diff --git a/addressbook/printing/e-contact-print-style-editor.c b/addressbook/printing/e-contact-print-style-editor.c
deleted file mode 100644
index 436aaddff0..0000000000
--- a/addressbook/printing/e-contact-print-style-editor.c
+++ /dev/null
@@ -1,155 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-/* 
- * e-contact-print-style-editor.c
- * Copyright (C) 2000  Ximian, Inc.
- * Author: Chris Lahey <clahey@ximian.com>
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of version 2 of the GNU General Public
- * License as published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * General Public License for more details.
- *
- * You should have received a copy of the GNU General Public
- * License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
- */
-
-#include "e-contact-print-style-editor.h"
-
-static void e_contact_print_style_editor_init		(EContactPrintStyleEditor		 *card);
-static void e_contact_print_style_editor_class_init	(EContactPrintStyleEditorClass	 *klass);
-static void e_contact_print_style_editor_set_arg        (GtkObject *o, GtkArg *arg, guint arg_id);
-static void e_contact_print_style_editor_get_arg        (GtkObject *object, GtkArg *arg, guint arg_id);
-static void e_contact_print_style_editor_destroy        (GtkObject *object);
-
-static GtkVBoxClass *parent_class = NULL;
-
-
-/* The arguments we take */
-enum {
-	ARG_0,
-	ARG_CARD
-};
-
-GtkType
-e_contact_print_style_editor_get_type (void)
-{
-  static GtkType contact_print_style_editor_type = 0;
-
-  if (!contact_print_style_editor_type)
-    {
-      static const GtkTypeInfo contact_print_style_editor_info =
-      {
-        "EContactPrintStyleEditor",
-        sizeof (EContactPrintStyleEditor),
-        sizeof (EContactPrintStyleEditorClass),
-        (GtkClassInitFunc) e_contact_print_style_editor_class_init,
-        (GtkObjectInitFunc) e_contact_print_style_editor_init,
-        /* reserved_1 */ NULL,
-        /* reserved_2 */ NULL,
-        (GtkClassInitFunc) NULL,
-      };
-
-      contact_print_style_editor_type = gtk_type_unique (gtk_vbox_get_type (), &contact_print_style_editor_info);
-    }
-
-  return contact_print_style_editor_type;
-}
-
-static void
-e_contact_print_style_editor_class_init (EContactPrintStyleEditorClass *klass)
-{
-  GtkObjectClass *object_class;
-  GtkVBoxClass *vbox_class;
-
-  object_class = (GtkObjectClass*) klass;
-  vbox_class = (GtkVBoxClass *) klass;
-
-  parent_class = gtk_type_class (gtk_vbox_get_type ());
-  
-  object_class->set_arg = e_contact_print_style_editor_set_arg;
-  object_class->get_arg = e_contact_print_style_editor_get_arg;
-  object_class->destroy = e_contact_print_style_editor_destroy;
-}
-
-#if 0
-static void
-_add_image(GtkTable *table, gchar *image, int left, int right, int top, int bottom)
-{
-	gtk_table_attach(table,
-			 gtk_widget_new(gtk_alignment_get_type(),
-					"child", gnome_pixmap_new_from_file(image),
-					"xalign", (double) 0,
-					"yalign", (double) 0,
-					"xscale", (double) 0,
-					"yscale", (double) 0,
-					NULL),
-			 left, right, top, bottom,
-			 GTK_FILL, GTK_FILL,
-			 0, 0);
-}
-#endif
-
-static void
-e_contact_print_style_editor_init (EContactPrintStyleEditor *e_contact_print_style_editor)
-{
-	GladeXML *gui;
-
-	/*   e_contact_print_style_editor->card = NULL;*/
-	gui = glade_xml_new (EVOLUTION_GLADEDIR "/e-contact-print.glade", NULL, NULL);
-	e_contact_print_style_editor->gui = gui;
-	gtk_widget_reparent(glade_xml_get_widget(gui, "vbox-contact-print-style-editor"),
-			    GTK_WIDGET(e_contact_print_style_editor));
-}
-
-void
-e_contact_print_style_editor_destroy (GtkObject *object)
-{
-	EContactPrintStyleEditor *e_contact_print_style_editor = E_CONTACT_PRINT_STYLE_EDITOR(object);
-
-	if (e_contact_print_style_editor->gui != NULL) {
-		g_object_unref(e_contact_print_style_editor->gui);
-		e_contact_print_style_editor->gui = NULL;
-	}
-
-	(* GTK_OBJECT_CLASS (parent_class)->destroy) (object);
-}
-
-GtkWidget*
-e_contact_print_style_editor_new (char *filename)
-{
-	GtkWidget *widget = GTK_WIDGET (gtk_type_new (e_contact_print_style_editor_get_type ()));
-	return widget;
-}
-
-static void
-e_contact_print_style_editor_set_arg (GtkObject *o, GtkArg *arg, guint arg_id)
-{
-	EContactPrintStyleEditor *e_contact_print_style_editor;
-
-	e_contact_print_style_editor = E_CONTACT_PRINT_STYLE_EDITOR (o);
-	
-	switch (arg_id){
-	default:
-		break;
-	}
-}
-
-static void
-e_contact_print_style_editor_get_arg (GtkObject *object, GtkArg *arg, guint arg_id)
-{
-	EContactPrintStyleEditor *e_contact_print_style_editor;
-
-	e_contact_print_style_editor = E_CONTACT_PRINT_STYLE_EDITOR (object);
-
-	switch (arg_id) {
-	default:
-	  arg->type = GTK_TYPE_INVALID;
-	  break;
-	}
-}
diff --git a/addressbook/printing/e-contact-print-style-editor.h b/addressbook/printing/e-contact-print-style-editor.h
deleted file mode 100644
index e4604d551c..0000000000
--- a/addressbook/printing/e-contact-print-style-editor.h
+++ /dev/null
@@ -1,73 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-/* e-contact-print-style-editor.h
- * Copyright (C) 2000  Ximian, Inc.
- * Author: Chris Lahey <clahey@ximian.com>
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of version 2 of the GNU General Public
- * License as published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * General Public License for more details.
- *
- * You should have received a copy of the GNU General Public
- * License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
- */
-
-#ifndef __E_CONTACT_PRINT_STYLE_EDITOR_H__
-#define __E_CONTACT_PRINT_STYLE_EDITOR_H__
-
-#include <gtk/gtkvbox.h>
-#include <glade/glade.h>
-
-#ifdef __cplusplus
-extern "C" {
-#pragma }
-#endif /* __cplusplus */
-
-/* EContactPrintStyleEditor - A dialog displaying information about a contact.
- *
- * The following arguments are available:
- *
- * name		type		read/write	description
- * --------------------------------------------------------------------------------
- * card         ECard *         R               The card currently being edited
- */
-
-#define E_CONTACT_PRINT_STYLE_EDITOR_TYPE			(e_contact_print_style_editor_get_type ())
-#define E_CONTACT_PRINT_STYLE_EDITOR(obj)			(GTK_CHECK_CAST ((obj), E_CONTACT_PRINT_STYLE_EDITOR_TYPE, EContactPrintStyleEditor))
-#define E_CONTACT_PRINT_STYLE_EDITOR_CLASS(klass)		(GTK_CHECK_CLASS_CAST ((klass), E_CONTACT_PRINT_STYLE_EDITOR_TYPE, EContactPrintStyleEditorClass))
-#define E_IS_MINICARD(obj)		(GTK_CHECK_TYPE ((obj), E_CONTACT_PRINT_STYLE_EDITOR_TYPE))
-#define E_IS_MINICARD_CLASS(klass)	(GTK_CHECK_CLASS_TYPE ((obj), E_CONTACT_PRINT_STYLE_EDITOR_TYPE))
-
-
-typedef struct _EContactPrintStyleEditor       EContactPrintStyleEditor;
-typedef struct _EContactPrintStyleEditorClass  EContactPrintStyleEditorClass;
-
-struct _EContactPrintStyleEditor
-{
-	GtkVBox parent;
-	
-	/* item specific fields */
-	GladeXML *gui;
-};
-
-struct _EContactPrintStyleEditorClass
-{
-	GtkVBoxClass parent_class;
-};
-
-
-GtkWidget *e_contact_print_style_editor_new(char *filename);
-GtkType    e_contact_print_style_editor_get_type (void);
-
-#ifdef __cplusplus
-}
-#endif /* __cplusplus */
-
-
-#endif /* __E_CONTACT_PRINT_STYLE_EDITOR_H__ */
diff --git a/addressbook/printing/e-contact-print-types.h b/addressbook/printing/e-contact-print-types.h
deleted file mode 100644
index b7082b41f6..0000000000
--- a/addressbook/printing/e-contact-print-types.h
+++ /dev/null
@@ -1,73 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-/* 
- * e-contact-print-types.h
- * Copyright (C) 2000  Ximian, Inc.
- * Author: Chris Lahey <clahey@ximian.com>
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of version 2 of the GNU General Public
- * License as published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * General Public License for more details.
- *
- * You should have received a copy of the GNU General Public
- * License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
- */
-
-#ifndef E_CONTACT_PRINT_TYPES_H
-#define E_CONTACT_PRINT_TYPES_H
-
-#include <glib.h>
-#include <libgnomeprint/gnome-font.h>
-
-typedef struct _EContactPrintStyle EContactPrintStyle;
-typedef enum _EContactPrintType EContactPrintType;
-
-enum _EContactPrintType {
-	E_CONTACT_PRINT_TYPE_CARDS,
-	E_CONTACT_PRINT_TYPE_MEMO_STYLE,
-	E_CONTACT_PRINT_TYPE_PHONE_LIST
-};
-
-struct _EContactPrintStyle
-{
-	gchar *title;
-	EContactPrintType type;
-	gboolean sections_start_new_page;
-	guint num_columns;
-	guint blank_forms;
-	gboolean letter_tabs;
-	gboolean letter_headings;
-	GnomeFont *headings_font;
-	GnomeFont *body_font;
-	gboolean print_using_grey;
-	gint paper_type;
-	gdouble paper_width;
-	gdouble paper_height;
-	gint paper_source;
-	gdouble top_margin;
-	gdouble left_margin;
-	gdouble bottom_margin;
-	gdouble right_margin;
-	gint page_size;
-	gdouble page_width;
-	gdouble page_height;
-	gboolean orientation_portrait;
-	GnomeFont *header_font;
-	gchar *left_header;
-	gchar *center_header;
-	gchar *right_header;
-	GnomeFont *footer_font;
-	gchar *left_footer;
-	gchar *center_footer;
-	gchar *right_footer;
-	gboolean reverse_on_even_pages;
-};
-
-#endif /* E_CONTACT_PRINT_TYPES_H */
-
diff --git a/addressbook/printing/e-contact-print.c b/addressbook/printing/e-contact-print.c
deleted file mode 100644
index f0a7eff6d6..0000000000
--- a/addressbook/printing/e-contact-print.c
+++ /dev/null
@@ -1,1103 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-/* 
- * e-contact-print.c
- * Copyright (C) 2000  Ximian, Inc.
- * Author: Chris Lahey <clahey@ximian.com>
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of version 2 of the GNU General Public
- * License as published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * General Public License for more details.
- *
- * You should have received a copy of the GNU General Public
- * License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
- */
-
-#include <config.h>
-#include "e-contact-print.h"
-
-#include <ctype.h>
-#include <sys/types.h>
-#include <stdlib.h>
-#include <string.h>
-#include <glib.h>
-#include <libxml/tree.h>
-#include <libxml/parser.h>
-#include <libxml/xmlmemory.h>
-#include <libgnome/gnome-util.h>
-#include <libgnome/gnome-i18n.h>
-#include <libgnomeui/gnome-dialog.h>
-#include <libgnomeprint/gnome-print.h>
-#include <libgnomeprint/gnome-font.h>
-#include <libgnomeprint/gnome-print-job.h>
-#include <libgnomeprintui/gnome-print-dialog.h>
-#include <libgnomeprintui/gnome-print-job-preview.h>
-#include <libebook/e-book.h>
-#include <libebook/e-contact.h>
-#include <gal/util/e-util.h>
-#include <e-util/e-print.h>
-
-#define SCALE 5
-#define HYPHEN_PIXELS 20
-#define HYPHEN_PENALTY ( (SCALE) * (SCALE) * (HYPHEN_PIXELS) * (HYPHEN_PIXELS) )
-
-typedef struct _EContactPrintContext EContactPrintContext;
-
-struct _EContactPrintContext
-{
-	GnomePrintContext *pc;
-	GnomePrintJob     *master;
-	gdouble x;
-	gdouble y;
-	gint column;
-	EContactPrintStyle *style;
-	gboolean first_section;
-	gchar first_char_on_page;
-	gchar last_char_on_page;
-	GnomeFont *letter_heading_font;
-	GnomeFont *letter_tab_font;
-	char *character;
-	gboolean first_contact;
-
-	gboolean uses_book;
-	int type;
-	EBook *book;
-	EBookQuery *query;
-
-	GList *contacts;
-};
-
-static gint
-e_contact_divide_text(GnomePrintContext *pc, GnomeFont *font, double width, const gchar *text, GList **return_val /* Of type char[] */)
-{
-	if ( width == -1 || gnome_font_get_width_utf8(font, text) <= width ) {
-		if ( return_val ) {
-			*return_val = g_list_append(*return_val, g_strdup(text));
-		}
-		return 1;
-	} else {
-#if 1
-		int i, l;
-		double x = 0;
-		int lastend = 0;
-		int linestart = 0;
-		int firstword = 1;
-		int linecount = 0;
-		l = strlen(text);
-		for ( i = 0; i < l; i++ ) {
-			if ( text[i] == ' ' ) {
-				if ( (!firstword) && x + gnome_font_get_width_utf8_sized(font, text + lastend, i - lastend) > width ) {
-					if (return_val) {
-						*return_val = g_list_append(*return_val, g_strndup(text + linestart, lastend - linestart));
-					}
-					x = gnome_font_get_width_utf8(font, "    ");
-					linestart = lastend + 1;
-					x += gnome_font_get_width_utf8_sized(font, text + linestart, i - linestart);
-					lastend = i;
-					linecount ++;
-				} else {
-					x += gnome_font_get_width_utf8_sized(font, text + lastend, i - lastend);
-					lastend = i;
-				}
-				firstword = 0;
-			} else if ( text[i] == '\n' ) {
-				if ( (!firstword) && x + gnome_font_get_width_utf8_sized(font, text + lastend, i - lastend) > width ) {
-					if (return_val) {
-						*return_val = g_list_append(*return_val, g_strndup(text + linestart, lastend - linestart));
-					}
-					linestart = lastend + 1;
-					lastend = i;
-					linecount ++;
-				}
-				if (return_val) {
-					*return_val = g_list_append(*return_val, g_strndup(text + linestart, i - linestart));
-				}
-				linestart = i + 1;
-				lastend = i + 1;
-				linecount ++;
-				x = gnome_font_get_width_utf8(font, "    ");
-
-				firstword = 1;
-			}
-		}
-		if ( (!firstword) && x + gnome_font_get_width_utf8_sized(font, text + lastend, i - lastend) > width ) {
-			if (return_val) {
-				*return_val = g_list_append(*return_val, g_strndup(text + linestart, lastend - linestart));
-			}
-			linestart = lastend + 1;
-			lastend = i;
-			linecount ++;
-		}
-		if (return_val) {
-			*return_val = g_list_append(*return_val, g_strndup(text + linestart, i - linestart));
-		}
-		linecount ++;
-		return(linecount);
-#else
-		HnjBreak *breaks;
-		gint *result;
-		gint *is;
-		gint n_breaks = 0, n_actual_breaks = 0;
-		gint i;
-		gint l;
-		gchar *hyphenation;
-		double x = - gnome_font_get_width_utf8(font, "    ") * SCALE;
-		HnjParams hnjparams;
-
-		hnjparams.set_width = width * SCALE + x;
-		hnjparams.max_neg_space = 0;
-		hnjparams.tab_width = 0;
-
-		l = strlen(text);
-	
-		/* find possible line breaks. */
-		for (i = 0; i < l; i++) {
-			if (text[i] == '-')
-				n_breaks++;
-			else if (text[i] == ' ')
-				n_breaks++;
-#if 0
- 			else if (hyphenation[i] & 1)
-				n_breaks++;
-#endif
-		}
-
-		breaks = g_new( HnjBreak, n_breaks + 1 );
-		result = g_new( gint, n_breaks + 1 );
-		is = g_new( gint, n_breaks + 1 );
-		n_breaks = 0;
-		/* find possible line breaks. */
-	
-		for (i = 0; i < l; i++) {
-			if ( text[i] == '-' ) {
-				x += gnome_font_get_width(font, text[i]) * SCALE;
-				breaks[n_breaks].x0 = x;
-				breaks[n_breaks].x1 = x;
-				breaks[n_breaks].penalty = HYPHEN_PENALTY;
-				breaks[n_breaks].flags = HNJ_JUST_FLAG_ISHYPHEN;
-				is[n_breaks] = i + 1;
-				n_breaks++;
-			} else if ( text[i] == ' ' ) {
-				breaks[ n_breaks ].x0 = x;
-				x += gnome_font_get_width(font, text[i]) * SCALE;
-				breaks[ n_breaks ].x1 = x;
-				breaks[ n_breaks ].penalty = 0;
-				breaks[ n_breaks ].flags = HNJ_JUST_FLAG_ISSPACE;
-				is[ n_breaks ] = i + 1;
-				n_breaks++;
-#if 0
-			} else if (word->hyphenation[i] & 1) {
-				breaks[n_breaks].x0 = x + gnome_font_get_width(font, '-') * SCALE;
-				breaks[n_breaks].x1 = x;
-				breaks[n_breaks].penalty = HYPHEN_PENALTY;
-				breaks[n_breaks].flags = HNJ_JUST_FLAG_ISHYPHEN;
-				is[n_breaks] = i + 1;
-				n_breaks++;
-#endif
-			} else
-				x += gnome_font_get_width(font, text[i]) * SCALE;
-
-		}
-		is[n_breaks] = i;
-		breaks[n_breaks].flags = 0;
-		n_breaks++;
-
-		/* Calculate optimal line breaks. */
-		n_actual_breaks = hnj_hs_just (breaks, n_breaks,
-					       &hnjparams, result);
-
-		if ( return_val ) {
-			gchar *next_val;
-			if ( breaks[result[0]].flags == HNJ_JUST_FLAG_ISHYPHEN && text[is[result[0]]] != '-' ) {
-				next_val = g_new(gchar, is[result[0]] + 2);
-				strncpy(next_val, text, is[result[0]]);
-				next_val[is[result[0]]] = 0;
-				strcat(next_val, "-");
-			} else {
-				next_val = g_new(gchar, is[result[0]] + 1);
-				strncpy(next_val, text, is[result[0]]);
-				next_val[is[result[0]]] = 0;
-			}
-			*return_val = g_list_append(*return_val, next_val);
-			
-			for ( i = 1; i < n_actual_breaks; i++ ) {
-				if ( (breaks[result[i]].flags & HNJ_JUST_FLAG_ISHYPHEN) && (text[is[result[i]]] != '-') ) {
-					next_val = g_new(gchar, is[result[i]] - is[result[i - 1]] + 2);
-					strncpy(next_val, text + is[result[i - 1]], is[result[i]] - is[result[i - 1]]);
-					next_val[is[result[i]] - is[result[i - 1]]] = 0;
-					strcat(next_val, "-");
-				} else {
-					next_val = g_new(gchar, is[result[i]] - is[result[i - 1]] + 1);
-					strncpy(next_val, text + is[result[i - 1]], is[result[i]] - is[result[i - 1]]);
-					next_val[is[result[i]] - is[result[i - 1]]] = 0;
-				}
-				*return_val = g_list_append(*return_val, next_val);
-			}
-		}
-		
-		g_free (breaks);
-		g_free (result);
-		g_free (is);
-		return n_actual_breaks;
-#endif
-	}
-}
-
-static void
-e_contact_output(GnomePrintContext *pc, GnomeFont *font, double x, double y, double width, const gchar *text)
-{
-	GList *list = NULL, *list_start;
-	int first_line = 1;
-	gnome_print_gsave(pc);
-	gnome_print_setfont(pc, font);
-	e_contact_divide_text(pc, font, width, text, &list);
-	for ( list_start = list; list; list = g_list_next(list)) {
-		y -= gnome_font_get_ascender(font);
-		gnome_print_moveto(pc, x, y);
-		gnome_print_show(pc, (char *)list->data);
-		y -= gnome_font_get_descender(font);
-		y -= .2 * gnome_font_get_size (font);
-		if ( first_line ) {
-			x += gnome_font_get_width_utf8(font, "    ");
-			first_line = 0;
-		}
-	}
-	g_list_foreach( list_start, (GFunc) g_free, NULL );
-	g_list_free( list_start );
-	gnome_print_grestore(pc);
-}
-
-static gdouble
-e_contact_text_height(GnomePrintContext *pc, GnomeFont *font, double width, const gchar *text)
-{
-	int line_count = e_contact_divide_text(pc, font, width, text, NULL);
-	return line_count * (gnome_font_get_ascender(font) + gnome_font_get_descender(font)) +
-		(line_count - 1) * .2 * gnome_font_get_size (font);
-}
-
-#if 0
-static void
-e_contact_output_and_advance(EContactPrintContext *ctxt, GnomeFont *font, double x, double width, gchar *text)
-{
-	ctxt->y -= .1 * gnome_font_get_size (font);
-	e_contact_output(ctxt->pc, font, x, ctxt->y, width, text);
-	ctxt->y -= e_contact_text_height(ctxt->pc, font, width, text);
-	ctxt->y -= .1 * gnome_font_get_size (font);
-}
-#endif
-
-static void
-e_contact_rectangle(GnomePrintContext *pc, 
-		   gdouble x0,
-		   gdouble y0,
-		   gdouble x1,
-		   gdouble y1,
-		   gdouble r,
-		   gdouble g,
-		   gdouble b)
-{
-	gnome_print_gsave(pc);
-	gnome_print_setrgbcolor(pc, r, g, b);
-	gnome_print_moveto(pc, x0, y0);
-	gnome_print_lineto(pc, x1, y0);
-	gnome_print_lineto(pc, x1, y1);
-	gnome_print_lineto(pc, x0, y1);
-	gnome_print_lineto(pc, x0, y0);
-	gnome_print_fill(pc);
-	gnome_print_grestore(pc);
-}
-
-static double
-e_contact_get_letter_tab_width (EContactPrintContext *ctxt)
-{
-	return gnome_font_get_width_utf8(ctxt->letter_tab_font, "123") + 4 + 18;
-}
-
-static double
-e_contact_print_letter_tab (EContactPrintContext *ctxt)
-{
-	unsigned char character;
-	gdouble x, y;
-	gdouble page_width = 72 * (ctxt->style->page_width - ctxt->style->left_margin - ctxt->style->right_margin);
-	gdouble tab_height, tab_width;
-	gdouble font_size;
-	tab_height = 72 * (ctxt->style->page_height - ctxt->style->top_margin - ctxt->style->bottom_margin) / 27.0;
-	font_size = tab_height / 2;
-	tab_width = e_contact_get_letter_tab_width(ctxt) - 18;
-	x = page_width + 72 * (ctxt->style->left_margin) - tab_width;
-	y = 72 * (ctxt->style->page_height - ctxt->style->top_margin);
-
-
-	gnome_print_gsave( ctxt->pc );
-	if ( ctxt->style->print_using_grey )
-		e_contact_rectangle( ctxt->pc, x, 72 * (ctxt->style->page_height - ctxt->style->top_margin), x + tab_width, ctxt->style->bottom_margin * 72, .85, .85, .85 );
-	for ( character = 'A' - 1; character <= 'Z'; character ++ ) {
-		char string[] = "123";
-		if ( character >= 'A' ) {
-			string[0] = tolower(character);
-			string[1] = 0;
-		}
-		if ( character >= ctxt->first_char_on_page && character <= ctxt->last_char_on_page ) {
-			e_contact_rectangle( ctxt->pc, x + 1, y - 1, x + tab_width - 1, y - (tab_height - 1), 0, 0, 0 );
-			gnome_print_setrgbcolor( ctxt->pc, 1, 1, 1 );
-			e_contact_output( ctxt->pc, ctxt->letter_tab_font, x + tab_width / 2 - gnome_font_get_width_utf8(ctxt->letter_tab_font, string) / 2, y - (tab_height - font_size) / 2, -1, string );
-		} else {
-			gnome_print_setrgbcolor( ctxt->pc, 0, 0, 0 );
-			e_contact_output( ctxt->pc, ctxt->letter_tab_font, x + tab_width / 2 - gnome_font_get_width_utf8(ctxt->letter_tab_font, string) / 2, y - (tab_height - font_size) / 2, -1, string );
-		}
-		y -= tab_height;
-	}
-	gnome_print_grestore( ctxt->pc );
-	return gnome_font_get_width_utf8(ctxt->style->body_font, "123") + gnome_font_get_size (ctxt->style->body_font) / 5;
-}
-
-static double
-e_contact_get_letter_heading_height (EContactPrintContext *ctxt)
-{
-	gdouble ascender, descender;
-	ascender = gnome_font_get_ascender(ctxt->letter_heading_font);
-	descender = gnome_font_get_descender(ctxt->letter_heading_font);
-	return ascender + descender + 9;
-}
-
-static void
-e_contact_print_letter_heading (EContactPrintContext *ctxt, gchar *character)
-{
-	gdouble ascender, descender;
-	gdouble width;
-
-	width = gnome_font_get_width_utf8(ctxt->letter_heading_font, "m") * 1.7;
-	ascender = gnome_font_get_ascender(ctxt->letter_heading_font);
-	descender = gnome_font_get_descender(ctxt->letter_heading_font);
-	gnome_print_gsave( ctxt->pc );
-	e_contact_rectangle( ctxt->pc, ctxt->x, ctxt->y, ctxt->x + width, ctxt->y - (ascender + descender + 6), 0, 0, 0);
-	gnome_print_setrgbcolor(ctxt->pc, 1, 1, 1);
-	ctxt->y -= 4;
-	e_contact_output(ctxt->pc, ctxt->letter_heading_font, ctxt->x + (width - gnome_font_get_width_utf8(ctxt->letter_heading_font, character))/ 2, ctxt->y, -1, character);
-	ctxt->y -= ascender + descender;
-	ctxt->y -= 2;
-	ctxt->y -= 3;
-	gnome_print_grestore( ctxt->pc );
-}
-
-static void
-e_contact_start_new_page(EContactPrintContext *ctxt)
-{
-	ctxt->x = ctxt->style->left_margin * 72;
-	ctxt->y = (ctxt->style->page_height - ctxt->style->top_margin) * 72;
-	ctxt->column = 0;
-	if ( ctxt->style->letter_tabs )
-		e_contact_print_letter_tab(ctxt);
-	gnome_print_showpage(ctxt->pc);
-
-	gnome_print_beginpage (ctxt->pc, NULL);
-
-	ctxt->first_char_on_page = ctxt->last_char_on_page + 1;
-}
-
-static double
-e_contact_get_contact_size(EContact *contact, EContactPrintContext *ctxt)
-{
-	gdouble height = 0;
-	gdouble page_width  = 72 * (ctxt->style->page_width - ctxt->style->left_margin - ctxt->style->right_margin);
-	gdouble column_width;
-	const char *file_as;
-	gint field;
-	if ( ctxt->style->letter_tabs )
-		page_width -= e_contact_get_letter_tab_width(ctxt);
-	column_width = (page_width + 18) / ctxt->style->num_columns - 18;
-
-	height += gnome_font_get_size (ctxt->style->headings_font) * .2;
-
-	height += gnome_font_get_size (ctxt->style->headings_font) * .2;
-
-	file_as = e_contact_get_const (contact, E_CONTACT_FILE_AS);
-
-	height += e_contact_text_height(ctxt->pc, ctxt->style->headings_font, column_width - 4, file_as);
-
-	height += gnome_font_get_size (ctxt->style->headings_font) * .2;
-
-	height += gnome_font_get_size (ctxt->style->headings_font) * .2;
-	
-	for(field = E_CONTACT_FILE_AS; field != E_CONTACT_LAST_SIMPLE_STRING; field++) {
-		char *string;
-		string = e_contact_get(contact, field);
-		if (string && *string) {
-			double xoff = 0;
-			xoff += gnome_font_get_width_utf8(ctxt->style->body_font, e_contact_pretty_name (field));
-			xoff += gnome_font_get_width_utf8(ctxt->style->body_font, ":  ");
-			height += e_contact_text_height(ctxt->pc, ctxt->style->body_font, column_width - xoff, string);
-			height += .2 * gnome_font_get_size (ctxt->style->body_font);
-		}
-		g_free(string);
-	}
-	height += gnome_font_get_size (ctxt->style->headings_font) * .4;
-
-	/* g_message ("%s %g", e_card_simple_get (simple, E_CARD_SIMPLE_FIELD_FILE_AS), height); */
-	return height;
-}
-
-
-static void
-e_contact_print_contact (EContact *contact, EContactPrintContext *ctxt)
-{
-	gdouble page_width  = 72 * (ctxt->style->page_width - ctxt->style->left_margin - ctxt->style->right_margin);
-	gdouble column_width;
-	char *file_as;
-	int field;
-
-	if ( ctxt->style->letter_tabs )
-		page_width -= e_contact_get_letter_tab_width(ctxt);
-	column_width = (page_width + 18) / ctxt->style->num_columns - 18;
-
-	gnome_print_gsave(ctxt->pc);
-
-	ctxt->y -= gnome_font_get_size (ctxt->style->headings_font) * .2;
-	ctxt->y -= gnome_font_get_size (ctxt->style->headings_font) * .2;
-
-	file_as = e_contact_get (contact, E_CONTACT_FILE_AS);
-	if (ctxt->style->print_using_grey)
-		e_contact_rectangle(ctxt->pc, ctxt->x, ctxt->y + gnome_font_get_size (ctxt->style->headings_font) * .3, ctxt->x + column_width, ctxt->y - e_contact_text_height(ctxt->pc, ctxt->style->headings_font, column_width - 4, file_as) - gnome_font_get_size (ctxt->style->headings_font) * .3, .85, .85, .85);
-	e_contact_output(ctxt->pc, ctxt->style->headings_font, ctxt->x + 2, ctxt->y, column_width - 4, file_as);
-	ctxt->y -= e_contact_text_height(ctxt->pc, ctxt->style->headings_font, column_width - 4, file_as);
-	g_free (file_as);
-
-	ctxt->y -= gnome_font_get_size (ctxt->style->headings_font) * .2;
-	ctxt->y -= gnome_font_get_size (ctxt->style->headings_font) * .2;
-	
-	for(field = E_CONTACT_FILE_AS; field != E_CONTACT_LAST_SIMPLE_STRING; field++) {
-		char *string;
-		string = e_contact_get(contact, field);
-
-		if (string && *string) {
-			double xoff = 0;
-			e_contact_output(ctxt->pc, ctxt->style->body_font, ctxt->x + xoff, ctxt->y, -1, e_contact_pretty_name (field));
-			xoff += gnome_font_get_width_utf8(ctxt->style->body_font, e_contact_pretty_name (field));
-			e_contact_output(ctxt->pc, ctxt->style->body_font, ctxt->x + xoff, ctxt->y, -1, ":  ");
-			xoff += gnome_font_get_width_utf8(ctxt->style->body_font, ":  ");
-			e_contact_output(ctxt->pc, ctxt->style->body_font, ctxt->x + xoff, ctxt->y, column_width - xoff, string);
-			ctxt->y -= e_contact_text_height(ctxt->pc, ctxt->style->body_font, column_width - xoff, string);
-			ctxt->y -= .2 * gnome_font_get_size (ctxt->style->body_font);
-		}
-		g_free(string);
-	}
-	
-	ctxt->y -= gnome_font_get_size (ctxt->style->headings_font) * .4;
-	gnome_print_grestore(ctxt->pc);
-}
-
-static void
-e_contact_start_new_column (EContactPrintContext *ctxt)
-{
-	gdouble page_width  = 72 * (ctxt->style->page_width - ctxt->style->left_margin - ctxt->style->right_margin);
-	gdouble column_offset;
-	if ( ctxt->style->letter_tabs ) 
-		page_width -= e_contact_get_letter_tab_width(ctxt);
-	column_offset = (page_width + 18) / ctxt->style->num_columns;
-	ctxt->column ++;
-	if (ctxt->column >= ctxt->style->num_columns) {
-		e_contact_start_new_page(ctxt);
-		ctxt->column = 0;
-	}
-	ctxt->x = (72 * ctxt->style->left_margin) + column_offset * ctxt->column;
-	ctxt->y = 72 * (ctxt->style->page_height - ctxt->style->top_margin);
-}
-
-static void
-complete_sequence(EBookView *book_view, EBookViewStatus status, EContactPrintContext *ctxt)
-{
-	GList *contacts = ctxt->contacts;
-
-	gdouble page_width  = 72 * (ctxt->style->page_width - ctxt->style->left_margin - ctxt->style->right_margin);
-
-	ctxt->first_contact = TRUE;
-	ctxt->character = NULL;
-	ctxt->y = (ctxt->style->page_height - ctxt->style->top_margin) * 72;
-	ctxt->x = (ctxt->style->left_margin) * 72;
-	if ( ctxt->style->letter_tabs ) 
-		page_width -= e_contact_get_letter_tab_width(ctxt);
-	
-	ctxt->first_char_on_page = 'A' - 1;
-
-	gnome_print_beginpage (ctxt->pc, NULL);
-
-	for(; contacts; contacts = contacts->next) {
-		EContact *contact = contacts->data;
-		guchar *file_as;
-		gchar *letter_str = NULL;
-
-		file_as = e_contact_get (contact, E_CONTACT_FILE_AS);
-
-		if (file_as != NULL) {
-			letter_str = g_strndup (file_as, g_utf8_next_char (file_as) - (gchar *) file_as);
-		}
-		if ( file_as && (!ctxt->character || g_utf8_collate (ctxt->character, letter_str) != 0) ) {
-			g_free (ctxt->character);
-			ctxt->character = g_strdup (letter_str);
-			if (ctxt->style->sections_start_new_page && ! ctxt->first_contact) {
-				e_contact_start_new_page(ctxt);
-			}
-			else if ((!ctxt->first_contact) && (ctxt->y - e_contact_get_letter_heading_height(ctxt) - e_contact_get_contact_size(contact, ctxt) < ctxt->style->bottom_margin * 72))
-				e_contact_start_new_column(ctxt);
-			if ( ctxt->style->letter_headings )
-				e_contact_print_letter_heading(ctxt, ctxt->character);
-			ctxt->first_section = FALSE;
-		} 
-		else if ( (!ctxt->first_contact) && (ctxt->y - e_contact_get_contact_size(contact, ctxt) < ctxt->style->bottom_margin * 72)) {
-			e_contact_start_new_column(ctxt);
-			if ( ctxt->style->letter_headings )
-				e_contact_print_letter_heading(ctxt, ctxt->character);
-		}
-		g_free (letter_str);
-		ctxt->last_char_on_page = file_as ? toupper (*file_as) : ' ';
-		if ( ctxt->last_char_on_page < ctxt->first_char_on_page )
-			ctxt->first_char_on_page = ctxt->last_char_on_page;
-		e_contact_print_contact(contact, ctxt);
-		ctxt->first_contact = FALSE;
-	}
-	ctxt->last_char_on_page = 'Z';
-	if ( ctxt->style->letter_tabs )
-		e_contact_print_letter_tab(ctxt);
-	gnome_print_showpage(ctxt->pc);
-	gnome_print_context_close(ctxt->pc);
-	gnome_print_job_close(ctxt->master);
-	g_free(ctxt->character);
-	if (book_view)
-		g_object_unref(book_view);
-	if (ctxt->type == GNOME_PRINT_DIALOG_RESPONSE_PREVIEW) {
-		GtkWidget *preview;
-		preview = GTK_WIDGET(gnome_print_job_preview_new(ctxt->master, "Print Preview"));
-		gtk_widget_show_all(preview);
-	} else {
-		gnome_print_job_print(ctxt->master);
-	}
-	g_object_unref(ctxt->pc);
-	g_object_unref(ctxt->master);
-	if (ctxt->book)
-		g_object_unref(ctxt->book);
-	if (ctxt->query)
-		e_book_query_unref (ctxt->query);
-	g_list_foreach(ctxt->contacts, (GFunc) g_object_unref, NULL);
-	g_list_free(ctxt->contacts);
-	g_object_unref(ctxt->style->headings_font);
-	g_object_unref(ctxt->style->body_font);
-	g_object_unref(ctxt->style->header_font);
-	g_object_unref(ctxt->style->footer_font);
-	g_object_unref(ctxt->letter_heading_font);
-	g_object_unref(ctxt->letter_tab_font);
-	g_free(ctxt->style);
-	g_free(ctxt);
-}
-
-static int
-contact_compare (EContact *contact1, EContact *contact2)
-{
-	if (contact1 && contact2) {
-		const char *file_as1, *file_as2;
-		file_as1 = e_contact_get_const (contact1, E_CONTACT_FILE_AS);
-		file_as2 = e_contact_get_const (contact2, E_CONTACT_FILE_AS);
-
-		if (file_as1 && file_as2)
-			return g_utf8_collate(file_as1, file_as2);
-		if (file_as1)
-			return -1;
-		if (file_as2)
-			return 1;
-		return strcmp(e_contact_get_const(contact1, E_CONTACT_UID), e_contact_get_const(contact2, E_CONTACT_UID));
-	} else {
-		return 0;
-	}
-}
-
-static void
-create_contact(EBookView *book_view, const GList *contacts, EContactPrintContext *ctxt)
-{
-	for(; contacts; contacts = contacts->next) {
-		EContact *contact = contacts->data;
-		g_object_ref(contact);
-		ctxt->contacts = g_list_insert_sorted(ctxt->contacts, contact, (GCompareFunc) contact_compare);
-	}
-}
-
-static void
-book_view_loaded (EBook *book, EBookStatus status, EBookView *book_view, EContactPrintContext *ctxt)
-{
-	g_object_ref(book_view);
-
-	g_signal_connect(book_view,
-			 "contacts_added",
-			 G_CALLBACK(create_contact),
-			 ctxt);
-
-	g_signal_connect(book_view,
-			 "sequence_complete",
-			 G_CALLBACK(complete_sequence),
-			 ctxt);
-
-	e_book_view_start (book_view);
-}
-
-static void
-e_contact_do_print_contacts (EBook *book, EBookQuery *query, EContactPrintContext *ctxt)
-{
-	e_book_async_get_book_view(book, query, NULL, -1, (EBookBookViewCallback) book_view_loaded, ctxt);
-}
-
-static void
-e_contact_do_print (EBook *book, EBookQuery *query, EContactPrintContext *ctxt)
-{
-	switch ( ctxt->style->type ) {
-	case E_CONTACT_PRINT_TYPE_CARDS:
-		e_contact_do_print_contacts( book, query, ctxt);
-		break;
-	default:
-		break;
-	}
-}
-
-static void lowify( char *data )
-{
-	for ( ; *data; data++ )
-		*data = tolower((unsigned char) *data);
-}
-
-static gboolean get_bool( char *data )
-{
-	if ( data ) {
-		lowify ( data );
-		return ! strcmp(data, "true");
-	} else
-		return FALSE;
-}
-
-static void get_string( char *data, char **variable )
-{
-	g_free ( *variable );
-	if ( data )
-		*variable = g_strdup( data );
-	else
-		*variable = g_strdup( "" );
-}
-
-static int get_integer( char *data )
-{
-	if ( data )
-		return atoi(data);
-	else 
-		return 0;
-}
-
-static double get_float( char *data )
-{
-	if ( data )
-		return atof(data);
-	else 
-		return 0;
-}
-
-static void get_font( char *data, GnomeFont **variable )
-{
-	if ( data ) {
-		GnomeFont *font = gnome_font_find_from_full_name( data );
-		if ( font ) {
-			g_object_unref(*variable);
-			*variable = font;
-		}
-	}
-}
-
-
-static void
-e_contact_build_style(EContactPrintStyle *style)
-{
-	xmlDocPtr styledoc;
-	gchar *filename;
-
-	style->title = g_strdup("");
-	style->type = E_CONTACT_PRINT_TYPE_CARDS;
-	style->sections_start_new_page = TRUE;
-	style->num_columns = 2;
-	style->blank_forms = 2;
-	style->letter_tabs = TRUE;
-	style->letter_headings = FALSE;
-
-	style->headings_font = gnome_font_find_closest_from_weight_slant ("Sans", GNOME_FONT_BOLD, FALSE, 8);
-	style->body_font = gnome_font_find_closest_from_weight_slant ("Sans", GNOME_FONT_BOOK, FALSE, 6);
-
-	style->print_using_grey = TRUE;
-	style->paper_type = 0;
-	style->paper_width = 8.5;
-	style->paper_height = 11;
-	style->paper_source = 0;
-	style->top_margin = .5;
-	style->left_margin = .5;
-	style->bottom_margin = .5;
-	style->right_margin = .5;
-	style->page_size = 0;
-	style->page_width = 2.75;
-	style->page_height = 4.25;
-#if 0
-	style->page_width = 4.25;
-	style->page_height = 5.5;
-#endif
-#if 0
-	style->page_width = 5.5;
-	style->page_height = 8.5;
-#endif
-	style->orientation_portrait = FALSE;
-
-	style->header_font = gnome_font_find_closest_from_weight_slant ("Sans", GNOME_FONT_BOOK, FALSE, 6);
-
-	style->left_header = g_strdup("");
-	style->center_header = g_strdup("");
-	style->right_header = g_strdup("");
-
-	style->footer_font = gnome_font_find_closest_from_weight_slant ("Sans", GNOME_FONT_BOOK, FALSE, 6);
-
-	style->left_footer = g_strdup("");
-	style->center_footer = g_strdup("");
-	style->right_footer = g_strdup("");
-	style->reverse_on_even_pages = FALSE;
-	filename = g_concat_dir_and_file(EVOLUTION_ECPSDIR, "medbook.ecps");
-	styledoc = xmlParseFile(filename);
-	g_free(filename);
-	if (styledoc) {
-		xmlNodePtr stylenode = xmlDocGetRootElement(styledoc);
-		xmlNodePtr node;
-		for (node = stylenode->children; node; node = node->next) {
-			char *data = xmlNodeGetContent ( node );
-			if ( !strcmp( node->name, "title" ) ) {
-				get_string(data, &(style->title));
-			} else if ( !strcmp( node->name, "type" ) ) {
-				lowify( data );
-				if ( !strcmp( data, "cards" ) )
-					style->type = E_CONTACT_PRINT_TYPE_CARDS;
-				else if ( !strcmp( data, "memo_style" ) )
-					style->type = E_CONTACT_PRINT_TYPE_MEMO_STYLE;
-				else if ( !strcmp( data, "phone_list" ) )
-					style->type = E_CONTACT_PRINT_TYPE_PHONE_LIST;
-			} else if ( !strcmp( node->name, "sections_start_new_page" ) ) {
-				style->sections_start_new_page = get_bool(data);
-			} else if ( !strcmp( node->name, "num_columns" ) ) {
-				style->num_columns = get_integer(data);
-			} else if ( !strcmp( node->name, "blank_forms" ) ) {
-				style->blank_forms = get_integer(data);
-			} else if ( !strcmp( node->name, "letter_tabs" ) ) {
-				style->letter_tabs = get_bool(data);
-			} else if ( !strcmp( node->name, "letter_headings" ) ) {
-				style->letter_headings = get_bool(data);
-			} else if ( !strcmp( node->name, "headings_font" ) ) {
-				get_font( data, &(style->headings_font) );
-			} else if ( !strcmp( node->name, "body_font" ) ) {
-				get_font( data, &(style->body_font) );
-			} else if ( !strcmp( node->name, "print_using_grey" ) ) {
-				style->print_using_grey = get_bool(data);
-			} else if ( !strcmp( node->name, "paper_width" ) ) {
-				style->paper_width = get_float(data);
-			} else if ( !strcmp( node->name, "paper_height" ) ) {
-				style->paper_height = get_float(data);
-			} else if ( !strcmp( node->name, "top_margin" ) ) {
-				style->top_margin = get_float(data);
-			} else if ( !strcmp( node->name, "left_margin" ) ) {
-				style->left_margin = get_float(data);
-			} else if ( !strcmp( node->name, "bottom_margin" ) ) {
-				style->bottom_margin = get_float(data);
-			} else if ( !strcmp( node->name, "right_margin" ) ) {
-				style->right_margin = get_float(data);
-			} else if ( !strcmp( node->name, "page_width" ) ) {
-				style->page_width = get_float(data);
-			} else if ( !strcmp( node->name, "page_height" ) ) {
-				style->page_height = get_float(data);
-			} else if ( !strcmp( node->name, "orientation" ) ) {
-				if ( data ) {
-					lowify(data);
-					style->orientation_portrait = strcmp(data, "landscape");
-				} else {
-					style->orientation_portrait = TRUE;
-				}
-			} else if ( !strcmp( node->name, "header_font" ) ) {
-				get_font( data, &(style->header_font) );
-			} else if ( !strcmp( node->name, "left_header" ) ) {
-				get_string(data, &(style->left_header));
-			} else if ( !strcmp( node->name, "center_header" ) ) {
-				get_string(data, &(style->center_header));
-			} else if ( !strcmp( node->name, "right_header" ) ) {
-				get_string(data, &(style->right_header));
-			} else if ( !strcmp( node->name, "footer_font" ) ) {
-				get_font( data, &(style->footer_font) );
-			} else if ( !strcmp( node->name, "left_footer" ) ) {
-				get_string(data, &(style->left_footer));
-			} else if ( !strcmp( node->name, "center_footer" ) ) {
-				get_string(data, &(style->center_footer));
-			} else if ( !strcmp( node->name, "right_footer" ) ) {
-				get_string(data, &(style->right_footer));
-			} else if ( !strcmp( node->name, "reverse_on_even_pages" ) ) {
-				style->reverse_on_even_pages = get_bool(data);
-			}
-			if ( data )
-				xmlFree (data);
-		}
-		xmlFreeDoc(styledoc);
-	}
-}
-
-static gint
-e_contact_print_close(GnomeDialog *dialog, gpointer data)
-{
-	return FALSE;
-}
-
-static void
-e_contact_print_response(GtkWidget *dialog, gint response_id, gpointer data)
-{
-	EContactPrintContext *ctxt = g_new(EContactPrintContext, 1);
-	EContactPrintStyle *style = g_new(EContactPrintStyle, 1);
-	GnomePrintJob *master;
-	GnomePrintConfig *config;
-	GnomePrintContext *pc;
-	gboolean uses_book = GPOINTER_TO_INT(g_object_get_data(G_OBJECT(dialog), "uses_book"));
-	gboolean uses_list = GPOINTER_TO_INT(g_object_get_data(G_OBJECT(dialog), "uses_list"));
-	EBook *book = NULL;
-	EBookQuery *query = NULL;
-	EContact *contact = NULL;
-	GList *contact_list = NULL;
-	gdouble font_size;
-
-	if (uses_book) {
-		book = g_object_get_data(G_OBJECT(dialog), "book");
-		query = g_object_get_data(G_OBJECT(dialog), "query");
-		e_book_query_ref (query);
-	}
-	else if (uses_list) {
-		contact_list = g_object_get_data(G_OBJECT(dialog), "contact_list");
-	}
-	else {
-		contact = g_object_get_data(G_OBJECT(dialog), "contact");
-	}
-	switch( response_id ) {
-	case GNOME_PRINT_DIALOG_RESPONSE_PRINT:
-		config = gnome_print_dialog_get_config (GNOME_PRINT_DIALOG(dialog));
-		master = gnome_print_job_new( config );
-		pc = gnome_print_job_get_context( master );
-		e_contact_build_style(style);
-		
-		ctxt->x = 0;
-		ctxt->y = 0;
-		ctxt->column = 0;
-		ctxt->style = style;
-		ctxt->master = master;
-		ctxt->first_section = TRUE;
-		ctxt->first_char_on_page = 'A' - 1;
-		ctxt->type = GNOME_PRINT_DIALOG_RESPONSE_PRINT;
-
-		font_size = 72 * ctxt->style->page_height / 27.0 / 2.0;
-		ctxt->letter_heading_font = gnome_font_find (gnome_font_get_name(ctxt->style->headings_font), gnome_font_get_size (ctxt->style->headings_font) * 1.5);
-		ctxt->letter_tab_font = gnome_font_find (gnome_font_get_name(ctxt->style->headings_font), font_size);
-	
-		ctxt->pc = pc;
-#warning FIXME gnome_print_multipage_new_from_sizes
-#if 0
-		ctxt->pc = GNOME_PRINT_CONTEXT(gnome_print_multipage_new_from_sizes(pc, 
-										   72 * style->paper_width, 
-										   72 * style->paper_height,
-										   72 * style->page_width,
-										   72 * style->page_height));
-#endif
-		
-		ctxt->book = book;
-		ctxt->query = query;
-		if (uses_book) {
-			ctxt->contacts = NULL;
-			e_contact_do_print(book, ctxt->query, ctxt);
-		}
-		else if (uses_list) {
-			ctxt->contacts = contact_list;
-			complete_sequence(NULL, E_BOOK_VIEW_STATUS_OK, ctxt);
-		}
-		else {
-			ctxt->contacts = g_list_append(NULL, contact);
-			complete_sequence(NULL, E_BOOK_VIEW_STATUS_OK, ctxt);
-		}
-		gtk_widget_destroy (dialog);
-
-		break;
-	case GNOME_PRINT_DIALOG_RESPONSE_PREVIEW:
-		config = gnome_print_dialog_get_config (GNOME_PRINT_DIALOG(dialog));
-		master = gnome_print_job_new( config );
-		pc = gnome_print_job_get_context( master );
-		e_contact_build_style(style);
-		
-		ctxt->x = 0;
-		ctxt->y = 0;
-		ctxt->column = 0;
-		ctxt->style = style;
-		ctxt->master = master;
-		ctxt->first_section = TRUE;
-		ctxt->first_char_on_page = 'A' - 1;
-		ctxt->type = GNOME_PRINT_DIALOG_RESPONSE_PREVIEW;
-
-		font_size = 72 * ctxt->style->page_height / 27.0 / 2.0;
-		ctxt->letter_heading_font = gnome_font_find (gnome_font_get_name(ctxt->style->headings_font), gnome_font_get_size (ctxt->style->headings_font) * 1.5);
-		ctxt->letter_tab_font = gnome_font_find (gnome_font_get_name(ctxt->style->headings_font), font_size);
-		
-		ctxt->pc = pc;
-#warning FIXME gnome_print_multipage_new_from_sizes
-#if 0
-		ctxt->pc = GNOME_PRINT_CONTEXT(gnome_print_multipage_new_from_sizes(pc, 
-										   72 * style->paper_width, 
-										   72 * style->paper_height,
-										   72 * style->page_width,
-										   72 * style->page_height));
-#endif
-		ctxt->book = book;
-		ctxt->query = query;
-
-		if (uses_book) {
-			ctxt->contacts = NULL;
-			g_object_ref(book);
-			e_contact_do_print(book, ctxt->query, ctxt);
-		}
-		else if (uses_list) {
-			ctxt->contacts = g_list_copy (contact_list);
-			g_list_foreach (ctxt->contacts, (GFunc)g_object_ref, NULL);
-			complete_sequence(NULL, E_BOOK_VIEW_STATUS_OK, ctxt);
-		}
-		else {
-			ctxt->contacts = g_list_append(NULL, contact);
-			g_object_ref(contact);
-			complete_sequence(NULL, E_BOOK_VIEW_STATUS_OK, ctxt);
-		}
-		break;
-	case GNOME_PRINT_DIALOG_RESPONSE_CANCEL:
-		if (uses_book)
-			g_object_unref(book);
-		else if (uses_list)
-			e_free_object_list (contact_list);
-		else
-			g_object_unref(contact);
-				
-		if (query) 
-		        e_book_query_unref (query);
-
-		gtk_widget_destroy (dialog);
-		g_free(style);
-		g_free(ctxt);
-		break;
-	}
-}
-
-GtkWidget *
-e_contact_print_dialog_new(EBook *book, char *query)
-{
-	GtkWidget *dialog;
-	
-	
-	dialog = e_print_get_dialog(_("Print contacts"), GNOME_PRINT_DIALOG_RANGE | GNOME_PRINT_DIALOG_COPIES);
-	gnome_print_dialog_construct_range_any(GNOME_PRINT_DIALOG(dialog), GNOME_PRINT_RANGE_ALL | GNOME_PRINT_RANGE_SELECTION,
-					       NULL, NULL, NULL);
-
-	g_object_ref(book);
-	g_object_set_data(G_OBJECT(dialog), "uses_book", GINT_TO_POINTER (TRUE));
-	g_object_set_data(G_OBJECT(dialog), "uses_list", GINT_TO_POINTER (FALSE));
-	g_object_set_data(G_OBJECT(dialog), "book", book);
-	g_object_set_data(G_OBJECT(dialog), "query", e_book_query_from_string  (query));
-	g_signal_connect(dialog,
-			 "response", G_CALLBACK(e_contact_print_response), NULL);
-	g_signal_connect(dialog,
-			 "close", G_CALLBACK(e_contact_print_close), NULL);
-	return dialog;
-}
-
-void
-e_contact_print_preview(EBook *book, char *query)
-{
-	EContactPrintContext *ctxt = g_new(EContactPrintContext, 1);
-	EContactPrintStyle *style = g_new(EContactPrintStyle, 1);
-	GnomePrintJob *master;
-	GnomePrintContext *pc;
-	GnomePrintConfig *config;
-	gdouble font_size;
-
-	config = e_print_load_config ();
-	master = gnome_print_job_new (config);
-	pc = gnome_print_job_get_context (master);
-	e_contact_build_style (style);
-
-	ctxt->x = 0;
-	ctxt->y = 0;
-	ctxt->column = 0;
-	ctxt->style = style;
-	ctxt->master = master;
-	ctxt->first_section = TRUE;
-	ctxt->first_char_on_page = 'A' - 1;
-	ctxt->type = GNOME_PRINT_DIALOG_RESPONSE_PREVIEW;
-
-	font_size = 72 * ctxt->style->page_height / 27.0 / 2.0;
-	ctxt->letter_heading_font = gnome_font_find (gnome_font_get_name(ctxt->style->headings_font), gnome_font_get_size (ctxt->style->headings_font) * 1.5);
-	ctxt->letter_tab_font = gnome_font_find (gnome_font_get_name(ctxt->style->headings_font), font_size);
-
-		ctxt->pc = pc;
-#warning FIXME gnome_print_multipage_new_from_sizes
-#if 0
-	ctxt->pc = GNOME_PRINT_CONTEXT(gnome_print_multipage_new_from_sizes(pc, 
-									    72 * style->paper_width, 
-									    72 * style->paper_height,
-									    72 * style->page_width,
-									    72 * style->page_height));
-#endif
-	ctxt->book = book;
-	ctxt->query = e_book_query_from_string (query);
-	ctxt->contacts = NULL;
-	g_object_ref(book);
-	e_contact_do_print(book, ctxt->query, ctxt);
-}
-
-GtkWidget *
-e_contact_print_contact_dialog_new(EContact *contact)
-{
-	GtkWidget *dialog;
-	
-	dialog = e_print_get_dialog(_("Print contact"), GNOME_PRINT_DIALOG_COPIES);
-
-	contact = e_contact_duplicate(contact);
-	g_object_set_data(G_OBJECT(dialog), "contact", contact);
-	g_object_set_data(G_OBJECT(dialog), "uses_list", GINT_TO_POINTER (FALSE));
-	g_object_set_data(G_OBJECT(dialog), "uses_book", GINT_TO_POINTER (FALSE));
-	g_signal_connect(dialog,
-			 "response", G_CALLBACK(e_contact_print_response), NULL);
-	g_signal_connect(dialog,
-			 "close", G_CALLBACK(e_contact_print_close), NULL);
-	return dialog;
-}
-
-GtkWidget *
-e_contact_print_contact_list_dialog_new(GList *list)
-{
-	GtkWidget *dialog;
-	GList *copied_list;
-	GList *l;
-
-	if (list == NULL)
-		return NULL;
-
-	copied_list = g_list_copy (list);
-	for (l = copied_list; l; l = l->next)
-		l->data = e_contact_duplicate (E_CONTACT (l->data));
-
-	dialog = e_print_get_dialog(_("Print contact"), GNOME_PRINT_DIALOG_COPIES);
-
-	g_object_set_data(G_OBJECT(dialog), "contact_list", copied_list);
-	g_object_set_data(G_OBJECT(dialog), "uses_list", GINT_TO_POINTER (TRUE));
-	g_object_set_data(G_OBJECT(dialog), "uses_book", GINT_TO_POINTER (FALSE));
-	g_signal_connect(dialog,
-			 "response", G_CALLBACK(e_contact_print_response), NULL);
-	g_signal_connect(dialog,
-			 "close", G_CALLBACK(e_contact_print_close), NULL);
-	return dialog;
-}
diff --git a/addressbook/printing/e-contact-print.glade b/addressbook/printing/e-contact-print.glade
deleted file mode 100644
index d1721e3509..0000000000
--- a/addressbook/printing/e-contact-print.glade
+++ /dev/null
@@ -1,2018 +0,0 @@
-<?xml version="1.0" standalone="no"?> <!--*- mode: xml -*-->
-<!DOCTYPE glade-interface SYSTEM "http://glade.gnome.org/glade-2.0.dtd" >
-
-<glade-interface>
-  <widget class="GtkDialog" id="print-edit-style">
-    <property name="visible">no</property>
-    <property name="title" translatable="yes">Page Setup:</property>
-    <property name="type">GTK_WINDOW_TOPLEVEL</property>
-    <property name="modal">no</property>
-    <property name="allow_shrink">no</property>
-    <property name="allow_grow">no</property>
-    <property name="window-position">GTK_WIN_POS_NONE</property>
-
-    <child internal-child="vbox">
-      <widget class="GtkVBox" id="dialog-vbox1">
-        <property name="homogeneous">no</property>
-        <property name="spacing">8</property>
-        <property name="visible">yes</property>
-
-        <child internal-child="action_area">
-          <widget class="GtkHButtonBox" id="dialog-action_area1">
-            <property name="layout_style">GTK_BUTTONBOX_END</property>
-            <property name="spacing">8</property>
-            <property name="visible">yes</property>
-
-            <child>
-              <widget class="GtkButton" id="button1">
-                <property name="can_default">yes</property>
-                <property name="can_focus">yes</property>
-                <property name="visible">yes</property>
-                <property name="label">gtk-ok</property>
-                <property name="use_stock">yes</property>
-                <property name="use_underline">yes</property>
-              </widget>
-            </child>
-
-            <child>
-              <widget class="GtkButton" id="button2">
-                <property name="can_default">yes</property>
-                <property name="can_focus">yes</property>
-                <property name="visible">yes</property>
-                <property name="label">gtk-apply</property>
-                <property name="use_stock">yes</property>
-                <property name="use_underline">yes</property>
-              </widget>
-            </child>
-
-            <child>
-              <widget class="GtkButton" id="button3">
-                <property name="can_default">yes</property>
-                <property name="can_focus">yes</property>
-                <property name="visible">yes</property>
-                <property name="label">gtk-cancel</property>
-                <property name="use_stock">yes</property>
-                <property name="use_underline">yes</property>
-              </widget>
-            </child>
-          </widget>
-          <packing>
-            <property name="padding">0</property>
-            <property name="expand">no</property>
-            <property name="fill">yes</property>
-            <property name="pack_type">GTK_PACK_END</property>
-          </packing>
-        </child>
-
-        <child>
-          <widget class="GtkVBox" id="vbox-contact-print-style-editor">
-            <property name="homogeneous">no</property>
-            <property name="spacing">5</property>
-            <property name="visible">yes</property>
-
-            <child>
-              <widget class="GtkHBox" id="hbox2">
-                <property name="border_width">5</property>
-                <property name="homogeneous">no</property>
-                <property name="spacing">16</property>
-                <property name="visible">yes</property>
-
-                <child>
-                  <widget class="GtkLabel" id="label8">
-                    <property name="label" translatable="yes">Style name:</property>
-                    <property name="justify">GTK_JUSTIFY_CENTER</property>
-                    <property name="wrap">no</property>
-                    <property name="xalign">0.5</property>
-                    <property name="yalign">0.5</property>
-                    <property name="xpad">0</property>
-                    <property name="ypad">0</property>
-                    <property name="visible">yes</property>
-                  </widget>
-                  <packing>
-                    <property name="padding">0</property>
-                    <property name="expand">no</property>
-                    <property name="fill">no</property>
-                  </packing>
-                </child>
-
-                <child>
-                  <widget class="GtkEntry" id="label-style-name">
-                    <property name="can_focus">yes</property>
-                    <property name="editable">no</property>
-                    <property name="text" translatable="yes"></property>
-                    <property name="max-length">0</property>
-                    <property name="visibility">yes</property>
-                    <property name="visible">yes</property>
-                  </widget>
-                  <packing>
-                    <property name="padding">0</property>
-                    <property name="expand">no</property>
-                    <property name="fill">no</property>
-                  </packing>
-                </child>
-              </widget>
-              <packing>
-                <property name="padding">0</property>
-                <property name="expand">yes</property>
-                <property name="fill">yes</property>
-              </packing>
-            </child>
-
-            <child>
-              <widget class="GtkNotebook" id="notebook1">
-                <property name="can_focus">yes</property>
-                <property name="show_tabs">yes</property>
-                <property name="show_border">yes</property>
-                <property name="tab_pos">GTK_POS_TOP</property>
-                <property name="scrollable">no</property>
-                <property name="tab_hborder">2</property>
-                <property name="tab_vborder">2</property>
-                <property name="enable-popup">no</property>
-                <property name="visible">yes</property>
-
-                <child>
-                  <widget class="GtkVBox" id="vbox2">
-                    <property name="border_width">5</property>
-                    <property name="homogeneous">no</property>
-                    <property name="spacing">5</property>
-                    <property name="visible">yes</property>
-
-                    <child>
-                      <widget class="GtkAlignment" id="alignment1">
-                        <property name="xalign">0.5</property>
-                        <property name="yalign">0.5</property>
-                        <property name="xscale">0</property>
-                        <property name="yscale">0</property>
-                        <property name="visible">yes</property>
-
-                        <child>
-                          <widget class="GtkFrame" id="frame5">
-                            <property name="label" translatable="yes">Preview:</property>
-                            <property name="label_xalign">0</property>
-                            <property name="shadow">GTK_SHADOW_ETCHED_IN</property>
-                            <property name="visible">yes</property>
-
-                            <child>
-                              <placeholder />
-                            </child>
-                          </widget>
-                        </child>
-                      </widget>
-                      <packing>
-                        <property name="padding">0</property>
-                        <property name="expand">yes</property>
-                        <property name="fill">yes</property>
-                      </packing>
-                    </child>
-
-                    <child>
-                      <widget class="GtkHBox" id="hbox1">
-                        <property name="homogeneous">yes</property>
-                        <property name="spacing">7</property>
-                        <property name="visible">yes</property>
-
-                        <child>
-                          <widget class="GtkFrame" id="frame6">
-                            <property name="label" translatable="yes">Options</property>
-                            <property name="label_xalign">0</property>
-                            <property name="shadow">GTK_SHADOW_ETCHED_IN</property>
-                            <property name="visible">yes</property>
-
-                            <child>
-                              <widget class="GtkAlignment" id="alignment4">
-                                <property name="xalign">0</property>
-                                <property name="yalign">0</property>
-                                <property name="xscale">0</property>
-                                <property name="yscale">0</property>
-                                <property name="visible">yes</property>
-
-                                <child>
-                                  <widget class="GtkTable" id="table1">
-                                    <property name="border_width">8</property>
-                                    <property name="homogeneous">no</property>
-                                    <property name="row_spacing">0</property>
-                                    <property name="column_spacing">0</property>
-                                    <property name="n-rows">6</property>
-                                    <property name="n-columns">5</property>
-                                    <property name="visible">yes</property>
-
-                                    <child>
-                                      <widget class="GtkLabel" id="label5">
-                                        <property name="label" translatable="yes">Include:</property>
-                                        <property name="justify">GTK_JUSTIFY_CENTER</property>
-                                        <property name="wrap">no</property>
-                                        <property name="xalign">0</property>
-                                        <property name="yalign">0.5</property>
-                                        <property name="xpad">0</property>
-                                        <property name="ypad">0</property>
-                                        <property name="visible">yes</property>
-                                      </widget>
-                                      <packing>
-                                        <property name="left_attach">0</property>
-                                        <property name="right_attach">1</property>
-                                        <property name="top_attach">4</property>
-                                        <property name="bottom_attach">5</property>
-                                        <property name="x_padding">0</property>
-                                        <property name="y_padding">0</property>
-                                        <property name="x_options">fill</property>
-                                        <property name="y_options">fill</property>
-                                      </packing>
-                                    </child>
-
-                                    <child>
-                                      <widget class="GtkLabel" id="label4">
-                                        <property name="label" translatable="yes">Sections:</property>
-                                        <property name="justify">GTK_JUSTIFY_CENTER</property>
-                                        <property name="wrap">no</property>
-                                        <property name="xalign">0</property>
-                                        <property name="yalign">0.5</property>
-                                        <property name="xpad">0</property>
-                                        <property name="ypad">0</property>
-                                        <property name="visible">yes</property>
-                                      </widget>
-                                      <packing>
-                                        <property name="left_attach">0</property>
-                                        <property name="right_attach">1</property>
-                                        <property name="top_attach">0</property>
-                                        <property name="bottom_attach">1</property>
-                                        <property name="x_padding">0</property>
-                                        <property name="y_padding">0</property>
-                                        <property name="x_options">fill</property>
-                                        <property name="y_options">fill</property>
-                                      </packing>
-                                    </child>
-
-                                    <child>
-                                      <widget class="GtkAlignment" id="alignment2">
-                                        <property name="xalign">0</property>
-                                        <property name="yalign">0.5</property>
-                                        <property name="xscale">0</property>
-                                        <property name="yscale">0</property>
-                                        <property name="visible">yes</property>
-
-                                        <child>
-                                          <widget class="GtkRadioButton" id="radiobutton1">
-                                            <property name="can_focus">yes</property>
-                                            <property name="label" translatable="yes">Immediately follow each other</property>
-                                            <property name="active">yes</property>
-                                            <property name="draw_indicator">yes</property>
-                                            <property name="visible">yes</property>
-                                          </widget>
-                                        </child>
-                                      </widget>
-                                      <packing>
-                                        <property name="left_attach">1</property>
-                                        <property name="right_attach">5</property>
-                                        <property name="top_attach">0</property>
-                                        <property name="bottom_attach">1</property>
-                                        <property name="x_padding">0</property>
-                                        <property name="y_padding">0</property>
-                                        <property name="x_options">fill</property>
-                                        <property name="y_options">fill</property>
-                                      </packing>
-                                    </child>
-
-                                    <child>
-                                      <widget class="GtkCheckButton" id="checkbutton1">
-                                        <property name="can_focus">yes</property>
-                                        <property name="label" translatable="yes">Letter tabs on side</property>
-                                        <property name="active">no</property>
-                                        <property name="draw_indicator">yes</property>
-                                        <property name="visible">yes</property>
-                                      </widget>
-                                      <packing>
-                                        <property name="left_attach">1</property>
-                                        <property name="right_attach">5</property>
-                                        <property name="top_attach">4</property>
-                                        <property name="bottom_attach">5</property>
-                                        <property name="x_padding">0</property>
-                                        <property name="y_padding">0</property>
-                                        <property name="x_options">fill</property>
-                                        <property name="y_options">fill</property>
-                                      </packing>
-                                    </child>
-
-                                    <child>
-                                      <widget class="GtkCheckButton" id="checkbutton2">
-                                        <property name="can_focus">yes</property>
-                                        <property name="label" translatable="yes">Headings for each letter</property>
-                                        <property name="active">no</property>
-                                        <property name="draw_indicator">yes</property>
-                                        <property name="visible">yes</property>
-                                      </widget>
-                                      <packing>
-                                        <property name="left_attach">1</property>
-                                        <property name="right_attach">5</property>
-                                        <property name="top_attach">5</property>
-                                        <property name="bottom_attach">6</property>
-                                        <property name="x_padding">0</property>
-                                        <property name="y_padding">0</property>
-                                        <property name="x_options">fill</property>
-                                        <property name="y_options">fill</property>
-                                      </packing>
-                                    </child>
-
-                                    <child>
-                                      <widget class="GtkAlignment" id="alignment3">
-                                        <property name="xalign">0</property>
-                                        <property name="yalign">0.5</property>
-                                        <property name="xscale">0</property>
-                                        <property name="yscale">0</property>
-                                        <property name="visible">yes</property>
-
-                                        <child>
-                                          <widget class="GtkRadioButton" id="radiobutton2">
-                                            <property name="can_focus">yes</property>
-                                            <property name="label" translatable="yes">Start on a new page</property>
-                                            <property name="active">no</property>
-                                            <property name="draw_indicator">yes</property>
-                                            <property name="visible">yes</property>
-                                          </widget>
-                                        </child>
-                                      </widget>
-                                      <packing>
-                                        <property name="left_attach">1</property>
-                                        <property name="right_attach">5</property>
-                                        <property name="top_attach">1</property>
-                                        <property name="bottom_attach">2</property>
-                                        <property name="x_padding">0</property>
-                                        <property name="y_padding">0</property>
-                                        <property name="x_options">fill</property>
-                                        <property name="y_options">fill</property>
-                                      </packing>
-                                    </child>
-
-                                    <child>
-                                      <widget class="GtkLabel" id="label6">
-                                        <property name="label" translatable="yes">Number of columns:</property>
-                                        <property name="justify">GTK_JUSTIFY_CENTER</property>
-                                        <property name="wrap">no</property>
-                                        <property name="xalign">0</property>
-                                        <property name="yalign">0.5</property>
-                                        <property name="xpad">0</property>
-                                        <property name="ypad">0</property>
-                                        <property name="visible">yes</property>
-                                      </widget>
-                                      <packing>
-                                        <property name="left_attach">0</property>
-                                        <property name="right_attach">3</property>
-                                        <property name="top_attach">2</property>
-                                        <property name="bottom_attach">3</property>
-                                        <property name="x_padding">0</property>
-                                        <property name="y_padding">2</property>
-                                        <property name="x_options">fill</property>
-                                        <property name="y_options">fill</property>
-                                      </packing>
-                                    </child>
-
-                                    <child>
-                                      <widget class="GtkLabel" id="label7">
-                                        <property name="label" translatable="yes">Blank forms at end:</property>
-                                        <property name="justify">GTK_JUSTIFY_CENTER</property>
-                                        <property name="wrap">no</property>
-                                        <property name="xalign">0</property>
-                                        <property name="yalign">0.5</property>
-                                        <property name="xpad">0</property>
-                                        <property name="ypad">0</property>
-                                        <property name="visible">yes</property>
-                                      </widget>
-                                      <packing>
-                                        <property name="left_attach">0</property>
-                                        <property name="right_attach">3</property>
-                                        <property name="top_attach">3</property>
-                                        <property name="bottom_attach">4</property>
-                                        <property name="x_padding">0</property>
-                                        <property name="y_padding">2</property>
-                                        <property name="x_options">fill</property>
-                                        <property name="y_options">fill</property>
-                                      </packing>
-                                    </child>
-
-                                    <child>
-                                      <widget class="GtkAlignment" id="alignment6">
-                                        <property name="xalign">0</property>
-                                        <property name="yalign">0.5</property>
-                                        <property name="xscale">0</property>
-                                        <property name="yscale">0</property>
-                                        <property name="visible">yes</property>
-
-                                        <child>
-                                          <widget class="GtkSpinButton" id="spinbutton2">
-                                            <property name="can_focus">yes</property>
-                                            <property name="climb_rate">1</property>
-                                            <property name="digits">0</property>
-                                            <property name="numeric">no</property>
-                                            <property name="update_policy">GTK_UPDATE_ALWAYS</property>
-                                            <property name="wrap">no</property>
-                                            <property name="snap_to_ticks">no</property>
-                                            <property name="visible">yes</property>
-                                            <property name="adjustment">2 0 100 1 10 10</property>
-                                          </widget>
-                                        </child>
-                                      </widget>
-                                      <packing>
-                                        <property name="left_attach">3</property>
-                                        <property name="right_attach">4</property>
-                                        <property name="top_attach">3</property>
-                                        <property name="bottom_attach">4</property>
-                                        <property name="x_padding">0</property>
-                                        <property name="y_padding">2</property>
-                                        <property name="x_options">fill</property>
-                                        <property name="y_options">fill</property>
-                                      </packing>
-                                    </child>
-
-                                    <child>
-                                      <widget class="GtkAlignment" id="alignment5">
-                                        <property name="xalign">0</property>
-                                        <property name="yalign">0.5</property>
-                                        <property name="xscale">0</property>
-                                        <property name="yscale">0</property>
-                                        <property name="visible">yes</property>
-
-                                        <child>
-                                          <widget class="GtkSpinButton" id="spinbutton1">
-                                            <property name="can_focus">yes</property>
-                                            <property name="climb_rate">1</property>
-                                            <property name="digits">0</property>
-                                            <property name="numeric">no</property>
-                                            <property name="update_policy">GTK_UPDATE_ALWAYS</property>
-                                            <property name="wrap">no</property>
-                                            <property name="width-request">45</property>
-                                            <property name="snap_to_ticks">no</property>
-                                            <property name="visible">yes</property>
-                                            <property name="adjustment">1 0 100 1 10 10</property>
-                                          </widget>
-                                        </child>
-                                      </widget>
-                                      <packing>
-                                        <property name="left_attach">3</property>
-                                        <property name="right_attach">4</property>
-                                        <property name="top_attach">2</property>
-                                        <property name="bottom_attach">3</property>
-                                        <property name="x_padding">0</property>
-                                        <property name="y_padding">2</property>
-                                        <property name="x_options">fill</property>
-                                        <property name="y_options">fill</property>
-                                      </packing>
-                                    </child>
-                                  </widget>
-                                </child>
-                              </widget>
-                            </child>
-                          </widget>
-                          <packing>
-                            <property name="padding">0</property>
-                            <property name="expand">yes</property>
-                            <property name="fill">yes</property>
-                          </packing>
-                        </child>
-
-                        <child>
-                          <widget class="GtkVBox" id="vbox3">
-                            <property name="homogeneous">no</property>
-                            <property name="spacing">8</property>
-                            <property name="visible">yes</property>
-
-                            <child>
-                              <widget class="GtkFrame" id="frame7">
-                                <property name="label" translatable="yes">Fonts</property>
-                                <property name="label_xalign">0</property>
-                                <property name="shadow">GTK_SHADOW_ETCHED_IN</property>
-                                <property name="visible">yes</property>
-
-                                <child>
-                                  <widget class="GtkTable" id="table2">
-                                    <property name="border_width">8</property>
-                                    <property name="homogeneous">no</property>
-                                    <property name="row_spacing">13</property>
-                                    <property name="column_spacing">8</property>
-                                    <property name="n-rows">2</property>
-                                    <property name="n-columns">2</property>
-                                    <property name="visible">yes</property>
-
-                                    <child>
-                                      <widget class="GtkAlignment" id="alignment7">
-                                        <property name="xalign">0.5</property>
-                                        <property name="yalign">1</property>
-                                        <property name="xscale">1</property>
-                                        <property name="yscale">0</property>
-                                        <property name="visible">yes</property>
-
-                                        <child>
-                                          <widget class="GtkButton" id="button6">
-                                            <property name="can_focus">yes</property>
-                                            <property name="label" translatable="yes">F_ont...</property>
-                                            <property name="relief">GTK_RELIEF_NORMAL</property>
-                                            <property name="visible">yes</property>
-                                            <property name="use_underline">yes</property>
-                                          </widget>
-                                        </child>
-                                      </widget>
-                                      <packing>
-                                        <property name="left_attach">1</property>
-                                        <property name="right_attach">2</property>
-                                        <property name="top_attach">1</property>
-                                        <property name="bottom_attach">2</property>
-                                        <property name="x_padding">0</property>
-                                        <property name="y_padding">0</property>
-                                        <property name="x_options">fill</property>
-                                        <property name="y_options">fill</property>
-                                      </packing>
-                                    </child>
-
-                                    <child>
-                                      <widget class="GtkAlignment" id="alignment8">
-                                        <property name="xalign">0.5</property>
-                                        <property name="yalign">1</property>
-                                        <property name="xscale">1</property>
-                                        <property name="yscale">0</property>
-                                        <property name="visible">yes</property>
-
-                                        <child>
-                                          <widget class="GtkButton" id="button5">
-                                            <property name="can_focus">yes</property>
-                                            <property name="label" translatable="yes">_Font...</property>
-                                            <property name="relief">GTK_RELIEF_NORMAL</property>
-                                            <property name="width-request">90</property>
-                                            <property name="visible">yes</property>
-                                            <property name="use_underline">yes</property>
-                                          </widget>
-                                        </child>
-                                      </widget>
-                                      <packing>
-                                        <property name="left_attach">1</property>
-                                        <property name="right_attach">2</property>
-                                        <property name="top_attach">0</property>
-                                        <property name="bottom_attach">1</property>
-                                        <property name="x_padding">0</property>
-                                        <property name="y_padding">0</property>
-                                        <property name="x_options">fill</property>
-                                        <property name="y_options">fill</property>
-                                      </packing>
-                                    </child>
-
-                                    <child>
-                                      <widget class="GtkVBox" id="vbox4">
-                                        <property name="homogeneous">no</property>
-                                        <property name="spacing">0</property>
-                                        <property name="visible">yes</property>
-
-                                        <child>
-                                          <widget class="GtkLabel" id="label10">
-                                            <property name="label" translatable="yes">Headings</property>
-                                            <property name="justify">GTK_JUSTIFY_CENTER</property>
-                                            <property name="wrap">no</property>
-                                            <property name="xalign">0</property>
-                                            <property name="yalign">0.5</property>
-                                            <property name="xpad">0</property>
-                                            <property name="ypad">0</property>
-                                            <property name="visible">yes</property>
-                                          </widget>
-                                          <packing>
-                                            <property name="padding">0</property>
-                                            <property name="expand">no</property>
-                                            <property name="fill">no</property>
-                                          </packing>
-                                        </child>
-
-                                        <child>
-                                          <widget class="GtkEntry" id="entry3">
-                                            <property name="can_focus">yes</property>
-                                            <property name="editable">yes</property>
-                                            <property name="text" translatable="yes">10 pt. Tahoma</property>
-                                            <property name="width-request">100</property>
-                                            <property name="max-length">0</property>
-                                            <property name="visibility">yes</property>
-                                            <property name="visible">yes</property>
-                                          </widget>
-                                          <packing>
-                                            <property name="padding">0</property>
-                                            <property name="expand">no</property>
-                                            <property name="fill">no</property>
-                                          </packing>
-                                        </child>
-                                      </widget>
-                                      <packing>
-                                        <property name="left_attach">0</property>
-                                        <property name="right_attach">1</property>
-                                        <property name="top_attach">0</property>
-                                        <property name="bottom_attach">1</property>
-                                        <property name="x_padding">0</property>
-                                        <property name="y_padding">0</property>
-                                        <property name="x_options">expand|fill</property>
-                                        <property name="y_options">fill</property>
-                                      </packing>
-                                    </child>
-
-                                    <child>
-                                      <widget class="GtkVBox" id="vbox5">
-                                        <property name="homogeneous">no</property>
-                                        <property name="spacing">0</property>
-                                        <property name="visible">yes</property>
-
-                                        <child>
-                                          <widget class="GtkLabel" id="label9">
-                                            <property name="label" translatable="yes">Body</property>
-                                            <property name="justify">GTK_JUSTIFY_CENTER</property>
-                                            <property name="wrap">no</property>
-                                            <property name="xalign">0</property>
-                                            <property name="yalign">0.5</property>
-                                            <property name="xpad">0</property>
-                                            <property name="ypad">0</property>
-                                            <property name="visible">yes</property>
-                                          </widget>
-                                          <packing>
-                                            <property name="padding">0</property>
-                                            <property name="expand">no</property>
-                                            <property name="fill">no</property>
-                                          </packing>
-                                        </child>
-
-                                        <child>
-                                          <widget class="GtkEntry" id="entry2">
-                                            <property name="can_focus">yes</property>
-                                            <property name="editable">yes</property>
-                                            <property name="text" translatable="yes">8 pt. Tahoma</property>
-                                            <property name="width-request">100</property>
-                                            <property name="max-length">0</property>
-                                            <property name="visibility">yes</property>
-                                            <property name="visible">yes</property>
-                                          </widget>
-                                          <packing>
-                                            <property name="padding">0</property>
-                                            <property name="expand">no</property>
-                                            <property name="fill">no</property>
-                                          </packing>
-                                        </child>
-                                      </widget>
-                                      <packing>
-                                        <property name="left_attach">0</property>
-                                        <property name="right_attach">1</property>
-                                        <property name="top_attach">1</property>
-                                        <property name="bottom_attach">2</property>
-                                        <property name="x_padding">0</property>
-                                        <property name="y_padding">0</property>
-                                        <property name="x_options">expand|fill</property>
-                                        <property name="y_options">fill</property>
-                                      </packing>
-                                    </child>
-                                  </widget>
-                                </child>
-                              </widget>
-                              <packing>
-                                <property name="padding">0</property>
-                                <property name="expand">yes</property>
-                                <property name="fill">yes</property>
-                              </packing>
-                            </child>
-
-                            <child>
-                              <widget class="GtkFrame" id="frame8">
-                                <property name="label" translatable="yes">Shading</property>
-                                <property name="label_xalign">0</property>
-                                <property name="shadow">GTK_SHADOW_ETCHED_IN</property>
-                                <property name="visible">yes</property>
-
-                                <child>
-                                  <widget class="GtkCheckButton" id="checkbutton3">
-                                    <property name="can_focus">yes</property>
-                                    <property name="label" translatable="yes">Print using gray shading</property>
-                                    <property name="active">no</property>
-                                    <property name="draw_indicator">yes</property>
-                                    <property name="visible">yes</property>
-                                  </widget>
-                                </child>
-                              </widget>
-                              <packing>
-                                <property name="padding">0</property>
-                                <property name="expand">yes</property>
-                                <property name="fill">yes</property>
-                              </packing>
-                            </child>
-                          </widget>
-                          <packing>
-                            <property name="padding">0</property>
-                            <property name="expand">yes</property>
-                            <property name="fill">yes</property>
-                          </packing>
-                        </child>
-                      </widget>
-                      <packing>
-                        <property name="padding">0</property>
-                        <property name="expand">yes</property>
-                        <property name="fill">yes</property>
-                      </packing>
-                    </child>
-                  </widget>
-                </child>
-
-                <child>
-                  <widget class="GtkLabel" id="label1">
-                    <property name="label" translatable="yes">Format</property>
-                    <property name="justify">GTK_JUSTIFY_CENTER</property>
-                    <property name="wrap">no</property>
-                    <property name="xalign">0.5</property>
-                    <property name="yalign">0.5</property>
-                    <property name="xpad">0</property>
-                    <property name="ypad">0</property>
-                    <property name="visible">yes</property>
-                  </widget>
-                  <packing>
-                    <property name="type">tab</property>
-                  </packing>
-                </child>
-
-                <child>
-                  <widget class="GtkHBox" id="hbox3">
-                    <property name="homogeneous">yes</property>
-                    <property name="spacing">0</property>
-                    <property name="visible">yes</property>
-
-                    <child>
-                      <widget class="GtkVBox" id="vbox6">
-                        <property name="homogeneous">no</property>
-                        <property name="spacing">0</property>
-                        <property name="visible">yes</property>
-
-                        <child>
-                          <widget class="GtkFrame" id="frame9">
-                            <property name="label" translatable="yes">Paper</property>
-                            <property name="label_xalign">0</property>
-                            <property name="shadow">GTK_SHADOW_ETCHED_IN</property>
-                            <property name="visible">yes</property>
-
-                            <child>
-                              <widget class="GtkVBox" id="vbox16">
-                                <property name="border_width">10</property>
-                                <property name="homogeneous">no</property>
-                                <property name="spacing">0</property>
-                                <property name="visible">yes</property>
-
-                                <child>
-                                  <widget class="GtkVBox" id="vbox17">
-                                    <property name="homogeneous">no</property>
-                                    <property name="spacing">0</property>
-                                    <property name="visible">yes</property>
-
-                                    <child>
-                                      <widget class="GtkLabel" id="label21">
-                                        <property name="label" translatable="yes">Type:</property>
-                                        <property name="justify">GTK_JUSTIFY_CENTER</property>
-                                        <property name="wrap">no</property>
-                                        <property name="xalign">0</property>
-                                        <property name="yalign">0.5</property>
-                                        <property name="xpad">0</property>
-                                        <property name="ypad">0</property>
-                                        <property name="visible">yes</property>
-                                      </widget>
-                                      <packing>
-                                        <property name="padding">0</property>
-                                        <property name="expand">no</property>
-                                        <property name="fill">no</property>
-                                      </packing>
-                                    </child>
-
-                                    <child>
-                                      <widget class="GtkScrolledWindow" id="scrolledwindow1">
-                                        <property name="hscrollbar_policy">GTK_POLICY_ALWAYS</property>
-                                        <property name="vscrollbar_policy">GTK_POLICY_ALWAYS</property>
-                                        <property name="shadow_type">GTK_SHADOW_IN</property>
-                                        <property name="visible">yes</property>
-
-                                        <child>
-                                          <widget class="GtkTreeView" id="clist1">
-                                            <property name="can_focus">yes</property>
-                                            <property name="headers-visible">no</property>
-                                            <property name="visible">yes</property>
-
-                                            <child>
-                                              <widget class="GtkLabel" id="label26">
-                                                <property name="child_name">CList:title</property>
-                                                <property name="label" translatable="yes">label26</property>
-                                                <property name="justify">GTK_JUSTIFY_CENTER</property>
-                                                <property name="wrap">no</property>
-                                                <property name="xalign">0.5</property>
-                                                <property name="yalign">0.5</property>
-                                                <property name="xpad">0</property>
-                                                <property name="ypad">0</property>
-                                                <property name="visible">yes</property>
-                                              </widget>
-                                            </child>
-                                          </widget>
-                                        </child>
-
-                                        <child internal-child="hscrollbar">
-                                          <widget class="GtkHScrollbar" id="convertwidget1">
-                                            <property name="update_policy">GTK_UPDATE_CONTINUOUS</property>
-                                            <property name="visible">yes</property>
-                                          </widget>
-                                        </child>
-
-                                        <child internal-child="vscrollbar">
-                                          <widget class="GtkVScrollbar" id="convertwidget2">
-                                            <property name="update_policy">GTK_UPDATE_CONTINUOUS</property>
-                                            <property name="visible">yes</property>
-                                          </widget>
-                                        </child>
-                                      </widget>
-                                      <packing>
-                                        <property name="padding">0</property>
-                                        <property name="expand">yes</property>
-                                        <property name="fill">yes</property>
-                                      </packing>
-                                    </child>
-                                  </widget>
-                                  <packing>
-                                    <property name="padding">0</property>
-                                    <property name="expand">yes</property>
-                                    <property name="fill">yes</property>
-                                  </packing>
-                                </child>
-
-                                <child>
-                                  <widget class="GtkVBox" id="vbox18">
-                                    <property name="homogeneous">no</property>
-                                    <property name="spacing">0</property>
-                                    <property name="visible">yes</property>
-
-                                    <child>
-                                      <widget class="GtkLabel" id="label24">
-                                        <property name="label" translatable="yes">Dimensions:</property>
-                                        <property name="justify">GTK_JUSTIFY_CENTER</property>
-                                        <property name="wrap">no</property>
-                                        <property name="xalign">0</property>
-                                        <property name="yalign">0.5</property>
-                                        <property name="xpad">0</property>
-                                        <property name="ypad">0</property>
-                                        <property name="visible">yes</property>
-                                      </widget>
-                                      <packing>
-                                        <property name="padding">0</property>
-                                        <property name="expand">no</property>
-                                        <property name="fill">no</property>
-                                      </packing>
-                                    </child>
-
-                                    <child>
-                                      <widget class="GtkHBox" id="hbox5">
-                                        <property name="homogeneous">yes</property>
-                                        <property name="spacing">0</property>
-                                        <property name="visible">yes</property>
-
-                                        <child>
-                                          <widget class="GtkLabel" id="label27">
-                                            <property name="label" translatable="yes">Width:</property>
-                                            <property name="justify">GTK_JUSTIFY_CENTER</property>
-                                            <property name="wrap">no</property>
-                                            <property name="xalign">0.5</property>
-                                            <property name="yalign">0.5</property>
-                                            <property name="xpad">0</property>
-                                            <property name="ypad">0</property>
-                                            <property name="visible">yes</property>
-                                          </widget>
-                                          <packing>
-                                            <property name="padding">0</property>
-                                            <property name="expand">no</property>
-                                            <property name="fill">no</property>
-                                          </packing>
-                                        </child>
-
-                                        <child>
-                                          <widget class="GtkEntry" id="entry9">
-                                            <property name="can_focus">yes</property>
-                                            <property name="editable">yes</property>
-                                            <property name="text" translatable="yes"></property>
-                                            <property name="width-request">1</property>
-                                            <property name="max-length">0</property>
-                                            <property name="visibility">yes</property>
-                                            <property name="visible">yes</property>
-                                          </widget>
-                                          <packing>
-                                            <property name="padding">0</property>
-                                            <property name="expand">yes</property>
-                                            <property name="fill">yes</property>
-                                          </packing>
-                                        </child>
-
-                                        <child>
-                                          <widget class="GtkLabel" id="label28">
-                                            <property name="label" translatable="yes">Height:</property>
-                                            <property name="justify">GTK_JUSTIFY_CENTER</property>
-                                            <property name="wrap">no</property>
-                                            <property name="xalign">0.5</property>
-                                            <property name="yalign">0.5</property>
-                                            <property name="xpad">0</property>
-                                            <property name="ypad">0</property>
-                                            <property name="visible">yes</property>
-                                          </widget>
-                                          <packing>
-                                            <property name="padding">0</property>
-                                            <property name="expand">no</property>
-                                            <property name="fill">no</property>
-                                          </packing>
-                                        </child>
-
-                                        <child>
-                                          <widget class="GtkEntry" id="entry10">
-                                            <property name="can_focus">yes</property>
-                                            <property name="editable">yes</property>
-                                            <property name="text" translatable="yes"></property>
-                                            <property name="width-request">1</property>
-                                            <property name="max-length">0</property>
-                                            <property name="visibility">yes</property>
-                                            <property name="visible">yes</property>
-                                          </widget>
-                                          <packing>
-                                            <property name="padding">0</property>
-                                            <property name="expand">yes</property>
-                                            <property name="fill">yes</property>
-                                          </packing>
-                                        </child>
-                                      </widget>
-                                      <packing>
-                                        <property name="padding">0</property>
-                                        <property name="expand">yes</property>
-                                        <property name="fill">yes</property>
-                                      </packing>
-                                    </child>
-                                  </widget>
-                                  <packing>
-                                    <property name="padding">0</property>
-                                    <property name="expand">yes</property>
-                                    <property name="fill">yes</property>
-                                  </packing>
-                                </child>
-
-                                <child>
-                                  <widget class="GtkVBox" id="vbox19">
-                                    <property name="homogeneous">no</property>
-                                    <property name="spacing">0</property>
-                                    <property name="visible">yes</property>
-
-                                    <child>
-                                      <widget class="GtkLabel" id="label25">
-                                        <property name="label" translatable="yes">Paper source:</property>
-                                        <property name="justify">GTK_JUSTIFY_CENTER</property>
-                                        <property name="wrap">no</property>
-                                        <property name="xalign">0</property>
-                                        <property name="yalign">0.5</property>
-                                        <property name="xpad">0</property>
-                                        <property name="ypad">0</property>
-                                        <property name="visible">yes</property>
-                                      </widget>
-                                      <packing>
-                                        <property name="padding">0</property>
-                                        <property name="expand">no</property>
-                                        <property name="fill">no</property>
-                                      </packing>
-                                    </child>
-
-                                    <child>
-                                      <widget class="GtkCombo" id="combo1">
-                                        <property name="value_in_list">no</property>
-                                        <property name="case_sensitive">no</property>
-                                        <property name="enable_arrow_keys">yes</property>
-                                        <property name="enable_arrows_always">no</property>
-                                        <property name="allow_empty">yes</property>
-                                        <property name="visible">yes</property>
-
-                                        <child internal-child="entry">
-                                          <widget class="GtkEntry" id="combo-entry1">
-                                            <property name="can_focus">yes</property>
-                                            <property name="editable">yes</property>
-                                            <property name="text" translatable="yes"></property>
-                                            <property name="max-length">0</property>
-                                            <property name="visibility">yes</property>
-                                            <property name="visible">yes</property>
-                                          </widget>
-                                        </child>
-
-                                        <child internal-child="list">
-                                          <widget class="GtkList" id="convertwidget3">
-                                            <property name="visible">yes</property>
-
-                                            <child>
-                                              <widget class="GtkListItem" id="convertwidget4">
-                                                <property name="visible">yes</property>
-
-                                                <child>
-                                                  <widget class="GtkLabel" id="convertwidget5">
-                                                    <property name="label" translatable="yes"></property>
-                                                    <property name="xalign">0.0</property>
-                                                    <property name="visible">yes</property>
-                                                  </widget>
-                                                </child>
-                                              </widget>
-                                            </child>
-                                          </widget>
-                                        </child>
-                                      </widget>
-                                      <packing>
-                                        <property name="padding">0</property>
-                                        <property name="expand">no</property>
-                                        <property name="fill">no</property>
-                                      </packing>
-                                    </child>
-                                  </widget>
-                                  <packing>
-                                    <property name="padding">0</property>
-                                    <property name="expand">yes</property>
-                                    <property name="fill">yes</property>
-                                  </packing>
-                                </child>
-                              </widget>
-                            </child>
-                          </widget>
-                          <packing>
-                            <property name="padding">0</property>
-                            <property name="expand">yes</property>
-                            <property name="fill">yes</property>
-                          </packing>
-                        </child>
-
-                        <child>
-                          <widget class="GtkFrame" id="frame10">
-                            <property name="label" translatable="yes">Margins</property>
-                            <property name="label_xalign">0</property>
-                            <property name="shadow">GTK_SHADOW_ETCHED_IN</property>
-                            <property name="visible">yes</property>
-
-                            <child>
-                              <widget class="GtkTable" id="table4">
-                                <property name="border_width">15</property>
-                                <property name="homogeneous">yes</property>
-                                <property name="row_spacing">6</property>
-                                <property name="column_spacing">9</property>
-                                <property name="n-rows">2</property>
-                                <property name="n-columns">4</property>
-                                <property name="visible">yes</property>
-
-                                <child>
-                                  <widget class="GtkLabel" id="label29">
-                                    <property name="label" translatable="yes">Top:</property>
-                                    <property name="justify">GTK_JUSTIFY_CENTER</property>
-                                    <property name="wrap">no</property>
-                                    <property name="xalign">0</property>
-                                    <property name="yalign">0.5</property>
-                                    <property name="xpad">0</property>
-                                    <property name="ypad">0</property>
-                                    <property name="visible">yes</property>
-                                  </widget>
-                                  <packing>
-                                    <property name="left_attach">0</property>
-                                    <property name="right_attach">1</property>
-                                    <property name="top_attach">0</property>
-                                    <property name="bottom_attach">1</property>
-                                    <property name="x_padding">0</property>
-                                    <property name="y_padding">0</property>
-                                    <property name="x_options">fill</property>
-                                    <property name="y_options">expand|fill</property>
-                                  </packing>
-                                </child>
-
-                                <child>
-                                  <widget class="GtkLabel" id="label30">
-                                    <property name="label" translatable="yes">Bottom:</property>
-                                    <property name="justify">GTK_JUSTIFY_CENTER</property>
-                                    <property name="wrap">no</property>
-                                    <property name="xalign">0</property>
-                                    <property name="yalign">0.5</property>
-                                    <property name="xpad">0</property>
-                                    <property name="ypad">0</property>
-                                    <property name="visible">yes</property>
-                                  </widget>
-                                  <packing>
-                                    <property name="left_attach">0</property>
-                                    <property name="right_attach">1</property>
-                                    <property name="top_attach">1</property>
-                                    <property name="bottom_attach">2</property>
-                                    <property name="x_padding">0</property>
-                                    <property name="y_padding">0</property>
-                                    <property name="x_options">fill</property>
-                                    <property name="y_options">expand|fill</property>
-                                  </packing>
-                                </child>
-
-                                <child>
-                                  <widget class="GtkLabel" id="label31">
-                                    <property name="label" translatable="yes">Left:</property>
-                                    <property name="justify">GTK_JUSTIFY_CENTER</property>
-                                    <property name="wrap">no</property>
-                                    <property name="xalign">0</property>
-                                    <property name="yalign">0.5</property>
-                                    <property name="xpad">0</property>
-                                    <property name="ypad">0</property>
-                                    <property name="visible">yes</property>
-                                  </widget>
-                                  <packing>
-                                    <property name="left_attach">2</property>
-                                    <property name="right_attach">3</property>
-                                    <property name="top_attach">0</property>
-                                    <property name="bottom_attach">1</property>
-                                    <property name="x_padding">0</property>
-                                    <property name="y_padding">0</property>
-                                    <property name="x_options">fill</property>
-                                    <property name="y_options">expand|fill</property>
-                                  </packing>
-                                </child>
-
-                                <child>
-                                  <widget class="GtkEntry" id="entry11">
-                                    <property name="can_focus">yes</property>
-                                    <property name="editable">yes</property>
-                                    <property name="text" translatable="yes"></property>
-                                    <property name="width-request">1</property>
-                                    <property name="max-length">0</property>
-                                    <property name="visibility">yes</property>
-                                    <property name="visible">yes</property>
-                                  </widget>
-                                  <packing>
-                                    <property name="left_attach">1</property>
-                                    <property name="right_attach">2</property>
-                                    <property name="top_attach">0</property>
-                                    <property name="bottom_attach">1</property>
-                                    <property name="x_padding">0</property>
-                                    <property name="y_padding">0</property>
-                                    <property name="x_options">expand|fill</property>
-                                    <property name="y_options"></property>
-                                  </packing>
-                                </child>
-
-                                <child>
-                                  <widget class="GtkEntry" id="entry12">
-                                    <property name="can_focus">yes</property>
-                                    <property name="editable">yes</property>
-                                    <property name="text" translatable="yes"></property>
-                                    <property name="width-request">1</property>
-                                    <property name="max-length">0</property>
-                                    <property name="visibility">yes</property>
-                                    <property name="visible">yes</property>
-                                  </widget>
-                                  <packing>
-                                    <property name="left_attach">3</property>
-                                    <property name="right_attach">4</property>
-                                    <property name="top_attach">0</property>
-                                    <property name="bottom_attach">1</property>
-                                    <property name="x_padding">0</property>
-                                    <property name="y_padding">0</property>
-                                    <property name="x_options">expand|fill</property>
-                                    <property name="y_options"></property>
-                                  </packing>
-                                </child>
-
-                                <child>
-                                  <widget class="GtkEntry" id="entry13">
-                                    <property name="can_focus">yes</property>
-                                    <property name="editable">yes</property>
-                                    <property name="text" translatable="yes"></property>
-                                    <property name="width-request">1</property>
-                                    <property name="max-length">0</property>
-                                    <property name="visibility">yes</property>
-                                    <property name="visible">yes</property>
-                                  </widget>
-                                  <packing>
-                                    <property name="left_attach">3</property>
-                                    <property name="right_attach">4</property>
-                                    <property name="top_attach">1</property>
-                                    <property name="bottom_attach">2</property>
-                                    <property name="x_padding">0</property>
-                                    <property name="y_padding">0</property>
-                                    <property name="x_options">expand|fill</property>
-                                    <property name="y_options"></property>
-                                  </packing>
-                                </child>
-
-                                <child>
-                                  <widget class="GtkEntry" id="entry14">
-                                    <property name="can_focus">yes</property>
-                                    <property name="editable">yes</property>
-                                    <property name="text" translatable="yes"></property>
-                                    <property name="width-request">1</property>
-                                    <property name="max-length">0</property>
-                                    <property name="visibility">yes</property>
-                                    <property name="visible">yes</property>
-                                  </widget>
-                                  <packing>
-                                    <property name="left_attach">1</property>
-                                    <property name="right_attach">2</property>
-                                    <property name="top_attach">1</property>
-                                    <property name="bottom_attach">2</property>
-                                    <property name="x_padding">0</property>
-                                    <property name="y_padding">0</property>
-                                    <property name="x_options">expand|fill</property>
-                                    <property name="y_options"></property>
-                                  </packing>
-                                </child>
-
-                                <child>
-                                  <widget class="GtkLabel" id="label32">
-                                    <property name="label" translatable="yes">Right:</property>
-                                    <property name="justify">GTK_JUSTIFY_CENTER</property>
-                                    <property name="wrap">no</property>
-                                    <property name="xalign">0</property>
-                                    <property name="yalign">0.5</property>
-                                    <property name="xpad">0</property>
-                                    <property name="ypad">0</property>
-                                    <property name="visible">yes</property>
-                                  </widget>
-                                  <packing>
-                                    <property name="left_attach">2</property>
-                                    <property name="right_attach">3</property>
-                                    <property name="top_attach">1</property>
-                                    <property name="bottom_attach">2</property>
-                                    <property name="x_padding">0</property>
-                                    <property name="y_padding">0</property>
-                                    <property name="x_options">fill</property>
-                                    <property name="y_options">expand|fill</property>
-                                  </packing>
-                                </child>
-                              </widget>
-                            </child>
-                          </widget>
-                          <packing>
-                            <property name="padding">0</property>
-                            <property name="expand">yes</property>
-                            <property name="fill">yes</property>
-                          </packing>
-                        </child>
-                      </widget>
-                      <packing>
-                        <property name="padding">0</property>
-                        <property name="expand">yes</property>
-                        <property name="fill">yes</property>
-                      </packing>
-                    </child>
-
-                    <child>
-                      <widget class="GtkVBox" id="vbox7">
-                        <property name="homogeneous">no</property>
-                        <property name="spacing">0</property>
-                        <property name="visible">yes</property>
-
-                        <child>
-                          <widget class="GtkFrame" id="frame11">
-                            <property name="label" translatable="yes">Page</property>
-                            <property name="label_xalign">0</property>
-                            <property name="shadow">GTK_SHADOW_ETCHED_IN</property>
-                            <property name="visible">yes</property>
-
-                            <child>
-                              <widget class="GtkVBox" id="vbox8">
-                                <property name="border_width">10</property>
-                                <property name="homogeneous">no</property>
-                                <property name="spacing">0</property>
-                                <property name="visible">yes</property>
-
-                                <child>
-                                  <widget class="GtkVBox" id="vbox20">
-                                    <property name="homogeneous">no</property>
-                                    <property name="spacing">0</property>
-                                    <property name="visible">yes</property>
-
-                                    <child>
-                                      <widget class="GtkLabel" id="label33">
-                                        <property name="label" translatable="yes">Size:</property>
-                                        <property name="justify">GTK_JUSTIFY_CENTER</property>
-                                        <property name="wrap">no</property>
-                                        <property name="xalign">0</property>
-                                        <property name="yalign">0.5</property>
-                                        <property name="xpad">0</property>
-                                        <property name="ypad">0</property>
-                                        <property name="visible">yes</property>
-                                      </widget>
-                                      <packing>
-                                        <property name="padding">0</property>
-                                        <property name="expand">no</property>
-                                        <property name="fill">no</property>
-                                      </packing>
-                                    </child>
-
-                                    <child>
-                                      <widget class="GtkScrolledWindow" id="scrolledwindow2">
-                                        <property name="hscrollbar_policy">GTK_POLICY_ALWAYS</property>
-                                        <property name="vscrollbar_policy">GTK_POLICY_ALWAYS</property>
-                                        <property name="shadow_type">GTK_SHADOW_IN</property>
-                                        <property name="visible">yes</property>
-
-                                        <child>
-                                          <widget class="GtkTreeView" id="clist2">
-                                            <property name="can_focus">yes</property>
-                                            <property name="headers-visible">no</property>
-                                            <property name="visible">yes</property>
-
-                                            <child>
-                                              <widget class="GtkLabel" id="label35">
-                                                <property name="child_name">CList:title</property>
-                                                <property name="label" translatable="yes">label26</property>
-                                                <property name="justify">GTK_JUSTIFY_CENTER</property>
-                                                <property name="wrap">no</property>
-                                                <property name="xalign">0.5</property>
-                                                <property name="yalign">0.5</property>
-                                                <property name="xpad">0</property>
-                                                <property name="ypad">0</property>
-                                                <property name="visible">yes</property>
-                                              </widget>
-                                            </child>
-                                          </widget>
-                                        </child>
-
-                                        <child internal-child="hscrollbar">
-                                          <widget class="GtkHScrollbar" id="convertwidget6">
-                                            <property name="update_policy">GTK_UPDATE_CONTINUOUS</property>
-                                            <property name="visible">yes</property>
-                                          </widget>
-                                        </child>
-
-                                        <child internal-child="vscrollbar">
-                                          <widget class="GtkVScrollbar" id="convertwidget7">
-                                            <property name="update_policy">GTK_UPDATE_CONTINUOUS</property>
-                                            <property name="visible">yes</property>
-                                          </widget>
-                                        </child>
-                                      </widget>
-                                      <packing>
-                                        <property name="padding">0</property>
-                                        <property name="expand">yes</property>
-                                        <property name="fill">yes</property>
-                                      </packing>
-                                    </child>
-                                  </widget>
-                                  <packing>
-                                    <property name="padding">0</property>
-                                    <property name="expand">yes</property>
-                                    <property name="fill">yes</property>
-                                  </packing>
-                                </child>
-
-                                <child>
-                                  <widget class="GtkVBox" id="vbox21">
-                                    <property name="homogeneous">no</property>
-                                    <property name="spacing">0</property>
-                                    <property name="visible">yes</property>
-
-                                    <child>
-                                      <widget class="GtkLabel" id="label34">
-                                        <property name="label" translatable="yes">Dimensions:</property>
-                                        <property name="justify">GTK_JUSTIFY_CENTER</property>
-                                        <property name="wrap">no</property>
-                                        <property name="xalign">0</property>
-                                        <property name="yalign">0.5</property>
-                                        <property name="xpad">0</property>
-                                        <property name="ypad">0</property>
-                                        <property name="visible">yes</property>
-                                      </widget>
-                                      <packing>
-                                        <property name="padding">0</property>
-                                        <property name="expand">no</property>
-                                        <property name="fill">no</property>
-                                      </packing>
-                                    </child>
-
-                                    <child>
-                                      <widget class="GtkHBox" id="hbox6">
-                                        <property name="homogeneous">yes</property>
-                                        <property name="spacing">0</property>
-                                        <property name="visible">yes</property>
-
-                                        <child>
-                                          <widget class="GtkLabel" id="label36">
-                                            <property name="label" translatable="yes">Width:</property>
-                                            <property name="justify">GTK_JUSTIFY_CENTER</property>
-                                            <property name="wrap">no</property>
-                                            <property name="xalign">0.5</property>
-                                            <property name="yalign">0.5</property>
-                                            <property name="xpad">0</property>
-                                            <property name="ypad">0</property>
-                                            <property name="visible">yes</property>
-                                          </widget>
-                                          <packing>
-                                            <property name="padding">0</property>
-                                            <property name="expand">no</property>
-                                            <property name="fill">no</property>
-                                          </packing>
-                                        </child>
-
-                                        <child>
-                                          <widget class="GtkEntry" id="entry15">
-                                            <property name="can_focus">yes</property>
-                                            <property name="editable">yes</property>
-                                            <property name="text" translatable="yes"></property>
-                                            <property name="width-request">1</property>
-                                            <property name="max-length">0</property>
-                                            <property name="visibility">yes</property>
-                                            <property name="visible">yes</property>
-                                          </widget>
-                                          <packing>
-                                            <property name="padding">0</property>
-                                            <property name="expand">yes</property>
-                                            <property name="fill">yes</property>
-                                          </packing>
-                                        </child>
-
-                                        <child>
-                                          <widget class="GtkLabel" id="label37">
-                                            <property name="label" translatable="yes">Height:</property>
-                                            <property name="justify">GTK_JUSTIFY_CENTER</property>
-                                            <property name="wrap">no</property>
-                                            <property name="xalign">0.5</property>
-                                            <property name="yalign">0.5</property>
-                                            <property name="xpad">0</property>
-                                            <property name="ypad">0</property>
-                                            <property name="visible">yes</property>
-                                          </widget>
-                                          <packing>
-                                            <property name="padding">0</property>
-                                            <property name="expand">no</property>
-                                            <property name="fill">no</property>
-                                          </packing>
-                                        </child>
-
-                                        <child>
-                                          <widget class="GtkEntry" id="entry16">
-                                            <property name="can_focus">yes</property>
-                                            <property name="editable">yes</property>
-                                            <property name="text" translatable="yes"></property>
-                                            <property name="width-request">1</property>
-                                            <property name="max-length">0</property>
-                                            <property name="visibility">yes</property>
-                                            <property name="visible">yes</property>
-                                          </widget>
-                                          <packing>
-                                            <property name="padding">0</property>
-                                            <property name="expand">yes</property>
-                                            <property name="fill">yes</property>
-                                          </packing>
-                                        </child>
-                                      </widget>
-                                      <packing>
-                                        <property name="padding">0</property>
-                                        <property name="expand">yes</property>
-                                        <property name="fill">yes</property>
-                                      </packing>
-                                    </child>
-                                  </widget>
-                                  <packing>
-                                    <property name="padding">0</property>
-                                    <property name="expand">yes</property>
-                                    <property name="fill">yes</property>
-                                  </packing>
-                                </child>
-                              </widget>
-                            </child>
-                          </widget>
-                          <packing>
-                            <property name="padding">0</property>
-                            <property name="expand">yes</property>
-                            <property name="fill">yes</property>
-                          </packing>
-                        </child>
-
-                        <child>
-                          <widget class="GtkFrame" id="frame12">
-                            <property name="label" translatable="yes">Orientation</property>
-                            <property name="label_xalign">0</property>
-                            <property name="shadow">GTK_SHADOW_ETCHED_IN</property>
-                            <property name="visible">yes</property>
-
-                            <child>
-                              <widget class="GtkHBox" id="hbox4">
-                                <property name="homogeneous">no</property>
-                                <property name="spacing">10</property>
-                                <property name="visible">yes</property>
-
-                                <child>
-                                  <placeholder />
-                                </child>
-
-                                <child>
-                                  <widget class="GtkVBox" id="vbox9">
-                                    <property name="homogeneous">no</property>
-                                    <property name="spacing">5</property>
-                                    <property name="visible">yes</property>
-
-                                    <child>
-                                      <widget class="GtkAlignment" id="alignment9">
-                                        <property name="xalign">0</property>
-                                        <property name="yalign">1</property>
-                                        <property name="xscale">0</property>
-                                        <property name="yscale">0</property>
-                                        <property name="visible">yes</property>
-
-                                        <child>
-                                          <widget class="GtkRadioButton" id="radiobutton3">
-                                            <property name="can_focus">yes</property>
-                                            <property name="label" translatable="yes">Portrait</property>
-                                            <property name="active">no</property>
-                                            <property name="draw_indicator">yes</property>
-                                            <property name="visible">yes</property>
-                                          </widget>
-                                        </child>
-                                      </widget>
-                                      <packing>
-                                        <property name="padding">0</property>
-                                        <property name="expand">yes</property>
-                                        <property name="fill">yes</property>
-                                      </packing>
-                                    </child>
-
-                                    <child>
-                                      <widget class="GtkAlignment" id="alignment10">
-                                        <property name="xalign">0</property>
-                                        <property name="yalign">0</property>
-                                        <property name="xscale">0</property>
-                                        <property name="yscale">0</property>
-                                        <property name="visible">yes</property>
-
-                                        <child>
-                                          <widget class="GtkRadioButton" id="radiobutton4">
-                                            <property name="can_focus">yes</property>
-                                            <property name="label" translatable="yes">Landscape</property>
-                                            <property name="active">no</property>
-                                            <property name="draw_indicator">yes</property>
-                                            <property name="visible">yes</property>
-                                          </widget>
-                                        </child>
-                                      </widget>
-                                      <packing>
-                                        <property name="padding">0</property>
-                                        <property name="expand">yes</property>
-                                        <property name="fill">yes</property>
-                                      </packing>
-                                    </child>
-                                  </widget>
-                                  <packing>
-                                    <property name="padding">0</property>
-                                    <property name="expand">yes</property>
-                                    <property name="fill">yes</property>
-                                  </packing>
-                                </child>
-                              </widget>
-                            </child>
-                          </widget>
-                          <packing>
-                            <property name="padding">0</property>
-                            <property name="expand">yes</property>
-                            <property name="fill">yes</property>
-                          </packing>
-                        </child>
-                      </widget>
-                      <packing>
-                        <property name="padding">0</property>
-                        <property name="expand">yes</property>
-                        <property name="fill">yes</property>
-                      </packing>
-                    </child>
-                  </widget>
-                </child>
-
-                <child>
-                  <widget class="GtkLabel" id="label2">
-                    <property name="label" translatable="yes">Paper</property>
-                    <property name="justify">GTK_JUSTIFY_CENTER</property>
-                    <property name="wrap">no</property>
-                    <property name="xalign">0.5</property>
-                    <property name="yalign">0.5</property>
-                    <property name="xpad">0</property>
-                    <property name="ypad">0</property>
-                    <property name="visible">yes</property>
-                  </widget>
-                  <packing>
-                    <property name="type">tab</property>
-                  </packing>
-                </child>
-
-                <child>
-                  <widget class="GtkVBox" id="vbox10">
-                    <property name="border_width">8</property>
-                    <property name="homogeneous">no</property>
-                    <property name="spacing">0</property>
-                    <property name="visible">yes</property>
-
-                    <child>
-                      <widget class="GtkTable" id="table5">
-                        <property name="homogeneous">yes</property>
-                        <property name="row_spacing">4</property>
-                        <property name="column_spacing">4</property>
-                        <property name="n-rows">4</property>
-                        <property name="n-columns">3</property>
-                        <property name="visible">yes</property>
-
-                        <child>
-                          <widget class="GtkAlignment" id="alignment15">
-                            <property name="xalign">0</property>
-                            <property name="yalign">1</property>
-                            <property name="xscale">0</property>
-                            <property name="yscale">0</property>
-                            <property name="visible">yes</property>
-
-                            <child>
-                              <widget class="GtkButton" id="button11">
-                                <property name="can_focus">yes</property>
-                                <property name="label" translatable="yes">F_ont...</property>
-                                <property name="relief">GTK_RELIEF_NORMAL</property>
-                                <property name="visible">yes</property>
-                                <property name="use_underline">yes</property>
-                              </widget>
-                            </child>
-                          </widget>
-                          <packing>
-                            <property name="left_attach">1</property>
-                            <property name="right_attach">2</property>
-                            <property name="top_attach">2</property>
-                            <property name="bottom_attach">3</property>
-                            <property name="x_padding">0</property>
-                            <property name="y_padding">0</property>
-                            <property name="x_options">fill</property>
-                            <property name="y_options">fill</property>
-                          </packing>
-                        </child>
-
-                        <child>
-                          <widget class="GtkTextView" id="text10">
-                            <property name="can_focus">yes</property>
-                            <property name="editable">no</property>
-                            <property name="text" translatable="yes"></property>
-                            <property name="wrap_mode">GTK_WRAP_WORD</property>
-                            <property name="height-request">50</property>
-                            <property name="visible">yes</property>
-                          </widget>
-                          <packing>
-                            <property name="left_attach">0</property>
-                            <property name="right_attach">1</property>
-                            <property name="top_attach">1</property>
-                            <property name="bottom_attach">2</property>
-                            <property name="x_padding">0</property>
-                            <property name="y_padding">0</property>
-                            <property name="x_options">fill</property>
-                            <property name="y_options">expand|fill</property>
-                          </packing>
-                        </child>
-
-                        <child>
-                          <widget class="GtkTextView" id="text11">
-                            <property name="can_focus">yes</property>
-                            <property name="editable">no</property>
-                            <property name="text" translatable="yes"></property>
-                            <property name="wrap_mode">GTK_WRAP_WORD</property>
-                            <property name="height-request">50</property>
-                            <property name="visible">yes</property>
-                          </widget>
-                          <packing>
-                            <property name="left_attach">2</property>
-                            <property name="right_attach">3</property>
-                            <property name="top_attach">1</property>
-                            <property name="bottom_attach">2</property>
-                            <property name="x_padding">0</property>
-                            <property name="y_padding">0</property>
-                            <property name="x_options">expand|fill</property>
-                            <property name="y_options">fill</property>
-                          </packing>
-                        </child>
-
-                        <child>
-                          <widget class="GtkTextView" id="text12">
-                            <property name="can_focus">yes</property>
-                            <property name="editable">no</property>
-                            <property name="text" translatable="yes"></property>
-                            <property name="wrap_mode">GTK_WRAP_WORD</property>
-                            <property name="height-request">50</property>
-                            <property name="visible">yes</property>
-                          </widget>
-                          <packing>
-                            <property name="left_attach">1</property>
-                            <property name="right_attach">2</property>
-                            <property name="top_attach">1</property>
-                            <property name="bottom_attach">2</property>
-                            <property name="x_padding">0</property>
-                            <property name="y_padding">0</property>
-                            <property name="x_options">fill</property>
-                            <property name="y_options">fill</property>
-                          </packing>
-                        </child>
-
-                        <child>
-                          <widget class="GtkTextView" id="text13">
-                            <property name="can_focus">yes</property>
-                            <property name="editable">no</property>
-                            <property name="text" translatable="yes"></property>
-                            <property name="wrap_mode">GTK_WRAP_WORD</property>
-                            <property name="height-request">50</property>
-                            <property name="visible">yes</property>
-                          </widget>
-                          <packing>
-                            <property name="left_attach">0</property>
-                            <property name="right_attach">1</property>
-                            <property name="top_attach">3</property>
-                            <property name="bottom_attach">4</property>
-                            <property name="x_padding">0</property>
-                            <property name="y_padding">0</property>
-                            <property name="x_options">fill</property>
-                            <property name="y_options">expand|fill</property>
-                          </packing>
-                        </child>
-
-                        <child>
-                          <widget class="GtkTextView" id="text14">
-                            <property name="can_focus">yes</property>
-                            <property name="editable">no</property>
-                            <property name="text" translatable="yes"></property>
-                            <property name="wrap_mode">GTK_WRAP_WORD</property>
-                            <property name="height-request">5</property>
-                            <property name="visible">yes</property>
-                          </widget>
-                          <packing>
-                            <property name="left_attach">1</property>
-                            <property name="right_attach">2</property>
-                            <property name="top_attach">3</property>
-                            <property name="bottom_attach">4</property>
-                            <property name="x_padding">0</property>
-                            <property name="y_padding">0</property>
-                            <property name="x_options">fill</property>
-                            <property name="y_options">fill</property>
-                          </packing>
-                        </child>
-
-                        <child>
-                          <widget class="GtkTextView" id="text15">
-                            <property name="can_focus">yes</property>
-                            <property name="editable">no</property>
-                            <property name="text" translatable="yes"></property>
-                            <property name="wrap_mode">GTK_WRAP_WORD</property>
-                            <property name="height-request">50</property>
-                            <property name="visible">yes</property>
-                          </widget>
-                          <packing>
-                            <property name="left_attach">2</property>
-                            <property name="right_attach">3</property>
-                            <property name="top_attach">3</property>
-                            <property name="bottom_attach">4</property>
-                            <property name="x_padding">0</property>
-                            <property name="y_padding">0</property>
-                            <property name="x_options">fill</property>
-                            <property name="y_options">fill</property>
-                          </packing>
-                        </child>
-
-                        <child>
-                          <widget class="GtkAlignment" id="alignment16">
-                            <property name="xalign">0.5</property>
-                            <property name="yalign">1</property>
-                            <property name="xscale">1</property>
-                            <property name="yscale">0</property>
-                            <property name="visible">yes</property>
-
-                            <child>
-                              <widget class="GtkVBox" id="vbox14">
-                                <property name="homogeneous">no</property>
-                                <property name="spacing">0</property>
-                                <property name="visible">yes</property>
-
-                                <child>
-                                  <widget class="GtkLabel" id="label14">
-                                    <property name="label" translatable="yes">Header</property>
-                                    <property name="justify">GTK_JUSTIFY_CENTER</property>
-                                    <property name="wrap">no</property>
-                                    <property name="xalign">0</property>
-                                    <property name="yalign">0.5</property>
-                                    <property name="xpad">0</property>
-                                    <property name="ypad">0</property>
-                                    <property name="visible">yes</property>
-                                  </widget>
-                                  <packing>
-                                    <property name="padding">0</property>
-                                    <property name="expand">no</property>
-                                    <property name="fill">no</property>
-                                  </packing>
-                                </child>
-
-                                <child>
-                                  <widget class="GtkEntry" id="entry7">
-                                    <property name="can_focus">yes</property>
-                                    <property name="editable">yes</property>
-                                    <property name="text" translatable="yes"></property>
-                                    <property name="max-length">0</property>
-                                    <property name="visibility">yes</property>
-                                    <property name="visible">yes</property>
-                                  </widget>
-                                  <packing>
-                                    <property name="padding">0</property>
-                                    <property name="expand">no</property>
-                                    <property name="fill">no</property>
-                                  </packing>
-                                </child>
-                              </widget>
-                            </child>
-                          </widget>
-                          <packing>
-                            <property name="left_attach">0</property>
-                            <property name="right_attach">1</property>
-                            <property name="top_attach">0</property>
-                            <property name="bottom_attach">1</property>
-                            <property name="x_padding">0</property>
-                            <property name="y_padding">0</property>
-                            <property name="x_options">expand|fill</property>
-                            <property name="y_options">fill</property>
-                          </packing>
-                        </child>
-
-                        <child>
-                          <widget class="GtkAlignment" id="alignment17">
-                            <property name="xalign">0.5</property>
-                            <property name="yalign">1</property>
-                            <property name="xscale">1</property>
-                            <property name="yscale">0</property>
-                            <property name="visible">yes</property>
-
-                            <child>
-                              <widget class="GtkVBox" id="vbox15">
-                                <property name="homogeneous">no</property>
-                                <property name="spacing">0</property>
-                                <property name="visible">yes</property>
-
-                                <child>
-                                  <widget class="GtkLabel" id="label15">
-                                    <property name="label" translatable="yes">Footer:</property>
-                                    <property name="justify">GTK_JUSTIFY_CENTER</property>
-                                    <property name="wrap">no</property>
-                                    <property name="xalign">0</property>
-                                    <property name="yalign">0.5</property>
-                                    <property name="xpad">0</property>
-                                    <property name="ypad">0</property>
-                                    <property name="visible">yes</property>
-                                  </widget>
-                                  <packing>
-                                    <property name="padding">0</property>
-                                    <property name="expand">no</property>
-                                    <property name="fill">no</property>
-                                  </packing>
-                                </child>
-
-                                <child>
-                                  <widget class="GtkEntry" id="entry8">
-                                    <property name="can_focus">yes</property>
-                                    <property name="editable">yes</property>
-                                    <property name="text" translatable="yes"></property>
-                                    <property name="max-length">0</property>
-                                    <property name="visibility">yes</property>
-                                    <property name="visible">yes</property>
-                                  </widget>
-                                  <packing>
-                                    <property name="padding">0</property>
-                                    <property name="expand">no</property>
-                                    <property name="fill">no</property>
-                                  </packing>
-                                </child>
-                              </widget>
-                            </child>
-                          </widget>
-                          <packing>
-                            <property name="left_attach">0</property>
-                            <property name="right_attach">1</property>
-                            <property name="top_attach">2</property>
-                            <property name="bottom_attach">3</property>
-                            <property name="x_padding">0</property>
-                            <property name="y_padding">0</property>
-                            <property name="x_options">expand|fill</property>
-                            <property name="y_options">fill</property>
-                          </packing>
-                        </child>
-
-                        <child>
-                          <widget class="GtkAlignment" id="alignment14">
-                            <property name="xalign">0</property>
-                            <property name="yalign">1</property>
-                            <property name="xscale">0</property>
-                            <property name="yscale">0</property>
-                            <property name="visible">yes</property>
-
-                            <child>
-                              <widget class="GtkButton" id="button10">
-                                <property name="can_focus">yes</property>
-                                <property name="label" translatable="yes">_Font...</property>
-                                <property name="relief">GTK_RELIEF_NORMAL</property>
-                                <property name="visible">yes</property>
-                                <property name="use_underline">yes</property>
-                              </widget>
-                            </child>
-                          </widget>
-                          <packing>
-                            <property name="left_attach">1</property>
-                            <property name="right_attach">2</property>
-                            <property name="top_attach">0</property>
-                            <property name="bottom_attach">1</property>
-                            <property name="x_padding">0</property>
-                            <property name="y_padding">0</property>
-                            <property name="x_options">fill</property>
-                            <property name="y_options">fill</property>
-                          </packing>
-                        </child>
-                      </widget>
-                      <packing>
-                        <property name="padding">0</property>
-                        <property name="expand">yes</property>
-                        <property name="fill">yes</property>
-                      </packing>
-                    </child>
-
-                    <child>
-                      <widget class="GtkHBox" id="hbox7">
-                        <property name="homogeneous">no</property>
-                        <property name="spacing">0</property>
-                        <property name="visible">yes</property>
-
-                        <child>
-                          <widget class="GtkToolbar" id="toolbar1">
-                            <property name="orientation">GTK_ORIENTATION_HORIZONTAL</property>
-                            <property name="toolbar-style">GTK_TOOLBAR_ICONS</property>
-                            <property name="visible">yes</property>
-
-                            <child>
-                              <placeholder />
-                            </child>
-
-                            <child>
-                              <placeholder />
-                            </child>
-
-                            <child>
-                              <placeholder />
-                            </child>
-
-                            <child>
-                              <placeholder />
-                            </child>
-
-                            <child>
-                              <placeholder />
-                            </child>
-                          </widget>
-                          <packing>
-                            <property name="padding">0</property>
-                            <property name="expand">yes</property>
-                            <property name="fill">no</property>
-                          </packing>
-                        </child>
-                      </widget>
-                      <packing>
-                        <property name="padding">0</property>
-                        <property name="expand">no</property>
-                        <property name="fill">yes</property>
-                      </packing>
-                    </child>
-
-                    <child>
-                      <widget class="GtkCheckButton" id="checkbutton4">
-                        <property name="can_focus">yes</property>
-                        <property name="label" translatable="yes">Reverse on even pages</property>
-                        <property name="active">no</property>
-                        <property name="draw_indicator">yes</property>
-                        <property name="visible">yes</property>
-                      </widget>
-                      <packing>
-                        <property name="padding">0</property>
-                        <property name="expand">no</property>
-                        <property name="fill">no</property>
-                      </packing>
-                    </child>
-                  </widget>
-                </child>
-
-                <child>
-                  <widget class="GtkLabel" id="label3">
-                    <property name="label" translatable="yes">Header/Footer</property>
-                    <property name="justify">GTK_JUSTIFY_CENTER</property>
-                    <property name="wrap">no</property>
-                    <property name="xalign">0.5</property>
-                    <property name="yalign">0.5</property>
-                    <property name="xpad">0</property>
-                    <property name="ypad">0</property>
-                    <property name="visible">yes</property>
-                  </widget>
-                  <packing>
-                    <property name="type">tab</property>
-                  </packing>
-                </child>
-              </widget>
-              <packing>
-                <property name="padding">0</property>
-                <property name="expand">yes</property>
-                <property name="fill">yes</property>
-              </packing>
-            </child>
-          </widget>
-          <packing>
-            <property name="padding">0</property>
-            <property name="expand">yes</property>
-            <property name="fill">yes</property>
-          </packing>
-        </child>
-      </widget>
-      <packing>
-        <property name="padding">4</property>
-        <property name="expand">yes</property>
-        <property name="fill">yes</property>
-      </packing>
-    </child>
-  </widget>
-</glade-interface>
diff --git a/addressbook/printing/e-contact-print.h b/addressbook/printing/e-contact-print.h
deleted file mode 100644
index 4edc948082..0000000000
--- a/addressbook/printing/e-contact-print.h
+++ /dev/null
@@ -1,36 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-/* 
- * e-contact-print.h
- * Copyright (C) 2000  Ximian, Inc.
- * Author: Chris Lahey <clahey@ximian.com>
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of version 2 of the GNU General Public
- * License as published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * General Public License for more details.
- *
- * You should have received a copy of the GNU General Public
- * License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
- */
-
-#ifndef E_CONTACT_PRINT_H
-#define E_CONTACT_PRINT_H
-
-#include <glib.h>
-#include <gtk/gtkwidget.h>
-#include <libebook/e-book.h>
-#include <libebook/e-contact.h>
-#include "e-contact-print-types.h"
-
-GtkWidget *e_contact_print_dialog_new(EBook *book, char *query);
-void e_contact_print_preview(EBook *book, char *query);
-GtkWidget *e_contact_print_contact_dialog_new(EContact *card);
-GtkWidget *e_contact_print_contact_list_dialog_new(GList *list);
-
-#endif /* E_CONTACT_PRINT_H */
diff --git a/addressbook/printing/medbook.ecps b/addressbook/printing/medbook.ecps
deleted file mode 100644
index ef76c0b46e..0000000000
--- a/addressbook/printing/medbook.ecps
+++ /dev/null
@@ -1,30 +0,0 @@
-<style>
-<title/>
-<type>cards</type>
-<sections_start_new_page>FALSE</sections_start_new_page>
-<num_columns>2</num_columns>
-<blank_forms>2</blank_forms>
-<letter_tabs>TRUE</letter_tabs>
-<letter_headings>TRUE</letter_headings>
-<headings_font>Helvetica Bold 12</headings_font>
-<body_font>Helvetica 8</body_font>
-<print_using_grey>TRUE</print_using_grey>
-<paper_width>8.5</paper_width>
-<paper_height>11</paper_height>
-<top_margin>0.5</top_margin>
-<left_margin>0.5</left_margin>
-<bottom_margin>0.5</bottom_margin>
-<right_margin>0.5</right_margin>
-<page_width>8.5</page_width>
-<page_height>11</page_height>
-<orientation>portrait</orientation>
-<header_font>Helvetica 8</header_font>
-<left_header/>
-<center_header/>
-<right_header/>
-<footer_font>Helvetica 8</footer_font>
-<left_footer/>
-<center_footer>[Page #]</center_footer>
-<right_footer/>
-<reverse_on_even_pages>FALSE</reverse_on_even_pages>
-</style>
diff --git a/addressbook/printing/phonelist.ecps b/addressbook/printing/phonelist.ecps
deleted file mode 100644
index 980750a6b2..0000000000
--- a/addressbook/printing/phonelist.ecps
+++ /dev/null
@@ -1,29 +0,0 @@
-<style>
-<title/>
-<type>phone_list</type>
-<sections_start_new_page>FALSE</sections_start_new_page>
-<num_columns>2</num_columns>
-<letter_tabs>FALSE</letter_tabs>
-<letter_headings>TRUE</letter_headings>
-<headings_font>Helvetica Bold 10</headings_font>
-<body_font>Helvetica 8</body_font>
-<print_using_grey>TRUE</print_using_grey>
-<paper_width>8.5</paper_width>
-<paper_height>11</paper_height>
-<top_margin>0.5</top_margin>
-<left_margin>0.5</left_margin>
-<bottom_margin>0.5</bottom_margin>
-<right_margin>0.5</right_margin>
-<page_width>8.5</page_width>
-<page_height>11</page_height>
-<orientation>portrait</orientation>
-<header_font>Helvetica 8</header_font>
-<left_header/>
-<center_header/>
-<right_header/>
-<footer_font>Helvetica 8</footer_font>
-<left_footer>[User Name]</left_footer>
-<center_footer>[Page #]</center_footer>
-<right_footer>[Date Printed]</right_footer>
-<reverse_on_even_pages>FALSE</reverse_on_even_pages>
-</style>
diff --git a/addressbook/printing/smallbook.ecps b/addressbook/printing/smallbook.ecps
deleted file mode 100644
index 0bb19aa92e..0000000000
--- a/addressbook/printing/smallbook.ecps
+++ /dev/null
@@ -1,30 +0,0 @@
-<style>
-<title/>
-<type>cards</type>
-<sections_start_new_page>FALSE</sections_start_new_page>
-<num_columns>1</num_columns>
-<blank_forms>2</blank_forms>
-<letter_tabs>TRUE</letter_tabs>
-<letter_headings>TRUE</letter_headings>
-<headings_font>Helvetica Bold 8</headings_font>
-<body_font>Helvetica 6</body_font>
-<print_using_grey>TRUE</print_using_grey>
-<paper_width>8.5</paper_width>
-<paper_height>11</paper_height>
-<top_margin>0.5</top_margin>
-<left_margin>0.5</left_margin>
-<bottom_margin>0.5</bottom_margin>
-<right_margin>0.5</right_margin>
-<page_width>2.75</page_width>
-<page_height>4.25</page_height>
-<orientation>portrait</orientation>
-<header_font>Helvetica 6</header_font>
-<left_header/>
-<center_header/>
-<right_header/>
-<footer_font>Helvetica 6</footer_font>
-<left_footer/>
-<center_footer>[Page #]</center_footer>
-<right_footer/>
-<reverse_on_even_pages>FALSE</reverse_on_even_pages>
-</style>
diff --git a/addressbook/printing/test-contact-print-style-editor.c b/addressbook/printing/test-contact-print-style-editor.c
deleted file mode 100644
index f49625434e..0000000000
--- a/addressbook/printing/test-contact-print-style-editor.c
+++ /dev/null
@@ -1,93 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-/* 
- * test-contact-print-style-editor.c
- * Copyright (C) 2000  Ximian, Inc.
- * Author: Chris Lahey <clahey@ximian.com>
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of version 2 of the GNU General Public
- * License as published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * General Public License for more details.
- *
- * You should have received a copy of the GNU General Public
- * License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
- */
-
-#include "config.h"
-
-#include <stdlib.h>
-#include <gtk/gtkmain.h>
-#include <libgnomeui/gnome-app.h>
-#include <libgnomeui/gnome-ui-init.h>
-#include <bonobo/bonobo-main.h>
-#include "e-contact-print-style-editor.h"
-
-/* This is a horrible thing to do, but it is just a test. */
-GtkWidget *editor;
-
-static void destroy_callback(GtkWidget *app, gpointer data)
-{
-	static int count = 2;
-	count --;
-	if ( count <= 0 )
-		exit(0);
-}
-
-#if 0
-static void about_callback( GtkWidget *widget, gpointer data )
-{
-  
-  const gchar *authors[] =
-  {
-    "Christopher James Lahey <clahey@umich.edu>",
-    NULL
-  };
-
-  GtkWidget *about =
-    gnome_about_new ( _( "Contact Print Style Editor Test" ), VERSION,
-		      _( "Copyright (C) 2000, Ximian, Inc." ),
-		      authors,
-		      _( "This should test the contact print style editor widget" ),
-		      NULL);
-  gtk_widget_show (about);                                            
-}
-#endif
-
-int main( int argc, char *argv[] )
-{
-  GtkWidget *app;
-
-  /*  bindtextdomain (PACKAGE, GNOMELOCALEDIR);
-      textdomain (PACKAGE);*/
-
-  gnome_program_init ("Contact Print Style Editor Test", VERSION,
-		      LIBGNOMEUI_MODULE,
-		      argc, argv,
-		      NULL);
-
-  glade_init ();
-
-  app = gnome_app_new("Contact Print Style Editor Test", NULL);
-
-  editor = e_contact_print_style_editor_new("");
-  
-  gnome_app_set_contents( GNOME_APP( app ), editor );
-
-  /* Connect the signals */
-  g_signal_connect( app, "destroy",
-		    G_CALLBACK ( destroy_callback ),
-		    ( gpointer ) app );
-
-  gtk_widget_show_all( app );
-
-  bonobo_main(); 
-
-  /* Not reached. */
-  return 0;
-}
diff --git a/addressbook/printing/test-print.c b/addressbook/printing/test-print.c
deleted file mode 100644
index a1dede7bde..0000000000
--- a/addressbook/printing/test-print.c
+++ /dev/null
@@ -1,88 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-/* 
- * test-print.c
- * Copyright (C) 2000  Ximian, Inc.
- * Author: Chris Lahey <clahey@ximian.com>
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of version 2 of the GNU General Public
- * License as published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * General Public License for more details.
- *
- * You should have received a copy of the GNU General Public
- * License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
- */
-
-#include "config.h"
-
-#include <stdlib.h>
-#include <gtk/gtkmain.h>
-#include <libgnomeui/gnome-dialog.h>
-#include <libgnomeui/gnome-ui-init.h>
-#include <glade/glade.h>
-#include <bonobo/bonobo-main.h>
-#include "e-contact-print.h"
-
-/* This is a horrible thing to do, but it is just a test. */
-GtkWidget *print;
-
-static gint test_close(GnomeDialog *dialog, gpointer data)
-{
-	exit(0);
-	return 1;
-}
-
-#if 0
-static void about_callback( GtkWidget *widget, gpointer data )
-{
-  
-  const gchar *authors[] =
-  {
-    "Christopher James Lahey <clahey@umich.edu>",
-    NULL
-  };
-
-  GtkWidget *about =
-    gnome_about_new ( _( "Contact Print Test" ), VERSION,
-		      _( "Copyright (C) 2000, Ximian, Inc." ),
-		      authors,
-		      _( "This should test the contact print code" ),
-		      NULL);
-  gtk_widget_show (about);                                            
-}
-#endif
-
-int main( int argc, char *argv[] )
-{
-  GList *shown_fields = NULL;
-
-  /*  bindtextdomain (PACKAGE, GNOMELOCALEDIR);
-      textdomain (PACKAGE);*/
-
-  gnome_program_init ("Contact Print Test", VERSION,
-		      LIBGNOMEUI_MODULE,
-		      argc, argv,
-		      NULL);
-
-  glade_init ();
-  
-  shown_fields = g_list_append(shown_fields, "First field");
-  shown_fields = g_list_append(shown_fields, "Second field");
-  shown_fields = g_list_append(shown_fields, "Third field");
-  shown_fields = g_list_append(shown_fields, "Fourth field");
-
-  print = e_contact_print_dialog_new(NULL, NULL);
-  gtk_widget_show_all(print);
-  g_signal_connect(print, "close", G_CALLBACK(test_close), NULL);
-
-  bonobo_main(); 
-
-  /* Not reached. */
-  return 0;
-}
diff --git a/addressbook/tools/.cvsignore b/addressbook/tools/.cvsignore
deleted file mode 100644
index 25963ae030..0000000000
--- a/addressbook/tools/.cvsignore
+++ /dev/null
@@ -1,5 +0,0 @@
-Makefile
-Makefile.in
-evolution-addressbook-export
-evolution-addressbook-abuse
-evolution-addressbook-clean
diff --git a/addressbook/tools/Makefile.am b/addressbook/tools/Makefile.am
deleted file mode 100644
index c925cb5e05..0000000000
--- a/addressbook/tools/Makefile.am
+++ /dev/null
@@ -1,39 +0,0 @@
-privlibexec_SCRIPTS =					\
-	csv2vcard					\
-	evolution-addressbook-clean
-
-privlibexec_PROGRAMS =			\
-	evolution-addressbook-export	
-
-INCLUDES =						\
-	-DG_LOG_DOMAIN=\"evolution-addressbook-tools\"	\
-	-I$(top_srcdir)					\
-	-I$(top_builddir)				\
-	-DEVOLUTION_LOCALEDIR=\""$(localedir)"\"	\
-	-DPREFIX=\""$(prefix)"\"			\
-	-DSYSCONFDIR=\""$(sysconfdir)"\"		\
-	-DDATADIR=\""$(datadir)"\"			\
-	-DLIBDIR=\""$(libdir)"\"			\
-	-I$(top_srcdir)/addressbook			\
-	-I$(top_builddir)/addressbook			\
-	$(EVOLUTION_ADDRESSBOOK_CFLAGS)
-
-evolution_addressbook_export_SOURCES =				\
-	evolution-addressbook-export.c				\
-	evolution-addressbook-export-list-cards.c 		\
-	evolution-addressbook-export-list-folders.c		\
-	evolution-addressbook-export.h
-
-evolution_addressbook_export_LDADD =				\
-	$(EVOLUTION_ADDRESSBOOK_LIBS)
-
-EXTRA_DIST = $(privlibexec_SCRIPTS) \
-	evolution-addressbook-clean.in
-
-CLEANFILES= evolution-addressbook-clean
-
-evolution-addressbook-clean: evolution-addressbook-clean.in Makefile
-## Use sed and then mv to avoid problems if the user interrupts.
-	sed -e 's?\@EVOLUTION_TOOLSDIR\@?$(privlibexecdir)?g' \
-           < $(srcdir)/evolution-addressbook-clean.in > evolution-addressbook-clean.tmp \
-          && mv evolution-addressbook-clean.tmp evolution-addressbook-clean
diff --git a/addressbook/tools/csv2vcard b/addressbook/tools/csv2vcard
deleted file mode 100755
index b968fbd9c3..0000000000
--- a/addressbook/tools/csv2vcard
+++ /dev/null
@@ -1,236 +0,0 @@
-#!/usr/bin/perl -w
-#
-# cvs2vcard - Script to convert Outlook CSV files into VCard files
-# suitable to be imported into Evolution.
-#
-# Copyright (C) 2001 Ximian, Inc.
-#
-# This program is free software; you can redistribute it and/or
-# modify it under the terms of version 2 of the GNU General Public
-# License as published by the Free Software Foundation.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-# General Public License for more details.
-#
-# You should have received a copy of the GNU General Public
-# License along with this program; if not, write to the
-# Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-# Boston, MA 02111-1307, USA.
-#
-# Author: Michael MacDonald <mjmac@ximian.com>
-#
-
-use strict;
-use diagnostics;
-use Text::ParseWords;
-
-sub usage
-{
-  print STDERR << "--EndOfUsage";
-
-Takes a CSV-formatted list of contacts from Outlook and attempts to
-convert it into a list of VCards suitable for import into Evolution.
-
-Usage: $0 [infile outfile]
-
---EndOfUsage
-
-  exit;
-}
-
-sub is_recognized_format
-{
-  my $line = shift;
-
-  # Making some assumptions here...  Prolly OK.
-  return $line =~ /(First Name|Middle Name|Last Name)/; 
-}
-
-sub map_columns
-{
-  my $line = shift;
-
-  my @names = parse_line(',', 0, $line);
-
-  my $ctr = 0;
-  my %fieldmap = map { $_ => $ctr++ } @names;
-
-  return %fieldmap;
-}
-
-sub build_vcard_attr_from_def
-{
-  my ($def, $fields, $map) = @_;
-
-  # Valid chars for lookup (from Outlook CSV) are
-  # A-Za-z0-9_-'/
-  # Valid chars for formatting of attr are
-  # \s,|
-  my @lookup = map { s/=0A$//; s/[^\w\s\-'\/]//; $_; } split /[\s,]*\|[\s,]*/, $def;
-
-  foreach my $el (@lookup) {
-    unless (defined($map->{ $el })) {
-      print STDERR "$el is undefined\n";
-      next;
-    }
-    if (defined($fields->[$map->{ $el }])) {
-      unless ($fields->[$map->{ $el }] =~ /(^$|0\/0\/00)/) {
-        $def =~ s/$el/$fields->[$map->{ $el }]/;
-      } else {
-        $def =~ s/((?<=\|)\s*)?$el(\s*?(?=\|))?(=0A)?,?//;
-      }
-    } else {
-      $def =~ s/((?<=\|)\s*)?$el(\s*?(?=\|))?(=0A)?,?//;
-    }
-  }
-  # Get rid of field delimiters
-  $def =~ s/\|//g;
-  # Snip off any trailing semicolons or whitespace
-  $def =~ s/[\s;]*$//;
-
-  return $def;
-}
-
-sub build_vcard_from_line {
-  my ($line, %map) = @_;
-  my %vcard;
-
-  my @fields = parse_line(',', 0, $line);
-
-  my %vcard_def = ( FN => 'Title |First Name |Middle Name |Last Name |Suffix',
-		    N => 'Last Name| Suffix|;First Name|;Middle Name|;Title',
-		   'ADR;WORK'  => 'PO Box|;Business Street 2|;Business Street|;Business City|;Business State|;Business Postal Code|;Business Country',
-		   'LABEL;QUOTED-PRINTABLE;WORK' => 'PO Box |Business Street=0A|Business Street 2=0A|Business City,| Business State| Business Postal Code=0A|Business Country',
-		   'TEL;WORK;VOICE' => 'Business Phone',
-		   'TEL;WORK;VOICE2' => 'Business Phone 2',
-		   'TEL;WORK;FAX' => 'Business Fax',
-		   'TEL;WORK;COMPANY' => 'Company Main Phone',
-		   'ADR;HOME'  => ';Home Street 2|;Home Street|;Home City|;Home State|;Home Postal Code|;Home Country',
-		   'LABEL;QUOTED-PRINTABLE;HOME' => 'Home Street=0A|Home Street 2=0A|Home City,| Home State| Home Postal Code=0A|Home Country',
-		   'TEL;HOME;VOICE' => 'Home Phone',
-		   'TEL;HOME;VOICE2' => 'Home Phone 2',
-		   'TEL;HOME;FAX' => 'Home Fax',
-		   'ADR;POSTAL'  => ';Other Street 2|;Other Street|;Other City|;Other State|;Other Postal Code|;Other Country',
-		   'LABEL;QUOTED-PRINTABLE;POSTAL' => 'Other Street=0A|Other Street 2=0A|Other City,| Other State| Other Postal Code=0A|Other Country',
-		   'TEL;VOICE' => 'Other Phone',
-		   'TEL;FAX' => 'Other Fax',
-		   'TEL;CELL' => 'Mobile Phone',
-		   'TEL;CAR' => 'Car Phone',
-		   'TEL;PAGER' => 'Pager',
-		   'TEL;PREF' => 'Primary Phone',
-		   'TEL;ISDN' => 'ISDN',
-		   'TEL;X-EVOLUTION-CALLBACK' => 'Callback',
-		   'TEL;X-EVOLUTION-TTYTDD' => 'TTY/TDD Phone',
-		   'TEL;X-EVOLUTION-TELEX' => 'Telex',
-		   'TEL;X-EVOLUTION-RADIO' => 'Radio Phone',
-		   'EMAIL;INTERNET' => 'E-mail Address',
-		   'EMAIL;INTERNET2' => 'E-mail 2 Address',
-		   'EMAIL;INTERNET3' => 'E-mail 3 Address',
-		    ORG => 'Company|;Department',
-		    TITLE => 'Job Title',
-		    ROLE => 'Profession',
-                   'X-EVOLUTION-ASSISTANT' => "Assistant's Name",
-		   'TEL;X-EVOLUTION-ASSISTANT' => "Assistant's Phone",
-		   'X-EVOLUTION-SPOUSE' => 'Spouse',
-                   'X-EVOLUTION-ANNIVERSARY' => 'Anniversary',
-                   'X-EVOLUTION-MANAGER' => "Manager's Name",
-                   'X-EVOLUTION-OFFICE' => 'Office Location',
-		    BDAY => 'Birthday',
-		    NOTE => 'Notes',
-		    FBURL => 'Internet Free Busy',
-		    URL => 'Web Page',
-                   );
-
-  foreach my $key (keys(%vcard_def)) {
-    my $attr = build_vcard_attr_from_def($vcard_def{ $key }, \@fields, \%map);
-    if (defined($attr)) {
-      $vcard{ $key } = $attr unless ($attr =~ /^$/);
-    }
-  } 
-
-  return %vcard;
-}
-
-sub print_vcard_to_fh
-{
-  my ($fh, %vcard) = @_;
- 
-  print $fh "BEGIN:VCARD\n";
-  foreach my $key (keys(%vcard)) {
-    # Dirty hack because Evolution's vcard stores multiple email addrs
-    # with same sttribute, hence key collision.  Bleah.
-    # Ugh!  Same deal for multiple phones... (eg. bus. phone)
-    #
-    # And finally, while we're special-casing...  Outlook exports dates
-    # differently, so munge 'em if we find 'em.
-    if ($key =~ /EMAIL;INTERNET/o) {
-      (my $temp = $key) =~ s/\d$//;
-      print $fh "$temp:$vcard{ $key }\n";
-    } elsif ($key =~ /TEL;(HOME|WORK)/o) {
-      (my $temp = $key) =~ s/\d$//;
-      print $fh "$temp:$vcard{ $key }\n";
-    } elsif ($key =~ /(BDAY|X\-EVOLUTION\-ANNIVERSARY)/o) {
-      my $temp = $vcard{ $key };
-      if ($temp =~ /(\d\d)\/(\d\d)\/(\d\d)/) {
-        # Y2k !!  MS Didn't learn anything.
-        # Hope no one was born before 1915
-        if ((1900 + $3) < 1915) {
-          print $fh "$key:20$3-$1-$2\n";
-        } else {
-          print $fh "$key:19$3-$1-$2\n";
-        }
-      } else {
-        # Something's funky...  Just delete the attribute
-        print STDERR "Couldn't figure out what to do with $key:$vcard{ $key }\n";
-        delete($vcard{ $key });
-      } 
-    } else {
-      print $fh "$key:$vcard{ $key }\n";
-    }
-  }
-  print $fh "END:VCARD\n\n";
-}
-
-my $in  = $ARGV[0];
-my $out = $ARGV[1];
-
-usage() unless(defined($in) && defined($out));
-
-open (IN, $in)
-  or die "Can't open($in): $!\n";
-
-open (OUT, ">$out")
-  or die "Can't open($out): $!\n";
-
-my $linectr = 0;
-my %map;
-
-while (my $line = <IN>) {
-  $line =~ s/\r//g;
-  $line =~ s/\n$//;
-  if ($linectr == 0) {
-    $linectr++;
-    usage() unless is_recognized_format($line);
-    %map = map_columns($line);
-    #if ($line =~ /\r\n$/) {
-    #  print STDERR "Apparenlty found DOS-style EOL indicators...\n";
-      $/ = "\r\n";
-    #}
-  } else {
-    $linectr++;
-    while ($line =~ /^(("([^"]|\n|"")*")?,)*"([^"]|\n|"")*$/) {
-      my $temp = $line;
-      $line = <IN>;
-      $line =~ s/\r//g;
-      $line =~ s/\n$//;
-      $line = "$temp $line";
-    }
-    my %vcard = build_vcard_from_line($line, %map);
-    print_vcard_to_fh(\*OUT, %vcard);
-  }
-}  
-
-close(IN);
-close(OUT);
diff --git a/addressbook/tools/evolution-addressbook-abuse.c b/addressbook/tools/evolution-addressbook-abuse.c
deleted file mode 100644
index 3446e15938..0000000000
--- a/addressbook/tools/evolution-addressbook-abuse.c
+++ /dev/null
@@ -1,91 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-
-#include <config.h>
-
-#include <bonobo/bonobo-main.h>
-
-#include <backend/ebook/e-book.h>
-#include <gnome.h>
-
-#define CONTACTS_TO_ADD 2000
-
-static gchar *
-make_random_string (void)
-{
-	const gchar *elements = " abcdefghijklmnopqrstuvwxyz1234567890  ABCDEFGHIJKLMNOPQRSTUVWXYZ";
-	gint len = strlen (elements);
-	gint i, N = 5 + (random () % 10);
-	gchar *str = g_malloc (N+1);
-
-	for (i = 0; i < N; ++i) {
-		str[i] = elements[random () % len];
-	}
-	str[i] = '\0';
-
-	return str;
-}
-
-static gchar *
-make_random_vcard (void)
-{
-	gchar *fa = make_random_string ();
-	gchar *name = make_random_string ();
-	gchar *email = make_random_string ();
-	gchar *org = make_random_string ();
-
-	gchar *vcard;
-
-	vcard = g_strdup_printf ("BEGIN:VCARD\n"
-				 "X-EVOLUTION-FILE-AS:%s\n"
-				 "N:%s\n"
-				 "EMAIL;INTERNET:%s\n"
-				 "ORG:%s\n"
-				 "END:VCARD",
-				 fa, name, email, org);
-	g_free (fa);
-	g_free (name);
-	g_free (email);
-	g_free (org);
-
-	return vcard;
-}
-
-int
-main (int argc, char *argv[])
-{
-	EBook *book;
-	int i;
-
-	if (getenv ("ABUSE_THE_WOMBAT") == NULL) {
-		g_print ("You probably don't want to use this program.\n"
-			 "It isn't very nice.\n");
-		exit(0);
-	}
-
-	bindtextdomain (GETTEXT_PACKAGE, EVOLUTION_LOCALEDIR);
-	textdomain (GETTEXT_PACKAGE);
-
-	gnome_program_init ("evolution-addressbook-abuse", VERSION,
-			    LIBGNOMEUI_MODULE, argc, argv, 
-			    GNOME_PROGRAM_STANDARD_PROPERTIES,
-			    NULL);
-
-	if (!e_book_get_default_addressbook (&book, NULL)) {
-		g_warning ("couldn't open addressbook");
-		exit (1);
-	}
-
-	for (i = 0; i < CONTACTS_TO_ADD; ++i) {
-		gchar *vcard = make_random_vcard ();
-		EContact *contact = e_contact_new_from_vcard (vcard);
-		g_message ("adding %d", i);
-		if (!e_book_add_contact (book, contact, NULL)) {
-			g_warning ("something went wrong...");
-			exit (1);
-		}
-		g_free (vcard);
-		g_object_unref (contact);
-	}
-
-	return 0;
-}
diff --git a/addressbook/tools/evolution-addressbook-clean.in b/addressbook/tools/evolution-addressbook-clean.in
deleted file mode 100644
index b7ee7ba167..0000000000
--- a/addressbook/tools/evolution-addressbook-clean.in
+++ /dev/null
@@ -1,24 +0,0 @@
-#! /usr/bin/perl -w
-
-sub do_system
-{
-    my ($command) = @_;
-    system ($command);
-    if ($? != 0) {
-	die "Command failed: $command";
-    }
-}
-
-$filename = `@EVOLUTION_TOOLSDIR@/evolution-addressbook-export`;
-if ($? != 0) {
-    $! = $?;
-    die $!;
-}
-
-$HOME = $ENV{"HOME"};
-
-system ("@EVOLUTION_TOOLSDIR@/killev");
-do_system ("/bin/mv ${HOME}/evolution/local/Contacts/addressbook.db ${HOME}/evolution/local/Contacts/addressbook-backup.db");
-do_system ("@EVOLUTION_TOOLSDIR@/evolution-addressbook-import --input-file $filename");
-do_system ("/bin/rm $filename");
-
diff --git a/addressbook/tools/evolution-addressbook-export-list-cards.c b/addressbook/tools/evolution-addressbook-export-list-cards.c
deleted file mode 100644
index 88923fd244..0000000000
--- a/addressbook/tools/evolution-addressbook-export-list-cards.c
+++ /dev/null
@@ -1,796 +0,0 @@
-/* -*- Mode: C; indent-tabs-mode: t; c-basic-offset: 8; tab-width: 8 -*- */
-/* evolution-addressbook-export-list-cards.c
- *
- * Copyright (C) 2003 Ximian, Inc.
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of version 2 of the GNU General Public
- * License as published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * General Public License for more details.
- *
- * You should have received a copy of the GNU General Public
- * License along with this program; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
- *
- * Author: Gilbert Fang <gilbert.fang@sun.com>
- *
- */
-
-#include <config.h>
-
-#include <string.h>
-#include <sys/types.h>
-#include <unistd.h>
-
-#include <glib.h>
-#include <bonobo-activation/bonobo-activation.h>
-#include <libbonobo.h>
-#include <libgnome/libgnome.h>
-
-#include <libebook/e-book.h>
-#include <libebook/e-contact.h>
-
-#include "evolution-addressbook-export.h"
-
-#define COMMA_SEPARATOR ","
-
-typedef enum _CARD_FORMAT CARD_FORMAT;
-typedef enum _DeliveryAddressField DeliveryAddressField;
-typedef enum _EContactFieldCSV EContactFieldCSV;
-typedef struct _EContactCSVFieldData EContactCSVFieldData;
-
-enum _CARD_FORMAT
-{
-	CARD_FORMAT_CSV,
-	CARD_FORMAT_VCARD
-};
-
-enum _DeliveryAddressField
-{
-	DELIVERY_ADDRESS_STREET,
-	DELIVERY_ADDRESS_EXT,
-	DELIVERY_ADDRESS_LOCALITY,
-	DELIVERY_ADDRESS_REGION,
-	DELIVERY_ADDRESS_CODE,
-	DELIVERY_ADDRESS_COUNTRY
-};
-
-enum _EContactFieldCSV
-{
-	E_CONTACT_CSV_FILE_AS,
-	E_CONTACT_CSV_FULL_NAME,
-	E_CONTACT_CSV_EMAIL,
-	E_CONTACT_CSV_PHONE_PRIMARY,
-	E_CONTACT_CSV_PHONE_ASSISTANT,
-	E_CONTACT_CSV_PHONE_BUSINESS,
-	E_CONTACT_CSV_PHONE_CALLBACK,
-	E_CONTACT_CSV_PHONE_COMPANY,
-	E_CONTACT_CSV_PHONE_HOME,
-	E_CONTACT_CSV_ORG,
-	/*E_CONTACT_CSV_ADDRESS_BUSINESS, */
-	E_CONTACT_CSV_ADDRESS_BUSINESS_STREET,
-	E_CONTACT_CSV_ADDRESS_BUSINESS_EXT,
-	E_CONTACT_CSV_ADDRESS_BUSINESS_CITY,
-	E_CONTACT_CSV_ADDRESS_BUSINESS_REGION,
-	E_CONTACT_CSV_ADDRESS_BUSINESS_POSTCODE,
-	E_CONTACT_CSV_ADDRESS_BUSINESS_COUNTRY,
-	/*E_CONTACT_CSV_ADDRESS_HOME, */
-	E_CONTACT_CSV_ADDRESS_HOME_STREET,
-	E_CONTACT_CSV_ADDRESS_HOME_EXT,
-	E_CONTACT_CSV_ADDRESS_HOME_CITY,
-	E_CONTACT_CSV_ADDRESS_HOME_REGION,
-	E_CONTACT_CSV_ADDRESS_HOME_POSTCODE,
-	E_CONTACT_CSV_ADDRESS_HOME_COUNTRY,
-	E_CONTACT_CSV_PHONE_MOBILE,
-	E_CONTACT_CSV_PHONE_CAR,
-	E_CONTACT_CSV_PHONE_BUSINESS_FAX,
-	E_CONTACT_CSV_PHONE_HOME_FAX,
-	E_CONTACT_CSV_PHONE_BUSINESS_2,
-	E_CONTACT_CSV_PHONE_HOME_2,
-	E_CONTACT_CSV_PHONE_ISDN,
-	E_CONTACT_CSV_PHONE_OTHER,
-	E_CONTACT_CSV_PHONE_OTHER_FAX,
-	E_CONTACT_CSV_PHONE_PAGER,
-	E_CONTACT_CSV_PHONE_RADIO,
-	E_CONTACT_CSV_PHONE_TELEX,
-	E_CONTACT_CSV_PHONE_TTYTDD,
-	/*E_CONTACT_CSV_ADDRESS_OTHER, */
-	E_CONTACT_CSV_ADDRESS_OTHER_STREET,
-	E_CONTACT_CSV_ADDRESS_OTHER_EXT,
-	E_CONTACT_CSV_ADDRESS_OTHER_CITY,
-	E_CONTACT_CSV_ADDRESS_OTHER_REGION,
-	E_CONTACT_CSV_ADDRESS_OTHER_POSTCODE,
-	E_CONTACT_CSV_ADDRESS_OTHER_COUNTRY,
-	E_CONTACT_CSV_EMAIL_2,
-	E_CONTACT_CSV_EMAIL_3,
-	E_CONTACT_CSV_HOMEPAGE_URL,
-	E_CONTACT_CSV_ORG_UNIT,
-	E_CONTACT_CSV_OFFICE,
-	E_CONTACT_CSV_TITLE,
-	E_CONTACT_CSV_ROLE,
-	E_CONTACT_CSV_MANAGER,
-	E_CONTACT_CSV_ASSISTANT,
-	E_CONTACT_CSV_NICKNAME,
-	E_CONTACT_CSV_SPOUSE,
-	E_CONTACT_CSV_NOTE,
-	E_CONTACT_CSV_CALENDAR_URI,
-	E_CONTACT_CSV_FREEBUSY_URL,
-	/*E_CONTACT_CSV_ANNIVERSARY, */
-	E_CONTACT_CSV_ANNIVERSARY_YEAR,
-	E_CONTACT_CSV_ANNIVERSARY_MONTH,
-	E_CONTACT_CSV_ANNIVERSARY_DAY,
-	/*E_CONTACT_CSV_BIRTH_DATE, */
-	E_CONTACT_CSV_BIRTH_DATE_YEAR,
-	E_CONTACT_CSV_BIRTH_DATE_MONTH,
-	E_CONTACT_CSV_BIRTH_DATE_DAY,
-	E_CONTACT_CSV_MAILER,
-	E_CONTACT_CSV_NAME_OR_ORG,
-	E_CONTACT_CSV_CATEGORIES,
-	E_CONTACT_CSV_FAMILY_NAME,
-	E_CONTACT_CSV_GIVEN_NAME,
-	E_CONTACT_CSV_WANTS_HTML,
-	E_CONTACT_CSV_IS_LIST,
-	E_CONTACT_CSV_LAST
-};
-
-struct _EContactCSVFieldData
-{
-	gint csv_field;
-	gint contact_field;
-	gchar *csv_name;
-};
-
-#define NOMAP -1
-static EContactCSVFieldData csv_field_data[] = {
-	{E_CONTACT_CSV_FILE_AS, E_CONTACT_FILE_AS, ""},
-	{E_CONTACT_CSV_FULL_NAME, E_CONTACT_CSV_FULL_NAME, ""},
-	{E_CONTACT_CSV_EMAIL, E_CONTACT_EMAIL, ""},
-	{E_CONTACT_CSV_PHONE_PRIMARY, E_CONTACT_PHONE_PRIMARY,
-	 ""},
-	{E_CONTACT_CSV_PHONE_ASSISTANT,
-	 E_CONTACT_PHONE_ASSISTANT, ""},
-	{E_CONTACT_CSV_PHONE_BUSINESS,
-	 E_CONTACT_PHONE_BUSINESS, ""},
-	{E_CONTACT_CSV_PHONE_CALLBACK,
-	 E_CONTACT_PHONE_CALLBACK, ""},
-	{E_CONTACT_CSV_PHONE_COMPANY, E_CONTACT_PHONE_COMPANY,
-	 ""},
-	{E_CONTACT_CSV_PHONE_HOME, E_CONTACT_PHONE_HOME, ""},
-	{E_CONTACT_CSV_ORG, E_CONTACT_ORG, ""},
-	/*E_CONTACT_CSV_ADDRESS_BUSINESS, */
-	{E_CONTACT_CSV_ADDRESS_BUSINESS_STREET, NOMAP,
-	 "Business Address"},
-	{E_CONTACT_CSV_ADDRESS_BUSINESS_EXT, NOMAP,
-	 "Business Address2"},
-	{E_CONTACT_CSV_ADDRESS_BUSINESS_CITY, NOMAP,
-	 "Business Address City"},
-	{E_CONTACT_CSV_ADDRESS_BUSINESS_REGION, NOMAP,
-	 "Business Address State"},
-	{E_CONTACT_CSV_ADDRESS_BUSINESS_POSTCODE, NOMAP,
-	 "Business Address PostCode"},
-	{E_CONTACT_CSV_ADDRESS_BUSINESS_COUNTRY, NOMAP,
-	 "Business Address Country"},
-	/*E_CONTACT_CSV_ADDRESS_HOME, */
-	{E_CONTACT_CSV_ADDRESS_HOME_STREET, NOMAP, "Home Address"},
-	{E_CONTACT_CSV_ADDRESS_HOME_EXT, NOMAP, "Home Address2"},
-	{E_CONTACT_CSV_ADDRESS_HOME_CITY, NOMAP, "Home Address City"},
-	{E_CONTACT_CSV_ADDRESS_HOME_REGION, NOMAP,
-	 "Home Address State"},
-	{E_CONTACT_CSV_ADDRESS_HOME_POSTCODE, NOMAP,
-	 "Home Address PostCode"},
-	{E_CONTACT_CSV_ADDRESS_HOME_COUNTRY, NOMAP,
-	 "Home Address Country"},
-	{E_CONTACT_CSV_PHONE_MOBILE, E_CONTACT_PHONE_MOBILE,
-	 ""},
-	{E_CONTACT_CSV_PHONE_CAR, E_CONTACT_PHONE_CAR, ""},
-	{E_CONTACT_CSV_PHONE_BUSINESS_FAX,
-	 E_CONTACT_PHONE_BUSINESS_FAX, ""},
-	{E_CONTACT_CSV_PHONE_HOME_FAX,
-	 E_CONTACT_PHONE_HOME_FAX, ""},
-	{E_CONTACT_CSV_PHONE_BUSINESS_2,
-	 E_CONTACT_PHONE_BUSINESS_2, ""},
-	{E_CONTACT_CSV_PHONE_HOME_2, E_CONTACT_PHONE_HOME_2,
-	 ""},
-	{E_CONTACT_CSV_PHONE_ISDN, E_CONTACT_PHONE_ISDN, ""},
-	{E_CONTACT_CSV_PHONE_OTHER, E_CONTACT_PHONE_OTHER, ""},
-	{E_CONTACT_CSV_PHONE_OTHER_FAX,
-	 E_CONTACT_PHONE_OTHER_FAX, ""},
-	{E_CONTACT_CSV_PHONE_PAGER, E_CONTACT_PHONE_PAGER, ""},
-	{E_CONTACT_CSV_PHONE_RADIO, E_CONTACT_PHONE_RADIO, ""},
-	{E_CONTACT_CSV_PHONE_TELEX, E_CONTACT_PHONE_TELEX, ""},
-	{E_CONTACT_CSV_PHONE_TTYTDD, E_CONTACT_PHONE_TTYTDD,
-	 ""},
-	/*E_CONTACT_CSV_ADDRESS_OTHER, */
-	{E_CONTACT_CSV_ADDRESS_OTHER_STREET, NOMAP, "Other Address"},
-	{E_CONTACT_CSV_ADDRESS_OTHER_EXT, NOMAP, "Other Address2"},
-	{E_CONTACT_CSV_ADDRESS_OTHER_CITY, NOMAP,
-	 "Other Address City"},
-	{E_CONTACT_CSV_ADDRESS_OTHER_REGION, NOMAP,
-	 "Other Address State"},
-	{E_CONTACT_CSV_ADDRESS_OTHER_POSTCODE, NOMAP,
-	 "Other Address PostCode"},
-	{E_CONTACT_CSV_ADDRESS_OTHER_COUNTRY, NOMAP,
-	 "Other Address Country"},
-	{E_CONTACT_CSV_EMAIL_2, E_CONTACT_EMAIL_2, ""},
-	{E_CONTACT_CSV_EMAIL_3, E_CONTACT_EMAIL_3, ""},
-	{E_CONTACT_CSV_HOMEPAGE_URL, E_CONTACT_HOMEPAGE_URL, ""},
-	{E_CONTACT_CSV_ORG_UNIT, E_CONTACT_ORG_UNIT, ""},
-	{E_CONTACT_CSV_OFFICE, E_CONTACT_OFFICE, ""},
-	{E_CONTACT_CSV_TITLE, E_CONTACT_TITLE, ""},
-	{E_CONTACT_CSV_ROLE, E_CONTACT_ROLE, ""},
-	{E_CONTACT_CSV_MANAGER, E_CONTACT_MANAGER, ""},
-	{E_CONTACT_CSV_ASSISTANT, E_CONTACT_ASSISTANT, ""},
-	{E_CONTACT_CSV_NICKNAME, E_CONTACT_NICKNAME, ""},
-	{E_CONTACT_CSV_SPOUSE, E_CONTACT_SPOUSE, ""},
-	{E_CONTACT_CSV_NOTE, E_CONTACT_NOTE, ""},
-	{E_CONTACT_CSV_CALENDAR_URI, E_CONTACT_CALENDAR_URI, ""},
-	{E_CONTACT_CSV_FREEBUSY_URL, E_CONTACT_FREEBUSY_URL, ""},
-	/*E_CONTACT_ANNIVERSARY, */
-	{E_CONTACT_CSV_ANNIVERSARY_YEAR, NOMAP, "Anniversary Year"},
-	{E_CONTACT_CSV_ANNIVERSARY_MONTH, NOMAP, "Anniversary Month"},
-	{E_CONTACT_CSV_ANNIVERSARY_DAY, NOMAP, "Anniversary Day"},
-	/*E_CONTACT_BIRTH_DATE, */
-	{E_CONTACT_CSV_BIRTH_DATE_YEAR, NOMAP, "Birth Year"},
-	{E_CONTACT_CSV_BIRTH_DATE_MONTH, NOMAP, "Birth Month"},
-	{E_CONTACT_CSV_BIRTH_DATE_DAY, NOMAP, "Birth Day"},
-	{E_CONTACT_CSV_MAILER, E_CONTACT_MAILER, ""},
-	{E_CONTACT_CSV_NAME_OR_ORG, E_CONTACT_NAME_OR_ORG, ""},
-	{E_CONTACT_CSV_CATEGORIES, E_CONTACT_CATEGORIES, ""},
-	{E_CONTACT_CSV_FAMILY_NAME, E_CONTACT_FAMILY_NAME, ""},
-	{E_CONTACT_CSV_GIVEN_NAME, E_CONTACT_GIVEN_NAME, ""},
-	{E_CONTACT_CSV_WANTS_HTML, E_CONTACT_WANTS_HTML, ""},
-	{E_CONTACT_CSV_IS_LIST, E_CONTACT_IS_LIST, ""},
-	{E_CONTACT_CSV_LAST, NOMAP, ""}
-
-};
-
-static GSList *pre_defined_fields;
-
-/*function prototypes*/
-gint e_contact_csv_get_contact_field (EContactFieldCSV csv_field);
-gchar *e_contact_csv_get_name (EContactFieldCSV csv_field);
-gchar *e_contact_csv_get (EContact * contact, EContactFieldCSV csv_field);
-gchar *e_contact_csv_get_header_line (GSList * csv_all_fields);
-gchar *e_contact_to_csv (EContact * contact, GSList * csv_all_fields);
-gchar *e_contact_get_csv (EContact * contact, GSList * csv_all_fields);
-gchar *delivery_address_get_sub_field (const EContactAddress * delivery_address, DeliveryAddressField sub_field);
-gchar *check_null_pointer (gchar * orig);
-gchar *escape_string (gchar * orig);
-int output_n_cards_file (FILE * outputfile, GList *contacts, int size, int begin_no, CARD_FORMAT format);
-static void fork_to_background (void);
-void set_pre_defined_field (GSList ** pre_defined_fields);
-guint action_list_cards_init (ActionContext * p_actctx);
-
-
-/* function declarations*/
-gint
-e_contact_csv_get_contact_field (EContactFieldCSV csv_field)
-{
-	return csv_field_data[csv_field].contact_field;
-}
-
-gchar *
-e_contact_csv_get_name (EContactFieldCSV csv_field)
-{
-	gint contact_field;
-	gchar *name;
-	gchar *quoted_name;
-
-	contact_field = e_contact_csv_get_contact_field (csv_field);
-
-	if (contact_field != NOMAP) {
-		name = g_strdup (e_contact_field_name (contact_field));
-	} else {
-		name = g_strdup (csv_field_data[csv_field].csv_name);
-	}
-	quoted_name = escape_string (name);
-	g_free (name);
-	return quoted_name;
-}
-
-
-gchar *
-e_contact_csv_get (EContact * contact, EContactFieldCSV csv_field)
-{
-	gint contact_field;
-	gchar *field_value;
-	gchar *quoted_field_value;
-
-	EContactAddress *delivery_address = NULL;
-	EContactDate *date;
-
-	contact_field = e_contact_csv_get_contact_field (csv_field);
-
-	if (contact_field != NOMAP) {
-		field_value = e_contact_get (contact, contact_field);
-	} else {
-
-		switch (csv_field) {
-		case E_CONTACT_CSV_ADDRESS_HOME_STREET:
-			delivery_address = e_contact_get (contact, E_CONTACT_ADDRESS_HOME);
-			field_value = delivery_address_get_sub_field (delivery_address, DELIVERY_ADDRESS_STREET);
-			break;
-		case E_CONTACT_CSV_ADDRESS_HOME_EXT:
-			delivery_address = e_contact_get (contact, E_CONTACT_ADDRESS_HOME);
-			field_value = delivery_address_get_sub_field (delivery_address, DELIVERY_ADDRESS_EXT);
-			break;
-		case E_CONTACT_CSV_ADDRESS_HOME_CITY:
-			delivery_address = e_contact_get (contact, E_CONTACT_ADDRESS_HOME);
-			field_value = delivery_address_get_sub_field (delivery_address, DELIVERY_ADDRESS_LOCALITY);
-			break;
-		case E_CONTACT_CSV_ADDRESS_HOME_REGION:
-			delivery_address = e_contact_get (contact, E_CONTACT_ADDRESS_HOME);
-			field_value = delivery_address_get_sub_field (delivery_address, DELIVERY_ADDRESS_REGION);
-			break;
-		case E_CONTACT_CSV_ADDRESS_HOME_POSTCODE:
-			delivery_address = e_contact_get (contact, E_CONTACT_ADDRESS_HOME);
-			field_value = delivery_address_get_sub_field (delivery_address, DELIVERY_ADDRESS_CODE);
-			break;
-		case E_CONTACT_CSV_ADDRESS_HOME_COUNTRY:
-			delivery_address = e_contact_get (contact, E_CONTACT_ADDRESS_HOME);
-			field_value = delivery_address_get_sub_field (delivery_address, DELIVERY_ADDRESS_COUNTRY);
-			break;
-		case E_CONTACT_CSV_ADDRESS_BUSINESS_STREET:
-			delivery_address = e_contact_get (contact, E_CONTACT_ADDRESS_WORK);
-			field_value = delivery_address_get_sub_field (delivery_address, DELIVERY_ADDRESS_STREET);
-			break;
-		case E_CONTACT_CSV_ADDRESS_BUSINESS_EXT:
-			delivery_address = e_contact_get (contact, E_CONTACT_ADDRESS_WORK);
-			field_value = delivery_address_get_sub_field (delivery_address, DELIVERY_ADDRESS_EXT);
-			break;
-		case E_CONTACT_CSV_ADDRESS_BUSINESS_CITY:
-			delivery_address = e_contact_get (contact, E_CONTACT_ADDRESS_WORK);
-			field_value = delivery_address_get_sub_field (delivery_address, DELIVERY_ADDRESS_LOCALITY);
-			break;
-		case E_CONTACT_CSV_ADDRESS_BUSINESS_REGION:
-			delivery_address = e_contact_get (contact, E_CONTACT_ADDRESS_WORK);
-			field_value = delivery_address_get_sub_field (delivery_address, DELIVERY_ADDRESS_REGION);
-			break;
-		case E_CONTACT_CSV_ADDRESS_BUSINESS_POSTCODE:
-			delivery_address = e_contact_get (contact, E_CONTACT_ADDRESS_WORK);
-			field_value = delivery_address_get_sub_field (delivery_address, DELIVERY_ADDRESS_CODE);
-			break;
-		case E_CONTACT_CSV_ADDRESS_BUSINESS_COUNTRY:
-			delivery_address = e_contact_get (contact, E_CONTACT_ADDRESS_WORK);
-			field_value = delivery_address_get_sub_field (delivery_address, DELIVERY_ADDRESS_COUNTRY);
-			break;
-		case E_CONTACT_CSV_BIRTH_DATE_YEAR:
-			date = e_contact_get (contact, E_CONTACT_BIRTH_DATE);
-			if (date) {
-				field_value = g_strdup_printf ("%04d", date->year);
-				e_contact_date_free (date);
-			}
-			else {
-				field_value = g_strdup ("");
-			}
-			break;
-
-		case E_CONTACT_CSV_BIRTH_DATE_MONTH:
-			date = e_contact_get (contact, E_CONTACT_BIRTH_DATE);
-			if (date) {
-				field_value = g_strdup_printf ("%04d", date->month);
-				e_contact_date_free (date);
-			}
-			else {
-				field_value = g_strdup ("");
-			}
-			break;
-
-		case E_CONTACT_CSV_BIRTH_DATE_DAY:
-			date = e_contact_get (contact, E_CONTACT_BIRTH_DATE);
-			if (date) {
-				field_value = g_strdup_printf ("%04d", date->day);
-				e_contact_date_free (date);
-			}
-			else {
-				field_value = g_strdup ("");
-			}
-			break;
-
-		default:
-			field_value = g_strdup ("");
-		}
-	}
-
-	/*checking to avoid the NULL pointer */
-	if (field_value == NULL)
-		field_value =  g_strdup ("");
-
-	quoted_field_value = escape_string (field_value);
-	g_free (field_value);
-
-	if (delivery_address)
-		e_contact_address_free (delivery_address);
-
-	return quoted_field_value;
-}
-
-
-gchar *
-e_contact_csv_get_header_line (GSList * csv_all_fields)
-{
-
-	guint field_number;
-	gint csv_field;
-	gchar **field_name_array;
-	gchar *header_line;
-
-	gint loop_counter;
-
-	field_number = g_slist_length (csv_all_fields);
-	field_name_array = g_new0 (gchar *, field_number + 1);
-
-	for (loop_counter = 0; loop_counter < field_number; loop_counter++) {
-		csv_field = GPOINTER_TO_INT (g_slist_nth_data (csv_all_fields, loop_counter));
-		*(field_name_array + loop_counter) = e_contact_csv_get_name (csv_field);
-	}
-
-	header_line = g_strjoinv (COMMA_SEPARATOR, field_name_array);
-
-	for (loop_counter = 0; loop_counter < field_number; loop_counter++) {
-		g_free (*(field_name_array + loop_counter));
-	}
-	g_free (field_name_array);
-
-	return header_line;
-
-}
-
-
-gchar *
-e_contact_to_csv (EContact * contact, GSList * csv_all_fields)
-{
-	guint field_number;
-	gint csv_field;
-	gchar **field_value_array;
-	gchar *aline;
-
-	gint loop_counter;
-
-	field_number = g_slist_length (csv_all_fields);
-	field_value_array = g_new0 (gchar *, field_number + 1);
-
-	for (loop_counter = 0; loop_counter < field_number; loop_counter++) {
-		csv_field = GPOINTER_TO_INT (g_slist_nth_data (csv_all_fields, loop_counter));
-		*(field_value_array + loop_counter) = e_contact_csv_get (contact, csv_field);
-	}
-
-	aline = g_strjoinv (COMMA_SEPARATOR, field_value_array);
-
-	for (loop_counter = 0; loop_counter < field_number; loop_counter++) {
-		g_free (*(field_value_array + loop_counter));
-	}
-	g_free (field_value_array);
-
-	return aline;
-
-}
-
-
-gchar *
-e_contact_get_csv (EContact * contact, GSList * csv_all_fields)
-{
-	gchar *aline;
-
-	aline = e_contact_to_csv (contact, csv_all_fields);
-	return aline;
-}
-
-
-gchar *
-check_null_pointer (gchar * orig)
-{
-	gchar *result;
-	if (orig == NULL)
-		result = g_strdup ("");
-	else
-		result = g_strdup (orig);
-	return result;
-}
-
-gchar *
-delivery_address_get_sub_field (const EContactAddress * address, DeliveryAddressField sub_field)
-{
-	gchar *sub_field_value;
-	gchar *str_temp, *str_temp_a;
-	if (address != NULL) {
-		switch (sub_field) {
-		case DELIVERY_ADDRESS_STREET:
-			str_temp_a = check_null_pointer (address->po);
-			str_temp = check_null_pointer (address->street);
-			sub_field_value = g_strdup_printf ("%s %s", str_temp_a, str_temp);
-			g_free (str_temp);
-			g_free (str_temp_a);
-			break;
-		case DELIVERY_ADDRESS_EXT:
-			sub_field_value = check_null_pointer (address->ext);
-			break;
-		case DELIVERY_ADDRESS_LOCALITY:
-			sub_field_value = check_null_pointer (address->locality);
-			break;
-		case DELIVERY_ADDRESS_REGION:
-			sub_field_value = check_null_pointer (address->region);
-			break;
-		case DELIVERY_ADDRESS_CODE:
-			sub_field_value = check_null_pointer (address->code);
-			break;
-		case DELIVERY_ADDRESS_COUNTRY:
-			sub_field_value = check_null_pointer (address->country);
-			break;
-		default:
-			sub_field_value = g_strdup ("");
-		}
-	} else {
-		sub_field_value = g_strdup ("");
-	}
-	return sub_field_value;
-}
-
-gchar *
-escape_string (gchar *orig)
-{
-	const guchar *p;
-	gchar *dest;
-	gchar *q;
-
-	if (orig == NULL)
-		return g_strdup ("\"\"");
-
-	p = (guchar *) orig;
-	/* Each source byte needs maximally two destination chars (\n), and the extra 2 is for the leading and trailing '"' */
-	q = dest = g_malloc (strlen (orig) * 2 + 1 + 2);
-
-	*q++ = '\"';
-	while (*p)
-	{
-		switch (*p)
-		{
-		case '\n':
-			*q++ = '\\';
-			*q++ = 'n';
-			break;
-		case '\r':
-			*q++ = '\\';
-			*q++ = 'r';
-			break;
-		case '\\':
-			*q++ = '\\';
-			*q++ = '\\';
-			break;
-		case '"':
-			*q++ = '"';
-			*q++ = '"';
-			break;
-		default:
-			*q++ = *p;
-		}
-		p++;
-	}
-
-	*q++ = '\"';
-	*q = 0;
-
-	return dest;
-}
-
-int
-output_n_cards_file (FILE * outputfile, GList *contacts, int size, int begin_no, CARD_FORMAT format)
-{
-	int i;
-	if (format == CARD_FORMAT_VCARD) {
-		for (i = begin_no; i < size + begin_no; i++) {
-			EContact *contact = g_list_nth_data (contacts, i);
-			gchar *vcard = e_vcard_to_string (E_VCARD (contact), EVC_FORMAT_VCARD_30);
-			fprintf (outputfile, "%s\n", vcard);
-			g_free (vcard);
-		}
-	} else if (format == CARD_FORMAT_CSV) {
-		gchar *csv_fields_name = e_contact_csv_get_header_line (pre_defined_fields);
-		fprintf (outputfile, "%s\n", csv_fields_name);
-		g_free (csv_fields_name);
-
-		for (i = begin_no; i < size + begin_no; i++) {
-			EContact *contact = g_list_nth_data (contacts, i);
-			gchar *csv = e_contact_get_csv (contact, pre_defined_fields);
-			fprintf (outputfile, "%s\n", csv);
-			g_free (csv);
-		}
-	}
-
-	return SUCCESS;
-
-}
-
-static void
-fork_to_background (void)
-{
-	pid_t pid;
-	pid = fork ();
-	if (pid == -1) {
-		/* ouch, fork() failed */
-		perror ("fork");
-		exit (-1);
-	} else if (pid == 0) {
-		/* child */
-		/*contunue */
-
-	} else {
-		/* parent exit,  note the use of _exit() instead of exit() */
-		_exit (-1);
-	}
-}
-
-
-
-
-static void
-action_list_cards (GList *contacts, ActionContext * p_actctx)
-{
-	FILE *outputfile;
-	long length;
-	int IsFirstOne;
-	int series_no;
-	gchar *file_series_name;
-	CARD_FORMAT format;
-	int size;
-
-	length = g_list_length (contacts);
-
-	if (length <= 0) {
-		g_warning ("Couldn't load addressbook correctly!!!! %s####", p_actctx->action_list_cards.addressbook_folder_uri);
-		exit (-1);
-	}
-
-
-	if (p_actctx->action_list_cards.async_mode == FALSE) {	/* normal mode */
-
-		if (p_actctx->action_list_cards.output_file == NULL) {
-			outputfile = stdout;
-		} else {
-			/* fopen output file */
-			if (!(outputfile = fopen (p_actctx->action_list_cards.output_file, "w"))) {
-				g_warning (_("Can not open file"));
-				exit (-1);
-			}
-		}
-
-		if (p_actctx->action_list_cards.IsVCard == TRUE)
-			format = CARD_FORMAT_VCARD;
-		else
-			format = CARD_FORMAT_CSV;
-
-		output_n_cards_file (outputfile, contacts, length, 0, format);
-
-		if (p_actctx->action_list_cards.output_file != NULL) {
-			fclose (outputfile);
-		}
-	}
-
-
-	/*async mode */
-	else {
-
-		size = p_actctx->action_list_cards.file_size;
-		IsFirstOne = TRUE;
-		series_no = 0;
-
-		do {
-			/* whether it is the last file */
-			if ((series_no + 1) * size >= length) {	/*last one */
-				file_series_name = g_strdup_printf ("%s.end", p_actctx->action_list_cards.output_file);
-
-			} else {	/*next one */
-				file_series_name =
-					g_strdup_printf ("%s.%04d", p_actctx->action_list_cards.output_file, series_no);
-			}
-
-			if (!(outputfile = fopen (file_series_name, "w"))) {
-				g_warning (_("Can not open file"));
-				exit (-1);
-			}
-
-
-			if (p_actctx->action_list_cards.IsVCard == TRUE)
-				format = CARD_FORMAT_VCARD;
-			else
-				format = CARD_FORMAT_CSV;
-			output_n_cards_file (outputfile, contacts, size, series_no * size, format);
-
-			fclose (outputfile);
-
-			series_no++;
-
-			if (IsFirstOne == TRUE) {
-				fork_to_background ();
-				IsFirstOne = FALSE;
-			}
-
-
-		}
-		while (series_no * size < length);
-		g_free (file_series_name);
-	}
-}
-
-void
-set_pre_defined_field (GSList ** pre_defined_fields)
-{
-	*pre_defined_fields = NULL;
-	*pre_defined_fields = g_slist_append (*pre_defined_fields, GINT_TO_POINTER (E_CONTACT_CSV_GIVEN_NAME));
-	*pre_defined_fields = g_slist_append (*pre_defined_fields, GINT_TO_POINTER (E_CONTACT_CSV_FAMILY_NAME));
-	*pre_defined_fields = g_slist_append (*pre_defined_fields, GINT_TO_POINTER (E_CONTACT_CSV_FULL_NAME));
-	*pre_defined_fields = g_slist_append (*pre_defined_fields, GINT_TO_POINTER (E_CONTACT_CSV_NICKNAME));
-	*pre_defined_fields = g_slist_append (*pre_defined_fields, GINT_TO_POINTER (E_CONTACT_CSV_EMAIL));
-	*pre_defined_fields = g_slist_append (*pre_defined_fields, GINT_TO_POINTER (E_CONTACT_CSV_EMAIL_2));
-	*pre_defined_fields = g_slist_append (*pre_defined_fields, GINT_TO_POINTER (E_CONTACT_CSV_WANTS_HTML));
-	*pre_defined_fields = g_slist_append (*pre_defined_fields, GINT_TO_POINTER (E_CONTACT_CSV_PHONE_BUSINESS));
-	*pre_defined_fields = g_slist_append (*pre_defined_fields, GINT_TO_POINTER (E_CONTACT_CSV_PHONE_HOME));
-	*pre_defined_fields = g_slist_append (*pre_defined_fields, GINT_TO_POINTER (E_CONTACT_CSV_PHONE_BUSINESS_FAX));
-	*pre_defined_fields = g_slist_append (*pre_defined_fields, GINT_TO_POINTER (E_CONTACT_CSV_PHONE_PAGER));
-	*pre_defined_fields = g_slist_append (*pre_defined_fields, GINT_TO_POINTER (E_CONTACT_CSV_PHONE_MOBILE));
-	*pre_defined_fields = g_slist_append (*pre_defined_fields, GINT_TO_POINTER (E_CONTACT_CSV_ADDRESS_HOME_STREET));
-	*pre_defined_fields = g_slist_append (*pre_defined_fields, GINT_TO_POINTER (E_CONTACT_CSV_ADDRESS_HOME_EXT));
-	*pre_defined_fields = g_slist_append (*pre_defined_fields, GINT_TO_POINTER (E_CONTACT_CSV_ADDRESS_HOME_CITY));
-	*pre_defined_fields = g_slist_append (*pre_defined_fields, GINT_TO_POINTER (E_CONTACT_CSV_ADDRESS_HOME_REGION));
-	*pre_defined_fields =
-		g_slist_append (*pre_defined_fields, GINT_TO_POINTER (E_CONTACT_CSV_ADDRESS_HOME_POSTCODE));
-	*pre_defined_fields =
-		g_slist_append (*pre_defined_fields, GINT_TO_POINTER (E_CONTACT_CSV_ADDRESS_HOME_COUNTRY));
-	*pre_defined_fields =
-		g_slist_append (*pre_defined_fields, GINT_TO_POINTER (E_CONTACT_CSV_ADDRESS_BUSINESS_STREET));
-	*pre_defined_fields =
-		g_slist_append (*pre_defined_fields, GINT_TO_POINTER (E_CONTACT_CSV_ADDRESS_BUSINESS_EXT));
-	*pre_defined_fields =
-		g_slist_append (*pre_defined_fields, GINT_TO_POINTER (E_CONTACT_CSV_ADDRESS_BUSINESS_CITY));
-	*pre_defined_fields =
-		g_slist_append (*pre_defined_fields, GINT_TO_POINTER (E_CONTACT_CSV_ADDRESS_BUSINESS_REGION));
-	*pre_defined_fields =
-		g_slist_append (*pre_defined_fields, GINT_TO_POINTER (E_CONTACT_CSV_ADDRESS_BUSINESS_POSTCODE));
-	*pre_defined_fields =
-		g_slist_append (*pre_defined_fields, GINT_TO_POINTER (E_CONTACT_CSV_ADDRESS_BUSINESS_COUNTRY));
-	*pre_defined_fields = g_slist_append (*pre_defined_fields, GINT_TO_POINTER (E_CONTACT_CSV_TITLE));
-	*pre_defined_fields = g_slist_append (*pre_defined_fields, GINT_TO_POINTER (E_CONTACT_CSV_OFFICE));
-	*pre_defined_fields = g_slist_append (*pre_defined_fields, GINT_TO_POINTER (E_CONTACT_CSV_ORG));
-	*pre_defined_fields = g_slist_append (*pre_defined_fields, GINT_TO_POINTER (E_CONTACT_CSV_HOMEPAGE_URL));
-	*pre_defined_fields = g_slist_append (*pre_defined_fields, GINT_TO_POINTER (E_CONTACT_CSV_CALENDAR_URI));
-	*pre_defined_fields = g_slist_append (*pre_defined_fields, GINT_TO_POINTER (E_CONTACT_CSV_BIRTH_DATE_YEAR));
-	*pre_defined_fields = g_slist_append (*pre_defined_fields, GINT_TO_POINTER (E_CONTACT_CSV_BIRTH_DATE_MONTH));
-	*pre_defined_fields = g_slist_append (*pre_defined_fields, GINT_TO_POINTER (E_CONTACT_CSV_BIRTH_DATE_DAY));
-	*pre_defined_fields = g_slist_append (*pre_defined_fields, GINT_TO_POINTER (E_CONTACT_CSV_NOTE));
-}
-
-guint
-action_list_cards_init (ActionContext * p_actctx)
-{
-	EBook *book;
-	EBookQuery *query;
-	GList *contacts;
-
-	if (p_actctx->action_list_cards.addressbook_folder_uri != NULL) {
-		book = e_book_new_from_uri (p_actctx->action_list_cards.addressbook_folder_uri, NULL);
-	} else {
-		book = e_book_new_default_addressbook (NULL);
-	}
-
-	if (!book
-	    || !e_book_open (book, TRUE, NULL)) {
-		g_warning ("Couldn't load addressbook %s", p_actctx->action_list_cards.addressbook_folder_uri);
-		exit (-1);
-	}
-
-	query = e_book_query_any_field_contains ("");
-	e_book_get_contacts (book, query, &contacts, NULL);
-	e_book_query_unref (query);
-
-	action_list_cards (contacts, p_actctx);
-
-	g_list_foreach (contacts, (GFunc)g_object_unref, NULL);
-	g_list_free (contacts);
-
-	return SUCCESS;
-}
diff --git a/addressbook/tools/evolution-addressbook-export-list-folders.c b/addressbook/tools/evolution-addressbook-export-list-folders.c
deleted file mode 100644
index 78fdca7f9f..0000000000
--- a/addressbook/tools/evolution-addressbook-export-list-folders.c
+++ /dev/null
@@ -1,99 +0,0 @@
-/* -*- Mode: C; indent-tabs-mode: t; c-basic-offset: 8; tab-width: 8 -*- */
-/* evolution-addressbook-export-list-folders.c
- *
- * Copyright (C) 2003 Ximian, Inc.
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of version 2 of the GNU General Public
- * License as published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * General Public License for more details.
- *
- * You should have received a copy of the GNU General Public
- * License along with this program; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
- *
- * Author: Gilbert Fang <gilbert.fang@sun.com>
- *
- */
-
-#include <config.h>
-
-#include <glib.h>
-#include <bonobo-activation/bonobo-activation.h>
-#include <libbonobo.h>
-#include <libgnome/libgnome.h>
-
-#include <libebook/e-book.h>
-
-#include "evolution-addressbook-export.h"
-
-guint
-action_list_folders_init (ActionContext * p_actctx)
-{
-	ESourceList *addressbooks = NULL;
-	GSList *groups, *group;
-	FILE *outputfile = NULL;
-
-	if (!e_book_get_addressbooks (&addressbooks, NULL)) {
-		g_warning (_("Couldn't get list of addressbooks"));
-		exit (-1);
-	}
-
-	if (p_actctx->action_list_folders.output_file != NULL) {
-		if (!(outputfile = fopen (p_actctx->action_list_folders.output_file, "w"))) {
-			g_warning (_("Can not open file"));
-			exit (-1);
-		}
-	}
-
-	groups = e_source_list_peek_groups (addressbooks);
-	for (group = groups; group; group = group->next) {
-		ESourceGroup *g = group->data;
-		GSList *sources, *source;
-
-		sources = e_source_group_peek_sources (g);
-		for (source = sources; source; source = source->next) {
-			ESource *s = source->data;
-			EBook *book;
-			EBookQuery *query;
-			GList *contacts;
-			char *uri;
-			const char *name;
-
-			book = e_book_new (s, NULL);
-			if (!book
-			    || !e_book_open (book, TRUE, NULL)) {
-				g_warning (_("failed to open book"));
-				continue;
-			}
-
-			query = e_book_query_any_field_contains ("");
-			e_book_get_contacts (book, query, &contacts, NULL);
-			e_book_query_unref (query);
-
-			uri = e_source_get_uri (s);
-			name = e_source_peek_name (s);
-
-			if (outputfile)
-				fprintf (outputfile, "\"%s\",\"%s\",%d\n", uri, name, g_list_length (contacts));
-			else
-				printf ("\"%s\",\"%s\",%d\n", uri, name, g_list_length (contacts));
-
-			g_free (uri);
-			g_list_foreach (contacts, (GFunc)g_object_unref, NULL);
-			g_list_free (contacts);
-
-			g_object_unref (book);
-		}
-	}
-
-	if (outputfile)
-		fclose (outputfile);
-
-	return SUCCESS;
-}
diff --git a/addressbook/tools/evolution-addressbook-export.c b/addressbook/tools/evolution-addressbook-export.c
deleted file mode 100644
index 070436dc0d..0000000000
--- a/addressbook/tools/evolution-addressbook-export.c
+++ /dev/null
@@ -1,160 +0,0 @@
-/* -*- Mode: C; indent-tabs-mode: t; c-basic-offset: 8; tab-width: 8 -*- */
-/* evolution-addressbook-export.c
- *
- * Copyright (C) 2003 Ximian, Inc.
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of version 2 of the GNU General Public
- * License as published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * General Public License for more details.
- *
- * You should have received a copy of the GNU General Public
- * License along with this program; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
- *
- * Author: Gilbert Fang <gilbert.fang@sun.com>
- *
- */
-
-#include <config.h>
-
-#include <glib.h>
-#include <bonobo-activation/bonobo-activation.h>
-#include <bonobo/bonobo-main.h>
-#include <gnome.h>
-
-#include <libebook/e-book.h>
-
-#include "evolution-addressbook-export.h"
-
-int
-main (int argc, char **argv)
-{
-	ActionContext actctx;
-	GnomeProgram *program;
-	poptContext context;
-	const gchar **argvn;
-
-	int current_action = ACTION_NOTHING;
-	int IsCSV = FALSE;
-	int IsVCard = FALSE;
-
-	/*** popttable */
-	char *output_file = NULL;
-	int list_folders_mode = FALSE;
-	char *output_format = NULL;
-	char *addressbook_folder_uri = NULL;
-	int async_mode = FALSE;
-	int file_size = 0;
-
-	struct poptOption options[] = {
-		{"output", '\0', POPT_ARG_STRING, &output_file, 0, N_("Specify the output file instead of standard output"),
-		 N_("OUTPUTFILE")},
-		{"list-addressbook-folders", 'l', POPT_ARG_NONE, &list_folders_mode, 0, N_("List local addressbook folders"),
-		 NULL},
-		{"format", '\0', POPT_ARG_STRING, &output_format, 0, N_("Show cards as vcard or csv file"), N_("[vcard|csv]")},
-		{"async", 'a', POPT_ARG_NONE, &async_mode, 0, N_("Export in asynchronous mode"), NULL},
-		{"size", '\0', POPT_ARG_INT, &file_size, 0,
-		 N_("The number of cards in one output file in asychronous mode, default size 100."), N_("NUMBER")},
-		{NULL, '\0', 0, NULL, 0, NULL, NULL}
-	};
-	/* popttable end ** */
-
-	/*i18n-lize */
-	bindtextdomain (GETTEXT_PACKAGE, EVOLUTION_LOCALEDIR);
-	bind_textdomain_codeset (GETTEXT_PACKAGE, "UTF-8");
-	textdomain (GETTEXT_PACKAGE);
-
-	program =
-		gnome_program_init (PACKAGE, VERSION, GNOME_BONOBO_MODULE, argc, argv, GNOME_PARAM_POPT_TABLE, options,
-				    GNOME_PARAM_NONE);
-
-	/* Parsing Parameter */
-	g_object_get (program, "popt-context", &context, NULL);
-	argvn = poptGetArgs (context);
-	if (!argvn) {
-		addressbook_folder_uri = NULL;
-	} else { /* there at lease is a one argument, and that should be addressbook folder uri */
-		addressbook_folder_uri = g_strdup (*argvn);
-	}
-        poptFreeContext (context);
-
-	if (list_folders_mode != FALSE) {
-		current_action = ACTION_LIST_FOLDERS;
-		/* check there should not be addressbook-folder-uri , and async and size , output_format */
-		if (addressbook_folder_uri != NULL || async_mode != FALSE || output_format != NULL || file_size != 0) {
-			g_warning (_("Command line arguments error, please use --help option to see the usage."));
-			exit (-1);
-		}
-	} else {
-
-		current_action = ACTION_LIST_CARDS;
-
-		/* check the output format */
-		if (output_format == NULL) {
-			IsVCard = TRUE;
-		} else {
-			IsCSV = !strcmp (output_format, "csv");
-			IsVCard = !strcmp (output_format, "vcard");
-			if (IsCSV == FALSE && IsVCard == FALSE) {
-				g_warning (_("Only support csv or vcard format."));
-				exit (-1);
-			}
-		}
-
-		/*check async and output file */
-		if (async_mode == TRUE) {
-			/* check have to output file , set default file_size */
-			if (output_file == NULL) {
-				g_warning (_("In async mode, output must be file."));
-				exit (-1);
-			}
-			if (file_size == 0)
-				file_size = DEFAULT_SIZE_NUMBER;
-		} else {
-			/*check no file_size */
-			if (file_size != 0) {
-				g_warning (_("In normal mode, there is no need for the size option."));
-				exit (-1);
-			}
-		}
-	}
-
-	/* do actions */
-	if (current_action == ACTION_LIST_FOLDERS) {
-		actctx.action_type = current_action;
-		if (output_file == NULL) {
-			actctx.action_list_folders.output_file = NULL;
-		} else {
-			actctx.action_list_folders.output_file = g_strdup (output_file);
-		}
-		action_list_folders_init (&actctx);
-	} else if (current_action == ACTION_LIST_CARDS) {
-		actctx.action_type = current_action;
-		if (output_file == NULL) {
-			actctx.action_list_cards.output_file = NULL;
-		} else {
-			actctx.action_list_cards.output_file = g_strdup (output_file);
-		}
-		actctx.action_list_cards.IsCSV = IsCSV;
-		actctx.action_list_cards.IsVCard = IsVCard;
-		actctx.action_list_cards.addressbook_folder_uri = g_strdup (addressbook_folder_uri);
-		actctx.action_list_cards.async_mode = async_mode;
-		actctx.action_list_cards.file_size = file_size;
-
-		action_list_cards_init (&actctx);
-
-	} else {
-		g_warning (_("Unhandled error"));
-		exit (-1);
-	}
-
-	/*FIXME:should free actctx's some char* field, such as output_file! but since the program will end, so that will not cause mem leak.  */
-
-	exit (0);
-}
diff --git a/addressbook/tools/evolution-addressbook-export.h b/addressbook/tools/evolution-addressbook-export.h
deleted file mode 100644
index 13749aed61..0000000000
--- a/addressbook/tools/evolution-addressbook-export.h
+++ /dev/null
@@ -1,81 +0,0 @@
-/* -*- Mode: C; indent-tabs-mode: t; c-basic-offset: 8; tab-width: 8 -*- */
-/* evolution-addressbook-export.h
- *
- * Copyright (C) 2003 Ximian, Inc.
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of version 2 of the GNU General Public
- * License as published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * General Public License for more details.
- *
- * You should have received a copy of the GNU General Public
- * License along with this program; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
- *
- * Author: Gilbert Fang <gilbert.fang@sun.com>
- *
- */
-
-#ifndef _EVOLUTION_ADDRESSBOOK_EXPORT_H_
-#define _EVOLUTION_ADDRESSBOOK_EXPORT_H__
-
-#include <glib.h>
-
-#ifdef __cplusplus
-extern "C" {
-#pragma }
-#endif /* __cplusplus */
-
-#define SUCCESS 0
-#define FAILED  -1
-
-#define ACTION_NOTHING       0
-#define ACTION_LIST_FOLDERS  1
-#define ACTION_LIST_CARDS    2
-
-#define DEFAULT_SIZE_NUMBER 100
-
-union _ActionContext
-{
-
-	guint action_type;
-
-	struct
-	{
-		gint action_type;
-		gchar *output_file;
-	}
-	action_list_folders;
-
-	struct
-	{
-		gint action_type;
-		gchar *output_file;
-		gint IsCSV;
-		gint IsVCard;
-		gchar *addressbook_folder_uri;
-		gint async_mode;
-		gint file_size;
-	}
-	action_list_cards;
-};
-
-typedef union _ActionContext ActionContext;
-
-
-/* action_list_folders */
-guint action_list_folders_init (ActionContext * p_actctx);
-
-/*action list cards*/
-guint action_list_cards_init (ActionContext * p_actctx);
-
-#ifdef __cplusplus
-}
-#endif /* __cplusplus */
-
-#endif /* _EVOLUTION_ADDRESSBOOK_EXPORT_H_ */
diff --git a/addressbook/tools/evolution-addressbook-import.c b/addressbook/tools/evolution-addressbook-import.c
deleted file mode 100644
index 28871efd96..0000000000
--- a/addressbook/tools/evolution-addressbook-import.c
+++ /dev/null
@@ -1,90 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-
-#include <config.h>
-
-#include <bonobo-activation/bonobo-activation.h>
-#include <bonobo/bonobo-main.h>
-#include <backend/ebook/e-book-async.h>
-#include <gnome.h>
-
-static int exec_ref_count = 0;
-
-static void
-ref_executable (void)
-{
-	exec_ref_count ++;
-}
-
-static void
-unref_executable (void)
-{
-	exec_ref_count --;
-	if (exec_ref_count == 0)
-		g_main_loop_quit (0);
-}
-
-static void
-add_cb (EBook *book, EBookStatus status, const char *id, gpointer closure)
-{
-	switch (status) {
-	case E_BOOK_ERROR_OK:
-		unref_executable ();
-		break;
-	default:
-		g_main_loop_quit (NULL);
-		break;
-	}
-}
-
-static void
-use_addressbook (EBook *book, gpointer closure)
-{
-	GList *cards, *list;
-	char *filename = closure;
-
-	if (book == NULL)
-		g_error (_("Error loading default addressbook."));
-
-	cards = e_card_load_cards_from_file (filename);
-
-	ref_executable ();
-
-	for (list = cards; list; list = list->next) {
-		ref_executable ();
-		e_book_add_card (book, list->data, add_cb, closure);
-	}
-	sync();
-
-	unref_executable ();
-}
-
-int
-main (int argc, char *argv[])
-{
-	char *filename = NULL;
-
-	struct poptOption options[] = {
-		{ "input-file", '\0', POPT_ARG_STRING, &filename, 0, N_("Input File"), NULL },
-		POPT_AUTOHELP
-		{ NULL, '\0', 0, NULL, 0, NULL, NULL }
-	};
-
-	bindtextdomain (GETTEXT_PACKAGE, EVOLUTION_LOCALEDIR);
-	textdomain (GETTEXT_PACKAGE);
-
-	gnome_program_init ("evolution-addressbook-import", VERSION,
-			    LIBGNOMEUI_MODULE, argc, argv, 
-			    GNOME_PROGRAM_STANDARD_PROPERTIES,
-			    GNOME_PARAM_POPT_TABLE, options,
-			    NULL);
-
-	if (filename == NULL) {
-		g_error (_("No filename provided."));
-	}
-
-	e_book_async_get_default_addressbook (use_addressbook, filename);
-
-	bonobo_main ();
-
-	return 0;
-}
diff --git a/addressbook/util/.cvsignore b/addressbook/util/.cvsignore
deleted file mode 100644
index 6205c6f3ab..0000000000
--- a/addressbook/util/.cvsignore
+++ /dev/null
@@ -1,4 +0,0 @@
-Makefile
-Makefile.in
-eab-marshal.c
-eab-marshal.h
diff --git a/addressbook/util/Makefile.am b/addressbook/util/Makefile.am
deleted file mode 100644
index 85c21832e9..0000000000
--- a/addressbook/util/Makefile.am
+++ /dev/null
@@ -1,34 +0,0 @@
-INCLUDES =						\
-	-DPREFIX=\"$(prefix)\"				\
-	-DSYSCONFDIR=\"$(sysconfdir)\"			\
-	-DDATADIR=\"$(datadir)\"			\
-	-DLIBDIR=\"$(libdir)\"				\
-	-DG_LOG_DOMAIN=\"EBook\"			\
-	-I$(top_srcdir) 				\
-	-I$(top_srcdir)/camel				\
-	-I$(top_builddir)/shell				\
-	-I$(top_srcdir)/shell				\
-        $(EVOLUTION_ADDRESSBOOK_CFLAGS)
-
-privlib_LTLIBRARIES = libeabutil.la
-
-libeabutil_la_SOURCES =					\
-	eab-marshal.c					\
-	eab-book-util.c					\
-	eab-book-util.h
-
-libeabutil_la_LIBADD =					\
-	$(EVOLUTION_ADDRESSBOOK_LIBS)			\
-	$(top_builddir)/e-util/libeutil.la
-
-MARSHAL_GENERATED = eab-marshal.c eab-marshal.h
-@EVO_MARSHAL_RULE@
-
-BUILT_SOURCES = $(MARSHAL_GENERATED)
-CLEANFILES    = $(BUILT_SOURCES)
-
-EXTRA_DIST = 		\
-	eab-marshal.list
-
-dist-hook:
-	cd $(distdir); rm -f $(BUILT_SOURCES)
diff --git a/addressbook/util/eab-book-util.c b/addressbook/util/eab-book-util.c
deleted file mode 100644
index 473d386f54..0000000000
--- a/addressbook/util/eab-book-util.c
+++ /dev/null
@@ -1,432 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-
-/*
- * eab-util.c
- *
- * Copyright (C) 2001-2003 Ximian, Inc.
- *
- * Authors: Jon Trowbridge <trow@ximian.com>
- *          Chris Toshok <toshok@ximian.com>
- */
-
-/*
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of version 2 of the GNU General Public
- * License as published by the Free Software Foundation.
- * 
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- * 
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
- * USA.
- */
-
-#include <config.h>
-#include "eab-book-util.h"
-
-#include <string.h>
-#include <glib.h>
-#include <glib-object.h>
-#include <e-util/e-config-listener.h>
-
-EConfigListener *
-eab_get_config_database ()
-{
-	static EConfigListener *config_db;
-
-	if (config_db == NULL)
-		config_db = e_config_listener_new ();
-
-	return config_db;
-}
-
-/*
- *
- * Specialized Queries
- *
- */
-
-static char*
-escape (const char *str)
-{
-	GString *s = g_string_new ("");
-	const char *p = str;
-
-	while (*p) {
-		if (*p == '\\')
-			g_string_append (s, "\\\\");
-		else if (*p == '"')
-			g_string_append (s, "\\\"");
-		else
-			g_string_append_c (s, *p);
-
-		p ++;
-	}
-
-	return g_string_free (s, FALSE);
-}
-
-guint
-eab_name_and_email_query (EBook *book,
-			  const gchar *name,
-			  const gchar *email,
-			  EBookListCallback cb,
-			  gpointer closure)
-{
-	gchar *email_query=NULL, *name_query=NULL;
-	EBookQuery *query;
-	guint tag;
-	char *escaped_name, *escaped_email;
-
-	g_return_val_if_fail (book && E_IS_BOOK (book), 0);
-	g_return_val_if_fail (cb != NULL, 0);
-
-	if (name && !*name)
-		name = NULL;
-	if (email && !*email)
-		email = NULL;
-
-	if (name == NULL && email == NULL)
-		return 0;
-
-	escaped_name = name ? escape (name) : NULL;
-	escaped_email = email ? escape (email) : NULL;
-
-	/* Build our e-mail query.
-	 * We only query against the username part of the address, to avoid not matching
-	 * fred@foo.com and fred@mail.foo.com.  While their may be namespace collisions
-	 * in the usernames of everyone out there, it shouldn't be that bad.  (Famous last words.)
-	 * But if name is missing we query against complete email id to avoid matching emails like 
-	 * users@foo.org with users@bar.org 
-	 */
-	if (escaped_email) {
-		const gchar *t = escaped_email;
-		while (*t && *t != '@')
-			++t;
-		if (*t == '@' && escaped_name) {
-			email_query = g_strdup_printf ("(beginswith \"email\" \"%.*s@\")", (int)(t-escaped_email), escaped_email);
-
-		} else {
-			email_query = g_strdup_printf ("(beginswith \"email\" \"%s\")", escaped_email);
-		}
-	}
-
-	/* Build our name query.*/
-	
-	if (escaped_name)
-		name_query = g_strdup_printf ("(or (beginswith \"file_as\" \"%s\") (beginswith \"full_name\" \"%s\"))", escaped_name, escaped_name);
-
-	/* Assemble our e-mail & name queries */
-	if (email_query && name_query) {
-		char *full_query = g_strdup_printf ("(and %s %s)", email_query, name_query);
-		query = e_book_query_from_string (full_query);
-		g_free (full_query);
-	}
-	else if (email_query) {
-		query = e_book_query_from_string (email_query);
-	}
-	else if (name_query) {
-		query = e_book_query_from_string (name_query);
-	}
-	else
-		return 0;
-
-	tag = e_book_async_get_contacts (book, query, cb, closure);
-
-	g_free (email_query);
-	g_free (name_query);
-	g_free (escaped_email);
-	g_free (escaped_name);
-	e_book_query_unref (query);
-
-	return tag;
-}
-
-/*
- * Simple nickname query
- */
-guint
-eab_nickname_query (EBook                 *book,
-		    const char            *nickname,
-		    EBookListCallback      cb,
-		    gpointer               closure)
-{
-	EBookQuery *query;
-	char *query_string;
-	guint retval;
-
-	g_return_val_if_fail (E_IS_BOOK (book), 0);
-	g_return_val_if_fail (nickname != NULL, 0);
-
-	/* The empty-string case shouldn't generate a warning. */
-	if (! *nickname)
-		return 0;
-
-	query_string = g_strdup_printf ("(is \"nickname\" \"%s\")", nickname);
-
-	query = e_book_query_from_string (query_string);
-
-	retval = e_book_async_get_contacts (book, query, cb, closure);
-
-	g_free (query_string);
-	g_object_unref (query);
-
-	return retval;
-}
-
-/* Copied from camel_strstrcase */
-static char *
-eab_strstrcase (const char *haystack, const char *needle)
-{
-	/* find the needle in the haystack neglecting case */
-	const char *ptr;
-	guint len;
-	
-	g_return_val_if_fail (haystack != NULL, NULL);
-	g_return_val_if_fail (needle != NULL, NULL);
-	
-	len = strlen (needle);
-	if (len > strlen (haystack))
-		return NULL;
-	
-	if (len == 0)
-		return (char *) haystack;
-	
-	for (ptr = haystack; *(ptr + len - 1) != '\0'; ptr++)
-		if (!g_ascii_strncasecmp (ptr, needle, len))
-			return (char *) ptr;
-	
-	return NULL;
-}
-
-
-GList*
-eab_contact_list_from_string (const char *str)
-{
-	GList *contacts = NULL;
-	GString *gstr = g_string_new ("");
-	char *str_stripped;
-	char *p = (char*)str;
-	char *q;
-
-	if (!p)
-		return NULL;
-
-	if (!strncmp (p, "Book: ", 6)) {
-		p = strchr (p, '\n');
-		if (!p) {
-			g_warning (G_STRLOC ": Got book but no newline!");
-			return NULL;
-		}
-		p++;
-	}
-
-	while (*p) {
-		if (*p != '\r') g_string_append_c (gstr, *p);
-		
-		p++;
-	}
-
-	q = p = str_stripped = g_string_free (gstr, FALSE);
-
-	/* Note: The VCard standard says
-	 *
-	 * vcard = "BEGIN" [ws] ":" [ws] "VCARD" [ws] 1*CRLF 
-	 *         items *CRLF "END" [ws] ":" [ws] "VCARD"
-	 *
-	 * which means we can have whitespace (e.g. "BEGIN : VCARD"). So we're not being
-	 * fully compliant here, although I'm not sure it matters. The ideal solution
-	 * would be to have a vcard parsing function that returned the end of the vcard
-	 * parsed. Arguably, contact list parsing should all be in libebook's e-vcard.c,
-	 * where we can do proper parsing and validation without code duplication. */
-	
-	for (p = eab_strstrcase (p, "BEGIN:VCARD"); p; p = eab_strstrcase (q, "\nBEGIN:VCARD")) {
-		gchar *card_str;
-
-		if (*p == '\n')
-			p++;
-
-		for (q = eab_strstrcase (p, "END:VCARD"); q; q = eab_strstrcase (q, "END:VCARD")) {
-			gchar *temp;
-
-			q += 9;
-			temp = q;
-			temp += strspn (temp, "\r\n\t ");
-
-			if (*temp == '\0' || !g_ascii_strncasecmp (temp, "BEGIN:VCARD", 11))
-				break;  /* Found the outer END:VCARD */
-		}
-
-		if (!q)
-			break;
-
-		card_str = g_strndup (p, q - p);
-		contacts = g_list_append (contacts, e_contact_new_from_vcard (card_str));
-		g_free (card_str);
-	}
-
-	g_free (str_stripped);
-
-	return contacts;
-}
-
-char*
-eab_contact_list_to_string (GList *contacts)
-{
-	GString *str = g_string_new ("");
-	GList *l;
-
-	for (l = contacts; l; l = l->next) {
-		EContact *contact = l->data;
-		char *vcard_str = e_vcard_to_string (E_VCARD (contact), EVC_FORMAT_VCARD_30);
-
-		g_string_append (str, vcard_str);
-		if (l->next)
-			g_string_append (str, "\r\n\r\n");
-	}
-
-	return g_string_free (str, FALSE);
-}
-
-gboolean
-eab_book_and_contact_list_from_string (const char *str, EBook **book, GList **contacts)
-{
-	const char *s0, *s1;
-	char *uri;
-
-	g_return_val_if_fail (str != NULL, FALSE);
-	g_return_val_if_fail (book != NULL, FALSE);
-	g_return_val_if_fail (contacts != NULL, FALSE);
-
-	*contacts = eab_contact_list_from_string (str);
-
-	if (!strncmp (str, "Book: ", 6)) {
-		s0 = str + 6;
-		s1 = strchr (str, '\r');
-
-		if (!s1)
-			s1 = strchr (str, '\n');
-	} else {
-		s0 = NULL;
-		s1 = NULL;
-	}
-
-	if (!s0 || !s1) {
-		*book = NULL;
-		return FALSE;
-	}
-
-	uri = g_strndup (s0, s1 - s0);
-	*book = e_book_new_from_uri (uri, NULL);
-	g_free (uri);
-
-	return *book ? TRUE : FALSE;
-}
-
-char *
-eab_book_and_contact_list_to_string (EBook *book, GList *contacts)
-{
-	char *s0, *s1;
-
-	s0 = eab_contact_list_to_string (contacts);
-	if (!s0)
-		s0 = g_strdup ("");
-
-	if (book)
-		s1 = g_strconcat ("Book: ", e_book_get_uri (book), "\r\n", s0, NULL);
-	else
-		s1 = g_strdup (s0);
-
-	g_free (s0);
-	return s1;
-}
-
-#if notyet
-/*
- *  Convenience routine to check for addresses in the local address book.
- */
-
-typedef struct _HaveAddressInfo HaveAddressInfo;
-struct _HaveAddressInfo {
-	gchar *email;
-	EBookHaveAddressCallback cb;
-	gpointer closure;
-};
-
-static void
-have_address_query_cb (EBook *book, EBookSimpleQueryStatus status, const GList *contacts, gpointer closure)
-{
-	HaveAddressInfo *info = (HaveAddressInfo *) closure;
-	
-	info->cb (book, 
-		  info->email,
-		  contacts && (status == E_BOOK_ERROR_OK) ? E_CONTACT (contacts->data) : NULL,
-		  info->closure);
-
-	g_free (info->email);
-	g_free (info);
-}
-
-static void
-have_address_book_open_cb (EBook *book, gpointer closure)
-{
-	HaveAddressInfo *info = (HaveAddressInfo *) closure;
-
-	if (book) {
-
-		e_book_name_and_email_query (book, NULL, info->email, have_address_query_cb, info);
-
-	} else {
-
-		info->cb (NULL, info->email, NULL, info->closure);
-
-		g_free (info->email);
-		g_free (info);
-
-	}
-}
-
-void
-eab_query_address_default (const gchar *email,
-			   EABHaveAddressCallback cb,
-			   gpointer closure)
-{
-	HaveAddressInfo *info;
-
-	g_return_if_fail (email != NULL);
-	g_return_if_fail (cb != NULL);
-
-	info = g_new0 (HaveAddressInfo, 1);
-	info->email = g_strdup (email);
-	info->cb = cb;
-	info->closure = closure;
-
-	e_book_use_default_book (have_address_book_open_cb, info);
-}
-#endif
-
-/* bad place for this i know. */
-int
-e_utf8_casefold_collate_len (const gchar *str1, const gchar *str2, int len)
-{
-	gchar *s1 = g_utf8_casefold(str1, len);
-	gchar *s2 = g_utf8_casefold(str2, len);
-	int rv;
-
-	rv = g_utf8_collate (s1, s2);
-
-	g_free (s1);
-	g_free (s2);
-
-	return rv;
-}
-
-int
-e_utf8_casefold_collate (const gchar *str1, const gchar *str2)
-{
-	return e_utf8_casefold_collate_len (str1, str2, -1);
-}
diff --git a/addressbook/util/eab-book-util.h b/addressbook/util/eab-book-util.h
deleted file mode 100644
index c1362f1571..0000000000
--- a/addressbook/util/eab-book-util.h
+++ /dev/null
@@ -1,72 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-
-/*
- * e-book-util.h
- *
- * Copyright (C) 2001-2003 Ximian, Inc.
- *
- * Authors: Jon Trowbridge <trow@ximian.com>
- *          Chris Toshok <toshok@ximian.com>
- */
-
-/*
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of version 2 of the GNU General Public
- * License as published by the Free Software Foundation.
- * 
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- * 
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
- * USA.
- */
-
-#ifndef __EAB_UTIL_H__
-#define __EAB_UTIL_H__
-
-#include <bonobo/bonobo-object.h>
-#include <bonobo/bonobo-moniker-util.h>
-#include <libebook/e-book.h>
-#include "e-util/e-config-listener.h"
-
-G_BEGIN_DECLS
-
-typedef void (*EABHaveAddressCallback) (EBook *book, const gchar *addr, EContact *contact, gpointer closure);
-
-/* config database interface. */
-EConfigListener       *eab_get_config_database       (void);
-
-/* Specialized Name/Email Queries */
-guint                  eab_name_and_email_query      (EBook                    *book,
-						      const char               *name,
-						      const char               *email,
-						      EBookListCallback         cb,
-						      gpointer                  closure);
-guint                  eab_nickname_query            (EBook                    *book,
-						      const char               *nickname,
-						      EBookListCallback         cb,
-						      gpointer                  closure);
-
-GList                 *eab_contact_list_from_string (const char *str);
-char                  *eab_contact_list_to_string    (GList *contacts);
-
-gboolean               eab_book_and_contact_list_from_string (const char *str, EBook **book, GList **contacts);
-char                  *eab_book_and_contact_list_to_string   (EBook *book, GList *contacts);
-
-/* Returns the EContact associated to email in the callback,
-   or NULL if no match is found in the default address book. */
-void                   eab_query_address_default     (const gchar              *email,
-						      EABHaveAddressCallback  cb,
-						      gpointer                  closure);
-
-int                    e_utf8_casefold_collate_len (const gchar *str1, const gchar *str2, int len);
-int                    e_utf8_casefold_collate (const gchar *str1, const gchar *str2);
-
-G_END_DECLS
-
-#endif /* __EAB_UTIL_H__ */
-
diff --git a/addressbook/util/eab-marshal.list b/addressbook/util/eab-marshal.list
deleted file mode 100644
index 680ea039a3..0000000000
--- a/addressbook/util/eab-marshal.list
+++ /dev/null
@@ -1,5 +0,0 @@
-NONE:NONE
-NONE:BOOL
-NONE:POINTER
-NONE:STRING
-NONE:INT
diff --git a/art/.cvsignore b/art/.cvsignore
deleted file mode 100644
index c038ed7864..0000000000
--- a/art/.cvsignore
+++ /dev/null
@@ -1,2 +0,0 @@
-Makefile
-Makefile.in
-\ No newline at end of file
diff --git a/art/16x16/.cvsignore b/art/16x16/.cvsignore
deleted file mode 100644
index 282522db03..0000000000
--- a/art/16x16/.cvsignore
+++ /dev/null
@@ -1,2 +0,0 @@
-Makefile
-Makefile.in
diff --git a/art/16x16/Makefile.am b/art/16x16/Makefile.am
deleted file mode 100644
index 2b5b8ca0fb..0000000000
--- a/art/16x16/Makefile.am
+++ /dev/null
@@ -1,3 +0,0 @@
-images16_DATA =	
-
-EXTRA_DIST = $(images16_DATA)
diff --git a/art/48x48/.cvsignore b/art/48x48/.cvsignore
deleted file mode 100644
index 282522db03..0000000000
--- a/art/48x48/.cvsignore
+++ /dev/null
@@ -1,2 +0,0 @@
-Makefile
-Makefile.in
diff --git a/art/48x48/Makefile.am b/art/48x48/Makefile.am
deleted file mode 100644
index be681b0c2e..0000000000
--- a/art/48x48/Makefile.am
+++ /dev/null
@@ -1,3 +0,0 @@
-images48_DATA =	
-
-EXTRA_DIST = $(images48_DATA)
diff --git a/art/ChangeLog b/art/ChangeLog
deleted file mode 100644
index e11e991a48..0000000000
--- a/art/ChangeLog
+++ /dev/null
@@ -1,151 +0,0 @@
-2004-05-20  Rodney Dawes  <dobey@ximian.com>
-
-	* Makefile.am (EXTRA_DIST): Add README and jump.xpm
-
-2004-05-19  Jeffrey Stedfast  <fejj@novell.com>
-
-	* README: New file explaining how to add icons to the build, etc.
-
-	* broken-image-*.xpm: Added for use with e-icon-factory.c so we
-	can return a "bropken image" icon for any icon we can't find/load.
-
-	* .: Removed many *many* icons that are no longer used.
-
-2004-03-09  Jakub Steiner <jimmac@ximian.com>
-
-	* autocompletion.png:
-	* Makefile.am: autocompletion icon for the preferences
-
-2004-03-08  Radek Doulik  <rodo@ximian.com>
-
-	* Makefile.am (images_DATA): added 16 pixels versions of junk
-	icons from the gnome-icon-theme module
-
-2004-03-08  Jakub Steiner <jimmac@ximian.com>
-
-	* alarm.png
-	* briefcase.png
-	* cellphone.png
-	* envelope.png
-	* evolution-calendar.png
-	* evolution-notes-mini.png
-	* evolution-notes.png
-	* evolution-tasks-mini.png
-	* evolution-tasks.png
-	* evolution-today.png
-	* ico-calendar.png
-	* im-invisible.png
-	* import.png
-	* mail-config-druid-identity.png
-	* print-preview-24.png
-	* print.png
-	* schedule-meeting-16.png
-	* schedule-meeting-16.xpm
-	* schedule-meeting-24.png
-	* stock-notjunk-24.png
-	* summary-settings.png: since using gnome-icon-theme is miles away, I tried
-	  bringing the art/ mess a bit up to date. Lots of xpm hell still
-	  :(
-
-2004-03-08  Jakub Steiner <jimmac@ximian.com>
-
-	* im-nov.png: (16x16). closes bug #54972
-	
-2004-02-25 Sivaiah Nallagatla <snallagatla@novell.com>
-	* Makefile.am : added im-nov.png (icon for Groupwise im)
-	to images_DATA
-
-2004-02-03  Jakub Steiner <jimmac@ximian.com>
-
-	* im-jabber.png: 16x16 jabber
-
-2004-01-29  Jakub Steiner <jimmac@ximian.com>
-
-	* im-aim.png
-	* im-icq.png
-	* im-msn.png
-	* im-yahoo.png: it indeed appears you need 16x16
-
-2004-01-29  Jakub Steiner <jimmac@ximian.com>
-
-	* im-aim.png
-	* im-icq.png
-	* im-msn.png
-	* im-yahoo.png: although I'm adding these to gnome-icon-theme
-	  instead, these are so ugly I replaced them here too. The rest
-	  of the im-* stuff I'm not quite sure what those represent. Will
-	  try to redo those as well.
-
-	  I have 16x16 versions of these in git, so if those are used
-	  scaled down, as I saw in a screenshot, feel free to use the
-	  16x16 versions. They will look better.
-
-	  Also feel free to file icon requests agains the
-	  gnome-icon-theme if you want Evolution icons.
-
-2004-01-15  Not Zed  <NotZed@Ximian.com>
-
-	* Makefile.am (images_DATA): added flag-for-followup-done-16.png
-	(glade_DATA): added flag-for-followup-done-48.png
-
-2003-01-11  Christian Hammond  <chipx86@gnupdate.org>
-
-	* art/im*.png, art/Makefile.am: Added IM png files from Gaim.
-
-2004-01-08  Ross Burton  <ross@burtonini.com>
-
-	* Makefile.am:
-	* videoconf.png:
-	Add a video conferencing icon.
-
-	* globe.png:
-	Replace with the 24x24 version.
-
-	Both of these are for the redesigned Collaboration tab in the
-	contact editor.
-
-2003-12-04  Radek Doulik  <rodo@ximian.com>
-
-	* Makefile.am (buttons_DATA): added stock junk button and notjunk
-	placeholder (until artists have the right one)
-
-2003-12-02  Rodney Dawes  <dobey@ximian.com>
-
-	* Makefile.am: Add flag-for-followup-done.xpm to EXTRA_DIST
-
-2003-12-02  Not Zed  <NotZed@Ximian.com>
-
-	* flag-for-folloup*: Changed the base flag colour to reddish, and
-	created a -done set, the original blue-ish colour.
-
-2003-11-12  Jakub Steiner <jimmac@ximian.com>
-
-	* about-box.png: replace the foobar file
-
-2003-10-10  Hans Petter Jansson  <hpj@ximian.com>
-
-	* listview.xpm: Add calendar list view icon.
-
-2003-09-24  Ettore Perazzoli  <ettore@ximian.com>
-
-	* about-box.png: More artwork from Jakub.
-
-2003-09-24  Ettore Perazzoli  <ettore@ximian.com>
-
-	* splash.png: New artwork from Jakub.
-
-2003-09-12  Bolian Yin <bolian.yin@sun.com>
-
-	* jump.xpm: add icon for the focused jump button.
-
-2003-08-28  Hans Petter Jansson  <hpj@ximian.com>
-
-	* appointment-reminder.png:
-	* appointment-reminder-excl.png: Add icons used by the calendar alarm's
-	systray notification. These are also in gnome-icon-theme HEAD, but
-	until we have workable stock packages, we use this.
-
-2003-06-23  Jakub Steiner <jimmac@ximian.com>
-
-	* splash.png:
-	* about-box.png: update Copyright info
diff --git a/art/ChangeLog.pre-1-4 b/art/ChangeLog.pre-1-4
deleted file mode 100644
index 9dec5cedc8..0000000000
--- a/art/ChangeLog.pre-1-4
+++ /dev/null
@@ -1,712 +0,0 @@
-2003-06-02  Ettore Perazzoli  <ettore@ximian.com>
-
-	* Makefile.am (install-data-local) [DEFAULT_BINARY]: Symlink
-	evolution.png to evolution-$(BASE_VERSION).png.  [#43596]
-
-2003-05-27  Jakub Steiner <jimmac@ximian.com>
-
-	* about-box.png, splash.png: Update copyright info
-
-2003-05-21  Ettore Perazzoli  <ettore@ximian.com>
-
-	* about-box.png, splash.png: New artwork from Jakub.
-
-2003-05-05  Jakub Steiner <jimmac@ximian.com>
-
-	* evolution-contacts-plain.png
-	* evolution-contacts.png:
-	* globe.png:
-	* malehead.png:
-	* next-message.png:
-	* previous-message.png:
-	* receive-24.png:
-	* reply-to-all.png:
-	* reply.png:
-	* send-24-receive.png:
-	* send-24.png:
-	* send-16.png:
-	* send-receive.xpm:
-	* send.png: quick fix of the artwork, the rest goes to the
-	  (future) icon theme
-
-2003-04-29  Chris Toshok  <toshok@ximian.com>
-
-	* Makefile.am (images_DATA): add stock-edit-{16,24}.png
-
-2003-03-03  Ettore Perazzoli  <ettore@ximian.com>
-
-	* about-box.png: New artwork from Jakub.
-
-2003-02-06  Dan Winship  <danw@ximian.com>
-
-	* Makefile.am: remove imagesdir, etc, which are now defined in
-	configure.in
-
-2003-01-22  Ettore Perazzoli  <ettore@ximian.com>
-
-	* Makefile.am (imagesdir): Version using $(BASE_VERSION).
-	(buttonsdir): Likewise.
-	(conduitsdir): Likewise.
-	(install-data-local): New rule to install evolution.png as
-	evolution-$(BASE_VERSION).png.
-	(EXTRA_DIST): Add evolution.png.
-
-2003-01-08  Ettore Perazzoli  <ettore@ximian.com>
-
-	* Makefile.am (imagesdir): Install images into
-	$(datadir)/evolution/images instead of
-	$(datadir)/images/evolution.
-	(buttonsdir): Likewise, these go into
-	$(datadir)/evolution/images/buttons now.
-	(conduits_DATA): Likewise, $(datadir)/evolution/images/conduits.
-
-2002-11-25  Ettore Perazzoli  <ettore@ximian.com>
-
-	* splash.png: New work-in-progress splash from Jakub.
-
-2002-10-28  Ettore Perazzoli  <ettore@ximian.com>
-
-	* splash.png: New artwork from Jakub.
-	* about-box.png: New artwork from Jakub.
-
-2002-10-28  Ettore Perazzoli  <ettore@ximian.com>
-
-	* settings.png: New.
-	* settings-16.png: New.
-
-2002-10-07  Ettore Perazzoli  <ettore@ximian.com>
-
-	* splash.png: New artwork from Jakub.
-
-2002-09-27  Dan Winship  <danw@ximian.com>
-
-	* post-reply-24.png: New icon for "Post a Reply" from Jakub.
-
-2002-02-29  Ettore Perazzoli  <ettore@ximian.com>
-
-	* about-box.png, splash.png: New artwork from Jakub.
-	
-2002-09-03  Ettore Perazzoli  <ettore@ximian.com>
-
-	* folder-settings.png: New icon from Jakub.
-
-2002-09-03  Jakub Steiner <jimmac@ximian.com>
-
-	* ldap-settings.png: use a more gnomeish version
-
-2002-08-01  Ettore Perazzoli  <ettore@ximian.com>
-
-	* contact-list-16.png: New artwork from Jakub.
-	* post-message-16.png: Likewise.
-	* meeting-request-16.png: Likewise.
-
-	* meeting.xpm: Removed.
-
-2002-07-26  Ettore Perazzoli  <ettore@ximian.com>
-
-	* mail.png: New icon for mail (gnome-textfile.png from GNOME 2, by
-	Tuomas' suggestion).
-
-2002-07-23  Jakub Steiner <jimmac@ximian.com>
-
-	* inbox.png,outbox.png: fix the arrows
-	* font.png: the former one was vector style - from gorilla
-	
-2002-07-22    <jpr@ximian.com>
-
-	* Makefile.am: add new image
-
-2002-07-16  Ettore Perazzoli  <ettore@ximian.com>
-
-	* inbox.png, outbox.png: Added final large versions of the Inbox
-	and Outbox icons.
-
-2002-07-09  Dan Winship  <danw@ximian.com>
-
-	* Makefile.am (images_DATA): add folder.png, folder-mini.png,
-	public-folder.png, and public-folder-mini.png
-
-	* folder-mini.png: Renamed from local-16.png
-
-	* folder.png, public-folder.png, public-folder-mini.png: New, from
-	Jakub.
-
-2002-07-09  Ettore Perazzoli  <ettore@ximian.com>
-
-	* Makefile.am (images_DATA): inbox-mini.png instead of
-	inbox-16.png, outbox-mini.png instead of outbox-16.png.  Also add
-	inbox.png and outbox.png.
-	(inbox.png): New.
-	(outbox.png): New.
-
-2002-05-20  Ettore Perazzoli  <ettore@ximian.com>
-
-	* schedule-meeting-24.png: New.
-
-2002-04-25  Larry Ewing  <lewing@ximian.com>
-
-	* Makefile.am (images_DATA): font.png: Add for the font config
-	prefs.
-
-2002-04-17  Dan Winship  <danw@ximian.com>
-
-	* monkey-16.png: Replace with an antialiased version
-
-2002-04-10  Dan Winship  <danw@ximian.com>
-
-	* Makefile.am (images_DATA), folder-settings.png: Add. (Copied
-	from Unscalable Gorilla because it was handy. Will probably get
-	changed to something else...)
-
-2002-03-28  Ettore Perazzoli  <ettore@ximian.com>
-
-	* calendar-and-tasks-settings.png: New.
-	* composer-settings.png: New.
-	* ldap-settings.png: New.
-	* mail-accounts-settings.png: New.
-	* summary-settings.png: New.
-
-2002-03-25  Dan Winship  <danw@ximian.com>
-
-	* Makefile.am (images_DATA): Add working-16.png (the GNOME2 stock
-	"wait" icon, from Jakub)
-
-2002-03-04  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* forward.xpm, reply.xpm, reply_to_all.xpm: Rename the internal
-	structure to coincide with the filenames.
-
-2002-02-29  Ettore Perazzoli  <ettore@ximian.com>
-
-	* about-box.png, splash.png: New cool artwork from Jakub.
-	
-2002-02-22  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* Makefile.am: Remove meeting_widget.png from the build since it
-	doesn't seem to be in cvs?
-
-2002-02-20  Jakub Steiner <jimmac@ximian.com>
-
-	* summary_preferences-16.png: menu icon for summary preferences
-	* Makefile.am: added the icon
-
-2002-02-13  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* flag-for-followup.xpm:
-	* flag-for-followup-16.png:
-	* flag-for-followup-48.png: New icons.
-
-	* Makefile.am: Added the new icons...
-
-2002-02-12  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* Makefile.am: Install mail-new.xpm, mail-read.xpm and
-	priority-high.xpm in the same place as other bonobo-ui menu
-	pixmaps so we can use these in menus too.
-
-2002-02-08  JP Rosevear  <jpr@ximian.com>
-
-	* connect_to_url-16.xpm: new icon
-
-	* new_all_day_event.png: ditto
-
-	* Makefile.am: install and dist new images
-
-2001-12-11  Jon Trowbridge  <trow@ximian.com>
-
-	* mail-need-reply.xpm: A new icon that sucks less.  We still need
-	some Tuomas-love.
-
-2001-12-09  Jon Trowbridge  <trow@ximian.com>
-
-	* mail-need-reply.xpm: Added a really, really ugly and
-	awful icon to symbolize "message needs a reply".
-
-	* Makefile.am (EXTRA_DIST): Added mail-need-reply.xpm.
-
-2001-11-06  Ettore Perazzoli  <ettore@ximian.com>
-
-	* evolution.png: New, updated icon from Tuomas.
-
-2001-11-05  JP Rosevear  <jpr@ximian.com>
-
-	* Makefile.am (EXTRA_DIST): dist the glade data
-
-2001-11-01  Ettore Perazzoli  <ettore@ximian.com>
-
-	* Makefile.am (gladedir): New.
-	(glade_DATA): Pixmap files required to be installed by the glade
-	files.
-
-2001-10-31  Ettore Perazzoli  <ettore@ximian.com>
-
-	* Makefile.am: Install `evolution.png', not `evolution-icon.png'.
-
-	* evolution.png: Renamed from `evolution-icon.png', removing the
-	old, now unused `evolution.png'.
-
-2001-10-30  Jakub Steiner <jimmac@ximian.com>
-
-	* splash-1-0.png: new style splash 
-
-2001-10-23  Tuomas Kuosmanen  <tigert@ximian.com>
-
-	* splash.png: Remove the "1" from "1.0 Release Candidate 1" so it
-	looks better.
-
-2001-10-23  Tuomas Kuosmanen  <tigert@ximian.com>
-
-	* Makefile.am (appicon_DATA): Changed the filename here too 
-	so the icon gets installed.
-
-	* evolution-icon.png: New icon that scales better.
-
-2001-10-22  Jakub Steiner <jimmac@ximian.com>
-
-	* about-box.png: update the layout a bit
-	* splash.png: update to 0.17 
-
-2001-10-16  Ettore Perazzoli  <ettore@ximian.com>
-
-	* Makefile.am (images_DATA): Add `about-box.png'.
-
-	* about-box.png: New image for the about box from Jakub.
-
-2001-10-18  Larry Ewing  <lewing@ximian.com>
-
-	* Makefile.am (images_DATA): add alarm.png for the new alarm
-	notification code.
-
-2001-10-04  Chris Toshok  <toshok@ximian.com>
-
-	* Makefile.am (images_DATA): change ldap-16.png to ldap-mini.png,
-	and add ldap.png.
-
-2001-10-04  Jakub Steiner <jimmac@ximian.com>
-
-	* splash.png: bump to 0.16
-	* ldap.png: 48x48 version for shortcut bar
-
-2001-09-25  Iain Holmes  <iain@ximian.com>
-
-	* add task.png
-
-2001-09-21  Iain Holmes  <iain@ximian.com>
-
-	* remove timezone.png...dunno where it came from.
-
-2001-09-21  Iain Holmes  <iain@ximian.com>
-
-	* install timezone-16.xpm
-
-2001-09-21  Jakub Steiner <jimmac@ximian.com>
-
-	* splash.png: beta4
-
-2001-09-08  Jakub Steiner <jimmac@ximian.com>
-
-	* pgp-signature-*: for the pgp signature checking
-	* Makefile.am (images_DATA): add the icon files
-
-2001-09-06  Chris Toshok  <toshok@ximian.com>
-
-	* Makefile.am (images_DATA): add ldap-16.png.
-
-2001-09-05  Jakub Steiner <jimmac@ximian.com>
-
-	* meeting-request.png: for the inline .ics stuff
-	* Makefile.am (images_DATA): add the icon file
-
-2001-09-04  Jakub Steiner <jimmac@ximian.com>
-
-	* timezone-48.png: for the timezone configuration step in the
-	  first-time-druid
-	* Makefile.am (images_DATA): add the icon file
-	
-2001-08-20  JP Rosevear  <jpr@ximian.com>
-
-	* Makefile.am: install new file
-
-	* talking-heads.png: new graphic for meeting requests
-
-2001-08-20  Damon Chaplin  <damon@ximian.com>
-
-	* Makefile.am (images_DATA): added goto-16.png & new_task-16.png.
-	(buttons_DATA): added save-24.png.
-
-2001-08-20  Damon Chaplin  <damon@ximian.com>
-
-	* Makefile.am (buttons_DATA): added cut.png, copy.png & paste.png,
-	so we can use them for the tasks toolbar.
-
-2001-08-18  Damon Chaplin  <damon@ximian.com>
-
-	* Makefile.am (images_DATA): added 16_copy.png, 16_customize.png,
-	16_cut.png & 16_paste.png.
-	(buttons_DATA): added new_task.png, which I made from scaling up the
-	smaller task.xpm icon.
-
-2001-08-18  Ettore Perazzoli  <ettore@ximian.com>
-
-	* Makefile.am (buttons_DATA): Added `delete-message.png'.
-
-2001-08-17  Damon Chaplin  <damon@ximian.com>
-
-	* Makefile.am (images_DATA): moved task.xpm here, so it gets installed,
-	so we can use it for the menus. Note that we don't have an icon to
-	use in the toolbar for a new task, and we need one. Jakub?
-
-2001-08-17  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* wax-seal.png: Added.
-
-	* wax-seal-broken.png: Added.
-
-2001-08-17  Jakub Steiner <jimmac@ximian.com>
-
-	* splash.png: marketing spoils the fun. boring splash again.
-	
-2001-08-17  Jakub Steiner <jimmac@ximian.com>
-
-	* splash.png: Ruperzilla splash
-	
-	* splash-1-0.png: 1.0 candidate
-
-2001-08-16  Jakub Steiner <jimmac@ximian.com>
-
-	* {next,previous}-message.png: use new document template. maybe
-	  still a bit dark.
-	
-2001-08-15  Jakub Steiner <jimmac@ximian.com>
-
-	* add-attachment.png: get rid of the yellow
-
-	* compose-message.png: the old one seemed too dark to me. This one
-	shares the same document base as the new stuff.
-
-2001-08-15  Jakub Steiner <jimmac@ximian.com>
-
-	* all_contacts.xpm, new_contact.xpm: Nat wanted something bigger
-	  that would match the new button style. The filename of
-	  all_contacts.xpm is crap, maybe you guys can fix it to be
-	  "new_list.xpm" or something. Didn't want to break things.
-	 
-2001-08-15  Jakub Steiner <jimmac@ximian.com>
-
-	* save-16.png, save-as-16.png: fix bottom. Tuomas didn't like too
-	  much detail.
-
-2001-08-15  Tuomas Kuosmanen  <tigert@ximian.com>
-
-	* goto-24.png: Icon for "Goto date.." -button. Someone could add
-	this into the code?
-
-2001-08-14  Tuomas Kuosmanen  <tigert@ximian.com>
-
-	* arrow-[left,right]-24.png: new arrow icons for calendar
-	toolbar..
-
-2001-08-14  Jakub Steiner <jimmac@ximian.com>
-
-	* evolution-today-mini.png: new summary tree view icon.
-
-2001-08-10  Rodrigo Moya <rodrigo@ximian.com>
-
-	* 16_category_*: removed these files, which are now in gal
-
-2001-08-09  Tuomas Kuosmanen  <tigert@ximian.com>
-
-	* send-receive.xpm: Updated this to have the yellow/green arrows
-	so it matches the style of other icons. Noticed that tasklist
-	scales 16x16 icons larger, so they generally look Bad(tm). (fixes
-	#6475)
-
-2001-08-07  Damon Chaplin  <damon@ximian.com>
-
-	* timezone-16.xpm: copied from the international category icon.
-	It would be better to have 2 different icons for these, but I had
-	to get rid of that square timezone icon!
-
-2001-08-07  Jakub Steiner <jimmac@ximian.com>
-
-	* evolution-trash-mini.png: scaled down Tuomas' trash icon.
-	  tweaked a bit. looks a lot better than the previous one.
-	
-2001-08-07  Jakub Steiner <jimmac@ximian.com>
-
-	* inbox-*, outbox-*: tree view icons * filters.xpm, edit-16.xpm,
-	marlboro_filters.xpm: remove unused * vfolder-16.xpm,
-	delete-message.xpm, undelete-message.xpm: let's not use xpms *
-	evolution-trash-mini.png: new version for edit>delete message,
-	tree view and everything * undelete_message-16.png,
-	folder-move-16.png, open-in-new-window-16.png, folder-copy-16.png:
-	tree view icons * faq-16.png, mark-as-important-16.png: menu icons
-	* Makefile.am (images_DATA): add new icons, change some xpms to
-	pngs
-      
-
-2001-08-03  Jakub Steiner <jimmac@ximian.com>
-
-	* ldap-16.png, imap-16.png, local-16.png: tree view icons for
-	  imap, ldap and local folders.
-
-2001-08-02  Jakub Steiner <jimmac@ximian.com>
-
-	* myevo-mail-summary.png, myevo-post-it.png, *
-	myevo-appointments.png: icons for My Evolution -- mail summary,
-	tasks, appointments. These are _NOT_TO_ replace the shortcut
-	icons, but solely for My Evolution.
-	
-2001-08-02  Tuomas Kuosmanen  <tigert@ximian.com>
-
-	* receive-24.png: Icon for the send/receive dialog at least.
-
-2001-07-31  Jakub Steiner <jimmac@ximian.com>
-
-	* splash.png: beta2 splash
-
-2001-07-31  Tuomas Kuosmanen  <tigert@ximian.com>
-
-	* send-24-receive.png: New version, looks more consistent with the
-	other icons.
-
-2001-07-30  Jakub Steiner <jimmac@ximian.com>
-
-	* search-16.png, search-and-replace-16.png: menu versions for
-	  shell and editor.  * properties-16.png: properties for shel
-	  (maybe other places too) * send-16.png, send-later-16.png:
-	  editor, shell menu.  * work_online-16.png: to accompany work
-	  online menu toggle.  * save-16.png, save-as-16.png:
-	  everywhere. (based on Tuomas new gnome stock panel icon)
-	
-2001-07-27    <tigert@ximian.com>
-
-	* new_appointment.[xpm,png]: New version, fixes bug #4704
-	hopefully.
-
-2001-07-25  Damon Chaplin  <damon@ximian.com>
-
-	* Makefile.am (images_DATA): added print-preview-24.png.
-
-2001-07-25  Jakub Steiner <jimmac@ximian.com>
-
-	* print-preview-24.png: toolbar icon for calendar's appointment
-	  dialog (now using the menu version)
-
-2001-07-20  JP Rosevear  <jpr@ximian.com>
-
-	* Pull in new splash screen
-
-2001-07-20  Rodrigo Moya <rodrigo@ximian.com>
-
-	* Makefile.am: install 2 new category icons
-	(16_category_suppliers.png and 16_category_time-and-expenses.png)
-
-2001-07-20    <tigert@ximian.com>
-
-	* 16_category_time-and-expenses.png: Icon for "Time & Expenses"
-	category..
-
-	* 16_category_suppliers.png: Icon for "Suppliers" category..
-
-	* evolution-calendar.png, evolution-contacts.png,
-	evolution-inbox.png, evolution-tasks.png, evolution-today.png:
-	Took out the colored background circles from the icons, apparently
-	people found them confusing rather than useful, especially on
-	small icons -mode of the shortcutbar.
-
-2001-07-19  Rodrigo Moya <rodrigo@ximian.com>
-
-	* Makefile.am: install the 2 new category icons
-
-2001-07-19    <tigert@ximian.com>
-
-	* 16_category_strategies.png, 16_category_status.png: New category
-	icons.
-
-2001-07-19  Jakub Steiner <jimmac@ximian.com>
-
-	* insert-link-24.png, insert-table-24.png, insert-image-24.png:
-	  toolbar icons for message editor.
-
-2001-07-17  Rodrigo Moya <rodrigo@ximian.com>
-
-	* Makefile.am: install category icons
-
-2001-07-17  Tuomas Kuosmanen  <tigert@ximian.com>
-
-	* 16_category_holiday-cards.png 16_category_hot-contacts.png
-	16_category_ideas.png: new category icons..
-
-2001-07-16  Tuomas Kuosmanen  <tigert@ximian.com>
-
-	* 16_category_favorites.png 16_category_gifts.png
-	16_category_goals.png: New additions for the category stuff..
-	still more to do..
-
-2001-07-13  Tuomas Kuosmanen  <tigert@ximian.com>
-
-	* 16_category_*.png: Some category icons for calendar/tasks, to
-	match the different category types for events. Still many to do,
-	but I wanted to commit them so you people can start hacking on the
-	code already. More to follow shortly.
-
-	* 16_customize.png: Icon for "Customize toolbars" or whatever menu
-	item that deals with customizing stuff (the icon is a wrench)
-
-2001-07-12  JP Rosevear  <jpr@ximian.com>
-
-	* Makefile.am: extra dist another xpm
-
-2001-07-12    <tigert@ximian.com>
-
-	* delete_message.[png,xpm]: New versions for the trashcan icon.  I
-	am wondering if we should do some filename cleanup here, all menu
-	icons should really be 16_foo.png, whereas the toolbar ones should
-	be foo.png. Currently we are mixing PNG and XPM here with some
-	files having otherwise same names (like this one)..
-
-2001-07-11    <tigert@ximian.com>
-
-	* new_appointment.[png,xpm]: New versions
-
-2001-07-10  Tuomas Kuosmanen  <tigert@ximian.com>
-
-	* new_appointment.png: New appointment icon.  *
-	new_appointment.xpm: Small version.. (should we change this to
-	16_new_appointment.png btw?
-
-2001-07-09  Iain Holmes  <iain@ximian.com>
-
-	* Makefile.am: Install the myweather-* icons.
-
-2001-07-07    <tigert@ximian.com>
-
-	* 16_[cut,copy,paste].png: New icons for the
-	Edit->[Cut,Copy,Paste] entries, the current gnome-stock ones start
-	to look bad when scaled down, so these are already 16x16 pixels.
-
-2001-07-05  Jakub Steiner <jimmac@ximian.com>
-
-	* myweather-*: weather status icons for My Evolution
-
-2001-07-04  Gediminas Paulauskas <menesis@delfi.lt>
-
-	* Makefile.am: install apply-filters-16.xpm
-
-2001-07-03  Tuomas Kuosmanen  <tigert@ximian.com>
-
-	* cut.png, copy.png, paste.png: icons for cut/copy/paste to fit
-	the general style.
-
-2001-07-01  Jakub Steiner <jimmac@ximian.com>
-
-	* print.xpm, print-preview.xpm: nat didn't like the jaggy
-	  version. This one is based on tuomas 48x48 print icon.
-
-2001-06-30  Ettore Perazzoli  <ettore@ximian.com>
-
-	* Makefile.am (buttons_DATA): Add `print.png', `next-message.png',
-	`previous-message.png'.
-
-2001-06-29  Jakub Steiner <jimmac@ximian.com>
-
-	* remove-nntp-folder-24.png, add-nntp-folder-24.png,
-	  refresh-nntp-folders-24.png: manage subscriptions toolbar icons
-
-2001-06-29  Tuomas Kuosmanen  <tigert@ximian.com>
-
-	* print.png: Icon for print message.
-
-	* next-message.png, previous-message.png: New icons to replace the
-	< > arrows in the mailer.
-
-2001-06-29  Chris Toshok  <toshok@ximian.com>
-
-	* Makefile.am (images_DATA): add contact-is-a-list.png
-
-2001-06-29  Tuomas Kuosmanen  <tigert@ximian.com>
-
-	* contact-is-a-list.png: icon for toshok, for contact lists.
-
-2001-06-27  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* Makefile.am: Install the add-attachment.png icon.
-
-2001-06-27  Tuomas Kuosmanen  <tigert@ximian.com>
-
-	* evolution-calendar-mini.png: New version of the folder tree's
-	calendar icon. Doesnt look too much like the contacts icon.
-
-2001-06-19  Damon Chaplin  <damon@ximian.com>
-
-	* world_map-960.png: world map picture used for selecting
-	timezones.  * Makefile.am (images_DATA): added world_map-960.png
-	for timezones.
-
-2001-06-14  Jakub Steiner <jimmac@ximian.com>
-
-	* apply-filters-16.xpm: for mailer menu.  * vfolder-16.xpm:
-	vfolder icon for menu items * hand-16.xpm: originally ment for
-	customize toolbars. might not work * edit-16.xpm: edit message
-	(message open)
-	
-2001-06-13  Jakub Steiner <jimmac@ximian.com>
-
-	* rdf.png, ico-rdf.png: ximianize those
-
-2001-06-13  Jakub Steiner <jimmac@ximian.com>
-
-	* splash-1-0.png: Initial mockup for the final splash.  Didn't
-	  wan't to overwrite the unstable splash.png.
-	
-2001-06-07  Iain Holmes  <iain@ximian.com>
-
-	* empty.gif: es-weather.png es-appointments.png ico-calendar.png
-	  ico-mail.png ico-rdf.png ico-weather.png bcg.png rdf.png
-	  pattern.png: Added all these for the new My Evolution
-
-2001-06-04  Jakub Steiner <jimmac@ximian.com>
-
-	* timezone-16.xpm: for events in a diffrent timezone
-
-2001-05-22  Jakub Steiner <jimmac@ximian.com>
-
-	* evolution-inbox-mini.png: fixed the shadow
-
-2001-05-17  Dan Winship  <danw@ximian.com>
-
-	* Makefile.am (images_DATA): Install Jakub's new icons
-
-2001-05-16  Jakub Steiner <jimmac@ximian.com>
-
-	* mail-config-druid-48.png, mail-config-druid-identity.png,
-	  mail-config-druid-account-name.png,
-	  mail-config-druid-receive.png, mail-config-druid-send.png,
-	  thankyou.png: config druid icons
-	  
-	      thankyou.png can be used for the last step in every evo
-	      druid (like the import one)
-
-2001-05-16  Jakub Steiner <jimmac@ximian.com>
-
-	* evolution-calendar.png, evolution-contacts.png,
-	  evolution-inbox.png, evolution-today.png, evolution-tasks.png:
-	  fixed bug #2862. Also changed the envelope icon Oh and we use
-	  #b39169 for calendar now
-	  
-2001-05-16  Ettore Perazzoli  <ettore@ximian.com>
-
-	* Makefile.am (images_DATA): Added `online.png' and `offline.png'.
-
-	* online.png: New icon by Tuomas.  * offline.png: New icon by
-	Tuomas.
-
-2001-05-14  Duncan Mak  <duncan@ximian.com>
-
-	* Makefile.am (images_DATA): add in the new find_message.xpm
-
-2001-05-14  Jakub Steiner <jimmac@ximian.com>
-
-	* find_message.xpm: Duncan requested this
-
diff --git a/art/Makefile.am b/art/Makefile.am
deleted file mode 100644
index 87bb7ded87..0000000000
--- a/art/Makefile.am
+++ /dev/null
@@ -1,26 +0,0 @@
-images_DATA = \
-	about-box.png			\
-	bcg.png				\
-	evolution-contacts-mini.png	\
-	monkey-16.png			\
-	offline.png			\
-	online.png			\
-	world_map-960.png
-
-install-data-local:
-	$(mkinstalldirs) $(DESTDIR)$(datadir)/pixmaps
-	$(INSTALL_DATA) $(srcdir)/evolution.png  $(DESTDIR)$(datadir)/pixmaps/evolution-$(BASE_VERSION).png
-if DEFAULT_BINARY
-	cd $(DESTDIR)$(datadir)/pixmaps && rm -f evolution.png && $(LN_S) evolution-$(BASE_VERSION).png evolution.png
-endif
-
-EXTRA_DIST = 				\
-	ChangeLog			\
-	ChangeLog.pre-1-4		\
-	README				\
-	broken-image-16.xpm		\
-	broken-image-24.xpm		\
-	empty.xpm			\
-	evolution.png			\
-	jump.xpm			\
-	$(images_DATA)
diff --git a/art/README b/art/README
deleted file mode 100644
index 9f78332ce1..0000000000
--- a/art/README
+++ /dev/null
@@ -1,46 +0,0 @@
-Evolution Icons
-===============
-
-Licensing
----------
-
-FIXME: add license info here.
-
-
-Adding Icons
-------------
-
-Icons that are meant to someday be themeable MUST be for one or more
-of the following sizes:
-
-- 16x16
-- 18x18
-- 20x20
-- 24x24
-- 32x32
-- 48x48
-
-(the following sizes may also be added for use with window
-decorations: 64x64 and 128x128)
-
-All icons should be named consistantly and be placed within the proper
-subdir that corresponds to their size (if the subdir does not yet
-exist, because no icons have been made for that size - then create the
-subdir and add it to the build as well).
-
-If it is expected that the icon(s) you've created will make it into
-the GNOME icon themes package at some point (or is already there?),
-then you will want to name your icons accordingly so that if the user
-installs a GNOME icons theme package with the appropriate icon(s),
-then he or she will see those icons rather than the ones installed by
-default with Evolution.
-
-The icons within the WWxHH subdirs will ONLY be used if they cnnot be
-found in the theme.
-
-The ONLY image files that may be placed in the toplevel art/ srcdir
-(eg. *this* dir) are xpm files that are built into the Evolution binary
-(or libs) and/or are not meant to be used as "icons".
-
-
--- fejj
diff --git a/art/about-box.png b/art/about-box.png
deleted file mode 100644
index c3613fb4bb..0000000000
--- a/art/about-box.png
+++ /dev/null
diff --git a/art/bcg.png b/art/bcg.png
deleted file mode 100644
index ec03f8ab6e..0000000000
--- a/art/bcg.png
+++ /dev/null
diff --git a/art/broken-image-16.xpm b/art/broken-image-16.xpm
deleted file mode 100644
index e96ee1aab0..0000000000
--- a/art/broken-image-16.xpm
+++ /dev/null
@@ -1,61 +0,0 @@
-/* XPM */
-static char * broken_image_16_xpm[] = {
-"16 16 42 1",
-" 	c None",
-".	c #000000",
-"+	c #FEFEFE",
-"@	c #FDFDFD",
-"#	c #E0E0E0",
-"$	c #C1C1C1",
-"%	c #F1F1F1",
-"&	c #C3C3C3",
-"*	c #FBFBFB",
-"=	c #A8A8A8",
-"-	c #ADADAD",
-";	c #767676",
-">	c #5D5D5D",
-",	c #404040",
-"'	c #F0F0F0",
-")	c #E2E2E2",
-"!	c #858585",
-"~	c #4B4B49",
-"{	c #161616",
-"]	c #EFEFEF",
-"^	c #EEEEEE",
-"/	c #C5C5C5",
-"(	c #DF421E",
-"_	c #ECECEC",
-":	c #C4C4C4",
-"<	c #EBEBEB",
-"[	c #EDEDED",
-"}	c #EAEAEA",
-"|	c #E8E8E8",
-"1	c #C0C0C0",
-"2	c #E7E7E7",
-"3	c #BFBFBF",
-"4	c #E6E6E6",
-"5	c #E5E5E5",
-"6	c #BEBEBE",
-"7	c #E4E4E4",
-"8	c #BDBDBD",
-"9	c #E3E3E3",
-"0	c #BBBBBB",
-"a	c #C2C2C2",
-"b	c #BCBCBC",
-"c	c #A0A0A0",
-"   .........    ",
-"  .++++++@#$.   ",
-"  .+%%%%%%&*=.  ",
-"  .+%%%%%%-;>,. ",
-"  .+%%%%%')!~{. ",
-"  .+%]]]]]]^^/. ",
-"  .+]]((^((^_:. ",
-"  .@^^(((((^<&. ",
-"  .@[__(((}}}$. ",
-"  .@<|(((((||1. ",
-"  .@}}((|((223. ",
-"  .@|444444456. ",
-"  .@2244455778. ",
-"  .@4555779990. ",
-"  .a888bb0000c. ",
-"   ...........  "};
diff --git a/art/broken-image-24.xpm b/art/broken-image-24.xpm
deleted file mode 100644
index ba6cc6854e..0000000000
--- a/art/broken-image-24.xpm
+++ /dev/null
@@ -1,169 +0,0 @@
-/* XPM */
-static char * broken_image_24_xpm[] = {
-"24 24 142 2",
-"  	c None",
-". 	c #000000",
-"+ 	c #D3D3D3",
-"@ 	c #F6F6F6",
-"# 	c #FFFFFF",
-"$ 	c #F9F9F9",
-"% 	c #DADADA",
-"& 	c #585858",
-"* 	c #C7C7C7",
-"= 	c #D1D1D1",
-"- 	c #D6D6D6",
-"; 	c #B2B2B2",
-"> 	c #D9D9D9",
-", 	c #D8D8D8",
-"' 	c #DDDDDD",
-") 	c #C0C0C0",
-"! 	c #E1E1E1",
-"~ 	c #F0F0F0",
-"{ 	c #9B9B9B",
-"] 	c #D4D4D4",
-"^ 	c #FEFEFE",
-"/ 	c #FDFDFD",
-"( 	c #FCFCFB",
-"_ 	c #FBFBFB",
-": 	c #AFAFAE",
-"< 	c #E9E9E9",
-"[ 	c #DFDFDF",
-"} 	c #8F8F8F",
-"| 	c #FAFAF9",
-"1 	c #F9F9F8",
-"2 	c #A4A4A3",
-"3 	c #F4F4F4",
-"4 	c #CFCFCF",
-"5 	c #A2A2A2",
-"6 	c #D5D5D5",
-"7 	c #F8F8F7",
-"8 	c #F8F7F6",
-"9 	c #9E9E9E",
-"0 	c #F7F6F5",
-"a 	c #F6F6F4",
-"b 	c #F4F3F2",
-"c 	c #DEDDDC",
-"d 	c #D3D2D0",
-"e 	c #B7B7B5",
-"f 	c #9F9E9D",
-"g 	c #706F6F",
-"h 	c #65625A",
-"i 	c #F5F4F3",
-"j 	c #F2F2F0",
-"k 	c #E4E4E2",
-"l 	c #DAD9D7",
-"m 	c #D8D8D6",
-"n 	c #E3E3E1",
-"o 	c #AFAEAC",
-"p 	c #88847B",
-"q 	c #D3D2D1",
-"r 	c #DF421E",
-"s 	c #F3F3F1",
-"t 	c #EEEDEB",
-"u 	c #EDECEA",
-"v 	c #E9E8E6",
-"w 	c #EEEEED",
-"x 	c #C4C3C2",
-"y 	c #8F8A81",
-"z 	c #F6F5F4",
-"A 	c #D0D0CE",
-"B 	c #ECEBE9",
-"C 	c #EAE9E7",
-"D 	c #E5E4E2",
-"E 	c #D2D1CE",
-"F 	c #8D887E",
-"G 	c #CECDCD",
-"H 	c #F0F0EE",
-"I 	c #EFEFED",
-"J 	c #F1F0EE",
-"K 	c #F0EFED",
-"L 	c #EFEEEC",
-"M 	c #E8E7E5",
-"N 	c #E5E4E1",
-"O 	c #E4E3E0",
-"P 	c #E1DFDC",
-"Q 	c #979288",
-"R 	c #A49E93",
-"S 	c #CBCBC9",
-"T 	c #E7E6E3",
-"U 	c #E3E2DF",
-"V 	c #E2E0DD",
-"W 	c #E0DFDB",
-"X 	c #A19C90",
-"Y 	c #EDEDEB",
-"Z 	c #C9C8C7",
-"` 	c #EBEAE8",
-" .	c #E9E8E5",
-"..	c #E6E4E1",
-"+.	c #E3E2DE",
-"@.	c #DFDEDA",
-"#.	c #DDDCD8",
-"$.	c #A19B90",
-"%.	c #C6C5C3",
-"&.	c #E8E7E4",
-"*.	c #E7E5E2",
-"=.	c #E4E3DF",
-"-.	c #DEDDD9",
-";.	c #DCDBD7",
-">.	c #C3C2C0",
-",.	c #E6E5E2",
-"'.	c #E5E4E0",
-").	c #E2E1DD",
-"!.	c #EDECEB",
-"~.	c #D9D7D3",
-"{.	c #9F998D",
-"].	c #C1C0BD",
-"^.	c #E4E2DF",
-"/.	c #E1E0DC",
-"(.	c #DDDBD7",
-"_.	c #DCDAD6",
-":.	c #D8D6D2",
-"<.	c #9E988D",
-"[.	c #EDEDED",
-"}.	c #E1E0DD",
-"|.	c #D6D4D2",
-"1.	c #EBEBE8",
-"2.	c #EAE8E6",
-"3.	c #E6E5E3",
-"4.	c #F1F1EF",
-"5.	c #D7D5D1",
-"6.	c #9D978B",
-"7.	c #E1DFDB",
-"8.	c #E0DEDA",
-"9.	c #DEDCD8",
-"0.	c #D7D6D1",
-"a.	c #D5D3CE",
-"b.	c #9B958A",
-"c.	c #999891",
-"d.	c #A39E92",
-"e.	c #A39D92",
-"f.	c #A39D91",
-"g.	c #A29C90",
-"h.	c #A19B8F",
-"i.	c #9D978C",
-"j.	c #9B968A",
-"k.	c #676359",
-"                                                ",
-"      . . . . . . . . . . . . .                 ",
-"    . + @ # # # # # # # # $ % & .               ",
-"    . @ # # # # # # # # # # * = - .             ",
-"    . # # ; > > > > , > , ' ) ! ~ { .           ",
-"    . # # ] # # ^ / ( / ( _ : < # [ } .         ",
-"    . # # > ^ / ( _ | _ | 1 2 ~ # 3 4 5 .       ",
-"    . # ^ 6 ( _ | 1 7 1 7 8 9 . . . . . . .     ",
-"    . # ( 6 | 1 7 8 0 8 0 a b c d e f g h .     ",
-"    . # | + 7 8 0 a i a i b j k l m n o p .     ",
-"    . # 7 q 0 a i r r b s r r t u v w x y .     ",
-"    . # z A b b s j r r r r t B C D i E F .     ",
-"    . # b G j H I J K r r L B M N O I P Q .     ",
-"    . # b G j H I J r r r r B M N O I P R .     ",
-"    . # H S I L t r r u u r r T U V L W X .     ",
-"    . # Y Z B B B `  .`  . .N ..+.@.Y #.$..     ",
-"    . # ` %.v M &.&.T &.T *.=.+.W -.u ;.$..     ",
-"    . # T >.,.,.N ..'...'.=.).W -.;.!.~.{..     ",
-"    . $ O ].+.^.=.).+.).+././.-.(._.t :.<..     ",
-"    . [.}.|.1.1.u 1.B 1.B ` ` 2. .3.4.5.6..     ",
-"    . = 7.8.@.-.W -.8.-.8.9.9._._.:.0.a.b..     ",
-"    . c.d.R e.f.e.X g.X g.h.$.{.{.i.i.j.k..     ",
-"      . . . . . . . . . . . . . . . . . .       ",
-"                                                "};
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/evolution-contacts-mini.png b/art/evolution-contacts-mini.png
deleted file mode 100644
index 5ddb92c1ce..0000000000
--- a/art/evolution-contacts-mini.png
+++ /dev/null
diff --git a/art/evolution.png b/art/evolution.png
deleted file mode 100644
index 412dcfbbc0..0000000000
--- a/art/evolution.png
+++ /dev/null
diff --git a/art/jump.xpm b/art/jump.xpm
deleted file mode 100644
index 7c289e738f..0000000000
--- a/art/jump.xpm
+++ /dev/null
@@ -1,30 +0,0 @@
-/* XPM */
-static char * jump_xpm[] = {
-"16 8 3 1",
-" 	c None",
-".	c #000000",
-"+	c #FFFF00",
-"................",
-".++++++++++++++.",
-".++++++++++++++.",
-".++..++..++..++.",
-".++..++..++..++.",
-".++++++++++++++.",
-".++++++++++++++.",
-"................"};
-
-static char * jump_xpm_focused[] = {
-"16 8 3 1",
-"       c None",
-".      c #0000FF",
-"+      c #FFFF00",
-"................",
-"................",
-"..++++++++++++..",
-"..+..++..++..+..",
-"..+..++..++..+..",
-"..++++++++++++..",
-"................",
-"................"};
-                                                                                                                
-
diff --git a/art/monkey-16.png b/art/monkey-16.png
deleted file mode 100644
index 02fb7b6eb5..0000000000
--- a/art/monkey-16.png
+++ /dev/null
diff --git a/art/offline.png b/art/offline.png
deleted file mode 100644
index 57bdd27be2..0000000000
--- a/art/offline.png
+++ /dev/null
diff --git a/art/online.png b/art/online.png
deleted file mode 100644
index 9a6a3980c2..0000000000
--- a/art/online.png
+++ /dev/null
diff --git a/art/world_map-960.png b/art/world_map-960.png
deleted file mode 100644
index 0512d20115..0000000000
--- a/art/world_map-960.png
+++ /dev/null
diff --git a/autogen.sh b/autogen.sh
deleted file mode 100755
index 4b51a10c76..0000000000
--- a/autogen.sh
+++ /dev/null
@@ -1,25 +0,0 @@
-#!/bin/sh
-# Run this to generate all the initial makefiles, etc.
-
-#!/bin/sh
-# Run this to generate all the initial makefiles, etc.
-
-srcdir=`dirname $0`
-test -z "$srcdir" && srcdir=.
-
-PKG_NAME="Evolution"
-REQUIRED_AUTOMAKE_VERSION=1.6
-
-(test -f $srcdir/configure.in \
-  && test -f $srcdir/ChangeLog \
-  && test -d $srcdir/shell) || {
-    echo -n "**Error**: Directory "\`$srcdir\'" does not look like the"
-    echo " top-level $PKG_NAME directory"
-    exit 1
-}
-
-which gnome-autogen.sh || {
-    echo "You need to install gnome-common from the GNOME CVS"
-    exit 1
-}
-USE_GNOME2_MACROS=1 . gnome-autogen.sh
diff --git a/calendar/.cvsignore b/calendar/.cvsignore
deleted file mode 100644
index b7f7dea650..0000000000
--- a/calendar/.cvsignore
+++ /dev/null
@@ -1,6 +0,0 @@
-Makefile.in
-Makefile
-.deps
-_libs
-.libs
-*.lo
diff --git a/calendar/AUTHORS b/calendar/AUTHORS
deleted file mode 100644
index e4fda3d3bc..0000000000
--- a/calendar/AUTHORS
+++ /dev/null
@@ -1,7 +0,0 @@
-Miguel de Icaza <miguel@kernel.org>
-Federico Mena <federico@helixcode.com>
-Arturo Esponosa <arturo@nuclecu.unam.mx>
-Russell Steinthal <rms39@columbia.edu>
-Rodrigo Moya <rodrigo@ximian.com>
-JP Rosevear <jpr@ximian.com>
-Damon Chaplin <damon@ximian.com>
diff --git a/calendar/ChangeLog b/calendar/ChangeLog
deleted file mode 100644
index 021000e746..0000000000
--- a/calendar/ChangeLog
+++ /dev/null
@@ -1,9751 +0,0 @@
-2005-03-24  Chenthill Palanisamy  <pchenthill@novell.com>
-	
-	Fixes #73320
-	* gui/e-meeting-list-view.c: (attendee_edited_cb): Check if
-	we are editing the same row and if so do not remove the attendee.
-
-2005-03-24  Chenthill Palanisamy  <pchenthill@novell.com>
-	
-	Fixes #73508
-	* gui/dialogs/meeting-page.c: (meeting_page_fill_widgets): Set the 
-	organizers status as NEEDS ACTION, checking for the static capability.
-
-2005-03-16  Li Yuan  <li.yuan@sun.com>
-
-	* gui/calendar-view.c: (calendar_view_class_init):
-	remove the edit function.
-
-	Fixes # 40762
-
-2005-03-22  Chenthill Palanisamy  <pchenthill@novell.com>
-
-	* gui/calendar-component.c: (popup_event_cb): Popup all the 
-	menu items when clicked on the source. 
-
-2005-03-21  Chenthill Palanisamy  <pchenthill@novell.com>
-
-	Fixes #73031
-	* gui/dialogs/event-editor.c: (event_editor_finalize):
-	* gui/dialogs/task-editor.c: (task_editor_finalize): Added
-	a check for the presence of the object before unreffing it.
-
-2005-03-21  JP Rosevear  <jpr@novell.com> 
- 
- 	* gui/gnome-cal.c (default_client_cal_opened_cb): if its busy, try
- 	again
- 	(client_cal_opened_cb): ditto
-  
-2005-03-21  JP Rosevear  <jpr@novell.com> 
- 
- 	* gui/e-day-view.c (e_day_view_on_main_canvas_drag_data_received):
- 	abort sequence
- 	(e_day_view_on_top_canvas_motion): prevent drag of recurring events
- 	(e_day_view_on_main_canvas_motion): ditto
- 
- 	* gui/e-calendar-view.c (on_unrecur_appointment): clear recur id
-	
-2005-03-21  JP Rosevear  <jpr@novell.com>
-  
- 	* gui/tasks-component.c (ensure_sources): ensure the color and
- 	primary config are set on the personal source
- 
- 	* gui/calendar-component.c (ensure_sources): ditto
-	
-2005-03-21  Li Yuan  <li.yuan@sun.com>
-
-	* gui/print.c: (print_comp_item):
-	Fixes #44579
-
-2005-03-17  Chenthill Palanisamy  <pchenthill@novell.com>
-
-	Fixes #68525, 68580
-	* gui/gnome-cal.c (update_query), (gnome_calendar_init):
-	Added a boolean variable to avoid crash when a race condition
-	occurs.
-
-2005-03-16  Rodrigo Moya <rodrigo@novell.com>
-
-	Fixes #73101
-
-	* calendar-errors.xml:
-	* calendar-errors.xml.h: removed unnecessary leading space.
-
-2005-03-16  Rodrigo Moya <rodrigo@novell.com>
-
-	Fixes #72983
-
-	* gui/e-cal-list-view.c (e_cal_list_view_new): set EXPAND_RECURRENCES
-	flag on the model.
-
-2005-03-15  JP Rosevear  <jpr@novell.com>
-
-	* gui/itip-utils.c (itip_send_comp): when publishing, the to_list
-	will always be null so don't error out then
-
-2005-03-13  JP Rosevear  <jpr@novell.com>
-
-	Fixes #73563
-	
-	* gui/alarm-notify/alarm-queue.c (notify_dialog_cb): make sure in
-	the snooze case the tray (and via callbacks then) the dialog is
-	destroyed
-
-2005-03-14  Chenthill Palanisamy  <pchenthill@novell.com>
-
-	Fixes #72979
-	* gui/e-cal-list-view.c (find_meeting),
-	(e_cal_list_view_on_table_double_click): Check whether its a
-	meeting and send appropriate boolean variable.
-
-2005-03-11  Sushma Rai  <rsushma@novell.com>
-
-	* gui/dialogs/event-page.c (event_page_show_options): Removed the check
-	for general options page static capability. Send options dialog will
-	not be created at this point.
-	(e_sendoptions_clicked_cb): Checking for the general options page
-	static capability, when used clicks send options button.
-
-	* gui/dialogs/task-page.c (task_page_show_options)
-	(e_sendoptions_clicked_cb): Similar.
-	Fixes #73501
-
-2005-03-09  Not Zed  <NotZed@Ximian.com>
-
-	* gui/e-week-view-event-item.c (e_week_view_event_item_draw_icons):
-	* gui/e-day-view.c (e_day_view_reshape_day_event): free the ecalcomponent
-	after using it.
-
-2005-03-08  Chenthill Palanisamy  <pchenthill@novell.com>
-
-	Fixes #73141
-	* gui/dialogs/comp-editor.c: 
-	(comp_editor_notify_client_changed):Assign the updated client
-	to priv->client and unref the old one.	
-
-2005-03-07  JP Rosevear  <jpr@novell.com>
-
-	* gui/alarm-notify/alarm-queue.c: add remove_client_alarms prototype
-	
-2005-03-06  Rodrigo Moya <rodrigo@novell.com>
-
-	* gui/dialogs/recur-comp.c (recur_component_dialog): disable dialog for
-	asking user which instance(s) to modify.
-
-2005-03-04  Rodrigo Moya <rodrigo@novell.com>
-
-	Fixes #72835
-
-	* gui/alarm-notify/alarm-notify-dialog.[ch] (alarm_notify_dialog):
-	changed to return the dialog we create, and to run in the background.
-	(dialog_response_cb): response callback for the dialog.
-
-	* gui/alarm-notify/alarm-queue.c (alarm_queue_done): don't g_assert,
-	just check for midnight_refresh pointer, and clear it up if not NULL.
-	Also, traverse all clients with g_hash_table_foreach_remove.
-	(free_client_alarms_cb, alarm_queue_remove_client, load_alarms): added
-	missing cleanup code.
-	(queue_midnight_refresh): don't g_assert, just check for midnigh_refresh
-	pointer and clear it up if not NULL.
-	(open_alarm_dialog): store the dialog returned by alarm_notify_dialog().
-	(tray_icon_destroyed_cb): destroy the dialog if still around.
-
-2005-02-28  Harish Krishnaswamy  <kharish@novell.com>
-
-        Fixes #69556
-        * gui/dialogs/cal-attachment-bar.c:
-        (cal_attachment_bar_attach_mime_part): Add missing call to
-        attach_mime_part.
-
-2005-02-28  Rodrigo Moya <rodrigo@novell.com>
-
-	Fixes #72928
-
-	* gui/alarm-notify/notify-main.c (main): don't call alarm_queue_done...
-
-	* gui/alarm-notify/alarm-notify.c (alarm_notify_finalize): ...do it at
-	the same level than alarm_queue_init.
-
-2005-02-28  JP Rosevear  <jpr@novell.com>
-
-	* gui/gnome-cal.c (gnome_calendar_goto_today): revert fix for
-	70000, its a ui change
-
-2005-02-28  Chenthill Palanisamy  <pchenthill@novell.com>
-
-	* gui/dialogs/comp-editor.c: (attachment_bar_icon_clicked_cb),
-	(setup_widgets): Connect the signal to "event", and open the attachment
-	only if its a double click from the cal attachment bar.
-
-2005-02-28  Chenthill Palanisamy  <pchenthill@novell.com>
-
-	Fixes #72958
-	* gui/dialogs/comp-editor.c: (save_comp): If the backend
-	returns success, if the delay delivery is set, do not
-	show them in the view, since it will not be created in the 
-	server.
-	
-2005-02-25  Sivaiah Nallagatla <snallagatla@novell.com>
-
-	* gui/calendar-component.c (ensure_sources) :
-	Make sure the base uri is same as the one
-	migration code uses. Avoids two "On This Computer"
-	groups when both migration and this code runs.
-	
-2005-02-23  Hans Petter Jansson  <hpj@novell.com>
-
-	* common/authentication.c:
-	* gui/e-pub-utils.c:
-	* gui/alarm-notify/alarm-notify.c:
-	* gui/alarm-notify/notify-main.c:
-	* gui/dialogs/url-editor-dialog.c:
-	Include <libedataserverui/e-passwords.h>.
-	* gui/itip-utils.c: Remove e-passwords.h include, it's not
-	needed.
-
-2005-02-23  JP Rosevear  <jpr@novell.com>
-
-	Fixes #70000
-	
-	* gui/gnome-cal.c (gnome_calendar_goto_today): set the view type
-	to day view
-
-2005-02-23  Chenthill Palanisamy  <pchenthill@novell.com>
-
-	Fixes #72006	
-	* gui/dialogs/comp-editor.c: (real_edit_comp):
-	* gui/dialogs/event-editor.c: (show_meeting):
-	* gui/dialogs/task-editor.c: (show_assignment): Reset
-	the changed state, to suppress the promt_to_changes
-	dialog when the fields are not changed.
-
-2005-02-21  JP Rosevear  <jpr@novell.com>
- 
- 	Fixes #63866, #67714, #62089, #47747, #61495, #28947
- 	
- 	* gui/e-select-names-renderer.h: update signal
- 
- 	* gui/e-select-names-renderer.c
- 	(e_select_names_renderer_editing_done): emit the cancelled signal
- 	properly and don't update if it was cancelled
- 	(e_select_names_renderer_focus_out_event): if the cell loses focus
- 	the editing is done
- 	(e_select_names_renderer_start_editing): listen for focus out
- 	event, and only set the address if appropriate
- 	(e_select_names_renderer_get_property): handle name/email props
- 	(e_select_names_renderer_set_property): ditto
- 	(e_select_names_renderer_finalize): free name/email
- 	(e_select_names_renderer_class_init): install name/email props;
- 	cell_edited returns lists now
- 
- 	* gui/e-select-names-editable.h: update protos
- 
- 	* gui/e-select-names-editable.c: don't really override any of the
- 	gtkentry editable cell routines since we directly inherit from
- 	ENameSelectorEntry
- 	(e_select_names_editable_get_emails): get all the email addresses
- 	(e_select_names_editable_get_names): get all the names
- 	(e_select_names_editable_set_address): set the destination
- 	correctly for editing
- 
- 	* gui/e-meeting-list-view.c (attendee_edited_cb): handle a blank
- 	entry by removing it and don't allow an entry that already exists
- 	to be entered
- 	(attendee_editing_canceled_cb): if the item editing is cancelled
- 	and it has no name or email address, remove it
- 	(process_section): if the contact has multiple addresses (ie a
- 	mailing list), expand the entries
- 
- 	* gui/e-calendar-marshal.list: add new marshaller
-	
-2005-02-19  Sivaiah Nallagatla <snallagatla@novell.com>
-
-	* gui/calendar-component.c (ensure_sources) :
-	Make sure all the default source groups and sources
-	are present by adding missing ones. Also update the
-	base uri of "On This Computer" group to take care 
-	of change in user home dir.
-	(calendar_component_init) : call ensure_sources 
-
-	* gui/tasks-component.c (ensure_sources)
-	(tasks_component_init) : ditto
-
-	Takes care of #67411 & #67724 for
-	calendar and tasks components. 
-
-
-2005-02-18  Rodrigo Moya <rodrigo@novell.com>
-
-	* gui/alarm-notify/alarm-notify.c (cal_opened_cb): if opening
-	the calendar failed, disconnect signals and unref it.
-
-2005-02-18  Chenthill Palanisamy  <pchenthill@novell.com>
-
-	* _EventPagePrivate: added a boolean variable is_meeting.
-	* _TaskPagePrivate: added a boolean variable is_assignment.
-	* gui/dialogs/task-page.h:
-	* gui/dialogs/event-page.h: Added a function to set
-	the is_meeting boolean variable.
-	* gui/dialogs/event-editor.c: (show_meeting):
-	* gui/dialogs/task-editor.c: (show_assignment): Called
-	the function to set the boolean variable.
-	* gui/dialogs/event-page.c: (event_page_init),
-	(event_page_set_meeting), (source_changed_cb):
-	* gui/dialogs/task-page.c: (task_page_init),
-	(task_page_set_assignment), (source_changed_cb):
-	If the source is changed and only if its a group
-	event show the send options frame.
-	* gui/gnome-cal.c: (client_cal_opened_cb): Do not
-	popup the offline error dialog for tasks.
-
-2005-02-15  Rodrigo Moya <rodrigo@novell.com>
-
-	* gui/migration.c (migrate_ical_folder_to_source): check return value
-	from e_cal_new, to display a better warning message.
-
-2005-02-11  Rodrigo Moya <rodrigo@novell.com>
-
-	Fixes #72038
-
-	* gui/itip-utils.c (itip_send_comp): when we get no recipients, don't
-	send the message and return an error.
-
-2005-02-10  Chenthill Palanisamy  <pchenthill@novell.com>
-
-	* gui/e-cal-model.c: (e_cal_view_objects_added_cb): Remove
-	the component from the view, if its already present before 
-	adding it.
-
-2005-02-09  Harish Krishnaswamy  <kharish@novell.com>
-
-	* gui/dialogs/event-editor.c: (event_editor_edit_comp):
-	Always remove the meeting and scheduling pages when there are no
-	attendees. This allows the sender to be added to the attendees list 
-	by default while creating new meetings.
-
-2005-02-08  Rodrigo Moya <rodrigo@novell.com>
-
-	* gui/e-cal-model.c (set_instance_times): set instance times correctly.
-
-2005-02-07  JP Rosevear  <jpr@novell.com>
-
-	Fixes #61075
-	
-	* gui/apps_evolution_calendar.schemas.in.in: add long descriptions
-	and clean up short items
-
-2005-02-05  Harish Krishnaswamy  <kharish@novell.com>
-
-	* calendar-errors.xml:
-	* calendar-errors.xml.h:
-	* gui/e-tasks.c: (client_cal_opened_cb):
-	* gui/gnome-cal.c: (client_cal_opened_cb),
-	(default_client_cal_opened_cb): add messages for
-	calendar/tasks not marked for offline usage.
-	
-
-2005-02-05  Harish Krishnaswamy  <kharish@novell.com>
-
-	* gui/dialogs/comp-editor.c (attach_message), (drop_action),
-	(drop_popup_copy), (drop_popup_move), (drop_popup_cancel),
-	(drop_popup_free), (drag_data_received), (drag_motion),
-	(comp_editor_class_init), (comp_editor_init), (real_edit_comp):
-	fix the dnd woes on calendar attachments.
-	* gui/dialogs/cal-attachment-bar.c (add_from_file): reuse  
-	mail composer's error message.
-	
-2005-02-04  Harry Lu  <harry.lu@sun.com>
-
-	Add a11y name for attachment button and bars.
-
-	* gui/dialogs/cal-attachment-bar.c: (cal_attachment_bar_new):
-	* gui/dialogs/comp-editor.c: (setup_widgets):
-
-2005-02-04  Rodney Dawes  <dobey@novell.com>
-
-	* gui/dialogs/comp-editor.[ch]: Add a string to CompEditorPrivate to
-	store the name of the help section we need to refer for derived dialogs
-	(response_cb): Handle the GTK_RESPONSE_HELP response and show help
-	(setup_widgets): Add a button to the dialog for Help
-	(comp_editor_init): Default to the "usage-calendar" help section
-	(comp_editor_finalize): Free the help_section variable
-	(comp_editor_show_help): Add a new method to actually open the help
-	(comp_editor_set_help_section): Add a method for derivatives to set the
-	help section they want to open
-
-	* gui/dialogs/event-editor.c (event_editor_init): Set the help section
-	we want to open for the event editor to "usage-calendar-apts"
-
-	* gui/dialogs/task-editor.c (task_editor_init): Set the help section
-	we want to open for the event editor to "usage-calendar-todo"
-	
-2005-02-04  Rodrigo Moya <rodrigo@novell.com>
-
-	* gui/e-tasks.c (update_view): clear the component preview when we
-	update the view.
-
-	* gui/e-cal-model.c (set_instance_times): use the correct timezone.
-	Removed commented code.
-
-2005-02-04  Rodrigo Moya <rodrigo@novell.com>
-
-	Fixes #71265
-
-	* gui/e-week-view.c (e_week_view_remove_event_cb):
-	* gui/e-day-view.c (e_day_view_remove_event_cb): if we remove the
-	event we were editing, update internal pointers.
-
-2005-02-04  Vivek Jain <jvivek@novell.com>
-	
-	* calendar-errors.xml.h
-	* calendar-errors.xml : changed the warning message string for
-	server-version
-
-2005-02-04  Yong Sun <yong.sun@sun.com>
-
-	Fix for #56901
-
-	* gui/print.c: (bound_text): When the width>maxwidth, the 
-	pointer 'p' should also be backwarded, same as 'o'.
-
-2005-02-03  Rodney Dawes  <dobey@novell.com>
-
-	* calendar-errors.xml.h: Update to include new strings from the
-	calendar-errors.xml file
-
-2005-02-03  Li Yuan  <li.yuan@sun.com>
-
-	* gui/dialogs/task-details-page.c: (get_widgets):
-	add a11y name to url.
-	* gui/dialogs/task-details-page.glade:
-	add a11y name to date completed.
-	* gui/dialogs/task-page.glade:
-	add a11y names to due date and start date.
-
-2005-02-03  Vivek Jain <jvivek@novell.com>
-	
-	* calendar-errors.xml : added a warning message for invalid server
-	version
-	* gui/gnome-cal.c (default_client_cal_opened_cb)
-	(client_cal_opened_cb): added a case to check the
-	call status and display warning	
-
-2005-02-02  Rodney Dawes  <dobey@novell.com>
-
-	* gui/dialogs/alarm-dialog.c (alarm_dialog_run): Set the border width
-	for the internal dialog containers to be HIG compliant
-
-	* gui/dialogs/alarm-dialog.glade: Remove the separator in the dialog
-	and fix some spacing/padding issues to be HIG compliant
-
-	* gui/dialogs/alarm-list-dialog.c (alarm_list_dialog_run): Set the
-	border width for the internal dialog containers to be HIG compliant
-	
-	* gui/dialogs/alarm-list-dialog.glade: Remove the separator in the
-	dialog and fix some spacing/padding issues to be HIG compliant
-
-2005-02-02  Rodrigo Moya <rodrigo@novell.com>
-
-	Fixes #72090
-
-	* gui/calendar-component.c (impl_handleURI): don't assume the URI is
-	always correct.
-
-2005-02-01  Rodney Dawes  <dobey@novell.com>
-
-	* gui/dialogs/comp-editor.c (setup_widgets): Clean up the spacing
-	and padding, and shove the notebook and expander arrow into a vbox
-	so that we can be HIG compliant
-	(comp_editor_init): Remove the separator from the "dialog" and set
-	the border width for the internal dialog widgets appropriately to
-	be compliant with the HIG for dialog borders
-	
-2005-02-01  JP Rosevear  <jpr@novell.com>
-
-	* gui/e-tasks.c (e_tasks_destroy): fix typo
-
-	* gui/gnome-cal.c (gnome_calendar_destroy): ditto
-	
-2005-02-01  Rodrigo Moya <rodrigo@novell.com>
-
-	* gui/e-cal-menu.c (e_cal_menu_target_new_select):
-	* gui/e-cal-popup.c (e_cal_popup_target_new_select): add correct mask
-	for detached recurrences.
-
-2005-02-01  Rodrigo Moya <rodrigo@novell.com>
-
-	* gui/calendar-commands.c
-	(calendar_control_sensitize_calendar_commands): only add real data
-	to the array.
-
-2005-02-01  JP Rosevear  <jpr@novell.com>
-
-	Fixes #71944
-	
-	* gui/e-tasks.c: declare config_categories_changed_cb before its
-	used
-
-2005-01-31  Hans Petter Jansson  <hpj@novell.com>
-
-	* common/Makefile.am (libevolution_calendarprivate_la_LDFLAGS):
-	Remove the -module flag, this isn't supposed to be a module.
-
-2005-01-31  Hans Petter Jansson  <hpj@novell.com>
-
-	* idl/evolution-calendar.idl: Remove definition of CalObjUID and
-	include that from Evolution-DataServer-Calendar.idl instead. This
-	prevents the typecode from being defined twice.
-
-2005-01-31  Hans Petter Jansson  <hpj@novell.com>
-
-	* gui/e-cal-config.c (_ECalConfigPrivate): Use guint instead of ulong
-	for signal ID.
-
-2005-01-31  Priit Laes <amd@tt.ee>
-
-	Fixes #61078
-
-	* gui/dialogs/task-page.glade: use consistent style for markup.
-
-2005-01-31  Chenthill Palanisamy  <pchenthill@novell.com>
-
-	Fixes #64682
-	* gui/e-calendar-view.c: (transfer_item_to): Added an 
-	X property to identify if the appointment is moved from 
-	another calendar.
-
-2005-01-28  JP Rosevear  <jpr@novell.com>
-
-	Fixes #71452
-	
-	* gui/dialogs/comp-editor.c (setup_widgets): listen for
-	delete_event signal and handle it outside of the response signal
-	so that cancel works properly
-
-2005-01-28  Rodrigo Moya <rodrigo@novell.com>
-
-	* gui/e-tasks.c (setup_widgets):
-	* gui/gnome-cal.c (setup_widgets): use correct key name.
-
-2005-01-28  Rodrigo Moya <rodrigo@novell.com>
-
-	Fixes #33078
-
-	* gui/gnome-cal.c: deal now with categories entirely here, no more
-	"categories_changed" signal from the backends.
-	(free_categories, add_categories, append_category_cb,
-	client_categories_changed_cb, copy_categories): removed.
-	(gnome_calendar_add_source): don't connect to removed signal.
-	(gnome_calendar_destroy): destroy the config listener.
-	(gnome_calendar_init): create a listener for the categories list
-	GConf key.
-	(config_categories_changed_cb): callback for configuration changes
-	in category list.
-	(setup_widgets): initialize the search bar with categories from
-	the configuration.
-
-	* gui/e-tasks.c (client_categories_changed_cb, e_tasks_add_todo_source,
-	e_tasks_init, config_categories_changed_cb, e_tasks_destroy,
-	setup_widgets): same as gnome-cal.c.
-
-2005-01-26  JP Rosevear  <jpr@novell.com>
-
-	Fixes #71485
-	
-	* calendar-errors.xml: fix paste-o
-
-2005-01-27  Harry Lu <harry.lu@sun.com>
-
-	Fix a runtime invalid cast warning.
-
-	* gui/e-calendar-table.c: (e_calendar_table_init): only set
-	a11y name if atk is enabled.
-
-2005-01-26  Rodrigo Moya <rodrigo@novell.com>
-
-	* gui/dialogs/recurrence-page.c (sensitize_buttons): objects returned
-	from e_cal_get_objects_for_uid are ECalComponent's, so use
-	g_object_unref to free them, not icalcomponent_free.
-
-2005-01-26  Li Yuan  <li.yuan@sun.com>
-
-	* gui/dialogs/cal-prefs-dialog.glade:
-	use full name for the weekday checkbox.
-
-	Fixes #71729.
-
-
-2005-01-26  JP Rosevear  <jpr@novell.com>
-
-	* gui/itip-utils.c (itip_send_comp): make sure we free the user
-	list
-
-2005-01-25  Li Yuan  <li.yuan@sun.com>
-
-	* gui/e-calendar-table.c: (e_calendar_table_init):
-	add a11y name to task table.
-
-2005-01-24  Rodrigo Moya <rodrigo@novell.com>
-
-	* gui/dialogs/recurrence-page.c (sensitize_buttons): if there are
-	detached instances, disable recurrence date widgets.
-
-2005-01-21  JP Rosevear  <jpr@novell.com>
-
-	Fixes #46404
-	
-	* gui/tasks-control.c (tasks_control_print_cmd): just call print
-	tasks, we don't do the dialog here
-
-	* gui/print.h: update protos
-
-	* gui/print.c (print_calendar): use e_print routines for config
-	and dialog and make copies and range settings properly available
-	(print_comp): ditto
-	(print_table): bring up dialog here so that printing for calendar
-	list view works correctly
-
-	* gui/calendar-commands.c (print): pass extra params to print
-	table
-
-2005-01-19  Rodrigo Moya <rodrigo@novell.com>
-
-	* importers/icalendar-importer.c (update_objects): use receive_objects
-	method instead of individually updating objects. Set the method on the
-	VCALENDAR object we create.
-
-2005-01-18  Rodrigo Moya <rodrigo@novell.com>
-
-	Fixes #71407
-
-	* gui/e-week-view.c (process_component): killed warnings.
-	(e_week_view_start_editing_event): do nothing if the calendar is
-	read only.
-
-	* gui/e-day-view.c (e_day_view_start_editing_event): ditto.
-
-2005-01-18  Harish Krishnaswamy  <kharish@novell.com>
-
-	* gui/dialogs/cal-attachment-bar.c 
-	(cal_attachment_bar_get_attachment_list): handle error conditions more
-	gracefully.
-
-2005-01-17  Rodrigo Moya <rodrigo@novell.com>
-
-	* gui/calendar-component.c:
-	* gui/calendar-offline-handler.c:
-	* gui/comp-editor-factory.c:
-	* gui/e-tasks.c:
-	* gui/gnome-cal.c:
-	* gui/misc.c:
-	* gui/alarm-notify/alarm-notify.c: use libedataserver's e-url.
-
-2005-01-17  Nat Friedman  <nat@novell.com>
-
-	* gui/dialogs/url-editor-dialog.glade: Changed the title for the
-	free/busy publishing settings dialog to "Free/Busy Publishing
-	Settings" (away from "Free/Busy Editor" which made no sense).
-
-2005-01-17  Rodrigo Moya <rodrigo@novell.com>
-
-	* gui/e-calendar-view.c (on_unrecur_appointment): removed the
-	e_day_view_... prefix in warning messages.
-
-2005-01-17  Harish Krishnaswamy  <kharish@novell.com>
-
-	* gui/dialogs/cal-attachment-bar.c (destroy):
-	fixed a kludge.
-
-2005-01-12  JP Rosevear  <jpr@novell.com>
-
-	Fixes #65820
-	
-	* gui/weekday-picker.c (get_day_text): add translator comment
-
-2005-01-08  Not Zed  <NotZed@Ximian.com>
-
-	* gui/e-day-view.c (e_day_view_finish_resize): set
-	last_Edited_comp_string to NULL, not test it for null.
-
-2005-01-12  Harish Krishnaswamy  <kharish@novell.com>
-
-	* gui/dialogs/cal-attachment-bar.c:
-	(cal_attachment_bar_set_attachment_list):
-	reverting the offset 'hyphen' fix - not required anymore.	
-
-2005-01-10  Rodrigo Moya <rodrigo@novell.com>
-
-	* gui/e-day-view.c (e_day_view_on_editing_stopped): remove the
-	temporary object from the view when stopping editing.
-
-	* gui/e-week-view.c (e_week_view_on_editing_stopped): ditto.
-	
-2005-01-10  Harish Krishnaswamy  <kharish@novell.com>
-
-	* gui/dialogs/cal-attachment-bar.c:
-	(cal_attachment_bar_set_attachment_list):
-	offset the file name to account for the 'hyphen'.
-
-2005-01-10  Chenthill Palanisamy <pchenthill@novell.com>
-
-	* gui/dialogs/event-page.glade
-	* gui/dialogs/task-page.glade: Showed the send options
-	button and label. Hided the Send options Frame.
-
-2005-01-10  Harish Krishnaswamy  <kharish@novell.com>
-
-	* gui/dialogs/cal-attachment-bar.[ch]: (destroy), (init),
-	(cal_attachment_bar_set_local_attachment_store),
-	(cal_attachment_bar_get_attachment_list),
-	(cal_attachment_bar_get_nth_attachment_filename),
-	(cal_attachment_bar_set_attachment_list):
-	Modified cal-attachment-bar to allow the path to 
-	the local attachment store be set externally, thereby
-	hiding the storage policy of different backends from it.
-	* gui/dialogs/comp-editor.c: (real_edit_comp):
-	set the local attachment store after obtaining it from 
-	the calendar.
-
-2005-01-09  JP Rosevear  <jpr@novell.com>
-
-	* gui/calendar-component.c (impl_handleURI): handle calendar://
-	uris
-
-2005-01-07  JP Rosevear  <jpr@novell.com>
-
-	* gui/dialogs/event-editor.c (event_editor_edit_comp): clear the
-	attendees, somehow I remove this in an earlier commit
-
-2005-01-07  Rodrigo Moya <rodrigo@novell.com>
-
-	* gui/dialogs/event-page.glade:
-	* gui/dialogs/task-page.glade: put a name to the 'Send options' frame.
-
-	* gui/dialogs/event-page.c (event_page_init): initialize reference to
-	the 'Send options' frame.
-	(get_widgets): get the 'Send options' frame from the .glade file.
-	(event_page_hide_options): just hide the frame.
-	(event_page_show_options): just show the frame.
-
-	* gui/dialogs/task-page.c (task_page_init): initialize reference to the
-	'Send options' frame.
-	(get_widgets): get the 'Send options' frame from the .glade file.
-	(task_page_hide_options): just hide the frame.
-	(task_page_show_options): just show the frame.
-
-2005-01-06  David Trowbridge  <trowbrds@cs.colorado.edu>
-
-	* gui/e-cal-event[hc]: initial import of ECalEvent targets
-
-	* gui/migration.c (migrate_calendars): add component.migration event
-
-2005-01-06  JP Rosevear  <jpr@novell.com>
-
-	* gui/Makefile.am: install schemas properly
-
-2005-01-06  Chenthill Palanisamy <pchenthill@novell.com>
-	
-	merging send options
-	* gui/dialogs/Makefile.am: Added two new files for send options.
-	* gui/dialogs/e-send-options-utils.{ch}:
-	(e_sendoptions_utils_set_default_data),
-	(e_sendoptions_utils_fill_component): For setting and gettings the 
-	send options.
-	* gui/dialogs/event-editor.c (event_editor_construct): Check for the static
-	capabilities before showing send options.
-	* gui/dialogs/event-page.c: (event_page_show_options),
-	(event_page_fill_component), (e_sendoptions_clicked_cb):
-	* gui/dialogs/event-page.glade:
-	* gui/dialogs/event-page.h: Added function to show/hide the send options button
-	and label and run the send options dialog. 
-	* gui/dialogs/task-editor.c: (task_editor_construct),
-	(task_editor_edit_comp):
-	* gui/dialogs/task-page.c: (task_page_init), (task_page_finalize),
-	(sensitize_widgets), (task_page_hide_options),
-	(task_page_show_options), (task_page_fill_widgets),
-	(task_page_fill_component), (get_widgets), (source_changed_cb),
-	(e_sendoptions_clicked_cb), (init_widgets): Same as event-page.
-	* gui/dialogs/task-page.glade: Added the send options button
-	* gui/dialogs/task-page.h: Added functions hiding and showing send
-	options button
-
-2005-01-05  Rodrigo Moya <rodrigo@novell.com>
-
-	* gui/e-day-view.c (e_day_view_find_event_from_uid): added a new
-	argument to pass the calendar client, since it might happen to have
-	events with the same UID on different calendars.
-	(e_day_view_do_key_press, model_rows_deleted_cb): added new argument
-	to e_day_view_find_event_from_uid.
-
-	* gui/e-week-view.c (e_week_view_find_event_from_uid): same as
-	e-day-view.c.
-	(e_week_view_do_key_press, model_rows_deleted_cb): added new argument
-	to e_week_view_find_event_from_uid.
-
-2005-01-04  Rodrigo Moya <rodrigo@novell.com>
-
-	* gui/e-cal-component-preview.c (write_html): use the new e-categories
-	API in e-d-s.
-
-2005-01-04  Rodrigo Moya <rodrigo@novell.com>
-
-	* gui/e-week-view.c (model_rows_deleted_cb): search our internal data
-	for the correct event.
-
-2005-01-04  Harry Lu  <harry.lu@sun.com>
-
-	* gui/calendar-component.c: (create_component_view): add a11y name 
-	to calendar sidebar selector.
-	* gui/tasks-component.c: (create_component_view): add a11y name 
-	to task sidebar selector.
-
-2005-01-03  JP Rosevear  <jpr@novell.com>
-
-	Fixes #69663
-	
-	* gui/e-cal-model-tasks.c (is_complete): look at the percent
-	complete and status properties as well for completeness clues
-
-2005-01-03  Rodrigo Moya <rodrigo@novell.com>
-
-	* gui/e-cal-model.c (e_cal_model_set_time_range): redo the queries
-	after emitting the 'time_range_changed' signal, since now the
-	views will only update their internal data but not redraw the
-	events on that signal.
-
-	* gui/e-day-view.c (model_changed_cb): removed, no longer needed.
-	(e_day_view_recalc_day_starts): no need to call e_day_view_update_query.
-	(e_day_view_init): no need to connect to 'model_changed' signal
-	on the model, we already connect to the row/cell_changed ones.
-
-	* gui/e-week-view.c (time_range_changed_cb): no need to call
-	e_week_view_update_query.
-	(model_changed_cb): removed, no longer needed.
-	(e_week_view_init): no need to connect to 'model_changed' signal
-	on the model, we already connect to the row/cell_changed ones.
-
-2004-12-31  JP Rosevear  <jpr@novell.com>
-
-	* gui/dialogs/schedule-page.c: add necessary include
-
-	* gui/dialogs/meeting-page.c (sensitize_widgets): kill warning
-
-	* gui/dialogs/cal-prefs-dialog.c (template_url_changed): kill warning
-
-	* gui/dialogs/alarm-dialog.c (malarm_widgets_to_alarm): kill warnings
-	(init_widgets): ditto
-
-	* gui/main.c (initialize): no need to init the config system now
-
-	* gui/e-cell-date-edit-config.h: include date edit text header
-
-	* gui/e-cal-config.c (ecp_target_free): kill warning
-
-	* gui/calendar-config.c: clean up includes, internally initialize
-	the config setup to make it easier for others; kill dead functions
-
-2004-12-26  Rodrigo Moya <rodrigo@novell.com>
-
-	* gui/e-cal-model.c (search_by_uid_and_client): removed superfluous if
-	check.
-	(e_cal_view_objects_modified_cb): add all objects at once.
-
-	* gui/e-day-view.c (e_day_view_remove_event_cb): set fields we
-	free to NULL.
-
-2004-12-24  Harish Krishnaswamy <kharish@novell.com>
-
-	* gui/dialogs/event-editor.c (event_editor_edit_comp):
-	Check for the existence of the meet/sched pages before
-	attempting to remove them.
-
-2004-12-23  Chenthill Palanisamy <pchenthill@novell.com>
-
-	Part of merge from offline branch 
-	
-	* gui/dialogs/calendar-setup.c
-	(eccp_general_offline): function to add the check box for
-	folder offline settings.
-	(offline_status_changed_cb): call back function for the same.
-	(ECalConfigItem eccp_items[]), (ECalConfigItem ectp_items[]):
-	 Added the check box function call in both the structures.
-	
-2004-12-23  Rodrigo Moya <rodrigo@novell.com>
-
-	* gui/e-cal-model.c (set_instance_times): get instance times using
-	the correct timezone.
-	(redo_queries): emit signals before clearing the array.
-
-	* gui/e-day-view.c (process_component):
-	* gui/e-week-view.c (process_component): no need to try to update,
-	always add.
-
-2004-12-23  Hans Petter Jansson  <hpj@novell.com>
-
-	* gui/e-select-names-editable.c: Correct bad include.
-
-	* gui/dialogs/Makefile.am (IDL_GENERATED_H)
-	(IDL_GENERATED)
-	(BUILT_SOURCES): No longer needed, removed.
-
-2004-12-22  Hans Petter Jansson  <hpj@novell.com>
-
-	* gui/Makefile.am (IDLS)
-	(SELECT_NAMES_IDL_GENERATED_H)
-	(SELECT_NAMES_IDL_GENERATED_C)
-	(SELECT_NAMES_IDL_GENERATED)
-	(IDL_GENERATED): Remove the addressbook IDL.
-
-	* gui/e-meeting-list-view.c (e_meeting_list_finalize)
-	(add_section)
-	(e_meeting_list_view_init)
-	(process_section)
-	(name_selector_dialog_close_cb)
-	(get_select_name_dialog): Adapt to new ENameSelector.
-
-	* gui/e-select-names-editable.c (esne_start_editing)
-	(esne_finalize)
-	(esne_init)
-	(e_select_names_editable_get_type)
-	(entry_activate)
-	(e_select_names_editable_construct)
-	(e_select_names_editable_get_address)
-	(e_select_names_editable_get_name)
-	(e_select_names_editable_set_address): Adapt to new ENameSelector.
-
-	* gui/e-select-names-renderer.c (e_select_names_renderer_editing_done)
-	(e_select_names_renderer_activated)
-	(e_select_names_renderer_start_editing): Adapt to new ENameSelector.
-
-	* gui/dialogs/alarm-dialog.c (malarm_widgets_to_alarm)
-	(addressbook_clicked_cb)
-	(addressbook_response_cb)
-	(setup_select_names)
-	(check_custom_email)
-	(malarm_addresses_changed_cb): Adapt to new ENameSelector.
-
-	* gui/dialogs/e-delegate-dialog.c (e_delegate_dialog_finalize)
-	(e_delegate_dialog_construct)
-	(addressbook_clicked_cb)
-	(addressbook_response_cb)
-	(e_delegate_dialog_get_delegate)
-	(e_delegate_dialog_get_delegate_name): Adapt to new ENameSelector.
-	
-2004-12-22  JP Rosevear  <jpr@novell.com>
-
-	* gui/e-meeting-store.c (freebusy_async): prevent compare against
-	null default_fb_uri and fix thinko
-
-2004-12-22  JP Rosevear  <jpr@novell.com>
-	
-	* gui/e-cal-model.c: Change copyright from ximian to novell
-
-2004-12-17  Not Zed  <NotZed@Ximian.com>
-
-	* gui/e-calendar-table.c (e_calendar_table_show_popup_menu): 
-
-	* gui/tasks-component.c (popup_event_cb): 
-
-	* gui/gnome-cal.c (gnome_calendar_view_popup_factory): 
-
-	* gui/e-calendar-view.c (e_calendar_view_create_popup_menu): 
-
-	* gui/alarm-notify/alarm-queue.c (tray_icon_clicked_cb): 
-
-	* gui/dialogs/meeting-page.c (button_press_event): 
-
-	* gui/calendar-component.c (popup_event_cb): 
-
-2004-12-22  JP Rosevear  <jpr@novell.com>
-
-	Fixes #61077
-	
-	* gui/dialogs/task-details-page.glade: remove extraneous tab
-
-	* gui/dialogs/alarm-dialog.c: ditto
-	
-2004-12-22  JP Rosevear  <jpr@novell.com>
-	
-	Fixes #61076
-	
-	* gui/comp-editor-factory.c (open_client): don't translate command
-	line warnings
-
-	* gui/calendar-offline-handler.c (backend_go_online): ditto
-	(backend_go_offline): ditto
-	
-2004-12-21  JP Rosevear  <jpr@novell.com>
-
-	Fixes #41624
-	
-	* conduits/calendar/calendar-conduit.c (local_record_from_comp):
-	append the exceptions, don't keep overwriting the first
-
-2004-12-21  Rodrigo Moya <rodrigo@novell.com>
-
-	* gui/e-cal-model.c (set_instance_times): no need to convert times now.
-	(add_instance_cb): no need to convert here.
-
-2004-12-21  Rodrigo Moya <rodrigo@novell.com>
-
-	Merge from recurrences-work-branch
-
-	* gui/e-cal-model.c (free_comp_data): renamed to
-	e_cal_model_free_component_data and made it public.
-	(clear_objects_array, e_cal_view_objects_removed_cb,
-	remove_client_objects): use e_cal_model_free_component_data.
-	(get_dtstart): get the DTSTART correctly for recurrences.
-	(add_instance_cb): initialize all members of ECalModelComponent, and
-	use the correct icalcomponent when setting the field.
-	(set_instance_times): new function to set the instance_* fields of
-	the ECalModelComponent when not expanding recurrences.
-	(e_cal_view_objects_added_cb): expand recurrences for all objects when
-	the model is set to expand. Call set_instance_times when not
-	expanding recurrences.
-	(e_cal_view_objects_modified_cb): made it remove objects and re-add
-	them.
-	(copy_ecdv): check values before using them.
-	(e_cal_model_copy_component_data): Added code to copy the instance_* and
-	color fields.
-
-	* gui/e-cal-model-calendar.c (get_dtend): get the DTEND correctly for
-	recurrences.
-	(ecmc_set_value_at): ask user which instances to modify.
-
-	* gui/e-day-view.c (e_day_view_find_event_from_uid): changed to search
-	by UID and RID if given.
-	(process_component): changed to not expand recurrences at all, this is
-	now done on the model.
-	(row_deleted_check_cb, remove_uid_cb): removed these functions.
-	(model_rows_deleted_cb): changed to just remove the rows signalled from
-	the model, which is the responsible for the recurrence expansion.
-	(e_day_view_new): set the model to expand recurrences.
-	(e_day_view_remove_event_cb): check the value searched in the array.
-	(e_day_view_do_key_press): use e_day_view_find_event_from_uid correctly.
-
-	* gui/e-week-view.c (e_week_view_find_event_from_uid): changed to search
-	by UID and RID if given.
-	(process_component_recur_cb): removed.
-	(process_component): changed to not expand recurrences at all, this is
-	now done on the model.
-	(row_deleted_check_cb, remove_uid_cb): removed these functions.
-	(model_rows_deleted_cb): changed to just remove the rows signalled from
-	the model, which is the responsible for the recurrence expansion.
-	(e_week_view_new): set the model to expand recurrences.
-	(e_week_view_remove_event_cb): check the value searched in the array.
-	Set the ECalModelComponent field to NULL after freeing it.
-	(e_week_view_do_key_press): use e_week_view_find_event_from_uid
-	correctly.
-
-	* gui/dialogs/recur-comp.c (recur_component_dialog): remove the
-	RECURRENCE-ID from the object when modifying all instances.
-
-2004-12-18  James Bowes  <bowes@cs.dal.ca>
-
-	* gui/apps_evolution_calendar.schemas.in.in: Add schema for Free/Busy
-	template uri.
-	* gui/calendar-config-keys.h:
-	* gui/calendar-config.c: (calendar_config_get_free_busy_template),
-	(calendar_config_set_free_busy_template),
-	(calendar_config_add_notification_free_busy_template):
-	* gui/calendar-config.h: Functions to get, set and monitor the 
-	Free/Busy template uri gconf setting.
-	* gui/dialogs/cal-prefs-dialog.c: (template_url_changed),
-	(setup_changes), (get_widgets), (show_fb_config):
-	* gui/dialogs/cal-prefs-dialog.glade:
-	* gui/dialogs/cal-prefs-dialog.h: Change 'Free/Busy Publish' tab to
-	'Free/Busy'. Add an entry for setting the default Free/Busy uri. 
-	Only change the gconf setting on 'focus out' event
-	* gui/e-meeting-store.c: (refresh_queue_remove): Check the hash using
-	the attendee's mailto: address, rather than the memory address of the 
-	attendee object as the key.
-	(e_meeting_store_get_fb_uri), (e_meeting_store_set_fb_uri): Get and set
-	the EMeetingStore's Free/Busy template string.
-	(process_callbacks_main_thread), (process_callbacks): Process callbacks
-	in the main thread, so that widgets can be redrawn properly.
-	(replace_string): Utility function for replacing wildcards in the
-	default Free/Busy uri.
-	(ems_finalize),	(ems_init), (freebusy_async), (refresh_busy_periods), 
-	(refresh_queue_add), (e_meeting_store_refresh_busy_periods): Add the 
-	ability to check for Free/Busy information from a default location, 
-	if all else fails.
-	(start_async_read): Use gnome-vfs to read the Free/Busy information.
-	* gui/e-meeting-store.h: Add function prototypes for get and set fb_uri
-	* gui/e-meeting-time-sel.c: (e_meeting_time_selector_init),
-	(e_meeting_time_selector_destroy), (free_busy_timeout_refresh), 
-	(free_busy_template_changed_cb): Watch for a change in the Free/Busy 
-	template gconf setting, and check for new Free/Busy data if it occurs.
-	* gui/e-meeting-time-sel.h: Include variable for notification function
-	id on changes to the Free/Busy uri in the EMeetingTimeSelector .
- 
-2004-12-17  Rodney Dawes  <dobey@novell.com>
-
-	* gui/alarm-notify/alarm-notify-dialog.c (an_minutes_update_label):
-	Add callback function for doing ngettext on the "minutes" label
-	(alarm_notify_dialog): Get the "minutes" label from the glade file
-	and set the callback for its "value_changed" signal
-
-	Fixes #47535
-
-2004-12-13  Harish Krishnaswamy <kharish@novell.com>
-
-	* gui/dialogs/calendar-setup.c : Correct some white space 
-	ugliness in the previous commit.
-
-2004-12-13  Vivek Jain <jvivek@novell.com>
-
-	* gui/dialogs/calendar-setup.c : Changed the window title based upon
-	the source.
-
-2003-12-09  Rodrigo Moya <rodrigo@novell.com>
-
-	* gui/e-calendar-view.c (on_unrecur_appointment): keep a local copy
-	of the ECal.
-
-2004-12-08  Hans Petter Jansson  <hpj@novell.com>
-
-	* gui/e-meeting-list-view.c
-	* gui/e-select-names-editable.c
-	* gui/dialogs/alarm-dialog.c
-	* gui/dialogs/e-delegate-dialog.c: Include <libebook/e-destination.h>
-	from evolution-data-server.
-
-2004-12-08  Harish Krishnaswamy <kharish@novell.com>
-	
-	* gui/e-week.c (time_range_changed_cb, e_week_view_set_first_day_shown):
-	update the query so currently held events can be cleared off.
-
-2004-12-08  David Mosberger <davidm@napali.hpl.hp.com>
-
-	* gui/main.c: include plugin headers to fix 64 bit problems.
-
-2004-12-06  Rodrigo Moya <rodrigo@novell.com>
-
-	Fixes #67403
-
-	* gui/dialogs/event-page.c (sensitize_widgets): don't unsensitize
-	the 'Customize' button, to allow users to look at the alarm list
-	for read only events.
-
-	* gui/dialogs/alarm-list-dialog.c (sensitize_buttons): unsensitize
-	buttons if the event is read only.
-
-2004-12-02  Chenthill Palanisamy  <pchenthill@novell.com>
-
-	* gui/dialogs/task-editor.[ch] (task_editor_new), (task_editor_construct),
-	(show_assignment):
-	Add a boolean variable to denote assigned task and construct the 
-	meeting page only for the assigned task. Set it as a group item
-	in component editor.
-	(_TaskEditorPrivate): added the boolean variable (is_assigned).
-	(task_editor_init): initialized the variable.
-	* gui/dialogs/comp-editor.[ch]: Added functions to set and get whether comp
-	 is a group item or individual item.
-	* gui/comp-editor.c (make_title_from_string), (make_title_from_comp):
-	Set the Title for the appointment editor window as "Meeting" or "Assigned
-	Task" if its a group calendar/task item.
-	(_CompEditorPrivate): added a boolean variable (is_group_item).
-	(comp_editor_init): initialized the same.
-	* gui/dialogs/event-editor.c (event_editor_construct), (show_meeting): Set whether
-	the component is a group item or not in comp editor.
-	* gui/e-calendar-table.c (e_calendar_table_open_task), (e_calendar_table_open_selected),
-	(open_task_by_row): Check whether the component being opened is an assigned task by
-	checking for attendees and call open_task with proper value for boolean variable assign.
-	* gui/comp-editor-factory.c (edit_existing):
-	* gui/e-calendar-table.c (open_task):
-	* gui/e-tasks.c (e_tasks_new_task):
-	* gui/gnome-cal.c (gnome_calendar_new_task):
-	* gui/tasks-component.c (create_new_todo):
-	Called the function task_editor_new with a added argument.
-
-2004-12-02  Chenthill Palanisamy  <pchenthill@novell.com>
-
-	* gui/e-day-view.c (e_day_view_finish_resize), (e_day_view_reshape_day_event)
-       	(e_day_view_change_event_time): Free the string day_view->last_edited_comp_string
-	before changing assigning it another value.
-	* gui/e-week-view.c (e_week_view_change_event_time): Free the string
-	week_view->last_edited_comp_string for the same reason above.
-	
-2004-11-29  Chenthill Palanisamy  <pchenthill@novell.com>
-
-	* calendar-errors.xml.h: committng this file. Missed to
-	commit this one.
-
-2004-11-29  Chenthill Palanisamy  <pchenthill@novell.com>
-	
-	* gui/dialogs/comp-editor.c (response_cb): Moved the call
-	for the warning dialog (send_component_prompt_subject) after 
-	the component is saved (save_comp_with_send). 
-	
-2004-11-26  JP Rosevear  <jpr@novell.com>
-
-	* gui/alarm-notify/alarm-queue.c (display_notification): ditto
-
-	* gui/e-timezone-entry.c (e_timezone_entry_init): get the image
-	directly from the icon factory
-
-2004-11-26  JP Rosevear  <jpr@novell.com>
-	
-	* gui/alarm-notify/alarm-queue.c (display_notification): prevent
-	crash if there is no description
-
-2004-11-25  Harish Krishnaswamy  <kharish@novell.com>
-
-	* gui/calendar-component.c: 
-	(new_calendar_cb), (edit_calendar_cb): Use modified_setup_edit_calendar call.
-	(popup_event_cb): If source is null (Rt click on a source group), show the new 
-	calendar popup menu item. Else, do not show the new calendar option. 
-	* gui/dialogs/calendar-setup.[ch] (eccp_get_source_type): Compare the
-	source_groups by their uid and not the pointers, so that the correct option
-	is activated on the combo box.
-	(calendar_setup_edit_calendar) : add a source_group parameter to the function.
-	(calendar_setup_new_calendar): Use modified signature of the above function.
-	* gui/e-calendar-view.c (on_edit_appointment): check the icalcomponent
-	to see if it is a meeting and set the argument to e_calendar_view_edit_appointment
-	correctly.
-
-2004-11-25  Chenthill Palanisamy  <pchenthill@novell.com>
-		
-	* gui/dialogs/event-deitor.c (show_meeting): removed the
-	call for comp_editor_show_page, so that the event page
-	shows up at first instead of meeting page when a meeting
-	is opened.
-
-2004-11-25  Chenthill Palanisamy  <pchenthill@novell.com>
-
-	* calendar-errors.xml: Added two error ids to display use
-	it when the meeting is created without a summary.
-	* gui/dialogs/send-comp.[ch] (send_component_prompt_subject): Added a 
-	function to prompt for a dialog when a meeting/assigned task is sent 
-	without a summary.
-	* gui/dialogs/comp-editor.c (response_cb): Called the above mentioned
-	function when the summary is not present.
-	
-2004-11-23  Rodney Dawes  <dobey@novell.com>
-
-	* gui/alarm-notify/alarm-notify-dialog.[ch]:
-	Add gtkimage.h to includes, and remove gtkhtml headers
-	Add and remove some widgets in the AlarmNotify struct
-	(dialog_destroy_cb, delete_event_cb, close_clicked_cb):
-	(snooze_clicked_cb, edit_clicked_cb, url_requested_cb):
-	(make_html_display, write_times, write_html_heading):
-	(alarm_notify_dialog_disable_buttons): 
-	Remove all these unneeded functions (no more GtkHTML in the dialog)
-	(alarm_notify_dialog): Add description and location arguments
-	Rename message argument to summary
-	Update gtk-doc comment block to reflect API changes
-	Clean up code to use gtk_dialog_run () and use a HIG compliant dialog
-
-	* gui/alarm-notify/alarm-notify.glade: Update the alarm notify
-	dialog to be HIG compliant and not use GtkHTML, and display more
-	information that is relevant to the appointment we are alerting of
-
-	* gui/alarm-notify/alarm-queue.c: Add new variables to the
-	TrayIconData structure so we can access the description and location
-	(on_dialog_objs_removed_cb): Remove alarm_dialog bits
-	(notify_dialog_cb): Remove alarm_dialog bits
-	(tray_icon_destroyed_cb): Free the description and location as well
-	(open_alarm_dialog): alarm_notify_dialog does all the work now, we
-	don't need to trap the dialog widget here
-	(display_notification): Add code to get the description and location
-	information from the cal component
-	Avoid using an alarm component which has less useful API
-	Fix a warning when creating the tray_icon widget
-	
-2004-11-15  Not Zed  <NotZed@Ximian.com>
-
-	* gui/dialogs/Makefile.am (libcal_dialogs_la_LIBADD): add
-	libeabutil, since we use e-destination.
-
-2004-11-08  Rodney Dawes  <dobey@novell.com>
-
-	* gui/alarm-notify/alarm-notify-dialog.c (write_html_heading):
-	Don't try to convert the results of timet_to_str_with_zone to UTF-8,
-	since the return value is already encoded in UTF-8
-
-	Fixes #47529
-
-2004-11-04  Rodrigo Moya <rodrigo@novell.com>
-
-	* gui/dialogs/event-page.glade:
-	* gui/dialogs/task-page.glade: expand the horizontal box so that it
-	fills all available space.
-
-2004-11-03  David Trowbridge  <trowbrds@cs.colorado.edu>
-
-	* gui/e-cal-config.c: added EConfig subclass for calendars
-	* gui/calendar-component.c, gui/tasks-component.c: initialize
-	  plugin hooks on component startup.
-	* gui/dialogs/calendar-setup.c: Converted to use EConfig
-
-2004-11-04  Li Yuan  <li.yuan@sun.com>
-
-	Fixes #6767
-
-	* gui/e-day-view-main-item.c:
-	(e_day_view_main_item_draw_day_event):
-	use widget->style instead of hard code colors.
-	* gui/e-day-view.c: (e_day_view_realize), (e_day_view_set_colors),
-	(e_day_view_style_set), (e_day_view_reshape_long_event),
-	(e_day_view_reshape_day_event):
-	ditto.
-	* gui/e-week-view.c: (e_week_view_realize),
-	(e_week_view_set_colors), (e_week_view_style_set),
-	(e_week_view_reshape_event_span):
-	ditto.
-
-2004-11-02  JP Rosevear  <jpr@novell.com>
-
-	* gui/e-day-view-config.c (set_twentyfour_hour): make sure the day
-	view times redraw themselves if we switch 24/12 hour modes
-
-2004-11-02  JP Rosevear  <jpr@novell.com>
-	
-	Fixes #68707
-	
-	* gui/e-week-view-event-item.c (e_week_view_event_item_draw):
-	restrict the range to 0-23 (midnight end times became '24')
-
-2004-10-28  Not Zed  <NotZed@Ximian.com>
-
-	* gui/tasks-component.c (popup_event_cb): 
-	* gui/e-calendar-view.c (e_calendar_view_create_popup_menu): 
-	* gui/e-calendar-table.c (e_calendar_table_show_popup_menu):
-	* gui/calendar-component.c (popup_event_cb): added hook doco.
-
-2004-10-27  Rodrigo Moya <rodrigo@novell.com>
-
-	* gui/e-cal-list-view.c (e_cal_list_view_new): don't expand recurrences
-	for the list view.
-
-2004-10-21  Harish Krishnaswamy  <kharish@novell.com>
-
-	* gui/e-cal-popup.[ch]: (e_cal_popup_target_new_source):
-	Add status bits to denote if the calendar source is available offline
-	so that plugins to calendar popups can use the status qualifier to denote 
-	their visibility preferences.
-
-2004-10-21  Rodrigo Moya <rodrigo@novell.com>
-
-	* gui/dialogs/select-source-dialog.c: use the new source selector
-	dialog in libedataserverui.
-
-2004-10-20  JP Rosevear  <jpr@novell.com>
-
-	* gui/calendar-component.c: put an icon on the properties menu item
-
-	* gui/tasks-component.c: ditto
-	
-	* gui/main.c (initialize): register plugin hooks for tasks and
-	calendar
-
-2004-10-20  JP Rosevear  <jpr@novell.com>
-	
-	* gui/e-cal-popup.c (ecalph_class_init): correct classid
-
-2004-10-19  JP Rosevear  <jpr@novell.com>
-
-	* gui/calendar-component.c, gui/e-cal-menu.c, gui/e-cal-popup.c,
-	gui/e-calendar-table.c, gui/e-calendar-view.c, gui/gnome-cal.c,
-	gui/tasks-component.c, gui/alarm-notify/alarm-queue.c,
-	gui/dialogs/meeting-page.c: convert to org.gnome hook names
-
-2004-10-19  Harish Krishnaswamy  <kharish@novell.com>
-
-	* gui/comp-editor-factory.c: (edit_existing):
-	Use e_cal_component_has_attendees to test if it is a meeting.
-	* gui/dialogs/event-editor.c: (event_editor_init):
-	By default, the event is not a meeting.
-	(event_editor_construct): Do not add the invitation, scheduling pages
-	to the editor if it is not a meeting. 
-	* gui/e-day-view.c: (e_day_view_on_event_double_click):
-	check the icalproperty to test if the event is a meeting.
-	
-2004-10-19  JP Rosevear  <jpr@novell.com>
-
-	* gui/gnome-cal.c (connect_list_view_focus): listen to the canvas
-	for focus events
-	(setup_widgets): listen for listen view selection changes
-
-	* gui/e-cal-list-view.c (setup_e_table): listen for the cursor to
-	move
-	(e_cal_list_view_cursor_change_cb): indicate the selection changed
-
-2004-10-19  Harish Krishnaswamy  <kharish@novell.com>
-
-	* gui/calendar-component.c (create_new_event):
-	* gui/e-calendar-view.c: (e_calendar_view_edit_appointment):
-	* gui/comp-editor-factory.c (edit_existing), (edit_new):
-	* gui/dialogs/event-editor.c (event_editor_edit_comp),
-	 (event_editor_new): updated the calls to event_editor_new 
-	with additional argument.
-	* gui/dialogs/event-editor.h: add parameter is_meeting to
-	distinguish between events and  meetings.
-	* gui/dialogs/meeting-page.c: (sensitize_widgets):
-	use explicit GError variable so that BUSY_ERROR
-	conditions do not lead us to think the calendar is readonly.
-	* gui/e-meeting-store.c: (refresh_queue_remove), (ems_init),
-	(e_meeting_store_remove_attendee), (freebusy_async),
-	(refresh_busy_periods), (refresh_queue_add): Make free-busy calls 
-	to backends async. Fixed the problem of spurious attendees getting 
-	added to the refresh_data.
-	
-2004-10-14  Not Zed  <NotZed@Ximian.com>
-
-	* gui/e-cal-menu.c (e_cal_menu_target_new_select): dont access a
-	NULL client.
-
-	* gui/gnome-cal.c (gnome_calendar_get_taskpad_menu)
-	(gnome_calendar_get_calendar_menu): accessors to get the menu
-	managers.
-	(gnome_calendar_init): setup menu managers.
-
-2004-10-13  Not Zed  <NotZed@Ximian.com>
-
-	* gui/calendar-commands.c (calendar_control_activate)
-	(calendar_control_deactivate): activate and deactivate the
-	calendar and taskpad menu handlers.
-	(sensitize_items): helper to sensitise items based on target
-	masks.
-	(calendar_control_sensitize_calendar_commands): update the
-	calendar menu manager target appropriately.
-	(sensitize_taskpad_commands): same for the taskpad.
-
-	* gui/e-cal-menu.[ch]: Targets for main menu management.
-
-	* gui/e-cal-popup.c (e_cal_popup_target_new_select): fix cast.
-	Also include the tasks stuff in the hook metadata.
-
-2004-10-15  JP Rosevear  <jpr@novell.com>
-
-	* gui/calendar-commands.c (calendar_control_activate): remove
-	useless ifdef'd out statement (its been unused for 3+ years)
-	
-2004-10-15  JP Rosevear  <jpr@novell.com>
-	
-	* gui/calendar-commands.h (calendar_goto_today): remove prototype
-
-	* gui/calendar-commands.c: remove dead function
-
-2004-10-14  JP Rosevear  <jpr@novell.com>
-
-	* gui/e-meeting-attendee.c: convert to G_DEFINE_TYPE
-
-	* gui/e-meeting-list-view.c: ditto
-
-	* gui/e-meeting-time-sel.c: ditto
-
-	* gui/e-meeting-time-sel-item.c: ditto
-
-	* gui/e-select-names-renderer.c: ditto
-
-	* gui/e-timezone-entry.c: ditto
-
-	* gui/e-tasks.c: ditto
-
-	* gui/gnome-cal.c: ditto
-
-	* gui/weekday-picker.c: ditto
-
-2004-10-14  JP Rosevear  <jpr@novell.com>
-	
-	* gui/e-cell-date-edit-config.c: convert to G_DEFINE_TYPE
-
-	* gui/e-cell-date-edit-text.c: ditto
-
-	* gui/e-comp-editor-registry.c: ditto
-
-	* gui/e-date-edit-config.c: ditto
-
-	* gui/e-mini-calendar-config.c: ditto
-
-2004-10-14  JP Rosevear  <jpr@novell.com>
-	
-	* gui/e-cal-list-view-config.c: convert to G_DEFINE_TYPE
-
-	* gui/e-cal-list-view.c: ditto
-
-	* gui/e-cal-model-calendar.c: ditto
-
-	* gui/e-cal-model-tasks.c: ditto
-
-	* gui/e-cal-model.c: ditto
-
-	* gui/e-calendar-table-config.c: ditto
-
-	* gui/e-calendar-table.c: ditto
-
-	* gui/e-calendar-view.c: ditto
-
-2004-10-14  JP Rosevear  <jpr@novell.com>
-	
-	* gui/calendar-view.c: convert to G_DEFINE_TYPE
-
-	* gui/calendar-view-factory.c: ditto
-
-	* gui/cal-search-bar.c: ditto
-
-	* gui/e-cal-component-preview.c: ditto
-
-2004-10-14  JP Rosevear  <jpr@novell.com>
-	
-	* gui/e-week-view-config.c: convert to G_DEFINE_TYPE
-
-	* gui/e-week-view-event-item.c: ditto
-
-	* gui/e-week-view-main-item.c: ditto
-
-	* gui/e-week-view-titles-item.c: ditto
-
-	* gui/e-week-view.c: ditto
-
-2004-10-14  JP Rosevear  <jpr@novell.com>
-	
-	* gui/e-day-view.c: convert to G_DEFINE_TYPE
-	
-	* gui/e-day-view-config.c: ditto
-
-	* gui/e-day-view-main-item.c: ditto
-
-	* gui/e-day-view-time-item.c: ditto
-
-	* gui/e-day-view-top-item.c: ditto
-
-2004-10-14  JP Rosevear  <jpr@novell.com>
-	
-	* gui/dialogs/comp-editor.c: convert to G_DEFINE_TYPE
-	
-	* gui/dialogs/meeting-page.c: ditto
-
-	* gui/dialogs/recurrence-page.c: ditto
-
-	* gui/dialogs/schedule-page.c: ditto
-
-	* gui/dialogs/e-delegate-dialog.c: ditto
-
-	* gui/dialogs/event-editor.c: ditto
-
-	* gui/dialogs/task-editor.c: ditto
-
-	* gui/dialogs/task-details-page.c: ditto
-
-	* gui/dialogs/select-source-dialog.c
-	(primary_selection_changed_cb): fix warning
-	
-2004-10-13  JP Rosevear  <jpr@novell.com>
-
-	* gui/dialogs/task-page.c: ditto
-
-	* gui/calendar-component.h: remove e-source-selector include
-
-	* gui/tasks-component.h: ditto
-	
-	* gui/calendar-component.c: update include to libedataserverui for
-	source selector and option menus
-	
-	* gui/e-cal-popup.c: ditto
-
-	* gui/dialogs/url-editor-dialog.h: ditto
-
-	* gui/dialogs/select-source-dialog.c: ditto
-
-	* gui/tasks-component.c: ditto
-
-	* importers/icalendar-importer.c: ditto
-	
-	* gui/e-itip-control.c: ditto; use G_DEFINE_TYPE instead of
-	E_MAKE_TYPE
-	
-	* gui/dialogs/event-page.c: ditto	
-
-	* gui/dialogs/task-page.c: ditto
-	
-2004-10-12  Li Yuan  <li.yuan@sun.com>
-
-	* gui/e-day-view.c: (e_day_view_on_main_canvas_button_press):
-	* gui/e-week-view.c: (e_week_view_on_button_press):
-	If main_canvas has focus, do not grub it. Emit the 
-	selected_time_changed signal after the selection day changed.
-
-2004-10-12  Not Zed  <NotZed@Ximian.com>
-
-	* gui/dialogs/meeting-page.c (button_press_event): convert menu to
-	epopup.
-
-2004-10-12  Not Zed  <NotZed@Ximian.com>
-
-	* gui/e-calendar-table.c (setup_popup_icons): removed.
-	(e_calendar_table_show_popup_menu): convert to use e-popup for
-	pluggable popup menu.
-	(e_calendar_table_on_open_task, e_calendar_table_on_save_as)
-	(e_calendar_table_on_print_task, e_calendar_table_on_cut)
-	(e_calendar_table_on_copy, e_calendar_table_on_paste)
-	(e_calendar_table_on_assign, e_calendar_table_on_forward)
-	(delete_cb):
-	(mark_as_complete_cb, open_url_cb): convert to epopup callbacks.
-	Moved all of the callbacks above the table rather than maintaining
-	forward declarations for some of them.
-
-	* gui/e-cal-popup.c (e_cal_popup_target_new_select): add the task
-	required masks, and make one vs many mutally exclusive.
-
-	* gui/e-calendar-view.c (e_calendar_view_create_popup_menu):
-	copy/setup the event list here.
-
-	* gui/e-cal-popup.c (e_cal_popup_target_new_select): take model +
-	events rather than the calendar view.
-
-2004-10-12  Li Yuan  <li.yuan@sun.com>
-
-	* gui/calendar-commands.c:
-	(calendar_get_text_for_folder_bar_label):
-	When the start year and the end year are the same, the num should
-	be displayed in start time.
-	* gui/dialogs/alarm-dialog.glade:
-	Add names to comboxes in alarm-dialog page.
-	* gui/dialogs/cal-prefs-dialog.glade:
-	Add labbled_by relation for e_date_edit.
-	Add names to comboxes in general tab and display tab.
-	Add shortcut keys to start_of_day_label and end_of_day_label.
-	* gui/dialogs/event-page.c: (init_widgets):
-	Use the default text_buffer of gtk_text_view instead of
-	creating one.
-	* gui/dialogs/event-page.glade:
-	Add labbled_by relation for e_date_edit.
-	* gui/dialogs/meeting-page.glade:
-	Set an atk name for organizer widget.
-	* gui/dialogs/task-page.c: (init_widgets):
-	Use the default text_buffer of gtk_text_view instead of
-	creating one.
-	* gui/dialogs/task-page.glade:
-	Add labbled_by relation for e_date_edit.
-	Add a11y names to task description and categories.
-	* gui/e-alarm-list.c: (e_alarm_list_iter_n_children):
-	Remove the iter checker. The iter can't have a valid value at this time.
-	* gui/e-date-time-list.c: (e_date_time_list_iter_n_children):
-	Remove the iter checker. The iter can't have a valid value at this time.
-	* gui/e-meeting-time-sel.c: (e_meeting_time_selector_construct):
-	Add labbled_by relation for e_date_edit.
-	* gui/e-timezone-entry.c: (e_timezone_entry_class_init),
-	(e_timezone_entry_init), (e_timezone_entry_mnemonic_activate),
-	(e_timezone_entry_focus):
-	Add a focus handler for e-timezone-entry. Set an atk name for the
-	button.
-	* gui/e-week-view.c: (e_week_view_do_cursor_key_up),
-	(e_week_view_do_cursor_key_down), (e_week_view_do_cursor_key_left),
-	(e_week_view_do_cursor_key_right), (e_month_view_do_cursor_key_up),
-	(e_month_view_do_cursor_key_down),
-	(e_month_view_do_cursor_key_left),
-	(e_month_view_do_cursor_key_right):
-	Emit the selected_time_changed signal after the selection day changed.
-
-2004-10-11  Not Zed  <NotZed@Ximian.com>
-
-	* gui/alarm-notify/alarm-queue.c (tray_icon_clicked_cb): convert
-	to epopup.
-	(add_popup_menu_item): removed, now redundant.
-
-2004-10-08  Rodrigo Moya <rodrigo@novell.com>
-
-	Fixes #45951
-
-	* gui/dialogs/event-page.glade:
-	* gui/dialogs/task-page.glade: attach the description field correctly
-	to the table so that it scrolls correctly instead of making the dialog
-	bigger as you write.
-
-	* gui/dialogs/comp-editor.c (setup_widgets): no need to create an extra
-	GtkVBox, just use the GtkDialog's one.
-
-2004-10-07  JP Rosevear  <jpr@novell.com>
-
-	* gui/dialogs/cal-prefs-dialog.c: remove useless include
-
-	* gui/dialogs/url-editor-dialog.c: ditto
-	
-2004-10-07  JP Rosevear  <jpr@novell.com>
-	
-	* gui/print.c: guard config.h
-
-	* gui/tasks-control.c: guard config.h, remove useless include
-
-	* gui/migration.c: remove useless include
-
-	* gui/main.c: remove useless include
-
-	* gui/e-calendar-view.h: #define the type
-
-	* gui/calendar-offline-handler.c: remove useless include
-
-	* gui/calendar-config.c: tidy header
-
-2004-10-07  JP Rosevear  <jpr@novell.com>
-	
-	* gui/calendar-commands.c: guard config.h include, kill warning
-	and remove useless include
-
-2004-10-06  Rodrigo Moya <rodrigo@novell.com>
-
-	Fixes #65932
-
-	* common/authentication.c: keep a hash table of all the source lists.
-	(auth_new_cal_from_uri): do a search in the source list for the given
-	URI, and use that ESource if we find it. Also, keep the hash table of
-	source lists up to date.
-
-	* gui/comp-editor-factory.c (cal_opened_cb): don't assert on error
-	cases, just display an error dialog.
-
-2004-10-06  Not Zed  <NotZed@Ximian.com>
-
-	* gui/gnome-cal.c (gnome_calendar_setup_view_popup): rename to
-	view_popup_factory.  Make it build an epopup item list directly.
-	Can't re-use the galview cruft :-/
-	(gnome_calendar_discard_view_popup): no longer needed.
-	(gc_set_view, gc_save_custom_view, gc_define_views_response) 
-	(gc_define_views): implement the gal-view popup menu items.
-
-	* gui/gnome-cal.h:
-	* gui/e-week-view.h:
-	* gui/e-day-view.h:
-	* gui/e-cal-list-view.h: removed old e-popup-menu header.
-
-	* gui/e-calendar-view.c (setup_popup_icons): removed.
-	(e_calendar_view_create_popup_menu): converted to use e-popup.
-	(on_paste, on_copy, on_cut, on_delete_occurrence) 
-	(on_unrecur_appointment, on_delete_appointment, on_publish) 
-	(on_forward, on_meeting, on_move_to, on_copy_to, on_print_event) 
-	(on_save_as, on_print, on_edit_appointment, on_goto_today) 
-	(on_goto_date, on_new_task, on_new_meeting, on_new_event) 
-	(on_new_appointment): convert to use e-popup stuff.
-
-	* gui/tasks-component.c (popup_event_cb): e-popup api changes.
-
-	* gui/e-cal-popup.c (e_cal_popup_target_new_select): implement the
-	selection target.
-	(ecalp_target_free): and free it.
-
-	* gui/e-cal-model.h: Make the ECalModel struct non-anonymous so it
-	can be forward-declared.
-
-	* gui/calendar-component.c (popup_event_cb): e-popup api changes.
-
-2004-10-06  Rodrigo Moya <rodrigo@novell.com>
-
-	Revert fix for #60551
-
-	* gui/dialogs/task-page.c (task_page_fill_component): start date
-	can be after the due date, no need to compare.
-
-2004-10-02  Iv�n Frade <frade@asturlinux.org>
-
-	Fixes #48116
-
-	* gui/dialogs/task-details.page.c (task_details_page_fill_component):
-	Validation: completed date is not a future date.
-	
-2004-10-01  Not Zed  <NotZed@Ximian.com>
-
-	* gui/tasks-component.c (create_component_view): cast warning
-	away.
-	(create_component_view): connect to popup_event rather than
-	fill_popup_menu.
-
-	* gui/calendar-component.c (create_component_view): cast a warning
-	away.
-
-	* calendar-errors.xml: add prompt-delete-task-list.
-
-	* gui/tasks-component.c (fill_popup_menu_cb): renamed to
-	popup_event_cb, make use e-cal-popup.
-	(edit_task_list_cb, new_task_list_cb, delete_task_list_cb) 
-	(copy_task_list_cb): deja-vu.  update for api.
-	(add_popup_menu_item): killed. murdered. drawn and quatered.
-	(delete_task_list_cb): use e-error for the delete prompt.
-
-	* gui/calendar-component.c (create_component_view): hook onto
-	popup event instead of fill_popup_menu.
-
-	* calendar-errors.xml: added prompt-delete-calendar.
-
-	* gui/calendar-component.c (fill_popup_menu_cb): rename to
-	popup_event_cb, make use e-cal-popup.
-	(edit_calendar_cb, new_calendar_cb, delete_calendar_cb) 
-	(copy_calendar_cb): fix for api changes.
-	(add_popup_menu_item): removed.
-	(delete_calendar_cb): use e-error for the delete thing.
-
-	* gui/e-cal-popup.[ch]: calendar popup driver.
-
-2004-09-29  Rodrigo Moya <rodrigo@novell.com>
-
-	Fixes #64683
-
-	* gui/e-meeting-time-sel.c (e_meeting_time_selector_construct): create
-	a scrolled window for the attendees list, and synchronize it with the
-	scrolling in the F/B area.
-
-2004-09-28  Not Zed  <NotZed@Ximian.com>
-
-	** See bug #66736.
-
-	* gui/e-itip-control.c (e_itip_control_set_data): noop if we were
-	destroyed (priv == null).
-
-2004-09-28  JP Rosevear  <jpr@novell.com>
- 
- 	Fixes #61766
- 	
- 	* gui/migration.c (create_calendar_contact_source): set a color
- 	for the contacts
- 	(create_calendar_sources): set a color for the personal source and
- 	make in primary and default if nothing else is either
- 	(create_task_sources): ditto for tasks personal source
-	
-2004-09-24  Rodrigo Moya <rodrigo@novell.com>
-
-	Fixes #65599
-
-	* gui/itip-utils.c (comp_fb_normalize): don't use NULL properties.
-
-	* gui/e-pub-utils.c (e_pub_publish): use auth_new_cal_from_source()
-	instead of auth_new_cal_from_uri().
-
-2004-09-24  JP Rosevear  <jpr@novell.com>
-
-	Fixes #64955, Vincent Noel <vnoel@cox.net>
-	
-	* libecal/e-cal.c (e_cal_get_alarms_in_range): fix c99-ism
-
-2004-09-24  JP Rosevear  <jpr@novell.com>
- 
- 	Fixes #66344
- 
- 	* gui/e-cal-model-calendar.c (get_dtend): check for existence of
- 	property and null time instead of sending through bad data
- 
- 	* gui/e-cal-model.c (get_dtstart): ditto
- 
- 	* gui/e-cal-model-tasks.c (get_completed): ditto
- 	(get_due): ditto
-
-2004-09-24  Chenthill Palanisamy  <pchenthill@novell.com>
-
-	Fixes #63513
-	* gui/e-itip-control.c
-	(ok_clicked_cb): Now the myaddress can be set to ecal address
-	since ok will be sentized only when ecal is loaded.
-
-2004-09-22  JP Rosevear  <jpr@novell.com>
-
-	* gui/calendar-component.c (fill_popup_menu_cb): ditto
-
-	* gui/tasks-component.c (fill_popup_menu_cb): don't allow a delete
-	of the system calendar
-
-2004-09-21  JP Rosevear  <jpr@novell.com>
- 
- 	Fixes #60904
- 	
- 	* gui/gnome-cal.c (set_week_start): update the view
- 	(get_times_for_views): mimic the work week guessing code exactly
- 	for calculating the time range needed instead of hardcoding 5 days
- 	(set_working_days): new routine to update the view
- 	(working_days_changed_cb): use above when getting config change
- 	notification
- 	(setup_config): set working days and add notification
-	
-2004-09-21  JP Rosevear  <jpr@novell.com>
- 
- 	Fixes #66158
- 	
- 	* gui/e-cal-model-tasks.c (e_cal_model_tasks_mark_task_complete):
- 	notify of change so completion status updates immediately
-	
-2004-09-21  JP Rosevear  <jpr@novell.com>
- 
-	Fixes #59194
- 	
- 	* gui/e-cal-model-calendar.c (get_location): return "" instead of
- 	NULL
-	
-2004-09-21  Chenthill Palanisamy  <pchenthill@novell.com>
-
-	Fixes #65682
-	* gui/itip-utils.c 
-	(itip_send_comp): check the static capability before
-	booking the deletion.
-
-2004-09-15  JP Rosevear  <jpr@novell.com>
- 
- 	Fixes #55172
- 	
- 	* conduits/calendar/calendar-conduit.c (local_record_from_comp):
- 	handle -1 (last) for monthly recurrences and check both by_set_pos
- 	and by_day since either can indicate this type of recurrence
-	
-2004-09-20  Tony Tsui <ttsui9@gmail.com>
-
-	Fixes #66174
-
-	* gui/dialogs/meeting-page.c (existing_attendee): fixed memory leak.
-
-2004-09-10   Hannah & Fazlu <hannah_lins@yahoo.co.in>
-
-	Fixes bug #65051
-
-	* calendar/gui/dialogs/task-page.c (task_page_fill_component):
-	Compared the dates and time
-
-2004-09-10  Rodrigo Moya <rodrigo@novell.com>
-
-	Fixes #62374
-
-	* gui/alarm-notify/alarm-queue.c (load_missed_alarms): removed this
-	function.
-	(cal_opened_cb): no need to call load_missed_alarms,
-	load_alarms_for_today will do everything.
-	(alarm_queue_add_client): ditto.
-	(load_alarms_for_today): take into account the last saved notification
-	time.
-	(load_alarms): unref the previous query, this function should now
-	only be called once per time range.
-
-2004-09-09  JP Rosevear  <jpr@novell.com>
- 
- 	Fixes #65454
- 	
- 	* gui/e-itip-control.c (class_init): only use a destroy function,
- 	no finalize
- 	(cleanup_ecal): util function
- 	(init): use above for hash table and killed destroyed flag
- 	(weren't using it anywhere)
- 	(destroy): collapse finalize work into here and guard against
- 	multiple destroy calls
-
-2004-09-08  JP Rosevear  <jpr@novell.com>
-
-	Fixes #62728
-	
-	* gui/e-week-view.c (e_week_view_set_week_start_day): trigger a
-	redraw when changing the start day
-
-2004-09-05  Chenthill Palanisamy  <pchenthill@novell.com>
-
-	* gui/e-calendar-table.c
-	(e_calendar_table_show_popup_menu): Check the
-	static capability to enable or disable the assign
-	tasks in the popup menu.
-
-	* gui/dialogs/recurrence-page.c
-	(sensitize_buttons): Check for the static capability
-	to convert a existing appointment to recurrence appointment
-	for enabling or diabling the recurrence widgets.
-
-2004-08-31  Rodrigo Moya <rodrigo@novell.com>
-
-	Fixes #62392
-
-	* gui/alarm-notify/alarm-queue.c (display_notification): ref the
-	client's query object so that it doesn't disappear on us.
-	(tray_icon_destroyed_cb): unref the query previously ref'ed.
-
-2004-08-31  Rodrigo Moya <rodrigo@novell.com>
-
-	* gui/e-cal-model-tasks.c: include missing string.h, to avoid
-	problems in 64 bit builds.
-	
-2004-08-27  Not Zed  <NotZed@Ximian.com>
-
-	* common/authentication.c (auth_func_cb): constify the strings to
-	remove a warning.
-
-	** See bug #64856 (workaround).
-
-	* common/authentication.c (auth_func_cb): 
-	* gui/e-pub-utils.c(e_pub_publish): add ONLINE flag to password
-	request.
-
-2004-08-28  JP Rosevear  <jpr@novell.com>
-
-	* gui/e-itip-control.c (rsvp_clicked_cb): get the active state
-	(insert_rsvp): set inital rsvp state
-
-	* gui/alarm-notify/alarm-queue.c (alarm_queue_add_client): load
-	immediately if they are loaded
-
-2004-08-27  Rodrigo Moya <rodrigo@novell.com>
-
-	* gui/alarm-notify/alarm-queue.c (load_alarms): use the
-	new 'has-alarms-in-range' query.
-	(alarm_queue_add_client): make sure we don't add twice the same alarm.
-
-2004-08-27  JP Rosevear  <jpr@novell.com>
-
-	Fixes #62911, #54101
-	
-	* gui/e-itip-control.c (set_ok_sens): util routine to set
-	sensitivity of OK button
-	(cal_opened_cb): cal back when calendar opens, sensitize ok button
-	(start_calendar_server): open async and take call back arg
-	(source_selected_cb): desensitize ok button until calendar is
-	loaded
-	(find_cal_opened_cb): check to see if the calendar contains the
-	object we are looking for, if none do show the source selector
-	option menu
-	(find_server): search async for the server
-	(destroy): clean up html widget
-	(finalize): instead of here
-	(get_publish_options): use only object tag
-	(get_request_options): ditto
-	(get_request_fb_options): ditto
-	(get_reply_options): ditto
-	(get_refresh_options): ditto
-	(get_cancel_options): ditto
-	(show_current_event): use new options, remove groupwise NEEDS
-	ACTION check, handle async loading
-	(show_current_todo): use new options, handle async loading
-	(option_activated_cb): record action
-	(add_option): add action item
-	(insert_boxes): layout widgets
-	(insert_label): insert label
-	(rsvp_clicked_cb): record rsvp status
-	(insert_rsvp): insert rsvp check box
-	(insert_ok): insert ok button
-	(publish_options_object): spit out relevant options
-	(request_options_object): ditto
-	(freebusy_options_object): ditto
-	(reply_options_object): ditto
-	(refresh_options_object): ditto
-	(cancel_options_object): ditto
-	(object_requested_cb): handle object requests
-	(ok_clicked_cb): use recorded actions
-
-2004-08-27  JP Rosevear  <jpr@novell.com>
-	
-	* gui/alarm-notify/alarm-notify.h: update proto
-
-	* gui/alarm-notify/alarm-notify.c (list_changed_cb): use per
-	source type client hash
-	(alarm_notify_init): ditto
-	(alarm_notify_finalize): ditto
-	(cal_opened_cb): ditto
-	(alarm_notify_add_calendar): ditto
-	(alarm_notify_remove_calendar): ditto, take source_type arg
-	(load_calendars_cb): don't call list_changed if the source list is
-	NULL
-	
-2004-08-26  Christian Neumair  <chris@gnome-de.org>
-
-	* gui/GNOME_Evolution_Calendar.server.in.in:
-	Don't mark component menu accels for translation.
-
-2004-08-25  JP Rosevear  <jpr@novell.com>
-
-	* conduits/todo/todo-conduit.c (for_each): prepare the local
-	record correctly, should fix copy to/from problems when syncing
-
-	* conduits/calendar/calendar-conduit.c (for_each): ditto
-
-2004-08-25  Frederic Crozat  <fcrozat@mandrakesoft.com>
-
-	* gui/dialogs/recur-comp.c: (recur_component_dialog):
-	Don't call gtk_dialog_set_has_separator on Gtk Message Dialog
-        with GTK+ >= 2.4.0.
-
-2004-08-25  Chenthill Palanisamy  <pchenthill@novell.com>
-
-	* gui/e-tasks.c
-	(default_client_cal_opened_cb): Reset the Status Bar message to
-	NUll, if the status of the Calendar is returned OK.
-
-2004-08-24  Rodrigo Moya <rodrigo@novell.com>
-
-	Fixes #58824
-
-	* gui/gnome-cal.c (open_ecal): Only try to open the calendar if not
-	loaded yet.
-	(update_query, client_cal_opened_cb, default_client_cal_opened_cb,
-	backend_died_cb): use always the same view for status messages.
-	(gnome_calendar_set_activity_handler): set the activity handlers on
-	all views, not just the current one.
-	(display_view): no need to set the activity handler here.
-
-2004-08-13  Jeffrey Stedfast  <fejj@novell.com>
-
-	* gui/dialogs/event-page.glade: Make the description scrolled
-	window scroll policy "automatic" rather than "never". Fixes bug
-	#62063.
-
-2004-08-18  Sivaiah Nallagatla <snallagatla@novell.com>
-
-	* gui/alarm-notify/alarm-notify.c (alarm-notify_init) :
-	initialize the mutext needed to prevent concurrect access 
-	priv->uri_clients_hash. Also install a timeout handler for
-        loading sources which requires  auth later
-	(alarm_notify_finalize) : free the new mutex
-	(load_calendars_cb) : call back which adds sources again after
-	one minute
-	(alarm_notify_add_calendar) : lock ad unlock the new mutex
-	before and after accessing uri_clients_hash  
-
-2004-08-16  JP Rosevear  <jpr@ximian.com>
-
-	Fixes #62706
-	
-	* gui/e-cal-model.c (e_cal_model_set_timezone): set the default
-	timezone on the server
-
-2004-08-16  Sivaiah Nallagatla <snallagatla@novell.com>
-	
-	* gui/alarm-notify/alarm-notify.h : change the prototype of 
-	alarm_notify_add_calendar to take Esource instead of uri 
-
-	* gui/alarm-notify/alarm-notify.c (alarm_notify_add_calendar) :
-	use auth_new_cal_from_source instead of _from_uri to create cal
-	client also do not try to load the cal backend which require auth
-	and for which there is no password availble in e-password seesion
-        (list_changed_cb) (load_calendars) : pass Esource insted of uri to
-	alarm_notify_add_calendar
-	 
-2004-08-14  Sivaiah Nallagatla <snallagatla@novell.com>
-
-	* gui/e-tasks.c (e_tasks_init) : initialize priv->default_lcient
-        (default_client_cal_opened_cb) : unref priv->default_client and
-	make it NULL
-	(client_cal_opened_cb) : don't unref client explicitly as removing
-	from priv->clients already does that.  Remove client based on uid
-	instead of uri
-	(backend_died_cb) : Remove client based on uid insted of uri Fixes
-	#62869
-
-2004-08-12  JP Rosevear  <jpr@ximian.com>
-
-	* gui/dialogs/calendar-setup.glade: make the button say Add Task
-	List instead of Add Group (matches menu item)
-
-2004-08-12  Carlos Garnacho Parro  <carlosg@gnome.org>
-
-	* gui/dialogs/alarm-dialog.glade: added the property
-	"use_filechooser" to the GnomeFileEntry
-
-2004-08-10  Not Zed  <NotZed@Ximian.com>
-
-	* gui/e-pub-utils.c (e_pub_publish): 
-	* common/authentication.c (auth_func_cb): epasswords api change.
-
-2004-08-11  JP Rosevear  <jpr@ximian.com>
-
-	Fixes #61555
-	
-	* gui/dialogs/meeting-page.c (existing_attendee): check if an
-	attendee was pre-existing
-	(remove_attendee): only add the attendee to the cancel comp if it
-	was pre-existing
-
-2004-08-10  Rodrigo Moya <rodrigo@novell.com>
-
-	* gui/e-cal-model.c (e_cal_model_set_search_query): guard against
-	re-running the same query.
-
-2004-08-10  Rodrigo Moya <rodrigo@novell.com>
-
-	* gui/alarm-notify/alarm-queue.c (tray_icon_destroyed_cb): disconnect
-	from signals also when using only the system tray. Fixes a crash when
-	removing an event that had an alarm popup recently.
-
-2004-08-09  Rodrigo Moya <rodrigo@novell.com>
-
-	* gui/e-calendar-view.c: re-added 'Make this occurrence movable' menu
-	item, gone by mistake.
-	(on_unrecur_appointment): new callback for the new menu item.
-
-2004-08-06  JP Rosevear  <jpr@ximian.com>
- 
-	Fixes #62452
- 	
-	* gui/e-itip-control.c (find_my_address): take option to retrieve
-	current status as well, actually look for the delegator in the
-	list so we can retrieve status there as well
-	(show_current_event): use find_my_address to get the status so we
-	properly handle not finding the address in the list of attendees
-	(show_current): pass extra param
-	(ok_clicked_cb): ditto
-
-2004-08-06  JP Rosevear  <jpr@ximian.com>
- 
-	Fixes #62021
- 	
-	* gui/dialogs/event-page.c (source_changed_cb): set the default
-	timezone
- 
-	* gui/e-itip-control.c (start_calendar_server): set the default
-	timezone
- 
-	* gui/calendar-component.c (setup_create_ecal): set the default
-	timezone, as the component view is not alive and hence has not set
-	it
-
-	* gui/tasks-component.c (setup_create_ecal): ditto
-
-2004-08-05  Parthasarathi S A   <sparthasarathi@novell.com>
-
-	Fix for bug #61673.
-	* calendar/gui/dialogs/save_comp.c(save_component_dialog):
-	  The function takes two arguments now, instead of one. The second
-	  argument is the pointer to the ECalComponent from which the component
-	  type can be determined. Based on the component type the corresponding
-	  error message is displayed.
-	* calendar/gui/dialogs/save_comp.h:
-	  Function definition updated for save_component_dialog.
-	* calendar/gui/dialogs/comp_editor.c(prompt_to_save_changes):
-	  passing the ECalComponent pointer to the 'save_component_dialog' function
-	* calendar/calendar-errors.xml: New error message string for task included
-	* calendar/calendar-errors.xml.h
-
-2004-08-05  Rodrigo Moya <rodrigo@novell.com>
-
-	Fixes #62030
-
-	* gui/alarm-notify/alarm-queue.c (tray_icon_destroyed_cb):
-	only remove the tray icon blinking timeout if we installed
-	it.
-	(display_notification): only install the tray icon blinking
-	timeout if using the system tray.
-	(tray_icon_blink_cb): use g_object_unref instead of the
-	deprecated gdk_pixbuf_unref.
-
-	* gui/alarm-notify/alarm.c (alarm_add): added missing argument
-	documentation.
-
-2004-08-03  JP Rosevear  <jpr@novell.com>
- 
-	* gui/gnome-cal.c (gnome_calendar_destroy): clean up all the
- 	default clients
- 	(default_client_cal_opened_cb): change the if statement to a
- 	switch to be consistent with the other code bits and set the
- 	default client for the source type
- 	(gnome_calendar_add_source): look at the default based on the
- 	source type
- 	(gnome_calendar_set_default_source): set the default for the
- 	source type
- 	(gnome_calendar_new_task): bail out if we have no ecal
- 
-	* gui/gnome-cal.c (set_timezone): set the timezone for all the
- 	default clients
- 
-	* gui/calendar-component.c (update_primary_task_selection): look
-	in the task source list, not the plain source list
-	
-2004-08-05  JP Rosevear  <jpr@novell.com>
-
-	* gui/tasks-control.c (tasks_control_sensitize_commands): kill
- 	warning by checking if there is a default client first (can happen
- 	when first starting up)
-	
-2004-08-05  JP Rosevear  <jpr@novell.com>
-
-	Fixes #62363
-	
-	* gui/calendar-component.c (create_new_event):
-	commit the sequence
-
-2004-08-04  Harish Krishnaswamy  <kharish@novell.com>
-
-	* gui/e-itip-control.c: (ok_clicked_cb): Handle decline request by
-	using update_item rather than remove_item, so the backend receives
-	the notification and can handle it. Also, do not rsvp if the backend
-	has the 'save_schedule' capability.
-
-2004-08-01  JP Rosevear  <jpr@novell.com>
- 
- 	* conduits/todo/todo-conduit.c (todoconduit_load_configuration):
- 	get source list and source
- 	(todoconduit_dupe_configuration): copy source list and source
- 	(todoconduit_destroy_configuration): unref source list and source
- 	(start_calendar_server): open the source that was set earlier
- 	(fill_widgets): set the source option menu value
- 	(create_settings_window): pass source list to pilot settings
- 	(save_settings): mark source with pilot-sync property
-
- 	* conduits/calendar/calendar-conduit.c: as above
- 	
- 	* conduits/todo/Makefile.am: link to and include misc. widgets
- 
- 	* conduits/calendar/Makefile.am: ditto	
-	
-2004-07-30  Rodrigo Moya <rodrigo@novell.com>
-
-	Fixes #57622
-
-	* gui/e-cal-model.h: added ECalModelFlags enum type.
-
-	* gui/e-cal-model.c (e_cal_model_set_flags, e_cal_model_get_flags):
-	new functions.
-	(e_cal_model_init): initialize the new internal field to keep the flags.
-	(e_cal_view_objects_added_cb): expand recurrences if the model flags
-	contain the EXPAND_RECUR bit.
-	(e_cal_view_objects_modified_cb): if EXPAND_RECUR is on, remove all
-	recurrences and regenerate them.
-	(e_cal_view_objects_removed_cb): remove all instances for given UIDs.
-	(add_new_client): killed warning.
-	(get_dtstart): use the instance_start time when dealing with recurrences.
-
-	* gui/e-cal-model-calendar.c (get_dtend): use the instance_end time
-	when dealing with recurrences.
-
-	* gui/e-cal-list-view.c (e_cal_list_view_new): set the EXPAND_RECUR
-	flag on the model for the list view.
-
-	* gui/e-week-view.c (e_week_view_add_event):
-	* gui/e-day-view.c (e_day_view_add_event): fill in the instance's
-	start and end times in the ECalModelComponent struct.
-
-	* gui/e-calendar-view.c (e_calendar_view_delete_selected_occurrence):
-	use the instance_start field to retrieve the RECUR-ID, now that all the
-	views fill it in.
-
-2004-07-29  JP Rosevear  <jpr@novell.com>
- 
- 	* gui/e-calendar-view.c: creating new items no longer needs to be
- 	disabled since the user can switch to a writable calendar and the
- 	editor ui is disabled properly
-	
-2004-07-31  JP Rosevear  <jpr@novell.com>
- 
- 	* gui/dialogs/event-editor.c (show_meeting): use Invitations not
- 	Meetings
- 	(event_editor_edit_comp): ditto
-	
-2004-07-31  JP Rosevear  <jpr@novell.com>
-
-	* gui/e-day-view.c (e_day_view_finish_long_event_resize): guard
-	with is_instance instead of has_recurrences because most of the
-	backends don't support this yet
-	(e_day_view_finish_resize): ditto
-	(e_day_view_change_event_time): ditto
-	(e_day_view_on_editing_stopped): ditto
-	(e_day_view_on_top_canvas_drag_data_received): ditto
-	(e_day_view_on_main_canvas_drag_data_received): ditto
-
-	* gui/e-week-view.c (e_week_view_change_event_time): ditto
-	(e_week_view_on_editing_stopped): ditto
-	
-2004-07-30  Harish Krishnaswamy  <kharish@novell.com>
-	
-	* gui/e-tasks.c: (client_cal_opened_cb),
-	(default_client_cal_opened_cb):
-	* gui/gnome-cal.c: (client_cal_opened_cb),
-	(default_client_cal_opened_cb):
-	Handle E_CALENDAR_STATUS_BUSY conditions and do not 
-	remove the source from the gnome-calendar. The fix
-	for #59335 exposed this problem.
-
-2004-07-28  Larry Ewing  <lewing@novell.com>
-
-	* gui/dialogs/calendar-setup.c (dialog_hide_unused_options): hide
-	dialog items that don't apply when editing properties.
-	(general_update_dialog): check to make sure we have a source
-	before checking its state.
-
-2004-07-27  JP Rosevear  <jpr@novell.com>
-
-	Fixes #62006
-	
-	* gui/e-cal-model.c (add_new_client): don't load the events if we
-	are already doing the query
-
-2004-07-25  JP Rosevear  <jpr@ximian.com>
- 
- 	Fixes #61058
- 	
- 	* gui/e-week-view.c (process_component_recur_cb): add but don't
- 	prepend
- 	(process_component): use above as call back so we can pass the
- 	prepend bool
- 	(e_week_view_add_event): take a prepend bool and prepend to the
- 	events array if asked so the event will be shown first when drawn
- 	(e_week_view_do_key_press): If the event can't be fit on the
- 	screen, ie not even one event can be shown in the day, don't try
- 	to edit it
-	
-2004-07-26  Rodney Dawes  <dobey@novell.com>
-
-	* gui/dialogs/event-page.glade: Fix mnemonic for "Location" to not
-	be duplicated with "OK"
-
-	* gui/dialogs/meeting-page.c (get_widgets): Get the "Attendees" label
-	(meeting_page_construct): Fix padding of GtkScrolledWindow widget
-	Set the mnemonic widget for the "Attendees" label
-
-	* gui/dialogs/meeting-page.glade: Fix HIG spacing to be correct
-	Fix the mnemonic for "Organizer" to not conflict
-	Add mnemonic for "Attendees"
-
-	* gui/dialogs/task-page.glade: Add mnemonic for "Description"
-
-2004-07-26  JP Rosevear  <jpr@novell.com>
- 
- 	* gui/dialogs/calendar-setup.c (calendar_setup_edit_calendar): set
- 	a different title if we are editing; de-sensitize option menu if
- 	we are editing
- 	(calendar_setup_edit_task_list): set a different title if we are editing
- 
- 	* gui/dialogs/calendar-setup.glade: use task list instead of tasks
- 	group
- 
- 	* gui/tasks-component.c (impl__get_userCreatableItems): add
- 	assigned task as an item, use task list instead of tasks group
- 
- 	* gui/calendar--component.c (impl__get_userCreatableItems): fiddle
- 	with shortcuts
-	
-2004-07-25 pchenthill <pchenthill@novell.com>
-
-	Fixes #59983
-	If the ecal component is already loaded, check for the participation 
-	status of the attendee and display the menu for selecting the 
-	calendar.
-
-2004-07-23  JP Rosevear  <jpr@ximian.com>
- 
- 	Fixes #61571
- 	
- 	* gui/e-week-view.c (e_week_view_start_editing_event): if the
- 	event moves, find it again using the model data as the invariant
- 	and then find the span again
-	
-2004-07-23  JP Rosevear  <jpr@novell.com>
- 
- 	Fixes #61760
- 	
- 	* gui/e-cal-model.c (add_new_client): don't check against the URI,
- 	just against the client
- 
-2004-07-23 pchenthill <pchenthill@novell.com>
-
-	* Retracting the commit made below for #59983 as it has
-	results in crash some cases
-
-2004-07-23 pchenthill <pchenthill@novell.com>
-
-        Fixes #59983
-        * gui/e-itip-control.c (show_current_event):
-        If the ecal component is already loaded, check for the participation
-        status of the attendee and display the menu for selecting the
-        calendar.
-
-2004-07-22  Larry Ewing  <lewing@ximian.com>
-
-	* gui/e-meeting-time-sel.c (e_meeting_time_selector_style_set):
-	fix the row heights and tweek the offsets so that things come out
-	OK.
-
-2004-07-21  JP Rosevear  <jpr@novell.com>
- 
-  	Fixes #61776
-		
- 	* gui/e-calendar-table.c (clipboard_get_text_cb): make sure the
- 	text is not NULL
-	
-2004-07-21  JP Rosevear  <jpr@novell.com>
-
-	Fixes #61738
-	
-	* gui/dialogs/meeting-page.c (clear_widgets): by default we have a
-	user as organizer
-	(sensitize_widgets): use user_org to determine widget sensitivity
-	(meeting_page_fill_widgets): set user_org value appropriately
-	(change_clicked_cb): set user_org to TRUE
-
-2004-07-21  JP Rosevear  <jpr@novell.com>
-
-	Fixes #61779
-	
-	* gui/dialogs/task-page.c (init_widgets): listen for changes on
-	start and due dates
-
-	* gui/dialogs/task-details-page.c (init_widgets): listen for
-	changes on completion date
-
-2004-07-20  Not Zed  <NotZed@Ximian.com>
-
-	* gui/e-cal-model.c: 
-	* importers/icalendar-importer.c: 
-	* gui/dialogs/select-source-dialog.c: 
-	* gui/dialogs/copy-source-dialog.c: 
-	* gui/alarm-notify/util.c: 
-	* common/authentication.c: 
-	* gui/migration.c: include config.h.  See #61395.
-
-2004-07-16  JP Rosevear  <jpr@novell.com>
-
-	Fixes #61451
-
-	* gui/e-itip-control.c (get_cancel_options): don't give a cancel
-	option if the event is no where to be found
-	(show_current_event): pass in kind
-	(show_current_todo): ditto
-
-2004-07-16  Larry Ewing  <lewing@ximian.com>
-
-	* gui/e-meeting-time-sel.c (e_meeting_time_selector_style_set):
-	fix the row heights and tweek the offsets so that things come out
-	OK.
-
-2004-07-16  Larry Ewing  <lewing@ximian.com>
-
-	* gui/calendar-component.c (set_info): use short month forms to
-	limit the maximum width of the label.
-
-2004-07-15  Rodrigo Moya <rodrigo@novell.com>
-
-	Fixes #57142
-
-	* gui/e-day-view.c (e_day_view_on_editing_stopped): commit the
-	sequence on the object before sending it to the backend.
-	(e_day_view_add_event): s/abort_sequence/commit_sequence.
-
-	* gui/e-week-view.c (e_week_view_on_editing_stopped): commit the
-	sequence here also.
-	(e_week_view_add_event): s/abort_sequence/commit_sequence.
-
-	* gui/comp-util.c (cal_comp_event_new_with_current_time): don't
-	commit the sequence here.
-
-2004-07-14  JP Rosevear  <jpr@novell.com>
- 
- 	Fixes #61572
- 	
- 	* gui/dialogs/schedule-page.c (times_changed_cb): call notify
- 	changed
- 
- 	* gui/dialogs/comp-editor.c (page_summary_changed_cb): no need to
- 	mark the editor changed here, it doesn't do the right thing anyhow
- 	(page_dates_changed_cb): ditto
- 	
-2004-07-14  JP Rosevear  <jpr@novell.com>
-
-	Fixes #60678
-	
-	* gui/dialogs/cancel-comp.c (cancel_component_dialog): flip the
-	messages around, the "deleting" flag means something else is doing
-	the deleting
-
-2004-07-12  JP Rosevear  <jpr@novell.com>
- 
- 	Fixes #57287, 58748
- 	
-	* gui/tasks-component.c (source_added_cb): if the source was
- 	added in the main calendar, select it because the user caused this
- 	to happen by creating a task
- 	(create_component_view): listen for source_added signal on the
- 	tasks
- 
- 	* gui/gnome-cal.c (view_selection_changed_cb): if the user created
- 	a task, make sure we are displaying the relevant event list
- 	(set_timezone): set the default zone of the default client
- 	(setup_widgets): listen for the user_created signal
- 	(gnome_calendar_destroy): clean up default client
- 	(client_cal_opened_cb): disconnect from the open signal
- 	(default_client_cal_opened_cb): set the default client on the
- 	models
- 	(open_ecal): make the callback function a param
- 	(gnome_calendar_add_source): include the default client when
- 	searching for an existing client
- 	(gnome_calendar_set_default_source): make the default client
- 	independent of the rest of the clients
- 
- 	* gui/e-week-view.c (e_week_view_on_editing_stopped): emit
- 	user_created signal
- 
- 	* gui/e-tasks.c (user_created_cb): if the user created a task,
- 	make sure we are displaying the relevant task list
- 	(set_timezone): set the timezone on the client
- 	(setup_widgets): listen for user_created signal
- 	(e_tasks_destroy): unref default client
- 	(default_client_cal_opened_cb): set the default on the model when
- 	it opens
- 	(open_ecal): open a task list
- 	(e_tasks_add_todo_source): include the default client when
- 	searching for an existing client
- 	(e_tasks_set_default_source): make the default client independent
- 	of the rest of the clients
- 
- 	* gui/e-day-view.c (e_day_view_on_editing_stopped): emit
- 	user_created signal
- 
- 	* gui/e-calendar-view.h: add signal proto
- 
- 	* gui/e-calendar-view.c (e_calendar_view_class_init): add
- 	user_created signal
- 
- 	* gui/e-calendar-table.h: add signal proto
- 
- 	* gui/e-calendar-table.c (e_calendar_table_class_init): add
- 	user_created signal
- 	(row_appended_cb): if row is appended, emit user_created signal
- 	(e_calendar_table_init): listen for row_appended signal
- 
- 	* gui/e-cal-model.h: add signal proto
- 
- 	* gui/e-cal-model.c (e_cal_model_class_init): add row_appended
-	signal
- 	(ecm_append_row): don't leak, emit row appended signal
- 	(e_cal_model_set_default_client): remove the existing default if
- 	it was only used as the default
- 	(update_e_cal_view_for_client): short circuit query create
- 	(add_new_client): look for an existing client and update its
- 	record if found, handle opening things here
- 	(e_cal_model_add_client): just call add_new_client
- 	(remove_client_objects): just remove a client's objects
- 	(remove_client): use above, handle removal of client if its
- 	default
- 
- 	* gui/calendar-component.c (source_added_cb): if the source was
- 	added in the main calendar, select it because the user caused this
- 	to happen by creating an appointment
- 	(create_component_view): listen for source_added signal on the
- 	calendar
-	
-2004-07-08  Radek Doulik  <rodo@ximian.com>
-
-	* gui/e-cal-model.c (e_cal_model_date_value_to_string): as below
-
-	* gui/e-cal-model-calendar.c (ecmc_value_to_string): as below
-
-	* gui/e-cal-model.c (ecm_value_to_string): as below
-
-	* gui/e-cal-model-tasks.c (ecmt_value_to_string): dup the string
-	value, it's free-ed later. instead of returning NULL return
-	g_strdup ("") as gal does
-
-	Fixes #56271
-
-2004-07-12  Rodney Dawes  <dobey#novell.com>
-
-	* gui/e-tasks.c (pane_realized): Add this callback so we can set the
-	paned position on realize
-	(setup_widgets): Move the paned widget to the priv structure so that
-	we can access it elsewhere
-	(display_view_cb): Set the paned position when the view gets displayed
-
-	Fixes #55653
-
-2004-07-12  Rodney Dawes  <dobey@novell.com>
-
-	* gui/dialogs/recur-comp.c (recur_component_dialog):
-	Update the layout of the dialog to be more usable
-
-	Partially fixes #56171
-
-2004-07-11  JÃ�rg Billeter <j@bitron.ch>
-
-	* gui/dialogs/event-page.c (event_page_fill_component):
-	busy should be opaque, not transparent
-
-2004-07-09  Rodrigo Moya <rodrigo@novell.com>
-
-	Revert my patches from July 5th and 6th.
-
-	* gui/gnome-cal.c (gnome_calendar_init): call setup_config/widgets
-	in the previous order.
-	(setup_widgets): set the timezone on the views when creating them.
-	(set_timezone): no need to set the timezone on the views here.
-	(client_cal_opened_cb): removed call to set_timezone().
-
-2004-07-09  Rodney Dawes  <dobey@novell.com>
-
-	* gui/e-day-view-top-item.c (e_day_view_top_item_draw_triangle):
-	Add an argument for the event_num so we can get the event object
-	Draw the left/right triangles with the right color for the event
-	Fix a small alignment bug with the triangle points
-
-	* gui/e-week-view-event-item.c (e_week_view_event_item_draw_triangle):
-	Draw the left/right triangles with the right color for the event
-	Fix a small alignment bug with the triangle points
-
-2004-07-09  Rodrigo Moya <rodrigo@novell.com>
-
-	Fixes #60289
-
-	* gui/dialogs/select-source-dialog.c (select_source_dialog): set the
-	absolute URI on the selected source, so that the ESource we keep
-	around has a valid URI.
-
-	* gui/e-calendar-view.c (transfer_item_to): when copying appointments,
-	change the UID.
-	(transfer_selected_items): don't pass hardcoded values to transfer_item_to.
-
-2004-07-08  Frederic Crozat  <fcrozat@mandrakesoft.com>
-
-	* gui/Makefile.am:
-	tarball should ship .schemas.in.in files, not generated files.
-
-2004-07-06  Rodrigo Moya <rodrigo@novell.com>
-
-	* gui/gnome-cal.c (gnome_calendar_init): setup the widgets before
-	the configuration.
-
-2004-07-06  JP Rosevear  <jpr@novell.com>
-
-	Fixes #60645
-	
-	* gui/e-calendar-view.c (e_calendar_view_new_appointment_full):
-	guess when an item should be all day based on the selection time
-
-2004-07-05  Rodrigo Moya <rodrigo@novell.com>
-
-	* gui/gnome-cal.c (setup_widgets): don't set the timezone on the views
-	here.
-	(set_timezone): do it here.
-	(client_cal_opened_cb): call set_timezone() here.
-
-2004-07-02  Rodrigo Moya <rodrigo@novell.com>
-
-	* gui/gnome-cal.c (set_view): update the internal current_view_type
-	field and focus the newly selected view.
-
-2004-07-02  Rodney Dawes  <dobey@novell.com>
-
-	* gui/dialogs/url-editor-dialog.c (get_widgets):
-	Get the label for the calendar list header also
-	(init_widgets): Set the border widths for the dialog's vbox and
-	action area to be more compliant with the HIG
-	Set the mnemonic widget for the calendar label, to the Source Selector
-	Remove the unneeded settings for the scrolled window, these are in the
-	glade xml for the widget
-	Set the icon list on the correct dialog widget, not the settings dialog
-
-	* gui/dialogs/url-editor-dialog.h:
-	Add the calendar_list_label widget here so we can access it
-
-	* gui/dialogs/url-editor-dialog.glade:
-	Change the dialog's layout to be HIG compliant and fix some strings
-	to do the same
-	Add mnemonics to all the labels that are associated with widgets
-
-2004-06-29  Sivaiah Nallagatla <snallagatla@novell.com>
-
-        * gui/e-tasks.c (e_tasks_add_todo_source)
-         (e_tasks_remove_todo_source) : store and lookup  clients
-        based on ESource uid instead of uri in priv->clients
-
-2004-06-28  Not Zed  <NotZed@Ximian.com>
-
-	* gui/tasks-component.c (impl__get_userCreatableItems): same.
-
-	* gui/calendar-component.c (impl__get_userCreatableItems): fix up
-	shortcuts.  #56746.
-
-2004-06-25  JP Rosevear  <jpr@novell.com>
-
-	* gui/dialogs/alarm-dialog.glade: don't show option tabs
-
-2004-06-25  JP Rosevear  <jpr@novell.com>
-
-	* gui/dialogs/task-editor.c (task_editor_construct): use "Task"
-	instead of "Basic"
-
-	* gui/dialogs/event-editor.c (event_editor_construct): use
-	"Invitations" instead of "Meeting"
-
-2004-06-25  JP Rosevear  <jpr@novell.com>
-
-	* gui/dialogs/e-delegate-dialog.glade: use "Contacts..."
-
-	* gui/dialogs/alarm-dialog.glade: add custom message email toggle
-
-	* gui/dialogs/alarm-dialog.c (get_widgets): get custom email
-	message toggle
-	(check_custom_email): check the custom message when setting
-	sensitivity of OK button
-	(malarm_message_toggled_cb): check custom email
-	(malarm_description_changed_cb): ditto
-	(action_selection_done_cb): ditto
-
-2004-06-25  JP Rosevear  <jpr@novell.com>
-
-	* gui/dialogs/alarm-dialog.c (alarm_to_dialog): set the default
-	address here if possible
-	(dialog_to_alarm): don't set it here
-	(check_custom_email): check for To: entries
-	(malarm_addresses_changed_cb): update when the text in the to
-	entry changes
-	(action_selection_done_cb): for the custom email settings
-	(init_widgets): listen for email To: changes
-	(alarm_dialog_run): only save the alarm if the response was "OK"
-
-2004-06-25  JP Rosevear  <jpr@novell.com>
-
-	* gui/dialogs/event-page.c (event_page_init): init alarm interval
-	to -1
-	(clear_widgets): give the alarm time option menu a sensible
-	default
-	(is_custom_alarm): account for the user defined alarm time if it
-	doesn't match the default set
-	(event_page_fill_widgets): default the option menu to the 15
-	minute or user define alarm if no alarm is currently set
-	(event_page_fill_component): account for the user defined alarm
-	tme
-	(init_widgets): add in the user defined alarm time if it doesn't
-	match the default set
-
-2004-06-25  JP Rosevaer  <jpr@novell.com>
-
-	* gui/dialogs/alarm-dialog.c (palarm_widgets_to_alarm): the args
-	are optional, don't store them if they aren't there
-	(check_custom_sound): sensitize the ok button based on whether or
-	not there needs to be input
-	(check_custom_message): ditto
-	(check_custom_program): ditto
-	(dalarm_message_toggled_cb): check custom message
-	(dalarm_description_changed_cb): ditto
-	(aalarm_sound_toggled_cb): check custom sound
-	(aalarm_attach_changed_cb): ditto
-	(palarm_program_changed_cb): check custom program
-	(action_selection_done_cb): use above checks as appropriate
-	(init_widgets): listen for changed signals
-
-2004-06-25  JP Rosevear  <jpr@novell.com>
-
-	* gui/dialogs/event-page.c (event_page_finalize): free old_summary
-	(is_custom_alarm): take description into account when checking for
-	custom alarm
-	(is_custom_alarm_uid_list): pass old_summary
-	(is_custom_alarm_store): ditto
-	(is_custom_alarm_store): ditto
-	(sensitize_widgets): ditto
-	(event_page_fill_component): ditto
-	(event_page_fill_widgets): store the initial summary
-	(alarm_changed_cb): make sure the needs description property gets
-	set on the default alarm
-	(alarm_custom_clicked_cb): copy the current store in case the user
-	hits cancel, if all the alarms are erased uncheck the alarm toggle
-
-	* gui/dialogs/alarm-dialog.glade: add toggles for custom messages
-	and sound
-
-	* gui/dialogs/alarm-dialog.c (aalarm_widgets_to_alarm): store
-	custom sound only if the toggle is checked
-	(dalarm_widgets_to_alarm): store custom message only if toggle is
-	checked
-	(get_widgets): load new widgets
-	(aalarm_sound_toggled_cb): sensitize sound entry
-	(dalarm_message_toggled_cb): sensitize message entry
-	(init_widgets): listen for toggle signals
-
-2004-06-24  JP Rosevear  <jpr@novell.com>
-
-	* gui/dialogs/alarm-list-dialog.c (selection_changed_cb):
-	sensitize the buttons
-	(init_widgets): listen for selection changes so we can delete
-	alarms
-
-2004-06-24  JP Rosevear  <jpr@novell.com>
-
-	* gui/dialogs/event-page.c (event_page_fill_component): store all
-	the custom alarms
-	(alarm_custom_clicked_cb): emit changed signal if necessary
-
-	* gui/dialogs/alarm-list-dialog.c (alarm_list_dialog_run): return
-	true/false based on button pushed
-
-	* gui/dialogs/alarm-dialog.c: move repeat options and per alarm
-	type options here
-
-	* gui/dialogs/alarm-dialog.glade: ditto
-	
-	* gui/dialogs/Makefile.am: remove alarm options dialog
-
-2004-06-24  Rodney Dawes  <dobey@novell.com>
-
-	* gui/calendar-component.c (create_component_view):
-	* gui/tasks-component.c (create_component_view):
-	Add a call to e_source_selector_set_select_new here so that we can
-	select new sources when we create them
-
-2004-06-23  Jeffrey Stedfast  <fejj@novell.com>
-
-	* conduits/todo/todo-conduit.c: Bump the version to 0.1.5 to help
-	track down bug #59726.
-
-2004-06-23  JP Rosevear  <jpr@novell.com>
-
-	* gui/dialogs/comp-editor.c (comp_editor_init): set the window
-	type hint to normal so it can go below the shell window
-
-2004-06-23  Rodrigo Moya <rodrigo@novell.com>
-
-	* gui/dialogs/comp-editor.c (comp_editor_notify_client_changed):
-	fixed gtk-doc comments and made it enable/disable the dialog's
-	OK button depending on the selected source.
-
-2004-06-23  Rodney Dawes  <dobey@novell.com>
-
-	* gui/calendar-component.c: Revert previous change to add the
-	callbacks for notification of calendar selection changes
-	(create_new_view): Update the comment for watching notification on
-	the tasks selection to state it is for the mini tasks view
-
-2004-06-23 JP Rosevear  <jpr@novell.com>
-
-	Fixes #57862
-	
-	* gui/gnome-cal.c (connect_day_view_focus): connect after the
-	focus events happen so the day view knows what is selected
-
-2004-06-23  JP Rosevear  <jpr@novell.com>
-
-	* gui/e-itip-control.c (update_attendee_status): tidy up to work
-	again
-	(ok_clicked_cb): use above when replying
-
-2004-06-23  JP Rosevear  <jpr@novell.com>
-
-	* gui/dialogs/meeting-page.c (remove_attendee): util function to
-	do the actual removal
-	(remove_attendee_at_row): ditto based on row number
-	(remove_clicked_cb): make the remove button work
-	(popup_delete_cb): use utility routines to do removal
-	(button_press_event): do the icon properly
-
-2004-06-22  Rodney Dawes  <dobey@novell.com>
-
-	* gui/calendar-component.c (config_calendars_selection_changed_cb):
-	(config_primary_calendar_selection_changed_cb):
-	Add these two callbacks so that we can update the selection in the
-	calendar when the gconf key changes, like we do for tasks
-
-	(create_component_view): Register the two callbacks that we created
-	for updating the selection in the view, and their notification IDs
-
-
-2004-06-22  JP Rosevear  <jpr@novell.com>
-
-	* gui/e-meeting-time-sel.c (e_meeting_time_selector_construct):
-	clean up mnemonic handling and put the proper icon in the contacts
-	button
-
-2004-06-22  JP Rosevear  <jpr@novell.com>
-
-	* gui/dialogs/recurrence-page.glade: fix mnemonics
-
-	* gui/dialogs/event-page.glade: ditto
-
-2004-06-22  JP Rosevear  <jpr@novell.com>
-
-	* gui/dialogs/comp-editor.c: kill warnings
-
-2004-06-22  JP Rosevear  <jpr@novell.com>
-
-	* gui/calendar-component.c (create_new_event): kill warning
-
-2004-06-22  Rodrigo Moya <rodrigo@novell.com>
-
-	* gui/dialogs/Makefile.am: removed alarm-page.*.
-
-2004-06-22  JP Rosevear  <jpr@novell.com>
-
-	 * gui/dialogs/Makefile.am, gui/dialogs/alarm-dialog.c,
-	 gui/dialogs/alarm-dialog.glade, gui/dialogs/alarm-dialog.h,
-	 gui/dialogs/alarm-list-dialog.c,
-	 gui/dialogs/alarm-list-dialog.glade,
-	 gui/dialogs/alarm-list-dialog.h, gui/dialogs/alarm-options.c,
-	 gui/dialogs/alarm-options.h, gui/dialogs/alarm-page.c,
-	 gui/dialogs/alarm-page.glade, gui/dialogs/alarm-page.h,
-	 gui/dialogs/comp-editor.c, gui/dialogs/comp-editor.h,
-	 gui/dialogs/event-editor.c, gui/dialogs/event-page.c,
-	 gui/dialogs/event-page.glade, gui/dialogs/meeting-page.c,
-	 gui/dialogs/meeting-page.glade, gui/dialogs/recurrence-page.c,
-	 gui/dialogs/recurrence-page.glade,
-	 gui/dialogs/task-details-page.c,
-	 gui/dialogs/task-details-page.glade, gui/dialogs/task-editor.c,
-	 gui/dialogs/task-page.c, gui/dialogs/task-page.glade: HIGify and
-	 newer design; alarm page is gone, Cancel/OK buttons for the
-	 dialog, no more menus; slightly improve read-only workings for
-	 entry areas
-	
-2004-06-22  JP Rosevear  <jpr@novell.com>
-
-	* gui/e-meeting-time-sel.c (e_meeting_time_selector_construct):
-	rename widgets to be consistent with those else where
-	(e_meeting_time_selector_set_read_only): cast properly
-	(e_meeting_time_selector_on_invite_others_button_expose): remove,
-	the widget sensitization is taken care of elsewhere
-
-2004-06-22  Larry Ewing  <lewing@ximian.com>
-
-	Fixes #59824
-	
-	* gui/e-week-view.h: increase some of the passing so that the text
-	does not appear to run together.  Ideally this would be based on
-	the font size but this will work for now.
-
-2004-06-21  Rodney Dawes  <dobey@novell.com>
-
-	Fixes #56892
-
-	* gui/dialogs/select-source-dialog.c (row_activated_cb): Add this
-	callback to activate the OK button when we double-click or press
-	the Enter key on a row
-	(select_source_dialog): Change the default size to be reasonable
-	Use ensure_style instead of realize on the dialog
-	Set the default response for the dialog to OK
-	Fix the packing of the group label to not have extraneous padding
-	Connect up the callback for row_activated
-
-2004-06-18  Jeffrey Stedfast  <fejj@novell.com>
-
-	Fixes bug #57592
-
-	* conduits/calendar/calendar-conduit.c (pre_sync): Same as below.
-
-	* conduits/todo/todo-conduit.c (pre_sync):
-	s/wombat/evolution-data-server/g
-
-2004-06-18  Rodrigo Moya <rodrigo@novell.com>
-
-	Fixes #58747
-
-	* gui/dialogs/comp-editor.c (prompt_to_save_changes): if the source
-	is read only, don't prompt the user.
-
-2004-06-18  Rodrigo Moya <rodrigo@novell.com>
-
-	Fixes #56323
-
-	* gui/calendar-component.c (create_new_event): removed read-only
-	check, just call the editor with the currently selected client and
-	let it do the job.
-
-	* gui/tasks-component.c (create_new_todo): ditto.
-
-2004-06-18  Rodrigo Moya <rodrigo@novell.com>
-
-	Fixes #60293
-
-	* gui/dialogs/recurrence-page.c (type_toggled_cb): make sure
-	we enable/disable correctly the 'Add' button.
-
-2004-06-17 Sivaiah Nallagatla <snallagatla@novell.com>
-
-        * gui/itip-utils.c (itip_publish_comp) : check for
-        host being non-NULL in soup uri. host can be null
-        for uri's of the form file:/foo or http:/foo etc
-
-2004-06-17  Rodrigo Moya <rodrigo@novell.com>
-
-	Fixes #60309
-
-	* gui/meeting-page.c (sensitize_widgets): moved up in the file, to
-	be declared before any use.
-
-2004-06-16  Rodrigo Moya <rodrigo@novell.com>
-
-	* gui/e-itip-control.c: use e-util's HTML conversion function,
-	instead of camel's.
-	(write_html): use e_text_to_html_full().
-
-2004-06-15  JP Rosevear  <jpr@novell.com>
-
-	Fixes #56197
-	
-	* gui/e-cal-list-view.etspec: add back categories
-
-	* gui/e-calendar-table.etspec: ditto
-	
-2004-06-15  JP Rosevear  <jpr@novell.com>
-
-	Fixes #59401
-	
-	* gui/e-week-view.c (e_week_view_on_text_item_event): if we are
-	editing the event, don't ignore the right click, stop editing the
-	event and continue on
-
-2004-06-15  JP Rosevear  <jpr@novell.com>
-
-	Fixes #57393
-	
-	* gui/e-week-view.c (e_week_view_set_compress_weekend): redraw the
-	titles as well since the spacing is different
-
-2004-06-15  Rodrigo Moya <rodrigo@novell.com>
-
-	* gui/dialogs/meeting-page.c (meeting_page_construct): connect
-	to "client_changed" signal on the page.
-	(client_changed_cb): new callback.
-	(sensitize_widgets): new function.
-	(meeting_page_fill_widgets): call sensitize_widgets().
-
-	* gui/e-meeting-time-sel.[ch]
-	(e_meeting_time_selector_set_read_only): new function.
-	(e_meeting_time_selector_construct): store some missing buttons
-	in the EMeetingTimeSelector structure.
-
-	* gui/dialogs/schedule-page.c (schedule_page_construct):
-	connect to "client_changed" signal on the page.
-	(client_changed_cb): new callback.
-	(sensitize_widgets): new function.
-	(schedule_page_fill_widgets): call sensitize_widgets().
-
-2004-06-10  Rodrigo Moya <rodrigo@novell.com>
-
-	* gui/e-cal-model.c (e_cal_view_objects_modified_cb): removed
-	g_assert call, since we shouldn't crash when getting wrong
-	notifications from a backend.
-
-2004-06-10  JP Rosevear  <jpr@novell.com>
-
-	* gui/gnome-cal.c
-	(gnome_calendar_on_date_navigator_selection_changed): only do the
-	range selected hack in one case
-
-2004-06-10  JP Rosevear  <jpr@novell.com>
-
-	* gui/gnome-cal.c (setup_widgets): set 6 weeks shown
-	(display_view): ditto
-
-2004-06-10  Rodrigo Moya <rodrigo@novell.com>
-
-	Fixes #58748
-
-	* gui/gnome-cal.c (setup_widgets): set the timezone on all views
-	when creating them.
-
-2004-06-10  Rodrigo Moya <rodrigo@novell.com>
-
-	* gui/e-calendar-table.c (e_calendar_table_init): don't set
-	the "bg_color_column" property on the ECellToggle class.
-
-2004-06-10  Rodrigo Moya <rodrigo@novell.com>
-
-	Fixes #58799
-
-	* gui/e-calendar-view.c (e_calendar_view_delete_selected_occurrence):
-	Use the timezone for getting the RECUR-ID from the instance start
-	date if available. Also, use dates only as the recurrence ID, and
-	do nothing if not a recurrent appointment.
-
-2004-06-09  JP Rosevear  <jpr@novell.com>
-
-	Fixes #59242, #57404, ##55394
-	
-	* gui/gnome-cal.c (get_times_for_views): calculate the work week,
-	week, and month views more exactly
-	(update_adjustment): update the view based on week view scrolling
-	(setup_widgets): listen for the scroll bar moving on the week
-	views
-	(gnome_calendar_update_date_navigator): adjust for compressed
-	weekends in the month view
-	(gnome_calendar_on_date_navigator_selection_changed): ditto
-
-	* gui/e-week-view.h: add protos
-
-	* gui/e-week-view.c (time_range_changed_cb): calculate the
-	base_date and first_day_shown more simply, allows multi-week
-	selection to work better; update the base date when told to do so
-	(e_week_view_init): init update_base_value var
-	(e_week_view_get_update_base_date): accessor
-	(e_week_view_set_update_base_date): ditto
-
-2004-06-08  Rodrigo Moya <rodrigo@novell.com>
-
-	Fixes #57578
-
-	* gui/e-calendar-view.c (on_move_to, on_copy_to): simplified to
-	just call transfer_selected_items() with the approppriate
-	arguments.
-	(transfer_selected_items): new function to transfer all selected
-	items to another calendar.
-	(transfer_item_to): added missing implementation.
-
-2004-06-08  Rodrigo Moya <rodrigo@novell.com>
-
-	Fixes #57579
-
-	* gui/dialogs/select-source-dialog.c (select_source_dialog): start
-	with the OK button disabled.
-	(primary_selection_changed_cb): enable/disable the OK button depending
-	on the selection on the ESourceSelector.
-
-2004-06-08  Rodrigo Moya <rodrigo@novell.com>
-
-	* gui/dialogs/comp-editor.[ch] (comp_editor_notify_client_changed):
-	new function for notifying all pages of the client change.
-	(page_client_changed_cb): no need for this callback.
-	(comp_editor_append_page): no need to connect to "client_changed"
-	signal on the pages.
-
-	* gui/dialogs/comp-editor-page.c
-	(comp_editor_page_notify_client_changed): re-added the call to
-	comp_editor_page_set_e_cal(), the client was not being set anywhere.
-
-	* gui/dialogs/event-page.c (source_changed_cb): use
-	comp_editor_notify_client_changed() so that all pages get informed
-	of the client change.
-
-	* gui/dialogs/task-page.c (source_changed_cb): ditto.
-
-2004-06-08  Rodrigo Moya <rodrigo@novell.com>
-
-	* gui/dialogs/comp-editor-page.c
-	(comp_editor_page_notify_client_changed): do not set the private
-	client here, it is set in comp-editor.c.
-
-	* gui/dialogs/event-page.c (sensitize_widgets): new function.
-	(source_changed_cb): call sensitize_buttons().
-
-	* gui/dialogs/recurrence-page.c (sensitize_buttons): new
-	function, to deal correctly with the sensitivity of all widgets
-	in the page.
-	(recurrence_page_fill_widgets, type_toggled_cb, client_changed_cb):
-	call sensitize_buttons() instead of sensitize_recur_widgets().
-	(recurrence_page_construct): g_signal_connect_after for
-	"client_changed", to get notifications after CompEditorPage
-	gets his.
-
-	* gui/dialogs/alarm-page.c (sensitize_buttons): sensitize the missing
-	widgets in the page.
-	(alarm_page_construct): g_signal_connect_after for "client_changed",
-	to get notifications after CompEditorPage gets his.
-
-2004-06-08  JP Rosevear  <jpr@novell.com>
-
-	* gui/e-week-view.c (e_week_view_do_key_press): cast week view
-	correctly
-
-2004-06-08  Rodrigo Moya <rodrigo@novell.com>
-
-	* gui/dialogs/recurrence-page.c (recurrence_page_construct): connect
-	to "client_changed" signal on the page.
-	(client_changed_cb): new callback.
-
-	* gui/dialogs/alarm-page.c (sensitize_buttons): fixed missing stuff
-	in last commit.
-
-2004-06-08  Rodrigo Moya <rodrigo@novell.com>
-
-	Fixes #59650
-
-	* gui/dialogs/alarm-page.c (alarm_page_construct): connect to
-	"client_changed" signal on the page.
-	(client_changed_cb): new callback.
-	(sensitize_buttons): added code for dealing with read only calendars
-	and disable/enable buttons approppriately.
-
-2004-06-07  Dan Winship  <danw@novell.com>
-
-	* gui/dialogs/comp-editor.c (pixmaps): s/stock_save_as/stock_save-as/
-
-2004-06-07  Rodrigo Moya <rodrigo@novell.com>
-
-	* gui/e-tasks.c (e_tasks_add_todo_source): open task lists
-	asynchronously.
-	(client_cal_opened_cb): callback from the client when opened.
-
-	* gui/gnome-cal.c (client_cal_opened_cb): disconnect from all
-	signals of the client when opening it fails. Clean up the status
-	messages correctly, based on source type.
-	(open_ecal): for tasks, use e_calendar_table_set_status_message
-	not e_calendar_view_set_status_message.
-	(gnome_calendar_remove_source_by_uid): call update_query only when
-	removing calendars, not tasks lists.
-	(update_query): set meaningful status messages.
-
-2004-06-06 Vardhman Jain <vardhman@students.iiit.net>
-
-	* Bug #36247
-	* gui/e-itip-control.c (write_html, set_date_label):
-	Changes to improve the performance of _(str) function call on strings
-	str of the type <tar>str</tag> to avoid translation of tag.
-
-2004-06-04    <jpr@novell.com>
-
-	* gui/gnome-cal.c: define G_MAXINT32 if it isn't already
-
-2004-06-04  JP Rosevear  <jpr@novell.com>
-
-	Fixes #58739
-	
-	* gui/migration.c (migrate_calendars): guard against NULL
-	gconf_val
-
-2004-06-04  JP Rosevear  <jpr@novell.com>
-
-	Fixes #59058
-	
-	* gui/gnome-cal.c (gnome_calendar_purge): make purging actually
-	work
-
-2004-06-04  JP Rosevear  <jpr@novell.com>
-
-	* gui/dialogs/task-page.c (task_page_fill_widgets): guard
-	against the text value being NULL
-
-	* gui/dialogs/event-page.c (event_page_fill_widgets): add guards
-	here as well
-	
-2004-06-03  Jeffrey Stedfast  <fejj@novell.com>
-
-	* conduits/calendar/calendar-conduit.c
-	(calconduit_load_configuration): If the last_uri string value is
-	the Evolution 1.4 URI, change it to the new URI. Fixes bug #54134.
-
-2004-06-03  Rodrigo Moya <rodrigo@novell.com>
-
-	Fixes #59481
-	
-	* gui/e-tasks.c (set_status_message): don't use vsprintf with
-	NULL strings, crashes on FreeBSD.
-
-2004-06-03  Rodrigo Moya <rodrigo@novell.com>
-
-	* gui/dialogs/comp-editor-page.c
-	(comp_editor_page_notify_client_changed): update the internal client
-	when it changes.
-
-2004-06-03  Rodrigo Moya <rodrigo@novell.com>
-
-	Fixes #56875
-
-	* gui/dialogs/event-editor.c (event_editor_construct): connect to
-	"client_changed" signal on the EventPage.
-	(client_changed_cb): set menu sensibility when the client changes.
-
-	* gui/dialogs/task-editor.c (task_editor_construct): connect to
-	"client_changed signal on the TaskPage.
-	(client_changed_cb): set menu sensibility when the client changes.
-
-2004-06-02  JP Rosevear  <jpr@novell.com>
-	
-	* gui/alarm-notify/alarm-notify.c (process_removal_in_hash): free
-	the correct uri, preventing bad memory corruption
-	(list_changed_cb): track the removals in a list so we don't
-	clobber the hash table data during the foreach loop
-
-2004-06-02  Chris Toshok  <toshok@ximian.com>
-
-	* gui/migration.c (migrate_calendars): remove absolute_uri from
-	ESource's.
-	(migrate_tasks): same.
-
-2004-06-02  Rodrigo Moya <rodrigo@novell.com>
-
-	* gui/e-meeting-list-view.c (start_addressbook_server): removed
-	pre-completion code, not needed anymore.
-	(emlv_finalize): no need to unref the book anymore.
-	(emlv_init): don't call start_addressbook_server.
-
-	* gui/dialogs/copy-source-dialog.c (copy_source): fixed
-	leak and pass the correct icalcomponent to e_cal_modify_object.
-
-2004-06-02  Rodrigo Moya <rodrigo@novell.com>
-
-	Fixes #59333
-
-	* gui/dialogs/task-page.c (task_page_fill_widgets): guard against
-	list items being NULL.
-
-2004-06-02  Larry Ewing  <lewing@ximian.com>
-
-	* gui/e-tasks.c (table_drag_data_delete): add a drag delete handler.
-	(table_drag_data_get): support text/vcard drags.
-	(setup_widgets): setup the etable as a drag source.
-
-	* gui/tasks-component.c: add source selector Drag & Drop handlers.
-
-2004-06-01  Larry Ewing  <lewing@ximian.com>
-
-	* gui/dialogs/calendar-setup.c: rename can_add to is_mutable, add
-	sensitivity logic for both readonly and mutable cases.  The
-	esource attributes are a complete mess and need discussion.
-
-	* gui/dialogs/calendar-setup.glade: remove edit dialogs and name
-	the tables.
-
-
-2004-06-01  Rodrigo Moya <rodrigo@novell.com>
-
-	Fixes #59369
-
-	* gui/e-calendar-view.c (clipboard_get_text_cb): don't pass NULL strings
-	to libical functions.
-
-2004-05-31  Priyanshu Raj <Priyanshu@students.iiit.net>
-
-	* Bug #51968 "Invite others.." button confusing in Appointment
-	editor dialog(Fixed)"
-
-2004-05-29  Priyanshu Raj <priyanshu@students.iiit.net>
-
-	* Bug #48134: Menu items in Scheduling tab should have sentence
-	capitalization (Fixed)
-	
-2004-05-28  Kidd Wang  <kidd.wang@sun.com>
-
-	* gui/e-week-view.c: (e_week_view_event_move),
-	(e_week_view_get_day_offset_of_event): a more straightforward way
-	to calculate the offset of a day within the week.
-
-2004-05-26  Jeffrey Stedfast  <fejj@novell.com>
-
-	Fix for bug #57818.
-
-	* gui/e-tasks.c (setup_widgets): Same.
-
-	* gui/gnome-cal.c (setup_widgets): Updated to pass a set of
-	bitflags to cal_search_bar_new().
-
-	* gui/cal-search-bar.c (cal_search_bar_new): Now takes a bit flag
-	argument specifying which search options to present.
-	(cal_search_bar_construct): Same as above. Construct the search
-	menu to use based on the bit flags.
-
-	* gui/apps_evolution_calendar.schemas.in.in: Changed the default
-	"Tasks due today" colour to be a light-blue (one of the default
-	colour values in the colour picker dialog). Fixes bug #53412.
-
-2004-05-26  Rodrigo Moya <rodrigo@ximian.com>
-
-	Fixes #57759
-
-	* gui/gnome-cal.c (gnome_calendar_remove_source_by_uid): remove all
-	queries we've got for the removed source.
-
-2004-05-26  Kidd Wang  <kidd.wang@sun.com>
-
-	* gui/e-week-view.c: (e_week_view_event_move),
-	(e_week_view_get_day_offset_of_event): a more straightforward way
-	to calculate the offset of a day within the week.
-
-2004-05-26  Kidd Wang  <kidd.wang@sun.com>
-
-	* gui/e-week-view.c: (e_week_view_event_move),
-	(e_week_view_change_event_time): In week view all-day events should
-	keep all-dayness when moved around.
-
-2004-05-25  Larry Ewing  <lewing@ximian.com>
-
-	* gui/dialogs/calendar-setup.c: remove now unused functions.
-	(source_group_can_add): fix can add logic, remove more unused
-	functions.
-
-	* gui/dialogs/calendar-setup.c (calendar_setup_edit_task_list):
-	use the new dialog.
-	(calendar_setup_edit_calendar): use the new dialog.
-	(key_press_event): look for escape press and destroy dialog.
-
-2004-05-25  Jeffrey Stedfast  <fejj@novell.com>
-
-	* gui/dialogs/url-editor-dialog.c (init_widgets): Use
-	gtk_window_set_icon_list() here instead of gtk_window_set_icon().
-
-	* gui/dialogs/select-source-dialog.c (select_source_dialog): Use
-	gtk_window_set_icon_list() here instead of gtk_window_set_icon().
-
-	* gui/dialogs/calendar-setup.c (source_to_dialog): Huh?? Why are
-	integer colours in an array of char*? Fixed to be an array of
-	guint32.
-
-	* gui/dialogs/changed-comp.c (changed_component_dialog): Use
-	gtk_window_set_icon_list() here instead of gtk_window_set_icon().
-
-	* gui/dialogs/calendar-setup.c (calendar_setup_new_calendar):
-	Don't bother calling tk_window_set_icon() if we are gonna call
-	gtk_window_set_icon_list a few lines later.
-	(calendar_setup_edit_calendar): Same.
-	instead.
-	(calendar_setup_new_task_list): Same.
-	(calendar_setup_edit_task_list): Same.
-
-	* gui/dialogs/alarm-options.c (alarm_options_dialog_run): Use
-	gtk_window_set_icon_list() instead of gtk_window_set_icon() so gtk
-	can do the Right Thing (tm).
-
-2004-05-25  Jeffrey Stedfast  <fejj@novell.com>
-
-	* Makefile.am: Make calendar-errors.xml.h and install the xml
-	file.
-
-	* calendar-errors.xml: New error definitions file.
-
-	* gui/gnome-cal.c (backend_died_cb): Use e-error
-
-	* gui/e-tasks.c (backend_died_cb): Use e-error
-
-	* gui/dialogs/send-comp.c (send_component_dialog): Use e-error
-
-	* gui/dialogs/save-comp.c (save_component_dialog): Use e-error
-
-	* gui/dialogs/delete-comp.c (delete_component_dialog): Use e-error
-
-	* gui/dialogs/cancel-comp.c (cancel_component_dialog): Use e-error
-
-2004-05-25  Sivaiah Nallagatla <snallagatla@novell.com>
-
-	* common/authentication.c (auth_func_cb): read the "auth-domain"
-	property to use as component name for e-password calls instead of
-	hard coded component name
-
-2004-05-25  Trent Lloyd  <lathiat@bur.st>
-
-	Fixes: #57472
-
-	* gui/dialogs/alarm-options.c:
-	* gui/dialogs/calendar-setup.c:
-	* gui/dialogs/cancel-comp.c:
-	* gui/dialogs/changed-comp.c:
-	* gui/dialogs/delete-comp.c:
-	* gui/dialogs/delete-error.c:
-	* gui/dialogs/save-comp.c:
-	* gui/dialogs/select-source-dialog.c:
-	* gui/dialogs/send-comp.c
-	* gui/dialogs/url-editor-dialog.c:
-	- Add include of e-icon-factory.h
-	- Set icon on window to be calendar/tasks icon rather than mail icon
-
-2004-05-21  Larry Ewing  <lewing@ximian.com>
-
-	* gui/dialogs/calendar-setup.c: set the dialog icons appropriately
-	for add task and calendar dialogs.
-
-2004-05-21  Larry Ewing  <lewing@ximian.com>
-
-	* gui/dialogs/calendar-setup.c: remove references to the uri
-	buttons.
-
-	* gui/dialogs/calendar-setup.glade: remove uri buttons, make add
-	task window wider and make the button spacing larger.
-
-2004-05-21  H P Nadig  <hpnadig@pacific.net.in>
-
-       * gui/dialogs/calendar-setup.glade: Adjusted the default size of
-       New Calendar Dialog. Fixes 57469.
-
-2004-05-20  JP Rosevear  <jpr@ximian.com>
-
-	* gui/e-itip-control.c (find_server): proper look for figuring out
-	if the object is on the server
-
-2004-05-20  JP Rosevear  <jpr@novell.com>
-
-	* gui/tag-calendar.c (tag_calendar_by_comp): pass the client
-	properly
-
-2004-05-19  Chris Toshok  <toshok@ximian.com>
-
-	* gui/e-meeting-store.c (start_addressbook_server): use the new
-	e_book_new_* and e_book_open apis.
-
-	* gui/e-meeting-list-view.c (start_addressbook_server): use the
-	new e_book_new_* and e_book_open apis.
-
-2004-05-19  William Jon McCann  <mccann@jhu.edu>
-
-	* gui/GNOME_Evolution_Calendar.server.in.in: Add menu_label and
-	menu_accelerator.
-
-2004-05-18  JP Rosevear  <jpr@novell.com>
-
-	* idl/evolution-calendar.idl: add arg
-
-	* gui/alarm-notify/alarm-queue.c (edit_component): send a mode
-	type
-
-	* gui/alarm-notify/alarm-notify.c: add fixme note
-
-	* gui/comp-editor-factory.c (impl_editExisting): take a editor
-	mode and twist it into a source type
-	(impl_editNew): ditto
-	(open_client): take a source type for creating the client
-	(lookup_open_client): ditto
-
-2004-05-18  JP Rosevear  <jpr@novell.com>
-
-	* gui/alarm-notify/notify-main.c (init_alarm_service): just set up
-	the alarm notify object
-
-	* gui/alarm-notify/alarm-notify.h: update proto
-
-	* gui/alarm-notify/alarm-notify.c (process_removal_in_hash):
-	process removals using the source list
-	(list_changed_cb): when the list changes, update
-	(load_calendars): initially load the calendars
-	(alarm_notify_init): load the calendars here and don't listen for
-	a selection notification
-	(alarm_notify_add_calendar): get the source type when adding a
-	calendar
-
-	* gui/alarm-notify/notify-main.c (main): no need to init/shutdown
-	gnome vfs
-
-	* gui/alarm-notify/config-data.h: new proto
-
-	* gui/alarm-notify/config-data.c
-	(config_data_get_notify_with_tray): routine to get schema value
-
-	* gui/alarm-notify/alarm.c (alarm_ready_cb): no timeout checking
-	here, setup_timeout does that
-	(queue_alarm): ditto
-	(setup_timeout): calculate the timeout better
-
-	* gui/alarm-notify/alarm-queue.c (query_objects_changed_cb): tidy
-	(edit_component): clean up exception handling
-	(display_notification): don't show the tray icon if we aren't
-	notifying with the tray
-
-	* gui/apps_evolution_calendar.schemas.in.in: add notify_with_tray
-	option
-
-2004-05-18  Kidd Wang  <kidd.wang@sun.com>
-
-	* gui/e-week-view.c: (e_week_view_do_cursor_key_up),
-	(e_week_view_do_cursor_key_down), (e_week_view_do_cursor_key_left),
-	(e_week_view_do_cursor_key_right), (e_month_view_do_cursor_key_up),
-	(e_month_view_do_cursor_key_down),
-	(e_month_view_do_cursor_key_left),
-	(e_month_view_do_cursor_key_right), (e_week_view_cursor_key_up),
-	(e_week_view_cursor_key_down), (e_week_view_cursor_key_left),
-	(e_week_view_cursor_key_right), (e_week_view_do_key_press): make
-	the focus movable in week/month view when no events are selected.
-
-2004-05-17  Jeffrey Stedfast  <fejj@novell.com>
-
-	* gui/dialogs/event-editor.c: Same.
-
-	* gui/dialogs/comp-editor.c: Change E_PIXMAP size args
-	over to E_ICON_SIZE_* values.
-
-	* gui/alarm-notify/alarm-queue.c (tray_icon_blink_cb): Use
-	E_ICON_SIZE enum here.
-	(display_notification): Same.
-
-	* gui/alarm-notify/alarm-notify-dialog.c (write_html_heading): Use
-	E_ICON_SIZE_DIALOG here.
-
-	* gui/e-week-view.c (e_week_view_realize): Same as below.
-
-	* gui/e-day-view.c (e_day_view_realize): Use E_ICON_SIZE_MENU for
-	the icon sizes rather than using pixel values.
-
-	* gui/calendar-commands.c (pixmaps): Change E_PIXMAP size args
-	over to E_ICON_SIZE_* values.
-
-	* gui/tasks-component.c (add_popup_menu_item): Use
-	E_ICON_SIZE_MENU
-
-	* gui/e-timezone-entry.c (e_timezone_entry_init): Use
-	E_ICON_SIZE_BUTTON
-
-	* gui/e-itip-control.c (write_error_html): Use E_ICON_SIZE enums.
-	(write_html): Same.
-
-	* gui/e-calendar-view.c (e_calendar_view_set_status_message): Use
-	E_ICON_SIZE_STATUS
-	(setup_popup_icons): Use E_ICON_SIZE_MENU
-
-	* gui/e-calendar-table.c (e_calendar_table_init): Use
-	E_ICON_SIZE_LIST rather than a hard-coded value of 16 pixels.
-	(e_calendar_table_set_status_message): Use E_ICON_SIZE_STATUS
-
-	* gui/calendar-component.c (add_popup_menu_item): Use
-	E_ICON_SIZE_MENU rather than hard-coding the pixel size.
-
-2004-05-17  JP Rosevear  <jpr@novell.com>
-
-	Fixes #56373
-	
-	* gui/comp-editor-factory.c (open_client): guess its an event for
-	now
-
-2004-05-17  V Ravi Kumar Raju <vravikr@yahoo.co.uk>
-
-	*  gui/e-alarm-list.c (get_alarm_string):
-	*  gui/dialogs/alarm-page.glade: Change dropdown list item 'Display
-	a message' for reminder types to 'Pop up an alert'
-
-2004-05-17  Rodrigo Moya <rodrigo@ximian.com>
-
-	* gui/e-calendar-view.c (e_calendar_view_delete_selected_occurrence):
-	if we don't have a RECURRENCE-ID, remove nothing, and use the instance
-	start time for the RECURRENCE-ID as the default.
-
-2004-05-17  H P Nadig  <hpnadig@pacific.net.in>
-
-	Fixes #56885
-	
-	* gui/dialogs/select-source-dialog.c (select_source_dialog): Changed
-	the window size of source dialog and a minor naming issue. 
-
-2004-05-14  Rodrigo Moya <rodrigo@ximian.com>
-
-	* gui/e-day-view.c (process_component):
-	* gui/e-week-view.c (process_component):
-	* gui/gnome-cal.c (gnome_calendar_purge):
-	* gui/tag-calendar.c (tag_calendar_by_comp):
-	* gui/e-cal-model.c (e_cal_model_generate_instances): use
-	e_cal_generate_instances_for_object instead of
-	e_cal_recur_generate_instances.
-
-2004-05-14  Nicel KM  <mnicel@novell.com>
-
-	* gui/dialogs/alarm-page.c (button_options_clicked_cb): invoke options 
-	dialog even if backend does not support email alarms and get email 
-	address only if supported.
-
-2004-05-13  Rodrigo Moya <rodrigo@ximian.com>
-
-	* gui/dialogs/alarm-page.c (add_clicked_cb): only get the email address
-	for alarms if the backend supports email alarms.
-
-2004-05-13  Not Zed  <NotZed@Ximian.com>
-
-	Fixes #57644.
-
-	* gui/e-day-view.c (row_deleted_check_cb): strdup the uid, as
-	below.
-	(remove_uid_cb): and free it.
-
-	* gui/e-week-view.c (row_deleted_check_cb): strdup the uid, 'cause
-	otherwise it can go away later as we delete stuff.
-	(remove_uid_cb): free the uid.
-
-	* gui/e-week-view-event-item.c (e_week_view_event_item_draw): add
-	some array bounds checking as an attempt to isolate the crash in
-	#57644.
-
-2004-05-11  Not Zed  <NotZed@Ximian.com>
-
-	* gui/migration.c (migrate_calendars, migrate_tasks): add GError
-	return for error details & return errors.
-
-	* gui/calendar-component.c (impl_upgradeFromVersion): fix for api
-	change, and erturn exception if we need to.
-
-2004-05-11  Rodrigo Moya <rodrigo@ximian.com>
-
-	* gui/e-itip-control.c (update_item): get error information from
-	the call to e_cal_receive_objects, and use that as the error message.
-
-2004-05-11  Dan Winship  <danw@ximian.com>
-
-	* gui/GNOME_Evolution_Calendar.server.in.in: Remove the calendar
-	and task list controls
-
-	* gui/main.c (factory): Remove support for the calendar and task
-	list controls
-
-	* gui/control-factory.c: Remove the property-bag stuff
-
-	* gui/tasks-control.c: Likewise
-
-2004-05-11  Rodrigo Moya <rodrigo@ximian.com>
-
-	Fixes #53137
-
-	* gui/dialogs/schedule-page.c (schedule_page_fill_widgets): check dates
-	from the ECalComponent before using them.
-
-2004-05-11  Rodrigo Moya <rodrigo@ximian.com>
-
-	* gui/e-cal-model-tasks.c (set_due): use/set the DUE date, not
-	the DTEND date.
-
-2004-05-07  Umeshtej <umeshtej@gawab.com>
-
-	Fixes #58014
-	
-	* gui/e-meeting-list-view.c (process_section):Run the for loop 
-	for the number of elements in cards.
-	
-2004-05-10  Trent Lloyd  <lathiat@bur.st>
-
-	* gui/dialogs/select-source-dialog.c: Include gtkhbox.h and gtkvbox.h
-	to fix implicit declaration
-	* gui/dialogs/meeting-page.c: (get_current_page) Cast GTK_ENTRY from
-	GTK_COMBO to fix compiler warning
-	* gui/dialogs/cal-prefs-dialog.c: Remove lvalue casts, produces
-	compiler warnings and are not necessary
-	
-2004-05-07  JP Rosevear  <jpr@ximian.com>
-
-	Fixes #52294
-	
-	* gui/e-cal-model.c (set_dtstart): set the tzid properly
-	(ecm_is_cell_editable): set check properly
-
-	* gui/e-cal-model-tasks.c (set_due): set the tzid properly
-	(ecmt_is_cell_editable): set check properly
-
-	* gui/e-cal-model-calendar.c (set_dtend): set the tzid properly
-	(ecmc_is_cell_editable): kill fixme and set check properly
-
-2004-05-07  JP Rosevear  <jpr@ximian.com>
-
-	* gui/e-cal-model.c (ecm_is_cell_editable): fix comment and check
-
-	* gui/e-cal-model-tasks.c (ecmt_set_value_at): set a parent field
-	properly
-	(ecmt_is_cell_editable): fix comment and check
-
-2004-05-06  Larry Ewing  <lewing@ximian.com>
-
-	* gui/dialogs/calendar-setup.c (source_to_dialog): use random
-	color for calendar default.
-
-2004-05-05  JP Rosevear  <jpr@ximian.com>
-
-	Fixes #58025
-	
-	* gui/gnome-cal.c (set_search_query): kill warning
-	(setup_config): don't set time out here
-	(setup_widgets): set it here
-	(gnome_calendar_destroy): clear the time out
-
-	* gui/e-tasks.c (search_bar_sexp_changed_cb): kill warning
-	(setup_config): don't set time out here
-	(setup_widgets): set it here and remember the time out id
-	(e_tasks_destroy): clear the time out
-
-2004-05-05  Larry Ewing  <lewing@ximian.com>
-
-	* gui/dialogs/calendar-setup.c: make sure that we don't crash if
-	there are no sources.
-	(calendar_setup_new_task_list): fix the previous fix to work if
-	there are sources.
-
-2004-05-04  Larry Ewing  <lewing@ximian.com>
-
-	* gui/dialogs/calendar-setup.c: fix logic error.
-	(source_group_can_add): helper function to fix groupwise case.
-	I'm still not happy with this but it will work for now.
-
-	* gui/dialogs/calendar-setup.c (source_to_dialog): convert units.
-	(dialog_to_source): convert time units.
-
-	* gui/dialogs/calendar-setup.glade. name the unit option menus.
-
-2004-05-03  Rodney Dawes  <dobey@ximian.com>
-
-	* gui/dialogs/select-source-dialog.c (select_source_dialog):
-	Make this dialog be HIG-compliant and accessible
-
-2004-05-03  Edgar Luna Díaz  <eald@linuxuanl.org>
-
-	* gui/dialogs/select-source-dialog.c (select_source_dialog):
-	Set the default window size to 276 x 320
-
-	Fixes #57298
-
-2004-05-03  Larry Ewing  <lewing@ximian.com>
-
-	* gui/dialogs/calendar-setup.glade: rename the cancel button.
-
-2004-04-29  Larry Ewing  <lewing@ximian.com>
-
-	* gui/e-cal-model.c (ecm_get_color_for_component): use the source
-	color if it is set.  Yay for ugly colors.
-
-	* gui/e-cal-model.h: add a color holder to the ECalModelComponent
-	since the return value of the color stuff is const.
-
-2004-05-03  JP Rosevear  <jpr@ximian.com>
-
-	Fixes #51714
-	
-	* gui/e-cal-list-view.c (setup_e_table): listen for double click
-	signal
-	(e_cal_list_view_on_table_double_click): edit the appointment that
-	was double clicked on
-
-2004-05-03  JP Rosevear  <jpr@ximian.com>
-
-	* gui/calendar-component.c (set_info): set the info label
-	(calendar_dates_changed_cb): call back for when the dates of the
-	calendar change
-	(create_component_view): store the info label for later use;
-	listen for date changes to set the info label
-
-2004-05-03  JP Rosevear  <jpr@ximian.com>
-
-	Fixes #57897
-	
-	* gui/e-tasks.c (setup_widgets): no need to listen for the deleted
-	signal, the cursor will change in that case
-
-2004-05-03  JP Rosevear  <jpr@ximian.com>
-
-	* gui/e-cal-model-tasks.c (set_completed): remove useless debug
-	statement
-
-2004-05-03  JP Rosevear  <jpr@ximian.com>
-
-	* gui/tasks-component.c (set_info): set the info label message
-	(model_changed_cb): call above
-	(table_selection_change_cb): ditto
-	(model_rows_inserted_cb): ditto
-	(model_rows_deleted_cb): ditto
-	(create_component_view): remember the info in the view struct;
-	listen for events that require the info label to be updated
-
-2004-05-03  JP Rosevear  <jpr@ximian.com>
-
-	Fixes #57899
-	
-	* gui/e-day-view.c (e_day_view_do_key_press): bail if the client
-	is read only (or we get an error trying to find out)
-
-	* gui/e-week-view.c (e_week_view_do_key_press): ditto
-	
-2004-05-03  JP Rosevear  <jpr@ximian.com>
-
-	Fixes #57894
-	
-	* gui/gnome-cal.c (gnome_calendar_new_task): make sure we use the
-	default component of the correct model
-
-2004-04-30  Rodney Dawes  <dobey@ximian.com>
-
-	* gui/alarm-notify/alarm-notify-dialog.c (alarm_notify_dialog):
-	* gui/alarm-notify/alarm-notify.glade:
-	Update the alarm notify dialog to be HIG compliant
-
-	Fixes #41224
-
-2004-04-30  Gary Ekker  <gekker@novell.com>
-
-	* gui/e-tasks.c: (e_tasks_init): Set up the model to use the correct 
-	query. Setup callbacks for gconf changes. Add an idle timeout to hide 
-	completed items.
-	Add update_view, update_view_cb, and 
-	config_hide_completed_tasks_changed_cb to update the model view.
-
-	* gui/gnome-cal.c: ditto
-	
-	* gui/calendar-config.h: Add notifications for hide_completed_tasks
-	settings.
-
-	* gui/calendar-config.c: ditto
-
-2004-04-30  Not Zed  <NotZed@Ximian.com>
-
-	* gui/dialogs/meeting-page.c (get_widgets): make the entry
-	non-editable.  Quick fix for #48132 (could convert to optionmenu
-	but then we need to change again for gnome >?2.6).
-
-2004-04-29  Rodney Dawes  <dobey@ximian.com>
-
-	* gui/dialogs/cal-prefs-dialog.glade: Update the prefs dialog pages
-	for the calendar and tasks components to be HIG compliant
-
-2004-04-29  JP Rosevear  <jpr@ximian.com>
-
-	* gui/tasks-component.h (tasks_component_peek_source_list): remove
-	prototypes
-
-	* gui/tasks-component.c (source_removed_cb):  unselect the
-	source in the selector if source removed from calendar
-	(create_component_view): create the activity handler and listen to
-	source remove signal
-
-	* gui/gnome-cal.h: add signals, protos
-
-	* gui/gnome-cal.c (gnome_calendar_class_init): add source added
-	and removed signals
-	(client_cal_opened_cb): emit source removed signal
-	(open_ecal): set the status message
-	(backend_died_cb): emit source removed signal
-	(gnome_calendar_set_activity_handler): allow an activity handler
-	to be set
-	(gnome_calendar_add_source): emit source added signal
-	(gnome_calendar_remove_source): emit source removed signal
-	(display_view): update the active activity handler
-	
-	* gui/e-tasks.h: add signal prototypes
-
-	* gui/e-tasks.c (e_tasks_class_init): add source added and removed
-	signals
-	(backend_died_cb): emit source removed signal
-	(e_tasks_add_todo_source): emit source added/removed signals
-	(e_tasks_remove_todo_source): emit source removed signal
-
-	* gui/e-calendar-view.h: add proto
-
-	* gui/e-calendar-view.c (e_calendar_view_set_activity_handler):
-	allow an activity handler to be set
-	(e_calendar_view_set_status_message): use private activity handler
-	(if any) to set status message
-
-	* gui/e-calendar-table.h: add data member and proto
-
-	* gui/e-calendar-table.c (e_calendar_table_set_activity_handler):
-	allow an activity handler to be set
-	(e_calendar_table_set_status_message): use private activity
-	handler (if any) to set status message
-
-	* gui/e-calendar-marshal.list: add extra marshallers
-
-	* gui/calendar-component.h: kill protos
-
-	* gui/calendar-component.c (source_removed_cb): unselect the
-	source in the selector if source removed from calendar
-	(create_component_view): create the activity handler and listen to
-	source remove signal
-
-2004-04-29  JP Rosevear  <jpr@ximian.com>
-
-	* gui/dialogs/comp-editor.c (send_timezone): ditto
-
-	* gui/dialogs/task-page.c (task_page_fill_component): kill warning
-
-2004-04-29  JP Rosevear  <jpr@ximian.com>
-
-	* gui/e-cal-model.c (e_cal_model_set_default_client): kill warning
-
-2004-04-29  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* gui/migration.c (migrate_pilot_data): Removed the terminating
-	NULL vararg since we don't need it for g_strdup_printf, it was
-	only needed when it was g_build_filename(). Gets rid of a gcc
-	warning.
-
-2004-04-29  Not Zed  <NotZed@Ximian.com>
-
-	* gui/e-itip-control.c (e_itip_control_set_data): check we find
-	any usable components of the icalendar entry before dereferncing
-	it.  Fixes crash in #57264.
-
-2004-04-28  Not Zed  <NotZed@Ximian.com>
-
-	* gui/e-itip-control.c (object_requested_cb): dont shadow source
-	with another source in the fallback case.  Related to #54094.
-
-2004-04-27  JP Rosevear  <jpr@ximian.com>
-
-	* gui/cal-search-bar.c: disable comment searching which is
-	currently useless
-
-2004-04-27  JP Rosevear  <jpr@ximian.com>
-
-	Fixes #52270 and #57593
-	
-	* gui/e-cal-model-tasks.c (ecmt_set_value_at): remove checks for
-	start after due
-	(ecmt_duplicate_value): copy the completed and due dates properly
-	(ecmt_fill_component_from_model): only set the percent and status
-	if the completion isn't set
-	(ensure_task_partially_complete): ensure the task is not complete,
-	in progress and make the percentage sensible if its 0 or 100
-	(set_status): make sure the status and related vars are set
-	properly
-	(ecmt_set_value_at): handle status
-	(ecmt_fill_component_from_model): make sure the click to add
-	fields don't clobber each other
-	(ecmt_is_cell_editable): status is editable
-
-	* gui/e-cal-model-calendar.c (ecmc_duplicate_value): copy the
-	dtend correctly
-
-2004-04-27  Larry Ewing  <lewing@ximian.com>
-
-	* gui/dialogs/calendar-setup.c: hook up the color picker and test
-	buttons in the new task dialog.
-
-	* gui/dialogs/calendar-setup.glade: fix visibility and color
-	picker names.
-
-2004-04-27  Larry Ewing  <lewing@ximian.com>
-
-	* gui/dialogs/calendar-setup.c (new_calendar_test_uri): add
-	handler for test button.
-	(calendar_setup_new_calendar): connect test button, fill in color
-	picker member.
-	(source_to_dialog): set the color picker color if the source has
-	one.
-	(dialog_to_source): set the source color.
-	
-2004-04-27  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* gui/migration.c (migrate_tasks): Fixed the version checks for
-	migrating pilot data.
-	(migrate_calendars): Same.
-	(migrate_pilot_data): Doh. Take a third argument to specify what
-	component we are migrating ("todo" vs "calendar") so that we can
-	compare against the correct filename. Might help :-)
-	(migrate_pilot_db_key): Just set an empty value for the data since
-	there's no way to actually get it and I don't think it really
-	matters anyway.
-
-2004-04-27  Kidd Wang  <kidd.wang@sun.com>
-
-	* gui/e-cal-model-tasks.c: (ecmt_set_value_at): compare the start
-	time and the due time only when both are not null.
-
-2004-04-26  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* gui/migration.c (migrate_pilot_data): New function to migrate
-	pilot data.
-	(migrate_calendars): Migrate pilot data if upgrade version <=1.5.9
-	(migrate_tasks): Same.
-
-2004-04-23  Rodney Dawes  <dobey@ximian.com>
-
-	* gui/alarm-notify/notify-main.c (main): Call e_icon_factory_init ()
-
-	Fixes #57497
-
-2004-04-22  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* conduits/calendar/calendar-conduit.c (start_calendar_server):
-	Use e_cal_open_default() instead of e_cal_open().
-	(map_name): Changed the path for the pilot map filename.
-	(pre_sync): Changed the query to "#t" instead of "(#t)" and
-	removed a duplicate block of code (seems to have been a paste-o?).
-
-	* conduits/todo/todo-conduit.c (start_calendar_server): Use
-	e_cal_open_default() instead of e_cal_open().
-	(map_name): Changed the path for the pilot map filename.
-	(pre_sync): Changed the query to "#t" instead of "(#t)" and
-	removed a duplicate block of code (seems to have been a paste-o?).
-
-2004-04-22  JP Rosevear  <jpr@ximian.com>
-
-	Fixes #56092
-	
-	* gui/e-day-view.c (e_day_view_show_popup_menu): weak ref for the
-	menu to be destroyed
-	(popup_destroyed_cb): reset popup_event_num and popup_event_day
-
-	* gui/e-week-view.c (e_week_view_show_popup_menu): weak ref for
-	the menu to be destroyed
-	(popup_destroyed_cb): reset the popup_event_num
-
-2004-04-21  JP Rosevear  <jpr@ximian.com>
-
-	* gui/calendar-component.c (create_new_event): make sure we don't
-	deref a NULL pointer
-
-2004-04-21  JP Rosevear  <jpr@ximian.com>
-
-	Fixes #56504
-	
-	* gui/gnome-cal.c (gnome_calendar_destroy): no need to destroy the
-	creatable item handler
-	(gnome_calendar_set_ui_component): don't do the creatable
-	item stuff here
-
-	* gui/e-tasks.c (e_tasks_set_ui_component): don't do the creatable
-	item stuff here
-	(e_tasks_destroy): no need to destroy creatable item handler
-
-	* gui/e-calendar-table.c (e_calendar_table_set_status_message):
-	comment out temporarily
-
-	* gui/e-calendar-view.c (e_calendar_view_set_status_message): ditto
-	
-	* gui/calendar-component.c: switch to using per component view
-	information; don't listen for config changes to the primary
-	selection and selection so that different windows can have
-	different calendar selections; use a local creatable items handler
-	so that the new button is associated with the right window when
-	setting the default times
-
-	* gui/tasks-component.c: ditto
-	
-2004-04-21  JP Rosevear <jpr@ximian.com>
-
-	* gui/e-tasks.c (set_timezone): only set the preview zone if the
-	preview has been created
-	(setup_widgets): set the default zone for the preview pane
-
-2004-04-21  JP Rosevear <jpr@ximian.com>
-
-	Fixes #55797
-	
-	* gui/calendar-component.c (create_new_event): force an all day
-	event if we are viewing the week, month or list view, which mimics
-	double click in the view
-
-2004-04-21  Frederic Crozat  <fcrozat@mandrakesoft.com>
-
-	* gui/migration.c: (migrate_calendars):
-	Fix crash when gconf value are not existing in the gconf
-        database.
-
-2004-04-21  Not Zed  <NotZed@Ximian.com>
-
-	** Fixes #57034.
-	
-	* gui/dialogs/calendar-setup.c (create_new_source_with_group):
-	NULL out source if we can't open the calendar.
-	(source_group_menu_add_groups): if the group is readonly, then
-	desensitise it.
-	(source_group_menu_add_groups): return the first non-readonly
-	calendar index.
-	(calendar_setup_new_calendar): set the group history to the first
-	non-readonly group.
-	(calendar_setup_new_task_list): same.
-
-	* gui/gnome-cal.c (gnome_calendar_set_ui_component): fix for
-	user_creatable_items api changes.
-
-	* gui/e-tasks.c (e_tasks_set_ui_component): fix for
-	user_creatable_items api changes.
-
-2004-04-19  Michael Terry  <mike@mterry.name>
-
-	* gui/GNOME_Evolution_Calendar.server.in.in:
-	* gui/calendar-commands.c:
-	* gui/calendar-component.c:
-	* gui/e-calendar-table.c:
-	* gui/e-calendar-view.c:
-	* gui/e-day-view-main-item.c:
-	* gui/e-day-view-top-item.c:
-	* gui/e-day-view.c:
-	* gui/e-day-view.h:
-	* gui/e-itip-control.c:
-	* gui/e-timezone-entry.c:
-	* gui/e-week-view-event-item.c:
-	* gui/e-week-view.c:
-	* gui/e-week-view.h:
-	* gui/tasks-component.c:
-	* gui/alarm-notify/alarm-notify-dialog.c:
-	* gui/alarm-notify/alarm-queue.c:
-	* gui/dialogs/comp-editor.c:
-	* gui/dialogs/event-editor.c: Update the calendar to use the icon theme
-	through the EIconFactory object in e-util
-
-2004-04-19  JP Rosevear <jpr@ximian.com>
-
-	* gui/gnome-cal.c (set_view): take a range_selected boolean for
-	internal use
-	(gnome_calendar_set_view): use above
-	(display_view): use priv->range_selected, we'll set it correctly
-	before this
-	(display_view_cb): only pass focus boolean
-	(gnome_calendar_on_date_navigator_selection_changed): set the view
-	so the view menu is accurate
-
-2004-04-18  JP Rosevear <jpr@ximian.com>
-
-	Fixes #54021
-	
-	* importers/icalendar-importer.c (update_single_object): ensure
-	UID exists
-
-2004-04-18  JP Rosevear <jpr@ximian.com>
-
-	Fixes #53124
-	
-	* gui/e-tasks.c: remove preview pieces, they are in their own
-	class now; use the new class for preview
-
-	* gui/e-cal-component-preview.[hc]: implement a preview area for
-	tasks and events
-
-2004-04-17  Trent Lloyd  <lathiat@sixlabs.org>
-
-	* gui/e-calendar-view.c: include libecal/e-cal-component.h to kill
-	implicit declaration of e_cal_component_get_recur_id_as_string at line
-	869.
-
-2004-04-15 Gary Ekker <gekker@novell.com>
-
-	Fixes #52271
-
-	* gui/e-cal-model-tasks.c: (set_percent): shouldn't call 
-	ensure_task_not_complete here, it removes the percent property that 
-	we just set.
-	
-
-2004-04-15  JP Rosevear  <jpr@ximian.com>
-
-	* gui/dialogs/task-page.c (task_page_fill_component): don't
-	actually check if start date is after due date, its perfectly
-	valid for that to occur
-
-2004-04-15  JP Rosevear  <jpr@ximian.com>
-
-	Fixes #53903
-	
-	* gui/dialogs/meeting-page.c (meeting_page_fill_widgets):
-	show/hide add button properly
-	(change_clicked_cb): ditto
-
-	* gui/dialogs/comp-editor.c (needs_send_cb): call back when "needs_send"
-	(page_changed_cb): use accessor
-	
-2004-04-15  JP Rosevear  <jpr@ximian.com>
-
-	* gui/dialogs/comp-editor.c (save_comp): stop listening to changes
-	since we are just going to save and close
-	(save_cmd): remove, its ok since we are toasting menus shortly
-	anyhow
-	(obj_modified_cb): no need to look at update flag
-	(obj_removed_cb): ditto
-
-2004-04-15  Gary Ekker  <gekker@novell.com>
-
-	* gui/calendar-component.h: move the calendar publishing initialization
-	from createControls to main.c
-
-	* gui/calendar-component.c: (create_controls): Ditto
-
-	* gui/main.c: (initialize): Ditto
-
-	* gui/dialogs/cal-prefs-dialog.c: (url_list_changed): remove a gfree
-	that was freeing a before it should have been. Also removed cruft from 
-	a previous attempt to fix the crash.
-
-2004-04-15  Rodrigo Moya <rodrigo@ximian.com>
-
-	* gui/dialogs/select-source-dialog.c (select_source_dialog): added some
-	spacing.
-
-	* gui/e-calendar-view.c (e_calendar_view_delete_selected_occurrence):
-	use the DTSTART for the recur-id if it's not available.
-
-2004-04-14  Larry Ewing  <lewing@ximian.com>
-
-	* gui/calendar-component.c (selector_tree_drag_motion): fix
-	missing parameters, wow that was a mess.
-
-	* gui/dialogs/calendar-setup.glade: add the new "new" dialogs,
-	remove the old druids.
-
-	* gui/dialogs/calendar-setup.c (calendar_setup_new_calendar): use
-	the new dialogs, colors are still not functional.
-	(calendar_setup_new_task_list): use the new dialogs, with no colors.
-
-2004-04-14  JP Rosevear <jpr@ximian.com>
-
-	Fixes #56613
-	
-	* gui/gnome-cal.h: add proto
-
-	* gui/gnome-cal.c (client_cal_opened_cb): key the clients by uid
-	(backend_died_cb): ditto
-	(gnome_calendar_add_source): ditto
-	(gnome_calendar_remove_source): use remove_source_by_uid
-	(gnome_calendar_remove_source_by_uid): new function to remove a
-	source by uid
-	(gnome_calendar_set_default_source): key the clients by uid
-
-	* gui/calendar-component.c (update_task_selection): the source
-	could be NULL if the source was deleted rather than unchecked
-	(update_primary_task_selection): look at the task source list
-
-2004-04-14  JP Rosevear <jpr@ximian.com>
-
-	Fixes #56553
-	
-	* importers/icalendar-importer.c (prepare_events): don't double
-	free or continue, we need to move to the next item
-	 (prepare_tasks): don't continue, move to the next item
-	
-2004-04-14  Not Zed  <NotZed@Ximian.com>
-
-	* gui/tasks-component.c (impl_createControls): Same as below for
-	the tasks component.
-
-	* gui/calendar-component.c (impl_createControls): add the info
-	area label widget to the sidebar control (c&p the addressbook
-	code).
-
-2004-04-12  Gary Ekker  <gekker@novell.com>
-
-        Fixes #56628
-	
-	* gui/calendar-component.c (create_new_event): Add informational dialog
-	when user attempts event creation in read-only calendar.
-	
-
-2004-04-09  Gary Ekker  <gekker@novell.com>
-
-	* gui/dialogs/url-editor-dialog.c: Fixed to use e-passwords.
-
-	* gui/dialogs/cal-prefs-dialog.c: Fixed crash and bugs created by 
-	changes made for instant apply.
-
-	* gui/itip-utils.c: Fixed to use e-passwords.
-
-	* gui/e-pub-utils.c: Fixed to use e-passwords.
-	(just_published): Fixed error in logic.
-	(e_pub_publish): Fixed crash if ESource is NULL.
-	
-
-2004-04-09  Chris Toshok  <toshok@ximian.com>
-
-	* gui/dialogs/e-delegate-dialog.c (e_delegate_dialog_construct):
-	EABDestination -> EDestination.
-	(e_delegate_dialog_get_delegate): same.
-	(e_delegate_dialog_get_delegate_name): same.
-
-	* gui/dialogs/alarm-options.c (alarm_to_malarm_widgets):
-	EABDestination -> EDestination.
-	(malarm_widgets_to_alarm): same.
-
-	* gui/e-select-names-editable.c
-	(e_select_names_editable_get_address): EABDestination ->
-	EDestination.
-	(e_select_names_editable_get_name): same.
-
-	* gui/e-meeting-list-view.c (process_section): EABDestination ->
-	EDestination.
-	(select_names_ok_cb): same.
-
-2004-04-09  Dan Winship  <danw@ximian.com>
-
-	* gui/gnome-cal.c (gnome_calendar_set_ui_component): Create an
-	EUserCreatableItemsHandler for the view if there isn't one yet,
-	and then activate it.
-	(gnome_calendar_destroy): destroy it.
-
-	* gui/calendar-component.c (impl__get_userCreatableItems): add
-	object/folder flags to items.
-
-	* gui/e-tasks.c (e_tasks_set_ui_component): Create an
-	EUserCreatableItemsHandler for the view if there isn't one yet,
-	and then activate it.
-	(e_tasks_destroy): destroy it.
-
-	* gui/tasks-component.c (impl__get_userCreatableItems): add
-	object/folder flags. Change "Task List" to "Tasks Group" per new
-	specs.
-
-	* gui/calendar-commands.c (calendar_control_deactivate): clear the
-	GnomeCal's ui_component rather than setting it again
-
-2004-04-07  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* gui/dialogs/cal-prefs-dialog.c: Fixed to be instant-apply.
-
-2004-04-07  JP Rosevear <jpr@ximian.com>
-
-	* gui/e-cal-model.c (e_cal_model_set_default_client): just add the
-	client, we have protection against re-adding it any how
-	(cal_opened_cb): stop listening to the open signal
-
-2004-04-07  JP Rosevear <jpr@ximian.com>
-
-	* gui/gnome-cal.c (gnome_calendar_dayjump): remove extra set view
-	params
-	(gnome_calendar_set_view): simplify, just set the current view id
-	and let the gal view stuff do the rest
-	(display_view): modify from set_view, don't set the view id here
-	or update the default view config setting
-	(display_view_cb): update the date navigator
-	(gnome_calendar_construct): kill the default view stuff, gal view
-	handles that
-	(gnome_calendar_on_date_navigator_selection_changed): use display_view
-
-	* gui/e-week-view.c (time_range_changed_cb): ditto
-	(e_week_view_set_selected_time_range): just set the selection,
-	don't fool with the base date
-	(e_week_view_on_button_press): do a full day event if double
-	clicked on
-
-	* gui/e-day-view.c (time_range_changed_cb): only set the selection
-	if we can't preserve an existing selection
-
-	* gui/control-factory.c (set_prop): allow list view, remove
-	default view usage
-
-	* gui/calendar-config.h: remove protos
-
-	* gui/calendar-config.c: remove default view calls
-
-	* gui/calendar-commands.c (show_day_view_clicked): remove extra
-	params to gnome_calendar_set_view
-	(show_work_week_view_clicked): ditto
-	(show_week_view_clicked): ditto
-	(show_month_view_clicked): ditto
-	(show_list_view_clicked): ditto
-
-	* gui/apps_evolution_calendar.schemas.in.in: remove default view
-	setting, gal view remembers this for us
-
-2004-04-05  JP Rosevear <jpr@ximian.com>
-
-	* gui/e-week-view.c (time_range_changed_cb): only select one day
-
-2004-04-05  Rodrigo Moya <rodrigo@ximian.com>
-
-	* gui/alarm-notify/alarm-queue.c: removed commented code.
-
-	* gui/alarm-notify/notify-main.c (main): removed useless call to set
-	the POA after construction.
-
-2004-04-05  Rodrigo Moya <rodrigo@ximian.com>
-
-	Fixes #56316
-
-	* gui/dialogs/comp-editor-page.[ch]: added "fill_timezones" virtual
-	method to CompEditorPage class.
-	(comp_editor_page_fill_timezones): new function.
-	(comp_editor_page_class_init): initialize new virtual method.
-
-	* gui/dialogs/event-page.c (event_page_fill_timezones,
-	event_page_class_init):
-	* gui/dialogs/task-page.c (task_page_fill_timezones,
-	task_page_class_init):
-	* gui/dialogs/task-details-page.c (task_details_page_fill_timezones,
-	task_details_page_class_init): implemented new virtual method for pages
-	dealing with timezones.
-
-	* gui/dialogs/comp-editor.c (save_comp): call the "fill_timezones"
-	method on all pages, and call...
-	(send_timezone): ...this function for each hash table item.
-
-2004-04-01  Rodrigo Moya <rodrigo@ximian.com>
-
-	* gui/gnome-cal.c (client_cal_opened_cb): set the default timezone
-	on all clients when opened.
-
-2004-04-01  Radek Doulik  <rodo@ximian.com>
-
-	* gui/e-calendar-view.c
-	(e_calendar_view_delete_selected_occurrence): fix small typo
-
-2004-04-01  Rodrigo Moya <rodrigo@ximian.com>
-
-	* gui/dialogs/recur-comp.c (recur_component_dialog): return correct
-	values (boolean).
-
-2004-03-31  JP Rosevear <jpr@ximian.com>
-
-	* gui/migration.c (migrate_calendars): make sure we unset the
-	float value for the panes if converting from 1.4 and earlier
-
-2004-03-31  JP Rosevear  <jpr@ximian.com>
-
-	Fixes #56120
-	
-	* gui/gnome-cal.c (append_category_cb): update the correct element
-	(client_categories_changed_cb): pass the array, not a reference to
-	it
-
-2004-03-31  Rodrigo Moya <rodrigo@ximian.com>
-
-	* gui/gnome-cal.c: fixed documentation typos.
-
-2004-03-31  Sarfraaz Ahmed <asarfraaz@novell.com>
-
-	* gui/config-control.c (set_prop) : Replaced add_event_source 
-	with add_source and passed the VEVENT type as argument.
-
-2004-03-30  William Jon McCann  <mccann@jhu.edu>
-
-	* gui/dialogs/calendar-setup.glade:
-	* gui/dialogs/calendar-setup.c (new_task_list_finish)
-	(calendar_setup_new_task_list, calendar_setup_edit_task_list):
-	add remote calendar setup page to task list setup assistant and
-	edit dialog.  Remove separators from dialog.
-
-2004-03-29  Larry Ewing  <lewing@ximian.com>
-
-	* gui/calendar-component.c (selector_tree_drag_data_received):
-	deal with the action type a properly. in the normal case.
-	
-	* gui/calendar-component.c (selector_tree_drag_data_received):
-	call drag_finish properly, change the uid.
-	(selector_tree_drag_motion): set drag status properly.
-
-2004-03-29  William Jon McCann  <mccann@jhu.edu>
-
-	* gui/tasks-component.c (delete_task_list_cb): 
-	* gui/calendar-component.c (delete_calendar_cb):
-	don't require client to be loaded in order to remove the source
-
-	* gui/migration.c (create_task_sources, migrate_tasks): create
-	On The Web source group for tasks.
-
-2004-03-29  Hari Prasad Nadig  <hp@ndeepak.info>
-
-	* gui/goto-dialog.glade: Naming issue, Go to Date -> Select Date,
-	Go to Today -> Select today. Solves 48293
-	
-	* gui/e-calendar-view.c: gives aid to the above change.
-
-2004-03-29  Rodrigo Moya <rodrigo@ximian.com>
-
-	* gui/alarm-notify/alarm-queue.c (query_objects_changed_cb): removed
-	misplaced return statement that prevented the rest of the objects list
-	to be processed.
-
-2004-03-29  Kidd Wang  <kidd.wang@sun.com>
-
-	* gui/e-calendar-view.c: (e_calendar_view_class_init): remove the
- 	EVENT_MOVE signal which was binded to Alt + Arrows.
- 	* gui/e-calendar-view.h: ditto.
- 	* gui/e-day-view.c: (e_day_view_class_init),
-	(e_day_view_do_key_press), (e_day_view_event_move): handle Alt + Arrows
-	in the more general place e_day_view_do_key_press so that we can avoid
-	the conflicting accessible key. When an appointment is selected,
-	pressing Alt + Arrows causes it to be moved around. Otherwise, pressing
-	Alt + LEFT/RIGHT will move the focus to the same day in the
-	previous/next week.
-	* gui/e-week-view.c: (e_week_view_class_init),
-	(e_week_view_event_move), (e_week_view_do_key_press): ditto.
-
-2004-03-26  JP Rosevear <jpr@ximian.com>
-
-	* gui/e-cal-model.c (update_e_cal_view_for_client): guard against
-	the case that we redo queries while still waiting for a client to
-	open
-
-2004-03-26  JP Rosevear  <jpr@ximian.com>
-
-	Fixes #53134
-	
-	* gui/e-cal-model.c (get_description): make sure to set the string
-	to NULL so that if this component doesn't have a description we
-	don't double free next time we are called
-
-2004-03-26  JP Rosevear <jpr@ximian.com>
-
-	* gui/migration.c (migrate_calendars): no need to explicitly add
-	the contacts group, the create function does this properly
-
-2004-03-26  JP Rosevear <jpr@ximian.com>
-
-	* gui/migration.c (migrate_calendars): make sure we always sync
-	the source list and just do it once; unref the sources we get
-	(migrate_tasks): make sure we always sync
-	the source list and just do it once
-
-2004-03-26  JP Rosevear <jpr@ximian.com>
-
-	Fixes #55648
-	
-	* gui/print.c (print_todo_details): get the default from the model
-
-	* gui/gnome-cal.h: remove and update protos
-
-	* gui/gnome-cal.c (update_query): the clients and client_list
-	members are now arrays of source types
-	(setup_widgets): default the query to everything for tasks, cast
-	the config items
-	(gnome_calendar_init): init all the client hashs
-	(gnome_calendar_destroy): clean them up, clean up all categories
-	(client_cal_opened_cb): handle based on source type
-	(append_category_cb): don't track the size in the closure
-	(client_categories_changed_cb): do all the merging here
-	(backend_died_cb): handle based on source type
-	(gnome_calendar_construct): we don't special case the task stuff
-	any more
-	(gnome_calendar_get_default_client): return the default of the
-	current view
-	(gnome_calendar_add_source): take a source type argument and
-	append accordingly
-	(gnome_calendar_remove_source): similar, but remove accordingly
-	(gnome_calendar_set_default_source): take a source type argument and
-	set the default accordingly
-	(gnome_calendar_new_task): use the default of the task model
-
-	* gui/e-calendar-view.c (e_calendar_view_add_event): kill warning
-
-	* gui/calendar-component.c (update_uris_for_selection): pass
-	source type when adding/removing
-	(update_uri_for_primary_selection): ditto
-	(update_task_selection): make sure we show the correct list of
-	tasks
-	(update_primary_task_selection): make sure we track the primary
-	task correctly
-	(delete_calendar_cb): pass source type when removing
-	(config_primary_selection_changed_cb): config listener callback
-	for tasks
-	(config_tasks_selection_changed_cb): ditto
-	(impl_createControls): load the initial task selection, listen for
-	changes
-	(calendar_component_init): get the source lists
-
-	* gui/calendar-commands.c (sensitize_taskpad_commands): get the
-	task pad and then the default client from that
-
-2004-03-26  JP Rosevear <jpr@ximian.com>
-
-	* gui/e-cal-model.c (find_client_data): finds the client data for
-	a client
-	(cal_opened_cb): update the query
-	(add_new_client): return client data
-	(e_cal_model_add_client): add the client immediately no matter
-	what, and possibly wait for it to open
-	(remove_client): guard against NULL query
-	(e_cal_model_remove_client): use find_client_data
-	(e_cal_model_dispose): guard against a NULL query
-
-2004-03-25  JP Rosevear <jpr@ximian.com>
-
-	* gui/e-cal-model.c (remove_client): fix off by one error when
-	emitting deleted signal
-
-2004-03-25  JP Rosevear <jpr@ximian.com>
-
-	Fixes #53499
-	
-	* gui/gnome-cal.c (setup_widgets): don't give the state file to
-	the list view
-	(set_view): ensure that if the list view was in custom mode it
-	stays that way
-	(display_view_cb): attach to the etable of the list view
-	(gnome_calendar_setup_view_menus): use an etable gal view for the
-	list view and don't set the view twice
-
-	* gui/e-tasks.c (e_tasks_setup_view_menus): the instance should no
-	longer be per task uri since all the uris are shown together
-
-	* gui/e-cal-list-view.h: update/add protos
-
-	* gui/e-cal-list-view.etspec: limit the available columns to what
-	product design agreed on
-
-	* gui/e-calendar-table.etspec: ditto
-
-	* gui/e-cal-list-view.c (e_cal_list_view_class_init): ignore
-	update query calls
-	(e_cal_list_view_load_state): make public
-	(e_cal_list_view_save_state): ditto
-	(setup_e_table): don't handle state saving ourselves
-	(e_cal_list_view_construct): ditto
-	(e_cal_list_view_new): ditto
-	(e_cal_list_view_destroy): ditto
-
-	* gui/calendar-view.c (calendar_view_get_type_code): we don't
-	handle the list view here
-
-	* gui/calendar-view-factory.c
-	(calendar_view_factory_get_type_code): we don't handle the list
-	view here
-	(calendar_view_factory_get_title): ditto
-
-2004-03-24  Rodrigo Moya <rodrigo@ximian.com>
-
-	* gui/gnome-cal.c (update_query): don't create queries for the clients
-	that are not loaded yet.
-
-2004-03-24  JP Rosevear <jpr@ximian.com>
-
-	* gui/gnome-cal.c (client_cal_opened_cb): remove debug code that
-	slipped in
-
-2004-03-24  Danilo Šegan  <dsegan@gmx.net>
-
-	* gui/e-alarm-list.c (get_alarm_duration_string): Use ngettext for
-	handling plural forms (fixes bug #53464). 
-	* gui/dialogs/delete-comp.c (delete_component_dialog): Likewise.
-	* gui/e-itip-control.c (write_recurrence_piece): Likewise.
-
-2004-03-23  JP Rosevear <jpr@ximian.com>
-
-	Fixes #51948
-	
-	* gui/dialogs/meeting-page.c (button_press_event): compile this
-	again, determine the row with a different method
-	(button_press_event): pass mpage
-	(meeting_page_construct): listen for button press event
-
-	* gui/e-meeting-list-view.c: remove commit that wasn't supposed to
-	go in
-
-2004-03-23  JP Rosevear <jpr@ximian.com>
-
-	* gui/e-calendar-view.c: make the flow control correct
-
-2004-03-23  JP Rosevear <jpr@ximian.com>
-
-	* gui/migration.c (create_calendar_sources, create_task_sources):
-	ensure that only one Personal calendar/task list gets created when
-	moving between minor versions
-
-2004-03-23  JP Rosevear  <jpr@ximian.com>
-
-	* gui/dialogs/copy-source-dialog.c (copy_source): remove unused
-	variable
-
-	* gui/e-cal-model.c (e_cal_model_copy_component_data): make the
-	precondition return NULL
-
-	* gui/control-factory.c (get_prop): make sure this code isn't
-	reached
-
-	* gui/calendar-component.c
-	(calendar_component_peek_source_selector): cast to kill warning
-
-2004-03-23 Umesh Tiwari   <tiwariumesh232@rediffmaiil.com>
-
-	For bug#53417
-
-	* gui/e-tasks.c:
-	Clear the preview panel after the last task is deleted.
-
-2004-03-23  Alfred Peng <alfred.peng@sun.com>
-
-	* gui/dialogs/alarm-options.c (malarm_widgets_to_alarm): get
-	the mail alarm description message from "malarm_description"
-	instead of "dalarm_description".
-
-2004-03-23  Alfred Peng <alfred.peng@sun.com>
-
-	* gui/alarm-notify/alarm-queue.c (audio_notification): If there
-	is no attachment for a audio reminder, only a message window
-	shows up.
-	Get a beep sound even without attachment for audio reminder.
-
-2004-03-22  Rodrigo Moya <rodrigo@ximian.com>
-
-	* gui/e-calendar-view.c (e_calendar_view_add_event): get the UID
-	from the server on newly created events and set the ECalComponent's
-	UID to that, for further operations.
-
-2004-03-20  Rodrigo Moya <rodrigo@ximian.com>
-
-	* gui/e-calendar-view.c: added 'Copy/Move to Calendar' menu entries.
-	(on_copy_to, on_move_to): callbacks for new menu items.
-	(on_print_event): don't leak selection list.
-
-2004-03-19  JP Rosevear  <jpr@ximian.com>
-
-	Fixes #55716
-	
-	* gui/e-cal-model.c (remove_client): unset the default if the
-	client removed was the default
-
-2004-03-19  Rodrigo Moya <rodrigo@ximian.com>
-
-	* gui/calendar-component.c (update_uris_for_selection): if
-	gnome_calendar_add_event_source fails, don't add the client to the
-	internal client list.
-
-2004-03-19  JP Rosevear <jpr@ximian.com>
-
-	Fixes #55723
-	
-	* gui/e-day-view.c (process_component): compare ecalcomponents,
-	not icalcomponents (the compare func is borked), check recurrence
-	changes better
-	(e_day_view_init): just use the model the parent creates
-
-	* gui/e-week-view.c (process_component): create the temporary item
-	from the correct icalcomp
-	(e_week_view_init): just use the model the parent creates
-
-2004-03-18  Rodrigo Moya <rodrigo@ximian.com>
-
-	* gui/dialogs/select-source-dialog.c (select_source_dialog): create
-	an ESourceSelector instead of a ESourceOptionMenu, to be consistent
-	with the other components, and create a scrolled window to hold the
-	source selector.
-	(primary_selection_changed_cb): callback for "primary_selection_changed"
-	signal in the ESourceSelector.
-
-2004-03-18  Alfred Peng <alfred.peng@sun.com>
-
-	* Fix #51187 on bugzilla of ximian
-	* gui/alarm-notify/alarm-queue.c (query_objects_changed_cb):
-	If "alarms" or "alarms->alarms" is NULL after querying a calendar
-	for the alarms of a particular object, the reuse of "cqa" will
-	probably cause evolution-alarm-notify to crash.
-	So remove "cqa" when "alarms" or "alarms->alarms" is NULL. Otherwise
-	update it.
-
-2004-03-17  hpnadig  <hp@ndeepak.info>
-
-	* gui/dialogs/task-page.glade: Capitalized words changed. Solves 48115.
-
-	* gui/dialogs/task-details-page.glade: s/Date Completed/Date completed.
-
-	* gui/e-calendar-table.etspec: Capitalization checked. Solves 48130.
-
-2004-03-17 Gary Ekker <gekker@novell.com>
-
-	Fixes #55292
-	
-	* gui/e-pub-utils.c (e_pub_publish): fix a crash when trying to
-	publish a NULL component
-
-2004-03-16  Rodrigo Moya <rodrigo@ximian.com>
-
-	* gui/dialogs/select-source-dialog.[ch]: new dialog for allowing the
-	user to select a source.
-
-	* gui/dialogs/copy-source-dialog.c (copy_source_dialog): use the
-	select_source_dialog function to ask user for the source to use.
-	(source_selected_cb): removed unneeded function.
-
-	* gui/dialogs/Makefile.am: added new files.
-
-2004-03-16  Rodrigo Moya <rodrigo@ximian.com>
-
-	* gui/calendar-commands.c
-	(calendar_control_sensitize_calendar_commands): check if the selected
-	event has its associated ECalModelComponent.
-
-2004-03-15  JP Rosevear  <jpr@ximian.com>
-
-	* gui/e-tasks.c (search_bar_sexp_changed_cb): set the search query
-	(e_tasks_init): set the query to be #t by default
-
-	* gui/e-cal-model.c (redo_queries): use the search query if there
-	is one (and no time is set), make sure to dup the #f
-
-2004-03-15  JP Rosevear <jpr@ximian.com>
-
-	* gui/dialogs/comp-editor-page.c (comp_editor_page_fill_widgets):
-	use right cast macro
-
-2004-03-15  JP Rosevear  <jpr@ximian.com>
-
-	* Rename e-cal-view to e-calendar-view and fix includes
-	
-	* gui/dialogs/comp-editor-page.c (comp_editor_page_fill_widgets):
-	pre-conditions should return FALS
-
-	* gui/e-cal-model.c (copy_ecdv): return the new struct
-
-	* gui/Makefile.am: build renamed files
-
-2004-03-15  JP Rosevear <jpr@ximian.com>
-
-	Fixes #52253
-	
-	* gui/print.c (print_week_summary_cb): copy component data
-
-	* gui/gnome-cal.c (get_times_for_views): calculate the time range
-	for each view
-	(set_search_query): set the search query on the model
-	(set_week_start): set the week start day
-	(week_start_changed_cb): track if it changes
-	(setup_config): set its notification
-	(setup_widgets): update the view times and date navigator
-	(gnome_calendar_init): remove dead values
-	(gnome_calendar_goto_date): just calc the new time and let
-	update_view_times handle it
-	(gnome_calendar_goto): ditto
-	(gnome_calendar_direction): ditto
-	(gnome_calendar_set_selected_time_range): ditto
-	(gnome_calendar_dayjump): ditto
-	(update_view_times): set the time ranges on the models
-	(set_view): use the new preserve day setting
-	(gnome_calendar_set_view): don't update the view times, just
-	switch
-	(gnome_calendar_get_selected_time_range): get the time range
-	(gnome_calendar_on_date_navigator_selection_changed): don't
-	re-update the date navigator, centralize the view setting
-
-	* gui/e-week-view.c (time_range_changed_cb): handle the time range
-	changing
-	(process_component): move here
-	(model_changed_cb): handle the model changing
-	(update_row): updated a changed row
-	(model_row_changed_cb): update a row
-	(model_cell_changed_cb): ditto
-	(model_rows_inserted_cb): handle events being added
-	(row_deleted_check_cb, remove_uid_cb, model_rows_deleted_cb):
-	handle events being deleted
-	(timezone_changed_cb): handle timezone changing
-	(e_week_view_init): create the model and listen to it
-	(e_week_view_new): don't create the model here
-	(e_week_view_set_selected_time_range): no need to cast
-	(e_week_view_set_first_day_shown): ditto
-	(e_week_view_set_weeks_shown): ditto
-	(e_week_view_update_event_cb): free and copy the data using new
-	routines
-	(e_week_view_foreach_event): step through every event
-	(e_week_view_remove_event_cb): we no longer track allocated status
-	(e_week_view_on_button_release): don't set the seleciton in the
-	calendar
-	(e_week_view_free_events): free the data with the util
-	(e_week_view_add_event): no need to track allocated status
-	(e_week_view_on_adjustment_changed): no need to cast
-
-	* gui/e-day-view.c (e_day_view_class_init): update query is no
-	longer used via class method
-	(time_range_changed_cb): handle the time range changing
-	(process_component): move here
-	(model_changed_cb): handle the model changing
-	(update_row): updated a changed row
-	(model_row_changed_cb): update a row
-	(model_cell_changed_cb): ditto
-	(model_rows_inserted_cb): handle events being added
-	(row_deleted_check_cb, remove_uid_cb, model_rows_deleted_cb):
-	handle events being deleted
-	(timezone_changed_cb): handle timezone changing
-	(e_day_view_init): create a model, connect to its signals
-	(e_day_view_destroy): we don't have our own query anymore
-	(e_day_view_update_event_cb): free and copy the data using new
-	routines
-	(e_day_view_remove_event_cb): we no longer track allocated status
-	(e_day_view_set_selected_time_range): actually set the selection
-	(e_day_view_recalc_day_starts): no need to cast
-	(e_day_view_recalc_work_week): ditto
-	(e_day_view_update_calendar_selection_time): don't call back to
-	the main calendar
-	(e_day_view_free_event_array): use the free util
-	(e_day_view_add_event): don't track allocated status
-
-	* gui/e-calendar-marshal.list: add marshaller
-
-	* gui/e-cal-view.h: remove field
-
-	* gui/e-cal-view.c: no longer listen for model signals
-	(e_calendar_view_class_init): make the model arg not construct
-	time
-
-	* gui/e-cal-model.h: update/add protos
-
-	* gui/e-cal-model.c (e_cal_model_class_init): set the dispose
-	handler and add a time_range_changed signal
-	(e_cal_model_init): defaults for queries
-	(e_cal_model_dispose): dispose of things
-	(e_cal_model_finalize): remove bits that are in dispose now
-	(search_by_uid_and_client): allow NULL client to find any uid
-	(e_cal_view_objects_added_cb): ref the client
-	(update_e_cal_view_for_client): use the full query
-	(remove_client): pre change for each row and emit deleted signals
-	(redo_queries): relaunch the query for each client
-	(e_cal_model_get_time_range): get the time range
-	(e_cal_model_set_time_range): set the time range and redo the
-	queries
-	(e_cal_model_set_search_query): get the search query
-	(e_cal_model_set_search_query): set the search query and redo the
-	queries
-	(e_cal_model_get_component_for_uid): get the component info based
-	on uid
-	(copy_ecdv): copy and ECellDateEditValue
-	(e_cal_model_copy_component_data): copy component data
-	(e_cal_model_free_component_data): unref the client
-
-2004-03-15  Rodrigo Moya <rodrigo@ximian.com>
-
-	Fixes #48112
-
-	* gui/calendar-commands.c (calendar_control_sensitize_calendar_commands):
-	disable the 'Delete' menu item on recurring meetings, since 'Delete all
-	Occurrences' already deals with that.
-
-2004-03-15  Rodrigo Moya <rodrigo@ximian.com>
-
-	Fixes #35577
-
-	* gui/e-cal-view.c (e_calendar_view_delete_selected_occurrence):
-	if the component is an instance, pass the recurrence ID to
-	e_cal_remove_object_with_mod. Also, make the user confirm the
-	deletion, and send the cancellation message for meetings.
-
-2004-03-12  Not Zed  <NotZed@Ximian.com>
-
-	* gui/e-cal-model.c (ecm_initialize_value): return "" instead of
-	NULL if there is no default_category set.  Fixes #53419.
-
-2004-03-09  Kidd Wang  <kidd.wang@sun.com>
-
-	* gui/e-day-view.c: (e_day_view_finish_long_event_resize): add a call
-	to e_cal_component_commit_sequence since we have changed the property
-	of the component. Whether the new event is all day should also be
-	set properly according to the value of the original event.
-
-2004-03-08  Rodrigo Moya <rodrigo@ximian.com>
-
-	Fixes #48106
-
-	* gui/dialogs/alarm-page.glade: s/Send an Email/Send an email.
-
-2004-03-05  Rodrigo Moya <rodrigo@ximian.com>
-
-	* gui/alarm-notify/alarm-notify.c (alarm_notify_init): set a GConf
-	listener callback to list for changes in selected calendars.
-	(alarm_notify_finalize): remove the GConf notification listener.
-	(conf_changed_cb): callback to react on configuration changes. Process
-	the new selected calendars and remove the unselected ones.
-	(process_removal_in_hash): callback to remove unselected calendars.
-
-2004-03-04  Rodrigo Moya <rodrigo@ximian.com>
-
-	Fixes #50294
-
-	* gui/e-tasks.c (setup_widgets): connect to "model_rows_deleted" signal
-	on the ETable's model.
-	(model_rows_deleted_cb): callback for clearing the preview widget when
-	the currently selected task is removed.
-
-2004-03-04  Rodrigo Moya <rodrigo@ximian.com>
-
-	* gui/calendar-commands.c (calendar_control_sensitize_calendar_commands):
-	set the sensitivity correctly, depending on whether the command applied
-	to the currently selected event or the default client.
-	(calendar_control_activate): make sure we start with the menu items
-	correctly enabled/disabled.
-
-2004-03-04  Rodrigo Moya <rodrigo@ximian.com>
-
-	Fixes #53496
-
-	* gui/dialogs/cal-prefs-dialog.glade: set the same spacing for all
-	tabs in the notebook.
-
-2004-03-04  Rodrigo Moya <rodrigo@ximian.com>
-
-	* gui/dialogs/comp-editor.c (comp_editor_append_page): always add
-	the page.
-
-	* gui/dialogs/event-page.c (event_page_fill_widgets): continue filling
-	up all other fields even if there are missing ones, and return the
-	validation result.
-
-2004-03-04  Rodrigo Moya <rodrigo@ximian.com>
-
-	* gui/alarm-notify/alarm-notify-dialog.c (alarm_notify_dialog):
-	don't make the dialog window sticky, the icon on the system tray
-	already shows in all workspaces.
-
-2004-03-04  Rodrigo Moya <rodrigo@ximian.com>
-
-	Fixes #54028
-
-	* gui/alarm-notify/alarm-queue.c (query_objects_changed_cb): fixed the
-	time range for the alarm query, to include the end of today.
-
-2004-03-04  Rodrigo Moya <rodrigo@ximian.com>
-
-	Fixes #53137
-
-	* gui/dialogs/comp-editor-page.[ch]: made fill_widgets virtual
-	method return a gboolean.
-	(comp_editor_page_fill_widgets): return value from virtual method
-	implementation.
-
-	* gui/dialogs/event-page.c (event_page_fill_widgets):
-	* gui/dialogs/meeting-page.c (meeting_page_fill_widgets):
-	* gui/dialogs/recurrence-page.c (recurrence_page_fill_widgets):
-	* gui/dialogs/schedule-page.c (schedule_page_fill_widgets):
-	* gui/dialogs/task-details-page.c (task_details_page_fill_widgets):
-	* gui/dialogs/task-page.c (task_page_fill_widgets):
-	* gui/dialogs/alarm-page.c (alarm_page_fill_widgets): return value,
-	as expected from the virtual method signature.
-
-	* gui/dialogs/comp-editor.c (comp_editor_append_page): dont add the
-	page if there was an error calling the fill_widgets method.
-
-2004-03-03  Rodrigo Moya <rodrigo@ximian.com>
-
-	* gui/e-cal-model.c (e_cal_model_add_client): prevent from adding
-	the same client more than once.
-
-2004-03-02  Rodrigo Moya <rodrigo@ximian.com>
-
-	* gui/cal-search-bar.c: added support for searching the location
-	field also.
-	(regen_query): take into account the new search field.
-
-2004-03-02  JP Rosevear <jpr@ximian.com>
-
-	* gui/Makefile.am: remove conduit dir creation
-
-2004-03-02  Larry Ewing  <lewing@ximian.com>
-
-	* gui/calendar-component.c: add untested start of dnd support for
-	source selector.
-
-2004-03-01  Dan Winship  <danw@ximian.com>
-
-	* gui/alarm-notify/alarm-notify.c: fix rampant double-freeing.
-
-2004-03-01  Rodrigo Moya <rodrigo@ximian.com>
-
-	* gui/itip-utils.c (comp_server_send): pass the user list and
-	returned icalcomponent to e_cal_send_objects().
-
-2004-03-01  Kidd Wang  <kidd.wang@sun.com>
-
-	* gui/print.c: (print_date_label): ignore the timezone info of all-day
-	events.
-
-2004-02-27  JP Rosevear <jpr@ximian.com>
-
-	* gui/gnome-cal.h: remove proto
-
-	* gui/gnome-cal.c (set_query): rename from
-	gnome_calendar_set_query and make static
-
-	* gui/e-day-view.h: remove proto for dead function
-
-	* gui/e-day-view.c: guard config.h include
-
-2004-02-26  Rodney Dawes  <dobey@ximian.com>
-
-	* gui/e-meeting-time-sel.c (e_meeting_time_selector_construct):
-	Create the arrows in these widgets as GTK_SHADOW_NONE, since the
-	default arrow type in GTK+ 2.x is flat triangle arrows, and shadow
-	types are generally ignored for arrows anyway, and so we don't look
-	ugly with themes that handle shadow types on arrows correctly
-
-2004-02-26  Rodney Dawes  <dobey@ximian.com>
-
-	* gui/alarm-notify/GNOME_Evolution_Calendar_AlarmNotify.server.in.in:
-	Fix the repo_id to include the evolution base version
-
-2004-02-26  JP Rosevear <jpr@ximian.com>
-
-	* gui/gnome-cal.c (client_cal_opened_cb): make sure we unref the
-	task pad client and the calendar clients are unreffed by the hash
-	table
-
-2004-02-24  JP Rosevear <jpr@ximian.com>
-
-	* gui/migration.c (migrate_calendars): fix float type pane
-	position keys (we migrated these improperly in the past), just use
-	the default value
-
-	Fixes #53087
-
-2004-02-18  Rodrigo Moya <rodrigo@ximian.com>
-
-	* gui/alarm-notify/alarm-notify.c (free_client_hash): remove the client
-	from the queue also.
-
-	* gui/gnome-cal.c (client_cal_opened_cb): set the task pad client to NULL
-	if opening it failed. Show more verbose status bar messages.
-
-2004-02-18  Rodrigo Moya <rodrigo@ximian.com>
-
-	* common/authentication.c (auth_func_cb): call first e_passwords_get_password
-	before calling _ask_password.
-
-	* gui/alarm-notify/alarm-queue.c (query_objects_changed_cb): add 1 second
-	to the last notification time, or we'll get many times the same notification.
-
-2004-02-18  Kidd Wang  <kidd.wang@sun.com>
-
-	* gui/e-cal-view.c: (e_calendar_view_add_event),
-	(clipboard_get_text_cb): make copy & paste and drag & drop behave
-	the same way described as follows:
-	In day view and work week view
-		from main canvas to top canvas
-			before copy or drag: short event
-			after paste or drop: all-day event
-		from main canvas to main canvas
-			before copy or drag: short event
-			after paste or drop: short event
-		from top canvas to top canvas
-			before copy or drag: all-day event
-			after paste or drop: all-day event			
-			before copy or drag: long event
-			after paste or drop: long event
-		from top canvas to main canvas
-			before copy or drag: all-day event
-			after paste or drop: short event
-			before copy or drag: long event
-			after paste or drop: short event
-	In week view, month view and list view life is pretty simple since
-	there's no top canvas in these three views. We just get what we copy
-	or drag after we perform paste or drop.
-
-2004-02-18  Kidd Wang  <kidd.wang@sun.com>
-
-	* gui/itip-utils.c: (itip_send_comp): set the string length properly.
-
-2004-02-16  Rodrigo Moya <rodrigo@ximian.com>
-
-	* gui/alarm-notify/alarm-queue.c (tray_icon_clicked_cb): removed buggy
-	characters from menu items' texts.
-
-2004-02-16  Rodrigo Moya <rodrigo@ximian.com>
-
-	* gui/alarm-notify/alarm-notify.c (alarm_notify_add_calendar): open the
-	calendars asynchonously.
-	(cal_opened_cb): callback for "cal_opened" signal. Add the calendars to
-	the alarm queue here.
-
-	* gui/alarm-notify/alarm-queue.c (query_objects_changed_cb): get alarms
-	since the last notification, only use current time when there is no
-	previous notification time.
-
-	* gui/alarm-notify/notify-main.c (init_session): set session restart
-	style to RESTART_IF_RUNNING.
-
-2004-02-16  Rodrigo Moya <rodrigo@ximian.com>
-
-	* gui/alarm-notify/notify-main.c: no need to keep the master client.
-	(init_session): just set the daemon's restart style, not the restart
-	command. Connect to "save_yourself" signal on the session also.
-	(save_session_cb): set the restart command here.
-
-2004-02-12  Hans Petter Jansson  <hpj@ximian.com>
-
-	* gui/dialogs/copy-source-dialog.c (copy_source_dialog): Instead
-	of saying "Select destination source", we now say "... calendar" or
-	"... task list", based on object type.
-
-2004-02-12  Chris Toshok  <toshok@ximian.com>
-
-	* gui/migration.c (CONTACTS_BASE_URI): rename from
-	CONTACT_BASE_URI, and change to contacts:// to match e-d-s.
-	(create_calendar_contact_source): CONTACT -> CONTACTS.
-	(create_calendar_sources): same.
-
-2004-02-13  Bruce Tao  <bruce.tao@sun.com>
-                                                                                
-        See #51567
-	* gui/dialogs/delete-comp.c (delete_component_dialog):
-        use "gtk_dialog_add_buttons" to change the response_id of button
-        "YES" and "NO".
-
-2004-02-11  Rodrigo Moya <rodrigo@ximian.com>
-
-	Fixes #53886
-
-	* gui/gnome-cal.c (gnome_calendar_paste_clipboard,
-	gnome_calendar_delete_selection, gnome_calendar_cut_clipboard,
-	gnome_calendar_copy_clipboard): removed g_assert_if_reached calls
-	since we might get a different widget getting the focus.
-	(get_focus_location): check the canvas's' focused item.
-
-2004-02-11  Rodrigo Moya <rodrigo@ximian.com>
-
-	Fixes #53271
-
-	* gui/calendar-component.c (delete_calendar_cb): remove the source from
-	the GnomeCalendar widget also.
-
-	* gui/tasks-component.c (delete_task_list_cb): ditto.
-
-2004-02-11  Kidd Wang  <kidd.wang@sun.com>
-
-	* gui/print.c: (print_date_label): guarantee we do have some timezone
-	before the time convertion.
-
-2004-02-10  JP Rosevear <jpr@ximian.com>
-
-	* importers/icalendar-importer.c: remove useless include
-
-	* importers/Makefile.am: remove executable build cruft
-
-2004-02-09  Rodrigo Moya <rodrigo@ximian.com>
-
-	* gui/gnome-cal.c (client_cal_opened_cb): don't add the clients to the
-	internal hash/list here, just remove it if opening the calendar fails.
-	(gnome_calendar_add_event_source): add the client to the internal
-	hash/list here.
-
-2004-02-09  Kidd Wang  <kidd.wang@sun.com>
-
-	* gui/e-cal-model-tasks.c: (ecmt_set_value_at): refuse to update
-	the task info if due date is before start date.
-
-2004-02-05  JP Rosevear <jpr@ximian.com>
-
-	* Convert the calendar_config_get_timezone and
-	icaltimezone_get_builtin_timezone pair to just
-	calendar_config_get_icaltimezone, this also guarantees we will
-	have some timezone (even if its just UTC)
-
-	Fixes #53754
-	
-2004-02-05  JP Rosevear <jpr@ximian.com>
-
-	* gui/calendar-config.h: add proto
-
-	* gui/calendar-config.c (calendar_config_get_icaltimezone): return
-	the icaltimezone based on the location and default to utc if we
-	can't find one
-	(calendar_config_get_hide_completed_tasks_sexp): use above
-
-2004-02-05  JP Rosevear <jpr@ximian.com>
-
-	* gui/dialogs/cal-prefs-dialog.c (set_color_picker): make failure
-	not so draconian - make the color black
-
-	Fixes #53547
-	
-2004-02-05  Kidd Wang  <kidd.wang@sun.com>
-
-	* gui/goto-dialog.glade: add a mnemonic for the 'Go to Today' button
-	in the 'Go To Date' dialog.
-
-2004-02-05  Sarfraaz Ahmed <asarfraaz@novell.com>
-
-        Fixes #53388
-
-        * gui/e-itip-control.c (get_next): added a check for NULL
-
-2004-02-04  JP Rosevear <jpr@ximian.com>
-
-	* importers/icalendar-importer.c (gnome_calendar_import_data_fn):
-	use new cal auth functions
-
-	* common/authentication.c (auth_new_cal_from_default): get a
-	default calendar with auth
-
-	* common/authentication.h: add proto
-
-2004-02-04  JP Rosevear <jpr@ximian.com>
-
-	* importers/icalendar-importer.c (importer_destroy_cb): we only
-	have a single client to free
-	(prepare_events): make the vtodo list optional
-	(button_toggled_cb): handle the type of thing to import switching
-	(primary_selection_changed_cb): handle the selected item switching
-	(create_control_fn): create a control with types (events, tasks)
-	and corresponding source selectors
-	(process_item_fn): only import one type of item at a time
-	(load_file_fn): load the ecal as dictated by the source and type
-	(vcal_importer_new): pass in control function
-	(gnome_calendar_import_data_fn): get the default calendars
-
-	* importers/Makefile.am (importersdir): add lib
-
-2004-02-04  Rodrigo Moya <rodrigo@ximian.com>
-
-	Fixes #52970
-
-	* idl/evolution-calendar.idl: added back the AlarmNotify interface.
-
-	* gui/alarm-notify/GNOME_Evolution_Calendar_AlarmNotify.server.in.in:
-	changed to have the AlarmNotify component be created via a factory.
-
-	* gui/alarm-notify/alarm-notify.[ch]: converted to implement the
-	AlarmNotify interface.
-
-	* gui/alarm-notify/notify-main.c (main): register the factory with
-	bonobo_generic_factory_new, not the object itself. Removed redundant
-	call to bonobo_object_unref. Call e_passwords_shutdown on exit.
-
-	* gui/alarm-notify/config-data.c (config_data_get_calendars_to_load):
-	get only the selected calendars/task lists.
-
-2004-02-04  Rodrigo Moya <rodrigo@ximian.com>
-
-	* gui/gnome-cal.c (gnome_calendar_add_event_source): don't update the
-	date navigator query nor the internal lists here...
-	(client_cal_opened_cb): do it here.
-
-2004-02-04  Rodrigo Moya <rodrigo@ximian.com>
-
-	* gui/main.c (launch_alarm_daemon_cb): display the exception message
-	on error.
-
-	* gui/gnome-cal.c (open_ecal): open calendars asynchronously.
-	(client_cal_opened_cb): on success, add the clients to the models here.
-	(gnome_calendar_add_event_source, gnome_calendar_construct): not here.
-
-2004-02-04  Kidd Wang  <kidd.wang@sun.com>
-
-	* gui/dialogs/alarm-page.glade: change the access key for adding a
-	reminder from Alt+a to Alt+d to avoid conflict with the menuitem.
-
-2004-02-04 Yong Sun <Yong.Sun@sun.com>
-
-	* gui/print.c: Fix a bug in evolution/calendar/gui/print.c:
-	bound_text(). It does not break lines with the correct boundary of UTF-8
-	characters. So, for non-latin locales, it will cause printing issues.
-
-2004-02-03  Dan Winship  <danw@ximian.com>
-
-	* gui/tasks-component.h: Fix location of e-activity-handler.h
-	#include
-
-	* gui/Makefile.am (INCLUDES): add widgets/misc for
-	e-activity-handler.h and e-task-bar.h
-
-	* gui/dialogs/Makefile.am (INCLUDES): Likewise
-
-2004-02-02  JP Rosevear <jpr@ximian.com>
-
-	* importers/icalendar-importer.c (support_format_fn): use
-	g_file_get_contents
-	(load_file_fn): ditto
-	(vcal_support_format_fn): ditto
-	(load_vcalendar_file): ditto
-
-2004-01-30  JP Rosevear <jpr@ximian.com>
-
-	* remove dead files
-
-2004-01-29 Gary Ekker <gekker@novell.com>
-
-	Fixes #51871
-
-	* gui/dialogs/calendar-setup.c (calendar_setup_edit_calendar): add
-	activate handler for name_entry
-	(calendar_setup_edit_task_list): ditto
-
-2004-01-30  JP Rosevear <jpr@ximian.com>
-
-	* gui/tasks-component.c (create_new_todo): remove extraneous ;
-
-	Fixes #53418
-
-2004-01-29  JP Rosevear <jpr@ximian.com>
-
-	* gui/migration.c (create_calendar_contact_source): don't set the
-	group to be read only until after the source is added.
-
-2004-01-29  JP Rosevear <jpr@ximian.com>
-
-	* gui/migration.c (migrate_ical_folder_to_source): migrate to a
-	specific source
-	(migrate_ical_folder): create a new source based on the new source
-	name/uid
-	(create_calendar_contact_source): use the #define for the base uri
-	(create_calendar_sources): try and find the right sources if they
-	already exist
-	(create_task_sources): ditto
-	(migrate_calendars): make sure the personal source is the system
-	source
-	(migrate_tasks): ditto
-
-2004-01-29  Rodrigo Moya <rodrigo@ximian.com>
-
-	* gui/calendar-view.c (calendar_view_get_type_code): added support for
-	the list view also.
-
-2004-01-28  Rodrigo Moya <rodrigo@ximian.com>
-
-	* gui/gnome-cal.c (update_query):
-	* gui/e-cal-list-view.c (e_cal_list_view_update_query):
-	* gui/e-cal-view.c (e_calendar_view_update_query): stop status bar
-	messages madness.
-
-2004-01-27  JP Rosevear <jpr@ximian.com>
-
-	* gui/calendar-component.c (delete_calendar_cb): use e_cal_remove
-
-	* gui/tasks-component.c (delete_task_list_cb): ditto
-
-2004-01-27  Rodrigo Moya <rodrigo@ximian.com>
-
-	Fixes #53276
-
-	* gui/dialogs/copy-source-dialog.c (show_error): new function to
-	create an error message dialog.
-	(copy_source): check if the destination calendar is read only, and
-	if so, don't try to copy components over. Fixed leaks. Call show_error
-	to display meaningful error messages.
-
-2004-01-26  JP Rosevear <jpr@ximian.com>
-
-	* gui/migration.c (migrate_ical_folder): add the source to the
-	group so it actually shows up
-
-2004-01-26  JP Rosevear <jpr@ximian.com>
-
-	* gui/migration.c (migrate_calendars): get the source name with
-	out using freed memory
-	(migrate_tasks): ditto
-
-2004-01-26  Rodrigo Moya <rodrigo@ximian.com>
-
-	Fixes #53338
-
-	* gui/dialogs/calendar-setup.c (dialog_to_source): set the relative
-	URI on the source for remote sources.
-
-2004-01-26  Rodrigo Moya <rodrigo@ximian.com>
-
-	Fixes #52312
-
-	* gui/dialogs/calendar-setup.c (create_new_source_with_group):
-	* gui/migration.c (migrate_ical_folder, create_calendar_sources,
-	create_task_sources): set the relative URI for local calendars and
-	task lists to be the source UID.
-
-2004-01-24  Rodrigo Moya <rodrigo@ximian.com>
-
-	* gui/calendar-component.[ch]
-	(calendar_component_peek_source_selector): new function.
-
-	* gui/tasks-component.[ch]
-	(tasks_component_peek_source_selector): new function.
-
-	* gui/e-tasks.c (backend_died_cb):
-	* gui/gnome-cal.c (backend_died_cb): don't tell the user to restart
-	Evolution, there is no need now, just unselecting and selecting
-	back the calendar loads it again. Also, remove the crashed client
-	from the list of loaded clients. Also, unselect the source on
-	the source selector.
-
-2004-01-24  JP Rosevear <jpr@ximian.com>
-
-	* gui/tasks-component.c (update_primary_selection): use
-	e_source_list_peek_source_any
-	(setup_create_ecal): ditto
-	(create_new_todo): just use the default call directly
-	(update_uris_for_selection): just use e-tasks remove/add todo
-	source directly
-
-2004-01-24  JP Rosevear <jpr@ximian.com>
-
-	* gui/e-tasks.c (e_tasks_add_todo_source): don't unref and ref,
-	the hash table does this
-	(e_tasks_remove_todo_source): ditto
-
-	Fixes #53281
-
-2004-01-24  Rodrigo Moya <rodrigo@ximian.com>
-
-	* gui/e-calendar-table.c (e_calendar_table_init): use the colors from
-	the model as background, not as foreground.
-
-	* gui/e-cal-model-tasks.c (ecmt_get_color_for_component): return the
-	color assigned to each URI if it's not overdue.
-
-2004-01-24  JP Rosevear <jpr@ximian.com>
-
-	* gui/tasks-component.c (delete_task_list_cb): sync the source
-	list after the source removal
-
-	* gui/calendar-component.c (delete_calendar_cb): ditto
-
-	Fixes #53271
-	
-2004-01-24  JP Rosevear <jpr@ximian.com>
-
-	* gui/migration.c (setup_progress_dialog): display a progress
-	dialog
-	(dialog_close): destroy it
-	(dialog_set_folder_name): display the folder being migrated
-	(dialog_set_progress): update the progress
-	(check_for_conflict): make sure we don't name anything the same
-	(get_source_name): create a source name
-	(migrate_ical): migrate the events/tasks from one ecal to another
-	(migrate_ical_folder): migrate a specific folder
-	(migrate_calendars): use above
-	(migrate_tasks): ditto
-
-2004-01-23  Rodney Dawes  <dobey@ximian.com>
-
-	* gui/e-itip-control.c: Use PUBLISH if no METHOD defined
-
-	Fixes #45564
-
-2004-01-22  Rodrigo Moya <rodrigo@ximian.com>
-
-	* gui/e-cal-model.c (e_cal_view_objects_removed_cb): don't assert
-	if we can't find the component, just continue with next item in
-	the list.
-
-2004-01-22  JP Rosevear <jpr@ximian.com>
-
-	* gui/migration.c (process_old_dir): remove useless e_mkdir_hier
-	call.
-
-	Fixes #53065
-
-2004-01-22  JP Rosevear <jpr@ximian.com>
-
-	* gui/e-tasks.c (e_tasks_setup_view_menus): Remove debugging
-	statement
-
-2004-01-22  JP Rosevear <jpr@ximian.com>
-
-	* gui/gnome-cal.c (setup_widgets): use the calendar component
-	config dir
-	(gnome_calendar_setup_view_menus): use the calendar component base
-	dir for the view storage
-
-	* gui/e-tasks.c (e_tasks_setup_view_menus): use the task component
-	base dir for the view storage
-
-	Fixes #53133
-
-2004-01-21  Rodrigo Moya <rodrigo@ximian.com>
-
-	* gui/e-tasks.c (e_tasks_add_todo_source): check return value
-	from auth_new_cal_from_source(). Connect to "backend_died"
-	signal on the ECal class.
-	(backend_died_cb): callback for "backend_died" that displays
-	an error message when that happens.
-
-	* gui/gnome-cal.c (backend_died_cb): use a GtkMessageDialog.
-
-2004-01-21  Rodrigo Moya <rodrigo@ximian.com>
-
-	* gui/e-tasks.[ch] (e_tasks_add_todo_uri, e_tasks_remove_todo_uri,
-	e_tasks_get_default_uri): renamed to _source and made them work
-	with ESource's.
-
-	* gui/tasks-component.c (update_uri_for_primary_selection,
-	add_uri_for_source, remove_uri_for_source):
-	* gui/tasks-control.c (tasks_control_set_property): updated for
-	changes in e-tasks.[ch].
-
-2004-01-21  Rodrigo Moya <rodrigo@ximian.com>
-
-	* gui/dialogs/calendar-setup.c (create_new_source_with_group):
-	added 'ECalSourceType' argument to be able to create the
-	ECal correctly. Added a call to e_cal_open with 'only_if_exists'
-	set to FALSE so that the backend creates the calendar.
-	(new_calendar_finish, new_task_list_finish): pass new argument
-	to create_new_source_with_group.
-
-2004-01-21  Rodrigo Moya <rodrigo@ximian.com>
-
-	* gui/tasks-component.c (delete_task_list_cb): call
-	e_cal_remove_calendar to actually remove the task list via
-	the backend.
-
-2004-01-21  Rodrigo Moya <rodrigo@ximian.com>
-
-	Fixes #51705
-
-	* gui/calendar-component.c (delete_calendar_cb): call
-	e_cal_remove_calendar to actually remove the calendar via
-	the backend.
-
-2004-01-21  JP Rosevear <jpr@ximian.com>
-
-	* gui/dialogs/calendar-setup.c (calendar_setup_new_calendar): just
-	use the convienence function for the default gconf client (fixes
-	leak)
-	(calendar_setup_new_task_list): ditto
-	(new_task_list_finish): we don't support task uri's
-	
-2004-01-21  JP Rosevear <jpr@ximian.com>
-
-	* gui/dialogs/calendar-setup.c (source_to_dialog): only block
-	widgets that exist
-
-2004-01-19  JP Rosevear <jpr@ximian.com>
-
-	* gui/e-cal-model-tasks.c (ensure_task_not_complete): correct
-	property name c/p error
-
-	Fixes # 52269
-	
-2004-01-19  JP Rosevear <jpr@ximian.com>
-
-	* gui/tasks-component.c (update_primary_selection): handle the
-	case where we have a bogus uid
-
-	* gui/calendar-component.c (update_primary_selection): ditto
-	
-2004-01-19  Radek Doulik  <rodo@ximian.com>
-
-	* gui/print.c (print_day_add_event): uncomment and use
-	ECalModelComponent
-	(print_day_details): use e_cal_model_generate_instances
-	(print_day_details_cb): use ECalModelGenerateInstancesData
-	(print_day_long_event): use event color
-	(print_day_event): ditto
-	(print_month_small): use e_cal_model_generate_instances
-	(instance_cb): use ECalModelGenerateInstancesData
-
-2004-01-18  Radek Doulik  <rodo@ximian.com>
-
-	* gui/print.c (print_border_with_triangles): use rgb color as
-	fillcolor
-	(print_week_day_event): ditto
-	(print_table): set page orientation, it may be changed from last
-	printing
-	(print_comp): ditto
-
-	* gui/e-cal-model.c (e_cal_model_get_rgb_color_for_component): new
-	helper function, gets component color as rgb double values
-
-	* gui/print.c (print_week_summary_cb): uncommented and updated for
-	e_cal_model_generate_instances
-	(print_week_summary): use e_cal_model_generate_instances
-	(print_border_with_triangles): pass rgb fillcolor
-	(print_border_rgb): new function to print border with rgb color
-	background
-
-	* gui/e-cal-model.c (e_cal_model_generate_instances): new
-	function, similar to e_cal_generate_instances. see comments to
-	understand how to use cb_data
-
-2004-01-17  JP Rosevear <jpr@ximian.com>
-
-	* gui/e-calendar-table.c (e_calendar_table_delete_selected): don't
-	create the component if there is a multiple selection
-
-	Fixes #52266
-	
-2004-01-17  JP Rosevear <jpr@ximian.com>
-
-	* gui/e-cal-view.c (on_print): we are required to pass in the end
-	in-out arg
-
-	Fixes #52972
-	
-2004-01-17  JP Rosevear <jpr@ximian.com>
-
-	* gui/print.h: update protos
-
-	* gui/print.c (print_title): util routine to print a title
-	(print_table): print out an etable
-
-	* gui/calendar-commands.c (print): handle printing the list view
-
-	* gui/e-cal-list-view.etspec: draw the grid to mimic tasks
-
-	* gui/tasks-control.c (tasks_control_print_cmd): use print_table
-
-	Fixes #51751, #52958
-	
-2004-01-16  JP Rosevear <jpr@ximian.com>
-
-	* gui/calendar-commands.c (print): handle list view by printing
-	the month
-
-2004-01-16  JP Rosevear <jpr@ximian.com>
-
-	* gui/e-itip-control.c (find_server): we actually want to not
-	return on any error as well (like NOT FOUND)
-
-2004-01-16  JP Rosevear <jpr@ximian.com>
-
-	* gui/e-comp-editor-registry.h: convert to GObject
-
-	* gui/e-comp-editor-registry.c (registry_data_free): routine to
-	free the registry data
-	(dispose): destroy the registry data
-	(finalize): finalize it
-	(class_init): setup above
-	(init): create full hash table
-	(e_comp_editor_registry_add): weak ref the editor and strdup the
-	hash table key
-	(editor_destroy_cb): we get the registry data now, just remove it
-
-	* gui/dialogs/comp-editor.c (close_dialog): disconnect the signal
-	handlers, its a bit of a hack but it is a simple fix
-
-2004-01-16  Radek Doulik  <rodo@ximian.com>
-
-	* gui/print.c (print_calendar): don't set old orientation, preview
-	needs right orientation even after everything is printed
-
-2004-01-16  Rodrigo Moya <rodrigo@ximian.com>
-
-	Fixes #52920
-
-	* gui/dialogs/calendar-setup.glade: match label's text with the
-	button's text.
-
-2004-01-16  Rodrigo Moya <rodrigo@ximian.com>
-
-	* gui/tasks-component.c (impl_dispose): unref the activity
-	handler.
-
-2004-01-16  Rodrigo Moya <rodrigo@ximian.com>
-
-	* gui/tasks-component.[ch]
-	(tasks_component_peek_activity_handler): new function.
-	(impl_createControls): create a task bar also for the tasks
-	component. We can't rely on the calendar component's one.
-	(tasks_component_init): create the private activity handler.
-
-	* gui/e-calendar-table.c (e_calendar_table_set_status_message):
-	use the tasks component's activity handler.
-
-	* gui/e-tasks.c (on_url_cb): new callback to display status
-	bar messages when mousing over links.
-	(setup_widgets): connect to "on_url" signal on the HTML widget.
-
-2004-01-15  Rodrigo Moya <rodrigo@ximian.com>
-
-	* gui/dialogs/comp-editor.c: reverted my changes made on Jan 8th.
-
-2004-01-15  Rodrigo Moya <rodrigo@ximian.com>
-
-	* gui/alarm-notify/save.[ch]: removed.
-
-	* gui/alarm-notify/Makefile.am: removed save.[ch].
-
-	* gui/alarm-notify/notify-main.c: removed obsolete headers.
-
-	* gui/alarm-notify/config-data.[ch]
-	(config_data_set_last_notification_time,
-	config_data_get_last_notification_time,
-	config_data_save_blessed_program, config_data_is_blessed_program):
-	new functions.
-
-	* gui/alarm-notify/alarm-queue.c: dont use removed functions.
-	(alarm_trigger_cb, procedure_notification_dialog,
-	alarm_queue_init):
-	use config_data_* functions.
-	
-	* gui/alarm-notify/alarm-notify.c: dont use removed functions.
-
-2004-01-15  JP Rosevear <jpr@ximian.com>
-
-	* gui/tasks-component.h: update protos
-	
-	* gui/tasks-component.c (impl_finalize): free base dir
-	(impl_upgradeFromVersion): just call migrate_tasks
-	(tasks_component_init): set base dir value
-	(tasks_component_peek_base_directory): accessor
-	(tasks_component_peek_source_list): ditto
-
-	* gui/migration.c (process_old_dir): look for a source with the
-	name and fallback to creating it
-	(create_calendar_contact_source): create the contacts:// source
-	(create_calendar_sources): use above and create all the necessary
-	sources
-	(create_task_sources): create all the necessary sources
-	(migrate_calendars): do all the migration logic here, upgrade
-	bonobo-conf to gconf
-	(migrate_tasks): ditto
-
-	* gui/calendar-component.h: update prototypes
-
-	* gui/calendar-component.c (impl_finalize): free the base
-	directory
-	(impl_upgradeFromVersion): just call migrate_calendars
-	(calendar_component_init): fill in base dir value
-	(calendar_component_peek_base_directory): accessor
-	(calendar_component_peek_source_list): ditto
-
-2004-01-15  Radek Doulik  <rodo@ximian.com>
-
-	* gui/calendar-component.c (create_new_event): test priv->calendar
-	is not NULL before getting current view
-
-	* gui/tasks-component.c (primary_source_selection_changed_cb):
-	reset create_ecal
-
-	* gui/calendar-component.c (impl_requestCreateItem): merge with
-	JP's changes
-	(primary_source_selection_changed_cb): reset create_ecal
-
-2004-01-14  Radek Doulik  <rodo@ximian.com>
-
-	* gui/e-cal-list-view.c (e_cal_list_view_get_selected_time_range):
-	new implementation, use time range from selected event
-
-	* gui/e-cal-view.c (e_calendar_view_get_selected_time_range):
-	return gboolean, TRUE if requested time was set, FALSE otherwise
-	(e_calendar_view_new_appointment_full): use current time if time
-	range is unavailable
-
-	* gui/calendar-component.c (impl_requestCreateItem): use
-	e_calendar_view_new_appointment_full instead of
-	cal_comp_event_new_with_current_time
-
-	* gui/e-cal-view.c (e_calendar_view_new_appointment_full): new
-	helper function
-
-	* gui/comp-editor-factory.c (edit_new): use
-	cal_comp_event_new_with_current_time
-
-	* gui/calendar-component.c (impl_requestCreateItem): use
-	cal_comp_event_new_with_current_time
-
-	* gui/comp-util.c (cal_comp_event_new_with_current_time): new
-	function, cut'n'pasted from get_default_event
-	(calendar-component.c and comp-editor-factory.c)
-
-2004-01-14  JP Rosevear <jpr@ximian.com>
-
-	* gui/tasks-component.c (impl_requestCreateItem): new utility
-	routine to create new tasks
-	(create_new_todo): use above so we don't try to set up the
-	creation ecal unless we are actually creating a new item
-
-	* gui/calendar-component.c (create_new_event): new utility routine
-	to create new events
-	(impl_requestCreateItem): use above so we don't try to set up the
-	creation ecal unless we are actually creating a new item
-
-2004-01-14  Rodrigo Moya <rodrigo@ximian.com>
-
-	* gui/e-calendar-table.c (e_calendar_table_show_popup_menu):
-	use get_selected_objects() instead of get_selected_comp().
-
-2004-01-14  Rodrigo Moya <rodrigo@ximian.com>
-
-	* gui/e-cal-model-tasks.c (get_status): removed assertion.
-
-2004-01-14  Rodrigo Moya <rodrigo@ximian.com>
-
-	* common/authentication.c (auth_new_cal_from_source): check
-	return value from e_cal_new().
-
-	* gui/gnome-cal.c (gnome_calendar_construct): if there is no
-	default tasks folder, don't create the ECal from it.
-
-2004-01-14  JP Rosevear <jpr@ximian.com>
-
-	* gui/tasks-component.c (impl_requestCreateItem): don't try to set
-	up the creation ecal unless we are actually creating a new item
-
-2004-01-13  Rodney Dawes  <dobey@ximian.com>
-
-	* gui/Makefile.am: Only link in libsoup where we need it
-
-2004-01-13  Rodrigo Moya <rodrigo@ximian.com>
-
-	* gui/calendar-component.c (impl_upgradeFromVersion): free 'base_uri'
-	at the end of the function, or it will leak, and removed duplicated
-	code to create the birthdays backend.
-
-2004-01-12 Gary Ekker <gekker@novell.com>
- 
- 	* gui/Makefile.am: add e-pub-utils.[ch]
- 	for Free/Busy publishing
- 	
- 	* gui/apps_evolution_calendar.schemas.in.in: add schema for
- 	/apps/evo/calendar/free_busy key
- 	
- 	* gui/calendar-commands.c (publish_freebusy_cmd): change to
- 	publish component rather than attach as email
- 	
- 	* gui/calendar-config-keys.h: add free_busy/urls key definition
- 	
- 	* gui/calendar-config.[ch] (calendar_config_get_free_busy): new
-   	method for retrieving FB gconf key
- 	(calendar_config_set_free_busy): new method for saving FB
- 	gconf key
- 	
- 	* gui/e-cal-view.c (on_publish): change to publish component
- 	rather than attach as email
- 	
- 	* gui/itip-utils.[ch] (itip_publish_begin): new method to process 
- 	e_cal_components and aggregate the data if we are publishing
- 	for multiple calendars
- 	(itip_publish_comp): new method to publish the ical data to an
- 	http server via libsoup
- 	(comp_fb_normalize): new static method to ensure rfc 2446 compliant 
- 	data before publishing icalcomponent_get_uid
- 	(fb_sort): new static method to sort FB properties in ascending order
- 	
- 	* gui/dialogs/Makefile.am: add url-editor-dialog.[ch] and 
- 	url-editor-dialog.glade for configure FB publishing
- 	
- 	* gui/dialogs/cal-prefs-dialog.[ch] (cal_prefs_dialog_url_add_clicked):
- 	(cal_prefs_dialog_url_edit_clicked):new method for events in FB tab 
- 	of cal-prefs-dialog
- 	(cal_prefs_dialog_url_remove_clicked): ditto
- 	(cal_prefs_dialog_url_enable_clicked): ditto
- 	(cal_prefs_dialog_url_url_list_change): ditto
- 	(cal_prefs_dialog_url_url_list_enable_toggled): ditto
- 	(cal_prefs_dialog_url_url_list_double_click): ditto
- 	(show_fb_config): new method for updating dialog with FB specific
- 	data in gconf
- 	(update_fb_config): new method for updating gconf with FB specific
- 	data from dialogs
- 	(setup_changes): detect changes in url_list gtk_tree_view
- 	(get_widgets): include new dialog widgets for FB config
- 	(init_widgets): connect signals for new FB config widgets
- 	
- 	* gui/dialogs/cal-prefs-dialog.glade: add new widgets for FB config
- 	
- 	* gui/dialogs/url-editor-dialog.[ch]: add files for FB url-editor dialog
- 	
- 	* gui/dialogs/url-editor-dialog.glade: ditto
- 	
- 	* gui/e-pub-utils.[ch]: add files with FB publishing utilities
- 
- 	* gui/calendar-component.c (init_calendar_publishing): sets up
- 	listeners to publish calendar, g_idle_add, and on gconf change
- 	(init_calendar_publishing_cb): ditto
- 	(conf_changed_callback): ditto
- 	(impl_createControls): ditto
-
-2004-01-12  Rodrigo Moya <rodrigo@ximian.com>
-
-	* gui/calendar-component.c (impl_upgradeFromVersion): sync the source
-	list after creating the remote source group.
-
-2004-01-12  JP Rosevear <jpr@ximian.com>
-
-	* Revert William McCann's patch of 2003-12-19 until we can get
-	consistent across all of evolution
-
-2004-01-12  Hans Petter Jansson  <hpj@ximian.com>
-
-	* gui/dialogs/calendar-setup.c (source_to_dialog): Only update dialog
-	widgets if they exist.
-
-2004-01-11  JP Rosevear <jpr@ximian.com>
-
-	* gui/tasks-component.c: Fix copyright notice, its copyright
-	Novell not our hackers
-
-	* gui/tasks-component.h: ditto
-	
-	* gui/calendar-component.c: ditto
-
-	* gui/calendar-component.h: ditto
-
-2004-01-10  Rodrigo Moya <rodrigo@ximian.com>
-
-	* gui/gnome-cal.c (open_ecal): cast the views to E_CALENDAR_VIEW,
-	not to E_CAL_VIEW.
-
-2004-01-10  Rodrigo Moya <rodrigo@ximian.com>
-
-	* gui/alarm-notify/notify-main.c: added missing headers.
-
-	* gui/alarm-notify/alarm-notify.c (alarm_notify_remove_calendar):
-	use the correct variable when calling alarm_queue_remove_client().
-
-	* gui/calendar-component.c (impl_upgradeFromVersion): removed redundant
-	variable declarations.
-
-	* gui/migration.c (process_old_dir):
-	* gui/e-timezone-entry.c (e_timezone_entry_mnemonic_activate):
-	* gui/e-date-time-list.c (e_date_time_list_finalize):
-	* gui/e-alarm-list.c (e_alarm_list_finalize): fixed warnings.
-
-	* gui/e-calendar-table.c: added missing prototypes at the top to
-	avoid warnings.
-
-	* gui/e-week-view.c (e_week_view_scroll_a_step):
-	* gui/e-day-view.c (e_day_view_event_move): directly return in the
-	default: case.
-
-	* gui/e-tasks.c (setup_widgets): connect to changes on the model.
-	(model_row_changed_cb): callback to update the HTML detailed view
-	when the currently selected task changes.
-	(client_obj_updated_cb): removed unused function.
-	(set_status_message): changed to accept a variable list of arguments.
-	(e_tasks_add_todo_uri): display status messages and get error message
-	from backend and display it in a dialog.
-	(cal_opened_cb, load_error, method_error, permission_error): removed
-	unused functions.
-
-	* gui/gnome-cal.c (open_ecal): added a GnomeCalendar argument, and
-	display status messages.
-	(gnome_calendar_construct, gnome_calendar_add_event_source):
-	adapted to changes in open_ecal().
-
-2004-01-10  Rodrigo Moya <rodrigo@ximian.com>
-
-	* gui/alarm-notify/alarm-queue.c (display_notification): keep
-	all the tray icons we create in a list.
-	(tray_icon_destroyed_cb): remove the tray icon data from the list.
-	(popup_dismiss_cb, popup_dismiss_all_cb): implemented missing
-	popup menu items.
-
-2004-01-09  Hans Petter Jansson  <hpj@ximian.com>
-
-	* gui/calendar-component.c (new_calendar_cb): calendar_config ->
-	calendar_setup.
-	(edit_calendar_cb): Ditto.
-	(impl_requestCreateItem): Ditto.
-
-	* gui/tasks-component.c (new_task_list_cb): Use calendar_setup.
-	(edit_task_list_cb): Implement properties callback.
-	(rename_task_list_cb): Remove.
-	(fill_popup_menu_cb): Remove "rename" and add "properties".
-	(impl_requestCreateItem): Use calendar_setup.
-
-	* gui/dialogs/Makefile.am (libcal_dialogs_la_SOURCES): calendar_config
-	-> calendar_setup. Remove new-task-list.[ch].
-	(glade_DATA): calendar_config -> calendar_setup. Remove
-	new-task-list.glade.
-
-	* gui/dialogs/new-task-list.[ch]: Remove.
-
-	* gui/dialogs/calendar-config.[ch]: Rename to calendar-setup.[ch].
-
-	* gui/dialogs/calendar-config.glade: Rename to calendar-setup.glade.
-
-2004-01-09  JP Rosevear <jpr@ximian.com>
-
-	* gui/calendar-component.c (impl_upgradeFromVersion): make sure we
-	sync the source list when appropriate
-
-	* gui/tasks-component.c (impl_upgradeFromVersion): ditto
-	
-2004-01-09  ERDI Gergo  <cactus@cactus.rulez.org>
-
-	* gui/calendar-component.c (impl_upgradeFromVersion): Create
-	ESource for anniversaries
-
-2004-01-09  Hans Petter Jansson  <hpj@ximian.com>
-
-	* gui/calendar-component.c (new_calendar_cb): Call
-	calendar_config_new_calendar().
-	(rename_calendar_cb): Remove.
-	(edit_calendar_cb): Implement properties callback.
-	(fill_popup_menu_cb): Add "Properties..." item and remove "Rename".
-
-	* gui/dialogs/Makefile.am (libcal_dialogs_la_SOURCES): Add
-	calendar-config.[ch] and remove new-calendar.[ch].
-	(glade_DATA): Add calendar-config.glade and remove new-calendar.glade.
-
-	* gui/dialogs/calendar-config.[ch]: Implement calendar creation and
-	editing.
-
-	* gui/dialogs/calendar-config.glade: Add GUI for above.
-
-2004-01-09  JP Rosevear <jpr@ximian.com>
-
-	* gui/tasks-component.c (impl_upgradeFromVersion): return the
-	corba values
-
-	* gui/calendar-component.c (impl_upgradeFromVersion): ditto
-
-2004-01-09  Rodrigo Moya <rodrigo@ximian.com>
-
-	* gui/calendar-component.c (impl_upgradeFromVersion): only migrate
-	old calendars if migrating from <= 1.4.x.
-
-	* gui/tasks-component.c (impl_upgradeFromVersion): ditto for tasks.
-
-2004-01-09  Andrew Wu <Yang.Wu@sun.com>
-
-	* gui/e-cal-view.c (e_calendar_view_class_init):
-	add a new signal "event_move" and its key binding.
-
-	* gui/e-cal-view.h:
-	add a new type "ECalViewMoveDirection".
-	add a new virtual method "event_move" for ECalView.
-
-	* gui/e-day-view.c
-	(e_day_view_event_move), (e_day_view_change_event_time):
-	Use "Alt + Arrow" to move a selected event through time lines
-	or different days.
-
-	* gui/e-day-view.h:
-	add a new property "last_edited_comp_string" for EWeekView.
-
-	* gui/e-week-view.c (e_week_view_class_init), (e_week_view_init),
-	(e_week_view_reshape_events), (e_week_view_event_move),
-	(e_week_view_get_day_offset_of_event), (e_week_view_scroll_a_step),
-	(e_week_view_change_event_time), (e_week_view_do_key_press),
-	(e_week_view_move_selection_day),
-	(e_week_view_get_adjust_days_for_move_up),
-	(e_week_view_get_adjust_days_for_move_down),
-	(e_week_view_get_adjust_days_for_move_left),
-	(e_week_view_get_adjust_days_for_move_right):
-	Use "Alt + Arrow" to move a selected event through different days.
-
-	* gui/e-week-view.h:
-	add a new property "last_edited_comp_string" for EWeekView.
-
-2004-01-08  Rodrigo Moya <rodrigo@ximian.com>
-
-	* gui/alarm-notify/alarm-queue.c (display_notification): store
-	the ECal's associated ECalView, and connect to its "objects_removed"
-	signal.
-	(notifiy_dialog_cb): disconnect signals from the ECalView, not the
-	ECal.
-	(on_dialog_objs_removed_cb): adapted to respond to "objects_removed"
-	signal on ECalView. Made it destroy the tray bar icon also.
-	(add_popup_menu_item): new function to create the popup items.
-	(tray_icon_clicked_cb): remove connection to obsolete signal, and
-	made it popup a menu on right-click.
-	(popup_open_cb, popup_dismiss_cb, popup_dismiss_all_cb): callbacks
-	for popup menu.
-
-	* gui/gnome-cal.c (connect_week_view_focus): don't access the
-	widget's private fields if NULL.
-
-2004-01-08  Rodrigo Moya <rodrigo@ximian.com>
-
-	* gui/dialogs/comp-editor.c (save_comp): moved the line that sets
-	priv->updating to FALSE up some lines, to avoid getting callbacks
-	with an incorrect value on it.
-	(obj_modified_cb): check the UIDs of the objects we get passed to
-	see if the one being edited is amongst them.
-
-2004-01-08  Kidd Wang  <kidd.wang@sun.com>
-
-	* gui/e-cal-view.h: delete the ECalViewMoveDirection type declaration
-        which was added by mistake yesterday.
-
-        * ChangeLog: add a missed entry for calender-commands.c.
-
-2004-01-07  Rodrigo Moya <rodrigo@ximian.com>
-
-	* gui/alarm-notify/alarm-queue.c (load_alarms): call e_cal_view_start
-	to actually start the live query.
-	(add_component_alarms): check the 'alarms' parameter before using it.
-
-2004-01-07  Rodrigo Moya <rodrigo@ximian.com>
-
-	* gui/alarm-notify/alarm-queue.c: added an ECalQuery for each loaded
-	client.
-	(load_alarms): use a live query to the calendar instead of calling
-	e_cal_get_alarms_in_range().
-	(alarm_queue_add_client): set query initially to NULL.
-	(query_objects_changed_cb): renamed and made it manage both
-	"objects_added" and "objects_modified" signals of ECalView.
-	(query_objects_removed_cb): manage the "objects_removed" signal of
-	ECalView.
-	(alarm_queue_remove_client): unref the live query.
-
-2004-01-06  JP Rosevear  <jpr@ximian.com>
-
-	* gui/gnome-cal.c (gnome_calendar_add_event_source): remove the
-	item from the hash last and don't free its members because the
-	hash table does that for us
-
-2004-01-06  Rodrigo Moya <rodrigo@ximian.com>
-
-	* gui/calendar-component.c (impl_upgradeFromVersion): new
-	method's implementation.
-	(calendar_component_class_init): initialize new epv's member.
-	(calendar_component_init): moved migration code to
-	impl_upgradeFromVersion.
-	(update_uri_for_primary_selection): fixed warning.
-
-	* gui/tasks-component.c (impl_upgradeFromVersion): new
-	method's implementation.
-	(tasks_component_class_init): initialize new epv's member.
-	(tasks_component_init): moved migration code to
-	impl_upgradeFromVersion.
-
-2004-01-06  JP Rosevear <jpr@ximian.com>
-
-	* gui/e-select-names-renderer.c (esnr_editing_done): disconnect
-	the activated signal
-
-2004-01-06  JP Rosevear <jpr@ximian.com>
-
-	* gui/dialogs/comp-editor.c (comp_editor_finalize): we don't put
-	any signal handlers on the client or source client now, but we do
-	on the view
-	(real_set_e_cal): no signal handlers on the client
-	(obj_modified_cb): we are guaranteed this is a signal for our
-	component
-	(obj_removed_cb): ditto
-	(listen_for_changes): listen for changes on the object
-	(save_comp): use above since the source_client changed
-	(real_edit_comp): use above since the comp changed
-
-2004-01-06  JP Rosevear <jpr@ximian.com>
-
-	* gui/e-select-names-renderer.c (esnr_activated): if we are
-	de-activated, the editing is done
-	(esnr_start_editing): listen for activated signal on the control
-	frame
-
-	Fixes #52196
-	
-2004-01-06  Kidd Wang  <kidd.wang@sun.com>
-
-	* gui/e-calendar-table.[ch] (e_calendar_table_open_selected):
-	open a dialog for the selected task.
-	* gui/e-tasks.[ch] (e_tasks_open_task): ditto.
-	* gui/tasks-control.c (tasks_control_sensitize_commands),
-	(tasks_control_open_task_cmd): add a menu item for "Open Task".
-	* gui/calender-commands.c: the event should also be allowed to open
-	even when it's readonly. 
-
-2004-01-05  Rodrigo Moya <rodrigo@ximian.com>
-
-	* gui/gnome-cal.c (open_ecal): new function to open ECal's, get any
-	error information and display it to the user, all-in-one.
-	(gnome_calendar_construct, gnome_calendar_add_event_source): use the
-	above function, instead of e_cal_open().
-	(open_error, method_error, permission_error): removed unneeded
-	functions, we just display the error message returned from the
-	backend.
-
-2004-01-05  Rodrigo Moya <rodrigo@ximian.com>
-
-	* gui/gnome-cal.c (gnome_calendar_construct): no need to connect to
-	the "cal_opened" signal on the task client. Also, added code to
-	add the client to the ECalendarTable's model.
-	(client_cal_opened_cb, update_e_cal_view_timeout): removed unneeded
-	function.
-
-2004-01-05  Rodrigo Moya <rodrigo@ximian.com>
-
-	* gui/gnome-cal.c (gnome_calendar_construct): display the tasks'
-	primary selection in the task list, and actually open the tasks
-	folder.
-
-	* gui/e-tasks.c (e_tasks_set_default_uri): use the ECalModel to
-	get the client for a given URI.
-
-2004-01-04  Rodrigo Moya <rodrigo@ximian.com>
-
-	* gui/calendar-component.c (add_uri_for_source,
-	remove_uri_for_source): removed redundant functions.
-	(update_uris_for_selection): dont call above functions, use
-	gnome_calendar_* directly.
-
-2003-12-29  Kidd Wang  <kidd.wang@sun.com>
-
-	* gui/calendar-commands.c (file_open_event_cb): add a menu item
-	for "open appointment".
-
-	* gui/e-cal-view.[ch] (e_calendar_view_open_event): add a signal
-	"open_event" and bind it to "ctrl+o". When the signal is delivered,
-	a dialog will be opened to edit the selected event.
-
-	* gui/e-calendar-table.c (e_calendar_table_on_key_press): press "ctrl-o"
-	to open a dialog.
-
-2003-12-24  JP Rosevear <jpr@ximian.com>
-
-	* gui/e-select-names-renderer.c (esnr_start_editing): fix the
-	signal name
-
-	* gui/dialogs/meeting-page.glade: add Add Attendee button
-
-	* gui/dialogs/meeting-page.c (get_widgets): extract add button
-	(add_clicked_cb): edit the attendee after we add it
-	(init_widgets): listen for add clicked
-	(meeting_page_construct): the add button is in the glade file now
-
-	* gui/e-select-names-editable.c (esne_start_editing): activate the
-	control
-	(e_select_names_editable_get_address): handle null dest
-	(e_select_names_editable_get_name): ditto
-
-	* gui/e-meeting-store.h: add proto
-
-	* gui/e-meeting-store.c (e_meeting_store_find_attendee_path):
-	create the path to a given attendee
-
-	* gui/e-meeting-list-view.h: add proto
-
-	* gui/e-meeting-list-view.c (e_meeting_list_view_edit): start
-	editing the address of a particular
-
-2003-12-22  Rodrigo Moya <rodrigo@ximian.com>
-
-	* gui/gnome-cal.[ch] (gnome_calendar_add_event_source,
-	gnome_calendar_remove_event_source): renamed from *_uri, to work with
-	ESource's rather than with plain URIs.
-	(gnome_calendar_set_default_source): ditto.
-
-	* gui/control-factory.c (set_prop):
-	* gui/calendar-component.c (add_uri_for_source, remove_uri_for_source,
-	update_uri_for_primary_selection):
-	use sources instead of uris with the GnomeCalendar widget.
-
-2003-12-22  Rodrigo Moya <rodrigo@ximian.com>
-
-	* gui/alarm-notify/save.c (get_saved_notification_time): if the setting
-	is not in the config database, use the current time, to avoid getting
-	hundreds of alarms for past events.
-
-2003-12-22  Rodrigo Moya <rodrigo@ximian.com>
-
-	* common/authentication.[ch]: new files for managing interactive
-	authentication with backends.
-
-	* common/Makefile.am: build new private library.
-
-	* gui/alarm-notify/alarm-notify.c (alarm_notify_add_calendar):
-	* gui/dialogs/event-page.c (source_changed_cb):
-	* gui/dialogs/task-page.c (source_changed_cb):
-	* gui/dialogs/copy-source-dialog.c (copy_source):
-	* gui/calendar-component.c (setup_create_ecal):
-	* gui/calendar-offline-handler.c (backend_go_offline,
-	backend_go_online, calendar_offline_handler_init):
-	* gui/comp-editor-factory.c (open_client):
-	* gui/e-itip-control.c (start_calendar_server):
-	* gui/e-tasks.c (e_tasks_add_todo_uri):
-	* gui/gnome-cal.c (gnome_calendar_construct,
-	gnome_calendar_add_event_uri):
-	* gui/tasks-component.c (setup_create_ecal):
-	* importers/icalendar-importer.c (load_file_fn, vcal_load_file_fn,
-	gnome_calendar_import_data_fn): create the ECal's via the
-	auth_new_cal_from* functions in the authentication module.
-
-	* gui/alarm-notify/Makefile.am:
-	* gui/Makefile.am:
-	* importers/Makefile.am: link new private library.
-	
-	* Makefile.am: added new directory to the build.
-
-2003-12-21  JP Rosevear <jpr@ximian.com>
-
-	* gui/e-itip-control.[hc]: rewrite for new ecal api, cache all
-	ecal's by type and minimize loading.  Switch to using the source
-	option menu
-
-	* conduits/todo/todo-conduit.c (start_calendar_server): ditto
-
-	* conduits/calendar/calendar-conduit.c (start_calendar_server):
-	use ECalSourceType
-	
-	* importers/icalendar-importer.c (load_file_fn): ditto
-	(vcal_load_file_fn): ditto
-	(gnome_calendar_import_data_fn): ditto
-
-	* gui/dialogs/task-page.c (source_changed_cb): ditto
-
-	* gui/dialogs/event-page.c (source_changed_cb): ditto
-
-	* gui/dialogs/copy-source-dialog.h: update proto
-
-	* gui/dialogs/copy-source-dialog.c (copy_source_dialog): ditto
-
-	* gui/alarm-notify/alarm-notify.c (alarm_notify_add_calendar): ditto
-
-	* gui/tasks-component.c (copy_task_list_cb): ditto
-	(setup_create_ecal): ditto
-
-	* gui/gnome-cal.c (gnome_calendar_construct): ditto
-	(gnome_calendar_add_event_uri): ditto
-
-	* gui/e-tasks.c (e_tasks_add_todo_uri): ditto
-
-	* gui/comp-editor-factory.c (open_client): ditto
-
-	* gui/calendar-offline-handler.c (backend_go_offline): ditto
-	(backend_go_online): ditto
-	(calendar_offline_handler_init): ditto
-
-	* gui/calendar-component.c (copy_calendar_cb): ditto
-	(setup_create_ecal): ditto
-
-	* gui/print.c (print_month_small): don't pass type to
-	e_cal_generate_instances	
-	(print_day_details): ditto
-	(print_week_summary): ditto
-
-	* gui/tag-calendar.c (tag_calendar_by_client): ditto
-	
-2003-12-19  JP Rosevear <jpr@ximian.com>
-
-	* gui/tasks-control.c (tasks_control_sensitize_commands): make
-	sure there is a ui container
-
-	* gui/calendar-commands.c (calendar_control_sensitize_calendar_commands): ditto
-	
-	* gui/tasks-component.c (impl_createControls): update after the
-	signals are connected so that the ecal's are actually loaded
-
-	* gui/calendar-component.c: ditto
-	
-2003-12-19  William Jon McCann  <mccann@jhu.edu>
-
-	* gui/dialogs/task-page.c (source_changed_cb): 
-	* gui/dialogs/send-comp.c (send_component_dialog): 
-	* gui/dialogs/save-comp.c (save_component_dialog): 
-	* gui/dialogs/recur-comp.c (recur_component_dialog): 
-	* gui/dialogs/event-page.c (source_changed_cb): 
-	* gui/dialogs/delete-error.c (delete_error_dialog): 
-	* gui/dialogs/delete-comp.c (delete_component_dialog): 
-	* gui/dialogs/changed-comp.c (changed_component_dialog): 
-	* gui/dialogs/cancel-comp.c (cancel_component_dialog): 
-	* gui/dialogs/alarm-options.glade:
-	* gui/dialogs/alarm-page.glade:
-	* gui/dialogs/cal-prefs-dialog.glade:
-	* gui/dialogs/e-delegate-dialog.glade:
-	* gui/dialogs/event-page.glade:
-	* gui/dialogs/new-calendar.glade:
-	* gui/dialogs/new-task-list.glade:
-	* gui/dialogs/recurrence-page.glade:
-	* gui/dialogs/task-details-page.glade:
-	* gui/dialogs/task-page.glade:
-	* gui/tasks-control.c (confirm_purge): 
-	* gui/tasks-component.c (delete_task_list_cb) 
-	(rename_task_list_cb, setup_create_ecal): 
-	* gui/goto-dialog.glade: 
-	* gui/e-cal-model-tasks.c (show_geo_warning): 
-	* gui/comp-editor-factory.c (cal_opened_cb): 
-	* gui/calendar-component.c (delete_calendar_cb) 
-	(rename_calendar_cb, setup_create_ecal, delete_calendar_cb): 
-	* gui/calendar-commands.c (purge_cmd):
-	Remove separators from dialogs.  Use frame style recommended
-	by the HIG.
-
-2003-12-18  Rodrigo Moya <rodrigo@ximian.com>
-
-	* gui/tasks-component.c (impl_createControls):
-	* gui/calendar-component.c (impl_createControls): make sure we
-	connect to the "changed" signals after setting the initial selections
-	on the ESourceSelector. Fixes some nasty warnings because of
-	calendar_control_sensitize_calendar_commands being called with
-	no container yet for the control.
-
-2003-12-17  Hans Petter Jansson  <hpj@ximian.com>
-
-	* gui/dialogs/comp-editor.c: Add the concept of a source client, where
-	the object lives currently. The plain client is where it will be
-	stored.
-	(comp_editor_finalize): If we have a source client, disconnect from
-	and unref it.
-	(save_comp): Check if the object is being moved, and if so, remove it
-	from the source client, and make the target client the new source.
-	(comp_editor_append_page): Connect to client_changed signal.
-	(real_set_e_cal): Change an old gtk_signal_disconnect_by_data() to
-	the GLib equivalent, and don't cast ECal to GtkObject. If the source
-	client is not set, make it equivalent to the target client.
-	(page_client_changed_cb): Implement. Handles a client change.
-
-	* gui/dialogs/comp-editor-page.c (comp_editor_page_class_init): Add
-	a new signal, "client_changed", that notifies that the ECal client
-	was changed from one of the editor pages.
-	(comp_editor_page_set_e_cal): Fix two bugs in this function; if the
-	same client is set twice, its ref count could drop to 0. Additionally,
-	it was unreffing the new client instead of the old one.
-	(comp_editor_page_notify_client_changed): Implement.
-
-	* gui/dialogs/event-page.c (event_page_fill_widgets): Fill in the
-	source menu.
-	(get_widgets): Get the source menu.
-	(source_changed_cb): Implement. Try to open a client for the new
-	source, and if successful, notify of the change. Show a dialog on
-	failure, and revert to last selected source.
-	(init_widgets): Connect to source menu.
-	(event_page_create_source_option_menu): Implement Glade helper.
-
-	* gui/dialogs/task-page.c (task_page_fill_widgets): Fill in the source
-	menu.
-	(get_widgets): Get the source menu.
-	(source_changed_cb): Implement, similar to the event page, but for
-	tasks.
-	(init_widgets): Connect to source menu.
-	(task_page_construct): Fix a message booboo.
-	(task_page_create_source_option_menu): Implement Glade helper.
-
-	* gui/dialogs/event-page.glade: Add source menu widget.
-
-	* gui/dialogs/task-page.glade: Add source menu widget.
-
-2003-12-17  Rodrigo Moya <rodrigo@ximian.com>
-
-	* gui/tasks-component.c (add_popup_menu_item):
-	* gui/calendar-component.c (add_popup_menu_item): use g_file_test
-	to check if the 'pixmap' argument is a file. If so, get the pixmap
-	from it, or gtk_image_new_from_stock will return an empty pixmap.
-
-2003-12-17  Rodrigo Moya <rodrigo@ximian.com>
-
-	* gui/gnome-cal.c (client_cal_opened_cb): set a correct status
-	message.
-
-	* gui/tasks-component.c (fill_popup_menu_cb):
-	* gui/calendar-component.c (fill_popup_menu_cb): use the folder*.png
-	icons for folder operations.
-
-	* gui/Makefile.am: removed cal-client directory from $INCLUDES.
-
-2003-12-17  Harry Lu  <harry.lu@sun.com>
- 
- 	Fixes #51665.
- 
- 	* gui/e-week-view.c: (e_week_view_focus): call 
- 	e_week_view_check_layout() so that the spans won't be NULL.
-
-2003-12-17  Rodrigo Moya <rodrigo@ximian.com>
-
-	* gui/calendar-commands.c: removed the 'NewCalendar' verb.
-	(file_new_calendar_cb): removed callback for 'NewCalendar' verb.
-
-	* gui/calendar-component.c: (impl__get_userCreatableItems): added
-	'New Calendar' to the list of user creatable items.
-	(impl_requestCreateItem): implemented 'New Calendar'.
-
-	* gui/tasks-component.c (impl__get_userCreatableItems): added
-	'New Task List' to the list of user creatable items.
-	(impl_requestCreateItem): implemented 'New Task List'.
-
-2003-12-17  Rodrigo Moya <rodrigo@ximian.com>
-
-	* gui/tasks-control.[ch] (tasks_control_sensitize_commands): made
-	it public.
-
-	* gui/tasks-component.c (update_uri_for_primary_selection): call
-	tasks_control_sensitize_commands() when the primary selection
-	changes.
-
-2003-12-17  Rodrigo Moya <rodrigo@ximian.com>
-
-	* gui/calendar-component.c (update_uri_for_primary_selection): call
-	calendar_control_sensitize_calendar_commands when the primary selection
-	changes.
-	(impl_createControls): keep the view_control in the private structure and
-	use control_factory_new_control() to create the control.
-	(control_activate_cb): removed unneeded function.
-
-	* gui/tasks-component.c (impl_createControls): use tasks_control_new to
-	create the tasks view control.
-	(control_activate_cb): removed unneeded function.
-
-	* gui/gnome-cal.c (gnome_calendar_add_event_uri): check the return
-	value from e_cal_new_from_uri.
-
-2003-12-17  Rodrigo Moya <rodrigo@ximian.com>
-
-	* gui/alarm-notify/alarm-notify.c (alarm_notify_remove_calendar):
-	make sure we free the data stored in the hash table.
-	(alarm_notify_add_calendar): call alarm_queue_add_client, or we wont
-	have alarms at all.
-
-	* gui/alarm-notify/alarm-queue.c: no need to hold a ref count.
-	(alarm_queue_add_client, alarm_queue_remove_client): don't use the
-	refcount private member.
-	(alarm_queue_add_client): don't connect to non-existing ECal signals.
-	(display_notification, free_client_alarms_cb): fixed warnings.
-
-2003-12-16  Rodrigo Moya <rodrigo@ximian.com>
-
-	Fixes part of #41237
-	
-	* gui/e-calendar-table.c: use GtkClipboard instead of GtkInvisible
-	for cut/copy/paste.
-	(selection_clear_event, selection_received, selection_get): removed
-	unneeded functions.
-	(e_calendar_table_init): don't create the invisible widget.
-	(e_calendar_table_copy_clipboard): use gtk_clipboard_set_text().
-	(e_calendar_table_paste_clipboard): use gtk_clipboard_request_text().
-	(clipboard_get_text_cb): callback for gtk_clipboard_request_text().
-
-	* gui/e-cal-view.c (e_calendar_view_init, e_calendar_view_destroy,
-	e_calendar_view_copy_clipboard): no need anymore to keep the last
-	clipboard selection, GtkClipboard does it for us.
-
-2003-12-16  Rodrigo Moya <rodrigo@ximian.com>
-
-	* gui/alarm-notify/notify-main.c (alarm_notify_factory_fn): return
-	a reference to the alarm_notify_service, not NULL and ref the object
-	before returning it.
-
-2003-12-15  JP Rosevear <jpr@ximian.com>
-
-	* gui/gnome-cal.c (setup_widgets): set the list view config
-	properly (so we don't blow away the month view config
-
-2003-12-15  JP Rosevear <jpr@ximian.com>
-
-	* gui/gnome-cal.c (setup_widgets): set the calendar for the day
-	view
-
-2003-12-14  JP Rosevear <jpr@ximian.com>
-
-	* gui/calendar-component.c (impl_requestCreateItem): set a proper
-	exception if we fail
-
-2003-12-14  JP Rosevear <jpr@ximian.com>
-	
-	* gui/calendar-config.c
-	(calendar_config_get_hide_completed_tasks_units): make sure the
-	string is non-null before strcmp'ing it
-
-	Fixes #52033
-	
-2003-12-10  Rodrigo Moya <rodrigo@ximian.com>
-
-	* gui/gnome-cal.c (gnome_calendar_add_event_uri): remove the client
-	from the list if there are errors, instead of re-adding it again.
-	Also, unref the ECal object on errors, for not leaking.
-
-2003-12-10  Bolian Yin <bolian.yin@sun.com>
-
-	*gui/e-week-view.c: Fix a event/jump button tabbing bug
-
-2003-12-10  Harry Lu  <harry.lu@sun.com>
-
-        Fix for bugzilla bug #51628.
-
-        * gui/weekday-picker.c: (weekday_picker_class_init): setup focus
-        handler.
-        (day_clicked): new function to set day_mask when mouse clicked
-        or keyboard input of space/enter.
-        (handle_key_press_event): new function to handle key press event.
-        (day_event_cb): handle key press event too.
-        (weekday_picker_init): set widget can be focused.
-        (colorize_items): change the box's outline if it is focused.
-        (weekday_picker_focus): new function to handler focus event.
-
-2003-12-09  Andrew Wu <Yang.Wu@sun.com>
-
-	* gui/e-week-view-main-item.c (e_week_view_main_item_class_init): init a11y.
-	* gui/e-week-view.c: emit signal "selected_time_changed".
-
-2003-12-08  Bolian Yin <bolian.yin@sun.com>
-
-	* gui/e-day-view.c (e_day_view_on_editing_started): remove setting property of "handle_popup".
-	* gui/e-week-view.c (e_week_view_on_editing_started): remove setting property of "handle_popup".
-
-2003-12-08 Carl Sun <carl.sun@sun.com>
-
-        Fixes #46351
-
-	* gui/e-timezone-entry.c  (e_timezone_entry_mnemonic_activate):
-	new function. override the  member function of GtkWidget to handle
-	nemonic_activate signal of custom class ETimezoneEntry.
-
-
-2003-12-08  Bolian Yin <bolian.yin@sun.com>
-
-	* gui/gnome-cal.c (gnome_calendar_class_init): correct argument mismatch in "goto_date" signal definition.
-
-2003-12-05  Yong Sun <Yong.Sun@Sun.com>
-
-	Fix for #51337
-
-	* gui/dialogs/alarm-page.c
-	Change raw string "Action/Trigger" to _("Action/Trigger")
-	* gui/dialogs/recurrence-page.c
-	Change raw string "Date/Time" to _("Date/Time")
-
-2003-12-04  Harry Lu  <harry.lu@sun.com>
-
-	Fix for bugzilla bug #51627.
-
-	* gui/goto.c: (create_ecal): set calitem's move_selection_when_moving 
-	to FALSE so that changing month and year won't send out 
-	a "selection_changed" signal.
-
-2003-12-03  Ettore Perazzoli  <ettore@ximian.com>
-
-	* gui/tasks-control.c (tasks_control_activate): Do not call
-	control_util_set_folder_bar_label().
-
-	* gui/e-calendar-table.c (e_calendar_table_set_status_message):
-	Use e_activity_handler_operation_progressing(), not
-	evolution_activity_client_update().
-
-	* gui/e-cal-view.c: Remove settings menu.
-	(on_settings): Remove.
-
-	* gui/calendar-commands.c (get_shell_view_interface): Remove.
-	(control_util_set_folder_bar_label): Remove.
-	(calendar_set_folder_bar_label): Remove.
-	(control_util_show_settings): Remove.
-	(gcal_calendar_dates_change_cb): Remove.
-	(calendar_control_activate): Do not connect, do not call
-	calendar_set_folder_bar_label().
-
-2003-12-03  JP Rosevear <jpr@ximian.com>
-
-	* gui/gnome-cal.c (gnome_calendar_destroy): free the notification
-	list
-	
-	* gui/tasks-component.c (impl_dispose): ditto
-
-	* gui/calendar-component.c (impl_dispose): ditto
-
-2003-12-03  JP Rosevear <jpr@ximian.com>
-
-	* gui/tasks-component.c (impl_dispose): free up the notifications
-	and the ecal
-	(config_create_ecal_changed_cb): clear the create_ecal if the
-	primary selection changes
-	(setup_create_ecal): find a default ecal to do creation with
-	(impl_requestCreateItem): use above
-
-2003-12-03  JP Rosevear <jpr@ximian.com>
-
-	* gui/tasks-component.c (rename_task_list_cb): cast the parent
-	(impl_createControls): add notification for primary tasks
-	(config_primary_selection_changed_cb): handle primary selection
-	changing in gconf
-
-	* gui/calendar-config-keys.h: fix config key for primary tasks
-
-2003-12-03  JP Rosevear <jpr@ximian.com>
-
-	* gui/calendar-component.c (rename_calendar_cb): cast the parent
-	(config_primary_selection_changed_cb): handle the primary
-	selection changing elsewhere
-	(impl_dispose): remove the list of notifications
-	(impl_createControls): add primary calendar notification
-	(config_create_ecal_changed_cb): clear create_ecal if the primary
-	key changes
-	(setup_create_ecal): find an ecal to use for creation
-	(impl_requestCreateItem): use above
-
-2003-12-03  Ettore Perazzoli  <ettore@ximian.com>
-
-	* importers/icalendar-importer.c: Do not #include shell stuff.
-
-	* gui/main.c: Do not #include <evolution-shell-client.h>.
-
-	* gui/e-itip-control.c: Do not #include
-	<e-folder-selector-button.h> nor <evolution-shell-client.h>.
-	(start_default_server): Return FALSE.
-	(default_server_started_cb): Do not connect the "selected" signal
-	on the button since it's now NULL.
-	(button_selected_cb): #if 0 out.
-
-	* gui/e-cal-list-view.h: Do not #include
-	"evolution-activity-client.h".
-
-	* gui/tasks-component.c (impl_createControls): Give an empty label
-	for the status bar.
-
-	* gui/e-day-view.h: Remove all deps on evolution-activity-client.
-
-2003-12-02  Rodney Dawes  <dobey@ximian.com>
-
-	* gui/Makefile.am: Version the schemas
-	* gui/apps_evolution_calendar.schemas: Removed
-	* gui/apps_evolution_calendar.schemas.in.in: Added
-
-2003-12-02  Rodrigo Moya <rodrigo@ximian.com>
-
-	* gui/dialogs/copy-source-dialog.c (copy_source_dialog): added
-	a label to the dialog to make it look less ugly.
-
-2003-12-02  Rodrigo Moya <rodrigo@ximian.com>
-
-	* gui/dialogs/copy-source-dialog.c: converted to use an
-	ESourceOptionMenu instead of the ESourceSelector.
-	(primary_selection_changed_cb): removed.
-	(copy_source_dialog): create the ESourceOptionMenu here.
-	(source_selected_cb): callback for the "source_selected"
-	signal on the ESourceOptionMenu widget.
-
-2003-12-02  Ettore Perazzoli  <ettore@ximian.com>
-
-	* gui/e-calendar-table.h (struct _ECalendarTable): Replace member
-	"activity" with an "activity_id".
-
-	* gui/e-cal-view.c (struct _ECalendarViewPrivate): Replace member
-	"activity" with "activity_id".
-	(e_calendar_view_destroy): Don't unref activity here anymore.
-	(e_calendar_view_set_status_message): Report progress using the
-	EActivityHandler off the CalendarComponent.
-
-	* gui/calendar-component.c
-	(struct _CalendarComponentPrivate): New member activity_handler.
-	(calendar_component_init): Init.
-	(calendar_component_peek_activity_handler): New.
-	(impl_dispose): Unref.
-	(impl_createControls): Return an ETaskBar for the statusbar
-	control.
-
-2003-12-01  Ettore Perazzoli  <ettore@ximian.com>
-
-	* gui/calendar-component.c (impl_createControls): Pass a label for
-	the status bar control for now.
-
-	* gui/tasks-component.c (impl_createControls): Pass a label for
-	the status bar control for now.
-
-2003-12-01  Rodney Dawes  <dobey@ximian.com>
-
-	* gui/GNOME_Evolution_Calendar.server.in.in:
-	* gui/calendar-commands.c:
-	* gui/e-meeting-list-view.c:
-	* gui/e-meeting-model.c:
-	* gui/e-select-names-editable.c:
-	* gui/itip-bonobo-control.c:
-	* gui/itip-utils.c:
-	* gui/main.c:
-	* gui/alarm-notify/GNOME_Evolution_Calendar_AlarmNotify.server.in.in:
-	* gui/alarm-notify/alarm-queue.c:
-	* gui/alarm-notify/notify-main.c:
-	* gui/dialogs/alarm-options.c:
-	* gui/dialogs/e-delegate-dialog.c:
-	* importers/GNOME_Evolution_Calendar_Importer.server.in.in:
-	* importers/main.c: Use BASE_VERSION for repo_ids and OAFIIDs
-
-2003-12-01  JP Rosevear <jpr@ximian.com>
-
-	* conduits/todo/Makefile.am: put the conduits in their own dir
-
-	* conduits/calendar/Makefile.am: ditto
-	
-	* conduits/todo/e-todo.conduit.in: subst in correct thing
-
-	* conduits/calendar/e-calendar.conduit.in: ditto
-
-2003-12-01  JP Rosevear <jpr@ximian.com>
-
-	* conduits/todo/Makefile.am: install to privlibdir
-
-	* conduits/calendar/Makefile.am: ditto
-	
-	* conduits/todo/e-todo.conduit.in: subst in correct thing
-
-	* conduits/calendar/e-calendar.conduit.in: subst in correct thing
-
-2003-12-01  Rodrigo Moya <rodrigo@ximian.com>
-
-	* gui/alarm-notify/alarm-notify.c (add_uri_to_load, remove_uri_to_load):
-	removed unneeded functions.
-	(alarm_notify_add_calendar, alarm_notify_remove_calendar): no need
-	anymore to add/remove URIs to load on startup to the configuration.
-
-2003-12-01  Rodrigo Moya <rodrigo@ximian.com>
-
-	* gui/alarm-notify/save.c (save_calendars_to_load): removed this
-	function, since we now use the ESourceList to know what calendars
-	to load.
-	(get_calendars_to_load): moved to config-data.c.
-	(save_notification_time, get_saved_notification_time,
-	save_blessed_program, is_blessed_program): use the
-	shared GConfClient.
-
-	* gui/alarm-notify/config-data.[ch]: use a GConfClient instead of a
-	EConfigListener.
-	(config_data_get_conf_client): renamed from _get_listener.
-	(config_data_get_timezone, config_data_get_24_hour_format): changed
-	to use the GConfClient.
-	(config_data_get_calendars_to_load): new function.
-	(ensure_inited): create the source lists for calendar and tasks here.
-	(do_cleanup): cleanup the source lists here.
-
-	* gui/alarm-notify/notify-main.c (load_calendars): use
-	config_data_get_calendars_to_load().
-
-2003-11-28  JP Rosevear <jpr@ximian.com>
-
-	* gui/e-tasks.c (e_tasks_delete_completed): we want to skip if it
-	*is* read only
-
-2003-11-28  JP Rosevear <jpr@ximian.com>
-
-	* gui/e-meeting-store.c (e_meeting_store_get_type): allocate the
-	type information correctly
-
-2003-11-26  Hans Petter Jansson  <hpj@ximian.com>
-
-	* gui/calendar-offline-handler.c (backend_go_offline): e_cal_new () ->
-	e_cal_new_from_uri ().
-	(backend_go_online): Ditto.
-	(calendar_offline_handler_init): Ditto.
-
-	* gui/comp-editor-factory.c (open_client): Ditto.
-
-	* gui/e-itip-control.c (start_calendar_server): Ditto.
-	(object_requested_cb): Ditto.
-
-	* gui/e-tasks.c (e_tasks_add_todo_uri): Ditto.
-
-	* gui/gnome-cal.c (gnome_calendar_construct): Ditto.
-	(gnome_calendar_add_event_uri): Ditto.
-
-	* gui/alarm-notify/alarm-notify.c (alarm_notify_add_calendar): Ditto.
-
-	* importers/icalendar-importer.c (load_file_fn): Ditto.
-	(vcal_load_file_fn): Ditto.
-	(gnome_calendar_import_data_fn): Ditto.
-
-	* gui/dialogs/copy-source-dialog.c (copy_source): Pass sources to
-	e_cal_new ().
-
-2003-11-24  Rodrigo Moya <rodrigo@ximian.com>
-
-	* gui/dialogs/copy-source-dialog.c (copy_source): use the correct
-	icalcomponent when calling e_cal_create_object.
-
-	* gui/tasks-control.c (sensitize_commands): no need to have a
-	selection for Paste to work.
-
-	* gui/e-calendar-table.c (e_calendar_table_show_popup_menu): disable
-	editing items if the selected task list is read only, not if it's not.
-
-2003-11-24  Rodrigo Moya <rodrigo@ximian.com>
-
-	* gui/dialogs/new-task-list.glade:
-	* gui/dialogs/new-task-list.[ch]: new files containing the
-	implementation of the 'New Task List' dialog.
-
-	* gui/dialogs/Makefile.am: added new files.
-
-	* gui/dialogs/new-calendar.c (new_calendar_dialog): use G_STRLOC
-	for g_warning messages.
-
-	* gui/tasks-component.c (new_task_list_cb): implemented.
-
-2003-11-24  Rodrigo Moya <rodrigo@ximian.com>
-
-	* gui/dialogs/copy-source-dialog.c (copy_source_dialog): actually
-	add the source selector to the dialog's box.
-
-2003-11-23  Rodrigo Moya <rodrigo@ximian.com>
-
-	* gui/tasks-component.c:
-	* gui/dialogs/copy-source-dialog.[ch]: fixed compilation errors.
-
-	* gui/dialogs/Makefile.am: added missing header directories.
-
-2003-11-23  Rodrigo Moya <rodrigo@ximian.com>
-
-	* gui/dialogs/new-calendar.[ch]: fixed copyright notices.
-
-	* gui/dialogs/copy-source-dialog.[ch]: implementation of the
-	Copy command for sources.
-
-	* gui/dialogs/Makefile.am: added new files.
-
-	* gui/calendar-component.c (fill_popup_menu_cb, copy_calendar_cb):
-	added Copy command.
-
-	* gui/tasks-component.c (fill_popup_menu_cb, copy_task_list_cb):
-	added Copy command.
-
-2003-11-23  Ross Burton  <ross@burtonini.com>
-
-	* gui/alarm-notify/GNOME_Evolution_Calendar_AlarmNotify.server.in.in:
-	Append "_2" to the OAFIID to avoid conflicting with Evo 1.4.
-	
-	* gui/main.c:
-	* gui/alarm-notify/notify-main.c:
-	Updated with new OAFIID.
-
-2003-11-20  JP Rosevear <jpr@ximian.com>
-
-	* Remove a bunch of gal includes that are no longer needed
-
-2003-11-19  Rodrigo Moya <rodrigo@ximian.com>
-
-	Fixes #43556
-
-	* gui/e-cal-view.c (selection_get, selection_clear_event,
-	selection_received): removed this unneeded functions.
-	(e_calendar_view_init): don't create a GtkInvisible anymore.
-	(e_calendar_view_destroy): no need to destroy the GtkInvisible.
-	(e_cal_view_copy_clipboard, e_cal_view_paste_clipboard):
-	use GtkClipboard.
-
-2003-11-19  JP Rosevear <jpr@ximian.com>
-
-	* gui/e-cal-model-tasks.c (get_due): make sure timezone value is
-	sane
-	(get_completed): ditto
-
-	* gui/e-cal-model.c (get_dtstart): add more guards
-
-	* gui/e-cal-model-calendar.c (get_dtend): ditto
-	
-2003-11-19  Rodrigo Moya <rodrigo@ximian.com>
-
-	Fixes #51052
-
-	* importers/icalendar-importer.c (prepare_events, prepare_tasks):
-	call icalcompiter_next to move the pointer to the next before
-	removing a component avoid breaking the link.
-
-2003-11-18  JP Rosevear <jpr@ximian.com>
-
-	* gui/e-cal-model.c (get_dtstart): make sure the timezone value is
-	sane
-
-	* gui/e-cal-model-calendar.c (get_dtend): ditto
-	
-2003-11-18  JP Rosevear  <jpr@ximian.com>
-
-	* gui/calendar-config.h: add protos
-
-	* gui/calendar-config.c (calendar_config_get_primary_calendar):
-	get the primary calendar
-	(calendar_config_set_primary_calendar): set it
-	(calendar_config_add_notification_primary_calendar): set
-	notifications for it
-	(calendar_config_get_primary_tasks): get the primary task list
-	(calendar_config_set_primary_tasks): set it
-	(calendar_config_add_notification_primary_tasks): set
-	notifications for it
-
-	* gui/calendar-config-keys.h: add primary keys
-
-	* gui/calendar-component.c (find_first_source): find any source
-	(update_uri_for_primary_selection): set the default uri and save
-	the source uid
-	(update_primary_selection): set the primary selection
-	(primary_source_selection_changed_cb): use above
-	(impl_createControls): set the primary selection
-
-	* gui/tasks-component.c: as above
-	
-2003-11-18  JP Rosevear <jpr@ximian.com>
-
-	* gui/Makefile.am: remove db3 include
-
-2003-11-18  Rodrigo Moya <rodrigo@ximian.com>
-
-	* gui/calendar-commands.c
-	(calendar_control_sensitize_calendar_commands,
-	sensitize_taskpad_commands): removed the 'New...' menu items
-	from the UI, it's now implemented in the shell.
-	(file_new_appointment_cb, file_new_event_cb, file_new_meeting_cb,
-	file_new_task_cb): removed.
-
-2003-11-18  Rodrigo Moya <rodrigo@ximian.com>
-
-	* gui/calendar-component.c (add_popup_menu_item): added 'sensitive'
-	argument.
-	(fill_popup_menu_cb): disable/enable menu items depending on whether
-	there is a selection or not.
-
-	* gui/tasks-component.c (add_popup_menu_item, fill_popup_menu_cb):
-	ditto.
-
-2003-11-17  JP Rosevear <jpr@ximian.com>
-
-	* Cleanup some ref/unref calls
-
-2003-11-17  Rodrigo Moya <rodrigo@ximian.com>
-
-	* gui/calendar-component.c (delete_calendar_cb, rename_calendar_cb):
-	* gui/tasks-component.c (delete_task_list_cb, rename_task_list_cb):
-	peek the primary selection.
-
-2003-11-17  Rodrigo Moya <rodrigo@ximian.com>
-
-	* gui/tasks-component.c (fill_popup_menu_cb): added 'Delete' and
-	'Rename' menu items.
-	(delete_task_list_cb, rename_task_list_cb): callbacks for new
-	menu items.
-
-2003-11-17  Rodrigo Moya <rodrigo@ximian.com>
-
-	* gui/calendar-component.c (add_popup_menu_item): try first to
-	create the icon from the stock, and then from a file.
-	(fill_popup_menu_cb): set callback for 'Rename' menu item.
-	(rename_calendar_cb): callback for 'Rename' menu item.
-	(new_calendar_cb): fixed arguments.
-
-	* gui/tasks-component.c (impl_createControls): connect to
-	"fill_popup_menu" signal on the source selector.
-	(fill_popup_menu_cb): callback to create our menu items.
-
-2003-11-17  Rodrigo Moya <rodrigo@ximian.com>
-
-	* idl/evolution-calendar.idl: remove the AlarmNotify service, no
-	more need for it, since the alarm daemon will listen for changes
-	on the GConf key.
-
-	* gui/gnome-cal.c (add_alarms): removed function to talk to the
-	alarm daemon.
-	(client_cal_opened_cb): don't call add_alarms().
-
-	* gui/alarm-notify/alarm-notify.[ch]: made it a basic GObject.
-	(AlarmNotify_addCalendar, AlarmNotify_removeCalendar): removed
-	AlarmNotify interface implementation.
-	(alarm_notify_class_init): no epv to initialize.
-	(alarm_notify_remove_calendar): new function, copied from the
-	CORBA method implementation.
-	(alarm_notify_factory_fn): return NULL, since there is no objects
-	that can be created via this factory now.
-
-	* gui/alarm-notify/notify-main.c (main): now the factory is the alarm
-	notification service itself.
-	(load_calendars): no need to use exceptions here.
-
-	* gui/alarm-notify/GNOME_Evolution_Calendar_AlarmNotify.server.in.in:
-	now the factory is the alarm notification service itself.
-
-	* gui/main.c (launch_alarm_daemon_cb): dont use the AlarmNotify CORBA
-	types.
-
-2003-11-17  Harry Lu  <harry.lu@sun.com>
-
-        * gui/dialogs/recurrence-page.c (make_ending_count_special):
-        Make ending count of occurrences of Recurrence tab numeric only.
-
-2003-11-16  JP Rosevear <jpr@ximian.com>
-
-	* gui/tasks-control.c (tasks_control_set_property): add a uri
-
-	* gui/e-tasks.c: kill e_tasks_open
-
-	* gui/e-tasks.h: remove proto
-
-2003-11-16  JP Rosevear <jpr@ximian.com>
-
-	* gui/e-cal-model.c (e_cal_view_objects_added_cb): emit the added
-	signal for the correct rows
-
-2003-11-16  JP Rosevear <jpr@ximian.com>
-
-	* gui/tasks-component.c (is_in_uids): copy in here
-	(update_uris_for_selection): save the selection
-	(update_selection): update the selection when its changed
-	somewhere else
-	(config_selection_changed_cb): update the selection if the
-	configuration changes
-	(impl_createControls): store the source selector
-
-	* gui/calendar-config.h: add protos
-
-	* gui/calendar-config.c (calendar_config_get_tasks_selected): get
-	the list of task lists selected
-	(calendar_config_set_tasks_selected): save it
-	(calendar_config_add_notification_tasks_selected): get notified
-	about it
-
-2003-11-16  JP Rosevear <jpr@ximian.com>
-
-	* gui/tasks-component.c (add_uri_for_source): add it via e-tasks
-	(remove_uri_for_source): remove it via e-tasks
-	(get_default_task): provide a default for editing
-	(impl_createControls): create the control directly
-	(impl_requestCreateItem): implement
-
-	* gui/gnome-cal.c (gnome_calendar_purge): don't let the two list
-	iterators clobber each other
-
-	* gui/e-tasks.h: add protos
-
-	* gui/e-tasks.c (e_tasks_destroy): free the client list and the
-	hash, disconnect signals
-	(e_tasks_new_task): use the default client
-	(e_tasks_add_todo_uri): add a uri
-	(e_tasks_remove_todo_uri): remove a uri
-	(e_tasks_set_default_uri): set default uri
-	(e_tasks_get_default_client): get default client
-	(e_tasks_delete_completed): expunge from all clients
-	(e_tasks_setup_view_menus): use default client uri
-
-	* gui/e-tasks.c (set_timezone): set the timezone for all clients
-	(e_tasks_init): set up the clients has table
-
-	* gui/e-calendar-table.etspec: yank some useless display columns
-
-	* gui/e-cal-model.c (remove_client): remove objects in reverse
-	order so we don't clobber ourselves
-
-	* gui/calendar-component.c: add FIXME
-
-2003-11-16  JP Rosevear <jpr@ximian.com>
-
-	* gui/calendar-component.c (get_default_event): set up a event to
-	be edited
-	(impl_requestCreateItem): implement
-
-2003-11-14  JP Rosevear <jpr@ximian.com>
-
-	* gui/*.[hc]: include e-source* from e-d-s
-
-2003-11-14  JP Rosevear <jpr@ximian.com>
-
-	* gui/calendar-config.c (calendar_config_get_calendars_selected):
-	config accessor
-	(calendar_config_set_calendars_selected): ditto
-	(calendar_config_add_notification_calendars_selected): config
-	notification
-
-	* gui/calendar-config.h: add protos
-
-	* gui/calendar-config-keys.h: add new key
-
-	* gui/calendar-component.c (is_in_uids): util function
-	(update_uris_for_selection): save the selection in the
-	configuration
-	(update_selection): update the selection from the config info
-	(source_selection_changed_cb): only pass one param
-	(config_selection_changed_cb): listen for config changes
-	(impl_dispose): remove config notification
-	(impl_createControls): use bonobo_exception_set; add a config
-	notification
-
-2003-11-13  Ettore Perazzoli  <ettore@ximian.com>
-
-	* gui/tasks-component.c (impl__get_userCreatableItems): New.
-	(impl_requestCreateItem): New.
-	(tasks_component_class_init): Install.
-
-	* gui/calendar-component.c (impl__get_userCreatableItems): New.
-	(impl_requestCreateItem): New, for now just a stub.
-	(calendar_component_class_init): Install into the EPV.
-
-2003-11-13  Ettore Perazzoli  <ettore@ximian.com>
-
-	* gui/GNOME_Evolution_Calendar.server.in.in: Add a component_alias
-	of "calendar" for the calendar and "tasks" for the tasks.
-
-2003-11-12  Hans Petter Jansson  <hpj@ximian.com>
-
-	* gui/calendar-component.c (add_popup_menu_item): Use non-deprecated
-	gtk_menu_shell_append ().
-
-2003-11-11  Bolian Yin <bolian.yin@sun.com>
-                                                                                
-        Fixes #50808
-                                                                                
-        * gui/goto.c (goto_dialog): set initial selection to current day.
-                                                                                
-2003-11-11  JP Rosevear <jpr@ximian.com>
-
-	* gui/calendar-offline-handler.c (backend_cal_opened_offline): use
-	a standard calendar status
-	(backend_cal_opened_online): ditto
-	
-	* gui/alarm-notify/alarm-queue.c (cal_opened_cb): ditto
-
-	* gui/gnome-cal.c (client_cal_opened_cb): ditto
-
-	* gui/e-tasks.c (cal_opened_cb): ditto
-
-	* gui/e-itip-control.c (default_server_started_cb): ditto
-
-	* gui/e-cal-model.c (cal_opened_cb): ditto
-
-	* gui/comp-editor-factory.c (cal_opened_cb): ditto
-
-2003-11-11  JP Rosevear <jpr@ximian.com>
-
-	* conduits/todo/todo-conduit.c (start_calendar_server): load the
-	calendar synchronously
-
-	* conduits/calendar/calendar-conduit.c (start_calendar_server): ditto
-	
-2003-11-10  JP Rosevear <jpr@ximian.com>
-
-	* importers/icalendar-importer.c (update_single_object): return
-	boolean not ECalStatus
-	(update_objects): ditto
-	(process_item_fn): handle above returns
-
-2003-11-10  JP Rosevear <jpr@ximian.com>
-
-	* gui/e-cal-model-tasks.c (get_due_status): just check the boolean
-
-2003-11-10  JP Rosevear <jpr@ximian.com>
-
-	* conduits/calendar/calendar-conduit.c
-	(e_calendar_context_destroy): use proper change list free function
-	name
-	(post_sync): ditto
-
-	* conduits/todo/todo-conduit.c: same
-	
-2003-11-10  Dan Winship  <danw@ximian.com>
-
-	* gui/e-tasks.c (e_tasks_delete_completed): Remove get-vtype check
-	from the completed-tasks query (and don't leak the sexp string).
-
-	* gui/e-cal-model.c (update_e_cal_view_for_client): Don't adjust
-	the sexp to use get-vtype.
-
-	* gui/gnome-cal.c (adjust_e_cal_view_sexp, gnome_calendar_purge):
-	Remove get-vtype check from queries
-
-2003-11-07  JP Rosevear <jpr@ximian.com>
-
-	* gui/Makefile.am: remove includes for toplevel libical dir
-
-	* gui/dialogs/Makefile.am: ditto
-
-	* importers/Makefile.am: ditto
-
-2003-11-07  JP Rosevear <jpr@ximian.com>
-
-	* In the gui this is a search and replace commit for moving the
-	calendar to evolution-data-server; it also deletes the old backend
-	files; e-cal-view was rename to e-calendar-view to remove name
-	conflict
-	
-2003-11-05  JP Rosevear <jpr@ximian.com>
-
-	* gui/migration.c: fix typo
-
-2003-11-05  Larry Ewing  <lewing@ximian.com>
-
-	* gui/migration.c (process_old_dir): add a unimplemented warning
-	so we at least avoid relocation errors.
-
-2003-11-04  Rodrigo Moya <rodrigo@ximian.com>
-
-	* gui/calendar-component.c (fill_popup_menu_callback): added more
-	menu items.
-	(delete_calendar_cb): callbacks for new popup menu items.
-	(impl_createControls): add the source selector widget to the
-	CalendarComponentPrivate structure.
-
-	* gui/migration.[ch] (migrate_old_tasks): new function to migrate
-	old tasks setups.
-	(process_old_dir): renamed and added a "filename" argument, so that
-	the same function can be used for tasks and calendar directories.
-	(migrate_old_calendars): added new argument when calling
-	process_old_dir().
-
-	* gui/tasks-component.c (tasks_component_init): call
-	migrate_old_tasks() if there are no groups defined.
-
-2003-11-04  Bolian Yin <bolian.yin@sun.com>
-
-	* gui/e-cal-view.c: add new signal "selected_time_changed" 
-	* gui/e-day-view-main-item.c (e_day_view_main_item_class_init):
-	a11y initialization
-	* gui/e-day-view-top-item (e_day_view_top_item_get_day_label):
-	new public function.
-	* gui/e-day-view.c (e_day_view_ensure_rows_visible,
-	e_day_view_update_calendar_selection_time): make static functions public
-	(e_day_view_cursor_key_up, e_day_view_cursor_key_down,
-	e_day_view_cursor_key_left, e_day_view_cursor_key_right): emit
-	"selected_time_changed".
-
-2003-11-03  Ettore Perazzoli  <ettore@ximian.com>
-
-	* gui/e-meeting-model.c (SELECT_NAMES_OAFID): Append "_2".
-	* gui/e-select-names-editable.c (SELECT_NAMES_OAFIID): Likewise.
-	* gui/e-meeting-list-view.c (SELECT_NAMES_OAFID): Likewise.
-	* gui/dialogs/alarm-options.c (SELECT_NAMES_OAFID): Likewise.
-	* gui/dialogs/e-delegate-dialog.c (SELECT_NAMES_OAFID): Likewise
-
-2003-11-03  Ettore Perazzoli  <ettore@ximian.com>
-
-	* gui/GNOME_Evolution_Calendar.server.in.in: use
-	"evolution2:config_item" properties instead of
-	"evolution:config_item" ones.
-
-2003-11-03  Harry Lu  <harry.lu@sun.com>
-
-	Fix for #50387.
-
-	* importers/icalendar-importer.c (support_format_fn):
-	Call icalcomponent_is_valid() to check whether the returned
-	icalcomponent is valid.
-
-2003-10-31  Hans Petter Jansson  <hpj@ximian.com>
-
-	* gui/calendar-component.c (calendar_component_init): Add the webcal
-	source group.
-
-	* gui/dialogs/new-calendar.c (print_uri_noproto): Implement.
-	(group_is_remote): Implement.
-	(create_new_source_with_group): Implement webcal case.
-	(new_calendar_dialog): Get optional location from dialog.
-
-	* gui/dialogs/new-calendar.glade: Add location entry.
-
-	* pcs/Makefile.am: Build http backend.
-
-	* pcs/cal-backend-http.[ch]: Add skeleton based on cal-backend-file.
-
-2003-10-31  Dan Winship  <danw@ximian.com>
-
-	* cal-util/cal-util.h: Add CAL_STATIC_CAPABILITY_NO_THISANDFUTURE
-	and CAL_STATIC_CAPABILITY_NO_THISANDPRIOR
-
-	* gui/dialogs/recur-comp.c (recur_component_dialog): Add a
-	CalClient argument. Use cal_client_get_static_capability to decide
-	whether or not to offer THISANDFUTURE and THISANDPRIOR options
-
-	* gui/dialogs/comp-editor.c (prompt_to_save_changes, save_cmd,
-	save_close_cmd): Pass a CalClient to recur_component_dialog.
-
-	* gui/e-day-view.c (e_day_view_finish_long_event_resize,
-	e_day_view_finish_resize, e_day_view_on_editing_stopped,
-	e_day_view_on_top_canvas_drag_data_received,
-	e_day_view_on_main_canvas_drag_data_received): Likewise
-
-	* gui/e-week-view.c (e_week_view_on_editing_stopped): Likewise
-
-	* gui/calendar-component.c (impl_createControls): set an exception
-	if we fail, so evo won't crash.
-
-2003-10-31  Rodrigo Moya <rodrigo@ximian.com>
-
-	* gui/e-calendar-table.c (e_calendar_table_show_popup_menu): fixed
-	mismatched condition in if/else statement.
-
-2003-10-30  Rodrigo Moya <rodrigo@ximian.com>
-
-	* gui/e-tasks.[ch] (e_tasks_get_cal_client): removed.
-
-	* gui/tasks-control.c (sensitize_commands): fixed to work correctly
-	with the ECalView's model.
-	(tasks_control_set_property): don't use e_tasks_get_cal_client.
-
-	* gui/alarm-notify/alarm-notify.c (free_client_hash): new function
-	to remove items from the CalClient's hash table.
-	(alarm_notify_finalize): call free_client_hash() for each item
-	in the hash table.
-
-2003-10-30  Rodrigo Moya <rodrigo@ximian.com>
-
-	* gui/alarm-notify/notify-main.c (client_die_cb): use
-	bonobo_main_quit, not gtk_main_quit.
-
-	* gui/alarm-notify/alarm-queue.c (free_client_alarms_cb): callback
-	for freeing ClientAlarms stored in the hash table.
-	(alarm_queue_done): call free_client_alarms_cb() for each opened
-	client.
-
-2003-10-30  Rodrigo Moya <rodrigo@ximian.com>
-
-	* pcs/cal-backend-file.c (mark_dirty, save_idle): removed, since
-	we dont save the file anymore in idle callbacks.
-	(cal_backend_file_dispose): removed all traces of the idle saving.
-	(check_dup_uid, create_cal, cal_backend_file_add_timezone,
-	cal_backend_file_create_object, cal_backend_file_modify_object,
-	cal_backend_file_remove_object, cal_backend_file_receive_objects):
-	call save() directly instead of mark_dirty().
-
-2003-10-30  Rodrigo Moya <rodrigo@ximian.com>
-
-	* pcs/cal-backend-file.c (cal_backend_file_modify_object):
-	implemented THIS and ALL recurrences cases, blowing away or detaching
-	recurrences from the main component as required.
-	(get_rid_string): make it return const.
-	(get_rid_timetype): new convenience function for getting
-	libical's recurrence ID from a CalComponent.
-	(cal_backend_file_is_read_only, remove_recurrence_cb,
-	remove_component): fixed warnings.
-	(remove_object_instance_cb): callback to remove the instances
-	from the hash on the THISANDPRIOR and THISANDFUTURE cases.
-	(cal_backend_file_remove_object): replaced mismatched if/else
-	statement with proper management of each of the recurrence cases.
-
-2003-10-29  JP Rosevear <jpr@ximian.com>
-
-	* gui/Makefile.am: build new files
-
-	* gui/dialogs/comp-editor-util.c (date_edit_destroy_cb): unref the
-	config manager
-	(comp_editor_new_date_edit): set up a config manager for the date
-	editor
-
-	* gui/e-date-edit-config.[hc]: config manager for e-date-edit
-
-2003-10-29  JP Rosevear <jpr@ximian.com>
-
-	* gui/dialogs/cal-prefs-dialog.c (update_config): no need to
-	update config settings everywhere explicitly
-
-	* gui/tasks-component.c (update_uris_for_selection): cast the
-	widget
-
-	* gui/gnome-cal.h: remove proto
-
-	* gui/gnome-cal.c (setup_widgets): don't update config settings
-	explicitly
-	(gnome_calendar_update_config_settings): kill
-
-	* gui/e-week-view.c: remove null chars
-
-	* gui/e-tasks.h: remove proto
-
-	* gui/e-tasks.c (set_timezone): set the timezone on the client
-	(timezone_changed_cb): changed timezone callback
-	(setup_config): setup config stuff
-	(e_tasks_init): setup config and widgets here
-	(e_tasks_new): construct is dead, no need to track all widgets
-	(cal_opened_cb): set the timezone upon opening
-	(e_tasks_update_all_config_settings): kill
-
-	* gui/control-factory.c (control_factory_new_control): create the
-	calendar ourselves
-
-	* gui/calendar-config.c (on_timezone_set): don't update the
-	settings everywhere here, we have config managers now
-
-	* gui/calendar-component.c (impl_createControls): create the
-	calendar ourselves
-
-	* gui/calendar-commands.h: remove protos
-
-	* gui/calendar-commands.c: remove dead functions
-
-2003-10-29  JP Rosevear <jpr@ximian.com>
-
-	* gui/e-day-view-config.c (set_twentyfour_hour): set the format on
-	the cal view
-
-	* gui/e-week-view-config.c (set_twentyfour_hour): ditto
-	
-	* gui/e-cal-list-view-config.c (set_twentyfour_hour): set the 24
-	hour format on the view
-	(twentyfour_hour_changed_cb): 24 hour format change callback
-	(e_cal_list_view_config_set_view): handle 24 hour format changes
-
-2003-10-29  JP Rosevear <jpr@ximian.com>
-
-	* gui/dialogs/recurrence-page.c (recurrence_page_finalize): unref
-	config manager
-	(init_widgets): create config manager for the e-calendar
-
-	* gui/e-tasks.c (setup_widgets): create config manager for the
-	table view
-	(e_tasks_destroy): unref config manager
-	(e_tasks_open): return FALSE not NULL
-	(e_tasks_update_all_config_settings): don't configure the calendar
-	table here, we have a manager
-
-	* gui/calendar-config.c: remove dead config functions (handled by
-	config managers now)
-
-2003-10-29  JP Rosevear <jpr@ximian.com>
-
-	* gui/gnome-cal.c (set_timezone): set the timezone for all clients
-	(timezone_changed_cb): callback for changes
-	(setup_config): setup the configuration
-	(setup_widgets): setup up configuration managers for the list
-	view, task list and date navigator
-	(gnome_calendar_init): setup config
-	(gnome_calendar_destroy): destroy configuration managers and
-	notifications
-	(gnome_calendar_update_config_settings): remove dead bits
-
-	* gui/e-mini-calendar-config.[hc]: manage configuration of an
-	e-calendar
-
-	* gui/e-day-view-config.h: remove extraneous comment, type the
-	parent class correctly
-
-	* gui/e-week-view-config.h: ditto
-	
-	* gui/e-day-view-config.c (e_day_view_config_class_init): type the
-	class correctly
-	(set_timezone): set timezone
-	(timezone_changed_cb): timezone changed callback
-	(e_day_view_config_set_view): track timezone changes
-
-	* gui/e-week-view-config.c: ditto
-	
-	* gui/e-cell-date-edit-config.[hc]: manage configuration of a date
-	edit cell
-
-	* gui/e-calendar-table-config.[hc]: manage configuration of a
-	e-calendar-table
-
-	* gui/e-cal-list-view.c (get_current_time_cb): use the view
-	timezone to compute
-
-	* gui/e-cal-list-view-config.[hc]: manage configuration of a
-	list view
-
-	* gui/calendar-config.h: update protos
-
-	* gui/calendar-config.c
-	(calendar_config_add_notification_timezone): notify of timezone
-	change
-	(calendar_config_add_notification_dnav_show_week_no): notify of
-	show week number setting change
-
-	* gui/calendar-component.c (calendar_component_peek): remove bad
-	comma
-
-	* gui/Makefile.am: build new config classes
-
-2003-10-29  Rodrigo Moya <rodrigo@ximian.com>
-
-	* gui/calendar-component.c (fill_popup_menu_callback): fixed
-	typo in menu item label.
-
-	* gui/e-cal-model.[ch] (e_cal_model_get_use_24_hour_format): new
-	function.
-
-	* gui/e-cal-view.[ch]: no need to keep the 'use_24_hour' setting,
-	it's already in the model.
-	(e_cal_view_get_use_24_hour_format,
-	e_cal_view_set_use_24_hour_format): new functions.
-
-	* gui/e-day-view.[ch] (e_day_view_get_24_hour_format,
-	(e_day_view_set_24_hour_format): removed.
-	(e_day_view_convert_time_to_display, e_day_view_update_event_label,
-	e_day_view_get_time_string_width): use the ECalView's function to
-	get the 24 hour format.
-
-	* gui/e-week-view.[ch] (e_week_view_get_24_hour_format,
-	e_week_view_set_24_hour_format): removed.
-	(e_week_view_convert_time_to_display,
-	e_week_view_get_time_string_width): use the ECalView's function
-	to get the 24 hour format.
-
-	* gui/e-day-view-top-item.c (e_day_view_top_item_draw_long_event):
-	* gui/e-day-view-time-item.c (e_day_view_time_item_draw):
-	* gui/e-week-view-event-item.c (e_week_view_draw_time):
-	don't use the view's use_24_hour_format, but the ECalView method.
-
-2003-10-28  Rodrigo Moya <rodrigo@ximian.com>
-
-	* gui/calendar-component.c (impl_createControls): connect to
-	"fill_popup_menu" on the ESourceSelector.
-	(fill_popup_menu_callback): add popup menu items here.
-	(add_popup_menu_item): new function to add items to the
-	popup menu.
-	(new_calendar_cb): callbacks for the popup menu items.
-
-2003-10-28  Rodrigo Moya <rodrigo@ximian.com>
-
-	* gui/e-cal-view.c: no need to keep the timezone here, it is
-	already stored in the model.
-	(e_cal_view_get_timezone): call e_cal_model_get_timezone().
-	(e_cal_view_set_timezone): call e_cal_model_set_timezone().
-	(e_cal_view_new_appointment_for): use the model's timezone.
-
-2003-10-27  Dan Winship  <danw@ximian.com>
-
-	* pcs/cal-backend.c (cal_backend_notify_object_created,
-	cal_backend_notify_object_modified,
-	cal_backend_notify_object_removed): New; tell each query about a
-	created/modified/removed object.
-
-	* pcs/cal.c (cal_notify_object_created): Use
-	cal_backend_notify_object_created.
-	(cal_notify_object_modified, cal_notify_object_removed): Likewise
-	for modified/removed
-	(cal_notify_objects_received): we need both the before and after
-	forms for the modified objects so they can be resolved as
-	adds/modifies/removes per-query. But the caller can just call the
-	cal_backend_* routines for each object anyway, so just remove the
-	created/modified/removed lists.
-
-	* pcs/cal-backend-sync.c (cal_backend_sync_receive_objects):
-	Remove created/modified/removed list arguments.
-	(_cal_backend_receive_objects): Likewise.
-
-	* pcs/cal-backend-file.c (cal_backend_file_receive_objects):
-	Remove created/modified/removed list arguments. Replace the one
-	use of *removed with a call to cal_backend_notify_object_removed.
-
-2003-10-27  JP Rosevear <jpr@ximian.com>
-
-	* gui/gnome-cal.c (setup_widgets): store config objects as well
-	(gnome_calendar_set_default_uri): return FALSE if the
-	pre-condition fails
-	(gnome_calendar_update_config_settings): remove settings that are
-	now handled by the config objects
-
-	* gui/e-week-view.c (e_week_view_set_compress_weekend): queue a
-	draw
-
-	* gui/e-itip-control.c (start_default_server): comment out
-
-	* gui/e-day-view-config.[hc]: a class to track config changes of
-	interest to day views
-
-	* gui/e-week-view.[hc]: ditto for week views
-	
-	* gui/calendar-config.h: add protos
-
-	* gui/calendar-config.c: use the #defines for the keys and add
-	notification routines
-
-	* gui/calendar-config-keys.h: a list of defines for gconf keys
-
-	* gui/Makefile.am: build new files
-
-2003-10-27  Rodrigo Moya <rodrigo@ximian.com>
-
-	* gui/e-cal-model.h: changed fill_component_from_model virtual
-	method to get an ETableModel, not an ECalModel.
-
-	* gui/e-cal-model.c (ecm_append_row): the source model sent from
-	ETable is an ETableModel, not an ECalModel.
-
-	* gui/e-cal-model-calendar.c (ecmc_fill_component_from_model):
-	get an ETableModel for the 'source_model' argument.
-
-	* gui/e-cal-model-tasks.c (ecmt_fill_component_from_model): ditto.
-
-2003-10-27  Rodrigo Moya <rodrigo@ximian.com>
-
-	* gui/tasks-component.c (add_uri_for_source): pass FALSE as the
-	'only_if_exists' parameter, so that the calendar gets created when
-	it still does not exist.
-
-2003-10-24  Rodrigo Moya <rodrigo@ximian.com>
-
-	* gui/tasks-component.c (tasks_component_init): initialize private
-	structure on TasksComponent.
-
-2003-10-24  Rodrigo Moya <rodrigo@ximian.com>
-
-	* gui/calendar-component.c (calendar_component_class_init): removed
-	repeated initialization.
-	(calendar_component_peek): use G_STRLOC for g_warning's.
-
-	* gui/tsaks-control.[ch] (tasks_control_activate,
-	tasks_control_deactivate): made these 2 functions public.
-
-	* gui/tasks-component.[ch]: implementation of the tasks component.
-
-	* gui/Makefile.am:
-	* gui/GNOME_Evolution_Calendar.server.in.in: added tasks component.
-
-	* gui/main.c: ditto.
-	(factory): added code to create the tasks component when requested.
-
-2003-10-24  Dan Winship  <danw@ximian.com>
-
-	* cal-client/cal-client.c (cal_client_get_changes): Remove type arg
-
-	* conduits/calendar/calendar-conduit.c (pre_sync, post_sync):
-	Update for that
-
-	* conduits/todo/todo-conduit.c (pre_sync, post_sync): Likewise
-
-	* idl/evolution-calendar.idl (getChanges): Remove type arg.
-
-	* pcs/cal.c (impl_Cal_getChanges): Likewise
-
-	* pcs/cal-backend.c (cal_backend_get_changes): Likewise
-
-	* pcs/cal-backend-sync.c (cal_backend_sync_get_changes): Likewise
-
-	* pcs/cal-backend-file.c (cal_backend_file_get_changes): Update
-	for that
-
-	* pcs/Makefile.am: build libpcs.la and libpcsfile.la instead of
-	just .a.
-	(libpcs_la_LIBADD): depend on libcal-util.la and libeutil.la
-	(libpcsfile_la_LIBADD): depend on libpcs.la
-
-2003-10-24  Rodrigo Moya <rodrigo@ximian.com>
-
-	* cal-util/cal-util.[ch] (cal_util_construct_instance,
-	cal_util_remove_instances): new functions for individual
-	instances management.
-
-	* pcs/cal-backend-file.c (cal_backend_file_get_object): if we
-	dont have a recurrence in our hash table, generate one for the
-	specified recurrence ID.
-	(match_recurrence_sexp): new function to match recurrences on
-	regular expresessions.
-	(match_object_sexp): call match_recurrence_sexp() for all recurrences.
-	(cal_backend_file_modify_object): handle mod_types.
-	(cal_backend_file_remove_object): handle mod_types.
-
-2003-10-24  JP Rosevear <jpr@ximian.com>
-
-	* gui/gnome-cal.h: update protos
-
-	* gui/gnome-cal.c (gnome_calendar_set_default_uri): set the
-	default client based on uri
-
-	* gui/calendar-component.c (add_uri_for_source): rename from
-	load_uri_for_source and take a calendar
-	(remove_uri_for_source): utility routine to remove the source's
-	uri from the calendar
-	(is_in_selection): checks to see if the uid of the given source
-	matches any of those in the given selection
-	(update_uris_for_selection): remove any uris no longer in the
-	selection, add those that still exist
-	(source_selection_changed_callback): call above
-	(primary_source_selection_changed_callback): we have the calendar
-	easily now; set the default by uri
-	(control_activate_cb): handle activation and de-activation
-	(impl_createControls): create the calendar control ourselves so we
-	have access to the calendar
-	(impl_dispose): release the source selection
-
-2003-10-23  Rodrigo Moya <rodrigo@ximian.com>
-
-	* pcs/cal-backend-file.c (add_component): if the component received
-	is an instance, add it to the recurrences hash table.
-	(free_recurrence): callback for g_hash_table_foreach() to free
-	the recurrences in the CalBackendFileObject structure.
-	(free_object): call free_recurrence for each recurrence.
-	(remove_recurrence_cb): g_hash_table_foreach() callback to
-	remove recurrences from the calendar.
-	(remove_component): remove all recurrences.
-	(cal_backend_file_open): check write access on the file, and
-	set read_only flag appropriately.
-	(cal_backend_file_is_read_only): return the private flag.
-	(cal_backend_file_init): initialize read_only flag.
-	(cal_backend_file_get_object): deal with recurrences.
-
-	* gui/alarm-notify/notify-main.c (main): unref the alarm
-	notification service when terminating.
-	(client_die_cb): call bonobo_main_quit instead of gtk_main_quit.
-
-2003-10-23    <jpr@ximian.com>
-
-	* gui/gnome-cal.c (gnome_calendar_get_current_view_widget): just
-	uses the views array and the current view type
-	(setup_widgets): ditto
-	(set_view): ditto
-	(backend_died_cb): ditto
-	(gnome_calendar_get_calendar_model): ditto
-	(gnome_calendar_update_config_settings): ditto
-
-2003-10-23  Rodrigo Moya <rodrigo@ximian.com>
-
-	* gui/e-day-view.c: accept also text/calendar for D&D.
-
-2003-10-23  JP Rosevear <jpr@ximian.com>
-
-	* gui/e-day-view.c (e_day_view_on_top_canvas_drag_data_received):
-	fix typo
-	(e_day_view_on_main_canvas_drag_data_received): fix C99 issue, fix
-	typo
-
-2003-10-23  JP Rosevear <jpr@ximian.com>
-
-	* gui/gnome-cal.c (update_query): use the internal client list to
-	create the queries
-	(gnome_calendar_destroy): use the internal client list to
-	disconnect signal handlers
-	(gnome_calendar_add_event_uri): add the client to the internal
-	list
-	(gnome_calendar_remove_event_uri): remove the client from the
-	internal list and lookup the client
-	(gnome_calendar_update_config_settings): use the internal client
-	list to update the config settings
-
-2003-10-23  Harry Lu  <harry.lu@sun.com>
-
-	* cal-client/cal-client.c: (cal_client_get_timezone): remove and free
-	op before return.
-
-	* gui/e-cal-view.c (e_cal_view_add_event): modified from
-	selection_received_add_event() so that it call be called out of
-	e-cal-view.c.
-	(selection_received): modified to call e_cal_view_add_event().
-
-	* gui/e-cal-view.h: add declaration for e_cal_view_add_event().
-
-	* gui/e-day-view.c (e_day_view_on_drag_data_get): Provide a
-	icalcomponent for both TARGET_CALENDAR_EVENT and TARGET_VCALENDAR.
-	(e_day_view_on_top_canvas_drag_data_received): If dragging between
-	different windows, make it works like a copy and paste.
-	(e_day_view_on_main_canvas_drag_data_received): ditto.
-
-2003-10-23  JP Rosevear <jpr@ximian.com>
-
-	* cal-util/cal-recur.c: update g_date calls to non-deprecated
-	calls
-
-	* cal-util/Makefile.am: turn off deprecated funcs
-
-	* cal-client/Makefile.am: turn off deprecated funcs
-
-	* cal-client/cal-client.c (cal_client_get_error_message): add OK
-	message
-
-	* pcs/cal-backend.[hc]: remove dead funcs
-
-	* pcs/query.c: tidy headers
-
-2003-10-23  JP Rosevear <jpr@ximian.com>
-
-	* pcs/query.c (query_notify_objects_removed_1): Fix c/p typo -
-	call removed instead of modify
-
-2003-10-23  Rodrigo Moya <rodrigo@ximian.com>
-
-	* gui/e-cal-view.c (e_cal_view_init): connect also to ETableModel's
-	"model_cell_changed" signal.
-	(e_cal_view_set_model): likewise.
-	(model_cell_changed_cb): callback for "model_cell_changed".
-	(e_cal_view_destroy): use g_signal_handlers_disconnect_matched instead
-	of g_signal_handlers_disconnect_by_func, so that all handlers are
-	disconnected.
-
-2003-10-23  JP Rosevear <jpr@ximian.com>
- 
- 	* pcs/cal.c (cal_notify_object_modified): guard against irrelevant
- 	args (ie if there was an error) 
- 	(cal_notify_object_removed): ditto
- 	(cal_notify_timezone_added): ditto
- 
- 	* pcs/cal-backend-sync.c (_cal_backend_is_read_only): init value
- 	to something known
- 	(_cal_backend_get_cal_address): ditto
- 	(_cal_backend_get_alarm_email_address): ditto
- 	(_cal_backend_get_ldap_attribute): ditto
- 	(_cal_backend_get_static_capabilities): ditto
- 	(_cal_backend_modify_object): ditto
- 	(_cal_backend_remove_object): ditto
- 	(_cal_backend_get_object_list): ditto
- 
-2003-10-22  JP Rosevear <jpr@ximian.com>
- 
- 	* gui/e-cal-list-view.c (e_cal_list_view_new): create a model and
- 	pass it as an arg during creation
- 
- 	* gui/e-day-view.c (e_day_view_new): unref the model
- 
- 	* gui/e-week-view.c (e_week_view_new): ditto
-	
-2003-10-22  JP Rosevear <jpr@ximian.com>
- 
- 	* cal-client/cal-client.c (cal_client_get_object): only change to
- 	invalid object error code if we got the object but couldn't parse
- 	it, and only check for timezones if we had success
- 
- 	* gui/comp-util.c (cal_comp_is_on_server): don't throw a warning
- 	if the object simply does not exist
-	
-2003-10-22  Rodrigo Moya <rodrigo@ximian.com>
-
-	* gui/gnome-cal.[ch] (gnome_calendar_remove_event_uri): new
-	function to remove calendars from the views.
-
-2003-10-22  Ettore Perazzoli  <ettore@ximian.com>
-
-	* gui/GNOME_Evolution_Calendar.server.in.in: Add an
-	"evolution:button_icon" attribute.
-
-2003-10-22  Ettore Perazzoli  <ettore@ximian.com>
-
-	* gui/GNOME_Evolution_Calendar.server.in.in: Add an
-	"evoution:button_sort_order" attribute.
-
-2003-10-22  Ettore Perazzoli  <ettore@ximian.com>
-
-	* gui/calendar-component.c (impl_createControls): Make the
-	scrolled window have a GTK_SHADOW_IN shadow.
-	* gui/dialogs/meeting-page.c (meeting_page_construct): Likewise.
-
-2003-10-22  Ettore Perazzoli  <ettore@ximian.com>
-
-	* gui/calendar-component.c (impl_createControls): Set the
-	scrollbar policy to "automatic" for both the horizontal and
-	vertical scrollbars around the source selector.
-
-2003-10-22  Ettore Perazzoli  <ettore@ximian.com>
-
-	* gui/GNOME_Evolution_Calendar.server.in.in: Add an
-	"evolution:button_label" property on the component for use in the
-	shell.
-
-2003-10-21  Rodney Dawes  <dobey@ximian.com>
-
-	* cal-client/Makefile.am: Fix typo in libcal_client_la_SOURCES
-	
-2003-10-21  Rodrigo Moya <rodrigo@ximian.com>
-
-	* gui/calendar-component.c (calendar_component_init): fixed
-	a leak caused by only freeing 'base_uri' in some cases.
-
-2003-10-21  JP Rosevear <jpr@ximian.com>
-
-	* gui/control-factory.c (get_prop): fix parse error
-	(set_prop): gnome_calendar_open was renamed
-
-	* conduits/todo/todo-conduit.c (start_calendar_server): adapt to
-	the cal_client_new changes and the lack of a default calendar
-	routine
-	(pre_sync): don't have to pass a type for the default object any
-	more
-
-	* conduits/calendar/calendar-conduit.c (start_calendar_server):
-	adapt to the cal_client_new changes and the lack of a default
-	calendar routine
-	(pre_sync): don't have to pass a type for the default object any
-	more
-
-	* cal-client/cal-client.c (cal_client_open_async): add FIXME
-	comment
-
-2003-10-21  Rodrigo Moya <rodrigo@ximian.com>
-
-	* pcs/cal-backend-file.c: store recurrences per object.
-	(free_object): free correctly the CalBackendFileObject's
-	contained in 'priv->comp_uid_hash'.
-	(lookup_component, check_dup_uid, add_component, remove_component,
-	match_object_sexp):
-	adapted to changes in comp_uid_hash.
-	
-2003-10-20  Rodrigo Moya <rodrigo@ximian.com>
-
-	* gui/gnome-cal.[ch] (gnome_calendar_add_event_uri): renamed
-	from gnome_calendar_open.
-
-	* gui/calendar-component.c (load_uri_for_source): call
-	gnome_calendar_add_event_uri instead of setting the URI property on
-	the Bonobo control.
-
-2003-10-17  Rodrigo Moya <rodrigo@ximian.com>
-
-	* gui/migration.c (process_calendar_dir): process subfolders.
-
-2003-10-17  Rodrigo Moya <rodrigo@ximian.com>
-
-	* gui/migration.[ch] (migrate_old_calendars): new function.
-
-	* gui/calendar-component.c (calendar_component_init): call
-	the above function to migrate from old setups.
-
-	* gui/Makefile.am: added new files.
-
-2003-10-17  Jeffrey Stedfast <fejj@ximian.com>
-	
-	* conduits/calendar/Makefile.am: Fixed for libical build changes.
-
-	* conduits/todo/Makefile.am: Same.
-
-2003-10-17  Rodrigo Moya <rodrigo@ximian.com>
-
-	* gui/e-cal-view.c (on_print): call
-	e_cal_view_get_visible_time_range, not the gnome_calendar_
-	version.
-	(e_cal_view_new_appointment_for, e_cal_view_new_appointment,
-	e_cal_view_edit_appointment): new functions.
-
-	* gui/gnome-cal.[ch] (gnome_calendar_new_appointment_for,
-	gnome_calendar_new_appointment, gnome_calendar_edit_object):
-	removed these functions, now available in e-cal-view.
-
-	* gui/calendar-commands.c:
-	* gui/e-day-view.c:
-	* gui/e-week-view-event-item.c:
-	* gui/e-week-view.c: replaced calls to gnome_calendar_* with
-	e_cal_view_* equivalents.
-
-2003-10-17  Rodrigo Moya <rodrigo@ximian.com>
-
-	* gui/e-cal-view.[ch] (e_cal_view_get_default_category):
-	(e_cal_view_set_default_category): new functions.
-	(e_cal_view_destroy): free the default_category field.
-
-	* gui/e-day-view.[ch] (e_day_view_set_default_category):
-	removed obsolete function.
-	(e_day_view_init, e_day_view_destroy, e_day_view_do_key_press):
-	use the ECalView's default_category.
-
-	* gui/e-week-view.[ch] (e_week_view_set_default_category):
-	removed obsolete function.
-	(e_week_view_init, e_week_view_destroy, e_week_view_do_key_press):
-	use the ECalView's default_category.
-
-	* gui/gnome-cal.c (gnome_calendar_set_query): set the query
-	also on the list view by using the priv->views array.
-	(search_bar_category_changed_cb, gnome_calendar_set_default_client):
-	use the priv->views array.
-	(gnome_calendar_get_calendar_model): return the model for the
-	current view widget.
-	(gnome_calendar_open): removed tasks opening code.
-
-2003-10-16  Rodrigo Moya <rodrigo@ximian.com>
-
-	* gui/dialogs/new-calendar.c (new_calendar_dialog): if the user
-	presses Cancel, just terminate.
-
-2003-10-16  Rodrigo Moya <rodrigo@ximian.com>
-
-	* gui/calendar-component.c (calendar_component_init): create
-	directories for the newly-created calendars.
-
-	* gui/dialogs/new-calendar.c (create_new_source_with_group): use
-	e_mkdir_hier instead of mkdir.
-
-2003-10-16  Rodrigo Moya <rodrigo@ximian.com>
-
-	* gui/calendar-component.c (calendar_component_init): if no groups
-	are present in the configuration, create the "On This Computer"
-	group and the "Personal" and "Work" calendars on it.
-
-	* gui/dialogs/new-calendar.c (new_calendar_dialog): moved the
-	source creation...
-	(create_new_source_with_group): ...here, and made the code create
-	the directory for the new calendar.
-
-2003-10-15  Hans Petter Jansson  <hpj@ximian.com>
-
-	* gui/e-select-names-editable.c (e_selct_names_editable_get_address):
-	EDestination -> EABDestination.
-
-	* gui/gnome-cal.c (setup_widgets): evolution_dir -> ".evolution".
-
-2003-10-15  Rodrigo Moya <rodrigo@ximian.com>
-
-	* gui/e-select-names-editable.c (e_select_names_editable_get_address):
-	use EABDestination instead of EDestination.
-
-	* gui/gnome-cal.c (gnome_calendar_open): disabled tasks opening code.
-
-2003-10-15  Rodrigo Moya <rodrigo@ximian.com>
-
-	* gui/e-meeting-list-view.c: adapted to new addressbook API.
-
-	* gui/e-meeting-store.c: adapted to new addressbook API.
-	(find_zone): fixed usage of icalcomponent where an icalproperty
-	is expected.
-	(refresh_busy_periods): fixed call to cal_client_get_free_busy().
-
-	* gui/e-meeting-time-sel.c (e_meeting_time_selector_construct):
-	added missing variable.
-	
-2003-10-15  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* gui/dialogs/meeting-page.c: #include <gal/e-table/e-table.h>
-
-2003-10-15  Rodrigo Moya <rodrigo@ximian.com>
-
-	* gui/e-meeting-list-view.c (start_addressbook_server):
-	updated to new addressbook API.
-	(book_open_cb): removed unneeded function, since we load
-	the local addressbook synchronously.
-
-2003-10-15  Rodrigo Moya <rodrigo@ximian.com>
-
-	* pcs/Makefile.am: added missing header directories.
-
-	* pcs/cal-factory.h: include <libical/ical.h>, not <ical.h>.
-
-	* gui/dialogs/meeting-page.c: added missing headers.
-	(meeting_page_construct): free 'backend_address' as returned
-	by cal_client_get_cal_address(). Removed code to create the
-	meeting model's ETable not removed with the merge.
-
-	* gui/e-meeting-list-view.c: updated addressbook headers.
-
-	* gui/gnome-cal.h: added missing ',' in the GnomeCalendarViewType
-	enum.
-	
-2003-10-14  Rodrigo Moya <rodrigo@ximian.com>
-
-	* gui/e-day-view.c (e_day_view_update_query): dont set status
-	messages here, already set in e_cal_view_update_query.
-	(update_query): removed this function.
-	(e_day_view_recalc_day_starts): call e_day_view_update_query,
-	not update_query.
-
-	* gui/e-week-view.c (e_week_view_update_query): dont set status
-	messages here, already set in e_cal_view_update_query.
-
-	* gui/gnome-cal.c (adjust_query_for_view): new function to adjust
-	the query for the visible time range on a given view.
-	(gnome_calendar_set_query): call adjust_query_for_view for each
-	one of the views.
-
-2003-10-14  Rodrigo Moya <rodrigo@ximian.com>
-
-	* gui/e-cal-view.c (e_cal_view_init): connect to signals on the
-	model we create here, so that we get notifications for changes.
-
-	* gui/gnome-cal.c (gnome_calendar_set_query): set the query
-	on all models.
-	(gnome_calendar_open): update the date navigator query.
-
-2003-10-14  Rodrigo Moya <rodrigo@ximian.com>
-
-	* pcs/cal.c (cal_notify_timezone_requested): never send NULL
-	strings to ORBit.
-
-	* gui/e-cal-view.c (e_cal_view_create_popup_menu): removed
-	unneeded variables. Also, fixed a typo that was making the
-	menu options be disabled when they should be enabled.
-
-2003-10-13  Rodrigo Moya <rodrigo@ximian.com>
-
-	* gui/e-cal-model.[ch] (e_cal_model_get_client_for_uri): new function.
-
-	* gui/gnome-cal.[ch] (gnome_calendar_set_default_client): new function.
-
-	* gui/calendar-component.c (primary_source_selection_changed_callback):
-	set the default client on the calendar view to be the primary
-	selection on the source list.
-
-2003-10-13  Rodrigo Moya <rodrigo@ximian.com>
-
-	* gui/dialogs/new-calendar.c (new_calendar_dialog): set a default group
-	on the calendar group option menu and create the source if all checks
-	are passed.
-
-2003-10-12  Rodrigo Moya <rodrigo@ximian.com>
-
-	* gui/dialogs/new-calendar.c (new_calendar_dialog): set up widgets
-	loaded from the Glade file.
-
-2003-10-10  Hans Petter Jansson  <hpj@ximian.com>
-
-	* gui/Makefile.am (etspec_DATA): Add e-cal-list-view.etspec.
-	(libevolution_calendar_la_SOURCES): Add e-cal-list-view.[ch].
-
-	* gui/calendar-commands.c (show_list_view_clicked): Implement.
-	(calendar_get_text_for_folder_bar_label): Add case for list view.
-	Use month case and tweak it so it doesn't show "%d - %d" if the
-	time span contains only one day.
-	(verbs): Add list view.
-	(pixmaps): Add list view.
-
-	* gui/calendar-view-factory.c (calendar_view_factory_get_title):
-	Add list view case.
-	(calendar_view_factory_get_type_code): Add list view case.
-
-	* gui/control-factory.c (get_prop): Add list view case.
-
-	* gui/e-cal-model.c (get_classification): Fix to conform to updated
-	libical.
-	(ecm_set_value_at): Add missing break statements.
-	(ecm_get_color_for_component): Add braces for clarity.
-
-	* gui/gnome-cal.c (gnome_calendar_get_current_view_widget): Add
-	list view case.
-	(get_focus_location): Add list view case.
-	(connect_list_view_focus): Implement.
-	(setup_widgets): Set up list view.
-	(gnome_calendar_direction): Add list view case.
-	(set_view): Add list view case.
-	(gnome_calendar_setup_view_menus): Add list view factory.
-	(gnome_calendar_construct): Account for list view.
-	(gnome_calendar_update_config_settings): Account for list view.
-	(get_days_shown): Implement list view case.
-
-	* gui/gnome-cal.h (GnomeCalendarViewType): Add list view.
-
-	* gui/e-cal-list-view.[ch]: Implement ECalListView, subclassing
-	ECalView.
-
-2003-10-10  Rodrigo Moya <rodrigo@ximian.com>
-
-	* gui/dialogs/new-calendar.[ch]: added new widget, which implements
-	the dialog to create new calendars.
-
-	* gui/dialogs/new-calendar.glade: basic mockup of the dialog.
-
-	* gui/dialogs/Makefile.am: added new files.
-
-	* gui/calendar-commands.c (file_new_calendar_cb): open the new calendar
-	dialog to allow user to create a new cal.
-
-2003-10-10  Rodrigo Moya <rodrigo@ximian.com>
-
-	* gui/control-factory.c (calendar_properties_init): pass the
-	BonoboControl to get_prop/set_prop.
-	(get_prop): obtain the GnomeCalendar from the control.
-	(set_prop): ditto, and when the URI property is changed,
-	sensitize the UI as approppriate.
-
-	* gui/calendar-commands.c (calendar_control_sensitize_calendar_commands):
-	made this function public.
-
-	* gui/calendar-commands.h: added new prototype.
-
-2003-10-10  Rodrigo Moya <rodrigo@ximian.com>
-
-	* gui/calendar-commands.c (file_new_calendar_cb,
-	file_new_appointment_cb, file_new_event_cb, file_new_meeting_cb,
-	file_new_task_cb): callbacks for "New..." verbs.
-	(sensitize_calendar_commands): sensitize new verbs, and made it
-	sensitize correctly based on the set of clients currently loaded.
-	(sensitize_taskpad_commands): likewise.
-
-2003-10-09  Hans Petter Jansson  <hpj@ximian.com>
-
-	* gui/e-cal-model.c (get_classification): Adapt to libical API changes.
-	(ecm_set_value_at): Break after each case, so we don't set the passed value
-	in more than one field.
-
-2003-10-09  Rodrigo Moya <rodrigo@ximian.com>
-
-	* gui/e-cal-view.c (e_cal_view_delete_selected_occurrence):
-	* cal-client/cal-client.c (cal_client_remove_object): added missing
-	argument when calling cal_client_remove_object_with_mod().
-
-2003-10-09  Rodrigo Moya <rodrigo@ximian.com>
-
-	* idl/evolution-calendar.idl: added missing 'rid' argument to the
-	removeObject method.
-
-	* cal-client/cal-client.c (cal_client_remove_object_with_mod):
-	* pcs/cal-backend.h:
-	* pcs/cal-backend.c (cal_backend_remove_object):
-	* pcs/cal-backend-sync.h:
-	* pcs/cal-backend-sync.c (cal_backend_sync_remove_object,
-	_cal_backend_remove_object):
-	* pcs/cal-backend-file.c (cal_backend_file_remove_object):
-	* pcs/cal.c (impl_cal_removeObject): adapted to changes in IDL.
-
-2003-10-09  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* cal-client/Makefile.am: INCLUDE path fixes for changes made to
-	libical build.
-
-	* cal-util/Makefile.am: INCLUDE path fixes for changes made to
-	libical build.
-
-	* cal-util/*.[c,h]: #include <libical/ical.h> instead of <ical.h>
-
-	* gui/Makefile.am: INCLUDE path fixes for changes made to libical
-	build.
-
-	* gui/*.[c,h]: #include <libical/ical.h> instead of <ical.h>
-
-	* gui/alarm-notify/Makefile.am: INCLUDE path fixes for changes
-	made to libical build.
-
-	* gui/alarm-notify/config-data.h: #include <libical/ical.h>
-	instead of <ical.h>
-
-	* gui/dialogs/Makefile.am: INCLUDE path fixes for changes made to
-	libical build.
-
-	* gui/dialogs/comp-editor-util.c: #include <libical/ical.h>
-	instead of <ical.h>
-
-	* gui/dialogs/e-delegate-dialog.c: #include <libical/ical.h>
-	instead of <ical.h>
-
-	* importers/Makefile.am: INCLUDE path fixes for changes made to
-	libical build.
-
-	* pcs/Makefile.am: INCLUDE path fixes for changes made to libical
-	build.
-
-	* pcs/cal.c: #include <libical/ical.h> instead of <ical.h>
-
-2003-10-08  Harry Lu  <harry.lu@sun.com>
-
-	* gui/dialogs/alarm-options.glade: Make repeat-quantity and
-	repeat-value of alarm option dialog numeric only.
-
-	* gui/dialogs/task-details-page.glade: Make percent-complete of
-	task details dialog numeric only.
-
-2003-10-08  Chris Toshok  <toshok@ximian.com>
-
-	* gui/dialogs/e-delegate-dialog.c (e_delegate_dialog_construct):
-	EDestination => EABDestination, and e_destination =>
-	eab_destination.
-	(e_delegate_dialog_get_delegate): same.
-	(e_delegate_dialog_get_delegate_name): same.
-
-	* gui/dialogs/comp-editor-util.c: remove unnecessary #include of
-	e-destination.h.
-
-	* gui/dialogs/alarm-options.c (alarm_to_malarm_widgets):
-	EDestination => EABDestination, and e_destination =>
-	eab_destination.
-	(malarm_widgets_to_alarm): same.
-
-	* gui/e-meeting-model.c (book_open_cb): track change to error
-	return codes.
-	(start_addressbook_server): use
-	e_book_async_get_default_addressbook.
-	(contacts_cb): rename cursor_cb to this, as we no longer get
-	passed a cursur, and we don't need to check the email address
-	since the query is now "is" instead of "contains".
-	(refresh_busy_periods): use an "is" query, and use
-	e_book_async_get_contacts instead of getting a CardCursor.
-	(process_section): this takes an EABDestination** instead of a
-	SimpleCardList*, which is gone.
-	(select_names_ok_cb): get "destinations" instead of
-	"simple_card_list".
-
-2003-10-08  Rodrigo Moya <rodrigo@ximian.com>
-
-	* cal-client/cal-client.c (cal_client_is_read_only): fixed
-	documentation comments.
-
-	* gui/calendar-commands.c (sensitize_calendar_commands): figure
-	out read-only menu items to disable based on the currently
-	selected object's CalClient.
-
-2003-10-08  Rodrigo Moya <rodrigo@ximian.com>
-
-	* cal-client/cal-client.c: set better error m,essages on the
-	E_CALENDAR_CHECK_STATUS macro.
-	(cal_client_get_error_message): new function.
-
-	* cal-client/cal-client.h: added new prototype.
-
-	* gui/dialogs/comp-editor.c (save_comp): use the GError argument
-	for the cal_client_create/_modify_object calls, and display the
-	error message coming from the backend.
-
-	* gui/comp-util.c (cal_comp_is_on_server): likewise.
-
-2003-10-07  Dan Winship  <danw@ximian.com>
-
-	* idl/evolution-calendar.idl (getDefaultObject): Remove the "type"
-	arg; the backend knows what type it is
-
-	* pcs/cal.c (impl_Cal_getDefaultObject): Likewise
-
-	* pcs/cal-backend.c (cal_backend_get_default_object): Likewise
-
-	* pcs/cal-backend-sync.c (cal_backend_sync_get_default_object,
-	_cal_backend_get_default_object): Likewise
-
-	* pcs/cal-backend-file.c (cal_backend_file_get_default_object):
-	Likewise. (Use cal_backend_get_kind() instead.)
-
-	* cal-client/cal-client.c (cal_client_get_default_object):
-	Likewise
-
-	* gui/comp-util.c (cal_comp_event_new_with_defaults,
-	cal_comp_task_new_with_defaults): Update calls to
-	cal_client_get_default_object().
-
-	* pcs/cal-backend-sync.c (_cal_backend_get_static_capabilities):
-	Use the right cal notification
-
-2003-10-07  Rodrigo Moya <rodrigo@ximian.com>
-
-	* gui/e-cal-model.c (e_cal_model_create_component_with_defaults):
-	dont clone NULL icalcomponent's.
-
-2003-10-07  Rodrigo Moya <rodrigo@ximian.com>
-
-	* gui/e-cal-model.c (e_cal_model_get_default_client): make sure we
-	always return a default client, if possible, since we rely on having
-	a default client in many places.
-
-	* gui/e-day-view.c (e_day_view_do_key_press): dont create event if
-	e_cal_model_create_component_with_defaults returns NULL.
-
-	* gui/e-week-view.c (e_week_view_do_key_press): dont create event if
-	e_cal_model_create_component_with_defaults returns NULL.
-	
-2003-10-06  Rodrigo Moya <rodrigo@ximian.com>
-
-	* gui/e-cal-model.c (e_cal_model_create_component_with_defaults):
-	make sure the component has always an UID.
-
-	* gui/e-day-view.c  (e_day_view_find_event_from_uid):
-	* gui/e-week-view.c (e_week_view_find_event_from_uid): check
-	pointers passed to strcmp().
-
-2003-10-06  Rodrigo Moya <rodrigo@ximian.com>
-
-	* gui/gnome-cal.c (gnome_calendar_open): added missing call to
-	cal_client_open().
-
-	* cal-client/cal-client.c (cal_client_new): fixed documentation
-	comments.
-	(cal_client_open): emit CAL_OPENED signal with appropriate status codes.
-	(open_sync): dont emit CAL_OPENED signal, it's already emitted in
-	cal_client_open().
-
-2003-10-06  Rodrigo Moya <rodrigo@ximian.com>
-
-	* gui/comp-editor-factory.c (open_client):
-	* gui/gnome-cal.c (gnome_calendar_open, gnome_calendar_construct):
-	* gui/calendar-offline-handler.c (backend_go_offline, backend_go_online,
-	calendar_offline_handler_init): adapted to changes in cal_client and
-	manage GError's returned by cal_client_open.
-
-	* gui/e-itip-control.c: dont run anymore sub event loops.
-	(start_calendar_server): use synchronous interface for opening calendars.
-	(start_default_server): renamed it from *_async.
-	(start_calendar_server_cb): removed unneeded function.
-	(object_requested_cb): use sync interface.
-
-	* gui/e-tasks.c (e_tasks_construct): dont create the CalClient here.
-	(e_tasks_open): do it here, where we've got all the info needed.
-
-	* importers/icalendar-importer.c (update_single_object): killed warning.
-	(ical_importer_new, vcal_importer_new): don't create CalClient's here.
-	(load_file_fn): create them here.
-	(vcal_load_file_fn): and here.
-	(gnome_calendar_import_data_fn): fixed usage of cal_client_*.
-
-	* */*: integrated JP's changes for synchronous open's in cal_client
-	and one model per view instead of one model for all views.
-	
-2003-10-02  Rodrigo Moya <rodrigo@ximian.com>
-
-	* cal-client/cal-client.c (cal_client_modify_object): return FALSE
-	if the icalcomponent is NULL.
-
-	* gui/e-day-view.c (e_day_view_finish_resize): commit sequence on
-	CalComponent after changing start/end dates.
-
-2003-10-01  Rodrigo Moya <rodrigo@ximian.com>
-
-	* gui/e-day-view.c (process_component):
-	* gui/e-week-view.c (process_component): expand recurrences here.
-
-2003-09-30  Rodrigo Moya <rodrigo@ximian.com>
-
-	* pcs/cal-backend-file.c (match_recurrence_sexp): removed.
-	(match_object_sexp): dont expand recurrences here.
-
-2003-09-30  Mike Kestner <mkestner@ximian.com>
-
-	* cal-util/cal-util-marshal.list : new VOID:STRING,STRING,STRING
-	* gui/Makefile.am : build the new view/store/renderer/editable
-	* gui/e-select-names-renderer.* : new completion cell renderer
-	* gui/e-select-names-editable.* : new completion cell editable
-	* gui/e-meeting-model.* : killed. code reused in list-view/store
-	* gui/e-meeting-store.* : port of EMeetingModel to GtkTreeModel
-	* gui/e-meeting-list-view.* : GtkTreeView subclass for attendee lists
-	* gui/e-meeting-time-sel.c : Use the new store/view
-	* gui/e-meeting-time-sel-item.c : Use the new store/view
-	* gui/dialogs/Makefile.am : don't install the etspec anymore.
-	* gui/dialogs/event-editor.c : Use the new store/view.
-	* gui/dialogs/meeting-page.c : Use the new store/view.
-	* gui/dialogs/shedule-page.c : Use the new store/view.
-	* gui/dialogs/task-editor.c : Use the new store/view.
-
-2003-09-29  JP Rosevear <jpr@ximian.com>
-
-	* conduits/todo/Makefile.am: link to libical-evolution
-
-	* conduits/calendar/Makefile.am: ditto	
-	
-2003-09-26  JP Rosevear <jpr@ximian.com>
-
-	* pcs/cal-backend.c (cal_backend_class_init): remove cal_added
-	signal
-
-2003-09-26  JP Rosevear <jpr@ximian.com>
-
-	* pcs/cal.h: add protos
-
-	* pcs/cal.c (cal_get_backend): accessor
-	(cal_get_listener): ditto
-
-	* pcs/cal-factory.c (impl_CalFactory_getCal): update to new
-	routine name
-
-	* pcs/cal-backend.h: add protos
-	
-	* pcs/cal-backend.c (cal_backend_init): init client mutex
-	(cal_backend_finalize): destroy client mutex
-	(cal_destroy_cb): just remove the client
-	(listener_died_cb): remove the client, the listener died so it
-	can't really do anything
-	(last_client_gone): signal the last client gone
-	(cal_backend_add_client): add a client with locking and listen for
-	the death of the listener
-	(cal_backend_remove_client): remove client
-
-2003-09-26  Rodrigo Moya <rodrigo@ximian.com>
-
-	* pcs/cal-backend-sync.c (_cal_backend_create_object): only free the
-	returned UID if it's not NULL.
-
-	* pcs/cal.c (cal_notify_object_created): dont send NULL strings to
-	ORBit code.
-
-2003-09-26  Rodrigo Moya <rodrigo@ximian.com>
-
-	* gui/comp-util.c (cal_comp_is_on_server): free the icalcomponent
-	returned from cal_client_get_object, and return TRUE if we find
-	the component on the backend.
-
-	* gui/e-day-view.c (process_component):
-	* gui/e-week-view.c (process_component): added missing case, so that
-	we also display recurrent meetings starting before the time range and
-	ending after the time range.
-
-	* cal-client/cal-listener.c (impl_notifyReadOnly): pass the
-	'read_only' argument to the signal callback correctly (a gboolean
-	not a 'gboolean *').
-
-	* gui/comp-editor-factory.c (resolve_pending_requests): removed
-	the g_assert on 'oc->pending != NULL', since there are now cases
-	(local calendar) where we get to call this function (cal_opened_cb)
-	with no pending requests yet.
-
-2003-09-25  JP Rosevear <jpr@ximian.com>
-
-	* gui/calendar-commands.c (publish_freebusy_cmd): adapt to new
-	get_free_busy api
-
-	* conduits/calendar/calendar-conduit.c (post_sync): ditto
-	(pre_sync): ditto
-
-	* conduits/todo/todo-conduit.c (pre_sync): ditto
-	(post_sync): ditto
-
-	* gui/e-meeting-model.c (refresh_busy_periods): ditto
-
-	* gui/e-itip-control.c (send_freebusy): ditto
-
-	* gui/e-cal-view.c (on_publish): ditto
-
-	* cal-client/cal-listener.h: add signals
-
-	* cal-client/cal-listener.c (build_change_list): move here from
-	cal-client.c
-	(impl_notifyChanges): implement
-	(build_free_busy_list): util to create the GList of free busy
-	objects
-	(impl_notifyFreeBusy): implement
-	(cal_listener_class_init): set free busy and changes epv methods,
-	add signals
-
-	* cal-client/cal-client.h: update protos
-
-	* cal-client/cal-client.c (cal_get_changes_cb): get changes call
-	back
-	(cal_get_free_busy_cb): get free busy call back
-	(cal_client_init): listen for free busy and changes signals
-	(cal_client_get_changes): convert to new threaded sync api
-	(cal_client_get_free_busy): ditto
-
-	* pcs/cal.h: add protos
-
-	* pcs/cal.c: remove dead type conversion function
-	(impl_Cal_getChanges): implement by just calling, no return stuff
-	(impl_Cal_getFreeBusy): ditto
-	(cal_notify_changes): do getChanges callback
-	(cal_notify_free_busy): do getFreeBusy callback
-
-	* pcs/cal-backend.h: update protos, vmethods
-	
-	* pcs/cal-backend.c (cal_backend_get_free_busy): call through
-	(cal_backend_get_changes): ditto
-
-	* pcs/cal-backend-sync.h: add vmethods, protos
-
-	* pcs/cal-backend-sync.c (cal_backend_sync_get_changes): call
-	through
-	(cal_backend_sync_get_free_busy): ditto
-	(_cal_backend_get_changes): backend implementation, notify
-	(_cal_backend_get_free_busy): ditto
-	(cal_backend_sync_class_init): set free busy and changes
-	implementations
-
-	* pcs/cal-backend-file.c (cal_backend_file_get_free_busy): convert
-	to sync backend method
-	(cal_backend_file_compute_changes_foreach_key): remove from the
-	hash here
-	(cal_backend_file_compute_changes): no need to build the sequence
-	here
-	(cal_backend_file_get_changes): convert to sync backend method
-	(cal_backend_file_class_init): set sync backend methods for free
-	busy and changes
-
-	* idl/evolution-calendar.idl: convert getChanges and getFreeBusy
-	to new async api
-
-2003-09-25  JP Rosevear  <jpr@ximian.com>
-
-	* pcs/cal-backend.h: remove dead result enums
-
-	* pcs/cal-backend.c: fix comments
-
-	* idl/evolution-calendar.idl: remove dead exceptions
-
-2003-09-25  JP Rosevear <jpr@ximian.com>
-
-	* pcs/cal.c (cal_notify_default_object): send back the empty
-	string if the object is NULL
-	(cal_notify_object): ditto
-
-2003-09-25  JP Rosevear <jpr@ximian.com>
-
-	* gui/comp-editor-factory.c (edit_existing): convert to api
-	changes
-
-	* conduits/todo/todo-conduit.c (local_record_from_uid): ditto
-	(pre_sync): ditto
-
-	* conduits/calendar/calendar-conduit.c (local_record_from_uid):
-	ditto
-	(pre_sync): ditto
-
-	* importers/icalendar-importer.c (update_single_object): ditto
-
-	* gui/dialogs/comp-editor.c (obj_updated_cb): ditto
-
-	* gui/e-itip-control.c (get_real_item): ditto
-	(find_server): ditto
-
-	* gui/comp-util.c (cal_comp_is_on_server): ditto
-	(cal_comp_event_new_with_defaults): ditto
-	(cal_comp_task_new_with_defaults): ditto
-
-	* cal-client/cal-listener.h: add signals
-
-	* cal-client/cal-listener.c (impl_notifyDefaultObjectRequested):
-	implement
-	(impl_notifyObjectRequested): ditto
-	(cal_listener_class_init): set above epv implementations, add signals
-
-	* cal-client/cal-client.h: update protos
-
-	* cal-client/cal-client.c (cal_default_object_requested_cb): get
-	default object callback
-	(cal_object_requested_cb): get object callback
-	(cal_client_init): listen for get and get default object signals
-	(cal_client_get_default_object): convert to new sync api
-	(cal_client_get_object): ditto
-
-	* pcs/cal.h: add protos
-
-	* pcs/cal.c (impl_Cal_getDefaultObject): just call the backend, it
-	does the notification now
-	(impl_Cal_getObject): ditto
-	(cal_notify_default_object): do getDefaultObject response
-	(cal_notify_object): do getObject response
-
-	* pcs/cal-backend.h: remove vmethods, protos
-
-	* pcs/cal-backend.c: remove a couple of dead functions
-	(cal_backend_class_init): get_object_component is no longer a
-	vmethod
-	(cal_backend_get_default_object): call through
-	(cal_backend_get_object): ditto
-
-	* pcs/cal-backend-sync.h: add protos, vmethods
-
-	* pcs/cal-backend-sync.c (cal_backend_sync_get_default_object):
-	call through
-	(cal_backend_sync_get_object): ditto
-	(_cal_backend_discard_alarm): pass correct params to
-	cal_notify_discard_alarm
-	(_cal_backend_get_default_object): call through and notify
-	(_cal_backend_get_object): ditto
-	(cal_backend_sync_class_init): set backend implementations
-
-	* pcs/cal-backend-file.c (cal_backend_file_get_default_object):
-	convert to sync backend method
-	(cal_backend_file_get_object): ditto
-	(cal_backend_file_compute_changes_foreach_key): just look up the
-	component rather than using the backend vmethod
-	(cal_backend_file_remove_object): return valid sync status codes
-	(cal_backend_file_class_init): move get_object, get_default_object
-	to sync class
-
-	* idl/evolution-calendar.idl: convert getObject and
-	getDefaultObject to new async idl
-
-2003-09-25  JP Rosevear  <jpr@ximian.com>
-
-	* pcs/cal.c (impl_Cal_discardAlarm): just call the backend
-	function, it does the notification
-	(cal_notify_alarm_discarded): notify of discard alarm call
-
-	* pcs/cal-backend.h: update proto
-
-	* pcs/cal-backend.c (cal_backend_discard_alarm): call through
-
-	* pcs/cal-backend-sync.h: add proto, vmethod
-
-	* pcs/cal-backend-sync.c (cal_backend_sync_discard_alarm): call
-	through
-	(_cal_backend_discard_alarm): call through and notify
-	(cal_backend_sync_class_init): set discard alarm implementation
-
-	* pcs/cal-backend-file.c (cal_backend_file_discard_alarm): match
-	sync backend vmethod
-	(cal_backend_file_class_init): set alarm vmethod implementation
-
-	* idl/evolution-calendar.idl: switch discardAlarm to new api
-
-	* gui/alarm-notify/alarm-queue.c (remove_queued_alarm): match new
-	api
-
-	* cal-client/cal-listener.h: add signal
-
-	* cal-client/cal-listener.c (impl_notifyAlarmDiscarded): implement
-	(cal_listener_class_init): add alarm, send, receive epv functions,
-	alarm signal
-
-	* cal-client/cal-client.h: update proto
-
-	* cal-client/cal-client.c (cal_alarm_discarded_cb): discardAlarm
-	callback
-	(cal_client_init): listen to discard alarm signal
-	(cal_client_discard_alarm): implement with new threaded sync api
-
-2003-09-25  JP Rosevear <jpr@ximian.com>
-
-	* idl/evolution-calendar.idl: remove unused user exceptions
-
-2003-09-24  Rodrigo Moya <rodrigo@ximian.com>
-
-	* pcs/cal-backend-util.[ch] (cal_backend_util_fill_alarm_instances_seq):
-	removed unneeded function.
-
-2003-09-24  JP Rosevear  <jpr@ximian.com>
-
-	* conduits/*/*.c: adjust to new timezone api calls
-
-	* gui/*.c: ditto
-
-	* gui/dialogs/*.c: ditto
-
-	* cal-client/cal-listener.h: add new signals
-
-	* cal-client/cal-listener.c (convert_status): convert invalid
-	object as well
-	(impl_notifyTimezoneRequested): implement
-	(impl_notifyDefaultTimezoneSet): ditto
-	(cal_listener_class_init): set epv implementations for timezone
-	functions
-	(cal_listener_class_init): create timezone response signals
-
-	* cal-client/cal-client.h: update protos
-
-	* cal-client/cal-client.c: fix return values all over the place
-	(cal_get_timezone_cb): getTimezone response
-	(cal_query_cb): setDefaultTimezone response
-	(cal_client_init): listen for new response signals
-	(cal_client_get_timezone): implement using new thread sync api
-	(cal_client_ensure_timezone_on_server): use add timezone call
-	(cal_client_set_default_timezone): oimplement using new thread sync
-	api
-
-	* cal-client/cal-client-types.h: add invalid object status code
-
-	* idl/evolution-calendar.idl: getQuery no longer raises any user
-	exceptions, remove dead types and exceptions
-
-2003-09-24  JP Rosevear <jpr@ximian.com>
-
-	* pcs/cal.h: new protos
-
-	* pcs/cal.c (impl_Cal_getTimezone): call backend implementation
-	(impl_Cal_addTimezone): ditto
-	(impl_Cal_setDefaultTimezone): ditto
-	(cal_class_init): set epv implementations of timezone functions
-	(cal_notify_timezone_requested): notify of get timezone response
-	(cal_notify_default_timezone_set): notify of default timezone
-	being set
-
-	* pcs/cal-backend.h: new vmethods, protos
-
-	* pcs/cal-backend.c (cal_backend_class_init): init new timezone
-	vmethods
-	(cal_backend_get_timezone): call through
-	(cal_backend_set_default_timezone): ditto
-	(cal_backend_add_timezone): ditto
-	(cal_backend_internal_get_default_timezone): ditto
-	(cal_backend_internal_get_timezone): ditto
-
-	* pcs/cal-backend-sync.h: add vmethods, protos
-
-	* pcs/cal-backend-sync.c (cal_backend_sync_get_timezone): call
-	through
-	(cal_backend_sync_set_default_timezone): ditto
-	(_cal_backend_set_default_timezone): call through and notify
-	(_cal_backend_get_timezone): ditto
-	(cal_backend_sync_class_init): set backend implementations for new
-	funcs
-
-	* pcs/cal-backend-object-sexp.c (func_occur_in_time_range): get
-	time_t values based on the zone
-
-	* pcs/cal-backend-file.c: reorg so we don't have to prototype
-	everything
-	(cal_backend_file_get_timezone): implement the sync backend way
-	(cal_backend_file_add_timezone): ditto
-	(cal_backend_file_set_default_timezone): ditto
-	(cal_backend_file_internal_get_default_timezone): internal method,
-	for sexp comparison
-	(cal_backend_file_internal_get_timezone): ditto
-
-	* idl/evolution-calendar.idl: convert timezone routines to async
-	api
-
-2003-09-23  Rodrigo Moya <rodrigo@ximian.com>
-
-	* pcs/cal-backend-object-sexp.c (func_occur_in_time_range): dont expand
-	recurrences, since they are supposed to be expanded in the backends.
-	(instance_occur_cb, resolve_tzid): removed unneeded functions.
-
-	* pcs/cal-backend-file.c (cal_backend_file_add_timezone): guard against
-	adding the timezone if it's already there.
-
-2003-09-23  JP Rosevear <jpr@ximian.com>
-
-	* pcs/cal.c (cal_notify_object_created): notify with the object,
-	not the uid
-
-	* gui/e-cal-model.c (add_new_client): don't listen for
-	non-existent signal
-
-2003-09-23  JP Rosevear <jpr@ximian.com>
-
-	* cal-client/cal-client.h: remove dead proto
-
-2003-09-23  JP Rosevear <jpr@ximian.com>
-
-	* cal-client/cal-client.h: remove send result enum
-
-	* gui/itip-utils.c (comp_server_send): use the new send_objects
-	routine
-
-2003-09-23  JP Rosevear <jpr@ximian.com>
-
-	* cal-client/cal-client.h: remove send result enum
-
-2003-09-23  JP Rosevear <jpr@ximian.com>
-
-	* cal-client/cal-client.h: remove enum, protos
-
-	* cal-client/cal-client.c: remove remove status enum typing
-
-2003-09-23  Rodrigo Moya <rodrigo@ximian.com>
-
-	* importers/icalendar-importer.c (update_objects): new function
-	to manage the update of components, taking into account
-	VTIMEZONE components.
-	(process_item_fn, gnome_calendar_import_data_fn): use
-	update_objects instead of cal_client_update_objects.
-
-2003-09-23  JP Rosevear <jpr@ximian.com>
-
-	* pcs/cal.h: update proto
-
-	* pcs/cal.c (impl_Cal_addTimezone): just call add_timezone, it
-	does the notification
-	(cal_notify_object_created): only notify the query if the object
-	matches
-	(cal_notify_object_removed): ditto
-
-	* pcs/cal-backend.h: update proto, vmethod
-
-	* pcs/cal-backend.c (cal_backend_add_timezone): returns void
-
-	* pcs/cal-backend-sync.h: update proto, vmethod
-
-	* pcs/cal-backend-sync.c (cal_backend_sync_remove_object): add the
-	object as an out param
-	(_cal_backend_remove_object): get the object and pass it in the
-	notification
-
-	* pcs/cal-backend-file.c (cal_backend_file_create_object): kill
-	cal_backend_file_update_objects call, its more efficient to create
-	the comp ourselves; stamp the creation time, add the component to
-	the toplevel
-	(cal_backend_file_modify_object): kill the
-	cal_backend_file_update_objects call, add the component to the
-	toplevel
-	(cal_backend_file_remove_object): pass back the object when
-	removing
-
-2003-09-23  JP Rosevear  <jpr@ximian.com>
-
-	* cal-client/cal-query.c (cal_query_finalize): disconnect the
-	signal handlers
-
-	* cal-client/cal-client.c (cal_client_get_query): unref the
-	listener when done
-
-2003-09-23  Rodrigo Moya <rodrigo@ximian.com>
-
-	* gui/e-cal-view.c (selection_received): add VTIMEZONE components
-	contained in the clipboard data to the backend.
-
-2003-09-22  JP Rosevear <jpr@ximian.com>
-
-	* gui/dialogs/comp-editor.c (save_comp): modify and create instead
-	of update, simplify mod code
-
-2003-09-22  JP Rosevear <jpr@ximian.com>
-
-	* gui/e-day-view.c (e_day_view_finish_long_event_resize): modify
-	the object instead of update, simplify the instance handling
-	(e_day_view_finish_resize): ditto
-	(e_day_view_on_top_canvas_drag_data_received): ditto
-	(e_day_view_on_main_canvas_drag_data_received): ditto
-
-2003-09-22  Rodrigo Moya <rodrigo@ximian.com>
-
-	* cal-client/cal-client.c (cal_client_get_alarms_in_range): use
-	'has-alarms' function in the search expression.
-
-	* pcs/cal-backend-object-sexp.c (func_has_alarms): new SExp function.
-
-2003-09-22  JP Rosevear <jpr@ximian.com>
-
-	* gui/e-day-view.c (e_day_view_on_editing_stopped): create the
-	object if its not on the server or modify it if it is
-
-	* gui/e-week-view.c (e_week_view_on_editing_stopped): we return if
-	there is no text and it *not* on the server
-
-2003-09-22  JP Rosevear <jpr@ximian.com>
-
-	* gui/e-week-view.c (e_week_view_on_editing_stopped): create the
-	object if its not on the server or modify it if it is
-
-2003-09-22  JP Rosevear <jpr@ximian.com>
-
-	* gui/gnome-cal.h: remove proto
-
-	* gui/gnome-cal.c: remove gnome_calendar_unrecur_selection
-
-	* gui/e-week-view.h: remove proto
-
-	* gui/e-week-view.c: remove e_week_view_unrecur_appointment
-
-	* gui/e-day-view.h: remove proto
-
-	* gui/e-day-view.c: remove e_day_view_unrecur_appointment
-
-	* gui/e-cal-view.c: remove on_unrecur_appointment (this is handled
-	better via recurrence id's now)
-
-2003-09-22  JP Rosevear <jpr@ximian.com>
-
-	* gui/e-itip-control.c (update_attendee_status): ifdef out, leave
-	temporarily for reference, but otherwise it shouldn't be needed
-	(update_item): switch to using receive objects
-	(ok_clicked_cb): update item when receiving a reply
-
-	* gui/e-calendar-table.c (selection_received): switch to using
-	create object from update_objects
-
-	* gui/e-cal-view.c (selection_received_add_event): util routine to
-	prevent duplication
-	(selection_received): use above
-
-	* gui/e-cal-model.c (ecm_set_value_at): switch to using modify
-	object from update_objects
-	(ecm_append_row): switch to using create object from
-	update_objects
-
-	* gui/e-cal-model-calendar.c (ecmc_set_value_at): switch to using
-	modify object from update_objects
-
-	* gui/e-cal-model-tasks.c (ecmt_set_value_at): ditto
-
-2003-09-22  Hans Petter Jansson  <hpj@ximian.com>
-
-	* cal-util/Makefile.am (libical_util_la_LIBADD):
-	libical.la -> libical-evolution.la
-
-	* importers/Makefile.am (libevolution_calendar_importers_la_LIBADD):
-	libicalvcal.la -> libicalvcal-evolution.la
-
-	
-2003-09-19  Rodrigo Moya <rodrigo@ximian.com>
-
-	* idl/evolution-calendar.idl: removed getAlarmsInRange and
-	getAlarmsForObject methods.
-
-	* pcs/cal.c (impl_Cal_getAlarmsInRange, impl_Cal_getAlarmsForObject):
-	removed unneeded CORBA methods.
-	(cal_class_init): dont set removed methods in the epv.
-
-	* pcs/cal-backend.[ch]: removed get_alarms_in_range and
-	get_alarms_for_object virtual methods.
-	(cal_backend_get_alarms_in_range, cal_backend_get_alarms_for_object):
-	removed.
-	(cal_backend_class_init): dont set removed virtual methods.
-
-	* pcs/cal-backend-file.c (cal_backend_file_get_alarms_in_range,
-	cal_backend_file_get_alarms_for_object): removed.
-	(cal_backend_file_class_init): dont set removed virtual methods.
-
-2003-09-19  Rodrigo Moya <rodrigo@ximian.com>
-
-	* cal-client/cal-client.c (cal_client_get_alarms_in_range): changed
-	to use queries.
-	(build_component_alarms_list): create the alarm list from a list
-	of iCalendar strings.
-	(build_alarm_instance_list): removed.
-	(cal_client_get_alarms_for_object): dont call the CORBA methods,
-	just get alarms by itself.
-
-2003-09-18  Rodrigo Moya <rodrigo@ximian.com>
-
-	* cal-client/cal-listener.[ch]: added "add_timezone" signal.
-	(impl_notifyTimezoneAdded): implemented new CalListener method.
-	(cal_listener_class_init): create "add_timezone" signal for the class.
-
-	* cal-client/cal-client.[ch] (cal_client_add_timezone): new function.
-	(cal_client_init): connect to "add_timezone" signal on the
-	CalListener.
-	(cal_add_timezone_cb): callback for the "add_timezone" signal.
-
-2003-09-18  Rodrigo Moya <rodrigo@ximian.com>
-
-	* idl/evolution-calendar.idl: added 'notifyTimezoneAdded' method
-	to the Calendar::Listener interface.
-
-	* pcs/cal-backend-sync.[ch] (cal_backend_sync_add_timezone):
-	(_cal_backend_add_timezone): new functions for the new virtual
-	method implementation.
-
-	* pcs/cal.[ch] (cal_notify_timezone_added): new function.
-
-	* pcs/cal-backend-file.c (cal_backend_add_timezone): converted to
-	return a CalBackendSyncStatus.
-	(cal_backend_file_class_init): the 'add_timezone' method we implement
-	is the one in the CalBackendSync class.
-	(cancel_receive_object): added missing 'return'.
-	(free_cal_component): removed unused function.
-
-2003-09-17  Rodrigo Moya <rodrigo@ximian.com>
-
-	* pcs/cal-backend-file.c (cal_backend_add_timezone): added new
-	virtual method implementation.
-
-	* pcs/cal.c (impl_Cal_addTimezone): check return value from
-	cal_backend_add_timezone, and set an exception if an error is
-	returned.
-
-2003-09-16  Rodrigo Moya <rodrigo@ximian.com>
-
-	* idl/evolution-calendar.idl: added addTimezone method.
-
-	* pcs/cal.c (impl_Cal_addTimezone): implemented new method.
-	(cal_class_init): set new method on the epv.
-
-	* pcs/cal-backend.[ch]: added 'add_timezone' virtual method.
-	(cal_backend_add_timezone): implemented new virtual method.
-
-	* pcs/cal-backend-file.c (cal_backend_file_modify_object): it's
-	cal_component_get_as_string, not cal_component_as_string.
-
-	* cal-client/cal-client.c (cal_client_ensure_timezone_on_server):
-	dont use anymore updateObjects method, use addTimezone instead.
-	
-2003-09-16  Rodrigo Moya <rodrigo@ximian.com>
-
-	* conduits/todo/Makefile.am: removed libwombat reference.
-
-2003-09-15  Rodrigo Moya <rodrigo@ximian.com>
-
-	* pcs/cal-backend-file.c (cal_backend_file_create_object): return
-	the UID of the added object.
-	(cal_backend_file_remove_object): ditto for old_object.
-
-2003-09-15  JP Rosevear <jpr@ximian.com>
-
-	* conduits/todo/todo-conduit.c (replace_record): switch to modify
-	object
-	(add_record): switch to using create object
-
-	* conduits/calendar/calendar-conduit.c (process_multi_day): switch
-	to using create object
-	(add_record): switch to using create object
-	(replace_record): switch to modify object
-
-	* cal-client/cal-listener.h: add signals
-
-	* cal-client/cal-listener.c (impl_notifyObjectsReceived):
-	implement listener method
-	(build_object_list): ditto
-	(cal_listener_class_init): create receive_objects and send_objects
-	signals
-
-	* cal-client/cal-client.h: add, update protos
-
-	* cal-client/cal-client.c (cal_objects_received_cb):
-	receive_objects callback
-	(cal_objects_sent_cb): send_objects callback
-	(cal_client_init): listen for above signals
-	(cal_client_create_object): pass back uid
-	(cal_client_receive_objects): implement
-	(cal_client_send_objects): ditto
-
-	* idl/evolution-calendar.idl: add receive/send objects methods and
-	yank updateObjects
-
-	* pcs/cal.h: add protos
-
-	* pcs/cal.c (impl_Cal_receiveObjects): implement
-	(impl_Cal_sendObjects): ditto
-	(cal_class_init): add epv methods
-	(cal_notify_objects_received): notify of objects received call,
-	updating queries
-	(cal_notify_objects_sent): notify of objects sent
-
-	* pcs/cal-backend.h: remove proto
-
-	* pcs/cal-backend.c (cal_backend_class_init): remove obj_updated
-	signal
-	(cal_backend_class_init): init vmethods properly
-	(cal_backend_receive_objects): call through
-	(cal_backend_send_objects): ditto
-
-	* pcs/cal-backend-sync.h: add protos, vmethods
-
-	* pcs/cal-backend-sync.c (cal_backend_sync_receive_objects): call
-	through
-	(cal_backend_sync_send_objects): ditto
-	(_cal_backend_receive_objects): call backend method and notify
-	(_cal_backend_send_objects): ditto
-	(cal_backend_sync_class_init): override send/receive object
-	vmethods
-
-	* pcs/cal-backend-file.c (cal_backend_file_class_init): set
-	remove/send objects sync vmethods
-	(cal_backend_file_create_object): remove call to dead method
-	(cal_backend_file_remove_object): ditto
-	(cal_backend_file_modify_object): ditto
-	(cancel_received_object): cancel an object
-	(check_tzids): check we have all the tzid's for the object
-	(cal_backend_file_receive_objects): receive a bunch of objects via
-	itip
-	(cal_backend_file_send_objects): skeleton implementation
-
-2003-09-15  Rodrigo Moya <rodrigo@ximian.com>
-
-	* idl/evolution-calendar.idl: added InvalidObject CallStatus.
-
-	* pcs/cal-backend-file.c (cal_backend_file_create_object): implemented.
-	(cal_backend_file_modify_object): implemented.
-
-2003-09-15  Harry Lu  <harry.lu@sun.com>
-
-	* gui/apps_evolution_calendar.schemas: change last_notification_time's
-	type from string to int.
-
-2003-09-12  Bolian Yin <bolian.yin@sun.com>
-
-	* e-week-view.c (e_week_view_focus): make jump button focusable
-	 (e_week_view_on_jump_button_event): key_press and focus event for jump button
-	 (e_week_view_jump_to_button_item): new function, jump to the day view.
-	 (e_week_view_is_jump_button_visible): new function.
-
-	
-2003-09-12  Rodrigo Moya <rodrigo@ximian.com>
-
-	* pcs/cal.c (cal_notify_cal_address, cal_notify_alarm_email_address,
-	cal_notify_ldap_attribute, cal_notify_static_capability):
-	make sure we always notify listeners, regardless of whether the
-	string is empty or not.
-
-	* cal-client/cal-client.c (check_capability): guard against using
-	NULL strings with strstr.
-
-2003-09-12  JP Rosevear <jpr@ximian.com>
-
-	* cal-client/client-test.c (cal_opened_cb): listen for other query
-	signals
-
-	* cal-client/cal-listener.h: add signals
-
-	* cal-client/cal-listener.c (impl_notifyObjectCreated): implement
-	(impl_notifyObjectModified): implement
-	(cal_listener_class_init): assign epv implementations
-	(cal_listener_class_init): add create/modify object signals
-
-	* cal-client/cal-client.h: add protos
-
-	* cal-client/cal-client.c (cal_object_created_cb): object created
-	callback
-	(cal_object_modified_cb): object modified callback
-	(cal_client_init): listen for create/modify object signals from
-	the listener
-	(cal_client_create_object): call the create object method
-	(cal_client_modify_object): call the modify object method
-
-	* cal-client/client-test.c (cal_opened_cb): listen for all the
-	query signals, tidy
-
-2003-09-12  JP Rosevear <jpr@ximian.com>
-
-	* pcs/cal.c (impl_Cal_createObject): implement
-	(impl_Cal_modifyObject): ditto
-	(cal_class_init): set epv methods for create/modify
-
-	* pcs/cal-backend.h: add protos, vmethod
-
-	* pcs/cal-backend.c (cal_backend_class_init): init new vmethods
-	(cal_backend_create_object): call through
-	(cal_backend_modify_object): ditto
-
-	* pcs/cal-backend-sync.h: add protos, vmethods
-
-	* pcs/cal-backend-sync.c (cal_backend_sync_create_object): call
-	through
-	(cal_backend_sync_modify_object): ditto
-	(_cal_backend_create_object): create object and notify
-	(_cal_backend_modify_object): modify object and notify
-
-	* pcs/cal-backend-file.c (cal_backend_file_create_object):
-	skeleton routine for creating objects
-	(cal_backend_file_modify_object): ditto for modifying
-
-	* idl/evolution-calendar.idl: add createObject and modifyObject
-	calls
-
-2003-09-12  JP Rosevear  <jpr@ximian.com>
-
-	* pcs/cal.c (cal_notify_object_removed): its uid, not uids
-
-2003-09-12  JP Rosevear <jpr@ximian.com>
-
-	* pcs/query.h: add protos
-
-	* pcs/query.c (query_object_matches): use the sexp to check for a
-	match
-	(query_notify_objects_added_1): notify of one object added to
-	query
-	(query_notify_objects_modified_1): ditto for modification
-	(query_notify_objects_removed_1): ditto for removal
-
-	* pcs/cal.h: add protos
-
-	* pcs/cal.c (cal_notify_object_created): notify of object creation
-	(cal_notify_object_modified): notify of object modification
-	(cal_notify_object_removed): use the _1 routines
-
-	* pcs/cal-backend-file.c (match_recurrence_sexp): this returns a
-	boolean
-	(cal_backend_file_update_objects): don't signal removals here now
-
-	* idl/evolution-calendar.idl: add object created and modified
-	responses
-
-	
-2003-09-11  JP Rosevear <jpr@ximian.com>
-
-	* pcs/cal.h: update proto
-
-	* pcs/cal.c (cal_notify_object_removed): notify relevant queries
-	of removal
-
-	* pcs/cal-backend.c (cal_backend_get_queries): ref the list before
-	passing it back
-
-	* pcs/cal-backend-sync.c (_cal_backend_remove_object): pass uid to
-	notification
-
-2003-09-11  JP Rosevear <jpr@ximian.com>
-
-	* pcs/cal-backend-file.c (match_recurrence_sexp): don't unref the
-	component
-
-	* cal-client/client-test.c (cal_opened_cb): listen to objects
-	added signal
-	(objects_added_cb): print the object uid
-	
-2003-09-11  JP Rosevear <jpr@ximian.com>
-
-	* pcs/cal-backend-object-sexp.c (cal_backend_object_sexp_text):
-	return the base text
-
-2003-09-11  JP Rosevear <jpr@ximian.com>
-
-	* gui/gnome-cal.c (update_query): fix c/p typo
-
-2003-09-11  JP Rosevear <jpr@ximian.com>
-
-	* gui/gnome-cal.c (update_query): start the query
-
-	* gui/e-cal-model.c (update_query_for_client): ditto
-
-	* cal-client/client-test.c (cal_opened_cb): ditto
-	
-2003-09-11  JP Rosevear <jpr@ximian.com>
-
-	* cal-client/cal-query.h: add proto
-
-	* cal-client/cal-query.c (cal_query_start): start the query
-
-2003-09-11  JP Rosevear <jpr@ximian.com>
-
-	* gui/dialogs/delete-error.c (delete_error_dialog): accept GError
-	and base error messages on that
-
-	* gui/dialogs/delete-error.h: update proto
-
-	* gui/e-tasks.c (e_tasks_delete_completed): pass extra param to
-	cal_client_remove_object
-
-	* conduits/todo/todo-conduit.c (delete_record): ditto
-
-	* conduits/calendar/calendar-conduit.c (process_multi_day): ditto
-	(delete_record): ditto
-	
-	* gui/gnome-cal.c (gnome_calendar_purge): ditto
-
-	* gui/dialogs/comp-editor.c (delete_comp): ditto
-	
-	* gui/e-cal-view.c (e_cal_view_cut_clipboard): pass the error to
-	delete_error_dialog
-	(delete_event): ditto
-	(e_cal_view_delete_selected_occurrence): ditto
-	
-	* gui/e-itip-control.c (remove_item): ditto
-
-	* gui/e-calendar-table.c (delete_selected_components): ditto
-
-	* cal-client/cal-listener.h: add signal
-
-	* cal-client/cal-listener.c (impl_notifyObjectRemoved): implement
-	(cal_listener_class_init): set object removed implementation and
-	create signal
-
-	* cal-client/cal-client.h: update protos
-
-	* cal-client/cal-client.c (cal_object_removed_cb): object removal
-	callback
-	(cal_client_init): listen for object removal signal
-	(cal_client_remove_object_with_mod): make call synchronous
-	(cal_client_remove_object): pass new params
-
-	* pcs/cal.h: add proto
-
-	* pcs/cal.c (impl_Cal_removeObject): just call the backend
-	function
-	(cal_notify_object_removed): notify of removal
-
-	* pcs/cal-backend.h: remove and update protos, remove signal
-
-	* pcs/cal-backend.c (cal_backend_class_init): kill obj_removed
-	signal
-	(cal_backend_remove_object): there is no return value now
-
-	* pcs/cal-backend-sync.h: add vmethod, proto
-
-	* pcs/cal-backend-sync.c (cal_backend_sync_remove_object): call
-	through
-	(_cal_backend_remove_object): remove the object and then do the
-	notification
-
-	* pcs/cal-backend-file.c (cal_backend_file_class_init): remove
-	object is not part of the sync class
-	(cal_backend_file_update_objects): there is no more removed signal
-	(cal_backend_file_remove_object): return sync status codes
-
-	* idl/evolution-calendar.idl: make removeObject oneway and and a
-	notification method in the listener
-
-2003-09-11  Rodrigo Moya <rodrigo@ximian.com>
-
-	* pcs/query.[ch] (query_get_text): new function.
-	(query_get_object_sexp): new function.
-
-	* pcs/cal-backend-file.c (cal_backend_file_start_query): implemented.
-
-2003-09-11  Hans Petter Jansson  <hpj@ximian.com>
-
-	* cal-util/Makefile.am (libcal_util_la_LIBADD):
-	libical-evolution.la -> libical.la
-
-	* cal-util/cal-component.c (cal_component_get_classification)
-	(cal_component_set_classification)
-	(get_text_list)
-	(get_icaltimetype)
-	(get_datetime)
-	(get_period_list)
-	(get_recur_list)
-	(cal_component_get_transparency)
-	(cal_component_set_transparency): Adapt to new libical.
-
-	* cal-util/cal-util.c (cal_util_event_dates_match): Ditto.
-
-	* pcs/cal-backend-file.c (create_user_free_busy): Ditto.
-
-	* gui/e-cal-model-tasks.c (get_completed)
-	(get_due)
-	(get_due_status): Ditto.
-
-	* gui/e-cal-model.c (get_dtstart)
-	(set_classification): Ditto.
-
-	* gui/e-cal-model-calendar.c (get_dtend)
-	(get_transparency)
-	(set_transparency): Adapt to new libical and fix a comparison bug.
-
-	* importers/Makefile.am (libevolution_calendar_importers_la_LIBADD):
-	libical-evolution.la -> libical.la
-
-2003-09-11  Dan Winship  <danw@ximian.com>
-
-	* cal-util/Makefile.am (privlib_LTLIBRARIES): Remove
-	libcal-util-static.la
-
-	* cal-client/Makefile.am (noinst_LTLIBRARIES): Remove
-	libcal-client-static.la
-
-	* conduits/calendar/Makefile.am (libecalendar_conduit_la_LIBADD):
-	use non-static libraries. The static ones were only needed for
-	libtool 1.3.
-
-	* conduits/todo/Makefile.am (libetodo_conduit_la_LIBADD): Likewise
-
-        * gui/Makefile.am (IDL_GENERATED): Don't compile the calendar idl
-        here. It's already in libcal-client.
-
-2003-09-11  Frederic Crozat  <fcrozat@mandrakesoft.com>
-
-	* conduits/todo/Makefile.am:
-	Statically link with wombat. Fix ETodo conduit.
-	(Mdk bug #5348)
-
-	
-2003-09-10  JP Rosevear  <jpr@ximian.com>
-
-	* pcs/cal.h: update proto
-
-	* pcs/cal.c (impl_Cal_getObjectList): just call the backend, it
-	will do the notification now
-	(cal_notify_object_list): the list is a list of strings
-
-	* pcs/cal-backend.h: update vmethod, proto
-
-	* pcs/cal-backend.c (cal_backend_get_object_list): call through
-
-	* pcs/cal-backend-sync.h: add proto, vmethod
-
-	* pcs/cal-backend-sync.c (cal_backend_sync_get_object_list): call
-	through
-	(_cal_backend_get_object_list): get the list of objects from the
-	sync backend and do the notification
-	(cal_backend_sync_class_init): set vmethod implementation
-
-	* pcs/cal-backend-file.c (cal_backend_file_class_init): the get
-	object list call is now part of the sync backend
-	(cal_backend_file_get_object_list): return a status and put the
-	object list in the passed in param
-
-2003-09-10  JP Rosevear  <jpr@ximian.com>
-
-	* pcs/cal-backend.c (cal_backend_finalize): unref the elist
-	(cal_backend_init): init the query elist
-
-2003-09-10  JP Rosevear <jpr@ximian.com>
-
-	* gui/gnome-cal.c (dn_query_objects_added_cb): match new query
-	signals - just tag here
-	(dn_query_objects_modified_cb): always retag
-	(dn_query_objects_removed_cb): ditto
-	(update_query): connect to new signals
-	(gnome_calendar_destroy): we don't keep a list of expunging
-	queries
-	(gnome_calendar_purge): no need to do the
-	expunge async, just get the object list immediately
-
-	* gui/e-tasks.c (e_tasks_delete_completed): no need to do the
-	expunge async, just get the object list immediately
-
-	* gui/e-cal-model.c (query_objects_added_cb): callback for objects
-	added to the query
-	(query_objects_modified_cb): ditto for modifications
-	(query_objects_removed_cb): ditto for removed
-	(query_progress_cb): progress of the query
-	(query_done_cb): query is done
-	(update_query_for_client): connect to the new signals
-
-	* cal-client/client-test.c (cal_opened_cb): run a query
-
-	* cal-client/cal-query.c: we are given the listener now - listen
-	for signals from the listener and emit signals matching the api
-	changes
-
-	* cal-client/query-listener.[hc]: rewrite to match new query
-	listener methods and emit signals rather than using function
-	callbacks
-
-	* cal-client/cal-marshal.list: add to marshallers
-
-	* cal-client/cal-listener.h: add query signal
-
-	* cal-client/cal-listener.c (impl_notifyQuery): implement
-	(cal_listener_class_init): set notifyQuery method
-	(cal_listener_class_init): add query signal
-
-	* cal-client/cal-client.h: update protos
-
-	* cal-client/cal-client.c (cal_query_cb): handle response to
-	getQuery
-	(cal_client_init): listen for query signal
-	(cal_client_get_query): get a query from the calendar
-
-	* pcs/query.h: update protos
-
-	* pcs/query.c: rewrite to implement the query start method and
-	provide notification calls
-
-	* pcs/cal.h: add proto
-
-	* pcs/cal.c (impl_Cal_getQuery): re-implement so the backend
-	doesn't create the query for us
-	(cal_notify_query): respond with the query
-
-	* pcs/cal-factory.c: re-order includes
-
-	* pcs/cal-common.h: add types
-
-	* pcs/cal-backend.h: update protos, vmethods
-
-	* pcs/cal-backend.c (cal_backend_class_init): init start_query
-	vmethod
-	(cal_backend_finalize): free mutex
-	(cal_backend_start_query): call through
-	(cal_backend_add_query): add a query to the list the backend is
-	running
-	(cal_backend_get_queries): get the query list
-
-	* pcs/cal-backend-object-sexp.h: add proto
-
-	* pcs/cal-backend-file.c (cal_backend_file_start_query): skeleton
-	for new backend implementation
-
-	* pcs/Makefile.am: don't build dead files
-
-	* idl/evolution-calendar.idl: make the getQuery call async, make
-	the query listener calls oneway and match the addressbook
-
-2003-09-09  Rodrigo Moya <rodrigo@ximian.com>
-
-	* pcs/cal-backend-file.c (cal_backend_file_get_object_component):
-	added case for getting the individual recurrences if 'rid' is
-	not NULL,
-
-2003-09-09  Rodrigo Moya <rodrigo@ximian.com>
-
-	* pcs/cal-backend-file.c (match_object_sexp): expand recurrences
-	for recurrent objects.
-	(match_recurrence_sexp): add the recurrences that match the query
-	expression to the object list.
-
-2003-09-08  Rodrigo Moya <rodrigo@ximian.com>
-
-	* pcs/cal-backend-file.c: don't store all recurrences in the
-	private structure.
-	
-2003-09-04  Rodrigo Moya <rodrigo@ximian.com>
-
-	* gui/e-day-vie
diff --git a/calendar/ChangeLog.pre-1-4 b/calendar/ChangeLog.pre-1-4
deleted file mode 100644
index 912411acd1..0000000000
--- a/calendar/ChangeLog.pre-1-4
+++ /dev/null
@@ -1,21872 +0,0 @@
-2003-06-02  Rodrigo Moya <rodrigo@ximian.com>
-
-	Fixes part of #43388
-
-	* importers/icalendar-importer.c (prepare_events):
-	(prepare_tasks): use external iterators for removing components from
-	the main component.
-
-2003-05-29  Rodrigo Moya <rodrigo@ximian.com>
-
-	Fixes #43763
-
-	* gui/e-week-view.c (e_week_view_init): use g_signal_connect_after
-	for "button_press_event" callback.
-
-	* gui/e-day-view.c (e_day_view_init): ditto.
-
-2003-05-29  JP Rosevear  <jpr@ximian.com>
-
-	Fixes #43775
-	
-	* gui/weekday-picker.c (get_day_text): calculate the characters to
-	display correctly
-	(configure_items): use it
-	(weekday_picker_style_set): ditto
-
-	* gui/print.c (format_date): use e_utf8_strftime
-	(print_week_view_background): ditto
-	(print_month_summary): ditto
-	(range_selector_new): ditto
-	(print_comp_item): ditto
-
-	* gui/itip-utils.c (comp_description): the translation is already
-	utf8
-
-	* gui/e-itip-control.c (write_label_piece): the string is already
-	in utf8
-
-	* gui/e-day-view.c (e_day_view_style_set): use e_utf8_strftime
-	(e_day_view_recalc_cell_sizes): ditto
-
-	* gui/e-day-view-top-item.c (e_day_view_top_item_draw): use
-	e_utf8_strftime
-
-	* gui/e-cell-date-edit-text.c (ecd_get_text): return the
-	duplicated buffer (its already utf8)
-	(show_date_warning): use e_utf8_strftime
-
-	* gui/calendar-model.c (date_value_to_string): return the
-	duplicated buffer (its already utf8)
-	(calendar_model_value_to_string): the translations should already
-	be in utf8
-
-	* gui/calendar-config.c
-	(calendar_config_locale_supports_12_hour_format): use
-	e_utf8_strftime
-
-	* gui/calendar-commands.c (calendar_set_folder_bar_label): use
-	e_utf8_strftime
-
-2003-05-28  Rodrigo Moya <rodrigo@ximian.com>
-
-	Fixes #43455
-
-	* gui/tasks-control.c (confirm_expunge): converted to a GtkMessageDialog
-	and removed object weak's ref code, not needed anymore.
-	
-2003-05-20  JP Rosevear  <jpr@ximian.com>
- 
- 	Fixes #43308
- 	
- 	* gui/e-meeting-time-sel.c (e_meeting_time_selector_style_set):
- 	adjust row heights to reflect changes in etable row heights and
- 	set display top to align properly
-	
-2003-05-22  JP Rosevear  <jpr@ximian.com>
- 
- 	* gui/dialogs/comp-editor-page.c (comp_editor_page_destroy): unref
- 	not ref the client
-	
-2003-05-22  JP Rosevear  <jpr@ximian.com>
-
-	Fixes #41329
-	
-	* gui/e-meeting-time-sel.c
-	(e_meeting_time_selector_on_zoomed_out_toggled): make sure the
-	meeting time is shown afterwards
-	(e_meeting_time_selector_on_working_hours_toggled): ditto
-
-2003-05-21  Rodrigo Moya <rodrigo@ximian.com>
-
-	Fixes #41234
-
-	* gui/dialogs/e-delegate-dialog.glade: changed button ordering.
-
-2003-05-20  Ettore Perazzoli  <ettore@ximian.com>
-
-	* gui/gnome-cal.c (gnome_calendar_setup_view_menus): Removed
-	debugging message.
-
-2003-05-20  Anna Marie Dirks  <anna@ximian.com>
-
-	* gui/dialogs/save-comp.c (save_component_dialog): Change this
-	dialog from using a gnome_message_box (which has been deprecated), 
-	to using a gtk_message_dialog. This HIG-ifies this dialog, and 
-	fixes bug #42046.
-
-2003-05-20  Hans Petter Jansson  <hpj@ximian.com>
-
-	Fixes #42056
-
-	* gui/e-meeting-time-sel.c (e_meeting_time_selector_construct):
-	Don't create accel groups for menuitem mnemonics. Don't use
-	deprecated functions where we actually need accel groups.
-
-2003-05-19  Dan Winship  <danw@ximian.com>
-
-	* pcs/cal-backend.c (cal_backend_finalize): Don't double-free
-	newly-added categories that the gui hasn't been told about yet.
-	#43321
-
-2003-05-19  Rodrigo Moya <rodrigo@ximian.com>
-
-	* gui/main.c (factory): set 'initialized' to TRUE when initialization
-	is done, or we get the initialization code called over and over.
-
-2003-05-19  Anna Marie Dirks  <anna@ximian.com>
-
-	* gui/e-meeting-time-sel.c:  (e_meeting_time_selector_construct): 
-	Added HIG-blessed padding to (some of) the widgets in the
-	dialog.
-
-	* gui/dialogs/meeting-page.glade: Added HIG-blessed border width
-	and spacing to the meeting page of the event editor.
-
-	* gui/dialogs/schedule-page.glade: Added HIG-blessed border width
-	to the schedule page on the event editor. 
-
-
-2003-05-19  JP Rosevear  <jpr@ximian.com>
-
-	* gui/gnome-cal.c (gnome_calendar_destroy): remove the query time
-	out if its still alive
-	(update_query_timeout): update the query and clear the time out
-	(client_cal_opened_cb): add the query update timeout
-
-2003-05-19  JP Rosevear  <jpr@ximian.com>
-	
-	Fixes #43103
-	
-	* gui/e-day-view.c (e_day_view_init): connect normally instead of
-	after so that our boolean return values afffect the action signal
-	emmissions properly
-	(e_day_view_on_top_canvas_drag_motion): fix proto to be a gboolean
-	(e_day_view_on_main_canvas_drag_motion): ditto
-
-	* gui/e-week-view.c (e_week_view_init): connect normally instead
-	of after so that our boolean return values afffect the action
-	signal emmissions properly
-
-2003-05-16  JP Rosevear  <jpr@ximian.com>
-
-	* gui/dialogs/comp-editor.c (make_title_from_comp): the title is
-	already in UTF-8
-
-2003-05-16  Rodrigo Moya <rodrigo@ximian.com>
-
-	Fixes #42220
-
-	* gui/e-day-view.c (e_day_view_finish_resize): hide canvas items and
-	update internal fields before updating the object.
-
-2003-05-15  JP Rosevear  <jpr@ximian.com>
- 
-	* gui/dialogs/comp-editor.c (comp_editor_finalize): unref the
-	client and the ui component
-	
-2003-05-15  JP Rosevear  <jpr@ximian.com>
- 
- 	Fixes #41935
- 	
-	* gui/e-week-view.c (e_week_view_init): listen for scroll events
-	on the canvas
-	(e_week_view_on_button_press): don't scroll here
-	(e_week_view_on_scroll): scroll here
- 
-	* gui/e-day-view.c (e_day_view_init): listen for scroll events on
-	the time and main canvases
-	(e_day_view_on_main_canvas_button_press): don't scroll here
-	(e_day_view_on_main_canvas_scroll): scroll here
-	(e_day_view_on_time_canvas_scroll): and here
-	
-2003-05-15  JP Rosevear  <jpr@ximian.com>
- 
- 	Fixes #43029
- 	
-	* gui/e-week-view.c (e_week_view_init): don't listen for destroy
-	signal
-	(e_week_view_destroy): check for NULL and make invisible NULL
-	after we destroy it, unref cursors and NULL them out as well,
-	guard against freeing events multiple times
- 
-	* gui/e-day-view.c (e_day_view_destroy): check for NULL and make
-	invisible NULL after we destroy it, unref cursors and NULL them
-	out as well, guard against freeing events multiple times
-	(e_day_view_init): don't listen for destroy signal
- 
-	* gui/e-calendar-table.c (e_calendar_table_init): don't listen for
-	destroy signal
-	(e_calendar_table_destroy): check for NULL and make invisible NULL
-	after we destroy it
-	
-2003-05-15  JP Rosevear	 <jpr@ximian.com>
- 
-	Fixes #41930
-	
-	* idl/evolution-calendar.idl: Make sure everything that can raise
-	a NotFound exception lists it
-	
-2003-05-15  JP Rosevear  <jpr@ximian.com>
-
-	* gui/e-meeting-time-sel.c
-	(e_meeting_time_selector_refresh_free_busy): ref ourselves the
-	number of times we'll get called back
-
-2003-05-14  JP Rosevear  <jpr@ximian.com>
-
-	* gui/e-tasks.c (e_tasks_destroy): guard against multiple destroys
-
-	* cal-client/cal-client.c (cal_client_finalize): unref the
-	bonobo listener
-
-	* gui/gnome-cal.c (gnome_calendar_destroy): guard against multiple
-	destroy calls
-
-	* gui/e-week-view.c (e_week_view_init): connect after destroy
-	(invisible_destroyed): don't unref, its already destroyed
-
-	* gui/e-day-view.c (e_day_view_init): connect after destroy
-	(invisible_destroyed): don't unref, its already destroyed
-
-	* gui/e-calendar-table.c (e_calendar_table_class_init): make sure
-	we set the parent class
-	(e_calendar_table_init): connect after the destroy handler runs
-	(e_calendar_table_destroy): guard against multiple destroys
-	(invisible_destroyed): don't unref the invisible, its already
-	being destroyed
-
-	* gui/calendar-offline-handler.c (backend_cal_set_mode): unref the
-	client, we are done with it now
-	(backend_cal_opened_online): ditto
-	(impl_dispose): unref our main client
-
-	* gui/calendar-commands.c (control_util_set_folder_bar_label):
-	release/unref the shell view once we are done with it
-	(control_util_show_settings): ditto
-
-2003-05-13  Rodrigo Moya <rodrigo@ximian.com>
-
-	* gui/alarm-notify/alarm-queue.c (notify_dialog_cb): fixed memory
-	leak introduced by previous commit.
-
-2003-05-12  Rodrigo Moya <rodrigo@ximian.com>
-
-	Fixes #41760
-
-	* gui/alarm-notify/alarm-queue.c (create_snooze): don't add a new
-	alarm, but update the already existing one.
-	(notify_dialog_cb): make sure we don't remove the alarm if we are
-	snoozing.
-	
-2003-05-07  JP Rosevear  <jpr@ximian.com>
-
-	* gui/dialogs/task-page.glade: fix button conversion problem
-
-	* gui/dialogs/task-details-page.c
-	(task_details_page_fill_widgets): only free the percent if its
-	non-null
-
-2003-05-07  Rodrigo Moya <rodrigo@ximian.com>
-
-	* cal-client/cal-client.c (cal_client_discard_alarm): added missing
-	assignment.
-
-2003-05-05  JP Rosevear  <jpr@ximian.com>
-
-	Fixes #41811
-	
-	* gui/alarm-notify/Makefile.am: don't dist idl generated files
-
-2003-05-01  JP Rosevear  <jpr@ximian.com>
-
-	* gui/dialogs/task-editor.c (task_editor_finalize): unref the
-	model again
-	(task_editor_edit_comp): don't allow editing if the assignee has
-	delegated
-
-	* gui/dialogs/meeting-page.c (popup_delete_cb): set the new
-	non-delegator to be editable
-
-	* gui/dialogs/event-editor.c (event_editor_edit_comp): don't allow
-	editing if the attendee has delegated
-	(event_editor_finalize): unref the model again
-
-	* gui/e-meeting-model.c: remove e-table-without related functions
-	(finalize): don't create without table
-	(e_meeting_model_etable_from_model): build the table with this as
-	model
-	(e_meeting_model_etable_model_to_view_row): directly use the
-	model_to_view call
-	(e_meeting_model_etable_view_to_model_row): as above
-	(attendee_changed_cb): make sure pre change is alwasy called
-
-	* gui/e-meeting-model.h: use DECLS, remove protos for long dead
-	functions, don't include config.h
-
-2003-04-30  Rodrigo Moya <rodrigo@ximian.com>
-
-	* gui/alarm-notify/alarm-notify.c (alarm_notify_add_calendar): removed
-	unused code.
-	
-2003-04-29  JP Rosevear  <jpr@ximian.com>
-
-	* gui/dialogs/task-editor.c (task_editor_finalize): ditto
-
-	* gui/dialogs/event-editor.c (event_editor_finalize): don't unref
-	the model here
-
-	* gui/e-meeting-time-sel.c (e_meeting_time_selector_destroy): null
-	up the display_top and display_main for re-entrancy purposes
-
-2003-04-25  JP Rosevear  <jpr@ximian.com>
-
-	* gui/itip-utils.c (itip_send_comp): kill warnings
-
-2003-04-28  Anna Marie Dirks  <anna@ximian.com>
-
-	* gui/dialogs/alarm-options.glade: Added HIG-blessed padding
-	to the alarm options dialog. Fixes bug #41221.
-
-2003-04-28  Anna Marie Dirks  <anna@ximian.com>
-
-	* gui/dialogs/cal-prefs-dialog.glade: Added appropriate spacing
-	and padding to the calendar/tasks page of the settings dialog. 
-	Fixes bug #41129
-
-
-2003-04-28  Anna Marie Dirks  <anna@ximian.com>
-	
-	* gui/dialogs/task-page.glade: Finishes up fixing #41256 by
-	adding appropriate spacing/padding to the main task page.
-
-	* gui/dialogs/task-details-page.glade: Added appropriate
-	spacing and padding to the task-details page. Partially 
-	fixes #41256.
-
-
-2003-04-28  Anna Marie Dirks  <anna@ximian.com>
-
-	* gui/dialogs/recurrence-page.glade: Added padding/spacing
-	to this page as specified by the HIG. Partially fixes #41215.
-
-	* gui/dialogs/alarm-page.glade: Added padding/spacing/stock 
-	buttons to the alarm page. Partially fixes #41215.
-
-	* gui/dialogs/event-page.glade: Added padding/spacing to the
-	event-page (partially fixes #41215)
-
-
-2003-04-27  Rodney Dawes  <dobey@ximian.com>
-
-	Fixes #35814
-	
-	* gui/calendar-component.c: Change mnemonic/keybinding for
-	New Meeting to not conflict with other items in the File->New menu
-	
-2003-04-24  Rodrigo Moya <rodrigo@ximian.com>
-
-	Fixes #41661
-
-	* idl/evolution-calendar.idl: added discardAlarm method to
-	GNOME:Evolution:Calendar:Cal interface.
-
-	* pcs/cal.c (cal_class_init): set new epv's method.
-	(impl_Cal_discardAlarm): implementation of new CORBA method.
-
-	* pcs/cal-backend.[ch]: added 'discard_alarm' virtual method, and
-	CAL_BACKEND_RESULT_NOT_IMPLEMENTED to CalBackendResult enum.
-	(cal_backend_class_init): initialize new class method.
-	(cal_backend_discard_alarm): new method.
-	(cal_backend_update_objects, cal_backend_remove_object): return
-	proper CalBackendResult values.
-
-	* pcs/cal-backend-file.c (cal_backend_file_class_init): initialize
-	new class method.
-	(cal_backend_file_discard_alarm): implementation of new method.
-	
-	* pcs/cal-client.[ch] (cal_client_discard_alarm): new function.
-
-	* gui/alarm-notify/alarm-queue.c (remove_qeueud_alarm): don't remove
-	the alarm directly from the component, call cal_client_discard_alarm
-	and let the backend deal with it.
-
-2003-04-24  JP Rosevear  <jpr@ximian.com>
- 
- 	* gui/apps_evolution_calendar.schemas: set the hpane default to
- 	32000 so we never see a pane no matter the start up window size
- 	unless the user changes it
-
-2003-04-24  JP Rosevear  <jpr@ximian.com>
-
-	Fixes #37552
-	
-	* gui/dialogs/Makefile.am: build delete-error.[hc]
-
-	* gui/e-tasks.c: wrap calls to cal_client_remove_object with
-	delete_error_dialog
-
-	* gui/e-itip-control.c: ditto
-
-	* gui/e-calendar-table.c: ditto
-
-	* gui/e-week-view.c: ditto
-
-	* gui/e-day-view.c: ditto
-
-	* gui/dialogs/delete-error.[hc]: gemerate an error message based
-	on result
-
-2003-04-23  Rodrigo Moya <rodrigo@ximian.com>
-
-	* gui/e-day-view.c (e_day_view_on_delete_occurrence): removed
-	unused variable..
-
-2003-04-23  Hans Petter Jansson  <hpj@ximian.com>
-
-	Fixes #41641
-
-	* gui/e-day-view.c (e_day_view_focus_in): Remove assert an old
-	input method code.
-	(e_day_view_focus_out): Ditto.
-	(e_day_view_reshape_long_event): Set input method context.
-	(e_day_view_reshape_day_event): Ditto.
-	(e_day_view_on_editing_started): Let EText handle the context popup.
-	(e_day_view_on_editing_stopped): Turn off EText's handling of context
-	popup.
-
-	* gui/e-week-view.c (e_week_view_reshape_event_span): Set input
-	method context.
-	(e_week_view_on_text_item_event): Let the EText item handle
-	right-click context popup if we're editing it.
-	(e_week_view_on_editing_started): Let the EText item handle the
-	context popup.
-	(e_weeK_view_on_editing_stopped): Turn off EText's handling of
-	context popup.
-
-2003-04-23  Rodrigo Moya <rodrigo@ximian.com>
-
-	Fixes #41671
-
-	* gui/alarm-notify/notify-main.c (main): added calls to gnome_sound_init
-	and gnome_sound_shutdown.
-
-	* gui/alarm-notify/alarm-queue.c (audio_notification): check that the
-	sound file exists, and gdk_beep if not.
-
-2003-04-22  Rodrigo Moya <rodrigo@ximian.com>
-
-	Fixes part of #41148, #41216 and #41235
-
-	* gui/e-itip-control.c (init):
-	* gui/e-meeting-time-sel.c (e_meeting_time_selector_construct,
-	  e_meeting_time_selector_add_key_color):
-	* gui/e-timezone-entry.c (e_timezone_entry_init):
-	* gui/gnome-cal.c (setup_widgets):
-	* gui/tasks-control.c (confirm_expunge):
-	* gui/dialogs/comp-editor.c (setup_widgets):
-	* gui/dialogs/e-delegate-dialog.c (e_delegate_dialog_construct):
-	* gui/dialogs/meeting-page.c (meeting_page_construct):
-	* gui/dialogs/recurrence-page.c (make_weekly_special,
-	  make_monthly_special, make_ending_count_special):
-	* gui/dialogs/schedule-page.c (schedule_page_construct):
-	use HIG-suggested spacing.
-
-2003-04-21  Rodrigo Moya <rodrigo@ximian.com>
-
-	Fixes #22444
-
-	* gui/calendar-commands.c: added new verbs for occurrence-related
-	menu items.
-	(delete_occurrence_cmd): added callback for "Delete this occurrence"
-	menu item. "Delete all occurrences" is just the same as "Delete".
-	(sensitize_calendar_commands): sensitive ocurrence-related menu items.
-
-	* gui/gnome-cal.[ch] (gnome_calendar_delete_selected_occurrence): new
-	function.
-	(gnome_calendar_get_current_view_widget): made this public.
-
-	* gui/e-week-view.[ch] (e_week_view_get_selected_event):
-	(e_week_view_delete_occurrence): new functions.
-	(e_week_view_delete_occurrence_internal): real implementation of the
-	'Delete Occurrence' logic.
-	(e_week_view_on_delete_occurrence): call delete_instance_internal.
-
-	* gui/e-day-view.[ch] (e_day_view_get_selected_event):
-	(e_day_view_delete_occurrence): new functions.
-	(e_week_view_delete_occurrence_internal): real implementation of the
-	'Delete Occurrence' logic.
-	(e_week_view_on_delete_occurrence): call delete_occurrence_internal.
-
-2003-04-18  Rodrigo Moya <rodrigo@ximian.com>
-
-	* gui/alarm-notify/alarm-notify.glade: removed 'heading' and
-	'message' labels.
-
-	* gui/alarm-notify/alarm-notify-dialog.c: removed deleted widgets.
-	(alarm_notify_dialog): don't load the removed widgets.
-
-2003-04-18  Rodney Dawes  <dobey@ximian.com>
-
-	Fixes #21499
-
-	* gui/Makefile.am:
-	* gui/calendar-commands.c:
-	* gui/tasks-control.c:
-	* gui/dialogs/Makefile.am:
-	* gui/dialogs/comp-editor.c:
-	Use PREFIX instead of EVOLUTION_DATADIR for bonobo_ui_util_set_ui ()
-	
-2003-04-17  JP Rosevear  <jpr@ximian.com>
-
-	Fixes #41459
-	
-	* gui/dialogs/meeting-page.c: comment out delegation stuff
-
-2003-04-17  Rodrigo Moya <rodrigo@ximian.com>
-
-	Fixes #34498
-
-	* gui/alarm-notify/alarm-queue.c: added a 'uid' field to the
-	CompQueuedAlarms structure.
-	(remove_queued_alarm): free the 'uid' field when freeing the
-	structure.
-	(add_component_alarms): g_strdup the component's UID and use that as
-	the key for the hash table.
-
-2003-04-16  Rodrigo Moya <rodrigo@ximian.com>
-
-	Fixes #41129, #41215, #41221, #41256
-
-	* gui/alarm-notify/alarm-notify.glade:
-	* gui/dialogs/alarm-options.glade:
-	* gui/dialogs/alarm-page.glade:
-	* gui/dialogs/cal-prefs-dialog.glade:
-	* gui/dialogs/e-delegate-dialog.glade:
-	* gui/dialogs/meeting-page.glade:
-	* gui/dialogs/recurrence-page.glade:
-	* gui/dialogs/schedule-page.glade:
-	* gui/dialogs/task-details-dialog.glade:
-	* gui/dialogs/task-page.glade:
-	* gui/dialogs/event-page.glade: set spacing to 6 pixels
-	everywhere.
-
-2003-04-16  JP Rosevear  <jpr@ximian.com>
- 
-	Fixes #41230
- 	
- 	* gui/e-itip-control.c (show_current): make sure to pass TRUE for
- 	tasks
- 	(start_calendar_server): make sure we don't gtk_main_quit if we
- 	haven't gtk_main'ed
- 	(start_calendar_server_cb): ditto
-
-2003-04-15  JP Rosevear  <jpr@ximian.com>
-
-	Fixes #39735 and 40257
-	
-	* gui/gnome-cal.c: convert float pane positions to ints
-	(setup_widgets): set the initial position after realization and
-	track the drags to get the new position, pack the panes slightly
-	differently
-	(gnome_calendar_set_pane_positions): set purely pixel oriented
-	positions
-	(gnome_calendar_update_config_settings): no need to update quanta
-	setting
-	(gnome_calendar_hpane_realized): realization callback
-	(gnome_calendar_vpane_realized): ditto
-	(gnome_calendar_vpane_resized): resize callback, store new size
-	(gnome_calendar_hpane_resized): ditto
-
-	* gui/calendar-model.c (get_due_status): handle an error getting
-	the timezone
-
-	* gui/calendar-config.c (calendar_config_get_hpane_pos): return an int
-	(calendar_config_set_hpane_pos): take an int
-	(calendar_config_get_vpane_pos): return an int
-	(calendar_config_set_vpane_pos): take an int
-
-	* gui/calendar-config.h: update protos
-
-	* gui/apps_evolution_calendar.schemas: update defaults for pane
-	positions
-
-2003-04-15  Hans Petter Jansson  <hpj@ximian.com>
-
-	* gui/calendar-component.c (owner_set_cb): If we already have an
-	evolution_dir, free the old one before setting it anew.
-
-	* gui/e-day-view-time-item.c (e_day_view_time_item_draw): Unref the
-	metrics.
-
-	* gui/e-day-view.c (e_day_view_style_set): Unref the metrics.
-	(e_day_view_recalc_cell_sizes): We don't need font metrics here.
-	(e_day_view_reshape_long_event): Ditto.
-
-	* gui/e-meeting-model.c (init): Don't dup the string passed to
-	e_table_without_hide().
-
-	* gui/e-meeting-time-sel.c (e_meeting_time_selector_style_set):
-	Unref the metrics.
-	(e_meeting_time_selector_recalc_date_form): Doesn't need metrics.
-
-	* gui/e-week-view-main-item.c (e_week_view_main_item_draw_day):
-	Unref the metrics.
-
-	* gui/e-week-view.c (e_week_view_style_set): Unref metrics.
-	(e_week_view_recalc_cell_sizes): Ditto.
-	(e_week_view_reshape_event_span): Move Pango stuff to where it
-	can't be leaked due to an early return. Unref metrics.
-
-	* gui/weekday-picker.c (weekday_picker_style_set): Unref metrics.
-
-	* gui/dialogs/meeting-page.c (meeting_page_finalize): Free default
-	address.
-
-2003-04-11  Dan Winship  <danw@ximian.com>
-
-	* gui/dialogs/Makefile.am (IDL_GENERATED, etc): Oops. Add this
-	back. Turns out it's still needed by other parts.
-
-2003-04-11  Dan Winship  <danw@ximian.com>
-
-	* gui/dialogs/task-page.glade: Remove the "Contacts" button and
-	entry from here too. Supposed to have been part of #35926
-
-	* gui/dialogs/task-page.c: Remove all code pertaining to the
-	contacts button
-
-	* gui/dialogs/comp-editor-util.c: 
-	* gui/dialogs/comp-editor-util.h: Likewise
-
-	* gui/dialogs/Makefile.am (IDL_GENERATED, etc): Remove
-	select-names stuff, which is no longer used.
-
-2003-04-11  Rodrigo Moya <rodrigo@ximian.com>
-
-	* cal-util/cal-util.h: added missing capabilities.
-
-	* cal-client/cal-client.c (cal_client_get_one_alarm_only,
-	  cal_client_get_organizer_must_attend,
-	  cal_client_get_save_schedules):
-	* gui/itip-utils.c (itip_organizer_is_user):
-	* gui/e-calendar-table.c (e_calendar_table_on_right_click):
-	* gui/dialogs/task-editor.c (set_menu_sens):
-	* gui/dialogs/event-page.c (event_page_fill_widgets):
-	* gui/dialogs/meeting-page.c (meeting_page_fill_widgets):
-	* gui/dialogs/alarm-page.c (button_options_clicked_cb): use the macros
-	defined in cal-util.h for static capabilities.
-
-2003-04-11  JP Rosevear  <jpr@ximian.com>
-
-	* gui/e-meeting-model.c (start_addressbook_server): load the
-	default book to look for additional free/busy info in
-	(init): ugly hack to make sure we get destroyed, set idle id to 0
-	(process_callbacks): unref the im because we are now done with it
-	(refresh_busy_periods): set idle id to 0, ref the model and handle
-	e_book_get_cursor error
-
-2003-04-11  JP Rosevear  <jpr@ximian.com>
-	
-	* gui/e-meeting-time-sel-item.c
-	(e_meeting_time_selector_item_destroy): guard against multiple
-	destroy calls
-
-2003-04-11  JP Rosevear  <jpr@ximian.com>
-	
-	* cal-client/cal-client.c (cal_client_get_free_busy): only print a
-	message if the exception isn't the reasonable NotFound
-
-2003-04-11  JP Rosevear  <jpr@ximian.com>
-	
-	* gui/dialogs/schedule-page.c (schedule_page_finalize): unref the
-	main widget since we ref it when we un-parent it
-
-	* gui/dialogs/alarm-page.c (alarm_page_finalize): ditto
-
-	* gui/dialogs/task-page.c (task_page_finalize): ditto
-
-	* gui/dialogs/event-page.c (event_page_finalize): ditto
-
-	* gui/dialogs/task-details-page.c (task_details_page_finalize):
-	ditto
-
-	* gui/dialogs/recurrence-page.c (recurrence_page_finalize): ditto
-
-	* gui/dialogs/meeting-page.c (meeting_page_finalize): ditto
-
-2003-04-10  Rodrigo Moya <rodrigo@ximian.com>
-
-	* gui/e-meeting-time-sel.c
-	(e_meeting_time_selector_options_menu_position_callback):
-	(e_meeting_time_selector_autopick_menu_position_callback): added the
-	allocation's X and Y position to the calculated coordinates.
-
-2003-04-10  JP Rosevear  <jpr@ximian.com>
-
-	Fixes #41127
-	
-	* gui/e-meeting-time-sel.c (e_meeting_time_selector_refresh_cb):
-	unref here, when the callback is done
-	(e_meeting_time_selector_refresh_free_busy): don't unref here
-
-	* gui/e-meeting-model.c (process_free_busy): if the type is
-	unexpected, make sure we cleanup properly
-
-2003-04-10  Rodrigo Moya <rodrigo@ximian.com>
-
-	* gui/alarm-notify/alarm-queue.c (remove_queued_alarm): only remove
-	the alarm for backends that want it (Exchange).
-
-2003-04-10  Rodrigo Moya <rodrigo@ximian.com>
-
-	* cal-util/cal-util.h: added #define's for static capabilities.
-
-	* pcs/cal-backend-file.c (cal_backend_file_get_static_capabilities):
-	use the #define's above.
-
-2003-04-09  Chris Toshok  <toshok@ximian.com>
-
-	Fixes #40133
-	
-	* pcs/cal-backend.c (cal_backend_class_init): use G_TYPE_INT
-	instead of G_TYPE_ENUM as a parameter type for the signal to get
-	rid of runtime warning.
-
-2003-04-09  JP Rosevear  <jpr@ximian.com>
-
-	Fixes #40915
-	
-	* gui/calendar-model.c (get_due_status): when getting the current
-	time for date values, use a timezone aware function
-
-2003-04-09  JP Rosevear  <jpr@ximian.com>
-	
-	Fixes #40952
-	
-	* pcs/cal-backend-file.c (cal_backend_file_open): check for file
-	method instead of is_local
-
-2003-04-08  JP Rosevear  <jpr@ximian.com>
-
-	Fixes #40894
-	
-	* gui/gnome-cal.c
-	(gnome_calendar_on_date_navigator_selection_changed): update the
-	selection for all view types
-
-2003-04-08  Ettore Perazzoli  <ettore@ximian.com>
-
-	* gui/dialogs/alarm-options.c: Remove button_ok, button_cancel,
-	canceled members from struct Dialog.
-	(get_widgets): Do not initialize.
-	(close_dialog): Destroy the toplevel.
-	(toplevel_delete_event_cb): Removed.
-	(button_cancel_clicked_cb): Removed.
-	(button_ok_clicked_cb): Removed.
-	(close_dialog): Removed.
-	(alarm_options_dialog_run): Use gtk_dialog_run.
-	(init_widgets): Do not init ->canceled, do not connect OK/Cancel
-	buttons.
-	(alarm_to_dialog): No need to make the file entry modal from here
-	anymore.
-
-	* gui/dialogs/alarm-options.glade: Turned into a GtkDialog.  Set
-	the "modal" property to True for the file entry.
-
-2003-04-07  Hans Petter Jansson  <hpj@ximian.com>
-
-	Fixes #35926.
-
-	* gui/dialogs/event-page.glade: Remove contacts entry/chooser.
-
-	* gui/dialogs/event-page.c: Remove contacts entry/chooser.
-	(event_page_init): Remove references.
-	(event_page_finalize): Ditto.
-	(event_page_fill_widgets): Ditto.
-	(event_page_fill_component): Ditto.
-	(get_widgets): Ditto.
-	(init_widgets): Ditto.
-	(contacts_clicked_cb): Remove wholesale.
-	(contacts_changed_cb): Ditto.
-
-2003-04-07  JP Rosevear  <jpr@ximian.com>
-
-	Fixes #40876
-	
-	* gui/e-meeting-time-sel.c
-	(e_meeting_time_selector_refresh_free_busy): guard against
-	callbacks after destruction
-	(e_meeting_time_selector_refresh_cb): ditto
-
-2003-04-07  JP Rosevear  <jpr@ximian.com>
-	
-	* gui/dialogs/event-page.glade: create buttons properly
-
-	* gui/itip-utils.c (comp_server_send): for errors other than busy,
-	we want to email the results
-
-	* pcs/cal-backend.c (cal_backend_ref_categories): insert the new
-	category in the category list as well
-	(idle_notify_categories_changed): reset idle id
-
-2003-04-07  Not Zed  <NotZed@Ximian.com>
- 
- 	Fixes #40252
- 
- 	* conduits/todo/todo-conduit.c: Same as below.
- 
- 	* conduits/calendar/calendar-conduit.c: Change the LOG macro to a
- 	single arg macro which copies its arg.  Fix all callers.  Change
- 	WARN and INFO to simply g_warning/g_message.  Init G_LOG_DOMAIN
- 	before including anything.
-	
-2003-04-07  Dan Winship  <danw@ximian.com>
-
-	* gui/GNOME_Evolution_Calendar.server.in.in: Clean up server names
-
-	* gui/alarm-notify/GNOME_Evolution_Calendar_AlarmNotify.server.in.in: 
-	Likewise
-
-	* importers/GNOME_Evolution_Calendar_Importer.server.in.in:
-	Likewise. Also mark the evolution:menu_name for i18n
-
-2003-04-07  Hans Petter Jansson  <hpj@ximian.com>
-
-	* gui/e-meeting-attendee.[ch]: GObjectify. Eliminates ref/sink
-	warnings from the meeting editor.
-
-2003-04-06  Hans Petter Jansson  <hpj@ximian.com>
-
-	Week view part of fix for #39895.
-
-	* gui/e-week-view-main-item.c (e_week_view_main_item_draw_day):
-	Use the UNFOCUSSED colour if we're not focused, rather than not
-	drawing anything.
-
-	* gui/e-week-view.c: Set up the UNFOCUSSED colour.
-
-	* gui/e-week-view.h: Add the UNFOCUSSED colour.
-
-2003-04-04  JP Rosevear  <jpr@ximian.com>
-
-	Fixes #40790
-	
-	* gui/alarm-notify/alarm-queue.c (procedure_notification_dialog):
-	return based on the response code (not old button stuff)
-
-2003-04-04  Ettore Perazzoli  <ettore@ximian.com>
-
-	* gui/dialogs/alarm-options.c (alarm_to_dialog): Make the file
-	entry modal.  [#40792]
-  
-2003-04-04  JP Rosevear  <jpr@ximian.com>
-	
-	Fixes #40789
-	
-	* gui/dialogs/alarm-options.c (alarm_to_dalarm_widgets):
-	description is a text buffer
-	(alarm_to_malarm_widgets): ditto
-	(dalarm_widgets_to_alarm): ditto
-	(malarm_widgets_to_alarm): ditto
-	(alarm_to_repeat_widgets): check repeat status correctly
-
-2003-04-04  Dan Winship  <danw@ximian.com>
-
-	* gui/e-itip-control.c (write_html): Don't free static string.
-
-2003-04-04  JP Rosevear  <jpr@ximian.com>
-
-	* gui/cal-search-bar.c (cal_search_bar_destroy): guard against
-	multiple destroy calls
-
-2003-04-04  JP Rosevear  <jpr@ximian.com>
-	
-	* cal-client/cal-client.c (get_default_uri): guard against empty
-	uri as well
-
-2003-04-04  JP Rosevear  <jpr@ximian.com>
-	
-	Fixes #40722
-	
-	* gui/e-meeting-time-sel.c (e_meeting_time_selector_destroy):
-	guard against multiple destroy calls
-
-2003-04-02  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* gui/control-factory.c (set_prop): Add a check to see if the view
-	should be the day-view and change the default to be whatever
-	calendar_config_get_default_view() returns. Should fix bug #39735.
-
-	* gui/calendar-config.h: calendar_config_write() and
-	calendar_config_write_on_exit() no longer exist. Removed
-	prototypes.
-
-	* gui/control-factory.c (set_prop): g_strcasecmp() is
-	deprecated. Since the values can never be anything other than all
-	lowercase anyway, just use strcmp.
-
-2003-04-02  Rodrigo Moya <rodrigo@ximian.com>
-
-	Fixes #39262
-	
-	* importers/icalendar-importer.c (load_file_fn, vcal_load_file_fn):
-	use folder_type argument to determine what to import.
-	
-2003-04-02  Rodrigo Moya <rodrigo@ximian.com>
-
-	* importers/icalendar-importer.c (load_file_fn, vcal_load_file_fn):
-	added "folder_type" parameter to EvolutionImporterLoadFileFn.
-	
-2003-04-02  JP Rosevear  <jpr@ximian.com>
-
-	Fixes #39955
-	
-	* gui/itip-utils.c (comp_sentby): don't unref the the account
-
-2003-04-02  Rodrigo Moya <rodrigo@ximian.com>
-
-	Fixes #40661
-	
-	* gui/itip-utils.c: added missing header for Forte compilation.
-
-2003-04-01  Hans Petter Jansson  <hpj@ximian.com>
-
-	* gui/e-day-view-main-item.c (e_day_view_main_item_draw):
-	Nuke GdkFont and use Pango's font measuring.
-
-	* gui/e-day-view-time-itme.c (e_day_view_time_item_get_column_width)
-	(e_day_view_time_item_draw): Ditto.
-
-	* gui/e-day-view-top-item.c (e_day_view_top_item_draw)
-	(e_day_view_top_item_draw_long_event): Ditto.
-
-	* gui/e-day-view.c (e_day_view_style_set)
-	(e_day_view_recalc_cell_sizes)
-	(e_day_view_reshape_long_event)
-	(e_day_view_update_top_canvas_drag)
-	(e_day_view_update_main_canvas_drag): Ditto.
-
-	* gui/e-meeting-time-sel.c (e_meeting_time_selector_style_set)
-	(e_meeting_time_selector_recalc_date_form): Ditto.
-
-	* gui/e-week-view-event-item.c (e_week_view_draw_time): Ditto.
-
-	* gui/e-week-view-main-item.c (e_week_view_main_item_draw_day):
-	Ditto.
-
-	* gui/e-week-view-titles-item.c (e_week_view_titles_item_draw):
-	Ditto.
-
-	* gui/e-week-view.c (e_week_view_style_set)
-	(e_week_view_recalc_cell_sizes)
-	(e_week_view_reshape_event_span): Ditto.
-
-	* gui/weekday-picker.c (weekday_picker_style_set): Ditto.
-
-2003-04-01  JP Rosevear  <jpr@ximian.com>
-
-	Fix for #17231 (Evo portion)
-	
-	* conduits/todo/todo-conduit.c (comp_from_remote_record): test for
-	secret flag properly
-
-	* conduits/calendar/calendar-conduit.c (comp_from_remote_record):
-	ditto
-
-2003-04-01  Rodrigo Moya <rodrigo@ximian.com>
-
-	* importers/icalendar-importer.c (load_file_fn, vcal_load_file_fn):
-	added filename (tasks.ics/calendar.ics) to the URI if it does not
-	contain it.
-
-2003-03-31  Rodrigo Moya <rodrigo@ximian.com>
-
-	Fixes #39961
-
-	* gui/e-meeting-time-sel.c
-	(e_meeting_time_selector_options_menu_position_callback):
-	(e_meeting_time_selector_autopick_menu_position_callback): use the
-	button's allocation to position the popup menu.
-
-2003-03-29  Not Zed  <NotZed@Ximian.com>
-
-	Fixes #39895
-
-	* gui/e-day-view.h (EDayViewColors): add an unfocussed colour to
-	draw the selection in when we're not focussed.
-
-	* gui/e-day-view.c (e_day_view_realize): Initialise
-	E_DAY_VIEW_COLOR_BG_SELECTED_UNFOCUSSED to be 1/2 saturation of
-	the focussed colour.
-
-	* gui/e-day-view-main-item.c (e_day_view_main_item_draw): Use the
-	UFOCUSSED colour if we aren't focussed, rather than just not
-	drawing anything.
-
-2003-03-28  JP Rosevear  <jpr@ximian.com>
-
-	* gui/e-itip-control.c (get_servers): the shell client is a
-	g_object now, ref appropriately
-
-2003-03-28  Hans Petter Jansson  <hpj@ximian.com>
-
-	* gui/e-day-view.c (comp_destroy_cb)
-	(e_day_view_on_long_event_button_press)
-	(e_day_view_on_event_button_press)
-	(e_day_view_on_long_event_click)
-	(e_day_view_on_event_click)
-	(e_day_view_on_event_double_click)
-	(e_day_view_on_delete_appointment): Hold weak references to the
-	CalComponent instead of connecting to the "destroy" signal.
-
-	* gui/e-week-view.c (comp_destroy_cb)
-	(e_week_view_on_text_item_event): Ditto.
-
-2003-03-28  Hans Petter Jansson  <hpj@ximian.com>
-
-	Fixes #39954
-	
-	* gui/dialogs/recurrence-page.c (make_recurrence_special):
-	Destroy would-be children of the container before the container.
-
-2003-03-28  JP Rosevear  <jpr@ximian.com>
-	
-	* gui/dialogs/meeting-page.c (meeting_page_init): init new members
-	(get_current_account): get a matching account for the currently
-	selected user in the combo
-	(meeting_page_finalize): unref the meeting attendee if there is
-	one
-	(meeting_page_fill_widgets): don't set the combo list here
-	(clear_widgets): set the default organizer here and if we don't
-	have an organizer, add the default organizer as an attendee
-	(meeting_page_fill_component): use get_current_account
-	(org_changed_cb): if this is a new meeting and the organizer
-	changes, change the attendee
-	(change_clicked_cb): no need to set the default here
-	(init_widgets): reflect changed callback name
-	(meeting_page_construct): set the combo strings here
-	(popup_delete_cb): remove the organizer attendee if the user
-	explicitly deletes it
-
-	* gui/e-meeting-model.c (attendee_changed_cb): set row properly
-
-	* gui/itip-utils.c (comp_to_list): skip the user themselves if
-	cancelling or requesting
-
-2003-03-26  Rodrigo Moya <rodrigo@ximian.com>
-
-	* importers/icalendar-importer.c (gnome_calendar_import_data_fn): use
-	g_object_unref for CalClient's.
-	(create_checkboxes_control): use g_signal_connect.
-
-	* cal-client/cal-client.c (cal_client_get_load_state): return correct
-	values in g_return_val_if_fail.
-
-2003-03-26  Jack Jia <jack.jia@sun.com>
-
-	* calendar/gui/dialogs/alarm-options.c
-	(malarm_widgets_to_alarm): add a parameter(TC_CORBA_string) to
-	the bonobo_widget_get_property.
-	
-2003-03-25  Dan Winship  <danw@ximian.com>
-
-	* gui/itip-utils.c: Update for e_notice move
-
-	* gui/tasks-control.c (confirm_expunge): Move the code that used
-	to be e_gnome_dialog_set_parent here, since it was marked
-	deprecated and this was the only place using it.
-
-	* gui/dialogs/comp-editor.c: Update for e_notice move
-	(page_changed_cb, page_summary_changed_cb, page_dates_changed_cb):
-	Pass a parent_window to e_notice.
-
-	* gui/dialogs/meeting-page.c: Update for e_notice move.
-	(meeting_page_fill_component, meeting_page_fill_component,
-	popup_delegate_cb): Pass a parent_window to e_notice
-
-2003-03-25  Dan Winship  <danw@ximian.com>
-
-	* cal-util/cal-util.c (cal_util_parse_ics_file): Utility wrapper
-	around icalparser.
-
-	* cal-util/test-recur.c (main): Use it
-
-	* pcs/cal-backend-file.c (open_cal): Likewise
-
-	* gui/comp-editor-factory.c (open_client): Add the OpenClient to
-	the hash before calling cal_client_open_calendar, since in some
-	failure cases, that will call cal_opened_cb (which will free the
-	oc) with a failure immediately, causing a crash if we then try to
-	deref it.
-
-2003-03-21  JP Rosevear  <jpr@ximian.com>
-
-	Fixes #32248
-	
-	* conduits/todo/todo-conduit.c (comp_from_remote_record): make
-	sure the due date is actually a date
-
-2003-03-21  JP Rosevear  <jpr@ximian.com>
-	
-	Fixes #31660
-	
-	* conduits/calendar/calendar-conduit.c (rrules_mostly_equal):
-	check if the rrules are equal other than until/count
-	(find_last_cb): update the data with the start timet
-	(local_record_from_comp): handle the case where the recurrence
-	rule ends after a certain number occurrences
-	(comp_from_remote_record): same
-
-2003-03-20  JP Rosevear  <jpr@ximian.com>
-
-	* conduits/calendar/calendar-conduit.c
-	(e_calendar_context_destroy): calcomponents are gobjects now
-	(calconduit_load_configuration): ref and sink to avoid warnings
-
-	* conduits/todo/todo-conduit.c (todoconduit_load_configuration):
-	ref and sink to avoid warnings
-	(e_todo_context_destroy): calcomponents are gobjects now
-
-2003-03-20  Rodrigo Moya <rodrigo@ximian.com>
-
-	* gui/dialogs/cancel-comp.c (cancel_component_dialog): use a
-	GtkMessageDialog and deal correctly with the dialog's reponses.
-
-2003-03-20  Rodrigo Moya <rodrigo@ximian.com>
-
-	Fixes #39770
-
-	* gui/itip-utils.c (itip_Send_comp): check the CORBA exception instead
-	of the g_return_val_if_fail. Also, use a CORBA_Object for the value
-	returned from bonobo_activation_activate_from_id.
-
-2003-03-20  Rodrigo Moya <rodrigo@ximian.com>
-
-	* importers/ical-importer.c: removed activation of shell_client.
-	(importer_destroy_cb): no need to unref shell_client.
-	(connect_to_shell): removed.
-	(ical_importer_new, vcal_importer_new): don't call connect_to_shell.
-
-2003-03-20  Rodrigo Moya <rodrigo@ximian.com>
-
-	* importers/ical-importer.c (get_uri_from_folder_path): removed.
-	(load_file_fn, vcal_load_file_fn): use physical_uri instead of
-	folderpath.
-
-2003-03-19  Ettore Perazzoli  <ettore@ximian.com>
-
-	* importers/GNOME_Evolution_Calendar_Importer.server.in.in:
-	Replace "evolution:menu-name" prop with "evolution:menu_name".
-	[#39692]
-
-2003-03-18  Rodrigo Moya <rodrigo@ximian.com>
-
-	* gui/dialogs/send-comp.c (send_component_dialog): use GtkMessageDialog
-	instead of gnome_question_dialog, and deal correctly with the dialog's
-	response.
-
-2003-03-18  Rodrigo Moya <rodrigo@ximian.com>
-
-	Fixes #34505
-
-	* gui/alarm-notify/alarm-queue.c (remove_queued_alarm): added removal
-	of the alarm itself in the calendar if the (new) argument says so.
-	Also, set expecting_update flag to TRUE.
-	(add_component_alarms): initialize expecting_update to FALSE.
-	(remove_alarms): don't remove the component if expecting_update is
-	TRUE.
-	(obj_updated_cb, notify_dialog_cb, procedure_notification): adapted
-	to changes in remove_queued_alarm.
-	
-2003-03-17  Hans Petter Jansson  <hpj@ximian.com>
-
-	Fixes #34095
-
-	* gui/e-meeting-model.c (append_row): Don't leak meeting attendees;
-	unref the attendee after it's assigned to model.
-
-	* gui/dialogs/meeting-page.c (meeting_page_destroy): Free the actual
-	array of deleted attendees.
-
-	* gui/dialogs/event-editor.c (event_editor_destroy): Free the private
-	structure.
-
-	* gui/itip-utils.c (comp_description): Rework free/busy information
-	composer so we can free date/time information after use. Then free it.
-	(itip_send_comp): Free the allocated CORBA buffer for attachment data.
-
-	* gui/dialogs/comp-editor-util.c (comp_editor_contacts_to_component):
-	Free the destination contacts string once we're done with it.
-
-	* gui/e-calendar-table.c (invisible_destroyed): Unref the invisible.
-
-	* gui/e-day-view.c (invisible_destroyed): Ditto.
-
-	* gui/e-week-view.c (invisible_destroyed): Ditto.
-
-2003-03-17  Hans Petter Jansson  <hpj@ximian.com>
-
-	Fixes #39757
-
-	* gui/dialogs/alarm-page.c (sensitize_buttons): Somehow this code
-	reverted to thinking it was dealing with a GtkCList, when in reality
-	it's a GtkTreeView. Fix that, so the buttons are sensitized correctly.
-
-2003-03-17  Hans Petter Jansson  <hpj@ximian.com>
-
-	Fixes #39736
-
-	* gui/e-day-view.c: Reduce the size of the large-digits font so it's
-	en par with the one in 1.2.
-
-2003-03-14  Rodrigo Moya <rodrigo@ximian.com>
-
-	Fixes #39740
-
-	* gui/e-meeting-model.c (is_cell_editable): check row number is valid
-	before using it as index for the GPtrArray.
-
-2003-03-14  Rodrigo Moya <rodrigo@ximian.com>
-
-	Fixes #39356
-
-	* gui/Makefile.am:
-	* gui/tasks-migrate.[ch]: removed tasks migration obsolete stuff.
-
-	* gui/calendar-component.c (owner_set_cb): don't call tasks_migrate.
-
-2003-03-14  Rodrigo Moya <rodrigo@ximian.com>
-	
-	* pcs/cal-factory.c (impl_CalFactory_uriList): set_release
-	on the sequence we create.
-
-	* cal-client/cal-client.c (cal_client_uri_list): don't leak the
-	string sequence returned by CalFactory_uriList.
-
-2003-03-13  Rodrigo Moya <rodrigo@ximian.com>
-
-	* pcs/query-backend.c (query_backend_new): use a weak ref instead
-	of connecting to backend's "destroy" signal.
-	(backend_destroyed_cb, query_destroyed_cb): changed to be weak
-	reference callbacks.
-
-2003-03-12  Rodrigo Moya <rodrigo@ximian.com>
-
-	* gui/dialogs/save-comp.c (save_component_dialog): don't use
-	GNOME_STOCK_* defines, but GTK_STOCK_*.
-
-2003-03-12  Rodrigo Moya <rodrigo@ximian.com>
-
-	* gui/dialogs/save-comp.[ch] (save_component_dialog): corrected
-	button ordering and changed the return type to be a GtkResponseType.
-
-	* gui/dialogs/comp-editor.c (prompt_to_save_changes): adapted to
-	changes in save_component_dialog.
-
-2003-03-11  Dan Winship  <danw@ximian.com>
-
-	* gui/calendar-config.c (on_timezone_set): Update for timezone
-	dialog API changes.
-
-	* gui/e-timezone-entry.c: Likewise
-
-2003-03-11  Rodrigo Moya <rodrigo@ximian.com>
-
-	* gui/gnome-cal.c (gnome_calendar_open): issue more descriptive
-	warnings.
-
-2003-03-09  Rodrigo Moya <rodrigo@ximian.com>
-
-	* gui/alarm-notify/alarm-notify.c (alarm_notify_add_calendar): if we
-	already have the client loaded, don't remove it, just increment its
-	reference count.
-
-	* gui/alarm-notify/alarm-queue.c (remove_queued_alarm): added new
-	argument to specify whether we want the component's structure removed
-	if no more alarms exist, and only free the structure if TRUE.
-	(remove_alarms): added same new argument and pass it over to
-	remove_queued_alarm.
-	(remove_comp, obj_updated_cb): passed new argument to remove_alarms.
-	(procedure_notification): passed new argument to remove_queued_alarm.
-	(obj_removed_cb): set all freed pointers to NULL.
-	(notify_dialog_cb): only remove the alarm if the pointers are not NULL.
-
-2003-03-07  Rodrigo Moya <rodrigo@ximian.com>
-
-	* gui/alarm-notify/save.c (get_calendars_to_load): create the array
-	to be returned only once.
-
-2003-03-06  Rodrigo Moya <rodrigo@ximian.com>
-
-	* gui/alarm-queue.c (display_notification): ref the CalClient.
-	(notify_dialog_cb): unref the CalClient.
-
-2003-03-06  Rodrigo Moya <rodrigo@ximian.com>
-
-	* gui/alarm-notify/alarm-notify-dialog.[ch]
-	(alarm_notify_dialog_disable_buttons): new function.
-	(alarm_notify_dialog): made it return a pointer to the dialog structure.
-
-	* gui/alarm-notify/alarm-queue.c (remove_alarms, remove_comp): splitted
-	alarm removal out of remove_comp.
-	(obj_updated_cb): remove the component only when needed. In normal
-	updates, just update the internal structure.
-	(edit_component): don't get a CompQueuedAlarms as argument, since it
-	might be removed.
-	(on_dialog_obj_updated_cb, on_dialog_obj_removed_cb): callbacks for
-	modifications during dialog display.
-	(notify_dialog_cb): disconnect from "obj_*ed" signals and call
-	edit_component with the new set of arguments.
-	(display_notification): added more data to the closure structure.
-
-2003-03-05  Rodrigo Moya <rodrigo@ximian.com>
-
-	Fixes #31382
-
-	* gui/e-meeting-model.c (async_read): don't assume the buffer is
-	always full, but use GNOME_VFS_ERROR_EOF instead for knowing when
-	the read has finished.
-
-2003-03-05  JP Rosevear  <jpr@ximian.com>
-
-	* gui/apps_evolution_calendar.schemas: fix defaults and
-	descriptions to match what calendar-config wants them to be
-
-2003-03-05  JP Rosevear  <jpr@ximian.com>
-	
-	* gui/e-itip-control.c (show_current): g_objectify ref/unref
-
-	* gui/itip-bonobo-control.c (set_data_idle_cb): as above
-	(pstream_load): ditto
-
-	* gui/dialogs/alarm-options.c (alarm_to_malarm_widgets): as above
-
-2003-03-05  JP Rosevear  <jpr@ximian.com>
- 
- 	* gui/e-itip-control.c (class_init): override finalize, not
- 	destroy
- 	(start_calendar_server): take itip as a param and gtk_main_quit if
- 	it gets destroyed while we are waiting for the cal client to load
- 	(start_default_server): ditto
- 	(get_servers): take itip as a param and don't load if we've been
- 	destroyed, check for an except when retrieving the folder list
- 	(init): ref the html control
-	(destroy): mark ourselves as destroyed
- 	(finalize): clean up, unref html control
- 	(write_html): if the html widget has been destroyed, don't write
- 	anything out
- 	(show_current_todo): pass extra param
- 	(show_current): ref/unref the itip control to avoid finalization while
- 	we are working, pass extra param
- 	(button_selected_cb): pass extra param
- 	(object_requested_cb): ditto
-
-2003-03-05  Rodrigo Moya <rodrigo@ximian.com>
-
-	* gui/calendar-offline-handler.c (backend_go_offline,
-	backend_go_online): cast CalClient's to GObject, not GtkObject.
-
-2003-03-04  JP Rosevear  <jpr@ximian.com>
- 
- 	* gui/dialogs/meeting-page.c (meeting_page_fill_widgets): don't
- 	let the user change to an email organizer if the back end is not
- 	an email addres
-	
-2003-03-04  JP Rosevear  <jpr@ximian.com>
- 
- 	Fixes #37881
- 	
- 	* gui/e-meeting-model.c (process_section): if the attendee is the
- 	empty string, try to get the email
-	
-2003-03-04  JP Rosevear  <jpr@ximian.com>
-
-	* gui/calendar-offline-handler.c (backend_cal_opened_online): set
-	the backend to REMOTE mode when it opens
-	(backend_go_online): prepare to set calendar mode to REMOTE
-	(impl_goOnline): get all the local calendars and set to REMOTE
-
-2003-03-04  JP Rosevear  <jpr@ximian.com>
- 
- 	Fixes #37881
- 	
- 	* gui/e-meeting-model.c (process_section): if the attendee is the
- 	empty string, try to get the email
- 
-2003-03-04  JP Rosevear  <jpr@ximian.com>
-  
- 	Fixes #37883
- 	
- 	* idl/evolution-calendar.idl: getLdapAttribute can raise NotFound
- 
-2003-03-04  JP Rosevear  <jpr@ximian.com>
- 
- 	Fixes #37806, #37697
- 	
- 	* gui/e-itip-control.c (e_itip_control_set_data): if the text is
- 	null or the empty string, just clear the widget
- 	(init): set the html widget to initially be blank
- 
-2003-03-04  JP Rosevear  <jpr@ximian.com>
- 
- 	* pcs/cal.c (impl_Cal_get_ldap_attribute): implement
- 
- 	* pcs/cal-backend.h: add virtual method
- 
- 	* pcs/cal-backend.c (cal_backend_get_ldap_attribute): call
- 	get_ldap_attribute_method
- 
- 	* pcs/cal-backend-file.c (cal_backend_file_class_init): overrid
- 	get_ldap_attribute method
- 
- 	* idl/evolution-calendar.idl: add getLdapAttribute method
- 
- 	* gui/e-meeting-model.c (process_section): take simple card list
- 	as arg and try to use the ldap attribute (if any) as the attendee,
- 	else use the email address
- 	(select_names_ok_cb): get the simple card list 
- 
- 	* cal-client/cal-client.h: add proto
- 
- 	* cal-client/cal-client.c (cal_client_init): init ldap_attribute
- 	to NULL
- 	(cal_client_destroy): free ldap_attribute
- 	(cal_client_get_ldap_attribute): accessor
-	
-2003-03-04  JP Rosevear  <jpr@ximian.com>
-
-       * gui/itip-utils.c (itip_organizer_is_user): call
-       cal_client_get_cal_address instead of cal_client_get_email_address
-
-       * gui/dialogs/meeting-page.c (meeting_page_construct): ditto
-
-       * pcs/cal.c (impl_Cal_get_cal_address): implement updated method
-       name
-       (cal_class_init): set method implementation
-
-       * pcs/cal-backend.c (cal_backend_class_init): init get_cal_address
-       virtual function
-       (cal_backend_get_cal_address): call proper function
-
-       * pcs/cal-backend.h: update proto, rename get_email_address
-       virtual function to get_cal_address virtual function
-
-       * pcs/cal-backend-file.c (cal_backend_file_class_init): match
-       get_cal_address call
-       (cal_backend_file_get_cal_address): rename from
-       cal_backend_file_get_email_address
-
-       * cal-client/cal-client.c: rename email_address private member to
-       cal_address
-       (cal_client_init): init cal_address
-       (cal_client_destroy): free cal_address and properly free
-       alarm_email_address
-       (cal_client_get_cal_address): rename from
-       cal_client_get_email_address and call proper corba function
-       
-2003-03-04  JP Rosevear  <jpr@ximian.com>
- 
-  	* idl/evolution-calendar.idl: fix comment
-	
-2003-03-04  JP Rosevear  <jpr@ximian.com>
- 
- 	* gui/calendar-model.c (calendar_model_append_row): update FIXME
- 	note
-	
-2003-03-04  JP Rosevear  <jpr@ximian.com>
- 
- 	* gui/dialogs/recur-comp.h: fix copyright
- 
- 	* gui/dialogs/recur-comp.c: fix copyright
- 	(recur_component_dialog): say "recurring journal entry" instead of
- 	just "recurring journal"
-
-2003-03-04  JP Rosevear  <jpr@ximian.com>
- 
-        Partially  Fixes #23606 (from Jack Jia <jack.jia@sun.com>)
- 	
- 	* gui/dialogs/schedule-page.c (update_time): handle no end date if
- 	the start is date only
- 
- 	* gui/dialogs/event-page.c (update_time): ditto
-	
-2003-03-04  JP Rosevear  <jpr@ximian.com>
-
-	Merging in 1.2 stuff
-	
-	Fixes #35598
-	
-	* gui/dialogs/task-details-page.c
-	(task_details_page_fill_widgets): count a status of needs action
-	as a status of none (not started)
-	(date_changed_cb): set the option menu to a status of none
-	(status_changed): no need to handle needs action status now
-
-	* gui/dialogs/task-details-page.glade: remove needs-action menu
-	item
-
-	Fixes #36763	
-		
-	* gui/dialogs/alarm-page.c (add_clicked_cb): if no address was set
-	for an email alarm, set the default
-	(button_options_clicked_cb): pass the default email address
-
-	* gui/dialogs/alarm-options.h (alarm_options_dialog_run): update proto
-
-	* gui/dialogs/alarm-options.c (alarm_to_malarm_widgets): if there
-	are no email attendees, default to the passed in value
-	(alarm_options_dialog_run): take and track an email param
-
-	* pcs/cal.c (impl_Cal_get_alarm_email_address): implement by
-	calling backend method
-	(cal_class_init): set alarm email address method implementation
-
-	* pcs/cal-backend.h: add new virtual proto
-
-	* pcs/cal-backend.c (cal_backend_class_init): set alarm email
-	address virtual method to NULL
-	(cal_backend_get_alarm_email_address): call backend method
-
-	* pcs/cal-backend-file.c (cal_backend_file_class_init): set alarm
-	email address method
-	(cal_backend_file_get_alarm_email_address): implement by returning
-	NULL
-
-	* idl/evolution-calendar.idl: add getAlarmEmailAddress method
- 
-	Fixes #37102
-	
-	* gui/dialogs/task-editor.c (set_menu_sens): don't allow task
-	assignment if the backend says not to
-
-	* gui/dialogs/recurrence-page.c (fill_component): kill warning
-	(preview_recur): display the recurrences in the dtstart timezone
-	if possible
-
-	* gui/gnome-cal.c (dn_query_obj_updated_cb): pass NULL to use
-	default tag zone
-
-	* gui/tag-calendar.c (tag_calendar_by_comp): allow display zone
-	for the tagged calendar to be passed in
-	(prepare_tag): use the passed in timezone for display if non-null
-
-	* gui/tag-calendar.h (tag_calendar_by_comp): update proto
-
-	* gui/dialogs/recurrence-page.c (recurrence_page_set_dates): make
-	sure we always update the preview
-
-	* conduits/todo/todo-conduit.c (add_record): make sure to create a
-	unique uid for the record
-
-	* conduits/calendar/calendar-conduit.c (add_record): ditto
-
-	* conduits/todo/todo-conduit.c (e_todo_context_new): init default
-	comp and timezone to NULL
-	(e_todo_context_destroy): unref default comp
-	(pre_sync): et the default comp via the client and set the default
-	timezone
-	(add_record): pass the default comp as the base comp
-
-	* conduits/calendar/calendar-conduit.c (e_calendar_context_new):
-	init default comp to NULL
-	(e_calendar_context_destroy): unref default comp
-	(pre_sync): get the default comp via the client
-	(add_record): pass the default comp as the base comp
-
-	* conduits/calendar/calendar-conduit.c (local_record_from_comp):
-	only add the recurrence rule if its not an instance
-
-	* gui/itip-control-factory.c (set_data_idle_cb): idle call back to
-	set control data
-	(pstream_load): set the data in an idle callback to avoid deadlock
-	(get_prop): handle view_only
-	(set_prop): ditto
-	(itip_control_factory): add view_only
-
-	* gui/e-itip-control.h: add protos
-
-	* gui/e-itip-control.c (write_html): only write out the options if
-	we aren't in view_only mode
-	(e_itip_control_set_view_only): accessor
-	(e_itip_control_get_view_only): ditto
-	
-	Fixes #36909
-	
-	* gui/dialogs/alarm-page.c (button_options_clicked_cb): indicate
-	whether the options dialog should allow repeating
-
-	* gui/dialogs/alarm-options.h: update proto
-
-	* gui/dialogs/alarm-options.c (alarm_to_repeat_widgets): if
-	repeating is not allowed, sensitize the widgets appropriately
-	(alarm_options_dialog_run): store the repeat param
-
-	* gui/calendar-model.c (calendar_model_append_row): guard against
-	saving before the calendar is open
-
-	* gui/e-day-view.c (e_day_view_key_press): ditto
-	
-	* gui/dialogs/comp-editor.c (page_changed_cb): change warning
-	dialog to not mention email
-	(page_summary_changed_cb): ditto
-	(page_dates_changed_cb): ditto
-
-	* gui/itip-utils.c (itip_organizer_is_user): make the compare case
-	insensitive
-
-	* gui/dialogs/meeting-page.c (meeting_page_fill_widgets): don't
-	allow the organizer to be changed if its not an email address
-
-	* gui/e-day-view.c, calendar-model.c, e-week-view.c,
-	task-editor.c, event-editor.c, comp-editor.c, meeting-page.c: pass
-	additional param
-
-	* gui/itip-utils.c (itip_organizer_is_user): take client as param,
-	and if organizer-not-email-address and email address and organizer
-	match, assume the user is the organizer
-
-	* gui/itip-utils.h: update proto
-
-	* pcs/cal.c (build_fb_seq): set the max
-
-	* gui/e-meeting-model.c
-	(e_meeting_model_add_attendee_with_defaults): correct typo and set
-	rsvp appropriately
-
-	* gui/dialogs/send-comp.c (send_component_dialog): if save
-	schedules, return FALSE for now
-
-	* gui/dialogs/recurrence-page.c (sensitize_recur_widgets):
-	de-sensitize the preview widget if we are viewing an instance
-	(preview_recur): return if the comp is an instance
-
-	* gui/dialogs/event-page.glade: name the show time frame
-
-	* gui/dialogs/event-page.c (event_page_fill_widgets) 
-	(event_page_init): init show time frame
-	(event_page_fill_widgets): hide/show frame as needed
-	(get_widgets): get the frame
-
-	* gui/alarm-notify/alarm-queue.c (mail_notification): kill mail
-	notification code
-
-	* cal-client/cal-client.c (load_static_capabilities): grab static
-	capabilities string
-	(check_capability): see if a capability is in the string
-	(cal_client_get_one_alarm_only): accessor
-	(cal_client_get_organizer_must_attend): use check_capability
-	(cal_client_get_static_capability): ditto
-
-	* cal-client/cal-client.h: new, changed protos
-
-	* idl/evolution-calendar.idl: change over getSchedulingInformation
-	to a more general getStaticCapabilities call
-
-	* pcs/cal-backend-file.c
-	(cal_backend_file_get_static_capabilities): return
-	"no-email-alarms"
-
-	* pcs/cal-backend.c (cal_backend_get_static_capabilities): ditto
-
-	* pcs/cal-backend.h: ditto
-
-	* pcs/cal.c (impl_Cal_get_static_capabilities): ditto
-
-	* gui/alarm-notify/alarm-queue.c (get_default_address): utility
-	routine to snag address info
-
-	* gui/alarm-notify/Makefile.am: build composer idl
-
-	* *.c: pass client param for send an cancel params
-	
-	* gui/dialogs/send-comp.c (send_component_dialog): take client as
-	a parm and if save schedules return true right away
-
-	* gui/dialogs/send-comp.h: update proto
-
-	* gui/dialogs/cancel-comp.c (cancel_component_dialog): take client
-	as a param and if we are deleting and schedule saves, return true
-	right away
-
-	* gui/dialogs/cancel-comp.h (cancel_component_dialog): update proto
-
-	* gui/dialogs/alarm-options.glade: add Send To: button
-
-	* gui/dialogs/alarm-options.c (addressbook_clicked_cb): display
-	dialog
-	(setup_select_names): attach above to Send To: button clicked
-	signal
-
-	* gui/dialogs/alarm-options.c (get_widgets): get mail alarm
-	widgets
-	(setup_select_names): add the select names widget
-	(alarm_to_malarm_widgets): show the attendees and description
-	(alarm_to_dialog): set the title for mail alarms properly
-	(malarm_widgets_to_alarm): save attendees and descriptions in
-	alarm
-	(alarm_options_dialog_run): call setup_select_names
-
-	* gui/dialogs/alarm-page.c: add email to alarm types
-
-	* gui/dialogs/alarm-options.glade: add mail alarm widgets
-
-	* gui/dialogs/alarm-page.glade: add email to alarm types
-
-	* cal-util/cal-component.c (scan_attendee): kill unnecessary
-	CalComponent param
-	(scan_property): don't pass same
-	(set_attendee_list): take an icalcomp instead of a CalComponent
-	(cal_component_set_attendee_list): pass same
-	(scan_alarm_property): if its an attendee, scan it
-	(make_alarm): set attendee_list member to null
-	(cal_component_alarm_new): ditto
-	(cal_component_alarm_free): free attendee list
-	(cal_component_alarm_get_attendee_list): return attendee list
-	(cal_component_alarm_set_attendee_list): set attendee list
-	(cal_component_alarm_has_attendees): return true if alarm has attendees
-
-	* cal-util/cal-component.h: new protos
-
-	* gui/calendar-model.c (calendar_model_append_row): use
-	cal_comp_task_new_with_defaults
-
-	* gui/comp-editor-factory.c (get_default_task): ditto
-
-	* gui/e-tasks.c (e_tasks_new_task): ditto
-
-	* gui/gnome-cal.c (gnome_calendar_new_task): ditto
-
-	* gui/comp-util.h (cal_comp_task_new_with_defaults): new proto
-
-	* gui/comp-util.c (cal_comp_task_new_with_defaults): new utility
-	routine
-
-	* cal-util/cal-util.c (generate_absolute_triggers): skip omitted
-	alarm types
-	(add_alarm_occurrences_cb): ditto
-	(cal_util_generate_alarms_for_list): take/pass omit param
-	(cal_util_generate_alarms_for_comp): ditto
-
-	* cal-util/cal-util.h: update protos
-
-	* pcs/cal-backend-file.c (cal_backend_file_get_alarms_for_object):
-	add omit param
-	(cal_backend_file_get_alarms_in_range): ditto
-
-	* pcs/cal-backend.c (cal_backend_get_scheduling_information):
-	remove dead param
-
-	* gui/dialogs/meeting-page.h: delete proto
-
-	* gui/dialogs/meeting-page.c: remove dead routine
-
-	* gui/dialogs/event-editor.c (event_editor_edit_comp): we don't
-	need to add the organizer as an attendee ourselves, just set the
-	edit level properly
-
-	* gui/dialogs/task-editor.c (task_editor_edit_comp): ditto
-
-	* gui/comp-util.c (cal_comp_event_new_with_defaults): take client
-	as arg so we can obtain the default from the backend
-	
-	* gui/comp-editor-factory.c (get_default_event): pass
-	cal_comp_event_new_with_defaults the new param
-
-	* gui/gnome-cal.c (gnome_calendar_new_appointment_for): ditto
-
-	* gui/e-week-view.c (e_week_view_key_press): ditto
-
-	* gui/e-day-view.c (e_day_view_key_press): ditto
-
-	* gui/calendar-model.c (calendar_model_append_row): ditto
-
-	* gui/comp-util.h (cal_comp_event_new_with_defaults): update proto
-
-	* pcs/cal-backend-file.c (cal_backend_file_get_default_object):
-	return appropriate default object
-
-	* pcs/cal-backend.c (cal_backend_get_default_object): call
-	get_default_backend class method
-
-	* pcs/cal-backend.h: add proto
-
-	* pcs/cal.c (impl_Cal_get_default_object): implement
-	(cal_class_init): set handler for getDefaultObject call
-
-	* idl/evolution-calendar.idl: remove always schedule from
-	SchedulingInformation and add getDefaultObject call
-
-	* cal-client/cal-client.c (cal_client_get_default_object): gets a
-	default object from the server
-	(cal_client_init): remove always_schedule
-	(load_scheduling_info): ditto
-
-	* cal-client/cal-client.h: add a proto, delete a proto
-
-	* gui/dialogs/meeting-page.c (right_click_cb): if the attendee is
-	not fully editable, don't allow deletion
-	(meeting_page_construct): keep the default organizer as an itip
-	address
-	(meeting_page_get_default_organizer): return the default organizer
-
-	* gui/dialogs/meeting-page.h: new proto
-
-	* gui/dialogs/event-editor.c (event_editor_edit_comp): we set
-	appropriate edit levels now for users and if the backend always
-	schedules we always show the meeting pages and add the organizer
-	as an attendee
-
-	* gui/dialogs/task-editor.c (task_editor_edit_comp): same
-
-	* gui/e-meeting-model.c (is_cell_editable): use the edit level of
-	the attendee to determine if cell is editable
-	(init): we no longer keep the attendee list of restricted
-
-	* gui/e-meeting-attendee.c (e_meeting_attendee_get_edit_level): accessor
-	(e_meeting_attendee_set_edit_level): ditto
-
-	* gui/e-meeting-attendee.h: new protos and edit level enum
-
-	* cal-client/cal-client.c (load_scheduling_info): load the
-	scheduling info
-	(cal_client_get_always_schedule): accessor
-	(cal_client_get_organizer_must_attend): ditto
-	(cal_client_get_save_schedules): ditto
-	(cal_client_init): init scheduling data members
-
-	* cal-client/cal-client.h: accessors for scheduling information
-
-	* pcs/cal-backend-file.c
-	(cal_backend_file_get_scheduling_information): implement the new
-	virtual method
-
-	* pcs/cal-backend.c (cal_backend_get_scheduling_information): call
-	the class specific method
-
-	* pcs/cal-backend.h: add virtual method
-
-	* idl/evolution-calendar.idl: add a getSchedulingInformation call
-	which describes how the backend does its scheduling
-
-	* pcs/cal.c (impl_Cal_get_scheduling_information): implement above
-
-	* gui/e-day-view.c: pass NULL as parent to recur dialog
-
-	* gui/e-week-view.c: ditto
-
-	* gui/dialogs/comp-editor.c (prompt_to_save_changes): show recur
-	dialog after prompting, not before
-	(save_cmd): ditto
-	(save_close_cmd): ditto
-	(real_edit_comp): don't show recur dialog before opening
-
-	* gui/dialogs/recur-comp.h (recur_component_dialog): update proto
-
-	* gui/dialogs/recur-comp.c (recur_component_dialog): take a parent
-	argument and set the dialog parent if non-null
-	
- 	* gui/e-week-view.c (e_day_view_on_editing_stopped): Don't update
- 	appointment if both the old and the new summary texts are empty.
- 
-	* gui/e-week-view.c (e_week_view_show_popup_menu): mask out "make
-	moveable" if its an instance
-
-	* gui/e-day-view.c (e_day_view_on_event_right_click): ditto
-
-	* gui/e-week-view.c (e_week_view_on_editing_stopped): if its
-	an instance, show the recur comp dialog and modify it based on the
-	response (or not if cancel is hit)
-
-	* gui/e-day-view.c (e_day_view_finish_long_event_resize): if its
-	an instance, show the recur comp dialog and modify it based on the
-	response (or not if cancel is hit)
-	(e_day_view_finish_resize): ditto
-	(e_day_view_on_editing_stopped): ditto
-	(e_day_view_on_top_canvas_drag_data_received): ditto
-	(e_day_view_on_main_canvas_drag_data_received): ditto
-
-	* gui/dialogs/comp-editor.c (real_edit_comp): reflect changes in
-	proto of recur_component_dialog
-
-	* gui/dialogs/recur-comp.c (recur_component_dialog): use ok/cancel
-	instead and radio buttons for the mod type
-
-	* gui/dialogs/recur-comp.h: update proto
-
-	* gui/e-day-view.c (e_day_view_on_long_event_click): allow
-	dragging if its an instance
-	(e_day_view_on_event_click): ditto
-	(e_day_view_on_top_canvas_motion): ditto
-	(e_day_view_on_main_canvas_motion): ditto
-
-	* gui/dialogs/comp-editor.c (save_comp): if its an instance,
-	update with the mod type
-	(real_edit_comp): ask the user what instances they want to change
-
-	* gui/dialogs/recur-comp.[hc]: new dialog to ask user what
-	recurrences to modify
-
-	* gui/dialogs/Makefile.am: Compile new files
-	
-	* gui/e-day-view.c (e_day_view_on_delete_occurrence): if its an
-	instance, just remove with THIS mod
-
-	* gui/e-week-view.c (e_week_view_on_delete_occurrence): ditto
-	
-	* cal-client/cal-client.c (cal_client_remove_object_with_mod):
-	send the mod parameter to the backend
-	(cal_client_remove_object): implement with above
-	(cal_client_update_object_with_mod): send the mod parameter to the
-	backend
-	(cal_client_update_object): implement with above
-
-	* cal-client/cal-client.h: new protos
-
-	* cal-client/cal-client.c (cal_client_is_read_only): return
-	booleans in the pre conditions
-	(cal_client_update_object): pass mod param
-	(cal_client_update_objects): ditto
-	(cal_client_remove_object): ditto
-	(cal_client_ensure_timezone_on_server): ditto
-
-	* pcs/cal.c (impl_Cal_update_objects): take mod param
-	(impl_Cal_remove_object): ditto
-
-	* pcs/cal-backend.h: fix protos
-
-	* pcs/cal-backend.c (cal_backend_update_objects): take mod param
-	(cal_backend_remove_object): ditto
-
-	* pcs/cal-backend-file.c (cal_backend_file_update_objects): take
-	mod param
-	(cal_backend_file_remove_object): ditto
-
-	* cal-util/cal-util.h: add mod enum
-
-	* cal-util/cal-recur.c (cal_recur_generate_instances_of_rule): if
-	its an instance, just report the instance
-
-	* cal-util/cal-component.h: new protos
-
-	* cal-util/cal-component.c (cal_component_is_instance): indicate
-	whether the component is an instance or not
-	(cal_component_free_range): free a range
-
-	* idl/evolution-calendar.idl: get remove and update to take mod
-	type 
-
-2003-03-03  Hans Petter Jansson  <hpj@ximian.com>
-
-	* gui/dialogs/alarm-page.c
-	* gui/dialogs/event-page.c
-	* gui/dialogs/meeting-page.c
-	* gui/dialogs/recurrence-page.c
-	* gui/dialogs/schedule-page.c
-	* gui/dialogs/task-details-page.c
-	* gui/dialogs/task-page.c (get_widgets): gtk_widget_unparent() ->
-	gtk_container_remove(). The former caused crashes in the
-	addressbook's name-selector.
-
-2003-03-01  Hans Petter Jansson  <hpj@ximian.com>
-
-	* Makefile.am: Do importers after the other dirs, as it relies on
-	generated files from there. This is still not optimal... Should
-	probably introduce dependencies.
-
-2003-02-28  Hans Petter Jansson  <hpj@ximian.com>
-
-	* importers/Makefile.am: Shlibify.
-
-	* importers/GNOME_Evolution_Calendar_Importer.server.in.in:
-	Shlibify.
-
-	* importers/icalendar-importer.c: Add necessary includes.
-	(importer_destroy_cb): This is now a GWeakNotify func. gtk_ -> g_.
-	(ical_importer_new)
-	(vcal_importer_new)
-	(gnome_calendar_importer_destroy_cb): Destroy signal -> weak ref.
-
-	* importers/main.c: Add necessary includes. Shlibify.
-
-2003-02-28  Dan Winship  <danw@ximian.com>
-
-	* gui/dialogs/Makefile.am: build libcal-dialogs as an uninstalled
-	shared library
-	($(IDL_GENERATED_H), etc): Only generate
-	Evolution-Addressbook-SelectNames.h, not the corresponding .c
-	files, or we'll get duplicate symbol errors trying to link this
-	into libevolution_calendar.la
-
-	* gui/Makefile.am (libevolution_calendar_la_LIBADD): Update for
-	that (and eliminate libtool portability warnings)
-
-2003-02-28  Hans Petter Jansson  <hpj@ximian.com>
-
-	* Makefile.am (SUBDIRS): Add importers/.
-
-	* importers/Makefile.am (server_in_files)
-	(server_DATA): Insert $(libexecdir).
-
-	* importers/icalendar-importer.c (connect_to_shell):
-	oaf_activate_from_id() -> bonobo_activation_activate_from_id().
-	(load_vcalendar_file): U_() -> _().
-
-	* importers/GNOME_Evolution_Calendar_Importer.server.in:
-	Renamed to corresponding .in.in.
-
-2003-02-28  Dan Winship  <danw@ximian.com>
-
-	* gui/Makefile.am (libevolution_calendar_la_LIBADD): Remove
-	libalarm.a, which was not being used by the calendar.
-
-	* gui/main.c: Remove unneeded alarm.h include.
-
-	* gui/alarm-notify/Makefile.am (noinst_LIBRARIES): Stop building
-	libalarm.a
-	(evolution_alarm_notify_SOURCES): Add alarm.c, alarm.h
-	(evolution_alarm_notify_LDADD): Remove libalarm.a
-
-2003-02-27  JP Rosevear  <jpr@ximian.com>
-
-	* conduits/todo/Makefile.am: link to versist libtool object
-
-	* conduits/calendar/Makefile.am: ditto
-	
-2003-02-26  Hans Petter Jansson  <hpj@ximian.com>
-
-	This makes alarm notification work.
-
-	* gui/alarm-notify/notify-main.c (main): Initialize GTK. Don't
-	initialize bonobo activation - bonobo_init() does that for us.
-
-2003-02-26  Hans Petter Jansson  <hpj@ximian.com>
-
-	This makes creating appointments and tasks from the "New" button work.
-
-	* gui/main.c (comp_editor_factory_fn): Doesn't need to take any args.
-	(factory): Add a handler for CompEditorFactory.
-
-2003-02-26  Hans Petter Jansson  <hpj@ximian.com>
-
-	Fixes Ximian #37895.
-
-	* gui/e-day-view.c (e_day_view_destroy): g_object_unref () ->
-	pango_font_description_free ().
-	(e_day_view_style_set): Ditto.
-
-	* gui/e-week-view.c (e_week_view_destroy): Ditto.
-
-2003-02-26  Hans Petter Jansson  <hpj@ximian.com>
-
-	Fixes Ximian #38306.
-
-	* gui/e-itip-control.c (clean_up): Do nothing if the private structure
-	has been freed. Don't call non-g_free() freers with NULL pointers.
-	(destroy): Do nothing if the private structure has been freed. Clear
-	pointers to freed blocks.
-
-2003-02-25  Hans Petter Jansson  <hpj@ximian.com>
-
-	* gui/print.c (print_calendar): Use fixed margins of 5% of page
-	width/height. This is the same cheat as gtkhtml employs to get
-	around the fact that GNOME_PRINT_KEY_PAGE_MARGIN_* don't return
-	useful values (I think). It sort of sucks, but is better than
-	no margins at all.
-	(print_comp): Ditto.
-
-2003-02-25  Hans Petter Jansson  <hpj@ximian.com>
-
-	* gui/calendar-config.c (calendar_config_get_default_view): Get
-	default view from correct key.
-
-2003-02-25  Hans Petter Jansson  <hpj@ximian.com>
-
-	* gui/dialogs/cal-prefs-dialog.c (get_widgets): Show start/end-of-day
-	widgets.
-	
-2003-02-23  Hans Petter Jansson  <hpj@ximian.com>
-
-	* cal-client/cal-client.c (cal_client_is_read_only): Don't warn
-	if calendar isn't loaded... Doesn't seem to hurt, but this should
-	probably be investigated further.
-
-	* gui/dialogs/comp-editor-util.c (comp_editor_contacts_to_widget):
-	If we have no contacts, don't bother trying to set them in the
-	widget. Used to pass a NULL list, which would lead to much anxiety
-	in callees.
-
-	* gui/dialogs/meeting-page.c (meeting_page_fill_widgets):
-	If we have no potential organizers, emit a sensible warning.
-
-	* gui/dialogs/task-page.c (init_widgets): Don't try to connect to
-	the "changed" signal of the GtkTextView -- we listen to the
-	GtkTextBuffer now.
-
-2003-02-20  Not Zed  <NotZed@Ximian.com>
-
-	* gui/e-itip-control.c (destroy): dont unref accounts anymore.
-	(change_status): itipAddress -> EAccount.
-
-	* gui/calendar-model.c (calendar_model_destroy): dont unref
-	accounts anymore.
-	(calendar_model_value_at): simplify logic using account_list_find.
-
-	* gui/dialogs/task-editor.c (task_editor_edit_comp): use new
-	itip_addresses interfaces.
-
-	* gui/dialogs/meeting-page.c (meeting_page_construct): use new
-	itip_addresses_* interfaces.  Should probably be using e_account
-	directly.
-	(meeting_page_finalize): dont unref the accounts list.
-
-	* gui/dialogs/event-editor.c (event_editor_edit_comp): dont unref
-	accounts anymore.
-
-	* gui/itip-utils.c (itip_addresses_get_default): Just use
-	e_account_list_get_default.
-	(itip_addresses_get): dont ref the account object, just keep 1 ref
-	to it.
-	(find_account): remove.
-	(itip_organizer_is_user): use e_account_list_find now.
-	(itip_sentby_is_user): "
-	(comp_limit_attendees): "
-
-2003-02-19  Not Zed  <NotZed@Ximian.com>
-
-	* gui/dialogs/meeting-page.c: addresses->accounts
-	(meeting_page_finalize): unref accounts.
-
-	* gui/dialogs/event-editor.c: Use EAccountList api's
-
-	* pcs/cal-backend-util.c (cal_backend_mail_account_get): Removed,
-	use a global EAccountList instead.
-	(cal_backend_mail_account_get_default): Use the global
-	EAccountList directly.
-	(cal_backend_mail_account_is_valid): And here too.
-
-	* gui/itip-utils.h: Removed ItipAddress structure.
-
-	* gui/itip-utils.c (itip_addresses_get): Change it to return a
-	global account object, so we dont need to duplicate all account
-	info in the calendar.
-	(itip_addresses_free, itip_address_free): Removed, use
-	g_object_unref.
-	(itip_addresses_get_default): Return an EAccount.
-	(find_account): helper to lookup accounts based on name/address.
-	(itip_organizer_is_user): Use helper to find account.
-	(itip_sentby_is_user): "
-	(comp_limit_attendees): "
-	(comp_sentby): Update to use an EAccount direclty.
-	(get_address): Removed, now redundant.
-
-	* gui/e-itip-control.c: Changed priv->addresses to be accounts
-	EAccountList.
-	(destroy): unref accounts.
-	(find_my_address): Change to use accounts list directly, also fix
-	a small potential memleak.
-
-	* gui/calendar-model.c: Change priv->addresses to be a direct
-	reference to an EAccountList, renamed priv->accounts.
-	(calendar_model_destroy): unref accounts.
-	(calendar_model_value_at): Use EAccountList directly to lookup
-	members.
-
-	* gui/calendar-config.c (calendar_config_get_timezone)
-	(calendar_config_set_timezone): Fix timezone key.
-	(calendar_config_get_24_hour_format): Same for 24 hour format key.
-	(calendar_config_set_24_hour_format): And here.
-	(calendar_config_get_week_start_day): "
-	(calendar_config_set_week_start_day): "
-	(calendar_config_get_day_start_hour): "
-	(calendar_config_set_day_start_hour): "
-	(calendar_config_get_day_start_minute): "
-	(calendar_config_set_day_start_minute): "
-	(calendar_config_get_day_end_hour): "
-	(calendar_config_set_day_end_hour): "
-	(calendar_config_get_day_end_minute)
-	(calendar_config_set_day_end_minute)
-	(calendar_config_get_time_divisions)
-	(calendar_config_set_time_divisions)
-	(calendar_config_get_dnav_show_week_no)
-	(calendar_config_set_dnav_show_week_no)
-	(calendar_config_get_default_view)
-	(calendar_config_set_default_view)
-	(calendar_config_get_hpane_pos, calendar_config_set_hpane_pos)
-	(calendar_config_get_vpane_pos, calendar_config_set_vpane_pos)
-	(calendar_config_get_month_hpane_pos)
-	(calendar_config_set_month_hpane_pos)
-	(calendar_config_get_month_vpane_pos)
-	(calendar_config_set_month_vpane_pos)
-	(calendar_config_get_compress_weekend)
-	(calendar_config_set_compress_weekend)
-	(calendar_config_get_show_event_end)
-	(calendar_config_set_show_event_end)
-	(calendar_config_get_working_days)
-	(calendar_config_set_working_days)
-	(calendar_config_get_hide_completed_tasks)
-	(calendar_config_set_hide_completed_tasks)
-	(calendar_config_get_hide_completed_tasks_units)
-	(calendar_config_set_hide_completed_tasks_units)
-	(calendar_config_get_hide_completed_tasks_value)
-	(calendar_config_set_hide_completed_tasks_value)
-	(calendar_config_get_confirm_delete)
-	(calendar_config_set_confirm_delete)
-	(calendar_config_get_confirm_expunge)
-	(calendar_config_set_confirm_expunge)
-	(calendar_config_get_tasks_due_today_color)
-	(calendar_config_set_tasks_due_today_color)
-	(calendar_config_get_tasks_overdue_color)
-	(calendar_config_set_tasks_overdue_color)
-	(calendar_config_get_use_default_reminder)
-	(calendar_config_set_use_default_reminder)
-	(calendar_config_get_default_reminder_interval)
-	(calendar_config_set_default_reminder_interval)
-	(calendar_config_get_default_reminder_units)
-	(calendar_config_set_default_reminder_units)
-	(calendar_config_default_calendar_folder)
-	(calendar_config_default_tasks_folder): Update config paths for
-	new config convention, etc.
-
-	* gui/alarm-notify/save.c (KEY_LAST_NOTIFICATION_TIME, etc):
-	Updated keys to lowercase/proper path.
-	(save_calendars_to_load): Store the calendars list as a gconf
-	list.
-	(get_calendars_to_load): Load the calendars list as a gconf list.
-	(save_blessed_program): Similar, for the blessed program list.
-	(is_blessed_program): Same here.
-
-	* gui/alarm-notify/config-data.c (config_data_get_timezone): Update
-	the path to the timezone key.
-	(config_data_get_24_hour_format): Fix path to config option.
-
-	* conduits/todo/todo-conduit.c (get_default_timezone): lower-case
-	the timezone key.
-
-	* conduits/calendar/calendar-conduit.c (get_default_timezone):
-	lower-case the timezone key.
-
-	* cal-client/cal-client.c (get_default_uri): Use the proper path
-	to get the default folder uri's.
-
-2003-02-23  Hans Petter Jansson  <hpj@ximian.com>
-
-	* gui/gnome-cal.c (backend_died_cb): Appease the compiler.
-	(gnome_calendar_update_paned_quanta): Don't actually try to set
-	the quantum properties. The quantum code should probably go away
-	entirely now that the panes update during resize, but let's keep
-	it around for a bit more.
-
-	* gui/dialogs/event-editor.c (event_editor_construct): Ref & sink
-	the pages.
-
-	* gui/dialogs/task-editor.c (task_editor_construct): Ref & sink
-	the pages.
-
-2003-02-23  Hans Petter Jansson  <hpj@ximian.com>
-
-	* gui/cal-search-bar.c (make_suboptions): Eliminate
-	e_utf8_to_gtk_string ().
-
-	* gui/e-timezone-entry.c (e_timezone_entry_get_display_name):
-	Ditto.
-
-	* gui/calendar-model.c (date_value_to_string):
-	e_utf8_from_locale_string () -> g_locale_to_utf8 ().
-	(calendar_model_value_to_string): Ditto.
-
-	* gui/e-cell-date-edit-text.c (ecd_get_text): Ditto.
-
-	* gui/e-itip-control.c (write_label_piece): Ditto.
-
-	* gui/print.c (format_date): Ditto.
-	(print_week_view_background): Ditto.
-	(print_month_summary): Ditto.
-	(print_date_label): Ditto.
-	(print_comp_item): Ditto.
-
-	* gui/alarm-notify/alarm-notify-dialog.c (write_html_heading):
-	Ditto.
-
-2003-02-22  Hans Petter Jansson  <hpj@ximian.com>
-
-	* gui/dialogs/task-details-page.c (get_widgets): Show the custom
-	widgets, since libglade appears to not want to do that.
-
-	* gui/dialogs/task-page.c (clear_widgets): Make the description
-	field use a GtkTextView.
-	(task_page_fill_widgets): Ditto.
-	(task_page_fill_component): Ditto.
-	(init_widgets): Ditto.
-	(get_widgets): Show the custom widgets, since libglade doesn't do it.
-
-2003-02-22  Hans Petter Jansson  <hpj@ximian.com>
-
-	* pcs/cal-backend.c (cal_backend_unref_categories): Add an
-	iteration statement. Fixes hang in wombat.
-
-2003-02-22  Hans Petter Jansson  <hpj@ximian.com>
-
-	* gui/apps_evolution_calendar.schemas: Commit fixes from
-	Grzegorz Goawski <grzegol@pld.org.pl>.
-
-2003-02-21  Hans Petter Jansson  <hpj@ximian.com>
-
-	* gui/calendar-model.c (calendar_model_class_init): GObject, not
-	GtkObject.
-	(calendar_model_destroy): -> calendar_model_finalize ().
-
-	* gui/calendar-view.c (calendar_view_class_init): GObject, not
-	GtkObject.
-	(calendar_view_destroy): -> calendar_view_finalize ().
-
-	* gui/comp-editor-factory.c (comp_editor_factory_class_init):
-	GObject, not GtkObject.
-	(comp_editor_factory_destroy): -> comp_editor_factory_finalize ().
-
-	* gui/e-day-view.c (e_day_view_long_event_button_press):
-	gtk_signal_disconnect () -> g_signal_handler_disconnect ().
-	(e_day_view_on_event_button_press): Ditto.
-	(e_day_view_on_long_event_click): Ditto.
-	(e_day_view_on_event_click): Ditto.
-	(e_day_view_on_event_double_click): Ditto.
-	(e_day_view_on_delete_appointment): Ditto.
-
-	* gui/e-week-view.c (e_week_view_on_text_item_event):
-	gtk_signal_disconnect () -> g_signal_handler_disconnect ().
-
-	* gui/alarm-notify/alarm-notify.c (AlarmNotify_RemoveCalendar):
-	Don't cast to GtkObject.
-
-2003-02-21  Dan Winship  <danw@ximian.com>
-
-	* cal-client/Makefile.am (libcal_client_la_LIBADD): depend on
-	libcal-util, libwombat, and libeutil
-	(client_test_LDADD): Remove those deps from here
-
-	* cal-util/Makefile.am (libcal_util_la_LIBADD): depend on
-	libical-evolution.la
-	(test_recur_LDADD): Remove that dependency here (and an ancient
-	libversit dependency).
-
-	* gui/alarm-notify/Makefile.am (evolution_alarm_notify_LDADD):
-	remove some deps
-
-	* gui/Makefile.am (libevolution_calendar_la_LIBADD): Likewise.
-
-2003-02-20  Hans Petter Jansson  <hpj@ximian.com>
-
-	* gui/apps_evolution_calendar.schemas: Add GConf schemas.
-
-	* gui/Makefile.am (EXTRA_DIST): Dist GConf schemas.
-	(install-data-local): Install GConf schemas.
-
-2003-02-20  Dan Winship  <danw@ximian.com>
-
-	* gui/Makefile.am (libevolution_calendar_la_LIBADD):
-	s/libemiscwidgets.a/libemiscwidgets.la/ and likewise for
-	libetimezonedialog
-
-2003-02-19  Ettore Perazzoli  <ettore@ximian.com>
-
-	* pcs/Makefile.am: Split $(CORBA_GENERATED_H) rule from the
-	$(CORBA_GENERATED_C) rule to that it autogens properly when using
-	parallel makes.
-	* cal-client/Makefile.am: Likewise.
-
-	* gui/gnome-cal.c (gnome_calendar_setup_view_menus): Fix path to
-	the calendar's GAL Views directory.  [Pointed out by Grzegorz
-	Goawski.]
-
-2003-02-11  Hans Petter Jansson  <hpj@ximian.com>
-
-	Enable printing for calendar and tasks.
-
-	* gui/print.c: Set default font to be "Sans". Store the PrintConfig
-	globally instead of PaperInfo (which doesn't exist anymore).
-	(get_font_for_size): Don't use
-	gnome_font_face_find_closest_from_weight_slant() anymore, since
-	it's broken. Instead, use gnome_font_face_find() and put bold- and
-	italicness in the name to look for. Descenders can now be negative,
-	so have to take the absolute value to get font height.
-	(print_comp): Use global, persistent print configuration.
-	GnomePrintDialog is now a GtkDialog. Remove manual configuration
-	parameter shuffling. Set up page using new methods.
-	(print_calendar): Like print_comp(). For month view, force landscape
-	mode by temporarily setting it in the config, and remove the old hack.
-	(print_setup): Port. I'm not sure this works, but at least it
-	compiles now. How do I test this code path?
-	(print_day_view): Pass NULL for page denominator.
-	(print_week_view): Ditto.
-	(print_month_view): Ditto.
-	(print_year_view): Ditto.
-	(print_comp_item): Add missing gnome_print_beginpage(). How did this
-	work before?
-
-	* gui/tasks-control.c: Store the PrintConfig globally instead of
-	passing individual parameters every time. Persistent too.
-	(print_title): Look for "Sans Bold" instead of "Times" with
-	GNOME_FONT_BOLD property. Don't use find_closest_from_weight_slant().
-	(print_tasks): Set up page using new methods. GnomePrintMaster ->
-	GnomePrintJob. Get params from global config instead of args.
-	(tasks_control_print_cmd): Use global, persistent print configuration.
-	Remove manual portrait/landscape hack. GnomePrintDialog is now a
-	GtkDialog. Set params in global config instead of passing them to
-	print_tasks().
-	(tasks_control_print_preview_cmd): print_tasks() now takes fewer
-	args.
-
-2003-02-11  Hans Petter Jansson  <hpj@ximian.com>
-
-	* gui/e-meeting-time-sel.c (e_meeting_time_selector_construct):
-	Don't use gtk_scrolled_window_set_scrollbar_spacing() anymore.
-
-2003-02-10  Hans Petter Jansson  <hpj@ximian.com>
-
-	* pcs/cal-backend-file.c (save): Don't try to make an error string
-	from an uninitialized GnomeVFSResult.
-
-2003-02-10  Ettore Perazzoli  <ettore@ximian.com>
-
-	* gui/Makefile.am: Make the CORBA IDL compilation work with
-	parallel makes.
-	* gui/dialogs/Makefile.am: Likewise.
-	* gui/alarm-notify/Makefile.am: Likewise.
-
-2003-02-07  Rodney Dawes  <dobey@ximian.com>
-
-	* gui/alarm-notify/GNOME_Evolution_Calendar_AlarmNotify.server.in:
-	remove this file, as it's generated now
-	* gui/alarm-notify/GNOME_Evolution_Calendar_AlarmNotify.server.in.in:
-	Add this file to generate the .server.in from, with hardcoded path
-	* gui/alarm-notify/Makefile.am: Hardcode path in server file
-	
-2003-02-07  Rodrigo Moya <rodrigo@ximian.com>
-	
-	Fixes #37706
-
-	* gui/comp-editor-factory.c (cal_opened_cb): added PERMISSION_DENIED
-	case for not ending process on g_assert_not_reached.
-
-2003-02-06  Ettore Perazzoli  <ettore@ximian.com>
-
-	* gui/e-day-view-time-item.c
-	(e_day_view_time_item_show_popup_menu): Use
-	e_auto_kill_popup_menu_on_selection_done() instead of
-	e_auto_kill_popup_menu_on_hide().
-	* gui/dialogs/meeting-page.c (right_click_cb): Likewise.
-
-2003-02-06  Dan Winship  <danw@ximian.com>
-
-	* gui/dialogs/event-page.c (make_timezone_entry): show the widget
-	before returning it.
-
-	* importers/main.c (main): s/PACKAGE/GETTEXT_PACKAGE/ in gettext
-	init
-
-2003-02-05  Dan Winship  <danw@ximian.com>
-
-	* gui/Makefile.am (INCLUDES): Remove cruft. Rename ICONSDIR to
-	IMAGESDIR.
-	(gladedir, etspecdir, serverdir): Remove definitions
-	(libevolution_calendar_la_LDFLAGS): Remove -export-dynamic, add
-	-module.
-	
-	* gui/calendar-config.c: #include <string.h>
-
-	* gui/calendar-component.c (add_creatable_item):
-	s/ICONSDIR/IMAGESDIR/
-
-	* gui/comp-util.c: #include <string.h>
-
-	* gui/e-alarm-list.c: #include e-time-utils.h
-	(row_deleted): Remove unused variable.
-	(e_alarm_list_append): Likewise.
-
-	* gui/e-date-time-list.c: #include e-time-utils.h, timeutil.h,
-	calendar-config.h
-	(row_deleted): Remove unused variable
-	(e_date_time_list_append): Likewise.
-
-	* gui/e-day-view.c (e_day_view_unrealize): Remove unused var
-	(e_day_view_style_set): Likewise.
-	(e_day_view_set_event_font_cb): Likewise.
-
-	* gui/e-day-view-time-item.c: #include <string.h>
-	(e_day_view_time_item_get_column_width): Remove unused variable.
-
-	* gui/e-itip-control.c: #include <unistd.h>
-	(url_requested_cb): s/ICONSDIR/IMAGESDIR/
-
-	* gui/e-week-view.c (e_week_view_unrealize): Remove unused variable
-	(e_week_view_style_set): Likewise
-
-	* gui/e-week-view-titles-item.c: #include string.h
-	* gui/itip-bonobo-control.c: Likewise
-	* gui/print.c: Likewise
-
-
-	* gui/alarm-notify/Makefile.am: Use privlibexecdir.
-	(INCLUDES): Remove cruft.
-	(gladedir, serversdir): Remove definitions
-	(evolution_alarm_notify_LDFLAGS): Remove no-longer-needed
-	-export-dynamic.
-
-	* gui/alarm-notify/alarm-notify-dialog.c (write_html_heading):
-	s/ICONSDIR/IMAGESDIR
-
-	* gui/alarm-notify/notify-main.c (main): Fix up gettext
-	initialization
-
-
-	* gui/dialogs/Makefile.am (INCLUDES): Remove cruft. Rename
-	ICONSDIR to IMAGESDIR.
-	(gladedir, etspecdir): Remove definitions
-
-	* gui/dialogs/alarm-page.c: #include gtktreeselection.h and
-	gtkcellrenderertext.h
-	(append_reminder): Remove unused variable.
-	(alarm_page_fill_component): Likewise.
-	(alarm_page_set_summary): Likewise.
-	(delete_clicked_cb): Likewise.
-
-	* gui/dialogs/comp-editor.c (make_icon_from_comp):
-	s/ICONSDIR/IMAGESDIR/
-
-	* gui/dialogs/event-page.c: #include <string.h>
-
-	* gui/dialogs/meeting-page.c (meeting_page_construct): Remove
-	unused variable.
-	(meeting_page_fill_widgets): Likewise
-
-	* gui/dialogs/recurrence-page.c: #include gtktreeselection.h and
-	gtkcellrenderertext.h
-	(append_exception): Remove unused variable
-	(fill_component): Likewise
-	(recurrence_page_set_summary): Likewise.
-	(exception_delete_cb): Likewise
-
-
-	* cal-client/Makefile.am (libcal_clientincludedir): Define in
-	terms of privincludedir
-
-	* cal-client/client-test.c (main): Fix up gettext initialization
-
-	* cal-client/cal-client.c (cal_client_construct): Likewise
-
-
-	* cal-util/Makefile.am (INCLUDES): Remove cruft.
-	(libcal_utilincludedir): Define in terms of privincludedir
-
-
-	* pcs/Makefile.am (INCLUDES): Remove cruft.
-	(pcsincludedir): Define in terms of privincludedir
-
-	* pcs/cal-backend-file.c (cal_backend_file_finalize): Remove
-	unused variable
-
-
-	* importers/Makefile.am: Update this some although it's not
-	currently being built
-
-2003-02-05  Dan Winship  <danw@ximian.com>
-
-	* gui/alarm-notify/notify-main.c (main):
-	s/glade_gnome_init/glade_init/
-
-	* gui/calendar-offline-handler.c: s/BonoboXObject/BonoboObject/
-
-	* gui/comp-editor-factory.c: Likewise
-
-2003-02-05  Dan Winship  <danw@ximian.com>
-
-	* cal-util/cal-recur.c (cal_recur_nth): array of localized month
-	day names ("1st" - "31st")
-
-	* gui/dialogs/recurrence-page.c (make_recur_month_num_submenu,
-	make_recur_month_num_menu, month_num_menu_selection_done_cb): Use
-	the new cal_recur_nth[] array. The way this was done before didn't
-	localize properly.
-
-	From evolution-1-2-branch:
-
-	* gui/e-itip-control.c (write_recurrence_piece): Describe
-	recurrences, if we can. #30993
-	(set_date_label): If the meeting has recurrences, call
-	write_recurrence_piece after writing the start and end dates.
-	(write_label_piece): Wrap the timezone in <font size=-1> to
-	de-emphasize it a bit and try to keep the timestamp on a single
-	line even with big Outlook timezone names. Add an option to show
-	just the date, for describing the end of recurrences (since the
-	time in the UNTIL is the *beginning* of the last instance, which
-	would confuse people).
-	(update_item): Set the VCALENDAR's METHOD.
-	(ok_clicked_cb): Use update_item, not remove_item, to process a
-	cancelation. Part of #33875.
-
-	* pcs/cal-backend-file.c (cal_backend_file_cancel_object): New,
-	handle an ICAL_METHOD_CANCEL update.
-	(cal_backend_file_update_objects): Call
-	cal_backend_file_update_object or cal_backend_file_cancel_object
-	as appropriate.
-
-2003-02-04  Hans Petter Jansson  <hpj@ximian.com>
-
-	* gui/e-meeting-time-sel.c
-	(e_meeting_time_selector_on_invite_others_button_draw):
-	Rename to e_meeting_time_selector_on_invite_others_button_expose()
-	and handle "expose-event" instead of "draw".
-	(e_meeting_time_selector_construct): The "draw" signal doesn't exist
-	anymore - connect to "expose-event" instead.
-
-	* gui/dialogs/event-page.c (clear_widgets): Clear the GtkTextBuffer
-	for the description.
-	(event_page_fill_widgets): Use the GtkTextBuffer.
-	(event_page_fill_component): Use the GtkTextBuffer.
-	(init_widgets): Create a GtkTextBuffer for the GtkTextView. Set word
-	wrap. Connect to the "changed" signal of the model instead of the view.
-
-2003-02-04  Hans Petter Jansson  <hpj@ximian.com>
-
-	* gui/e-meeting-time-sel-item.c
-	(e_meeting_time_selector_item_paint_day_top): Use PangoLayout to
-	draw text.
-
-2003-02-02  Hans Petter Jansson  <hpj@ximian.com>
-
-	* gui/e-day-view.c (e_day_view_set_event_font_cb): Skip setting the
-	"font_gdk" arg for now.
-	(e_day_view_update_main_canvas_drag): Ditto.
-
-	* gui/e-week-view.c (e_week_view_style_set): Ditto.
-
-	* gui/weekday-picker.c (configure_items): Ditto.
-
-	* gui/dialogs/event-page.c (get_widgets): Show custom widgets
-	manually, since the visibility specified in the Glade XML appears
-	to not have any effect.
-
-	* gui/dialogs/recurrence-page.c (get_widgets): Ditto.
-
-2003-01-30 Ronald Kuetemeier <ronald@kuetemeier.com>
-
-	Fixes #35572
-
-	* gui/alarm-notify/alarm-queue.c: set saved_notification_time to last
-	notification time when we update the config to last notification, so
-	alarms will not get trigged again if a new calendar window is opened.
-
-2003-01-26  Chris Toshok  <toshok@ximian.com>
-
-	* conduits/todo/todo-conduit.c: CalClient and CalComponent are
-	GObjects.
-
-	* conduits/calendar/calendar-conduit.c: same.
-
-2003-01-26  Chris Toshok  <toshok@ximian.com>
-
-	* conduits/calendar/calendar-conduit.c (start_calendar_server):
-	fix warning.
-	(get_default_timezone): BonoboConfigDatabase -> e_config_listener.
-	(accept_all_cookies): remove.
-	(conduit_get_gpilot_conduit): remove the oaf initialization stuff.
-
-	* conduits/todo/todo-conduit.c (start_calendar_server):
-	fix warning.
-	(get_default_timezone): BonoboConfigDatabase -> e_config_listener.
-	(accept_all_cookies): remove.
-	(conduit_get_gpilot_conduit): remove the oaf initialization stuff.
-
-	* Makefile.am (CONDUIT_DIR): uncomment the conduit stuff.
-
-2003-01-26  Hans Petter Jansson  <hpj@ximian.com>
-
-	Make clicks, drags and resizes work, and pangoize remaining strings.
-	Fix EText placement.
-
-	* gui/e-day-view-top-item.c (e_day_view_top_item_draw_long_event):
-	Use Pango.
-
-	* gui/e-day-view.c (e_day_view_on_top_canvas_button_press):
-	Don't add scroll offset, it's already factored in.
-	(e_day_view_on_main_canvas_button_press): Ditto.
-	(e_day_view_on_top_canvas_motion): Ditto.
-	(e_day_view_on_main_canvas_motion): Ditto.
-	(e_day_view_reshape_long_event): Don't set the "font_gdk" property.
-	Its non-existence will prevent the other properties from being set as
-	well.
-	(e_day_view_reshape_day_event): Ditto.
-	(e_day_view_update_top_canvas_drag): Ditto.
-	(e_day_view_start_editing_event): ETextEventProcessor is a GObject
-	now. So use g_signal_stuff.
-	(e_day_view_check_auto_scroll): Factor out scroll offset before
-	checking the pointer's position relative to widget.
-	(e_day_view_auto_scroll_handler): Don't freeze the canvas when
-	scrolling - it will fail to update the canvas. If this is not
-	intended behaviour, it's a bug in the canvas, I think.
-	(e_day_view_on_main_canvas_drag_motion): Factor in the scroll offset
-	before checking for auto-scroll, since the function requires this.
-
-	* gui/e-week-view.c (e_week_view_reshape_event_span): Don't set the
-	"font_gdk" property. Its non-existence will prevent the other
-	properties from being set as well.
-	(e_week_view_start_editing_event): ETextEventProcessor is a GObject
-	now. So use g_signal_stuff.
-
-2003-01-25  Hans Petter Jansson  <hpj@ximian.com>
-
-	Mainly making all views use PangoLayouts for text. When drawing a
-	PangoLayout, the draw offset is the top left corner of the layout,
-	not the text's baseline. Keep this in mind when viewing the
-	changes. I'll be brief about the exact changes, since they speak
-	better for themselves.
-
-	* gui/e-day-view-time-item.c (e_day_view_time_item_get_column_width):
-	Use Pango.
-	(e_day_view_time_item_draw): Use Pango.
-
-	* gui/e-day-view-top-item.c (e_day_view_top_item_draw): Use Pango.
-	(e_day_view_top_item_draw_long_event): Add some FIXME text so we can
-	see when this is being used. Is it in use at all?
-
-	* gui/e-day-view.c: No longer specify an explicit X font string for
-	the large font. Use the main font, and change the point size.
-	(e_day_view_init): Use Pango.
-	(e_day_view_style_set): Use Pango. Comment out the gdk_font setting
-	for the drag text items for now.
-
-	* gui/e-day-view.h: Use Pango.
-
-	* gui/e-week-view-event-item.c (e_week_view_draw_time): Use Pango.
-
-	* gui/e-week-view-main-item.c (e_week_view_main_item_draw_day):
-	Use Pango.
-
-	* gui/e-week-view-titles-item.c (e_week_view_titles_item_draw):
-	Use Pango.
-
-	* gui/e-week-view.c: No longer specify an explicit X font string for
-	the small font. Use the main font, and change the point size.
-	(e_week_view_init): Use Pango.
-	(e_week_view_destroy): Use Pango.
-	(get_string_width): Implemented for convenience.
-	(get_digit_width): Implemented for convenience.
-	(e_week_view_style_set): Use Pango.
-	(e_week_view_recalc_cell_sizes): Use Pango.
-	(e_week_view_get_time_string_width): Use Pango.
-
-	* gui/e-week-view.h: Use Pango.
-
-	Following are some random UTF-8 fixes and a crash fix.
-
-	* gui/itip-utils.c (comp_description): Use g_locale_to_utf8 ().
-
-	* gui/dialogs/comp-editor.c (make_title_from_comp): Return a
-	UTF-8 string.
-
-	* gui/dialogs/alarm-page.c (alarm_page_set_summary): Pass UTF-8
-	directly to GTK.
-
-	* gui/dialogs/delete-comp.c (delete_component_dialog): Ditto.
-
-	* gui/dialogs/meeting-page.c (meeting_page_fill_widgets): Ditto.
-	(meeting_page_construct): Ditto.
-
-	* gui/dialogs/recurrence-page.c (recurrence_page_set_summary): Ditto.
-
-	* gui/dialogs/event-editor.c (event_editor_finalize): Fix crash caused
-	by gtk_object_destroy()-ing a non-GtkObject.
-
-2003-01-24  Hans Petter Jansson  <hpj@ximian.com>
-
-	* gui/e-day-view.c (e_day_view_on_editing_stopped): Don't insist
-	appointment is updated if both old and new summary are blank.
-
-	* gui/e-week-view.c (e_week_view_on_editing_stopped): Ditto.
-
-	* gui/e-timezone-entry.c (on_button_clicked): Timezone dialog is now
-	a GtkDialog. Treat it as such.
-
-	* gui/goto.c (ecal_event): Goto dialog is now a GtkDialog. Treat it
-	as such.
-	(goto_dialog): Ditto.
-
-	* gui/goto-dialog.glade: Set the return IDs from the dialog buttons.
-
-	* gui/dialogs/meeting-page.c (popup_delegate_cb): Enable the delegate
-	dialog. It's now a GtkDialog, so treat it like one.
-	(right_click_cb): Use GTK stock item, not GNOME (that doesn't work
-	anymore).
-
-	* gui/e-delegate-dialog.glade: Set the return IDs from dialog buttons.
-
-	* gui/print.c (print_calendar): Correct the print dialog init. Code
-	is still not enabled, though.
-
-	* gui/tasks-control.c (print_tasks): Add a warning about printing
-	being disabled.
-
-2003-01-24  Ettore Perazzoli  <ettore@ximian.com>
-
-	* gui/dialogs/Makefile.am (iconsdir): Remove, this is now defined
-	in configure.in.
-
-	* gui/Makefile.am (iconsdir): Remove; this is now defined in
-	configure.in.
-
-	* gui/alarm-notify/Makefile.am (iconsdir): Remove; this is now
-	defined in configure.in.
-
-2003-01-23  Hans Petter Jansson  <hpj@ximian.com>
-
-	* gui/dialogs/event-page.c (get_widgets): GTK_OBJECT -> G_OBJECT cast.
-	
-	* gui/dialogs/alarm-page.c (get_widgets): Ditto.
-
-	* gui/dialogs/meeting-page.c (get_widgets): Ditto.
-
-	* gui/dialogs/recurrence-page.c (get_widgets): Ditto.
-
-	* gui/dialogs/schedule-page.c (get_widget): Ditto.
-
-	* gui/dialogs/task-details-page.c (get_widget): Ditto.
-
-	* gui/dialogs/task-page.c (get_widget): Ditto.
-
-	* gui/e-meeting-time-sel.c (e_meeting_time_selector_construct): Add a
-	FIXME comment to think about.
-
-	* gui/dialogs/comp-editor.c (comp_editor_merge_ui): Add a terminating
-	NULL to the concatenation.
-
-2003-01-23  Hans Petter Jansson  <hpj@ximian.com>
-
-	Fixes some trivial, but distracting, warnings.
-
-	* gui/calendar-config.c (on_timezone_set): Fix constness.
-
-	* gui/e-timezone-entry.c (on_button_clicked): Fix constness.
-
-	* gui/dialogs/event-page.c (contacts_changed_cb): Fix constness.
-
-	* gui/dialogs/task-page.c (contacts_changed_cb): Fix constness.
-
-	* gui/e-itip-control.c (start_default_server): Cast callback with
-	G_CALLBACK ().
-
-	* gui/dialogs/schedule-page.c (init_widgets): Cast callback with
-	G_CALLBACK ().
-
-	* gui/calendar-offline-handler.c (impl_dispose): Takes GObject,
-	not GtkObject.
-	(impl_finalize): Ditto.
-
-	* gui/calendar-view.c (calendar_view_edit): Now takes parent window
-	as second arg.
-
-	* gui/e-meeting-model.c (select_names_ok_cb): Fix constness.
-	(get_select_name_dialog): Cast callback to BonoboListenerCallbackFn.
-
-	* gui/e-meeting-time-sel.c
-	(e_meeting_time_selector_options_menu_position_callback): Add the
-	push_in arg to arg list. This was crash-prone before.
-	(e_meeting_time_selector_autopick_menu_position_callback): Ditto.
-
-	* gui/alarm-notify/alarm-notify-dialog.c: Include e-unicode.h.
-
-2003-01-23  Ettore Perazzoli  <ettore@ximian.com>
-
-	* gui/Makefile.am (componentdir): Removed definition; this is now
-	defined in configure.in.
-
-2003-01-22  Ettore Perazzoli  <ettore@ximian.com>
-
-	* pcs/cal-backend.c (cal_backend_ref_categories): Do not put the
-	category in both the changed_categories and the categories hashes;
-	fixes a double-free when finalizing the CalBackend.
-
-2003-01-22  Ettore Perazzoli  <ettore@ximian.com>
-
-	* gui/gnome-cal.c (gnome_calendar_setup_view_menus): Use
-	EVOLUTION_GALVIEWSDIR.
-
-	* gui/e-tasks.c (e_tasks_setup_view_menus): Use
-	EVOLUTION_GALVIEWSDIR.
-
-	* cal-util/Makefile.am: Install libcal-util.la in $(privlibdir)
-	instead of $(libdir).
-
-	* gui/dialogs/comp-editor.c (setup_widgets): Get
-	evolution-comp-editor.xml from EVOLUTION_UIDIR.
-	(comp_editor_merge_ui): Get the file in EVOLUTION_UIDIR.
-
-	* gui/tasks-control.c (tasks_control_activate): Get
-	evolution-tasks.xml from EVOLUTION_UI_DIRECTORY.
-
-	* gui/calendar-commands.c (calendar_control_activate): Get
-	evolution-calendar.xml from EVOLUTION_UI_DIRECTORY.
-
-	* pcs/Makefile.am (pcsincludedir): Version using $(BASE_VERSION).
-
-	* importers/Makefile.am: Install evolution-calendar-importer in
-	$(libexecdir)/evolution/$(BASE_VERSION).
-	(sounddir): Remove.
-
-	* gui/dialogs/Makefile.am (iconsdir): Version using
-	$(BASE_VERSION).
-	(gladedir): Likewise.
-	(etspecdir): Likewise.
-
-	* gui/Makefile.am (help_base): Remove.
-	(install-data-local): Do not make the $(help_base)/C directory.
-	(etspecdir): Version using $(BASE_VERSION).
-	(gladedir): Likewise.
-	(iconsdir): Likewise.
-	(INCLUDES): Update the EVOLUTION_IMAGESDIR define to be versioned,
-	and add a -DEVOLUTION_GALVIEWSDIR.
-
-	* cal-util/Makefile.am: Install evolution-alarm-notify in
-	$(libexecdir)/evolution/$(BASE_VERSION).
-
-	* cal-util/Makefile.am (libcal_utilincludedir): Version using
-	$(BASE_VERSION).
-	* gui/alarm-notify/Makefile.am (iconsdir): Likewise.
-	(gladedir): Likewise.
-
-	* cal-client/Makefile.am: Install libcal-client.la in privlibdir
-	instead of libdir.
-	(libcal_clientincludedir): Version using $(BASE_VERSION).
-
-2003-01-18  Hans Petter Jansson  <hpj@ximian.com>
-
-	* gui/print.c (print_calendar): Create a GnomePrintDialog,
-	not a GnomePrinterDialog. They're different things. Patch from
-	Chema.
-
-2003-01-17  Dan Winship  <danw@ximian.com>
-
-	* pcs/cal-backend.c: Move some non-file-backend-specific stuff
-	from cal-backend-file here so it can be shared with other
-	backends.
-	(CalBackendPrivate): add this, containing the categories hashes
-	and the (formerly public) clients list.
-	(cal_backend_init, cal_backend_finalize): Handle backend->priv.
-	(cal_destroy_cb): Simplify this (and redo it as a weak notify
-	func)
-	(cal_backend_add_cal): Keep a weak ref on the cal rather than
-	connecting to its "destroy" signal. Call notify_categories_changed
-	to let the new cal know about them.
-	(get_object): Default implementation of cal_backend_get_object.
-	that calls cal_component_get_as_string on the return value of
-	cal_backend_get_object_component.
-	(cal_backend_notify_mode, cal_backend_notify_update,
-	cal_backend_notify_remove, cal_backend_notify_error): Notify each
-	Cal about something.
-	(cal_backend_ref_categories, cal_backend_unref_categories):
-	Maintain a list of categories that are used by components in the
-	backend, and trigger categories_changed notifications as needed.
-
-	* pcs/cal-backend-file.c: Remove stuff that was moved to
-	CalBackend (notify funcs, category handling, get_object
-	implementation)
-
-2003-01-16  Hans Petter Jansson  <hpj@ximian.com>
-
-	* gui/e-alarm-list.[ch]: Implement EAlarmList as CalComponentAlarm
-	list with a GtkTreeModel interface.
-
-	* gui/Makefile.am: Add e-alarm-list.[ch].
-
-	* gui/dialogs/alarm-page.[ch]: Use GtkTreeView with the new
-	EAlarmList as model for the alarm list. Update copyright.
-
-	* gui/dialogs/recurrence-page.[ch]: Update copyright.
-	(free_exception_date_time): Removed.
-	(fill_exception_widgets): Kill a lingering clist operation.
-
-2003-01-15  Hans Petter Jansson  <hpj@ximian.com>
-
-	* gui/e-meeting-time-sel.c (e_meeting_time_selector_construct):
-	Create accel groups for popup menus. Fixes crash.
-
-	* gui/e-date-time-list.[ch]: Implement EDateTimeList as
-	CalComponentDateTime list with a GtkTreeModel interface.
-
-	* gui/Makefile.am: Add e-date-time-list.[ch]. 
-
-	* gui/dialogs/recurrence-page.c: Use GtkTreeView with the new
-	EDateTimeList as model for the exception list.
-
-	* gui/e-day-view.c: Silence warnings caused by missing casts.
-
-	* gui/e-week-view.c: Silence warnings caused by missing casts.
-
-2003-01-15  Rodney Dawes  <dobey@ximian.com>
-
-	* gui/Makefile.am: Added libevolution_calendar_la_LDFLAGS, and
-	avoid versioning the shlib component
-	
-2003-01-14  Ettore Perazzoli  <ettore@ximian.com>
-
-	* cal-client/Makefile.am (CORBA_SOURCES_GENERATED): Renamed from
-	CORBA_GENERATED.
-	(CORBA_GENERATED): New, put both $(CORBA_SOURCES_GENERATED) and
-	$(CORBA_HEADERS_GENERATED) in it.
-	(BUILT_SOURCES): Put $(CORBA_GENERATED) in here.
-
-2003-01-14  Hans Petter Jansson  <hpj@ximian.com>
-
-	* gui/e-calendar-table.c (tasks_popup_menu): Cast signal handlers
-	to GtkSignalFunc, avoid warnings.
-
-	* gui/gnome-cal.c (set_view): Only set view ID if we have an instance.
-
-2003-01-14  Ettore Perazzoli  <ettore@ximian.com>
-
-	* cal-util/Makefile.am (EXTRA_DIST): cal-util-marshal.list.
-
-	* Makefile.am: Comment out the CONDUIT_DIR stuff for now.
-
-2003-01-14  Rodney Dawes  <dobey@ximian.com>
-
-	* gui/gnome-cal.c: Use GtkPaned instead of EPaned
-	
-2003-01-14  Hans Petter Jansson  <hpj@ximian.com>
-
-	* gui/e-day-view.c (e_day_view_init): Work around canvas crashes
-	by ensuring rectangles have an initial width.
-
-2003-01-13  Ettore Perazzoli  <ettore@ximian.com>
-
-	* gui/config-control-factory.h: Removed.
-	* gui/config-control-factory.c: Removed.
-
-	* gui/itip-bonobo-control.c: Renamed from itip-control-factory.c.
-	(itip_bonobo_control_new): New.
-	(itip_control_factory_init): Removed.
-
-	* gui/itip-bonobo-control.h: Renamed from itip-control-factory.h.
-
-	* gui/tasks-control-factory.c: Removed.
-	* gui/tasks-control-factory.h: Removed.
-
-	* gui/control-factory.c (control_factory_init): Removed.
-
-	* gui/Makefile.am: Updated to build everything as
-	libevolution-calendar.so and install in the COMPONENTDIR.
-
-	* gui/GNOME_Evolution_Calendar.server.in.in: Updated to build the
-	component as a shared library.
-
-	* gui/main.c (main): Removed.
-
-	* gui/calendar-component.c (calendar_component_get_object): New.
-	(owner_set_cb): Do not store the shell pointer in shells.
-	(owner_unset_cb): Do not remove the shell pointer from shells;
-	instead, just set global_shell_client to NULL.
-
-	* gui/calendar-component.h: Renamed from component-factory.h.
-	* gui/calendar-component.c: Renamed from component-factory.c.
-
-2003-01-10  Ettore Perazzoli  <ettore@ximian.com>
-
-	* importers/icalendar-importer.c (connect_to_shell):
-	CORBA_Object_release() the CORBA shell.
-
-2003-01-09  Dan Winship  <danw@ximian.com>
-
-	* gui/dialogs/recurrence-page.c (make_recur_month_num_submenu,
-	make_recur_month_num_menu, month_num_menu_selection_done_cb): Use
-	the new cal_recur_nth[] array. The way this was done before didn't
-	localize properly.
-
-	* cal-util/cal-recur.c (cal_recur_nth): array of localized month
-	day names ("1st" - "31st")
-
-	* cal-util/cal-component.c (cal_component_set_recurid): Allow
-	recur_id to be NULL to clear the recurrence id. (Based on a story
-	by JP on evolution-1-2-recurid-branch)
-
-	* gui/print.c: Remove unused gnome-print-copies.h #include
-
-	* pcs/query.c (query_new): Use g_object_weak_ref rather than
-	connecting to "destroy" (which doesn't actually exist on a
-	CalBackend)
-	(backend_destroyed_cb): Update prototype.
-
-2003-01-08  Ettore Perazzoli  <ettore@ximian.com>
-
-	* gui/alarm-notify/Makefile.am: Icons are now in
-	$(datadir)/evolution/images instead of
-	$(datadir)/images/evolution.
-	* gui/Makefile.am: Likewise.
-	* gui/dialogs/Makefile.am: Likewise.
-
-2003-01-06  Dan Winship  <danw@ximian.com>
-
-	* idl/Makefile.am: remove idldir definition. (It's defined in
-	configure.in now)
-
-2002-12-19  Hans Petter Jansson  <hpj@ximian.com>
-
-	* gui/calendar-commands.c (calendar_control_deactivate):
-	Replace gtk_signal_disconnect_by_data() with
-	g_signal_handlers_disconnect_matched(). Former takes GtkObject,
-	latter takes GObject.
-
-	* gui/calendar-model.c (calendar_model_destroy): Ditto.
-	(update_query): Ditto.
-	(calendar_model_set_cal_client): Ditto.
-
-	* gui/e-day-view.c (e_day_view_destroy): Ditto.
-	(update_query): Ditto.
-	(e_day_view_set_cal_client): Ditto.
-
-	* gui/e-tasks.c (query_eval_error_cb): Ditto.
-	(query_query_done_cb): Ditto.
-
-	* gui/e-week-view.c (e_week_view_destroy): Ditto.
-	(update_query): Ditto.
-	(e_week_view_set_cal_client): Ditto.
-
-	* gui/gnome-cal.c (update_query): Ditto.
-	(gnome_calendar_destroy): Ditto.
-
-	* gui/tasks-control.c (tasks_control_deactivate): Ditto.
-
-	* gui/e-comp-editor-registry.c (foreach_close_cb): Replace
-	gtk_signal_handler_(un)block_by_data() with
-	g_signal_handlers_(un)block_matched(). Former takes GtkObject, latter
-	takes GObject.
-
-	* gui/dialogs/alarm-page.c (alarm_page_get_type): Replace with
-	E_MAKE_TYPE().
-	(alarm_page_class_init): Use GObject as base class instead of
-	GtkObject, and set up finalization instead of destroy handler.
-	(alarm_page_destroy): Change to alarm_page_finalize() and assume
-	parent is GObject, not GtkObject.
-	(alarm_page_new): Use g_object_new(), not gtk_type_new().
-
-	* gui/dialogs/event-page.c: Same general changes as above file.
-	(update_time): Replace gtk_signal_handler_(un)block_by_data()
-	with g_signal_handlers_(un)block_matched().
-	(clear_widgets): Ditto.
-	(times_updated): Ditto.
-
-	* gui/dialogs/recurrence-page.c: Same general changes as above file.
-	(clear_widgets): Replace gtk_signal_handler_(un)block_by_data()
-	with g_signal_handlers_(un)block_matched().
-	(append_exception): Ditto.
-	(fill_ending_date): Ditto.
-	(recurrence_page_fill_widgets): Ditto.
-
-	* gui/dialogs/comp-editor.c: Same general changes as above file.
-	(comp_editor_finalize): Replace gtk_signal_disconnect_by_data()
-	with g_signal_handlers_disconnect_matched().
-	(comp_editor_remove_page): Ditto.
-
-	* gui/dialogs/event-editor.c: Same general changes as above file.
-	* gui/dialogs/meeting-page.c: Same general changes as above file.
-	* gui/dialogs/schedule-page.c: Same general changes as above file.
-	* gui/dialogs/task-details-page.c: Same general changes.
-	* gui/dialogs/task-editor.c: Same general changes as above file.
-	* gui/dialogs/task-page.c: Same general changes as above file.
-	* gui/dialogs/e-delegate-dialog.c: Same general changes.
-
-2002-12-16  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* gui/e-itip-control.c (write_html): Use camel_text_to_html()
-	instead.
-
-2002-12-16  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* gui/e-itip-control.c (write_html): Correctly convert text.value
-	into HTML here (ie, don't pass "<i>None</i>" into e_text_to_html()
-	if text.value is NULL).
-
-2002-12-06  Rodrigo Moya <rodrigo@ximian.com>
-                                                                                                
-        Fixes #35003
-
-	* gui/misc.[ch] (get_uri_without_password): new function for
-	removing the password from the CalClient's uris.
-
-	* gui/gnome-cal.c (client_cal_opened_cb): use the URI returned by
-	get_uri_without_password for messages.
-	(backend_error_cb): likewise.
-	(backend_died_cb): likewise.
-	(gnome_calendar_open): likewise.
-	(open_error, method_error, permission_error): likewise.
-
-	* gui/e-tasks.c (e_tasks_open): hide the password from the URI
-	being displayed in messages.
-	(backend_error_cb): likewise.
-
-2002-12-06  Hans Petter Jansson  <hpj@ximian.com>
-
-	* cal-client/cal-query.c (cal_query_done_status_enum_get_type):
-	Implement GType for this enumeration.
-	(cal_query_class_init): Use the enumeration instead of the
-	abstract one.
-
-	* cal-client/cal-query.h: Add type macro and proto for enum.
-
-2002-12-06  Hans Petter Jansson  <hpj@ximian.com>
-
-	* gui/component-factory.c (create_view): Pass the env argument to
-	bonobo_control_set_property ().
-
-	* gui/e-meeting-model.c (class_init): We're no longer derived from
-	GtkObject, so use GObject class methods instead. destroy->finalize.
-	(destroy): Zapped.
-	(finalize): Implement based on old destroy ().
-
-2002-12-06  Hans Petter Jansson  <hpj@ximian.com>
-
-	* cal-client/cal-client.c (cal_client_open_status_enum_get_type):
-	Create a non-abstract enumeration type derived from GEnum.
-	(cal_client_set_mode_status_enum_get_type): Ditto.
-	(cal_mode_enum_get_type): Ditto.
-	(cal_client_class_init): Use our enumerations and not the abstract
-	one.
-	(cal_client_finalize): Don't destroy factories, since the CalClient
-	doesn't own them anymore. They're shared between CalClients now.
-	(get_factories): Implement. Move the factory setup code here from
-	cal_client_construct (), and cache the factories. This is hopefully
-	temporary, until wombat goes away or is fixed.
-	(cal_client_construct): Most of the code moved to get_factories ().
-
-	* cal-client/cal-client.h: Add enumeration type macros and protos.
-
-	* gui/cal-search-bar.c (cal_search_bar_get_type): Removed in favour
-	of E_MAKE_TYPE, which uses GObject calls.
-	(cal_search_bar_class_init): Use g_type_class_peek_parent ().
-
-	* gui/calendar-model.c (calendar_model_get_type):
-	(calendar_model_class_init): Ditto, like above file.
-	* gui/calendar-view.c (calendar_view_get_type):
-	(calendar_view_class_init): Ditto.
-	* gui/e-calendar-table.c (e_calendar_table_get_type):
-	(e_calendar_table_class_init): Ditto.
-	* gui/e-comp-editor-registry.c (e_comp_editor_registry_get_type):
-	(class_init): Ditto.
-	* gui/e-day-view-main-item.c (e_day_view_main_item_get_type):
-	(e_day_view_main_item_class_init): Ditto.
-	* gui/e-day-view-time-item.c (e_day_view_time_item_get_type):
-	(e_day_view_time_item_class_init): Ditto.
-	* gui/e-day-view-top-item.c (e_day_view_top_item_get_type):
-	(e_day_view_top_item_class_init): Ditto.
-	* gui/e-day-view.c (e_day_view_get_type):
-	(e_day_view_class_init): Ditto.
-	* gui/e-itip-control.c (e_itip_control_get_type):
-	(class_init): Ditto.
-	* gui/e-meeting-attendee.c (e_meeting_attendee_get_type):
-	(class_init): Ditto.
-	* gui/e-meeting-model.c (e_meeting_model_get_type):
-	(class_init): Ditto.
-	* gui/e-meeting-time-sel-item.c
-	(e_meeting_time_selector_item_get_type):
-	(e_meeting_time_selector_item_class_init): Ditto.
-	* gui/e-meeting-time-sel.c
-	(e_meeting_time_selector_get_type):
-	(e_meeting_time_selector_class_init): Ditto.
-	* gui/e-timezone-entry.c (e_timezone_entry_get_type):
-	(e_timezone_entry_class_init): Ditto.
-	* gui/e-week-view-event-item.c (e_week_view_event_item_get_type):
-	(e_week_view_event_item_class_init): Ditto.
-	* gui/e-week-view-main-item.c (e_week_view_main_item_get_type):
-	(e_week_view_main_item_class_init): Ditto.
-	* gui/e-week-view-titles-item.c (e_week_view_titles_item_get_type):
-	(e_week_view_titles_item_class_init): Ditto.
-	* gui/gnome-cal.c (gnome_calendar_get_type):
-	(gnome_calendar_class_init): Ditto.
-	* gui/weekday-picker.c (weekday_picker_get_type):
-	(weekday_picker_class_init): Ditto.
-
-	* gui/e-week-view.c (e_week_view_get_type):
-	(e_week_view_class_init): Ditto, but parent_class init was moved
-	from get_type() to class_init().
-
-	* gui/calendar-view-factory.c (calendar_view_factory_get_type):
-	(calendar_view_factory_class_init): Ditto, and set up finalize
-	callback instead of destroy.
-	(calendar_view_factory_finalize): It's a GObject, so implement this.
-	(celendar_view_factory_destroy): Move code to _finalize() and remove.
-
-	* gui/main.c (init_bonobo): Remove extraneous bonobo_activation_init().
-
-2002-11-27  Not Zed  <NotZed@Ximian.com>
-
-	* gui/itip-utils.[ch]: run fix.sh over this.
-
-	* gui/dialogs/*.[ch]: run fix.sh over all of this.
-
-2002-11-26  Richard Li <Richard.Li@Sun.COM>
-
-	* cal-client/cal-client.c (cal_client_construct): removed extra call
-	to CORBA_exception_init.
-
-2002-11-22  Not Zed  <NotZed@Ximian.com>
-
-	* gui/dialogs/delete-comp.c (delete_component_dialog): Changed
-	e_messagebox -> gtk_messagedialog.
-
-2002-11-21  Not Zed  <NotZed@Ximian.com>
-
-	* gui/component-factory.c (create_view): pass type to
-	bonobo_control_set_property.
-
-2002-11-20  Not Zed  <NotZed@Ximian.com>
-
-	* gui/Makefile.am (EXTRA_DIST): fix typo, servers_in_files ->
-	server_in_files.
-
-2002-11-19  Ettore Perazzoli  <ettore@ximian.com>
-
-	* Makefile.am: Added rule to generate
-	GNOME_Evolution_Calendar.server.in from
-	GNOME_Evolution_Calendar.server.in.in, substituting @LIBEXECDIR@.
-	Also, install evolution-calendar in $libexecdir instead of
-	$bindir.
-
-	* gui/GNOME_Evolution_Calendar.server.in.in: Renamed from
-	GNOME_Evolution_Calendar.server.in.  Prepended the executable name
-	with @LIBEXECDIR@.
-
-2002-11-19  Not Zed  <NotZed@Ximian.com>
-
-	* gui/e-meeting-model.c (get_select_name_dialog): pass type to
-	bonobo_widget::set_property.
-	(select_names_ok_cb): ", for get_property.
-
-	* gui/dialogs/e-delegate-dialog.c (e_delegate_dialog_construct):
-	pass type to bonobo_widget::set_property & plug small leak.
-	(e_delegate_dialog_get_delegate): ", for get_property.
-	(e_delegate_dialog_get_delegate_name): "
-
-	* gui/dialogs/comp-editor-util.c (comp_editor_contacts_to_widget):
-	pass type to bonobo_widget::set_property.
-	(comp_editor_contacts_to_component): ", for get_property
-
-2002-11-16  Chris Toshok  <toshok@ximian.com>
-
-	* gui/e-meeting-time-sel.c (e_meeting_time_selector_style_set):
-	use new e_table_header_compute_height signature.
-
-2002-11-15  Rodney Dawes  <dobey@ximian.com>
-
-	* gui/component-factory.c: Use bonobo_main_quit instead of gtk
-	
-2002-11-13  Federico Mena Quintero  <federico@ximian.com>
-
-	* cal-client/cal-query.c: #include <string.h>
-	(obj_removed_cb): Fixed prototype.
-
-	* cal-client/cal-client.c (get_objects_atomically): Fix use of
-	g_signal_handler_disconnect().
-
-	* cal-client/client-test.c (create_client): Add G_CALLBACK casts.
-
-2002-11-12  Federico Mena Quintero  <federico@ximian.com>
-
-	* pcs/cal-backend-util.c: #include <string.h>
-
-	* pcs/cal.c: Fixed prototypes of the CORBA method implementations.
-
-	* pcs/cal-backend-file.c (cal_backend_file_dispose): Added a
-	dispose method.
-	(cal_backend_file_get_free_busy): Converted to use EConfigListener
-	rather than BonoboConfigDatabase.
-
-	* gui/alarm-notify/alarm-notify.c: #include <string.h>, fix use of
-	g_hash_table_lookup_extended().
-
-	* gui/alarm-notify/alarm-notify-dialog.c: Substitute deprecated
-	GTK+ functions for new ones.
-
-	* gui/alarm-notify/alarm-queue.c: Likewise.
-
-	* gui/alarm-notify/notify-main.c: #include <string.h>,
-	<gtk/gtkmain.h>.
-
-	* gui/alarm-notify/save.c: #include <string.h>.
-
-2002-11-08  Ettore Perazzoli  <ettore@ximian.com>
-
-	* gui/calendar-commands.c (calendar_control_deactivate): Use
-	g_object_set_data(..., NULL) instead of gtk_object_remove_data().
-
-	* gui/calendar-commands.c: Use g_object_{set,get}_* functions
-	instead of gtk_object_{set,get}_*.
-	* gui/calendar-commands.c: Likewise.
-	* gui/calendar-config.c: Likewise.
-	* gui/control-factory.c: Likewise.
-	* gui/e-calendar-table.c: Likewise.
-	* gui/e-comp-editor-registry.c: Likewise.
-	* gui/e-day-view-main-item.c: Likewise.
-	* gui/e-day-view-time-item.c: Likewise.
-	* gui/e-day-view-top-item.c: Likewise.
-	* gui/e-day-view.c: Likewise.
-	* gui/e-meeting-attendee.c: Likewise.
-	* gui/e-meeting-model.c: Likewise.
-	* gui/e-meeting-time-sel-item.c: Likewise.
-	* gui/e-meeting-time-sel.c: Likewise.
-	* gui/e-week-view-event-item.c: Likewise.
-	* gui/e-week-view-layout.c: Likewise.
-	* gui/e-week-view-main-item.c: Likewise.
-	* gui/e-week-view-titles-item.c: Likewise.
-	* gui/e-week-view.c: Likewise.
-	* gui/gnome-cal.c: Likewise.
-	* gui/print.c: Likewise.
-
-2002-11-08  Ettore Perazzoli  <ettore@ximian.com>
-
-	* gui/calendar-commands.c: Use g_object_ref()/g_object_unref()
-	instead of gtk_object_ref/gtk_object_unref().
-	* gui/calendar-config.c: Likewise.
-	* gui/calendar-model.c: Likewise.
-	* gui/comp-editor-factory.c: Likewise.
-	* gui/comp-util.c: Likewise.
-	* gui/e-calendar-table.c: Likewise.
-	* gui/e-day-view.c: Likewise.
-	* gui/e-itip-control.c: Likewise.
-	* gui/e-meeting-model.c: Likewise.
-	* gui/e-meeting-time-sel.c: Likewise.
-	* gui/e-tasks.c: Likewise.
-	* gui/e-timezone-entry.c: Likewise.
-	* gui/e-week-view.c: Likewise.
-	* gui/gnome-cal.c: Likewise.
-	* gui/goto.c: Likewise.
-	* gui/itip-utils.c: Likewise.
-	* gui/print.c: Likewise.
-	* gui/tasks-control.c: Likewise.
-	* gui/tasks-migrate.c: Likewise.
-
-	* gui/cal-search-bar.c: Use g_object_new() instead of
-	gtk_type_new().
-	* gui/calendar-model.c: Likewise.
-	* gui/calendar-view-factory.c: Likewise.
-	* gui/calendar-view.c: Likewise.
-	* gui/calendar-view.c: Likewise.
-	* gui/comp-editor-factory.c: Likewise.
-	* gui/e-calendar-table.c: Likewise.
-	* gui/e-cell-date-edit-text.c: Likewise.
-	* gui/e-comp-editor-registry.c: Likewise.
-	* gui/e-day-view.c: Likewise.
-	* gui/e-itip-control.c: Likewise.
-	* gui/e-meeting-attendee.c: Likewise.
-	* gui/e-meeting-attendee.c: Likewise.
-	* gui/e-meeting-model.c: Likewise.
-	* gui/e-meeting-time-sel.c: Likewise.
-	* gui/e-tasks.c: Likewise.
-	* gui/e-timezone-entry.c: Likewise.
-	* gui/e-week-view.c: Likewise.
-	* gui/gnome-cal.c: Likewise.
-	* gui/weekday-picker.c: Likewise.
-
-	* gui/e-itip-control.c (get_servers): g_object_unref the
-	shell_client instead of using bonobo_object_unref().
-
-	* gui/component-factory.c (owner_set_cb): Use
-	evolution_shell_client_corba_objref() instead of
-	bonobo_object_corba_objref().
-
-2002-11-08  Ettore Perazzoli  <ettore@ximian.com>
-
-	* gui/calendar-commands.c: Use g_signal_connect() instead of
-	gtk_signal_connect().
-	* calendar-commands.c: Likewise.
-	* calendar-config.c: Likewise.
-	* calendar-model.c: Likewise.
-	* comp-editor-factory.c: Likewise.
-	* component-factory.c: Likewise.
-	* control-factory.c: Likewise.
-	* e-calendar-table.c: Likewise.
-	* e-comp-editor-registry.c: Likewise.
-	* e-day-view-time-item.c: Likewise.
-	* e-day-view.c: Likewise.
-	* e-itip-control.c: Likewise.
-	* e-meeting-model.c: Likewise.
-	* e-meeting-time-sel.c: Likewise.
-	* e-tasks.c: Likewise.
-	* e-timezone-entry.c: Likewise.
-	* e-week-view.c: Likewise.
-	* gnome-cal.c: Likewise.
-	* goto.c: Likewise.
-	* tasks-control.c: Likewise.
-	* tasks-migrate.c: Likewise.
-	* weekday-picker.c: Likewise.
-
-2002-11-08  Ettore Perazzoli  <ettore@ximian.com>
-
-	* gui/calendar-offline-handler.c
-	(calendar_offline_handler_class_init): GObjectified.
-	(impl_finalize): Finalize impl.
-	(impl_dispose): Dispose impl.
-	(calendar_offline_handler_new): Use g_object_new().
-	(backend_cal_opened): use g_signal_connect() instead of
-	gtk_signal_connect().
-	(backend_go_offline): Likewise.
-	(backend_cal_opened): g_object_unref() instead of
-	gtk_object_unref().
-	(backend_go_offline): Likewise.
-
-2002-11-08  Rodrigo Moya <rodrigo@ximian.com>
-
-	* importers/evolution-calendar-importer.h: use GLib macros.
-
-	* importers/main.c (init_importer): use bonobo_generic_factory_new,
-	not bonobo_generic_factory_new_multi.
-	(main): don't use libgnome functions.
-
-2002-11-07  Rodrigo Moya <rodrigo@ximian.com>
-
-	* cal-client/client-test.c: don't use GTK, we don't need it.
-
-2002-11-07  JP Rosevear  <jpr@ximian.com>
-
-	* Initial port of gui/ subdir to GNOME 2
-
-2002-11-07  Rodrigo Moya <rodrigo@ximian.com>
-
-	* importers/icalendar-importer.c: removed non-existant headers.
-
-	* importers/Makefile.am: changes for BonoboActivation.
-
-	* gui/GNOME_Evolution_Calendar.server.in: install to $libdir, not
-	$datadir.
-
-2002-11-07  Rodrigo Moya <rodrigo@ximian.com>
-
-	* cal-client/query-listener.[ch]: converted to BonoboObject.
-
-	* gui/dialogs/comp-editor-util.c (parse_contact_string): use glib's
-	g_utf8_strchr.
-
-	* gui/dialogs/delete-comp.c: removed non-existant headers. Use
-	GtkStock instead of GnomeStock.
-
-	* gui/dialogs/e-delegate-dialog.c: converted to BonoboActivation.
-	(e_delegate_dialog_construct): adapted to changes in glade_xml_new.
-
-2002-11-07  Rodrigo Moya <rodrigo@ximian.com>
-
-	* pcs/cal.[ch]: converted to BonoboObject.
-	(impl_Cal_get_query): bonobo_object_unref the query returned by
-	cal_backend_get_query if we can't duplicate it.
-
-	* pcs/query.[ch]:
-	* pcs/cal-factory.[ch]: converted to BonoboObject.
-
-	* pcs/query-backend.[ch]:
-	* pcs/cal-backend-file.[ch]:
-	* pcs/cal-backend.[ch]: GObjectify.
-
-2002-11-06  Rodrigo Moya <rodrigo@ximian.com>
-
-	* gui/cal-prefs-dialog.c: #include gtkoptionmenu.h.
-	(cal_prefs_dialog_new): adapted to changes in glade_xml_new.
-
-	* gui/dialogs/event-page.h:
-	* gui/dialogs/meeting-page.h:
-	* gui/dialogs/recurrence-page.h:
-	* gui/dialogs/schedule-page.h:
-	* gui/dialogs/task-details-page.h:
-	* gui/dialogs/task-page.h:
-	* gui/cal-prefs-dialog.h: use correctly the macros.
-
-	* gui/dialogs/cancel-comp.c:
-	* gui/dialogs/changed-comp.c:
-	* gui/dialogs/comp-editor-page.c:
-	* gui/gnome-cal.h: removed non-existent headers.
-
-	* gui/dialogs/comp-editor.c: remove non-existent headers.
-	(close_dialog): gtk_widget_destroy the widget.
-	(setup_widgets, comp_editor_merge_ui): use BonoboWindow correctly.
-	(comp_editor_set_cal_client, comp_editor_send_comp,
-	 comp_editor_edit_comp): use G_OBJECT_GET_CLASS for
-	getting the class of an object.
-
-	* gui/dialogs/comp-editor-page.c (comp_editor_page_class_init):
-	use g_signal_* functions.
-
-	* gui/dialogs/comp-editor-util.c: converted to BonoboActivation.
-
-	* gui/dialogs/comp-editor.h: #include bonobo-window.h, not
-	bonobo-win.h.
-
-2002-11-06  Rodrigo Moya <rodrigo@ximian.com>
-
-	* gui/alarm-notify/GNOME_Evolution_Calendar_AlarmNotify.server.in:
-	* gui/GNOME_Evolution_Calendar.server.in: renmaed .oaf.in files.
-
-	* gui/alarm-notify/Makefile.am:
-	* gui/Makefile.am: fixed rules for .server files.
-
-2002-11-06  Rodrigo Moya <rodrigo@ximian.com>
-
-	* gui/dialogs/comp-editor-util.[ch]
-	(comp_editor_connect_contacts_changed): don't return a
-	Bonobo_EventSource_ListenerId, since it does not exist anymore,
-	and was not even being used.
-
-	* gui/e-timezone-entry.h: use GLib macros.
-
-	* gui/dialogs/*.glade:
-	* gui/alarm-notify/*.glade:
-	* gui/*.glade: converted to Glade2 format.
-
-2002-11-05  Rodrigo Moya <rodrigo@ximian.com>
-
-	* gui/dialogs/alarm-options.c (alarm_options_dialog_run): adapted to
-	to new glade_xml_new signature.
-
-	* gui/calendar-model.h:
-	* gui/dialogs/comp-editor-page.h:
-	* gui/dialogs/alarm-page.[ch]: removed non-existant header files.
-
-	* gui/dialogs/comp-editor-util.h: added missing headers.
-
-2002-11-05  Rodrigo Moya <rodrigo@ximian.com>
-
-	* pcs/cal-backend.c: use libxml2 headers.
-
-	* gui/alarm-notify/Makefile.am:
-	* gui/dialogs/Makefile.am:
-	* gui/Makefile.am: s/XML_I18N/INTLTOOL. Fixed execution of
-	$(ORBIT_IDL).
-
-	* gui/alarm-notify/alarm-notify.[ch]: converted to BonoboObject.
-
-	* gui/alarm-notify/alarm-notify-dialog.c: compilation fixes.
-	(alarm_notify_dialog): adapted to new glade_xml_new signature.
-
-	* gui/alarm-notify/alarm-queue.c: ported to BonoboActivation and
-	GtkStock and GtkDialog.
-
-	* gui/alarm-notify/notify-main.c: ported to BonoboActivation and
-	use GObject functions instead of GtkObject ones.
-
-	* gui/alarm-notify/save.h: removed BonoboConfig related functions.
-
-	* gui/alarm-notify/config-data.c: use GObject functions instead of
-	GtkObject ones.
-
-	* TODO.port: added file for keeping track of disabled things while we
-	port.
-
-2002-11-04  Rodrigo Moya <rodrigo@ximian.com>
-
-	* cal-util/cal-util-marshal.list: added new marshallers.
-
-	* cal-client/cal-client.c (get_objects_atomically): fixed calls to
-	g_signal_handler_disconnect_by_func.
-	(cal_client_class_init): fixed typos.
-
-	* cal-client/cal-client-multi.[ch]:
-	* cal-client/cal-client-types.c:
-	* cal-client/cal-query.[ch]: ported to GObject.
-
-	* cal-client/cal-listener.[ch]: converted to BonoboObject.
-
-	* cal-client/Makefile.am:
-	* pcs/Makefile.am: fixed flags for orbit-idl
-
-2002-11-04  Rodrigo Moya <rodrigo@ximian.com>
-
-	* cal-util/Makefile.am:
-	* cal-util/cal-util-marshal.list: added marshallers.
-
-	* cal-client/cal-client.[ch]: ported to GObject.
-
-2002-11-04  Rodrigo Moya <rodrigo@ximian.com>
-
-	* cal-util/cal-component.[ch]: ported to GObject.
-
-	* cal-util/cal-util.c (cal_util_generate_alarms_for_comp): use
-	g_object_* instead of gtk_object_*.
-
-2002-11-03  Rodrigo Moya <rodrigo@ximian.com>
-
-	* cal-client/cal-client.c (get_default_uri): use EConfigListener
-	instead of BonoboConfig.
-
-	* cal-client/cal-client.c:
-	* cal-client/cal-listener.[ch]:
-	* cal-client/query-listener.c: warning free.
-
-2002-11-03  Rodrigo Moya <rodrigo@ximian.com>
-
-	* pcs/cal-backend-util.[ch]: don't use BonoboConfig, but
-	EConfigListener.
-
-	* gui/calendar-config.c: use /apps/Evolution prefix for all
-	configuration keys.
-
-2002-10-31  Rodrigo Moya <rodrigo@ximian.com>
-
-	* cal-util/cal-component.[ch]:
-	* cal-util/cal-recur.h:
-	* cal-util/cal-util.[ch]:
-	* cal-client/cal-client.h:
-	* cal-client/cal-client-multi.h:
-	* cal-client/cal-client-types.[ch]:
-	* cal-client/cal-listener.h
-	* cal-client/cal-query.[ch]:
-	* cal-client/query-listener.h:
-	* pcs/cal.h:
-	* pcs/cal-backend.[ch]:
-	* pcs/cal-backend-file.h:
-	* pcs/cal-backend-util.h:
-	* pcs/cal-common.h:
-	* pcs/cal-factory.h:
-	* pcs/query.[ch]:
-	* pcs/query-backend.[ch]: started GNOME 2 porting.
-	cal-util, cal-client and pcs compiled ok.
-
-	* cal-client/cal-client.c (cal_client_construct):
-	* pcs/cal-factory.c: use b-a instead of OAF and bonobo-config
-	instead of bonobo-conf.
-
-2002-10-29  Rodrigo Moya <rodrigo@ximian.com>
-
-	* gui/gnome-cal.c (backend_died_cb): cleaned up the status bar
-	messages for all widgets.
-
-2002-10-24  JP Rosevear  <jpr@ximian.com>
-	
-	* gui/e-itip-control.c (init): initialize new values
-	(clean_up): free new values
-	(find_my_address): if we have a delegator address, use it instead
-	(write_html): display delegator info to user
-	(show_current_event): if we have a calendar uri, use that and
-	describe the event differently
-	(show_current_todo): ditto
-	(show_current): search for delegator X properties
-	(e_itip_control_set_delegator_address): accessor
-	(e_itip_control_get_delegator_address): ditto
-	(e_itip_control_set_delegator_name): ditto
-	(e_itip_control_get_delegator_name): ditto
-	(e_itip_control_set_calendar_uri): ditto
-	(e_itip_control_get_calendar_uri): ditto
-
-	* gui/e-itip-control.h: add protos
-
-	* gui/itip-utils.c (comp_from): use the first attendee as the from
-	address for things other than request, cancel and add (use
-	organizer) and publish (use default address)
-
-2002-10-23  Rodrigo Moya <rodrigo@ximian.com>
-
-	Fixes #32613
-
-	* gui/component-factory.c (sc_user_create_new_item_cb): use the
-	default calendar/tasks folder to activate the component editor.
-	(get_data_uri): deal correctly with the URIs being used.
-
-2002-10-23  JP Rosevear  <jpr@ximian.com>
-
-	* gui/e-itip-control.c (show_current): fix warning
-
-2002-10-22  Rodrigo Moya <rodrigo@ximian.com>
-
-	Fixes #32371
-
-	* pcs/query.c (start_cached_query_cb): CORBA_exception_init the
-	CORBA_Environment before using it.
-	
-2002-10-22  Rodrigo Moya <rodrigo@ximian.com>
-
-	* pcs/cal-factory.c (lookup_backend): use NULL for pointer instead of
-	FALSE.
-
-2002-10-22  JP Rosevear  <jpr@ximian.com>
-
-	* gui/itip-utils.c (get_address): use e_config_listener_* to get
-	values
-	(itip_addresses_get): ditto
-	(itip_addresses_get_default): ditto
-
-	* gui/calendar-model.c (calendar_model_value_to_string): don't
-	send back a null string (affects if it is the group header)
-	(calendar_model_init): pre load config database info so we don't
-	do corba calls during draws
-
-	Fixes #32276
-	
-2002-10-17  JP Rosevear  <jpr@ximian.com>
-
-	* gui/gnome-cal.c (gnome_calendar_construct): fix c/p type
-
-2002-10-17  JP Rosevear  <jpr@ximian.com>
-	
-	* gui/dialogs/recurrence-page.c (fill_ending_date): if the value
-	is a datetime, convert it to a date
-
-	* gui/itip-utils.c (comp_compliant): convert an UNTIL date value
-	to a datetime value
-
-	* cal-util/cal-component.c (cal_component_has_simple_recurrence):
-	check to see if the component recurrences meet our definition of
-	"simple"
-
-	* cal-util/cal-component.h: new proto
-
-2002-10-17  Rodrigo Moya <rodrigo@ximian.com>
-
-	* gui/dialogs/recurrence-page.c (fill_component): changed to have a
-	gboolean return type, which is what it's supposed to do.
-	(recurrence_page_fill_component): return the result from
-	fill_component.
-
-	* gui/dialogs/comp-editor-page.h: fixed typo in function prototype.
-
-2002-10-11  JP Rosevear  <jpr@ximian.com>
-
-	* gui/gnome-cal.c
-	(gnome_calendar_on_date_navigator_selection_changed): try to
-	preserve the work week view setting if it makes sense
-	(set_view): don't update the info again based on our view change
-	call
-
-	Fixes #16036
-	
-2002-10-08  Rodrigo Moya <rodrigo@ximian.com>
-
-	Fixes #11434
-	
-	* gui/dialogs/comp-editor-page.[ch]
-	(comp_editor_page_display_validation_error): new function.
-	
-	* gui/dialogs/event-page.c (event_page_fill_component):
-	* gui/dialogs/recurrence-page.c (fill_component):
-	* gui/dialogs/task-details-page.c (task_details_page_fill_component):
-	* gui/dialogs/task-page.c (task_page_fill_component): added
-	checks for all date values, and return FALSE if we find
-	some invalid date/times.
-	
-	* gui/dialogs/comp-editor.c (save_comp): activate the page that
-	returns error in fill_component.
-
-2002-10-08  JP Rosevear  <jpr@ximian.com>
-
-	* gui/dialogs/cal-prefs-dialog.c
-	(cal_prefs_dialog_create_time_edit): set the 24 hour format
-	initially
-
-	Fixes #31812
-	
-2002-10-08  JP Rosevear  <jpr@ximian.com>
-	
-	* gui/e-week-view.c: remove pilot settings from contextual menu
-
-	* gui/e-day-view.c: ditto
-
-2002-10-07  Rodrigo Moya <rodrigo@ximian.com>
-
-	Fixes #31774
-
-	* gui/dialogs/alarm-options.c (dalarm_widgets_to_alarm,
-	palarm_widgets_to_alarm): use correct pointer in loop.
-
-2002-10-07  JP Rosevear  <jpr@ximian.com>
-
-	* gui/dialogs/cal-prefs-dialog.c (setup_changes): cast the correct
-	item
-
-2002-10-07  Rodrigo Moya <rodrigo@ximian.com>
-
-	Fixes crash in #19159
-
-	* gui/alarm-notify/alarm-queue.c (lookup_queued_alarm): don't crash if
-	we don't find the queued alarm in the internal list.
-	(alarm_trigger_cb, create_snooze, display_notification,
-	 audio_notification, procedure_notification, remove_queued_alarm):
-	check return value from lookup_queued_alarm.
-
-2002-10-04  Rodrigo Moya <rodrigo@ximian.com>
-
-	Fixes #15892
-
-	* idl/evolution-calendar.idl: added notifyErrorOccurred method to
-	the Listener interface, so that backends can notify clients of errors
-	that can't be reported otherwise.
-
-	* pcs/cal.[ch] (cal_notify_error): new function.
-
-	* pcs/cal-backend-file.c (save): made to save to temporary file and
-	then moved to the correct file, so that we don't lose any data if
-	there's a problem while saving.
-	(notify_error): new function for notifying error messages to clients.
-
-	* cal-client/cal-listener.[ch]: added new callback function for getting
-	error messages from backends.
-	(impl_notifyErrorOccurred): new method implementation.
-	(cal_listener_class_init): initialize new epv member.
-	(cal_listener_init, cal_listener_destroy, cal_listener_construct,
-	 cal_listener_new): initialize new function pointer.
-
-	* cal-client/cal-client.[ch]: adapted to changes in CalListener class.
-	(cal_client_class_init): added "backend_error" signal to CalClient class.
-	(backend_error_cb): callback for "error_occurred" signal on the CalListener,
-	which just emits the "backend_error" signal of CalClient.
-
-	* gui/gnome-cal.c (gnome_calendar_construct): connect to "backend_error"
-	signal on the CalClient's we create.
-	(backend_error_cb): display error message on error from backend.
-
-	* gui/e-tasks.c: likewise.
-
-2002-10-02  Rodrigo Moya <rodrigo@ximian.com>
-
-	* gui/alarm-notify/notify-main.c (alarm_notify_factory_fn): removed
-	unneeded g_assert which was preventing the alarm daemon to
-	start correctly in some cases.
-
-2002-10-02  Rodrigo Moya <rodrigo@ximian.com>
-	
-	Fixes #30057
-	
-	* cal-client/cal-client.c (cal_client_is_read_only): added check
-	of the status of the client before trying to make CORBA calls.
-
-	* gui/calendar-commands.c (sensitize_calendar_commands,
-	  sensitize_taskpad_commands):
-	* gui/tasks-control.c (sensitize_commands):
-	* gui/dialogs/event-editor.c (set_menu_sens):
-	* gui/dialogs/task-editor.c (set_menu_sens):
-	* gui/e-calendar-table.c (e_calendar_table_on_right_click):
-	* gui/e-day-view.c (e_day_view_on_event_right_click):
-	* gui/e-week-view.c (e_week_view_show_popup_menu): take into account
-	the read-onlyness of clients to disable/enable menu items.
-
-2002-10-01  Rodrigo Moya <rodrigo@ximian.com>
-
-	* idl/evolution-calendar.idl: added isReadOnly method to Cal
-	interface.
-
-	* pcs/cal.c (impl_Cal_is_read_only): new method implementation.
-
-	* pcs/cal-backend.[ch]: added is_read_only method to CalBackend class.
-	(cal_backend_is_read_only): new function.
-
-	* pcs/cal-backend-file.c (cal_backend_file_is_read_only): new method.
-	(cal_backend_file_class_init): set new signal's virtual method.
-
-	* cal-client/cal-client.[ch] (cal_client_is_read_only): new function.
-
-2002-10-01  Rodrigo Moya <rodrigo@ximian.com>
-
-	Fixes #15710
-
-	* gui/dialogs/alarm-page.c (alarm_page_init): added a
-	X-EVOLUTION-NEEDS-DESCRIPTION property, so that we later set it
-	correctly if it hasn't been set in the meanwhile (editing options for
-	the alarm).
-
-	* gui/dialogs/alarm-options.c (dalarm_widgets_to_alarm,
-	palarm_widgets_to_alarm): removed X-EVOLUTION-NEEDS-DESCRIPTION
-	property from alarms every time we set the description of the alarm.
-
-2002-10-01  Rodrigo Moya <rodrigo@ximian.com>
-
-	Fixes #30290
-
-	* importers/icalendar-importer.c (process_item_fn): return a status of
-	BUSY rather than NOT_READY, to avoid the display of the error message.
-	
-2002-09-30  JP Rosevear  <jpr@ximian.com>
-
-	* conduits/calendar/calendar-conduit.c
-	(calconduit_load_configuration): load multi_day_split
-	(calconduit_save_configuration): save it
-	(calconduit_dupe_configuration): copy it
-	(e_cal_gui_new): create gui for it
-	(e_cal_gui_fill_widgets): fill gui with value
-	(e_cal_gui_fill_config): get value from gui and store in config
-	(e_calendar_context_destroy): destroy new_cfg and gui properly
-	(process_multi_day): skip item if its multi-day and we don't want
-	to split
-	(fill_widgets): fill local config widgets
-	(create_settings_window): create local config widgets
-	(save_settings): fill config from local widgets
-
-	Fixes #23763
-	
-2002-09-30  Aaron Weber  <aaron@ximian.com>
-
-	* gui/e-itip-control.c (update_item): adjust string on line 1609
-	and 1517.
-
-	* gui/dialogs/alarm-options.glade: rephrase string on line 270
-
-2002-09-27  Dan Winship  <danw@ximian.com>
-
-	* gui/calendar-commands.c (pixmaps): Remove "/Toolbar/New" and
-	"/Toolbar/NewTask" since they're not there any more. Kills some
-	bonobo-ui spewage.
-
-2002-09-26  Dan Winship  <danw@ximian.com>
-
-	Non-Connector part of #29334 (meeting created by a delegate in the
-	delegator's calendar should have the delegator as Organizer).
-
-	* idl/evolution-calendar.idl: add Cal_getEmailAddress, to return
-	the email address associated with a backend (if any).
-
-	* pcs/cal-backend.c (cal_backend_get_email_address): New.
-
-	* pcs/cal-backend-file.c (cal_backend_file_get_email_address):
-	Return NULL (for now).
-
-	* pcs/cal.c (impl_Cal_get_email_address): Implement this by
-	calling cal_backend_get_email_address and returning a NotFound
-	exception if it returns NULL.
-
-	* cal-client/cal-client.c (cal_client_get_email_address): New.
-	(cal_client_init, cal_client_destroy, etc): initialize/free
-	email_address
-
-	* gui/dialogs/event-editor.c (event_editor_construct): Split this
-	out of event_editor_init. Take and set a CalClient.
-	(event_editor_new): Take a CalClient.
-
-	* gui/dialogs/task-editor.c (task_editor_construct,
-	task_editor_new): Likewise.
-
-	* gui/dialogs/meeting-page.c (meeting_page_new,
-	meeting_page_construct): Take a CalClient and call
-	cal_client_get_email_address to find the default organizer
-	address. (Also fix a bug if the default account's name has
-	non-ASCII characters.)
-
-	* gui/itip-utils.c (comp_from): New. When sending a REQUEST or
-	CANCEL, use the Organizer as the From address.
-	(itip_send_comp): Call comp_from and pass the result to
-	Composer_setHeaders.
-
-	* gui/comp-editor-factory.c (edit_existing, edit_new): Pass the
-	CalClient to event_editor_new/task_editor_new
-
-	* gui/e-calendar-table.c (open_task): Likewise.
-
-	* gui/e-tasks.c (e_tasks_new_task): Likewise.
-
-	* gui/gnome-cal.c (gnome_calendar_edit_object,
-	gnome_calendar_new_task): Likewise.
-
-2002-09-26  JP Rosevear  <jpr@ximian.com>
-
-	* gui/e-meeting-model.c (set_value_at): only change the attendee
-	value if it isn't empty
-
-2002-09-26  Rodrigo Moya <rodrigo@ximian.com>
-
-	Should fix once for all #24210
-
-	* idl/evolution-calendar.idl: changed the notifyObjUpdated method
-	of the QueryListener interface accept a list of UIDs.
-
-	* cal-client/query-listener.[ch] (impl_notifyObjUpdated): likewise for
-	the QueryListener class.
-
-	* cal-client/cal-query.c (obj_updated_cb): changed to adapt the
-	multiple-id's received in the QueryListener class' signal to the
-	one-by-one update notification of the public CalQuery class, thus
-	keeping the changes needed for this minimal.
-
-	* pcs/query.c (add_component, start_cached_query_cb): changed to
-	send sequences of UIDs.
-
-2002-09-25  Dan Winship  <danw@ximian.com>
-
-	* gui/component-factory.c (folder_types): Add "calendar/public"
-	and "tasks/public".
-	(type_is_calendar, type_is_tasks): New utility functions
-	(create_view, create_folder, remove_folder, xfer_folder,
-	sc_user_create_new_item_cb): Use type_is_calendar/type_is_tasks
-
-	* importers/icalendar-importer.c (get_uri_from_folder_path): allow
-	importing into public calendar/task folders too.
-
-	* gui/e-itip-control.c: Note that it's intentional that we use
-	"calendar" and "tasks" here instead of "calendar/*" and "tasks/*".
-	(31032)
-
-2002-09-25  JP Rosevear  <jpr@ximian.com>
-
-	* gui/itip-utils.c (itip_send_comp): if the item being sent is not
-	a meeting, send it as a mixed item with a description and the
-	calendar text in an attachment
-
-	Fixes #30638
-
-2002-09-25  Rodrigo Moya <rodrigo@ximian.com>
-
-	Fixes #27961
-
-	* pcs/cal-backend-file.c (cal_backend_file_update_object): set the
-	LAST-MODIFIED time of the components when we save them.
-
-2002-09-24  Rodrigo Moya <rodrigo@ximian.com>
-
-	* pcs/cal-backend-file.c (cal_backend_file_get_timezone_object,
-	cal_backend_file_get_timezone): return a builtin timezone if we
-	don't find the timezone in our component.
-
-2002-09-24  JP Rosevear  <jpr@ximian.com>
-
-	* conduits/calendar/calendar-conduit.c (comp_from_remote_record):
-	make sure the start/end for no time palm events are DATE values,
-	tidy code slightly
-
-	Fixes #21631
-	
-2002-09-24  JP Rosevear  <jpr@ximian.com>
-
-	* conduits/calendar/calendar-conduit.c (process_multi_day):
-	convert to date values if the original start and end were both
-	dates
-
-2002-09-24  Rodrigo Moya <rodrigo@ximian.com>
-
-	* cal-client/cal-query.c (cal_query_destroy): unref the query
-	since now the query object on the server keeps a copy of it and
-	must know when the listener is no longer valid.
-
-	* pcs/query.c (listener_died_cb): unref the QueryListener object.
-	(query_construct): create an EComponentListener for the non-cached
-	queries' listeners also.
-
-2002-09-23  JP Rosevear  <jpr@ximian.com>
-
-	* conduits/todo/Makefile.am: add libeutil to the link
-
-	* conduits/calendar/Makefile.am: ditto
-
-2002-09-23  Dan Winship  <danw@ximian.com>
-
-	* pcs/cal.c (imple_Cal_update_objects, impl_Cal_remove_object):
-	fix non-ANSI switch statements.
-
-	* gui/e-meeting-model.c (is_cell_editable, value_is_empty,
-	process_free_busy_comp): Likewise
-
-	* gui/itip-utils.c (comp_compliant): Likewise.
-
-2002-09-23  Rodrigo Moya <rodrigo@ximian.com>
-
-	* gui/main.c (launch_alarm_daemon): install an idle callback that will
-	start the alarm daemon.
-	(launch_alarm_daemon_cb): actually activate the alarm daemon here.
-
-	* pcs/query.c (start_cached_query_cb): remove timeout function always
-	and re-add it if the query is in progress.
-
-2002-09-23  Rodrigo Moya <rodrigo@ximian.com>
-
-	* pcs/query.c (start_cached_query_cb): move success notification code
-	to its own code block, since it was being run for parse errors also.
-	Also, remove all traces of the query from the cache if there is an
-	error. Also, use GINT_TO_POINTER instead of GPOINTER_TO_INT.
-
-2002-09-23  Rodrigo Moya <rodrigo@ximian.com>
-
-	Fixes #28310
-
-	* gui/alarm-notify/save.c (save_notification_time): only save the
-	new notification time if it is bigger than the already saved one.
-	This should avoid some reminders showing up twice.
-
-2002-09-20  JP Rosevear  <jpr@ximian.com>
-
-	* gui/comp-util.c (cal_comp_is_on_server): check to see if the
-	component is already on the server or not
-
-	* gui/comp-util.h: change proto
-
-	* gui/e-week-view.c (e_week_view_on_editing_stopped): only delete
-	the event if the summary is empty and the component is not already
-	on the server
-
-	* gui/e-day-view.c (e_day_view_on_editing_stopped): same
-
-	Fixes #14111
-	
-2002-09-20  JP Rosevear  <jpr@ximian.com>
-	
-	* gui/dialogs/meeting-page.c (meeting_page_fill_widgets): set the
-	deleted attendees array to size 0 after we clean it up
-
-	Fixes #30479
-	
-2002-09-20  Rodrigo Moya <rodrigo@ximian.com>
-
-	* pcs/query.c (parse_sexp): remove the query from the cache if it
-	failed.
-	(start_cached_query_cb): notify of errors in the query.
-
-2002-09-19  Rodrigo Moya <rodrigo@ximian.com>
-
-	* pcs/query.c: added a list of EComponentListener's to control the
-	lifetime of the listeners.
-	(query_init): initialize new member.
-	(query_destroy): free new member.
-	(start_cached_query_cb): create a EComponentListener for the new
-	listener being added.
-
-2002-09-19  Rodrigo Moya <rodrigo@ximian.com>
-
-	More fixes for #24210
-
-	* pcs/query.c: added list of cached queries and changed the Query
-	class to work with several listeners, not only one.
-	(query_init): initialize new members.
-	(query_destroy): free new members.
-	(add_component, remove_component, parse_sexp, match_component,
-	 process_components_cb): notify all listeners.
-	(notify_uid_cb, start_cached_query_cb): implemented integration of
-	cached queries.
-	(query_new): search the query in the cache before creating a new
-	one. And if we create a new one, store it in the cache.
-
-2002-09-19  JP Rosevear  <jpr@ximian.com>
-
-	* gui/dialogs/recurrence-page.c (simple_recur_to_comp): bump the
-	month_num by 1 because it indexs at 0
-	(recurrence_page_fill_widgets): lower the month_num by one as above
-
-	Fixes #30381
-	
-2002-09-17  Rodrigo Moya <rodrigo@ximian.com>
-
-	Fixes #26362
-
-	* gui/e-itip-control.c (show current): add a default reminder if
-	default reminders are set in the configuration.
-
-2002-09-11  JP Rosevear  <jpr@ximian.com>
-
-	* gui/e-day-view.c (e_day_view_on_top_canvas_button_press): keep
-	the selection if we right click in it (but not on an appointment)
-	(e_day_view_on_main_canvas_button_press): ditto
-
-	* gui/e-week-view.c (e_week_view_on_button_press): same
-
-2002-09-11  JP Rosevear  <jpr@ximian.com>
-	
-	* gui/e-week-view.c (e_week_view_new_appointment): create a new
-	appointment based on the selection
-	(e_week_view_on_button_press): use above
-	(e_week_view_on_new_appointment): ditto
-	(e_week_view_on_new_meeting): ditto
-
-	Fixes #18162
-	
-2002-09-10  JP Rosevear  <jpr@ximian.com>
-
-	* gui/comp-editor-factory.c (get_default_event): duh, don't
-	blindly increment the hour without adjusting for the day
-	boundaries
-
-	Fixes #29983
-	
-2002-09-10  Rodrigo Moya <rodrigo@ximian.com>
-
-	Fixes #24032
-
-	* gui/e-itip-control.c (init): don't get servers here, since we don't
-	know the type of the component(s) to be loaded.
-	(show_current): get servers here.
-	(destroy): only free stuff that needs to be freed.
-
-2002-09-09  Rodrigo Moya <rodrigo@ximian.com>
-
-	* gui/gnome-cal.c (client_cal_opened_cb): display status messages for
-	all operations we make, so that when using remote slow backends, so
-	that users have always indication of what's happening.
-
-2002-09-06  JP Rosevear  <jpr@ximian.com>
-
-	* gui/gnome-cal.c (gnome_calendar_edit_object): kill warning
-
-	* gui/e-week-view.h: new proto
-
-	* gui/e-week-view.c (e_week_view_set_selected_time_range_visible):
-	select a range of time in the currently visible area, if out side
-	the visible area, select as much as possible
-	(e_week_view_on_text_item_event): call above
-
-	* gui/e-week-view-event-item.c
-	(e_week_view_event_item_button_press): call above
-
-	* gui/e-day-view.c
-	(e_day_view_set_selected_time_range_in_top_visible): select a
-	range of time in the currently visible area, if out side the
-	visible area, select as much as possible
-	(e_day_view_set_selected_time_range_visible): the same for the
-	main canvas
-	(e_day_view_on_long_event_button_press): call above
-	(e_day_view_on_event_button_press): ditto
-
-2002-09-05  JP Rosevear  <jpr@ximian.com>
-
-	* gui/itip-utils.c (itip_send_comp): don't try to send via the
-	server if we are publishing; don't bail out on a 0 length to list
-	if we are publishing
-
-2002-09-05  Anna Marie Dirks <anna@ximian.com>	
-
-	* gui/GNOME_Evolution_Calendar.oaf.in: Changed the description of
-	the calendar/tasks page of the settings dialog, to be hopefully
-	more descriptive and less awkwardly worded.
-
-
-2002-09-05  Rodrigo Moya <rodrigo@ximian.com>
-
-	* gui/e-day-view.c (e_day_view_on_drag_data_get): added support for
-	text/x-calendar targets, in which case a VCALENDAR component, with
-	full timezone information is returned.
-
-2002-09-04  JP Rosevear  <jpr@ximian.com>
-
-	* gui/gnome-cal.c (gnome_calendar_destroy): don't listen to client
-	signals after we get destroyed
-
-	Fixes #17036
-	
-2002-09-04  JP Rosevear  <jpr@ximian.com>
-	
-	* gui/dialogs/event-editor.c (event_editor_send_comp): bail out if
-	we couldn't send the cancel
-
-	* gui/dialogs/task-editor.c (task_editor_send_comp): ditto
-
-	* gui/dialogs/comp-editor.c (save_comp_with_send): indicate send
-	status
-	(real_send_comp): return success/fail, only resave the component a
-	if we successfully sent
-	(comp_editor_send_comp): return success/fail
-
-	* gui/itip-utils.h: update proto
-
-	* gui/itip-utils.c (itip_send_comp): return true if we sent the
-	message
-	
-2002-09-04  JP Rosevear  <jpr@ximian.com>
-
-	* gui/itip-utils.c (comp_server_send): provide error message
-	param, give a dialog with the message if we get a busy result;
-	return TRUE if we succeed
-	(itip_send_comp): bail out if we had a problem sending via the
-	server
-
-	* cal-client/cal-client.c (cal_client_send_object): pass back
-	error message if we get the busy exception in the new param
-
-	* cal-client/cal-client.h: update proto
-
-	* pcs/cal.c (impl_Cal_send_object): dump backend error message
-	into Busy exception
-
-	* pcs/cal-backend.h: update proto
-
-	* pcs/cal-backend.c (cal_backend_send_object): take/pass new error
-	message parameter
-
-	* pcs/cal-backend-file.c (cal_backend_file_send_object): take new param
-
-	* idl/evolution-calendar.idl: add errorMsg to Busy exception
-
-2002-09-04  Ettore Perazzoli  <ettore@ximian.com>
-
-	* gui/component-factory.c (create_object): Pass NULL as
-	@unpopulate_folder_context_menu_fn to
-	evolution_shell_component_new().
-
-2002-09-03  JP Rosevear  <jpr@ximian.com>
-
-	* gui/itip-utils.c (comp_compliant): don't make the reply
-	component minimal
-
-	Fixes #28956
-	
-2002-08-30  JP Rosevear  <jpr@ximian.com>
-
-	* gui/itip-utils.c (itip_send_comp): make the sure to list is 0
-	length before sending via imip
-
-	Fixes #29624
-	
-2002-08-30  Mike Kestner  <mkestner@ximian.com>
-
-	* gui/dialogs/event-page.c:
-	* gui/dialogs/task-page.c: use bonobo_object_release_unref to release
-	the remote SelectNames component, not CORBA_Object_release.
-
-2002-08-29  JP Rosevear  <jpr@ximian.com>
-
-	* gui/e-day-view.c (e_day_view_on_top_canvas_button_press): select
-	the top canvas if the user right-clicks on it
-	(e_day_view_on_main_canvas_button_press): select the row the user
-	is right-clicking on
-	(e_day_view_on_long_event_button_press): select the top canvas if
-	the user right-clicks on an event there
-	(e_day_view_on_event_button_press): select the relevant rows if
-	the user right-clicks on an event
-	(e_day_view_set_selected_time_range_in_top): select a number of
-	days in the top canvas
-
-	* gui/e-week-view.c (e_week_view_on_button_press): select the day
-	the user is right-clicking on
-	(e_week_view_on_text_item_event): select the corresponding time
-	range when showing the contextual menu for an event
-
-	* gui/e-week-view-event-item.c
-	(e_week_view_event_item_button_press): select the corresponding
-	time range when showing the contextual menu for an event
-
-	Fixes #14660
-	
-2002-08-28  Rodrigo Moya <rodrigo@ximian.com>
-
-	* gui/e-day-view.c:
-	* gui/e-week-view.c: added missing header file.
-
-2002-08-28  Dan Winship  <danw@ximian.com>
-
-	* gui/GNOME_Evolution_Calendar.oaf.in: Add an
-	evolution:shell_component_launch_order and rename
-	evolution:shell_component_icon.
-
-2002-08-27  Rodrigo Moya <rodrigo@ximian.com>
-
-	* gui/calendar-config.c: use EConfigListener instead of direct access
-	to the bonobo-conf database.
-	(calendar_config_init): create the EConfigListener here, and install
-	an atexit function to unref the config listener object.
-	(config_read, property_change_cb, calendar_config_write,
-	 calendar_config_write_on_exit): removed unneeded functions.
-	(calendar_config_get_*, calendar_config_set_*): changed to make use of
-	EConfigListener directly.
-
-	* gui/main.c (main): removed call to calendar_config_write_on_exit.
-
-	* gui/dialogs/cal-prefs-dialog.c (update_config): removed call to
-	calendar_config_write.
-
-2002-08-26  Rodrigo Moya <rodrigo@ximian.com>
-
-	Fixes #12326
-
-	* gui/alarm-notify/config-data.c (ensure_inited): create a
-	EConfigListener for configuration access.
-	(do_cleanup): g_atexit installed function, to clean up configuration
-	database resources.
-	(config_data_get_timezone): retrieve the configuration for the
-	EConfigListener object.
-	(config_data_get_listener): new function.
-
-	* gui/alarm-notify/save.c (get_config_db, discard_config_db): removed.
-	Use EConfigListener instead.
-	(save_notification_time, get_saved_notification_time,
-	 save_calendars_to_load, get_calendars_to_load, save_blessed_program,
-	 is_blessed_program): use EConfigListener.
-
-	* gui/alarm-notify/notify-main.c (init_alarm_notify_service): removed.
-	(alarm_notify_factory_fn): create here the alarm_notify_service if it
-	hasn't been created yet.
-	(load_calendars): likewise.
-	(main): don't call init_alarm_notify_service.
-
-2002-08-22  JP Rosevear  <jpr@ximian.com>
-
-	* gui/e-meeting-model.c (process_section): if its a
-	non-participant, add it as a resource to match dialog label
-	(set_value_at): if the type is set to be a resource, switch the
-	role to non-participant by default
-
-2002-08-22  JP Rosevear  <jpr@ximian.com>
-	
-	* gui/calendar-model.c (set_completed): if the value given is a
-	date, convert to a time in the current zone
-
-2002-08-20  JP Rosevear  <jpr@ximian.com>
-
-	* gui/tasks-control.c (tasks_control_activate): don't set the
-	tasks ui component until the container is set, remove unused
-	pixmaps
-
-2002-08-19  JP Rosevear  <jpr@ximian.com>
-
-	* gui/e-meeting-model.c (destroy): disconnect destroy signal
-	callbacks on tables
-
-	Fixes #28231
-
-2002-08-19  JP Rosevear  <jpr@ximian.com>
-	
-	* gui/itip-utils.c (comp_toplevel_with_zones): clone the ical
-	component before adding it
-
-	Fixes #29061
-	
-2002-08-19  JP Rosevear  <jpr@ximian.com>
-	
-	* gui/comp-editor-factory.c (get_default_event): make sure to get
-	the date in the current zone, not at UTC
-
-	Fixes #17692
-	
-2002-08-19  JP Rosevear  <jpr@ximian.com>
-
-	* gui/e-itip-control.c (set_date_label): stop adding redundant
-	information for start/end/due/complete times
-	(write_html): convert newlines properly and escape characters for
-	summary, location, description; put text information on separate
-	line from bolded title to make it look nicer when there are line
-	breaks
-
-	Fixes #26964
-	
-2002-08-16  Rodrigo Moya <rodrigo@ximian.com>
-
-	* cal-client/cal-client.[ch]: added internal EComponentListener
-	object, to listen for the activated Cal.
-	(cal_client_class_init): added "backend_died" signal.
-	(cal_client_destroy): clean up component listener.
-	(backend_died_cb): new callback for getting signals from the
-	EComponentListener.
-	(cal_opened_cb): setup component listener.
-	
-	* cal-client/Makefile.am: added libetuil to needed LIBS.
-
-	* gui/gnome-cal.c (backend_died_cb): new callback.
-	(gnome_calendar_construct): connect to "backend_died" signal
-	on all CalClient's we create.
-	
-2002-08-14  JP Rosevear  <jpr@ximian.com>
-
-	* gui/dialogs/cal-prefs-dialog.c (init_widgets): listen for the
-	time editors to change
-	(cal_prefs_dialog_start_of_day_changed): make sure the start is
-	never after the end
-	(cal_prefs_dialog_end_of_day_changed): make sure the end is never
-	after the start
-
-	* gui/e-meeting-time-sel.c
-	(e_meeting_time_selector_set_working_hours): make sure to show a
-	minimum of 1 hour for work day
-
-	* gui/e-day-view-main-item.c (e_day_view_main_item_draw):
-	calculate the work/not working color boxes to the nearest pixel,
-	rather the the nearest time division
-
-	Fixes #10286, #26285
-	
-2002-08-13  Dan Winship  <danw@ximian.com>
-
-	* gui/e-itip-control.c: Remove a bunch of old #if 0 code.
-	(update_item): Set X-MICROSOFT-CDO-REPLYTIME here.
-
-	* gui/itip-utils.c (comp_toplevel_with_zones): Don't set it here.
-
-	* cal-util/cal-component.c (ensure_mandatory_properties): Use
-	icaltime_current_time_with_zone rather than rolling our own.
-	(cal_component_strip_errors): Remove unused variable.
-
-2002-08-13  Rodrigo Moya <rodrigo@ximian.com>
-
-	* gui/gnome-cal.c (gnome_calendar_open): set status message on
-	ECalendarTable when opening the tasks.
-	(client_cal_opened_cb): set ECalendarTable status message to NULL
-	when we open the tasks folder. Also, clear up calendar status message
-	in all cases, not only if the folder was opened successfully.
-
-2002-08-13  Rodrigo Moya <rodrigo@ximian.com>
-
-	* gui/gnome-cal.c (gnome_calendar_open): set status message to NULL
-	if there is an error opening the calendar.
-	(client_cal_opened_cb): set status message to NULL only when we have
-	successfully opened the main CalClient.
-
-2002-08-09  JP Rosevear  <jpr@ximian.com>
-
-	* gui/dialogs/comp-editor.c (real_send_comp): set the editor to
-	changed so the item actually gets saved
-
-2002-08-08  JP Rosevear  <jpr@ximian.com>
-
-	* gui/itip-utils.c (users_has_attendee): check for an attendee in
-	the list
-	(comp_to_list): only add the user if they aren't on the list
-	(comp_server_send): don't remove the users, pass back the list
-	(itip_send_comp): send to server before doing comp_minimal
-
-	* gui/dialogs/comp-editor.c (real_send_comp): edit and save the
-	updated comp
-
-	* pcs/cal.c (impl_Cal_send_object): copy the correct item to pass
-	back
-
-2002-08-08  Dan Winship  <danw@ximian.com>
-
-	* pcs/query-backend.c (query_backend_new): Initialize
-	loaded_backends before using it. (Just kills off a harmless
-	g_warning.)
-
-2002-08-08  Rodrigo Moya <rodrigo@ximian.com>
-
-	Fixes #15710
-
-	* cal-util/cal-component.[ch]
-	(cal_component_alarm_get_icalcomponent): new function for getting
-	the icalcomponent from a CalComponentAlarm.
-
-	* gui/comp-util.c (cal_comp_event_new_with_defaults): added
-	X-EVOLUTION-NEEDS-DESCRIPTION property to the default reminder
-	alarm, so that we can identify it when saving the component.
-
-	* gui/dialogs/alarm-page.c (alarm_page_fill_component): if the
-	alarm has the X-EVOLUTION-NEEDS-DESCRIPTION property, set the
-	description to be the same as of the component.
-
-2002-08-07  JP Rosevear  <jpr@ximian.com>
-
-	* pcs/cal-backend-file.c (cal_backend_file_send_object): just
-	return the object untouched since we don't send anything
-
-	* pcs/cal-backend.c (cal_backend_remove_object): call virtual method
-
-	* pcs/cal-backend.h: add send result codes, new proto
-
-	* pcs/cal.c (impl_Cal_send_object): implement sendObject corba call
-	(cal_class_init): add to epv
-
-	* gui/itip-utils.c (comp_toplevel_with_zones): utility function to
-	create icalcomponent with necessary timezone info
-	(comp_has_attendee): see if attendee is in the attendee list
-	(comp_server_send): use above and remove attendees if the server
-	sends them
-
-	* gui/e-itip-control.c (show_current_todo): remove unused var
-
-	* idl/evolution-calendar.idl: add Busy exception and
-
-	* cal-client/cal-client.c (cal_client_send_object): send object
-	via the server (if the server can)
-
-	* cal-client/cal-client.h: add send results and new proto
-
-2002-08-05  Rodrigo Moya <rodrigo@ximian.com>
-
-	* pcs/query-backend.[ch] (query_backend_get_object_component): new
-	function.
-	(query_backend_get_uids): new function.
-	(query_backend_new): create the static GHashTable if it hasn't been
-	created yet.
-	(query_backend_destroy): destroy the static GHashTable if empty.
-	(foreach_uid_cb): call object_updated_cb, which does everything.
-
-	* pcs/query.c: make use of the new QueryBackend class.
-	(query_init): initialize new private structure member.
-	(query_destroy): clean up new member, without freeing it, since it is
-	managed internally in query-backend.c.
-	(query_construct): create a QueryBackend for the query.
-	
-2002-08-04  Rodrigo Moya <rodrigo@ximian.com>
-
-	Fixes the crash in #19159
-
-	* gui/alarm-notify/alarm-queue.c (create_snooze): check for NULL
-	pointers before using them.
-
-2002-08-02  JP Rosevear  <jpr@ximian.com>
-
-	* gui/e-week-view.c (e_week_view_init): don't warn if we can't use
-	the small font, just set use_small_font to FALSE
-
-2002-08-02  JP Rosevear  <jpr@ximian.com>
-	
-	* gui/e-itip-control.c (adjust_item): new util function to add
-	information to an itip message that might not already be there for
-	display purposes (summary, location, etc)
-	(show_current_event): use above
-	(show_current_todo): ditto
-
-2002-08-02  JP Rosevear  <jpr@ximian.com>
-	
-	* gui/e-meeting-model.c (init): initialize value to corba nil
-
-2002-08-01  Ettore Perazzoli  <ettore@ximian.com>
-
-	* gui/component-factory.c (create_object): Use
-	meeting-request-16.png instead of meeting-request.png.
-
-	* gui/calendar-commands.c (pixmaps): Remove pixmaps in
-	/menu/File/New/NewFirstItem/.
-
-2002-08-01  JP Rosevear  <jpr@ximian.com>
-
-	* gui/calendar-model.c (is_overdue): use get_due_status
-	(get_color): ditto
-	(get_due_status): utility function to reduce replicated code,
-	handle the case where the due date is just a date
-
-2002-07-31  Rodrigo Moya <rodrigo@ximian.com>
-
-	* pcs/query-backend.[ch]: new class for implementing a backend cache
-	for the calendar queries.
-
-	* pcs/Makefile.am: added new files.
-
-2002-07-31  Ettore Perazzoli  <ettore@ximian.com>
-
-	* gui/component-factory.c (create_object): Change the order of the
-	user creatable items a bit so that "New Appointment" and "New
-	Meeting" are at the top when in a calendar folder.
-
-2002-07-31  Ettore Perazzoli  <ettore@ximian.com>
-
-	* gui/component-factory.c (add_creatable_item): New arg
-	@folder_type, pass it to
-	evolution_shell_component_add_user_creatable_item().
-	(create_object): Set the right folder types for the various
-	user-creatable items.
-
-2002-07-31  JP Rosevear  <jpr@ximian.com>
-
-	* gui/e-tasks.c (e_tasks_destroy): we no longer need to manually
-	save the state
-	(e_tasks_open): we no longer need to manually load the state
-	(display_view_cb): attach the gal view to the table
-
-	Fixes #27894
-	
-2002-07-29  JP Rosevear  <jpr@ximian.com>
-
-	* gui/e-day-view.c (e_day_view_find_work_week_start): make sure
-	that the work week view goes to the current work week if the day
-	selected is before the start of the work week
-
-	Fixes #20317
-	
-2002-07-28  Rodrigo Moya <rodrigo@ximian.com>
-
-	* gui/dialogs/task-details-page.c: fixed mapping of popdown menu
-	to ICAL_STATUS_ values.
-	(task_details_page_fill_widgets): when we can't set the status,
-	default to ICAL_STATUS_NONE, which maps to 'Not started'. Fixed
-	use of 'percent' variable, which was being used after being freed.
-	(percent_complete_changed): default to ICAL_STATUS_NONE (Not Started).
-
-	* gui/dialogs/task-details-page.glade: added 'Needs Action' to
-	popdown menu values.
-
-2002-07-26  Rodrigo Moya <rodrigo@ximian.com>
-
-	* cal-util/cal-util.[ch] (cal_util_add_timezones_from_component):
-	new function for adding VTIMEZONE components to a VCALENDAR
-	component.
-
-	* gui/e-calendar-table.c (copy_row_cb): added VTIMEZONE components
-	to resulting VCALENDAR top-level component.
-
-	* gui/e-week-view.c (e_week_view_copy_clipboard): copy to the
-	clipboard a top-level VCALENDAR component, with all the needed
-	VTIMEZONE components.
-	(e_week_view_on_copy): likewise.
-
-	* gui/e-day-view.c (e_day_view_copy_clipboard): likewise.
-	(e_day_view_on_copy): likewise.
-
-2002-07-26  JP Rosevear  <jpr@ximian.com>
-
-	* cal-client/cal-client.c (cal_client_construct): remove useless
-	debug statement
-
-	Probably fixes #19333
-	
-2002-07-26  JP Rosevear  <jpr@ximian.com>
-	
-	* gui/comp-editor-factory.c (impl_editExisting): focus the editor
-	if it does exist, create a new one if it doesn't (not vice-versa)
-
-	Fixes #23468
-	
-2002-07-25  JP Rosevear  <jpr@ximian.com>
-
-	* gui/e-day-view.c (e_day_view_init): set large_font to NULL
-	(e_day_view_style_set): calculate large font, fall back to the
-	style->font if necessary
-
-	Fixes #11773
-	
-2002-07-24  JP Rosevear  <jpr@ximian.com>
-
-	* gui/e-itip-control.c (write_html): display the location in the
-	itip information
-
-	Fixes #24690
-	
-2002-07-24  JP Rosevear  <jpr@ximian.com>
-
-	* gui/calendar-model.c (set_percent): set status to in progress if
-	the percent is between 0 and 100
-	(set_status): if the value is set to in process, change the
-	percent to 50
-
-	Fixes #1590
-	
-2002-07-24  JP Rosevear  <jpr@ximian.com>
-	
-	* cal-util/timeutil.c (time_day_of_year): add a day for the leap
-	year only if we are currently counting Feb., not if the month
-	passed in is Feb.  Fixes #23446.
-
-2002-07-23  JP Rosevear  <jpr@ximian.com>
-
-	* gui/e-day-view.c (e_day_view_realize): use proper meeting icon
-
-2002-07-22  Dan Winship  <danw@ximian.com>
-
-	* pcs/Makefile.am: Split pcs-backend-file out of libpcs and build
-	it as a separate (noinst) library libpcsfile.a. This gets the db3
-	dependencies out of libpcs, and people trying to create a calendar
-	backend shouldn't be calling functions from the existing backends
-	anyway so there's no reason to install them.
-
-	* cal-util/timeutil.c: Replace a bunch of old gnomecal functions
-	with the functionally identical ones from Connector.
-
-2002-07-18  Rodrigo Moya <rodrigo@ximian.com>
-
-	* importers/icalendar-importer.c (get_uri_from_folder_path): if
-	there's an exception, continue with the next item.
-
-2002-07-08  Peter Williams  <peterw@ximian.com>
-
-	* cal-util/Makefile.am: Install libcal-util-static.la
-	and fix the -all-static flag to make it install statically.
-	
-	* pcs/Makefile.am: Install libpcs.a and its headers.
-
-	* pcs/cal-backend-util.h: Same sort of include namespacing fix,
-	but for pcs.
-
-	* pcs/cal.h:
-	* pcs/query.h:
-	* pcs/cal-factory.h:
-	* pcs/cal-backend.h:
-	* pcs/cal-backend-file.h: Same.
-
-2002-07-17    <jpr@ximian.com>
-
-	* gui/calendar-model.c (calendar_model_value_at): use util
-	function to see if the user is the organizer
-
-	* gui/dialogs/cancel-comp.c (cancel_component_dialog): add
-	deleting proto to indicate whether cancelling or deleting is the
-	primary operation
-
-	* gui/dialogs/cancel-comp.h: update proto
-
-	* gui/dialogs/comp-editor.c (delete_cmd): offer to cancel
-
-	* gui/dialogs/task-editor.c (cancel_task_cmd): call
-	cancel_component_dialog with new param
-
-	* gui/dialogs/event-editor.c (cancel_meeting_cmd): ditto
-
-	* gui/e-week-view.c (e_week_view_on_editing_stopped): only update
-	request if user is organizer
-	(e_week_view_show_popup_menu): disable the meeting and meeting
-	organizer mask if appropriate
-	(e_week_view_delete_event_internal): offer to cancel the meeting
-	(e_week_view_on_cut): ditto
-	(selection_received): send request if its a meeting
-
-	* gui/e-day-view.h: add meeting icon/mask
-
-	* gui/e-day-view.c (e_day_view_on_event_right_click): disable the
-	meeting and meeting organizer mask if appropriate
-	(e_day_view_delete_event_internal): offer to cancel meeting
-	(e_day_view_on_cut): ditto
-	(e_day_view_finish_long_event_resize): only update request if user
-	is organizer
-	(e_day_view_reshape_long_event): add meeting icon to count
-	(e_day_view_reshape_day_event): ditto
-	(e_day_view_on_top_canvas_drag_data_received): only update request
-	if user is organizer
-	(e_day_view_on_main_canvas_drag_data_received): ditto
-	(selection_received): offer to send meeting info
-
-	* gui/e-day-view-main-item.c
-	(e_day_view_main_item_draw_day_event): draw meeting icon if
-	appropriate (using dummy icon atm)
-
-2002-07-14  Rodrigo Moya <rodrigo@ximian.com>
-
-	Fixes #8001
-
-	* importers/icalendar-importer.c (connect_to_shell): new function for
-	connecting the importers (both iCal and vCal) to the shell, needed for
-	some information retrieval about the folders we're importing to.
-	(ical_importer_new, vcal_importer_new): call connect_to_shell.
-	(importer_destroy_cb): unref the shell client object.
-	(get_uri_from_folder_path): retrieve the uri from the storage
-	registry.
-	(check_folder_type): removed.
-
-	* importers/Makefile.am: included libeshell to LIBS.
-
-2002-07-12  Peter Williams  <peterw@ximian.com>
-
-	* pcs/cal.c: Sigh, fix for the wombat.idl -> Evolution-Wombat.idl
-	rename here too. At least grep indicates that's all that needs to
-	be fixed.
-
-2002-07-08  Peter Williams  <peterw@ximian.com>
-
-	* gui/Makefile.am (INCLUDES): Change the -I flags to get
-	it to play nicely with the new Ebook header paradigm.
-
-	* gui/dialogs/Makefile.am: Same.
-	
-	* gui/e-meeting-model.c: More of the same.
-
-	* gui/dialogs/e-delegate-dialog.c:
-	* gui/dialogs/e-meeting-model.c:
-	* gui/dialogs/comp-editor-util.c: Fix include lines to get
-	ebook headers.
-
-	* pcs/Makefile.am: Same.
-
-2002-07-02  Rodrigo Moya <rodrigo@ximian.com>
-
-	Fixes #16034
-
-	* gui/e-day-view.c (e_day_view_reshape_long_event):
-	(e_day_view_reshape_day_event):
-	* gui/e-day-view-main-item.c (e_day_view_main_item_draw_day_event):
-	* gui/e-week-view.c (e_week_view_reshape_event_span):
-	* gui/e-week-view-event-item.c (e_week_view_event_item_draw_icons):
-	Don't assume all categories have icons when allocating space for
-	the icons.
-
-2002-07-02  Ettore Perazzoli  <ettore@ximian.com>
-
-	* gui/component-factory.c (add_creatable_item): New arg @tooltip.
-	Pass it to evolution_shell_component_add_user_creatable_item(),
-	which now has a @tooltip arg.
-	(create_object): Added tooltips.
-
-2002-07-01  JP Rosevear  <jpr@ximian.com>
-
-	* gui/calendar-config.c (config_read): listen for timezone config
-	change
-	(property_change_cb): set the timezone if it changed elsewhere
-
-	* gui/main.c (init_bonobo): call bonobo_activate because we make
-	bonobo related calls before the bonobo_main call
-
-2002-06-25  Rodrigo Moya <rodrigo@ximian.com>
-
-	Fixes #25410
-
-	* gui/alarm-notify.c (AlarmNotify_removeCalendar): do proper
-	cleanup on removal of clients.
-	(alarm_notify_add_calendar): ditto.
-
-2002-06-27  JP Rosevear  <jpr@ximian.com>
-	
-	* gui/itip-utils.c (comp_compliant): plug leak and actually use
-	the minimal comp we create
-	
-2002-06-25  JP Rosevear  <jpr@ximian.com>
-
-	* gui/dialogs/comp-editor-page.h: add back proto
-
-	* gui/dialogs/comp-editor-page.c
-	(comp_editor_page_notify_needs_send): add page needs_send signal
-
-	* gui/e-meeting-time-sel.c
-	(e_meeting_time_selector_on_invite_others_button_draw): check to
-	see if the button should be sensitive when drawing
-	(e_meeting_time_selector_construct): listen for the button draw
-	signal
-
-	* cal-util/cal-component.c (cal_component_strip_errors): remove
-	X-LIC-ERROR x properties
-
-	* cal-util/cal-component.h: new proto
-
-	* gui/dialogs/meeting-page.c (change_clicked_cb): set needs_send
-	to true
-	(meeting_page_fill_widgets): set up gui based on if the user or
-	someone else is the organizer
-	(meeting_page_construct): read the addresses here for the combo
-	box
-	(get_widgets): explicitly set the value in list values
-	
-	* gui/dialogs/event-editor.c (set_menu_sens): base this on the
-	exist org and user org values of the comp editor
-	(event_editor_edit_comp): set up editable row restrictions on the
-	meeting model if the user is not an organizer, and don't set needs
-	send if we aren't the organizer initially
-	(model_row_changed_cb): set needs_send to true
-	(row_count_changed_cb): ditto
-
-	* gui/dialogs/meeting-page.glade: update gui
-	
-	* gui/dialogs/comp-editor.c (save_comp_with_send): if the user is
-	not the organizer, REPLY rather than REQUEST
-	(comp_editor_set_existing_org): accessor
-	(comp_editor_get_existing_org): ditto
-	(comp_editor_set_user_org): ditto
-	(comp_editor_get_user_org): ditto
-	(real_edit_comp): determine if there is an existing organizer and
-	if the organizers is a user
-	(page_changed_cb): warn the user that changes may be discarded
-	(page_summary_changed_cb): ditto
-	(page_dates_changed_cb): ditto
-
-	* gui/dialogs/comp-editor.h: new protos
-
-	* gui/itip-utils.c (itip_organizer_is_user): determine if the
-	organizer of a component is a user
-	(itip_sentby_is_user): same for sentby field of organizer
-	(comp_sentby): use above routines instead
-	(comp_compliant): strip all X-LIC-ERROR fields generated by
-	libical
-
-	* gui/e-meeting-model.c (is_cell_editable): if there is a list of
-	editable rows, allow only the status column of those rows to be
-	edited
-	(init): init edit_rows
-	(e_meeting_model_restricted_add): add an editable row to the model
-	(e_meeting_model_restricted_remove): remove an editable row
-	(e_meeting_model_restricted_clear): clear all editable rows
-	(e_meeting_model_etable_click_to_add): set the click to add arg on
-	all tables
-	(e_meeting_model_etable_from_model): track the tables
-	(table_destroy_list_cb): remove the table being destroyed from the
-	list
-	(table_destroy_state_cb): remove the table being destroyed from
-	the list
-	
-	* gui/e-meeting-model.h: new protos
-
-	* gui/e-itip-control.c (update_attendee_status): kill warning
-	
-2002-06-18  JP Rosevear  <jpr@ximian.com>
-	
-	* zones.h: update for new zones
-
-2002-06-17  Rodrigo Moya <rodrigo@ximian.com>
-
-	Fixes wombat crash (for JP and myself)
-
-	* gui/gnome-cal.c (gnome_calendar_open): don't call add_alarms here,
-	since the client is not yet attached to the backend, and the alarm
-	daemon does unref the client before creating a new one.
-	(client_cal_opened_cb): call add_alarms here.
-
-2002-06-12  Rodrigo Moya <rodrigo@ximian.com>
-
-        * gui/alarm-notify.c: added timeout_id to LoadedClient structure, to
-	keep track of the timeout function.
-	(retry_timeout_cb): don't use RetryData, but the LoadedClient.
-	(cal_opened_cb): ditto, and assigned lc->timeout_id to the return
-	value of g_timeout_add().
-	(alarm_notify_add_calendar): destroy the timeout callback when
-	destroying the LoadedClient structure.
-
-2002-06-12  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* pcs/cal-factory.c (open_fn): Free the uri_string once we're done
-	with it.
-
-2002-06-12  Kjartan Maraas  <kmaraas@gnome.org>
-
-	* gui/dialogs/cal-prefs-dialog.glade: Fix a typo.
-	
-2002-06-10  Rodrigo Moya <rodrigo@ximian.com>
-
-	* gui/alarm-notify/alarm-notify.c (alarm_notify_add_calendar): removed
-	already loaded client when asked to be opened again, and *really*
-	re-open it again.
-
-2002-06-04  Christopher James Lahey  <clahey@ximian.com>
-
-	* gui/gnome-cal.c (gnome_calendar_setup_view_menus):
-	gal_view_menus_set_show_define_views (..., FALSE);
-
-2002-06-04  Christopher James Lahey  <clahey@ximian.com>
-
-	* gui/e-tasks.c (e_tasks_setup_view_menus), gui/gnome-cal.c
-	(gnome_calendar_setup_view_menus): Set the title of our
-	GalViewCollection.
-
-2002-06-03  Anna Marie Dirks  <anna@ximian.com>
-
-	* gui/dialogs/cal-prefs-dialog.glade: In an attempt to clean up the 
-	config dialog (and to reduce its overall girth), I have re-laid-out the
-	calendar preferences dialog. It now conforms to standard Evolution 
-	spacing and padding guidelines, and exhibits proper alignment, etc.
-
-2002-06-03  Rodrigo Moya <rodrigo@ximian.com>
-
-	* pcs/query.c: keep a reference to the Query object, to avoid
-	crashes when the queries are destroyed before finishing processing.
-	Fixes #25056.
-
-2002-05-26  JP Rosevear  <jpr@ximian.com>
-
-	* gui/dialogs/comp-editor.h: update proto
-
-	* gui/dialogs/comp-editor.c (comp_editor_get_comp): new function
-	to get base comp
-
-	* gui/e-comp-editor-registry.c (e_comp_editor_registry_add): get
-	the base comp, not the current comp, don't unref it
-	(foreach_close_cb): block the signal, unblock it if the editor
-	could not be closed
-	(e_comp_editor_registry_close_all): fix preconditions
-	(editor_destroy_cb): get the base comp, not the current comp,
-	don't unref it
-
-2002-05-26  JP Rosevear  <jpr@ximian.com>
-
-	* gui/e-comp-editor-registry.c (e_comp_editor_registry_close_all):
-	if there are remaining items, return false
-	(foreach_close_cb): don't remove the item if it couldn't be closed
-
-	* gui/e-comp-editor-registry.h: update proto
-
-	* gui/component-factory.c (request_quit): return a boolean
-	indicating if everything was closed
-
-	* gui/dialogs/comp-editor.h: update proto
-
-	* gui/dialogs/comp-editor.c (comp_editor_close): return true if
-	the editor was closed, false otherwise
-
-2002-05-26  JP Rosevear  <jpr@ximian.com>
-	
-	* gui/e-comp-editor-registry.[hc]: a registry of comp editors so
-	we can close them all centrally
-
-	* gui/gnome-cal.c (gnome_calendar_init): there is no editor hash
-	now
-	(gnome_calendar_destroy): ditto
-	(gnome_calendar_edit_object): look for the event editor in the
-	registry, if it isn't there, create it and add it to the registry
-
-	* gui/e-calendar-table.c (open_task): look for the task editor in
-	the registry, if it isn't there, create it and add it to the
-	registry
-
-	* gui/component-factory.c (request_quit): close all open editors
-	(create_object): add a request_quit function to the shell
-	component
-
-	* gui/comp-editor-factory.c (free_client): there is no
-	uid_comp_hash to free any more
-	(editor_destroy_cb): we get an OpenClient as callback data now,
-	reduce the editor count and destroy it if it is 0
-	(edit_existing): don't create the Component, add the new editor to
-	the registry, increase the editor count
-	(edit_new): ditto
-	(open_client): set the editor count to 0
-	(impl_editExisting): look in the registry for the editor
-
-	* gui/Makefile.am: Build new sources
-
-	* gui/main.c (main): create the registry
-
-	* gui/dialogs/comp-editor.c (comp_editor_close): prompt to save
-	and then close dialog
-
-	* gui/dialogs/comp-editor.h: new proto
-
-	* gui/GNOME_Evolution_Calendar.oaf.in: remove dead summary stuff
-
-2002-05-24  Rodrigo Moya <rodrigo@ximian.com>
-
-	* pcs/cal-backend-file.c (save): check the value returned by
-	gnome_vfs_uri_to_string before using it.
-	(cal_backend_file_open): ditto.
-
-2002-05-20  Ettore Perazzoli  <ettore@ximian.com>
-
-	* gui/dialogs/event-editor.c (event_editor_init): Pass the
-	@component_pixmaps in so we give the new "Meeting" button an icon.
-
-	* gui/dialogs/comp-editor.c (comp_editor_merge_ui): New arg
-	@component_pixmaps to pass in custom pixmaps.
-
-2002-05-20  Rodrigo Moya <rodrigo@ximian.com>
-
-	* gui/alarm-notify/alarm-notify.c:
-	* gui/alarm-notify/notify-main.c: ported changes from evolution-1-0
-	to make it work with reminders on remote backends.
-
-	* pcs/cal-backend-file.c (cal_backend_file_open): check the string
-	returned by gnome_vfs_uri_to_string, which can be empty. If so,
-	return an error.
-
-2002-05-17  JP Rosevear  <jpr@ximian.com>
-
-	* gui/gnome-cal.c (gnome_calendar_setup_view_menus): set the view
-	to the current view
-
-2002-05-16  Rodrigo Moya <rodrigo@ximian.com>
-
-	* gui/gnome-cal.c (client_cal_opened_cb): added support for
-	CAL_CLIENT_OPEN_PERMISSION_DENIED error code.
-	(permission_error): new function to display 'Permission Denied'
-	error message when opening the calendar.
-
-	* gui/e-tasks.c: likewise.
-
-	* idl/evolution-calendar.idl: added PERMISSION_DENIED to Listener's
-	OpenStatus enumeration.
-
-	* cal-client/cal-client.c (cal_opened_cb): added code for retrieving
-	'Permission Denied' errors, and convert it to CalClientOpenStatus
-	values.
-
-	* pcs/cal-factory.c (open_backend): added code for informing of
-	'Permission Denied' errors.
-
-2002-05-16  Rodrigo Moya <rodrigo@ximian.com>
-
-	* idl/evolution-calendar.idl: added PermissionDenied exception and
-	make it be raised in open, updateObjects and removeObject.
-
-	* pcs/cal-backend.h: added CAL_BACKEND_OPEN_PERMISSION_DENIED to
-	CalBackendOpenStatus enumeration, added CalBackendResult enumeration.
-
-	* pcs/cal.c:
-	* pcs/cal-backend.c:
-	* pcs/cal-backend-file.c: adapted to changes in update_objects and
-	remove_object methods.
-
-	* cal-client/cal-client.[ch]: added CalClientResult enumeration.
-	(cal_client_update_object, cal_client_update_objects,
-	 cal_client_remove_object): changed to return a CalClientResult.
-
-	* conduits/calendar/calendar-conduit.c:
-	* calendar/conduits/todo/todo-conduit.c:
-	* importers/icalendar-importer.c:
-	* gui/dialogs/comp-editor.c:
-	* gui/calendar-model.c:
-	* gui/e-calendar-table.c:
-	* gui/e-day-view.c:
-	* gui/e-itip-control.c:
-	* gui/e-week-view.c:
-	* gui/comp-util.c:
-	* gui/e-tasks.c:
-	* gui/tasks-migrate.c: adapted to changes in cal_client_update_object(s)
-	and cal_client_remove_object.
-	
-2002-05-15  Ettore Perazzoli  <ettore@ximian.com>
-
-	* gui/component-factory.c (create_object): Pass NULL as
-	@request_quit_fn.
-
-2002-05-14  JP Rosevear  <jpr@ximian.com>
-
-	* gui/dialogs/schedule-page.c (schedule_page_construct): set the
-	working hours for the meeting time selector
-	
-2002-05-14  JP Rosevear  <jpr@ximian.com>
-
-	* cal-util/cal-component.h: make the range datetime member a
-	struct not a pointer
-
-	* cal-util/cal-component.c (cal_component_get_recurid): take a
-	pointer to a range
-	(cal_component_set_recurid): ditto
-
-	* gui/itip-utils.c (comp_minimal): get/set the recurrence id
-	properly
-	
-2002-05-09  Ettore Perazzoli  <ettore@ximian.com>
-
-	* gui/e-itip-control.c (get_servers): use
-	GNOME_Evolution_Storage__get_folderList instead of
-	GNOME_Evolution_Storage_getFolderList since I have now changed
-	that to be an attribute instead of a method.
-
-2002-05-07  JP Rosevear  <jpr@ximian.com>
-
-	* gui/e-itip-control.c (start_calendar_server): start a server a
-	uri
-	(start_default_server): start a default server
-	(get_servers): get all clients for all folders of the given
-	type(s)
-	(find_server): locate a server for a particular uid
-	(init): get_servers, listen for object_requested signal
-	(destroy): destroy all clients
-	(write_html): put options is there own cell
-	(get_publish_options): place selector in if param is true
-	(get_request_options): ditto
-	(get_real_item): only try and look up the item if we know its in
-	the server
-	(show_current_event): find the server (if any) for the current
-	comp
-	(show_current_todo): ditto
-	(update_attendee_status): if there is no server for the comp, it
-	doesn't exist
-	(remove_item): ditto
-	(button_selected_cb): get a client for the selected folder
-	(object_requested_cb): draw the folder button in
-
-	* gui/calendar-config.h: new protos
-
-	* gui/calendar-config.c (calendar_config_default_tasks_folder):
-	get default tasks uri
-	(calendar_config_default_calendar_folder): get default calendar
-	uri
-
-	* cal-client/cal-client.c (get_default_uri): use
-	cal_util_expand_uri
-
-	* cal-util/cal-util.h: new proto
-
-	* cal-util/cal-util.c (cal_util_expand_uri): tack on the file name
-	if its a file uri
-
-2002-05-03  Rodrigo Moya <rodrigo@ximian.com>
-
-	* gui/e-tasks.c (e_tasks_delete_selected):
-	(e_tasks_complete_selected): show progress messages
-	on the status bar.
-
-2002-05-02  Rodrigo Moya <rodrigo@ximian.com>
-
-	* pcs/query.c: #include <gtk/gtkmain.h> to avoid warnings.
-
-2002-05-02  JP Rosevear  <jpr@ximian.com>
-
-	* gui/e-week-view.c (free_view_popup): only discard the popup if
-	we created one
-
-2002-05-02  Rodrigo Moya <rodrigo@ximian.com>
-
-	* pcs/query.c: refactored a bit, to not do things in idle loops.
-
-2002-05-01  JP Rosevear  <jpr@ximian.com>
-
-	* gui/print.c (print_day_details): modify the start and end hours
-	to accomodate all the events in the day
-
-	* gui/e-day-view.c (free_view_popup): only discard the popup if we
-	created one
-
-2002-04-30  JP Rosevear  <jpr@ximian.com>
-
-	* gui/gnome-cal.c (gnome_calendar_construct): remove setup_widgets
-	from here
-	(gnome_calendar_init): move setup_widgets back here
-
-2002-04-26  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* gui/Makefile.am: Don't link to libibex anymore!!
-
-2002-04-24  JP Rosevear  <jpr@ximian.com>
-
-	* gui/e-day-view.c (e_day_view_on_pilot_settings): launch pilot
-	settings capplet
-
-	* gui/e-week-view.c (e_week_view_on_pilot_settings): ditto
-	
-2002-04-24  JP Rosevear  <jpr@ximian.com>
-	
-	* gui/e-week-view.c (free_view_popup): free the view popup
-	(e_week_view_show_popup_menu): add the view popup to the
-	"main_item" menu and listen for destruction
-
-	* gui/e-day-view.c (free_view_popup): as above
-	(e_day_view_on_event_right_click): as above
-
-	* gui/e-week-view.h: add class member
-
-	* gui/e-day-view.h: add a class member
-
-	* gui/gnome-cal.h: new protos
-
-	* gui/gnome-cal.c (set_view): set the instance view id properly
-	when switching views
-	(gnome_calendar_setup_view_popup): generate a view popup
-	(gnome_calendar_discard_view_popup): destroy a view popup
-
-2002-04-22  Rodrigo Moya <rodrigo@ximian.com>
-
-	* pcs/cal.c (impl_Cal_get_alarms_in_range): raise an exception if the
-	backend's method returns NULL, since we can't send a NULL pointer to
-	ORBit.
-
-2002-04-19  Anna Marie Dirks  <anna@ximian.com>
-
-	* gui/dialogs/cal-prefs-dialog.glade: Collapsed notebook into two pages
-	and added accelerators for everything, as part of my config dialog
-	polishing project
-
-2002-04-18  JP Rosevear  <jpr@ximian.com>
-
-	* gui/dialogs/recurrence-page.c (simple_recur_to_comp): properly
-	handle -ve recurrence values
-	(month_num_submenu_selection_done_cb): track the current date in
-	use
-	(make_recur_month_num_submenu): make a submenu of dates
-	(make_recur_month_num_menu): make the date/relation option menu
-	(month_num_menu_selection_done_cb): update the date properly and
-	keep both option menus consistent
-	(month_day_menu_selection_done_cb): keep both option menus
-	consistent
-	(make_monthly_special): listen for selection done signal
-	(make_recurrence_special): destroy old month_num_menu
-	(recurrence_page_fill_widgets): properly handle -ve recurrence
-	values
-
-2002-04-18  JP Rosevear  <jpr@ximian.com>
-	
-	* gui/e-day-view.c (e_day_view_on_settings): show the settings
-
-	* gui/e-week-view.c (e_week_view_on_settings): ditto
-
-	* gui/calendar-commands.c (control_util_show_settings): show the
-	settings dialog
-
-	* gui/calendar-commands.h: new proto
-
-	* gui/control-factory.c (control_factory_new_control): set the
-	control as object data on the calendar
-
-2002-04-17  Christopher James Lahey  <clahey@ximian.com>
-
-	* gui/e-calendar-table.c, gui/e-day-view.c, gui/e-week-view.c,
-	gui/dialogs/meeting-page.c: Updated these to match the new
-	EPopupMenu.
-
-2002-04-05  Rodrigo Moya <rodrigo@ximian.com>
-
-	* pcs/cal-backend.[ch] (cal_backend_get_query): new method.
-
-	* pcs/cal-backend-file.c (cal_backend_file_get_query): new method.
-
-	* pcs/cal.c (impl_Cal_get_query): call the CalBackend's implementation
-	instead of calling query_new directly.
-
-	* pcs/query.[ch]: fixed headers.
-
-2002-04-10  Dan Winship  <danw@ximian.com>
-
-	* gui/gnome-cal.c (gnome_calendar_open): Fix this: Rodrigo's patch
-	used one of the functions I just removed. :)
-
-2002-04-10  Rodrigo Moya <rodrigo@ximian.com>
-
-	* gui/gnome-cal.c (gnome_calendar_open): use the default uri for
-	tasks (as stored in the configuration) when the calendar URI is not
-	a local one (connector, etc).
-
-2002-04-10  Dan Winship  <danw@ximian.com>
-
-	* cal-client/cal-client.c (get_default_uri): Use new-and-improved
-	default folder URI config paths.
-
-	* gui/calendar-config.c (calendar_config_{get,set}_default_uri,
-	calendar_config_{get,set}_default_tasks_uri): Remove these. The
-	shell owns this information now. (Weren't being used anyway.)
-
-	* gui/component-factory.c (get_data_uri): Fix another place that
-	hardcoded tacking foo.ics on to the end of URLs.
-
-2002-04-08  Dan Winship  <danw@ximian.com>
-
-	* gui/component-factory.c (create_view): Add view_info arg. If the
-	view_info is non-empty and this is a calendar folder, set the
-	"view" property on the control's propertybag.
-
-	* gui/control-factory.c (calendar_properties_init): Set up the
-	"view" property.
-	(get_prop, set_prop): handle the "view" property by
-	getting/setting the GnomeCalendar's view. Unfortunately, this
-	doesn't actually work. See #23208.
-
-	* gui/calendar-commands.c (calendar_control_activate): Set the UI
-	component's container before calling
-	gnome_calendar_set_ui_component so that the search bar
-	initialization will work.
-
-2002-04-06  JP Rosevear  <jpr@ximian.com>
-
-	* pcs/cal-backend-db.[hc]: Remove dead files.
-
-2002-04-06  JP Rosevear  <jpr@ximian.com>
-	
-	* gui/GNOME_Evolution_Calendar.oaf.in: add config_item:type
-
-2002-04-01  Kjartan Maraas  <kmaraas@gnome.org>
-
-	* gui/e-itip-control.c: Fix a string.
-	
-2002-04-01  Rodrigo Moya <rodrigo@ximian.com>
-
-	* pcs/cal-backend-db.c: simple fix for DB3 header inclusion in
-	Mac OS X, by Max Horn <max@quendi.de>
-
-2002-03-31  JP Rosevear  <jpr@ximian.com>
-
-	* gui/e-itip-control.c (clean_up): free the my_address member
-	(find_my_address): fall back on a CN match if possible
-	(change_status): handle changing the status of a non-existent
-	address by adding a new attendee
-	(update_attendee_status): if the attendee response is not from a
-	user on the list of attendees, ask the user if they want to add
-	the attendee any how (as an optional participant)
-	(ok_clicked_cb): if we are suppose to rsvp and the status was ok,
-	but the attendee address is not known, find it
-	
-2002-03-29  Ettore Perazzoli  <ettore@ximian.com>
-
-	* gui/GNOME_Evolution_Calendar.oaf.in: Set a priority for the
-	config item.  Rename to "Calendar and Tasks".
-
-2002-03-29  JP Rosevear  <jpr@ximian.com>
-
-	* conduits/calendar/Makefile.am: s/libversit.la/libversit.a/
-
-	* conduits/todo/Makefile.am: ditto
-
-2002-03-29  JP Rosevear  <jpr@ximian.com>
-	
-	* gui/e-calendar-table.c: implement new pop up menu items for
-	"Save as", "Print", "Assign Task", "Forward as iCalendar"
-
-	* gui/e-day-view.c: similarly, also "Publish Free/Busy
-	Information" and "New Meeting" and "New Task"
-
-	* gui/e-week-view.c: ditto
-
-	* gui/dialogs/task-editor.c (show_assignment): move the assignment
-	page stuff here
-	(task_editor_show_assignment): use it
-	(assign_task_cmd): ditto
-
-	* gui/dialogs/task-editor.h: new proto
-
-	* gui/dialogs/comp-editor.c (save_as_cmd): use new e-util file
-	selector function
-
-	* meeting-mockup.glade: Remove old file
-
-	* topic.dat
-
-2002-03-19  Dan Winship  <danw@ximian.com>
-
-	* cal-util/Makefile.am: s/libversit.la/libversit.a/
-
-	* cal-client/Makefile.am: Likewise
-
-	* gui/Makefile.am: Likewise
-
-2002-03-18  Ettore Perazzoli  <ettore@ximian.com>
-
-	* gui/cal-search-bar.c: Removed `search_menu_items'.
-	(cal_search_bar_menu_activated): Removed.
-	(cal_search_bar_class_init): Don't install.
-	(cal_search_bar_construct): No menu items here.
-
-2002-03-15  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* gui/e-day-view.c: Updated to use new EPopupMenu API.
-
-	* gui/e-week-view.c: Updated to use new EPopupMenu API.
-
-	* gui/e-calendar-table.c: Updated to use new EPopupMenu API.
-
-2002-03-15  Ettore Perazzoli  <ettore@ximian.com>
-
-	* gui/tasks-control.c (tasks_control_activate): Call
-	`e_tasks_set_ui_component()' here to give it the
-	BonoboUIComponent.
-	(tasks_control_deactivate): Likewise, call it here to unset the
-	BonoboUIComponent.
-
-	* gui/e-tasks.c (e_tasks_set_ui_component): New.
-
-	* gui/calendar-commands.c (calendar_control_activate): Call
-	gnome_calendar_set_ui_component() here.
-	(calendar_control_deactivate): ...And here, with a NULL
-	BonoboUIComponent.
-
-	* gui/gnome-cal.c (gnome_calendar_set_ui_component): New.
-
-2002-03-15  JP Rosevear  <jpr@ximian.com>
-
-	* gui/main.c: use bonobo exception macros to tidy
-
-	* gui/itip-control-factory.c: ditto
-
-	* gui/gnome-cal.c: ditto
-
-	* gui/comp-editor-factory.c: ditto
-
-	* gui/calendar-commands.c: ditto
-
-2002-03-14  JP Rosevear  <jpr@ximian.com>
-
-	* idl/evolution-calendar.idl: add all day event editor mode
-
-	* gui/component-factory.c: clean up exception handling
-	(sc_user_create_new_item_cb): support the all day event id
-	(create_object): add a user creatable all day appointment item
-
-	* gui/comp-editor-factory.c (get_default_event): get a default
-	event either all day or starting at the top of the hour
-	(get_default_task): get a default task
-	(edit_new): support the all day event mode
-
-	* gui/calendar-commands.c: remove unused functions/verbs
-
-2002-03-13  Ettore Perazzoli  <ettore@ximian.com>
-
-	* gui/GNOME_Evolution_Calendar.oaf.in: Add an
-	"evolution:config_item:icon_path" attribute so we get an icon for
-	the calendar preferences.
-
-2002-03-12  Ettore Perazzoli  <ettore@ximian.com>
-
-	* gui/dialogs/cal-prefs-dialog.glade: Add <visible>False</visible>
-	to cal-prefs-dialog so it doesn't get shown when we load the Glade
-	file with libglade.
-
-	* gui/component-factory.c (owner_set_cb): Register the
-	ConfigControl factory.
-
-	* gui/tasks-control.c: Removed verb "TaskSettings".
-	(tasks_control_settings_cmd): Removed.
-
-	* gui/calendar-commands.c: Removed verb "CalendarSettings".
-	(settings_cmd): Removed.
-
-	* gui/dialogs/cal-prefs-dialog.c: Renamed `CalPrefsDialogPrivate'
-	to `DialogData'.  Replace `dialog' member with a `page' member.
-	Remove `toplevel_notebook' member.
-	(init_widgets): Renamed from `cal_prefs_dialog_init_widgets'.
-	Just get a DialogData.
-	(get_widgets): Get a DialogData pointer.
-	(cal_prefs_dialog_destroy): Removed.
-	(config_control_destroy_callback): New, signal handler for
-	::destroy for ConfigControl.
-	(cal_prefs_dialog_new): Create a new DialogData, connect all the
-	signal handlers.
-	(create_time_edit): Renamed from
-	`cal_prefs_dialog_create_time_edit'.
-	(cal_prefs_dialog_show): Removed.
-	(cal_prefs_dialog_button_clicked): Removed.
-	(show_task_list_config): Get a DialogData.
-	(show_config): Renamed from `cal_prefs_dialog_show_config'.
-	Likewise.
-	(update_task_list_config): Likewise.
-	(update_config): Renamed from
-	`cal_prefs_dialog_update_config'. Likewise.
-	(color_set_callback): New callback, makes the dialog report
-	changes when the setting in any of the color widgets is changed.
-	(widget_changed_callback): New callback, makes the dialog report
-	changes when any of the widgets changes status.
-	(connect_changed): New utility function to connect this callback
-	to all the widgets.
-	(setup_widgets): Connect all the widgets.
-	(cal_prefs_dialog_new): Call `setup_widgets'.
-
-	* gui/config-control-factory.c: New.
-	* gui/config-control-factory.h: New.
-
-	* gui/GNOME_Evolution_Calendar.oaf.in: Add
-	OAFIID:GNOME_Evolution_Calendar_ConfigControl and
-	OAFIID:GNOME_Evolution_Calendar_ConfigControlFactory.
-
-2002-03-06  Rodrigo Moya <rodrigo@ximian.com>
-
-	Should fix #21240
-
-	* gui/alarm-notify/alarm-notify.c: replaced use of GnomeVFSURI
-	with EUri, to allow non-registered methods.
-
-2002-03-05  Rodrigo Moya <rodrigo@ximian.com>
-
-	* gui/e-itip-control.c (e_itip_control_set_data): reverted my last
-	change of adding the METHOD property to the incoming request.
-
-	* gui/itip-utils.c (comp_string): added extra
-	X-MICROSOFT-CDO-REPLYTIME property for broken Outlook. Should fix
-	#20783.
-
-2002-03-04  Dan Winship  <danw@ximian.com>
-
-	* gui/itip-utils.c (comp_compliant): Reset the DTSTAMP of the new
-	component. (RFC2245 says DTSTAMP corresponds to the time the
-	particular iCalendar representation of the object was created.)
-	Fixes #21198.
-
-2002-03-05  JP Rosevear  <jpr@ximian.com>
-
-	* gui/print.c: remove unneeded parameter from print_text_size
-	everywhere
-	(get_font_for_size): calculate a font size based on the available
-	height
-	(print_text): calculate the top of where the font should be drawn
-	(print_text_size): use get_font_for_size
-	(print_day_background): use get_font_for_size
-
-2002-03-05  JP Rosevear  <jpr@ximian.com>
-
-	* gui/e-meeting-time-sel-item.c
-	(e_meeting_time_selector_item_draw): pass the real table
-	to e_meeting_model_etable_view_to_model_row
-	(e_meeting_time_selector_item_paint_busy_periods): ditto
-
-	* gui/dialogs/meeting-page.c (right_click_cb): ditto
-	
-	* gui/e-meeting-model.h: update protos
-
-	* gui/e-meeting-model.c
-	(e_meeting_model_etable_model_to_view_row): take in to account the
-	fact the table used the without model
-	(e_meeting_model_etable_view_to_model_row): ditto
-
-2002-03-04  Damon Chaplin  <damon@ximian.com>
-
-	* gui/tasks-control.c: added support for printing the Tasks table.
-	I hacked it a bit so the user could choose portrait or landscape mode.
-	This is bug #9677. ETable printing has a few issues, though, and it
-	isn't very pretty.
-
-2002-03-04  Dan Winship  <danw@ximian.com>
-
-	* gui/itip-utils.c (comp_subject): Prefix the subject with an
-	indicator like "Accepted" or "Cancelled" explaining what the
-	action is, since Outlook doesn't display any of that information
-	inline like we do. (20780)
-
-2002-02-28  Rodrigo Moya <rodrigo@ximian.com>
-
-	* calendar/gui/e-itip-control.c (e_itip_control_set_data): added the
-	METHOD property to the top level component we create.
-
-2002-02-26  Rodrigo Moya <rodrigo@ximian.com>
-
-	* gui/control-factory.c (set_prop):
-	* gui/tasks-control.c (tasks_control_set_property): display an error
-	message if the call to gnome_calendar_open or e_tasks_open does not
-	return TRUE. Fixes #20346.
-
-2002-02-25  Dan Winship  <danw@ximian.com>
-
-	* gui/itip-utils.c (itip_send_comp): use
-	GNOME_Evolution_Composer_setBody rather than _setMultipartType and
-	_attachData now, to send a message containing just a text/calendar
-	part. Fixes 14705. Mostly.
-	(comp_content_type): Include the filename here since we can't add
-	a Content-Disposition now.
-
-2002-02-24  Chris Toshok  <toshok@ximian.com>
-
-	* gui/cal-search-bar.c (cal_search_bar_class_init): change
-	query_changed to search_activated.
-	(cal_search_bar_search_activated): rename
-	cal_search_bar_query_changed to this.
-
-2002-02-21  Ettore Perazzoli  <ettore@ximian.com>
-
-	* gui/component-factory.c (add_creatable_item): New helper
-	function.
-	(create_object): Add icons for the various user creatable items.
-
-2002-02-19  JP Rosevear  <jpr@ximian.com>
- 
- 	* gui/e-itip-control.c (send_item): pass extra itip_send_comp
-	params
- 	(send_freebusy): ditto
- 	(ok_clicked_cb): ditto, including the timezones culled from the
-	component
- 
- 	* gui/e-week-view.c: pass extra itip_send_comp params
- 
- 	* gui/calendar-commands.c: ditto
- 
- 	* gui/e-day-view.c: ditto
- 
- 	* gui/dialogs/task-editor.c: ditto
- 
- 	* gui/dialogs/event-editor.c: ditto
- 
- 	* gui/dialogs/comp-editor.c: ditto
- 	
- 	* gui/itip-utils.h (itip_send_comp): update proto
- 
- 	* gui/itip-utils.c (foreach_tzid_callback): check the passed in
- 	zones, then the builtin time zones then the client
-
-2002-02-19  JP Rosevear  <jpr@ximian.com>
- 
- 	* gui/e-itip-control.c (find_my_address): strip the ical value and
- 	do a case insensitive compare
- 	(find_attendee): ditto
- 	(change_status): put the error message here
- 	(ok_clicked_cb): don't update the item or rsvp unless
- 	change_status was successful, trip the ical value and do a case
- 	insensitive compare
- 
- 	* gui/itip-utils.c (get_address): strip the incoming address
- 	(itip_strip_mailto): use g_strncasecmp
- 	(comp_limit_attendees): strip the ical value and do a case
- 	insensitive compare
-
-2002-02-14  JP Rosevear  <jpr@ximian.com>
- 
- 	* gui/e-meeting-model.c: use new column enums
- 	(set_value_at): emit pre-change/cell change signals
- 	(destroy): destroy refresh_queue and refresh_data
- 	(init): init new elements
- 	(refresh_queue_add): if the attendee is being refreshed already,
- 	possibly update the start/end times to look for and update the
- 	callback info, otherwise add it to the queue
- 	(refresh_queue_remove): remove a refreshing attende from the queue
- 	(process_callbacks): make all the callbacks and remove the
- 	attendee from the queue
- 	(process_free_busy): process the callbacks immediately if parsing
- 	fails or on successful completion of processing
- 	(async_close): process free busy
-	(cursor_cb): we're only looking for one at a time now
- 	(refresh_busy_periods): idle callback to start processing the queue
- 	(e_meeting_model_refresh_all_busy_periods): add every row to the queue
- 	(e_meeting_model_refresh_busy_periods): add a single row to the queue
- 
- 	* gui/e-meeting-model.h: new protos, enum the columns
- 
- 	* gui/e-meeting-time-sel.c: use new compare time function
- 	(e_meeting_time_selector_construct): listen for a cell changed
- 	signal and use separate callbacks for rows_inserted and
- 	rows_deleted
- 	(e_meeting_time_selector_refresh_free_busy): util function to
- 	refresh free busy info
- 	(e_meeting_time_selector_on_update_free_busy): use above
- 	(rows_inserted_cb): refresh free busy on the new rows
- 	(cell_changed_cb): refresh free busy on the row when the address
- 	changes
- 	(rows_deleted_cb): redraw
- 
- 	* gui/e-meeting-utils.[hc]: a holding spot for a meeting time
- 	comparison function
- 
- 	* gui/Makefile.am: compile new files
-	
-2002-02-13  Rodrigo Moya <rodrigo@ximian.com>
-
-        * gui/control-factory.c (set_prop): don't append 'calendar.ics'
-	to the URI.
-	(get_prop): finished.
-
-	* gui/tasks-control.c (tasks_control_set_property): don't append
-	'tasks.ics' to the URI.
-	(tasks_control_get_property): finished.
-
-	* gui/gnome-cal.c (gnome_calendar_open):
-	* gui/e-tasks.c (e_tasks_open): append $filename.ics to the uri to be
-	opened if the uri is local. Leave intact in other cases.
-
-2002-02-08  Damon Chaplin  <damon@ximian.com>
-
-	* gui/comp-util.c (cal_comp_util_compare_event_timezones): check if
-	the CalComponentDateTime values are set before trying to use them.
-	Possibly fixes bug #18529.
-
-	* importers/icalendar-importer.c: added vCalendar importer and
-	intelligent GnomeCalendar importer code here, as it shares a lot of
-	code with the iCalendar importer.
-
-	NOTE: check_folder_type() needs to be finished at some point.
-	It needs a new shell Corba call so it can decide whether to import
-	events or tasks into the folder. Currently it just imports both.
-
-	* importers/main.c (importer_factory_fn): create vCalendar importer
-	or GnomeCalendar importer if required.
-
-	* importers/evolution-calendar-importer.h: added declarations for
-	creating a vCalendar importer and intelligent Gnome Calendar importer.
-
-	* importers/Makefile.am: added -DEVOLUTION_SOUNDDIR so the importer
-	knows what filename to use for audio alarms in vCalendar files.
-	Added libicalvcal-evolution to LDADD.
-
-	* importers/GNOME_Evolution_Calendar_Importer.oaf.in: added vCalendar
-	importer and intelligent Gnome Calendar importer.
-
-	* gui/comp-util.c (cal_comp_util_compare_event_timezones): return TRUE
-	if the event uses UTC. We don't want to flag all events from Outlook,
-	which use UTC.
-
-2002-02-08  JP Rosevear  <jpr@ximian.com>
-
-	* gui/dialogs/task-details-page.glade: change custom widget
-	creator to e_url_entry_new
-
-	* gui/dialogs/task-details-page.c (get_widgets): get the url entry
-	and its entry
-
-2002-02-08  JP Rosevear  <jpr@ximian.com>
-
-	* gui/dialogs/task-details-page.glade: add a custom widget created
-	with e_url_button_new
-
-	* gui/dialogs/task-details-page.c (task_details_page_init): init
-	url_button member to NULL
-	(init_widgets): set the url button entry
-	(get_widgets): get the url button
-
-	* gui/calendar-commands.c (pixmaps): use new all day event icon
-
-2002-02-07  JP Rosevear  <jpr@ximian.com>
-
-	* gui/e-day-view.c: pass meeting boolean for
-	gnome_calendar_edit_object and gnome_calendar_new_appointment_for
-
-	* gui/e-week-view-event-item.c: ditto
-
-	* gui/e-week-view.c: ditto
-
-	* gui/tasks-control.c (confirm_expunge): kill warning
-
-	* gui/calendar-commands.c (new_meeting_cb): show a new meeting
-	dialog
-	(new_event_cb): pass new param
-
-	* gui/gnome-cal.c (gnome_calendar_edit_object): take meeting
-	boolean and show meeting page if true
-	(gnome_calendar_new_appointment_for): takeing meeting param and
-	pass to above
-	(gnome_calendar_new_appointment): add new param
-
-	* gui/gnome-cal.h: update proto
-
-	* gui/component-factory.c (create_component): take a comp editor
-	mode, determine vtype
-	(sc_user_create_new_item_cb): check for meeting user creatable
-	item
-	(create_object): add meeting as user creatable item
-
-	* gui/comp-editor-factory.c (edit_new): get a comp editor mode
-	now, determine vtype and show meeting page if required
-	(queue_edit_new): get comp editor mode
-	(impl_editNew): ditto, plus queue the mode directly instead of
-	determining the vtype
-
-	* gui/dialogs/event-editor.c (show_meeting): new internal util
-	function to show meeting page
-	(event_editor_show_meeting): show the meeting
-	(schedule_meeting_cmd): use show_meeting
-
-	* gui/dialogs/event-editor.h: new proto
-
-	* idl/evolution-calendar.idl: editNew takes a mode rather than a
-	type now
-
-	* cal-util/Makefile.am: fix includes
-
-2002-02-07  Christopher James Lahey  <clahey@ximian.com>
-
-	* gui/e-tasks.c (e_tasks_setup_view_menus), gui/gnome-cal.c
-	(gnome_calendar_setup_view_menus): Made these use the new
-	GalViewMenus stuff.
-
-2002-02-06  Damon Chaplin  <damon@ximian.com>
-
-	* cal-util/cal-recur.c (cal_recur_from_icalproperty): convert months
-	from 1-12 to 0-11. Fixes bug #19235.
-
-2002-02-04  JP Rosevear  <jpr@ximian.com>
-
-	* conduits/todo/todo-conduit.c (e_todo_gui_new): new gui routines
-	for conduit settings
-	(e_todo_gui_fill_config): ditto
-	(e_todo_gui_fill_widgets): ditto
-	(e_todo_gui_destroy): ditto
-	(e_todo_context_destroy): destroy new_cfg and gui properly
-	(local_record_from_comp): set the priority to the default setting
-	if none is set on the icalendar object
-	(fill_widgets): fill gui widgets
-	(create_settings_window): create gui
-
-2002-01-30  JP Rosevear  <jpr@ximian.com>
-
-	* gui/e-itip-control.c (write_html): if this is a reply, print the
-	attendee status
-
-2002-01-25  Federico Mena Quintero  <federico@ximian.com>
-
-	* gui/dialogs/alarm-options.glade: Use 1 instead of zero as the
-	minimum value for the repetitions spin button as we use a check
-	box to specify whether the alarm has repetitions or not.  Fixes
-	bug #19054.
-
-2002-01-24  Ettore Perazzoli  <ettore@ximian.com>
-
-	* importers/Makefile.am (evolution_calendar_importer_LDADD):
-	Ooops.  Forgot to use EVOLUTION_CALENDAR_LIBS here.
-
-2002-01-24  Ettore Perazzoli  <ettore@ximian.com>
-
-	* conduits/calendar/Makefile.am: Use
-	EVOLUTION_CALENDAR_CONDUIT_LIBS and
-	EVOLUTION_CALENDAR_CONDUIT_CFLAGS.
-	* conduits/todo/Makefile.am: Likewise.
-
-	* cal-client/Makefile.am: Use EVOLUTION_CALENDAR_LIBS and
-	EVOLUTION_CALENDAR_CFLAGS.
-	* cal-util/Makefile.am: Likewise.
-	* gui/alarm-notify/Makefile.am: Likewise.
-	* gui/Makefile.am: Likewise.
-
-2002-01-23  Ettore Perazzoli  <ettore@ximian.com>
-
-	* gui/component-factory.c (create_object): Pass a NULL @icon to
-	`evolution_shell_component_add_user_creatable_item()'.
-
-2002-01-21  JP Rosevear  <jpr@ximian.com>
-
-	* conduits/todo/todo-conduit.c (todoconduit_load_configuration):
-	return a new configuration struct, load default priority setting
-	(todoconduit_save_configuration): save default priority setting
-	(e_todo_context_new): dupe configuration
-
-	* conduits/calendar/calendar-conduit.c (e_calendar_context_new):
-	set ps to NULL
-
-2002-01-17  Damon Chaplin  <damon@ximian.com>
-
-	* gui/dialogs/alarm-page.c (get_alarm_string): save the alarm string
-	in the correct variable (str), so it actually gets shown for alarms
-	with specific trigger times. Fixes bug #18801.
-
-2002-01-15  Rodrigo Moya <rodrigo@ximian.com>
-
-	* gui/dialogs/task-page.c (task_page_fill_widgets): default component
-	classification to PUBLIC. Fixes internal bug #1066
-
-2002-01-14  JP Rosevear  <jpr@ximian.com>
-
-	* conduits/calendar/calendar-conduit.c: move all functions here,
-	get rid of header files, use e-pilot-settings to display gui
-
-	* conduits/todo/todo-conduit.c: as above
-	
-2002-01-14  JP Rosevear  <jpr@ximian.com>
-	
-	* gui/gnome-cal.c (get_current_time): use icaltimetype_to_tm
-	
-2002-01-14  JP Rosevear  <jpr@ximian.com>
-	
-	* gui/e-week-view-main-item.c (e_week_view_main_item_draw_day):
-	figure out when today is and highlight if it is not selected
-
-	* gui/e-week-view.h: enum the "today" color
-
-	* gui/e-week-view.c (e_week_view_realize): init the "today" color
-
-2002-01-13  JP Rosevear  <jpr@ximian.com>
-
-	* gui/alarm-notify/save.h: add protos
-
-	* gui/alarm-notify/save.c (save_blessed_program): records a
-	program as blessed
-	(is_blessed_program): checks to see if a program is blessed
-
-	* gui/alarm-notify/alarm-queue.c (procedure_notification_dialog):
-	popup a dialog notifying the user that is a program and let them
-	not see the dialog about this program again
-	(procedure_notification): use above
-
-2002-01-11  Damon Chaplin  <damon@ximian.com>
-
-	* gui/e-timezone-entry.c: 
-	* gui/e-itip-control.c (write_label_piece): 
-	* gui/calendar-config.c (on_timezone_set): translate timezone names
-	when displayed. Fixes bug #6544.
-
-2002-01-03  JP Rosevear  <jpr@ximian.com>
-
-	* gui/tasks-control.c (tasks_control_complete_cmd): new verb
-	callback
-	(sensitize_commands): set sensitivity of mark complete command
-
-	* gui/e-tasks.h: new proto
-
-	* gui/e-tasks.c (e_tasks_complete_selected): mark selected tasks
-	in the table as complete
-
-	* gui/e-calendar-table.h: new proto
-
-	* gui/e-calendar-table.c (e_calendar_table_complete_selected):
-	mark selected rows as complete
-
-2002-01-03  JP Rosevear  <jpr@ximian.com>
-	
-	* gui/tasks-control.c (confirm_expunge): only need one warning
-	message now
-
-	* gui/e-tasks.c (create_sexp): change the logic to expunge all
-	completed tasks not just hidden ones
-
-2002-01-03  JP Rosevear  <jpr@ximian.com>
-	
-	* gui/tasks-control.c (confirm_expunge): confirm expunging of the
-	tasks
-	(tasks_control_expunge_cmd): verb callback
-
-	* gui/calendar-config.c (config_read): read confirm expunge value
-	(calendar_config_write): write confirm expunge value
-	(calendar_config_write_on_exit): ditto
-	(calendar_config_get_confirm_expunge): get value
-	(calendar_config_set_confirm_expunge): set value
-
-	* gui/calendar-config.h: new proto
-
-	* gui/e-itip-control.c (start_calendar_server): kill warning
-
-	* gui/e-tasks.c (e_tasks_init): init query member to NULL
-	(set_status_message): util function to set status message
-	(e_tasks_open): use above
-	(cal_opened_cb): ditto
-	(create_sexp): create sexp of items to be deleted
-	(query_obj_updated_cb): remove any items found
-	(query_eval_error_cb): bail out on error
-	(query_query_done_cb): tidy when done
-	(e_tasks_delete_completed): set up query
-
-	* gui/e-tasks.h: new proto
-
-	* gui/calendar-model.c (query_query_done_cb): use g_warning
-	instead of printing to stderr
-	(query_eval_error_cb): ditto
-	(update_query): clear the status message if we can't create the
-	query
-
-	* gui/tag-calendar.c (resolve_tzid_cb): make this static
-
-2001-12-21  JP Rosevear  <jpr@ximian.com>
-
-	* gui/dialogs/comp-editor.c: remove needs send signal related
-	cruft
-	(save_comp_with_send): with send_component_dialog, indicate if the
-	meeting info is newly created or not
-	(real_edit_comp): remember if the dialog initially needs a send
-
-	* gui/dialogs/send-comp.c (send_component_dialog): take a "new"
-	parameter indicating whether the dialog should intimate if the
-	component to be sent is a new meeting or not
-
-	* gui/dialogs/send-comp.h: update proto
-
-	* gui/dialogs/comp-editor.c: remove no longer used needs_send
-	notification and signal
-
-	* gui/dialogs/comp-editor.h: remove proto
-
-	* gui/e-day-view.c (e_day_view_on_main_canvas_drag_data_received): add new
-	param to send_component_dialog
-	(e_day_view_finish_long_event_resize): ditto
-	(e_day_view_finish_resize): ditto
-	(e_day_view_on_editing_stopped): ditto
-	(e_day_view_on_top_canvas_drag_data_received): ditto
-
-	* gui/e-week-view.c (e_week_view_on_editing_stopped): add new
-	param to send_component_dialog
-
-2001-12-21 JP Rosevear  <jpr@ximian.com>
-	
-	* gui/dialogs/comp-editor.h: inherit from bonobo window	
-
-	* gui/dialogs/comp-editor.c: inherit from bonobo window
-	(comp_editor_key_press_event): Look for an escape key press and
-	close the window if found
-
-2001-12-20  Ettore Perazzoli  <ettore@ximian.com>
-
-	[Fixes #17377, Evolution doesn't work on multi-depth displays.]
-
-	* gui/main.c (main): Push GdkRGB visual and colormap.
-
-2001-12-19  JP Rosevear  <jpr@ximian.com>
-
-	* conduits/calendar/calendar-conduit.c (check_for_slow_setting):
-	go slow and clear the map if the last uri and the current uri do
-	not match
-	(post_sync): save the last uri
-
-	* conduits/calendar/calendar-conduit-config.h: handle a last uri
-	config option
-
-	* conduits/todo/todo-conduit-config.h: ditto
-
-    	* conduits/calendar/calendar-conduit.c (start_calendar_server):
-    	use the open_default_calendar method
-    
-    	* conduits/todo/todo-conduit.c (start_calendar_server): same as above
-	
-    	* cal-client/Makefile.am: link with bonobo conf
-    
-    	* cal-client/cal-client.h: new protos
-    
-    	* idl/evolution-calendar.idl: make sure open method raises
-    	appropriate exceptions
-    
-     	* gui/e-itip-control.c (start_calendar_server): use
-     	cal_client_open_default_* calls
-     
-     	* cal-client/cal-client.c (real_open_calendar): do the real work
-     	of loading
-     	(cal_client_open_calendar): use above
-     	(get_fall_back_uri): get the basic local uri
-     	(get_default_uri): get the default uri from the config db
-     	(cal_client_open_default_calendar): open the default uri or the
-     	fallback if the method is unsupported
-     	(cal_client_open_default_tasks): same for tasks
-	
-2001-12-17  JP Rosevear  <jpr@ximian.com>
- 
- 	* gui/e-itip-control.c (send_item): use get_real_item
- 	(get_refresh_options): uncomment out
- 	(get_real_item): obtain the real object which has the uid of the
- 	item received
- 	(show_current_todo): use get_refresh_options for refresh method
- 	and provide the description and summary from the real component
- 	since its not in the reply
- 	(show_current_event): ditto
- 	(send_item): use get_real_item
-
-2001-12-17  JP Rosevear  <jpr@ximian.com>
-
-	* gui/itip-utils.c (comp_limit_attendees): can't remove properties
-	in an iteration loop, so remove them outside the loop
-	(comp_minimal): don't set a recurid if there isn't one, add the x
-	properties to the clone
-	(comp_compliant): unref the clone for DECLINECOUNTER
-
-	* gui/e-itip-control.c (get_refresh_options): make function
-	available again
-	(show_current_event): use it here
-	(ok_clicked_cb): can't remove properties in an iteration loop, so
-	remove them outside the loop
-
-	* cal-util/cal-component.c (free_icalcomponent): properly free the
-	attendee list
-	(cal_component_rescan): don't destroy the alarm hash
-
-2001-12-13  Damon Chaplin  <damon@ximian.com>
-
-	* zones.h: new file to contain all timezone names for translation.
-	We won't be using the translations in 1.0.1, but it gives translators
-	time before we do use them in 1.0.2.
-
-	* Makefile.am: added zones.h to EXTRA_DIST.
-
-2001-12-12  JP Rosevear  <jpr@ximian.com>
- 
-	* gui/e-day-view.c (e_day_view_on_top_canvas_button_release):
- 	ungrab the pointer before calling
- 	e_day_view_finish_long_event_resize
- 	(e_day_view_on_main_canvas_button_release): ditto
- 	(e_day_view_finish_long_event_resize): ask if the meeting should
- 	be sent
- 	(e_day_view_finish_resize): ditto
- 	(e_day_view_on_editing_stopped): ditto
- 	(e_day_view_on_top_canvas_drag_data_received): ditto
- 	(e_day_view_on_main_canvas_drag_data_received): ditto
-
-2001-12-11  JP Rosevear  <jpr@ximian.com>
-
- 	* gui/e-meeting-model.c (process_free_busy_comp): properly convert
- 	the dtstart and dtend times if they are UTC
- 	(cursor_cb): if we don't have anybody to get f/b info for, process
- 	the callbacks immediately
- 	(e_meeting_model_refresh_busy_periods): take start/end times,
- 	calculate the timet values with object timezone
- 	(e_meeting_model_etable_model_to_view_row): proper cast
- 	(e_meeting_model_etable_view_to_model_row): ditto
-	(async_open): bail out if we couldn't open properly
-
-	* gui/e-meeting-time-sel.c
- 	(e_meeting_time_selector_on_update_free_busy): use defines for
- 	determining the number of days before and after of free busy to
- 	request
- 	(e_meeting_time_selector_update_dates_shown): use defines for the
- 	number of days shown
- 
- 	* gui/e-meeting-model.h: update proto
-
-2001-12-10  Damon Chaplin  <damon@ximian.com>
-
-	* gui/control-factory.c (control_factory_new_control): removed code
-	that connects to GnomeCalendar's "dates_shown_changed" signal.
-
-	* gui/calendar-commands.c (gcal_calendar_dates_change_cb): 
-	(calendar_control_activate): moved it here, so it gets reconnected
-	whenever the control is activated. Fixes bug #15798.
-
-2001-12-10  Damon Chaplin  <damon@ximian.com>
-
-	* importers/GNOME_Evolution_Calendar_Importer.oaf.in: fixed executable
-	name. Fixes bug #16880.
-
-2001-12-08  JP Rosevear  <jpr@ximian.com>
-  
-  	* conduits/calendar/calendar-conduit.c (local_record_from_comp):
-  	if we have an alarm that can be represented on the pilot, set the
-  	appointment fields appropriately, if the duration has values for
-  	minutes and/or hours and/or days, use the lowest common
-  	denominator
-  	(comp_from_remote_record): if the appointment on the pilot has an
-  	alarm, find the first alarm an item currently had that is relative
-  	to the start and with a negative duration and update it (or create
-  	a new one if no valid ones exist)
-  
- 	* cal-util/cal-component.c (cal_component_get_alarm_uids): build
-  	list in the order they appear in the component so we get
-  	consisting order for the gui and for the pilot
- 
-2001-12-08  Rodrigo Moya <rodrigo@ximian.com>
-
-	* gui/calendar-config.c (calendar_config_get_default_uri):
-	(calendar_config_get_default_tasks_uri): s/%/%s
-
-2001-11-09  Federico Mena Quintero  <federico@ximian.com>
-
-	(committed by Damon)
-
-	Fix bug #14699.
-
-	* pcs/query.c (QueryState): Added a state QUERY_WAIT_FOR_BACKEND
-	to indicate that the query is not populated as we are waiting for
-	the backend to be opened.
-	(query_init): Start in the QUERY_WAIT_FOR_BACKEND state.
-	(query_destroy): Only disconnect from the backend if we are in a
-	state that implies that we are connected to its signals.
-	(query_construct): If the backend is already loaded, immediately
-	set the state to QUERY_START_PENDING.
-	(backend_opened_cb): Disconnect from the backend's "opened"
-	signal.  Set the state to QUERY_START_PENDING.
-	(match_component): We can now only match components if the query
-	is in progress or if it is done.  Assert to that effect, and do
-	not ensure_sexp().
-	(match_component): Do not check for a nonexistent component using
-	g_return_if_fail().  Also, there is no need to ref/unref the
-	component.
-	(backend_obj_updated_cb): Assert to the effect of our state.
-	(backend_obj_removed_cb): Likewise.
-	(parse_sexp): Renamed from ensure_sexp().  Assert that the query
-	has not started.  Do not disconnect from the backend's signals
-	here, since we have no connections.
-	(start_query_cb): Set the state to QUERY_IN_PROGRESS here instead
-	of in populate_query().
-
-2001-12-07  Rodrigo Moya <rodrigo@ximian.com>
-
-	* gui/calendar-config.c (calendar_config_get_default_uri):
-	(calendar_config_get_default_tasks_uri): if the key in the config
-	database does not exist, just return the local URIs, but never
-	return NULL
-
-2001-12-06  Rodrigo Moya <rodrigo@ximian.com>
-
-	* gui/dialogs/event-page.c (event_page_fill_widgets): default
-	component classification to PUBLIC
-
-2001-12-06  Jon Trowbridge  <trow@ximian.com>
-
-        * gui/dialogs/event-editor.c (event_editor_destroy): Explicitly
-	destroy the EMeetingModel.  This is a hack to work around problems
-	with the reference counting; we are still leaking the
-	EMeetingModels.
-
-        * gui/e-meeting-time-sel.c
-        (e_meeting_time_selector_construct): Ref our EMeetingModel.
-        (e_meeting_time_selector_destroy): Unref the model.
-
-        * gui/e-meeting-model.c (destroy): Properly destroy
-	corba_select_names with a call to bonobo_object_release_unref.
-        (Fixes 14002)
-
-2001-12-05  Rodrigo Moya <rodrigo@ximian.com>
-
-	* gui/dialogs/event-page.glade: added entry for the LOCATION field
-
-	* gui/dialogs/event-page.c: added support for the new LOCATION entry
-	added in the Event editor.
-
-2001-12-05  Zbigniew Chyla  <cyba@gnome.pl>
-
-	* gui/itip-utils.c (comp_subject, comp_description):
-	Marked strings for translation.
-
-2001-12-03  Damon Chaplin  <damon@ximian.com>
-
-	* gui/e-meeting-model.c: 
-	* gui/calendar-model.c: make sure we call e_table_model_pre_change()
-	before changing the model.
-
-	* gui/calendar-config.c (calendar_config_configure_e_calendar_table): 
-	removed call to e_table_model_changed(). calendar_model_refresh()
-	results in that anyway.
-
-2001-12-03  Damon Chaplin  <damon@ximian.com>
-
-	* gui/e-calendar-table.etspec: disabled 'Alarms', 'End Date' and
-	'Show Time As' fields, as these are not useful for tasks. We may want
-	to reenable them later if we add a table view of calendar events.
-
-2001-12-02  Rodrigo Moya <rodrigo@ximian.com>
-
-	* gui/calendar-offline-handler.c (backend_cal_opened): connect to
-	"cal_set_mode" signal before calling cal_client_set_mode. Also,
-	s/cal_mode_set/cal_set_mode
-	(backend_go_offline): connect to "cal_opened" signal before calling
-	cal_client_open_calendar
-
-2001-11-30  Damon Chaplin  <damon@ximian.com>
-
-	* gui/e-itip-control.c (remove_item): only show the dialog if we
-	created it. Hopefully fixes bug #15774.
-	Also ifdef'ed out a lot of code that isn't currently used, including
-	code to use a label which is never created. The unused code was there
-	to support handling multiple iTIP objects in a message, but was never
-	updated when we switched to use HTML for the control. Fixes bug #16232.
-
-2001-11-28  Federico Mena Quintero  <federico@ximian.com>
-
-	* gui/gnome-cal.c (gnome_calendar_new_task): Set the category of
-	the new task to that of the search bar.  Fixes bug #15533.
-
-2001-11-27  Rodrigo Moya <rodrigo@ximian.com>
-
-	* gui/e-itip-control.c (update_attendee_status):
-	* gui/itip-utils.c (comp_to_list): fixed typos in translatable
-	strings. Fixes Ximian #15456
-
-2001-11-14  Damon Chaplin  <damon@ximian.com>
-
-	* gui/print.c: Substituted gnome_font_get_width_string() with
-	gnome_font_get_width_utf8() and gnome_font_get_width_string_n()
-	with gnome_font_get_width_utf8_sized(). Fixes calendar part of #15379.
-
-2001-11-14  Federico Mena Quintero  <federico@ximian.com>
-
-	* gui/calendar-model.c (date_value_to_string): Convert the buffer
-	to UTF8.
-	(calendar_model_value_to_string): Do not convert the string fields
-	to UTF8 again; they are already in UTF8.  Fixes the UTF8-related
-	bits of bug #15304.
-
-2001-11-14  Damon Chaplin  <damon@ximian.com>
-
-	* gui/calendar-model.c: 
-	* cal-util/cal-component.h: #ifdef'ed out the LOCATION field for now,
-	since it wasn't supported everywhere, or in the .etspec file.
-
-2001-11-14  Damon Chaplin  <damon@ximian.com>
-
-	* gui/e-calendar-table.c: don't abort when e_table_selected_count()
-	returns odd values. There seems to be a bug in ETable. This is to
-	avoid bug #13843.
-
-2001-11-13  Federico Mena Quintero  <federico@ximian.com>
-
-	(committed to CVS by Damon)
-	Fixes bug #15137.
-	
-	* gui/e-day-view.c (e_day_view_on_delete_appointment): Do not try
-	to operate on the event if it gets deleted while stopping the
-	edition.
-	(e_day_view_on_event_double_click): Likewise.
-	(e_day_view_on_long_event_button_press): Likewise.
-	(e_day_view_on_event_button_press): Likewise.
-	(e_day_view_on_long_event_click): Likewise.
-	(e_day_view_on_event_click): Likewise.
-
-	* gui/e-week-view.c (e_week_view_on_text_item_event): Likewise.
-
-2001-11-14  JP Rosevear  <jpr@ximian.com>
-
-	* conduits/calendar/calendar-conduit.c (pre_sync): remove silly
-	debug warning
-
-2001-11-13  Damon Chaplin  <damon@ximian.com>
-
-	* gui/alarm-notify/config-data.c (ensure_inited): 
-	* gui/calendar-config.c (config_read): 
-	* conduits/todo/todo-conduit.c (get_default_timezone): 
-	* conduits/calendar/calendar-conduit.c (get_default_timezone): 
-	make the timezone default to UTC. Fixes bug #14362.
-
-2001-11-13  Rodrigo Moya <rodrigo@ximian.com>
-
-	* gui/e-week-view.c (selection_received): only change the day,
-	month and year for the start date, for not screwing up the start
-	time, which was being set to midnight always (Fixes Ximian #5287)
-	Also, deal correctly with VCALENDAR components
-	
-	* gui/e-day-view.c (selection_received): dela correctly with
-	VCALENDAR components being pasted
-
-2001-11-11  Federico Mena Quintero  <federico@ximian.com>
-
-	* gui/alarm-notify/save.c (get_calendars_to_load): The last
-	argument to the bonobo_config_get_XXX_with_default() is a gboolean
-	*, not a CORBA_Environment *.  Fixes bug #14655.
-
-2001-11-11  JP Rosevear  <jpr@ximian.com>
-
- 	* pcs/cal-backend-file.c (free_busy_instance): recurrence
- 	expansion callback for free/busy
- 	(create_user_free_busy): expand recurrences and use date/time
- 	values for dtstart and dtend
- 
-2001-11-11  JP Rosevear  <jpr@ximian.com>
-
-	* gui/e-meeting-model.h: new protos
-
-	* gui/e-meeting-model.c (e_meeting_model_get_zone): accessor
-	(e_meeting_model_set_zone): ditto
-	(init): init to the calendar default zone
-	(process_free_busy_comp): take the zone to convert to as a param
-	(e_meeting_model_refresh_busy_periods): redraw properly
-
-	* gui/dialogs/schedule-page.c (update_time): set the zone of the
-	model
-
-2001-11-09  Damon Chaplin  <damon@ximian.com>
-
-	* gui/e-week-view.c (e_week_view_key_press): don't subtract a day
-	from DTEND. For DATE values we don't include the entire day now.
-	Fixes bug #14842.
-
-2001-11-09  Damon Chaplin  <damon@ximian.com>
-
-	* gui/e-week-view-layout.c (e_week_view_layout_events): fix buffer
-	overflow. Fixes bug #10285 (the printing of lines & dates in the
-	printout of the month view).
-
-2001-11-09  Zbigniew Chyla  <cyba@gnome.pl>
-
-	* gui/dialogs/meeting-page.c
-	(meeting_page_fill_widgets): Convert strings to GTK+ encoding.
-	(meeting_page_destroy): Free allocated strings before freeing the list
-	itself.
-
-2001-11-08  JP Rosevear  <jpr@ximian.com>
-
-	* gui/e-meeting-time-sel.c
-	(e_meeting_time_selector_timeout_handler): don't let an empty
-	event occur for all days when auto scrolling
-
-2001-11-08  Rodrigo Moya <rodrigo@ximian.com>
-
-	* pcs/cal-backend-file.c 
-	(cal_backend_file_compute_changes_foreach_key): don't leak the
-	string returned by cal_component_get_as_string nor the temporary
-	CalComponent we create
-
-2001-11-08  JP Rosevear  <jpr@ximian.com>
-	
- 	* gui/e-itip-control.c (ok_clicked_cb): don't add the item, remove
- 	it if declining (in case it was added before)
- 	(remove_item): Since we can't discern between an item not found
- 	and another error, always say the removal is complete
-
-2001-11-07  Zbigniew Chyla  <cyba@gnome.pl>
-
-	* gui/e-cell-date-edit-text.c (ecd_get_text):
-	Convert generated string to UTF-8.
-
-2001-11-07  JP Rosevear  <jpr@ximian.com>
-
- 	* gui/e-meeting-time-sel.c
- 	(e_meeting_time_selector_on_start_time_changed): emit changed
- 	signal
- 	(e_meeting_time_selector_on_end_time_changed): emit changed
- 	signal, if end time is now before start time and all day event,
- 	make sure a whole day is still selected
- 	(e_meeting_time_selector_drag_meeting_time): calculate the first
- 	and last_time's in whole days for all day events
- 	(e_meeting_time_selector_timeout_handler): calculate the drag time
- 	to be whole days for all day events and scroll the canvas even if
- 	we don't update the time so the user can see where they're headed
-
-2001-11-06  JP Rosevear  <jpr@ximian.com>
-
-	* gui/dialogs/event-editor.c (event_editor_edit_comp): make sure
-	to remove all attendees from the model when we edit a new comp,
-	append the pages if they are needed and we weren't showing them
-	before
-
-	* gui/dialogs/task-editor.c (task_editor_edit_comp): same as above
-
- 	* gui/dialogs/comp-editor.c (comp_editor_remove_page): check for a
- 	return value indicating the page was not found and return if so
- 
-2001-11-05  Ettore Perazzoli  <ettore@ximian.com>
-
-	* gui/dialogs/e-delegate-dialog.c: #include
-	"Evolution-Addressbook-SelectNames.h", not
-	"../Evolution-Addressbook-SelectNames.h".  Grrr.
-
-2001-11-05  JP Rosevear  <jpr@ximian.com>
-
-	* gui/e-meeting-time-sel.c (e_meeting_time_selector_class_init):
-	add a changed signal
-	(e_meeting_time_selector_construct): emit changed signal
-	(e_meeting_time_selector_set_meeting_time): ditto
-	(e_meeting_time_selector_set_all_day): set the all day setting
-	(e_meeting_time_selector_autopick): emit changed signal
-	(e_meeting_time_selector_find_nearest_interval): find proper
-	interval when in all day mode
-	(e_meeting_time_selector_find_nearest_interval_backward): ditto
-	(e_meeting_time_selector_drag_meeting_time): for all day events,
-	move the time when past the 12 hour mark, and and always make sure
-	1 full day is selected, emit changed signal when appropriate
-	(e_meeting_time_selector_update_start_date_edit): set date and
-	time of day together
-	(e_meeting_time_selector_update_end_date_edit): ditto, and adjust
-	display time if all day event
-
-	* gui/e-meeting-time-sel-item.c
-	(e_meeting_time_selector_item_draw): remove unused variable
-	(e_meeting_time_selector_item_button_press): for all day mode,
-	make the interval a whole day
-
-	* gui/dialogs/schedule-page.c (update_time): set the meeting time
-	selector setting instead of manual mucking with the e-date-edit
-	widgets
-	(init_widgets): listen to the changed signal of the meeting time
-	selector instead of propagating multiple events as it updates
-
-	* gui/dialogs/event-page.c (update_time): block time zone change
-	signals
-
-2001-11-05  Damon Chaplin  <damon@ximian.com>
-
-	* gui/calendar-model.c (dup_date_edit_value): removed ';' in the wrong
-	place. Fixes bug #14421.
-
-2001-11-05  Dan Winship  <danw@ximian.com>
-
-	* gui/alarm-notify/Makefile.am (evolution_alarm_notify_LDFLAGS):
-	-export-dynamic for libglade custom widget.
-
-2001-11-04  Damon Chaplin  <damon@ximian.com>
-
-	* gui/comp-editor-factory.c (get_default_component): use TZID from the
-	builtin timezone, instead of using the location name.
-
-2001-11-02  Federico Mena Quintero  <federico@ximian.com>
-
-	* cal-util/cal-util.c (compute_alarm_range): Short-circuit the
-	calculation of the repeat time if there are zero repetitions.
-	(compute_alarm_range): I'm a moron.  De-reference alarm_start when
-	subtracting stuff from it!  Fixes bug #14209.
-
-2001-10-31  Ettore Perazzoli  <ettore@ximian.com>
-
-	* gui/dialogs/Makefile.am: Added rules to generate
-	`Evolution-Addressbook-SelectNames.h'.
-
-	* gui/dialogs/comp-editor-util.h: #include
-	"Evolution-Addressbook-SelectNames.h" from this directory.
-
-2001-10-31  Federico Mena Quintero  <federico@ximian.com>
-
-	* gui/dialogs/alarm-options.c: #include <string.h>
-
-2001-10-31  Federico Mena Quintero  <federico@ximian.com>
-
-	* gui/gnome-cal.c (dn_query_obj_updated_cb): If a query is not in
-	progress, just retag the whole thing.  An event may change dates
-	and tag_calendar_by_comp() would not know how to untag the old
-	dates.  Fixes bug #10220.
-
-	* pcs/query.c (start_query_cb): Connect to the backend's
-	"obj_updated" and "obj_removed" signals here instead of in
-	query_construct().  If a query is started while another one is
-	notifying of an update, these signal connections would get appened
-	to the running signal (the one that triggered the notification
-	about an update) and the new signal handlers would also get
-	called.  We are really not interested in updates before we
-	populate the query, because we'll catch the changes anyways.
-
-2001-10-31  Federico Mena Quintero  <federico@ximian.com>
-
-	Fix bug #13723.
-
-	* gui/gnome-cal.h (GnomeCalendarClass): New signals
-	"calendar_focus_change", "taskpad_focus_change", and
-	"taskpad_selection_changed".  Renamed "selection_changed" to
-	"calendar_selection_changed".
-
-	* gui/gnome-cal.c (gnome_calendar_get_num_tasks_selected): New
-	function.
-	(setup_widgets): Connect to the focus event signals of the task
-	pad and the calendar view widgets.
-	(gnome_calendar_delete_selection): Renamed from
-	gnome_calendar_delete_event().
-	(gnome_calendar_cut_clipboard): Handle the current focus location.
-	(gnome_calendar_copy_clipboard): Likewise.
-	(gnome_calendar_paste_clipboard): Likewise.
-	(gnome_calendar_delete_selection): Likewise.
-	(table_selection_change_cb): New callback.
-
-	* gui/calendar-commands.c (sensitize_calendar_commands): Take in
-	whether we should unconditionally disable everything.
-	(sensitize_taskpad_commands): Analogous function to the above.
-	(gcal_calendar_focus_change_cb): New callback, used for calendar
-	views.
-	(gcal_taskpad_focus_change_cb): New callback, used for the
-	taskpad.
-
-	* gui/e-day-view.c (e_day_view_key_press): Use a better test for
-	keys that should start editing.  Fixes bug #6447.
-
-	* gui/e-week-view.c (e_week_view_key_press): Likewise.
-
-2001-10-31  Christopher James Lahey  <clahey@ximian.com>
-
-	* gui/calendar-model.c: Make the pre_changes and changes match
-	here.
-
-2001-10-31  JP Rosevear  <jpr@ximian.com>
-
-	* gui/itip-utils.c (itip_send_comp): send as mixed rather than
-	alternative
-
-2001-10-31  Ettore Perazzoli  <ettore@ximian.com>
-
-	* gui/alarm-notify/save.c (KEY_CALENDARS_TO_LOAD):
-	Removed.
-	(KEY_NUM_CALENDARS_TO_LOAD): New key, containing the number of
-	calendars to load.
-	(BASE_KEY_CALENDAR_TO_LOAD): New base key name for the URIs of the
-	calendars to load.
-	(save_calendars_to_load): Rewrote to not use a sequence, to work
-	around an ORBit bug that causes bonobo-moniker-xmldb to crash.
-	(get_calendars_to_load): Likewise.
-
-2001-10-30  Damon Chaplin  <damon@ximian.com>
-
-	* gui/dialogs/comp-editor.c (comp_editor_remove_page): disconnect
-	signals added in append_page(). Fixes Gtk-Critical warning about
-	GtkAccelGroup being added twice to a window.
-
-2001-10-30  JP Rosevear  <jpr@ximian.com>
-
-	* gui/itip-utils.c (itip_send_comp): set a body for the message
-
-2001-10-30  Dan Winship  <danw@ximian.com>
-
-	* gui/itip-utils.c (itip_send_comp): call
-	GNOME_Evolution_Composer_setMultipartType to get a
-	multipart/alternative.
-
-2001-10-30  JP Rosevear  <jpr@ximian.com>
-
-	* gui/e-meeting-time-sel.c
-	(e_meeting_time_selector_on_start_time_changed): don't overwrite
-	memory
-	(e_meeting_time_selector_on_end_time_changed): ditto
-
-2001-10-30  Damon Chaplin  <damon@ximian.com>
-
-	* gui/calendar-model.c (dup_date_edit_value): return NULL if passed
-	NULL. Should fix bug #14048.
-
-2001-10-30  Federico Mena Quintero  <federico@ximian.com>
-
-	* gui/calendar-config.c (config_read): Do not ignore the
-	exceptions of the cases that do not have defaults.
-
-2001-10-30  JP Rosevear  <jpr@ximian.com>
-
-	* gui/e-meeting-time-sel.c
-	(e_meeting_time_selector_drag_meeting_time): if we are doing all
-	day stuff, make the drag increment 1 day at a time
-
-2001-10-30  Federico Mena Quintero  <federico@ximian.com>
-
-	* gui/dialogs/meeting-page.c (meeting_page_fill_component): Add
-	_() to a string that was missing it.
-
-2001-10-30  Federico Mena Quintero  <federico@ximian.com>
-
-	* gui/dialogs/meeting-page.c (table_canvas_focus_out_cb): Commit
-	the ETable click-to-add for if the dialog is being destroyed.
-	Should fix bug #13959.
-
-2001-10-30  Federico Mena Quintero  <federico@ximian.com>
-
-	* gui/itip-utils.c (itip_send_comp): Allocate enough space for the
-	string!  (was missing the null terminator) Possibly fixes #13924.
-	Thanks a *LOT* to Michael Zucchi for running this through Purify.
-
-2001-10-30  JP Rosevear  <jpr@ximian.com>
-	
-	* gui/e-meeting-time-sel-item.c
-	(e_meeting_time_selector_item_button_press): move in whole day
-	increments if we are in all day mode
-
-	* gui/e-meeting-time-sel.c
-	(e_meeting_time_selector_on_start_time_changed): get rid of
-	localtime call
-	(e_meeting_time_selector_on_end_time_changed): ditto
-	(e_meeting_time_selector_update_start_date_edit): set the date
-	editor using the meeting time fields directly
-	(e_meeting_time_selector_update_end_date_edit): ditto
-
-	* gui/dialogs/schedule-page.c (update_time): do the set_show_time
-	stuff first
-
-	* conduits/calendar/calendar-conduit.c (process_multi_day): don't
-	adjust the time, set the default timezone for date values
-
-2001-10-30  Dan Winship  <danw@ximian.com>
-
-	* gui/alarm-notify/Makefile.am (INCLUDES):
-	s/BONOBO_HTML_GNOME_LIBS/BONOBO_HTML_GNOME_CFLAGS/
-
-2001-10-30  JP Rosevear  <jpr@ximian.com>
-	
-	* gui/e-meeting-model.c (e_meeting_model_count_actual_attendees):
-	count the actual attendees (doesn't include people delegating
-
-	* gui/e-meeting-time-sel.c: use
-	e_meeting_model_count_actual_attendees (renamed)
-
-	* gui/e-meeting-time-sel-item.c: use
-	e_meeting_model_etable_view_to_model_row calls instead of calling
-	on the model directly, use e_meeting_model_count_actual_attendees
-
-	* gui/e-meeting-model.c
-	(e_meeting_model_etable_model_to_view_row): get the real mapping
-	(e_meeting_model_etable_view_to_model_row): ditto
-	(get_key): e-table-without callback
-	(duplicate_key): ditto
-	(free_gotten_key): ditto
-	(free_duplicated_key): ditto
-	(init): create without model
-	(e_meeting_model_etable_from_model): build etable from without
-	model
-
-	* gui/e-meeting-model.h: update protos
-
-	* gui/dialogs/meeting-page.c (right_click_cb): convert row from
-	view to model row
-
-2001-10-30  Damon Chaplin  <damon@ximian.com>
-
-	* gui/dialogs/task-page.c (task_page_fill_widgets): set to the default
-	timezone for DATE values, in case the user switches to a DATE-TIME.
-
-2001-10-30  Damon Chaplin  <damon@ximian.com>
-
-	* gui/dialogs/task-page.c: handle DATE values for Start and Due dates.
-
-2001-10-30  Damon Chaplin  <damon@ximian.com>
-
-	* gui/dialogs/schedule-page.c: 
-	* gui/dialogs/event-page.c: 
-	* gui/dialogs/comp-editor-util.c: updated code to handle DATE values.
-
-	* gui/gnome-cal.c (gnome_calendar_new_appointment_for): 
-	* gui/e-day-view.c (e_day_view_key_press): updated DATE code.
-
-	* gui/e-cell-date-edit-text.c: 
-	* gui/calendar-model.c: updated to support DATE values.
-
-	* cal-util/cal-recur.c (cal_recur_generate_instances_of_rule): updated
-	to use DATE values in same way as Outlook - i.e. the DTEND date is
-	not included entirely. Though I did make it so that if the DTSTART
-	and DTEND used the same DATE value, it includes the entire day.
-	So 1-day events should be the same. Long All-Day events will be
-	1 day shorter.
-
-	* cal-util/cal-component.c (cal_component_get_start_plus_duration): 
-	don't subtract a day from the end date.
-
-	* gui/tasks-control.c: updated the EPixmap paths for Cut/Copy etc.
-	Removed Print & Print Preview paths, since we don't have menu commands
-	for these any more.
-
-2001-10-30  Federico Mena Quintero  <federico@ximian.com>
-
-	Fix bug #10016.
-
-	* gui/dialogs/comp-editor.c (comp_editor_merge_ui): Use
-	bonobo_ui_util_set_ui() instead of doing things by hand.  Hmmm, if
-	only that function had a way of telling us whether it failed so
-	that we could avoid setting the verb list...
-
-	* gui/dialogs/event-editor.c (event_editor_init): Do not pass the
-	filename with the full path so that Bonobo can find it in a smart
-	way.
-
-	* gui/dialogs/task-editor.c (task_editor_init): Likewise.
-
-2001-10-30  Federico Mena Quintero  <federico@ximian.com>
-
-	* gui/dialogs/delete-comp.c (delete_component_dialog): Use an
-	EMessageBox instead of a gnome_dialog_question so that the label
-	gets line breaking.  Fixes bug #11260.
-
-2001-10-29  Federico Mena Quintero  <federico@ximian.com>
-
-	Fix bug #13649.
-
-	* gui/calendar-config.c
-	(calendar_config_get_use_default_reminder): New function.
-	(calendar_config_set_use_default_reminder): New function.
-	(calendar_config_get_default_reminder_interval): New function.
-	(calendar_config_set_default_reminder_interval): New function.
-	(calendar_config_get_default_reminder_units): New function.
-	(calendar_config_set_default_reminder_units): New function.
-	(config_read): Get the options for default reminders.
-	(calendar_config_write): Set the options for default reminders.
-
-	* gui/dialogs/cal-prefs-dialog.c (cal_prefs_dialog_show_config):
-	Set the default reminder widgets from the config values.
-	(cal_prefs_dialog_update_config): Set the config values from the
-	widgets.
-
-	* gui/comp-util.c (cal_comp_event_new_with_defaults): New
-	function; creates a VEVENT component with the default alarm.
-
-	* gui/e-day-view.c (e_day_view_key_press): Use
-	cal_comp_event_new_with_defaults ();
-
-	* gui/e-week-view.c (e_week_view_key_press): Likewise.
-	* gui/calendar-model.c (calendar_model_append_row): Likewise.
-	* gui/comp-editor-factory.c (get_default_component): Likewise.
-	* gui/gnome-cal.c (gnome_calendar_new_appointment_for): Likewise.
-
-	* cal-util/cal-component.c (ensure_alarm_properties_cb): Ensure we
-	have a DESCRIPTION property.
-	(cal_component_commit_sequence): Ensure we have the mandatory
-	alarm properties.
-
-2001-10-30  JP Rosevear  <jpr@ximian.com>
-	
-	* gui/e-meeting-model.c (process_section): process an individual
-	section here
-	(select_names_ok_cb): call above
-	(get_select_name_dialog): listen for ok:dialog signal
-
-2001-10-29  Damon Chaplin  <damon@ximian.com>
-
-	* importers/Makefile.am (evolution_calendar_importer_LDADD): 
-	* gui/Makefile.am (evolution_calendar_LDADD): 
-	* cal-util/Makefile.am (test_recur_LDADD): 
-	* cal-client/Makefile.am (client_test_LDADD): use libical-evolution.la
-
-	* gui/dialogs/schedule-page.c: save the timezone passed in for the
-	start time, so if our times are changed we use this. Also, if the
-	end time was passed in in a different timezone, convert it.
-	Also hide the time fields for DATE values. Note that DATE values still
-	do not work.
-
-	* gui/dialogs/meeting-page.glade: changed "Invite Others" to
-	"Invite Others..." to be consistent with the other page.
-
-	* gui/dialogs/event-page.c (times_updated):
-	(all_day_event_toggled_cb): set is_date if appropriate.
-
-	* gui/e-itip-control.c (write_label_piece): convert all UTC times to
-	the current timezone. Outlook sends simple, non-recurring, events as
-	UTC times, which isn't very useful.
-
-2001-10-29  Federico Mena Quintero  <federico@ximian.com>
-
-	* gui/main.c (launch_alarm_daemon): Launch the alarm daemon as
-	soon as the calendar component is started.  Fixes bug #13867;
-	we can't really do much better than this.
-
-2001-10-29  Federico Mena Quintero  <federico@ximian.com>
-
-	* gui/tasks-control.c (pixmaps): Fix the verb names for the
-	pixmaps in the Edit menu; they were out of synch with the XML
-	UI description.
-
-2001-10-29  Chris Toshok  <toshok@ximian.com>
-
-	* pcs/cal-factory.c (cal_factory_dump_active_backends): new
-	function.
-	(dump_backend): new function.
-
-	* pcs/cal-factory.h: add prototype for
-	cal_factory_dump_active_backends.
-
-2001-10-29  Federico Mena Quintero  <federico@ximian.com>
-
-	Fix bug #12163.
-
-	* cal-util/cal-util.c (compute_alarm_range): Take alarm
-	repetitions into account.
-	(add_alarm_occurrences_cb): Add alarm repetitions.
-	(generate_absolute_triggers): Likewise.
-	(generate_absolute_triggers): Oops, absolute triggers are in UTC,
-	so convert them as such.  Also, pay attention to the timezones of
-	the dtstart and dtend properties.
-
-2001-10-29  JP Rosevear  <jpr@ximian.com>
-
-	* importers/Makefile.am: include the header as a source so it gets
-	dist'ed.
-
-2001-10-29  Ettore Perazzoli  <ettore@ximian.com>
-
-	* importers/Makefile.am (INCLUDES):
-	s/BONOBO_CFLAGS/BONOBO_GNOME_CFLAGS/.
-
-2001-10-29  Rodrigo Moya <rodrigo@ximian.com>
-
-	* importers/icalendar-importer.c (load_file_fn): fixed URI
-	construction, which was preventing importing into the root
-	calendar (~/evo/local/Calendar/)
-
-2001-10-29  JP Rosevear  <jpr@ximian.com>
-
-	* conduits/calendar/calendar-conduit.c (is_all_day): handle date
-	values
-
-2001-10-29  Rodrigo Moya <rodrigo@ximian.com>
-
-	* importers/: added evolution-calendar-importer binary, starting
-	with an iCalendar file importer
-
-2001-10-29  JP Rosevear  <jpr@ximian.com>
-
-	* conduits/todo/todo-conduit-config.h
-	(todoconduit_load_configuration): get the management object by id
-
-	* conduits/calendar/calendar-conduit-config.h
-	(calconduit_load_configuration): ditto
-
-2001-10-29  Rodrigo Moya <rodrigo@ximian.com>
-
-	* gui/calendar-config.[ch] (calendar_config_get_default_uri):
-	(calendar_config_set_default_uri):
-	(calendar_config_get_default_tasks_uri):
-	(calendar_config_set_default_tasks_uri): new functions for setting
-	and retrieving the default calendar URIs
-
-	* gui/e-itip-control.c (init): don't use
-	hard-coded URI, but use the default calendar URI, as returned
-	by calendar_config_get_default_uri
-	(start_calendar_server): added a "gboolean tasks" parameter, so
-	that the local tasks.ics file is used if the calendar to be
-	started is for tasks when no default tasks URI is found in
-	the configuration
-
-2001-10-28  JP Rosevear  <jpr@ximian.com>
-
-	* conduits/calendar/calendar-conduit.c (add_record): unref the
-	comp when finished
-
-	* conduits/todo/todo-conduit.c (add_record): ditto
-	
-2001-10-28  Damon Chaplin  <damon@ximian.com>
-
-	* gui/dialogs/task-page.c (task_page_fill_widgets): added break
-	statements after each case, when setting the classification.
-	Fixes bug #13772.
-
-2001-10-28  Rodrigo Moya <rodrigo@ximian.com>
-
-	* cal-client/cal-client.c (destroy_wombat_client): removed this
-	function, as we don't need to unref at all the WombatClient
-	object, since it is aggregated to the CalListener object, which
-	will take care of unrefing it (Fixes Ximian #12001)
-	(cal_client_open_calendar): create the WombatClient here
-
-2001-10-28  Damon Chaplin  <damon@ximian.com>
-
-	* gui/print.c (print_todo_details): get the tasks directly from the
-	CalendarModel, so we get the filtering & sorting for free. Fixes
-	bug #10280. Hmm. This seems too easy. It isn't going to work is it...
-
-	* gui/gnome-cal.c (gnome_calendar_get_task_pad): new function to get
-	the TaskPad ECalendarTable, for printing.
-
-	* gui/calendar-model.c: 
-	* gui/calendar-config.c (calendar_config_get_hide_completed_tasks_sexp): 
-	split this out from calendar-model.c so we could use it for printing,
-	but ended up doing that a different way.
-
-	* gui/dialogs/task-page.c (init_widgets): removed a duplicated signal
-	connected to field_changed_cb().
-
-2001-10-27  Damon Chaplin  <damon@ximian.com>
-
-	* gui/print.c (print_week_view): 
-	(range_selector_new): when the week start day is set to Sunday, we
-	have to be careful to make sure we print the correct week, since
-	the previous Saturday is actually printed first. Fixes bug #13687.
-	(print_week_summary): always set compress_weekend to true if
-	multi_week_view is FALSE (i.e. we are printing the week view).
-	Fixes bug #13688.
-
-	* gui/e-itip-control.c (send_freebusy): use the timezones from the
-	DTSTART and DTEND.
-	(write_label_piece): output the date-time and the timezone after it.
-	Note that we may want to convert it to the current timezone and display
-	that as well. Also converted COMPLETED to the current timezone.
-	And fixed all uses of old timezone functions.
-
-	* gui/dialogs/comp-editor.c (commit_all_fields): added function to
-	set the focus in the window to NULL, so all fields lose their focus,
-	so they emit "changed" signals and update their values if needed.
-	We call this when most menu commands are used, e.g. 'Save and Close',
-	'Print' etc. Fixes bug #11434. In future we should also check fields
-	are valid and show dialogs if they are not.
-
-	* gui/calendar-model.c (get_completed): use the completed value
-	properly. Fixes bug #13694.
-
-	* cal-util/timeutil.c (icaltimetype_to_tm_with_zone): don't check
-	from_zone and to_zone != NULL. A NULL zone is valid, it is for
-	floating times.
-
-2001-10-27  Federico Mena Quintero  <federico@ximian.com>
-
-	* gui/e-day-view.c (e_day_view_on_text_item_event): Cancel editing
-	if the user presses Escape.
-
-	* gui/e-week-view.c (e_week_view_on_text_item_event): Likewise.
-
-	* gui/cal-search-bar.c: #include <string.h>
-
-2001-10-27  Federico Mena Quintero  <federico@ximian.com>
-
-	* gui/e-day-view.c (e_day_view_on_editing_stopped): Delete
-	appointments with empty summaries.  Fixes Ximian bug #780.
-
-	* gui/e-week-view.c (e_week_view_on_editing_stopped): Likewise.
-
-	* gui/dialogs/delete-comp.c (delete_component_dialog): Added an
-	argument to specify whether we unconditionally want single
-	components to be considered as not having a summary.
-
-	* gui/comp-util.c (cal_comp_confirm_delete_empty_comp): New
-	function.
-
-	* gui/misc.[ch]: New files with miscellaneous utility functions;
-	moved string_is_empty() over from calendar-model.c.
-
-	* gui/calendar-model.c: Use the string_is_empty()
-	function from misc.c.
-
-	* gui/Makefile.am (evolution_calendar_SOURCES): Added misc.[ch] to
-	the list of sources.
-
-2001-10-27  JP Rosevear  <jpr@ximian.com>
-
-	* conduits/todo/todo-conduit.c (local_record_from_comp): touch on
-	lookup
-	(check_for_slow_setting): write touched only if slow sync
-	(match): touch on lookup
-
-	* conduits/calendar/calendar-conduit.c (local_record_from_comp):
-	touch the record on lookup
-	(check_for_slow_setting): write touched only if slow sync
-	(pre_sync): don't touch on lookup
-	(match): touch on lookup
-
-2001-10-26  JP Rosevear  <jpr@ximian.com>
-
-	* conduits/calendar/e-calendar.conduit.in: remove the merges as
-	valid sync types
-
-	* conduits/todo/e-todo.conduit.in: as above
-
-	* conduits/calendar/calendar-conduit.c (pre_sync): write out only
-	the touched records if we are doing copies
-
-	* conduits/todo/todo-conduit.c: as above
-	
-	* conduits/calendar/calendar-conduit-config.h
-	(calconduit_load_configuration): get the sync type
-
-	* conduits/todo/todo-conduit-config.h: as above
-	
-2001-10-26  Damon Chaplin  <damon@ximian.com>
-
-	* gui/e-itip-control.c (write_label_piece): convert the formatted
-	date to UTF-8.
-
-	* cal-util/cal-recur.c (CAL_OBJ_DEBUG): turn off debug functions.
-
-	* gui/dialogs/comp-editor-util.c (parse_contact_string): handle UTF8
-	correctly. Bug #4450. Good enough for 1.0.
-
-	* gui/e-week-view-event-item.c (e_week_view_draw_time): set the gc
-	color before drawing. Should fix bug #11469.
-
-	* gui/dialogs/task-editor.c (task_editor_edit_comp): show or hide the
-	meeting page as appropriate. Note this may be called more than once,
-	if the task gets updated somewhere else and the user clicks 'Update
-	the object'. Hopefully fixes bug #12930.
-
-	* gui/print.c (print_comp_item): printed more fields and made a little
-	prettier. Fixes bug #9352.
-	(print_date_label): used the correct timezones for each date field.
-
-	* *.c: removed several debug messages.
-
-2001-10-26  JP Rosevear  <jpr@ximian.com>
-
-	* conduits/calendar/calendar-conduit.c (check_for_slow_setting):
-	make debug output more accurate
-
-	* conduits/todo/todo-conduit.c (check_for_slow_setting): ditto
-
-2001-10-26  JP Rosevear  <jpr@ximian.com>
-	
-	* conduits/todo/todo-conduit.c (pre_sync): remove the uid from the
-	map if was archived and is now deleted
-
-	* conduits/calendar/calendar-conduit.c: ditto
-
-2001-10-26  Rodrigo Moya <rodrigo@ximian.com>
-
-	* gui/e-calendar_table.c (delete_selected_components):
-	(selection_received): added status bar messages
-
-	* gui/e-day-view.c (e_day_view_cut_clipboard):
-	(selection_received): likewise
-
-	* gui/e-week-view.c (e_week_view_cut_clipboard):
-	(selection_received): likewise
-
-2001-10-26  JP Rosevear  <jpr@ximian.com>
-
-	* conduits/calendar/calendar-conduit.h: modify fields
-
-	* conduits/todo/todo-conduit.h: as above
-
-	* conduits/calendar/calendar-conduit.c (print_remote): free the
-	struct after use
-	(e_calendar_context_new): explicitly init context fields
-	(e_calendar_context_destroy): free local records and properly free
-	changed hash elements
-	(start_calendar_server_cb): tidy
-	(start_calendar_server): ditto
-	(free_local): free a local record
-	(local_record_to_pilot_record): use a static buffer to avoid leaks
-	(local_record_from_comp): only copy over alarm stuff from the
-	original record, we sync everything else
-	(local_record_from_uid): unref the comp when we are done
-	(pre_sync): free change_id
-	(post_sync): ditto
-	(for_each): track locals
-	(for_each_modified): ditto
-	(free_match): use free_local
-
-	* conduits/todo/todo-conduit.c: as above
-	
-2001-10-26  Federico Mena Quintero  <federico@ximian.com>
-
-	* pcs/cal.c (cal_construct): Get a fresh CORBA_Environment for
-	every CORBA call.  Hopefully will fix #11978, but I'm not sure
-	about what else could be happening.
-	(cal_get_password): Free the exception.
-
-2001-10-25  Damon Chaplin  <damon@ximian.com>
-
-	* gui/e-itip-control.c: used functions to get PUBLISH_OPTIONS etc.,
-	so we can translate them.
-
-2001-10-25  Damon Chaplin  <damon@ximian.com>
-
-	* cal-util/cal-recur.c (cal_obj_bysetpos_filter): subtract 1 from
-	any positive BYSETPOS value, since our array is 0-based.
-
-	* gui/dialogs/recurrence-page.c (simple_recur_to_comp): 
-	(recurrence_page_fill_widgets): Outlook (2000) will not accept monthly
-	recurrences like BYDAY=2TU. Instead it uses BYDAY=TU;BYSETPOS=2.
-	So to be compatable with it we now do the same, although we still
-	accept and convert the old format.
-
-	* cal-client/cal-client.c (cal_client_get_component_as_string): new
-	function to return a complete VCALENDAR string containing a VEVENT
-	or VTODO with all the VTIMEZONEs it uses.
-
-	* gui/dialogs/comp-editor.c (save_as_ok): use above function so we
-	save the VTIMEZONE data with the VEVENT/VTODO. Fixes bug #8626.
-	Also made sure we output "METHOD:PUBLISH" since Outlook (2000) will
-	not import it otherwise.
-
-	* gui/dialogs/comp-editor.c (page_mapped_cb): 
-	(page_unmapped_cb): install/uninstall the GtkAccelGroup for the page.
-	(comp_editor_append_page): connect to the map/unmap signals to
-	install/uninstall the accelerators. (This is all for bug #11609,
-	though of course it doesn't work too well in GTK+ 1.2 anyway.)
-
-	* gui/dialogs/task-page.c (get_widgets): 
-	* gui/dialogs/task-details-page.c (get_widgets): 
-	* gui/dialogs/schedule-page.c (get_widgets): 
-	* gui/dialogs/recurrence-page.c (get_widgets): 
-	* gui/dialogs/meeting-page.c (get_widgets): 
-	* gui/dialogs/event-page.c (get_widgets): 
-	* gui/dialogs/alarm-page.c (get_widgets): got the GtkAccelGroup from
-	the original window, ref'ed it and placed it in the CompEditorPage
-	struct.
-
-	* gui/dialogs/comp-editor-page.c (comp_editor_page_destroy): unref
-	any GtkAccelGroup for the page.
-
-	* gui/dialogs/task-page.glade: changed '_Confidential' to
-	'Con_fidential' as it clashed with '_Contacts'. It now matches the
-	event editor as well.
-
-	* gui/dialogs/event-page.glade: 
-	* gui/dialogs/task-page.glade: Set CAN_FOCUS to TRUE for the custom
-	EDateEdit widgets, and set them as the accel targets of the labels.
-
-2001-10-25  Rodrigo Moya <rodrigo@ximian.com>
-
-	* gui/dialogs/comp-editor.c (save_comp): show an error message when
-	we can't update the object on the calendar server
-
-2001-10-25  Federico Mena Quintero  <federico@ximian.com>
-
-	* gui/control-factory.c: Ifdef-ed out the PersistFile bits.
-
-	* gui/GNOME_Evolution_Calendar.oaf.in: The tasks folder does not
-	support the PersistFile interface; removed it.  Removed it as well
-	from the calendar folder since it is aggregated but not actually
-	implemented.
-
-2001-10-25  Federico Mena Quintero  <federico@ximian.com>
-
-	* gui/component-factory.c (xfer_folder): Handle tasks folders as
-	well; was always using "calendar.ics" as the filename.
-
-2001-10-24  Damon Chaplin  <damon@ximian.com>
-
-	* gui/GNOME_Evolution_Calendar.oaf.in: added sections for Tasks
-	factory and control. I hope someone checks these!
-
-2001-10-24  Ettore Perazzoli  <ettore@ximian.com>
-
-	* gui/component-factory.c (xfer_folder): Fixed to only copy the
-	`calendar.ics' and `calendar.ics~' files.
-
-2001-10-24  Damon Chaplin  <damon@ximian.com>
-
-	* pcs/cal-backend-file.c (cal_backend_file_update_objects): when
-	iterating over the subcomponents, use 'subcomp' rather than 'icalcomp'.
-	That meant it wasn't working at all well when an entire VCALENDAR
-	was passed in.
-
-	* cal-util/cal-component.c: handle DURATION property used instead of
-	DTEND or DUE. In cal_component_get_dtend/due we will return DTSTART
-	+ DURATION if necessary. In set_dtend/due we remove any DURATION
-	property. Fixes bug #11262.
-
-	* gui/e-meeting-model.c (build_etable): 
-	* gui/e-calendar-table.c (e_calendar_table_init): use U_ for the
-	ECellCombo popdown strings, as it expects UTF-8 strings.
-
-2001-10-24  JP Rosevear  <jpr@ximian.com>
-
-	* gui/e-meeting-time-sel.c (e_meeting_time_selector_construct):
-	track the spacer vbox
-	(e_meeting_time_selector_style_set): make sure the rows are the
-	correct size for the style
-
-	* gui/e-meeting-time-sel-item.c
-	(e_meeting_time_selector_item_paint_day_top): slight adjustments
-	to where the text is drawn
-
-	* gui/e-meeting-time-sel.h: new member
-
-	* gui/e-meeting-model.c (build_etable): ensure uniform row height
-
-	* conduits/todo/todo-conduit.c (comp_from_remote_record): mark
-	status as completed in appropriate places and don't overwrite
-	legitimate percentages and such
-
-2001-10-24  Federico Mena Quintero  <federico@ximian.com>
-
-	Fixes bug #5282.
-
-	* cal-util/timeutil.c (icaltimetype_to_tm_with_zone): New function
-	to avoid copying the same code all over the place.
-	(icaltimetype_to_tm): Also set the tm.tm_wday.
-
-	* gui/alarm-notify/alarm-queue.c (queue_midnight_refresh): Use
-	time_day_end_with_zone().
-	(load_alarms_for_today): Likewise.  And oops, we were only
-	computing the times and not loading the alarms.
-	(obj_updated_cb): Likewise.
-	(load_alarms): Removed assertion that is no longer valid because
-	we may load the alarms for a client in two stages.
-
-	* gui/dialogs/alarm-page.c (get_alarm_string): Convert absolute
-	trigger times to the local timezone.
-
-	* gui/alarm-notify/alarm-notify-dialog.c (write_html_heading):
-	Convert the times to the local timezone.
-	(alarm_notify_dialog): Likewise, for the window title.
-	(alarm_notify_dialog): Set the window layer to WIN_LAYER_ONTOP.
-
-	* gui/e-cell-date-edit-text.c (ecd_get_text): Use
-	icaltimetype_to_tm_with_zone().
-
-	* gui/alarm-notify/save.c (get_config_db): Made public.
-	(discard_config_db): Made public.
-
-	* gui/alarm-notify/config-data.[ch]: New files with functions to
-	fetch the calendar configuration data used by the alarm daemon.
-
-2001-10-23  Damon Chaplin  <damon@ximian.com>
-
-	* cal-util/cal-component.c (cal_component_event_dates_match): make sure
-	we free all the CalComponentDateTime's when we are finished.
-
-	* gui/gnome-cal.c (gnome_calendar_notify_dates_shown_changed): just
-	return if no time range is set.
-
-2001-10-23  JP Rosevear  <jpr@ximian.com>
-
-	* gui/e-meeting-time-sel.c
-	(e_meeting_time_selector_table_vadjustment_changed): adjust the
-	display canvas when the table scrolls
-	(e_meeting_time_selector_construct): listen for table scrolling
-
-2001-10-23  JP Rosevear  <jpr@ximian.com>
-	
-	* gui/e-meeting-model.c (build_etable): no longer set the
-	scrollbar policy here
-
-	* gui/e-meeting-time-sel.c
-	(e_meeting_time_selector_update_main_canvas_scroll_region): add an
-	extra row to the height so the click to add row can be properly
-	seen
-	(e_meeting_time_selector_construct): set the scrollbar policy for
-	the etable scrolled
-
-2001-10-23  JP Rosevear  <jpr@ximian.com>
-	
-	* cal-util/timeutil.c (icaltimetype_to_tm): convert an
-	icaltimetype to a tm
-	(tm_to_icaltimetype): vice versa
-
-	* cal-util/timeutil.h: new protos
-
-	* conduits/calendar/calendar-conduit.c: replace all mktime and
-	localtime calls (except for debugging calls)
-
-	* conduits/todo/todo-conduit.c: ditto
-	(comp_from_remote_record): make sure the completed time is in UTC
-	
-2001-10-23  Rodrigo Moya <rodrigo@ximian.com>
-
-	* cal-client/cal-query.c (cal_query_construct) set priv->corba_query
-	to CORBA_OBJECT_NIL if there was an error
-
-2001-10-22  Damon Chaplin  <damon@ximian.com>
-
-	* idl/evolution-calendar.idl: added setDefaultTimezone() method.
-
-	* pcs/cal-backend.c (cal_backend_get_default_timezone): 
-	(cal_backend_set_default_timezone): new functions to call class
-	methods.
-
-	* pcs/cal-backend-file.c: lots of changes to handle the default
-	timezone and use it.
-
-	* pcs/query.c: use the default timezone.
-
-	* gui/dialogs/task-details-page.c (date_changed_cb): initialized
-	completed_tt.
-
-	* gui/dialogs/event-page.c: changed it to handle DATE values. The
-	'All Day Event' checkbox is only set now when the DTSTART and DTEND
-	are DATE values.
-
-	* gui/dialogs/comp-editor-util.c (comp_editor_free_dates): free the
-	CalComponentDateTime structs as well.
-
-	* gui/e-tasks.c: set the default timezone on the server.
-
-	* gui/tag-calendar.c: 
-	* gui/gnome-cal.c: 
-	* gui/e-week-view.c: 
-	* gui/e-day-view.c: updates to handle DATE values.
-
-	* gui/e-calendar-table.c (date_compare_cb): updated to use the new
-	ECellDateEditValue values, so it now works.
-	(percent_compare_cb): updated to use GPOINTER_TO_INT values.
-	(e_calendar_table_init): use an ECellPercent for the percent field
-	and an ECellDateEditText for the date fields.
-
-	* gui/comp-util.c (cal_comp_util_compare_event_timezones): return TRUE
-	if the DTSTART or DTEND is a DATE value. We don't want to show the
-	timezone icons for DATE values.
-
-	* gui/comp-editor-factory.c (resolve_pending_requests): set the default
-	timezone on the server.
-
-	* gui/calendar-model.c: major changes to support sorting properly.
-	For date and percent fields we now use subclasses of ECellText, so
-	we don't use a char* as the model value. For the percent field we now
-	use a GINT_TO_POINTER. For the date fields we now use a
-	ECellDateEditValue* as the value.
-
-	* gui/calendar-config.c (calendar_config_configure_e_cell_date_edit): 
-	set the timezone and use_24_hour flags of the new ECellDateEditText.
-
-	* conduits/todo/todo-conduit.c (pre_sync): 
-	* conduits/calendar/calendar-conduit.c (pre_sync): set the default
-	timezone on the server.
-
-	* cal-util/timeutil.c (time_days_in_month): removed debug message.
-
-	* cal-util/test-recur.c: try to handle timezones in the iCalendar
-	file properly, and updated to pass default timezone.
-
-	* cal-util/cal-util.c (cal_util_generate_alarms_for_comp):
-	(cal_util_generate_alarms_for_list): added default timezone argument.
-
-	* cal-util/cal-recur.c: changed many of the functions to take a default
-	timezone, to use to resolve DATE and floating DATE-TIME values.
-
-	* cal-client/cal-client.c (cal_client_set_default_timezone): new
-	function to set the default timezone.
-	(cal_client_ensure_timezone_on_server): new function to ensure that
-	a given timezone is on the server.
-
-	* gui/e-cell-date-edit-text.c: new subclass of ECellText to display
-	and edit a date value.
-
-	* cal-util/cal-recur.c (cal_obj_byday_expand_monthly): changed week_num
-	to -week_num when calculating the weeks to go back from the end of the
-	month for things like BYDAY=-2WE. Fixes bug #11525.
-	(cal_recur_generate_instances_of_rule): only go up to MAX_YEAR (2037).
-	We can't really handle anything past that anyway.
-	(cal_recur_ensure_rule_end_date): initialize cb_date.end_date to 0,
-	so if the RULE doesn't generate COUNT instances we save 0 as the
-	time_t.
-
-2001-10-22  Federico Mena Quintero  <federico@ximian.com>
-
-	* gui/tasks-control-factory.c (tasks_control_factory_fn): Put up a
-	warning dialog box if we failed to create the tasks control.
-	Fixes bug #13033.
-
-2001-10-22  JP Rosevear  <jpr@ximian.com>
-
-	* gui/e-itip-control.c (set_date_label): write out the correct
-	time in the control
-
-	* pcs/cal.c (build_fb_seq): utility function to build sequences of
-	f/b data
-	(impl_Cal_get_free_busy): use above so we never return a NULL
-
-	* conduits/calendar/calendar-conduit-config.h
-	(calconduit_save_configuration): fix c/p error
-	(calconduit_load_configuration): ditto
-
-2001-10-22  JP Rosevear  <jpr@ximian.com>
-	
-	* gui/dialogs/meeting-page.c (meeting_page_destroy): we don't need
-	to save the state
-
-	* gui/e-meeting-time-sel.c (e_meeting_time_selector_destroy):
-	ditto
-
-	* gui/e-meeting-model.c (build_etable): listen for the etable
-	being destroyed
-	(table_destroy_cb): save the state when the etable is destroyed
-
-2001-10-21  JP Rosevear  <jpr@ximian.com>
-
-	* gui/dialogs/schedule-page.c (init_widgets): listen for changes
-	in the date editors
-	(schedule_page_set_dates): update the times when they change
-	elsewhere
-	(update_time): set the time in the dialog
-	(time_changed_cb): notify of changed times
-	
-	* gui/dialogs/comp-editor.c (page_dates_changed_cb): don't call
-	the set dates function on the page that noted the change
-	(page_summary_changed_cb): same for set summary function
-	
-	* gui/dialogs/event-page.c (update_time): move time setting stuff
-	to util function
-	(event_page_set_dates): use it
-	(event_page_fill_component): ditto
-
-	* gui/e-meeting-time-sel.h: fix comment
-
-2001-10-19  Federico Mena Quintero  <federico@ximian.com>
-
-	* gui/alarm-notify/alarm-notify.c (add_uri_to_load): Do not assert
-	if we fail to load the URI list.  This would of course have been a
-	bonobo-conf activation problem.
-	(remove_uri_to_load): Likewise.
-
-	* gui/alarm-notify/notify-main.c (load_calendars): Likewise.
-
-	* gui/alarm-notify/alarm-queue.c (load_missed_alarms): Make the
-	time range half-open so that we do not display the last alarm
-	twice.
-
-2001-10-19  Rodrigo Moya <rodrigo@ximian.com>
-
-	* gui/calendar-model.c (calendar_model_set_status_message): make
-	it a public function
-
-	* gui/e-tasks.c (e_tasks_open): display progress messages
-	(cal_opened_cb): clean up status bar messages
-
-	* gui/gnome-cal.c (gnome_calendar_open): display progress messages
-	(client_cal_opened_cb): clean up status bar messages
-
-2001-10-19  Rodrigo Moya <rodrigo@ximian.com>
-	
-	* gui/calendar-model.c (set_status_message): new function
-	(update_query): call set_status_message
-	(query_query_done_cb):
-	(query_eval_error_cb): clean up status bar messages
-	(get_location, set_location): new functions for setting and
-	retrieving the location in the calendar model
-
-2001-10-19  Rodrigo Moya <rodrigo@ximian.com>
-
-	* gui/component-factory.c (owner_set_cb): keep a reference to the
-	EvolutionShellClient component
-
-	* gui/e-week-view.c (e_week_view_set_status_message): new function
-	(update_query): call e_week_view_set_status_message
-	(query_query_done_cb):
-	(query_eval_error_cb): clean up status bar messages
-
-	* gui/e-day-view.c (e_day_view_set_status_message): new function
-	(update_query): call e_day_view_set_status_message
-	(query_query_done_cb):
-	(query_eval_error_cb): clean up status bar messages
-
-	* gui/Makefile.am: added EVOLUTION_IMAGESDIR to CFLAGS
-	
-2001-10-18  JP Rosevear  <jpr@ximian.com>
-
-	* gui/e-meeting-time-sel.c
-	(e_meeting_time_selector_on_invite_others_button_clicked): call
-	the invite others dialog in the model
-
-	* gui/e-meeting-attendee.c (e_meeting_attendee_get_atype): pick
-	attendee type based on role and cutype
-
-	* gui/e-meeting-attendee.h: remove proto
-
-	* gui/Makefile.am: compile select names idl
-
-	* gui/e-meeting-model.h: new proto
-
-	* gui/dialogs/meeting-page.c: remove invite others dialogs bits
-	from here
-
-	* gui/e-meeting-model.c (e_meeting_model_invite_others_dialog):
-	and put them here
-	
-	* gui/dialogs/Makefile.am: compile corba bits in parent dir
-
-	* gui/dialogs/comp-editor-util.h: reflect above in includes
-
-	* gui/dialogs/e-delegate-dialog.c: ditto
-
-	* gui/dialogs/schedule-page.c: ditto and clean includes
-	
-2001-10-18  Larry Ewing  <lewing@ximian.com>
-
-	* gui/alarm-notify/alarm-notify-dialog.c: add html widget
-	(url_requested_cb): add function to load images from file as they
-	are requested.
-	(write_html_heading): convert to using html.
-	(alarm_notify_dialog): convert to use html display.
-	(make_html_display): this is the function the custom widget in the
-	galde file uses to create the html widget.
-
-	* gui/alarm-notify/alarm-notify.glade: add placeholder for the
-	custom html widget.
-
-	* gui/alarm-notify/Makefile.am: add flags for gtkhtml and gal.
-	
-2001-10-18  Federico Mena Quintero  <federico@ximian.com>
-
-	Adds session management for the alarm daemon.  Also makes it store
-	a list of calendars to be monitored.  Those calendars will all be
-	loaded when the alarm daemon starts up.
-
-	* idl/evolution-calendar.idl (AlarmNotify): Removed the ::die()
-	method.  The alarm daemon now handles termination via the session
-	manager's commands.
-
-	* gui/alarm-notify/notify-main.c (set_session_parameters): New
-	function, sets some parameters so that the session manager can
-	restart the daemon via the evolution-alarm-client program.  Also,
-	sets up the "die" signal so that the daemon can terminate when the
-	session ends.
-	(load_calendars): New function to load the calendars on startup.
-	(main): Set the session parameters.  Load the calendars on startup.
-
-	* gui/alarm-notify/alarm-notify.c (alarm_notify_add_calendar): New
-	function, moved over from the impl_ function.  Added a
-	load_afterwards argument to indicate whether the calendar should
-	just be loaded or if it should also be added to the list of
-	calendars to load on startup.
-	(AlarmNotify_addCalendar): Use alarm_notify_add_calendar().
-	(AlarmNotify_removeCalendar): Remove the calendar from the list of
-	calendars to load on startup.
-
-	* gui/alarm-notify/save.c (save_calendars_to_load): New function,
-	saves a sequence of the URIs to load.
-	(get_calendars_to_load): New function, loads a sequence of
-	calendars to load.
-
-	* gui/alarm-notify/alarm.h: Removed stale prototype for alarm_init().
-
-	* gui/component-factory.c (remove_folder): Ask the alarm daemon to
-	stop monitoring alarms for the folder that is being deleted.
-
-2001-10-18  JP Rosevear  <jpr@ximian.com>
-
-	* gui/e-meeting-time-sel.c
-
-	* gui/e-meeting-time-sel-item.c
-	(e_meeting_time_selector_item_paint_day_top): use 12 or 24 hour
-	settings
-
-	* gui/e-meeting-time-sel.c: strings for 12 hour setting
-	(e_meeting_time_selector_construct): increase width slightly
-	
-	* gui/e-meeting-time-sel.h: extern the new char array
-
-2001-10-18  Rodrigo Moya <rodrigo@ximian.com>
-
-	* cal-util/cal-component.[ch] (cal_component_get_location):
-	(cal_component_set_location): new functions
-
-2001-10-18  JP Rosevear  <jpr@ximian.com>
-	
-	* gui/e-meeting-model.c (process_callbacks): util routine to
-	handle calling back
-	(async_close): use above
-	(e_meeting_model_refresh_busy_periods): ditto
-
-2001-10-17  JP Rosevear  <jpr@ximian.com>
-
-	* conduits/todo/todo-conduit.c (local_record_from_comp): translate
-	1-5 priorites to 1-9 priorities better
-	(comp_from_remote_record): ditto
-
-2001-10-17  JP Rosevear  <jpr@ximian.com>
-	
-	* idl/evolution-calendar.idl: allow some decent exceptions
-
-2001-10-17  Rodrigo Moya <rodrigo@ximian.com>
-
-	* pcs/query.c (match_component): there may be cases when the backend
-	will return an invalid component from a valid UID (an UID returned
-	by the get_uids method), so don't abort if that's the case
-
-2001-10-15  Damon Chaplin  <damon@ximian.com>
-
-	* gui/dialogs/cal-prefs-dialog.glade: removed Help button. Do we have
-	any others?
-
-2001-10-15  Larry Ewing  <lewing@ximian.com>
-
-	* gui/dialogs/comp-editor.c (set_icon_from_comp): remove warnings.
-
-2001-10-15  JP Rosevear  <jpr@ximian.com>
-
-	* conduits/calendar/calendar-conduit.c (process_multi_day):
-	function to break up multi day events into single events for both
-	evo and the pilot and create new CalClientChange structures
-	(pre_sync): call above function, and adjust changed list if
-	necessary
-
-2001-10-15  JP Rosevear  <jpr@ximian.com>
-
-	* conduits/calendar/calendar-conduit.c (is_all_day): util function
-	to determine if event is all day
-	(local_record_from_comp): use new util function
-	(comp_from_remote_record): kill use of deprecated time functions
-
-2001-10-13  Larry Ewing  <lewing@ximian.com>
-
-	* gui/dialogs/comp-editor.c (real_edit_comp): call
-	set_icon_from_comp.
-	(set_icon_from_comp): set the window icon from the comp.
-	(make_icon_from_comp): get the icon path based on comp type.
-	
-	* gui/dialogs/Makefile.am (iconsdir): EVOLUTION_ICONSDIR bits.
-
-2001-10-13  JP Rosevear  <jpr@ximian.com>
-
-	* gui/dialogs/task-editor.c (task_editor_send_comp): send
-	cancellation comp if necessary
-
-2001-10-12  JP Rosevear  <jpr@ximian.com>
-
-	* gui/dialogs/alarm-page.c: return fill_component success
-
-	* gui/dialogs/task-page.c: ditto
-
-	* gui/dialogs/task-details-page.c: ditto
-
-	* gui/dialogs/schedule-page.c: ditto
-
-	* gui/dialogs/recurrence-page.c: ditto
-
-	* gui/dialogs/event-page.c: ditto
-
-	* gui/dialogs/meeting-page.c: use e_notice instead of
-	duplicate_error
-	(meeting_page_get_cancel_comp): duh, deleted_attendees is an array
-	now
-	(meeting_page_fill_component): spew gui errors if there is no
-	organizer or no attendees, return success
-
-	* gui/dialogs/event-editor.c (event_editor_send_comp): always call
-	parent method and don't send the cancellation comp if the method
-	is publish
-	(refresh_meeting_cmd): use the orginal comp to refresh
-	(forward_cmd): prompt the user for the version they want to send
-	(current, original)
-
-	* gui/dialogs/task-editor.c (forward_cmd): as above
-	(refresh_task_cmd): ditto
-
-	* gui/dialogs/comp-editor-page.c
-	(comp_editor_page_fill_component): return boolean of whether the
-	component could be filled or not
-
-	* gui/dialogs/comp-editor-page.h: update proto
-
-	* gui/dialogs/comp-editor.c (prompt_to_save_changes): take a param
-	on whether to try and send or not
-	(comp_editor_get_current_comp): only fill component if its changed
-	(comp_editor_save_comp): prompt user as well
-
-	* gui/dialogs/comp-editor.h: change proto
-
-	* gui/itip-utils.c: replace error_dialog with e_notice
-	(comp_content_type): specify charset
-
-2001-10-11  Larry Ewing  <lewing@ximian.com>
-
-	* gui/e-itip-control.c: large reworking of i18n tagging and now
-	uses gtk_html_stream write and U_ where appropriate.  More to
-	come.
-
-2001-10-10  Larry Ewing  <lewing@ximian.com>
-
-	* gui/e-itip-control.c (init): set the default character set to
-	utf-8.
-
-2001-10-10  Federico Mena Quintero  <federico@ximian.com>
-
-	* pcs/cal-factory.c (lookup_backend): Return the original key in
-	the hash table if requested.
-	(backend_last_client_gone_cb): Use lookup_backend() so that we
-	have the URI mangling done for us.
-	(impl_CalFactory_open): The type should be GtkType *, not GtkType!
-
-2001-10-10  JP Rosevear  <jpr@ximian.com>
-
-	* cal-client/cal-client.c (cal_set_mode_cb): remove unneeded
-	assertions
-
-2001-10-10  JP Rosevear  <jpr@ximian.com>
-	
-	* pcs/cal-factory.c (add_uri): fix logic checks
-
-	* gui/dialogs/event-editor.c (event_editor_init): init the
-	exisiting_org boolean
-	(set_menu_sens): base sensitivity on existing_org boolean
-	(event_editor_edit_comp): set exisiting_org boolean
-
-	* gui/dialogs/task-editor.c: same as above
-
-	* gui/calendar-offline-handler.c (add_connection): handle the
-	protocol or host being unknown
-
-	* cal-util/cal-component.c (cal_component_has_organizer):
-	implement
-
-2001-10-09  Federico Mena Quintero  <federico@ximian.com>
-
-	Fixes bug #884.
-
-	* gui/alarm-notify/save.[ch]: New files with functions to
-	save/load the last notification time.
-
-	* gui/alarm-notify/alarm-queue.c (alarm_trigger_cb): Save the last
-	notification time.
-	(alarm_queue_init): Load the last notification time when the
-	daemon is inited.
-	(alarm_queue_add_client): Load the alarms that we missed while the
-	alarm daemon was not running.
-	(cal_opened_cb): Likewise.
-
-	* gui/alarm-notify/Makefile.am (evolution_alarm_notify_SOURCES):
-	Added save.[ch] to the list of sources.
-
-2001-10-09  JP Rosevear  <jpr@ximian.com>
-
-	* gui/itip-utils.c (get_address): util function to get address
-	(itip_addresses_get_default): get only the default address
-	(itip_address_free): free single address
-	(itip_addresses_free): use above
-	(comp_limit_attendees): limit the number of attendees to one, the
-	user
-	(comp_sentby): set the sentby parameter if the user is not the
-	organizer
-	(comp_minimal): remove extraneous info for send (for refresh and
-	declinecounter)
-	(comp_compliant): remove all alarms, do various things to make the
-	components comply with itip spec based on method
-	(itip_send_comp): use comp_compliant method
-
-	* gui/itip-utils.h: new protos
-
-	* gui/e-itip-control.c: rescan the component when necessary
-	(get_next): don't get stuck in infinite loop if there are no
-	viewable components
-	(e_itip_control_set_data): if there are no viewable components,
-	spit an error message
-
-	* gui/dialogs/meeting-page.h: tidy
-
-	* gui/dialogs/meeting-page.c (meeting_page_fill_widgets): use
-	organizer's cn if possible
-	(other_clicked_cb): no longer doing the sent by stuff directly,
-	hide more widgets
-
-	* pcs/query.c: use bonobo exception stuff
-
-	* cal-util/cal-component.c (cal_component_rescan): have the comp
-	rescan its libical component (for when you change things directly)
-	(free_icalcomponent): take a param on whether to free the
-	component or just clean up the mappings
-	(cal_component_has_attendees): util function
-
-	* cal-util/cal-component.h: new protos
-	
-2001-10-09  Rodrigo Moya <rodrigo@ximian.com>
-
-	* pcs/cal-factory.c (lookup_backend, add_backend): deal correctly with
-	URIs to be inserted into the hash table, so that we don't add the same
-	backend over and over because the URI strings were different (although
-	refering to the same backend)
-
-	* pcs/cal-backend-file.c (mail_account_*): moved to a common place
-	(cal_backend_file_open): check if "uristr != NULL" and not
-	"uri != NULL"
-
-	* pcs/cal-backend-util.c: moved to here
-
-	* gui/e-day-view.c: add missing header file
-
-2001-10-09  Dan Winship  <danw@ximian.com>
-
-	* gui/e-meeting-model.c (process_free_busy_comp): Fix incorrect
-	variable name check.
-
-2001-10-03  JP Rosevear  <jpr@ximian.com>
-
-	* gui/itip-utils.c (itip_send_comp): refactor functionality into
-	several function
-	(comp_string): if we are publishing, empty the attendee list
-
-	* gui/dialogs/event-editor.c (schedule_meeting_cmd): when we
-	schedule a new meeting, mark the event editor as changed
-
-	* pcs/cal.c (cal_class_init): get correct parent class
-
-	* gui/dialogs/comp-editor.c (comp_editor_merge_ui): use the
-	generated ui component name
-
-2001-10-03  Rodrigo Moya <rodrigo@ximian.com>
-
-	* gui/component-factory.c:
-	* gui/calendar-offline-handler.c:
-	* gui/comp-editor-factory.c: replace use of gnome_vfs_uri with e_uri
-
-	* gui/e-meeting-model.c (start_addressbook_server): make it return void,
-	since the return value does not mind
-
-	* pcs/cal.c:
-	* pcs/cal-factory.c:
-	* pcs/cal-backend.[ch]: don't use GnomeVFS for URI management
-	
-	* pcs/cal-backend-file.c: ditto, only use GnomeVFS for internal
-	operations
-
-	* cal-client/cal-client.c (cal_client_open_calendar): don't CORBA_exception_free
-	before checking for exceptions
-
-2001-10-03  Christopher James Lahey  <clahey@ximian.com>
-
-	* gui/e-calendar-table.etspec: Added priorities to a bunch of
-	these columns.  Fixes Ximian bug #7158.
-
-2001-10-03  Damon Chaplin  <damon@ximian.com>
-
-	* gui/comp-util.c (cal_comp_util_add_exdate): save the EXDATE as a
-	DATE-TIME value, since we know the exact time. Fixes bug #11278.
-	(Before we were setting is_date, but icaltime_from_timet_with_zone()
-	didn't convert it properly. We need to figure out how to handle DATEs
-	when using time_t's.)
-
-	* gui/dialogs/recurrence-page.c (get_exception_string): use
-	e_time_format_date_and_time() so we show the time as well, if the
-	exception is a DATE-TIME value.
-
-	* cal-util/timeutil.c: removed time_add_month(), time_year_begin(),
-	time_month_begin() & time_week_begin() - old pre-timezone functions
-	which we no longer use.
-
-	* cal-util/cal-recur.c (cal_recur_from_icalproperty): set
-	ir.until.is_date to FALSE before converting to a time_t.
-	Hopefully fixes bug #5034.
-
-2001-10-02  Ettore Perazzoli  <ettore@ximian.com>
-
-	* gui/dialogs/comp-editor.c (setup_widgets): Use
-	`bonobo_ui_component_new_default()', not
-	`bonobo_ui_component_new()'.
-
-2001-10-02  JP Rosevear  <jpr@ximian.com>
-
-	* cal-client/cal-query.c: use bonobo-exception to tidy
-
-2001-10-02  JP Rosevear  <jpr@ximian.com>
-	
-	* conduits/calendar/calendar-conduit.c (nth_weekday): handle -1 as
-	well
-	(comp_from_remote_record): fix monthly by day recurrences and
-	handle "last" day type
-
-2001-10-01  Damon Chaplin  <damon@ximian.com>
-
-	* gui/dialogs/comp-editor.c (comp_editor_destroy): unref the page
-	objects here, instead of in close_dialog(). (This was fixed a while
-	ago, but accidentally reverted.) Fixes bug #7543.
-
-2001-10-01  Federico Mena Quintero  <federico@ximian.com>
-
-	* gui/alarm-notify/alarm-notify-dialog.c (alarm_notify_dialog):
-	Set the window state to sticky.  Thanks to Peter Teichman for the
-	suggestion.
-
-2001-10-01  JP Rosevear  <jpr@ximian.com>
-
-	* conduits/calendar/calendar-conduit.c (local_record_from_comp):
-	Convert the comp exceptions to the pilot record
-	(comp_from_remote_record): record exceptions on the desktop and
-	use time zone stuff on recurrence end date
-
-2001-10-01  JP Rosevear  <jpr@ximian.com>
-	
-	* pcs/cal-backend-file.c (cal_backend_file_compute_changes):
-	strdup the uid to avoid double free, write out only after
-	everything is done
-
-2001-10-01  Rodrigo Moya <rodrigo@ximian.com>
-
-	* gui/gnome-cal.c (gnome_calendar_open): don't use
-	gnome_vfs_uri_is_local on URIs created with
-	gnome_vfs_uri_new_private
-
-2001-09-28  Damon Chaplin  <damon@ximian.com>
-
-	* gui/print.c (print_comp_item): use bound_text to print the summary,
-	so it wraps instead of being clipped to 1 line. Fixes part 3 of bug
-	#10285, I think.
-
-	* gui/dialogs/alarm-page.glade: left-aligned the Date/Time label.
-	Also set the width of the Summary & Date/Time labels to 10, and set
-	expand to TRUE, to make sure that the dialog doesn't keep getting
-	wider as the summary text on the main page gets longer. Could possibly
-	use an EClippedLabel here instead, so we get a '...' at the end if it
-	is clipped.
-
-	* gui/dialogs/recurrence-page.glade: changed Summary & Date/Time
-	widths as above.
-
-	* gui/print.c (print_calendar): use landscape mode for the month
-	preview.
-	(print_border_with_triangles): use EPSILON to account for floating
-	point errors. Hopefully fixes part 2b of bug #10285.
-
-2001-09-28  JP Rosevear  <jpr@ximian.com>
-
-	* conduits/calendar/calendar-conduit.c (local_record_from_comp):
-	Handle the fields and category we don't sync by making sure we
-	don't overwrite them
-	(local_record_to_pilot_record): use local record category
-	(pre_sync): track db info
-
-	* conduits/calendar/calendar-conduit.h: db info field
-
-	* conduits/todo/todo-conduit.[hc]: same as above
-
-	* pcs/cal-backend-file.c
-	(cal_backend_file_compute_changes_foreach_key): create a dummy
-	component of the right type and strdup the uid
-	(cal_backend_file_compute_changes): sync the db hash after each
-	change and free the uid
-
-2001-09-28  JP Rosevear  <jpr@ximian.com>
-	
-	* cal-client/cal-client.c (cal_client_open_calendar): init the
-	execption rather than freeing it
-
-2001-09-28  Rodrigo Moya <rodrigo@ximian.com>
-
-	* cal-client/cal-client.c (cal_client_construct): use bonobo-exception
-	for exceptions
-	(cal_client_open_calendar): likewise
-
-2001-09-27  Ettore Perazzoli  <ettore@ximian.com>
-
-	* gui/calendar-commands.c (pixmaps): Update pixmap menu paths;
-	/menu/ComponentToolsPlaceholder/Tools ->
-	/menu/Tools/ComponentPlaceholder .
-	* gui/tasks-control.c: Likewise.
-
-2001-09-27  Rodrigo Moya <rodrigo@ximian.com>
-
-	* idl/evolution-calendar.idl: added InvalidURI and UnsupportedMethod
-	exceptions to the CalFactory interface
-
-	* pcs/cal-factory.c (impl_CalFactory_open): raise InvalidURI exception on
-	URI errors and UnsupportedMethod when we don't support the method for
-	a given URI
-	
-2001-09-26  Rodrigo Moya <rodrigo@ximian.com>
-
-	* cal-client/cal-client.c: added support for using multiple calendar
-	factories
-	(cal_client_uri_list): use the list of factories loaded for this
-	CalClient
-
-2001-09-26  Damon Chaplin  <damon@ximian.com>
-
-	* gui/e-calendar-table.c (date_compare_cb): 
-	(percent_compare_cb): 
-	(priority_compare_cb): added comparison functions for these special
-	cell types. But the date and percent ones don't work yet due to the
-	use of static text buffers for return cell values.
-	(e_calendar_table_init): added the comparison functions to the
-	ETableExtras. NOTE: task_compare_cb() never seems to be called.
-	I'm not sure why it is there.
-
-	* gui/e-calendar-table.etspec: set the comparison function names for
-	the date/percent/priority fields.
-
-	* cal-util/cal-util.c (cal_util_priority_to_string): 
-	(cal_util_priority_from_string): new utility functions.
-
-	* gui/calendar-model.c (get_priority): 
-	(set_priority): used above utility functions, and removed the warning
-	dialog which isn't useful now that the field isn't editable.
-
-	* gui/dialogs/event-page.c (times_updated): handle timezones and for
-	all-day events make sure it stays an all-day event after adjusting.
-	Fixes bugs #5945 and #10222.
-
-	* gui/calendar-commands.c (pixmaps): fixed the E_PIXMAP paths - the
-	edit items were moved beneath 'EditPlaceholder'. This gets rid of
-	those long Bonobo warnings! (and we get the icons back)
-
-	* gui/dialogs/comp-editor.c (pixmaps): removed the PrintPreview toolbar
-	icon, since it doesn't appear in the xml file. Gets rid of warning.
-
-	* gui/dialogs/event-page.c (notify_dates_changed): new function to
-	emit the notification signal when the dates are changed. It also
-	handles timezones now.
-
-	* gui/dialogs/comp-editor-page.h (CompEditorPageDates): used
-	CalComponentDateTime for start/end/due so we have the timezone as well
-	as the time.
-
-	* gui/dialogs/comp-editor-util.c (comp_editor_dates): updated to get
-	the timezones as well as the times.
-	(comp_editor_free_dates): new function needed to free all the structs.
-
-	* gui/dialogs/recurrence-page.c (recurrence_page_set_dates): added call
-	to preview_recur() to make sure the preview gets updated.
-
-	* gui/dialogs/alarm-page.c (alarm_page_fill_widgets): free the
-	CompEditorPageDates struct after use.
-
-	* gui/tag-calendar.c (tag_calendar_by_comp): added 'comp_is_on_server'
-	argument. If FALSE, we try to use builtin timezones first. This is
-	needed for the recurrence page of the event editor, because the
-	timezones may not have been added to the server yet. This and the
-	changes to the notification stuff should fix bug #5034.
-
-	* gui/gnome-cal.c (dn_query_obj_updated_cb): call above
-	tag_calendar_by_comp() with TRUE since the events will be on the
-	server in this case.
-
-	* gui/e-day-view-layout.c:
-	* gui/e-day-view.c: made sure an event always takes up at least one
-	row, even when the start & end times are the same. Fixes bug #5944.
-	I don't know if we should try to also handle events with the end time
-	before the start time.
-
-	* gui/e-week-view.c (e_week_view_style_set): check that the small font
-	is actually smaller than the normal font. If it isn't, don't use it.
-	Hopefully fixes bug #6876.
-	(e_week_view_on_new_appointment): if only one day is selected, then
-	we set the initial time of the event to 1/2-hour from the start of the
-	working day, to differentiate 'New Appointment' from 'New All Day
-	Event'. Fixes bug #8892.
-
-	* gui/e-day-view.c (e_day_view_on_new_appointment): do the same as the
-	above.
-
-2001-09-26  Federico Mena Quintero  <federico@ximian.com>
-
-	Fixes the GUI part of bug #7892.
-
-	* gui/dialogs/alarm-page.c (get_alarm_duration_string): Return
-	NULL if the duration is zero.
-	(get_alarm_string): Handle duration of zero.  Also, hopefully
-	make the strings be more l10n-friendly.
-
-	* gui/alarm-notify/alarm.c (alarm_ready_cb): I am a moron.  Fix
-	reversed test.
-
-2001-09-26  JP Rosevear  <jpr@ximian.com>
-
-	* gui/dialogs/comp-editor.c (comp_editor_destroy): disconnect
-	signals first thing
-
-2001-09-26  Dan Winship  <danw@ximian.com>
-
-	* gui/Makefile.am (evolution_calendar_LDFLAGS): Add
-	-export-dynamic to make glade custom widgets work on non-Linux.
-
-2001-09-26  Rodrigo Moya <rodrigo@ximian.com>
-
-	* cal-util/cal-util.h: added CAL_MODE_INVALID to CalMode enum
-
-2001-09-26  JP Rosevear  <jpr@ximian.com>
-
-	* pcs/cal.h: new proto
-
-	* pcs/cal.c (impl_Cal_set_mode): implement set mode method
-	(cal_class_init): set setMode function in epv
-	(cal_notify_mode): notify listener of mode change
-
-	* pcs/cal-factory.c (add_uri): deal with UriType renaming
-
-	* pcs/cal-backend.h: add new virtual methods and protos
-
-	* pcs/cal-backend.c (cal_backend_class_init): init new virtual
-	methods to null
-	(cal_backend_set_mode): sets mode
-	(cal_backend_get_mode): gets mode
-
-	* pcs/cal-backend-file.c (cal_backend_file_class_init): overide
-	get_mode and set_mode methods
-	(cal_backend_file_get_mode): return mode
-	(notify_mode): have listeners notified of the set mode call
-	(cal_backend_file_set_mode): set the mode by indicating not
-	supported
-
-	* cal-client/cal-listener.h: update proto
-
-	* cal-client/cal-listener.c (impl_notifyCalSetMode): implement set
-	mode callback
-	(cal_listener_construct): take set mode callback
-	(cal_listener_new): ditto
-
-	* cal-client/cal-client.h: update protos, add signal proto
-
-	* cal-client/cal-client.c (cal_client_class_init): add
-	cal_set_mode signal
-	(cal_set_mode_cb): handle set mode callback from listener
-	(cal_client_open_calendar): pass additional param to cal_listener_new
-	(cal_client_set_mode): wrapper to set the calendar mode
-
-	* idl/evolution-calendar.idl: make UriType into CalMode, add
-	SetModeStatus enum and notifyCalSetMode method to the listener
-
-	* gui/calendar-offline-handler.c (create_connection_list): fetch
-	the uri list ourselves
-	(impl_prepareForOffline): reflect param change of
-	create_connect_list
-	(update_offline): ditto
-	(backend_cal_set_mode): set mode call back
-	(backend_cal_opened): cal opened call back, set mode to local
-	(impl_goOffline): reflect UriType renaming
-
-	* cal-util/cal-util.h: rename UriType to CalMode
-
-2001-09-25  Federico Mena Quintero  <federico@ximian.com>
-
-	Warning fixes courtesy of Chris Lahey <clahey@ximian.com>.
-
-	* gui/e-itip-control.c (write_html): Warning fixes.  Also, don't
-	strdup() more than necessary.
-
-	* gui/e-meeting-time-sel.c (e_meeting_time_selector_refresh_cb):
-	Warning fixes.
-
-	* gui/itip-utils.c (itip_addresses_get): Warning fixes.
-
-	* gui/print.c (print_day_background): Warning fixes.
-
-	* gui/dialogs/alarm-options.c (alarm_to_aalarm_widgets): Warning
-	fixes.
-	(alarm_to_palarm_widgets): Likewise.
-
-	* gui/dialogs/delete-comp.c: #include "../calendar-config.h"
-
-2001-09-25  Federico Mena Quintero  <federico@ximian.com>
-
-	* gui/alarm-notify/alarm.c (alarm_ready_cb): Check that the
-	timeout is not set up before we create a new one; the alarm_fn
-	callback may cause the alarm system to re-enter and add a new
-	alarm.  Fixes bug #10840.
-	(pop_alarm): Assert that there is at least one alarm in the queue.
-
-2001-09-25  JP Rosevear  <jpr@ximian.com>
-
-	* pcs/cal.c: use bonobo-exception stuff to clean code
-
-	* pcs/cal-factory.c (add_uri): add uri to the list if the type
-	matches
-	(impl_CalFactory_uriList): implement uriList method
-
-	* pcs/cal-backend.h: new virtual function member
-
-	* pcs/cal-backend.c (cal_backend_is_remote): call virtual function
-
-	* pcs/cal-backend-file.c (cal_backend_file_class_init): override
-	virtual function
-	(cal_backend_file_is_remote): new virtual function, always return
-	FALSE
-
-	* idl/evolution-calendar.idl: uriList factory call, with flags for
-	types to get
-
-	* gui/dialogs/comp-editor.c (comp_editor_destroy): cast to remove
-	warning
-
-	* gui/e-itip-control.c (write_label_piece): kill warnings by take
-	const char *
-
-	* gui/component-factory.c (create_object): aggregate offline
-	interface
-
-	* gui/Makefile.am: compile new files
-
-	* calobj.[hc]: Remove obsolete files
-
-	* cal-util/cal-util.h: enum URI types for uriList call
-
-	* cal-client/cal-client.c (build_uri_list): build list from string
-	sequence
-	(cal_client_uri_list): factory call to get uri list
-
-	* cal-client/cal-client.h: new proto
-
-	* cal-client/cal-client.c: use bonobo exception stuff to clean
-	code
-
-	* gui/calendar-offline-handler.[hc]: Start some skeleton routines
-	for online/offline handling
-
-	* pcs/cal-factory.c (launch_backend_for_uri): use accessor and
-	remove FIXME
-
-2001-09-23  JP Rosevear  <jpr@ximian.com>
-
-	* gui/e-itip-control.c (set_date_label): base text on component
-	type
-
-2001-09-20  Rodrigo Moya <rodrigo@ximian.com>
-
-	* gui/component-factory.c: don't use gnome_vfs_uri_new_private
-	(fixes Ximian #10544)
-
-2001-09-20  Federico Mena Quintero  <federico@ximian.com>
-
-	* gui/component-factory.c: #include a few files we were missing
-	from libgnomevfs.
-
-2001-09-20  JP Rosevear  <jpr@ximian.com>
-
-	* pcs/cal-backend-file.c (load_db): gets a config db
-	(cal_backend_file_destroy): release config db
-	(cal_backend_file_init): use load_db
-	(mail_account_get): gets a mail account by number
-	(mail_account_get_default): gets the default mail account
-	(mail_account_is_valid): looks to see if any accounts have the
-	given address
-	(create_user_free_busy): modularize so we can call multiple times
-	if necessary, set organizer
-	(cal_backend_file_get_free_busy): if the list of users is null,
-	use the default account otherwise get the same info for each
-	address that is an identity in the mailer
-
-	* gui/itip-utils.c (itip_addresses_get): s/gint/glong/ for bonobo
-	conf returns
-
-	* gui/calendar-commands.c (publish_freebusy_cmd): fix problems
-	from a merge so that we publish 6 weeks of free/busy information
-	again
-
-2001-09-20  Larry Ewing  <lewing@ximian.com>
-
-	* gui/dialogs/recurrence-page.c (recurrence_page_destroy): make
-	sure to release the ref on priv->comp.
-
-	* gui/dialogs/comp-editor.c (real_edit_comp): make sure to release
-	the ref on priv->comp.
-
-2001-09-19  Federico Mena Quintero  <federico@ximian.com>
-
-	* gui/alarm-notify/alarm-queue.c (audio_notification): Display a
-	notification message always, in addition to playing the sound.
-	(procedure_notification): Present a confirmation dialog before
-	actually running the alarm's program.
-	(procedure_notification): Use gnome_execute_shell() instead of
-	gnome_execute_async() so that we handle multiple arguments
-	properly.  Plus, it is most likely what the user expects.
-	(mail_notification): Display a message about unsupported email
-	reminders instead of blindly dropping the alarm.
-
-	* gui/dialogs/alarm-options.glade: Added an explanatory message
-	about mail alarms not being supported.
-
-	* gui/dialogs/alarm-page.glade: Removed the "Send an email"
-	option.
-
-	* gui/dialogs/alarm-page.c (action_map): Removed CAL_ALARM_EMAIL.
-
-2001-09-19  JP Rosevear  <jpr@ximian.com>
-
-	* gui/dialogs/task-editor.c (init_widgets): listen for model
-	changes
-	(task_editor_edit_comp): add the attendees to the model and notify
-	of need send
-	(row_count_changed_cb): mark as changed when row added/deleted
-	(model_row_changed_cb): mark as changed when row changes
-	
-	* gui/dialogs/event-editor.c (init_widgets): listen for model
-	changes
-	(event_editor_init): flip page order
-	(event_editor_edit_comp): set needs send value
-	(schedule_meeting_cmd): flip page order
-	(row_count_changed_cb): mark as changed when row added/deleted
-	(model_row_changed_cb): mark as changed when row changes
-	
-	* gui/dialogs/schedule-page.c: remove model change notification
-	stuff
-	(schedule_page_fill_widgets): no need to do the needs_send here
-	because the editor handles this since it owns the model
-
-	* gui/dialogs/event-editor.c (init_widgets): listen for model
-	changes
-	(event_editor_init): flip page order
-	(event_editor_edit_comp): set needs send value
-	(schedule_meeting_cmd): flip page order
-	(row_count_changed_cb): mark as changed when row added/deleted
-	(model_row_changed_cb): mark as changed when row changes
-
-	* gui/dialogs/meeting-page.c (meeting_page_fill_widgets): no need
-	to do the needs_send here because the editor handles this since it
-	owns the model
-	(invite_entry_changed): ditto
-
-	* gui/dialogs/comp-editor.c (comp_editor_set_changed): new
-	accessor
-	(comp_editor_get_changed): ditto
-	(comp_editor_set_needs_send): ditto
-	(comp_editor_get_needs_send): ditto
-
-	* gui/dialogs/comp-editor.h: new protos
-
-	* gui/itip-utils.c (itip_addresses_get): reflect configuration
-	path changes in the mailer
-
-	* gui/e-meeting-model.c: remove commented out code, ifdef one
-	section for later
-
-2001-09-19  Rodrigo Moya <rodrigo@ximian.com>
-
-	* pcs/cal-factory.c (cal_factory_oaf_register): add a new parameter
-	(const char *iid) to specify the OAFIID of the factory being
-	registered
-
-2001-09-19  JP Rosevear  <jpr@ximian.com>
-
-	* gui/e-meeting-model.c (e_meeting_model_refresh_busy_periods):
-	remove silly debug #if 0
-
-	* gui/calendar-commands.c (publish_freebusy_cmd): g_list_free
-	rather than g_free
-
-	* gui/e-itip-control.c (write_html): eliminate code path that
-	caused double freed memory
-
-2001-09-18  JP Rosevear  <jpr@ximian.com>
-
-	* gui/dialogs/schedule-page.*: A page that shows the meeting time
-	selector and free/busy data for attendees
-
-	* gui/dialogs/meeting-page.c: use the meeting model to track/edit
-	attendees, remove table value conversion routines and simple table
-	routines
-	(set_attendees): take a pointer array
-	(meeting_page_destroy): destroy the pointer array, save state
-	(meeting_page_init): new pointer array
-	(meeting_page_fill_widgets): don't null the deleted attendees
-	field
-	(popup_delegate_cb): array add
-	(popup_delete_cb): array add
-	(cleanup_attendees): iterate over the array to unref now
-	(meeting_page_fill_widgets): don't null out fields, no need to add
-	attendees here
-	(invite_entry_changed): use e_meeting_attendee routines
-	(popup_delegate_cb): ditto
-	(popup_delete_cb): ditto
-	(meeting_page_new): take new arg and pass it to construct
-	(meeting_page_construct): take new arg, use e-meeting-model
-	routines to construct table
-
-	* gui/dialogs/task-editor.c (task_editor_init): new meeting model
-	(task_editor_destroy): unref the model
-
-	* gui/dialogs/event-editor.c (event_editor_init): make new model
-	and pass it to meeting and schedule pages
-	(event_editor_set_cal_client): virtual function, set meeting model
-	client
-	(event_editor_edit_comp): add the attendees to the model
-	(event_editor_destroy): unref model
-	
-	* gui/dialogs/comp-editor.h: add virtual function
-	* gui/dialogs/comp-editor.c (comp_editor_set_cal_client): make
-	set_cal_client a virutal function
-
-	* gui/e-meeting-types.h: generally useful type defines
-
-	* gui/e-meeting-time-sel*.[hc]: Move here and use an e-table for
-	the attendee list and extract display information from the new
-	meeting model and attendees
-
-	* gui/e-meeting-time-sel.etspec: spec for the table
-
-	* gui/e-meeting-attendee.[hc]: meeting attendees for the model,
-	with to/from conversions for CalComponentAttendee structure, emits
-	changed signal and allows getting and setting of free busy
-	periods
-
-	* gui/e-meeting-model.[hc]: move the model out on its own
-
-	* gui/e-itip-control.c (write_error_html): clean up warnings
-	
-2001-09-18  Federico Mena Quintero  <federico@ximian.com>
-
-	Fixes bug #6350.
-
-	* gui/component-factory.c (remove_folder): Use a simplified method
-	for removing our folder data; we just need to remove calendar.ics
-	or tasks.ics and the corresponding backup files.
-
-2001-09-18  Federico Mena Quintero  <federico@ximian.com>
-
-	Fixes bug #2830.
-
-	* gui/calendar-config.c (calendar_config_get_confirm_delete): New
-	function.
-	(calendar_config_set_confirm_delete): New function.
-	(config_read): Get the default value for the ConfirmDelete option.
-	(calendar_config_write): Set the value of ConfirmDelete.
-
-	* gui/dialogs/delete-comp.c (delete_component_dialog): Handle the
-	configuration option for confirmation.
-
-	* gui/dialogs/cal-prefs-dialog.c (CalPrefsDialogPrivate): Added
-	the fields for the Other page.
-	(get_widgets): Handle the new widgets.
-	(cal_prefs_dialog_show_config): Likewise.
-	(cal_prefs_dialog_update_config): Likewise.
-
-2001-09-18  Rodrigo Moya <rodrigo@ximian.com>
-
-	* cal-client/cal-client-multi.[ch]: new class for managing multiple
-	calendars, with an API very similar to the CalClient one,
-	for ease of transition from one to the other
-
-	* gui/component-factory.c (xfer_folder, remove_folder, create_folder):
-	reworked to be able to manage folders for any calendar backend, and
-	not only the file: one
-
-2001-09-18  Rodrigo Moya <rodrigo@ximian.com>
-	
-	* idl/evolution-calendar.idl: changed signature for the getFreeBusy
-	method, to return a sequence of CalObj's, and added sequence of users
-	as a new parameter to that method
-
-	* cal-client/cal-client.c (cal_client_get_free_busy): adapted to new
-	IDL method signature, by adding a new "GList *users" parameter, for
-	callers to be able to specify a list of users
-
-	* pcs/cal-backend.[ch] (cal_backend_get_free_busy):
-	* pcs/cal-backend-file.c (cal_backend_file_get_free_busy): add the
-	"GList *users" parameter. In cal_backend_file_get_free_busy, call
-	lookup_component to get the CalComponent for each uid, instead
-	of calling cal_backend_get_object, which meant converting the
-	component to a string and then parsing it again.
-
-	* cal-client/client-test.c (cal_opened_cb):
-	* gui/e-itip-control.c (send_freebusy):
-	* gui/calendar-commands.c (publish_freebusy_cmd): adapted to
-	new getFreeBusy method signature
-
-2001-09-17  Damon Chaplin  <damon@ximian.com>
-
-	* gui/calendar-model.c: added a timeout to refresh the list every
-	10 minutes. Not ideal, as the user may be editing a task when it gets
-	refreshed.
-	(adjust_query_sexp): use the 'completed-before?' operator to filter
-	out tasks according to the config settings.
-
-	* gui/dialogs/task-details-page.c (task_details_page_fill_widgets): 
-	added support for the 'Completed' date. This code must have got lost
-	somewhere, as it used to work.
-	(date_changed_cb): set the priv->updating flag while updating the other
-	widgets.
-
-	* pcs/cal-backend-file.c (cal_backend_file_update_objects): made sure
-	we freed the components.
-
-	* pcs/query.c (func_completed_before): added 'completed-before?'
-	operator.
-
-	* gui/calendar-config.c (calendar_config_configure_e_cell_date_edit): 
-	don't set the lower & upper hour. Use 0-24 like the EDateEdit does.
-
-	* gui/dialogs/cal-prefs-dialog.c (cal_prefs_dialog_show_config): set
-	the 12/24-hour time format options sensitive only if we support both.
-
-	* gui/calendar-config.c (config_read): if the locale doesn't define
-	'am' and 'pm' strings then we must use 24-hour format.
-
-	* gui/calendar-commands.c (calendar_set_folder_bar_label): don't
-	translate the '%d' as it doesn't make much sense. Resolves bug #8027.
-
-2001-09-17  Federico Mena Quintero  <federico@ximian.com>
-
-	* gui/component-factory.c (owner_set_cb): Do not call
-	calendar_config_init() here.
-
-	* gui/main.c (main): Call calendar_config_init() here.
-
-2001-09-17  Federico Mena Quintero  <federico@ximian.com>
-
-	* gui/alarm-notify/alarm.c (queue_alarm): Duh, only setup the
-	timeout if the list was empty.
-	(alarm_ready_cb): Notify with the ID of the original alarm.
-	(alarm_remove): Likewise.
-
-2001-09-17  Federico Mena Quintero  <federico@ximian.com>
-
-	Switch the alarm system from using SIGALRM to normal glib timers.
-	Also, use a more robust de-queueing mechanism.
-
-	* gui/alarm-notify/alarm.c (alarm_init): Removed.
-	(alarm_done): Remove the glib timeout instead of closing the pipes
-	and the signal handler.
-	(alarm_add): Allow adding alarms that happen before right now.
-	(queue_alarm): Use a glib timer instead of a signal.
-	(alarm_remove): Adjust the timeout as appropriate.
-
-	* gui/alarm-notify/notify-main.c (main): There is no need to
-	initialize the alarm system now.
-
-	* gui/main.c (main): Likewise.
-
-2001-09-17  JP Rosevear  <jpr@ximian.com>
-
-	* gui/calendar-model.c (calendar_model_init): get itip addresses
-	(calendar_model_destroy): destroy same
-	(calendar_model_value_at): do more thorough checking on whether to
-	use recurring, assigned, assigned to or regular task icons
-
-2001-09-17  JP Rosevear  <jpr@ximian.com>
-	
-	* cal-util/cal-component.c (for_each_remove_all_alarms): for each
-	call back, removes the alarms
-	(cal_component_remove_all_alarms): remove all alarms from the
-	component
-
-	* cal-util/cal-component.h: new proto
-
-	* gui/e-itip-control.c (write_error_html): writes error messages
-	rather than normal html
-
-	* gui/itip-utils.c (itip_send_comp): remove all alarms if the
-	method warrants it
-
-2001-09-16  Christopher James Lahey  <clahey@ximian.com>
-
-	* gui/dialogs/meeting-page.c (build_etable): Updated this to match
-	the new ETableSimple interface.
-
-2001-09-14  Ettore Perazzoli  <ettore@ximian.com>
-
-	[Automake 1.5 fixes pointed out by Richard Boulton
-	<richard@tartarus.org>, as per #9258.]
-
-	* cal-client/Makefile.am: Set CLEANFILES directly instead of using
-	`+='.
-	* gui/Makefile.am: Likewise.
-	* gui/alarm-notify/Makefile.am: Likewise.
-	* pcs/Makefile.am: Likewise.
-
-2001-09-14  Damon Chaplin  <damon@ximian.com>
-
-	* gui/e-itip-control.c (ok_clicked_cb): added space after 'identities'
-	in the message. Fixes bug #9896.
-
-2001-09-14  JP Rosevear  <jpr@ximian.com>
-
-	* conduits/calendar/e-calendar.conduit.in: remove translation
-	marker for now	
-
-2001-09-13  JP Rosevear  <jpr@ximian.com>
-
-	* cal-util/cal-component.h: use ical partstat, role, cutypes
-	directly 
-
-	* cal-util/cal-component.c: ditto
-
-	* gui/e-itip-control.c (find_my_address): set my addresses if the
-	addresses match
-	(find_attendee): strstr returns non-null on a match
-	(write_html): use new icon, select the name displayed (organizer
-	or attendee) based on method,
-	(ok_clicked_cb): when rsvp'ing strip off all but the attendee
-	being replied for as is specified in the spec
-	(find_attendee_partstat): new util function to extract the
-	partstat of an attendee
-	(update_attendee_status): updates the partstat of a specific
-	attendee in the reply message
-
-	* gui/dialogs/meeting-page.c: use ical partstat, role, cutypes
-	directly
-	(popup_delegate_cb): if we delegate, notify of needs send and
-	changed
-	(popup_delete_cb): notify of needs send and changed for each
-	deletion
-	
-2001-09-12  JP Rosevear  <jpr@ximian.com>
-
-	* gui/calendar-commands.c (publish_freebusy_cmd): send 6 weeks of
-	free busy info starting with the UTC start of day
-
-	* gui/itip-utils.c (get_label): create a text representation of
-	the given icaltime
-	(itip_send_comp): if the summary is empty, set the subject based
-	on the type of component, put the right extension on free/busy
-	components and base descriptions on type of component, include
-	start/end for free/busy info
-	
-2001-09-11  Federico Mena Quintero  <federico@ximian.com>
-
-	* gui/alarm-notify/alarm-queue.c (display_notification): Added an
-	use_description argument so that other alarms can fall back to
-	this type.
-	(audio_notification): Implemented.
-	(remove_comp): Call remove_queued_alarm() here; there is no longer
-	a destroy notification function for alarms so must we do this
-	manually.
-	(alarm_trigger_cb): Do not pass the alarm to the notification
-	functions so that we can free it ourselves before all the alarms
-	in the component get freed.
-	(display_notification): Get the alarm here instead of getting it
-	as an argument.
-	(procedure_notification): Implemented.
-
-2001-09-11  JP Rosevear  <jpr@ximian.com>
-
-	* gui/dialogs/meeting-page.c (invite_entry_changed): free the
-	destination vector when we finish with it, if we actually add
-	anyone, notify listeners of the needs send and changed info. Fixes
-	bug #8632.
-
-2001-09-10  Zbigniew Chyla  <cyba@gnome.pl>
-
-	* gui/print.c
-	(format_date): Convert string generated by strftime to UTF-8.
-	(print_week_view_background): Ditto.
-	(print_month_summary): Ditto.
-	(print_month_small): Use U_() instead of _().
-	(print_day_background): Ditto.
-	(print_todo_details): Ditto.
-	(print_date_label): Convert generated string to UTF-8.
-
-2001-09-10  Federico Mena Quintero  <federico@ximian.com>
-
-	* cal-util/cal-component.c (cal_component_alarm_get_attach):
-	Handle the new icalattach type instead of struct icalattachtype.
-	(cal_component_alarm_set_attach): Likewise.
-
-	* gui/dialogs/alarm-options.c (alarm_to_aalarm_widgets): Likewise.
-	(alarm_to_palarm_widgets): Likewise.
-	(aalarm_widgets_to_alarm): Likewise.
-	(palarm_widgets_to_alarm): Likewise.
-
-2001-09-05  Ettore Perazzoli  <ettore@ximian.com>
-
-	[Fix #958, ShellComponents should not be created by factories, for
-	the calendar.]
-
-	* gui/GNOME_Evolution_Calendar.oaf.in: Remove the
-	ShellComponentFactory.
-
-	* gui/component-factory.c (create_object): Renamed from
-	`component_fn'.  Don't get any args.
-	(component_factory_init): Create the component using
-	`create_object()' and register it into OAF.
-	(COMPONENT_FACTORY_ID): Removed.
-	(COMPONENT_ID): New.
-
-2001-09-04  Federico Mena Quintero  <federico@ximian.com>
-
-	* gui/component-factory.c (sc_user_create_new_item_cb):
-	Implemented.
-
-	* gui/main.c (component_editor_factory_init): New function to
-	create the factory for the comp_editor_factory.
-
-	* gui/comp-editor-factory.c: Finished implementation.
-
-	* gui/alarm-notify/alarm-queue.c (edit_component): Implemented the
-	Edit command.
-
-	* gui/Makefile.am (evolution_calendar_SOURCES): Added
-	comp-editor-factory.[ch] to the list of sources.
-
-2001-09-03  Damon Chaplin  <damon@ximian.com>
-
-	* gui/calendar-commands.c (calendar_control_activate): 
-	* gui/tasks-control.c (tasks_control_activate): don't call
-	calendar_config_check_timezone_set() now, since the startup wizard
-	handles that.
-
-	* gui/e-tasks.c (e_tasks_class_init): changed selection_changed signal
-	to GTK_RUN_LAST. It has no reason to be GTK_RUN_FIRST.
-
-	* gui/gnome-cal.c: 
-	* gui/e-week-view.c: 
-	* gui/e-day-view.c: added "selection_changed" signal,
-	XX_delete_event() and XX_get_num_events_selected().
-
-	* gui/e-day-view-top-item.c (e_day_view_top_item_draw): fix the shadow
-	around the dates at the top - it was 1 pixel off.
-
-	* gui/calendar-commands.c: added sensitize_commands(), similar to in
-	tasks-control.c, so we only make Cut/Copy/Delete sensitive when an
-	event is selected. Also added delete_event_cmd().
-
-	* gui/dialogs/task-page.c (task_page_set_summary): 
-	* gui/dialogs/event-page.c (event_page_set_summary): do nothing,
-	since the summary only gets changed on the main event/task page now.
-	Fixes bug #6939.
-
-	* gui/e-day-view.c (e_day_view_on_main_canvas_drag_data_received): 
-	(e_day_view_on_top_canvas_drag_data_received): check that we are
-	dragging an event from the same EDayView. We currently don't support
-	DnD from other widgets.
-	(e_day_view_update_top_canvas_drag): only get the summary if we
-	actually have an event. Fixes bug #5162.
-
-	* gui/e-day-view.c (e_day_view_on_editing_stopped): if the text hasn't
-	changed we need to call e_day_view_update_event_label() to show the
-	times again if necessary. Fixes bug #1813.
-
-	* gui/dialogs/comp-editor.c (comp_editor_destroy): destroy the
-	CompEditorPage objects here rather than in close_dialog(), after the
-	widgets have been destroyed. We do this because the widgets have lots
-	of signal handlers connected with the CompEditorPage objects as the
-	signal data, so we want to ensure that the data pointer is always
-	valid. (Alternatively we could disconnect all the handlers when the
-	CompEditorPage objects are destroyed, or use connect_while_alive()).
-	Fixes bug #7543.
-
-	Note: there is still a small bug in that if you type in a time and
-	then hit 'Save and Close', the time won't be saved. I'm not sure
-	where this should be fixed - should the actions which close the
-	dialog grab the focus to the toplevel, so any widgets currently
-	being edited finish the edit and emit 'changed'?
-	
-	* gui/dialogs/recurrence-page.c (append_exception): use
-	gtk_clist_set_row_data_full() so freeing is handled automatically by
-	the GtkClist. This helps avoid problems at destroy-time.
-	(exception_delete_cb): just call gtk_clist_remove() now. No need to
-	free the row data as GtkCList now handles it.
-	(recurrence_page_destroy): no need to free the data in the clist.
-
-	* gui/dialogs/alarm-page.c: ditto.
-
-	* gui/dialogs/meeting-page.c: ditto.
-	(etable_destroy_cb): save the ETable state in this new handler cb
-	rather than in the destroy method, since the widget will already be
-	destroyed by then.
-
-2001-08-31  Damon Chaplin  <damon@ximian.com>
-
-	* gui/e-itip-control.c: changed 3 occurrences of 'Replyed' to 'replied'
-
-2001-08-31  Zbigniew Chyla  <cyba@gnome.pl>
-
-	* gui/e-itip-control.c (write_html):
-	Marked strings for translation (with U_).
-
-	* gui/itip-utils.c (itip_send_comp):
-	Ditto.
-
-2001-08-31  Damon Chaplin  <damon@ximian.com>
-
-	* gui/dialogs/comp-editor-util.c (comp_editor_contacts_to_widget): 
-	(comp_editor_contacts_to_component): fix debugging messages so they
-	use "" rather than NULL. Fixes bug #8559.
-
-2001-08-29  Federico Mena Quintero  <federico@ximian.com>
-
-	* pcs/cal-backend-file.c (cal_backend_file_remove_object): See if
-	the set of categories changed by using the removed_categories hash
-	table.
-	(cal_backend_file_init): Create a table of removed categories.
-	This allows us to notify if and only if the set of category
-	changes when an object is updated/removed, instead of
-	unconditionally notifying if an object is updated.
-	(cal_backend_file_update_objects): Only notify if the set of
-	categories really changed.
-	(update_categories_from_comp): Shuffle the categories between the
-	priv->categories and priv->removed_categories lists.
-
-2001-08-28  Federico Mena Quintero  <federico@ximian.com>
-
-	Fixes bug #7879, a query may receive an update notification from
-	the backend before the query itself gets populated.
-
-	* pcs/query.c (ensure_sexp): New function; ensures that the esexp
-	is created and notifies of parse errors.  It is the bulk of
-	start_query_cb() but put in a separate function so that we can
-	share it elsewhere.
-	(start_query_cb): Use ensure_sexp().
-	(process_component_cb): Oops, notify of a successfully finished
-	query.
-	(match_component): Call ensure_sexp().  This function can be
-	called by the backend notification callbacks before the query is
-	populated, so we need to make sure the esexp exists here.
-
-2001-08-22  Federico Mena Quintero  <federico@ximian.com>
-
-	* gui/cal-search-bar.c (cal_search_bar_construct): Set the
-	"category is" criterion as the default for the calendar and tasks.
-
-2001-08-22  Federico Mena Quintero  <federico@ximian.com>
-
-	* gui/dialogs/recurrence-page.c (recurrence_page_fill_widgets):
-	Unset the priv->updating flag before returning in the case the
-	component has no recurrence information.  Fixes bug #6850.
-
-2001-08-22  Federico Mena Quintero  <federico@ximian.com>
-
-	* gui/alarm-notify/alarm-queue.c (QueuedAlarm): Added a snooze
-	flag to differentiate snoozed alarms from real occurrences.
-	(add_component_alarms): Do not specify a destroy function for the
-	alarm trigger.  We handle this in the callbacks now.
-	(alarm_trigger_cb): Just remove the alarms for the unimplemented
-	notification types.
-	(create_snooze): Implemented snooze.
-	(notify_dialog_cb): Snooze as appropriate.
-
-2001-08-22  JP Rosevear  <jpr@ximian.com>
-
-	* gui/itip-utils.c (foreach_tzid_callback): call back to add
-	timezones to the top level
-	(itip_send_comp): call icalcomponent_foreach_tzid
-
-2001-08-22  Dan Winship  <danw@ximian.com>
-
-	* gui/gnome-cal.c: #include <libgnomevfs/gnome-vfs-types.h> so
-	this will compile against gnome-vfs 1.0.1.
-
-2001-08-22  Rodrigo Moya <rodrigo@ximian.com>
-
-	* gui/gnome-cal.c (gnome_calendar_open): open the tasks folder
-	associated with the calendar being opened, and not always the local
-	tasks.ics file
-
-	* pcs/cal-factory.c (open_fn): use gnome_vfs_uri_new_private when
-	parsing the URI to allow non-registered URIs
-
-2001-08-21  Federico Mena Quintero  <federico@ximian.com>
-
-	* gui/dialogs/alarm-options.c (alarm_to_palarm_widgets): Handle
-	the case where there is no attachment.  Fixes bug #7257.
-
-2001-08-21  JP Rosevear  <jpr@ximian.com>
-
-	* gui/e-itip-control.c (write_html): strip the mailto bit for the
-	email address if we display it
-
-2001-08-21  Damon Chaplin  <damon@ximian.com>
-
-	* pcs/query.c (func_is_completed): added new e-sexp operator. We
-	don't currently use it though.
-
-	* gui/dialogs/cal-prefs-dialog.glade: Changed '_Overdue' to 'O_verdue'
-	since we have an '_Other' notebook tab. Added '_Hide' accel.
-
-	* gui/dialogs/cal-prefs-dialog.c: hooked up config options to dialog.
-
-	* gui/calendar-config.c: added config options for hiding completed
-	tasks.
-
-	* gui/e-week-view-event-item.c (e_week_view_event_item_draw): 
-	* gui/e-day-view-top-item.c (e_day_view_top_item_draw_long_event): 
-	* gui/e-day-view.c (e_day_view_reshape_long_event): added 2 pixels
-	extra space between icons and text for long events, and 1 pixel space
-	between icons in all events.
-	(e_day_view_realize): changed the background color to match the
-	EGrayBar in the shell.
-
-2001-08-21  Rodrigo Moya <rodrigo@ximian.com>
-
-	* pcs/cal-backend-util.[ch]: new files to contain utility functions
-	for calendar backends
-
-	* pcs/cal-backend.c (cal_backend_add_cal): implement it here, and not in
-	the calendar backends. Add a "cal_added" signal, so that backends are
-	notified when a new Cal is added, if they need to
-	(cal_backend_get_type_by_uid): implement it here
-
-	* pcs/cal-backend-file.c (fill_alarm_instances_seq): moved to
-	cal-backend-util.c
-	(cal_backend_file_add_cal): removed
-	(cal_backend_file_init): connect to the "cal_added" signal in the
-	CalBackend class so that we can update categories when a new Cal is
-	added
-	(cal_backend_file_get_type_by_uid): removed
-
-	* pcs/cal-backend-db.c (fill_alarm_instances_seq): moved to
-	cal-backend-util.c
-	(cal_backend_db_add_cal): removed
-	(cal_backend_db_get_type_by_uid): removed
-
-	* AUTHORS: added JP and Damon to list of authors
-
-2001-08-20  Rodrigo Moya <rodrigo@ximian.com>
-
-	* cal-util/cal-util.[ch] (cal_util_generate_alarms_for_list):
-	(cal_util_generate_alarms_for_comp): 
-	new functions moved from the CalBackendFile, to allow its use outside
-	of it. The signature has changed a little bit, since these functions
-	need a way to get the timezones from the callers, so a callback
-	function to resolve the timezones has been added to the list of
-	parameters
-
-	* pcs/cal-backend-file.c (generate_alarms_for_list):
-	(generate_alarms_for_comp): moved to cal-util, with all their related
-	functions/structures
-
-	* pcs/cal-backend-db.c: removed functions that were moved to cal-util
-
-2001-08-20  Damon Chaplin  <damon@ximian.com>
-
-	* gui/dialogs/comp-editor.c (pixmaps): use Delete icon in menu, and
-	change to bigger Save icon in toolbar.
-
-	* gui/tasks-control.c: 
-	* gui/calendar-commands.c (pixmaps): used new_task-16.png and
-	goto-16.png.
-
-2001-08-20  Damon Chaplin  <damon@ximian.com>
-
-	* gui/calendar-commands.c (pixmaps): added delete icons for menu
-	and toolbar.
-
-2001-08-20  Damon Chaplin  <damon@ximian.com>
-
-	* gui/tasks-control.c: added Cut/Copy/Paste icons for toolbar.
-
-2001-08-20  Damon Chaplin  <damon@ximian.com>
-
-	* gui/tasks-control.c: uses new delete icons in menu & toolbar.
-
-2001-08-19  Ettore Perazzoli  <ettore@ximian.com>
-
-	* gui/component-factory.c: Update the folder list to include a
-	display name and a description.
-
-2001-08-20  Damon Chaplin  <damon@ximian.com>
-
-	* gui/dialogs/comp-editor.c (pixmaps): use new delete icon for toolbar.
-
-2001-08-19  Damon Chaplin  <damon@ximian.com>
-
-	* gui/e-itip-control.c: fixed typo, 'send' -> 'sent'. Bug #7621.
-
-2001-08-18  Damon Chaplin  <damon@ximian.com>
-
-	* gui/dialogs/cal-prefs-dialog.glade: added option to hide completed
-	tasks after a given number of minutes/hours/days. Unfinished.
-
-	* gui/dialogs/event-page.c (event_page_fill_component): initialize
-	zone to NULL to avoid a warning.
-	(contacts_clicked_cb): work around a bug in SelectNames by notifying
-	that the page has changed when you click the 'Contacts' button.
-	Otherwise it is easy to lose changes.
-
-	* gui/dialogs/task-page.c (contacts_clicked_cb): ditto.
-
-2001-08-18  Damon Chaplin  <damon@ximian.com>
-
-	* gui/dialogs/comp-editor.c (pixmaps): used new Save/Save As icons.
-
-	* gui/tasks-control.c:
-	* gui/calendar-commands.c (pixmaps): added new Cut/Copy/Paste icons,
-	and changed the 'New Task' icon to use the bigger one I made.
-
-2001-08-05  Zbigniew Chyla  <cyba@gnome.pl>
-
-	* gui/dialogs/task-page.c (summary_changed_cb):
-	Use e_dialog_editable_get instead of gtk_editable_get_chars (we need
-	UTF-8 string).
-
-2001-08-18  Zbigniew Chyla  <cyba@gnome.pl>
-
-	* gui/calendar-config.c (locale_uses_24h_time_format): New.
-	(config_read): Use locale's setting as default for
-	/Calendar/Display/Use24HourFormat so that Europeans don't have to
-	switch to 24-hour format manually.
-
-2001-08-17  JP Rosevear  <jpr@ximian.com>
-
-	* gui/e-itip-control.c (destroy): destroy the addresses
-	(clean_up): don't free the addresses, we need them
-
-2001-08-17  Damon Chaplin  <damon@ximian.com>
-
-	* gui/gnome-cal.c (gnome_calendar_new_task): new function to open the
-	task editor to add a new task.
-
-	* gui/calendar-commands.c: added new_task_cb() to create a new task
-	in the calendar folder, and added menu commands for it, and a toolbar
-	button (I think that is what Ettore wanted. Maybe he just meant menu
-	commands. Anyway, it is easy to take out.) Note that we don't have a
-	decent icon for 'New Task' for the toolbar.
-	Also added the new Goto button (but we don't have a similar one for
-	the menu command).
-
-2001-08-16  Iain Holmes  <iain@ximian.com>
-
-	* gui/Makefile.am: Add the libetimezonedialog.a lib link
-
-	* gui/calendar-config.c: Change the #include for the timezone dialog
-
-	* gui/e-timezone-entry.c: Ditto.
-
-	* gui/dialogs/Makefile.am: Remove the e-timezone-dialog stuff.
-
-2001-08-16  Damon Chaplin  <damon@ximian.com>
-
-	* gui/dialogs/event-page.c: hide the timezone fields for all-day
-	events. We will use DATE values for these eventually, and these
-	don't have timezones associated with them. Currently we just use the
-	default timezone for all-day events, as a workaround until we have
-	DATE values working.
-
-	* gui/dialogs/comp-editor-util.c (comp_editor_new_date_edit): added
-	make_time_insensitive flag. Though we may not use it.
-
-	* gui/dialogs/event-page.glade: made the 'All day event' toggle
-	right-aligned, so it doesn't move when the other widgets are shown
-	and hidden.
-
-	* gui/e-timezone-entry.c (e_timezone_entry_set_default_timezone): new
-	function to set the default timezone of the widget. If the current
-	timezone setting matches the default then the entry field is hidden.
-	Most people won't use timezones so this makes the GUI simpler.
-
-	* gui/dialogs/event-page.c (init_widgets): 
-	* gui/dialogs/task-page.c (init_widgets): set the default timezone
-	using the above function.
-
-	* gui/dialogs/task-page.c (task_page_fill_widgets): if the start date
-	or due date is not set, we use the default timezone, so the user
-	doesn't have to set this each time they set the date.
-
-2001-08-16  Federico Mena Quintero  <federico@ximian.com>
-
-	* gui/dialogs/alarm-page.c (alarm_page_fill_widgets): If the
-	component has no alarms remember to set the priv->updating flag to
-	FALSE before returning.
-
-2001-08-16  JP Rosevear  <jpr@ximian.com>
-
-	* gui/dialogs/e-delegate-dialog.c
-	(e_delegate_dialog_get_delegate_name): get the destinations
-	property, not the text property
-
-2001-08-16  Federico Mena Quintero  <federico@ximian.com>
-
-	* gui/dialogs/alarm-page.c (clear_widgets): Set the default-to-add
-	notification to be display a message 15 minutes before the start
-	of the appointment.  Fixes bug #7175.
-
-2001-08-16  Federico Mena Quintero  <federico@ximian.com>
-
-	* gui/dialogs/comp-editor-util.c (comp_editor_strip_categories):
-	New function to strip surrounding whitespace from a string of
-	categories entered by the user.
-
-	* gui/dialogs/task-page.c (task_page_fill_component): Use
-	comp_editor_strip_categories().
-
-	* gui/dialogs/event-page.c (event_page_fill_component): Likewise.
-
-2001-08-16  Federico Mena Quintero  <federico@ximian.com>
-
-	* gui/calendar-config.c (calendar_config_configure_e_date_edit):
-	Do not set the time popup range.  We also want to be able to
-	create appointments that are not within nine-to-five!  Think of
-	going to the movies!  Fixes bug #7436.
-
-	* gui/dialogs/cal-prefs-dialog.glade: "am/pm" is now "AM/PM".
-	Fixes bug #7367.
-
-2001-08-16  Jon Trowbridge  <trow@ximian.com>
-
-	* gui/cal-search-bar.c: Changed to reflect my renaming of some of
-	the more hideously-named functions in the ESearchBar API.
-
-2001-08-15  JP Rosevear  <jpr@ximian.com>
-
-	* gui/dialogs/comp-editor.c (save_comp): only fill the component
-	and save it if something has changed
-	(save_comp_with_send): only try to send if something has changed
-	and the editor needs a send
-
-2001-08-15  Federico Mena Quintero  <federico@ximian.com>
-
-	* gui/dialogs/cal-prefs-dialog.glade: OK, re-added the default
-	alarm options.  Way too many people are asking for them.
-
-2001-08-15  Federico Mena Quintero  <federico@ximian.com>
-
-	* gui/component-factory.c (factory_fn): Add the user creatable
-	items.  The callback is not actually implemented yet; this is just
-	to finalize the GUI.
-
-	* gui/dialogs/cal-prefs-dialog.glade: Added an option to ask for
-	confirmation when deleting items.  Added underlined shortcuts
-	(they may not all work currently).
-
-2001-08-14  Damon Chaplin  <damon@ximian.com>
-
-	* gui/dialogs/task-page.c: 
-	* gui/dialogs/event-page.c: added support for the Contacts field.
-	Note that I'm not sure what we should put in the iCalendar CONTACT
-	properties. Currently we put "name <email>", but it isn't recognized
-	as a contact when we reopen the dialog, so we may need more info here.
-	Also we currently use a simple parser to parse the above format, and
-	we should maybe use some camel function.
-
-	* gui/dialogs/task-page.glade: 
-	* gui/dialogs/event-page.glade: replaced the GtkEntry fields for the
-	Contacts with a GtkEventBox which we put the BonoboControl in at
-	runtime.
-
-	* gui/dialogs/meeting-page.c (invite_entry_changed): added FIXMEs
-	since it doesn't seem to be freeing the EDestination stuff. JP?
-
-	* gui/dialogs/comp-editor-util.c: added bunch of utility functions to
-	handle the Contacts field in the main Event and Task pages.
-
-	* gui/gnome-cal.c: added visible_start and visible_end fields, so we
-	only emit the 'dates-shown-changed' signal when really necessary.
-	Currently changing the folder title bar label results in a complete
-	redraw of the Evolution window (silly GtkLabel queueing a resize),
-	so we want to avoid that as much as possible.
-	(gnome_calendar_new_appointment_for): only move the event's end time
-	to the end of the day if it is not already 00:00:00.
-
-	* gui/e-week-view-event-item.c: 
-	* gui/e-week-view.c: 
-	* gui/e-day-view.c: added support for double-clicking on an event to
-	open it, and for double-clicking on the background to create a new
-	event. There is still a minor problem to sort out, but it basically
-	works.
-
-	* cal-util/cal-component.c: added support for CONTACT properties,
-	mainly by copying the code for COMMENT properties which are exactly
-	the same type.
-
-	* gui/e-day-view.c (e_day_view_realize): use the same color for the
-	top canvas background as the shortcut bar, to make it look a little
-	nicer (I think). Although we still have the theme problem with
-	hard-coded colors.
-
-2001-08-14  Federico Mena Quintero  <federico@ximian.com>
-
-	* gui/e-calendar-table.etspec: Made the click-to-add message
-	shorter.  Fixes bug #7177.
-
-2001-08-14  Federico Mena Quintero  <federico@ximian.com>
-
-	* gui/calendar-commands.c (pixmaps): Added Tigert's new icons for
-	Prev and Next.
-
-2001-08-14  Federico Mena Quintero  <federico@ximian.com>
-
-	* gui/cal-search-bar.c (make_suboptions): Make the "Any Category"
-	item consistent with the one in the addressbook.  Also, free the
-	items correctly.
-
-2001-08-14  Federico Mena Quintero  <federico@ximian.com>
-
-	* gui/cal-search-bar.c (get_current_category): Handle an array of
-	categories in the CalSearchBar instead of our own menu items.
-	(notify_query_contains): Fetch the text from the search bar here
-	instead of in regen_query().
-	(regen_query): Handle category searches.
-	(notify_category_is): New function.
-	(cal_search_bar_construct): Do not create an option menu.
-	(make_suboptions): New function to create the suboption items from
-	the list of categories.
-	(notify_query_contains): Do not include a category sexp here.
-
-2001-08-13  JP Rosevear  <jpr@ximian.com>
-
-	* gui/e-itip-control.c (update_item): add dialog for feedback
-	(remove_item): ditto
-	(send_item): ditto
-	(send_freebusy): ditto
-
-2001-08-13  JP Rosevear  <jpr@ximian.com>
-
-	* gui/e-itip-control.c: rewrite the gui to use gtkhtml
-
-	* gui/Makefile.am: define the icon dir
-
-2001-08-12  Kjartan Maraas  <kmaraas@gnome.org>
-
-	* gui/e-itip-control.h: Remove #include <config.h> from here.
-	* gui/itip-utilss.h: Same here.
-	
-2001-08-11  Ettore Perazzoli  <ettore@ximian.com>
-
-	* gui/tasks-control.c: Update the paths of the Tools menu
-	according to the changes in the XML [i.e. things are moved to the
-	ComponentToolsPlaceholder].
-
-	* gui/calendar-commands.c: Likewise.
-
-2001-08-11  Damon Chaplin  <damon@ximian.com>
-
-	* gui/dialogs/event-page.c (init_widgets): 
-	* gui/dialogs/task-page.c (init_widgets): turn on word-wrap for the
-	description fields. Fixes bug #6821.
-
-2001-08-10  Jon Trowbridge  <trow@ximian.com>
-
-	* gui/cal-search-bar.c: Where we have ESearchBarItems, set their
-	subitems to NULL.
-
-2001-08-09  Damon Chaplin  <damon@ximian.com>
-
-	* pcs/cal-backend.c (cal_backend_get_object_component): added new
-	backend method to get the component given a UID.
-
-	* pcs/cal-backend-file.c (cal_backend_file_get_object_component): 
-	added implementation of above virtual method.
-	
-	* pcs/query.c (match_component): use the new backend function to get
-	the CalComponent rather than the string. This avoids converting all
-	the calendar components to strings and parsing them back into
-	components for every query! (That wasn't a good idea, was it ;)
-
-	* gui/e-week-view.c: 
-	* gui/e-day-view.c: use a timeout handler to layout the events,
-	to avoid doing a layout for each event we get from a query.
-
-	* gui/print.c (print_day_add_event): 
-	* gui/e-day-view.c (e_day_view_add_event): set start_row_or_col and
-	num_columns to 0. They are guint8's.
-
-	* gui/e-week-view.c (e_week_view_free_events): hide all the jump
-	buttons. Fixes bug #5946.
-
-	* gui/calendar-commands.c (calendar_set_folder_bar_label): added the
-	day numbers for the month view.
-
-	* gui/dialogs/recurrence-page.glade: changed "_Delete" to "_Remove",
-	since it clashed with "_Add". Also added underlined accelerators for
-	the recurrence radio buttons. Note that none of these accelerators
-	actually work at present, due to the way we are using .glade files
-	for each notebook page. I need to add a bug about this.
-	Also, the "_Action" menu doesn't popup when I press Alt+A, even though
-	the "_File" menu does popup when I press Alt+F. Strange.
-
-	* pcs/cal-backend-file.c (cal_backend_file_get_timezone_object):
-	removed debug msgs.
-
-2001-08-09  Rodrigo Moya <rodrigo@ximian.com>
-
-	* gui/e-day-view-top-item.c (e_day_view_top_item_draw_long_event):
-	* gui/e-day-view-main-item.c (e_day_view_main_item_draw_day_event):
-	* gui/e-week-view-event-item.c (e_week_view_event_item_draw_icons):
-	unref the GdkPixmap and GdkBitmap returned by the function
-	e_categories_config_get_icon_for ()
-
-2001-08-09  JP Rosevear  <jpr@ximian.com>
-
-	* gui/dialogs/task-page.*: Remove progress frame
-
-	* gui/dialogs/task-details-page.*: Put in progress frame, remove
-	basics frame
-	
-	* gui/dialogs/task-editor.c (set_menu_sens): util function to set
-	menu sensitivity based on state
-	(task_editor_init): add meeting page
-	(task_editor_edit_comp): show page if necessary
-	(task_editor_destroy): unref meeting page
-	(assign_task_cmd): bring up meeting page
-	(refresh_task_cmd): save before sending
-	(forward_cmd): ditto
-
-	* gui/dialogs/comp-editor.c (save_cmd): implement new save command
-
-2001-08-09  Federico Mena Quintero  <federico@ximian.com>
-
-	* gui/e-itip-control.c (destroy): Chain to the destroy handler in
-	the parent class!
-
-	* gui/dialogs/comp-editor-page.c (comp_editor_page_destroy):
-	Likewise.  Sigh.
-
-	* gui/cal-search-bar.c (cal_search_bar_destroy): Whoops, added a
-	destroy handler.
-
-2001-08-08  Damon Chaplin  <damon@ximian.com>
-
-	* gui/goto-dialog.glade: removed underlined accelerator key from
-	"_Go To Today" button. GnomeDialog doesn't actually support underlined
-	accelerator keys for buttons. We could hack it, like Glade does, if
-	we really need to. Fixes bug #6418.
-
-2001-08-08  Federico Mena Quintero  <federico@ximian.com>
-
-	* gui/e-day-view.c (update_query): Stop editing any event.  Fixes
-	bug #5949.
-
-2001-08-08  Federico Mena Quintero  <federico@ximian.com>
-
-	* gui/dialogs/alarm-page.c (alarm_page_fill_component): Duuuh, set
-	the alarm_copy on the component, not the original alarm.  Fixes
-	bug #5214.
-
-2001-08-08  JP Rosevear  <jpr@ximian.com>
-
-	* gui/dialogs/meeting-page.c (set_attendees): set the attendees of
-	a component
-	(meeting_page_fill_component): use above
-	(meeting_page_get_cancel_comp): return a comp with the attendees
-	to be cancelled
-
-	* gui/dialogs/meeting-page.h: get a component that will be sent as
-	a cancellation
-
-	* gui/dialogs/event-editor.c (event_editor_class_init): override
-	send_comp class method
-	(event_editor_send_comp): send cancellation notices to deleted
-	attendees
-	(refresh_meeting_cmd): save before send
-	(forward_cmd): ditto
-
-	* gui/dialogs/comp-editor.c (comp_editor_class_init): set default
-	send_comp method
-	(real_send_comp): do the real work
-	(comp_editor_send_comp): call class method
-	(save_comp): don't do any sending
-	(save_comp_with_send): save and send here
-	(prompt_to_save_changes): use above
-	(save_close_cmd): ditto
-
-	* gui/dialogs/comp-editor.h: add virtual function
-
-2001-08-08  Rodrigo Moya <rodrigo@ximian.com>
-
-	* gui/e-week-view-event-item.c
-	(e_week_view_event_item_draw_icons): don't use a NULL mask in the
-	call to gdk_gc_set_clip_mask
-
-	* gui/e-day-view-top-item.c (e_day_view_top_item_draw_long_event):
-	ditto
-
-	* gui/e-day-view-main-item.c
-	(e_day_view_main_item_draw_day_event): ditto
-
-2001-08-08  JP Rosevear  <jpr@ximian.com>
-
-	* conduits/calendar/calendar-conduit-config.h: fix pre-processor
-	macros
-
-	* conduits/calendar/calendar-conduit.h: ditto
-
-	* conduits/todo/todo-conduit-config.h: fix pre-processor macros
-
-	* conduits/todo/todo-conduit.h: ditto
-
-2001-08-07  Federico Mena Quintero  <federico@ximian.com>
-
-	* cal-client/cal-listener.c (cal_listener_stop_notification): New
-	function to stop further notification from happening.
-	(impl_notifyCalOpened): Do not notify if requested.
-	(impl_notifyObjUpdated): Likewise.
-	(impl_notifyObjRemoved): Likewise.
-	(impl_notifyCategoriesChanged): Likewise.
-	(CalListenerPrivate): Do not keep a reference to the server-side
-	Cal.  This would create a circular reference since the server
-	keeps a reference to the listener.
-	(cal_listener_destroy): Likewise.
-	(impl_notifyCalOpened): Likewise.
-
-	* pcs/cal.c (cal_destroy): bonobo_object_release_unref() the listener.
-
-	* cal-client/cal-client.c (cal_client_destroy): Ask the listener
-	to stop notifications.  Also, do not unref it as the server does
-	that itself when we unref the Cal.
-
-2001-08-07  Federico Mena Quintero  <federico@ximian.com>
-
-	* gui/calendar-model.c (calendar_model_free_value): Only unref the
-	FIELD_COMPONENT if it is non-NULL.  We return a NULL for that
-	field from ::initialize_value(), after all.  Fixes bug #6098.
-
-2001-08-07  JP Rosevear  <jpr@ximian.com>
-
-	* gui/itip-utils.c (itip_send_comp): Make calendar.ics the
-	suggested name when attaching the ical object
-
-2001-08-06  Damon Chaplin  <damon@ximian.com>
-
-	* gui/e-week-view.h: 
-	* gui/e-day-view.h: added 'different_timezone' fields to EDayViewEvent
-	and EWeekViewEvent, to note that the event is in a different timezone.
-	We now compute this once when we add the event to the array, rather
-	than each time we draw the event. If it is set, we will draw the
-	timezone icon next to the event.
-
-	* gui/e-day-view-main-item.c: take transparency into account when
-	drawing the blue vertical bars to represent busy time.
-
-	* gui/tag-calendar.c: take transparency into account when tagging
-	the mini calendar.
-
-	* gui/e-calendar-table.c (e_calendar_table_init): removed the "None"
-	options for transparency and classification, since these properties
-	have defaults anyway, so we may as well use those to keep it simple.
-	Also use "Free" and "Busy" for transparency, rather than "Transparent"
-	and "Opaque".
-
-	* gui/calendar-model.c: updated classification & transparency code
-	as above.
-
-	* gui/e-calendar-table.etspec: changed "Transparency" to "Show Time As"
-	since people have a chance of understanding that.
-
-	* gui/e-week-view.c: 
-	* gui/e-day-view.c: 
-	* gui/gnome-cal.c: added functions to get the visible time range.
-
-	* gui/calendar-commands.c: finished stuff to set the folder bar
-	label to the dates currently displayed.
-
-	* gui/control-factory.c (control_factory_new_control): connected
-	signal to update the folder title bar label when the dates shown
-	are changed. I had to connect it here since we need the BonoboControl
-	in the callback, and I don't know how to get the control from the
-	widget.
-
-	* gui/tasks-control.c (tasks_control_activate): clear the folder bar
-	label. We could display something here at some point.
-
-	* gui/dialogs/recurrence-page.glade: changed "_Add" to "A_dd", since
-	we have an "_Actions" menu. (These also use Alt+key, right?)
-
-	* gui/dialogs/event-page.glade: 
-	* gui/dialogs/event-page.c: added 'Show Time As' field, which is
-	really the TRANSP property but with a better name!
-	Also changed one of the "_Confidential" to "Con_fidential" since we
-	already have "_Contacts" using the same 'C' key.
-
-	* pcs/cal-backend-file.c (cal_backend_file_get_free_busy): skip
-	events that are TRANSPARENT. Also added comment as this code looks
-	inefficient.
-
-	* cal-util/cal-component.c: removed stuff for comparing timezones.
-
-	* gui/comp-util.c (cal_comp_util_compare_event_timezones): moved the
-	above function here, and updated it to compare the UTC offsets of the
-	times as well as the TZIDs.
-
-2001-08-06  Federico Mena Quintero  <federico@ximian.com>
-
-	* gui/dialogs/cal-prefs-dialog.glade: In process of fixing bug
-	#6005.  The "Calendar" page is now "Display", and it has no
-	frames.  The "Task list" page has colons between the labels and
-	the color pickers, and it has no frame.
-
-2001-08-06  Rodrigo Moya <rodrigo@ximian.com>
-
-	* cal-client/cal-client.c (destroy_wombat_client): added check for
-	NULL pointers. Maybe fixes #5203 (I can't reproduce it, so I'm not
-	sure)
-
-2001-08-03  Federico Mena Quintero  <federico@ximian.com>
-
-	* cal-client/query-listener.c (query_listener_stop_notification):
-	New function; stops further notification from happening.  This is
-	needed since the listener is destroyed asynchronously from the
-	Wombat and the corresponding CalQuery may already have died.
-	(impl_notifyObjUpdated): Do not notify if requested.
-	(impl_notifyObjRemoved): Likewise.
-	(impl_notifyQueryDone): Likewise.
-	(impl_notifyEvalError): Likewise.
-
-	* cal-client/cal-query.c (cal_query_destroy): Use
-	query_listener_stop_notification().
-
-	* cal-client/cal-listener.c (cal_listener_destroy): Nullify the
-	pointers to the callback functions.
-
-	* gui/e-day-view.c (update_query): Commit our state of no longer
-	having a query before unrefing it.  We may reenter from the ORBit
-	main loop and we *really* want this information to be committed.
-
-	* gui/e-week-view.c (update_query): Likewise.
-
-	* gui/calendar-model.c (update_query): Likewise.
-
-	* gui/tag-calendar.c (tag_calendar_by_comp): Added a "clear_first"
-	argument that indicates whether the ECalendar should be cleared of
-	any marks first.
-
-	* gui/calendar-commands.c (calendar_control_activate): Removed
-	ifdefed-out view buttons code from the Gnomecal days.
-
-	* gui/gnome-cal.c (client_categories_changed_cb): Merge the
-	categories of the calendar and tasks clients so that we can
-	display the categories in both sets.
-	(gnome_calendar_construct): Connect to "categories_changed" on
-	both clients.
-	(gnome_calendar_on_date_navigator_selection_changed): Removed call
-	to gnome_calendar_update_view_buttons().
-	(gnome_calendar_update_view_buttons): Removed.  We cannot have
-	this until Bonobo supports radio toolbar items.
-	(gnome_calendar_set_view_buttons): Removed.
-	(gnome_calendar_dayjump): Do not use priv->day_button.
-	(GnomeCalendarPrivate): Removed the {day,work_week,week,month}_button 
-	fields.
-	(gnome_calendar_set_query): Start a retagging process of the date
-	navigator so that it reflects the current query.
-	(update_query): New function to restart a query for the date navigator.
-	(initial_load): Use update_query() instead of tagging the date
-	navigator directly.
-	(gnome_calendar_on_date_navigator_date_range_changed): Likewise.
-	(client_cal_opened_cb): Use update_query() instead of initial_load().
-	(initial_load): Removed.
-	(client_obj_updated_cb): Removed.
-	(client_obj_removed_cb): Removed.
-	(gnome_calendar_new_appointment_for): Set the default category of
-	the new component.
-	(search_bar_category_changed_cb): Set the default category for the
-	calendar views.
-
-	* gui/cal-search-bar.c (cal_search_bar_set_categories): Sort the
-	categories before creating the menu.
-
-	* gui/e-day-view.c (adjust_query_sexp): Return NULL instead of
-	"#f" if the time range is not set yet.
-	(update_query): Do not start a query if the time range is not set.
-	(e_day_view_set_default_category): New function.
-	(e_day_view_key_press): Set the default category on the new
-	component.
-
-	* gui/e-week-view.c (adjust_query_sexp): Analogous to the above.
-	(update_query): Analogous to the above.
-	(e_week_view_set_default_category): Analogous to the above.
-	(e_week_view_key_press): Analogous to the above.
-
-2001-08-03  Federico Mena Quintero  <federico@ximian.com>
-
-	Fixes bug #1407.
-
-	* gui/dialogs/cal-prefs-dialog.glade: Removed the alarm
-	preferences page, since we decided it was unnecessary.
-
-2001-08-03  Zbigniew Chyla  <cyba@gnome.pl>
-
-	I18n fixes.
-
-	* gui/dialogs/event-page.c (summary_changed_cb):
-	Use e_dialog_editable_get instead of gtk_editable_get_chars (we need
-	UTF-8 string).
-
-	* gui/itip-utils.c:
-	Added missing #include <config.h>
-
-2001-08-02  Jon Trowbridge  <trow@ximian.com>
-
-	* gui/Makefile.am: Added camel dependency (now needed by ebook).
-
-2001-08-01  Federico Mena Quintero  <federico@ximian.com>
-
-	* gui/calendar-model.c (calendar_model_value_is_empty): If the
-	default category is the same as the value passed in to this
-	function, return TRUE.  This could be a hack or not, but it
-	prevents two items from being added to the table if a category is
-	selected.
-
-	* gui/e-tasks.c (setup_widgets): Allow the search bar to shrink
-	horizontally.
-
-	* gui/dialogs/task-page.c (clear_widgets): Pass valid values to
-	e_dialog_option_menu_set(); these need to come from the status map.
-
-2001-08-01  Damon Chaplin  <damon@ximian.com>
-
-	* cal-client/cal-client.c: removed debugging messages.
-
-2001-08-01  Federico Mena Quintero  <federico@ximian.com>
-
-	The calendar search bar widget now includes a drop-down menu of
-	available categories.
-
-	* pcs/query.c (func_has_categories): Handle one and only one #f
-	value as meaning "unfiled", for components that have no categories
-	at all.
-
-	* pcs/cal-backend-file.c (open_cal): Duh, do not notify here about
-	changed categories since at this point we don't have any clients
-	bound to us yet.
-	(create_cal): Likewise.
-	(cal_backend_file_add_cal): Notify here.
-
-	* gui/cal-search-bar.h (CalSearchBarClass): New signal
-	"category_changed".
-
-	* gui/cal-search-bar.c (cal_search_bar_construct): Add a drop-down
-	menu for the list of categories.
-	(search_option_items): Removed the "Has category" option, since we
-	now have the drop-down menu instad and it would be confusing to
-	have both options.
-	(regen_query): Likewise.  Also, this function is now the old
-	cal_search_bar_query_changed() and is shared by that very function
-	and by the callback from the drop-down menu.
-	(notify_query_contains): Include the sub-sexp for the categories.
-	(cal_search_bar_set_categories): New function.
-	(cal_search_bar_get_category): New function.
-	(categories_selection_done_cb): Emit the "category_changed" signal.
-
-	* gui/e-tasks.c (obj_updated_cb): Removed function since it did
-	not do anything; all updates are handled by the CalendarModel.
-	(obj_removed_cb): Likewise.
-	(ETasksPrivate): Removed the fields for the categories option
-	menu, since now it is in the ESearchBar.
-	(search_bar_sexp_changed_cb): Use calendar_model_set_query()
-	directly here, as we do not need to frob the sexp anymore.
-	(update_query): Removed.
-	(client_categories_changed_cb): New callback.
-	(search_bar_category_changed_cb): New callback.
-	(e_tasks_new_task): Set the default category on the component to
-	the one that is selected in the search bar.
-	(e_tasks_on_filter_selected): Removed.
-	(e_tasks_on_categories_changed): Removed.
-	(e_tasks_rebuild_categories_menu): Removed.
-	(e_tasks_add_menu_item): Removed.
-	(e_tasks_setup_view_menus): Sanitized not to sink objects wildly.
-	(e_tasks_discard_view_menus): New function.
-
-	* gui/calendar-model.h (CalendarModelClass): Removed the
-	"categories_changed" signal since this is handled in the Wombat
-	now.
-
-	* gui/calendar-model.c (calendar_model_get_categories): Removed.
-	(calendar_model_set_value_at): Do not collect the categories.
-	(query_obj_updated_cb): Likewise.
-	(calendar_model_collect_categories): Removed.
-	(calendar_model_set_default_category): Constify.
-
-	* gui/tasks-control.c (tasks_control_deactivate): Call
-	e_tasks_discard_view_menus().
-
-	* gui/gnome-cal.c (search_bar_category_changed_cb): Set the
-	default category for the task pad's model.
-
-2001-07-31  Federico Mena Quintero  <federico@ximian.com>
-
-	The Wombat now keeps track of which categories are present in the
-	objects of a calendar.  It will notify the clients of changes in
-	this set.  This is to make the category drop-down menus in the
-	calendar/tasks views be always up to date.
-
-	* idl/evolution-calendar.idl (Listener): Added a
-	notifyCategoriesChanged() method.  The Wombat now keeps track of
-	the categories within a calendar.
-
-	* cal-client/cal-listener.[ch]: Switched it to use BonoboXObject.
-	Also added the notifyCategoriesChanged implementation.
-
-	* cal-client/cal-client.[ch]: Added a "categories_changed" signal.
-
-	* pcs/cal-backend-file.c: Maintain a list of the live categories.
-	(update_categories_from_comp): New function to maintain the set of
-	live categories.
-	(add_component): Update the set of categories.
-	(remove_component): Likewise.
-	(open_cal): Notify about changes in the set of categories.
-	(create_cal): Likewise.
-	(cal_backend_file_update_objects): Likewise.
-	(cal_backend_file_remove_object): Likewise.
-	(notify_categories_changed): New function to notify the clients
-	about the current set of categories.
-
-	* pcs/cal.c (cal_notify_categories_changed): New function.
-
-2001-07-31  Rodrigo Moya <rodrigo@ximian.com>
-
-        * gui/e-day-view.c (selection_received):
-        * gui/e-week-view.c (selection_received): yes, set the end date, but
-	correctly calculated, not by using the component's duration, which
-	may not exist. Now really fixes #5836
-
-2001-07-31  Rodrigo Moya <rodrigo@ximian.com>
-
-	* gui/e-day-view.c (selection_received):
-	* gui/e-week-view.c (selection_received): don't set the end date
-	for the pasted components, since it will be recalculated when the start
-	date is set, thus keeping the same duration than the original
-	cut/copied component. Fixes #5836
-
-2001-07-30  Damon Chaplin  <damon@ximian.com>
-
-	* gui/gnome-cal.c: 
-	* gui/calendar-commands.c (clear_folder_bar_label): started some code
-	to show the currently displayed dates in the folder title bar.
-	Unfinished.
-
-	* gui/e-itip-control.c (set_date_label):
-	* conduits/todo/todo-conduit.c (local_record_from_comp): 
-	* conduits/calendar/calendar-conduit.c (local_record_from_comp): free
-	the CalComponentDateTimes. (Note the iTIP control needs updating for
-	timezone support.)
-
-	* cal-util/cal-component.c: Changed CalComponentDateTime so that the
-	TZID is malloc'ed and freed rather than being a pointer to a static
-	string. This was causing problems as sometimes we were freeing the
-	string that was being pointed to, so we got corrupted TZIDs.
-
-	* gui/comp-util.c (cal_comp_util_add_exdate): set TZID to NULL.
-	DATE values do not have timezones.
-
-	* gui/e-week-view.c: 
-	* gui/e-day-view.c: Moved 'Paste' after the New Appointment commands,
-	since I think they are more commonly-used. Also added underlined
-	accelerator keys.
-
-	* gui/e-calendar-table.c: changed 'Edit this task' to 'Open' in the
-	popup menu to be consistent with other folders, and separated from the
-	clipboard commands. Also changed to use EPopupMenu so the accelerators
-	work, and the masks may be useful at some point.
-
-	* gui/dialogs/recurrence-page.c: use DATE values for UNTIL, since
-	that makes it simpler. Fixes bug #5034.
-
-	* gui/calendar-config.c (calendar_config_set_timezone): strdup the
-	location string. Fixes bug #4990.
-
-	* gui/tag-calendar.c (tag_calendar_cb): take 1 off iend as the times
-	don't include the end time.
-
-	* gui/e-week-view-layout.c (e_week_view_layout_event): fixed
-	days_shown. Fixes bug #5709.
-
-	* cal-client/cal-client.c (cal_client_get_timezone): took out some
-	debugging messages.
-
-2001-07-30  Damon Chaplin  <damon@ximian.com>
-
-	* gui/dialogs/cal-prefs-dialog.glade: added Help button. Though of
-	course it doesn't do anything yet.
-
-2001-07-30  JP Rosevear  <jpr@ximian.com>
-
-	* gui/dialogs/meeting-page.c: Mark strings for translation
-
-2001-07-30  Rodrigo Moya <rodrigo@ximian.com>
-
-	* cal-client/client-test.c (cal_opened_cb): call
-	cal_client_get_free_busy for testing the new method
-
-	* pcs/cal-backend-file.c (cal_backend_file_get_free_busy): implemented
-
-2001-07-28  Federico Mena Quintero  <federico@ximian.com>
-
-	Fixes bug #5352.
-
-	* gui/dialogs/cal-prefs-dialog.c (cal_prefs_dialog_show): Added a
-	`page' argument so that we can select which page to show when
-	popping up the dialog.
-	(cal_prefs_dialog_construct): Added the `page' argument as well.
-	(cal_prefs_dialog_new): Likewise.
-
-	* gui/calendar-commands.c (settings_cmd): Set the page to the main
-	calendar settings one.
-
-	* gui/tasks-control.c (tasks_control_settings_cmd): Implemented
-	callback for the "Task Settings" command.
-	(verbs): Added the "TasksSettings" verb.
-	(pixmaps): Added an icon for the tasks settings command.
-
-2001-07-27  JP Rosevear  <jpr@ximian.com>
-
-	* conduits/calendar/calendar-conduit.c (local_record_from_comp):
-	recur is always in UTC
-	
-2001-07-27  JP Rosevear  <jpr@ximian.com>
-
-	* conduits/calendar/calendar-conduit.c: handle timezones
-	everywhere
-	(get_timezone): new function to get a timezone based
-	on a tzid
-	(get_default_timezone): get default timezone
-
-	* conduits/calendar/calendar-conduit.h: time zone field for the
-	context
-
-	* conduits/calendar/Makefile.am: link to bonobo conf
-
-	* conduits/todo/todo-conduit.c: handle timezones
-	everywhere
-	(get_timezone): new function to get a timezone based
-	on a tzid
-	(get_default_timezone): get default timezone
-
-	* conduits/todo/todo-conduit.h: time zone field for the
-	context
-
-	* conduits/todo/Makefile.am: link to bonobo conf
-	
-2001-07-27  Rodrigo Moya <rodrigo@ximian.com>
-
-	* gui/e-day-view-main-item.c (e_day_view_main_item_draw_day_event):
-	* gui/e-day-view-top-item.c (e_day_view_top_item_draw_long_event): 
-	* gui/e-week-view-event-item.c (e_week_view_event_item_draw_icons): 
-	initialize to NULL some pointers
-
-	* e-calendar-table.c (selection_received): deal correctly with
-	VCALENDAR objects
-	(e_calendar_table_copy_clipboard): g_strdup the value returned by
-	icalcomponent_get_as_ical_string
-
-2001-07-27  Federico Mena Quintero  <federico@ximian.com>
-
-	* gui/gnome-cal.c (gnome_calendar_set_query): Constify and set the
-	query sexp on the task pad's model as well.
-
-2001-07-27  Federico Mena Quintero  <federico@ximian.com>
-
-	* gui/cal-search-bar.[ch]: New files with a derivative of
-	ESearchBar that generates sexps for calendar queries directly.
-
-	* gui/gnome-cal.c (setup_widgets): Use CalSearchBar instead of
-	ESearchBar.
-
-	* gui/e-calendar-table.h (ECalendarTable): Removed the ->colors
-	array since it is handled by ETableExtras now.
-
-	* gui/e-calendar-table.[ch]: Removed the subset_model.  Now we use
-	the live query facility to filter tasks.  Removed the filter
-	function stuff as well.
-
-	* gui/e-tasks.c (e_tasks_construct): Use
-	calendar_model_set_cal_client() directly instead of
-	e_calendar_table_set_model().
-	(setup_widgets): Create a calendar search bar for the tasks
-	component.
-	(search_bar_sexp_changed_cb): Set the query sexp on the table model.
-	(e_tasks_on_filter_selected): Regenerate the query from the
-	selected category and the current sexp.
-	(update_query): New convenience function to recompute the real
-	query sexp.
-
-	* gui/gnome-cal.c (gnome_calendar_construct): Likewise.
-
-	* gui/e-calendar-table.c (e_calendar_table_set_cal_client):
-	Removed function; people are now supposed to get the model from
-	the calendar table and operate on it.
-
-	* gui/calendar-commands.c (verbs): Consistency fixes with the XML
-	file.
-	(pixmaps): Likewise.
-
-	* gui/Makefile.am (evolution_calendar_SOURCES): Added
-	cal-search-bar.[ch] to the list of sources.
-
-2001-07-20  Federico Mena Quintero  <federico@ximian.com>
-
-	* idl/evolution-calendar.idl (CompEditorFactory): New interface to
-	a centralized factory for calendar component editors.  Has
-	editExisting() and editNew() methods to edit an existing component
-	from a URI/UID pair, and to create a new component in a calendar
-	that is in a particular URI, respectively.
-
-	* gui/comp-editor-factory.[ch]: Implementation files for the
-	component editor factory.
-
-	* gui/GNOME_Evolution_Calendar.oaf.in: Added the CompEditorFactory
-	stuff.
-
-	* gui/Makefile.am (evolution_calendar_SOURCES): Added
-	comp-editor-factory.[ch] to the list of sources.
-
-2001-07-26  JP Rosevear  <jpr@ximian.com>
-
-	* gui/dialogs/meeting-page.c (invite_entry_changed): when an entry
-	has changed, iterate over the elements of the entry and add them
-	to the list if need be
-	(get_select_name_dialog): add a Chair Persons section
-
-	* gui/itip-utils.c (itip_send_comp): send the empty string as
-	subject if there is no summary
-	
-2001-07-26  JP Rosevear  <jpr@ximian.com>
-
-	* gui/itip-utils.c (itip_send_comp): send the empty string as
-	subject if there is no summary
-
-	* gui/dialogs/meeting-page.c (cleanup_attendees): free a list of
-	attendees
-	(meeting_page_fill_widgets): clean up attendee lists and fix typo
-	(find_match): add ability to return pos of match
-	(popup_delete_cb): if deletion happens, make sure to tidy up
-	delegation chain
-
-	* gui/dialogs/e-delegate-dialog.c (e_delegate_dialog_construct):
-	use the destination rather than text property
-	(e_delegate_dialog_get_delegate): ditto
-	(e_delegate_dialog_new): take name/address pair for dialog default
-
-	* gui/dialogs/e-delegate-dialog.h: update protos
-
-	* gui/e-itip-control.c (clean_up): only unref the object if we
-	have one
-	
-	* gui/itip-control-factory.c (stream_read): make sure we null
-	terminate the final buffer
-
-	* gui/itip-utils.c (itip_send_comp): strip the mailto: from the
-	organizer address if necessary
-
-2001-07-26  Damon Chaplin  <damon@ximian.com>
-
-	* gui/dialogs/recurrence-page.c (exception_select_row_cb): check that
-	the row passed in is valid. Sometimes we get the "row-selected"
-	signal for row 0 when there are no rows in the list. Fixes bug #4266.
-
-	* cal-client/cal-client.c (cal_client_get_object): prefetch all the
-	timezone data needed by the object, to try to avoid making Corba
-	calls all over the place. They can cause problems because they call
-	the GTK+ main loop recursively. This currently leads to an assertion
-	failure in the GnomeCanvas occasionally.
-
-2001-07-25  JP Rosevear  <jpr@ximian.com>
-
-	* gui/e-itip-control.c (e_itip_control_set_data): gracefully
-	handle the lack of a method
-
-2001-07-25  Rodrigo Moya <rodrigo@ximian.com>
-
-	* gui/e-day-view.c (selection_received_cb): check type of component
-	before actually pasting.
-	Deal with VCALENDAR components also (fixes bug #5140)
-
-	* gui/e-week-view.c (selection_received_cb): ditto
-
-	* cal-client/cal-client.c (cal_client_update_object): check the return
-	value from cal_component_get_as_string and don't call
-	GNOME_Evolution_Calendar_Cal_updateObjects if NULL
-
-2001-07-25  Damon Chaplin  <damon@ximian.com>
-
-	* gui/dialogs/comp-editor.c (pixmaps): used the new print preview icon.
-
-	* gui/print.c (range_selector_new): changed the 'Current day/week...'
-	strings to 'Selected day/week...' to make a little less confusing.
-	Fixes bug #5451.
-
-2001-07-25  JP Rosevear  <jpr@ximian.com>
-
-	* gui/dialogs/meeting-page.c (is_duplicate): see if the address is
-	already in the list of attendees
-	(duplicate_error): throw up an error dialog
-	(popup_delegate_cb): if the attendee has already delegated, delete
-	the old delegatee
-	(value_at): cast to kill warnings
-	(append_row): don't add the new attendee if they are already in
-	the list
-
-2001-07-24  Damon Chaplin  <damon@ximian.com>
-
-	* gui/dialogs/recurrence-page.c (get_exception_string): calculate
-	tmp_tm.tm_wday ourselves. strftime has a habit of crashing if you
-	have weird values here. I think this fixes bug #4574.
-
-2001-07-24  JP Rosevear  <jpr@ximian.com>
-
-	* gui/dialogs/meeting-page.c (value_at): stip the delto and
-	delfrom
-	(popup_delegate_cb): show a delegate dialog and add the new
-	delegatee and update the delegator
-	(add_section): listen for changes in a more direct manner
-	(get_select_name_dialog): add_section now takes a limit argument
-
-	* gui/dialogs/e-delegate-dialog.[hc]: New dialog to query the user
-	for a person to delegate to
-
-	* gui/dialogs/Makefile.am: build/install new files
-
-	* gui/Makefile.am: add ldadd line for ebook
-
-2001-07-21  Damon Chaplin  <damon@ximian.com>
-
-	* gui/e-week-view-event-item.c (e_week_view_event_item_draw): fixed
-	the test to see whether we should draw the icons.
-
-2001-07-22  Ettore Perazzoli  <ettore@ximian.com>
-
-	* gui/component-factory.c (get_local_file_name_for_folder_type):
-	New helper function.
-	(remove_folder): Add a @type arg and handle it, by deleting
-	"tasks.ics" instead of "calendar.ics" if the type is "tasks".  If
-	the type is not "tasks" or "calendar", report an
-	`UNSUPPORTED_TYPE' error.
-	(xfer_folder): Likewise.
-
-2001-07-21  Ettore Perazzoli  <ettore@ximian.com>
-
-	* gui/component-factory.c: Make folders of type "calendar" and
-	"tasks" user-creatable by setting `user_creatable' to %TRUE in the
-	`EvolutionShellComponentFolderType's.
-
-2001-07-19  Federico Mena Quintero  <federico@ximian.com>
-
-	* gui/dialogs/event-editor.h (event_editor_update_widgets):
-	Removed unused prototype.
-
-	* gui/dialogs/task-editor.h (task_editor_update_widgets):
-	Likewise.
-
-2001-07-19  JP Rosevear  <jpr@ximian.com>
-
-	* gui/e-itip-control.c (clean_up): free various data related
-	settings
-	(destroy): use cleanup and unref the clients
-	(e_itip_control_set_data): clean up before setting the data and
-	store the timezones in a top level component
-	(update_item): use cal_client_update_objects and our top level
-	(including the timezones)
-
-2001-07-19  Damon Chaplin  <damon@ximian.com>
-
-	* gui/dialogs/comp-editor.c (pixmaps): 
-	* gui/calendar-commands.c (pixmaps): updated to use new print icon.
-
-2001-07-17  Damon Chaplin  <damon@ximian.com>
-
-	* gui/dialogs/recurrence-page.c (init_widgets): don't show the time
-	in the EDateEdit widget for adding EXDATEs.
-
-	* cal-util/cal-component.c (cal_component_alarm_set_trigger): don't
-	set t.time.is_date to -1. It is a boolean flag, 0 or 1. We probably
-	don't want a date value, so we leave it at 0.
-
-2001-07-18  Rodrigo Moya <rodrigo@ximian.com>
-
-	* gui/e-day-view-main-item.c (e_day_view_main_item_draw_day_event):
-	do not discard drawing icon if mask is NULL
-
-	* gui/e-day-view-top-item.c (e_day_view_top_item_draw_long_event):
-	ditto
-
-2001-07-17  JP Rosevear  <jpr@ximian.com>
-
-	* gui/e-itip-control.c (get_next): find the next displayable
-	component
-	(get_prev): find the previous displayable component
-	(e_itip_control_set_data): use above
-	(prev_clicked_cb): ditto
-	(next_clicked_cb): ditto
-
-2001-07-17  Federico Mena Quintero  <federico@ximian.com>
-
-	Really fixes #4380.  The previous fix was necessary but not
-	sufficient; it worked for me because my system timezone happens to
-	match the Evolution timezone --- if they don't match, the bug
-	would persist.  Not matching is *not* an error; it is just a
-	matter of Unix sucking a lot and XST not being finished :)
-
-	* cal-util/timeutil.c (time_to_gdate_with_zone): New function.  We
-	cannot use g_date_set_time() anymore because it does not take
-	timezones into account.
-
-	* gui/gnome-cal.c (get_days_shown): Use the function above.
-
-	* gui/e-day-view.c (e_day_view_find_work_week_start): Likewise.
-
-	* gui/e-week-view.c (e_week_view_set_selected_time_range): Likewise.
-
-2001-07-17  Jon Trowbridge  <trow@ximian.com>
-
-	* gui/dialogs/meeting-page.c (invite_entry_changed): Print
-	a g_message when the list of invited people changes
-	in the SelectNames control.
-	(add_section): #if 0/#endif out some (broken?) code.
-	(get_select_name_dialog): Listen for changes in the
-	SelectNames control.
-
-2001-07-17  Damon Chaplin  <damon@ximian.com>
-
-	* gui/dialogs/e-timezone-dialog.c (e_timezone_dialog_destroy): destroy
-	the dialog widget here. Fixes bug #4198.
-
-2001-07-16  Damon Chaplin  <damon@ximian.com>
-
-	* gui/dialogs/task-page.c (task_page_fill_widgets): 
-	* gui/dialogs/event-page.c (event_page_fill_widgets): try to use
-	builtin timezones before getting them from the server. When creating
-	new events/tasks the timezones may not be on the server.
-
-	* gui/dialogs/event-page.c (event_page_fill_widgets): for all-day
-	events we subtract a day from the end date rather than add it.
-
-	* gui/dialogs/e-timezone-dialog.c (on_map_leave): ignore the event
-	if it isn't a GDK_CROSSING_NORMAL event. For some reason we are getting
-	leave events when the button is pressed, which meant that selecting
-	timezones in the map didn't work.
-
-	* gui/dialogs/comp-editor-util.c (comp_editor_dates): 
-	* gui/print.c (print_date_label): only free icaltimetype if not NULL.
-
-2001-07-12  Taylor Hayward  <taylorhayward@yahoo.com>
-
-	* gui/goto-dialog.glade:
-	* gui/meeting-mockup.glade:
-	* gui/alarm-notify�larm-notify.glade:
-	* gui/dialogs/alarm-page.glade:
-	* gui/dialogs/meeting-page.glade:
-	* gui/dialogs/recurrence-page.glade: Added missing underlined
-	shortcuts.
-
-2001-07-12  JP Rosevear  <jpr@ximian.com>
-	
-	* cal-util/cal-util.h: new proto
-
-	* cal-util/cal-util.c (cal_util_new_top_level): standard place to
-	get your top level calendar component
-
-	* pcs/cal-backend-file.c (create_cal): use it
-
-	* gui/itip-utils.c (itip_send_comp): ditto
-
-	* gui/e-calendar-table.c (e_calendar_table_copy_clipboard): ditto
-	
-2001-07-12  JP Rosevear  <jpr@ximian.com>
-
-	* gui/e-calendar-table.c (e_calendar_table_copy_clipboard): fix
-	typo breaking compilation
-
-	* gui/dialogs/meeting-page.c: fix include
-
-	* gui/dialogs/Makefile.am: build select names idl here
-
-	* gui/Makefile.am: remove select names compilation from here
-	
-2001-07-12  JP Rosevear  <jpr@ximian.com>
-
-	* gui/dialogs/task-details-page.c (task_details_page_set_dates):
-	guard against infinite loops with the updating boolean, fixes 4270
-
-2001-07-12  Rodrigo Moya <rodrigo@ximian.com>
-
-	* gui/e-calendar-table.c: added support for multiple selections in
-	cut/copy/paste. Also, it's now ready for the
-	s/update_object/update_objects change (I think)
-
-2001-07-11  Damon Chaplin  <damon@ximian.com>
-
-	* idl/evolution-calendar.idl: renamed updateObject to updateObjects
-	and removed the UID argument, since it can add/update multiple objects
-	at once. (It can't yet, but it will!)
-
-	* pcs/cal.c: 
-	* pcs/cal-backend.[hc]: 
-	* pcs/cal-backend-file.c: renamed update_object to update_objects and
-	got rid of the UID arg.
-
-	* cal-client/cal-client.c (cal_client_update_objects): new function to
-	add/update multiple objects in one go, i.e for iTIP and for importing
-	calendars.
-
-	* gui/print.c (print_date_label): fixed type bug.
-
-	* gui/e-week-view.[hc]: 
-	* gui/e-week-view-event-item.c: draw the timezone icons if the event's
-	DTSTART or DTEND is in a different timezone to the current one.
-	Note that we may want to change this so it compares the UTC offsets
-	rather than the TZIDs, since currently it will draw the icons for all
-	events coming from iTIP requests from other clients.
-
-2001-07-11  Federico Mena Quintero  <federico@ximian.com>
-
-	Fixes bug #4380 as well as some leftovers from the days of struct
-	tm and some uninitialized values.
-
-	* gui/gnome-cal.c
-	(gnome_calendar_on_date_navigator_selection_changed): Initialize
-	the icaltimetype structures completely.
-	(gnome_calendar_init): Do not reset priv->zone to NULL here, since
-	it was set by gnome_calendar_update_config_settings() from
-	setup_widgets().
-
-	* gui/calendar-model.c (set_completed): Do not set is_daylight.
-
-	* gui/e-day-view.c (e_day_view_convert_grid_position_to_time):
-	Likewise.
-
-	* gui/e-week-view.c (e_week_view_set_timezone): Likewise.
-
-	* cal-util/cal-recur.c (generate_instances_for_chunk): Likewise,
-	and initialize start_tt and end_tt completely.
-
-	* cal-util/timeutil.c (time_year_begin_with_zone): Likewise.
-	(time_month_begin_with_zone): Likewise.
-	(time_week_begin_with_zone): Likewise.
-	(time_day_begin_with_zone): Likewise.
-	(time_day_end_with_zone): Likewise.
-	(time_from_isodate): Likewise.
-
-	* gui/dialogs/task-page.c (task_page_fill_component): Initialize
-	icaltime before using it.
-
-	* gui/dialogs/event-page.c (event_page_fill_component): Likewise.
-
-	* gui/dialogs/recurrence-page.c (simple_recur_to_comp): Removed an
-	unused icaltimetype.
-
-	* gui/dialogs/task-details-page.c
-	(task_details_page_fill_component): Initialize icaltime before
-	using it.
-
-2001-07-11  JP Rosevear  <jpr@ximian.com>
-
-	* gui/component-factory.c: fix the calendar not exiting with a
-	gross hack because i don't have time to fix the ref counting right
-	now
-	
-2001-07-11  JP Rosevear  <jpr@ximian.com>
-
-	* gui/dialogs/meeting-page.c: be careful about adding and
-	stripping MAILTO:'s properly
-
-	* gui/dialogs/meeting-page.etspec: add missing columns
-
-	* gui/itip-utils.c (itip_strip_mailto): point to the real start of
-	the email address
-
-	* gui/itip-utils.h: add proto
-
-	* gui/itip-control-factory.c: get rid of the my address property
-
-	* gui/e-itip-control.c: use the users real identity to figure out
-	which attendee they are
-	(find_my_address): figure out who the user is among the attendees
-
-	* gui/e-itip-control.h: remove protos
-
-	* gui/dialogs/Makefile.am: extra dist etspecs
-
-	* gui/Makefile.am: ditto
-
-2001-07-11  Kjartan Maraas  <kmaraas@gnome.org>
-
-	* gui/e-calendar-table.c: Added a hack to get the last
-	string translated since xml-i18n-tools doesn't recognize
-	_click-to-add-message="Click here to add a task".
-	
-2001-07-10  Peter Williams  <peterw@ximian.com>
-
-	* gui/Makefile.am (BUILT_SOURCES): Move this higher so that
-	Makefile properly depends on us. Fixes distcheck.
-
-2001-07-11  Jason Leach  <jleach@ximian.com>
-
-	[Fix bug #4389: ETableSpecification still in e-calendar-table.c
-	file]
-	
-	* gui/e-calendar-table.etspec: New file containing the spec that
-	was in e-calendar-table.c as a big string.
-	
-	* gui/e-calendar-table.c (e_calendar_table_init): Use the spec
-	file instead of a string.
-	(e_calendar_table_get_spec): Removed this function, we don't need
-	it anymore.
-
-	* gui/e-tasks.c (e_tasks_setup_menus): Don't load from string,
-	from file instead.
-	
-	* gui/Makefile.am: Necessary changes to get the new .etspec file
-	installed.
-
-2001-07-10  Jason Leach  <jleach@ximian.com>
-
-	[Fix bug #4388: ETableSpecification still in meeting-page.c file]
-
-	* gui/dialogs/meeting-page.etspec: New file containing the spec
-	that was previously in meeting-page.c as a string.
-	
-	* gui/dialogs/meeting-page.c: One line change to get it to use
-	this spec file instead of a string.
-
-	* gui/dialogs/Makefile.am: Necessary changes to get the new
-	meeting-page.etspec installed.
-
-2001-07-10  Damon Chaplin  <damon@ximian.com>
-
-	* gui/calendar-model.c:
-	* gui/e-calendar-table.c:
-	* gui/e-day-view-main-item.c:
-	* gui/e-day-view-top-item.c:
-	* gui/e-day-view.[hc]:
-	* gui/e-week-view.c:
-	* gui/gnome-cal.c:
-	* gui/print.c:
-	* gui/dialogs/cal-prefs-dialog.c:
-	* gui/dialogs/comp-editor-util.c:
-	* gui/dialogs/event-page.c:
-	* pcs/cal-backend-file.c:
-	* pcs/query.c:
-	* cal-util/cal-component.[hc]: 
-	* cal-util/cal-recur.c: 
-	* cal-util/timeutil.[hc]: 
-	* cal-client/cal-client.[hc]: more timezone updates. I'm pretty much
-	done with the calendar code now, except for alarms and conduits,
-	which Federico and JP know more about. And there are a couple of
-	other minor things to fix. But it is still pretty buggy.
-
-2001-07-10  JP Rosevear  <jpr@ximian.com>
-
-	* gui/dialogs/meeting-page.c: Add popup support so you can delete
-	users from the list
-
-	* gui/dialogs/comp-editor.c (setup_widgets): fix typo
-
-2001-07-10  Federico Mena Quintero  <federico@ximian.com>
-
-	* gui/alarm-notify/alarm-queue.c (alarm_trigger_cb): Handle the
-	different alarm actions.
-	(display_notification): Do the alarm notification dialog here.
-
-	* gui/alarm-notify/alarm-notify-dialog.c (make_heading): Take in a
-	CalComponentVType, not a whole component.
-	(alarm_notify_dialog): Take in a CalComponentVType and the final
-	message instead of generating it ourselves.
-
-2001-07-09  Federico Mena Quintero  <federico@ximian.com>
-
-	* pcs/cal-backend-file.c (generate_alarms_for_comp): Pass the
-	parent vCalendar component as the timezone closure of
-	cal_recur_generate_instances().
-
-	* gui/dialogs/alarm-page.c (get_alarm_string): Make the string
-	consistent with the option menu text.
-	(get_alarm_string): Removed extra spaces from the last part of the
-	alarm string.
-
-2001-07-09  Federico Mena Quintero  <federico@ximian.com>
-
-	* gui/e-day-view.c (e_day_view_key_press): Use
-	e_utf8_from_gtk_event_key() so that we can input utf8 text
-	properly.
-	(e_day_view_cut_clipboard): Constify.
-	(e_day_view_on_cut): Constify.
-	(e_day_view_reshape_long_event): Remove unused variable.
-
-	* gui/e-week-view.c (e_week_view_key_press): Use
-	e_utf8_from_gtk_event_key() so that we can input utf8 text
-	properly.
-	(e_week_view_cut_clipboard): Constify.
-	(e_week_view_on_cut): Constify.
-
-	* cal-client/cal-client.c (cal_client_resolve_tzid_cb): Fix the
-	prototype so that this matches CalRecurResolveTimezoneFn.  Also
-	renamed it so that it is clear that it is supposed to be a
-	callback.
-
-2001-07-06  JP Rosevear  <jpr@ximian.com>
-
-	* gui/dialogs/meeting-page.c (init_widgets): connect to the entry
-	not the combo
-
-	* gui/dialogs/event-editor.c (set_menu_sens): set menu
-	sensitivities based on whether or not the meeting page is shown
-	(event_editor_init): call above
-	(event_editor_edit_comp): ditto
-	(schedule_meeting_cmd): ditto
-
-	* gui/dialogs/comp-editor.h: new proto
-
-	* gui/dialogs/comp-editor.c (comp_editor_set_ui_prop): new
-	function to allow for set of ui props (esp. "sensitive")
-	
-2001-07-06  JP Rosevear  <jpr@ximian.com>
-
-	* gui/dialogs/meeting-page.c (clear_widgets): actually clear some
-	widgets and hide/show widgets in the default setup
-	(meeting_page_destroy): destroy the address lists
-	(meeting_page_fill_widgets): allow the user to select among their
-	identities as a new organizer, or show the existing organizer as
-	label
-	(meeting_page_fill_component): set the "MAILTO:" bit of the
-	organizer to match spec, set CN properly if we know it
-	(get_widgets): load new widgets
-	(other_clicked_cb): handle "Other Organizer" click
-	(change_clicked_cb): handle "Change Organizer" click
-	(init_widgets): listen for clicks on new buttons
-
-	* gui/dialogs/comp-editor.c (comp_editor_remove_page): remove the
-	page from our internal list and unref it
-
-	* gui/itip-utils.c (itip_addresses_get): get the configure mail
-	identities
-	(itip_addresses_free): free a list of identities returned by
-	itip_addresses_get
-
-	* gui/itip-utils.h: remove obsolete protos, and new protos
-
-	* gui/gnome-cal.html: Remove ancient file
-
-2001-07-04  Federico Mena Quintero  <federico@ximian.com>
-
-	Fixes bug #4018 and what would be the analogous bugs for the other
-	component editors.
-
-	* gui/dialogs/comp-editor-page.h (CompEditorPageClass): New
-	virtual method "::focus_main_widget()".
-
-	* gui/dialogs/comp-editor-page.c
-	(comp_editor_page_focus_main_widget): New function.
-
-	* gui/dialogs/comp-editor.c (comp_editor_append_page): If we are
-	inserting the main page, ask it to focus its main widget.
-
-	* gui/dialogs/alarm-page.c (alarm_page_focus_main_widget):
-	Implemented.
-
-	* gui/dialogs/event-page.c (event_page_focus_main_widget):
-	Implemented.
-	#include "e-util/e-categories-config.h".
-
-	* gui/dialogs/meeting-page.c (meeting_page_focus_main_widget):
-	Implemented.
-
-	* gui/dialogs/recurrence-page.c
-	(recurrence_page_focus_main_widget): Implemented.
-
-	* gui/dialogs/task-details-page.c
-	(task_details_page_focus_main_widget): Implemented.
-
-	* gui/dialogs/task-page.c (task_page_focus_main_widget):
-	Implemented.
-
-2001-07-04  Federico Mena Quintero  <federico@ximian.com>
-
-	* gui/calendar-commands.c (clear_folder_bar_label): New function.
-	(calendar_control_activate): Clear the folder bar label; we really
-	don't have anything interesting to display.
-
-2001-07-03  JP Rosevear  <jpr@ximian.com>
-
-	* gui/dialogs/meeting-page.c: Add new columns for information
-	specification
-	(meeting_page_destroy): save the table state
-	(build_etable): load new table state
-
-	* gui/dialogs/task-editor.c (task_editor_destroy): unref pages
-
-	* gui/dialogs/event-editor.c (event_editor_destroy): unref pages
-
-	* gui/dialogs/comp-editor.c (setup_widgets): kill warning
-	(comp_editor_append_page): ref page passed in
-	(close_dialog): unref pages
-
-2001-07-03  Damon Chaplin  <damon@ximian.com>
-
-	* gui/e-day-view.c (query_obj_updated_cb): fix warning, and added
-	some debug messages.
-
-	* gui/dialogs/comp-editor-util.c (write_label_piece): 
-	* gui/e-day-view-top-item.c (e_day_view_top_item_draw): call mktime()
-	to set the weekday, though this is a temporary fix.
-
-2001-07-03  Damon Chaplin  <damon@ximian.com>
-
-	* pcs/cal-backend.[hc]: added virtual method to get a VTIMEZONE
-	component given a TZID. We need this to resolve TZIDs when expanding
-	an event using cal_recur_generate_instances() in query.c.
-
-	* pcs/cal-backend-file.c (cal_backend_file_get_timezone): implemented
-	virtual method.
-	(cal_backend_file_update_object): fixed bug, kind -> child_kind.
-
-	* pcs/query.c (func_occur_in_time_range): use the virtual method for
-	resolving TZIDs. The other way didn't work anyway, as we didn't have
-	the entire VCALENDAR with VTIMEZONEs in it.
-
-	* gui/dialogs/recurrence-page.c (init_widgets): 
-	(make_ending_until_special): moved the call to
-	e_date_edit_set_get_time_callback() from init_widgets to
-	make_ending_until_special(), since that is where the widget gets
-	created.
-
-	* gui/e-timezone-entry.c (e_timezone_entry_set_timezone): handle zone
-	being NULL.
-
-2001-07-02  Federico Mena Quintero  <federico@ximian.com>
-
-	* gui/dialogs/alarm-options.[ch]: New files with the alarm options
-	dialog; this configures the repeat/duration properties and the
-	options specific to each alarm action type.
-
-	* gui/dialogs/alarm-page.c (AlarmPagePrivate): Added the alarm
-	options button.  Also, keep an alarm structure which we are
-	editing and an alarm options dialog.
-	(init_widgets): Connect to the options button.
-	(add_clicked_cb): Clone the component we are editing instead of
-	creating a new one so that we preserve the data from the alarm
-	options dialog.
-	(button_options_clicked_cb): Pop up the alarm options dialog.
-
-	* cal-util/cal-component.c (cal_component_alarm_new): Doh,
-	initialize the other fields in the new alarm.
-
-2001-07-03  Damon Chaplin  <damon@ximian.com>
-
-	* cal-client/cal-client.[hc]
-	* cal-util/cal-component.c
-	* cal-util/cal-recur.[hc]
-	* cal-util/test-recur.c
-	* cal-util/timeutil.c
-	* gui/calendar-config.c
-	* gui/calendar-model.[hc]
-	* gui/comp-util.[hc]
-	* gui/e-calendar-table.c
-	* gui/e-day-view-main-item.c
-	* gui/e-day-view-top-item.c
-	* gui/e-day-view.[hc]
-	* gui/e-itip-control.c
-	* gui/e-timezone-entry.[hc]
-	* gui/e-week-view.[hc]
-	* gui/gnome-cal.[hc]
-	* gui/goto.c
-	* gui/tag-calendar.[hc]
-	* gui/dialogs/cal-prefs-dialog.c
-	* gui/dialogs/comp-editor-page.[hc]
-	* gui/dialogs/comp-editor-util.[hc]
-	* gui/dialogs/comp-editor.c
-	* gui/dialogs/e-timezone-dialog.[hc]
-	* gui/dialogs/event-page.c
-	* gui/dialogs/meeting-page.c
-	* gui/dialogs/recurrence-page.c
-	* gui/dialogs/task-details-page.c
-	* gui/dialogs/task-details-page.glade
-	* gui/dialogs/task-page.c
-	* idl/evolution-calendar.idl
-	* pcs/cal-backend-file.c
-	* pcs/cal-backend.c
-	* pcs/cal-backend.h
-	* pcs/cal.c
-	* pcs/query.c: timezone changes everywhere. There's still quite a
-	few things to update, and its not working well at present.
-
-2001-07-02  JP Rosevear  <jpr@ximian.com>
-
-	* gui/calendar-commands.c (publish_freebusy_cmd): publish
-	free/busy information for the currently viewed time range
-
-2001-07-02  Christopher James Lahey  <clahey@ximian.com>
-
-	* gui/Makefile.am (INCLUDES): Added $(BONOBO_CONF_CFLAGS).
-	(evolution_calendar_LDADD): Added $(BONOBO_CONF_LIBS).
-
-2001-07-02  Federico Mena Quintero  <federico@ximian.com>
-
-	Support for ATTACH, DESCRIPTION properties in alarm components.
-
-	* cal-util/cal-component.c (scan_alarm_property):  Deal with
-	ATTACH, DESCRIPTION properties.
-	(cal_component_alarm_get_attach): New function.  Libical is
-	actually bogus; supposedly icalattachtype structures are
-	refcounted but the property functions return them by value.
-	(cal_copmonent_alarm_set_attach): New function.
-	(cal_component_alarm_get_description): New function.
-	(cal_component_alarm_set_description): New function.
-
-2001-07-02  Federico Mena Quintero  <federico@ximian.com>
-
-	Support for repeat/duration properties in alarm components.
-
-	* cal-util/cal-component.h (CalAlarmRepeat): New structure that
-	pairs the repeat/duration values of an alarm component, which must
-	be set both together or not set at all.
-
-	* cal-util/cal-component.c (CalComponentAlarm): Added fields for
-	the repeat and duration properties.
-	(scan_alarm_property): Scan the DURATION and REPEAT properties.
-	(make_alarm): Nullify/initialize all the fields in the alarm.
-	(cal_component_alarm_get_repeat): New function.
-	(cal_component_alarm_set_repeat): New function.
-
-	* gui/dialogs/alarm-page.glade: Changed the label of display
-	alarms from "Show a dialog" to "Display a message".
-
-2001-07-02  JP Rosevear  <jpr@ximian.com>
-
-	* gui/dialogs/task-details-page.c
-	(task_details_page_fill_widgets): fill in delegated from field
-	
-2001-07-02  Rodrigo Moya <rodrigo@ximian.com>
-
-	* gui/dialogs/task-page.c (categories_clicked_cb): 
-	* gui/dialogs/event-page.c (categories_clicked_cb): use the new
-	self-contained e_categories_config_open_dialog_for_entry() function
-
-	* gui/e-week-view-event-item.c (e_week_view_item_draw_icons): 
-	* gui/e-day-view-top-item.c (e_day_view_reshape_long_event):
-	(e_day_view_reshape_day_event): ditto
-	* gui/e-day-view-main-item.c (e_day_view_main_item_draw_day_event):
-	use e_categories_config_get_icon_for() to retrieve the icon
-	associated with each category
-
-2001-07-02  JP Rosevear  <jpr@ximian.com>
-
-	* gui/e-itip-control.c (send_freebusy): implement
-
-	* cal-util/cal-component.c (set_attendee_list): add the delto
-	property rather than the delfrom property twice
-
-	* gui/dialogs/task-editor.c (task_editor_edit_comp): show
-	delegation info if appropriate
-	(delegate_task_cmd): delegate command
-	(cancel_task_cmd): cancel command
-	(refresh_task_cmd): refresh command
-
-	* gui/dialogs/task-details-page.c: Load new widgets
-	(task_details_page_show_delegation): show/hide delegation info widgets
-
-	* gui/dialogs/task-details-page.h: new proto
-
-	* gui/dialogs/event-editor.c (event_editor_edit_comp): free
-	attendee list when finished
-
-	* gui/dialogs/comp-editor.c (setup_widgets): explicitly show the
-	widgets, update pixmaps after the verbs have been added
-	(comp_editor_focus): don't do a show all
-
-2001-07-02  Federico Mena Quintero  <federico@ximian.com>
-
-	Fixes bug #1406.
-
-	* gui/calendar-config.c (config_read): Handle the options for the
-	task list colors.
-	(calendar_config_write): Ditto.
-	(calendar_config_get_tasks_due_today_color): New function.
-	(calendar_config_set_tasks_due_today_color): New function.
-	(calendar_config_get_tasks_overdue_color): New function.
-	(calendar_config_set_tasks_overdue_color): New function.
-	(calendar_config_configure_e_calendar_table): Use
-	e_table_model_changed() for the colors.
-
-	* gui/dialogs/cal-prefs-dialog.glade: Updated the options for the
-	task list and alarms.
-
-	* gui/dialogs/cal-prefs-dialog.c (cal_prefs_dialog_show_config):
-	Update the task list settings.
-	(cal_prefs_dialog_update_config): Ditto.
-
-	* gui/calendar-model.c (get_color): Deal with tasks for today as
-	well as overdue tasks.  Make it cleaner, even though we have to
-	duplicate a chunk of is_overdue().
-
-	* gui/calendar-commands.c (preferences_cmd): Renamed from
-	properties_cmd().
-
-2001-07-01  Rodrigo Moya <rodrigo@ximian.com>
-
-	* gui/e-day-view-main-item.c
-	(e_day_view_main_item_draw_day_event): draw icons per category
-
-	* gui/e-day-view-top-item.c
-	(e_day_view_top_item_draw_long_event): draw icons per category
-
-	* gui/e-day-view.c
-	(e_day_view_reshape_long_event):
-	(e_day_view_reshape_day_event): calculate space for category icons
-
-	* gui/e-week-view-event-item.c
-	(e_week_view_event_item_draw_icons): draw icons per category
-
-	* gui/e-week-view.c
-	(e_week_view_reshape_event_span): calculate space for category icons
-	
-2001-07-01  Rodrigo Moya <rodrigo@ximian.com>
-
-	* gui/e-day-view.c (e_day_view_*_clipboard): fixed clibpoard
-	command activation from the menu entries. CTRL-C and CTRL-X don't
-	work though, since it seems the key presses are being captured by
-	the text item
-
-	gui/e-week-view.c (e_week_view_*_clipboard): ditto
-
-2001-06-30  Federico Mena Quintero  <federico@ximian.com>
-
-	* gui/e-week-view-event-item.c
-	(e_week_view_event_item_button_press): Only set the
-	pressed_event_num and pressed_span_num if button 1 was pressed.
-	Fix up return values a bit.  This fixes bug #3780.
-
-	* gui/gnome-cal.c
-	(gnome_calendar_on_date_navigator_selection_changed): Doh, the
-	call for the day view was supposed to be
-	gnome_calendar_set_view(), not set_view().  Fixes bug #3779.
-
-2001-06-30  Rodrigo Moya <rodrigo@ximian.com>
-
-	* gui/tasks-control.c (tasks_control_cut_cmd): call
-	e_calendar_table_cut_clipboard with the correct object
-
-	(tasks_control_copy_cmd): ditto
-
-	(sensitize_commands): sensitize clipboard commands based on the
-	number of selected tasks
-
-2001-06-28  Rodrigo Moya <rodrigo@ximian.com>
-
-	* gui/e-calendar-table.[ch] (e_calendar_table_cut_clipboard),
-	(e_calendar_table_copy_clipboard),
-	(e_calendar_table_paste_clipboard): new functions for allowing the
-	execution of clipboard-related commands
-
-	* gui/tasks-control.c (tasks_control_cut_cmd),
-	(tasks_control_copy_cmd), (tasks_control_paste_cmd): added
-	callbacks for the new clipboard-related menu entries
-
-2001-06-28  Rodrigo Moya <rodrigo@ximian.com>
-
-	* gui/component-factory.c: removed not-uses-anymore parameter in
-	call to evolution_shell_component_new
-
-	* gui/gnome-cal.[ch] (gnome_calendar_cut_clipboard),
-	(gnome_calendar_copy_clipboard), (gnome_calendar_paste_clipboard):
-	new functions for allowing execution of clipboard-related commands
-
-	* gui/e-day-view.[ch] (e_day_view_cut_clipboard),
-	(e_day_view_copy_clipboard), (e_day_view_paste_clipboard): ditto
-
-	* gui/e-week-view.[ch] (e_week_view_cut_clipboard),
-	(e_week_view_copy_clipboard), (e_week_view_paste_clipboard): ditto
-
-2001-06-27  Rodrigo Moya <rodrigo@ximian.com>
-
-	* gui/calendar-commands.c (cut_event_cmd),
-	(copy_event_cmd), (paste_event_cmd): added callbacks for the new
-	clipboard-related menu entries
-
-2001-06-27  Ettore Perazzoli  <ettore@ximian.com>
-
-	* gui/component-factory.c (factory_fn): Pass NULL as the
-	@external_uri_schemas argument to
-	`evolution_shell_component_new()'.
-
-2001-06-27  Peter Williams  <peterw@ximian.com>
-
-	* conduits/*/Makefile.am (INCLUDES): More srcdir != builddir
-	fixes.
-
-2001-06-27  Rodrigo Moya <rodrigo@ximian.com>
-
-	* gui/e-calendar-table.c (selection_received): fixed
-	(e_calendar_table_on_copy): fixed
-
-2001-06-26  Federico Mena Quintero  <federico@ximian.com>
-
-	* idl/evolution-calendar.idl (CalAlarmInstance): Renamed the occur
-	field to occur_start; added an occur_end field.  This way we can
-	present the complete times for the occurrence from the server.
-
-	* cal-util/cal-component.h (CalAlarmInstance): Likewise.
-
-	* pcs/cal-backend-file.c (add_alarm_occurrences_cb): Fill the new
-	fields appropriately.
-	(generate_absolute_triggers): Likewise; we use -1 in case the
-	component has no DTSTART or DTEND because there are no meaningful
-	occurrence dates here.
-	(fill_alarm_instances_seq): Fill in the new fields.
-
-	* cal-client/cal-client.c (build_alarm_instance_list): Likewise.
-
-	* gui/alarm-notify/alarm-notify-dialog.c (alarm_notify_dialog):
-	Take in both the occur_start and occur_end times.
-
-	* gui/goto.c (goto_dialog): Free the dlg structure on the bail-out
-	cases.
-
-	* gui/dialogs/event-page.c (get_widgets): Do not assert if we
-	cannot find the main widget; just return FALSE.
-
-	* gui/dialogs/alarm-page.c (get_widgets): Likewise.
-
-	* gui/dialogs/task-page.c (get_widgets): Likewise.
-
-	* gui/dialogs/task-details-page.c (get_widgets): Likewise.
-
-	* gui/dialogs/meeting-page.c (get_widgets): Likewise.
-
-2001-06-25  Peter Williams  <peterw@ximian.com>
-
-	* conduits/calendar/Makefile.am (INCLUDES): Fixes for
-	srcdir != builddir. Link to the static libwombat.
-
-	* conduits/todo/Makefile.am (INCLUDES): Here too.
-
-2001-06-24  Federico Mena Quintero  <federico@ximian.com>
-
-	* gui/alarm-notify/notify-main.c (main): Initialize libglade.
-
-	* pcs/cal-backend-file.c (compute_alarm_range):
-	icaldurationtype_as_int() will now return a negative value if
-	dur->is_neg is true, so we need to flip the sign of some
-	operations here.
-	(add_alarm_occurrences_cb): Likewise.
-
-	* pcs/cal-backend-db.c (compute_alarm_range): Likewise.
-	(add_alarm_occurrences_cb): Likewise.
-
-2001-06-24  Federico Mena Quintero  <federico@ximian.com>
-
-	* gui/alarm-notify/alarm-notify.c: Converted to use BonoboXObject.
-
-	* gui/gnome-cal.c (gnome_calendar_open): Ask the alarm
-	notification service to add the calendar and tasks URIs.
-	(add_alarms): New function.
-
-	* gui/alarm-notify/notify-main.c (main): Doh, fixed typo in the
-	OAFIID.
-	(main): Initialize and shut down gnome-vfs.
-
-	* gui/Makefile.am (IDLS): Added evolution-calendar.idl, sigh.
-	(evolution_calendar_SOURCES): Added the files generated from the IDL.
-
-	* gui/alarm-notify/alarm-queue.c (alarm_trigger_cb): New function
-	used when an alarm is triggered.
-
-	* gui/dialogs/Makefile.am: Removed the alarm-notify-dialog files;
-	they are now in gui/alarm-notify.
-
-	* gui/alarm-notify/Makefile.am: Added the alarm-notify-dialog
-	files.
-
-	* pcs/cal.c (cal_forget_password): This was incorrectly named
-	cal_client_forget_password(); renamed it.
-
-	* gui/main.c (main): Initialize and shut down gnome-vfs.
-
-2001-06-23  Federico Mena Quintero  <federico@ximian.com>
-
-	* gui/e-calendar-table.c (task_compare_cb): New function to
-	compare tasks like the Pilot task list.
-
-	* cal-util/cal-component.h (CalComponentField): Added a
-	semi-hackish CAL_COMPONENT_FIELD_COMPONENT.  In the ETable model,
-	it is intended to return a pointer to the component itself.
-
-	* gui/calendar-model.c (calendar_model_value_at): Return the
-	component itself for CAL_COMPONENT_FIELD_COMPONENT.  Be more
-	paranoid about invalid columns.
-	(calendar_model_set_value_at): Be more paranoid about invalid
-	columns.
-	(calendar_model_duplicate_value): Ref the component field.
-	(calendar_model_initialize_value): Deal with the component field.
-	(calendar_model_value_is_empty): Likewise.
-	(calendar_model_value_to_string): Likewise.
-
-2001-06-22  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* gui/Makefile.am: Added itip-control-factory.* to the build.
-
-2001-06-22  Rodrigo Moya <rodrigo@ximian.com>
-
-	* pcs/cal.[ch] (cal_get_password): new function for the backends to
-	be able to call the getPassword method on the associated
-	WombatClient
-	(cal_forget_password): ditto for the forgetPassword method
-
-2001-06-22  Rodrigo Moya <rodrigo@ximian.com>
-
-	* idl/evolution-calendar.idl: changed getFreeBusy method to return
-	a CalObj instead of a sequence
-
-	* cal-client/cal-client.[ch] (cal_client_get_free_busy): changed it to
-	work like the cal_client_get_object function, that is, it does not
-	return anymore a list of UIDs, but a CalClientGetStatus code, and
-	added a new parameter for the caller to get the component back when
-	this function returns
-	(cal_client_open): aggregate WombatClient interface to the CalListener
-	being used
-
-	* pcs/cal-backend-db.c, pcs/cal-backend-file.c (..get_free_busy): set
-	return value to "char *" as it will be returning a FreeBusy object,
-	and not a list of UIDs
-
-	* pcs/cal-backend.[ch] (cal_backend_get_free_busy): ditto
-
-	* pcs/cal.c (cal_construct): queryInterface on the listener to obtain
-	the WombatClient interface
-
-2001-06-21  JP Rosevear  <jpr@ximian.com>
-
-	* gui/main.c (main): update to new call
-
-	* gui/e-itip-control.[hc]: break the widget bits out on their own
-	into a proper object, basic stuff seems to be working again
-	
-	* gui/itip-control-factory.c: put the control specific bits here
-	from e-itip-control.c
-
-	* gui/itip-control-factory.h: new header
-
-2001-06-21  JP Rosevear  <jpr@ximian.com>
-
-	* gui/dialogs/Makefile.am (gladedir): add include path
-
-	* gui/dialogs/comp-editor.c (setup_widgets): remove buttons and
-	use evolution's standard ui config
-
-	* gui/print.c (print_comp_item): print description text
-
-2001-06-21  Rodrigo Moya <rodrigo@ximian.com>
-
-	* cal-client/cal-client.[ch]:
-	(cal_client_init): create a WombatClient when creating a CalClient
-	object, so that we can receive authentication notifications from
-	the wombat
-	(cal_client_destroy): destroy the WombatClient object when dying
-	(cal_client_set_auth_func): new function to set the authentication
-	function to be called when a password is required by the calendar
-	server (through the WombatClient object)
-	(cal_client_get_free_busy): new function for calling the new IDL
-	method Cal::getFreeBusy
-
-	* gui/alarm-notify/Makefile.am: add libwombat to LDADD
-
-	* gui/Makefile.am: add libwombat to LDADD
-
-2001-06-20  Dave Camp  <dave@ximian.com>
-
-	* gui/itip-utils.c (itip_send_comp): Changed attach_data
-	to be a GNOME_Evolution_Composer_AttachmentData rather than a
-	CORBA_char*.
-
-2001-06-20  JP Rosevear  <jpr@ximian.com>
-
-	* gui/dialogs/comp-editor.c (print_cmd): print menu command
-	(print_preview_cmd): ditto for print preview
-	(print_setup_cmd): ditto for print setup
-	(comp_editor_set_cal_client): listen for updated and removed
-	signals
-	(obj_updated_cb): if the item changes else where, query the user
-	for the course of action
-	(obj_removed_cb): ditto for removal
-
-	* gui/print.c (print_setup): rudimentary page setup support
-	(print_comp): rudimentary individual event/task printing support
-
-	* gui/print.h: new protos
-
-	* gui/dialogs/changed-comp.[hc]: dialog to query the user about
-	what to do when a item is changed elsewhere
-
-	* gui/dialogs/Makefile.am: build new files
-
-	* gui/dialogs/send-comp.c (send_component_dialog): remove useless
-	assignment
-	
-2001-06-20  Rodrigo Moya <rodrigo@ximian.com>
-
-	* idl/evolution-calendar.idl: added getFreeBusy method
-
-	* pcs/cal.c (impl_Cal_get_free_busy): implementation of the new
-	getFreeBusy added method
-	
-	* pcs/cal-backend.[ch]: added new virtual method to the CalBackend
-	class (get_free_busy)
-
-	* pcs/cal-backend-db.c (cal_backend_db_get_free_busy): new function,
-	not implemented yet
-
-	* pcs/cal-backend-file.c (cal_backend_file_get_free_busy): new funtion,
-	not implemented yet
-
-2001-06-20  Damon Chaplin  <damon@ximian.com>
-
-	* gui/calendar-config.[hc]:
-	* gui/gnome-cal.[hc]: 
-	* gui/tasks-control.c (tasks_control_activate): 
-	* gui/calendar-commands.c (calendar_control_activate): moved the
-	function to check for a default timezone to calendar-config.c, and
-	also used it in the tasks control.
-
-	* gui/dialogs/e-timezone-dialog.h: #include <gtk/gtkwidget.h> fix.
-
-2001-06-20  Damon Chaplin  <damon@ximian.com>
-
-	* gui/calendar-commands.c (calendar_control_activate): 
-	* gui/gnome-cal.[hc]: added code to show the timezone dialog if the
-	user hasn't set a default timezone yet.
-
-	* gui/dialogs/e-timezone-dialog.c (e_timezone_dialog_add_timezones): 
-	set the "None" item string before adding it to the combo, to stop the
-	combo putting "None" in the entry initially.
-
-2001-06-19  Rodrigo Moya <rodrigo@ximian.com>
-
-	* gui/e-calendar-table.[ch]: added cut/copy/paste support. It works
-	with single selections (a single component selected) and with
-	multiple ones (several components selected)
-
-2001-06-19  Damon Chaplin  <damon@ximian.com>
-
-	* gui/dialogs/event-page.c: if the timezones of the start and end of
-	the event are the same, then if the start timezone is changed we
-	change the end timezone as well, since that is what most users will
-	want.
-
-2001-06-19  Damon Chaplin  <damon@ximian.com>
-
-	* pcs/cal.c: 
-	* idl/evolution-calendar.idl: 
-	* cal-client/cal-client.[hc]: removed stuff to get builtin timezone
-	info from the server.
-
-2001-06-19  Damon Chaplin  <damon@ximian.com>
-
-	* gui/dialogs/cal-prefs-dialog.c: added a 'Time zone' setting. Also
-	rearranged a little, adding a new 'General' page, since we had too
-	many settings on the 'Calendar' page.
-
-	* gui/e-timezone-entry.[hc]: 
-	* gui/dialogs/e-timezone-dialog.[hc]: 
-	* gui/dialogs/comp-editor.c: 
-	* gui/dialogs/comp-editor-page.[hc]: 
-	* gui/dialogs/event-page.c: 
-	* gui/dialogs/task-details-page.c: 
-	* gui/dialogs/task-page.c: removed CalClient stuff. The timezone dialog
-	now uses the timezone data directly from the client's libical library.
-
-2001-06-19  JP Rosevear  <jpr@ximian.com>
-
-	* gui/dialogs/task-editor.c (task_editor_init): add ui
-	(forward_cmd): implement forward command
-
-	* gui/dialogs/comp-editor.c (save_as_ok): bug fix, seems to work
-	now
-	
-2001-06-19  JP Rosevear  <jpr@ximian.com>
-
-	* gui/control-factory.c (control_factory_init): add auto exit unref
-
-	* gui/component-factory.c (destroy_cb): destroy our selves if we
-	have no more shells
-	(component_factory_init): add auto exit unref
-	
-2001-06-19  JP Rosevear  <jpr@ximian.com>
-
-	* gui/Makefile.am: don't compile or install the old meeting edit
-	stuff
-
-	* gui/e-week-view.c: ditto
-
-	* gui/e-day-view.c: Remove scheduling menu option
-	
-2001-06-19  JP Rosevear  <jpr@ximian.com>
-
-	* gui/itip-utils.c: add some needed commas
-	(itip_send_comp): if publishing, don't set the to list and show
-	the message.  unless publishing, just send the email
-
-	* gui/Makefile.am: remove typo
-	
-2001-06-19  JP Rosevear  <jpr@ximian.com>
-
-	* gui/dialogs/send-comp.c: itip/imip send dialog
-
-	* gui/dialogs/send-comp.h: new proto
-
-	* gui/dialogs/recurrence-page.c (recurrence_page_set_dates): only
-	use the weekday picker if visible
-
-	* gui/dialogs/meeting-page.c: just show the meeting list
-
-	* gui/dialogs/event-editor.c (event_editor_edit_comp): remove the
-	meeting page if no attendees
-	(schedule_meeting_cmd): schedule a meeting menu item
-	(refresh_meeting_cmd): refresh meeting request menu item
-	(cancel_meeting_cmd): ditto for cancel
-	(forward_cmd): send as attachment
-
-	* gui/dialogs/comp-editor.c (comp_editor_remove_page): remove page
-	from dialog
-	(comp_editor_show_page): show a given page
-	(comp_editor_get_current_comp): return a cal component
-	representing the current widget state
-	(comp_editor_save_comp): save the cal component
-	(comp_editor_delete_comp): delete the cal component
-	(comp_editor_send_comp): send the cal component
-	(comp_editor_merge_ui): merge xml in to the bonobo gui
-	(setup_widgets): use a bonobo window instead of a gtk window, add menus again
-	(save_as_cmd): save to file on disk - still broken
-	(save_close_cmd): close menu command
-	(save_close_cmd): save and close menu command
-
-	* gui/dialogs/comp-editor.h: new protos
-
-	* gui/dialogs/cancel-comp.c (cancel_component_dialog): itip/imip
-	cancellation dialog
-
-	* gui/dialogs/cancel-comp.h: new proto
-
-	* gui/dialogs/Makefile.am: build new files
-
-	* gui/dialogs/comp-editor-page.c
-	(comp_editor_page_notify_needs_send): emit needs_send signal
-
-	* gui/dialogs/comp-editor-page.h: new signal protos
-
-	* gui/itip-utils.c (itip_send_comp): new function to send cal
-	components
-
-	* gui/itip-utils.h: new proto
-
-	* gui/e-itip-control.c (pstream_load): trim using cal-component
-	wrapper stuff
-	(accept_button_clicked_cb): use itip_send_comp
-	(tentative_button_clicked_cb): ditto
-	(decline_button_clicked_cb): ditto
-
-	* gui/Makefile.am: compile select name idl stuff
-
-	* cal-util/cal-component.c (cal_component_get_organizer): get the organizer
-	(cal_component_set_organizer): set the organizer
-	(cal_component_get_recurid): get the recurrence id
-	(cal_component_set_recurid): set the recurrence id
-	(set_attendee_list): actually set the attendee list
-	(get_attendee_list): build the attendee list
-
-	* cal-util/cal-component.h: new protos
-
-2001-06-19  Damon Chaplin  <damon@ximian.com>
-
-	* gui/dialogs/task-details-page.glade: 
-	* gui/dialogs/task-page.glade: 
-	* gui/dialogs/event-page.glade: added timezone fields. Also moved the
-	'All Day' flag into an alignment so it doesn't mess up the height of
-	the other widgets.
-
-	* gui/dialogs/task-details-page.c: 
-	* gui/dialogs/task-page.c: 
-	* gui/dialogs/event-page.c: added code to handle the timezone fields.
-	This still needs to be hooked up when the libical code is finished.
-
-	* gui/dialogs/e-timezone-dialog.c (on_map_leave): new function to
-	clear the preview label and turn off the highlighted point on the
-	map when you move the mouse outside it.
-	(find_selected_point): new function to try to find the point
-	corresponding to the text in the combo.
-	(on_combo_changed): call the above function to update the selected
-	point.
-	(on_map_leave): turn off the preview point & label when the mouse
-	leaves the map.
-	(e_timezone_dialog_set_cal_client): changed it so that selecting "None"
-	clears the entry.
-	
-	* gui/dialogs/comp-editor-page.[hc]: added set_cal_client() virtual
-	method since some pages need to access the CalClient to get timezone
-	information. Also added comp_editor_page_set_cal_client() to call
-	the virtual method.
-
-	* gui/dialogs/comp-editor.c (comp_editor_set_cal_client): called
-	comp_editor_page_set_cal_client() on each page.
-
-	* gui/calendar-config.c: added functions to get & set the timezone.
-
-2001-06-18  Eskil Heyn Olsen  <eskil@eskil.dk>
-
-	* conduits/calendar/calendar-conduit.c: (comp_from_remote_record),
-	(check_for_slow_setting), (conduit_get_gpilot_conduit):
-	* conduits/todo/todo-conduit.c: (check_for_slow_setting),
-	(conduit_get_gpilot_conduit):
-	Tweaked for some gnome-pilot api changes
-
-2001-06-15  Federico Mena Quintero  <federico@ximian.com>
-
-	* gui/calendar-view.[ch]: New files with the generic calendar view
-	object.  It sucks that we have to implement at least two classes
-	to define a GalView and its factory.
-
-	* gui/calendar-view-factory.[ch]: New files; factory for calendar
-	views.
-
-	* gui/gnome-cal.h (GnomeCalendarViewType): Moved from gnome-cal.c
-	and renamed from ViewType.  We no longer use strings to identify
-	the view types.
-
-	* gui/gnome-cal.c (gnome_calendar_get_view_type): New function.
-	(set_view): Renamed from gnome_calendar_set_view_internal().
-	(gnome_calendar_set_query): Made public; renamed from set_query().
-	(gnome_calendar_setup_view_menus): New function to set up the view
-	collection and the GalViewMenus.
-	(gnome_calendar_discard_view_menus): New function to discard them.
-
-	* gui/calendar-commands.c (calendar_control_activate): Set up the
-	GalView menus.
-	(calendar_control_deactivate): Discard the GalView menus.
-
-	* gui/e-day-view.c: #include <gtk/gtkinvisible.h>
-
-	* gui/dialogs/comp-editor.c (comp_editor_get_type): The type info
-	structure should be static.
-
-2001-06-15  Rodrigo Moya <rodrigo@ximian.com>
-
-	* gui/e-day-view.c (selection_received): generate a new UID
-	when pasting
-
-	* gui/e-week-view.c (selection_received): ditto
-
-2001-06-15  Rodrigo Moya <rodrigo@ximian.com>
-
-	* gui/e-day-view.c (selection_received): finished implementation
-	of Paste stuff
-
-	* gui/e-week-view.c (selection_received): ditto
-
-2001-06-14  Rodrigo Moya <rodrigo@ximian.com>
-
-	* gui/e-day-view.[ch]: added popup menu items for cut/copy/paste
-
-	* gui/e-week-view.[ch]: ditto
-
-2001-06-14  Damon Chaplin  <damon@ximian.com>
-
-	* gui/e-timezone-entry.[hc]: new widget to enter a timezone.
-
-	* gui/Makefile.am (evolution_calendar_SOURCES): added the above.
-	* gui/Makefile.am (evolution_calendar_LDADD): had to move
-	libcal-dialogs.a above libmiscwidgets.a to get it to compile.
-
-2001-06-14  Damon Chaplin  <damon@ximian.com>
-
-	* gui/dialogs/e-timezone-dialog.[hc]: 
-	* gui/dialogs/e-timezone-dialog.glade: new dialog for setting the
-	time zone.
-
-	* gui/dialogs/Makefile.am: added timezone dialog files.
-
-	* idl/evolution-calendar.idl: added CalTimezoneInfo struct and seq,
-	and getBuiltinTimezoneInfo method.
-
-	* pcs/cal.c (impl_Cal_get_builtin_timezone_info): implemented method.
-	(cal_class_init): added method to epv.
-	
-	* cal-client/cal-client.c (struct CalClientPrivate): added
-	timezone_info array to contain cached info on builtin timezone city
-	names and coordinates.
-	(cal_client_get_builtin_timezone_info): new function to get the info
-	about builtin timezones.
-
-	* cal-client/cal-client.h: added CalTimezoneInfo struct, to contain
-	the city names and coords of the builtin timezones.
-
-2001-06-13  JP Rosevear  <jpr@ximian.com>
-
-	* gui/dialogs/comp-editor-util.c (comp_editor_date_label): remove
-	unnecessary space
-
-	* gui/dialogs/task-page.c (task_page_set_summary): indicate we are
-	updating, Fixes #3307
-
-2001-06-13  JP Rosevear  <jpr@ximian.com>
-
-	* gui/dialogs/task-details-page.c (task_details_page_set_dates):
-	set the completed time in the date editor if appropriate
-
-	* gui/dialogs/task-page.c (task_page_set_dates): if we are
-	updating, return
-	(complete_date_changed): don't returns if we are updating - the
-	guards are done in the calling function
-	(status_changed): indicate when we are updating and when we are
-	finished, round the completion time to the nearest minute
-	(percent_complete_changed): indicate when are updating and when we
-	are finished
-	(percent_complete_changed): notify of the date change after the
-	option menu is updated
-	
-2001-06-11  Rodrigo Moya <rodrigo@ximian.com>
-
-	* gui/e-day-view.[ch]: added cut&paste support, by using a GtkInvisible
-	widget to manage the clipboard selections.
-	
-	* gui/e-week-view.[ch]: ditto
-
-2001-06-08  Iain Holmes  <iain@ximian.com>
-
-	* gui/component-factory.c: Removed the executive-summary includes.
-	(component_factory_init): Don't init the summary factory.
-
-	* gui/calendar-summary.[ch]: Removed.
-
-	* gui/Makefile.am: Remove executive-summary stuff, move some libs 
-	around a bit.
-
-2001-06-04  JP Rosevear  <jpr@ximian.com>
-
-	* gui/dialogs/recurrence-page.c (recurrence_page_set_dates):
-	update the blocked/selected days if the starting day of the
-	appointment changes, fixes #2188
-
-	* gui/dialogs/task-details-page.h: tidy proto
-
-2001-06-03  Ettore Perazzoli  <ettore@ximian.com>
-
-	* gui/e-itip-control.c: #include <bonobo/bonobo-context.h> instead
-	of <bonobo/bonobo-running-context.h>.
-	* gui/tasks-control-factory.c: Likewise.
-
-	* gui/Makefile.am (evolution_calendar_LDADD): Move `$(DB3_LDADD)'
-	before libeutil.
-
-2001-06-01  JP Rosevear  <jpr@ximian.com>
-
-	* gui/Makefile.am: no longer build widget-util.*, the code has
-	been moved
-	
-2001-06-01  JP Rosevear  <jpr@ximian.com>
-
-	* gui/dialogs/event-page.c (make_date_edit): use new func
-
-	* gui/dialogs/task-details-page.c
-	(task_details_page_create_date_edit): ditto
-
-	* gui/dialogs/recurrence-page.c (make_ending_until_special): ditto
-
-	* gui/dialogs/comp-editor-util.c (comp_editor_new_date_edit):
-	rename date_edit_new function
-
-	* gui/dialogs/comp-editor-util.h: new proto
-
-	* gui/dialogs/task-page.c (task_page_set_summary): no longer any
-	need to block/unblock the handler
-	(task_page_create_date_edit): use new func
-	
-2001-06-01  JP Rosevear  <jpr@ximian.com>
-
-	* gui/.cvsignore: Update
-
-	* gui/evolution-calendar-control.c: Remove dead file
-
-	* gui/*.vcf: Remove dead files
-	
-2001-06-01  JP Rosevear  <jpr@ximian.com>
-
-	* gui/dialogs/comp-editor-page.[hc]: renamed from editor-page for
-	consistency, more complete implementation
-
-	* gui/dialogs/comp-editor.[hc]: More complete implementation
-
-	* gui/dialogs/*-page.*: The various pages needed to construct the
-	event and task dialogs
-	
-	* gui/dialogs/comp-editor-util.[hc]: useful utility functions for the
-	component editor pages to use
-
-	* gui/dialogs/Makefile.am: Build and install new files
-
-	* gui/event-editor*: Remove, obsoleted by the new comp-editor
-	stuff
-
-	* gui/dialogs/task-editor-dialog.glade: ditto
-
-	* gui/e-calendar-table.c (open_task): update to use comp editor
-	stuff
-
-	* gui/e-tasks.c (e_tasks_new_task): ditto
-
-	* gui/gnome-cal.c (gnome_calendar_edit_object): ditto
-
-	* gui/Makefile.am: don't build non-existent files nor try to
-	install them
-
-2001-06-01  JP Rosevear  <jpr@ximian.com>
-
-	* gui/e-itip-control.c (e_itip_control_factory_init): ditto
-
-	* gui/tasks-control-factory.c (tasks_control_factory_init):
-	auto_exit_unref the factory
-
-2001-06-01  Ettore Perazzoli  <ettore@ximian.com>
-
-	* gui/Makefile.am (evolution_calendar_LDADD): Add `$(DB3_LDADD)'.
-
-2001-05-29  Federico Mena Quintero  <federico@ximian.com>
-
-	* gui/e-tasks.c (e_tasks_get_calendar_table): New function.
-
-	* gui/tasks-control.c (tasks_control_activate): Connect to the
-	"selection_changed" signal of the tasks widget here, not in
-	tasks_control_new().  Also, update the sensitivity of the commands
-	here for the first time.
-	(tasks_control_deactivate): Disconnect from the signal here since
-	it only makes sense to monitor selection changes while the control
-	is active.
-	(selection_changed_cb): Removed hack that tested the presence of
-	the remote UI container.
-	(sensitize_commands): New function.
-
-2001-05-28  Damon Chaplin  <damon@ximian.com>
-
-	* gui/e-week-view-layout.[hc]: 
-	* gui/e-day-view-layout.[hc]: new files to contain layout code split
-	off from EDayView an EWeekView, so we can use it for printing.
-
-	* gui/print.c: rewritten to use the same layout code as the EDayView
-	and EWeekView widgets.
-
-	* gui/gnome-cal.c (gnome_calendar_get_task_pad_cal_client): added
-	function so we can get the CalClient used for the TaskPad for printing.
-
-	* gui/Makefile.am (evolution_calendar_SOURCES): added
-	e-day-view-layout.[hc] amd e-week-view-layout.[hc].
-
-	* cal-util/timeutil.c (time_week_begin): 
-	(time_week_end): added week_start_day argument.
-
-	* cal-util/cal-recur.c: added comments describing problems in it.
-
-2001-05-27  Rodrigo Moya <rodrigo@ximian.com>
-
-	* gui/component-factory.c (remove_folder): implemented the
-	'remove_folder' function for the calendar shell component
-	(xfer_folder): ditto for 'xfer_folder'
-
-2001-05-27  Dan Winship  <danw@ximian.com>
-
-	* gui/calendar-commands.c: #include
-	"evolution-shell-component-utils.h" rather than "e-gui-utils.h"
-	for e_pixmaps_update.
-
-	* gui/tasks-control.c: Likewise.
- 
-2001-05-25  Peter Williams  <peterw@ximian.com>
-
-	* gui/Makefile.am: Reference libeshell.la instead of libeshell.a.
-
-2001-05-23  Federico Mena Quintero  <federico@ximian.com>
-
-	* gui/dialogs/recurrence-page.c: Finished porting from the old
-	event-editor.c.  Made it store a clone of the component for when
-	we need to expand the recurrence set.
-
-	* gui/dialogs/event-page.c (event_page_get_dates): New function.
-
-	* gui/dialogs/editor-page.c (editor_page_set_dates): Renamed from
-	editor_page_set_dtstart(); now sets both DTSTART and DTEND.
-
-	* gui/dialogs/alarm-page.c (alarm_page_set_dates): Ahem, it is a
-	label, not an entry.
-
-2001-05-21  Federico Mena Quintero  <federico@ximian.com>
-
-	Fix bug #2831; the tasks toolbar and menu now have a button to
-	delete the selected tasks.
-
-	* gui/e-calendar-table.c (e_calendar_table_delete_selected): New
-	function.
-	(delete_cb): Use e_calendar_table_delete_selected().
-	(e_calendar_table_get_table): New function.
-
-	* gui/tasks-control.c (tasks_control_new_task_cmd): Handle the
-	delete command.
-	(selection_changed_cb): Change the sensitivity of the TasksDelete
-	command when the selection in the table changes.
-
-	* gui/e-tasks.c (table_selection_change_cb): Notify upstream when
-	the ETable selection changes.
-
-2001-05-18  Federico Mena Quintero  <federico@ximian.com>
-
-	Fix bug #2829.
-
-	* gui/dialogs/delete-comp.c (delete_component_dialog): Allow the
-	caller to specify whether just one or many components are to be
-	deleted.
-
-	* gui/e-calendar-table.c (tasks_popup_one): Popup menu definition
-	for when one and only one task is selected.
-	(tasks_popup_many): Likewise, for more than one task.
-	(e_calendar_table_on_right_click): Do not create a structure for
-	the closure data; we can simply pass the cal_table.  Use a
-	different menu depending on the number of selected tasks.
-	(mark_as_complete_cb): Renamed; now iterates over the selected
-	rows.
-	(delete_selected_components): New function to delete all the
-	selected components.
-	(delete_cb): Adjusted for delete_component_dialog().
-	(open_task): New function, simply open a CalComponent in the task
-	editor.
-	(open_task_by_row): Renamed; use open_task().
-
-	* gui/e-week-view.c (e_week_view_on_delete_appointment): Updated
-	for delete_component_dialog().
-
-	* gui/e-day-view.c (e_day_view_on_delete_appointment): Likewise.
-
-2001-05-16  Duncan Mak  <duncan@ximian.com>
-
-	* gui/Makefile.am (evolution_calendar_SOURCES): removed
-	editor-page.[ch] because they've now moved dialogs.
-
-2001-05-16  Federico Mena Quintero  <federico@ximian.com>
-
-	Split the event and task editors into different objects for the
-	separate pages; this way they can be shared by both editors.
-
-	* gui/dialogs/editor-page.[ch]: New abstract class for a page in a
-	calendar component editor.
-
-	* gui/dialogs/event-page.[ch]: Main page of an event editor.
-
-	* gui/dialogs/alarm-page.[ch]: Alarm page of a calendar component
-	editor.
-
-	* gui/dialogs/recurrence-page.[ch]: Recurrence page of a calendar
-	component editor.
-
-	* gui/dialogs/event-page.c (event_page_fill_widgets): Eeek, this
-	was missing a bunch of break statements.
-	(event_page_fill_component): Use a temporary variable rather than
-	allocating a struct icaltimetype.
-
-	* gui/dialogs/alarm-page.c (get_alarm_string): Do not use
-	fixed-size buffers.
-	(alarm_page_fill_widgets): Use cal_obj_uid_list_free().
-	(append_reminder): Now the list stores the plain CalComponentAlarm
-	structures in the row data.  We do *NOT* want to be frobbing the
-	component's data directly.  Rather, we clone the alarms from the
-	component and maintain them on our own.
-	(alarm_page_fill_component): Clone the alarms before adding them
-	to the component so that we maintain the invariant that the alarm
-	structures in the list did *not* come from the component.
-
-	* cal-util/cal-component.c (cal_component_add_alarm): Added
-	documentation.
-	(cal_component_remove_alarm): Added documentation.
-	(cal_component_remove_alarm): Do a lookup in our hash table of
-	alarms instead of scanning the whole component.
-	(CalComponentAlarm): Removed the `parent' field, since it was
-	unused.
-	(cal_component_free_alarm_uids): Removed function, since
-	cal_component_get_alarm_uids() is documented so that the user will
-	know that he must use cal_obj_uid_list_free().
-	(cal_component_alarm_clone): New function.
-
-2001-05-09  Federico Mena Quintero  <federico@ximian.com>
-
-	* gui/Makefile.am (evolution_calendar_SOURCES): Added
-	editor-page.[ch] to the list of sources.
-
-2001-05-09  JP Rosevear  <jpr@ximian.com>
-
-	* gui/event-editor.c (reminder_add_cb): switch on the correct
-	widget and map
-
-2001-05-08  JP Rosevear  <jpr@ximian.com>
-
-	* gui/e-itip-control.c (e_itip_control_factory): unref the
-	property bag when we finish with it
-
-	* gui/evolution-calendar-control.c (calendar_properties_init): ditto
-
-	* gui/control-factory.c (calendar_properties_init): ditto
-
-	* gui/calendar-summary.c (create_summary_view): ditto
-
-2001-05-08  JP Rosevear  <jpr@ximian.com>
-
-	* cal-util/cal-component.c (cal_component_alarm_free):
-	(cal_component_alarm_free): free the alarm component if it doesn't
-	have a parent, rather than if it does
-
-	* gui/Makefile.am: sanitize LD_ADDS and CFLAGS so the libtool
-	lines are shorter (fixes problem on solaries due to sed)
-
-2001-05-07  JP Rosevear  <jpr@ximian.com>
-
-	* pcs/cal-factory.[hc]: Convert to bonobo xobject
-
-	* pcs/cal.[hc]: Convert to bonobo xobject
-
-2001-05-07  Gediminas Paulauskas <menesis@delfi.lt>
-
-	* gui/event-editor.c (make_title_from_comp): conversion summary
-	from utf8 here, use translated strings as is.
-	(set_title_from_comp): reflect this, simplify.
-
-	* gui/dialogs/task-editor.c: updated copies of above functions here.
-
-	* gui/gnome-cal.c: use defines from widgets/misc/e-filter-bar.h for
-	consistency in "Show all".
-
-2001-05-04  JP Rosevear  <jpr@ximian.com>
-
-	* gui/calendar-model.c (calendar_model_append_row): unref the
-	calcomponent when we're done with it
-
-	* cal-util/cal-component.c (cal_component_gen_uid): free the iso
-	date string when we finish with it
-
-2001-04-27  JP Rosevear  <jpr@ximian.com>
-
-	* gui/e-meeting-edit.c (put_property_in_list): remove hardcoded
-	values
-	(edit_attendee): ditto, and there are only 4 roles now
-
-	* gui/e-meeting-dialog.glade: tweak
-
-	* gui/itip-utils.c: There shouldn't be an "other" role
-
-2001-04-26  JP Rosevear  <jpr@ximian.com>
-
-	 * gui/e-meeting-edit.c (edit_attendee): use enums not hard code
-	 values
-	
-2001-04-26  JP Rosevear  <jpr@ximian.com>
-
-	* gui/e-meeting-edit.c (add_button_clicked_cb):
-	icalparameter_new_rsvp now takes an enum
-
-2001-04-26  JP Rosevear  <jpr@ximian.com>
-
-	* cal-util/cal-component.c (cal_component_alarm_set_trigger): the
-	value type should be inited with ICAL_VALUE_* rather than
-	ICAL_*_VALUE because it is a param argument.
-
-2001-04-26  Federico Mena Quintero  <federico@ximian.com>
-
-	* gui/calendar-model.c (get_is_overdue): Replace "<" by "<=" in
-	the comparison for due dates against the current time.  This makes
-	tasks appear immediately as red when you click Now in the due date
-	popup field.
-
-	This is not a complete solution to the more general problem of
-	tasks staying the same color even if they become overdue while the
-	task list remains the same on the screen.  This has been logged as
-	bug #2399.
-
-2001-04-26  Ettore Perazzoli  <ettore@ximian.com>
-
-	* gui/dialogs/Makefile.am (INCLUDES): Add `$(EXTRA_GNOME_CFLAGS)'.
-
-2001-04-26  Dan Winship  <danw@ximian.com>
-
-	* conduits/todo/Makefile.am (libetodo_conduit_la_LIBADD): Remove
-	UNICODE_LIBS
-
-	* cal-client/Makefile.am (client_test_LDADD): Remove -lunicode
-
-2001-04-24  Duncan Mak  <duncan@ximian.com>
-
-	* gui/alarm-notify/notify-main.c (funny_trigger_cb): Fixed
-	Strftime so it uses the locale prefered way to display date/time. 
-	("%x %X" instead of "%Y/%m/%d %H:%M:%S")
-
-2001-04-21  Gediminas Paulauskas <menesis@delfi.lt>
-
-	* gui/calendar-summary.c: translate "Things to do" etc. and convert them
-	to utf8. Changed some link from helixcode to ximian.
-
-2001-04-18  Ettore Perazzoli  <ettore@ximian.com>
-
-	* gui/dialogs/Makefile.am (INCLUDES): Add
-	`-I$(top_srcdir)/calendar/cal-client',
-	`-I$(top_builddir)/calendar/cal-client'.
-	* gui/Makefile.am (INCLUDES): Likewise.
-
-	* cal-client/cal-query.h: #include "evolution-calendar.h".
-
-2001-04-17  Federico Mena Quintero  <federico@ximian.com>
-
-	* gui/event-editor.c (init_widgets): Connect to the "changed"
-	signal of the categories entry so that they will be applied
-	correctly.
-	(EventEditorPrivate): Added fields for the contacts button and
-	entry.
-	(init_widgets): Disable the contacts widgets as we do not support
-	them yet.
-	(get_widgets): Get the contacts widgets.
-
-	* gui/dialogs/task-editor.c (get_widgets): Get the contacts
-	button, which was missing.
-	(init_widgets): Disable the contacts widgets as we do not support
-	them yet.
-
-	* pcs/query.c (matches_text_list): Use e_utf8_strstrcasedecomp()
-	instead of plain e_utf8_strstrcase().
-	(matches_summary): Likewise.
-
-2001-04-17  JP Rosevear  <jpr@ximian.com>
-
-	* cal-util/cal-component.c (cal_component_alarm_set_action): the
-	libical action stuff uses enums rather than strings to enumerate
-	the various actions now
-	(cal_component_alarm_get_action): ditto
-
-2001-04-17  Ettore Perazzoli  <ettore@ximian.com>
-
-	* gui/alarm-notify/Makefile.am (evolution_alarm_notify_SOURCES):
-	Add `$(CORBA_GENERATED)'.
-
-2001-04-16  Dan Winship  <danw@ximian.com>
-
-	* pcs/Makefile.am (INCLUDES): Add EXTRA_GNOME_CFLAGS, for gal.
-
-2001-04-15  Federico Mena Quintero  <federico@ximian.com>
-
-	* gui/gnome-cal.c (setup_widgets): Create the ESearchBar thingy.
-	(search_bar_query_changed_cb): Build the different queries based
-	on the type and string.
-
-	* pcs/query.c (backend_obj_updated_cb): Ref the query while we are
-	notifying the listener so that it will not disappear from under us.
-	(backend_obj_removed_cb): Likewise.
-	(process_component_cb): Likewise.
-	(func_contains): New function to match text fields.
-	(matches_comment): New function to match comment lists.
-	(matches_description): New function to match description lists.
-	(matches_summary): New function to match summaries.
-	(matches_any): New function to match any text field.
-	(func_has_categories): New function to match categories.
-
-2001-04-14  Federico Mena Quintero  <federico@ximian.com>
-
-	* gui/alarm-notify/notify-main.c (main): Initialize the trigger
-	and queue systems.
-
-2001-04-13  Dan Winship  <danw@ximian.com>
-
-	* cal-util/timeutil.c (time_from_isodate): Fix the syntactic bogon
-	here, and attempt to fix the logical bogon too. (tm_gmtoff and
-	timezone have opposite signs... I'm assuming Federico tested the
-	Linux case, so I'm flipping the sign of the BSD case. But maybe he
-	didn't and it's supposed to be the other way...)
-
-2001-04-12  Federico Mena Quintero  <federico@ximian.com>
-
-	* gui/e-day-view.c (update_query): New function to restart a query
-	for the day view.
-	(query_obj_updated_cb): Renamed from obj_updated_cb(); updated for
-	queries instead of calendar clients.
-	(query_obj_removed_cb): Likewise.
-	(cal_opened_cb): Just update_query() instead of queueing reloading
-	all the events.
-	(e_day_view_set_cal_client): Likewise.
-	(e_day_view_set_query): Likewise.
-	(e_day_view_set_selected_time_range): Likewise.
-	(e_day_view_set_days_shown): Likewise.
-	(e_day_view_recalc_work_week): Likewise.
-	(e_day_view_queue_reload_events): Removed function now that events
-	are updated entirely by the query.
-	(e_day_view_reload_events_idle_cb): Likewise.
-	(e_day_view_reload_events): Likewise.
-	(e_day_view_init): Use a pretty arrow instead of GDK_TOP_LEFT_ARROW.
-
-	* gui/e-week-view.c: Analogous changes to the ones in e-day-view.c.
-	(e_week_view_init): Use a pretty arrow instead of GDK_TOP_LEFT_ARROW.
-
-	* cal-util/timeutil.c (isodate_from_time_t): Return a g_strdup()ed
-	version of the string instead of a pointer to a static buffer.
-	(time_from_isodate): Resurrected function.  Polished up to our
-	current standards of paranoia.
-
-	* pcs/query.c (func_time_now): New function (time-now).
-	(func_make_time): New function (make-time ISODATE).
-	(func_time_add_day): New function (time-add-day TIME N).
-	(func_time_day_begin): New function (time-day-begin TIME).
-	(func_time_day_end): New function (time-day-end TIME).
-	(func_occur_in_time_range): Use time_t values instead of ints.
-	(match_component): Free the stringized component.  Free the ESexp
-	result value.
-
-	* gui/e-day-view.h: Removed a couple of unused prototypes.
-
-	* pcs/query.c (query_destroy): Oops, disconnect from the backend.
-
-	* pcs/cal.c (Cal_get_query): Duplicate the query reference before
-	we return it.
-
-	* gui/calendar-commands.c (pixmaps): Fixed paths to image files.
-
-2001-04-11  JP Rosevear  <jpr@ximian.com>
-
-	* pcs/cal-backend-file.c (cal_backend_file_compute_changes):
-	prepend to both changes and change_ids when different and mark as
-	modified, not added
-
-2001-04-11  Christopher James Lahey  <clahey@ximian.com>
-
-	* gui/calendar-model.c (calendar_model_append_row): Fix this to
-	just send the data to the wombat instead of inserting it
-	ourselves.
-
-2001-04-11  Gediminas Paulauskas <menesis@delfi.lt>
-
-	Display fixes, thanks to Kjartan for finding these.
-
-	* gui/event-editor.c: use simple (not e_utf8_) gtk_clist_append for
-	strings which are never in utf-8.
-	* dialogs/delete-comp.c (delete_component_dialog): convert only
-	summary from utf-8 to gtk charset. Translated values are in correct
-	craset already.
-
-2001-04-04  Kjartan Maraas  <kmaraas@gnome.org>
-
-	* gui/calendar-commands.c: Fix headers.
-	* gui/calendar-config.c: Same here.
-	* gui/calendar-model.c: Same here.
-	* gui/e-day-view-time-item.c: Same here.
-	* gui/e-day-view-top-item.c: Same here.
-	* gui/e-day-view.c: Same here.
-	* gui/e-meeting-edit.c: Same here.
-	* gui/e-week-view-main-item.c: Same here.
-	* gui/e-week-view.c: Same here.
-	* gui/event-editor.c: Same here.
-	* gui/gnome-cal.c: Same here.
-	* gui/goto.c: Same here.
-	* gui/main.c: Same her.
-	* gui/print.c: Same here.
-
-2001-04-02  Federico Mena Quintero  <federico@ximian.com>
-
-	* gui/e-tasks.c (e_tasks_setup_menus): Plug leak.
-
-	* gui/event-editor.c (obj_updated_cb): Do nothing for now until we
-	think of something sensible to do.
-	(obj_removed_cb): Likewise.
-
-	* gui/dialogs/task-editor.c (obj_updated_cb): Likewise.
-	(obj_removed_cb): Likewise.
-
-	* gui/event-editor.c (dialog_to_comp_object): Plug leak.
-
-2001-04-01  Federico Mena Quintero  <federico@ximian.com>
-
-	Client-side glue for the live query engine.
-
-	* cal-client/query-listener.[ch]: New files with the
-	implementation fo the QueryListener interface.
-
-	* cal-client/cal-query.[ch]: New files with the client-side
-	convenience object for live queries.
-
-	* cal-client/cal-listener.h (CalListenerClass): Removed unused
-	slots for signal handlers.
-
-	* cal-client/Makefile.am (libcal_clientinclude_HEADERS): Now we
-	install the evolution-calendar.h header.  This sucks a bit.
-
-2001-04-01  Gediminas Paulauskas <menesis@delfi.lt>
-
-	* gui/calendar-commands.c: use new pixmap cache. Added some menu icons
-	and changed filenames of renamed icons.
-	* gui/tasks-control.c: added icons for new task and print in menu.
-
-2001-03-29  Federico Mena Quintero  <federico@ximian.com>
-
-	Engine for live queries to calendars.  A query object watches a
-	CalBackend in the PCS and is otherwise completely separate from
-	it; backends need to do nothing to support live queries.  Right
-	now we have the following functions:
-
-		(get-vtype)
-
-			Returns a string indicating the type of component
-			(VEVENT, VTODO, VJOURNAL, VFREEBUSY, VTIMEZONE,
-			UNKNOWN).
-
-		(occur-in-time-range? START END)
-
-			START - int, time_t start of the time range
-			END - int, time_t end of the time range
-
-			Returns a boolean indicating whether the component
-			has any occurrences in the specified time range.
-
-	* idl/evolution-calendar.idl (Cal::getQuery): New method that
-	initiates a live query.
-	(Query): New interface for a handle to a live query.
-	(QueryListener): New interface for a listener to changes in a live
-	query.
-
-	* pcs/query.[ch]: New files with the live query engine.
-
-	* pcs/cal-backend.h (CalBackendClass): Added notification signals
-	so that the query system can catch them.
-	(CalBackendClass): New virtual method ::get_load_state().
-
-	* pcs/cal-backend.c (cal_backend_opened):
-	(cal_backend_obj_updated):
-	(cal_backend_obj_updated): New functions to emit the notification
-	signals; to be used only by backend implementations.
-	(cal_backend_get_load_state): New function.
-
-	* pcs/cal-backend-file.c (notify_update): Call
-	cal_backend_obj_updated().
-	(notify_remove): Call call_backend_obj_removed().
-	(open_cal): Free the icalcomp if it is not of the correct type.
-	(cal_backend_file_get_load_state): Implemented new method.
-
-	* pcs/cal-backend-db.c (cal_backend_db_update_object): Call
-	cal_backend_obj_updated().
-	(cal_backend_db_remove_object): Call cal_backend_obj_removed().
-	(cal_backend_db_get_load_state): Implemented new method.
-
-	* pcs/cal.c (Cal_get_query): Implementation of the ::getQuery()
-	method.
-
-2001-03-27 Anna Marie Dirks <anna@ximian.com>
-
-	* gui/e-itip-control.c: fixed button placement to comply
-	with gnome standards.
-
-2001-03-27 Anna Marie Dirks <anna@ximian.com>
-
-	* gui/e-itip-control.glade: fixed spacing and label alignment to
-	comply with gnome standards. Also removed shadows from extraneous
-	scrolled windows to avoid bevelitous. There are many more changes
-	that need to happen to this viewer, but they all require a hacker
-	to do some c-coding, so I will avoid committing them until after the
-	.10 release.
-
-2001-03-26  Kjartan Maraas  <kmaraas@gnome.org>
-
-	* cal-client/client-test.c: Replace includes of <gnome.h>, <bonobo.h>
-	and <gtk/gtk.h> with the needed headers to speed up compile.
-	* cal-util/test-recur.c: Same here for <gtk/gtk.h>
-	* gui/calendar-commands.c: Replace <bonobo.h> and remove
-	<libgnorba/gnorba.h>
-	* gui/calendar-summary.c: Replace <gnome.h> and <bonobo.h>
-	* gui/calendar-summary.h: Added <bonobo/bonobo-generic-factory.h>
-	* gui/component-factory.c: Remove <bonobo.h>
-	* gui/control-factory.c: Replace <bonobo.h>
-	* gui/e-calendar-table.c: Remove <gnome.h>
-	* gui/e-itip-control.c: Replace <gnome.h> and <bonobo.h>
-	* gui/e-meeting-edit.c: Replace <bonobo.h>
-	* gui/e-tasks.c: Replace <gnome.h>
-	* gui/e-tasks.h: Replace <bonobo.h>
-	* gui/gnome-cal.h: Remove <bonobo.h>
-	* gui/main.c: Replace <bonobo.h> and <glade/glade.h>
-	* gui/tasks-control-factory.c: Replace <bonobo.h>
-	* gui/tasks-control.c: Replace <gnome.h> and <bonobo.h>
-	* gui/weekday-picker.c: Add <string.h> and <libgnome/gnome-defs.h>
-	* gui/alarm-notify/client-main.c: Remove <gnome.h> and <bonobo.h>
-	* gui/alarm-notify/notify-main.c: Replace <gnome.h> and <bonobo.h>
-	* gui/dialogs/alarm-notify-dialog.c: Replace <gnome.h>
-	* pcs/cal-backend.c: Replace <gtk/gtk.h>
-
-2001-03-25  Federico Mena Quintero  <federico@ximian.com>
-
-	* gui/e-calendar-table.c (e_calendar_table_init): The
-	model_rows_{inserted,deleted} signals changed names; deal with it.
-	(e_calendar_table_on_rows_inserted): Updated for new ETable API.
-	(e_calendar_table_on_rows_deleted): Likewise.
-
-	* gui/gnome-cal.h (GnomeCalendarOpenMode): Removed unused enum.
-
-	* gui/gnome-cal.c (gnome_calendar_open): Constify.
-
-	* gui/calendar-commands.c (calendar_set_uri): Removed function,
-	since it was just calling gnome_calendar_open().
-
-	* gui/control-factory.c (set_prop): Replace usage of
-	calendar_set_uri() with gnome_calendar_open().
-	(load_calendar): Likewise.
-	(calendar_persist_init): Made static.
-
-	* gui/e-tasks.c: #include "calendar-config.h"
-	(e_tasks_update_all_config_settings): We are configuring a table,
-	not a calendar!  Use the appropriate function.
-
-2001-03-17  Miguel de Icaza  <miguel@ximian.com>
-
-	* gui/e-day-view.c (e_day_view_on_new_event,
-	e_day_view_on_new_appointment): Simplifed this function to use the
-	shared code.
-
-	* gui/e-week-view.c (e_week_view_on_new_event,
-	e_week_view_on_new_appointment): ditto.
-
-	* gui/gnome-cal.c (gnome_calendar_new_appointment_for): New
-	function used to launch editor components with a time range.   A
-	bunch of functions use this code now instead of duplicating code
-	all over the place
-
-	* gui/e-week-view.c (e_week_view_new_event): Moved functionality
-	here from e_day_view_on_new_appointment.  Allows setting for "full
-	day" event.
-	(e_week_view_on_new_full_day): New function for making a full day
-	event.
-	(e_week_view_on_goto_date): Go To support.
-	(e_week_view_on_goto_today): Goto today support.
-
-	* gui/e-day-view.c (e_day_view_new_event): Moved functionality
-	here from e_day_view_on_new_appointment.  Allows setting for "full
-	day" event.
-	(e_day_view_on_new_full_day): New function for making a full day
-	event.
-	(e_day_view_on_goto_date): Go To support.
-	(e_day_view_on_goto_today): Goto today support.
-
-	* main_items: Add New All Day Event;  Go to Today; Go to Date.
-
-2001-03-07  Miguel de Icaza  <miguel@ximian.com>
-
-	* gui/control-factory.c (calendar_persist_init): New function:
-	inits the BonoboPersistFile server.
-
-	* gui/GNOME_Evolution_Calendar.oaf.in: Added BonoboPropertyBag to
-	the list of supported interfaces that were supported but not
-	reported.  Add the new PersistFile.
-
-	Add text/calendar mime type attribute.
-
-2001-03-15  Dan Winship  <danw@ximian.com>
-
-	* gui/e-week-view.c (e_week_view_start_editing_event):
-	* gui/e-day-view.c (e_day_view_start_editing_event): Update
-	arguments to e_canvas_item_grab_focus.
-
-2001-03-15  Gediminas Paulauskas <menesis@delfi.lt>
-
-	* gui/*.xpm: moved to ../art.
-	* gui/Makefile.am: removed *.xpm and oaf_DATA from EXTRA_DIST.
-	* gui/e-calendar-table.c, gui/e-day-view.c, gui/e-week-view.c:
-	#include "art/*.xpm".
-
-2001-03-09  JP Rosevear  <jpr@ximian.com>
-
-	* conduits/todo/Makefile.am: PISOCK_INCLUDEDIR has become
-	PISOCK_CFLAGS in gnome-pilot.m4 and remove capplet foo
-
-	* conduits/calendar/Makefile.am: ditto
-
-2001-03-08  Ettore Perazzoli  <ettore@ximian.com>
-
-	* gui/component-factory.c (factory_fn): Specify a NULL
-	`EvolutionShellComponentGetDndSelectionFn'.
-
-2001-02-27  Miguel de Icaza  <miguel@ximian.com>
-
-	* gui/e-day-view.c (e_day_view_on_event_right_click): Reorganize
-	the menus to have entries always in a consistent fashion, as
-	reported to the genepool mailing list.
-	(e_day_view_on_event_right_click): Added a FIXME comment to the
-	FIXME comment without a FIXME.
-
-	Now we use e_popup_menu.  This allows us to hide/show items on
-	demand, and to sensitize/de-sensitize items depending on their
-	state.
-
-	This will also let us add icon support (when we get nice icons for
-	this)
-
-	* gui/e-week-view.c (e_week_view_show_popup_menu): Ditto.
-
-	The files popup-menu.c and popup-menu.h can now be removed.
-
-2001-03-05  Damon Chaplin  <damon@ximian.com>
-
-	* gui/e-tasks.c: keep list of all Tasks folders so we can update the
-	preference settings when necessary.
-
-	* gui/gnome-cal.c: configure the TaskPad according to the settings.
-
-	* gui/e-calendar-table.c: use ECellCombo and ECellDateEdit for fields,
-	so the tasks folders is almost usable now.
-
-	* gui/calendar-model.c: added support for the Status property.
-
-	* gui/calendar-config.[hc]: added convenience functions to setup
-	ECalendarTable and ECellDateEdit objects.
-
-	* gui/calendar-commands.c: connected to "destroy" signal of calendars
-	so we can remove them from all_calendars list.
-
-	* gui/dialogs/cal-prefs-dialog.c (cal_prefs_dialog_update_config):
-	call e_tasks_update_all_config_settings() to update all the settings
-	in the Tasks folders as well.
-
-	* cal-util/cal-component.h: added CAL_COMPONENT_FIELD_STATUS.
-
-	* cal-util/cal-component.c (cal_component_get_transparency): fixed
-	calls to strcasecmp so they check for '== 0'.
-
-	Applied patch from Miguel...
-
-2001-02-27  Miguel de Icaza  <miguel@ximian.com>
-
-	* gui/e-day-view.c (e_day_view_on_event_right_click): Reorganize
-	the menus to have entries always in a consistent fashion, as
-	reported to the genepool mailing list.
-	(e_day_view_on_event_right_click): Added a FIXME comment to the
-	FIXME comment without a FIXME.
-
-	Now we use e_popup_menu.  This allows us to hide/show items on
-	demand, and to sensitize/de-sensitize items depending on their
-	state.
-
-	This will also let us add icon support (when we get nice icons for
-	this)
-
-	* gui/e-week-view.c (e_week_view_show_popup_menu): Ditto.
-
-	The files popup-menu.c and popup-menu.h can now be removed.
-
-2001-03-02  JP Rosevear  <jpr@ximian.com>
-
-	* conduits/todo/e-todo.conduit.in: update for new pilot foo
-
-	* conduits/calendar/e-calendar.conduit.in: ditto
-
-	* conduits/todo/Makefile.am: update sed script
-
-	* conduits/calendar/Makefile.am: ditto
-
-2001-02-28  Federico Mena Quintero  <federico@ximian.com>
-
-	* gui/event-editor.c (recurrence_exception_select_row_cb): New
-	function to set the EDateEdit's value when a row is selected in
-	the exception date list.  Fixes bug #1638.
-	(append_exception): Set the value as well. Block/unblock signals
-	from the clist as appropriate.  Gotta love non-model/view widgets.
-	(recurrence_exception_delete_cb): Be more paranoid about the
-	contents of the list row's data.
-	(recur_to_comp_object): Likewise.
-	(fill_exception_widgets): Select the first row after we are done
-	appending the exception dates.
-
-2001-02-26  Federico Mena Quintero  <federico@ximian.com>
-
-	* gui/alarm-notify/Makefile.am (libalarm_a_SOURCES): Create a
-	little stand-alone library for the low-level alarm trigger
-	mechanism.  This is so that the GUI parts of the calendar can use
-	it in addition to the alarm daemon.
-
-	* gui/main.c: #include "alarm-notify/alarm.h".
-
-	* gui/calendar-summary.c: Likewise.
-	(alarm_fn): Do not remove the previous alarm; it is removed
-	automatically when it is triggered.
-
-	* gui/Makefile.am (evolution_calendar_SOURCES): Removed alarm.[ch]
-	from the sources.
-
-	* gui/alarm.[ch]: Removed obsolete files.
-
-2001-02-23  Federico Mena Quintero  <federico@ximian.com>
-
-	* gui/alarm-notify/alarm-notify.c (AlarmNotify_addCalendar):
-	Switched to using our own refcounted structure for loaded clients.
-	(AlarmNotify_removeCalendar): Ditto.  Also, do the full
-	destruction of the client.
-	(alarm_notify_destroy): Destroy each element in the hash table.
-
-	* cal-client/cal-client.c (cal_client_construct): Test for
-	exceptions from OAF when activating the Wombat calendar factory.
-
-	* gui/alarm-notify/GNOME_Evolution_Calendar_AlarmNotify.oaf.in:
-	New .oaf.in file.
-
-	* gui/alarm-notify/Makefile.am (oaf_in_files): Updated.
-
-	* gui/GNOME_Evolution_Calendar.oaf.in: Put all the servers here
-	instead of in a million files.
-
-	* gui/GNOME_Evolution_Calendar_Control.oaf.in: Removed file.
-
-	* gui/GNOME_Evolution_Calendar_gnomecal.oaf.in: Removed *REALLY*
-	obsolete file.
-
-	* gui/Makefile.am (oaf_in_files): Updated.
-
-2001-02-23  Rodrigo Moya <rodrigo@ximian.com>
-
-	* pcs/cal-backend-db.c (add_history): fixed generation of history records
-
-2001-02-16  Federico Mena Quintero  <federico@ximian.com>
-
-	* pcs/cal-factory.c (CalFactoryPrivate): Added a `registered'
-	field.
-	(cal_factory_oaf_register): New function; now the factory performs
-	its own registration with OAF.
-	(cal_factory_destroy): Unregister from OAF if appropriate.
-
-2001-02-19  JP Rosevear  <jpr@ximian.com>
-
-	* conduits/todo/Makefile.am: Remove PISOCK_LIBDIR
-
-	* conduits/calendar/Makefile.am: ditto
-
-2001-02-16  Rodrigo Moya <rodrigo@ximian.com>
-
-	* pcs/calbackend-db.c (cal_backend_db_destroy): close DB environment.
-	Some compilation warnings removed
-
-2001-02-13  Christopher James Lahey  <clahey@ximian.com>
-
-	* gui/Makefile.am (evolution_calendar_LDADD): Added libmenus.la.
-
-	* gui/e-calendar-table.c, gui/e-calendar-table.h
-	(e_calendar_table_get_spec): Added this function.
-
-	* gui/e-tasks.c, gui/e-tasks.h (e_tasks_setup_menus): Added this
-	function.
-
-	* gui/tasks-control.c (tasks_control_activate): Call
-	e_tasks_setup_menus.
-
-2001-02-13  JP Rosevear  <jpr@ximian.com>
-
-	* gui/e-tasks.c (e_tasks_new_task): call task_editor_focus
-
-2001-02-13  JP Rosevear  <jpr@ximian.com>
-
-	* gui/calendar-commands.c (update_pixmaps): Set toolbar new
-	appointment icon
-	(set_pixmap): load files rather than create from xpm file
-
-	* gui/*view.xpm: move to the art directory
-
-2001-02-13  Rodrigo Moya <rodrigo@ximian.com>
-
-	* pcs/cal-backend-db.c (cal_backend_db_get_alarms_for_object):
-	implemented
-
-2001-02-13  JP Rosevear  <jpr@ximian.com>
-
-	* gui/calendar-commands.c (update_pixmaps): Set toolbar new command
-
-	* gui/e-calendar-table.c: Add titles to pixbuf column for grouping
-
-	* gui/calendar-model.c (calendar_model_class_init): override value
-	to string virtual method
-	(calendar_model_value_to_string): implement value to string for
-	etable (necessary for group by)
-
-2001-02-12  Rodrigo Moya <rodrigo@ximian.com>
-
-	* pcs/cal-backend-file.c:
-	cal_backend_db_update_object(): manage both updates and additions/add notification
-	cal_backend_db_get_object(): don't use DB cursors
-	cal_backend_db_get_type_by_uid(): don't use DB cursors
-	cal_backend_db_remove_object(): don't use DB cursors/add notification
-	cal_backend_db_get_alarms_in_range(): implemented
-
-2001-02-12  Kjartan Maraas  <kmaraas@gnome.org>
-
-	* gui/Makefile.am: Hook up the xml-i18n-tools + .oaf.in stuff.
-	* gui/GNOME_Evolution_Calendar*.oaf.in: Marked strings for translation.
-
-2001-02-11  Rodrigo Moya <rodrigo@ximian.com>
-
-	* pcs/cal-backend-db.c: added DB3 transactions support
-	* pcs/cal-backend-db.[ch]: added the new DB3-based backend. This is just
-	the beginning, there are some missing things still.
-
-2001-02-11  Gediminas Paulauskas <menesis@delfi.lt>
-
-	Really use xml-i18n-tools.
-
-	* conduits/calendar/e-calendar-conduit-control-applet.desktop,
-	conduits/todo/e-todo-conduit-control-applet.desktop: removed.
-
-	* conduits/calendar/e-calendar-conduit-control-applet.desktop.in,
-	conduits/todo/e-todo-conduit-control-applet.desktop.in: added empty.
-
-	* conduits/calendar/Makefile.am, conduits/todo/Makefile.am:
-	reflect above changes, merge translations.
-
-	* gui/*.glade.h, gui/dialogs/*.glade.h: removed, xml-i18n-extract
-	takes care of strings itself.
-
-	* gui/*.glade, gui/dialogs/*.glade: do not output_translatable_strings
-
-	* gui/Makefile.am, gui/dialogs/Makefile.am: do not include removed
-	files in EXTRA_DIST.
-
-2001-02-08  JP Rosevear  <jpr@ximian.com>
-
-	* gui/dialogs/task-editor-dialog.glade: Oops, remove old widget
-
-2001-02-08  JP Rosevear  <jpr@ximian.com>
-
-	* gui/dialogs/task-editor.c (fill_widgets): fill in new
-	classification stuff properly
-	(get_widgets): load new class. widgets
-	(init_widgets): if the class. widgets change, mark the dialog
-	dirty
-	(dialog_to_comp_object): set the comp class. from the new widgets
-
-	* gui/dialogs/task-editor-dialog.glade: Make more consistent,
-	fixing bugs 1247 and 1249
-
-	* gui/dialogs/task-editor.c (fill_widgets):
-
-	* gui/event-editor-dialog.glade: Gui tidying
-
-	* gui/event-editor.c: Remove old alarm cruft
-
-	* cal-util/cal-component.c (cal_component_set_url): Don't try and
-	write an empty string as a property
-
-
-2001-02-08  JP Rosevear  <jpr@ximian.com>
-
-	* pcs/cal-backend-file.c: Move the get_change code here
-
-	* pcs/cal-backend.c: Remove get_changes related stuff and
-	implement by calling the virtual method instead
-
-	* pcs/cal-backend.h: New virtual method.
-
-	* pcs/cal-backend-file.c (compute_alarm_range): Use
-	icaldurationtype_as_int (replace _as_timet)
-	(add_alarm_occurrences_cb): ditto
-
-2001-02-08  JP Rosevear  <jpr@ximian.com>
-
-	* pcs/cal-backend-file.c (compute_alarm_range): Use
-	icaldurationtype_as_int (replace _as_timet)
-	(add_alarm_occurrences_cb): ditto
-
-	* gui/e-week-view.c (e_week_view_on_schedule_meet): new routine to
-	throw up the meeting schedule dialog
-	(e_week_view_show_popup_menu): add schedule meeting to the
-	contextual menu where appropriate
-
-2001-02-08  JP Rosevear  <jpr@ximian.com>
-
-	* gui/event-editor.c: Remove assorted menu/bonobo stuff
-
-	* gui/dialogs/task-editor.c: Remove assorted menu/bonobo stuff
-	(task_editor_construct): no longer suck out the glade contents
-	into a bonobo win, listen for apply and close signals
-	(tedit_apply_event_cb): listen for apply signal and save object
-	(tedit_close_event_cb): listen for close signal and prompt to save
-	if need be
-	(task_editor_focus): new function to bring the dialog to the front
-
-	* gui/dialogs/task-editor.h: new prototype
-
-	* gui/e-meeting-edit.c (schedule_button_clicked_cb): no need to
-	update widgets in the event editor since the event editor won't be
-	open
-	(e_meeting_editor_new): don't need the event editor reference any
-	more
-
-	* gui/e-meeting-edit.h: Change prototype
-
-	* gui/e-day-view.c (e_day_view_on_event_right_click): Make
-	schedule meeting a new contextual menu item
-	(e_day_view_on_schedule_meet): new routine to schedule a meeting
-	from the contextual menu
-
-	* gui/e-calendar-table.c (e_calendar_table_open_task): Call
-	task_editor_focus
-
-	* gui/event-editor-dialog.glade: Update to be a property box
-
-	* gui/dialogs/task-editor-dialog.glade: Update to be a property
-	box
-
-2001-02-07  Iain Holmes  <iain@ximian.com>
-
-	* gui/calendar-summary.c (create_summary_view): Add a setter to the
-	property bag.
-	(set_property): The setter.
-	(generate_html_summary): Sort the UIDs accodring to time.
-
-2001-02-06  JP Rosevear  <jpr@ximian.com>
-
-	* gui/event-editor.c (fill_reminder_widgets): Match new
-	append_alarm signature
-	(reminder_to_comp_object): only add alarms tagged as new, no
-	longer delete all alarms first
-	(append_reminder): the row data is now of type ReminderData,
-	rename from append_alarm
-	(reminder_add_cb): math new append_alarm signature
-	(reminder_delete_cb): if the alarm existed before the dialog was
-	loaded, delete it immediately from the cal component
-
-2001-02-06  JP Rosevear  <jpr@ximian.com>
-
-	* gui/event-editor-dialog.glade: Gui tweaks for bugs 1248 and 1246
-
-	* gui/dialogs/task-editor-dialog.glade: ditto
-
-2001-02-07  JP Rosevear  <jpr@ximian.com>
-
-	* gui/event-editor-dialog.glade: Fix spacing
-
-2001-02-06  JP Rosevear  <jpr@ximian.com>
-
-	* gui/event-editor-dialog.glade: Gui tweaks for bugs 1248 and 1246
-
-	* gui/dialogs/task-editor-dialog.glade: ditto
-
-2001-02-06  JP Rosevear  <jpr@ximian.com>
-
-	* gui/e-week-view.c (e_week_view_show_popup_menu): Make the menus more
-	consistent
-
-	* gui/e-day-view.c (e_day_view_on_event_right_click): ditto
-
-	* gui/e-calendar-table.c: ditto
-
-2001-02-06  JP Rosevear  <jpr@ximian.com>
-
-	* cal-util/cal-component.c (cal_component_set_categories): If the
-	categories string is empty, remove the property
-	(get_period_list): Fixes from clahey to handle the new rdate
-	format in libical
-	(set_period_list): ditto
-
-2001-02-05  JP Rosevear  <jpr@ximian.com>
-
-	* cal-util/cal-component.c (cal_component_alarm_set_trigger): Set
-	the time and duration values in the trigger to null by default
-	(cal_component_free_alarm_uids): properly free the list of alarm
-	uids
-
-2001-02-05  JP Rosevear  <jpr@ximian.com>
-
-	* gui/event-editor.c (get_widgets): get the new reminder widgets
-	(sync_entries): different callback data
-	(summary_changed_cb): take different data and handle various cases
-	(init_widgets): connect signals for the new widgets
-	(get_alarm_duration_string): give a text string of the alarm
-	duration
-	(get_alarm_string): give a string representing the alarm
-	(fill_widgets): make sure we don't loop infinitely and remove old
-	alarm cruft
-	(reminder_to_comp_object): dump alarm info in the gui into the cal
-	component
-	(append_alarm): add alarm to the clist
-	(reminder_add_cb): create new alarm
-	(reminder_delete_cb): remove the alarm from the list
-
-	* gui/event-editor-dialog.glade: Update gui
-
-	* gui/e-calendar-table.c: include gnome.h for all the menu stuff
-
-	* gui/calendar-summary.c: for internationalization
-
-	* gui/tasks-control.c: include gnome.h
-
-	* gui/e-tasks.c: ditto
-
-	* gui/e-itip-control.c: ditto
-
-	* cal-util/cal-recur.c (cal_recur_set_rule_end_date): Update for
-	libical changes
-
-2001-02-05  Christopher James Lahey  <clahey@helixcode.com>
-
-	* gui/calendar-model.c: Fixed up these #includes.
-
-2001-02-03  Federico Mena Quintero  <federico@ximian.com>
-
-	* gui/dialogs/save-comp.c (save_component_dialog):
-	gnome_dialog_grab_focus() on the Yes button.  Fixes bug #1242.
-
-2001-01-30  Kjartan Maraas  <kmaraas@gnome.org>
-
-	* gui/e-calendar-table.c: Mark a string for translation.
-	* gui/e-itip-control.c: Mark a bunch of strings for translation.
-
-2001-01-30  Ettore Perazzoli  <ettore@ximian.com>
-
-	* gui/print.c: #include <sys/time.h>.
-
-2001-01-29  Federico Mena Quintero  <federico@ximian.com>
-
-	* gui/calendar-config.c: <gnome.h> trimming to reduce compilation
-	time.
-	* gui/calendar-summary.c: Likewise.
-	* gui/e-calendar-table.c: Likewise.
-	* gui/e-day-view-time-item.c: Likewise.
-	* gui/e-day-view.c: Likewise.
-	* gui/e-itip-control.c: Likewise.
-	* gui/e-meeting-edit.c: Likewise.
-	* gui/e-meeting-edit.h: Likewise.
-	* gui/e-tasks.c: Likewise.
-	* gui/e-week-view.c: Likewise.
-	* gui/event-editor.c: Likewise.
-	* gui/gnome-cal.c: Likewise.
-	* gui/goto.c: Likewise.
-	* gui/itip-utils.h: Likewise.
-	* gui/main.c: Likewise.
-	* gui/popup-menu.c: Likewise.
-	* gui/print.c: Likewise.
-	* gui/tasks-control-factory.c: Likewise.
-	* gui/tasks-control.c: Likewise.
-	* gui/tasks-migrate.c: Likewise.
-
-2001-01-25  Federico Mena Quintero  <federico@ximian.com>
-
-	* cal-util/timeutil.c: <gnome.h> trimming to reduce compilation time.
-	* gui/dialogs/task-editor.c: Ditto.
-	* gui/dialogs/cal-prefs-dialog.c: Ditto.
-	* gui/dialogs/save-comp.c: Ditto.
-	* gui/dialogs/delete-comp.c: Ditto.
-	* gui/calendar-commands.c: Ditto.
-	* gui/calendar-model.c: Ditto.
-
-2001-01-26  Ettore Perazzoli  <ettore@ximian.com>
-
-	* gui/e-itip-control.c (itip_control_destroy_cb): Don't attempt to
-	call `icalcomponent_remove_component()' on a NULL component or a
-	NULL subcomponent.
-
-2001-01-25  Damon Chaplin  <damon@ximian.com>
-
-	* gui/tag-calendar.c: don't tag the calendar if no dates are shown.
-	(e_calendar_item_get_date_range() now returns FALSE in this case.)
-
-2001-01-23  Damon Chaplin  <damon@helixcode.com>
-
-	* gui/calendar-model.c (ensure_task_complete): make sure the status
-	is set to "Completed". Fixes bug #1253.
-
-	* gui/e-tasks.c (e_tasks_open): load the ETable state after opening
-	the tasks folder, since it relies on the folder uri, which isn't set
-	now until you open the folder.
-
-	* gui/calendar-model.c (obj_updated_cb): add the categories from the
-	updated object to our tree, and emit the "categories-changed" signal
-	if they have changed. Fixes bug #1255.
-
-	* gui/e-tasks.c: removed debug messages.
-
-2001-01-23  JP Rosevear  <jpr@ximian.com>
-
-	*  libical import cleanup
-
-2001-01-23  JP Rosevear  <jpr@ximian.com>
-
-	* conduits/todo/todo-conduit.c (local_record_from_comp): properly ref
-	the cal component when we use it, prevents double free
-
-	* conduits/calendar/calendar-conduit.c (local_record_from_comp): ditto
-
-2001-01-22  JP Rosevear  <jpr@ximian.com>
-
-	* gui/dialogs/Makefile.am: compile new stuff
-
-	* gui/dialogs/task-editor.c (prompt_to_save_changes): use new
-	standard dialog
-
-	* gui/event-editor.c (prompt_to_save_changes): ditto
-
-	* gui/dialogs/save-comp.h: new header
-
-	* gui/dialogs/save-comp.c (save_component_dialog): shows the save
-	dialog
-
-2001-01-22  JP Rosevear  <jpr@ximian.com>
-
-	* conduits/todo/todo-conduit.c (for_each_modified): remove duplicate
-	message
-
-	* conduits/calendar/Makefile.am: Remove vfs lib dependency
-
-	* conduits/todo/Makefile.am: ditto
-
-	* conduits/calendar/calendar-conduit.c: Remove alarm foo for now
-	(for_each_modified): remove duplicate message
-
-2001-01-21  JP Rosevear  <jpr@ximian.com>
-
-	* conduits/calendar/calendar-conduit.c (delete_record): Remove
-	deleted records from the pilot map so we don't have dupes in the future
-
-	* conduits/todo/todo-conduit.c (delete_record): ditto
-
-2001-01-21  Federico Mena Quintero  <federico@ximian.com>
-
-	* gui/dialogs/task-editor.c (file_delete_cb): Fix bug #1250; now
-	we present a confirmation dialog before deleting the component.
-
-2001-01-20  Federico Mena Quintero  <federico@ximian.com>
-
-	* gui/event-editor-dialog.glade: Fix bug #1243.  Turn on the Y
-	expand/fill options for the date widgets in the General page.
-	This makes them be vertically aligned with the "All day event"
-	toggle so that they will get the focus in the proper order; the
-	toggle would get the focus before them because it was a pixel or
-	two above them.
-
-2001-01-19  Federico Mena Quintero  <federico@ximian.com>
-
-	* gui/weekday-picker.c (weekday_picker_init): Unset the
-	GTK_CAN_FOCUS flag on the weekday picker.  This will do until it
-	supports being used with the keyboard.
-
-2001-01-19  JP Rosevear  <jpr@ximian.com>
-
-	* cal-util/cal-component.c (cal_component_alarm_new): create a new
-	cal component alarm
-	(cal_component_add_alarm): add alarm to the cal component
-	(cal_component_remove_alarm): remove alarm from the cal component
-	(remove_alarm): remove alarm from hash
-
-	* cal-util/cal-component.h: new protos
-
-	* conduits/calendar/calendar-conduit.c (comp_from_remote_record):
-	add alarm information, still needs to be hacked to replace an already
-	existing alarm.  questions abound about the heuristic for doing this.
-
-2001-01-17  JP Rosevear  <jpr@ximian.com>
-
-	* gui/event-editor.c (dialog_to_comp_object): Properly set categories
-	to NULL if there are none
-
-2001-01-18  Federico Mena Quintero  <federico@ximian.com>
-
-	* gui/tasks-migrate.[ch]: New files with a simple sequence to
-	migrate the task components from the old calendar folder into the
-	new tasks folder.
-
-	* gui/component-factory.c (owner_set_cb): Call tasks_migrate()
-	once evolution_dir is set.  It sucks to have to do this here.
-
-	* cal-client/cal-client.c (cal_client_get_uids): In the inline
-	docs, indicate how to free the return value.
-	(cal_opened_cb): Ahem, moved assertion to the right place.  Also,
-	ref() and unref() around our own signal emission because we are
-	not inside a signal handler, rather a simple callback from the
-	listener object; we want to have a chance to clean up even if the
-	client is unrefed during the emission.
-
-	* gui/Makefile.am (evolution_calendar_SOURCES): Added
-	tasks-migrate.[ch] to the list of sources.
-
-2001-01-17  Federico Mena Quintero  <federico@ximian.com>
-
-	* gui/event-editor.c (init_widgets): Use
-	e_calendar_item_set_max_days_sel() instead of setting GTK+ object
-	arguments.
-
-	* gui/e-day-view.c (e_day_view_set_cal_client): Oops, we had a
-	reversed test for the client being loaded.
-
-	* gui/tag-calendar.c (tag_calendar_by_client): Fixed similarly
-	reversed test.
-
-2001-01-17  Damon Chaplin  <damon@helixcode.com>
-
-	* gui/e-week-view*.c
-	* gui/e-day-view*.c: don't use the theme colors at all within
-	the graphical parts of the widgets, since they may clash with
-	our colors. May make them configurable in future so people can tweak
-	them to go with their theme. At least the calendars are usable in any
-	theme now, even though the colors may not go well with the theme.
-	Also set the font of all the EText items in style_set.
-
-	* gui/e-week-view-event-item.c (e_week_view_event_item_draw): don't
-	draw the icons if we are editing the event.
-
-	* gui/e-day-view.c:
-	* gui/e-week-view.c: reinstated the optimizations so we don't do a
-	complete relayout if the event's dates haven't been changed.
-	(Though we still do a re-layout when recurring events change, since
-	comparing all the RDATES/RRULES/EXDATES/EXRULES is too much hassle.)
-	A side-effect of this change is that the EWeekView won't crash so
-	often - only recurring events will be a problem.
-
-	* cal-util/cal-component.[hc]: added function to check if the start
-	and end dates of a component match. Used for optimizing the updating
-	of the EDayView & EWeekView.
-
-2001-01-17  JP Rosevear  <jpr@ximian.com>
-
-	* conduits/calendar/calendar-conduit.c (start_calendar_server): Check
-	for open error and handled
-
-	* conduits/todo/todo-conduit.c (start_calendar_server): ditto
-
-2001-01-17  JP Rosevear  <jpr@ximian.com>
-
-	* conduits/calendar/calendar-conduit.c (start_calendar_server): Check
-	for open error and handled
-
-	* pcs/cal-backend.c (cal_backend_compute_changes): Fix transposition
-	of sync db location
-
-2001-01-17  Federico Mena Quintero  <federico@ximian.com>
-
-	* */*: Ximianified email addresses and copyrights.
-
-	* idl/evolution-calendar.idl (CalFactory::open): Renamed from
-	::load(), and added an only_if_exists argument.
-	(CalFactory::create): Removed method.
-	(Listener::OpenStatus): Removed the IN_USE error and replaced it
-	with a NOT_FOUND one; renamed the enum from LoadStatus.
-	(Listener::notifyCalOpened): Renamed from notifyCalLoaded().
-
-	* pcs/cal-backend.h (CalBackend): Removed the uri field.
-	(CalBackendOpenStatus): Renamed from CalBackendLoadStatus and
-	added a NOT_FOUND value.
-	(CalBackendClass::open): Put in a slot for the open method.
-
-	* pcs/cal-backend.c (cal_backend_create): Removed function.
-
-	* pcs/cal-backend-file.c (cal_backend_file_open): Return the
-	appropriate value when only_if_exists is TRUE.
-	(create_cal): We are Ximian now, so set the PRODID property to
-	the appropriate foo.
-
-	* pcs/cal-factory.c (CalFactory_open): implemented, replacing
-	CalFactory_load() and CalFactory_create().
-	(CalFactory_open): Moved the queue_load_create_job() stuff to
-	here, since we now only need to contemplate the open case instead
-	of load/create ones.
-	(open_backend): Do everything here; replaces load_backend() and
-	create_backend().
-
-	* cal-client/cal-listener.h (CalListenerClass::cal_opened):
-	Renamed from cal_loaded.
-	(CalListenerClass): Replaced the silly signals, which are
-	gratuitous abstraction, by a set of function pointers in the
-	instance structure.
-
-	* cal-client/cal-listener.c (cal_listener_get_calendar): Removed
-	unused function.
-	(cal_listener_construct): Added the listener notification functions.
-	(cal_listener_new): Ditto.
-	(Listener_notifyCalOpened): Renamed to our new naming convention
-	for servant implementations.
-	(Listener_notifyObjUpdated): Ditto.
-	(Listener_notifyObjRemoved): Ditto.
-
-	* cal-client/cal-client.h (CalClientOpenStatus): Renamed from
-	CalClientLoadStatus.
-	(CalClientClass::cal_opened): Renamed from ::cal_loaded().
-	(CalClientLoadState): New enum; basically make LoadState public so
-	that users of this code do not have to maintain their own states.
-
-	* cal-client/cal-client.c (cal_client_create_calendar): Removed
-	function.
-	(cal_client_open_calendar): Moved the functionality over from
-	load_or_create(); now we do everything here.
-	(*): Use the CalClientLoadState enum values instead of the old
-	LoadState values.
-	(cal_client_get_load_state): Renamed from cal_client_is_loaded(),
-	and return the appropriate value.
-	(CalClientPrivate): Added an uri field.
-	(cal_client_init): Initialize priv->uri.
-	(cal_client_destroy): Free the priv->uri.
-	(cal_opened_cb): Maintain the priv->uri.
-	(cal_client_open_calendar): Fill in the priv->uri.
-	(cal_client_get_uri): New function.
-
-	* gui/calendar-model.c (calendar_model_set_new_comp_vtype): New
-	function to configure the type of calendar components to create
-	when doing click-to-add.  This makes the model usable for
-	something other than task lists.
-	(calendar_model_get_new_comp_vtype): New function.
-
-	* gui/e-calendar-table.c (e_calendar_table_get_model): New function.
-	(e_calendar_table_destroy): Unref the subset_model.
-
-	* gui/gnome-cal.h (GnomeCalendarOpenMode): Removed enum.
-
-	* gui/gnome-cal.c (LoadState): Removed enum; we now use the
-	CalClientLoadState from the client objects.
-	(GnomeCalendarPrivate): Removed the loading_uri and
-	task_pad_loading_uri fields as well as the load_state and
-	task_pad_load_state fields, as we can now query them directly from
-	the CalClient.
-	(open_error): Renamed from load_error().
-	(create_error): Removed function.
-	(gnome_calendar_open): Do not take in the mode parameter.
-	(cal_opened_cb): Get rid of our beautifully-crafted state machine
-	and replace it with simple code; all the loading smarts are in the
-	Wombat now.
-	(setup_widgets): Set the new component vtype of the table model to
-	CAL_COMPONENT_TODO.
-
-	* gui/Makefile.am (evolution_calendar_SOURCES): Removed
-	gnome-month-item.[ch] from the list of sources.
-
-	* gui/calendar-summary.c (CalSummary): Removed unused cal_loaded
-	field.
-	(create_summary_view): Do not check if the file exists; this is
-	the job of the Wombat.
-	(generate_html_summary): Fixed prototype.
-	(alarm_fn): Fixed prototype.
-	(property_dialog): Fixed prototype.  Wonder if/how this ever
-	worked.
-	(create_summary_view): Cast the component and view as
-	appropriate.  Removed unused html variable.
-
-	[Iain dude, are you compiling with -Wall?]
-
-	* gui/e-itip-control.c (cal_opened_cb): Sigh, this function
-	signature was *very* wrong.  It was using CalClientGetStatus
-	instead of CalClientOpenStatus.
-
-	* gui/e-tasks.h (ETasksOpenMode): Removed enum.
-
-	* gui/e-tasks.c (setup_widgets): Set the new component vtype of
-	the table model to CAL_COMPONENT_TODO.
-	(LoadState): Removed the state machine foo.
-	(e_tasks_open): Removed the mode parameter.
-	(initial_load): Removed function.
-	(create_error): Removed function.
-	(ETasksPrivate): Removed folder_uri field.
-	(cal_opened_cb): Remove the state machine.
-
-	* gui/component-factory.c: #include "tasks-control.h"
-
-	* conduits/calendar/calendar-conduit.h (ECalConduitContext):
-	Removed calendar_load_tried field.
-
-	* conduits/calendar/calendar-conduit.c (start_calendar_server_cb):
-	Sigh, fixed function prototype.
-
-	* conduits/todo/todo-conduit.h (EToDoConduitContext): Removed
-	calendar_load_tried field.
-
-	* conduits/todo/todo-conduit.c (start_calendar_server_cb): Fixed
-	function prototype.
-
-2001-01-16  JP Rosevear  <jpr@ximian.com>
-
-	* conduits/todo/todo-conduit.c (print_local): fix debug output
-	(print_remote): ditto
-
-2001-01-15  JP Rosevear  <jpr@ximian.com>
-
-	* pcs/cal-backend.c (cal_backend_compute_changes): accomadate tasks
-	in their new dir
-
-	* conduits/todo/todo-conduit.c (start_calendar_server): ditto
-
-2001-01-15  JP Rosevear  <jpr@ximian.com>
-
-	* conduits/todo/todo-conduit.c (print_local): prevent segfaults and
-	buffer overflows.
-	(print_remote): ditto
-
-	* conduits/calendar/calendar-conduit.c: as above
-
-2001-01-14  Damon Chaplin  <damon@helixcode.com>
-
-	* gui/e-calendar-table.c (E_CALENDAR_TABLE_SPEC): changed the expansion
-	values so that small text fields are 1.0, all the date fields and the
-	URL field are 2.0, and the Summary is 3.0. Hopefully the user will
-	resize the fields as desired, but at least this is a better start.
-
-2001-01-14  JP Rosevear  <jpr@ximian.com>
-
-	* conduits/calendar/Makefile.am: pass -module and -avoid-version to
-	conduit linker
-
-	* conduits/todo/Makefile.am: ditto
-
-2001-01-14  Damon Chaplin  <damon@helixcode.com>
-
-	* gui/dialogs/task-editor.[hc]: moved #include
-	<cal-client/cal-client.h> to the .h file.
-
-	* gui/e-tasks.c: load & save the Tasks folders' ETable layout.
-	Added an option menu to filter tasks by category.
-
-	* gui/gnome-cal.c: use the "Tasks" folder for the TaskPad.
-	(We may make the actual tasks folder shown a per-calendar option.)
-
-	* gui/tasks-control.c (tasks_control_new_task_cmd): added support for
-	the New Task icon on the toolbar.
-
-	* gui/e-calendar-table.[hc]: we now use an ETableSubsetVariable model
-	to filter the tasks by a category. And tidied up a little.
-
-	* gui/calendar-model.[hc]: added way to get all the categories used by
-	the tasks, so we can show an option menu of them. Also a signal which
-	is emitted when they are changed.
-	Also allows a default category to be set, which is used to initialize
-	the 'click-to-add' row.
-	Also made sure the initialize_value()/get_value() functions don't
-	return NULL since that can cause a SEGV.
-
-	* gui/e-week-view.c:
-	* gui/e-day-view.c: set the "fill_color_rgba" arg of the EText items
-	to black since it doesn't seem to set up a default color properly.
-	Hopefully this fixes the bug on Solaris where the items appear with
-	strange colors.
-
-	* gui/widget-util.c (date_edit_new): use the calendar_config function
-	to set most of the options. It wasn't setting the 12/24 hour option
-	before.
-
-	* gui/dialogs/task-editor-dialog.glade: added "Undefined" priority.
-
-2001-01-12  Ettore Perazzoli  <ettore@helixcode.com>
-
-	* gui/component-factory.c (factory_fn): Pass NULL as the
-	@copy_folder_fn arg to `evolution_shell_component_new()'.
-
-2001-01-12  Miguel de Icaza  <miguel@ximian.com>
-
-	* gui/e-calendar-table.c: Add translation strings.
-
-2001-01-08  Iain Holmes  <iain@helixcode.com>
-
-	* gui/calendar-summary.c (create_summary_view): Add a PropertyControl
-	interface to set whether or not to show tasks and appointments. Add
-	a PersistStream to remember this.
-
-2001-01-09  Dave Camp  <dave@helixcode.com>
-
-	* gui/Makefile.am: Replaced e-meet-dialog.glade.h with
-	e-meeting-dialog.glade in glade_messages.
-
-	* gui/e-meeting-dialog.glade: Enabled the translatable string option.
-
-	* gui/e-itip-control.glade: Likewise.
-
-2001-01-09  Federico Mena Quintero  <federico@helixcode.com>
-
-	* idl/evolution-calendar.idl (AlarmNotify): New interface for the
-	alarm notification system.
-
-	* gui/alarm-notify: New directory for the alarm notification
-	daemon and its auxiliary stuff.
-
-	* gui/alarm-notify/alarm.[ch]: Moved over from gui/alarm.[ch].
-
-	* gui/alarm-notify/alarm-queue.[ch]: Moved over from
-	gui/alarm-notify.[ch].  Renamed functions from alarm_notify_*() to
-	alarm_queue_*().
-
-	* gui/alarm-notify/alarm-notify.[ch]: Implementation of the
-	GNOME::Evolution::Calendar::AlarmNotify interface.
-
-	* gui/Makefile.am (evolution_calendar_LDADD): Removed the
-	LINK_FLAGS variable and reordered the libraries to remove some
-	duplicated ones.
-	(SUBDIRS): Added the alarm-notify directory.
-
-2001-01-08  Iain Holmes  <iain@helixcode.com>
-
-	* gui/calendar-summary.c (generate_html_summary): Get the tasks
-	correctly.
-	(generate_html_summary): Mark the tasks as completed if so.
-
-2001-01-08  Damon Chaplin  <damon@helixcode.com>
-
-	* gui/Makefile.am: added new source files for the Tasks folders.
-
-	* gui/e-tasks.[hc]: new widget to encapsulate the Tasks view.
-
-	* gui/tasks-control.[hc]: new files to implement the Tasks control.
-
-	* gui/tasks-control-factory.[hc]: new files to implement the factory
-	for the Tasks controls. (I think the way I've split the code up is a
-	lot cleaner than the GnomeCal implementation - the factory file just
-	contains the factory functions and the control file contains all the
-	control functions. Maybe we should make GnomeCal like this.)
-
-	* gui/main.c: initialize the Tasks control factory.
-
-	* gui/component-factory.c: added support for the Tasks control.
-	Also added a "create_folder" function so we can now create new Tasks
-	and Calendar folders within Evolution.
-	I'm not a Bonobo expert so someone might want to check these over.
-
-	* gui/calendar-config.[hc]: added convenience functions to configure
-	the common settings of ECalendar and EDateEdit widgets.
-
-	* gui/dialogs/task-editor.c (task_editor_create_date_edit):
-	* gui/gnome-cal.c (gnome_calendar_update_config_settings):
-	* gui/event-editor.c: used function to configure the ECalendars
-	and EDateEdits.
-
-	* gui/e-day-view-top-item.c (e_day_view_top_item_draw_long_event):
-	fixed minor bug in format strings.
-
-2001-01-06  Iain Holmes  <iain@helixcode.com>
-
-	* gui/calendar-summary.c (generate_html_summary): Neaten the HTML,
-	and fix the time printing stuff. Add stuff the get Tasks.
-	(alarm_fn): Set up an alarm for midnight everynight and regenerate
-	the HTML for the new day.
-
-2001-01-05  JP Rosevear  <jpr@helixcode.com>
-
-	* gui/event-editor.c (get_widgets): get categories button
-	(init_widgets): listen for button click
-	(fill_widgets): fill in the categories area
-	(dialog_to_comp_object): set the cal component categories
-	(categories_clicked): throw up the categories dialog and update
-	when ok is clicked
-
-	* gui/event-editor-dialog.glade: Add categories and contacts buttons
-	and fields
-
-	* gui/dialogs/task-editor-dialog.glade: Rename button
-
-2001-01-05  JP Rosevear  <jpr@helixcode.com>
-
-	* gui/dialogs/task-editor.c (get_widgets): get categories button
-	(init_widgets): listen for button click
-	(fill_widgets): fill in the categories area
-	(dialog_to_comp_object): set the cal component categories
-	(categories_clicked): throw up the categories dialog and update
-	when ok is clicked
-
-	* gui/dialogs/task-editor-dialog.glade: Tweak to name the categories
-	button and make it active
-
-	* gui/calendar-model.c (get_categories): We can get the string list of
-	categories directly now
-
-	* cal-util/cal-component.c (cal_component_get_categories): new function
-	to get the categories list as a string
-	(cal_component_set_categories): same but for setting
-	(free_icalcomponent): init the categories var
-	(scan_categories): kill
-	(scan_property): assign the prop to the categories var
-	(cal_component_get_categories_list): deal with renaming var to categories
-	(cal_component_set_categories_list): fix brokeness
-
-2001-01-03  Federico Mena Quintero  <federico@helixcode.com>
-
-	* gui/calendar-commands.c (new_calendar): Handle the case where
-	the calendar view cannot be created; present a warning dialog box.
-	(new_calendar): Do not show the widget here, since we already show
-	it in control-factory.c.
-
-	* gui/control-factory.c (control_factory_new_control): Handle the
-	case where the calendar view cannot be created.
-
-	* gui/component-factory.c (create_view): Ditto.
-
-	* gui/calendar-summary.h: Added prototype for
-	calendar_summary_factory_init().
-
-2001-01-02  Federico Mena Quintero  <federico@helixcode.com>
-
-	* gui/alarm-notify.c (add_component_alarms): If the component has
-	no alarms, do not try to queue them.
-	(remove_client_alarms): New function to remove all the queued
-	alarms for a calendar client.
-	(alarm_notify_remove_client): Remove the client's alarms.
-
-2001-01-02  Federico Mena Quintero  <federico@helixcode.com>
-
-	* gui/dialogs/delete-comp.c (delete_component_dialog): Do not
-	compose strings so that they can be localized correctly.  Also,
-	convert from UTF8 into the font's encoding.  Fixes bug #1030.
-
-	* gui/e-calendar-table.c (delete_component): Pass the widget
-	argument to delete_component_dialog().
-
-	* gui/e-day-view.c (e_day_view_on_delete_appointment): Likewise.
-
-	* gui/e-week-view.c (e_week_view_on_delete_appointment): Likewise.
-
-	* gui/event-editor.c (file_delete_cb): Likewise.
-
-	* gui/calendar-commands.c: Use BONOBO_UI_VERB() instead of
-	BONOBO_UI_UNSAFE_VERB().  Guess what, all of our handler
-	signatures were wrong.
-
-	* gui/event-editor.c: Likewise.
-
-	* gui/dialogs/task-editor.c: Likewise.
-
-	* gui/goto-dialog.glade: Added some spacing between the month/year
-	widgets and the calendar widget.
-
-2001-01-01  Federico Mena Quintero  <federico@helixcode.com>
-
-	* gui/gnome-cal.c (gnome_calendar_destroy): Unconditionally remove
-	the client from the alarm notification system.
-	Removed all the obsolete alarm code.
-
-	* gui/event-editor.c: Removed some crufty externs left over from
-	Gnomecal.
-
-	* gui/calendar-commands.c: #include "goto.h"
-	Removed crufty variables left over from Gnomecal.
-	(new_calendar): Do not take a full_name parameter.
-	(init_username): Removed function.
-	(init_calendar): Wheeeeeeee!  Removed crufty function.
-	(quit_cmd): Removed function.
-
-	* gui/print.c (WEEK_STARTS_ON_MONDAY): Made it unconditionally
-	FALSE because we do not use the configuration setting anyways.
-	Sigh, all the printing code needs to be revamped.
-
-2000-12-26  Iain Holmes  <iain@helixcode.com>
-
-	* gui/calendar-summary.c (create_summary_view): Create a shared
-	BonoboEventSource object.
-
-2000-12-25  Miguel de Icaza  <miguel@helixcode.com>
-
-	* gui/e-day-view.c (e_day_view_init): Set draw background to FALSE.
-	(e_day_view_reshape_long_event): ditto.
-	(e_day_view_reshape_day_event): ditto.
-
-2000-12-22  JP Rosevear  <jpr@helixcode.com>
-
-	* gui/dialogs/delete-comp.c (delete_component_dialog): Clean up
-	translatable strings for translators, fixes bug 993
-
-2000-12-22  JP Rosevear  <jpr@helixcode.com>
-
-	* gui/goto.c (create_ecal): Make sure the current month is shown
-	when the dialog pops up.
-
-	* gui/goto-dialog.glade: Remove flicker
-
-2000-12-22  JP Rosevear  <jpr@helixcode.com>
-
-	* pcs/cal-backend-file.c (cal_backend_file_get_alarms_for_object):
-	account for the case where there are no alarms, fixes crash
-
-2000-12-22  JP Rosevear  <jpr@helixcode.com>
-
-	* gui/goto.c (ecal_date_range_changed): New function to keep the
-	ecal marked properly
-	(create_ecal): move more creation code here, update marks
-	(goto_dialog_init_widgets): listen for date_range_changed signal
-	in the ecal
-
-	* gui/calendar-commands.c (init_calendar): Remove ancient gnomecal
-	cruft
-
-	* gui/mark.[hc], gui/prop.c: Remove ancient gnomecal code that is
-	no longer needed, last bit of bug 904
-
-2000-12-22  JP Rosevear  <jpr@helixcode.com>
-
-	* gui/goto-dialog.glade.h: translations
-
-	* gui/goto-dialog.glade: new glade file for goto dialog
-
-	* gui/gnome-cal.c (setup_widgets): Set date navigator attributes
-
-	* gui/calendar-commands.h: remove prototype
-
-	* gui/goto.h: Add prototype
-
-	* gui/Makefile.am: Add glade file stuff
-
-	* gui/gnome-cal.c (setup_widgets): Use accessors to configure the
-	calendar item properly
-
-2000-12-21  Federico Mena Quintero  <federico@helixcode.com>
-
-	Alarm trigger queueing for the GUI part.
-
-	* gui/alarm-notify.[ch]: New files with the high-level alarm
-	notification system; mostly moved over from gnome-cal.c.  The
-	low-level timer stuff is still in alarm.[ch].
-
-	* gui/alarm-notify.c (alarm_notify_init): New function to
-	initialize the alarm notification system.
-	(alarm_notify_done): New function to shut down the alarm
-	notification system.
-	(alarm_notify_add_client): New function to start monitoring a
-	calendar client for alarm notification.
-	(alarm_notify_remove_client): New function to stop monitoring a
-	client.
-
-	* gui/alarm.h (AlarmDestroyNotify): Also pass in the alarm ID so
-	the callback may know which ID is being destroyed.
-
-	* gui/alarm.c (clear_itimer): New function.
-	(pop_alarm): Use clear_itimer().
-	(alarm_done): New function to shut down the timer system.
-	(alarm_add): Add some preconditions.  Do not call the destroy
-	notification function if we could not create the alarm.
-	(alarm_ready): Pass the alarm ID to the destroy notify function.
-	(alarm_remove): Likewise.  Also, add some preconditions.
-
-	* gui/gnome-cal.c: Removed the alarm notification functions from
-	here since they are now in alarm-notify.c.
-	(gnome_calendar_construct): Register the client with
-	alarm_notify_add_client().
-	(gnome_calendar_destroy): Use alarm_notify_remove_client() to
-	unregister the client.
-	(obj_updated_cb): Do not do any alarm-related stuff.
-	(obj_removed_cb): Likewise.
-
-	* gui/main.c (main): Shut down the alarm timer system.
-	(main): Initialize and shut down the alarm notification system.
-
-	* gui/Makefile.am (evolution_calendar_SOURCES): Added
-	alarm-notify.[ch] to the list of sources.
-
-	* gui/calendar-model.c (calendar_model_set_cal_client): Only
-	connect to the "cal_loaded" signal if the client is not already
-	loaded.
-
-	* gui/e-day-view.c (e_day_view_set_cal_client): Likewise.
-
-	* gui/e-week-view.c (e_week_view_set_cal_client): Likewise.
-
-	* gui/e-itip-control.c (update_calendar): Connect to "cal_loaded"
-	before issuing the load request.
-
-2000-12-21  Iain Holmes  <iain@helixcode.com>
-
-	* gui/calendar-summary.c: Updated for new executive summary.
-
-	* gui/component-factory.c: Reenabled the summary.
-
-	* gui/GNOME_Evolution_Calendar.oafinfo: Added the summary.
-
-2000-12-20  JP Rosevear  <jpr@helixcode.com>
-
-	* conduits/todo/todo-conduit.h: Fix erroneous documentation
-
-	* conduits/todo/todo-conduit.c (comp_from_remote_record): if
-	!is_empty_time rather than is_empty_time
-	(e_todo_context_new): Return a pointer rather than fill in
-	a parameter
-	(e_todo_context_foreach_change): Free just the key
-	(e_todo_context_destroy): Plug this enormous leakage.  I had assumed
-	i had done this earlier, which isn't too bright when anything beyond
-	2 minutes ago is fuzzy.
-	(comp_from_remote_record): Kill warnings
-	(post_sync): Destroy the map later
-	(conduit_get_gpilot_conduit): Fix e_todo_context_new params
-
-	* conduits/calendar/calendar-conduit.[hc]: Similar to above
-
-2000-12-19  JP Rosevear  <jpr@helixcode.com>
-
-	* conduits/calendar/calendar-conduit.c: Remove pointless comment
-
-	* conduits/todo/todo-conduit.c (is_empty_time): add utility function
-	(comp_from_remote_record): use it
-
-2000-12-19  JP Rosevear  <jpr@helixcode.com>
-
-	* conduits/calendar/calendar-conduit.c (local_record_from_comp):
-	Convert cal component strings to pilot character set
-	(comp_from_remote_record): vice versa
-
-	* conduits/todo/todo-conduit.c: Same as above
-
-2000-12-19  Federico Mena Quintero  <federico@helixcode.com>
-
-	* pcs/cal-backend-file.c (compute_alarm_range): Fix confusion in
-	the way the range is expanded.
-
-	* cal-util/cal-component.c (cal_component_alarms_free): Doh,
-	alarms->alarms is a list, not a generic pointer.  Free it properly.
-	(cal_component_free_pilot_id): Removed unused function.
-	(cal_component_free_pilot_status): Likewise.
-
-	* gui/main.c (init_bonobo): Use VERSION instead of a hardcoded
-	string.  Pass argc by value, not by reference.  Test the return
-	value of gnome_init_with_popt_table().
-
-	* cal-client/cal-client.c (cal_client_free_alarms): Oops, missed
-	implementing this function.
-
-	* cal-util/timeutil.c (print_time_t): Better printing format.
-	(isodiff_to_secs): Removed unused function.
-	(isodiff_from_secs): Removed unused function.
-	(time_day_end): Removed crufty part.
-	(time_day_begin): Removed crufty part.
-	(time_day_hour): Removed unused function.
-	(format_simple_hour): Removed unused function.
-	(get_time_t_hour): Removed unused function.
-	(time_from_start_duration): Removed unused function.
-
-	* cal-util/timeutil.h (parse_date): Removed unimplemented, unused
-	function prototype.
-
-2000-12-19  Christopher James Lahey  <clahey@helixcode.com>
-
-	* gui/gnome-cal.c: Removed prototype for setup_alarm to fix a
-	warning.
-
-2000-12-18  Federico Mena Quintero  <federico@helixcode.com>
-
-	Alarm instance generation support for the Wombat.
-
-	* idl/evolution-calendar.idl (Cal::CalAlarmInstance): Changed to
-	have an alarm UID, the trigger time, and the actual occurrence
-	time.
-	(Cal::CalComponentAlarms): New structure to hold a pair of a
-	component and its alarms that trigger in a particular range of
-	time.
-	(Cal::getAlarmsInRange): Changed to return a CalComponentAlarmsSeq.
-
-	* cal-util/cal-component.h (CalAlarmInstance): New C-side
-	structure to match the one on the IDL.
-	(CalComponentAlarms): Ditto.
-	(CalAlarmAction): Renamed from CalComponentAlarmAction.
-	(CalAlarmTriggerType): Renamed from CalComponentAlarmTriggerType.
-	Encoded the START and END parameters for the RELATED parameter in
-	this enum, too.  Added a NONE value for invalid or missing trigger
-	specifications.
-	(CalComponentAlarmTriggerRelated): Removed.
-	(CalAlarmTrigger): Renamed from CalComponentAlarmTrigger.  Renamed
-	the duration/time fields to rel_duration/abs_time, respectively.
-
-	* cal-util/cal-component.c (cal_component_alarm_get_trigger):
-	Changed to use the new trigger structure.
-	(cal_component_alarm_set_trigger): Likewise.
-	(cal_component_alarm_free_trigger): Removed function.
-	(cal_component_has_alarms): Count the elements in the
-	alarm_uid_hash instead of trying to fetch the first alarm subcomponent.
-	(cal_component_alarms_free): New function to free a
-	CalComponentAlarms structure.
-	(CalComponentAlarmPrivate): Added an uid property pointer.
-	(scan_alarm_property): Scan for the our extension UID property.
-	(cal_component_alarm_get_uid): New function.
-
-	* pcs/cal-backend.h (CalBackendClass): Changed the signatures of
-	the ::get_alarms_in_range() and ::get_alarms_for_object() methods.
-
-	* pcs/cal-backend.c (cal_backend_get_alarms_in_range): Changed
-	signature; use the new method.
-	(cal_backend_get_alarms_for_object): Likewise.
-
-	* pcs/cal-backend-file.c (compute_alarm_range): New spiffy
-	function to compute a range of time for alarm occurrences.
-	(add_alarm_occurrences_cb): New function to add alarms for a
-	particular occurrence of the component.
-	(generate_absolute_triggers): New function to add the absolute
-	alarm triggers.
-	(generate_alarms_for_comp): New function to generate all the alarm
-	instances for a component.
-	(cal_backend_file_get_alarms_in_range): Implemented.
-
-	* pcs/cal.c (Cal_get_alarms_in_range): Use the new CalBackend API.
-	(Cal_get_alarms_for_object): Likewise.
-	(build_alarm_instance_seq): Removed old function.
-
-	* cal-util/cal-util.c (cal_alarm_instance_list_free): Removed
-	function.
-
-	* cal-client/cal-client.c (build_component_alarms_list): New
-	function to demarshal the component alarms sequence.
-	(build_alarm_instance_list): New function to demarshal the alarm
-	instances sequence.
-	(cal_client_get_alarms_in_range): Updated for the new API.
-	(cal_client_get_alarms_for_object): Updated for the new API.
-
-	* gui/gnome-cal.c: Temporary #ifdef-ing out of alarm-related stuff
-	to make it build.
-
-2000-12-15  Federico Mena Quintero  <federico@helixcode.com>
-
-	* cal-util/timeutil.[ch] (time_from_isodate): Removed unused
-	function, a relic from Gnomecal.
-
-2000-12-15  Dan Winship  <danw@helixcode.com>
-
-	* cal-util/timeutil.c (time_from_isodate): Fix the sign in the
-	HAVE_TM_GMTOFF case
-
-2000-12-15  Federico Mena Quintero  <federico@helixcode.com>
-
-	* gui/Makefile.am (evolution_calendar_SOURCES): Removed getdate.y.
-	We no longer use it; it is a relic from Gnomecal.
-
-	* gui/getdate.y: Removed file.
-
-2000-12-14  Federico Mena Quintero  <federico@helixcode.com>
-
-	Fixes bug #955.
-
-	* gui/weekday-picker.c (WeekdayPickerPrivate): Added a field for
-	the week_start_day, to be used in the same way as
-	calendar-config.h defines it.  Removed the week_starts_on_monday
-	flag.
-	(day_event_cb): Use the week_start_day.
-	(colorize_items): Likewise.
-	(configure_items): Likewise.
-	(weekday_picker_set_week_start_day): New function.
-	(weekday_picker_get_week_start_day): New function.
-	(weekday_picker_set_week_starts_on_monday): Removed function.
-	(weekday_picker_get_week_starts_on_monday): Removed function.
-
-	* gui/widget-util.[ch]: New files with utilities for creating or
-	configuring widgets.
-
-	* gui/widget-util.c (date_edit_new): New function to create an
-	EDateEdit configured with the calendar's preferences; moved over
-	from event-editor.c.
-
-	* gui/event-editor.c (make_recur_weekly_special): Use
-	weekday_picker_set_week_start_day() and the corresponding function
-	from calendar-config.h.
-	(init_widgets): Likewise.
-	(make_date_edit_with_time): Removed function.
-	(make_recur_ending_until_special): Use date_edit_new().
-	(make_date_edit): Likewise.
-
-	* gui/dialogs/task-editor.c (task_editor_create_date_edit): Likewise.
-
-	* gui/event-editor-dialog.glade: Removed references to
-	make_date_edit_with_time(); replace them with make_date_edit().
-
-	* gui/Makefile.am (evolution_calendar_SOURCES): Added
-	widget-util.[ch] to the list of sources.
-
-2000-12-14  Federico Mena Quintero  <federico@helixcode.com>
-
-	* gui/e-calendar-table.c (E_CALENDAR_TABLE_SPEC): Reset the widths
-	of the columns with pixbufs to the actual pixbufs' sizes; now
-	ETable properly computes its column widths so we do not need to
-	add extra padding here.
-
-2000-12-14  Dan Winship  <danw@helixcode.com>
-
-	* gui/calendar-model.c (_XOPEN_SOURCE): #define this to 500, not
-	nothing. Also, move this bit after the other #includes to
-	prevent potential messiness.
-
-2000-12-13  Federico Mena Quintero  <federico@helixcode.com>
-
-	* cal-util/cal-component.c (ensure_mandatory_properties): Even
-	though icaltime_from_timet() now properly ignores the is_utc
-	argument since time_t values *are* in UTC by definition, we were
-	passing FALSE for that argument's value in a bunch of places.  So
-	although it is ignored, changed them to TRUE for consistency.
-	Hopefully newer versions of libical will remove that argument
-	entirely since it does not make sense to speak of non-absolute
-	time_t values.
-
-	* cal-util/cal-recur.c (cal_recur_set_rule_end_date): Likewise.
-
-	* conduits/calendar/calendar-conduit.c (comp_from_remote_record): Likewise.
-
-	* conduits/todo/todo-conduit.c (comp_from_remote_record): Likewise.
-
-	* gui/dialogs/task-editor.c (dialog_to_comp_object): Likewise.
-
-	* gui/e-day-view.c (e_day_view_on_new_appointment): Likewise.
-	(e_day_view_on_delete_occurrence): Likewise.
-	(e_day_view_on_unrecur_appointment): Likewise.
-	(e_day_view_on_unrecur_appointment): Likewise.
-	(e_day_view_finish_long_event_resize): Likewise.
-	(e_day_view_finish_resize): Likewise.
-	(e_day_view_key_press): Likewise.
-	(e_day_view_on_top_canvas_drag_data_received): Likewise.
-	(e_day_view_on_main_canvas_drag_data_received): Likewise.
-
-	* gui/e-week-view.c (e_week_view_key_press): Likewise.
-	(e_week_view_on_new_appointment): Likewise.
-	(e_week_view_on_delete_occurrence): Likewise.
-	(e_week_view_on_unrecur_appointment): Likewise.
-
-	* gui/event-editor.c (simple_recur_to_comp_object): Likewise.
-	(recur_to_comp_object): Likewise.
-	(dialog_to_comp_object): Likewise.
-
-	* gui/gnome-cal.c (gnome_calendar_new_appointment): Likewise.
-
-2000-12-13  Christopher James Lahey  <clahey@helixcode.com>
-
-	* cal-util/cal-recur.c: #if 0ed cal_obj_date_only_compare_func.
-	(cal_object_get_rdate_end): Changed this function to get rid of a
-	possible uninitialized error on the rdate function.
-
-	* gui/calendar-model.c: Fixed some warnings involving the #define
-	_XOPEN_SOURCE lines here.
-
-	* gui/component-factory.c: #ifdef WANT_THE_EXECUTIVE_SUMMARYed out
-	the summary_factory object since it's unused if
-	WANT_THE_EXCUTIVE_SUMMARY is not defined.
-
-	* gui/e-day-view.c: #if 0ed out e_day_view_remove_event_cb.
-	(obj_updated_cb): #ifndef NO_WARNINGSed out a #warning.
-
-	* gui/e-week-view-event-item.c (e_week_view_event_item_draw): Made
-	it so that
-
-	* gui/e-week-view.c (obj_updated_cb): #ifndef NO_WARNINGSed out a
-	#warning.
-
-2000-12-13  JP Rosevear  <jpr@helixcode.com>
-
-	* conduits/todo/Makefile.am: Revert federico's change for now
-	because of libtool limitations with ldadding shared libtool
-	libs
-
-	* conduits/calendar/Makefile.am: ditto
-
-2000-12-12  JP Rosevear  <jpr@helixcode.com>
-
-	* gui/dialogs/task-editor.c (task_editor_set_todo_object): Use
-	set_title_from_comp
-	(save_todo_object): ditto
-	(set_title_from_comp): Make sure the title is encoded properly (as in
-	event-editor)
-
-2000-12-12  Federico Mena Quintero  <federico@helixcode.com>
-
-	* cal-util/cal-component.c (get_text_list): Constify for new
-	libical API.
-	(set_text_list): Likewise.
-
-	* cal-util/cal-recur.c (cal_recur_get_rule_end_date): Likewise.
-	(cal_recur_set_rule_end_date): Likewise.
-
-	* gui/e-itip-control.c (find_attendee): Likewise.
-	(pstream_load): Likewise.
-
-	* gui/gnome-cal.c (released_event_object_cb): Removed unused function.
-
-	* gui/dialogs/task-editor.c (status_string_map): Removed unused
-	variable.
-
-2000-12-11  Federico Mena Quintero  <federico@helixcode.com>
-
-	* cal-util/Makefile.am (test_recur_LDADD): Link to the libical
-	shared library.
-
-	* cal-client/Makefile.am (client_test_LDADD): Likewise.
-
-	* conduits/calendar/Makefile.am (libecalendar_conduit_la_LIBADD):
-	Likewise.
-
-	* gui/Makefile.am (LINK_FLAGS): Likewise.
-
-2000-12-11  Federico Mena Quintero  <federico@helixcode.com>
-
-	This is to make things work with libical 0.21helix1 and later.
-	Warnings remain because at last libical was constified; will take
-	care of those tomorrow.
-
-	* cal-util/timeutil.h: #include <ical.h> instead of <icaltypes.h>
-
-	* gui/e-itip-control.c: Likewise.
-
-	* gui/e-meeting-edit.c: Likewise.
-
-	* gui/itip-utils.h: Likewise.
-
-	* cal-util/cal-component.c (alarm_uid_from_prop): constify.
-	(cal_component_get_status): Updated for new libical API.
-	(cal_component_set_status): Likewise.
-
-	* gui/calendar-model.c (ensure_task_complete): Removed unused
-	status code.
-	(ensure_task_not_complete): Update for new status API.
-
-	* gui/dialogs/task-editor.c (status_string_to_value): Removed
-	function.
-	(status_value_to_string): Removed function.
-	(status_string_map): Removed variable.
-	(fill_widgets): Update for new status API.
-	(dialog_to_comp_object): Likewise.
-
-2000-12-11  Damon Chaplin  <damon@helixcode.com>
-
-	* cal-util/cal-recur.c (generate_instances_for_chunk): updated the
-	tests on the start & end time just before calling the callback. It
-	was skipping occurrences that started before the required interval's
-	start time, which was wrong. We want all occurrences that intersect
-	the interval.
-	(cal_obj_time_weekday): removed the CalRecurrence* argument, since it
-	isn't needed.
-
-2000-12-11  Damon Chaplin  <damon@helixcode.com>
-
-	* gui/event-editor.c: added changed flags and added calls to a new
-	function event_editor_set_changed() to set & reset this flag.
-	Added prompt_to_save_changed() which is called when the user
-	selects File/Close or the window's close button.
-	Fixed the 'All day event' toggle button.
-	Made the 'Alarm' page sensitive as appropriate when filling widgets.
-	(Though note that the alarm widgets are not being set yet.)
-
-	* gui/dialogs/task-editor.c: added changed flag as above.
-
-	* gui/event-editor-dialog.glade: used good names for all the
-	classification radio buttons so we can access them in the code.
-
-	* gui/event-editor.c (init_widgets): use the "show week numbers" config
-	option in the recurrence preview calendar.
-
-	* gui/e-day-view.c (e_day_view_update_event_label): use 9:00 instead
-	of 09:00 in the main view, as we do everywhere else now. It means the
-	times won't line up, but they are easier to read which I think is
-	better.
-	Added support for Page Up/Down, though I think it should move the
-	selection rather than just scroll the canvas.
-
-	* cal-util/cal-recur.c (generate_instances_for_chunk): removed the
-	end parameter since we should be using the chunk end time now.
-	Added single_rule parameter for when we are generating the
-	occurrences of a single RRULE, in which case the event's start date is
-	not included in the occurrences output (unless it results from the
-	RRULE expansion). Both of these fix problems when using COUNT.
-
-	* gui/gnome-cal.c (gnome_calendar_on_date_navigator_selection_changed):
-	fixed bug when checking if the new start day starts on the week start
-	day. If you select a complete week it should now show the Week view.
-
-2000-12-08  Federico Mena Quintero  <federico@helixcode.com>
-
-	* gui/event-editor.c (dialog_to_comp_object): Free the strings we
-	get from the editables.
-
-	* gui/dialogs/task-editor.c (dialog_to_comp_object): Likewise.
-	This sucks; this code should be shared between the two dialogs.
-
-2000-12-08  Federico Mena Quintero  <federico@helixcode.com>
-
-	* gui/event-editor.c (fill_widgets): Free the dates we get from
-	the component.
-
-2000-12-08  JP Rosevear  <jpr@helixcode.com>
-
-	* gui/e-calendar-table.c (e_calendar_table_init): Attach signal
-	handlers to the e_scrolled_table's etable rather than to the
-	e_scrolled_table directly
-	(e_calendar_table_on_double_click): This signal provides more
-	params now
-
-2000-12-07  Christopher James Lahey  <clahey@helixcode.com>
-
-	* gui/e-calendar-table.c: Got rid of code referencing the
-	ETableScrolled proxy functions.
-
-2000-12-07  JP Rosevear  <jpr@helixcode.com>
-
-	* conduits/calendar/calendar-conduit.c (post_sync): Ugly hack for syncing
-	until pcs can be altered (longer term)
-
-	* conduits/todo/todo-conduit.c (post_sync): ditto
-
-2000-12-07  Chris Toshok  <toshok@helixcode.com>
-
-	* cal-client/Makefile.am (client_test_LDADD): add
-	EXTRA_GNOME_LIBS.
-
-2000-12-07  JP Rosevear  <jpr@helixcode.com>
-
-	* pcs/cal-backend.c (cal_backend_compute_changes_foreach_key): Create
-	an empty cal component if the object has been deleted.
-
-	* idl/evolution-calendar.idl: Bit shift the change type constants
-	properly
-
-2000-12-07  Federico Mena Quintero  <federico@helixcode.com>
-
-	* cal-client/cal-client.c (cal_client_generate_instances): Unref
-	the component from the objects list; it got referenced as many
-	times as appropriate for the instances list.
-
-2000-12-06  Federico Mena Quintero  <federico@helixcode.com>
-
-	* gui/event-editor.c (file_delete_cb): Confirm before deleting the
-	event.
-
-2000-12-06  JP Rosevear  <jpr@helixcode.com>
-
-	* gui/e-week-view.c (e_week_view_init): unref the pixbuf when
-	finished with it
-
-2000-12-06  Federico Mena Quintero  <federico@helixcode.com>
-
-	Fixes bug #920.
-
-	* gui/e-calendar-table.c (delete_component): New function.
-	(e_calendar_table_on_delete_task): Use delete_component().
-	(e_calendar_table_on_key_press): Likewise.  Also, mark the event
-	as handled.
-
-	* gui/calendar-model.c (calendar_model_get_component): Renamed
-	function from calendar_model_get_cal_object().
-	(calendar_model_delete_task): Removed function.
-
-	* gui/dialogs/delete-comp.[ch]: New files with the dialog for
-	deleting a calendar component.
-
-	* gui/e-day-view.c (e_day_view_on_delete_appointment): Confirm
-	before actually deleting the appointment.
-
-	* gui/e-week-view.c (e_week_view_on_delete_appointment): Likewise.
-
-	* gui/dialogs/Makefile.am (libcal_dialogs_a_SOURCES): Added
-	delete-comp.[ch] to the list of sources.
-
-	* cal-util/cal-component.c (cal_component_destroy): Free the alarm
-	UID hash.
-
-2000-12-06  JP Rosevear  <jpr@helixcode.com>
-
-	* pcs/cal.c (build_change_seq): kill
-	(Cal_get_changes): return the corba sequence directly
-
-	* pcs/cal-backend.h: update prototype
-
-	* pcs/cal-backend.c (cal_backend_compute_changes_foreach_key): Build
-	the corba struct rather than the old calobjchange thing
-	(cal_backend_compute_changes): ditto.  build and return the actual
-	corba sequence rather than the list of calobjchanges
-	(cal_backend_get_changes): return the corba sequence
-
-	* cal-util/cal-util.h: Remove CalObjChange cruft
-
-	* cal-util/cal-util.c (cal_obj_change_list_free): Kill
-
-2000-12-06  JP Rosevear  <jpr@helixcode.com>
-
-	* cal-util/cal-util.c:
-
-	* conduits/calendar/calendar-conduit.c (map_name): Update so as not to conflict
-	with calendar
-	(next_changed_item): update to use CalClientChange instead of CalObjChange
-	(compute_status): ditto
-	(pre_sync): ditto
-	(for_each_modified): since we now have the cal component we can call
-	local_record_from_comp directly
-
-	* conduits/todo/todo-conduit.c: same as above
-
-	* pcs/cal-backend.c: Remove much logging cruft
-	(cal_backend_compute_changes): Calculate the changes based on the
-	hashed database
-	(cal_backend_get_changes): call cal_backend_compute_changes
-	(cal_backend_compute_changes_foreach_key): hash callback for
-	calculating deletions
-
-	* pcs/cal-backend.h: update protype, remove logging cruft from
-	object
-
-	* pcs/cal.c (build_change_seq): dup the calobj rather than the uid
-	now
-	(Cal_get_changes): rename from Cal_get_changed_uids
-	(cal_get_epv): reflect name change in epv
-
-	* cal-util/cal-util.c (cal_obj_change_list_free): update assertion
-
-	* cal-util/cal-util.h: CalObjChange now returns the entire ical
-	component, update the change types.  This should all go away shortly
-
-	* idl/evolution-calendar.idl: getChangedUIds -> getChanges.
-	CalObjChange now contains the calobj rather than the uid, update
-	the change types
-
-	* cal-client/cal-client.c (cal_client_get_changes): rename from
-	cal_client_get_changed_uids to make idl and addressbook
-
-	* cal-client/cal-client.h: Update prototype
-
-	* cal-client/cal-client.c (build_change_list): Build a list of
-	CalClientChange instead of CalObjChange
-
-	* cal-client/cal-client-types.c (cal_client_change_list_free): Free
-	a glist of CalClientChanges
-
-	* cal-client/cal-client-types.h: New file. Declarations for
-	CalClientChange.
-
-	* cal-client/Makefile.am: Build new files
-
-2000-12-06  JP Rosevear  <jpr@helixcode.com>
-
-	* conduits/todo/Makefile.am: Fix my build stupidty READ THE MACRO
-
-	* conduits/calendar/Makefile.am: ditto
-
-2000-12-04  JP Rosevear  <jpr@helixcode.com>
-
-	* gui/e-day-view-time-item.c (e_day_view_time_item_get_column_width):
-	Initialize max_large_digit_width to 0 to prevent crazy sizing issues.
-
-2000-12-04  Dan Winship  <danw@helixcode.com>
-
-	* gui/e-itip-control.c: Remove mysterious #include inserted by
-	mmeeks to break the build.
-
-2000-12-01  Federico Mena Quintero  <federico@helixcode.com>
-
-	Fixes bug #918.
-
-	* gui/weekday-picker.c (WeekdayPickerPrivate): Added a field for a
-	set of blocked days.
-	(weekday_picker_set_blocked_days): New function to configure a set
-	of days that cannot be modified by the user.
-	(weekday_picker_get_blocked_days): Query function for the above.
-	(day_event_cb): Block the appropriate days from being modified.
-
-	* gui/event-editor.c (get_start_weekday_mask): New function to
-	compute a day mask for the start day of a calendar component.
-	(set_recur_special_defaults): New function to set sane defaults
-	for the recurrence special widgets.
-	(fill_recurrence_widgets): Use set_recur_special_defaults().
-	(make_recur_weekly_special): Block the appropriate days.
-
-2000-12-01  Federico Mena Quintero  <federico@helixcode.com>
-
-	* gui/control-factory.c (set_prop): Removed debugging message.
-	(control_factory_init): Ditto.
-
-	* gui/calendar-commands.c (calendar_set_uri): Ditto.
-
-	* gui/main.c (main): Ditto.
-
-	* gui/event-editor.c (set_title_from_comp): New function to
-	generate a title and convert it from UTF8 before setting it on the
-	window.
-	(save_event_object): Uset set_title_from_comp().
-	(event_editor_set_event_object): Likewise.
-
-2000-11-30  JP Rosevear  <jpr@helixcode.com>
-
-	* conduits/todo/todo-conduit.c:  Debug message cleanups
-	(comp_from_remote_record): Properly set the ical description field
-
-	* conduits/calendar/calendar-conduit.c (is_empty_time): New utility
-	functions that look for all 0's in a struct tm
-	(comp_from_remote_record): use above
-	(local_record_from_comp): Correctly set the repeatForever value so
-	that we repeat forever instead of a really long time
-	(comp_from_remote_record): Only set the cal component recurrence
-	until field when repeatForever is 0
-
-2000-11-30  Jesse Pavel   <jpavel@helixcode.com>
-
-	* gui/e-itip-control.c: fixed a bug that caused the calendar to
-	segfault when the iTip control was destroyed.
-
-2000-11-30  JP Rosevear  <jpr@helixcode.com>
-
-	* conduits/calendar/calendar-conduit.c (local_record_from_comp): Empty
-	by_day entries are no longer indicated by ICAL_RECURRENCE_ARRAY_MAX not
-	SHRT_MAX. Calculate weekly and monthly by date recurrences properly
-	(get_pilot_day): Convert ical day to corresponding integer for pilot day
-
-2000-11-30  JP Rosevear  <jpr@helixcode.com>
-
-	* conduits/calendar/calendar-conduit.c: Debug message cleanups
-	(get_ical_day): Fix off-by-one error which affected weekly occurences.
-	(comp_from_remote_record): Monthly by day and by date were reversed
-	(nth_weekday): function taken from event-editor.c that encodes BYDAY
-	values - this needs to be in libical really.
-	(comp_from_remote_record): Don't set the description if the pilot note
-	is null.  Rejig so that we don't have to free objects.
-
-2000-11-28  Federico Mena Quintero  <federico@helixcode.com>
-
-	Upgrade of the alarm framework.  We now access alarms by a unique
-	identifier.  This UID is added as an extension property to alarm
-	subcomponents when their parent components are scanned by
-	CalComponent.
-
-	* cal-util/cal-component.c (CalComponentPrivate): Added a hash
-	table of alarm UIDs -> alarm properties.
-	(cal_component_init): Initialize priv->alarm_uid_hash.
-	(free_icalcomponent): Free the elements in the
-	priv->alarm_uid_hash.
-	(scan_alarm): New function to add scan an alarm subcomponent and
-	ensure that it has an alarm UID extension property so that we can
-	add it to our mapping table.
-	(cal_component_get_first_alarm): Removed function.
-	(cal_component_get_next_alarm): Removed function.
-	(cal_component_get_alarm_uids): New function.
-	(cal_component_get_alarm): New function.
-
-2000-11-28  JP Rosevear  <jpr@helixcode.com>
-
-	* conduits/todo/todo-conduit.c (local_record_to_pilot_record): Return
-	a struct rather than a pointer to a struct
-	(compare): local_record_to_pilot_record now returns a struct
-	(prepare): ditto
-	(free_prepare): remove as per gnome-pilot changes
-	(conduit_get_gpilot_conduit): don't listen for free_prepare signal
-
-	* conduits/calendar/calendar-conduit.c: Same as above
-
-2000-11-28  Federico Mena Quintero  <federico@helixcode.com>
-
-	* gui/e-calendar-table.c (E_CALENDAR_TABLE_SPEC): Reformatted the
-	table spec to make it easier to read.
-
-	* gui/tag-calendar.c: Oops, Damon wrote this, not me.  Fixed the
-	Authors line.
-
-2000-11-28  Damon Chaplin  <damon@helixcode.com>
-
-	* gui/e-day-view*.[hc]:
-	* gui/e-week-view*.[hc]: finished 12-hour support and tried to tidy
-	up & comment the drawing code in places. Also fixed a couple of bugs I
-	spotted. All the options on the 'Calendar' page should now work.
-
-2000-11-28  Jesse Pavel   <jpavel@helixcode.com>
-
-	* gui/e-meeting-edit.c: removed some debugging code that I had,
-	which might have caused problems.
-
-2000-11-27  Jesse Pavel   <jpavel@helixcode.com>
-
-	* gui/calendar-model.c: added a preliminary change to have
-	Assigned To-Do items have a corresponding icon.
-
-2000-11-27  JP Rosevear  <jpr@helixcode.com>
-
-	* conduits/todo/todo-conduit.c (free_prepare): Ditto
-
-	* conduits/calendar/calendar-conduit.c (free_prepare): Adjust
-	free_prepare to the correct signal parameters.  Don't actually
-	do anything - there is a semantic discrepancy that needs to be
-	resolved.
-
-2000-11-26  Damon Chaplin  <damon@helixcode.com>
-
-	* gui/e-day-view.c (e_day_view_set_days_shown): == instead of =.
-
-2000-11-26  Damon Chaplin  <damon@helixcode.com>
-
-	* gui/gnome-cal.c: added more support for config settings.
-
-	* gui/e-week-view.[hc]:
-	* gui/e-day-view.[hc]: added support for setting - show event end
-	times, week start day and 12-hour format (unfinished).
-
-	* gui/e-day-view-time-item.c: started 12-hour support.
-
-	* gui/tag-calendar.c (prepare_tag): use end_day + 1 since we want to
-	include the last day.
-
-	* gui/event-editor.c (set_all_day): minor change when turning all_day
-	off - set the event end to one hour after the event start if it is on
-	or before the start time. Also added more comments to make it a bit
-	clearer.
-
-	* cal-util/cal-recur.c (cal_obj_time_add_days): use a gint for day
-	rather than a guint since we now support -ve days.
-	Also fixed bug with weekly recurrences.
-
-	* gui/dialogs/task-editor.c (task_editor_create_date_edit): use
-	config settings.
-
-	* gui/dialogs/cal-prefs-dialog.c (cal_prefs_dialog_update_config):
-	updated EDateEdit calls.
-
-2000-11-24  Federico Mena Quintero  <federico@helixcode.com>
-
-	* gui/e-calendar-table.c (e_calendar_table_init): Unref the ETable
-	extras.
-
-2000-11-24  Federico Mena Quintero  <federico@helixcode.com>
-
-	* cal-util/cal-component.c (free_icalcomponent): DOH, fixed
-	reversed test for the presence of the icalcomp's parent.  This was
-	causing memory leaks in the Wombat and elsewhere.
-
-	* pcs/cal-backend.c (cal_backend_set_node_timet): Plug leak.
-
-2000-11-24  Federico Mena Quintero  <federico@helixcode.com>
-
-	* pcs/cal-backend-file.c (scan_vcalendar): Use the new libical
-	external iterators (icalcomponent_begin_component() and friends);
-	the internal iterators are deprecated.
-
-	* cal-util/test-recur.c (generate_occurrences): Likewise.
-
-	* gui/e-itip-control.c (pstream_load): Likewise.
-
-	* gui/e-meeting-edit.c (e_meeting_edit): Likewise.
-
-	* pcs/cal-backend.c (cal_backend_log_entry): Plug leak.
-	(cal_backend_log_sync): Free the entry->uid.
-
-	* util/icalendar-save.[ch]:
-	* util/icalendar-test.c:
-	* util/icalendar.[ch]: Removed obsolete files.
-
-2000-11-21  Federico Mena Quintero  <federico@helixcode.com>
-
-	* gui/task.xpm: Remove the check because it makes it look like the
-	task is already completed.  This fixes bug #819.
-
-	* gui/task-recurring.xpm: Make it use a prettier overlaid icon.
-
-	* gui/task-*.xpm: Made the things look like little spiral-bound
-	notebooks.
-
-	* gui/e-calendar-table.c (E_CALENDAR_TABLE_SPEC): Make the default
-	column order be icon/completed/summary.  You may need to erase
-	your ~/evolution/config/TaskPad for this to appear.
-
-2000-11-21  Federico Mena Quintero  <federico@helixcode.com>
-
-	* gui/calendar-model.c (calendar_model_is_cell_editable): The icon
-	column is not editable!
-
-	* gui/calendar-commands.c (todo_properties_changed): Removed.
-	(time_format_changed): Removed.
-	(colors_changed): Removed.
-
-	* gui/calendar-commands.h:
-	* gui/prop.c (prop_apply):
-	* gui/calendar-commands.c (init_calendar): Removed the old to-do
-	list crap.
-
-	* gui/gncal-todo.[ch]: Removed obsolete files.
-
-	* gui/Makefile.am (evolution_calendar_SOURCES): Removed gncal-todo.[ch].
-
-	* gui/gnome-cal.c (gnome_calendar_todo_properties_changed): Removed.
-	(gnome_calendar_time_format_changed): Removed.
-	(gnome_calendar_colors_changed): Removed.
-
-2000-11-21   Jesse Pavel   <jpavel@helixcode.com>
-
-	* gui/e-itip-control.c: fixed the stupid Bonobo widget size
-	allocation bug that had been vexing me.
-
-	* gui/e-itip-control.glade: I removed some hacks that were
-	necessary for said size bug.
-
-2000-11-16   Jesse Pavel   <jpavel@helixcode.com>
-
-	* gui/e-itip-control.c, gui/e-meeting-edit.c: added cancellation
-	code to our program; people can cancel meetings, which is the best
-	thing to do for most meetings.
-
-2000-11-13   Jesse Pavel   <jpavel@helixcode.com>
-
-	* gui/e-itip-control.c: made the REPLY code actually work.
-
-2000-11-13   Jesse Pavel   <jpavel@helixcode.com>
-
-	* gui/itip-utils.[ch]: I created this file to store some commonly used enumeration to
-	string mappings and functions.
-
-	* gui/Makefile.am: this was changed to reflect the addition of the above file.
-
-	* gui/e-itip-control.c: added code to take action on a REPLY message.
-
-	* gui/e-meeting-edit.c: bug fixes.
-
-2000-11-12  Federico Mena Quintero  <federico@helixcode.com>
-
-	OK, bugzilla bug #829 is fixed and that does not redeem me from
-	extreme procrastination.  Wheeeeeeeeeeeeeeee!
-
-	* gui/event-editor-dialog.c: Changed the "Rule view" label to
-	"Preview"
-
-2000-11-12  Federico Mena Quintero  <federico@helixcode.com>
-
-	* gui/event-editor.c (make_recur_ending_count_special): Misspelled
-	"occurrences".
-	(fill_recurrence_widgets): Sensitize the "Custom recurrence" radio
-	button as appropriate.
-	(sensitize_recur_widgets): Resurrected the recurrence custom
-	warning label.
-	(get_widgets): Load the recurrence custom warning bin.
-
-	* gui/event-editor-dialog.glade: Add an empty alignment for the
-	recurrence custom warning label.
-
-2000-11-12  Federico Mena Quintero  <federico@helixcode.com>
-
-	* gui/event-editor.c (recur_preview_date_range_changed_cb): New
-	function; re-tag the calendar when its date range changes.
-	(init_widgets): Connect to "date_range_changed" on the recurrence
-	preview calendar.
-	(make_recur_weekly_special): Connect to "changed" on the weekday
-	picker.
-	(recur_weekday_picker_changed_cb): New function; re-tag the calendar.
-	(month_day_menu_selection_done_cb): Re-tag the calendar.
-	(recur_month_index_value_changed_cb): Likewise.
-	(recur_ending_until_changed_cb): Likewise.
-	(recur_ending_count_value_changed_cb): Likewise.
-	(make_recur_monthly_special): Connect to "value_changed" on the
-	adjustment of the month index.
-	(make_recur_ending_until_special): Connect to "changed" on the
-	ending-until date picker.
-	(make_recur_ending_count_special): Connect to "value_changed" on
-	the ending-count adjustment.
-	(init_widgets): Set to zero the maximum number of selectable days
-	in the recurrence preview calendar.  Set the week_start_day from
-	the calendar's configuration.
-
-2000-11-12  Federico Mena Quintero  <federico@helixcode.com>
-
-	* gui/event-editor.c (clear_widgets): Block the signals as appropriate.
-	(fill_ending_date): Ditto.
-	(fill_recurrence_widgets): Ditto.
-	(recurrence_type_toggled_cb): Only sensitize the widgets and
-	preview the recurrence if the toggle button is active.
-
-2000-11-12  Federico Mena Quintero  <federico@helixcode.com>
-
-	* gui/event-editor.c (recur_to_comp_object): Clear the rdate and
-	exrule lists from the component if we are setting a simple
-	recurrence.
-	(recur_to_comp_object): Set the exdate list here instead of in
-	dialog_to_comp_object().
-	(preview_recur): New function to tag the recurrence preview
-	calendar based on the information from the dialog box.
-	(fill_exception_widgets): Fill the exception widgets here; moved
-	over from fill_widgets().
-	(fill_recurrence_widgets): Call preview_recur().  Also, call
-	fill_exception_widgets() first of all.
-	(recurrence_type_toggled_cb): Call preview_recur().
-	(recur_interval_selection_done_cb): Likewise.
-	(recur_ending_selection_done_cb): Likewise.
-	(recurrence_exception_add_cb): Likewise.
-	(recurrence_exception_modify_cb): Likewise.
-	(recurrence_exception_delete_cb): Likewise.
-	(date_changed_cb): Likewise.
-	(recur_interval_value_changed_cb): Likewise, new function.
-
-	* gui/tag-calendar.[ch]: New files with utilities for tagging
-	calendars.  mark.[ch] should go away some day.
-
-	* gui/tag-calendar.c (tag_calendar): Moved over from
-	gnome_calendar_tag_calendar().  Take in a CalClient instead of a
-	GnomeCalendar.  Added API docs.
-	(tag_calendar_by_comp): New function to tag a calendar based on a
-	single calendar component instead of a whole client.
-
-	* gui/gnome-cal.c (initial_load): Use tag_calendar_by_client().
-	(obj_updated_cb): Likewise.
-	(obj_removed_cb): Likewise.
-	(gnome_calendar_on_date_navigator_date_range_changed): Likewise.
-	(editor_closed_cb): Free the closure.
-	(destroy_editor_cb): Renamed from free_uid().  Do not free the
-	UID; just unref the event editor.  Our destroy handler to it will
-	free things properly.  This will also cause the corresponding
-	calendar client to be unrefed.
-	(editor_closed_cb): Use a flag on the GnomeCalendar to decide
-	whether to remove the editor from the hash table.  This is sort of
-	icky.
-
-	* gui/calendar-model.c (obj_updated_cb): If the object is new, we
-	have to use e_table_model_row_inserted(), not row_changed().
-	Thanks to JP Rosevear for reporting this.
-
-	* gui/Makefile.am (evolution_calendar_SOURCES): Added
-	tag-calendar.[ch] to the list of sources.
-
-2000-11-11  Matt Bissiri  <bissiri@eecs.umich.edu>
-
-	* gui/evolution-calendar.oafinfo:
-	Update the remaining "IDL:Evolution*" to "IDL:GNOME/Evolution*"
-	to sync up with yesterday's IDL re-scoping.
-
-2000-11-10  Michael Meeks  <michael@helixcode.com>
-
-	* gui/Makefile.am ($(IDL_GENERATED)): sort include order.
-
-	* pcs/Makefile.am (idl_flags): ditto.
-
-2000-11-10  JP Rosevear  <jpr@helixcode.com>
-
-	* conduits/calendar/calendar-conduit.c (for_each_modified): Inc the
-	iterator before finding the next changed item.
-
-	* conduits/todo/todo-conduit.c (for_each_modified): ditto
-
-2000-11-09   Jesse Pavel   <jpavel@helixcode.com>
-
-	* gui/e-itip-control.c: I wrote the code so that recipients of meeting requests
-	can reply appropriately.
-
-2000-11-09   Jesse Pavel   <jpavel@helixcode.com>
-
-	* gui/e-meeting-edit.c:  fixed a bug that would make the calendar segfault
-	if the meeting editor were called up twice without first saving the
-	component.
-
-2000-11-08   Jesse Pavel   <jpavel@helixcode.com>
-
-	* gui/e-itip-control.c, gui/e-itip-control.glade: updated the GUI
-	to allow the user to add PUBLISHed events to his calendar, and created
-	unworking buttons for meeting requests.
-
-2000-11-08  Federico Mena Quintero  <federico@helixcode.com>
-
-	These changes fix bugzilla bugs #874 and #875.
-
-	* cal-util/cal-component.c (cal_component_get_exdate_list): Return
-	a list of CalComponentDateTime instead of simple struct
-	icaltimetype objects.  Exception date properties *can* contain a
-	timezone parameter, so we need to include those if they are
-	present.
-	(cal_component_set_exdate_list): On the input, handle a list of
-	CalComponentDateTime structures.  On the internals, handle a list
-	of struct datetime instead of plain properties.
-	(cal_component_free_exdate_list): Handle a list of
-	CalComponentDateTime structures.
-	(scan_exdate): Create a list of struct datetime structures.
-	(free_icalcomponent): Free the exdate_list properly.
-
-	* cal-util/cal-recur.c (generate_instances_for_chunk): Use the
-	proper types for exception dates.
-
-	* gui/comp-util.h:
-	* gui/comp-util.c: New files with utilities for manipulating
-	calendar component objects.
-	(cal_comp_util_add_exdate): New function.
-
-	* gui/Makefile.am (evolution_calendar_SOURCES): Added
-	comp-util.[ch] to the list of sources.
-
-	* gui/e-day-view.c (add_exdate): New convenience function to add
-	an exception date to a calendar component.
-	(e_day_view_on_unrecur_appointment): Use cal_comp_util_add_exdate().
-	(e_day_view_on_delete_occurrence): Likewise.
-
-	* gui/e-week-view.c (e_week_view_on_delete_occurrence): Likewise.
-	(e_week_view_on_unrecur_appointment): Likewise.
-
-	* gui/event-editor.c (nth_weekday): Be paranoid about valid
-	position values.
-	(fill_widgets): Use the proper types for exdates.
-	(dialog_to_comp_object): Likewise.
-
-2000-11-08  Federico Mena Quintero  <federico@helixcode.com>
-
-	* gui/event-editor.c (adjust_day_index_spin): Adjust the valid
-	range of the month index spin button depending on the selection of
-	the day/weekday menu.
-
-2000-11-07   Jesse Pavel   <jpavel@helixcode.com>
-
-	* gui/e-itip-control.c, gui/e-itip-control.glade: changed the GUI,
-	and added some extra feedback for the user.
-
-2000-11-07  Federico Mena Quintero  <federico@helixcode.com>
-
-	* gui/weekday-picker.h (WeekdayPickerClass): Added a "changed"
-	signal to notify of changes to the set of selected days.
-
-	* gui/weekday-picker.c (weekday_picker_class_init): Create the
-	"changed" signal.
-	(weekday_picker_set_days): Emit the "changed" signal.
-
-2000-11-06   Jesse Pavel   <jpavel@helixcode.com>
-
-	* gui/e-itip-control.c, gui/e-itip-control.glade: changed to GUI to
-	accomodate dynamically generated buttons, which will be tailored to
-	the type of iTip message that is incoming.
-
-	* gui/e-meeting-dialog.glade gui/e-meeting-edit.c: added a new button
-	to publish events, in addition to requesting meetings.
-
-2000-11-05  Federico Mena Quintero  <federico@helixcode.com>
-
-	* gui/event-editor-dialog.glade: Removed the old recurrence page.
-	Wheeeeeeeeee!
-
-	* gui/event-editor.c (make_recurrence_special): Clear the monthly
-	widgets.
-	(make_recur_monthly_special): Create the monthly widgets.
-	(clear_widgets): Clear the monthly values.
-	(simple_recur_to_comp_object): Fill in the monthly values.
-	(fill_recurrence_widgets): Fill in the monthly and yearly source
-	values.
-	(dialog_to_comp_object): Take in a CalComponent instead of using
-	the event editor's directly.
-	(recur_to_comp_object): Likewise.
-	(simple_recur_to_comp_object): Likewise.
-	(EventEditorPrivate): Removed the widgets from the old recurrence
-	page.
-	(get_widgets): Likewise.
-	(clear_widgets): Likewise.
-	(dialog_to_comp_object): If the description or summary are empty,
-	just clear the description list or summary property, respectively,
-	instead of saving empty ones.
-	(simple_recur_to_comp_object): Set the week_start field.
-
-	* gui/main.c: Fix includes, and add calendar-config.h.
-
-	* gui/Makefile.am (evolution_calendar_SOURCES): The glade messages
-	file should not be in SOURCES.
-
-2000-11-05  Christopher James Lahey  <clahey@helixcode.com>
-
-	* doc/.cvsignore, doc/C/.cvsignore: Removed unnecessary .cvsignore
-	files.
-
-2000-11-03  Federico Mena Quintero  <federico@helixcode.com>
-
-	* gui/event-editor.c (check_all_day): Block signals from the
-	toggle button.
-	(date_changed_cb): Merged check_dates() and check_times() into
-	this function; provide better behavior as well.
-	(check_dates): Removed function.
-	(check_times): Removed function.
-	(init_widgets): Connect to the "changed" signal on the start_time
-	and end_time widgets.
-	(check_all_day): Use a better test.
-
-	* gui/Makefile.am: Clean the idl-generated sources properly.
-	* cal-client/Makefile.am: Likewise.
-
-2000-11-03  Jesse Pavel <jpavel@helixcode.com>
-
-	* gui/e-itip-control.c: added some checks for the type of an
-	incoming iCal component before passing it off to the CalComponent
-	routines.
-
-2000-11-02  Federico Mena Quintero  <federico@helixcode.com>
-
-	* gui/dialogs/task-editor.c (init_widgets): The date editor's
-	signal is now "changed".
-	(completed_changed): Renamed callback to reflect the name of the
-	signal.
-
-2000-11-01  Gediminas Paulauskas  <menesis@delfi.lt>
-
-	* gui/main.c: (main): added call to bindtextdomain and textdomain, so
-	all calendar gui shows up localized.
-
-2000-10-31  Federico Mena Quintero  <federico@helixcode.com>
-
-	* gui/event-editor.c (count_by_xxx): Hmmm.  SHRT_MAX changed to
-	ICAL_RECURRENCE_ARRAY_MAX in libical.  Deal with it.
-	(fill_recurrence_widgets): Likewise.
-	(simple_recur_to_comp_object): Fixed incorrect assertion.  The
-	weekday picker is not the immediate child of the recurrence
-	special container.
-	(fill_recurrence_widgets): Call make_recurrence_special() after
-	setting the recurrence period type.
-	(fill_ending_date): Call make_recurrence_ending_special().  This
-	would be so much nicer if GTK+ were model/view all over.
-
-2000-10-31  JP Rosevear  <jpr@helixcode.com>
-
-	* conduits/todo/todo-conduit.h: Remove add/del/mod hashes and
-	add changed_hash.
-
-	* conduits/calendar/calendar-conduit.h: ditto
-
-	* conduits/todo/todo-conduit.c (next_changed_item): Utility function
-	to get the next "really" changed item (changed status can be cleared now)
-	(compute_status): Compute status based on changed_hash
-	(pre_sync): Fill changed_hash and counts adds/mods/dels
-	(set_status_cleared): New callback handler - avoid double syncing
-	(for_each_modified): Use next_changed_item to iterate
-	(add_archive_record): kill
-	(delete_archive_record): kill
-	(archive_record): New callback handler - mark/unmark archive status
-	(conduit_get_gpilot_conduit): Adjust signal connects
-
-	* conduits/calendar/calendar-conduit.c: ditto
-
-2000-10-30  Federico Mena Quintero  <federico@helixcode.com>
-
-	* gui/event-editor.c (sensitize_recur_widgets): New function.  We
-	split it from the radio callback so that we can call it explicitly
-	from fill_recurrence_widgets().
-	(fill_recurrence_widgets): Call sensitize_recur_widgets() as
-	appropriate.
-
-2000-10-30  Federico Mena Quintero  <federico@helixcode.com>
-
-	* gui/calendar-commands.c (new_calendar): Removed the geometry and
-	hidden arguments.  This code is ancient.
-	(all_calendars): Made static.  This sucks; configuration should be
-	notification-based instead of "let's iterate through all open
-	calendars".
-	(active_calendars): Removed.  Functions can check the length of
-	the all_calendars list if they are interested.
-
-	* gui/event-editor.c (sync_entries): Do not take in an extra data
-	pointer.
-	(summary_changed_cb): Use a single call back to sync both entries.
-	(sync_date_edits): New function to sync two EDateEdit widgets.
-	(init_widgets): Connect the general and recurrence starting date
-	widgets.
-
-2000-10-27  Federico Mena Quintero  <federico@helixcode.com>
-
-	* gui/event-editor.c (sync_entries): New function.
-	(general_summary_changed_cb): Sync the general summary to the
-	recurrence summary widget.
-	(recurrence_summary_changed_cb): Vice-versa.
-	(init_widgets): Hook to the summaries.
-
-	* event-editor-dialog.glade: Do not expand/fill the start and end
-	date so that the "all day event" button is not pushed all the way
-	to the right.
-	Decrease the spacing between the recurrence sentence widgets.
-	Remove a spurious empty label that was lurking around the
-	recurrence widgets.
-	Make the alarm widgets expand the right way.
-	Delete old recurrence widgets.
-
-2000-10-27  Federico Mena Quintero  <federico@helixcode.com>
-
-	* gui/event-editor.c (init_widgets): Connect to the recurrence
-	ending menu.
-	(recur_ending_selection_done_cb): Implemented.
-	(make_recurrence_ending_special): Implemented.
-	(make_recur_ending_until_special): Implemented.
-	(fill_ending_date): Implemented.
-	(make_recur_ending_count_special): Implemented.
-	(simple_recur_to_comp_object): Fill in the ending date.
-	(clear_widgets): Clear the recurrence ending widgets.
-
-	* gui/event-editor-dialog.glade: Moved the recurrence type radio
-	buttons to a single hbox to save space.
-	Fixed the lower value of the recurrence interval spin button.
-	Removed the stale widgets from the recurrence ending date part.
-
-2000-10-27  Jesse Pavel <jpavel@helixcode.com>
-
-	* gui/e-meeting-edit.c: fixed problems in which I allocated CORBA
-	strings of 0 length, but then didn't NULL terminate them.
-
-2000-10-27    <jpr@helixcode.com>
-
-	* conduits/calendar/calendar-conduit.c (check_for_slow_setting):
-	Check boundary case of fast sync
-
-	* conduits/todo/todo-conduit.c (check_for_slow_setting): ditto
-
-2000-10-27    <jpr@helixcode.com>
-
-	* conduits/calendar/calendar-conduit.c (add_archive_record): Remove
-	invalid test.
-	(local_record_from_comp): If the event is all day, mark it as timeless
-	(comp_from_remote_record): Timeless events take up all day
-
-	* conduits/todo/todo-conduit.c (add_archive_record): ditto
-
-2000-10-27  JP Rosevear  <jpr@helixcode.com>
-
-	* conduits/todo/todo-conduit.c (add_archive_record): Take proper
-	number of parameters
-
-	* conduits/calendar/calendar-conduit.c (add_archive_record): ditto
-
-2000-10-26  Federico Mena Quintero  <federico@helixcode.com>
-
-	* gui/event-editor.c (EventEditorPrivate): Integrate Anna's new
-	recurrence page.  Replace the old widget pointers with the new
-	ones.  Modified the relevant functions accordingly and added
-	plenty of new ones.
-	(event_editor_get_cal_client): New function.
-	(fill_recurrence_widgets): This is *THE* tricky function for you.
-	It has to discriminate whether we get a recurrence we support for
-	editing or not.  And this is not trivial.  Sigh.
-	(event_editor_update_widgets): Added preconditions and API docs.
-
-	* event-editor-dialog.glade: Fixed all the spacings/
-	paddings/packing options so that the widgets will look right if
-	the dialog box is resized.  Also fixes some misaligned widgets.
-
-	* cal-util/cal-component.c (cal_component_set_rdate_list): Removed
-	incorrect assertion.
-
-2000-10-26  Michael Meeks  <michael@helixcode.com>
-
-	* pcs/cal-factory.c (str_tolower): unsigned chars to isalpha
-
-	* cal-util/calobj.c (weekdaylist, weekdaynum): ditto.
-
-2000-10-25  Jesse Pavel <jpavel@helixcode.com>
-
-	* gui/e-meeting-edit.c: brushed up some code to deal with
-	the organizer entry, and solidified the CORBA memory-freeing
-	issues.
-
-2000-10-25  Jesse Pavel <jpavel@helixcode.com>
-
-	* removed the Evolution-Composer generated files, due
-	to a tip on how we do things.
-
-2000-10-25  Jesse Pavel <jpavel@helixcode.com>
-
-	* gui/e-meeting-edit.c: I fixed a bunch of memory-deallocation
-	bugs, and finished the initial integration with the mailer.
-
-	* gui/Makefile.am: made the build us the Evolution-Composer.idl
-	from the composer directory.
-
-2000-10-25  Jesse Pavel <jpavel@helixcode.com>
-
-	* gui/Evolution-Composer.idl: added this from the composer IDL sources
-
-	* gui/Makefile.am: changed to reflect the above IDL and the associated
-	orbit-idl generated files.
-
-	* gui/Evolution-Composer.h,
-	  gui/Evolution-Composer-common.c,
-	  gui/Evolution-Composer-stubs.c,
-	  gui/Evolution-Composer-skels.c:
-	the generated files, as per the above description.
-
-	* gui/e-meeting-edit.c: more work towards mailer integration.
-
-2000-10-24  Jesse Pavel <jpavel@helixcode.com>
-
-	* gui/e-meeting-edit.c: I've added code to interact with the mailer's
-	CORBA interfaces, though it's not yet working.
-
-2000-10-23  JP Rosevear  <jpr@helixcode.com>
-
-	* conduits/todo/todo-conduit.c (local_record_from_comp): Use
-	new e-pilot-map lookup function
-	(match): ditto
-
-	* conduits/calendar/calendar-conduit.c (local_record_from_comp): Use
-	new e-pilot-map lookup function
-	(match): ditto
-
-2000-10-23  Dan Winship  <danw@helixcode.com>
-
-	* pcs/Makefile.am (INCLUDES):
-	* gui/dialogs/Makefile.am (INCLUDES):
-	* gui/Makefile.am (INCLUDES):
-	* cal-util/Makefile.am (INCLUDES):
-	* cal-client/Makefile.am (INCLUDES): Update GNOMELOCALEDIR.
-
-2000-10-23  JP Rosevear  <jpr@helixcode.com>
-
-	* conduits/todo/todo-conduit.h: Use new libeconduit calls and
-	abstraction
-
-	* conduits/calendar/calendar-conduit.c: ditto
-
-	* conduits/calendar/calendar-conduit.h: ditto
-
-	* conduits/todo/todo-conduit.c: ditto
-
-	* conduits/calendar/Makefile.am: Add libeconduit-static.la
-
-	* conduits/calendar/calendar-conduit.c (post_sync): Use e_pilot_map_write
-	(pre_sync): Use e_pilot_map_read
-
-2000-10-23  JP Rosevear  <jpr@helixcode.com>
-
-	* conduits/todo/Makefile.am: Add libeconduit-static.la
-
-	* conduits/todo/todo-conduit.c (post_sync): Use e_pilot_map_write
-	(pre_sync): Use e_pilot_map_read
-
-2000-10-21  Damon Chaplin  <damon@helixcode.com>
-
-	* gui/dialogs/cal-prefs-dialog.c
-	(cal_prefs_dialog_use_24_hour_toggled): removed debug message.
-
-	* gui/e-calendar-table.c (e_calendar_table_save_state): new function
-	to save the state of the table to a given file.
-
-	* gui/e-calendar-table.h (struct _ECalendarTable): added etable field
-	so we can access it to save the state.
-
-	* gui/gnome-cal.c (gnome_calendar_destroy): call
-	e_calendar_table_save_state() to save the state of the TaskPad.
-	(setup_widgets): load the state of the TaskPad.
-
-	* gui/calendar-config.c: added support for the default view.
-
-	* gui/gnome-cal.c (gnome_calendar_construct):
-	(gnome_calendar_set_view_internal): use/set the default view setting.
-
-2000-10-20  Jesse Pavel <jpavel@helixcode.com>
-
-	* gui/e-meeting-editor.c: added more (working) integration with the
-	meeting schedular.
-
-2000-10-20  Jesse Pavel <jpavel@helixcode.com>
-
-	* cal-utils/cal-component.c: in set_datetime(), I put an #if 0'd portion
-	of the code back into operation, because the icalproperty_remove_parameter()
-	function is now implemented.
-
-	* gui/e-meeting-editor.c: added more (unworking) integration with the
-	meeting schedular.
-
-2000-10-20  JP Rosevear  <jpr@helixcode.com>
-
-	* pcs/cal-backend.c (cal_backend_destroy): New destroy
-	handler to properly stop the timer, sync the log and unref
-	the URI.
-	(cal_backend_last_client_gone): Just emit the signal,
-	clean up work is done in cal_backend_destroy now.
-
-	* pcs/cal-backend-file.c (cal_backend_file_load): Unref the
-	uri we are replacing NOT the new uri.
-
-2000-10-20  JP Rosevear  <jpr@helixcode.com>
-
-	* conduits/todo/Makefile.am: Fix build
-
-	* conduits/calendar/Makefile.am: Fix build
-
-2000-10-20  JP Rosevear  <jpr@helixcode.com>
-
-	* conduits/calendar/calendar-conduit.c (delete_archive_record):
-	Don't throw an error
-
-	* conduits/todo/todo-conduit.c (delete_archive_record): ditto
-
-2000-10-20  JP Rosevear  <jpr@helixcode.com>
-
-	* conduits/todo/todo-conduit-control-applet.c: Add defines
-
-	* conduits/todo/todo-conduit-config.h: put #ifdefs around functions
-	can't make this a public interface in the usual way as then the
-	symbols would be exported
-
-	* conduits/todo/todo-conduit.c: Kill warnings. clahey will be
-	happy! Add some defines to include only the necessary config functions.
-	(conduit_get_gpilot_conduit): Hook up archive signals
-
-	* conduits/calendar/calendar-conduit.c: Same as above
-
-	* conduits/calendar/calendar-conduit-control-applet.c: ditto
-
-	* conduits/calendar/calendar-conduit-config.h: ditto
-
-2000-10-20  Michael Meeks  <michael@helixcode.com>
-
-	* gui/calendar-commands.h: s/BonoboUIHandler/BonoboUIComponent/
-
-	* gui/calendar-commands.c (properties_cmd): ditto.
-
-2000-10-20  Damon Chaplin  <damon@helixcode.com>
-
-	* gui/calendar-model.c (calendar_model_value_at): use
-	cal_component_has_alarms().
-
-2000-10-20  Damon Chaplin  <damon@helixcode.com>
-
-	* gui/e-calendar-table.c (E_CALENDAR_TABLE_SPEC): added
-	_click-to-add-message, though I'm not sure if i18n will work.
-
-	* cal-util/cal-recur.c (cal_obj_time_add_hours):
-	(cal_obj_time_add_minutes):
-	(cal_obj_time_add_seconds): updated to handle -ve args.
-
-	* cal-util/timeutil.c (time_add_day): set tm_isdst to -1 before calling
-	mktime().
-
-	* cal-util/cal-recur.c (generate_instances_for_chunk): don't call the
-	callback if the event ends exactly on the interval start time.
-
-	* gui/e-week-view.c (e_week_view_reshape_event_span):
-	* gui/e-week-view-event-item.c (e_week_view_event_item_draw_icons):
-	* gui/e-day-view-top-item.c (e_day_view_top_item_draw_long_event):
-	* gui/e-day-view-main-item.c (e_day_view_main_item_draw_day_event):
-	* gui/e-day-view.c (e_day_view_reshape_long_event):
-	(e_day_view_reshape_day_event): use cal_component_has_alarms().
-
-	* cal-util/cal-component.[hc]: added cal_component_has_alarms().
-
-2000-10-16  Damon Chaplin  <damon@helixcode.com>
-
-	* gui/calendar-config.c (config_read): set default MonthVPanePosition
-	to 1 rather than 0, so if you move the hpane you'll see the date
-	navigator.
-
-2000-10-19  Jesse Pavel <jpavel@helixcode.com>
-
-	* gui/event-editor.[ch]: added a public function which causes the
-	event editor to reload its widgets to the associated CalComponent.
-
-	* gui/e-meeting-edit.c: added rudimentary support for the phat
-	e-meeting-time-selector widget, though it has no effect on the
-	component yet.
-
-	* gui/Makefile.am: the meeting editor depends on the meeting widget
-	library, now.
-
-	* gui/e-itip-control.glade: I added another toolbar button that summons
-	from the hoary deep the meeting time widget.
-
-2000-10-19  Ettore Perazzoli  <ettore@helixcode.com>
-
-	* gui/Makefile.am: Add `event-editor-dialog.glade.h'.
-	(EXTRA_DIST): Add `$(glade_messages)'.
-
-2000-10-19  Michael Meeks  <michael@helixcode.com>
-
-	* gui/calendar-commands.c (tb_print_cb): remove; redundant.
-
-	* gui/event-editor.c (create_menu, create_toolbar): kill.
-	(event_editor_destroy): upd.
-	(event_editor_construct): update to new UI handler, cast
-	priv->general_summary to a widget not an object.
-
-2000-10-18  Michael Meeks  <michael@helixcode.com>
-
-	* gui/dialogs/task-editor.c (create_menu, create_toolbar): die.
-	(debug_xml_cb): add debugging hook.
-
-	* gui/dialogs/Makefile.am: add EVOLUTION_DATADIR
-
-	* gui/dialogs/task-editor.c (task_editor_construct): upd for new UI.
-
-2000-10-17  JP Rosevear  <jpr@helixcode.com>
-
-	* conduits/todo/todo-conduit-control-applet.c: Add defines
-
-	* conduits/todo/todo-conduit-config.h: put #ifdefs around functions
-	can't make this a public interface in the usual way as then the
-	symbols would be exported
-
-	* conduits/todo/todo-conduit.c: Kill warnings. clahey will be
-	happy! Add some defines to include only the necessary config functions.
-	(conduit_get_gpilot_conduit): Hook up archive signals
-
-	* conduits/calendar/calendar-conduit.c: Same as above
-
-	* conduits/calendar/calendar-conduit-control-applet.c: ditto
-
-	* conduits/calendar/calendar-conduit-config.h: ditto
-
-2000-10-16  Jesse Pavel <jpavel@helixcode.com>
-
-	* gui/e-itip-control.c: You can now add incoming iTip
-	messages to your calendar store.
-
-	* gui/e-itip-control.glade: added a progress bar dialog
-	in case the calendar loading takes a long time.
-
-2000-10-16  JP Rosevear  <jpr@helixcode.com>
-
-	* cal-client/cal-client.h: Remove pilot cruft.  All pilot stuff
-	is in the conduits now and uses the logging facility.
-
-	* pcs/cal-backend-file.c: ditto
-
-	* pcs/cal-backend.h: ditto
-
-	* pcs/cal-backend.c: ditto
-
-	* pcs/cal.c: ditto
-
-	* pcs/cal.h: ditto
-
-	* idl/evolution-calendar.idl: ditto
-
-	* cal-util/cal-component.h: ditto
-
-	* cal-util/cal-component.c: ditto
-
-	* cal-client/cal-client.c: ditto
-
-	* conduits/calendar/calendar-conduit.c (local_record_from_comp):
-	Take a stab at storing recurrence stuff on the pilot properly
-
-	* pcs/cal-backend.c (cal_backend_update_object): Don't log the
-	event until after the update in case its a new item
-
-2000-10-16  Tuomas Kuosmanen  <tigert@helixcode.com>
-
-	* gui/dayview.xpm, gui/workweekview.xpm, gui/weekview.xpm
-	gui/monthview.xpm gui/yearview.xpm: Updated icons, let me know
-	if you like these or not, I might work on these some more but
-	I wanted to put these versions up anyway to get feedback..
-
-2000-10-15  Dan Winship  <danw@helixcode.com>
-
-	* gui/Makefile.am: Remove CPPFLAGS def since the -D there was
-	already in INCLUDES
-
-2000-10-14  Ettore Perazzoli  <ettore@helixcode.com>
-
-	* gui/evolution-calendar.oafinfo: Added an
-	"evolution:shell-component-icon" attribute.
-
-2000-10-12  Jesse Pavel <jpavel@helixcode.com>
-
-	* gui/e-itip-control.{c,glade}: Made the control much more
-	relavent to the function at hand.
-
-2000-10-12  Damon Chaplin  <damon@helixcode.com>
-
-	* gui/e-calendar-table.c (E_CALENDAR_TABLE_SPEC): set the 2 icon
-	columns to a min width of 18 and resizable to FALSE.
-
-2000-10-12  Damon Chaplin  <damon@helixcode.com>
-
-	* gui/calendar-commands.c (calendar_control_activate):
-	(update_pixmaps):
-	(set_pixmap): set the pixmaps of the toolbar buttons for the views,
-	and removed a lot of old unused stuff. We'll use plain buttons for
-	the view buttons for now, until Bonobo toolbars support radio buttons.
-
-	* gui/gnome-cal.c (gnome_calendar_dayjump): check day_button is not
-	NULL before using it.
-	(gnome_calendar_update_view_buttons): check button is not NULL.
-
-2000-10-11  Damon Chaplin  <damon@helixcode.com>
-
-	* gui/e-day-view-time-item.c (e_day_view_time_item_draw): got 12/24
-	hour format the wrong way round.
-
-2000-10-12  JP Rosevear  <jpr@helixcode.com>
-
-	* conduits/calendar/calendar-conduit.c (comp_from_remote_record):
-	Store recurrence stuff on the desktop properly
-	(get_ical_day): Utility function
-
-2000-10-12  Iain Holmes  <iain@helixcode.com>
-
-	* gui/component-factory.c: Disable the executive summary.
-
-2000-10-11  JP Rosevear  <jpr@helixcode.com>
-
-	* pcs/cal-backend.c (cal_backend_log_entry): Take CalObjType
-	as a param because its impossible to determine after a delete.
-	(cal_backend_remove_object): Calculate CalObjType and pass
-	it to cal_backend_log_entry
-	(cal_backend_update_object): ditto
-
-	* conduits/todo/todo-conduit.c (local_record_from_comp): Kill
-	unused variables.
-	(add_archive_record): Don't kill the sync if this happens
-	(update_record): Kill old function
-	(replace_record): New function to handle replace_record signal
-	(conduit_get_gpilot_conduit): Listen for replace record signal
-	(add_record): Always add a new record, never replace
-	(replace_record): Always replace an existing record
-
-	* conduits/calendar/calendar-conduit.c: Same as above
-
-2000-10-10  Jesse Pavel  <jpavel@helixcode.com>
-
-	* gui/e-itip-control.c: set a default size for the control.
-
-2000-10-10  Jesse Pavel  <jpavel@helixcode.com>
-
-	* gui/evolution-calendar.oafinfo: Added information about the
-	text/calendar MIME type, so that the evolution-calendar is called
-	to deal with iMIP attachments.
-
-	* gui/e-itip-control.[ch]: These files implement a Bonobo
-	control that will eventually deal with iMIP/iTIP messages from
-	the mailer. Right now, it's not working.
-
-	* gui/e-itip-control.glade: The Glade GUI for the above-mentioned
-	control.
-
-	* gui/Makefile.am: added references to the files I created.
-
-	* gui/main.c: called the initialization function of the Bonobo
-	control factory.
-
-2000-10-11  Tuomas Kuosmanen  <tigert@helixcode.com>
-
-	* gui/task-assigned-to.xpm gui/task-assigned.xpm
-	gui/recur.xpm gui/task-recurring.xpm gui/task.xpm:
-	New versions of the icons for the tasklist/pad.
-
-2000-10-11  Damon Chaplin  <damon@helixcode.com>
-
-	* gui/component-factory.c (owner_unset_cb): don't free evolution_dir
-	as we need it to save the config settings.
-
-2000-10-11  Damon Chaplin  <damon@helixcode.com>
-
-	* gui/main.c (main): call calendar_config_write_on_exit() to write
-	out some special config settings (as the mail component does).
-
-	* gui/calendar-commands.c (properties_cmd): changed to use the new
-	preferences dialog.
-	(update_all_config_settings): new function to iterate over all the
-	calendars and update the config settings.
-
-	* gui/dialogs/cal-prefs-dialog.glade: preferences dialog.
-
-	* gui/dialogs/cal-prefs-dialog.[hc]: new files for the preferences
-	dialog.
-
-	* gui/calendar-config.[hc]: new files to handle loading/saving config
-	settings.
-
-	* cal-util/cal-recur.c: fixed bug in YEARLY when no filters were set,
-	plus minor changes.
-
-	* cal-util/test-recur.c: updated.
-
-	* gui/e-day-view-time-item.c:
-	* gui/popup-menu.c: update to #include <gal/widgets/e-gui-utils.h>
-
-	* gui/component-factory.c (owner_set_cb): called calendar_config_init.
-	(owner_set_cb):
-	(owner_unset_cb): updated the prototypes.
-
-	* gui/main.c (main): added call to calendar_config_write_on_exit().
-
-	* gui/component-factory.h:
-	* gui/component-factory.c (owner_set_cb): added global evolution_dir
-	just like the mail component, so we know we to store config stuff.
-
-2000-10-11  Christopher James Lahey  <clahey@helixcode.com>
-
-	* gui/e-calendar-table.c: Fixed the column elements here.
-
-2000-10-11  Christopher James Lahey  <clahey@helixcode.com>
-
-	* gui/e-calendar-table.c: Updated to use the new ETable
-	specification stuff.
-
-2000-10-11  JP Rosevear  <jpr@helixcode.com>
-
-	* conduits/todo/todo-conduit.c (map_sax_start_element): The
-	element is "pilot_id" not "pilotid".  Update both maps
-	(compute_pid): Utility function to set a local records pid
-	(local_record_from_comp): Compute the pid and status here,
-	no longer use the old cal_component pilot interfaces
-	(free_match): Its a *local not a **local
-
-	* conduits/calendar/calendar-conduit.c: same as above
-
-	* conduits/todo/todo-conduit.h: Have both a uid and pid map
-
-	* conduits/todo/calendar-conduit.h: same as above
-
-2000-10-09  JP Rosevear  <jpr@helixcode.com>
-
-	* conduits/*: Adjust to using gnome-pilot-sync-abs conduit which
-	is based on the latest pilot link changes.
-
-2000-10-09  Iain Holmes  <iain@helixcode.com>
-
-	* Makefile.am: Added the executive-summary library and cflags
-
-	* gui/evolution-calendar.oafinfo: Added oaf servers for the
-	executive summary and executive summary factory.
-
-	* gui/calendar-summary.[ch]: New files to create the summary.
-
-	* gui/component-factory.c (summary_fn): Create the executive
-	summary component.
-	(component_factory_init): Start the summary factory as well.
-
-2000-10-06  Federico Mena Quintero  <federico@helixcode.com>
-
-	* gui/weekday-picker.[ch]: New widget to pick weekdays.
-
-2000-10-05  Michael Meeks  <michael@helixcode.com>
-
-	* gui/calendar-commands.c: upd.
-	(calendar_control_activate): upd.
-	(calendar_control_deactivate): upd.
-
-2000-10-05  Damon Chaplin  <damon@helixcode.com>
-
-	* gui/e-day-view.c:
-	* gui/e-week-view.c: when the user types in a new event, don't create
-	it until the user hits Return or switches focus. Removed the
-	editing_new_event flags.
-
-	* cal-util/test-recur.c: rewritten to work on ics files. Now I can
-	start testing the recurrence code.
-
-	* cal-util/cal-recur.c: a few fixes.
-
-	* gui/e-day-view.c (e_day_view_check_if_new_event_fits): fixed to
-	return TRUE for long events, not FALSE.
-
-2000-10-04  Federico Mena Quintero  <federico@helixcode.com>
-
-	* gui/print.c (print_todo_details): As a temporary solution to the
-	to-do printing, just print the summaries.  We'll use the ETable
-	printing stuff later.
-
-	* gui/print.c (print_day_summary_cb): Use g_list_append() correctly.
-	(print_todo_details_cb): Likewise.
-	(print_day_summary): Initialize psi.events.  This code was
-	obviously never tested.
-	(print_todo_details): Likewise.
-	(print_day_details): Initialize pdi.slots.
-
-	* gui/print.c (range_selector_new): Fix strftime() %a versus %b
-	confusion.  Fixes bugzilla #644.
-	(range_selector_new): Fix the whole localization mess by making
-	better use of strftime().  Now we generate whole date strings at a
-	time and compose them later.  Fixes bugzilla #643.
-
-2000-10-02  Jesse Pavel   <jpavel@helixcode.com>
-
-	* gui/e-meeting-edit.c: added support for the ROLE and RSVP parameters
-	in both the GUI and underlying iCal.
-
-2000-09-29  Jesse Pavel   <jpavel@helixcode.com>
-
-	* gui/e-meeting-edit.c: added support for organizers in the meeting
-	scheduler.
-
-2000-09-29  Jesse Pavel   <jpavel@helixcode.com>
-
-	* gui/e-meeting-edit.c: added code that makes changes to the underlying
-	iCAL structure of an event, when the user changes meeting information.
-
-	* gui/e-meeting-dialog.glade: this is the Glade UI for the meeting dialog
-	and accoutrements.
-
-2000-09-29  Damon Chaplin  <damon@helixcode.com>
-
-	* cal-util/cal-recur.c: updated to support RDATE end times or
-	durations. Note that if you have two RDATEs with the same start times,
-	but with different end dates/durations set, the results are
-	unpredictable. So the event editor dialog should check for this.
-
-	* gui/e-week-view-main-item.c (e_week_view_main_item_draw_day):
-	make strftime() strings translatable, and changed the formats a bit.
-
-	* NOTE: someone needs to check print.c to make sure strftime strings
-	are OK for i18n.
-
-	* gui/e-day-view.h: Changed EDayViewDateFormat enum. We now try to
-	include the weekday if possible. Also changed EDayView struct so we
-	store the month & weekdays with the longest names rather than the
-	actual widths. This helps i18n.
-
-	* gui/e-day-view.c (e_day_view_recalc_cell_sizes): used _() for
-	strftime strings, tried to see if weekday fits, and rearranged a
-	bit to make i18n easier.
-
-	* gui/e-day-view-top-item.c (e_day_view_top_item_draw): used _() for
-	strftime strings, and updated to use new formats.
-
-	* gui/calendar-model.c: added use_24_hour_format boolean to
-	CalendarModelPrivate so we can display dates in 12-hour format if
-	requested. This meant adding a CalendarModel argument to a few
-	functions. Also added get/set functions to set use_24_hour_format.
-	I suppose ideally we should have an ECellDate renderer and this option
-	should go there.
-
-2000-09-27  Jesse Pavel	  <jpavel@helixcode.com>
-
-	* gui/event-editor.c: changed a menu entry so that it will invoke
-	my meeting editor.
-
-	* gui/e-meeting-edit.[ch]: added these files to provide preliminary
-	support for iTIP meeting scheduling. Currently, only the GUI works;
-	there is not yet any backend support.
-
-	* gui/Makefile.am: added entries for e-meeting-edit.[ch]
-
-2000-09-24  Damon Chaplin  <damon@helixcode.com>
-
-	* gui/dialogs/task-editor-dialog.glade: set the height of the scrolled
-	window for the description field, since the default window height
-	doesn't seem to be working.
-
-	* cal-util/cal-component.h: added functions to get the actual
-	icalproperty lists for RRULE and EXRULE properties.
-
-	* cal-util/cal-recur.[hc]: added support for COUNT, though I need to
-	test it a bit. Also fixed the call to generate_instances_for_year() so
-	it uses the chunk dates.
-
-2000-09-20  Damon Chaplin  <damon@helixcode.com>
-
-	* gui/event-editor.c: got rid of 1 '_' in '__Formatting'.
-
-2000-09-22  Michael Meeks  <michael@helixcode.com>
-
-	* gui/calendar-commands.c (calendar_control_activate): upd.
-
-2000-09-21  Federico Mena Quintero  <federico@helixcode.com>
-
-	* gui/calendar-commands.c (verbs): Removed the "about calendar"
-	command, since we don't want to have both "About Evolution" and
-	"About Calendar".
-
-2000-09-21  Michael Meeks  <michael@helixcode.com>
-
-	* gui/calendar-commands.c (calendar_control_activate): _UIHandler
-	update.
-
-2000-09-20  JP Rosevear  <jpr@helixcode.com>
-
-	* conduits/todo/todo-conduit.c (pre_sync): Don't fail if there
-	is no map file.
-
-2000-09-20  JP Rosevear  <jpr@helixcode.com>
-
-	* conduits/todo/todo-conduit.h: Add since field to context
-
-	* conduits/todo/todo-conduit.c (map_set_node_timet): New utility
-	function
-	(map_sax_start_element): Look for the map timestamp as well
-	(map_write): Write the map timestamp
-	(pre_sync): Use the map time stamp when looking for changed entries
-
-	* pcs/cal-backend.c (cal_backend_log_sax_start_element): Make sure
-	we are in a valid timestamp
-
-2000-09-20  JP Rosevear  <jpr@helixcode.com>
-
-	* pcs/cal-backend.c (cal_backend_log_name): Make the log file
-	name relevant to the actual calendar file, rather than just the
-	directory.
-
-2000-09-20  JP Rosevear  <jpr@helixcode.com>
-
-	* pcs/cal-backend.c (cal_backend_get_log_entries): Oops
-
-2000-09-20  JP Rosevear  <jpr@helixcode.com>
-
-	* pcs/cal-backend.c (cal_backend_get_log_entries): Use a local
-	sax handler.
-
-	* conduits/todo/todo-conduit.c (pre_sync): Use xmlSAXParseFile
-	(map_sax_parse): Delete
-
-2000-09-20  JP Rosevear  <jpr@helixcode.com>
-
-	* pcs/cal-backend.c (cal_backend_log_sax_start_element): Properly
-	assign the CalObjChange type.
-	(cal_backend_log_sax_parse): Delete
-	(cal_backend_get_log_entries): Use xmlSAXUserParseFile
-
-2000-09-19  JP Rosevear  <jpr@helixcode.com>
-
-	* pcs/cal-backend.c (cal_backend_set_uri): New utility function
-	(cal_backend_load): use above
-	(cal_backend_create): use above
-	(cal_backend_log_name): Take a uri instead of a backend param
-
-	* pcs/cal-backend-file.c: Get rid of useless hash functions
-	(cal_backend_file_load): Check to make sure path exists and is
-	local
-	(cal_backend_file_load): Unref the current uri if there is one
-	(cal_backend_file_create): ditto
-
-	* pcs/cal-backend.c (cal_backend_last_client_gone): Sync before
-	shooting ourselves in the foot
-
-	* pcs/cal-backend-file.c (save): Fully implement backing up the
-	calendar before writing out the new entry.
-
-2000-09-19  JP Rosevear  <jpr@helixcode.com>
-
-	* conduits/todo/todo-conduit.c (check_for_slow_setting): Add some
-	other cases where a slow sync is in order
-	(pre_sync): Pre load the uids, the map and the add/mod/del lists
-	(match_record): Use the map hash to match records
-	(iterate): Iterate using the pre-loaded uid list
-	(iterate_specific): Iterate using the add/mod/del lists
-	(purge): Delete all entries in the del list
-	(set_status): Set status by adding to an appropriate list
-	(set_pilot_id): Set pilot_id by updating map hash
-
-	* conduits/todo/todo-conduit.h: Add lists for added, modified and
-	deleted objects
-
-	* conduits/todo/todo-conduit.c (map_name): Get the pilot_id->uid map
-	file name
-	(map_sax_start_element): SAX handler to extract a pilot_id->uid
-	mapping
-	(map_sax_parse): Parse the given file and build a pilot_id->uid hash
-	(map_write_foreach): Write out individual mapping elements
-	(map_write): Write out the pilot_id->uid mapping
-	(start_calendar_server_cb): Rename from gnome_calendar_load_cb
-
-	* conduits/todo/todo-conduit-config.h: Rename pilotID to pilot_id
-
-	* conduits/todo/e-todo.conduit.in: A little renaming
-
-	* conduits/todo/Makefile.am: Fix build slightly
-
-	* pcs/cal.c (build_change_seq): Build a corba sequence out of a list
-	of CalObjChanges
-	(Cal_get_objects_in_range): Implement new corba function
-
-	* pcs/cal-backend.c (cal_backend_init): Intiliaze to NULL
-	(cal_backend_load): Track the uri so we can write the log file
-	to the same place
-	(cal_backend_log_name): Figure out the log filename/path based on
-	the calendar uri
-	(cal_backend_set_node_timet): Set an xml node property value from
-	a time_t
-	(cal_backend_log_entry): Adds a log entry to list waiting to be written
-	out
-	(cal_backend_log_sync): Syncs the log entries to disk
-	(cal_backend_log_sax_start_element): SAX callback for reading in
-	log entries
-	(cal_backend_log_sax_end_element): ditto
-	(cal_backend_log_sax_parse): Main SAX parser call to parse the log
-	file looking for particular log entries and creating a CalObjChange
-	hash with the last change for each object
-	(cal_backend_get_log_entries): Returns a hash of objects of a given
-	type changed since the given time
-	(cal_backend_update_object): Add appropriate log entries
-	(cal_backend_remove_object): ditto
-	(cal_backend_get_changed_uids): Implement new idl interface call
-	(cal_backend_foreach_changed): Convert CalObjChange hash into a list
-
-	* pcs/cal-backend-imc.[hc]: Remove crufty files
-
-	* pcs/cal-backend-file.c (cal_backend_file_get_type_by_uid): New
-	function that returns the CalObjType for a uid.
-
-	* cal-client/cal-client.h: Update prototypes.
-
-	* cal-client/cal-client.c (build_change_list): Build a list
-	of CalObjChange items from a corba sequence.
-	(cal_client_get_changed_uids): New accessor method for the
-	similarly named addition to the idl file.
-
-	* cal-util/cal-util.h: Update prototypes and add CalObjChangeType
-	enum.
-
-	* cal-util/cal-util.c (cal_obj_change_list_free): New utility
-	method to free a list of CalObjChange objects.
-
-	* idl/evolution-calendar.idl: Add get_changed_uids method
-	and associated types.
-
-2000-09-18  Christopher James Lahey  <clahey@helixcode.com>
-
-	* gui/Makefile.am: Added $(EXTRA_GNOME_CFLAGS) and
-	$(EXTRA_GNOME_LIBS).  Removed unneeded libraries.
-
-	* gui/calendar-model.h, gui/e-calendar-table.c, gui/e-day-view.c,
-	gui/e-week-view-event-item.c, gui/e-week-view.c,
-	gui/event-editor.c, gui/gncal-todo.c, gui/gnome-cal.c, gui/main.c,
-	gui/print.c, gui/dialogs/task-editor.c: Fixed the #include lines
-	to deal properly with gal.
-
-	* gui/check-filled.xpm: New file since we can't include it from
-	e-table anymore.
-
-2000-09-16  Michael Meeks  <michael@helixcode.com>
-
-	* gui/Makefile.am (INCLUDES): add datadir
-
-	* gui/calendar-commands.c (calendar_control_activate): use it.
-
-2000-09-14  JP Rosevear  <jpr@helixcode.com>
-
-	* conduits/todo/.cvsignore: Shush
-
-2000-09-14  JP Rosevear  <jpr@helixcode.com>
-
-	* Add headers with GPL notice and credit copyright to those appropriate
-
-	* conduits/todo/todo-conduit-control-applet.c (doHelp): Update name,
-	authors, copyright for about dialog.
-	(activate_sync_type): Tidy
-
-	* conduits/todo/Makefile.am: Rename binaries and libs to e-todo*
-	to avoid conflicts.
-
-	* conduits/todo/e-todo.conduit.in: Reflect binary/lib name changes
-
-	* conduits/todo/e-todo-conduit-control-applet.desktop: ditto
-
-	* conduits/todo/todo.conduit.in: Removed
-
-	* conduits/todo/todo-conduit-control-applet.desktop: Removed
-
-	* conduits/todo/todo-conduit-config.h (todoconduit_load_configuration):
-	The config file will now be called e-todo-conduit
-	(todoconduit_save_configuration): ditto
-
-	* conduits/todo/todo-conduit.c: Some renaming to keep consistent.
-	(pre_sync): Remove commented out function that does not exist.
-
-	* conduits/todo/todo-conduit-control-applet.c: ditto
-
-	* conduits/todo/todo-conduit-config.h: ditto
-
-	* conduits/todo/todo-conduit.h: ditto
-
-
-2000-09-07  Michael Meeks  <michael@helixcode.com>
-
-	* gui/calendar-commands.c: Re-write most UI handler code.
-
-2000-09-13  Federico Mena Quintero  <federico@helixcode.com>
-
-	* gui/calendar-model.c (obj_updated_cb): Removed an unused
-	variable.
-
-	* gui/calendar-model.c (obj_updated_cb): See if the new object
-	matches the type of objects we were told to deal with.
-	(load_objects): Likewise.
-
-2000-09-13  JP Rosevear  <jpr@helixcode.com>
-
-	* pcs/cal-backend-file.c (remove_component): Only remove the pilot
-	item from the hash if it exists in the first place.
-
-2000-09-12  JP Rosevear  <jpr@helixcode.com>
-
-	* pcs/cal-backend-file.c (add_component): plug leakage
-
-2000-09-12  JP Rosevear  <jpr@helixcode.com>
-
-	* conduits/calendar/calendar-conduit.c: Hack to compile for distcheck.
-
-	* conduits/calendar/calendar-conduit.h: Remove calobj.h dependency
-
-2000-09-12  JP Rosevear  <jpr@helixcode.com>
-
-	* pcs/cal-backend-file.c (cal_backend_file_load): Use g_int_*
-	for now
-	(cal_backend_file_create): ditto
-
-	* conduits/todo/todo-conduit.c (local_record_from_compobject): Make
-	this actually fill in the todo record.
-	(find_record_in_repository): Add debug stuff
-	(iterate_specific): Use the already exisiting utility function
-
-	* pcs/cal-backend-file.c (cal_backend_file_update_pilot_id): correct
-	the status and id types. g_strdup the uid since this is not a
-	constified return
-	(cal_backend_file_get_uid_by_pilot_id): correct the id type
-
-2000-09-12  Ettore Perazzoli  <ettore@helixcode.com>
-
-	* gui/Makefile.am: Remove `ui.xml' stuff.
-
-	* pcs/cal-backend.c: Dont' #include calobj.h anymore as it's gone.
-
-2000-09-12  Federico Mena Quintero  <federico@helixcode.com>
-
-	* gui/gnome-cal.c (gnome_calendar_construct): Connect to the
-	"cal_loaded" signal of the client here.
-	(connect_load): Removed function.
-	(disconnect_load): Removed function.
-	(cal_loaded_cb): Store the URI we are loading in the GnomeCal
-	structure instead of in a weird closure.  This gets rid of the
-	connect/disconnect mess as well.
-	(gnome_calendar_open): Store the URI in the GnomeCal.
-
-2000-09-11  Christopher James Lahey  <clahey@helixcode.com>
-
-	* gui/e-day-view.c: Fixed a warning (removed unused variable
-	gfloat width from e_day_view_get_event_position.)
-
-2000-09-11  JP Rosevear  <jpr@helixcode.com>
-
-	* conduits/todo/todo-conduit.c: Handle renaming, header cleanup
-
-	* conduits/todo/todo-conduit.h: Rename GCalLocalRecord to
-	EToDoLocalRecord, header cleanup
-
-2000-09-11  JP Rosevear  <jpr@helixcode.com>
-
-	* conduits/todo/todo-conduit.c (comp_from_remote_record): Use
-	description list instead of comment list for pilot todo note
-	(transmit): Check for null cal component properties, set priority
-	correctly, use description list instead of comment list.  Make
-	pilot record private when appropriate.
-
-2000-09-10  JP Rosevear  <jpr@helixcode.com>
-
-	* conduits/todo/todo-conduit.c (comp_from_remote_record): Only
-	set the due date only if it exists
-
-2000-09-10  JP Rosevear  <jpr@helixcode.com>
-
-	* gui/calendar-model.c (get_is_complete): Relying on the status
-	field is somewhat faulty since it is related to group scheduling
-
-2000-09-10  JP Rosevear  <jpr@helixcode.com>
-
-	* conduits/todo/todo-conduit.c (update_calendar_entry_in_repository):
-	Make log output a little more sensible
-	(comp_from_remote_record): Minor correction when making a CalComponent
-	from scratch.
-	(update_record): Use comp_from_remote_record for new items, rather
-	than repeating the code here.
-
-2000-09-10  JP Rosevear  <jpr@helixcode.com>
-
-	* conduits/todo/todo-conduit.c: Remove catch_ret_val function
-	since its no longer useful.  Fix naming of various fields from
-	the header changes.  Use GnomePilotRecord* stuff instead of
-	ICAL_PILOT_SYNC_*
-	(e_todo_context_new): Rename from gcalconduit_new_context. Now takes
-	a pilot id and loads the configuration here
-	(e_todo_context_destroy): Rename from gcalconduit_destroy_context.
-	Unref the client and destroy the configuration if they exist here
-	(start_calendar_server): Change the default calendar name
-	(local_record_from_comp_uid): Rename from local_record_from_ical_uid
-	(local_record_from_compobject): Rename from
-	local_record_from_icalobject.  Properly do the pilot id and status.
-	(comp_from_remote_record): Rename from ical_from_remote_record.
-	Handle due, complete, classification and pilot stuff properly
-	(pre_sync): Remove some old stuff.  We need to figure out how to
-	set some of the field values.
-	(set_status): Reflect pilot status changes from above
-	(conduit_destroy_gpilot_conduit): Remove cleanup stuff that is
-	now done by e_todo_context_destroy
-	(conduit_get_gpilot_conduit): Only set the context as object
-	data of the conduit.
-
-	* conduits/todo/todo-conduit.h: Rename GCalConduitContext to
-	EToDoConduitContext.  Remove some unused struct fields.
-	For GCalLocalRecord, rename ical to comp.
-
-2000-09-11  Damon Chaplin  <damon@helixcode.com>
-
-	* gui/dialogs/task-editor.c: changed to use EDateEdit.
-
-	* gui/dialogs/task-editor-dialog.glade: added "None" option to
-	Classification option menu, and used custom widgets for the date
-	entries so we can use EDateEdit widgets.
-
-	* gui/event-editor.c: changed to use EDateEdit. Note that this needs
-	to be fixed at some point to handle invalid dates, i.e. when
-	e_date_edit_get_time returns -1.
-
-	* gui/calendar-model.c (ensure_task_complete):
-	(ensure_task_not_complete): new functions to set the related properties
-	to make sure a task is marked as complete on not, i.e. "Date Completed"
-	"Status" and "Percent" properties.
-
-2000-09-08  Damon Chaplin  <damon@helixcode.com>
-
-	* gui/calendar-model.c (get_is_complete): use the status field rather
-	than the completed date, as it is more reliable.
-	(get_is_overdue): use get_is_complete().
-	(calendar_model_mark_task_complete): check if it is already complete,
-	and if so don't update it.
-
-	* cal-util/cal-component.c (cal_component_get_status):
-	(cal_component_set_status): added functions to support the STATUS
-	property. Also added the property to CalComponentPrivate and set it
-	to NULL in free_icalcomponent(). Someone should check my code as I've
-	mainly done a Cut & Paste job.
-
-2000-09-10  JP Rosevear  <jpr@helixcode.com>
-	* conduits/todo/todo-conduit.c: Convert "//" style comments
-	(local_record_from_ical_uid): Remove iCalObject cruft
-	(ical_from_remote_record): ditto
-	(free_match): Properly unref the CalComponent
-
-2000-09-10  JP Rosevear  <jpr@helixcode.com>
-
-	* conduits/todo/todo-conduit.c (local_record_from_icalobject): Use
-	cal component pilot stuff properly
-	(find_record_in_repository): Remove cruft
-	(ical_from_remote_record): Remove cruft
-	(update_record): Set the vtype immediately after creation. Remove cruft
-
-	* conduits/todo/todo-conduit.h: Remove iCalObject stuff
-
-	* conduits/todo/todo-conduit-config.h: Move all the config stuff
-	here, I need to kill the warnings at some point
-
-	* conduits/todo/todo-conduit-control-applet.c (doRevertSettings):
-	Set all the state variables correctly on a revert
-	(doSaveSettings): Update original state
-	(doHelp): Rename from about_cb
-	(main): Destroy configurations when done
-
-	* conduits/todo/Makefile.am: Tidy
-
-	* pcs/cal-backend-file.c (cbf_pilot_hash): Function for hashing
-	pilot ids
-	(cbf_pilot_equal): For hash table of pilot ids
-	(cal_backend_file_destroy): Destroy pilot id hash
-	(add_component): Insert the uid into the pilot hash
-	(remove_component): Remove the uid from the pilot hash
-	(cal_backend_file_load): Create the pilot hash
-	(cal_backend_file_create): ditto
-	(cal_backend_file_get_uid_by_pilot_id): Implement using the pilot hash
-	(cal_backend_file_update_pilot_id): ditto
-
-	* cal-util/cal-component.h: Update prototypes
-
-	* cal-util/cal-component.c (cal_component_get_pilot_id): Implement
-	using ical X properties
-	(cal_component_set_pilot_id): ditto
-	(cal_component_get_pilot_status): ditto
-	(cal_component_set_pilot_status): ditto
-	(cal_component_free_pilot_id): Free a pilot id
-	(cal_component_free_pilot_status): Free a pilot status
-
-2000-09-09  Ettore Perazzoli  <ettore@helixcode.com>
-
-	* gui/dialogs/Makefile.am (INCLUDES): Add
-	`-I$(top_builddir)/libical/src/libical' so that we get
-	`icalversion.h' from the build directory instead of taking it from
-	the installation directory, which is of course Wrong (tm).
-	* gui/Makefile.am (INCLUDES): Likewise.
-
-2000-09-08  Federico Mena Quintero  <federico@helixcode.com>
-
-	* gui/gnome-cal.c (cal_loaded_cb): New function with the
-	loading/creation state machine.  It is carefully modelled after
-	the state machine that started the Universe, so bow before it.
-	(gnome_calendar_construct): Do not connect to cal_loaded here.
-	(connect_load): The closure for the cal_loaded callback is a bit
-	tricky, so provide a function to create it and connect to the
-	signal.
-	(disconnect_load): Disconnect from the signal and free the
-	closure.
-	(gnome_calendar_load_cb): Removed obsolete buggy function.
-	(gnome_calendar_open): Use the new mechanism.
-
-	* gui/control-factory.c (set_prop): The default filename is now
-	calendar.ics.
-
-2000-09-08  JP Rosevear  <jpr@helixcode.com>
-
-	* conduits/calendar/calendar-conduit.c (transmit): Use
-	icaltime_as_timet
-
-2000-09-08  Christopher James Lahey  <clahey@helixcode.com>
-
-	* cal-util/cal-recur.c, gui/e-day-view.c, gui/e-week-view.c,
-	gui/event-editor.c, gui/getdate.y, gui/gncal-todo.c,
-	gui/gnome-cal.c, gui/dialogs/task-editor.c: Fixed some warnings.
-
-2000-09-08  JP Rosevear  <jpr@helixcode.com>
-
-	* conduits/calendar/Makefile.am: Tidy
-
-	* conduits/todo/Makefile.am: Tidy
-
-2000-09-08  Federico Mena Quintero  <federico@helixcode.com>
-
-	Fall equinox cleanup!
-
-	OK, I know the equinox is not here yet, but weather has changed
-	enough to warrant it.
-
-	Sigh.  This place is definitely not the tropics.
-
-	* gui/gnome-cal.c (obj_updated_cb): Renamed from
-	gnome_calendar_object_updated_cb(); fixed prototype.
-	(obj_removed_cb): Renamed from gnome_calendar_object_removed_cb();
-	fixed prototype.
-	(GnomeCalendarPrivate): Moved all the GnomeCalendar fields to a
-	private structure so I don't have to rebuild the whole calendar
-	GUI directory every time something changes in the object.
-	(GnomeCalendarPrivate): Removed the property bag and the control
-	fields; they are local to the control-factory now.
-	(gnome_calendar_update_view_buttons): Remove the
-	ignore_view_button_clicks mess and just block the signal.
-	(gnome_calendar_set_view): Added a "focus" argument to indicate
-	whether we want the main widget in the specified view to grab the
-	focus.
-	(gnome_calendar_set_view_internal): Handle the focus argument here.
-	(gnome_calendar_set_view_buttons): Temporary hack to notify the
-	calendar about its buttons.
-	(gnome_calendar_get_selected_time_range): New function.
-	(gnome_calendar_get_cal_client): New function.
-
-	* gui/control-factory.c (calendar_properties_init): Keep the
-	property bag local to here; it does not need to be in the calendar
-	object yet.
-	(control_factory_fn): Renamed from control_factory().  Just use
-	control_factory_new_control().
-	(control_factory_new_control): Moved the stuff over from
-	create_control(), and keep the control local to here.  Check the
-	return value of bonobo_control_new().
-
-	* gui/calendar-commands.c (show_day_view_clicked): Remove the
-	ignore_view_button_clicks mess.
-	(new_calendar): Removed the useless "page" argument.
-	(calendar_control_activate): Use gnome_calendar_set_view_buttons()
-	for now.
-
-2000-09-07  Lauris Kaplinski  <lauris@helixcode.com>
-
-	* cal-client/Makefile.am: Added -lunicode
-
-	* gui/dialogs/task-editor.c: More UTF-8 wrappers
-	(priority_index_to_value): Kill warning, add assertion
-
-2000-09-06  JP Rosevear  <jpr@helixcode.com>
-
-	* gui/e-day-view-main-item.c (e_day_view_main_item_draw_day_event):
-	Use new cal_component_has_recurrences convenience function
-
-	* gui/e-week-view.c (e_week_view_show_popup_menu): ditto
-
-	* gui/e-week-view-event-item.c (e_week_view_event_item_draw_icons):
-	ditto
-
-	* gui/calendar-model.c (calendar_model_value_at): ditto
-	(calendar_model_value_at): ditto
-
-	* gui/e-day-view.c (e_day_view_on_event_click): ditto
-	(e_day_view_on_event_right_click): ditto
-	(e_day_view_on_top_canvas_motion): ditto
-	(e_day_view_on_top_canvas_motion): ditto
-	(e_day_view_on_main_canvas_motion): ditto
-	(e_day_view_on_main_canvas_motion): ditto
-	(e_day_view_reshape_day_event): ditto
-
-	* gui/e-day-view-top-item.c (e_day_view_top_item_draw_long_event):
-	ditto
-
-	* gui/e-day-view.c (e_day_view_on_long_event_click): ditto
-
-2000-09-06  JP Rosevear  <jpr@helixcode.com>
-
-	* cal-util/cal-recur.c (cal_recur_generate_instances): Use
-	new convenience functions and only get the recurrence
-	stuff if needed.  Free the recurrence stuff if used.
-
-2000-09-05  JP Rosevear  <jpr@helixcode.com>
-
-	* cal-util/cal-component.h: Add new prototypes
-
-	* cal-util/cal-component.c (cal_component_has_exrules): Utility
-	function to determine whether a cal component has any exrules
-	(cal_component_has_exdates): Ditto for exdates
-	(cal_component_has_exceptions): Utility function to determine
-	whether a cal component has any exception rules
-	(cal_component_has_recurrences):Utility function to determine
-	whether a cal component has any recurrence rules
-
-2000-09-05  JP Rosevear  <jpr@helixcode.com>
-
-	* gui/event-editor.c (dialog_to_comp_object): Kill all exdates if
-	there are no dates in the box
-
-	* cal-util/cal-recur.c (generate_instances_for_year): Add a special
-	case for when there are exceptions but no rrules or rdates.
-	(cal_obj_remove_exceptions): Use date only compare func
-	(cal_obj_date_only_compare_func): New compare function that
-	compares the date only, not the time.
-
-	* gui/event-editor.c (dialog_to_comp_object): Need a break for the
-	yearly recurrence type
-	(dialog_to_comp_object): We need to allocate icaltimetypes for the
-	exdate list
-	(fill_widgets): Handle a weekly recurrence with no particular day set
-	(dialog_to_comp_object): Kill all rrules if "None" is selected as
-	the recurrence type by the user
-
-2000-09-06  Damon Chaplin  <damon@helixcode.com>
-
-	* gui/e-calendar-table.c (e_calendar_table_open_task): uses the new
-	TaskEditor dialog.
-
-	* gui/dialogs/task-editor.[hc]:
-	* gui/dialogs/task-editor-dialog.glade: updated. Still need to fix the
-	'Status' property (CalComponent doesn't support it yet), and use a
-	replacement for GnomeDateEdit, since we need to support setting 'None'
-	as the date.
-
-2000-09-04  Damon Chaplin  <damon@helixcode.com>
-
-	* gui/event-editor.c (obj_updated_cb):
-	(obj_removed_cb): compare the updated object's uid with the one we
-	are editing, and just return if it doesn't match.
-
-2000-09-01  Damon Chaplin  <damon@helixcode.com>
-
-	* gui/gnome-cal.c (gnome_calendar_tag_calendar): added check to see
-	if the client has loaded successfully. Gets rid of a few warnings.
-
-2000-09-05  JP Rosevear  <jpr@helixcode.com>
-
-	* cal-util/cal-recur.c (generate_instances_for_year): The exdate
-	and rdate lists are a list of icaltimetypes, not CalComponentPeriods
-
-	* gui/e-day-view.c (e_day_view_on_delete_occurrence): The exdate list
-	is a list of icaltimetypes, not CalComponentDateTimes
-
-2000-09-05  JP Rosevear  <jpr@helixcode.com>
-
-	* gui/e-day-view.c (e_day_view_on_delete_occurrence): Append
-	the exdate to the list AFTER we create the date value.
-
-2000-09-05  JP Rosevear  <jpr@helixcode.com>
-
-	* cal-util/cal-component.c (cal_component_free_recur_list): Free
-	the data, not the list element.
-
-2000-09-05  JP Rosevear  <jpr@helixcode.com>
-
-	* cal-util/cal-recur.c (cal_recur_generate_instances): Compute
-	the event duration using the event start/end times, not the
-	interval times.
-
-2000-09-05  JP Rosevear  <jpr@helixcode.com>
-
-	* cal-util/cal-recur.c (cal_recur_from_icalrecurrencetype): Check
-	to see if r->enddate is (time_t)-1 and set to 0 if so
-
-2000-09-02  Ettore Perazzoli  <ettore@helixcode.com>
-
-	* conduits/calendar/Makefile.am (INCLUDES): Add libical include
-	directories and `$(BONOBO_GNOME_CFLAGS)'.
-	* conduits/todo/Makefile.am (INCLUDES): Likewise.
-
-2000-09-02  Lauris Kaplinski  <lauris@helixcode.com>
-
-	* gui/event-editor.c: e_utf8 wrappers
-
-	* gui/gncal-todo.c: e_utf8_wrappers
-
-2000-09-02  Christopher James Lahey  <clahey@helixcode.com>
-
-	* conduits/calendar/calendar-conduit.c,
-	conduits/todo/todo-conduit.c, gui/e-week-view.c, gui/gnome-cal.c:
-	Fixed some warnings.
-
-2000-09-01  Federico Mena Quintero  <federico@helixcode.com>
-
-	* gui/gnome-cal.c (gnome_calendar_new): Use
-	gnome_calendar_construct() so that we can check for proper
-	creation of the client.
-	(gnome_calendar_destroy): Check that the client exists before we
-	unref it.
-	(gnome_calendar_construct): Do the CalClient creation here.  Bind
-	the views to it here as well instead of in setup_widgets().
-	(gnome_calendar_init): Call setup_widgets() here.
-
-	* gui/e-calendar-table.c (e_calendar_table_destroy): Unref the
-	model.
-
-2000-09-01  JP Rosevear  <jpr@helixcode.com>
-
-	* conduits/todo/todo-conduit.c: Update for new libical.
-	Conduits should atleast compile now.
-
-	* conduits/calendar/calendar-conduit.c: ditto
-
-	* Makefile.am: Build the conduits only when they've been
-	enabled.
-
-2000-09-01  JP Rosevear  <jpr@helixcode.com>
-
-	* gui/event-editor.c: Make toolbar save and close button.
-	We should put a similar menu option in sometime.
-
-2000-08-31  JP Rosevear  <jpr@helixcode.com>
-
-	* cal-util/cal-recur.c (array_to_list): Use
-	ICAL_RECURRENCE_ARRAY_MAX instead of MAX_SHORT
-
-2000-08-31  JP Rosevear  <jpr@helixcode.com>
-
-	* gui/event-editor.c (file_delete_cb): Implement delete option
-	(dialog_to_comp_object): Set the weekday start value and use
-	local not UTC time
-
-2000-08-31  Federico Mena Quintero  <federico@helixcode.com>
-
-	* gui/event-editor.c (file_delete_cb): No need to spit a warning
-	if removal fails.
-	(event_editor_destroy): Free the exception clist data.  Unref the
-	calendar client here.
-	(close_dialog): Just call gtk_object_destroy() on the event
-	editor; the destroy handler will free everything else.
-
-	* cal-client/cal-client.c (cal_client_object_exists): Removed
-	function; this is not useful because we operate asynchronously.
-
-	* gui/e-day-view.c (e_day_view_on_delete_appointment): No need to
-	spit a warning if removal fails.
-
-	* gui/e-week-view.c (e_week_view_on_delete_appointment): Likewise.
-
-	* gui/calendar-model.c (calendar_model_delete_task): Likewise.
-
-2000-08-31  JP Rosevear  <jpr@helixcode.com>
-
-	* gui/event-editor.c (file_delete_cb): Implement delete option
-	(recurrence_toggled): Make an ugly hack to get the recurrence
-	pages showing properly since we don't yet implement all of the
-	recurrence rule stuff.
-
-	* cal-client/cal-client.c (cal_client_object_exists): New function
-	to see if an object exists and is obtainable from the backend
-
-	* cal-client/cal-client.h: Add prototype
-
-2000-08-31  JP Rosevear  <jpr@helixcode.com>
-
-	* gui/gnome-cal.c (editor_closed_cb): Event editor destroyed
-	callback to do hash cleanup
-	(gnome_calendar_edit_object): Set event editor calendar client.
-
-	* gui/event-editor.h: Add new prototype
-
-	* gui/event-editor.c: Trash signal stuff.  We will manipulate
-	the client directly.  Make the toolbar save and menu save items
-	work identically.  Add icons to the toolbar.
-	(save_event_object): Call cal_client_update_object
-	(close_dialog): Unref the client and disconnect signals
-	Actually destroy the event editor object.
-	(obj_updated_cb): New function.  Doesn't really do anything
-	yet but it will inform the user the event has changed elsewhere
-	in the future.
-	(obj_removed_cb): ditto
-	(event_editor_set_cal_client): New function to set the calendar
-	client
-
-	* gui/gnome-cal.c (gnome_calendar_new_appointment): Commit
-	the sequence to the cal component and use non UTC times.
-
-2000-08-30  Lauris Kaplinski  <lauris@helixcode.com>
-
-	* gui/print.c: Countless small changes for gnome-print 0.21+
-
-2000-08-30  Damon Chaplin  <damon@helixcode.com>
-
-	* gui/e-day-view.[hc]:
-	* gui/e-day-view-main-item.c:
-	* gui/e-week-view.[hc]:
-	* gui/e-week-view-main-item.c:
-	* gui/calendar-commands.c:
-	* gui/gnome-cal.[hc]: switched to using new ECalendar widget,
-	and a few other fixes.
-
-2000-08-30  Federico Mena Quintero  <federico@helixcode.com>
-
-	* gui/gnome-cal.h (GnomeCal): Removed unused field event_editor.
-
-	* gui/e-day-view.c (e_day_view_key_press): Oops, set the
-	dtstart/dtend on the component before adding it.
-	(e_day_view_on_editing_stopped): No need to check for an UID.
-	Update the summary properly.
-
-2000-08-30  JP Rosevear  <jpr@helixcode.com>
-
-	* gui/e-week-view.c: Make sure the is_utc flag is always
-	FALSE for icaltime_from_timet
-	(e_week_view_on_unrecur_appointment): Use icaltimetype struct
-	from the stack and make sure tzid is always NULL
-	(e_week_view_key_press): ditto
-
-2000-08-30  JP Rosevear  <jpr@helixcode.com>
-
-	* gui/e-day-view.c: Make sure the is_utc flag is always
-	FALSE for icaltime_from_timet
-	(e_day_view_on_unrecur_appointment): Use icaltimetype struct
-	from the stack and make sure tzid is always NULL
-	(e_day_view_finish_long_event_resize): ditto
-	(e_day_view_finish_resize): ditto
-	(e_day_view_on_top_canvas_drag_data_received): ditto
-	(e_day_view_on_main_canvas_drag_data_received): ditto
-
-2000-08-30  JP Rosevear  <jpr@helixcode.com>
-
-	* cal-client/cal-client.c (add_instance): Actually add the
-	comp_instance struct to the instances list.  We now appear
-	to able to keep events and todos between sessions. Yay!
-
-2000-08-29  Federico Mena Quintero  <federico@helixcode.com>
-
-	Now the views monitor the client by themselves; it does not make
-	sense to proxy all notifications through the GnomeCal.  The
-	GnomeCal should just be a meta-widget that holds all the views.
-
-	At some later point we'll want to decouple the views from the
-	GnomeCal so that they can be embedded anywhere; they should emit
-	signals to request appropriate actions from the toplevel GUI
-	instead of calling the GnomeCal directly.
-
-	* gui/e-day-view.c (e_day_view_set_cal_client): New function; now
-	the day view monitors the client by itself.
-	(cal_loaded_cb): New callback; moved over from
-	e_day_view_update_all_events().
-	(obj_updated_cb): New callback; moved over from
-	e_day_view_update_event().
-	(obj_removed_cb): New callback; moved over from
-	e_day_view_remove_event().
-	(e_day_view_update_all_events): Removed function.
-	(e_day_view_update_event): Removed function.
-	(e_day_view_remove_event): Removed function.
-	(*): Use the day_view->client directly instead of fetching it from
-	the GnomeCal.
-	(e_day_view_destroy): Unref the client.
-	(e_day_view_reload_events): Check if the client is loaded.
-	(e_day_view_key_press): Set the vtype of the new component.
-
-	* gui/e-week-view.c (e_week_view_set_cal_client): New function.
-	(cal_loaded_cb): New callback.
-	(obj_updated_cb): New callback.
-	(obj_removed_cb): New callback.
-	(e_week_view_update_all_events): Removed function.
-	(e_week_view_update_event): Removed function.
-	(e_week_view_remove_event): Removed function.
-	(*): Use the week_view->client directly.
-	(e_week_view_destroy): Unref the client.
-	(e_week_view_reload_events): Check if the client is loaded.
-
-	* gui/gnome-cal.c (setup_widgets): Set the cal_client on all the
-	views.
-	(gnome_calendar_update_all): Do not update the views, since now
-	they do it themselves.
-	(gnome_calendar_object_updated_cb): Likewise.
-	(gnome_calendar_object_removed_cb): Likewise.
-	(setup_widgets): Remove all to-do list cruft.
-	(gnome_calendar_colors_changed): Likewise.
-	(gnome_calendar_todo_properties_changed): Likewise.
-
-	* gui/calendar-commands.h (todo_style_changed): Removed variable.
-
-	* gui/gncal-todo.c: Removed old clist cruft; just left in the
-	temporary dialog box for now.
-
-2000-08-29  Dan Winship  <danw@helixcode.com>
-
-	* cal-client/client-test.c:
-	* cal-client/cal-client.c:
-	* conduits/todo/todo-conduit.h:
-	* conduits/calendar/calendar-conduit.h: remove USING_OAF checks.
-
-2000-08-29  JP Rosevear  <jpr@helixcode.com>
-
-	* gui/gnome-cal.c (gnome_calendar_edit_object): Use
-	event_editor_set_event_object
-
-	* gui/event-editor.c (event_editor_set_event_object): Rename
-	from event_editor_set_ical_object
-
-	* gui/event-editor.h: Update prototype
-
-	* gui/e-week-view.c (e_week_view_on_new_appointment):
-	Call cal_component_commit_sequence after event changes. Default
-	to these being all day events.
-
-2000-08-29  JP Rosevear  <jpr@helixcode.com>
-
-	* gui/event-editor.c (dialog_to_comp_object): These are not UTC
-	times
-
-2000-08-28  Federico Mena Quintero  <federico@helixcode.com>
-
-	* cal-client/cal-client.c (cal_client_is_loaded): New function.
-	We need this from code that dynamically updates from a client and
-	could not have connected to the "cal_loaded" signal right after
-	the client was created.
-
-	* gui/calendar-model.c (load_objects): Do not try to load the
-	objects if the client has not been loaded yet.
-	(cal_loaded_cb): Check the status value.
-
-	* gui/calendar-model.h (CalendarModel): Declare the private
-	structure here so that gdb will give me love.
-
-	* pcs/cal-factory.h (CalFactory): Likewise.
-
-	* pcs/cal.h (Cal): Likewise.
-
-	* cal-client/cal-listener.h (CalListener): Likewise.
-
-	* cal-client/cal-client.h (CalClient): Likewise.
-
-	* pcs/cal-backend.h (CalBackend): This no longer has a private
-	structure, so remove it.
-
-	* cal-util/Makefile.am (libcal_util_la_SOURCES): Removed the
-	vCalendar and old iCalendar cruft.
-	(libcal_utilinclude_HEADERS): Likewise.
-	Removed the obsolete iCalendar test program.
-
-2000-08-28  JP Rosevear  <jpr@helixcode.com>
-
-	* cal-util/timeutil.h: We no longer need time_from_icaltimetype
-	as libical has the API for this
-
-	* cal-util/timeutil.c: ditto
-
-	* cal-util/cal-recur.c: Replace time_from_icaltimetype with
-	icaltime_as_timet
-
-	* gui/calendar-model.c: ditto
-
-	* gui/event-editor.c: ditto
-
-	* gui/gnome-cal.c: ditto
-
-2000-08-28  Federico Mena Quintero  <federico@helixcode.com>
-
-	* pcs/cal-backend-file.c (remove_component): Remove the
-	icalcomponent from the toplevel calendar here.
-	(cal_backend_file_update_object): Do not remove it here.
-	(cal_backend_file_remove_object): Do not remove it here.
-	(add_component): Add the icalcomponent to the toplevel calendar if
-	asked to.
-	(cal_backend_file_update_object): Do not add it here.
-
-2000-08-28  JP Rosevear  <jpr@helixcode.com>
-
-	* gui/event-editor.c (dialog_to_comp_object): Initiliaze tzid to
-	null, only set recurrence rules and exception dates if there
-	are any
-
-2000-08-27  JP Rosevear  <jpr@helixcode.com>
-
-	* pcs/cal-backend-file.c (save): Write out the calendar object
-	(cal_backend_file_update_object): Remove/add the icalcomponent
-	from our master icalcomponent (the calendar)
-	(cal_backend_file_remove_object): Remove the icalcomponent
-	from our master icalcomponent
-
-2000-08-26  JP Rosevear  <jpr@helixcode.com>
-
-	* gui/Makefile.am: Remove gnorba stuff
-
-	* gui/main.c: ditto
-
-	* gui/component-factory.c: ditto
-
-	* gui/control-factory.c: ditto
-
-	* gui/*.gnorba: ditto
-
-2000-08-25  JP Rosevear  <jpr@helixcode.com>
-
-	* gui/e-calendar-table.c (e_calendar_table_init): Uncomment
-	debug code.
-
-	* gui/calendar-model.c (set_complete): Set the completed
-	date to the current date
-	(calendar_model_set_value_at): Handle complete field
-
-2000-08-25  JP Rosevear  <jpr@helixcode.com>
-
-	* gui/calendar-model.c (get_is_complete): Don't attempt to
-	free this if its null
-	(calendar_model_duplicate_value): Implement for summary field
-	value
-	(calendar_model_initialize_value): Remove debug code
-
-	* gui/e-calendar-table.c: Correct etable init xml
-	(create_column): Pass the id to e_table_header_add_column
-	rather than a hard coded one
-	(e_calendar_table_init): Make sure summary column isn't
-	added twice.  Add an alarms column, else etable won't
-	work with columns who have an ID higher than that
-
-2000-08-24  JP Rosevear  <jpr@helixcode.com>
-
-	* gui/gncal-todo.c (ok_button): Properly append to list
-
-	* gui/event-editor.c (dialog_to_comp_object): ditto
-
-	* gui/e-day-view.c (e_day_view_on_new_appointment): The base
-	times are not UTC
-
-	* gui/e-week-view.c (e_week_view_on_new_appointment): ditto
-
-2000-08-24  JP Rosevear  <jpr@helixcode.com>
-
-	* Update for libical 0.19
-
-2000-08-24  Christopher James Lahey  <clahey@helixcode.com>
-
-	* gui/calendar-commands.c, gui/e-day-view.c, gui/e-week-view.c,
-	gui/event-editor.c, gui/gncal-todo.c, gui/gnome-cal.c, gui/prop.c:
-	Fixed some warnings.
-
-2000-08-24  JP Rosevear  <jpr@helixcode.com>
-
-	* gui/e-week-view.c (e_week_view_on_new_appointment): Do not alloc
-	the struct icaltimetype but point to one on the stack.  More
-	importantly, set the date.tzid to NULL.
-
-2000-08-24  JP Rosevear  <jpr@helixcode.com>
-
-	* gui/gnome-cal.c (save_event_object_cb): Make signal
-	names saner
-	(released_event_object_cb): ditto
-	(gnome_calendar_edit_object): ditto
-
-	* gui/event-editor.h: Make signal names saner
-
-	* gui/event-editor.c (event_editor_class_init): Make signal
-	names saner now that we don't use ical object
-	(save_event_object): ditto with callback names
-	(file_save_cb): ditto
-	(tb_save_and_close_cb): ditto
-	(event_editor_set_ical_object): ditto
-
-	* gui/e-day-view.c (e_day_view_update_event): Umm,
-	!= CAL_COMPONENT_EVENT (I hope that wasn't me!)
-
-2000-08-24  Federico Mena Quintero  <federico@helixcode.com>
-
-	* gui/e-day-view.c (e_day_view_on_new_appointment): Do not alloc
-	the struct icaltimetype but point to one on the stack.  More
-	importantly, set the date.tzid to NULL.
-
-2000-08-24  JP Rosevear  <jpr@helixcode.com>
-
-	* gui/event-editor-dialog.glade: Remove owner field
-
-	* gui/event-editor.c (clear_widgets): Forget about owner field
-	(get_widgets): ditto
-	(fill_widgets): ditto
-
-2000-08-24  JP Rosevear  <jpr@helixcode.com>
-
-	* gui/calendar-model.c (calendar_model_initialize_value): Handle
-	summary field
-	(calendar_model_value_is_empty): ditto
-	(calendar_model_free_value): ditto
-
-2000-08-23  JP Rosevear  <jpr@helixcode.com>
-
-	* gui/event-editor-dialog.glade: Remove status bar
-
-	* cal-util/cal-component.c (cal_component_set_rrule_list): Allow
-	a null list
-	(cal_component_set_rdate_list): Allow a null list
-
-	* gui/e-day-view.c (e_day_view_on_new_appointment): Commit
-	the CalComponent sequence
-
-2000-08-23  Federico Mena Quintero  <federico@helixcode.com>
-
-	* gui/main.c: #include <e-util/e-cursors.h>
-
-	* gui/e-day-view-time-item.c (e_day_view_time_item_draw):
-	Initialize time_min_x1 and hour_r to keep gcc happy.
-
-	* gui/e-day-view.c (e_day_view_update_event_label): Warning fix.
-	(e_day_view_update_main_canvas_drag): Initialize start_row.
-
-	* gui/e-week-view-event-item.c (e_week_view_event_item_draw):
-	Initialize time_y_small_min, icon_x.
-
-	* Makefile.am (SUBDIRS): Re-enable the gui directory.
-
-	* gui/prop.c (prop_store_alarm_default_values): Temporarily #if 0
-	out.
-
-2000-08-23  JP Rosevear  <jpr@helixcode.com>
-
-	* gui/e-week-view.c (e_week_view_key_press): Set vtype of new
-	CalComponent
-	(e_week_view_on_new_appointment): ditto
-
-	* gui/e-day-view.c (e_day_view_on_new_appointment): ditto
-
-2000-08-23  JP Rosevear  <jpr@helixcode.com>
-
-	* gui/e-day-view-time-item.c: Include gnome.h for gettext purposes
-
-	* gui/gnome-cal.c: ditto
-
-	* gui/prop.c: #if out some alarm stuff
-
-2000-08-23  Federico Mena Quintero  <federico@helixcode.com>
-
-	* gui/e-calendar-table.c (e_calendar_table_init): Updated
-	function.
-	(e_calendar_table_open_task): Updated function.
-
-2000-08-21  Federico Mena Quintero  <federico@helixcode.com>
-
-	* gui/calendar-model.c (calendar_model_duplicate_value): Updated
-	function.
-	(calendar_model_free_value): Updated function.
-	(calendar_model_initialize_value): Updated function.
-	(calendar_model_value_is_empty): Updated function.
-	(remove_object): Updated function.
-	(obj_updated_cb): Updated function.
-	(calendar_model_get_cal_client): Added inline docs.
-	(calendar_model_delete_task): Updated.
-	(calendar_model_mark_task_complete): Updated.
-	(calendar_model_get_cal_object): Updated.
-
-2000-08-21  Federico Mena Quintero  <federico@helixcode.com>
-
-	* gui/calendar-model.c (set_categories): New function.
-	(parse_time): Moved over from the old set_time_t().  This just
-	parses the time and leaves the warning dialog for the caller.
-	(set_datetime): New function.
-	(set_geo): Updated old function.
-	(set_percent): Updated old function.
-	(set_priority): Updated old function.
-	(set_summary): New function.
-	(set_url): New function.
-	(calendar_model_set_value_at): Updated function.
-	(calendar_model_is_cell_editable): Updated function.
-	(calendar_model_append_row): Updated.  Added an ugly hack to
-	accomodate ETable's lack of a real API for adding new items.
-	Also, don't try to set columns that are not editable.
-
-2000-08-21  JP Rosevear  <jpr@helixcode.com>
-
-	* gui/e-week-view.c (e_week_view_reload_events):
-	Use CalObjType
-
-	* gui/e-day-view.c (e_day_view_reload_events): ditto
-
-2000-08-21  JP Rosevear  <jpr@helixcode.com>
-
-	* gui/e-day-view-main-item.c (e_day_view_main_item_draw_day_event):
-	Use CalComponent instead of iCalObject.  #if some alarm stuff
-
-2000-08-21  JP Rosevear  <jpr@helixcode.com>
-
-	* gui/e-day-view-top-item.c (e_day_view_top_draw_long_event):
-	Use CalComponent instead of iCalObject.  #if some alarm stuff
-
-2000-08-21  JP Rosevear  <jpr@helixcode.com>
-
-	* gui/e-day-view.h: Update prototypes
-
-	* gui/e-day-view.c (e_day_view_on_unrecur_appointment):
-	Remove commented out portions.
-
-	* gui/e-week-view.c (e_week_view_on_unrecur_appointment):
-	Tidy.
-
-2000-08-21  JP Rosevear  <jpr@helixcode.com>
-
-	* gui/e-day-view.c
-	(e_day_view_update_event): Use CalComponent
-	instead of iCalObject.  Work around not having a compare
-	dates routine for two CalComponents.
-	(e_day_view_reshape_long_event): Use CalComponent instead
-	of iCalObject, #if some alarm stuff
-	(e_day_view_reshape_day_event): ditto
-	(e_day_view_reload_events): Use revamped CalClient
-	(e_day_view_update_event_cb): Use CalComponent
-	instead of iCalObject
-	(e_day_view_foreach_event_with_uid): ditto
-	(e_day_view_remove_event_cb): ditto
-	(e_day_view_update_event_label): ditto
-	(e_day_view_find_event_from_uid): ditto
-	(e_day_view_on_event_click): ditto
-	(e_day_view_on_event_right_click): ditto
-	(e_day_view_on_new_appointment): ditto
-	(e_day_view_on_edit_appointment): ditto
-	(e_day_view_on_delete_occurrence): ditto
-	(e_day_view_on_delete_appointment): ditto
-	(e_day_view_on_unrecur_appointment): ditto
-	(e_day_view_on_top_canvas_motion): ditto
-	(e_day_view_on_main_canvas_motion): ditto
-	(e_day_view_finish_long_event_resize): ditto
-	(e_day_view_finish_resize): ditto
-	(e_day_view_free_event_array): ditto
-	(e_day_view_add_event): ditto
-	(e_day_view_key_press): ditto
-	(e_day_view_on_editing_stopped): ditto
-	(e_day_view_update_top_canvas_drag): ditto
-	(e_day_view_update_main_canvas_drag): ditto
-	(e_day_view_on_drag_data_get): ditto
-	(e_day_view_on_top_canvas_drag_data_received): ditto
-	(e_day_view_on_main_canvas_drag_data_received): ditto
-
-2000-08-20  JP Rosevear  <jpr@helixcode.com>
-
-	* gui/e-week-view-event-item.c (e_week_view_event_item_draw_icons):
-	Use CalComponent instead of iCalObject.  #if some alarm stuff
-
-2000-08-20  JP Rosevear  <jpr@helixcode.com>
-
-	* gui/e-week-view.c (e_week_view_update_event): Use CalComponent
-	instead of iCalObject.  Work around not having a compare
-	dates routine for two CalComponents.
-	(e_week_view_reload_events): Use revamped CalClient
-	(e_week_view_reshape_event_span): Use CalComponent instead
-	of iCalObject, #if some alarm stuff
-	(e_week_view_update_event_cb): Use CalComponent instead of
-	iCalObject
-	(e_week_view_foreach_event_with_uid): ditto
-	(e_week_view_remove_event_cb): ditto
-	(e_week_view_free_events): ditto
-	(e_week_view_add_event): ditto
-	(e_week_view_on_editing_stopped): ditto
-	(e_week_view_find_event_from_uid): ditto
-	(e_week_view_key_press): ditto
-	(e_week_view_show_popup_menu): ditto
-	(e_week_view_on_new_appointment): ditto
-	(e_week_view_on_edit_appointment): ditto
-	(e_week_view_on_delete_occurrence): ditto
-	(e_week_view_on_delete_appointment): ditto
-	(e_week_view_on_unrecur_appointment): ditto
-
-	* gui/e-week-view.h: Update prototypes.
-
-2000-08-18  JP Rosevear  <jpr@helixcode.com>
-
-	* gui/event-editor.h: Update prototypes.
-
-	* gui/event-editor.c: Need to come back here later to fix the
-	alarm stuff.  The gui also needs to be completely redone to
-	support the fancier CalComponent settings (exrules, rdates, etc)
-	There are some warnings that I put in to mark some of these
-	spots
-	(event_editor_destroy): Use Calcomponent instead
-	of iCalObject
-	(make_title_from_comp): ditto
-	(clear_widgets): ditto
-	(fill_widgets): ditto
-	(classification_get): ditto
-	(dialog_to_comp_object): ditto
-	(save_ical_object): ditto
-	(close_dialog): ditto
-	(event_editor_set_ical_object): ditto
-
-2000-08-17  JP Rosevear  <jpr@helixcode.com>
-
-	* gui/gncal-todo.c (ok_button): Use CalComponent instead of
-	iCalObject
-	(cancel_button): ditto
-	(gncal_todo_edit): ditto
-	(add_todo): ditto
-	(edit_todo): ditto
-	(delete_todo): ditto
-	(insert_in_clist): ditto
-	(gncal_todo_update): ditto
-
-	* gui/gncal-todo.h: Update prototypes
-
-2000-08-16  JP Rosevear  <jpr@helixcode.com>
-
-	Rework gnome-cal.c - alarms are a tad broken ATM so this
-	will need more cleaning later.
-
-	* gui/gnome-cal.c (snooze): Use CalComponent instead of
-	iCalObject
-	(edit): ditto
-	(audio_notification): ditto
-	(display_notification_cb): Use CalComponent member of
-	alarm_notify_closure rather than iCalObject
-	(display_notification): ditto
-	(trigger_alarm_cb): ditto.  Use CalComponent alarm types
-	(gnome_calendar_tag_calendar_cb): New
-	cal_client_generate_instances callback to
-	mark_gtk_calendar_day's
-	(gnome_calendar_tag_calendar): Use above callback
-	(save_ical_object_cb): Use CalComponent instead of
-	iCalObject
-	(gnome_calendar_edit_object): ditto
-	(gnome_calendar_new_appointment): ditto
-
-2000-08-15  JP Rosevear  <jpr@helixcode.com>
-
-	* gui/mark.c (mark_month_item_cb): Callback used to mark every
-	event in a month.
-	(mark_month_item): Use cal_client_generate_instances with
-	above callback
-
-2000-08-15  JP Rosevear  <jpr@helixcode.com>
-
-	* gui/print.c (print_month_small): Use
-	cal_client_get_objects_in_range
-	(print_day_details_cb): Callback used to create columns and fill
-	events into a day view.  Code should be shared with e-day-view
-	in reality.  Maybe need to go back to layout.[hc] a bit later
-	(print_day_details): Use cal_client_generate_instances with
-	above callback. Iterate over results to expand events to fit.
-	(print_day_summary_cb): Callback to build list of event info
-	for a day
-	(print_day_summary): Use cal_client_generate_instances with
-	above callback to generate the required event info for printing
-	(print_todo_details_cb): Callback used create list of todo info
-	(print_todo_details): Use cal_client_generate_instances with
-	above callback to generate required todo info for printing.
-
-	* gui/layout.[hc]: No longer used.
-
-2000-08-12  Federico Mena Quintero  <federico@helixcode.com>
-
-	* gui/calendar-model.c (get_is_overdue): Finished implementing.
-	(calendar_model_value_at): Handle the color field.
-
-2000-08-11  Seth Alves  <alves@hungry.com>
-
-	* cal-util/cal-component.c (cal_component_get_pilot_id):
-	(cal_component_set_pilot_id):  stubs for pilot id accessors
-	(cal_component_get_pilot_status):
-	(cal_component_set_pilot_status): stubs for pilot status accessors
-
-	* conduits/calendar/calendar-conduit.c (transmit): start to
-	convert to cal-component interface
-
-	* conduits/todo/todo-conduit.c (transmit): same
-
-2000-08-11  Federico Mena Quintero  <federico@helixcode.com>
-
-	* gui/calendar-model.c (get_geo): Generate a prettier string for
-	the geographical position.
-	(get_classification): New function.
-	(get_categories): New function.
-	(get_completed): New function.
-	(get_dtend): New function.
-	(get_dtstart): New function.
-	(get_due): New function.
-	(get_percent): New function.
-	(get_priority): New function.
-	(get_summary): New function.
-	(get_transparency): New function.
-	(get_url): New function.
-	(get_has_alarms): New function.
-	(get_has_recurrences): New function.
-	(get_is_complete): New function.
-	(get_is_overdue): New function.
-
-	* cal-util/cal-component.c (scan_property): Handle the GEO
-	property.
-	(free_icalcomponent): Likewise.
-	(cal_component_get_geo): Likewise.
-	(cal_component_set_geo): Likewise.
-	(cal_component_free_geo): Likewise.
-	(cal_component_set_exdate_list): Removed incorrect assertion.
-	(cal_component_set_exrule_list): Removed incorrect assertion.
-	(cal_component_get_next_alarm): Oops, this had not been
-	implemented at all.
-	(cal_component_has_rdates): New function.
-	(cal_component_has_rrules): New function.
-
-	* cal-util/cal-component.h (CalComponentField): Added the GEO
-	property.
-
-2000-08-11  Federico Mena Quintero  <federico@helixcode.com>
-
-	* cal-util/cal-component.c (scan_property): Handle the
-	PERCENT-COMPLETE property.
-	(free_icalcomponent): Likewise.
-	(cal_component_get_percent): Likewise.
-	(cal_component_set_percent): Likewise.
-	(cal_component_free_percent): Likewise.
-	(scan_property): Handle the PRIORITY property.
-	(free_icalcomponent): Likewise.
-	(cal_component_get_priority): Likewise.
-	(cal_component_set_priority): Likewise.
-	(cal_component_free_priority): Likewise.
-
-	* cal-util/cal-component.h (CalComponentField): New enumeration
-	with the list of fields we support for ETable.
-
-2000-08-10  Dan Winship  <danw@helixcode.com>
-
-	* gui/component-factory.c (owner_set_cb): Update prototype.
-
-2000-08-10  Federico Mena Quintero  <federico@helixcode.com>
-
-	* gui/gnome-cal.c (gnome_calendar_new_appointment): New function.
-	Mostly moved over from calendar-commands.c:display_objedit().
-
-	* gui/calendar-commands.c (calendar_iterate): Removed.  Wheee!
-	(display_objedit): Removed.
-	(new_appointment_cb): New function.  Just call
-	gnome_calendar_new_appointment().
-	(display_objedit_today): Removed.
-	(calendar_control_activate): Removed the "New appointment for
-	today" option, since it is pretty useless.
-
-2000-08-10  Federico Mena Quintero  <federico@helixcode.com>
-
-	* cal-client/cal-client.c (cal_client_generate_instances): There.
-	A pretty function to generate recurrence instances atomically so
-	that clients don't have to jump through hoops.  Now we can get rid
-	of the ugly calendar_iterate() function.
-
-2000-08-09  Cody Russell  <bratsche@gnome.org>
-
-	* gui/calendar-commands.c: Make the toolbar honor the user's
-	gnomecc settings for detachable toolbars.
-
-2000-08-09  Federico Mena Quintero  <federico@helixcode.com>
-
-	* gui/alarm.c (pop_alarm): Oops, subtract the new alarm's trigger
-	time from the current time.
-
-2000-08-09  Christopher James Lahey  <clahey@helixcode.com>
-
-	* cal-client/cal-client.c: Fixed a warning.
-
-2000-08-09  Christopher James Lahey  <clahey@helixcode.com>
-
-	* cal-client/cal-client.c, gui/e-calendar-table.c, pcs/cal.c:
-	Fixed some warnings.
-
-2000-08-08  Federico Mena Quintero  <federico@helixcode.com>
-
-	* idl/evolution-calendar.idl (Cal): Added a get_objects_in_range()
-	method.  Takes in a time range and the type of component we are
-	interested in; returns a list of UIDs.  The idea is that
-	ocurrences get computed in the client; we can have multiple
-	recurrences in iCalendar and we cannot identify them trivially
-	across the wire.
-	(Cal): Removed the get_events_in_range() method.
-
-	* pcs/cal-backend.c (cal_backend_free_uid_list): New function.
-	(cal_backend_get_objects_in_range): New function.
-	(cal_backend_get_events_in_range): Removed.
-
-	* pcs/cal-backend-file.c (cal_backend_file_get_objects_in_range):
-	Implemented new method.
-	(cal_backend_file_get_events_in_range): Removed.
-
-	* pcs/cal.c (Cal_get_events_in_range): Removed.
-	(uncorba_obj_type): New function.
-	(Cal_get_uids): Use uncorba_obj_type().
-	(Cal_get_n_objects): Likewise.
-	(Cal_get_objects_in_range): Implemented new method.
-
-	* cal-client/cal-client.c (cal_client_get_events_in_range): Removed.
-	(cal_client_get_objects_in_range): Implemented.
-	(corba_obj_type): New function.
-	(cal_client_get_n_objects): Use corba_obj_type().
-	(cal_client_get_uids): Likewise.
-
-2000-08-07  Federico Mena Quintero  <federico@helixcode.com>
-
-	* cal-util/cal-component.c (cal_component_clone): New function.
-	(cal_component_get_icalcomponent): Ensure that the SEQUENCE
-	property does not need incrementing.
-
-	* gui/dialogs/alarm-notify-dialog.c (alarm_notify_dialog): Use
-	CalComponent.  Deal with an empty summary property.
-
-2000-08-07  Federico Mena Quintero  <federico@helixcode.com>
-
-	* cal-util/cal-component.c (cal_component_get_as_string): Doh,
-	libical owns the string's memory, so do not free it.
-
-	* cal-client/client-test.c (create_client): Connect to the destroy
-	signal of the client here.
-
-	* cal-client/test.ics: New test file, modified from Eric Busboom's
-	test file from RFC 2445.
-
-2000-08-05  Federico Mena Quintero  <federico@helixcode.com>
-
-	* cal-client/client-test.c (dump_component): This was gone for
-	some reason.
-	(main): Load a new test file.
-
-2000-08-04  Federico Mena Quintero  <federico@helixcode.com>
-
-	* cal-util/cal-component.c (cal_component_commit_sequence): New
-	function to commit changes to the SEQUENCE property.
-	(cal_component_get_as_string): Ensure that the sequence has been
-	committed.
-
-	* cal-client/cal-client.c (cal_client_get_object): Use
-	CalComponent instead of the old iCalObject.
-	(cal_client_update_object): Use iCalObject.  Commit the SEQUENCE
-	property before stringifying the object and piping it over to the
-	Wombat.
-
-2000-08-04  Seth Alves  <alves@hungry.com>
-
-	* conduits/todo/todo-conduit.c (conduit_get_gpilot_conduit): if
-	oaf isn't initialized by the time the conduit starts, start it
-	up.  we do this because we need to start wombat with oaf, and
-	gpilotd doesn't currently start oaf.
-
-2000-08-04  Michael Meeks  <michael@helixcode.com>
-
-	* gui/calendar-commands.c (calendar_control_activate): unref.
-
-2000-08-02  Federico Mena Quintero  <federico@helixcode.com>
-
-	* pcs/cal-backend-file.c (cal_backend_file_get_uid_by_pilot_id):
-	Added stub for now.
-	(cal_backend_file_update_pilot_id): Likewise.
-
-	* pcs/Makefile.am (libpcs_a_SOURCES): Removed cal-backend-imc.[ch]
-	from the list of sources.  The idea is to move vCalendar importing
-	to the GUI as a convenience function.
-
-2000-08-02  Seth Alves  <alves@hungry.com>
-
-	* pcs/cal-backend-imc.c (cal_backend_imc_update_pilot_id): call
-	save (cbimc) after setting the pilot id and status.
-
-2000-08-02  Joe Shaw  <joe@helixcode.com>
-
-	* pcs/cal-backend-file.c (cal_backend_file_update_pilot_id):
-	Fixed a g_return_if_fail that had two parameters and thus
-	wouldn't build.
-
-2000-08-03  Damon Chaplin  <damon@helixcode.com>
-
-	* gui/calendar-model.c (calendar_model_append_row): updated to match
-	the new ETableModel append_row. This meant we could also get rid of
-	the row_being_added and idle_id hack.
-
-2000-08-02  Christopher James Lahey  <clahey@helixcode.com>
-
-	* gui/calendar-model.c: Emit "model_pre_change" signals as
-	appropriate.
-
-2000-08-02  Federico Mena Quintero  <federico@helixcode.com>
-
-	* pcs/cal-backend-file.[ch]: New files for the iCalendar file
-	backend.
-
-	* pcs/Makefile.am (libpcs_a_SOURCES): Added cal-backend-file.[ch].
-
-	* cal-util/cal-component.c (cal_component_set_icalcomponent):
-	Return an operation success code for if we are passed a component
-	of a type we don't support.
-
-2000-07-31  Federico Mena Quintero  <federico@helixcode.com>
-
-	* cal-util/cal-recur.c (*): Use CalComponent and the new property
-	types instead of the old iCalObject stuff.
-	(cal_recur_generate_instances): Renamed from
-	cal_object_generate_events().  Ensure that the component has the
-	DTSTART property.
-	(generate_instances_for_year): Renamed from
-	cal_object_generate_events_for_year().
-	(cal_obj_expand_recurrence): Made static.
-	(cal_recur_from_icalrecurrencetype): New function.  We should
-	really convert this whole file to use struct icalrecurrencetype
-	instead.
-	(cal_recur_free): New function.
-
-	* cal-util/cal-recur.h (CalRecurType): Renamed from CalObjRecurType.
-	(CalRecurrence): Renamed from CalObjRecurrence.
-
-	* cal-util/timeutil.c (time_from_icaltimetype): New function.
-
-	* cal-util/Makefile.am: Commented out the test-recur program.
-
-2000-08-01  Damon Chaplin  <damon@helixcode.com>
-
-	* Removed doc directory, since it is the old gnome-pim docs which
-	aren't used any more.
-
-	* Makefile.am (SUBDIRS): removed doc.
-
-2000-07-26  Peter Williams  <peterw@helixcode.com>
-
-	* gui/calendar-model.c: compile fix for Solaris
-	(works under Linux, too; don't know about others)
-
-	* this is a test of whether CVS merge does what I
-	think it will do.
-
-2000-07-26  Federico Mena Quintero  <federico@helixcode.com>
-
-	OK, it seems that we have all the interesting properties for
-	single-user calendars now.  RFC 2445 can bite me.
-
-	* cal-util/cal-component.c (scan_property): Handle the RRULE
-	property.  Yay!.
-	(scan_recur): Likewise, yow!
-	(get_recur_list): Likewise, yeehaw!
-	(get_recur_list): Likewise, honk honk!
-	(set_recur_list): Likewise, booooga booooga!
-	(cal_component_get_rrule_list): Likewise, squeek squeek!
-	(cal_component_set_rrule_list): That's it, I ran out of sounds.
-	(cal_component_free_recur_list): Likewise.
-	(scan_property): Handle the EXRULE property.
-	(free_icalcomponent): Likewise.
-	(cal_component_get_exrule_list): Likewise.
-	(cal_component_set_exrule_list): Likewise.
-	(set_period_list): Oops, free the old properties as well as
-	removing them.
-	(set_text_list): Ditto.
-	(cal_component_set_exdate_list): Ditto.
-
-	* cal-util/cal-component.c: Put all the functions used to free
-	returned values all together.
-	(cal_component_set_rdate_list): Oops, mark SEQUENCE property to be
-	incremented since the RFC requires it.
-	(scan_property): Handle the EXDATE property.
-	(scan_exdate): Likewise.
-	(free_icalcomponent): Likewise.
-	(cal_component_get_exdate_list): Likewise.
-	(cal_component_set_exdate_list): Likewise.
-	(cal_component_free_exdate_list): Likewise.
-
-2000-07-26  Jeffrey Stedfast  <fejj@helixcode.com>
-
-	* gui/Makefile.am: Fixed a typo
-
-2000-07-26  Jeffrey Stedfast  <fejj@helixcode.com>
-
-	* gui/Makefile.am: Added a few xpm files to the EXTRA DIST section
-
-2000-07-25  Federico Mena Quintero  <federico@helixcode.com>
-
-	* cal-util/cal-component.c (cal_component_free_period_list): New function.
-	(scan_property): Handle the RDATE property.
-	(scan_period): Likewise.
-	(free_icalcomponent): Likewise.
-	(get_period_list): Likewise.
-	(set_period_list): Likewise.
-	(cal_component_get_rdate_list): Likewise.
-	(cal_component_set_rdate_list): Likewise.
-	(scan_text): Simplify a bit since we only handle the ALTREP
-	parameter; there is no need to iterate over all parameters.
-	(scan_datetime): Simplify; just handle the TZID parameter.
-	(scan_summary): Simplify; just handle the ALTREP parameter.
-	(cal_component_get_as_string): New function.
-
-	* idl/evolution-calendar.idl (CalObjType): Removed the TYPE_OTHER;
-	now we only expose the types of objects we know about.
-
-	* cal-util/cal-util.h (CalObjType): Likewise.
-
-	* cal-client/cal-client.c (cal_client_get_n_objects): Likewise.
-	(cal_client_get_uids): Likewise.
-
-	* conduits/calendar/calendar-conduit.c (get_calendar_objects): Likewise.
-	(check_for_slow_setting): Likewise.
-
-	* pcs/cal-backend-imc.c (count_objects): Likewise.
-	(build_uids_list): Likewise.
-
-	* pcs/cal.c (Cal_get_uids): Likewise.
-	(Cal_get_n_objects): Likewise.
-
-2000-07-25  Damon Chaplin  <damon@helixcode.com>
-
-	* gui/e-calendar-table.[hc]: new ECalendarTable to show an ETable view
-	for Todo/Event items.
-
-	* gui/task-assigned-to.xpm:
-	* gui/task-recurring.xpm:
-	* gui/task-assigned.xpm:
-	* gui/task.xpm: new pixmaps (all the same at present) to go in the
-	icon column of the ETable.
-
-	* gui/event-editor.c: hid the silly 'Calendar' labels on the
-	GnomeDateEdits and hid the times when you select 'All day event'.
-	Also adjusted the time_t's so that when an all day event finishes on
-	say midnight 13th May, we show 12th May in the dialog, since it
-	implicitly includes all of that day up to midnight.
-
-	* gui/dialogs/task-editor-dialog.glade:
-	* gui/dialogs/task-editor.[hc]: unfinished dialog to edit tasks.
-
-	* gui/gncal-todo.c: temporary hack so that we can use the simple dialog
-	with our new ETable.
-
-2000-07-23  Damon Chaplin  <damon@helixcode.com>
-
-	* cal-util/calobj.h: added a few more fields.
-
-	* cal-util/calobj.c (ical_object_create_from_vobject): check for a
-	NULL return from vObjectUStringZValue for URL property to avoid SEGV.
-	For some reason an empty 'URL:' property appears and causes trouble.
-
-2000-07-20  Ettore Perazzoli  <ettore@helixcode.com>
-
-	* gui/component-factory.c (factory_fn): Update for the new
-	`evolution_shell_component_new()' arg.
-
-2000-07-19  Federico Mena Quintero  <federico@helixcode.com>
-
-	* cal-util/cal-component.c (cal_component_alarm_set_trigger):
-	Finish filling the trigger.  What a pain, again.
-	(cal_component_alarm_free_trigger): Implemented.
-
-2000-07-19  Fatih Demir	<kabalak@gmx.net>
-
-	* conduits/calendar/calendar-conduit-control-applet.desktop:
-
-	* conduits/todo/todo-conduit-control-applet.desktop:
-		Added the Turkish desktop entries.
-
-2000-07-18  Federico Mena Quintero  <federico@helixcode.com>
-
-	* cal-util/cal-component.c (cal_component_alarm_free): Free the
-	icalcomponent if this is an unattached alarm.
-	(scan_alarm_property): Handle the TRIGGER property.
-	(cal_component_alarm_get_trigger): Ditto.  Royal pain.
-	(cal_component_alarm_set_trigger): Ditto.  Less pain.
-
-2000-07-17  Federico Mena Quintero  <federico@helixcode.com>
-
-	* cal-client/cal-client.c (cal_client_get_object): Fixed inline
-	docs.
-	(cal_client_new): Ditto.
-	(cal_client_get_n_objects): Added inline docs.
-
-2000-07-14  Federico Mena Quintero  <federico@helixcode.com>
-
-	* cal-util/cal-component.c (CalComponentAlarm): New internal
-	represntation for alarm components.  We really don't map them to a
-	CalComponent because it is more convenient to handle them as
-	"child" structures.
-	(make_alarm): New function to create a CalComponentAlarm from an
-	icalcomponent representing a VALARM.
-	(scan_alarm_property): New function to scan a property from an
-	alarm component.  We support ACTION.
-	(cal_component_get_first_alarm): New function to start an iterator
-	over the alarms in a calendar component.
-	(cal_component_alarm_get_action): New function.
-	(cal_component_alarm_set_action): New function.
-
-2000-07-13  Seth Alves  <alves@hungry.com>
-
-	* conduits/todo/todo-conduit.c: conduit based on the calendar conduit.
-	this conduit syncs a pilot's ToDoDB database to wombat's list of "todo"
-	events.
-
-	* gui/gncal-todo.c (simple_todo_editor): set todo's priority control
-	based on value from ical object during edit.
-
-2000-07-12  Federico Mena Quintero  <federico@helixcode.com>
-
-	* gui/print.c: Revert Michael's GnomeFont patch until the
-	gnome-print API stabilizes.
-
-2000-07-12  Michael Meeks  <michael@helixcode.com>
-
-	* gui/print.c (titled_box, print_text, print_month_small),
-	(bound_text): GnomeFont update.
-
-2000-07-12  Seth Alves  <alves@hungry.com>
-
-	* conduits/calendar/calendar-conduit.c: fixed various problems
-
-	* cal-client/Makefile.am: build a static version of the library
-	to link with the conduits
-
-	* cal-util/Makefile.am: same
-
-2000-07-11  Federico Mena Quintero  <federico@helixcode.com>
-
-	* cal-util/cal-component.c (scan_property): Handle the COMPLETED
-	property.
-	(free_icalcomponent): Ditto.
-	(cal_component_get_completed): Ditto.
-	(cal_component_set_completed): Ditto.
-	(scan_property): Handle the TRANSPARENCY property.
-	(free_icalcomponent): Ditto.
-	(cal_component_get_transparency): Ditto.
-	(cal_component_set_transparency): Ditto.
-	(scan_property): Handle the URL property.
-	(free_icalcomponent): Ditto.
-	(cal_component_get_url): Ditto.
-	(cal_component_set_url): Ditto.
-
-	* pcs/cal-factory.c (queue_load_create_job): Removed unneeded
-	check for the URI.
-	(load_fn): Be more paranoid about the URI and notify the listener
-	if we got passed a bad URI.  Simplify the termination code a bit.
-	(create_fn): Likewise.
-	(queue_load_create_job): Be more paranoid about the URI.
-
-2000-07-10  Ettore Perazzoli  <ettore@helixcode.com>
-
-	* gui/Makefile.am: Remove pilot stuff for now.
-
-	* Makefile.am (SUBDIRS): Remove `conduits'.
-
-2000-07-10  Dan Winship  <danw@helixcode.com>
-
-	* gui/Makefile.am (EXTRA_DIST): remove gnomecal.conduit
-
-	* conduits/calendar/Makefile.am (EXTRA_DIST): We want
-	calendar.conduit.in, not calendar.conduit.
-
-2000-07-10  Seth Alves  <alves@hungry.com>
-
-	* gui/Makefile.am (SUBDIRS):
-	* conduits/calendar/Makefile.am: moved calendar-conduit stuff from
-	the gui directory to here.
-
-	* Makefile.am (SUBDIRS): added conduits to SIBDIRS
-
-2000-07-08  Ettore Perazzoli  <ettore@helixcode.com>
-
-	* gui/calendar-commands.c (calendar_control_activate): Remove
-	"close calendar" command.
-
-2000-07-08  Anders Carlsson  <andersca@gnu.org>
-
-	* gui/e-week-view.c (e_week_view_on_button_press): Handle mouse wheel scrolling.
-
-	* gui/e-day-view.c (e_day_view_on_time_canvas_button_press): New function to handle
-	mouse wheel scrolling.
-	(e_day_view_on_main_canvas_button_press): Handle mouse wheel scrolling.
-
-2000-07-07  Federico Mena Quintero  <federico@helixcode.com>
-
-	* cal-util/cal-component.c (scan_property): Handle the SEQUENCE
-	property.
-	(free_icalcomponent): Ditto.
-	(cal_component_get_sequence): Ditto.
-	(cal_component_set_sequence): Ditto.
-	(cal_component_free_sequence): Ditto.
-	(cal_component_set_last_modified): Removed incorrect assertion.
-	(CalComponentPrivate): New need_sequence_inc flag.  The sequence
-	number must be incremented when certain properties change, so we
-	store a flag that says if we need to bump it when piping the
-	object over the wire.
-	(free_icalcomponent): Reset need_sequence_inc.
-	(cal_component_set_dtstart): Set need_sequence_inc.
-	(cal_component_set_dtend): Ditto.
-	(cal_component_set_due): Ditto.
-
-2000-07-06  Federico Mena Quintero  <federico@helixcode.com>
-
-	* cal-util/cal-component.c (scan_property): Handle the
-	LAST-MODIFIED property.
-	(free_icalcomponent): Ditto.
-	(cal_component_get_last_modified): Ditto.
-	(cal_component_set_last_modified): Ditto.
-	(get_icaltimetype): New function to get struct icaltimetype
-	values.
-	(cal_component_get_created): Use get_icaltimetype().
-	(set_icaltimetype): New function to set struct icaltimetype
-	values.
-	(cal_component_set_created): Use set_icaltimetype().
-
-	* cal-util/cal-component.c (scan_property): Handle the CREATED
-	property.
-	(free_icalcomponent): Ditto.
-	(cal_component_free_icaltimetype): Ditto.
-	(cal_component_get_created): Ditto.
-	(cal_component_set_created): Ditto.
-	(cal_component_init): Do not create an UID here.
-	(ensure_mandatory_properties): New function to ensure that the
-	mandatory RFC properties are indeed in the component.  If they are
-	not, we create them on the fly.
-	(cal_component_set_new_vtype): Use ensure_mandatory_properties().
-	(cal_component_set_icalcomponent): Ditto.
-	(cal_component_get_uid): Return the UID in a parameter, not as a
-	function return value, for consistency's sake.
-	(scan_property): Handle the DTSTAMP property.
-	(free_icalcomponent): Ditto.
-	(cal_component_get_dtstamp): Ditto.
-	(cal_component_set_dtstamp): Ditto.
-
-2000-07-04  Damon Chaplin  <damon@helixcode.com>
-
-	* gui/gncal-todo.c (gncal_todo_update): Use &obj instead of &ico in
-	the call to cal_client_get_object(). The ToDo list should work now.
-
-	* gui/event-editor-dialog.glade: set the toplevel GnomeApp to invisible
-	so it doesn't appear and then resize.
-
-2000-07-03  Federico Mena Quintero  <federico@helixcode.com>
-
-	* cal-util/cal-component.c (cal_component_get_summary): Use
-	CalComponentText instead of CalComponentPropSummary.  Removed the
-	latter typedef.
-	(cal_component_set_summary): Likewise.
-	(scan_property): Handle the CLASSIFICATION property.
-	(cal_component_get_classification): Ditto.
-	(cal_component_set_classification): Ditto.
-
-	* cal-util/cal-component.c (cal_component_free_text_list): Renamed
-	from cal_component_free_description_list().  We can share this
-	function since both comments and descriptions have the same form.
-	(scan_text): Ditto.
-	(get_text_list): New function.
-	(set_text_list): New function.
-	(cal_component_get_description_list): Use get_text_list().
-	(cal_component_set_description_list): Use set_text_list().
-	(cal_component_set_uid): Add sanity check.
-	(cal_component_get_summary): Ditto.
-	(cal_component_get_description_list): Ditto.
-	(cal_component_get_dtstart): Ditto.
-	(cal_component_get_dtend): Ditto.
-	(cal_component_get_due): Ditto.
-	(scan_property): Handle the COMMENT property.
-	(cal_component_get_comment_list): Ditto.
-	(cal_component_set_comment_list): Ditto.
-
-2000-07-02  Federico Mena Quintero  <federico@helixcode.com>
-
-	* cal-util/cal-component.c (scan_categories): Handle CATEGORIES.
-	This can appear multiple times, so we maintain a list.  We
-	compress them later to a single property with multiple values.
-	(cal_component_get_categories_list): Ditto.
-	(cal_component_set_categories_list): Ditto.
-	(cal_component_free_categories_list): Ditto.
-	(free_icalcomponent): Properly free the mappings.
-
-2000-07-02  Federico Mena Quintero  <federico@helixcode.com>
-
-	* cal-util/cal-component.c (scan_datetime): Handle date/time and
-	timezone pairs.
-	(scan_property): Handle DTSTART and DTEND.
-	(cal_component_free_datetime): Ditto.
-	(get_datetime): Ditto.
-	(cal_component_get_dtstart): Ditto.
-	(set_datetime): Ditto.
-	(cal_component_set_dtstart): Ditto.
-	(cal_component_get_dtend): Ditto.
-	(cal_component_set_dtend): Ditto.
-	(scan_property): Handle DUE date.
-	(cal_component_get_due): Ditto.
-	(cal_component_set_due): Ditto.
-
-2000-07-01  Federico Mena Quintero  <federico@helixcode.com>
-
-	* cal-util/cal-component.c (cal_component_get_description_list):
-	Handle the DESCRIPTION property.  There can be multiple
-	descriptions with parameters each, so we deal with a list instead
-	of a single structure.
-	(cal_component_set_description_list): Ditto.
-	(cal_component_free_description_list): Ditto.
-	(scan_property): Ditto.
-	(scan_description): Ditto.
-
-2000-06-30  Federico Mena Quintero  <federico@helixcode.com>
-
-	* cal-util/cal-component.c (cal_component_get_summary): To avoid
-	passing a million parameters to setters/getters for properties
-	that support parameters, we now pass client-side structures
-	instead.  Here we use CalComponentPropSummary.
-	(cal_component_set_summary): Ditto.
-
-2000-06-29  Christopher James Lahey  <clahey@helixcode.com>
-
-	* gui/component-factory.c: Make calendar die when evolution quits.
-
-2000-06-30  Federico Mena Quintero  <federico@helixcode.com>
-
-	* cal-util/cal-component.c: Change of plans.  We use an
-	icalcomponent from libical as our core representation so that we
-	can preserve extension fields and fields that we don't (yet)
-	support.  CalComponent is just a wrapper with a nice API that
-	provides non-iterative, random access to the ical's fields.
-	(cal_component_destroy): Free the thing correctly.
-	(cal_component_get_vtype): Re-implement in terms of icalcomponent.
-	(cal_component_set_icalcomponent): New function to set the
-	CalComponent's data from an existing icalcomponent.
-	(cal_component_get_icalcomponent): New function.
-	(cal_component_set_new_vtype): New convenience function to create
-	an empty component.
-	(scan_icalcomponent): Core scanning function.
-	(scan_property): Another core scanning function.
-	(cal_component_get_uid): Use the property directly.
-	(cal_component_get_summary): Ditto.  Handle the altrep parameter
-	as well.
-	(cal_component_set_summary): Ditto.  Feel the pain, motherfucker.
-	It is ridiculous how much code this involves.
-	(scan_summary): Ditto.
-
-2000-06-29  Ettore Perazzoli  <ettore@helixcode.com>
-
-	* gui/component-factory.c (owner_set_cb): Get an
-	EvolutionShellClient instead of an Evolution_Shell to match the
-	changes in libeshell.
-
-2000-06-29  Federico Mena Quintero  <federico@helixcode.com>
-
-	* gui/Makefile.am: Do not link and include the pilot stuff for the
-	calendar component, just for the Pilot conduit.  Commented out the
-	Pilot part so that Evolution can build.  Sigh, we'll have to
-	modify gnome-pilot to use OAF.
-
-2000-06-29  Peter Williams  <peterw@helixcode.com>
-
-	* gui/Makefile.am (LINK_FLAGS): Make the calendar-pilot-sync
-	program conditional on HAVE_GNOME_PILOT, and add
-	GNOME_PILOT_CFLAGS, GNOME_PILOT_LIBS, and PISOCK_LIBS in the
-	appropriate places.
-
-2000-06-29  Seth Alves  <alves@hungry.com>
-
-	* pcs/cal.c (Cal_get_uid_by_pilot_id):
-	(Cal_update_pilot_id):
-	* pcs/cal-backend-imc.c (cal_backend_imc_update_pilot_id):
-	(cal_backend_imc_get_uid_by_pilot_id):
-	* pcs/cal-backend.c (cal_backend_get_uid_by_pilot_id):
-	(cal_backend_update_pilot_id):  server code to service these:
-
-	* gui/calendar-pilot-sync.c: updated to make use of cal-client.
-	also uses dirty bits on both sides to aid in syncing.
-
-	* cal-client/cal-client.c (cal_client_get_uid_by_pilot_id): new
-	function -- ask the cal server to return uid given an object's
-	pilot id.
-	(cal_client_update_pilot_id): new function -- inform the
-	cal server of an objects pilot id and pilot dirty-flag.
-
-2000-06-28  Federico Mena Quintero  <federico@helixcode.com>
-
-	* cal-util/cal-component.[ch]: New files for the new iCalendar
-	component object.  Today's properties: basic component type, UID,
-	SUMMARY.
-
-	* cal-util/Makefile.am: Added cal-component.[ch] to the list of
-	sources.
-
-2000-06-27  Michael Meeks  <michael@helixcode.com>
-
-	* pcs/Makefile.am (INCLUDES): use BONOBO_VFS_GNOME_CFLAGS.
-
-2000-06-26  Christopher James Lahey  <clahey@helixcode.com>
-
-	* gui/calendar-model.c: Added an #ifdefed value_to_string handler
-	assignment.
-
-2000-06-26  Federico Mena Quintero  <federico@helixcode.com>
-
-	* gui/calendar-model.c (calendar_model_duplicate_value):
-	Implement.
-	(calendar_model_initialize_value): Implement.
-	(calendar_model_value_is_empty): Implement.
-
-2000-06-21  Damon Chaplin  <damon@helixcode.com>
-
-	* gui/e-day-view.c (e_day_view_reshape_long_event): set event before
-	using it!
-	(e_day_view_init): used new colors from tigert.
-
-2000-06-21  Christopher James Lahey  <clahey@helixcode.com>
-
-	* gui/e-day-view.c, gui/e-week-view.c: Remove the usage of the "x"
-	and "y" arguments.
-
-2000-06-21  Damon Chaplin  <damon@helixcode.com>
-
-	* gui/gnome-cal.c (gnome_calendar_direction): changed so it keeps the
-	selection range. It just moves it on one day/week etc. This makes
-	it very handy for the keyboard shortcut code.
-
-	* gui/calendar-commands.c (calendar_control_activate): fixed bug
-	setting the radio button active.
-
-	* gui/e-day-view.[hc]: added support for keyboard navigation and
-	selection of the time range.
-
-2000-06-20  Federico Mena Quintero  <federico@helixcode.com>
-
-	* gui/calendar-model.c (calendar_model_set_value_at): Implemented.
-	(calendar_model_is_cell_editable): Implemented.
-
-	* cal-client/cal-client.c (cal_client_update_object): Take in an
-	iCalObject instead of a stringified version.
-
-	* gui/gnome-cal.c (gnome_calendar_update_object): Removed.
-	(gnome_calendar_remove_object): Removed.
-	(save_ical_object_cb): Use the CalClient function.
-
-	* gui/e-day-view.c (e_day_view_on_delete_occurrence): Likewise.
-	(e_day_view_on_unrecur_appointment): Likewise.
-	(e_day_view_finish_long_event_resize): Likewise.
-	(e_day_view_finish_resize): Likewise.
-	(e_day_view_key_press): Likewise.
-	(e_day_view_on_editing_stopped): Likewise.
-	(e_day_view_on_top_canvas_drag_data_received): Likewise.
-	(e_day_view_on_main_canvas_drag_data_received): Likewise.
-	(e_day_view_on_delete_appointment): Likewise.
-
-	* gui/e-week-view.c (e_week_view_on_editing_stopped): Likewise.
-	(e_week_view_key_press): Likewise.
-	(e_week_view_on_delete_occurrence): Likewise.
-	(e_week_view_on_unrecur_appointment): Likewise.
-	(e_week_view_on_delete_appointment): Likewise.
-
-	* gui/gncal-todo.c (ok_button): Likewise.
-	(delete_todo): Likewise.
-
-2000-06-19  Damon Chaplin  <damon@helixcode.com>
-
-	* gui/event-editor-dialog.glade: tidied up dialog a bit, adding
-	space etc.
-
-	* gui/e-week-view.c (e_week_view_reshape_events): removed debug msg.
-
-2000-06-18  Ettore Perazzoli <ettore@helixcode.com>
-
-	* cal-util/Makefile.am (INCLUDES): Include from
-	`$(top_builddir)/libical/src/libical' too.  [For the generated
-	libical `icalversion.h' header.]
-	* cal-client/Makefile.am (INCLUDES): Likewise.
-
-2000-06-18  Damon Chaplin  <damon@helixcode.com>
-
-	* gui/e-day-view.c (e_day_view_on_top_canvas_drag_data_received):
-	fixed a DnD bug.
-
-2000-06-17  Dan Winship  <danw@helixcode.com>
-
-	* cal-client/Makefile.am (INCLUDES): Fix to not depend on
-	installed ical.h
-
-2000-06-17  Damon Chaplin  <damon@helixcode.com>
-
-	* gui/e-week-view.c: added little buttons which are shown when there
-	are more events than will fit in a day. Clicking on the button takes
-	the user to the 1-Day view and shows the full day.
-
-	* gui/e-day-view.c:
-	* gui/e-week-view.c: set the "use_ellipsis" arg to TRUE for the EText
-	items so we get tooltips automatically. Though we may want to use our
-	own code to show tooltips so we can show the tips when the mouse is
-	around the edges of the event box, and we may want to show the start
-	and end times of the event in full.
-
-	* gui/calendar-commands.c (calendar_control_activate):
-	* gui/gnome-cal.h: added view_toolbar_buttons[] so we can access the
-	radio buttons in the code easily. We need this if we want to jump to
-	another view programmatically.
-
-2000-06-16  Damon Chaplin  <damon@helixcode.com>
-
-	* gui/jump.xpm: new icon for the EWeekView to jump to the day.
-
-	* gui/Makefile.am (EXTRA_DIST): added jump.xpm
-
-2000-06-16  Damon Chaplin  <damon@helixcode.com>
-
-	* gui/calendar-model.c (calendar_model_class_init): #ifdef'ed out
-	references to functions which don't exist yet, so evolution still
-	compiles.
-
-2000-06-16  Damon Chaplin  <damon@helixcode.com>
-
-	* cal-util/test-recur.c: updated.
-
-	* cal-util/cal-recur.[hc]: mostly finished, though it depends on the
-	iCalObject struct being updated to support more of iCalendar.
-
-2000-06-16  Damon Chaplin  <damon@helixcode.com>
-
-	* pcs/.cvsignore: added icalendar-test.
-
-2000-06-15  Damon Chaplin  <damon@helixcode.com>
-
-	* cal-util/Makefile.am (test_recur_LDADD): use libical.a
-
-2000-06-15  Dan Winship  <danw@helixcode.com>
-
-	* cal-util/Makefile.am (noinst_PROGRAMS): merge the two separate
-	noinst_PROGRAMS declarations into one so automake accepts it.
-	(INCLUDES): include libical src dir so we don't depend on having
-	ical.h already installed
-
-2000-06-14  Federico Mena Quintero  <federico@helixcode.com>
-
-	* gui/calendar-model.c: GPtrArray cannot insert stuff in the
-	middle of the array (!), so use plain GArray everywhere.  Sigh.
-
-2000-06-13  Federico Mena Quintero  <federico@helixcode.com>
-
-	* cal-client/cal-client.c (cal_client_get_object): Use vCalendar
-	again.
-
-	* cal-util/calobj.c (ical_object_find_in_string): From Seth, make
-	it use vCalendar again.
-
-2000-06-13  Federico Mena Quintero  <federico@helixcode.com>
-
-	* gui/calendar-model.c (obj_updated_cb): Juggle some eggs in
-	asynchronous fashion.  Finished implementing.
-	(obj_removed_cb): Implemented.  This one needs no juggling.
-	(calendar_model_set_cal_client): Only load the objects if we have
-	a client.
-	(calendar_model_destroy): Disconnect from the client's signals.
-
-	* gui/Makefile.am (evolution_calendar_SOURCES): Added
-	calendar-model.[ch] to the list of sources.
-
-	* pcs/cal-backend-imc.c (cal_backend_imc_get_n_objects): Doh,
-	return the computed value.
-
-2000-06-13  Federico Mena Quintero  <federico@helixcode.com>
-
-	* gui/calendar-model.c (CalendarModelPrivate): Added the array of
-	objects and the hash table of UID->array index.
-	(calendar_model_row_count): Return the length directly from the
-	array instead of asking the Wombat.
-	(calendar_model_value_at): Implemented.
-	(calendar_model_new): Create an empty model.  We provide a new
-	setter function now.
-	(calendar_model_construct): Removed function.
-	(calendar_model_set_cal_client): New function to set the calendar
-	client and object type at any time.  This lets us reuse a calendar
-	model object.
-
-	* cal-util/calobj.h (iCalObjectField): Just report whether the
-	object has alarms; not every single alarm.
-
-2000-06-13  Ettore Perazzoli  <ettore@helixcode.com>
-
-	* gui/Makefile.am (SHELL_OBJS): Removed.
-	(evolution_calendar_LDADD): Link with
-	`$(top_builddir)/shell/libeshell.a'.
-
-2000-06-09  Ettore Perazzoli  <ettore@helixcode.com>
-
-	* gui/component-factory.c (factory_fn): Pass NULL for the new args
-	@create_folder_fn and @remove_folder_fn.
-	(create_view): Updated to match the new
-	`EvolutionShellComponentCreateViewFn'.  Return
-	`EVOLUTION_SHELL_COMPONENT_UNSUPPORTEDTYPE' if type is not
-	"calendar".
-
-2000-06-09  Federico Mena Quintero  <federico@helixcode.com>
-
-	* idl/evolution-calendar.idl (Cal): Added a get_n_objects()
-	method.
-
-	* pcs/cal-backend.c (cal_backend_get_n_objects): New function.
-
-	* pcs/cal-backend-imc.c (cal_backend_imc_get_n_objects):
-	Implemented.
-
-	* pcs/cal.c (Cal_get_n_objects): Implemented.
-
-	* cal-client/cal-client.c (cal_client_get_uids): Free the ev.
-	(cal_client_get_n_objects): Implemented.
-
-	* cal-util/calobj.h (iCalObjectField): New enumeration to identify
-	the fields in an iCalObject.
-
-2000-06-08  Federico Mena Quintero  <federico@helixcode.com>
-
-	* gui/event-editor.c (event_editor_destroy): Free the private
-	structure.
-
-2000-06-08  Federico Mena Quintero  <federico@helixcode.com>
-
-	* cal-util/calobj.c (ical_object_to_vobject): Allow for NULL
-	summaries.
-
-2000-06-07  Federico Mena Quintero  <federico@helixcode.com>
-
-	* gui/event-editor.c (toolbar): Added missing tooltips.  We still
-	need icons, though.
-
-2000-06-07  Seth Alves  <alves@hungry.com>
-
-	* cal-util/calobj.c (ical_object_find_in_string): put this back in,
-	it's still used in cal-backend-imc.c:cal_backend_imc_update_object
-
-	* cal-client/cal-client.c (cal_client_get_object): instead of
-	returning a text representation, decode the text and return an
-	iCalObject.  Also added CalClientGetStatus which indicates
-	success or type of failure.
-
-	* cal-util/calobj.c (ical_object_find_in_string): #ifed out
-	ical_object_find_in_string since it is unused now.
-
-	* cal-client/client-test.c (list_uids): track get_object change
-	* gui/calendar-commands.c (calendar_iterate): same
-	* gui/e-day-view.c (e_day_view_update_event): same
-	* gui/e-week-view.c (e_week_view_update_event): same
-	* gui/print.c (print_day_details): same
-	(print_day_summary): same
-	(print_todo_details): same
-	* gui/gnome-cal.c (trigger_alarm_cb): same
-	* gui/gncal-todo.c (gncal_todo_update): same
-
-2000-06-06  Seth Alves  <alves@hungry.com>
-
-	* cal-util/icalendar.c, icalendar-save.c: fixed a bunch of problems
-	* cal-util/calobj.c (ical_object_find_in_string): use libical
-	instead of libversit
-	(ical_object_to_string): same
-	(dump_icalobject): prints the contents of an icalobject for debugging
-
-	* gui/Makefile.am (LINK_FLAGS): link libical.a instead of libical.la
-	so we don't have to modify the build system of the released libical
-	* cal-client/Makefile.am (client_test_LDADD): same
-	* cal-util/Makefile.am (icalendar_test_LDADD): same
-
-2000-06-06  Federico Mena Quintero  <federico@helixcode.com>
-
-	* cal-util/calobj.c (ical_object_destroy): Removed from the public
-	header; made static.  Now everyone should use refcounting.
-
-	* pcs/cal-backend-imc.c (free_ical_object): Use
-	ical_object_unref().
-	(remove_object): Likewise.
-
-2000-06-02  Federico Mena Quintero  <federico@helixcode.com>
-
-	* gui/calendar-commands.c (print): New function to call the print
-	engine.
-	(calendar_toolbar): Added the Print button.
-	(calendar_control_activate): Added the File/Print item.
-
-	* gui/e-day-view.c (e_day_view_get_selected_time_range): Allow
-	start_time and end_time to be NULL.
-
-	* gui/e-week-view.c (e_week_view_get_selected_time_range):
-	Likewise.
-
-	* gui/print.c (range_selector_new): Show the range selector
-	widgets.  Use the correct radio group for all of them!
-	(print_calendar): Do the dialog box here.  We may want to split
-	this function later into smaller chunks.
-
-2000-06-05  Damon Chaplin  <damon@helixcode.com>
-
-	* gui/e-week-view-event-item.c (e_week_view_event_item_button_press):
-	allow the right button to popup the menu, even when the event is
-	being edited.
-
-	* gui/e-week-view.c:
-	* gui/e-day-view.c: Set the keyboard focus to the EDayView/EWeekView
-	when the right button is clicked, so that any event being edited is
-	saved before any action (e.g. opening the Event Editor dialog) is
-	started. Note that this won't work if we switch to asynchronous
-	notification.
-
-2000-06-02  Federico Mena Quintero  <federico@helixcode.com>
-
-	* gui/event-editor.c (tb_save_and_close_cb): Implemented.
-	(toolbar): Added an icon for the Save and Close command.
-	(save_ical_object): Recompute the title of the window here.  Maybe
-	it would be better to do it when we actually get the
-	"object_changed" signal from the CalClient.
-	(file_close_cb): Implemented.
-
-2000-06-02  Federico Mena Quintero  <federico@helixcode.com>
-
-	* gui/gnome-cal.c (save_ical_object_cb): Implemented.
-	(gnome_calendar_add_object): Removed function, since it was
-	identical to gnome_calendar_update_object().  Modified the rest
-	of the code to use only the latter.
-	(gnome_calendar_remove_object): Be more paranoid about the UID.
-	(gnome_calendar_update_object): Ditto.  Also, renamed this
-	function from gnome_calendar_object_changed(), for consistency
-	with the lower-level CalClient interface.
-
-	* gui/event-editor.c (event_editor_class_init): New
-	"save_ical_object" signal to ask that our parent store the
-	calendar object to the backend.
-	(save_ical_object): New function to save the calendar object,
-	actually if just emits the signal.
-	(file_save_cb): Implemented.
-	(dialog_to_ical_object): We want priv->
-	alarm_program_run_program_entry (i.e. the entry inside the
-	GnomeFileEntry), not the file entry itself.
-	(dialog_to_ical_object): Only insert the recurrence ending date if
-	the event is recurrent!
-
-2000-06-02  Christopher James Lahey  <clahey@helixcode.com>
-
-	* gui/Makefile.am: Fixed EXTRA_DIST.
-
-2000-06-01  Federico Mena Quintero  <federico@helixcode.com>
-
-	* gui/gnome-cal.c (editor_closed_cb): Handler for the
-	"editor_closed" signal of the event editor; we just destroy it
-	then.
-
-	* gui/event-editor.c (app_delete_event_cb): Callback used when the
-	dialog is closed.  Release the iCalObject here instead of the
-	event editor's destroy handler, and emit the new "editor_closed"
-	signal.
-
-2000-06-01  Federico Mena Quintero  <federico@helixcode.com>
-
-	* gui/event-editor-dialog.glade: Change of plans.  The toplevel
-	GnomeApp is now generated with Glade instead of being created in
-	the program code.  Otherwise we can't migrate the accelerators to
-	the new toplevel and they won't work.
-
-	* gui/event-editor.[ch]: EventEditor now derives from GtkObject.
-	This lets us use the GnomeApp created by libglade and still have
-	signals and stuff.
-
-	* gui/event-editor.c (create_menu): Tell the UI handler that the
-	menubar is the GnomeApp's existing one, not to create a new one.
-	(create_toolbar): Tell the UI handler to use the GnomeApp's
-	existing toolbar.
-	(event_editor_focus): New function to raise/focus an event editor.
-
-	* gui/gnome-cal.c (gnome_calendar_edit_object): Use
-	event_editor_focus().
-
-2000-06-01  Ettore Perazzoli  <ettore@helixcode.com>
-
-	* gui/calendar-commands.c (calendar_control_activate): Put the
-	toolbar into a frame to make it look like standard GNOME toolbars.
-	Also, set `GNOME_DOCK_ITEM_BEH_NEVER_VERTICAL' so that it does not
-	do evil things when its moved to the left or the right of the
-	window.
-
-2000-05-31  Federico Mena Quintero  <federico@helixcode.com>
-
-	* gui/gnome-cal.h (GnomeCalendar): Added a hash table to map
-	calendar objects to their respective event editors.
-
-	* gui/gnome-cal.c (gnome_calendar_init): Create the
-	object_editor_hash.
-	(gnome_calendar_destroy): Free the object_editor_hash.
-	(gnome_calendar_edit_object): New function to centralize the
-	launching of event editors; if one already exists for a particular
-	calendar object, we just raise its window.
-	(edit): Use gnome_calendar_edit_object().
-
-	* gui/calendar-commands.c (display_objedit): Use
-	gnome_calendar_edit_object().
-	(display_objedit_today): Likewise.
-
-	* gui/e-day-view.c (e_day_view_on_new_appointment): Likewise.
-	(e_day_view_on_edit_appointment): Likewise.
-
-	* gui/e-week-view.c (e_week_view_on_new_appointment): Likewise.
-	(e_week_view_on_edit_appointment): Likewise.
-
-	* gui/event-editor.c (event_editor_new): Do not take in an
-	iCalObject; rather provide an event_editor_set_ical_object()
-	function.  We need this because a single editor may be switched
-	between different calendar objects.  Also, do not show the event
-	editor; leave it up to the client code.
-	(event_editor_construct): Likewise.
-	(clear_widgets): New function to clear the widgets to default
-	values.
-	(fill_widgets): New function to fill in the widgets from the
-	iCalObject.  We don't do this in init_widgets() anymore.
-	(free_exception_clist_data): New function to free the exceptions
-	clist data.  We were leaking the row data.
-	(init_widgets): Hook to the destroy signal of the exceptions
-	clist.
-	(event_editor_set_ical_object): New function.  Now it also makes a
-	copy of the calendar object for the event editor; clients do not
-	need to copy it anymore.
-	(event_editor_destroy): Unref the UI handler as well.
-	(event_editor_class_init): New "ical_object_released" signal to
-	notify the parent that we are no longer editing the calendar
-	object.
-	(make_title_from_ico): Handle NULL objects.
-
-	* gui/event-editor.h (EventEditor): Removed fields that are no
-	longer used.
-
-2000-05-31  Damon Chaplin  <damon@helixcode.com>
-
-	* cal-util/Makefile.am: added test-recur test program.
-
-	* cal-util/test-recur.c: new file to test the recurrence code.
-
-	* cal-util/.cvsignore: added test-recur.
-
-	* cal-util/cal-recur.c: updated.
-
-2000-05-30  Federico Mena Quintero  <federico@helixcode.com>
-
-	* gui/event-editor.c (event_editor_construct): Create the UI
-	handler after we have constructed the parent GnomeApp.
-	(main_menu): Menu template is now in place.
-	(toolbar): Tollbar template is now in place.
-	(create_toolbar): Turn off labels in the toolbar since it sucks;
-	it should support non-homogeneous buttons with horizontal icons
-	and text.
-
-2000-05-29  Federico Mena Quintero  <federico@helixcode.com>
-
-	* gui/gnome-cal.c (gnome_calendar_object_changed): Removed the
-	flags argument, since now we just proxy the calendar object to the
-	calendar client.
-
-	* gui/event-editor.c (alarm_unit_get): Moved over from
-	event-editor-utils.c.
-
-	* gui/event-editor-utils.[ch]: Removed files, since the two
-	functions that were left there (i.e. the ones not present in
-	e-dialog-widgets) can simply be moved to event-editor.c.
-
-	* gui/Makefile.am (evolution_calendar_SOURCES): Removed
-	event-editor-utils.[ch] from the list of sources.
-
-2000-05-27  Federico Mena Quintero  <federico@helixcode.com>
-
-	* gui/event-editor-utils.c: Moved many functions to
-	e-util/e-dialog-widgets.c.
-
-2000-05-25  Federico Mena Quintero  <federico@helixcode.com>
-
-	* gui/event-editor-dialog.glade: Put the main notebook directly
-	under a simple GtkWindow.  We are going to pull out the notebook
-	and slap it into our custom-built GnomeApp, anwyays.
-
-	* gui/event-editor.c: Made the EventEditor derive from GnomeApp.
-	Added a BonoboUIHandler for its menu and toolbar.
-	(make_title_from_ico): Create a nice title for the window.
-	(get_widgets): Fetch the Glade widgets here instead of all over
-	the place.
-	(event_editor_new): Temporary hack to show the dialog here, just
-	so that I can test it.
-
-	* gui/Makefile.am (EXTRA_DIST): Added the Glade messages file.
-
-2000-05-25  Federico Mena Quintero  <federico@helixcode.com>
-
-	* gui/main.c (init_bonobo): Do not initialize libglade twice.
-
-	* gui/component-factory.c (create_view): Set the folder_uri
-	property, otherwise the calendar will not get loaded into the
-	view.
-
-2000-05-25  Christopher James Lahey  <clahey@helixcode.com>
-
-	* gui/main.c: Make it so that warnings don't crash calendar.
-
-2000-05-25  Ettore Perazzoli  <ettore@helixcode.com>
-
-	* gui/evolution-calendar-control.c: Removed.
-
-	* gui/main.c: New.
-
-	* gui/control-factory.c: New.
-	* gui/control-factory.h: New.
-
-	* gui/calendar-component-factory.c: New.
-	* gui/calendar-component-factory.c: New.
-
-	* gui/evolution-calendar-control.c (calendar_control_factory):
-	Renamed from `calendar_factory'.
-	(calendar_control_factory_init): Renamed from
-	`calendar_factory_init'.
-
-	* gui/Makefile.am: Link with the files from `$(builddir)/shell'.
-
-	* gui/evolution-calendar.gnorba: New.
-	* gui/evolution-calendar.oafinfo: New.
-
-2000-05-24  Federico Mena Quintero  <federico@helixcode.com>
-
-	* gui/print.c (range_selector_new): New function to create the
-	custom range selector.
-	(print_dialog): New function to show the print dialog.
-	(print_calendar): Use the print dialog.
-
-2000-05-24  Christopher James Lahey  <clahey@helixcode.com>
-
-	* gui/Makefile.am: Added libepaned.a.
-
-	* gui/gnome-cal.c: Switched from GtkPaned to EPaned.
-
-2000-05-22  Federico Mena Quintero  <federico@helixcode.com>
-
-	* gui/calendar-commands.c (calendar_get_events_in_range): Removed
-	function.
-
-	* gui/mark.c (mark_month_item): Use
-	cal_client_get_events_in_range().
-
-	* gui/calendar-commands.c (show_year_view_clicked): Comment out,
-	since we don't have a year view.
-
-	* gui/gnome-cal.c (setup_widgets): Removed the year view stuff.
-	(gnome_calendar_get_current_view_name): Likewise.
-	(gnome_calendar_update_view_times): Likewise.
-	(gnome_calendar_direction): Likewise.
-	(gnome_calendar_set_view): Likewise.
-	(gnome_calendar_update_all): Likewise.
-	(gnome_calendar_object_updated_cb): Likewise.
-	(gnome_calendar_object_removed_cb): Likewise.
-	(gnome_calendar_time_format_changed): Likewise.
-	(gnome_calendar_get_current_time_range): Likewise.
-
-	* gui/gnome-cal.h (GnomeCalendar): Removed the year view stuff.
-
-	* gui/Makefile.am (evolution_calendar_SOURCES): Added layout.[ch],
-	print.[ch].  Removed quick-view.[ch], year-view.[ch] since they
-	are no longer used.  Removed all the old Pilot crap.
-
-2000-05-20  Damon Chaplin  <damon@helixcode.com>
-
-	* cal-util/cal-recur.[hc]: new files to implement iCalendar recurrence
-	rules. These are only part finished, but people may like to check that
-	the architecture seems OK.
-
-2000-05-17  Damon Chaplin  <damon@helixcode.com>
-
-	* gui/e-day-view.c (e_day_view_on_delete_occurrence):
-	* gui/e-week-view.c (e_week_view_on_delete_occurrence): use a copy of
-	the iCalObject so we detect the change in the "update_event" callback.
-	Maybe we should just update the view ourselves and then we wouldn't
-	need to detect any change in the callback.
-
-	* cal-util/calobj.c (ical_object_reset_recurrence): new function to
-	get rid of any recurrence rules. Used when we 'unrecur' an event.
-
-	* gui/e-day-view.c (e_day_view_key_press): don't add a new event if it
-	won't fit, or we end up adding a new event for each key press.
-	(e_day_view_update_event_label): don't update it if it doesn't have
-	an EText item (i.e. it isn't visible).
-
-	* gui/e-day-view-time-item.c: allow selection of times using this
-	column.
-
-2000-05-19  Federico Mena Quintero  <federico@helixcode.com>
-
-	* cal-util/timeutil.c (time_add_minutes): Fixed warning message.
-	(time_add_day): Likewise.
-	(time_add_month): Likewise.
-	(time_add_year): Likewise.
-	(time_from_day): Of all functions, *this* one had to have a bug.
-	Set the tm.tm_isdst to -1 to specify that we don't know whether
-	the time is in DST or not.  This fixes *many* bugs upstream.
-	(time_week_begin): Likewise.  We never noticed this since the week
-	functions are never used.
-	(time_week_end): Likewise.
-
-2000-05-17  Seth Alves  <alves@hungry.com>
-
-	* gui/event-editor.c: hooked up more widget signals to callbacks
-	to the gladified dialog acts more like the original one.
-
-2000-05-16  Seth Alves  <alves@hungry.com>
-
-	* gui/event-editor.c (recurrence_toggled): hook the radio buttons
-	to the pages of the notebook.
-	(append_exception):
-	(recurrence_exception_added):
-	(recurrence_exception_deleted):
-	(recurrence_exception_changed): code to deal with the recurrence
-	exception list.
-
-2000-05-15  Seth Alves  <alves@hungry.com>
-
-	* gui/event-editor.[ch]: gladeified replacement for eventedit.c
-
-	* gui/event-editor-utils.[ch]: utilities used by event-editor.c
-
-	* gui/event-editor-dialog.glade: glade file used by event-editor.c
-
-2000-05-14  Federico Mena Quintero  <federico@helixcode.com>
-
-	* gui/gnome-cal.c (display_notification): Use the alarm
-	notification dialog.
-	(display_notification_cb): New callback for the result of the
-	alarm notification dialog.
-
-	* gui/dialogs/alarm-notify.glade: New file with the alarm
-	notification dialog.
-
-	* gui/dialogs/alarm-notify-dialog.[ch]: New file.
-
-	* gui/dialogs/Makefile.am: New file.
-
-	* gui/Makefile.am (SUBDIRS): Added the dialogs directory.
-
-2000-05-13  Federico Mena Quintero  <federico@helixcode.com>
-
-	* gui/gnome-cal.c (trigger_alarm_cb): Better error checking, and
-	plug leaks of str_ico and ico.
-
-	* gui/evolution-calendar-control.c (main): Initialize libglade.
-
-2000-05-13  Ettore Perazzoli  <ettore@helixcode.com>
-
-	* pcs/Makefile.am (INCLUDES): Add
-	`-I$(top_builddir)/libical/src/libical'.
-
-2000-05-12  Federico Mena Quintero  <federico@helixcode.com>
-
-	* cal-util/calobj.c (generate): Use a (dtend - dtstart) offset to
-	compute the ending time of the occurrence.  This takes care of
-	recurring events that span multiple days.  Also, removed the DST
-	condition since it did not look right at all:  if you have a daily
-	appointment at 18:00, it still should happen at 18:00 even during
-	daylight savings.
-
-	* gui/gnome-cal.c (gnome_calendar_tag_calendar): Use the timeutil
-	functions instead of calculating the month's times by hand.  Use
-	cal_obj_instance_list_free() instead of freeing the list by hand.
-	Clip the range we pass to mark_gtk_calendar_day().
-	(mark_gtk_calendar_day): Fixed off-by-one error at the end of the
-	month by adding real day offsets.
-
-2000-05-11  Federico Mena Quintero  <federico@helixcode.com>
-
-	* gui/gnome-cal.c (add_alarms_for_object): New function to add
-	today's alarms for a single object.
-	(gnome_calendar_object_updated_cb): Update the object's alarms.
-
-	* idl/evolution-calendar.idl (Cal): Added a
-	get_alarms_for_object() method.
-
-	* pcs/cal.c (Cal_get_alarms_for_object): Implemented method.
-
-	* pcs/cal-backend.c (cal_backend_get_alarms_for_object): New
-	function.
-
-	* pcs/cal-backend-imc.c (cal_backend_imc_get_alarms_for_object):
-	Implemented.
-
-	* cal-client/cal-client.c (cal_client_get_alarms_for_object): New
-	function.
-
-2000-05-11  Dan Winship  <danw@helixcode.com>
-
-	* gui/calendar-commands.c (calendar_control_activate): Now that we
-	depend on current gnome-libs we can make the toolbar detachable
-	again.
-
-	* pcs/icalendar-save.c (timet_to_icaltime): remove unused timezone
-	variable to make this compile on BSD systems (where timezone is
-	the name of a function)
-
-2000-05-11  Federico Mena Quintero  <federico@helixcode.com>
-
-	* gui/gnome-cal.c (gnome_calendar_update_all): Removed unused
-	arguments.  Load the initial alarms here.
-	(load_alarms): New function to load a day's worth of alarms.
-	(gnome_calendar_class_init): Eeeek!  This was taking in an
-	incorrect argument type.
-	(gnome_calendar_init): Now the calendar keeps a hash table of
-	UIDs->queued alarms.  Create the hash table here.
-	(gnome_calendar_destroy): Destroy the alarms hash table.
-	(gnome_calendar_object_updated_cb): Remove the alarms for the
-	object and regenerate them.
-	(gnome_calendar_object_removed_cb): Remove the alarms for the
-	object.
-
-	* gui/alarm.c (alarm_add): Do not take in a CalendarAlarm, just
-	the trigger time, the callback and the closure data.  Return an
-	opaque identifier for the alarm so that it can be removed by the
-	client code if needed.  Use the queue_alarm() helper function.
-	(queue_alarm): Helper function to actually queue the alarm and set
-	up the itimer.  Deal with a nonzero return value from
-	setitimer().
-	(alarm_remove): New function to remove an alarm based on its ID.
-	(pop_alarm): New helper function; pops the first alarm of the
-	queue and resets the timer as appropriate.
-	(alarm_ready): Simplified a lot by using pop_alarm().
-
-	* idl/evolution-calendar.idl (Cal): Added get_alarms_in_range().
-
-	* pcs/cal.c (build_instance_seq): New function to build a CORBA
-	sequence from the internal list of instances.
-	(Cal_get_events_in_range): Use build_instance_seq().
-	(Cal_get_alarms_in_range): Implemented new method.
-
-	* pcs/cal-backend.c (cal_backend_get_alarms_in_range): New
-	function with the get_alarms_in_range() engine.
-
-	* pcs/cal-backend-imc.c (cal_backend_imc_get_alarms_in_range):
-	Implemented the get_alarms_in_range() method.
-
-	* cal-client/cal-client.c (cal_client_get_alarms_in_range): New
-	client-side function for getting the alarms.
-	(build_instance_list): New helper function to build the
-	CalObjInstance list from the CORBA sequence.
-	(cal_client_get_events_in_range): Use build_instance_list().
-
-	* gui/calendar-commands.h: #include <cal-util/calobj.h>.  #include
-	"gnome-cal.h".
-
-	* gui/e-week-view.c: #include "calendar-commands.h" instead of
-	main.h; the latter is an obsolete file and will be killed.
-
-	* gui/evolution-calendar-control.c (main): Call init_bonobo()
-	before anything else.  We need the GTK+ object system initialized.
-
-	* gui/Makefile.am (evolution_calendar_SOURCES): Do not use main.h.
-
-	* cal-util/cal-util.c (cal_alarm_instance_list_free): New function.
-
-2000-05-10  Matt Loper  <matt@helixcode.com>
-
-	* gui/calendar-commands.c (calendar_control_activate): Move
-	"about" menuitem to the help menu.
-
-2000-05-10  Christopher James Lahey  <clahey@helixcode.com>
-
-	* gui/Makefile.am: Added main.h.  Combined the two EXTRA_DIST
-	sections.
-
-2000-05-09  Christopher James Lahey  <clahey@helixcode.com>
-
-	* pcs/cal-backend-imc.c: Set the format when creating a new
-	calendar.
-
-2000-05-09  Christopher James Lahey  <clahey@helixcode.com>
-
-	* pcs/cal-factory.c: Removed double free of method_string in
-	uri->method_string.
-
-2000-05-08  Ettore Perazzoli  <ettore@helixcode.com>
-
-	* pcs/cal.h: Include "calendar/pcs/evolution-calendar.h" instead
-	of "evolution-calendar.h".
-
-	* pcs/cal-backend.h: Include "calendar/pcs/evolution-calendar.h"
-	instead of "evolution-calendar.h".
-
-2000-05-08  Seth Alves  <alves@hungry.com>
-
-	* gui/e-day-view.c (e_day_view_on_delete_appointment): call
-	e_day_view_stop_editing_event here to avoid a divide by zero
-	a bit further on.  i'm not sure if this is the best fix for this.
-
-2000-05-08  Federico Mena Quintero  <federico@helixcode.com>
-
-	* pcs/cal-backend.h (CalBackendClass): CalBackendClass now is just
-	an interface for calendar backends; this is an abstract class.
-	Put in the vtable for the backend methods.
-
-	* pcs/cal-backend.c (cal_backend_new): Removed function, since
-	CalBackend is not just an abstract class.
-	Removed implementation-specific functions and made public
-	functions call the virtual methods instead.
-
-	* pcs/cal-backend-imc.[ch]: New files with the CalBackendIMC
-	implementation; this implements a backend for iCalendar and
-	vCalendar files.  Moved the implementation-specific stuff from
-	cal-backend.[ch] to here.
-
-	* pcs/cal-backend-imc.c (CalendarFormat): Moved enumeration to
-	here.  Added a CAL_UNKNOWN value for when the backend is not
-	loaded yet.
-	(cal_backend_imc_init): Initialize priv->format as CAL_UNKNOWN.
-	(save_to_vcal): Use the same VCProdIdProp value as in
-	cal-util/calobj.c.  Use "1.0" as the VCVersionProp as per the
-	vCalendar spec.
-	(ensure_uid): Return nothing, since the result value need not be
-	used anymore.
-	(add_object): Since we mark the calendar as dirty anyways, we do
-	not need to check the result value of ensure_uid() anymore.
-	(remove_object): Asssert that we know how to handle the object's
-	type.  We do this in add_object() anyways.
-
-	* pcs/Makefile.am (libpcs_a_SOURCES): Added cal-backend-imc.[ch].
-
-	* gui/gnome-cal.c: Replaced debugging printf()s with g_message()
-	so that we can see the line number where they occur.
-
-	* gui/gnome-cal.c (gnome_calendar_load_cb): Sort of handle the
-	LOAD_METHOD_NOT_SUPPORTED result code, and added a default for the
-	switch.
-
-	* cal-client/cal-listener.h (CalListenerLoadStatus): Removed
-	enumeration; it is stupid to translate all values for the
-	CalClient when it is going to translate them again.
-	(CalListenerClass::cal_loaded): This signal now passes the
-	LoadStatus directly from the CORBA side.
-
-	* cal-client/cal-listener.c (Listener_cal_loaded): Do not
-	translate the status value.
-
-	* cal-client/cal-client.h (CalClientLoadStatus): Added the
-	CAL_CLIENT_LOAD_METHOD_NOT_SUPPORTED error code.
-
-	* cal-client/cal-client.c (cal_loaded_cb): Translate the CORBA
-	version of the LoadStatus result code.
-
-	* pcs/cal-factory.c (CalFactoryPrivate): New methods field for the
-	hash table from method strings to the GtkTypes for backend class
-	types.
-	(cal_factory_init): Create the priv->methods hash table.
-	(cal_factory_destroy): Free the priv->methods hash table.
-	(cal_factory_register_method): New function to register a backend
-	class for a particular URI method.
-	(launch_backend_for_uri): New function to launch a backend for a
-	particular URI's method.
-	(load_backend): Use launch_backend_for_uri().  Move the error
-	notification code from load_fn() to here.
-	(create_backend): Use launch_backend_for_uri().  Move the error
-	notification code form create_fn() to here; it is #ifdefed out
-	since currently cal_backend_create() does not have any error
-	reporting capabilities.
-
-	* idl/evolution-calendar.idl (Listener::LoadStatus): Added a
-	PROTOCOL_NOT_SUPPORTED error code.
-
-	* pcs/cal-factory.c (cal_factory_load cal_factory_create): Removed
-	functions, since they were supposed to be internal only.
-	(CalFactory_load): Call queue_load_create_job() directly.
-	(CalFactory_create): Likewise.
-
-2000-05-08  Damon Chaplin  <damon@helixcode.com>
-
-	* gui/e-week-view.c (e_week_view_remove_event_cb):
-	* gui/e-day-view.c (e_day_view_remove_event_cb): don't set the ico->uid
-	to NULL or we won't find any other occurrences of the event. Set the
-	editing_event_day/num to -1 instead.
-
-	* gui/e-week-view-event-item.c (e_week_view_event_item_draw): fixed the
-	positioning of the icons for long events.
-
-	* cal-util/calobj.c (ical_object_normalize_summary): forgot to
-	terminate the string.
-
-2000-05-07  Damon Chaplin  <damon@helixcode.com>
-
-	* gui/e-day-view.c (e_day_view_on_main_canvas_drag_data_received):
-	(e_day_view_on_top_canvas_drag_data_received): show the EText item,
-	just in case it hasn't moved, otherwise it won't appear.
-
-	* gui/e-day-view.h (E_DAY_VIEW_BAR_WIDTH): increased from 6 to 8 to
-	make it easier to drag an event. Also increased E_DAY_VIEW_GAP_WIDTH
-	since it must be >= the BAR_WIDTH.
-
-2000-05-07  Matt Loper  <matt@helixcode.com>
-
-	* gui/evolution-calendar-control.c (PROPERTY_CALENDAR_URI):
-	Changed to "folder_uri" from "calendar_uri".
-	(set_prop): The uri given to us is a directory, so we append a
-	filename onto the end before we use it.
-
-2000-05-06  Damon Chaplin  <damon@helixcode.com>
-
-	* cal-util/timeutil.c (time_day_begin):
-	(time_day_end): changed these so they just do a simple localtime(),
-	update the struct tm, then do a mktime(). I don't know why it used to
-	look at the tm_isdst flags etc. From a little test program I wrote
-	which steps through testing every hour for a year it wasn't working
-	correctly, and the new code does.
-	(time_add_day): also got rid of the stuff that looked at tm_isdst here.
-	My test program now works better.
-
-2000-05-06  Chris Toshok  <toshok@helixcode.com>
-	* gui/.cvsignore: ignore evolution-calendar.pure
-
-	* gui/Makefile.am: add support for building evolution-calendar.pure
-
-2000-05-06  Damon Chaplin  <damon@helixcode.com>
-
-	* gui/e-day-view.c:
-	* gui/e-week-view.c: finish editing event when user hits Return key.
-	(e_week_view_on_text_item_event): stop event signals after doing any
-	other calls, since otherwise it will also stop any other resulting
-	event signals.
-
-	* gui/e-week-view-event-item.c (e_week_view_event_item_draw): don't
-	draw the start/end times while editing.
-
-	* gui/eventedit.c: changed the Summary field to a GtkEntry, since we
-	now only want a single line of text.
-
-	* cal-util/calobj.c (ical_object_normalize_summary): new function to
-	convert the summary field to a single line of text, by converting any
-	sequence of CR & LF characters to a single space.
-	(ical_object_create_from_vobject): call the above function. I think
-	all functions that load iCalObjects go through this.
-	(ical_new): called it here as well just in case.
-
-2000-05-06  Damon Chaplin  <damon@helixcode.com>
-
-	* gui/week-view.[hc]: removed.
-
-2000-05-06  Damon Chaplin  <damon@helixcode.com>
-
-	* gui/gncal-day-panel.[hc]:
-	* gui/gncal-day-view.[hc]:
-	* gui/gncal-full-day.[hc]:
-	* gui/gncal-week-view.[hc]:
-	* gui/layout.[hc]:
-	* gui/view-utils.[hc]: removed old calendar view files.
-
-2000-05-06  Damon Chaplin  <damon@helixcode.com>
-
-	* cal-util/calobj.[hc]: added guint ref_count to iCalObject struct,
-	and ical_object_ref/unref() functions. I've updated all the gui/
-	stuff to use ref_counts but I haven't touched the pcs/ stuff. Maybe
-	just using ical_object_destroy() is OK there.
-
-	* gui/gncal-todo.c:
-	* gui/calendar-commands.c:
-	* gui/eventedit.c:
-	* gui/e-week-view.c:
-	* gui/e-day-view.c: use refcounting for iCalObjects.
-
-	* gui/e-day-view-main-item.c:
-	* gui/e-day-view-top-item.c:
-	* gui/e-day-view.c: try not to ever draw outside the event, even when
-	the event is very small.
-
-2000-05-05  Damon Chaplin  <damon@helixcode.com>
-
-	* gui/e-day-view.c: don't allow recurring events to be resized or
-	dragged, and don't show the resize/drag cursors. Actually it may be
-	better to let the user do the resize/drag and then ask them what they
-	want to do - change the single occurrence or the entire series.
-
-	* gui/e-day-view-time-item.c (e_day_view_time_item_show_popup_menu):
-	use e_auto_kill_popup_menu_on_hide() to destroy the popup menu.
-
-	* gui/popup-menu.c: include e-gui-utils.h
-
-2000-05-04  Damon Chaplin  <damon@helixcode.com>
-
-	* gui/e-day-view.c (e_day_view_foreach_event_with_uid): for the long
-	events pass E_DAY_VIEW_LONG_EVENT as the day. Fixes SEGV.
-
-	* gui/calendar-commands.c: when we switch views, grab the focus.
-
-	* gui/gnome-cal.c (gnome_calendar_tag_calendar):
-	(gnome_calendar_mark_gtk_calendar_day): changed this so it uses
-	cal_client_get_events_in_range(), and doesn't load any objects.
-	Also just return if it isn't visible.
-
-	* gui/calendar-commands.c (calendar_get_events_in_range): call
-	g_list_sort() to sort the list rather than g_list_insert_sorted() for
-	each element. It is much more efficient.
-	Also changed it so that the co->ev_start/end fields are copied from
-	the CalObjInstance rather than the parameters to the function
-	(that is right, isn't it?)
-	Also freed the list elements, and finally the list.
-	(calendar_iterate): changed this to use cal_client_get_events_in_range
-	since that is more efficient than getting all the uids and then loading
-	and parsing all the events.
-
-	* pcs/cal-backend.c (save): output the '... saved' message before
-	freeing the string!
-
-	* gui/gncal-todo.c (gncal_todo_update):
-	* gui/e-week-view.c (e_week_view_update_event):
-	* gui/e-day-view.c (e_day_view_update_event):
-	* gui/calendar-commands.c (calendar_get_events_in_range):
-	(calendar_iterate): free obj_string after it is parsed.
-
-2000-05-02  Damon Chaplin  <damon@helixcode.com>
-
-	* gui/calendar-commands.c (calendar_control_activate): set the active
-	radio button here. Oops - it wasn't a Bonobo problem after all.
-
-	* gui/popup-menu.c (popup_menu): added call to
-	e_auto_kill_popup_menu_on_hide() to destroy the menu.
-
-	* gui/e-week-view.c (e_week_view_show_popup_menu):
-	* gui/e-day-view.c (e_day_view_on_event_right_click): ico->user_data
-	isn't useful any more, since the event editor keeps its own iCalObject.
-	So for now we make the menu commands available even when the event is
-	being edited in the event editor.
-	Also corrected misspellings of 'occurance' -> 'occurrence'.
-
-	* gui/eventedit.c (event_editor_destroy): destroy the iCalObject.
-	The event editor now uses its own independent iCalObject.
-
-	* gui/e-week-view.c (e_week_view_on_unrecur_appointment):
-	* gui/e-day-view.c (e_day_view_on_unrecur_appointment): create a new
-	uid for the new single instance. I'm not sure what we should do about
-	the creation/last modification times of the objects.
-
-	* gui/e-week-view.c (e_week_view_on_edit_appointment):
-	* gui/e-day-view.c (e_day_view_on_edit_appointment): duplicate the
-	iCalObject before passing it to the event editor, since it will change
-	the fields. If we don't duplicate it we won't know what has changed
-	when we get the "update_event" callback.
-
-	* gui/e-week-view.c (e_week_view_key_press):
-	* gui/e-day-view.c (e_day_view_key_press): set the created and last_mod
-	times of the new iCalObject. We may want to set the default alarm as
-	well.
-
-	* cal-util/calobj.c (ical_gen_uid): made this function public so we
-	can generate new uids if necessary.
-
-2000-05-01  Damon Chaplin  <damon@helixcode.com>
-
-	* gui/gnome-cal.[hc] (gnome_calendar_get_current_time_range): new
-	function to get the currently seleted time range form the current view.
-
-	* gui/calendar-commands.c (display_objedit): use the above function
-	to get the time for the new appointment.
-
-	* gui/e-week-view.c:
-	* gui/e-day-view.c: use a shallow copy of the ico when we update the
-	times (when resizing/dragging). Otherwise we won't detect that the
-	time has changed in the "update_event" callback.
-
-	Also added functions to get the currently selected time range.
-
-2000-04-30  Seth Alves  <alves@hungry.com>
-
-	* pcs/icalendar-save.c (icalcomponent_create_from_ical_object): set
-	attendee and contact address correctly.
-
-	* pcs/cal-backend.c (icalendar_calendar_load): init priv->object_hash
-	when loading.
-	(cal_get_type_from_filename): if file extension is .ical, consider
-	the file an ical file.
-
-2000-05-01  Damon Chaplin  <damon@helixcode.com>
-
-	* cal-util/calobj.c (ical_object_compare_dates): new function to see
-	if the event dates have changed (including any recurrence rules).
-	It is used for optimization when we get the "object_changed" signal.
-	We have to do far less work if the dates are unchanged.
-
-	* gui/e-week-view.c:
-	* gui/e-day-view.c: only draw the selection when we have the keyboard
-	focus, since the user expects to be able to type in a new event when
-	the selection is shown. Also keep the selection when we lose focus,
-	but just don't show it.
-
-	Also quite a few changes to cope with the new client/server
-	architecture.
-
-	* gui/e-day-view-top-item.c (e_day_view_top_item_draw):
-	* gui/e-day-view-main-item.c (e_day_view_main_item_draw):
-	* gui/e-week-view-main-item.c (e_week_view_main_item_draw_day):
-	only draw the selection if the widget has the keyboard focus.
-
-	* gui/gnome-cal.c (mark_gtk_calendar_day): fixed so it works with
-	events longer than one day. And changed the code for updating events
-	in the new views.
-
-2000-04-27  Ettore Perazzoli  <ettore@helixcode.com>
-
-	* gui/evolution-calendar-control.c
-	(init_bonobo): OAFized.
-
-	* gui/main.c (main): Initialize with OAF if `USING_OAF'.
-
-	* gui/evolution-calendar-control.c: New #define
-	`CONTROL_FACTORY_ID', varying according to whether we are
-	`USING_OAF'.
-	(calendar_factory_init): Use `CONTROL_FACTORY_ID'.
-
-	* gui/Makefile.am: Updated for OAF.
-
-	* pcs/cal-factory.h: Explicitly #include
-	"calendar/pcs/evolution-calendar.h" instead of just
-	"evolution-calendar.h".
-
-	* cal-client/cal-client.c (cal_client_construct) [USING_OAF]: Use
-	OAF.
-
-	* cal-client/client-test.c (init_corba): New function, implemented
-	differently depending on `USING_OAF'.
-
-2000-04-27    <alves@hungry.com>
-
-	* pcs/cal-backend.c (cal_backend_load): fix memory leak
-	(save_to_vcal): same
-	(save): same
-	(cal_backend_load): same
-
-2000-04-26  Christopher James Lahey  <clahey@helixcode.com>
-
-	* cal-util/.cvsignore: Replaced libcal-util.la with *.la
-
-	* pcs/.cvsignore: Added *.la and *.lo.
-
-2000-04-25  Federico Mena Quintero  <federico@helixcode.com>
-
-	* pcs/cal-factory.c (backend_last_client_gone_cb): Renamed from
-	backend_destroy_cb.  Now we use it for the "last_client_gone"
-	signal from the backend.  Also, unref the backend to destroy it.
-	(add_backend): Connect to the "last_client_gone" signal of the
-	backend.
-	(cal_factory_get_n_backends): New function to query the number of
-	running backends.
-
-	* pcs/cal-backend.c (cal_backend_class_init): Register the new
-	"last_client_gone" signal.  It is emitted when the last Cal client
-	goes away.  It is used to notify the factory when a backend may be
-	safely destroyed.
-	(cal_destroy_cb): Emit the "last_client_gone" signal when the last
-	client disconnects from the backend.
-
-2000-04-25  Seth Alves  <alves@hungry.com>
-
-	* gui/e-day-view.c (e_day_view_find_event_from_ico): compare
-	iCalObjects by their UIDs instead of by their pointers.
-
-	* pcs/cal-backend.c (cal_backend_destroy): don't save on destroy.
-
-2000-04-25  Ettore Perazzoli  <ettore@helixcode.com>
-
-	* cal-client/Makefile.am: Add `$(datadir)/idl'.
-
-	* pcs/Makefile.am (idl_flags): Add `$(datadir)/idl'.
-	(INCLUDES): Use `$(BONOBO_GNOME_CFLAGS)'.
-
-2000-04-25  Seth Alves  <alves@hungry.com>
-
-	* gui/gnome-cal.c (gnome_calendar_destroy): hook for widget
-	destroy -- used to unref the CalClient so wombat knows we are gone.
-	(gnome_calendar_class_init): added a class init for this widget.
-
-	* gui/e-day-view.c (e_day_view_update_event): allow for null ico
-
-	* gui/e-week-view.c (e_week_view_update_event): allow for null ico
-
-2000-04-24  Federico Mena Quintero  <federico@helixcode.com>
-
-	* cal-client/client-test.c (main): The path to the test calendar
-	changed when we moved stuff around.  Users will have to tweak this
-	for their CVS setup, anyways.
-	(create_client): Create or load the calendar as appropriate.
-	(client_destroy_cb): Exit the main loop if both clients are gone.
-	(main): Connect to the "destroy" signal of the clients so that we
-	can terminate the test program.
-
-2000-04-24  Seth Alves  <alves@hungry.com>
-
-	* pcs/icalendar.c (parse_person): allow for null CN
-	(parse_person): allow for null sent_by
-
-	* pcs/Makefile.am: build icalendar-test
-
-	* pcs/icalendar-test.c: a test which loads an ical file and
-	converts it to our internal format, and then saves it back out.
-
-2000-04-24  Damon Chaplin  <damon@helixcode.com>
-
-	* gui/Makefile.am: added new source files and pixmaps, and removed
-	old source files, which can be deleted.
-
-	* gui/e-week-view-titles-item.[hc]:
-	* gui/e-week-view-main-item.[hc]:
-	* gui/e-week-view-event-item.[hc]:
-	* gui/e-week-view.[hc]: new files implementing the week/month views.
-
-	* gui/yearview.xpm:
-	* gui/monthview.xpm:
-	* gui/weekview.xpm:
-	* gui/workweekview.xpm:
-	* gui/dayview.xpm: new pixmaps for the toolbar buttons. These aren't
-	intended to be the final pixmaps.
-
-	* gui/calendar-commands.c: added radio buttons to the toolbar to
-	switch between the calendar views, and moved the am_pm_flag here so we
-	can get rid of view-utils.c.
-
-	* gui/gnome-cal.[hc]: made it a subclass of GtkVBox, rearranged the
-	widgets into 2 notebooks, and added the	selection_start_time and
-	selection_end_time fields.
-
-	* gui/goto.c: updated to use new selection time range.
-
-	* gui/quick-view.c: added '#include <gtk/gtkwindow.h>' so it compiles.
-
-	* gui/e-day-view.[hc]: changed the interface to support the new
-	selection time range, got rid of a few debugging messages and changed
-	a few bits.
-
-2000-04-21  Seth Alves  <alves@hungry.com>
-
-	* pcs/icalendar-save.c: start on code to do the opposite of
-	icalendar.c (convert from iCalObjects to libical's icalcomponents).
-
-	* gui/calendar-commands.c (calendar_control_activate): moved
-	"About Calendar" into the View menu so it shows up.
-
-2000-04-20  Seth Alves  <alves@hungry.com>
-
-	* gui/gnome-cal.c (gnome_calendar_changed_cb): new function: callback
-	for listener's object updated signal.
-	(gnome_calendar_object_removed_cb): new function: callback for
-	listener's object removed signal.
-	(gnome_calendar_new): hook up listener's "obj_updated" and
-	"obj_removed" signals so if evolution is running twice,
-	they will both see changes right away.
-	(gnome_calendar_object_changed): don't call update_all, since
-	it will be called by the listener.
-	(gnome_calendar_remove_object): don't call update_all
-	(gnome_calendar_add_object): don't call update_all
-
-	* gui/gncal-full-day.c (child_realize): create fullday's gcs
-	even if pixmap_bell has already been created.  this was
-	causing crashes if the calendar was run twice.
-
-2000-04-19  Seth Alves  <alves@hungry.com>
-
-	* gui/eventedit.c (ee_rp_init_rule): changed the order around
-	a bit to avoid a Gtk-CRITICAL crash
-
-	* gui/gncal-todo.c (gncal_todo_update): fixed code to populate
-	the todo clist
-
-	* cal-client/cal-client.c (cal_client_get_uids): don't check
-	type against CALOBJ_TYPE_ANY since it will always match.
-	(cal_client_get_uids): same (re: CALOBJ_TYPE_ANY)
-
-	* pcs/cal-backend.c (build_uids_list): same (re: CALOBJ_TYPE_ANY)
-
-	* pcs/cal.c (Cal_get_uids): same (re: CALOBJ_TYPE_ANY)
-
-	* pcs/cal-backend.c (remove_object): don't call save from here
-	because in all cases the caller of remove_object calls save
-
-	* gui/calendar-commands.c (calendar_set_uri): calls gnome_calendar_open
-	instead of checking on disk and calling load or create.
-
-	* gui/gnome-cal.c (gnome_calendar_object_changed): fixed to use
-	cal_client_update_object -- editing and dragging events works again
-	(gnome_calendar_open): collapsed gnome_calendar_load and
-	gnome_calendar_create into this function.  added new type
-	GnomeCalendarOpenMode which has the value CALENDAR_OPEN or
-	CALENDAR_OPEN_OR_CREATE.
-
-	* gui/evolution-calendar-control.c (calendar_properties_init): create
-	a property bag for this control
-	(set_prop): callback for property sets
-	(get_prop): callback for proprety gets
-
-	* gui/calendar-commands.c (calendar_set_uri): new function,
-	called when the "calendar_uri" property is set on the calendar-
-	control's property bag.
-
-2000-04-18  Federico Mena Quintero  <federico@helixcode.com>
-
-	* cal-util/Makefile.am (INCLUDES): Fix include path.
-
-2000-04-16  Federico Mena Quintero  <federico@helixcode.com>
-
-	* pcs/cal-factory.h (CalFactoryClass): We have a new
-	"last_calendar_gone" signal that Wombat can use to terminate
-	itself properly.
-
-	* pcs/cal-factory.c (cal_factory_class_init): Register the
-	"last_calendar_gone" signal.
-	(backend_destroy_cb): Emit the "last_calendar_gone" signal instead
-	of killing the factory.
-
-	* pcs/Makefile.am: Added $(CORBA_GENERATED) to BUILT_SOURCES.
-	(INCLUDES): Make the log domain be "wombat-pcs".
-
-2000-04-17  Seth Alves  <alves@hungry.com>
-
-	* pcs/cal-backend.c (add_object): removed implicit save, since
-	we don't want to save as we load from disk.
-	(cal_backend_update_object): added a call to save, since it
-	isn't done by add_object now.
-
-2000-04-16  Federico Mena Quintero  <federico@helixcode.com>
-
-	* cal-util/Makefile.am: Renamed library from libcalutil to
-	libcal-util, to be consistent with libcal-client.  Install header
-	files in $(includedir)/evolution/cal-util.
-	(INCLUDES): Add "cal-util" log domain for glib.
-	(libcal_clientincludedir): The header files are now installed in
-	$(includedir)/evolution/cal-client.
-
-	* cal-util/cal-util.h: Fix includes.
-
-	* cal-client/client-test.c: Fix includes.
-
-	* pcs/Makefile.am: Create libpcs.a, not a shared library, because
-	it is for internal use by Wombat only.  The header files should
-	not be installed, either.  Removed all the old Tlacuache stuff.
-
-	* gui/Makefile.am (EXTRA_DIST): We no longer distribute
-	gncal.desktop.
-	(evolution_calendar_INCLUDES): Add "calendar-gui" for the glib log
-	domain.
-
-	* gui/*.[ch]: Fix cal-util and cal-client includes.
-
-	* pcs/Makefile.am (INCLUDES): Added "pcs" log domain for glib.
-
-	* pcs/*.[ch]: Fix cal-util includes.
-
-2000-04-11  Chris Toshok  <toshok@helixcode.com>
-
-	* pcs/icalendar.c (icaltime_to_timet): use HAVE_TIMEZONE to switch
-	between linux's timezone variable and *bsd's method of getting the
-	gmt offset.
-
-2000-04-10  Seth Alves  <alves@hungry.com>
-
-	* pcs/cal-backend.c (save_to_vcal): create and save an actual
-	vcalendar instead of a list of vcal objects.
-
-2000-04-10  Damon Chaplin  <damon@helixcode.com>
-
-	* gui/Makefile.am (INCLUDES): moved srcdir directories to the top so
-	we search headers in the evolution tree before installed headers.
-	(Otherwise when you do 'make install' lots of files in gui/ get
-	rebuilt, since they depend on the installed cal-client.h which has just
-	been updated.)
-
-2000-04-09  Seth Alves  <alves@hungry.com>
-
-	* gui/gnome-cal.c (gnome_calendar_load): catch cal_loaded signal
-	on the cal client.
-	(gnome_calendar_load_cb): callback for cal_loaded signal.  moved
-	gnome_calendar_update_all from gnome_calendar_load to here.
-
-	* gui/calendar-commands.c: minor cleanups
-
-	* pcs/cal-backend.c (save_to_vcal): copied code from gnome-pim
-	to write vcal to a file
-	(save): filled it with more gnome-pim code
-	(add_object): call save () after changing
-	(remove_object): same
-	(cal_backend_create): same
-	(cal_backend_remove_object): same
-
-2000-04-08  Christopher James Lahey  <clahey@helixcode.com>
-
-	* gui/Makefile.am: Removed linking with libetable and libeminicard
-	since they weren't being used.
-
-2000-04-08  Seth Alves  <alves@hungry.com>
-
-	* gui/gnome-cal.c (gnome_calendar_create): new function:
-	friendly wrapper for cal_client_create_calendar
-
-	* gui/calendar-commands.c (new_calendar): call gnome_calendar_create
-	if no filename is provided
-
-	* gui/prop.c (properties): calendar is a frame
-
-	* gui/calendar-commands.c (calendar_control_activate): sort out the
-	menus a bit, more of them show up now.
-
-	* gui/Makefile.am: don't build library or test, just the bonobo control
-
-	* gui/gncal-todo.c (simple_todo_editor): calendar is a frame instead
-	of a window, now.
-
-	* gui/gnome-cal.c (gnome_calendar_new): same
-
-	* gui/goto.c (goto_dialog): same
-
-2000-04-06  Seth Alves  <alves@hungry.com>
-
-	* gui/calendar-commands.c (calendar_control_activate): removed
-	uih from the argument list, added cal.  use cal as user_data
-	in callbacks rather than the control.
-	(calendar_control_deactivate): removed uih from argument list
-
-2000-04-05  Seth Alves  <alves@hungry.com>
-
-	* gui/calendar-commands.c (setup_menu): removed
-	(setup_appbar): removed
-	(calendar_control_activate): new function -- does the work
-	that setup_appbar and setup_menu used to do.
-	(calendar_control_deactivate): undoes what calendar_control_activate
-	does by removing the toolbar items and menu items.
-
-	* gui/Makefile.am: build test-calendar-widget and evolution-calendar,
-	common stuff is in a library
-
-	* gui/gnome-cal.c (gnome_calendar_get_type): made the calendar widget
-	based on a gtk_frame rather than a gnome_app
-
-	* gui/calendar-commands.c: split out some of main.c
-
-	* gui/evolution-calendar-control.c: bonobo bung so evolution
-	can use the calendar widget
-
-2000-04-01  Matt Loper  <matt@helixcode.com>
-
-	* pcs/.cvsignore: Added *.lo.
-
-2000-03-30  Seth Alves  <alves@hungry.com>
-
-        * gui/main.c (calendar_get_events_in_range):
-        cal_client_get_events_in_range returns a list of CalObjInstance *, not
-        a list of (char *) uid.
-
-	* Makefile.am (SUBDIRS): readded the gui directory
-
-	* gui/main.c: temporarily added alarm_defaults back in,
-	since the calendar doesn't link without it
-
-2000-03-29  Matt Loper  <matt@helixcode.com>
-
-	* Makefile.am: remove the gui directory, which doesn't compile.
-
-2000-03-28  Matt Loper  <matt@helixcode.com>
-
-	* pcs/Makefile.am: create a libpcs.la library, for use in the
-	wombat.
-
-2000-03-28  Seth Alves  <alves@hungry.com>
-
-	* gui/Makefile.am (LINK_FLAGS): added libeutil.la and libetext.a
-
-	* gui/main.c (calendar_iterate): switch from string_to_ical_object to
-	ical_object_find_in_string
-	(calendar_get_events_in_range): same
-	(session_save_state): commented out references
-	to gcal->client->filename
-
-2000-03-27  Federico Mena Quintero  <federico@helixcode.com>
-
-	* pcs/cal-backend.c (cal_backend_get_object): Use
-	ical_object_to_string().
-
-	* cal-util/calobj.c (ical_object_to_string): Moved over from
-	pcs/cal-backend.c (was string_from_ical_object).
-	(get_calendar_base_vobject): Likewise, moved over from
-	pcs/cal-backend.c.
-
-	* cal-util/cal-util.c: Removed string_to_ical_object(); the
-	correct function is in calobj.[ch], called
-	ical_object_find_in_string().  Removed ical_object_to_string,
-	since we now implement it in calobj.c.
-
-	* cal-util/calobj.c: Removed ical_object_new_from_string(); see
-	above.
-
-	* idl/evolution-calendar.idl (CalObjInstance): Calendar object
-	instances now contain only the UID for the object, not the whole
-	string representation of the object.  This allows clients to
-	implement caching of objects if they wish.
-
-	* pcs/cal.c (Cal_get_events_in_range): Likewise.
-
-	* pcs/cal-backend.c (build_event_list): Likewise.
-
-	* cal-client/cal-client.c (cal_client_get_events_in_range):
-	Likewise.
-
-	* cal-util/cal-util.h (CalObjInstance): Likewise.
-
-	* cal-util/cal-util.c (cal_obj_instance_list_free): Likewise.
-	(cal_obj_uid_list_free): Assert that the UIDs in the list are not
-	NULL.
-
-	* pcs/tlacuache.gnorba (repo_id): The calendar factory also
-	supports the Unknown interface.
-
-2000-03-17  Federico Mena Quintero  <federico@helixcode.com>
-
-	* gui/e-day-view.c: Fix includes.
-	(e_day_view_on_delete_occurance): Do not call save_default_calendar().
-	(e_day_view_on_delete_appointment): Likewise.
-	(e_day_view_on_unrecur_appointment): Likewise.
-	(e_day_view_finish_long_event_resize): Likewise.
-	(e_day_view_finish_resize): Likewise.
-	(e_day_view_key_press): Likewise.
-	(e_day_view_on_editing_stopped): Likewise.
-	(e_day_view_on_top_canvas_drag_data_received): Likewise.
-	(e_day_view_on_main_canvas_drag_data_received): Likewise.
-
-2000-03-13  Damon Chaplin  <damon@helixcode.com>
-
-	* gui/e-day-view*.[hc]: new files for the Day/Work-Week views.
-
-2000-03-12  Federico Mena Quintero  <federico@helixcode.com>
-
-	* gui/main.c (gnome_calendar_locate): Removed function now that it
-	is no CORBA server in the GUI.
-	(save_default_calendar): Removed function.  Now the personal
-	calendar server will take care of saving modified calendars when
-	appropriate.
-	(close_cmd): Do not call unregister_calendar_services().
-
-	* gui/eventedit.c (ee_ok): Do not save the calendar.
-
-	* gui/gncal-day-panel.c (day_view_range_activated): Likewise.
-
-	* gui/gncal-todo.c (ok_button): Likewise.
-	(delete_todo): Likewise.
-
-	* gui/gncal-full-day.c (delete_occurance): Likewise.
-	(delete_appointment): Likewise.
-	(unrecur_appointment): Likewise.
-	(child_focus_out): Likewise.
-	(update_from_drag_info): Likewise.
-
-	* gui/gnome-cal.c (gnome_calendar_new): Removed obsolete call to
-	create the CORBA server.
-
-	* gui/gnome-cal.h (GnomeCalendar): Renamed `calc' field to
-	`client'.
-
-	* cal-client/cal-client.h (CalClient): Removed filename and
-	corba_server fields.
-
-2000-03-10  Federico Mena Quintero  <federico@helixcode.com>
-
-	* gui/main.c (main): Do not pass the INIT_SERVER flag to
-	gnome_CORBA_init_with_popt_table().  Check for exceptions
-	properly.
-	(main): Initialize Bonobo.
-	(main): Call process_dates() to parse the dates from the command
-	line before we dump the events or the TODOs.
-	(main): Use bonobo_main() instead of gtk_main().
-
-	* cal-util/calobj.c (ical_new): Initialize the alarm types here.
-	Do not call default_alarm() anymore, since that is a GUI issue.
-	(default_alarm): Removed function.
-	(alarm_defaults): Removed defaults data.
-
-	* pcs/tlacuache.c (calendar_notify): Removed stubs for
-	alarm_defaults, calendar_notify(), debug_alarms.
-
-2000-03-09  Federico Mena Quintero  <federico@helixcode.com>
-
-	* gui/Makefile.am: Removed the corba-cal stuff.  Commented out the
-	Pilot conduit stuff for now.
-
-	* gui/calendar.c: Random #ifdefs to make it build, although this
-	file is going away.
-
-	* gui/Makefile.am: Removed referenes to calobj.[ch] and timeutil.[ch].
-
-	* gui/calendar-conduit.c: Fixup includes.
-
-	* gui/calendar-conduit.h: Fixup includes.
-
-2000-03-09  Seth Alves  <alves@hungry.com>
-
-	* gui/gnome-cal.h: replaced "Calendar *cal" with "CalClient *calc"
-	in the GnomeCalendar struct.
-
-	* gui/*.c: tracked change from Calendar * to CalClient
-
-	* gui/main.c: moved alarm_defaults from here to cal-util/calobj.c
-	(calendar_get_events_in_range): pulled this out of calendar.c and
-	fixed it up to use cal-client stuff.  i'm not sure where to put it yet.
-
-	* gui/main.c (calendar_iterate): pulled this one out of calendar.c also
-
-2000-03-07  Federico Mena Quintero  <federico@helixcode.com>
-
-	* cal-client/Makefile.am: Removed cal-client-alarm.[ch] from the
-	list of sources.  This was a miscommunication on our part.
-
-2000-03-05  Seth Alves  <alves@hungry.com>
-
-	* cal-client/cal-client-alarm.c: stubs for client side
-	access to alarm structures.  this will probably change,
-	since i don't know what i'm doing.
-
-	* cal-util/alarm-enums.h: enums for alarms needed by
-	both the client and the server
-
-	* remaining source files in calendar/... have been moved
-	to calendar/gui.
-
-	* gui/alarm.c: start to decouple the view from the model
-	in the alarm editing code
-
-2000-03-03  Seth Alves  <alves@hungry.com>
-
-	* cal-util/Makefile.am: new file -- things shared between
-	the client and server go in this directory
-
-	*  calobj.c calobj.h icalendar.c icalendar.h
-	timeutil.c timeutil.h cal-util.c cal-util.h where moved
-	backend stuff went into pcs.  shared stuff went into
-	cal-util.
-
-2000-03-02  Federico Mena Quintero  <federico@helixcode.com>
-
-	At this point the calendar client and personal calendar server
-	files were moved to the idl/, cal-client/, and pcs/ directories.
-
-	* idl/Makefile.am: New file.
-
-	* cal-client/Makefile.am: New file.  Moved the libcal-client stuff
-	from calendar/Makefile.am to here.
-
-	* pcs/Makefile.am: New file.  Moved the tlacuache stuff from
-	calendar/Makefile.am to here.
-
-	* Makefile.am (SUBDIRS): Added the idl and cal-client directories.
-
-	* calendar.h: Removed the references to cal-backend.h and its
-	stuff.  This file is going away soon!
-
-	* icalendar.c: #include <config.h>.  Also, we don't need to
-	include cal-backend.h or gnome.h.
-
-	* icalendar.h: Protect from multiple inclusions.
-
-2000-03-01  Federico Mena Quintero  <federico@helixcode.com>
-
-	* Makefile.am: Use the gnome-config flags for orbit-idl.
-	Create a libcal-client library with the calendar client object.
-
-2000-02-29  Federico Mena Quintero  <federico@helixcode.com>
-
-	* Makefile.am: Removed stale rule for the conduit.
-
-2000-02-21  Matt Loper  <matt@helixcode.com>
-
-	* .cvsignore: Added *.lo.
-
-2000-02-19  Matt Loper  <matt@helixcode.com>
-
-	* .cvsignore: Added tlacuache and tl-test.
-
-2000-02-18  Miguel de Icaza  <miguel@nuclecu.unam.mx>
-
-	* Makefile.am (INCLUDES): Use BONOBO_VFS_GNOME_CFLAGS instead of
-	GNOMEUI_INCLUDES, as we use Bonobo and VFS.
-
-2000-02-17  Seth Alves  <alves@hungry.com>
-
-	* cal-backend.h: moved CalendarFormat type def here
-
-	* cal-backend.c (cal_backend_load): if extension suggests
-	an ical file, attempt to load an iCal file.
-	(cal_get_type_from_filename): returns CAL_ICAL if file
-	extension is 'ics' or 'ifb', else returns CAL_VCAL
-	(icalendar_calendar_load): moved this here from
-	icalendar.c because it needs to call the static function
-	add_object.
-
-2000-02-17  Federico Mena Quintero  <federico@helixcode.com>
-
-	* cal-client.c (cal_client_remove_object): Implemented.
-
-	* cal.c (cal_notify_remove): Implemented.
-	(Cal_remove_object): Implemented.
-	(cal_get_epv): Fill in the remove_object field in the epv.
-
-	* cal-backend.c (cal_backend_remove_object): Implemented.
-	(notify_remove): New function to notify clients that an object was
-	removed.
-
-2000-02-16  Russell Steinthal  <rms39@columbia.edu>
-
-	* calobj.[ch], eventedit.c, main.c: Change iCalObject.organizer
-	from char* to iCalPerson*
-
-	* calobj.[ch]: Change iCalObject.related from list of char* to
-	list of iCalRelation*; assorted related fixes
-
-	* icalendar.c: interface between libical and the gnomecal
-	internal representation
-
-2000-02-11  Federico Mena Quintero  <federico@helixcode.com>
-
-	* cal-client.c (cal_client_update_object): Implemented.
-
-	* cal.c (cal_notify_update): New function to notify the listener
-	about an updated object.
-	(Cal_update_object): Implemented.
-	(Cal_get_uids): set_release() the sequence to TRUE.
-	(Cal_get_events_in_range): Likewise.
-
-	* cal-backend.c (remove_object): New function to remove objects
-	from a calendar backend.
-	(cal_backend_update_object): New public function to update an
-	object and notify clients about it.
-
-	* evolution-calendar.idl (Cal): Added update_object() and
-	delete_object() methods.
-	(Listener): Removed the obj_changed method and renamed obj_added
-	to obj_updated.  We now only have updated and removed notifiers.
-
-	* cal-listener.[ch]: Removed the "changed" notification code.
-	Changed the "added" notification code to the "updated"
-	notification.
-
-	* cal-client.c: Likewise.
-
-	* tlacuache.c (create_cal_factory): Connect to "destroy" on the
-	factory and exit the main loop when the factory is destroyed.
-
-	* cal-factory.c (backend_destroy_cb): New callback used when a
-	backend is destroyed.  Removes the backend from the factory's hash
-	table and unrefs the factory if all backends go away.
-	(add_calendar_client): Free the environment.
-
-	* cal.c (cal_new): Use bonobo_object_unref() if we fail to
-	initialize.
-
-	* cal-listener.c (cal_listener_new): Likewise.
-
-	* layout.c (layout_events): Plug li.partition memory leak.
-
-2000-02-10  Federico Mena Quintero  <federico@helixcode.com>
-
-	* cal-backend.c (cal_backend_add_cal): Connect to the Cal's
-	destroy signal.
-	(cal_backend_remove_cal): Killed function now that removal of Cal
-	objects is done in their destroy callback.
-	(cal_destroy_cb): New callback to remove a Cal from the backend's
-	list of clients.  Also, the backend destroys itself when there are
-	no more clients connected to it.
-	(save): New placeholder function to save a backend.
-	(destroy): New function to destroy a backend's data.
-	(cal_backend_destroy): Save the calendar and destroy it.
-
-	* cal.c (cal_destroy): Reset the priv->backend to NULL.
-
-	* cal-factory.c (add_calendar_client): There is no need to call
-	cal_backend_remove_cal(); we can now just destroy the Cal object.
-	(create_fn): Make sure we always unref the URI.
-	(load_fn): Move the URI unref to the end of the function for
-	safety.
-
-	* cal-factory.c (add_calendar_client): Unref the Cal only if
-	notification of the listener was unsuccessful.  Otherwise, the
-	calendar user agent (Listener side) keeps the reference.
-
-	* tl-test.c (list_uids): Free the calobj.
-
-	* cal-client.c (cal_loaded_cb): Use bonobo_object_unref() to get
-	rid of the listener.
-	(load_or_create): Likewise.
-	(destroy_factory): New function to get rid of the factory.
-	(destroy_listener): New function to get rid of the listener.
-	(destroy_cal): New function to get rid of the calendar client
-	interface object.
-	(cal_client_destroy): Free all resources.
-	(cal_client_get_object): CORBA_free() the calobj string.  Boy, I
-	love memprof.
-
-	* cal-listener.c (cal_listener_destroy): Reset the priv->cal to
-	CORBA_OBJECT_NIL.
-
-	* cal-backend.c (cal_backend_remove_cal): Do not unref the Cal,
-	since the calendar user agent owns it.
-	(cal_backend_add_cal): Do not ref the Cal, since the calendar user
-	agent owns it.
-
-	* cal-factory.c (add_calendar_client): Use bonobo_object_unref()
-	to get rid of the calendar client interface object.
-
-	* calobj.c (ical_object_create_from_vobject): Duplicate the
-	default "PUBLIC" string.
-
-2000-02-09  Federico Mena Quintero  <federico@helixcode.com>
-
-	* cal-factory.c (cal_factory_load): Added documentation comment.
-	(load_fn): Do not print a message if the backend could not be
-	loaded due to a non-fatal error.
-	(queue_load_create_job): Moved the stuff from cal_factory_load()
-	to here.  Now this function serves to queue load or create
-	requests.
-	(cal_factory_load): Use queue_load_create_job().
-	(cal_factory_create): Implemented; use queue_load_create_job().
-	(create_fn): New job handler for creating new calendars.
-	(create_backend): New function to create a new backend with a new
-	calendar.
-	(add_backend): New helper function to add backends to the
-	factory's hash table.
-	(load_backend): Use add_backend() instead of adding the backend by
-	ourselves.
-
-	* cal-client.c (load_or_create): Moved the functionality from
-	cal_client_load_calendar() to here, and added an option to create
-	a new calendar instead of loading an existing one.
-	(cal_client_load_calendar): Use load_or_create().
-	(cal_client_create_calendar): Implemented.
-
-	* cal-backend.c (cal_backend_create): Implemented.
-
-	* evolution-calendar.idl (LoadStatus): Added an IN_USE error for
-	create requests.
-
-	* cal-listener.h (CalListenerLoadStatus): Added CAL_LISTENER_LOAD_IN_USE.
-
-	* cal-listener.c (Listener_cal_loaded): Convert the IN_USE error.
-
-	* cal-client.h (CalClientLoadStatus): Added CAL_CLIENT_LOAD_IN_USE.
-
-	* cal-client.c (cal_loaded_cb): Handle CAL_LISTENER_LOAD_IN_USE.
-
-	* tl-test.c: New test program for the calendar client side; it
-	also exercises the server side by sending commands to it.
-
-	* Makefile.am: Added the tl-test program.
-
-	* tlacuache.gnorba: Updated.
-
-	* tlacuache.c (create_cal_factory): Use the right GOAD id.
-
-	* cal-client.c (cal_client_construct): Use the right GOAD id.
-
-2000-02-08  Federico Mena Quintero  <federico@helixcode.com>
-
-	* evolution-calendar.idl (Cal): Added get_uids() method to get a
-	list of UIDs based on object types.
-
-	* cal-backend.c (cal_backend_get_uids): Implemented get_uids() in
-	the backend.
-
-	* cal.c (Cal_get_uids): Implemented get_uids() method.
-
-	* cal-client.c (cal_client_get_uids): Implemented client-side
-	function.
-
-	* cal-util.c (cal_obj_instance_list_free): Doh.  Free the list,
-	not the last link.
-	(cal_obj_uid_list_free): New function to free a list of UIDs.
-
-	* GnomeCal.idl (Repository): Removed unused method
-	get_object_by_id_list().  This is just for cleanup purposes and to
-	remind me exactly of what needs to be moved over to
-	evolution-calendar.idl.
-	(Repository): Removed unused get_objects() method.
-
-	* corba-cal.c (init_calendar_repo_class): Removed the unused
-	get_objects method.
-
-	* calobj.h (CalObjFindStatus): New status value enumeration for
-	the find function.
-
-	* calobj.c (ical_object_find_in_string): New function to parse a
-	complete calendar and find a calendar object in it.  This should
-	be used instead ical_object_new_from_string() in the future.
-
-	* evolution-calendar.idl (CalObjInstance): Added an uid field.
-	Now the idea is that whenever calendar object strings are passed
-	around, their UIDs are passed along with them so that the actual
-	object can be pulled from the whole VCAL object using its UID to
-	identify it.
-
-	* cal-util.h (CalObjInstance): Added uid field.
-
-	* cal-util.c (cal_obj_instance_list_free): Free the UIDs.
-
-	* cal-backend.c (build_event_list): Store the object's UID in the
-	instance structure.
-
-	* cal.c (Cal_get_events_in_range): Copy the UID field to the CORBA
-	structure.
-
-	* cal-client.c (cal_client_get_events_in_range): Copy the UID
-	field from the CORBA structure.
-
-	* main.c (gnome_cal_file_menu): Removed unfinished html-month stuff.
-
-	* Makefile.am (gnomecal_SOURCES): Removed html-month.c.
-
-	* gnome-cal.c: #include "alarm.h"
-	(mail_notify): Made static.
-
-	* alarm.h: #include "calobj.h"
-
-	* corba-cal-factory.h (init_corba_server): Fixed prototype.
-
-	* quick-view.c (create_items_for_event): Made static.
-
-	* gncal-todo.c (column_resized): Made static.
-
-	* layout.c (find_index): Made static.
-
-2000-02-08  Federico Mena Quintero  <federico@helixcode.com>
-
-	* evolution-calendar.idl (CalObjInstance): New struct to wrap
-	instances of calendar objects for recurrencies and alarms.
-	(Cal::get_events_in_range): New method to get ocurring and
-	recurring events by time range.
-
-	* cal-backend.c (cal_backend_get_events_in_range): New function to
-	get a list of event instances in a time range.
-	(string_from_ical_object): New internal function.
-	(cal_backend_get_object): Use string_from_ical_object() instead of
-	doing everything ourselves.
-	(cal_backend_get_events_in_range): New function to get a list of
-	the events that occur or recur in a specified time range.
-
-	* cal-client.c (cal_client_get_events_in_range): Implemented
-	client-side function.
-
-	* cal-util.h:
-	* cal-util.c: New files with utilities and types common to the
-	client and server parts.
-	(CalObjInstance): New structure to hold an instance of an actual
-	occurrence, recurrence, or alarm trigger of a calendar object.
-	(cal_obj_instance_list_free): New function to free a list of
-	calendar object instances.
-
-	* cal.c (Cal_get_events_in_range): Implemented new method.
-
-	* corba-cal.c (cal_repo_get_updated_objects): Free `str' with
-	free(), not g_free(), since calendar_get_as_vcal_string() uses
-	writeMemVObject(), which uses realloc().  Fixed in gnome-pim as
-	well.
-
-2000-02-04  Federico Mena Quintero  <federico@helixcode.com>
-
-	* cal-backend.c (get_calendar_base_vobject): New function to
-	create the base VObject for a calendar.
-	(cal_backend_get_object): Create the base calendar and add the
-	sought object to it, then stringify it.
-
-	* evolution-calendar.idl (Listener::obj_added
-	Listener::obj_changed): Now these pass in just the UIDs, not the
-	complete objects.
-
-	* cal-listener.c (Listener_obj_added): Changed to pass in the uid,
-	not the object.
-	(Listener_obj_changed): Likewise.
-
-	* cal-client.h (CalClientClass): Made the obj_added and
-	obj_changed signals take in the UIDs, not the full objects.
-
-	* cal-client.c (obj_added_cb): Likewise.
-	(obj_changed_cb): Likewise.
-
-2000-02-04  Federico Mena Quintero  <federico@helixcode.com>
-
-	* cal-backend.c (CalBackendPrivate): Renamed the event_hash field
-	to object_hash.  Now we hash all the calendar's objects here based
-	on their UIDs.
-	(ensure_uid): New function to create UIDs for calendar objects
-	that don't have them.
-	(add_object): Ensure the object has an UID before inserting it in
-	the calendar.
-	(cal_backend_get_object): New function.
-
-2000-02-03  Federico Mena Quintero  <federico@helixcode.com>
-
-	* evolution-calendar.idl (Cal): Added the get_object() method.
-
-	* cal-client.c (cal_client_get_object): New function to get a
-	calendar object by its UID.
-
-	* cal.c (Cal_get_object): Implemented.
-
-	* cal-backend.c (cal_backend_get_object): New unfinished backend
-	function.  We need some reorganizing of how the calendar objects
-	are stored.
-
-2000-02-02  Federico Mena Quintero  <federico@helixcode.com>
-
-	* Makefile.am (gnomecal_SOURCES): Added the CORBA generated
-	sources.
-
-2000-02-01  Federico Mena Quintero  <federico@helixcode.com>
-
-	* cal-client.c (cal_loaded): Handle the cal_loaded signal from the
-	listener.  Store the calendar client interface object, and emit
-	our own cal_loaded signal.
-	(cal_client_load_calendar): Connect to the listener's signals.
-	(cal_client_class_init): Added the "obj_added", "obj_removed",
-	�bj_changed" signals.
-	(obj_added_cb): Handle the signal from the listener.
-	(obj_removed_cb): Likewise.
-	(obj_changed_cb): Likewise.
-
-2000-01-30  Federico Mena Quintero  <federico@helixcode.com>
-
-	* Makefile.am (gnomecal_SOURCES): Added cal-client.[ch] and
-	cal-listener.[ch].
-
-2000-01-30  Federico Mena Quintero  <federico@helixcode.com>
-
-	* evolution-calendar.idl: Changed the namespace from
-	GNOME::Calendar to Evolution::Calendar.
-	(Listener::LoadStatus): Fixed SUCESSS -> SUCCESS typo.  And I
-	never noticed it in the implementation.  Ain't M-/ grand?
-
-	* Makefile.am: Changed ocurrences of gnome-calendar.idl to
-	evolution-calendar.idl.
-
-	* *.[ch]: Changed GNOME_Calendar_foo identifiers to
-	Evolution_Calendar_foo.
-
-2000-01-25  Federico Mena Quintero  <federico@helixcode.com>
-
-	* cal-client.c cal-client.h: New files with the calendar client
-	object.
-
-2000-01-25  Federico Mena Quintero  <federico@helixcode.com>
-
-	* cal-factory.c (CalFactory_load): Check that the listener is not
-	nil and emit and exception if it is.
-
-	* gnome-calendar.idl (CalFactory::load CalFactory::create): Now
-	these raise the NilListener exception.
-
-	* tlacuache.c (calendar_notify): Error stub for alarms.
-	(alarm_defaults): Stub array.
-	(debug_alarms): Stub variable.
-	(main): Initialize gnome-vfs.
-
-2000-01-24  Federico Mena Quintero  <federico@helixcode.com>
-
-	* tlacuache.c: New main module for the Tlacuache personal calendar
-	server.
-
-	* tlacuache.gnorba: New gnorba file for Tlacuache, the GNOME
-	personal calendar server.
-
-	* Makefile.am: Added the stuff necessary to build Tlacuache.
-
-	* cal.c (Cal_get_uri): Convert the URI to a string before
-	returning it.
-
-	* cal-factory.c (CalFactory_create): Doh, this function is void.
-
-	* job.c (job_add): Use g_idle_add(), not gtk_idle_add().
-
-2000-01-24  Federico Mena Quintero  <federico@helixcode.com>
-
-	* cal-backend.c (cal_backend_remove_cal): New function to remove a
-	calendar client interface object from a backend.
-	(cal_backend_load): Convert the URI to string and use
-	Parse_MIME_FromFileName().  The conversion is not very smart,
-	though.
-
-	* cal-factory.c (load_backend): Moved most of the error handling
-	upstream to load_fn().
-	(load_fn): Handle failure in case the backend could not be loaded.
-	(cal_factory_destroy): Free the backends and the backend hash
-	table.
-	(add_calendar_client): Implemented.  We create a Cal client
-	interface object and attach it to the backend, and we notify the
-	listener.
-
-2000-01-22  Federico Mena Quintero  <federico@helixcode.com>
-
-	* cal-factory.c (lookup_backend): Renamed from lookup_calendar().
-	Also, return a backend instead of a Cal client object.
-
-	* cal-backend.c (cal_backend_load): Take in a GnomeVFSURI, not a
-	string.
-
-	* cal-listener.c (Listener_cal_loaded): Pass the load status to
-	the signal.
-	(cal_listener_destroy): Better error checking.
-	(cal_listener_new): Better error checking.
-
-	* cal-listener.h (CalListenerLoadStatus): New enum for the load
-	status of a calendar.
-	(CalListenerClass): Added the status argument to the cal_loaded
-	signal.
-
-	* gnome-calendar.idl (cal_loaded): Added a load status code.
-
-	* cal-backend.h (CalBackendLoadStatus): Renamed from
-	CalBackendLoadResult.
-
-2000-01-18  Federico Mena Quintero  <federico@helixcode.com>
-
-	* cal-backend.c cal-backend.h: Moved the calendar backend here.
-	This is the actual calendar-handling object.
-	(load_from_vobject): Moved over from calendar.c.  Modified to use
-	a CalBackend instead of the old Calendar structure.
-	(add_object): Likewise.
-
-	* cal.c: Now the Cal object is just a calendar client interface
-	object; we use it as a "viewport" onto a CalBackend.  This also
-	lets us do correct resource management.
-
-	* cal-common.h: New file with common forward declarations; we
-	can't have circular dependencies between headers.
-
-2000-01-18  Federico Mena Quintero  <federico@helixcode.com>
-
-	* cal-factory.c (cal_factory_load): Queue a load job.
-	(load_fn): Load job handler.  Lookup the calendar by URI, load it
-	if it is not loaded, or just report it to the new listener if it is.
-
-	* job.c job.h: New files with a simple job queue manager.
-
-	* gnome-calendar.idl (Listener::cal_loaded): Do not return the
-	whole calendar object string.  The client will be able to query
-	the calendar for the events it needs.
-
-	* cal-listener.c (Listener_cal_loaded): Ref the calendar GNOME
-	object.  We unref it when the listener is destroyed.
-
-2000-01-17  Federico Mena Quintero  <federico@helixcode.com>
-
-	The files from the gncal directory of the gnome-pim module on CVS
-	were moved here, to evolution/calendar, in preparation for the
-	Evolution work.  The calendar is being split into a model/view
-	architecture.  The model is a personal calendar server (PAS):  it
-	provides storage, notification, and event generation; the
-	views/controllers are the calendar user agents and things like
-	Pilot synchronizers.
-
-2000-01-11  Federico Mena Quintero  <federico@helixcode.com>
-
-	* cal.c: Removed the CORBA listener methods, adjusted for the new
-	IDL.
-
-	* cal-listener.c (cal_listener_init): Create the private
-	structure.  In it we hold a reference to the calendar the listener
-	is watching.
-	(cal_listener_destroy): Destroy the private structure and unref
-	the calendar.
-	(Listener_cal_loaded): Stuff the calendar into our private data.
-	(Listener_obj_added): Adjusted for new IDL.
-	(Listener_obj_removed): Likewise.
-
-	* gnome-calendar.idl: New IDL for the personal calendar server.
-
-	* cal.h cal.c: New files with the calendar object.
-
-	* cal-listener.h cal-listener.c: New files with the calendar
-	listener object.
-
-	* cal-factory.h cal-factory.c: New files with the calendar factory
-	object.
-
-2000-01-09  Eskil Heyn Olsen  <deity@eskil.dk>
-
-	* Makefile.am: Changes to remove todo capplet stuff from distro.
-
-2000-01-08  Vadim Strizhevsky  <vadim@optonline.net>
-
-	* calendar-conduit-control-applet.c: Added pilotID argument to
-	gpilotd_conduit_mgmt_new.
-
-
-2000-01-05  Eskil Heyn Olsen  <deity@eskil.dk>
-
-	* GnomeCal.idl: Added an argument to get_number_of_objects, so you
-	can choose which state the object should have
-	(any/new/modified/...). Will also add one to choose type
-	(event/journal etc).
-
-	* corba-cal.c (cal_repo_get_number_of_objects): Implemented the
-	new version of get_number_of_objects.
-
-	* calendar-conduit.c (pre_sync): Calls various
- 	gnome_pilot_conduit_standard_abs_set_num_yadayda to get progress bars.
-
-2000-01-04  Eskil Heyn Olsen  <deity@eskil.dk>
-
-	* calendar-conduit.c (start_calendar_server): Let's not call
-	g_error, but g_warning instead.
-	(pre_sync): Get record numbers info, total, new, deleted etc, and
-	tell gpilotd.
-
-1999-12-31  Eskil Heyn Olsen  <deity@eskil.dk>
-
-	* eventedit.c (ee_store_recur_end_to_ical): Adds 86400 secs (1
-	day) to the date chooses by the user. This ensures the recurrence
-	also occurs on that date.
-	(ee_rp_init_ending_date): And subtracts 86400 secs when about to
-	redisplay the box.
-
-	* calendar.h: Added an argument to calendar_new, to enable certain
-	features, such as initing alarms or nor.
-
-	* calendar.c (calendar_new): Implemented support for the
-	CALENDAR_INIT_ALARMS option to calendar_new.
-
-	* corba-cal.c (cal_repo_get_updated_objects): Added
- 	CALENDAR_INIT_ALARMS to calendar_new calls.
-
-	* main.c: Added CALENDAR_INIT_ALARMS to calendar_new calls. This
- 	should probably be CALENDAR_INIT_NIL, but I'm not sure, guess
- 	steintr should check it.
-
-	* gnome-cal.c: Added CALENDAR_INIT_ALARMS to calendar_new calls.
-
-	* calendar-pilot-sync.c: Added CALENDAR_INIT_NIL to calendar_new calls.
-
-1999-12-10  Russell Steinthal  <rms39@columbia.edu>
-
-	* eventedit.c (ee_create_ae): Fix sensitivity bug when used to
-	create default alarm box (widgets in that box should always be
-	sensitive, even if the enabled checkbutton is not set)
-
-1999-12-08  Eskil Heyn Olsen  <deity@eskil.dk>
-
-	* calendar-conduit-control-applet.c (setSettings): Capplets now
-	sets first_sync on enable, this should make the conduit copy old
-	entries from the pilot to gnomecal.
-
-1999-12-07  Eskil Heyn Olsen  <deity@eskil.dk>
-
-	* calendar-conduit.c (pre_sync): Check if local store is
-	empty. If, force slow sync.
-
-	* GnomeCal.idl (GNOME): Added get_number_of_objects.
-
-	* corba-cal.c (cal_repo_get_number_of_objects): implemented the
- 	get_number_of_objects.
-
-	* calendar-conduit-control-applet.c (setStateCfg): Fixed bug that
-	caused the capplet to always set the sync action to Disable upon start.
-
-1999-12-05  Eskil Heyn Olsen  <deity@eskil.dk>
-
-	* Makefile.am (Conduits_second_DATA): Also install .desktop files
-	for conduit capplets in the gnome/apps menu dir.
-
-1999-12-04  Eskil Heyn Olsen  <deity@eskil.dk>
-
-	* Makefile.am (EXTRA_DIST): Added .desktop files to EXTRA_DIST.
-
-1999-10-12  Clifford R. Conover  <rusty@zootweb.com>
-
-	* gncal-todo.c Todo List improvements.
-
-	Cleaned up todo item highlighting, added support for highlighting
- 	events due today, and events not due yet.  Colors are configurable
- 	on the Colors Tab of the properties window.
-
-	Renamed Frame in Properties window to Colors rather then Month
- 	Colors since we are now asking for Todo item colors.
-
-	Added ability to display time until todo item is due in list, it
- 	automatically selects the best denomination of time (up to weeks)
- 	and down to seconds to display.  This should be made configurable
- 	in a future version.
-
-	Changed Todo dialog to ask for time that event is due.  This
- 	allows more accurate tracking of then the item is due, before the
- 	dialog was only asking for the date of the todo item.
-
-1999-12-03  Eskil Heyn Olsen  <deity@eskil.dk>
-
-	* calendar-conduit.c: undef DEBUG_CALCONDUT, suppresses debug output.
-
-1999-12-02  Russell Steinthal  <rms39@columbia.edu>
-
-	* alarm.c: Enhanced debug support: can be toggled on and off by
-	SIGUSR1, reports alarms which could not be added
-
-	* gnome-cal.c, main.[ch], prop.c: Add snooze capability for audio
-	and display alarms.  Snooze interval can be configured in the
-	Properties box.
-
-1999-11-30  Eskil Heyn Olsen  <deity@eskil.dk>
-
-	* calendar-conduit.c (compare): Fixed compare bug. Also neated up
-	some of the if's in set_status.
-
-1999-11-22  Russell Steinthal  <rms39@columbia.edu>
-
-	* Merged todo list coloring patch from stable
-	* Added myself to AUTHORS, about box (per Miguel)
-
-1999-11-22  Eskil Heyn Olsen  <deity@eskil.dk>
-
-	* calendar-conduit.c (pre_sync): Writes some warning
- 	messages when pre_sync fails.
-
-1999-11-14  Eskil Heyn Olsen  <deity@eskil.dk>
-
-	* Makefile.am: Stupid misplaced endif cause gncal to depend on an
-	install gnome-pilot... fixed... sorry.
-
-1999-11-12  Eskil Heyn Olsen  <deity@eskil.dk>
-
-	* Makefile.am (extra_pilot_bins): Fixed the if then else problem,
-	using solution suggested by James Henstridge, appears to be caused
-	by a (by now fixed) bug in my automake.
-
-1999-11-12  Russell Steinthal  <rms39@columbia.edu>
-
-	* prop.c: Config code for timeout, make Alarms property page use a
-	vbox instead of an hbox so that the propbox stays a reasonable width.
-
-	* gnome-cal.c, main.[ch]: Add timeout for audio alarms, code to load
-	from config file
-
-	* eventedit.c: Give some static functions external linkage so they
-	can be used elsewhere (make_spin_button); add some prototypes to
-	appease gcc.
-
-1999-11-11  Russell Steinthal  <rms39@columbia.edu>
-
-	* calendar.c (calendar_day_change): Add call to
-	calendar_init_alarms() to schedule another day change alarm.
-
-1999-11-09  Eskil Heyn Olsen  <deity@eskil.dk>
-
-	* calendar-conduit.c: Enabled debug output. Sets a g_log_domain,
-	now version 0.8.5. Consistent use of GSList/GList. Implemented
-	compare, default uses one that compares the contents of a struct
-	Appointment, but also has #ifdeffed code that does a field level
-	comparison, not complete, but perhaps educational.
-
-	* Makefile.am (#todo_conduit_control_applet_SOURCES): Fixed an
-	unwanted conditional on libcalendar_conduit_la_LDFLAGS
-
-1999-11-05  Eskil Heyn Olsen  <deity@eskil.dk>
-
-	* calendar-conduit-control-applet.c (readStateCfg): Commented the
-	code out, thus the capplet works again.
-
-1999-11-04  Eskil Olsen   <deity@eskil.dk>
-
-	* Makefile.am: Uses the PISOCK_LIBDIR, for people with odd install
- 	dirs for their pilot-link. Also install a pretty icon for the
- 	calendar-conduit.
-
-	* calendar-conduit-control-applet.c: Modfied the
-	try/revert/ok/cancel scheme to be more intuitive, also uses a
-	GtkOptionMenu for the possible sync methods.
-
-	* calendar-conduit-control-applet.desktop: use the nice icon...
-
-	* calendar-conduit.c: Ack, had to define debug_alarms and
-	alarm_default, otherwise they are undefined. Is gncal code messy
-	or is this considered a way of configuring the cal engine ?
-	Implemented delete_all syncabs methods.
-
-	* calendar-pilot-sync.c: also had to declare debug_alarms and
- 	alarm_defaults, just as ugly.
-
-1999-11-02  Russell Steinthal  <rms39@columbia.edu>
-
-	* prop.c: Add new alarm page to properties box
-
-	* prop.c, calobj.c, main.[ch] eventedit.c: New support for default
-	alarms, configurable in the properties box.
-
-	* gnome-cal.c, prop.c, main.[ch]: add option to beep on Display
-	alarms
-
-1999-10-23  Russell Steinthal  <rms39@columbia.edu>
-
-	* calendar.c (calendar_new): Correctly initialize calendar_day_end
-	and calendar_day_begin *before* installing day-change alarm.
-
-1999-10-21  Russell Steinthal  <rms39@columbia.edu>
-
-	* alarm.c, main.c: Added alarm debugging code
-
-	* main.c (open_ok): Show an error box if the user tries to open a
-	non-existent file; fixes bug #1818
-
-1999-10-19  Russell Steinthal  <rms39@columbia.edu>
-
-	* gnome-cal.c (calendar_notify): Fix typos which were causing
-	invalid times in audio notification dialogs; fixes Bug #2561
-
-1999-10-18  Russell Steinthal  <rms39@columbia.edu>
-
-	* gncal-day-panel.c (gncal_day_panel_new): Placed the various
-	elements of the day view in paned windows so that the user can
-	adjust the relative sizes of the daily schedule, monthly calendar,
-	and to-do list.
-
-1999-10-18  Martin Norb�ck  <norpan@bigfoot.com>
-
-	* gncal.desktop: Added swedish translation
-
-1999-10-13  Eskil Olsen   <deity@eskil.dk>
-
-	* Makefile.am: Hopefully the fixes the much-hated
-	gnome-pilot dependency.
-
-1999-10-07  Eskil Olsen   <deity@eskil.dk>
-
-	* calendar.c (calendar_object_changed): moved the pilot_status =
-	MOD up, so even a CHANGE_SUMMARY will set the modified flag.
-
-	* calendar-conduit.c: more _free calls, vamped the noise on output.
-
-1999-10-06  Eskil Olsen   <deity@eskil.dk>
-
-	* *conduit*[ch]: checks return values from gpilotd_init/connect.
-
-	* calender.c (vcalendar_create_from_calendar): removed a set
- 	of cleanVObject cleanStrTbl, since the freed memory that the
-	function returned.
-
-1999-09-27  Timur Bakeyev  <mc@bat.ru>
-
-	* timeutil.c (time_from_isodate): Use tm.gmtoff or timezone to get
-	correct offset from UTC, according to HAVE_TM_GMTOFF or HAVE_TIMEZONE.
-	See also 1999-07-19  Matt Martin <matt@abacusnet.net>
-
-1999-09-27  Miguel de Icaza  <miguel@nuclecu.unam.mx>
-
-	* month-view.c (add_event): ditto
-	(mark_current_day): ditto
-	(month_view_set): ditto
-
-	* goto.c (goto_dialog): ditto.
-
-	* gnome-month-item.c (gnome_month_item_init): ditto.
-
-	* gncal-day-panel.c (gncal_day_panel_new): ditto.
-
-	* getdate.c (RelativeDate): ditto.
-
-	* eventedit.c (set_all_day): ditto.
-	(ee_rp_init_rule): ditto.
-
-	* calendar.c (vcalendar_create_from_calendar): ditto.
-
-	* calendar-conduit.c (update_record): ditto.
-
-	* calobj.c (ical_object_generate_events): Get rid of pointers to
-	values returned from localtime, as it uses a static buffer.
-
-1999-09-26  Eskil Olsen <deity@eskil.dk>
-
-	* corba-cal.c: the g_free that was commented out since glib said
-	was a duplicate free, was supposed to be a free.
-
-	* GnomeCal.idl/corba-cal.c: added a get_object_id_list and a
-	get_objects_by_id_list. Latter is not done.
-
-	* calendar-conduit.c: rewrote the way the conduit iterates over
-	records. It no longers fetches all entries (since that didn't work
-	with more then 285 entries. It now fetches the id list, and gets
-	each record. (will be using get_objects_by_id_list to get records
-	in amounts of 10 or so later, to reduce amount of corba calls).
-
-	* calendar-conduit.c: now sets alarm parameters when transferring
-	from gnomecal to pilot.
-
-1999-09-23  Eskil Olsen <deity@eskil.dk>
-
-	* calendar-conduit.c: better merge of summary/description
- 	when doing ical_from_remote (update_record), also handles
-	import from gnomecal to pilot better, and on both ways, repeat
-	events are much better now.
-
-1999-09-22  Eskil Olsen <deity@eskil.dk>
-
-	* corba-cal.c: commented out a g_free that glib reported
-	as being a duplicate free.
-	* calendar-conduit.c: got gnomecal->pilot up and runnning.
-
-1999-02-06  Lauris Kaplinski <lauris@ariman.ee>
-
-	* gncal.desktop: Added Estonian translations.
-
-1999-09-14  Federico Mena Quintero  <federico@redhat.com>
-
-	* gncal-full-day.c (child_popup_menu): Set the data pointers for
-	all the items.
-
-1999-09-14  Kjartan Maraas  <kmaraas@online.no>
-
-	* doc/C/gnomecal.sgml: Merge from gnome-pim-1-0. Synced with newest
-	user-guide.
-
-1999-09-01  Miguel de Icaza  <miguel@gnu.org>
-
-	* eventedit.c (ee_create_buttons): Make the OK button the default
-	button per Russell's suggestion.
-
-1999-08-30  Miguel de Icaza  <miguel@nuclecu.unam.mx>
-
-	* calendar.c (calendar_object_changed): Modify the
-	object->last_mod field.
-	(calendar_add_object): Ditto.
-
-	Closes bug #676
-
-	* main.c (save_calendar_cmd): Fix problem in which we warned the
-	user about the calendar being modified the first time the calendar
-	was used.
-
-1999-08-22  Tomas Ogren  <stric@ing.umu.se>
-
-	* gnomecal.gnorba: "GenericFactoy" is wrong...
-
-1999-08-15  Miguel de Icaza  <miguel@gnu.org>
-
-	* calobj.c (ical_gen_uid): Fix the hostname part.
-
-1999-08-07  Peter Teichman  <pat4@acpub.duke.edu>
-
-	* calendar-pilot-sync.c (sync_pilot): sync correctly for objects
-	created on the pilot, but not dirty (because they have been synced
-	with some other program in the past)
-
-1999-07-30  Miguel de Icaza  <miguel@gnu.org>
-
-	* month-view.c (month_view_init): Release points here.
-
-1999-08-02  Peter Teichman  <pat4@acpub.duke.edu>
-
-	* Makefile.am (libcalendar_conduit_la_LDFLAGS):
-	libcalendar_conduit now installs
-
-	* calendar-pilot-sync.c (sync_pilot): do deletion of appointments
-	correctly, when they are deleted on the pilot
-	(conduit_free_Appointment): protect against double-freeing parts
-	of the Appointment structure
-	(update_record): all-day events from the pilot are handled a bit
-	more reasonably
-
-1999-08-01  Peter Teichman  <pat4@acpub.duke.edu>
-
-	* calendar-pilot-sync.c (sync_object_to_pilot): The multi-day
-	appointment corruption bug is dead. Whoo!
-
-1999-07-31  Peter Teichman  <pat4@acpub.duke.edu>
-
-	* Makefile.am: fixed this up slightly with respect to pilot conduits
-
-1999-07-30  Jonathan Blandford  <jrb@redhat.com>
-
-	* Makefile.am (libcalendar_conduit_la_LIBADD): More autoconf-stuff
-
-1999-07-29  Jonathan Blandford  <jrb@redhat.com>
-
-	* gnome-cal.c (setup_widgets): Add scrolling to the yearview.
-
-1999-07-28  Miguel de Icaza  <miguel@gnu.org>
-
-	* calendar-pilot-sync.c: (sync_object_to_pilot): If the enddate is
-	not set, set the repeatForever to 1.  This fixes all of the
-	birthdays problems I had.
-
-	Make the code not take arguments
-	(sync_cal_to_pilot): Nice event update information
-
-	* calendar.c (calendar_new): Add Event UID hash table.
-	(calendar_add_object): Add events to the hash table here.
-	(calendar_remove_object): Remove events here.
-	(calendar_object_find_event): Use the hash table here.
-
-	* main.c (save_calendar_cmd): The object is already destroyed by
-	gnome_dialog_run.
-
-	* calendar-pilot-sync.c (sync_object_to_pilot): Do not turn
-	archived bit on.
-
-	* calobj.c (ical_gen_uid): Use the hostname, not the domain name.
-	(ical_gen_uid): Add a serial number.  Isodates can be small.
-
-	* corba-cal.c (cal_repo_update_pilot_id): New method to update the
-	pilot status.
-	(cal_repo_get_updated_objects): New method.  Returns a list of
-	modified and not-sycned objects
-
-	* calendar-pilot-sync.c (sync_cal_to_pilot): New function to sync
-	from the GnomeCalendar to the pilot.
-	(sync_object_to_pilot): Sync a single event to the pilot.
-	(try_alarm): Alarm syncing code.
-
-1999-07-27  Miguel de Icaza  <miguel@gnu.org>
-
-	* calendar-pilot-sync.c: New file.  Implements PalmPilot
-	syncronization with the Gnome Calendar.
-
-	* calobj.c (ical_object_new_from_string): New function.  Creates
-	an iCalObject from a vCalendar string that is supposed to contain
-	only one vEvent.
-
-	* calendar.c:
-	(calendar_save): Split this routine in two.
-
-	* gnome-cal.c (gnome_calendar_new): Create the corba server here.
-
-	* main.c: Include gnorba.h, and corba-cal-factory.h here
-	(close_cmd): Kill the calendar server on shutdown.
-
-	* calobj.c (load_recur_yearly_day): Added a fixme comment.  WE
-	need to handle intervals in the years.
-
-	* calendar.c (calendar_object_find_in_list, calendar_object_find,
-	calendar_object_find_todo, calendar_object_find_event): New
-	functions for looking up information.
-
-	* main.c (gnome_calendar_locate): New function.
-
-	* corba-cal.c (calendar_create_object): New file.  Implements the
-	corba server.
-
-	* calendar.c (calendar_object_changed): Flag pilot-status as changed.
-
-	* calobj.c (ical_object_to_vobject): Save pilot information for syncing.
-	(ical_object_create_from_vobject): Load syncing information for
-	pilot.  Do it in a way compatible with KOrganizer.
-
-1999-07-26  Miguel de Icaza  <miguel@gnu.org>
-
-	* calobj.c (ical_object_create_from_vobject): Generate unique IDs
-	on Vevents we load that lack it.  WE need this for the old
-	gnome calendar generated files (ie, before now :-).
-
-	Required to sync with the Palm
-
-1999-07-26  Miguel de Icaza  <miguel@gnu.org>
-
-	* calobj.c (ical_object_create_from_vobject): Generate unique IDs
-	on Vevents we load that lack it.  WE need this for the old
-	gnome calendar generated files (ie, before now :-).
-
-	Required to sync with the Palm
-
-1999-07-19  Matt Martin <matt@abacusnet.net>
-
-	* timeutil.c (time_from_isodate): Handle the 'Z' parameter to the
-	ISO date format to convert from GMT time.
-
-1999-07-17  Nat Friedman  <nat@gnome-support.com>
-
-	* calendar.c (calendar_add_object): Copy the new UID into the
- 	iCalObject structure.
-
-1999-07-16  Miguel de Icaza  <miguel@gnu.org>
-
-	* gnome-month-item.c (gnome_month_item_set_arg): Merge fix from
-	gnome-pim-1-0: Fixed cut&paste bug for day fontsets.
-
-1999-07-14  Miguel de Icaza  <miguel@gnu.org>
-
-	* calobj.c (ical_gen_uid): Returns a UID.
-	(ical_object_new): Use a UID when creating an event.  Should get
-	syncing done easier.
-
-1999-07-14  Nicholas J Kreucher <nick@poetic.com>
-
-	* calobj.c (skip_numbers): Actually skip over the numbers.
-	(ical_object_to_vobject): Test the proper variable for storing the
-	proper information.
-
-1999-07-14  Jean-Noel Guiheneuf <jean-noel.guiheneuf@wanadoo.fr>
-
-	* timeutil.c (time_add_month): Fixed the problem with next month
-	going from a 31-day to a 30-day by adjusting the date to the
-	closest day at the end of the month.
-
-1999-06-07  Mike McEwan  <mike@lotusland.demon.co.uk>
-
-        * timeutil.c (time_add_month): Tell ktime' that we don't know
-        about daylight saving time so that it does *not* make adjustments
-        when we traverse a DST boundary.
-        (time_year_begin): ditto.
-        (time_year_end): ditto.
-        (time_month_begin): ditto.
-        (time_month_end): ditto.
-
-1999-06-16  Anders Carlsson  <anders.carlsson@tordata.se>
-
-	* main.c (new_calendar): Realize the toplevel widget when
-	--hidden is passed to gnomecal. This fixes a segfault.
-
-1999-06-04  Robert Brady  <rwb197@ecs.soton.ac.uk>
-
-	* gnome-cal.h, gnome-cal.c: Fix abort() problem with the year view.
-	(Bug #1367). Thanks to Owen Cliffe <oc197@ecs.soton.ac.uk> for
-	helping track it down.
-
-1999-06-03  Miguel de Icaza  <miguel@nuclecu.unam.mx>
-
-	* calobj.c (daynumberlist): One line bug fix from Sergey I Panov.
-
-1999-06-02  Miguel de Icaza  <miguel@nuclecu.unam.mx>
-
-	* view-utils.c (nicetime): Use %H instead of %k, as %k is a GNU
-	extension, not available in other systems.
-
-1999-06-01  Miguel de Icaza  <miguel@nuclecu.unam.mx>
-
-	* calobj.c (daynumberlist): Work around broken software that
-	writes a broken month-of-day as "zero".  Use the dtstart date for
-	this on this event.
-
-1999-05-28  Miguel de Icaza  <miguel@nuclecu.unam.mx>
-
-	* Makefile.am (install-data-local): help files be gone.  They are
-	now installed from the Docbook stuff.
-
-1999-05-26  Russell Steinthal  <steintr@condor.penguinpowered.com>
-
-	* gncal-todo.c main.c main.h prop.c: Added support for priorities
-	for todo items.  Doesn't do much, but you can set them and sort by
-	them.  (Use the properties box to enable them; should they be on
-	by default?)
-
-1999-05-25  Miguel de Icaza  <miguel@nuclecu.unam.mx>
-
-	* main.c (parse_an_arg): Added missing break here.  It was causing
-	core dumps when invoked with --userfile.
-
-	* gnome-cal.c (gnome_calendar_set_view): Add some assertions here,
-	to pin point the bug reported on gnome-list.
-
-	* calobj.c (load_recurrence): Make intervals always exist.  a 0
-	interval is wrong.
-
-1999-05-25  Federico Mena Quintero  <federico@nuclecu.unam.mx>
-
-	* year-view.c: Removed unused macro CALENDAR_HEIGHT.
-
-1999-05-25  Federico Mena Quintero  <federico@nuclecu.unam.mx>
-
-	* year-view.c (idle_handler): Set the canvas scroll region here,
-	not in size_allocate().  Also, use the correct width and height
-	based on the allocation and the precomputed minimum width/height
-	values.
-
-	* gnome-cal.c (setup_widgets): Set the scrollbar policy of the
-	scrolled window.
-
-	* main.c (setup_appbar): Use the correct type for the appbar.
-
-	* gncal-day-view.c: Removed unused function switch_to_day().
-
-	* gncal-day-panel.c (calendar_day_selected): Removed unused variable.
-
-1999-05-25  Nat Friedman  <nat@nat.org>
-
-	* doc/C/gnomecal.sgml: Fixed a typo.
-
-	* gnome-cal.c (setup_widgets): Added a scrolled window widget into
- 	which the year view is placed.
-
-	* year-view.c (CALENDAR_HEIGHT): The height of the total year view
- 	inside the scrolled window.
-	(idle_handler): Set the height of the year view to
- 	CALENDAR_HEIGHT.
-	(year_view_size_allocate): Set the scroll region of the year view
- 	canvas to allocation->width, CALENDAR_HEIGHT.
-
-1999-04-25  Miguel de Icaza  <miguel@nuclecu.unam.mx>
-
-	* main.c (dump_todo): Add --todo flag to dump the todo contents.
-
-1999-04-19  Miguel de Icaza  <miguel@nuclecu.unam.mx>
-
-	* gncal-todo.c (add_activated): Use same hack used in edit_activated
-
-1999-04-16  Miguel de Icaza  <miguel@nuclecu.unam.mx>
-
-	* gncal-todo.c (edit_activated): Kill all grabs from the CList
-	before running the new dialog box.
-
-	This fixes the problem of button-3/Edit on the todo item blocking
-	the GUI (actually, the main window responds, but not the todo
-	window).
-
-1999-04-08  Miguel de Icaza  <miguel@nuclecu.unam.mx>
-
-	* gncal-todo.c (gncal_todo_init): Make sure we can get events for
-	button3.  The code for the nice popup menu was there but was not
-	getting invoked.
-
-1999-04-01 Steve Murphy <murf@e-tools.com>
-
-	* calobj.c (weekdaynum): Added this routine so Monthly recurrences
-	use the weekday field as a simple integer for a single weekday.
-
-	* calobj.c (load_recur_monthly_pos): Call weekdaynum instead of
-	weekdaylist. The interface only lets the user input a single value
-	anyway.
-
-	* calobj.c (ical_object_to_vobject): instead of code to output day
-	names from a bit array, use instead the value as an int and output
-	a single dayname.
-
-	* calobj.c (ical_object_generate_events): first_week_day gets the
-	day int instead of the first entry in the bit field. I inserted a
-	fair chunk of code to avoid calling generate if the day is out of
-	range for a month. It may be unneccessary, because mktime will
-	turn the extra days into a valid date the next month. But not all
-	mktimes are equal, I fear.
-
-	* eventedit.c (ee_store_recur_rule_to_ical): For case 3,
-	(Monthly), I added code to set the interval slot of the recur
-	struct; without this value, selecting a monthly recursing, by
-	date, would lead to an infinite loop broken only by a failure to
-	alloc more memory. Also, in the "by position" case, both
-	u.month_pos and u.month_day were being assigned values. This is a
-	mistake, as they are both part of an union, and the same
-	thing. The weekday field should get the recur_rr_month_weekday
-	value.
-
-	* eventedit.c (ee_rp_init_rule): set default day from the weekday
-	field instead of the u.month_day field, which is really the
-	month_pos value.
-
-	* gnome-cal.c (gnome_calendar_tag_calendar): Month days start with
-	1, not 0; thus, setting tm.tm_mday = 0, and then calling mktime
-	will generate a time corresponding to the end of the previous
-	month, which may have a mday anywhere from 28 to 31. The end time
-	just adds 1 to the month, so your end time may not cover the last
-	few days of this month, depending on what the biggest mday of last
-	month was. I changed it so tm_mday is set to 1 instead.
-
-1999-03-30  Federico Mena Quintero  <federico@nuclecu.unam.mx>
-
-	* gncal-todo.c (convert_time_t_to_char): Made static.  Make it use
-	the full year format for strftime().
-
-1999-03-27  Nuno Ferreira  <nmrf@rnl.ist.utl.pt>
-
-	* calobj.c: Include <config.h> So that strings get translated.
-
-1999-03-26  Tomas Ogren  <stric@ing.umu.se>
-
-	* prop.c (build_hours_menu): Made it respect 12/24h settings..
-	Doesn't show until next time you open the dialog.. yet..
-
-1999-03-24  Tomas Ogren  <stric@ing.umu.se>
-
-	* gncal-week-view.c (gncal_week_view_set): Did some i18n work
-	* eventedit.c (get_exception_string): Did some i18n work
-
-1999-03-24  Tomas Ogren  <stric@ing.umu.se>
-
-	* gncal-todo.c (gncal_todo_init): Made clist titles i18n:able
-	* main.c (poptOption): Added which views that are possible for
-	--view in the --help text (closes #367)
-	* main.c (dump_events): Added (short) month to the strftime and made
-	the strings i18n:able
-
-1999-03-23  Tomas Ogren  <stric@ing.umu.se>
-
-	* gncal/calobj.c: Added 2 paranthesis..
-	"foobar = d / 60*60" is _NOT_ the same as "foobar = d / (60*60)"
-	which caused heavy alarm-corruption with alarms between 2 hrs and
-	2 days.
-
-1999-03-23  Nat Friedman  <nat@nat.org>
-
-	* eventedit.c (ee_store_recur_rule_to_ical): Set the
- 	recur->interval to the value of the recur_rr_month_period spin
- 	button if the event is being set "by day."  This closes bug #675
- 	as reported by bagfors@hpc2n.umu.se.  Thanks for the report!
-
-1999-03-10  Clifford R. Conover <rconover@montana.edu>
-
-	* gncal-todo.c (simple_todo_editor): Add support for Due Date when
-	adding a TODO item here.
-	(column_resized): New function
-	(init_column_sorting): New function.
-	(todo_click_column): New function.
-	(convert_time_t_to_char, make_overdue_todo_style): New functions.
-
-	* gnome-cal.c (gnome_calendar_todo_properties_changed): New
-	function used to update the TODO when the properties have been
-	chagned for it.
-
-	* prop.c (prop_apply_todo): Apply TODO properties.
-
-	* gncal-day-panel.c (todo_list_properties_changed): Update the
-	TODO display here.
-
-	* eventedit.c (date_edit_new): Made public
-
-1999-03-10  Craig A Soules (soules+@andrew.cmu.edu)
-
-	* timeutil.c, calendar.c, calobj.c, gncal-day-panel.c: Add support
-	for daylight time savings.
-
-1999-02-28  Martin Baulig  <martin@home-of-linux.org>
-
-	* gncal-full-day.c (recompute_motion): For DRAG_MOVE, DRAG_SIZE_TOP
-	and DRAG_SIZE_BOTTOM: call child_focus_out () if the child currently
-	has the focus.
-
-1999-02-27  Changwoo Ryu  <cwryu@adam.kaist.ac.kr>
-
-	* quick-view.c (QUICK_VIEW_FONTSET): Added Korean font to the
-	fontset string.
-	* mark.h (*_FONTSET): Likewise.
-
-1999-02-23  Miguel de Icaza  <miguel@nuclecu.unam.mx>
-
-	* calobj.c (ical_object_to_vobject): Save the owner/organizer of
-	the event.
-	(ical_object_create_from_vobject): Load the owner/organizer of the event.
-
-	* gncal-full-day.c (delete_occurance): Assign child to data (fixes
-	crash on "delete this occurrance").
-
-1999-02-22  Timur Bakeyev  <mc@bat.ru>
-
-	* calendar.c: According to configured values, use either tm.tm_zone
-	or tzname. In last case, also declare it extern.
-
-	* prop.c: langinfo.h not available everywhere. Wrapped. BTW, works
-	fine without it.
-
-1999-02-20  Tomas Ogren  <stric@ing.umu.se>
-
-	* main.c (init_username): Made use of g_get_{user,real}_name() instead
-	of our own home-brew...
-
-1999-02-17  Sergey Panov <sipan@mit.edu>
-
-	* gnome-month-item.c,gnome-month-item.h,goto.c,mark.h,
-	month-view.c,prop.c,quick-view.c,year-view.c: will define
-	fonts via fontset. Friendlier to locales that use iso8859-[^1]
-	and koi8-r encodings. Does not solve problem for Asian languiges
-	--- better solution is needed (e.g. standart GNOME fontstyles
-	defined in gtkrc).
-
-1999-02-16  Sergey Panov <sipan@mit.edu>
-
-	* main.c: Use N_() macro for color settings labels in
-	color_props structure.
-
-1999-02-15  Federico Mena Quintero  <federico@nuclecu.unam.mx>
-
-	* goto.c (goto_dialog): Indentation fixes.
-
-1999-02-15  Tomas Ogren  <stric@ing.umu.se>
-
-	* goto.c: Made a private copy of what localtime() returns, to be able
-	to keep the data after more calls to localtime().
-
-1999-02-11  Miguel de Icaza  <miguel@nuclecu.unam.mx>
-
-	* main.c (save_default_calendar): New function.  Saves the
-	calendar if it is the user's default calendar
-
-	* gncal-full-day.c (unrecur_appointment):
-	* gncal-day-panel.c (day_view_range_activated):
-	* eventedit.c (ee_ok):
-	* gncal-todo.c (ok_button): Added autosave for the default
-	calendar.
-
-1999-02-09  Tomas Ogren  <stric@ing.umu.se>
-
-	* main.c: Removed the gtk_widget_realize call.
-
-1999-02-06  Changwoo Ryu  <cwryu@adam.kaist.ac.kr>
-
-	* gncal.desktop: Added Korean translations.
-
-1999-02-04  Federico Mena Quintero  <federico@nuclecu.unam.mx>
-
-	* eventedit.c (date_edit_new): New convenience function to create
-	a properly-configured date editor widget.
-
-1999-02-03  Federico Mena Quintero  <federico@nuclecu.unam.mx>
-
-	* gncal-week-view.c (gncal_week_view_new): Make the calendar start
-	weeks on Monday if appropriate.
-	(gncal_week_view_time_format_changed): New function to notify the
-	week view that the time format has changed.
-
-	* gncal-day-panel.c (gncal_day_panel_new): Make the calendar start
-	weeks on Monday if appropriate.
-	(gncal_day_panel_time_format_changed): New function to notify the
-	day panel that the time format has changed.
-
-	* gnome-cal.c (gnome_calendar_time_format_changed): Tell the day
-	and week views that the time format has changed.
-
-1999-02-01  Federico Mena Quintero  <federico@nuclecu.unam.mx>
-
-	* eventedit.c (event_editor_init): Set the title of the event
-	editor window.
-
-1999-01-31  Federico Mena Quintero  <federico@nuclecu.unam.mx>
-
-	* gncal-day-view.c (gncal_day_view_expose): Do not remove the
-	clipping rectangle here.
-
-	* view-utils.c (view_utils_draw_events): Remove the clipping
-	rectangle here, since the user of this function should not know
-	about it.
-
-1999-01-30  Miguel de Icaza  <miguel@nuclecu.unam.mx>
-
-	* view-utils.c (view_utils_draw_events): Improve this draw
-	routine.  Now it can split the text in lines and fit as many
-	events as possible.
-	(nicetime): Return strings without spaces at the beginning.
-
-	* gncal-day-view.c (gncal_day_view_expose): Move clip-clear
-	operation here.
-
-1999-01-29 Jason Tackaberry <tack@dok.org>
-
-	* gncal-full-day.c (child_popup_menu): if the user clicks on an
-        event that is an occurance, the menu will allow the user to delete
-        all occurances of this event, or just the selected occurance.
-        (delete_occurance): added.
-
-        * eventedit.c (append_exception): force the clist to select the
-        new exception.  (fixes segfault)
-        (delete_exception): if the last exception in the clist is deleted,
-        move the selection index up. (fixes segfault)
-
-1999-01-28  Miguel de Icaza  <miguel@nuclecu.unam.mx>
-
-	* main.c (parse_an_arg): Add --hidden key to hide the calendar at
-	startup. Only works with GNOME window managers though :-(
-
-	* calendar.c (calendar_day_change): Reschedule alarms for the new day.
-
-	(calendar_init_alarms): Schedule an alarm for midnight to change
-	the calendar_day_begin/calendar_day_end.
-
-	* alarm.c (alarm_ready): If we reschedule, there is no need to
-	activate any pending alarms.
-
-1999-01-28  Federico Mena Quintero  <federico@nuclecu.unam.mx>
-
-	* gncal-full-day.c (child_new): Insert the summary text here.
-	(child_focus_in): No need to raise the window, since we have
-	Spiffo(tm) layout code.  Boy, this is old code.
-	(gncal_full_day_focus_child): Now that GtkText works better, we
-	can avoid synthesizing a click which was causing grief, anyway.
-	(child_button_press): Grab the focus before popping up the menu.
-
-	* layout.c (find_index): Added a sanity check.
-
-	* gncal-full-day.c (child_destroy): Unmap and unrealize the child
-	before unparenting/destroying it.
-	(child_unrealize): Unrealize the widget.  What was I thinking?
-	(child_new): Save the focus_out_event signal connection id in
-	Child structure (in a new field).
-	(child_destroy): Disconnect from the focus_out_event signal, since
-	we don't want to get such an event when the widget is destroyed.
-	(gncal_full_day_destroy): Destroy the children properly; it was
-	leaking memory.
-
-1999-01-27  Miguel de Icaza  <miguel@nuclecu.unam.mx>
-
-	* main.c (save_calendar_cmd): Warn if the calendar file has
-	changed.
-
-	* calendar.c (calendar_load, calendar_save): Keep track of the
-	modification time for the calendar file.
-
-1999-01-20  Nat Friedman  <nat@nat.org>
-
-	* gncal-full-day.c (gncal_full_day_key_press): Only trap printable
- 	characters such that hotkeys work.
-	(UNSELECT_TIMEOUT): Changed to 0.  Much saner behavior.
-
-	* prop.c (properties): Connect gnome_help_pbox_display to the
- 	GnomePropertyBox help button.
-
-1999-01-19  Federico Mena Quintero  <federico@nuclecu.unam.mx>
-
-	* quick-view.c (quick_view_do_popup): Do not grab the mouse here
-	(it was being grabbed incorrectly, anyways).
-	(quick_view_map_event): Grab the mouse when the window is mapped.
-	This avoids the ugly "while (xGrabPointer () != Success)" hack.
-	(quick_view_button_release): Handle button releases here.
-
-1999-01-19  Tomas Ogren  <stric@ing.umu.se>
-
-	* main.c: do gtk_widget_realize on the toplevel window..
-
-1999-01-13  Federico Mena Quintero  <federico@nuclecu.unam.mx>
-
-	* gncal-day-panel.c (gncal_day_panel_new): Make the little
-	calendar start up with the correct date.
-
-	* gncal-week-view.c (gncal_week_view_set): Add the month to the
-	date range display label.
-
-1999-01-08  Nat Friedman  <nat@nat.org>
-
-	* main.c: Converted some more stuff to use the standards.
-
-1999-01-08  Nat Friedman  <nat@nat.org>
-
-	* main.c (setup_appbar): New function to create the status bar.
-	(setup_menu): Install menu hints.
-
-	Menu items updated to match the standards.  New Settings menu
- 	created.
-
-1998-12-30  Jeff Garzik  <jgarzik@pobox.com>
-
-	* gncal/calendar.c, gncal/gnome-cal.c, gncal/main.c,
-	  gncal/quick-view.c:
-	s/g_copy_strings/g_strconcat/
-
-1998-12-16  Miguel de Icaza  <miguel@nuclecu.unam.mx>
-
-	Rewrote the old and broken alarm system.  It never actually
-	worked properly.  Now it works properly, and I figured a nice way
-	to get the Audio alarm do something nicer (it is now like an alarm
-	clock :-).
-
-	* gnome-cal.c (calendar_notify): Now we take a CalendarAlarm to
-	actually distinguish which alarm was triggered.
-
-	* alarm.c (alarm_ready): The code was only activating the first
-	alarm.  Reschedule the timer upon delivery of an alarm.
-
-1998-12-14  Federico Mena Quintero  <federico@nuclecu.unam.mx>
-
-	* year-view.c (idle_handler): Use the allocation size instead of
-	the old fields in the canvas structure.
-
-	* goto.c (create_days): Use gtk_widget_set_usize() instead of
-	gnome_canvas_set_size().
-	* quick-view.c (setup_event_list): Likewise.
-
-1998-12-09  Miguel de Icaza  <miguel@nuclecu.unam.mx>
-
-	* gncal-todo.c (simple_todo_editor): Use gnome_dialog_set_parent.
-	* goto.c (goto_dialog): ditto
-	* prop.c (properties): ditto.
-
-1998-11-23  Miguel de Icaza  <miguel@nuclecu.unam.mx>
-
-	* eventedit.c (ee_rp_init_exceptions): Update GtkClist usage.
-
-1998-11-23  Andrew T. Veliath  <andrewtv@usa.net>
-
-	* gncal-day-panel.c (gncal_day_panel_new): Use
-	gtk_scrolled_window_add_with_viewport instead of
-	gtk_container_add (gtk changes).
-
-1998-11-23  Herbert V. Riedel <hvr@hvrlab.ml.org>
-
-	* eventedit.c: use GPOINTER_TO_INT
-
-	* gncal-todo.c: same.
-
-1998-11-22  Matthew Wilson  <msw@redhat.com>
-
-	* main.c: Fixed the popt event parsing callback to have the
-	correct number of arguments.  This stops it from segfaulting.
-
-1998-11-16  Federico Mena Quintero  <federico@nuclecu.unam.mx>
-
-	* eventedit.c (ee_classification_widgets): Doh.  Fixed stupid bug
-	where the classification buttons were not being set correctly.
-	(ee_store_general_values_to_ical): Take into account the fact that
-	radio group lists are stored in reverse order of insertion.
-
-	* gncal-todo.c (gncal_todo_init): Use a scrolled window to put the
-	clist into.
-
-1998-11-11  Miguel de Icaza  <miguel@nuclecu.unam.mx>
-
-	* calendar.c (calendar_save): Backup the old file before saving
-	the caledar.
-
-1998-11-06  Miguel de Icaza  <miguel@nuclecu.unam.mx>
-
-	* calobj.c: Add ctype.h
-
-1998-10-31  Federico Mena Quintero  <federico@nuclecu.unam.mx>
-
-	* gnome-cal.c (gnome_calendar_direction): Add the offset from the
-	beginning of the current time unit (day/month/etc), otherwise it
-	does not work right, for example, you are on the 31st day of a
-	month and the next month is a 30-day one and you jump to the next
-	month.
-
-1998-10-16  Federico Mena Quintero  <federico@nuclecu.unam.mx>
-
-	* month-view.c: Changed a lot of stuff not to use the layout code
-	-- the month view's days are too small to display layout
-	usefully.  Now they display a little list of the events in each
-	day.  We also have a popup menu for the days in the month view.
-
-	* calendar.c (calendar_get_objects_in_range): Reverse the list so
-	that it is returned in increasing order.
-
-	* eventedit.c (event_editor_new_whole_day): New public function to
-	create an event for the complete span of day_begin to day_end.
-
-	* year-view.c (new_appointment): Use event_editor_new_whole_day().
-
-	* year-view.c (yv_popup_menu): Mark strings for i18n.
-
-1998-10-12  Ji Lee <g@ucsd.edu>
-
-	* eventedit.c (ee_store_recur_rule_to_ical): The interval was
-	never being loaded from the spin button.
-
-1998-10-09  Federico Mena Quintero  <federico@nuclecu.unam.mx>
-
-	* month-view.c (month_view_update): Create a list of children and
-	lay them out nicely.  Lots of functions added for this purpose.
-	(adjust_segment): Main event segment adjustment routine.
-	(adjust_children): Adjusts all the children in the month view.
-	(child_create_segments): Creates the segments for a particular event.
-	(layout_children): Uses the generic layout engine to organize the children.
-
-1998-10-08  Federico Mena Quintero  <federico@nuclecu.unam.mx>
-
-	* gncal-todo.c (clist_row_selected): Set the sensitivity of the
-	edit/delete buttons.
-	(gncal_todo_update): Likewise.  Thanks to Dirk Luetjens for the
-	bug report.
-
-	* layout.c: Do some cleanup; now we pass a struct with the layout
-	algorithm's state instead of passing a trillion parameters around.
-
-	* gncal-full-day.c (layout_children): Use the new generic layout
-	engine.
-	(child_compare): Sort keys are start time then end time, not just
-	start time.  This produces somewhat nicer results for the layout
-	algorithm.
-
-	The new layout code uses a partition of the time range occupied by
-	the events, rather than using a fixed time granularity.  This is
-	better since the different parts of the program that use the
-	layout module will have different semantics regarding snapping the
-	event bounds to a fixed "time grid".
-
-1998-10-07  Federico Mena Quintero  <federico@nuclecu.unam.mx>
-
-	* layout.[ch]: New files that abstract the event layout code from
-	gncal-full-day.c into something useful for other parts of the
-	program.  Now all event layout is done here.
-
-	* Makefile.am (gnomecal_SOURCES): Added layout.[ch] to the list of
-	sources.
-
-1998-10-07  Carsten Schaar  <nhadcasc@fs-maphy.uni-hannover.de>
-
-	* main.c (main): Replaced the 'gnome_client_new_default' call with
-	'gnome_master_client'.
-
-1998-10-02  Federico Mena Quintero  <federico@nuclecu.unam.mx>
-
-	* timeutil.c (time_day_begin): Changed name from
-	time_start_of_day() to be consistent with the other begin/end functions.
-	(time_day_end): Likewise.
-
-	* calobj.c (ical_object_get_first_weekday): New public function to
-	get the first toggled day in a weekday mask.  Since we do not
-	support multiple weekdays in a monthly-by-pos rule, we just fetch
-	the first toggled one.
-	(ical_object_generate_events): Added a missing break statement.
-
-	* timeutil.c (time_month_end): Made it consistent with the rest of
-	the time begin/end functions -- now it returns the first second of
-	the *next* month.
-	(time_week_end): Actually implemented this function.  It will be
-	used when the week view is rewritten.
-
-	* calobj.c (time_in_range): Fix off-by-one in the comparison of
-	the time against the end time.
-
-	* gncal-full-day.c (expand_space): Fixed bug where the columns not
-	were being expanded due to a missing "slot + j".
-
-1998-10-01  Federico Mena Quintero  <federico@nuclecu.unam.mx>
-
-	* month-view.c (month_view_init): Use the font #defines.
-	(month_view_new): Set the colors of the month view upon creation.
-	(mark_current_day): New function to mark the current day in the
-	month view.
-	(month_view_set): Mark the current day.
-	(month_view_colors_changed): Mark the current day and colorify the
-	month item appropriately.
-
-	* month-view.h: Added year and month fields to the MonthView
-	structure.
-
-	* main.c: Renamed the Appointments color property, since it will
-	be used by the month view as well.
-
-	* goto.c (update): Set the current day's font and color.
-
-	* year-view.c (year_view_init): Set the fonts of the month items
-	when creating them.
-
-	* mark.h: Added new #defines for HEADING_FONT and TITLE_FONT.
-
-	* year-view.c (year_view_init): Use the new font #defines.
-
-	* prop.c (prop_apply_colors): Fixed to work with the
-	I-am-paranoid-and-I-need-to-size-my-ints changes to
-	GnomeColorPicker.
-	(color_spec_from_picker): Likewise.
-
-1998-09-30  Federico Mena Quintero  <federico@nuclecu.unam.mx>
-
-	* goto.c (create_days): Colorify the month item and prepare it for
-	prelighting here.
-
-	* main.c (color_props):  Changed the default colors to something
-	not dull.
-
-	* year-view.c (compute_min_size): New function to compute the
-	minimum size of the year view properly.
-	(year_view_size_request): Added two new fields to the year view
-	structure that contain the minimum size.  Return this in the
-	size_request method.
-	(year_view_new): Call compute_min_size to save the minimum size
-	for later use.
-	(idle_handler): Make it resize the items correctly.
-
-	* gnome-month-item.c (gnome_month_item_set_arg): Reshape when
-	necessary.  This is needed becaues we now actually calculate a
-	minimum size for the month item based on the font sizes and paddings.
-	(check_heading_sizes): New function to calculate a minimum size
-	based on the headings' dimensions.
-	(check_day_sizes): New function to calculate a minimum size based
-	on the day number labels' dimensions.
-	(check_sizes): New function that computes a minimum size for the
-	month item.
-	(reshape): Now calls check_sizes() to ensure a minimum size for
-	the month item.
-
-	* year-view.c (mark_current_day): New function to mark the current
-	day in the year view.
-
-	* mark.c: Removed mark_current_day from here.
-
-1998-09-29  Federico Mena Quintero  <federico@nuclecu.unam.mx>
-
-	* prop.c (fetch_color_spec): Changed name from fetch_prelight_spec
-	and made it conform to the new prelighting mechanism.
-	(fake_mark_days): Set the proper day attributes.
-	(reconfigure_month): Use colorify_month_item().
-	(fake_mark_days): Use mark_month_item_index().
-
-	* mark.c (colorify_month_item): New public function to reset the
-	colors in a month item.
-	(get_attributes): New internal function that creates an array of
-	attributes for the days in a month item.  This is the basis of all
-	the new optimizations to month item marking.
-	(unmark_month_item): Now it uses the attributes array to unmark
-	only the days that need unmarking.
-	(mark_event_in_month): Update the day attributes array.
-	(month_item_prepare_prelight): Changed the definition of the
-	prelight color query function.  Use the new function.
-	(day_event): Do color changes based on the day attributes array.
-	(mark_month_item_index): New public function to mark a single day
-	by index.
-	(mark_event_in_month): Use mark_month_item_index().
-
-	* gnome-month-item.c (gnome_month_item_num2child): Now takes an
-	int, not a GnomeMonthItemChild.
-	(gnome_month_item_child2num): Now returns an int, not a
-	GnomeMonthItemChild.
-	(gnome_month_item_num2day): Now takes an int, not a
-	GnomeMonthItemChild.
-
-	* goto.c (goto_dialog): Create the days before the year spin
-	button, because the year_changed callback expects the month item
-	to be created.  The new semantics of the spin button cause it to
-	emit a value_changed signal on the adjustment upon creation -- is
-	this the behavior we want from it?
-	(goto_dialog): Use gtk_window_set_modal() instead of the
-	deprectaed gnome_dialog_set_modal().
-
-	* quick-view.c (quick_view_new): Make it look not as crappy by
-	putting the title inside the frame.
-	(quick_view_do_popup): Fixed the pointer grab and added a cursor.
-	(create_items_for_event): Query the text width/height from the
-	text item using the new object arguments, so that the size of the
-	popup window can be set properly.
-
-	* year-view.c (do_quick_view_popup): Calculate a nice date string
-	for the popup window.
-
-1998-09-28  Federico Mena Quintero  <federico@nuclecu.unam.mx>
-
-	* quick-view.[ch]: New file that presents a quick view of the
-	events in a particular day when the mouse is clicked on the year
-	view.  Work in progress.
-
-	* year-view.c (do_quick_view_popup): New function that creates a
-	quick view for the events in a day.
-
-	* Makefile.am (gnomecal_SOURCES): Added quick-view.[ch] to the
-	list of sources.
-
-1998-09-27  Federico Mena Quintero  <federico@nuclecu.unam.mx>
-
-	* main.c: Hotkey for File/Exit should be C-q, not C-x.
-
-1998-09-24  Federico Mena Quintero  <federico@nuclecu.unam.mx>
-
-	* year-view.c (do_popup_menu): New function to execute the popup
-	menu in the year view.
-	(day_event): Invoke the popup menu with the context set to days.
-	(new_appointment): New function to create a new appointment from
-	the year view.
-	(do_jump): New function to do the appropriate view/date jumping
-	from the popup menu.
-
-	* main.c: Fixed two icons in the File menu.
-
-1998-09-21  Federico Mena Quintero  <federico@nuclecu.unam.mx>
-
-	* main.c: Added underlined shortcuts and accelerators to the main menu.
-
-1998-09-16  Raja R Harinath  <harinath@cs.umn.edu>
-
-	* gncal-week-view.c (<gtk/gtklabel.h>): Include.
-	* gncal-week-view.h (<gtk/gtkvbox.h>): Include.
-
-1998-09-06  Miguel de Icaza  <miguel@nuclecu.unam.mx>
-
-	* gnome-cal.c (mail_notify): Fixed the bug reported about the mail
-	notification not beint sent until the program was terminated.
-
-1998-09-03  Federico Mena Quintero  <federico@nuclecu.unam.mx>
-
-	* gncal-full-day.c (gncal_full_day_forall): Updated foreach ->
-	forall from Gtk changes, bleah.
-
-	* year-view.c (day_event): New function to handle events from
-	days.  Jumps to the day that is clicked.
-
-	* main.c: Use a watch cursor while the previous/today/next
-	functions are doing their job.
-
-	* mark.c (month_item_prepare_prelight): New public utility
-	function to prepare a month item for prelighting.  It will store
-	the proper prelight information and attach the appropriate signals.
-	(mark_current_day): Make the current day bold as well (useful for
-	color-blind people, I guess).
-
-	* prop.c (set_current_day): Reset the date in the sample calendar
-	and mark the current day.
-	(fake_mark_days): Mark fake events in the sample calendar.
-
-	* year-view.c (year_view_set): Use the general prelighting engine.
-
-	* goto.c (day_event): Just process button presses, as prelighting
-	is done behind the scenes now.
-	(update): Use the general prelighting engine.
-
-	* prop.c (create_colors_page): We can now configure the colors of
-	the monthly calendars!  Wheeeeee!  There are still some nits to be
-	fixed, which are listed in the TODO file.
-	(build_color_spec): New function to build color specifications.
-	(parse_color_spec): New function to parse color specifications.
-
-	* mark.c: Modified all functions to use the configured colors.
-	* goto.c: Likewise.
-
-	* main.c (colors_changed): New function that notifies all
-	calendars that colors have changed.
-
-	* gnome-cal.c (gnome_calendar_colors_changed): New function that
-	notifies all the views that the colors have changed.
-
-	* month-view.c (month_view_colors_changed): New function that
-	notifies the month view that colors have changed.
-
-	* year-view.c (year_view_colors_changed): New function that
-	notifies the year view that colors have changed.
-
-	* gnome-month-item.h (struct _GnomeMonthItem): Added fields for
-	outline and day box colors.
-
-	* gnome-month-item.c (gnome_month_item_set_arg): Added
-	outline_color, outline_color_gdk, day_box_color, and
-	day_box_color_gdk arguments to month items.  These are convenient
-	to quickly set the colors of the month item.
-	(gnome_month_item_get_arg): Likewise.
-
-	* main.[ch]: Added a global array of structures for color preferences.
-
-1998-08-31  Federico Mena Quintero  <federico@nuclecu.unam.mx>
-
-	* goto.c: Small code cleanup.
-	(day_event): Upon receiving a LeaveNotify event, Reset the day's
-	background to the correct color.
-
-1998-08-29  Federico Mena Quintero  <federico@nuclecu.unam.mx>
-
-	* mark.[ch]: New files with utility functions to mark calendars
-	with their events.
-
-	* mark.c (mark_month_item): New public function to mark a month
-	item with events.
-	(unmark_month_item): New public function to unmark all the days in
-	a month item to their default appearance.
-
-	* year-view.c (year_view_set): Use the new unmark_month_item() and
-	mark_month_item() to mark the months with events.
-
-	* goto.c (update): New function that updates the calendar in the
-	Go-to dialog by marking the days.
-
-	* timeutil.c (time_year_begin): Modified to take a time_t value.
-	(time_year_end): Likewise.
-	(time_month_begin): Actually implemented this function, which was
-	in the header file but not here.
-	(time_days_in_month): New public function that returns the number
-	of days in a month.
-
-	* Makefile.am (gnomecal_SOURCES): Added mark.[ch] to the sources.
-
-	* year-view.c (unmark_days): Use unmark_month_item().
-
-	* gncal-full-day.c (gncal_full_day_destroy): Fixed crash when
-	destroying the full day view.  The full day's destroy method is
-	unusual in that it destroys the list of child widgets itself, as
-	it does not have a remove method, so it needs to reset the list to
-	NULL.
-
-1998-08-27  Federico Mena Quintero  <federico@nuclecu.unam.mx>
-
-	* gnome-month-item.c (build_month): Now does the correct thing
-	when the user wants weeks to start on Monday.  Now all the Monday
-	special casing, as far as day numbering is concerned, is only in
-	this function.
-
-	* year-view.c (mark_days): This function marks the days that have
-	events in them.  It also fixes a memory leak in the old
-	implementation (it was leaking the whole list).
-	(unmark_days): New function used to unmark all the days in the
-	year view.
-	(mark_event): New function that marks all the days that are
-	spanned by a time range.  It also fixes the bug in the old
-	implementation where it could possibly mark days past the ends of
-	the year (if the event crosses year boundaries, for example).
-
-	* timeutil.c (time_year_begin): Take the year parameter since year
-	1, not 1900.
-	(time_year_end): Likewise.
-
-	* year-view.c (year_view_size_allocate): Now changing the size of
-	the calendars is done in the idle loop.
-	(idle_handler): This function actually does the resizing of the items.
-
-	* year-view.h (struct _YearView): Added idle_id and need_resize
-	fields.
-
-1998-08-26  Federico Mena Quintero  <federico@nuclecu.unam.mx>
-
-	* year-view.c: Beginning of the new year view.  Sizing and event
-	marking needs to be finished.
-
-	* gnome-cal.c: Updated for year-view.
-	(gnome_calendar_time_format_changed): Use year_view_time_format_changed().
-
-	* year-view.[ch]: Renamed the gncal-year-view.[ch] files to
-	year-view.[ch].
-
-	* Makefile.am (gnomecal_SOURCES): Updated year-view.[ch] in the
-	list of source files.
-
-1998-08-25  Federico Mena Quintero  <federico@nuclecu.unam.mx>
-
-	* goto.c (create_days): Set the heading color of the month item.
-
-	* main.c: Use GNOME_STOCK_PIXMAP_JUMP_TO, now that it exists,
-	instead of goto.xpm.  Also, removed goto.xpm from cvs.
-
-	* gnome-month-item.h (struct _GnomeMonthItem): Added fields for
-	the heading and day number fonts.  Added fields for heading and
-	day number label colors.
-
-	* gnome-month-item.c (gnome_month_item_class_init): ARG_DAY_NAMES
-	should be write-only.  Also, added arguments for heading and day
-	number fonts.  Added arguments for heading and day number colors.
-
-1998-08-24  Federico Mena Quintero  <federico@nuclecu.unam.mx>
-
-	* prop.c (build_two_radio_group): Doh.  Set the state of the radio
-	buttons properly.
-
-	* month-view.c (month_view_time_format_changed): New public
-	function that notifies the month view of a time format change.
-
-	* gnome-cal.c (gnome_calendar_time_format_changed): New public
-	function that notifies the calendar of a time format change.
-
-	* main.c (time_format_changed): Use gnome_calendar_time_format_changed().
-
-	* month-view.c (month_view_update): New public function to update
-	the month view when an event changes.  This is still unfinished.
-	(month_view_set): New public function to set the month in the
-	month view.
-
-	* gnome-cal.c (gnome_calendar_direction): Add case for month view.
-	(gnome_calendar_set_view): Likewise.
-	(gnome_calendar_update_all): Likewise.
-
-	* timeutil.c (time_add_week): Implemented the time_add_week()
-	function, which was on the header file.
-	(time_add_month): Added public month-adding routine.
-
-	* gnome-cal.c (gnome_calendar_get_current_view_name): Add case for
-	month view.
-	(gnome_calendar_goto): Likewise, and set the time on the month view.
-
-	* month-view.c (month_view_new): Now it takes the calendar plus
-	the time_t representing the month.
-
-	* gnome-month-item.h: Added documentation on the object arguments
-	for the month item.
-
-	* month-view.c (month_view_init): Added a month/year heading to
-	the month view.
-
-	* TODO: Updated the TODO list a bit.
-
-	* main.c (gnome_cal_file_menu): The preferences menu option should
-	go in the File menu.
-	(gnome_cal_edit_menu): Added stock pixmaps to the menu items.
-	(gnome_cal_menu): Renamed the Calendar menu to Edit.
-	(gnome_cal_help_menu): Use "About Gnomecal", not just "About".
-
-	* prop.c (hour_activated): Notify the property box that it has changed.
-
-	* main.c: Changed the Properties menu item to Preferences.  These
-	are global application preferences, not a single calendar's
-	properties.
-
-	* prop.c (prop_apply): Save the week_starts_on_monday flag to the
-	configuration file.
-	(properties): Added a check button for weeks starting on Monday.
-	(properties): Beautified the Preferences dialog.
-
-	* month-view.c (month_view_init):
-	* goto.c (create_days): Set the month item to start weeks on
-	Monday if appropriate.
-
-	* main.c (init_calendar): A boolean is not an hour, so don't
-	range_check_hour() on it.
-	(init_calendar): Added a global week_starts_on_monday flag.
-
-	* main.h: Added global week_starts_on_monday flag.
-
-1998-08-21  Miguel de Icaza  <miguel@nuclecu.unam.mx>
-
-	* calobj.c (ical_object_create_from_vobject): If mail alarm or
-	program alarm are missing the action, then set an empty default.
-
-1998-08-18  Federico Mena Quintero  <federico@nuclecu.unam.mx>
-
-	* gnome-month-item.c (gnome_month_item_day2index): New public
-	function to get the displayed day index of the specified date.
-
-	* gnome-cal.c (gnome_calendar_goto_today): New public function to
-	jump to the current day.
-
-	* goto.c (day_event): Jump to the selected day when the user
-	clicks the mouse, and prelight days as appropriate.
-
-	* timeutil.c (time_from_day): New public function to build a
-	time_t from a year/month/day triplet.
-
-	* gnome-month-item.c (gnome_month_item_num2child):
-	(gnome_month_item_child2num): New public functions to convert an
-	index into a child and vice-versa, respectively.
-	(gnome_month_item_num2day): New public function to convert a child
-	number into a displayed day number.
-
-	* goto.c (goto_dialog): Doh, use gnome-dialog properly :-)
-
-	* gnome-month-item.c (create_items): Use g_strdup()ed day names
-	from the start.
-
-1998-08-17  Federico Mena Quintero  <federico@nuclecu.unam.mx>
-
-	* main.c (gnome_toolbar): Made it use goto.xpm.
-
-	* Makefile.am (EXTRA_DIST): Added goto.xpm to the list of files.
-
-1998-08-13  Federico Mena Quintero  <federico@nuclecu.unam.mx>
-
-	* gnome-month-item.c (gnome_month_item_set_arg): Doh.  Actually
-	recalculate the days using the month and year.
-
-	* main.c: Added "Go to" button to quickly jump to a specific date.
-
-	* goto.c: New file that defines the quick go-to date dialog.
-
-	* Makefile.am (gnomecal_SOURCES): Added goto.c to the sources.
-
-1998-08-11  Nuno Ferreira  <nmrf@rnl.ist.utl.pt>
-
-	* main.c (new_calendar): Made title i18n friendly. This was bug
-	#215.
-
-	* eventedit.c (ee_store_recur_end_to_ical): Set recur->enddate to
-	recur->_enddate, not to itself, when adding recurring event and
-	supplying an end date. This fixes (at least part of) bug #99.
-
-1998-08-10  Federico Mena Quintero  <federico@nuclecu.unam.mx>
-
-	* month-view.[ch]: Start of the month view widget.  This will use
-	the generic month item and extend it to have the semantics desired
-	for the gnomecal month view.
-
-	* gnome-month-item.[ch]: New generic canvas item for the month
-	view and the "small calendars".  This is intended to be a
-	high-level display engine for monthly calendars.  This is a work
-	in progress.
-
-	* gnome-cal.h (GnomeCalendar): Added a month_view field.
-
-	* gnome-cal.c (setup_widgets): Create the month view and insert it
-	into the notebook.
-
-	* Makefile.am: Added month-view.[ch] and gnome-month-item.[ch] to
-	the sources.
-
-1998-08-03  Federico Mena Quintero  <federico@nuclecu.unam.mx>
-
-	* main.c (about_calendar_cmd): Use an array of const strings to
-	keep gcc happy.
-
-	* alarm.c (alarm_compare_by_time): Use gconstpointer to keep gcc happy.
-	* calendar.c (calendar_object_compare_by_start): Likewise.
-	* gncal-full-day.c (child_compare_by_start): Likewise.
-
-1998-07-07  Miguel de Icaza  <miguel@nuclecu.unam.mx>
-
-	* main.c: Add support for --view flag.
-	(session_save_state): Save the view mode;
-	(new_calendar): Now takes a view mode flag.
-
-	* gnome-cal.c (gnome_calendar_get_current_view_name): New
-	function for enhancing the session management support for
-	gnomecal.
-	(gnome_calendar_set_view): New function that makes a given page
-	active.
-
-1998-07-01  Nuno Ferreira  <nmrf@rnl.ist.utl.pt>
-
-	* gncal.desktop: Added Portuguese translation.
-
-Mon Jun 22 13:01:16 1998  Havoc Pennington  <hp@pobox.com>
-
-	* main.c (session_save_state): Use gnome_geometry_string to get
-	the geometry string.
-
-1998-06-04  Federico Mena Quintero  <federico@nuclecu.unam.mx>
-
-	* eventedit.c (ee_rp_init_rule): Do not subtract 1 from
-	tm->tm_mday for the default_day.
-
-	* gnome-cal.c (gnome_calendar_new):
-	(gnome_calendar_goto): Use the start of the day -- things expect
-	it to be that way.
-
-1998-05-27  Nuno Ferreira  <nmrf@rnl.ist.utl.pt>
-
-	* eventedit.c (ee_store_recur_rule_to_ical): Fill in
-	ical->recur->interval from value in spin_button. This ixed an
-	infinnite loop.
-
-1998-05-30  Federico Mena Quintero  <federico@nuclecu.unam.mx>
-
-	* gncal-full-day.c (child_draw): Paint the decorations correctly.
-	(child_draw_decor): Paint the recurrence/bell icons correctly.
-
-1998-05-25  Miguel de Icaza  <miguel@nuclecu.unam.mx>
-
-	* eventedit.c (ee_rp_init_rule): Use the contents of
-	ee->ical->dtstart for computing the predefined values of the recurrence.
-
-	* gncal-full-day.c (gncal_full_day_unrealize): Fix the gc
-	destruction in the unrealization code and fix the pixmap unrefing.
-
-	* main.c (close_cmd): Remove a bad hack that disabled calendar
-	widget destruction.
-
-	* calobj.c (ical_object_generate_events): Fix for the weekly event
-	generation.  Was reported on the bug tracking system.
-
-1998-05-18  Miguel de Icaza  <miguel@nuclecu.unam.mx>
-
-	* gncal-full-day.c (layout_children): Implemented ultra-cool
-	layout for the events that share the same time range.  Gals and
-	guys you can now drop Outlook on the recycle bin.
-
-	Which reminds me.  We do not have a recycle bin.  How could that
-	happen in a project as cool as this one?  Someone explain this to
-	me.
-
-1998-05-18  Federico Mena  <federico@nuclecu.unam.mx>
-
-	* gncal-full-day.c (paint_back): Eliminated unnecessary border repainting.
-
-Sun May 17 17:55:03 1998  Havoc Pennington  <hp@pobox.com>
-
-	* gncal-todo.c (simple_todo_editor): Close dialog when return is pressed.
-
-1998-05-15  Miguel de Icaza  <miguel@nuclecu.unam.mx>
-
-	* gnome-cal.c (mark_gtk_calendar_day): Bug free version of the
-	range computation in place.
-
-	* gncal-year-view.c (year_view_mark_day): Use the same new version
-	of the range computation here.
-
-	* calobj.c (ical_object_generate_events): Fix the begin/end
-	condition.
-
-1998-05-14  Miguel de Icaza  <miguel@nuclecu.unam.mx>
-
-	* timeutil.c (isodate_from_time_t): Do not add the spurious
-	padding.
-
-	* calobj.c (store_date_list): Bug fix:  I was using the wrong
-	pointer when saving the exception date list.
-	(set_date_list): Bug fix:  load correctly the complete exception
-	date list.
-	(set_date_list): Use ',' for the exception date separator as the
-	versit people can not get their standard right.
-
-	* gncal-full-day.c (unrecur_appointment): Support for making an
-	existing recurrent event `movable' for a day.
-
-	* calobj.c (ical_object_add_exdate): New routine, used to add
-	exception dates.
-	(ical_object_duplicate): New routine:  used to do the magic
-	recur->no-recur event.
-
-1998-05-08  Miguel de Icaza  <miguel@nuclecu.unam.mx>
-
-	* gncal-full-day.c (new_appointment): Use gtk_calendar freeze/thaw
-
-	* gncal-year-view.c (gncal_year_view_set_year): Use gtkcalendar freeze/thaw.
-
-	* eventedit.c (event_editor_init): Use gnome_dialog_set_close to
-	avoid the ugly warning.
-
-	* main.c (display_objedit): Default to the day the user is looking
-	at.
-
-1998-05-05  Miguel de Icaza  <miguel@nuclecu.unam.mx>
-
-	* gncal-day-panel.c (full_day_size_allocated): Do not emit a value
-	changed signal if the value is the same.
-
-1998-05-04  Miguel de Icaza  <miguel@nuclecu.unam.mx>
-
-	* prop.c (prop_apply): Only run the apply code once.
-
-1998-05-03  Miguel de Icaza  <miguel@nuclecu.unam.mx>
-
-	* gncal-day-panel.c (update): Draw the day at startup.
-	(gncal_day_panel_set): Fix selected-day display.
-	(gncal_day_panel_new): Switch day on double clicks, not on single
-	clicks.
-
-	* calobj.c (ical_object_compute_end): Removed debug messages.
-
-1998-04-30  Miguel de Icaza  <miguel@nuclecu.unam.mx>
-
-	* prop.c (prop_apply): Do not call prop_cancel, ths is now using
-	GnomePropertyDialog.
-
-1998-04-29  Miguel de Icaza  <miguel@nuclecu.unam.mx>
-
-	* gncal-week-view.c (sync_week): Use gnome_calendar_tag_calendar.
-
-	* gnome-cal.c (gnome_calendar_tag_calendar): New routine used to
-	fill a gtk_calendar with the events on a GnomeCalendar object.
-
-	* gncal-week-view.c (gncal_week_view_new): Set the week to the day
-	we double clicked.
-
-1998-04-28  Miguel de Icaza  <miguel@nuclecu.unam.mx>
-
-	* gnome-cal.c (calendar_notify): Apply black magic to get mail
-	notifications to work.
-
-	* gncal-full-day.c (child_focus_out): Temporary optimization, the
-	child_focus_out is constantly calling the
-	gnome_calendar_object_changed when the property editor has been
-	invoked.  This happens every time the mouse moves crosses the main
-	window.
-
-	* calendar.c (calendar_object_changed): Reschedule alarms when a
-	calendar object has changed its times.
-
-Sat Apr 25 22:20:45 1998  Havoc Pennington  <hp@pobox.com>
-
-	* eventedit.c, eventedit.h: Descend from GnomeDialog. Took vbox
-	out of class structure; use GnomeDialog vbox
-	instead. gnome_dialog_set_destroy instead of destroying in button
-	callbacks. Don't create buttons, separator, or vbox manually.
-	#include <libgnomeui/gnome-dialog.h>.
-
-1998-04-24  Miguel de Icaza  <miguel@nuclecu.unam.mx>
-
-	* calobj.c (ical_object_create_from_vobject): Fixed alarm loading;
-	Load snooze time and snooze count
-
-1998-04-23  Federico Mena Quintero  <federico@nuclecu.unam.mx>
-
-	* calendar.c (calendar_save): Actually save the to-do entries.
-
-	* gncal-todo.c (simple_todo_editor): Now you can add and edit
-	to-do entries.
-
-1998-04-22  Federico Mena Quintero  <federico@nuclecu.unam.mx>
-
-	* gncal-full-day.c: Made it use popup_menu().
-
-	* popup-menu.c: New file with utility functions for creating popup
-	menus.  Maybe such a thing would be useful in libgnomeui, a la
-	gnome-app-helper?
-
-	* Makefile.am (gnomecal_SOURCES): Added popup-menu.[ch] to the sources.
-
-1998-04-22  Miguel de Icaza  <miguel@nuclecu.unam.mx>
-
-	* prop.c (properties): Added Calendar properties editor.
-	(properties): Make the code use a propery box.
-
-	* main.c: Save/load properties (fix to old commit).
-
-1998-04-21  Federico Mena Quintero  <federico@nuclecu.unam.mx>
-
-	* gncal-todo.c: New widget for editing TODO lists.  This will be
-	worked on a lot.
-
-	* Makefile.am (gnomecal_SOURCES): Added gncal-todo.[ch] to the sources.
-
-	* gncal-day-panel.c: Make it use the new TODO widget.
-
-1998-04-21  Miguel de Icaza  <miguel@nuclecu.unam.mx>
-
-	* timeutil.c (isodate_from_time_t): Do not save with the global
-	time flag (Z at the end of the isodate).  When we figure out a way
-	to load times in GMT time, we will add this back
-
-	* view-utils.c (popup_menu): Moved this routine here as there are
-	more users of this code.
-
-	* gncal-day-view.c (gncal_day_view_class_init): Add button press
-	handler.
-	(new_appointment): New routine for creating appointments on a day.
-
-
-
-	* main.c (save_ok): Added call to gtk_window_set_wmclass.
-
-	* gncal-day-panel.c (calendar_day_selected): Fix, years for mktime
-	should substract 1900 and gtk_calendar stores years relative to
-	year 0.
-
-	* gncal-week-view.c (gncal_week_view_new): Make the week view
-	descend from VBox so that we can add a label to it.
-	(gncal_week_view_set): Display the ending day of the week
-	correctly.
-
-	Added a label that displays the week range.
-
-1998-04-21  Federico Mena Quintero  <federico@nuclecu.unam.mx>
-
-	* gnome-cal.c: Made it use GncalDayPanel.
-
-	* gncal-day-panel.c: New widget for the day view in the main
-	calendar toplevel.  It basically takes care of everything
-	gnome-cal did by hand with respect to the day view.
-
-	* Makefile.am (gnomecal_SOURCES): Added gncal-day-panel.[ch] to
-	the rules.
-
-	* main.c: Added a separator between the About menu item and the
-	help topics.
-
-1998-04-20  Miguel de Icaza  <miguel@nuclecu.unam.mx>
-
-	* eventedit.c (ee_ok): Mark the event as non-new after accepting changes.
-
-1998-04-20  Federico Mena Quintero  <federico@nuclecu.unam.mx>
-
-	* gncal-full-day.c (gncal_full_day_get_day_start_yoffset): New
-	public function that returns the y offset for the row
-	corresponding to the "day begin" time.
-
-	* gncal-full-day.c (gncal_full_day_key_press): Now any printable
-	keystroke (not just Return) will activate the selected range.
-
-	* gncal-full-day.c (paint_back): Made it use the new paint_row
-	function instead of painting everything directly.  We calculate
-	areas in a smarter way so there is even less flicker than before,
-	especially when selecting regions.
-
-	* eventedit.c: Sensitize recurrence widgets properly.
-
-	* calobj.c (duration_callback): Pass the correct pointer type to
-	is_date_in_list().
-
-1998-04-20  Miguel de Icaza  <miguel@nuclecu.unam.mx>
-
-	* calobj.c (duration_callback): Take exception dates into
-	account.
-
-	* gncal-full-day.c (new_appointment): Setup the event editor dates
-	to those of the currently displayed day.
-	(gncal_full_day_selection_range): Use sensible values in the case
-	no range is selected.
-	(new_appointment): Events now use the current day for event creation.
-
-	* view-utils.c: Pretty up the time display.
-
-	* calobj.c (ical_object_compute_end): Initialize
-	ico->recur->enddate, otherwise we loop forever during final date computation.
-
-	* eventedit.c: Now recurrence is toggled by a radio button in the
-	recurrence page, as the checkbox is confusing.
-
-	* calobj.c (is_date_in_list): Add support for the exclussion
-	dates.
-
-1998-04-18  Miguel de Icaza  <miguel@nuclecu.unam.mx>
-
-	* gncal-year-view.c (double_click): Fix this routine as well.
-
-	* gncal-week-view.c (jump_to_day): Bind the gtkcalendar signals to
-	the week.
-
-	* gncal-year-view.c (gncal_year_view_set_year): Put things in the
-	proper range.  Now the year view actually matches this year.
-
-	* gnome-cal.html: Added small documentation.
-
-	* main.c: Add more icons to the menus;  Rename some menubar
-	entries;  Add `new' icon to the toolbar.
-	(dump_events): Added argument handling and dumping of events from
-	the command line.  Extremely cool.
-
-	* getdate.y: Taken from the CVS source code.  Used for date
-	parsing in the command line.
-
-	Internationalized getdate.y.  Wee!  It even works with spanish.
-
-	* calobj.c (ical_object_to_vobject): Add Quoted printable property
-	to items containing new lines.
-	(duration): Use unsigned integers, to work around buggy calendar
-	files generated by korganizer.
-
-	* main.c (save_calendar_cmd): Do not ask for file name if we are
-	saving.
-	(save_as_calendar_cmd): New command.
-
-
-1998-04-17  Miguel de Icaza  <miguel@nuclecu.unam.mx>
-
-	* alarm.c (alarm_kill, alarm_init, alarm_add): Implement the alarm
-	management framework.
-
-1998-04-17  Federico Mena Quintero  <federico@nuclecu.unam.mx>
-
-	* calobj.c (ical_new): Added mandatory status property.
-	(ical_object_to_vobject): Only store "related" list if it exists.
-	(store_list): Add terminating null char and free the correct data.
-
-	* main.c (save_calendar_cmd): Implemented calendar saving.
-	(open_calendar_cmd): Implemented calendar loading.
-	(new_calendar_cmd): Implemented calendar creation.
-	(new_calendar): Don't load our test calendar by default.
-
-	* gncal-full-day.c (delete_appointment): Delete appointment implemented.
-
-	* eventedit.c (ee_store_recur_values_to_ical): Free/create
-	ical's recurrence appropriately.
-	(ee_rp_init_rule): Initialize all missing parameters from ical.
-	(ee_rp_init_ending_date): Initialize missing fields from ical.
-
-1998-04-17  Miguel de Icaza  <miguel@nuclecu.unam.mx>
-
-	* gnome-cal.c (gnome_calendar_remove_object): Add support for
-	removing objects.
-
-1998-04-17  Federico Mena Quintero  <federico@nuclecu.unam.mx>
-
-	* eventedit.c (ee_init_recurrence_page): New function that creates
-	the recurrence page in the toplevel notebook.
-	(ee_store_recur_values_to_ical): Now we can also store the recurrences.
-
-1998-04-17  Miguel de Icaza  <miguel@nuclecu.unam.mx>
-
-	* calobj.c (ical_object_generate_events): Implement
-	RECUR_MONTHLY_BY_POS implemented.
-	(ical_object_create_from_vobject): Fix the alarm
-	initialization code.
-	(save_alarm): Save alarms.
-	(ical_object_generate_events): Fixed the recurrent code to take
-	into account the recur->endate field (if at all specified).
-
-	(ical_object_to_vobject): Implement recurrence rule saving.
-
-1998-04-16  Federico Mena Quintero  <federico@nuclecu.unam.mx>
-
-	* eventedit.c (ee_store_alarm): Use menu_shell->children, not
-	menu->children.  Why does GtkMenu have a children field in the
-	object structure?
-	(check_dates): New function that insures that start_date < end_date.
-	(check_times): In addition to checking whether the event spans the
-	whole day, now it insures that start_time < end_time.
-
-	* gncal-full-day.c (child_set_size): Now children get bigger
-	temporarily while they are focused.  This allows the handles not
-	to "overlap" the rows used by the child and thus allow editing of
-	very thin events.
-	(recompute_motion): Fix for new child coordinates.
-	(gncal_full_day_expose): Make it use find_child_by_window()
-	instead of looking for it by hand.
-
-	* bell.xpm recur.xpm: XPM files for events with alarm and
-	recurrence, respectively.
-
-1998-04-15  Federico Mena Quintero  <federico@nuclecu.unam.mx>
-
-	* gncal-full-day.c (button_1): Preserve the up/down cursor while dragging.
-
-	* gncal-full-day.c (child_draw): Now children have a vertical
-	handle as well.  This can be used to move the child anytime, not
-	only when it is focused.
-	(recompute_motion): Modified for new drag behavior.
-
-	* eventedit.c (ee_init_general_page): The general_owner may be
-	null.  Do the proper thing when creating the label.
-	(ee_ok): Update the gnome calendar appropriately.
-
-	* timeutil.h:
-	* gncal-year-view.h: Add some missing prototypes.
-
-	* gncal-full-day.c (child_popup_menu): Set the sensitivity of menu
-	items according to whether the ical object is being edited or not.
-
-	* eventedit.c (event_editor_new): Set the "being edited" flag on
-	the ical object (stored as the ical object's user data).
-	(event_editor_destroy): Release the flag.
-
-	* calobj.h: The iCalObject structure now has a generic user_data pointer.
-	* calobj.c (ical_object_set_user_data ical_object_get_user_data):
-	Functions to set this data.
-
-	* gncal-full-day.c (child_button_press): Do child popup menu correctly.
-
-	* main.c (about_calendar_cmd): Fixed my address and added Arturo
-	to the authors in the about box.
-
-	* gncal-full-day.c (find_child_by_window): Compare child's widget
-	windows by user_data (which will be the parent widget, that is,
-	the text widget).  We cannot assume that child->widget->window
-	will be *the* window we are interested on because there may be
-	child widgets with multiple windows.
-
-1998-04-15  Miguel de Icaza  <miguel@nuclecu.unam.mx>
-
-	* calobj.c (ical_foreach): Define iterator routine.
-
-1998-04-15  Arturo Espinosa Aldama  <arturo@nuclecu.unam.mx>
-
-	* gncal-year-view.[hc]: Now using time_t for new and set.
-	  Random fixes, as well.
-
-1998-04-15  Federico Mena Quintero  <federico@nuclecu.unam.mx>
-
-	* gncal-full-day.c (button_3): New popup menus activated with
-	mouse button 3.
-	(create_appointment): Create a new appointment from the popup
-	menus.  See the FIXME.
-
-1998-04-15  Miguel de Icaza  <miguel@nuclecu.unam.mx>
-
-	* gncal-full-day.c (layout_kill_rows): Routine to destory rows
-	array properly.
-
-	* gncal-year-view.c (gncal_year_view_new): Add missing year in
-	call to strftime.
-
-	* calobj.c (ical_object_create_from_vobject): Fixed memory leaks
-	from the return values of versit's fakeCString.
-
-1998-04-14  Arturo Espinosa Aldama  <arturo@nuclecu.unam.mx>
-
-	* gncal-year-view.[hc]: New widget for the year view.
-	* Makefile.am: added required compilation of the new files.
-
-1998-04-14  Federico Mena Quintero  <federico@nuclecu.unam.mx>
-
-	* eventedit.c (event_editor_setup_time_frame): Fixed some table
-	expansions to make the dialog look nicer when resized.
-
-	* calobj.c (ignore_space): Fixed compiler warning about unused
-	computed value.
-	(ocurrencelist): Replace str by p confusion.  Removed unused
-	variables value and q.
-	(daynumber): Fixed a couple of warnings about unused values.
-	(load_recurrence): Removed unused variable c.  Added a default
-	clause to the switch(type).
-
-	* eventedit.c (ee_rp_init_frequency): Removed unused variable content.
-	Fixed a compiler warning by adding a missing cast.
-
-	* calobj.c (ical_object_create_from_vobject): Make the
-	load_recurrence() part work correctly.  Eliminated use of
-	syntax_error variable.
-
-1998-04-13  Federico Mena Quintero  <federico@nuclecu.unam.mx>
-
-	* gncal-full-day.c (child_key_press): Unfocus the child and focus
-	the parent fullday widget when the user presses Esc.
-
-	* gncal-week-view.c (gncal_week_view_update): Now takes object and
-	flags parameters.
-	* gncal-day-view.c (gncal_day_view_update): Likewise.
-	* gncal-full-day.c (gncal_full_day_update): Likewise.
-	(child_focus_in): New function.  In conjunction with
-	child_focus_out(), these only display the handles in the child
-	when it is focused.  The result is that the user can see more of
-	the child's text when nothing is focused, and we can also display
-	fatter and nicer drag handles.
-
-	* gnome-cal.c (gnome_calendar_object_changed): Now takes an
-	additional flags parameter
-	(gnome_calendar_update_all): Made function static.  Now takes
-	changed object and flags parameters as well.
-	(gnome_calendar_object_changed): Now takes additional flags
-	parameter to indicate what changed in the specified object.
-
-	* calobj.h (CalObjectChange): New enum with flags to describe what
-	has been changed in an object.
-
-	* gncal-full-day.h:
-	* gncal-full-day.c (gncal_full_day_focus_child): New function to
-	let the outside world decide which child to focus.
-	(gncal_full_day_focus_child): Bleah.  We have to synthesize a
-	click because GtkText will not set the cursor when you focus it.
-
-	* gnome-cal.c (day_view_range_activated): Focus the new child in
-	the full day widget.
-
-	* eventedit.c (event_editor_setup_time_frame): Re-aligned some
-	widgets to make it look prettier.
-	(ee_alarm_widgets): Likewise.
-	(ee_init_general_page): Likewise.
-	(ee_classification_widgets): Likewise.
-	(event_editor_init_widgets): Likewise.
-
-	* gnome-cal.c (day_view_range_activated): Create new object and
-	add it to the calendar.  You can now select a range in the
-	full-day view, hit Return, and a new event will be added at the
-	selected range.  I still have to figure out how to focus this new child.
-
-	* gncal-full-day.c (paint_back): Rewrote function to avoid
-	painting an area more than once -- eliminate flicker.
-	(paint_back_rows): New function that calls paint_back() only for
-	the area of the specified rows.
-	(gncal_full_day_button_press):
-	(gncal_full_day_button_release):
-	(gncal_full_day_motion): Made these functions use
-	paint_back_rows() instead of paint_back(), to eliminate flicker.  Wheee!
-
-1998-04-12  Federico Mena Quintero  <federico@nuclecu.unam.mx>
-
-	* gnome-cal.c (setup_day_view): We now connect to the
-	range_activated signal of the fullday widget instead of catching
-	key presses ourselves.
-	(day_view_range_activated): New function that creates a new
-	iCalObject and inserts it into the calendar, not finished yet.
-
-1998-04-11  Federico Mena Quintero  <federico@nuclecu.unam.mx>
-
-	* gncal-full-day.c (get_time_from_rows): New function, calculates
-	a pair of time_t values from the specified start and number of rows.
-
-	* gncal-full-day.h (GncalFullDayClass): New signal
-	"range_activated".  It is emitted when a range is selected and the
-	user hits Return.
-	(gncal_full_day_selection_range): New function, returns the
-	selected range.
-
-	* gncal-full-day.c (struct drag_info): Moved selection information
-	to their own fields instead of sharing the child's drag fields.
-	This allows us to keep the selection when a child is moved.
-	(recompute_motion): Made the case when (row < di->sel_click_row)
-	work correctly.
-
-1998-04-11  Miguel de Icaza  <miguel@nuclecu.unam.mx>
-
-	* gnome-cal.c (gnome_calendar_goto): Add support for navigating
-	on the day view.
-
-	* timeutil.c (time_start_of_day, time_end_of_day, time_day_hour):
-	New time manipulation functions.
-
-	* eventedit.c (ee_rp_init_frequency): Add the different frequency
-	editors to a notebook.  Make the notebook startup on the entry
-	selected recurrence type;
-
-1998-04-11  Federico Mena Quintero  <federico@nuclecu.unam.mx>
-
-	* gncal-full-day.c (recompute_motion): Now we support selecting a
-	range in the main window (by clicking+dragging).  It flickers
-	horribly and is not perfect, but it is a start.
-
-1998-04-09  Federico Mena Quintero  <federico@nuclecu.unam.mx>
-
-	* gncal-full-day.c: #include <string.h>
-
-	* gncal-full-day.c (child_map): Show instead of just map the child
-	widget (otherwise the text widget gets confused and will not focus).
-
-	* calobj.c (ical_object_to_vobject): Quote chars as 'x', not "x".
-
-	* calobj.h: Added prototype for ical_object_to_vobject().
-
-	* gnome-cal.c (gnome_calendar_object_changed): New function.  This
-	should be called when a calendar object is changed.
-
-	* gncal-full-day.c (update_from_drag_info): Call
-	gnome_calendar_object_changed() instead of updating manually.
-
-	* calendar.c (calendar_add_object):
-	(calendar_remove_object): Set the modified flag to true.
-
-	* gncal-full-day.c (gncal_full_day_draw): Finished implementing
-	this function.
-
-1998-04-08  Raja R Harinath  <harinath@cs.umn.edu>
-
-	* gncal.c (update_calendar): Say `#if 0', not `#ifdef 0'.
-
-1998-04-07  Federico Mena Quintero  <federico@nuclecu.unam.mx>
-
-	* eventedit.c: Removed unused global variable parent_class.
-
-	* eventedit.h: Renamed gtk_window field to window.
-	Made the parent_class field in the EventEditorClass structure be a
-	GtkWindowClass, not a gnome property box class.
-	Added prototype for event_editor_get_type().
-
-1998-04-06  Federico Mena Quintero  <federico@nuclecu.unam.mx>
-
-	* gncal-week-view.c (gncal_week_view_new): Use the new
-	gtk_table_set_homogeneous() instead of setting the variable directly.
-
-1998-04-03  Federico Mena Quintero  <federico@nuclecu.unam.mx>
-
-	* eventedit.c (ee_create_ae): Make it return void.
-	(ee_alarm_widgets): Remove some unused variables.
-	(ee_store_alarm): Make it return void.
-	#include <string.h>
-
-	* eventedit.h: #include "gnome-cal.h"
-
-	* calobj.c (list_free): Don't use g_free in the g_list_foreach.
-
-	* calendar.h: Add prototype for calendar_load().
-
-	* timeutil.h: Add prototypes for time_add_*().
-
-	* calendar.c:
-	* calobj.c:
-	* eventedit.c:
-	* gnome-cal.c: #include "timeutil.h"
-
-	* gncal-day-view.c (gncal_day_view_size_request): Make the minimum
-	width equal or larger to the title width.
-
-	* main.c: #include "eventedit.h"
-	(main): Add a return statement.
-	(new_calendar): Show stuff *after* the calendar has been loaded.
-
-	* gnome-cal.c (gnome_calendar_load): Update the day view.
-	(setup_widgets): Hackish setup of a day view widget - will fix later.
-	(gnome_calendar_init): Initialize all fields.
-
-	* gnome-cal.h: Added day_view field.  Maybe this should be changed
-	when the a complete day view panel is complete.
-
-	* gncal-day-view.c (gncal_day_view_update): Draw after update, not
-	before.
-
-1998-04-06  Carsten Schaar  <nhadcasc@fs-maphy.uni-hannover.de>
-
-	* versit/.cvsignore: New file.
-
-Fri Apr  3 22:31:54 1998  Tom Tromey  <tromey@cygnus.com>
-
-	* calendar.c: Include <config.h>.
-
-1998-04-03  Miguel de Icaza  <miguel@nuclecu.unam.mx>
-
-	* timeutil.c (time_add_year, time_add_year, time_add_week):
-	Routines for time manipulation.
-
-	* calobj.c (ical_object_destroy): Full destruction of the object.
-
-	* eventedit.c: Finished the main event editor form;  It still
-	lacks the details and the recurrence bits.  It now adds events
-	and cancels.
-
-1998-04-03  Federico Mena Quintero  <federico@nuclecu.unam.mx>
-
-	* view-utils.c (view_utils_draw_events): The "better" format
-	string for strftime() wasn't better, after all :-(
-
-1998-04-02  Federico Mena Quintero  <federico@nuclecu.unam.mx>
-
-	* gncal-full-day.c: New full-day widget.  It is still a work in
-	progress.  It will be similar to M$ Schedule's nifty full day view
-	widget, but with Gtk's elegance :-)
-
-	* Makefile.am (gnomecal_SOURCES): Added gncal-full-day.[ch] to the sources.
-
-1998-04-02  Miguel de Icaza  <miguel@nuclecu.unam.mx>
-
-	* eventedit.c: Object editor widget.  We dropped ObjEdit.
-
-	* timeutil.c (time_from_isodate): Fix.
-
-	* view-utils.c (view_utils_draw_events): Changed the display
-	formats.
-
-1998-04-02  Federico Mena Quintero  <federico@nuclecu.unam.mx>
-
-	* view-utils.c (view_utils_draw_events): Use better format
-	specifier for strftime().
-	(view_utils_draw_textured_frame): Ultra-nifty function to draw
-	textured "metal" frames, like Netscape's handles.
-
-1998-04-02  Miguel de Icaza  <miguel@nuclecu.unam.mx>
-
-	* gncal-day-view.c (gncal_day_view_update): Day events are now
-	cached inside the widget.  They get initialized at this time.
-
-	* view-utils.c (view_utils_draw_events): Use the list of events.
-
-1998-04-02  Federico Mena Quintero  <federico@nuclecu.unam.mx>
-
-	* gncal-day-view.c (gncal_day_view_set_shadow): New customization
-	function.  We can't decide on a stupid border type :-)
-	(gncal_day_view_init): Made GTK_SHADOW_ETCHED_IN be the default
-	shadow type.  Looks good.
-
-1998-04-02  Miguel de Icaza  <miguel@nuclecu.unam.mx>
-
-	* main.c: New main program that uses our new datatypes and
-	objects.
-
-	* calendar.c (calendar_load_from_vobject, calendar_load):
-	Implement loading of vCalendar objects and vCalendar files.
-
-	* calobj.c (ical_object_create_from_vobject): Implement loading of
-	vCalendar event and todo objects.
-
-	* timeutil.c (isodate_from_time_t): New function.
-
-	* gnome-cal.c, gnome-cal.h: Implement a toplevel widget, derived
-	from GnomeApp.  It holds all of the day views and arbitrates the
-	display.
-
-1998-04-02  Federico Mena Quintero  <federico@nuclecu.unam.mx>
-
-	* gncal-week-view.[ch]: New week view composite widget.  This
-	provides a full week view (7 day views plus busy time display --
-	the latter is currently unimplemented).
-
-1998-04-01  Federico Mena Quintero  <federico@nuclecu.unam.mx>
-
-	* gncal-day-view.c: New day view widget.  It is intended to be a
-	child widget of the week view composite widget.
-
-	* calendar.c (calendar_get_objects_in_range):
-	(calendar_get_events_in_range):
-	(calendar_get_journal_in_range):
-	(calendar_get_journal_in_range): These functions now take a
-	sort_func parameter, which is of type GCompareFunc.  If the
-	specified value is non-NULL, it will return a sorted list.
-	Otherwise, it will return an unordered list.
-	(calendar_compare_by_dtstart): Provide a generic sorting routine
-	for calendar objects.
-
-1998-04-01 Miguel de Icaza <miguel@kernel.org>
-
-	* Start from scratch
-
-Tue Mar 31 23:46:50 1998  Tom Tromey  <tromey@cygnus.com>
-
-	* timeutil.c (format_simple_hour): `buf' now static.
-
-1998-03-31  Federico Mena Quintero  <federico@nuclecu.unam.mx>
-
-	* gncal.c: Removed #include "gtkcalendar.h", because it now comes
-	from libgnomeui.
-
-	* Makefile.am (gncal_SOURCES): Added new source files to the rules.
-
-	* timeutil.c (format_simple_hour): New function, formats an
-	hour/am_pm pair into a string of the form "3am", "12pm", "05h",
-	"19h", etc.  It is used by the day view widget for its labels.
-
-1998-03-31 Craig Small <csmall@small.dropbear.id.au>
-
-	* Now has (non working) session maangement
-	* Uses a clist for the dailylist like gtt
-
-Sat Mar 21 15:43:20 1998  Tom Tromey  <tromey@cygnus.com>
-
-	* gncal.c: Use gnome_message_box_*, not gnome_messagebox_*.
-
-1998-03-12  Craig Small <csmall@small.dropbear.id.au>
-
-	* Now linked (in some horrible way) to the gtkcalendar widget.
-
-Sun Mar  8 16:38:10 1998  Tom Tromey  <tromey@cygnus.com>
-
-	* Makefile.am (INCLUDES): Added GNOME_INCLUDEDIR.
-	(gncal_LDADD): Don't include libsupport.a.
-
-	* gncal.c (main): Use new gnome_init.
-
-1998-02-19  Federico Mena Quintero  <federico@nuclecu.unam.mx>
-
-	* gncal.c (main): Added app_id "gncal".
-
-1998-02-19  Carsten Schaar  <nhadcasc@fs-maphy.uni-hannover.de>
-
-	* Makefile.am (gncal_LDADD): Added '$(INTLLIBS)'
-
-1998-02-18  Raja R Harinath  <harinath@cs.umn.edu>
-
-	* Makefile.am (gncal_LDADD): Include `libsupport.a'.
-
-	* calcs.c (month_atoi): Replace buggy explicit loop string compare
-	with strcasecmp.
-	(day_atoi): Likewise.
-
-Sun Jan 25 23:38:30 1998  Miguel de Icaza  <miguel@nuclecu.unam.mx>
-
-	* menus.c: Replace "Quit" with "Exit".
diff --git a/calendar/Makefile.am b/calendar/Makefile.am
deleted file mode 100644
index 56acae59c8..0000000000
--- a/calendar/Makefile.am
+++ /dev/null
@@ -1,25 +0,0 @@
-if ENABLE_PILOT_CONDUITS
-CONDUIT_DIR = conduits
-else
-CONDUIT_DIR =
-endif
-
-SUBDIRS = idl common gui importers $(CONDUIT_DIR)
-
-error_DATA = calendar-errors.xml
-error_i18n = $(error_DATA:.xml=.xml.h)
-errordir = $(privdatadir)/errors
-%.xml.h: %.xml
-	$(top_builddir)/e-util/e-error-tool $^
-
-EXTRA_DIST =			\
-	ChangeLog.pre-1-4	\
-	$(error_DATA)		\
-	zones.h
-
-dist-hook:
-	cd $(distdir); rm -f $(BUILT_SOURCES)
-
-BUILT_SOURCES = $(error_i18n)
-
-CLEANFILES = $(BUILT_SOURCES)
diff --git a/calendar/calendar-errors.xml b/calendar/calendar-errors.xml
deleted file mode 100644
index 68707787fe..0000000000
--- a/calendar/calendar-errors.xml
+++ /dev/null
@@ -1,212 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<error-list domain="calendar">
-
- <error id="prompt-cancel-meeting" type="question" defult="GTK_RESPONSE_YES">
-  <primary>Would you like to send all the participants a cancellation notice?</primary>
-  <secondary>If you don't send a cancellation notice, the other participants may not know the meeting is canceled.</secondary>
-  <button label="Don't Send" response="GTK_RESPONSE_NO"/>
-  <button label="Send Notice" response="GTK_RESPONSE_YES"/>
- </error>
-
- <error id="prompt-delete-meeting" type="question" defult="GTK_RESPONSE_NO">
-  <primary>Are you sure you want to delete this meeting?</primary>
-  <secondary>All information on this meeting will be deleted and can not be restored.</secondary>
-  <button stock="gtk-cancel" response="GTK_RESPONSE_NO"/>
-  <button stock="gtk-delete" response="GTK_RESPONSE_YES"/>
- </error>
-
- <error id="prompt-cancel-task" type="question" defult="GTK_RESPONSE_YES">
-  <primary>Would you like to send all the participants a cancellation notice?</primary>
-  <secondary>If you don't send a cancellation notice, the other participants may not know the task has been deleted.</secondary>
-  <button label="Don't Send" response="GTK_RESPONSE_NO"/>
-  <button label="Send Notice" response="GTK_RESPONSE_YES"/>
- </error>
-
- <error id="prompt-delete-task" type="question" defult="GTK_RESPONSE_NO">
-  <primary>Are you sure you want to delete this task?</primary>
-  <secondary>All information on this task will be deleted and can not be restored.</secondary>
-  <button stock="gtk-cancel" response="GTK_RESPONSE_NO"/>
-  <button stock="gtk-delete" response="GTK_RESPONSE_YES"/>
- </error>
-
- <error id="prompt-cancel-journal" type="question" defult="GTK_RESPONSE_YES">
-  <primary>Would you like to send a cancellation notice for this journal entry?</primary>
-  <secondary>If you don't send a cancellation notice, the other participants may not know the journal has been deleted.</secondary>
-  <button label="Don't Send" response="GTK_RESPONSE_NO"/>
-  <button label="Send Notice" response="GTK_RESPONSE_YES"/>
- </error>
-
- <error id="prompt-delete-journal" type="question" defult="GTK_RESPONSE_NO">
-  <primary>Are you sure you want to delete this journal entry?</primary>
-  <secondary>All information on this journal entry will be deleted and can not be restored.</secondary>
-  <button stock="gtk-cancel" response="GTK_RESPONSE_NO"/>
-  <button stock="gtk-delete" response="GTK_RESPONSE_YES"/>
- </error>
-
- <error id="prompt-delete-titled-appointment" type="question" default="GTK_RESPONSE_NO">
-  <primary>Are you sure you want to delete the appointment titled '{0}'?</primary>
-  <secondary>All information on this appointment will be deleted and can not be restored.</secondary>
-  <button stock="gtk-cancel" response="GTK_RESPONSE_NO"/>
-  <button stock="gtk-delete" response="GTK_RESPONSE_YES"/>
- </error>
-
- <error id="prompt-delete-appointment" type="question" default="GTK_RESPONSE_NO">
-  <primary>Are you sure you want to delete this appointment?</primary>
-  <secondary>All information on this appointment will be deleted and can not be restored.</secondary>
-  <button stock="gtk-cancel" response="GTK_RESPONSE_NO"/>
-  <button stock="gtk-delete" response="GTK_RESPONSE_YES"/>
- </error>
-
- <error id="prompt-delete-named-task" type="question" default="GTK_RESPONSE_NO">
-  <primary>Are you sure you want to delete the '{0}' task?</primary>
-  <secondary>All information on this task will be deleted and can not be restored.</secondary>
-  <button stock="gtk-cancel" response="GTK_RESPONSE_NO"/>
-  <button stock="gtk-delete" response="GTK_RESPONSE_YES"/>
- </error>
-
- <error id="prompt-delete-task" type="question" default="GTK_RESPONSE_NO">
-  <primary>Are you sure you want to delete this task?</primary>
-  <secondary>All information on this task will be deleted and can not be restored.</secondary>
-  <button stock="gtk-cancel" response="GTK_RESPONSE_NO"/>
-  <button stock="gtk-delete" response="GTK_RESPONSE_YES"/>
- </error>
-
- <error id="prompt-delete-named-journal" type="question" default="GTK_RESPONSE_NO">
-  <primary>Are you sure you want to delete the journal entry '{0}'?</primary>
-  <secondary>All information in this journal will be deleted and can not be restored.</secondary>
-  <button stock="gtk-cancel" response="GTK_RESPONSE_NO"/>
-  <button stock="gtk-delete" response="GTK_RESPONSE_YES"/>
- </error>
-
- <error id="prompt-delete-journal" type="question" default="GTK_RESPONSE_NO">
-  <primary>Are you sure you want to delete this journal entry?</primary>
-  <secondary>All information in this journal will be deleted and can not be restored.</secondary>
-  <button stock="gtk-cancel" response="GTK_RESPONSE_NO"/>
-  <button stock="gtk-delete" response="GTK_RESPONSE_YES"/>
- </error>
-
- <error id="prompt-delete-appointments" type="question" default="GTK_RESPONSE_NO">
-  <primary>Are you sure you want to delete these {0} appointments?</primary>
-  <secondary>All information on these appointments will be deleted and can not be restored.</secondary>
-  <button stock="gtk-cancel" response="GTK_RESPONSE_NO"/>
-  <button stock="gtk-delete" response="GTK_RESPONSE_YES"/>
- </error>
-
- <error id="prompt-delete-tasks" type="question" default="GTK_RESPONSE_NO">
-  <primary>Are you sure you want to delete these {0} tasks?</primary>
-  <secondary>All information on these tasks will be deleted and can not be restored.</secondary>
-  <button stock="gtk-cancel" response="GTK_RESPONSE_NO"/>
-  <button stock="gtk-delete" response="GTK_RESPONSE_YES"/>
- </error>
-
- <error id="prompt-delete-journals" type="question" default="GTK_RESPONSE_NO">
-  <primary>Are you sure you want to delete these {0} journal entries?</primary>
-  <secondary>All information in these journal entries will be deleted and can not be restored.</secondary>
-  <button stock="gtk-cancel" response="GTK_RESPONSE_NO"/>
-  <button stock="gtk-delete" response="GTK_RESPONSE_YES"/>
- </error>
-
- <error id="prompt-save-appointment" type="question" default="GTK_RESPONSE_YES">
-  <title>Save Appointment</title>
-  <primary>Would you like to save your changes to this appointment?</primary>
-  <secondary>You have made changes to this appointment, but not yet saved them.</secondary>
-  <button label="Discard Changes" response="GTK_RESPONSE_NO"/>
-  <button stock="gtk-cancel" response="GTK_RESPONSE_CANCEL"/>
-  <button label="Save Changes" response="GTK_RESPONSE_YES"/>
- </error>
-
- <error id="prompt-save-task" type="question" default="GTK_RESPONSE_YES">
- <title>Save Task</title>
- <primary>Would you like to save your changes to this task?</primary>
- <secondary>You have made changes to this task, but not yet saved them.</secondary>
- <button label="Discard Changes" response="GTK_RESPONSE_NO"/>
- <button stock="gtk-cancel" response="GTK_RESPONSE_CANCEL"/>
- <button label="Save Changes" response="GTK_RESPONSE_YES"/>
- </error>
-	      
- <error id="prompt-meeting-invite" type="question" default="GTK_RESPONSE_YES">
-  <primary>Would you like to send meeting invitations to participants?</primary>
-  <secondary>Email invitations will be sent to all participants and allow them to RSVP.</secondary>
-  <button label="Don't Send" response="GTK_RESPONSE_NO"/>
-  <button label="Send" response="GTK_RESPONSE_YES"/>
- </error>
-
- <error id="prompt-send-updated-meeting-info" type="question" default="GTK_RESPONSE_YES">
-  <primary>Would you like to send updated meeting information to participants?</primary>
-  <secondary>Sending updated information allows other participants to keep their calendars up to date.</secondary>
-  <button label="Don't Send" response="GTK_RESPONSE_NO"/>
-  <button label="Send" response="GTK_RESPONSE_YES"/>
- </error>
-
-
- <error id="prompt-send-task" type="question" default="GTK_RESPONSE_YES">
-  <primary>Would you like to send this task to participants?</primary>
-  <secondary>Email invitations will be sent to all participants and allow them to accept this task.</secondary>
-  <button label="Don't Send" response="GTK_RESPONSE_NO"/>
-  <button label="Send" response="GTK_RESPONSE_YES"/>
- </error>
-
- <error id="prompt-send-updated-task-info" type="question" default="GTK_RESPONSE_YES">
-  <primary>Would you like to send updated task information to participants?</primary>
-  <secondary>Sending updated information allows other participants to keep their task lists up to date.</secondary>
-  <button label="Don't Send" response="GTK_RESPONSE_NO"/>
-  <button label="Send" response="GTK_RESPONSE_YES"/>
- </error>
-
- <error id="tasks-crashed" type="error">
-  <primary>The Evolution tasks have quit unexpectedly.</primary>
-  <secondary>Your tasks will not be available until Evolution is restarted.</secondary>
- </error>
-
- <error id="calendar-crashed" type="error">
-  <primary>The Evolution calendar has quit unexpectedly.</primary>
-  <secondary>Your calendars will not be available until Evolution is restarted.</secondary>
- </error>
-
- <error id="prompt-delete-calendar" type="question" modal="true" default="GTK_RESPONSE_CANCEL">
-  <primary>Delete calendar '{0}'?</primary>
-  <secondary>This calendar will be removed permanently.</secondary>
-  <button stock="gtk-cancel" response="GTK_RESPONSE_CANCEL"/>
-  <button stock="gtk-delete" response="GTK_RESPONSE_YES"/>
- </error>
-
- <error id="prompt-delete-task-list" type="question" modal="true" default="GTK_RESPONSE_CANCEL">
-  <primary>Delete task list '{0}'?</primary>
-  <secondary>This task list will be removed permanently.</secondary>
-  <button stock="gtk-cancel" response="GTK_RESPONSE_CANCEL"/>
-  <button stock="gtk-delete" response="GTK_RESPONSE_YES"/>
- </error>
- 
- <error id="prompt-send-no-subject-calendar" type="question" default="GTK_RESPONSE_YES">
-  <primary>Are you sure you want to send the appointment without a summary?</primary>
-  <secondary>Adding a meaningful Summary to your appointment will give your recipients an idea of what your appointment is about.</secondary>
-  <button stock="gtk-cancel" response="GTK_RESPONSE_CANCEL"/>
-  <button label="_Send" response="GTK_RESPONSE_YES"/>
- </error>
-
- <error id="prompt-send-no-subject-task" type="question" default="GTK_RESPONSE_YES">
-  <primary>Are you sure you want to send the task without a summary?</primary>
-  <secondary>Adding a meaningful Summary to your task will give your recipients an idea of what your task is about.</secondary>
-  <button stock="gtk-cancel" response="GTK_RESPONSE_CANCEL"/>
-  <button label="_Send" response="GTK_RESPONSE_YES"/>
- </error>
-
- <error id="prompt-no-contents-offline-calendar" type="error" default="GTK_RESPONSE_YES">
-  <primary>Error loading calendar</primary>
-  <secondary>The calendar is not marked for offline usage</secondary>
-  <button stock ="gtk-ok" response="GTK_RESPONSE_YES"/>
- </error>
- 
- <error id="prompt-no-contents-offline-tasks" type="error" default="GTK_RESPONSE_YES">
-  <primary>Error loading task list</primary>
-  <secondary>The task list is not marked for offline usage</secondary>
-  <button stock ="gtk-ok" response="GTK_RESPONSE_YES"/>
- </error>
-
- <error id="server-version" type="warning">
-	 <title>Server Version</title> 
-	 <primary>Your server needs to be updated</primary>
-	 <secondary>Some features may not work correctly with your current server version </secondary>
- </error>
-
-</error-list>
diff --git a/calendar/calendar-errors.xml.h b/calendar/calendar-errors.xml.h
deleted file mode 100644
index cec7a7a993..0000000000
--- a/calendar/calendar-errors.xml.h
+++ /dev/null
@@ -1,146 +0,0 @@
-/* calendar:prompt-cancel-meeting primary */
-char *s = N_("Would you like to send all the participants a cancellation notice?");
-/* calendar:prompt-cancel-meeting secondary */
-char *s = N_("If you don't send a cancellation notice, the other participants may not know the meeting is canceled.");
-char *s = N_("Don't Send");
-char *s = N_("Send Notice");
-/* calendar:prompt-delete-meeting primary */
-char *s = N_("Are you sure you want to delete this meeting?");
-/* calendar:prompt-delete-meeting secondary */
-char *s = N_("All information on this meeting will be deleted and can not be restored.");
-/* calendar:prompt-cancel-task primary */
-char *s = N_("Would you like to send all the participants a cancellation notice?");
-/* calendar:prompt-cancel-task secondary */
-char *s = N_("If you don't send a cancellation notice, the other participants may not know the task has been deleted.");
-char *s = N_("Don't Send");
-char *s = N_("Send Notice");
-/* calendar:prompt-delete-task primary */
-char *s = N_("Are you sure you want to delete this task?");
-/* calendar:prompt-delete-task secondary */
-char *s = N_("All information on this task will be deleted and can not be restored.");
-/* calendar:prompt-cancel-journal primary */
-char *s = N_("Would you like to send a cancellation notice for this journal entry?");
-/* calendar:prompt-cancel-journal secondary */
-char *s = N_("If you don't send a cancellation notice, the other participants may not know the journal has been deleted.");
-char *s = N_("Don't Send");
-char *s = N_("Send Notice");
-/* calendar:prompt-delete-journal primary */
-char *s = N_("Are you sure you want to delete this journal entry?");
-/* calendar:prompt-delete-journal secondary */
-char *s = N_("All information on this journal entry will be deleted and can not be restored.");
-/* calendar:prompt-delete-titled-appointment primary */
-char *s = N_("Are you sure you want to delete the appointment titled '{0}'?");
-/* calendar:prompt-delete-titled-appointment secondary */
-char *s = N_("All information on this appointment will be deleted and can not be restored.");
-/* calendar:prompt-delete-appointment primary */
-char *s = N_("Are you sure you want to delete this appointment?");
-/* calendar:prompt-delete-appointment secondary */
-char *s = N_("All information on this appointment will be deleted and can not be restored.");
-/* calendar:prompt-delete-named-task primary */
-char *s = N_("Are you sure you want to delete the '{0}' task?");
-/* calendar:prompt-delete-named-task secondary */
-char *s = N_("All information on this task will be deleted and can not be restored.");
-/* calendar:prompt-delete-task primary */
-char *s = N_("Are you sure you want to delete this task?");
-/* calendar:prompt-delete-task secondary */
-char *s = N_("All information on this task will be deleted and can not be restored.");
-/* calendar:prompt-delete-named-journal primary */
-char *s = N_("Are you sure you want to delete the journal entry '{0}'?");
-/* calendar:prompt-delete-named-journal secondary */
-char *s = N_("All information in this journal will be deleted and can not be restored.");
-/* calendar:prompt-delete-journal primary */
-char *s = N_("Are you sure you want to delete this journal entry?");
-/* calendar:prompt-delete-journal secondary */
-char *s = N_("All information in this journal will be deleted and can not be restored.");
-/* calendar:prompt-delete-appointments primary */
-char *s = N_("Are you sure you want to delete these {0} appointments?");
-/* calendar:prompt-delete-appointments secondary */
-char *s = N_("All information on these appointments will be deleted and can not be restored.");
-/* calendar:prompt-delete-tasks primary */
-char *s = N_("Are you sure you want to delete these {0} tasks?");
-/* calendar:prompt-delete-tasks secondary */
-char *s = N_("All information on these tasks will be deleted and can not be restored.");
-/* calendar:prompt-delete-journals primary */
-char *s = N_("Are you sure you want to delete these {0} journal entries?");
-/* calendar:prompt-delete-journals secondary */
-char *s = N_("All information in these journal entries will be deleted and can not be restored.");
-/* calendar:prompt-save-appointment title */
-char *s = N_("Save Appointment");
-/* calendar:prompt-save-appointment primary */
-char *s = N_("Would you like to save your changes to this appointment?");
-/* calendar:prompt-save-appointment secondary */
-char *s = N_("You have made changes to this appointment, but not yet saved them.");
-char *s = N_("Discard Changes");
-char *s = N_("Save Changes");
-/* calendar:prompt-save-task title */
-char *s = N_("Save Task");
-/* calendar:prompt-save-task primary */
-char *s = N_("Would you like to save your changes to this task?");
-/* calendar:prompt-save-task secondary */
-char *s = N_("You have made changes to this task, but not yet saved them.");
-char *s = N_("Discard Changes");
-char *s = N_("Save Changes");
-/* calendar:prompt-meeting-invite primary */
-char *s = N_("Would you like to send meeting invitations to participants?");
-/* calendar:prompt-meeting-invite secondary */
-char *s = N_("Email invitations will be sent to all participants and allow them to RSVP.");
-char *s = N_("Don't Send");
-char *s = N_("Send");
-/* calendar:prompt-send-updated-meeting-info primary */
-char *s = N_("Would you like to send updated meeting information to participants?");
-/* calendar:prompt-send-updated-meeting-info secondary */
-char *s = N_("Sending updated information allows other participants to keep their calendars up to date.");
-char *s = N_("Don't Send");
-char *s = N_("Send");
-/* calendar:prompt-send-task primary */
-char *s = N_("Would you like to send this task to participants?");
-/* calendar:prompt-send-task secondary */
-char *s = N_("Email invitations will be sent to all participants and allow them to accept this task.");
-char *s = N_("Don't Send");
-char *s = N_("Send");
-/* calendar:prompt-send-updated-task-info primary */
-char *s = N_("Would you like to send updated task information to participants?");
-/* calendar:prompt-send-updated-task-info secondary */
-char *s = N_("Sending updated information allows other participants to keep their task lists up to date.");
-char *s = N_("Don't Send");
-char *s = N_("Send");
-/* calendar:tasks-crashed primary */
-char *s = N_("The Evolution tasks have quit unexpectedly.");
-/* calendar:tasks-crashed secondary */
-char *s = N_("Your tasks will not be available until Evolution is restarted.");
-/* calendar:calendar-crashed primary */
-char *s = N_("The Evolution calendar has quit unexpectedly.");
-/* calendar:calendar-crashed secondary */
-char *s = N_("Your calendars will not be available until Evolution is restarted.");
-/* calendar:prompt-delete-calendar primary */
-char *s = N_("Delete calendar '{0}'?");
-/* calendar:prompt-delete-calendar secondary */
-char *s = N_("This calendar will be removed permanently.");
-/* calendar:prompt-delete-task-list primary */
-char *s = N_("Delete task list '{0}'?");
-/* calendar:prompt-delete-task-list secondary */
-char *s = N_("This task list will be removed permanently.");
-/* calendar:prompt-send-no-subject-calendar primary */
-char *s = N_("Are you sure you want to send the appointment without a summary?");
-/* calendar:prompt-send-no-subject-calendar secondary */
-char *s = N_("Adding a meaningful Summary to your appointment will give your recipients an idea of what your appointment is about.");
-char *s = N_("_Send");
-/* calendar:prompt-send-no-subject-task primary */
-char *s = N_("Are you sure you want to send the task without a summary?");
-/* calendar:prompt-send-no-subject-task secondary */
-char *s = N_("Adding a meaningful Summary to your task will give your recipients an idea of what your task is about.");
-char *s = N_("_Send");
-/* calendar:prompt-no-contents-offline-calendar primary */
-char *s = N_("Error loading calendar");
-/* calendar:prompt-no-contents-offline-calendar secondary */
-char *s = N_("The calendar is not marked for offline usage");
-/* calendar:prompt-no-contents-offline-tasks primary */
-char *s = N_("Error loading task list");
-/* calendar:prompt-no-contents-offline-tasks secondary */
-char *s = N_("The task list is not marked for offline usage");
-/* calendar:server-version title */
-char *s = N_("Server Version");
-/* calendar:server-version primary */
-char *s = N_("Your server needs to be updated");
-/* calendar:server-version secondary */
-char *s = N_("Some features may not work correctly with your current server version ");
diff --git a/calendar/common/.cvsignore b/calendar/common/.cvsignore
deleted file mode 100644
index 282522db03..0000000000
--- a/calendar/common/.cvsignore
+++ /dev/null
@@ -1,2 +0,0 @@
-Makefile
-Makefile.in
diff --git a/calendar/common/Makefile.am b/calendar/common/Makefile.am
deleted file mode 100644
index 2a9e84ab84..0000000000
--- a/calendar/common/Makefile.am
+++ /dev/null
@@ -1,28 +0,0 @@
-noinst_LTLIBRARIES = libevolution-calendarprivate.la
-
-INCLUDES =						\
-	-DG_LOG_DOMAIN=\"calendar-gui\"			\
-	-I$(top_builddir)/shell				\
-	-I$(top_srcdir)/shell				\
-	-I$(top_srcdir)					\
-	-I$(top_srcdir)/calendar			\
-	-I$(top_srcdir)/widgets				\
-	-I$(top_srcdir)/a11y/calendar			\
-	-DEVOLUTION_DATADIR=\""$(datadir)"\"		\
-	-DEVOLUTION_GLADEDIR=\""$(gladedir)"\"		\
-	-DEVOLUTION_ETSPECDIR=\""$(etspecdir)"\"	\
-	-DEVOLUTION_IMAGESDIR=\""$(imagesdir)"\"	\
-	-DEVOLUTION_GALVIEWSDIR=\""$(viewsdir)"\"	\
-	-DEVOLUTION_UIDIR=\""$(evolutionuidir)"\"	\
-	-DPREFIX=\""$(prefix)"\"			\
-	$(EVOLUTION_CALENDAR_CFLAGS)
-
-libevolution_calendarprivate_la_SOURCES =	\
-	authentication.c			\
-	authentication.h
-
-libevolution_calendarprivate_la_LIBADD =				\
-	$(top_builddir)/e-util/libeutil.la				\
-	$(EVOLUTION_CALENDAR_LIBS)
-
-libevolution_calendarprivate_la_LDFLAGS = -avoid-version
diff --git a/calendar/common/authentication.c b/calendar/common/authentication.c
deleted file mode 100644
index 69d0e9544c..0000000000
--- a/calendar/common/authentication.c
+++ /dev/null
@@ -1,143 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-
-/* 
- * Authors : 
- *  Rodrigo Moya <rodrigo@ximian.com>
- *
- * Copyright 2003, Novell, Inc.
- *
- * This program is free software; you can redistribute it and/or 
- * modify it under the terms of version 2 of the GNU General Public 
- * License as published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
- * USA
- */
-
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
-
-#include <string.h>
-#include <bonobo/bonobo-i18n.h>
-#include <libedataserverui/e-passwords.h>
-#include "authentication.h"
-
-static GHashTable *source_lists_hash = NULL;
-
-static char *
-auth_func_cb (ECal *ecal, const char *prompt, const char *key, gpointer user_data)
-{
-	gboolean remember;
-	char *password;
-	ESource *source;
-	const gchar *auth_domain, *component_name;
-
-	source = e_cal_get_source (ecal);
-	auth_domain = e_source_get_property (source, "auth-domain");
-	component_name = auth_domain ? auth_domain : "Calendar";
-	password = e_passwords_get_password (component_name, key);
-	
-	if (!password)
-		password = e_passwords_ask_password (_("Enter password"), component_name, key, prompt,
-						     E_PASSWORDS_REMEMBER_FOREVER|E_PASSWORDS_SECRET|E_PASSWORDS_ONLINE,
-						     &remember,
-						     NULL);
-
-	return password;
-}
-
-ECal *
-auth_new_cal_from_default (ECalSourceType type)
-{
-	ECal *ecal = NULL;
-	
-	if (!e_cal_open_default (&ecal, type, auth_func_cb, NULL, NULL))
-		return NULL;
-
-
-	return ecal;
-}
-
-ECal *
-auth_new_cal_from_source (ESource *source, ECalSourceType type)
-{
-	ECal *cal;
-
-	cal = e_cal_new (source, type);
-	if (cal)
-		e_cal_set_auth_func (cal, (ECalAuthFunc) auth_func_cb, NULL);
-
-	return cal;
-}
-
-ECal *
-auth_new_cal_from_uri (const char *uri, ECalSourceType type)
-{
-	ESourceGroup *group = NULL;
-	ESource *source = NULL;
-	ECal *cal;
-	ESourceList *source_list = NULL;
-
-	/* try to find the source in the source list in GConf */
-	source_list = g_hash_table_lookup (source_lists_hash, &type);
-	if (!source_list) {
-		if (e_cal_get_sources (&source_list, type, NULL)) {
-			if (!source_lists_hash)
-				source_lists_hash = g_hash_table_new (g_int_hash, g_int_equal);
-
-			g_hash_table_insert (source_lists_hash, &type, source_list);
-		}
-	}
-
-	if (source_list) {
-		GSList *gl;
-
-		for (gl = e_source_list_peek_groups (source_list); gl != NULL && source == NULL; gl = gl->next) {
-			GSList *sl;
-
-			for (sl = e_source_group_peek_sources (gl->data); sl != NULL; sl = sl->next) {
-				char *source_uri;
-
-				source_uri = e_source_get_uri (sl->data);
-				if (source_uri) {
-					if (!strcmp (source_uri, uri)) {
-						g_free (source_uri);
-						source = g_object_ref (sl->data);
-						break;
-					}
-
-					g_free (source_uri);
-				}
-			}
-		}
-	}
-
-	if (!source) {
-		group = e_source_group_new ("", uri);
-		source = e_source_new ("", "");
-		e_source_set_group (source, group);
-
-		/* we explicitly check for groupwise:// uris, to force authentication on them */
-		if (!strncmp (uri, "groupwise://", strlen ("groupwise://"))) {
-			e_source_set_property (source, "auth", "1");
-			e_source_set_property (source, "auth-domain", "Groupwise");
-			/* FIXME: need to retrieve the username */
-		}
-	}
-
-	cal = auth_new_cal_from_source (source, type);
-
-	g_object_unref (source);
-	if (group)
-		g_object_unref (group);
-
-	return cal;
-}
diff --git a/calendar/common/authentication.h b/calendar/common/authentication.h
deleted file mode 100644
index 2f8af70ace..0000000000
--- a/calendar/common/authentication.h
+++ /dev/null
@@ -1,34 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-
-/* 
- * Authors : 
- *  Rodrigo Moya <rodrigo@ximian.com>
- *
- * Copyright 2003, Novell, Inc.
- *
- * This program is free software; you can redistribute it and/or 
- * modify it under the terms of version 2 of the GNU General Public 
- * License as published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
- * USA
- */
-
-#ifndef _AUTHENTICATION_H_
-#define _AUTHENTICATION_H_
-
-#include <libedataserver/e-source.h>
-#include <libecal/e-cal.h>
-
-ECal *auth_new_cal_from_default (ECalSourceType type);
-ECal *auth_new_cal_from_source (ESource *source, ECalSourceType type);
-ECal *auth_new_cal_from_uri (const char *uri, ECalSourceType type);
-
-#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 e44e5d1bda..0000000000
--- a/calendar/conduits/calendar/.cvsignore
+++ /dev/null
@@ -1,9 +0,0 @@
-Makefile.in
-Makefile
-.deps
-*.conduit
-*.lo
-.libs
-libecalendar_conduit.la
-e-calendar-conduit-control-applet
-e-calendar-conduit-control-applet.desktop
diff --git a/calendar/conduits/calendar/Makefile.am b/calendar/conduits/calendar/Makefile.am
deleted file mode 100644
index 0b6f78655f..0000000000
--- a/calendar/conduits/calendar/Makefile.am
+++ /dev/null
@@ -1,37 +0,0 @@
-INCLUDES = 					\
-	-I$(top_srcdir)/e-util			\
-	-I$(top_builddir)/e-util		\
-	-I$(top_srcdir)/widgets/misc		\
-	-I$(top_builddir)/widgets/misc		\
-	$(EVOLUTION_CALENDAR_CONDUIT_CFLAGS)
-
-# Calendar Conduit
-privconduit_LTLIBRARIES = libecalendar_conduit.la
-
-libecalendar_conduit_la_SOURCES = 	\
-	calendar-conduit.c
-
-libecalendar_conduit_la_LDFLAGS = -module -avoid-version
-libecalendar_conduit_la_LIBADD = 					\
-	$(top_builddir)/e-util/libeutil.la				\
-	$(top_builddir)/e-util/libeconduit.la	 			\
-	$(top_builddir)/widgets/misc/libemiscwidgets.la	 		\
-	$(EVOLUTION_CALENDAR_CONDUIT_LIBS)
-
-e-calendar-$(BASE_VERSION).conduit: e-calendar.conduit.in
-	sed -e 's^\@privconduitdir\@^$(privconduitdir)^g' 				\
-	    -e 's^\@datadir\@^$(datadir)^g' 				\
-	    -e 's^\@BASE_VERSION\@^$(BASE_VERSION)^g' 			\
-	    $< > $@
-
-conduitdir = $(datadir)/gnome-pilot/conduits/
-conduit_DATA = e-calendar-$(BASE_VERSION).conduit
-
-BUILT_SOURCES = $(conduit_DATA)
-CLEANFILES = $(BUILT_SOURCES)
-
-EXTRA_DIST = \
-	e-calendar.conduit.in
-
-dist-hook:
-	cd $(distdir); rm -f $(BUILT_SOURCES)
-\ No newline at end of file
diff --git a/calendar/conduits/calendar/calendar-conduit.c b/calendar/conduits/calendar/calendar-conduit.c
deleted file mode 100644
index b3c1b5e553..0000000000
--- a/calendar/conduits/calendar/calendar-conduit.c
+++ /dev/null
@@ -1,1950 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-/* Evolution calendar - Calendar Conduit
- *
- * Copyright (C) 1998 Free Software Foundation
- * Copyright (C) 2000 Ximian, Inc.
- *
- * Authors: Eskil Heyn Olsen <deity@eskil.dk> 
- *          JP Rosevear <jpr@ximian.com>
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of version 2 of the GNU General Public
- * License as published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307, USA.
- */
-
-#include <config.h>
-
-#define G_LOG_DOMAIN "ecalconduit"
-
-#include <libecal/e-cal-types.h>
-#include <libecal/e-cal.h>
-#include <libecal/e-cal-time-util.h>
-#include <pi-source.h>
-#include <pi-socket.h>
-#include <pi-dlp.h>
-#include <pi-datebook.h>
-#include <gpilotd/gnome-pilot-conduit.h>
-#include <gpilotd/gnome-pilot-conduit-sync-abs.h>
-#include <libgpilotdCM/gnome-pilot-conduit-management.h>
-#include <libgpilotdCM/gnome-pilot-conduit-config.h>
-#include <e-pilot-map.h>
-#include <e-pilot-settings.h>
-#include <e-pilot-util.h>
-#include <e-config-listener.h>
-
-GnomePilotConduit * conduit_get_gpilot_conduit (guint32);
-void conduit_destroy_gpilot_conduit (GnomePilotConduit*);
-
-#define CONDUIT_VERSION "0.1.6"
-
-#define DEBUG_CALCONDUIT 1
-/* #undef DEBUG_CALCONDUIT */
-
-#ifdef DEBUG_CALCONDUIT
-#define LOG(x) x
-#else
-#define LOG(x)
-#endif 
-
-#define WARN g_warning
-#define INFO g_message
-
-#define PILOT_MAX_ADVANCE 99
-
-typedef struct _ECalLocalRecord ECalLocalRecord;
-typedef struct _ECalConduitCfg ECalConduitCfg;
-typedef struct _ECalConduitGui ECalConduitGui;
-typedef struct _ECalConduitContext ECalConduitContext;
-
-/* Local Record */
-struct _ECalLocalRecord {
-	/* The stuff from gnome-pilot-conduit-standard-abs.h
-	   Must be first in the structure, or instances of this
-	   structure cannot be used by gnome-pilot-conduit-standard-abs.
-	*/
-	GnomePilotDesktopRecord local;
-
-	/* The corresponding Comp object */
-	ECalComponent *comp;
-
-        /* pilot-link appointment structure */
-	struct Appointment *appt;
-};
-
-static void
-calconduit_destroy_record (ECalLocalRecord *local)
-{
-	g_object_unref (local->comp);
-	free_Appointment (local->appt);
-	g_free (local->appt);	
-	g_free (local);
-}
-
-/* Configuration */
-struct _ECalConduitCfg {
-	guint32 pilot_id;
-	GnomePilotConduitSyncType  sync_type;
-
-	ESourceList *source_list;
-	ESource *source;
-	gboolean secret;
-	gboolean multi_day_split;
-	
-	gchar *last_uri;
-};
-
-static ECalConduitCfg *
-calconduit_load_configuration (guint32 pilot_id) 
-{
-	ECalConduitCfg *c;
-	GnomePilotConduitManagement *management;
-	GnomePilotConduitConfig *config;
- 	gchar prefix[256];
-	
-	c = g_new0 (ECalConduitCfg, 1);
-	g_assert (c != NULL);
-
-	/* Pilot ID */
-	c->pilot_id = pilot_id;
-
-	/* Sync Type */
-	management = gnome_pilot_conduit_management_new ("e_calendar_conduit", GNOME_PILOT_CONDUIT_MGMT_ID);
-	gtk_object_ref (GTK_OBJECT (management));
-	gtk_object_sink (GTK_OBJECT (management));
-	config = gnome_pilot_conduit_config_new (management, pilot_id);
-	gtk_object_ref (GTK_OBJECT (config));
-	gtk_object_sink (GTK_OBJECT (config));
-	if (!gnome_pilot_conduit_config_is_enabled (config, &c->sync_type))
-		c->sync_type = GnomePilotConduitSyncTypeNotSet;
-	gtk_object_unref (GTK_OBJECT (config));
-	gtk_object_unref (GTK_OBJECT (management));
-
-	/* Custom settings */
-	g_snprintf (prefix, 255, "/gnome-pilot.d/e-calendar-conduit/Pilot_%u/", pilot_id);
-	gnome_config_push_prefix (prefix);
-
-	if (!e_cal_get_sources (&c->source_list, E_CAL_SOURCE_TYPE_EVENT, NULL))
-		c->source_list = NULL;
-	if (c->source_list) {
-		c->source = e_pilot_get_sync_source (c->source_list);
-		if (!c->source)
-			c->source = e_source_list_peek_source_any (c->source_list);
-		if (c->source) {
-			g_object_ref (c->source);
-		} else {
-			g_object_unref (c->source_list);
-			c->source_list = NULL;
-		}
-	}
-	c->secret = gnome_config_get_bool ("secret=FALSE");
-	c->multi_day_split = gnome_config_get_bool ("multi_day_split=TRUE");
-	if ((c->last_uri = gnome_config_get_string ("last_uri")) && !strncmp (c->last_uri, "file://", 7)) {
-		const char *path = c->last_uri + 7;
-		const char *home;
-		
-		home = g_get_home_dir ();
-		
-		if (!strncmp (path, home, strlen (home))) {
-			path += strlen (home);
-			if (*path == '/')
-				path++;
-			
-			if (!strcmp (path, "evolution/local/Calendar/calendar.ics")) {
-				/* need to upgrade the last_uri. yay. */
-				g_free (c->last_uri);
-				c->last_uri = g_strdup_printf ("file://%s/.evolution/calendar/local/system/calendar.ics", home);
-			}
-		}
-	}
-	
-	gnome_config_pop_prefix (); 
-
-	return c;
-}
-
-static void
-calconduit_save_configuration (ECalConduitCfg *c) 
-{
-	gchar prefix[256];
-
-	g_snprintf (prefix, 255, "/gnome-pilot.d/e-calendar-conduit/Pilot_%u/", c->pilot_id);
-	gnome_config_push_prefix (prefix);
-
-	e_pilot_set_sync_source (c->source_list, c->source);
-	gnome_config_set_bool ("secret", c->secret);
-	gnome_config_set_bool ("multi_day_split", c->multi_day_split);
-	gnome_config_set_string ("last_uri", c->last_uri);
-
-	gnome_config_pop_prefix ();
-
-	gnome_config_sync ();
-	gnome_config_drop_all ();
-}
-
-static ECalConduitCfg*
-calconduit_dupe_configuration (ECalConduitCfg *c) 
-{
-	ECalConduitCfg *retval;
-
-	g_return_val_if_fail (c != NULL, NULL);
-
-	retval = g_new0 (ECalConduitCfg, 1);
-	retval->pilot_id = c->pilot_id;
-	retval->sync_type = c->sync_type;
-
-	if (c->source_list)
-		retval->source_list = g_object_ref (c->source_list);
-	if (c->source)
-		retval->source = g_object_ref (c->source);
-	retval->secret = c->secret;
-	retval->multi_day_split = c->multi_day_split;
-	retval->last_uri = g_strdup (c->last_uri);
-	
-	return retval;
-}
-
-static void 
-calconduit_destroy_configuration (ECalConduitCfg *c) 
-{
-	g_return_if_fail (c != NULL);
-
-	g_object_unref (c->source_list);
-	g_object_unref (c->source);
-	g_free (c->last_uri);
-	g_free (c);
-}
-
-/* Gui */
-struct _ECalConduitGui {
-	GtkWidget *multi_day_split;
-};
-
-static ECalConduitGui *
-e_cal_gui_new (EPilotSettings *ps) 
-{
-	ECalConduitGui *gui;
-	GtkWidget *lbl;
-	gint rows;
-	
-	g_return_val_if_fail (ps != NULL, NULL);
-	g_return_val_if_fail (E_IS_PILOT_SETTINGS (ps), NULL);
-
-	gtk_table_resize (GTK_TABLE (ps), E_PILOT_SETTINGS_TABLE_ROWS + 1, E_PILOT_SETTINGS_TABLE_COLS);
-
-	gui = g_new0 (ECalConduitGui, 1);
-
-	rows = E_PILOT_SETTINGS_TABLE_ROWS;
-	lbl = gtk_label_new (_("Split Multi-Day Events:"));
-	gui->multi_day_split = gtk_check_button_new ();
-	gtk_table_attach_defaults (GTK_TABLE (ps), lbl, 0, 1, rows, rows + 1);
-	gtk_table_attach_defaults (GTK_TABLE (ps), gui->multi_day_split, 1, 2, rows, rows + 1);
-	gtk_widget_show (lbl);
-	gtk_widget_show (gui->multi_day_split);
-	
-	return gui;
-}
-
-static void
-e_cal_gui_fill_widgets (ECalConduitGui *gui, ECalConduitCfg *cfg) 
-{
-	g_return_if_fail (gui != NULL);
-	g_return_if_fail (cfg != NULL);
-
-	gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (gui->multi_day_split),
-				      cfg->multi_day_split);
-}
-
-static void
-e_cal_gui_fill_config (ECalConduitGui *gui, ECalConduitCfg *cfg) 
-{
-	g_return_if_fail (gui != NULL);
-	g_return_if_fail (cfg != NULL);
-
-	cfg->multi_day_split = gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (gui->multi_day_split));
-}
-
-static void
-e_cal_gui_destroy (ECalConduitGui *gui) 
-{
-	g_free (gui);
-}
-
-/* Context */
-struct _ECalConduitContext {
-	GnomePilotDBInfo *dbi;
-
-	ECalConduitCfg *cfg;
-	ECalConduitCfg *new_cfg;
-	ECalConduitGui *gui;
-	GtkWidget *ps;
-	
-	struct AppointmentAppInfo ai;
-
-	ECal *client;
-
-	icaltimezone *timezone;
-	ECalComponent *default_comp;
-	GList *comps;
-	GList *changed;
-	GHashTable *changed_hash;
-	GList *locals;
-	
-	EPilotMap *map;
-};
-
-static ECalConduitContext *
-e_calendar_context_new (guint32 pilot_id) 
-{
-	ECalConduitContext *ctxt;
-
-	ctxt = g_new0 (ECalConduitContext, 1);
-	g_assert (ctxt != NULL);
-	
-	ctxt->cfg = calconduit_load_configuration (pilot_id);
-	ctxt->new_cfg = calconduit_dupe_configuration (ctxt->cfg);
-	ctxt->ps = NULL;
-	ctxt->dbi = NULL;
-	ctxt->client = NULL;
-	ctxt->timezone = NULL;
-	ctxt->default_comp = NULL;
-	ctxt->comps = NULL;
-	ctxt->changed = NULL;
-	ctxt->changed_hash = NULL;
-	ctxt->locals = NULL;
-	ctxt->map = NULL;
-	
-	return ctxt;
-}
-
-static gboolean
-e_calendar_context_foreach_change (gpointer key, gpointer value, gpointer data) 
-{
-	g_free (key);
-
-	return TRUE;
-}
-
-static void
-e_calendar_context_destroy (ECalConduitContext *ctxt)
-{
-	GList *l;
-	
-	g_return_if_fail (ctxt != NULL);
-
-	if (ctxt->cfg != NULL)
-		calconduit_destroy_configuration (ctxt->cfg);
-	if (ctxt->new_cfg != NULL)
-		calconduit_destroy_configuration (ctxt->new_cfg);
-	if (ctxt->gui != NULL)
-		e_cal_gui_destroy (ctxt->gui);
-
-	if (ctxt->client != NULL)
-		g_object_unref (ctxt->client);
- 	if (ctxt->default_comp != NULL)
- 		g_object_unref (ctxt->default_comp);	
-	if (ctxt->comps != NULL) {
-		for (l = ctxt->comps; l; l = l->next)
-			g_object_unref (l->data);
-		g_list_free (ctxt->comps);
-	}
-	
-	if (ctxt->changed != NULL)
-		e_cal_free_change_list (ctxt->changed);
-	
-	if (ctxt->changed_hash != NULL) {
-		g_hash_table_foreach_remove (ctxt->changed_hash, e_calendar_context_foreach_change, NULL);
-		g_hash_table_destroy (ctxt->changed_hash);
-	}
-	
-	if (ctxt->locals != NULL) {
-		for (l = ctxt->locals; l != NULL; l = l->next)
-			calconduit_destroy_record (l->data);
-		g_list_free (ctxt->locals);
-	}
-	
-	if (ctxt->map != NULL)
-		e_pilot_map_destroy (ctxt->map);
-}
-
-/* Debug routines */
-static char *
-print_local (ECalLocalRecord *local)
-{
-	static char buff[ 4096 ];
-
-	if (local == NULL) {
-		sprintf (buff, "[NULL]");
-		return buff;
-	}
-
-	if (local->appt && local->appt->description) {
-		g_snprintf (buff, 4096, "[%ld %ld '%s' '%s']",
-			    mktime (&local->appt->begin),
-			    mktime (&local->appt->end),
-			    local->appt->description ?
-			    local->appt->description : "",
-			    local->appt->note ?
-			    local->appt->note : "");
-		return buff;
-	}
-
-	return "";
-}
-
-static char *print_remote (GnomePilotRecord *remote)
-{
-	static char buff[ 4096 ];
-	struct Appointment appt;
-
-	if (remote == NULL) {
-		sprintf (buff, "[NULL]");
-		return buff;
-	}
-
-	memset (&appt, 0, sizeof (struct Appointment));
-	unpack_Appointment (&appt, remote->record, remote->length);
-
-	g_snprintf (buff, 4096, "[%ld %ld '%s' '%s']",
-		    mktime (&appt.begin),
-		    mktime (&appt.end),
-		    appt.description ?
-		    appt.description : "",
-		    appt.note ?
-		    appt.note : "");
-
-	free_Appointment (&appt);
-
-	return buff;
-}
-
-static int
-start_calendar_server (ECalConduitContext *ctxt)
-{
-	g_return_val_if_fail (ctxt != NULL, -2);
-
-	if (ctxt->cfg->source) {
-		ctxt->client = e_cal_new (ctxt->cfg->source, E_CAL_SOURCE_TYPE_EVENT);
-		if (!e_cal_open (ctxt->client, TRUE, NULL))
-			return -1;
-	} else if (!e_cal_open_default (&ctxt->client, E_CAL_SOURCE_TYPE_EVENT, NULL, NULL, NULL)) {
-		return -1;
-	}
-
-        return 0;
-
-}
-
-/* Utility routines */
-static icaltimezone *
-get_timezone (ECal *client, const char *tzid) 
-{
-	icaltimezone *timezone = NULL;
-
-	timezone = icaltimezone_get_builtin_timezone_from_tzid (tzid);
-	if (timezone == NULL)		 
-		 e_cal_get_timezone (client, tzid, &timezone, NULL);
-	
-	return timezone;
-}
-
-static icaltimezone *
-get_default_timezone (void)
-{
-	EConfigListener *listener;
-	icaltimezone *timezone = NULL;
-	char *location;
-
-	listener = e_config_listener_new ();
-
-	location = e_config_listener_get_string_with_default (listener,
-		"/apps/evolution/calendar/display/timezone", "UTC", NULL);
-	if (!location || !location[0]) {
-		g_free (location);
-		location = g_strdup ("UTC");
-	}
-	
-	timezone = icaltimezone_get_builtin_timezone (location);
-	g_free (location);
-
-	g_object_unref (listener);
-
-	return timezone;	
-}
-
-
-static char *
-map_name (ECalConduitContext *ctxt) 
-{
-	char *filename;
-	
-	filename = g_strdup_printf ("%s/.evolution/calendar/local/system/pilot-map-calendar-%d.xml",
-				    g_get_home_dir (), ctxt->cfg->pilot_id);
-	
-	return filename;
-}
-
-static icalrecurrencetype_weekday
-get_ical_day (int day) 
-{
-	switch (day) {
-	case 0:
-		return ICAL_SUNDAY_WEEKDAY;
-	case 1:
-		return ICAL_MONDAY_WEEKDAY;
-	case 2:
-		return ICAL_TUESDAY_WEEKDAY;
-	case 3:
-		return ICAL_WEDNESDAY_WEEKDAY;
-	case 4:
-		return ICAL_THURSDAY_WEEKDAY;
-	case 5:
-		return ICAL_FRIDAY_WEEKDAY;
-	case 6:
-		return ICAL_SATURDAY_WEEKDAY;
-	}
-
-	return ICAL_NO_WEEKDAY;
-}
-
-static int
-get_pilot_day (icalrecurrencetype_weekday wd) 
-{
-	switch (wd) {
-	case ICAL_SUNDAY_WEEKDAY:
-		return 0;
-	case ICAL_MONDAY_WEEKDAY:
-		return 1;
-	case ICAL_TUESDAY_WEEKDAY:
-		return 2;
-	case ICAL_WEDNESDAY_WEEKDAY:
-		return 3;
-	case ICAL_THURSDAY_WEEKDAY:
-		return 4;
-	case ICAL_FRIDAY_WEEKDAY:
-		return 5;
-	case ICAL_SATURDAY_WEEKDAY:
-		return 6;
-	default:
-		return -1;
-	}
-}
-
-static gboolean
-is_empty_time (struct tm time) 
-{
-	if (time.tm_sec || time.tm_min || time.tm_hour 
-	    || time.tm_mday || time.tm_mon || time.tm_year) 
-		return FALSE;
-	
-	return TRUE;
-}
-
-static gboolean
-is_all_day (ECal *client, ECalComponentDateTime *dt_start, ECalComponentDateTime *dt_end) 
-{
-	time_t dt_start_time, dt_end_time;
-	icaltimezone *timezone;
-
-	if (dt_start->value->is_date && dt_end->value->is_date)
-		return TRUE;
-	
-	timezone = get_timezone (client, dt_start->tzid);
-	dt_start_time = icaltime_as_timet_with_zone (*dt_start->value, timezone);
-	dt_end_time = icaltime_as_timet_with_zone (*dt_end->value, get_timezone (client, dt_end->tzid));
-
-	if (dt_end_time == time_add_day_with_zone (dt_start_time, 1, timezone))
-		return TRUE;
-
-	return FALSE;
-}
-
-static gboolean
-process_multi_day (ECalConduitContext *ctxt, ECalChange *ccc, GList **multi_comp, GList **multi_ccc)
-{
-	ECalComponentDateTime dt_start, dt_end;
-	icaltimezone *tz_start, *tz_end;
-	time_t event_start, event_end, day_end;
-	struct icaltimetype *old_start_value, *old_end_value;
-	const char *uid;
-	gboolean is_date = FALSE;
-	gboolean last = FALSE;
-	gboolean ret = TRUE;
-
-	*multi_ccc = NULL;
-	*multi_comp = NULL;
-	
-	if (ccc->type == E_CAL_CHANGE_DELETED)
-		return FALSE;
-
-	/* Start time */
-	e_cal_component_get_dtstart (ccc->comp, &dt_start);
-	if (dt_start.value->is_date)
-		tz_start = ctxt->timezone;
-	else
-		tz_start = get_timezone (ctxt->client, dt_start.tzid);
-	event_start = icaltime_as_timet_with_zone (*dt_start.value, tz_start);
-
-	e_cal_component_get_dtend (ccc->comp, &dt_end);
-	if (dt_end.value->is_date)
-		tz_end = ctxt->timezone;
-	else
-		tz_end = get_timezone (ctxt->client, dt_end.tzid);
-	event_end = icaltime_as_timet_with_zone (*dt_end.value, tz_end);
-
-	day_end = time_day_end_with_zone (event_start, ctxt->timezone);			
-	if (day_end >= event_end) {
-		ret = FALSE;
-		goto cleanup;
-	} else if (e_cal_component_has_recurrences (ccc->comp) || !ctxt->cfg->multi_day_split) {
-		ret = TRUE;
-		goto cleanup;
-	}
-
-	if (dt_start.value->is_date && dt_end.value->is_date)
-		is_date = TRUE;
-	
-	old_start_value = dt_start.value;
- 	old_end_value = dt_end.value;
-	while (!last) {
-		ECalComponent *clone = e_cal_component_clone (ccc->comp);
-		char *new_uid = e_cal_component_gen_uid ();
-		struct icaltimetype start_value, end_value;
-		ECalChange *c = g_new0 (ECalChange, 1);
-		
-		if (day_end >= event_end) {
-			day_end = event_end;
-			last = TRUE;
-		}
-
-		e_cal_component_set_uid (clone, new_uid);
-
-		start_value = icaltime_from_timet_with_zone (event_start, is_date, tz_start);
-		dt_start.value = &start_value;
-		e_cal_component_set_dtstart (clone, &dt_start);
-		
-		end_value = icaltime_from_timet_with_zone (day_end, is_date, tz_end);
-		dt_end.value = &end_value;
-		e_cal_component_set_dtend (clone, &dt_end);
-
-		/* FIXME Error handling */
-		e_cal_create_object (ctxt->client, e_cal_component_get_icalcomponent (clone), NULL, NULL);
-
-		c->comp = clone;
-		c->type = E_CAL_CHANGE_ADDED;
-		
-		*multi_ccc = g_list_prepend (*multi_ccc, c);
-		*multi_comp = g_list_prepend (*multi_comp, g_object_ref (c->comp));
-
-		event_start = day_end;
-		day_end = time_day_end_with_zone (event_start, ctxt->timezone);
-	}
-	dt_start.value = old_start_value;
-	dt_end.value = old_end_value;
-	
-	e_cal_component_get_uid (ccc->comp, &uid);
-	/* FIXME Error handling */
-	e_cal_remove_object (ctxt->client, uid, NULL);
-	ccc->type = E_CAL_CHANGE_DELETED;
-
- cleanup:
-	e_cal_component_free_datetime (&dt_start);
-	e_cal_component_free_datetime (&dt_end);
-
-	return ret;
-}
-
-static short
-nth_weekday (int pos, icalrecurrencetype_weekday weekday)
-{
-	g_assert ((pos > 0 && pos <= 5) || (pos == -1));
-
-	return ((abs (pos) * 8) + weekday) * (pos < 0 ? -1 : 1);
-}
-
-static GList *
-next_changed_item (ECalConduitContext *ctxt, GList *changes) 
-{
-	ECalChange *ccc;
-	GList *l;
-	
-	for (l = changes; l != NULL; l = l->next) {
-		const char *uid;
-
-		ccc = l->data;
-		
-		e_cal_component_get_uid (ccc->comp, &uid);
-		if (g_hash_table_lookup (ctxt->changed_hash, uid))
-			return l;
-	}
-	
-	return NULL;
-}
-
-static void
-compute_status (ECalConduitContext *ctxt, ECalLocalRecord *local, const char *uid)
-{
-	ECalChange *ccc;
-
-	local->local.archived = FALSE;
-	local->local.secret = FALSE;
-
-	ccc = g_hash_table_lookup (ctxt->changed_hash, uid);
-	
-	if (ccc == NULL) {
-		local->local.attr = GnomePilotRecordNothing;
-		return;
-	}
-	
-	switch (ccc->type) {
-	case E_CAL_CHANGE_ADDED:
-		local->local.attr = GnomePilotRecordNew;
-		break;
-		
-	case E_CAL_CHANGE_MODIFIED:
-		local->local.attr = GnomePilotRecordModified;
-		break;
-		
-	case E_CAL_CHANGE_DELETED:
-		local->local.attr = GnomePilotRecordDeleted;
-		break;
-	}
-}
-
-static gboolean
-rrules_mostly_equal (struct icalrecurrencetype *a, struct icalrecurrencetype *b)
-{
-	struct icalrecurrencetype acopy, bcopy;
-	
-	acopy = *a;
-	bcopy = *b;
-	
-	acopy.until = bcopy.until = icaltime_null_time ();
-	acopy.count = bcopy.count = 0;
-	
-	if (!memcmp (&acopy, &bcopy, sizeof (struct icalrecurrencetype)))
-		return TRUE;
-	
-	return FALSE;
-}
-
-static gboolean
-find_last_cb (ECalComponent *comp, time_t start, time_t end, gpointer data)
-{
-	time_t *last = data;
-	
-	*last = start;
-
-	return TRUE;
-}
-
-static GnomePilotRecord
-local_record_to_pilot_record (ECalLocalRecord *local,
-			      ECalConduitContext *ctxt)
-{
-	GnomePilotRecord p;
-	static char record[0xffff];
-
-	g_assert (local->comp != NULL);
-	g_assert (local->appt != NULL );
-	
-	p.ID = local->local.ID;
-	p.category = local->local.category;
-	p.attr = local->local.attr;
-	p.archived = local->local.archived;
-	p.secret = local->local.secret;
-
-	/* Generate pilot record structure */
-	p.record = record;
-	p.length = pack_Appointment (local->appt, p.record, 0xffff);
-
-	return p;	
-}
-
-/*
- * converts a ECalComponent object to a ECalLocalRecord
- */
-static void
-local_record_from_comp (ECalLocalRecord *local, ECalComponent *comp, ECalConduitContext *ctxt) 
-{
-	const char *uid;
-	ECalComponentText summary;
-	GSList *d_list = NULL, *edl = NULL, *l;
-	ECalComponentText *description;
-	ECalComponentDateTime dt_start, dt_end;
-	ECalComponentClassification classif;
-	icaltimezone *default_tz = ctxt->timezone;
-	int i;
-	
-	g_return_if_fail (local != NULL);
-	g_return_if_fail (comp != NULL);
-
-	local->comp = comp;
-	g_object_ref (comp);
-	
-	e_cal_component_get_uid (local->comp, &uid);
-	local->local.ID = e_pilot_map_lookup_pid (ctxt->map, uid, TRUE);
-	compute_status (ctxt, local, uid);
-
-	local->appt = g_new0 (struct Appointment, 1);
-
-	/* Handle the fields and category we don't sync by making sure
-         * we don't overwrite them 
-	 */
-	if (local->local.ID != 0) {
-		struct Appointment appt;		
-		char record[0xffff];
-		int cat = 0;
-		
-		if (dlp_ReadRecordById (ctxt->dbi->pilot_socket, 
-					ctxt->dbi->db_handle,
-					local->local.ID, &record, 
-					NULL, NULL, NULL, &cat) > 0) {
-			local->local.category = cat;
-			memset (&appt, 0, sizeof (struct Appointment));
-			unpack_Appointment (&appt, record, 0xffff);
-			local->appt->alarm = appt.alarm;
-			local->appt->advance = appt.advance;
-			local->appt->advanceUnits = appt.advanceUnits;
-			free_Appointment (&appt);
-		}
-	}
-
-	/* STOP: don't replace these with g_strdup, since free_Appointment
-	   uses free to deallocate */
-	e_cal_component_get_summary (comp, &summary);
-	if (summary.value) 
-		local->appt->description = e_pilot_utf8_to_pchar (summary.value);
-
-	e_cal_component_get_description_list (comp, &d_list);
-	if (d_list) {
-		description = (ECalComponentText *) d_list->data;
-		if (description && description->value)
-			local->appt->note = e_pilot_utf8_to_pchar (description->value);
-		else
-			local->appt->note = NULL;
-	} else {
-		local->appt->note = NULL;
-	}
-
-	/* Start/End */
-	e_cal_component_get_dtstart (comp, &dt_start);
-	e_cal_component_get_dtend (comp, &dt_end);
-	if (dt_start.value) {
-		icaltimezone_convert_time (dt_start.value, 
-					   get_timezone (ctxt->client, dt_start.tzid),
-					   default_tz);
-		local->appt->begin = icaltimetype_to_tm (dt_start.value);
-	}
-	
-	if (dt_start.value && dt_end.value) {
-		if (is_all_day (ctxt->client, &dt_start, &dt_end)) {
-			local->appt->event = 1;
-		} else {
-			icaltimezone_convert_time (dt_end.value, 
-						   get_timezone (ctxt->client, dt_end.tzid),
-						   default_tz);
-			local->appt->end = icaltimetype_to_tm (dt_end.value);
-			local->appt->event = 0;
-		}
-	} else {
-		local->appt->event = 1;
-	}
-	e_cal_component_free_datetime (&dt_start);
-	e_cal_component_free_datetime (&dt_end);	
-
-	/* Recurrence Rules */
-	local->appt->repeatType = repeatNone;
-
-	if (!e_cal_component_is_instance (comp)) {
-		if (e_cal_component_has_rrules (comp)) {
-			GSList *list;
-			struct icalrecurrencetype *recur;
-		
-			e_cal_component_get_rrule_list (comp, &list);
-			recur = list->data;
-		
-			switch (recur->freq) {
-			case ICAL_DAILY_RECURRENCE:
-				local->appt->repeatType = repeatDaily;
-				break;
-			case ICAL_WEEKLY_RECURRENCE:
-				local->appt->repeatType = repeatWeekly;
-				for (i = 0; i <= 7 && recur->by_day[i] != ICAL_RECURRENCE_ARRAY_MAX; i++) {
-					icalrecurrencetype_weekday wd;
-
-					wd = icalrecurrencetype_day_day_of_week (recur->by_day[i]);
-					local->appt->repeatDays[get_pilot_day (wd)] = 1;
-				}
-			
-				break;
-			case ICAL_MONTHLY_RECURRENCE:
-				if (recur->by_month_day[0] != ICAL_RECURRENCE_ARRAY_MAX) {
-					local->appt->repeatType = repeatMonthlyByDate;
-					break;
-				}
-			
-				/* Not going to work with -ve  by_day/by_set_pos other than -1,
-				 * pilot doesn't support that anyhow */
-				local->appt->repeatType = repeatMonthlyByDay;
-				switch (recur->by_set_pos[0] != ICAL_RECURRENCE_ARRAY_MAX ? recur->by_set_pos[0] 
-					: icalrecurrencetype_day_position (recur->by_day[0])) {
-				case 1:
-					local->appt->repeatDay = dom1stSun;
-					break;
-				case 2:
-					local->appt->repeatDay = dom2ndSun;
-					break;
-				case 3:
-					local->appt->repeatDay = dom3rdSun;
-					break;
-				case 4:
-					local->appt->repeatDay = dom4thSun;
-					break;
-				case -1:
-				case 5:
-					local->appt->repeatDay = domLastSun;
-					break;
-				}
-				local->appt->repeatDay += get_pilot_day (icalrecurrencetype_day_day_of_week (recur->by_day[0]));
-				break;
-			case ICAL_YEARLY_RECURRENCE:
-				local->appt->repeatType = repeatYearly;
-				break;
-			default:
-				break;
-			}
-
-			if (local->appt->repeatType != repeatNone) {
-				local->appt->repeatFrequency = recur->interval;
-			}
-		
-			if (!icaltime_is_null_time (recur->until)) {
-				local->appt->repeatForever = 0;
-				local->appt->repeatEnd = icaltimetype_to_tm_with_zone (&recur->until, 
-										       icaltimezone_get_utc_timezone (), 
-										       default_tz);
-			} else if (recur->count > 0) {
-				time_t last = -1;
-				struct icaltimetype itt;
-
-				/* The palm does not support count recurrences */
-				local->appt->repeatForever = 0;
-				e_cal_recur_generate_instances (comp, -1, -1, find_last_cb, &last, 
-							      e_cal_resolve_tzid_cb, ctxt->client, 
-							      default_tz);
-				itt = icaltime_from_timet_with_zone (last, TRUE, default_tz);
-				local->appt->repeatEnd = icaltimetype_to_tm (&itt);
-			} else {
-				local->appt->repeatForever = 1;
-			}
-		
-			e_cal_component_free_recur_list (list);
-		}
-
-		/* Exceptions */
-		e_cal_component_get_exdate_list (comp, &edl);
-		local->appt->exceptions = g_slist_length (edl);
-		local->appt->exception = g_new0 (struct tm, local->appt->exceptions);	
-		for (l = edl, i = 0; l != NULL; l = l->next, i++) {
-			ECalComponentDateTime *dt = l->data;
-
-			icaltimezone_convert_time (dt->value, 
-						   icaltimezone_get_utc_timezone (),
-						   default_tz);
-			local->appt->exception[i] = icaltimetype_to_tm (dt->value);
-		}
-		e_cal_component_free_exdate_list (edl);
-	}
-	
-	/* Alarm */
-	local->appt->alarm = 0;
-	if (e_cal_component_has_alarms (comp)) {
-		GList *uids, *l;		
-		ECalComponentAlarm *alarm;
-		ECalComponentAlarmTrigger trigger;
-
-		uids = e_cal_component_get_alarm_uids (comp);
-		for (l = uids; l != NULL; l = l->next) {
-			alarm = e_cal_component_get_alarm (comp, l->data);
-			e_cal_component_alarm_get_trigger (alarm, &trigger);
-			
-			if ((trigger.type == E_CAL_COMPONENT_ALARM_TRIGGER_RELATIVE_START
-			     && trigger.u.rel_duration.is_neg)) {
-				local->appt->advanceUnits = advMinutes;
-				local->appt->advance = 
-					trigger.u.rel_duration.minutes
-					+ trigger.u.rel_duration.hours * 60
-					+ trigger.u.rel_duration.days * 60 * 24
-					+ trigger.u.rel_duration.weeks * 7 * 60 * 24;
-
-				if (local->appt->advance > PILOT_MAX_ADVANCE) {
-					local->appt->advanceUnits = advHours;
-					local->appt->advance = 
-						trigger.u.rel_duration.minutes / 60
-						+ trigger.u.rel_duration.hours
-						+ trigger.u.rel_duration.days * 24
-						+ trigger.u.rel_duration.weeks * 7 * 24;
-				}
-				if (local->appt->advance > PILOT_MAX_ADVANCE) {
-					local->appt->advanceUnits = advDays;
-					local->appt->advance =
-						trigger.u.rel_duration.minutes / (60 * 24)
-						+ trigger.u.rel_duration.hours / 24
-						+ trigger.u.rel_duration.days
-						+ trigger.u.rel_duration.weeks * 7;
-				}
-				if (local->appt->advance > PILOT_MAX_ADVANCE)
-					local->appt->advance = PILOT_MAX_ADVANCE;
-
-				local->appt->alarm = 1;
-				break;
-			}
-			e_cal_component_alarm_free (alarm);
-		}
-		cal_obj_uid_list_free (uids);
-	}
-	
-	e_cal_component_get_classification (comp, &classif);
-
-	if (classif == E_CAL_COMPONENT_CLASS_PRIVATE)
-		local->local.secret = 1;
-	else
-		local->local.secret = 0;
-
-	local->local.archived = 0;  
-}
-
-static void 
-local_record_from_uid (ECalLocalRecord *local,
-		       const char *uid,
-		       ECalConduitContext *ctxt)
-{
-	ECalComponent *comp;
-	icalcomponent *icalcomp;
-	GError *error = NULL;
-
-	g_assert(local!=NULL);
-
-	if (e_cal_get_object (ctxt->client, uid, NULL, &icalcomp, &error)) {
-		comp = e_cal_component_new ();
-		if (!e_cal_component_set_icalcomponent (comp, icalcomp)) {
-			g_object_unref (comp);
-			icalcomponent_free (icalcomp);
-			return;
-		}
-
-		local_record_from_comp (local, comp, ctxt);
-		g_object_unref (comp);
-	} else if (error->code == E_CALENDAR_STATUS_OBJECT_NOT_FOUND) {
-		comp = e_cal_component_new ();
-		e_cal_component_set_new_vtype (comp, E_CAL_COMPONENT_EVENT);
-		e_cal_component_set_uid (comp, uid);
-		local_record_from_comp (local, comp, ctxt);
-		g_object_unref (comp);
-	} else {
-		INFO ("Object did not exist");
-	}
-
-	g_clear_error (&error);
-}
-
-static ECalComponent *
-comp_from_remote_record (GnomePilotConduitSyncAbs *conduit,
-			 GnomePilotRecord *remote,
-			 ECalComponent *in_comp,
-			 ECal *client,
-			 icaltimezone *timezone)
-{
-	ECalComponent *comp;
-	struct Appointment appt;
-	struct icaltimetype now = icaltime_from_timet_with_zone (time (NULL), FALSE, timezone), it;
-	struct icalrecurrencetype recur;
-	ECalComponentText summary = {NULL, NULL};
-	ECalComponentDateTime dt = {NULL, NULL};
-	GSList *edl = NULL;	
-	char *txt;
-	int pos, i;
-	
-	g_return_val_if_fail (remote != NULL, NULL);
-
-	memset (&appt, 0, sizeof (struct Appointment));
-	unpack_Appointment (&appt, remote->record, remote->length);
-
-	if (in_comp == NULL) {
-		comp = e_cal_component_new ();
-		e_cal_component_set_new_vtype (comp, E_CAL_COMPONENT_EVENT);
-		e_cal_component_set_created (comp, &now);
-	} else {
-		comp = e_cal_component_clone (in_comp);
-	}
-
-	e_cal_component_set_last_modified (comp, &now);
-
-	summary.value = txt = e_pilot_utf8_from_pchar (appt.description);
-	e_cal_component_set_summary (comp, &summary);
-	free (txt);
-
-	/* The iCal description field */
-	if (!appt.note) {
-		e_cal_component_set_description_list (comp, NULL);
-	} else {
-		GSList l;
-		ECalComponentText text;
-
-		text.value = txt = e_pilot_utf8_from_pchar (appt.note);
-		text.altrep = NULL;
-		l.data = &text;
-		l.next = NULL;
-
-		e_cal_component_set_description_list (comp, &l);
-		free (txt);
-	} 
-
-	if (appt.event && !is_empty_time (appt.begin)) {
-		it = tm_to_icaltimetype (&appt.begin, TRUE);
-		dt.value = &it;
-		dt.tzid = NULL;
-		e_cal_component_set_dtstart (comp, &dt);
-		e_cal_component_set_dtend (comp, &dt);
-	} else {
-		dt.tzid = icaltimezone_get_tzid (timezone);
-
-		if (!is_empty_time (appt.begin)) {
-			it = tm_to_icaltimetype (&appt.begin, FALSE);
-			dt.value = &it;
-			e_cal_component_set_dtstart (comp, &dt);
-		}
-
-		if (!is_empty_time (appt.end)) {		
-			it = tm_to_icaltimetype (&appt.end, FALSE);
-			dt.value = &it;
-			e_cal_component_set_dtend (comp, &dt);
-		}
-	}
-
-	/* Recurrence information */
-  	icalrecurrencetype_clear (&recur);
-
-	switch (appt.repeatType) {
-	case repeatNone:
-		recur.freq = ICAL_NO_RECURRENCE;
-		break;
-
-	case repeatDaily:
-		recur.freq = ICAL_DAILY_RECURRENCE;
-		recur.interval = appt.repeatFrequency;
-		break;
-
-	case repeatWeekly:
-		recur.freq = ICAL_WEEKLY_RECURRENCE;
-		recur.interval = appt.repeatFrequency;
-
-		pos = 0;
-		for (i = 0; i < 7; i++) {
-			if (appt.repeatDays[i])
-				recur.by_day[pos++] = get_ical_day (i);
-		}
-		
-		break;
-
-	case repeatMonthlyByDay:
-		recur.freq = ICAL_MONTHLY_RECURRENCE;
-		recur.interval = appt.repeatFrequency;
-		if (appt.repeatDay < domLastSun)
-			recur.by_day[0] = nth_weekday ((appt.repeatDay / 7) + 1, 
-						       get_ical_day (appt.repeatDay % 7));
-		else
-			recur.by_day[0] = nth_weekday (-1, get_ical_day (appt.repeatDay % 7));		
-		break;
-		
-	case repeatMonthlyByDate:
-		recur.freq = ICAL_MONTHLY_RECURRENCE;
-		recur.interval = appt.repeatFrequency;
-		recur.by_month_day[0] = appt.begin.tm_mday;
-		break;
-
-	case repeatYearly:
-		recur.freq = ICAL_YEARLY_RECURRENCE;
-		recur.interval = appt.repeatFrequency;
-		break;
-		
-	default:
-		g_assert_not_reached ();
-	}
-
-	if (recur.freq != ICAL_NO_RECURRENCE) {
-		GSList *list = NULL, *existing;
-		struct icalrecurrencetype *erecur;
-		
-		/* recurrence start of week */
-		recur.week_start = get_ical_day (appt.repeatWeekstart);
-
-		if (!appt.repeatForever) {
-			recur.until = tm_to_icaltimetype (&appt.repeatEnd, TRUE);	
-		}
-
-		list = g_slist_append (list, &recur);
-		e_cal_component_set_rrule_list (comp, list);
-
-		/* If the desktop uses count and rrules are
-		 * equivalent, use count still on the desktop */
-		if (!appt.repeatForever && e_cal_component_has_rrules (in_comp)) {
-			e_cal_component_get_rrule_list (in_comp, &existing);
-			erecur = existing->data;
-			
-			/* If the rules are otherwise the same and the existing uses count, 
-			   see if they end at the same point */
-			if (rrules_mostly_equal (&recur, erecur) && 
-			    icaltime_is_null_time (erecur->until) && erecur->count > 0) {
-				time_t last, elast;
-				
-				e_cal_recur_generate_instances (comp, -1, -1, find_last_cb, &last, 
-							      e_cal_resolve_tzid_cb, client,
-							      timezone);
-				e_cal_recur_generate_instances (in_comp, -1, -1, find_last_cb, &elast, 
-							      e_cal_resolve_tzid_cb, client, 
-							      timezone);
-
-				
-				if (last == elast) {
-					recur.until = icaltime_null_time ();
-					recur.count = erecur->count;
-					e_cal_component_set_rrule_list (comp, list);
-				}
-			}
-		}
-
-		g_slist_free (list);
-	} else {
-		e_cal_component_set_rrule_list (comp, NULL);		
-	}
-
-	/* Exceptions */
-	for (i = 0; i < appt.exceptions; i++) {
-		struct tm ex;
-		ECalComponentDateTime *dt = g_new0 (ECalComponentDateTime, 1);
-
-		dt->value = g_new0 (struct icaltimetype, 1);
-		dt->tzid = NULL;		
-		
-		ex = appt.exception[i];
-		*dt->value = tm_to_icaltimetype (&ex, TRUE);
-		
-		edl = g_slist_prepend (edl, dt);
-	}
-	e_cal_component_set_exdate_list (comp, edl);
-	e_cal_component_free_exdate_list (edl);
-
-	/* Alarm */
-	if (appt.alarm) {
-		ECalComponentAlarm *alarm = NULL;
-		ECalComponentAlarmTrigger trigger;
-		gboolean found = FALSE;
-		
-		if (e_cal_component_has_alarms (comp)) {
-			GList *uids, *l;
-			
-			uids = e_cal_component_get_alarm_uids (comp);
-			for (l = uids; l != NULL; l = l->next) {
-				alarm = e_cal_component_get_alarm (comp, l->data);
-				e_cal_component_alarm_get_trigger (alarm, &trigger);
-				if ((trigger.type == E_CAL_COMPONENT_ALARM_TRIGGER_RELATIVE_START
-				     && trigger.u.rel_duration.is_neg)) {
-					found = TRUE;
-					break;
-				}
-				e_cal_component_alarm_free (alarm);
-			}
-			cal_obj_uid_list_free (uids);
-		}
-		if (!found)
-			alarm = e_cal_component_alarm_new ();
-
-		memset (&trigger, 0, sizeof (ECalComponentAlarmTrigger));
-		trigger.type = E_CAL_COMPONENT_ALARM_TRIGGER_RELATIVE_START;
-		trigger.u.rel_duration.is_neg = 1;
-		switch (appt.advanceUnits) {
-		case advMinutes:
-			trigger.u.rel_duration.minutes = appt.advance;
-			break;
-		case advHours:
-			trigger.u.rel_duration.hours = appt.advance;
-			break;
-		case advDays:
-			trigger.u.rel_duration.days = appt.advance;
-			break;
-		}
-		e_cal_component_alarm_set_trigger (alarm, trigger);
-		e_cal_component_alarm_set_action (alarm, E_CAL_COMPONENT_ALARM_DISPLAY);
-
-		if (!found)
-			e_cal_component_add_alarm (comp, alarm);
-		e_cal_component_alarm_free (alarm);
-	}
-	
-	e_cal_component_set_transparency (comp, E_CAL_COMPONENT_TRANSP_NONE);
-
-	if (remote->secret)
-		e_cal_component_set_classification (comp, E_CAL_COMPONENT_CLASS_PRIVATE);
-	else
-		e_cal_component_set_classification (comp, E_CAL_COMPONENT_CLASS_PUBLIC);
-
-	e_cal_component_commit_sequence (comp);
-	
-	free_Appointment (&appt);
-
-	return comp;
-}
-
-static void
-check_for_slow_setting (GnomePilotConduit *c, ECalConduitContext *ctxt)
-{
-	GnomePilotConduitStandard *conduit = GNOME_PILOT_CONDUIT_STANDARD (c);
-	int map_count;
-	const char *uri;
-	
-	/* If there are objects but no log */
-	map_count = g_hash_table_size (ctxt->map->pid_map);
-	if (map_count == 0)
-		gnome_pilot_conduit_standard_set_slow (conduit, TRUE);
-
-	/* Or if the URI's don't match */
-	uri = e_cal_get_uri (ctxt->client);
-	LOG (g_message ( "  Current URI %s (%s)\n", uri, ctxt->cfg->last_uri ? ctxt->cfg->last_uri : "<NONE>" ));
-	if (ctxt->cfg->last_uri != NULL && strcmp (ctxt->cfg->last_uri, uri)) {
-		gnome_pilot_conduit_standard_set_slow (conduit, TRUE);
-		e_pilot_map_clear (ctxt->map);
-	}
-	
-	if (gnome_pilot_conduit_standard_get_slow (conduit)) {
-		ctxt->map->write_touched_only = TRUE;
-		LOG (g_message ( "    doing slow sync\n" ));
-	} else {
-		LOG (g_message ( "    doing fast sync\n" ));
-	}
-}
-
-/* Pilot syncing callbacks */
-static gint
-pre_sync (GnomePilotConduit *conduit,
-	  GnomePilotDBInfo *dbi,
-	  ECalConduitContext *ctxt)
-{
-	GnomePilotConduitSyncAbs *abs_conduit;
-	GList *removed = NULL, *added = NULL, *l;
-	int len;
-	unsigned char *buf;
-	char *filename, *change_id;
-	icalcomponent *icalcomp;
-	gint num_records, add_records = 0, mod_records = 0, del_records = 0;
-
-	abs_conduit = GNOME_PILOT_CONDUIT_SYNC_ABS (conduit);
-
-	LOG (g_message ( "---------------------------------------------------------\n" ));
-	LOG (g_message ( "pre_sync: Calendar Conduit v.%s", CONDUIT_VERSION ));
-
-	ctxt->dbi = dbi;	
-	ctxt->client = NULL;
-
-	if (start_calendar_server (ctxt) != 0) {
-		WARN(_("Could not start evolution-data-server"));
-		gnome_pilot_conduit_error (conduit, _("Could not start evolution-data-server"));
-		return -1;
-	}
-
-	/* Get the timezone */
-	ctxt->timezone = get_default_timezone ();
-	if (ctxt->timezone == NULL)
-		return -1;
-	LOG (g_message ( "  Using timezone: %s", icaltimezone_get_tzid (ctxt->timezone) ));
-	
-	/* Set the default timezone on the backend. */
-	if (ctxt->timezone) {
-		if (!e_cal_set_default_timezone (ctxt->client, ctxt->timezone, NULL))
-			return -1;
-	}
-
-	/* Get the default component */
-	if (!e_cal_get_default_object (ctxt->client, &icalcomp, NULL))
-		return -1;
-
-	ctxt->default_comp = e_cal_component_new ();
-	if (!e_cal_component_set_icalcomponent (ctxt->default_comp, icalcomp)) {
-		g_object_unref (ctxt->default_comp);
-		icalcomponent_free (icalcomp);
-		return -1;
-	}
-
-	/* Load the uid <--> pilot id mapping */
-	filename = map_name (ctxt);
-	e_pilot_map_read (filename, &ctxt->map);
-	g_free (filename);
-
-	/* Get the local database */
-	if (!e_cal_get_object_list_as_comp (ctxt->client, "#t", &ctxt->comps, NULL))
-		return -1;
-
-	/* Find the added, modified and deleted items */
-	change_id = g_strdup_printf ("pilot-sync-evolution-calendar-%d", ctxt->cfg->pilot_id);
-	if (!e_cal_get_changes (ctxt->client, change_id, &ctxt->changed, NULL))
-		return -1;
-	ctxt->changed_hash = g_hash_table_new (g_str_hash, g_str_equal);
-	g_free (change_id);
-	
-	/* See if we need to split up any events */
-	for (l = ctxt->changed; l != NULL; l = l->next) {
-		ECalChange *ccc = l->data;
-		GList *multi_comp = NULL, *multi_ccc = NULL;
-		
-		if (process_multi_day (ctxt, ccc, &multi_comp, &multi_ccc)) {
-			ctxt->comps = g_list_concat (ctxt->comps, multi_comp);
-			
-			added = g_list_concat (added, multi_ccc);
-			removed = g_list_prepend (removed, ccc);
-		}
-	}
-
-	/* Remove the events that were split up */
-	g_list_concat (ctxt->changed, added);
-	for (l = removed; l != NULL; l = l->next) {
-		ECalChange *ccc = l->data;
-		const char *uid;
-
-		e_cal_component_get_uid (ccc->comp, &uid);
-		if (e_pilot_map_lookup_pid (ctxt->map, uid, FALSE) == 0) {
-			ctxt->changed = g_list_remove (ctxt->changed, ccc);
-			g_object_unref (ccc->comp);
-			g_free (ccc);
-		}
-	}
-	g_list_free (removed);
-	
-	for (l = ctxt->changed; l != NULL; l = l->next) {
-		ECalChange *ccc = l->data;
-		const char *uid;
-		
-		e_cal_component_get_uid (ccc->comp, &uid);
-		if (!e_pilot_map_uid_is_archived (ctxt->map, uid)) {
-
-			g_hash_table_insert (ctxt->changed_hash, g_strdup (uid), ccc);
-
-			switch (ccc->type) {
-			case E_CAL_CHANGE_ADDED:
-				add_records++;
-				break;
-			case E_CAL_CHANGE_MODIFIED:
-				mod_records++;
-				break;
-			case E_CAL_CHANGE_DELETED:
-				del_records++;
-				break;
-			}
-		} else if (ccc->type == E_CAL_CHANGE_DELETED) {
-			e_pilot_map_remove_by_uid (ctxt->map, uid);
-		}
-	}
-	
-	/* Set the count information */
-	num_records = g_list_length (ctxt->comps);
-	gnome_pilot_conduit_sync_abs_set_num_local_records(abs_conduit, num_records);
-	gnome_pilot_conduit_sync_abs_set_num_new_local_records (abs_conduit, add_records);
-	gnome_pilot_conduit_sync_abs_set_num_updated_local_records (abs_conduit, mod_records);
-	gnome_pilot_conduit_sync_abs_set_num_deleted_local_records(abs_conduit, del_records);
-
-	buf = (unsigned char*)g_malloc (0xffff);
-	len = dlp_ReadAppBlock (dbi->pilot_socket, dbi->db_handle, 0,
-			      (unsigned char *)buf, 0xffff);
-	
-	if (len < 0) {
-		WARN (_("Could not read pilot's Calendar application block"));
-		WARN ("dlp_ReadAppBlock(...) = %d", len);
-		gnome_pilot_conduit_error (conduit,
-					   _("Could not read pilot's Calendar application block"));
-		return -1;
-	}
-	unpack_AppointmentAppInfo (&(ctxt->ai), buf, len);
-	g_free (buf);
-
-	check_for_slow_setting (conduit, ctxt);
-	if (ctxt->cfg->sync_type == GnomePilotConduitSyncTypeCopyToPilot
-	    || ctxt->cfg->sync_type == GnomePilotConduitSyncTypeCopyFromPilot)
-		ctxt->map->write_touched_only = TRUE;
-	
-	return 0;
-}
-
-static gint
-post_sync (GnomePilotConduit *conduit,
-	   GnomePilotDBInfo *dbi,
-	   ECalConduitContext *ctxt)
-{
-	GList *changed;
-	gchar *filename, *change_id;
-	
-	LOG (g_message ( "post_sync: Calendar Conduit v.%s", CONDUIT_VERSION ));
-
-	g_free (ctxt->cfg->last_uri);
-	ctxt->cfg->last_uri = g_strdup (e_cal_get_uri (ctxt->client));
-	calconduit_save_configuration (ctxt->cfg);
-	
-	filename = map_name (ctxt);
-	e_pilot_map_write (filename, ctxt->map);
-	g_free (filename);
-	
-	/* FIX ME ugly hack - our changes musn't count, this does introduce
-	 * a race condition if anyone changes a record elsewhere during sycnc
-         */
-	change_id = g_strdup_printf ("pilot-sync-evolution-calendar-%d", ctxt->cfg->pilot_id);
-	if (e_cal_get_changes (ctxt->client, change_id, &changed, NULL))
-		e_cal_free_change_list (changed);
-	g_free (change_id);
-	
-	LOG (g_message ( "---------------------------------------------------------\n" ));
-
-	return 0;
-}
-
-static gint
-set_pilot_id (GnomePilotConduitSyncAbs *conduit,
-	      ECalLocalRecord *local,
-	      guint32 ID,
-	      ECalConduitContext *ctxt)
-{
-	const char *uid;
-
-	LOG (g_message ( "set_pilot_id: setting to %d\n", ID ));
-	
-	e_cal_component_get_uid (local->comp, &uid);
-	e_pilot_map_insert (ctxt->map, ID, uid, FALSE);
-
-        return 0;
-}
-
-static gint
-set_status_cleared (GnomePilotConduitSyncAbs *conduit,
-		    ECalLocalRecord *local,
-		    ECalConduitContext *ctxt)
-{
-	const char *uid;
-	
-	LOG (g_message ( "set_status_cleared: clearing status\n" ));
-	
-	e_cal_component_get_uid (local->comp, &uid);
-	g_hash_table_remove (ctxt->changed_hash, uid);
-	
-        return 0;
-}
-
-static gint
-for_each (GnomePilotConduitSyncAbs *conduit,
-	  ECalLocalRecord **local,
-	  ECalConduitContext *ctxt)
-{
-	static GList *comps, *iterator;
-	static int count;
-
-	g_return_val_if_fail (local != NULL, -1);
-
-	if (*local == NULL) {
-		LOG (g_message ( "beginning for_each" ));
-
-		comps = ctxt->comps;
-		count = 0;
-		
-		if (comps != NULL) {
-			LOG (g_message ( "iterating over %d records", g_list_length (comps)));
-
-			*local = g_new0 (ECalLocalRecord, 1);
-			local_record_from_comp (*local, comps->data, ctxt);
-			g_list_prepend (ctxt->locals, *local);
-
-			iterator = comps;
-		} else {
-			LOG (g_message ( "no events" ));
-			(*local) = NULL;
-			return 0;
-		}
-	} else {
-		count++;
-		if (g_list_next (iterator)) {
-			iterator = g_list_next (iterator);
-
-			*local = g_new0 (ECalLocalRecord, 1);
-			local_record_from_comp (*local, iterator->data, ctxt);
-			g_list_prepend (ctxt->locals, *local);
-		} else {
-			LOG (g_message ( "for_each ending" ));
-
-			/* Tell the pilot the iteration is over */
-			*local = NULL;
-
-			return 0;
-		}
-	}
-
-	return 0;
-}
-
-static gint
-for_each_modified (GnomePilotConduitSyncAbs *conduit,
-		   ECalLocalRecord **local,
-		   ECalConduitContext *ctxt)
-{
-	static GList *iterator;
-	static int count;
-
-	g_return_val_if_fail (local != NULL, -1);
-
-	if (*local == NULL) {
-		LOG (g_message ( "for_each_modified beginning\n" ));
-		
-		iterator = ctxt->changed;
-		
-		count = 0;
-	
-		LOG (g_message ( "iterating over %d records", g_hash_table_size (ctxt->changed_hash) ));
-		
-		iterator = next_changed_item (ctxt, iterator);
-		if (iterator != NULL) {
-			ECalChange *ccc = iterator->data;
-		
-			*local = g_new0 (ECalLocalRecord, 1);
-			local_record_from_comp (*local, ccc->comp, ctxt);
-			g_list_prepend (ctxt->locals, *local);
-		} else {
-			LOG (g_message ( "no events" ));
-
-			*local = NULL;
-		}
-	} else {
-		count++;
-		iterator = g_list_next (iterator);
-		if (iterator && (iterator = next_changed_item (ctxt, iterator))) {
-			ECalChange *ccc = iterator->data;
-			
-			*local = g_new0 (ECalLocalRecord, 1);
-			local_record_from_comp (*local, ccc->comp, ctxt);
-			g_list_prepend (ctxt->locals, *local);
-		} else {
-			LOG (g_message ( "for_each_modified ending" ));
-
-			/* Signal the iteration is over */
-			*local = NULL;
-		}
-	}
-
-	return 0;
-}
-
-static gint
-compare (GnomePilotConduitSyncAbs *conduit,
-	 ECalLocalRecord *local,
-	 GnomePilotRecord *remote,
-	 ECalConduitContext *ctxt)
-{
-	/* used by the quick compare */
-	GnomePilotRecord local_pilot;
-	int retval = 0;
-
-	LOG (g_message ("compare: local=%s remote=%s...\n",
-			print_local (local), print_remote (remote)));
-
-	g_return_val_if_fail (local!=NULL,-1);
-	g_return_val_if_fail (remote!=NULL,-1);
-
-	local_pilot = local_record_to_pilot_record (local, ctxt);
-
-	if (remote->length != local_pilot.length
-	    || memcmp (local_pilot.record, remote->record, remote->length))
-		retval = 1;
-
-	if (retval == 0)
-		LOG (g_message ( "    equal" ));
-	else
-		LOG (g_message ( "    not equal" ));
-	
-	return retval;
-}
-
-static gint
-add_record (GnomePilotConduitSyncAbs *conduit,
-	    GnomePilotRecord *remote,
-	    ECalConduitContext *ctxt)
-{
-	ECalComponent *comp;
-	char *uid;
-	int retval = 0;
-	
-	g_return_val_if_fail (remote != NULL, -1);
-
-	LOG (g_message ( "add_record: adding %s to desktop\n", print_remote (remote) ));
-
-	comp = comp_from_remote_record (conduit, remote, ctxt->default_comp, ctxt->client, ctxt->timezone);
-
-	/* Give it a new UID otherwise it will be the uid of the default comp */
-	uid = e_cal_component_gen_uid ();
-	e_cal_component_set_uid (comp, uid);
-	
-	if (!e_cal_create_object (ctxt->client, e_cal_component_get_icalcomponent (comp), NULL, NULL))
-		return -1;
-
-	e_pilot_map_insert (ctxt->map, remote->ID, uid, FALSE);
-
-	g_free (uid);	
-
-	g_object_unref (comp);
-	
-	return retval;
-}
-
-static gint
-replace_record (GnomePilotConduitSyncAbs *conduit,
-		ECalLocalRecord *local,
-		GnomePilotRecord *remote,
-		ECalConduitContext *ctxt)
-{
-	ECalComponent *new_comp;
-	int retval = 0;
-	
-	g_return_val_if_fail (remote != NULL, -1);
-
-	LOG (g_message ("replace_record: replace %s with %s\n",
-			print_local (local), print_remote (remote)));
-
-	new_comp = comp_from_remote_record (conduit, remote, local->comp, ctxt->client, ctxt->timezone);
-	g_object_unref (local->comp);
-	local->comp = new_comp;
-
-	if (!e_cal_modify_object (ctxt->client, e_cal_component_get_icalcomponent (new_comp), 
-				       CALOBJ_MOD_ALL, NULL))
-		return -1;
-
-	return retval;
-}
-
-static gint
-delete_record (GnomePilotConduitSyncAbs *conduit,
-	       ECalLocalRecord *local,
-	       ECalConduitContext *ctxt)
-{
-	const char *uid;
-
-	g_return_val_if_fail (local != NULL, -1);
-	g_assert (local->comp != NULL);
-
-	e_cal_component_get_uid (local->comp, &uid);
-
-	LOG (g_message ( "delete_record: deleting %s\n", uid ));
-
-	e_pilot_map_remove_by_uid (ctxt->map, uid);
-	/* FIXME Error handling */
-	e_cal_remove_object (ctxt->client, uid, NULL);
-	
-        return 0;
-}
-
-static gint
-archive_record (GnomePilotConduitSyncAbs *conduit,
-		ECalLocalRecord *local,
-		gboolean archive,
-		ECalConduitContext *ctxt)
-{
-	const char *uid;
-	int retval = 0;
-	
-	g_return_val_if_fail (local != NULL, -1);
-
-	LOG (g_message ( "archive_record: %s\n", archive ? "yes" : "no" ));
-
-	e_cal_component_get_uid (local->comp, &uid);
-	e_pilot_map_insert (ctxt->map, local->local.ID, uid, archive);
-	
-        return retval;
-}
-
-static gint
-match (GnomePilotConduitSyncAbs *conduit,
-       GnomePilotRecord *remote,
-       ECalLocalRecord **local,
-       ECalConduitContext *ctxt)
-{
-	const char *uid;
-	
-	LOG (g_message ("match: looking for local copy of %s\n",
-			print_remote (remote)));	
-	
-	g_return_val_if_fail (local != NULL, -1);
-	g_return_val_if_fail (remote != NULL, -1);
-
-	*local = NULL;
-	uid = e_pilot_map_lookup_uid (ctxt->map, remote->ID, TRUE);
-	
-	if (!uid)
-		return 0;
-
-	LOG (g_message ( "  matched\n" ));
-	
-	*local = g_new0 (ECalLocalRecord, 1);
-	local_record_from_uid (*local, uid, ctxt);
-	
-	return 0;
-}
-
-static gint
-free_match (GnomePilotConduitSyncAbs *conduit,
-	    ECalLocalRecord *local,
-	    ECalConduitContext *ctxt)
-{
-	LOG (g_message ( "free_match: freeing\n" ));
-
-	g_return_val_if_fail (local != NULL, -1);
-
-	calconduit_destroy_record (local);
-
-	return 0;
-}
-
-static gint
-prepare (GnomePilotConduitSyncAbs *conduit,
-	 ECalLocalRecord *local,
-	 GnomePilotRecord *remote,
-	 ECalConduitContext *ctxt)
-{
-	LOG (g_message ( "prepare: encoding local %s\n", print_local (local) ));
-
-	*remote = local_record_to_pilot_record (local, ctxt);
-
-	return 0;
-}
-
-/* Pilot Settings Callbacks */
-static void
-fill_widgets (ECalConduitContext *ctxt)
-{
-	if (ctxt->cfg->source)
-		e_pilot_settings_set_source (E_PILOT_SETTINGS (ctxt->ps),
-					     ctxt->cfg->source);	
-	e_pilot_settings_set_secret (E_PILOT_SETTINGS (ctxt->ps),
-				     ctxt->cfg->secret);
-
-	e_cal_gui_fill_widgets (ctxt->gui, ctxt->cfg);
-}
-
-static gint
-create_settings_window (GnomePilotConduit *conduit,
-			GtkWidget *parent,
-			ECalConduitContext *ctxt)
-{
-	LOG (g_message ( "create_settings_window" ));
-	
-	if (!ctxt->cfg->source_list)
-		return -1;
-
-	ctxt->ps = e_pilot_settings_new (ctxt->cfg->source_list);
-	ctxt->gui = e_cal_gui_new (E_PILOT_SETTINGS (ctxt->ps));
-
-	gtk_container_add (GTK_CONTAINER (parent), ctxt->ps);
-	gtk_widget_show (ctxt->ps);
-
-	fill_widgets (ctxt);
-	
-	return 0;
-}
-static void
-display_settings (GnomePilotConduit *conduit, ECalConduitContext *ctxt)
-{
-	LOG (g_message ( "display_settings" ));
-	
-	fill_widgets (ctxt);
-}
-
-static void
-save_settings    (GnomePilotConduit *conduit, ECalConduitContext *ctxt)
-{
-        LOG (g_message ( "save_settings" ));
-
-	if (ctxt->new_cfg->source)
-		g_object_unref (ctxt->new_cfg->source);
-	ctxt->new_cfg->source = g_object_ref (e_pilot_settings_get_source (E_PILOT_SETTINGS (ctxt->ps)));
-	g_object_ref (ctxt->new_cfg->source);
-	ctxt->new_cfg->secret =
-		e_pilot_settings_get_secret (E_PILOT_SETTINGS (ctxt->ps));
-	e_cal_gui_fill_config (ctxt->gui, ctxt->new_cfg);
-
-	calconduit_save_configuration (ctxt->new_cfg);
-}
-
-static void
-revert_settings  (GnomePilotConduit *conduit, ECalConduitContext *ctxt)
-{
-	LOG (g_message ( "revert_settings" ));
-
-	calconduit_save_configuration (ctxt->cfg);
-	calconduit_destroy_configuration (ctxt->new_cfg);
-	ctxt->new_cfg = calconduit_dupe_configuration (ctxt->cfg);
-}
-
-GnomePilotConduit *
-conduit_get_gpilot_conduit (guint32 pilot_id)
-{
-	GtkObject *retval;
-	ECalConduitContext *ctxt;
-
-	LOG (g_message ( "in calendar's conduit_get_gpilot_conduit\n" ));
-
-	retval = gnome_pilot_conduit_sync_abs_new ("DatebookDB", 0x64617465);
-	g_assert (retval != NULL);
-
-	ctxt = e_calendar_context_new (pilot_id);
-	gtk_object_set_data (GTK_OBJECT (retval), "calconduit_context", ctxt);
-
-	/* Sync signals */
-	gtk_signal_connect (retval, "pre_sync", (GtkSignalFunc) pre_sync, ctxt);
-	gtk_signal_connect (retval, "post_sync", (GtkSignalFunc) post_sync, ctxt);
-
-  	gtk_signal_connect (retval, "set_pilot_id", (GtkSignalFunc) set_pilot_id, ctxt);
-  	gtk_signal_connect (retval, "set_status_cleared", (GtkSignalFunc) set_status_cleared, ctxt);
-
-  	gtk_signal_connect (retval, "for_each", (GtkSignalFunc) for_each, ctxt);
-  	gtk_signal_connect (retval, "for_each_modified", (GtkSignalFunc) for_each_modified, ctxt);
-  	gtk_signal_connect (retval, "compare", (GtkSignalFunc) compare, ctxt);
-
-  	gtk_signal_connect (retval, "add_record", (GtkSignalFunc) add_record, ctxt);
-  	gtk_signal_connect (retval, "replace_record", (GtkSignalFunc) replace_record, ctxt);
-  	gtk_signal_connect (retval, "delete_record", (GtkSignalFunc) delete_record, ctxt);
-  	gtk_signal_connect (retval, "archive_record", (GtkSignalFunc) archive_record, ctxt);
-
-  	gtk_signal_connect (retval, "match", (GtkSignalFunc) match, ctxt);
-  	gtk_signal_connect (retval, "free_match", (GtkSignalFunc) free_match, ctxt);
-
-  	gtk_signal_connect (retval, "prepare", (GtkSignalFunc) prepare, ctxt);
-
-	/* Gui Settings */
-	gtk_signal_connect (retval, "create_settings_window", (GtkSignalFunc) create_settings_window, ctxt);
-	gtk_signal_connect (retval, "display_settings", (GtkSignalFunc) display_settings, ctxt);
-	gtk_signal_connect (retval, "save_settings", (GtkSignalFunc) save_settings, ctxt);
-	gtk_signal_connect (retval, "revert_settings", (GtkSignalFunc) revert_settings, ctxt);
-
-	return GNOME_PILOT_CONDUIT (retval);
-}
-
-void
-conduit_destroy_gpilot_conduit (GnomePilotConduit *conduit)
-{ 
-	GtkObject *obj = GTK_OBJECT (conduit);
-	ECalConduitContext *ctxt;
-
-	ctxt = gtk_object_get_data (obj, "calconduit_context");
-	e_calendar_context_destroy (ctxt);
-
-	gtk_object_destroy (obj);
-}
diff --git a/calendar/conduits/calendar/e-calendar.conduit.in b/calendar/conduits/calendar/e-calendar.conduit.in
deleted file mode 100644
index 6ddcf5761a..0000000000
--- a/calendar/conduits/calendar/e-calendar.conduit.in
+++ /dev/null
@@ -1,9 +0,0 @@
-<gnome-pilot-conduit version="1.0">
-	<conduit id="e_calendar_conduit" type="shlib" location="@privconduitdir@/libecalendar_conduit.so"/>
-	<name value="ECalendar"/>
-	<conduit-attribute name="description" value="Synchronizes Calendar with Evolution @BASE_VERSION@"/>
-	<conduit-attribute name="default-synctype" value="synchronize"/>
-	<conduit-attribute name="valid-synctypes" value="synchronize copy_from_pilot copy_to_pilot"/>
-     	<conduit-attribute name="settings" value="TRUE"/>
-	<conduit-attribute name="icon" value="@datadir@/images/evolution/conduits/48_evo-calendar-conduit.png"/>
-</gnome-pilot-conduit>
diff --git a/calendar/conduits/todo/.cvsignore b/calendar/conduits/todo/.cvsignore
deleted file mode 100644
index 84e47b82ae..0000000000
--- a/calendar/conduits/todo/.cvsignore
+++ /dev/null
@@ -1,9 +0,0 @@
-Makefile.in
-Makefile
-.deps
-.libs
-*.lo
-*.la
-e-todo-conduit-control-applet
-e-todo-conduit-control-applet.desktop
-*.conduit
diff --git a/calendar/conduits/todo/Makefile.am b/calendar/conduits/todo/Makefile.am
deleted file mode 100644
index 8753a50395..0000000000
--- a/calendar/conduits/todo/Makefile.am
+++ /dev/null
@@ -1,37 +0,0 @@
-INCLUDES = 					\
-	-I$(top_srcdir)/e-util			\
-	-I$(top_builddir)/e-util		\
-	-I$(top_srcdir)/widgets/misc		\
-	-I$(top_builddir)/widgets/misc		\
-	$(EVOLUTION_CALENDAR_CONDUIT_CFLAGS)
-
-# ToDo Conduit
-privconduit_LTLIBRARIES = libetodo_conduit.la
-
-libetodo_conduit_la_SOURCES = 	\
-	todo-conduit.c
-
-libetodo_conduit_la_LDFLAGS = -module -avoid-version
-libetodo_conduit_la_LIBADD = 						\
-	$(top_builddir)/e-util/libeutil.la				\
-	$(top_builddir)/e-util/libeconduit.la		 		\
-	$(top_builddir)/widgets/misc/libemiscwidgets.la		 	\
-	$(EVOLUTION_CALENDAR_CONDUIT_LIBS)
-
-e-todo-$(BASE_VERSION).conduit: e-todo.conduit.in
-	sed -e 's^\@privconduitdir\@^$(privconduitdir)^g' 			\
-	    -e 's^\@datadir\@^$(datadir)^g' 				\
-	    -e 's^\@BASE_VERSION\@^$(BASE_VERSION)^g' 			\
-	    $< > $@
-
-conduitdir = $(datadir)/gnome-pilot/conduits/
-conduit_DATA = e-todo-$(BASE_VERSION).conduit
-
-BUILT_SOURCES = $(conduit_DATA)
-CLEANFILES = $(BUILT_SOURCES)
-
-EXTRA_DIST = \
-	e-todo.conduit.in
-
-dist-hook:
-	cd $(distdir); rm -f $(BUILT_SOURCES)
-\ No newline at end of file
diff --git a/calendar/conduits/todo/e-todo.conduit.in b/calendar/conduits/todo/e-todo.conduit.in
deleted file mode 100644
index 3b02058c91..0000000000
--- a/calendar/conduits/todo/e-todo.conduit.in
+++ /dev/null
@@ -1,9 +0,0 @@
-<gnome-pilot-conduit version="1.0">
-	<conduit id="e_todo_conduit" type="shlib" location="@privconduitdir@/libetodo_conduit.so"/>
-	<name value="EToDo"/>
-	<conduit-attribute name="description" value="Synchronizes ToDo List with Evolution @BASE_VERSION@"/>
-	<conduit-attribute name="default-synctype" value="synchronize"/>
-	<conduit-attribute name="valid-synctypes" value="synchronize copy_from_pilot copy_to_pilot"/>
-     	<conduit-attribute name="settings" value="TRUE"/>
-	<conduit-attribute name="icon" value="@datadir@/images/evolution/conduits/48_evo-todo-conduit.png"/>
-</gnome-pilot-conduit>
diff --git a/calendar/conduits/todo/todo-conduit.c b/calendar/conduits/todo/todo-conduit.c
deleted file mode 100644
index 1767741270..0000000000
--- a/calendar/conduits/todo/todo-conduit.c
+++ /dev/null
@@ -1,1438 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-/* Evolution calendar - ToDo Conduit
- *
- * Copyright (C) 1998 Free Software Foundation
- * Copyright (C) 2000 Ximian, Inc.
- *
- * Authors: Eskil Heyn Olsen <deity@eskil.dk> 
- *          JP Rosevear <jpr@ximian.com>
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of version 2 of the GNU General Public
- * License as published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307, USA.
- */
-
-
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
-
-#define G_LOG_DOMAIN "etodoconduit"
-
-#include <libecal/e-cal-types.h>
-#include <libecal/e-cal.h>
-#include <libecal/e-cal-time-util.h>
-#include <pi-source.h>
-#include <pi-socket.h>
-#include <pi-dlp.h>
-#include <pi-todo.h>
-#include <libical/icaltypes.h>
-#include <gpilotd/gnome-pilot-conduit.h>
-#include <gpilotd/gnome-pilot-conduit-sync-abs.h>
-#include <libgpilotdCM/gnome-pilot-conduit-management.h>
-#include <libgpilotdCM/gnome-pilot-conduit-config.h>
-#include <e-pilot-map.h>
-#include <e-pilot-settings.h>
-#include <e-pilot-util.h>
-#include <e-config-listener.h>
-
-GnomePilotConduit * conduit_get_gpilot_conduit (guint32);
-void conduit_destroy_gpilot_conduit (GnomePilotConduit*);
-
-#define CONDUIT_VERSION "0.1.6"
-
-#define DEBUG_TODOCONDUIT 1
-/* #undef DEBUG_TODOCONDUIT */
-
-#ifdef DEBUG_TODOCONDUIT
-#define LOG(x) x
-#else
-#define LOG(x)
-#endif 
-
-#define WARN g_warning
-#define INFO g_message
-
-typedef struct _EToDoLocalRecord EToDoLocalRecord;
-typedef struct _EToDoConduitCfg EToDoConduitCfg;
-typedef struct _EToDoConduitGui EToDoConduitGui;
-typedef struct _EToDoConduitContext EToDoConduitContext;
-
-/* Local Record */
-struct _EToDoLocalRecord {
-	/* The stuff from gnome-pilot-conduit-standard-abs.h
-	   Must be first in the structure, or instances of this
-	   structure cannot be used by gnome-pilot-conduit-standard-abs.
-	*/
-	GnomePilotDesktopRecord local;
-
-	/* The corresponding Comp object */
-	ECalComponent *comp;
-
-        /* pilot-link todo structure */
-	struct ToDo *todo;
-};
-
-static void
-todoconduit_destroy_record (EToDoLocalRecord *local) 
-{
-	g_object_unref (local->comp);
-	free_ToDo (local->todo);
-	g_free (local->todo);	
-	g_free (local);
-}
-
-/* Configuration */
-struct _EToDoConduitCfg {
-	guint32 pilot_id;
-	GnomePilotConduitSyncType  sync_type;
-
-	ESourceList *source_list;
-	ESource *source;
-	gboolean secret;
-	gint priority;
-
-	gchar *last_uri;
-};
-
-static EToDoConduitCfg *
-todoconduit_load_configuration (guint32 pilot_id) 
-{
-	EToDoConduitCfg *c;
-	GnomePilotConduitManagement *management;
-	GnomePilotConduitConfig *config;
-	gchar prefix[256];
-
-
-	g_snprintf (prefix, 255, "/gnome-pilot.d/e-todo-conduit/Pilot_%u/",
-		    pilot_id);
-	
-	c = g_new0 (EToDoConduitCfg,1);
-	g_assert (c != NULL);
-
-	c->pilot_id = pilot_id;
-
-	management = gnome_pilot_conduit_management_new ("e_todo_conduit", GNOME_PILOT_CONDUIT_MGMT_ID);
-	gtk_object_ref (GTK_OBJECT (management));
-	gtk_object_sink (GTK_OBJECT (management));
-	config = gnome_pilot_conduit_config_new (management, pilot_id);
-	gtk_object_ref (GTK_OBJECT (config));
-	gtk_object_sink (GTK_OBJECT (config));
-	if (!gnome_pilot_conduit_config_is_enabled (config, &c->sync_type))
-		c->sync_type = GnomePilotConduitSyncTypeNotSet;
-	gtk_object_unref (GTK_OBJECT (config));
-	gtk_object_unref (GTK_OBJECT (management));
-	
-	/* Custom settings */
-	gnome_config_push_prefix (prefix);
-	
-	if (!e_cal_get_sources (&c->source_list, E_CAL_SOURCE_TYPE_TODO, NULL))
-		c->source_list = NULL;
-	if (c->source_list) {
-		c->source = e_pilot_get_sync_source (c->source_list);
-		if (!c->source)
-			c->source = e_source_list_peek_source_any (c->source_list);
-		if (c->source) {
-			g_object_ref (c->source);
-		} else {
-			g_object_unref (c->source_list);
-			c->source_list = NULL;
-		}
-	}
-	
-	c->secret = gnome_config_get_bool ("secret=FALSE");
-	c->priority = gnome_config_get_int ("priority=3");
-	c->last_uri = gnome_config_get_string ("last_uri");
-
-	gnome_config_pop_prefix ();
-
-	return c;
-}
-
-static void
-todoconduit_save_configuration (EToDoConduitCfg *c) 
-{
-	gchar prefix[256];
-
-	g_snprintf (prefix, 255, "/gnome-pilot.d/e-todo-conduit/Pilot_%u/",
-		    c->pilot_id);
-
-	gnome_config_push_prefix (prefix);
-	e_pilot_set_sync_source (c->source_list, c->source);
-	gnome_config_set_bool ("secret", c->secret);
-	gnome_config_set_int ("priority", c->priority);
-	gnome_config_set_string ("last_uri", c->last_uri);
-	gnome_config_pop_prefix ();
-
-	gnome_config_sync ();
-	gnome_config_drop_all ();
-}
-
-static EToDoConduitCfg*
-todoconduit_dupe_configuration (EToDoConduitCfg *c) 
-{
-	EToDoConduitCfg *retval;
-
-	g_return_val_if_fail (c != NULL, NULL);
-
-	retval = g_new0 (EToDoConduitCfg, 1);
-	retval->sync_type = c->sync_type;
-	retval->pilot_id = c->pilot_id;
-
-	if (c->source_list)
-		retval->source_list = g_object_ref (c->source_list);
-	if (c->source)
-		retval->source = g_object_ref (c->source);
-	retval->secret = c->secret;
-	retval->priority = c->priority;
-	retval->last_uri = g_strdup (c->last_uri);
-
-	return retval;
-}
-
-static void 
-todoconduit_destroy_configuration (EToDoConduitCfg *c) 
-{
-	g_return_if_fail (c != NULL);
-
-	g_object_unref (c->source_list);
-	g_object_unref (c->source);
-	g_free (c->last_uri);
-	g_free (c);
-}
-
-/* Gui */
-struct _EToDoConduitGui {
-	GtkWidget *priority;
-};
-
-static EToDoConduitGui *
-e_todo_gui_new (EPilotSettings *ps) 
-{
-	EToDoConduitGui *gui;
-	GtkWidget *lbl;
-	GtkObject *adj;
-	gint rows;
-	
-	g_return_val_if_fail (ps != NULL, NULL);
-	g_return_val_if_fail (E_IS_PILOT_SETTINGS (ps), NULL);
-
-	gtk_table_resize (GTK_TABLE (ps), E_PILOT_SETTINGS_TABLE_ROWS + 1, E_PILOT_SETTINGS_TABLE_COLS);
-
-	gui = g_new0 (EToDoConduitGui, 1);
-
-	rows = E_PILOT_SETTINGS_TABLE_ROWS;
-	lbl = gtk_label_new (_("Default Priority:"));
-	gtk_misc_set_alignment (GTK_MISC (lbl), 0.0, 0.5);
-	adj = gtk_adjustment_new (1, 1, 5, 1, 5, 5);
-	gui->priority = gtk_spin_button_new (GTK_ADJUSTMENT (adj), 1.0, 0);
-	gtk_spin_button_set_numeric (GTK_SPIN_BUTTON (gui->priority), TRUE);
-	gtk_table_attach_defaults (GTK_TABLE (ps), lbl, 0, 1, rows, rows + 1);
-        gtk_table_attach_defaults (GTK_TABLE (ps), gui->priority, 1, 2, rows, rows + 1);
-	gtk_widget_show (lbl);
-	gtk_widget_show (gui->priority);
-	
-	return gui;
-}
-
-static void
-e_todo_gui_fill_widgets (EToDoConduitGui *gui, EToDoConduitCfg *cfg) 
-{
-	g_return_if_fail (gui != NULL);
-	g_return_if_fail (cfg != NULL);
-
-	gtk_spin_button_set_value (GTK_SPIN_BUTTON (gui->priority), cfg->priority);
-}
-
-static void
-e_todo_gui_fill_config (EToDoConduitGui *gui, EToDoConduitCfg *cfg) 
-{
-	g_return_if_fail (gui != NULL);
-	g_return_if_fail (cfg != NULL);
-
-	cfg->priority = gtk_spin_button_get_value_as_int (GTK_SPIN_BUTTON (gui->priority));
-}
-
-static void
-e_todo_gui_destroy (EToDoConduitGui *gui) 
-{
-	g_free (gui);
-}
-
-/* Context */
-struct _EToDoConduitContext {
-	GnomePilotDBInfo *dbi;
-
-	EToDoConduitCfg *cfg;
-	EToDoConduitCfg *new_cfg;
-	EToDoConduitGui *gui;
-	GtkWidget *ps;
-	
-	struct ToDoAppInfo ai;
-
-	ECal *client;
-
-	icaltimezone *timezone;
-	ECalComponent *default_comp;
-	GList *comps;
-	GList *changed;
-	GHashTable *changed_hash;
-	GList *locals;
-	
-	EPilotMap *map;
-};
-
-static EToDoConduitContext *
-e_todo_context_new (guint32 pilot_id) 
-{
-	EToDoConduitContext *ctxt = g_new0 (EToDoConduitContext, 1);
-	
-	ctxt->cfg = todoconduit_load_configuration (pilot_id);
-	ctxt->new_cfg = todoconduit_dupe_configuration (ctxt->cfg);
-	ctxt->gui = NULL;
-	ctxt->ps = NULL;
-	ctxt->client = NULL;
-	ctxt->timezone = NULL;
-	ctxt->default_comp = NULL;
-	ctxt->comps = NULL;
-	ctxt->changed_hash = NULL;
-	ctxt->changed = NULL;
-	ctxt->locals = NULL;
-	ctxt->map = NULL;
-
-	return ctxt;
-}
-
-static gboolean
-e_todo_context_foreach_change (gpointer key, gpointer value, gpointer data) 
-{
-	g_free (key);
-	
-	return TRUE;
-}
-
-static void
-e_todo_context_destroy (EToDoConduitContext *ctxt)
-{
-	GList *l;
-	
-	g_return_if_fail (ctxt != NULL);
-
-	if (ctxt->cfg != NULL)
-		todoconduit_destroy_configuration (ctxt->cfg);
-	if (ctxt->new_cfg != NULL)
-		todoconduit_destroy_configuration (ctxt->new_cfg);
-	if (ctxt->gui != NULL)
-		e_todo_gui_destroy (ctxt->gui);
-	
-	if (ctxt->client != NULL)
-		g_object_unref (ctxt->client);
-
-	if (ctxt->default_comp != NULL)
-		g_object_unref (ctxt->default_comp);
-	if (ctxt->comps != NULL) {
-		for (l = ctxt->comps; l; l = l->next)
-			g_object_unref (l->data);
-		g_list_free (ctxt->comps);
-	}
-
-	if (ctxt->changed_hash != NULL) {
-		g_hash_table_foreach_remove (ctxt->changed_hash, e_todo_context_foreach_change, NULL);
-		g_hash_table_destroy (ctxt->changed_hash);
-	}
-
-	if (ctxt->locals != NULL) {
-		for (l = ctxt->locals; l != NULL; l = l->next)
-			todoconduit_destroy_record (l->data);
-		g_list_free (ctxt->locals);
-	}
-	
-	if (ctxt->changed != NULL)
-		e_cal_free_change_list (ctxt->changed);
-	
-	if (ctxt->map != NULL)
-		e_pilot_map_destroy (ctxt->map);
-
-	g_free (ctxt);
-}
-
-/* Debug routines */
-static char *
-print_local (EToDoLocalRecord *local)
-{
-	static char buff[ 4096 ];
-
-	if (local == NULL) {
-		sprintf (buff, "[NULL]");
-		return buff;
-	}
-
-	if (local->todo && local->todo->description) {
-		g_snprintf (buff, 4096, "[%d %ld %d %d '%s' '%s']",
-			    local->todo->indefinite,
-			    mktime (& local->todo->due),
-			    local->todo->priority,
-			    local->todo->complete,
-			    local->todo->description ?
-			    local->todo->description : "",
-			    local->todo->note ?
-			    local->todo->note : "");
-		return buff;
-	}
-
-	return "";
-}
-
-static char *print_remote (GnomePilotRecord *remote)
-{
-	static char buff[ 4096 ];
-	struct ToDo todo;
-
-	if (remote == NULL) {
-		sprintf (buff, "[NULL]");
-		return buff;
-	}
-
-	memset (&todo, 0, sizeof (struct ToDo));
-	unpack_ToDo (&todo, remote->record, remote->length);
-
-	g_snprintf (buff, 4096, "[%d %ld %d %d '%s' '%s']",
-		    todo.indefinite,
-		    mktime (&todo.due),
-		    todo.priority,
-		    todo.complete,
-		    todo.description ?
-		    todo.description : "",
-		    todo.note ?
-		    todo.note : "");
-
-	free_ToDo (&todo);
-	
-	return buff;
-}
-
-static int
-start_calendar_server (EToDoConduitContext *ctxt)
-{
-	g_return_val_if_fail (ctxt != NULL, -2);
-
-	if (ctxt->cfg->source) {
-		ctxt->client = e_cal_new (ctxt->cfg->source, E_CAL_SOURCE_TYPE_TODO);
-		if (!e_cal_open (ctxt->client, TRUE, NULL)) 
-			return -1;
-	} else if (!e_cal_open_default (&ctxt->client, E_CAL_SOURCE_TYPE_TODO, NULL, NULL, NULL)) {
-		return -1;
-	}
-
-	return 0;
-}
-
-/* Utility routines */
-static icaltimezone *
-get_timezone (ECal *client, const char *tzid) 
-{
-	icaltimezone *timezone = NULL;
-
-	timezone = icaltimezone_get_builtin_timezone_from_tzid (tzid);
-	if (timezone == NULL)
-		 e_cal_get_timezone (client, tzid, &timezone, NULL);
-	
-	return timezone;
-}
-
-static icaltimezone *
-get_default_timezone (void)
-{
-	EConfigListener *listener;
-	icaltimezone *timezone = NULL;
-	char *location;
-
-	listener = e_config_listener_new ();
-
-	location = e_config_listener_get_string_with_default (listener,
-		"/apps/evolution/calendar/display/timezone", "UTC", NULL);
-	if (!location || !location[0]) {
-		g_free (location);
-		location = g_strdup ("UTC");
-	}
-	
-	timezone = icaltimezone_get_builtin_timezone (location);
-	g_free (location);
-
-	g_object_unref (listener);
-
-	return timezone;	
-}
-
-static char *
-map_name (EToDoConduitContext *ctxt) 
-{
-	char *filename;
-	
-	filename = g_strdup_printf ("%s/.evolution/tasks/local/system/pilot-map-todo-%d.xml", g_get_home_dir (), ctxt->cfg->pilot_id);
-	
-	return filename;
-}
-
-static gboolean
-is_empty_time (struct tm time) 
-{
-	if (time.tm_sec || time.tm_min || time.tm_hour 
-	    || time.tm_mday || time.tm_mon || time.tm_year) 
-		return FALSE;
-	
-	return TRUE;
-}
-
-static GList *
-next_changed_item (EToDoConduitContext *ctxt, GList *changes) 
-{
-	ECalChange *ccc;
-	GList *l;
-	
-	for (l = changes; l != NULL; l = l->next) {
-		const char *uid;
-
-		ccc = l->data;
-		
-		e_cal_component_get_uid (ccc->comp, &uid);
-		if (g_hash_table_lookup (ctxt->changed_hash, uid))
-			return l;
-	}
-	
-	return NULL;
-}
-
-static void
-compute_status (EToDoConduitContext *ctxt, EToDoLocalRecord *local, const char *uid)
-{
-	ECalChange *ccc;
-
-	local->local.archived = FALSE;
-	local->local.secret = FALSE;
-
-	ccc = g_hash_table_lookup (ctxt->changed_hash, uid);
-	
-	if (ccc == NULL) {
-		local->local.attr = GnomePilotRecordNothing;
-		return;
-	}
-	
-	switch (ccc->type) {
-	case E_CAL_CHANGE_ADDED:
-		local->local.attr = GnomePilotRecordNew;
-		break;	
-	case E_CAL_CHANGE_MODIFIED:
-		local->local.attr = GnomePilotRecordModified;
-		break;
-	case E_CAL_CHANGE_DELETED:
-		local->local.attr = GnomePilotRecordDeleted;
-		break;
-	}
-}
-
-static GnomePilotRecord
-local_record_to_pilot_record (EToDoLocalRecord *local,
-			      EToDoConduitContext *ctxt)
-{
-	GnomePilotRecord p;
-	static char record[0xffff];
-
-	g_assert (local->comp != NULL);
-	g_assert (local->todo != NULL );
-	
-	LOG (g_message ( "local_record_to_pilot_record\n" ));
-
-	p.ID = local->local.ID;
-	p.category = local->local.category;
-	p.attr = local->local.attr;
-	p.archived = local->local.archived;
-	p.secret = local->local.secret;
-
-	/* Generate pilot record structure */
-	p.record = record;
-	p.length = pack_ToDo (local->todo, p.record, 0xffff);
-
-	return p;	
-}
-
-/*
- * converts a ECalComponent object to a EToDoLocalRecord
- */
-static void
-local_record_from_comp (EToDoLocalRecord *local, ECalComponent *comp, EToDoConduitContext *ctxt) 
-{
-	const char *uid;
-	int *priority;
-	icalproperty_status status;
-	ECalComponentText summary;
-	GSList *d_list = NULL;
-	ECalComponentText *description;
-	ECalComponentDateTime due;
-	ECalComponentClassification classif;
-	icaltimezone *default_tz = get_default_timezone ();
-	
-	LOG (g_message ( "local_record_from_comp\n" ));
-
-	g_return_if_fail (local != NULL);
-	g_return_if_fail (comp != NULL);
-
-	local->comp = comp;
-	g_object_ref (comp);
-
-	e_cal_component_get_uid (local->comp, &uid);
-	local->local.ID = e_pilot_map_lookup_pid (ctxt->map, uid, TRUE);
-
-	compute_status (ctxt, local, uid);
-
-	local->todo = g_new0 (struct ToDo,1);
-
-	/* Don't overwrite the category */
-	if (local->local.ID != 0) {
-		char record[0xffff];
-		int cat = 0;
-		
-		if (dlp_ReadRecordById (ctxt->dbi->pilot_socket, 
-					ctxt->dbi->db_handle,
-					local->local.ID, &record, 
-					NULL, NULL, NULL, &cat) > 0) {
-			local->local.category = cat;			
-		}
-	}
-
-	/* STOP: don't replace these with g_strdup, since free_ToDo
-	   uses free to deallocate */
-	e_cal_component_get_summary (comp, &summary);
-	if (summary.value) 
-		local->todo->description = e_pilot_utf8_to_pchar (summary.value);
-
-	e_cal_component_get_description_list (comp, &d_list);
-	if (d_list) {
-		description = (ECalComponentText *) d_list->data;
-		if (description && description->value)
-			local->todo->note = e_pilot_utf8_to_pchar (description->value);
-		else
-			local->todo->note = NULL;
-	} else {
-		local->todo->note = NULL;
-	}
-
-	e_cal_component_get_due (comp, &due);	
-	if (due.value) {
-		icaltimezone_convert_time (due.value,
-					   get_timezone (ctxt->client, due.tzid),
-					   default_tz);
-		local->todo->due = icaltimetype_to_tm (due.value);
-		local->todo->indefinite = 0;
-	} else {
-		local->todo->indefinite = 1;
-	}
-	e_cal_component_free_datetime (&due);	
-
-	e_cal_component_get_status (comp, &status);	
-	if (status == ICAL_STATUS_COMPLETED)
-		local->todo->complete = 1;
-	else
-		local->todo->complete = 0;
-	
-	e_cal_component_get_priority (comp, &priority);
-	if (priority && *priority != 0) {
-		if (*priority <= 3)
-			local->todo->priority = 1;
-		else if (*priority == 4)
-			local->todo->priority = 2;
-		else if (*priority == 5)
-			local->todo->priority = 3;
-		else if (*priority <= 7)
-			local->todo->priority = 4;
-		else
-			local->todo->priority = 5;
-		
-		e_cal_component_free_priority (priority);
-	} else {
-		local->todo->priority = ctxt->cfg->priority;
-	}	
-	
-	e_cal_component_get_classification (comp, &classif);
-
-	if (classif == E_CAL_COMPONENT_CLASS_PRIVATE)
-		local->local.secret = 1;
-	else
-		local->local.secret = 0;
-
-	local->local.archived = 0;
-}
-
-static void 
-local_record_from_uid (EToDoLocalRecord *local,
-		       const char *uid,
-		       EToDoConduitContext *ctxt)
-{
-	ECalComponent *comp;
-	icalcomponent *icalcomp;
-	GError *error = NULL;
-
-	g_assert(local!=NULL);
-
-	if (e_cal_get_object (ctxt->client, uid, NULL, &icalcomp, &error)) {
-		comp = e_cal_component_new ();
-		if (!e_cal_component_set_icalcomponent (comp, icalcomp)) {
-			g_object_unref (comp);
-			icalcomponent_free (icalcomp);
-			return;
-		}
-
-		local_record_from_comp (local, comp, ctxt);
-		g_object_unref (comp);
-	} else if (error->code == E_CALENDAR_STATUS_OBJECT_NOT_FOUND) {
-		comp = e_cal_component_new ();
-		e_cal_component_set_new_vtype (comp, E_CAL_COMPONENT_TODO);
-		e_cal_component_set_uid (comp, uid);
-		local_record_from_comp (local, comp, ctxt);
-		g_object_unref (comp);
-	} else {
-		INFO ("Object did not exist");
-	}
-
-	g_clear_error (&error);
-}
-
-
-static ECalComponent *
-comp_from_remote_record (GnomePilotConduitSyncAbs *conduit,
-			 GnomePilotRecord *remote,
-			 ECalComponent *in_comp,
-			 icaltimezone *timezone)
-{
-	ECalComponent *comp;
-	struct ToDo todo;
-	ECalComponentText summary = {NULL, NULL};
-	ECalComponentDateTime dt = {NULL, icaltimezone_get_tzid (timezone)};
-	struct icaltimetype due, now;
-	icaltimezone *utc_zone;
-	int priority;
-	char *txt;
-	
-	g_return_val_if_fail (remote != NULL, NULL);
-
-	memset (&todo, 0, sizeof (struct ToDo));
-	unpack_ToDo (&todo, remote->record, remote->length);
-
-	utc_zone = icaltimezone_get_utc_timezone ();
-	now = icaltime_from_timet_with_zone (time (NULL), FALSE, 
-					     utc_zone);
-
-	if (in_comp == NULL) {
-		comp = e_cal_component_new ();
-		e_cal_component_set_new_vtype (comp, E_CAL_COMPONENT_TODO);
-		e_cal_component_set_created (comp, &now);
-	} else {
-		comp = e_cal_component_clone (in_comp);
-	}
-
-	e_cal_component_set_last_modified (comp, &now);
-
-	summary.value = txt = e_pilot_utf8_from_pchar (todo.description);
-	e_cal_component_set_summary (comp, &summary);
-	free (txt);
-	
-	/* The iCal description field */
-	if (!todo.note) {
-		e_cal_component_set_comment_list (comp, NULL);
-	} else {
-		GSList l;
-		ECalComponentText text;
-
-		text.value = txt = e_pilot_utf8_from_pchar (todo.note);
-		text.altrep = NULL;
-		l.data = &text;
-		l.next = NULL;
-
-		e_cal_component_set_description_list (comp, &l);
-		free (txt);
-	} 
-
-	if (todo.complete) {
-		int percent = 100;
-
-		e_cal_component_set_completed (comp, &now);
-		e_cal_component_set_percent (comp, &percent);
-		e_cal_component_set_status (comp, ICAL_STATUS_COMPLETED);
-	} else {
-		int *percent = NULL;
-		icalproperty_status status;
-		
-		e_cal_component_set_completed (comp, NULL);
-		
-		e_cal_component_get_percent (comp, &percent);
-		if (percent == NULL || *percent == 100) {
-			int p = 0;
-			e_cal_component_set_percent (comp, &p);
-		}
-		if (percent != NULL)
-			e_cal_component_free_percent (percent);
-
-		e_cal_component_get_status (comp, &status);
-		if (status == ICAL_STATUS_COMPLETED)
-			e_cal_component_set_status (comp, ICAL_STATUS_NEEDSACTION);
-	}
-
-	if (!is_empty_time (todo.due)) {
-		due = tm_to_icaltimetype (&todo.due, TRUE);
-		dt.value = &due;
-		e_cal_component_set_due (comp, &dt);
-	}
-
-	switch (todo.priority) {
-	case 1:
-		priority = 3;
-		break;
-	case 2:
-		priority = 4;
-		break;
-	case 3:
-		priority = 5;
-		break;
-	case 4:
-		priority = 7;
-		break;
-	default:
-		priority = 9;
-	}
-	
-	e_cal_component_set_priority (comp, &priority);
-	e_cal_component_set_transparency (comp, E_CAL_COMPONENT_TRANSP_NONE);
-
-	if (remote->secret)
-		e_cal_component_set_classification (comp, E_CAL_COMPONENT_CLASS_PRIVATE);
-	else
-		e_cal_component_set_classification (comp, E_CAL_COMPONENT_CLASS_PUBLIC);
-
-	e_cal_component_commit_sequence (comp);
-	
-	free_ToDo(&todo);
-
-	return comp;
-}
-
-static void
-check_for_slow_setting (GnomePilotConduit *c, EToDoConduitContext *ctxt)
-{
-	GnomePilotConduitStandard *conduit = GNOME_PILOT_CONDUIT_STANDARD (c);
-	int map_count;
-	const char *uri;
-	
-	/* If there are no objects or objects but no log */
-	map_count = g_hash_table_size (ctxt->map->pid_map);
-	if (map_count == 0)
-		gnome_pilot_conduit_standard_set_slow (conduit, TRUE);
-
-	/* Or if the URI's don't match */
-	uri = e_cal_get_uri (ctxt->client);
-	LOG (g_message ( "  Current URI %s (%s)\n", uri, ctxt->cfg->last_uri ? ctxt->cfg->last_uri : "<NONE>" ));
-	if (ctxt->cfg->last_uri != NULL && strcmp (ctxt->cfg->last_uri, uri)) {
-		gnome_pilot_conduit_standard_set_slow (conduit, TRUE);
-		e_pilot_map_clear (ctxt->map);
-	}
-
-	if (gnome_pilot_conduit_standard_get_slow (conduit)) {
-		ctxt->map->write_touched_only = TRUE;
-		LOG (g_message ( "    doing slow sync\n" ));
-	} else {
-		LOG (g_message ( "    doing fast sync\n" ));
-	}	
-}
-
-/* Pilot syncing callbacks */
-static gint
-pre_sync (GnomePilotConduit *conduit,
-	  GnomePilotDBInfo *dbi,
-	  EToDoConduitContext *ctxt)
-{
-	GnomePilotConduitSyncAbs *abs_conduit;
-	GList *l;
-	int len;
-	unsigned char *buf;
-	char *filename, *change_id;
-	icalcomponent *icalcomp;
-	gint num_records, add_records = 0, mod_records = 0, del_records = 0;
-
-	abs_conduit = GNOME_PILOT_CONDUIT_SYNC_ABS (conduit);
-
-	LOG (g_message ( "---------------------------------------------------------\n" ));
-	LOG (g_message ( "pre_sync: ToDo Conduit v.%s", CONDUIT_VERSION ));
-	g_message ("ToDo Conduit v.%s", CONDUIT_VERSION);
-
-	ctxt->dbi = dbi;	
-	ctxt->client = NULL;
-	
-	if (start_calendar_server (ctxt) != 0) {
-		WARN(_("Could not start evolution-data-server"));
-		gnome_pilot_conduit_error (conduit, _("Could not start evolution-data-server"));
-		return -1;
-	}
-
-	/* Get the timezone */
-	ctxt->timezone = get_default_timezone ();
-	if (ctxt->timezone == NULL)
-		return -1;
-	LOG (g_message ( "  Using timezone: %s", icaltimezone_get_tzid (ctxt->timezone) ));
-
-	/* Set the default timezone on the backend. */
-	if (ctxt->timezone && !e_cal_set_default_timezone (ctxt->client, ctxt->timezone, NULL))
-		return -1;
-	
-	/* Get the default component */
-	if (!e_cal_get_default_object (ctxt->client, &icalcomp, NULL))
-		return -1;
-	
-	ctxt->default_comp = e_cal_component_new ();
-	if (!e_cal_component_set_icalcomponent (ctxt->default_comp, icalcomp)) {
-		g_object_unref (ctxt->default_comp);
-		icalcomponent_free (icalcomp);
-		return -1;
-	}
-	
-	/* Load the uid <--> pilot id map */
-	filename = map_name (ctxt);
-	e_pilot_map_read (filename, &ctxt->map);
-	g_free (filename);
-
-	/* Get the local database */
-	if (!e_cal_get_object_list_as_comp (ctxt->client, "#t", &ctxt->comps, NULL))
-		return -1;
-	
-	/* Count and hash the changes */
-	change_id = g_strdup_printf ("pilot-sync-evolution-todo-%d", ctxt->cfg->pilot_id);
-	if (!e_cal_get_changes (ctxt->client, change_id, &ctxt->changed, NULL))
-		return -1;
-	
-	ctxt->changed_hash = g_hash_table_new (g_str_hash, g_str_equal);
-	g_free (change_id);
-	
-	for (l = ctxt->changed; l != NULL; l = l->next) {
-		ECalChange *ccc = l->data;
-		const char *uid;
-		
-		e_cal_component_get_uid (ccc->comp, &uid);
-		if (!e_pilot_map_uid_is_archived (ctxt->map, uid)) {
-			
-			g_hash_table_insert (ctxt->changed_hash, g_strdup (uid), ccc);
-			
-			switch (ccc->type) {
-			case E_CAL_CHANGE_ADDED:
-				add_records++;
-				break;
-			case E_CAL_CHANGE_MODIFIED:
-				mod_records++;
-				break;
-			case E_CAL_CHANGE_DELETED:
-				del_records++;
-				break;
-			}
-		} else if (ccc->type == E_CAL_CHANGE_DELETED) {
-			e_pilot_map_remove_by_uid (ctxt->map, uid);
-		}
-	}
-
-	/* Set the count information */
-	num_records = g_list_length (ctxt->comps);
-	gnome_pilot_conduit_sync_abs_set_num_local_records(abs_conduit, num_records);
-	gnome_pilot_conduit_sync_abs_set_num_new_local_records (abs_conduit, add_records);
-	gnome_pilot_conduit_sync_abs_set_num_updated_local_records (abs_conduit, mod_records);
-	gnome_pilot_conduit_sync_abs_set_num_deleted_local_records(abs_conduit, del_records);
-
-	buf = (unsigned char*)g_malloc (0xffff);
-	len = dlp_ReadAppBlock (dbi->pilot_socket, dbi->db_handle, 0,
-			      (unsigned char *)buf, 0xffff);
-	
-	if (len < 0) {
-		WARN (_("Could not read pilot's ToDo application block"));
-		WARN ("dlp_ReadAppBlock(...) = %d", len);
-		gnome_pilot_conduit_error (conduit,
-					   _("Could not read pilot's ToDo application block"));
-		return -1;
-	}
-	unpack_ToDoAppInfo (&(ctxt->ai), buf, len);
-	g_free (buf);
-
-	check_for_slow_setting (conduit, ctxt);
-	if (ctxt->cfg->sync_type == GnomePilotConduitSyncTypeCopyToPilot
-	    || ctxt->cfg->sync_type == GnomePilotConduitSyncTypeCopyFromPilot)
-		ctxt->map->write_touched_only = TRUE;
-	
-	return 0;
-}
-
-static gint
-post_sync (GnomePilotConduit *conduit,
-	   GnomePilotDBInfo *dbi,
-	   EToDoConduitContext *ctxt)
-{
-	GList *changed;
-	gchar *filename, *change_id;
-
-	LOG (g_message ( "post_sync: ToDo Conduit v.%s", CONDUIT_VERSION ));
-
-	g_free (ctxt->cfg->last_uri);
-	ctxt->cfg->last_uri = g_strdup (e_cal_get_uri (ctxt->client));
-	todoconduit_save_configuration (ctxt->cfg);
-	
-	filename = map_name (ctxt);
-	e_pilot_map_write (filename, ctxt->map);
-	g_free (filename);
-
-	/* FIX ME ugly hack - our changes musn't count, this does introduce
-	 * a race condition if anyone changes a record elsewhere during sycnc
-         */
-	change_id = g_strdup_printf ("pilot-sync-evolution-todo-%d", ctxt->cfg->pilot_id);
-	if (e_cal_get_changes (ctxt->client, change_id, &changed, NULL))
-		e_cal_free_change_list (changed);
-	g_free (change_id);
-	
-	LOG (g_message ( "---------------------------------------------------------\n" ));
-
-	return 0;
-}
-
-static gint
-set_pilot_id (GnomePilotConduitSyncAbs *conduit,
-	      EToDoLocalRecord *local,
-	      guint32 ID,
-	      EToDoConduitContext *ctxt)
-{
-	const char *uid;
-
-	LOG (g_message ( "set_pilot_id: setting to %d\n", ID ));
-	
-	e_cal_component_get_uid (local->comp, &uid);
-	e_pilot_map_insert (ctxt->map, ID, uid, FALSE);
-
-        return 0;
-}
-
-static gint
-set_status_cleared (GnomePilotConduitSyncAbs *conduit,
-		    EToDoLocalRecord *local,
-		    EToDoConduitContext *ctxt)
-{
-	const char *uid;
-	
-	LOG (g_message ( "set_status_cleared: clearing status\n" ));
-	
-	e_cal_component_get_uid (local->comp, &uid);
-	g_hash_table_remove (ctxt->changed_hash, uid);
-	
-        return 0;
-}
-
-static gint
-for_each (GnomePilotConduitSyncAbs *conduit,
-	  EToDoLocalRecord **local,
-	  EToDoConduitContext *ctxt)
-{
-	static GList *comps, *iterator;
-	static int count;
-
-	g_return_val_if_fail (local != NULL, -1);
-
-	if (*local == NULL) {
-		LOG (g_message ( "beginning for_each" ));
-
-		comps = ctxt->comps;
-		count = 0;
-		
-		if (comps != NULL) {
-			LOG (g_message ( "iterating over %d records", g_list_length (comps)));
-
-			*local = g_new0 (EToDoLocalRecord, 1);
-			local_record_from_comp (*local, comps->data, ctxt);
-			g_list_prepend (ctxt->locals, *local);
-			
-			iterator = comps;
-		} else {
-			LOG (g_message ( "no events" ));
-			(*local) = NULL;
-			return 0;
-		}
-	} else {
-		count++;
-		if (g_list_next (iterator)) {
-			iterator = g_list_next (iterator);
-
-			*local = g_new0 (EToDoLocalRecord, 1);
-			local_record_from_comp (*local, iterator->data, ctxt);
-			g_list_prepend (ctxt->locals, *local);
-		} else {
-			LOG (g_message ( "for_each ending" ));
-
-			/* Tell the pilot the iteration is over */
-			*local = NULL;
-
-			return 0;
-		}
-	}
-
-	return 0;
-}
-
-static gint
-for_each_modified (GnomePilotConduitSyncAbs *conduit,
-		   EToDoLocalRecord **local,
-		   EToDoConduitContext *ctxt)
-{
-	static GList *iterator;
-	static int count;
-
-	g_return_val_if_fail (local != NULL, 0);
-
-	if (*local == NULL) {
-		LOG (g_message ( "for_each_modified beginning\n" ));
-		
-		iterator = ctxt->changed;
-		
-		count = 0;
-	
-		LOG (g_message ( "iterating over %d records", g_hash_table_size (ctxt->changed_hash) ));
-		
-		iterator = next_changed_item (ctxt, iterator);
-		if (iterator != NULL) {
-			ECalChange *ccc = iterator->data;
-		
-			*local = g_new0 (EToDoLocalRecord, 1);
-			local_record_from_comp (*local, ccc->comp, ctxt);
-			g_list_prepend (ctxt->locals, *local);
-		} else {
-			LOG (g_message ( "no events" ));
-
-			*local = NULL;
-		}
-	} else {
-		count++;
-		iterator = g_list_next (iterator);
-		if (iterator && (iterator = next_changed_item (ctxt, iterator))) {
-			ECalChange *ccc = iterator->data;
-			
-			*local = g_new0 (EToDoLocalRecord, 1);
-			local_record_from_comp (*local, ccc->comp, ctxt);			
-			g_list_prepend (ctxt->locals, *local);
-		} else {
-			LOG (g_message ( "for_each_modified ending" ));
-
-			/* Signal the iteration is over */
-			*local = NULL;
-		}
-	}
-
-	return 0;
-}
-
-static gint
-compare (GnomePilotConduitSyncAbs *conduit,
-	 EToDoLocalRecord *local,
-	 GnomePilotRecord *remote,
-	 EToDoConduitContext *ctxt)
-{
-	/* used by the quick compare */
-	GnomePilotRecord local_pilot;
-	int retval = 0;
-
-	LOG (g_message ("compare: local=%s remote=%s...\n",
-			print_local (local), print_remote (remote)));
-
-	g_return_val_if_fail (local!=NULL,-1);
-	g_return_val_if_fail (remote!=NULL,-1);
-
-	local_pilot = local_record_to_pilot_record (local, ctxt);
-
-	if (remote->length != local_pilot.length
-	    || memcmp (local_pilot.record, remote->record, remote->length))
-		retval = 1;
-
-	if (retval == 0)
-		LOG (g_message ( "    equal" ));
-	else
-		LOG (g_message ( "    not equal" ));
-	
-	return retval;
-}
-
-static gint
-add_record (GnomePilotConduitSyncAbs *conduit,
-	    GnomePilotRecord *remote,
-	    EToDoConduitContext *ctxt)
-{
-	ECalComponent *comp;
-	char *uid;
-	int retval = 0;
-	
-	g_return_val_if_fail (remote != NULL, -1);
-
-	LOG (g_message ( "add_record: adding %s to desktop\n", print_remote (remote) ));
-
-	comp = comp_from_remote_record (conduit, remote, ctxt->default_comp, ctxt->timezone);
-
-	/* Give it a new UID otherwise it will be the uid of the default comp */
-	uid = e_cal_component_gen_uid ();
-	e_cal_component_set_uid (comp, uid);
-
-	if (!e_cal_create_object (ctxt->client, e_cal_component_get_icalcomponent (comp), NULL, NULL))
-		return -1;
-
-	e_pilot_map_insert (ctxt->map, remote->ID, uid, FALSE);
-
-	g_object_unref (comp);
-
-	return retval;
-}
-
-static gint
-replace_record (GnomePilotConduitSyncAbs *conduit,
-		EToDoLocalRecord *local,
-		GnomePilotRecord *remote,
-		EToDoConduitContext *ctxt)
-{
-	ECalComponent *new_comp;
-	int retval = 0;
-	
-	g_return_val_if_fail (remote != NULL, -1);
-
-	LOG (g_message ("replace_record: replace %s with %s\n",
-			print_local (local), print_remote (remote)));
-
-	new_comp = comp_from_remote_record (conduit, remote, local->comp, ctxt->timezone);
-	g_object_unref (local->comp);
-	local->comp = new_comp;
-
-	if (!e_cal_modify_object (ctxt->client, e_cal_component_get_icalcomponent (new_comp), 
-				       CALOBJ_MOD_ALL, NULL))
-		return -1;
-
-	return retval;
-}
-
-static gint
-delete_record (GnomePilotConduitSyncAbs *conduit,
-	       EToDoLocalRecord *local,
-	       EToDoConduitContext *ctxt)
-{
-	const char *uid;
-
-	g_return_val_if_fail (local != NULL, -1);
-	g_return_val_if_fail (local->comp != NULL, -1);
-
-	e_cal_component_get_uid (local->comp, &uid);
-
-	LOG (g_message ( "delete_record: deleting %s\n", uid ));
-
-	e_pilot_map_remove_by_uid (ctxt->map, uid);
-	/* FIXME Error handling */
-	e_cal_remove_object (ctxt->client, uid, NULL);
-	
-        return 0;
-}
-
-static gint
-archive_record (GnomePilotConduitSyncAbs *conduit,
-		EToDoLocalRecord *local,
-		gboolean archive,
-		EToDoConduitContext *ctxt)
-{
-	const char *uid;
-	int retval = 0;
-	
-	g_return_val_if_fail (local != NULL, -1);
-
-	LOG (g_message ( "archive_record: %s\n", archive ? "yes" : "no" ));
-
-	e_cal_component_get_uid (local->comp, &uid);
-	e_pilot_map_insert (ctxt->map, local->local.ID, uid, archive);
-	
-        return retval;
-}
-
-static gint
-match (GnomePilotConduitSyncAbs *conduit,
-       GnomePilotRecord *remote,
-       EToDoLocalRecord **local,
-       EToDoConduitContext *ctxt)
-{
-	const char *uid;
-	
-	LOG (g_message ("match: looking for local copy of %s\n",
-			print_remote (remote)));	
-	
-	g_return_val_if_fail (local != NULL, -1);
-	g_return_val_if_fail (remote != NULL, -1);
-
-	*local = NULL;
-	uid = e_pilot_map_lookup_uid (ctxt->map, remote->ID, TRUE);
-	
-	if (!uid)
-		return 0;
-
-	LOG (g_message ( "  matched\n" ));
-	
-	*local = g_new0 (EToDoLocalRecord, 1);
-	local_record_from_uid (*local, uid, ctxt);
-	
-	return 0;
-}
-
-static gint
-free_match (GnomePilotConduitSyncAbs *conduit,
-	    EToDoLocalRecord *local,
-	    EToDoConduitContext *ctxt)
-{
-	LOG (g_message ( "free_match: freeing\n" ));
-
-	g_return_val_if_fail (local != NULL, -1);
-
-	todoconduit_destroy_record (local);
-
-	return 0;
-}
-
-static gint
-prepare (GnomePilotConduitSyncAbs *conduit,
-	 EToDoLocalRecord *local,
-	 GnomePilotRecord *remote,
-	 EToDoConduitContext *ctxt)
-{
-	LOG (g_message ( "prepare: encoding local %s\n", print_local (local) ));
-
-	*remote = local_record_to_pilot_record (local, ctxt);
-
-	return 0;
-}
-
-/* Pilot Settings Callbacks */
-static void
-fill_widgets (EToDoConduitContext *ctxt)
-{
-	if (ctxt->cfg->source)
-		e_pilot_settings_set_source (E_PILOT_SETTINGS (ctxt->ps), 
-					     ctxt->cfg->source);
-	e_pilot_settings_set_secret (E_PILOT_SETTINGS (ctxt->ps),
-				     ctxt->cfg->secret);
-
-	e_todo_gui_fill_widgets (ctxt->gui, ctxt->cfg);
-}
-
-static gint
-create_settings_window (GnomePilotConduit *conduit,
-			GtkWidget *parent,
-			EToDoConduitContext *ctxt)
-{
-	LOG (g_message ( "create_settings_window" ));
-	
-	if (!ctxt->cfg->source_list)	
-		return -1;
-
-	ctxt->ps = e_pilot_settings_new (ctxt->cfg->source_list);
-	ctxt->gui = e_todo_gui_new (E_PILOT_SETTINGS (ctxt->ps));
-
-	gtk_container_add (GTK_CONTAINER (parent), ctxt->ps);
-	gtk_widget_show (ctxt->ps);
-
-	fill_widgets (ctxt);
-	
-	return 0;
-}
-
-static void
-display_settings (GnomePilotConduit *conduit, EToDoConduitContext *ctxt)
-{
-	LOG (g_message ( "display_settings" ));
-	
-	fill_widgets (ctxt);
-}
-
-static void
-save_settings    (GnomePilotConduit *conduit, EToDoConduitContext *ctxt)
-{
-	LOG (g_message ( "save_settings" ));
-
-	if (ctxt->new_cfg->source)
-		g_object_unref (ctxt->new_cfg->source);
-	ctxt->new_cfg->source = e_pilot_settings_get_source (E_PILOT_SETTINGS (ctxt->ps));
-	g_object_ref (ctxt->new_cfg->source);
-	ctxt->new_cfg->secret = e_pilot_settings_get_secret (E_PILOT_SETTINGS (ctxt->ps));
-	e_todo_gui_fill_config (ctxt->gui, ctxt->new_cfg);
-	
-	todoconduit_save_configuration (ctxt->new_cfg);
-}
-
-static void
-revert_settings  (GnomePilotConduit *conduit, EToDoConduitContext *ctxt)
-{
-	LOG (g_message ( "revert_settings" ));
-
-	todoconduit_save_configuration (ctxt->cfg);
-	todoconduit_destroy_configuration (ctxt->new_cfg);
-	ctxt->new_cfg = todoconduit_dupe_configuration (ctxt->cfg);
-}
-
-GnomePilotConduit *
-conduit_get_gpilot_conduit (guint32 pilot_id)
-{
-	GtkObject *retval;
-	EToDoConduitContext *ctxt;
-
-	LOG (g_message ( "in todo's conduit_get_gpilot_conduit\n" ));
-
-	retval = gnome_pilot_conduit_sync_abs_new ("ToDoDB", 0x746F646F);
-	g_assert (retval != NULL);
-	
-	ctxt = e_todo_context_new (pilot_id);
-	gtk_object_set_data (GTK_OBJECT (retval), "todoconduit_context", ctxt);
-
-	gtk_signal_connect (retval, "pre_sync", (GtkSignalFunc) pre_sync, ctxt);
-	gtk_signal_connect (retval, "post_sync", (GtkSignalFunc) post_sync, ctxt);
-
-  	gtk_signal_connect (retval, "set_pilot_id", (GtkSignalFunc) set_pilot_id, ctxt);
-  	gtk_signal_connect (retval, "set_status_cleared", (GtkSignalFunc) set_status_cleared, ctxt);
-
-  	gtk_signal_connect (retval, "for_each", (GtkSignalFunc) for_each, ctxt);
-  	gtk_signal_connect (retval, "for_each_modified", (GtkSignalFunc) for_each_modified, ctxt);
-  	gtk_signal_connect (retval, "compare", (GtkSignalFunc) compare, ctxt);
-
-  	gtk_signal_connect (retval, "add_record", (GtkSignalFunc) add_record, ctxt);
-  	gtk_signal_connect (retval, "replace_record", (GtkSignalFunc) replace_record, ctxt);
-  	gtk_signal_connect (retval, "delete_record", (GtkSignalFunc) delete_record, ctxt);
-  	gtk_signal_connect (retval, "archive_record", (GtkSignalFunc) archive_record, ctxt);
-
-  	gtk_signal_connect (retval, "match", (GtkSignalFunc) match, ctxt);
-  	gtk_signal_connect (retval, "free_match", (GtkSignalFunc) free_match, ctxt);
-
-  	gtk_signal_connect (retval, "prepare", (GtkSignalFunc) prepare, ctxt);
-
-	/* Gui Settings */
-	gtk_signal_connect (retval, "create_settings_window", (GtkSignalFunc) create_settings_window, ctxt);
-	gtk_signal_connect (retval, "display_settings", (GtkSignalFunc) display_settings, ctxt);
-	gtk_signal_connect (retval, "save_settings", (GtkSignalFunc) save_settings, ctxt);
-	gtk_signal_connect (retval, "revert_settings", (GtkSignalFunc) revert_settings, ctxt);
-
-	return GNOME_PILOT_CONDUIT (retval);
-}
-
-void
-conduit_destroy_gpilot_conduit (GnomePilotConduit *conduit)
-{ 
-	GtkObject *obj = GTK_OBJECT (conduit);
-	EToDoConduitContext *ctxt;
-	
-	ctxt = gtk_object_get_data (obj, "todoconduit_context");
-	e_todo_context_destroy (ctxt);
-
-	gtk_object_destroy (obj);
-}
diff --git a/calendar/gui/.cvsignore b/calendar/gui/.cvsignore
deleted file mode 100644
index 328884758a..0000000000
--- a/calendar/gui/.cvsignore
+++ /dev/null
@@ -1,28 +0,0 @@
-Makefile.in
-Makefile
-.deps
-_libs
-.libs
-.pure
-apps_evolution_calendar-1.5.schemas
-apps_evolution_calendar-1.5.schemas.in
-apps_evolution_calendar-2.2.schemas
-evolution-calendar
-evolution-calendar.pure
-evolution-calendar.h
-evolution-calendar-common.c
-evolution-calendar-skels.c
-evolution-calendar-stubs.c
-e-calendar-marshal.h
-e-calendar-marshal.c
-*.lo
-Evolution-Addressbook-SelectNames-common.c
-Evolution-Addressbook-SelectNames-skels.c
-Evolution-Addressbook-SelectNames-stubs.c
-Evolution-Addressbook-SelectNames.h
-Evolution-Composer-common.c
-Evolution-Composer-skels.c
-Evolution-Composer-stubs.c
-Evolution-Composer.h
-GNOME_Evolution_Calendar*.server
-GNOME_Evolution_Calendar*.server.in
diff --git a/calendar/gui/GNOME_Evolution_Calendar.server.in.in b/calendar/gui/GNOME_Evolution_Calendar.server.in.in
deleted file mode 100644
index 21690f8f71..0000000000
--- a/calendar/gui/GNOME_Evolution_Calendar.server.in.in
+++ /dev/null
@@ -1,114 +0,0 @@
-<oaf_info>
-
-<oaf_server iid="OAFIID:GNOME_Evolution_Calendar_Factory:@VERSION@"
-            type="shlib"
-            location="@COMPONENTDIR@/libevolution-calendar.so">
-
-	<oaf_attribute name="repo_ids" type="stringv">
-		<item value="IDL:GNOME/ObjectFactory:1.0"/>
-	</oaf_attribute>
-
-	<oaf_attribute name="name" type="string"
-                       _value="Evolution Calendar and Tasks"/>
-
-</oaf_server>
-
-<oaf_server iid="OAFIID:GNOME_Evolution_Calendar_iTip_Control:@VERSION@"
-            type="factory"
-            location="OAFIID:GNOME_Evolution_Calendar_Factory:@VERSION@">
-
-	<oaf_attribute name="repo_ids" type="stringv">
-		<item value="IDL:Bonobo/Control:1.0"/>
-	        <item value="IDL:Bonobo/PersistStream:1.0"/>
-	</oaf_attribute>
-
-	<oaf_attribute name="bonobo:supported_mime_types" type="stringv">
-		<item value="text/calendar"/>
-		<item value="text/x-calendar"/>
-	</oaf_attribute>
-
-	<oaf_attribute name="name" type="string"
-		       _value="Evolution Calendar scheduling message viewer"/>
-</oaf_server>
-
-<oaf_server iid="OAFIID:GNOME_Evolution_Calendar_Component:@VERSION@"
-            type="factory"
-            location="OAFIID:GNOME_Evolution_Calendar_Factory:@VERSION@">
-
-	<oaf_attribute name="repo_ids" type="stringv">
-		<item value="IDL:GNOME/Evolution/Component:@VERSION@"/>
-	</oaf_attribute>
-
-	<oaf_attribute name="evolution:component_alias" type="string" value="calendar"/>
-
-	<oaf_attribute name="name" type="string" _value="Evolution's Calendar component"/>
-
-	<oaf_attribute name="evolution:menu_label" type="string" _value="_Calendars"/>
-	<oaf_attribute name="evolution:menu_accelerator" type="string" value="*Control*F3"/>
-	<oaf_attribute name="evolution:button_label" type="string" _value="Calendars"/>
-        <oaf_attribute name="evolution:button_icon" type="string" value="stock_calendar"/>
-	<oaf_attribute name="evolution:button_sort_order" type="string" value="-8"/>
-</oaf_server>
-
-<oaf_server iid="OAFIID:GNOME_Evolution_Tasks_Component:@VERSION@"
-            type="factory"
-            location="OAFIID:GNOME_Evolution_Calendar_Factory:@VERSION@">
-
-	<oaf_attribute name="repo_ids" type="stringv">
-		<item value="IDL:GNOME/Evolution/Component:@VERSION@"/>
-	</oaf_attribute>
-
-	<oaf_attribute name="evolution:component_alias" type="string" value="tasks"/>
-
-	<oaf_attribute name="name" type="string" _value="Evolution's Tasks component"/>
-
-	<oaf_attribute name="evolution:menu_label" type="string" _value="_Tasks"/>
-	<oaf_attribute name="evolution:menu_accelerator" type="string" value="*Control*F4"/>
-	<oaf_attribute name="evolution:button_label" type="string" _value="Tasks"/>
-        <oaf_attribute name="evolution:button_icon" type="string" value="stock_todo"/>
-	<oaf_attribute name="evolution:button_sort_order" type="string" value="-8"/>
-</oaf_server>
-
-<oaf_server iid="OAFIID:GNOME_Evolution_Calendar_CompEditorFactory:@VERSION@"
-            type="factory"
-            location="OAFIID:GNOME_Evolution_Calendar_Factory:@VERSION@">
-
-	<oaf_attribute name="repo_ids" type="stringv">
-		<item value="IDL:GNOME/Evolution/Calendar/CompEditorFactory:@VERSION@"/>
-		<item value="IDL:Bonobo/Unknown:1.0"/>
-	</oaf_attribute>
-
-	<oaf_attribute name="name" type="string"
-                       _value="Evolution Calendar/Task editor"/>
-</oaf_server>
-
-<oaf_server iid="OAFIID:GNOME_Evolution_Calendar_ConfigControl:@VERSION@"
-	    type="factory"
-	    location="OAFIID:GNOME_Evolution_Calendar_Factory:@VERSION@">
-
-	<oaf_attribute name="repo_ids" type="stringv">
-		<item value="IDL:GNOME/Evolution/ConfigControl:@VERSION@"/>
-	</oaf_attribute>
-
-	<oaf_attribute name="evolution2:config_item:title" type="string"
-		       _value="Calendar and Tasks"/>
-
-	<oaf_attribute name="evolution2:config_item:description" type="string"
-		       _value="Configure your timezone, Calendar and Task List here "/>
-
-	<oaf_attribute name="evolution2:config_item:icon_name" type="string"
-		       value="stock_calendar-and-tasks"/>
-
-	<oaf_attribute name="evolution2:config_item:type" type="stringv">
-		<item value="calendar"/>
-		<item value="tasks"/>
-	</oaf_attribute>
-
-	<oaf_attribute name="evolution2:config_item:priority" type="string" value="-7"/>
-    
-	<oaf_attribute name="name" type="string"
-		       _value="Evolution Calendar configuration control"/>
-
-</oaf_server>
-
-</oaf_info>
diff --git a/calendar/gui/Makefile.am b/calendar/gui/Makefile.am
deleted file mode 100644
index f1463147ba..0000000000
--- a/calendar/gui/Makefile.am
+++ /dev/null
@@ -1,263 +0,0 @@
-## CORBA stuff
-
-IDLS =												   	\
-	$(top_srcdir)/composer/Evolution-Composer.idl						  	\
-	$(top_srcdir)/calendar/idl/evolution-calendar.idl
-
-CALENDAR_IDL_GENERATED_H =              		\
-	evolution-calendar.h
-CALENDAR_IDL_GENERATED_C =		\
-	evolution-calendar-common.c	\
-	evolution-calendar-skels.c	\
-	evolution-calendar-stubs.c
-CALENDAR_IDL_GENERATED = $(CALENDAR_IDL_GENERATED_C) $(CALENDAR_IDL_GENERATED_H)
-
-$(CALENDAR_IDL_GENERATED_H): $(IDLS)
-	$(ORBIT_IDL) -I $(srcdir) $(IDL_INCLUDES)   \
-                $(top_srcdir)/calendar/idl/evolution-calendar.idl
-$(CALENDAR_IDL_GENERATED_C): $(CALENDAR_IDL_GENERATED_H)
-
-# Message composer IDL files
-
-COMPOSER_IDL_GENERATED_H = \
-        Evolution-Composer.h
-COMPOSER_IDL_GENERATED_C =             			\
-        Evolution-Composer-common.c       		\
-        Evolution-Composer-skels.c        		\
-        Evolution-Composer-stubs.c
-COMPOSER_IDL_GENERATED = $(COMPOSER_IDL_GENERATED_C) $(COMPOSER_IDL_GENERATED_H)
-
-$(COMPOSER_IDL_GENERATED_H): $(IDLS)
-	$(ORBIT_IDL) -I $(srcdir) $(IDL_INCLUDES)   \
-                $(srcdir)/../../composer/Evolution-Composer.idl
-$(COMPOSER_IDL_GENERATED_C): $(COMPOSER_IDL_GENERATED_H)
-
-IDL_GENERATED = $(CALENDAR_IDL_GENERATED) $(COMPOSER_IDL_GENERATED)
-
-# The marshallers
-MARSHAL_GENERATED = e-calendar-marshal.c e-calendar-marshal.h
-@EVO_MARSHAL_RULE@
-
-SUBDIRS = alarm-notify dialogs
-
-component_LTLIBRARIES = libevolution-calendar.la
-
-ecalendarincludedir = $(privincludedir)/calendar/gui
-
-ecalendarinclude_HEADERS =	\
-	e-cal-config.h
-
-INCLUDES =						\
-	-DG_LOG_DOMAIN=\"calendar-gui\"			\
-	-I$(top_builddir)/shell				\
-	-I$(top_srcdir)/shell				\
-	-I$(top_srcdir)					\
-	-I$(top_srcdir)/calendar			\
-	-I$(top_srcdir)/widgets				\
-	-I$(top_srcdir)/widgets/misc			\
-	-I$(top_srcdir)/a11y/calendar			\
-	-DEVOLUTION_DATADIR=\""$(datadir)"\"		\
-	-DEVOLUTION_GLADEDIR=\""$(gladedir)"\"		\
-	-DEVOLUTION_ETSPECDIR=\""$(etspecdir)"\"	\
-	-DEVOLUTION_IMAGESDIR=\""$(imagesdir)"\"	\
-	-DEVOLUTION_GALVIEWSDIR=\""$(viewsdir)"\"	\
-	-DEVOLUTION_UIDIR=\""$(evolutionuidir)"\"	\
-	-DPREFIX=\""$(prefix)"\"			\
-	$(LIBSOUP_CFLAGS)				\
-	$(EVOLUTION_CALENDAR_CFLAGS)
-
-glade_DATA = 					\
-	e-itip-control.glade			\
-	goto-dialog.glade
-
-etspec_DATA =				\
-	e-calendar-table.etspec		\
-	e-meeting-time-sel.etspec	\
-	e-cal-list-view.etspec
-
-libevolution_calendar_la_SOURCES =		\
-	$(IDL_GENERATED)			\
-	$(MARSHAL_GENERATED)			\
-	cal-search-bar.c			\
-	cal-search-bar.h			\
-	calendar-config.c			\
-	calendar-config.h			\
-	calendar-config-keys.h			\
-	calendar-commands.c			\
-	calendar-commands.h			\
-	calendar-component.c			\
-	calendar-component.h			\
-	calendar-offline-handler.c		\
-	calendar-offline-handler.h		\
-	calendar-view.c				\
-	calendar-view.h				\
-	calendar-view-factory.c			\
-	calendar-view-factory.h			\
-	comp-editor-factory.c			\
-	comp-editor-factory.h			\
-	comp-util.c				\
-	comp-util.h				\
-	control-factory.c			\
-	control-factory.h			\
-	e-alarm-list.c				\
-	e-alarm-list.h				\
-	e-cal-component-preview.c		\
-	e-cal-component-preview.h		\
-	e-cal-config.c				\
-	e-cal-config.h				\
-	e-cal-event.c				\
-	e-cal-event.h				\
-	e-cal-menu.c				\
-	e-cal-menu.h				\
-	e-cal-model-calendar.h			\
-	e-cal-model-calendar.c			\
-	e-cal-model-calendar.h			\
-	e-cal-model-tasks.c			\
-	e-cal-model-tasks.h			\
-	e-cal-model.c				\
-	e-cal-model.h				\
-	e-cal-popup.h				\
-	e-cal-popup.c				\
-	e-calendar-view.c			\
-	e-calendar-view.h			\
-	e-cal-list-view.c			\
-	e-cal-list-view.h			\
-	e-cal-list-view-config.c		\
-	e-cal-list-view-config.h		\
-	e-calendar-table.c			\
-	e-calendar-table.h			\
-	e-calendar-table-config.c		\
-	e-calendar-table-config.h		\
-	e-cell-date-edit-config.c		\
-	e-cell-date-edit-config.h		\
-	e-cell-date-edit-text.h			\
-	e-cell-date-edit-text.c			\
-	e-comp-editor-registry.c		\
-	e-comp-editor-registry.h		\
-	e-date-edit-config.c			\
-	e-date-edit-config.h			\
-	e-date-time-list.c                      \
-	e-date-time-list.h                      \
-	e-day-view-config.c			\
-	e-day-view-config.h			\
-	e-day-view-layout.c			\
-	e-day-view-layout.h			\
-	e-day-view-main-item.c			\
-	e-day-view-main-item.h			\
-	e-day-view-time-item.c			\
-	e-day-view-time-item.h			\
-	e-day-view-top-item.c			\
-	e-day-view-top-item.h			\
-	e-day-view.c				\
-	e-day-view.h				\
-	e-itip-control.h			\
-	e-itip-control.c			\
-	e-meeting-attendee.c			\
-	e-meeting-attendee.h			\
-	e-meeting-list-view.c			\
-	e-meeting-list-view.h			\
-	e-meeting-store.c			\
-	e-meeting-store.h			\
-	e-meeting-time-sel.c			\
-	e-meeting-time-sel.h			\
-	e-meeting-time-sel-item.c		\
-	e-meeting-time-sel-item.h		\
-	e-meeting-types.h			\
-	e-meeting-utils.c			\
-	e-meeting-utils.h			\
-	e-mini-calendar-config.c		\
-	e-mini-calendar-config.h		\
-	e-pub-utils.c				\
-	e-pub-utils.h				\
-	e-select-names-editable.c		\
-	e-select-names-editable.h		\
-	e-select-names-renderer.c		\
-	e-select-names-renderer.h		\
-	e-week-view-config.c			\
-	e-week-view-config.h			\
-	e-week-view-event-item.c		\
-	e-week-view-event-item.h		\
-	e-week-view-layout.c			\
-	e-week-view-layout.h			\
-	e-week-view-main-item.c			\
-	e-week-view-main-item.h			\
-	e-week-view-titles-item.c		\
-	e-week-view-titles-item.h		\
-	e-week-view.c				\
-	e-week-view.h				\
-	e-tasks.c				\
-	e-tasks.h				\
-	e-timezone-entry.c			\
-	e-timezone-entry.h			\
-	gnome-cal.c				\
-	gnome-cal.h				\
-	goto.c					\
-	goto.h					\
-	itip-bonobo-control.c			\
-	itip-bonobo-control.h			\
-	itip-utils.c				\
-	itip-utils.h				\
-	main.c					\
-	migration.c				\
-	migration.h				\
-	misc.c					\
-	misc.h					\
-	print.c					\
-	print.h					\
-	tag-calendar.c				\
-	tag-calendar.h				\
-	tasks-component.c			\
-	tasks-component.h			\
-	tasks-control.c				\
-	tasks-control.h				\
-	weekday-picker.c			\
-	weekday-picker.h
-
-libevolution_calendar_la_LIBADD =					\
-	$(top_builddir)/widgets/menus/libmenus.la			\
-	$(top_builddir)/shell/libeshell.la				\
-	$(top_builddir)/calendar/common/libevolution-calendarprivate.la	\
-	$(top_builddir)/calendar/gui/dialogs/libcal-dialogs.la		\
-	$(top_builddir)/widgets/e-timezone-dialog/libetimezonedialog.la	\
-	$(top_builddir)/widgets/misc/libemiscwidgets.la			\
-	$(top_builddir)/e-util/libeutil.la				\
-	$(top_builddir)/a11y/calendar/libevolution-calendar-a11y.la	\
-	$(LIBSOUP_LIBS)							\
-	$(EVOLUTION_CALENDAR_LIBS)
-
-libevolution_calendar_la_LDFLAGS = -avoid-version -module
-
-server_in_files = GNOME_Evolution_Calendar.server.in.in
-server_DATA = $(server_in_files:.server.in.in=_$(BASE_VERSION).server)
-@EVO_SERVER_RULE@
-@INTLTOOL_SERVER_RULE@
-
-# GConf schemas
-
-schemadir   = $(GCONF_SCHEMA_FILE_DIR)
-schema_in_files = apps_evolution_calendar.schemas.in.in
-schema_DATA = $(schema_in_files:.schemas.in.in=-$(BASE_VERSION).schemas)
-%-$(BASE_VERSION).schemas.in: %.schemas.in.in
-	cp $< $@
-
-@INTLTOOL_SCHEMAS_RULE@
-
-EXTRA_DIST =	 			\
-	e-calendar-marshal.list		\
-	$(glade_DATA)			\
-	$(schema_in_files)              \
-	$(etspec_DATA)			\
-	$(server_in_files)
-
-BUILT_SOURCES = $(IDL_GENERATED) $(server_DATA)
-CLEANFILES = $(BUILT_SOURCES)
-
-install-data-local:
-	if test -z "$(DESTDIR)"; then \
-		for p in $(schema_DATA); do \
-			GCONF_CONFIG_SOURCE=$(GCONF_SCHEMA_CONFIG_SOURCE) $(GCONFTOOL) --makefile-install-rule $$p; \
-		done; \
-	fi
-
-dist-hook:
-	cd $(distdir); rm -f $(BUILT_SOURCES)
diff --git a/calendar/gui/alarm-notify/.cvsignore b/calendar/gui/alarm-notify/.cvsignore
deleted file mode 100644
index d940a07146..0000000000
--- a/calendar/gui/alarm-notify/.cvsignore
+++ /dev/null
@@ -1,12 +0,0 @@
-.deps
-.libs
-.pure
-Makefile
-Makefile.in
-evolution-calendar-stubs.c
-evolution-calendar-skels.c
-evolution-calendar-common.c
-evolution-calendar.h
-evolution-alarm-notify
-GNOME_Evolution_Calendar_AlarmNotify*.server
-GNOME_Evolution_Calendar_AlarmNotify*.server.in
diff --git a/calendar/gui/alarm-notify/GNOME_Evolution_Calendar_AlarmNotify.server.in.in b/calendar/gui/alarm-notify/GNOME_Evolution_Calendar_AlarmNotify.server.in.in
deleted file mode 100644
index 91007dece2..0000000000
--- a/calendar/gui/alarm-notify/GNOME_Evolution_Calendar_AlarmNotify.server.in.in
+++ /dev/null
@@ -1,27 +0,0 @@
-<oaf_info>
-
-<oaf_server iid="OAFIID:GNOME_Evolution_Calendar_AlarmNotify_Factory:@VERSION@"
-            type="exe"
-            location="@LIBEXECDIR@/evolution-alarm-notify">
-
-	<oaf_attribute name="repo_ids" type="stringv">
-		<item value="IDL:GNOME/ObjectFactory:1.0"/>
-	</oaf_attribute>
-
-	<oaf_attribute name="name" type="string"
-                       _value="Evolution Calendar alarm notification service"/>
-</oaf_server>
-
-<oaf_server iid="OAFIID:GNOME_Evolution_Calendar_AlarmNotify:@VERSION@"
-            type="factory"
-            location="OAFIID:GNOME_Evolution_Calendar_AlarmNotify_Factory:@VERSION@">
-
-	<oaf_attribute name="repo_ids" type="stringv">
-		<item value="IDL:Bonobo/Unknown:1.0"/>
-		<item value="IDL:GNOME/Evolution/Calendar/AlarmNotify:@VERSION@"/>
-	</oaf_attribute>
-
-	<oaf_attribute name="name" type="string" _value="Evolution Calendar alarm notification service"/>
-</oaf_server>
-
-</oaf_info>
diff --git a/calendar/gui/alarm-notify/Makefile.am b/calendar/gui/alarm-notify/Makefile.am
deleted file mode 100644
index ffe95557ec..0000000000
--- a/calendar/gui/alarm-notify/Makefile.am
+++ /dev/null
@@ -1,68 +0,0 @@
-CORBA_GENERATED_H =				\
-	evolution-calendar.h
-CORBA_GENERATED_C =				\
-	evolution-calendar-common.c		\
-	evolution-calendar-skels.c		\
-	evolution-calendar-stubs.c
-CORBA_GENERATED = $(CORBA_GENERATED_C) $(CORBA_GENERATED_H)
-
-idls = $(top_srcdir)/calendar/idl/evolution-calendar.idl
-idl_flags = $(IDL_INCLUDES) 
-
-$(CORBA_GENERATED_H): $(idls)
-	$(ORBIT_IDL) $(idl_flags) $(top_srcdir)/calendar/idl/evolution-calendar.idl
-$(CORBA_GENERATED_C): $(CORBA_GENERATED_H)
-
-
-privlibexec_PROGRAMS = evolution-alarm-notify
-
-
-INCLUDES = 						\
-	-DG_LOG_DOMAIN=\"evolution-alarm-notify\"	\
-	-I$(top_srcdir)					\
-	-I$(top_srcdir)/widgets				\
-	-I$(top_srcdir)/calendar			\
-	-DEVOLUTION_GLADEDIR=\""$(gladedir)"\"		\
-	-DEVOLUTION_IMAGESDIR=\""$(imagesdir)"\"	\
-	-DEVOLUTION_LOCALEDIR=\""$(localedir)"\"	\
-	-DEVOLUTION_LIBEXECDIR=\""$(privlibexecdir)"\"	\
-	$(EVOLUTION_CALENDAR_CFLAGS)
-
-glade_DATA =		\
-	alarm-notify.glade
-
-evolution_alarm_notify_SOURCES =	\
-	$(CORBA_GENERATED)		\
-	alarm.c				\
-	alarm.h				\
-	alarm-notify.c			\
-	alarm-notify.h			\
-	alarm-notify-dialog.c		\
-	alarm-notify-dialog.h		\
-	alarm-queue.c			\
-	alarm-queue.h			\
-	config-data.c			\
-	config-data.h			\
-	notify-main.c			\
-	util.c				\
-	util.h
-
-evolution_alarm_notify_LDADD =						\
-	$(top_builddir)/e-util/libeutil.la				\
-	$(top_builddir)/calendar/common/libevolution-calendarprivate.la	\
-	$(EVOLUTION_CALENDAR_LIBS)
-
-server_in_files = GNOME_Evolution_Calendar_AlarmNotify.server.in.in
-server_DATA = $(server_in_files:.server.in.in=_$(BASE_VERSION).server)
-@EVO_SERVER_RULE@
-@INTLTOOL_SERVER_RULE@
-
-EXTRA_DIST =			\
-	$(server_in_files)	\
-	$(glade_DATA)
-
-BUILT_SOURCES = $(CORBA_GENERATED) $(server_DATA)
-CLEANFILES = $(BUILT_SOURCES)
-
-dist-hook:
-	cd $(distdir); rm -f $(BUILT_SOURCES)
diff --git a/calendar/gui/alarm-notify/alarm-notify-dialog.c b/calendar/gui/alarm-notify/alarm-notify-dialog.c
deleted file mode 100644
index ee625c96f9..0000000000
--- a/calendar/gui/alarm-notify/alarm-notify-dialog.c
+++ /dev/null
@@ -1,235 +0,0 @@
-/* Evolution calendar - alarm notification dialog
- *
- * Copyright (C) 2000 Ximian, Inc.
- * Copyright (C) 2001 Ximian, Inc.
- *
- * Author: Federico Mena-Quintero <federico@ximian.com>
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of version 2 of the GNU General Public
- * License as published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307, USA.
- */
-
-#include <config.h>
-#include <stdio.h>
-#include <string.h>
-#include <gtk/gtkdialog.h>
-#include <gtk/gtkimage.h>
-#include <gtk/gtklabel.h>
-#include <gtk/gtkspinbutton.h>
-#include <gtk/gtksignal.h>
-#include <gtk/gtkscrolledwindow.h>
-#include <gtk/gtkwindow.h>
-#include <libgnome/gnome-i18n.h>
-#if 0 
-#  include <libgnomeui/gnome-winhints.h>
-#endif
-#include <glade/glade.h>
-#include <e-util/e-time-utils.h>
-#include <libecal/e-cal-time-util.h>
-#include "alarm-notify-dialog.h"
-#include "config-data.h"
-#include "util.h"
-#include <e-util/e-icon-factory.h>
-
-
-/* The useful contents of the alarm notify dialog */
-typedef struct {
-	GladeXML *xml;
-
-	GtkWidget *dialog;
-	GtkWidget *title;
-	GtkWidget *snooze_time;
-	GtkWidget *minutes_label;
-	GtkWidget *description;
-	GtkWidget *location;
-	GtkWidget *start;
-	GtkWidget *end;
-
-	AlarmNotifyFunc func;
-	gpointer func_data;
-} AlarmNotify;
-
-enum {
-        AN_RESPONSE_EDIT = 0,
-	AN_RESPONSE_SNOOZE = 1
-};
-
-
-
-static void
-an_update_minutes_label (GtkSpinButton *sb, gpointer data)
-{
-	AlarmNotify *an;
-	char *new_label;
-	int snooze_timeout;
-
-	an = (AlarmNotify *) data;
-
-	snooze_timeout = gtk_spin_button_get_value_as_int (sb);
-	new_label = g_strdup (ngettext ("minute", "minutes", snooze_timeout));
-	gtk_label_set_text (GTK_LABEL (an->minutes_label), new_label);
-	g_free (new_label);
-}
-
-static void
-dialog_response_cb (GtkDialog *dialog, guint response_id, gpointer user_data)
-{
-	int snooze_timeout;
-	AlarmNotify *an = user_data;
-
-	switch (response_id) {
-	case AN_RESPONSE_EDIT:
-		(* an->func) (ALARM_NOTIFY_EDIT, -1, an->func_data);
-		break;
-	case AN_RESPONSE_SNOOZE:
-		snooze_timeout = gtk_spin_button_get_value_as_int (GTK_SPIN_BUTTON (an->snooze_time));
-		(* an->func) (ALARM_NOTIFY_SNOOZE, snooze_timeout, an->func_data);
-		break;
-	case GTK_RESPONSE_CLOSE:
-	case GTK_RESPONSE_DELETE_EVENT:
-		(* an->func) (ALARM_NOTIFY_CLOSE, -1, an->func_data);
-		break;
-	}
-}
-
-static void
-dialog_destroyed_cb (GtkWidget *dialog, gpointer user_data)
-{
-	AlarmNotify *an = user_data;
-
-	g_object_unref (an->xml);
-	g_free (an);
-}
-
-/**
- * alarm_notify_dialog:
- * @trigger: Trigger time for the alarm.
- * @occur_start: Start of occurrence time for the event.
- * @occur_end: End of occurrence time for the event.
- * @vtype: Type of the component which corresponds to the alarm.
- * @summary: Short summary of the appointment
- * @description: Long description of the appointment
- * @location: Location of the appointment
- * @func: Function to be called when a dialog action is invoked.
- * @func_data: Closure data for @func.
- *
- * Runs the alarm notification dialog.  The specified @func will be used to
- * notify the client about result of the actions in the dialog.
- *
- * Return value: a pointer to the dialog widget created or NULL if there is an error.
- **/
-GtkWidget *
-alarm_notify_dialog (time_t trigger, time_t occur_start, time_t occur_end,
-		     ECalComponentVType vtype, const char *summary,
-		     const char *description, const char *location,
-		     AlarmNotifyFunc func, gpointer func_data)
-{
-	AlarmNotify *an;
-	GtkWidget *image;
-	icaltimezone *current_zone;
-	char *title;
-	char *start, *end;
-	char *icon_path;
-	GList *icon_list;
-
-	g_return_val_if_fail (trigger != -1, NULL);
-
-	/* Only VEVENTs or VTODOs can have alarms */
-	g_return_val_if_fail (vtype == E_CAL_COMPONENT_EVENT || vtype == E_CAL_COMPONENT_TODO, NULL);
-	g_return_val_if_fail (summary != NULL, NULL);
-	g_return_val_if_fail (description != NULL, NULL);
-	g_return_val_if_fail (location != NULL, NULL);
-	g_return_val_if_fail (func != NULL, NULL);
-
-	an = g_new0 (AlarmNotify, 1);
-
-	an->func = func;
-	an->func_data = func_data;
-
-	an->xml = glade_xml_new (EVOLUTION_GLADEDIR "/alarm-notify.glade", NULL, NULL);
-	if (!an->xml) {
-		g_message ("alarm_notify_dialog(): Could not load the Glade XML file!");
-		g_free (an);
-		return NULL;
-	}
-
-	an->dialog = glade_xml_get_widget (an->xml, "alarm-notify");
-	an->title = glade_xml_get_widget (an->xml, "title-label");
-	an->snooze_time = glade_xml_get_widget (an->xml, "snooze-time");
-	an->minutes_label = glade_xml_get_widget (an->xml, "minutes-label");
-	an->description = glade_xml_get_widget (an->xml, "description-label");
-	an->location = glade_xml_get_widget (an->xml, "location-label");
-	an->start = glade_xml_get_widget (an->xml, "start-label");
-	an->end = glade_xml_get_widget (an->xml, "end-label");
-
-	if (!(an->dialog && an->title && an->snooze_time
-	      && an->description && an->location && an->start && an->end)) {
-		g_message ("alarm_notify_dialog(): Could not find all widgets in Glade file!");
-		g_object_unref (an->xml);
-		g_free (an);
-		return NULL;
-	}
-
-	gtk_widget_realize (an->dialog);
-	gtk_container_set_border_width (GTK_CONTAINER (GTK_DIALOG (an->dialog)->vbox), 0);
-	gtk_container_set_border_width (GTK_CONTAINER (GTK_DIALOG (an->dialog)->action_area), 12);
-
-	image = glade_xml_get_widget (an->xml, "alarm-image");
-	icon_path = e_icon_factory_get_icon_filename ("stock_alarm", E_ICON_SIZE_DIALOG);
-	gtk_image_set_from_file (GTK_IMAGE (image), icon_path);
-	g_free (icon_path);
-
-	/* Title */
-
-	gtk_window_set_title (GTK_WINDOW (an->dialog), summary);
-
-	/* Set the widget contents */
-
-	title = g_strdup_printf ("<big><b>%s</b></big>", summary);
-	gtk_label_set_markup (GTK_LABEL (an->title), title);
-	g_free (title);
-
-	gtk_label_set_text (GTK_LABEL (an->description), description);
-	gtk_label_set_text (GTK_LABEL (an->location), location);
-
-	/* Stringize the times */
-
-	current_zone = config_data_get_timezone ();
-
-	start = timet_to_str_with_zone (occur_start, current_zone);
-	gtk_label_set_text (GTK_LABEL (an->start), start);
-
-	end = timet_to_str_with_zone (occur_end, current_zone);
-	gtk_label_set_text (GTK_LABEL (an->end), end);
-
-	/* Set callback for updating the snooze "minutes" label */
-	g_signal_connect (G_OBJECT (an->snooze_time), "value_changed",
-			  G_CALLBACK (an_update_minutes_label), an);
-	/* Run! */
-
-	if (!GTK_WIDGET_REALIZED (an->dialog))
-		gtk_widget_realize (an->dialog);
-
-	icon_list = e_icon_factory_get_icon_list ("stock_alarm");
-	if (icon_list) {
-		gtk_window_set_icon_list (GTK_WINDOW (an->dialog), icon_list);
-		g_list_foreach (icon_list, (GFunc) g_object_unref, NULL);
-		g_list_free (icon_list);
-	}
-
-	g_signal_connect (G_OBJECT (an->dialog), "response", G_CALLBACK (dialog_response_cb), an);
-	g_signal_connect (G_OBJECT (an->dialog), "destroy", G_CALLBACK (dialog_destroyed_cb), an);
-	gtk_widget_show (an->dialog);
-
-	return an->dialog;
-}
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 cf01f76af9..0000000000
--- a/calendar/gui/alarm-notify/alarm-notify-dialog.h
+++ /dev/null
@@ -1,45 +0,0 @@
-/* Evolution calendar - alarm notification dialog
- *
- * Copyright (C) 2001 Ximian, Inc.
- *
- * Author: Federico Mena-Quintero <federico@ximian.com>
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of version 2 of the GNU General Public
- * License as published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307, USA.
- */
-
-#ifndef ALARM_NOTIFY_DIALOG_H
-#define ALARM_NOTIFY_DIALOG_H
-
-#include <time.h>
-#include <glib.h>
-#include <libecal/e-cal-component.h>
-#include <gtk/gtkwidget.h>
-
-
-
-typedef enum {
-	ALARM_NOTIFY_CLOSE,
-	ALARM_NOTIFY_SNOOZE,
-	ALARM_NOTIFY_EDIT
-} AlarmNotifyResult;
-
-typedef void (* AlarmNotifyFunc) (AlarmNotifyResult result, int snooze_mins, gpointer data);
-
-GtkWidget *alarm_notify_dialog (time_t trigger, time_t occur_start, time_t occur_end,
-				ECalComponentVType vtype, const char *summary,
-				const char *description, const char *location,
-				AlarmNotifyFunc func, gpointer func_data);
-
-
-#endif
diff --git a/calendar/gui/alarm-notify/alarm-notify.c b/calendar/gui/alarm-notify/alarm-notify.c
deleted file mode 100644
index 31864ec9eb..0000000000
--- a/calendar/gui/alarm-notify/alarm-notify.c
+++ /dev/null
@@ -1,375 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- *
- *  Evolution calendar - Alarm notification service object
- *
- * Copyright (C) 2001 Ximian, Inc.
- *
- * Author: Federico Mena-Quintero <federico@ximian.com>
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of version 2 of the GNU General Public
- * License as published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307, USA.
- */
-
-#ifdef HAVE_CONFIG_H
-#include "config.h"
-#endif
-
-#include <string.h>
-#include <bonobo/bonobo-main.h>
-#include <libedataserver/e-url.h>
-#include <libedataserverui/e-passwords.h>
-#include <libecal/e-cal.h>
-#include "alarm-notify.h"
-#include "alarm-queue.h"
-#include "config-data.h"
-#include "common/authentication.h"
-
-
-/* Private part of the AlarmNotify structure */
-struct _AlarmNotifyPrivate {
-	/* Mapping from EUri's to LoadedClient structures */
-	/* FIXME do we need per source type uri hashes? or perhaps we
-	   just need to hash based on source */
-	GHashTable *uri_client_hash [E_CAL_SOURCE_TYPE_LAST];
-        ESourceList *source_lists [E_CAL_SOURCE_TYPE_LAST];	
-        GMutex *mutex;
-};
-
-
-
-static void alarm_notify_class_init (AlarmNotifyClass *klass);
-static void alarm_notify_init (AlarmNotify *an, AlarmNotifyClass *klass);
-static void alarm_notify_finalize (GObject *object);
-
-
-static BonoboObjectClass *parent_class;
-
-
-
-BONOBO_TYPE_FUNC_FULL(AlarmNotify, GNOME_Evolution_Calendar_AlarmNotify, BONOBO_TYPE_OBJECT, alarm_notify)
-
-/* Class initialization function for the alarm notify service */
-static void
-alarm_notify_class_init (AlarmNotifyClass *klass)
-{
-	GObjectClass *object_class;
-
-	object_class = (GObjectClass *) klass;
-
-	parent_class = g_type_class_peek_parent (klass);
-
-	object_class->finalize = alarm_notify_finalize;
-}
-
-typedef struct {
-	AlarmNotify *an;
-	ESourceList *source_list;
-	GList *removals;
-} ProcessRemovalsData;
-
-static void
-process_removal_in_hash (gpointer key, gpointer value, gpointer data)
-{
-	char *uri = key;
-	ProcessRemovalsData *prd = data;
-	GSList *groups, *sources, *p, *q;
-	gboolean found = FALSE;
-
-	/* search the list of selected calendars */
-	groups = e_source_list_peek_groups (prd->source_list);
-	for (p = groups; p != NULL; p = p->next) {
-		ESourceGroup *group = E_SOURCE_GROUP (p->data);
-		
-		sources = e_source_group_peek_sources (group);
-		for (q = sources; q != NULL; q = q->next) {
-			ESource *source = E_SOURCE (q->data);
-			char *source_uri;
-
-			source_uri = e_source_get_uri (source);
-			if (strcmp (source_uri, uri) == 0)
-				found = TRUE;
-			g_free (source_uri);
-
-			if (found)
-				return;
-		}
-	}
-
-	/* not found, so list it for removal */
-	prd->removals = g_list_prepend (prd->removals, uri);
-}
-
-static void
-list_changed_cb (ESourceList *source_list, gpointer data)
-{
-	AlarmNotify *an = data;
-	AlarmNotifyPrivate *priv;
-	GSList *groups, *sources, *p, *q;
-	ECalSourceType source_type = E_CAL_SOURCE_TYPE_LAST;
-	ProcessRemovalsData prd;
-	GList *l;
-	int i;
-	
-	priv = an->priv;
-
-	/* Figure out the source type */
-	for (i = 0; i < E_CAL_SOURCE_TYPE_LAST; i++) {
-		if (source_list == priv->source_lists[i]) {
-			source_type = i;
-			break;
-		}
-	}
-	if (source_type == E_CAL_SOURCE_TYPE_LAST)
-		return;
-	
-	/* process the additions */
-	groups = e_source_list_peek_groups (source_list);
-	for (p = groups; p != NULL; p = p->next) {
-		ESourceGroup *group = E_SOURCE_GROUP (p->data);
-		
-		sources = e_source_group_peek_sources (group);
-		for (q = sources; q != NULL; q = q->next) {
-			ESource *source = E_SOURCE (q->data);
-			char *uri;
-			
-			uri = e_source_get_uri (source);
-			if (!g_hash_table_lookup (priv->uri_client_hash[source_type], uri)) {
-				g_message ("Adding %s", uri);
-				alarm_notify_add_calendar (an, source_type, source, FALSE);
-			}
-			g_free (uri);
-		}
-	}
-
-	/* process the removals */
-	prd.an = an;
-	prd.source_list = priv->source_lists[source_type];
-	prd.removals = NULL;
-	g_hash_table_foreach (priv->uri_client_hash[source_type], (GHFunc) process_removal_in_hash, &prd);
-
-	for (l = prd.removals; l; l = l->next) {
-		g_message ("Removing %s", (char *)l->data);
-		alarm_notify_remove_calendar (an, source_type, l->data);
-	}
-	g_list_free (prd.removals);
-}
-
-static void
-load_calendars (AlarmNotify *an, ECalSourceType source_type)
-{
-	AlarmNotifyPrivate *priv;
-	ESourceList *source_list;
-	GSList *groups, *sources, *p, *q;
-
-	priv = an->priv;
-	
-	if (!e_cal_get_sources (&source_list, source_type, NULL)) {
-		g_message (G_STRLOC ": Could not get the list of sources to load");
-		priv->source_lists[source_type] = NULL;
-
-		return;
-	}
-
-	groups = e_source_list_peek_groups (source_list);
-	for (p = groups; p != NULL; p = p->next) {
-		ESourceGroup *group = E_SOURCE_GROUP (p->data);
-		
-		sources = e_source_group_peek_sources (group);
-		for (q = sources; q != NULL; q = q->next) {
-			ESource *source = E_SOURCE (q->data);
-			char *uri;
-			
-			uri = e_source_get_uri (source);
-			g_message ("Loading %s", uri);
-			alarm_notify_add_calendar (an, source_type, source, FALSE);
-			g_free (uri);
-			
-		}
-	}
-
-	g_signal_connect_object (source_list, "changed", G_CALLBACK (list_changed_cb), an, 0);
-	priv->source_lists[source_type] = source_list;
-}
-
-static gboolean
-load_calendars_cb (gpointer data)
-{
-	int i;
-	AlarmNotify *an =  ALARM_NOTIFY (data);
-	
-	for (i = 0; i < E_CAL_SOURCE_TYPE_LAST; i++) {
-		if (an->priv->source_lists[i])
-			list_changed_cb (an->priv->source_lists[i], an);
-	}
-	
-	return FALSE;
-	
-}
-/* Object initialization function for the alarm notify system */
-static void
-alarm_notify_init (AlarmNotify *an, AlarmNotifyClass *klass)
-{
-	AlarmNotifyPrivate *priv;
-	int i;
-
-	priv = g_new0 (AlarmNotifyPrivate, 1);
-	an->priv = priv;
-	priv->mutex = g_mutex_new ();
-
-	for (i = 0; i < E_CAL_SOURCE_TYPE_LAST; i++)
-		priv->uri_client_hash[i] = g_hash_table_new_full (g_str_hash, g_str_equal, g_free, g_object_unref);
-
-	alarm_queue_init ();
-
-	for (i = 0; i < E_CAL_SOURCE_TYPE_LAST; i++)
-		load_calendars (an, i);
-	g_timeout_add (60000, (GSourceFunc)load_calendars_cb, an);
-}
-
-static void
-dequeue_client (gpointer key, gpointer value, gpointer user_data)
-{
-	ECal *client = value;
-
-	alarm_queue_remove_client (client);
-}
-
-/* Finalize handler for the alarm notify system */
-static void
-alarm_notify_finalize (GObject *object)
-{
-	AlarmNotify *an;
-	AlarmNotifyPrivate *priv;
-	int i;
-	
-	g_return_if_fail (object != NULL);
-	g_return_if_fail (IS_ALARM_NOTIFY (object));
-
-	an = ALARM_NOTIFY (object);
-	priv = an->priv;
-
-	for (i = 0; i < E_CAL_SOURCE_TYPE_LAST; i++) {
-		g_hash_table_foreach (priv->uri_client_hash[i], dequeue_client, NULL);
-		g_hash_table_destroy (priv->uri_client_hash[i]);
-	}
-
-	alarm_queue_done ();
-
-	g_mutex_free (priv->mutex);
-	g_free (priv);
-
-	if (G_OBJECT_CLASS (parent_class)->finalize)
-		(* G_OBJECT_CLASS (parent_class)->finalize) (object);
-}
-
-
-
-/**
- * alarm_notify_new:
- * 
- * Creates a new #AlarmNotify object.
- * 
- * Return value: A newly-created #AlarmNotify, or NULL if its corresponding
- * CORBA object could not be created.
- **/
-AlarmNotify *
-alarm_notify_new (void)
-{
-	AlarmNotify *an;
-
-	an = g_object_new (TYPE_ALARM_NOTIFY,
-			   "poa", bonobo_poa_get_threaded (ORBIT_THREAD_HINT_PER_REQUEST, NULL),
-			   NULL);
-	return an;
-}
-
-static void
-cal_opened_cb (ECal *client, ECalendarStatus status, gpointer user_data)
-{
-	AlarmNotifyPrivate *priv;
-	AlarmNotify *an = ALARM_NOTIFY (user_data);
-
-	priv = an->priv;
-
-	if (status == E_CALENDAR_STATUS_OK)
-		alarm_queue_add_client (client);
-	else {
-		g_hash_table_remove (priv->uri_client_hash[e_cal_get_source_type (client)],
-				     e_cal_get_uri (client));
-		g_signal_handlers_disconnect_matched (G_OBJECT (client), G_SIGNAL_MATCH_DATA,
-						      0, 0, NULL, NULL, an);
-		g_object_unref (client);
-	}
-}
-
-/**
- * alarm_notify_add_calendar:
- * @an: An alarm notification service.
- * @uri: URI of the calendar to load.
- * @load_afterwards: Whether this calendar should be loaded in the future
- * when the alarm daemon starts up.
- * 
- * Tells the alarm notification service to load a calendar and start monitoring
- * its alarms.  It can optionally be made to save the URI of this calendar so
- * that it can be loaded in the future when the alarm daemon starts up.
- **/
-void
-alarm_notify_add_calendar (AlarmNotify *an, ECalSourceType source_type,  ESource *source, gboolean load_afterwards)
-{
-	AlarmNotifyPrivate *priv;
-	ECal *client;
-	char *str_uri;
-	g_return_if_fail (an != NULL);
-	g_return_if_fail (IS_ALARM_NOTIFY (an));
-	
-
-	priv = an->priv;
-	str_uri = e_source_get_uri (source);
-	
-	g_mutex_lock (an->priv->mutex);
-	/* See if we already know about this uri */
-	if (g_hash_table_lookup (priv->uri_client_hash[source_type], str_uri)) {
-		g_mutex_unlock (an->priv->mutex);
-		return;
-	}
-	/* if loading of this requires password and password is not currently availble in e-password
-	   session skip this source loading. we do not really want to prompt for auth from alarm dameon*/
-
-	if ((e_source_get_property (source, "auth") && 
-	     (!e_passwords_get_password (e_source_get_property(source, "auth-domain"), str_uri)))) {
-		g_mutex_unlock (an->priv->mutex);
-		return;
-	}
-	client = auth_new_cal_from_source (source, source_type);
-
-	if (client) {
-		g_hash_table_insert (priv->uri_client_hash[source_type], g_strdup (str_uri), client);
-		g_signal_connect (G_OBJECT (client), "cal_opened", G_CALLBACK (cal_opened_cb), an);
-		e_cal_open_async (client, FALSE);
-	}
-	g_mutex_unlock (an->priv->mutex);
-}
-
-void
-alarm_notify_remove_calendar (AlarmNotify *an, ECalSourceType source_type, const char *str_uri)
-{
-	AlarmNotifyPrivate *priv;
-	ECal *client;
-	
-	priv = an->priv;
-
-	client = g_hash_table_lookup (priv->uri_client_hash[source_type], str_uri);
-	if (client) {
-		alarm_queue_remove_client (client);
-		g_hash_table_remove (priv->uri_client_hash[source_type], str_uri);
-	}
-}
diff --git a/calendar/gui/alarm-notify/alarm-notify.glade b/calendar/gui/alarm-notify/alarm-notify.glade
deleted file mode 100644
index 0302458aa3..0000000000
--- a/calendar/gui/alarm-notify/alarm-notify.glade
+++ /dev/null
@@ -1,543 +0,0 @@
-<?xml version="1.0" standalone="no"?> <!--*- mode: xml -*-->
-<!DOCTYPE glade-interface SYSTEM "http://glade.gnome.org/glade-2.0.dtd">
-
-<glade-interface>
-
-<widget class="GtkDialog" id="alarm-notify">
-  <property name="visible">True</property>
-  <property name="title" translatable="yes">Appointment</property>
-  <property name="type">GTK_WINDOW_TOPLEVEL</property>
-  <property name="window_position">GTK_WIN_POS_NONE</property>
-  <property name="modal">False</property>
-  <property name="default_width">384</property>
-  <property name="default_height">200</property>
-  <property name="resizable">True</property>
-  <property name="destroy_with_parent">False</property>
-  <property name="decorated">True</property>
-  <property name="skip_taskbar_hint">False</property>
-  <property name="skip_pager_hint">False</property>
-  <property name="type_hint">GDK_WINDOW_TYPE_HINT_DIALOG</property>
-  <property name="gravity">GDK_GRAVITY_NORTH_WEST</property>
-  <property name="has_separator">False</property>
-
-  <child internal-child="vbox">
-    <widget class="GtkVBox" id="dialog-vbox3">
-      <property name="visible">True</property>
-      <property name="homogeneous">False</property>
-      <property name="spacing">0</property>
-
-      <child internal-child="action_area">
-	<widget class="GtkHButtonBox" id="dialog-action_area3">
-	  <property name="visible">True</property>
-	  <property name="layout_style">GTK_BUTTONBOX_END</property>
-
-	  <child>
-	    <widget class="GtkButton" id="button3">
-	      <property name="visible">True</property>
-	      <property name="can_default">True</property>
-	      <property name="can_focus">True</property>
-	      <property name="relief">GTK_RELIEF_NORMAL</property>
-	      <property name="focus_on_click">True</property>
-	      <property name="response_id">0</property>
-
-	      <child>
-		<widget class="GtkAlignment" id="alignment2">
-		  <property name="visible">True</property>
-		  <property name="xalign">0.5</property>
-		  <property name="yalign">0.5</property>
-		  <property name="xscale">0</property>
-		  <property name="yscale">0</property>
-		  <property name="top_padding">0</property>
-		  <property name="bottom_padding">0</property>
-		  <property name="left_padding">0</property>
-		  <property name="right_padding">0</property>
-
-		  <child>
-		    <widget class="GtkHBox" id="hbox6">
-		      <property name="visible">True</property>
-		      <property name="homogeneous">False</property>
-		      <property name="spacing">2</property>
-
-		      <child>
-			<widget class="GtkImage" id="image4">
-			  <property name="visible">True</property>
-			  <property name="stock">gtk-properties</property>
-			  <property name="icon_size">4</property>
-			  <property name="xalign">0.5</property>
-			  <property name="yalign">0.5</property>
-			  <property name="xpad">0</property>
-			  <property name="ypad">0</property>
-			</widget>
-			<packing>
-			  <property name="padding">0</property>
-			  <property name="expand">False</property>
-			  <property name="fill">False</property>
-			</packing>
-		      </child>
-
-		      <child>
-			<widget class="GtkLabel" id="label16">
-			  <property name="visible">True</property>
-			  <property name="label" translatable="yes">_Edit</property>
-			  <property name="use_underline">True</property>
-			  <property name="use_markup">False</property>
-			  <property name="justify">GTK_JUSTIFY_LEFT</property>
-			  <property name="wrap">False</property>
-			  <property name="selectable">False</property>
-			  <property name="xalign">0.5</property>
-			  <property name="yalign">0.5</property>
-			  <property name="xpad">0</property>
-			  <property name="ypad">0</property>
-			</widget>
-			<packing>
-			  <property name="padding">0</property>
-			  <property name="expand">False</property>
-			  <property name="fill">False</property>
-			</packing>
-		      </child>
-		    </widget>
-		  </child>
-		</widget>
-	      </child>
-	    </widget>
-	  </child>
-
-	  <child>
-	    <widget class="GtkButton" id="button4">
-	      <property name="visible">True</property>
-	      <property name="can_default">True</property>
-	      <property name="can_focus">True</property>
-	      <property name="relief">GTK_RELIEF_NORMAL</property>
-	      <property name="focus_on_click">True</property>
-	      <property name="response_id">1</property>
-
-	      <child>
-		<widget class="GtkAlignment" id="alignment3">
-		  <property name="visible">True</property>
-		  <property name="xalign">0.5</property>
-		  <property name="yalign">0.5</property>
-		  <property name="xscale">0</property>
-		  <property name="yscale">0</property>
-		  <property name="top_padding">0</property>
-		  <property name="bottom_padding">0</property>
-		  <property name="left_padding">0</property>
-		  <property name="right_padding">0</property>
-
-		  <child>
-		    <widget class="GtkHBox" id="hbox7">
-		      <property name="visible">True</property>
-		      <property name="homogeneous">False</property>
-		      <property name="spacing">2</property>
-
-		      <child>
-			<widget class="GtkImage" id="image5">
-			  <property name="visible">True</property>
-			  <property name="stock">gtk-refresh</property>
-			  <property name="icon_size">4</property>
-			  <property name="xalign">0.5</property>
-			  <property name="yalign">0.5</property>
-			  <property name="xpad">0</property>
-			  <property name="ypad">0</property>
-			</widget>
-			<packing>
-			  <property name="padding">0</property>
-			  <property name="expand">False</property>
-			  <property name="fill">False</property>
-			</packing>
-		      </child>
-
-		      <child>
-			<widget class="GtkLabel" id="label17">
-			  <property name="visible">True</property>
-			  <property name="label" translatable="yes">_Snooze</property>
-			  <property name="use_underline">True</property>
-			  <property name="use_markup">False</property>
-			  <property name="justify">GTK_JUSTIFY_LEFT</property>
-			  <property name="wrap">False</property>
-			  <property name="selectable">False</property>
-			  <property name="xalign">0.5</property>
-			  <property name="yalign">0.5</property>
-			  <property name="xpad">0</property>
-			  <property name="ypad">0</property>
-			</widget>
-			<packing>
-			  <property name="padding">0</property>
-			  <property name="expand">False</property>
-			  <property name="fill">False</property>
-			</packing>
-		      </child>
-		    </widget>
-		  </child>
-		</widget>
-	      </child>
-	    </widget>
-	  </child>
-
-	  <child>
-	    <widget class="GtkButton" id="button5">
-	      <property name="visible">True</property>
-	      <property name="can_default">True</property>
-	      <property name="can_focus">True</property>
-	      <property name="label">gtk-close</property>
-	      <property name="use_stock">True</property>
-	      <property name="relief">GTK_RELIEF_NORMAL</property>
-	      <property name="focus_on_click">True</property>
-	      <property name="response_id">-7</property>
-	    </widget>
-	  </child>
-	</widget>
-	<packing>
-	  <property name="padding">0</property>
-	  <property name="expand">False</property>
-	  <property name="fill">True</property>
-	  <property name="pack_type">GTK_PACK_END</property>
-	</packing>
-      </child>
-
-      <child>
-	<widget class="GtkHBox" id="hbox2">
-	  <property name="border_width">12</property>
-	  <property name="visible">True</property>
-	  <property name="homogeneous">False</property>
-	  <property name="spacing">12</property>
-
-	  <child>
-	    <widget class="GtkImage" id="alarm-image">
-	      <property name="visible">True</property>
-	      <property name="stock">gtk-dialog-info</property>
-	      <property name="icon_size">6</property>
-	      <property name="xalign">0.5</property>
-	      <property name="yalign">0</property>
-	      <property name="xpad">0</property>
-	      <property name="ypad">0</property>
-	    </widget>
-	    <packing>
-	      <property name="padding">0</property>
-	      <property name="expand">False</property>
-	      <property name="fill">False</property>
-	    </packing>
-	  </child>
-
-	  <child>
-	    <widget class="GtkVBox" id="vbox1">
-	      <property name="visible">True</property>
-	      <property name="homogeneous">False</property>
-	      <property name="spacing">12</property>
-
-	      <child>
-		<widget class="GtkLabel" id="title-label">
-		  <property name="visible">True</property>
-		  <property name="label" translatable="yes">Appointment Title</property>
-		  <property name="use_underline">False</property>
-		  <property name="use_markup">True</property>
-		  <property name="justify">GTK_JUSTIFY_LEFT</property>
-		  <property name="wrap">False</property>
-		  <property name="selectable">False</property>
-		  <property name="xalign">0</property>
-		  <property name="yalign">0.5</property>
-		  <property name="xpad">0</property>
-		  <property name="ypad">0</property>
-		</widget>
-		<packing>
-		  <property name="padding">0</property>
-		  <property name="expand">False</property>
-		  <property name="fill">False</property>
-		</packing>
-	      </child>
-
-	      <child>
-		<widget class="GtkVBox" id="vbox2">
-		  <property name="visible">True</property>
-		  <property name="homogeneous">False</property>
-		  <property name="spacing">12</property>
-
-		  <child>
-		    <widget class="GtkLabel" id="description-label">
-		      <property name="visible">True</property>
-		      <property name="can_focus">True</property>
-		      <property name="label" translatable="yes">description of appointment</property>
-		      <property name="use_underline">False</property>
-		      <property name="use_markup">True</property>
-		      <property name="justify">GTK_JUSTIFY_LEFT</property>
-		      <property name="wrap">True</property>
-		      <property name="selectable">True</property>
-		      <property name="xalign">0</property>
-		      <property name="yalign">0.5</property>
-		      <property name="xpad">0</property>
-		      <property name="ypad">0</property>
-		    </widget>
-		    <packing>
-		      <property name="padding">0</property>
-		      <property name="expand">False</property>
-		      <property name="fill">False</property>
-		    </packing>
-		  </child>
-
-		  <child>
-		    <widget class="GtkTable" id="table1">
-		      <property name="visible">True</property>
-		      <property name="n_rows">4</property>
-		      <property name="n_columns">2</property>
-		      <property name="homogeneous">False</property>
-		      <property name="row_spacing">6</property>
-		      <property name="column_spacing">6</property>
-
-		      <child>
-			<widget class="GtkLabel" id="label5">
-			  <property name="visible">True</property>
-			  <property name="label" translatable="yes">Location:</property>
-			  <property name="use_underline">False</property>
-			  <property name="use_markup">False</property>
-			  <property name="justify">GTK_JUSTIFY_LEFT</property>
-			  <property name="wrap">False</property>
-			  <property name="selectable">False</property>
-			  <property name="xalign">0</property>
-			  <property name="yalign">0.5</property>
-			  <property name="xpad">0</property>
-			  <property name="ypad">0</property>
-			</widget>
-			<packing>
-			  <property name="left_attach">0</property>
-			  <property name="right_attach">1</property>
-			  <property name="top_attach">0</property>
-			  <property name="bottom_attach">1</property>
-			  <property name="x_options">fill</property>
-			  <property name="y_options"></property>
-			</packing>
-		      </child>
-
-		      <child>
-			<widget class="GtkLabel" id="label6">
-			  <property name="visible">True</property>
-			  <property name="label" translatable="yes">Start time:</property>
-			  <property name="use_underline">False</property>
-			  <property name="use_markup">False</property>
-			  <property name="justify">GTK_JUSTIFY_LEFT</property>
-			  <property name="wrap">False</property>
-			  <property name="selectable">False</property>
-			  <property name="xalign">0</property>
-			  <property name="yalign">0.5</property>
-			  <property name="xpad">0</property>
-			  <property name="ypad">0</property>
-			</widget>
-			<packing>
-			  <property name="left_attach">0</property>
-			  <property name="right_attach">1</property>
-			  <property name="top_attach">1</property>
-			  <property name="bottom_attach">2</property>
-			  <property name="x_options">fill</property>
-			  <property name="y_options"></property>
-			</packing>
-		      </child>
-
-		      <child>
-			<widget class="GtkLabel" id="label7">
-			  <property name="visible">True</property>
-			  <property name="label" translatable="yes">End time:</property>
-			  <property name="use_underline">False</property>
-			  <property name="use_markup">False</property>
-			  <property name="justify">GTK_JUSTIFY_LEFT</property>
-			  <property name="wrap">False</property>
-			  <property name="selectable">False</property>
-			  <property name="xalign">0</property>
-			  <property name="yalign">0.5</property>
-			  <property name="xpad">0</property>
-			  <property name="ypad">0</property>
-			</widget>
-			<packing>
-			  <property name="left_attach">0</property>
-			  <property name="right_attach">1</property>
-			  <property name="top_attach">2</property>
-			  <property name="bottom_attach">3</property>
-			  <property name="x_options">fill</property>
-			  <property name="y_options"></property>
-			</packing>
-		      </child>
-
-		      <child>
-			<widget class="GtkLabel" id="location-label">
-			  <property name="visible">True</property>
-			  <property name="label" translatable="yes">location</property>
-			  <property name="use_underline">False</property>
-			  <property name="use_markup">False</property>
-			  <property name="justify">GTK_JUSTIFY_LEFT</property>
-			  <property name="wrap">False</property>
-			  <property name="selectable">False</property>
-			  <property name="xalign">0</property>
-			  <property name="yalign">0.5</property>
-			  <property name="xpad">0</property>
-			  <property name="ypad">0</property>
-			</widget>
-			<packing>
-			  <property name="left_attach">1</property>
-			  <property name="right_attach">2</property>
-			  <property name="top_attach">0</property>
-			  <property name="bottom_attach">1</property>
-			  <property name="x_options">fill</property>
-			  <property name="y_options"></property>
-			</packing>
-		      </child>
-
-		      <child>
-			<widget class="GtkLabel" id="start-label">
-			  <property name="visible">True</property>
-			  <property name="can_focus">True</property>
-			  <property name="label" translatable="yes">start-time</property>
-			  <property name="use_underline">False</property>
-			  <property name="use_markup">False</property>
-			  <property name="justify">GTK_JUSTIFY_LEFT</property>
-			  <property name="wrap">False</property>
-			  <property name="selectable">True</property>
-			  <property name="xalign">0</property>
-			  <property name="yalign">0.5</property>
-			  <property name="xpad">0</property>
-			  <property name="ypad">0</property>
-			</widget>
-			<packing>
-			  <property name="left_attach">1</property>
-			  <property name="right_attach">2</property>
-			  <property name="top_attach">1</property>
-			  <property name="bottom_attach">2</property>
-			  <property name="x_options">fill</property>
-			  <property name="y_options"></property>
-			</packing>
-		      </child>
-
-		      <child>
-			<widget class="GtkLabel" id="end-label">
-			  <property name="visible">True</property>
-			  <property name="can_focus">True</property>
-			  <property name="label" translatable="yes">end-time</property>
-			  <property name="use_underline">False</property>
-			  <property name="use_markup">False</property>
-			  <property name="justify">GTK_JUSTIFY_LEFT</property>
-			  <property name="wrap">False</property>
-			  <property name="selectable">True</property>
-			  <property name="xalign">0</property>
-			  <property name="yalign">0.5</property>
-			  <property name="xpad">0</property>
-			  <property name="ypad">0</property>
-			</widget>
-			<packing>
-			  <property name="left_attach">1</property>
-			  <property name="right_attach">2</property>
-			  <property name="top_attach">2</property>
-			  <property name="bottom_attach">3</property>
-			  <property name="x_options">fill</property>
-			  <property name="y_options"></property>
-			</packing>
-		      </child>
-
-		      <child>
-			<widget class="GtkHBox" id="hbox5">
-			  <property name="visible">True</property>
-			  <property name="homogeneous">False</property>
-			  <property name="spacing">6</property>
-
-			  <child>
-			    <widget class="GtkSpinButton" id="snooze-time">
-			      <property name="visible">True</property>
-			      <property name="can_focus">True</property>
-			      <property name="climb_rate">1</property>
-			      <property name="digits">0</property>
-			      <property name="numeric">False</property>
-			      <property name="update_policy">GTK_UPDATE_ALWAYS</property>
-			      <property name="snap_to_ticks">False</property>
-			      <property name="wrap">False</property>
-			      <property name="adjustment">5 1 60 1 10 10</property>
-			    </widget>
-			    <packing>
-			      <property name="padding">0</property>
-			      <property name="expand">False</property>
-			      <property name="fill">False</property>
-			    </packing>
-			  </child>
-
-			  <child>
-			    <widget class="GtkLabel" id="minutes-label">
-			      <property name="visible">True</property>
-			      <property name="label" translatable="yes">minutes</property>
-			      <property name="use_underline">False</property>
-			      <property name="use_markup">False</property>
-			      <property name="justify">GTK_JUSTIFY_LEFT</property>
-			      <property name="wrap">False</property>
-			      <property name="selectable">False</property>
-			      <property name="xalign">0.5</property>
-			      <property name="yalign">0.5</property>
-			      <property name="xpad">0</property>
-			      <property name="ypad">0</property>
-			    </widget>
-			    <packing>
-			      <property name="padding">0</property>
-			      <property name="expand">False</property>
-			      <property name="fill">False</property>
-			    </packing>
-			  </child>
-			</widget>
-			<packing>
-			  <property name="left_attach">1</property>
-			  <property name="right_attach">2</property>
-			  <property name="top_attach">3</property>
-			  <property name="bottom_attach">4</property>
-			  <property name="x_options">fill</property>
-			  <property name="y_options">fill</property>
-			</packing>
-		      </child>
-
-		      <child>
-			<widget class="GtkLabel" id="label11">
-			  <property name="visible">True</property>
-			  <property name="label" translatable="yes">Snooze _time:</property>
-			  <property name="use_underline">True</property>
-			  <property name="use_markup">False</property>
-			  <property name="justify">GTK_JUSTIFY_LEFT</property>
-			  <property name="wrap">False</property>
-			  <property name="selectable">False</property>
-			  <property name="xalign">0</property>
-			  <property name="yalign">0.5</property>
-			  <property name="xpad">0</property>
-			  <property name="ypad">0</property>
-			  <property name="mnemonic_widget">snooze-time</property>
-			</widget>
-			<packing>
-			  <property name="left_attach">0</property>
-			  <property name="right_attach">1</property>
-			  <property name="top_attach">3</property>
-			  <property name="bottom_attach">4</property>
-			  <property name="x_options">fill</property>
-			  <property name="y_options"></property>
-			</packing>
-		      </child>
-		    </widget>
-		    <packing>
-		      <property name="padding">0</property>
-		      <property name="expand">True</property>
-		      <property name="fill">True</property>
-		    </packing>
-		  </child>
-		</widget>
-		<packing>
-		  <property name="padding">0</property>
-		  <property name="expand">True</property>
-		  <property name="fill">True</property>
-		</packing>
-	      </child>
-	    </widget>
-	    <packing>
-	      <property name="padding">0</property>
-	      <property name="expand">True</property>
-	      <property name="fill">True</property>
-	    </packing>
-	  </child>
-	</widget>
-	<packing>
-	  <property name="padding">0</property>
-	  <property name="expand">True</property>
-	  <property name="fill">True</property>
-	</packing>
-      </child>
-    </widget>
-  </child>
-</widget>
-
-</glade-interface>
diff --git a/calendar/gui/alarm-notify/alarm-notify.h b/calendar/gui/alarm-notify/alarm-notify.h
deleted file mode 100644
index 4d8b5f194f..0000000000
--- a/calendar/gui/alarm-notify/alarm-notify.h
+++ /dev/null
@@ -1,64 +0,0 @@
-/* Evolution calendar - Alarm notification service object
- *
- * Copyright (C) 2000 Ximian, Inc.
- * Copyright (C) 2000 Ximian, Inc.
- *
- * Author: Federico Mena-Quintero <federico@ximian.com>
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of version 2 of the GNU General Public
- * License as published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307, USA.
- */
-
-#ifndef ALARM_NOTIFY_H
-#define ALARM_NOTIFY_H
-
-#include <bonobo/bonobo-object.h>
-#include "evolution-calendar.h"
-
-
-
-#define TYPE_ALARM_NOTIFY            (alarm_notify_get_type ())
-#define ALARM_NOTIFY(obj)            (G_TYPE_CHECK_INSTANCE_CAST ((obj), TYPE_ALARM_NOTIFY, AlarmNotify))
-#define ALARM_NOTIFY_CLASS(klass)    (G_TYPE_CHECK_CLASS_CAST ((klass), TYPE_ALARM_NOTIFY,		\
-				      AlarmNotifyClass))
-#define IS_ALARM_NOTIFY(obj)         (G_TYPE_CHECK_INSTANCE_TYPE ((obj), TYPE_ALARM_NOTIFY))
-#define IS_ALARM_NOTIFY_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), TYPE_ALARM_NOTIFY))
-
-typedef struct _AlarmNotify AlarmNotify;
-typedef struct _AlarmNotifyClass AlarmNotifyClass;
-
-typedef struct _AlarmNotifyPrivate AlarmNotifyPrivate;
-
-struct _AlarmNotify {
-	BonoboObject object;
-
-	/* Private data */
-	AlarmNotifyPrivate *priv;
-};
-
-struct _AlarmNotifyClass {
-	BonoboObjectClass parent_class;
-	POA_GNOME_Evolution_Calendar_AlarmNotify__epv epv;
-};
-
-GType alarm_notify_get_type (void);
-
-AlarmNotify *alarm_notify_new (void);
-
-void alarm_notify_add_calendar (AlarmNotify *an, ECalSourceType source_type, ESource *source, gboolean load_afterwards);
-void alarm_notify_remove_calendar (AlarmNotify *an, ECalSourceType source_type, const char *str_uri);
-
-
-
-
-#endif
diff --git a/calendar/gui/alarm-notify/alarm-queue.c b/calendar/gui/alarm-notify/alarm-queue.c
deleted file mode 100644
index 9b62f131de..0000000000
--- a/calendar/gui/alarm-notify/alarm-queue.c
+++ /dev/null
@@ -1,1429 +0,0 @@
-/* Evolution calendar - Alarm queueing engine
- *
- * Copyright (C) 2001 Ximian, Inc.
- *
- * Authors: Federico Mena-Quintero <federico@ximian.com>
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of version 2 of the GNU General Public
- * License as published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307, USA.
- */
-
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
-
-#include <string.h>
-#include <glib.h>
-#include <bonobo-activation/bonobo-activation.h>
-#include <bonobo/bonobo-object.h>
-#include <bonobo/bonobo-exception.h>
-#include <gtk/gtksignal.h>
-#include <gtk/gtkbox.h>
-#include <gtk/gtkdialog.h>
-#include <gtk/gtkeventbox.h>
-#include <gtk/gtkimage.h>
-#include <gtk/gtkimagemenuitem.h>
-#include <gtk/gtklabel.h>
-#include <gtk/gtkcheckbutton.h>
-#include <gtk/gtkstock.h>
-#include <gtk/gtktooltips.h>
-#include <libgnome/gnome-i18n.h>
-#include <libgnome/gnome-exec.h>
-#include <libgnome/gnome-sound.h>
-#include <libgnomeui/gnome-dialog-util.h>
-#include <libgnomeui/gnome-uidefs.h>
-#include <e-util/eggtrayicon.h>
-#include <e-util/e-icon-factory.h>
-#include <libecal/e-cal-time-util.h>
-#include "evolution-calendar.h"
-#include "alarm.h"
-#include "alarm-notify-dialog.h"
-#include "alarm-queue.h"
-#include "config-data.h"
-#include "util.h"
-#include "e-util/e-popup.h"
-
-
-
-/* Whether the queueing system has been initialized */
-static gboolean alarm_queue_inited;
-
-/* When the alarm queue system is inited, this gets set to the last time an
- * alarm notification was issued.  This lets us present any notifications that
- * should have happened while the alarm daemon was not running.
- */
-static time_t saved_notification_time;
-
-/* Clients we are monitoring for alarms */
-static GHashTable *client_alarms_hash = NULL;
-
-/* List of tray icons being displayed */
-static GList *tray_icons_list = NULL;
-
-/* Structure that stores a client we are monitoring */
-typedef struct {
-	/* Monitored client */
-	ECal *client;
-
-	/* The live query to the calendar */
-	ECalView *query;
-
-	/* Hash table of component UID -> CompQueuedAlarms.  If an element is
-	 * present here, then it means its cqa->queued_alarms contains at least
-	 * one queued alarm.  When all the alarms for a component have been
-	 * dequeued, the CompQueuedAlarms structure is removed from the hash
-	 * table.  Thus a CQA exists <=> it has queued alarms.
-	 */
-	GHashTable *uid_alarms_hash;
-} ClientAlarms;
-
-/* Pair of a ECalComponentAlarms and the mapping from queued alarm IDs to the
- * actual alarm instance structures.
- */
-typedef struct {
-	/* The parent client alarms structure */
-	ClientAlarms *parent_client;
-
-	/* The component's UID */
-	char *uid;
-
-	/* The actual component and its alarm instances */
-	ECalComponentAlarms *alarms;
-
-	/* List of QueuedAlarm structures */
-	GSList *queued_alarms;
-
-	/* Flags */
-	gboolean expecting_update;
-} CompQueuedAlarms;
-
-/* Pair of a queued alarm ID and the alarm trigger instance it refers to */
-typedef struct {
-	/* Alarm ID from alarm.h */
-	gpointer alarm_id;
-
-	/* Instance from our parent CompQueuedAlarms->alarms->alarms list */
-	ECalComponentAlarmInstance *instance;
-
-	/* Whether this is a snoozed queued alarm or a normal one */
-	guint snooze : 1;
-} QueuedAlarm;
-
-/* Alarm ID for the midnight refresh function */
-static gpointer midnight_refresh_id = NULL;
-
-static void display_notification (time_t trigger, CompQueuedAlarms *cqa,
-				  gpointer alarm_id, gboolean use_description);
-static void audio_notification (time_t trigger, CompQueuedAlarms *cqa, gpointer alarm_id);
-static void mail_notification (time_t trigger, CompQueuedAlarms *cqa, gpointer alarm_id);
-static void procedure_notification (time_t trigger, CompQueuedAlarms *cqa, gpointer alarm_id);
-
-static void query_objects_changed_cb (ECal *client, GList *objects, gpointer data);
-static void query_objects_removed_cb (ECal *client, GList *objects, gpointer data);
-
-static void remove_client_alarms (ClientAlarms *ca);
-
-
-
-/* Alarm queue engine */
-
-static void load_alarms_for_today (ClientAlarms *ca);
-static void midnight_refresh_cb (gpointer alarm_id, time_t trigger, gpointer data);
-
-/* Queues an alarm trigger for midnight so that we can load the next day's worth
- * of alarms.
- */
-static void
-queue_midnight_refresh (void)
-{
-	time_t midnight;
-	icaltimezone *zone;
-
-	if (midnight_refresh_id != NULL) {
-		alarm_remove (midnight_refresh_id);
-		midnight_refresh_id = NULL;
-	}
-
-	zone = config_data_get_timezone ();
-
-	midnight = time_day_end_with_zone (time (NULL), zone);
-
-	midnight_refresh_id = alarm_add (midnight, midnight_refresh_cb, NULL, NULL);
-	if (!midnight_refresh_id) {
-		g_message ("queue_midnight_refresh(): Could not set up the midnight refresh alarm!");
-		/* FIXME: what to do? */
-	}
-}
-
-/* Loads a client's alarms; called from g_hash_table_foreach() */
-static void
-add_client_alarms_cb (gpointer key, gpointer value, gpointer data)
-{
-	ClientAlarms *ca;
-
-	ca = value;
-	load_alarms_for_today (ca);
-}
-
-/* Loads the alarms for the new day every midnight */
-static void
-midnight_refresh_cb (gpointer alarm_id, time_t trigger, gpointer data)
-{
-	/* Re-load the alarms for all clients */
-
-	g_hash_table_foreach (client_alarms_hash, add_client_alarms_cb, NULL);
-
-	/* Re-schedule the midnight update */
-
-	if (midnight_refresh_id != NULL) {
-		alarm_remove (midnight_refresh_id);
-		midnight_refresh_id = NULL;
-	}
-
-	queue_midnight_refresh ();
-}
-
-/* Looks up a client in the client alarms hash table */
-static ClientAlarms *
-lookup_client (ECal *client)
-{
-	return g_hash_table_lookup (client_alarms_hash, client);
-}
-
-/* Looks up a queued alarm based on its alarm ID */
-static QueuedAlarm *
-lookup_queued_alarm (CompQueuedAlarms *cqa, gpointer alarm_id)
-{
-	GSList *l;
-	QueuedAlarm *qa;
-
-	qa = NULL;
-
-	for (l = cqa->queued_alarms; l; l = l->next) {
-		qa = l->data;
-		if (qa->alarm_id == alarm_id)
-			return qa;
-	}
-
-	/* not found, might have been updated/removed */
-	return NULL;
-}
-
-/* Removes an alarm from the list of alarms of a component.  If the alarm was
- * the last one listed for the component, it removes the component itself.
- */
-static void
-remove_queued_alarm (CompQueuedAlarms *cqa, gpointer alarm_id,
-		     gboolean free_object, gboolean remove_alarm)
-{
-	QueuedAlarm *qa;
-	GSList *l;
-
-	qa = NULL;
-
-	for (l = cqa->queued_alarms; l; l = l->next) {
-		qa = l->data;
-		if (qa->alarm_id == alarm_id)
-			break;
-	}
-
-	if (!l)
-		return;
-
-	cqa->queued_alarms = g_slist_remove_link (cqa->queued_alarms, l);
-	g_slist_free_1 (l);
-
-	if (remove_alarm) {
-		cqa->expecting_update = TRUE;
-		e_cal_discard_alarm (cqa->parent_client->client, cqa->alarms->comp,
-				     qa->instance->auid, NULL);
-		cqa->expecting_update = FALSE;
-	}
-
-	g_free (qa);
-
-	/* If this was the last queued alarm for this component, remove the
-	 * component itself.
-	 */
-
-	if (cqa->queued_alarms != NULL)
-		return;
-
-	if (free_object) {
-		g_hash_table_remove (cqa->parent_client->uid_alarms_hash, cqa->uid);
-		g_free (cqa->uid);
-		cqa->uid = NULL;
-		cqa->parent_client = NULL;
-		e_cal_component_alarms_free (cqa->alarms);
-		g_free (cqa);
-	} else {
-		e_cal_component_alarms_free (cqa->alarms);
-		cqa->alarms = NULL;
-	}
-}
-
-/* Callback used when an alarm triggers */
-static void
-alarm_trigger_cb (gpointer alarm_id, time_t trigger, gpointer data)
-{
-	CompQueuedAlarms *cqa;
-	ECalComponent *comp;
-	QueuedAlarm *qa;
-	ECalComponentAlarm *alarm;
-	ECalComponentAlarmAction action;
-
-	cqa = data;
-	comp = cqa->alarms->comp;
-
-	config_data_set_last_notification_time (trigger);
-	saved_notification_time = trigger;
-
-	qa = lookup_queued_alarm (cqa, alarm_id);
-	if (!qa)
-		return;
-
-	/* Decide what to do based on the alarm action.  We use the trigger that
-	 * is passed to us instead of the one from the instance structure
-	 * because this may be a snoozed alarm instead of an original
-	 * occurrence.
-	 */
-
-	alarm = e_cal_component_get_alarm (comp, qa->instance->auid);
-	g_assert (alarm != NULL);
-
-	e_cal_component_alarm_get_action (alarm, &action);
-	e_cal_component_alarm_free (alarm);
-
-	switch (action) {
-	case E_CAL_COMPONENT_ALARM_AUDIO:
-		audio_notification (trigger, cqa, alarm_id);
-		break;
-
-	case E_CAL_COMPONENT_ALARM_DISPLAY:
-		display_notification (trigger, cqa, alarm_id, TRUE);
-		break;
-
-	case E_CAL_COMPONENT_ALARM_EMAIL:
-		mail_notification (trigger, cqa, alarm_id);
-		break;
-
-	case E_CAL_COMPONENT_ALARM_PROCEDURE:
-		procedure_notification (trigger, cqa, alarm_id);
-		break;
-
-	default:
-		g_assert_not_reached ();
-		break;
-	}
-}
-
-/* Adds the alarms in a ECalComponentAlarms structure to the alarms queued for a
- * particular client.  Also puts the triggers in the alarm timer queue.
- */
-static void
-add_component_alarms (ClientAlarms *ca, ECalComponentAlarms *alarms)
-{
-	const char *uid;
-	CompQueuedAlarms *cqa;
-	GSList *l;
-
-	/* No alarms? */
-	if (alarms == NULL || alarms->alarms == NULL) {
-		g_message ("No alarms to add");
-		if (alarms)
-			e_cal_component_alarms_free (alarms);
-		return;
-	}
-
-	cqa = g_new (CompQueuedAlarms, 1);
-	cqa->parent_client = ca;
-	cqa->alarms = alarms;
-	cqa->expecting_update = FALSE;
-
-	cqa->queued_alarms = NULL;
-
-	for (l = alarms->alarms; l; l = l->next) {
-		ECalComponentAlarmInstance *instance;
-		gpointer alarm_id;
-		QueuedAlarm *qa;
-
-		instance = l->data;
-
-		g_message ("Adding alarm at %lu (%lu)", instance->trigger, time (NULL));
-		alarm_id = alarm_add (instance->trigger, alarm_trigger_cb, cqa, NULL);
-		if (!alarm_id) {
-			g_message ("add_component_alarms(): Could not schedule a trigger for "
-				   "%ld, discarding...", (long) instance->trigger);
-			continue;
-		}
-
-		qa = g_new (QueuedAlarm, 1);
-		qa->alarm_id = alarm_id;
-		qa->instance = instance;
-		qa->snooze = FALSE;
-
-		cqa->queued_alarms = g_slist_prepend (cqa->queued_alarms, qa);
-	}
-
-	e_cal_component_get_uid (alarms->comp, &uid);
-
-	/* If we failed to add all the alarms, then we should get rid of the cqa */
-	if (cqa->queued_alarms == NULL) {
-		g_message ("add_component_alarms(): Could not add any of the alarms "
-			   "for the component `%s'; discarding it...", uid);
-
-		e_cal_component_alarms_free (cqa->alarms);
-		cqa->alarms = NULL;
-
-		g_free (cqa);
-		return;
-	}
-
-	cqa->queued_alarms = g_slist_reverse (cqa->queued_alarms);
-	cqa->uid = g_strdup (uid);
-	g_hash_table_insert (ca->uid_alarms_hash, cqa->uid, cqa);
-}
-
-/* Loads the alarms of a client for a given range of time */
-static void
-load_alarms (ClientAlarms *ca, time_t start, time_t end)
-{
-	char *str_query, *iso_start, *iso_end;
-
-	iso_start = isodate_from_time_t (start);
-	if (!iso_start)
-		return;
-                                                                               
-	iso_end = isodate_from_time_t (end);
-	if (!iso_end) {
-		g_free (iso_start);
-		return;
-	}
-
-	str_query = g_strdup_printf ("(has-alarms-in-range? (make-time \"%s\") (make-time \"%s\"))",
-				     iso_start, iso_end);
-	g_free (iso_start);
-	g_free (iso_end);
-
-	/* create the live query */
-	if (ca->query) {
-		g_signal_handlers_disconnect_matched (ca->query, G_SIGNAL_MATCH_DATA, 0, 0, NULL, NULL, ca);
-		g_object_unref (ca->query);
-		ca->query = NULL;
-	}
-
-	/* FIXME: handle errors */
-	if (!e_cal_get_query (ca->client, str_query, &ca->query, NULL)) {
-		g_warning (G_STRLOC ": Could not get query for client");
-	} else {
-		g_signal_connect (G_OBJECT (ca->query), "objects_added",
-				  G_CALLBACK (query_objects_changed_cb), ca);
-		g_signal_connect (G_OBJECT (ca->query), "objects_modified",
-				  G_CALLBACK (query_objects_changed_cb), ca);
-		g_signal_connect (G_OBJECT (ca->query), "objects_removed",
-				  G_CALLBACK (query_objects_removed_cb), ca);
-
-		e_cal_view_start (ca->query);
-	}
-
-	g_free (str_query);
-}
-
-/* Loads today's remaining alarms for a client */
-static void
-load_alarms_for_today (ClientAlarms *ca)
-{
-	time_t now, from, day_end;
-	icaltimezone *zone;
-
-	now = time (NULL);
-
-	/* Make sure we don't miss some events from the last notification.
-	 * We add 1 to the saved_notification_time to make the time ranges
-	 * half-open; we do not want to display the "last" displayed alarm
-	 * twice, once when it occurs and once when the alarm daemon restarts.
-	 */
-	from = MIN (config_data_get_last_notification_time () + 1, now);
-	zone = config_data_get_timezone ();
-
-	g_message ("Loading alarms for today");
-	day_end = time_day_end_with_zone (now, zone);
-	load_alarms (ca, from, day_end);
-}
-
-/* Called when a calendar client finished loading; we load its alarms */
-static void
-cal_opened_cb (ECal *client, ECalendarStatus status, gpointer data)
-{
-	ClientAlarms *ca;
-
-	ca = data;
-
-	if (status != E_CALENDAR_STATUS_OK)
-		return;
-
-	load_alarms_for_today (ca);
-}
-
-/* Looks up a component's queued alarm structure in a client alarms structure */
-static CompQueuedAlarms *
-lookup_comp_queued_alarms (ClientAlarms *ca, const char *uid)
-{
-	return g_hash_table_lookup (ca->uid_alarms_hash, uid);
-}
-
-static void
-remove_alarms (CompQueuedAlarms *cqa, gboolean free_object)
-{
-	GSList *l;
-
-	for (l = cqa->queued_alarms; l;) {
-		QueuedAlarm *qa;
-
-		qa = l->data;
-
-		/* Get the next element here because the list element will go
-		 * away in remove_queued_alarm().  The qa will be freed there as
-		 * well.
-		 */
-		l = l->next;
-
-		alarm_remove (qa->alarm_id);
-		remove_queued_alarm (cqa, qa->alarm_id, free_object, FALSE);
-	}
-
-}
-
-/* Removes a component an its alarms */
-static void
-remove_comp (ClientAlarms *ca, const char *uid)
-{
-	CompQueuedAlarms *cqa;
-
-	cqa = lookup_comp_queued_alarms (ca, uid);
-	if (!cqa)
-		return;
-
-	/* If a component is present, then it means we must have alarms queued
-	 * for it.
-	 */
-	g_assert (cqa->queued_alarms != NULL);
-
-	remove_alarms (cqa, TRUE);
-
-	/* The list should be empty now, and thus the queued component alarms
-	 * structure should have been freed and removed from the hash table.
-	 */
-	g_assert (lookup_comp_queued_alarms (ca, uid) == NULL);
-}
-
-/* Called when a calendar component changes; we must reload its corresponding
- * alarms.
- */
-static void
-query_objects_changed_cb (ECal *client, GList *objects, gpointer data)
-{
-	ClientAlarms *ca;
-	time_t from, day_end;
-	ECalComponentAlarms *alarms;
-	gboolean found;
-	icaltimezone *zone;
-	CompQueuedAlarms *cqa;
-	GList *l;
-
-	ca = data;
-
-	from = config_data_get_last_notification_time ();
-	if (from == -1)
-		from = time (NULL);
-	else
-		from += 1; /* we add 1 to make sure the alarm is not displayed twice */
-
-	zone = config_data_get_timezone ();
-
-	day_end = time_day_end_with_zone (time (NULL), zone);
-	g_message ("Query response for alarms");
-	for (l = objects; l != NULL; l = l->next) {
-		const char *uid;
-		GSList *sl;
-
-		uid = icalcomponent_get_uid (l->data);
-		found = e_cal_get_alarms_for_object (ca->client, uid, from, day_end, &alarms);
-
-		if (!found) {
-			g_message ("No alarms found on object");
-			remove_comp (ca, uid);
-			continue;
-		}
-
-		cqa = lookup_comp_queued_alarms (ca, uid);
-		if (!cqa) {
-			g_message ("No currently queue alarms");
-			add_component_alarms (ca, alarms);
-			continue;
-		}
-
-		g_message ("Already existing alarms");
-		/* if the alarms or the alarms list is empty, just remove it */
-		if (alarms == NULL || alarms->alarms == NULL) {
-			if (alarms)
-				e_cal_component_alarms_free (alarms);
-			continue;
-		}
-
-		/* if already in the list, just update it */
-		remove_alarms (cqa, FALSE);
-		cqa->alarms = alarms;
-		cqa->queued_alarms = NULL;
-		
-		/* add the new alarms */
-		for (sl = cqa->alarms->alarms; sl; sl = sl->next) {
-			ECalComponentAlarmInstance *instance;
-			gpointer alarm_id;
-			QueuedAlarm *qa;
-
-			instance = sl->data;
-
-			alarm_id = alarm_add (instance->trigger, alarm_trigger_cb, cqa, NULL);
-			if (!alarm_id) {
-				g_message (G_STRLOC ": Could not schedule a trigger for "
-					   "%ld, discarding...", (long) instance->trigger);
-				continue;
-			}
-
-			qa = g_new (QueuedAlarm, 1);
-			qa->alarm_id = alarm_id;
-			qa->instance = instance;
-			qa->snooze = FALSE;
-			
-			cqa->queued_alarms = g_slist_prepend (cqa->queued_alarms, qa);
-		}
-		
-		cqa->queued_alarms = g_slist_reverse (cqa->queued_alarms);
-	}
-}
-
-/* Called when a calendar component is removed; we must delete its corresponding
- * alarms.
- */
-static void
-query_objects_removed_cb (ECal *client, GList *objects, gpointer data)
-{
-	ClientAlarms *ca;
-	GList *l;
-
-	ca = data;
-
-	for (l = objects; l != NULL; l = l->next)
-		remove_comp (ca, l->data);
-}
-
-
-
-/* Notification functions */
-
-/* Creates a snooze alarm based on an existing one.  The snooze offset is
- * compued with respect to the current time.
- */
-static void
-create_snooze (CompQueuedAlarms *cqa, gpointer alarm_id, int snooze_mins)
-{
-	QueuedAlarm *orig_qa;
-	time_t t;
-	gpointer new_id;
-
-	orig_qa = lookup_queued_alarm (cqa, alarm_id);
-	if (!orig_qa)
-		return;
-
-	t = time (NULL);
-	t += snooze_mins * 60;
-
-	new_id = alarm_add (t, alarm_trigger_cb, cqa, NULL);
-	if (!new_id) {
-		g_message ("create_snooze(): Could not schedule a trigger for "
-			   "%ld, discarding...", (long) t);
-		return;
-	}
-
-	orig_qa->instance->trigger = t;
-	orig_qa->alarm_id = new_id;
-	orig_qa->snooze = TRUE;
-}
-
-/* Launches a component editor for a component */
-static void
-edit_component (ECal *client, ECalComponent *comp)
-{
-	const char *uid;
-	const char *uri;
-	ECalSourceType source_type;
-	CORBA_Environment ev;
-	GNOME_Evolution_Calendar_CompEditorFactory factory;
-	GNOME_Evolution_Calendar_CompEditorFactory_CompEditorMode corba_type;
-
-	e_cal_component_get_uid (comp, &uid);
-
-	uri = e_cal_get_uri (client);
-	source_type = e_cal_get_source_type (client);
-
-	/* Get the factory */
-	CORBA_exception_init (&ev);
-	factory = bonobo_activation_activate_from_id ("OAFIID:GNOME_Evolution_Calendar_CompEditorFactory:" BASE_VERSION,
-						      0, NULL, &ev);
-
-	if (BONOBO_EX (&ev)) {
-		g_message (G_STRLOC ": Could not activate the component editor factory");
-		CORBA_exception_free (&ev);
-		return;
-	}
-
-	/* Edit the component */
-	switch (source_type) {
-	case E_CAL_SOURCE_TYPE_TODO:
-		corba_type = GNOME_Evolution_Calendar_CompEditorFactory_EDITOR_MODE_TODO;
-		break;
-	default:
-		corba_type = GNOME_Evolution_Calendar_CompEditorFactory_EDITOR_MODE_EVENT;		
-	}
-	
-	GNOME_Evolution_Calendar_CompEditorFactory_editExisting (factory, uri, (char *) uid, corba_type, &ev);
-
-	if (BONOBO_EX (&ev))
-		g_message (G_STRLOC ": Exception while editing the component");
-
-	CORBA_exception_free (&ev);
-
-	/* Get rid of the factory */
-	bonobo_object_release_unref (factory, NULL);
-}
-
-typedef struct {
-	char *summary;
-	char *description;
-	char *location;
-	gboolean blink_state;
-	gint blink_id;
-	time_t trigger;
-	CompQueuedAlarms *cqa;
-	gpointer alarm_id;
-	ECalComponent *comp;
-	ECal *client;
-	ECalView *query;
-	GtkWidget *tray_icon;
-	GtkWidget *image;
-	GtkWidget *alarm_dialog;
-} TrayIconData;
-
-static void
-on_dialog_objs_removed_cb (ECal *client, GList *objects, gpointer data)
-{
-	const char *our_uid;
-	GList *l;
-	TrayIconData *tray_data = data;
-
-	e_cal_component_get_uid (tray_data->comp, &our_uid);
-	g_return_if_fail (our_uid && *our_uid);
-
-	for (l = objects; l != NULL; l = l->next) {
-		const char *uid = l->data;
-
-		if (!uid)
-			continue;
-
-		if (!strcmp (uid, our_uid)) {
-			tray_data->cqa = NULL;
-			tray_data->alarm_id = NULL;
-
-			gtk_widget_destroy (tray_data->tray_icon);
-		}
-	}
-}
-
-/* Callback used from the alarm notify dialog */
-static void
-notify_dialog_cb (AlarmNotifyResult result, int snooze_mins, gpointer data)
-{
-	TrayIconData *tray_data = data;
-
-	g_signal_handlers_disconnect_matched (tray_data->query, G_SIGNAL_MATCH_FUNC,
-					      0, 0, NULL, on_dialog_objs_removed_cb, NULL);
-
-	switch (result) {
-	case ALARM_NOTIFY_SNOOZE:
-		create_snooze (tray_data->cqa, tray_data->alarm_id, snooze_mins);
-		tray_data->cqa = NULL;
-		break;
-
-	case ALARM_NOTIFY_EDIT:
-		edit_component (tray_data->client, tray_data->comp);
-		break;
-
-	case ALARM_NOTIFY_CLOSE:
-		/* Do nothing */
-		break;
-
-	default:
-		g_assert_not_reached ();
-	}
-
-	gtk_widget_destroy (tray_data->tray_icon);
-}
-
-static gint
-tray_icon_destroyed_cb (GtkWidget *tray, gpointer user_data)
-{
-	TrayIconData *tray_data = user_data;
-
-	g_signal_handlers_disconnect_matched (tray_data->query, G_SIGNAL_MATCH_FUNC,
-					      0, 0, NULL, on_dialog_objs_removed_cb, NULL);
-
-	if (tray_data->cqa != NULL)
-		remove_queued_alarm (tray_data->cqa, tray_data->alarm_id, TRUE, TRUE);
-
-	if (tray_data->alarm_dialog != NULL) {
-		gtk_widget_destroy (tray_data->alarm_dialog);
-		tray_data->alarm_dialog = NULL;
-	}
-
-	if (tray_data->summary != NULL) {
-		g_free (tray_data->summary);
-		tray_data->summary = NULL;
-	}
-
-	if (tray_data->description != NULL) {
-		g_free (tray_data->description);
-		tray_data->description = NULL;
-	}
-
-	if (tray_data->location != NULL) {
-		g_free (tray_data->location);
-		tray_data->location = NULL;
-	}
-
-	if (tray_data->blink_id)
-		g_source_remove (tray_data->blink_id);
-
-	g_object_unref (tray_data->comp);
-	g_object_unref (tray_data->client);
-	g_object_unref (tray_data->query);
-
-	tray_icons_list = g_list_remove (tray_icons_list, tray_data);
-	g_free (tray_data);
-
-	return TRUE;
-}
-
-/* Callbacks.  */
-static gboolean
-open_alarm_dialog (TrayIconData *tray_data)
-{
-	QueuedAlarm *qa;
-
-	qa = lookup_queued_alarm (tray_data->cqa, tray_data->alarm_id);
-	if (qa) {
-		gtk_widget_hide (tray_data->tray_icon);
-		tray_data->alarm_dialog = alarm_notify_dialog (tray_data->trigger,
-							       qa->instance->occur_start,
-							       qa->instance->occur_end,
-							       e_cal_component_get_vtype (tray_data->comp),
-							       tray_data->summary,
-							       tray_data->description,
-							       tray_data->location,
-							       notify_dialog_cb, tray_data);
-	}
-
-	return TRUE;
-}
-
-static void
-popup_dismiss_cb (EPopup *ep, EPopupItem *pitem, void *data)
-{
-	TrayIconData *tray_data = data;
-
-	gtk_widget_destroy (tray_data->tray_icon);
-}
-
-static void
-popup_dismiss_all_cb (EPopup *ep, EPopupItem *pitem, void *data)
-{
-	while (tray_icons_list != NULL) {
-		TrayIconData *tray_data = tray_icons_list->data;
-
-		gtk_widget_destroy (tray_data->tray_icon);
-
-		tray_icons_list = g_list_remove (tray_icons_list, tray_icons_list);
-	}
-}
-
-static void
-popup_open_cb (EPopup *ep, EPopupItem *pitem, void *data)
-{
-	TrayIconData *tray_data = data;
-
-	open_alarm_dialog (tray_data);
-}
-
-static EPopupItem tray_items[] = {
-	{ E_POPUP_ITEM, "00.open", N_("Open"), popup_open_cb, NULL, GTK_STOCK_OPEN },
-	{ E_POPUP_ITEM, "10.dismiss", N_("Dismiss"), popup_dismiss_cb, NULL, NULL },
-	{ E_POPUP_ITEM, "20.dismissall", N_("Dismiss All"), popup_dismiss_all_cb, NULL, NULL },
-};
-
-static void
-tray_popup_free(EPopup *ep, GSList *items, void *data)
-{
-	g_slist_free(items);
-}
-
-static gint
-tray_icon_clicked_cb (GtkWidget *widget, GdkEventButton *event, gpointer user_data)
-{
-	TrayIconData *tray_data = user_data;
-
-	if (event->type == GDK_BUTTON_PRESS) {
-		if (event->button == 1) {
-			return open_alarm_dialog (tray_data);
-		} else if (event->button == 3) {
-			GtkMenu *menu;
-			GSList *menus = NULL;
-			EPopup *ep;
-			int i;
-
-			ep = e_popup_new("org.gnome.evolution.alarmNotify.popup");
-			for (i=0;i<sizeof(tray_items)/sizeof(tray_items[0]);i++)
-				menus = g_slist_prepend(menus, &tray_items[i]);
-			e_popup_add_items(ep, menus, NULL, tray_popup_free, tray_data);
-			menu = e_popup_create_menu_once(ep, NULL, 0);
-			gtk_menu_popup(menu, NULL, NULL, NULL, NULL, event->button, event->time);
-
-			return TRUE;
-		}
-	}
-
-	return FALSE;
-}
-
-static gboolean
-tray_icon_blink_cb (gpointer data)
-{
-	TrayIconData *tray_data = data;
-	GdkPixbuf *pixbuf;
-
-	tray_data->blink_state = tray_data->blink_state == TRUE ? FALSE : TRUE;
-	pixbuf = e_icon_factory_get_icon  (tray_data->blink_state == TRUE ?
-					   "stock_appointment-reminder-excl" :
-					   "stock_appointment-reminder",
-					   E_ICON_SIZE_LARGE_TOOLBAR);
-
-	gtk_image_set_from_pixbuf (GTK_IMAGE (tray_data->image), pixbuf);
-	g_object_unref (pixbuf);
-
-	return TRUE;
-}
-
-/* Performs notification of a display alarm */
-static void
-display_notification (time_t trigger, CompQueuedAlarms *cqa,
-		      gpointer alarm_id, gboolean use_description)
-{
-	QueuedAlarm *qa;
-	ECalComponent *comp;
-	const char *summary, *description, *location;
-	GtkWidget *tray_icon, *image, *ebox;
-	GtkTooltips *tooltips;
-	TrayIconData *tray_data;
-	ECalComponentText text;
-	GSList *text_list;
-	char *str, *start_str, *end_str, *alarm_str;
-	icaltimezone *current_zone;
-
-	comp = cqa->alarms->comp;
-	qa = lookup_queued_alarm (cqa, alarm_id);
-	if (!qa)
-		return;
-	
-	/* get a sensible description for the event */
-	e_cal_component_get_summary (comp, &text);
-
-	if (text.value)
-		summary = text.value;
-	else
-	        summary = _("No summary available.");
-
-	e_cal_component_get_description_list (comp, &text_list);
-
-	if (text_list) {
-		text = *((ECalComponentText *)text_list->data);
-		if (text.value)
-			description = text.value;
-		else
-			description = _("No description available.");
-	} else {
-		description = _("No description available.");
-	}
-
-	e_cal_component_free_text_list (text_list);
-
-	e_cal_component_get_location (comp, &location);
-
-	if (!location)
-	        location = _("No location information available.");
-
-	/* create the tray icon */
-	tooltips = gtk_tooltips_new ();
-
-	tray_icon = GTK_WIDGET (egg_tray_icon_new (qa->instance->auid));
-	image = e_icon_factory_get_image  ("stock_appointment-reminder", E_ICON_SIZE_LARGE_TOOLBAR);
-	ebox = gtk_event_box_new ();
-
-	gtk_widget_show (image);
-	gtk_widget_show (ebox);
-
-	current_zone = config_data_get_timezone ();
-	alarm_str = timet_to_str_with_zone (trigger, current_zone);
-	start_str = timet_to_str_with_zone (qa->instance->occur_start, current_zone);
-	end_str = timet_to_str_with_zone (qa->instance->occur_end, current_zone);
-	str = g_strdup_printf (_("Alarm on %s\n%s\nStarting at %s\nEnding at %s"),
-			       alarm_str, summary, start_str, end_str);
-	gtk_tooltips_set_tip (GTK_TOOLTIPS (tooltips), ebox, str, str);
-	g_free (start_str);
-	g_free (end_str);
-	g_free (alarm_str);
-	g_free (str);
-	
-	g_object_set_data (G_OBJECT (tray_icon), "image", image);
-	g_object_set_data (G_OBJECT (tray_icon), "available", GINT_TO_POINTER (1));
-
-	gtk_container_add (GTK_CONTAINER (ebox), image);
-	gtk_container_add (GTK_CONTAINER (tray_icon), ebox);
-
-	/* create the private structure */
-	tray_data = g_new0 (TrayIconData, 1);
-	tray_data->summary = g_strdup (summary);
-	tray_data->description = g_strdup (description);
-	tray_data->location = g_strdup (location);
-	tray_data->trigger = trigger;
-	tray_data->cqa = cqa;
-	tray_data->alarm_id = alarm_id;
-	tray_data->comp = e_cal_component_clone (comp);
-	tray_data->client = cqa->parent_client->client;
-	tray_data->query = g_object_ref (cqa->parent_client->query);
-	tray_data->image = image;
-	tray_data->blink_state = FALSE;
-	g_object_ref (tray_data->client);
-	tray_data->tray_icon = tray_icon;
-
-	tray_icons_list = g_list_prepend (tray_icons_list, tray_data);
-
-	g_signal_connect (G_OBJECT (tray_icon), "destroy",
-			  G_CALLBACK (tray_icon_destroyed_cb), tray_data);
-	g_signal_connect (G_OBJECT (ebox), "button_press_event",
-			  G_CALLBACK (tray_icon_clicked_cb), tray_data);
-	g_signal_connect (G_OBJECT (tray_data->query), "objects_removed",
-			  G_CALLBACK (on_dialog_objs_removed_cb), tray_data);
-
-	if (!config_data_get_notify_with_tray ()) {
-		tray_data->blink_id = -1;
-		open_alarm_dialog (tray_data);
-	} else {
-		tray_data->blink_id = g_timeout_add (500, tray_icon_blink_cb, tray_data);
-		gtk_widget_show (tray_icon);
-	}
-}
-
-/* Performs notification of an audio alarm */
-static void
-audio_notification (time_t trigger, CompQueuedAlarms *cqa,
-		    gpointer alarm_id)
-{
-	QueuedAlarm *qa;
-	ECalComponent *comp;
-	ECalComponentAlarm *alarm;
-	icalattach *attach;
-	int	flag = 0;
-
-	comp = cqa->alarms->comp;
-	qa = lookup_queued_alarm (cqa, alarm_id);
-	if (!qa)
-		return;
-
-	alarm = e_cal_component_get_alarm (comp, qa->instance->auid);
-	g_assert (alarm != NULL);
-
-	e_cal_component_alarm_get_attach (alarm, &attach);
-	e_cal_component_alarm_free (alarm);
-
-	if (attach && icalattach_get_is_url (attach)) {
-		const char *url;
-
-		url = icalattach_get_url (attach);
-
-		if (url && *url && g_file_test (url, G_FILE_TEST_EXISTS)) {
-			flag = 1;
-			gnome_sound_play (url); /* this sucks */
-		}
-	}
-
-	if (!flag)
-		gdk_beep ();
-
-	if (attach)
-		icalattach_unref (attach);
-
-	/* We present a notification message in addition to playing the sound */
-	display_notification (trigger, cqa, alarm_id, FALSE);
-}
-
-/* Performs notification of a mail alarm */
-static void
-mail_notification (time_t trigger, CompQueuedAlarms *cqa, gpointer alarm_id)
-{
-	GtkWidget *dialog;
-	GtkWidget *label;
-
-	/* FIXME */
-
-	display_notification (trigger, cqa, alarm_id, FALSE);
-
-	dialog = gtk_dialog_new_with_buttons (_("Warning"),
-					      NULL, 0,
-					      GTK_STOCK_OK, GTK_RESPONSE_CANCEL,
-					      NULL);
-	label = gtk_label_new (_("Evolution does not support calendar reminders with\n"
-				 "email notifications yet, but this reminder was\n"
-				 "configured to send an email.  Evolution will display\n"
-				 "a normal reminder dialog box instead."));
-	gtk_box_pack_start (GTK_BOX (GTK_DIALOG (dialog)->vbox), label, TRUE, TRUE, 4);
-
-	gtk_dialog_run (GTK_DIALOG (dialog));
-}
-
-/* Performs notification of a procedure alarm */
-static gboolean
-procedure_notification_dialog (const char *cmd, const char *url) 
-{
-	GtkWidget *dialog, *label, *checkbox;
-	char *str;
-	int btn;
-	
-	if (config_data_is_blessed_program (url))
-		return TRUE;
-	
-	dialog = gtk_dialog_new_with_buttons (_("Warning"),
-					      NULL, 0,
-					      GTK_STOCK_NO, GTK_RESPONSE_CANCEL,
-					      GTK_STOCK_YES, GTK_RESPONSE_OK,
-					      NULL);
-
-	str = g_strdup_printf (_("An Evolution Calendar reminder is about to trigger. "
-				 "This reminder is configured to run the following program:\n\n"
-				 "        %s\n\n"
-				 "Are you sure you want to run this program?"),
-			       cmd);
-	label = gtk_label_new (str);
-	gtk_label_set_line_wrap (GTK_LABEL (label), TRUE);
-	gtk_label_set_justify (GTK_LABEL (label), GTK_JUSTIFY_LEFT);
-	gtk_widget_show (label);
-	gtk_box_pack_start (GTK_BOX (GTK_DIALOG (dialog)->vbox),
-			    label, TRUE, TRUE, 4);
-	g_free (str);
-
-	checkbox = gtk_check_button_new_with_label
-		(_("Do not ask me about this program again."));
-	gtk_widget_show (checkbox);
-	gtk_box_pack_start (GTK_BOX (GTK_DIALOG (dialog)->vbox), 
-			    checkbox, TRUE, TRUE, 4);
-
-	/* Run the dialog */
-	btn = gtk_dialog_run (GTK_DIALOG (dialog));
-	if (btn == GTK_RESPONSE_OK && gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (checkbox)))
-		config_data_save_blessed_program (url);
-	gtk_widget_destroy (dialog);
-
-	return (btn == GTK_RESPONSE_OK);
-}
-
-static void
-procedure_notification (time_t trigger, CompQueuedAlarms *cqa, gpointer alarm_id)
-{
-	QueuedAlarm *qa;
-	ECalComponent *comp;
-	ECalComponentAlarm *alarm;
-	ECalComponentText description;
-	icalattach *attach;
-	const char *url;
-	char *cmd;
-	int result;
-
-	comp = cqa->alarms->comp;
-	qa = lookup_queued_alarm (cqa, alarm_id);
-	if (!qa)
-		return;
-
-	alarm = e_cal_component_get_alarm (comp, qa->instance->auid);
-	g_assert (alarm != NULL);
-
-	e_cal_component_alarm_get_attach (alarm, &attach);
-	e_cal_component_alarm_get_description (alarm, &description);
-	e_cal_component_alarm_free (alarm);
-
-	/* If the alarm has no attachment, simply display a notification dialog. */
-	if (!attach)
-		goto fallback;
-
-	if (!icalattach_get_is_url (attach)) {
-		icalattach_unref (attach);
-		goto fallback;
-	}
-
-	url = icalattach_get_url (attach);
-	g_assert (url != NULL);
-
-	/* Ask for confirmation before executing the stuff */
-	if (description.value)
-		cmd = g_strconcat (url, " ", description.value, NULL);
-	else
-		cmd = (char *) url;
-
-	result = 0;
-	if (procedure_notification_dialog (cmd, url))
-		result = gnome_execute_shell (NULL, cmd);
-	
-	if (cmd != (char *) url)
-		g_free (cmd);
-
-	icalattach_unref (attach);
-
-	/* Fall back to display notification if we got an error */
-	if (result < 0)
-		goto fallback;
-
-	remove_queued_alarm (cqa, alarm_id, TRUE, TRUE);
-	return;
-
- fallback:
-
-	display_notification (trigger, cqa, alarm_id, FALSE);
-}
-
-
-
-/**
- * alarm_queue_init:
- *
- * Initializes the alarm queueing system.  This should be called near the
- * beginning of the program.
- **/
-void
-alarm_queue_init (void)
-{
-	g_return_if_fail (alarm_queue_inited == FALSE);
-
-	client_alarms_hash = g_hash_table_new (g_direct_hash, g_direct_equal);
-	queue_midnight_refresh ();
-
-	saved_notification_time = config_data_get_last_notification_time ();
-	if (saved_notification_time == -1) {
-		saved_notification_time = time (NULL);
-		config_data_set_last_notification_time (saved_notification_time);
-	}
-
-	alarm_queue_inited = TRUE;
-}
-
-static gboolean
-free_client_alarms_cb (gpointer key, gpointer value, gpointer user_data)
-{
-	ClientAlarms *ca = value;
-
-	if (ca) {
-		remove_client_alarms (ca);
-		if (ca->client) {
-			g_signal_handlers_disconnect_matched (ca->client, G_SIGNAL_MATCH_DATA,
-							      0, 0, NULL, NULL, ca);
-			g_object_unref (ca->client);
-		}
-
-		if (ca->query) {
-			g_signal_handlers_disconnect_matched (ca->query, G_SIGNAL_MATCH_DATA,
-							      0, 0, NULL, NULL, ca);
-			g_object_unref (ca->query);
-		}
-
-		g_hash_table_destroy (ca->uid_alarms_hash);
-
-		g_free (ca);
-		return TRUE;
-	}
-
-	return FALSE;
-}
-
-/**
- * alarm_queue_done:
- *
- * Shuts down the alarm queueing system.  This should be called near the end
- * of the program.  All the monitored calendar clients should already have been
- * unregistered with alarm_queue_remove_client().
- **/
-void
-alarm_queue_done (void)
-{
-	g_return_if_fail (alarm_queue_inited);
-
-	/* All clients must be unregistered by now */
-	g_return_if_fail (g_hash_table_size (client_alarms_hash) == 0);
-
-	g_hash_table_foreach_remove (client_alarms_hash, (GHRFunc) free_client_alarms_cb, NULL);
-	g_hash_table_destroy (client_alarms_hash);
-	client_alarms_hash = NULL;
-
-	if (midnight_refresh_id != NULL) {
-		alarm_remove (midnight_refresh_id);
-		midnight_refresh_id = NULL;
-	}
-
-	alarm_queue_inited = FALSE;
-}
-
-/**
- * alarm_queue_add_client:
- * @client: A calendar client.
- *
- * Adds a calendar client to the alarm queueing system.  Alarm trigger
- * notifications will be presented at the appropriate times.  The client should
- * be removed with alarm_queue_remove_client() when receiving notifications
- * from it is no longer desired.
- *
- * A client can be added any number of times to the alarm queueing system,
- * but any single alarm trigger will only be presented once for a particular
- * client.  The client must still be removed the same number of times from the
- * queueing system when it is no longer wanted.
- **/
-void
-alarm_queue_add_client (ECal *client)
-{
-	ClientAlarms *ca;
-
-	g_return_if_fail (alarm_queue_inited);
-	g_return_if_fail (client != NULL);
-	g_return_if_fail (E_IS_CAL (client));
-
-	ca = lookup_client (client);
-	if (ca) {
-		return;
-	}
-
-	ca = g_new (ClientAlarms, 1);
-
-	ca->client = client;
-	ca->query = NULL;
-	g_object_ref (ca->client);
-
-	g_hash_table_insert (client_alarms_hash, client, ca);
-
-	ca->uid_alarms_hash = g_hash_table_new (g_str_hash, g_str_equal);
-
-	if (e_cal_get_load_state (client) == E_CAL_LOAD_LOADED) {
-		load_alarms_for_today (ca);
-	} else {
-		g_signal_connect (client, "cal_opened",
-				  G_CALLBACK (cal_opened_cb),
-				  ca);
-	}
-}
-
-/* Called from g_hash_table_foreach(); adds a component UID to a list */
-static void
-add_uid_cb (gpointer key, gpointer value, gpointer data)
-{
-	GSList **uids;
-	const char *uid;
-
-	uids = data;
-	uid = key;
-
-	*uids = g_slist_prepend (*uids, (char *) uid);
-}
-
-/* Removes all the alarms queued for a particular calendar client */
-static void
-remove_client_alarms (ClientAlarms *ca)
-{
-	GSList *uids;
-	GSList *l;
-
-	/* First we build a list of UIDs so that we can remove them one by one */
-
-	uids = NULL;
-	g_hash_table_foreach (ca->uid_alarms_hash, add_uid_cb, &uids);
-
-	for (l = uids; l; l = l->next) {
-		const char *uid;
-
-		uid = l->data;
-
-		remove_comp (ca, uid);
-	}
-
-	g_slist_free (uids);
-
-	/* The hash table should be empty now */
-
-	g_assert (g_hash_table_size (ca->uid_alarms_hash) == 0);
-}
-
-/**
- * alarm_queue_remove_client:
- * @client: A calendar client.
- *
- * Removes a calendar client from the alarm queueing system.
- **/
-void
-alarm_queue_remove_client (ECal *client)
-{
-	ClientAlarms *ca;
-
-	g_return_if_fail (alarm_queue_inited);
-	g_return_if_fail (client != NULL);
-	g_return_if_fail (E_IS_CAL (client));
-
-	ca = lookup_client (client);
-	g_return_if_fail (ca != NULL);
-
-	remove_client_alarms (ca);
-
-	/* Clean up */
-
-	if (ca->client) {
-		g_signal_handlers_disconnect_matched (ca->client, G_SIGNAL_MATCH_DATA,
-						      0, 0, NULL, NULL, ca);
-		g_object_unref (ca->client);
-		ca->client = NULL;
-	}
-
-	if (ca->query) {
-		g_signal_handlers_disconnect_matched (ca->query, G_SIGNAL_MATCH_DATA,
-						      0, 0, NULL, NULL, ca);
-		g_object_unref (ca->query);
-		ca->query = NULL;
-	}
-
-	g_hash_table_destroy (ca->uid_alarms_hash);
-	ca->uid_alarms_hash = NULL;
-
-	g_free (ca);
-
-	g_hash_table_remove (client_alarms_hash, client);
-}
diff --git a/calendar/gui/alarm-notify/alarm-queue.h b/calendar/gui/alarm-notify/alarm-queue.h
deleted file mode 100644
index 12802750ec..0000000000
--- a/calendar/gui/alarm-notify/alarm-queue.h
+++ /dev/null
@@ -1,34 +0,0 @@
-/* Evolution calendar - Alarm queueing engine
- *
- * Copyright (C) 2001 Ximian, Inc.
- *
- * Authors: Federico Mena-Quintero <federico@ximian.com>
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of version 2 of the GNU General Public
- * License as published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307, USA.
- */
-
-#ifndef ALARM_QUEUE_H
-#define ALARM_QUEUE_H
-
-#include <libecal/e-cal.h>
-
-
-void alarm_queue_init (void);
-void alarm_queue_done (void);
-
-void alarm_queue_add_client (ECal *client);
-void alarm_queue_remove_client (ECal *client);
-
-
-#endif
diff --git a/calendar/gui/alarm-notify/alarm.c b/calendar/gui/alarm-notify/alarm.c
deleted file mode 100644
index 6c57311c12..0000000000
--- a/calendar/gui/alarm-notify/alarm.c
+++ /dev/null
@@ -1,301 +0,0 @@
-/* Evolution calendar - Low-level alarm timer mechanism
- *
- * Copyright (C) 2000 Ximian, Inc.
- * Copyright (C) 2000 Ximian, Inc.
- *
- * Authors: Miguel de Icaza <miguel@ximian.com>
- *          Federico Mena-Quintero <federico@ximian.com>
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of version 2 of the GNU General Public
- * License as published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307, USA.
- */
-
-#include <config.h>
-#include <unistd.h>
-#include <time.h>
-#include <fcntl.h>
-#include <signal.h>
-#include <sys/time.h>
-#include <gdk/gdk.h>
-#include "alarm.h"
-
-
-
-/* Our glib timeout */
-static guint timeout_id;
-
-/* The list of pending alarms */
-static GList *alarms = NULL;
-
-/* A queued alarm structure */
-typedef struct {
-	time_t             trigger;
-	AlarmFunction      alarm_fn;
-	gpointer           data;
-	AlarmDestroyNotify destroy_notify_fn;
-} AlarmRecord;
-
-static void setup_timeout (void);
-
-
-
-/* Removes the head alarm from the queue.  Does not touch the timeout_id. */
-static void
-pop_alarm (void)
-{
-	AlarmRecord *ar;
-	GList *l;
-
-	g_assert (alarms != NULL);
-
-	ar = alarms->data;
-
-	l = alarms;
-	alarms = g_list_remove_link (alarms, l);
-	g_list_free_1 (l);
-
-	g_free (ar);
-}
-
-/* Callback from the alarm timeout */
-static gboolean
-alarm_ready_cb (gpointer data)
-{
-	time_t now;
-
-	g_assert (alarms != NULL);
-	timeout_id = 0;
-
-	now = time (NULL);
-
-	g_message ("Alarm callback!");
-	while (alarms) {
-		AlarmRecord *notify_id, *ar;
-		AlarmRecord ar_copy;
-
-		ar = alarms->data;
-
-		if (ar->trigger > now)
-			break;
-
-		g_message ("Process alarm with trigger %lu", ar->trigger);
-		notify_id = ar;
-
-		ar_copy = *ar;
-		ar = &ar_copy;
-
-		pop_alarm (); /* This will free the original AlarmRecord; that's why we copy it */
-
-		(* ar->alarm_fn) (notify_id, ar->trigger, ar->data);
-
-		if (ar->destroy_notify_fn)
-			(* ar->destroy_notify_fn) (notify_id, ar->data);
-	}
-
-	/* We need this check because one of the alarm_fn above may have
-	 * re-entered and added an alarm of its own, so the timer will
-	 * already be set up.
-	 */
-	if (alarms)
-		setup_timeout ();
-
-	return FALSE;
-}
-
-/* Sets up a timeout for the next minute.  We do not need to be concerned with
- * timezones here, as this is just a periodic check on the alarm queue.
- */
-static void
-setup_timeout (void)
-{
-	const AlarmRecord *ar;
-	guint diff;
-	time_t now;
-	g_assert (alarms != NULL);
-
-	ar = alarms->data;
-
-	/* Remove the existing time out */
-	if (timeout_id != 0) {
-		g_source_remove (timeout_id);
-		timeout_id = 0;
-	}
-
-	/* Ensure that if the trigger managed to get behind the
-	 * current time we timeout immediately */
-	diff = MAX (0, ar->trigger - time (NULL));
-	now = time (NULL);
-	
-	/* Add the time out */
-	g_message ("Setting timeout for %d %lu %lu", diff, ar->trigger, now);
-	g_message (" %s", ctime (&ar->trigger));
-	g_message (" %s", ctime (&now));
-	timeout_id = g_timeout_add (diff * 1000, alarm_ready_cb, NULL);
-}
-
-/* Used from g_list_insert_sorted(); compares the trigger times of two AlarmRecord structures. */
-static int
-compare_alarm_by_time (gconstpointer a, gconstpointer b)
-{
-	const AlarmRecord *ara = a;
-	const AlarmRecord *arb = b;
-	time_t diff;
-
-	diff = ara->trigger - arb->trigger;
-	return (diff < 0) ? -1 : (diff > 0) ? 1 : 0;
-}
-
-/* Adds an alarm to the queue and sets up the timer */
-static void
-queue_alarm (AlarmRecord *ar)
-{
-	GList *old_head;
-
-	/* Track the current head of the list in case there are changes */
-	old_head = alarms;
-
-	/* Insert the new alarm in order */
-	alarms = g_list_insert_sorted (alarms, ar, compare_alarm_by_time);
-
-	/* If there first item on the list didn't change, the time out is fine */
-	if (old_head == alarms)
-		return;
-
-	/* Set the timer for removal upon activation */
-	setup_timeout ();
-}
-
-
-
-/**
- * alarm_add:
- * @trigger: Time at which alarm will trigger.
- * @alarm_fn: Callback for trigger.
- * @data: Closure data for callback.
- * @destroy_notify_fn: destroy notification callback.
- *
- * Adds an alarm to trigger at the specified time.  The @alarm_fn will be called
- * with the provided data and the alarm will be removed from the trigger list.
- *
- * Return value: An identifier for this alarm; it can be used to remove the
- * alarm later with alarm_remove().  If the trigger time occurs in the past, then
- * the alarm will not be queued and the function will return NULL.
- **/
-gpointer
-alarm_add (time_t trigger, AlarmFunction alarm_fn, gpointer data,
-	   AlarmDestroyNotify destroy_notify_fn)
-{
-	AlarmRecord *ar;
-
-	g_return_val_if_fail (trigger != -1, NULL);
-	g_return_val_if_fail (alarm_fn != NULL, NULL);
-
-	ar = g_new (AlarmRecord, 1);
-	ar->trigger = trigger;
-	ar->alarm_fn = alarm_fn;
-	ar->data = data;
-	ar->destroy_notify_fn = destroy_notify_fn;
-
-	queue_alarm (ar);
-
-	return ar;
-}
-
-/**
- * alarm_remove:
- * @alarm: A queued alarm identifier.
- * 
- * Removes an alarm from the alarm queue.
- **/
-void
-alarm_remove (gpointer alarm)
-{
-	AlarmRecord *notify_id, *ar;
-	AlarmRecord ar_copy;
-	AlarmRecord *old_head;
-	GList *l;
-
-	g_return_if_fail (alarm != NULL);
-
-	ar = alarm;
-
-	l = g_list_find (alarms, ar);
-	if (!l) {
-		g_message (G_STRLOC ": Requested removal of nonexistent alarm!");
-		return;
-	}
-
-	old_head = alarms->data;
-
-	notify_id = ar;
-
-	if (old_head == ar) {
-		ar_copy = *ar;
-		ar = &ar_copy;
-		pop_alarm (); /* This will free the original AlarmRecord; that's why we copy it */
-	} else {
-		alarms = g_list_remove_link (alarms, l);
-		g_list_free_1 (l);
-	}
-
-	/* Reset the timeout */
-
-	g_assert (timeout_id != 0);
-
-	if (!alarms) {
-		g_source_remove (timeout_id);
-		timeout_id = 0;
-	}
-
-	/* Notify about destructiono of the alarm */
-
-	if (ar->destroy_notify_fn)
-		(* ar->destroy_notify_fn) (notify_id, ar->data);
-
-}
-
-/**
- * alarm_done:
- * 
- * Terminates the alarm timer mechanism.  This should be called at the end of
- * the program.
- **/
-void
-alarm_done (void)
-{
-	GList *l;
-
-	if (timeout_id == 0) {
-		g_assert (alarms == NULL);
-		return;
-	}
-
-	g_assert (alarms != NULL);
-
-	g_source_remove (timeout_id);
-	timeout_id = 0;
-
-	for (l = alarms; l; l = l->next) {
-		AlarmRecord *ar;
-
-		ar = l->data;
-
-		if (ar->destroy_notify_fn)
-			(* ar->destroy_notify_fn) (ar, ar->data);
-
-		g_free (ar);
-	}
-
-	g_list_free (alarms);
-	alarms = NULL;
-}
diff --git a/calendar/gui/alarm-notify/alarm.h b/calendar/gui/alarm-notify/alarm.h
deleted file mode 100644
index 23fde886c9..0000000000
--- a/calendar/gui/alarm-notify/alarm.h
+++ /dev/null
@@ -1,42 +0,0 @@
-/* Evolution calendar - Low-level alarm timer mechanism
- *
- * Copyright (C) 2000 Ximian, Inc.
- * Copyright (C) 2000 Ximian, Inc.
- *
- * Authors: Miguel de Icaza <miguel@ximian.com>
- *          Federico Mena-Quintero <federico@ximian.com>
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of version 2 of the GNU General Public
- * License as published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307, USA.
- */
-
-#ifndef ALARM_H
-#define ALARM_H
-
-#include <time.h>
-#include <glib.h>
-
-
-
-typedef void (* AlarmFunction) (gpointer alarm_id, time_t trigger, gpointer data);
-typedef void (* AlarmDestroyNotify) (gpointer alarm_id, gpointer data);
-
-void alarm_done (void);
-
-gpointer alarm_add (time_t trigger, AlarmFunction alarm_fn, gpointer data,
-		    AlarmDestroyNotify destroy_notify_fn);
-void alarm_remove (gpointer alarm);
-
-
-
-#endif
diff --git a/calendar/gui/alarm-notify/config-data.c b/calendar/gui/alarm-notify/config-data.c
deleted file mode 100644
index cd3f7ed885..0000000000
--- a/calendar/gui/alarm-notify/config-data.c
+++ /dev/null
@@ -1,251 +0,0 @@
-/* Evolution calendar - Configuration values for the alarm notification daemon
- *
- * Copyright (C) 2001 Ximian, Inc.
- *
- * Authors: Federico Mena-Quintero <federico@ximian.com>
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of version 2 of the GNU General Public
- * License as published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307, USA.
- */
-
-#ifdef HAVE_CONFIOH
-#include <config.h>
-#endif
-
-#include <string.h>
-#include <libedataserver/e-source-list.h>
-#include "config-data.h"
-
-
-
-#define KEY_LAST_NOTIFICATION_TIME "/apps/evolution/calendar/notify/last_notification_time"
-#define KEY_PROGRAMS "/apps/evolution/calendar/notify/programs"
-
-/* Whether we have initied ourselves by reading the data from the configuration engine */
-static gboolean inited = FALSE;
-static GConfClient *conf_client = NULL;
-static ESourceList *calendar_source_list = NULL, *tasks_source_list = NULL;
-
-
-
-/* Copied from ../calendar-config.c; returns whether the locale has 'am' and
- * 'pm' strings defined.
- */
-static gboolean
-locale_supports_12_hour_format (void)
-{
-	char s[16];
-	time_t t = 0;
-
-	strftime (s, sizeof s, "%p", gmtime (&t));
-	return s[0] != '\0';
-}
-
-static void
-do_cleanup (void)
-{
-	if (calendar_source_list) {
-		g_object_unref (calendar_source_list);
-		calendar_source_list = NULL;
-	}
-
-	if (tasks_source_list) {
-		g_object_unref (tasks_source_list);
-		tasks_source_list = NULL;
-	}
-
-	g_object_unref (conf_client);
-	conf_client = NULL;
-
-	inited = FALSE;
-}
-
-/* Ensures that the configuration values have been read */
-static void
-ensure_inited (void)
-{
-	if (inited)
-		return;
-
-	inited = TRUE;
-
-	conf_client = gconf_client_get_default ();
-	if (!GCONF_IS_CLIENT (conf_client)) {
-		inited = FALSE;
-		return;
-	}
-
-	g_atexit ((GVoidFunc) do_cleanup);
-
-	/* load the sources for calendars and tasks */
-	calendar_source_list = e_source_list_new_for_gconf (conf_client,
-							    "/apps/evolution/calendar/sources");
-	tasks_source_list = e_source_list_new_for_gconf (conf_client,
-							 "/apps/evolution/tasks/sources");
-
-}
-
-GConfClient *
-config_data_get_conf_client (void)
-{
-	ensure_inited ();
-	return conf_client;
-}
-
-icaltimezone *
-config_data_get_timezone (void)
-{
-	char *location;
-	icaltimezone *local_timezone;
-
-	ensure_inited ();
-
-	location = gconf_client_get_string (conf_client, 
-					    "/apps/evolution/calendar/display/timezone",
-					    NULL);
-	if (location && location[0]) {
-		local_timezone = icaltimezone_get_builtin_timezone (location);
-	} else {
-		local_timezone = icaltimezone_get_utc_timezone ();
-	}
-
-	g_free (location);
-
-	return local_timezone;
-}
-
-gboolean
-config_data_get_24_hour_format (void)
-{
-	ensure_inited ();
-
-	if (locale_supports_12_hour_format ()) {
-		return gconf_client_get_bool (conf_client,
-					      "/apps/evolution/calendar/display/use_24hour_format",
-					      NULL);
-	}
-
-	return TRUE;
-}
-
-gboolean
-config_data_get_notify_with_tray (void)
-{
-	ensure_inited ();
-
-	return gconf_client_get_bool (conf_client,
-				      "/apps/evolution/calendar/notify/notify_with_tray",
-				      NULL);
-}
-
-/**
- * config_data_set_last_notification_time:
- * @t: A time value.
- * 
- * Saves the last notification time so that it can be fetched the next time the
- * alarm daemon is run.  This way the daemon can show alarms that should have
- * triggered while it was not running.
- **/
-void
-config_data_set_last_notification_time (time_t t)
-{
-	GConfClient *conf_client;
-	time_t current_t;
-
-	g_return_if_fail (t != -1);
-
-	if (!(conf_client = config_data_get_conf_client ()))
-		return;
-
-	/* we only store the new notification time if it is bigger
-	   than the already stored one */
-	current_t = gconf_client_get_int (conf_client, KEY_LAST_NOTIFICATION_TIME, NULL);
-	if (t > current_t)
-		gconf_client_set_int (conf_client, KEY_LAST_NOTIFICATION_TIME, t, NULL);
-}
-
-/**
- * config_data_get_last_notification_time:
- * 
- * Queries the last saved value for alarm notification times.
- * 
- * Return value: The last saved value, or -1 if no value had been saved before.
- **/
-time_t
-config_data_get_last_notification_time (void)
-{
-	GConfClient *conf_client;
-	GConfValue *value;
-
-	if (!(conf_client = config_data_get_conf_client ()))
-		return -1;
-
-	value = gconf_client_get_without_default (conf_client, KEY_LAST_NOTIFICATION_TIME, NULL);
-	if (value)
-		return (time_t) gconf_value_get_int (value);
-
-	return time (NULL);
-}
-
-/**
- * config_data_save_blessed_program:
- * @program: a program name
- * 
- * Saves a program name as "blessed"
- **/
-void
-config_data_save_blessed_program (const char *program)
-{
-	GConfClient *conf_client;
-	GSList *l;
-
-	if (!(conf_client = config_data_get_conf_client ()))
-		return;
-
-	l = gconf_client_get_list (conf_client, KEY_PROGRAMS, GCONF_VALUE_STRING, NULL);
-	l = g_slist_append (l, g_strdup (program));
-	gconf_client_set_list (conf_client, KEY_PROGRAMS, GCONF_VALUE_STRING, l, NULL);
-	g_slist_foreach (l, (GFunc) g_free, NULL);
-	g_slist_free (l);
-}
-
-/**
- * config_data_is_blessed_program:
- * @program: a program name
- * 
- * Checks to see if a program is blessed
- * 
- * Return value: TRUE if program is blessed, FALSE otherwise
- **/
-gboolean
-config_data_is_blessed_program (const char *program)
-{
-	GConfClient *conf_client;
-	GSList *l, *n;
-	gboolean found = FALSE;
-
-	if (!(conf_client = config_data_get_conf_client ()))
-		return FALSE;
-
-	l = gconf_client_get_list (conf_client, KEY_PROGRAMS, GCONF_VALUE_STRING, NULL);
-	while (l) {
-		n = l->next;
-		if (!found)
-			found = strcmp ((char *) l->data, program) == 0;
-		g_free (l->data);
-		g_slist_free_1 (l);
-		l = n;
-	}
-
-	return found;
-}
diff --git a/calendar/gui/alarm-notify/config-data.h b/calendar/gui/alarm-notify/config-data.h
deleted file mode 100644
index e5b2c3d689..0000000000
--- a/calendar/gui/alarm-notify/config-data.h
+++ /dev/null
@@ -1,38 +0,0 @@
-/* Evolution calendar - Configuration values for the alarm notification daemon
- *
- * Copyright (C) 2001 Ximian, Inc.
- *
- * Authors: Federico Mena-Quintero <federico@ximian.com>
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of version 2 of the GNU General Public
- * License as published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307, USA.
- */
-
-#ifndef CONFIG_DATA_H
-#define CONFIG_DATA_H
-
-#include <glib.h>
-#include <libical/ical.h>
-#include <gconf/gconf-client.h>
-
-GConfClient  *config_data_get_conf_client (void);
-
-icaltimezone *config_data_get_timezone (void);
-gboolean      config_data_get_24_hour_format (void);
-gboolean      config_data_get_notify_with_tray (void);
-void          config_data_set_last_notification_time (time_t t);
-time_t        config_data_get_last_notification_time (void);
-void          config_data_save_blessed_program (const char *program);
-gboolean      config_data_is_blessed_program (const char *program);
-
-#endif
diff --git a/calendar/gui/alarm-notify/notify-main.c b/calendar/gui/alarm-notify/notify-main.c
deleted file mode 100644
index 1032f5b42b..0000000000
--- a/calendar/gui/alarm-notify/notify-main.c
+++ /dev/null
@@ -1,170 +0,0 @@
-/* Evolution calendar - Alarm notification service main file
- *
- * Copyright (C) 2000 Ximian, Inc.
- * Copyright (C) 2003 Novell, Inc.
- *
- * Authors: Federico Mena-Quintero <federico@ximian.com>
- *          Rodrigo Moya <rodrigo@ximian.com>
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of version 2 of the GNU General Public
- * License as published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307, USA.
- */
-
-#ifdef HAVE_CONFIG_H
-#include "config.h"
-#endif
-
-#include <string.h>
-#include <glib.h>
-#include <gtk/gtkmain.h>
-#include <libgnome/gnome-i18n.h>
-#include <libgnome/gnome-init.h>
-#include <libgnome/gnome-sound.h>
-#include <libgnomeui/gnome-client.h>
-#include <libgnomeui/gnome-ui-init.h>
-#include <libgnomevfs/gnome-vfs-init.h>
-#include <glade/glade.h>
-#include <bonobo/bonobo-main.h>
-#include <bonobo/bonobo-generic-factory.h>
-#include <bonobo-activation/bonobo-activation.h>
-#include <libedataserver/e-source.h>
-#include <libedataserverui/e-passwords.h>
-#include "e-util/e-icon-factory.h"
-#include "alarm.h"
-#include "alarm-queue.h"
-#include "alarm-notify.h"
-#include "config-data.h"
-
-
-
-static BonoboGenericFactory *factory;
-
-static AlarmNotify *alarm_notify_service = NULL;
-
-
-/* Callback for the master client's "die" signal.  We must terminate the daemon
- * since the session is ending.
- */
-static void
-client_die_cb (GnomeClient *client)
-{
-	bonobo_main_quit ();
-}
-
-static gint
-save_session_cb (GnomeClient *client, GnomeSaveStyle save_style, gint shutdown,
-		 GnomeInteractStyle interact_style, gint fast, gpointer user_data)
-{
-	char *args[2];
-
-	args[0] = EVOLUTION_LIBEXECDIR "/evolution-alarm-notify";
-	args[1] = NULL;
-	gnome_client_set_restart_command (client, 1, args);
-
-	return TRUE;
-}
-
-/* Sees if a session manager is present.  If so, it tells the SM how to restart
- * the daemon when the session starts.  It also sets the die callback so that
- * the daemon can terminate properly when the session ends.
- */
-static void
-init_session (void)
-{
-	GnomeClient *master_client;
-
-	master_client = gnome_master_client ();
-
-	g_signal_connect (G_OBJECT (master_client), "die",
-			  G_CALLBACK (client_die_cb), NULL);
-	g_signal_connect (G_OBJECT (master_client), "save_yourself",
-			  G_CALLBACK (save_session_cb), NULL);
-
-	/* The daemon should always be started up by the session manager when
-	 * the session starts.  The daemon will take care of loading whatever
-	 * calendars it was told to load.
-	 */
-	gnome_client_set_restart_style (master_client, GNOME_RESTART_IF_RUNNING);
-}
-
-/* Factory function for the alarm notify service; just creates and references a
- * singleton service object.
- */
-static BonoboObject *
-alarm_notify_factory_fn (BonoboGenericFactory *factory, const char *component_id, void *data)
-{
-	if (!alarm_notify_service) {
-		alarm_notify_service = alarm_notify_new ();
-		g_assert (alarm_notify_service != NULL);
-	}
-
-	bonobo_object_ref (BONOBO_OBJECT (alarm_notify_service));
-
-	return BONOBO_OBJECT (alarm_notify_service);
-}
-
-/* Creates the alarm notifier */
-static gboolean
-init_alarm_service (gpointer user_data)
-{
-	if (!alarm_notify_service) {
-		alarm_notify_service = alarm_notify_new ();
-		g_assert (alarm_notify_service != NULL);
-	}
-	
-	return FALSE;
-}
-
-int
-main (int argc, char **argv)
-{
-	bindtextdomain (GETTEXT_PACKAGE, EVOLUTION_LOCALEDIR);
-	bind_textdomain_codeset (GETTEXT_PACKAGE, "UTF-8");
-	textdomain (GETTEXT_PACKAGE);
-
-	gnome_program_init ("evolution-alarm-notify", VERSION, LIBGNOMEUI_MODULE, argc, argv, NULL);
-
-	if (bonobo_init_full (&argc, argv, bonobo_activation_orb_get (),
-			      CORBA_OBJECT_NIL, CORBA_OBJECT_NIL) == FALSE)
-		g_error (_("Could not initialize Bonobo"));
-
-	glade_init ();
-
-	gnome_sound_init ("localhost");
-
-	e_icon_factory_init ();
-
-	factory = bonobo_generic_factory_new ("OAFIID:GNOME_Evolution_Calendar_AlarmNotify_Factory:" BASE_VERSION,
-					      (BonoboFactoryCallback) alarm_notify_factory_fn, NULL);
-	if (!factory)
-		g_error (_("Could not create the alarm notify service factory"));
-
-	init_session ();
-
-	g_idle_add ((GSourceFunc) init_alarm_service, NULL);
-
-	bonobo_main ();
-
-	bonobo_object_unref (BONOBO_OBJECT (factory));
-	factory = NULL;
-
-	if (alarm_notify_service)
-		bonobo_object_unref (BONOBO_OBJECT (alarm_notify_service));
-
-	alarm_done ();
-
-	e_passwords_shutdown ();
-	gnome_sound_shutdown ();
-
-	return 0;
-}
diff --git a/calendar/gui/alarm-notify/util.c b/calendar/gui/alarm-notify/util.c
deleted file mode 100644
index 3749e5f300..0000000000
--- a/calendar/gui/alarm-notify/util.c
+++ /dev/null
@@ -1,49 +0,0 @@
-/* Evolution calendar - utility functions
- *
- * Copyright (C) 2000 Ximian, Inc.
- * Copyright (C) 2001 Ximian, Inc.
- *
- * Author: Federico Mena-Quintero <federico@ximian.com>
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of version 2 of the GNU General Public
- * License as published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307, USA.
- */
-
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
-
-#include <libgnome/gnome-i18n.h>
-#include <e-util/e-time-utils.h>
-#include <libecal/e-cal-time-util.h>
-#include "config-data.h"
-#include "util.h"
-
-/* Converts a time_t to a string, relative to the specified timezone */
-char *
-timet_to_str_with_zone (time_t t, icaltimezone *zone)
-{
-	struct icaltimetype itt;
-	struct tm tm;
-	char buf[256];
-
-	if (t == -1)
-		return g_strdup (_("invalid time"));
-
-	itt = icaltime_from_timet_with_zone (t, FALSE, zone);
-	tm = icaltimetype_to_tm (&itt);
-
-	e_time_format_date_and_time (&tm, config_data_get_24_hour_format (),
-				     FALSE, FALSE, buf, sizeof (buf));
-	return g_strdup (buf);
-}
diff --git a/calendar/gui/alarm-notify/util.h b/calendar/gui/alarm-notify/util.h
deleted file mode 100644
index 7dae3dd7fe..0000000000
--- a/calendar/gui/alarm-notify/util.h
+++ /dev/null
@@ -1,29 +0,0 @@
-/* Evolution calendar - utility functions
- *
- * Copyright (C) 2000 Ximian, Inc.
- * Copyright (C) 2001 Ximian, Inc.
- *
- * Author: Federico Mena-Quintero <federico@ximian.com>
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of version 2 of the GNU General Public
- * License as published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307, USA.
- */
-
-#ifndef UTIL_H
-#define UTIL_H
-
-#include <libecal/e-cal-component.h>
-
-char *timet_to_str_with_zone (time_t t, icaltimezone *zone);
-
-#endif
diff --git a/calendar/gui/apps_evolution_calendar.schemas.in.in b/calendar/gui/apps_evolution_calendar.schemas.in.in
deleted file mode 100644
index bb25cdd8b0..0000000000
--- a/calendar/gui/apps_evolution_calendar.schemas.in.in
+++ /dev/null
@@ -1,413 +0,0 @@
-<gconfschemafile>
-  <schemalist>
-
-    <!-- Display -->
-
-    <schema>
-      <key>/schemas/apps/evolution/calendar/display/timezone</key>
-      <applyto>/apps/evolution/calendar/display/timezone</applyto>
-      <owner>evolution-calendar</owner>
-      <type>string</type>
-      <default>UTC</default>
-      <locale name="C">
-        <short>Timezone</short>
-        <long>The default timezone to use for dates and times in the calendar, as an untranslated Olsen timezone database location like "America/New York".</long>
-      </locale>
-    </schema>
-
-    <schema>
-      <key>/schemas/apps/evolution/calendar/display/use_24hour_format</key>
-      <applyto>/apps/evolution/calendar/display/use_24hour_format</applyto>
-      <owner>evolution-calendar</owner>
-      <type>bool</type>
-      <default>false</default>
-      <locale name="C">
-        <short>Twenty four hour time format</short>
-        <long>Whether to show times in twenty four hour format instead of using am/pm.</long>
-      </locale>
-    </schema>
-
-    <schema>
-      <key>/schemas/apps/evolution/calendar/display/week_start_day</key>
-      <applyto>/apps/evolution/calendar/display/week_start_day</applyto>
-      <owner>evolution-calendar</owner>
-      <type>int</type>
-      <default>1</default>
-      <locale name="C">
-        <short>Week start</short>
-        <long>Weekday the week starts on, from Sunday (0) to Saturday (6).</long>
-      </locale>
-    </schema>
-
-    <schema>
-      <key>/schemas/apps/evolution/calendar/display/day_start_hour</key>
-      <applyto>/apps/evolution/calendar/display/day_start_hour</applyto>
-      <owner>evolution-calendar</owner>
-      <type>int</type>
-      <default>9</default>
-      <locale name="C">
-        <short>Workday start hour</short>
-        <long>Hour the workday starts on, in twenty four hour format, 0 to 23.</long>
-      </locale>
-    </schema>
-
-    <schema>
-      <key>/schemas/apps/evolution/calendar/display/day_start_minute</key>
-      <applyto>/apps/evolution/calendar/display/day_start_minute</applyto>
-      <owner>evolution-calendar</owner>
-      <type>int</type>
-      <default>0</default>
-      <locale name="C">
-        <short>Workday start minute</short>
-        <long>Minute the workday starts on, 0 to 59.</long>
-      </locale>
-    </schema>
-
-    <schema>
-      <key>/schemas/apps/evolution/calendar/display/day_end_hour</key>
-      <applyto>/apps/evolution/calendar/display/day_end_hour</applyto>
-      <owner>evolution-calendar</owner>
-      <type>int</type>
-      <default>17</default>
-      <locale name="C">
-        <short>Workday end hour</short>
-        <long>Hour the workday ends on, in twenty four hour format, 0 to 23.</long>
-      </locale>
-    </schema>
-
-    <schema>
-      <key>/schemas/apps/evolution/calendar/display/day_end_minute</key>
-      <applyto>/apps/evolution/calendar/display/day_end_minute</applyto>
-      <owner>evolution-calendar</owner>
-      <type>int</type>
-      <default>0</default>
-      <locale name="C">
-        <short>Workday end minute</short>
-        <long>Minute the workday ends on, 0 to 59</long>
-      </locale>
-    </schema>
-
-    <schema>
-      <key>/schemas/apps/evolution/calendar/display/time_divisions</key>
-      <applyto>/apps/evolution/calendar/display/time_divisions</applyto>
-      <owner>evolution-calendar</owner>
-      <type>int</type>
-      <default>30</default>
-      <locale name="C">
-        <short>Time divisions</short>
-        <short>Intervals shown in Day and Work Week views, in minutes.</short>
-      </locale>
-    </schema>
-
-    <schema>
-      <key>/schemas/apps/evolution/calendar/display/hpane_position</key>
-      <applyto>/apps/evolution/calendar/display/hpane_position</applyto>
-      <owner>evolution-calendar</owner>
-      <type>int</type>
-      <default>400</default>
-      <locale name="C">
-        <short>Horizontal pane position</short>
-        <long>Position of the horizontal pane, between the date navigator calendar and the task list when not in the month view, in pixels.</long>
-      </locale>
-    </schema>
-
-    <schema>
-      <key>/schemas/apps/evolution/calendar/display/vpane_position</key>
-      <applyto>/apps/evolution/calendar/display/vpane_position</applyto>
-      <owner>evolution-calendar</owner>
-      <type>int</type>
-      <default>150</default>
-      <locale name="C">
-        <short>Vertical pane position</short>
-        <long>Position of the vertical pane, between the view and the date navigator calendar and task list when not in the month view, in pixels.</long>
-      </locale>
-    </schema>
-
-    <schema>
-      <key>/schemas/apps/evolution/calendar/display/month_hpane_position</key>
-      <applyto>/apps/evolution/calendar/display/month_hpane_position</applyto>
-      <owner>evolution-calendar</owner>
-      <type>int</type>
-      <default>32000</default>
-      <locale name="C">
-        <short>Month view horizontal pane position </short>
-        <long>Position of the horizontal pane, between the view and the date navigator calendar and task list in the month view, in pixels.</long>
-      </locale>
-    </schema>
-
-    <schema>
-      <key>/schemas/apps/evolution/calendar/display/month_vpane_position</key>
-      <applyto>/apps/evolution/calendar/display/month_vpane_position</applyto>
-      <owner>evolution-calendar</owner>
-      <type>int</type>
-      <default>150</default>
-      <locale name="C">
-        <short>Month view vertical pane position </short>
-        <long>Position of the vertical pane, between the view and the date navigator calendar and task list in the month view, in pixels.</long>
-      </locale>
-    </schema>
-
-    <schema>
-      <key>/schemas/apps/evolution/calendar/display/task_vpane_position</key>
-      <applyto>/apps/evolution/calendar/display/task_vpane_position</applyto>
-      <owner>evolution-calendar</owner>
-      <type>int</type>
-      <default>400</default>
-      <locale name="C">
-        <short>Tasks vertical pane position </short>
-        <long>Position of the vertical pane, between task list and the task preview pane, in pixels.</long>
-      </locale>
-    </schema>
-
-    <schema>
-      <key>/schemas/apps/evolution/calendar/display/compress_weekend</key>
-      <applyto>/apps/evolution/calendar/display/compress_weekend</applyto>
-      <owner>evolution-calendar</owner>
-      <type>bool</type>
-      <default>true</default>
-      <locale name="C">
-        <short>Compress weekends in month view</short>
-        <long>Whether to compress weekends in the month view, which puts Saturday and Sunday in the space of one weekday.</long>
-      </locale>
-    </schema>
-
-    <schema>
-      <key>/schemas/apps/evolution/calendar/display/show_event_end</key>
-      <applyto>/apps/evolution/calendar/display/show_event_end</applyto>
-      <owner>evolution-calendar</owner>
-      <type>bool</type>
-      <default>true</default>
-      <locale name="C">
-        <short>Show appointment end times in week and month views</short>
-        <long>Whether to display the end time of events in the week and month views.</long>
-      </locale>
-    </schema>
-
-    <schema>
-      <key>/schemas/apps/evolution/calendar/display/working_days</key>
-      <applyto>/apps/evolution/calendar/display/working_days</applyto>
-      <owner>evolution-calendar</owner>
-      <type>int</type>
-      <default>62</default>
-      <locale name="C">
-        <short>Work days</short>
-        <long>Days on which the start and end of work hours should be indicated.</long>
-      </locale>
-    </schema>
-
-    <!-- Tasks -->
-
-    <schema>
-      <key>/schemas/apps/evolution/calendar/tasks/hide_completed</key>
-      <applyto>/apps/evolution/calendar/tasks/hide_completed</applyto>
-      <owner>evolution-calendar</owner>
-      <type>bool</type>
-      <default>false</default>
-      <locale name="C">
-        <short>Hide completed tasks</short>
-        <long>Whether to hide completed tasks in the tasks view.</long>
-      </locale>
-    </schema>
-
-    <schema>
-      <key>/schemas/apps/evolution/calendar/tasks/hide_completed_units</key>
-      <applyto>/apps/evolution/calendar/tasks/hide_completed_units</applyto>
-      <owner>evolution-calendar</owner>
-      <type>string</type>
-      <default>days</default>
-      <locale name="C">
-        <short>Hide task units</short>
-        <long>Units for determining when to hide tasks, "minutes", "hours" or "days".</long>
-      </locale>
-    </schema>
-
-    <schema>
-      <key>/schemas/apps/evolution/calendar/tasks/hide_completed_value</key>
-      <applyto>/apps/evolution/calendar/tasks/hide_completed_value</applyto>
-      <owner>evolution-calendar</owner>
-      <type>int</type>
-      <default>1</default>
-      <locale name="C">
-        <short>Hide task value</short>
-        <long>Number of units for determining when to hide tasks.</long>
-      </locale>
-    </schema>
-
-    <!-- Tasks: Colors -->
-
-    <schema>
-      <key>/schemas/apps/evolution/calendar/tasks/colors/due_today</key>
-      <applyto>/apps/evolution/calendar/tasks/colors/due_today</applyto>
-      <owner>evolution-calendar</owner>
-      <type>string</type>
-      <default>#1e90ff</default>
-      <locale name="C">
-        <short>Tasks due today color</short>
-	<long>Background color of tasks that are due today, in "#rrggbb" format.</long>
-      </locale>
-    </schema>
-
-    <schema>
-      <key>/schemas/apps/evolution/calendar/tasks/colors/overdue</key>
-      <applyto>/apps/evolution/calendar/tasks/colors/overdue</applyto>
-      <owner>evolution-calendar</owner>
-      <type>string</type>
-      <default>#ff0000</default>
-      <locale name="C">
-        <short>Overdue tasks color</short>
-	<long>Background color of tasks that are overdue, in "#rrggbb" format.</long>
-      </locale>
-    </schema>
-
-    <!-- Miscellaneous -->
-
-    <schema>
-      <key>/schemas/apps/evolution/calendar/prompts/confirm_delete</key>
-      <applyto>/apps/evolution/calendar/prompts/confirm_delete</applyto>
-      <owner>evolution-calendar</owner>
-      <type>bool</type>
-      <default>true</default>
-      <locale name="C">
-        <short>Ask for confirmation when deleting items</short>
-        <long>Whether to ask for confirmation when deleting an appointment or task.</long>
-      </locale>
-    </schema>
-
-    <schema>
-      <key>/schemas/apps/evolution/calendar/prompts/confirm_expunge</key>
-      <applyto>/apps/evolution/calendar/prompts/confirm_expunge</applyto>
-      <owner>evolution-calendar</owner>
-      <type>bool</type>
-      <default>true</default>
-      <locale name="C">
-        <short>Confirm expunge</short>
-        <long>Whether to ask for confirmation when expunging appointments and tasks.</long>
-      </locale>
-    </schema>
-
-    <schema>
-      <key>/schemas/apps/evolution/calendar/other/use_default_reminder</key>
-      <applyto>/apps/evolution/calendar/other/use_default_reminder</applyto>
-      <owner>evolution-calendar</owner>
-      <type>bool</type>
-      <default>false</default>
-      <locale name="C">
-        <short>Default appointment reminder</short>
-        <long>Whether to set a default reminder for appointments.</long>
-      </locale>
-    </schema>
-
-    <schema>
-      <key>/schemas/apps/evolution/calendar/other/default_reminder_interval</key>
-      <applyto>/apps/evolution/calendar/other/default_reminder_interval</applyto>
-      <owner>evolution-calendar</owner>
-      <type>int</type>
-      <default>15</default>
-      <locale name="C">
-        <short>Default reminder value</short>
-        <long>Number of units for determining for a default reminder.</long>
-      </locale>
-    </schema>
-
-    <schema>
-      <key>/schemas/apps/evolution/calendar/other/default_reminder_units</key>
-      <applyto>/apps/evolution/calendar/other/default_reminder_units</applyto>
-      <owner>evolution-calendar</owner>
-      <type>string</type>
-      <default></default>
-      <locale name="C">
-        <short>Default reminder units</short>
-        <long>Units for a default reminder, "minutes", "hours" or "days".</long>
-      </locale>
-    </schema>
-
-    <!-- Date navigator -->
-
-    <schema>
-      <key>/schemas/apps/evolution/calendar/date_navigator/show_week_numbers</key>
-      <applyto>/apps/evolution/calendar/date_navigator/show_week_numbers</applyto>
-      <owner>evolution-calendar</owner>
-      <type>bool</type>
-      <default>false</default>
-      <locale name="C">
-        <short>Show week numbers in date navigator</short>
-        <long>Whether to show week numbers in the date navigator.</long>
-      </locale>
-    </schema>
-
-    <!-- Alarm notification -->
-
-    <schema>
-      <key>/schemas/apps/evolution/calendar/notify/last_notification_time</key>
-      <applyto>/apps/evolution/calendar/notify/last_notification_time</applyto>
-      <owner>evolution-calendar</owner>
-      <type>int</type>
-      <default>-1</default>
-      <locale name="C">
-        <short>Last alarm time</short>
-        <long>Time the last alarm ran, in time_t.</long>
-      </locale>
-    </schema>
-
-    <schema>
-      <key>/schemas/apps/evolution/calendar/notify/calendars</key>
-      <applyto>/apps/evolution/calendar/notify/calendars</applyto>
-      <owner>evolution-calendar</owner>
-      <type>list</type>
-      <list_type>string</list_type>
-      <default>[]</default>
-      <locale name="C">
-        <short>Calendars to run alarms for</short>
-      </locale>
-    </schema>
-
-    <schema>
-      <key>/schemas/apps/evolution/calendar/notify/programs</key>
-      <applyto>/apps/evolution/calendar/notify/programs</applyto>
-      <owner>evolution-calendar</owner>
-      <type>list</type>
-      <list_type>string</list_type>
-      <default>[]</default>
-      <locale name="C">
-        <short>Alarm programs</short>
-        <long>Programs that are allowed to be run by alarms.</long>
-      </locale>
-    </schema>
-
-    <schema>
-      <key>/schemas/apps/evolution/calendar/notify/notify_with_tray</key>
-      <applyto>/apps/evolution/calendar/notify/notify_with_tray</applyto>
-      <owner>evolution-calendar</owner>
-      <type>bool</type>
-      <default>false</default>
-      <locale name="C">
-        <short>Show display alarms in notification tray</short>
-        <long>Whether or not to use the notification tray for display alarms.</long>
-      </locale>
-    </schema>
-    
-    <schema>
-      <key>/schemas/apps/evolution/calendar/publish/uris</key>
-      <applyto>/apps/evolution/calendar/publish/uris</applyto>
-      <owner>evolution-calendar</owner>
-      <type>list</type>
-      <list_type>string</list_type>
-      <default>[]</default>
-      <locale name="C">
-        <short>Free/busy server urls</short>
-        <long>List of server urls for free/busy publishing.</long>
-      </locale>
-    </schema>    
-
-    <schema>
-      <key>/schemas/apps/evolution/calendar/publish/template</key>
-      <applyto>/apps/evolution/calendar/publish/template</applyto>
-      <owner>evolution-calendar</owner>
-      <type>string</type>
-      <locale name="C">
-        <short>Free/busy template url</short>
-        <long>The url template to use as a free/busy data fallback, %u is replaced by the user part of the mail address and %d is replaced by the domain.</long>
-      </locale>
-    </schema>
-  </schemalist>
-</gconfschemafile>
diff --git a/calendar/gui/cal-search-bar.c b/calendar/gui/cal-search-bar.c
deleted file mode 100644
index 962b7e5eca..0000000000
--- a/calendar/gui/cal-search-bar.c
+++ /dev/null
@@ -1,524 +0,0 @@
-/* Evolution calendar - Search bar widget for calendar views
- *
- * Copyright (C) 2001 Ximian, Inc.
- *
- * Author: Federico Mena-Quintero <federico@ximian.com>
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of version 2 of the GNU General Public
- * License as published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307, USA.
- */
-
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
-
-#include <stdlib.h>
-#include <string.h>
-#include <glib.h>
-#include <gtk/gtkmenu.h>
-#include <gtk/gtkmenuitem.h>
-#include <gtk/gtkoptionmenu.h>
-#include <gtk/gtksignal.h>
-#include <libgnome/gnome-i18n.h>
-#include "cal-search-bar.h"
-
-
-/* IDs and option items for the ESearchBar */
-enum {
-	SEARCH_ANY_FIELD_CONTAINS,
-	SEARCH_SUMMARY_CONTAINS,
-	SEARCH_DESCRIPTION_CONTAINS,
-	SEARCH_COMMENT_CONTAINS,
-	SEARCH_LOCATION_CONTAINS,
-	SEARCH_CATEGORY_IS
-};
-
-/* Comments are disabled because they are kind of useless right now, see bug 33247 */
-static ESearchBarItem search_option_items[] = {
-	{ N_("Any field contains"), SEARCH_ANY_FIELD_CONTAINS, NULL },
-	{ N_("Summary contains"), SEARCH_SUMMARY_CONTAINS, NULL },
-	{ N_("Description contains"), SEARCH_DESCRIPTION_CONTAINS, NULL },
-	{ N_("Comment contains"), SEARCH_COMMENT_CONTAINS, NULL },
-	{ N_("Location contains"), SEARCH_LOCATION_CONTAINS, NULL },
-	{ N_("Category is"), SEARCH_CATEGORY_IS, NULL },
-};
-
-/* IDs for the categories suboptions */
-#define CATEGORIES_ALL 0
-#define CATEGORIES_UNMATCHED 1
-#define CATEGORIES_OFFSET 3
-
-/* Private part of the CalSearchBar structure */
-struct CalSearchBarPrivate {
-	/* Array of categories */
-	GPtrArray *categories;
-};
-
-static void cal_search_bar_destroy (GtkObject *object);
-
-static void cal_search_bar_search_activated (ESearchBar *search);
-
-/* Signal IDs */
-enum {
-	SEXP_CHANGED,
-	CATEGORY_CHANGED,
-	LAST_SIGNAL
-};
-
-static guint cal_search_bar_signals[LAST_SIGNAL] = { 0 };
-
-G_DEFINE_TYPE (CalSearchBar, cal_search_bar, E_SEARCH_BAR_TYPE);
-
-/* Class initialization function for the calendar search bar */
-static void
-cal_search_bar_class_init (CalSearchBarClass *class)
-{
-	ESearchBarClass *e_search_bar_class;
-	GtkObjectClass *object_class;
-
-	e_search_bar_class = (ESearchBarClass *) class;
-	object_class = (GtkObjectClass *) class;
-
-	cal_search_bar_signals[SEXP_CHANGED] =
-		gtk_signal_new ("sexp_changed",
-				GTK_RUN_FIRST,
-				G_TYPE_FROM_CLASS (object_class),
-				GTK_SIGNAL_OFFSET (CalSearchBarClass, sexp_changed),
-				gtk_marshal_NONE__STRING,
-				GTK_TYPE_NONE, 1,
-				GTK_TYPE_STRING);
-
-	cal_search_bar_signals[CATEGORY_CHANGED] =
-		gtk_signal_new ("category_changed",
-				GTK_RUN_FIRST,
-				G_TYPE_FROM_CLASS (object_class),
-				GTK_SIGNAL_OFFSET (CalSearchBarClass, category_changed),
-				gtk_marshal_NONE__STRING,
-				GTK_TYPE_NONE, 1,
-				GTK_TYPE_STRING);
-
-	class->sexp_changed = NULL;
-	class->category_changed = NULL;
-
-	e_search_bar_class->search_activated = cal_search_bar_search_activated;
-
-	object_class->destroy = cal_search_bar_destroy;
-}
-
-/* Object initialization function for the calendar search bar */
-static void
-cal_search_bar_init (CalSearchBar *cal_search)
-{
-	CalSearchBarPrivate *priv;
-
-	priv = g_new (CalSearchBarPrivate, 1);
-	cal_search->priv = priv;
-
-	priv->categories = g_ptr_array_new ();
-	g_ptr_array_set_size (priv->categories, 0);
-}
-
-/* Frees an array of categories */
-static void
-free_categories (GPtrArray *categories)
-{
-	int i;
-
-	for (i = 0; i < categories->len; i++) {
-		g_assert (categories->pdata[i] != NULL);
-		g_free (categories->pdata[i]);
-	}
-
-	g_ptr_array_free (categories, TRUE);
-}
-
-/* Destroy handler for the calendar search bar */
-static void
-cal_search_bar_destroy (GtkObject *object)
-{
-	CalSearchBar *cal_search;
-	CalSearchBarPrivate *priv;
-
-	g_return_if_fail (object != NULL);
-	g_return_if_fail (IS_CAL_SEARCH_BAR (object));
-
-	cal_search = CAL_SEARCH_BAR (object);
-	priv = cal_search->priv;
-
-	if (priv) {
-		if (priv->categories) {
-			free_categories (priv->categories);
-			priv->categories = NULL;
-		}
-		
-		g_free (priv);
-		cal_search->priv = NULL;
-	}
-	
-	if (GTK_OBJECT_CLASS (cal_search_bar_parent_class)->destroy)
-		(* GTK_OBJECT_CLASS (cal_search_bar_parent_class)->destroy) (object);
-}
-
-
-
-/* Emits the "sexp_changed" signal for the calendar search bar */
-static void
-notify_sexp_changed (CalSearchBar *cal_search, const char *sexp)
-{
-	gtk_signal_emit (GTK_OBJECT (cal_search), cal_search_bar_signals[SEXP_CHANGED],
-			 sexp);
-}
-
-/* Returns the string of the currently selected category, NULL for "Unmatched",
- * or (const char *) 1 for "All".
- */
-static const char *
-get_current_category (CalSearchBar *cal_search)
-{
-	CalSearchBarPrivate *priv;
-	int id, subid;
-
-	priv = cal_search->priv;
-
-	g_assert (priv->categories != NULL);
-
-	id = e_search_bar_get_item_id (E_SEARCH_BAR (cal_search));
-	if (id != SEARCH_CATEGORY_IS)
-		return NULL;
-
-	subid = e_search_bar_get_subitem_id (E_SEARCH_BAR (cal_search));
-	if (subid == CATEGORIES_ALL)
-		return (const char *) 1;
-	else if (subid == CATEGORIES_UNMATCHED)
-		return NULL;
-	else {
-		int i;
-
-		i = subid - CATEGORIES_OFFSET;
-		g_assert (i >= 0 && i < priv->categories->len);
-
-		return priv->categories->pdata[i];
-	}
-}
-
-/* Sets the query string to be (contains? "field" "text") */
-static void
-notify_e_cal_view_contains (CalSearchBar *cal_search, const char *field)
-{
-	char *text;
-	char *sexp;
-
-	text = e_search_bar_get_text (E_SEARCH_BAR (cal_search));
-	if (!text)
-		return; /* This is an error in the UTF8 conversion, not an empty string! */
-
-	sexp = g_strdup_printf ("(contains? \"%s\" \"%s\")", field, text);
-	g_free (text);
-
-	notify_sexp_changed (cal_search, sexp);
-	g_free (sexp);
-}
-
-/* Returns a sexp for the selected category in the drop-down menu.  The "All"
- * option is returned as (const char *) 1, and the "Unfiled" option is returned
- * as NULL.
- */
-static char *
-get_category_sexp (CalSearchBar *cal_search)
-{
-	const char *category;
-
-	category = get_current_category (cal_search);
-
-	if (category == NULL)
-		return g_strdup ("(has-categories? #f)"); /* Unfiled items */
-	else if (category == (const char *) 1)
-		return NULL; /* All items */
-	else
-		return g_strdup_printf ("(has-categories? \"%s\")", category); /* Specific category */
-}
-
-/* Sets the query string to the appropriate match for categories */
-static void
-notify_category_is (CalSearchBar *cal_search)
-{
-	char *sexp;
-
-	sexp = get_category_sexp (cal_search);
-	if (!sexp)
-		notify_sexp_changed (cal_search, "#t"); /* Match all */
-	else
-		notify_sexp_changed (cal_search, sexp);
-
-	if (sexp)
-		g_free (sexp);
-}
-
-/* Creates a new query from the values in the widgets and notifies upstream */
-static void
-regen_query (CalSearchBar *cal_search)
-{
-	CalSearchBarPrivate *priv;
-	int id;
-	const char *category;
-
-	priv = cal_search->priv;
-
-	/* Fetch the data from the ESearchBar's entry widgets */
-
-	id = e_search_bar_get_item_id (E_SEARCH_BAR (cal_search));
-
-	/* Generate the different types of queries */
-
-	switch (id) {
-	case SEARCH_ANY_FIELD_CONTAINS:
-		notify_e_cal_view_contains (cal_search, "any");
-		break;
-
-	case SEARCH_SUMMARY_CONTAINS:
-		notify_e_cal_view_contains (cal_search, "summary");
-		break;
-
-	case SEARCH_DESCRIPTION_CONTAINS:
-		notify_e_cal_view_contains (cal_search, "description");
-		break;
-
-	case SEARCH_COMMENT_CONTAINS:
-		notify_e_cal_view_contains (cal_search, "comment");
-		break;
-
-	case SEARCH_LOCATION_CONTAINS:
-		notify_e_cal_view_contains (cal_search, "location");
-		break;
-
-	case SEARCH_CATEGORY_IS:
-		notify_category_is (cal_search);
-
-		category = cal_search_bar_get_category (cal_search);
-		gtk_signal_emit (GTK_OBJECT (cal_search), cal_search_bar_signals[CATEGORY_CHANGED],
-				 category);
-		break;
-
-	default:
-		g_assert_not_reached ();
-	}
-}
-
-/* search_activated handler for the calendar search bar */
-static void
-cal_search_bar_search_activated (ESearchBar *search)
-{
-	CalSearchBar *cal_search;
-
-	cal_search = CAL_SEARCH_BAR (search);
-	regen_query (cal_search);
-}
-
-
-
-/* Creates the suboptions menu for the ESearchBar with the list of categories */
-static void
-make_suboptions (CalSearchBar *cal_search)
-{
-	CalSearchBarPrivate *priv;
-	ESearchBarSubitem *subitems;
-	int i;
-
-	priv = cal_search->priv;
-
-	g_assert (priv->categories != NULL);
-
-	/* Categories plus "all", "unmatched", separator, terminator */
-	subitems = g_new (ESearchBarSubitem, priv->categories->len + 3 + 1);
-
-	/* All, unmatched, separator */
-
-	subitems[0].text = _("Any Category");
-	subitems[0].id = CATEGORIES_ALL;
-	subitems[0].translate = FALSE;
-
-	subitems[1].text = _("Unmatched");
-	subitems[1].id = CATEGORIES_UNMATCHED;
-	subitems[1].translate = FALSE;
-
-	/* All the other items */
-
-	if (priv->categories->len > 0) {
-		subitems[2].text = NULL; /* separator */
-		subitems[2].id = 0;
-
-		for (i = 0; i < priv->categories->len; i++) {
-			const char *category;
-			char *str;
-
-			category = priv->categories->pdata[i];
-			str = g_strdup (category ? category : "");
-
-			subitems[i + CATEGORIES_OFFSET].text      = str;
-			subitems[i + CATEGORIES_OFFSET].id        = i + CATEGORIES_OFFSET;
-			subitems[i + CATEGORIES_OFFSET].translate = FALSE;
-		}
-
-		subitems[i + CATEGORIES_OFFSET].id = -1; /* terminator */
-	} else
-		subitems[2].id = -1; /* terminator */
-
-	e_search_bar_set_suboption (E_SEARCH_BAR (cal_search), SEARCH_CATEGORY_IS, subitems);
-
-	/* Free the strings */
-	for (i = 0; i < priv->categories->len; i++)
-		g_free (subitems[i + CATEGORIES_OFFSET].text);
-
-	g_free (subitems);
-}
-
-/**
- * cal_search_bar_construct:
- * @cal_search: A calendar search bar.
- * @flags: bitfield of items to appear in the search menu
- * 
- * Constructs a calendar search bar by binding its menu and option items.
- * 
- * Return value: The same value as @cal_search.
- **/
-CalSearchBar *
-cal_search_bar_construct (CalSearchBar *cal_search, guint32 flags)
-{
-	ESearchBarItem *items;
-	guint32 bit = 0x1;
-	int i, j;
-	
-	g_return_val_if_fail (IS_CAL_SEARCH_BAR (cal_search), NULL);
-	
-	items = g_alloca ((G_N_ELEMENTS (search_option_items) + 1) * sizeof (ESearchBarItem));
-	for (i = 0, j = 0; i < G_N_ELEMENTS (search_option_items); i++, bit <<= 1) {
-		if ((flags & bit) != 0) {
-			items[j].text = search_option_items[i].text;
-			items[j].id = search_option_items[i].id;
-			items[j].subitems = search_option_items[i].subitems;
-			j++;
-		}
-	}
-	
-	items[j].text = NULL;
-	items[j].id = -1;
-	items[j].subitems = NULL;
-	
-	e_search_bar_construct (E_SEARCH_BAR (cal_search), NULL, items);
-	make_suboptions (cal_search);
-
-	e_search_bar_set_ids (E_SEARCH_BAR (cal_search), SEARCH_CATEGORY_IS, CATEGORIES_ALL);
-
-	return cal_search;
-}
-
-/**
- * cal_search_bar_new:
- * flags: bitfield of items to appear in the search menu
- * 
- * Creates a new calendar search bar.
- * 
- * Return value: A newly-created calendar search bar.  You should connect to the
- * "sexp_changed" signal to monitor changes in the generated sexps.
- **/
-GtkWidget *
-cal_search_bar_new (guint32 flags)
-{
-	CalSearchBar *cal_search;
-
-	cal_search = g_object_new (TYPE_CAL_SEARCH_BAR, NULL);
-	return GTK_WIDGET (cal_search_bar_construct (cal_search, flags));
-}
-
-/* Used from qsort() */
-static int
-compare_categories_cb (const void *a, const void *b)
-{
-	const char **ca, **cb;
-
-	ca = (const char **) a;
-	cb = (const char **) b;
-
-	/* FIXME: should use some utf8 strcoll() thingy */
-	return strcmp (*ca, *cb);
-}
-
-/* Creates a sorted array of categories based on the original one; copies the
- * string values.
- */
-static GPtrArray *
-sort_categories (GPtrArray *categories)
-{
-	GPtrArray *c;
-	int i;
-
-	c = g_ptr_array_new ();
-	g_ptr_array_set_size (c, categories->len);
-
-	for (i = 0; i < categories->len; i++)
-		c->pdata[i] = g_strdup (categories->pdata[i]);
-
-	qsort (c->pdata, c->len, sizeof (gpointer), compare_categories_cb);
-
-	return c;
-}
-
-/**
- * cal_search_bar_set_categories:
- * @cal_search: A calendar search bar.
- * @categories: Array of pointers to strings for the category names.
- * 
- * Sets the list of categories that are to be shown in the drop-down list
- * of a calendar search bar.  The search bar will automatically add an item
- * for "unfiled" components, that is, those that have no categories assigned
- * to them.
- **/
-void
-cal_search_bar_set_categories (CalSearchBar *cal_search, GPtrArray *categories)
-{
-	CalSearchBarPrivate *priv;
-
-	g_return_if_fail (IS_CAL_SEARCH_BAR (cal_search));
-	g_return_if_fail (categories != NULL);
-
-	priv = cal_search->priv;
-
-	g_assert (priv->categories != NULL);
-	free_categories (priv->categories);
-
-	priv->categories = sort_categories (categories);
-	make_suboptions (cal_search);
-}
-
-/**
- * cal_search_bar_get_category:
- * @cal_search: A calendar search bar.
- * 
- * Queries the currently selected category name in a calendar search bar.
- * If "All" or "Unfiled" are selected, this function will return NULL.
- * 
- * Return value: Name of the selected category, or NULL if there is no
- * selected category.
- **/
-const char *
-cal_search_bar_get_category (CalSearchBar *cal_search)
-{
-	const char *category;
-
-	category = get_current_category (cal_search);
-
-	if (!category || category == (const char *) 1)
-		return NULL;
-	else
-		return category;
-}
diff --git a/calendar/gui/cal-search-bar.h b/calendar/gui/cal-search-bar.h
deleted file mode 100644
index 311dacd606..0000000000
--- a/calendar/gui/cal-search-bar.h
+++ /dev/null
@@ -1,83 +0,0 @@
-/* Evolution calendar - Search bar widget for calendar views
- *
- * Copyright (C) 2001 Ximian, Inc.
- *
- * Author: Federico Mena-Quintero <federico@ximian.com>
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of version 2 of the GNU General Public
- * License as published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307, USA.
- */
-
-#ifndef CAL_SEARCH_BAR_H
-#define CAL_SEARCH_BAR_H
-
-#include "widgets/misc/e-search-bar.h"
-#include "widgets/misc/e-filter-bar.h"
-
-G_BEGIN_DECLS
-
-
-
-#define TYPE_CAL_SEARCH_BAR            (cal_search_bar_get_type ())
-#define CAL_SEARCH_BAR(obj)            (GTK_CHECK_CAST ((obj), TYPE_CAL_SEARCH_BAR, CalSearchBar))
-#define CAL_SEARCH_BAR_CLASS(klass)    (GTK_CHECK_CLASS_CAST ((klass), TYPE_CAL_SEARCH_BAR,	\
-					CalSearchBarClass))
-#define IS_CAL_SEARCH_BAR(obj)         (GTK_CHECK_TYPE ((obj), TYPE_CAL_SEARCH_BAR))
-#define IS_CAL_SEARCH_BAR_CLASS(klass) (GTK_CHECK_CLASS_TYPE ((klass), TYPE_CAL_SEARCH_BAR))
-
-typedef struct CalSearchBarPrivate CalSearchBarPrivate;
-
-enum {
-	CAL_SEARCH_ANY_FIELD_CONTAINS    = (1 << 0),
-	CAL_SEARCH_SUMMARY_CONTAINS      = (1 << 1),
-	CAL_SEARCH_DESCRIPTION_CONTAINS  = (1 << 2),
-	CAL_SEARCH_COMMENT_CONTAINS      = (1 << 3),
-	CAL_SEARCH_LOCATION_CONTAINS     = (1 << 4),
-	CAL_SEARCH_CATEGORY_IS           = (1 << 5)
-};
-
-#define CAL_SEARCH_ALL (0xff)
-#define CAL_SEARCH_CALENDAR_DEFAULT (0x37)
-#define CAL_SEARCH_TASKS_DEFAULT    (0x27)
-
-typedef struct {
-	ESearchBar search_bar;
-
-	/* Private data */
-	CalSearchBarPrivate *priv;
-} CalSearchBar;
-
-typedef struct {
-	ESearchBarClass parent_class;
-
-	/* Notification signals */
-
-	void (* sexp_changed) (CalSearchBar *cal_search, const char *sexp);
-	void (* category_changed) (CalSearchBar *cal_search, const char *category);
-} CalSearchBarClass;
-
-GtkType cal_search_bar_get_type (void);
-
-CalSearchBar *cal_search_bar_construct (CalSearchBar *cal_search, guint32 flags);
-
-GtkWidget *cal_search_bar_new (guint32 flags);
-
-void cal_search_bar_set_categories (CalSearchBar *cal_search, GPtrArray *categories);
-
-const char *cal_search_bar_get_category (CalSearchBar *cal_search);
-
-
-
-G_END_DECLS
-
-#endif
diff --git a/calendar/gui/calendar-commands.c b/calendar/gui/calendar-commands.c
deleted file mode 100644
index 8cf9849f7d..0000000000
--- a/calendar/gui/calendar-commands.c
+++ /dev/null
@@ -1,712 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-/* Evolution calendar - Commands for the calendar GUI control
- *
- * Copyright (C) 1998 The Free Software Foundation
- * Copyright (C) 2000 Ximian, Inc.
- * Copyright (C) 2000 Ximian, Inc.
- *
- * Authors: Miguel de Icaza <miguel@ximian.com>
- *          Federico Mena-Quintero <federico@ximian.com>
- *          Seth Alves <alves@hungry.com>
- *          Rodrigo Moya <rodrigo@ximian.com>
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of version 2 of the GNU General Public
- * License as published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307, USA.
- */
-
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
-
-#include <pwd.h>
-#include <unistd.h>
-#include <sys/types.h>
-#include <sys/stat.h>
-#include <string.h>
-#include <ctype.h>
-#include <errno.h>
-
-#include <gdk-pixbuf/gdk-pixbuf.h>
-#include <gtk/gtkfilesel.h>
-#include <gtk/gtklabel.h>
-#include <gtk/gtkmain.h>
-#include <gtk/gtksignal.h>
-#include <gtk/gtkspinbutton.h>
-#include <gtk/gtkmessagedialog.h>
-#include <libgnome/gnome-util.h>
-#include <libgnomeui/gnome-dialog-util.h>
-#include <libgnomeui/gnome-messagebox.h>
-#include <libgnomeui/gnome-stock-icons.h>
-#include <libgnome/gnome-util.h>
-#include <libgnome/gnome-i18n.h>
-#include <bonobo/bonobo-ui-util.h>
-#include <bonobo/bonobo-exception.h>
-#include <libecal/e-cal-time-util.h>
-#include "shell/Evolution.h"
-#include "calendar-commands.h"
-#include "calendar-config.h"
-#include "e-day-view.h"
-#include "e-week-view.h"
-#include "gnome-cal.h"
-#include "goto.h"
-#include "print.h"
-#include "dialogs/cal-prefs-dialog.h"
-#include "itip-utils.h"
-#include "e-pub-utils.h"
-#include "e-cal-list-view.h"
-#include "evolution-shell-component-utils.h"
-#include "e-util/e-icon-factory.h"
-#include "e-cal-menu.h"
-
-/* Focusing information for the calendar view.  We have to keep track of this
- * ourselves because with Bonobo controls, we may get unpaired focus_out events.
- */
-typedef struct {
-	guint calendar_focused : 1;
-	guint taskpad_focused : 1;
-} FocusData;
-
-static void
-file_open_event_cb (BonoboUIComponent *uic, gpointer data, const char *path)
-{
-	GnomeCalendar *gcal;
-
-	gcal = GNOME_CALENDAR (data);
-
-	e_calendar_view_open_event (E_CALENDAR_VIEW (gnome_calendar_get_current_view_widget (gcal)));
-}
-
-
-/* Prints the calendar at its current view and time range */
-static void
-print (GnomeCalendar *gcal, gboolean preview)
-{
-	time_t start;
-	GnomeCalendarViewType view_type;
-	PrintView print_view;
-	ECalListView *list_view;
-	ETable *etable;
-	
-	gnome_calendar_get_current_time_range (gcal, &start, NULL);
-	view_type = gnome_calendar_get_view (gcal);
-
-	switch (view_type) {
-	case GNOME_CAL_DAY_VIEW:
-		print_view = PRINT_VIEW_DAY;
-		break;
-
-	case GNOME_CAL_WORK_WEEK_VIEW:
-	case GNOME_CAL_WEEK_VIEW:
-		print_view = PRINT_VIEW_WEEK;
-		break;
-
-	case GNOME_CAL_MONTH_VIEW:
-		print_view = PRINT_VIEW_MONTH;
-		break;
-
-	case GNOME_CAL_LIST_VIEW:
-		list_view = E_CAL_LIST_VIEW (gnome_calendar_get_current_view_widget (gcal));
-		etable = e_table_scrolled_get_table (list_view->table_scrolled);
-		print_table (etable, _("Print"), _("Calendar"), preview);
-		return;
-
-	default:
-		g_assert_not_reached ();
-		return;
-	}
-
-	print_calendar (gcal, preview, start, print_view);
-}
-
-/* File/Print callback */
-static void
-file_print_cb (BonoboUIComponent *uic, gpointer data, const char *path)
-{
-	GnomeCalendar *gcal;
-
-	gcal = GNOME_CALENDAR (data);
-	print (gcal, FALSE);
-}
-
-static void
-file_print_preview_cb (BonoboUIComponent *uic, gpointer data, const char *path)
-{
-	GnomeCalendar *gcal;
-
-	gcal = GNOME_CALENDAR (data);
-	print (gcal, TRUE);
-}
-
-/* Sets a clock cursor for the specified calendar window */
-static void
-set_clock_cursor (GnomeCalendar *gcal)
-{
-	GdkCursor *cursor;
-
-	cursor = gdk_cursor_new (GDK_WATCH);
-	gdk_window_set_cursor (GTK_WIDGET (gcal)->window, cursor);
-	gdk_cursor_destroy (cursor);
-	gdk_flush ();
-}
-
-/* Resets the normal cursor for the specified calendar window */
-static void
-set_normal_cursor (GnomeCalendar *gcal)
-{
-	gdk_window_set_cursor (GTK_WIDGET (gcal)->window, NULL);
-	gdk_flush ();
-}
-
-static void
-previous_clicked (BonoboUIComponent *uic, gpointer data, const char *path)
-{
-	GnomeCalendar *gcal;
-
-	gcal = GNOME_CALENDAR (data);
-
-	set_clock_cursor (gcal);
-	gnome_calendar_previous (gcal);
-	set_normal_cursor (gcal);
-}
-
-static void
-next_clicked (BonoboUIComponent *uic, gpointer data, const char *path)
-{
-	GnomeCalendar *gcal;
-
-	gcal = GNOME_CALENDAR (data);
-
-	set_clock_cursor (gcal);
-	gnome_calendar_next (gcal);
-	set_normal_cursor (gcal);
-}
-
-void
-calendar_goto_today (GnomeCalendar *gcal)
-{
-	set_clock_cursor (gcal);
-	gnome_calendar_goto_today (gcal);
-	set_normal_cursor (gcal);
-}
-
-static void
-today_clicked (BonoboUIComponent *uic, gpointer data, const char *path)
-{
-	GnomeCalendar *gcal;
-
-	gcal = GNOME_CALENDAR (data);
-
-	calendar_goto_today (gcal);
-}
-
-static void
-goto_clicked (BonoboUIComponent *uic, gpointer data, const char *path)
-{
-	GnomeCalendar *gcal;
-
-	gcal = GNOME_CALENDAR (data);
-
-	goto_dialog (gcal);
-}
-
-static void
-show_day_view_clicked (BonoboUIComponent *uic, gpointer data, const char *path)
-{
-	GnomeCalendar *gcal;
-
-	gcal = GNOME_CALENDAR (data);
-
-	gnome_calendar_set_view (gcal, GNOME_CAL_DAY_VIEW);
-}
-
-static void
-show_work_week_view_clicked (BonoboUIComponent *uic, gpointer data, const char *path)
-{
-	GnomeCalendar *gcal;
-
-	gcal = GNOME_CALENDAR (data);
-
-	gnome_calendar_set_view (gcal, GNOME_CAL_WORK_WEEK_VIEW);
-}
-
-static void
-show_week_view_clicked (BonoboUIComponent *uic, gpointer data, const char *path)
-{
-	GnomeCalendar *gcal;
-
-	gcal = GNOME_CALENDAR (data);
-
-	gnome_calendar_set_view (gcal, GNOME_CAL_WEEK_VIEW);
-}
-
-static void
-show_month_view_clicked (BonoboUIComponent *uic, gpointer data, const char *path)
-{
-	GnomeCalendar *gcal;
-
-	gcal = GNOME_CALENDAR (data);
-
-	gnome_calendar_set_view (gcal, GNOME_CAL_MONTH_VIEW);
-}
-
-
-static void
-show_list_view_clicked (BonoboUIComponent *uic, gpointer data, const char *path)
-{
-	GnomeCalendar *gcal;
-
-	gcal = GNOME_CALENDAR (data);
-
-	gnome_calendar_set_view (gcal, GNOME_CAL_LIST_VIEW);
-}
-
-
-static void
-cut_cmd (BonoboUIComponent *uic, gpointer data, const gchar *path)
-{
-	GnomeCalendar *gcal;
-
-	gcal = GNOME_CALENDAR (data);
-	set_clock_cursor (gcal);
-	gnome_calendar_cut_clipboard (gcal);
-	set_normal_cursor (gcal);
-}
-
-static void
-copy_cmd (BonoboUIComponent *uic, gpointer data, const gchar *path)
-{
-	GnomeCalendar *gcal;
-
-	gcal = GNOME_CALENDAR (data);
-
-	set_clock_cursor (gcal);
-	gnome_calendar_copy_clipboard (gcal);
-	set_normal_cursor (gcal);
-}
-
-static void
-paste_cmd (BonoboUIComponent *uic, gpointer data, const gchar *path)
-{
-	GnomeCalendar *gcal;
-
-	gcal = GNOME_CALENDAR (data);
-
-	set_clock_cursor (gcal);
-	gnome_calendar_paste_clipboard (gcal);
-	set_normal_cursor (gcal);
-}
-
-static void
-delete_cmd (BonoboUIComponent *uic, gpointer data, const gchar *path)
-{
-	GnomeCalendar *gcal;
-
-	gcal = GNOME_CALENDAR (data);
-
-	set_clock_cursor (gcal);
-	gnome_calendar_delete_selection (gcal);
-	set_normal_cursor (gcal);
-}
-
-static void
-delete_occurrence_cmd (BonoboUIComponent *uic, gpointer data, const gchar *path)
-{
-	GnomeCalendar *gcal;
-
-	gcal = GNOME_CALENDAR (data);
-
-	set_clock_cursor (gcal);
-	gnome_calendar_delete_selected_occurrence (gcal);
-	set_normal_cursor (gcal);
-}
-
-static void
-publish_freebusy_cmd (BonoboUIComponent *uic, gpointer data, const gchar *path)
-{
-	e_pub_publish (TRUE);
-}
-
-static void
-purge_cmd (BonoboUIComponent *uic, gpointer data, const gchar *path)
-{
-	GnomeCalendar *gcal;
-	GtkWidget *dialog, *parent, *box, *label, *spin;
-	int response;
-
-	gcal = GNOME_CALENDAR (data);
-
-	/* create the dialog */
-	parent = gtk_widget_get_toplevel (GTK_WIDGET (gcal));
-	dialog = gtk_message_dialog_new (
-		(GtkWindow *)parent,
-		GTK_DIALOG_DESTROY_WITH_PARENT,
-		GTK_MESSAGE_WARNING,
-		GTK_BUTTONS_OK_CANCEL,
-		_("This operation will permanently erase all events older than the selected amount of time. If you continue, you will not be able to recover these events."));
-	gtk_dialog_set_default_response (GTK_DIALOG (dialog), GTK_RESPONSE_CANCEL);
-
-	box = gtk_hbox_new (FALSE, 6);
-	gtk_box_pack_start (GTK_BOX (GTK_DIALOG (dialog)->vbox), box, TRUE, FALSE, 6);
-
-	label = gtk_label_new (_("Purge events older than"));
-	gtk_box_pack_start (GTK_BOX (box), label, TRUE, FALSE, 6);
-	spin = gtk_spin_button_new_with_range (0.0, 1000.0, 1.0);
-	gtk_spin_button_set_value (GTK_SPIN_BUTTON (spin), 60.0);
-	gtk_box_pack_start (GTK_BOX (box), spin, FALSE, FALSE, 6);
-	label = gtk_label_new (_("days"));
-	gtk_box_pack_start (GTK_BOX (box), label, TRUE, FALSE, 6);
-
-	gtk_widget_show_all (box);
-
-	/* run the dialog */
-	response = gtk_dialog_run (GTK_DIALOG (dialog));
-	if (response == GTK_RESPONSE_OK) {
-		gint days;
-		time_t tt;
-
-		days = gtk_spin_button_get_value_as_int (GTK_SPIN_BUTTON (spin));
-		tt = time (NULL);
-		tt -= (days * (24 * 3600));
-
-		gnome_calendar_purge (gcal, tt);
-	}
-
-	gtk_widget_destroy (dialog);
-}
-
-struct _sensitize_item {
-	char *command;
-	guint32 enable;
-};
-
-static void
-sensitize_items(BonoboUIComponent *uic, struct _sensitize_item *items, guint32 mask)
-{
-	while (items->command) {
-		char command[32];
-
-		g_assert(strlen(items->command)<21);
-		sprintf(command, "/commands/%s", items->command);
-
-		bonobo_ui_component_set_prop (uic, command, "sensitive",
-					      (items->enable & mask) == 0 ? "1" : "0",
-					      NULL);
-		items++;
-	}
-}
-
-static struct _sensitize_item calendar_sensitize_table[] = {
-	{ "EventOpen", E_CAL_MENU_SELECT_ONE },
-	{ "Cut", E_CAL_MENU_SELECT_EDITABLE },
-	{ "Copy", E_CAL_MENU_SELECT_ANY },
-	{ "Paste", E_CAL_MENU_SELECT_EDITABLE },
-	{ "Delete", E_CAL_MENU_SELECT_EDITABLE|E_CAL_MENU_SELECT_NONRECURRING },
-	{ "DeleteOccurrence", E_CAL_MENU_SELECT_EDITABLE|E_CAL_MENU_SELECT_RECURRING },
-	{ "DeleteAllOccurrences", E_CAL_MENU_SELECT_EDITABLE|E_CAL_MENU_SELECT_RECURRING },
-	{ 0 }
-};
-
-/* Sensitizes the UI Component menu/toolbar calendar commands based on the
- * number of selected events. (This will always be 0 or 1 currently.)  If enable
- * is FALSE, all will be disabled.  Otherwise, the currently-selected number of
- * events will be used.
- */
-void
-calendar_control_sensitize_calendar_commands (BonoboControl *control, GnomeCalendar *gcal, gboolean enable)
-{
-	BonoboUIComponent *uic;
-	GtkWidget *view;
-	ECalMenu *menu;
-	ECalModel *model;
-	GPtrArray *events;
-	GList *selected, *l;
-	ECalMenuTargetSelect *t;
-
-	uic = bonobo_control_get_ui_component (control);
-	g_assert (uic != NULL);
-
-	if (bonobo_ui_component_get_container (uic) == CORBA_OBJECT_NIL)
-		return;
-	
-	view = gnome_calendar_get_current_view_widget (gcal);
-
-	menu = gnome_calendar_get_calendar_menu (gcal);
-	model = e_calendar_view_get_model((ECalendarView *)view);
-	events = g_ptr_array_new();
-	selected = e_calendar_view_get_selected_events((ECalendarView *)view);
-	for (l=selected;l;l=g_list_next(l)) {
-		ECalendarViewEvent *event = l->data;
-		if (event && event->comp_data)
-			g_ptr_array_add (events, e_cal_model_copy_component_data(event->comp_data));
-	}
-	g_list_free(selected);
-
-	t = e_cal_menu_target_new_select(menu, model, events);
-	if (!enable)
-		t->target.mask = ~0;
-
-	sensitize_items(uic, calendar_sensitize_table, t->target.mask);
-#if 0
-	/* retrieve read-onlyness of the default client */
-	e_cal = e_cal_model_get_default_client (gnome_calendar_get_calendar_model (gcal));
-	if (e_cal)
-		e_cal_is_read_only (e_cal, &default_read_only, NULL);
-	else
-		default_read_only = TRUE;
-#endif
-
-	e_menu_update_target((EMenu *)menu, (EMenuTarget *)t);
-}
-
-static struct _sensitize_item taskpad_sensitize_table[] = {
-	{ "Cut", E_CAL_MENU_SELECT_EDITABLE },
-	{ "Copy", E_CAL_MENU_SELECT_ANY },
-	{ "Paste", E_CAL_MENU_SELECT_EDITABLE },
-	{ "Delete", E_CAL_MENU_SELECT_EDITABLE },
-	{ 0 }
-};
-
-/* Sensitizes the UI Component menu/toolbar tasks commands based on the number
- * of selected tasks.  If enable is FALSE, all will be disabled.  Otherwise, the
- * currently-selected number of tasks will be used.
- */
-static void
-sensitize_taskpad_commands (GnomeCalendar *gcal, BonoboControl *control, gboolean enable)
-{
-	BonoboUIComponent *uic;
-	ECalendarTable *task_pad;
-	ECalModel *model;
-	GSList *selected, *l;
-	ECalMenu *menu;
-	GPtrArray *events;
-	ECalMenuTargetSelect *t;
-
-	uic = bonobo_control_get_ui_component (control);
-	g_assert (uic != NULL);
-
-	menu = gnome_calendar_get_calendar_menu (gcal);
-	task_pad = gnome_calendar_get_task_pad(gcal);
-	model = e_calendar_table_get_model (task_pad);
-	selected = e_calendar_table_get_selected(task_pad);
-	events = g_ptr_array_new();
-	for (l=selected;l;l=g_slist_next(l))
-		g_ptr_array_add(events, e_cal_model_copy_component_data((ECalModelComponent *)l->data));
-	g_slist_free(selected);
-
-	t = e_cal_menu_target_new_select(menu, model, events);
-	if (!enable)
-		t->target.mask = ~0;
-
-	sensitize_items(uic, taskpad_sensitize_table, t->target.mask);
-}
-
-/* Callback used when the selection in the calendar views changes */
-static void
-gcal_calendar_selection_changed_cb (GnomeCalendar *gcal, gpointer data)
-{
-	BonoboControl *control;
-
-	control = BONOBO_CONTROL (data);
-
-	printf("calendar selection changed\n");
-
-	calendar_control_sensitize_calendar_commands (control, gcal, TRUE);
-}
-
-/* Callback used when the selection in the taskpad changes */
-static void
-gcal_taskpad_selection_changed_cb (GnomeCalendar *gcal, gpointer data)
-{
-	BonoboControl *control;
-
-	control = BONOBO_CONTROL (data);
-
-	sensitize_taskpad_commands (gcal, control, TRUE);
-}
-
-/* Callback used when the focus changes for a calendar view */
-static void
-gcal_calendar_focus_change_cb (GnomeCalendar *gcal, gboolean in, gpointer data)
-{
-	BonoboControl *control;
-	FocusData *focus;
-
-	control = BONOBO_CONTROL (data);
-
-	focus = g_object_get_data (G_OBJECT (control), "focus_data");
-	g_assert (focus != NULL);
-
-	if (in) {
-		g_signal_connect (gcal, "calendar_selection_changed",
-				  G_CALLBACK (gcal_calendar_selection_changed_cb), control);
-		calendar_control_sensitize_calendar_commands (control, gcal, TRUE);
-		focus->calendar_focused = TRUE;
-	} else if (focus->calendar_focused) {
-		gtk_signal_disconnect_by_func (GTK_OBJECT (gcal),
-					       G_CALLBACK (gcal_calendar_selection_changed_cb),
-					       control);
-		calendar_control_sensitize_calendar_commands (control, gcal, FALSE);
-		focus->calendar_focused = FALSE;
-	}
-}
-
-/* Callback used when the taskpad focus changes */
-static void
-gcal_taskpad_focus_change_cb (GnomeCalendar *gcal, gboolean in, gpointer data)
-{
-	BonoboControl *control;
-	FocusData *focus;
-
-	control = BONOBO_CONTROL (data);
-
-	focus = g_object_get_data (G_OBJECT (control), "focus_data");
-	g_assert (focus != NULL);
-
-	if (in) {
-		g_signal_connect (gcal, "taskpad_selection_changed",
-				  G_CALLBACK (gcal_taskpad_selection_changed_cb), control);
-		sensitize_taskpad_commands (gcal, control, TRUE);
-		focus->taskpad_focused = TRUE;
-	} else if (focus->taskpad_focused) {
-		/* With Bonobo controls, we may get unpaired focus_out events.
-		 * That is why we have to keep track of this ourselves instead
-		 * of blindly assumming that we are getting this event because
-		 * the taskpad was in fact focused.
-		 */
-		gtk_signal_disconnect_by_func (GTK_OBJECT (gcal),
-					       G_CALLBACK (gcal_taskpad_selection_changed_cb),
-					       control);
-		sensitize_taskpad_commands (gcal, control, FALSE);
-		focus->taskpad_focused = FALSE;
-	}
-
-}
-
-
-static BonoboUIVerb verbs [] = {
-	BONOBO_UI_VERB ("EventOpen", file_open_event_cb),
-	BONOBO_UI_VERB ("CalendarPrint", file_print_cb),
-	BONOBO_UI_VERB ("CalendarPrintPreview", file_print_preview_cb),
-
-	BONOBO_UI_VERB ("Cut", cut_cmd),
-	BONOBO_UI_VERB ("Copy", copy_cmd),
-	BONOBO_UI_VERB ("Paste", paste_cmd),
-	BONOBO_UI_VERB ("Delete", delete_cmd),
-	BONOBO_UI_VERB ("DeleteOccurrence", delete_occurrence_cmd),
-	BONOBO_UI_VERB ("DeleteAllOccurrences", delete_cmd),
-
-	BONOBO_UI_VERB ("CalendarPrev", previous_clicked),
-	BONOBO_UI_VERB ("CalendarToday", today_clicked),
-	BONOBO_UI_VERB ("CalendarNext", next_clicked),
-	BONOBO_UI_VERB ("CalendarGoto", goto_clicked),
-
-	BONOBO_UI_VERB ("ShowDayView", show_day_view_clicked),
-	BONOBO_UI_VERB ("ShowWorkWeekView", show_work_week_view_clicked),
-	BONOBO_UI_VERB ("ShowWeekView", show_week_view_clicked),
-	BONOBO_UI_VERB ("ShowMonthView", show_month_view_clicked),
-	BONOBO_UI_VERB ("ShowListView", show_list_view_clicked),
-
-	BONOBO_UI_VERB ("PublishFreeBusy", publish_freebusy_cmd),
-	BONOBO_UI_VERB ("CalendarPurge", purge_cmd),
-
-	BONOBO_UI_VERB_END
-};
-
-static EPixmap pixmaps [] =
-{
-	E_PIXMAP ("/Toolbar/DayView",	      "stock_calendar-view-day",       E_ICON_SIZE_LARGE_TOOLBAR),
-	E_PIXMAP ("/Toolbar/WorkWeekView",    "stock_calendar-view-work-week", E_ICON_SIZE_LARGE_TOOLBAR),
-	E_PIXMAP ("/Toolbar/WeekView",	      "stock_calendar-view-week",      E_ICON_SIZE_LARGE_TOOLBAR),
-	E_PIXMAP ("/Toolbar/MonthView",	      "stock_calendar-view-month",     E_ICON_SIZE_LARGE_TOOLBAR),
-	E_PIXMAP ("/Toolbar/ListView",	      "stock_calendar-view-list",      E_ICON_SIZE_LARGE_TOOLBAR),
-
-	E_PIXMAP_END
-};
-
-void
-calendar_control_activate (BonoboControl *control,
-			   GnomeCalendar *gcal)
-{
-	Bonobo_UIContainer remote_uih;
-	BonoboUIComponent *uic;
-	FocusData *focus;
-
-	uic = bonobo_control_get_ui_component (control);
-	g_assert (uic != NULL);
-
-	remote_uih = bonobo_control_get_remote_ui_container (control, NULL);
-	bonobo_ui_component_set_container (uic, remote_uih, NULL);
-	bonobo_object_release_unref (remote_uih, NULL);
-
-	gnome_calendar_set_ui_component (gcal, uic);
-
-	bonobo_ui_component_add_verb_list_with_data (uic, verbs, gcal);
-
-	bonobo_ui_component_freeze (uic, NULL);
-
-	bonobo_ui_util_set_ui (uic, PREFIX,
-			       EVOLUTION_UIDIR "/evolution-calendar.xml",
-			       "evolution-calendar",
-			       NULL);
-
-	e_pixmaps_update (uic, pixmaps);
-
-	gnome_calendar_setup_view_menus (gcal, uic);
-
-	g_signal_connect (gcal, "calendar_focus_change",
-			  G_CALLBACK (gcal_calendar_focus_change_cb), control);
-	g_signal_connect (gcal, "taskpad_focus_change",
-			  G_CALLBACK (gcal_taskpad_focus_change_cb), control);
-
-	e_menu_activate((EMenu *)gnome_calendar_get_calendar_menu (gcal), uic, 1);
-	e_menu_activate((EMenu *)gnome_calendar_get_taskpad_menu (gcal), uic, 1);
-
-	calendar_control_sensitize_calendar_commands (control, gcal, TRUE);
-	sensitize_taskpad_commands (gcal, control, TRUE);
-
-	bonobo_ui_component_thaw (uic, NULL);
-
-	focus = g_new (FocusData, 1);
-	focus->calendar_focused = FALSE;
-	focus->taskpad_focused = FALSE;
-
-	g_object_set_data (G_OBJECT (control), "focus_data", focus);
-}
-
-void
-calendar_control_deactivate (BonoboControl *control, GnomeCalendar *gcal)
-{
-	FocusData *focus;
-	BonoboUIComponent *uic;
-
-	uic = bonobo_control_get_ui_component (control);
-	g_assert (uic != NULL);
-
-	e_menu_activate((EMenu *)gnome_calendar_get_calendar_menu (gcal), uic, 0);
-	e_menu_activate((EMenu *)gnome_calendar_get_taskpad_menu (gcal), uic, 0);
-
-	gnome_calendar_set_ui_component (gcal, NULL);
-
-	focus = g_object_get_data (G_OBJECT (control), "focus_data");
-	g_assert (focus != NULL);
-
-	g_object_set_data (G_OBJECT (control), "focus_data", NULL);
-	g_free (focus);
-
-	gnome_calendar_discard_view_menus (gcal);
-
-	g_signal_handlers_disconnect_matched (gcal, G_SIGNAL_MATCH_DATA, 0, 0, NULL, NULL, control);
-
-	bonobo_ui_component_rm (uic, "/", NULL);
- 	bonobo_ui_component_unset_container (uic, NULL);
-}
diff --git a/calendar/gui/calendar-commands.h b/calendar/gui/calendar-commands.h
deleted file mode 100644
index 36b06f1ebb..0000000000
--- a/calendar/gui/calendar-commands.h
+++ /dev/null
@@ -1,40 +0,0 @@
-/* Evolution calendar - Commands for the calendar GUI control
- *
- * Copyright (C) 1998 The Free Software Foundation
- * Copyright (C) 2000 Ximian, Inc.
- * Copyright (C) 2000 Ximian, Inc.
- *
- * Authors: Miguel de Icaza <miguel@ximian.com>
- *          Federico Mena-Quintero <federico@ximian.com>
- *          Seth Alves <alves@hungry.com>
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of version 2 of the GNU General Public
- * License as published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307, USA.
- */
-
-#ifndef CALENDAR_COMMANDS_H
-#define CALENDAR_COMMANDS_H
-
-#include "gnome-cal.h"
-
-#include <bonobo/bonobo-control.h>
-#include <bonobo/bonobo-ui-component.h>
-
-void calendar_control_activate (BonoboControl *control, GnomeCalendar *gcal);
-void calendar_control_deactivate (BonoboControl *control, GnomeCalendar *gcal);
-
-void calendar_control_sensitize_calendar_commands (BonoboControl *control, GnomeCalendar *gcal, gboolean enable);
-
-void calendar_goto_today (GnomeCalendar *gcal);
-
-#endif /* CALENDAR_COMMANDS_H */
diff --git a/calendar/gui/calendar-component.c b/calendar/gui/calendar-component.c
deleted file mode 100644
index 63cb4859e5..0000000000
--- a/calendar/gui/calendar-component.c
+++ /dev/null
@@ -1,1681 +0,0 @@
-/* -*- Mode: C; indent-tabs-mode: t; c-basic-offset: 8; tab-width: 8 -*- */
-/* calendar-component.c
- *
- * Copyright (C) 2003  Novell, Inc.
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of version 2 of the GNU General Public
- * License as published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * General Public License for more details.
- *
- * You should have received a copy of the GNU General Public
- * License along with this program; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
- *
- * Authors: Ettore Perazzoli <ettore@ximian.com>
- *          Rodrigo Moya <rodrigo@ximian.com>
- */
-
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
-
-#include <string.h>
-#include <errno.h>
-#include <bonobo/bonobo-control.h>
-#include <bonobo/bonobo-i18n.h>
-#include <bonobo/bonobo-exception.h>
-#include <libical/icalvcal.h>
-#include <libedataserver/e-url.h>
-#include <libecal/e-cal-time-util.h>
-#include <libedataserverui/e-source-selector.h>
-#include <shell/e-user-creatable-items-handler.h>
-#include "e-pub-utils.h"
-#include "e-calendar-view.h"
-#include "calendar-config-keys.h"
-#include "calendar-config.h"
-#include "calendar-component.h"
-#include "calendar-commands.h"
-#include "control-factory.h"
-#include "gnome-cal.h"
-#include "migration.h"
-#include "e-comp-editor-registry.h"
-#include "comp-util.h"
-#include "common/authentication.h"
-#include "dialogs/calendar-setup.h"
-#include "dialogs/comp-editor.h"
-#include "dialogs/copy-source-dialog.h"
-#include "dialogs/event-editor.h"
-#include "widgets/misc/e-info-label.h"
-#include "widgets/misc/e-error.h"
-#include "e-util/e-icon-factory.h"
-#include "e-cal-menu.h"
-#include "e-cal-popup.h"
-
-/* IDs for user creatable items */
-#define CREATE_EVENT_ID        "event"
-#define CREATE_MEETING_ID      "meeting"
-#define CREATE_ALLDAY_EVENT_ID "allday-event"
-#define CREATE_CALENDAR_ID      "calendar"
-#define WEB_BASE_URI "webcal://"
-#define CONTACTS_BASE_URI "contacts://"
-#define WEATHER_BASE_URI "weather://"
-#define PERSONAL_RELATIVE_URI "system"
-
-enum DndTargetType {
-	DND_TARGET_TYPE_CALENDAR_LIST,
-};
-#define CALENDAR_TYPE "text/calendar"
-#define XCALENDAR_TYPE "text/x-calendar"
-static GtkTargetEntry drag_types[] = {
-	{ CALENDAR_TYPE, 0, DND_TARGET_TYPE_CALENDAR_LIST },
-	{ XCALENDAR_TYPE, 0, DND_TARGET_TYPE_CALENDAR_LIST }
-};
-static gint num_drag_types = sizeof(drag_types) / sizeof(drag_types[0]);
-
-#define PARENT_TYPE bonobo_object_get_type ()
-static BonoboObjectClass *parent_class = NULL;
-
-typedef struct 
-{
-	ESourceList *source_list;
-	ESourceList *task_source_list;
-	
-	GSList *source_selection;
-	GSList *task_source_selection;
-	
-	GnomeCalendar *calendar;
-
-	EInfoLabel *info_label;
-	GtkWidget *source_selector;
-
-	BonoboControl *view_control;
-	BonoboControl *sidebar_control;
-	BonoboControl *statusbar_control;
-
-	GList *notifications;
-
-	EUserCreatableItemsHandler *creatable_items_handler;
-
-	EActivityHandler *activity_handler;
-} CalendarComponentView;
-
-struct _CalendarComponentPrivate {
-	char *base_directory;
-	char *config_directory;
-
-	GConfClient *gconf_client;
-	int gconf_notify_id;
-
-	ESourceList *source_list;
-	ESourceList *task_source_list;
-
-	GList *views;
-
-	ECal *create_ecal;
-
-	GList *notifications;
-};
-
-/* FIXME This should be gnome cal likely */
-extern ECompEditorRegistry *comp_editor_registry;
-
-static void
-ensure_sources (CalendarComponent *component)
-{
-	GSList *groups;
-	ESourceList *source_list;
-	ESourceGroup *group;
-	ESourceGroup *on_this_computer;
-	ESourceGroup *on_the_web;
-	ESourceGroup *contacts;
-	ESourceGroup *weather;
-	ESource *personal_source;
-	ESource *birthdays_source;
-	char *base_uri, *base_uri_proto;
-
-	on_this_computer = NULL;
-	on_the_web = NULL;
-	contacts = NULL;
-	weather = NULL;
-	personal_source = NULL;
-	birthdays_source = NULL;
-
-	if (!e_cal_get_sources (&source_list, E_CAL_SOURCE_TYPE_EVENT, NULL)) {
-		g_warning ("Could not get calendar source list from GConf!");
-		return;
-	}
-
-	base_uri = g_build_filename (calendar_component_peek_base_directory (component),
-				     "/calendar/local/",
-				     NULL);
-
-	base_uri_proto = g_strconcat ("file://", base_uri, NULL);
-
-	groups = e_source_list_peek_groups (source_list);
-	if (groups) {
-		/* groups are already there, we need to search for things... */
-		GSList *g;
-
-		for (g = groups; g; g = g->next) {
-
-			group = E_SOURCE_GROUP (g->data);
-
-			/* compare only file:// part. If user home dir name changes we do not want to create 
-			   one more group  */
-
-			if (!on_this_computer && !strncmp (base_uri_proto, e_source_group_peek_base_uri (group), 7))
-				on_this_computer = group;
-			else if (!on_the_web && !strcmp (WEB_BASE_URI, e_source_group_peek_base_uri (group)))
-				on_the_web = group;
-			else if (!contacts && !strcmp (CONTACTS_BASE_URI, e_source_group_peek_base_uri (group)))
-				contacts = group;
-			else if (!weather && !strcmp (WEATHER_BASE_URI, e_source_group_peek_base_uri (group)))
-				weather = group;
-		}
-	}
-
-	if (on_this_computer) {
-		/* make sure "Personal" shows up as a source under
-		   this group */
-		GSList *sources = e_source_group_peek_sources (on_this_computer);
-		GSList *s;
-		for (s = sources; s; s = s->next) {
-			ESource *source = E_SOURCE (s->data);
-			if (!strcmp (PERSONAL_RELATIVE_URI, e_source_peek_relative_uri (source))) {
-				personal_source = source;
-				break;
-			}
-		}
-		/* Make sure we have the correct base uri. This can change when user's
-		   homedir name changes */
-		if (strcmp (base_uri_proto, e_source_group_peek_base_uri (on_this_computer))) {
-		    e_source_group_set_base_uri (on_this_computer, base_uri_proto);
-		  
-		    /* *sigh* . We shouldn't  need this sync call here as set_base_uri
-		       call results in synching to gconf, but that happens in idle loop
-		       and too late to prevent user seeing "Can not Open ... because of invalid uri" error.*/
-		    e_source_list_sync (source_list,NULL); 
-		}
-	}
-	else {
-		/* create the local source group */
-		group = e_source_group_new (_("On This Computer"), base_uri_proto);
-		e_source_list_add_group (source_list, group, -1);
-
-		on_this_computer = group;
-	}
-
-	if (!personal_source) {
-		/* Create the default Person addressbook */
-		personal_source = e_source_new (_("Personal"), PERSONAL_RELATIVE_URI);
-		e_source_group_add_source (on_this_computer, personal_source, -1);
-
-		if (!calendar_config_get_primary_calendar () && !calendar_config_get_calendars_selected ()) {
-			GSList selected;
-
-			calendar_config_set_primary_calendar (e_source_peek_uid (personal_source));
-
-			selected.data = (gpointer)e_source_peek_uid (personal_source);
-			selected.next = NULL;
-			calendar_config_set_calendars_selected (&selected);
-		}
-		
-		e_source_set_color (personal_source, 0xBECEDD);
-	}
-
-	if (!on_the_web) {
-		/* Create the On the web source group */
-		group = e_source_group_new (_("On The Web"), WEB_BASE_URI);
-		e_source_list_add_group (source_list, group, -1);
-
-		on_the_web = group;
-	}
-	if (contacts) {
-		GSList *sources = e_source_group_peek_sources (contacts);
-		if (sources) 
-			birthdays_source = E_SOURCE (sources->data); /* There is only one source under Contacts Group*/
-	}
-	else  {
-		/* Create the contacts group */
-		group = e_source_group_new (_("Contacts"), CONTACTS_BASE_URI);
-		e_source_list_add_group (source_list, group, -1);
-		contacts = group;
-	}
-	
-	if (!birthdays_source) {
-		birthdays_source = e_source_new (_("Birthdays & Anniversaries"), "/");
-		e_source_group_add_source (contacts, birthdays_source, -1);
-	}
-		
-	if (!weather) {
-		/* Create the weather group */
-		group = e_source_group_new (_("Weather"), WEATHER_BASE_URI);
-		e_source_list_add_group (source_list, group, -1);
-		weather = group;
-	}
-		
-	component->priv->source_list = source_list;
-
-	if (personal_source)
-		g_object_unref (personal_source);
-	if (birthdays_source)
-		g_object_unref (birthdays_source);
-			
-	g_free (base_uri_proto);
-	g_free (base_uri);
-}
-
-
-/* Utility functions.  */
-
-static gboolean
-is_in_selection (GSList *selection, ESource *source)
-{
-	GSList *l;
-	
-	for (l = selection; l; l = l->next) {
-		ESource *selected_source = l->data;
-		
-		if (!strcmp (e_source_peek_uid (selected_source), e_source_peek_uid (source)))
-			return TRUE;
-	}
-
-	return FALSE;
-}
-
-static gboolean
-is_in_uids (GSList *uids, ESource *source)
-{
-	GSList *l;
-	
-	for (l = uids; l; l = l->next) {
-		const char *uid = l->data;
-		
-		if (!strcmp (uid, e_source_peek_uid (source)))
-			return TRUE;
-	}
-
-	return FALSE;
-}
-
-static void
-update_uris_for_selection (CalendarComponentView *component_view)
-{
-	GSList *selection, *l, *uids_selected = NULL;
-	
-	selection = e_source_selector_get_selection (E_SOURCE_SELECTOR (component_view->source_selector));
-
-	for (l = component_view->source_selection; l; l = l->next) {
-		ESource *old_selected_source = l->data;
-
-		if (!is_in_selection (selection, old_selected_source))
-			gnome_calendar_remove_source (component_view->calendar, E_CAL_SOURCE_TYPE_EVENT, old_selected_source);
-	}
-
-	for (l = selection; l; l = l->next) {
-		ESource *selected_source = l->data;
-		
-		if (gnome_calendar_add_source (component_view->calendar, E_CAL_SOURCE_TYPE_EVENT, selected_source))
-			uids_selected = g_slist_append (uids_selected, (char *) e_source_peek_uid (selected_source));
-	}
-	
-	e_source_selector_free_selection (component_view->source_selection);
-	component_view->source_selection = selection;
-
-	/* Save the selection for next time we start up */
-	calendar_config_set_calendars_selected (uids_selected);
-	g_slist_free (uids_selected);
-}
-
-static void
-update_uri_for_primary_selection (CalendarComponentView *component_view)
-{
-	ESource *source;
-
-	source = e_source_selector_peek_primary_selection (E_SOURCE_SELECTOR (component_view->source_selector));
-	if (!source)
-		return;
-
-	/* Set the default */
-	gnome_calendar_set_default_source (component_view->calendar, E_CAL_SOURCE_TYPE_EVENT, source);
-
-	/* Make sure we are embedded first */
-	calendar_control_sensitize_calendar_commands (component_view->view_control, component_view->calendar, TRUE);
-
-	/* Save the selection for next time we start up */
-	calendar_config_set_primary_calendar (e_source_peek_uid (source));
-}
-
-static void
-update_selection (CalendarComponentView *component_view)
-{
-	GSList *selection, *uids_selected, *l;
-
-	/* Get the selection in gconf */
-	uids_selected = calendar_config_get_calendars_selected ();
-
-	/* Remove any that aren't there any more */
-	selection = e_source_selector_get_selection (E_SOURCE_SELECTOR (component_view->source_selector));
-
-	for (l = selection; l; l = l->next) {
-		ESource *source = l->data;
-
-		if (!is_in_uids (uids_selected, source)) 
-			e_source_selector_unselect_source (E_SOURCE_SELECTOR (component_view->source_selector), source);
-	}
-	
-	e_source_selector_free_selection (selection);
-
-	/* Make sure the whole selection is there */
-	for (l = uids_selected; l; l = l->next) {
-		char *uid = l->data;
-		ESource *source;
-
-		source = e_source_list_peek_source_by_uid (component_view->source_list, uid);
-		if (source) 
-			e_source_selector_select_source (E_SOURCE_SELECTOR (component_view->source_selector), source);
-		
-		g_free (uid);
-	}
-	g_slist_free (uids_selected);
-}
-
-static void
-update_task_selection (CalendarComponentView *component_view)
-{
-	GSList *uids_selected, *l;
-
-	/* Get the selection in gconf */
-	uids_selected = calendar_config_get_tasks_selected ();
-
-	/* Remove any that aren't there any more */
-	for (l = component_view->task_source_selection; l; l = l->next) {
-		char *uid = l->data;
-		ESource *source;
-
-		source = e_source_list_peek_source_by_uid (component_view->task_source_list, uid);
-		if (!source)
-			gnome_calendar_remove_source_by_uid (component_view->calendar, E_CAL_SOURCE_TYPE_TODO, uid);
-		else if (!is_in_uids (uids_selected, source))
-			gnome_calendar_remove_source (component_view->calendar, E_CAL_SOURCE_TYPE_TODO, source);
-		
-		g_free (uid);
-	}
-	g_slist_free (component_view->task_source_selection);
-
-	/* Make sure the whole selection is there */
-	for (l = uids_selected; l; l = l->next) {
-		char *uid = l->data;
-		ESource *source;
-
-		source = e_source_list_peek_source_by_uid (component_view->task_source_list, uid);
-		if (!gnome_calendar_add_source (component_view->calendar, E_CAL_SOURCE_TYPE_TODO, source))
-			/* FIXME do something */;
-	}
-
-	component_view->task_source_selection = uids_selected;
-}
-
-static void
-update_primary_selection (CalendarComponentView *component_view)
-{
-	ESource *source = NULL;
-	char *uid;
-
-	uid = calendar_config_get_primary_calendar ();
-	if (uid) {
-		source = e_source_list_peek_source_by_uid (component_view->source_list, uid);
-		g_free (uid);
-	}
-	
-	if (source) {
-		e_source_selector_set_primary_selection (E_SOURCE_SELECTOR (component_view->source_selector), source);
-	} else {
-		/* Try to create a default if there isn't one */
-		source = e_source_list_peek_source_any (component_view->source_list);
-		if (source)
-			e_source_selector_set_primary_selection (E_SOURCE_SELECTOR (component_view->source_selector), source);
-	}
-}
-
-static void
-update_primary_task_selection (CalendarComponentView *component_view)
-{
-	ESource *source = NULL;
-	char *uid;
-
-	uid = calendar_config_get_primary_tasks ();
-	if (uid) {
-		source = e_source_list_peek_source_by_uid (component_view->task_source_list, uid);
-
-		g_free (uid);
-	}
-	
-	if (source)
-		gnome_calendar_set_default_source (component_view->calendar, E_CAL_SOURCE_TYPE_TODO, source);
-}
-
-/* Callbacks.  */
-static void
-copy_calendar_cb (EPopup *ep, EPopupItem *pitem, void *data)
-{
-	CalendarComponentView *component_view = data;
-	ESource *selected_source;
-	
-	selected_source = e_source_selector_peek_primary_selection (E_SOURCE_SELECTOR (component_view->source_selector));
-	if (!selected_source)
-		return;
-
-	copy_source_dialog (GTK_WINDOW (gtk_widget_get_toplevel (ep->target->widget)), selected_source, E_CAL_SOURCE_TYPE_EVENT);
-}
-
-static void
-delete_calendar_cb (EPopup *ep, EPopupItem *pitem, void *data)
-{
-	CalendarComponentView *component_view = data;
-	ESource *selected_source;
-	ECal *cal;
-	char *uri;
-
-	selected_source = e_source_selector_peek_primary_selection (E_SOURCE_SELECTOR (component_view->source_selector));
-	if (!selected_source)
-		return;
-
-	if (e_error_run((GtkWindow *)gtk_widget_get_toplevel(ep->target->widget),
-			"calendar:prompt-delete-calendar", e_source_peek_name(selected_source)) != GTK_RESPONSE_YES)
-		return;
-
-	/* first, ask the backend to remove the calendar */
-	uri = e_source_get_uri (selected_source);
-	cal = e_cal_model_get_client_for_uri (gnome_calendar_get_calendar_model (component_view->calendar), uri);
-	if (!cal)
-		cal = e_cal_new_from_uri (uri, E_CAL_SOURCE_TYPE_EVENT);
-	g_free (uri);
-	if (cal) {
-		if (e_cal_remove (cal, NULL)) {
-			if (e_source_selector_source_is_selected (E_SOURCE_SELECTOR (component_view->source_selector),
-								  selected_source)) {
-				gnome_calendar_remove_source (component_view->calendar, E_CAL_SOURCE_TYPE_EVENT, selected_source);
-				e_source_selector_unselect_source (E_SOURCE_SELECTOR (component_view->source_selector),
-								   selected_source);
-			}
-			
-			e_source_group_remove_source (e_source_peek_group (selected_source), selected_source);
-			e_source_list_sync (component_view->source_list, NULL);
-		}
-	}
-}
-
-static void
-new_calendar_cb (EPopup *ep, EPopupItem *pitem, void *data)
-{
-	calendar_setup_edit_calendar (GTK_WINDOW (gtk_widget_get_toplevel(ep->target->widget)), NULL, pitem->user_data);
-}
-
-static void
-edit_calendar_cb (EPopup *ep, EPopupItem *pitem, void *data)
-{
-	CalendarComponentView *component_view = data;
-	ESource *selected_source;
-
-	selected_source = e_source_selector_peek_primary_selection (E_SOURCE_SELECTOR (component_view->source_selector));
-	if (!selected_source)
-		return;
-
-	calendar_setup_edit_calendar (GTK_WINDOW (gtk_widget_get_toplevel(ep->target->widget)), selected_source, NULL);
-}
-
-static EPopupItem ecc_source_popups[] = {
-	{ E_POPUP_ITEM, "10.new", N_("New Calendar"), new_calendar_cb, NULL, "stock_calendar", 0, 0 },
-	{ E_POPUP_ITEM, "15.copy", N_("Copy"), copy_calendar_cb, NULL, "stock_folder-copy", 0, E_CAL_POPUP_SOURCE_PRIMARY },
-	{ E_POPUP_ITEM, "20.delete", N_("Delete"), delete_calendar_cb, NULL, "stock_delete", 0, E_CAL_POPUP_SOURCE_USER|E_CAL_POPUP_SOURCE_PRIMARY },
-	{ E_POPUP_ITEM, "30.properties", N_("Properties..."), edit_calendar_cb, NULL, "stock_folder-properties", 0, E_CAL_POPUP_SOURCE_PRIMARY },
-};
-
-static void
-ecc_source_popup_free(EPopup *ep, GSList *list, void *data)
-{
-	g_slist_free(list);
-}
-
-static gboolean
-popup_event_cb(ESourceSelector *selector, ESource *insource, GdkEventButton *event, CalendarComponentView *component_view)
-{
-	ECalPopup *ep;
-	ECalPopupTargetSource *t;
-	GSList *menus = NULL;
-	int i;
-	GtkMenu *menu;
-
-	/** @HookPoint-ECalPopup: Calendar Source Selector Context Menu
-	 * @Id: org.gnome.evolution.calendar.source.popup
-	 * @Class: org.gnome.evolution.calendar.popup:1.0
-	 * @Target: ECalPopupTargetSource
-	 *
-	 * The context menu on the source selector in the calendar window.
-	 */
-	ep = e_cal_popup_new("org.gnome.evolution.calendar.source.popup");
-	t = e_cal_popup_target_new_source(ep, selector);
-	t->target.widget = (GtkWidget *)component_view->calendar;
-
-	for (i=0;i<sizeof(ecc_source_popups)/sizeof(ecc_source_popups[0]);i++)
-		menus = g_slist_prepend(menus, &ecc_source_popups[i]);
-
-	e_popup_add_items((EPopup *)ep, menus, NULL, ecc_source_popup_free, component_view);
-
-	menu = e_popup_create_menu_once((EPopup *)ep, (EPopupTarget *)t, 0);
-	gtk_menu_popup(menu, NULL, NULL, NULL, NULL, event?event->button:0, event?event->time:gtk_get_current_event_time());
-
-	return TRUE;
-}
-
-static void
-source_selection_changed_cb (ESourceSelector *selector, CalendarComponentView *component_view)
-{
-	update_uris_for_selection (component_view);
-}
-
-static void
-primary_source_selection_changed_cb (ESourceSelector *selector, CalendarComponentView *component_view)
-{
-	update_uri_for_primary_selection (component_view);
-}
-
-static void
-source_added_cb (GnomeCalendar *calendar, ECalSourceType source_type, ESource *source, CalendarComponentView *component_view)
-{
-	switch (source_type) {
-	case E_CAL_SOURCE_TYPE_EVENT:
-		e_source_selector_select_source (E_SOURCE_SELECTOR (component_view->source_selector), source);
-		break;
-	default:
-		break;
-	}
-}
-
-static void
-source_removed_cb (GnomeCalendar *calendar, ECalSourceType source_type, ESource *source, CalendarComponentView *component_view)
-{
-	switch (source_type) {
-	case E_CAL_SOURCE_TYPE_EVENT:
-		e_source_selector_unselect_source (E_SOURCE_SELECTOR (component_view->source_selector), source);
-		break;
-	default:
-		break;
-	}
-}
-
-static void
-set_info (CalendarComponentView *component_view)
-{
-	icaltimezone *zone;
-	struct icaltimetype start_tt, end_tt;
-	time_t start_time, end_time;
-	struct tm start_tm, end_tm;
-	char buffer[512], end_buffer[256];
-	GnomeCalendarViewType view;
-
-	gnome_calendar_get_visible_time_range (component_view->calendar, &start_time, &end_time);
-	zone = gnome_calendar_get_timezone (component_view->calendar);
-
-	start_tt = icaltime_from_timet_with_zone (start_time, FALSE, zone);
-	start_tm.tm_year = start_tt.year - 1900;
-	start_tm.tm_mon = start_tt.month - 1;
-	start_tm.tm_mday = start_tt.day;
-	start_tm.tm_hour = start_tt.hour;
-	start_tm.tm_min = start_tt.minute;
-	start_tm.tm_sec = start_tt.second;
-	start_tm.tm_isdst = -1;
-	start_tm.tm_wday = time_day_of_week (start_tt.day, start_tt.month - 1,
-					     start_tt.year);
-
-	/* Take one off end_time so we don't get an extra day. */
-	end_tt = icaltime_from_timet_with_zone (end_time - 1, FALSE, zone);
-	end_tm.tm_year = end_tt.year - 1900;
-	end_tm.tm_mon = end_tt.month - 1;
-	end_tm.tm_mday = end_tt.day;
-	end_tm.tm_hour = end_tt.hour;
-	end_tm.tm_min = end_tt.minute;
-	end_tm.tm_sec = end_tt.second;
-	end_tm.tm_isdst = -1;
-	end_tm.tm_wday = time_day_of_week (end_tt.day, end_tt.month - 1,
-					   end_tt.year);
-
-	view = gnome_calendar_get_view (component_view->calendar);
-
-	switch (view) {
-	case GNOME_CAL_DAY_VIEW:
-	case GNOME_CAL_WORK_WEEK_VIEW:
-	case GNOME_CAL_WEEK_VIEW:
-		if (start_tm.tm_year == end_tm.tm_year
-		    && start_tm.tm_mon == end_tm.tm_mon
-		    && start_tm.tm_mday == end_tm.tm_mday) {
-			e_utf8_strftime (buffer, sizeof (buffer),
-				  _("%A %d %b %Y"), &start_tm);
-		} else if (start_tm.tm_year == end_tm.tm_year) {
-			e_utf8_strftime (buffer, sizeof (buffer),
-				  _("%a %d %b"), &start_tm);
-			e_utf8_strftime (end_buffer, sizeof (end_buffer),
-				  _("%a %d %b %Y"), &end_tm);
-			strcat (buffer, " - ");
-			strcat (buffer, end_buffer);
-		} else {
-			e_utf8_strftime (buffer, sizeof (buffer),
-				  _("%a %d %b %Y"), &start_tm);
-			e_utf8_strftime (end_buffer, sizeof (end_buffer),
-				  _("%a %d %b %Y"), &end_tm);
-			strcat (buffer, " - ");
-			strcat (buffer, end_buffer);
-		}
-		break;
-	case GNOME_CAL_MONTH_VIEW:
-	case GNOME_CAL_LIST_VIEW:
-		if (start_tm.tm_year == end_tm.tm_year) {
-			if (start_tm.tm_mon == end_tm.tm_mon) {
-				e_utf8_strftime (buffer, sizeof (buffer),
-					  "%d", &start_tm);
-				e_utf8_strftime (end_buffer, sizeof (end_buffer),
-					  _("%d %b %Y"), &end_tm);
-				strcat (buffer, " - ");
-				strcat (buffer, end_buffer);
-			} else {
-				e_utf8_strftime (buffer, sizeof (buffer),
-					  _("%d %b"), &start_tm);
-				e_utf8_strftime (end_buffer, sizeof (end_buffer),
-					  _("%d %b %Y"), &end_tm);
-				strcat (buffer, " - ");
-				strcat (buffer, end_buffer);
-			}
-		} else {
-			e_utf8_strftime (buffer, sizeof (buffer),
-				  _("%d %b %Y"), &start_tm);
-			e_utf8_strftime (end_buffer, sizeof (end_buffer),
-				  _("%d %b %Y"), &end_tm);
-			strcat (buffer, " - ");
-			strcat (buffer, end_buffer);
-		}
-		break;
-	default:
-		g_assert_not_reached ();
-	}
-
-	e_info_label_set_info (component_view->info_label, _("Calendar"), buffer);
-}
-
-static void
-calendar_dates_changed_cb (GnomeCalendar *calendar, CalendarComponentView *component_view)
-{
-	set_info (component_view);
-}
-
-static void
-config_primary_selection_changed_cb (GConfClient *client, guint id, GConfEntry *entry, gpointer data)
-{
-	CalendarComponent *calendar_component = data;
-	CalendarComponentPrivate *priv = calendar_component->priv;
-	
-	if (priv->create_ecal) {
-		g_object_unref (priv->create_ecal);
-		priv->create_ecal = NULL;
-	}
-}
-
-static void
-config_tasks_selection_changed_cb (GConfClient *client, guint id, GConfEntry *entry, gpointer data)
-{
-	update_task_selection (data);
-}
-
-
-static void
-config_primary_tasks_selection_changed_cb (GConfClient *client, guint id, GConfEntry *entry, gpointer data)
-{
-	update_primary_task_selection (data);
-}
-
-static gboolean
-init_calendar_publishing_cb (gpointer data)
-{	
-	/* Publish if it is time to publish again */
-	e_pub_publish (FALSE);
-
-	return FALSE;
-}
-
-static void
-conf_changed_callback (GConfClient *client,
-		       unsigned int connection_id,
-		       GConfEntry *entry,
-		       void *user_data)
-{
-	/* publish config changed, so publish */
-	e_pub_publish (TRUE);
-}
-
-/* Evolution::Component CORBA methods.  */
-static void
-impl_handleURI (PortableServer_Servant servant, const char *uri, CORBA_Environment *ev)
-{
-	CalendarComponent *calendar_component = CALENDAR_COMPONENT (bonobo_object_from_servant (servant));
-	CalendarComponentPrivate *priv;
-
-	priv = calendar_component->priv;
-
-	if (!strncmp (uri, "calendar:", 9)) {
-		EUri *euri = e_uri_new (uri);
-		const char *p;
-		char *header, *content;
-		size_t len, clen;
-		time_t start = -1, end = -1;
-
-		p = euri->query;
-		if (p) {
-			while (*p) {
-				len = strcspn (p, "=&");
-			
-				/* If it's malformed, give up. */
-				if (p[len] != '=')
-					break;
-			
-				header = (char *) p;
-				header[len] = '\0';
-				p += len + 1;
-			
-				clen = strcspn (p, "&");
-			
-				content = g_strndup (p, clen);
-
-				if (!g_ascii_strcasecmp (header, "startdate")) {
-					start = time_from_isodate (content);
-				} else if (!g_ascii_strcasecmp (header, "enddate")) {
-					end = time_from_isodate (content);
-				}
-			
-				g_free (content);
-
-				p += clen;
-				if (*p == '&') {
-					p++;
-					if (!strcmp (p, "amp;"))
-						p += 4;
-				}
-			}
-
-			if (start != -1) {
-				GList *l;
-			
-				if (end == -1)
-					end = start;
-			
-				l = g_list_last (priv->views);
-				if (l) {
-					CalendarComponentView *view = l->data;
-				
-					gnome_calendar_set_selected_time_range (view->calendar, start, end);
-				}
-			}
-		}
-
-		e_uri_free (euri);
-	}
-}
-
-static void
-impl_upgradeFromVersion (PortableServer_Servant servant,
-			 CORBA_short major,
-			 CORBA_short minor,
-			 CORBA_short revision,
-			 CORBA_Environment *ev)
-{
-	GError *err = NULL;
-	CalendarComponent *calendar_component = CALENDAR_COMPONENT (bonobo_object_from_servant (servant));
-
-	if (!migrate_calendars (calendar_component, major, minor, revision, &err)) {
-		GNOME_Evolution_Component_UpgradeFailed *failedex;
-
-		failedex = GNOME_Evolution_Component_UpgradeFailed__alloc();
-		failedex->what = CORBA_string_dup(_("Failed upgrading calendars."));
-		failedex->why = CORBA_string_dup(err->message);
-		CORBA_exception_set(ev, CORBA_USER_EXCEPTION, ex_GNOME_Evolution_Component_UpgradeFailed, failedex);
-	}
-
-	if (err)
-		g_error_free(err);
-}
-
-static gboolean
-selector_tree_drag_drop (GtkWidget *widget, 
-			 GdkDragContext *context, 
-			 int x, 
-			 int y, 
-			 guint time, 
-			 CalendarComponent *component)
-{
-	GtkTreeViewColumn *column;
-	int cell_x;
-	int cell_y;
-	GtkTreePath *path;
-	GtkTreeModel *model;
-	GtkTreeIter iter;
-	gpointer data;
-	
-	if (!gtk_tree_view_get_path_at_pos  (GTK_TREE_VIEW (widget), x, y, &path, 
-					     &column, &cell_x, &cell_y))
-		return FALSE;
-	
-	
-	model = gtk_tree_view_get_model (GTK_TREE_VIEW (widget));
-
-	if (!gtk_tree_model_get_iter (model, &iter, path)) {
-		gtk_tree_path_free (path);
-		return FALSE;
-	}
-
-	gtk_tree_model_get (model, &iter, 0, &data, -1);
-	
-	if (E_IS_SOURCE_GROUP (data)) {
-		g_object_unref (data);
-		gtk_tree_path_free (path);
-		return FALSE;
-	}
-	
-	gtk_tree_path_free (path);
-	return TRUE;
-}
-	
-static gboolean
-selector_tree_drag_motion (GtkWidget *widget,
-			   GdkDragContext *context,
-			   int x,
-			   int y,
-			   guint time,
-			   gpointer user_data)
-{
-	GtkTreePath *path = NULL;
-	gpointer data = NULL;
-	GtkTreeViewDropPosition pos;
-	GtkTreeModel *model;
-	GtkTreeIter iter;
-	GdkDragAction action = GDK_ACTION_DEFAULT;
-	
-	if (!gtk_tree_view_get_dest_row_at_pos (GTK_TREE_VIEW (widget),
-						x, y, &path, &pos))
-		goto finish;
-	
-	model = gtk_tree_view_get_model (GTK_TREE_VIEW (widget));
-	
-	if (!gtk_tree_model_get_iter (model, &iter, path))
-		goto finish;
-	
-	gtk_tree_model_get (model, &iter, 0, &data, -1);
-
-	if (E_IS_SOURCE_GROUP (data) || e_source_get_readonly (data))
-		goto finish;
-	
-	gtk_tree_view_set_drag_dest_row(GTK_TREE_VIEW (widget), path, GTK_TREE_VIEW_DROP_INTO_OR_BEFORE);
-	action = context->suggested_action;
-
- finish:
-	if (path)
-		gtk_tree_path_free (path);
-	if (data)
-		g_object_unref (data);
-
-	gdk_drag_status (context, action, time);
-	return TRUE;
-}
-
-static gboolean
-update_single_object (ECal *client, icalcomponent *icalcomp)
-{
-	char *uid;
-	icalcomponent *tmp_icalcomp;
-
-	uid = (char *) icalcomponent_get_uid (icalcomp);
-	
-	if (e_cal_get_object (client, uid, NULL, &tmp_icalcomp, NULL))
-		return e_cal_modify_object (client, icalcomp, CALOBJ_MOD_ALL, NULL);
-
-	return e_cal_create_object (client, icalcomp, &uid, NULL);	
-}
-
-static gboolean
-update_objects (ECal *client, icalcomponent *icalcomp)
-{
-	icalcomponent *subcomp;
-	icalcomponent_kind kind;
-
-	kind = icalcomponent_isa (icalcomp);
-	if (kind == ICAL_VTODO_COMPONENT || kind == ICAL_VEVENT_COMPONENT)
-		return update_single_object (client, icalcomp);
-	else if (kind != ICAL_VCALENDAR_COMPONENT)
-		return FALSE;
-
-	subcomp = icalcomponent_get_first_component (icalcomp, ICAL_ANY_COMPONENT);
-	while (subcomp) {
-		gboolean success;
-		
-		kind = icalcomponent_isa (subcomp);
-		if (kind == ICAL_VTIMEZONE_COMPONENT) {
-			icaltimezone *zone;
-
-			zone = icaltimezone_new ();
-			icaltimezone_set_component (zone, subcomp);
-
-			success = e_cal_add_timezone (client, zone, NULL);
-			icaltimezone_free (zone, 1);
-			if (!success)
-				return success;
-		} else if (kind == ICAL_VTODO_COMPONENT ||
-			   kind == ICAL_VEVENT_COMPONENT) {
-			success = update_single_object (client, subcomp);
-			if (!success)
-				return success;
-		}
-
-		subcomp = icalcomponent_get_next_component (icalcomp, ICAL_ANY_COMPONENT);
-	}
-
-	return TRUE;
-}
-
-static void
-selector_tree_drag_data_received (GtkWidget *widget, 
-				  GdkDragContext *context, 
-				  gint x, 
-				  gint y, 
-				  GtkSelectionData *data,
-				  guint info,
-				  guint time,
-				  gpointer user_data)
-{
-	GtkTreePath *path = NULL;
-	GtkTreeViewDropPosition pos;
-	gpointer source = NULL;
-	GtkTreeModel *model;
-	GtkTreeIter iter;
-	gboolean success = FALSE;
-	icalcomponent *icalcomp = NULL;
-	ECal *client = NULL;
-
-	if (!gtk_tree_view_get_dest_row_at_pos (GTK_TREE_VIEW (widget),
-						x, y, &path, &pos))
-		goto finish;
-	
-	model = gtk_tree_view_get_model (GTK_TREE_VIEW (widget));
-	
-	if (!gtk_tree_model_get_iter (model, &iter, path))
-		goto finish;
-       
-	
-	gtk_tree_model_get (model, &iter, 0, &source, -1);
-
-	if (E_IS_SOURCE_GROUP (source) || e_source_get_readonly (source))
-		goto finish;
-
-	icalcomp = icalparser_parse_string (data->data);
-	
-	if (icalcomp) {
-		char * uid;
-
-		/* FIXME deal with GDK_ACTION_ASK */
-		if (context->action == GDK_ACTION_COPY) {
-			uid = e_cal_component_gen_uid ();
-			icalcomponent_set_uid (icalcomp, uid);
-		}
-
-		client = auth_new_cal_from_source (source, 
-						   E_CAL_SOURCE_TYPE_EVENT);
-		
-		if (client) {
-			if (e_cal_open (client, TRUE, NULL)) {
-				success = TRUE;
-				update_objects (client, icalcomp);
-			}
-			
-			g_object_unref (client);
-		}
-		
-		icalcomponent_free (icalcomp);
-	}
-
- finish:
-	if (source)
-		g_object_unref (source);
-	if (path)
-		gtk_tree_path_free (path);
-
-	gtk_drag_finish (context, success, context->action == GDK_ACTION_MOVE, time);
-}	
-
-static void
-selector_tree_drag_leave (GtkWidget *widget, GdkDragContext *context, guint time, gpointer data)
-{
-	gtk_tree_view_set_drag_dest_row(GTK_TREE_VIEW (widget), 
-					NULL, GTK_TREE_VIEW_DROP_BEFORE);
-}
-
-static void
-control_activate_cb (BonoboControl *control, gboolean activate, gpointer data)
-{
-	CalendarComponentView *component_view = data;
-
-	if (activate) {
-		BonoboUIComponent *uic;
-		uic = bonobo_control_get_ui_component (component_view->view_control);
-		
-		e_user_creatable_items_handler_activate (component_view->creatable_items_handler, uic);
-	}	
-}
-
-
-static void
-config_create_ecal_changed_cb (GConfClient *client, guint id, GConfEntry *entry, gpointer data)
-{	
-	CalendarComponent *calendar_component = data;
-	CalendarComponentPrivate *priv;
-	
-	priv = calendar_component->priv;
-
-	g_object_unref (priv->create_ecal);
-	priv->create_ecal = NULL;
-	
-	priv->notifications = g_list_remove (priv->notifications, GUINT_TO_POINTER (id));
-}
-
-static ECal *
-setup_create_ecal (CalendarComponent *calendar_component, CalendarComponentView *component_view) 
-{
-	CalendarComponentPrivate *priv;
-	ESource *source = NULL;
-	char *uid;
-	guint not;
-	
-	priv = calendar_component->priv;
-
-	/* Try to use the client from the calendar first to avoid re-opening things */
-	if (component_view) {
-		ECal *default_ecal;
-		
-		default_ecal = gnome_calendar_get_default_client (component_view->calendar);
-		if (default_ecal)
-			return default_ecal;
-	}
-	
-	/* If there is an existing fall back, use that */
-	if (priv->create_ecal)
-		return priv->create_ecal; 
-
-	/* Get the current primary calendar, or try to set one if it doesn't already exist */		
-	uid = calendar_config_get_primary_calendar ();
-	if (uid) {
-		source = e_source_list_peek_source_by_uid (priv->source_list, uid);
-		g_free (uid);
-
-		priv->create_ecal = auth_new_cal_from_source (source, E_CAL_SOURCE_TYPE_EVENT);
-	} 
-
-	if (!priv->create_ecal) {
-		/* Try to create a default if there isn't one */
-		source = e_source_list_peek_source_any (priv->source_list);
-		if (source)
-			priv->create_ecal = auth_new_cal_from_source (source, E_CAL_SOURCE_TYPE_EVENT);
-	}
-		
-	if (priv->create_ecal) {
-		icaltimezone *zone;
-
-		if (!e_cal_open (priv->create_ecal, FALSE, NULL)) {
-			GtkWidget *dialog;
-			
-			dialog = gtk_message_dialog_new (NULL, GTK_DIALOG_MODAL,
-							 GTK_MESSAGE_WARNING, GTK_BUTTONS_OK,
-							 _("Unable to open the calendar '%s' for creating events and meetings"), 
-							   e_source_peek_name (source));
-			gtk_dialog_run (GTK_DIALOG (dialog));
-			gtk_widget_destroy (dialog);
-
-			return NULL;
-		}
-
-		zone = calendar_config_get_icaltimezone ();
-		e_cal_set_default_timezone (priv->create_ecal, zone, NULL);
-
-	} else {
-		GtkWidget *dialog;
-			
-		dialog = gtk_message_dialog_new (NULL, GTK_DIALOG_MODAL,
-						 GTK_MESSAGE_WARNING, GTK_BUTTONS_OK,
-						 _("There is no calendar available for creating events and meetings"));
-		gtk_dialog_run (GTK_DIALOG (dialog));
-		gtk_widget_destroy (dialog);
-
-		return NULL;
-	}		
-
-	/* Handle the fact it may change on us */
-	not = calendar_config_add_notification_primary_calendar (config_create_ecal_changed_cb, 
-								 calendar_component);
-	priv->notifications = g_list_prepend (priv->notifications, GUINT_TO_POINTER (not));
-
-	/* Save the primary source for use elsewhere */
-	calendar_config_set_primary_calendar (e_source_peek_uid (source));
-
-	return priv->create_ecal;
-}
-
-static gboolean
-create_new_event (CalendarComponent *calendar_component, CalendarComponentView *component_view, gboolean is_allday, gboolean is_meeting)
-{
-	ECal *ecal;
-	ECalendarView *view;
-
-	ecal = setup_create_ecal (calendar_component, component_view);
-	if (!ecal)
-		return FALSE;
-
-	if (component_view && (view = E_CALENDAR_VIEW (gnome_calendar_get_current_view_widget (component_view->calendar)))) {
-		GnomeCalendarViewType view_type;
-
-		/* Force all for these view types because thats what's selected and it mimics a double click */
-		view_type = gnome_calendar_get_view (component_view->calendar);
-		if (view_type == GNOME_CAL_WEEK_VIEW 
-		    || view_type == GNOME_CAL_MONTH_VIEW
-		    || view_type == GNOME_CAL_LIST_VIEW)
-			is_allday = TRUE;
-
-		e_calendar_view_new_appointment_full (view, is_allday, is_meeting);
-	} else {
-		ECalComponent *comp;
-		EventEditor *editor;
-
-		editor = event_editor_new (ecal, is_meeting);
-		comp = cal_comp_event_new_with_current_time (ecal, is_allday);
-		e_cal_component_commit_sequence (comp);
-
-		comp_editor_edit_comp (COMP_EDITOR (editor), comp);
-		if (is_meeting)
-			event_editor_show_meeting (editor);
-		comp_editor_focus (COMP_EDITOR (editor));
-
-		e_comp_editor_registry_add (comp_editor_registry, COMP_EDITOR (editor), TRUE);
-	}
-
-	return TRUE;	
-}
-
-static void
-create_local_item_cb (EUserCreatableItemsHandler *handler, const char *item_type_name, void *data)
-{
-	CalendarComponent *calendar_component = data;
-	CalendarComponentPrivate *priv;
-	CalendarComponentView *component_view = NULL;
-	GList *l;
-	
-	priv = calendar_component->priv;
-	
-	for (l = priv->views; l; l = l->next) {
-		component_view = l->data;
-
-		if (component_view->creatable_items_handler == handler)
-			break;
-		
-		component_view = NULL;
-	}
-	
-	if (strcmp (item_type_name, CREATE_EVENT_ID) == 0)
-		create_new_event (calendar_component, component_view, FALSE, FALSE);
- 	else if (strcmp (item_type_name, CREATE_ALLDAY_EVENT_ID) == 0)
-		create_new_event (calendar_component, component_view, TRUE, FALSE);
-	else if (strcmp (item_type_name, CREATE_MEETING_ID) == 0)
-		create_new_event (calendar_component, component_view, FALSE, TRUE);
-	else if (strcmp (item_type_name, CREATE_CALENDAR_ID) == 0)
-		calendar_setup_new_calendar (GTK_WINDOW (gtk_widget_get_toplevel (GTK_WIDGET (component_view->calendar))));
-}
-
-static CalendarComponentView *
-create_component_view (CalendarComponent *calendar_component)
-{
-	CalendarComponentPrivate *priv;
-	CalendarComponentView *component_view;
-	GtkWidget *selector_scrolled_window, *vbox;
-	GtkWidget *statusbar_widget;
-	guint not;
-	AtkObject *a11y;
-	
-	priv = calendar_component->priv;
-
-	/* Create the calendar component view */
-	component_view = g_new0 (CalendarComponentView, 1);
-	
-	/* Add the source lists */
-	component_view->source_list = g_object_ref (priv->source_list);
-	component_view->task_source_list = g_object_ref (priv->task_source_list);
-	
-	/* Create sidebar selector */
-	component_view->source_selector = e_source_selector_new (calendar_component->priv->source_list);
-	e_source_selector_set_select_new ((ESourceSelector *)component_view->source_selector, TRUE);
-	a11y = gtk_widget_get_accessible (GTK_WIDGET (component_view->source_selector));
-	atk_object_set_name (a11y, _("Calendar Source Selector"));
-
-	g_signal_connect (component_view->source_selector, "drag-motion", G_CALLBACK (selector_tree_drag_motion), 
-			  calendar_component);
-	g_signal_connect (component_view->source_selector, "drag-leave", G_CALLBACK (selector_tree_drag_leave), 
-			  calendar_component);
-	g_signal_connect (component_view->source_selector, "drag-drop", G_CALLBACK (selector_tree_drag_drop), 
-			  calendar_component);
-	g_signal_connect (component_view->source_selector, "drag-data-received", 
-			  G_CALLBACK (selector_tree_drag_data_received), calendar_component);
-
-	gtk_drag_dest_set(component_view->source_selector, GTK_DEST_DEFAULT_ALL, drag_types,
-			  num_drag_types, GDK_ACTION_COPY | GDK_ACTION_MOVE);
-
-	gtk_widget_show (component_view->source_selector);
-
-	selector_scrolled_window = gtk_scrolled_window_new (NULL, NULL);
-	gtk_container_add (GTK_CONTAINER (selector_scrolled_window), component_view->source_selector);
-	gtk_scrolled_window_set_policy (GTK_SCROLLED_WINDOW (selector_scrolled_window),
-					GTK_POLICY_AUTOMATIC, GTK_POLICY_AUTOMATIC);
-	gtk_scrolled_window_set_shadow_type (GTK_SCROLLED_WINDOW (selector_scrolled_window),
-					     GTK_SHADOW_IN);
-	gtk_widget_show (selector_scrolled_window);
-
-	component_view->info_label = (EInfoLabel *)e_info_label_new("stock_calendar");
-	e_info_label_set_info (component_view->info_label, _("Calendars"), "");
-	gtk_widget_show (GTK_WIDGET (component_view->info_label));
-
-	vbox = gtk_vbox_new(FALSE, 0);
-	gtk_box_pack_start(GTK_BOX (vbox), GTK_WIDGET (component_view->info_label), FALSE, TRUE, 0);
-	gtk_box_pack_start(GTK_BOX (vbox), selector_scrolled_window, TRUE, TRUE, 0);
-	gtk_widget_show (vbox);
-
-	component_view->sidebar_control = bonobo_control_new (vbox);
-
-	/* Create main view */
-	component_view->view_control = control_factory_new_control ();
-	if (!component_view->view_control) {
-		/* FIXME free memory */
-
-		return NULL;
-	}
-
-	component_view->calendar = (GnomeCalendar *) bonobo_control_get_widget (component_view->view_control);
-
-	/* This signal is thrown if backends die - we update the selector */
-	g_signal_connect (component_view->calendar, "source_added", 
-			  G_CALLBACK (source_added_cb), component_view);
-	g_signal_connect (component_view->calendar, "source_removed", 
-			  G_CALLBACK (source_removed_cb), component_view);
-
-	/* Create status bar */
-	statusbar_widget = e_task_bar_new ();
-	component_view->activity_handler = e_activity_handler_new ();
-	e_activity_handler_attach_task_bar (component_view->activity_handler, E_TASK_BAR (statusbar_widget));
-	gtk_widget_show (statusbar_widget);
-
-	component_view->statusbar_control = bonobo_control_new (statusbar_widget);
-	
-	gnome_calendar_set_activity_handler (component_view->calendar, component_view->activity_handler);
-	
-	/* connect after setting the initial selections, or we'll get unwanted calls
-	   to calendar_control_sensitize_calendar_commands */
-	g_signal_connect (component_view->source_selector, "selection_changed",
-			  G_CALLBACK (source_selection_changed_cb), component_view);
-	g_signal_connect (component_view->source_selector, "primary_selection_changed",
-			  G_CALLBACK (primary_source_selection_changed_cb), component_view);
-	g_signal_connect (component_view->source_selector, "popup_event",
-			  G_CALLBACK (popup_event_cb), component_view);
-
-	/* Set up the "new" item handler */
-	component_view->creatable_items_handler = e_user_creatable_items_handler_new ("calendar", create_local_item_cb, calendar_component);
-	g_signal_connect (component_view->view_control, "activate", G_CALLBACK (control_activate_cb), component_view);
-
-	/* We use this to update the component information */
-	set_info (component_view);
-	g_signal_connect (component_view->calendar, "dates_shown_changed",
-			  G_CALLBACK (calendar_dates_changed_cb), component_view);
-
-	/* Load the selection from the last run */
-	update_selection (component_view);	
-	update_primary_selection (component_view);
-	update_task_selection (component_view);
-	update_primary_task_selection (component_view);
-
-	/* If the tasks selection changes elsewhere, update it for the mini
-	   mini tasks view sidebar */
-	not = calendar_config_add_notification_tasks_selected (config_tasks_selection_changed_cb, 
-							       component_view);
-	component_view->notifications = g_list_prepend (component_view->notifications, GUINT_TO_POINTER (not));
-
-	not = calendar_config_add_notification_primary_tasks (config_primary_tasks_selection_changed_cb, 
-							      component_view);
-	component_view->notifications = g_list_prepend (component_view->notifications, GUINT_TO_POINTER (not));
-
-	return component_view;
-}
-
-static void
-destroy_component_view (CalendarComponentView *component_view)
-{	
-	GList *l;
-	
-	if (component_view->source_list)
-		g_object_unref (component_view->source_list);
-
-	if (component_view->task_source_list)
-		g_object_unref (component_view->task_source_list);
-
-	if (component_view->source_selection)
-		e_source_selector_free_selection (component_view->source_selection);
-	
-	for (l = component_view->notifications; l; l = l->next)
-		calendar_config_remove_notification (GPOINTER_TO_UINT (l->data));
-	g_list_free (component_view->notifications);
-
-	if (component_view->creatable_items_handler)
-		g_object_unref (component_view->creatable_items_handler);
-
-	if (component_view->activity_handler)
-		g_object_unref (component_view->activity_handler);
-
-	g_free (component_view);
-}
-
-static void
-view_destroyed_cb (gpointer data, GObject *where_the_object_was)
-{
-	CalendarComponent *calendar_component = data;
-	CalendarComponentPrivate *priv;
-	GList *l;
-	
-	priv = calendar_component->priv;
-
-	for (l = priv->views; l; l = l->next) {
-		CalendarComponentView *component_view = l->data;
-		
-		if (G_OBJECT (component_view->view_control) == where_the_object_was) {
-			priv->views = g_list_remove (priv->views, component_view);
-			destroy_component_view (component_view);
-
-			break;
-		}
-	}
-}
-
-static void
-impl_createControls (PortableServer_Servant servant,
-		     Bonobo_Control *corba_sidebar_control,
-		     Bonobo_Control *corba_view_control,
-		     Bonobo_Control *corba_statusbar_control,
-		     CORBA_Environment *ev)
-{
-	CalendarComponent *calendar_component = CALENDAR_COMPONENT (bonobo_object_from_servant (servant));
-	CalendarComponentPrivate *priv;
-	CalendarComponentView *component_view;
-	
-	priv = calendar_component->priv;
-
-	/* Create the calendar component view */
-	component_view = create_component_view (calendar_component);
-	if (!component_view) {
-		/* FIXME Should we describe the problem in a control? */
-		bonobo_exception_set (ev, ex_GNOME_Evolution_Component_Failed);
-
-		return;
-	}
-
-	g_object_weak_ref (G_OBJECT (component_view->view_control), view_destroyed_cb, calendar_component);
-	priv->views = g_list_append (priv->views, component_view);
-	
-	/* Return the controls */
-	*corba_sidebar_control = CORBA_Object_duplicate (BONOBO_OBJREF (component_view->sidebar_control), ev);
-	*corba_view_control = CORBA_Object_duplicate (BONOBO_OBJREF (component_view->view_control), ev);
-	*corba_statusbar_control = CORBA_Object_duplicate (BONOBO_OBJREF (component_view->statusbar_control), ev);
-}
-
-
-static GNOME_Evolution_CreatableItemTypeList *
-impl__get_userCreatableItems (PortableServer_Servant servant,
-			      CORBA_Environment *ev)
-{
-	GNOME_Evolution_CreatableItemTypeList *list = GNOME_Evolution_CreatableItemTypeList__alloc ();
-
-	list->_length  = 4;
-	list->_maximum = list->_length;
-	list->_buffer  = GNOME_Evolution_CreatableItemTypeList_allocbuf (list->_length);
-
-	CORBA_sequence_set_release (list, FALSE);
-
-	list->_buffer[0].id = CREATE_EVENT_ID;
-	list->_buffer[0].description = _("New appointment");
-	list->_buffer[0].menuDescription = _("_Appointment");
-	list->_buffer[0].tooltip = _("Create a new appointment");
-	list->_buffer[0].menuShortcut = 'a';
-	list->_buffer[0].iconName = "stock_new-appointment";
-	list->_buffer[0].type = GNOME_Evolution_CREATABLE_OBJECT;
-
-	list->_buffer[1].id = CREATE_MEETING_ID;
-	list->_buffer[1].description = _("New meeting");
-	list->_buffer[1].menuDescription = _("M_eeting");
-	list->_buffer[1].tooltip = _("Create a new meeting request");
-	list->_buffer[1].menuShortcut = 'e';
-	list->_buffer[1].iconName = "stock_new-meeting";
-	list->_buffer[1].type = GNOME_Evolution_CREATABLE_OBJECT;
-
-	list->_buffer[2].id = CREATE_ALLDAY_EVENT_ID;
-	list->_buffer[2].description = _("New all day appointment");
-	list->_buffer[2].menuDescription = _("All Day A_ppointment");
-	list->_buffer[2].tooltip = _("Create a new all-day appointment");
-	list->_buffer[2].menuShortcut = 'p';
-	list->_buffer[2].iconName = "stock_new-24h-appointment";
-	list->_buffer[2].type = GNOME_Evolution_CREATABLE_OBJECT;
-
-	list->_buffer[3].id = CREATE_CALENDAR_ID;
-	list->_buffer[3].description = _("New calendar");
-	list->_buffer[3].menuDescription = _("Cale_ndar");
-	list->_buffer[3].tooltip = _("Create a new calendar");
-	list->_buffer[3].menuShortcut = 'n';
-	list->_buffer[3].iconName = "stock_calendar";
-	list->_buffer[3].type = GNOME_Evolution_CREATABLE_FOLDER;
-
-	return list;
-}
-
-static void
-impl_requestCreateItem (PortableServer_Servant servant,
-			const CORBA_char *item_type_name,
-			CORBA_Environment *ev)
-{
-	CalendarComponent *calendar_component = CALENDAR_COMPONENT (bonobo_object_from_servant (servant));
-	gboolean result = FALSE;
-	
-	if (strcmp (item_type_name, CREATE_EVENT_ID) == 0)
-		result = create_new_event (calendar_component, NULL, FALSE, FALSE);
- 	else if (strcmp (item_type_name, CREATE_ALLDAY_EVENT_ID) == 0)
-		result = create_new_event (calendar_component, NULL, TRUE, FALSE);
-	else if (strcmp (item_type_name, CREATE_MEETING_ID) == 0)
-		result = create_new_event (calendar_component, NULL, FALSE, TRUE);
-	else if (strcmp (item_type_name, CREATE_CALENDAR_ID) == 0)
-		/* FIXME Should we use the last opened window? */
-		calendar_setup_new_calendar (NULL);
-	else
-		bonobo_exception_set (ev, ex_GNOME_Evolution_Component_UnknownType);
-
-	if (!result)
-		bonobo_exception_set (ev, ex_GNOME_Evolution_Component_Failed);
-}
-
-/* GObject methods.  */
-
-static void
-impl_dispose (GObject *object)
-{
-	CalendarComponent *calendar_component = CALENDAR_COMPONENT (object);
-	CalendarComponentPrivate *priv = calendar_component->priv;
-	GList *l;
-	
-	if (priv->source_list != NULL) {
-		g_object_unref (priv->source_list);
-		priv->source_list = NULL;
-	}
-
-	if (priv->gconf_client != NULL) {
-		g_object_unref (priv->gconf_client);
-		priv->gconf_client = NULL;
-	}
-
-	if (priv->create_ecal) {
-		g_object_unref (priv->create_ecal);
-		priv->create_ecal = NULL;
-	}
-
-	for (l = priv->views; l; l = l->next) {
-		CalendarComponentView *component_view = l->data;
-	
-		g_object_weak_unref (G_OBJECT (component_view->view_control), view_destroyed_cb, calendar_component);
-	}
-	g_list_free (priv->views);
-	priv->views = NULL;
-	
-	for (l = priv->notifications; l; l = l->next)
-		calendar_config_remove_notification (GPOINTER_TO_UINT (l->data));
-	g_list_free (priv->notifications);
-	priv->notifications = NULL;
-
-	(* G_OBJECT_CLASS (parent_class)->dispose) (object);
-}
-
-static void
-impl_finalize (GObject *object)
-{
-	CalendarComponentPrivate *priv = CALENDAR_COMPONENT (object)->priv;
-	GList *l;
-	
-	for (l = priv->views; l; l = l->next) {
-		CalendarComponentView *component_view = l->data;
-		
-		destroy_component_view (component_view);
-	}
-	g_list_free (priv->views);
-	
-	g_free (priv->base_directory);
-	g_free (priv->config_directory);
-	g_free (priv);
-
-	(* G_OBJECT_CLASS (parent_class)->finalize) (object);
-}
-
-static void
-calendar_component_class_init (CalendarComponentClass *class)
-{
-	POA_GNOME_Evolution_Component__epv *epv = &class->epv;
-	GObjectClass *object_class = G_OBJECT_CLASS (class);
-
-	parent_class = g_type_class_peek_parent (class);
-
-	epv->upgradeFromVersion      = impl_upgradeFromVersion;
-	epv->createControls          = impl_createControls;
-	epv->_get_userCreatableItems = impl__get_userCreatableItems;
-	epv->requestCreateItem       = impl_requestCreateItem;
-	epv->handleURI               = impl_handleURI;
-
-	object_class->dispose  = impl_dispose;
-	object_class->finalize = impl_finalize;
-}
-
-static void
-calendar_component_init (CalendarComponent *component)
-{
-	CalendarComponentPrivate *priv;
-	guint not;
-	
-	priv = g_new0 (CalendarComponentPrivate, 1);
-
-	priv->base_directory = g_build_filename (g_get_home_dir (), ".evolution", NULL);
-	priv->config_directory = g_build_filename (g_get_home_dir (),
-						   ".evolution", "calendar", "config",
-						   NULL);
-
-	/* EPFIXME: Should use a custom one instead?  Also we should add
-	 * calendar_component_peek_gconf_client().  */
-	priv->gconf_client = gconf_client_get_default ();
-
-	not = calendar_config_add_notification_primary_calendar (config_primary_selection_changed_cb, 
-								 component);
-	priv->notifications = g_list_prepend (priv->notifications, GUINT_TO_POINTER (not));
-
-	component->priv = priv;
-	ensure_sources (component);
-	if (!e_cal_get_sources (&priv->task_source_list, E_CAL_SOURCE_TYPE_TODO, NULL))
-		;
-}
-
-
-/* Public API.  */
-
-CalendarComponent *
-calendar_component_peek (void)
-{
-	static CalendarComponent *component = NULL;
-
-	if (component == NULL) {
-		component = g_object_new (calendar_component_get_type (), NULL);
-
-		if (e_mkdir_hier (calendar_component_peek_config_directory (component), 0777) != 0) {
-			g_warning (G_STRLOC ": Cannot create directory %s: %s",
-				   calendar_component_peek_config_directory (component),
-				   g_strerror (errno));
-			g_object_unref (component);
-			component = NULL;
-		}
-	}
-
-	return component;
-}
-
-const char *
-calendar_component_peek_base_directory (CalendarComponent *component)
-{
-	return component->priv->base_directory;
-}
-
-const char *
-calendar_component_peek_config_directory (CalendarComponent *component)
-{
-	return component->priv->config_directory;
-}
-
-ESourceList *
-calendar_component_peek_source_list (CalendarComponent *component)
-{
-	return component->priv->source_list;
-}
-
-void
-calendar_component_init_publishing (void)
-{
-	guint idle_id = 0;
-	CalendarComponent *calendar_component;
-	CalendarComponentPrivate *priv;
-	
-	calendar_component = calendar_component_peek ();
-	
-	priv = calendar_component->priv;
-	
-	gconf_client_add_dir (priv->gconf_client, CALENDAR_CONFIG_PUBLISH, GCONF_CLIENT_PRELOAD_ONELEVEL, NULL);
-
-	priv->gconf_notify_id
-		= gconf_client_notify_add (priv->gconf_client, CALENDAR_CONFIG_PUBLISH,
-					   (GConfClientNotifyFunc) conf_changed_callback, NULL,
-					   NULL, NULL);
-	
-	idle_id = g_idle_add ((GSourceFunc) init_calendar_publishing_cb, GINT_TO_POINTER (idle_id));
-}
-
-BONOBO_TYPE_FUNC_FULL (CalendarComponent, GNOME_Evolution_Component, PARENT_TYPE, calendar_component)
diff --git a/calendar/gui/calendar-component.h b/calendar/gui/calendar-component.h
deleted file mode 100644
index 58c808b8ec..0000000000
--- a/calendar/gui/calendar-component.h
+++ /dev/null
@@ -1,67 +0,0 @@
-/* -*- Mode: C; indent-tabs-mode: t; c-basic-offset: 8; tab-width: 8 -*- */
-/* calendar-component.h
- *
- * Copyright (C) 2003  Novell, Inc.
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of version 2 of the GNU General Public
- * License as published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * General Public License for more details.
- *
- * You should have received a copy of the GNU General Public
- * License along with this program; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
- *
- * Author: Ettore Perazzoli <ettore@ximian.com>
- */
-
-#ifndef _CALENDAR_COMPONENT_H_
-#define _CALENDAR_COMPONENT_H_
-
-
-#include <bonobo/bonobo-object.h>
-#include <libedataserver/e-source-list.h>
-#include "Evolution.h"
-
-
-#define CALENDAR_TYPE_COMPONENT			(calendar_component_get_type ())
-#define CALENDAR_COMPONENT(obj)			(G_TYPE_CHECK_INSTANCE_CAST ((obj), CALENDAR_TYPE_COMPONENT, CalendarComponent))
-#define CALENDAR_COMPONENT_CLASS(klass)		(G_TYPE_CHECK_CLASS_CAST ((klass), CALENDAR_TYPE_COMPONENT, CalendarComponentClass))
-#define CALENDAR_IS_COMPONENT(obj)			(G_TYPE_CHECK_INSTANCE_TYPE ((obj), CALENDAR_TYPE_COMPONENT))
-#define CALENDAR_IS_COMPONENT_CLASS(klass)		(G_TYPE_CHECK_CLASS_TYPE ((obj), CALENDAR_TYPE_COMPONENT))
-
-
-typedef struct _CalendarComponent        CalendarComponent;
-typedef struct _CalendarComponentPrivate CalendarComponentPrivate;
-typedef struct _CalendarComponentClass   CalendarComponentClass;
-
-struct _CalendarComponent {
-	BonoboObject parent;
-
-	CalendarComponentPrivate *priv;
-};
-
-struct _CalendarComponentClass {
-	BonoboObjectClass parent_class;
-
-	POA_GNOME_Evolution_Component__epv epv;
-};
-
-
-GType calendar_component_get_type  (void);
-
-CalendarComponent *calendar_component_peek  (void);
-
-const char       *calendar_component_peek_base_directory    (CalendarComponent *component);
-const char       *calendar_component_peek_config_directory  (CalendarComponent *component);
-ESourceList      *calendar_component_peek_source_list       (CalendarComponent *component);
-
-void calendar_component_init_publishing (void);
-
-
-#endif /* _CALENDAR_COMPONENT_H_ */
diff --git a/calendar/gui/calendar-config-keys.h b/calendar/gui/calendar-config-keys.h
deleted file mode 100644
index d3be9673e5..0000000000
--- a/calendar/gui/calendar-config-keys.h
+++ /dev/null
@@ -1,79 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-/*
- * Authors :
- *  JP Rosevear <jpr@ximian.com>
- *
- * Copyright 2003, Ximian, Inc.
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of version 2 of the GNU General Public
- * License as published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
- * USA
- */
-
-#ifndef _CALENDAR_CONFIG_KEYS_H_
-#define _CALENDAR_CONFIG_KEYS_H_
-
-G_BEGIN_DECLS
-
-#define CALENDAR_CONFIG_PREFIX "/apps/evolution/calendar"
-
-/* Display settings */
-#define CALENDAR_CONFIG_TIMEZONE CALENDAR_CONFIG_PREFIX "/display/timezone"
-#define CALENDAR_CONFIG_SELECTED_CALENDARS CALENDAR_CONFIG_PREFIX "/display/selected_calendars"
-#define CALENDAR_CONFIG_PRIMARY_CALENDAR CALENDAR_CONFIG_PREFIX "/display/primary_calendar"
-#define CALENDAR_CONFIG_24HOUR CALENDAR_CONFIG_PREFIX "/display/use_24hour_format"
-#define CALENDAR_CONFIG_WEEK_START CALENDAR_CONFIG_PREFIX "/display/week_start_day"
-#define CALENDAR_CONFIG_DAY_START_HOUR CALENDAR_CONFIG_PREFIX "/display/day_start_hour"
-#define CALENDAR_CONFIG_DAY_START_MINUTE CALENDAR_CONFIG_PREFIX "/display/day_start_minute"
-#define CALENDAR_CONFIG_DAY_END_HOUR CALENDAR_CONFIG_PREFIX "/display/day_end_hour"
-#define CALENDAR_CONFIG_DAY_END_MINUTE CALENDAR_CONFIG_PREFIX "/display/day_end_minute"
-#define CALENDAR_CONFIG_TIME_DIVISIONS CALENDAR_CONFIG_PREFIX "/display/time_divisions"
-#define CALENDAR_CONFIG_TIME_DIVISIONS CALENDAR_CONFIG_PREFIX "/display/time_divisions"
-#define CALENDAR_CONFIG_DEFAULT_VIEW CALENDAR_CONFIG_PREFIX "/display/default_view"
-#define CALENDAR_CONFIG_HPANE_POS CALENDAR_CONFIG_PREFIX "/display/hpane_position"
-#define CALENDAR_CONFIG_VPANE_POS CALENDAR_CONFIG_PREFIX "/display/vpane_position"
-#define CALENDAR_CONFIG_MONTH_HPANE_POS CALENDAR_CONFIG_PREFIX "/display/month_hpane_position"
-#define CALENDAR_CONFIG_MONTH_VPANE_POS CALENDAR_CONFIG_PREFIX "/display/month_vpane_position"
-#define CALENDAR_CONFIG_TASK_VPANE_POS CALENDAR_CONFIG_PREFIX "/display/task_vpane_position"
-#define CALENDAR_CONFIG_COMPRESS_WEEKEND CALENDAR_CONFIG_PREFIX "/display/compress_weekend"
-#define CALENDAR_CONFIG_SHOW_EVENT_END CALENDAR_CONFIG_PREFIX "/display/show_event_end"
-#define CALENDAR_CONFIG_WORKING_DAYS CALENDAR_CONFIG_PREFIX "/display/working_days"
-
-/* Date navigator settings */
-#define CALENDAR_CONFIG_DN_SHOW_WEEK_NUMBERS CALENDAR_CONFIG_PREFIX "/date_navigator/show_week_numbers"
-
-/* Task display settings */
-#define CALENDAR_CONFIG_TASKS_SELECTED_TASKS CALENDAR_CONFIG_PREFIX "/tasks/selected_tasks"
-#define CALENDAR_CONFIG_PRIMARY_TASKS CALENDAR_CONFIG_PREFIX "/tasks/primary_tasks"
-#define CALENDAR_CONFIG_TASKS_HIDE_COMPLETED CALENDAR_CONFIG_PREFIX "/tasks/hide_completed"
-#define CALENDAR_CONFIG_TASKS_HIDE_COMPLETED_UNITS CALENDAR_CONFIG_PREFIX "/tasks/hide_completed_units"
-#define CALENDAR_CONFIG_TASKS_HIDE_COMPLETED_VALUE CALENDAR_CONFIG_PREFIX "/tasks/hide_completed_value"
-#define CALENDAR_CONFIG_TASKS_DUE_TODAY_COLOR CALENDAR_CONFIG_PREFIX "/tasks/colors/due_today"
-#define CALENDAR_CONFIG_TASKS_OVERDUE_COLOR CALENDAR_CONFIG_PREFIX "/tasks/colors/overdue"
-
-/* Prompt settings */
-#define CALENDAR_CONFIG_PROMPT_DELETE CALENDAR_CONFIG_PREFIX "/prompts/confirm_delete"
-#define CALENDAR_CONFIG_PROMPT_PURGE CALENDAR_CONFIG_PREFIX "/prompts/confirm_purge"
-
-/* Default reminder */
-#define CALENDAR_CONFIG_DEFAULT_REMINDER CALENDAR_CONFIG_PREFIX "/other/use_default_reminder"
-#define CALENDAR_CONFIG_DEFAULT_REMINDER_INTERVAL CALENDAR_CONFIG_PREFIX "/other/default_reminder_interval"
-#define CALENDAR_CONFIG_DEFAULT_REMINDER_UNITS CALENDAR_CONFIG_PREFIX "/other/default_reminder_units"
-
-/* Free/Busy settings */
-#define CALENDAR_CONFIG_PUBLISH CALENDAR_CONFIG_PREFIX"/publish/uris"
-#define CALENDAR_CONFIG_TEMPLATE CALENDAR_CONFIG_PREFIX"/publish/template"
-
-G_END_DECLS
-
-#endif
diff --git a/calendar/gui/calendar-config.c b/calendar/gui/calendar-config.c
deleted file mode 100644
index c31bdca261..0000000000
--- a/calendar/gui/calendar-config.c
+++ /dev/null
@@ -1,1143 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-/*
- * Authors :
- *  Damon Chaplin <damon@ximian.com>
- *  Rodrigo Moya <rodrigo@ximian.com>
- *
- * Copyright 2000-2004, Novell, Inc.
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of version 2 of the GNU General Public
- * License as published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
- * USA
- */
-
-/*
- * calendar-config.c - functions to load/save/get/set user settings.
- */
-
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
-
-#include <string.h>
-#include <time.h>
-#include <libgnomeui/gnome-dialog.h>
-#include <gal/util/e-util.h>
-#include <widgets/e-timezone-dialog/e-timezone-dialog.h>
-#include <libecal/e-cal-time-util.h>
-
-#include "calendar-config-keys.h"
-#include "calendar-config.h"
-
-
-
-static GConfClient *config = NULL;
-
-static void on_timezone_set		(GnomeDialog	*dialog,
-					 int		 button,
-					 ETimezoneDialog *etd);
-static gboolean on_timezone_dialog_delete_event	(GnomeDialog	*dialog,
-						 GdkEvent	*event,
-						 ETimezoneDialog *etd);
-
-static void
-do_cleanup (void)
-{
-	g_object_unref (config);
-	config = NULL;
-}
-
-static void
-calendar_config_init (void)
-{
-	if (config)
-		return;
-
-	config = gconf_client_get_default ();
-	g_atexit ((GVoidFunc) do_cleanup);
-
-	gconf_client_add_dir (config, CALENDAR_CONFIG_PREFIX, GCONF_CLIENT_PRELOAD_RECURSIVE, NULL);
-}
-
-void
-calendar_config_remove_notification (guint id)
-{
-	calendar_config_init ();
-	
-	gconf_client_notify_remove (config, id);
-}
-
-/* Returns TRUE if the locale has 'am' and 'pm' strings defined, in which
-   case the user can choose between 12 and 24-hour time formats. */
-gboolean
-calendar_config_locale_supports_12_hour_format (void)
-{
-	char s[16];
-	time_t t = 0;
-
-	calendar_config_init ();
-
-	e_utf8_strftime (s, sizeof s, "%p", gmtime (&t));
-	return s[0] != '\0';
-}
-
-/* Returns the string representation of a units value */
-static const char *
-units_to_string (CalUnits units)
-{
-	switch (units) {
-	case CAL_DAYS:
-		return "days";
-
-	case CAL_HOURS:
-		return "hours";
-
-	case CAL_MINUTES:
-		return "minutes";
-
-	default:
-		g_assert_not_reached ();
-		return NULL;
-	}
-}
-
-/*
- * Calendar Settings.
- */
-
-/* The current list of calendars selected */
-GSList *
-calendar_config_get_calendars_selected (void)
-{
-	calendar_config_init ();
-
-	return gconf_client_get_list (config, CALENDAR_CONFIG_SELECTED_CALENDARS, GCONF_VALUE_STRING, NULL);
-}
-
-void
-calendar_config_set_calendars_selected (GSList *selected)
-{
-	calendar_config_init ();
-
-	gconf_client_set_list (config, CALENDAR_CONFIG_SELECTED_CALENDARS, GCONF_VALUE_STRING, selected, NULL);
-}
-
-guint
-calendar_config_add_notification_calendars_selected (GConfClientNotifyFunc func, gpointer data)
-{
-	guint id;
-
-	calendar_config_init ();
-	
-	id = gconf_client_notify_add (config, CALENDAR_CONFIG_SELECTED_CALENDARS, func, data, NULL, NULL);
-	
-	return id;
-}
-
-/* The primary calendar */
-char *
-calendar_config_get_primary_calendar (void)
-{
-	calendar_config_init ();
-
-	return gconf_client_get_string (config, CALENDAR_CONFIG_PRIMARY_CALENDAR, NULL);
-}
-
-void
-calendar_config_set_primary_calendar (const char *primary_uid)
-{
-	calendar_config_init ();
-
-	gconf_client_set_string (config, CALENDAR_CONFIG_PRIMARY_CALENDAR, primary_uid, NULL);
-}
-
-
-guint
-calendar_config_add_notification_primary_calendar (GConfClientNotifyFunc func, gpointer data)
-{
-	guint id;
-
-	calendar_config_init ();
-	
-	id = gconf_client_notify_add (config, CALENDAR_CONFIG_PRIMARY_CALENDAR, func, data, NULL, NULL);
-	
-	return id;
-}
-
-
-/* The current timezone, e.g. "Europe/London". It may be NULL, in which case
-   you should assume UTC (though Evolution will show the timezone-setting
-   dialog the next time a calendar or task folder is selected). */
-gchar *
-calendar_config_get_timezone (void)
-{
-	calendar_config_init ();
-
-	return gconf_client_get_string (config, CALENDAR_CONFIG_TIMEZONE, NULL);
-}
-
-icaltimezone *
-calendar_config_get_icaltimezone (void)
-{
-	char *location;
-	icaltimezone *zone = NULL;
-
-	calendar_config_init ();
-	
-	location = calendar_config_get_timezone ();
-	if (location)
-		zone = icaltimezone_get_builtin_timezone (location);
-
-	if (!zone)
-		zone = icaltimezone_get_utc_timezone ();
-	
-	return zone;
-}
-
-
-/* Sets the timezone. If set to NULL it defaults to UTC.
-   FIXME: Should check it is being set to a valid timezone. */
-void
-calendar_config_set_timezone (gchar *timezone)
-{
-	calendar_config_init ();
-
-	if (timezone && timezone[0])
-		gconf_client_set_string (config, CALENDAR_CONFIG_TIMEZONE, timezone, NULL);
-	else
-		gconf_client_set_string (config, CALENDAR_CONFIG_TIMEZONE, "UTC", NULL);
-}
-
-guint
-calendar_config_add_notification_timezone (GConfClientNotifyFunc func, gpointer data)
-{
-	guint id;
-
-	calendar_config_init ();
-	
-	id = gconf_client_notify_add (config, CALENDAR_CONFIG_TIMEZONE, func, data, NULL, NULL);
-	
-	return id;
-}
-
-/* Whether we use 24-hour format or 12-hour format (AM/PM). */
-gboolean
-calendar_config_get_24_hour_format	(void)
-{
-	calendar_config_init ();
-
-	/* If the locale defines 'am' and 'pm' strings then the user has the
-	   choice of 12-hour or 24-hour time format, with 12-hour as the
-	   default. If the locale doesn't have 'am' and 'pm' strings we have
-	   to use 24-hour format, or strftime()/strptime() won't work. */
-	if (calendar_config_locale_supports_12_hour_format ())
-		return gconf_client_get_bool (config, CALENDAR_CONFIG_24HOUR, NULL);
-
-	return TRUE;
-}
-
-
-void
-calendar_config_set_24_hour_format	(gboolean     use_24_hour)
-{
-	calendar_config_init ();
-
-	gconf_client_set_bool (config, CALENDAR_CONFIG_24HOUR, use_24_hour, NULL);
-}
-
-guint
-calendar_config_add_notification_24_hour_format (GConfClientNotifyFunc func, gpointer data)
-{
-	guint id;
-
-	calendar_config_init ();
-	
-	id = gconf_client_notify_add (config, CALENDAR_CONFIG_24HOUR, func, data, NULL, NULL);
-	
-	return id;
-}
-
-/* The start day of the week (0 = Sun to 6 = Mon). */
-gint
-calendar_config_get_week_start_day	(void)
-{
-	calendar_config_init ();
-
-	return gconf_client_get_int (config, CALENDAR_CONFIG_WEEK_START, NULL);
-}
-
-
-void
-calendar_config_set_week_start_day	(gint	      week_start_day)
-{
-	calendar_config_init ();
-
-	gconf_client_set_int (config, CALENDAR_CONFIG_WEEK_START, week_start_day, NULL);
-}
-
-guint 
-calendar_config_add_notification_week_start_day (GConfClientNotifyFunc func, gpointer data)
-{
-	guint id;
-
-	calendar_config_init ();
-	
-	id = gconf_client_notify_add (config, CALENDAR_CONFIG_WEEK_START, func, data, NULL, NULL);
-	
-	return id;	
-}
-
-/* The start and end times of the work-day. */
-gint
-calendar_config_get_day_start_hour	(void)
-{
-	calendar_config_init ();
-
-	return gconf_client_get_int (config, CALENDAR_CONFIG_DAY_START_HOUR, NULL);
-}
-
-
-void
-calendar_config_set_day_start_hour	(gint	      day_start_hour)
-{
-	calendar_config_init ();
-
-	gconf_client_set_int (config, CALENDAR_CONFIG_DAY_START_HOUR, day_start_hour, NULL);
-}
-
-guint 
-calendar_config_add_notification_day_start_hour (GConfClientNotifyFunc func, gpointer data)
-{
-	guint id;
-
-	calendar_config_init ();
-	
-	id = gconf_client_notify_add (config, CALENDAR_CONFIG_DAY_START_HOUR, func, data, NULL, NULL);
-	
-	return id;	
-}
-
-gint
-calendar_config_get_day_start_minute	(void)
-{
-	calendar_config_init ();
-
-	return gconf_client_get_int (config, CALENDAR_CONFIG_DAY_START_MINUTE, NULL);
-}
-
-
-void
-calendar_config_set_day_start_minute	(gint	      day_start_min)
-{
-	calendar_config_init ();
-
-	gconf_client_set_int (config, CALENDAR_CONFIG_DAY_START_MINUTE, day_start_min, NULL);
-}
-
-guint 
-calendar_config_add_notification_day_start_minute (GConfClientNotifyFunc func, gpointer data)
-{
-	guint id;
-
-	calendar_config_init ();
-	
-	id = gconf_client_notify_add (config, CALENDAR_CONFIG_DAY_START_MINUTE, func, data, NULL, NULL);
-	
-	return id;	
-}
-
-gint
-calendar_config_get_day_end_hour	(void)
-{
-	calendar_config_init ();
-
-	return gconf_client_get_int (config, CALENDAR_CONFIG_DAY_END_HOUR, NULL);
-}
-
-
-void
-calendar_config_set_day_end_hour	(gint	      day_end_hour)
-{
-	calendar_config_init ();
-
-	gconf_client_set_int (config, CALENDAR_CONFIG_DAY_END_HOUR, day_end_hour, NULL);
-}
-
-guint 
-calendar_config_add_notification_day_end_hour (GConfClientNotifyFunc func, gpointer data)
-{
-	guint id;
-
-	calendar_config_init ();
-	
-	id = gconf_client_notify_add (config, CALENDAR_CONFIG_DAY_END_HOUR, func, data, NULL, NULL);
-	
-	return id;	
-}
-
-gint
-calendar_config_get_day_end_minute	(void)
-{
-	calendar_config_init ();
-
-	return gconf_client_get_int (config, CALENDAR_CONFIG_DAY_END_MINUTE, NULL);
-}
-
-
-void
-calendar_config_set_day_end_minute	(gint	      day_end_min)
-{
-	calendar_config_init ();
-
-	gconf_client_set_int (config, CALENDAR_CONFIG_DAY_END_MINUTE, day_end_min, NULL);
-}
-
-guint 
-calendar_config_add_notification_day_end_minute (GConfClientNotifyFunc func, gpointer data)
-{
-	guint id;
-	
-	calendar_config_init ();
-
-	id = gconf_client_notify_add (config, CALENDAR_CONFIG_DAY_END_MINUTE, func, data, NULL, NULL);
-	
-	return id;	
-}
-
-/* The time divisions in the Day/Work-Week view in minutes (5/10/15/30/60). */
-gint
-calendar_config_get_time_divisions	(void)
-{
-	calendar_config_init ();
-
-	return gconf_client_get_int (config, CALENDAR_CONFIG_TIME_DIVISIONS, NULL);
-}
-
-
-void
-calendar_config_set_time_divisions	(gint	      divisions)
-{
-	calendar_config_init ();
-
-	gconf_client_set_int (config, CALENDAR_CONFIG_TIME_DIVISIONS, divisions, NULL);
-}
-
-guint
-calendar_config_add_notification_time_divisions (GConfClientNotifyFunc func, gpointer data)
-{
-	guint id;
-
-	calendar_config_init ();
-	
-	id = gconf_client_notify_add (config, CALENDAR_CONFIG_TIME_DIVISIONS, func, data, NULL, NULL);
-	
-	return id;
-}
-
-/* Whether we show week numbers in the Date Navigator. */
-gboolean
-calendar_config_get_dnav_show_week_no	(void)
-{
-	calendar_config_init ();
-
-	return gconf_client_get_bool (config, CALENDAR_CONFIG_DN_SHOW_WEEK_NUMBERS, NULL);
-}
-
-
-void
-calendar_config_set_dnav_show_week_no	(gboolean     show_week_no)
-{
-	calendar_config_init ();
-
-	gconf_client_set_bool (config, CALENDAR_CONFIG_DN_SHOW_WEEK_NUMBERS, show_week_no, NULL);
-}
-
-guint 
-calendar_config_add_notification_dnav_show_week_no (GConfClientNotifyFunc func, gpointer data)
-{
-	guint id;
-
-	calendar_config_init ();
-	
-	id = gconf_client_notify_add (config, CALENDAR_CONFIG_DN_SHOW_WEEK_NUMBERS, func, data, NULL, NULL);
-	
-	return id;
-}
-
-/* The positions of the panes in the normal and month views. */
-gint
-calendar_config_get_hpane_pos		(void)
-{
-	calendar_config_init ();
-
-	return gconf_client_get_int (config, CALENDAR_CONFIG_HPANE_POS, NULL);
-}
-
-
-void
-calendar_config_set_hpane_pos		(gint	      hpane_pos)
-{
-	calendar_config_init ();
-
-	gconf_client_set_int (config, CALENDAR_CONFIG_HPANE_POS, hpane_pos, NULL);
-}
-
-
-gint
-calendar_config_get_vpane_pos		(void)
-{
-	calendar_config_init ();
-
-	return gconf_client_get_int (config, CALENDAR_CONFIG_VPANE_POS, NULL);
-}
-
-
-void
-calendar_config_set_vpane_pos		(gint	      vpane_pos)
-{
-	calendar_config_init ();
-
-	gconf_client_set_int (config, CALENDAR_CONFIG_VPANE_POS, vpane_pos, NULL);
-}
-
-
-gint
-calendar_config_get_month_hpane_pos	(void)
-{
-	calendar_config_init ();
-
-	return gconf_client_get_int (config, CALENDAR_CONFIG_MONTH_HPANE_POS, NULL);
-}
-
-
-void
-calendar_config_set_month_hpane_pos	(gint	      hpane_pos)
-{
-	calendar_config_init ();
-
-	gconf_client_set_int (config, CALENDAR_CONFIG_MONTH_HPANE_POS, hpane_pos, NULL);
-}
-
-
-gint
-calendar_config_get_month_vpane_pos	(void)
-{
-	calendar_config_init ();
-
-	return  gconf_client_get_int (config, CALENDAR_CONFIG_MONTH_VPANE_POS, NULL);
-}
-
-
-void
-calendar_config_set_month_vpane_pos	(gint	      vpane_pos)
-{
-	gconf_client_set_int (config, CALENDAR_CONFIG_MONTH_VPANE_POS, vpane_pos, NULL);
-}
-
-/* The current list of task lists selected */
-GSList   *
-calendar_config_get_tasks_selected (void)
-{
-	return gconf_client_get_list (config, CALENDAR_CONFIG_TASKS_SELECTED_TASKS, GCONF_VALUE_STRING, NULL);
-}
-
-void
-calendar_config_set_tasks_selected (GSList *selected)
-{
-	gconf_client_set_list (config, CALENDAR_CONFIG_TASKS_SELECTED_TASKS, GCONF_VALUE_STRING, selected, NULL);
-}
-
-guint
-calendar_config_add_notification_tasks_selected (GConfClientNotifyFunc func, gpointer data)
-{
-	guint id;
-	
-	id = gconf_client_notify_add (config, CALENDAR_CONFIG_TASKS_SELECTED_TASKS, func, data, NULL, NULL);
-	
-	return id;
-}
-
-/* The primary task list */
-char *
-calendar_config_get_primary_tasks (void)
-{
-	return gconf_client_get_string (config, CALENDAR_CONFIG_PRIMARY_TASKS, NULL);
-}
-
-void
-calendar_config_set_primary_tasks (const char *primary_uid)
-{
-	gconf_client_set_string (config, CALENDAR_CONFIG_PRIMARY_TASKS, primary_uid, NULL);
-}
-
-
-guint
-calendar_config_add_notification_primary_tasks (GConfClientNotifyFunc func, gpointer data)
-{
-	guint id;
-	
-	id = gconf_client_notify_add (config, CALENDAR_CONFIG_PRIMARY_TASKS, func, data, NULL, NULL);
-	
-	return id;
-}
-
-gint
-calendar_config_get_task_vpane_pos	(void)
-{
-	return  gconf_client_get_int (config, CALENDAR_CONFIG_TASK_VPANE_POS, NULL);
-}
-
-
-void
-calendar_config_set_task_vpane_pos	(gint	      vpane_pos)
-{
-	gconf_client_set_int (config, CALENDAR_CONFIG_TASK_VPANE_POS, vpane_pos, NULL);
-}
-
-
-/* Whether we compress the weekend in the week/month views. */
-gboolean
-calendar_config_get_compress_weekend	(void)
-{
-	return gconf_client_get_bool (config, CALENDAR_CONFIG_COMPRESS_WEEKEND, NULL);
-}
-
-
-void
-calendar_config_set_compress_weekend	(gboolean     compress)
-{
-	gconf_client_set_bool (config, CALENDAR_CONFIG_COMPRESS_WEEKEND, compress, NULL);
-}
-
-guint
-calendar_config_add_notification_compress_weekend (GConfClientNotifyFunc func, gpointer data)
-{
-	guint id;
-	
-	id = gconf_client_notify_add (config, CALENDAR_CONFIG_COMPRESS_WEEKEND, func, data, NULL, NULL);
-	
-	return id;
-}
-
-/* Whether we show event end times. */
-gboolean
-calendar_config_get_show_event_end	(void)
-{
-	return gconf_client_get_bool (config, CALENDAR_CONFIG_SHOW_EVENT_END, NULL);
-}
-
-
-void
-calendar_config_set_show_event_end	(gboolean     show_end)
-{
-	gconf_client_set_bool (config, CALENDAR_CONFIG_SHOW_EVENT_END, show_end, NULL);
-}
-
-guint
-calendar_config_add_notification_show_event_end (GConfClientNotifyFunc func, gpointer data)
-{
-	guint id;
-	
-	id = gconf_client_notify_add (config, CALENDAR_CONFIG_SHOW_EVENT_END, func, data, NULL, NULL);
-	
-	return id;
-}
-
-/* The working days of the week, a bit-wise combination of flags. */
-CalWeekdays
-calendar_config_get_working_days	(void)
-{
-	return gconf_client_get_int (config, CALENDAR_CONFIG_WORKING_DAYS, NULL);
-}
-
-
-void
-calendar_config_set_working_days	(CalWeekdays  days)
-{
-	gconf_client_set_int (config, CALENDAR_CONFIG_WORKING_DAYS, days, NULL);
-}
-
-guint 
-calendar_config_add_notification_working_days (GConfClientNotifyFunc func, gpointer data)
-{
-	guint id;
-	
-	id = gconf_client_notify_add (config, CALENDAR_CONFIG_WORKING_DAYS , func, data, NULL, NULL);
-	
-	return id;	
-}
-
-/* Settings to hide completed tasks. */
-gboolean
-calendar_config_get_hide_completed_tasks	(void)
-{
-	return gconf_client_get_bool (config, CALENDAR_CONFIG_TASKS_HIDE_COMPLETED, NULL);
-}
-
-
-void
-calendar_config_set_hide_completed_tasks	(gboolean	hide)
-{
-	gconf_client_set_bool (config, CALENDAR_CONFIG_TASKS_HIDE_COMPLETED, hide, NULL);
-}
-
-guint 
-calendar_config_add_notification_hide_completed_tasks (GConfClientNotifyFunc func, gpointer data)
-{
-	guint id;
-	
-	id = gconf_client_notify_add (config, CALENDAR_CONFIG_TASKS_HIDE_COMPLETED , func, data, NULL, NULL);
-	
-	return id;	
-}
-
-CalUnits
-calendar_config_get_hide_completed_tasks_units	(void)
-{
-	char *units;
-	CalUnits cu;
-
-	units = gconf_client_get_string (config, CALENDAR_CONFIG_TASKS_HIDE_COMPLETED_UNITS, NULL);
-
-	if (units && !strcmp (units, "minutes"))
-		cu = CAL_MINUTES;
-	else if (units && !strcmp (units, "hours"))
-		cu = CAL_HOURS;
-	else
-		cu = CAL_DAYS;
-
-	g_free (units);
-
-	return cu;
-}
-
-
-void
-calendar_config_set_hide_completed_tasks_units	(CalUnits	cu)
-{
-	char *units;
-
-	switch (cu) {
-	case CAL_MINUTES :
-		units = g_strdup ("minutes");
-		break;
-	case CAL_HOURS :
-		units = g_strdup ("hours");
-		break;
-	default :
-		units = g_strdup ("days");
-	}
-
-	gconf_client_set_string (config, CALENDAR_CONFIG_TASKS_HIDE_COMPLETED_UNITS, units, NULL);
-
-	g_free (units);
-}
-
-guint 
-calendar_config_add_notification_hide_completed_tasks_units (GConfClientNotifyFunc func, gpointer data)
-{
-	guint id;
-	
-	id = gconf_client_notify_add (config, CALENDAR_CONFIG_TASKS_HIDE_COMPLETED_UNITS , func, data, NULL, NULL);
-	
-	return id;	
-}
-
-gint
-calendar_config_get_hide_completed_tasks_value	(void)
-{
-	return gconf_client_get_int (config, CALENDAR_CONFIG_TASKS_HIDE_COMPLETED_VALUE, NULL);
-}
-
-
-void
-calendar_config_set_hide_completed_tasks_value	(gint		value)
-{
-	gconf_client_set_int (config, CALENDAR_CONFIG_TASKS_HIDE_COMPLETED_VALUE, value, NULL);
-}
-
-guint 
-calendar_config_add_notification_hide_completed_tasks_value (GConfClientNotifyFunc func, gpointer data)
-{
-	guint id;
-	
-	id = gconf_client_notify_add (config, CALENDAR_CONFIG_TASKS_HIDE_COMPLETED_VALUE , func, data, NULL, NULL);
-	
-	return id;	
-}
-
-/**
- * calendar_config_get_confirm_delete:
- *
- * Queries the configuration value for whether a confirmation dialog is
- * presented when deleting calendar/tasks items.
- *
- * Return value: Whether confirmation is required when deleting items.
- **/
-gboolean
-calendar_config_get_confirm_delete (void)
-{
-	return gconf_client_get_bool (config, CALENDAR_CONFIG_PROMPT_DELETE, NULL);
-}
-
-/**
- * calendar_config_set_confirm_delete:
- * @confirm: Whether confirmation is required when deleting items.
- *
- * Sets the configuration value for whether a confirmation dialog is presented
- * when deleting calendar/tasks items.
- **/
-void
-calendar_config_set_confirm_delete (gboolean confirm)
-{
-	gconf_client_set_bool (config, CALENDAR_CONFIG_PROMPT_DELETE, confirm, NULL);
-}
-
-/**
- * calendar_config_get_confirm_purge:
- *
- * Queries the configuration value for whether a confirmation dialog is
- * presented when purging calendar/tasks items.
- *
- * Return value: Whether confirmation is required when purging items.
- **/
-gboolean
-calendar_config_get_confirm_purge (void)
-{
-	return gconf_client_get_bool (config, CALENDAR_CONFIG_PROMPT_PURGE, NULL);
-}
-
-/**
- * calendar_config_set_confirm_purge:
- * @confirm: Whether confirmation is required when purging items.
- *
- * Sets the configuration value for whether a confirmation dialog is presented
- * when purging calendar/tasks items.
- **/
-void
-calendar_config_set_confirm_purge (gboolean confirm)
-{
-	gconf_client_set_bool (config, CALENDAR_CONFIG_PROMPT_PURGE, confirm, NULL);
-}
-
-void
-calendar_config_check_timezone_set ()
-{
-	ETimezoneDialog *timezone_dialog;
-	GtkWidget *dialog;
-	GList *elem;
-	char *zone;
-
-	zone = calendar_config_get_timezone ();
-	if (zone && zone[0])
-		return;
-
-	/* Show timezone dialog. */
-	timezone_dialog = e_timezone_dialog_new ();
-	dialog = e_timezone_dialog_get_toplevel (timezone_dialog);
-
-	/* Hide the cancel button, which is the 2nd button. */
-	elem = g_list_nth (GNOME_DIALOG (dialog)->buttons, 1);
-	gtk_widget_hide (elem->data);
-
-	g_signal_connect (dialog, "clicked",
-			  G_CALLBACK (on_timezone_set), timezone_dialog);
-	g_signal_connect (dialog, "delete-event",
-			  G_CALLBACK (on_timezone_dialog_delete_event), timezone_dialog);
-
-	gtk_widget_show (dialog);
-}
-
-
-static void
-on_timezone_set			(GnomeDialog	*dialog,
-				 int		 button,
-				 ETimezoneDialog *etd)
-{
-	icaltimezone *zone;
-
-	zone = e_timezone_dialog_get_timezone (etd);
-	if (zone)
-		calendar_config_set_timezone (icaltimezone_get_location (zone));
-
-	g_object_unref (etd);
-}
-
-
-static gboolean
-on_timezone_dialog_delete_event	(GnomeDialog	*dialog,
-				 GdkEvent	*event,
-				 ETimezoneDialog *etd)
-{
-	g_object_unref (etd);
-	return TRUE;
-}
-
-
-/**
- * calendar_config_get_tasks_due_today_color:
- *
- * Queries the color to be used to display tasks that are due today.
- *
- * Return value: An X color specification.
- **/
-const char *
-calendar_config_get_tasks_due_today_color (void)
-{
-	static char *color = NULL;
-
-	if (color)
-		g_free (color);
-
-	color = gconf_client_get_string (config, CALENDAR_CONFIG_TASKS_DUE_TODAY_COLOR, NULL);
-	return color;
-}
-
-/**
- * calendar_config_set_tasks_due_today_color:
- * @color: X color specification
- *
- * Sets the color to be used to display tasks that are due today.
- **/
-void
-calendar_config_set_tasks_due_today_color (const char *color)
-{
-	g_return_if_fail (color != NULL);
-
-	gconf_client_set_string (config, CALENDAR_CONFIG_TASKS_DUE_TODAY_COLOR, color, NULL);
-}
-
-/**
- * calendar_config_get_tasks_overdue_color:
- *
- * Queries the color to be used to display overdue tasks.
- *
- * Return value: An X color specification.
- **/
-const char *
-calendar_config_get_tasks_overdue_color (void)
-{
-	static char *color = NULL;
-
-	if (color)
-		g_free (color);
-
-	color = gconf_client_get_string (config, CALENDAR_CONFIG_TASKS_OVERDUE_COLOR, NULL);
-	return color;
-}
-
-/**
- * calendar_config_set_tasks_overdue_color:
- * @color: X color specification
- *
- * Sets the color to be used to display overdue tasks.
- **/
-void
-calendar_config_set_tasks_overdue_color (const char *color)
-{
-	g_return_if_fail (color != NULL);
-
-	gconf_client_set_string (config, CALENDAR_CONFIG_TASKS_OVERDUE_COLOR, color, NULL);
-}
-
-/**
- * calendar_config_get_use_default_reminder:
- *
- * Queries whether new appointments should be created with a default reminder.
- *
- * Return value: Boolean value indicating whether new appointments should be
- * created with a default reminder from the values of
- * calendar_config_get_default_reminder_interval() and
- * calendar_config_get_default_reminder_units().
- **/
-gboolean
-calendar_config_get_use_default_reminder (void)
-{
-	return gconf_client_get_bool (config, CALENDAR_CONFIG_DEFAULT_REMINDER, NULL);
-}
-
-/**
- * calendar_config_set_use_default_reminder:
- * @value: Whether to create new appointments with a default reminder.
- *
- * Sets whether newly-created appointments should get a default reminder set
- * them.
- **/
-void
-calendar_config_set_use_default_reminder (gboolean value)
-{
-	gconf_client_set_bool (config, CALENDAR_CONFIG_DEFAULT_REMINDER, value, NULL);
-}
-
-/**
- * calendar_config_get_default_reminder_interval:
- *
- * Queries the interval for the default reminder of newly-created
- * appointments, i.e. 5 in "5 minutes".
- *
- * Return value: Interval for default reminders.
- **/
-int
-calendar_config_get_default_reminder_interval (void)
-{
-	return gconf_client_get_int (config, CALENDAR_CONFIG_DEFAULT_REMINDER_INTERVAL, NULL);
-}
-
-/**
- * calendar_config_set_default_reminder_interval:
- * @interval: Interval value, e.g. 5 for "5 minutes".
- *
- * Sets the interval that should be used for the default reminder in new
- * appointments.
- **/
-void
-calendar_config_set_default_reminder_interval (int interval)
-{
-	gconf_client_set_int (config, CALENDAR_CONFIG_DEFAULT_REMINDER_INTERVAL, interval, NULL);
-}
-
-/**
- * calendar_config_get_default_reminder_units:
- *
- * Queries the units of time in which default reminders should be created for
- * new appointments, e.g. CAL_MINUTES for "5 minutes".
- *
- * Return value: Time units for default reminders.
- **/
-CalUnits
-calendar_config_get_default_reminder_units (void)
-{
-	char *units;
-	CalUnits cu;
-
-	units = gconf_client_get_string (config, CALENDAR_CONFIG_DEFAULT_REMINDER_UNITS, NULL);
-
-	if (units && !strcmp (units, "days"))
-		cu = CAL_DAYS;
-	else if (units && !strcmp (units, "hours"))
-		cu = CAL_HOURS;
-	else
-		cu = CAL_MINUTES;
-	g_free (units);
-
-	return cu;
-}
-
-/**
- * calendar_config_set_default_reminder_units:
- * @units: Time units, e.g. CAL_MINUTES for "5 minutes".
- *
- * Sets the units to be used for default reminders in new appointments.
- **/
-void
-calendar_config_set_default_reminder_units (CalUnits units)
-{
-	gconf_client_set_string (config, CALENDAR_CONFIG_DEFAULT_REMINDER_UNITS, units_to_string(units), NULL);
-}
-
-/**
- * calendar_config_get_hide_completed_tasks_sexp:
- *
- * Returns the subexpression to use to filter out completed tasks according
- * to the config settings. The returned sexp should be freed.
- **/
-char*
-calendar_config_get_hide_completed_tasks_sexp (void)
-{
-	char *sexp = NULL;
-
-	if (calendar_config_get_hide_completed_tasks ()) {
-		CalUnits units;
-		gint value;
-
-		units = calendar_config_get_hide_completed_tasks_units ();
-		value = calendar_config_get_hide_completed_tasks_value ();
-
-		if (value == 0) {
-			/* If the value is 0, we want to hide completed tasks
-			   immediately, so we filter out all completed tasks.*/
-			sexp = g_strdup ("(not is-completed?)");
-		} else {
-			char *isodate;
-			icaltimezone *zone;
-			struct icaltimetype tt;
-			time_t t;
-
-			/* Get the current time, and subtract the appropriate
-			   number of days/hours/minutes. */
-			zone = calendar_config_get_icaltimezone ();
-			tt = icaltime_current_time_with_zone (zone);
-
-			switch (units) {
-			case CAL_DAYS:
-				icaltime_adjust (&tt, -value, 0, 0, 0);
-				break;
-			case CAL_HOURS:
-				icaltime_adjust (&tt, 0, -value, 0, 0);
-				break;
-			case CAL_MINUTES:
-				icaltime_adjust (&tt, 0, 0, -value, 0);
-				break;
-			default:
-				g_assert_not_reached ();
-			}
-
-			t = icaltime_as_timet_with_zone (tt, zone);
-
-			/* Convert the time to an ISO date string, and build
-			   the query sub-expression. */
-			isodate = isodate_from_time_t (t);
-			sexp = g_strdup_printf ("(not (completed-before? (make-time \"%s\")))", isodate);
-		}
-	}
-
-	return sexp;
-}
-
-GSList *
-calendar_config_get_free_busy (void)
-{	
-	return gconf_client_get_list (config, CALENDAR_CONFIG_PUBLISH, 
-				      GCONF_VALUE_STRING, NULL);
-}
-
-void
-calendar_config_set_free_busy (GSList *url_list)
-{
-	gconf_client_set_list (config, CALENDAR_CONFIG_PUBLISH, 
-			       GCONF_VALUE_STRING, url_list, NULL);
-}
-
-gchar *
-calendar_config_get_free_busy_template (void)
-{
-	return gconf_client_get_string (config, CALENDAR_CONFIG_TEMPLATE, NULL);
-}
-
-void
-calendar_config_set_free_busy_template (const gchar *template)
-{
-	gconf_client_set_string (config, CALENDAR_CONFIG_TEMPLATE, template, NULL);
-}
-
-guint 
-calendar_config_add_notification_free_busy_template (GConfClientNotifyFunc func, 
-						     gpointer data)
-{
-	guint id;
-	
-	id = gconf_client_notify_add (config, CALENDAR_CONFIG_TEMPLATE, func, data, 
-				      NULL, NULL);
-	
-	return id;	
-}
diff --git a/calendar/gui/calendar-config.h b/calendar/gui/calendar-config.h
deleted file mode 100644
index 414e52b14f..0000000000
--- a/calendar/gui/calendar-config.h
+++ /dev/null
@@ -1,217 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-
-/*
- * Authors :
- *  Damon Chaplin <damon@ximian.com>
- *  Rodrigo Moya <rodrigo@ximian.com>
- *
- * Copyright 2000, Ximian, Inc.
- * Copyright 2000, Ximian, Inc.
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of version 2 of the GNU General Public
- * License as published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
- * USA
- */
-
-/*
- * calendar-config.h - functions to load/save/get/set user settings.
- */
-
-#ifndef _CALENDAR_CONFIG_H_
-#define _CALENDAR_CONFIG_H_
-
-#include <glib.h>
-#include <libecal/e-cal.h>
-#include <gconf/gconf-client.h>
-
-/* These are used to get/set the working days in the week. The bit-flags are
-   combined together. The bits must be from 0 (Sun) to 6 (Sat) to match the
-   day values used by localtime etc. */
-typedef enum
-{
-	CAL_SUNDAY	= 1 << 0,
-	CAL_MONDAY	= 1 << 1,
-	CAL_TUESDAY	= 1 << 2,
-	CAL_WEDNESDAY	= 1 << 3,
-	CAL_THURSDAY	= 1 << 4,
-	CAL_FRIDAY	= 1 << 5,
-	CAL_SATURDAY	= 1 << 6
-} CalWeekdays;
-
-
-/* Units for settings. */
-typedef enum
-{
-	CAL_DAYS,
-	CAL_HOURS,
-	CAL_MINUTES
-} CalUnits;
-
-
-void calendar_config_remove_notification (guint id);
-
-/*
- * Calendar Settings.
- */
-
-/* The current list of calendars selected */
-GSList   *calendar_config_get_calendars_selected (void);
-void	  calendar_config_set_calendars_selected (GSList *selected);
-guint	  calendar_config_add_notification_calendars_selected (GConfClientNotifyFunc func, gpointer data);
-
-/* The primary calendar */
-char     *calendar_config_get_primary_calendar (void);
-void	  calendar_config_set_primary_calendar (const char *primary_uid);
-guint	  calendar_config_add_notification_primary_calendar (GConfClientNotifyFunc func, gpointer data);
-
-/* The current timezone, e.g. "Europe/London". */
-gchar*	  calendar_config_get_timezone		(void);
-icaltimezone *calendar_config_get_icaltimezone (void);
-void	  calendar_config_set_timezone		(gchar	     *timezone);
-guint calendar_config_add_notification_timezone (GConfClientNotifyFunc func, gpointer data);
-
-/* The working days of the week, a bit-wise combination of flags. */
-CalWeekdays calendar_config_get_working_days	(void);
-void	  calendar_config_set_working_days	(CalWeekdays  days);
-guint calendar_config_add_notification_working_days (GConfClientNotifyFunc func, gpointer data);
-
-/* The start day of the week (0 = Sun to 6 = Sat). */
-gint	  calendar_config_get_week_start_day	(void);
-void	  calendar_config_set_week_start_day	(gint	      week_start_day);
-guint calendar_config_add_notification_week_start_day (GConfClientNotifyFunc func, gpointer data);
-
-/* The start and end times of the work-day. */
-gint	  calendar_config_get_day_start_hour	(void);
-void	  calendar_config_set_day_start_hour	(gint	      day_start_hour);
-guint calendar_config_add_notification_day_start_hour (GConfClientNotifyFunc func, gpointer data);
-
-gint	  calendar_config_get_day_start_minute	(void);
-void	  calendar_config_set_day_start_minute	(gint	      day_start_min);
-guint calendar_config_add_notification_day_start_minute (GConfClientNotifyFunc func, gpointer data);
-
-gint	  calendar_config_get_day_end_hour	(void);
-void	  calendar_config_set_day_end_hour	(gint	      day_end_hour);
-guint calendar_config_add_notification_day_end_hour (GConfClientNotifyFunc func, gpointer data);
-
-gint	  calendar_config_get_day_end_minute	(void);
-void	  calendar_config_set_day_end_minute	(gint	      day_end_min);
-guint calendar_config_add_notification_day_end_minute (GConfClientNotifyFunc func, gpointer data);
-
-/* Whether we use 24-hour format or 12-hour format (AM/PM). */
-gboolean  calendar_config_get_24_hour_format	(void);
-void	  calendar_config_set_24_hour_format	(gboolean     use_24_hour);
-guint calendar_config_add_notification_24_hour_format (GConfClientNotifyFunc func, gpointer data);
-
-/* The time divisions in the Day/Work-Week view in minutes (5/10/15/30/60). */
-gint	  calendar_config_get_time_divisions	(void);
-void	  calendar_config_set_time_divisions	(gint	      divisions);
-guint calendar_config_add_notification_time_divisions (GConfClientNotifyFunc func, gpointer data);
-
-/* Whether we show event end times. */
-gboolean  calendar_config_get_show_event_end	(void);
-void	  calendar_config_set_show_event_end	(gboolean     show_end);
-guint calendar_config_add_notification_show_event_end (GConfClientNotifyFunc func, gpointer data);
-
-/* Whether we compress the weekend in the week/month views. */
-gboolean  calendar_config_get_compress_weekend	(void);
-void	  calendar_config_set_compress_weekend	(gboolean     compress);
-guint calendar_config_add_notification_compress_weekend (GConfClientNotifyFunc func, gpointer data);
-
-/* Whether we show week numbers in the Date Navigator. */
-gboolean  calendar_config_get_dnav_show_week_no	(void);
-void	  calendar_config_set_dnav_show_week_no	(gboolean     show_week_no);
-guint calendar_config_add_notification_dnav_show_week_no (GConfClientNotifyFunc func, gpointer data);
-
-/* The positions of the panes in the normal and month views. */
-gint      calendar_config_get_hpane_pos		(void);
-void	  calendar_config_set_hpane_pos		(gint	      hpane_pos);
-
-gint      calendar_config_get_vpane_pos		(void);
-void	  calendar_config_set_vpane_pos		(gint	      vpane_pos);
-
-gint      calendar_config_get_month_hpane_pos	(void);
-void	  calendar_config_set_month_hpane_pos	(gint	      hpane_pos);
-
-gint      calendar_config_get_month_vpane_pos	(void);
-void	  calendar_config_set_month_vpane_pos	(gint	      vpane_pos);
-
-/* The current list of task lists selected */
-GSList   *calendar_config_get_tasks_selected (void);
-void	  calendar_config_set_tasks_selected (GSList *selected);
-guint	  calendar_config_add_notification_tasks_selected (GConfClientNotifyFunc func, gpointer data);
-
-/* The primary calendar */
-char     *calendar_config_get_primary_tasks (void);
-void	  calendar_config_set_primary_tasks (const char *primary_uid);
-guint	  calendar_config_add_notification_primary_tasks (GConfClientNotifyFunc func, gpointer data);
-
-/* The pane position */
-gint      calendar_config_get_task_vpane_pos    (void);
-void      calendar_config_set_task_vpane_pos    (gint         vpane_pos);
-
-/* Colors for the task list */
-const char *calendar_config_get_tasks_due_today_color	(void);
-void	    calendar_config_set_tasks_due_today_color	(const char *color);
-
-const char *calendar_config_get_tasks_overdue_color	(void);
-void	    calendar_config_set_tasks_overdue_color	(const char *color);
-
-/* Settings to hide completed tasks. */
-gboolean  calendar_config_get_hide_completed_tasks	(void);
-void	  calendar_config_set_hide_completed_tasks	(gboolean	hide);
-guint	  calendar_config_add_notification_hide_completed_tasks (GConfClientNotifyFunc func, gpointer data);
-
-CalUnits  calendar_config_get_hide_completed_tasks_units(void);
-void	  calendar_config_set_hide_completed_tasks_units(CalUnits	units);
-guint	  calendar_config_add_notification_hide_completed_tasks_units (GConfClientNotifyFunc func, gpointer data);
-
-gint	  calendar_config_get_hide_completed_tasks_value(void);
-void	  calendar_config_set_hide_completed_tasks_value(gint		value);
-guint	  calendar_config_add_notification_hide_completed_tasks_value (GConfClientNotifyFunc func, gpointer data);
-
-char*	  calendar_config_get_hide_completed_tasks_sexp (void);
-
-/* Confirmation options */
-gboolean  calendar_config_get_confirm_delete (void);
-void      calendar_config_set_confirm_delete (gboolean confirm);
-
-gboolean  calendar_config_get_confirm_purge (void);
-void      calendar_config_set_confirm_purge (gboolean confirm);
-
-/* Default reminder options */
-gboolean calendar_config_get_use_default_reminder (void);
-void     calendar_config_set_use_default_reminder (gboolean value);
-
-int      calendar_config_get_default_reminder_interval (void);
-void     calendar_config_set_default_reminder_interval (int interval);
-
-CalUnits calendar_config_get_default_reminder_units (void);
-void     calendar_config_set_default_reminder_units (CalUnits units);
-
-/* Free/Busy Settings */
-GSList * calendar_config_get_free_busy (void);
-void calendar_config_set_free_busy (GSList * url_list);
-
-gchar *calendar_config_get_free_busy_template (void);
-void calendar_config_set_free_busy_template (const gchar *template);
-guint calendar_config_add_notification_free_busy_template (GConfClientNotifyFunc func, 
-							   gpointer data);
-
-/* Shows the timezone dialog if the user hasn't set a default timezone. */
-void	  calendar_config_check_timezone_set	(void);
-
-/* Returns TRUE if the locale has 'am' and 'pm' strings defined, i.e. it
-   supports 12-hour time format. */
-gboolean  calendar_config_locale_supports_12_hour_format(void);
-
-#endif /* _CALENDAR_CONFIG_H_ */
diff --git a/calendar/gui/calendar-offline-handler.c b/calendar/gui/calendar-offline-handler.c
deleted file mode 100644
index 9126d49337..0000000000
--- a/calendar/gui/calendar-offline-handler.c
+++ /dev/null
@@ -1,348 +0,0 @@
-/* -*- Mode: C; indent-tabs-mode: t; c-basic-offset: 8; tab-width: 8 -*- */
-/* calendar-offline-handler.c
- *
- * Copyright (C) 2001  Ximian, Inc.
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of version 2 of the GNU General Public
- * License as published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * General Public License for more details.
- *
- * You should have received a copy of the GNU General Public
- * License along with this program; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
- *
- * Authors:
- *   Ettore Perazzoli <ettore@ximian.com>
- *   Dan Winship <danw@ximian.com>
- */
-
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
-
-#include <gtk/gtkmain.h>
-#include <gtk/gtksignal.h>
-#include <bonobo/bonobo-exception.h>
-#include <bonobo/bonobo-i18n.h>
-#include <libedataserver/e-url.h>
-#include <libecal/e-cal.h>
-#include "calendar-offline-handler.h"
-#include "common/authentication.h"
-
-#define PARENT_TYPE bonobo_object_get_type ()
-static BonoboObjectClass *parent_class = NULL;
-
-struct _CalendarOfflineHandlerPrivate {
-	ECal *client;
-
-	GNOME_Evolution_OfflineProgressListener listener_interface;
-
-	gboolean is_offline;	
-};
-
-static void
-add_connection (gpointer data, gpointer user_data)
-{
-	EUri *uri = e_uri_new (data);	
-	GNOME_Evolution_ConnectionList *list = user_data;
-
-	g_return_if_fail (uri != NULL);
-	
-	if (uri->host != NULL)
-		list->_buffer[list->_length].hostName = CORBA_string_dup (uri->host);
-	else
-		list->_buffer[list->_length].hostName = CORBA_string_dup ("Unknown");
-	if (uri->protocol != NULL)
-		list->_buffer[list->_length].type = CORBA_string_dup (uri->protocol);
-	else
-		list->_buffer[list->_length].type = CORBA_string_dup ("Unknown");
-	list->_length++;
-
-	e_uri_free (uri);
-}
-
-static GNOME_Evolution_ConnectionList *
-create_connection_list (CalendarOfflineHandler *offline_handler)
-{
-	CalendarOfflineHandlerPrivate *priv;
-	GNOME_Evolution_ConnectionList *list;
-	GList *uris;
-
-	priv = offline_handler->priv;
-
- 	uris = e_cal_uri_list (priv->client, CAL_MODE_REMOTE);	
-
-	list = GNOME_Evolution_ConnectionList__alloc ();
-	list->_length = 0;
-	list->_maximum = g_list_length (uris);
-	list->_buffer = CORBA_sequence_GNOME_Evolution_Connection_allocbuf (list->_maximum);
-
-	g_list_foreach (uris, add_connection, list);
-
-	return list;
-}
-
-/* GNOME::Evolution::Offline methods.  */
-static CORBA_boolean
-impl__get_isOffline (PortableServer_Servant servant,
-		     CORBA_Environment *ev)
-{
-	CalendarOfflineHandler *offline_handler;
-	CalendarOfflineHandlerPrivate *priv;
-	
-	offline_handler = CALENDAR_OFFLINE_HANDLER (bonobo_object_from_servant (servant));
-	priv = offline_handler->priv;
-
-	return priv->is_offline;
-}
-
-static void
-impl_prepareForOffline (PortableServer_Servant servant,
-			GNOME_Evolution_ConnectionList **active_connection_list,
-			CORBA_Environment *ev)
-{
-	CalendarOfflineHandler *offline_handler;
-	CalendarOfflineHandlerPrivate *priv;
-	
-	offline_handler = CALENDAR_OFFLINE_HANDLER (bonobo_object_from_servant (servant));
-	priv = offline_handler->priv;
-
-	*active_connection_list = create_connection_list (offline_handler);
-}
-
-static void
-update_offline (CalendarOfflineHandler *offline_handler)
-{
-	CalendarOfflineHandlerPrivate *priv;
-	GNOME_Evolution_ConnectionList *connection_list;
-	CORBA_Environment ev;
-
-	priv = offline_handler->priv;
-
-	connection_list = create_connection_list (offline_handler);
-
-	CORBA_exception_init (&ev);
-
-	GNOME_Evolution_OfflineProgressListener_updateProgress (priv->listener_interface, 
-								connection_list, &ev);
-
-	if (BONOBO_EX (&ev))
-		g_warning ("Error updating offline progress");
-
-	CORBA_exception_free (&ev);
-}
-
-static void
-backend_cal_set_mode (ECal *client, ECalSetModeStatus status, CalMode mode, gpointer data)
-{
-	CalendarOfflineHandler *offline_handler = data;
-
-	update_offline (offline_handler);
-	g_object_unref (client);
-}
-
-static void
-backend_cal_opened_offline (ECal *client, ECalendarStatus status, gpointer data)
-{
-	CalendarOfflineHandler *offline_handler = data;
-
-	if (status != E_CALENDAR_STATUS_OK) {
-		update_offline (offline_handler);
-		g_object_unref (client);
-		return;
-	}
-
-	g_signal_connect (client, "cal_set_mode", G_CALLBACK (backend_cal_set_mode), offline_handler);
-	e_cal_set_mode (client, CAL_MODE_LOCAL);
-}
-
-static void
-backend_cal_opened_online (ECal *client, ECalendarStatus status, gpointer data)
-{
-	if (status != E_CALENDAR_STATUS_OK) {
-		g_object_unref (client);
-		return;
-	}
-
-	e_cal_set_mode (client, CAL_MODE_REMOTE);
-	g_object_unref (client);
-}
-
-static void
-backend_go_offline (gpointer data, gpointer user_data)
-{
-	CalendarOfflineHandler *offline_handler = user_data;
-	char *uri = data;
-	ECal *client;
-	gboolean success;
-	GError *error = NULL;
-
-	/* FIXME This should not use LAST */
-	client = auth_new_cal_from_uri (uri, E_CAL_SOURCE_TYPE_LAST);
-	g_signal_connect (client, "cal_opened", G_CALLBACK (backend_cal_opened_offline), offline_handler);
-	success = e_cal_open (client, TRUE, &error);
-	if (!success) {
-		g_warning (G_STRLOC ": %s", error->message);
-		update_offline (offline_handler);
-		g_object_unref (client);
-		g_error_free (error);
-		return;		
-	}
-}
-
-static void
-backend_go_online (gpointer data, gpointer user_data)
-{
-	CalendarOfflineHandler *offline_handler = user_data;
-	char *uri = data;
-	ECal *client;
-	gboolean success;
-	GError *error = NULL;
-
-	/* FIXME This should not use LAST */	
-	client = auth_new_cal_from_uri (uri, E_CAL_SOURCE_TYPE_LAST);
-	g_signal_connect (G_OBJECT (client), "cal_opened", 
-			  G_CALLBACK (backend_cal_opened_online), offline_handler);
-	success = e_cal_open (client, TRUE, &error);
-	if (!success) {
-		g_warning (G_STRLOC ": %s", error->message);
-		g_object_unref (client);
-		g_error_free (error);
-		return;		
-	}	
-}
-
-static void
-impl_goOffline (PortableServer_Servant servant,
-		const GNOME_Evolution_OfflineProgressListener progress_listener,
-		CORBA_Environment *ev)
-{
-	CalendarOfflineHandler *offline_handler;
-	CalendarOfflineHandlerPrivate *priv;
-	GList *uris;
-	
-	offline_handler = CALENDAR_OFFLINE_HANDLER (bonobo_object_from_servant (servant));
-	priv = offline_handler->priv;
-
-	/* To update the status */
-	priv->listener_interface = CORBA_Object_duplicate (progress_listener, ev);
-
-	uris = e_cal_uri_list (priv->client, CAL_MODE_REMOTE);
-
-	g_list_foreach (uris, backend_go_offline, offline_handler);	
-}
-
-static void
-impl_goOnline (PortableServer_Servant servant,
-	       CORBA_Environment *ev)
-{
-	CalendarOfflineHandler *offline_handler;
-	CalendarOfflineHandlerPrivate *priv;
-	GList *uris;
-
-	offline_handler = CALENDAR_OFFLINE_HANDLER (bonobo_object_from_servant (servant));
-	priv = offline_handler->priv;
-
-	uris = e_cal_uri_list (priv->client, CAL_MODE_LOCAL);
-
-	g_list_foreach (uris, backend_go_online, offline_handler);
-}
-
-/* GObject methods.  */
-
-static void
-impl_dispose (GObject *object)
-{
-	CalendarOfflineHandler *offline_handler;
-	CalendarOfflineHandlerPrivate *priv;
-
-	offline_handler = CALENDAR_OFFLINE_HANDLER (object);
-	priv = offline_handler->priv;
-
-	if (priv->client) {
-		g_object_unref (priv->client);
-		priv->client = NULL;
-	}
-	
-	if (priv->listener_interface != CORBA_OBJECT_NIL) {
-		CORBA_Environment ev;
-
-		CORBA_exception_init (&ev);
-		CORBA_Object_release (priv->listener_interface, &ev);
-		CORBA_exception_free (&ev);
-
-		priv->listener_interface = CORBA_OBJECT_NIL;
-	}
-
-	if (G_OBJECT_CLASS (parent_class)->dispose)
-		(* G_OBJECT_CLASS (parent_class)->dispose) (object);
-}
-
-static void
-impl_finalize (GObject *object)
-{
-	CalendarOfflineHandler *offline_handler;
-	CalendarOfflineHandlerPrivate *priv;
-
-	offline_handler = CALENDAR_OFFLINE_HANDLER (object);
-	priv = offline_handler->priv;
-
-	g_free (priv);
-
-	if (G_OBJECT_CLASS (parent_class)->finalize)
-		(* G_OBJECT_CLASS (parent_class)->finalize) (object);
-}
-
-/* GTK+ type initialization.  */
-
-static void
-calendar_offline_handler_class_init (CalendarOfflineHandlerClass *klass)
-{
-	GObjectClass *object_class;
-	POA_GNOME_Evolution_Offline__epv *epv;
-
-	object_class = G_OBJECT_CLASS (klass);
-	object_class->dispose = impl_dispose;
-	object_class->finalize = impl_finalize;
-
-	epv = & klass->epv;
-	epv->_get_isOffline    = impl__get_isOffline;
-	epv->prepareForOffline = impl_prepareForOffline;
-	epv->goOffline         = impl_goOffline;
-	epv->goOnline          = impl_goOnline;
-
-	parent_class = gtk_type_class (PARENT_TYPE);
-}
-
-static void
-calendar_offline_handler_init (CalendarOfflineHandler *offline_handler)
-{
-	CalendarOfflineHandlerPrivate *priv;
-
-	priv = g_new (CalendarOfflineHandlerPrivate, 1);
-	offline_handler->priv = priv;
-
-	/* FIXME This should not use LAST */
-	/* FIXME: what URI to use? */
-	priv->client = auth_new_cal_from_uri ("", E_CAL_SOURCE_TYPE_LAST);
-	priv->listener_interface = CORBA_OBJECT_NIL;
-	priv->is_offline = FALSE;
-}
-
-CalendarOfflineHandler *
-calendar_offline_handler_new (void)
-{
-	CalendarOfflineHandler *new;
-
-	new = g_object_new (calendar_offline_handler_get_type (), NULL);
-	
-	return new;
-}
-
-BONOBO_TYPE_FUNC_FULL (CalendarOfflineHandler, GNOME_Evolution_Offline, PARENT_TYPE, calendar_offline_handler);
diff --git a/calendar/gui/calendar-offline-handler.h b/calendar/gui/calendar-offline-handler.h
deleted file mode 100644
index 3cc61b4f25..0000000000
--- a/calendar/gui/calendar-offline-handler.h
+++ /dev/null
@@ -1,69 +0,0 @@
-/* -*- Mode: C; indent-tabs-mode: t; c-basic-offset: 8; tab-width: 8 -*- */
-/* calendar-offline-handler.h
- *
- * Copyright (C) 2001  Ximian, Inc.
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of version 2 of the GNU General Public
- * License as published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * General Public License for more details.
- *
- * You should have received a copy of the GNU General Public
- * License along with this program; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
- *
- * Author: Ettore Perazzoli <ettore@ximian.com>
- */
-
-#ifndef _CALENDAR_OFFLINE_HANDLER_H_
-#define _CALENDAR_OFFLINE_HANDLER_H_
-
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
-
-#include <bonobo/bonobo-object.h>
-#include "Evolution.h"
-
-#ifdef __cplusplus
-extern "C" {
-#pragma }
-#endif /* __cplusplus */
-
-#define CALENDAR_TYPE_OFFLINE_HANDLER			(calendar_offline_handler_get_type ())
-#define CALENDAR_OFFLINE_HANDLER(obj)			(GTK_CHECK_CAST ((obj), CALENDAR_TYPE_OFFLINE_HANDLER, CalendarOfflineHandler))
-#define CALENDAR_OFFLINE_HANDLER_CLASS(klass)		(GTK_CHECK_CLASS_CAST ((klass), CALENDAR_TYPE_OFFLINE_HANDLER, CalendarOfflineHandlerClass))
-#define CALENDAR_IS_OFFLINE_HANDLER(obj)			(GTK_CHECK_TYPE ((obj), CALENDAR_TYPE_OFFLINE_HANDLER))
-#define CALENDAR_IS_OFFLINE_HANDLER_CLASS(klass)		(GTK_CHECK_CLASS_TYPE ((obj), CALENDAR_TYPE_OFFLINE_HANDLER))
-
-
-typedef struct _CalendarOfflineHandler        CalendarOfflineHandler;
-typedef struct _CalendarOfflineHandlerPrivate CalendarOfflineHandlerPrivate;
-typedef struct _CalendarOfflineHandlerClass   CalendarOfflineHandlerClass;
-
-struct _CalendarOfflineHandler {
-	BonoboObject parent;
-
-	CalendarOfflineHandlerPrivate *priv;
-};
-
-struct _CalendarOfflineHandlerClass {
-	BonoboObjectClass parent_class;
-
-	POA_GNOME_Evolution_Offline__epv epv;
-};
-
-
-GtkType             calendar_offline_handler_get_type  (void);
-CalendarOfflineHandler *calendar_offline_handler_new       (void);
-
-#ifdef __cplusplus
-}
-#endif /* __cplusplus */
-
-#endif /* _CALENDAR_OFFLINE_HANDLER_H_ */
diff --git a/calendar/gui/calendar-view-factory.c b/calendar/gui/calendar-view-factory.c
deleted file mode 100644
index 2fced5476c..0000000000
--- a/calendar/gui/calendar-view-factory.c
+++ /dev/null
@@ -1,213 +0,0 @@
-/* Evolution calendar - Generic view factory for calendar views
- *
- * Copyright (C) 2001 Ximian, Inc.
- *
- * Author: Federico Mena-Quintero <federico@ximian.com>
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of version 2 of the GNU General Public
- * License as published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307, USA.
- */
-
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
-
-#include <glib.h>
-#include <libgnome/gnome-i18n.h>
-#include "calendar-view-factory.h"
-#include "calendar-view.h"
-
-
-
-/* Private part of the CalendarViewFactory structure */
-struct _CalendarViewFactoryPrivate {
-	/* Type of views created by this factory */
-	GnomeCalendarViewType view_type;
-};
-
-
-
-static void calendar_view_factory_finalize (GObject *object);
-
-static const char *calendar_view_factory_get_title (GalViewFactory *factory);
-static const char *calendar_view_factory_get_type_code (GalViewFactory *factory);
-static GalView *calendar_view_factory_new_view (GalViewFactory *factory, const char *name);
-
-G_DEFINE_TYPE (CalendarViewFactory, calendar_view_factory, GAL_VIEW_FACTORY_TYPE);
-
-/* Class initialization function for the calendar view factory */
-static void
-calendar_view_factory_class_init (CalendarViewFactoryClass *class)
-{
-	GalViewFactoryClass *gal_view_factory_class;
-	GObjectClass *gobject_class;
-
-	gal_view_factory_class = (GalViewFactoryClass *) class;
-	gobject_class = (GObjectClass *) class;
-
-	gal_view_factory_class->get_title = calendar_view_factory_get_title;
-	gal_view_factory_class->get_type_code = calendar_view_factory_get_type_code;
-	gal_view_factory_class->new_view = calendar_view_factory_new_view;
-
-	gobject_class->finalize = calendar_view_factory_finalize;
-}
-
-/* Object initialization class for the calendar view factory */
-static void
-calendar_view_factory_init (CalendarViewFactory *cal_view_factory)
-{
-	CalendarViewFactoryPrivate *priv;
-
-	priv = g_new0 (CalendarViewFactoryPrivate, 1);
-	cal_view_factory->priv = priv;
-}
-
-/* Finalize method for the calendar view factory */
-static void
-calendar_view_factory_finalize (GObject *object)
-{
-	CalendarViewFactory *cal_view_factory;
-	CalendarViewFactoryPrivate *priv;
-
-	g_return_if_fail (object != NULL);
-	g_return_if_fail (IS_CALENDAR_VIEW_FACTORY (object));
-
-	cal_view_factory = CALENDAR_VIEW_FACTORY (object);
-	priv = cal_view_factory->priv;
-
-	g_free (priv);
-	cal_view_factory->priv = NULL;
-
-	if (G_OBJECT_CLASS (calendar_view_factory_parent_class)->finalize)
-		(* G_OBJECT_CLASS (calendar_view_factory_parent_class)->finalize) (object);
-}
-
-
-
-/* get_title method for the calendar view factory */
-static const char *
-calendar_view_factory_get_title (GalViewFactory *factory)
-{
-	CalendarViewFactory *cal_view_factory;
-	CalendarViewFactoryPrivate *priv;
-
-	cal_view_factory = CALENDAR_VIEW_FACTORY (factory);
-	priv = cal_view_factory->priv;
-
-	switch (priv->view_type) {
-	case GNOME_CAL_DAY_VIEW:
-		return _("Day View");
-
-	case GNOME_CAL_WORK_WEEK_VIEW:
-		return _("Work Week View");
-
-	case GNOME_CAL_WEEK_VIEW:
-		return _("Week View");
-
-	case GNOME_CAL_MONTH_VIEW:
-		return _("Month View");
-
-	default:
-		g_assert_not_reached ();
-		return NULL;
-	}
-}
-
-/* get_type_code method for the calendar view factory */
-static const char *
-calendar_view_factory_get_type_code (GalViewFactory *factory)
-{
-	CalendarViewFactory *cal_view_factory;
-	CalendarViewFactoryPrivate *priv;
-
-	cal_view_factory = CALENDAR_VIEW_FACTORY (factory);
-	priv = cal_view_factory->priv;
-
-	switch (priv->view_type) {
-	case GNOME_CAL_DAY_VIEW:
-		return "day_view";
-
-	case GNOME_CAL_WORK_WEEK_VIEW:
-		return "work_week_view";
-
-	case GNOME_CAL_WEEK_VIEW:
-		return "week_view";
-
-	case GNOME_CAL_MONTH_VIEW:
-		return "month_view";
-
-	default:
-		g_assert_not_reached ();
-		return NULL;
-	}
-}
-
-/* new_view method for the calendar view factory */
-static GalView *
-calendar_view_factory_new_view (GalViewFactory *factory, const char *name)
-{
-	CalendarViewFactory *cal_view_factory;
-	CalendarViewFactoryPrivate *priv;
-	CalendarView *cal_view;
-
-	cal_view_factory = CALENDAR_VIEW_FACTORY (factory);
-	priv = cal_view_factory->priv;
-
-	cal_view = calendar_view_new (priv->view_type, name);
-	return GAL_VIEW (cal_view);
-}
-
-
-
-/**
- * calendar_view_factory_construct:
- * @cal_view_factory: A calendar view factory.
- * @view_type: Type of calendar views that the factory will create.
- * 
- * Constructs a calendar view factory by setting the type of views it will
- * create.
- * 
- * Return value: The same value as @cal_view_factory.
- **/
-CalendarViewFactory *
-calendar_view_factory_construct (CalendarViewFactory *cal_view_factory,
-				 GnomeCalendarViewType view_type)
-{
-	CalendarViewFactoryPrivate *priv;
-
-	g_return_val_if_fail (cal_view_factory != NULL, NULL);
-	g_return_val_if_fail (IS_CALENDAR_VIEW_FACTORY (cal_view_factory), NULL);
-
-	priv = cal_view_factory->priv;
-
-	priv->view_type = view_type;
-
-	return cal_view_factory;
-}
-
-/**
- * calendar_view_factory_new:
- * @view_type: Type of calendar views that the factory will create.
- * 
- * Creates a new factory for calendar views.
- * 
- * Return value: A newly-created calendar view factory.
- **/
-CalendarViewFactory *
-calendar_view_factory_new (GnomeCalendarViewType view_type)
-{
-	CalendarViewFactory *cal_view_factory;
-
-	cal_view_factory = g_object_new (TYPE_CALENDAR_VIEW_FACTORY, NULL);
-	return calendar_view_factory_construct (cal_view_factory, view_type);
-}
diff --git a/calendar/gui/calendar-view-factory.h b/calendar/gui/calendar-view-factory.h
deleted file mode 100644
index 6d1de25590..0000000000
--- a/calendar/gui/calendar-view-factory.h
+++ /dev/null
@@ -1,64 +0,0 @@
-/* Evolution calendar - Generic view factory for calendar views
- *
- * Copyright (C) 2001 Ximian, Inc.
- *
- * Author: Federico Mena-Quintero <federico@ximian.com>
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of version 2 of the GNU General Public
- * License as published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307, USA.
- */
-
-#ifndef CALENDAR_VIEW_FACTORY_H
-#define CALENDAR_VIEW_FACTORY_H
-
-#include <gal/menus/gal-view-factory.h>
-#include "gnome-cal.h"
-
-G_BEGIN_DECLS
-
-
-
-#define TYPE_CALENDAR_VIEW_FACTORY            (calendar_view_factory_get_type ())
-#define CALENDAR_VIEW_FACTORY(obj)            (GTK_CHECK_CAST ((obj), TYPE_CALENDAR_VIEW_FACTORY,  \
-					       CalendarViewFactory))
-#define CALENDAR_VIEW_FACTORY_CLASS(klass)    (GTK_CHECK_CLASS_CAST ((klass),			   \
-					       TYPE_CALENDAR_VIEW_FACTORY, CalendarViewClass))
-#define IS_CALENDAR_VIEW_FACTORY(obj)         (GTK_CHECK_TYPE ((obj), TYPE_CALENDAR_VIEW_FACTORY))
-#define IS_CALENDAR_VIEW_FACTORY_CLASS(klass) (GTK_CHECK_CLASS_TYPE ((klass),			   \
-					       TYPE_CALENDAR_VIEW_FACTORY))
-
-typedef struct _CalendarViewFactoryPrivate CalendarViewFactoryPrivate;
-
-typedef struct {
-	GalViewFactory factory;
-
-	/* Private data */
-	CalendarViewFactoryPrivate *priv;
-} CalendarViewFactory;
-
-typedef struct {
-	GalViewFactoryClass parent_class;
-} CalendarViewFactoryClass;
-
-GtkType calendar_view_factory_get_type (void);
-
-CalendarViewFactory *calendar_view_factory_construct (CalendarViewFactory *cal_view_factory,
-						      GnomeCalendarViewType view_type);
-
-CalendarViewFactory *calendar_view_factory_new (GnomeCalendarViewType view_type);
-
-
-
-G_END_DECLS
-
-#endif
diff --git a/calendar/gui/calendar-view.c b/calendar/gui/calendar-view.c
deleted file mode 100644
index e3e39ea555..0000000000
--- a/calendar/gui/calendar-view.c
+++ /dev/null
@@ -1,271 +0,0 @@
-/* Evolution calendar - Generic view object for calendar views
- *
- * Copyright (C) 2001 Ximian, Inc.
- *
- * Author: Federico Mena-Quintero <federico@ximian.com>
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of version 2 of the GNU General Public
- * License as published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307, USA.
- */
-
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
-
-#include "calendar-view.h"
-
-
-
-/* Private part of the CalendarView structure */
-struct _CalendarViewPrivate {
-	/* Type of the view */
-	GnomeCalendarViewType view_type;
-
-	/* Title of the view */
-	char *title;
-};
-
-
-
-static void calendar_view_finalize (GObject *object);
-
-static void calendar_view_load (GalView *view, const char *filename);
-static void calendar_view_save (GalView *view, const char *filename);
-static const char *calendar_view_get_title (GalView *view);
-static void calendar_view_set_title (GalView *view, const char *title);
-static const char *calendar_view_get_type_code (GalView *view);
-static GalView *calendar_view_clone (GalView *view);
-
-G_DEFINE_TYPE (CalendarView, calendar_view, GAL_VIEW_TYPE);
-
-/* Class initialization function for the calendar view */
-static void
-calendar_view_class_init (CalendarViewClass *class)
-{
-	GalViewClass *gal_view_class;
-	GObjectClass *object_class;
-
-	gal_view_class = (GalViewClass *) class;
-	object_class = (GObjectClass *) class;
-
-	gal_view_class->edit = NULL;
-	gal_view_class->load = calendar_view_load;
-	gal_view_class->save = calendar_view_save;
-	gal_view_class->get_title = calendar_view_get_title;
-	gal_view_class->set_title = calendar_view_set_title;
-	gal_view_class->get_type_code = calendar_view_get_type_code;
-	gal_view_class->clone = calendar_view_clone;
-
-	object_class->finalize = calendar_view_finalize;
-}
-
-/* Object initialization function for the calendar view */
-static void
-calendar_view_init (CalendarView *cal_view)
-{
-	CalendarViewPrivate *priv;
-
-	priv = g_new0 (CalendarViewPrivate, 1);
-	cal_view->priv = priv;
-
-	priv->title = NULL;
-}
-
-/* Destroy method for the calendar view */
-static void
-calendar_view_finalize (GObject *object)
-{
-	CalendarView *cal_view;
-	CalendarViewPrivate *priv;
-
-	g_return_if_fail (object != NULL);
-	g_return_if_fail (IS_CALENDAR_VIEW (object));
-
-	cal_view = CALENDAR_VIEW (object);
-	priv = cal_view->priv;
-
-	if (priv->title) {
-		g_free (priv->title);
-		priv->title = NULL;
-	}
-
-	g_free (priv);
-	cal_view->priv = NULL;
-
-	if (G_OBJECT_CLASS (calendar_view_parent_class)->finalize)
-		(* G_OBJECT_CLASS (calendar_view_parent_class)->finalize) (object);
-}
-
-
-
-/* load method of the calendar view */
-static void
-calendar_view_load (GalView *view, const char *filename)
-{
-	/* nothing */
-}
-
-/* save method of the calendar view */
-static void
-calendar_view_save (GalView *view, const char *filename)
-{
-	/* nothing */
-}
-
-/* get_title method of the calendar view */
-static const char *
-calendar_view_get_title (GalView *view)
-{
-	CalendarView *cal_view;
-	CalendarViewPrivate *priv;
-
-	cal_view = CALENDAR_VIEW (view);
-	priv = cal_view->priv;
-
-	return (const char *) priv->title;
-}
-
-/* set_title method of the calendar view */
-static void
-calendar_view_set_title (GalView *view, const char *title)
-{
-	CalendarView *cal_view;
-	CalendarViewPrivate *priv;
-
-	cal_view = CALENDAR_VIEW (view);
-	priv = cal_view->priv;
-
-	if (priv->title)
-		g_free (priv->title);
-
-	priv->title = g_strdup (title);
-}
-
-/* get_type_code method for the calendar view */
-static const char *
-calendar_view_get_type_code (GalView *view)
-{
-	CalendarView *cal_view;
-	CalendarViewPrivate *priv;
-
-	cal_view = CALENDAR_VIEW (view);
-	priv = cal_view->priv;
-
-	switch (priv->view_type) {
-	case GNOME_CAL_DAY_VIEW:
-		return "day_view";
-
-	case GNOME_CAL_WORK_WEEK_VIEW:
-		return "work_week_view";
-
-	case GNOME_CAL_WEEK_VIEW:
-		return "week_view";
-
-	case GNOME_CAL_MONTH_VIEW:
-		return "month_view";
-
-	default:
-		g_assert_not_reached ();
-		return NULL;
-	}
-}
-
-/* clone method for the calendar view */
-static GalView *
-calendar_view_clone (GalView *view)
-{
-	CalendarView *cal_view;
-	CalendarViewPrivate *priv;
-	CalendarView *new_view;
-	CalendarViewPrivate *new_priv;
-
-	cal_view = CALENDAR_VIEW (view);
-	priv = cal_view->priv;
-
-	new_view = g_object_new (TYPE_CALENDAR_VIEW, NULL);
-	new_priv = new_view->priv;
-
-	new_priv->view_type = priv->view_type;
-	new_priv->title = g_strdup (priv->title);
-
-	return GAL_VIEW (new_view);
-}
-
-
-
-/**
- * calendar_view_construct:
- * @cal_view: A calendar view.
- * @view_type: The type of calendar view that this object will represent.
- * @title: Title for the view.
- * 
- * Constructs a calendar view by setting its view type and title.
- * 
- * Return value: The same value as @cal_view.
- **/
-CalendarView *
-calendar_view_construct (CalendarView *cal_view,
-			 GnomeCalendarViewType view_type,
-			 const char *title)
-{
-	CalendarViewPrivate *priv;
-
-	g_return_val_if_fail (cal_view != NULL, NULL);
-	g_return_val_if_fail (IS_CALENDAR_VIEW (cal_view), NULL);
-	g_return_val_if_fail (title != NULL, NULL);
-
-	priv = cal_view->priv;
-
-	priv->view_type = view_type;
-	priv->title = g_strdup (title);
-
-	return cal_view;
-}
-
-/**
- * calendar_view_new:
- * @view_type: The type of calendar view that this object will represent.
- * @title: Title for the view.
- * 
- * Creates a new calendar view object.
- * 
- * Return value: A newly-created calendar view.
- **/
-CalendarView *
-calendar_view_new (GnomeCalendarViewType view_type, const char *title)
-{
-	CalendarView *cal_view;
-
-	cal_view = g_object_new (TYPE_CALENDAR_VIEW, NULL);
-	return calendar_view_construct (cal_view, view_type, title);
-}
-
-/**
- * calendar_view_get_view_type:
- * @cal_view: A calendar view.
- * 
- * Queries the calendar view type of a calendar view.
- * 
- * Return value: Type of calendar view.
- **/
-GnomeCalendarViewType
-calendar_view_get_view_type (CalendarView *cal_view)
-{
-	CalendarViewPrivate *priv;
-
-	g_return_val_if_fail (cal_view != NULL, GNOME_CAL_DAY_VIEW);
-	g_return_val_if_fail (IS_CALENDAR_VIEW (cal_view), GNOME_CAL_DAY_VIEW);
-
-	priv = cal_view->priv;
-	return priv->view_type;
-}
diff --git a/calendar/gui/calendar-view.h b/calendar/gui/calendar-view.h
deleted file mode 100644
index 8b85966a90..0000000000
--- a/calendar/gui/calendar-view.h
+++ /dev/null
@@ -1,66 +0,0 @@
-/* Evolution calendar - Generic view object for calendar views
- *
- * Copyright (C) 2001 Ximian, Inc.
- *
- * Author: Federico Mena-Quintero <federico@ximian.com>
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of version 2 of the GNU General Public
- * License as published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307, USA.
- */
-
-#ifndef CALENDAR_VIEW_H
-#define CALENDAR_VIEW_H
-
-#include <gal/menus/gal-view.h>
-#include "gnome-cal.h"
-
-G_BEGIN_DECLS
-
-
-
-#define TYPE_CALENDAR_VIEW            (calendar_view_get_type ())
-#define CALENDAR_VIEW(obj)            (GTK_CHECK_CAST ((obj), TYPE_CALENDAR_VIEW, CalendarView))
-#define CALENDAR_VIEW_CLASS(klass)    (GTK_CHECK_CLASS_CAST ((klass), TYPE_CALENDAR_VIEW,      	\
-				       CalendarViewClass))
-#define IS_CALENDAR_VIEW(obj)         (GTK_CHECK_TYPE ((obj), TYPE_CALENDAR_VIEW))
-#define IS_CALENDAR_VIEW_CLASS(klass) (GTK_CHECK_CLASS_TYPE ((klass), TYPE_CALENDAR_VIEW))
-
-typedef struct _CalendarViewPrivate CalendarViewPrivate;
-
-typedef struct {
-	GalView view;
-
-	/* Private data */
-	CalendarViewPrivate *priv;
-} CalendarView;
-
-typedef struct {
-	GalViewClass parent_class;
-} CalendarViewClass;
-
-GtkType calendar_view_get_type (void);
-
-CalendarView *calendar_view_construct (CalendarView *cal_view,
-				       GnomeCalendarViewType view_type,
-				       const char *title);
-
-CalendarView *calendar_view_new (GnomeCalendarViewType view_type,
-				 const char *title);
-
-GnomeCalendarViewType calendar_view_get_view_type (CalendarView *cal_view);
-
-
-
-G_END_DECLS
-
-#endif
diff --git a/calendar/gui/comp-editor-factory.c b/calendar/gui/comp-editor-factory.c
deleted file mode 100644
index 62d24f4467..0000000000
--- a/calendar/gui/comp-editor-factory.c
+++ /dev/null
@@ -1,647 +0,0 @@
-/* Evolution calendar - Component editor factory object
- *
- * Copyright (C) 2001 Ximian, Inc.
- *
- * Authors: Federico Mena-Quintero <federico@ximian.com>
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of version 2 of the GNU General Public
- * License as published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307, USA.
- */
-
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
-
-#include <gtk/gtkmessagedialog.h>
-#include <bonobo/bonobo-exception.h>
-#include <bonobo/bonobo-i18n.h>
-#include <evolution-calendar.h>
-#include <libedataserver/e-url.h>
-#include <libecal/e-cal.h>
-#include "calendar-config.h"
-#include "e-comp-editor-registry.h"
-#include "comp-editor-factory.h"
-#include "comp-util.h"
-#include "common/authentication.h"
-#include "dialogs/event-editor.h"
-#include "dialogs/task-editor.h"
-
-extern ECompEditorRegistry *comp_editor_registry;
-
-
-
-/* A pending request */
-
-typedef enum {
-	REQUEST_EXISTING,
-	REQUEST_NEW
-} RequestType;
-
-typedef struct {
-	RequestType type;
-
-	union {
-		struct {
-			char *uid;
-		} existing;
-
-		struct {
-			 GNOME_Evolution_Calendar_CompEditorFactory_CompEditorMode type;
-		} new;
-	} u;
-} Request;
-
-/* A client we have open */
-typedef struct {
-	/* Our parent CompEditorFactory */
-	CompEditorFactory *factory;
-
-	/* Uri of the calendar, used as key in the clients hash table */
-	char *uri;
-
-	/* Client of the calendar */
-	ECal *client;
- 
-	/* Count editors using this client */
-	int editor_count;
-
-	/* Pending requests; they are pending if the client is still being opened */
-	GSList *pending;
-
-	/* Whether this is open or still waiting */
-	guint open : 1;
-} OpenClient;
-
-/* Private part of the CompEditorFactory structure */
-struct CompEditorFactoryPrivate {
-	/* Hash table of URI->OpenClient */
-	GHashTable *uri_client_hash;
-};
-
-
-
-static void comp_editor_factory_class_init (CompEditorFactoryClass *class);
-static void comp_editor_factory_init (CompEditorFactory *factory);
-static void comp_editor_factory_finalize (GObject *object);
-
-static void impl_editExisting (PortableServer_Servant servant,
-			       const CORBA_char *str_uri,
-			       const CORBA_char *uid,
-			       const GNOME_Evolution_Calendar_CompEditorFactory_CompEditorMode corba_type,
-			       CORBA_Environment *ev);
-static void impl_editNew (PortableServer_Servant servant,
-			  const CORBA_char *str_uri,
-			  const GNOME_Evolution_Calendar_CalObjType type,
-			  CORBA_Environment *ev);
-
-static BonoboObjectClass *parent_class = NULL;
-
-
-
-BONOBO_TYPE_FUNC_FULL (CompEditorFactory,
-		       GNOME_Evolution_Calendar_CompEditorFactory,
-		       BONOBO_OBJECT_TYPE,
-		       comp_editor_factory);
-
-/* Class initialization function for the component editor factory */
-static void
-comp_editor_factory_class_init (CompEditorFactoryClass *class)
-{
-	GObjectClass *object_class;
-
-	object_class = (GObjectClass *) class;
-
-	parent_class = g_type_class_peek_parent (class);
-
-	class->epv.editExisting = impl_editExisting;
-	class->epv.editNew = impl_editNew;
-
-	object_class->finalize = comp_editor_factory_finalize;
-}
-
-/* Object initialization function for the component editor factory */
-static void
-comp_editor_factory_init (CompEditorFactory *factory)
-{
-	CompEditorFactoryPrivate *priv;
-
-	priv = g_new (CompEditorFactoryPrivate, 1);
-	factory->priv = priv;
-
-	priv->uri_client_hash = g_hash_table_new (g_str_hash, g_str_equal);
-}
-
-/* Frees a Request structure */
-static void
-free_request (Request *r)
-{
-	if (r->type == REQUEST_EXISTING) {
-		g_assert (r->u.existing.uid != NULL);
-		g_free (r->u.existing.uid);
-	}
-
-	g_free (r);
-}
-
-/* Frees an OpenClient structure */
-static void
-free_client (OpenClient *oc)
-{
-	GSList *l;
-
-	g_free (oc->uri);
-	oc->uri = NULL;
-
-	g_object_unref (oc->client);
-	oc->client = NULL;
-
-	for (l = oc->pending; l; l = l->next) {
-		Request *r;
-
-		r = l->data;
-		free_request (r);
-	}
-	g_slist_free (oc->pending);
-	oc->pending = NULL;
-
-	g_free (oc);
-}
-
-/* Used from g_hash_table_foreach(); frees a client structure */
-static void
-free_client_cb (gpointer key, gpointer value, gpointer data)
-{
-	OpenClient *oc;
-
-	oc = value;
-	free_client (oc);
-}
-
-/* Destroy handler for the component editor factory */
-static void
-comp_editor_factory_finalize (GObject *object)
-{
-	CompEditorFactory *factory;
-	CompEditorFactoryPrivate *priv;
-
-	g_return_if_fail (object != NULL);
-	g_return_if_fail (IS_COMP_EDITOR_FACTORY (object));
-
-	factory = COMP_EDITOR_FACTORY (object);
-	priv = factory->priv;
-
-	g_hash_table_foreach (priv->uri_client_hash, free_client_cb, NULL);
-	g_hash_table_destroy (priv->uri_client_hash);
-	priv->uri_client_hash = NULL;
-
-	g_free (priv);
-	factory->priv = NULL;
-
-	if (G_OBJECT_CLASS (parent_class)->finalize)
-		(* G_OBJECT_CLASS (parent_class)->finalize) (object);
-}
-
-
-
-/* Callback used when a component editor gets destroyed */
-static void
-editor_destroy_cb (GtkObject *object, gpointer data)
-{
-	OpenClient *oc;
-	CompEditorFactory *factory;
-	CompEditorFactoryPrivate *priv;
-
-	oc = data;
-	factory = oc->factory;
-	priv = factory->priv;
-
-	oc->editor_count--;
-
-	/* See if we need to free the client */
-	g_assert (oc->pending == NULL);
-
-	if (oc->editor_count != 0)
-		return;
-
-	g_hash_table_remove (priv->uri_client_hash, oc->uri);
-	free_client (oc);
-}
-
-/* Starts editing an existing component on a client that is already open */
-static void
-edit_existing (OpenClient *oc, const char *uid)
-{
-	ECalComponent *comp;
-	icalcomponent *icalcomp;
-	CompEditor *editor;
-	ECalComponentVType vtype;
-
-	g_assert (oc->open);
-
-	/* Get the object */
-	if (!e_cal_get_object (oc->client, uid, NULL, &icalcomp, NULL)) {
-		/* FIXME Better error handling */
-		g_warning (G_STRLOC ": Syntax error while getting component `%s'", uid);
-
-		return;
-	}
-	
-	comp = e_cal_component_new ();
-	if (!e_cal_component_set_icalcomponent (comp, icalcomp)) {
-		g_object_unref (comp);
-		icalcomponent_free (icalcomp);
-		return;
-	}
-	
-	/* Create the appropriate type of editor */
-	
-	vtype = e_cal_component_get_vtype (comp);
-
-	switch (vtype) {
-	case E_CAL_COMPONENT_EVENT:
-		editor = COMP_EDITOR (event_editor_new (oc->client, e_cal_component_has_attendees (comp)));
-		break;
-
-	case E_CAL_COMPONENT_TODO:
-		editor = COMP_EDITOR (task_editor_new (oc->client, e_cal_component_has_attendees (comp)));
-		break;
-
-	default:
-		g_message ("edit_exiting(): Unsupported object type %d", (int) vtype);
-		g_object_unref (comp);
-		return;
-	}
-
-	/* Set the object on the editor */
-	comp_editor_edit_comp (editor, comp);
-	comp_editor_focus (editor);
-
-	oc->editor_count++;
-	g_signal_connect (editor, "destroy", G_CALLBACK (editor_destroy_cb), oc);
-
-	e_comp_editor_registry_add (comp_editor_registry, editor, TRUE);
-}
-
-static ECalComponent *
-get_default_task (ECal *client)
-{
-	ECalComponent *comp;
-	
-	comp = cal_comp_task_new_with_defaults (client);
-
-	return comp;
-}
-
-/* Edits a new object in the context of a client */
-static void
-edit_new (OpenClient *oc, const GNOME_Evolution_Calendar_CompEditorFactory_CompEditorMode type)
-{
-	ECalComponent *comp;
-	CompEditor *editor;
-	
-	switch (type) {
-	case GNOME_Evolution_Calendar_CompEditorFactory_EDITOR_MODE_EVENT:
-		editor = COMP_EDITOR (event_editor_new (oc->client, FALSE));
-		comp = cal_comp_event_new_with_current_time (oc->client, FALSE);
-		break;
-	case GNOME_Evolution_Calendar_CompEditorFactory_EDITOR_MODE_MEETING:
-		editor = COMP_EDITOR (event_editor_new (oc->client, TRUE));
-		comp = cal_comp_event_new_with_current_time (oc->client, FALSE);
-		break;
-	case GNOME_Evolution_Calendar_CompEditorFactory_EDITOR_MODE_ALLDAY_EVENT:
-		editor = COMP_EDITOR (event_editor_new (oc->client, FALSE));
-		comp = cal_comp_event_new_with_current_time (oc->client, TRUE);
-		break;
-	case GNOME_Evolution_Calendar_CompEditorFactory_EDITOR_MODE_TODO:
-		editor = COMP_EDITOR (task_editor_new (oc->client, FALSE));
-		comp = get_default_task (oc->client);
-		break;
-	default:
-		g_assert_not_reached ();
-		return;
-	}
-
-	comp_editor_edit_comp (editor, comp);
-	if (type == GNOME_Evolution_Calendar_CompEditorFactory_EDITOR_MODE_MEETING)
-		event_editor_show_meeting (EVENT_EDITOR (editor));
-	comp_editor_focus (editor);
-
-	oc->editor_count++;
-	g_signal_connect (editor, "destroy", G_CALLBACK (editor_destroy_cb), oc);
-
-	e_comp_editor_registry_add (comp_editor_registry, editor, TRUE);
-}
-
-/* Resolves all the pending requests for a client */
-static void
-resolve_pending_requests (OpenClient *oc)
-{
-	CompEditorFactory *factory;
-	CompEditorFactoryPrivate *priv;
-	GSList *l;
-	icaltimezone *zone;
-
-	factory = oc->factory;
-	priv = factory->priv;
-
-	if (!oc->pending)
-		return;
-
-	/* Set the default timezone in the backend. */
-	zone = calendar_config_get_icaltimezone ();
-
-	/* FIXME Error handling? */
-	e_cal_set_default_timezone (oc->client, zone, NULL);
-
-	for (l = oc->pending; l; l = l->next) {
-		Request *request;
-
-		request = l->data;
-
-		switch (request->type) {
-		case REQUEST_EXISTING:
-			edit_existing (oc, request->u.existing.uid);
-			break;
-
-		case REQUEST_NEW:
-			edit_new (oc, request->u.new.type);
-			break;
-		}
-
-		free_request (request);
-	}
-
-	g_slist_free (oc->pending);
-	oc->pending = NULL;
-}
-
-/* Callback used when a client is finished opening.  We resolve all the pending
- * requests.
- */
-static void
-cal_opened_cb (ECal *client, ECalendarStatus status, gpointer data)
-{
-	OpenClient *oc;
-	CompEditorFactory *factory;
-	CompEditorFactoryPrivate *priv;
-	GtkWidget *dialog = NULL;
-
-	oc = data;
-	factory = oc->factory;
-	priv = factory->priv;
-
-	switch (status) {
-	case E_CALENDAR_STATUS_OK:
-		oc->open = TRUE;
-		resolve_pending_requests (oc);
-		return;
-
-	case E_CALENDAR_STATUS_OTHER_ERROR:
-	case E_CALENDAR_STATUS_NO_SUCH_CALENDAR:
-		dialog = gtk_message_dialog_new (NULL, GTK_DIALOG_MODAL,
-						 GTK_MESSAGE_ERROR, GTK_BUTTONS_CLOSE,
-						 _("Error while opening the calendar"));
-		break;
-
-	case E_CALENDAR_STATUS_PROTOCOL_NOT_SUPPORTED:
-		dialog = gtk_message_dialog_new (NULL, GTK_DIALOG_MODAL,
-						 GTK_MESSAGE_ERROR, GTK_BUTTONS_CLOSE,
-						 _("Method not supported when opening the calendar"));
-		break;
-
-	case E_CALENDAR_STATUS_PERMISSION_DENIED :
-		dialog = gtk_message_dialog_new (NULL, GTK_DIALOG_MODAL,
-						 GTK_MESSAGE_ERROR, GTK_BUTTONS_CLOSE,
-						 _("Permission denied to open the calendar"));
-		break;
-
-	case E_CALENDAR_STATUS_AUTHENTICATION_FAILED :
-		dialog = gtk_message_dialog_new (NULL, GTK_DIALOG_MODAL,
-						 GTK_MESSAGE_ERROR, GTK_BUTTONS_CLOSE,
-						 _("Authentication Failed"));
-		break;
-
-	default:
-		dialog = gtk_message_dialog_new (NULL, GTK_DIALOG_MODAL,
-						 GTK_MESSAGE_ERROR, GTK_BUTTONS_CLOSE,
-						 _("Unknown error"));
-		return;
-	}
-
-	gtk_dialog_run (GTK_DIALOG (dialog));
-	gtk_widget_destroy (dialog);
-
-	g_hash_table_remove (priv->uri_client_hash, oc->uri);
-	free_client (oc);
-}
-
-/* Creates a new OpenClient structure and queues the component editing/creation
- * process until the client is open.  Returns NULL if it could not issue the
- * open request.
- */
-static OpenClient *
-open_client (CompEditorFactory *factory, ECalSourceType source_type, const char *uristr)
-{
-	CompEditorFactoryPrivate *priv;
-	ECal *client;
-	OpenClient *oc;
-	GError *error = NULL;
-
-	priv = factory->priv;
-
-	client = auth_new_cal_from_uri (uristr, source_type);
-	if (!client)
-		return NULL;
-
-	oc = g_new (OpenClient, 1);
-	oc->factory = factory;
-
-	oc->uri = g_strdup (uristr);
-
-	oc->client = client;
-	oc->editor_count = 0;
-	oc->pending = NULL;
-	oc->open = FALSE;
-
-	g_signal_connect (oc->client, "cal_opened", G_CALLBACK (cal_opened_cb), oc);
-
-	g_hash_table_insert (priv->uri_client_hash, oc->uri, oc);
-
-	if (!e_cal_open (oc->client, FALSE, &error)) {
-		g_warning (G_STRLOC ": %s", error->message);
-		g_free (oc->uri);
-		g_object_unref (oc->client);
-		g_free (oc);
-		g_error_free (error);
-
-		return NULL;
-	}
-
-	return oc;
-}
-
-/* Looks up an open client or queues it for being opened.  Returns the client or
- * NULL on failure; in the latter case it sets the ev exception.
- */
-static OpenClient *
-lookup_open_client (CompEditorFactory *factory, ECalSourceType source_type, const char *str_uri, CORBA_Environment *ev)
-{
-	CompEditorFactoryPrivate *priv;
-	OpenClient *oc;
-	EUri *uri;
-
-	priv = factory->priv;
-
-	/* Look up the client */
-
-	uri = e_uri_new (str_uri);
-	if (!uri) {
-		bonobo_exception_set (ev, ex_GNOME_Evolution_Calendar_CompEditorFactory_InvalidURI);
-		return NULL;
-	}
-	e_uri_free (uri);
-
-	oc = g_hash_table_lookup (priv->uri_client_hash, str_uri);
-	if (!oc) {
-		oc = open_client (factory, source_type, str_uri);
-		if (!oc) {
-			bonobo_exception_set (ev, ex_GNOME_Evolution_Calendar_CompEditorFactory_BackendContactError);
-			return NULL;
-		}
-	}
-
-	return oc;
-}
-
-/* Queues a request for editing an existing object */
-static void
-queue_edit_existing (OpenClient *oc, const char *uid)
-{
-	Request *request;
-
-	g_assert (!oc->open);
-
-	request = g_new (Request, 1);
-	request->type = REQUEST_EXISTING;
-	request->u.existing.uid = g_strdup (uid);
-
-	oc->pending = g_slist_append (oc->pending, request);
-}
-
-/* ::editExisting() method implementation */
-static void
-impl_editExisting (PortableServer_Servant servant,
-		   const CORBA_char *str_uri,
-		   const CORBA_char *uid,
-		   const GNOME_Evolution_Calendar_CompEditorFactory_CompEditorMode corba_type,
-		   CORBA_Environment *ev)
-{
-	CompEditorFactory *factory;
-	CompEditorFactoryPrivate *priv;
-	OpenClient *oc;
-	CompEditor *editor;
-	ECalSourceType source_type;
-	
-	factory = COMP_EDITOR_FACTORY (bonobo_object_from_servant (servant));
-	priv = factory->priv;
-
-	switch (corba_type) {
-	case GNOME_Evolution_Calendar_CompEditorFactory_EDITOR_MODE_TODO:
-		source_type = E_CAL_SOURCE_TYPE_TODO;
-		break;
-	default:
-		source_type = E_CAL_SOURCE_TYPE_EVENT;
-	}
-	
-	oc = lookup_open_client (factory, source_type, str_uri, ev);
-	if (!oc)
-		return;
-
-	if (!oc->open) {
-		queue_edit_existing (oc, uid);
-		return;
-	}
-
-	/* Look up the component */
-	editor = e_comp_editor_registry_find (comp_editor_registry, uid);
-	if (editor == NULL) {
-		edit_existing (oc, uid);
-	} else {
-		comp_editor_focus (editor);
-	}
-}
-
-/* Queues a request for creating a new object */
-static void
-queue_edit_new (OpenClient *oc, const GNOME_Evolution_Calendar_CompEditorFactory_CompEditorMode type)
-{
-	Request *request;
-
-	g_assert (!oc->open);
-
-	request = g_new (Request, 1);
-	request->type = REQUEST_NEW;
-	request->u.new.type = type;
-
-	oc->pending = g_slist_append (oc->pending, request);
-}
-
-/* ::editNew() method implementation */
-static void
-impl_editNew (PortableServer_Servant servant,
-	      const CORBA_char *str_uri,
-	      const GNOME_Evolution_Calendar_CompEditorFactory_CompEditorMode corba_type,
-	      CORBA_Environment *ev)
-{
-	CompEditorFactory *factory;
-	CompEditorFactoryPrivate *priv;
-	OpenClient *oc;
-	ECalSourceType source_type;
-	
-	factory = COMP_EDITOR_FACTORY (bonobo_object_from_servant (servant));
-	priv = factory->priv;
-
-	switch (corba_type) {
-	case GNOME_Evolution_Calendar_CompEditorFactory_EDITOR_MODE_TODO:
-		source_type = E_CAL_SOURCE_TYPE_TODO;
-		break;
-	default:
-		source_type = E_CAL_SOURCE_TYPE_EVENT;
-	}
-
-	oc = lookup_open_client (factory, source_type, str_uri, ev);
-	if (!oc)
-		return;
-
-	if (!oc->open)
-		queue_edit_new (oc, corba_type);
-	else
-		edit_new (oc, corba_type);
-}
-
-
-
-/**
- * comp_editor_factory_new:
- * 
- * Creates a new calendar component editor factory.
- * 
- * Return value: A newly-created component editor factory.
- **/
-CompEditorFactory *
-comp_editor_factory_new (void)
-{
-	return g_object_new (TYPE_COMP_EDITOR_FACTORY, NULL);
-}
-
-
diff --git a/calendar/gui/comp-editor-factory.h b/calendar/gui/comp-editor-factory.h
deleted file mode 100644
index fca4573497..0000000000
--- a/calendar/gui/comp-editor-factory.h
+++ /dev/null
@@ -1,58 +0,0 @@
-/* Evolution calendar - Component editor factory object
- *
- * Copyright (C) 2001 Ximian, Inc.
- *
- * Authors: Federico Mena-Quintero <federico@ximian.com>
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of version 2 of the GNU General Public
- * License as published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307, USA.
- */
-
-#ifndef COMP_EDITOR_FACTORY_H
-#define COMP_EDITOR_FACTORY_H
-
-#include <bonobo/bonobo-object.h>
-#include "evolution-calendar.h"
-
-
-
-#define TYPE_COMP_EDITOR_FACTORY            (comp_editor_factory_get_type ())
-#define COMP_EDITOR_FACTORY(obj)            (GTK_CHECK_CAST ((obj), TYPE_COMP_EDITOR_FACTORY,	\
-					     CompEditorFactory))
-#define COMP_EDITOR_FACTORY_CLASS(klass)    (GTK_CHECK_CLASS_CAST ((klass),			\
-					     TYPE_COMP_EDITOR_FACTORY, CompEditorFactoryClass))
-#define IS_COMP_EDITOR_FACTORY(obj)         (GTK_CHECK_TYPE ((obj), TYPE_COMP_EDITOR_FACTORY))
-#define IS_COMP_EDITOR_FACTORY_CLASS(klass) (GTK_CHECK_CLASS_TYPE ((klass), TYPE_COMP_EDITOR_FACTORY))
-
-typedef struct CompEditorFactoryPrivate CompEditorFactoryPrivate;
-
-typedef struct {
-	BonoboObject object;
-
-	/* Private data */
-	CompEditorFactoryPrivate *priv;
-} CompEditorFactory;
-
-typedef struct {
-	BonoboObjectClass parent_class;
-
-	POA_GNOME_Evolution_Calendar_CompEditorFactory__epv epv;
-} CompEditorFactoryClass;
-
-GtkType comp_editor_factory_get_type (void);
-
-CompEditorFactory *comp_editor_factory_new (void);
-
-
-
-#endif
diff --git a/calendar/gui/comp-util.c b/calendar/gui/comp-util.c
deleted file mode 100644
index 0ee3e696bb..0000000000
--- a/calendar/gui/comp-util.c
+++ /dev/null
@@ -1,379 +0,0 @@
-/* Evolution calendar - Utilities for manipulating ECalComponent objects
- *
- * Copyright (C) 2000 Ximian, Inc.
- * Copyright (C) 2000 Ximian, Inc.
- *
- * Author: Federico Mena-Quintero <federico@ximian.com>
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of version 2 of the GNU General Public
- * License as published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307, USA.
- */
-
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
-
-#include <string.h>
-#include <time.h>
-#include "calendar-config.h"
-#include "comp-util.h"
-#include "dialogs/delete-comp.h"
-
-
-
-/**
- * cal_comp_util_add_exdate:
- * @comp: A calendar component object.
- * @itt: Time for the exception.
- * 
- * Adds an exception date to the current list of EXDATE properties in a calendar
- * component object.
- **/
-void
-cal_comp_util_add_exdate (ECalComponent *comp, time_t t, icaltimezone *zone)
-{
-	GSList *list;
-	ECalComponentDateTime *cdt;
-
-	g_return_if_fail (comp != NULL);
-	g_return_if_fail (E_IS_CAL_COMPONENT (comp));
-
-	e_cal_component_get_exdate_list (comp, &list);
-
-	cdt = g_new (ECalComponentDateTime, 1);
-	cdt->value = g_new (struct icaltimetype, 1);
-	*cdt->value = icaltime_from_timet_with_zone (t, FALSE, zone);
-	cdt->tzid = g_strdup (icaltimezone_get_tzid (zone));
-
-	list = g_slist_append (list, cdt);
-	e_cal_component_set_exdate_list (comp, list);
-	e_cal_component_free_exdate_list (list);
-}
-
-
-
-/* Returns TRUE if the TZIDs are equivalent, i.e. both NULL or the same. */
-static gboolean
-e_cal_component_compare_tzid (const char *tzid1, const char *tzid2)
-{
-	gboolean retval = TRUE;
-
-	if (tzid1) {
-		if (!tzid2 || strcmp (tzid1, tzid2))
-			retval = FALSE;
-	} else {
-		if (tzid2)
-			retval = FALSE;
-	}
-
-	return retval;
-}
-
-/**
- * cal_comp_util_compare_event_timezones:
- * @comp: A calendar component object.
- * @client: A #ECal.
- * 
- * Checks if the component uses the given timezone for both the start and
- * the end time, or if the UTC offsets of the start and end times are the same
- * as in the given zone.
- *
- * Returns: TRUE if the component's start and end time are at the same UTC
- * offset in the given timezone.
- **/
-gboolean
-cal_comp_util_compare_event_timezones (ECalComponent *comp,
-				       ECal *client,
-				       icaltimezone *zone)
-{
-	ECalComponentDateTime start_datetime, end_datetime;
-	const char *tzid;
-	gboolean retval = FALSE;
-	icaltimezone *start_zone, *end_zone;
-	int offset1, offset2;
-
-	tzid = icaltimezone_get_tzid (zone);
-
-	e_cal_component_get_dtstart (comp, &start_datetime);
-	e_cal_component_get_dtend (comp, &end_datetime);
-
-	/* If either the DTSTART or the DTEND is a DATE value, we return TRUE.
-	   Maybe if one was a DATE-TIME we should check that, but that should
-	   not happen often. */
-	if ((start_datetime.value && start_datetime.value->is_date)
-	    || (end_datetime.value && end_datetime.value->is_date)) {
-		retval = TRUE;
-		goto out;
-	}
-
-	/* If the event uses UTC for DTSTART & DTEND, return TRUE. Outlook
-	   will send single events as UTC, so we don't want to mark all of
-	   these. */
-	if ((!start_datetime.value || start_datetime.value->is_utc)
-	    && (!end_datetime.value || end_datetime.value->is_utc)) {
-		retval = TRUE;
-		goto out;
-	}
-
-	/* If the event uses floating time for DTSTART & DTEND, return TRUE.
-	   Imported vCalendar files will use floating times, so we don't want
-	   to mark all of these. */
-	if (!start_datetime.tzid && !end_datetime.tzid) {
-		retval = TRUE;
-		goto out;
-	}
-
-	/* FIXME: DURATION may be used instead. */
-	if (e_cal_component_compare_tzid (tzid, start_datetime.tzid)
-	    && e_cal_component_compare_tzid (tzid, end_datetime.tzid)) {
-		/* If both TZIDs are the same as the given zone's TZID, then
-		   we know the timezones are the same so we return TRUE. */
-		retval = TRUE;
-	} else {
-		/* If the TZIDs differ, we have to compare the UTC offsets
-		   of the start and end times, using their own timezones and
-		   the given timezone. */
-		if (!e_cal_get_timezone (client, start_datetime.tzid,
-					      &start_zone, NULL))
-			goto out;
-
-		if (start_datetime.value) {
-			offset1 = icaltimezone_get_utc_offset (start_zone,
-							       start_datetime.value,
-							       NULL);
-			offset2 = icaltimezone_get_utc_offset (zone,
-							       start_datetime.value,
-							       NULL);
-			if (offset1 != offset2)
-				goto out;
-		}
-
-		if (!e_cal_get_timezone (client, end_datetime.tzid,
-					      &end_zone, NULL))
-			goto out;
-
-		if (end_datetime.value) {
-			offset1 = icaltimezone_get_utc_offset (end_zone,
-							       end_datetime.value,
-							       NULL);
-			offset2 = icaltimezone_get_utc_offset (zone,
-							       end_datetime.value,
-							       NULL);
-			if (offset1 != offset2)
-				goto out;
-		}
-
-		retval = TRUE;
-	}
-
- out:
-
-	e_cal_component_free_datetime (&start_datetime);
-	e_cal_component_free_datetime (&end_datetime);
-
-	return retval;
-}
-
-/**
- * cal_comp_confirm_delete_empty_comp:
- * @comp: A calendar component.
- * @client: Calendar client where the component purportedly lives.
- * @widget: Widget to be used as the basis for UTF8 conversion.
- * 
- * Assumming a calendar component with an empty SUMMARY property (as per
- * string_is_empty()), asks whether the user wants to delete it based on
- * whether the appointment is on the calendar server or not.  If the
- * component is on the server, this function will present a confirmation
- * dialog and delete the component if the user tells it to.  If the component
- * is not on the server it will just return TRUE.
- * 
- * Return value: A result code indicating whether the component
- * was not on the server and is to be deleted locally, whether it
- * was on the server and the user deleted it, or whether the
- * user cancelled the deletion.
- **/
-gboolean
-cal_comp_is_on_server (ECalComponent *comp, ECal *client)
-{
-	const char *uid;
-	icalcomponent *icalcomp;
-	GError *error = NULL;
-
-	g_return_val_if_fail (comp != NULL, FALSE);
-	g_return_val_if_fail (E_IS_CAL_COMPONENT (comp), FALSE);
-	g_return_val_if_fail (client != NULL, FALSE);
-	g_return_val_if_fail (E_IS_CAL (client), FALSE);
-
-	/* See if the component is on the server.  If it is not, then it likely
-	 * means that the appointment is new, only in the day view, and we
-	 * haven't added it yet to the server.  In that case, we don't need to
-	 * confirm and we can just delete the event.  Otherwise, we ask
-	 * the user.
-	 */
-	e_cal_component_get_uid (comp, &uid);
-
-	if (e_cal_get_object (client, uid, NULL, &icalcomp, &error)) {
-		icalcomponent_free (icalcomp);
-
-		return TRUE;
-	}
-
-	if (error->code != E_CALENDAR_STATUS_OBJECT_NOT_FOUND)
-		g_warning (G_STRLOC ": %s", error->message);
-
-	g_clear_error (&error);
-
-	return FALSE;
-}
-
-/**
- * cal_comp_event_new_with_defaults:
- * 
- * Creates a new VEVENT component and adds any default alarms to it as set in
- * the program's configuration values.
- * 
- * Return value: A newly-created calendar component.
- **/
-ECalComponent *
-cal_comp_event_new_with_defaults (ECal *client)
-{
-	icalcomponent *icalcomp;
-	ECalComponent *comp;
-	int interval;
-	CalUnits units;
-	ECalComponentAlarm *alarm;
-	icalproperty *icalprop;
-	ECalComponentAlarmTrigger trigger;
-
-	if (!e_cal_get_default_object (client, &icalcomp, NULL))
-		return NULL;
-
-	comp = e_cal_component_new ();
-	if (!e_cal_component_set_icalcomponent (comp, icalcomp)) {
-		g_object_unref (comp);
-		icalcomponent_free (icalcomp);
-		return NULL;
-	}
-	
-	if (!calendar_config_get_use_default_reminder ())
-		return comp;
-
-	interval = calendar_config_get_default_reminder_interval ();
-	units = calendar_config_get_default_reminder_units ();
-
-	alarm = e_cal_component_alarm_new ();
-
-	/* We don't set the description of the alarm; we'll copy it from the
-	 * summary when it gets committed to the server. For that, we add a
-	 * X-EVOLUTION-NEEDS-DESCRIPTION property to the alarm's component.
-	 */
-	icalcomp = e_cal_component_alarm_get_icalcomponent (alarm);
-	icalprop = icalproperty_new_x ("1");
-	icalproperty_set_x_name (icalprop, "X-EVOLUTION-NEEDS-DESCRIPTION");
-	icalcomponent_add_property (icalcomp, icalprop);
-
-	e_cal_component_alarm_set_action (alarm, E_CAL_COMPONENT_ALARM_DISPLAY);
-
-	trigger.type = E_CAL_COMPONENT_ALARM_TRIGGER_RELATIVE_START;
-
-	memset (&trigger.u.rel_duration, 0, sizeof (trigger.u.rel_duration));
-
-	trigger.u.rel_duration.is_neg = TRUE;
-
-	switch (units) {
-	case CAL_MINUTES:
-		trigger.u.rel_duration.minutes = interval;
-		break;
-
-	case CAL_HOURS:	
-		trigger.u.rel_duration.hours = interval;
-		break;
-
-	case CAL_DAYS:	
-		trigger.u.rel_duration.days = interval;
-		break;
-
-	default:
-		g_assert_not_reached ();
-	}
-
-	e_cal_component_alarm_set_trigger (alarm, trigger);
-
-	e_cal_component_add_alarm (comp, alarm);
-	e_cal_component_alarm_free (alarm);
-
-	return comp;
-}
-
-ECalComponent *
-cal_comp_event_new_with_current_time (ECal *client, gboolean all_day) 
-{
-	ECalComponent *comp;
-	struct icaltimetype itt;
-	ECalComponentDateTime dt;
-	icaltimezone *zone;
-
-	comp = cal_comp_event_new_with_defaults (client);
-
-	g_return_val_if_fail (comp, NULL);
-	
-	zone = calendar_config_get_icaltimezone ();
-	if (all_day) {
-		itt = icaltime_from_timet_with_zone (time (NULL), 1, zone);
-
-		dt.value = &itt;
-		dt.tzid = icaltimezone_get_tzid (zone);
-		
-		e_cal_component_set_dtstart (comp, &dt);
-		e_cal_component_set_dtend (comp, &dt);		
-	} else {
-		itt = icaltime_current_time_with_zone (zone);
-		icaltime_adjust (&itt, 0, 1, -itt.minute, -itt.second);
-		
-		dt.value = &itt;
-		dt.tzid = icaltimezone_get_tzid (zone);
-		
-		e_cal_component_set_dtstart (comp, &dt);
-		icaltime_adjust (&itt, 0, 1, 0, 0);
-		e_cal_component_set_dtend (comp, &dt);
-	}
-
-	return comp;
-}
-
-ECalComponent *
-cal_comp_task_new_with_defaults (ECal *client)
-{
-	ECalComponent *comp;
-	icalcomponent *icalcomp;
-
-	if (!e_cal_get_default_object (client, &icalcomp, NULL))
-		return NULL;
-
-	comp = e_cal_component_new ();
-	if (!e_cal_component_set_icalcomponent (comp, icalcomp)) {
-		g_object_unref (comp);
-		icalcomponent_free (icalcomp);
-
-		return NULL;
-	}
-
-	comp = e_cal_component_new ();
-	if (!e_cal_component_set_icalcomponent (comp, icalcomp)) {
-		g_object_unref (comp);
-		icalcomponent_free (icalcomp);
-		return NULL;
-	}
-
-	return comp;
-}
diff --git a/calendar/gui/comp-util.h b/calendar/gui/comp-util.h
deleted file mode 100644
index 26c7881e99..0000000000
--- a/calendar/gui/comp-util.h
+++ /dev/null
@@ -1,46 +0,0 @@
-/* Evolution calendar - Utilities for manipulating ECalComponent objects
- *
- * Copyright (C) 2000 Ximian, Inc.
- * Copyright (C) 2000 Ximian, Inc.
- *
- * Author: Federico Mena-Quintero <federico@ximian.com>
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of version 2 of the GNU General Public
- * License as published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307, USA.
- */
-
-#ifndef COMP_UTIL_H
-#define COMP_UTIL_H
-
-#include <gtk/gtkwidget.h>
-#include <libecal/e-cal-component.h>
-#include <libecal/e-cal.h>
-
-void cal_comp_util_add_exdate (ECalComponent *comp, time_t t, icaltimezone *zone);
-
-
-/* Returns TRUE if the component uses the given timezone for both DTSTART
-   and DTEND, or if the UTC offsets of the start and end times are the same
-   as in the given zone. */
-gboolean cal_comp_util_compare_event_timezones (ECalComponent *comp,
-						ECal *client,
-						icaltimezone *zone);
-
-gboolean cal_comp_is_on_server (ECalComponent *comp,
-				ECal *client);
-
-ECalComponent *cal_comp_event_new_with_defaults (ECal *client);
-ECalComponent *cal_comp_event_new_with_current_time (ECal *client, gboolean all_day);
-ECalComponent *cal_comp_task_new_with_defaults (ECal *client);
-
-#endif
diff --git a/calendar/gui/control-factory.c b/calendar/gui/control-factory.c
deleted file mode 100644
index c6aab4b258..0000000000
--- a/calendar/gui/control-factory.c
+++ /dev/null
@@ -1,79 +0,0 @@
-/* -*- Mode: C; indent-tabs-mode: t; c-basic-offset: 8; tab-width: 8 -*- */
-/* control-factory.c
- *
- * Copyright (C) 2000, 2001, 2002, 2003  Ximian, Inc.
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of version 2 of the GNU General Public
- * License as published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * General Public License for more details.
- *
- * You should have received a copy of the GNU General Public
- * License along with this program; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
- *
- * Author: Ettore Perazzoli <ettore@ximian.com>
- */
-
-#include <config.h>
-#include <string.h>
-#include <gtk/gtksignal.h>
-#include <glade/glade.h>
-#include <bonobo/bonobo-control.h>
-#include <bonobo/bonobo-generic-factory.h>
-#include <bonobo/bonobo-persist-file.h>
-#include <bonobo/bonobo-context.h>
-#include <glade/glade.h>
-#include <libgnomeui/gnome-dialog-util.h>
-
-#include <libecal/e-cal-time-util.h>
-#include <gui/gnome-cal.h>
-#include <gui/calendar-commands.h>
-#include <gui/calendar-config.h>
-
-#include "control-factory.h"
-
-CORBA_Environment ev;
-CORBA_ORB orb;
-
-static void
-control_activate_cb (BonoboControl *control, gboolean activate, gpointer data)
-{
-	GnomeCalendar *gcal;
-
-	gcal = GNOME_CALENDAR (data);
-
-	if (activate)
-		calendar_control_activate (control, gcal);
-	else
-		calendar_control_deactivate (control, gcal);
-}
-
-BonoboControl *
-control_factory_new_control (void)
-{
-	BonoboControl *control;
-	GnomeCalendar *gcal;
-
-	gcal = GNOME_CALENDAR (gnome_calendar_new ());
-	if (!gcal)
-		return NULL;
-
-	gtk_widget_show (GTK_WIDGET (gcal));
-
-	control = bonobo_control_new (GTK_WIDGET (gcal));
-	if (!control) {
-		g_message ("control_factory_fn(): could not create the control!");
-		return NULL;
-	}
-	g_object_set_data (G_OBJECT (gcal), "control", control);
-
-	g_signal_connect (control, "activate", G_CALLBACK (control_activate_cb), gcal);
-
-	return control;
-}
diff --git a/calendar/gui/control-factory.h b/calendar/gui/control-factory.h
deleted file mode 100644
index bab1611c03..0000000000
--- a/calendar/gui/control-factory.h
+++ /dev/null
@@ -1,30 +0,0 @@
-/* -*- Mode: C; indent-tabs-mode: t; c-basic-offset: 8; tab-width: 8 -*- */
-/* control-factory.c
- *
- * Copyright (C) 2000, 2001, 2002, 2003  Ximian, Inc.
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of version 2 of the GNU General Public
- * License as published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * General Public License for more details.
- *
- * You should have received a copy of the GNU General Public
- * License along with this program; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
- *
- * Author: Ettore Perazzoli <ettore@ximian.com>
- */
-
-#ifndef _CONTROL_FACTORY_H_
-#define _CONTROL_FACTORY_H_
-
-#include <bonobo/bonobo-control.h>
-
-BonoboControl *control_factory_new_control  (void);
-
-#endif /* _CONTROL_FACTORY_H_ */
diff --git a/calendar/gui/dialogs/.cvsignore b/calendar/gui/dialogs/.cvsignore
deleted file mode 100644
index 182657d5ac..0000000000
--- a/calendar/gui/dialogs/.cvsignore
+++ /dev/null
@@ -1,8 +0,0 @@
-.deps
-.pure
-Makefile
-Makefile.in
-Evolution-Addressbook-SelectNames-common.c
-Evolution-Addressbook-SelectNames-skels.c
-Evolution-Addressbook-SelectNames-stubs.c
-Evolution-Addressbook-SelectNames.h
diff --git a/calendar/gui/dialogs/Makefile.am b/calendar/gui/dialogs/Makefile.am
deleted file mode 100644
index 11cdf3bd6d..0000000000
--- a/calendar/gui/dialogs/Makefile.am
+++ /dev/null
@@ -1,106 +0,0 @@
-INCLUDES = 								\
-	-DG_LOG_DOMAIN=\"calendar-gui\"					\
-	-I$(top_srcdir)							\
-	-I$(top_builddir)						\
-	-I$(top_srcdir)/calendar					\
-	-I$(top_srcdir)/calendar/cal-client				\
-	-I$(top_builddir)/calendar/cal-client				\
-	-I$(top_builddir)/shell						\
-	-I$(top_srcdir)/shell						\
-	-I$(top_srcdir)/widgets/misc					\
-	-DEVOLUTION_DATADIR=\""$(datadir)"\"				\
-	-DEVOLUTION_GLADEDIR=\""$(gladedir)"\"				\
-	-DEVOLUTION_IMAGESDIR=\""$(imagesdir)"\"			\
-	-DEVOLUTION_UIDIR=\""$(evolutionuidir)"\"			\
-	-DPREFIX=\""$(prefix)"\"					\
-	$(EVOLUTION_CALENDAR_CFLAGS)
-
-noinst_LTLIBRARIES = libcal-dialogs.la
-
-libcal_dialogs_la_LIBADD =					\
-	$(top_builddir)/addressbook/util/libeabutil.la
-
-libcal_dialogs_la_SOURCES =	\
-	$(IDL_GENERATED)	\
-	alarm-dialog.c		\
-	alarm-dialog.h		\
-	alarm-list-dialog.c	\
-	alarm-list-dialog.h	\
-	cal-attachment-bar.c    \
-	cal-attachment-bar.h    \
-	cal-attachment-select-file.c \
-	cal-attachment-select-file.h \
-	cal-attachment.c        \
-	cal-attachment.h        \
-	cal-prefs-dialog.c	\
-	cal-prefs-dialog.h	\
-	calendar-setup.c	\
-	calendar-setup.h	\
-	cancel-comp.c		\
-	cancel-comp.h		\
-	changed-comp.c		\
-	changed-comp.h		\
-	comp-editor.c		\
-	comp-editor.h		\
-	comp-editor-page.c	\
-	comp-editor-page.h	\
-	comp-editor-util.c	\
-	comp-editor-util.h	\
-	copy-source-dialog.c	\
-	copy-source-dialog.h	\
-	delete-comp.c		\
-	delete-comp.h		\
-	delete-error.c		\
-	delete-error.h		\
-	e-delegate-dialog.c	\
-	e-delegate-dialog.h	\
-	e-send-options-utils.c  \
-	e-send-options-utils.h  \
-	event-editor.c		\
-	event-editor.h		\
-	event-page.c		\
-	event-page.h		\
-	meeting-page.c		\
-	meeting-page.h		\
-	recurrence-page.c	\
-	recurrence-page.h	\
-	recur-comp.c		\
-	recur-comp.h		\
-	save-comp.c		\
-	save-comp.h		\
-	schedule-page.c		\
-	schedule-page.h		\
-	select-source-dialog.c	\
-	select-source-dialog.h	\
-	send-comp.c		\
-	send-comp.h		\
-	task-editor.c		\
-	task-editor.h		\
-	task-details-page.c	\
-	task-details-page.h	\
-	task-page.c		\
-	task-page.h		\
-	url-editor-dialog.c	\
-	url-editor-dialog.h	
-
-glade_DATA =				\
-	alarm-dialog.glade		\
-	alarm-list-dialog.glade		\
-	cal-attachment.glade            \
-	cal-prefs-dialog.glade		\
-	e-delegate-dialog.glade		\
-	event-page.glade		\
-	meeting-page.glade		\
-	recurrence-page.glade		\
-	schedule-page.glade		\
-	task-details-page.glade		\
-	task-page.glade			\
-	url-editor-dialog.glade
-
-CLEANFILES = $(BUILT_SOURCES)
-
-dist-hook:
-	cd $(distdir); rm -f $(BUILT_SOURCES)
-
-EXTRA_DIST =			\
-	$(glade_DATA)
diff --git a/calendar/gui/dialogs/alarm-dialog.c b/calendar/gui/dialogs/alarm-dialog.c
deleted file mode 100644
index d0db059b62..0000000000
--- a/calendar/gui/dialogs/alarm-dialog.c
+++ /dev/null
@@ -1,962 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-
-/* Evolution calendar - Alarm page of the calendar component dialogs
- *
- * Copyright (C) 2001-2003 Ximian, Inc.
- *
- * Authors: Federico Mena-Quintero <federico@ximian.com>
- *          Miguel de Icaza <miguel@ximian.com>
- *          Seth Alves <alves@hungry.com>
- *          JP Rosevear <jpr@ximian.com>
- *          Hans Petter Jansson <hpj@ximian.com>
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of version 2 of the GNU General Public
- * License as published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307, USA.
- */
-
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
-
-#include <string.h>
-#include <gtk/gtklabel.h>
-#include <gtk/gtkcellrenderertext.h>
-#include <gtk/gtkdialog.h>
-#include <gtk/gtknotebook.h>
-#include <gtk/gtksignal.h>
-#include <gtk/gtktreeview.h>
-#include <gtk/gtktreeselection.h>
-#include <gtk/gtkoptionmenu.h>
-#include <gtk/gtktextbuffer.h>
-#include <gtk/gtktextview.h>
-#include <gtk/gtktogglebutton.h>
-#include <libgnome/gnome-i18n.h>
-#include <bonobo/bonobo-control.h>
-#include <bonobo/bonobo-exception.h>
-#include <bonobo/bonobo-widget.h>
-#include <glade/glade.h>
-#include "e-util/e-dialog-widgets.h"
-#include "e-util/e-time-utils.h"
-#include <libecal/e-cal-util.h>
-#include <libecal/e-cal-time-util.h>
-#include "e-util/e-dialog-widgets.h"
-#include "e-util/e-icon-factory.h"
-#include <libebook/e-destination.h>
-#include <libedataserverui/e-name-selector.h>
-#include "../calendar-config.h"
-#include "comp-editor-util.h"
-#include "alarm-dialog.h"
-
-
-
-typedef struct {
-	/* Glade XML data */
-	GladeXML *xml;
-
-	/* The alarm  */
-	ECalComponentAlarm *alarm;
-
-	/* The client */
-	ECal *ecal;
-	
-	/* Toplevel */
-	GtkWidget *toplevel;
-
-	GtkWidget *action;
-	GtkWidget *interval_value;
-	GtkWidget *value_units;
-	GtkWidget *relative;
-	GtkWidget *time;
-
-	/* Alarm repeat widgets */
-	GtkWidget *repeat_toggle;
-	GtkWidget *repeat_group;
-	GtkWidget *repeat_quantity;
-	GtkWidget *repeat_value;
-	GtkWidget *repeat_unit;
-
-	GtkWidget *option_notebook;
-	
-	/* Display alarm widgets */
-	GtkWidget *dalarm_group;
-	GtkWidget *dalarm_message;
-	GtkWidget *dalarm_description;
-
-	/* Audio alarm widgets */
-	GtkWidget *aalarm_group;
-	GtkWidget *aalarm_sound;
-	GtkWidget *aalarm_attach;
-
-	/* Mail alarm widgets */
-	const char *email;
-	GtkWidget *malarm_group;
-	GtkWidget *malarm_address_group;
-	GtkWidget *malarm_addresses;
-	GtkWidget *malarm_addressbook;
-	GtkWidget *malarm_message;
-	GtkWidget *malarm_description;
-
-	/* Procedure alarm widgets */
-	GtkWidget *palarm_group;
-	GtkWidget *palarm_program;
-	GtkWidget *palarm_args;
-
-	/* Addressbook name selector */
-	ENameSelector *name_selector;
-} Dialog;
-
-static const char *section_name = "Send To";
-
-/* "relative" types */
-enum {
-	BEFORE,
-	AFTER
-};
-
-/* Time units */
-enum {
-	MINUTES,
-	HOURS,
-	DAYS
-};
-
-/* Option menu maps */
-static const int action_map[] = {
-	E_CAL_COMPONENT_ALARM_DISPLAY,
-	E_CAL_COMPONENT_ALARM_AUDIO,
-	E_CAL_COMPONENT_ALARM_PROCEDURE,
-	E_CAL_COMPONENT_ALARM_EMAIL,
-	-1
-};
-
-static const char *action_map_cap[] = {
-	CAL_STATIC_CAPABILITY_NO_DISPLAY_ALARMS,
-	CAL_STATIC_CAPABILITY_NO_AUDIO_ALARMS,
-        CAL_STATIC_CAPABILITY_NO_PROCEDURE_ALARMS,
-	CAL_STATIC_CAPABILITY_NO_EMAIL_ALARMS
-};
-
-static const int value_map[] = {
-	MINUTES,
-	HOURS,
-	DAYS,
-	-1
-};
-
-static const int relative_map[] = {
-	BEFORE,
-	AFTER,
-	-1
-};
-
-static const int time_map[] = {
-	E_CAL_COMPONENT_ALARM_TRIGGER_RELATIVE_START,
-	E_CAL_COMPONENT_ALARM_TRIGGER_RELATIVE_END,
-	-1
-};
-
-enum duration_units {
-	DUR_MINUTES,
-	DUR_HOURS,
-	DUR_DAYS
-};
-
-static const int duration_units_map[] = {
-	DUR_MINUTES,
-	DUR_HOURS,
-	DUR_DAYS,
-	-1
-};
-
-/* Fills the widgets with default values */
-static void
-clear_widgets (Dialog *dialog)
-{
-	/* Sane defaults */
-	e_dialog_option_menu_set (dialog->action, E_CAL_COMPONENT_ALARM_DISPLAY, action_map);
-	e_dialog_spin_set (dialog->interval_value, 15);
-	e_dialog_option_menu_set (dialog->value_units, MINUTES, value_map);
-	e_dialog_option_menu_set (dialog->relative, BEFORE, relative_map);
-	e_dialog_option_menu_set (dialog->time, E_CAL_COMPONENT_ALARM_TRIGGER_RELATIVE_START, time_map);
-
-	gtk_widget_set_sensitive (dialog->repeat_group, FALSE);
-	gtk_widget_set_sensitive (dialog->dalarm_group, FALSE);
-	gtk_widget_set_sensitive (dialog->aalarm_group, FALSE);
-	gtk_widget_set_sensitive (dialog->malarm_group, FALSE);
-
-	gtk_notebook_set_current_page (GTK_NOTEBOOK (dialog->option_notebook), 0);
-}
-
-/* fill_widgets handler for the alarm page */
-static void
-alarm_to_dialog (Dialog *dialog)
-{
-	GtkWidget *menu;
-	GList *l;
-	gboolean repeat;
-	char *email;
-	int i;	
-
-	/* Clean the page */
-	clear_widgets (dialog);
-
-	/* Alarm types */
-	menu = gtk_option_menu_get_menu (GTK_OPTION_MENU (dialog->action));
-	for (i = 0, l = GTK_MENU_SHELL (menu)->children; action_map[i] != -1; i++, l = l->next) {
-		if (e_cal_get_static_capability (dialog->ecal, action_map_cap[i]))
-			gtk_widget_set_sensitive (l->data, FALSE);
-		else
-			gtk_widget_set_sensitive (l->data, TRUE);
-	}
-
-	/* Set a default address if possible */
-	if (!e_cal_get_static_capability (dialog->ecal, CAL_STATIC_CAPABILITY_NO_EMAIL_ALARMS)
-	    && e_cal_get_alarm_email_address (dialog->ecal, &email, NULL)) {
-		ECalComponentAttendee *a;
-		GSList attendee_list;
-		
-		a = g_new0 (ECalComponentAttendee, 1);
-		a->value = email;
-		attendee_list.data = a;
-		attendee_list.next = NULL;
-		e_cal_component_alarm_set_attendee_list (dialog->alarm, &attendee_list);
-		g_free (email);
-		g_free (a);
-	}
-
-	/* If we can repeat */
-	repeat = !e_cal_get_static_capability (dialog->ecal, CAL_STATIC_CAPABILITY_NO_ALARM_REPEAT);
-	gtk_widget_set_sensitive (dialog->repeat_toggle, repeat);
-}
-
-static void
-repeat_widgets_to_alarm (Dialog *dialog, ECalComponentAlarm *alarm)
-{
-	ECalComponentAlarmRepeat repeat;
-
-	if (!e_dialog_toggle_get (dialog->repeat_toggle)) {
-		repeat.repetitions = 0;
-
-		e_cal_component_alarm_set_repeat (alarm, repeat);
-		return;
-	}
-
-	repeat.repetitions = e_dialog_spin_get_int (dialog->repeat_quantity);
-
-	memset (&repeat.duration, 0, sizeof (repeat.duration));
-	switch (e_dialog_option_menu_get (dialog->repeat_unit, duration_units_map)) {
-	case DUR_MINUTES:
-		repeat.duration.minutes = e_dialog_spin_get_int (dialog->repeat_value);
-		break;
-
-	case DUR_HOURS:
-		repeat.duration.hours = e_dialog_spin_get_int (dialog->repeat_value);
-		break;
-
-	case DUR_DAYS:
-		repeat.duration.days = e_dialog_spin_get_int (dialog->repeat_value);
-		break;
-
-	default:
-		g_assert_not_reached ();
-	}
-
-	e_cal_component_alarm_set_repeat (alarm, repeat);
-
-}
-
-/* Fills the audio alarm data with the values from the widgets */
-static void
-aalarm_widgets_to_alarm (Dialog *dialog, ECalComponentAlarm *alarm)
-{
-	char *url;
-	icalattach *attach;
-
-	if (!gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (dialog->aalarm_sound)))
-		return;
-
-	url = e_dialog_editable_get (dialog->aalarm_attach);
-	attach = icalattach_new_from_url (url ? url : "");
-	g_free (url);
-
-	e_cal_component_alarm_set_attach (alarm, attach);
-	icalattach_unref (attach);
-}
-
-/* Fills the display alarm data with the values from the widgets */
-static void
-dalarm_widgets_to_alarm (Dialog *dialog, ECalComponentAlarm *alarm)
-{
-	char *str;
-	ECalComponentText description;
-	GtkTextBuffer *text_buffer;
-	GtkTextIter text_iter_start, text_iter_end;
-	icalcomponent *icalcomp;
-	icalproperty *icalprop;
-
-	if (!gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (dialog->dalarm_message)))
-		return;
-
-	text_buffer = gtk_text_view_get_buffer (GTK_TEXT_VIEW (dialog->dalarm_description));
-	gtk_text_buffer_get_start_iter (text_buffer, &text_iter_start);
-	gtk_text_buffer_get_end_iter   (text_buffer, &text_iter_end);
-	str = gtk_text_buffer_get_text (text_buffer, &text_iter_start, &text_iter_end, FALSE);
-
-	description.value = str;
-	description.altrep = NULL;
-
-	e_cal_component_alarm_set_description (alarm, &description);
-	g_free (str);
-
-	/* remove the X-EVOLUTION-NEEDS-DESCRIPTION property, so that
-	 * we don't re-set the alarm's description */
-	icalcomp = e_cal_component_alarm_get_icalcomponent (alarm);
-	icalprop = icalcomponent_get_first_property (icalcomp, ICAL_X_PROPERTY);
-	while (icalprop) {
-		const char *x_name;
-
-		x_name = icalproperty_get_x_name (icalprop);
-		if (!strcmp (x_name, "X-EVOLUTION-NEEDS-DESCRIPTION")) {
-			icalcomponent_remove_property (icalcomp, icalprop);
-			break;
-		}
-
-		icalprop = icalcomponent_get_next_property (icalcomp, ICAL_X_PROPERTY);
-	}
-}
-
-/* Fills the mail alarm data with the values from the widgets */
-static void
-malarm_widgets_to_alarm (Dialog *dialog, ECalComponentAlarm *alarm)
-{
-	char *str;
-	ECalComponentText description;
-	GSList *attendee_list = NULL;
-	GtkTextBuffer *text_buffer;
-	GtkTextIter text_iter_start, text_iter_end;
-	ENameSelectorModel *name_selector_model;
-	EDestinationStore *destination_store;
-	GList *destinations;
-	icalcomponent *icalcomp;
-	icalproperty *icalprop;
-	GList *l;
-	
-	/* Attendees */
-	name_selector_model = e_name_selector_peek_model (dialog->name_selector);
-	e_name_selector_model_peek_section (name_selector_model, section_name, NULL, &destination_store);
-	destinations = e_destination_store_list_destinations (destination_store);
-
-	for (l = destinations; l; l = g_list_next (l)) {
-		EDestination *dest;
-		ECalComponentAttendee *a;
-
-		dest = l->data;
-		
-		a = g_new0 (ECalComponentAttendee, 1);
-		a->value = e_destination_get_email (dest);
-		a->cn = e_destination_get_name (dest);
-
-		attendee_list = g_slist_append (attendee_list, a);
-	}
-
-	e_cal_component_alarm_set_attendee_list (alarm, attendee_list);
-
-	e_cal_component_free_attendee_list (attendee_list);
-	g_list_free (destinations);
-
-	if (!gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (dialog->malarm_message)))
-		return;
-	
-	/* Description */
-	text_buffer = gtk_text_view_get_buffer (GTK_TEXT_VIEW (dialog->malarm_description));
-	gtk_text_buffer_get_start_iter (text_buffer, &text_iter_start);
-	gtk_text_buffer_get_end_iter   (text_buffer, &text_iter_end);
-	str = gtk_text_buffer_get_text (text_buffer, &text_iter_start, &text_iter_end, FALSE);
-
-	description.value = str;
-	description.altrep = NULL;
-
-	e_cal_component_alarm_set_description (alarm, &description);
-	g_free (str);
-
-	/* remove the X-EVOLUTION-NEEDS-DESCRIPTION property, so that
-	 * we don't re-set the alarm's description */
-	icalcomp = e_cal_component_alarm_get_icalcomponent (alarm);
-	icalprop = icalcomponent_get_first_property(icalcomp, ICAL_X_PROPERTY);
-	while (icalprop) {
-		const char *x_name;
-
-		x_name = icalproperty_get_x_name (icalprop);
-		if (!strcmp (x_name, "X-EVOLUTION-NEEDS-DESCRIPTION")) {
-			icalcomponent_remove_property (icalcomp, icalprop);
-			break;
-		}
-
-		icalprop = icalcomponent_get_next_property (icalcomp, ICAL_X_PROPERTY);
-	}
-}
-
-/* Fills the procedure alarm data with the values from the widgets */
-static void
-palarm_widgets_to_alarm (Dialog *dialog, ECalComponentAlarm *alarm)
-{
-	char *program;
-	icalattach *attach;
-	char *str;
-	ECalComponentText description;
-	icalcomponent *icalcomp;
-	icalproperty *icalprop;
-
-	program = e_dialog_editable_get (dialog->palarm_program);
-	attach = icalattach_new_from_url (program ? program : "");
-	g_free (program);
-
-	e_cal_component_alarm_set_attach (alarm, attach);
-	icalattach_unref (attach);
-
-	str = e_dialog_editable_get (dialog->palarm_args);
-	if (str && *str) {
-		description.value = str;
-		description.altrep = NULL;
-		
-		e_cal_component_alarm_set_description (alarm, &description);
-	}
-	g_free (str);
-	
-	/* remove the X-EVOLUTION-NEEDS-DESCRIPTION property, so that
-	 * we don't re-set the alarm's description */
-	icalcomp = e_cal_component_alarm_get_icalcomponent (alarm);
-	icalprop = icalcomponent_get_first_property (icalcomp, ICAL_X_PROPERTY);
-	while (icalprop) {
-		const char *x_name;
-
-		x_name = icalproperty_get_x_name (icalprop);
-		if (!strcmp (x_name, "X-EVOLUTION-NEEDS-DESCRIPTION")) {
-			icalcomponent_remove_property (icalcomp, icalprop);
-			break;
-		}
-
-		icalprop = icalcomponent_get_next_property (icalcomp, ICAL_X_PROPERTY);
-	}
-}
-
-/* fill_component handler for the alarm page */
-static void
-dialog_to_alarm (Dialog *dialog)
-{
-	ECalComponentAlarmTrigger trigger;
-	ECalComponentAlarmAction action;
-
-	/* Fill out the alarm */
-	memset (&trigger, 0, sizeof (ECalComponentAlarmTrigger));
-	trigger.type = e_dialog_option_menu_get (dialog->time, time_map);
-	if (e_dialog_option_menu_get (dialog->relative, relative_map) == BEFORE)
-		trigger.u.rel_duration.is_neg = 1;
-	else
-		trigger.u.rel_duration.is_neg = 0;
-
-	switch (e_dialog_option_menu_get (dialog->value_units, value_map)) {
-	case MINUTES:
-		trigger.u.rel_duration.minutes =
-			e_dialog_spin_get_int (dialog->interval_value);
-		break;
-
-	case HOURS:
-		trigger.u.rel_duration.hours =
-			e_dialog_spin_get_int (dialog->interval_value);
-		break;
-
-	case DAYS:
-		trigger.u.rel_duration.days =
-			e_dialog_spin_get_int (dialog->interval_value);
-		break;
-
-	default:
-		g_assert_not_reached ();
-	}
-	e_cal_component_alarm_set_trigger (dialog->alarm, trigger);
-
-	action = e_dialog_option_menu_get (dialog->action, action_map);
-	e_cal_component_alarm_set_action (dialog->alarm, action);
-
-	/* Repeat stuff */
-	repeat_widgets_to_alarm (dialog, dialog->alarm);
-
-	/* Options */
-	switch (action) {
-	case E_CAL_COMPONENT_ALARM_NONE:
-		g_assert_not_reached ();
-		break;
-
-	case E_CAL_COMPONENT_ALARM_AUDIO:
-		aalarm_widgets_to_alarm (dialog, dialog->alarm);
-		break;
-
-	case E_CAL_COMPONENT_ALARM_DISPLAY:
-		dalarm_widgets_to_alarm (dialog, dialog->alarm);
-		break;
-
-	case E_CAL_COMPONENT_ALARM_EMAIL:
-		malarm_widgets_to_alarm (dialog, dialog->alarm);
-		break;
-
-	case E_CAL_COMPONENT_ALARM_PROCEDURE:
-		palarm_widgets_to_alarm (dialog, dialog->alarm);
-		break;
-
-	case E_CAL_COMPONENT_ALARM_UNKNOWN:
-		break;
-
-	default:
-		g_assert_not_reached ();
-	}
-}
-
-/* Gets the widgets from the XML file and returns TRUE if they are all available. */
-static gboolean
-get_widgets (Dialog *dialog)
-{
-#define GW(name) glade_xml_get_widget (dialog->xml, name)
-
-	dialog->toplevel = GW ("alarm-dialog");
-	if (!dialog->toplevel)
-		return FALSE;
-
-	dialog->action = GW ("action");
-	dialog->interval_value = GW ("interval-value");
-	dialog->value_units = GW ("value-units");
-	dialog->relative = GW ("relative");
-	dialog->time = GW ("time");
-
-	dialog->repeat_toggle = GW ("repeat-toggle");
-	dialog->repeat_group = GW ("repeat-group");
-	dialog->repeat_quantity = GW ("repeat-quantity");
-	dialog->repeat_value = GW ("repeat-value");
-	dialog->repeat_unit = GW ("repeat-unit");
-
-	dialog->option_notebook = GW ("option-notebook");
-
-	dialog->dalarm_group = GW ("dalarm-group");
-	dialog->dalarm_message = GW ("dalarm-message");
-	dialog->dalarm_description = GW ("dalarm-description");
-
-	dialog->aalarm_group = GW ("aalarm-group");
-	dialog->aalarm_sound = GW ("aalarm-sound");
-	dialog->aalarm_attach = GW ("aalarm-attach");
-
-	dialog->malarm_group = GW ("malarm-group");
-	dialog->malarm_address_group = GW ("malarm-address-group");
-	dialog->malarm_addressbook = GW ("malarm-addressbook");
-	dialog->malarm_message = GW ("malarm-message");
-	dialog->malarm_description = GW ("malarm-description");
-	
-	dialog->palarm_group = GW ("palarm-group");
-	dialog->palarm_program = GW ("palarm-program");
-	dialog->palarm_args = GW ("palarm-args");
-
-#undef GW
-
-	return (dialog->action
-		&& dialog->interval_value
-		&& dialog->value_units
-		&& dialog->relative
-		&& dialog->time
-		&& dialog->repeat_toggle
-		&& dialog->repeat_group
-		&& dialog->repeat_quantity
-		&& dialog->repeat_value
-		&& dialog->repeat_unit
-		&& dialog->option_notebook
-		&& dialog->dalarm_group
-		&& dialog->dalarm_message
-		&& dialog->dalarm_description
-		&& dialog->aalarm_group
-		&& dialog->aalarm_sound
-		&& dialog->aalarm_attach
-		&& dialog->malarm_group
-		&& dialog->malarm_address_group
-		&& dialog->malarm_addressbook
-		&& dialog->malarm_message
-		&& dialog->malarm_description
-		&& dialog->palarm_group
-		&& dialog->palarm_program
-		&& dialog->palarm_args);		
-}
-
-#if 0
-/* Callback used when the alarm options button is clicked */
-static void
-show_options (Dialog *dialog)
-{
-	gboolean repeat;
-	char *email;
-
-	e_cal_component_alarm_set_action (dialog->alarm,
-					e_dialog_option_menu_get (dialog->action, action_map));
-
-	repeat = !e_cal_get_static_capability (dialog->ecal, CAL_STATIC_CAPABILITY_NO_ALARM_REPEAT);
-
-	if (e_cal_get_static_capability (dialog->ecal, CAL_STATIC_CAPABILITY_NO_EMAIL_ALARMS)
-	    || e_cal_get_alarm_email_address (dialog->ecal, &email, NULL)) {
-		if (!alarm_options_dialog_run (dialog->toplevel, dialog->alarm, email, repeat))
-			g_message (G_STRLOC ": not create the alarm options dialog");
-	}
-}
-#endif
-
-static void
-addressbook_clicked_cb (GtkWidget *widget, gpointer data)
-{
-	Dialog *dialog = data;
-	ENameSelectorDialog *name_selector_dialog;
-
-	name_selector_dialog = e_name_selector_peek_dialog (dialog->name_selector);
-	gtk_widget_show (GTK_WIDGET (name_selector_dialog));
-}
-
-static void
-addressbook_response_cb (GtkWidget *widget, gint response, gpointer data)
-{
-	Dialog *dialog = data;
-	ENameSelectorDialog *name_selector_dialog;
-
-	name_selector_dialog = e_name_selector_peek_dialog (dialog->name_selector);
-	gtk_widget_hide (GTK_WIDGET (name_selector_dialog));
-}
-
-static gboolean
-setup_select_names (Dialog *dialog)
-{
-	ENameSelectorModel *name_selector_model;
-	ENameSelectorDialog *name_selector_dialog;
-
-	dialog->name_selector = e_name_selector_new ();
-	name_selector_model = e_name_selector_peek_model (dialog->name_selector);
-
-	e_name_selector_model_add_section (name_selector_model, section_name, section_name, NULL);
-
-	dialog->malarm_addresses =
-		GTK_WIDGET (e_name_selector_peek_section_entry (dialog->name_selector, section_name));
-	gtk_widget_show (dialog->malarm_addresses);
-	gtk_box_pack_end_defaults (GTK_BOX (dialog->malarm_address_group), dialog->malarm_addresses);
-
-	gtk_signal_connect (GTK_OBJECT (dialog->malarm_addressbook), "clicked",
-			    GTK_SIGNAL_FUNC (addressbook_clicked_cb), dialog);
-
-	name_selector_dialog = e_name_selector_peek_dialog (dialog->name_selector);
-	g_signal_connect (name_selector_dialog, "response",
-			  G_CALLBACK (addressbook_response_cb), dialog);
-
-	return TRUE;
-}
-
-/* Callback used when the repeat toggle button is toggled.  We sensitize the
- * repeat group options as appropriate.
- */
-static void
-repeat_toggle_toggled_cb (GtkToggleButton *toggle, gpointer data)
-{
-	Dialog *dialog = data;
-	gboolean active;
-
-	active = gtk_toggle_button_get_active (toggle);
-
-	gtk_widget_set_sensitive (dialog->repeat_group, active);
-}
-
-static void
-check_custom_sound (Dialog *dialog)
-{
-	char *str;
-	gboolean sens;
-	
-	str = e_dialog_editable_get (dialog->aalarm_attach);
-
-	sens = e_dialog_toggle_get (dialog->aalarm_sound) ? str && *str : TRUE;
-	gtk_dialog_set_response_sensitive (GTK_DIALOG (dialog->toplevel), GTK_RESPONSE_OK, sens);
-
-	g_free (str);
-}
-
-static void
-aalarm_sound_toggled_cb (GtkToggleButton *toggle, gpointer data)
-{
-	Dialog *dialog = data;
-	gboolean active;
-
-	active = gtk_toggle_button_get_active (toggle);
-
-	gtk_widget_set_sensitive (dialog->aalarm_group, active);
-	check_custom_sound (dialog);
-}
-
-static void
-aalarm_attach_changed_cb (GtkWidget *widget, gpointer data)
-{
-	Dialog *dialog = data;
-	
-	check_custom_sound (dialog);
-}
-
-static void
-check_custom_message (Dialog *dialog)
-{
-	char *str;
-	GtkTextBuffer *text_buffer;
-	GtkTextIter text_iter_start, text_iter_end;
-	gboolean sens;
-	
-	text_buffer = gtk_text_view_get_buffer (GTK_TEXT_VIEW (dialog->dalarm_description));
-	gtk_text_buffer_get_start_iter (text_buffer, &text_iter_start);
-	gtk_text_buffer_get_end_iter   (text_buffer, &text_iter_end);
-	str = gtk_text_buffer_get_text (text_buffer, &text_iter_start, &text_iter_end, FALSE);
-
-	sens = e_dialog_toggle_get (dialog->dalarm_message) ? str && *str : TRUE;
-	gtk_dialog_set_response_sensitive (GTK_DIALOG (dialog->toplevel), GTK_RESPONSE_OK, sens);
-
-	g_free (str);
-}
-
-static void
-dalarm_message_toggled_cb (GtkToggleButton *toggle, gpointer data)
-{
-	Dialog *dialog = data;
-	gboolean active;
-
-	active = gtk_toggle_button_get_active (toggle);
-
-	gtk_widget_set_sensitive (dialog->dalarm_group, active);
-	check_custom_message (dialog);
-}
-
-static void
-dalarm_description_changed_cb (GtkWidget *widget, gpointer data)
-{
-	Dialog *dialog = data;
-	
-	check_custom_message (dialog);
-}
-
-static void
-check_custom_program (Dialog *dialog)
-{
-	char *str;
-	gboolean sens;
-	
-	str = e_dialog_editable_get (dialog->palarm_program);
-
-	sens = str && *str;
-	gtk_dialog_set_response_sensitive (GTK_DIALOG (dialog->toplevel), GTK_RESPONSE_OK, sens);
-}
-
-static void
-palarm_program_changed_cb (GtkWidget *widget, gpointer data)
-{
-	Dialog *dialog = data;
-	
-	check_custom_program (dialog);
-}
-
-static void
-check_custom_email (Dialog *dialog)
-{
-	char *str;
-	GtkTextBuffer *text_buffer;
-	GtkTextIter text_iter_start, text_iter_end;
-	ENameSelectorModel *name_selector_model;
-	EDestinationStore *destination_store;
-	GList *destinations;
-	gboolean sens;
-
-	name_selector_model = e_name_selector_peek_model (dialog->name_selector);
-	e_name_selector_model_peek_section (name_selector_model, section_name, NULL, &destination_store);
-	destinations = e_destination_store_list_destinations (destination_store);
-
-	text_buffer = gtk_text_view_get_buffer (GTK_TEXT_VIEW (dialog->malarm_description));
-	gtk_text_buffer_get_start_iter (text_buffer, &text_iter_start);
-	gtk_text_buffer_get_end_iter   (text_buffer, &text_iter_end);
-	str = gtk_text_buffer_get_text (text_buffer, &text_iter_start, &text_iter_end, FALSE);
-
-	sens = (destinations != NULL) && (e_dialog_toggle_get (dialog->malarm_message) ? str && *str : TRUE);
-	gtk_dialog_set_response_sensitive (GTK_DIALOG (dialog->toplevel), GTK_RESPONSE_OK, sens);
-
-	g_list_free (destinations);
-}
-
-static void
-malarm_addresses_changed_cb  (GtkWidget *editable,
-			      gpointer   data)
-{
-	Dialog *dialog = data;
-	
-	check_custom_email (dialog);
-}
-
-static void
-malarm_message_toggled_cb (GtkToggleButton *toggle, gpointer data)
-{
-	Dialog *dialog = data;
-	gboolean active;
-
-	active = gtk_toggle_button_get_active (toggle);
-
-	gtk_widget_set_sensitive (dialog->malarm_group, active);
-	check_custom_email (dialog);
-}
-
-static void
-malarm_description_changed_cb (GtkWidget *widget, gpointer data)
-{
-	Dialog *dialog = data;
-	
-	check_custom_email (dialog);
-}
-
-static void
-action_selection_done_cb (GtkMenuShell *menu_shell, gpointer data)
-{
-	Dialog *dialog = data;
-	ECalComponentAlarmAction action;
-	int page = 0, i;
-	
-	action = e_dialog_option_menu_get (dialog->action, action_map);
-	for (i = 0; action_map[i] != -1 ; i++) {
-		if (action == action_map[i]) {
-			page = i;
-			break;
-		}
-	}
-	
-	gtk_notebook_set_page (GTK_NOTEBOOK (dialog->option_notebook), page);
-
-	switch (action) {	
-	case E_CAL_COMPONENT_ALARM_AUDIO:
-		check_custom_sound (dialog);
-		break;
-
-	case E_CAL_COMPONENT_ALARM_DISPLAY:
-		check_custom_message (dialog);
-		break;
-
-	case E_CAL_COMPONENT_ALARM_EMAIL:
-		check_custom_email (dialog);
-		break;
-
-	case E_CAL_COMPONENT_ALARM_PROCEDURE:
-		check_custom_program (dialog);
-		break;
-	default:
-		g_assert_not_reached ();
-		return;
-	}
-}
-
-/* Hooks the widget signals */
-static void
-init_widgets (Dialog *dialog)
-{
-	GtkWidget *menu;
-	GtkTextBuffer *text_buffer;
-	
-	menu = gtk_option_menu_get_menu (GTK_OPTION_MENU (dialog->action));
-	g_signal_connect (menu, "selection_done",
-			  G_CALLBACK (action_selection_done_cb),
-			  dialog);
-
-	g_signal_connect (G_OBJECT (dialog->repeat_toggle), "toggled",
-			  G_CALLBACK (repeat_toggle_toggled_cb), dialog);
-
-	/* Handle custom sounds */
-	g_signal_connect (G_OBJECT (dialog->aalarm_sound), "toggled",
-			  G_CALLBACK (aalarm_sound_toggled_cb), dialog);
-	g_signal_connect (G_OBJECT (dialog->aalarm_attach), "changed",
-			  G_CALLBACK (aalarm_attach_changed_cb), dialog);
-
-	/* Handle custom messages */
-	g_signal_connect (G_OBJECT (dialog->dalarm_message), "toggled",
-			  G_CALLBACK (dalarm_message_toggled_cb), dialog);
-	text_buffer = gtk_text_view_get_buffer (GTK_TEXT_VIEW (dialog->dalarm_description));
-	g_signal_connect (G_OBJECT (text_buffer), "changed",
-			  G_CALLBACK (dalarm_description_changed_cb), dialog);
-
-	/* Handle program */
-	g_signal_connect (G_OBJECT (dialog->palarm_program), "changed",
-			  G_CALLBACK (palarm_program_changed_cb), dialog);
-
-	/* Handle custom email */
-	g_signal_connect (G_OBJECT (dialog->malarm_message), "toggled",
-			  G_CALLBACK (malarm_message_toggled_cb), dialog);
-	text_buffer = gtk_text_view_get_buffer (GTK_TEXT_VIEW (dialog->malarm_description));
-	g_signal_connect (G_OBJECT (text_buffer), "changed",
-			  G_CALLBACK (malarm_description_changed_cb), dialog);
-
-	g_signal_connect (dialog->malarm_addresses, "changed",
-			  G_CALLBACK (malarm_addresses_changed_cb), dialog);
-}
-
-gboolean
-alarm_dialog_run (GtkWidget *parent, ECal *ecal, ECalComponentAlarm *alarm)
-{
-	Dialog dialog;
-	int response_id;
-	GList *icon_list;
-	
-	g_return_val_if_fail (alarm != NULL, FALSE);
-
-	dialog.alarm = alarm;
-	dialog.ecal = ecal;
-	
-	dialog.xml = glade_xml_new (EVOLUTION_GLADEDIR "/alarm-dialog.glade", NULL, NULL);
-	if (!dialog.xml) {
-		g_message (G_STRLOC ": Could not load the Glade XML file!");
-		return FALSE;
-	}
-
-	if (!get_widgets (&dialog)) {
-		g_object_unref(dialog.xml);
-		return FALSE;
-	}
-
-	if (!setup_select_names (&dialog)) {
-  		g_object_unref (dialog.xml);
-  		return FALSE;
-  	}
-
-	init_widgets (&dialog);
-
-	alarm_to_dialog (&dialog);
-
-	gtk_widget_ensure_style (dialog.toplevel);
-	gtk_container_set_border_width (GTK_CONTAINER (GTK_DIALOG (dialog.toplevel)->vbox), 0);
-	gtk_container_set_border_width (GTK_CONTAINER (GTK_DIALOG (dialog.toplevel)->action_area), 12);
-
-	icon_list = e_icon_factory_get_icon_list ("stock_calendar");
-	if (icon_list) {
-		gtk_window_set_icon_list (GTK_WINDOW (dialog.toplevel), icon_list);
-		g_list_foreach (icon_list, (GFunc) g_object_unref, NULL);
-		g_list_free (icon_list);
-	}
-
-	gtk_window_set_transient_for (GTK_WINDOW (dialog.toplevel),
-				      GTK_WINDOW (parent));
-  
-	response_id = gtk_dialog_run (GTK_DIALOG (dialog.toplevel));
-
-	if (response_id == GTK_RESPONSE_OK)
-		dialog_to_alarm (&dialog);
-
-	gtk_widget_destroy (dialog.toplevel);
-	g_object_unref (dialog.xml);
-
-	return response_id == GTK_RESPONSE_OK ? TRUE : FALSE;
-}
diff --git a/calendar/gui/dialogs/alarm-dialog.glade b/calendar/gui/dialogs/alarm-dialog.glade
deleted file mode 100644
index d6ded5f252..0000000000
--- a/calendar/gui/dialogs/alarm-dialog.glade
+++ /dev/null
@@ -1,1178 +0,0 @@
-<?xml version="1.0" standalone="no"?> <!--*- mode: xml -*-->
-<!DOCTYPE glade-interface SYSTEM "http://glade.gnome.org/glade-2.0.dtd">
-
-<glade-interface>
-<requires lib="gnome"/>
-
-<widget class="GtkDialog" id="alarm-dialog">
-  <property name="border_width">6</property>
-  <property name="visible">True</property>
-  <property name="title" translatable="yes">Add Alarm</property>
-  <property name="type">GTK_WINDOW_TOPLEVEL</property>
-  <property name="window_position">GTK_WIN_POS_NONE</property>
-  <property name="modal">True</property>
-  <property name="resizable">True</property>
-  <property name="destroy_with_parent">False</property>
-  <property name="decorated">True</property>
-  <property name="skip_taskbar_hint">False</property>
-  <property name="skip_pager_hint">False</property>
-  <property name="type_hint">GDK_WINDOW_TYPE_HINT_DIALOG</property>
-  <property name="gravity">GDK_GRAVITY_NORTH_WEST</property>
-  <property name="has_separator">False</property>
-
-  <child internal-child="vbox">
-    <widget class="GtkVBox" id="dialog-vbox1">
-      <property name="visible">True</property>
-      <property name="homogeneous">False</property>
-      <property name="spacing">6</property>
-
-      <child internal-child="action_area">
-	<widget class="GtkHButtonBox" id="dialog-action_area1">
-	  <property name="visible">True</property>
-	  <property name="layout_style">GTK_BUTTONBOX_END</property>
-
-	  <child>
-	    <widget class="GtkButton" id="cancelbutton">
-	      <property name="visible">True</property>
-	      <property name="can_default">True</property>
-	      <property name="can_focus">True</property>
-	      <property name="label">gtk-cancel</property>
-	      <property name="use_stock">True</property>
-	      <property name="relief">GTK_RELIEF_NORMAL</property>
-	      <property name="focus_on_click">True</property>
-	      <property name="response_id">-6</property>
-	    </widget>
-	  </child>
-
-	  <child>
-	    <widget class="GtkButton" id="okbutton">
-	      <property name="visible">True</property>
-	      <property name="can_default">True</property>
-	      <property name="can_focus">True</property>
-	      <property name="label">gtk-ok</property>
-	      <property name="use_stock">True</property>
-	      <property name="relief">GTK_RELIEF_NORMAL</property>
-	      <property name="focus_on_click">True</property>
-	      <property name="response_id">-5</property>
-	    </widget>
-	  </child>
-	</widget>
-	<packing>
-	  <property name="padding">0</property>
-	  <property name="expand">False</property>
-	  <property name="fill">True</property>
-	  <property name="pack_type">GTK_PACK_END</property>
-	</packing>
-      </child>
-
-      <child>
-	<widget class="GtkVBox" id="vbox28">
-	  <property name="border_width">12</property>
-	  <property name="visible">True</property>
-	  <property name="homogeneous">False</property>
-	  <property name="spacing">12</property>
-
-	  <child>
-	    <widget class="GtkLabel" id="label2">
-	      <property name="visible">True</property>
-	      <property name="label" translatable="yes">&lt;b&gt;Alarm&lt;/b&gt;</property>
-	      <property name="use_underline">False</property>
-	      <property name="use_markup">True</property>
-	      <property name="justify">GTK_JUSTIFY_LEFT</property>
-	      <property name="wrap">False</property>
-	      <property name="selectable">False</property>
-	      <property name="xalign">0</property>
-	      <property name="yalign">0.5</property>
-	      <property name="xpad">0</property>
-	      <property name="ypad">0</property>
-	    </widget>
-	    <packing>
-	      <property name="padding">0</property>
-	      <property name="expand">False</property>
-	      <property name="fill">False</property>
-	    </packing>
-	  </child>
-
-	  <child>
-	    <widget class="GtkHBox" id="hbox56">
-	      <property name="visible">True</property>
-	      <property name="homogeneous">False</property>
-	      <property name="spacing">12</property>
-
-	      <child>
-		<widget class="GtkLabel" id="label20">
-		  <property name="visible">True</property>
-		  <property name="label" translatable="yes"></property>
-		  <property name="use_underline">False</property>
-		  <property name="use_markup">False</property>
-		  <property name="justify">GTK_JUSTIFY_LEFT</property>
-		  <property name="wrap">False</property>
-		  <property name="selectable">False</property>
-		  <property name="xalign">0.5</property>
-		  <property name="yalign">0.5</property>
-		  <property name="xpad">0</property>
-		  <property name="ypad">0</property>
-		</widget>
-		<packing>
-		  <property name="padding">0</property>
-		  <property name="expand">False</property>
-		  <property name="fill">False</property>
-		</packing>
-	      </child>
-
-	      <child>
-		<widget class="GtkHBox" id="hbox54">
-		  <property name="visible">True</property>
-		  <property name="homogeneous">False</property>
-		  <property name="spacing">6</property>
-
-		  <child>
-		    <widget class="GtkOptionMenu" id="action">
-		      <property name="visible">True</property>
-		      <property name="can_focus">True</property>
-		      <property name="history">0</property>
-
-		      <child internal-child="menu">
-			<widget class="GtkMenu" id="convertwidget1">
-			  <property name="visible">True</property>
-
-			  <child>
-			    <widget class="GtkMenuItem" id="convertwidget2">
-			      <property name="visible">True</property>
-			      <property name="label" translatable="yes">Pop up an alert</property>
-			      <property name="use_underline">True</property>
-			    </widget>
-			  </child>
-
-			  <child>
-			    <widget class="GtkMenuItem" id="convertwidget3">
-			      <property name="visible">True</property>
-			      <property name="label" translatable="yes">Play a sound</property>
-			      <property name="use_underline">True</property>
-			    </widget>
-			  </child>
-
-			  <child>
-			    <widget class="GtkMenuItem" id="convertwidget4">
-			      <property name="visible">True</property>
-			      <property name="label" translatable="yes">Run a program</property>
-			      <property name="use_underline">True</property>
-			    </widget>
-			  </child>
-
-			  <child>
-			    <widget class="GtkMenuItem" id="send_an_email1">
-			      <property name="visible">True</property>
-			      <property name="label" translatable="yes">Send an email</property>
-			      <property name="use_underline">True</property>
-			    </widget>
-			  </child>
-			</widget>
-		      </child>
-		    </widget>
-		    <packing>
-		      <property name="padding">0</property>
-		      <property name="expand">False</property>
-		      <property name="fill">False</property>
-		    </packing>
-		  </child>
-
-		  <child>
-		    <widget class="GtkSpinButton" id="interval-value">
-		      <property name="visible">True</property>
-		      <property name="can_focus">True</property>
-		      <property name="climb_rate">1</property>
-		      <property name="digits">0</property>
-		      <property name="numeric">True</property>
-		      <property name="update_policy">GTK_UPDATE_ALWAYS</property>
-		      <property name="snap_to_ticks">False</property>
-		      <property name="wrap">False</property>
-		      <property name="adjustment">1 0 999 1 10 10</property>
-		    </widget>
-		    <packing>
-		      <property name="padding">0</property>
-		      <property name="expand">False</property>
-		      <property name="fill">True</property>
-		    </packing>
-		  </child>
-
-		  <child>
-		    <widget class="GtkOptionMenu" id="value-units">
-		      <property name="visible">True</property>
-		      <property name="can_focus">True</property>
-		      <property name="history">0</property>
-
-		      <child internal-child="menu">
-			<widget class="GtkMenu" id="convertwidget5">
-			  <property name="visible">True</property>
-
-			  <child>
-			    <widget class="GtkMenuItem" id="convertwidget6">
-			      <property name="visible">True</property>
-			      <property name="label" translatable="yes">minute(s)</property>
-			      <property name="use_underline">True</property>
-			    </widget>
-			  </child>
-
-			  <child>
-			    <widget class="GtkMenuItem" id="convertwidget7">
-			      <property name="visible">True</property>
-			      <property name="label" translatable="yes">hour(s)</property>
-			      <property name="use_underline">True</property>
-			    </widget>
-			  </child>
-
-			  <child>
-			    <widget class="GtkMenuItem" id="convertwidget8">
-			      <property name="visible">True</property>
-			      <property name="label" translatable="yes">day(s)</property>
-			      <property name="use_underline">True</property>
-			    </widget>
-			  </child>
-			</widget>
-		      </child>
-		    </widget>
-		    <packing>
-		      <property name="padding">0</property>
-		      <property name="expand">False</property>
-		      <property name="fill">False</property>
-		    </packing>
-		  </child>
-
-		  <child>
-		    <widget class="GtkOptionMenu" id="relative">
-		      <property name="visible">True</property>
-		      <property name="can_focus">True</property>
-		      <property name="history">0</property>
-
-		      <child internal-child="menu">
-			<widget class="GtkMenu" id="convertwidget9">
-			  <property name="visible">True</property>
-
-			  <child>
-			    <widget class="GtkMenuItem" id="convertwidget10">
-			      <property name="visible">True</property>
-			      <property name="label" translatable="yes">before</property>
-			      <property name="use_underline">True</property>
-			    </widget>
-			  </child>
-
-			  <child>
-			    <widget class="GtkMenuItem" id="convertwidget11">
-			      <property name="visible">True</property>
-			      <property name="label" translatable="yes">after</property>
-			      <property name="use_underline">True</property>
-			    </widget>
-			  </child>
-			</widget>
-		      </child>
-		    </widget>
-		    <packing>
-		      <property name="padding">0</property>
-		      <property name="expand">False</property>
-		      <property name="fill">False</property>
-		    </packing>
-		  </child>
-
-		  <child>
-		    <widget class="GtkOptionMenu" id="time">
-		      <property name="visible">True</property>
-		      <property name="can_focus">True</property>
-		      <property name="history">0</property>
-
-		      <child internal-child="menu">
-			<widget class="GtkMenu" id="convertwidget12">
-			  <property name="visible">True</property>
-
-			  <child>
-			    <widget class="GtkMenuItem" id="convertwidget13">
-			      <property name="visible">True</property>
-			      <property name="label" translatable="yes">start of appointment</property>
-			      <property name="use_underline">True</property>
-			    </widget>
-			  </child>
-
-			  <child>
-			    <widget class="GtkMenuItem" id="convertwidget14">
-			      <property name="visible">True</property>
-			      <property name="label" translatable="yes">end of appointment</property>
-			      <property name="use_underline">True</property>
-			    </widget>
-			  </child>
-			</widget>
-		      </child>
-		    </widget>
-		    <packing>
-		      <property name="padding">0</property>
-		      <property name="expand">False</property>
-		      <property name="fill">False</property>
-		    </packing>
-		  </child>
-		</widget>
-		<packing>
-		  <property name="padding">0</property>
-		  <property name="expand">True</property>
-		  <property name="fill">True</property>
-		</packing>
-	      </child>
-	    </widget>
-	    <packing>
-	      <property name="padding">0</property>
-	      <property name="expand">False</property>
-	      <property name="fill">False</property>
-	    </packing>
-	  </child>
-
-	  <child>
-	    <widget class="GtkLabel" id="label3">
-	      <property name="visible">True</property>
-	      <property name="label" translatable="yes">&lt;b&gt;Repeat&lt;/b&gt;</property>
-	      <property name="use_underline">False</property>
-	      <property name="use_markup">True</property>
-	      <property name="justify">GTK_JUSTIFY_LEFT</property>
-	      <property name="wrap">False</property>
-	      <property name="selectable">False</property>
-	      <property name="xalign">0</property>
-	      <property name="yalign">0.5</property>
-	      <property name="xpad">0</property>
-	      <property name="ypad">0</property>
-	    </widget>
-	    <packing>
-	      <property name="padding">0</property>
-	      <property name="expand">False</property>
-	      <property name="fill">False</property>
-	    </packing>
-	  </child>
-
-	  <child>
-	    <widget class="GtkHBox" id="hbox57">
-	      <property name="visible">True</property>
-	      <property name="homogeneous">False</property>
-	      <property name="spacing">12</property>
-
-	      <child>
-		<widget class="GtkLabel" id="label21">
-		  <property name="visible">True</property>
-		  <property name="label" translatable="yes"></property>
-		  <property name="use_underline">False</property>
-		  <property name="use_markup">False</property>
-		  <property name="justify">GTK_JUSTIFY_LEFT</property>
-		  <property name="wrap">False</property>
-		  <property name="selectable">False</property>
-		  <property name="xalign">0.5</property>
-		  <property name="yalign">0.5</property>
-		  <property name="xpad">0</property>
-		  <property name="ypad">0</property>
-		</widget>
-		<packing>
-		  <property name="padding">0</property>
-		  <property name="expand">False</property>
-		  <property name="fill">False</property>
-		</packing>
-	      </child>
-
-	      <child>
-		<widget class="GtkVBox" id="vbox5">
-		  <property name="visible">True</property>
-		  <property name="homogeneous">False</property>
-		  <property name="spacing">6</property>
-
-		  <child>
-		    <widget class="GtkCheckButton" id="repeat-toggle">
-		      <property name="visible">True</property>
-		      <property name="can_focus">True</property>
-		      <property name="has_focus">True</property>
-		      <property name="label" translatable="yes">_Repeat the alarm</property>
-		      <property name="use_underline">True</property>
-		      <property name="relief">GTK_RELIEF_NORMAL</property>
-		      <property name="focus_on_click">True</property>
-		      <property name="active">False</property>
-		      <property name="inconsistent">False</property>
-		      <property name="draw_indicator">True</property>
-		    </widget>
-		    <packing>
-		      <property name="padding">0</property>
-		      <property name="expand">False</property>
-		      <property name="fill">False</property>
-		    </packing>
-		  </child>
-
-		  <child>
-		    <widget class="GtkHBox" id="repeat-group">
-		      <property name="visible">True</property>
-		      <property name="homogeneous">False</property>
-		      <property name="spacing">6</property>
-
-		      <child>
-			<widget class="GtkSpinButton" id="repeat-quantity">
-			  <property name="visible">True</property>
-			  <property name="can_focus">True</property>
-			  <property name="climb_rate">1</property>
-			  <property name="digits">0</property>
-			  <property name="numeric">True</property>
-			  <property name="update_policy">GTK_UPDATE_ALWAYS</property>
-			  <property name="snap_to_ticks">False</property>
-			  <property name="wrap">False</property>
-			  <property name="adjustment">1 1 999 1 10 10</property>
-			</widget>
-			<packing>
-			  <property name="padding">0</property>
-			  <property name="expand">True</property>
-			  <property name="fill">True</property>
-			</packing>
-		      </child>
-
-		      <child>
-			<widget class="GtkLabel" id="label1">
-			  <property name="visible">True</property>
-			  <property name="label" translatable="yes">extra times every</property>
-			  <property name="use_underline">False</property>
-			  <property name="use_markup">False</property>
-			  <property name="justify">GTK_JUSTIFY_CENTER</property>
-			  <property name="wrap">False</property>
-			  <property name="selectable">False</property>
-			  <property name="xalign">0.5</property>
-			  <property name="yalign">0.5</property>
-			  <property name="xpad">0</property>
-			  <property name="ypad">0</property>
-			</widget>
-			<packing>
-			  <property name="padding">0</property>
-			  <property name="expand">False</property>
-			  <property name="fill">False</property>
-			</packing>
-		      </child>
-
-		      <child>
-			<widget class="GtkSpinButton" id="repeat-value">
-			  <property name="visible">True</property>
-			  <property name="can_focus">True</property>
-			  <property name="climb_rate">1</property>
-			  <property name="digits">0</property>
-			  <property name="numeric">True</property>
-			  <property name="update_policy">GTK_UPDATE_ALWAYS</property>
-			  <property name="snap_to_ticks">False</property>
-			  <property name="wrap">False</property>
-			  <property name="adjustment">5 0 999 1 10 10</property>
-			</widget>
-			<packing>
-			  <property name="padding">0</property>
-			  <property name="expand">True</property>
-			  <property name="fill">True</property>
-			</packing>
-		      </child>
-
-		      <child>
-			<widget class="GtkOptionMenu" id="repeat-unit">
-			  <property name="visible">True</property>
-			  <property name="can_focus">True</property>
-			  <property name="history">0</property>
-
-			  <child internal-child="menu">
-			    <widget class="GtkMenu" id="convertwidget1">
-			      <property name="visible">True</property>
-
-			      <child>
-				<widget class="GtkMenuItem" id="convertwidget2">
-				  <property name="visible">True</property>
-				  <property name="label" translatable="yes">minutes</property>
-				  <property name="use_underline">True</property>
-				</widget>
-			      </child>
-
-			      <child>
-				<widget class="GtkMenuItem" id="convertwidget3">
-				  <property name="visible">True</property>
-				  <property name="label" translatable="yes">hours</property>
-				  <property name="use_underline">True</property>
-				</widget>
-			      </child>
-
-			      <child>
-				<widget class="GtkMenuItem" id="convertwidget4">
-				  <property name="visible">True</property>
-				  <property name="label" translatable="yes">days</property>
-				  <property name="use_underline">True</property>
-				</widget>
-			      </child>
-			    </widget>
-			  </child>
-			</widget>
-			<packing>
-			  <property name="padding">0</property>
-			  <property name="expand">False</property>
-			  <property name="fill">False</property>
-			</packing>
-		      </child>
-		    </widget>
-		    <packing>
-		      <property name="padding">0</property>
-		      <property name="expand">False</property>
-		      <property name="fill">False</property>
-		    </packing>
-		  </child>
-		</widget>
-		<packing>
-		  <property name="padding">0</property>
-		  <property name="expand">False</property>
-		  <property name="fill">True</property>
-		</packing>
-	      </child>
-	    </widget>
-	    <packing>
-	      <property name="padding">0</property>
-	      <property name="expand">False</property>
-	      <property name="fill">False</property>
-	    </packing>
-	  </child>
-
-	  <child>
-	    <widget class="GtkLabel" id="label4">
-	      <property name="visible">True</property>
-	      <property name="label" translatable="yes">&lt;b&gt;Options&lt;/b&gt;</property>
-	      <property name="use_underline">False</property>
-	      <property name="use_markup">True</property>
-	      <property name="justify">GTK_JUSTIFY_LEFT</property>
-	      <property name="wrap">False</property>
-	      <property name="selectable">False</property>
-	      <property name="xalign">0</property>
-	      <property name="yalign">0.5</property>
-	      <property name="xpad">0</property>
-	      <property name="ypad">0</property>
-	    </widget>
-	    <packing>
-	      <property name="padding">0</property>
-	      <property name="expand">False</property>
-	      <property name="fill">False</property>
-	    </packing>
-	  </child>
-
-	  <child>
-	    <widget class="GtkHBox" id="hbox55">
-	      <property name="visible">True</property>
-	      <property name="homogeneous">False</property>
-	      <property name="spacing">12</property>
-
-	      <child>
-		<widget class="GtkLabel" id="label22">
-		  <property name="visible">True</property>
-		  <property name="label" translatable="yes"></property>
-		  <property name="use_underline">False</property>
-		  <property name="use_markup">False</property>
-		  <property name="justify">GTK_JUSTIFY_LEFT</property>
-		  <property name="wrap">False</property>
-		  <property name="selectable">False</property>
-		  <property name="xalign">0.5</property>
-		  <property name="yalign">0.5</property>
-		  <property name="xpad">0</property>
-		  <property name="ypad">0</property>
-		</widget>
-		<packing>
-		  <property name="padding">0</property>
-		  <property name="expand">False</property>
-		  <property name="fill">False</property>
-		</packing>
-	      </child>
-
-	      <child>
-		<widget class="GtkNotebook" id="option-notebook">
-		  <property name="visible">True</property>
-		  <property name="show_tabs">False</property>
-		  <property name="show_border">False</property>
-		  <property name="tab_pos">GTK_POS_TOP</property>
-		  <property name="scrollable">False</property>
-		  <property name="enable_popup">False</property>
-
-		  <child>
-		    <widget class="GtkVBox" id="vbox3">
-		      <property name="visible">True</property>
-		      <property name="homogeneous">False</property>
-		      <property name="spacing">6</property>
-
-		      <child>
-			<widget class="GtkCheckButton" id="dalarm-message">
-			  <property name="visible">True</property>
-			  <property name="can_focus">True</property>
-			  <property name="label" translatable="yes">Custom _message</property>
-			  <property name="use_underline">True</property>
-			  <property name="relief">GTK_RELIEF_NORMAL</property>
-			  <property name="focus_on_click">True</property>
-			  <property name="active">False</property>
-			  <property name="inconsistent">False</property>
-			  <property name="draw_indicator">True</property>
-			</widget>
-			<packing>
-			  <property name="padding">0</property>
-			  <property name="expand">False</property>
-			  <property name="fill">False</property>
-			</packing>
-		      </child>
-
-		      <child>
-			<widget class="GtkTable" id="dalarm-group">
-			  <property name="visible">True</property>
-			  <property name="n_rows">1</property>
-			  <property name="n_columns">2</property>
-			  <property name="homogeneous">False</property>
-			  <property name="row_spacing">6</property>
-			  <property name="column_spacing">6</property>
-
-			  <child>
-			    <widget class="GtkLabel" id="label2">
-			      <property name="visible">True</property>
-			      <property name="label" translatable="yes">Mes_sage:</property>
-			      <property name="use_underline">True</property>
-			      <property name="use_markup">False</property>
-			      <property name="justify">GTK_JUSTIFY_CENTER</property>
-			      <property name="wrap">False</property>
-			      <property name="selectable">False</property>
-			      <property name="xalign">0</property>
-			      <property name="yalign">0</property>
-			      <property name="xpad">0</property>
-			      <property name="ypad">0</property>
-			      <property name="mnemonic_widget">option-notebook</property>
-			    </widget>
-			    <packing>
-			      <property name="left_attach">0</property>
-			      <property name="right_attach">1</property>
-			      <property name="top_attach">0</property>
-			      <property name="bottom_attach">1</property>
-			      <property name="x_options">fill</property>
-			      <property name="y_options">fill</property>
-			    </packing>
-			  </child>
-
-			  <child>
-			    <widget class="GtkScrolledWindow" id="scrolledwindow1">
-			      <property name="visible">True</property>
-			      <property name="hscrollbar_policy">GTK_POLICY_NEVER</property>
-			      <property name="vscrollbar_policy">GTK_POLICY_AUTOMATIC</property>
-			      <property name="shadow_type">GTK_SHADOW_IN</property>
-			      <property name="window_placement">GTK_CORNER_TOP_LEFT</property>
-
-			      <child>
-				<widget class="GtkTextView" id="dalarm-description">
-				  <property name="visible">True</property>
-				  <property name="can_focus">True</property>
-				  <property name="editable">True</property>
-				  <property name="overwrite">False</property>
-				  <property name="accepts_tab">True</property>
-				  <property name="justification">GTK_JUSTIFY_LEFT</property>
-				  <property name="wrap_mode">GTK_WRAP_WORD</property>
-				  <property name="cursor_visible">True</property>
-				  <property name="pixels_above_lines">0</property>
-				  <property name="pixels_below_lines">0</property>
-				  <property name="pixels_inside_wrap">0</property>
-				  <property name="left_margin">0</property>
-				  <property name="right_margin">0</property>
-				  <property name="indent">0</property>
-				  <property name="text" translatable="yes"></property>
-				</widget>
-			      </child>
-			    </widget>
-			    <packing>
-			      <property name="left_attach">1</property>
-			      <property name="right_attach">2</property>
-			      <property name="top_attach">0</property>
-			      <property name="bottom_attach">1</property>
-			    </packing>
-			  </child>
-			</widget>
-			<packing>
-			  <property name="padding">0</property>
-			  <property name="expand">True</property>
-			  <property name="fill">True</property>
-			</packing>
-		      </child>
-		    </widget>
-		    <packing>
-		      <property name="tab_expand">False</property>
-		      <property name="tab_fill">True</property>
-		    </packing>
-		  </child>
-
-		  <child>
-		    <widget class="GtkLabel" id="label15">
-		      <property name="visible">True</property>
-		      <property name="label" translatable="yes">label15</property>
-		      <property name="use_underline">False</property>
-		      <property name="use_markup">False</property>
-		      <property name="justify">GTK_JUSTIFY_LEFT</property>
-		      <property name="wrap">False</property>
-		      <property name="selectable">False</property>
-		      <property name="xalign">0.5</property>
-		      <property name="yalign">0.5</property>
-		      <property name="xpad">0</property>
-		      <property name="ypad">0</property>
-		    </widget>
-		    <packing>
-		      <property name="type">tab</property>
-		    </packing>
-		  </child>
-
-		  <child>
-		    <widget class="GtkVBox" id="vbox1">
-		      <property name="visible">True</property>
-		      <property name="homogeneous">False</property>
-		      <property name="spacing">6</property>
-
-		      <child>
-			<widget class="GtkCheckButton" id="aalarm-sound">
-			  <property name="visible">True</property>
-			  <property name="can_focus">True</property>
-			  <property name="label" translatable="yes">Custom alarm sound</property>
-			  <property name="use_underline">True</property>
-			  <property name="relief">GTK_RELIEF_NORMAL</property>
-			  <property name="focus_on_click">True</property>
-			  <property name="active">False</property>
-			  <property name="inconsistent">False</property>
-			  <property name="draw_indicator">True</property>
-			</widget>
-			<packing>
-			  <property name="padding">0</property>
-			  <property name="expand">False</property>
-			  <property name="fill">False</property>
-			</packing>
-		      </child>
-
-		      <child>
-			<widget class="GtkHBox" id="aalarm-group">
-			  <property name="visible">True</property>
-			  <property name="homogeneous">False</property>
-			  <property name="spacing">6</property>
-
-			  <child>
-			    <widget class="GtkLabel" id="label3">
-			      <property name="visible">True</property>
-			      <property name="label" translatable="yes">_Sound:</property>
-			      <property name="use_underline">True</property>
-			      <property name="use_markup">False</property>
-			      <property name="justify">GTK_JUSTIFY_CENTER</property>
-			      <property name="wrap">False</property>
-			      <property name="selectable">False</property>
-			      <property name="xalign">0.5</property>
-			      <property name="yalign">0.5</property>
-			      <property name="xpad">0</property>
-			      <property name="ypad">0</property>
-			      <property name="mnemonic_widget">aalarm-attach</property>
-			    </widget>
-			    <packing>
-			      <property name="padding">0</property>
-			      <property name="expand">False</property>
-			      <property name="fill">False</property>
-			    </packing>
-			  </child>
-
-			  <child>
-			    <widget class="GnomeFileEntry" id="file-entry1">
-			      <property name="visible">True</property>
-			      <property name="max_saved">10</property>
-			      <property name="directory_entry">False</property>
-			      <property name="modal">True</property>
-			      <property name="use_filechooser">True</property>
-			      <property name="filechooser_action">GTK_FILE_CHOOSER_ACTION_OPEN</property>
-
-			      <child internal-child="entry">
-				<widget class="GtkEntry" id="aalarm-attach">
-				  <property name="visible">True</property>
-				  <property name="can_focus">True</property>
-				  <property name="editable">True</property>
-				  <property name="visibility">True</property>
-				  <property name="max_length">0</property>
-				  <property name="text" translatable="yes"></property>
-				  <property name="has_frame">True</property>
-				  <property name="invisible_char">*</property>
-				  <property name="activates_default">False</property>
-				</widget>
-			      </child>
-			    </widget>
-			    <packing>
-			      <property name="padding">0</property>
-			      <property name="expand">True</property>
-			      <property name="fill">True</property>
-			    </packing>
-			  </child>
-			</widget>
-			<packing>
-			  <property name="padding">0</property>
-			  <property name="expand">False</property>
-			  <property name="fill">True</property>
-			</packing>
-		      </child>
-		    </widget>
-		    <packing>
-		      <property name="tab_expand">False</property>
-		      <property name="tab_fill">True</property>
-		    </packing>
-		  </child>
-
-		  <child>
-		    <widget class="GtkLabel" id="label16">
-		      <property name="visible">True</property>
-		      <property name="label" translatable="yes">label16</property>
-		      <property name="use_underline">False</property>
-		      <property name="use_markup">False</property>
-		      <property name="justify">GTK_JUSTIFY_LEFT</property>
-		      <property name="wrap">False</property>
-		      <property name="selectable">False</property>
-		      <property name="xalign">0.5</property>
-		      <property name="yalign">0.5</property>
-		      <property name="xpad">0</property>
-		      <property name="ypad">0</property>
-		    </widget>
-		    <packing>
-		      <property name="type">tab</property>
-		    </packing>
-		  </child>
-
-		  <child>
-		    <widget class="GtkVBox" id="vbox2">
-		      <property name="visible">True</property>
-		      <property name="homogeneous">False</property>
-		      <property name="spacing">0</property>
-
-		      <child>
-			<widget class="GtkTable" id="palarm-group">
-			  <property name="visible">True</property>
-			  <property name="n_rows">2</property>
-			  <property name="n_columns">2</property>
-			  <property name="homogeneous">False</property>
-			  <property name="row_spacing">6</property>
-			  <property name="column_spacing">6</property>
-
-			  <child>
-			    <widget class="GtkLabel" id="label5">
-			      <property name="visible">True</property>
-			      <property name="label" translatable="yes">_Program:</property>
-			      <property name="use_underline">True</property>
-			      <property name="use_markup">False</property>
-			      <property name="justify">GTK_JUSTIFY_CENTER</property>
-			      <property name="wrap">False</property>
-			      <property name="selectable">False</property>
-			      <property name="xalign">0</property>
-			      <property name="yalign">0.5</property>
-			      <property name="xpad">0</property>
-			      <property name="ypad">0</property>
-			      <property name="mnemonic_widget">palarm-program</property>
-			    </widget>
-			    <packing>
-			      <property name="left_attach">0</property>
-			      <property name="right_attach">1</property>
-			      <property name="top_attach">0</property>
-			      <property name="bottom_attach">1</property>
-			      <property name="x_options">fill</property>
-			      <property name="y_options"></property>
-			    </packing>
-			  </child>
-
-			  <child>
-			    <widget class="GtkLabel" id="label6">
-			      <property name="visible">True</property>
-			      <property name="label" translatable="yes">_Arguments:</property>
-			      <property name="use_underline">True</property>
-			      <property name="use_markup">False</property>
-			      <property name="justify">GTK_JUSTIFY_CENTER</property>
-			      <property name="wrap">False</property>
-			      <property name="selectable">False</property>
-			      <property name="xalign">0</property>
-			      <property name="yalign">0.5</property>
-			      <property name="xpad">0</property>
-			      <property name="ypad">0</property>
-			      <property name="mnemonic_widget">palarm-args</property>
-			    </widget>
-			    <packing>
-			      <property name="left_attach">0</property>
-			      <property name="right_attach">1</property>
-			      <property name="top_attach">1</property>
-			      <property name="bottom_attach">2</property>
-			      <property name="x_options">fill</property>
-			      <property name="y_options"></property>
-			    </packing>
-			  </child>
-
-			  <child>
-			    <widget class="GtkEntry" id="palarm-program">
-			      <property name="visible">True</property>
-			      <property name="can_focus">True</property>
-			      <property name="editable">True</property>
-			      <property name="visibility">True</property>
-			      <property name="max_length">0</property>
-			      <property name="text" translatable="yes"></property>
-			      <property name="has_frame">True</property>
-			      <property name="invisible_char">*</property>
-			      <property name="activates_default">False</property>
-			    </widget>
-			    <packing>
-			      <property name="left_attach">1</property>
-			      <property name="right_attach">2</property>
-			      <property name="top_attach">0</property>
-			      <property name="bottom_attach">1</property>
-			      <property name="y_options"></property>
-			    </packing>
-			  </child>
-
-			  <child>
-			    <widget class="GtkEntry" id="palarm-args">
-			      <property name="visible">True</property>
-			      <property name="can_focus">True</property>
-			      <property name="editable">True</property>
-			      <property name="visibility">True</property>
-			      <property name="max_length">0</property>
-			      <property name="text" translatable="yes"></property>
-			      <property name="has_frame">True</property>
-			      <property name="invisible_char">*</property>
-			      <property name="activates_default">False</property>
-			    </widget>
-			    <packing>
-			      <property name="left_attach">1</property>
-			      <property name="right_attach">2</property>
-			      <property name="top_attach">1</property>
-			      <property name="bottom_attach">2</property>
-			      <property name="y_options"></property>
-			    </packing>
-			  </child>
-			</widget>
-			<packing>
-			  <property name="padding">0</property>
-			  <property name="expand">False</property>
-			  <property name="fill">True</property>
-			</packing>
-		      </child>
-		    </widget>
-		    <packing>
-		      <property name="tab_expand">False</property>
-		      <property name="tab_fill">True</property>
-		    </packing>
-		  </child>
-
-		  <child>
-		    <widget class="GtkLabel" id="label17">
-		      <property name="visible">True</property>
-		      <property name="label" translatable="yes">label17</property>
-		      <property name="use_underline">False</property>
-		      <property name="use_markup">False</property>
-		      <property name="justify">GTK_JUSTIFY_LEFT</property>
-		      <property name="wrap">False</property>
-		      <property name="selectable">False</property>
-		      <property name="xalign">0.5</property>
-		      <property name="yalign">0.5</property>
-		      <property name="xpad">0</property>
-		      <property name="ypad">0</property>
-		    </widget>
-		    <packing>
-		      <property name="type">tab</property>
-		    </packing>
-		  </child>
-
-		  <child>
-		    <widget class="GtkVBox" id="vbox4">
-		      <property name="visible">True</property>
-		      <property name="homogeneous">False</property>
-		      <property name="spacing">0</property>
-
-		      <child>
-			<widget class="GtkVBox" id="vbox6">
-			  <property name="visible">True</property>
-			  <property name="homogeneous">False</property>
-			  <property name="spacing">6</property>
-
-			  <child>
-			    <widget class="GtkHBox" id="malarm-address-group">
-			      <property name="visible">True</property>
-			      <property name="homogeneous">False</property>
-			      <property name="spacing">6</property>
-
-			      <child>
-				<widget class="GtkButton" id="malarm-addressbook">
-				  <property name="visible">True</property>
-				  <property name="can_focus">True</property>
-				  <property name="label" translatable="yes">Send To:</property>
-				  <property name="use_underline">True</property>
-				  <property name="relief">GTK_RELIEF_NORMAL</property>
-				  <property name="focus_on_click">True</property>
-				</widget>
-				<packing>
-				  <property name="padding">0</property>
-				  <property name="expand">False</property>
-				  <property name="fill">False</property>
-				</packing>
-			      </child>
-
-			      <child>
-				<placeholder/>
-			      </child>
-			    </widget>
-			    <packing>
-			      <property name="padding">0</property>
-			      <property name="expand">True</property>
-			      <property name="fill">True</property>
-			    </packing>
-			  </child>
-
-			  <child>
-			    <widget class="GtkVBox" id="vbox27">
-			      <property name="visible">True</property>
-			      <property name="homogeneous">False</property>
-			      <property name="spacing">6</property>
-
-			      <child>
-				<widget class="GtkCheckButton" id="malarm-message">
-				  <property name="visible">True</property>
-				  <property name="can_focus">True</property>
-				  <property name="label" translatable="yes">Custom _message</property>
-				  <property name="use_underline">True</property>
-				  <property name="relief">GTK_RELIEF_NORMAL</property>
-				  <property name="focus_on_click">True</property>
-				  <property name="active">False</property>
-				  <property name="inconsistent">False</property>
-				  <property name="draw_indicator">True</property>
-				</widget>
-				<packing>
-				  <property name="padding">0</property>
-				  <property name="expand">False</property>
-				  <property name="fill">False</property>
-				</packing>
-			      </child>
-
-			      <child>
-				<widget class="GtkTable" id="malarm-group">
-				  <property name="visible">True</property>
-				  <property name="n_rows">1</property>
-				  <property name="n_columns">2</property>
-				  <property name="homogeneous">False</property>
-				  <property name="row_spacing">6</property>
-				  <property name="column_spacing">6</property>
-
-				  <child>
-				    <widget class="GtkScrolledWindow" id="scrolledwindow3">
-				      <property name="visible">True</property>
-				      <property name="hscrollbar_policy">GTK_POLICY_NEVER</property>
-				      <property name="vscrollbar_policy">GTK_POLICY_AUTOMATIC</property>
-				      <property name="shadow_type">GTK_SHADOW_IN</property>
-				      <property name="window_placement">GTK_CORNER_TOP_LEFT</property>
-
-				      <child>
-					<widget class="GtkTextView" id="malarm-description">
-					  <property name="visible">True</property>
-					  <property name="can_focus">True</property>
-					  <property name="editable">True</property>
-					  <property name="overwrite">False</property>
-					  <property name="accepts_tab">True</property>
-					  <property name="justification">GTK_JUSTIFY_LEFT</property>
-					  <property name="wrap_mode">GTK_WRAP_WORD</property>
-					  <property name="cursor_visible">True</property>
-					  <property name="pixels_above_lines">0</property>
-					  <property name="pixels_below_lines">0</property>
-					  <property name="pixels_inside_wrap">0</property>
-					  <property name="left_margin">0</property>
-					  <property name="right_margin">0</property>
-					  <property name="indent">0</property>
-					  <property name="text" translatable="yes"></property>
-					</widget>
-				      </child>
-				    </widget>
-				    <packing>
-				      <property name="left_attach">1</property>
-				      <property name="right_attach">2</property>
-				      <property name="top_attach">0</property>
-				      <property name="bottom_attach">1</property>
-				      <property name="y_options">fill</property>
-				    </packing>
-				  </child>
-
-				  <child>
-				    <widget class="GtkLabel" id="label19">
-				      <property name="visible">True</property>
-				      <property name="label" translatable="yes">Mes_sage:</property>
-				      <property name="use_underline">True</property>
-				      <property name="use_markup">False</property>
-				      <property name="justify">GTK_JUSTIFY_CENTER</property>
-				      <property name="wrap">False</property>
-				      <property name="selectable">False</property>
-				      <property name="xalign">0</property>
-				      <property name="yalign">0</property>
-				      <property name="xpad">0</property>
-				      <property name="ypad">0</property>
-				      <property name="mnemonic_widget">option-notebook</property>
-				    </widget>
-				    <packing>
-				      <property name="left_attach">0</property>
-				      <property name="right_attach">1</property>
-				      <property name="top_attach">0</property>
-				      <property name="bottom_attach">1</property>
-				      <property name="x_options">fill</property>
-				      <property name="y_options">fill</property>
-				    </packing>
-				  </child>
-				</widget>
-				<packing>
-				  <property name="padding">0</property>
-				  <property name="expand">True</property>
-				  <property name="fill">True</property>
-				</packing>
-			      </child>
-			    </widget>
-			    <packing>
-			      <property name="padding">0</property>
-			      <property name="expand">False</property>
-			      <property name="fill">False</property>
-			    </packing>
-			  </child>
-			</widget>
-			<packing>
-			  <property name="padding">0</property>
-			  <property name="expand">False</property>
-			  <property name="fill">True</property>
-			</packing>
-		      </child>
-		    </widget>
-		    <packing>
-		      <property name="tab_expand">False</property>
-		      <property name="tab_fill">True</property>
-		    </packing>
-		  </child>
-
-		  <child>
-		    <widget class="GtkLabel" id="label18">
-		      <property name="visible">True</property>
-		      <property name="label" translatable="yes">label18</property>
-		      <property name="use_underline">False</property>
-		      <property name="use_markup">False</property>
-		      <property name="justify">GTK_JUSTIFY_LEFT</property>
-		      <property name="wrap">False</property>
-		      <property name="selectable">False</property>
-		      <property name="xalign">0.5</property>
-		      <property name="yalign">0.5</property>
-		      <property name="xpad">0</property>
-		      <property name="ypad">0</property>
-		    </widget>
-		    <packing>
-		      <property name="type">tab</property>
-		    </packing>
-		  </child>
-		</widget>
-		<packing>
-		  <property name="padding">0</property>
-		  <property name="expand">True</property>
-		  <property name="fill">True</property>
-		</packing>
-	      </child>
-	    </widget>
-	    <packing>
-	      <property name="padding">0</property>
-	      <property name="expand">True</property>
-	      <property name="fill">True</property>
-	    </packing>
-	  </child>
-	</widget>
-	<packing>
-	  <property name="padding">0</property>
-	  <property name="expand">True</property>
-	  <property name="fill">True</property>
-	</packing>
-      </child>
-    </widget>
-  </child>
-</widget>
-
-</glade-interface>
diff --git a/calendar/gui/dialogs/alarm-dialog.h b/calendar/gui/dialogs/alarm-dialog.h
deleted file mode 100644
index 8e57579d9f..0000000000
--- a/calendar/gui/dialogs/alarm-dialog.h
+++ /dev/null
@@ -1,37 +0,0 @@
-/* Evolution calendar - Alarm page of the calendar component dialogs
- *
- * Copyright (C) 2001-2003 Ximian, Inc.
- *
- * Authors: Federico Mena-Quintero <federico@ximian.com>
- *          Miguel de Icaza <miguel@ximian.com>
- *          Seth Alves <alves@hungry.com>
- *          JP Rosevear <jpr@ximian.com>
- *          Hans Petter Jansson <hpj@ximian.com>
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of version 2 of the GNU General Public
- * License as published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307, USA.
- */
-
-#ifndef ALARM_DIALOG_H
-#define ALARM_DIALOG_H
-
-#include <libecal/e-cal.h>
-#include <libecal/e-cal-component.h>
-
-G_BEGIN_DECLS
-
-gboolean alarm_dialog_run (GtkWidget *parent, ECal *ecal, ECalComponentAlarm *alarm);
-
-G_END_DECLS
-
-#endif
diff --git a/calendar/gui/dialogs/alarm-list-dialog.c b/calendar/gui/dialogs/alarm-list-dialog.c
deleted file mode 100644
index 88460e0935..0000000000
--- a/calendar/gui/dialogs/alarm-list-dialog.c
+++ /dev/null
@@ -1,261 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-
-/* Evolution calendar - Alarm page of the calendar component dialogs
- *
- * Copyright (C) 2001-2003 Ximian, Inc.
- *
- * Authors: Federico Mena-Quintero <federico@ximian.com>
- *          Miguel de Icaza <miguel@ximian.com>
- *          Seth Alves <alves@hungry.com>
- *          JP Rosevear <jpr@ximian.com>
- *          Hans Petter Jansson <hpj@ximian.com>
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of version 2 of the GNU General Public
- * License as published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307, USA.
- */
-
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
-
-#include <string.h>
-#include <gtk/gtklabel.h>
-#include <gtk/gtkcellrenderertext.h>
-#include <gtk/gtkdialog.h>
-#include <gtk/gtksignal.h>
-#include <gtk/gtktreeview.h>
-#include <gtk/gtktreeselection.h>
-#include <gtk/gtkoptionmenu.h>
-#include <libgnome/gnome-i18n.h>
-#include <glade/glade.h>
-#include "e-util/e-dialog-widgets.h"
-#include "e-util/e-time-utils.h"
-#include <libecal/e-cal-util.h>
-#include <libecal/e-cal-time-util.h>
-#include "e-util/e-dialog-widgets.h"
-#include "e-util/e-icon-factory.h"
-#include "alarm-dialog.h"
-#include "alarm-list-dialog.h"
-
-
-
-typedef struct {
-	/* Glade XML data */
-	GladeXML *xml;
-
-	/* The client */
-	ECal *ecal;
-
-	/* The list store */
-	EAlarmList *list_store;
-	
-	/* Toplevel */
-	GtkWidget *toplevel;
-
-	GtkWidget *list;
-	GtkWidget *add;
-	GtkWidget *delete;
-} Dialog;
-
-/* Gets the widgets from the XML file and returns TRUE if they are all available. */
-static gboolean
-get_widgets (Dialog *dialog)
-{
-#define GW(name) glade_xml_get_widget (dialog->xml, name)
-
-	dialog->toplevel = GW ("alarm-list-dialog");
-	if (!dialog->toplevel)
-		return FALSE;
-
-	dialog->list = GW ("list");
-	dialog->add = GW ("add"); 
-	dialog->delete = GW ("delete");
-
-#undef GW
-
-	return (dialog->list
-		&& dialog->add
-		&& dialog->delete);
-}
-
-static void
-sensitize_buttons (Dialog *dialog)
-{
-	GtkTreeSelection *selection;
-	GtkTreeIter iter;
-	gboolean have_selected, read_only = FALSE;
-	GError *error = NULL;
-
-	if (!e_cal_is_read_only (dialog->ecal, &read_only, &error)) {
-		if (error->code != E_CALENDAR_STATUS_BUSY)
-			read_only = TRUE;
-		g_error_free (error);
-	}
-
-	selection = gtk_tree_view_get_selection (GTK_TREE_VIEW (dialog->list));
-	have_selected = gtk_tree_selection_get_selected (selection, NULL, &iter);
-
-	if ((e_cal_get_one_alarm_only (dialog->ecal) && have_selected) || read_only)
-		gtk_widget_set_sensitive (dialog->add, FALSE);
-	else
-		gtk_widget_set_sensitive (dialog->add, TRUE);
-	gtk_widget_set_sensitive (dialog->delete, have_selected && !read_only);
-}
-
-/* Callback used for the "add reminder" button */
-static void
-add_clicked_cb (GtkButton *button, gpointer data)
-{
-	Dialog *dialog = data;
-	ECalComponentAlarm *alarm;
-	GtkTreeView *view;
-	GtkTreeIter iter;
-	icalcomponent *icalcomp;
-	icalproperty *icalprop;
-	
-	view = GTK_TREE_VIEW (dialog->list);
-
-	alarm = e_cal_component_alarm_new ();
-
-	icalcomp = e_cal_component_alarm_get_icalcomponent (alarm);
-	icalprop = icalproperty_new_x ("1");
-	icalproperty_set_x_name (icalprop, "X-EVOLUTION-NEEDS-DESCRIPTION");
-        icalcomponent_add_property (icalcomp, icalprop);
-	
-	if (alarm_dialog_run (dialog->toplevel, dialog->ecal, alarm)) {
-		e_alarm_list_append (dialog->list_store, &iter, alarm);
-		gtk_tree_selection_select_iter (gtk_tree_view_get_selection (view), &iter);
-	} else {
-		e_cal_component_alarm_free (alarm);
-	}
-
-	sensitize_buttons (dialog);
-}
-
-/* Callback used for the "delete reminder" button */
-static void
-delete_clicked_cb (GtkButton *button, gpointer data)
-{
-	Dialog *dialog = data;
-	GtkTreeSelection *selection;
-	GtkTreeIter iter;
-	GtkTreePath *path;
-	gboolean valid_iter;
-
-	selection = gtk_tree_view_get_selection (GTK_TREE_VIEW (dialog->list));
-	if (!gtk_tree_selection_get_selected (selection, NULL, &iter)) {
-		g_warning ("Could not get a selection to delete.");
-		return;
-	}
-
-	path = gtk_tree_model_get_path (GTK_TREE_MODEL (dialog->list_store), &iter);
-	e_alarm_list_remove (dialog->list_store, &iter);
-
-	/* Select closest item after removal */
-	valid_iter = gtk_tree_model_get_iter (GTK_TREE_MODEL (dialog->list_store), &iter, path);
-	if (!valid_iter) {
-		gtk_tree_path_prev (path);
-		valid_iter = gtk_tree_model_get_iter (GTK_TREE_MODEL (dialog->list_store), &iter, path);
-	}
-
-	if (valid_iter)
-		gtk_tree_selection_select_iter (selection, &iter);
-
-	sensitize_buttons (dialog);
-
-	gtk_tree_path_free (path);
-}
-
-static void
-selection_changed_cb (GtkTreeSelection *selection, gpointer data)
-{
-	Dialog *dialog = data;
-
-	sensitize_buttons (dialog);
-}
-
-/* Hooks the widget signals */
-static void
-init_widgets (Dialog *dialog)
-{
-	GtkTreeViewColumn *column;
-	GtkCellRenderer *cell_renderer;
-
-	/* View */
-	gtk_tree_view_set_model (GTK_TREE_VIEW (dialog->list),
-				 GTK_TREE_MODEL (dialog->list_store));
-
-	column = gtk_tree_view_column_new ();
-	gtk_tree_view_column_set_title (column, _("Action/Trigger"));
-	cell_renderer = GTK_CELL_RENDERER (gtk_cell_renderer_text_new ());
-	gtk_tree_view_column_pack_start (column, cell_renderer, TRUE);
-	gtk_tree_view_column_add_attribute (column, cell_renderer, "text", E_ALARM_LIST_COLUMN_DESCRIPTION);
-	gtk_tree_view_append_column (GTK_TREE_VIEW (dialog->list), column);
-
-	/* Reminder buttons */
-	g_signal_connect (dialog->add, "clicked",
-			  G_CALLBACK (add_clicked_cb), dialog);
-	g_signal_connect (dialog->delete, "clicked",
-			  G_CALLBACK (delete_clicked_cb), dialog);
-
-	g_signal_connect (gtk_tree_view_get_selection (GTK_TREE_VIEW (dialog->list)), "changed",
-			  G_CALLBACK (selection_changed_cb), dialog);
-}
-
-gboolean
-alarm_list_dialog_run (GtkWidget *parent, ECal *ecal, EAlarmList *list_store)
-{
-	Dialog dialog;
-	int response_id;
-	GList *icon_list;
-	
-	dialog.ecal = ecal;
-	dialog.list_store = list_store;	
-
-	dialog.xml = glade_xml_new (EVOLUTION_GLADEDIR "/alarm-list-dialog.glade", NULL, NULL);
-	if (!dialog.xml) {
-		g_message (G_STRLOC ": Could not load the Glade XML file!");
-		return FALSE;
-	}
-
-	if (!get_widgets (&dialog)) {
-		g_object_unref(dialog.xml);
-		return FALSE;
-	}
-
-	init_widgets (&dialog);
-
-	sensitize_buttons (&dialog);
-	
-	gtk_widget_ensure_style (dialog.toplevel);
-	gtk_container_set_border_width (GTK_CONTAINER (GTK_DIALOG (dialog.toplevel)->vbox), 0);
-	gtk_container_set_border_width (GTK_CONTAINER (GTK_DIALOG (dialog.toplevel)->action_area), 12);
-
-	icon_list = e_icon_factory_get_icon_list ("stock_calendar");
-	if (icon_list) {
-		gtk_window_set_icon_list (GTK_WINDOW (dialog.toplevel), icon_list);
-		g_list_foreach (icon_list, (GFunc) g_object_unref, NULL);
-		g_list_free (icon_list);
-	}
-
-	gtk_window_set_transient_for (GTK_WINDOW (dialog.toplevel),
-				      GTK_WINDOW (parent));
-
-	response_id = gtk_dialog_run (GTK_DIALOG (dialog.toplevel));
-	gtk_widget_hide (dialog.toplevel);
-
-	gtk_widget_destroy (dialog.toplevel);
-	g_object_unref (dialog.xml);
-
-	return response_id == GTK_RESPONSE_OK ? TRUE : FALSE;
-}
diff --git a/calendar/gui/dialogs/alarm-list-dialog.glade b/calendar/gui/dialogs/alarm-list-dialog.glade
deleted file mode 100644
index 886b1a47b9..0000000000
--- a/calendar/gui/dialogs/alarm-list-dialog.glade
+++ /dev/null
@@ -1,218 +0,0 @@
-<?xml version="1.0" standalone="no"?> <!--*- mode: xml -*-->
-<!DOCTYPE glade-interface SYSTEM "http://glade.gnome.org/glade-2.0.dtd">
-
-<glade-interface>
-
-<widget class="GtkDialog" id="alarm-list-dialog">
-  <property name="title" translatable="yes">Alarms</property>
-  <property name="type">GTK_WINDOW_TOPLEVEL</property>
-  <property name="window_position">GTK_WIN_POS_CENTER_ON_PARENT</property>
-  <property name="modal">True</property>
-  <property name="default_width">320</property>
-  <property name="default_height">240</property>
-  <property name="resizable">True</property>
-  <property name="destroy_with_parent">False</property>
-  <property name="decorated">True</property>
-  <property name="skip_taskbar_hint">False</property>
-  <property name="skip_pager_hint">False</property>
-  <property name="type_hint">GDK_WINDOW_TYPE_HINT_DIALOG</property>
-  <property name="gravity">GDK_GRAVITY_NORTH_WEST</property>
-  <property name="has_separator">False</property>
-
-  <child internal-child="vbox">
-    <widget class="GtkVBox" id="dialog-vbox1">
-      <property name="visible">True</property>
-      <property name="homogeneous">False</property>
-      <property name="spacing">0</property>
-
-      <child internal-child="action_area">
-	<widget class="GtkHButtonBox" id="dialog-action_area1">
-	  <property name="visible">True</property>
-	  <property name="layout_style">GTK_BUTTONBOX_END</property>
-
-	  <child>
-	    <widget class="GtkButton" id="cancelbutton1">
-	      <property name="visible">True</property>
-	      <property name="can_default">True</property>
-	      <property name="can_focus">True</property>
-	      <property name="label">gtk-cancel</property>
-	      <property name="use_stock">True</property>
-	      <property name="relief">GTK_RELIEF_NORMAL</property>
-	      <property name="focus_on_click">True</property>
-	      <property name="response_id">-6</property>
-	    </widget>
-	  </child>
-
-	  <child>
-	    <widget class="GtkButton" id="okbutton1">
-	      <property name="visible">True</property>
-	      <property name="can_default">True</property>
-	      <property name="can_focus">True</property>
-	      <property name="label">gtk-ok</property>
-	      <property name="use_stock">True</property>
-	      <property name="relief">GTK_RELIEF_NORMAL</property>
-	      <property name="focus_on_click">True</property>
-	      <property name="response_id">-5</property>
-	    </widget>
-	  </child>
-	</widget>
-	<packing>
-	  <property name="padding">0</property>
-	  <property name="expand">False</property>
-	  <property name="fill">True</property>
-	  <property name="pack_type">GTK_PACK_END</property>
-	</packing>
-      </child>
-
-      <child>
-	<widget class="GtkVBox" id="vbox53">
-	  <property name="border_width">12</property>
-	  <property name="visible">True</property>
-	  <property name="homogeneous">False</property>
-	  <property name="spacing">12</property>
-
-	  <child>
-	    <widget class="GtkHBox" id="hbox55">
-	      <property name="visible">True</property>
-	      <property name="homogeneous">False</property>
-	      <property name="spacing">6</property>
-
-	      <child>
-		<widget class="GtkScrolledWindow" id="scrolledwindow13">
-		  <property name="visible">True</property>
-		  <property name="hscrollbar_policy">GTK_POLICY_NEVER</property>
-		  <property name="vscrollbar_policy">GTK_POLICY_AUTOMATIC</property>
-		  <property name="shadow_type">GTK_SHADOW_IN</property>
-		  <property name="window_placement">GTK_CORNER_TOP_LEFT</property>
-
-		  <child>
-		    <widget class="GtkTreeView" id="list">
-		      <property name="visible">True</property>
-		      <property name="can_focus">True</property>
-		      <property name="headers_visible">True</property>
-		      <property name="rules_hint">False</property>
-		      <property name="reorderable">False</property>
-		      <property name="enable_search">True</property>
-		    </widget>
-		  </child>
-		</widget>
-		<packing>
-		  <property name="padding">0</property>
-		  <property name="expand">True</property>
-		  <property name="fill">True</property>
-		</packing>
-	      </child>
-
-	      <child>
-		<widget class="GtkVButtonBox" id="vbuttonbox2">
-		  <property name="visible">True</property>
-		  <property name="layout_style">GTK_BUTTONBOX_START</property>
-		  <property name="spacing">6</property>
-
-		  <child>
-		    <widget class="GtkButton" id="add">
-		      <property name="visible">True</property>
-		      <property name="can_default">True</property>
-		      <property name="can_focus">True</property>
-		      <property name="relief">GTK_RELIEF_NORMAL</property>
-		      <property name="focus_on_click">True</property>
-
-		      <child>
-			<widget class="GtkAlignment" id="alignment1">
-			  <property name="visible">True</property>
-			  <property name="xalign">0.5</property>
-			  <property name="yalign">0.5</property>
-			  <property name="xscale">0</property>
-			  <property name="yscale">0</property>
-			  <property name="top_padding">0</property>
-			  <property name="bottom_padding">0</property>
-			  <property name="left_padding">0</property>
-			  <property name="right_padding">0</property>
-
-			  <child>
-			    <widget class="GtkHBox" id="hbox56">
-			      <property name="visible">True</property>
-			      <property name="homogeneous">False</property>
-			      <property name="spacing">2</property>
-
-			      <child>
-				<widget class="GtkImage" id="image1">
-				  <property name="visible">True</property>
-				  <property name="stock">gtk-add</property>
-				  <property name="icon_size">4</property>
-				  <property name="xalign">0.5</property>
-				  <property name="yalign">0.5</property>
-				  <property name="xpad">0</property>
-				  <property name="ypad">0</property>
-				</widget>
-				<packing>
-				  <property name="padding">0</property>
-				  <property name="expand">False</property>
-				  <property name="fill">False</property>
-				</packing>
-			      </child>
-
-			      <child>
-				<widget class="GtkLabel" id="label65">
-				  <property name="visible">True</property>
-				  <property name="label" translatable="yes">A_dd</property>
-				  <property name="use_underline">True</property>
-				  <property name="use_markup">False</property>
-				  <property name="justify">GTK_JUSTIFY_LEFT</property>
-				  <property name="wrap">False</property>
-				  <property name="selectable">False</property>
-				  <property name="xalign">0.5</property>
-				  <property name="yalign">0.5</property>
-				  <property name="xpad">0</property>
-				  <property name="ypad">0</property>
-				</widget>
-				<packing>
-				  <property name="padding">0</property>
-				  <property name="expand">False</property>
-				  <property name="fill">False</property>
-				</packing>
-			      </child>
-			    </widget>
-			  </child>
-			</widget>
-		      </child>
-		    </widget>
-		  </child>
-
-		  <child>
-		    <widget class="GtkButton" id="delete">
-		      <property name="visible">True</property>
-		      <property name="can_default">True</property>
-		      <property name="can_focus">True</property>
-		      <property name="label">gtk-remove</property>
-		      <property name="use_stock">True</property>
-		      <property name="relief">GTK_RELIEF_NORMAL</property>
-		      <property name="focus_on_click">True</property>
-		    </widget>
-		  </child>
-		</widget>
-		<packing>
-		  <property name="padding">0</property>
-		  <property name="expand">False</property>
-		  <property name="fill">False</property>
-		</packing>
-	      </child>
-	    </widget>
-	    <packing>
-	      <property name="padding">0</property>
-	      <property name="expand">True</property>
-	      <property name="fill">True</property>
-	    </packing>
-	  </child>
-	</widget>
-	<packing>
-	  <property name="padding">0</property>
-	  <property name="expand">True</property>
-	  <property name="fill">True</property>
-	</packing>
-      </child>
-    </widget>
-  </child>
-</widget>
-
-</glade-interface>
diff --git a/calendar/gui/dialogs/alarm-list-dialog.h b/calendar/gui/dialogs/alarm-list-dialog.h
deleted file mode 100644
index a46bcccfa4..0000000000
--- a/calendar/gui/dialogs/alarm-list-dialog.h
+++ /dev/null
@@ -1,38 +0,0 @@
-/* Evolution calendar - Alarm page of the calendar component dialogs
- *
- * Copyright (C) 2001-2003 Ximian, Inc.
- *
- * Authors: Federico Mena-Quintero <federico@ximian.com>
- *          Miguel de Icaza <miguel@ximian.com>
- *          Seth Alves <alves@hungry.com>
- *          JP Rosevear <jpr@ximian.com>
- *          Hans Petter Jansson <hpj@ximian.com>
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of version 2 of the GNU General Public
- * License as published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307, USA.
- */
-
-#ifndef ALARM_LIST_DIALOG_H
-#define ALARM_LIST_DIALOG_H
-
-#include <libecal/e-cal.h>
-#include <libecal/e-cal-component.h>
-#include "../e-alarm-list.h"
-
-G_BEGIN_DECLS
-
-gboolean alarm_list_dialog_run (GtkWidget *parent, ECal *ecal, EAlarmList *list_store);
-
-G_END_DECLS
-
-#endif
diff --git a/calendar/gui/dialogs/cal-attachment-bar.c b/calendar/gui/dialogs/cal-attachment-bar.c
deleted file mode 100644
index 96ea9abf40..0000000000
--- a/calendar/gui/dialogs/cal-attachment-bar.c
+++ /dev/null
@@ -1,931 +0,0 @@
-/* -*- Mode: C; indent-tabs-mode: t; c-basic-offset: 8; tab-width: 8 -*- */
-/*
- *  Authors: Harish Krishnaswamy <kharish@novell.com>
- *
- *  Copyright 2004  Novell, Inc. (www.novell.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.
- *
- */
-
-
-/* Much of this file has been shamelessly copied from the mail attachment
- * handling code, including the fixmes. Modifications/Additions that are
- * specific to the calendar component have been flagged by some comments
- * fwiw */
-
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
-
-#include <string.h>
-#include <gtk/gtk.h>
-#include <glade/glade.h>
-#include <gconf/gconf.h>
-#include <gconf/gconf-client.h>
-#include <gdk/gdkkeysyms.h>
-#include <libgnomevfs/gnome-vfs-mime-handlers.h>
-#include <libgnome/gnome-i18n.h>
-#include "comp-editor.h"
-#include "cal-attachment-select-file.h"
-#include "cal-attachment.h"
-#include "cal-attachment-bar.h"
-
-#include <libedataserver/e-iconv.h>
-
-#include <camel/camel-data-wrapper.h>
-#include <camel/camel-stream-fs.h>
-#include <camel/camel-stream-null.h>
-#include <camel/camel-stream-mem.h>
-#include <camel/camel-stream-filter.h>
-#include <camel/camel-mime-filter-bestenc.h>
-#include <camel/camel-mime-part.h>
-#include <camel/camel-file-utils.h>
-
-#include "e-util/e-gui-utils.h"
-#include "e-util/e-icon-factory.h"
-#include "widgets/misc/e-error.h"
-#include "mail/em-popup.h"
-
-#define ICON_WIDTH 64
-#define ICON_SEPARATORS " /-_"
-#define ICON_SPACING 2
-#define ICON_ROW_SPACING ICON_SPACING
-#define ICON_COL_SPACING ICON_SPACING
-#define ICON_BORDER 2
-#define ICON_TEXT_SPACING 2
-
-static GnomeIconListClass *parent_class = NULL;
-
-struct _CalAttachmentBarPrivate {
-	GSList *attachments;
-	guint num_attachments;
-	/* The persistent copies of the attachments
-	 * derive their location and name from the 
-	 * local_attachment_store and the comp_uid.
-	 */
-	char *local_attachment_store;
-	char *comp_uid;
-};
-
-enum {
-	CHANGED,
-	LAST_SIGNAL
-};
-
-static guint signals[LAST_SIGNAL] = { 0 };
-
-static void update (CalAttachmentBar *bar);
-
-static char *
-size_to_string (gulong size)
-{
-	char *size_string;
-	
-	/* FIXME: The following should probably go into a separate module, as
-           we might have to do the same thing in other places as well.  Also,
-	   I am not sure this will be OK for all the languages.  */
-	
-	if (size < 1e3L) {
-		size_string = NULL;
-	} else {
-		gdouble displayed_size;
-		
-		if (size < 1e6L) {
-			displayed_size = (gdouble) size / 1.0e3;
-			size_string = g_strdup_printf (_("%.0fK"), displayed_size);
-		} else if (size < 1e9L) {
-			displayed_size = (gdouble) size / 1.0e6;
-			size_string = g_strdup_printf (_("%.0fM"), displayed_size);
-		} else {
-			displayed_size = (gdouble) size / 1.0e9;
-			size_string = g_strdup_printf (_("%.0fG"), displayed_size);
-		}
-	}
-	
-	return size_string;
-}
-
-/* Attachment handling functions.  */
-
-static void
-free_attachment_list (CalAttachmentBar *bar)
-{
-	CalAttachmentBarPrivate *priv;
-	GSList *p;
-	
-	priv = bar->priv;
-	
-	for (p = priv->attachments; p != NULL; p = p->next)
-		g_object_unref (p->data);
-	
-	priv->attachments = NULL;
-}
-
-static void
-attachment_changed_cb (CalAttachment *attachment,
-		       gpointer data)
-{
-	update (CAL_ATTACHMENT_BAR (data));
-}
-
-static void
-add_common (CalAttachmentBar *bar,
-	    CalAttachment *attachment)
-{
-	g_return_if_fail (attachment != NULL);
-	
-	g_signal_connect (attachment, "changed",
-			  G_CALLBACK (attachment_changed_cb),
-			  bar);
-	
-	bar->priv->attachments = g_slist_append (bar->priv->attachments,
-						attachment);
-	bar->priv->num_attachments++;
-	
-	update (bar);
-	
-	g_signal_emit (bar, signals[CHANGED], 0);
-}
-
-static void
-add_from_mime_part (CalAttachmentBar *bar,
-		    CamelMimePart *part)
-{
-	add_common (bar, cal_attachment_new_from_mime_part (part));
-}
-
-static void
-add_from_file (CalAttachmentBar *bar,
-	       const char *file_name,
-	       const char *disposition)
-{
-	CalAttachment *attachment;
-	CamelException ex;
-	
-	camel_exception_init (&ex);
-	attachment = cal_attachment_new (file_name, disposition, &ex);
-	if (attachment) {
-		add_common (bar, attachment);
-	} else {
-		e_error_run((GtkWindow *)gtk_widget_get_toplevel((GtkWidget *)bar), "mail-composer:no-attach",
-			    file_name, camel_exception_get_description(&ex), NULL);
-		camel_exception_clear (&ex);
-	}
-}
-
-static void
-remove_attachment (CalAttachmentBar *bar,
-		   CalAttachment *attachment)
-{
-	g_return_if_fail (E_IS_CAL_ATTACHMENT_BAR (bar));
-	g_return_if_fail (g_slist_find (bar->priv->attachments, attachment) != NULL);
-
-	bar->priv->attachments = g_slist_remove (bar->priv->attachments,
-						attachment);
-	bar->priv->num_attachments--;
-	if (attachment->editor_gui != NULL) {
-		GtkWidget *dialog = glade_xml_get_widget (attachment->editor_gui, "dialog");
-		g_signal_emit_by_name (dialog, "response", GTK_RESPONSE_CLOSE);
-	}
-	
-	g_object_unref(attachment);
-	
-	g_signal_emit (bar, signals[CHANGED], 0);
-}
-
-/* Icon list contents handling.  */
-
-static void
-update (CalAttachmentBar *bar)
-{
-	CalAttachmentBarPrivate *priv;
-	GnomeIconList *icon_list;
-	GSList *p;
-	
-	priv = bar->priv;
-	icon_list = GNOME_ICON_LIST (bar);
-	
-	gnome_icon_list_freeze (icon_list);
-	
-	gnome_icon_list_clear (icon_list);
-	
-	for (p = priv->attachments; p != NULL; p = p->next) {
-		CalAttachment *attachment;
-		CamelContentType *content_type;
-		char *size_string, *label;
-		GdkPixbuf *pixbuf;
-		const char *desc;
-		
-		attachment = p->data;
-		content_type = camel_mime_part_get_content_type (attachment->body);
-		/* Get the image out of the attachment 
-		   and create a thumbnail for it */
-		pixbuf = attachment->pixbuf_cache;
-		if (pixbuf) {
-			g_object_ref(pixbuf);
-		} else if (camel_content_type_is(content_type, "image", "*")) {
-			CamelDataWrapper *wrapper;
-			CamelStreamMem *mstream;
-			GdkPixbufLoader *loader;
-			gboolean error = TRUE;
-			
-			wrapper = camel_medium_get_content_object (CAMEL_MEDIUM (attachment->body));
-			mstream = (CamelStreamMem *) camel_stream_mem_new ();
-			
-			camel_data_wrapper_decode_to_stream (wrapper, (CamelStream *) mstream);
-			
-			/* Stream image into pixbuf loader */
-			loader = gdk_pixbuf_loader_new ();
-			error = !gdk_pixbuf_loader_write (loader, mstream->buffer->data, mstream->buffer->len, NULL);
-			gdk_pixbuf_loader_close (loader, NULL);
-			
-			if (!error) {
-				int ratio, width, height;
-				
-				/* Shrink pixbuf */
-				pixbuf = gdk_pixbuf_loader_get_pixbuf (loader);
-				width = gdk_pixbuf_get_width (pixbuf);
-				height = gdk_pixbuf_get_height (pixbuf);
-				if (width >= height) {
-					if (width > 48) {
-						ratio = width / 48;
-						width = 48;
-						height = height / ratio;
-					}
-				} else {
-					if (height > 48) {
-						ratio = height / 48;
-						height = 48;
-						width = width / ratio;
-					}
-				}
-				
-				attachment->pixbuf_cache = gdk_pixbuf_scale_simple 
-					(pixbuf,
-					 width,
-					 height,
-					 GDK_INTERP_BILINEAR);
-				pixbuf = attachment->pixbuf_cache;
-				g_object_ref(pixbuf);
-			} else {
-				pixbuf = NULL;
-				g_warning ("GdkPixbufLoader Error");
-			}
-			
-			/* Destroy everything */
-			g_object_unref (loader);
-			camel_object_unref (mstream);
-		}
-		
-		desc = camel_mime_part_get_description (attachment->body);
-		if (!desc || *desc == '\0')
-			desc = camel_mime_part_get_filename (attachment->body);
-		
-		if (!desc)
-			desc = _("attachment");
-		
-		if (attachment->size
-		    && (size_string = size_to_string (attachment->size))) {
-			label = g_strdup_printf ("%s (%s)", desc, size_string);
-			g_free (size_string);
-		} else
-			label = g_strdup (desc);
-		
-		if (pixbuf == NULL) {
-			char *mime_type;
-			
-			mime_type = camel_content_type_simple (content_type);
-			pixbuf = e_icon_for_mime_type (mime_type, 48);
-			if (pixbuf == NULL) {
-				g_warning("cannot find icon for mime type %s (installation problem?)", mime_type);
-				/* stock_attach would be better, but its fugly scaled up */
-				pixbuf = e_icon_factory_get_icon("stock_unknown", E_ICON_SIZE_DIALOG);
-			}
-			g_free (mime_type);
-		}
-
-		if (pixbuf) {
-			gnome_icon_list_append_pixbuf (icon_list, pixbuf, NULL, label);
-			g_object_unref(pixbuf);
-		}
-		
-		g_free (label);
-	}	
-	gnome_icon_list_thaw (icon_list);
-}
-
-static void
-remove_selected (CalAttachmentBar *bar)
-{
-	GnomeIconList *icon_list;
-	CalAttachment *attachment;
-	GSList *attachment_list, *l;
-	GList *p;
-	int num = 0, left, dlen;
-	
-	icon_list = GNOME_ICON_LIST (bar);
-	
-	attachment_list = NULL;
-	p = gnome_icon_list_get_selection (icon_list);
-	dlen = g_list_length (p);
-	for ( ; p != NULL; p = p->next) {
-		num = GPOINTER_TO_INT (p->data);
-		attachment = CAL_ATTACHMENT (g_slist_nth_data (bar->priv->attachments, num));
-
-		if (g_slist_find (attachment_list, attachment) == NULL) {
-			attachment_list = g_slist_prepend (attachment_list, attachment);
-		}
-	}
-	
-	for (l = attachment_list; l != NULL; l = l->next)
-		remove_attachment (bar, CAL_ATTACHMENT (l->data));
-	
-	g_slist_free (attachment_list);
-	
-	update (bar);
-	
-	left = gnome_icon_list_get_num_icons (icon_list);
-	num = num - dlen + 1;
-	if (left > 0)
-		gnome_icon_list_focus_icon (icon_list, left > num ? num : left - 1);
-}
-
-static void
-edit_selected (CalAttachmentBar *bar)
-{
-	GnomeIconList *icon_list;
-	GList *selection;
-	GSList *attach;
-	int num;
-	
-	icon_list = GNOME_ICON_LIST (bar);
-	
-	selection = gnome_icon_list_get_selection (icon_list);
-	if (selection) {
-		num = GPOINTER_TO_INT (selection->data);
-		attach = g_slist_nth (bar->priv->attachments, num);
-		if (attach)
-			cal_attachment_edit ((CalAttachment *)attach->data, GTK_WIDGET (bar));
-	}
-}
-
-/* "Attach" dialog.  */
-
-static void
-add_from_user (CalAttachmentBar *bar)
-{
-	CompEditor *editor;
-	GPtrArray *file_list;
-	gboolean is_inline = FALSE;
-	int i;
-	
-	editor = COMP_EDITOR (gtk_widget_get_toplevel (GTK_WIDGET (bar)));
-	
-	
-	file_list = comp_editor_select_file_attachments (editor, &is_inline);
-	/*TODO add a good implementation here */
-	if (!file_list)
-		return;
-	
-	for (i = 0; i < file_list->len; i++) {
-		add_from_file (bar, file_list->pdata[i], is_inline ? "inline" : "attachment");
-		g_free (file_list->pdata[i]);
-	}
-	
-	g_ptr_array_free (file_list, TRUE);
-}
-
-/* Callbacks.  */
-
-static void
-cab_add(EPopup *ep, EPopupItem *item, void *data)
-{
-	CalAttachmentBar *bar = data;
-
-	add_from_user(bar);
-}
-
-static void
-cab_properties(EPopup *ep, EPopupItem *item, void *data)
-{
-	CalAttachmentBar *bar = data;
-	
-	edit_selected(bar);
-}
-
-static void
-cab_remove(EPopup *ep, EPopupItem *item, void *data)
-{
-	CalAttachmentBar *bar = data;
-
-	remove_selected(bar);
-}
-
-/* Popup menu handling.  */
-static EPopupItem cab_popups[] = {
-	{ E_POPUP_ITEM, "10.attach", N_("_Remove"), cab_remove, NULL, GTK_STOCK_REMOVE, EM_POPUP_ATTACHMENTS_MANY },
-	{ E_POPUP_ITEM, "20.attach", N_("_Properties"), cab_properties, NULL, GTK_STOCK_PROPERTIES, EM_POPUP_ATTACHMENTS_ONE },
-	{ E_POPUP_BAR, "30.attach.00", NULL, NULL, NULL, NULL, EM_POPUP_ATTACHMENTS_MANY|EM_POPUP_ATTACHMENTS_ONE },
-	{ E_POPUP_ITEM, "30.attach.01", N_("_Add attachment..."), cab_add, NULL, GTK_STOCK_ADD, 0 },
-};
-
-static void
-cab_popup_position(GtkMenu *menu, int *x, int *y, gboolean *push_in, gpointer user_data)
-{
-	CalAttachmentBar *bar = user_data;
-	GnomeIconList *icon_list = user_data;
-	GList *selection;
-	GnomeCanvasPixbuf *image;
-	
-	gdk_window_get_origin (((GtkWidget*) bar)->window, x, y);
-	
-	selection = gnome_icon_list_get_selection (icon_list);
-	if (selection == NULL)
-		return;
-	
-	image = gnome_icon_list_get_icon_pixbuf_item (icon_list, (gint)selection->data);
-	if (image == NULL)
-		return;
-	
-	/* Put menu to the center of icon. */
-	*x += (int)(image->item.x1 + image->item.x2) / 2;
-	*y += (int)(image->item.y1 + image->item.y2) / 2;
-}
-
-static void
-cab_popups_free(EPopup *ep, GSList *l, void *data)
-{
-	g_slist_free(l);
-}
-
-/* if id != -1, then use it as an index for target of the popup */
-static void
-cab_popup(CalAttachmentBar *bar, GdkEventButton *event, int id)
-{
-	GList *p;
-	GSList *attachments = NULL, *menus = NULL;
-	int i;
-	EMPopup *emp;
-	EMPopupTargetAttachments *t;
-	GtkMenu *menu;
-	CalAttachment *attachment;
-
-	if (id == -1
-	    || (attachment = g_slist_nth_data(bar->priv->attachments, id)) == NULL) {
-		p = gnome_icon_list_get_selection((GnomeIconList *)bar);
-		for ( ; p != NULL; p = p->next) {
-			int num = GPOINTER_TO_INT(p->data);
-			CalAttachment *attachment = g_slist_nth_data(bar->priv->attachments, num);
-			
-			if (attachment && g_slist_find(attachments, attachment) == NULL) {
-				g_object_ref(attachment);
-				attachments = g_slist_prepend(attachments, attachment);
-			}
-		}
-		attachments = g_slist_reverse(attachments);
-	} else {
-		g_object_ref(attachment);
-		attachments = g_slist_prepend(attachments, attachment);
-	}
-
-	for (i=0;i<sizeof(cab_popups)/sizeof(cab_popups[0]);i++)
-		menus = g_slist_prepend(menus, &cab_popups[i]);
-
-	/** @HookPoint-EMPopup: Composer Attachment Bar Context Menu
-	 * @Id: org.gnome.evolution.mail.composer.attachmentbar.popup
-	 * @Class: org.gnome.evolution.mail.popup:1.0
-	 * @Target: EMPopupTargetAttachments
-	 *
-	 * This is the context menu on the composer attachment bar.
-	 */
-	emp = em_popup_new("org.gnome.evolution.mail.composer.attachmentbar.popup");
-	e_popup_add_items((EPopup *)emp, menus, NULL, cab_popups_free, bar);
-	t = em_popup_target_new_attachments(emp, attachments);
-	t->target.widget = (GtkWidget *)bar;
-	menu = e_popup_create_menu_once((EPopup *)emp, (EPopupTarget *)t, 0);
-
-	if (event == NULL)
-		gtk_menu_popup(menu, NULL, NULL, cab_popup_position, bar, 0, gtk_get_current_event_time());
-	else
-		gtk_menu_popup(menu, NULL, NULL, NULL, NULL, event->button, event->time);
-}
-
-/* GtkObject methods.  */
-
-static void
-destroy (GtkObject *object)
-{
-	CalAttachmentBar *bar;
-	
-	bar = CAL_ATTACHMENT_BAR (object);
-	
-	if (bar->priv) {
-		free_attachment_list (bar);
-		if (bar->priv->local_attachment_store)
-			g_free (bar->priv->local_attachment_store);
-		if (bar->priv->comp_uid)
-			g_free (bar->priv->comp_uid);
-		g_free (bar->priv);
-		bar->priv = NULL;
-	}
-
-	if (GTK_OBJECT_CLASS (parent_class)->destroy != NULL)
-		(* GTK_OBJECT_CLASS (parent_class)->destroy) (object);
-}
-
-/* GtkWidget methods.  */
-
-static gboolean 
-popup_menu_event (GtkWidget *widget)
-{
-	cab_popup((CalAttachmentBar *)widget, NULL, -1);
-	return TRUE;
-}
-
-
-static int
-button_press_event (GtkWidget *widget, GdkEventButton *event)
-{
-	CalAttachmentBar *bar = (CalAttachmentBar *)widget;
-	GnomeIconList *icon_list = GNOME_ICON_LIST(widget);
-	int icon_number;
-	
-	if (event->button != 3)
-		return GTK_WIDGET_CLASS (parent_class)->button_press_event (widget, event);
-	
-	icon_number = gnome_icon_list_get_icon_at (icon_list, event->x, event->y);
-	if (icon_number >= 0) {
-		gnome_icon_list_unselect_all(icon_list);
-		gnome_icon_list_select_icon (icon_list, icon_number);
-	}
-
-	cab_popup(bar, event, icon_number);
-	
-	return TRUE;
-}
-
-static gint
-key_press_event(GtkWidget *widget, GdkEventKey *event)
-{
-        CalAttachmentBar *bar = CAL_ATTACHMENT_BAR (widget);
-
-        if (event->keyval == GDK_Delete) {
-                remove_selected (bar);
-                return TRUE;
-        }
-                                                                                
-        return GTK_WIDGET_CLASS (parent_class)->key_press_event (widget, event);
-}
-
-/* Initialization.  */
-
-static void
-class_init (CalAttachmentBarClass *klass)
-{
-	GtkObjectClass *object_class;
-	GtkWidgetClass *widget_class;
-	GnomeIconListClass *icon_list_class;
-	
-	object_class = GTK_OBJECT_CLASS (klass);
-	widget_class = GTK_WIDGET_CLASS (klass);
-	icon_list_class = GNOME_ICON_LIST_CLASS (klass);
-	
-	parent_class = g_type_class_ref (gnome_icon_list_get_type ());
-	
-	object_class->destroy = destroy;
-	
-	widget_class->button_press_event = button_press_event;
-	widget_class->popup_menu = popup_menu_event;
-	widget_class->key_press_event = key_press_event;
-
-	/* Setup signals.  */
-	
-	signals[CHANGED] =
-		g_signal_new ("changed",
-			      E_TYPE_CAL_ATTACHMENT_BAR,
-			      G_SIGNAL_RUN_LAST,
-			      G_STRUCT_OFFSET (CalAttachmentBarClass, changed),
-			      NULL, NULL,
-			      g_cclosure_marshal_VOID__VOID,
-			      G_TYPE_NONE, 0);
-}
-
-static void
-init (CalAttachmentBar *bar)
-{
-	CalAttachmentBarPrivate *priv;
-	
-	priv = g_new (CalAttachmentBarPrivate, 1);
-	
-	priv->attachments = NULL;
-	priv->num_attachments = 0;
-	priv->local_attachment_store = NULL;
-	priv->comp_uid = NULL;
-	
-	bar->priv = priv;
-}
-
-GType
-cal_attachment_bar_get_type (void)
-{
-	static GType type = 0;
-	
-	if (type == 0) {
-		static const GTypeInfo info = {
-			sizeof (CalAttachmentBarClass),
-			NULL, NULL,
-			(GClassInitFunc) class_init,
-			NULL, NULL,
-			sizeof (CalAttachmentBar),
-			0,
-			(GInstanceInitFunc) init,
-		};
-		
-		type = g_type_register_static (GNOME_TYPE_ICON_LIST, "CalAttachmentBar", &info, 0);
-	}
-	
-	return type;
-}
-
-GtkWidget *
-cal_attachment_bar_new (GtkAdjustment *adj)
-{
-	CalAttachmentBar *new;
-	GnomeIconList *icon_list;
-	int width, height, icon_width, window_height;
-	PangoFontMetrics *metrics;
-	PangoContext *context;
-	
-	new = g_object_new (cal_attachment_bar_get_type (), NULL);
-	
-	icon_list = GNOME_ICON_LIST (new);
-	
-	context = gtk_widget_get_pango_context ((GtkWidget *) new);
-	metrics = pango_context_get_metrics (context, ((GtkWidget *) new)->style->font_desc, pango_context_get_language (context));
-	width = PANGO_PIXELS (pango_font_metrics_get_approximate_char_width (metrics)) * 15;
-	/* This should be *2, but the icon list creates too much space above ... */
-	height = PANGO_PIXELS (pango_font_metrics_get_ascent (metrics) + pango_font_metrics_get_descent (metrics)) * 3;
-	pango_font_metrics_unref (metrics);
-	
-	icon_width = ICON_WIDTH + ICON_SPACING + ICON_BORDER + ICON_TEXT_SPACING;
-	icon_width = MAX (icon_width, width);
-	
-	gnome_icon_list_construct (icon_list, icon_width, adj, 0);
-	
-	window_height = ICON_WIDTH + ICON_SPACING + ICON_BORDER + ICON_TEXT_SPACING + height;
-	gtk_widget_set_size_request (GTK_WIDGET (new), icon_width * 4, window_height);
-	
-	gnome_icon_list_set_separators (icon_list, ICON_SEPARATORS);
-	gnome_icon_list_set_row_spacing (icon_list, ICON_ROW_SPACING);
-	gnome_icon_list_set_col_spacing (icon_list, ICON_COL_SPACING);
-	gnome_icon_list_set_icon_border (icon_list, ICON_BORDER);
-	gnome_icon_list_set_text_spacing (icon_list, ICON_TEXT_SPACING);
-	gnome_icon_list_set_selection_mode (icon_list, GTK_SELECTION_MULTIPLE);
-
-	atk_object_set_name (gtk_widget_get_accessible (GTK_WIDGET (new)), 
-				_("Attachment Bar"));
-	
-	return GTK_WIDGET (new);
-}
-
-static char *
-get_default_charset (void)
-{
-	GConfClient *gconf;
-	const char *locale;
-	char *charset;
-	
-	gconf = gconf_client_get_default ();
-	charset = gconf_client_get_string (gconf, "/apps/evolution/mail/composer/charset", NULL);
-	
-	if (!charset || charset[0] == '\0') {
-		g_free (charset);
-		charset = gconf_client_get_string (gconf, "/apps/evolution/mail/format/charset", NULL);
-		if (charset && charset[0] == '\0') {
-			g_free (charset);
-			charset = NULL;
-		}
-	}
-	
-	g_object_unref (gconf);
-	
-	if (!charset && (locale = e_iconv_locale_charset ()))
-		charset = g_strdup (locale);
-	
-	return charset ? charset : g_strdup ("us-ascii");
-}
-
-void 
-cal_attachment_bar_set_local_attachment_store (CalAttachmentBar *bar,
-		const char *attachment_store)
-{
-	if (bar->priv->local_attachment_store) 
-		g_free (bar->priv->local_attachment_store);
-	bar->priv->local_attachment_store = 
-		g_strconcat (attachment_store, "/", NULL);
-}
-
-void 
-cal_attachment_bar_set_comp_uid (CalAttachmentBar *bar, char *comp_uid)
-{
-	if (bar->priv->comp_uid) 
-		g_free (bar->priv->comp_uid);
-	bar->priv->comp_uid = comp_uid;	
-}
-
-guint
-cal_attachment_bar_get_num_attachments (CalAttachmentBar *bar)
-{
-	g_return_val_if_fail (bar != NULL, 0);
-	g_return_val_if_fail (E_IS_CAL_ATTACHMENT_BAR (bar), 0);
-	
-	return bar->priv->num_attachments;
-}
-
-void
-cal_attachment_bar_attach_mime_part (CalAttachmentBar *bar,
-						CamelMimePart *part)
-{
-	g_return_if_fail (E_IS_CAL_ATTACHMENT_BAR (bar));
-	
-	add_from_mime_part (bar, part);
-}
-
-void
-cal_attachment_bar_attach (CalAttachmentBar *bar,
-				      const gchar *file_name)
-{
-	g_return_if_fail (E_IS_CAL_ATTACHMENT_BAR (bar));
-	
-	if (file_name == NULL)
-		add_from_user (bar);
-	else
-		add_from_file (bar, file_name, "attachment");
-}
-
-/*
- *  TODO  write a good documentation
- *  this method serializes the attached files on the filesystem
- *  and sets the urls to the component
- */
-GSList *
-cal_attachment_bar_get_attachment_list (CalAttachmentBar *bar)
-{
-	CalAttachmentBarPrivate *priv;
-	CalAttachment *attachment;
-	GSList *list = NULL, *p;
-
-	priv = bar->priv;
-	for (p = priv->attachments; p != NULL; p = p->next) {
-		CamelDataWrapper *wrapper;
-		CamelStreamMem *mstream;
-		unsigned char *buffer = NULL;
-		int fd;
-		char *attach_file_url;
-	
-		attachment = p->data;
-		wrapper = camel_medium_get_content_object (CAMEL_MEDIUM (attachment->body));
-		mstream = (CamelStreamMem *) camel_stream_mem_new ();
-			
-		camel_data_wrapper_decode_to_stream (wrapper, (CamelStream *) mstream);
-		buffer = g_memdup (mstream->buffer->data, mstream->buffer->len);
-
-
-		/* Extract the content from the stream and write it down
-		 * as a mime part file into the directory denoting the
-		 * calendar source */
-		attach_file_url = g_strconcat (priv->local_attachment_store,
-				priv->comp_uid,  "-",
-			 camel_file_util_safe_filename
-			 (camel_mime_part_get_filename (attachment->body)), NULL); 
-
-		fd = open (attach_file_url+7, O_RDWR|O_CREAT|O_TRUNC, 0600);
-		if (fd == -1) {
-			/* TODO handle error conditions */
-			g_message ("DEBUG: could not open the file descriptor\n");
-			continue;
-		}
-
-		/* write the camel mime part  (attachment->body) into the file*/
-		if (camel_write (fd, buffer, mstream->buffer->len) == -1) {
-			/* TODO handle error condition */
-			g_message ("DEBUG: camel write failed.\n");
-			continue;
-		}
-		list = g_slist_append (list, g_strdup (attach_file_url));
-		/* do i need to close the fd */
-		g_free (attach_file_url);
-	}	
-	
-	return list;
-}
-
-char *
-cal_attachment_bar_get_nth_attachment_filename (CalAttachmentBar *bar, int n)
-{
-	CalAttachment *attach;
-
-	g_return_val_if_fail (bar != NULL, 0);
-	g_return_val_if_fail (E_IS_CAL_ATTACHMENT_BAR (bar), 0);
-	
-	attach = g_slist_nth_data (bar->priv->attachments, n);
-	return g_strconcat (bar->priv->local_attachment_store, bar->priv->comp_uid, "-", camel_mime_part_get_filename
-			(attach->body), NULL);
-}
-
-/* TODO (sigh) this loads the attachments
- * from the file system just for displaying the iconlist
- * need a better approach here.
- */
-void
-cal_attachment_bar_set_attachment_list (CalAttachmentBar *bar, GSList *attach_list)
-{
-	CalAttachmentBarPrivate *priv;
-	GSList  *p;
-
-	priv = bar->priv;
-
-	if (priv->attachments) {
-		/* To prevent repopulating the
-		 * bar due to redraw functions in fill_widget. 
-		 * Assumes it can be set only once.
-		 */		
-		return; 
-	}
-
-	for (p = attach_list; p != NULL; p = p->next) {
-		char *attach_filename;
-		CalAttachment *attach;
-		
-		attach_filename = (char *) p->data;
-		/* should we assert if g_str_has_prefix (attach_filename, "file://")) 
-		 * here
-		*/
-		/* get url sans protocol and add it to the bar.
-		 * how to set the filename properly */
-		cal_attachment_bar_attach (bar, attach_filename +7);
-		/* set file name correctly on the display */
-		attach =  g_slist_nth_data (priv->attachments,
-				priv->num_attachments-1);
-		if (attach) {
-			camel_mime_part_set_filename (attach->body,
-					attach_filename + strlen (priv->local_attachment_store)+ 
-					strlen (priv->comp_uid) + 1); 
-			update (bar);
-		}
-	}
-}
-
-GSList *
-cal_attachment_bar_get_mime_attach_list (CalAttachmentBar *bar)
-{
-	CalAttachmentBarPrivate *priv;
-	struct CalMimeAttach *cal_mime_attach;
-	GSList *attach_list = NULL, *l;
-
-	/* TODO assert sanity of bar */
-	priv = bar->priv;	
-	for (l = priv->attachments; l ; l = l->next) {
-		
-		CalAttachment *attach = (CalAttachment *) l->data;
-		CamelDataWrapper *wrapper;
-		CamelStreamMem *mstream;
-		unsigned char *buffer = NULL;
-		char *desc;
-		
-		cal_mime_attach = g_malloc0 (sizeof (struct CalMimeAttach));
-		wrapper = camel_medium_get_content_object (CAMEL_MEDIUM (attach->body));
-		mstream = (CamelStreamMem *) camel_stream_mem_new ();
-			
-		camel_data_wrapper_decode_to_stream (wrapper, (CamelStream *) mstream);
-		buffer = g_memdup (mstream->buffer->data, mstream->buffer->len);
-		
-		cal_mime_attach->encoded_data = buffer;
-		cal_mime_attach->length = mstream->buffer->len;
-		cal_mime_attach->filename = g_strdup (camel_mime_part_get_filename
-			((CamelMimePart *) attach->body));
-		desc = camel_mime_part_get_description ((CamelMimePart *) attach->body);
-		if (!desc || *desc == '\0')
-			desc = _("attachment");
-		cal_mime_attach->description = g_strdup (desc);
-		cal_mime_attach->content_type = g_strdup (camel_data_wrapper_get_mime_type (wrapper));
-		
-		attach_list = g_slist_append (attach_list, cal_mime_attach);
-		
-	}
-
-	return attach_list;
-}
diff --git a/calendar/gui/dialogs/cal-attachment-bar.h b/calendar/gui/dialogs/cal-attachment-bar.h
deleted file mode 100644
index 468bae0495..0000000000
--- a/calendar/gui/dialogs/cal-attachment-bar.h
+++ /dev/null
@@ -1,84 +0,0 @@
-/* -*- Mode: C; indent-tabs-mode: t; c-basic-offset: 8; tab-width: 8 -*- */
-/* msg-composer-attachment-bar.h
- *
- * Copyright (C) 2004  Novell, Inc.
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of version 2 of the GNU General Public
- * published by the Free Software Foundation; either version 2 of the
- * License as published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * General Public License for more details.
- *
- * You should have received a copy of the GNU General Public
- * 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: Harish Krishnaswamy <kharish@novell.com>
- */
-
-#ifndef __CAL_ATTACHMENT_BAR_H__
-#define __CAL_ATTACHMENT_BAR_H__
-
-#include <libgnomeui/gnome-icon-list.h>
-#include <camel/camel-multipart.h>
-
-
-#ifdef __cplusplus
-extern "C" {
-#pragma }
-#endif /* __cplusplus */
-
-#define E_TYPE_CAL_ATTACHMENT_BAR \
-	(cal_attachment_bar_get_type ())
-#define CAL_ATTACHMENT_BAR(obj)   \
-	(G_TYPE_CHECK_INSTANCE_CAST ((obj), E_TYPE_CAL_ATTACHMENT_BAR, CalAttachmentBar))
-#define CAL_ATTACHMENT_BAR_CLASS(klass) \
-	(G_TYPE_CHECK_CLASS_CAST ((klass), E_TYPE_CAL_ATTACHMENT_BAR, CalAttachmentBarClass))
-#define E_IS_CAL_ATTACHMENT_BAR(obj) \
-	(G_TYPE_CHECK_INSTANCE_TYPE ((obj), E_TYPE_CAL_ATTACHMENT_BAR))
-#define E_IS_CAL_ATTACHMENT_BAR_CLASS(klass) \
-	(G_TYPE_CHECK_CLASS_TYPE ((obj), E_TYPE_CAL_ATTACHMENT_BAR))
-
-typedef struct _CalAttachmentBar CalAttachmentBar;
-typedef struct _CalAttachmentBarClass CalAttachmentBarClass;
-typedef struct _CalAttachmentBarPrivate CalAttachmentBarPrivate;
-
-struct _CalAttachmentBar {
-	GnomeIconList parent;
-	
-	CalAttachmentBarPrivate *priv;
-};
-
-struct _CalAttachmentBarClass {
-	GnomeIconListClass parent_class;
-	
-	void (* changed) (CalAttachmentBar *bar);
-};
-
-
-GtkType cal_attachment_bar_get_type (void);
-
-GtkWidget *cal_attachment_bar_new (GtkAdjustment *adj);
-void cal_attachment_bar_to_multipart (CalAttachmentBar *bar, CamelMultipart *multipart,
-						 const char *default_charset);
-guint cal_attachment_bar_get_num_attachments (CalAttachmentBar *bar);
-void cal_attachment_bar_attach (CalAttachmentBar *bar, const char *file_name);
-void cal_attachment_bar_attach_mime_part (CalAttachmentBar *bar, CamelMimePart *part);
-GSList *cal_attachment_bar_get_attachment_list (CalAttachmentBar *bar);
-char * cal_attachment_bar_get_nth_attachment_filename (CalAttachmentBar *bar, int n);
-GSList *cal_attachment_bar_get_mime_attach_list (CalAttachmentBar *bar);
-void cal_attachment_bar_set_attachment_list (CalAttachmentBar *bar, GSList *attach_list);
-void cal_attachment_bar_set_local_attachment_store (CalAttachmentBar *bar, 
-		const char *attachment_store);
-void cal_attachment_bar_set_comp_uid (CalAttachmentBar *bar, char *comp_uid);
-
-#ifdef __cplusplus
-}
-#endif /* __cplusplus */
-
-#endif /* __CAL_ATTACHMENT_BAR_H__ */
diff --git a/calendar/gui/dialogs/cal-attachment-select-file.c b/calendar/gui/dialogs/cal-attachment-select-file.c
deleted file mode 100644
index 6e64ea09c7..0000000000
--- a/calendar/gui/dialogs/cal-attachment-select-file.c
+++ /dev/null
@@ -1,224 +0,0 @@
-/* -*- Mode: C; indent-tabs-mode: t; c-basic-offset: 8; tab-width: 8 -*- */
-/*
- *  Authors: Harish Krishnaswamy <kharish@novell.com>
- *
- *  Copyright 2004 Novell, Inc. (www.novell.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.
- *
- */
-
-/* Much of this file has been shamelessly copied from the mail attachment
- * handling code, including the fixmes. Modifications/Additions that are
- * specific to the calendar component have been flagged by some comments
- * fwiw */
-
-
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
-
-#include <gtk/gtkbox.h>
-#include <gtk/gtkcheckbutton.h>
-#include <gtk/gtkmain.h>
-#include <gtk/gtksignal.h>
-#include <gtk/gtkversion.h>
-
-#ifdef USE_GTKFILECHOOSER
-#include <gtk/gtkfilechooser.h>
-#include <gtk/gtkfilechooserdialog.h>
-#include <gtk/gtkstock.h>
-#else
-#include <gtk/gtkfilesel.h>
-#endif
-
-#include <libgnomeui/gnome-uidefs.h>
-#include <libgnome/gnome-i18n.h>
-
-#include "cal-attachment-select-file.h"
-#include <e-util/e-icon-factory.h>
-
-enum {
-	SELECTOR_MODE_MULTI    = (1 << 0),
-	SELECTOR_MODE_SAVE     = (1 << 1)
-};
-
-static GtkWidget*
-run_selector(CompEditor *editor, const char *title, guint32 flags, gboolean *showinline_p)
-{
-	GtkWidget *selection;
-	GtkWidget *showinline = NULL;
-	char *path;
-	GList *icon_list;
-	
-	path = g_object_get_data ((GObject *) editor, "attach_path");
-	
-#ifdef USE_GTKFILECHOOSER
-	if (flags & SELECTOR_MODE_SAVE)
-		selection = gtk_file_chooser_dialog_new (title,
-							 NULL,
-							 GTK_FILE_CHOOSER_ACTION_SAVE,
-							 GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL,
-							 GTK_STOCK_SAVE, GTK_RESPONSE_OK,
-							 NULL);
-	else
-		selection = gtk_file_chooser_dialog_new (title,
-							 NULL,
-							 GTK_FILE_CHOOSER_ACTION_OPEN,
-							 GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL,
-							 GTK_STOCK_OPEN, GTK_RESPONSE_OK,
-							 NULL);
-	
-	gtk_dialog_set_default_response (GTK_DIALOG (selection), GTK_RESPONSE_OK);
-	
-	if ((flags & SELECTOR_MODE_SAVE) == 0)
-		gtk_file_chooser_set_select_multiple ((GtkFileChooser *) selection, (flags & SELECTOR_MODE_MULTI));
-	
-	/* restore last path used */
-	if (!path)
-		gtk_file_chooser_set_current_folder (GTK_FILE_CHOOSER (selection), g_get_home_dir ());
-	else
-		gtk_file_chooser_set_current_folder (GTK_FILE_CHOOSER (selection), path);
-	
-        if (showinline_p) {
-		showinline = gtk_check_button_new_with_label (_("Suggest automatic display of attachment"));
-		gtk_widget_show (showinline);
-		gtk_file_chooser_set_extra_widget (GTK_FILE_CHOOSER (selection), showinline);
-        }
-#else
-	selection = gtk_file_selection_new (title);
-	
-	gtk_file_selection_set_select_multiple ((GtkFileSelection *) selection, (flags & SELECTOR_MODE_MULTI));
-	
-	/* restore last path used */
-	if (!path) {
-		path = g_strdup_printf ("%s/", g_get_home_dir ());
-		gtk_file_selection_set_filename (GTK_FILE_SELECTION (selection), path);
-		g_free (path);
-	} else {
-		gtk_file_selection_set_filename (GTK_FILE_SELECTION (selection), path);
-	}
-	
-	if (showinline_p) {
-		showinline = gtk_check_button_new_with_label (_("Suggest automatic display of attachment"));
-		gtk_widget_show (showinline);
-		gtk_box_pack_end (GTK_BOX (GTK_FILE_SELECTION (selection)->main_vbox), showinline, FALSE, FALSE, 4);
-	}
-#endif
-	
-	gtk_window_set_transient_for ((GtkWindow *) selection, (GtkWindow *) editor);
-	gtk_window_set_wmclass ((GtkWindow *) selection, "fileselection", "Evolution:editor");
-	gtk_window_set_modal ((GtkWindow *) selection, TRUE);
-	
-	icon_list = e_icon_factory_get_icon_list ("stock_mail-compose");
-	if (icon_list) {
-		gtk_window_set_icon_list (GTK_WINDOW (selection), icon_list);
-		g_list_foreach (icon_list, (GFunc) g_object_unref, NULL);
-		g_list_free (icon_list);
-	}
-	
-	if (gtk_dialog_run ((GtkDialog *) selection) == GTK_RESPONSE_OK) {
-		if (showinline_p)
-			*showinline_p = gtk_toggle_button_get_active ((GtkToggleButton *) showinline);
-		
-#ifdef USE_GTKFILECHOOSER
-		path = g_path_get_dirname (gtk_file_chooser_get_filename (GTK_FILE_CHOOSER (selection)));
-#else
-		path = g_path_get_dirname (gtk_file_selection_get_filename (GTK_FILE_SELECTION (selection)));
-#endif
-		
-		g_object_set_data_full ((GObject *) editor, "attach_path", g_strdup_printf ("%s/", path), g_free);
-		g_free (path);
-	} else {
-		gtk_widget_destroy (selection);
-		selection = NULL;
-	}
-	
-	return selection;
-}
-
-/**
- * comp_editor_select_file:
- * @editor: a editor
- * @title: the title for the file selection dialog box
- * @save_mode: whether the file selection box should be shown in save mode or not
- *
- * This pops up a file selection dialog box with the given title
- * and allows the user to select a file.
- *
- * Return value: the selected filename, or %NULL if the user
- * cancelled.
- **/
-char *
-comp_editor_select_file (CompEditor *editor, const char *title, gboolean save_mode)
-{
-	guint32 flags = save_mode ? SELECTOR_MODE_SAVE : SELECTOR_MODE_MULTI;
-	GtkWidget *selection;
-	char *name = NULL;
-	
-	selection = run_selector (editor, title, flags, NULL);
-	if (selection) {
-#ifdef USE_GTKFILECHOOSER
-		name = g_strdup (gtk_file_chooser_get_filename (GTK_FILE_CHOOSER (selection)));
-#else
-		name = g_strdup (gtk_file_selection_get_filename (GTK_FILE_SELECTION (selection)));
-#endif
-		gtk_widget_destroy (selection);
-	}
-
-	return name;
-}
-
-GPtrArray *
-comp_editor_select_file_attachments (CompEditor *editor, gboolean *showinline_p)
-{
-	GtkWidget *selection;
-	GPtrArray *list = NULL;
-	
-	selection = run_selector (editor, _("Attach file(s)"), SELECTOR_MODE_MULTI, showinline_p);
-	
-	if (selection) {
-#ifdef USE_GTKFILECHOOSER
-		GSList *files, *l, *n;
-		
-		if ((l = files = gtk_file_chooser_get_filenames (GTK_FILE_CHOOSER (selection)))) {
-			list = g_ptr_array_new ();
-			
-			while (l) {
-				n = l->next;
-				g_ptr_array_add (list, l->data);
-				g_slist_free_1 (l);
-				l = n;
-			}
-		}
-#else
-		char **files;
-		int i;
-		
-		if ((files = gtk_file_selection_get_selections (GTK_FILE_SELECTION (selection)))) {
-			list = g_ptr_array_new ();
-			for (i = 0; files[i]; i++)
-				g_ptr_array_add (list, files[i]);
-			
-			g_free (files);
-		}
-#endif
-		
-		gtk_widget_destroy (selection);
-	}
-	
-	return list;
-}
-
diff --git a/calendar/gui/dialogs/cal-attachment-select-file.h b/calendar/gui/dialogs/cal-attachment-select-file.h
deleted file mode 100644
index 99b113783a..0000000000
--- a/calendar/gui/dialogs/cal-attachment-select-file.h
+++ /dev/null
@@ -1,36 +0,0 @@
-/* -*- Mode: C; indent-tabs-mode: t; c-basic-offset: 8; tab-width: 8 -*- */
-/* cal-attachment-select-file.c
- *
- * Copyright (C) 2004 Novell, Inc.
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of version 2 of the GNU General Public
- * published by the Free Software Foundation; either version 2 of the
- * License as published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * General Public License for more details.
- *
- * You should have received a copy of the GNU General Public
- * 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: Harish K <kharish@novell.com>
- */
-
-#ifndef E_MSG_COMPOSER_SELECT_FILE_H
-#define E_MSG_COMPOSER_SELECT_FILE_H
-
-#include "comp-editor.h"
-
-char *comp_editor_select_file (CompEditor *editor,
-				  const char *title,
-				  gboolean save_mode);
-
-GPtrArray *comp_editor_select_file_attachments (CompEditor *editor,
-						   gboolean *inline_p);
-
-#endif /* CAL_ATTACHMENT_SELECT_FILE_H */
diff --git a/calendar/gui/dialogs/cal-attachment.c b/calendar/gui/dialogs/cal-attachment.c
deleted file mode 100644
index 2f36aaf887..0000000000
--- a/calendar/gui/dialogs/cal-attachment.c
+++ /dev/null
@@ -1,486 +0,0 @@
-/* -*- Mode: C; indent-tabs-mode: t; c-basic-offset: 8; tab-width: 8 -*- */
-/*
- *  Authors: Harish Krishnaswamy <kharish@novell.com>
- *  Copyright 2004 Novell Inc. <www.novell.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.
- *
- */
-
-
-/* Much of this file has been shamelessly copied from the mail attachment
- * handling code, including the fixmes. Modifications/Additions that are
- * specific to the calendar component have been flagged by some comments
- * fwiw */
-
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
-
-#include <sys/stat.h>
-#include <string.h>
-#include <errno.h>
-
-#include <gtk/gtknotebook.h>
-#include <gtk/gtktogglebutton.h>
-#include <gtk/gtkdialog.h>
-#include <libgnomevfs/gnome-vfs.h>
-#include <libgnome/gnome-i18n.h>
-
-#include "e-util/e-mktemp.h"
-#include <camel/camel.h>
-
-#include "comp-editor.h"
-#include "cal-attachment.h"
-
-
-enum {
-	CHANGED,
-	LAST_SIGNAL
-};
-static guint signals[LAST_SIGNAL] = { 0 };
-
-static GObjectClass *parent_class = NULL;
-
-
-static void
-changed (CalAttachment *attachment)
-{
-	g_signal_emit (attachment, signals[CHANGED], 0);
-}
-
-
-/* GtkObject methods.  */
-
-static void
-finalise(GObject *object)
-{
-	CalAttachment *attachment;
-	
-	attachment = CAL_ATTACHMENT (object);
-	
-	camel_object_unref (attachment->body);
-	if (attachment->pixbuf_cache != NULL)
-		g_object_unref (attachment->pixbuf_cache);
-	
-        G_OBJECT_CLASS (parent_class)->finalize (object);
-}
-
-
-/* Signals.  */
-
-static void
-real_changed (CalAttachment *cal_attachment)
-{
-	g_return_if_fail (E_IS_CAL_ATTACHMENT (cal_attachment));
-}
-
-
-static void
-class_init (CalAttachmentClass *klass)
-{
-	GObjectClass *object_class;
-	
-	object_class = (GObjectClass*) klass;
-	parent_class = g_type_class_ref (G_TYPE_OBJECT);
-	
-	object_class->finalize = finalise;
-	klass->changed = real_changed;
-	
-	signals[CHANGED] = g_signal_new ("changed",
-					 E_TYPE_CAL_ATTACHMENT,
-					 G_SIGNAL_RUN_FIRST,
-					 G_STRUCT_OFFSET (CalAttachmentClass, changed),
-					 NULL,
-					 NULL,
-					 g_cclosure_marshal_VOID__VOID,
-					 G_TYPE_NONE, 0);
-}
-
-static void
-init (CalAttachment *cal_attachment)
-{
-	cal_attachment->editor_gui = NULL;
-	cal_attachment->body = NULL;
-	cal_attachment->size = 0;
-	cal_attachment->pixbuf_cache = NULL;
-}
-
-GType
-cal_attachment_get_type (void)
-{
-	static GType type = 0;
-	
-	if (type == 0) {
-		static const GTypeInfo info = {
-			sizeof (CalAttachmentClass),
-			NULL,
-			NULL,
-			(GClassInitFunc) class_init,
-			NULL,
-			NULL,
-			sizeof (CalAttachment),
-			0,
-			(GInstanceInitFunc) init,
-		};
-		
-		type = g_type_register_static (G_TYPE_OBJECT, "CalAttachment", &info, 0);
-	}
-	
-	return type;
-}
-
-/**
- * cal_attachment_guess_mime_type:
- * @file_name: filename
- * Returns the guessed mime type of the file given by #file_name
- **/ 
- 
-static char *
-cal_attachment_guess_mime_type (const char *file_name)
-{
-	GnomeVFSFileInfo *info;
-	GnomeVFSResult result;
-	char *type = NULL;
-
-	info = gnome_vfs_file_info_new ();
-	result = gnome_vfs_get_file_info (file_name, info,
-					  GNOME_VFS_FILE_INFO_GET_MIME_TYPE |
-					  GNOME_VFS_FILE_INFO_FORCE_SLOW_MIME_TYPE |
-					  GNOME_VFS_FILE_INFO_FOLLOW_LINKS);
-	if (result == GNOME_VFS_OK)
-		type = g_strdup (gnome_vfs_file_info_get_mime_type (info));
-
-	gnome_vfs_file_info_unref (info);
-
-	return type;
-}
-
-
-/**
- * cal_attachment_new:
- * @file_name: filename to attach
- * @disposition: Content-Disposition of the attachment
- * @ex: exception
- *
- * Return value: the new attachment, or %NULL on error
- **/
-CalAttachment *
-cal_attachment_new (const char *file_name,
-			       const char *disposition,
-			       CamelException *ex)
-{
-	CalAttachment *new;
-	CamelMimePart *part;
-	CamelDataWrapper *wrapper;
-	CamelStream *stream;
-	struct stat statbuf;
-	char *mime_type;
-	char *filename;
-	
-	g_return_val_if_fail (file_name != NULL, NULL);
-	
-	if (stat (file_name, &statbuf) < 0) {
-		camel_exception_setv (ex, CAMEL_EXCEPTION_SYSTEM,
-				      _("Cannot attach file %s: %s"),
-				      file_name, g_strerror (errno));
-		return NULL;
-	}
-	
-	/* return if it's not a regular file */
-	if (!S_ISREG (statbuf.st_mode)) {
-		camel_exception_setv (ex, CAMEL_EXCEPTION_SYSTEM,
-				      _("Cannot attach file %s: not a regular file"),
-				      file_name);
-		return NULL;
-	}
-	
-	stream = camel_stream_fs_new_with_name (file_name, O_RDONLY, 0);
-	if (!stream) {
-		camel_exception_setv (ex, CAMEL_EXCEPTION_SYSTEM,
-				      _("Cannot attach file %s: %s"),
-				      file_name, g_strerror (errno));
-		return NULL;
-	}
-	
-	mime_type = cal_attachment_guess_mime_type (file_name);
-	if (mime_type) {
-		if (!g_ascii_strcasecmp (mime_type, "message/rfc822")) {
-			wrapper = (CamelDataWrapper *) camel_mime_message_new ();
-		} else {
-			wrapper = camel_data_wrapper_new ();
-		}
-		
-		camel_data_wrapper_construct_from_stream (wrapper, stream);
-		camel_data_wrapper_set_mime_type (wrapper, mime_type);
-		g_free (mime_type);
-	} else {
-		wrapper = camel_data_wrapper_new ();
-		camel_data_wrapper_construct_from_stream (wrapper, stream);
-		camel_data_wrapper_set_mime_type (wrapper, "application/octet-stream");
-	}
-	
-	camel_object_unref (stream);
-	
-	part = camel_mime_part_new ();
-	camel_medium_set_content_object (CAMEL_MEDIUM (part), wrapper);
-	camel_object_unref (wrapper);
-	
-	camel_mime_part_set_disposition (part, disposition);
-	filename = g_path_get_basename (file_name);
-	camel_mime_part_set_filename (part, filename);
-	g_free (filename);
-	
-#if 0
-	/* Note: Outlook 2002 is broken with respect to Content-Ids on
-           non-multipart/related parts, so as an interoperability
-           workaround, don't set a Content-Id on these parts. Fixes
-           bug #10032 */
-	/* set the Content-Id */
-	content_id = camel_header_msgid_generate ();
-	camel_mime_part_set_content_id (part, content_id);
-	g_free (content_id);
-#endif
-	
-	new = g_object_new (E_TYPE_CAL_ATTACHMENT, NULL);
-	new->editor_gui = NULL;
-	new->body = part;
-	new->size = statbuf.st_size;
-	new->guessed_type = TRUE;
-	
-	return new;
-}
-
-
-/**
- * cal_attachment_new_from_mime_part:
- * @part: a CamelMimePart
- * 
- * Return value: a new CalAttachment based on the mime part
- **/
-CalAttachment *
-cal_attachment_new_from_mime_part (CamelMimePart *part)
-{
-	CalAttachment *new;
-	CamelMimePart *mime_part;
-	CamelStream *stream;
-	
-	g_return_val_if_fail (CAMEL_IS_MIME_PART (part), NULL);
-	
-	stream = camel_stream_mem_new ();
-	if (camel_data_wrapper_write_to_stream (CAMEL_DATA_WRAPPER (part), stream) == -1) {
-		camel_object_unref (stream);
-		return NULL;
-	}
-	
-	camel_stream_reset (stream);
-	mime_part = camel_mime_part_new ();
-	
-	if (camel_data_wrapper_construct_from_stream (CAMEL_DATA_WRAPPER (mime_part), stream) == -1) {
-		camel_object_unref (mime_part);
-		camel_object_unref (stream);
-		return NULL;
-	}
-	
-	camel_object_unref (stream);
-	
-	new = g_object_new (E_TYPE_CAL_ATTACHMENT, NULL);
-	new->editor_gui = NULL;
-	new->body = mime_part;
-	new->guessed_type = FALSE;
-	new->size = 0;
-	
-	return new;
-}
-
-
-/* The attachment property dialog.  */
-
-typedef struct {
-	GtkWidget *dialog;
-	GtkEntry *file_name_entry;
-	GtkEntry *description_entry;
-	GtkEntry *mime_type_entry;
-	GtkToggleButton *disposition_checkbox;
-	CalAttachment *attachment;
-} DialogData;
-
-static void
-destroy_dialog_data (DialogData *data)
-{
-	g_free (data);
-}
-
-/*
- * fixme: I am converting EVERYTHING to/from UTF-8, although mime types
- * are in ASCII. This is not strictly necessary, but we want to be
- * consistent and possibly check for errors somewhere.
- */
-
-static void
-set_entry (GladeXML *xml, const char *widget_name, const char *value)
-{
-	GtkEntry *entry;
-	
-	entry = GTK_ENTRY (glade_xml_get_widget (xml, widget_name));
-	if (entry == NULL)
-		g_warning ("Entry for `%s' not found.", widget_name);
-	else
-		gtk_entry_set_text (entry, value ? value : "");
-}
-
-static void
-connect_widget (GladeXML *gui, const char *name, const char *signal_name,
-		GCallback func, gpointer data)
-{
-	GtkWidget *widget;
-	
-	widget = glade_xml_get_widget (gui, name);
-	g_signal_connect (widget, signal_name, func, data);
-}
-
-static void
-close_cb (GtkWidget *widget, gpointer data)
-{
-	CalAttachment *attachment;
-	DialogData *dialog_data;
-	
-	dialog_data = (DialogData *) data;
-	attachment = dialog_data->attachment;
-	
-	gtk_widget_destroy (dialog_data->dialog);
-	g_object_unref (attachment->editor_gui);
-	attachment->editor_gui = NULL;
-	
-	g_object_unref (attachment);
-	
-	destroy_dialog_data (dialog_data);
-}
-
-static void
-ok_cb (GtkWidget *widget, gpointer data)
-{
-	DialogData *dialog_data;
-	CalAttachment *attachment;
-	const char *str;
-	
-	dialog_data = (DialogData *) data;
-	attachment = dialog_data->attachment;
-	
-	str = gtk_entry_get_text (dialog_data->file_name_entry);
-	camel_mime_part_set_filename (attachment->body, str);
-	
-	str = gtk_entry_get_text (dialog_data->description_entry);
-	camel_mime_part_set_description (attachment->body, str);
-	
-	str = gtk_entry_get_text (dialog_data->mime_type_entry);
-	camel_mime_part_set_content_type (attachment->body, str);
-	
-	camel_data_wrapper_set_mime_type(camel_medium_get_content_object(CAMEL_MEDIUM (attachment->body)), str);
-	
-	switch (gtk_toggle_button_get_active (dialog_data->disposition_checkbox)) {
-	case 0:
-		camel_mime_part_set_disposition (attachment->body, "attachment");
-		break;
-	case 1:
-		camel_mime_part_set_disposition (attachment->body, "inline");
-		break;
-	default:
-		/* Hmmmm? */
-		break;
-	}
-	
-	changed (attachment);
-	close_cb (widget, data);
-}
-
-static void
-response_cb (GtkWidget *widget, gint response, gpointer data)
-{
-	if (response == GTK_RESPONSE_OK)
-		ok_cb (widget, data);
-	else
-		close_cb (widget, data);
-}
-
-void
-cal_attachment_edit (CalAttachment *attachment, GtkWidget *parent)
-{
-	CamelContentType *content_type;
-	const char *disposition;
-	DialogData *dialog_data;
-	GladeXML *editor_gui;
-	char *type;
-	
-	g_return_if_fail (attachment != NULL);
-	g_return_if_fail (E_IS_CAL_ATTACHMENT (attachment));
-	
-	if (attachment->editor_gui != NULL) {
-		GtkWidget *window;
-		
-		window = glade_xml_get_widget (attachment->editor_gui,
-					       "dialog");
-		gdk_window_show (window->window);
-		return;
-	}
-	
-	editor_gui = glade_xml_new (EVOLUTION_GLADEDIR "/cal-attachment.glade",
-				    NULL, NULL);
-	if (editor_gui == NULL) {
-		g_warning ("Cannot load `cal-attachment.glade'");
-		return;
-	}
-	
-	attachment->editor_gui = editor_gui;
-	
-	gtk_window_set_transient_for
-		(GTK_WINDOW (glade_xml_get_widget (editor_gui, "dialog")),
-		 GTK_WINDOW (gtk_widget_get_toplevel (parent)));
-	
-	dialog_data = g_new (DialogData, 1);
-	g_object_ref (attachment);
-	dialog_data->attachment = attachment;
-	dialog_data->dialog = glade_xml_get_widget (editor_gui, "dialog");
-	dialog_data->file_name_entry = GTK_ENTRY (
-		glade_xml_get_widget (editor_gui, "file_name_entry"));
-	dialog_data->description_entry = GTK_ENTRY (
-		glade_xml_get_widget (editor_gui, "description_entry"));
-	dialog_data->mime_type_entry = GTK_ENTRY (
-		glade_xml_get_widget (editor_gui, "mime_type_entry"));
-	dialog_data->disposition_checkbox = GTK_TOGGLE_BUTTON (
-		glade_xml_get_widget (editor_gui, "disposition_checkbox"));
-	
-	set_entry (editor_gui, "file_name_entry",
-		   camel_mime_part_get_filename (attachment->body));
-	set_entry (editor_gui, "description_entry",
-		   camel_mime_part_get_description (attachment->body));
-	content_type = camel_mime_part_get_content_type (attachment->body);
-	type = camel_content_type_simple (content_type);
-	set_entry (editor_gui, "mime_type_entry", type);
-	g_free (type);
-	
-	disposition = camel_mime_part_get_disposition (attachment->body);
-	gtk_toggle_button_set_active (dialog_data->disposition_checkbox,
-				      disposition && !g_ascii_strcasecmp (disposition, "inline"));
-	
-	connect_widget (editor_gui, "dialog", "response", (GCallback)response_cb, dialog_data);
-#warning "signal connect while alive"	
-	/* make sure that when the composer gets hidden/closed that our windows also close */
-	parent = gtk_widget_get_toplevel (parent);
-	gtk_signal_connect_while_alive (GTK_OBJECT (parent), "destroy", (GCallback)close_cb, dialog_data,
-					GTK_OBJECT (dialog_data->dialog));
-	gtk_signal_connect_while_alive (GTK_OBJECT (parent), "hide", (GCallback)close_cb, dialog_data,
-					GTK_OBJECT (dialog_data->dialog));
-}
diff --git a/calendar/gui/dialogs/cal-attachment.glade b/calendar/gui/dialogs/cal-attachment.glade
deleted file mode 100644
index dc228eef70..0000000000
--- a/calendar/gui/dialogs/cal-attachment.glade
+++ /dev/null
@@ -1,237 +0,0 @@
-<?xml version="1.0" standalone="no"?> <!--*- mode: xml -*-->
-<!DOCTYPE glade-interface SYSTEM "http://glade.gnome.org/glade-2.0.dtd">
-
-<glade-interface>
-
-<widget class="GtkDialog" id="dialog">
-  <property name="border_width">6</property>
-  <property name="visible">True</property>
-  <property name="title" translatable="yes">Attachment Properties</property>
-  <property name="type">GTK_WINDOW_TOPLEVEL</property>
-  <property name="window_position">GTK_WIN_POS_NONE</property>
-  <property name="modal">False</property>
-  <property name="resizable">True</property>
-  <property name="destroy_with_parent">False</property>
-  <property name="has_separator">True</property>
-
-  <child internal-child="vbox">
-    <widget class="GtkVBox" id="dialog-vbox1">
-      <property name="visible">True</property>
-      <property name="homogeneous">False</property>
-      <property name="spacing">6</property>
-
-      <child internal-child="action_area">
-	<widget class="GtkHButtonBox" id="dialog-action_area1">
-	  <property name="visible">True</property>
-	  <property name="layout_style">GTK_BUTTONBOX_END</property>
-
-	  <child>
-	    <widget class="GtkButton" id="close_button">
-	      <property name="visible">True</property>
-	      <property name="can_default">True</property>
-	      <property name="has_default">True</property>
-	      <property name="can_focus">True</property>
-	      <property name="label">gtk-cancel</property>
-	      <property name="use_stock">True</property>
-	      <property name="relief">GTK_RELIEF_NORMAL</property>
-	      <property name="response_id">-6</property>
-	    </widget>
-	  </child>
-
-	  <child>
-	    <widget class="GtkButton" id="ok_button">
-	      <property name="visible">True</property>
-	      <property name="can_default">True</property>
-	      <property name="can_focus">True</property>
-	      <property name="label">gtk-ok</property>
-	      <property name="use_stock">True</property>
-	      <property name="relief">GTK_RELIEF_NORMAL</property>
-	      <property name="response_id">-5</property>
-	    </widget>
-	  </child>
-	</widget>
-	<packing>
-	  <property name="padding">0</property>
-	  <property name="expand">False</property>
-	  <property name="fill">True</property>
-	  <property name="pack_type">GTK_PACK_END</property>
-	</packing>
-      </child>
-
-      <child>
-	<widget class="GtkTable" id="table1">
-	  <property name="visible">True</property>
-	  <property name="n_rows">4</property>
-	  <property name="n_columns">2</property>
-	  <property name="homogeneous">False</property>
-	  <property name="row_spacing">6</property>
-	  <property name="column_spacing">6</property>
-
-	  <child>
-	    <widget class="GtkEntry" id="description_entry">
-	      <property name="visible">True</property>
-	      <property name="can_focus">True</property>
-	      <property name="editable">True</property>
-	      <property name="visibility">True</property>
-	      <property name="max_length">0</property>
-	      <property name="text" translatable="yes"></property>
-	      <property name="has_frame">True</property>
-	      <property name="invisible_char" translatable="yes">*</property>
-	      <property name="activates_default">False</property>
-	    </widget>
-	    <packing>
-	      <property name="left_attach">1</property>
-	      <property name="right_attach">2</property>
-	      <property name="top_attach">1</property>
-	      <property name="bottom_attach">2</property>
-	      <property name="y_options"></property>
-	    </packing>
-	  </child>
-
-	  <child>
-	    <widget class="GtkEntry" id="mime_type_entry">
-	      <property name="visible">True</property>
-	      <property name="sensitive">False</property>
-	      <property name="can_focus">True</property>
-	      <property name="editable">False</property>
-	      <property name="visibility">True</property>
-	      <property name="max_length">0</property>
-	      <property name="text" translatable="yes"></property>
-	      <property name="has_frame">True</property>
-	      <property name="invisible_char" translatable="yes">*</property>
-	      <property name="activates_default">False</property>
-	    </widget>
-	    <packing>
-	      <property name="left_attach">1</property>
-	      <property name="right_attach">2</property>
-	      <property name="top_attach">2</property>
-	      <property name="bottom_attach">3</property>
-	      <property name="y_options"></property>
-	    </packing>
-	  </child>
-
-	  <child>
-	    <widget class="GtkLabel" id="mime_label">
-	      <property name="visible">True</property>
-	      <property name="label" translatable="yes">MIME type:</property>
-	      <property name="use_underline">False</property>
-	      <property name="use_markup">False</property>
-	      <property name="justify">GTK_JUSTIFY_LEFT</property>
-	      <property name="wrap">False</property>
-	      <property name="selectable">False</property>
-	      <property name="xalign">1</property>
-	      <property name="yalign">0.5</property>
-	      <property name="xpad">0</property>
-	      <property name="ypad">0</property>
-	    </widget>
-	    <packing>
-	      <property name="left_attach">0</property>
-	      <property name="right_attach">1</property>
-	      <property name="top_attach">2</property>
-	      <property name="bottom_attach">3</property>
-	      <property name="x_options">fill</property>
-	      <property name="y_options"></property>
-	    </packing>
-	  </child>
-
-	  <child>
-	    <widget class="GtkLabel" id="description_label">
-	      <property name="visible">True</property>
-	      <property name="label" translatable="yes">Description:</property>
-	      <property name="use_underline">False</property>
-	      <property name="use_markup">False</property>
-	      <property name="justify">GTK_JUSTIFY_CENTER</property>
-	      <property name="wrap">False</property>
-	      <property name="selectable">False</property>
-	      <property name="xalign">1</property>
-	      <property name="yalign">0.5</property>
-	      <property name="xpad">0</property>
-	      <property name="ypad">0</property>
-	    </widget>
-	    <packing>
-	      <property name="left_attach">0</property>
-	      <property name="right_attach">1</property>
-	      <property name="top_attach">1</property>
-	      <property name="bottom_attach">2</property>
-	      <property name="x_options">fill</property>
-	      <property name="y_options"></property>
-	    </packing>
-	  </child>
-
-	  <child>
-	    <widget class="GtkLabel" id="filename_label">
-	      <property name="visible">True</property>
-	      <property name="label" translatable="yes">File name:</property>
-	      <property name="use_underline">False</property>
-	      <property name="use_markup">False</property>
-	      <property name="justify">GTK_JUSTIFY_CENTER</property>
-	      <property name="wrap">False</property>
-	      <property name="selectable">False</property>
-	      <property name="xalign">1</property>
-	      <property name="yalign">0.5</property>
-	      <property name="xpad">0</property>
-	      <property name="ypad">0</property>
-	    </widget>
-	    <packing>
-	      <property name="left_attach">0</property>
-	      <property name="right_attach">1</property>
-	      <property name="top_attach">0</property>
-	      <property name="bottom_attach">1</property>
-	      <property name="x_options">fill</property>
-	      <property name="y_options"></property>
-	    </packing>
-	  </child>
-
-	  <child>
-	    <widget class="GtkEntry" id="file_name_entry">
-	      <property name="visible">True</property>
-	      <property name="can_focus">True</property>
-	      <property name="editable">True</property>
-	      <property name="visibility">True</property>
-	      <property name="max_length">0</property>
-	      <property name="text" translatable="yes"></property>
-	      <property name="has_frame">True</property>
-	      <property name="invisible_char" translatable="yes">*</property>
-	      <property name="activates_default">False</property>
-	    </widget>
-	    <packing>
-	      <property name="left_attach">1</property>
-	      <property name="right_attach">2</property>
-	      <property name="top_attach">0</property>
-	      <property name="bottom_attach">1</property>
-	      <property name="y_options"></property>
-	    </packing>
-	  </child>
-
-	  <child>
-	    <widget class="GtkCheckButton" id="disposition_checkbox">
-	      <property name="visible">True</property>
-	      <property name="can_focus">True</property>
-	      <property name="label" translatable="yes">Suggest automatic display of attachment</property>
-	      <property name="use_underline">True</property>
-	      <property name="relief">GTK_RELIEF_NORMAL</property>
-	      <property name="active">False</property>
-	      <property name="inconsistent">False</property>
-	      <property name="draw_indicator">True</property>
-	    </widget>
-	    <packing>
-	      <property name="left_attach">0</property>
-	      <property name="right_attach">2</property>
-	      <property name="top_attach">3</property>
-	      <property name="bottom_attach">4</property>
-	      <property name="x_options">fill</property>
-	      <property name="y_options"></property>
-	    </packing>
-	  </child>
-	</widget>
-	<packing>
-	  <property name="padding">0</property>
-	  <property name="expand">True</property>
-	  <property name="fill">True</property>
-	</packing>
-      </child>
-    </widget>
-  </child>
-</widget>
-
-</glade-interface>
diff --git a/calendar/gui/dialogs/cal-attachment.h b/calendar/gui/dialogs/cal-attachment.h
deleted file mode 100644
index 842ab2ed4d..0000000000
--- a/calendar/gui/dialogs/cal-attachment.h
+++ /dev/null
@@ -1,80 +0,0 @@
-/* -*- Mode: C; indent-tabs-mode: t; c-basic-offset: 8; tab-width: 8 -*- */
-/* cal-attachment.h
- *
- * Copyright (C) 2004  Novell, Inc.
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of version 2 of the GNU General Public
- * published by the Free Software Foundation; either version 2 of the
- * License as published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * General Public License for more details.
- *
- * You should have received a copy of the GNU General Public
- * 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: Harish Krishnaswamy
- */
-#ifndef __CAL_ATTACHMENT_H__
-#define __CAL_ATTACHMENT_H__
-
-#include <gdk-pixbuf/gdk-pixbuf.h>
-#include <glade/glade-xml.h>
-#include <camel/camel-mime-part.h>
-#include <camel/camel-exception.h>
-
-#ifdef __cplusplus
-extern "C" {
-#pragma }
-#endif /* __cplusplus */
-
-#define E_TYPE_CAL_ATTACHMENT			(cal_attachment_get_type ())
-#define CAL_ATTACHMENT(obj)			(G_TYPE_CHECK_INSTANCE_CAST ((obj), E_TYPE_CAL_ATTACHMENT, CalAttachment))
-#define CAL_ATTACHMENT_CLASS(klass)		(G_TYPE_CHECK_CLASS_CAST ((klass), E_TYPE_CAL_ATTACHMENT, CalAttachmentClass))
-#define E_IS_CAL_ATTACHMENT(obj)		(G_TYPE_CHECK_INSTANCE_TYPE ((obj), E_TYPE_CAL_ATTACHMENT))
-#define E_IS_CAL_ATTACHMENT_CLASS(klass)	(G_TYPE_CHECK_CLASS_TYPE ((obj), E_TYPE_CAL_ATTACHMENT))
-
-typedef struct _CalAttachment       CalAttachment;
-typedef struct _CalAttachmentClass  CalAttachmentClass;
-
-struct _CalAttachment {
-	GObject parent;
-
-	GladeXML *editor_gui;
-
-	CamelMimePart *body;
-	gboolean guessed_type;
-	gulong size;
-
-	GdkPixbuf *pixbuf_cache;
-};
-
-struct _CalAttachmentClass {
-	GObjectClass parent_class;
-
-	void (*changed)	(CalAttachment *cal_attachment);
-};
-
-struct CalMimeAttach {
-	char *filename;
-	char *content_type;
-	char *description;
-	char *encoded_data;
-	guint length;
-};
-
-GType cal_attachment_get_type (void);
-CalAttachment *cal_attachment_new (const char *file_name, const char *disposition, CamelException *ex);
-CalAttachment *cal_attachment_new_from_mime_part (CamelMimePart *part);
-void cal_attachment_edit (CalAttachment *attachment, GtkWidget *parent);
-
-#ifdef __cplusplus
-}
-#endif /* __cplusplus */
-
-#endif /* __CAL_ATTACHMENT_H__ */
diff --git a/calendar/gui/dialogs/cal-prefs-dialog.c b/calendar/gui/dialogs/cal-prefs-dialog.c
deleted file mode 100644
index 750319a001..0000000000
--- a/calendar/gui/dialogs/cal-prefs-dialog.c
+++ /dev/null
@@ -1,1041 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-
-/*
- * Authors :
- *  Damon Chaplin <damon@ximian.com>
- *  Ettore Perazzoli <ettore@ximian.com>
- *
- * Copyright 2000, 2001, 2002 Ximian, Inc.
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of version 2 of the GNU General Public
- * License as published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
- * USA
- */
-
-/*
- * CalPrefsDialog - a GtkObject which handles a libglade-loaded dialog
- * to edit the calendar preference settings.
- */
-
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
-
-#include "../e-timezone-entry.h"
-#include "cal-prefs-dialog.h"
-#include "../calendar-config.h"
-#include "url-editor-dialog.h"
-
-#include <gtk/gtk.h>
-#include <gtk/gtkmain.h>
-#include <gtk/gtksignal.h>
-#include <gtk/gtkoptionmenu.h>
-#include <gtk/gtktogglebutton.h>
-#include <libxml/tree.h>
-#include <string.h>
-#include <libgnome/gnome-i18n.h>
-#include <libgnomeui/gnome-color-picker.h>
-#include <glade/glade.h>
-#include <e-util/e-dialog-widgets.h>
-#include <widgets/misc/e-dateedit.h>
-
-
-static const int week_start_day_map[] = {
-	1, 2, 3, 4, 5, 6, 0, -1
-};
-
-static const int time_division_map[] = {
-	60, 30, 15, 10, 5, -1
-};
-
-/* The following two are kept separate in case we need to re-order each menu individually */
-static const int hide_completed_units_map[] = {
-	CAL_MINUTES, CAL_HOURS, CAL_DAYS, -1
-};
-
-static const int default_reminder_units_map[] = {
-	CAL_MINUTES, CAL_HOURS, CAL_DAYS, -1
-};
-
-static gboolean get_widgets (DialogData *data);
-
-static void setup_changes (DialogData *data);
-
-static void init_widgets (DialogData *data);
-static void show_config (DialogData *data);
-
-static void config_control_destroy_callback (DialogData *dialog_data, GObject *deadbeef);
-
-static void cal_prefs_dialog_url_add_clicked (GtkWidget *button, DialogData *dialog_data);
-static void cal_prefs_dialog_url_edit_clicked (GtkWidget *button, DialogData *dialog_data);
-static void cal_prefs_dialog_url_remove_clicked (GtkWidget *button, DialogData *dialog_data);
-static void cal_prefs_dialog_url_enable_clicked (GtkWidget *button, DialogData *dialog_data);
-static void cal_prefs_dialog_url_list_change (GtkTreeSelection *selection, DialogData *dialog_data);
-static void cal_prefs_dialog_url_list_enable_toggled (GtkCellRendererToggle *renderer, const char *path_string, DialogData *dialog_data);
-static void cal_prefs_dialog_url_list_double_click(GtkTreeView *treeview, 
-						   GtkTreePath *path, 
-						   GtkTreeViewColumn *column, 
-						   DialogData *dialog_data);
-static void show_fb_config (DialogData *dialog_data);
-
-GtkWidget *cal_prefs_dialog_create_time_edit (void);
-
-#define PREFS_WINDOW(dialog_data) GTK_WINDOW (gtk_widget_get_ancestor (GTK_WIDGET (dialog_data), GTK_TYPE_WINDOW))
-
-/**
- * cal_prefs_dialog_new:
- *
- * Creates a new #CalPrefsDialog.
- *
- * Return value: a new #CalPrefsDialog.
- **/
-EvolutionConfigControl *
-cal_prefs_dialog_new (void)
-{
-	DialogData *dialog_data;
-	EvolutionConfigControl *config_control;
-
-	dialog_data = g_new0 (DialogData, 1);
-
-	/* Load the content widgets */
-
-	dialog_data->xml = glade_xml_new (EVOLUTION_GLADEDIR "/cal-prefs-dialog.glade", NULL, NULL);
-	if (!dialog_data->xml) {
-		g_message ("cal_prefs_dialog_construct(): Could not load the Glade XML file!");
-		return NULL;
-	}
-
-	if (!get_widgets (dialog_data)) {
-		g_message ("cal_prefs_dialog_construct(): Could not find all widgets in the XML file!");
-		return NULL;
-	}
-
-	init_widgets (dialog_data);
-	show_config (dialog_data);
-
-	gtk_widget_ref (dialog_data->page);
-	gtk_container_remove (GTK_CONTAINER (dialog_data->page->parent), dialog_data->page);
-	config_control = evolution_config_control_new (dialog_data->page);
-	gtk_widget_unref (dialog_data->page);
-	
-	g_object_weak_ref ((GObject *) config_control, (GWeakNotify) config_control_destroy_callback, dialog_data);
-	
-	setup_changes (dialog_data);
-
-	return config_control;
-}
-
-/* Returns a pointer to a static string with an X color spec for the current
- * value of a color picker.
- */
-static const char *
-spec_from_picker (GtkWidget *picker)
-{
-	static char spec[8];
-	guint8 r, g, b;
-
-	gnome_color_picker_get_i8 (GNOME_COLOR_PICKER (picker), &r, &g, &b, NULL);
-	g_snprintf (spec, sizeof (spec), "#%02x%02x%02x", r, g, b);
-
-	return spec;
-}
-
-static void
-working_days_changed (GtkWidget *widget, DialogData *dialog_data)
-{
-	CalWeekdays working_days = 0;
-	guint32 mask = 1;
-	int day;
-	
-	for (day = 0; day < 7; day++) {
-		if (e_dialog_toggle_get (dialog_data->working_days[day]))
-			working_days |= mask;
-		mask <<= 1;
-	}
-	
-	calendar_config_set_working_days (working_days);
-}
-
-static void
-timezone_changed (GtkWidget *widget, DialogData *dialog_data)
-{
-	icaltimezone *zone;
-	
-	zone = e_timezone_entry_get_timezone (E_TIMEZONE_ENTRY (dialog_data->timezone));
-	calendar_config_set_timezone (icaltimezone_get_location (zone));
-}
-
-static void
-start_of_day_changed (GtkWidget *widget, DialogData *dialog_data)
-{
-	int start_hour, start_minute, end_hour, end_minute;
-	EDateEdit *start, *end;
-	
-	start = E_DATE_EDIT (dialog_data->start_of_day);
-	end = E_DATE_EDIT (dialog_data->end_of_day);
-	
-	e_date_edit_get_time_of_day (start, &start_hour, &start_minute);
-	e_date_edit_get_time_of_day (end, &end_hour, &end_minute);
-	
-	if ((start_hour > end_hour) || (start_hour == end_hour && start_minute > end_minute)) {
-		if (start_hour < 23)
-			e_date_edit_set_time_of_day (end, start_hour + 1, start_minute);
-		else
-			e_date_edit_set_time_of_day (end, 23, 59);
-		
-		return;
-	}
-	
-	calendar_config_set_day_start_hour (start_hour);
-	calendar_config_set_day_start_minute (start_minute);
-}
-
-static void
-end_of_day_changed (GtkWidget *widget, DialogData *dialog_data)
-{
-	int start_hour, start_minute, end_hour, end_minute;
-	EDateEdit *start, *end;
-	
-	start = E_DATE_EDIT (dialog_data->start_of_day);
-	end = E_DATE_EDIT (dialog_data->end_of_day);
-	
-	e_date_edit_get_time_of_day (start, &start_hour, &start_minute);
-	e_date_edit_get_time_of_day (end, &end_hour, &end_minute);
-	
-	if ((end_hour < start_hour) || (end_hour == start_hour && end_minute < start_minute)) {
-		if (end_hour < 1)
-			e_date_edit_set_time_of_day (start, 0, 0);
-		else
-			e_date_edit_set_time_of_day (start, end_hour - 1, end_minute);
-		
-		return;
-	}
-	
-	calendar_config_set_day_end_hour (end_hour);
-	calendar_config_set_day_end_minute (end_minute);
-}
-
-static void
-week_start_day_changed (GtkWidget *widget, DialogData *dialog_data)
-{
-	int week_start_day;
-	
-	week_start_day = e_dialog_option_menu_get (dialog_data->week_start_day, week_start_day_map);
-	calendar_config_set_week_start_day (week_start_day);
-}
-
-static void
-use_24_hour_toggled (GtkToggleButton *toggle, DialogData *dialog_data)
-{
-	gboolean use_24_hour;
-	
-	use_24_hour = gtk_toggle_button_get_active (toggle);
-	
-	e_date_edit_set_use_24_hour_format (E_DATE_EDIT (dialog_data->start_of_day), use_24_hour);
-	e_date_edit_set_use_24_hour_format (E_DATE_EDIT (dialog_data->end_of_day), use_24_hour);
-	
-	calendar_config_set_24_hour_format (use_24_hour);
-}
-
-static void
-time_divisions_changed (GtkWidget *widget, DialogData *dialog_data)
-{
-	int time_divisions;
-	
-	time_divisions = e_dialog_option_menu_get (dialog_data->time_divisions, time_division_map);
-	calendar_config_set_time_divisions (time_divisions);
-}
-
-static void
-show_end_times_toggled (GtkToggleButton *toggle, DialogData *dialog_data)
-{
-	calendar_config_set_show_event_end (gtk_toggle_button_get_active (toggle));
-}
-
-static void
-compress_weekend_toggled (GtkToggleButton *toggle, DialogData *dialog_data)
-{
-	calendar_config_set_compress_weekend (gtk_toggle_button_get_active (toggle));
-}
-
-static void
-dnav_show_week_no_toggled (GtkToggleButton *toggle, DialogData *dialog_data)
-{
-	calendar_config_set_dnav_show_week_no (gtk_toggle_button_get_active (toggle));
-}
-
-static void
-hide_completed_tasks_toggled (GtkToggleButton *toggle, DialogData *dialog_data)
-{
-	gboolean hide;
-	
-	hide = gtk_toggle_button_get_active (toggle);
-	
-	gtk_widget_set_sensitive (dialog_data->tasks_hide_completed_spinbutton, hide);
-	gtk_widget_set_sensitive (dialog_data->tasks_hide_completed_optionmenu, hide);
-	
-	calendar_config_set_hide_completed_tasks (hide);
-}
-
-static void
-hide_completed_tasks_changed (GtkWidget *widget, DialogData *dialog_data)
-{
-	calendar_config_set_hide_completed_tasks_value (e_dialog_spin_get_int (dialog_data->tasks_hide_completed_spinbutton));
-}
-
-static void
-hide_completed_tasks_units_changed (GtkWidget *widget, DialogData *dialog_data)
-{
-	calendar_config_set_hide_completed_tasks_units (
-		e_dialog_option_menu_get (dialog_data->tasks_hide_completed_optionmenu, hide_completed_units_map));
-}
-
-static void
-tasks_due_today_set_color (GnomeColorPicker *picker, guint r, guint g, guint b, guint a, DialogData *dialog_data)
-{
-	calendar_config_set_tasks_due_today_color (spec_from_picker (dialog_data->tasks_due_today_color));
-}
-
-static void
-tasks_overdue_set_color (GnomeColorPicker *picker, guint r, guint g, guint b, guint a, DialogData *dialog_data)
-{
-	calendar_config_set_tasks_overdue_color (spec_from_picker (dialog_data->tasks_overdue_color));
-}
-
-static void
-confirm_delete_toggled (GtkToggleButton *toggle, DialogData *dialog_data)
-{
-	calendar_config_set_confirm_delete (gtk_toggle_button_get_active (toggle));
-}
-
-static void
-default_reminder_toggled (GtkToggleButton *toggle, DialogData *dialog_data)
-{
-	calendar_config_set_use_default_reminder (gtk_toggle_button_get_active (toggle));
-}
-
-static void
-default_reminder_interval_changed (GtkWidget *widget, DialogData *dialog_data)
-{
-	calendar_config_set_default_reminder_interval (
-		e_dialog_spin_get_int (dialog_data->default_reminder_interval));
-}
-
-static void
-default_reminder_units_changed (GtkWidget *widget, DialogData *dialog_data)
-{
-	calendar_config_set_default_reminder_units (
-		e_dialog_option_menu_get (dialog_data->default_reminder_units, default_reminder_units_map));
-}
-
-static void
-url_list_changed (DialogData *dialog_data)
-{
-	GtkListStore *model = NULL;
-	GSList *url_list = NULL;
-	GtkTreeIter iter;
-	gboolean valid;
-	
-	url_list = NULL;
-	
-	model = (GtkListStore *) gtk_tree_view_get_model (dialog_data->url_list);
-	
-	valid = gtk_tree_model_get_iter_first ((GtkTreeModel *) model, &iter);
-	while (valid) {
-		EPublishUri *url;
-		char *xml;
-		
-		gtk_tree_model_get ((GtkTreeModel *) model, &iter, 
-				    URL_LIST_FREE_BUSY_URL_COLUMN, &url, 
-				    -1);
-		
-		if ((xml = e_pub_uri_to_xml (url)))
-			url_list = g_slist_append (url_list, xml);
-		
-		valid = gtk_tree_model_iter_next ((GtkTreeModel *) model, &iter);
-	}
-	
-	calendar_config_set_free_busy (url_list);
-	
-	g_slist_free (url_list);
-}
-
-static void
-template_url_changed (GtkEntry *entry, DialogData *dialog_data)
-{
-	calendar_config_set_free_busy_template (gtk_entry_get_text (entry));
-}
-
-static void
-setup_changes (DialogData *dialog_data)
-{
-	int i;
-	
-	for (i = 0; i < 7; i ++)
-		g_signal_connect (dialog_data->working_days[i], "toggled", G_CALLBACK (working_days_changed), dialog_data);
-	
-	g_signal_connect (dialog_data->timezone, "changed", G_CALLBACK (timezone_changed), dialog_data);
-	
-	g_signal_connect (dialog_data->start_of_day, "changed", G_CALLBACK (start_of_day_changed), dialog_data);
-	g_signal_connect (dialog_data->end_of_day, "changed", G_CALLBACK (end_of_day_changed), dialog_data);
-	
-	g_signal_connect (GTK_OPTION_MENU (dialog_data->week_start_day)->menu, "selection-done",
-			  G_CALLBACK (week_start_day_changed), dialog_data);
-	
-	g_signal_connect (dialog_data->use_24_hour, "toggled", G_CALLBACK (use_24_hour_toggled), dialog_data);
-	
-	g_signal_connect (GTK_OPTION_MENU (dialog_data->time_divisions)->menu, "selection-done",
-			  G_CALLBACK (time_divisions_changed), dialog_data);
-	
-	g_signal_connect (dialog_data->show_end_times, "toggled", G_CALLBACK (show_end_times_toggled), dialog_data);
-	g_signal_connect (dialog_data->compress_weekend, "toggled", G_CALLBACK (compress_weekend_toggled), dialog_data);
-	g_signal_connect (dialog_data->dnav_show_week_no, "toggled", G_CALLBACK (dnav_show_week_no_toggled), dialog_data);
-	
-	g_signal_connect (dialog_data->tasks_hide_completed_checkbutton, "toggled",
-			  G_CALLBACK (hide_completed_tasks_toggled), dialog_data);
-	g_signal_connect (dialog_data->tasks_hide_completed_spinbutton, "value-changed",
-			  G_CALLBACK (hide_completed_tasks_changed), dialog_data);
-	g_signal_connect (GTK_OPTION_MENU (dialog_data->tasks_hide_completed_optionmenu)->menu, "selection-done",
-			  G_CALLBACK (hide_completed_tasks_units_changed), dialog_data);
-	g_signal_connect (dialog_data->tasks_due_today_color, "color-set",
-			  G_CALLBACK (tasks_due_today_set_color), dialog_data);
-	g_signal_connect (dialog_data->tasks_overdue_color, "color-set",
-			  G_CALLBACK (tasks_overdue_set_color), dialog_data);
-	
-	g_signal_connect (dialog_data->confirm_delete, "toggled", G_CALLBACK (confirm_delete_toggled), dialog_data);
-	g_signal_connect (dialog_data->default_reminder, "toggled", G_CALLBACK (default_reminder_toggled), dialog_data);
-	g_signal_connect (dialog_data->default_reminder_interval, "changed",
-			  G_CALLBACK (default_reminder_interval_changed), dialog_data);
-	g_signal_connect (GTK_OPTION_MENU (dialog_data->default_reminder_units)->menu, "selection-done",
-			  G_CALLBACK (default_reminder_units_changed), dialog_data);
-
-	g_signal_connect (dialog_data->template_url, "changed", G_CALLBACK (template_url_changed), dialog_data);
-}
-
-/* Gets the widgets from the XML file and returns if they are all available.
- */
-static gboolean
-get_widgets (DialogData *data)
-{
-#define GW(name) glade_xml_get_widget (data->xml, name)
-
-	data->page = GW ("toplevel-notebook");
-
-	/* The indices must be 0 (Sun) to 6 (Sat). */
-	data->working_days[0] = GW ("sun_button");
-	data->working_days[1] = GW ("mon_button");
-	data->working_days[2] = GW ("tue_button");
-	data->working_days[3] = GW ("wed_button");
-	data->working_days[4] = GW ("thu_button");
-	data->working_days[5] = GW ("fri_button");
-	data->working_days[6] = GW ("sat_button");
-
-	data->timezone = GW ("timezone");
-	data->week_start_day = GW ("first_day_of_week");
-	data->start_of_day = GW ("start_of_day");
-	gtk_widget_show (data->start_of_day);
-	data->end_of_day = GW ("end_of_day");
-	gtk_widget_show (data->end_of_day);
-	data->use_12_hour = GW ("use_12_hour");
-	data->use_24_hour = GW ("use_24_hour");
-	data->time_divisions = GW ("time_divisions");
-	data->show_end_times = GW ("show_end_times");
-	data->compress_weekend = GW ("compress_weekend");
-	data->dnav_show_week_no = GW ("dnav_show_week_no");
-
-	data->tasks_due_today_color = GW ("tasks_due_today_color");
-	data->tasks_overdue_color = GW ("tasks_overdue_color");
-
-	data->tasks_hide_completed_checkbutton = GW ("tasks-hide-completed-checkbutton");
-	data->tasks_hide_completed_spinbutton = GW ("tasks-hide-completed-spinbutton");
-	data->tasks_hide_completed_optionmenu = GW ("tasks-hide-completed-optionmenu");
-
-	data->confirm_delete = GW ("confirm-delete");
-	data->default_reminder = GW ("default-reminder");
-	data->default_reminder_interval = GW ("default-reminder-interval");
-	data->default_reminder_units = GW ("default-reminder-units");
-	
-	data->url_add = GW ("url_add");
-	data->url_edit = GW ("url_edit");
-	data->url_remove = GW ("url_remove");
-	data->url_enable = GW ("url_enable");
-	data->url_list = GTK_TREE_VIEW (GW ("url_list"));
-
-	data->template_url = GW("template_url");
-
-#undef GW
-
-	return (data->page
-		&& data->timezone
-		&& data->working_days[0]
-		&& data->working_days[1]
-		&& data->working_days[2]
-		&& data->working_days[3]
-		&& data->working_days[4]
-		&& data->working_days[5]
-		&& data->working_days[6]
-		&& data->week_start_day
-		&& data->start_of_day
-		&& data->end_of_day
-		&& data->use_12_hour
-		&& data->use_24_hour
-		&& data->time_divisions
-		&& data->show_end_times
-		&& data->compress_weekend
-		&& data->dnav_show_week_no
-		&& data->tasks_due_today_color
-		&& data->tasks_overdue_color
-		&& data->tasks_hide_completed_checkbutton
-		&& data->tasks_hide_completed_spinbutton
-		&& data->tasks_hide_completed_optionmenu
-		&& data->confirm_delete
-		&& data->default_reminder
-		&& data->default_reminder_interval
-		&& data->default_reminder_units
-		&& data->url_add
-		&& data->url_edit
-		&& data->url_remove
-		&& data->url_enable
-		&& data->url_list);
-}
-
-
-static void
-config_control_destroy_callback (DialogData *dialog_data, GObject *deadbeef)
-{
-	g_object_unref (dialog_data->xml);
-	
-	g_free (dialog_data);
-}
-
-/* Called by libglade to create our custom EDateEdit widgets. */
-GtkWidget *
-cal_prefs_dialog_create_time_edit (void)
-{
-	GtkWidget *dedit;
-
-	dedit = e_date_edit_new ();
-
-	e_date_edit_set_use_24_hour_format (E_DATE_EDIT (dedit), calendar_config_get_24_hour_format ());
-	e_date_edit_set_time_popup_range (E_DATE_EDIT (dedit), 0, 24);
-	e_date_edit_set_show_date (E_DATE_EDIT (dedit), FALSE);
-
-	return dedit;
-}
-
-
-/* Connects any necessary signal handlers. */
-static void
-init_widgets (DialogData *dialog_data)
-{
-	GtkCellRenderer *renderer = NULL;
-	GtkTreeSelection *selection;
-	GtkListStore *model;
-	
-	dialog_data->url_editor = FALSE;
-	dialog_data->url_editor_dlg =NULL;
-	
-	/* Free/Busy ... */
-	g_signal_connect (dialog_data->url_add, "clicked",
-			  G_CALLBACK (cal_prefs_dialog_url_add_clicked),
-			  dialog_data);
-	
-	g_signal_connect (dialog_data->url_edit, "clicked",
-			  G_CALLBACK (cal_prefs_dialog_url_edit_clicked),
-			  dialog_data);
-	
-	g_signal_connect (dialog_data->url_remove, "clicked",
-			  G_CALLBACK (cal_prefs_dialog_url_remove_clicked),
-			  dialog_data);
-	
-	g_signal_connect (dialog_data->url_enable, "clicked",
-			  G_CALLBACK (cal_prefs_dialog_url_enable_clicked),
-			  dialog_data);
-	
-	/* Free/Busy Listview */
-	renderer = gtk_cell_renderer_toggle_new();
-	g_object_set ((GObject *) renderer, "activatable", TRUE, NULL);
-	
-	model = gtk_list_store_new (URL_LIST_N_COLUMNS, G_TYPE_BOOLEAN,
-				    G_TYPE_STRING, G_TYPE_POINTER);
-	
-	gtk_tree_view_set_model (dialog_data->url_list, 
-				 (GtkTreeModel *) model);
-
-	gtk_tree_view_insert_column_with_attributes (dialog_data->url_list, -1,
-						    _("Enabled"), renderer,
-						    "active", 
-						     URL_LIST_ENABLED_COLUMN, 
-						    NULL);
-
-	g_signal_connect (renderer, "toggled", 
-			 G_CALLBACK (cal_prefs_dialog_url_list_enable_toggled),
-			 dialog_data);
-	
-	renderer = gtk_cell_renderer_text_new ();
-	gtk_tree_view_insert_column_with_attributes (dialog_data->url_list, -1, 
-						    _("Location"), renderer,
-						    "text", 
-						    URL_LIST_LOCATION_COLUMN, 
-						    NULL);
-	
-	selection = gtk_tree_view_get_selection ((GtkTreeView *) dialog_data->url_list);
-	gtk_tree_selection_set_mode (selection, GTK_SELECTION_SINGLE);
-	gtk_tree_view_set_headers_visible ((GtkTreeView *) dialog_data->url_list, TRUE);
-	
-	g_signal_connect (dialog_data->url_list, "row-activated",
-			 G_CALLBACK (cal_prefs_dialog_url_list_double_click),
-			 dialog_data);
-}
-
-/* Sets the color in a color picker from an X color spec */
-static void
-set_color_picker (GtkWidget *picker, const char *spec)
-{
-	GdkColor color;
-
-	if (!spec || !gdk_color_parse (spec, &color))
-		color.red = color.green = color.blue = 0;
-
-	gnome_color_picker_set_i16 (GNOME_COLOR_PICKER (picker),
-				    color.red,
-				    color.green,
-				    color.blue,
-				    65535);
-}
-
-static void
-cal_prefs_dialog_url_add_clicked (GtkWidget *button, DialogData *dialog_data)
-{
-	EPublishUri *url = NULL;
-	GtkTreeModel *model;
-	GtkTreeIter iter;
-	GtkTreeSelection *selection;
-	
-	model = gtk_tree_view_get_model (dialog_data->url_list);
-	url = g_new0 (EPublishUri, 1);
-	url->enabled = TRUE;
-	url->location = "";
-	
-	if (!dialog_data->url_editor) {
-		dialog_data->url_editor = url_editor_dialog_new (dialog_data, 
-								 url);
-		
-		if (url->location != "") {
-			gtk_list_store_append(GTK_LIST_STORE (model), &iter);
-			gtk_list_store_set (GTK_LIST_STORE(model), &iter, 
-					   URL_LIST_ENABLED_COLUMN, 
-					   url->enabled,
-					   URL_LIST_LOCATION_COLUMN, 
-					   g_strdup (url->location),
-					   URL_LIST_FREE_BUSY_URL_COLUMN, url,
-					   -1);
-			
-			url_list_changed (dialog_data);
-			
-			if (!GTK_WIDGET_SENSITIVE ((GtkWidget *) dialog_data->url_remove)) {
-				selection = gtk_tree_view_get_selection ((GtkTreeView *) dialog_data->url_list);
-				gtk_tree_model_get_iter_first ((GtkTreeModel *) model, &iter);
-				gtk_widget_set_sensitive ((GtkWidget*) dialog_data->url_remove, TRUE);
-				gtk_tree_selection_select_iter (selection, &iter);
-			}	
-		}
-		dialog_data->url_editor = FALSE;
-		dialog_data->url_editor_dlg = NULL;
-	} else {
-		gdk_window_raise (dialog_data->url_editor_dlg->window);
-	}	
-}
-
-static void
-cal_prefs_dialog_url_edit_clicked (GtkWidget *button, DialogData *dialog_data)
-{
-	if (!dialog_data->url_editor) {
-		GtkTreeSelection *selection;
-		EPublishUri *url = NULL;
-		GtkTreeModel *model;
-		GtkTreeIter iter;
-		
-		selection = gtk_tree_view_get_selection ((GtkTreeView *) dialog_data->url_list);
-		if (gtk_tree_selection_get_selected (selection, &model, &iter)){
-			gtk_tree_model_get (model, &iter, 
-					    URL_LIST_FREE_BUSY_URL_COLUMN, 
-					    &url, 
-					    -1);
-
-		}
-
-		if (url) {
-			dialog_data->url_editor = url_editor_dialog_new (dialog_data, url);
-			
-			gtk_list_store_set ((GtkListStore *) model, &iter, 
-					   URL_LIST_LOCATION_COLUMN, 
-					   g_strdup (url->location), 
-					   URL_LIST_ENABLED_COLUMN, 
-					   url->enabled, 
-					   URL_LIST_FREE_BUSY_URL_COLUMN, url,
-					   -1);
-			
-			url_list_changed (dialog_data);
-			
-			if (!GTK_WIDGET_SENSITIVE ((GtkWidget *) dialog_data->url_remove)) {
-				selection = gtk_tree_view_get_selection ((GtkTreeView *) dialog_data->url_list);
-				gtk_tree_model_get_iter_first ((GtkTreeModel *) model, &iter);
-				gtk_widget_set_sensitive ((GtkWidget*) dialog_data->url_remove, TRUE);
-				gtk_tree_selection_select_iter (selection, &iter);
-			}
-			dialog_data->url_editor = FALSE;
-			dialog_data->url_editor_dlg = NULL;
-		}
-	} else {
-		gdk_window_raise (dialog_data->url_editor_dlg->window);
-	}	
-}
-
-static void
-cal_prefs_dialog_url_remove_clicked (GtkWidget *button, DialogData *dialog_data)
-{
-	EPublishUri *url = NULL;
-	GtkTreeSelection * selection;
-	GtkTreeModel *model;
-	GtkWidget *confirm;
-	GtkTreeIter iter;
-	int ans;
-	
-	selection = gtk_tree_view_get_selection (dialog_data->url_list);
-	if (gtk_tree_selection_get_selected (selection, &model, &iter))
-		gtk_tree_model_get (model, &iter, 
-				    URL_LIST_FREE_BUSY_URL_COLUMN, &url, 
-				    -1);
-	
-	/* make sure we have a valid account selected and that 
-	   we aren't editing anything... */
-	if (url == NULL || dialog_data->url_editor)
-		return;
-	
-	confirm = gtk_message_dialog_new (PREFS_WINDOW (dialog_data),
-					  GTK_DIALOG_MODAL|GTK_DIALOG_DESTROY_WITH_PARENT,
-					  GTK_MESSAGE_QUESTION, 
-					  GTK_BUTTONS_NONE,
-					  _("Are you sure you want to remove this URL?"));
-	
-	button = gtk_button_new_from_stock (GTK_STOCK_YES);
-	gtk_button_set_label ((GtkButton *) button, _("Remove"));
-	gtk_dialog_add_action_widget ((GtkDialog *) confirm, (GtkWidget *) button, GTK_RESPONSE_YES);
-	gtk_widget_show ((GtkWidget *) button);
-	
-	button = gtk_button_new_from_stock (GTK_STOCK_NO);
-	gtk_button_set_label ((GtkButton *) button, _("Don't Remove"));
-	gtk_dialog_add_action_widget ((GtkDialog *) confirm, 
-				      (GtkWidget *) button, GTK_RESPONSE_NO);
-
-	gtk_widget_show ((GtkWidget *) button);
-	
-	ans = gtk_dialog_run ((GtkDialog *) confirm);
-	gtk_widget_destroy (confirm);
-	
-	if (ans == GTK_RESPONSE_YES) {
-		int len;
-		
-		gtk_list_store_remove ((GtkListStore *) model, &iter);
-		
-		len = gtk_tree_model_iter_n_children (GTK_TREE_MODEL (model), NULL);
-		if (len > 0) {
-			gtk_tree_selection_select_iter (selection, &iter);
-		} else {
-			gtk_widget_set_sensitive (GTK_WIDGET (dialog_data->url_edit), FALSE);
-			gtk_widget_set_sensitive (GTK_WIDGET (dialog_data->url_remove), FALSE);
-			gtk_widget_set_sensitive (GTK_WIDGET (dialog_data->url_enable), FALSE);
-		}
-		g_free (url);
-		url_list_changed (dialog_data);
-	}
-}
-
-static void
-cal_prefs_dialog_url_enable_clicked (GtkWidget *button, DialogData *dialog_data)
-{
-	EPublishUri *url = NULL;
-	GtkTreeSelection * selection;
-	GtkTreeModel *model;
-	GtkTreeIter iter;
-	
-	selection = gtk_tree_view_get_selection (dialog_data->url_list);
-	if (gtk_tree_selection_get_selected (selection, &model, &iter)) {
-		gtk_tree_model_get (model, &iter, 
-				    URL_LIST_FREE_BUSY_URL_COLUMN, &url, 
-				    -1);
-		url->enabled = !url->enabled;
-		
-		gtk_tree_selection_select_iter (selection, &iter);
-		
-		gtk_list_store_set ((GtkListStore *) model, &iter, 
-				    URL_LIST_ENABLED_COLUMN, url->enabled, 
-				    -1);
-		
-		gtk_button_set_label ((GtkButton *) dialog_data->url_enable, 
-				      url->enabled ? _("Disable") : _("Enable"));
-		
-		url_list_changed (dialog_data);
-	}
-}
- 
-static void
-cal_prefs_dialog_url_list_enable_toggled (GtkCellRendererToggle *renderer, 
-					  const char *path_string, 
-					  DialogData *dialog_data)
-{
-	GtkTreeSelection * selection;
-	EPublishUri *url = NULL;
-	GtkTreeModel *model;
-	GtkTreePath *path;
-	GtkTreeIter iter;
-	
-	path = gtk_tree_path_new_from_string (path_string);
-	model = gtk_tree_view_get_model (dialog_data->url_list);
-	selection = gtk_tree_view_get_selection (dialog_data->url_list);
-
-	if (gtk_tree_model_get_iter (model, &iter, path)) {
-		gtk_tree_model_get (model, &iter, 
-				    URL_LIST_FREE_BUSY_URL_COLUMN, &url, 
-				    -1);
-		
-		url->enabled = !url->enabled;
-		gtk_list_store_set((GtkListStore *) model, &iter, 
-				   URL_LIST_ENABLED_COLUMN,
-				   url->enabled, -1);
-		
-		if (gtk_tree_selection_iter_is_selected (selection, &iter))
-			gtk_button_set_label ((GtkButton *) dialog_data->url_enable, 
-					      url->enabled ? _("Disable") : _("Enable"));
-		
-		url_list_changed (dialog_data);
-	}
-
-	gtk_tree_path_free (path);
-}
-
-static void
-cal_prefs_dialog_url_list_double_click (GtkTreeView *treeview, 
-					GtkTreePath *path, 
-					GtkTreeViewColumn *column, 
-					DialogData *dialog_data)
-{
-	cal_prefs_dialog_url_edit_clicked  (NULL, dialog_data);
-}				
-
-static void
-cal_prefs_dialog_url_list_change (GtkTreeSelection *selection, 
-				  DialogData *dialog_data)
-{
-	EPublishUri *url = NULL;
-	GtkTreeModel *model;
-	GtkTreeIter iter;
-	int state;
-	
-	state = gtk_tree_selection_get_selected (selection, &model, &iter);
-	if (state) {
-		gtk_tree_model_get (model, &iter, 
-				    URL_LIST_FREE_BUSY_URL_COLUMN, &url, 
-				    -1);
-
-		if (url->location && url->enabled)
-			gtk_button_set_label ((GtkButton *) dialog_data->url_enable, _("Disable"));
-		else
-			gtk_button_set_label ((GtkButton *) dialog_data->url_enable, _("Enable"));
-	} else {
-		gtk_widget_grab_focus (GTK_WIDGET (dialog_data->url_add));
-	}
-	
-	gtk_widget_set_sensitive (GTK_WIDGET (dialog_data->url_edit), state);
-	gtk_widget_set_sensitive (GTK_WIDGET (dialog_data->url_remove), state);
-	gtk_widget_set_sensitive (GTK_WIDGET (dialog_data->url_enable), state);
-}
-
-/* Shows the current Free/Busy settings in the dialog */
-static void
-show_fb_config (DialogData *dialog_data)
-{
-	GSList *url_config_list = NULL;
-	GtkListStore *model;
-	GtkTreeIter iter;
-	gchar *template_url;
-	
-	model = (GtkListStore *) gtk_tree_view_get_model (dialog_data->url_list);
-	gtk_list_store_clear (model);
-	
-	/* restore urls from gconf */
-	url_config_list = calendar_config_get_free_busy();
-
-	if (!url_config_list) {
-		/* list is empty-disable edit, remove, and enable buttons */
-		gtk_widget_set_sensitive (GTK_WIDGET (dialog_data->url_edit), 
-					 FALSE);
-
-		gtk_widget_set_sensitive (GTK_WIDGET (dialog_data->url_remove), 
-					 FALSE);
-
-		gtk_widget_set_sensitive (GTK_WIDGET (dialog_data->url_enable), 
-					 FALSE);
-	}	else {
-		gtk_widget_set_sensitive (GTK_WIDGET (dialog_data->url_edit), 
-					 TRUE);
-
-		gtk_widget_set_sensitive (GTK_WIDGET (dialog_data->url_remove), 
-					 TRUE);
-
-		gtk_widget_set_sensitive (GTK_WIDGET (dialog_data->url_enable), 
-					 TRUE);
-	}
-	
-	while (url_config_list) {
-		gchar *xml = (gchar *)url_config_list->data;
-		EPublishUri *url;
-		url = g_new0 (EPublishUri, 1);
-		
-		e_pub_uri_from_xml (url, xml);
-		if (url->location) {
-			gtk_list_store_append (model, &iter);
-			gtk_list_store_set (model, &iter, 
-					   URL_LIST_ENABLED_COLUMN, 
-					   url->enabled,
-					   URL_LIST_LOCATION_COLUMN, 
-					   url->location,
-					   URL_LIST_FREE_BUSY_URL_COLUMN, url,
-					   -1);
-		}
-
-		url_config_list = g_slist_next (url_config_list);
-		g_free (xml);
-	}
-
-	g_slist_foreach (url_config_list, (GFunc) g_free, NULL);
-	g_slist_free (url_config_list);
-
-	template_url = calendar_config_get_free_busy_template ();
-	gtk_entry_set_text (GTK_ENTRY (dialog_data->template_url), template_url);
-
-	g_free (template_url);
-}
-
-/* Shows the current task list settings in the dialog */
-static void
-show_task_list_config (DialogData *dialog_data)
-{
-	CalUnits units;
-	gboolean hide_completed_tasks;
-
-	set_color_picker (dialog_data->tasks_due_today_color, calendar_config_get_tasks_due_today_color ());
-	set_color_picker (dialog_data->tasks_overdue_color, calendar_config_get_tasks_overdue_color ());
-
-	/* Hide Completed Tasks. */
-	hide_completed_tasks = calendar_config_get_hide_completed_tasks ();
-	e_dialog_toggle_set (dialog_data->tasks_hide_completed_checkbutton,
-			     hide_completed_tasks);
-
-	/* Hide Completed Tasks Units. */
-	units = calendar_config_get_hide_completed_tasks_units ();
-	e_dialog_option_menu_set (dialog_data->tasks_hide_completed_optionmenu,
-				  units, hide_completed_units_map);
-
-	/* Hide Completed Tasks Value. */
-	e_dialog_spin_set (dialog_data->tasks_hide_completed_spinbutton,
-			   calendar_config_get_hide_completed_tasks_value ());
-
-	gtk_widget_set_sensitive (dialog_data->tasks_hide_completed_spinbutton,
-				  hide_completed_tasks);
-	gtk_widget_set_sensitive (dialog_data->tasks_hide_completed_optionmenu,
-				  hide_completed_tasks);
-}
-
-/* Shows the current config settings in the dialog. */
-static void
-show_config (DialogData *dialog_data)
-{
-	CalWeekdays working_days;
-	gint mask, day, week_start_day, time_divisions;
-	icaltimezone *zone;
-	gboolean sensitive;
-
-	/* Timezone. */
-	zone = calendar_config_get_icaltimezone ();
-	e_timezone_entry_set_timezone (E_TIMEZONE_ENTRY (dialog_data->timezone),
-				       zone);
-
-	/* Working Days. */
-	working_days = calendar_config_get_working_days ();
-	mask = 1 << 0;
-	for (day = 0; day < 7; day++) {
-		e_dialog_toggle_set (dialog_data->working_days[day], (working_days & mask) ? TRUE : FALSE);
-		mask <<= 1;
-	}
-
-	/* Week Start Day. */
-	week_start_day = calendar_config_get_week_start_day ();
-	e_dialog_option_menu_set (dialog_data->week_start_day, week_start_day,
-				  week_start_day_map);
-
-	/* Start of Day. */
-	e_date_edit_set_time_of_day (E_DATE_EDIT (dialog_data->start_of_day),
-				     calendar_config_get_day_start_hour (),
-				     calendar_config_get_day_start_minute ());
-
-	/* End of Day. */
-	e_date_edit_set_time_of_day (E_DATE_EDIT (dialog_data->end_of_day),
-				     calendar_config_get_day_end_hour (),
-				     calendar_config_get_day_end_minute ());
-
-	/* 12/24 Hour Format. */
-	if (calendar_config_get_24_hour_format ())
-		e_dialog_toggle_set (dialog_data->use_24_hour, TRUE);
-	else
-		e_dialog_toggle_set (dialog_data->use_12_hour, TRUE);
-
-	sensitive = calendar_config_locale_supports_12_hour_format ();
-	gtk_widget_set_sensitive (dialog_data->use_12_hour, sensitive);
-	gtk_widget_set_sensitive (dialog_data->use_24_hour, sensitive);
-
-
-	/* Time Divisions. */
-	time_divisions = calendar_config_get_time_divisions ();
-	e_dialog_option_menu_set (dialog_data->time_divisions, time_divisions,
-				  time_division_map);
-
-	/* Show Appointment End Times. */
-	e_dialog_toggle_set (dialog_data->show_end_times, calendar_config_get_show_event_end ());
-
-	/* Compress Weekend. */
-	e_dialog_toggle_set (dialog_data->compress_weekend, calendar_config_get_compress_weekend ());
-
-	/* Date Navigator - Show Week Numbers. */
-	e_dialog_toggle_set (dialog_data->dnav_show_week_no, calendar_config_get_dnav_show_week_no ());
-
-	/* Task list */
-
-	show_task_list_config (dialog_data);
-	
-	/* Free/Busy */
-	show_fb_config (dialog_data);
-
-	/* Other page */
-
-	e_dialog_toggle_set (dialog_data->confirm_delete, calendar_config_get_confirm_delete ());
-
-	e_dialog_toggle_set (dialog_data->default_reminder,
-			     calendar_config_get_use_default_reminder ());
-	e_dialog_spin_set (dialog_data->default_reminder_interval,
-			   calendar_config_get_default_reminder_interval ());
-	e_dialog_option_menu_set (dialog_data->default_reminder_units,
-				  calendar_config_get_default_reminder_units (),
-				  default_reminder_units_map);
-}
diff --git a/calendar/gui/dialogs/cal-prefs-dialog.glade b/calendar/gui/dialogs/cal-prefs-dialog.glade
deleted file mode 100644
index c950ed44be..0000000000
--- a/calendar/gui/dialogs/cal-prefs-dialog.glade
+++ /dev/null
@@ -1,2026 +0,0 @@
-<?xml version="1.0" standalone="no"?> <!--*- mode: xml -*-->
-<!DOCTYPE glade-interface SYSTEM "http://glade.gnome.org/glade-2.0.dtd">
-
-<glade-interface>
-<requires lib="gnome"/>
-
-<widget class="GtkDialog" id="cal-prefs-dialog">
-  <property name="title" translatable="yes">Calendar and Tasks Settings</property>
-  <property name="type">GTK_WINDOW_TOPLEVEL</property>
-  <property name="window_position">GTK_WIN_POS_NONE</property>
-  <property name="modal">False</property>
-  <property name="resizable">True</property>
-  <property name="destroy_with_parent">False</property>
-  <property name="decorated">True</property>
-  <property name="skip_taskbar_hint">False</property>
-  <property name="skip_pager_hint">False</property>
-  <property name="type_hint">GDK_WINDOW_TYPE_HINT_DIALOG</property>
-  <property name="gravity">GDK_GRAVITY_NORTH_WEST</property>
-  <property name="has_separator">False</property>
-
-  <child internal-child="vbox">
-    <widget class="GtkVBox" id="vbox1">
-      <property name="visible">True</property>
-      <property name="homogeneous">False</property>
-      <property name="spacing">6</property>
-
-      <child internal-child="action_area">
-	<widget class="GtkHButtonBox" id="hbuttonbox1">
-	  <property name="visible">True</property>
-	  <property name="layout_style">GTK_BUTTONBOX_END</property>
-
-	  <child>
-	    <widget class="GtkButton" id="button1">
-	      <property name="visible">True</property>
-	      <property name="can_default">True</property>
-	      <property name="can_focus">True</property>
-	      <property name="label">gtk-ok</property>
-	      <property name="use_stock">True</property>
-	      <property name="relief">GTK_RELIEF_NORMAL</property>
-	      <property name="focus_on_click">True</property>
-	      <property name="response_id">0</property>
-	    </widget>
-	  </child>
-
-	  <child>
-	    <widget class="GtkButton" id="button2">
-	      <property name="visible">True</property>
-	      <property name="can_default">True</property>
-	      <property name="can_focus">True</property>
-	      <property name="label">gtk-apply</property>
-	      <property name="use_stock">True</property>
-	      <property name="relief">GTK_RELIEF_NORMAL</property>
-	      <property name="focus_on_click">True</property>
-	      <property name="response_id">0</property>
-	    </widget>
-	  </child>
-
-	  <child>
-	    <widget class="GtkButton" id="button3">
-	      <property name="visible">True</property>
-	      <property name="can_default">True</property>
-	      <property name="can_focus">True</property>
-	      <property name="label">gtk-close</property>
-	      <property name="use_stock">True</property>
-	      <property name="relief">GTK_RELIEF_NORMAL</property>
-	      <property name="focus_on_click">True</property>
-	      <property name="response_id">0</property>
-	    </widget>
-	  </child>
-	</widget>
-	<packing>
-	  <property name="padding">0</property>
-	  <property name="expand">False</property>
-	  <property name="fill">True</property>
-	  <property name="pack_type">GTK_PACK_END</property>
-	</packing>
-      </child>
-
-      <child>
-	<widget class="GtkNotebook" id="toplevel-notebook">
-	  <property name="visible">True</property>
-	  <property name="can_focus">True</property>
-	  <property name="show_tabs">True</property>
-	  <property name="show_border">True</property>
-	  <property name="tab_pos">GTK_POS_TOP</property>
-	  <property name="scrollable">False</property>
-	  <property name="enable_popup">False</property>
-
-	  <child>
-	    <widget class="GtkVBox" id="vbox10">
-	      <property name="border_width">12</property>
-	      <property name="visible">True</property>
-	      <property name="homogeneous">False</property>
-	      <property name="spacing">12</property>
-
-	      <child>
-		<widget class="GtkLabel" id="label51">
-		  <property name="visible">True</property>
-		  <property name="label" translatable="yes">&lt;b&gt;Time&lt;/b&gt;</property>
-		  <property name="use_underline">False</property>
-		  <property name="use_markup">True</property>
-		  <property name="justify">GTK_JUSTIFY_LEFT</property>
-		  <property name="wrap">False</property>
-		  <property name="selectable">False</property>
-		  <property name="xalign">0</property>
-		  <property name="yalign">0.5</property>
-		  <property name="xpad">0</property>
-		  <property name="ypad">0</property>
-		</widget>
-		<packing>
-		  <property name="padding">0</property>
-		  <property name="expand">False</property>
-		  <property name="fill">False</property>
-		</packing>
-	      </child>
-
-	      <child>
-		<widget class="GtkHBox" id="hbox26">
-		  <property name="visible">True</property>
-		  <property name="homogeneous">False</property>
-		  <property name="spacing">12</property>
-
-		  <child>
-		    <widget class="GtkLabel" id="label52">
-		      <property name="visible">True</property>
-		      <property name="label" translatable="yes"></property>
-		      <property name="use_underline">False</property>
-		      <property name="use_markup">False</property>
-		      <property name="justify">GTK_JUSTIFY_LEFT</property>
-		      <property name="wrap">False</property>
-		      <property name="selectable">False</property>
-		      <property name="xalign">0.5</property>
-		      <property name="yalign">0.5</property>
-		      <property name="xpad">0</property>
-		      <property name="ypad">0</property>
-		    </widget>
-		    <packing>
-		      <property name="padding">0</property>
-		      <property name="expand">False</property>
-		      <property name="fill">False</property>
-		    </packing>
-		  </child>
-
-		  <child>
-		    <widget class="GtkTable" id="table5">
-		      <property name="visible">True</property>
-		      <property name="n_rows">2</property>
-		      <property name="n_columns">3</property>
-		      <property name="homogeneous">False</property>
-		      <property name="row_spacing">6</property>
-		      <property name="column_spacing">6</property>
-
-		      <child>
-			<widget class="GtkLabel" id="label22">
-			  <property name="visible">True</property>
-			  <property name="label" translatable="yes">Time _zone:</property>
-			  <property name="use_underline">True</property>
-			  <property name="use_markup">False</property>
-			  <property name="justify">GTK_JUSTIFY_CENTER</property>
-			  <property name="wrap">False</property>
-			  <property name="selectable">False</property>
-			  <property name="xalign">0</property>
-			  <property name="yalign">0.5</property>
-			  <property name="xpad">0</property>
-			  <property name="ypad">0</property>
-			  <property name="mnemonic_widget">timezone</property>
-			</widget>
-			<packing>
-			  <property name="left_attach">0</property>
-			  <property name="right_attach">1</property>
-			  <property name="top_attach">0</property>
-			  <property name="bottom_attach">1</property>
-			  <property name="x_options">fill</property>
-			  <property name="y_options"></property>
-			</packing>
-		      </child>
-
-		      <child>
-			<widget class="GtkLabel" id="label20">
-			  <property name="visible">True</property>
-			  <property name="label" translatable="yes">Time format:</property>
-			  <property name="use_underline">False</property>
-			  <property name="use_markup">False</property>
-			  <property name="justify">GTK_JUSTIFY_CENTER</property>
-			  <property name="wrap">False</property>
-			  <property name="selectable">False</property>
-			  <property name="xalign">0</property>
-			  <property name="yalign">0.5</property>
-			  <property name="xpad">0</property>
-			  <property name="ypad">0</property>
-			</widget>
-			<packing>
-			  <property name="left_attach">0</property>
-			  <property name="right_attach">1</property>
-			  <property name="top_attach">1</property>
-			  <property name="bottom_attach">2</property>
-			  <property name="x_options">fill</property>
-			  <property name="y_options"></property>
-			</packing>
-		      </child>
-
-		      <child>
-			<widget class="GtkHBox" id="hbox10">
-			  <property name="visible">True</property>
-			  <property name="homogeneous">True</property>
-			  <property name="spacing">4</property>
-
-			  <child>
-			    <widget class="GtkAlignment" id="alignment2">
-			      <property name="visible">True</property>
-			      <property name="xalign">0</property>
-			      <property name="yalign">0.5</property>
-			      <property name="xscale">3.35276e-08</property>
-			      <property name="yscale">1</property>
-			      <property name="top_padding">0</property>
-			      <property name="bottom_padding">0</property>
-			      <property name="left_padding">0</property>
-			      <property name="right_padding">0</property>
-
-			      <child>
-				<widget class="GtkRadioButton" id="use_12_hour">
-				  <property name="visible">True</property>
-				  <property name="can_focus">True</property>
-				  <property name="label" translatable="yes">_12 hour (AM/PM)</property>
-				  <property name="use_underline">True</property>
-				  <property name="relief">GTK_RELIEF_NORMAL</property>
-				  <property name="focus_on_click">True</property>
-				  <property name="active">False</property>
-				  <property name="inconsistent">False</property>
-				  <property name="draw_indicator">True</property>
-				</widget>
-			      </child>
-			    </widget>
-			    <packing>
-			      <property name="padding">0</property>
-			      <property name="expand">True</property>
-			      <property name="fill">True</property>
-			    </packing>
-			  </child>
-
-			  <child>
-			    <widget class="GtkRadioButton" id="use_24_hour">
-			      <property name="visible">True</property>
-			      <property name="can_focus">True</property>
-			      <property name="label" translatable="yes">_24 hour</property>
-			      <property name="use_underline">True</property>
-			      <property name="relief">GTK_RELIEF_NORMAL</property>
-			      <property name="focus_on_click">True</property>
-			      <property name="active">False</property>
-			      <property name="inconsistent">False</property>
-			      <property name="draw_indicator">True</property>
-			      <property name="group">use_12_hour</property>
-			    </widget>
-			    <packing>
-			      <property name="padding">0</property>
-			      <property name="expand">True</property>
-			      <property name="fill">True</property>
-			    </packing>
-			  </child>
-			</widget>
-			<packing>
-			  <property name="left_attach">1</property>
-			  <property name="right_attach">2</property>
-			  <property name="top_attach">1</property>
-			  <property name="bottom_attach">2</property>
-			  <property name="x_options">fill</property>
-			  <property name="y_options">fill</property>
-			</packing>
-		      </child>
-
-		      <child>
-			<widget class="Custom" id="timezone">
-			  <property name="visible">True</property>
-			  <property name="can_focus">True</property>
-			  <property name="creation_function">make_timezone_entry</property>
-			  <property name="int1">0</property>
-			  <property name="int2">0</property>
-			  <property name="last_modification_time">Wed, 20 Jun 2001 02:22:46 GMT</property>
-			</widget>
-			<packing>
-			  <property name="left_attach">1</property>
-			  <property name="right_attach">3</property>
-			  <property name="top_attach">0</property>
-			  <property name="bottom_attach">1</property>
-			  <property name="x_options">fill</property>
-			  <property name="y_options">fill</property>
-			</packing>
-		      </child>
-		    </widget>
-		    <packing>
-		      <property name="padding">0</property>
-		      <property name="expand">True</property>
-		      <property name="fill">True</property>
-		    </packing>
-		  </child>
-		</widget>
-		<packing>
-		  <property name="padding">0</property>
-		  <property name="expand">False</property>
-		  <property name="fill">False</property>
-		</packing>
-	      </child>
-
-	      <child>
-		<widget class="GtkLabel" id="label49">
-		  <property name="visible">True</property>
-		  <property name="label" translatable="yes">&lt;b&gt;Work Week&lt;/b&gt;</property>
-		  <property name="use_underline">True</property>
-		  <property name="use_markup">True</property>
-		  <property name="justify">GTK_JUSTIFY_LEFT</property>
-		  <property name="wrap">False</property>
-		  <property name="selectable">False</property>
-		  <property name="xalign">0</property>
-		  <property name="yalign">0.5</property>
-		  <property name="xpad">0</property>
-		  <property name="ypad">0</property>
-		</widget>
-		<packing>
-		  <property name="padding">0</property>
-		  <property name="expand">False</property>
-		  <property name="fill">False</property>
-		</packing>
-	      </child>
-
-	      <child>
-		<widget class="GtkHBox" id="hbox25">
-		  <property name="visible">True</property>
-		  <property name="homogeneous">False</property>
-		  <property name="spacing">12</property>
-
-		  <child>
-		    <widget class="GtkLabel" id="label50">
-		      <property name="visible">True</property>
-		      <property name="label" translatable="yes"></property>
-		      <property name="use_underline">False</property>
-		      <property name="use_markup">False</property>
-		      <property name="justify">GTK_JUSTIFY_LEFT</property>
-		      <property name="wrap">False</property>
-		      <property name="selectable">False</property>
-		      <property name="xalign">0.5</property>
-		      <property name="yalign">0.5</property>
-		      <property name="xpad">0</property>
-		      <property name="ypad">0</property>
-		    </widget>
-		    <packing>
-		      <property name="padding">0</property>
-		      <property name="expand">False</property>
-		      <property name="fill">False</property>
-		    </packing>
-		  </child>
-
-		  <child>
-		    <widget class="GtkTable" id="table8">
-		      <property name="visible">True</property>
-		      <property name="n_rows">4</property>
-		      <property name="n_columns">4</property>
-		      <property name="homogeneous">False</property>
-		      <property name="row_spacing">6</property>
-		      <property name="column_spacing">6</property>
-
-		      <child>
-			<widget class="GtkHBox" id="hbox17">
-			  <property name="visible">True</property>
-			  <property name="homogeneous">False</property>
-			  <property name="spacing">6</property>
-
-			  <child>
-			    <widget class="GtkCheckButton" id="mon_button">
-			      <property name="visible">True</property>
-			      <property name="can_focus">True</property>
-			      <property name="label" translatable="yes">_Mon</property>
-			      <property name="use_underline">True</property>
-			      <property name="relief">GTK_RELIEF_NORMAL</property>
-			      <property name="focus_on_click">True</property>
-			      <property name="active">False</property>
-			      <property name="inconsistent">False</property>
-			      <property name="draw_indicator">True</property>
-			      <accessibility>
-				<atkproperty name="AtkObject::accessible_name" translatable="yes">Monday</atkproperty>
-			      </accessibility>
-			    </widget>
-			    <packing>
-			      <property name="padding">0</property>
-			      <property name="expand">False</property>
-			      <property name="fill">False</property>
-			    </packing>
-			  </child>
-
-			  <child>
-			    <widget class="GtkCheckButton" id="tue_button">
-			      <property name="visible">True</property>
-			      <property name="can_focus">True</property>
-			      <property name="label" translatable="yes">_Tue</property>
-			      <property name="use_underline">True</property>
-			      <property name="relief">GTK_RELIEF_NORMAL</property>
-			      <property name="focus_on_click">True</property>
-			      <property name="active">False</property>
-			      <property name="inconsistent">False</property>
-			      <property name="draw_indicator">True</property>
-			      <accessibility>
-				<atkproperty name="AtkObject::accessible_name" translatable="yes">Tuesday</atkproperty>
-			      </accessibility>
-			    </widget>
-			    <packing>
-			      <property name="padding">0</property>
-			      <property name="expand">False</property>
-			      <property name="fill">False</property>
-			    </packing>
-			  </child>
-
-			  <child>
-			    <widget class="GtkCheckButton" id="wed_button">
-			      <property name="visible">True</property>
-			      <property name="can_focus">True</property>
-			      <property name="label" translatable="yes">_Wed</property>
-			      <property name="use_underline">True</property>
-			      <property name="relief">GTK_RELIEF_NORMAL</property>
-			      <property name="focus_on_click">True</property>
-			      <property name="active">False</property>
-			      <property name="inconsistent">False</property>
-			      <property name="draw_indicator">True</property>
-			      <accessibility>
-				<atkproperty name="AtkObject::accessible_name" translatable="yes">Wednesday</atkproperty>
-			      </accessibility>
-			    </widget>
-			    <packing>
-			      <property name="padding">0</property>
-			      <property name="expand">False</property>
-			      <property name="fill">False</property>
-			    </packing>
-			  </child>
-
-			  <child>
-			    <widget class="GtkCheckButton" id="thu_button">
-			      <property name="visible">True</property>
-			      <property name="can_focus">True</property>
-			      <property name="label" translatable="yes">T_hu</property>
-			      <property name="use_underline">True</property>
-			      <property name="relief">GTK_RELIEF_NORMAL</property>
-			      <property name="focus_on_click">True</property>
-			      <property name="active">False</property>
-			      <property name="inconsistent">False</property>
-			      <property name="draw_indicator">True</property>
-			      <accessibility>
-				<atkproperty name="AtkObject::accessible_name" translatable="yes">Thursday</atkproperty>
-			      </accessibility>
-			    </widget>
-			    <packing>
-			      <property name="padding">0</property>
-			      <property name="expand">False</property>
-			      <property name="fill">False</property>
-			    </packing>
-			  </child>
-
-			  <child>
-			    <widget class="GtkCheckButton" id="fri_button">
-			      <property name="visible">True</property>
-			      <property name="can_focus">True</property>
-			      <property name="label" translatable="yes">_Fri</property>
-			      <property name="use_underline">True</property>
-			      <property name="relief">GTK_RELIEF_NORMAL</property>
-			      <property name="focus_on_click">True</property>
-			      <property name="active">False</property>
-			      <property name="inconsistent">False</property>
-			      <property name="draw_indicator">True</property>
-			      <accessibility>
-				<atkproperty name="AtkObject::accessible_name" translatable="yes">Friday</atkproperty>
-			      </accessibility>
-			    </widget>
-			    <packing>
-			      <property name="padding">0</property>
-			      <property name="expand">False</property>
-			      <property name="fill">False</property>
-			    </packing>
-			  </child>
-
-			  <child>
-			    <widget class="GtkCheckButton" id="sat_button">
-			      <property name="visible">True</property>
-			      <property name="can_focus">True</property>
-			      <property name="label" translatable="yes">_Sat</property>
-			      <property name="use_underline">True</property>
-			      <property name="relief">GTK_RELIEF_NORMAL</property>
-			      <property name="focus_on_click">True</property>
-			      <property name="active">False</property>
-			      <property name="inconsistent">False</property>
-			      <property name="draw_indicator">True</property>
-			      <accessibility>
-				<atkproperty name="AtkObject::accessible_name" translatable="yes">Saturday</atkproperty>
-			      </accessibility>
-			    </widget>
-			    <packing>
-			      <property name="padding">0</property>
-			      <property name="expand">False</property>
-			      <property name="fill">True</property>
-			    </packing>
-			  </child>
-
-			  <child>
-			    <widget class="GtkCheckButton" id="sun_button">
-			      <property name="visible">True</property>
-			      <property name="can_focus">True</property>
-			      <property name="label" translatable="yes">S_un</property>
-			      <property name="use_underline">True</property>
-			      <property name="relief">GTK_RELIEF_NORMAL</property>
-			      <property name="focus_on_click">True</property>
-			      <property name="active">False</property>
-			      <property name="inconsistent">False</property>
-			      <property name="draw_indicator">True</property>
-			      <accessibility>
-				<atkproperty name="AtkObject::accessible_name" translatable="yes">Sunday</atkproperty>
-			      </accessibility>
-			    </widget>
-			    <packing>
-			      <property name="padding">0</property>
-			      <property name="expand">False</property>
-			      <property name="fill">False</property>
-			    </packing>
-			  </child>
-			</widget>
-			<packing>
-			  <property name="left_attach">1</property>
-			  <property name="right_attach">4</property>
-			  <property name="top_attach">1</property>
-			  <property name="bottom_attach">2</property>
-			  <property name="y_options">fill</property>
-			</packing>
-		      </child>
-
-		      <child>
-			<widget class="GtkAlignment" id="alignment3">
-			  <property name="visible">True</property>
-			  <property name="xalign">7.45058e-09</property>
-			  <property name="yalign">0.5</property>
-			  <property name="xscale">0</property>
-			  <property name="yscale">1</property>
-			  <property name="top_padding">0</property>
-			  <property name="bottom_padding">0</property>
-			  <property name="left_padding">0</property>
-			  <property name="right_padding">0</property>
-
-			  <child>
-			    <widget class="GtkOptionMenu" id="first_day_of_week">
-			      <property name="visible">True</property>
-			      <property name="can_focus">True</property>
-			      <property name="history">0</property>
-
-			      <child internal-child="menu">
-				<widget class="GtkMenu" id="convertwidget1">
-				  <property name="visible">True</property>
-
-				  <child>
-				    <widget class="GtkMenuItem" id="convertwidget2">
-				      <property name="visible">True</property>
-				      <property name="label" translatable="yes">Monday</property>
-				      <property name="use_underline">True</property>
-				    </widget>
-				  </child>
-
-				  <child>
-				    <widget class="GtkMenuItem" id="convertwidget3">
-				      <property name="visible">True</property>
-				      <property name="label" translatable="yes">Tuesday</property>
-				      <property name="use_underline">True</property>
-				    </widget>
-				  </child>
-
-				  <child>
-				    <widget class="GtkMenuItem" id="convertwidget4">
-				      <property name="visible">True</property>
-				      <property name="label" translatable="yes">Wednesday</property>
-				      <property name="use_underline">True</property>
-				    </widget>
-				  </child>
-
-				  <child>
-				    <widget class="GtkMenuItem" id="convertwidget5">
-				      <property name="visible">True</property>
-				      <property name="label" translatable="yes">Thursday</property>
-				      <property name="use_underline">True</property>
-				    </widget>
-				  </child>
-
-				  <child>
-				    <widget class="GtkMenuItem" id="convertwidget6">
-				      <property name="visible">True</property>
-				      <property name="label" translatable="yes">Friday</property>
-				      <property name="use_underline">True</property>
-				    </widget>
-				  </child>
-
-				  <child>
-				    <widget class="GtkMenuItem" id="convertwidget7">
-				      <property name="visible">True</property>
-				      <property name="label" translatable="yes">Saturday</property>
-				      <property name="use_underline">True</property>
-				    </widget>
-				  </child>
-
-				  <child>
-				    <widget class="GtkMenuItem" id="convertwidget8">
-				      <property name="visible">True</property>
-				      <property name="label" translatable="yes">Sunday</property>
-				      <property name="use_underline">True</property>
-				    </widget>
-				  </child>
-				</widget>
-			      </child>
-			    </widget>
-			  </child>
-			</widget>
-			<packing>
-			  <property name="left_attach">1</property>
-			  <property name="right_attach">2</property>
-			  <property name="top_attach">0</property>
-			  <property name="bottom_attach">1</property>
-			  <property name="x_options">fill</property>
-			  <property name="y_options"></property>
-			</packing>
-		      </child>
-
-		      <child>
-			<widget class="GtkLabel" id="label32">
-			  <property name="visible">True</property>
-			  <property name="label" translatable="yes">W_eek starts:</property>
-			  <property name="use_underline">True</property>
-			  <property name="use_markup">False</property>
-			  <property name="justify">GTK_JUSTIFY_CENTER</property>
-			  <property name="wrap">False</property>
-			  <property name="selectable">False</property>
-			  <property name="xalign">0</property>
-			  <property name="yalign">0.5</property>
-			  <property name="xpad">0</property>
-			  <property name="ypad">0</property>
-			  <property name="mnemonic_widget">first_day_of_week</property>
-			</widget>
-			<packing>
-			  <property name="left_attach">0</property>
-			  <property name="right_attach">1</property>
-			  <property name="top_attach">0</property>
-			  <property name="bottom_attach">1</property>
-			  <property name="x_options">fill</property>
-			  <property name="y_options"></property>
-			</packing>
-		      </child>
-
-		      <child>
-			<widget class="GtkLabel" id="label31">
-			  <property name="visible">True</property>
-			  <property name="label" translatable="yes">Work days:</property>
-			  <property name="use_underline">False</property>
-			  <property name="use_markup">False</property>
-			  <property name="justify">GTK_JUSTIFY_CENTER</property>
-			  <property name="wrap">False</property>
-			  <property name="selectable">False</property>
-			  <property name="xalign">0</property>
-			  <property name="yalign">0.5</property>
-			  <property name="xpad">0</property>
-			  <property name="ypad">0</property>
-			</widget>
-			<packing>
-			  <property name="left_attach">0</property>
-			  <property name="right_attach">1</property>
-			  <property name="top_attach">1</property>
-			  <property name="bottom_attach">2</property>
-			  <property name="x_options">fill</property>
-			  <property name="y_options"></property>
-			</packing>
-		      </child>
-
-		      <child>
-			<widget class="GtkLabel" id="end_of_day_label">
-			  <property name="visible">True</property>
-			  <property name="label" translatable="yes">Day _ends:</property>
-			  <property name="use_underline">True</property>
-			  <property name="use_markup">False</property>
-			  <property name="justify">GTK_JUSTIFY_RIGHT</property>
-			  <property name="wrap">False</property>
-			  <property name="selectable">False</property>
-			  <property name="xalign">0</property>
-			  <property name="yalign">0.5</property>
-			  <property name="xpad">0</property>
-			  <property name="ypad">0</property>
-			  <property name="mnemonic_widget">end_of_day</property>
-			</widget>
-			<packing>
-			  <property name="left_attach">0</property>
-			  <property name="right_attach">1</property>
-			  <property name="top_attach">3</property>
-			  <property name="bottom_attach">4</property>
-			  <property name="x_options">fill</property>
-			  <property name="y_options"></property>
-			</packing>
-		      </child>
-
-		      <child>
-			<widget class="GtkLabel" id="start_of_day_label">
-			  <property name="visible">True</property>
-			  <property name="label" translatable="yes">_Day begins:</property>
-			  <property name="use_underline">True</property>
-			  <property name="use_markup">False</property>
-			  <property name="justify">GTK_JUSTIFY_CENTER</property>
-			  <property name="wrap">False</property>
-			  <property name="selectable">False</property>
-			  <property name="xalign">0</property>
-			  <property name="yalign">0.5</property>
-			  <property name="xpad">0</property>
-			  <property name="ypad">0</property>
-			  <property name="mnemonic_widget">start_of_day</property>
-			</widget>
-			<packing>
-			  <property name="left_attach">0</property>
-			  <property name="right_attach">1</property>
-			  <property name="top_attach">2</property>
-			  <property name="bottom_attach">3</property>
-			  <property name="x_options">fill</property>
-			  <property name="y_options"></property>
-			</packing>
-		      </child>
-
-		      <child>
-			<widget class="Custom" id="start_of_day">
-			  <property name="visible">True</property>
-			  <property name="creation_function">cal_prefs_dialog_create_time_edit</property>
-			  <property name="int1">0</property>
-			  <property name="int2">0</property>
-			  <property name="last_modification_time">Thu, 30 May 2002 19:26:53 GMT</property>
-			  <accessibility>
-			    <atkrelation target="start_of_day_label" type="labelled-by"/>
-			  </accessibility>
-			</widget>
-			<packing>
-			  <property name="left_attach">1</property>
-			  <property name="right_attach">4</property>
-			  <property name="top_attach">2</property>
-			  <property name="bottom_attach">3</property>
-			  <property name="x_options">fill</property>
-			  <property name="y_options">fill</property>
-			</packing>
-		      </child>
-
-		      <child>
-			<widget class="Custom" id="end_of_day">
-			  <property name="visible">True</property>
-			  <property name="creation_function">cal_prefs_dialog_create_time_edit</property>
-			  <property name="int1">0</property>
-			  <property name="int2">0</property>
-			  <property name="last_modification_time">Thu, 30 May 2002 19:27:35 GMT</property>
-			  <accessibility>
-			    <atkrelation target="end_of_day_label" type="labelled-by"/>
-			  </accessibility>
-			</widget>
-			<packing>
-			  <property name="left_attach">1</property>
-			  <property name="right_attach">4</property>
-			  <property name="top_attach">3</property>
-			  <property name="bottom_attach">4</property>
-			  <property name="x_options">fill</property>
-			  <property name="y_options">fill</property>
-			</packing>
-		      </child>
-		    </widget>
-		    <packing>
-		      <property name="padding">0</property>
-		      <property name="expand">True</property>
-		      <property name="fill">True</property>
-		    </packing>
-		  </child>
-		</widget>
-		<packing>
-		  <property name="padding">0</property>
-		  <property name="expand">False</property>
-		  <property name="fill">False</property>
-		</packing>
-	      </child>
-
-	      <child>
-		<widget class="GtkLabel" id="label53">
-		  <property name="visible">True</property>
-		  <property name="label" translatable="yes">&lt;b&gt;Alerts&lt;/b&gt;</property>
-		  <property name="use_underline">False</property>
-		  <property name="use_markup">True</property>
-		  <property name="justify">GTK_JUSTIFY_LEFT</property>
-		  <property name="wrap">False</property>
-		  <property name="selectable">False</property>
-		  <property name="xalign">0</property>
-		  <property name="yalign">0.5</property>
-		  <property name="xpad">0</property>
-		  <property name="ypad">0</property>
-		</widget>
-		<packing>
-		  <property name="padding">0</property>
-		  <property name="expand">False</property>
-		  <property name="fill">False</property>
-		</packing>
-	      </child>
-
-	      <child>
-		<widget class="GtkHBox" id="hbox27">
-		  <property name="visible">True</property>
-		  <property name="homogeneous">False</property>
-		  <property name="spacing">12</property>
-
-		  <child>
-		    <widget class="GtkLabel" id="label54">
-		      <property name="visible">True</property>
-		      <property name="label" translatable="yes"></property>
-		      <property name="use_underline">False</property>
-		      <property name="use_markup">False</property>
-		      <property name="justify">GTK_JUSTIFY_LEFT</property>
-		      <property name="wrap">False</property>
-		      <property name="selectable">False</property>
-		      <property name="xalign">0.5</property>
-		      <property name="yalign">0.5</property>
-		      <property name="xpad">0</property>
-		      <property name="ypad">0</property>
-		    </widget>
-		    <packing>
-		      <property name="padding">0</property>
-		      <property name="expand">False</property>
-		      <property name="fill">False</property>
-		    </packing>
-		  </child>
-
-		  <child>
-		    <widget class="GtkVBox" id="vbox13">
-		      <property name="visible">True</property>
-		      <property name="homogeneous">False</property>
-		      <property name="spacing">0</property>
-
-		      <child>
-			<widget class="GtkCheckButton" id="confirm-delete">
-			  <property name="border_width">3</property>
-			  <property name="visible">True</property>
-			  <property name="can_focus">True</property>
-			  <property name="label" translatable="yes">_Ask for confirmation when deleting items</property>
-			  <property name="use_underline">True</property>
-			  <property name="relief">GTK_RELIEF_NORMAL</property>
-			  <property name="focus_on_click">True</property>
-			  <property name="active">False</property>
-			  <property name="inconsistent">False</property>
-			  <property name="draw_indicator">True</property>
-			</widget>
-			<packing>
-			  <property name="padding">0</property>
-			  <property name="expand">False</property>
-			  <property name="fill">False</property>
-			</packing>
-		      </child>
-
-		      <child>
-			<widget class="GtkHBox" id="hbox19">
-			  <property name="border_width">3</property>
-			  <property name="visible">True</property>
-			  <property name="homogeneous">False</property>
-			  <property name="spacing">3</property>
-
-			  <child>
-			    <widget class="GtkCheckButton" id="default-reminder">
-			      <property name="visible">True</property>
-			      <property name="can_focus">True</property>
-			      <property name="label" translatable="yes">Sh_ow a reminder</property>
-			      <property name="use_underline">True</property>
-			      <property name="relief">GTK_RELIEF_NORMAL</property>
-			      <property name="focus_on_click">True</property>
-			      <property name="active">False</property>
-			      <property name="inconsistent">False</property>
-			      <property name="draw_indicator">True</property>
-			    </widget>
-			    <packing>
-			      <property name="padding">0</property>
-			      <property name="expand">False</property>
-			      <property name="fill">False</property>
-			    </packing>
-			  </child>
-
-			  <child>
-			    <widget class="GtkSpinButton" id="default-reminder-interval">
-			      <property name="visible">True</property>
-			      <property name="can_focus">True</property>
-			      <property name="climb_rate">1</property>
-			      <property name="digits">0</property>
-			      <property name="numeric">False</property>
-			      <property name="update_policy">GTK_UPDATE_ALWAYS</property>
-			      <property name="snap_to_ticks">False</property>
-			      <property name="wrap">False</property>
-			      <property name="adjustment">0 0 9999 1 10 10</property>
-			    </widget>
-			    <packing>
-			      <property name="padding">0</property>
-			      <property name="expand">False</property>
-			      <property name="fill">False</property>
-			    </packing>
-			  </child>
-
-			  <child>
-			    <widget class="GtkAlignment" id="alignment4">
-			      <property name="visible">True</property>
-			      <property name="xalign">7.45058e-09</property>
-			      <property name="yalign">0.5</property>
-			      <property name="xscale">0</property>
-			      <property name="yscale">0</property>
-			      <property name="top_padding">0</property>
-			      <property name="bottom_padding">0</property>
-			      <property name="left_padding">0</property>
-			      <property name="right_padding">0</property>
-
-			      <child>
-				<widget class="GtkOptionMenu" id="default-reminder-units">
-				  <property name="visible">True</property>
-				  <property name="can_focus">True</property>
-				  <property name="history">0</property>
-				  <accessibility>
-				    <atkproperty name="AtkObject::accessible_name" translatable="yes">option menu to choose reminder units</atkproperty>
-				  </accessibility>
-
-				  <child internal-child="menu">
-				    <widget class="GtkMenu" id="convertwidget9">
-				      <property name="visible">True</property>
-
-				      <child>
-					<widget class="GtkMenuItem" id="convertwidget10">
-					  <property name="visible">True</property>
-					  <property name="label" translatable="yes">Minutes</property>
-					  <property name="use_underline">True</property>
-					</widget>
-				      </child>
-
-				      <child>
-					<widget class="GtkMenuItem" id="convertwidget11">
-					  <property name="visible">True</property>
-					  <property name="label" translatable="yes">Hours</property>
-					  <property name="use_underline">True</property>
-					</widget>
-				      </child>
-
-				      <child>
-					<widget class="GtkMenuItem" id="convertwidget12">
-					  <property name="visible">True</property>
-					  <property name="label" translatable="yes">Days</property>
-					  <property name="use_underline">True</property>
-					</widget>
-				      </child>
-				    </widget>
-				  </child>
-				</widget>
-			      </child>
-			    </widget>
-			    <packing>
-			      <property name="padding">0</property>
-			      <property name="expand">False</property>
-			      <property name="fill">True</property>
-			    </packing>
-			  </child>
-
-			  <child>
-			    <widget class="GtkLabel" id="label35">
-			      <property name="visible">True</property>
-			      <property name="label" translatable="yes">before every appointment</property>
-			      <property name="use_underline">False</property>
-			      <property name="use_markup">False</property>
-			      <property name="justify">GTK_JUSTIFY_CENTER</property>
-			      <property name="wrap">False</property>
-			      <property name="selectable">False</property>
-			      <property name="xalign">0.5</property>
-			      <property name="yalign">0.5</property>
-			      <property name="xpad">0</property>
-			      <property name="ypad">0</property>
-			    </widget>
-			    <packing>
-			      <property name="padding">0</property>
-			      <property name="expand">False</property>
-			      <property name="fill">False</property>
-			    </packing>
-			  </child>
-			</widget>
-			<packing>
-			  <property name="padding">0</property>
-			  <property name="expand">False</property>
-			  <property name="fill">False</property>
-			</packing>
-		      </child>
-		    </widget>
-		    <packing>
-		      <property name="padding">0</property>
-		      <property name="expand">True</property>
-		      <property name="fill">True</property>
-		    </packing>
-		  </child>
-		</widget>
-		<packing>
-		  <property name="padding">0</property>
-		  <property name="expand">False</property>
-		  <property name="fill">False</property>
-		</packing>
-	      </child>
-	    </widget>
-	    <packing>
-	      <property name="tab_expand">False</property>
-	      <property name="tab_fill">False</property>
-	    </packing>
-	  </child>
-
-	  <child>
-	    <widget class="GtkLabel" id="label21">
-	      <property name="visible">True</property>
-	      <property name="label" translatable="yes">General</property>
-	      <property name="use_underline">True</property>
-	      <property name="use_markup">False</property>
-	      <property name="justify">GTK_JUSTIFY_CENTER</property>
-	      <property name="wrap">False</property>
-	      <property name="selectable">False</property>
-	      <property name="xalign">0.5</property>
-	      <property name="yalign">0.5</property>
-	      <property name="xpad">0</property>
-	      <property name="ypad">0</property>
-	    </widget>
-	    <packing>
-	      <property name="type">tab</property>
-	    </packing>
-	  </child>
-
-	  <child>
-	    <widget class="GtkVBox" id="vbox8">
-	      <property name="border_width">12</property>
-	      <property name="visible">True</property>
-	      <property name="homogeneous">False</property>
-	      <property name="spacing">12</property>
-
-	      <child>
-		<widget class="GtkLabel" id="label55">
-		  <property name="visible">True</property>
-		  <property name="label" translatable="yes">&lt;b&gt;General&lt;/b&gt;</property>
-		  <property name="use_underline">False</property>
-		  <property name="use_markup">True</property>
-		  <property name="justify">GTK_JUSTIFY_LEFT</property>
-		  <property name="wrap">False</property>
-		  <property name="selectable">False</property>
-		  <property name="xalign">0</property>
-		  <property name="yalign">0.5</property>
-		  <property name="xpad">0</property>
-		  <property name="ypad">0</property>
-		</widget>
-		<packing>
-		  <property name="padding">0</property>
-		  <property name="expand">False</property>
-		  <property name="fill">False</property>
-		</packing>
-	      </child>
-
-	      <child>
-		<widget class="GtkHBox" id="hbox28">
-		  <property name="visible">True</property>
-		  <property name="homogeneous">False</property>
-		  <property name="spacing">12</property>
-
-		  <child>
-		    <widget class="GtkLabel" id="label56">
-		      <property name="visible">True</property>
-		      <property name="label" translatable="yes"></property>
-		      <property name="use_underline">False</property>
-		      <property name="use_markup">False</property>
-		      <property name="justify">GTK_JUSTIFY_LEFT</property>
-		      <property name="wrap">False</property>
-		      <property name="selectable">False</property>
-		      <property name="xalign">0.5</property>
-		      <property name="yalign">0.5</property>
-		      <property name="xpad">0</property>
-		      <property name="ypad">0</property>
-		    </widget>
-		    <packing>
-		      <property name="padding">0</property>
-		      <property name="expand">False</property>
-		      <property name="fill">False</property>
-		    </packing>
-		  </child>
-
-		  <child>
-		    <widget class="GtkVBox" id="vbox16">
-		      <property name="visible">True</property>
-		      <property name="homogeneous">False</property>
-		      <property name="spacing">6</property>
-
-		      <child>
-			<widget class="GtkHBox" id="hbox12">
-			  <property name="visible">True</property>
-			  <property name="homogeneous">False</property>
-			  <property name="spacing">6</property>
-
-			  <child>
-			    <widget class="GtkLabel" id="label25">
-			      <property name="visible">True</property>
-			      <property name="label" translatable="yes">_Time divisions:</property>
-			      <property name="use_underline">True</property>
-			      <property name="use_markup">False</property>
-			      <property name="justify">GTK_JUSTIFY_CENTER</property>
-			      <property name="wrap">False</property>
-			      <property name="selectable">False</property>
-			      <property name="xalign">0.5</property>
-			      <property name="yalign">0.5</property>
-			      <property name="xpad">0</property>
-			      <property name="ypad">0</property>
-			      <property name="mnemonic_widget">time_divisions</property>
-			    </widget>
-			    <packing>
-			      <property name="padding">0</property>
-			      <property name="expand">False</property>
-			      <property name="fill">False</property>
-			    </packing>
-			  </child>
-
-			  <child>
-			    <widget class="GtkOptionMenu" id="time_divisions">
-			      <property name="visible">True</property>
-			      <property name="can_focus">True</property>
-			      <property name="history">0</property>
-
-			      <child internal-child="menu">
-				<widget class="GtkMenu" id="convertwidget13">
-				  <property name="visible">True</property>
-
-				  <child>
-				    <widget class="GtkMenuItem" id="convertwidget14">
-				      <property name="visible">True</property>
-				      <property name="label" translatable="yes">60 minutes</property>
-				      <property name="use_underline">True</property>
-				    </widget>
-				  </child>
-
-				  <child>
-				    <widget class="GtkMenuItem" id="convertwidget15">
-				      <property name="visible">True</property>
-				      <property name="label" translatable="yes">30 minutes</property>
-				      <property name="use_underline">True</property>
-				    </widget>
-				  </child>
-
-				  <child>
-				    <widget class="GtkMenuItem" id="convertwidget16">
-				      <property name="visible">True</property>
-				      <property name="label" translatable="yes">15 minutes</property>
-				      <property name="use_underline">True</property>
-				    </widget>
-				  </child>
-
-				  <child>
-				    <widget class="GtkMenuItem" id="convertwidget17">
-				      <property name="visible">True</property>
-				      <property name="label" translatable="yes">10 minutes</property>
-				      <property name="use_underline">True</property>
-				    </widget>
-				  </child>
-
-				  <child>
-				    <widget class="GtkMenuItem" id="convertwidget18">
-				      <property name="visible">True</property>
-				      <property name="label" translatable="yes">05 minutes</property>
-				      <property name="use_underline">True</property>
-				    </widget>
-				  </child>
-				</widget>
-			      </child>
-			    </widget>
-			    <packing>
-			      <property name="padding">0</property>
-			      <property name="expand">False</property>
-			      <property name="fill">False</property>
-			    </packing>
-			  </child>
-			</widget>
-			<packing>
-			  <property name="padding">0</property>
-			  <property name="expand">False</property>
-			  <property name="fill">False</property>
-			</packing>
-		      </child>
-
-		      <child>
-			<widget class="GtkCheckButton" id="show_end_times">
-			  <property name="visible">True</property>
-			  <property name="can_focus">True</property>
-			  <property name="label" translatable="yes">_Show appointment end times in week and month views</property>
-			  <property name="use_underline">True</property>
-			  <property name="relief">GTK_RELIEF_NORMAL</property>
-			  <property name="focus_on_click">True</property>
-			  <property name="active">False</property>
-			  <property name="inconsistent">False</property>
-			  <property name="draw_indicator">True</property>
-			</widget>
-			<packing>
-			  <property name="padding">0</property>
-			  <property name="expand">False</property>
-			  <property name="fill">False</property>
-			</packing>
-		      </child>
-
-		      <child>
-			<widget class="GtkCheckButton" id="compress_weekend">
-			  <property name="visible">True</property>
-			  <property name="can_focus">True</property>
-			  <property name="label" translatable="yes">_Compress weekends in month view</property>
-			  <property name="use_underline">True</property>
-			  <property name="relief">GTK_RELIEF_NORMAL</property>
-			  <property name="focus_on_click">True</property>
-			  <property name="active">False</property>
-			  <property name="inconsistent">False</property>
-			  <property name="draw_indicator">True</property>
-			</widget>
-			<packing>
-			  <property name="padding">0</property>
-			  <property name="expand">False</property>
-			  <property name="fill">False</property>
-			</packing>
-		      </child>
-
-		      <child>
-			<widget class="GtkCheckButton" id="dnav_show_week_no">
-			  <property name="visible">True</property>
-			  <property name="can_focus">True</property>
-			  <property name="label" translatable="yes">Show week _numbers in date navigator</property>
-			  <property name="use_underline">True</property>
-			  <property name="relief">GTK_RELIEF_NORMAL</property>
-			  <property name="focus_on_click">True</property>
-			  <property name="active">False</property>
-			  <property name="inconsistent">False</property>
-			  <property name="draw_indicator">True</property>
-			</widget>
-			<packing>
-			  <property name="padding">0</property>
-			  <property name="expand">False</property>
-			  <property name="fill">False</property>
-			</packing>
-		      </child>
-		    </widget>
-		    <packing>
-		      <property name="padding">0</property>
-		      <property name="expand">True</property>
-		      <property name="fill">True</property>
-		    </packing>
-		  </child>
-		</widget>
-		<packing>
-		  <property name="padding">0</property>
-		  <property name="expand">False</property>
-		  <property name="fill">False</property>
-		</packing>
-	      </child>
-
-	      <child>
-		<widget class="GtkLabel" id="label57">
-		  <property name="visible">True</property>
-		  <property name="label" translatable="yes">&lt;b&gt;Task List&lt;/b&gt;</property>
-		  <property name="use_underline">False</property>
-		  <property name="use_markup">True</property>
-		  <property name="justify">GTK_JUSTIFY_LEFT</property>
-		  <property name="wrap">False</property>
-		  <property name="selectable">False</property>
-		  <property name="xalign">0</property>
-		  <property name="yalign">0.5</property>
-		  <property name="xpad">0</property>
-		  <property name="ypad">0</property>
-		</widget>
-		<packing>
-		  <property name="padding">0</property>
-		  <property name="expand">False</property>
-		  <property name="fill">False</property>
-		</packing>
-	      </child>
-
-	      <child>
-		<widget class="GtkHBox" id="hbox29">
-		  <property name="visible">True</property>
-		  <property name="homogeneous">False</property>
-		  <property name="spacing">12</property>
-
-		  <child>
-		    <widget class="GtkLabel" id="label58">
-		      <property name="visible">True</property>
-		      <property name="label" translatable="yes"></property>
-		      <property name="use_underline">False</property>
-		      <property name="use_markup">False</property>
-		      <property name="justify">GTK_JUSTIFY_LEFT</property>
-		      <property name="wrap">False</property>
-		      <property name="selectable">False</property>
-		      <property name="xalign">0.5</property>
-		      <property name="yalign">0.5</property>
-		      <property name="xpad">0</property>
-		      <property name="ypad">0</property>
-		    </widget>
-		    <packing>
-		      <property name="padding">0</property>
-		      <property name="expand">False</property>
-		      <property name="fill">False</property>
-		    </packing>
-		  </child>
-
-		  <child>
-		    <widget class="GtkVBox" id="vbox12">
-		      <property name="visible">True</property>
-		      <property name="homogeneous">False</property>
-		      <property name="spacing">6</property>
-
-		      <child>
-			<widget class="GtkTable" id="table7">
-			  <property name="visible">True</property>
-			  <property name="n_rows">2</property>
-			  <property name="n_columns">2</property>
-			  <property name="homogeneous">False</property>
-			  <property name="row_spacing">6</property>
-			  <property name="column_spacing">6</property>
-
-			  <child>
-			    <widget class="GtkLabel" id="label28">
-			      <property name="visible">True</property>
-			      <property name="label" translatable="yes">T_asks due today:</property>
-			      <property name="use_underline">True</property>
-			      <property name="use_markup">False</property>
-			      <property name="justify">GTK_JUSTIFY_CENTER</property>
-			      <property name="wrap">False</property>
-			      <property name="selectable">False</property>
-			      <property name="xalign">0</property>
-			      <property name="yalign">0.5</property>
-			      <property name="xpad">0</property>
-			      <property name="ypad">0</property>
-			      <property name="mnemonic_widget">tasks_due_today_color</property>
-			    </widget>
-			    <packing>
-			      <property name="left_attach">0</property>
-			      <property name="right_attach">1</property>
-			      <property name="top_attach">0</property>
-			      <property name="bottom_attach">1</property>
-			      <property name="x_options">fill</property>
-			      <property name="y_options"></property>
-			    </packing>
-			  </child>
-
-			  <child>
-			    <widget class="GtkLabel" id="label29">
-			      <property name="visible">True</property>
-			      <property name="label" translatable="yes">_Overdue tasks:</property>
-			      <property name="use_underline">True</property>
-			      <property name="use_markup">False</property>
-			      <property name="justify">GTK_JUSTIFY_CENTER</property>
-			      <property name="wrap">False</property>
-			      <property name="selectable">False</property>
-			      <property name="xalign">0</property>
-			      <property name="yalign">0.5</property>
-			      <property name="xpad">0</property>
-			      <property name="ypad">0</property>
-			      <property name="mnemonic_widget">tasks_overdue_color</property>
-			    </widget>
-			    <packing>
-			      <property name="left_attach">0</property>
-			      <property name="right_attach">1</property>
-			      <property name="top_attach">1</property>
-			      <property name="bottom_attach">2</property>
-			      <property name="x_options">fill</property>
-			      <property name="y_options"></property>
-			    </packing>
-			  </child>
-
-			  <child>
-			    <widget class="GnomeColorPicker" id="tasks_overdue_color">
-			      <property name="visible">True</property>
-			      <property name="can_focus">True</property>
-			      <property name="dither">True</property>
-			      <property name="use_alpha">False</property>
-			      <property name="title" translatable="yes">Color for overdue tasks</property>
-			      <property name="focus_on_click">True</property>
-			    </widget>
-			    <packing>
-			      <property name="left_attach">1</property>
-			      <property name="right_attach">2</property>
-			      <property name="top_attach">1</property>
-			      <property name="bottom_attach">2</property>
-			      <property name="x_options">fill</property>
-			      <property name="y_options"></property>
-			    </packing>
-			  </child>
-
-			  <child>
-			    <widget class="GnomeColorPicker" id="tasks_due_today_color">
-			      <property name="visible">True</property>
-			      <property name="can_focus">True</property>
-			      <property name="dither">True</property>
-			      <property name="use_alpha">False</property>
-			      <property name="title" translatable="yes">Color for tasks due today</property>
-			      <property name="focus_on_click">True</property>
-			    </widget>
-			    <packing>
-			      <property name="left_attach">1</property>
-			      <property name="right_attach">2</property>
-			      <property name="top_attach">0</property>
-			      <property name="bottom_attach">1</property>
-			      <property name="x_options">fill</property>
-			      <property name="y_options"></property>
-			    </packing>
-			  </child>
-			</widget>
-			<packing>
-			  <property name="padding">0</property>
-			  <property name="expand">False</property>
-			  <property name="fill">False</property>
-			</packing>
-		      </child>
-
-		      <child>
-			<widget class="GtkHBox" id="hbox15">
-			  <property name="visible">True</property>
-			  <property name="homogeneous">False</property>
-			  <property name="spacing">6</property>
-
-			  <child>
-			    <widget class="GtkCheckButton" id="tasks-hide-completed-checkbutton">
-			      <property name="visible">True</property>
-			      <property name="can_focus">True</property>
-			      <property name="label" translatable="yes">_Hide completed tasks after</property>
-			      <property name="use_underline">True</property>
-			      <property name="relief">GTK_RELIEF_NORMAL</property>
-			      <property name="focus_on_click">True</property>
-			      <property name="active">False</property>
-			      <property name="inconsistent">False</property>
-			      <property name="draw_indicator">True</property>
-			    </widget>
-			    <packing>
-			      <property name="padding">0</property>
-			      <property name="expand">False</property>
-			      <property name="fill">False</property>
-			    </packing>
-			  </child>
-
-			  <child>
-			    <widget class="GtkSpinButton" id="tasks-hide-completed-spinbutton">
-			      <property name="visible">True</property>
-			      <property name="can_focus">True</property>
-			      <property name="climb_rate">1</property>
-			      <property name="digits">0</property>
-			      <property name="numeric">False</property>
-			      <property name="update_policy">GTK_UPDATE_ALWAYS</property>
-			      <property name="snap_to_ticks">False</property>
-			      <property name="wrap">False</property>
-			      <property name="adjustment">1 0 9999 1 10 10</property>
-			    </widget>
-			    <packing>
-			      <property name="padding">0</property>
-			      <property name="expand">False</property>
-			      <property name="fill">True</property>
-			    </packing>
-			  </child>
-
-			  <child>
-			    <widget class="GtkOptionMenu" id="tasks-hide-completed-optionmenu">
-			      <property name="visible">True</property>
-			      <property name="can_focus">True</property>
-			      <property name="history">0</property>
-			      <accessibility>
-				<atkproperty name="AtkObject::accessible_name" translatable="yes">option menu to choose time units</atkproperty>
-			      </accessibility>
-
-			      <child internal-child="menu">
-				<widget class="GtkMenu" id="convertwidget19">
-				  <property name="visible">True</property>
-
-				  <child>
-				    <widget class="GtkMenuItem" id="convertwidget20">
-				      <property name="visible">True</property>
-				      <property name="label" translatable="yes">Minutes</property>
-				      <property name="use_underline">True</property>
-				    </widget>
-				  </child>
-
-				  <child>
-				    <widget class="GtkMenuItem" id="convertwidget21">
-				      <property name="visible">True</property>
-				      <property name="label" translatable="yes">Hours</property>
-				      <property name="use_underline">True</property>
-				    </widget>
-				  </child>
-
-				  <child>
-				    <widget class="GtkMenuItem" id="convertwidget22">
-				      <property name="visible">True</property>
-				      <property name="label" translatable="yes">Days</property>
-				      <property name="use_underline">True</property>
-				    </widget>
-				  </child>
-				</widget>
-			      </child>
-			    </widget>
-			    <packing>
-			      <property name="padding">0</property>
-			      <property name="expand">False</property>
-			      <property name="fill">False</property>
-			    </packing>
-			  </child>
-			</widget>
-			<packing>
-			  <property name="padding">0</property>
-			  <property name="expand">False</property>
-			  <property name="fill">False</property>
-			</packing>
-		      </child>
-		    </widget>
-		    <packing>
-		      <property name="padding">0</property>
-		      <property name="expand">True</property>
-		      <property name="fill">True</property>
-		    </packing>
-		  </child>
-		</widget>
-		<packing>
-		  <property name="padding">0</property>
-		  <property name="expand">False</property>
-		  <property name="fill">False</property>
-		</packing>
-	      </child>
-	    </widget>
-	    <packing>
-	      <property name="tab_expand">False</property>
-	      <property name="tab_fill">False</property>
-	    </packing>
-	  </child>
-
-	  <child>
-	    <widget class="GtkLabel" id="label7">
-	      <property name="visible">True</property>
-	      <property name="label" translatable="yes">Display</property>
-	      <property name="use_underline">True</property>
-	      <property name="use_markup">False</property>
-	      <property name="justify">GTK_JUSTIFY_CENTER</property>
-	      <property name="wrap">False</property>
-	      <property name="selectable">False</property>
-	      <property name="xalign">0.5</property>
-	      <property name="yalign">0.5</property>
-	      <property name="xpad">0</property>
-	      <property name="ypad">0</property>
-	    </widget>
-	    <packing>
-	      <property name="type">tab</property>
-	    </packing>
-	  </child>
-
-	  <child>
-	    <widget class="GtkVBox" id="vbox17">
-	      <property name="border_width">12</property>
-	      <property name="visible">True</property>
-	      <property name="homogeneous">False</property>
-	      <property name="spacing">12</property>
-
-	      <child>
-		<widget class="GtkFrame" id="frame2">
-		  <property name="visible">True</property>
-		  <property name="label_xalign">0</property>
-		  <property name="label_yalign">0.5</property>
-		  <property name="shadow_type">GTK_SHADOW_NONE</property>
-
-		  <child>
-		    <widget class="GtkAlignment" id="alignment8">
-		      <property name="visible">True</property>
-		      <property name="xalign">0.5</property>
-		      <property name="yalign">0.5</property>
-		      <property name="xscale">1</property>
-		      <property name="yscale">1</property>
-		      <property name="top_padding">12</property>
-		      <property name="bottom_padding">0</property>
-		      <property name="left_padding">12</property>
-		      <property name="right_padding">0</property>
-
-		      <child>
-			<widget class="GtkHBox" id="hbox20">
-			  <property name="visible">True</property>
-			  <property name="homogeneous">False</property>
-			  <property name="spacing">6</property>
-
-			  <child>
-			    <widget class="GtkScrolledWindow" id="scrolledwindow1">
-			      <property name="visible">True</property>
-			      <property name="can_focus">True</property>
-			      <property name="hscrollbar_policy">GTK_POLICY_AUTOMATIC</property>
-			      <property name="vscrollbar_policy">GTK_POLICY_AUTOMATIC</property>
-			      <property name="shadow_type">GTK_SHADOW_IN</property>
-			      <property name="window_placement">GTK_CORNER_TOP_LEFT</property>
-
-			      <child>
-				<widget class="GtkTreeView" id="url_list">
-				  <property name="visible">True</property>
-				  <property name="can_focus">True</property>
-				  <property name="headers_visible">True</property>
-				  <property name="rules_hint">False</property>
-				  <property name="reorderable">False</property>
-				  <property name="enable_search">True</property>
-				</widget>
-			      </child>
-			    </widget>
-			    <packing>
-			      <property name="padding">0</property>
-			      <property name="expand">True</property>
-			      <property name="fill">True</property>
-			    </packing>
-			  </child>
-
-			  <child>
-			    <widget class="GtkVBox" id="vbox15">
-			      <property name="visible">True</property>
-			      <property name="homogeneous">False</property>
-			      <property name="spacing">6</property>
-
-			      <child>
-				<widget class="GtkVButtonBox" id="vbuttonbox3">
-				  <property name="visible">True</property>
-				  <property name="layout_style">GTK_BUTTONBOX_START</property>
-				  <property name="spacing">6</property>
-
-				  <child>
-				    <widget class="GtkButton" id="url_add">
-				      <property name="visible">True</property>
-				      <property name="can_default">True</property>
-				      <property name="can_focus">True</property>
-				      <property name="relief">GTK_RELIEF_NORMAL</property>
-				      <property name="focus_on_click">True</property>
-
-				      <child>
-					<widget class="GtkAlignment" id="alignment5">
-					  <property name="visible">True</property>
-					  <property name="can_default">True</property>
-					  <property name="can_focus">True</property>
-					  <property name="xalign">0.5</property>
-					  <property name="yalign">0.5</property>
-					  <property name="xscale">0</property>
-					  <property name="yscale">0</property>
-					  <property name="top_padding">0</property>
-					  <property name="bottom_padding">0</property>
-					  <property name="left_padding">0</property>
-					  <property name="right_padding">0</property>
-
-					  <child>
-					    <widget class="GtkHBox" id="hbox22">
-					      <property name="visible">True</property>
-					      <property name="homogeneous">False</property>
-					      <property name="spacing">2</property>
-
-					      <child>
-						<widget class="GtkImage" id="image1">
-						  <property name="visible">True</property>
-						  <property name="stock">gtk-add</property>
-						  <property name="icon_size">4</property>
-						  <property name="xalign">0.5</property>
-						  <property name="yalign">0.5</property>
-						  <property name="xpad">0</property>
-						  <property name="ypad">0</property>
-						</widget>
-						<packing>
-						  <property name="padding">0</property>
-						  <property name="expand">False</property>
-						  <property name="fill">False</property>
-						</packing>
-					      </child>
-
-					      <child>
-						<widget class="GtkLabel" id="labeladd">
-						  <property name="visible">True</property>
-						  <property name="can_default">True</property>
-						  <property name="can_focus">True</property>
-						  <property name="label" translatable="yes">_Add URL</property>
-						  <property name="use_underline">True</property>
-						  <property name="use_markup">False</property>
-						  <property name="justify">GTK_JUSTIFY_LEFT</property>
-						  <property name="wrap">False</property>
-						  <property name="selectable">False</property>
-						  <property name="xalign">0.5</property>
-						  <property name="yalign">0.5</property>
-						  <property name="xpad">0</property>
-						  <property name="ypad">0</property>
-						</widget>
-						<packing>
-						  <property name="padding">0</property>
-						  <property name="expand">False</property>
-						  <property name="fill">False</property>
-						</packing>
-					      </child>
-					    </widget>
-					  </child>
-					</widget>
-				      </child>
-				    </widget>
-				  </child>
-
-				  <child>
-				    <widget class="GtkButton" id="url_edit">
-				      <property name="visible">True</property>
-				      <property name="sensitive">False</property>
-				      <property name="can_default">True</property>
-				      <property name="can_focus">True</property>
-				      <property name="relief">GTK_RELIEF_NORMAL</property>
-				      <property name="focus_on_click">True</property>
-
-				      <child>
-					<widget class="GtkAlignment" id="alignment6">
-					  <property name="visible">True</property>
-					  <property name="xalign">0.5</property>
-					  <property name="yalign">0.5</property>
-					  <property name="xscale">0</property>
-					  <property name="yscale">0</property>
-					  <property name="top_padding">0</property>
-					  <property name="bottom_padding">0</property>
-					  <property name="left_padding">0</property>
-					  <property name="right_padding">0</property>
-
-					  <child>
-					    <widget class="GtkHBox" id="hbox23">
-					      <property name="visible">True</property>
-					      <property name="homogeneous">False</property>
-					      <property name="spacing">2</property>
-
-					      <child>
-						<widget class="GtkImage" id="image2">
-						  <property name="visible">True</property>
-						  <property name="stock">gtk-properties</property>
-						  <property name="icon_size">4</property>
-						  <property name="xalign">0.5</property>
-						  <property name="yalign">0.5</property>
-						  <property name="xpad">0</property>
-						  <property name="ypad">0</property>
-						</widget>
-						<packing>
-						  <property name="padding">0</property>
-						  <property name="expand">False</property>
-						  <property name="fill">False</property>
-						</packing>
-					      </child>
-
-					      <child>
-						<widget class="GtkLabel" id="label47">
-						  <property name="visible">True</property>
-						  <property name="label" translatable="yes">_Edit</property>
-						  <property name="use_underline">True</property>
-						  <property name="use_markup">False</property>
-						  <property name="justify">GTK_JUSTIFY_LEFT</property>
-						  <property name="wrap">False</property>
-						  <property name="selectable">False</property>
-						  <property name="xalign">0.5</property>
-						  <property name="yalign">0.5</property>
-						  <property name="xpad">0</property>
-						  <property name="ypad">0</property>
-						</widget>
-						<packing>
-						  <property name="padding">0</property>
-						  <property name="expand">False</property>
-						  <property name="fill">False</property>
-						</packing>
-					      </child>
-					    </widget>
-					  </child>
-					</widget>
-				      </child>
-				    </widget>
-				  </child>
-
-				  <child>
-				    <widget class="GtkButton" id="url_remove">
-				      <property name="visible">True</property>
-				      <property name="sensitive">False</property>
-				      <property name="can_default">True</property>
-				      <property name="can_focus">True</property>
-				      <property name="label">gtk-remove</property>
-				      <property name="use_stock">True</property>
-				      <property name="relief">GTK_RELIEF_NORMAL</property>
-				      <property name="focus_on_click">True</property>
-				    </widget>
-				  </child>
-
-				  <child>
-				    <widget class="GtkButton" id="url_enable">
-				      <property name="visible">True</property>
-				      <property name="can_default">True</property>
-				      <property name="can_focus">True</property>
-				      <property name="label" translatable="yes">E_nable</property>
-				      <property name="use_underline">True</property>
-				      <property name="relief">GTK_RELIEF_NORMAL</property>
-				      <property name="focus_on_click">True</property>
-				    </widget>
-				  </child>
-				</widget>
-				<packing>
-				  <property name="padding">0</property>
-				  <property name="expand">False</property>
-				  <property name="fill">False</property>
-				</packing>
-			      </child>
-
-			      <child>
-				<widget class="GtkVButtonBox" id="vbuttonbox4">
-				  <property name="visible">True</property>
-				  <property name="layout_style">GTK_BUTTONBOX_START</property>
-				  <property name="spacing">3</property>
-				</widget>
-				<packing>
-				  <property name="padding">0</property>
-				  <property name="expand">False</property>
-				  <property name="fill">False</property>
-				</packing>
-			      </child>
-
-			      <child>
-				<widget class="GtkLabel" id="label46">
-				  <property name="visible">True</property>
-				  <property name="label" translatable="yes"></property>
-				  <property name="use_underline">False</property>
-				  <property name="use_markup">False</property>
-				  <property name="justify">GTK_JUSTIFY_LEFT</property>
-				  <property name="wrap">False</property>
-				  <property name="selectable">False</property>
-				  <property name="xalign">0.5</property>
-				  <property name="yalign">0.5</property>
-				  <property name="xpad">0</property>
-				  <property name="ypad">0</property>
-				</widget>
-				<packing>
-				  <property name="padding">0</property>
-				  <property name="expand">False</property>
-				  <property name="fill">False</property>
-				</packing>
-			      </child>
-			    </widget>
-			    <packing>
-			      <property name="padding">0</property>
-			      <property name="expand">False</property>
-			      <property name="fill">False</property>
-			    </packing>
-			  </child>
-			</widget>
-		      </child>
-		    </widget>
-		  </child>
-
-		  <child>
-		    <widget class="GtkLabel" id="label60">
-		      <property name="visible">True</property>
-		      <property name="label" translatable="yes">&lt;b&gt;Publishing&lt;/b&gt;</property>
-		      <property name="use_underline">False</property>
-		      <property name="use_markup">True</property>
-		      <property name="justify">GTK_JUSTIFY_LEFT</property>
-		      <property name="wrap">False</property>
-		      <property name="selectable">False</property>
-		      <property name="xalign">0.5</property>
-		      <property name="yalign">0.5</property>
-		      <property name="xpad">0</property>
-		      <property name="ypad">0</property>
-		    </widget>
-		    <packing>
-		      <property name="type">label_item</property>
-		    </packing>
-		  </child>
-		</widget>
-		<packing>
-		  <property name="padding">0</property>
-		  <property name="expand">True</property>
-		  <property name="fill">True</property>
-		</packing>
-	      </child>
-
-	      <child>
-		<widget class="GtkFrame" id="frame1">
-		  <property name="visible">True</property>
-		  <property name="label_xalign">0</property>
-		  <property name="label_yalign">0.5</property>
-		  <property name="shadow_type">GTK_SHADOW_NONE</property>
-
-		  <child>
-		    <widget class="GtkAlignment" id="alignment7">
-		      <property name="visible">True</property>
-		      <property name="xalign">0.5</property>
-		      <property name="yalign">0.5</property>
-		      <property name="xscale">1</property>
-		      <property name="yscale">1</property>
-		      <property name="top_padding">12</property>
-		      <property name="bottom_padding">0</property>
-		      <property name="left_padding">12</property>
-		      <property name="right_padding">0</property>
-
-		      <child>
-			<widget class="GtkVBox" id="vbox18">
-			  <property name="visible">True</property>
-			  <property name="homogeneous">False</property>
-			  <property name="spacing">6</property>
-
-			  <child>
-			    <widget class="GtkHBox" id="hbox30">
-			      <property name="visible">True</property>
-			      <property name="homogeneous">False</property>
-			      <property name="spacing">12</property>
-
-			      <child>
-				<widget class="GtkLabel" id="label61">
-				  <property name="visible">True</property>
-				  <property name="label" translatable="yes">Template:</property>
-				  <property name="use_underline">False</property>
-				  <property name="use_markup">False</property>
-				  <property name="justify">GTK_JUSTIFY_LEFT</property>
-				  <property name="wrap">False</property>
-				  <property name="selectable">False</property>
-				  <property name="xalign">0.5</property>
-				  <property name="yalign">0.5</property>
-				  <property name="xpad">0</property>
-				  <property name="ypad">0</property>
-				</widget>
-				<packing>
-				  <property name="padding">0</property>
-				  <property name="expand">False</property>
-				  <property name="fill">False</property>
-				</packing>
-			      </child>
-
-			      <child>
-				<widget class="GtkEntry" id="template_url">
-				  <property name="visible">True</property>
-				  <property name="can_focus">True</property>
-				  <property name="editable">True</property>
-				  <property name="visibility">True</property>
-				  <property name="max_length">0</property>
-				  <property name="text" translatable="yes"></property>
-				  <property name="has_frame">True</property>
-				  <property name="invisible_char" translatable="yes">*</property>
-				  <property name="activates_default">False</property>
-				</widget>
-				<packing>
-				  <property name="padding">0</property>
-				  <property name="expand">True</property>
-				  <property name="fill">True</property>
-				</packing>
-			      </child>
-			    </widget>
-			    <packing>
-			      <property name="padding">0</property>
-			      <property name="expand">False</property>
-			      <property name="fill">False</property>
-			    </packing>
-			  </child>
-
-			  <child>
-			    <widget class="GtkLabel" id="label62">
-			      <property name="visible">True</property>
-			      <property name="label" translatable="yes">&lt;i&gt;%u and %d will be replaced by user and domain from the email address.&lt;/i&gt;</property>
-			      <property name="use_underline">False</property>
-			      <property name="use_markup">True</property>
-			      <property name="justify">GTK_JUSTIFY_LEFT</property>
-			      <property name="wrap">True</property>
-			      <property name="selectable">False</property>
-			      <property name="xalign">0.49</property>
-			      <property name="yalign">0.5</property>
-			      <property name="xpad">0</property>
-			      <property name="ypad">0</property>
-			    </widget>
-			    <packing>
-			      <property name="padding">0</property>
-			      <property name="expand">False</property>
-			      <property name="fill">False</property>
-			    </packing>
-			  </child>
-			</widget>
-		      </child>
-		    </widget>
-		  </child>
-
-		  <child>
-		    <widget class="GtkLabel" id="label59">
-		      <property name="visible">True</property>
-		      <property name="label" translatable="yes">&lt;b&gt;Default Free/Busy Server&lt;/b&gt;</property>
-		      <property name="use_underline">False</property>
-		      <property name="use_markup">True</property>
-		      <property name="justify">GTK_JUSTIFY_LEFT</property>
-		      <property name="wrap">False</property>
-		      <property name="selectable">False</property>
-		      <property name="xalign">0.5</property>
-		      <property name="yalign">0.5</property>
-		      <property name="xpad">0</property>
-		      <property name="ypad">0</property>
-		    </widget>
-		    <packing>
-		      <property name="type">label_item</property>
-		    </packing>
-		  </child>
-		</widget>
-		<packing>
-		  <property name="padding">0</property>
-		  <property name="expand">False</property>
-		  <property name="fill">True</property>
-		</packing>
-	      </child>
-	    </widget>
-	    <packing>
-	      <property name="tab_expand">False</property>
-	      <property name="tab_fill">True</property>
-	    </packing>
-	  </child>
-
-	  <child>
-	    <widget class="GtkLabel" id="label42">
-	      <property name="visible">True</property>
-	      <property name="label" translatable="yes">Free/Busy</property>
-	      <property name="use_underline">True</property>
-	      <property name="use_markup">False</property>
-	      <property name="justify">GTK_JUSTIFY_CENTER</property>
-	      <property name="wrap">False</property>
-	      <property name="selectable">False</property>
-	      <property name="xalign">0.5</property>
-	      <property name="yalign">0.5</property>
-	      <property name="xpad">0</property>
-	      <property name="ypad">0</property>
-	    </widget>
-	    <packing>
-	      <property name="type">tab</property>
-	    </packing>
-	  </child>
-	</widget>
-	<packing>
-	  <property name="padding">0</property>
-	  <property name="expand">True</property>
-	  <property name="fill">True</property>
-	</packing>
-      </child>
-    </widget>
-  </child>
-</widget>
-
-</glade-interface>
diff --git a/calendar/gui/dialogs/cal-prefs-dialog.h b/calendar/gui/dialogs/cal-prefs-dialog.h
deleted file mode 100644
index 5c92570d37..0000000000
--- a/calendar/gui/dialogs/cal-prefs-dialog.h
+++ /dev/null
@@ -1,102 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-
-/* 
- * Author : 
- *  Damon Chaplin <damon@ximian.com>
- *
- * Copyright 2000, Ximian, Inc.
- * Copyright 2000, Ximian, Inc.
- *
- * This program is free software; you can redistribute it and/or 
- * modify it under the terms of version 2 of the GNU General Public 
- * License as published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public 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/gtk.h>
-#include <glade/glade.h>
-#include <gconf/gconf.h>
-#include <gconf/gconf-client.h>
-#include "../e-pub-utils.h"
-#include "evolution-config-control.h"
-
-G_BEGIN_DECLS
-
-enum {
-	URL_LIST_ENABLED_COLUMN,
-	URL_LIST_LOCATION_COLUMN,
-	URL_LIST_FREE_BUSY_URL_COLUMN,
-	URL_LIST_N_COLUMNS
-};
-
-struct _DialogData {
-	/* Glade XML data */
-	GladeXML *xml;
-	
-	GConfClient *gconf;
-
-	GtkWidget *page;
-
-	GtkWidget *timezone;
-	GtkWidget *working_days[7];
-	GtkWidget *week_start_day;
-	GtkWidget *start_of_day;
-	GtkWidget *end_of_day;
-	GtkWidget *use_12_hour;
-	GtkWidget *use_24_hour;
-	GtkWidget *time_divisions;
-	GtkWidget *show_end_times;
-	GtkWidget *compress_weekend;
-	GtkWidget *dnav_show_week_no;
-
-	/* Widgets for the task list options */
-	GtkWidget *tasks_due_today_color;
-	GtkWidget *tasks_overdue_color;
-
-	GtkWidget *tasks_hide_completed_checkbutton;
-	GtkWidget *tasks_hide_completed_spinbutton;
-	GtkWidget *tasks_hide_completed_optionmenu;
-	
-	/* Widgets for the Free/Busy options */
-	GtkWidget *url_add;
-	GtkWidget *url_edit;
-	GtkWidget *url_remove;
-	GtkWidget *url_enable;
-	GtkTreeView *url_list;
-	gboolean url_editor;
-	GtkWidget* url_editor_dlg;
-	guint destroyed : 1;
-
-	/* widgets for the Free/Busy template */
-	GtkWidget *template_url;
-		
-	/* Other page options */
-	GtkWidget *confirm_delete;
-	GtkWidget *default_reminder;
-	GtkWidget *default_reminder_interval;
-	GtkWidget *default_reminder_units;
-};
-typedef struct _DialogData DialogData;
-
-EvolutionConfigControl *cal_prefs_dialog_new (void);
-
-G_END_DECLS
-
-#endif /* _CAL_PREFS_DIALOG_H_ */
diff --git a/calendar/gui/dialogs/calendar-setup.c b/calendar/gui/dialogs/calendar-setup.c
deleted file mode 100644
index 5c921a8c3f..0000000000
--- a/calendar/gui/dialogs/calendar-setup.c
+++ /dev/null
@@ -1,519 +0,0 @@
-/*
- * Authors: David Trowbridge <trowbrds@cs.colorado.edu>
- *
- * Copyright (C) 2004 Novell, Inc (www.novell.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/gtkbox.h>
-#include <gtk/gtkdialog.h>
-#include <gtk/gtkstock.h>
-#include <gtk/gtkvbox.h>
-
-#include <libedataserver/e-source.h>
-#include <libedataserver/e-source-list.h>
-#include <libgnome/gnome-i18n.h>
-#include <libgnomeui/libgnomeui.h>
-
-#include "calendar-setup.h"
-#include "../e-cal-config.h"
-
-typedef struct _CalendarSourceDialog CalendarSourceDialog;
-
-struct _CalendarSourceDialog {
-	ECalConfig *config;	/* the config manager */
-
-	GtkWidget *window;
-
-	/* Source selection (creation only) */
-	ESourceList *source_list;
-	GSList *menu_source_groups;
-	GtkWidget *group_optionmenu;
-
-	/* ESource we're currently editing */
-	ESource *source;
-	/* The original source in edit mode.  Also used to flag when we are in edit mode. */
-	ESource *original_source;
-
-	/* Source group we're creating/editing a source in */
-	ESourceGroup *source_group;
-};
-
-static gboolean
-eccp_check_complete (EConfig *ec, const char *pageid, void *data)
-{
-	CalendarSourceDialog *sdialog = data;
-	gboolean valid = TRUE;
-	const char *tmp;
-	ESource *source;
-
-	tmp = e_source_peek_name (sdialog->source);
-	valid = tmp && tmp[0] && ((source = e_source_group_peek_source_by_name (sdialog->source_group, tmp)) == NULL || source == sdialog->original_source);
-
-	return valid;
-}
-
-static void
-colorpicker_set_color (GnomeColorPicker *color, guint32 rgb)
-{
-	gnome_color_picker_set_i8 (color, (rgb & 0xff0000) >> 16, (rgb & 0xff00) >> 8, rgb & 0xff, 0xff);
-}
-
-static guint32
-colorpicker_get_color (GnomeColorPicker *color)
-{
-	guint8 r, g, b, a;
-	guint32 rgb = 0;
-
-	gnome_color_picker_get_i8 (color, &r, &g, &b, &a);
-
-	rgb = r;
-	rgb <<= 8;
-	rgb |= g;
-	rgb <<= 8;
-	rgb |= b;
-
-	return rgb;
-}
-
-static void
-eccp_commit (EConfig *ec, GSList *items, void *data)
-{
-	CalendarSourceDialog *sdialog = data;
-	xmlNodePtr xml;
-
-	if (sdialog->original_source) {
-		guint32 color;
-
-		xml = xmlNewNode (NULL, "dummy");
-		e_source_dump_to_xml_node (sdialog->source, xml);
-		e_source_update_from_xml_node (sdialog->original_source, xml->children, NULL);
-		xmlFreeNode (xml);
-
-		e_source_get_color (sdialog->source, &color);
-		e_source_set_color (sdialog->original_source, color);
-	} else {
-		e_source_group_add_source (sdialog->source_group, sdialog->source, -1);
-		e_source_list_sync (sdialog->source_list, NULL);
-	}
-}
-
-static void
-eccp_free (EConfig *ec, GSList *items, void *data)
-{
-	CalendarSourceDialog *sdialog = data;
-
-	g_slist_free (items);
-
-	g_object_unref (sdialog->source);
-	if (sdialog->original_source)
-		g_object_unref (sdialog->original_source);
-	if (sdialog->source_list)
-		g_object_unref (sdialog->source_list);
-	g_slist_free (sdialog->menu_source_groups);
-	g_free (sdialog);
-}
-
-static void
-eccp_type_changed (GtkComboBox *dropdown, CalendarSourceDialog *sdialog)
-{
-	int id = gtk_combo_box_get_active (dropdown);
-	GtkTreeModel *model;
-	GtkTreeIter iter;
-
-	model = gtk_combo_box_get_model (dropdown);
-	if (id == -1 || !gtk_tree_model_iter_nth_child (model, &iter, NULL, id))
-		return;
-
-	/* TODO: when we change the group type, we lose all of the pre-filled dialog info */
-
-	gtk_tree_model_get (model, &iter, 1, &sdialog->source_group, -1);
-	/* HACK: doesn't work if you don't do this */
-	e_source_set_absolute_uri (sdialog->source, NULL);
-	e_source_set_group (sdialog->source, sdialog->source_group);
-
-	e_source_set_relative_uri (sdialog->source, "");
-
-	e_config_target_changed ((EConfig *) sdialog->config, E_CONFIG_TARGET_CHANGED_REBUILD);
-}
-
-static GtkWidget *
-eccp_get_source_type (EConfig *ec, EConfigItem *item, GtkWidget *parent, GtkWidget *old, void *data)
-{
-	static GtkWidget *label, *type;
-	int row;
-	CalendarSourceDialog *sdialog = data;
-	ECalConfigTargetSource *t = (ECalConfigTargetSource *) ec->target;
-	ESource *source = t->source;
-	ESourceGroup *group = e_source_peek_group (source);
-	char *markup;
-
-	if (old)
-		gtk_widget_destroy (label);
-
-	row = ((GtkTable *)parent)->nrows;
-
-	if (sdialog->original_source) {
-		label = gtk_label_new (_("Type:"));
-
-		type = gtk_label_new ("");
-		gtk_widget_show (type);
-		markup = g_strdup_printf ("<span weight=\"bold\">%s</span>", e_source_group_peek_name (group));
-		gtk_label_set_markup (GTK_LABEL (type), markup);
-		gtk_misc_set_alignment (GTK_MISC (type), 0.0, 0.5);
-		g_free (markup);
-		gtk_table_attach (GTK_TABLE (parent), type, 1, 2, row, row+1, GTK_EXPAND | GTK_FILL, 0, 0, 0);
-	} else {
-		GtkCellRenderer *cell;
-		GtkListStore *store;
-		GtkTreeIter iter;
-		GSList *l;
-		int active = 0, i = 0;
-
-		label = gtk_label_new_with_mnemonic(_("_Type:"));
-
-		type = gtk_combo_box_new ();
-		cell = gtk_cell_renderer_text_new ();
-		store = gtk_list_store_new (2, G_TYPE_STRING, G_TYPE_POINTER);
-		for (l = sdialog->menu_source_groups; l; l = g_slist_next (l)) {
-			ESourceGroup *group = l->data;
-
-			gtk_list_store_append (store, &iter);
-			gtk_list_store_set (store, &iter, 0, e_source_group_peek_name (group), 1, group, -1);
-			if (!strcmp (e_source_group_peek_uid (sdialog->source_group), e_source_group_peek_uid (group)))
-				active = i;
-			i++;
-		}
-
-		gtk_cell_layout_pack_start ((GtkCellLayout *) type, cell, TRUE);
-		gtk_cell_layout_set_attributes ((GtkCellLayout *) type, cell, "text", 0, NULL);
-		gtk_combo_box_set_model ((GtkComboBox *) type, (GtkTreeModel *) store);
-		gtk_combo_box_set_active ((GtkComboBox *) type, active);
-		g_signal_connect (type, "changed", G_CALLBACK (eccp_type_changed), sdialog);
-		gtk_widget_show (type);
-		gtk_table_attach (GTK_TABLE (parent), type, 1, 2, row, row+1, GTK_EXPAND | GTK_FILL, 0, 0, 0);
-		gtk_label_set_mnemonic_widget (GTK_LABEL (label), type);
-	}
-
-	gtk_widget_show (label);
-	gtk_misc_set_alignment (GTK_MISC (label), 0.0, 0.5);
-	gtk_table_attach (GTK_TABLE (parent), label, 0, 1, row, row+1, GTK_FILL, 0, 0, 0);
-
-	return type;
-}
-
-static void
-name_changed (GtkEntry *entry, ECalConfigTargetSource *t)
-{
-	ESource *source = t->source;
-	e_source_set_name (source, gtk_entry_get_text (GTK_ENTRY (entry)));
-}
-
-static GtkWidget *
-eccp_get_source_name (EConfig *ec, EConfigItem *item, struct _GtkWidget *parent, struct _GtkWidget *old, void *data)
-{
-	static GtkWidget *label, *entry;
-	int row;
-	ECalConfigTargetSource *t = (ECalConfigTargetSource *) ec->target;
-	ESource *source = t->source;
-
-	if (old)
-		gtk_widget_destroy (label);
-
-	row = ((GtkTable*)parent)->nrows;
-
-	label = gtk_label_new_with_mnemonic (_("_Name:"));
-	gtk_misc_set_alignment (GTK_MISC (label), 0.0, 0.5);
-	gtk_widget_show (label);
-	gtk_table_attach (GTK_TABLE (parent), label, 0, 1, row, row+1, GTK_FILL, 0, 0, 0);
-
-	entry = gtk_entry_new ();
-	gtk_widget_show (entry);
-	gtk_table_attach (GTK_TABLE (parent), entry, 1, 2, row, row+1, GTK_EXPAND | GTK_FILL, 0, 0, 0);
-	gtk_label_set_mnemonic_widget (GTK_LABEL (label), entry);
-	g_signal_connect (G_OBJECT (entry), "changed", G_CALLBACK (name_changed), (gpointer) t);
-
-	if (source)
-		gtk_entry_set_text (GTK_ENTRY (entry), e_source_peek_name (source));
-
-	return entry;
-}
-
-static void 
-offline_status_changed_cb (GtkWidget *widget, CalendarSourceDialog *sdialog)
-{
-	
-	if (gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (widget)))
-		e_source_set_property (sdialog->source, "offline_sync", "1");
-	else 
-		e_source_set_property (sdialog->source, "offline_sync", "0");	
-	    
-}
-
-static GtkWidget *
-eccp_general_offline (EConfig *ec, EConfigItem *item, struct _GtkWidget *parent, struct _GtkWidget *old, void *data)
-{
-	CalendarSourceDialog *sdialog = data;
-	GtkWidget *offline_setting;
-	const char *offline_sync;
-	int row;
-	gboolean is_local = g_str_has_prefix (e_source_group_peek_base_uri (sdialog->source_group), "file:");
-	offline_sync =  e_source_get_property (sdialog->source, "offline_sync");
-	if (old)
-		return old;
-	else {
-		row = ((GtkTable*)parent)->nrows;
-		offline_setting = gtk_check_button_new_with_label (N_("Copy calendar contents locally for offline operation"));
-		gtk_widget_show (offline_setting);
-		g_signal_connect (offline_setting, "toggled", G_CALLBACK (offline_status_changed_cb), sdialog);
-		gtk_table_attach (GTK_TABLE (parent), offline_setting, 1, 2, row, row+1, GTK_EXPAND | GTK_FILL, 0, 0, 0);
-
-	}
-	
-	gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (offline_setting), (offline_sync && g_str_equal (offline_sync, "1"))  ? TRUE : FALSE);
-	if (is_local)
-	  gtk_widget_hide (offline_setting);
-	return offline_setting;
-}
-
-static void
-color_changed (GnomeColorPicker *picker, guint r, guint g, guint b, guint a, ECalConfigTargetSource *t)
-{
-	ESource *source = t->source;
-	e_source_set_color (source, colorpicker_get_color (picker));
-}
-
-static GtkWidget *
-eccp_get_source_color (EConfig *ec, EConfigItem *item, struct _GtkWidget *parent, struct _GtkWidget *old, void *data)
-{
-	CalendarSourceDialog *sdialog = data;
-	static GtkWidget *label, *picker;
-	int row;
-	ECalConfigTargetSource *t = (ECalConfigTargetSource *) ec->target;
-	ESource *source = t->source;
-
-	static guint32 assigned_colors[] = {
-		0xBECEDD, /* 190 206 221     Blue */
-		0xE2F0EF, /* 226 240 239     Light Blue */
-		0xC6E2B7, /* 198 226 183     Green */
-		0xE2F0D3, /* 226 240 211     Light Green */
-		0xE2D4B7, /* 226 212 183     Khaki */
-		0xEAEAC1, /* 234 234 193     Light Khaki */
-		0xF0B8B7, /* 240 184 183     Pink */
-		0xFED4D3, /* 254 212 211     Light Pink */
-		0xE2C6E1, /* 226 198 225     Purple */
-		0xF0E2EF  /* 240 226 239     Light Purple */
-	};
-	GRand *rand = g_rand_new ();
-	guint32 color;
-
-	if (old)
-		gtk_widget_destroy (label);
-
-	row = ((GtkTable*)parent)->nrows;
-
-	color = assigned_colors[g_rand_int_range (rand, 0, 9)];
-	g_rand_free (rand);
-
-	label = gtk_label_new_with_mnemonic (_("C_olor:"));
-	gtk_misc_set_alignment (GTK_MISC (label), 0.0, 0.5);
-	gtk_widget_show (label);
-	gtk_table_attach (GTK_TABLE (parent), label, 0, 1, row, row+1, GTK_FILL, 0, 0, 0);
-
-	picker = gnome_color_picker_new ();
-	gtk_widget_show (picker);
-	gtk_label_set_mnemonic_widget (GTK_LABEL (label), picker);
-	gtk_table_attach (GTK_TABLE (parent), picker, 1, 2, row, row+1, GTK_EXPAND | GTK_FILL, 0, 0, 0);
-	g_signal_connect (G_OBJECT (picker), "color-set", G_CALLBACK (color_changed), t);
-
-	if (sdialog->original_source)
-		e_source_get_color (sdialog->original_source, &color);
-	else
-		/* since we don't have an original source here, we want to set
-		 * the initial color */
-		e_source_set_color (sdialog->source, color);
-
-	colorpicker_set_color (GNOME_COLOR_PICKER (picker), color);
-
-	return picker;
-}
-
-static ECalConfigItem eccp_items[] = {
-	{ E_CONFIG_BOOK, "", NULL },
-	{ E_CONFIG_PAGE,          "00.general", N_("General") },
-	{ E_CONFIG_SECTION_TABLE, "00.general/00.source", N_("Calendar") },
-	{ E_CONFIG_ITEM_TABLE,    "00.general/00.source/00.type", NULL, eccp_get_source_type },
-	{ E_CONFIG_ITEM_TABLE,    "00.general/00.source/10.name", NULL, eccp_get_source_name },
-	{ E_CONFIG_ITEM_TABLE,    "00.general/00.source/20.color", NULL, eccp_get_source_color },
-	{ E_CONFIG_ITEM_TABLE,	  "00.general/00.source/30.offline", NULL, eccp_general_offline },
-	{ 0 },
-};
-
-static ECalConfigItem ectp_items[] = {
-	{ E_CONFIG_BOOK, "", NULL },
-	{ E_CONFIG_PAGE,          "00.general", N_("General") },
-	{ E_CONFIG_SECTION_TABLE, "00.general/00.source", N_("Tasks List") },
-	{ E_CONFIG_ITEM_TABLE,    "00.general/00.source/00.type", NULL, eccp_get_source_type },
-	{ E_CONFIG_ITEM_TABLE,    "00.general/00.source/10.name", NULL, eccp_get_source_name },
-	{ E_CONFIG_ITEM_TABLE,    "00.general/00.source/20.color", NULL, eccp_get_source_color },
-	{ E_CONFIG_ITEM_TABLE,	  "00.general/00.source/30.offline", NULL, eccp_general_offline },
-	{ 0 },
-};
-
-/**
- * calendar_setup_edit_calendar:
- * @parent: parent window for dialog (current unused)
- * @source: the ESource corresponding to the calendar
- *
- * Show calendar properties for @source.
- **/
-void
-calendar_setup_edit_calendar (struct _GtkWindow *parent, ESource *source, ESourceGroup *group)
-{
-	CalendarSourceDialog *sdialog = g_new0 (CalendarSourceDialog, 1);
-	char *xml;
-	ECalConfig *ec;
-	int i;
-	GSList *items = NULL;
-	ECalConfigTargetSource *target;
-
-	if (source) {
-		guint32 color;
-
-		sdialog->original_source = source;
-		g_object_ref (source);
-		sdialog->source_group = e_source_peek_group (source);
-		xml = e_source_to_standalone_xml (source);
-		sdialog->source = e_source_new_from_standalone_xml (xml);
-		g_free (xml);
-
-		e_source_get_color (source, &color);
-		e_source_set_color (sdialog->source, color);
-	} else {
-		GConfClient *gconf;
-		GSList *l;
-
-		sdialog->source = e_source_new ("", "");
-		gconf = gconf_client_get_default ();
-		sdialog->source_list = e_source_list_new_for_gconf (gconf, "/apps/evolution/calendar/sources");
-		l = e_source_list_peek_groups (sdialog->source_list);
-		sdialog->menu_source_groups = g_slist_copy(l);
-
-		sdialog->source_group = (ESourceGroup *)sdialog->menu_source_groups->data;
-		g_object_unref (gconf);
-		if (group)
-			sdialog->source_group = (ESourceGroup *)group;
-	}
-
-	/* HACK: doesn't work if you don't do this */
-	e_source_set_absolute_uri (sdialog->source, NULL);
-	e_source_set_group (sdialog->source, sdialog->source_group);
-
-	sdialog->config = ec = e_cal_config_new (E_CONFIG_BOOK, "org.gnome.evolution.calendar.calendarProperties");
-	for (i = 0; eccp_items[i].path; i++)
-		items = g_slist_prepend (items, &eccp_items[i]);
-	e_config_add_items ((EConfig *) ec, items, eccp_commit, NULL, eccp_free, sdialog);
-	e_config_add_page_check ((EConfig *) ec, NULL, eccp_check_complete, sdialog);
-
-	target = e_cal_config_target_new_source (ec, sdialog->source);
-	e_config_set_target ((EConfig *) ec, (EConfigTarget *) target);
-
-	if (source)
-		sdialog->window = e_config_create_window ((EConfig *)ec, NULL, _("Calendar Properties"));
-	else
-		sdialog->window = e_config_create_window ((EConfig *)ec, NULL, _("New Calendar"));
-		
-	/* forces initial validation */
-	if (!sdialog->original_source)
-		e_config_target_changed ((EConfig *)ec, E_CONFIG_TARGET_CHANGED_STATE);
-
-	return;
-}
-
-void
-calendar_setup_new_calendar (struct _GtkWindow *parent)
-{
-	calendar_setup_edit_calendar (parent, NULL, NULL);
-}
-
-void
-calendar_setup_edit_task_list (struct _GtkWindow *parent, ESource *source)
-{
-	CalendarSourceDialog *sdialog = g_new0 (CalendarSourceDialog, 1);
-	char *xml;
-	ECalConfig *ec;
-	int i;
-	GSList *items = NULL;
-	ECalConfigTargetSource *target;
-
-	if (source) {
-		guint32 color;
-
-		sdialog->original_source = source;
-		g_object_ref (source);
-		sdialog->source_group = e_source_peek_group (source);
-		xml = e_source_to_standalone_xml (source);
-		sdialog->source = e_source_new_from_standalone_xml (xml);
-		g_free (xml);
-
-		e_source_get_color (source, &color);
-		e_source_set_color (sdialog->source, color);
-	} else {
-		GConfClient *gconf;
-		GSList *l;
-
-		sdialog->source = e_source_new ("", "");
-		gconf = gconf_client_get_default ();
-		sdialog->source_list = e_source_list_new_for_gconf (gconf, "/apps/evolution/tasks/sources");
-		l = e_source_list_peek_groups (sdialog->source_list);
-		sdialog->menu_source_groups = g_slist_copy(l);
-
-		sdialog->source_group = (ESourceGroup *)sdialog->menu_source_groups->data;
-		g_object_unref (gconf);
-	}
-
-	/* HACK: doesn't work if you don't do this */
-	e_source_set_absolute_uri (sdialog->source, NULL);
-	e_source_set_group (sdialog->source, sdialog->source_group);
-
-	sdialog->config = ec = e_cal_config_new (E_CONFIG_BOOK, "org.gnome.evolution.calendar.calendarProperties");
-	for (i = 0; ectp_items[i].path; i++)
-		items = g_slist_prepend (items, &ectp_items[i]);
-	e_config_add_items ((EConfig *) ec, items, eccp_commit, NULL, eccp_free, sdialog);
-	e_config_add_page_check ((EConfig *) ec, NULL, eccp_check_complete, sdialog);
-
-	target = e_cal_config_target_new_source (ec, sdialog->source);
-	e_config_set_target ((EConfig *) ec, (EConfigTarget *) target);
-
-	sdialog->window = e_config_create_window ((EConfig *)ec, NULL, _("Task List Properties"));
-
-	/* forces initial validation */
-	if (!sdialog->original_source)
-		e_config_target_changed ((EConfig *)ec, E_CONFIG_TARGET_CHANGED_STATE);
-
-	return;
-}
-
-void
-calendar_setup_new_task_list (struct _GtkWindow *parent)
-{
-	calendar_setup_edit_task_list (parent, NULL);
-}
diff --git a/calendar/gui/dialogs/calendar-setup.glade b/calendar/gui/dialogs/calendar-setup.glade
deleted file mode 100644
index be736d5366..0000000000
--- a/calendar/gui/dialogs/calendar-setup.glade
+++ /dev/null
@@ -1,922 +0,0 @@
-<?xml version="1.0" standalone="no"?> <!--*- mode: xml -*-->
-<!DOCTYPE glade-interface SYSTEM "http://glade.gnome.org/glade-2.0.dtd">
-
-<glade-interface>
-<requires lib="gnome"/>
-
-<widget class="GtkWindow" id="add-calendar-window">
-  <property name="title" translatable="yes">Add Calendar</property>
-  <property name="type">GTK_WINDOW_TOPLEVEL</property>
-  <property name="window_position">GTK_WIN_POS_NONE</property>
-  <property name="modal">False</property>
-  <property name="default_width">320</property>
-  <property name="default_height">240</property>
-  <property name="resizable">True</property>
-  <property name="destroy_with_parent">False</property>
-  <property name="decorated">True</property>
-  <property name="skip_taskbar_hint">False</property>
-  <property name="skip_pager_hint">False</property>
-  <property name="type_hint">GDK_WINDOW_TYPE_HINT_NORMAL</property>
-  <property name="gravity">GDK_GRAVITY_NORTH_WEST</property>
-
-  <child>
-    <widget class="GtkVBox" id="vbox1">
-      <property name="border_width">12</property>
-      <property name="visible">True</property>
-      <property name="homogeneous">False</property>
-      <property name="spacing">12</property>
-
-      <child>
-	<widget class="GtkTable" id="settings-table">
-	  <property name="visible">True</property>
-	  <property name="n_rows">5</property>
-	  <property name="n_columns">2</property>
-	  <property name="homogeneous">False</property>
-	  <property name="row_spacing">6</property>
-	  <property name="column_spacing">6</property>
-
-	  <child>
-	    <widget class="GtkEntry" id="name-entry">
-	      <property name="visible">True</property>
-	      <property name="can_focus">True</property>
-	      <property name="editable">True</property>
-	      <property name="visibility">True</property>
-	      <property name="max_length">0</property>
-	      <property name="text" translatable="yes"></property>
-	      <property name="has_frame">True</property>
-	      <property name="invisible_char" translatable="yes">*</property>
-	      <property name="activates_default">True</property>
-	    </widget>
-	    <packing>
-	      <property name="left_attach">1</property>
-	      <property name="right_attach">2</property>
-	      <property name="top_attach">1</property>
-	      <property name="bottom_attach">2</property>
-	      <property name="y_options"></property>
-	    </packing>
-	  </child>
-
-	  <child>
-	    <widget class="GtkLabel" id="uri-label">
-	      <property name="visible">True</property>
-	      <property name="label" translatable="yes">_URL:</property>
-	      <property name="use_underline">True</property>
-	      <property name="use_markup">False</property>
-	      <property name="justify">GTK_JUSTIFY_LEFT</property>
-	      <property name="wrap">False</property>
-	      <property name="selectable">False</property>
-	      <property name="xalign">0</property>
-	      <property name="yalign">0.5</property>
-	      <property name="xpad">0</property>
-	      <property name="ypad">0</property>
-	    </widget>
-	    <packing>
-	      <property name="left_attach">0</property>
-	      <property name="right_attach">1</property>
-	      <property name="top_attach">3</property>
-	      <property name="bottom_attach">4</property>
-	      <property name="x_options">fill</property>
-	      <property name="y_options"></property>
-	    </packing>
-	  </child>
-
-	  <child>
-	    <widget class="GtkLabel" id="refresh-label">
-	      <property name="visible">True</property>
-	      <property name="label" translatable="yes">_Refresh:</property>
-	      <property name="use_underline">True</property>
-	      <property name="use_markup">False</property>
-	      <property name="justify">GTK_JUSTIFY_LEFT</property>
-	      <property name="wrap">False</property>
-	      <property name="selectable">False</property>
-	      <property name="xalign">0</property>
-	      <property name="yalign">0.5</property>
-	      <property name="xpad">0</property>
-	      <property name="ypad">0</property>
-	    </widget>
-	    <packing>
-	      <property name="left_attach">0</property>
-	      <property name="right_attach">1</property>
-	      <property name="top_attach">4</property>
-	      <property name="bottom_attach">5</property>
-	      <property name="x_options">fill</property>
-	      <property name="y_options"></property>
-	    </packing>
-	  </child>
-
-	  <child>
-	    <widget class="GtkAlignment" id="refresh-hbox">
-	      <property name="visible">True</property>
-	      <property name="xalign">0</property>
-	      <property name="yalign">0.5</property>
-	      <property name="xscale">0</property>
-	      <property name="yscale">1</property>
-	      <property name="top_padding">0</property>
-	      <property name="bottom_padding">0</property>
-	      <property name="left_padding">0</property>
-	      <property name="right_padding">0</property>
-
-	      <child>
-		<widget class="GtkHBox" id="hbox2">
-		  <property name="visible">True</property>
-		  <property name="homogeneous">False</property>
-		  <property name="spacing">6</property>
-
-		  <child>
-		    <widget class="GtkSpinButton" id="refresh-spin">
-		      <property name="visible">True</property>
-		      <property name="can_focus">True</property>
-		      <property name="climb_rate">1</property>
-		      <property name="digits">0</property>
-		      <property name="numeric">False</property>
-		      <property name="update_policy">GTK_UPDATE_ALWAYS</property>
-		      <property name="snap_to_ticks">False</property>
-		      <property name="wrap">False</property>
-		      <property name="adjustment">30 0 100 1 10 10</property>
-		    </widget>
-		    <packing>
-		      <property name="padding">0</property>
-		      <property name="expand">True</property>
-		      <property name="fill">True</property>
-		    </packing>
-		  </child>
-
-		  <child>
-		    <widget class="GtkOptionMenu" id="refresh-optionmenu">
-		      <property name="visible">True</property>
-		      <property name="can_focus">True</property>
-		      <property name="history">0</property>
-
-		      <child>
-			<widget class="GtkMenu" id="menu3">
-
-			  <child>
-			    <widget class="GtkMenuItem" id="minutes1">
-			      <property name="visible">True</property>
-			      <property name="label" translatable="yes">minutes</property>
-			      <property name="use_underline">True</property>
-			      <signal name="activate" handler="on_minutes1_activate" last_modification_time="Tue, 17 Feb 2004 17:39:35 GMT"/>
-			    </widget>
-			  </child>
-
-			  <child>
-			    <widget class="GtkMenuItem" id="hours1">
-			      <property name="visible">True</property>
-			      <property name="label" translatable="yes">hours</property>
-			      <property name="use_underline">True</property>
-			      <signal name="activate" handler="on_hours1_activate" last_modification_time="Tue, 17 Feb 2004 17:39:35 GMT"/>
-			    </widget>
-			  </child>
-
-			  <child>
-			    <widget class="GtkMenuItem" id="days1">
-			      <property name="visible">True</property>
-			      <property name="label" translatable="yes">days</property>
-			      <property name="use_underline">True</property>
-			      <signal name="activate" handler="on_days1_activate" last_modification_time="Tue, 17 Feb 2004 17:39:35 GMT"/>
-			    </widget>
-			  </child>
-
-			  <child>
-			    <widget class="GtkMenuItem" id="weeks1">
-			      <property name="visible">True</property>
-			      <property name="label" translatable="yes">weeks</property>
-			      <property name="use_underline">True</property>
-			      <signal name="activate" handler="on_weeks1_activate" last_modification_time="Tue, 17 Feb 2004 17:39:35 GMT"/>
-			    </widget>
-			  </child>
-			</widget>
-		      </child>
-		    </widget>
-		    <packing>
-		      <property name="padding">0</property>
-		      <property name="expand">False</property>
-		      <property name="fill">False</property>
-		    </packing>
-		  </child>
-		</widget>
-	      </child>
-	    </widget>
-	    <packing>
-	      <property name="left_attach">1</property>
-	      <property name="right_attach">2</property>
-	      <property name="top_attach">4</property>
-	      <property name="bottom_attach">5</property>
-	      <property name="y_options">fill</property>
-	    </packing>
-	  </child>
-
-	  <child>
-	    <widget class="GtkLabel" id="label35">
-	      <property name="visible">True</property>
-	      <property name="label" translatable="yes">C_olor:</property>
-	      <property name="use_underline">True</property>
-	      <property name="use_markup">False</property>
-	      <property name="justify">GTK_JUSTIFY_LEFT</property>
-	      <property name="wrap">False</property>
-	      <property name="selectable">False</property>
-	      <property name="xalign">0</property>
-	      <property name="yalign">0.5</property>
-	      <property name="xpad">0</property>
-	      <property name="ypad">0</property>
-	      <property name="mnemonic_widget">source-color</property>
-	    </widget>
-	    <packing>
-	      <property name="left_attach">0</property>
-	      <property name="right_attach">1</property>
-	      <property name="top_attach">2</property>
-	      <property name="bottom_attach">3</property>
-	      <property name="x_options">fill</property>
-	      <property name="y_options"></property>
-	    </packing>
-	  </child>
-
-	  <child>
-	    <widget class="GtkHBox" id="uri-hbox">
-	      <property name="visible">True</property>
-	      <property name="homogeneous">False</property>
-	      <property name="spacing">6</property>
-
-	      <child>
-		<widget class="GtkEntry" id="uri-entry">
-		  <property name="visible">True</property>
-		  <property name="can_focus">True</property>
-		  <property name="editable">True</property>
-		  <property name="visibility">True</property>
-		  <property name="max_length">0</property>
-		  <property name="text" translatable="yes"></property>
-		  <property name="has_frame">True</property>
-		  <property name="invisible_char" translatable="yes">*</property>
-		  <property name="activates_default">False</property>
-		</widget>
-		<packing>
-		  <property name="padding">0</property>
-		  <property name="expand">True</property>
-		  <property name="fill">True</property>
-		</packing>
-	      </child>
-	    </widget>
-	    <packing>
-	      <property name="left_attach">1</property>
-	      <property name="right_attach">2</property>
-	      <property name="top_attach">3</property>
-	      <property name="bottom_attach">4</property>
-	      <property name="x_options">fill</property>
-	      <property name="y_options">fill</property>
-	    </packing>
-	  </child>
-
-	  <child>
-	    <widget class="GtkOptionMenu" id="group-optionmenu">
-	      <property name="visible">True</property>
-	      <property name="can_focus">True</property>
-	      <property name="history">-1</property>
-
-	      <child>
-		<widget class="GtkMenu" id="menu1">
-		</widget>
-	      </child>
-	    </widget>
-	    <packing>
-	      <property name="left_attach">1</property>
-	      <property name="right_attach">2</property>
-	      <property name="top_attach">0</property>
-	      <property name="bottom_attach">1</property>
-	      <property name="x_options">fill</property>
-	      <property name="y_options"></property>
-	    </packing>
-	  </child>
-
-	  <child>
-	    <widget class="GtkLabel" id="group-label">
-	      <property name="visible">True</property>
-	      <property name="label" translatable="yes">_Type:</property>
-	      <property name="use_underline">True</property>
-	      <property name="use_markup">False</property>
-	      <property name="justify">GTK_JUSTIFY_LEFT</property>
-	      <property name="wrap">False</property>
-	      <property name="selectable">False</property>
-	      <property name="xalign">0</property>
-	      <property name="yalign">0.5</property>
-	      <property name="xpad">0</property>
-	      <property name="ypad">0</property>
-	      <property name="mnemonic_widget">group-optionmenu</property>
-	    </widget>
-	    <packing>
-	      <property name="left_attach">0</property>
-	      <property name="right_attach">1</property>
-	      <property name="top_attach">0</property>
-	      <property name="bottom_attach">1</property>
-	      <property name="x_options">fill</property>
-	      <property name="y_options"></property>
-	    </packing>
-	  </child>
-
-	  <child>
-	    <widget class="GtkLabel" id="name-label">
-	      <property name="visible">True</property>
-	      <property name="label" translatable="yes">_Name:</property>
-	      <property name="use_underline">True</property>
-	      <property name="use_markup">False</property>
-	      <property name="justify">GTK_JUSTIFY_LEFT</property>
-	      <property name="wrap">False</property>
-	      <property name="selectable">False</property>
-	      <property name="xalign">0</property>
-	      <property name="yalign">0.5</property>
-	      <property name="xpad">0</property>
-	      <property name="ypad">0</property>
-	      <property name="mnemonic_widget">name-entry</property>
-	    </widget>
-	    <packing>
-	      <property name="left_attach">0</property>
-	      <property name="right_attach">1</property>
-	      <property name="top_attach">1</property>
-	      <property name="bottom_attach">2</property>
-	      <property name="x_options">fill</property>
-	      <property name="y_options"></property>
-	    </packing>
-	  </child>
-
-	  <child>
-	    <widget class="GnomeColorPicker" id="source-color">
-	      <property name="visible">True</property>
-	      <property name="can_focus">True</property>
-	      <property name="dither">True</property>
-	      <property name="use_alpha">False</property>
-	      <property name="title" translatable="yes">Pick a color</property>
-	      <property name="focus_on_click">True</property>
-	    </widget>
-	    <packing>
-	      <property name="left_attach">1</property>
-	      <property name="right_attach">2</property>
-	      <property name="top_attach">2</property>
-	      <property name="bottom_attach">3</property>
-	      <property name="x_options">fill</property>
-	      <property name="y_options"></property>
-	    </packing>
-	  </child>
-	</widget>
-	<packing>
-	  <property name="padding">0</property>
-	  <property name="expand">True</property>
-	  <property name="fill">True</property>
-	</packing>
-      </child>
-
-      <child>
-	<widget class="GtkHButtonBox" id="hbuttonbox1">
-	  <property name="visible">True</property>
-	  <property name="layout_style">GTK_BUTTONBOX_END</property>
-	  <property name="spacing">10</property>
-
-	  <child>
-	    <widget class="GtkButton" id="cancel-button">
-	      <property name="visible">True</property>
-	      <property name="can_default">True</property>
-	      <property name="can_focus">True</property>
-	      <property name="label">gtk-cancel</property>
-	      <property name="use_stock">True</property>
-	      <property name="relief">GTK_RELIEF_NORMAL</property>
-	      <property name="focus_on_click">True</property>
-	    </widget>
-	  </child>
-
-	  <child>
-	    <widget class="GtkButton" id="add-button">
-	      <property name="visible">True</property>
-	      <property name="can_default">True</property>
-	      <property name="can_focus">True</property>
-	      <property name="relief">GTK_RELIEF_NORMAL</property>
-	      <property name="focus_on_click">True</property>
-
-	      <child>
-		<widget class="GtkAlignment" id="alignment1">
-		  <property name="visible">True</property>
-		  <property name="xalign">0.5</property>
-		  <property name="yalign">0.5</property>
-		  <property name="xscale">0</property>
-		  <property name="yscale">0</property>
-		  <property name="top_padding">0</property>
-		  <property name="bottom_padding">0</property>
-		  <property name="left_padding">0</property>
-		  <property name="right_padding">0</property>
-
-		  <child>
-		    <widget class="GtkHBox" id="hbox1">
-		      <property name="visible">True</property>
-		      <property name="homogeneous">False</property>
-		      <property name="spacing">2</property>
-
-		      <child>
-			<widget class="GtkImage" id="image1">
-			  <property name="visible">True</property>
-			  <property name="stock">gtk-add</property>
-			  <property name="icon_size">4</property>
-			  <property name="xalign">0.5</property>
-			  <property name="yalign">0.5</property>
-			  <property name="xpad">0</property>
-			  <property name="ypad">0</property>
-			</widget>
-			<packing>
-			  <property name="padding">0</property>
-			  <property name="expand">False</property>
-			  <property name="fill">False</property>
-			</packing>
-		      </child>
-
-		      <child>
-			<widget class="GtkLabel" id="label3">
-			  <property name="visible">True</property>
-			  <property name="label" translatable="yes">_Add Calendar</property>
-			  <property name="use_underline">True</property>
-			  <property name="use_markup">False</property>
-			  <property name="justify">GTK_JUSTIFY_LEFT</property>
-			  <property name="wrap">False</property>
-			  <property name="selectable">False</property>
-			  <property name="xalign">0.5</property>
-			  <property name="yalign">0.5</property>
-			  <property name="xpad">0</property>
-			  <property name="ypad">0</property>
-			</widget>
-			<packing>
-			  <property name="padding">0</property>
-			  <property name="expand">False</property>
-			  <property name="fill">False</property>
-			</packing>
-		      </child>
-		    </widget>
-		  </child>
-		</widget>
-	      </child>
-	    </widget>
-	  </child>
-	</widget>
-	<packing>
-	  <property name="padding">0</property>
-	  <property name="expand">False</property>
-	  <property name="fill">False</property>
-	</packing>
-      </child>
-    </widget>
-  </child>
-</widget>
-
-<widget class="GtkWindow" id="add-task-list-window">
-  <property name="title" translatable="yes">Add Task List</property>
-  <property name="type">GTK_WINDOW_TOPLEVEL</property>
-  <property name="window_position">GTK_WIN_POS_NONE</property>
-  <property name="modal">False</property>
-  <property name="default_width">320</property>
-  <property name="default_height">240</property>
-  <property name="resizable">True</property>
-  <property name="destroy_with_parent">False</property>
-  <property name="decorated">True</property>
-  <property name="skip_taskbar_hint">False</property>
-  <property name="skip_pager_hint">False</property>
-  <property name="type_hint">GDK_WINDOW_TYPE_HINT_NORMAL</property>
-  <property name="gravity">GDK_GRAVITY_NORTH_WEST</property>
-
-  <child>
-    <widget class="GtkVBox" id="vbox87">
-      <property name="border_width">12</property>
-      <property name="visible">True</property>
-      <property name="homogeneous">False</property>
-      <property name="spacing">12</property>
-
-      <child>
-	<widget class="GtkTable" id="settings-table">
-	  <property name="visible">True</property>
-	  <property name="n_rows">5</property>
-	  <property name="n_columns">2</property>
-	  <property name="homogeneous">False</property>
-	  <property name="row_spacing">6</property>
-	  <property name="column_spacing">6</property>
-
-	  <child>
-	    <widget class="GtkEntry" id="name-entry">
-	      <property name="visible">True</property>
-	      <property name="can_focus">True</property>
-	      <property name="editable">True</property>
-	      <property name="visibility">True</property>
-	      <property name="max_length">0</property>
-	      <property name="text" translatable="yes"></property>
-	      <property name="has_frame">True</property>
-	      <property name="invisible_char" translatable="yes">*</property>
-	      <property name="activates_default">False</property>
-	    </widget>
-	    <packing>
-	      <property name="left_attach">1</property>
-	      <property name="right_attach">2</property>
-	      <property name="top_attach">1</property>
-	      <property name="bottom_attach">2</property>
-	      <property name="y_options"></property>
-	    </packing>
-	  </child>
-
-	  <child>
-	    <widget class="GtkLabel" id="uri-label">
-	      <property name="visible">True</property>
-	      <property name="label" translatable="yes">_URL:</property>
-	      <property name="use_underline">True</property>
-	      <property name="use_markup">False</property>
-	      <property name="justify">GTK_JUSTIFY_LEFT</property>
-	      <property name="wrap">False</property>
-	      <property name="selectable">False</property>
-	      <property name="xalign">0</property>
-	      <property name="yalign">0.5</property>
-	      <property name="xpad">0</property>
-	      <property name="ypad">0</property>
-	    </widget>
-	    <packing>
-	      <property name="left_attach">0</property>
-	      <property name="right_attach">1</property>
-	      <property name="top_attach">3</property>
-	      <property name="bottom_attach">4</property>
-	      <property name="x_options">fill</property>
-	      <property name="y_options"></property>
-	    </packing>
-	  </child>
-
-	  <child>
-	    <widget class="GtkLabel" id="refresh-label">
-	      <property name="visible">True</property>
-	      <property name="label" translatable="yes">_Refresh:</property>
-	      <property name="use_underline">True</property>
-	      <property name="use_markup">False</property>
-	      <property name="justify">GTK_JUSTIFY_LEFT</property>
-	      <property name="wrap">False</property>
-	      <property name="selectable">False</property>
-	      <property name="xalign">0</property>
-	      <property name="yalign">0.5</property>
-	      <property name="xpad">0</property>
-	      <property name="ypad">0</property>
-	    </widget>
-	    <packing>
-	      <property name="left_attach">0</property>
-	      <property name="right_attach">1</property>
-	      <property name="top_attach">4</property>
-	      <property name="bottom_attach">5</property>
-	      <property name="x_options">fill</property>
-	      <property name="y_options"></property>
-	    </packing>
-	  </child>
-
-	  <child>
-	    <widget class="GtkLabel" id="label593">
-	      <property name="visible">True</property>
-	      <property name="label" translatable="yes">C_olor:</property>
-	      <property name="use_underline">True</property>
-	      <property name="use_markup">False</property>
-	      <property name="justify">GTK_JUSTIFY_LEFT</property>
-	      <property name="wrap">False</property>
-	      <property name="selectable">False</property>
-	      <property name="xalign">0</property>
-	      <property name="yalign">0.5</property>
-	      <property name="xpad">0</property>
-	      <property name="ypad">0</property>
-	      <property name="mnemonic_widget">source-color</property>
-	    </widget>
-	    <packing>
-	      <property name="left_attach">0</property>
-	      <property name="right_attach">1</property>
-	      <property name="top_attach">2</property>
-	      <property name="bottom_attach">3</property>
-	      <property name="x_options">fill</property>
-	      <property name="y_options"></property>
-	    </packing>
-	  </child>
-
-	  <child>
-	    <widget class="GnomeColorPicker" id="source-color">
-	      <property name="visible">True</property>
-	      <property name="can_focus">True</property>
-	      <property name="dither">True</property>
-	      <property name="use_alpha">False</property>
-	      <property name="title" translatable="yes">Pick a color</property>
-	      <property name="focus_on_click">True</property>
-	    </widget>
-	    <packing>
-	      <property name="left_attach">1</property>
-	      <property name="right_attach">2</property>
-	      <property name="top_attach">2</property>
-	      <property name="bottom_attach">3</property>
-	      <property name="x_options">fill</property>
-	      <property name="y_options"></property>
-	    </packing>
-	  </child>
-
-	  <child>
-	    <widget class="GtkHBox" id="uri-hbox">
-	      <property name="visible">True</property>
-	      <property name="homogeneous">False</property>
-	      <property name="spacing">6</property>
-
-	      <child>
-		<widget class="GtkEntry" id="uri-entry">
-		  <property name="visible">True</property>
-		  <property name="can_focus">True</property>
-		  <property name="editable">True</property>
-		  <property name="visibility">True</property>
-		  <property name="max_length">0</property>
-		  <property name="text" translatable="yes"></property>
-		  <property name="has_frame">True</property>
-		  <property name="invisible_char" translatable="yes">*</property>
-		  <property name="activates_default">False</property>
-		</widget>
-		<packing>
-		  <property name="padding">0</property>
-		  <property name="expand">True</property>
-		  <property name="fill">True</property>
-		</packing>
-	      </child>
-	    </widget>
-	    <packing>
-	      <property name="left_attach">1</property>
-	      <property name="right_attach">2</property>
-	      <property name="top_attach">3</property>
-	      <property name="bottom_attach">4</property>
-	      <property name="x_options">fill</property>
-	      <property name="y_options">fill</property>
-	    </packing>
-	  </child>
-
-	  <child>
-	    <widget class="GtkOptionMenu" id="group-optionmenu">
-	      <property name="visible">True</property>
-	      <property name="can_focus">True</property>
-	      <property name="history">-1</property>
-
-	      <child>
-		<widget class="GtkMenu" id="menu5">
-		</widget>
-	      </child>
-	    </widget>
-	    <packing>
-	      <property name="left_attach">1</property>
-	      <property name="right_attach">2</property>
-	      <property name="top_attach">0</property>
-	      <property name="bottom_attach">1</property>
-	      <property name="x_options">fill</property>
-	      <property name="y_options"></property>
-	    </packing>
-	  </child>
-
-	  <child>
-	    <widget class="GtkLabel" id="label594">
-	      <property name="visible">True</property>
-	      <property name="label" translatable="yes">_Type:</property>
-	      <property name="use_underline">True</property>
-	      <property name="use_markup">False</property>
-	      <property name="justify">GTK_JUSTIFY_LEFT</property>
-	      <property name="wrap">False</property>
-	      <property name="selectable">False</property>
-	      <property name="xalign">0</property>
-	      <property name="yalign">0.5</property>
-	      <property name="xpad">0</property>
-	      <property name="ypad">0</property>
-	      <property name="mnemonic_widget">group-optionmenu</property>
-	    </widget>
-	    <packing>
-	      <property name="left_attach">0</property>
-	      <property name="right_attach">1</property>
-	      <property name="top_attach">0</property>
-	      <property name="bottom_attach">1</property>
-	      <property name="x_options">fill</property>
-	      <property name="y_options"></property>
-	    </packing>
-	  </child>
-
-	  <child>
-	    <widget class="GtkLabel" id="label595">
-	      <property name="visible">True</property>
-	      <property name="label" translatable="yes">_Name:</property>
-	      <property name="use_underline">True</property>
-	      <property name="use_markup">False</property>
-	      <property name="justify">GTK_JUSTIFY_LEFT</property>
-	      <property name="wrap">False</property>
-	      <property name="selectable">False</property>
-	      <property name="xalign">0</property>
-	      <property name="yalign">0.5</property>
-	      <property name="xpad">0</property>
-	      <property name="ypad">0</property>
-	      <property name="mnemonic_widget">name-entry</property>
-	    </widget>
-	    <packing>
-	      <property name="left_attach">0</property>
-	      <property name="right_attach">1</property>
-	      <property name="top_attach">1</property>
-	      <property name="bottom_attach">2</property>
-	      <property name="x_options">fill</property>
-	      <property name="y_options"></property>
-	    </packing>
-	  </child>
-
-	  <child>
-	    <widget class="GtkAlignment" id="refresh-hbox">
-	      <property name="visible">True</property>
-	      <property name="xalign">0</property>
-	      <property name="yalign">0.5</property>
-	      <property name="xscale">0</property>
-	      <property name="yscale">1</property>
-	      <property name="top_padding">0</property>
-	      <property name="bottom_padding">0</property>
-	      <property name="left_padding">0</property>
-	      <property name="right_padding">0</property>
-
-	      <child>
-		<widget class="GtkHBox" id="hbox130">
-		  <property name="visible">True</property>
-		  <property name="homogeneous">False</property>
-		  <property name="spacing">6</property>
-
-		  <child>
-		    <widget class="GtkSpinButton" id="refresh-spin">
-		      <property name="visible">True</property>
-		      <property name="can_focus">True</property>
-		      <property name="climb_rate">1</property>
-		      <property name="digits">0</property>
-		      <property name="numeric">False</property>
-		      <property name="update_policy">GTK_UPDATE_ALWAYS</property>
-		      <property name="snap_to_ticks">False</property>
-		      <property name="wrap">False</property>
-		      <property name="adjustment">30 0 100 1 10 10</property>
-		    </widget>
-		    <packing>
-		      <property name="padding">0</property>
-		      <property name="expand">True</property>
-		      <property name="fill">True</property>
-		    </packing>
-		  </child>
-
-		  <child>
-		    <widget class="GtkOptionMenu" id="refresh-optionmenu">
-		      <property name="visible">True</property>
-		      <property name="can_focus">True</property>
-		      <property name="history">0</property>
-
-		      <child>
-			<widget class="GtkMenu" id="menu6">
-
-			  <child>
-			    <widget class="GtkMenuItem" id="menuitem7">
-			      <property name="visible">True</property>
-			      <property name="label" translatable="yes">minutes</property>
-			      <property name="use_underline">True</property>
-			      <signal name="activate" handler="on_minutes1_activate" last_modification_time="Tue, 17 Feb 2004 17:39:35 GMT"/>
-			    </widget>
-			  </child>
-
-			  <child>
-			    <widget class="GtkMenuItem" id="menuitem8">
-			      <property name="visible">True</property>
-			      <property name="label" translatable="yes">hours</property>
-			      <property name="use_underline">True</property>
-			      <signal name="activate" handler="on_hours1_activate" last_modification_time="Tue, 17 Feb 2004 17:39:35 GMT"/>
-			    </widget>
-			  </child>
-
-			  <child>
-			    <widget class="GtkMenuItem" id="menuitem9">
-			      <property name="visible">True</property>
-			      <property name="label" translatable="yes">days</property>
-			      <property name="use_underline">True</property>
-			      <signal name="activate" handler="on_days1_activate" last_modification_time="Tue, 17 Feb 2004 17:39:35 GMT"/>
-			    </widget>
-			  </child>
-
-			  <child>
-			    <widget class="GtkMenuItem" id="menuitem10">
-			      <property name="visible">True</property>
-			      <property name="label" translatable="yes">weeks</property>
-			      <property name="use_underline">True</property>
-			      <signal name="activate" handler="on_weeks1_activate" last_modification_time="Tue, 17 Feb 2004 17:39:35 GMT"/>
-			    </widget>
-			  </child>
-			</widget>
-		      </child>
-		    </widget>
-		    <packing>
-		      <property name="padding">0</property>
-		      <property name="expand">False</property>
-		      <property name="fill">False</property>
-		    </packing>
-		  </child>
-		</widget>
-	      </child>
-	    </widget>
-	    <packing>
-	      <property name="left_attach">1</property>
-	      <property name="right_attach">2</property>
-	      <property name="top_attach">4</property>
-	      <property name="bottom_attach">5</property>
-	      <property name="x_options">fill</property>
-	      <property name="y_options">fill</property>
-	    </packing>
-	  </child>
-	</widget>
-	<packing>
-	  <property name="padding">0</property>
-	  <property name="expand">True</property>
-	  <property name="fill">True</property>
-	</packing>
-      </child>
-
-      <child>
-	<widget class="GtkHButtonBox" id="hbuttonbox22">
-	  <property name="visible">True</property>
-	  <property name="layout_style">GTK_BUTTONBOX_END</property>
-	  <property name="spacing">10</property>
-
-	  <child>
-	    <widget class="GtkButton" id="cancel-button">
-	      <property name="visible">True</property>
-	      <property name="can_default">True</property>
-	      <property name="can_focus">True</property>
-	      <property name="label">gtk-cancel</property>
-	      <property name="use_stock">True</property>
-	      <property name="relief">GTK_RELIEF_NORMAL</property>
-	      <property name="focus_on_click">True</property>
-	    </widget>
-	  </child>
-
-	  <child>
-	    <widget class="GtkButton" id="add-button">
-	      <property name="visible">True</property>
-	      <property name="can_default">True</property>
-	      <property name="can_focus">True</property>
-	      <property name="relief">GTK_RELIEF_NORMAL</property>
-	      <property name="focus_on_click">True</property>
-
-	      <child>
-		<widget class="GtkAlignment" id="alignment48">
-		  <property name="visible">True</property>
-		  <property name="xalign">0.5</property>
-		  <property name="yalign">0.5</property>
-		  <property name="xscale">0</property>
-		  <property name="yscale">0</property>
-		  <property name="top_padding">0</property>
-		  <property name="bottom_padding">0</property>
-		  <property name="left_padding">0</property>
-		  <property name="right_padding">0</property>
-
-		  <child>
-		    <widget class="GtkHBox" id="hbox129">
-		      <property name="visible">True</property>
-		      <property name="homogeneous">False</property>
-		      <property name="spacing">2</property>
-
-		      <child>
-			<widget class="GtkImage" id="image12">
-			  <property name="visible">True</property>
-			  <property name="stock">gtk-add</property>
-			  <property name="icon_size">4</property>
-			  <property name="xalign">0.5</property>
-			  <property name="yalign">0.5</property>
-			  <property name="xpad">0</property>
-			  <property name="ypad">0</property>
-			</widget>
-			<packing>
-			  <property name="padding">0</property>
-			  <property name="expand">False</property>
-			  <property name="fill">False</property>
-			</packing>
-		      </child>
-
-		      <child>
-			<widget class="GtkLabel" id="add-label">
-			  <property name="visible">True</property>
-			  <property name="label" translatable="yes">_Add Task List</property>
-			  <property name="use_underline">True</property>
-			  <property name="use_markup">False</property>
-			  <property name="justify">GTK_JUSTIFY_LEFT</property>
-			  <property name="wrap">False</property>
-			  <property name="selectable">False</property>
-			  <property name="xalign">0.5</property>
-			  <property name="yalign">0.5</property>
-			  <property name="xpad">0</property>
-			  <property name="ypad">0</property>
-			</widget>
-			<packing>
-			  <property name="padding">0</property>
-			  <property name="expand">False</property>
-			  <property name="fill">False</property>
-			</packing>
-		      </child>
-		    </widget>
-		  </child>
-		</widget>
-	      </child>
-	    </widget>
-	  </child>
-	</widget>
-	<packing>
-	  <property name="padding">0</property>
-	  <property name="expand">False</property>
-	  <property name="fill">False</property>
-	</packing>
-      </child>
-    </widget>
-  </child>
-</widget>
-
-</glade-interface>
diff --git a/calendar/gui/dialogs/calendar-setup.h b/calendar/gui/dialogs/calendar-setup.h
deleted file mode 100644
index 3e266df93c..0000000000
--- a/calendar/gui/dialogs/calendar-setup.h
+++ /dev/null
@@ -1,43 +0,0 @@
-/*
- * Authors: David Trowbridge <trowbrds@cs.colorado.edu>
- *
- * Copyright (C) 2004 Novell, Inc (www.novell.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_SETUP_H__
-#define __CALENDAR_SETUP_H__
-
-struct _GtkWindow;
-struct _ESource;
-
-#ifdef __cplusplus
-extern "C" {
-#pragma }
-#endif
-
-void calendar_setup_edit_calendar  (struct _GtkWindow *parent, struct _ESource *source, struct _ESourceGroup *group);
-void calendar_setup_new_calendar   (struct _GtkWindow *parent);
-
-void calendar_setup_edit_task_list (struct _GtkWindow *parent, struct _ESource *source);
-void calendar_setup_new_task_list  (struct _GtkWindow *parent);
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif /* __CALENDAR_SETUP_H__ */
diff --git a/calendar/gui/dialogs/cancel-comp.c b/calendar/gui/dialogs/cancel-comp.c
deleted file mode 100644
index eedd7ce49c..0000000000
--- a/calendar/gui/dialogs/cancel-comp.c
+++ /dev/null
@@ -1,85 +0,0 @@
-/* Evolution calendar - Send calendar component dialog
- *
- * Copyright (C) 2001 Ximian, Inc.
- *
- * Author: JP Rosevear <jpr@ximian.com>
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of version 2 of the GNU General Public
- * License as published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307, USA.
- */
-
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
-
-#include <glib.h>
-#include <gtk/gtkmessagedialog.h>
-#include <libgnome/gnome-i18n.h>
-#include <libgnomeui/gnome-uidefs.h>
-#include <e-util/e-icon-factory.h>
-#include "widgets/misc/e-error.h"
-#include "cancel-comp.h"
-
-
-
-/**
- * cancel_component_dialog:
- * 
- * Pops up a dialog box asking the user whether he wants to send a
- * cancel and delete an iTip/iMip message
- * 
- * Return value: TRUE if the user clicked Yes, FALSE otherwise.
- **/
-gboolean
-cancel_component_dialog (GtkWindow *parent, ECal *client, ECalComponent *comp, gboolean deleting)
-{
-	ECalComponentVType vtype;
-	const char *id;
-	
-	if (deleting && e_cal_get_save_schedules (client))
-		return TRUE;
-	
-	vtype = e_cal_component_get_vtype (comp);
-	
-	switch (vtype) {
-	case E_CAL_COMPONENT_EVENT:
-		if (deleting)
-			id = "calendar:prompt-cancel-meeting";
-		else
-			id = "calendar:prompt-delete-meeting";
-		break;
-
-	case E_CAL_COMPONENT_TODO:
-		if (deleting)
-			id = "calendar:prompt-cancel-task";
-		else
-			id = "calendar:prompt-delete-task";
-		break;
-
-	case E_CAL_COMPONENT_JOURNAL:
-		if (deleting)
-			id = "calendar:prompt-cancel-journal";
-		else
-			id = "calendar:prompt-delete-journal";
-		break;
-
-	default:
-		g_message (G_STRLOC ": Cannot handle object of type %d", vtype);
-		return FALSE;
-	}
-	
-	if (e_error_run (parent, id, NULL) == GTK_RESPONSE_YES)
-		return TRUE;
-	else
-		return FALSE;
-}
diff --git a/calendar/gui/dialogs/cancel-comp.h b/calendar/gui/dialogs/cancel-comp.h
deleted file mode 100644
index a43f24f2fe..0000000000
--- a/calendar/gui/dialogs/cancel-comp.h
+++ /dev/null
@@ -1,30 +0,0 @@
-/* Evolution calendar - Send calendar component dialog
- *
- * Copyright (C) 2001 Ximian, Inc.
- *
- * Author: JP Rosevear <jpr@ximian.com>
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of version 2 of the GNU General Public
- * License as published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307, USA.
- */
-
-#ifndef CANCEL_COMP_H
-#define CANCEL_COMP_H
-
-#include <glib.h>
-#include <libecal/e-cal.h>
-#include <libecal/e-cal-component.h>
-
-gboolean cancel_component_dialog (GtkWindow *parent, ECal *client, ECalComponent *comp, gboolean deleting);
-
-#endif
diff --git a/calendar/gui/dialogs/changed-comp.c b/calendar/gui/dialogs/changed-comp.c
deleted file mode 100644
index a76b123b36..0000000000
--- a/calendar/gui/dialogs/changed-comp.c
+++ /dev/null
@@ -1,124 +0,0 @@
-/* Evolution calendar - Send calendar component dialog
- *
- * Copyright (C) 2001 Ximian, Inc.
- *
- * Author: JP Rosevear <jpr@ximian.com>
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of version 2 of the GNU General Public
- * License as published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307, USA.
- */
-
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
-
-#include <glib.h>
-#include <gtk/gtkmessagedialog.h>
-#include <libgnome/gnome-i18n.h>
-#include <libgnomeui/gnome-uidefs.h>
-#include <e-util/e-icon-factory.h>
-#include "changed-comp.h"
-
-
-
-/**
- * changed_component_dialog:
- * @parent: Parent window for the dialog.
- * @comp: A calendar component
- * @deleted: Whether the object is being deleted or updated
- * @changed: Whether or not the user has made changes
- * 
- * Pops up a dialog box asking the user whether changes made (if any)
- * should be thrown away because the item has been updated elsewhere
- * 
- * Return value: TRUE if the user clicked Yes, FALSE otherwise.
- **/
-gboolean
-changed_component_dialog (GtkWindow *parent, ECalComponent *comp, gboolean deleted, gboolean changed)
-{
-	GtkWidget *dialog;
-	ECalComponentVType vtype;
-	char *str;
-	gint response;
-	GList *icon_list;
-	
-	vtype = e_cal_component_get_vtype (comp);
-
-	if (deleted) {
-		switch (vtype) {
-		case E_CAL_COMPONENT_EVENT:
-			str = _("This event has been deleted.");
-			break;
-
-		case E_CAL_COMPONENT_TODO:
-			str = _("This task has been deleted.");
-			break;
-
-		case E_CAL_COMPONENT_JOURNAL:
-			str = _("This journal entry has been deleted.");
-			break;
-
-		default:
-			g_message ("changed_component_dialog(): "
-				   "Cannot handle object of type %d", vtype);
-			return FALSE;
-		}
-		if (changed)
-			str = g_strdup_printf (_("%s  You have made changes. Forget those changes and close the editor?"), str);
-		else
-			str = g_strdup_printf (_("%s  You have made no changes, close the editor?"), str); 
-
-	} else {
-		switch (vtype) {
-		case E_CAL_COMPONENT_EVENT:
-			str = _("This event has been changed.");
-			break;
-
-		case E_CAL_COMPONENT_TODO:
-			str = _("This task has been changed.");
-			break;
-
-		case E_CAL_COMPONENT_JOURNAL:
-			str = _("This journal entry has been changed.");
-			break;
-
-		default:
-			g_message ("changed_component_dialog(): "
-				   "Cannot handle object of type %d", vtype);
-			return FALSE;
-		}
-		if (changed)
-			str = g_strdup_printf (_("%s  You have made changes. Forget those changes and update the editor?"), str);
-		else
-			str = g_strdup_printf (_("%s  You have made no changes, update the editor?"), str); 
-	}
-	
-	dialog = gtk_message_dialog_new (parent, GTK_DIALOG_MODAL,
-					 GTK_MESSAGE_QUESTION,
-					 GTK_BUTTONS_YES_NO, str);
-	
-	icon_list = e_icon_factory_get_icon_list ("stock_calendar");
-	if (icon_list) {
-		gtk_window_set_icon_list (GTK_WINDOW (dialog), icon_list);
-		g_list_foreach (icon_list, (GFunc) g_object_unref, NULL);
-		g_list_free (icon_list);
-	}
-	
-	response = gtk_dialog_run (GTK_DIALOG (dialog));
-	gtk_widget_destroy (dialog);
-
-	if (response == GTK_RESPONSE_YES)
-		return TRUE;
-	else
-		return FALSE;
-}
diff --git a/calendar/gui/dialogs/changed-comp.h b/calendar/gui/dialogs/changed-comp.h
deleted file mode 100644
index f029f3388e..0000000000
--- a/calendar/gui/dialogs/changed-comp.h
+++ /dev/null
@@ -1,30 +0,0 @@
-/* Evolution calendar - Changed calendar component dialog
- *
- * Copyright (C) 2001 Ximian, Inc.
- *
- * Author: JP Rosevear <jpr@ximian.com>
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of version 2 of the GNU General Public
- * License as published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307, USA.
- */
-
-#ifndef CHANGED_COMP_H
-#define CHANGED_COMP_H
-
-#include <glib.h>
-#include <gtk/gtkwindow.h>
-#include <libecal/e-cal-component.h>
-
-gboolean changed_component_dialog (GtkWindow *window, ECalComponent *comp, gboolean deleted, gboolean changed);
-
-#endif
diff --git a/calendar/gui/dialogs/comp-editor-page.c b/calendar/gui/dialogs/comp-editor-page.c
deleted file mode 100644
index 2d656060e7..0000000000
--- a/calendar/gui/dialogs/comp-editor-page.c
+++ /dev/null
@@ -1,471 +0,0 @@
-/* Evolution calendar - Base class for calendar component editor pages
- *
- * Copyright (C) 2001 Ximian, Inc.
- *
- * Authors: Federico Mena-Quintero <federico@ximian.com>
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of version 2 of the GNU General Public
- * License as published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public 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 <libgnome/gnome-i18n.h>
-#include <libgnomeui/gnome-dialog.h>
-#include <libgnomeui/gnome-dialog-util.h>
-#include "comp-editor-page.h"
-
-
-
-static void comp_editor_page_class_init (CompEditorPageClass *class);
-static void comp_editor_page_init (CompEditorPage *page);
-static void comp_editor_page_destroy (GtkObject *object);
-
-static GtkObjectClass *parent_class = NULL;
-
-/* Signal IDs */
-
-enum {
-	CHANGED,
-	NEEDS_SEND,
-	SUMMARY_CHANGED,
-	DATES_CHANGED,
-	CLIENT_CHANGED,
-	LAST_SIGNAL
-};
-
-static guint comp_editor_page_signals[LAST_SIGNAL];
-
-#define CLASS(page) (COMP_EDITOR_PAGE_CLASS (G_OBJECT_GET_CLASS (page)))
-
-
-
-/**
- * comp_editor_page_get_type:
- * 
- * Registers the #CompEditorPage class if necessary, and returns the type ID
- * associated to it.
- * 
- * Return value: The type ID of the #CompEditorPage class.
- **/
-GtkType
-comp_editor_page_get_type (void)
-{
-	static GtkType comp_editor_page_type = 0;
-
-	if (!comp_editor_page_type) {
-		static const GtkTypeInfo comp_editor_page_info = {
-			"CompEditorPage",
-			sizeof (CompEditorPage),
-			sizeof (CompEditorPageClass),
-			(GtkClassInitFunc) comp_editor_page_class_init,
-			(GtkObjectInitFunc) comp_editor_page_init,
-			NULL, /* reserved_1 */
-			NULL, /* reserved_2 */
-			(GtkClassInitFunc) NULL
-		};
-
-		comp_editor_page_type =
-			gtk_type_unique (GTK_TYPE_OBJECT,
-					 &comp_editor_page_info);
-	}
-
-	return comp_editor_page_type;
-}
-
-/* Class initialization function for the abstract editor page */
-static void
-comp_editor_page_class_init (CompEditorPageClass *class)
-{
-	GtkObjectClass *object_class;
-
-	object_class = (GtkObjectClass *) class;
-
-	parent_class = g_type_class_ref(GTK_TYPE_OBJECT);
-
-	comp_editor_page_signals[CHANGED] =
-		g_signal_new ("changed",
-			      G_TYPE_FROM_CLASS (class),
-			      G_SIGNAL_RUN_FIRST,
-			      G_STRUCT_OFFSET (CompEditorPageClass, changed),
-			      NULL, NULL,
-			      g_cclosure_marshal_VOID__VOID,
-			      G_TYPE_NONE, 0);
-
-	comp_editor_page_signals[NEEDS_SEND] =
-		g_signal_new ("needs_send",
-			      G_TYPE_FROM_CLASS (class),
-			      G_SIGNAL_RUN_FIRST,
-			      G_STRUCT_OFFSET (CompEditorPageClass, needs_send),
-			      NULL, NULL,
-			      g_cclosure_marshal_VOID__VOID,
-			      G_TYPE_NONE, 0);
-
-	comp_editor_page_signals[SUMMARY_CHANGED] =
-		g_signal_new ("summary_changed",
-			      G_TYPE_FROM_CLASS (class),
-			      G_SIGNAL_RUN_FIRST,
-			      G_STRUCT_OFFSET (CompEditorPageClass, summary_changed),
-			      NULL, NULL,
-			      g_cclosure_marshal_VOID__POINTER,
-			      G_TYPE_NONE, 1, G_TYPE_POINTER);
-
-	comp_editor_page_signals[DATES_CHANGED] =
-		g_signal_new ("dates_changed",
-			      G_TYPE_FROM_CLASS (class),
-			      G_SIGNAL_RUN_FIRST,
-			      G_STRUCT_OFFSET (CompEditorPageClass, dates_changed),
-			      NULL, NULL,
-			      g_cclosure_marshal_VOID__POINTER,
-			      G_TYPE_NONE, 1, G_TYPE_POINTER);
-
-	comp_editor_page_signals[CLIENT_CHANGED] =
-		g_signal_new ("client_changed",
-			      G_TYPE_FROM_CLASS (class),
-			      G_SIGNAL_RUN_FIRST,
-			      G_STRUCT_OFFSET (CompEditorPageClass, client_changed),
-			      NULL, NULL,
-			      g_cclosure_marshal_VOID__OBJECT,
-			      G_TYPE_NONE, 1, G_TYPE_OBJECT);
-
-	class->changed = NULL;
-	class->summary_changed = NULL;
-	class->dates_changed = NULL;
-
-	class->get_widget = NULL;
-	class->focus_main_widget = NULL;
-	class->fill_widgets = NULL;
-	class->fill_component = NULL;
-	class->fill_timezones = NULL;
-	class->set_summary = NULL;
-	class->set_dates = NULL;
-
-	object_class->destroy = comp_editor_page_destroy;
-}
-
-
-
-static void
-comp_editor_page_init (CompEditorPage *page)
-{
-	page->client = NULL;
-	page->accel_group = NULL;
-}
-
-
-static void
-comp_editor_page_destroy (GtkObject *object)
-{
-	CompEditorPage *page;
-
-	g_return_if_fail (object != NULL);
-	g_return_if_fail (IS_COMP_EDITOR_PAGE (object));
-
-	page = COMP_EDITOR_PAGE (object);
-
-	if (page->client) {
-		g_object_unref (page->client);
-		page->client = NULL;
-	}
-
-	if (page->accel_group) {
-		gtk_accel_group_unref (page->accel_group);
-		page->accel_group = NULL;
-	}
-
-	if (GTK_OBJECT_CLASS (parent_class)->destroy)
-		(* GTK_OBJECT_CLASS (parent_class)->destroy) (object);
-}
-
-
-/**
- * comp_editor_page_get_widget:
- * @page: An editor page.
- * 
- * Queries the main widget of an editor page.
- * 
- * Return value: The widget that is the page's upper container.  It should
- * normally be inserted in a notebook widget.
- **/
-GtkWidget *
-comp_editor_page_get_widget (CompEditorPage *page)
-{
-	g_return_val_if_fail (page != NULL, NULL);
-	g_return_val_if_fail (IS_COMP_EDITOR_PAGE (page), NULL);
-
-	g_assert (CLASS (page)->get_widget != NULL);
-	return (* CLASS (page)->get_widget) (page);
-}
-
-/**
- * comp_editor_page_focus_main_widget:
- * @page: An editor page.
- * 
- * Makes an editor page focus its main widget.  This is used by the component
- * editor when it first pops up so that it can focus the main widget in the
- * first page.
- **/
-void
-comp_editor_page_focus_main_widget (CompEditorPage *page)
-{
-	g_return_if_fail (page != NULL);
-	g_return_if_fail (IS_COMP_EDITOR_PAGE (page));
-
-	g_assert (CLASS (page)->focus_main_widget != NULL);
-	(* CLASS (page)->focus_main_widget) (page);
-}
-
-/**
- * comp_editor_page_fill_widgets:
- * @page: An editor page.
- * @comp: A calendar component.
- * 
- * Fills the widgets of an editor page with the data from a calendar component.
- **/
-gboolean
-comp_editor_page_fill_widgets (CompEditorPage *page, ECalComponent *comp)
-{
-	g_return_val_if_fail (IS_COMP_EDITOR_PAGE (page), FALSE);
-	g_return_val_if_fail (E_IS_CAL_COMPONENT (comp), FALSE);
-
-	g_assert (CLASS (page)->fill_widgets != NULL);
-	return (* CLASS (page)->fill_widgets) (page, comp);
-}
-
-/**
- * comp_editor_page_fill_component:
- * @page: An editor page.
- * @comp: A calendar component.
- * 
- * Takes the data from the widgets of an editor page and sets it on a calendar
- * component, replacing the contents of the properties that the editor page
- * knows how to manipulate.
- *
- * Returns: TRUE if the component could be filled, FALSE otherwise
- **/
-gboolean
-comp_editor_page_fill_component (CompEditorPage *page, ECalComponent *comp)
-{
-	g_return_val_if_fail (page != NULL, FALSE);
-	g_return_val_if_fail (IS_COMP_EDITOR_PAGE (page), FALSE);
-	g_return_val_if_fail (comp != NULL, FALSE);
-
-	if (CLASS (page)->fill_component != NULL)
-		return (* CLASS (page)->fill_component) (page, comp);
-
-	return TRUE;
-}
-
-/**
- * comp_editor_page_fill_timezones:
- * @page: An editor page.
- * @timezones: Hash table to which timezones will be added.
- *
- * Fills the given hash table with all the timezones used by the dates in the
- * specific editor page.
- *
- * Returns: TRUE if the timezones were added, FALSE otherwise.
- */
-gboolean
-comp_editor_page_fill_timezones (CompEditorPage *page, GHashTable *timezones)
-{
-	g_return_val_if_fail (IS_COMP_EDITOR_PAGE (page), FALSE);
-	g_return_val_if_fail (timezones != NULL, FALSE);
-
-	if (CLASS (page)->fill_timezones != NULL)
-		return (* CLASS (page)->fill_timezones) (page, timezones);
-
-	return TRUE;
-}
-
-/**
- * comp_editor_page_set_e_cal:
- * @page: An editor page
- * @client: A #ECal object
- *
- * Sets the #ECal for the dialog page to use.
- **/
-void
-comp_editor_page_set_e_cal (CompEditorPage *page, ECal *client)
-{
-	g_return_if_fail (page != NULL);
-        g_return_if_fail (IS_COMP_EDITOR_PAGE (page));
-
-	if (client == page->client)
-		return;
-
-	if (page->client)
-		g_object_unref (page->client);
-
-	page->client = client;
-	if (page->client)
-		g_object_ref (client);
-}
-
-/**
- * comp_editor_page_set_summary:
- * @page: An editor page
- * @summary: The text of the new summary value
- * 
- * Sets the summary value for this group of widgets
- **/
-void
-comp_editor_page_set_summary (CompEditorPage *page, const char *summary)
-{
-	g_return_if_fail (page != NULL);
-	g_return_if_fail (IS_COMP_EDITOR_PAGE (page));
-
-	if (CLASS (page)->set_summary != NULL)
-		(* CLASS (page)->set_summary) (page, summary);
-}
-
-/**
- * comp_editor_page_set_dates:
- * @page: An editor page
- * @dates: A collection of various dates in time_t format
- * 
- * Sets the date values for this group of widgets
- **/
-void
-comp_editor_page_set_dates (CompEditorPage *page, CompEditorPageDates *dates)
-{
-	g_return_if_fail (page != NULL);
-	g_return_if_fail (IS_COMP_EDITOR_PAGE (page));
-
-	if (CLASS (page)->set_dates != NULL)
-		(* CLASS (page)->set_dates) (page, dates);
-}
-
-/**
- * comp_editor_page_notify_changed:
- * @page: An editor page.
- * 
- * Makes an editor page emit the "changed" signal.  This is meant to be
- * used only by page implementations.
- **/
-void
-comp_editor_page_notify_changed (CompEditorPage *page)
-{
-	g_return_if_fail (page != NULL);
-	g_return_if_fail (IS_COMP_EDITOR_PAGE (page));
-
-	gtk_signal_emit (GTK_OBJECT (page), comp_editor_page_signals[CHANGED]);
-}
-
-/**
- * comp_editor_page_notify_needs_send:
- * @page: 
- * 
- * 
- **/
-void
-comp_editor_page_notify_needs_send (CompEditorPage *page)
-{
-	g_return_if_fail (page != NULL);
-	g_return_if_fail (IS_COMP_EDITOR_PAGE (page));
-
-	gtk_signal_emit (GTK_OBJECT (page), comp_editor_page_signals[NEEDS_SEND]);	
-}
-
-/**
- * comp_editor_page_notify_summary_changed:
- * @page: An editor page.
- * 
- * Makes an editor page emit the "summary_changed" signal.  This is meant to be
- * used only by page implementations.
- **/
-void
-comp_editor_page_notify_summary_changed (CompEditorPage *page,
-					 const char *summary)
-{
-	g_return_if_fail (page != NULL);
-	g_return_if_fail (IS_COMP_EDITOR_PAGE (page));
-
-	
-	gtk_signal_emit (GTK_OBJECT (page),
-			 comp_editor_page_signals[SUMMARY_CHANGED],
-			 summary);
-}
-
-/**
- * comp_editor_page_notify_dates_changed:
- * @page: An editor page.
- * 
- * Makes an editor page emit the "dates_changed" signal.  This is meant to be
- * used only by page implementations.
- **/
-void
-comp_editor_page_notify_dates_changed (CompEditorPage *page,
-				       CompEditorPageDates *dates)
-{
-	g_return_if_fail (page != NULL);
-	g_return_if_fail (IS_COMP_EDITOR_PAGE (page));
-
-	gtk_signal_emit (GTK_OBJECT (page),
-			 comp_editor_page_signals[DATES_CHANGED],
-			 dates);
-}
-
-/**
- * comp_editor_page_notify_client_changed:
- * @page: An editor page.
- * 
- * Makes an editor page emit the "client_changed" signal.  This is meant to be
- * used only by page implementations.
- **/
-void
-comp_editor_page_notify_client_changed (CompEditorPage *page,
-					ECal *client)
-{
-	g_return_if_fail (page != NULL);
-	g_return_if_fail (IS_COMP_EDITOR_PAGE (page));
-
-	comp_editor_page_set_e_cal (page, client);
-	gtk_signal_emit (GTK_OBJECT (page),
-			 comp_editor_page_signals[CLIENT_CHANGED],
-			 client);
-}
-
-/**
- * comp_editor_page_display_validation_error:
- * @page: An editor page.
- * @msg: Error message to display.
- * @field: Widget that caused the validation error.
- *
- * Displays an error message about a validation problem in the
- * given field. Once the error message has been displayed, the
- * focus is set to the widget that caused the validation error.
- */
-void
-comp_editor_page_display_validation_error (CompEditorPage *page,
-					   const char *msg,
-					   GtkWidget *field)
-{
-	GtkWidget *dialog;
-	char *real_msg;
-
-	g_return_if_fail (IS_COMP_EDITOR_PAGE (page));
-	g_return_if_fail (msg != NULL);
-	g_return_if_fail (GTK_IS_WIDGET (field));
-
-	real_msg = g_strdup_printf (_("Validation error: %s"), msg);
-	dialog = gnome_error_dialog (real_msg);
-	gnome_dialog_run_and_close (GNOME_DIALOG (dialog));
-
-	gtk_widget_grab_focus (field);
-
-	g_free (real_msg);
-}
diff --git a/calendar/gui/dialogs/comp-editor-page.h b/calendar/gui/dialogs/comp-editor-page.h
deleted file mode 100644
index 2b3c6c60ab..0000000000
--- a/calendar/gui/dialogs/comp-editor-page.h
+++ /dev/null
@@ -1,118 +0,0 @@
-/* Evolution calendar - Base class for calendar component editor pages
- *
- * Copyright (C) 2001 Ximian, Inc.
- *
- * Authors: Federico Mena-Quintero <federico@ximian.com>
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of version 2 of the GNU General Public
- * License as published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307, USA.
- */
-
-#ifndef COMP_EDITOR_PAGE_H
-#define COMP_EDITOR_PAGE_H
-
-#include <time.h>
-#include <gtk/gtkwidget.h>
-#include <libecal/e-cal-component.h>
-#include <libecal/e-cal.h>
-
-G_BEGIN_DECLS
-
-
-
-#define TYPE_COMP_EDITOR_PAGE            (comp_editor_page_get_type ())
-#define COMP_EDITOR_PAGE(obj)            (G_TYPE_CHECK_INSTANCE_CAST ((obj), TYPE_COMP_EDITOR_PAGE, CompEditorPage))
-#define COMP_EDITOR_PAGE_CLASS(klass)    (G_TYPE_CHECK_CLASS_CAST ((klass), TYPE_COMP_EDITOR_PAGE,	CompEditorPageClass))
-#define IS_COMP_EDITOR_PAGE(obj)         (G_TYPE_CHECK_INSTANCE_TYPE ((obj), TYPE_COMP_EDITOR_PAGE))
-#define IS_COMP_EDITOR_PAGE_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((obj), TYPE_COMP_EDITOR_PAGE))
-
-typedef struct {
-	ECalComponentDateTime *start;
-	ECalComponentDateTime *end;
-	ECalComponentDateTime *due;
-	struct icaltimetype *complete;
-} CompEditorPageDates;
-
-typedef struct {
-	GtkObject object;
-
-	/* Some of the pages need the ECal to access timezone data. Also,
-	 * the event page needs to know it to fill the source option menu. */
-	ECal *client;
-
-	/* The GtkAccelGroup for the page. We install this when the page is
-	   mapped, and uninstall when it is unmapped. libglade would do this
-	   normally, but we create our pages individually so have to do it
-	   ourselves. */
-	GtkAccelGroup *accel_group;
-} CompEditorPage;
-
-typedef struct {
-	GtkObjectClass parent_class;
-
-	/* Notification signals */
-
-	void (* changed)    (CompEditorPage *page);
-	void (* needs_send) (CompEditorPage *page);
-
-	void (* summary_changed) (CompEditorPage *page, const char *summary);
-	void (* dates_changed)   (CompEditorPage *page, const char *dates);
-	void (* client_changed)  (CompEditorPage *page, ECal *client);
-
-	/* Virtual methods */
-
-	GtkWidget *(* get_widget) (CompEditorPage *page);
-	void (* focus_main_widget) (CompEditorPage *page);
-
-	gboolean (* fill_widgets) (CompEditorPage *page, ECalComponent *comp);
-	gboolean (* fill_component) (CompEditorPage *page, ECalComponent *comp);
-	gboolean (* fill_timezones) (CompEditorPage *page, GHashTable *timezones);
-
-	void (* set_summary) (CompEditorPage *page, const char *summary);
-	void (* set_dates) (CompEditorPage *page, CompEditorPageDates *dates);
-} CompEditorPageClass;
-
-
-GtkType    comp_editor_page_get_type               (void);
-GtkWidget *comp_editor_page_get_widget             (CompEditorPage      *page);
-void       comp_editor_page_focus_main_widget      (CompEditorPage      *page);
-gboolean   comp_editor_page_fill_widgets           (CompEditorPage      *page,
-						    ECalComponent        *comp);
-gboolean   comp_editor_page_fill_component         (CompEditorPage      *page,
-						    ECalComponent        *comp);
-gboolean   comp_editor_page_fill_timezones         (CompEditorPage      *page,
-						    GHashTable          *timezones);
-void       comp_editor_page_set_e_cal              (CompEditorPage      *page,
-						    ECal           *client);
-void       comp_editor_page_set_summary            (CompEditorPage      *page,
-						    const char          *summary);
-void       comp_editor_page_set_dates              (CompEditorPage      *page,
-						    CompEditorPageDates *dates);
-void       comp_editor_page_notify_changed         (CompEditorPage      *page);
-void       comp_editor_page_notify_needs_send      (CompEditorPage      *page);
-void       comp_editor_page_notify_summary_changed (CompEditorPage      *page,
-						    const char          *summary);
-void       comp_editor_page_notify_dates_changed   (CompEditorPage      *page,
-						    CompEditorPageDates *dates);
-void       comp_editor_page_notify_client_changed  (CompEditorPage      *page,
-						    ECal                *client);
-void       comp_editor_page_display_validation_error (CompEditorPage      *page,
-						      const char          *msg,
-						      GtkWidget           *field);
-
-
-
-
-G_END_DECLS
-
-#endif
diff --git a/calendar/gui/dialogs/comp-editor-util.c b/calendar/gui/dialogs/comp-editor-util.c
deleted file mode 100644
index 2383f760e0..0000000000
--- a/calendar/gui/dialogs/comp-editor-util.c
+++ /dev/null
@@ -1,349 +0,0 @@
-/* Evolution calendar - Widget utilities
- *
- * Copyright (C) 2000 Ximian, Inc.
- *
- * Author: Federico Mena-Quintero <federico@ximian.com>
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of version 2 of the GNU General Public
- * License as published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public 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 <ctype.h>
-#include <string.h>
-#include <libical/ical.h>
-#include <glib.h>
-#include <gtk/gtklabel.h>
-#include <libgnome/gnome-i18n.h>
-#include <bonobo-activation/bonobo-activation.h>
-#include <bonobo/bonobo-control.h>
-#include <bonobo/bonobo-widget.h>
-#include <e-util/e-time-utils.h>
-#include <libecal/e-cal-time-util.h>
-#include "../calendar-config.h"
-#include "../e-date-edit-config.h"
-#include "comp-editor-util.h"
-
-
-
-/**
- * comp_editor_dates:
- * @dates: A structure to be filled out with dates of a component
- * @comp: The component to extract the dates from
- * 
- * Extracts the dates from the calendar component into the
- * CompEditorPageDates structure. Call comp_editor_free_dates() to free the
- * results.
- **/
-void
-comp_editor_dates (CompEditorPageDates *dates, ECalComponent *comp)
-{
-	ECalComponentDateTime dt;
-
-	dates->start = NULL;
-	dates->end = NULL;
-	dates->due = NULL;
-	dates->complete = NULL;
-	
-	/* Note that the ECalComponentDateTime's returned contain allocated
-	   icaltimetype and tzid values, so we just take over ownership of
-	   those. */
-	e_cal_component_get_dtstart (comp, &dt);
-	if (dt.value) {
-		dates->start = g_new (ECalComponentDateTime, 1);
-		*dates->start = dt;
-	}
-
-	e_cal_component_get_dtend (comp, &dt);
-	if (dt.value) {
-		dates->end = g_new (ECalComponentDateTime, 1);
-		*dates->end = dt;
-	}
-
-	e_cal_component_get_due (comp, &dt);
-	if (dt.value) {
-		dates->due = g_new (ECalComponentDateTime, 1);
-		*dates->due = dt;
-	}
-
-	e_cal_component_get_completed (comp, &dates->complete);
-}
-
-
-/* This frees the dates in the CompEditorPageDates struct. But it doesn't free
- * the struct (as that is usually static).
- */
-void
-comp_editor_free_dates (CompEditorPageDates *dates)
-{
-	/* Note that e_cal_component_free_datetime() only frees the fields in
-	   the struct. It doesn't free the struct itself, so we do that. */
-	if (dates->start) {
-		e_cal_component_free_datetime (dates->start);
-		g_free (dates->start);
-	}
-
-	if (dates->end) {
-		e_cal_component_free_datetime (dates->end);
-		g_free (dates->end);
-	}
-
-	if (dates->due) {
-		e_cal_component_free_datetime (dates->due);
-		g_free (dates->due);
-	}
-
-	if (dates->complete)
-		e_cal_component_free_icaltimetype (dates->complete);
-}
-
-
-/* dtstart is only passed in if tt is the dtend. */
-static void
-write_label_piece (struct icaltimetype *tt, char *buffer, int size,
-		   char *stext, char *etext, struct icaltimetype *dtstart)
-{
-	struct tm tmp_tm = { 0 };
-	struct icaltimetype tt_copy = *tt;
-	int len;
-	
-	/* FIXME: May want to convert the time to an appropriate zone. */
-
-	if (stext != NULL)
-		strcat (buffer, stext);
-
-	/* If we are writing the DTEND (i.e. DTSTART is set), and
-	   DTEND > DTSTART, subtract 1 day. The DTEND date is not inclusive. */
-	if (tt_copy.is_date && dtstart
-	    && icaltime_compare_date_only (tt_copy, *dtstart) > 0) {
-		icaltime_adjust (&tt_copy, -1, 0, 0, 0);
-	}
-
-	tmp_tm.tm_year = tt_copy.year - 1900;
-	tmp_tm.tm_mon = tt_copy.month - 1;
-	tmp_tm.tm_mday = tt_copy.day;
-	tmp_tm.tm_hour = tt_copy.hour;
-	tmp_tm.tm_min = tt_copy.minute;
-	tmp_tm.tm_sec = tt_copy.second;
-	tmp_tm.tm_isdst = -1;
-
-	tmp_tm.tm_wday = time_day_of_week (tt_copy.day, tt_copy.month - 1,
-					   tt_copy.year);
-
-	len = strlen (buffer);
-	e_time_format_date_and_time (&tmp_tm,
-				     calendar_config_get_24_hour_format (), 
-				     !tt_copy.is_date, FALSE,
-				     &buffer[len], size - len);
-	if (etext != NULL)
-		strcat (buffer, etext);
-}
-
-/**
- * comp_editor_date_label:
- * @dates: The dates to use in constructing a label
- * @label: The label whose text is to be set
- * 
- * Set the text of a label based on the dates available and the user's
- * formatting preferences
- **/
-void
-comp_editor_date_label (CompEditorPageDates *dates, GtkWidget *label)
-{
-	char buffer[1024];
-	gboolean start_set = FALSE, end_set = FALSE;
-	gboolean complete_set = FALSE, due_set = FALSE;
-
-	buffer[0] = '\0';
-
-	if (dates->start && !icaltime_is_null_time (*dates->start->value))
-		start_set = TRUE;
-	if (dates->end && !icaltime_is_null_time (*dates->end->value))
-		end_set = TRUE;
-	if (dates->complete && !icaltime_is_null_time (*dates->complete))
-		complete_set = TRUE;
-	if (dates->due && !icaltime_is_null_time (*dates->due->value))
-		due_set = TRUE;
-
-	if (start_set)
-		write_label_piece (dates->start->value, buffer, 1024,
-				   NULL, NULL, NULL);
-
-	if (start_set && end_set)
-		write_label_piece (dates->end->value, buffer, 1024,
-				   _(" to "), NULL, dates->start->value);
-
-	if (complete_set) {
-		if (start_set)
-			write_label_piece (dates->complete, buffer, 1024, _(" (Completed "), ")", NULL);
-		else
-			write_label_piece (dates->complete, buffer, 1024, _("Completed "), NULL, NULL);
-	}
-	
-	if (due_set && dates->complete == NULL) {
-		if (start_set)
-			write_label_piece (dates->due->value, buffer, 1024, _(" (Due "), ")", NULL);
-		else
-			write_label_piece (dates->due->value, buffer, 1024, _("Due "), NULL, NULL);
-	}
-
-	gtk_label_set_text (GTK_LABEL (label), buffer);
-}
-
-static void
-date_edit_destroy_cb (EDateEdit *date_edit, gpointer data)
-{
-	EDateEditConfig *config = data;
-	
-	g_object_unref (config);
-}
-
-/**
- * comp_editor_new_date_edit:
- * @show_date: Whether to show a date picker in the widget.
- * @show_time: Whether to show a time picker in the widget.
- * @make_time_insensitive: Whether the time field is made insensitive rather
- * than hiding it. This is useful if you want to preserve the layout of the
- * widgets.
- * 
- * Creates a new #EDateEdit widget, configured using the calendar's preferences.
- * 
- * Return value: A newly-created #EDateEdit widget.
- **/
-GtkWidget *
-comp_editor_new_date_edit (gboolean show_date, gboolean show_time,
-			   gboolean make_time_insensitive)
-{
-	EDateEdit *dedit;
-	EDateEditConfig *config;
-	
-	dedit = E_DATE_EDIT (e_date_edit_new ());
-
-	e_date_edit_set_show_date (dedit, show_date);
-	e_date_edit_set_show_time (dedit, show_time);
-#if 0
-	e_date_edit_set_make_time_insensitive (dedit, make_time_insensitive);
-#else
-	e_date_edit_set_make_time_insensitive (dedit, FALSE);
-#endif
-	
-	config = e_date_edit_config_new (dedit);
-	g_signal_connect (G_OBJECT (dedit), "destroy", G_CALLBACK (date_edit_destroy_cb), config);
-	
-	return GTK_WIDGET (dedit);
-}
-
-
-/* Returns the current time, for EDateEdit widgets and ECalendar items in the
-   dialogs.
-   FIXME: Should probably use the timezone from somewhere in the component
-   rather than the current timezone. */
-struct tm
-comp_editor_get_current_time (GtkObject *object, gpointer data)
-{
-	icaltimezone *zone;
-	struct icaltimetype tt;
-	struct tm tmp_tm = { 0 };
-
-	/* Get the current timezone. */
-	zone = calendar_config_get_icaltimezone ();
-
-	tt = icaltime_from_timet_with_zone (time (NULL), FALSE, zone);
-
-	/* Now copy it to the struct tm and return it. */
-	tmp_tm.tm_year  = tt.year - 1900;
-	tmp_tm.tm_mon   = tt.month - 1;
-	tmp_tm.tm_mday  = tt.day;
-	tmp_tm.tm_hour  = tt.hour;
-	tmp_tm.tm_min   = tt.minute;
-	tmp_tm.tm_sec   = tt.second;
-	tmp_tm.tm_isdst = -1;
-
-	return tmp_tm;
-}
-
-
-
-/**
- * comp_editor_strip_categories:
- * @categories: A string of category names entered by the user.
- * 
- * Takes a string of the form "categ, categ, categ, ..." and removes the
- * whitespace between categories to result in "categ,categ,categ,..."
- * 
- * Return value: The category names stripped of surrounding whitespace
- * and separated with commas.
- **/
-char *
-comp_editor_strip_categories (const char *categories)
-{
-	char *new_categories;
-	const char *start, *end;
-	const char *p;
-	char *new_p;
-
-	if (!categories)
-		return NULL;
-
-	new_categories = g_new (char, strlen (categories) + 1);
-
-	start = end = NULL;
-	new_p = new_categories;
-
-	for (p = categories; *p; p++) {
-		int c;
-
-		c = *p;
-
-		if (isspace (c))
-			continue;
-		else if (c == ',') {
-			int len;
-
-			if (!start)
-				continue;
-
-			g_assert (start <= end);
-
-			len = end - start + 1;
-			strncpy (new_p, start, len);
-			new_p[len] = ',';
-			new_p += len + 1;
-
-			start = end = NULL;
-		} else {
-			if (!start) {
-				start = p;
-				end = p;
-			} else
-				end = p;
-		}
-	}
-
-	if (start) {
-		int len;
-
-		g_assert (start <= end);
-
-		len = end - start + 1;
-		strncpy (new_p, start, len);
-		new_p += len;
-	}
-
-	*new_p = '\0';
-
-	return new_categories;
-}
diff --git a/calendar/gui/dialogs/comp-editor-util.h b/calendar/gui/dialogs/comp-editor-util.h
deleted file mode 100644
index 078cd6508c..0000000000
--- a/calendar/gui/dialogs/comp-editor-util.h
+++ /dev/null
@@ -1,40 +0,0 @@
-/* Evolution calendar - Widget utilities
- *
- * Copyright (C) 2000 Ximian, Inc.
- *
- * Author: JP Rosevear <jpr@ximian.com>
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of version 2 of the GNU General Public
- * License as published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307, USA.
- */
-
-#ifndef _COMP_EDITOR_UTIL_H_
-#define _COMP_EDITOR_UTIL_H_
-
-#include <gtk/gtkwidget.h>
-#include "comp-editor-page.h"
-
-void comp_editor_dates (CompEditorPageDates *date, ECalComponent *comp);
-void comp_editor_free_dates (CompEditorPageDates *dates);
-
-void comp_editor_date_label (CompEditorPageDates *dates, GtkWidget *label);
-
-GtkWidget *comp_editor_new_date_edit (gboolean show_date, gboolean show_time,
-				      gboolean make_time_insensitive);
-
-struct tm comp_editor_get_current_time (GtkObject *object, gpointer data);
-
-
-char *comp_editor_strip_categories (const char *categories);
-
-#endif
diff --git a/calendar/gui/dialogs/comp-editor.c b/calendar/gui/dialogs/comp-editor.c
deleted file mode 100644
index 8286b444e8..0000000000
--- a/calendar/gui/dialogs/comp-editor.c
+++ /dev/null
@@ -1,2134 +0,0 @@
-/* Evolution calendar - Framework for a calendar component editor dialog
- *
- * Copyright (C) 2001 Ximian, Inc.
- *
- * Author: Federico Mena-Quintero <federico@ximian.com>
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of version 2 of the GNU General Public
- * License as published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307, USA.
- */
-
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
-
-#include <stdio.h>
-#include <sys/types.h>
-#include <sys/stat.h>
-#include <unistd.h>
-#include <glib.h>
-#include <gdk/gdkkeysyms.h>
-#include <gtk/gtkstock.h>
-#include <libgnome/libgnome.h>
-#include <libgnome/gnome-i18n.h>
-#include <libgnomeui/gnome-uidefs.h>
-#include <libgnomeui/gnome-dialog.h>
-#include <libgnomeui/gnome-dialog-util.h>
-#include <libgnomeui/gnome-messagebox.h>
-#include <e-util/e-dialog-utils.h>
-#include <e-util/e-icon-factory.h>
-#include <evolution-shell-component-utils.h>
-
-#include <camel/camel-url.h>
-#include <camel/camel-exception.h>
-#include <camel/camel-folder.h>
-#include <camel/camel-stream-mem.h>
-#include <camel/camel-mime-message.h>
-
-#include "mail/mail-tools.h"
-#include "mail/em-popup.h"
-
-#include "../print.h"
-#include "../comp-util.h"
-#include "save-comp.h"
-#include "delete-comp.h"
-#include "send-comp.h"
-#include "changed-comp.h"
-#include "cancel-comp.h"
-#include "recur-comp.h"
-#include "comp-editor.h"
-
-#include "cal-attachment-bar.h"
-#include "widgets/misc/e-expander.h"
-#include "widgets/misc/e-error.h"
-
-
-#define d(x) x
-
-
-
-/* Private part of the CompEditor structure */
-struct _CompEditorPrivate {
-	/* Client to use */
-	ECal *client;
-	
-	/* Source client (where comp lives currently) */
-	ECal *source_client;
-
-	/* View to listen for changes */
-	ECalView *view;
-
-	/* Calendar object/uid we are editing; this is an internal copy */
-	ECalComponent *comp;
-
-	/* The pages we have */
-	GList *pages;
-
-	/* Notebook to hold the pages */
-	GtkNotebook *notebook;
-
-	/* Attachment handling */
-	GtkWidget *attachment_bar;
-	GtkWidget *attachment_scrolled_window;
-	GtkWidget *attachment_expander;
-	GtkWidget *attachment_expander_label;
-	GtkWidget *attachment_expander_icon;
-	GtkWidget *attachment_expander_num;
-
-	guint32 attachment_bar_visible : 1;
-
-	
-	gboolean changed;
-	gboolean needs_send;
-
-	CalObjModType mod;
-	
- 	gboolean existing_org;
- 	gboolean user_org;
-	gboolean is_group_item;
-	
- 	gboolean warned;
-
-        char *help_section;
-};
-
-
-
-static gint comp_editor_key_press_event (GtkWidget *d, GdkEventKey *e);
-static void comp_editor_finalize (GObject *object);
-static void comp_editor_show_help (CompEditor *editor);
-
-static void real_set_e_cal (CompEditor *editor, ECal *client);
-static void real_edit_comp (CompEditor *editor, ECalComponent *comp);
-static gboolean real_send_comp (CompEditor *editor, ECalComponentItipMethod method);
-static gboolean prompt_to_save_changes (CompEditor *editor, gboolean send);
-static void delete_comp (CompEditor *editor);
-static void close_dialog (CompEditor *editor);
-
-static void page_changed_cb (GtkObject *obj, gpointer data);
-static void needs_send_cb (GtkObject *obj, gpointer data);
-static void page_summary_changed_cb (GtkObject *obj, const char *summary, gpointer data);
-static void page_dates_changed_cb (GtkObject *obj, CompEditorPageDates *dates, gpointer data);
-
-static void obj_modified_cb (ECal *client, GList *objs, gpointer data);
-static void obj_removed_cb (ECal *client, GList *uids, gpointer data);
-
-G_DEFINE_TYPE (CompEditor, comp_editor, GTK_TYPE_DIALOG);
-
-enum {
-	DND_TYPE_MESSAGE_RFC822,
-	DND_TYPE_X_UID_LIST,
-	DND_TYPE_TEXT_URI_LIST,
-	DND_TYPE_NETSCAPE_URL,
-	DND_TYPE_TEXT_VCARD,
-	DND_TYPE_TEXT_CALENDAR,
-};
-
-static GtkTargetEntry drop_types[] = {
-	{ "message/rfc822", 0, DND_TYPE_MESSAGE_RFC822 },
-	{ "x-uid-list", 0, DND_TYPE_X_UID_LIST },
-	{ "text/uri-list", 0, DND_TYPE_TEXT_URI_LIST },
-	{ "_NETSCAPE_URL", 0, DND_TYPE_NETSCAPE_URL },
-	{ "text/x-vcard", 0, DND_TYPE_TEXT_VCARD },
-	{ "text/calendar", 0, DND_TYPE_TEXT_CALENDAR },
-};
-
-#define num_drop_types (sizeof (drop_types) / sizeof (drop_types[0]))
-
-static struct {
-	char *target;
-	GdkAtom atom;
-	guint32 actions;
-} drag_info[] = {
-	{ "message/rfc822", 0, GDK_ACTION_COPY },
-	{ "x-uid-list", 0, GDK_ACTION_ASK|GDK_ACTION_MOVE|GDK_ACTION_COPY },
-	{ "text/uri-list", 0, GDK_ACTION_COPY },
-	{ "_NETSCAPE_URL", 0, GDK_ACTION_COPY },
-	{ "text/x-vcard", 0, GDK_ACTION_COPY },
-	{ "text/calendar", 0, GDK_ACTION_COPY },
-};
-
-static void
-attach_message(CompEditor *editor, CamelMimeMessage *msg)
-{
-	CamelMimePart *mime_part;
-	const char *subject;
-
-	mime_part = camel_mime_part_new();
-	camel_mime_part_set_disposition(mime_part, "inline");
-	subject = camel_mime_message_get_subject(msg);
-	if (subject) {
-		char *desc = g_strdup_printf(_("Attached message - %s"), subject);
-
-		camel_mime_part_set_description(mime_part, desc);
-		g_free(desc);
-	} else
-		camel_mime_part_set_description(mime_part, _("Attached message"));
-
-	camel_medium_set_content_object((CamelMedium *)mime_part, (CamelDataWrapper *)msg);
-	camel_mime_part_set_content_type(mime_part, "message/rfc822");
-	cal_attachment_bar_attach_mime_part(CAL_ATTACHMENT_BAR(editor->priv->attachment_bar), mime_part);
-	camel_object_unref(mime_part);
-}
-
-struct _drop_data {
-	CompEditor *editor;
-
-	GdkDragContext *context;
-	/* Only selection->data and selection->length are valid */
-	GtkSelectionData *selection;
-
-	guint32 action;
-	guint info;
-	guint time;
-
-	unsigned int move:1;
-	unsigned int moved:1;
-	unsigned int aborted:1;
-};
-
-static void
-drop_action(CompEditor *editor, GdkDragContext *context, guint32 action, GtkSelectionData *selection, guint info, guint time)
-{
-	char *tmp, *str, **urls;
-	CamelMimePart *mime_part;
-	CamelStream *stream;
-	CamelURL *url;
-	CamelMimeMessage *msg;
-	char *content_type;
-	int i, success=FALSE, delete=FALSE;
-
-	switch (info) {
-	case DND_TYPE_MESSAGE_RFC822:
-		d(printf ("dropping a message/rfc822\n"));
-		/* write the message(s) out to a CamelStream so we can use it */
-		stream = camel_stream_mem_new ();
-		camel_stream_write (stream, selection->data, selection->length);
-		camel_stream_reset (stream);
-		
-		msg = camel_mime_message_new ();
-		if (camel_data_wrapper_construct_from_stream((CamelDataWrapper *)msg, stream) != -1) {
-			attach_message(editor, msg);
-			success = TRUE;
-			delete = action == GDK_ACTION_MOVE;
-		}
-
-		camel_object_unref(msg);
-		camel_object_unref(stream);
-		break;
-	case DND_TYPE_TEXT_URI_LIST:
-	case DND_TYPE_NETSCAPE_URL:
-		d(printf ("dropping a text/uri-list\n"));
-		tmp = g_strndup (selection->data, selection->length);
-		urls = g_strsplit (tmp, "\n", 0);
-		g_free (tmp);
-		
-		for (i = 0; urls[i] != NULL; i++) {
-			str = g_strstrip (urls[i]);
-			if (urls[i][0] == '#') {
-				g_free(str);
-				continue;
-			}
-
-			if (!g_ascii_strncasecmp (str, "mailto:", 7)) {
-				/* TODO does not handle mailto now */
-				g_free (str);
-			} else {
-				url = camel_url_new (str, NULL);
-				g_free (str);
-
-				if (url == NULL)
-					continue;
-
-				if (!g_ascii_strcasecmp (url->protocol, "file"))
-					cal_attachment_bar_attach
-						(CAL_ATTACHMENT_BAR (editor->priv->attachment_bar),
-					 	url->path);
-
-				camel_url_free (url);
-			}
-		}
-		
-		g_free (urls);
-		success = TRUE;
-		break;
-	case DND_TYPE_TEXT_VCARD:
-	case DND_TYPE_TEXT_CALENDAR:
-		content_type = gdk_atom_name (selection->type);
-		d(printf ("dropping a %s\n", content_type));
-		
-		mime_part = camel_mime_part_new ();
-		camel_mime_part_set_content (mime_part, selection->data, selection->length, content_type);
-		camel_mime_part_set_disposition (mime_part, "inline");
-		
-		cal_attachment_bar_attach_mime_part
-			(CAL_ATTACHMENT_BAR (editor->priv->attachment_bar),
-			 mime_part);
-		
-		camel_object_unref (mime_part);
-		g_free (content_type);
-
-		success = TRUE;
-		break;
-	case DND_TYPE_X_UID_LIST: {
-		GPtrArray *uids;
-		char *inptr, *inend;
-		CamelFolder *folder;
-		CamelException ex = CAMEL_EXCEPTION_INITIALISER;
-
-		/* NB: This all runs synchronously, could be very slow/hang/block the ui */
-
-		uids = g_ptr_array_new();
-
-		inptr = selection->data;
-		inend = selection->data + selection->length;
-		while (inptr < inend) {
-			char *start = inptr;
-
-			while (inptr < inend && *inptr)
-				inptr++;
-
-			if (start > (char *)selection->data)
-				g_ptr_array_add(uids, g_strndup(start, inptr-start));
-
-			inptr++;
-		}
-
-		if (uids->len > 0) {
-			folder = mail_tool_uri_to_folder(selection->data, 0, &ex);
-			if (folder) {
-				if (uids->len == 1) {
-					msg = camel_folder_get_message(folder, uids->pdata[0], &ex);
-					if (msg == NULL)
-						goto fail;
-					attach_message(editor, msg);
-				} else {
-					CamelMultipart *mp = camel_multipart_new();
-					char *desc;
-
-					camel_data_wrapper_set_mime_type((CamelDataWrapper *)mp, "multipart/digest");
-					camel_multipart_set_boundary(mp, NULL);
-					for (i=0;i<uids->len;i++) {
-						msg = camel_folder_get_message(folder, uids->pdata[i], &ex);
-						if (msg) {
-							mime_part = camel_mime_part_new();
-							camel_mime_part_set_disposition(mime_part, "inline");
-							camel_medium_set_content_object((CamelMedium *)mime_part, (CamelDataWrapper *)msg);
-							camel_mime_part_set_content_type(mime_part, "message/rfc822");
-							camel_multipart_add_part(mp, mime_part);
-							camel_object_unref(mime_part);
-							camel_object_unref(msg);
-						} else {
-							camel_object_unref(mp);
-							goto fail;
-						}
-					}
-					mime_part = camel_mime_part_new();
-					camel_medium_set_content_object((CamelMedium *)mime_part, (CamelDataWrapper *)mp);
-					/* translators, this count will always be >1 */
-					desc = g_strdup_printf(ngettext("Attached message", "%d attached messages", uids->len), uids->len);
-					camel_mime_part_set_description(mime_part, desc);
-					g_free(desc);
-					cal_attachment_bar_attach_mime_part
-						(CAL_ATTACHMENT_BAR(editor->priv->attachment_bar), mime_part);
-					camel_object_unref(mime_part);
-					camel_object_unref(mp);
-				}
-				success = TRUE;
-				delete = action == GDK_ACTION_MOVE;
-			fail:
-				if (camel_exception_is_set(&ex)) {
-					char *name;
-
-					camel_object_get(folder, NULL, CAMEL_FOLDER_NAME, &name, NULL);
-					e_error_run((GtkWindow *)editor, "mail-editor:attach-nomessages",
-						    name?name:(char *)selection->data, camel_exception_get_description(&ex), NULL);
-					camel_object_free(folder, CAMEL_FOLDER_NAME, name);
-				}
-				camel_object_unref(folder);
-			} else {
-				e_error_run((GtkWindow *)editor, "mail-editor:attach-nomessages",
-					    selection->data, camel_exception_get_description(&ex), NULL);
-			}
-
-			camel_exception_clear(&ex);
-		}
-
-		g_ptr_array_free(uids, TRUE);
-
-		break; }
-	default:
-		d(printf ("dropping an unknown\n"));
-		break;
-	}
-
-	printf("Drag finished, success %d delete %d\n", success, delete);
-
-	gtk_drag_finish(context, success, delete, time);
-}
-
-static void
-drop_popup_copy (EPopup *ep, EPopupItem *item, void *data)
-{
-	struct _drop_data *m = data;
-	drop_action(m->editor, m->context, GDK_ACTION_COPY, m->selection, m->info, m->time);
-}
-
-static void
-drop_popup_move (EPopup *ep, EPopupItem *item, void *data)
-{
-	struct _drop_data *m = data;
-	drop_action(m->editor, m->context, GDK_ACTION_MOVE, m->selection, m->info, m->time);
-}
-
-static void
-drop_popup_cancel(EPopup *ep, EPopupItem *item, void *data)
-{
-	struct _drop_data *m = data;
-	gtk_drag_finish(m->context, FALSE, FALSE, m->time);
-}
-
-static EPopupItem drop_popup_menu[] = {
-	{ E_POPUP_ITEM, "00.emc.02", N_("_Copy"), drop_popup_copy, NULL, "stock_mail-copy", 0 },
-	{ E_POPUP_ITEM, "00.emc.03", N_("_Move"), drop_popup_move, NULL, "stock_mail-move", 0 },
-	{ E_POPUP_BAR, "10.emc" },
-	{ E_POPUP_ITEM, "99.emc.00", N_("Cancel _Drag"), drop_popup_cancel, NULL, NULL, 0 },
-};
-
-static void
-drop_popup_free(EPopup *ep, GSList *items, void *data)
-{
-	struct _drop_data *m = data;
-
-	g_slist_free(items);
-
-	g_object_unref(m->context);
-	g_object_unref(m->editor);
-	g_free(m->selection->data);
-	g_free(m->selection);
-	g_free(m);
-}
-
-static void
-drag_data_received (CompEditor *editor, GdkDragContext *context,
-		    int x, int y, GtkSelectionData *selection,
-		    guint info, guint time)
-{
-	if (selection->data == NULL || selection->length == -1)
-		return;
-
-	if (context->action == GDK_ACTION_ASK) {
-		EMPopup *emp;
-		GSList *menus = NULL;
-		GtkMenu *menu;
-		int i;
-		struct _drop_data *m;
-
-		m = g_malloc0(sizeof(*m));
-		m->context = context;
-		g_object_ref(context);
-		m->editor = editor;
-		g_object_ref(editor);
-		m->action = context->action;
-		m->info = info;
-		m->time = time;
-		m->selection = g_malloc0(sizeof(*m->selection));
-		m->selection->data = g_malloc(selection->length);
-		memcpy(m->selection->data, selection->data, selection->length);
-		m->selection->length = selection->length;
-
-		emp = em_popup_new("org.gnome.evolution.mail.editor.popup.drop");
-		for (i=0;i<sizeof(drop_popup_menu)/sizeof(drop_popup_menu[0]);i++)
-			menus = g_slist_append(menus, &drop_popup_menu[i]);
-
-		e_popup_add_items((EPopup *)emp, menus, NULL, drop_popup_free, m);
-		menu = e_popup_create_menu_once((EPopup *)emp, NULL, 0);
-		gtk_menu_popup(menu, NULL, NULL, NULL, NULL, 0, time);
-	} else {
-		drop_action(editor, context, context->action, selection, info, time);
-	}
-}
-
-static gboolean
-drag_motion(GObject *o, GdkDragContext *context, gint x, gint y, guint time, CompEditor *editor)
-{
-	GList *targets;
-	GdkDragAction action, actions = 0;
-
-	for (targets = context->targets; targets; targets = targets->next) {
-		int i;
-
-		for (i=0;i<sizeof(drag_info)/sizeof(drag_info[0]);i++)
-			if (targets->data == (void *)drag_info[i].atom)
-				actions |= drag_info[i].actions;
-	}
-
-	actions &= context->actions;
-	action = context->suggested_action;
-	/* we default to copy */
-	if (action == GDK_ACTION_ASK && (actions & (GDK_ACTION_MOVE|GDK_ACTION_COPY)) != (GDK_ACTION_MOVE|GDK_ACTION_COPY))
-		action = GDK_ACTION_COPY;
-
-	gdk_drag_status(context, action, time);
-
-	return action != 0;
-}
-
-/* Class initialization function for the calendar component editor */
-static void
-comp_editor_class_init (CompEditorClass *klass)
-{
-	GObjectClass *object_class;
-	GtkWidgetClass *widget_class;
-	GObjectClass *gobject_class;
-	int i;
-
-	for (i=0;i<sizeof(drag_info)/sizeof(drag_info[0]);i++)
-		drag_info[i].atom = gdk_atom_intern(drag_info[i].target, FALSE);
-
-	gobject_class = G_OBJECT_CLASS(klass);
-	object_class = G_OBJECT_CLASS (klass);
-	widget_class = GTK_WIDGET_CLASS (klass);
-
-	klass->set_e_cal = real_set_e_cal;
-	klass->edit_comp = real_edit_comp;
-	klass->send_comp = real_send_comp;
-
-	widget_class->key_press_event = comp_editor_key_press_event;
-	object_class->finalize = comp_editor_finalize;
-}
-
-static void
-listen_for_changes (CompEditor *editor)
-{
-	CompEditorPrivate *priv;
-	const char *uid = NULL;
-
-	priv = editor->priv;
-
-	/* Discard change listener */
-	if (priv->view) {
-		g_signal_handlers_disconnect_matched (G_OBJECT (priv->view),
-						      G_SIGNAL_MATCH_DATA,
-						      0, 0, NULL, NULL,
-						      editor);
-				
-		g_object_unref (priv->view);
-		priv->view = NULL;
-	}
-	
-	/* Listen for changes */
-	if (priv->comp)
-		e_cal_component_get_uid (priv->comp, &uid);
-
-	if (uid) {
-		char *query;
-		
-		query = g_strdup_printf ("(uid? \"%s\")", uid);
-		e_cal_get_query (priv->source_client, query, &priv->view, NULL);
-		g_free (query);
-	}
-	
-	if (priv->view) {
-		g_signal_connect (priv->view, "objects_modified",
-				  G_CALLBACK (obj_modified_cb), editor);
-
-		g_signal_connect((priv->view), "objects_removed",
-				 G_CALLBACK (obj_removed_cb), editor);
-
-		e_cal_view_start (priv->view);
-	}
-}
-
-/* This sets the focus to the toplevel, so any field being edited is committed.
-   FIXME: In future we may also want to check some of the fields are valid,
-   e.g. the EDateEdit fields. */
-static void
-commit_all_fields (CompEditor *editor)
-{
-	CompEditorPrivate *priv;
-
-	priv = editor->priv;
-
-	gtk_window_set_focus (GTK_WINDOW (editor), NULL);
-}
-
-static void
-send_timezone (gpointer key, gpointer value, gpointer user_data)
-{
-	icaltimezone *zone = value;
-	CompEditor *editor = user_data;
-
-	e_cal_add_timezone (editor->priv->client, zone, NULL);
-}
-
-static gboolean
-save_comp (CompEditor *editor)
-{
-	CompEditorPrivate *priv;
-	ECalComponent *clone;
-	GList *l;
-	gboolean result;
-	GError *error = NULL;
-	GHashTable *timezones;
-	const char *orig_uid;
-	icalcomponent *icalcomp;
-
-	priv = editor->priv;
-
-	if (!priv->changed)
-		return TRUE;
-
-	/* Stop listening because we are about to change things */
-	if (priv->view) {
-		g_signal_handlers_disconnect_matched (G_OBJECT (priv->view),
-						      G_SIGNAL_MATCH_DATA,
-						      0, 0, NULL, NULL,
-						      editor);
-
-		g_object_unref (priv->view);
-		priv->view = NULL;
-	}
-
-	/* Update on the server */
-	timezones = g_hash_table_new (g_str_hash, g_str_equal);
-
-	clone = e_cal_component_clone (priv->comp);
-	for (l = priv->pages; l != NULL; l = l->next) {
-		if (!comp_editor_page_fill_component (l->data, clone)) {
-			g_object_unref (clone);
-			g_hash_table_destroy (timezones);
-			comp_editor_show_page (editor, COMP_EDITOR_PAGE (l->data));
-			return FALSE;
-		}
-
-		/* retrieve all timezones */
-		comp_editor_page_fill_timezones (l->data, timezones);
-	}
-	
-	/* If we are not the organizer, we don't update the sequence number */
-	if (!e_cal_component_has_organizer (clone) || itip_organizer_is_user (clone, priv->client))
-		e_cal_component_commit_sequence (clone);
-	else
-		e_cal_component_abort_sequence (clone);
-
-	g_object_unref (priv->comp);
-	priv->comp = clone;
-
-	e_cal_component_get_uid (priv->comp, &orig_uid);
-
-	/* send timezones */
-	g_hash_table_foreach (timezones, (GHFunc) send_timezone, editor);
-	g_hash_table_destroy (timezones);
-	
-	/* Attachments*/
-	
-	e_cal_component_set_attachment_list (priv->comp,
-			cal_attachment_bar_get_attachment_list ((CalAttachmentBar *) priv->attachment_bar)); 
-	icalcomp = e_cal_component_get_icalcomponent (priv->comp);
-	/* send the component to the server */
-	if (!cal_comp_is_on_server (priv->comp, priv->client)) {
-		result = e_cal_create_object (priv->client, icalcomp, NULL, &error);
-	} else {
-		result = e_cal_modify_object (priv->client, icalcomp, priv->mod, &error);
-	}
-
-	/* If the delay delivery is set, the items will not be created in the server immediately,
-	   so we need not show them in the view. They will appear as soon as the server creates
-	   it after the delay period */
-	if (result && e_cal_component_has_attendees (priv->comp)) {
-		gboolean delay_set = FALSE;
-		icalproperty *icalprop;
-		icalprop = icalcomponent_get_first_property (icalcomp, ICAL_X_PROPERTY);
-		while (icalprop) {
-			const char *x_name;
-
-			x_name = icalproperty_get_x_name (icalprop);
-			if (!strcmp (x_name, "X-EVOLUTION-OPTIONS-DELAY")) {
-				delay_set = TRUE;
-				break;
-			}
-
-			icalprop = icalcomponent_get_next_property (icalcomp, ICAL_X_PROPERTY);
-		}
-		if (delay_set)
-			return TRUE;
-	}
-	
-	if (!result) {
-		GtkWidget *dlg;
-		char *msg;
-
-		msg = g_strdup (error ? error->message : _("Could not update object"));
-
-		dlg = gnome_error_dialog (msg);
-		gnome_dialog_run_and_close (GNOME_DIALOG (dlg));
-
-		g_free (msg);
-		if (error)
-			g_error_free (error);
-
-		return FALSE;
-	} else {
-		if (priv->source_client &&
-		    !e_source_equal (e_cal_get_source (priv->client),
-				     e_cal_get_source (priv->source_client)) &&
-		    cal_comp_is_on_server (priv->comp, priv->source_client)) {
-			/* Comp found a new home. Remove it from old one. */
-			e_cal_remove_object (priv->source_client, orig_uid, NULL);
-
-			/* Let priv->source_client point to new home, so we can move it
-			 * again this session. */
-			g_object_unref (priv->source_client);
-			priv->source_client = g_object_ref (priv->client);
-			
-			listen_for_changes (editor);
-		}
-
-		priv->changed = FALSE;
-	}
-
-	return TRUE;
-}
-
-static gboolean
-save_comp_with_send (CompEditor *editor)
-{
-	CompEditorPrivate *priv;
-	gboolean send;
-
-	priv = editor->priv;
-
-	send = priv->changed && priv->needs_send;
-
-	if (!save_comp (editor))
-		return FALSE;
-
- 	if (send && send_component_dialog ((GtkWindow *) editor, priv->client, priv->comp, !priv->existing_org)) {
- 		if (itip_organizer_is_user (priv->comp, priv->client))
- 			return comp_editor_send_comp (editor, E_CAL_COMPONENT_METHOD_REQUEST);
- 		else
- 			return comp_editor_send_comp (editor, E_CAL_COMPONENT_METHOD_REPLY);
- 	}
-
-	return TRUE;
-}
-
-static gboolean
-prompt_to_save_changes (CompEditor *editor, gboolean send)
-{
-	CompEditorPrivate *priv;
-	gboolean read_only;
-
-	priv = editor->priv;
-
-	if (!priv->changed)
-		return TRUE;
-
-	if (!e_cal_is_read_only (priv->client, &read_only, NULL) || read_only)
-		return TRUE;
-
-	switch (save_component_dialog (GTK_WINDOW(editor), priv->comp)) {
-	case GTK_RESPONSE_YES: /* Save */
-		if (e_cal_component_is_instance (priv->comp))
-			if (!recur_component_dialog (priv->client, priv->comp, &priv->mod, GTK_WINDOW (editor)))
-				return FALSE;
-		
-		if (send && save_comp_with_send (editor))
-			return TRUE;
-		else if (!send && save_comp (editor))
-			return TRUE;
-		else
-			return FALSE;
-	case GTK_RESPONSE_NO: /* Discard */
-		return TRUE;
-	case GTK_RESPONSE_CANCEL: /* Cancel */
-	default:
-		return FALSE;
-	}
-}
-
-static void
-response_cb (GtkWidget *widget, int response, gpointer data)
-{
-	CompEditor *editor = COMP_EDITOR (data);
-	CompEditorPrivate *priv;
-	ECalComponentText text;
-	
-	priv = editor->priv;
-
-	switch (response) {
-	case GTK_RESPONSE_OK:
-		commit_all_fields (editor);
-		
-		if (e_cal_component_is_instance (priv->comp))
-			if (!recur_component_dialog (priv->client, priv->comp, &priv->mod, GTK_WINDOW (editor)))
-				return;
-	
-		if (save_comp_with_send (editor)) {
-	
-			e_cal_component_get_summary (priv->comp, &text);
-		
-			if (!text.value) {
-				if (!send_component_prompt_subject ((GtkWindow *) editor, priv->client, priv->comp))
-					return;
-			}
-			close_dialog (editor);
-		}
-
-		break;
-	case GTK_RESPONSE_HELP:
-		comp_editor_show_help (editor);
-
-		break;
-	case GTK_RESPONSE_CANCEL:
-		commit_all_fields (editor);
-		
-		if (prompt_to_save_changes (editor, TRUE))
-			close_dialog (editor);
-		break;
-	default:
-		/* We handle delete event below */
-		break;
-	}
-}
-
-static int
-delete_event_cb (GtkWidget *widget, GdkEvent *event, gpointer data)
-{
-	CompEditor *editor = COMP_EDITOR (data);
-	CompEditorPrivate *priv;
-	ECalComponentText text;
-	
-	priv = editor->priv;
-
-	commit_all_fields (editor);
-	
-	if (prompt_to_save_changes (editor, TRUE))
-		close_dialog (editor);
-
-	return TRUE;
-}
-
-static void
-attachment_bar_changed_cb (CalAttachmentBar *bar,
-			   void *data)
-{
-	CompEditor *editor = COMP_EDITOR (data);
-	
-	guint attachment_num = cal_attachment_bar_get_num_attachments (
-		CAL_ATTACHMENT_BAR (editor->priv->attachment_bar));
-	if (attachment_num) {
-		gchar *num_text = g_strdup_printf (
-			ngettext ("<b>%d</b> File Attached", "<b>%d</b> Files Attached", attachment_num),
-			attachment_num);
-		gtk_label_set_markup (GTK_LABEL (editor->priv->attachment_expander_num),
-				      num_text);
-		g_free (num_text);
-
-		gtk_widget_show (editor->priv->attachment_expander_icon);
-		
-	} else {
-		gtk_label_set_text (GTK_LABEL (editor->priv->attachment_expander_num), "");
-		gtk_widget_hide (editor->priv->attachment_expander_icon);
-	}
-	
-	
-	/* Mark the editor as changed so it prompts about unsaved
-           changes on close */
-	comp_editor_set_changed (editor, TRUE);
-
-}
-
-static	gboolean 
-attachment_bar_icon_clicked_cb (CalAttachmentBar *bar, GdkEvent *event, void *data)
-{
-	GnomeIconList *icon_list;
-	GList *p;
-	int num;
-	char *attach_file_url;
-	GError *error = NULL;
-	
-	if (E_IS_CAL_ATTACHMENT_BAR (bar) && event->type == GDK_2BUTTON_PRESS) {
-		icon_list = GNOME_ICON_LIST (bar);
-		p = gnome_icon_list_get_selection (icon_list);
-		if (p) {
-			num = GPOINTER_TO_INT (p->data);
-			attach_file_url = cal_attachment_bar_get_nth_attachment_filename (bar, num);	
-			/* launch the url now */
-			/* TODO should send GError and handle error conditions
-			 * here */
-			gnome_url_show (attach_file_url, &error);
-			if (error)
-				g_message ("DEBUG: Launch failed :(\n");
-			g_free (attach_file_url); }
-		return TRUE;
-	} else 
-		return FALSE;
-}
-
-static void
-attachment_expander_activate_cb (EExpander *expander,
-				 void *data)
-{
-	CompEditor *editor = COMP_EDITOR (data);
-	gboolean show = e_expander_get_expanded (expander);
-	
-	/* Update the expander label */
-	if (show)
-		gtk_label_set_text_with_mnemonic (GTK_LABEL (editor->priv->attachment_expander_label),
-						  _("Hide _Attachment Bar (drop attachments here)"));
-	else
-		gtk_label_set_text_with_mnemonic (GTK_LABEL (editor->priv->attachment_expander_label),
-						  _("Show _Attachment Bar (drop attachments here)"));
-
-}
-
-/* Creates the basic in the editor */
-static void
-setup_widgets (CompEditor *editor)
-{
-	CompEditorPrivate *priv;
-	GtkWidget *expander_hbox, *vbox;
-	GdkPixbuf *attachment_pixbuf;
-
-	priv = editor->priv;
-
-	/* Useful vbox */
-	vbox = gtk_vbox_new (FALSE, 12);
-	gtk_container_set_border_width (GTK_CONTAINER (vbox), 12);
-	gtk_box_pack_start (GTK_BOX (GTK_DIALOG (editor)->vbox), vbox, TRUE, TRUE, 0);
-	gtk_widget_show (vbox);
-
-	/* Notebook */
-	priv->notebook = GTK_NOTEBOOK (gtk_notebook_new ());
-	gtk_widget_show (GTK_WIDGET (priv->notebook));
-	gtk_box_pack_start (GTK_BOX (vbox), GTK_WIDGET (priv->notebook),
-			    TRUE, TRUE, 0);
-
-	/* Buttons */
-	gtk_dialog_add_button  (GTK_DIALOG (editor), GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL);
-	gtk_dialog_add_button  (GTK_DIALOG (editor), GTK_STOCK_OK, GTK_RESPONSE_OK);
-	gtk_dialog_add_button  (GTK_DIALOG (editor), GTK_STOCK_HELP, GTK_RESPONSE_HELP);
-	gtk_dialog_set_response_sensitive (GTK_DIALOG (editor), GTK_RESPONSE_OK, FALSE);
-
-	g_signal_connect (editor, "response", G_CALLBACK (response_cb), editor);
-	g_signal_connect (editor, "delete_event", G_CALLBACK (delete_event_cb), editor);
-
-	/*Attachments */
-	priv->attachment_scrolled_window = gtk_scrolled_window_new (NULL, NULL);
-	gtk_scrolled_window_set_shadow_type (GTK_SCROLLED_WINDOW (priv->attachment_scrolled_window),
-					     GTK_SHADOW_IN);
-	gtk_scrolled_window_set_policy (GTK_SCROLLED_WINDOW (priv->attachment_scrolled_window),
-					GTK_POLICY_AUTOMATIC, GTK_POLICY_AUTOMATIC);
-	
-	priv->attachment_bar = cal_attachment_bar_new (NULL);
-	GTK_WIDGET_SET_FLAGS (priv->attachment_bar, GTK_CAN_FOCUS);
-	gtk_container_add (GTK_CONTAINER (priv->attachment_scrolled_window),
-			   priv->attachment_bar);
-	gtk_widget_show (priv->attachment_bar);
-	g_signal_connect (priv->attachment_bar, "changed",
-			  G_CALLBACK (attachment_bar_changed_cb), editor);
-	g_signal_connect (GNOME_ICON_LIST (priv->attachment_bar), "event",
-			  G_CALLBACK (attachment_bar_icon_clicked_cb), NULL);			
-	priv->attachment_expander_label =
-		gtk_label_new_with_mnemonic (_("Show _Attachment Bar (drop attachments here)"));
-	priv->attachment_expander_num = gtk_label_new ("");
-	gtk_label_set_use_markup (GTK_LABEL (priv->attachment_expander_num), TRUE);
-	gtk_misc_set_alignment (GTK_MISC (priv->attachment_expander_label), 0.0, 0.5);
-	gtk_misc_set_alignment (GTK_MISC (priv->attachment_expander_num), 1.0, 0.5);
-	expander_hbox = gtk_hbox_new (FALSE, 0);
-	
-	attachment_pixbuf = e_icon_factory_get_icon ("stock_attach", E_ICON_SIZE_MENU);
-	priv->attachment_expander_icon = gtk_image_new_from_pixbuf (attachment_pixbuf);
-	gtk_misc_set_alignment (GTK_MISC (priv->attachment_expander_icon), 1, 0.5);
-	gtk_widget_set_size_request (priv->attachment_expander_icon, 100, -1);
-	g_object_unref (attachment_pixbuf);	
-
-	gtk_box_pack_start (GTK_BOX (expander_hbox), priv->attachment_expander_label,
-			    TRUE, TRUE, 0);
-	gtk_box_pack_start (GTK_BOX (expander_hbox), priv->attachment_expander_icon,
-			    TRUE, TRUE, 0);
-	gtk_box_pack_start (GTK_BOX (expander_hbox), priv->attachment_expander_num,
-			    TRUE, TRUE, 0);
-	gtk_widget_show_all (expander_hbox);
-	gtk_widget_hide (priv->attachment_expander_icon);
-
-	priv->attachment_expander = e_expander_new ("");	
-	e_expander_set_label_widget (E_EXPANDER (priv->attachment_expander), expander_hbox);
-	atk_object_set_name (gtk_widget_get_accessible (priv->attachment_expander), _("Attachment Button: Press space key to toggle attachment bar"));
-	
-	gtk_container_add (GTK_CONTAINER (priv->attachment_expander),
-			   priv->attachment_scrolled_window);
-	gtk_box_pack_start (GTK_BOX (vbox), priv->attachment_expander,
-			    FALSE, FALSE, GNOME_PAD_SMALL);
-	gtk_widget_show (priv->attachment_expander);
-	e_expander_set_expanded (E_EXPANDER (priv->attachment_expander), FALSE);
-	g_signal_connect_after (priv->attachment_expander, "activate",
-				G_CALLBACK (attachment_expander_activate_cb), editor);
-
-	
-}
-
-/* Object initialization function for the calendar component editor */
-static void
-comp_editor_init (CompEditor *editor)
-{
-	CompEditorPrivate *priv;
-
-	priv = g_new0 (CompEditorPrivate, 1);
-	editor->priv = priv;
-
-	setup_widgets (editor);
-
-	priv->pages = NULL;
-	priv->changed = FALSE;
-	priv->needs_send = FALSE;
-	priv->mod = CALOBJ_MOD_ALL;
- 	priv->existing_org = FALSE;
- 	priv->user_org = FALSE;
- 	priv->warned = FALSE;
-	priv->is_group_item = FALSE;
-	priv->help_section = g_strdup ("usage-calendar");
-
-	/* DND support */
-	gtk_drag_dest_set (GTK_WIDGET (editor), GTK_DEST_DEFAULT_ALL,  drop_types, num_drop_types, GDK_ACTION_COPY|GDK_ACTION_ASK|GDK_ACTION_MOVE);
-	g_signal_connect(editor, "drag_data_received", G_CALLBACK (drag_data_received), NULL);
-	g_signal_connect(editor, "drag-motion", G_CALLBACK(drag_motion), editor);
-
-	gtk_window_set_type_hint (GTK_WINDOW (editor), GDK_WINDOW_TYPE_HINT_NORMAL);
-	gtk_dialog_set_has_separator (GTK_DIALOG (editor), FALSE);
-
-	gtk_widget_ensure_style (GTK_WIDGET (editor));
-	gtk_container_set_border_width (GTK_CONTAINER (GTK_DIALOG (editor)->vbox), 0);
-	gtk_container_set_border_width (GTK_CONTAINER (GTK_DIALOG (editor)->action_area), 12);
-}
-
-
-static gint
-comp_editor_key_press_event (GtkWidget *d, GdkEventKey *e)
-{
-#if 0
-	if (e->keyval == GDK_Escape) {
-		if (prompt_to_save_changes (COMP_EDITOR (d), TRUE))
-			close_dialog (COMP_EDITOR (d));
-		return TRUE;
-	}
-#endif
-
-	if (GTK_WIDGET_CLASS (comp_editor_parent_class)->key_press_event)
-		return (* GTK_WIDGET_CLASS (comp_editor_parent_class)->key_press_event) (d, e);
-
-	return FALSE;
-}
-
-/* Destroy handler for the calendar component editor */
-static void
-comp_editor_finalize (GObject *object)
-{
-	CompEditor *editor;
-	CompEditorPrivate *priv;
-	GList *l;
-
-	editor = COMP_EDITOR (object);
-	priv = editor->priv;
-
-	g_free (priv->help_section);
-
-	if (priv->client) {
-		g_object_unref (priv->client);
-		priv->client = NULL;
-	}
-	
-	if (priv->source_client) {
-		g_object_unref (priv->source_client);
-		priv->source_client = NULL;
-	}
-
-	if (priv->view) {
-		g_signal_handlers_disconnect_matched (G_OBJECT (priv->view),
-						      G_SIGNAL_MATCH_DATA,
-						      0, 0, NULL, NULL,
-						      editor);
-
-		g_object_unref (priv->view);
-		priv->view = NULL;
-	}
-
-	/* We want to destroy the pages after the widgets get destroyed,
-	   since they have lots of signal handlers connected to the widgets
-	   with the pages as the data. */
-	for (l = priv->pages; l != NULL; l = l->next)
-		g_object_unref (l->data);
-
-	if (priv->comp) {
-		g_object_unref (priv->comp);
-		priv->comp = NULL;
-	}
-
-	g_free (priv);
-	editor->priv = NULL;
-
-	if (G_OBJECT_CLASS (comp_editor_parent_class)->finalize)
-		(* G_OBJECT_CLASS (comp_editor_parent_class)->finalize) (object);
-}
-
-static void
-comp_editor_show_help (CompEditor *editor)
-{
-	GError *error = NULL;
-	CompEditorPrivate *priv;
-
-	priv = editor->priv;
-
-	gnome_help_display_desktop (NULL,
-				    "evolution-" BASE_VERSION,
-				    "evolution-" BASE_VERSION ".xml",
-				    priv->help_section,
-				    &error);
-	if (error != NULL)
-		g_warning ("%s", error->message);
-}
-
-
-static void
-delete_comp (CompEditor *editor)
-{
-	CompEditorPrivate *priv;
-	const char *uid;
-
-	priv = editor->priv;
-
-	e_cal_component_get_uid (priv->comp, &uid);
-	e_cal_remove_object (priv->client, uid, NULL);
-	close_dialog (editor);
-}
-
-/* Closes the dialog box and emits the appropriate signals */
-static void
-close_dialog (CompEditor *editor)
-{
-	CompEditorPrivate *priv;
-
-	priv = editor->priv;
-
-	/* FIXME Unfortunately we do this here because otherwise corba
-	   calls happen during destruction and we might get a change
-	   notification back when we are in an inconsistent state */
-	if (priv->view)
-		g_signal_handlers_disconnect_matched (G_OBJECT (priv->view),
-						      G_SIGNAL_MATCH_DATA, 0, 0, NULL, NULL, editor); 
-	
-	gtk_widget_destroy (GTK_WIDGET (editor));
-}
-
-
-
-void
-comp_editor_set_existing_org (CompEditor *editor, gboolean existing_org)
-{
-	CompEditorPrivate *priv;
-
-	g_return_if_fail (editor != NULL);
-	g_return_if_fail (IS_COMP_EDITOR (editor));
-
-	priv = editor->priv;
-
-	priv->existing_org = existing_org;
-}
-
-gboolean
-comp_editor_get_existing_org (CompEditor *editor)
-{
-	CompEditorPrivate *priv;
-
-	g_return_val_if_fail (editor != NULL, FALSE);
-	g_return_val_if_fail (IS_COMP_EDITOR (editor), FALSE);
-
-	priv = editor->priv;
-
-	return priv->existing_org;
-}
-
-void
-comp_editor_set_user_org (CompEditor *editor, gboolean user_org)
-{
-	CompEditorPrivate *priv;
-
-	g_return_if_fail (editor != NULL);
-	g_return_if_fail (IS_COMP_EDITOR (editor));
-
-	priv = editor->priv;
-
-	priv->user_org = user_org;
-}
-
-gboolean
-comp_editor_get_user_org (CompEditor *editor)
-{
-	CompEditorPrivate *priv;
-
-	g_return_val_if_fail (editor != NULL, FALSE);
-	g_return_val_if_fail (IS_COMP_EDITOR (editor), FALSE);
-
-	priv = editor->priv;
-
-	return priv->user_org;
-}
-
-void
-comp_editor_set_group_item (CompEditor *editor, gboolean group_item)
-{
-	CompEditorPrivate *priv;
-
-	g_return_if_fail (editor != NULL);
-	g_return_if_fail (IS_COMP_EDITOR (editor));
-
-	priv = editor->priv;
-
-	priv->is_group_item = group_item;
-}
-
-gboolean
-comp_editor_get_group_item (CompEditor *editor)
-{
-	CompEditorPrivate *priv;
-
-	g_return_val_if_fail (editor != NULL, FALSE);
-	g_return_val_if_fail (IS_COMP_EDITOR (editor), FALSE);
-
-	priv = editor->priv;
-
-	return priv->is_group_item;
-}
-
-/**
- * comp_editor_set_changed:
- * @editor: A component editor
- * @changed: Value to set the changed state to
- *
- * Set the dialog changed state to the given value
- **/
-void
-comp_editor_set_changed (CompEditor *editor, gboolean changed)
-{
-	CompEditorPrivate *priv;
-
-	priv = editor->priv;
-
-	priv->changed = changed;
-
-	gtk_dialog_set_response_sensitive (GTK_DIALOG (editor), GTK_RESPONSE_OK, changed);
-	gtk_dialog_set_default_response (GTK_DIALOG (editor), GTK_RESPONSE_OK);
-}
-
-/**
- * comp_editor_get_changed:
- * @editor: A component editor
- *
- * Gets the changed state of the dialog
- *
- * Return value: A boolean indicating if the dialog is in a changed
- * state
- **/
-gboolean
-comp_editor_get_changed (CompEditor *editor)
-{
-	CompEditorPrivate *priv;
-
-	priv = editor->priv;
-
-	return priv->changed;
-}
-
-/**
- * comp_editor_set_needs_send:
- * @editor: A component editor
- * @needs_send: Value to set the needs send state to
- *
- * Set the dialog needs send state to the given value
- **/
-void
-comp_editor_set_needs_send (CompEditor *editor, gboolean needs_send)
-{
-	CompEditorPrivate *priv;
-
-	priv = editor->priv;
-
-	priv->needs_send = needs_send;
-}
-
-/**
- * comp_editor_get_needs_send:
- * @editor: A component editor
- *
- * Gets the needs send state of the dialog
- *
- * Return value: A boolean indicating if the dialog is in a needs send
- * state
- **/
-gboolean
-comp_editor_get_needs_send (CompEditor *editor)
-{
-	CompEditorPrivate *priv;
-
-	priv = editor->priv;
-
-	return priv->needs_send;
-}
-
-static void page_mapped_cb (GtkWidget *page_widget,
-			    CompEditorPage *page)
-{
-	GtkWidget *toplevel;
-
-	toplevel = gtk_widget_get_toplevel (page_widget);
-	if (!GTK_IS_WINDOW (toplevel))
-		return;
-
-	if (page->accel_group) {
-		gtk_window_add_accel_group (GTK_WINDOW (toplevel),
-					    page->accel_group);
-	}
-}
-
-static void page_unmapped_cb (GtkWidget *page_widget,
-			      CompEditorPage *page)
-{
-	GtkWidget *toplevel;
-
-	toplevel = gtk_widget_get_toplevel (page_widget);
-	if (!GTK_IS_WINDOW (toplevel))
-		return;
-
-	if (page->accel_group) {
-		gtk_window_remove_accel_group (GTK_WINDOW (toplevel),
-					       page->accel_group);
-	}
-}
-
-/**
- * comp_editor_append_page:
- * @editor: A component editor
- * @page: A component editor page
- * @label: Label of the page
- *
- * Appends a page to the editor notebook with the given label
- **/
-void
-comp_editor_append_page (CompEditor *editor,
-			 CompEditorPage *page,
-			 const char *label)
-{
-	CompEditorPrivate *priv;
-	GtkWidget *page_widget;
-	GtkWidget *label_widget;
-	gboolean is_first_page;
-
-	g_return_if_fail (editor != NULL);
-	g_return_if_fail (IS_COMP_EDITOR (editor));
-	g_return_if_fail (page != NULL);
-	g_return_if_fail (IS_COMP_EDITOR_PAGE (page));
-	g_return_if_fail (label != NULL);
-
-	priv = editor->priv;
-
-	g_object_ref (page);
-
-	/* If we are editing something, fill the widgets with current info */
-	if (priv->comp != NULL) {
-		ECalComponent *comp;
-
-		comp = comp_editor_get_current_comp (editor);
-		comp_editor_page_fill_widgets (page, comp);
-		g_object_unref (comp);
-	}
-
-	page_widget = comp_editor_page_get_widget (page);
-	g_assert (page_widget != NULL);
-
-	label_widget = gtk_label_new (label);
-
-	is_first_page = (priv->pages == NULL);
-
-	priv->pages = g_list_append (priv->pages, page);
-	gtk_notebook_append_page (priv->notebook, page_widget, label_widget);
-
-	/* Listen for things happening on the page */
-	g_signal_connect(page, "changed",
-			    G_CALLBACK (page_changed_cb), editor);
-	g_signal_connect(page, "needs_send",
-			    G_CALLBACK (needs_send_cb), editor);
-	g_signal_connect(page, "summary_changed",
-			    G_CALLBACK (page_summary_changed_cb), editor);
-	g_signal_connect(page, "dates_changed",
-			    G_CALLBACK (page_dates_changed_cb), editor);
-
-	/* Listen for when the page is mapped/unmapped so we can
-	   install/uninstall the appropriate GtkAccelGroup. */
-	g_signal_connect((page_widget), "map",
-			    G_CALLBACK (page_mapped_cb), page);
-	g_signal_connect((page_widget), "unmap",
-			    G_CALLBACK (page_unmapped_cb), page);
-
-	/* The first page is the main page of the editor, so we ask it to focus
-	 * its main widget.
-	 */
-	if (is_first_page)
-		comp_editor_page_focus_main_widget (page);
-}
-
-/**
- * comp_editor_remove_page:
- * @editor: A component editor
- * @page: A component editor page
- *
- * Removes the page from the component editor
- **/
-void
-comp_editor_remove_page (CompEditor *editor, CompEditorPage *page)
-{
-	CompEditorPrivate *priv;
-	GtkWidget *page_widget;
-	gint page_num;
-
-	g_return_if_fail (editor != NULL);
-	g_return_if_fail (IS_COMP_EDITOR (editor));
-	g_return_if_fail (page != NULL);
-	g_return_if_fail (IS_COMP_EDITOR_PAGE (page));
-
-	priv = editor->priv;
-
-	page_widget = comp_editor_page_get_widget (page);
-	page_num = gtk_notebook_page_num (priv->notebook, page_widget);
-	if (page_num == -1)
-		return;
-	
-	/* Disconnect all the signals added in append_page(). */
-	g_signal_handlers_disconnect_matched (page, G_SIGNAL_MATCH_DATA, 0, 0, NULL, NULL, editor);
-	g_signal_handlers_disconnect_matched (page_widget, G_SIGNAL_MATCH_DATA, 0, 0, NULL, NULL, page);
-
-	gtk_notebook_remove_page (priv->notebook, page_num);
-
-	priv->pages = g_list_remove (priv->pages, page);
-	g_object_unref (page);
-}
-
-/**
- * comp_editor_show_page:
- * @editor:
- * @page:
- *
- *
- **/
-void
-comp_editor_show_page (CompEditor *editor, CompEditorPage *page)
-{
-	CompEditorPrivate *priv;
-	GtkWidget *page_widget;
-	gint page_num;
-
-	g_return_if_fail (editor != NULL);
-	g_return_if_fail (IS_COMP_EDITOR (editor));
-	g_return_if_fail (page != NULL);
-	g_return_if_fail (IS_COMP_EDITOR_PAGE (page));
-
-	priv = editor->priv;
-
-	page_widget = comp_editor_page_get_widget (page);
-	page_num = gtk_notebook_page_num (priv->notebook, page_widget);
-	gtk_notebook_set_page (priv->notebook, page_num);
-}
-
-/**
- * comp_editor_set_e_cal:
- * @editor: A component editor
- * @client: The calendar client to use
- *
- * Sets the calendar client used by the editor to update components
- **/
-void
-comp_editor_set_e_cal (CompEditor *editor, ECal *client)
-{
-	CompEditorClass *klass;
-
-	g_return_if_fail (editor != NULL);
-	g_return_if_fail (IS_COMP_EDITOR (editor));
-
-	klass = COMP_EDITOR_CLASS (G_OBJECT_GET_CLASS (editor));
-
-	if (klass->set_e_cal)
-		klass->set_e_cal (editor, client);
-}
-
-/**
- * comp_editor_get_e_cal:
- * @editor: A component editor
- *
- * Returns the calendar client of the editor
- *
- * Return value: The calendar client of the editor
- **/
-ECal *
-comp_editor_get_e_cal (CompEditor *editor)
-{
-	CompEditorPrivate *priv;
-
-	g_return_val_if_fail (editor != NULL, NULL);
-	g_return_val_if_fail (IS_COMP_EDITOR (editor), NULL);
-
-	priv = editor->priv;
-
-	return priv->client;
-}
-
-void
-comp_editor_set_help_section (CompEditor *editor, const char *section)
-{
-	CompEditorPrivate *priv;
-
-	priv = editor->priv;
-
-	g_free (priv->help_section);
-	priv->help_section = g_strdup (section);
-}
-
-/* Creates an appropriate title for the event editor dialog */
-static char *
-make_title_from_comp (ECalComponent *comp, gboolean is_group_item)
-{
-	char *title;
-	const char *type_string;
-	ECalComponentVType type;
-	ECalComponentText text;
-
-	if (!comp)
-		return g_strdup (_("Edit Appointment"));
-
-	type = e_cal_component_get_vtype (comp);
-	switch (type) {
-	case E_CAL_COMPONENT_EVENT:
-		if (is_group_item)
-			type_string = _("Meeting - %s");
-		else
-			type_string = _("Appointment - %s");
-		break;
-	case E_CAL_COMPONENT_TODO:
-		if (is_group_item)
-			type_string = _("Assigned Task - %s");
-		else
-			type_string = _("Task - %s");
-		break;
-	case E_CAL_COMPONENT_JOURNAL:
-		type_string = _("Journal entry - %s");
-		break;
-	default:
-		g_message ("make_title_from_comp(): Cannot handle object of type %d", type);
-		return NULL;
-	}
-
-	e_cal_component_get_summary (comp, &text);
-	if (text.value) {
-		title = g_strdup_printf (type_string, text.value);
-	} else {
-		title = g_strdup_printf (type_string, _("No summary"));
-	}
-
-	return title;
-}
-
-/* Creates an appropriate title for the event editor dialog */
-static char *
-make_title_from_string (ECalComponent *comp, const char *str, gboolean is_group_item)
-{
-	char *title;
-	const char *type_string;
-	ECalComponentVType type;
-
-	if (!comp)
-		return g_strdup (_("Edit Appointment"));
-
-	type = e_cal_component_get_vtype (comp);
-	switch (type) {
-	case E_CAL_COMPONENT_EVENT:
-		if (is_group_item)
-			type_string = _("Meeting - %s");
-		else
-			type_string = _("Appointment - %s");
-		break;
-	case E_CAL_COMPONENT_TODO:
-		if (is_group_item)
-			type_string = _("Assigned Task - %s");	
-		else
-			type_string = _("Task - %s");
-		break;
-	case E_CAL_COMPONENT_JOURNAL:
-		type_string = _("Journal entry - %s");
-		break;
-	default:
-		g_message ("make_title_from_string(): Cannot handle object of type %d", type);
-		return NULL;
-	}
-
-	if (str) {
-		title = g_strdup_printf (type_string, str);
-	} else {
-		title = g_strdup_printf (type_string, _("No summary"));
-	}
-
-	return title;
-}
-
-static const char *
-make_icon_from_comp (ECalComponent *comp)
-{
-	ECalComponentVType type;
-
-	if (!comp)
-		return "stock_calendar";
-
-	type = e_cal_component_get_vtype (comp);
-	switch (type) {
-	case E_CAL_COMPONENT_EVENT:
-		return "stock_new-appointment";
-		break;
-	case E_CAL_COMPONENT_TODO:
-		return "stock_task";
-		break;
-	default:
-		return "stock_calendar";
-	}
-}
-
-/* Sets the event editor's window title from a calendar component */
-static void
-set_title_from_comp (CompEditor *editor)
-{
-	CompEditorPrivate *priv;
-	char *title;
-
-	priv = editor->priv;
-	title = make_title_from_comp (priv->comp, priv->is_group_item);
-	gtk_window_set_title (GTK_WINDOW (editor), title);
-	g_free (title);
-}
-
-static void
-set_title_from_string (CompEditor *editor, const char *str)
-{
-	CompEditorPrivate *priv;
-	char *title;
-
-	priv = editor->priv;
-	title = make_title_from_string (priv->comp, str, priv->is_group_item);
-	gtk_window_set_title (GTK_WINDOW (editor), title);
-	g_free (title);
-}
-
-static void
-set_icon_from_comp (CompEditor *editor)
-{
-	CompEditorPrivate *priv;
-	const char *icon_name;
-	GList *icon_list;
-
-	priv = editor->priv;
-	icon_name = make_icon_from_comp (priv->comp);
-
-	icon_list = e_icon_factory_get_icon_list (icon_name);
-	if (icon_list) {
-		gtk_window_set_icon_list (GTK_WINDOW (editor), icon_list);
-		g_list_foreach (icon_list, (GFunc) g_object_unref, NULL);
-		g_list_free (icon_list);
-	}
-}
-
-static void
-fill_widgets (CompEditor *editor)
-{
-	CompEditorPrivate *priv;
-	GList *l;
-
-	priv = editor->priv;
-
-	/*Check if attachments are available here and set them*/
-	if (e_cal_component_has_attachments (priv->comp)) {
-		GSList *attachment_list = NULL;
-		e_cal_component_get_attachment_list (priv->comp, &attachment_list);
-		cal_attachment_bar_set_attachment_list
-			((CalAttachmentBar *)priv->attachment_bar, attachment_list);
-		e_expander_set_expanded (E_EXPANDER (priv->attachment_expander), TRUE);
-	}	
-
-	for (l = priv->pages; l != NULL; l = l->next)
-		comp_editor_page_fill_widgets (l->data, priv->comp);
-}
-
-static void
-real_set_e_cal (CompEditor *editor, ECal *client)
-{
-	CompEditorPrivate *priv;
-	GList *elem;
-
-	g_return_if_fail (editor != NULL);
-	g_return_if_fail (IS_COMP_EDITOR (editor));
-
-	priv = editor->priv;
-
-	if (client == priv->client)
-		return;
-
-	if (client) {
-		g_return_if_fail (E_IS_CAL (client));
-		g_return_if_fail (e_cal_get_load_state (client) ==
-				  E_CAL_LOAD_LOADED);
-		g_object_ref (client);
-	}
-
-	if (priv->client)
-		g_object_unref (priv->client);
-
-	priv->client = client;
-	if (!priv->source_client)
-		priv->source_client = g_object_ref (client);
-
-	/* Pass the client to any pages that need it. */
-	for (elem = priv->pages; elem; elem = elem->next)
-		comp_editor_page_set_e_cal (elem->data, client);
-}
-
-static void
-real_edit_comp (CompEditor *editor, ECalComponent *comp)
-{
-	CompEditorPrivate *priv;
-	const char *uid;
-	
-	g_return_if_fail (editor != NULL);
-	g_return_if_fail (IS_COMP_EDITOR (editor));
-
-	priv = editor->priv;
-
-	if (priv->comp) {
-		g_object_unref (priv->comp);
-		priv->comp = NULL;
-	}
-
-	if (comp)
-		priv->comp = e_cal_component_clone (comp);
-	
- 	priv->existing_org = e_cal_component_has_organizer (comp);
- 	priv->user_org = itip_organizer_is_user (comp, priv->client);
- 	priv->warned = FALSE;
- 		
-	set_title_from_comp (editor);
-	set_icon_from_comp (editor);
-	e_cal_component_get_uid (comp, &uid);
-	cal_attachment_bar_set_local_attachment_store ((CalAttachmentBar *) priv->attachment_bar, 
-			e_cal_get_local_attachment_store (priv->client)); 
-	cal_attachment_bar_set_comp_uid (priv->attachment_bar, g_strdup	(uid));
-
-	fill_widgets (editor);
-
-	priv->changed =FALSE;
-
-	listen_for_changes (editor);
-}
-
-
-static gboolean
-real_send_comp (CompEditor *editor, ECalComponentItipMethod method)
-{
-	CompEditorPrivate *priv;
-	ECalComponent *tmp_comp;
-	
-	g_return_val_if_fail (editor != NULL, FALSE);
-	g_return_val_if_fail (IS_COMP_EDITOR (editor), FALSE);
-
-	priv = editor->priv;
-
-	if (!e_cal_component_has_attachments (priv->comp)) {
-		if (itip_send_comp (method, priv->comp, priv->client,
-					NULL, NULL)) {
-			tmp_comp = priv->comp;
-			g_object_ref (tmp_comp);
-			comp_editor_edit_comp (editor, tmp_comp);
-			g_object_unref (tmp_comp);
-			
-			comp_editor_set_changed (editor, TRUE);
-			save_comp (editor);
-
-			return TRUE;
-		}
-
-	} else {
-		/* Clone the component with attachments set to CID:...  */
-		ECalComponent *send_comp;
-		int num_attachments, i;
-		GSList *attach_list = NULL;
-		GSList *mime_attach_list;
-			
-		send_comp = e_cal_component_clone (priv->comp);
-		num_attachments = e_cal_component_get_num_attachments (send_comp);
-
-		for (i = 0; i < num_attachments ; i++) {
-			attach_list = g_slist_append (attach_list, g_strdup ("CID:..."));
-		}
-		e_cal_component_set_attachment_list (send_comp, attach_list);
-
-		/* mime_attach_list is freed by itip_send_comp */
-		mime_attach_list = comp_editor_get_mime_attach_list (editor);
-		if (itip_send_comp (method, send_comp, priv->client,
-					NULL, mime_attach_list)) {
-			tmp_comp = priv->comp;
-			g_object_ref (tmp_comp);
-			comp_editor_edit_comp (editor, tmp_comp);
-			g_object_unref (tmp_comp);
-			
-			comp_editor_set_changed (editor, TRUE);
-			save_comp (editor);
-			g_object_unref (send_comp);
-			return TRUE;
-		}
-		g_object_unref (send_comp);
-	}
-
-	comp_editor_set_changed (editor, TRUE);
-	
-	return FALSE;	
-
-}
-
-
-/**
- * comp_editor_edit_comp:
- * @editor: A component editor
- * @comp: A calendar component
- *
- * Starts the editor editing the given component
- **/
-void
-comp_editor_edit_comp (CompEditor *editor, ECalComponent *comp)
-{
-	CompEditorClass *klass;
-
-	g_return_if_fail (editor != NULL);
-	g_return_if_fail (IS_COMP_EDITOR (editor));
-	g_return_if_fail (comp != NULL);
-	g_return_if_fail (E_IS_CAL_COMPONENT (comp));
-
-	klass = COMP_EDITOR_CLASS (G_OBJECT_GET_CLASS (editor));
-
-	if (klass->edit_comp)
-		klass->edit_comp (editor, comp);
-}
-
-ECalComponent *
-comp_editor_get_comp (CompEditor *editor)
-{
-	CompEditorPrivate *priv;
-
-	g_return_val_if_fail (editor != NULL, NULL);
-	g_return_val_if_fail (IS_COMP_EDITOR (editor), NULL);
-
-	priv = editor->priv;
-
-	return priv->comp;
-}
-
-ECalComponent *
-comp_editor_get_current_comp (CompEditor *editor)
-{
-	CompEditorPrivate *priv;
-	ECalComponent *comp;
-	GList *l;
-
-	g_return_val_if_fail (editor != NULL, NULL);
-	g_return_val_if_fail (IS_COMP_EDITOR (editor), NULL);
-
-	priv = editor->priv;
-
-	comp = e_cal_component_clone (priv->comp);
-	if (priv->changed) {
-		for (l = priv->pages; l != NULL; l = l->next)
-			comp_editor_page_fill_component (l->data, comp);
-	}
-
-	return comp;
-}
-
-/**
- * comp_editor_save_comp:
- * @editor:
- *
- *
- **/
-gboolean
-comp_editor_save_comp (CompEditor *editor, gboolean send)
-{
-	return prompt_to_save_changes (editor, send);
-}
-
-/**
- * comp_editor_delete_comp:
- * @editor:
- *
- *
- **/
-void
-comp_editor_delete_comp (CompEditor *editor)
-{
-	delete_comp (editor);
-}
-
-/**
- * comp_editor_send_comp:
- * @editor:
- * @method:
- *
- *
- **/
-gboolean
-comp_editor_send_comp (CompEditor *editor, ECalComponentItipMethod method)
-{
-	CompEditorClass *klass;
-
-	g_return_val_if_fail (editor != NULL, FALSE);
-	g_return_val_if_fail (IS_COMP_EDITOR (editor), FALSE);
-
-	klass = COMP_EDITOR_CLASS (G_OBJECT_GET_CLASS (editor));
-
-	if (klass->send_comp)
-		return klass->send_comp (editor, method);
-
-	return FALSE;
-}
-
-gboolean
-comp_editor_close (CompEditor *editor)
-{
-	gboolean close;
-	
-	g_return_val_if_fail (editor != NULL, FALSE);
-	g_return_val_if_fail (IS_COMP_EDITOR (editor), FALSE);
-
-	commit_all_fields (editor);
-	
-	close = prompt_to_save_changes (editor, TRUE);
-	if (close)
-		close_dialog (editor);
-
-	return close;
-}
-
-
-/* Utility function to get the mime-attachment list from the attachment
- * bar for sending the comp via itip. The list and its contents must
- * be freed by the caller.
- */
-GSList *
-comp_editor_get_mime_attach_list (CompEditor *editor) 
-{
-	GSList *mime_attach_list;
-
-	mime_attach_list = cal_attachment_bar_get_mime_attach_list
-		((CalAttachmentBar *)editor->priv->attachment_bar);
-
-	return mime_attach_list;
-}
-
-/* Brings attention to a window by raising it and giving it focus */
-static void
-raise_and_focus (GtkWidget *widget)
-{
-	g_assert (GTK_WIDGET_REALIZED (widget));
-	gdk_window_show (widget->window);
-	gtk_widget_grab_focus (widget);
-}
-
-/**
- * comp_editor_focus:
- * @editor: A component editor
- *
- * Brings the editor window to the front and gives it focus
- **/
-void
-comp_editor_focus (CompEditor *editor)
-{
-	CompEditorPrivate *priv;
-
-	g_return_if_fail (editor != NULL);
-	g_return_if_fail (IS_COMP_EDITOR (editor));
-
-	priv = editor->priv;
-
-	gtk_widget_show (GTK_WIDGET (editor));
-	raise_and_focus (GTK_WIDGET (editor));
-}
-
-/**
- * comp_editor_notify_client_changed:
- * @editor: A component editor.
- * 
- * Makes an editor emit the "client_changed" signal.
- **/
-void
-comp_editor_notify_client_changed (CompEditor *editor, ECal *client)
-{
-	GList *l;
-	CompEditorPrivate *priv;
-	gboolean read_only;
-
-	g_return_if_fail (editor != NULL);
-	g_return_if_fail (IS_COMP_EDITOR (editor));
-
-	priv = editor->priv;
-
-	priv->changed = TRUE;
-	
-	g_object_unref (priv->client);
-	priv->client = client;
-
-	comp_editor_set_e_cal (editor, client);
-	for (l = priv->pages; l != NULL; l = l->next)
-		comp_editor_page_notify_client_changed (COMP_EDITOR_PAGE (l->data), client);
-
-	if (!e_cal_is_read_only (client, &read_only, NULL))
-		read_only = TRUE;
-
-	gtk_dialog_set_response_sensitive (GTK_DIALOG (editor), GTK_RESPONSE_OK, !read_only);
-}
-
-static void
-page_changed_cb (GtkObject *obj, gpointer data)
-{
-	CompEditor *editor = COMP_EDITOR (data);
-	CompEditorPrivate *priv;
-
-	priv = editor->priv;
-
-	comp_editor_set_changed (editor, TRUE);
-
-	if (!priv->warned && priv->existing_org && !priv->user_org) {
-		e_notice (editor, GTK_MESSAGE_INFO,
-			  _("Changes made to this item may be discarded if an update arrives"));
-		priv->warned = TRUE;
-	}
-	
-}
-
-static void
-needs_send_cb (GtkObject *obj, gpointer data)
-{
-	CompEditor *editor = COMP_EDITOR (data);
-	CompEditorPrivate *priv;
-
-	priv = editor->priv;
-
-	comp_editor_set_needs_send (editor, TRUE);
-}
-
-/* Page signal callbacks */
-static void
-page_summary_changed_cb (GtkObject *obj, const char *summary, gpointer data)
-{
-	CompEditor *editor = COMP_EDITOR (data);
-	CompEditorPrivate *priv;
-	GList *l;
-
-	priv = editor->priv;
-
-	for (l = priv->pages; l != NULL; l = l->next)
-		if (obj != l->data)
-			comp_editor_page_set_summary (l->data, summary);
-
-	if (!priv->warned && priv->existing_org && !priv->user_org) {
-		e_notice (editor, GTK_MESSAGE_INFO,
-			  _("Changes made to this item may be discarded if an update arrives"));
-		priv->warned = TRUE;
-	}
-
-	set_title_from_string (editor, summary);
-}
-
-static void
-page_dates_changed_cb (GtkObject *obj,
-		       CompEditorPageDates *dates,
-		       gpointer data)
-{
-	CompEditor *editor = COMP_EDITOR (data);
-	CompEditorPrivate *priv;
-	GList *l;
-
-	priv = editor->priv;
-
-	for (l = priv->pages; l != NULL; l = l->next)
-		if (obj != l->data)
-			comp_editor_page_set_dates (l->data, dates);
-
-	if (!priv->warned && priv->existing_org && !priv->user_org) {
-		e_notice (editor, GTK_MESSAGE_INFO,
-			  _("Changes made to this item may be discarded if an update arrives"));
-		priv->warned = TRUE;
-	}
-}
-
-static void
-obj_modified_cb (ECal *client, GList *objects, gpointer data)
-{
-	CompEditor *editor = COMP_EDITOR (data);
-	CompEditorPrivate *priv;
-	ECalComponent *comp = NULL;
-
-	priv = editor->priv;
-
-	/* We queried based on a specific UID so we definitely changed */
-	if (changed_component_dialog ((GtkWindow *) editor, priv->comp, FALSE, priv->changed)) {
-		icalcomponent *icalcomp = icalcomponent_new_clone (objects->data);
-
-		comp = e_cal_component_new ();
-		if (e_cal_component_set_icalcomponent (comp, icalcomp)) {
-			comp_editor_edit_comp (editor, comp);
-		} else {
-			GtkWidget *dlg;
-			
-			dlg = gnome_error_dialog (_("Unable to use current version!"));
-			gnome_dialog_run_and_close (GNOME_DIALOG (dlg));
-			icalcomponent_free (icalcomp);
-		}
-
-		g_object_unref (comp);
-	}
-}
-
-static void
-obj_removed_cb (ECal *client, GList *uids, gpointer data)
-{
-	CompEditor *editor = COMP_EDITOR (data);
-	CompEditorPrivate *priv;
-
-	priv = editor->priv;
-
-	if (changed_component_dialog ((GtkWindow *) editor, priv->comp, TRUE, priv->changed))
-		close_dialog (editor);
-}
-
diff --git a/calendar/gui/dialogs/comp-editor.h b/calendar/gui/dialogs/comp-editor.h
deleted file mode 100644
index 7203b3e722..0000000000
--- a/calendar/gui/dialogs/comp-editor.h
+++ /dev/null
@@ -1,106 +0,0 @@
-/* Evolution calendar - Framework for a calendar component editor dialog
- *
- * Copyright (C) 2001 Ximian, Inc.
- *
- * Author: Federico Mena-Quintero <federico@ximian.com>
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of version 2 of the GNU General Public
- * License as published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307, USA.
- */
-
-#ifndef COMP_EDITOR_H
-#define COMP_EDITOR_H
-
-#include <gtk/gtk.h>
-#include <libecal/e-cal.h>
-#include "../itip-utils.h"
-#include "comp-editor-page.h"
-#include "evolution-shell-component-utils.h"
-#include "cal-attachment-bar.h"
-
-G_BEGIN_DECLS
-
-
-
-#define TYPE_COMP_EDITOR            (comp_editor_get_type ())
-#define COMP_EDITOR(obj)            (G_TYPE_CHECK_INSTANCE_CAST ((obj), TYPE_COMP_EDITOR, CompEditor))
-#define COMP_EDITOR_CLASS(klass)    (G_TYPE_CHECK_CLASS_CAST ((klass), TYPE_COMP_EDITOR, CompEditorClass))
-#define IS_COMP_EDITOR(obj)         (G_TYPE_CHECK_INSTANCE_TYPE ((obj), TYPE_COMP_EDITOR))
-#define IS_COMP_EDITOR_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), TYPE_COMP_EDITOR))
-
-typedef struct _CompEditorPrivate CompEditorPrivate;
-
-typedef struct {
-	GtkDialog object;
-
-	/* Private data */
-	CompEditorPrivate *priv;
-} CompEditor;
-
-typedef struct {
-	GtkDialogClass parent_class;
-
-	/* Virtual functions */
-	void (* set_e_cal) (CompEditor *page, ECal *client);
-	void (* edit_comp) (CompEditor *page, ECalComponent *comp);
-	gboolean (* send_comp) (CompEditor *page, ECalComponentItipMethod method);
-} CompEditorClass;
-
-GtkType       comp_editor_get_type         (void);
-void          comp_editor_set_changed      (CompEditor             *editor,
-					    gboolean                changed);
-gboolean      comp_editor_get_changed      (CompEditor             *editor);
-void          comp_editor_set_needs_send   (CompEditor             *editor,
-					    gboolean                needs_send);
-gboolean      comp_editor_get_needs_send   (CompEditor             *editor);
-void          comp_editor_set_existing_org (CompEditor             *editor,
-					    gboolean                existing_org);
-gboolean      comp_editor_get_existing_org (CompEditor             *editor);
-void          comp_editor_set_user_org     (CompEditor             *editor,
-					    gboolean                user_org);
-gboolean      comp_editor_get_user_org     (CompEditor             *editor);
-void          comp_editor_set_group_item     (CompEditor             *editor,
-					    gboolean                is_group_item);
-gboolean      comp_editor_get_group_item     (CompEditor             *editor);
-void          comp_editor_append_page      (CompEditor             *editor,
-					    CompEditorPage         *page,
-					    const char             *label);
-void          comp_editor_remove_page      (CompEditor             *editor,
-					    CompEditorPage         *page);
-void          comp_editor_show_page        (CompEditor             *editor,
-					    CompEditorPage         *page);
-void          comp_editor_set_e_cal        (CompEditor             *editor,
-					    ECal              *client);
-void          comp_editor_set_help_section (CompEditor             *editor,
-					    const char             *section);
-ECal         *comp_editor_get_e_cal        (CompEditor             *editor);
-void          comp_editor_edit_comp        (CompEditor             *ee,
-					    ECalComponent           *comp);
-ECalComponent *comp_editor_get_comp        (CompEditor             *editor);
-ECalComponent *comp_editor_get_current_comp (CompEditor             *editor);
-gboolean      comp_editor_save_comp        (CompEditor             *editor,
-					    gboolean                send);
-void          comp_editor_delete_comp      (CompEditor             *editor);
-gboolean      comp_editor_send_comp        (CompEditor             *editor,
-					    ECalComponentItipMethod  method);
-GSList        *comp_editor_get_mime_attach_list (CompEditor        *editor); 
-gboolean      comp_editor_close            (CompEditor             *editor);
-void          comp_editor_focus            (CompEditor             *editor);
-
-void          comp_editor_notify_client_changed (CompEditor *editor, ECal *client);
-
-
-
-G_END_DECLS
-
-#endif
diff --git a/calendar/gui/dialogs/copy-source-dialog.c b/calendar/gui/dialogs/copy-source-dialog.c
deleted file mode 100644
index 9fdfee16b2..0000000000
--- a/calendar/gui/dialogs/copy-source-dialog.c
+++ /dev/null
@@ -1,136 +0,0 @@
-/* Evolution calendar - Copy source dialog
- *
- * Copyright (C) 2003 Novell, Inc.
- *
- * Author: Rodrigo Moya <rodrigo@ximian.com>
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of version 2 of the GNU General Public
- * License as published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307, USA.
- */
-
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
-
-#include <gtk/gtkmessagedialog.h>
-#include <bonobo/bonobo-i18n.h>
-#include "copy-source-dialog.h"
-#include "select-source-dialog.h"
-#include "common/authentication.h"
-
-typedef struct {
-	ESource *orig_source;
-	ECalSourceType obj_type;
-	ESource *selected_source;
-} CopySourceDialogData;
-
-static void
-show_error (GtkWindow *parent, const char *msg)
-{
-	GtkWidget *dialog;
-
-	dialog = gtk_message_dialog_new (parent, 0, GTK_MESSAGE_ERROR, GTK_BUTTONS_CLOSE, msg);
-	gtk_dialog_run (GTK_DIALOG (dialog));
-	gtk_widget_destroy (dialog);
-}
-
-static gboolean
-copy_source (CopySourceDialogData *csdd)
-{
-	ECal *source_client, *dest_client;
-	gboolean read_only = TRUE;
-	GList *obj_list = NULL;
-	gboolean result = FALSE;
-
-	if (!csdd->selected_source)
-		return FALSE;
-
-	/* open the source */
-	source_client = auth_new_cal_from_source (csdd->orig_source, csdd->obj_type);
-	if (!e_cal_open (source_client, TRUE, NULL)) {
-		show_error (NULL, _("Could not open source"));
-		g_object_unref (source_client);
-		return FALSE;
-	}
-
-	/* open the destination */
-	dest_client = auth_new_cal_from_source (csdd->selected_source, csdd->obj_type);
-	if (!e_cal_open (dest_client, FALSE, NULL)) {
-		show_error (NULL, _("Could not open destination"));
-		g_object_unref (dest_client);
-		g_object_unref (source_client);
-		return FALSE;
-	}
-
-	/* check if the destination is read only */
-	e_cal_is_read_only (dest_client, &read_only, NULL);
-	if (read_only) {
-		show_error (NULL, _("Destination is read only"));
-	} else {
-		if (e_cal_get_object_list (source_client, "#t", &obj_list, NULL)) {
-			GList *l;
-			const char *uid;
-			icalcomponent *icalcomp;
-
-			for (l = obj_list; l != NULL; l = l->next) {
-				/* FIXME: process recurrences */
-				/* FIXME: process errors */
-				if (e_cal_get_object (dest_client, icalcomponent_get_uid (l->data), NULL,
-						      &icalcomp, NULL)) {
-					e_cal_modify_object (dest_client, l->data, CALOBJ_MOD_ALL, NULL);
-					icalcomponent_free (icalcomp);
-				} else {
-					e_cal_create_object (dest_client, l->data, (char **) &uid, NULL);
-					g_free ((gpointer) uid);
-				}
-			}
-
-			e_cal_free_object_list (obj_list);
-		}
-	}
-
-	/* free memory */
-	g_object_unref (dest_client);
-	g_object_unref (source_client);
-
-	return result;
-}
-
-/**
- * copy_source_dialog
- *
- * Implements the Copy command for sources, allowing the user to select a target
- * source to copy to.
- */
-gboolean
-copy_source_dialog (GtkWindow *parent, ESource *source, ECalSourceType obj_type)
-{
-	CopySourceDialogData csdd;
-	gboolean result = FALSE;
-
-	g_return_val_if_fail (E_IS_SOURCE (source), FALSE);
-
-	csdd.orig_source = source;
-	csdd.selected_source = NULL;
-	csdd.obj_type = obj_type;
-
-	csdd.selected_source = select_source_dialog (parent, obj_type);
-	if (csdd.selected_source) {
-		result = copy_source (&csdd);
-
-		/* free memory */
-		g_object_unref (csdd.selected_source);
-	}
-
-	return result;
-}
diff --git a/calendar/gui/dialogs/copy-source-dialog.h b/calendar/gui/dialogs/copy-source-dialog.h
deleted file mode 100644
index 597b1f25fc..0000000000
--- a/calendar/gui/dialogs/copy-source-dialog.h
+++ /dev/null
@@ -1,31 +0,0 @@
-/* Evolution calendar - Copy source dialog
- *
- * Copyright (C) 2003 Novell, Inc.
- *
- * Author: Rodrigo Moya <rodrigo@ximian.com>
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of version 2 of the GNU General Public
- * License as published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307, USA.
- */
-
-#ifndef COPY_SOURCE_DIALOG_H
-#define COPY_SOURCE_DIALOG_H
-
-#include <gtk/gtkwindow.h>
-#include <libedataserver/e-source.h>
-#include <libecal/e-cal.h>
-#include <libecal/e-cal-util.h>
-
-gboolean copy_source_dialog (GtkWindow *parent, ESource *source, ECalSourceType type);
-
-#endif
diff --git a/calendar/gui/dialogs/delete-comp.c b/calendar/gui/dialogs/delete-comp.c
deleted file mode 100644
index ed60def95e..0000000000
--- a/calendar/gui/dialogs/delete-comp.c
+++ /dev/null
@@ -1,160 +0,0 @@
-/* Evolution calendar - Delete calendar component dialog
- *
- * Copyright (C) 2001 Ximian, Inc.
- *
- * Author: Federico Mena-Quintero <federico@ximian.com>
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of version 2 of the GNU General Public
- * License as published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307, USA.
- */
-
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
-
-#include <glib.h>
-#include <gtk/gtkstock.h>
-#include <gtk/gtkmessagedialog.h>
-#include <libgnome/gnome-i18n.h>
-#include <e-util/e-icon-factory.h>
-#include "widgets/misc/e-error.h"
-#include "../calendar-config.h"
-#include "delete-comp.h"
-
-
-
-/**
- * delete_component_dialog:
- * @comp: A calendar component if a single component is to be deleted, or NULL
- * if more that one component is to be deleted.
- * @consider_as_untitled: If deleting more than one component, this is ignored.
- * Otherwise, whether to consider the component as not having a summary; if
- * FALSE then the component's summary string will be used.
- * @n_comps: Number of components that are to be deleted.
- * @vtype: Type of the components that are to be deleted.  This is ignored
- * if only one component is to be deleted, and the vtype is extracted from
- * the component instead.
- * @widget: A widget to use as a basis for conversion from UTF8 into font
- * encoding.
- * 
- * Pops up a dialog box asking the user whether he wants to delete a number of
- * calendar components.  The dialog will not appear, however, if the
- * configuration option for confirmation is turned off.
- * 
- * Return value: TRUE if the user clicked Yes, FALSE otherwise.  If the
- * configuration option for confirmation is turned off, this function will
- * unconditionally return TRUE.
- **/
-gboolean
-delete_component_dialog (ECalComponent *comp,
-			 gboolean consider_as_untitled,
-			 int n_comps, ECalComponentVType vtype,
-			 GtkWidget *widget)
-{
-	const char *stock_icon, *id;
-	char *arg0 = NULL;
-	int response;
-	
-	if (comp) {
-		g_return_val_if_fail (E_IS_CAL_COMPONENT (comp), FALSE);
-		g_return_val_if_fail (n_comps == 1, FALSE);
-	} else {
-		g_return_val_if_fail (n_comps > 1, FALSE);
-		g_return_val_if_fail (vtype != E_CAL_COMPONENT_NO_TYPE, FALSE);
-	}
-
-	g_return_val_if_fail (widget != NULL, FALSE);
-	g_return_val_if_fail (GTK_IS_WIDGET (widget), FALSE);
-
-	if (!calendar_config_get_confirm_delete ())
-		return TRUE;
-
-	if (comp) {
-		ECalComponentText summary;
-		
-		vtype = e_cal_component_get_vtype (comp);
-		
-		if (!consider_as_untitled) {
-			e_cal_component_get_summary (comp, &summary);
-			arg0 = g_strdup (summary.value);
-		}
-		
-		switch (vtype) {
-		case E_CAL_COMPONENT_EVENT:
-			stock_icon = "stock_calendar";
-			if (arg0)
-				id = "calendar:prompt-delete-titled-appointment";
-			else
-				id = "calendar:prompt-delete-appointment";
-			break;
-
-		case E_CAL_COMPONENT_TODO:
-			stock_icon = "stock_todo";
-			if (arg0)
-				id = "calendar:prompt-delete-named-task";
-			else
-				id = "calendar:prompt-delete-task";
-			break;
-
-		case E_CAL_COMPONENT_JOURNAL:
-			stock_icon = "stock_calendar";
-			if (arg0)
-				id = "calendar:prompt-delete-named-journal";
-			else
-				id = "calendar:prompt-delete-journal";
-			break;
-
-		default:
-			g_message ("delete_component_dialog(): Cannot handle object of type %d",
-				   vtype);
-			g_free (arg0);
-			return FALSE;
-		}
-	} else {
-		switch (vtype) {
-		case E_CAL_COMPONENT_EVENT:
-			if (n_comps == 1)
-				id = "calendar:prompt-delete-appointment";
-			else
-				id = "calendar:prompt-delete-appointments";
-			break;
-
-		case E_CAL_COMPONENT_TODO:
-			if (n_comps == 1)
-				id = "calendar:prompt-delete-task";
-			else
-				id = "calendar:prompt-delete-tasks";
-			break;
-
-		case E_CAL_COMPONENT_JOURNAL:
-			if (n_comps == 1)
-				id = "calendar:prompt-delete-journal";
-			else
-				id = "calendar:prompt-delete-journals";
-			break;
-
-		default:
-			g_message ("delete_component_dialog(): Cannot handle objects of type %d",
-				   vtype);
-			return FALSE;
-		}
-		
-		if (n_comps > 1)
-			arg0 = g_strdup_printf ("%d", n_comps);
-	}
-	
-	response = e_error_run ((GtkWindow *) gtk_widget_get_toplevel (widget), id, arg0, NULL);
-	g_free (arg0);
-	
-	return response == GTK_RESPONSE_YES;
-}
diff --git a/calendar/gui/dialogs/delete-comp.h b/calendar/gui/dialogs/delete-comp.h
deleted file mode 100644
index f8773c25d0..0000000000
--- a/calendar/gui/dialogs/delete-comp.h
+++ /dev/null
@@ -1,32 +0,0 @@
-/* Evolution calendar - Delete calendar component dialog
- *
- * Copyright (C) 2001 Ximian, Inc.
- *
- * Author: Federico Mena-Quintero <federico@ximian.com>
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of version 2 of the GNU General Public
- * License as published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307, USA.
- */
-
-#ifndef DELETE_COMP_H
-#define DELETE_COMP_H
-
-#include <gtk/gtkwidget.h>
-#include <libecal/e-cal-component.h>
-
-gboolean delete_component_dialog (ECalComponent *comp,
-				  gboolean consider_as_untitled,
-				  int n_comps, ECalComponentVType vtype,
-				  GtkWidget *widget);
-
-#endif
diff --git a/calendar/gui/dialogs/delete-error.c b/calendar/gui/dialogs/delete-error.c
deleted file mode 100644
index 5932abeab8..0000000000
--- a/calendar/gui/dialogs/delete-error.c
+++ /dev/null
@@ -1,122 +0,0 @@
-/* Evolution calendar - Send calendar component dialog
- *
- * Copyright (C) 2001 Ximian, Inc.
- *
- * Author: JP Rosevear <jpr@ximian.com>
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of version 2 of the GNU General Public
- * License as published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307, USA.
- */
-
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
-
-#include <glib.h>
-#include <gtk/gtkmessagedialog.h>
-#include <libgnome/gnome-i18n.h>
-#include <libgnomeui/gnome-uidefs.h>
-#include <e-util/e-icon-factory.h>
-#include "delete-error.h"
-
-
-
-/**
- * delete_error_dialog:
- * 
- * Shows any applicable error messages as the result of deleting and object
- * 
- **/
-void
-delete_error_dialog (GError *error, ECalComponentVType vtype)
-{
-	GList *icon_list = NULL;
-	GtkWidget *dialog;
-	const char *str;
-	
-	if (!error)
-		return;
-	
-	switch (error->code) {
-	case E_CALENDAR_STATUS_CORBA_EXCEPTION:
-		switch (vtype) {
-		case E_CAL_COMPONENT_EVENT:
-			str = _("The event could not be deleted due to a corba error");
-			break;
-		case E_CAL_COMPONENT_TODO:
-			str = _("The task could not be deleted due to a corba error");
-			break;
-		case E_CAL_COMPONENT_JOURNAL:
-			str = _("The journal entry could not be deleted due to a corba error");
-			break;
-		default:
-			str = _("The item could not be deleted due to a corba error");
-			break;
-		}
-		break;
-	case E_CALENDAR_STATUS_PERMISSION_DENIED:
-		switch (vtype) {
-		case E_CAL_COMPONENT_EVENT:
-			str = _("The event could not be deleted because permission was denied");
-			break;
-		case E_CAL_COMPONENT_TODO:
-			str = _("The task could not be deleted because permission was denied");
-			break;
-		case E_CAL_COMPONENT_JOURNAL:
-			str = _("The journal entry could not be deleted because permission was denied");
-			break;
-		default:
-			str = _("The item could not be deleted because permission was denied");
-			break;
-		}
-		break;
-	case E_CALENDAR_STATUS_OTHER_ERROR:
-		switch (vtype) {
-		case E_CAL_COMPONENT_EVENT:
-			str = _("The event could not be deleted due to an error");
-			break;
-		case E_CAL_COMPONENT_TODO:
-			str = _("The task could not be deleted due to an error");
-			break;
-		case E_CAL_COMPONENT_JOURNAL:
-			str = _("The journal entry could not be deleted due to an error");
-			break;
-		default:
-			str = _("The item could not be deleted due to an error");
-			break;
-		}
-		break;
-	case E_CALENDAR_STATUS_OK:
-	case E_CALENDAR_STATUS_OBJECT_NOT_FOUND:
-	default:		
-		/* If not found, we don't care - its gone anyhow */
-		return;
-	}
-	
-	dialog = gtk_message_dialog_new (NULL, GTK_DIALOG_MODAL,
-					 GTK_MESSAGE_ERROR,
-					 GTK_BUTTONS_OK, str);
-	if (vtype == E_CAL_COMPONENT_EVENT)
-		icon_list = e_icon_factory_get_icon_list ("stock_calendar");
-	else if (vtype == E_CAL_COMPONENT_TODO)
-		icon_list = e_icon_factory_get_icon_list ("stock_todo");
-	
-	if (icon_list) {
-		gtk_window_set_icon_list (GTK_WINDOW (dialog), icon_list);
-		g_list_foreach (icon_list, (GFunc) g_object_unref, NULL);
-		g_list_free (icon_list);
-	}
-	
-	gtk_dialog_run (GTK_DIALOG (dialog));
-	gtk_widget_destroy (dialog);
-}
diff --git a/calendar/gui/dialogs/delete-error.h b/calendar/gui/dialogs/delete-error.h
deleted file mode 100644
index 68c132e479..0000000000
--- a/calendar/gui/dialogs/delete-error.h
+++ /dev/null
@@ -1,30 +0,0 @@
-/* Evolution calendar - Send calendar component dialog
- *
- * Copyright (C) 2001 Ximian, Inc.
- *
- * Author: JP Rosevear <jpr@ximian.com>
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of version 2 of the GNU General Public
- * License as published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307, USA.
- */
-
-#ifndef DELETE_ERROR_H
-#define DELETE_ERROR_H
-
-#include <glib.h>
-#include <libecal/e-cal.h>
-#include <libecal/e-cal-component.h>
-
-void delete_error_dialog (GError *error, ECalComponentVType vtype);
-
-#endif
diff --git a/calendar/gui/dialogs/e-delegate-dialog.c b/calendar/gui/dialogs/e-delegate-dialog.c
deleted file mode 100644
index cd0c768c63..0000000000
--- a/calendar/gui/dialogs/e-delegate-dialog.c
+++ /dev/null
@@ -1,316 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-/* Evolution calendar - Delegate selector dialog
- *
- * Copyright (C) 2001 Ximian, Inc.
- *
- * Authors: Damon Chaplin <damon@ximian.com>
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of version 2 of the GNU General Public
- * License as published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307, USA.
- */
-
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
-
-#include <gtk/gtksignal.h>
-#include <gtk/gtkcombo.h>
-#include <gtk/gtkentry.h>
-#include <gtk/gtklabel.h>
-#include <gnome.h>
-#include <libical/ical.h>
-#include <glade/glade.h>
-#include <widgets/misc/e-map.h>
-#include <libebook/e-destination.h>
-#include <libedataserverui/e-name-selector.h>
-#include "e-delegate-dialog.h"
-
-struct _EDelegateDialogPrivate {
-	char *name;
-	char *address;
-
-	/* Glade XML data */
-	GladeXML *xml;
-
-	/* Widgets from the Glade file */
-	GtkWidget *app;
-	GtkWidget *hbox;
-	GtkWidget *addressbook;
-
-	ENameSelector *name_selector;
-	GtkWidget *entry;	
-};
-
-static const char *section_name = "Delegate To";
-
-static void e_delegate_dialog_finalize		(GObject	*object);
-
-static gboolean get_widgets			(EDelegateDialog *edd);
-static void addressbook_clicked_cb              (GtkWidget *widget, gpointer data);
-static void addressbook_response_cb             (GtkWidget *widget, gint response, gpointer data);
-
-G_DEFINE_TYPE (EDelegateDialog, e_delegate_dialog, G_TYPE_OBJECT);
-
-/* Class initialization function for the event editor */
-static void
-e_delegate_dialog_class_init (EDelegateDialogClass *class)
-{
-	GObjectClass *gobject_class;
-
-	gobject_class = (GObjectClass *) class;
-
-	gobject_class->finalize = e_delegate_dialog_finalize;
-}
-
-/* Object initialization function for the event editor */
-static void
-e_delegate_dialog_init (EDelegateDialog *edd)
-{
-	EDelegateDialogPrivate *priv;
-
-	priv = g_new0 (EDelegateDialogPrivate, 1);
-	edd->priv = priv;
-
-	priv->address = NULL;
-}
-
-/* Destroy handler for the event editor */
-static void
-e_delegate_dialog_finalize (GObject *object)
-{
-	EDelegateDialog *edd;
-	EDelegateDialogPrivate *priv;
-	GtkWidget *dialog;
-
-	g_return_if_fail (object != NULL);
-	g_return_if_fail (E_IS_DELEGATE_DIALOG (object));
-
-	edd = E_DELEGATE_DIALOG (object);
-	priv = edd->priv;
-
-	g_object_unref (priv->name_selector);
-
-	/* Destroy the actual dialog. */
-	dialog = e_delegate_dialog_get_toplevel (edd);
-	gtk_widget_destroy (dialog);
-
-	g_free (priv->address);
-	priv->address = NULL;
-
-	g_free (priv);
-	edd->priv = NULL;
-
-	if (G_OBJECT_CLASS (e_delegate_dialog_parent_class)->finalize)
-		(* G_OBJECT_CLASS (e_delegate_dialog_parent_class)->finalize) (object);
-}
-
-
-EDelegateDialog *
-e_delegate_dialog_construct (EDelegateDialog *edd, const char *name, const char *address)
-{
-	EDelegateDialogPrivate *priv;
-	EDestinationStore *destination_store;
-	EDestination *dest;
-	ENameSelectorModel *name_selector_model;
-	ENameSelectorDialog *name_selector_dialog;
-	char *str;
-
-	g_return_val_if_fail (edd != NULL, NULL);
-	g_return_val_if_fail (E_IS_DELEGATE_DIALOG (edd), NULL);
-
-	priv = edd->priv;
-
-	/* Load the content widgets */
-
-	priv->xml = glade_xml_new (EVOLUTION_GLADEDIR "/e-delegate-dialog.glade",
-				   NULL, NULL);
-	if (!priv->xml) {
-		g_message ("e_delegate_dialog_construct(): Could not load the Glade XML file!");
-		goto error;
-	}
-
-	if (!get_widgets (edd)) {
-		g_message ("e_delegate_dialog_construct(): Could not find all widgets in the XML file!");
-		goto error;
-	}
-
-	priv->name_selector = e_name_selector_new ();
-	name_selector_model = e_name_selector_peek_model (priv->name_selector);
-	e_name_selector_model_add_section (name_selector_model, section_name, section_name, NULL);
-
-	priv->entry = GTK_WIDGET (e_name_selector_peek_section_entry (priv->name_selector, section_name));
-	gtk_widget_show (priv->entry);
-	gtk_box_pack_start (GTK_BOX (priv->hbox), priv->entry, TRUE, TRUE, 6);
-
-	dest = e_destination_new ();
-
-	if (name != NULL && *name)
-		e_destination_set_name (dest, name);
-	if (address != NULL && *address)
-		e_destination_set_email (dest, address);
-
-	e_name_selector_model_peek_section (name_selector_model, section_name, NULL, &destination_store);
-	e_destination_store_append_destination (destination_store, dest);
-	g_object_unref (dest);
-		
-	g_signal_connect((priv->addressbook), "clicked",
-			    G_CALLBACK (addressbook_clicked_cb), edd);
-
-	name_selector_dialog = e_name_selector_peek_dialog (priv->name_selector);
-	g_signal_connect (name_selector_dialog, "response", G_CALLBACK (addressbook_response_cb), edd);
-
-	return edd;
-
- error:
-
-	g_object_unref (edd);
-	return NULL;
-}
-
-static gboolean
-get_widgets (EDelegateDialog *edd)
-{
-	EDelegateDialogPrivate *priv;
-
-	priv = edd->priv;
-
-#define GW(name) glade_xml_get_widget (priv->xml, name)
-
-	priv->app		= GW ("delegate-dialog");
-	priv->hbox              = GW ("delegate-hbox");
-	priv->addressbook	= GW ("addressbook");	
-
-	return (priv->app
-		&& priv->hbox
-		&& priv->addressbook);
-}
-
-static void
-addressbook_clicked_cb (GtkWidget *widget, gpointer data)
-{
-	EDelegateDialog *edd = data;
-	EDelegateDialogPrivate *priv;
-	ENameSelectorDialog *name_selector_dialog;
-	
-	priv = edd->priv;
-
-	name_selector_dialog = e_name_selector_peek_dialog (priv->name_selector);
-	gtk_widget_show (GTK_WIDGET (name_selector_dialog));
-}
-
-static void
-addressbook_response_cb (GtkWidget *widget, gint response, gpointer data)
-{
-	EDelegateDialog *edd = data;
-	EDelegateDialogPrivate *priv;
-	ENameSelectorDialog *name_selector_dialog;
-
-	priv = edd->priv;
-
-	name_selector_dialog = e_name_selector_peek_dialog (priv->name_selector);
-	gtk_widget_hide (GTK_WIDGET (name_selector_dialog));
-}
-
-/**
- * e_delegate_dialog_new:
- *
- * Creates a new event editor dialog.
- *
- * Return value: A newly-created event editor dialog, or NULL if the event
- * editor could not be created.
- **/
-EDelegateDialog *
-e_delegate_dialog_new (const char *name, const char *address)
-{
-	EDelegateDialog *edd;
-
-	edd = E_DELEGATE_DIALOG (g_object_new (E_TYPE_DELEGATE_DIALOG, NULL));
-	return e_delegate_dialog_construct (E_DELEGATE_DIALOG (edd), name, address);
-}
-
-char *
-e_delegate_dialog_get_delegate		(EDelegateDialog  *edd)
-{
-	EDelegateDialogPrivate *priv;
-	ENameSelectorModel *name_selector_model;
-	EDestinationStore *destination_store;
-	GList *destinations;
-	EDestination *destination;
-	
-	g_return_val_if_fail (edd != NULL, NULL);
-	g_return_val_if_fail (E_IS_DELEGATE_DIALOG (edd), NULL);
-
-	priv = edd->priv;
-
-	name_selector_model = e_name_selector_peek_model (priv->name_selector);
-	e_name_selector_model_peek_section (name_selector_model, section_name, NULL, &destination_store);
-	destinations = e_destination_store_list_destinations (destination_store);
-	if (!destinations)
-		return NULL;
-
-	destination = destinations->data;
-
-	if (destination) {
-		g_free (priv->address);
-		priv->address = g_strdup (e_destination_get_email (destination));
-	}
-	
-	g_list_free (destinations);
-	return g_strdup (priv->address);
-}
-
-
-char *
-e_delegate_dialog_get_delegate_name		(EDelegateDialog  *edd)
-{
-	EDelegateDialogPrivate *priv;
-	ENameSelectorModel *name_selector_model;
-	EDestinationStore *destination_store;
-	GList *destinations;
-	EDestination *destination;
-	
-	g_return_val_if_fail (edd != NULL, NULL);
-	g_return_val_if_fail (E_IS_DELEGATE_DIALOG (edd), NULL);
-
-	priv = edd->priv;
-
-	name_selector_model = e_name_selector_peek_model (priv->name_selector);
-	e_name_selector_model_peek_section (name_selector_model, section_name, NULL, &destination_store);
-	destinations = e_destination_store_list_destinations (destination_store);
-	if (!destinations)
-		return NULL;
-
-	destination = destinations->data;
-
-	if (destination) {
-		g_free (priv->name);
-		priv->name = g_strdup (e_destination_get_name (destination));
-	}
-	
-	g_list_free (destinations);
-	return g_strdup (priv->name);
-}
-
-GtkWidget*
-e_delegate_dialog_get_toplevel	(EDelegateDialog  *edd)
-{
-	EDelegateDialogPrivate *priv;
-
-	g_return_val_if_fail (edd != NULL, NULL);
-	g_return_val_if_fail (E_IS_DELEGATE_DIALOG (edd), NULL);
-
-	priv = edd->priv;
-
-	return priv->app;
-}
-
diff --git a/calendar/gui/dialogs/e-delegate-dialog.glade b/calendar/gui/dialogs/e-delegate-dialog.glade
deleted file mode 100644
index af24ca2b63..0000000000
--- a/calendar/gui/dialogs/e-delegate-dialog.glade
+++ /dev/null
@@ -1,113 +0,0 @@
-<?xml version="1.0" standalone="no"?> <!--*- mode: xml -*-->
-<!DOCTYPE glade-interface SYSTEM "http://glade.gnome.org/glade-2.0.dtd">
-
-<glade-interface>
-<requires lib="gnome"/>
-
-<widget class="GtkDialog" id="delegate-dialog">
-  <property name="title" translatable="yes">Enter Delegate</property>
-  <property name="type">GTK_WINDOW_TOPLEVEL</property>
-  <property name="window_position">GTK_WIN_POS_NONE</property>
-  <property name="modal">False</property>
-  <property name="resizable">True</property>
-  <property name="destroy_with_parent">False</property>
-  <property name="has_separator">True</property>
-
-  <child internal-child="vbox">
-    <widget class="GtkVBox" id="dialog-vbox1">
-      <property name="visible">True</property>
-      <property name="homogeneous">False</property>
-      <property name="spacing">8</property>
-
-      <child internal-child="action_area">
-	<widget class="GtkHButtonBox" id="dialog-action_area1">
-	  <property name="visible">True</property>
-	  <property name="layout_style">GTK_BUTTONBOX_END</property>
-
-	  <child>
-	    <widget class="GtkButton" id="cancel-button">
-	      <property name="visible">True</property>
-	      <property name="can_default">True</property>
-	      <property name="can_focus">True</property>
-	      <property name="label">gtk-cancel</property>
-	      <property name="use_stock">True</property>
-	      <property name="relief">GTK_RELIEF_NORMAL</property>
-	      <property name="response_id">-6</property>
-	    </widget>
-	  </child>
-
-	  <child>
-	    <widget class="GtkButton" id="ok-button">
-	      <property name="visible">True</property>
-	      <property name="can_default">True</property>
-	      <property name="has_default">True</property>
-	      <property name="can_focus">True</property>
-	      <property name="label">gtk-ok</property>
-	      <property name="use_stock">True</property>
-	      <property name="relief">GTK_RELIEF_NORMAL</property>
-	      <property name="response_id">-5</property>
-	    </widget>
-	  </child>
-	</widget>
-	<packing>
-	  <property name="padding">0</property>
-	  <property name="expand">False</property>
-	  <property name="fill">True</property>
-	  <property name="pack_type">GTK_PACK_END</property>
-	</packing>
-      </child>
-
-      <child>
-	<widget class="GtkHBox" id="delegate-hbox">
-	  <property name="visible">True</property>
-	  <property name="homogeneous">False</property>
-	  <property name="spacing">6</property>
-
-	  <child>
-	    <widget class="GtkLabel" id="label3">
-	      <property name="visible">True</property>
-	      <property name="label" translatable="yes">Delegate To:</property>
-	      <property name="use_underline">False</property>
-	      <property name="use_markup">False</property>
-	      <property name="justify">GTK_JUSTIFY_CENTER</property>
-	      <property name="wrap">False</property>
-	      <property name="selectable">False</property>
-	      <property name="xalign">0.5</property>
-	      <property name="yalign">0.5</property>
-	      <property name="xpad">0</property>
-	      <property name="ypad">0</property>
-	    </widget>
-	    <packing>
-	      <property name="padding">0</property>
-	      <property name="expand">False</property>
-	      <property name="fill">False</property>
-	    </packing>
-	  </child>
-
-	  <child>
-	    <widget class="GtkButton" id="addressbook">
-	      <property name="visible">True</property>
-	      <property name="can_focus">True</property>
-	      <property name="label" translatable="yes">Contacts...</property>
-	      <property name="use_underline">True</property>
-	      <property name="relief">GTK_RELIEF_NORMAL</property>
-	    </widget>
-	    <packing>
-	      <property name="padding">0</property>
-	      <property name="expand">False</property>
-	      <property name="fill">False</property>
-	      <property name="pack_type">GTK_PACK_END</property>
-	    </packing>
-	  </child>
-	</widget>
-	<packing>
-	  <property name="padding">0</property>
-	  <property name="expand">False</property>
-	  <property name="fill">False</property>
-	</packing>
-      </child>
-    </widget>
-  </child>
-</widget>
-
-</glade-interface>
diff --git a/calendar/gui/dialogs/e-delegate-dialog.h b/calendar/gui/dialogs/e-delegate-dialog.h
deleted file mode 100644
index 2acc853e0a..0000000000
--- a/calendar/gui/dialogs/e-delegate-dialog.h
+++ /dev/null
@@ -1,72 +0,0 @@
-/* Evolution calendar - Delegate selector dialog
- *
- * Copyright (C) 2001 Ximian, Inc.
- *
- * Authors: JP Rosevear <jpr@ximian.com>
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of version 2 of the GNU General Public
- * License as published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307, USA.
- */
-
-#ifndef __E_DELEGATE_DIALOG_H__
-#define __E_DELEGATE_DIALOG_H__
-
-#include <gtk/gtkwidget.h>
-
-
-
-#define E_TYPE_DELEGATE_DIALOG       (e_delegate_dialog_get_type ())
-#define E_DELEGATE_DIALOG(obj)       (G_TYPE_CHECK_INSTANCE_CAST ((obj), E_TYPE_DELEGATE_DIALOG, EDelegateDialog))
-#define E_DELEGATE_DIALOG_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), E_TYPE_DELEGATE_DIALOG,	\
-				      EDelegateDialogClass))
-#define E_IS_DELEGATE_DIALOG(obj)    (G_TYPE_CHECK_INSTANCE_TYPE ((obj), E_TYPE_DELEGATE_DIALOG))
-#define E_IS_DELEGATE_DIALOG_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), E_TYPE_DELEGATE_DIALOG))
-
-
-typedef struct _EDelegateDialog		EDelegateDialog;
-typedef struct _EDelegateDialogClass	EDelegateDialogClass;
-typedef struct _EDelegateDialogPrivate	EDelegateDialogPrivate;
-
-struct _EDelegateDialog {
-	GtkObject object;
-
-	/* Private data */
-	EDelegateDialogPrivate *priv;
-};
-
-struct _EDelegateDialogClass {
-	GtkObjectClass parent_class;
-};
-
-GtkType          e_delegate_dialog_get_type          (void);
-
-EDelegateDialog* e_delegate_dialog_construct         (EDelegateDialog *etd,
-						      const char      *name,
-						      const char      *address);
-
-EDelegateDialog* e_delegate_dialog_new               (const char      *name,
-						      const char      *address);
-
-char*            e_delegate_dialog_get_delegate      (EDelegateDialog *etd);
-
-char*            e_delegate_dialog_get_delegate_name (EDelegateDialog *etd);
-
-void             e_delegate_dialog_set_delegate      (EDelegateDialog *etd,
-						      const char      *address);
-
-GtkWidget*       e_delegate_dialog_get_toplevel      (EDelegateDialog *etd);
-
-
-
-
-#endif /* __E_DELEGATE_DIALOG_H__ */
diff --git a/calendar/gui/dialogs/e-send-options-utils.c b/calendar/gui/dialogs/e-send-options-utils.c
deleted file mode 100644
index ff70a2ccd7..0000000000
--- a/calendar/gui/dialogs/e-send-options-utils.c
+++ /dev/null
@@ -1,219 +0,0 @@
-/* Evolution calendar - Timezone selector dialog
- *
- * Copyright (C) 2001 Ximian, Inc.
- *
- * Authors: Damon Chaplin <damon@ximian.com>
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of version 2 of the GNU General Public
- * License as published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * General Public License for more details.
- *
- * You should have received a copy of the GNU General Public
- * 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 "e-send-options-utils.h"
-#include "../calendar-config.h"
-#include <glib.h>
-
-ESendOptionsDialog *sod = NULL;
-
-void 
-e_sendoptions_utils_set_default_data (ESendOptionsDialog *sod, ESource *source, char * type) 
-{
-	ESendOptionsGeneral *gopts = NULL;
-	ESendOptionsStatusTracking *sopts;
-	GConfClient *gconf = gconf_client_get_default ();
-	ESourceList *source_list;
-	const char *uid;
-	const char *value;
-	
-	gopts = sod->data->gopts;
-	sopts = sod->data->sopts;
-	
-	if (!strcmp (type, "calendar"))
-		source_list = e_source_list_new_for_gconf (gconf, "/apps/evolution/calendar/sources");
-	else 
-		source_list = e_source_list_new_for_gconf (gconf, "/apps/evolution/tasks/sources");
-	
-	uid = e_source_peek_uid (source);
-	source = e_source_list_peek_source_by_uid (source_list, uid);
-
-		/* priority */
-	value = e_source_get_property (source, "priority");	
-	if (value) {
-		if (!strcmp (value, "high"))
-			gopts->priority = E_PRIORITY_HIGH;
-		else if (!strcmp (value, "standard"))
-			gopts->priority = E_PRIORITY_STANDARD;
-		else if (!strcmp (value, "low"))
-			gopts->priority = E_PRIORITY_LOW;
-		else
-			gopts->priority = E_PRIORITY_UNDEFINED;
-	}
-		/* Reply requested */
-	value = e_source_get_property (source, "reply-requested");	
-	if (value) {
-		if (!strcmp (value, "none"))
-			gopts->reply_enabled = FALSE;
-		else if (!strcmp (value, "convinient")) {
-			gopts->reply_enabled = TRUE;
-			gopts->reply_convenient = TRUE; 
-		} else {
-			gint i = atoi (value);
-			gopts->reply_within = i;
-		}
-	}
-		/* Delay delivery */
-	value = e_source_get_property (source, "delay-delivery");	
-	if (value) {
-		if (!strcmp (value, "none"))
-			gopts->delay_enabled = FALSE;
-		else {
-			gopts->delay_enabled = TRUE;
-			gopts->delay_until = icaltime_as_timet (icaltime_from_string (value));
-		}
-	}	
-		/* Expiration Date */
-	value = e_source_get_property (source, "expiration");	
-	if (value) {
-		if (!strcmp (value, "none"))
-			gopts->expiration_enabled = FALSE;
-		else {
-			gint i = atoi (value);
-			if (i == 0)
-				gopts->expiration_enabled = FALSE;
-			else
-				gopts->expiration_enabled = TRUE;
-			gopts->expire_after = i;
-		}
-	}
-		/* status tracking */
-	value = e_source_get_property (source, "status-tracking");	
-	if (value) {
-		if (!strcmp (value, "none"))
-			sopts->tracking_enabled = FALSE;
-		else {
-			sopts->tracking_enabled = TRUE;
-			if (!strcmp (value, "delivered"))
-				sopts->track_when = E_DELIVERED;
-			else if (!strcmp (value, "delivered-opened"))
-				sopts->track_when = E_DELIVERED_OPENED;
-			else
-				sopts->track_when = E_ALL;
-		}
-	}
-
-		/* Return Notifications */
-	
-	value = e_source_get_property (source, "return-open");	
-	if (value) {
-		if (!strcmp (value, "none"))
-			sopts->opened = E_RETURN_NOTIFY_NONE;
-		else 
-			sopts->opened = E_RETURN_NOTIFY_MAIL;
-	}
-	
-	value = e_source_get_property (source, "return-accept");	
-	if (value) {
-		if (!strcmp (value, "none"))
-			sopts->accepted = E_RETURN_NOTIFY_NONE;
-		else 
-			sopts->accepted = E_RETURN_NOTIFY_MAIL;
-	}
-
- 	value = e_source_get_property (source, "return-decline");	
-	if (value) {
-		if (!strcmp (value, "none"))
-			sopts->declined = E_RETURN_NOTIFY_NONE;
-		else 
-			sopts->declined = E_RETURN_NOTIFY_MAIL;
-	}
-	
-	value = e_source_get_property (source, "return-complete");	
-	if (value) {
-		if (!strcmp (value, "none"))
-			sopts->completed = E_RETURN_NOTIFY_NONE;
-		else 
-			sopts->completed = E_RETURN_NOTIFY_MAIL;
-	}
-
-}
-
-void 
-e_sendoptions_utils_fill_component (ESendOptionsDialog *sod, ECalComponent *comp) 
-{
-	int i = 1;
-	icalproperty *prop;
-	icalcomponent *icalcomp;
-	ESendOptionsGeneral *gopts;
-	ESendOptionsStatusTracking *sopts;
-
-	gopts = sod->data->gopts;
-	sopts = sod->data->sopts;
-
-	e_cal_component_set_sequence (comp, &i);
-	icalcomp = e_cal_component_get_icalcomponent (comp);
-
-	if (e_sendoptions_get_need_general_options (sod)) {
-		prop = icalproperty_new_x ((const char *) g_strdup_printf ("%d", gopts->priority));
-		icalproperty_set_x_name (prop, "X-EVOLUTION-OPTIONS-PRIORITY");
-		icalcomponent_add_property (icalcomp, prop);	
-
-		if (gopts->reply_enabled) {
-			if (gopts->reply_convenient) 
-				prop = icalproperty_new_x ("convenient");	
-			else 
-				prop = icalproperty_new_x ((const char *) g_strdup_printf ( "%d", gopts->reply_within));
-			icalproperty_set_x_name (prop, "X-EVOLUTION-OPTIONS-REPLY");
-			icalcomponent_add_property (icalcomp, prop);
-		}
-
-		if (gopts->expiration_enabled && gopts->expire_after) {
-			prop = icalproperty_new_x ((const char *) g_strdup_printf ( "%d", gopts->expire_after));	
-			icalproperty_set_x_name (prop, "X-EVOLUTION-OPTIONS-EXPIRE");
-			icalcomponent_add_property (icalcomp, prop);
-		}
-
-		if (gopts->delay_enabled) {
-			struct icaltimetype temp;
-			icaltimezone *zone = calendar_config_get_icaltimezone ();
-			temp = icaltime_from_timet_with_zone (gopts->delay_until, FALSE, zone);	
-			prop = icalproperty_new_x (icaltime_as_ical_string (temp));
-			icalproperty_set_x_name (prop, "X-EVOLUTION-OPTIONS-DELAY");
-			icalcomponent_add_property (icalcomp, prop);
-		}
-	}
-	
-	if (sopts->tracking_enabled) 
-		prop = icalproperty_new_x ((const char *) g_strdup_printf ( "%d", sopts->track_when));	
-	else
-		prop = icalproperty_new_x ("0");
-
-	icalproperty_set_x_name (prop, "X-EVOLUTION-OPTIONS-TRACKINFO");
-	icalcomponent_add_property (icalcomp, prop);
-		
-	
-	prop = icalproperty_new_x ((const char *) g_strdup_printf ("%d", sopts->opened));	
-	icalproperty_set_x_name (prop, "X-EVOLUTION-OPTIONS-OPENED");
-	icalcomponent_add_property (icalcomp, prop);
-	
-	prop = icalproperty_new_x ((const char *) g_strdup_printf ("%d", sopts->accepted));	
-	icalproperty_set_x_name (prop, "X-EVOLUTION-OPTIONS-ACCEPTED");
-	icalcomponent_add_property (icalcomp, prop);
-
-	prop = icalproperty_new_x ((const char *) g_strdup_printf ("%d", sopts->declined));	
-	icalproperty_set_x_name (prop, "X-EVOLUTION-OPTIONS-DECLINED");
-	icalcomponent_add_property (icalcomp, prop);
-
-	prop = icalproperty_new_x ((const char *) g_strdup_printf ("%d", sopts->completed));	
-	icalproperty_set_x_name (prop, "X-EVOLUTION-OPTIONS-COMPLETED");
-	icalcomponent_add_property (icalcomp, prop);
-}
-
diff --git a/calendar/gui/dialogs/e-send-options-utils.h b/calendar/gui/dialogs/e-send-options-utils.h
deleted file mode 100644
index ef35d66d95..0000000000
--- a/calendar/gui/dialogs/e-send-options-utils.h
+++ /dev/null
@@ -1,31 +0,0 @@
-/* Evolution calendar - Timezone selector dialog
- *
- * Copyright (C) 2001 Ximian, Inc.
- *
- * Authors: Damon Chaplin <damon@ximian.com>
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of version 2 of the GNU General Public
- * License as published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * General Public License for more details.
- *
- * You should have received a copy of the GNU General Public
- * 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_SENDOPTIONS_UTILS_H__
-#define __E_SENDOPTIONS_UTILS_H__
-
-#include "widgets/misc/e-send-options.h"
-#include <libecal/e-cal-component.h>
-#include <libedataserver/e-source-list.h>
-
-void e_sendoptions_utils_set_default_data (ESendOptionsDialog *sod, ESource *source, char* type);   
-void e_sendoptions_utils_fill_component (ESendOptionsDialog *sod, ECalComponent *comp);
-#endif
diff --git a/calendar/gui/dialogs/event-editor.c b/calendar/gui/dialogs/event-editor.c
deleted file mode 100644
index 5f46bb1222..0000000000
--- a/calendar/gui/dialogs/event-editor.c
+++ /dev/null
@@ -1,477 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-
-/* Evolution calendar - Event editor dialog
- *
- * Copyright (C) 2000 Ximian, Inc.
- * Copyright (C) 2001 Ximian, Inc.
- *
- * Authors: Miguel de Icaza <miguel@ximian.com>
- *          Federico Mena-Quintero <federico@ximian.com>
- *          Seth Alves <alves@hungry.com>
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of version 2 of the GNU General Public
- * License as published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307, USA.
- */
-
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
-
-#include <string.h>
-#include <glade/glade.h>
-#include <libgnome/gnome-i18n.h>
-#include <widgets/misc/e-dateedit.h>
-#include <e-util/e-icon-factory.h>
-
-#include "event-page.h"
-#include "recurrence-page.h"
-#include "meeting-page.h"
-#include "schedule-page.h"
-#include "cancel-comp.h"
-#include "event-editor.h"
-
-struct _EventEditorPrivate {
-	EventPage *event_page;
-	RecurrencePage *recur_page;
-	MeetingPage *meet_page;
-	SchedulePage *sched_page;
-
-	EMeetingStore *model;
-	gboolean is_meeting;
-	gboolean meeting_shown;
-	gboolean updating;	
-};
-
-
-
-static void event_editor_set_e_cal (CompEditor *editor, ECal *client);
-static void event_editor_edit_comp (CompEditor *editor, ECalComponent *comp);
-static gboolean event_editor_send_comp (CompEditor *editor, ECalComponentItipMethod method);
-static void event_editor_finalize (GObject *object);
-
-static void schedule_meeting_cmd (GtkWidget *widget, gpointer data);
-static void refresh_meeting_cmd (GtkWidget *widget, gpointer data);
-static void cancel_meeting_cmd (GtkWidget *widget, gpointer data);
-static void forward_cmd (GtkWidget *widget, gpointer data);
-
-static void model_row_change_insert_cb (GtkTreeModel *model, GtkTreePath *path, GtkTreeIter *iter, gpointer data);
-static void model_row_delete_cb (GtkTreeModel *model, GtkTreePath *path, gpointer data);
-
-
-G_DEFINE_TYPE (EventEditor, event_editor, TYPE_COMP_EDITOR);
-
-/* Class initialization function for the event editor */
-static void
-event_editor_class_init (EventEditorClass *klass)
-{
-	GObjectClass *gobject_class;
-	CompEditorClass *editor_class;
-	
-	gobject_class = (GObjectClass *) klass;
-	editor_class = (CompEditorClass *) klass;
-
-	editor_class->set_e_cal = event_editor_set_e_cal;
-	editor_class->edit_comp = event_editor_edit_comp;
-	editor_class->send_comp = event_editor_send_comp;
-	
-	gobject_class->finalize = event_editor_finalize;
-}
-
-static void
-init_widgets (EventEditor *ee)
-{
-	EventEditorPrivate *priv;
-
-	priv = ee->priv;
-
-	g_signal_connect((priv->model), "row_changed",
-			    G_CALLBACK (model_row_change_insert_cb), ee);
-	g_signal_connect((priv->model), "row_inserted",
-			    G_CALLBACK (model_row_change_insert_cb), ee);
-	g_signal_connect((priv->model), "row_deleted",
-			    G_CALLBACK (model_row_delete_cb), ee);
-}
-
-static void
-client_changed_cb (CompEditorPage *page, ECal *client, gpointer user_data)
-{
-	//set_menu_sens (EVENT_EDITOR (user_data));
-}
-
-/* Object initialization function for the event editor */
-static void
-event_editor_init (EventEditor *ee)
-{
-	EventEditorPrivate *priv;
-	
-	priv = g_new0 (EventEditorPrivate, 1);
-	ee->priv = priv;
-
-	priv->model = E_MEETING_STORE (e_meeting_store_new ());
-	priv->meeting_shown = TRUE;
-	priv->updating = FALSE;	
-	priv->is_meeting = FALSE;
-
-	comp_editor_set_help_section (COMP_EDITOR (ee), "usage-calendar-apts");
-}
-
-EventEditor *
-event_editor_construct (EventEditor *ee, ECal *client)
-{
-	EventEditorPrivate *priv;
-
-	priv = ee->priv;
-
-	priv->event_page = event_page_new ();
-	g_object_ref (priv->event_page);
-	gtk_object_sink (GTK_OBJECT (priv->event_page));
-	comp_editor_append_page (COMP_EDITOR (ee), 
-				 COMP_EDITOR_PAGE (priv->event_page),
-				 _("Appointment"));
-	g_signal_connect (G_OBJECT (priv->event_page), "client_changed",
-			  G_CALLBACK (client_changed_cb), ee);
-
-	priv->recur_page = recurrence_page_new ();
-	g_object_ref (priv->recur_page);
-	gtk_object_sink (GTK_OBJECT (priv->recur_page));
-	comp_editor_append_page (COMP_EDITOR (ee),
-				 COMP_EDITOR_PAGE (priv->recur_page),
-				 _("Recurrence"));
-	
-	if (priv->is_meeting) {
-		if (e_cal_get_static_capability (client, CAL_STATIC_CAPABILITY_REQ_SEND_OPTIONS))
-			event_page_show_options (priv->event_page);
-
-		comp_editor_set_group_item (COMP_EDITOR (ee), TRUE);
-		priv->sched_page = schedule_page_new (priv->model);
-		g_object_ref (priv->sched_page);
-		gtk_object_sink (GTK_OBJECT (priv->sched_page));
-		comp_editor_append_page (COMP_EDITOR (ee),
-					 COMP_EDITOR_PAGE (priv->sched_page),
-					 _("Scheduling"));
-		
-		priv->meet_page = meeting_page_new (priv->model, client);
-		g_object_ref (priv->meet_page);
-		gtk_object_sink (GTK_OBJECT (priv->meet_page));
-		comp_editor_append_page (COMP_EDITOR (ee),
-					 COMP_EDITOR_PAGE (priv->meet_page),
-					 _("Invitations"));
-	}
-	comp_editor_set_e_cal (COMP_EDITOR (ee), client);
-
-	init_widgets (ee);
-	gtk_window_set_default_size (GTK_WINDOW (ee), 300, 225);
-
-	return ee;
-}
-
-static void
-event_editor_set_e_cal (CompEditor *editor, ECal *client)
-{
-	EventEditor *ee;
-	EventEditorPrivate *priv;
-	
-	ee = EVENT_EDITOR (editor);
-	priv = ee->priv;
-
-	e_meeting_store_set_e_cal (priv->model, client);
-	
-	if (COMP_EDITOR_CLASS (event_editor_parent_class)->set_e_cal)
-		COMP_EDITOR_CLASS (event_editor_parent_class)->set_e_cal (editor, client);	
-}
-
-static void
-event_editor_edit_comp (CompEditor *editor, ECalComponent *comp)
-{
-	EventEditor *ee;
-	EventEditorPrivate *priv;
-	ECalComponentOrganizer organizer;
-	ECal *client;
-	GSList *attendees = NULL;
-	
-	ee = EVENT_EDITOR (editor);
-	priv = ee->priv;
-	
-	priv->updating = TRUE;
-	
-	if (COMP_EDITOR_CLASS (event_editor_parent_class)->edit_comp)
-		COMP_EDITOR_CLASS (event_editor_parent_class)->edit_comp (editor, comp);
-
-	client = comp_editor_get_e_cal (COMP_EDITOR (editor));
-
-	/* Get meeting related stuff */
-	e_cal_component_get_organizer (comp, &organizer);
-	e_cal_component_get_attendee_list (comp, &attendees);
-
-	/* Clear things up */
-	e_meeting_store_remove_all_attendees (priv->model);
-
-	/* Set up the attendees */
-	if (attendees == NULL) {
-		if (priv->meet_page)
-			comp_editor_remove_page (editor, COMP_EDITOR_PAGE (priv->meet_page));
-		if (priv->sched_page)
-			comp_editor_remove_page (editor, COMP_EDITOR_PAGE (priv->sched_page));
-		priv->meeting_shown = FALSE;
-	} else {
-		GSList *l;
-		int row;
-	
-		if (!priv->meeting_shown) {
-			comp_editor_append_page (COMP_EDITOR (ee),
-						 COMP_EDITOR_PAGE (priv->sched_page),
-						 _("Scheduling"));
-			comp_editor_append_page (COMP_EDITOR (ee),
-						 COMP_EDITOR_PAGE (priv->meet_page),
-						 _("Invitations"));
-		}
-	
-		for (l = attendees; l != NULL; l = l->next) {
-			ECalComponentAttendee *ca = l->data;
-			EMeetingAttendee *ia;
-
-			ia = E_MEETING_ATTENDEE (e_meeting_attendee_new_from_e_cal_component_attendee (ca));
-
-			/* If we aren't the organizer or the attendee is just delegating, don't allow editing */
-			if (!comp_editor_get_user_org (editor) || e_meeting_attendee_is_set_delto (ia))
-				e_meeting_attendee_set_edit_level (ia,  E_MEETING_ATTENDEE_EDIT_NONE);
-			e_meeting_store_add_attendee (priv->model, ia);
-
-			g_object_unref(ia);
-		}
-
-		/* If we aren't the organizer we can still change our own status */
-		if (!comp_editor_get_user_org (editor)) {
-			EAccountList *accounts;
-			EAccount *account;
-			EIterator *it;
-
-			accounts = itip_addresses_get ();
-			for (it = e_list_get_iterator((EList *)accounts);e_iterator_is_valid(it);e_iterator_next(it)) {
-				EMeetingAttendee *ia;
-
-				account = (EAccount*)e_iterator_get(it);
-
-				ia = e_meeting_store_find_attendee (priv->model, account->id->address, &row);
-				if (ia != NULL)
-					e_meeting_attendee_set_edit_level (ia, E_MEETING_ATTENDEE_EDIT_STATUS);
-			}
-			g_object_unref(it);
-		} else if (e_cal_get_organizer_must_attend (client)) {
-			EMeetingAttendee *ia;
-
-			ia = e_meeting_store_find_attendee (priv->model, organizer.value, &row);
-			if (ia != NULL)
-				e_meeting_attendee_set_edit_level (ia, E_MEETING_ATTENDEE_EDIT_NONE);
-		}
-		
-		priv->meeting_shown = TRUE;
-	}	
-	e_cal_component_free_attendee_list (attendees);
-
-	comp_editor_set_needs_send (COMP_EDITOR (ee), priv->meeting_shown && itip_organizer_is_user (comp, client));
-	
-	priv->updating = FALSE;
-}
-
-static gboolean
-event_editor_send_comp (CompEditor *editor, ECalComponentItipMethod method)
-{
-	EventEditor *ee = EVENT_EDITOR (editor);
-	EventEditorPrivate *priv;
-	ECalComponent *comp = NULL;
-
-	priv = ee->priv;
-
-	/* Don't cancel more than once or when just publishing */
-	if (method == E_CAL_COMPONENT_METHOD_PUBLISH ||
-	    method == E_CAL_COMPONENT_METHOD_CANCEL)
-		goto parent;
-	
-	comp = meeting_page_get_cancel_comp (priv->meet_page);
-	if (comp != NULL) {
-		ECal *client;
-		gboolean result;
-		
-		client = e_meeting_store_get_e_cal (priv->model);
-		result = itip_send_comp (E_CAL_COMPONENT_METHOD_CANCEL, comp,
-				client, NULL, NULL);
-		g_object_unref (comp);
-
-		if (!result)
-			return FALSE;
-	}
-
- parent:
-	if (COMP_EDITOR_CLASS (event_editor_parent_class)->send_comp)
-		return COMP_EDITOR_CLASS (event_editor_parent_class)->send_comp (editor, method);
-
-	return FALSE;
-}
-
-/* Destroy handler for the event editor */
-static void
-event_editor_finalize (GObject *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->event_page) {
- 		g_object_unref (priv->event_page);
-		priv->event_page = NULL;
-	}
-	
-	if (priv->recur_page) {
-		g_object_unref (priv->recur_page);
-		priv->recur_page = NULL;
-	}
-
-	if (priv->meet_page) {
-		g_object_unref (priv->meet_page);
-		priv->meet_page = NULL;
-	}
-
-	if (priv->sched_page) {
-		g_object_unref (priv->sched_page);
-		priv->sched_page = NULL;
-	}
-
-	if (priv->model) {
-		g_object_unref (priv->model);
-		priv->model = NULL;
-	}
-
-	g_free (priv);
-
-	if (G_OBJECT_CLASS (event_editor_parent_class)->finalize)
-		(* G_OBJECT_CLASS (event_editor_parent_class)->finalize) (object);
-}
-
-/**
- * event_editor_new:
- * @client: a ECal
- *
- * 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 (ECal *client, gboolean is_meeting)
-{
-	EventEditor *ee;
-
-	ee = EVENT_EDITOR (g_object_new (TYPE_EVENT_EDITOR, NULL));
-	ee->priv->is_meeting = is_meeting;
-	return event_editor_construct (ee, client);
-}
-
-static void
-show_meeting (EventEditor *ee)
-{
-	EventEditorPrivate *priv;
-
-	priv = ee->priv;
-
-	
-	event_page_set_meeting (priv->event_page, TRUE);
-	if (!priv->meeting_shown) {
-		comp_editor_append_page (COMP_EDITOR (ee),
-					 COMP_EDITOR_PAGE (priv->sched_page),
-					 _("Scheduling"));
-		comp_editor_append_page (COMP_EDITOR (ee),
-					 COMP_EDITOR_PAGE (priv->meet_page),
-					 _("Invitations"));
-		priv->meeting_shown = TRUE;
-
- 		comp_editor_set_changed (COMP_EDITOR (ee), FALSE);
-		comp_editor_set_needs_send (COMP_EDITOR (ee), priv->meeting_shown);
-	}
-	
-}
-
-void
-event_editor_show_meeting (EventEditor *ee)
-{
-	g_return_if_fail (ee != NULL);
-	g_return_if_fail (IS_EVENT_EDITOR (ee));
-
-	show_meeting (ee);
-}
-
-static void
-schedule_meeting_cmd (GtkWidget *widget, gpointer data)
-{
-	EventEditor *ee = EVENT_EDITOR (data);
-
-	show_meeting (ee);
-}
-
-static void
-refresh_meeting_cmd (GtkWidget *widget, gpointer data)
-{
-	EventEditor *ee = EVENT_EDITOR (data);
-	
-	comp_editor_send_comp (COMP_EDITOR (ee), E_CAL_COMPONENT_METHOD_REFRESH);
-}
-
-static void
-cancel_meeting_cmd (GtkWidget *widget, gpointer data)
-{
-	EventEditor *ee = EVENT_EDITOR (data);
-	ECalComponent *comp;
-	
-	comp = comp_editor_get_current_comp (COMP_EDITOR (ee));
-	if (cancel_component_dialog ((GtkWindow *) ee,
-				     comp_editor_get_e_cal (COMP_EDITOR (ee)), comp, FALSE)) {
-		comp_editor_send_comp (COMP_EDITOR (ee), E_CAL_COMPONENT_METHOD_CANCEL);
-		comp_editor_delete_comp (COMP_EDITOR (ee));
-	}
-}
-
-static void
-forward_cmd (GtkWidget *widget, gpointer data)
-{
-	EventEditor *ee = EVENT_EDITOR (data);
-
-	if (comp_editor_save_comp (COMP_EDITOR (ee), TRUE))
-		comp_editor_send_comp (COMP_EDITOR (ee), E_CAL_COMPONENT_METHOD_PUBLISH);
-}
-
-static void
-model_changed (EventEditor *ee)
-{
-	if (!ee->priv->updating) {
-		comp_editor_set_changed (COMP_EDITOR (ee), TRUE);
-		comp_editor_set_needs_send (COMP_EDITOR (ee), TRUE);
-	}
-}
-
-static void
-model_row_change_insert_cb (GtkTreeModel *model, GtkTreePath *path, GtkTreeIter *iter, gpointer data)
-{
-	model_changed (EVENT_EDITOR (data));
-}
-
-static void
-model_row_delete_cb (GtkTreeModel *model, GtkTreePath *path, gpointer data)
-{
-	model_changed (EVENT_EDITOR (data));
-}
-
diff --git a/calendar/gui/dialogs/event-editor.h b/calendar/gui/dialogs/event-editor.h
deleted file mode 100644
index 0f934c28f2..0000000000
--- a/calendar/gui/dialogs/event-editor.h
+++ /dev/null
@@ -1,61 +0,0 @@
-/* Evolution calendar - Event editor dialog
- *
- * Copyright (C) 2000 Ximian, Inc.
- * Copyright (C) 2001 Ximian, Inc.
- *
- * Authors: Miguel de Icaza <miguel@ximian.com>
- *          Federico Mena-Quintero <federico@ximian.com>
- *          Seth Alves <alves@hungry.com>
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of version 2 of the GNU General Public
- * License as published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307, USA.
- */
-
-#ifndef __EVENT_EDITOR_H__
-#define __EVENT_EDITOR_H__
-
-#include <gtk/gtkobject.h>
-#include "comp-editor.h"
-
-
-
-#define TYPE_EVENT_EDITOR            (event_editor_get_type ())
-#define EVENT_EDITOR(obj)            (G_TYPE_CHECK_INSTANCE_CAST ((obj), TYPE_EVENT_EDITOR, EventEditor))
-#define EVENT_EDITOR_CLASS(klass)    (G_TYPE_CHECK_CLASS_CAST ((klass), TYPE_EVENT_EDITOR,	EventEditorClass))
-#define IS_EVENT_EDITOR(obj)         (G_TYPE_CHECK_INSTANCE_TYPE ((obj), TYPE_EVENT_EDITOR))
-#define IS_EVENT_EDITOR_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), TYPE_EVENT_EDITOR))
-
-typedef struct _EventEditor EventEditor;
-typedef struct _EventEditorClass EventEditorClass;
-typedef struct _EventEditorPrivate EventEditorPrivate;
-
-struct _EventEditor {
-	CompEditor parent;
-
-	/* Private data */
-	EventEditorPrivate *priv;
-};
-
-struct _EventEditorClass {
-	CompEditorClass parent_class;
-};
-
-GtkType      event_editor_get_type     (void);
-EventEditor *event_editor_construct    (EventEditor *ee,
-					ECal   *client);
-EventEditor *event_editor_new          (ECal   *client, gboolean is_meeting);
-void         event_editor_show_meeting (EventEditor *ee);
-
-
-
-#endif /* __EVENT_EDITOR_H__ */
diff --git a/calendar/gui/dialogs/event-page.c b/calendar/gui/dialogs/event-page.c
deleted file mode 100644
index 51b11170cd..0000000000
--- a/calendar/gui/dialogs/event-page.c
+++ /dev/null
@@ -1,2065 +0,0 @@
-/* Evolution calendar - Main page of the event editor dialog
- *
- * Copyright (C) 2001 Ximian, Inc.
- *
- * Authors: Federico Mena-Quintero <federico@ximian.com>
- *          Miguel de Icaza <miguel@ximian.com>
- *          Seth Alves <alves@hungry.com>
- *          JP Rosevear <jpr@ximian.com>
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of version 2 of the GNU General Public
- * License as published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307, USA.
- */
-
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
-
-#include <string.h>
-#include <gtk/gtksignal.h>
-#include <gtk/gtktextview.h>
-#include <gtk/gtktogglebutton.h>
-#include <gtk/gtkmessagedialog.h>
-#include <libgnome/gnome-i18n.h>
-#include <glade/glade.h>
-#include <gal/widgets/e-categories.h>
-#include <libedataserverui/e-source-option-menu.h>
-#include "common/authentication.h"
-#include "e-util/e-categories-config.h"
-#include "e-util/e-dialog-widgets.h"
-#include "widgets/misc/e-dateedit.h"
-#include "widgets/misc/e-send-options.h"
-#include <libecal/e-cal-time-util.h>
-#include "../calendar-config.h"
-#include "../e-timezone-entry.h"
-#include "comp-editor.h"
-#include "comp-editor-util.h"
-#include "../e-alarm-list.h"
-#include "alarm-list-dialog.h"
-#include "event-page.h"
-#include "e-send-options-utils.h"
-
-
-
-/* Private part of the EventPage structure */
-struct _EventPagePrivate {
-	/* Glade XML data */
-	GladeXML *xml;
-
-	/* Widgets from the Glade file */
-
-	GtkWidget *main;
-
-	GtkWidget *summary;
-	GtkWidget *summary_label;
-	GtkWidget *location;
-	GtkWidget *location_label;
-
-	GtkWidget *start_time;
-	GtkWidget *end_time;
-	GtkWidget *start_timezone;
-	GtkWidget *end_timezone;
-	GtkWidget *all_day_event;
-
-	GtkWidget *description;
-
-	GtkWidget *classification;
-	
-	GtkWidget *show_time_as_busy;
-
-	GtkWidget *alarm;
-	GtkWidget *alarm_time;
-	GtkWidget *alarm_warning;
-	GtkWidget *alarm_custom;
-
-	GtkWidget *categories_btn;
-	GtkWidget *categories;
-
-	GtkWidget *source_selector;
-	
-	GtkWidget *sendoptions_frame;
-	GtkWidget *sendoptions_button;
-
-	EAlarmList *alarm_list_store;
-	
-	gboolean updating;
-	gboolean sendoptions_shown;
-
-	ESendOptionsDialog *sod;
-	char *old_summary;
-	CalUnits alarm_units;
-	int alarm_interval;
-	
-	/* This is TRUE if both the start & end timezone are the same. If the
-	   start timezone is then changed, we updated the end timezone to the
-	   same value, since 99% of events start and end in one timezone. */
-	gboolean sync_timezones;
-	gboolean is_meeting;
-};
-
-
-
-static void event_page_finalize (GObject *object);
-
-static GtkWidget *event_page_get_widget (CompEditorPage *page);
-static void event_page_focus_main_widget (CompEditorPage *page);
-static gboolean event_page_fill_widgets (CompEditorPage *page, ECalComponent *comp);
-static gboolean event_page_fill_component (CompEditorPage *page, ECalComponent *comp);
-static gboolean event_page_fill_timezones (CompEditorPage *page, GHashTable *timezones);
-static void event_page_set_summary (CompEditorPage *page, const char *summary);
-static void event_page_set_dates (CompEditorPage *page, CompEditorPageDates *dates);
-
-G_DEFINE_TYPE (EventPage, event_page, TYPE_COMP_EDITOR_PAGE);
-
-/* Class initialization function for the event page */
-static void
-event_page_class_init (EventPageClass *class)
-{
-	CompEditorPageClass *editor_page_class;
-	GObjectClass *object_class;
-
-	editor_page_class = (CompEditorPageClass *) class;
-	object_class = (GObjectClass *) class;
-
-	editor_page_class->get_widget = event_page_get_widget;
-	editor_page_class->focus_main_widget = event_page_focus_main_widget;
-	editor_page_class->fill_widgets = event_page_fill_widgets;
-	editor_page_class->fill_component = event_page_fill_component;
-	editor_page_class->fill_timezones = event_page_fill_timezones;
-	editor_page_class->set_summary = event_page_set_summary;
-	editor_page_class->set_dates = event_page_set_dates;
-
-	object_class->finalize = event_page_finalize;
-}
-
-/* Object initialization function for the event page */
-static void
-event_page_init (EventPage *epage)
-{
-	EventPagePrivate *priv;
-
-	priv = g_new0 (EventPagePrivate, 1);
-	epage->priv = priv;
-
-	priv->xml = NULL;
-
-	priv->main = NULL;
-	priv->summary = NULL;
-	priv->summary_label = NULL;
-	priv->location = NULL;
-	priv->location_label = NULL;
-	priv->start_time = NULL;
-	priv->end_time = NULL;
-	priv->start_timezone = NULL;
-	priv->end_timezone = NULL;
-	priv->all_day_event = NULL;
-	priv->description = NULL;
-	priv->classification = NULL;
-	priv->show_time_as_busy = NULL;
-	priv->alarm = NULL;
-	priv->alarm_time = NULL;
-	priv->alarm_custom = NULL;
-	priv->categories_btn = NULL;
-	priv->categories = NULL;
-	priv->sendoptions_frame = NULL;
-	priv->sendoptions_button = NULL;
-	priv->sod = NULL;
-
-	priv->alarm_interval =  -1;
-	
-	priv->updating = FALSE;
-	priv->sendoptions_shown = FALSE;
-	priv->is_meeting = FALSE;
-	priv->sync_timezones = FALSE;
-
-}
-
-/* Destroy handler for the event page */
-static void
-event_page_finalize (GObject *object)
-{
-	EventPage *epage;
-	EventPagePrivate *priv;
-
-	g_return_if_fail (object != NULL);
-	g_return_if_fail (IS_EVENT_PAGE (object));
-
-	epage = EVENT_PAGE (object);
-	priv = epage->priv;
-
-	if (priv->main)
-		gtk_widget_unref (priv->main);
-
-	if (priv->xml) {
-		g_object_unref (priv->xml);
-		priv->xml = NULL;
-	}
-
-	if (priv->alarm_list_store) {
-		g_object_unref (priv->alarm_list_store);
-		priv->alarm_list_store = NULL;
-	}
-
-	if (priv->sod) {
-		g_object_unref (priv->sod);
-		priv->sod = NULL;
-	}
-	g_free (priv->old_summary);
-	
-	g_free (priv);
-	epage->priv = NULL;
-
-	if (G_OBJECT_CLASS (event_page_parent_class)->finalize)
-		(* G_OBJECT_CLASS (event_page_parent_class)->finalize) (object);
-}
-
-
-
-static const int classification_map[] = {
-	E_CAL_COMPONENT_CLASS_PUBLIC,
-	E_CAL_COMPONENT_CLASS_PRIVATE,
-	E_CAL_COMPONENT_CLASS_CONFIDENTIAL,
-	-1
-};
-
-enum {
-	ALARM_15_MINUTES,
-	ALARM_1_HOUR,
-	ALARM_1_DAY,
-	ALARM_USER_TIME
-};
-
-static const int alarm_map[] = {
-	ALARM_15_MINUTES,
-	ALARM_1_HOUR,
-	ALARM_1_DAY,
-	ALARM_USER_TIME,
-	-1
-};
-
-/* get_widget handler for the event page */
-static GtkWidget *
-event_page_get_widget (CompEditorPage *page)
-{
-	EventPage *epage;
-	EventPagePrivate *priv;
-
-	epage = EVENT_PAGE (page);
-	priv = epage->priv;
-
-	return priv->main;
-}
-
-/* focus_main_widget handler for the event page */
-static void
-event_page_focus_main_widget (CompEditorPage *page)
-{
-	EventPage *epage;
-	EventPagePrivate *priv;
-
-	epage = EVENT_PAGE (page);
-	priv = epage->priv;
-
-	gtk_widget_grab_focus (priv->summary);
-}
-
-/* Sets the 'All Day Event' flag to the given value (without emitting signals),
- * and shows or hides the widgets as appropriate. */
-static void
-set_all_day (EventPage *epage, gboolean all_day)
-{
-	EventPagePrivate *priv;
-
-	priv = epage->priv;
-
-	gtk_signal_handler_block_by_data (GTK_OBJECT (priv->all_day_event),
-					  epage);
-	e_dialog_toggle_set (priv->all_day_event, all_day);
-	gtk_signal_handler_unblock_by_data (GTK_OBJECT (priv->all_day_event),
-					    epage);
-
-	e_date_edit_set_show_time (E_DATE_EDIT (priv->start_time), !all_day);
-	e_date_edit_set_show_time (E_DATE_EDIT (priv->end_time), !all_day);
-
-	/* DATE values do not have timezones, so we hide the fields. */
-	if (all_day) {
-		gtk_widget_hide (priv->start_timezone);
-		gtk_widget_hide (priv->end_timezone);
-	} else {
-		gtk_widget_show (priv->start_timezone);
-		gtk_widget_show (priv->end_timezone);
-	}
-}
-
-static void
-update_time (EventPage *epage, ECalComponentDateTime *start_date, ECalComponentDateTime *end_date)
-{
-	EventPagePrivate *priv;
-	struct icaltimetype *start_tt, *end_tt, implied_tt;
-	icaltimezone *start_zone = NULL, *end_zone = NULL;
-	gboolean all_day_event;
-
-	priv = epage->priv;
-
-	/* Note that if we are creating a new event, the timezones may not be
-	   on the server, so we try to get the builtin timezone with the TZID
-	   first. */
-	start_zone = icaltimezone_get_builtin_timezone_from_tzid (start_date->tzid);
-	if (!start_zone) {
-		/* FIXME: Handle error better. */
-		if (!e_cal_get_timezone (COMP_EDITOR_PAGE (epage)->client,
-					      start_date->tzid, &start_zone, NULL)) {
-			g_warning ("Couldn't get timezone from server: %s",
-				   start_date->tzid ? start_date->tzid : "");			
-		}
-	}
-
-	end_zone = icaltimezone_get_builtin_timezone_from_tzid (end_date->tzid);
-	if (!end_zone) {
-		if (!e_cal_get_timezone (COMP_EDITOR_PAGE (epage)->client,
-					      end_date->tzid, &end_zone, NULL)) {
-			/* FIXME: Handle error better. */
-			g_warning ("Couldn't get timezone from server: %s",
-				   end_date->tzid ? end_date->tzid : "");
-		}
-	}
-
-	/* If both times are DATE values, we set the 'All Day Event' checkbox.
-	   Also, if DTEND is after DTSTART, we subtract 1 day from it. */
-	all_day_event = FALSE;
-	start_tt = start_date->value;
-	end_tt = end_date->value;
-	if (!end_tt && start_tt->is_date) {
-		end_tt = &implied_tt;
-		*end_tt = *start_tt;
-		icaltime_adjust (end_tt, 1, 0, 0, 0);
-	}
-	
-	if (start_tt->is_date && end_tt->is_date) {
-		all_day_event = TRUE;
-		if (icaltime_compare_date_only (*end_tt, *start_tt) > 0) {
-			icaltime_adjust (end_tt, -1, 0, 0, 0);
-		}
-	}
-
-	set_all_day (epage, all_day_event);
-
-	/* If it is an all day event, we set both timezones to the current
-	   timezone, so that if the user toggles the 'All Day Event' checkbox
-	   the event uses the current timezone rather than none at all. */
-	if (all_day_event)
-		start_zone = end_zone = calendar_config_get_icaltimezone ();
-
-	gtk_signal_handler_block_by_data (GTK_OBJECT (priv->start_time),
-					  epage);
-	g_signal_handlers_block_matched (priv->end_time, G_SIGNAL_MATCH_DATA, 0, 0, NULL, NULL, epage);
-
-	e_date_edit_set_date (E_DATE_EDIT (priv->start_time), start_tt->year,
-			      start_tt->month, start_tt->day);
-	e_date_edit_set_time_of_day (E_DATE_EDIT (priv->start_time),
-				     start_tt->hour, start_tt->minute);
-
-	e_date_edit_set_date (E_DATE_EDIT (priv->end_time), end_tt->year,
-			      end_tt->month, end_tt->day);
-	e_date_edit_set_time_of_day (E_DATE_EDIT (priv->end_time),
-				     end_tt->hour, end_tt->minute);
-
-	gtk_signal_handler_unblock_by_data (GTK_OBJECT (priv->start_time),
-					    epage);
-	gtk_signal_handler_unblock_by_data (GTK_OBJECT (priv->end_time),
-					    epage);
-
-	/* Set the timezones, and set sync_timezones to TRUE if both timezones
-	   are the same. */
-	gtk_signal_handler_block_by_data (GTK_OBJECT (priv->start_timezone),
-					  epage);
-	g_signal_handlers_block_matched (priv->end_timezone, G_SIGNAL_MATCH_DATA, 0, 0, NULL, NULL, epage);
-	
-	e_timezone_entry_set_timezone (E_TIMEZONE_ENTRY (priv->start_timezone),
-				       start_zone);
-	e_timezone_entry_set_timezone (E_TIMEZONE_ENTRY (priv->end_timezone),
-				       end_zone);
-
-	gtk_signal_handler_unblock_by_data (GTK_OBJECT (priv->start_timezone),
-					    epage);
-	gtk_signal_handler_unblock_by_data (GTK_OBJECT (priv->end_timezone),
-					    epage);
-
-	priv->sync_timezones = (start_zone == end_zone) ? TRUE : FALSE;
-
-}
-
-/* Fills the widgets with default values */
-static void
-clear_widgets (EventPage *epage)
-{
-	EventPagePrivate *priv;
-
-	priv = epage->priv;
-
-	/* Summary, description */
-	e_dialog_editable_set (priv->summary, NULL);
-	e_dialog_editable_set (priv->location, NULL);
-	gtk_text_buffer_set_text (gtk_text_view_get_buffer (GTK_TEXT_VIEW (priv->description)), "", 0);
-
-	/* Start and end times */
-	gtk_signal_handler_block_by_data (GTK_OBJECT (priv->start_time),
-					  epage);
-	g_signal_handlers_block_matched (priv->end_time, G_SIGNAL_MATCH_DATA, 0, 0, NULL, NULL, epage);
-
-	e_date_edit_set_time (E_DATE_EDIT (priv->start_time), 0);
-	e_date_edit_set_time (E_DATE_EDIT (priv->end_time), 0);
-
-	gtk_signal_handler_unblock_by_data (GTK_OBJECT (priv->start_time),
-					    epage);
-	gtk_signal_handler_unblock_by_data (GTK_OBJECT (priv->end_time),
-					    epage);
-
-	set_all_day (epage, FALSE);
-
-	/* Classification */
-	e_dialog_option_menu_set (priv->classification, E_CAL_COMPONENT_CLASS_PRIVATE, classification_map);
-
-	/* Show Time As (Transparency) */
-	e_dialog_toggle_set (priv->show_time_as_busy, TRUE);
-
-	/* Alarm */
-	e_dialog_toggle_set (priv->alarm, FALSE);
-	e_dialog_option_menu_set (priv->alarm_time, ALARM_15_MINUTES, alarm_map);
-	
-	/* Categories */
-	e_dialog_editable_set (priv->categories, NULL);
-}
-
-static gboolean
-is_custom_alarm (ECalComponentAlarm *ca, char *old_summary, CalUnits user_units, int user_interval, int *alarm_type) 
-{
-	ECalComponentAlarmTrigger trigger;
-	ECalComponentAlarmRepeat repeat;
-	ECalComponentAlarmAction action;
-	ECalComponentText desc;
-	icalcomponent *icalcomp;
-	icalproperty *icalprop;
-	icalattach *attach;
-	gboolean needs_desc = FALSE;
-	
-	e_cal_component_alarm_get_action (ca, &action);
-	if (action != E_CAL_COMPONENT_ALARM_DISPLAY)
-		return TRUE;
-
-	e_cal_component_alarm_get_attach (ca, &attach);
-	if (attach)
-		return TRUE;
-
-	icalcomp = e_cal_component_alarm_get_icalcomponent (ca);
-	icalprop = icalcomponent_get_first_property (icalcomp, ICAL_X_PROPERTY);
-	while (icalprop) {
-		const char *x_name;
-
-		x_name = icalproperty_get_x_name (icalprop);
-		if (!strcmp (x_name, "X-EVOLUTION-NEEDS-DESCRIPTION"))
-			needs_desc = TRUE;
-
-		icalprop = icalcomponent_get_next_property (icalcomp, ICAL_X_PROPERTY);
-	}
-
-	if (!needs_desc) {	
-		e_cal_component_alarm_get_description (ca, &desc);
-		if (!desc.value || !old_summary || strcmp (desc.value, old_summary))
-			return TRUE;
-	}
-
-	e_cal_component_alarm_get_repeat (ca, &repeat);
-	if (repeat.repetitions != 0)
-		return TRUE;
-	
-	if (e_cal_component_alarm_has_attendees (ca))
-		return TRUE;
-	
-	e_cal_component_alarm_get_trigger (ca, &trigger);
-	if (trigger.type != E_CAL_COMPONENT_ALARM_TRIGGER_RELATIVE_START)
-		return TRUE;
-	
-	if (trigger.u.rel_duration.is_neg != 1)
-		return TRUE;
-
-	if (trigger.u.rel_duration.weeks != 0)
-		return TRUE;
-
-	if (trigger.u.rel_duration.seconds != 0)
-		return TRUE;
-
-	if (trigger.u.rel_duration.days == 1
-	    && trigger.u.rel_duration.hours == 0
-	    && trigger.u.rel_duration.minutes == 0) {
-		if (alarm_type)
-			*alarm_type = ALARM_1_DAY;
-		return FALSE;
-	}
-	
-	if (trigger.u.rel_duration.days == 0
-	    && trigger.u.rel_duration.hours == 1
-	    && trigger.u.rel_duration.minutes == 0) {
-		if (alarm_type)
-			*alarm_type = ALARM_1_HOUR;
-		return FALSE;
-	}
-	
-	if (trigger.u.rel_duration.days == 0
-	    && trigger.u.rel_duration.hours == 0
-	    && trigger.u.rel_duration.minutes == 15) {
-		if (alarm_type)
-			*alarm_type = ALARM_15_MINUTES;		
-		return FALSE;
-	}
-
-	if (user_interval != -1) {
-		switch (user_units) {
-		case CAL_DAYS:		
-			if (trigger.u.rel_duration.days == user_interval
-			    && trigger.u.rel_duration.hours == 0
-			    && trigger.u.rel_duration.minutes == 0) {
-				if (alarm_type)
-					*alarm_type = ALARM_USER_TIME;		
-				return FALSE;
-			}
-			break;
-			
-		case CAL_HOURS:
-			if (trigger.u.rel_duration.days == 0
-			    && trigger.u.rel_duration.hours == user_interval
-			    && trigger.u.rel_duration.minutes == 0) {
-				if (alarm_type)
-					*alarm_type = ALARM_USER_TIME;		
-				return FALSE;
-			}
-			break;
-			
-		case CAL_MINUTES:
-			if (trigger.u.rel_duration.days == 0
-			    && trigger.u.rel_duration.hours == 0
-			    && trigger.u.rel_duration.minutes == user_interval) {
-				if (alarm_type)
-					*alarm_type = ALARM_USER_TIME;		
-				return FALSE;
-			}
-			break;
-		}		
-	}
-
-	return TRUE;
-}
-
-static gboolean
-is_custom_alarm_uid_list (ECalComponent *comp, GList *alarms, char *old_summary, CalUnits user_units, int user_interval, int *alarm_type)
-{
-	ECalComponentAlarm *ca;
-	gboolean result;
-	
-	if (g_list_length (alarms) > 1)
-		return TRUE;
-
-	ca = e_cal_component_get_alarm (comp, alarms->data);
-	result = is_custom_alarm (ca, old_summary, user_units, user_interval, alarm_type);
-	e_cal_component_alarm_free (ca);
-
-	return result;
-}
-
-static gboolean
-is_custom_alarm_store (EAlarmList *alarm_list_store, char *old_summary,  CalUnits user_units, int user_interval, int *alarm_type) 
-{
-	const ECalComponentAlarm *alarm;
-	GtkTreeModel *model;
-	GtkTreeIter iter;
-	gboolean valid_iter;
-	
-	model = GTK_TREE_MODEL (alarm_list_store);
-
-	valid_iter = gtk_tree_model_get_iter_first (model, &iter);
-	if (!valid_iter)
-		return FALSE;
-
-	alarm = e_alarm_list_get_alarm (alarm_list_store, &iter);
-	if (is_custom_alarm ((ECalComponentAlarm *)alarm, old_summary, user_units, user_interval, alarm_type))
-		return TRUE;
-
-	valid_iter = gtk_tree_model_iter_next (model, &iter);
-	if (valid_iter)
-		return TRUE;
-	
-	return FALSE;
-}
-
-static void
-sensitize_widgets (EventPage *epage)
-{
-	gboolean read_only, custom, alarm;
-	EventPagePrivate *priv;
-	
-	priv = epage->priv;
-
-	if (!e_cal_is_read_only (COMP_EDITOR_PAGE (epage)->client, &read_only, NULL))
-		read_only = TRUE;
-
-	custom = is_custom_alarm_store (priv->alarm_list_store, priv->old_summary, priv->alarm_units, priv->alarm_interval, NULL);
-	alarm = e_dialog_toggle_get (priv->alarm);
-	
-	gtk_widget_set_sensitive (priv->summary_label, !read_only);
-	gtk_entry_set_editable (GTK_ENTRY (priv->summary), !read_only);
-	gtk_widget_set_sensitive (priv->location_label, !read_only);
-	gtk_entry_set_editable (GTK_ENTRY (priv->location), !read_only);
-	gtk_widget_set_sensitive (priv->start_time, !read_only);
-	gtk_widget_set_sensitive (priv->start_timezone, !read_only);
-	gtk_widget_set_sensitive (priv->end_time, !read_only);
-	gtk_widget_set_sensitive (priv->end_timezone, !read_only);
-	gtk_widget_set_sensitive (priv->all_day_event, !read_only);
-	gtk_widget_set_sensitive (priv->description, !read_only);
-	gtk_widget_set_sensitive (priv->classification, !read_only);
-	gtk_widget_set_sensitive (priv->show_time_as_busy, !read_only);
-	gtk_widget_set_sensitive (priv->alarm, !read_only);
-	gtk_widget_set_sensitive (priv->alarm_time, !read_only && !custom && alarm);
-	gtk_widget_set_sensitive (priv->alarm_custom, alarm);
-	if (custom)
-		gtk_widget_show (priv->alarm_warning);
-	else
-		gtk_widget_hide (priv->alarm_warning);
-	gtk_widget_set_sensitive (priv->categories_btn, !read_only);
-	gtk_widget_set_sensitive (priv->sendoptions_button, !read_only);
-	gtk_entry_set_editable (GTK_ENTRY (priv->categories), !read_only);
-}
-
-void
-event_page_hide_options (EventPage *page)
-{
-	g_return_if_fail (IS_EVENT_PAGE (page));
-
-	gtk_widget_hide (page->priv->sendoptions_frame);
-
-	page->priv->sendoptions_shown = FALSE;
-}
-
-void
-event_page_show_options (EventPage *page)
-{
-	g_return_if_fail (IS_EVENT_PAGE (page));
-
-	gtk_widget_show (page->priv->sendoptions_frame);
-	page->priv->sendoptions_shown = TRUE;
-}
-
-void 
-event_page_set_meeting (EventPage *page, gboolean set)
-{
-	g_return_if_fail (IS_EVENT_PAGE (page));
-
-	page->priv->is_meeting = set;
-}
-
-/* fill_widgets handler for the event page */
-static gboolean
-event_page_fill_widgets (CompEditorPage *page, ECalComponent *comp)
-{
-	EventPage *epage;
-	EventPagePrivate *priv;
-	ECalComponentText text;
-	ECalComponentClassification cl;
-	ECalComponentTransparency transparency;
-	ECalComponentDateTime start_date, end_date;
-	icalcomponent *icalcomp;
-	const char *location, *uid = NULL;
-	const char *categories;
-	ESource *source;
-	GSList *l;
-	gboolean validated = TRUE;
-	
-	g_return_val_if_fail (page->client != NULL, FALSE);
-
-	epage = EVENT_PAGE (page);
-	priv = epage->priv;
-
-	/* Don't send off changes during this time */
-	priv->updating = TRUE;
-
-	/* Clean the page */
-	clear_widgets (epage);
-
-	/* Summary, location, description(s) */
-
-	e_cal_component_get_summary (comp, &text);
-	e_dialog_editable_set (priv->summary, text.value);
-	priv->old_summary = g_strdup (text.value);
-	
-	e_cal_component_get_location (comp, &location);
-	e_dialog_editable_set (priv->location, location);
-
-	e_cal_component_get_description_list (comp, &l);
-	if (l && l->data) {
-		ECalComponentText *dtext;
-		
-		dtext = l->data;
-		gtk_text_buffer_set_text (gtk_text_view_get_buffer (GTK_TEXT_VIEW (priv->description)),
-					  dtext->value ? dtext->value : "", -1);
-	}
-	e_cal_component_free_text_list (l);
-
-	/* Start and end times */
-
-	e_cal_component_get_dtstart (comp, &start_date);
-	e_cal_component_get_dtend (comp, &end_date);
-	if (!start_date.value) {
-		comp_editor_page_display_validation_error (page, _("Event with no start date"), priv->start_time);
-		validated = FALSE;
-	} else if (!end_date.value) {
-		comp_editor_page_display_validation_error (page, _("Event with no end date"), priv->end_time);
-		validated = FALSE;
-	} else
-		update_time (epage, &start_date, &end_date);
-	
-	e_cal_component_free_datetime (&start_date);
-	e_cal_component_free_datetime (&end_date);
-
-	/* Classification */
-	e_cal_component_get_classification (comp, &cl);
-
-	switch (cl) {
-	case E_CAL_COMPONENT_CLASS_PUBLIC:
-	case E_CAL_COMPONENT_CLASS_PRIVATE:
-	case E_CAL_COMPONENT_CLASS_CONFIDENTIAL:
-		break;
-	default:
-		cl = E_CAL_COMPONENT_CLASS_PUBLIC;
-		break;
-	}
-	e_dialog_option_menu_set (priv->classification, cl, classification_map);
-
-	/* Show Time As (Transparency) */
-	e_cal_component_get_transparency (comp, &transparency);
-	switch (transparency) {
-	case E_CAL_COMPONENT_TRANSP_TRANSPARENT:
-		e_dialog_toggle_set (priv->show_time_as_busy, FALSE);
-		break;
-
-	default:
-		e_dialog_toggle_set (priv->show_time_as_busy, TRUE);
-		break;
-	}
-	if (e_cal_get_static_capability (page->client, CAL_STATIC_CAPABILITY_NO_TRANSPARENCY))
-		gtk_widget_hide (priv->show_time_as_busy);
-	else
-		gtk_widget_show (priv->show_time_as_busy);
-
-	/* Alarms */
-	g_signal_handlers_block_matched (priv->alarm, G_SIGNAL_MATCH_DATA, 0, 0, NULL, NULL, epage);
-	if (e_cal_component_has_alarms (comp)) {
-		GList *alarms, *l;
-		int alarm_type;
-		
-		e_dialog_toggle_set (priv->alarm, TRUE);
-
-		alarms = e_cal_component_get_alarm_uids (comp);
-		if (!is_custom_alarm_uid_list (comp, alarms, priv->old_summary, priv->alarm_units, priv->alarm_interval, &alarm_type))
-			e_dialog_option_menu_set (priv->alarm_time, alarm_type, alarm_map);
-
-		for (l = alarms; l != NULL; l = l->next) {
-			ECalComponentAlarm *ca;
-			
-			ca = e_cal_component_get_alarm (comp, l->data);
-			e_alarm_list_append (priv->alarm_list_store, NULL, ca);			
-			e_cal_component_alarm_free (ca);
-		}
-
-		cal_obj_uid_list_free (alarms);
-	} else {
-		e_dialog_toggle_set (priv->alarm, FALSE);
-		e_dialog_option_menu_set (priv->alarm_time, priv->alarm_interval == -1 ? ALARM_15_MINUTES : ALARM_USER_TIME, alarm_map);
-	}
-	g_signal_handlers_unblock_matched (priv->alarm, G_SIGNAL_MATCH_DATA, 0, 0, NULL, NULL, epage);
-	
-	/* Categories */
-	e_cal_component_get_categories (comp, &categories);
-	e_dialog_editable_set (priv->categories, categories);
-
-	/* Source */
-	source = e_cal_get_source (page->client);
-	e_source_option_menu_select (E_SOURCE_OPTION_MENU (priv->source_selector), source);
-
-	e_cal_component_get_uid (comp, &uid);
-	if (e_cal_get_object (COMP_EDITOR_PAGE (epage)->client, uid, NULL, &icalcomp, NULL)) {
-		icalcomponent_free (icalcomp);
-		event_page_hide_options (epage);
-	}
-
-	priv->updating = FALSE;
-
-	sensitize_widgets (epage);
-
-	return validated;
-}
-
-/* fill_component handler for the event page */
-static gboolean
-event_page_fill_component (CompEditorPage *page, ECalComponent *comp)
-{
-	EventPage *epage;
-	EventPagePrivate *priv;
-	ECalComponentDateTime start_date, end_date;
-	struct icaltimetype start_tt, end_tt;
-	gboolean all_day_event, start_date_set, end_date_set, busy;
-	char *cat, *str;
-	ECalComponentClassification classif;
-	GtkTextBuffer *text_buffer;
-	GtkTextIter text_iter_start, text_iter_end;
-
-	epage = EVENT_PAGE (page);
-	priv = epage->priv;
-	text_buffer = gtk_text_view_get_buffer (GTK_TEXT_VIEW (priv->description));
-
-	/* Summary */
-
-	str = e_dialog_editable_get (priv->summary);
-	if (!str || strlen (str) == 0)
-		e_cal_component_set_summary (comp, NULL);
-	else {
-		ECalComponentText text;
-
-		text.value = str;
-		text.altrep = NULL;
-
-		e_cal_component_set_summary (comp, &text);
-	}
-
-	if (str)
-		g_free (str);
-
-	/* Location */
-
-	str = e_dialog_editable_get (priv->location);
-	if (!str || strlen (str) == 0)
-		e_cal_component_set_location (comp, NULL);
-	else
-		e_cal_component_set_location (comp, str);
-
-	if (str)
-		g_free (str);
-
-	/* Description */
-
-	gtk_text_buffer_get_start_iter (text_buffer, &text_iter_start);
-	gtk_text_buffer_get_end_iter   (text_buffer, &text_iter_end);
-	str = gtk_text_buffer_get_text (text_buffer, &text_iter_start, &text_iter_end, FALSE);
-
-	if (!str || strlen (str) == 0)
-		e_cal_component_set_description_list (comp, NULL);
-	else {
-		GSList l;
-		ECalComponentText text;
-
-		text.value = str;
-		text.altrep = NULL;
-		l.data = &text;
-		l.next = NULL;
-
-		e_cal_component_set_description_list (comp, &l);
-	}
-
-	if (str)
-		g_free (str);
-
-	/* Dates */
-
-	start_tt = icaltime_null_time ();
-	start_date.value = &start_tt;
-	start_date.tzid = NULL;
-
-	end_tt = icaltime_null_time ();
-	end_date.value = &end_tt;
-	end_date.tzid = NULL;
-
-	if (!e_date_edit_date_is_valid (E_DATE_EDIT (priv->start_time))) {
-		comp_editor_page_display_validation_error (page, _("Start date is wrong"), priv->start_time);
-		return FALSE;
-	}
-	start_date_set = e_date_edit_get_date (E_DATE_EDIT (priv->start_time),
-					       &start_tt.year,
-					       &start_tt.month,
-					       &start_tt.day);
-	g_assert (start_date_set);
-
-	if (!e_date_edit_date_is_valid (E_DATE_EDIT (priv->end_time))) {
-		comp_editor_page_display_validation_error (page, _("End date is wrong"), priv->end_time);
-		return FALSE;
-	}
-	end_date_set = e_date_edit_get_date (E_DATE_EDIT (priv->end_time),
-					     &end_tt.year,
-					     &end_tt.month,
-					     &end_tt.day);
-	g_assert (end_date_set);
-
-	/* If the all_day toggle is set, we use DATE values for DTSTART and
-	   DTEND. If not, we fetch the hour & minute from the widgets. */
-	all_day_event = e_dialog_toggle_get (priv->all_day_event);
-
-	if (all_day_event) {
-		start_tt.is_date = TRUE;
-		end_tt.is_date = TRUE;
-
-		/* We have to add 1 day to DTEND, as it is not inclusive. */
-		icaltime_adjust (&end_tt, 1, 0, 0, 0);
-	} else {
-		icaltimezone *start_zone, *end_zone;
-
-		if (!e_date_edit_time_is_valid (E_DATE_EDIT (priv->start_time))) {
-			comp_editor_page_display_validation_error (page, _("Start time is wrong"), priv->start_time);
-			return FALSE;
-		}
-		e_date_edit_get_time_of_day (E_DATE_EDIT (priv->start_time),
-					     &start_tt.hour,
-					     &start_tt.minute);
-		if (!e_date_edit_time_is_valid (E_DATE_EDIT (priv->end_time))) {
-			comp_editor_page_display_validation_error (page, _("End time is wrong"), priv->end_time);
-			return FALSE;
-		}
-		e_date_edit_get_time_of_day (E_DATE_EDIT (priv->end_time),
-					     &end_tt.hour,
-					     &end_tt.minute);
-		start_zone = e_timezone_entry_get_timezone (E_TIMEZONE_ENTRY (priv->start_timezone));
-		start_date.tzid = icaltimezone_get_tzid (start_zone);
-		end_zone = e_timezone_entry_get_timezone (E_TIMEZONE_ENTRY (priv->end_timezone));
-		end_date.tzid = icaltimezone_get_tzid (end_zone);
-	}
-
-	e_cal_component_set_dtstart (comp, &start_date);
-	e_cal_component_set_dtend (comp, &end_date);
-
-
-	/* Categories */
-
-	cat = e_dialog_editable_get (priv->categories);
-	str = comp_editor_strip_categories (cat);
-	if (cat)
-		g_free (cat);
-
-	e_cal_component_set_categories (comp, str);
-
-	if (str)
-		g_free (str);
-
-	/* Classification */
-	classif = e_dialog_option_menu_get (priv->classification, classification_map);
-	e_cal_component_set_classification (comp, classif);
-
-	/* Show Time As (Transparency) */
-	busy = e_dialog_toggle_get (priv->show_time_as_busy);
-	e_cal_component_set_transparency (comp, busy ? E_CAL_COMPONENT_TRANSP_OPAQUE : E_CAL_COMPONENT_TRANSP_TRANSPARENT);
-
-	/* send options */
-	if (priv->sendoptions_shown && priv->sod) 
-		e_sendoptions_utils_fill_component (priv->sod, comp);
-
-	/* Alarm */
-	e_cal_component_remove_all_alarms (comp);
-	if (e_dialog_toggle_get (priv->alarm)) {
-		if (is_custom_alarm_store (priv->alarm_list_store, priv->old_summary, priv->alarm_units, priv->alarm_interval, NULL)) {
-			GtkTreeModel *model;
-			GtkTreeIter iter;
-			gboolean valid_iter;
-
-			model = GTK_TREE_MODEL (priv->alarm_list_store);
-			
-			for (valid_iter = gtk_tree_model_get_iter_first (model, &iter); valid_iter;
-			     valid_iter = gtk_tree_model_iter_next (model, &iter)) {
-				ECalComponentAlarm *alarm, *alarm_copy;
-				icalcomponent *icalcomp;
-				icalproperty *icalprop;
-				
-				alarm = (ECalComponentAlarm *) e_alarm_list_get_alarm (priv->alarm_list_store, &iter);
-				g_assert (alarm != NULL);
-				
-				/* We set the description of the alarm if it's got
-				 * the X-EVOLUTION-NEEDS-DESCRIPTION property.
-				 */
-				icalcomp = e_cal_component_alarm_get_icalcomponent (alarm);
-				icalprop = icalcomponent_get_first_property (icalcomp, ICAL_X_PROPERTY);
-				while (icalprop) {
-					const char *x_name;
-					ECalComponentText summary;
-
-					x_name = icalproperty_get_x_name (icalprop);
-					if (!strcmp (x_name, "X-EVOLUTION-NEEDS-DESCRIPTION")) {
-						e_cal_component_get_summary (comp, &summary);
-						e_cal_component_alarm_set_description (alarm, &summary);
-
-						icalcomponent_remove_property (icalcomp, icalprop);
-						break;
-					}
-
-					icalprop = icalcomponent_get_next_property (icalcomp, ICAL_X_PROPERTY);
-				}
-
-				/* We clone the alarm to maintain the invariant that the alarm
-				 * structures in the list did *not* come from the component.
-				 */
-
-				alarm_copy = e_cal_component_alarm_clone (alarm);
-				e_cal_component_add_alarm (comp, alarm_copy);
-				e_cal_component_alarm_free (alarm_copy);
-			}
-		} else {
-			ECalComponentAlarm *ca;
-			ECalComponentText summary;
-			ECalComponentAlarmTrigger trigger;
-			int alarm_type;
-
-			ca = e_cal_component_alarm_new ();
-			
-			e_cal_component_get_summary (comp, &summary);
-			e_cal_component_alarm_set_description (ca, &summary);
-		
-			e_cal_component_alarm_set_action (ca, E_CAL_COMPONENT_ALARM_DISPLAY);
-
-			memset (&trigger, 0, sizeof (ECalComponentAlarmTrigger));
-			trigger.type = E_CAL_COMPONENT_ALARM_TRIGGER_RELATIVE_START;		
-			trigger.u.rel_duration.is_neg = 1;
-		
-			alarm_type = e_dialog_option_menu_get (priv->alarm_time, alarm_map);
-			switch (alarm_type) {
-			case ALARM_15_MINUTES:
-				trigger.u.rel_duration.minutes = 15;
-				break;
-			
-			case ALARM_1_HOUR:
-				trigger.u.rel_duration.hours = 1;
-				break;
-			
-			case ALARM_1_DAY:
-				trigger.u.rel_duration.days = 1;
-				break;
-
-			case ALARM_USER_TIME:
-				switch (calendar_config_get_default_reminder_units ()) {
-				case CAL_DAYS:		
-					trigger.u.rel_duration.days = priv->alarm_interval;
-					break;
-		
-				case CAL_HOURS:
-					trigger.u.rel_duration.hours = priv->alarm_interval;
-					break;
-		
-				case CAL_MINUTES:
-					trigger.u.rel_duration.minutes = priv->alarm_interval;
-					break;
-				}
-				break;
-				
-			default:
-				break;
-			}		
-			e_cal_component_alarm_set_trigger (ca, trigger);
-
-			e_cal_component_add_alarm (comp, ca);
-		}
-	}
-	
-	return TRUE;
-}
-
-/* fill_timezones handler for the event page */
-static gboolean
-event_page_fill_timezones (CompEditorPage *page, GHashTable *timezones)
-{
-	EventPage *epage;
-	EventPagePrivate *priv;
-	icaltimezone *zone;
-
-	epage = EVENT_PAGE (page);
-	priv = epage->priv;
-
-	/* add start date timezone */
-	zone = e_timezone_entry_get_timezone (E_TIMEZONE_ENTRY (priv->start_timezone));
-	if (zone) {
-		if (!g_hash_table_lookup (timezones, icaltimezone_get_tzid (zone)))
-			g_hash_table_insert (timezones, icaltimezone_get_tzid (zone), zone);
-	}
-
-	/* add end date timezone */
-	zone = e_timezone_entry_get_timezone (E_TIMEZONE_ENTRY (priv->end_timezone));
-	if (zone) {
-		if (!g_hash_table_lookup (timezones, icaltimezone_get_tzid (zone)))
-			g_hash_table_insert (timezones, icaltimezone_get_tzid (zone), zone);
-	}
-
-	return TRUE;
-}
-
-/* set_summary handler for the event page */
-static void
-event_page_set_summary (CompEditorPage *page, const char *summary)
-{
-	/* nothing */
-}
-
-static void
-event_page_set_dates (CompEditorPage *page, CompEditorPageDates *dates)
-{	
-	update_time (EVENT_PAGE (page), dates->start, dates->end);
-}
-
-
-
-/* Gets the widgets from the XML file and returns if they are all available. */
-static gboolean
-get_widgets (EventPage *epage)
-{
-	CompEditorPage *page = COMP_EDITOR_PAGE (epage);
-	EventPagePrivate *priv;
-	GSList *accel_groups;
-	GtkWidget *toplevel;
-
-	priv = epage->priv;
-
-#define GW(name) glade_xml_get_widget (priv->xml, name)
-
-	priv->main = GW ("event-page");
-	if (!priv->main)
-		return FALSE;
-
-	/* Get the GtkAccelGroup from the toplevel window, so we can install
-	   it when the notebook page is mapped. */
-	toplevel = gtk_widget_get_toplevel (priv->main);
-	accel_groups = gtk_accel_groups_from_object (G_OBJECT (toplevel));
-	if (accel_groups) {
-		page->accel_group = accel_groups->data;
-		gtk_accel_group_ref (page->accel_group);
-	}
-
-	gtk_widget_ref (priv->main);
-	gtk_container_remove (GTK_CONTAINER (priv->main->parent), priv->main);
-
-	priv->summary = GW ("summary");
-	priv->summary_label = GW ("summary-label");
-	priv->location = GW ("location");
-	priv->location_label = GW ("location-label");
-
-	/* Glade's visibility flag doesn't seem to work for custom widgets */
-	priv->start_time = GW ("start-time");
-	gtk_widget_show (priv->start_time);
-	priv->end_time = GW ("end-time");
-	gtk_widget_show (priv->end_time);
-
-	priv->start_timezone = GW ("start-timezone");
-	priv->end_timezone = GW ("end-timezone");
-	priv->all_day_event = GW ("all-day-event");
-
-	priv->description = GW ("description");
-
-	priv->classification = GW ("classification");
-
-	priv->show_time_as_busy = GW ("show-time-as-busy");
-
-	priv->alarm = GW ("alarm");
-	priv->alarm_time = GW ("alarm-time");
-	priv->alarm_warning = GW ("alarm-warning");
-	priv->alarm_custom = GW ("alarm-custom");
-
-	priv->categories_btn = GW ("categories-button");
-	priv->categories = GW ("categories");
-
-	priv->source_selector = GW ("source");
-
-	priv->sendoptions_frame = GW ("send-options-frame");
-	priv->sendoptions_button = GW ("send-options-button");
-
-#undef GW
-
-	return (priv->summary
-		&& priv->location
-		&& priv->start_time
-		&& priv->end_time
-		&& priv->start_timezone
-		&& priv->end_timezone
-		&& priv->all_day_event
-		&& priv->description
-		&& priv->classification
-		&& priv->show_time_as_busy
-		&& priv->alarm
-		&& priv->alarm_time
-		&& priv->alarm_warning
-		&& priv->alarm_custom
-		&& priv->categories_btn
-		&& priv->categories
-		&& priv->sendoptions_frame
-		&& priv->sendoptions_button);
-}
-
-/* Callback used when the summary changes; we emit the notification signal. */
-static void
-summary_changed_cb (GtkEditable *editable, gpointer data)
-{
-	EventPage *epage;
-	EventPagePrivate *priv;
-	gchar *summary;
-	
-	epage = EVENT_PAGE (data);
-	priv = epage->priv;
-	
-	if (priv->updating)
-		return;
-	
-	summary = e_dialog_editable_get (GTK_WIDGET (editable));
-	comp_editor_page_notify_summary_changed (COMP_EDITOR_PAGE (epage),
-						 summary);
-	g_free (summary);
-}
-
-
-/* Note that this assumes that the start_tt and end_tt passed to it are the
-   dates visible to the user. For DATE values, we have to add 1 day to the
-   end_tt before emitting the signal. */
-static void
-notify_dates_changed (EventPage *epage, struct icaltimetype *start_tt,
-		      struct icaltimetype *end_tt)
-{
-	EventPagePrivate *priv;
-	CompEditorPageDates dates;
-	ECalComponentDateTime start_dt, end_dt;
-	gboolean all_day_event;
-	icaltimezone *start_zone = NULL, *end_zone = NULL;
-
-	priv = epage->priv;
-	
-	all_day_event = e_dialog_toggle_get (priv->all_day_event);
-
-	start_dt.value = start_tt;
-	end_dt.value = end_tt;
-
-	if (all_day_event) {
-		/* The actual DTEND is 1 day after the displayed date for
-		   DATE values. */
-		icaltime_adjust (end_tt, 1, 0, 0, 0);
-	} else {
-		start_zone = e_timezone_entry_get_timezone (E_TIMEZONE_ENTRY (priv->start_timezone));
-		end_zone = e_timezone_entry_get_timezone (E_TIMEZONE_ENTRY (priv->end_timezone));
-	}
-
-	start_dt.tzid = start_zone ? icaltimezone_get_tzid (start_zone) : NULL;
-	end_dt.tzid = end_zone ? icaltimezone_get_tzid (end_zone) : NULL;
-
-	dates.start = &start_dt;
-	dates.end = &end_dt;
-
-	dates.due = NULL;
-	dates.complete = NULL;
-
-	comp_editor_page_notify_dates_changed (COMP_EDITOR_PAGE (epage),
-					       &dates);
-}
-
-
-static gboolean
-check_start_before_end (struct icaltimetype *start_tt,
-			icaltimezone *start_zone,
-			struct icaltimetype *end_tt,
-			icaltimezone *end_zone,
-			gboolean adjust_end_time)
-{
-	struct icaltimetype end_tt_copy;
-	int cmp;
-
-	/* Convert the end time to the same timezone as the start time. */
-	end_tt_copy = *end_tt;
-	icaltimezone_convert_time (&end_tt_copy, end_zone, start_zone);
-
-	/* Now check if the start time is after the end time. If it is,
-	   we need to modify one of the times. */
-	cmp = icaltime_compare (*start_tt, end_tt_copy);
-	if (cmp > 0) {
-		if (adjust_end_time) {
-			/* Modify the end time, to be the start + 1 hour. */
-			*end_tt = *start_tt;
-			icaltime_adjust (end_tt, 0, 1, 0, 0);
-			icaltimezone_convert_time (end_tt, start_zone,
-						   end_zone);
-		} else {
-			/* Modify the start time, to be the end - 1 hour. */
-			*start_tt = *end_tt;
-			icaltime_adjust (start_tt, 0, -1, 0, 0);
-			icaltimezone_convert_time (start_tt, end_zone,
-						   start_zone);
-		}
-		return TRUE;
-	}
-
-	return FALSE;
-}
-
-
-/*
- * This is called whenever the start or end dates or timezones is changed.
- * It makes sure that the start date < end date. It also emits the notification
- * signals so the other event editor pages update their labels etc.
- *
- * If adjust_end_time is TRUE, if the start time < end time it will adjust
- * the end time. If FALSE it will adjust the start time. If the user sets the
- * start or end time, the other time is adjusted to make it valid.
- */
-static void
-times_updated (EventPage *epage, gboolean adjust_end_time)
-{
-	EventPagePrivate *priv;
-	struct icaltimetype start_tt = icaltime_null_time();
-	struct icaltimetype end_tt = icaltime_null_time();
-	gboolean date_set, all_day_event;
-	gboolean set_start_date = FALSE, set_end_date = FALSE;
-	icaltimezone *start_zone, *end_zone;
-	
-	priv = epage->priv;
-
-	if (priv->updating)
-		return;
-
-	/* Fetch the start and end times and timezones from the widgets. */
-	all_day_event = e_dialog_toggle_get (priv->all_day_event);
-
-	date_set = e_date_edit_get_date (E_DATE_EDIT (priv->start_time),
-					 &start_tt.year,
-					 &start_tt.month,
-					 &start_tt.day);
-	g_assert (date_set);
-
-	date_set = e_date_edit_get_date (E_DATE_EDIT (priv->end_time),
-					 &end_tt.year,
-					 &end_tt.month,
-					 &end_tt.day);
-	g_assert (date_set);
-
-	if (all_day_event) {
-		/* All Day Events are simple. We just compare the dates and if
-		   start > end we copy one of them to the other. */
-		int cmp = icaltime_compare_date_only (start_tt, end_tt);
-		if (cmp > 0) {
-			if (adjust_end_time) {
-				end_tt = start_tt;
-				set_end_date = TRUE;
-			} else {
-				start_tt = end_tt;
-				set_start_date = TRUE;
-			}
-		}
-
-		start_tt.is_date = TRUE;
-		end_tt.is_date = TRUE;
-	} else {
-		/* For DATE-TIME events, we have to convert to the same
-		   timezone before comparing. */
-		e_date_edit_get_time_of_day (E_DATE_EDIT (priv->start_time),
-					     &start_tt.hour,
-					     &start_tt.minute);
-		e_date_edit_get_time_of_day (E_DATE_EDIT (priv->end_time),
-					     &end_tt.hour,
-					     &end_tt.minute);
-
-		start_zone = e_timezone_entry_get_timezone (E_TIMEZONE_ENTRY (priv->start_timezone));
-		end_zone = e_timezone_entry_get_timezone (E_TIMEZONE_ENTRY (priv->end_timezone));
-
-		if (check_start_before_end (&start_tt, start_zone,
-					    &end_tt, end_zone,
-					    adjust_end_time)) {
-			if (adjust_end_time)
-				set_end_date = TRUE;
-			else
-				set_start_date = TRUE;
-		}
-	}
-
-
-	if (set_start_date) {
-		g_signal_handlers_block_matched (priv->start_time, G_SIGNAL_MATCH_DATA, 0, 0, NULL, NULL, epage);
-		e_date_edit_set_date (E_DATE_EDIT (priv->start_time),
-				      start_tt.year, start_tt.month,
-				      start_tt.day);
-		e_date_edit_set_time_of_day (E_DATE_EDIT (priv->start_time),
-					     start_tt.hour, start_tt.minute);
-		g_signal_handlers_unblock_matched (priv->start_time, G_SIGNAL_MATCH_DATA, 0, 0, NULL, NULL, epage);
-	}
-
-	if (set_end_date) {
-		g_signal_handlers_block_matched (priv->end_time, G_SIGNAL_MATCH_DATA, 0, 0, NULL, NULL, epage);
-		e_date_edit_set_date (E_DATE_EDIT (priv->end_time),
-				      end_tt.year, end_tt.month, end_tt.day);
-		e_date_edit_set_time_of_day (E_DATE_EDIT (priv->end_time),
-					     end_tt.hour, end_tt.minute);
-		g_signal_handlers_unblock_matched (priv->end_time, G_SIGNAL_MATCH_DATA, 0, 0, NULL, NULL, epage);
-	}
-
-	/* Notify upstream */
-	notify_dates_changed (epage, &start_tt, &end_tt);
-}
-
-/* Callback used when the start or end date widgets change.  We check that the
- * start date < end date and we set the "all day event" button as appropriate.
- */
-static void
-date_changed_cb (GtkWidget *dedit, gpointer data)
-{
-	EventPage *epage;
-	
-	epage = EVENT_PAGE (data);
-
-	times_updated (epage, dedit == epage->priv->start_time);
-}
-
-
-/* Callback used when the start timezone is changed. If sync_timezones is set,
- * we set the end timezone to the same value. It also updates the start time
- * labels on the other notebook pages.
- */
-static void
-start_timezone_changed_cb (GtkWidget *widget, gpointer data)
-{
-	EventPage *epage;
-	EventPagePrivate *priv;
-	icaltimezone *zone;
-
-	epage = EVENT_PAGE (data);
-	priv = epage->priv;
-
-	if (priv->sync_timezones) {
-		zone = e_timezone_entry_get_timezone (E_TIMEZONE_ENTRY (priv->start_timezone));
-		priv->updating = TRUE;
-		e_timezone_entry_set_timezone (E_TIMEZONE_ENTRY (priv->end_timezone), zone);
-		priv->updating = FALSE;
-	}
-
-	times_updated (epage, TRUE);
-}
-
-
-/* Callback used when the end timezone is changed. It checks if the end
- * timezone is the same as the start timezone and sets sync_timezones if so.
- */
-static void
-end_timezone_changed_cb (GtkWidget *widget, gpointer data)
-{
-	EventPage *epage;
-	EventPagePrivate *priv;
-	icaltimezone *start_zone, *end_zone;
-	
-	epage = EVENT_PAGE (data);
-	priv = epage->priv;
-
-	start_zone = e_timezone_entry_get_timezone (E_TIMEZONE_ENTRY (priv->start_timezone));
-	end_zone = e_timezone_entry_get_timezone (E_TIMEZONE_ENTRY (priv->end_timezone));
-
-	priv->sync_timezones = (start_zone == end_zone) ? TRUE : FALSE;
-
-	times_updated (epage, TRUE);
-}
-
-/* Callback: all day event button toggled.
- * Note that this should only be called when the user explicitly toggles the
- * button. Be sure to block this handler when the toggle button's state is set
- * within the code.
- */
-static void
-all_day_event_toggled_cb (GtkWidget *toggle, gpointer data)
-{
-	EventPage *epage;
-	EventPagePrivate *priv;
-	gboolean all_day;
-	struct icaltimetype start_tt = icaltime_null_time();
-	struct icaltimetype end_tt = icaltime_null_time();
-	gboolean date_set;
-
-	epage = EVENT_PAGE (data);
-	priv = epage->priv;
-
-	/* When the all_day toggle is turned on, the start date is
-	 * rounded down to the start of the day, and end date is
-	 * rounded down to the start of the day on which the event
-	 * ends. The event is then taken to be inclusive of the days
-	 * between the start and end days.  Note that if the event end
-	 * is at midnight, we round it down to the previous day, so the
-	 * event times stay the same.
-	 *
-	 * When the all_day_toggle is turned off, then if the event is within
-	 * one day, we set the event start to the start of the working day,
-	 * and set the event end to one hour after it. If the event is longer
-	 * than one day, we set the event end to the end of the day it is on,
-	 * so that the actual event times remain the same.
-	 *
-	 * This may need tweaking to work well with different timezones used
-	 * in the event start & end.
-	 */
-	all_day = GTK_TOGGLE_BUTTON (toggle)->active;
-
-	set_all_day (epage, all_day);
-
-	date_set = e_date_edit_get_date (E_DATE_EDIT (priv->start_time),
-					 &start_tt.year,
-					 &start_tt.month,
-					 &start_tt.day);
-	e_date_edit_get_time_of_day (E_DATE_EDIT (priv->start_time),
-				     &start_tt.hour,
-				     &start_tt.minute);
-	g_assert (date_set);
-
-	date_set = e_date_edit_get_date (E_DATE_EDIT (priv->end_time),
-					 &end_tt.year,
-					 &end_tt.month,
-					 &end_tt.day);
-	e_date_edit_get_time_of_day (E_DATE_EDIT (priv->end_time),
-				     &end_tt.hour,
-				     &end_tt.minute);
-	g_assert (date_set);
-
-	if (all_day) {
-		/* Round down to the start of the day. */
-		start_tt.hour = 0;
-		start_tt.minute  = 0;
-		start_tt.second  = 0;
-		start_tt.is_date = TRUE;
-
-		/* Round down to the start of the day, or the start of the
-		   previous day if it is midnight. */
-		icaltime_adjust (&end_tt, 0, 0, 0, -1);
-		end_tt.hour = 0;
-		end_tt.minute  = 0;
-		end_tt.second  = 0;
-		end_tt.is_date = TRUE;
-	} else {
-		icaltimezone *start_zone, *end_zone;
-
-		if (end_tt.year == start_tt.year
-		    && end_tt.month == start_tt.month
-		    && end_tt.day == start_tt.day) {
-			/* The event is within one day, so we set the event
-			   start to the start of the working day, and the end
-			   to one hour later. */
-			start_tt.hour = calendar_config_get_day_start_hour ();
-			start_tt.minute  = calendar_config_get_day_start_minute ();
-			start_tt.second  = 0;
-
-			end_tt = start_tt;
-			icaltime_adjust (&end_tt, 0, 1, 0, 0);
-		} else {
-			/* The event is longer than 1 day, so we keep exactly
-			   the same times, just using DATE-TIME rather than
-			   DATE. */
-			icaltime_adjust (&end_tt, 1, 0, 0, 0);
-		}
-
-		/* Make sure that end > start using the timezones. */
-		start_zone = e_timezone_entry_get_timezone (E_TIMEZONE_ENTRY (priv->start_timezone));
-		end_zone = e_timezone_entry_get_timezone (E_TIMEZONE_ENTRY (priv->end_timezone));
-		check_start_before_end (&start_tt, start_zone,
-					&end_tt, end_zone,
-					TRUE);
-	}
-
-	gtk_signal_handler_block_by_data (GTK_OBJECT (priv->start_time),
-					  epage);
-	gtk_signal_handler_block_by_data (GTK_OBJECT (priv->end_time),
-					  epage);
-
-	e_date_edit_set_date (E_DATE_EDIT (priv->start_time), start_tt.year,
-			      start_tt.month, start_tt.day);
-	e_date_edit_set_time_of_day (E_DATE_EDIT (priv->start_time),
-				     start_tt.hour, start_tt.minute);
-
-	e_date_edit_set_date (E_DATE_EDIT (priv->end_time), end_tt.year,
-			      end_tt.month, end_tt.day);
-	e_date_edit_set_time_of_day (E_DATE_EDIT (priv->end_time),
-				     end_tt.hour, end_tt.minute);
-
-	gtk_signal_handler_unblock_by_data (GTK_OBJECT (priv->start_time),
-					    epage);
-	gtk_signal_handler_unblock_by_data (GTK_OBJECT (priv->end_time),
-					    epage);
-
-	/* Notify upstream */
-	notify_dates_changed (epage, &start_tt, &end_tt);
-}
-
-/* Callback used when the categories button is clicked; we must bring up the
- * category list dialog.
- */
-static void
-categories_clicked_cb (GtkWidget *button, gpointer data)
-{
-	EventPage *epage;
-	EventPagePrivate *priv;
-	GtkWidget *entry;
-
-	epage = EVENT_PAGE (data);
-	priv = epage->priv;
-
-	entry = priv->categories;
-	e_categories_config_open_dialog_for_entry (GTK_ENTRY (entry));
-}
-
-static void
-e_sendoptions_clicked_cb (GtkWidget *button, gpointer data)
-{
-	EventPage *epage;
-	EventPagePrivate *priv;
-	GtkWidget *toplevel;
-	ESource *source;
-
-	epage = EVENT_PAGE (data);
-	priv = epage->priv;
-
-	if (!priv->sod) {
-		priv->sod = e_sendoptions_dialog_new ();
-		source = e_source_option_menu_peek_selected  (E_SOURCE_OPTION_MENU (priv->source_selector));
-		e_sendoptions_utils_set_default_data (priv->sod, source, "calendar");
-		priv->sod->data->initialized = TRUE;
-	}	
-
-	if (e_cal_get_static_capability (COMP_EDITOR_PAGE (epage)->client, 
-					 CAL_STATIC_CAPABILITY_NO_GEN_OPTIONS)) {
-		e_sendoptions_set_need_general_options (priv->sod, FALSE);
-	}
-
-	toplevel = gtk_widget_get_toplevel (priv->main);
-	e_sendoptions_dialog_run (priv->sod, toplevel, E_ITEM_CALENDAR);
-}
-
-/* This is called when any field is changed; it notifies upstream. */
-static void
-field_changed_cb (GtkWidget *widget, gpointer data)
-{
-	EventPage *epage;
-	EventPagePrivate *priv;
-	
-	epage = EVENT_PAGE (data);
-	priv = epage->priv;
-	
-	if (!priv->updating)
-		comp_editor_page_notify_changed (COMP_EDITOR_PAGE (epage));
-}
-
-static void
-source_changed_cb (GtkWidget *widget, ESource *source, gpointer data)
-{
-	EventPage *epage;
-	EventPagePrivate *priv;
-
-	epage = EVENT_PAGE (data);
-	priv = epage->priv;
-
-	if (!priv->updating) {
-		ECal *client;
-
-		client = auth_new_cal_from_source (source, E_CAL_SOURCE_TYPE_EVENT);
-		if (!client || !e_cal_open (client, FALSE, NULL)) {
-			GtkWidget *dialog;
-
-			if (client)
-				g_object_unref (client);
-
-			e_source_option_menu_select (E_SOURCE_OPTION_MENU (priv->source_selector),
-						     e_cal_get_source (COMP_EDITOR_PAGE (epage)->client));
-
-			dialog = gtk_message_dialog_new (NULL, GTK_DIALOG_MODAL,
-							 GTK_MESSAGE_WARNING, GTK_BUTTONS_OK,
-							 _("Unable to open the calendar '%s'."),
-							 e_source_peek_name (source));
-			gtk_dialog_run (GTK_DIALOG (dialog));
-			gtk_widget_destroy (dialog);
-		} else {
-			icaltimezone *zone;
-			
-			zone = calendar_config_get_icaltimezone ();
-			e_cal_set_default_timezone (client, zone, NULL);
-
-			comp_editor_notify_client_changed (
-				COMP_EDITOR (gtk_widget_get_toplevel (priv->main)),
-				client);
-			if (e_cal_get_static_capability (client, CAL_STATIC_CAPABILITY_REQ_SEND_OPTIONS) && priv->is_meeting)
-				event_page_show_options (epage);
-			else
-				event_page_hide_options (epage);
-
-			sensitize_widgets (epage);
-		}
-	}
-}
-
-static void
-alarm_changed_cb (GtkWidget *widget, gpointer data)
-{
-	EventPage *epage;
-	EventPagePrivate *priv;
-	
-	epage = EVENT_PAGE (data);
-	priv = epage->priv;
-
-	if (e_dialog_toggle_get (priv->alarm)) {
-		ECalComponentAlarm *ca;
-		ECalComponentAlarmTrigger trigger;
-		icalcomponent *icalcomp;
-		icalproperty *icalprop;
-		int alarm_type;
-		
-		ca = e_cal_component_alarm_new ();		
-		
-		e_cal_component_alarm_set_action (ca, E_CAL_COMPONENT_ALARM_DISPLAY);
-
-		memset (&trigger, 0, sizeof (ECalComponentAlarmTrigger));
-		trigger.type = E_CAL_COMPONENT_ALARM_TRIGGER_RELATIVE_START;		
-		trigger.u.rel_duration.is_neg = 1;
-		
-		alarm_type = e_dialog_option_menu_get (priv->alarm_time, alarm_map);
-		switch (alarm_type) {
-		case ALARM_15_MINUTES:
-			trigger.u.rel_duration.minutes = 15;
-			break;
-			
-		case ALARM_1_HOUR:
-			trigger.u.rel_duration.hours = 1;
-			break;
-			
-		case ALARM_1_DAY:
-			trigger.u.rel_duration.days = 1;
-			break;
-
-		case ALARM_USER_TIME:
-			switch (calendar_config_get_default_reminder_units ()) {
-			case CAL_DAYS:		
-				trigger.u.rel_duration.days = priv->alarm_interval;
-				break;
-				
-			case CAL_HOURS:
-				trigger.u.rel_duration.hours = priv->alarm_interval;
-				break;
-				
-			case CAL_MINUTES:
-				trigger.u.rel_duration.minutes = priv->alarm_interval;
-				break;
-			}
-			break;
-			
-		default:
-			break;
-		}		
-		e_cal_component_alarm_set_trigger (ca, trigger);
-
-		icalcomp = e_cal_component_alarm_get_icalcomponent (ca);
-		icalprop = icalproperty_new_x ("1");
-		icalproperty_set_x_name (icalprop, "X-EVOLUTION-NEEDS-DESCRIPTION");
-		icalcomponent_add_property (icalcomp, icalprop);
-
-		e_alarm_list_append (priv->alarm_list_store, NULL, ca);
-	} else {
-		e_alarm_list_clear (priv->alarm_list_store);
-	}	
-		
-	sensitize_widgets (epage);	
-}
-
-static void
-alarm_custom_clicked_cb (GtkWidget *widget, gpointer data)
-{
-	EventPage *epage;
-	EventPagePrivate *priv;
-	EAlarmList *temp_list_store;
-	GtkTreeModel *model;
-	GtkTreeIter iter;
-	gboolean valid_iter;
-	GtkWidget *toplevel;
-	
-	epage = EVENT_PAGE (data);
-	priv = epage->priv;
-
-	/* Make a copy of the list store in case the user cancels */
-	temp_list_store = e_alarm_list_new ();
-	model = GTK_TREE_MODEL (priv->alarm_list_store);
-	
-	for (valid_iter = gtk_tree_model_get_iter_first (model, &iter); valid_iter;
-	     valid_iter = gtk_tree_model_iter_next (model, &iter)) {
-		ECalComponentAlarm *alarm;
-				
-		alarm = (ECalComponentAlarm *) e_alarm_list_get_alarm (priv->alarm_list_store, &iter);
-		g_assert (alarm != NULL);
-
-		e_alarm_list_append (temp_list_store, NULL, alarm);
-	}	
-	
-	toplevel = gtk_widget_get_toplevel (priv->main);
-	if (alarm_list_dialog_run (toplevel, COMP_EDITOR_PAGE (epage)->client, temp_list_store)) {
-		g_object_unref (priv->alarm_list_store);
-		priv->alarm_list_store = temp_list_store;
-
-		comp_editor_page_notify_changed (COMP_EDITOR_PAGE (epage));	
-	} else {
-		g_object_unref (temp_list_store);
-	}	
-	
-	/* If the user erases everything, uncheck the alarm toggle */
-	valid_iter = gtk_tree_model_get_iter_first (GTK_TREE_MODEL (priv->alarm_list_store), &iter);
-	if (!valid_iter)
-		e_dialog_toggle_set (priv->alarm, FALSE);
-
-	sensitize_widgets (epage);
-}
-
-/* Hooks the widget signals */
-static gboolean
-init_widgets (EventPage *epage)
-{
-	EventPagePrivate *priv;
-	GtkTextBuffer *text_buffer;
-	icaltimezone *zone;
-	char *menu_label = NULL;
-	
-	priv = epage->priv;
-
-	/* Make sure the EDateEdit widgets use our timezones to get the
-	   current time. */
-	e_date_edit_set_get_time_callback (E_DATE_EDIT (priv->start_time),
-					   (EDateEditGetTimeCallback) comp_editor_get_current_time,
-					   epage, NULL);
-	e_date_edit_set_get_time_callback (E_DATE_EDIT (priv->end_time),
-					   (EDateEditGetTimeCallback) comp_editor_get_current_time,
-					   epage, NULL);
-
-	/* Summary */
-	g_signal_connect((priv->summary), "changed",
-			    G_CALLBACK (summary_changed_cb), epage);
-
-	/* Description */
-	text_buffer = gtk_text_view_get_buffer (GTK_TEXT_VIEW (priv->description));
-
-	gtk_text_view_set_wrap_mode (GTK_TEXT_VIEW (priv->description), GTK_WRAP_WORD);
-
-	/* Start and end times */
-	g_signal_connect((priv->start_time), "changed",
-			    G_CALLBACK (date_changed_cb), epage);
-	g_signal_connect((priv->end_time), "changed",
-			    G_CALLBACK (date_changed_cb), epage);
-
-	g_signal_connect((priv->start_timezone), "changed",
-			    G_CALLBACK (start_timezone_changed_cb), epage);
-	g_signal_connect((priv->end_timezone), "changed",
-			    G_CALLBACK (end_timezone_changed_cb), epage);
-
-	g_signal_connect((priv->all_day_event), "toggled",
-			    G_CALLBACK (all_day_event_toggled_cb), epage);
-
-	/* Categories button */
-	g_signal_connect((priv->categories_btn), "clicked",
-			    G_CALLBACK (categories_clicked_cb), epage);
-
-	/* send options button */
-	g_signal_connect((priv->sendoptions_button), "clicked", 
-			    G_CALLBACK (e_sendoptions_clicked_cb), epage);
-
-	/* Source selector */
-	g_signal_connect((priv->source_selector), "source_selected",
-			    G_CALLBACK (source_changed_cb), epage);
-
-	/* Alarms */
-	priv->alarm_list_store = e_alarm_list_new ();
-
-	/* Add the user defined time if necessary */
-	priv->alarm_units = calendar_config_get_default_reminder_units ();
-	priv->alarm_interval = calendar_config_get_default_reminder_interval ();
-	
-	switch (priv->alarm_units) {
-	case CAL_DAYS:
-		if (priv->alarm_interval != 1) {
-			menu_label = g_strdup_printf (ngettext("%d day before appointment", "%d days before appointment", priv->alarm_interval), priv->alarm_interval);
-		} else {
-			priv->alarm_interval = -1;
-		}
-		break;
-		
-	case CAL_HOURS:
-		if (priv->alarm_interval != 1) {
-			menu_label = g_strdup_printf (ngettext("%d hour before appointment", "%d hours before appointment", priv->alarm_interval), priv->alarm_interval);
-		} else {
-			priv->alarm_interval = -1;
-		}
-		break;
-		
-	case CAL_MINUTES:
-		if (priv->alarm_interval != 15) {
-			menu_label = g_strdup_printf (ngettext("%d minute before appointement", "%d minutes before appointment", priv->alarm_interval), priv->alarm_interval);
-		} else {
-			priv->alarm_interval = -1;
-		}
-		break;
-	}
-	
-	if (menu_label) {
-		GtkWidget *item, *menu;
-
-		item = gtk_menu_item_new_with_label (menu_label);
-		gtk_widget_show (item);
-		menu = gtk_option_menu_get_menu (GTK_OPTION_MENU (priv->alarm_time));
-		gtk_menu_shell_append (GTK_MENU_SHELL (menu), item);
-	}
-	
-	g_signal_connect (priv->alarm,
-			  "toggled", G_CALLBACK (alarm_changed_cb),
-			  epage);
-	g_signal_connect (priv->alarm_custom, "clicked",
-			  G_CALLBACK (alarm_custom_clicked_cb), epage);
-
-	/* Connect the default signal handler to use to make sure we notify
-	 * upstream of changes to the widget values.
-	 */
-
-	/* Belongs to priv->description */
-	g_signal_connect((text_buffer), "changed",
-			    G_CALLBACK (field_changed_cb), epage);
-
-	g_signal_connect((priv->summary), "changed",
-			    G_CALLBACK (field_changed_cb), epage);
-	g_signal_connect((priv->location), "changed",
-			    G_CALLBACK (field_changed_cb), epage);
-	g_signal_connect((priv->start_time), "changed",
-			    G_CALLBACK (field_changed_cb), epage);
-	g_signal_connect((priv->end_time), "changed",
-			    G_CALLBACK (field_changed_cb), epage);
-	g_signal_connect((priv->start_timezone), "changed",
-			    G_CALLBACK (field_changed_cb), epage);
-	g_signal_connect((priv->end_timezone), "changed",
-			    G_CALLBACK (field_changed_cb), epage);
-	g_signal_connect((priv->all_day_event), "toggled",
-			    G_CALLBACK (field_changed_cb), epage);
-	g_signal_connect((priv->classification),
-			    "changed", G_CALLBACK (field_changed_cb),
-			    epage);
-	g_signal_connect((priv->show_time_as_busy),
-			    "toggled", G_CALLBACK (field_changed_cb),
-			    epage);
-	g_signal_connect((priv->alarm),
-			    "toggled", G_CALLBACK (field_changed_cb),
-			    epage);
-	g_signal_connect((priv->alarm_time),
-			    "changed", G_CALLBACK (field_changed_cb),
-			    epage);
-	g_signal_connect((priv->categories), "changed",
-			    G_CALLBACK (field_changed_cb), epage);
-
-	/* Set the default timezone, so the timezone entry may be hidden. */
-	zone = calendar_config_get_icaltimezone ();
-	e_timezone_entry_set_default_timezone (E_TIMEZONE_ENTRY (priv->start_timezone), zone);
-	e_timezone_entry_set_default_timezone (E_TIMEZONE_ENTRY (priv->end_timezone), zone);
-
-	return TRUE;
-}
-
-
-
-/**
- * event_page_construct:
- * @epage: An event page.
- * 
- * Constructs an event page by loading its Glade data.
- * 
- * Return value: The same object as @epage, or NULL if the widgets could not be
- * created.
- **/
-EventPage *
-event_page_construct (EventPage *epage)
-{
-	EventPagePrivate *priv;
-
-	priv = epage->priv;
-
-	priv->xml = glade_xml_new (EVOLUTION_GLADEDIR "/event-page.glade", 
-				   NULL, NULL);
-	if (!priv->xml) {
-		g_message ("event_page_construct(): " 
-			   "Could not load the Glade XML file!");
-		return NULL;
-	}
-
-	if (!get_widgets (epage)) {
-		g_message ("event_page_construct(): " 
-			   "Could not find all widgets in the XML file!");
-		return NULL;
-	}
-
-	if (!init_widgets (epage)) {
-		g_message ("event_page_construct(): " 
-			   "Could not initialize the widgets!");
-		return NULL;
-	}
-
-	return epage;
-}
-
-/**
- * event_page_new:
- * 
- * Creates a new event page.
- * 
- * Return value: A newly-created event page, or NULL if the page could
- * not be created.
- **/
-EventPage *
-event_page_new (void)
-{
-	EventPage *epage;
-
-	epage = g_object_new (TYPE_EVENT_PAGE, NULL);
-	if (!event_page_construct (epage)) {
-		g_object_unref (epage);
-		return NULL;
-	}
-
-	return epage;
-}
-
-GtkWidget *make_date_edit (void);
-
-GtkWidget *
-make_date_edit (void)
-{
-	return comp_editor_new_date_edit (TRUE, TRUE, TRUE);
-}
-
-GtkWidget *make_timezone_entry (void);
-
-GtkWidget *
-make_timezone_entry (void)
-{
-	GtkWidget *w;
-
-	w = e_timezone_entry_new ();
-	gtk_widget_show (w);
-	return w;
-}
-
-GtkWidget *event_page_create_source_option_menu (void);
-
-GtkWidget *
-event_page_create_source_option_menu (void)
-{
-	GtkWidget   *menu;
-	GConfClient *gconf_client;
-	ESourceList *source_list;
-
-	gconf_client = gconf_client_get_default ();
-	source_list = e_source_list_new_for_gconf (gconf_client, "/apps/evolution/calendar/sources");
-
-	menu = e_source_option_menu_new (source_list);
-	g_object_unref (source_list);
-
-	gtk_widget_show (menu);
-	return menu;
-}
diff --git a/calendar/gui/dialogs/event-page.glade b/calendar/gui/dialogs/event-page.glade
deleted file mode 100644
index 38dd6576cc..0000000000
--- a/calendar/gui/dialogs/event-page.glade
+++ /dev/null
@@ -1,896 +0,0 @@
-<?xml version="1.0" standalone="no"?> <!--*- mode: xml -*-->
-<!DOCTYPE glade-interface SYSTEM "http://glade.gnome.org/glade-2.0.dtd">
-
-<glade-interface>
-
-<widget class="GtkWindow" id="event-toplevel">
-  <property name="title" translatable="yes">window1</property>
-  <property name="type">GTK_WINDOW_TOPLEVEL</property>
-  <property name="window_position">GTK_WIN_POS_NONE</property>
-  <property name="modal">False</property>
-  <property name="resizable">True</property>
-  <property name="destroy_with_parent">False</property>
-  <property name="decorated">True</property>
-  <property name="skip_taskbar_hint">False</property>
-  <property name="skip_pager_hint">False</property>
-  <property name="type_hint">GDK_WINDOW_TYPE_HINT_NORMAL</property>
-  <property name="gravity">GDK_GRAVITY_NORTH_WEST</property>
-
-  <child>
-    <widget class="GtkVBox" id="event-page">
-      <property name="border_width">12</property>
-      <property name="visible">True</property>
-      <property name="homogeneous">False</property>
-      <property name="spacing">6</property>
-
-      <child>
-	<widget class="GtkLabel" id="label66">
-	  <property name="visible">True</property>
-	  <property name="label" translatable="yes">&lt;b&gt;Basics&lt;/b&gt;</property>
-	  <property name="use_underline">False</property>
-	  <property name="use_markup">True</property>
-	  <property name="justify">GTK_JUSTIFY_LEFT</property>
-	  <property name="wrap">False</property>
-	  <property name="selectable">False</property>
-	  <property name="xalign">0</property>
-	  <property name="yalign">0.5</property>
-	  <property name="xpad">0</property>
-	  <property name="ypad">0</property>
-	</widget>
-	<packing>
-	  <property name="padding">0</property>
-	  <property name="expand">False</property>
-	  <property name="fill">False</property>
-	</packing>
-      </child>
-
-      <child>
-	<widget class="GtkHBox" id="hbox56">
-	  <property name="visible">True</property>
-	  <property name="homogeneous">False</property>
-	  <property name="spacing">0</property>
-
-	  <child>
-	    <widget class="GtkLabel" id="label67">
-	      <property name="visible">True</property>
-	      <property name="label" translatable="yes"></property>
-	      <property name="use_underline">False</property>
-	      <property name="use_markup">False</property>
-	      <property name="justify">GTK_JUSTIFY_LEFT</property>
-	      <property name="wrap">False</property>
-	      <property name="selectable">False</property>
-	      <property name="xalign">0.5</property>
-	      <property name="yalign">0.5</property>
-	      <property name="xpad">12</property>
-	      <property name="ypad">0</property>
-	    </widget>
-	    <packing>
-	      <property name="padding">0</property>
-	      <property name="expand">False</property>
-	      <property name="fill">False</property>
-	    </packing>
-	  </child>
-
-	  <child>
-	    <widget class="GtkTable" id="table11">
-	      <property name="visible">True</property>
-	      <property name="n_rows">5</property>
-	      <property name="n_columns">2</property>
-	      <property name="homogeneous">False</property>
-	      <property name="row_spacing">6</property>
-	      <property name="column_spacing">6</property>
-
-	      <child>
-		<widget class="GtkLabel" id="summary-label">
-		  <property name="visible">True</property>
-		  <property name="label" translatable="yes">Su_mmary:</property>
-		  <property name="use_underline">True</property>
-		  <property name="use_markup">False</property>
-		  <property name="justify">GTK_JUSTIFY_CENTER</property>
-		  <property name="wrap">False</property>
-		  <property name="selectable">False</property>
-		  <property name="xalign">7.45058e-09</property>
-		  <property name="yalign">0.5</property>
-		  <property name="xpad">0</property>
-		  <property name="ypad">0</property>
-		  <property name="mnemonic_widget">summary</property>
-		</widget>
-		<packing>
-		  <property name="left_attach">0</property>
-		  <property name="right_attach">1</property>
-		  <property name="top_attach">0</property>
-		  <property name="bottom_attach">1</property>
-		  <property name="x_options">fill</property>
-		  <property name="y_options"></property>
-		</packing>
-	      </child>
-
-	      <child>
-		<widget class="GtkEntry" id="summary">
-		  <property name="visible">True</property>
-		  <property name="can_focus">True</property>
-		  <property name="editable">True</property>
-		  <property name="visibility">True</property>
-		  <property name="max_length">0</property>
-		  <property name="text" translatable="yes"></property>
-		  <property name="has_frame">True</property>
-		  <property name="invisible_char" translatable="yes">*</property>
-		  <property name="activates_default">False</property>
-		</widget>
-		<packing>
-		  <property name="left_attach">1</property>
-		  <property name="right_attach">2</property>
-		  <property name="top_attach">0</property>
-		  <property name="bottom_attach">1</property>
-		  <property name="y_options"></property>
-		</packing>
-	      </child>
-
-	      <child>
-		<widget class="GtkLabel" id="location-label">
-		  <property name="visible">True</property>
-		  <property name="label" translatable="yes">Locat_ion:</property>
-		  <property name="use_underline">True</property>
-		  <property name="use_markup">False</property>
-		  <property name="justify">GTK_JUSTIFY_CENTER</property>
-		  <property name="wrap">False</property>
-		  <property name="selectable">False</property>
-		  <property name="xalign">7.45058e-09</property>
-		  <property name="yalign">0.5</property>
-		  <property name="xpad">0</property>
-		  <property name="ypad">0</property>
-		  <property name="mnemonic_widget">location</property>
-		</widget>
-		<packing>
-		  <property name="left_attach">0</property>
-		  <property name="right_attach">1</property>
-		  <property name="top_attach">1</property>
-		  <property name="bottom_attach">2</property>
-		  <property name="x_options">fill</property>
-		  <property name="y_options"></property>
-		</packing>
-	      </child>
-
-	      <child>
-		<widget class="GtkEntry" id="location">
-		  <property name="visible">True</property>
-		  <property name="can_focus">True</property>
-		  <property name="editable">True</property>
-		  <property name="visibility">True</property>
-		  <property name="max_length">0</property>
-		  <property name="text" translatable="yes"></property>
-		  <property name="has_frame">True</property>
-		  <property name="invisible_char" translatable="yes">*</property>
-		  <property name="activates_default">False</property>
-		</widget>
-		<packing>
-		  <property name="left_attach">1</property>
-		  <property name="right_attach">2</property>
-		  <property name="top_attach">1</property>
-		  <property name="bottom_attach">2</property>
-		  <property name="y_options"></property>
-		</packing>
-	      </child>
-
-	      <child>
-		<widget class="GtkScrolledWindow" id="scrolledwindow12">
-		  <property name="visible">True</property>
-		  <property name="hscrollbar_policy">GTK_POLICY_AUTOMATIC</property>
-		  <property name="vscrollbar_policy">GTK_POLICY_AUTOMATIC</property>
-		  <property name="shadow_type">GTK_SHADOW_IN</property>
-		  <property name="window_placement">GTK_CORNER_TOP_LEFT</property>
-
-		  <child>
-		    <widget class="GtkTextView" id="description">
-		      <property name="visible">True</property>
-		      <property name="can_focus">True</property>
-		      <property name="editable">True</property>
-		      <property name="overwrite">False</property>
-		      <property name="accepts_tab">True</property>
-		      <property name="justification">GTK_JUSTIFY_LEFT</property>
-		      <property name="wrap_mode">GTK_WRAP_WORD</property>
-		      <property name="cursor_visible">True</property>
-		      <property name="pixels_above_lines">0</property>
-		      <property name="pixels_below_lines">0</property>
-		      <property name="pixels_inside_wrap">0</property>
-		      <property name="left_margin">0</property>
-		      <property name="right_margin">0</property>
-		      <property name="indent">0</property>
-		      <property name="text" translatable="yes"></property>
-		      <accessibility>
-			<atkproperty name="AtkObject::accessible_name" translatable="yes">Event Description</atkproperty>
-		      </accessibility>
-		    </widget>
-		  </child>
-		</widget>
-		<packing>
-		  <property name="left_attach">1</property>
-		  <property name="right_attach">2</property>
-		  <property name="top_attach">4</property>
-		  <property name="bottom_attach">5</property>
-		  <property name="x_options">expand|shrink|fill</property>
-		  <property name="y_options">expand|shrink|fill</property>
-		</packing>
-	      </child>
-
-	      <child>
-		<widget class="GtkLabel" id="label69">
-		  <property name="visible">True</property>
-		  <property name="label" translatable="yes">Classi_fication:</property>
-		  <property name="use_underline">True</property>
-		  <property name="use_markup">False</property>
-		  <property name="justify">GTK_JUSTIFY_CENTER</property>
-		  <property name="wrap">False</property>
-		  <property name="selectable">False</property>
-		  <property name="xalign">7.45058e-09</property>
-		  <property name="yalign">0.5</property>
-		  <property name="xpad">0</property>
-		  <property name="ypad">0</property>
-		  <property name="mnemonic_widget">classification</property>
-		</widget>
-		<packing>
-		  <property name="left_attach">0</property>
-		  <property name="right_attach">1</property>
-		  <property name="top_attach">2</property>
-		  <property name="bottom_attach">3</property>
-		  <property name="x_options">fill</property>
-		  <property name="y_options"></property>
-		</packing>
-	      </child>
-
-	      <child>
-		<widget class="GtkHBox" id="hbox57">
-		  <property name="visible">True</property>
-		  <property name="homogeneous">False</property>
-		  <property name="spacing">6</property>
-
-		  <child>
-		    <widget class="GtkOptionMenu" id="classification">
-		      <property name="visible">True</property>
-		      <property name="can_focus">True</property>
-		      <property name="history">0</property>
-
-		      <child>
-			<widget class="GtkMenu" id="menu1">
-
-			  <child>
-			    <widget class="GtkMenuItem" id="public1">
-			      <property name="visible">True</property>
-			      <property name="label" translatable="yes">Public</property>
-			      <property name="use_underline">True</property>
-			    </widget>
-			  </child>
-
-			  <child>
-			    <widget class="GtkMenuItem" id="private1">
-			      <property name="visible">True</property>
-			      <property name="label" translatable="yes">Private</property>
-			      <property name="use_underline">True</property>
-			    </widget>
-			  </child>
-
-			  <child>
-			    <widget class="GtkMenuItem" id="confidential1">
-			      <property name="visible">True</property>
-			      <property name="label" translatable="yes">Confidential</property>
-			      <property name="use_underline">True</property>
-			    </widget>
-			  </child>
-			</widget>
-		      </child>
-		    </widget>
-		    <packing>
-		      <property name="padding">0</property>
-		      <property name="expand">True</property>
-		      <property name="fill">True</property>
-		    </packing>
-		  </child>
-
-		  <child>
-		    <widget class="GtkLabel" id="label65">
-		      <property name="visible">True</property>
-		      <property name="label" translatable="yes">Cale_ndar:</property>
-		      <property name="use_underline">True</property>
-		      <property name="use_markup">False</property>
-		      <property name="justify">GTK_JUSTIFY_LEFT</property>
-		      <property name="wrap">False</property>
-		      <property name="selectable">False</property>
-		      <property name="xalign">0.5</property>
-		      <property name="yalign">0.5</property>
-		      <property name="xpad">0</property>
-		      <property name="ypad">0</property>
-		      <property name="mnemonic_widget">source</property>
-		    </widget>
-		    <packing>
-		      <property name="padding">0</property>
-		      <property name="expand">False</property>
-		      <property name="fill">False</property>
-		    </packing>
-		  </child>
-
-		  <child>
-		    <widget class="Custom" id="source">
-		      <property name="visible">True</property>
-		      <property name="creation_function">event_page_create_source_option_menu</property>
-		      <property name="int1">0</property>
-		      <property name="int2">0</property>
-		      <property name="last_modification_time">Wed, 17 Dec 2003 18:20:26 GMT</property>
-		    </widget>
-		    <packing>
-		      <property name="padding">0</property>
-		      <property name="expand">True</property>
-		      <property name="fill">True</property>
-		    </packing>
-		  </child>
-		</widget>
-		<packing>
-		  <property name="left_attach">1</property>
-		  <property name="right_attach">2</property>
-		  <property name="top_attach">2</property>
-		  <property name="bottom_attach">3</property>
-		  <property name="x_options">fill</property>
-		  <property name="y_options">fill</property>
-		</packing>
-	      </child>
-
-	      <child>
-		<widget class="GtkButton" id="categories-button">
-		  <property name="visible">True</property>
-		  <property name="can_focus">True</property>
-		  <property name="label" translatable="yes">Ca_tegories...</property>
-		  <property name="use_underline">True</property>
-		  <property name="relief">GTK_RELIEF_NORMAL</property>
-		  <property name="focus_on_click">True</property>
-		</widget>
-		<packing>
-		  <property name="left_attach">0</property>
-		  <property name="right_attach">1</property>
-		  <property name="top_attach">3</property>
-		  <property name="bottom_attach">4</property>
-		  <property name="x_options">fill</property>
-		  <property name="y_options"></property>
-		</packing>
-	      </child>
-
-	      <child>
-		<widget class="GtkEntry" id="categories">
-		  <property name="visible">True</property>
-		  <property name="can_focus">True</property>
-		  <property name="editable">True</property>
-		  <property name="visibility">True</property>
-		  <property name="max_length">0</property>
-		  <property name="text" translatable="yes"></property>
-		  <property name="has_frame">True</property>
-		  <property name="invisible_char" translatable="yes">*</property>
-		  <property name="activates_default">False</property>
-		</widget>
-		<packing>
-		  <property name="left_attach">1</property>
-		  <property name="right_attach">2</property>
-		  <property name="top_attach">3</property>
-		  <property name="bottom_attach">4</property>
-		  <property name="y_options"></property>
-		</packing>
-	      </child>
-
-	      <child>
-		<widget class="GtkLabel" id="label68">
-		  <property name="visible">True</property>
-		  <property name="label" translatable="yes">_Description:</property>
-		  <property name="use_underline">True</property>
-		  <property name="use_markup">False</property>
-		  <property name="justify">GTK_JUSTIFY_CENTER</property>
-		  <property name="wrap">False</property>
-		  <property name="selectable">False</property>
-		  <property name="xalign">7.45058e-09</property>
-		  <property name="yalign">0</property>
-		  <property name="xpad">0</property>
-		  <property name="ypad">0</property>
-		  <property name="mnemonic_widget">description</property>
-		</widget>
-		<packing>
-		  <property name="left_attach">0</property>
-		  <property name="right_attach">1</property>
-		  <property name="top_attach">4</property>
-		  <property name="bottom_attach">5</property>
-		  <property name="x_options">fill</property>
-		  <property name="y_options">fill</property>
-		</packing>
-	      </child>
-	    </widget>
-	    <packing>
-	      <property name="padding">0</property>
-	      <property name="expand">True</property>
-	      <property name="fill">True</property>
-	    </packing>
-	  </child>
-	</widget>
-	<packing>
-	  <property name="padding">0</property>
-	  <property name="expand">True</property>
-	  <property name="fill">True</property>
-	</packing>
-      </child>
-
-      <child>
-	<widget class="GtkLabel" id="label70">
-	  <property name="visible">True</property>
-	  <property name="label" translatable="yes">&lt;b&gt;Date and Time&lt;/b&gt;</property>
-	  <property name="use_underline">False</property>
-	  <property name="use_markup">True</property>
-	  <property name="justify">GTK_JUSTIFY_LEFT</property>
-	  <property name="wrap">False</property>
-	  <property name="selectable">False</property>
-	  <property name="xalign">0</property>
-	  <property name="yalign">0.5</property>
-	  <property name="xpad">0</property>
-	  <property name="ypad">0</property>
-	</widget>
-	<packing>
-	  <property name="padding">0</property>
-	  <property name="expand">False</property>
-	  <property name="fill">False</property>
-	</packing>
-      </child>
-
-      <child>
-	<widget class="GtkHBox" id="hbox58">
-	  <property name="visible">True</property>
-	  <property name="homogeneous">False</property>
-	  <property name="spacing">0</property>
-
-	  <child>
-	    <widget class="GtkLabel" id="label71">
-	      <property name="visible">True</property>
-	      <property name="label" translatable="yes"></property>
-	      <property name="use_underline">False</property>
-	      <property name="use_markup">False</property>
-	      <property name="justify">GTK_JUSTIFY_LEFT</property>
-	      <property name="wrap">False</property>
-	      <property name="selectable">False</property>
-	      <property name="xalign">0.5</property>
-	      <property name="yalign">0.5</property>
-	      <property name="xpad">12</property>
-	      <property name="ypad">0</property>
-	    </widget>
-	    <packing>
-	      <property name="padding">0</property>
-	      <property name="expand">False</property>
-	      <property name="fill">False</property>
-	    </packing>
-	  </child>
-
-	  <child>
-	    <widget class="GtkTable" id="table12">
-	      <property name="border_width">6</property>
-	      <property name="visible">True</property>
-	      <property name="n_rows">4</property>
-	      <property name="n_columns">4</property>
-	      <property name="homogeneous">False</property>
-	      <property name="row_spacing">6</property>
-	      <property name="column_spacing">6</property>
-
-	      <child>
-		<widget class="Custom" id="start-time">
-		  <property name="visible">True</property>
-		  <property name="can_focus">True</property>
-		  <property name="creation_function">make_date_edit</property>
-		  <property name="int1">0</property>
-		  <property name="int2">0</property>
-		  <property name="last_modification_time">Tue, 16 May 2000 19:11:05 GMT</property>
-		  <accessibility>
-		    <atkrelation target="start-time-label" type="labelled-by"/>
-		  </accessibility>
-		</widget>
-		<packing>
-		  <property name="left_attach">1</property>
-		  <property name="right_attach">2</property>
-		  <property name="top_attach">0</property>
-		  <property name="bottom_attach">1</property>
-		  <property name="x_options"></property>
-		</packing>
-	      </child>
-
-	      <child>
-		<widget class="Custom" id="end-time">
-		  <property name="visible">True</property>
-		  <property name="can_focus">True</property>
-		  <property name="creation_function">make_date_edit</property>
-		  <property name="int1">0</property>
-		  <property name="int2">0</property>
-		  <property name="last_modification_time">Tue, 16 May 2000 19:11:10 GMT</property>
-		  <accessibility>
-		    <atkrelation target="end-time-label" type="labelled-by"/>
-		  </accessibility>
-		</widget>
-		<packing>
-		  <property name="left_attach">1</property>
-		  <property name="right_attach">2</property>
-		  <property name="top_attach">1</property>
-		  <property name="bottom_attach">2</property>
-		  <property name="x_options"></property>
-		</packing>
-	      </child>
-
-	      <child>
-		<widget class="Custom" id="end-timezone">
-		  <property name="visible">True</property>
-		  <property name="creation_function">make_timezone_entry</property>
-		  <property name="int1">0</property>
-		  <property name="int2">0</property>
-		  <property name="last_modification_time">Mon, 18 Jun 2001 23:51:40 GMT</property>
-		</widget>
-		<packing>
-		  <property name="left_attach">2</property>
-		  <property name="right_attach">3</property>
-		  <property name="top_attach">1</property>
-		  <property name="bottom_attach">2</property>
-		  <property name="x_options"></property>
-		  <property name="y_options">fill</property>
-		</packing>
-	      </child>
-
-	      <child>
-		<widget class="GtkLabel" id="start-time-label">
-		  <property name="visible">True</property>
-		  <property name="label" translatable="yes">_Start time:</property>
-		  <property name="use_underline">True</property>
-		  <property name="use_markup">False</property>
-		  <property name="justify">GTK_JUSTIFY_CENTER</property>
-		  <property name="wrap">False</property>
-		  <property name="selectable">False</property>
-		  <property name="xalign">0</property>
-		  <property name="yalign">0.5</property>
-		  <property name="xpad">0</property>
-		  <property name="ypad">0</property>
-		  <property name="mnemonic_widget">start-time</property>
-		</widget>
-		<packing>
-		  <property name="left_attach">0</property>
-		  <property name="right_attach">1</property>
-		  <property name="top_attach">0</property>
-		  <property name="bottom_attach">1</property>
-		  <property name="x_options">fill</property>
-		  <property name="y_options"></property>
-		</packing>
-	      </child>
-
-	      <child>
-		<widget class="GtkLabel" id="end-time-label">
-		  <property name="visible">True</property>
-		  <property name="label" translatable="yes">_End time:</property>
-		  <property name="use_underline">True</property>
-		  <property name="use_markup">False</property>
-		  <property name="justify">GTK_JUSTIFY_CENTER</property>
-		  <property name="wrap">False</property>
-		  <property name="selectable">False</property>
-		  <property name="xalign">0</property>
-		  <property name="yalign">0.5</property>
-		  <property name="xpad">0</property>
-		  <property name="ypad">0</property>
-		  <property name="mnemonic_widget">end-time</property>
-		</widget>
-		<packing>
-		  <property name="left_attach">0</property>
-		  <property name="right_attach">1</property>
-		  <property name="top_attach">1</property>
-		  <property name="bottom_attach">2</property>
-		  <property name="x_options">fill</property>
-		  <property name="y_options"></property>
-		</packing>
-	      </child>
-
-	      <child>
-		<widget class="GtkCheckButton" id="all-day-event">
-		  <property name="visible">True</property>
-		  <property name="can_focus">True</property>
-		  <property name="label" translatable="yes">A_ll day event</property>
-		  <property name="use_underline">True</property>
-		  <property name="relief">GTK_RELIEF_NORMAL</property>
-		  <property name="focus_on_click">True</property>
-		  <property name="active">False</property>
-		  <property name="inconsistent">False</property>
-		  <property name="draw_indicator">True</property>
-		</widget>
-		<packing>
-		  <property name="left_attach">3</property>
-		  <property name="right_attach">4</property>
-		  <property name="top_attach">0</property>
-		  <property name="bottom_attach">1</property>
-		  <property name="x_options">fill</property>
-		  <property name="y_options"></property>
-		</packing>
-	      </child>
-
-	      <child>
-		<widget class="Custom" id="start-timezone">
-		  <property name="visible">True</property>
-		  <property name="creation_function">make_timezone_entry</property>
-		  <property name="int1">0</property>
-		  <property name="int2">0</property>
-		  <property name="last_modification_time">Mon, 18 Jun 2001 23:51:34 GMT</property>
-		</widget>
-		<packing>
-		  <property name="left_attach">2</property>
-		  <property name="right_attach">3</property>
-		  <property name="top_attach">0</property>
-		  <property name="bottom_attach">1</property>
-		  <property name="x_options"></property>
-		  <property name="y_options">fill</property>
-		</packing>
-	      </child>
-
-	      <child>
-		<widget class="GtkCheckButton" id="show-time-as-busy">
-		  <property name="visible">True</property>
-		  <property name="can_focus">True</property>
-		  <property name="label" translatable="yes">Show time as _busy</property>
-		  <property name="use_underline">True</property>
-		  <property name="relief">GTK_RELIEF_NORMAL</property>
-		  <property name="focus_on_click">True</property>
-		  <property name="active">False</property>
-		  <property name="inconsistent">False</property>
-		  <property name="draw_indicator">True</property>
-		</widget>
-		<packing>
-		  <property name="left_attach">3</property>
-		  <property name="right_attach">4</property>
-		  <property name="top_attach">1</property>
-		  <property name="bottom_attach">2</property>
-		  <property name="x_options">fill</property>
-		  <property name="y_options"></property>
-		</packing>
-	      </child>
-
-	      <child>
-		<widget class="GtkCheckButton" id="alarm">
-		  <property name="visible">True</property>
-		  <property name="can_focus">True</property>
-		  <property name="label" translatable="yes">_Alarm</property>
-		  <property name="use_underline">True</property>
-		  <property name="relief">GTK_RELIEF_NORMAL</property>
-		  <property name="focus_on_click">True</property>
-		  <property name="active">False</property>
-		  <property name="inconsistent">False</property>
-		  <property name="draw_indicator">True</property>
-		</widget>
-		<packing>
-		  <property name="left_attach">0</property>
-		  <property name="right_attach">1</property>
-		  <property name="top_attach">2</property>
-		  <property name="bottom_attach">3</property>
-		  <property name="x_options">fill</property>
-		  <property name="y_options"></property>
-		</packing>
-	      </child>
-
-	      <child>
-		<widget class="GtkHBox" id="hbox50">
-		  <property name="visible">True</property>
-		  <property name="homogeneous">False</property>
-		  <property name="spacing">6</property>
-
-		  <child>
-		    <widget class="GtkOptionMenu" id="alarm-time">
-		      <property name="visible">True</property>
-		      <property name="can_focus">True</property>
-		      <property name="history">0</property>
-
-		      <child>
-			<widget class="GtkMenu" id="menu2">
-
-			  <child>
-			    <widget class="GtkMenuItem" id="15_minutes_before_appointment1">
-			      <property name="visible">True</property>
-			      <property name="label" translatable="yes">15 minutes before appointment</property>
-			      <property name="use_underline">True</property>
-			    </widget>
-			  </child>
-
-			  <child>
-			    <widget class="GtkMenuItem" id="1_hour_before_appointment1">
-			      <property name="visible">True</property>
-			      <property name="label" translatable="yes">1 hour before appointment</property>
-			      <property name="use_underline">True</property>
-			    </widget>
-			  </child>
-
-			  <child>
-			    <widget class="GtkMenuItem" id="1_day_before_appointment1">
-			      <property name="visible">True</property>
-			      <property name="label" translatable="yes">1 day before appointment</property>
-			      <property name="use_underline">True</property>
-			    </widget>
-			  </child>
-			</widget>
-		      </child>
-		    </widget>
-		    <packing>
-		      <property name="padding">0</property>
-		      <property name="expand">False</property>
-		      <property name="fill">False</property>
-		    </packing>
-		  </child>
-
-		  <child>
-		    <widget class="GtkButton" id="alarm-custom">
-		      <property name="visible">True</property>
-		      <property name="can_focus">True</property>
-		      <property name="relief">GTK_RELIEF_NORMAL</property>
-		      <property name="focus_on_click">True</property>
-
-		      <child>
-			<widget class="GtkAlignment" id="alignment1">
-			  <property name="visible">True</property>
-			  <property name="xalign">0.5</property>
-			  <property name="yalign">0.5</property>
-			  <property name="xscale">0</property>
-			  <property name="yscale">0</property>
-			  <property name="top_padding">0</property>
-			  <property name="bottom_padding">0</property>
-			  <property name="left_padding">0</property>
-			  <property name="right_padding">0</property>
-
-			  <child>
-			    <widget class="GtkHBox" id="hbox59">
-			      <property name="visible">True</property>
-			      <property name="homogeneous">False</property>
-			      <property name="spacing">2</property>
-
-			      <child>
-				<widget class="GtkImage" id="image1">
-				  <property name="visible">True</property>
-				  <property name="stock">gtk-preferences</property>
-				  <property name="icon_size">4</property>
-				  <property name="xalign">0.5</property>
-				  <property name="yalign">0.5</property>
-				  <property name="xpad">0</property>
-				  <property name="ypad">0</property>
-				</widget>
-				<packing>
-				  <property name="padding">0</property>
-				  <property name="expand">False</property>
-				  <property name="fill">False</property>
-				</packing>
-			      </child>
-
-			      <child>
-				<widget class="GtkLabel" id="label72">
-				  <property name="visible">True</property>
-				  <property name="label" translatable="yes">C_ustomize...</property>
-				  <property name="use_underline">True</property>
-				  <property name="use_markup">False</property>
-				  <property name="justify">GTK_JUSTIFY_LEFT</property>
-				  <property name="wrap">False</property>
-				  <property name="selectable">False</property>
-				  <property name="xalign">0.5</property>
-				  <property name="yalign">0.5</property>
-				  <property name="xpad">0</property>
-				  <property name="ypad">0</property>
-				</widget>
-				<packing>
-				  <property name="padding">0</property>
-				  <property name="expand">False</property>
-				  <property name="fill">False</property>
-				</packing>
-			      </child>
-			    </widget>
-			  </child>
-			</widget>
-		      </child>
-		    </widget>
-		    <packing>
-		      <property name="padding">0</property>
-		      <property name="expand">False</property>
-		      <property name="fill">False</property>
-		    </packing>
-		  </child>
-		</widget>
-		<packing>
-		  <property name="left_attach">1</property>
-		  <property name="right_attach">4</property>
-		  <property name="top_attach">2</property>
-		  <property name="bottom_attach">3</property>
-		  <property name="x_options">fill</property>
-		  <property name="y_options">fill</property>
-		</packing>
-	      </child>
-
-	      <child>
-		<widget class="GtkLabel" id="alarm-warning">
-		  <property name="label" translatable="yes">This appointment has customized alarms</property>
-		  <property name="use_underline">False</property>
-		  <property name="use_markup">False</property>
-		  <property name="justify">GTK_JUSTIFY_LEFT</property>
-		  <property name="wrap">False</property>
-		  <property name="selectable">False</property>
-		  <property name="xalign">0</property>
-		  <property name="yalign">0.5</property>
-		  <property name="xpad">0</property>
-		  <property name="ypad">0</property>
-		</widget>
-		<packing>
-		  <property name="left_attach">1</property>
-		  <property name="right_attach">2</property>
-		  <property name="top_attach">3</property>
-		  <property name="bottom_attach">4</property>
-		  <property name="y_options"></property>
-		</packing>
-	      </child>
-	    </widget>
-	    <packing>
-	      <property name="padding">0</property>
-	      <property name="expand">True</property>
-	      <property name="fill">True</property>
-	    </packing>
-	  </child>
-	</widget>
-	<packing>
-	  <property name="padding">0</property>
-	  <property name="expand">False</property>
-	  <property name="fill">False</property>
-	</packing>
-      </child>
-
-      <child>
-	<widget class="GtkFrame" id="send-options-frame">
-	  <property name="label_xalign">0</property>
-	  <property name="label_yalign">0.5</property>
-	  <property name="shadow_type">GTK_SHADOW_NONE</property>
-
-	  <child>
-	    <widget class="GtkAlignment" id="alignment2">
-	      <property name="border_width">12</property>
-	      <property name="visible">True</property>
-	      <property name="xalign">0.5</property>
-	      <property name="yalign">0.5</property>
-	      <property name="xscale">0.06</property>
-	      <property name="yscale">1</property>
-	      <property name="top_padding">0</property>
-	      <property name="bottom_padding">0</property>
-	      <property name="left_padding">0</property>
-	      <property name="right_padding">253</property>
-
-	      <child>
-		<widget class="GtkButton" id="send-options-button">
-		  <property name="visible">True</property>
-		  <property name="can_focus">True</property>
-		  <property name="label" translatable="yes">Ad_vanced  send options</property>
-		  <property name="use_underline">True</property>
-		  <property name="relief">GTK_RELIEF_NORMAL</property>
-		  <property name="focus_on_click">True</property>
-		</widget>
-	      </child>
-	    </widget>
-	  </child>
-
-	  <child>
-	    <widget class="GtkLabel" id="send-options-label">
-	      <property name="visible">True</property>
-	      <property name="label" translatable="yes">&lt;b&gt;Send Options&lt;/b&gt;</property>
-	      <property name="use_underline">False</property>
-	      <property name="use_markup">True</property>
-	      <property name="justify">GTK_JUSTIFY_LEFT</property>
-	      <property name="wrap">False</property>
-	      <property name="selectable">False</property>
-	      <property name="xalign">0.5</property>
-	      <property name="yalign">0.5</property>
-	      <property name="xpad">0</property>
-	      <property name="ypad">0</property>
-	    </widget>
-	    <packing>
-	      <property name="type">label_item</property>
-	    </packing>
-	  </child>
-	</widget>
-	<packing>
-	  <property name="padding">0</property>
-	  <property name="expand">False</property>
-	  <property name="fill">False</property>
-	</packing>
-      </child>
-    </widget>
-  </child>
-</widget>
-
-</glade-interface>
diff --git a/calendar/gui/dialogs/event-page.h b/calendar/gui/dialogs/event-page.h
deleted file mode 100644
index 30b84a1621..0000000000
--- a/calendar/gui/dialogs/event-page.h
+++ /dev/null
@@ -1,62 +0,0 @@
-/* Evolution calendar - Main page of the event editor dialog
- *
- * Copyright (C) 2001 Ximian, Inc.
- *
- * Authors: Federico Mena-Quintero <federico@ximian.com>
- *          Miguel de Icaza <miguel@ximian.com>
- *          Seth Alves <alves@hungry.com>
- *          JP Rosevear <jpr@ximian.com>
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of version 2 of the GNU General Public
- * License as published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307, USA.
- */
-
-#ifndef EVENT_PAGE_H
-#define EVENT_PAGE_H
-
-#include "comp-editor-page.h"
-
-G_BEGIN_DECLS
-
-
-
-#define TYPE_EVENT_PAGE            (event_page_get_type ())
-#define EVENT_PAGE(obj)            (G_TYPE_CHECK_INSTANCE_CAST ((obj), TYPE_EVENT_PAGE, EventPage))
-#define EVENT_PAGE_CLASS(klass)    (G_TYPE_CHECK_CLASS_CAST ((klass), TYPE_EVENT_PAGE, EventPageClass))
-#define IS_EVENT_PAGE(obj)         (G_TYPE_CHECK_INSTANCE_TYPE ((obj), TYPE_EVENT_PAGE))
-#define IS_EVENT_PAGE_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((obj), TYPE_EVENT_PAGE))
-
-typedef struct _EventPagePrivate EventPagePrivate;
-
-typedef struct {
-	CompEditorPage page;
-
-	/* Private data */
-	EventPagePrivate *priv;
-} EventPage;
-
-typedef struct {
-	CompEditorPageClass parent_class;
-} EventPageClass;
-
-
-GtkType    event_page_get_type  (void);
-EventPage *event_page_construct (EventPage *epage);
-EventPage *event_page_new       (void);
-void event_page_show_options (EventPage *page);
-void event_page_hide_options (EventPage *page);
-void event_page_set_meeting (EventPage *page, gboolean set);
-
-G_END_DECLS
-
-#endif
diff --git a/calendar/gui/dialogs/meeting-page.c b/calendar/gui/dialogs/meeting-page.c
deleted file mode 100644
index 5846e81652..0000000000
--- a/calendar/gui/dialogs/meeting-page.c
+++ /dev/null
@@ -1,986 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-/* Evolution calendar - Main page of the task editor dialog
- *
- * Copyright (C) 2001 Ximian, Inc.
- *
- * Authors: Federico Mena-Quintero <federico@ximian.com>
- *          Miguel de Icaza <miguel@ximian.com>
- *          Seth Alves <alves@hungry.com>
- *          JP Rosevear <jpr@ximian.com>
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of version 2 of the GNU General Public
- * License as published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307, USA.
- */
-
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
-
-#include <glib.h>
-#include <gtk/gtkcombo.h>
-#include <gtk/gtksignal.h>
-#include <gtk/gtktogglebutton.h>
-#include <gtk/gtkvbox.h>
-#include <gtk/gtkwindow.h>
-#include <libgnome/gnome-i18n.h>
-#include <glade/glade.h>
-#include <libgnomeui/gnome-stock-icons.h>
-#include <gal/widgets/e-gui-utils.h>
-#include <widgets/misc/e-dateedit.h>
-#include <e-util/e-dialog-utils.h>
-#include <e-util/e-dialog-widgets.h>
-
-#include "../calendar-component.h"
-#include "../e-meeting-attendee.h"
-#include "../e-meeting-store.h"
-#include "../e-meeting-list-view.h"
-#include "../itip-utils.h"
-#include "comp-editor-util.h"
-#include "e-delegate-dialog.h"
-#include "meeting-page.h"
-#include "../e-cal-popup.h"
-
-/* Private part of the MeetingPage structure */
-struct _MeetingPagePrivate {
-	/* Lists of attendees */
-	GPtrArray *deleted_attendees;
-
-	/* To use in case of cancellation */
-	ECalComponent *comp;
-	
-	/* List of identities */
-	EAccountList *accounts;
-	EMeetingAttendee *ia;
-	char *default_address;
-	
-	/* Glade XML data */
-	GladeXML *xml;
-
-	/* Widgets from the Glade file */
-	GtkWidget *main;
-	GtkWidget *list_box;
-	GtkWidget *organizer_table;
-	GtkWidget *organizer;
-	GtkWidget *existing_organizer_table;
-	GtkWidget *existing_organizer;
-	GtkWidget *existing_organizer_btn;
-	GtkWidget *add;
-	GtkWidget *remove;
-	GtkWidget *invite;
-	GtkWidget *att_label;
-
-	/* ListView stuff */
-	EMeetingStore *model;
-	EMeetingListView *list_view;
-	gint row;
-	
-	/* For handling who the organizer is */
-	gboolean user_org;
-	gboolean existing;
-	
-        gboolean updating;
-};
-
-
-
-static void meeting_page_finalize (GObject *object);
-
-static GtkWidget *meeting_page_get_widget (CompEditorPage *page);
-static void meeting_page_focus_main_widget (CompEditorPage *page);
-static gboolean meeting_page_fill_widgets (CompEditorPage *page, ECalComponent *comp);
-static gboolean meeting_page_fill_component (CompEditorPage *page, ECalComponent *comp);
-
-G_DEFINE_TYPE (MeetingPage, meeting_page, TYPE_COMP_EDITOR_PAGE);
-
-/* Class initialization function for the task page */
-static void
-meeting_page_class_init (MeetingPageClass *class)
-{
-	CompEditorPageClass *editor_page_class;
-	GObjectClass *object_class;
-
-	editor_page_class = (CompEditorPageClass *) class;
-	object_class = (GObjectClass *) class;
-
-	editor_page_class->get_widget = meeting_page_get_widget;
-	editor_page_class->focus_main_widget = meeting_page_focus_main_widget;
-	editor_page_class->fill_widgets = meeting_page_fill_widgets;
-	editor_page_class->fill_component = meeting_page_fill_component;
-	editor_page_class->set_summary = NULL;
-	editor_page_class->set_dates = NULL;
-
-	object_class->finalize = meeting_page_finalize;
-}
-
-/* Object initialization function for the task page */
-static void
-meeting_page_init (MeetingPage *mpage)
-{
-	MeetingPagePrivate *priv;
-	
-	priv = g_new0 (MeetingPagePrivate, 1);
-	mpage->priv = priv;
-	
-	priv->deleted_attendees = g_ptr_array_new ();
-
-	priv->comp = NULL;
-
-	priv->accounts = NULL;
-	priv->ia = NULL;
-	priv->default_address = NULL;
-	
-	priv->xml = NULL;
-	priv->main = NULL;
-	priv->invite = NULL;
-	
-	priv->model = NULL;
-	priv->list_view = NULL;
-	
-	priv->updating = FALSE;
-}
-
-static EAccount *
-get_current_account (MeetingPage *mpage)
-{	
-	MeetingPagePrivate *priv;
-	EIterator *it;
-	const char *str;
-	
-	priv = mpage->priv;
-
-	str = gtk_entry_get_text (GTK_ENTRY (GTK_COMBO (priv->organizer)->entry));
-	if (!str)
-		return NULL;
-	
-	for (it = e_list_get_iterator((EList *)priv->accounts); e_iterator_is_valid(it); e_iterator_next(it)) {
-		EAccount *a = (EAccount *)e_iterator_get(it);
-		char *full = g_strdup_printf("%s <%s>", a->id->name, a->id->address);
-
-		if (!strcmp (full, str)) {
-			g_free (full);
-			g_object_unref (it);
-
-			return a;
-		}
-	
-		g_free (full);
-	}
-	g_object_unref (it);
-	
-	return NULL;	
-}
-
-static void
-set_attendees (ECalComponent *comp, const GPtrArray *attendees)
-{
-	GSList *comp_attendees = NULL, *l;
-	int i;
-	
-	for (i = 0; i < attendees->len; i++) {
-		EMeetingAttendee *ia = g_ptr_array_index (attendees, i);
-		ECalComponentAttendee *ca;
-		
-		ca = e_meeting_attendee_as_e_cal_component_attendee (ia);
-		
-		comp_attendees = g_slist_prepend (comp_attendees, ca);
-		
-	}
-	comp_attendees = g_slist_reverse (comp_attendees);
-	e_cal_component_set_attendee_list (comp, comp_attendees);
-	
-	for (l = comp_attendees; l != NULL; l = l->next)
-		g_free (l->data);	
-	g_slist_free (comp_attendees);
-}
-
-static void
-cleanup_attendees (GPtrArray *attendees)
-{
-	int i;
-	
-	for (i = 0; i < attendees->len; i++)
-		g_object_unref (g_ptr_array_index (attendees, i));
-}
-
-/* Destroy handler for the task page */
-static void
-meeting_page_finalize (GObject *object)
-{
-	MeetingPage *mpage;
-	MeetingPagePrivate *priv;
-	
-	g_return_if_fail (object != NULL);
-	g_return_if_fail (IS_MEETING_PAGE (object));
-
-	mpage = MEETING_PAGE (object);
-	priv = mpage->priv;
-
-	if (priv->comp != NULL)
-		g_object_unref (priv->comp);
-	
-	cleanup_attendees (priv->deleted_attendees);
-	g_ptr_array_free (priv->deleted_attendees, TRUE);
-
-	if (priv->ia != NULL)
-		g_object_unref (priv->ia);
-	
-	g_object_unref (priv->model);
-	
-	if (priv->main)
-		gtk_widget_unref (priv->main);
-
-	if (priv->xml) {
-		g_object_unref (priv->xml);
-		priv->xml = NULL;
-	}
-
-	if (priv->default_address) {
-		g_free (priv->default_address);
-		priv->default_address = NULL;
-	}
-
-	g_free (priv);
-	mpage->priv = NULL;
-
-	if (G_OBJECT_CLASS (meeting_page_parent_class)->finalize)
-		(* G_OBJECT_CLASS (meeting_page_parent_class)->finalize) (object);
-}
-
-
-
-/* get_widget handler for the task page */
-static GtkWidget *
-meeting_page_get_widget (CompEditorPage *page)
-{
-	MeetingPage *mpage;
-	MeetingPagePrivate *priv;
-
-	mpage = MEETING_PAGE (page);
-	priv = mpage->priv;
-
-	return priv->main;
-}
-
-/* focus_main_widget handler for the task page */
-static void
-meeting_page_focus_main_widget (CompEditorPage *page)
-{
-	MeetingPage *mpage;
-	MeetingPagePrivate *priv;
-
-	mpage = MEETING_PAGE (page);
-	priv = mpage->priv;
-
-	gtk_widget_grab_focus (priv->organizer);
-}
-
-/* Fills the widgets with default values */
-static void
-clear_widgets (MeetingPage *mpage)
-{
-	MeetingPagePrivate *priv;
-
-	priv = mpage->priv;
-
-	gtk_entry_set_text (GTK_ENTRY (GTK_COMBO (priv->organizer)->entry), priv->default_address);
-	gtk_label_set_text (GTK_LABEL (priv->existing_organizer), _("None"));
-
-	gtk_widget_show (priv->organizer_table);
-	gtk_widget_hide (priv->existing_organizer_table);	
-
-	priv->existing = FALSE;
-	priv->user_org = TRUE;
-}
-
-static void
-sensitize_widgets (MeetingPage *mpage)
-{
-	gboolean read_only = FALSE;
-	MeetingPagePrivate *priv = mpage->priv;
-	GError *error = NULL;
-	
-	if (!e_cal_is_read_only (COMP_EDITOR_PAGE (mpage)->client, &read_only, &error)) {
-		if (error->code != E_CALENDAR_STATUS_BUSY)
-			read_only = TRUE;
-		g_error_free (error);
-	}	
-	gtk_widget_set_sensitive (priv->organizer, !read_only);
-	gtk_widget_set_sensitive (priv->existing_organizer_btn, !read_only);
-	gtk_widget_set_sensitive (priv->add, !read_only && priv->user_org);
-	gtk_widget_set_sensitive (priv->remove, !read_only && priv->user_org);
-	gtk_widget_set_sensitive (priv->invite, !read_only && priv->user_org);
-	gtk_widget_set_sensitive (GTK_WIDGET (priv->list_view), !read_only);
-}
-
-/* fill_widgets handler for the meeting page */
-static gboolean
-meeting_page_fill_widgets (CompEditorPage *page, ECalComponent *comp)
-{
-	MeetingPage *mpage;
-	MeetingPagePrivate *priv;
-	ECalComponentOrganizer organizer;
-	
-	mpage = MEETING_PAGE (page);
-	priv = mpage->priv;
-
-	priv->updating = TRUE;
-	
-	/* Clean out old data */
-	if (priv->comp != NULL)
-		g_object_unref (priv->comp);
-	priv->comp = NULL;
-	
-	cleanup_attendees (priv->deleted_attendees);
-	g_ptr_array_set_size (priv->deleted_attendees, 0);
-	
-	/* Clean the screen */
-	clear_widgets (mpage);
-
-	/* Component for cancellation */
-	priv->comp = e_cal_component_clone (comp);
-	
-	/* If there is an existing organizer show it properly */
-	if (e_cal_component_has_organizer (comp)) {
-		e_cal_component_get_organizer (comp, &organizer);
-		if (organizer.value != NULL) {
-			const gchar *strip = itip_strip_mailto (organizer.value);
-			gchar *string;
-
-			gtk_widget_hide (priv->organizer_table);
-			gtk_widget_show (priv->existing_organizer_table);
-			if (itip_organizer_is_user (comp, page->client)) {
-				gtk_widget_set_sensitive (priv->invite, TRUE);
-				gtk_widget_set_sensitive (priv->add, TRUE);
-				gtk_widget_set_sensitive (priv->remove, TRUE);
-				if (e_cal_get_static_capability (
-					    page->client,
-					    CAL_STATIC_CAPABILITY_ORGANIZER_NOT_EMAIL_ADDRESS))
-					gtk_widget_hide (priv->existing_organizer_btn);
-				priv->user_org = TRUE;
-			} else {
-				if (e_cal_get_static_capability (
-					    page->client,
-					    CAL_STATIC_CAPABILITY_ORGANIZER_NOT_EMAIL_ADDRESS))
-					gtk_widget_hide (priv->existing_organizer_btn);
-				gtk_widget_set_sensitive (priv->invite, FALSE);
-				gtk_widget_set_sensitive (priv->add, FALSE);
-				gtk_widget_set_sensitive (priv->remove, FALSE);
-				priv->user_org = FALSE;
-			}
-			
-			if (organizer.cn != NULL)
-				string = g_strdup_printf ("%s <%s>", organizer.cn, strip);
-			else
-				string = g_strdup (strip);
-			gtk_label_set_text (GTK_LABEL (priv->existing_organizer), string);
-			g_free (string);
-
-			priv->existing = TRUE;
-		}
-	} else {
-		EAccount *a;
-		
-		a = get_current_account (mpage);
-		if (a != NULL) {
-			priv->ia = e_meeting_store_add_attendee_with_defaults (priv->model);
-			g_object_ref (priv->ia);
-
-			e_meeting_attendee_set_address (priv->ia, g_strdup_printf ("MAILTO:%s", a->id->address));
-			e_meeting_attendee_set_cn (priv->ia, g_strdup (a->id->name));
-			if (page->client && e_cal_get_organizer_must_accept (page->client))
-				e_meeting_attendee_set_status (priv->ia, ICAL_PARTSTAT_NEEDSACTION);
-			else
-				e_meeting_attendee_set_status (priv->ia, ICAL_PARTSTAT_ACCEPTED);
-		}
-	}
-	
-	priv->updating = FALSE;
-
-	sensitize_widgets (mpage);
-
-	return TRUE;
-}
-
-/* fill_component handler for the meeting page */
-static gboolean
-meeting_page_fill_component (CompEditorPage *page, ECalComponent *comp)
-{
-	MeetingPage *mpage;
-	MeetingPagePrivate *priv;
-	ECalComponentOrganizer organizer = {NULL, NULL, NULL, NULL};
-
-	mpage = MEETING_PAGE (page);
-	priv = mpage->priv;
-
-	if (!priv->existing) {
-		EAccount *a;
-		gchar *addr = NULL;
-
-		/* Find the identity for the organizer or sentby field */
-		a = get_current_account (mpage);
-		
-		/* Sanity Check */
-		if (a == NULL) {
-			e_notice (page, GTK_MESSAGE_ERROR,
-				  _("The organizer selected no longer has an account."));
-			return FALSE;			
-		}
-		
-		if (a->id->address == NULL || strlen (a->id->address) == 0) {
-			e_notice (page, GTK_MESSAGE_ERROR,
-				  _("An organizer is required."));
-			return FALSE;
-		} 
-
-		addr = g_strdup_printf ("MAILTO:%s", a->id->address);
-	
-		organizer.value = addr;
-		organizer.cn = a->id->name;
-		e_cal_component_set_organizer (comp, &organizer);
-
-		g_free (addr);
-	}
-
-	if (e_meeting_store_count_actual_attendees (priv->model) < 1) {
-		e_notice (page, GTK_MESSAGE_ERROR,
-			  _("At least one attendee is required."));
-		return FALSE;
-	}
-	set_attendees (comp, e_meeting_store_get_attendees (priv->model));
-	
-	return TRUE;
-}
-
-
-
-/* Gets the widgets from the XML file and returns if they are all available. */
-static gboolean
-get_widgets (MeetingPage *mpage)
-{
-	CompEditorPage *page = COMP_EDITOR_PAGE (mpage);
-	MeetingPagePrivate *priv;
-	GSList *accel_groups;
-	GtkWidget *toplevel;
-
-	priv = mpage->priv;
-
-#define GW(name) glade_xml_get_widget (priv->xml, name)
-
-	priv->main = GW ("meeting-page");
-	if (!priv->main)
-		return FALSE;
-
-	priv->list_box = GW ("list-box");
-
-	/* Get the GtkAccelGroup from the toplevel window, so we can install
-	   it when the notebook page is mapped. */
-	toplevel = gtk_widget_get_toplevel (priv->main);
-	accel_groups = gtk_accel_groups_from_object (G_OBJECT (toplevel));
-	if (accel_groups) {
-		page->accel_group = accel_groups->data;
-		gtk_accel_group_ref (page->accel_group);
-	}
-
-	gtk_widget_ref (priv->main);
-	gtk_container_remove (GTK_CONTAINER (priv->main->parent), priv->main);
-
-	/* For making the user the organizer */
-	priv->organizer_table = GW ("organizer-table");
-	priv->organizer = GW ("organizer");
-	gtk_combo_set_value_in_list (GTK_COMBO (priv->organizer), FALSE, FALSE);
-	gtk_entry_set_editable (GTK_ENTRY (GTK_COMBO (priv->organizer)->entry), FALSE);
-
-	/* For showing existing organizers */
-	priv->existing_organizer_table = GW ("existing-organizer-table");
-	priv->existing_organizer = GW ("existing-organizer");
-	priv->existing_organizer_btn = GW ("existing-organizer-button");
-
-	/* Buttons */
-	priv->add = GW ("add-attendee");
-	priv->remove = GW ("remove-attendee");
-	priv->invite = GW ("invite");
-
-	/* Attendees Label */
-	priv->att_label = GW ("attendees-label");
-
-#undef GW
-
-	return (priv->list_box
-		&& priv->att_label
-		&& priv->invite
-		&& priv->add
-		&& priv->remove
-		&& priv->organizer_table
-		&& priv->organizer
-		&& priv->existing_organizer_table
-		&& priv->existing_organizer
-		&& priv->existing_organizer_btn);
-}
-
-static void
-org_changed_cb (GtkWidget *widget, gpointer data)
-{
-	MeetingPage *mpage;
-	MeetingPagePrivate *priv;
-	
-	mpage = MEETING_PAGE (data);
-	priv = mpage->priv;
-
-	if (priv->updating)
-		return;
-	
-	if (!priv->existing && priv->ia != NULL) {
-		EAccount *a;
-		
-		a = get_current_account (mpage);
-		if (a != NULL) {
-			e_meeting_attendee_set_address (priv->ia, g_strdup_printf ("MAILTO:%s", a->id->address));
-			e_meeting_attendee_set_cn (priv->ia, g_strdup (a->id->name));
-			
-			if (!e_meeting_store_find_attendee (priv->model, e_meeting_attendee_get_address (priv->ia), NULL))
-				e_meeting_store_add_attendee (priv->model, priv->ia);
-		} else {
-			e_meeting_store_remove_attendee (priv->model, priv->ia);
-		}
-	}
-		
-	comp_editor_page_notify_changed (COMP_EDITOR_PAGE (mpage));
-}
-
-/* Function called to change the organizer */
-static void
-change_clicked_cb (GtkWidget *widget, gpointer data) 
-{
-	MeetingPage *mpage;
-	MeetingPagePrivate *priv;
-	
-	mpage = MEETING_PAGE (data);
-	priv = mpage->priv;
-
-	gtk_widget_show (priv->organizer_table);
-	gtk_widget_hide (priv->existing_organizer_table);
-	gtk_widget_set_sensitive (priv->invite, TRUE);
-	gtk_widget_set_sensitive (priv->add, TRUE);
-	gtk_widget_set_sensitive (priv->remove, TRUE);
-
-	comp_editor_page_notify_changed (COMP_EDITOR_PAGE (mpage));
-	
-	priv->existing = FALSE;
-	priv->user_org = TRUE;
-}
-
-static void
-add_clicked_cb (GtkButton *btn, MeetingPage *mpage)
-{
-	EMeetingAttendee *attendee;
-	
-	attendee = e_meeting_store_add_attendee_with_defaults (mpage->priv->model);
-	e_meeting_list_view_edit (mpage->priv->list_view, attendee);
-}
-
-static gboolean
-existing_attendee (EMeetingAttendee *ia, ECalComponent *comp) 
-{
-	GSList *attendees, *l;
-	const gchar *ia_address;
-	
-	ia_address = itip_strip_mailto (e_meeting_attendee_get_address (ia));
-	if (!ia_address)
-		return FALSE;
-	
-	e_cal_component_get_attendee_list (comp, &attendees);
-
-	for (l = attendees; l; l = l->next) {
-		ECalComponentAttendee *attendee = l->data;
-		const char *address;
-		
-		address = itip_strip_mailto (attendee->value);
-		if (address && !g_strcasecmp (ia_address, address)) {
-			e_cal_component_free_attendee_list (attendees);
-			return TRUE;
-		}
-	}
-	
-	e_cal_component_free_attendee_list (attendees);
-	
-	return FALSE;
-}
-
-static void
-remove_attendee (MeetingPage *mpage, EMeetingAttendee *ia) 
-{
-	MeetingPagePrivate *priv;
-	int pos = 0;
-	
-	priv = mpage->priv;
-
-	/* If the user deletes the organizer attendee explicitly,
-	   assume they no longer want the organizer showing up */
-	if (ia == priv->ia) {
-		g_object_unref (priv->ia);
-		priv->ia = NULL;
-	}	
-		
-	/* If this was a delegatee, no longer delegate */
-	if (e_meeting_attendee_is_set_delfrom (ia)) {
-		EMeetingAttendee *ib;
-		
-		ib = e_meeting_store_find_attendee (priv->model, e_meeting_attendee_get_delfrom (ia), &pos);
-		if (ib != NULL) {
-			e_meeting_attendee_set_delto (ib, NULL);
-			e_meeting_attendee_set_edit_level (ib,  E_MEETING_ATTENDEE_EDIT_FULL);
-		}		
-	}
-	
-	/* Handle deleting all attendees in the delegation chain */	
-	while (ia != NULL) {
-		EMeetingAttendee *ib = NULL;
-
-		if (existing_attendee (ia, priv->comp)) {
-			g_object_ref (ia);
-			g_ptr_array_add (priv->deleted_attendees, ia);
-		}
-		
-		if (e_meeting_attendee_get_delto (ia) != NULL)
-			ib = e_meeting_store_find_attendee (priv->model, e_meeting_attendee_get_delto (ia), NULL);
-		e_meeting_store_remove_attendee (priv->model, ia);
-
-		ia = ib;
-	}
-
-	sensitize_widgets (mpage);
-}
-
-static void
-remove_attendee_at_row (MeetingPage *mpage, int row) 
-{
-	MeetingPagePrivate *priv;
-	EMeetingAttendee *ia;
-	
-	priv = mpage->priv;
-
-	ia = e_meeting_store_find_attendee_at_row (priv->model, row);
-	remove_attendee (mpage, ia);
-}
-
-static void
-remove_clicked_cb (GtkButton *btn, MeetingPage *mpage)
-{
-	MeetingPagePrivate *priv;
-	EMeetingAttendee *ia;
-	GtkTreeSelection *selection;
-	GtkTreeIter iter;
-	GtkTreePath *path;
-	gboolean valid_iter;
-	char *address;
-	
-	priv = mpage->priv;
-
-	selection = gtk_tree_view_get_selection (GTK_TREE_VIEW (priv->list_view));
-	if (!gtk_tree_selection_get_selected (selection, NULL, &iter)) {
-		g_warning ("Could not get a selection to delete.");
-		return;
-	}
-	path = gtk_tree_model_get_path (GTK_TREE_MODEL (priv->model), &iter);	
-	
-	gtk_tree_model_get (GTK_TREE_MODEL (priv->model), &iter, E_MEETING_STORE_ADDRESS_COL, &address, -1);
-	ia = e_meeting_store_find_attendee (priv->model, address, NULL);
-	g_free (address);
-	if (!ia)
-		return;
-	
-	remove_attendee (mpage, ia);
-
-	/* Select closest item after removal */
-	valid_iter = gtk_tree_model_get_iter (GTK_TREE_MODEL (priv->model), &iter, path);
-	if (!valid_iter) {
-		gtk_tree_path_prev (path);
-		valid_iter = gtk_tree_model_get_iter (GTK_TREE_MODEL (priv->model), &iter, path);
-	}
-
-	if (valid_iter)
-		gtk_tree_selection_select_iter (selection, &iter);
-
-	gtk_tree_path_free (path);
-}
-
-/* Function called to invite more people */
-static void
-invite_cb (GtkWidget *widget, gpointer data) 
-{
-	MeetingPage *mpage;
-	MeetingPagePrivate *priv;
-	
-	mpage = MEETING_PAGE (data);
-	priv = mpage->priv;
-
-	e_meeting_list_view_invite_others_dialog (priv->list_view);
-}
-
-/* Hooks the widget signals */
-static void
-init_widgets (MeetingPage *mpage)
-{
-	MeetingPagePrivate *priv;
-
-	priv = mpage->priv;
-
-	/* Organizer */
-	g_signal_connect (GTK_COMBO (priv->organizer)->entry, "changed",
-			  G_CALLBACK (org_changed_cb), mpage);
-
-	g_signal_connect (priv->existing_organizer_btn, "clicked",
-			  G_CALLBACK (change_clicked_cb), mpage);
-
-	/* Add attendee button */
-	g_signal_connect (priv->add, "clicked", G_CALLBACK (add_clicked_cb), mpage);
-
-	/* Remove attendee button */
-	g_signal_connect (priv->remove, "clicked", G_CALLBACK (remove_clicked_cb), mpage);
-
-	/* Contacts button */
-	g_signal_connect(priv->invite, "clicked", G_CALLBACK (invite_cb), mpage);
-}
-
-static void
-client_changed_cb (CompEditorPage *page, ECal *client, gpointer user_data)
-{
-	MeetingPage *mpage = MEETING_PAGE (page);
-
-	sensitize_widgets (mpage);
-}
-
-static void
-popup_delete_cb (EPopup *ep, EPopupItem *pitem, void *data)
-{
-	MeetingPage *mpage = data;
-	MeetingPagePrivate *priv;
-	
-	priv = mpage->priv;
-
-	remove_attendee_at_row (mpage, priv->row);
-}
-
-enum {
-	CAN_DELEGATE = 2,
-	CAN_DELETE = 4
-};
-
-static EPopupItem context_menu_items[] = {
-#if 0
-	{ E_POPUP_ITEM, "00.delegate", N_("_Delegate To..."), popup_delegate_cb, NULL, NULL, CAN_DELEGATE },
-	{ E_POPUP_BAR, "05.bar" },
-#endif
-	{ E_POPUP_ITEM, "10.delete", N_("_Remove"), popup_delete_cb, NULL, GTK_STOCK_REMOVE, CAN_DELETE },
-};
-
-static void
-context_popup_free(EPopup *ep, GSList *items, void *data)
-{
-	g_slist_free(items);
-}
-
-static gint
-button_press_event (GtkWidget *widget, GdkEventButton *event, MeetingPage *mpage)
-{
-	MeetingPagePrivate *priv;
-	GtkMenu *menu;
-	EMeetingAttendee *ia;
-	GtkTreePath *path;
-	GtkTreeIter iter;
-	char *address;
-	int disable_mask = 0;
-	GSList *menus = NULL;
-	ECalPopup *ep;
-	int i;
-
-	priv = mpage->priv;
-
-	/* only process right-clicks */
-	if (event->button != 3 || event->type != GDK_BUTTON_PRESS)
-		return FALSE;
-
-	/* only if we right-click on an attendee */
-	if (!gtk_tree_view_get_path_at_pos (GTK_TREE_VIEW (priv->list_view), event->x, event->y, &path, NULL, NULL, NULL))
-		return FALSE;
-	if (!gtk_tree_model_get_iter (GTK_TREE_MODEL (priv->model), &iter, path))
-		return FALSE;
-	
-	gtk_tree_model_get (GTK_TREE_MODEL (priv->model), &iter, E_MEETING_STORE_ADDRESS_COL, &address, -1);
-	ia = e_meeting_store_find_attendee (priv->model, address, &priv->row);
-	g_free (address);
-	if (!ia)
-		return FALSE;
-	
- 	if (e_meeting_attendee_get_edit_level (ia) != E_MEETING_ATTENDEE_EDIT_FULL)
- 		disable_mask = CAN_DELETE;
-
-	ep = e_cal_popup_new("org.gnome.evolution.calendar.meeting.popup");
-	for (i=0;i<sizeof(context_menu_items)/sizeof(context_menu_items[0]);i++)
-		menus = g_slist_prepend(menus, &context_menu_items[i]);
-
-	e_popup_add_items((EPopup *)ep, menus, NULL, context_popup_free, mpage);
-	menu = e_popup_create_menu_once((EPopup *)ep, NULL, disable_mask);
-	gtk_menu_popup (menu, NULL, NULL, NULL, NULL, event->button, event->time);
-
-	return TRUE;
-}
-
-/**
- * meeting_page_construct:
- * @mpage: An task details page.
- * 
- * Constructs an task page by loading its Glade data.
- * 
- * Return value: The same object as @mpage, or NULL if the widgets could not 
- * be created.
- **/
-MeetingPage *
-meeting_page_construct (MeetingPage *mpage, EMeetingStore *ems,
-			ECal *client)
-{
-	MeetingPagePrivate *priv;
-	char *backend_address;
-	EIterator *it;
-	EAccount *def_account;
-	GList *address_strings = NULL, *l;
-	GtkWidget *sw;
-	
-	priv = mpage->priv;
-
-	priv->xml = glade_xml_new (EVOLUTION_GLADEDIR 
-				   "/meeting-page.glade", NULL, NULL);
-	if (!priv->xml) {
-		g_message (G_STRLOC ": Could not load the Glade XML file!");
-		return NULL;
-	}
-
-	if (!get_widgets (mpage)) {
-		g_message (G_STRLOC ": Could not find all widgets in the XML file!");
-		return NULL;
-	}
-
-	/* Address information */
-	if (!e_cal_get_cal_address (client, &backend_address, NULL))
-		return NULL;
-
-	priv->accounts = itip_addresses_get ();
-	def_account = itip_addresses_get_default();
-	for (it = e_list_get_iterator((EList *)priv->accounts);
-	     e_iterator_is_valid(it);
-	     e_iterator_next(it)) {
-		EAccount *a = (EAccount *)e_iterator_get(it);
-		char *full;
-		
-		full = g_strdup_printf("%s <%s>", a->id->name, a->id->address);
-
-		address_strings = g_list_append(address_strings, full);
-
-		/* Note that the address specified by the backend gets
-		 * precedence over the default mail address.
-		 */
-		if (backend_address && !strcmp (backend_address, a->id->address)) {
-			if (priv->default_address)
-				g_free (priv->default_address);
-			
-			priv->default_address = g_strdup (full);
-		} else if (a == def_account && !priv->default_address) {
-			priv->default_address = g_strdup (full);
-		}
-	}
-	g_object_unref(it);
-	g_free (backend_address);
-
-	if (address_strings)
-		gtk_combo_set_popdown_strings (GTK_COMBO (priv->organizer), address_strings);
-	else
-		g_warning ("No potential organizers!");
-
-	for (l = address_strings; l != NULL; l = l->next)
-		g_free (l->data);
-	g_list_free (address_strings);
-	
-	/* The etable displaying attendees and their status */
-	g_object_ref (ems);
-	priv->model = ems;
-
-	priv->list_view = e_meeting_list_view_new (priv->model); 
-	g_signal_connect (G_OBJECT (priv->list_view), "button_press_event", G_CALLBACK (button_press_event), mpage);
-
-	gtk_widget_show (GTK_WIDGET (priv->list_view));
-	sw = gtk_scrolled_window_new (NULL, NULL);
-	gtk_scrolled_window_set_policy (GTK_SCROLLED_WINDOW (sw), GTK_POLICY_AUTOMATIC, GTK_POLICY_AUTOMATIC);
-	gtk_scrolled_window_set_shadow_type (GTK_SCROLLED_WINDOW (sw), GTK_SHADOW_IN);
-	gtk_widget_show (sw);
-	gtk_container_add (GTK_CONTAINER (sw), GTK_WIDGET (priv->list_view));
-	gtk_box_pack_start (GTK_BOX (priv->list_box), sw, TRUE, TRUE, 0);
-	
-	/* Set the mnemonic widget for the Attendees label */
-	gtk_label_set_mnemonic_widget (GTK_LABEL (priv->att_label), GTK_WIDGET (priv->list_view));
-
-	/* Init the widget signals */
-	init_widgets (mpage);
-
-	g_signal_connect_after (G_OBJECT (mpage), "client_changed",
-				G_CALLBACK (client_changed_cb), NULL);
-
-	return mpage;
-}
-
-/**
- * meeting_page_new:
- * 
- * Creates a new task details page.
- * 
- * Return value: A newly-created task details page, or NULL if the page could
- * not be created.
- **/
-MeetingPage *
-meeting_page_new (EMeetingStore *ems, ECal *client)
-{
-	MeetingPage *mpage;
-
-	mpage = g_object_new (TYPE_MEETING_PAGE, NULL);
-	if (!meeting_page_construct (mpage, ems, client)) {
-		g_object_unref (mpage);
-		return NULL;
-	}
-
-	return mpage;
-}
-
-/**
- * meeting_page_get_cancel_comp:
- * @mpage: 
- * 
- * 
- * 
- * Return value: 
- **/
-ECalComponent *
-meeting_page_get_cancel_comp (MeetingPage *mpage)
-{
-	MeetingPagePrivate *priv;
-
-	g_return_val_if_fail (mpage != NULL, NULL);
-	g_return_val_if_fail (IS_MEETING_PAGE (mpage), NULL);
-
-	priv = mpage->priv;
-
-	if (priv->deleted_attendees->len == 0)
-		return NULL;
-	
-	set_attendees (priv->comp, priv->deleted_attendees);
-	
-	return e_cal_component_clone (priv->comp);
-}
diff --git a/calendar/gui/dialogs/meeting-page.etspec b/calendar/gui/dialogs/meeting-page.etspec
deleted file mode 100644
index 96bc480fe9..0000000000
--- a/calendar/gui/dialogs/meeting-page.etspec
+++ /dev/null
@@ -1,21 +0,0 @@
-<ETableSpecification click-to-add="true" click-to-add-end="true" _click-to-add-message="Click here to add an attendee" draw-grid="true">
-  <ETableColumn model_col= "0" _title="Attendee" expansion="2.0" minimum_width="10" resizable="true" cell="string" compare="string"/>
-  <ETableColumn model_col= "1" _title="Member" expansion="2.0" minimum_width="10" resizable="true" cell="string" compare="string"/>
-  <ETableColumn model_col= "2" _title="Type" expansion="1.0" minimum_width="10" resizable="true" cell="typeedit" compare="string"/>
-  <ETableColumn model_col= "3" _title="Role" expansion="1.0" minimum_width="10" resizable="true" cell="roleedit" compare="string"/>
-  <ETableColumn model_col= "4" _title="RSVP" expansion="1.0" minimum_width="10" resizable="true" cell="rsvpedit" compare="string"/>
-  <ETableColumn model_col= "5" _title="Delegated To" expansion="2.0" minimum_width="10" resizable="true" cell="string" compare="string"/>
-  <ETableColumn model_col= "6" _title="Delegated From" expansion="2.0" minimum_width="10" resizable="true" cell="string" compare="string"/>
-  <ETableColumn model_col= "7" _title="Status" expansion="1.0" minimum_width="10" resizable="true" cell="statusedit" compare="string"/>
-  <ETableColumn model_col= "8" _title="Common Name" expansion="2.0" minimum_width="10" resizable="true" cell="string" compare="string"/>
-  <ETableColumn model_col= "9" _title="Language" expansion="2.0" minimum_width="10" resizable="true" cell="string" compare="string"/>
-
-  <ETableState>
-     <column source="0"/>
-     <column source="2"/>
-     <column source="3"/>
-     <column source="4"/>
-     <column source="7"/>
-     <grouping></grouping>
-  </ETableState>
-</ETableSpecification>
diff --git a/calendar/gui/dialogs/meeting-page.glade b/calendar/gui/dialogs/meeting-page.glade
deleted file mode 100644
index 51f7399b5f..0000000000
--- a/calendar/gui/dialogs/meeting-page.glade
+++ /dev/null
@@ -1,378 +0,0 @@
-<?xml version="1.0" standalone="no"?> <!--*- mode: xml -*-->
-<!DOCTYPE glade-interface SYSTEM "http://glade.gnome.org/glade-2.0.dtd">
-
-<glade-interface>
-
-<widget class="GtkWindow" id="meeting-toplevel">
-  <property name="title" translatable="yes">window1</property>
-  <property name="type">GTK_WINDOW_TOPLEVEL</property>
-  <property name="window_position">GTK_WIN_POS_NONE</property>
-  <property name="modal">False</property>
-  <property name="resizable">True</property>
-  <property name="destroy_with_parent">False</property>
-  <property name="decorated">True</property>
-  <property name="skip_taskbar_hint">False</property>
-  <property name="skip_pager_hint">False</property>
-  <property name="type_hint">GDK_WINDOW_TYPE_HINT_NORMAL</property>
-  <property name="gravity">GDK_GRAVITY_NORTH_WEST</property>
-
-  <child>
-    <widget class="GtkVBox" id="meeting-page">
-      <property name="border_width">12</property>
-      <property name="visible">True</property>
-      <property name="homogeneous">False</property>
-      <property name="spacing">6</property>
-
-      <child>
-	<widget class="GtkVBox" id="vbox1">
-	  <property name="visible">True</property>
-	  <property name="homogeneous">False</property>
-	  <property name="spacing">6</property>
-
-	  <child>
-	    <widget class="GtkHBox" id="organizer-table">
-	      <property name="visible">True</property>
-	      <property name="homogeneous">False</property>
-	      <property name="spacing">12</property>
-
-	      <child>
-		<widget class="GtkLabel" id="label10">
-		  <property name="visible">True</property>
-		  <property name="label" translatable="yes">Or_ganizer:</property>
-		  <property name="use_underline">True</property>
-		  <property name="use_markup">False</property>
-		  <property name="justify">GTK_JUSTIFY_LEFT</property>
-		  <property name="wrap">False</property>
-		  <property name="selectable">False</property>
-		  <property name="xalign">0.5</property>
-		  <property name="yalign">0.5</property>
-		  <property name="xpad">0</property>
-		  <property name="ypad">0</property>
-		  <property name="mnemonic_widget">organizer-entry</property>
-		</widget>
-		<packing>
-		  <property name="padding">0</property>
-		  <property name="expand">False</property>
-		  <property name="fill">False</property>
-		</packing>
-	      </child>
-
-	      <child>
-		<widget class="GtkCombo" id="organizer">
-		  <property name="visible">True</property>
-		  <property name="value_in_list">True</property>
-		  <property name="allow_empty">False</property>
-		  <property name="case_sensitive">False</property>
-		  <property name="enable_arrow_keys">True</property>
-		  <property name="enable_arrows_always">False</property>
-		  <accessibility>
-		    <atkproperty name="AtkObject::accessible_name" translatable="yes">Organizer</atkproperty>
-		  </accessibility>
-
-		  <child internal-child="entry">
-		    <widget class="GtkEntry" id="organizer-entry">
-		      <property name="visible">True</property>
-		      <property name="can_focus">True</property>
-		      <property name="editable">True</property>
-		      <property name="visibility">True</property>
-		      <property name="max_length">0</property>
-		      <property name="text" translatable="yes"></property>
-		      <property name="has_frame">True</property>
-		      <property name="invisible_char" translatable="yes">*</property>
-		      <property name="activates_default">False</property>
-		    </widget>
-		  </child>
-
-		  <child internal-child="list">
-		    <widget class="GtkList" id="convertwidget1">
-		      <property name="visible">True</property>
-		      <property name="selection_mode">GTK_SELECTION_BROWSE</property>
-
-		      <child>
-			<widget class="GtkListItem" id="convertwidget2">
-			  <property name="visible">True</property>
-
-			  <child>
-			    <widget class="GtkLabel" id="convertwidget3">
-			      <property name="visible">True</property>
-			      <property name="label" translatable="yes"></property>
-			      <property name="use_underline">False</property>
-			      <property name="use_markup">False</property>
-			      <property name="justify">GTK_JUSTIFY_LEFT</property>
-			      <property name="wrap">False</property>
-			      <property name="selectable">False</property>
-			      <property name="xalign">0</property>
-			      <property name="yalign">0.5</property>
-			      <property name="xpad">0</property>
-			      <property name="ypad">0</property>
-			    </widget>
-			  </child>
-			</widget>
-		      </child>
-		    </widget>
-		  </child>
-		</widget>
-		<packing>
-		  <property name="padding">0</property>
-		  <property name="expand">True</property>
-		  <property name="fill">True</property>
-		</packing>
-	      </child>
-	    </widget>
-	    <packing>
-	      <property name="padding">0</property>
-	      <property name="expand">True</property>
-	      <property name="fill">True</property>
-	    </packing>
-	  </child>
-
-	  <child>
-	    <widget class="GtkHBox" id="existing-organizer-table">
-	      <property name="visible">True</property>
-	      <property name="homogeneous">False</property>
-	      <property name="spacing">12</property>
-
-	      <child>
-		<widget class="GtkLabel" id="label11">
-		  <property name="visible">True</property>
-		  <property name="label" translatable="yes">Organizer:</property>
-		  <property name="use_underline">True</property>
-		  <property name="use_markup">False</property>
-		  <property name="justify">GTK_JUSTIFY_LEFT</property>
-		  <property name="wrap">False</property>
-		  <property name="selectable">False</property>
-		  <property name="xalign">0.5</property>
-		  <property name="yalign">0.5</property>
-		  <property name="xpad">0</property>
-		  <property name="ypad">0</property>
-		  <property name="mnemonic_widget">organizer-entry</property>
-		</widget>
-		<packing>
-		  <property name="padding">0</property>
-		  <property name="expand">False</property>
-		  <property name="fill">False</property>
-		</packing>
-	      </child>
-
-	      <child>
-		<widget class="GtkLabel" id="existing-organizer">
-		  <property name="visible">True</property>
-		  <property name="label" translatable="yes">None</property>
-		  <property name="use_underline">False</property>
-		  <property name="use_markup">False</property>
-		  <property name="justify">GTK_JUSTIFY_CENTER</property>
-		  <property name="wrap">False</property>
-		  <property name="selectable">False</property>
-		  <property name="xalign">0</property>
-		  <property name="yalign">0.5</property>
-		  <property name="xpad">0</property>
-		  <property name="ypad">0</property>
-		</widget>
-		<packing>
-		  <property name="padding">0</property>
-		  <property name="expand">False</property>
-		  <property name="fill">False</property>
-		</packing>
-	      </child>
-
-	      <child>
-		<widget class="GtkButton" id="existing-organizer-button">
-		  <property name="visible">True</property>
-		  <property name="can_focus">True</property>
-		  <property name="label" translatable="yes">C_hange Organizer</property>
-		  <property name="use_underline">True</property>
-		  <property name="relief">GTK_RELIEF_NORMAL</property>
-		  <property name="focus_on_click">True</property>
-		</widget>
-		<packing>
-		  <property name="padding">0</property>
-		  <property name="expand">False</property>
-		  <property name="fill">False</property>
-		</packing>
-	      </child>
-	    </widget>
-	    <packing>
-	      <property name="padding">0</property>
-	      <property name="expand">True</property>
-	      <property name="fill">True</property>
-	    </packing>
-	  </child>
-	</widget>
-	<packing>
-	  <property name="padding">0</property>
-	  <property name="expand">False</property>
-	  <property name="fill">False</property>
-	</packing>
-      </child>
-
-      <child>
-	<widget class="GtkLabel" id="attendees-label">
-	  <property name="visible">True</property>
-	  <property name="label" translatable="yes">&lt;b&gt;Att_endees&lt;/b&gt;</property>
-	  <property name="use_underline">True</property>
-	  <property name="use_markup">True</property>
-	  <property name="justify">GTK_JUSTIFY_LEFT</property>
-	  <property name="wrap">False</property>
-	  <property name="selectable">False</property>
-	  <property name="xalign">0</property>
-	  <property name="yalign">0.5</property>
-	  <property name="xpad">0</property>
-	  <property name="ypad">0</property>
-	</widget>
-	<packing>
-	  <property name="padding">0</property>
-	  <property name="expand">False</property>
-	  <property name="fill">False</property>
-	</packing>
-      </child>
-
-      <child>
-	<widget class="GtkHBox" id="list-box">
-	  <property name="visible">True</property>
-	  <property name="homogeneous">False</property>
-	  <property name="spacing">12</property>
-
-	  <child>
-	    <widget class="GtkVButtonBox" id="vbuttonbox1">
-	      <property name="visible">True</property>
-	      <property name="layout_style">GTK_BUTTONBOX_START</property>
-	      <property name="spacing">6</property>
-
-	      <child>
-		<widget class="GtkButton" id="add-attendee">
-		  <property name="visible">True</property>
-		  <property name="can_default">True</property>
-		  <property name="can_focus">True</property>
-		  <property name="label">gtk-add</property>
-		  <property name="use_stock">True</property>
-		  <property name="relief">GTK_RELIEF_NORMAL</property>
-		  <property name="focus_on_click">True</property>
-		</widget>
-	      </child>
-
-	      <child>
-		<widget class="GtkButton" id="remove-attendee">
-		  <property name="visible">True</property>
-		  <property name="can_default">True</property>
-		  <property name="can_focus">True</property>
-		  <property name="label">gtk-remove</property>
-		  <property name="use_stock">True</property>
-		  <property name="relief">GTK_RELIEF_NORMAL</property>
-		  <property name="focus_on_click">True</property>
-		</widget>
-	      </child>
-
-	      <child>
-		<widget class="GtkButton" id="invite">
-		  <property name="visible">True</property>
-		  <property name="can_default">True</property>
-		  <property name="can_focus">True</property>
-		  <property name="relief">GTK_RELIEF_NORMAL</property>
-		  <property name="focus_on_click">True</property>
-
-		  <child>
-		    <widget class="GtkAlignment" id="alignment1">
-		      <property name="visible">True</property>
-		      <property name="xalign">0.5</property>
-		      <property name="yalign">0.5</property>
-		      <property name="xscale">0</property>
-		      <property name="yscale">0</property>
-		      <property name="top_padding">0</property>
-		      <property name="bottom_padding">0</property>
-		      <property name="left_padding">0</property>
-		      <property name="right_padding">0</property>
-
-		      <child>
-			<widget class="GtkHBox" id="hbox3">
-			  <property name="visible">True</property>
-			  <property name="homogeneous">False</property>
-			  <property name="spacing">2</property>
-
-			  <child>
-			    <widget class="GtkImage" id="image1">
-			      <property name="visible">True</property>
-			      <property name="stock">gtk-jump-to</property>
-			      <property name="icon_size">4</property>
-			      <property name="xalign">0.5</property>
-			      <property name="yalign">0.5</property>
-			      <property name="xpad">0</property>
-			      <property name="ypad">0</property>
-			    </widget>
-			    <packing>
-			      <property name="padding">0</property>
-			      <property name="expand">False</property>
-			      <property name="fill">False</property>
-			    </packing>
-			  </child>
-
-			  <child>
-			    <widget class="GtkLabel" id="label2">
-			      <property name="visible">True</property>
-			      <property name="label" translatable="yes">Con_tacts...</property>
-			      <property name="use_underline">True</property>
-			      <property name="use_markup">False</property>
-			      <property name="justify">GTK_JUSTIFY_LEFT</property>
-			      <property name="wrap">False</property>
-			      <property name="selectable">False</property>
-			      <property name="xalign">0.5</property>
-			      <property name="yalign">0.5</property>
-			      <property name="xpad">0</property>
-			      <property name="ypad">0</property>
-			    </widget>
-			    <packing>
-			      <property name="padding">0</property>
-			      <property name="expand">False</property>
-			      <property name="fill">False</property>
-			    </packing>
-			  </child>
-			</widget>
-		      </child>
-		    </widget>
-		  </child>
-		</widget>
-	      </child>
-	    </widget>
-	    <packing>
-	      <property name="padding">0</property>
-	      <property name="expand">False</property>
-	      <property name="fill">True</property>
-	      <property name="pack_type">GTK_PACK_END</property>
-	    </packing>
-	  </child>
-
-	  <child>
-	    <widget class="GtkLabel" id="label7">
-	      <property name="visible">True</property>
-	      <property name="label" translatable="yes"></property>
-	      <property name="use_underline">False</property>
-	      <property name="use_markup">False</property>
-	      <property name="justify">GTK_JUSTIFY_LEFT</property>
-	      <property name="wrap">False</property>
-	      <property name="selectable">False</property>
-	      <property name="xalign">0.5</property>
-	      <property name="yalign">0.5</property>
-	      <property name="xpad">0</property>
-	      <property name="ypad">0</property>
-	    </widget>
-	    <packing>
-	      <property name="padding">0</property>
-	      <property name="expand">False</property>
-	      <property name="fill">False</property>
-	    </packing>
-	  </child>
-
-	  <child>
-	    <placeholder/>
-	  </child>
-	</widget>
-	<packing>
-	  <property name="padding">0</property>
-	  <property name="expand">True</property>
-	  <property name="fill">True</property>
-	</packing>
-      </child>
-    </widget>
-  </child>
-</widget>
-
-</glade-interface>
diff --git a/calendar/gui/dialogs/meeting-page.h b/calendar/gui/dialogs/meeting-page.h
deleted file mode 100644
index 95533cd771..0000000000
--- a/calendar/gui/dialogs/meeting-page.h
+++ /dev/null
@@ -1,67 +0,0 @@
-/* Evolution calendar - Main page of the task editor dialog
- *
- * Copyright (C) 2001 Ximian, Inc.
- *
- * Authors: Federico Mena-Quintero <federico@ximian.com>
- *          Miguel de Icaza <miguel@ximian.com>
- *          Seth Alves <alves@hungry.com>
- *          JP Rosevear <jpr@ximian.com>
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of version 2 of the GNU General Public
- * License as published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307, USA.
- */
-
-#ifndef MEETING_PAGE_H
-#define MEETING_PAGE_H
-
-#include "../e-meeting-store.h"
-#include "../itip-utils.h"
-#include "comp-editor-page.h"
-
-G_BEGIN_DECLS
-
-
-
-#define TYPE_MEETING_PAGE            (meeting_page_get_type ())
-#define MEETING_PAGE(obj)            (G_TYPE_CHECK_INSTANCE_CAST ((obj), TYPE_MEETING_PAGE, MeetingPage))
-#define MEETING_PAGE_CLASS(klass)    (G_TYPE_CHECK_CLASS_CAST ((klass), TYPE_MEETING_PAGE, MeetingPageClass))
-#define IS_MEETING_PAGE(obj)         (G_TYPE_CHECK_INSTANCE_TYPE ((obj), TYPE_MEETING_PAGE))
-#define IS_MEETING_PAGE_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((obj), TYPE_MEETING_PAGE))
-
-typedef struct _MeetingPagePrivate MeetingPagePrivate;
-
-typedef struct {
-	CompEditorPage page;
-
-	/* Private data */
-	MeetingPagePrivate *priv;
-} MeetingPage;
-
-typedef struct {
-	CompEditorPageClass parent_class;
-} MeetingPageClass;
-
-
-GtkType       meeting_page_get_type          (void);
-MeetingPage  *meeting_page_construct         (MeetingPage   *mpage,
-					      EMeetingStore *ems,
-					      ECal     *client);
-MeetingPage  *meeting_page_new               (EMeetingStore *ems,
-					      ECal     *client);
-ECalComponent *meeting_page_get_cancel_comp   (MeetingPage   *mpage);
-
-
-
-G_END_DECLS
-
-#endif
diff --git a/calendar/gui/dialogs/new-calendar.glade b/calendar/gui/dialogs/new-calendar.glade
deleted file mode 100644
index 0a136ed7c8..0000000000
--- a/calendar/gui/dialogs/new-calendar.glade
+++ /dev/null
@@ -1,239 +0,0 @@
-<?xml version="1.0" standalone="no"?> <!--*- mode: xml -*-->
-<!DOCTYPE glade-interface SYSTEM "http://glade.gnome.org/glade-2.0.dtd">
-
-<glade-interface>
-
-<widget class="GtkDialog" id="new-calendar-dialog">
-  <property name="border_width">12</property>
-  <property name="visible">True</property>
-  <property name="title" translatable="yes">Add New Calendar</property>
-  <property name="type">GTK_WINDOW_TOPLEVEL</property>
-  <property name="window_position">GTK_WIN_POS_CENTER</property>
-  <property name="modal">False</property>
-  <property name="resizable">False</property>
-  <property name="destroy_with_parent">False</property>
-  <property name="has_separator">True</property>
-
-  <child internal-child="vbox">
-    <widget class="GtkVBox" id="dialog-vbox1">
-      <property name="visible">True</property>
-      <property name="homogeneous">False</property>
-      <property name="spacing">0</property>
-
-      <child internal-child="action_area">
-	<widget class="GtkHButtonBox" id="dialog-action_area1">
-	  <property name="visible">True</property>
-	  <property name="layout_style">GTK_BUTTONBOX_END</property>
-
-	  <child>
-	    <widget class="GtkButton" id="cancelbutton1">
-	      <property name="visible">True</property>
-	      <property name="can_default">True</property>
-	      <property name="can_focus">True</property>
-	      <property name="label">gtk-cancel</property>
-	      <property name="use_stock">True</property>
-	      <property name="relief">GTK_RELIEF_NORMAL</property>
-	      <property name="response_id">-6</property>
-	    </widget>
-	  </child>
-
-	  <child>
-	    <widget class="GtkButton" id="okbutton1">
-	      <property name="visible">True</property>
-	      <property name="can_default">True</property>
-	      <property name="can_focus">True</property>
-	      <property name="label">gtk-ok</property>
-	      <property name="use_stock">True</property>
-	      <property name="relief">GTK_RELIEF_NORMAL</property>
-	      <property name="response_id">-5</property>
-	    </widget>
-	  </child>
-	</widget>
-	<packing>
-	  <property name="padding">0</property>
-	  <property name="expand">False</property>
-	  <property name="fill">True</property>
-	  <property name="pack_type">GTK_PACK_END</property>
-	</packing>
-      </child>
-
-      <child>
-	<widget class="GtkTable" id="table1">
-	  <property name="visible">True</property>
-	  <property name="n_rows">4</property>
-	  <property name="n_columns">3</property>
-	  <property name="homogeneous">False</property>
-	  <property name="row_spacing">6</property>
-	  <property name="column_spacing">6</property>
-
-	  <child>
-	    <widget class="GtkLabel" id="label2">
-	      <property name="visible">True</property>
-	      <property name="label" translatable="yes">Calendar Group</property>
-	      <property name="use_underline">False</property>
-	      <property name="use_markup">False</property>
-	      <property name="justify">GTK_JUSTIFY_LEFT</property>
-	      <property name="wrap">False</property>
-	      <property name="selectable">False</property>
-	      <property name="xalign">0</property>
-	      <property name="yalign">0.5</property>
-	      <property name="xpad">0</property>
-	      <property name="ypad">0</property>
-	    </widget>
-	    <packing>
-	      <property name="left_attach">1</property>
-	      <property name="right_attach">2</property>
-	      <property name="top_attach">1</property>
-	      <property name="bottom_attach">2</property>
-	      <property name="x_padding">6</property>
-	      <property name="x_options">fill</property>
-	      <property name="y_options"></property>
-	    </packing>
-	  </child>
-
-	  <child>
-	    <widget class="GtkOptionMenu" id="calendar-group">
-	      <property name="visible">True</property>
-	      <property name="can_focus">True</property>
-	      <property name="history">-1</property>
-	    </widget>
-	    <packing>
-	      <property name="left_attach">2</property>
-	      <property name="right_attach">3</property>
-	      <property name="top_attach">1</property>
-	      <property name="bottom_attach">2</property>
-	      <property name="x_padding">6</property>
-	      <property name="x_options">fill</property>
-	      <property name="y_options"></property>
-	    </packing>
-	  </child>
-
-	  <child>
-	    <widget class="GtkEntry" id="calendar-name">
-	      <property name="visible">True</property>
-	      <property name="can_focus">True</property>
-	      <property name="editable">True</property>
-	      <property name="visibility">True</property>
-	      <property name="max_length">0</property>
-	      <property name="text" translatable="yes"></property>
-	      <property name="has_frame">True</property>
-	      <property name="invisible_char" translatable="yes">*</property>
-	      <property name="activates_default">False</property>
-	    </widget>
-	    <packing>
-	      <property name="left_attach">2</property>
-	      <property name="right_attach">3</property>
-	      <property name="top_attach">2</property>
-	      <property name="bottom_attach">3</property>
-	      <property name="x_padding">6</property>
-	      <property name="y_options"></property>
-	    </packing>
-	  </child>
-
-	  <child>
-	    <widget class="GtkLabel" id="label1">
-	      <property name="visible">True</property>
-	      <property name="label" translatable="yes">&lt;b&gt;Calendar options&lt;/b&gt;</property>
-	      <property name="use_underline">False</property>
-	      <property name="use_markup">True</property>
-	      <property name="justify">GTK_JUSTIFY_LEFT</property>
-	      <property name="wrap">False</property>
-	      <property name="selectable">False</property>
-	      <property name="xalign">0</property>
-	      <property name="yalign">0.5</property>
-	      <property name="xpad">0</property>
-	      <property name="ypad">0</property>
-	    </widget>
-	    <packing>
-	      <property name="left_attach">0</property>
-	      <property name="right_attach">3</property>
-	      <property name="top_attach">0</property>
-	      <property name="bottom_attach">1</property>
-	      <property name="y_padding">6</property>
-	      <property name="y_options"></property>
-	    </packing>
-	  </child>
-
-	  <child>
-	    <widget class="GtkLabel" id="label3">
-	      <property name="visible">True</property>
-	      <property name="label" translatable="yes">Calendar Name</property>
-	      <property name="use_underline">False</property>
-	      <property name="use_markup">False</property>
-	      <property name="justify">GTK_JUSTIFY_LEFT</property>
-	      <property name="wrap">False</property>
-	      <property name="selectable">False</property>
-	      <property name="xalign">0</property>
-	      <property name="yalign">0.5</property>
-	      <property name="xpad">0</property>
-	      <property name="ypad">0</property>
-	    </widget>
-	    <packing>
-	      <property name="left_attach">1</property>
-	      <property name="right_attach">2</property>
-	      <property name="top_attach">2</property>
-	      <property name="bottom_attach">3</property>
-	      <property name="x_padding">6</property>
-	      <property name="x_options">fill</property>
-	      <property name="y_options"></property>
-	    </packing>
-	  </child>
-
-	  <child>
-	    <widget class="GtkLabel" id="calendar-source-label">
-	      <property name="visible">True</property>
-	      <property name="label" translatable="yes">Calendar Location</property>
-	      <property name="use_underline">False</property>
-	      <property name="use_markup">False</property>
-	      <property name="justify">GTK_JUSTIFY_LEFT</property>
-	      <property name="wrap">False</property>
-	      <property name="selectable">False</property>
-	      <property name="xalign">0</property>
-	      <property name="yalign">0.5</property>
-	      <property name="xpad">0</property>
-	      <property name="ypad">0</property>
-	    </widget>
-	    <packing>
-	      <property name="left_attach">1</property>
-	      <property name="right_attach">2</property>
-	      <property name="top_attach">3</property>
-	      <property name="bottom_attach">4</property>
-	      <property name="x_padding">6</property>
-	      <property name="x_options">fill</property>
-	      <property name="y_options"></property>
-	    </packing>
-	  </child>
-
-	  <child>
-	    <widget class="GtkEntry" id="calendar-location">
-	      <property name="visible">True</property>
-	      <property name="can_focus">True</property>
-	      <property name="editable">True</property>
-	      <property name="visibility">True</property>
-	      <property name="max_length">0</property>
-	      <property name="text" translatable="yes"></property>
-	      <property name="has_frame">True</property>
-	      <property name="invisible_char" translatable="yes">*</property>
-	      <property name="activates_default">False</property>
-	    </widget>
-	    <packing>
-	      <property name="left_attach">2</property>
-	      <property name="right_attach">3</property>
-	      <property name="top_attach">3</property>
-	      <property name="bottom_attach">4</property>
-	      <property name="x_padding">6</property>
-	      <property name="y_options"></property>
-	    </packing>
-	  </child>
-	</widget>
-	<packing>
-	  <property name="padding">4</property>
-	  <property name="expand">True</property>
-	  <property name="fill">True</property>
-	</packing>
-      </child>
-    </widget>
-  </child>
-</widget>
-
-</glade-interface>
diff --git a/calendar/gui/dialogs/new-task-list.glade b/calendar/gui/dialogs/new-task-list.glade
deleted file mode 100644
index ffc38582c8..0000000000
--- a/calendar/gui/dialogs/new-task-list.glade
+++ /dev/null
@@ -1,193 +0,0 @@
-<?xml version="1.0" standalone="no"?> <!--*- mode: xml -*-->
-<!DOCTYPE glade-interface SYSTEM "http://glade.gnome.org/glade-2.0.dtd">
-
-<glade-interface>
-<requires lib="gnome"/>
-
-<widget class="GtkDialog" id="new-task-list-dialog">
-  <property name="border_width">12</property>
-  <property name="visible">True</property>
-  <property name="title" translatable="yes">Add New Task List</property>
-  <property name="type">GTK_WINDOW_TOPLEVEL</property>
-  <property name="window_position">GTK_WIN_POS_CENTER</property>
-  <property name="modal">False</property>
-  <property name="resizable">False</property>
-  <property name="destroy_with_parent">False</property>
-  <property name="has_separator">True</property>
-
-  <child internal-child="vbox">
-    <widget class="GtkVBox" id="dialog-vbox1">
-      <property name="visible">True</property>
-      <property name="homogeneous">False</property>
-      <property name="spacing">0</property>
-
-      <child internal-child="action_area">
-	<widget class="GtkHButtonBox" id="dialog-action_area1">
-	  <property name="visible">True</property>
-	  <property name="layout_style">GTK_BUTTONBOX_END</property>
-
-	  <child>
-	    <widget class="GtkButton" id="cancelbutton1">
-	      <property name="visible">True</property>
-	      <property name="can_default">True</property>
-	      <property name="can_focus">True</property>
-	      <property name="label">gtk-cancel</property>
-	      <property name="use_stock">True</property>
-	      <property name="relief">GTK_RELIEF_NORMAL</property>
-	      <property name="response_id">-6</property>
-	    </widget>
-	  </child>
-
-	  <child>
-	    <widget class="GtkButton" id="okbutton1">
-	      <property name="visible">True</property>
-	      <property name="can_default">True</property>
-	      <property name="can_focus">True</property>
-	      <property name="label">gtk-ok</property>
-	      <property name="use_stock">True</property>
-	      <property name="relief">GTK_RELIEF_NORMAL</property>
-	      <property name="response_id">-5</property>
-	    </widget>
-	  </child>
-	</widget>
-	<packing>
-	  <property name="padding">0</property>
-	  <property name="expand">False</property>
-	  <property name="fill">True</property>
-	  <property name="pack_type">GTK_PACK_END</property>
-	</packing>
-      </child>
-
-      <child>
-	<widget class="GtkTable" id="table1">
-	  <property name="visible">True</property>
-	  <property name="n_rows">3</property>
-	  <property name="n_columns">3</property>
-	  <property name="homogeneous">False</property>
-	  <property name="row_spacing">6</property>
-	  <property name="column_spacing">6</property>
-
-	  <child>
-	    <widget class="GtkLabel" id="label2">
-	      <property name="visible">True</property>
-	      <property name="label" translatable="yes">Task List Group</property>
-	      <property name="use_underline">False</property>
-	      <property name="use_markup">False</property>
-	      <property name="justify">GTK_JUSTIFY_LEFT</property>
-	      <property name="wrap">False</property>
-	      <property name="selectable">False</property>
-	      <property name="xalign">0</property>
-	      <property name="yalign">0.5</property>
-	      <property name="xpad">0</property>
-	      <property name="ypad">0</property>
-	    </widget>
-	    <packing>
-	      <property name="left_attach">1</property>
-	      <property name="right_attach">2</property>
-	      <property name="top_attach">1</property>
-	      <property name="bottom_attach">2</property>
-	      <property name="x_padding">6</property>
-	      <property name="x_options">fill</property>
-	      <property name="y_options"></property>
-	    </packing>
-	  </child>
-
-	  <child>
-	    <widget class="GtkOptionMenu" id="task-list-group">
-	      <property name="visible">True</property>
-	      <property name="can_focus">True</property>
-	      <property name="history">-1</property>
-	    </widget>
-	    <packing>
-	      <property name="left_attach">2</property>
-	      <property name="right_attach">3</property>
-	      <property name="top_attach">1</property>
-	      <property name="bottom_attach">2</property>
-	      <property name="x_padding">6</property>
-	      <property name="x_options">fill</property>
-	      <property name="y_options"></property>
-	    </packing>
-	  </child>
-
-	  <child>
-	    <widget class="GtkEntry" id="task-list-name">
-	      <property name="visible">True</property>
-	      <property name="can_focus">True</property>
-	      <property name="editable">True</property>
-	      <property name="visibility">True</property>
-	      <property name="max_length">0</property>
-	      <property name="text" translatable="yes"></property>
-	      <property name="has_frame">True</property>
-	      <property name="invisible_char" translatable="yes">*</property>
-	      <property name="activates_default">False</property>
-	    </widget>
-	    <packing>
-	      <property name="left_attach">2</property>
-	      <property name="right_attach">3</property>
-	      <property name="top_attach">2</property>
-	      <property name="bottom_attach">3</property>
-	      <property name="x_padding">6</property>
-	      <property name="y_options"></property>
-	    </packing>
-	  </child>
-
-	  <child>
-	    <widget class="GtkLabel" id="label1">
-	      <property name="visible">True</property>
-	      <property name="label" translatable="yes">&lt;b&gt;Task List Options&lt;/b&gt;</property>
-	      <property name="use_underline">False</property>
-	      <property name="use_markup">True</property>
-	      <property name="justify">GTK_JUSTIFY_LEFT</property>
-	      <property name="wrap">False</property>
-	      <property name="selectable">False</property>
-	      <property name="xalign">0</property>
-	      <property name="yalign">0.5</property>
-	      <property name="xpad">0</property>
-	      <property name="ypad">0</property>
-	    </widget>
-	    <packing>
-	      <property name="left_attach">0</property>
-	      <property name="right_attach">3</property>
-	      <property name="top_attach">0</property>
-	      <property name="bottom_attach">1</property>
-	      <property name="y_padding">6</property>
-	      <property name="y_options"></property>
-	    </packing>
-	  </child>
-
-	  <child>
-	    <widget class="GtkLabel" id="label3">
-	      <property name="visible">True</property>
-	      <property name="label" translatable="yes">Task List Name</property>
-	      <property name="use_underline">False</property>
-	      <property name="use_markup">False</property>
-	      <property name="justify">GTK_JUSTIFY_LEFT</property>
-	      <property name="wrap">False</property>
-	      <property name="selectable">False</property>
-	      <property name="xalign">0</property>
-	      <property name="yalign">0.5</property>
-	      <property name="xpad">0</property>
-	      <property name="ypad">0</property>
-	    </widget>
-	    <packing>
-	      <property name="left_attach">1</property>
-	      <property name="right_attach">2</property>
-	      <property name="top_attach">2</property>
-	      <property name="bottom_attach">3</property>
-	      <property name="x_padding">6</property>
-	      <property name="x_options">fill</property>
-	      <property name="y_options"></property>
-	    </packing>
-	  </child>
-	</widget>
-	<packing>
-	  <property name="padding">4</property>
-	  <property name="expand">True</property>
-	  <property name="fill">True</property>
-	</packing>
-      </child>
-    </widget>
-  </child>
-</widget>
-
-</glade-interface>
diff --git a/calendar/gui/dialogs/recur-comp.c b/calendar/gui/dialogs/recur-comp.c
deleted file mode 100644
index 734516e904..0000000000
--- a/calendar/gui/dialogs/recur-comp.c
+++ /dev/null
@@ -1,149 +0,0 @@
-/* Evolution calendar - Recurring calendar component dialog
- *
- * Copyright (C) 2002 Ximian, Inc.
- *
- * Author: JP Rosevear <jpr@ximian.com>
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of version 2 of the GNU General Public
- * License as published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307, USA.
- */
-
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
-
-#include <glib.h>
-#include <gtk/gtk.h>
-#include <libgnome/gnome-i18n.h>
-#include <libgnomeui/gnome-uidefs.h>
-#include "recur-comp.h"
-
-
-
-gboolean
-recur_component_dialog (ECal *client,
-			ECalComponent *comp,
-			CalObjModType *mod,
-			GtkWindow *parent)
-{
-#if 0
-	char *str;
-	GtkWidget *dialog, *rb_this, *rb_prior, *rb_future, *rb_all, *hbox;
-	GtkWidget *placeholder, *vbox;
-	ECalComponentVType vtype;
-	gboolean ret;
-	
-	g_return_val_if_fail (E_IS_CAL_COMPONENT (comp), FALSE);
-
-	vtype = e_cal_component_get_vtype (comp);
-	
-	switch (vtype) {
-	case E_CAL_COMPONENT_EVENT:
-		str = g_strdup_printf (_("You are modifying a recurring event, what would you like to modify?"));
-		break;
-
-	case E_CAL_COMPONENT_TODO:
-		str = g_strdup_printf (_("You are modifying a recurring task, what would you like to modify?"));
-		break;
-
-	case E_CAL_COMPONENT_JOURNAL:
-		str = g_strdup_printf (_("You are modifying a recurring journal entry, what would you like to modify?"));
-		break;
-
-	default:
-		g_message ("recur_component_dialog(): Cannot handle object of type %d", vtype);
-		return FALSE;
-	}
-
-
-	dialog = gtk_message_dialog_new (parent, 0, GTK_MESSAGE_QUESTION, GTK_BUTTONS_OK_CANCEL, "%s", str);
-	g_free (str);
-#if !GTK_CHECK_VERSION (2,4,0)
-	gtk_dialog_set_has_separator (GTK_DIALOG (dialog), FALSE);
-#endif
-	gtk_window_set_resizable (GTK_WINDOW (dialog), TRUE);
-
-	hbox = gtk_hbox_new (FALSE, 12);
-	gtk_container_add (GTK_CONTAINER (GTK_DIALOG (dialog)->vbox), hbox);
-
-	placeholder = gtk_label_new ("");
-	gtk_widget_set_size_request (placeholder, 48, 48);
-	gtk_box_pack_start (GTK_BOX (hbox), placeholder, FALSE, FALSE, 0);
-	gtk_widget_show (placeholder);
-
-	vbox = gtk_vbox_new (FALSE, 6);
-	gtk_box_pack_start (GTK_BOX (hbox), vbox, TRUE, TRUE, 0);
-	gtk_widget_show (vbox);
-
-	rb_this = gtk_radio_button_new_with_label (NULL, _("This Instance Only"));
-	gtk_container_add (GTK_CONTAINER (vbox), rb_this);
-
-	if (!e_cal_get_static_capability (client, CAL_STATIC_CAPABILITY_NO_THISANDPRIOR)) {
-		rb_prior = gtk_radio_button_new_with_label_from_widget (GTK_RADIO_BUTTON (rb_this), _("This and Prior Instances"));
-		gtk_container_add (GTK_CONTAINER (vbox), rb_prior);
-	} else
-		rb_prior = NULL;
-
-	if (!e_cal_get_static_capability (client, CAL_STATIC_CAPABILITY_NO_THISANDFUTURE)) {
-		rb_future = gtk_radio_button_new_with_label_from_widget (GTK_RADIO_BUTTON (rb_this), _("This and Future Instances"));
-		gtk_container_add (GTK_CONTAINER (vbox), rb_future);
-	} else
-		rb_future = NULL;
-
-	rb_all = gtk_radio_button_new_with_label_from_widget (GTK_RADIO_BUTTON (rb_this), _("All Instances"));
-	gtk_container_add (GTK_CONTAINER (vbox), rb_all);
-
-	gtk_widget_show_all (hbox);
-
-	placeholder = gtk_label_new ("");
-	gtk_box_pack_start (GTK_BOX (GTK_DIALOG (dialog)->vbox), placeholder, FALSE, FALSE, 0);
-	gtk_widget_show (placeholder);
-
-	ret = gtk_dialog_run (GTK_DIALOG (dialog)) == GTK_RESPONSE_OK;
-
-	if (gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (rb_this)))
-		*mod = CALOBJ_MOD_THIS;
-	else if (rb_prior && gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (rb_prior)))
-		*mod = CALOBJ_MOD_THISANDPRIOR;
-	else if (rb_future && gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (rb_future)))
-		*mod = CALOBJ_MOD_THISANDFUTURE;
-	else if (gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (rb_all))) {
-		*mod = CALOBJ_MOD_ALL;
-
-		/* remove the RECURRENCE-ID from the object if modifying ALL instances */
-		if (ret) {
-			icalproperty *prop;
-
-			prop = icalcomponent_get_first_property (e_cal_component_get_icalcomponent (comp),
-								 ICAL_RECURRENCEID_PROPERTY);
-			if (prop)
-				icalcomponent_remove_property (e_cal_component_get_icalcomponent (comp), prop);
-		}
-	}
-
-	gtk_widget_destroy (dialog);
-
-	return ret;
-#endif
-
-	icalproperty *prop;
-
-	prop = icalcomponent_get_first_property (e_cal_component_get_icalcomponent (comp),
-						 ICAL_RECURRENCEID_PROPERTY);
-	if (prop)
-		icalcomponent_remove_property (e_cal_component_get_icalcomponent (comp), prop);
-
-	*mod = CALOBJ_MOD_ALL;
-
-	return TRUE;
-}
diff --git a/calendar/gui/dialogs/recur-comp.h b/calendar/gui/dialogs/recur-comp.h
deleted file mode 100644
index 94ccbdae87..0000000000
--- a/calendar/gui/dialogs/recur-comp.h
+++ /dev/null
@@ -1,34 +0,0 @@
-/* Evolution calendar - Recurring calendar component dialog
- *
- * Copyright (C) 2002 Ximian, Inc.
- *
- * Author: JP Rosevear <jpr@ximian.com>
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of version 2 of the GNU General Public
- * License as published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public 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 RECUR_COMP_H
-#define RECUR_COMP_H
-
-#include <gtk/gtkwindow.h>
-#include <libecal/e-cal.h>
-#include <libecal/e-cal-component.h>
-#include <libecal/e-cal-util.h>
-
-gboolean recur_component_dialog (ECal *client,
-				 ECalComponent *comp,
-				 CalObjModType *mod,
-				 GtkWindow *parent);
-
-#endif
diff --git a/calendar/gui/dialogs/recurrence-page.c b/calendar/gui/dialogs/recurrence-page.c
deleted file mode 100644
index 07e3b6164b..0000000000
--- a/calendar/gui/dialogs/recurrence-page.c
+++ /dev/null
@@ -1,2403 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-
-/* Evolution calendar - Recurrence page of the calendar component dialogs
- *
- * Copyright (C) 2001-2003 Ximian, Inc.
- *
- * Authors: Federico Mena-Quintero <federico@ximian.com>
- *          Miguel de Icaza <miguel@ximian.com>
- *          Seth Alves <alves@hungry.com>
- *          JP Rosevear <jpr@ximian.com>
- *          Hans Petter Jansson <hpj@ximiman.com>
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of version 2 of the GNU General Public
- * License as published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307, USA.
- */
-
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
-
-#include <gtk/gtklabel.h>
-#include <gtk/gtkcellrenderertext.h>
-#include <gtk/gtkmenuitem.h>
-#include <gtk/gtkoptionmenu.h>
-#include <gtk/gtktogglebutton.h>
-#include <gtk/gtksignal.h>
-#include <gtk/gtkspinbutton.h>
-#include <gtk/gtktreeview.h>
-#include <gtk/gtktreeselection.h>
-#include <gtk/gtkdialog.h>
-#include <gtk/gtkstock.h>
-#include <libgnome/gnome-i18n.h>
-#include <glade/glade.h>
-#include <e-util/e-dialog-widgets.h>
-#include <e-util/e-time-utils.h>
-#include <widgets/misc/e-dateedit.h>
-#include <libecal/e-cal-recur.h>
-#include <libecal/e-cal-time-util.h>
-#include "../calendar-config.h"
-#include "../tag-calendar.h"
-#include "../weekday-picker.h"
-#include "comp-editor-util.h"
-#include "../e-date-time-list.h"
-#include "../e-mini-calendar-config.h"
-#include "recurrence-page.h"
-
-
-
-enum month_num_options {
-	MONTH_NUM_FIRST,
-	MONTH_NUM_SECOND,
-	MONTH_NUM_THIRD,
-	MONTH_NUM_FOURTH,
-	MONTH_NUM_LAST,
-	MONTH_NUM_DAY,
-	MONTH_NUM_OTHER
-};
-
-static const int month_num_options_map[] = {
-	MONTH_NUM_FIRST,
-	MONTH_NUM_SECOND,
-	MONTH_NUM_THIRD,
-	MONTH_NUM_FOURTH,
-	MONTH_NUM_LAST,
-	MONTH_NUM_DAY,
-	MONTH_NUM_OTHER,
-	-1
-};
-
-enum month_day_options {
-	MONTH_DAY_NTH,
-	MONTH_DAY_MON,
-	MONTH_DAY_TUE,
-	MONTH_DAY_WED,
-	MONTH_DAY_THU,
-	MONTH_DAY_FRI,
-	MONTH_DAY_SAT,
-	MONTH_DAY_SUN
-};
-
-static const int month_day_options_map[] = {
-	MONTH_DAY_NTH,
-	MONTH_DAY_MON,
-	MONTH_DAY_TUE,
-	MONTH_DAY_WED,
-	MONTH_DAY_THU,
-	MONTH_DAY_FRI,
-	MONTH_DAY_SAT,
-	MONTH_DAY_SUN,
-	-1
-};
-
-enum recur_type {
-	RECUR_NONE,
-	RECUR_SIMPLE,
-	RECUR_CUSTOM
-};
-
-static const int type_map[] = {
-	RECUR_NONE,
-	RECUR_SIMPLE,
-	RECUR_CUSTOM,
-	-1
-};
-
-static const int freq_map[] = {
-	ICAL_DAILY_RECURRENCE,
-	ICAL_WEEKLY_RECURRENCE,
-	ICAL_MONTHLY_RECURRENCE,
-	ICAL_YEARLY_RECURRENCE,
-	-1
-};
-
-enum ending_type {
-	ENDING_FOR,
-	ENDING_UNTIL,
-	ENDING_FOREVER
-};
-
-static const int ending_types_map[] = {
-	ENDING_FOR,
-	ENDING_UNTIL,
-	ENDING_FOREVER,
-	-1
-};
-
-/* Private part of the RecurrencePage structure */
-struct _RecurrencePagePrivate {
-	/* Component we use to expand the recurrence rules for the preview */
-	ECalComponent *comp;
-
-	/* Glade XML data */
-	GladeXML *xml;
-
-	/* Widgets from the Glade file */
-	GtkWidget *main;
-
-	GtkWidget *recurs;
-	gboolean custom;
-	
-	GtkWidget *params;
-	GtkWidget *interval_value;
-	GtkWidget *interval_unit;
-	GtkWidget *special;
-	GtkWidget *ending_menu;
-	GtkWidget *ending_special;
-	GtkWidget *custom_warning_bin;
-
-	/* For weekly recurrences, created by hand */
-	GtkWidget *weekday_picker;
-	guint8 weekday_day_mask;
-	guint8 weekday_blocked_day_mask;
-
-	/* For monthly recurrences, created by hand */
-	int month_index;
-
-	GtkWidget *month_day_menu;
-	enum month_day_options month_day;
-
-	GtkWidget *month_num_menu;
-	enum month_num_options month_num;
-	
-	/* For ending date, created by hand */
-	GtkWidget *ending_date_edit;
-	struct icaltimetype ending_date_tt;
-
-	/* For ending count of occurrences, created by hand */
-	GtkWidget *ending_count_spin;
-	int ending_count;
-
-	/* More widgets from the Glade file */
-	GtkWidget *exception_list;  /* This is a GtkTreeView now */
-	GtkWidget *exception_add;
-	GtkWidget *exception_modify;
-	GtkWidget *exception_delete;
-
-	GtkWidget *preview_bin;
-
-	/* Store for exception_list */
-	EDateTimeList *exception_list_store;
-
-	/* For the recurrence preview, the actual widget */
-	GtkWidget *preview_calendar;
-	EMiniCalendarConfig *preview_calendar_config;
-	
-	gboolean updating;
-};
-
-
-
-static void recurrence_page_finalize (GObject *object);
-
-static GtkWidget *recurrence_page_get_widget (CompEditorPage *page);
-static void recurrence_page_focus_main_widget (CompEditorPage *page);
-static gboolean recurrence_page_fill_widgets (CompEditorPage *page, ECalComponent *comp);
-static gboolean recurrence_page_fill_component (CompEditorPage *page, ECalComponent *comp);
-static void recurrence_page_set_dates (CompEditorPage *page, CompEditorPageDates *dates);
-
-static void field_changed (RecurrencePage *apage);
-
-G_DEFINE_TYPE (RecurrencePage, recurrence_page, TYPE_COMP_EDITOR_PAGE);
-
-/* Class initialization function for the recurrence page */
-static void
-recurrence_page_class_init (RecurrencePageClass *class)
-{
-	CompEditorPageClass *editor_page_class;
-	GObjectClass *object_class;
-
-	editor_page_class = (CompEditorPageClass *) class;
-	object_class = (GObjectClass *) class;
-
-	editor_page_class->get_widget = recurrence_page_get_widget;
-	editor_page_class->focus_main_widget = recurrence_page_focus_main_widget;
-	editor_page_class->fill_widgets = recurrence_page_fill_widgets;
-	editor_page_class->fill_component = recurrence_page_fill_component;
-	editor_page_class->set_dates = recurrence_page_set_dates;
-
-	object_class->finalize = recurrence_page_finalize;
-}
-
-/* Object initialization function for the recurrence page */
-static void
-recurrence_page_init (RecurrencePage *rpage)
-{
-	RecurrencePagePrivate *priv;
-
-	priv = g_new0 (RecurrencePagePrivate, 1);
-	rpage->priv = priv;
-
-	priv->xml = NULL;
-
-	priv->main = NULL;
-	priv->recurs = NULL;
-	priv->custom = FALSE;
-	priv->params = NULL;
-	priv->interval_value = NULL;
-	priv->interval_unit = NULL;
-	priv->special = NULL;
-	priv->ending_menu = NULL;
-	priv->ending_special = NULL;
-	priv->custom_warning_bin = NULL;
-	priv->weekday_picker = NULL;
-	priv->month_day_menu = NULL;
-	priv->month_num_menu = NULL;
-	priv->ending_date_edit = NULL;
-	priv->ending_count_spin = NULL;
-	priv->exception_list = NULL;
-	priv->exception_add = NULL;
-	priv->exception_modify = NULL;
-	priv->exception_delete = NULL;
-	priv->preview_bin = NULL;
-	priv->preview_calendar = NULL;
-
-	priv->comp = NULL;
-}
-
-/* Destroy handler for the recurrence page */
-static void
-recurrence_page_finalize (GObject *object)
-{
-	RecurrencePage *rpage;
-	RecurrencePagePrivate *priv;
-
-	g_return_if_fail (object != NULL);
-	g_return_if_fail (IS_RECURRENCE_PAGE (object));
-
-	rpage = RECURRENCE_PAGE (object);
-	priv = rpage->priv;
-
-	if (priv->main)
-		gtk_widget_unref (priv->main);
-
-	if (priv->xml) {
-		g_object_unref (priv->xml);
-		priv->xml = NULL;
-	}
-
-	if (priv->comp) {
-		g_object_unref (priv->comp);
-		priv->comp = NULL;
-	}
-
-	if (priv->exception_list_store) {
-		g_object_unref (priv->exception_list_store);
-		priv->exception_list_store = NULL;
-	}
-
-	if (priv->preview_calendar_config) {
-		g_object_unref (priv->preview_calendar_config);
-		priv->preview_calendar_config = NULL;
-	}
-
-	g_free (priv);
-	rpage->priv = NULL;
-
-	if (G_OBJECT_CLASS (recurrence_page_parent_class)->finalize)
-		(* G_OBJECT_CLASS (recurrence_page_parent_class)->finalize) (object);
-}
-
-
-
-/* get_widget handler for the recurrence page */
-static GtkWidget *
-recurrence_page_get_widget (CompEditorPage *page)
-{
-	RecurrencePage *rpage;
-	RecurrencePagePrivate *priv;
-
-	rpage = RECURRENCE_PAGE (page);
-	priv = rpage->priv;
-
-	return priv->main;
-}
-
-/* focus_main_widget handler for the recurrence page */
-static void
-recurrence_page_focus_main_widget (CompEditorPage *page)
-{
-	RecurrencePage *rpage;
-	RecurrencePagePrivate *priv;
-
-	rpage = RECURRENCE_PAGE (page);
-	priv = rpage->priv;
-
-	gtk_widget_grab_focus (priv->recurs);
-}
-
-/* Fills the widgets with default values */
-static void
-clear_widgets (RecurrencePage *rpage)
-{
-	RecurrencePagePrivate *priv;
-	GtkAdjustment *adj;
-	GtkWidget *menu;
-
-	priv = rpage->priv;
-
-	priv->custom = FALSE;
-	
-	priv->weekday_day_mask = 0;
-
-	priv->month_index = 1;
-	priv->month_num = MONTH_NUM_DAY;
-	priv->month_day = MONTH_DAY_NTH;
-
-	g_signal_handlers_block_matched (priv->recurs, G_SIGNAL_MATCH_DATA, 0, 0, NULL, NULL, rpage);
-	e_dialog_toggle_set (priv->recurs, FALSE);
-	g_signal_handlers_unblock_matched (priv->recurs, G_SIGNAL_MATCH_DATA, 0, 0, NULL, NULL, rpage);
-
-	adj = gtk_spin_button_get_adjustment (GTK_SPIN_BUTTON (priv->interval_value));
-	g_signal_handlers_block_matched (adj, G_SIGNAL_MATCH_DATA, 0, 0, NULL, NULL, rpage);
-	e_dialog_spin_set (priv->interval_value, 1);
-	g_signal_handlers_unblock_matched (adj, G_SIGNAL_MATCH_DATA, 0, 0, NULL, NULL, rpage);
-
-	menu = gtk_option_menu_get_menu (GTK_OPTION_MENU (priv->interval_unit));
-	g_signal_handlers_block_matched (menu, G_SIGNAL_MATCH_DATA, 0, 0, NULL, NULL, rpage);
-	e_dialog_option_menu_set (priv->interval_unit,
-				  ICAL_DAILY_RECURRENCE,
-				  freq_map);
-	g_signal_handlers_unblock_matched (menu, G_SIGNAL_MATCH_DATA, 0, 0, NULL, NULL, rpage);
-
-	priv->ending_date_tt = icaltime_today ();
-	priv->ending_count = 1;
-
-	menu = gtk_option_menu_get_menu (GTK_OPTION_MENU (priv->ending_menu));
-	g_signal_handlers_block_matched (menu, G_SIGNAL_MATCH_DATA, 0, 0, NULL, NULL, rpage);
-	e_dialog_option_menu_set (priv->ending_menu, 
-				  ENDING_FOREVER,
-				  ending_types_map);
-	g_signal_handlers_unblock_matched (menu, G_SIGNAL_MATCH_DATA, 0, 0, NULL, NULL, rpage);
-
-	/* Exceptions list */
-	e_date_time_list_clear (priv->exception_list_store);
-}
-
-/* Appends an exception date to the list */
-static void
-append_exception (RecurrencePage *rpage, ECalComponentDateTime *datetime)
-{
-	RecurrencePagePrivate *priv;
-	GtkTreeView *view;
-	GtkTreeIter  iter;
-
-	priv = rpage->priv;
-	view = GTK_TREE_VIEW (priv->exception_list);
-
-	e_date_time_list_append (priv->exception_list_store, &iter, datetime);
-	gtk_tree_selection_select_iter (gtk_tree_view_get_selection (view), &iter);
-}
-
-/* Fills in the exception widgets with the data from the calendar component */
-static void
-fill_exception_widgets (RecurrencePage *rpage, ECalComponent *comp)
-{
-	RecurrencePagePrivate *priv;
-	GSList *list, *l;
-	gboolean added = FALSE;
-
-	priv = rpage->priv;
-	e_cal_component_get_exdate_list (comp, &list);
-
-	for (l = list; l; l = l->next) {
-		ECalComponentDateTime *cdt;
-
-		added = TRUE;
-
-		cdt = l->data;
-		append_exception (rpage, cdt);
-	}
-
-	e_cal_component_free_exdate_list (list);
-}
-
-/* Computes a weekday mask for the start day of a calendar component,
- * for use in a WeekdayPicker widget.
- */
-static guint8
-get_start_weekday_mask (ECalComponent *comp)
-{
-	ECalComponentDateTime dt;
-	guint8 retval;
-
-	e_cal_component_get_dtstart (comp, &dt);
-
-	if (dt.value) {
-		short weekday;
-
-		weekday = icaltime_day_of_week (*dt.value);
-		retval = 0x1 << (weekday - 1);
-	} else
-		retval = 0;
-
-	e_cal_component_free_datetime (&dt);
-
-	return retval;
-}
-
-/* Sets some sane defaults for the data sources for the recurrence special
- * widgets, even if they will not be used immediately.
- */
-static void
-set_special_defaults (RecurrencePage *rpage)
-{
-	RecurrencePagePrivate *priv;
-	guint8 mask;
-
-	priv = rpage->priv;
-
-	mask = get_start_weekday_mask (priv->comp);
-
-	priv->weekday_day_mask = mask;
-	priv->weekday_blocked_day_mask = mask;
-}
-
-/* Sensitizes the recurrence widgets based on the state of the recurrence type
- * radio group.
- */
-static void
-sensitize_recur_widgets (RecurrencePage *rpage)
-{
-	RecurrencePagePrivate *priv;
-	gboolean recurs;
-	GtkWidget *label;
-
-	priv = rpage->priv;
-
-	recurs = e_dialog_toggle_get (priv->recurs);
-	
-	/* We can't preview that well for instances right now */
-	if (e_cal_component_is_instance (priv->comp))
-		gtk_widget_set_sensitive (priv->preview_calendar, FALSE);
-	else
-		gtk_widget_set_sensitive (priv->preview_calendar, TRUE);
-
-	if (GTK_BIN (priv->custom_warning_bin)->child)
-		gtk_widget_destroy (GTK_BIN (priv->custom_warning_bin)->child);
-
-	if (recurs && priv->custom) {
-		gtk_widget_set_sensitive (priv->params, FALSE);
-		gtk_widget_hide (priv->params);
-
-		label = gtk_label_new (_("This appointment contains "
-					 "recurrences that Evolution "
-					 "cannot edit."));
-		gtk_container_add (GTK_CONTAINER (priv->custom_warning_bin),
-				   label);
-		gtk_widget_show_all (priv->custom_warning_bin);
-	} else if (recurs) {
-		gtk_widget_set_sensitive (priv->params, TRUE);
-		gtk_widget_show (priv->params);
-		gtk_widget_hide (priv->custom_warning_bin);
-	} else {
-		gtk_widget_set_sensitive (priv->params, FALSE);
-		gtk_widget_show (priv->params);
-		gtk_widget_hide (priv->custom_warning_bin);
-	}
-}
-
-static void
-sensitize_buttons (RecurrencePage *rpage)
-{
-	gboolean read_only;
-	gint selected_rows;
-	RecurrencePagePrivate *priv;
-	icalcomponent *icalcomp;
-	const char *uid;
-
-	priv = rpage->priv;
-
-	selected_rows = gtk_tree_selection_count_selected_rows (
-		gtk_tree_view_get_selection (GTK_TREE_VIEW (priv->exception_list)));
-
-	if (!e_cal_is_read_only (COMP_EDITOR_PAGE (rpage)->client, &read_only, NULL))
-		read_only = TRUE;
-	
-	if (!read_only) {
-		e_cal_component_get_uid (priv->comp, &uid);
-
-		if (e_cal_get_static_capability (COMP_EDITOR_PAGE (rpage)->client, CAL_STATIC_CAPABILITY_NO_CONV_TO_RECUR) && e_cal_get_object(COMP_EDITOR_PAGE (rpage)->client, uid, NULL, &icalcomp, NULL)) {
-			read_only = TRUE;
-			icalcomponent_free (icalcomp);
-		}
-
-		if (!read_only) {
-			GList *list;
-
-			/* see if we have detached instances */
-			if (e_cal_get_objects_for_uid (COMP_EDITOR_PAGE (rpage)->client, uid, &list, NULL)) {
-				if (list && g_list_length (list) > 1)
-					read_only = TRUE;
-
-				g_list_foreach (list, (GFunc) g_object_unref, NULL);
-				g_list_free (list);
-			}
-		}
-	}
-
-	if (!read_only)
-		sensitize_recur_widgets (rpage);
-	else
-		gtk_widget_set_sensitive (priv->params, FALSE);
-
-	gtk_widget_set_sensitive (priv->recurs, !read_only);
-	gtk_widget_set_sensitive (priv->exception_add, !read_only && e_cal_component_has_recurrences (priv->comp));
-	gtk_widget_set_sensitive (priv->exception_modify, !read_only && selected_rows > 0);
-	gtk_widget_set_sensitive (priv->exception_delete, !read_only && selected_rows > 0);
-}
-
-#if 0
-/* Encondes a position/weekday pair into the proper format for
- * icalrecurrencetype.by_day. Not needed at present.
- */
-static short
-nth_weekday (int pos, icalrecurrencetype_weekday weekday)
-{
-	g_assert (pos > 0 && pos <= 5);
-
-	return (pos << 3) | (int) weekday;
-}
-#endif
-
-/* Gets the simple recurrence data from the recurrence widgets and stores it in
- * the calendar component.
- */
-static void
-simple_recur_to_comp (RecurrencePage *rpage, ECalComponent *comp)
-{
-	RecurrencePagePrivate *priv;
-	struct icalrecurrencetype r;
-	GSList l;
-	enum ending_type ending_type;
-	gboolean date_set;
-
-	priv = rpage->priv;
-
-	icalrecurrencetype_clear (&r);
-
-	/* Frequency, interval, week start */
-
-	r.freq = e_dialog_option_menu_get (priv->interval_unit, freq_map);
-	r.interval = e_dialog_spin_get_int (priv->interval_value);
-	r.week_start = ICAL_SUNDAY_WEEKDAY
-		+ calendar_config_get_week_start_day ();
-
-	/* Frequency-specific data */
-
-	switch (r.freq) {
-	case ICAL_DAILY_RECURRENCE:
-		/* Nothing else is required */
-		break;
-
-	case ICAL_WEEKLY_RECURRENCE: {
-		guint8 day_mask;
-		int i;
-
-		g_assert (GTK_BIN (priv->special)->child != NULL);
-		g_assert (priv->weekday_picker != NULL);
-		g_assert (IS_WEEKDAY_PICKER (priv->weekday_picker));
-
-		day_mask = weekday_picker_get_days (WEEKDAY_PICKER (priv->weekday_picker));
-
-		i = 0;
-
-		if (day_mask & (1 << 0))
-			r.by_day[i++] = ICAL_SUNDAY_WEEKDAY;
-
-		if (day_mask & (1 << 1))
-			r.by_day[i++] = ICAL_MONDAY_WEEKDAY;
-
-		if (day_mask & (1 << 2))
-			r.by_day[i++] = ICAL_TUESDAY_WEEKDAY;
-
-		if (day_mask & (1 << 3))
-			r.by_day[i++] = ICAL_WEDNESDAY_WEEKDAY;
-
-		if (day_mask & (1 << 4))
-			r.by_day[i++] = ICAL_THURSDAY_WEEKDAY;
-
-		if (day_mask & (1 << 5))
-			r.by_day[i++] = ICAL_FRIDAY_WEEKDAY;
-
-		if (day_mask & (1 << 6))
-			r.by_day[i++] = ICAL_SATURDAY_WEEKDAY;
-
-		break;
-	}
-
-	case ICAL_MONTHLY_RECURRENCE: {
-		enum month_num_options month_num;
-		enum month_day_options month_day;
-		
-		g_assert (GTK_BIN (priv->special)->child != NULL);
-		g_assert (priv->month_day_menu != NULL);
-		g_assert (GTK_IS_OPTION_MENU (priv->month_day_menu));
-		g_assert (priv->month_num_menu != NULL);
-		g_assert (GTK_IS_OPTION_MENU (priv->month_num_menu));
-
-		month_num = e_dialog_option_menu_get (priv->month_num_menu,
-						      month_num_options_map );
-		month_day = e_dialog_option_menu_get (priv->month_day_menu,
-						      month_day_options_map);
-
-		if (month_num == MONTH_NUM_LAST)
-			month_num = -1;
-		else
-			month_num++;
-		
-		switch (month_day) {
-		case MONTH_DAY_NTH:
-			if (month_num == -1)
-				r.by_month_day[0] = -1;
-			else
-				r.by_month_day[0] = priv->month_index;
-			break;
-
-		/* Outlook 2000 uses BYDAY=TU;BYSETPOS=2, and will not
-		   accept BYDAY=2TU. So we now use the same as Outlook
-		   by default. */
-		case MONTH_DAY_MON:
-			r.by_day[0] = ICAL_MONDAY_WEEKDAY;
-			r.by_set_pos[0] = month_num;
-			break;
-
-		case MONTH_DAY_TUE:
-			r.by_day[0] = ICAL_TUESDAY_WEEKDAY;
-			r.by_set_pos[0] = month_num;
-			break;
-
-		case MONTH_DAY_WED:
-			r.by_day[0] = ICAL_WEDNESDAY_WEEKDAY;
-			r.by_set_pos[0] = month_num;
-			break;
-
-		case MONTH_DAY_THU:
-			r.by_day[0] = ICAL_THURSDAY_WEEKDAY;
-			r.by_set_pos[0] = month_num;
-			break;
-
-		case MONTH_DAY_FRI:
-			r.by_day[0] = ICAL_FRIDAY_WEEKDAY;
-			r.by_set_pos[0] = month_num;
-			break;
-
-		case MONTH_DAY_SAT:
-			r.by_day[0] = ICAL_SATURDAY_WEEKDAY;
-			r.by_set_pos[0] = month_num;
-			break;
-
-		case MONTH_DAY_SUN:
-			r.by_day[0] = ICAL_SUNDAY_WEEKDAY;
-			r.by_set_pos[0] = month_num;
-			break;
-
-		default:
-			g_assert_not_reached ();
-		}
-
-		break;
-	}
-
-	case ICAL_YEARLY_RECURRENCE:
-		/* Nothing else is required */
-		break;
-
-	default:
-		g_assert_not_reached ();
-	}
-
-	/* Ending date */
-
-	ending_type = e_dialog_option_menu_get (priv->ending_menu,
-						ending_types_map);
-
-	switch (ending_type) {
-	case ENDING_FOR:
-		g_assert (priv->ending_count_spin != NULL);
-		g_assert (GTK_IS_SPIN_BUTTON (priv->ending_count_spin));
-
-		r.count = e_dialog_spin_get_int (priv->ending_count_spin);
-		break;
-
-	case ENDING_UNTIL:
-		g_assert (priv->ending_date_edit != NULL);
-		g_assert (E_IS_DATE_EDIT (priv->ending_date_edit));
-
-		/* We only allow a DATE value to be set for the UNTIL property,
-		   since we don't support sub-day recurrences. */
-		date_set = e_date_edit_get_date (E_DATE_EDIT (priv->ending_date_edit),
-						 &r.until.year,
-						 &r.until.month,
-						 &r.until.day);
-		g_assert (date_set);
-
-		r.until.is_date = 1;
-
-		break;
-
-	case ENDING_FOREVER:
-		/* Nothing to be done */
-		break;
-
-	default:
-		g_assert_not_reached ();
-	}
-
-	/* Set the recurrence */
-
-	l.data = &r;
-	l.next = NULL;
-
-	e_cal_component_set_rrule_list (comp, &l);
-}
-
-/* Fills a component with the data from the recurrence page; in the case of a
- * custom recurrence, it leaves it intact.
- */
-static gboolean
-fill_component (RecurrencePage *rpage, ECalComponent *comp)
-{
-	RecurrencePagePrivate *priv;
-	gboolean recurs;
-	GtkTreeModel *model;
-	GtkTreeIter iter;
-	gboolean valid_iter;
-	GSList *list;
-
-	priv = rpage->priv;
-	model = GTK_TREE_MODEL (priv->exception_list_store);
-
-	recurs = e_dialog_toggle_get (priv->recurs);
-	
-	if (recurs && priv->custom) {
-		/* We just keep whatever the component has currently */
-	} else if (recurs) {
-		e_cal_component_set_rdate_list (comp, NULL);
-		e_cal_component_set_exrule_list (comp, NULL);
-		simple_recur_to_comp (rpage, comp);
-	} else {
-		e_cal_component_set_rdate_list (comp, NULL);
-		e_cal_component_set_rrule_list (comp, NULL);
-		e_cal_component_set_exrule_list (comp, NULL);
-	}
-
-	/* Set exceptions */
-
-	list = NULL;
-
-	for (valid_iter = gtk_tree_model_get_iter_first (model, &iter); valid_iter;
-	     valid_iter = gtk_tree_model_iter_next (model, &iter)) {
-		const ECalComponentDateTime *dt;
-		ECalComponentDateTime *cdt;
-
-		cdt = g_new (ECalComponentDateTime, 1);
-		cdt->value = g_new (struct icaltimetype, 1);
-
-		dt = e_date_time_list_get_date_time (E_DATE_TIME_LIST (model), &iter);
-		g_assert (dt != NULL);
-
-		if (!icaltime_is_valid_time (*dt->value)) {
-			comp_editor_page_display_validation_error (COMP_EDITOR_PAGE (rpage),
-								   _("Recurrence date is invalid"),
-								   priv->exception_list);
-			return FALSE;
-		}
-
-		*cdt->value = *dt->value;
-		cdt->tzid = g_strdup (dt->tzid);
-
-		list = g_slist_prepend (list, cdt);
-	}
-
-	e_cal_component_set_exdate_list (comp, list);
-	e_cal_component_free_exdate_list (list);
-
-	return TRUE;
-}
-
-/* Re-tags the recurrence preview calendar based on the current information of
- * the widgets in the recurrence page.
- */
-static void
-preview_recur (RecurrencePage *rpage)
-{
-	RecurrencePagePrivate *priv;
-	ECalComponent *comp;
-	ECalComponentDateTime cdt;
-	GSList *l;
-	icaltimezone *zone = NULL;
-	
-	priv = rpage->priv;
-
-	/* If our component has not been set yet through ::fill_widgets(), we
-	 * cannot preview the recurrence.
-	 */
-	if (!priv->comp || e_cal_component_is_instance (priv->comp))
-		return;
-
-	/* Create a scratch component with the start/end and
-	 * recurrence/exception information from the one we are editing.
-	 */
-
-	comp = e_cal_component_new ();
-	e_cal_component_set_new_vtype (comp, E_CAL_COMPONENT_EVENT);
-
-	e_cal_component_get_dtstart (priv->comp, &cdt);
-	if (cdt.tzid != NULL) {
-		/* FIXME Will e_cal_get_timezone really not return builtin zones? */
-		if (!e_cal_get_timezone (COMP_EDITOR_PAGE (rpage)->client, cdt.tzid, &zone, NULL))
-			zone = icaltimezone_get_builtin_timezone_from_tzid (cdt.tzid);
-	}
-	e_cal_component_set_dtstart (comp, &cdt);
-	e_cal_component_free_datetime (&cdt);
-
-	e_cal_component_get_dtend (priv->comp, &cdt);
-	e_cal_component_set_dtend (comp, &cdt);
-	e_cal_component_free_datetime (&cdt);
-
-	e_cal_component_get_exdate_list (priv->comp, &l);
-	e_cal_component_set_exdate_list (comp, l);
-	e_cal_component_free_exdate_list (l);
-
-	e_cal_component_get_exrule_list (priv->comp, &l);
-	e_cal_component_set_exrule_list (comp, l);
-	e_cal_component_free_recur_list (l);
-
-	e_cal_component_get_rdate_list (priv->comp, &l);
-	e_cal_component_set_rdate_list (comp, l);
-	e_cal_component_free_period_list (l);
-
-	e_cal_component_get_rrule_list (priv->comp, &l);
-	e_cal_component_set_rrule_list (comp, l);
-	e_cal_component_free_recur_list (l);
-
-	fill_component (rpage, comp);
-
-	tag_calendar_by_comp (E_CALENDAR (priv->preview_calendar), comp,
-			      COMP_EDITOR_PAGE (rpage)->client, zone, TRUE, FALSE);
-	g_object_unref(comp);
-}
-
-/* Callback used when the recurrence weekday picker changes */
-static void
-weekday_picker_changed_cb (WeekdayPicker *wp, gpointer data)
-{
-	RecurrencePage *rpage;
-
-	rpage = RECURRENCE_PAGE (data);
-
-	field_changed (rpage);
-	preview_recur (rpage);
-}
-
-/* Creates the special contents for weekly recurrences */
-static void
-make_weekly_special (RecurrencePage *rpage)
-{
-	RecurrencePagePrivate *priv;
-	GtkWidget *hbox;
-	GtkWidget *label;
-	WeekdayPicker *wp;
-
-	priv = rpage->priv;
-
-	g_assert (GTK_BIN (priv->special)->child == NULL);
-	g_assert (priv->weekday_picker == NULL);
-
-	/* Create the widgets */
-
-	hbox = gtk_hbox_new (FALSE, 2);
-	gtk_container_add (GTK_CONTAINER (priv->special), hbox);
-
-	label = gtk_label_new (_("on"));
-	gtk_box_pack_start (GTK_BOX (hbox), label, FALSE, FALSE, 6);
-
-	wp = WEEKDAY_PICKER (weekday_picker_new ());
-
-	priv->weekday_picker = GTK_WIDGET (wp);
-	gtk_box_pack_start (GTK_BOX (hbox), GTK_WIDGET (wp), FALSE, FALSE, 6);
-
-	gtk_widget_show_all (hbox);
-
-	/* Set the weekdays */
-
-	weekday_picker_set_week_start_day (wp, calendar_config_get_week_start_day ());
-	weekday_picker_set_days (wp, priv->weekday_day_mask);
-	weekday_picker_set_blocked_days (wp, priv->weekday_blocked_day_mask);
-
-	g_signal_connect((wp), "changed",
-			    G_CALLBACK (weekday_picker_changed_cb),
-			    rpage);
-}
-
-
-static void
-month_num_submenu_selection_done_cb (GtkMenuShell *menu_shell, gpointer data)
-{
-	GtkWidget *item;
-	int month_index;
-	
-	item = gtk_menu_get_active (GTK_MENU (menu_shell));
-	item = gtk_menu_get_active (GTK_MENU (gtk_menu_item_get_submenu (GTK_MENU_ITEM (item))));
-
-	month_index = GPOINTER_TO_INT (gtk_object_get_user_data (GTK_OBJECT (item)));
-	gtk_object_set_user_data (GTK_OBJECT (data), GINT_TO_POINTER (month_index));
-}
-
-/* Creates the option menu for the monthly recurrence number */
-static GtkWidget *
-make_recur_month_num_submenu (const char *title, int start, int end)
-{
-	GtkWidget *submenu, *item;
-	int i;
-	
-	submenu = gtk_menu_new ();
-	for (i = start; i < end; i++) {
-		item = gtk_menu_item_new_with_label (_(e_cal_recur_nth[i]));
-		gtk_menu_shell_append(GTK_MENU_SHELL(submenu), item);
-		gtk_object_set_user_data (GTK_OBJECT (item), GINT_TO_POINTER (i + 1));
-		gtk_widget_show (item);
-	}	
-
-	item = gtk_menu_item_new_with_label (_(title));
-	gtk_widget_show (item);
-	gtk_menu_item_set_submenu (GTK_MENU_ITEM (item), submenu);
-
-	return item;
-}
-
-static GtkWidget *
-make_recur_month_num_menu (int month_index)
-{
-	static const char *options[] = {
-		N_("first"),
-		N_("second"),
-		N_("third"),
-		N_("fourth"),
-		N_("last")
-	};
-
-	GtkWidget *menu, *submenu, *item, *submenu_item;
-	GtkWidget *omenu;
-	int i;
-
-	menu = gtk_menu_new ();
-
-	/* Relation */
-	for (i = 0; i < sizeof (options) / sizeof (options[0]); i++) {
-		item = gtk_menu_item_new_with_label (_(options[i]));
-		gtk_menu_shell_append(GTK_MENU_SHELL(menu), item);
-		gtk_widget_show (item);
-	}
-
-	/* Current date */
-	item = gtk_menu_item_new_with_label (_(e_cal_recur_nth[month_index - 1]));
-	gtk_menu_shell_append(GTK_MENU_SHELL(menu), item);
-	gtk_widget_show (item);
-
-	/* Other Submenu */
-	submenu = gtk_menu_new ();
-	submenu_item = gtk_menu_item_new_with_label (_("Other Date"));
-	gtk_menu_shell_append(GTK_MENU_SHELL(menu), submenu_item);
-	gtk_widget_show (submenu_item);
-
-	item = make_recur_month_num_submenu ("1st to 10th", 0, 10);
-	gtk_menu_shell_append(GTK_MENU_SHELL(submenu), item);
-	item = make_recur_month_num_submenu ("11th to 20th", 10, 20);
-	gtk_menu_shell_append(GTK_MENU_SHELL(submenu), item);
-	item = make_recur_month_num_submenu ("21st to 31st", 20, 31);
-	gtk_menu_shell_append(GTK_MENU_SHELL(submenu), item);
-
-	gtk_menu_item_set_submenu (GTK_MENU_ITEM (submenu_item), submenu);
-	gtk_object_set_user_data (GTK_OBJECT (submenu_item), GINT_TO_POINTER (month_index));
-	g_signal_connect((submenu), "selection_done",
-			    G_CALLBACK (month_num_submenu_selection_done_cb),
-			    submenu_item);
-
-	omenu = gtk_option_menu_new ();
-	gtk_option_menu_set_menu (GTK_OPTION_MENU (omenu), menu);
-
-	return omenu;
-}
-
-/* Creates the option menu for the monthly recurrence days */
-static GtkWidget *
-make_recur_month_menu (void)
-{
-	static const char *options[] = {
-		N_("day"),
-		N_("Monday"),
-		N_("Tuesday"),
-		N_("Wednesday"),
-		N_("Thursday"),
-		N_("Friday"),
-		N_("Saturday"),
-		N_("Sunday")
-	};
-
-	GtkWidget *menu;
-	GtkWidget *omenu;
-	int i;
-
-	menu = gtk_menu_new ();
-
-	for (i = 0; i < sizeof (options) / sizeof (options[0]); i++) {
-		GtkWidget *item;
-
-		item = gtk_menu_item_new_with_label (_(options[i]));
-		gtk_menu_shell_append(GTK_MENU_SHELL(menu), item);
-		gtk_widget_show (item);
-	}
-
-	omenu = gtk_option_menu_new ();
-	gtk_option_menu_set_menu (GTK_OPTION_MENU (omenu), menu);
-
-	return omenu;
-}
-
-static void
-month_num_menu_selection_done_cb (GtkMenuShell *menu_shell, gpointer data)
-{
-	RecurrencePage *rpage;
-	RecurrencePagePrivate *priv;
-	enum month_num_options month_num;
-	enum month_day_options month_day;
-
-	rpage = RECURRENCE_PAGE (data);
-	priv = rpage->priv;
-
-	month_num = e_dialog_option_menu_get (priv->month_num_menu,
-					      month_num_options_map);
-	month_day = e_dialog_option_menu_get (priv->month_day_menu,
-					      month_day_options_map);
-
-	if (month_num == MONTH_NUM_OTHER) {
-		GtkWidget *label, *item;
-
-		item = gtk_menu_get_active (GTK_MENU (menu_shell));
-		priv->month_index = GPOINTER_TO_INT (gtk_object_get_user_data (GTK_OBJECT (item)));
-
-		month_num = MONTH_NUM_DAY;
-		e_dialog_option_menu_set (priv->month_num_menu, month_num, month_num_options_map);
-
-		label = GTK_BIN (priv->month_num_menu)->child;
-		gtk_label_set_text (GTK_LABEL (label), _(e_cal_recur_nth[priv->month_index - 1]));
-
-		e_dialog_option_menu_set (priv->month_num_menu, 0, month_num_options_map);
-		e_dialog_option_menu_set (priv->month_num_menu, month_num, month_num_options_map);
-	}
-	
-	if (month_num == MONTH_NUM_DAY && month_day != MONTH_DAY_NTH)
-		e_dialog_option_menu_set (priv->month_day_menu,
-					  MONTH_DAY_NTH,
-					  month_day_options_map);
-	else if (month_num != MONTH_NUM_DAY && month_num != MONTH_NUM_LAST && month_day == MONTH_DAY_NTH)
-		e_dialog_option_menu_set (priv->month_day_menu,
-					  MONTH_DAY_MON,
-					  month_num_options_map);
-	field_changed (rpage);
-	preview_recur (rpage);
-}
-
-/* Callback used when the monthly day selection menu changes.  We need
- * to change the valid range of the day index spin button; e.g. days
- * are 1-31 while a Sunday is the 1st through 5th.
- */
-static void
-month_day_menu_selection_done_cb (GtkMenuShell *menu_shell, gpointer data)
-{
-	RecurrencePage *rpage;
-	RecurrencePagePrivate *priv;
-	enum month_num_options month_num;
-	enum month_day_options month_day;
-
-	rpage = RECURRENCE_PAGE (data);
-	priv = rpage->priv;
-	
-	month_num = e_dialog_option_menu_get (priv->month_num_menu,
-					      month_num_options_map);
-	month_day = e_dialog_option_menu_get (priv->month_day_menu,
-					      month_day_options_map);
-	if (month_day == MONTH_DAY_NTH && month_num != MONTH_NUM_LAST && month_num != MONTH_NUM_DAY)
-		e_dialog_option_menu_set (priv->month_num_menu,
-					  MONTH_NUM_DAY,
-					  month_num_options_map);
-	else if (month_day != MONTH_DAY_NTH && month_num == MONTH_NUM_DAY)
-		e_dialog_option_menu_set (priv->month_num_menu,
-					  MONTH_NUM_FIRST,
-					  month_num_options_map);
-	field_changed (rpage);
-	preview_recur (rpage);
-}
-
-/* Callback used when the month index value changes. */
-static void
-month_index_value_changed_cb (GtkAdjustment *adj, gpointer data)
-{
-	RecurrencePage *rpage;
-
-	rpage = RECURRENCE_PAGE (data);
-
-	field_changed (rpage);
-	preview_recur (rpage);
-}
-
-/* Creates the special contents for monthly recurrences */
-static void
-make_monthly_special (RecurrencePage *rpage)
-{
-	RecurrencePagePrivate *priv;
-	GtkWidget *hbox;
-	GtkWidget *label;
-	GtkAdjustment *adj;
-	GtkWidget *menu;
-
-	priv = rpage->priv;
-
-	g_assert (GTK_BIN (priv->special)->child == NULL);
-	g_assert (priv->month_day_menu == NULL);
-
-	/* Create the widgets */
-
-	hbox = gtk_hbox_new (FALSE, 2);
-	gtk_container_add (GTK_CONTAINER (priv->special), hbox);
-
-	label = gtk_label_new (_("on the"));
-	gtk_box_pack_start (GTK_BOX (hbox), label, FALSE, FALSE, 6);
-
-	adj = GTK_ADJUSTMENT (gtk_adjustment_new (1, 1, 31, 1, 10, 10));
-
-	priv->month_num_menu = make_recur_month_num_menu (priv->month_index);
-	gtk_box_pack_start (GTK_BOX (hbox), priv->month_num_menu,
-			    FALSE, FALSE, 6);
-
-	priv->month_day_menu = make_recur_month_menu ();
-	gtk_box_pack_start (GTK_BOX (hbox), priv->month_day_menu,
-			    FALSE, FALSE, 6);
-
-	gtk_widget_show_all (hbox);
-
-	/* Set the options */
-	e_dialog_option_menu_set (priv->month_num_menu,
-				  priv->month_num,
-				  month_num_options_map);
-	e_dialog_option_menu_set (priv->month_day_menu,
-				  priv->month_day,
-				  month_day_options_map);
-
-	g_signal_connect((adj), "value_changed",			    G_CALLBACK (month_index_value_changed_cb),
-			    rpage);
-
-	menu = gtk_option_menu_get_menu (GTK_OPTION_MENU (priv->month_num_menu));
-	g_signal_connect((menu), "selection_done",
-			    G_CALLBACK (month_num_menu_selection_done_cb),
-			    rpage);
-	menu = gtk_option_menu_get_menu (GTK_OPTION_MENU (priv->month_day_menu));
-	g_signal_connect((menu), "selection_done",
-			    G_CALLBACK (month_day_menu_selection_done_cb),
-			    rpage);
-}
-
-/* Changes the recurrence-special widget to match the interval units.
- *
- * For daily recurrences: nothing.
- * For weekly recurrences: weekday selector.
- * For monthly recurrences: "on the" <nth> [day, Weekday]
- * For yearly recurrences: nothing.
- */
-static void
-make_recurrence_special (RecurrencePage *rpage)
-{
-	RecurrencePagePrivate *priv;
-	icalrecurrencetype_frequency frequency;
-
-	priv = rpage->priv;
-
-	if (priv->month_num_menu != NULL) {
-		gtk_widget_destroy (priv->month_num_menu);
-		priv->month_num_menu = NULL;
-	}
-	if (GTK_BIN (priv->special)->child != NULL) {
-		gtk_widget_destroy (GTK_BIN (priv->special)->child);
-
-		priv->weekday_picker = NULL;
-		priv->month_day_menu = NULL;
-	}
-
-	frequency = e_dialog_option_menu_get (priv->interval_unit, freq_map);
-
-	switch (frequency) {
-	case ICAL_DAILY_RECURRENCE:
-		gtk_widget_hide (priv->special);
-		break;
-
-	case ICAL_WEEKLY_RECURRENCE:
-		make_weekly_special (rpage);
-		gtk_widget_show (priv->special);
-		break;
-
-	case ICAL_MONTHLY_RECURRENCE:
-		make_monthly_special (rpage);
-		gtk_widget_show (priv->special);
-		break;
-
-	case ICAL_YEARLY_RECURRENCE:
-		gtk_widget_hide (priv->special);
-		break;
-
-	default:
-		g_assert_not_reached ();
-	}
-}
-
-/* Counts the elements in the by_xxx fields of an icalrecurrencetype */
-static int
-count_by_xxx (short *field, int max_elements)
-{
-	int i;
-
-	for (i = 0; i < max_elements; i++)
-		if (field[i] == ICAL_RECURRENCE_ARRAY_MAX)
-			break;
-
-	return i;
-}
-
-/* Callback used when the ending-until date editor changes */
-static void
-ending_until_changed_cb (EDateEdit *de, gpointer data)
-{
-	RecurrencePage *rpage;
-
-	rpage = RECURRENCE_PAGE (data);
-	field_changed (rpage);
-	preview_recur (rpage);
-}
-
-/* Creates the special contents for "ending until" (end date) recurrences */
-static void
-make_ending_until_special (RecurrencePage *rpage)
-{
-	RecurrencePagePrivate *priv;
-	EDateEdit *de;
-
-	priv = rpage->priv;
-
-	g_assert (GTK_BIN (priv->ending_special)->child == NULL);
-	g_assert (priv->ending_date_edit == NULL);
-
-	/* Create the widget */
-
-	priv->ending_date_edit = comp_editor_new_date_edit (TRUE, FALSE,
-							    FALSE);
-	de = E_DATE_EDIT (priv->ending_date_edit);
-
-	gtk_container_add (GTK_CONTAINER (priv->ending_special),
-			   GTK_WIDGET (de));
-	gtk_widget_show_all (GTK_WIDGET (de));
-
-	/* Set the value */
-
-	e_date_edit_set_date (de, priv->ending_date_tt.year,
-			      priv->ending_date_tt.month,
-			      priv->ending_date_tt.day);
-
-	g_signal_connect((de), "changed",
-			    G_CALLBACK (ending_until_changed_cb), rpage);
-
-	/* Make sure the EDateEdit widget uses our timezones to get the
-	   current time. */
-	e_date_edit_set_get_time_callback (de,
-					   (EDateEditGetTimeCallback) comp_editor_get_current_time,
-					   rpage, NULL);
-}
-
-/* Callback used when the ending-count value changes */
-static void
-ending_count_value_changed_cb (GtkAdjustment *adj, gpointer data)
-{
-	RecurrencePage *rpage;
-
-	rpage = RECURRENCE_PAGE (data);
-	field_changed (rpage);
-	preview_recur (rpage);
-}
-
-/* Creates the special contents for the occurrence count case */
-static void
-make_ending_count_special (RecurrencePage *rpage)
-{
-	RecurrencePagePrivate *priv;
-	GtkWidget *hbox;
-	GtkWidget *label;
-	GtkAdjustment *adj;
-
-	priv = rpage->priv;
-
-	g_assert (GTK_BIN (priv->ending_special)->child == NULL);
-	g_assert (priv->ending_count_spin == NULL);
-
-	/* Create the widgets */
-
-	hbox = gtk_hbox_new (FALSE, 2);
-	gtk_container_add (GTK_CONTAINER (priv->ending_special), hbox);
-
-	adj = GTK_ADJUSTMENT (gtk_adjustment_new (1, 1, 10000, 1, 10, 10));
-	priv->ending_count_spin = gtk_spin_button_new (adj, 1, 0);
-	gtk_spin_button_set_numeric ((GtkSpinButton *)priv->ending_count_spin, TRUE);
-	gtk_box_pack_start (GTK_BOX (hbox), priv->ending_count_spin,
-			    FALSE, FALSE, 6);
-
-	label = gtk_label_new (_("occurrences"));
-	gtk_box_pack_start (GTK_BOX (hbox), label, FALSE, FALSE, 6);
-
-	gtk_widget_show_all (hbox);
-
-	/* Set the values */
-
-	e_dialog_spin_set (priv->ending_count_spin, priv->ending_count);
-
-	g_signal_connect((adj), "value_changed",
-			    G_CALLBACK (ending_count_value_changed_cb),
-			    rpage);
-}
-
-/* Changes the recurrence-ending-special widget to match the ending date option
- *
- * For: <n> [days, weeks, months, years, occurrences]
- * Until: <date selector>
- * Forever: nothing.
- */
-static void
-make_ending_special (RecurrencePage *rpage)
-{
-	RecurrencePagePrivate *priv;
-	enum ending_type ending_type;
-
-	priv = rpage->priv;
-
-	if (GTK_BIN (priv->ending_special)->child != NULL) {
-		gtk_widget_destroy (GTK_BIN (priv->ending_special)->child);
-
-		priv->ending_date_edit = NULL;
-		priv->ending_count_spin = NULL;
-	}
-
-	ending_type = e_dialog_option_menu_get (priv->ending_menu,
-						ending_types_map);
-
-	switch (ending_type) {
-	case ENDING_FOR:
-		make_ending_count_special (rpage);
-		gtk_widget_show (priv->ending_special);
-		break;
-
-	case ENDING_UNTIL:
-		make_ending_until_special (rpage);
-		gtk_widget_show (priv->ending_special);
-		break;
-
-	case ENDING_FOREVER:
-		gtk_widget_hide (priv->ending_special);
-		break;
-
-	default:
-		g_assert_not_reached ();
-	}
-}
-
-/* Fills the recurrence ending date widgets with the values from the calendar
- * component.
- */
-static void
-fill_ending_date (RecurrencePage *rpage, struct icalrecurrencetype *r)
-{
-	RecurrencePagePrivate *priv;
-	GtkWidget *menu;
-
-	priv = rpage->priv;
-
-	menu = gtk_option_menu_get_menu (GTK_OPTION_MENU (priv->ending_menu));
-	g_signal_handlers_block_matched (menu, G_SIGNAL_MATCH_DATA, 0, 0, NULL, NULL, rpage);
-
-	if (r->count == 0) {
-		if (r->until.year == 0) {
-			/* Forever */
-
-			e_dialog_option_menu_set (priv->ending_menu,
-						  ENDING_FOREVER,
-						  ending_types_map);
-		} else {
-			/* Ending date */
-
-			if (!r->until.is_date) {
-				ECal *client = COMP_EDITOR_PAGE (rpage)->client;
-				ECalComponentDateTime dt;
-				icaltimezone *from_zone, *to_zone;
-			
-				e_cal_component_get_dtstart (priv->comp, &dt);
-
-				if (dt.value->is_date)
-					to_zone = calendar_config_get_icaltimezone ();
-				else if (dt.tzid == NULL)
-					to_zone = icaltimezone_get_utc_timezone ();
-				else
-					/* FIXME Error checking? */
-					e_cal_get_timezone (client, dt.tzid, &to_zone, NULL);
-				from_zone = icaltimezone_get_utc_timezone ();
-
-				icaltimezone_convert_time (&r->until, from_zone, to_zone);
-
-				r->until.hour = 0;
-				r->until.minute = 0;
-				r->until.second = 0;
-				r->until.is_date = TRUE;
-				r->until.is_utc = FALSE;
-			}
-
-			priv->ending_date_tt = r->until;
-			e_dialog_option_menu_set (priv->ending_menu,
-						  ENDING_UNTIL,
-						  ending_types_map);
-		}
-	} else {
-		/* Count of occurrences */
-
-		priv->ending_count = r->count;
-		e_dialog_option_menu_set (priv->ending_menu,
-					  ENDING_FOR,
-					  ending_types_map);
-	}
-
-	g_signal_handlers_unblock_matched (menu, G_SIGNAL_MATCH_DATA, 0, 0, NULL, NULL, rpage);
-
-	make_ending_special (rpage);
-}
-
-/* fill_widgets handler for the recurrence page.  This function is particularly
- * tricky because it has to discriminate between recurrences we support for
- * editing and the ones we don't.  We only support at most one recurrence rule;
- * no rdates or exrules (exdates are handled just fine elsewhere).
- */
-static gboolean
-recurrence_page_fill_widgets (CompEditorPage *page, ECalComponent *comp)
-{
-	RecurrencePage *rpage;
-	RecurrencePagePrivate *priv;
-	ECalComponentText text;
-	CompEditorPageDates dates;
-	GSList *rrule_list;
-	int len;
-	struct icalrecurrencetype *r;
-	int n_by_second, n_by_minute, n_by_hour;
-	int n_by_day, n_by_month_day, n_by_year_day;
-	int n_by_week_no, n_by_month, n_by_set_pos;
-	GtkWidget *menu;
-	GtkAdjustment *adj;
-
-	rpage = RECURRENCE_PAGE (page);
-	priv = rpage->priv;
-
-	/* Keep a copy of the component so that we can expand the recurrence 
-	 * set for the preview.
-	 */
-
-	if (priv->comp)
-		g_object_unref (priv->comp);
-
-	priv->comp = e_cal_component_clone (comp);
-
-	/* Don't send off changes during this time */
-	priv->updating = TRUE;
-
-	/* Clean the page */
-	clear_widgets (rpage);
-
-	/* Summary */
-	e_cal_component_get_summary (comp, &text);
-
-	/* Dates */
-	comp_editor_dates (&dates, comp);
-	recurrence_page_set_dates (page, &dates);
-	comp_editor_free_dates (&dates);
-
-	/* Exceptions */
-	fill_exception_widgets (rpage, comp);
-
-	/* Set up defaults for the special widgets */
-	set_special_defaults (rpage);
-
-	/* No recurrences? */
-
-	if (!e_cal_component_has_rdates (comp)
-	    && !e_cal_component_has_rrules (comp)
-	    && !e_cal_component_has_exrules (comp)) {
-		gtk_signal_handler_block_by_data (GTK_OBJECT (priv->recurs), rpage);
-		e_dialog_toggle_set (priv->recurs, FALSE);
-		gtk_signal_handler_unblock_by_data (GTK_OBJECT (priv->recurs), rpage);
-
-		sensitize_buttons (rpage);
-		preview_recur (rpage);
-
-		priv->updating = FALSE;
-		return TRUE;
-	}
-
-	/* See if it is a custom set we don't support */
-
-	e_cal_component_get_rrule_list (comp, &rrule_list);
-	len = g_slist_length (rrule_list);
-	if (len > 1
-	    || e_cal_component_has_rdates (comp)
-	    || e_cal_component_has_exrules (comp))
-		goto custom;
-
-	/* Down to one rule, so test that one */
-
-	g_assert (len == 1);
-	r = rrule_list->data;
-
-	/* Any funky frequency? */
-
-	if (r->freq == ICAL_SECONDLY_RECURRENCE
-	    || r->freq == ICAL_MINUTELY_RECURRENCE
-	    || r->freq == ICAL_HOURLY_RECURRENCE)
-		goto custom;
-
-	/* Any funky shit? */
-
-#define N_HAS_BY(field) (count_by_xxx (field, sizeof (field) / sizeof (field[0])))
-
-	n_by_second = N_HAS_BY (r->by_second);
-	n_by_minute = N_HAS_BY (r->by_minute);
-	n_by_hour = N_HAS_BY (r->by_hour);
-	n_by_day = N_HAS_BY (r->by_day);
-	n_by_month_day = N_HAS_BY (r->by_month_day);
-	n_by_year_day = N_HAS_BY (r->by_year_day);
-	n_by_week_no = N_HAS_BY (r->by_week_no);
-	n_by_month = N_HAS_BY (r->by_month);
-	n_by_set_pos = N_HAS_BY (r->by_set_pos);
-
-	if (n_by_second != 0
-	    || n_by_minute != 0
-	    || n_by_hour != 0)
-		goto custom;
-
-	/* Filter the funky shit based on the frequency; if there is nothing
-	 * weird we can actually set the widgets.
-	 */
-
-	switch (r->freq) {
-	case ICAL_DAILY_RECURRENCE:
-		if (n_by_day != 0
-		    || n_by_month_day != 0
-		    || n_by_year_day != 0
-		    || n_by_week_no != 0
-		    || n_by_month != 0
-		    || n_by_set_pos != 0)
-			goto custom;
-
-		menu = gtk_option_menu_get_menu (GTK_OPTION_MENU (priv->interval_unit));
-		g_signal_handlers_block_matched (menu, G_SIGNAL_MATCH_DATA, 0, 0, NULL, NULL, rpage);
-		e_dialog_option_menu_set (priv->interval_unit,
-					  ICAL_DAILY_RECURRENCE,
-					  freq_map);
-		g_signal_handlers_unblock_matched (menu, G_SIGNAL_MATCH_DATA, 0, 0, NULL, NULL, rpage);
-		break;
-
-	case ICAL_WEEKLY_RECURRENCE: {
-		int i;
-		guint8 day_mask;
-
-		if (n_by_month_day != 0
-		    || n_by_year_day != 0
-		    || n_by_week_no != 0
-		    || n_by_month != 0
-		    || n_by_set_pos != 0)
-			goto custom;
-
-		day_mask = 0;
-
-		for (i = 0; i < 8 && r->by_day[i] != ICAL_RECURRENCE_ARRAY_MAX; i++) {
-			enum icalrecurrencetype_weekday weekday;
-			int pos;
-
-			weekday = icalrecurrencetype_day_day_of_week (r->by_day[i]);
-			pos = icalrecurrencetype_day_position (r->by_day[i]);
-
-			if (pos != 0)
-				goto custom;
-
-			switch (weekday) {
-			case ICAL_SUNDAY_WEEKDAY:
-				day_mask |= 1 << 0;
-				break;
-
-			case ICAL_MONDAY_WEEKDAY:
-				day_mask |= 1 << 1;
-				break;
-
-			case ICAL_TUESDAY_WEEKDAY:
-				day_mask |= 1 << 2;
-				break;
-
-			case ICAL_WEDNESDAY_WEEKDAY:
-				day_mask |= 1 << 3;
-				break;
-
-			case ICAL_THURSDAY_WEEKDAY:
-				day_mask |= 1 << 4;
-				break;
-
-			case ICAL_FRIDAY_WEEKDAY:
-				day_mask |= 1 << 5;
-				break;
-
-			case ICAL_SATURDAY_WEEKDAY:
-				day_mask |= 1 << 6;
-				break;
-
-			default:
-				break;
-			}
-		}
-
-		priv->weekday_day_mask = day_mask;
-
-		menu = gtk_option_menu_get_menu (GTK_OPTION_MENU (priv->interval_unit));
-		g_signal_handlers_block_matched (menu, G_SIGNAL_MATCH_DATA, 0, 0, NULL, NULL, rpage);
-		e_dialog_option_menu_set (priv->interval_unit,
-					  ICAL_WEEKLY_RECURRENCE,
-					  freq_map);
-		g_signal_handlers_unblock_matched (menu, G_SIGNAL_MATCH_DATA, 0, 0, NULL, NULL, rpage);
-		break;
-	}
-
-	case ICAL_MONTHLY_RECURRENCE:
-		if (n_by_year_day != 0
-		    || n_by_week_no != 0
-		    || n_by_month != 0
-		    || n_by_set_pos > 1)
-			goto custom;
-
-		if (n_by_month_day == 1) {
-			int nth;
-
-			if (n_by_set_pos != 0)
-				goto custom;
-
-			nth = r->by_month_day[0];
-			if (nth < 1 && nth != -1)
-				goto custom;
-
-			if (nth == -1) {
-				ECalComponentDateTime dt;
-				
-				e_cal_component_get_dtstart (comp, &dt);
-				priv->month_index = dt.value->day;
-				priv->month_num = MONTH_NUM_LAST;
-			} else {
-				priv->month_index = nth;
-				priv->month_num = MONTH_NUM_DAY;
-			}
-			priv->month_day = MONTH_DAY_NTH;
-			
-		} else if (n_by_day == 1) {
-			enum icalrecurrencetype_weekday weekday;
-			int pos;
-			enum month_day_options month_day;
-
-			/* Outlook 2000 uses BYDAY=TU;BYSETPOS=2, and will not
-			   accept BYDAY=2TU. So we now use the same as Outlook
-			   by default. */
-
-			weekday = icalrecurrencetype_day_day_of_week (r->by_day[0]);
-			pos = icalrecurrencetype_day_position (r->by_day[0]);
-
-			if (pos == 0) {
-				if (n_by_set_pos != 1)
-					goto custom;
-				pos = r->by_set_pos[0];
-			} else if (pos < 0) {
-				goto custom;
-			}
-
-			switch (weekday) {
-			case ICAL_MONDAY_WEEKDAY:
-				month_day = MONTH_DAY_MON;
-				break;
-
-			case ICAL_TUESDAY_WEEKDAY:
-				month_day = MONTH_DAY_TUE;
-				break;
-
-			case ICAL_WEDNESDAY_WEEKDAY:
-				month_day = MONTH_DAY_WED;
-				break;
-
-			case ICAL_THURSDAY_WEEKDAY:
-				month_day = MONTH_DAY_THU;
-				break;
-
-			case ICAL_FRIDAY_WEEKDAY:
-				month_day = MONTH_DAY_FRI;
-				break;
-
-			case ICAL_SATURDAY_WEEKDAY:
-				month_day = MONTH_DAY_SAT;
-				break;
-
-			case ICAL_SUNDAY_WEEKDAY:
-				month_day = MONTH_DAY_SUN;
-				break;
-
-			default:
-				goto custom;
-			}
-
-			if (pos == -1)
-				priv->month_num = MONTH_NUM_LAST;
-			else 
-				priv->month_num = pos - 1;
-			priv->month_day = month_day;
-		} else
-			goto custom;
-
-		menu = gtk_option_menu_get_menu (GTK_OPTION_MENU (priv->interval_unit));
-		g_signal_handlers_block_matched (menu, G_SIGNAL_MATCH_DATA, 0, 0, NULL, NULL, rpage);
-		e_dialog_option_menu_set (priv->interval_unit,
-					  ICAL_MONTHLY_RECURRENCE,
-					  freq_map);
-		g_signal_handlers_unblock_matched (menu, G_SIGNAL_MATCH_DATA, 0, 0, NULL, NULL, rpage);
-		break;
-
-	case ICAL_YEARLY_RECURRENCE:
-		if (n_by_day != 0
-		    || n_by_month_day != 0
-		    || n_by_year_day != 0
-		    || n_by_week_no != 0
-		    || n_by_month != 0
-		    || n_by_set_pos != 0)
-			goto custom;
-
-		menu = gtk_option_menu_get_menu (GTK_OPTION_MENU (priv->interval_unit));
-		g_signal_handlers_block_matched (menu, G_SIGNAL_MATCH_DATA, 0, 0, NULL, NULL, rpage);
-		e_dialog_option_menu_set (priv->interval_unit,
-					  ICAL_YEARLY_RECURRENCE,
-					  freq_map);
-		g_signal_handlers_unblock_matched (menu, G_SIGNAL_MATCH_DATA, 0, 0, NULL, NULL, rpage);
-		break;
-
-	default:
-		goto custom;
-	}
-
-	/* If we got here it means it is a simple recurrence */
-
-	g_signal_handlers_block_matched (priv->recurs, G_SIGNAL_MATCH_DATA, 0, 0, NULL, NULL, rpage);
-	e_dialog_toggle_set (priv->recurs, TRUE);
-	g_signal_handlers_unblock_matched (priv->recurs, G_SIGNAL_MATCH_DATA, 0, 0, NULL, NULL, rpage);
-
-	sensitize_buttons (rpage);
-	make_recurrence_special (rpage);
-
-	adj = gtk_spin_button_get_adjustment (GTK_SPIN_BUTTON (priv->interval_value));
-	g_signal_handlers_block_matched (adj, G_SIGNAL_MATCH_DATA, 0, 0, NULL, NULL, rpage);
-	e_dialog_spin_set (priv->interval_value, r->interval);
-	g_signal_handlers_unblock_matched (adj, G_SIGNAL_MATCH_DATA, 0, 0, NULL, NULL, rpage);
-
-	fill_ending_date (rpage, r);
-
-	goto out;
-
- custom:
-
-	g_signal_handlers_block_matched (priv->recurs, G_SIGNAL_MATCH_DATA, 0, 0, NULL, NULL, rpage);
-	priv->custom = TRUE;
-	e_dialog_toggle_set (priv->recurs, TRUE);
-	g_signal_handlers_unblock_matched (priv->recurs, G_SIGNAL_MATCH_DATA, 0, 0, NULL, NULL, rpage);
-	/* FIXME Desensitize recurrence page */
-
-	sensitize_buttons (rpage);
-
- out:
-	priv->custom = FALSE;
-	e_cal_component_free_recur_list (rrule_list);
-	preview_recur (rpage);
-
-	priv->updating = FALSE;
-
-	return TRUE;
-}
-
-/* fill_component handler for the recurrence page */
-static gboolean
-recurrence_page_fill_component (CompEditorPage *page, ECalComponent *comp)
-{
-	RecurrencePage *rpage;
-
-	rpage = RECURRENCE_PAGE (page);
-	return fill_component (rpage, comp);
-}
-
-/* set_dates handler for the recurrence page */
-static void
-recurrence_page_set_dates (CompEditorPage *page, CompEditorPageDates *dates)
-{
-	RecurrencePage *rpage;
-	RecurrencePagePrivate *priv;
-	ECalComponentDateTime dt;
-	struct icaltimetype icaltime;
-	guint8 mask;
-
-	rpage = RECURRENCE_PAGE (page);
-	priv = rpage->priv;
-
-	/* Copy the dates to our component */
-
-	if (!priv->comp)
-		return;
-
-	dt.value = &icaltime;
-
-	if (dates->start) {
-		icaltime = *dates->start->value;
-		dt.tzid = dates->start->tzid;
-		e_cal_component_set_dtstart (priv->comp, &dt);
-	}
-	
-	if (dates->end) {
-		icaltime = *dates->end->value;
-		dt.tzid = dates->end->tzid;
-		e_cal_component_set_dtend (priv->comp, &dt);
-	}
-
-	/* Update the weekday picker if necessary */
-	mask = get_start_weekday_mask (priv->comp);
-	if (mask != priv->weekday_blocked_day_mask) {
-		priv->weekday_day_mask = priv->weekday_day_mask | mask;
-		priv->weekday_blocked_day_mask = mask;
-		
-		if (priv->weekday_picker != NULL) {
-			weekday_picker_set_days (WEEKDAY_PICKER (priv->weekday_picker),
-						 priv->weekday_day_mask);
-			weekday_picker_set_blocked_days (WEEKDAY_PICKER (priv->weekday_picker),
-							 priv->weekday_blocked_day_mask);
-		}
-	}
-	
-	/* Make sure the preview gets updated. */
-	preview_recur (rpage);
-}
-
-
-
-/* Gets the widgets from the XML file and returns if they are all available. */
-static gboolean
-get_widgets (RecurrencePage *rpage)
-{
-	CompEditorPage *page = COMP_EDITOR_PAGE (rpage);
-	RecurrencePagePrivate *priv;
-	GSList *accel_groups;
-	GtkWidget *toplevel;
-
-	priv = rpage->priv;
-
-#define GW(name) glade_xml_get_widget (priv->xml, name)
-
-	priv->main = GW ("recurrence-page");
-	if (!priv->main)
-		return FALSE;
-
-	/* Get the GtkAccelGroup from the toplevel window, so we can install
-	   it when the notebook page is mapped. */
-	toplevel = gtk_widget_get_toplevel (priv->main);
-	accel_groups = gtk_accel_groups_from_object (G_OBJECT (toplevel));
-	if (accel_groups) {
-		page->accel_group = accel_groups->data;
-		gtk_accel_group_ref (page->accel_group);
-	}
-
-	gtk_widget_ref (priv->main);
-	gtk_container_remove (GTK_CONTAINER (priv->main->parent), priv->main);
-	      
-	priv->recurs = GW ("recurs");
-	priv->params = GW ("params");
-	      
-	priv->interval_value = GW ("interval-value");
-	priv->interval_unit = GW ("interval-unit");
-	priv->special = GW ("special");
-	priv->ending_menu = GW ("ending-menu");
-	priv->ending_special = GW ("ending-special");
-	priv->custom_warning_bin = GW ("custom-warning-bin");
-	      
-	priv->exception_list = GW ("exception-list");
-	priv->exception_add = GW ("exception-add");
-	priv->exception_modify = GW ("exception-modify");
-	priv->exception_delete = GW ("exception-delete");
-	      
-	priv->preview_bin = GW ("preview-bin");
-
-#undef GW
-	
-	return (priv->recurs
-		&& priv->params
-		&& priv->interval_value
-		&& priv->interval_unit
-		&& priv->special
-		&& priv->ending_menu
-		&& priv->ending_special
-		&& priv->custom_warning_bin
-		&& priv->exception_list
-		&& priv->exception_add
-		&& priv->exception_modify
-		&& priv->exception_delete
-		&& priv->preview_bin);
-}
-
-/* Callback used when the displayed date range in the recurrence preview
- * calendar changes.
- */
-static void
-preview_date_range_changed_cb (ECalendarItem *item, gpointer data)
-{
-	RecurrencePage *rpage;
-
-	rpage = RECURRENCE_PAGE (data);
-	preview_recur (rpage);
-}
-
-/* Callback used when one of the recurrence type radio buttons is toggled.  We
- * enable or disable the recurrence parameters.
- */
-static void
-type_toggled_cb (GtkToggleButton *toggle, gpointer data)
-{
-	RecurrencePage *rpage;
-	RecurrencePagePrivate *priv;
-	gboolean read_only;
-
-	rpage = RECURRENCE_PAGE (data);
-
-	priv = rpage->priv;
-
-	field_changed (rpage);
-
-	sensitize_buttons (rpage);
-	preview_recur (rpage);
-
-	/* enable/disable the 'Add' button */
-	if (!e_cal_is_read_only (COMP_EDITOR_PAGE (rpage)->client, &read_only, NULL))
-		read_only = TRUE;
-
-	if (!gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (priv->recurs)) || read_only)
-		gtk_widget_set_sensitive (priv->exception_add, FALSE);
-	else 
-		gtk_widget_set_sensitive (priv->exception_add, TRUE);
-}
-
-/* Callback used when the recurrence interval value spin button changes. */
-static void
-interval_value_changed_cb (GtkAdjustment *adj, gpointer data)
-{
-	RecurrencePage *rpage;
-
-	rpage = RECURRENCE_PAGE (data);
-
-	field_changed (rpage);
-	preview_recur (rpage);
-}
-
-/* Callback used when the recurrence interval option menu changes.  We need to
- * change the contents of the recurrence special widget.
- */
-static void
-interval_selection_done_cb (GtkMenuShell *menu_shell, gpointer data)
-{
-	RecurrencePage *rpage;
-
-	rpage = RECURRENCE_PAGE (data);
-
-	field_changed (rpage);
-	make_recurrence_special (rpage);
-	preview_recur (rpage);
-}
-
-/* Callback used when the recurrence ending option menu changes.  We need to
- * change the contents of the ending special widget.
- */
-static void
-ending_selection_done_cb (GtkMenuShell *menu_shell, gpointer data)
-{
-	RecurrencePage *rpage;
-
-	rpage = RECURRENCE_PAGE (data);
-
-	field_changed (rpage);
-	make_ending_special (rpage);
-	preview_recur (rpage);
-}
-
-static GtkWidget *
-create_exception_dialog (RecurrencePage *rpage, const char *title, GtkWidget **date_edit)
-{
-	RecurrencePagePrivate *priv;
-	GtkWidget *dialog, *toplevel;
-	
-	priv = rpage->priv;
-
-	toplevel = gtk_widget_get_toplevel (priv->main);
-	dialog = gtk_dialog_new_with_buttons (title, GTK_WINDOW (toplevel),
-					      GTK_DIALOG_MODAL | GTK_DIALOG_DESTROY_WITH_PARENT,
-					      GTK_STOCK_CANCEL, GTK_RESPONSE_REJECT,
-					      GTK_STOCK_OK, GTK_RESPONSE_ACCEPT,
-					      NULL);
-
-	*date_edit = comp_editor_new_date_edit (TRUE, FALSE, TRUE);
-	gtk_widget_show (*date_edit);
-	gtk_box_pack_start (GTK_BOX (GTK_DIALOG (dialog)->vbox), *date_edit, FALSE, TRUE, 6);
-	
-	return dialog;
-}
-
-/* Callback for the "add exception" button */
-static void
-exception_add_cb (GtkWidget *widget, gpointer data)
-{
-	RecurrencePage *rpage;
-	RecurrencePagePrivate *priv;
-	GtkWidget *dialog, *date_edit;
-	gboolean date_set;
-	
-	rpage = RECURRENCE_PAGE (data);
-	priv = rpage->priv;
-
-	dialog = create_exception_dialog (rpage, "Add exception", &date_edit);
-	
-	if (gtk_dialog_run (GTK_DIALOG (dialog)) == GTK_RESPONSE_ACCEPT) {
-		ECalComponentDateTime dt;
-		struct icaltimetype icaltime = icaltime_null_time ();
-
-		field_changed (rpage);
-		
-		dt.value = &icaltime;
-		
-		/* We use DATE values for exceptions, so we don't need a TZID. */
-		dt.tzid = NULL;
-		icaltime.is_date = 1;
-		
-		date_set = e_date_edit_get_date (E_DATE_EDIT (date_edit),
-						 &icaltime.year,
-						 &icaltime.month,
-						 &icaltime.day);
-		g_assert (date_set);
-		
-		append_exception (rpage, &dt);
-		preview_recur (rpage);
-	}
-	
-	gtk_widget_destroy (dialog);
-}
-
-/* Callback for the "modify exception" button */
-static void
-exception_modify_cb (GtkWidget *widget, gpointer data)
-{
-	RecurrencePage *rpage;
-	RecurrencePagePrivate *priv;
-	GtkWidget *dialog, *date_edit;
-	const ECalComponentDateTime *current_dt;
-	GtkTreeSelection *selection;
-	GtkTreeIter iter;
-
-	rpage = RECURRENCE_PAGE (data);
-	priv = rpage->priv;
-
-	selection = gtk_tree_view_get_selection (GTK_TREE_VIEW (priv->exception_list));
-	if (!gtk_tree_selection_get_selected (selection, NULL, &iter)) {
-		g_warning ("Could not get a selection to modify.");
-		return;
-	}
-
-	current_dt = e_date_time_list_get_date_time (priv->exception_list_store, &iter);
-	
-	dialog = create_exception_dialog (rpage, "Modify exception", &date_edit);
-	e_date_edit_set_date (E_DATE_EDIT (date_edit), 
-			      current_dt->value->year, current_dt->value->month, current_dt->value->day);
-	
-	if (gtk_dialog_run (GTK_DIALOG (dialog)) == GTK_RESPONSE_ACCEPT) {
-		ECalComponentDateTime dt;
-		struct icaltimetype icaltime = icaltime_null_time ();
-		struct icaltimetype *tt;
-
-		field_changed (rpage);
-		
-		dt.value = &icaltime;
-		tt = dt.value;
-		e_date_edit_get_date (E_DATE_EDIT (date_edit), 
-				      &tt->year, &tt->month, &tt->day);
-		tt->hour = 0;
-		tt->minute = 0;
-		tt->second = 0;
-		tt->is_date = 1;
-		
-		/* No TZID, since we are using a DATE value now. */
-		dt.tzid = NULL;
-		
-		e_date_time_list_set_date_time (priv->exception_list_store, &iter, &dt);
-		preview_recur (rpage);
-	}
-	
-	gtk_widget_destroy (dialog);
-}
-
-/* Callback for the "delete exception" button */
-static void
-exception_delete_cb (GtkWidget *widget, gpointer data)
-{
-	RecurrencePage *rpage;
-	RecurrencePagePrivate *priv;
-	GtkTreeSelection *selection;
-	GtkTreeIter iter;
-	GtkTreePath *path;
-	gboolean valid_iter;
-
-	rpage = RECURRENCE_PAGE (data);
-	priv = rpage->priv;
-
-	selection = gtk_tree_view_get_selection (GTK_TREE_VIEW (priv->exception_list));
-	if (!gtk_tree_selection_get_selected (selection, NULL, &iter)) {
-		g_warning ("Could not get a selection to delete.");
-		return;
-	}
-
-	field_changed (rpage);
-
-	path = gtk_tree_model_get_path (GTK_TREE_MODEL (priv->exception_list_store), &iter);
-	e_date_time_list_remove (priv->exception_list_store, &iter);
-
-	/* Select closest item after removal */
-	valid_iter = gtk_tree_model_get_iter (GTK_TREE_MODEL (priv->exception_list_store), &iter, path);
-	if (!valid_iter) {
-		gtk_tree_path_prev (path);
-		valid_iter = gtk_tree_model_get_iter (GTK_TREE_MODEL (priv->exception_list_store), &iter, path);
-	}
-
-	if (valid_iter)
-		gtk_tree_selection_select_iter (selection, &iter);
-
-	gtk_tree_path_free (path);
-	preview_recur (rpage);
-}
-
-/* Callback used when a row is selected in the list of exception
- * dates.  We must update the date/time widgets to reflect the
- * exception's value.
- */
-static void
-exception_selection_changed_cb (GtkTreeSelection *selection, gpointer data)
-{
-	RecurrencePage *rpage;
-	RecurrencePagePrivate *priv;
-	GtkTreeIter iter;
-
-	rpage = RECURRENCE_PAGE (data);
-	priv = rpage->priv;
-
-	if (!gtk_tree_selection_get_selected (selection, NULL, &iter)) {
-		gtk_widget_set_sensitive (priv->exception_modify, FALSE);
-		gtk_widget_set_sensitive (priv->exception_delete, FALSE);
-		return;
-	}
-
-	gtk_widget_set_sensitive (priv->exception_modify, TRUE);
-	gtk_widget_set_sensitive (priv->exception_delete, TRUE);
-}
-
-/* This is called when any field is changed; it notifies upstream. */
-static void
-field_changed (RecurrencePage *rpage)
-{
-	RecurrencePagePrivate *priv;
-
-	priv = rpage->priv;
-	
-	if (!priv->updating)
-		comp_editor_page_notify_changed (COMP_EDITOR_PAGE (rpage));
-}
-
-/* Hooks the widget signals */
-static void
-init_widgets (RecurrencePage *rpage)
-{
-	RecurrencePagePrivate *priv;
-	ECalendar *ecal;
-	GtkAdjustment *adj;
-	GtkWidget *menu;
-	GtkTreeViewColumn *column;
-	GtkCellRenderer *cell_renderer;
-
-	priv = rpage->priv;
-
-	/* Recurrence preview */
-
-	priv->preview_calendar = e_calendar_new ();
-	ecal = E_CALENDAR (priv->preview_calendar);
-	priv->preview_calendar_config = e_mini_calendar_config_new (ecal);
-	g_signal_connect((ecal->calitem), "date_range_changed",
-			    G_CALLBACK (preview_date_range_changed_cb),
-			    rpage);
-	e_calendar_item_set_max_days_sel (ecal->calitem, 0);
-	gtk_container_add (GTK_CONTAINER (priv->preview_bin),
-			   priv->preview_calendar);
-	gtk_widget_show (priv->preview_calendar);
-
-	e_calendar_item_set_get_time_callback (ecal->calitem,
-					       (ECalendarItemGetTimeCallback) comp_editor_get_current_time,
-					       rpage, NULL);
-
-	/* Recurrence types */
-
-	g_signal_connect(priv->recurs, "toggled", G_CALLBACK (type_toggled_cb), rpage);
-
-	/* Recurrence interval */
-
-	adj = gtk_spin_button_get_adjustment (GTK_SPIN_BUTTON (priv->interval_value));
-	g_signal_connect((adj), "value_changed",
-			    G_CALLBACK (interval_value_changed_cb),
-			    rpage);
-
-	/* Recurrence units */
-
-	menu = gtk_option_menu_get_menu (GTK_OPTION_MENU (priv->interval_unit));
-	g_signal_connect((menu), "selection_done",
-			    G_CALLBACK (interval_selection_done_cb),
-			    rpage);
-
-	/* Recurrence ending */
-
-	menu = gtk_option_menu_get_menu (GTK_OPTION_MENU (priv->ending_menu));
-	g_signal_connect((menu), "selection_done",
-			    G_CALLBACK (ending_selection_done_cb), rpage);
-
-	/* Exception buttons */
-
-	g_signal_connect((priv->exception_add), "clicked",
-			    G_CALLBACK (exception_add_cb), rpage);
-	g_signal_connect((priv->exception_modify), "clicked",
-			    G_CALLBACK (exception_modify_cb), rpage);
-	g_signal_connect((priv->exception_delete), "clicked",
-			    G_CALLBACK (exception_delete_cb), rpage);
-
-	gtk_widget_set_sensitive (priv->exception_modify, FALSE);
-	gtk_widget_set_sensitive (priv->exception_delete, FALSE);
-
-	/* Exception list */
-
-	/* Model */
-	priv->exception_list_store = e_date_time_list_new ();
-	gtk_tree_view_set_model (GTK_TREE_VIEW (priv->exception_list),
-				 GTK_TREE_MODEL (priv->exception_list_store));
-
-	/* View */
-	column = gtk_tree_view_column_new ();
-	gtk_tree_view_column_set_title (column, _("Date/Time"));
-	cell_renderer = GTK_CELL_RENDERER (gtk_cell_renderer_text_new ());
-	gtk_tree_view_column_pack_start (column, cell_renderer, TRUE);
-	gtk_tree_view_column_add_attribute (column, cell_renderer, "text", E_DATE_TIME_LIST_COLUMN_DESCRIPTION);
-	gtk_tree_view_append_column (GTK_TREE_VIEW (priv->exception_list), column);
-
-	g_signal_connect (gtk_tree_view_get_selection (GTK_TREE_VIEW (priv->exception_list)), "changed",
-			  G_CALLBACK (exception_selection_changed_cb), rpage);
-}
-
-
-
-static void
-client_changed_cb (CompEditorPage *page, ECal *client, gpointer user_data)
-{
-	RecurrencePage *rpage = RECURRENCE_PAGE (page);
-
-	sensitize_buttons (rpage);
-}
-
-/**
- * recurrence_page_construct:
- * @rpage: A recurrence page.
- *
- * Constructs a recurrence page by loading its Glade data.
- *
- * Return value: The same object as @rpage, or NULL if the widgets could not be
- * created.
- **/
-RecurrencePage *
-recurrence_page_construct (RecurrencePage *rpage)
-{
-	RecurrencePagePrivate *priv;
-
-	priv = rpage->priv;
-
-	priv->xml = glade_xml_new (EVOLUTION_GLADEDIR 
-				   "/recurrence-page.glade", NULL, NULL);
-	if (!priv->xml) {
-		g_message ("recurrence_page_construct(): "
-			   "Could not load the Glade XML file!");
-		return NULL;
-	}
-
-	if (!get_widgets (rpage)) {
-		g_message ("recurrence_page_construct(): "
-			   "Could not find all widgets in the XML file!");
-		return NULL;
-	}
-
-	init_widgets (rpage);
-
-	g_signal_connect_after (G_OBJECT (rpage), "client_changed",
-				G_CALLBACK (client_changed_cb), NULL);
-
-	return rpage;
-}
-
-/**
- * recurrence_page_new:
- *
- * Creates a new recurrence page.
- *
- * Return value: A newly-created recurrence page, or NULL if the page could not
- * be created.
- **/
-RecurrencePage *
-recurrence_page_new (void)
-{
-	RecurrencePage *rpage;
-
-	rpage = g_object_new (TYPE_RECURRENCE_PAGE, NULL);
-	if (!recurrence_page_construct (rpage)) {
-		g_object_unref (rpage);
-		return NULL;
-	}
-
-	return rpage;
-}
-
-
-GtkWidget *make_exdate_date_edit (void);
-
-GtkWidget *
-make_exdate_date_edit (void)
-{
-	return comp_editor_new_date_edit (TRUE, TRUE, FALSE);
-}
-
diff --git a/calendar/gui/dialogs/recurrence-page.glade b/calendar/gui/dialogs/recurrence-page.glade
deleted file mode 100644
index bcbfb7748e..0000000000
--- a/calendar/gui/dialogs/recurrence-page.glade
+++ /dev/null
@@ -1,637 +0,0 @@
-<?xml version="1.0" standalone="no"?> <!--*- mode: xml -*-->
-<!DOCTYPE glade-interface SYSTEM "http://glade.gnome.org/glade-2.0.dtd">
-
-<glade-interface>
-
-<widget class="GtkWindow" id="recurrence-toplevel">
-  <property name="title" translatable="yes">window1</property>
-  <property name="type">GTK_WINDOW_TOPLEVEL</property>
-  <property name="window_position">GTK_WIN_POS_NONE</property>
-  <property name="modal">False</property>
-  <property name="resizable">True</property>
-  <property name="destroy_with_parent">False</property>
-  <property name="decorated">True</property>
-  <property name="skip_taskbar_hint">False</property>
-  <property name="skip_pager_hint">False</property>
-  <property name="type_hint">GDK_WINDOW_TYPE_HINT_NORMAL</property>
-  <property name="gravity">GDK_GRAVITY_NORTH_WEST</property>
-
-  <child>
-    <widget class="GtkVBox" id="recurrence-page">
-      <property name="border_width">12</property>
-      <property name="visible">True</property>
-      <property name="homogeneous">False</property>
-      <property name="spacing">6</property>
-
-      <child>
-	<widget class="GtkLabel" id="label71">
-	  <property name="visible">True</property>
-	  <property name="label" translatable="yes">&lt;b&gt;Recurrence&lt;/b&gt;</property>
-	  <property name="use_underline">False</property>
-	  <property name="use_markup">True</property>
-	  <property name="justify">GTK_JUSTIFY_LEFT</property>
-	  <property name="wrap">False</property>
-	  <property name="selectable">False</property>
-	  <property name="xalign">0</property>
-	  <property name="yalign">0.5</property>
-	  <property name="xpad">0</property>
-	  <property name="ypad">0</property>
-	</widget>
-	<packing>
-	  <property name="padding">0</property>
-	  <property name="expand">False</property>
-	  <property name="fill">False</property>
-	</packing>
-      </child>
-
-      <child>
-	<widget class="GtkHBox" id="hbox61">
-	  <property name="visible">True</property>
-	  <property name="homogeneous">False</property>
-	  <property name="spacing">0</property>
-
-	  <child>
-	    <widget class="GtkLabel" id="label72">
-	      <property name="visible">True</property>
-	      <property name="label" translatable="yes"></property>
-	      <property name="use_underline">False</property>
-	      <property name="use_markup">False</property>
-	      <property name="justify">GTK_JUSTIFY_LEFT</property>
-	      <property name="wrap">False</property>
-	      <property name="selectable">False</property>
-	      <property name="xalign">0.5</property>
-	      <property name="yalign">0.5</property>
-	      <property name="xpad">12</property>
-	      <property name="ypad">0</property>
-	    </widget>
-	    <packing>
-	      <property name="padding">0</property>
-	      <property name="expand">False</property>
-	      <property name="fill">False</property>
-	    </packing>
-	  </child>
-
-	  <child>
-	    <widget class="GtkVBox" id="vbox59">
-	      <property name="visible">True</property>
-	      <property name="homogeneous">False</property>
-	      <property name="spacing">6</property>
-
-	      <child>
-		<widget class="GtkCheckButton" id="recurs">
-		  <property name="visible">True</property>
-		  <property name="can_focus">True</property>
-		  <property name="label" translatable="yes">This appointment rec_urs</property>
-		  <property name="use_underline">True</property>
-		  <property name="relief">GTK_RELIEF_NORMAL</property>
-		  <property name="focus_on_click">True</property>
-		  <property name="active">False</property>
-		  <property name="inconsistent">False</property>
-		  <property name="draw_indicator">True</property>
-		</widget>
-		<packing>
-		  <property name="padding">0</property>
-		  <property name="expand">False</property>
-		  <property name="fill">False</property>
-		</packing>
-	      </child>
-
-	      <child>
-		<widget class="GtkHBox" id="hbox57">
-		  <property name="visible">True</property>
-		  <property name="homogeneous">False</property>
-		  <property name="spacing">6</property>
-
-		  <child>
-		    <widget class="GtkHBox" id="params">
-		      <property name="visible">True</property>
-		      <property name="homogeneous">False</property>
-		      <property name="spacing">2</property>
-
-		      <child>
-			<widget class="GtkLabel" id="label68">
-			  <property name="visible">True</property>
-			  <property name="label" translatable="yes">Every</property>
-			  <property name="use_underline">False</property>
-			  <property name="use_markup">False</property>
-			  <property name="justify">GTK_JUSTIFY_CENTER</property>
-			  <property name="wrap">False</property>
-			  <property name="selectable">False</property>
-			  <property name="xalign">0</property>
-			  <property name="yalign">0.5</property>
-			  <property name="xpad">0</property>
-			  <property name="ypad">0</property>
-			</widget>
-			<packing>
-			  <property name="padding">0</property>
-			  <property name="expand">False</property>
-			  <property name="fill">False</property>
-			</packing>
-		      </child>
-
-		      <child>
-			<widget class="GtkSpinButton" id="interval-value">
-			  <property name="visible">True</property>
-			  <property name="can_focus">True</property>
-			  <property name="climb_rate">1</property>
-			  <property name="digits">0</property>
-			  <property name="numeric">True</property>
-			  <property name="update_policy">GTK_UPDATE_ALWAYS</property>
-			  <property name="snap_to_ticks">False</property>
-			  <property name="wrap">False</property>
-			  <property name="adjustment">1 1 10000 1 10 10</property>
-			</widget>
-			<packing>
-			  <property name="padding">0</property>
-			  <property name="expand">False</property>
-			  <property name="fill">False</property>
-			</packing>
-		      </child>
-
-		      <child>
-			<widget class="GtkOptionMenu" id="interval-unit">
-			  <property name="visible">True</property>
-			  <property name="can_focus">True</property>
-			  <property name="history">0</property>
-
-			  <child internal-child="menu">
-			    <widget class="GtkMenu" id="convertwidget1">
-			      <property name="visible">True</property>
-
-			      <child>
-				<widget class="GtkMenuItem" id="convertwidget2">
-				  <property name="visible">True</property>
-				  <property name="label" translatable="yes">day(s)</property>
-				  <property name="use_underline">True</property>
-				</widget>
-			      </child>
-
-			      <child>
-				<widget class="GtkMenuItem" id="convertwidget3">
-				  <property name="visible">True</property>
-				  <property name="label" translatable="yes">week(s)</property>
-				  <property name="use_underline">True</property>
-				</widget>
-			      </child>
-
-			      <child>
-				<widget class="GtkMenuItem" id="convertwidget4">
-				  <property name="visible">True</property>
-				  <property name="label" translatable="yes">month(s)</property>
-				  <property name="use_underline">True</property>
-				</widget>
-			      </child>
-
-			      <child>
-				<widget class="GtkMenuItem" id="convertwidget5">
-				  <property name="visible">True</property>
-				  <property name="label" translatable="yes">year(s)</property>
-				  <property name="use_underline">True</property>
-				</widget>
-			      </child>
-			    </widget>
-			  </child>
-			</widget>
-			<packing>
-			  <property name="padding">0</property>
-			  <property name="expand">False</property>
-			  <property name="fill">False</property>
-			</packing>
-		      </child>
-
-		      <child>
-			<widget class="GtkAlignment" id="special">
-			  <property name="visible">True</property>
-			  <property name="xalign">0.5</property>
-			  <property name="yalign">0.5</property>
-			  <property name="xscale">0</property>
-			  <property name="yscale">0</property>
-			  <property name="top_padding">0</property>
-			  <property name="bottom_padding">0</property>
-			  <property name="left_padding">0</property>
-			  <property name="right_padding">0</property>
-
-			  <child>
-			    <placeholder/>
-			  </child>
-			</widget>
-			<packing>
-			  <property name="padding">0</property>
-			  <property name="expand">False</property>
-			  <property name="fill">False</property>
-			</packing>
-		      </child>
-
-		      <child>
-			<widget class="GtkOptionMenu" id="ending-menu">
-			  <property name="visible">True</property>
-			  <property name="can_focus">True</property>
-			  <property name="history">0</property>
-
-			  <child internal-child="menu">
-			    <widget class="GtkMenu" id="convertwidget6">
-			      <property name="visible">True</property>
-
-			      <child>
-				<widget class="GtkMenuItem" id="convertwidget7">
-				  <property name="visible">True</property>
-				  <property name="label" translatable="yes">for</property>
-				  <property name="use_underline">True</property>
-				</widget>
-			      </child>
-
-			      <child>
-				<widget class="GtkMenuItem" id="convertwidget8">
-				  <property name="visible">True</property>
-				  <property name="label" translatable="yes">until</property>
-				  <property name="use_underline">True</property>
-				</widget>
-			      </child>
-
-			      <child>
-				<widget class="GtkMenuItem" id="convertwidget9">
-				  <property name="visible">True</property>
-				  <property name="label" translatable="yes">forever</property>
-				  <property name="use_underline">True</property>
-				</widget>
-			      </child>
-			    </widget>
-			  </child>
-			</widget>
-			<packing>
-			  <property name="padding">0</property>
-			  <property name="expand">False</property>
-			  <property name="fill">False</property>
-			</packing>
-		      </child>
-
-		      <child>
-			<widget class="GtkAlignment" id="ending-special">
-			  <property name="visible">True</property>
-			  <property name="xalign">0.5</property>
-			  <property name="yalign">0.5</property>
-			  <property name="xscale">0</property>
-			  <property name="yscale">0</property>
-			  <property name="top_padding">0</property>
-			  <property name="bottom_padding">0</property>
-			  <property name="left_padding">0</property>
-			  <property name="right_padding">0</property>
-
-			  <child>
-			    <placeholder/>
-			  </child>
-			</widget>
-			<packing>
-			  <property name="padding">0</property>
-			  <property name="expand">False</property>
-			  <property name="fill">False</property>
-			</packing>
-		      </child>
-		    </widget>
-		    <packing>
-		      <property name="padding">0</property>
-		      <property name="expand">False</property>
-		      <property name="fill">False</property>
-		    </packing>
-		  </child>
-
-		  <child>
-		    <widget class="GtkAlignment" id="custom-warning-bin">
-		      <property name="visible">True</property>
-		      <property name="xalign">0</property>
-		      <property name="yalign">0.5</property>
-		      <property name="xscale">1</property>
-		      <property name="yscale">1</property>
-		      <property name="top_padding">0</property>
-		      <property name="bottom_padding">0</property>
-		      <property name="left_padding">0</property>
-		      <property name="right_padding">0</property>
-
-		      <child>
-			<placeholder/>
-		      </child>
-		    </widget>
-		    <packing>
-		      <property name="padding">0</property>
-		      <property name="expand">True</property>
-		      <property name="fill">True</property>
-		    </packing>
-		  </child>
-		</widget>
-		<packing>
-		  <property name="padding">0</property>
-		  <property name="expand">True</property>
-		  <property name="fill">True</property>
-		</packing>
-	      </child>
-	    </widget>
-	    <packing>
-	      <property name="padding">0</property>
-	      <property name="expand">False</property>
-	      <property name="fill">False</property>
-	    </packing>
-	  </child>
-	</widget>
-	<packing>
-	  <property name="padding">0</property>
-	  <property name="expand">False</property>
-	  <property name="fill">True</property>
-	</packing>
-      </child>
-
-      <child>
-	<widget class="GtkLabel" id="label73">
-	  <property name="visible">True</property>
-	  <property name="label" translatable="yes">&lt;b&gt;Exceptions&lt;/b&gt;</property>
-	  <property name="use_underline">False</property>
-	  <property name="use_markup">True</property>
-	  <property name="justify">GTK_JUSTIFY_LEFT</property>
-	  <property name="wrap">False</property>
-	  <property name="selectable">False</property>
-	  <property name="xalign">0</property>
-	  <property name="yalign">0.5</property>
-	  <property name="xpad">0</property>
-	  <property name="ypad">0</property>
-	</widget>
-	<packing>
-	  <property name="padding">0</property>
-	  <property name="expand">False</property>
-	  <property name="fill">False</property>
-	</packing>
-      </child>
-
-      <child>
-	<widget class="GtkHBox" id="hbox60">
-	  <property name="visible">True</property>
-	  <property name="homogeneous">False</property>
-	  <property name="spacing">0</property>
-
-	  <child>
-	    <widget class="GtkLabel" id="label75">
-	      <property name="visible">True</property>
-	      <property name="label" translatable="yes"></property>
-	      <property name="use_underline">False</property>
-	      <property name="use_markup">False</property>
-	      <property name="justify">GTK_JUSTIFY_LEFT</property>
-	      <property name="wrap">False</property>
-	      <property name="selectable">False</property>
-	      <property name="xalign">0.5</property>
-	      <property name="yalign">0.5</property>
-	      <property name="xpad">12</property>
-	      <property name="ypad">0</property>
-	    </widget>
-	    <packing>
-	      <property name="padding">0</property>
-	      <property name="expand">False</property>
-	      <property name="fill">False</property>
-	    </packing>
-	  </child>
-
-	  <child>
-	    <widget class="GtkHBox" id="hbox63">
-	      <property name="visible">True</property>
-	      <property name="homogeneous">False</property>
-	      <property name="spacing">6</property>
-
-	      <child>
-		<widget class="GtkScrolledWindow" id="scrolledwindow14">
-		  <property name="visible">True</property>
-		  <property name="hscrollbar_policy">GTK_POLICY_NEVER</property>
-		  <property name="vscrollbar_policy">GTK_POLICY_AUTOMATIC</property>
-		  <property name="shadow_type">GTK_SHADOW_IN</property>
-		  <property name="window_placement">GTK_CORNER_TOP_LEFT</property>
-
-		  <child>
-		    <widget class="GtkTreeView" id="exception-list">
-		      <property name="visible">True</property>
-		      <property name="can_focus">True</property>
-		      <property name="headers_visible">False</property>
-		      <property name="rules_hint">False</property>
-		      <property name="reorderable">False</property>
-		      <property name="enable_search">True</property>
-		    </widget>
-		  </child>
-		</widget>
-		<packing>
-		  <property name="padding">0</property>
-		  <property name="expand">True</property>
-		  <property name="fill">True</property>
-		</packing>
-	      </child>
-
-	      <child>
-		<widget class="GtkVButtonBox" id="vbuttonbox1">
-		  <property name="visible">True</property>
-		  <property name="layout_style">GTK_BUTTONBOX_START</property>
-		  <property name="spacing">6</property>
-
-		  <child>
-		    <widget class="GtkButton" id="exception-add">
-		      <property name="visible">True</property>
-		      <property name="can_default">True</property>
-		      <property name="can_focus">True</property>
-		      <property name="label">gtk-add</property>
-		      <property name="use_stock">True</property>
-		      <property name="relief">GTK_RELIEF_NORMAL</property>
-		      <property name="focus_on_click">True</property>
-		    </widget>
-		  </child>
-
-		  <child>
-		    <widget class="GtkButton" id="exception-modify">
-		      <property name="visible">True</property>
-		      <property name="can_default">True</property>
-		      <property name="can_focus">True</property>
-		      <property name="relief">GTK_RELIEF_NORMAL</property>
-		      <property name="focus_on_click">True</property>
-
-		      <child>
-			<widget class="GtkAlignment" id="alignment1">
-			  <property name="visible">True</property>
-			  <property name="xalign">0.5</property>
-			  <property name="yalign">0.5</property>
-			  <property name="xscale">0</property>
-			  <property name="yscale">0</property>
-			  <property name="top_padding">0</property>
-			  <property name="bottom_padding">0</property>
-			  <property name="left_padding">0</property>
-			  <property name="right_padding">0</property>
-
-			  <child>
-			    <widget class="GtkHBox" id="hbox64">
-			      <property name="visible">True</property>
-			      <property name="homogeneous">False</property>
-			      <property name="spacing">2</property>
-
-			      <child>
-				<widget class="GtkImage" id="image1">
-				  <property name="visible">True</property>
-				  <property name="stock">gtk-preferences</property>
-				  <property name="icon_size">4</property>
-				  <property name="xalign">0.5</property>
-				  <property name="yalign">0.5</property>
-				  <property name="xpad">0</property>
-				  <property name="ypad">0</property>
-				</widget>
-				<packing>
-				  <property name="padding">0</property>
-				  <property name="expand">False</property>
-				  <property name="fill">False</property>
-				</packing>
-			      </child>
-
-			      <child>
-				<widget class="GtkLabel" id="label76">
-				  <property name="visible">True</property>
-				  <property name="label" translatable="yes">_Edit</property>
-				  <property name="use_underline">True</property>
-				  <property name="use_markup">False</property>
-				  <property name="justify">GTK_JUSTIFY_LEFT</property>
-				  <property name="wrap">False</property>
-				  <property name="selectable">False</property>
-				  <property name="xalign">0.5</property>
-				  <property name="yalign">0.5</property>
-				  <property name="xpad">0</property>
-				  <property name="ypad">0</property>
-				</widget>
-				<packing>
-				  <property name="padding">0</property>
-				  <property name="expand">False</property>
-				  <property name="fill">False</property>
-				</packing>
-			      </child>
-			    </widget>
-			  </child>
-			</widget>
-		      </child>
-		    </widget>
-		  </child>
-
-		  <child>
-		    <widget class="GtkButton" id="exception-delete">
-		      <property name="visible">True</property>
-		      <property name="can_default">True</property>
-		      <property name="can_focus">True</property>
-		      <property name="label">gtk-remove</property>
-		      <property name="use_stock">True</property>
-		      <property name="relief">GTK_RELIEF_NORMAL</property>
-		      <property name="focus_on_click">True</property>
-		    </widget>
-		  </child>
-		</widget>
-		<packing>
-		  <property name="padding">0</property>
-		  <property name="expand">False</property>
-		  <property name="fill">True</property>
-		</packing>
-	      </child>
-	    </widget>
-	    <packing>
-	      <property name="padding">0</property>
-	      <property name="expand">True</property>
-	      <property name="fill">True</property>
-	    </packing>
-	  </child>
-	</widget>
-	<packing>
-	  <property name="padding">0</property>
-	  <property name="expand">True</property>
-	  <property name="fill">True</property>
-	</packing>
-      </child>
-
-      <child>
-	<widget class="GtkLabel" id="label70">
-	  <property name="visible">True</property>
-	  <property name="label" translatable="yes">&lt;b&gt;Preview&lt;/b&gt;</property>
-	  <property name="use_underline">False</property>
-	  <property name="use_markup">True</property>
-	  <property name="justify">GTK_JUSTIFY_CENTER</property>
-	  <property name="wrap">False</property>
-	  <property name="selectable">False</property>
-	  <property name="xalign">0</property>
-	  <property name="yalign">0.5</property>
-	  <property name="xpad">0</property>
-	  <property name="ypad">0</property>
-	</widget>
-	<packing>
-	  <property name="padding">0</property>
-	  <property name="expand">False</property>
-	  <property name="fill">False</property>
-	</packing>
-      </child>
-
-      <child>
-	<widget class="GtkHBox" id="hbox62">
-	  <property name="visible">True</property>
-	  <property name="homogeneous">False</property>
-	  <property name="spacing">0</property>
-
-	  <child>
-	    <widget class="GtkLabel" id="label74">
-	      <property name="visible">True</property>
-	      <property name="label" translatable="yes"></property>
-	      <property name="use_underline">False</property>
-	      <property name="use_markup">False</property>
-	      <property name="justify">GTK_JUSTIFY_LEFT</property>
-	      <property name="wrap">False</property>
-	      <property name="selectable">False</property>
-	      <property name="xalign">0.5</property>
-	      <property name="yalign">0.5</property>
-	      <property name="xpad">12</property>
-	      <property name="ypad">0</property>
-	    </widget>
-	    <packing>
-	      <property name="padding">0</property>
-	      <property name="expand">False</property>
-	      <property name="fill">False</property>
-	    </packing>
-	  </child>
-
-	  <child>
-	    <widget class="GtkVBox" id="vbox60">
-	      <property name="visible">True</property>
-	      <property name="homogeneous">False</property>
-	      <property name="spacing">0</property>
-
-	      <child>
-		<widget class="GtkAlignment" id="preview-bin">
-		  <property name="visible">True</property>
-		  <property name="xalign">0</property>
-		  <property name="yalign">0</property>
-		  <property name="xscale">1</property>
-		  <property name="yscale">1</property>
-		  <property name="top_padding">0</property>
-		  <property name="bottom_padding">0</property>
-		  <property name="left_padding">0</property>
-		  <property name="right_padding">0</property>
-
-		  <child>
-		    <placeholder/>
-		  </child>
-		</widget>
-		<packing>
-		  <property name="padding">0</property>
-		  <property name="expand">False</property>
-		  <property name="fill">True</property>
-		</packing>
-	      </child>
-	    </widget>
-	    <packing>
-	      <property name="padding">0</property>
-	      <property name="expand">True</property>
-	      <property name="fill">True</property>
-	    </packing>
-	  </child>
-	</widget>
-	<packing>
-	  <property name="padding">0</property>
-	  <property name="expand">True</property>
-	  <property name="fill">True</property>
-	</packing>
-      </child>
-    </widget>
-  </child>
-</widget>
-
-</glade-interface>
diff --git a/calendar/gui/dialogs/recurrence-page.h b/calendar/gui/dialogs/recurrence-page.h
deleted file mode 100644
index 7a10eff069..0000000000
--- a/calendar/gui/dialogs/recurrence-page.h
+++ /dev/null
@@ -1,62 +0,0 @@
-/* Evolution calendar - Recurrence page of the calendar component dialogs
- *
- * Copyright (C) 2001-2003 Ximian, Inc.
- *
- * Authors: Federico Mena-Quintero <federico@ximian.com>
- *          Miguel de Icaza <miguel@ximian.com>
- *          Seth Alves <alves@hungry.com>
- *          JP Rosevear <jpr@ximian.com>
- *          Hans Petter Jansson <hpj@ximian.com>
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of version 2 of the GNU General Public
- * License as published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307, USA.
- */
-
-#ifndef RECURRENCE_PAGE_H
-#define RECURRENCE_PAGE_H
-
-#include "comp-editor-page.h"
-
-G_BEGIN_DECLS
-
-
-
-#define TYPE_RECURRENCE_PAGE            (recurrence_page_get_type ())
-#define RECURRENCE_PAGE(obj)            (G_TYPE_CHECK_INSTANCE_CAST ((obj), TYPE_RECURRENCE_PAGE, RecurrencePage))
-#define RECURRENCE_PAGE_CLASS(klass)    (G_TYPE_CHECK_CLASS_CAST ((klass), TYPE_RECURRENCE_PAGE, RecurrencePageClass))
-#define IS_RECURRENCE_PAGE(obj)         (G_TYPE_CHECK_INSTANCE_TYPE ((obj), TYPE_RECURRENCE_PAGE))
-#define IS_RECURRENCE_PAGE_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((obj), TYPE_RECURRENCE_PAGE))
-
-typedef struct _RecurrencePagePrivate RecurrencePagePrivate;
-
-typedef struct {
-	CompEditorPage page;
-
-	/* Private data */
-	RecurrencePagePrivate *priv;
-} RecurrencePage;
-
-typedef struct {
-	CompEditorPageClass parent_class;
-} RecurrencePageClass;
-
-
-GtkType         recurrence_page_get_type  (void);
-RecurrencePage *recurrence_page_construct (RecurrencePage *rpage);
-RecurrencePage *recurrence_page_new       (void);
-
-
-
-G_END_DECLS
-
-#endif
diff --git a/calendar/gui/dialogs/save-comp.c b/calendar/gui/dialogs/save-comp.c
deleted file mode 100644
index fa5eae8659..0000000000
--- a/calendar/gui/dialogs/save-comp.c
+++ /dev/null
@@ -1,54 +0,0 @@
-/* Evolution calendar - Delete calendar component dialog
- *
- * Copyright (C) 2000 Ximian, Inc.
- * Copyright (C) 2000 Ximian, Inc.
- *
- * Author: Federico Mena-Quintero <federico@ximian.com>
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of version 2 of the GNU General Public
- * License as published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public 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 "widgets/misc/e-error.h"
-#include "save-comp.h"
-#include "comp-editor.h"
-
-/**
- * save_component_dialog:
- * @parent: Window to use as the transient dialog's parent.
- * @comp: Pointer to the EcalComponent 
- *
- * Pops up a dialog box asking the user whether he wants to save changes for
- * a calendar component.
- * 
- * Return value: the response_id of the button selected.
- **/
-
-GtkResponseType
-save_component_dialog (GtkWindow *parent, ECalComponent *comp)
-{
-	ECalComponentVType vtype = e_cal_component_get_vtype(comp);
-
-	switch(vtype) {
-		case E_CAL_COMPONENT_EVENT:
-			return e_error_run (parent, "calendar:prompt-save-appointment", NULL);
-		case E_CAL_COMPONENT_TODO:
-			return e_error_run (parent, "calendar:prompt-save-task", NULL);
-		default:
-			return GTK_RESPONSE_NO;
-	}
-}
diff --git a/calendar/gui/dialogs/save-comp.h b/calendar/gui/dialogs/save-comp.h
deleted file mode 100644
index 79abe30453..0000000000
--- a/calendar/gui/dialogs/save-comp.h
+++ /dev/null
@@ -1,30 +0,0 @@
-/* Evolution calendar - Delete calendar component dialog
- *
- * Copyright (C) 2000 Ximian, Inc.
- * Copyright (C) 2000 Ximian, Inc.
- *
- * Author: Federico Mena-Quintero <federico@ximian.com>
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of version 2 of the GNU General Public
- * License as published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307, USA.
- */
-
-#ifndef SAVE_COMP_H
-#define SAVE_COMP_H
-
-#include <gtk/gtkdialog.h>
-#include <libecal/e-cal-component.h>
-
-GtkResponseType save_component_dialog (GtkWindow *parent, ECalComponent *comp);
-
-#endif
diff --git a/calendar/gui/dialogs/schedule-page.c b/calendar/gui/dialogs/schedule-page.c
deleted file mode 100644
index 327770cecb..0000000000
--- a/calendar/gui/dialogs/schedule-page.c
+++ /dev/null
@@ -1,529 +0,0 @@
-/* Evolution calendar - Scheduling page
- *
- * Copyright (C) 2001 Ximian, Inc.
- *
- * Authors: Federico Mena-Quintero <federico@ximian.com>
- *          Miguel de Icaza <miguel@ximian.com>
- *          Seth Alves <alves@hungry.com>
- *          JP Rosevear <jpr@ximian.com>
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of version 2 of the GNU General Public
- * License as published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307, USA.
- */
-
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
-
-#include <glib.h>
-#include <gtk/gtksignal.h>
-#include <gtk/gtktogglebutton.h>
-#include <gtk/gtkvbox.h>
-#include <gtk/gtkwindow.h>
-#include <libgnome/gnome-i18n.h>
-#include <libgnomeui/gnome-dialog-util.h>
-#include <glade/glade.h>
-#include <e-util/e-dialog-widgets.h>
-#include <widgets/misc/e-dateedit.h>
-#include "../calendar-config.h"
-#include "../e-meeting-time-sel.h"
-#include "../itip-utils.h"
-#include "comp-editor-util.h"
-#include "e-delegate-dialog.h"
-#include "schedule-page.h"
-
-
-
-/* Private part of the SchedulePage structure */
-struct _SchedulePagePrivate {	
-	/* Glade XML data */
-	GladeXML *xml;
-
-	/* Widgets from the Glade file */
-	GtkWidget *main;
-
-	/* Model */
-	EMeetingStore *model;
-	
-	/* Selector */
-	EMeetingTimeSelector *sel;
-	
-	/* The timezone we use. Note that we use the same timezone for the
-	   start and end date. We convert the end date if it is passed in in
-	   another timezone. */
-	icaltimezone *zone;
-
-	gboolean updating;
-};
-
-
-
-static void schedule_page_finalize (GObject *object);
-
-static GtkWidget *schedule_page_get_widget (CompEditorPage *page);
-static void schedule_page_focus_main_widget (CompEditorPage *page);
-static gboolean schedule_page_fill_widgets (CompEditorPage *page, ECalComponent *comp);
-static gboolean schedule_page_fill_component (CompEditorPage *page, ECalComponent *comp);
-static void schedule_page_set_dates (CompEditorPage *page, CompEditorPageDates *dates);
-
-static void times_changed_cb (GtkWidget *widget, gpointer data);
-
-G_DEFINE_TYPE (SchedulePage, schedule_page, TYPE_COMP_EDITOR_PAGE);
-
-/* Class initialization function for the schedule page */
-static void
-schedule_page_class_init (SchedulePageClass *class)
-{
-	CompEditorPageClass *editor_page_class;
-	GObjectClass *object_class;
-
-	editor_page_class = (CompEditorPageClass *) class;
-	object_class = (GObjectClass *) class;
-
-	editor_page_class->get_widget = schedule_page_get_widget;
-	editor_page_class->focus_main_widget = schedule_page_focus_main_widget;
-	editor_page_class->fill_widgets = schedule_page_fill_widgets;
-	editor_page_class->fill_component = schedule_page_fill_component;
-	editor_page_class->set_summary = NULL;
-	editor_page_class->set_dates = schedule_page_set_dates;
-
-	object_class->finalize = schedule_page_finalize;
-}
-
-/* Object initialization function for the schedule page */
-static void
-schedule_page_init (SchedulePage *spage)
-{
-	SchedulePagePrivate *priv;
-
-	priv = g_new0 (SchedulePagePrivate, 1);
-	spage->priv = priv;
-
-	priv->xml = NULL;
-
-	priv->main = NULL;
-
-	priv->zone = NULL;
-
-	priv->updating = FALSE;
-}
-
-/* Destroy handler for the schedule page */
-static void
-schedule_page_finalize (GObject *object)
-{
-	SchedulePage *spage;
-	SchedulePagePrivate *priv;
-	
-	g_return_if_fail (object != NULL);
-	g_return_if_fail (IS_SCHEDULE_PAGE (object));
-
-	spage = SCHEDULE_PAGE (object);
-	priv = spage->priv;
-
-	if (priv->main)
-		gtk_widget_unref (priv->main);
-
-	if (priv->xml) {
-		g_object_unref (priv->xml);
-		priv->xml = NULL;
-	}
-
-	g_object_unref(priv->model);
-
-	g_free (priv);
-	spage->priv = NULL;
-
-	if (G_OBJECT_CLASS (schedule_page_parent_class)->finalize)
-		(* G_OBJECT_CLASS (schedule_page_parent_class)->finalize) (object);
-}
-
-
-
-/* get_widget handler for the schedule page */
-static GtkWidget *
-schedule_page_get_widget (CompEditorPage *page)
-{
-	SchedulePage *spage;
-	SchedulePagePrivate *priv;
-
-	spage = SCHEDULE_PAGE (page);
-	priv = spage->priv;
-
-	return priv->main;
-}
-
-/* focus_main_widget handler for the schedule page */
-static void
-schedule_page_focus_main_widget (CompEditorPage *page)
-{
-	SchedulePage *spage;
-	SchedulePagePrivate *priv;
-
-	spage = SCHEDULE_PAGE (page);
-	priv = spage->priv;
-
-	gtk_widget_grab_focus (GTK_WIDGET (priv->sel));
-}
-
-static void
-sensitize_widgets (SchedulePage *spage)
-{
-	gboolean read_only;
-	SchedulePagePrivate *priv = spage->priv;
-
-	if (!e_cal_is_read_only (COMP_EDITOR_PAGE (spage)->client, &read_only, NULL))
-		read_only = TRUE;
-
-	e_meeting_time_selector_set_read_only (priv->sel, read_only);
-}
-
-static void
-client_changed_cb (CompEditorPage *page, ECal *client, gpointer user_data)
-{
-	SchedulePage *spage = SCHEDULE_PAGE (page);
-
-	sensitize_widgets (spage);
-}
-
-/* Set date/time */
-static void
-update_time (SchedulePage *spage, ECalComponentDateTime *start_date, ECalComponentDateTime *end_date) 
-{
-	SchedulePagePrivate *priv;
-	struct icaltimetype start_tt, end_tt;
-	icaltimezone *start_zone = NULL, *end_zone = NULL;
-	gboolean all_day;
-
-	priv = spage->priv;
-
-	/* Note that if we are creating a new event, the timezones may not be
-	   on the server, so we try to get the builtin timezone with the TZID
-	   first. */
-	start_zone = icaltimezone_get_builtin_timezone_from_tzid (start_date->tzid);
-	if (!start_zone) {
-		if (!e_cal_get_timezone (COMP_EDITOR_PAGE (spage)->client,
-					      start_date->tzid, &start_zone, NULL)) {
-			/* FIXME: Handle error better. */
-			g_warning ("Couldn't get timezone from server: %s",
-				   start_date->tzid ? start_date->tzid : "");
-		}
-	}
-
-	end_zone = icaltimezone_get_builtin_timezone_from_tzid (end_date->tzid);
-	if (!end_zone) {
-		if (!e_cal_get_timezone (COMP_EDITOR_PAGE (spage)->client,
-					      end_date->tzid, &end_zone, NULL)) {
-			/* FIXME: Handle error better. */
-			g_warning ("Couldn't get timezone from server: %s",
-				   end_date->tzid ? end_date->tzid : "");
-		}		
-	}
-
-	start_tt = *start_date->value;
-	if (!end_date->value && start_tt.is_date) {
-		end_tt = start_tt;
-		icaltime_adjust (&end_tt, 1, 0, 0, 0);
-	} else {
-		end_tt = *end_date->value;
-	}	
-	
-	/* If the end zone is not the same as the start zone, we convert it. */
-	priv->zone = start_zone;
-	if (start_zone != end_zone) {
-		icaltimezone_convert_time (&end_tt, end_zone, start_zone);
-	}
-	e_meeting_store_set_zone (priv->model, priv->zone);
-	
-	all_day = (start_tt.is_date && end_tt.is_date) ? TRUE : FALSE;
-
-	/* For All Day Events, if DTEND is after DTSTART, we subtract 1 day
-	   from it. */
-	if (all_day) {
-		if (icaltime_compare_date_only (end_tt, start_tt) > 0) {
-			icaltime_adjust (&end_tt, -1, 0, 0, 0);
-		}
-	}
-
-	e_meeting_time_selector_set_all_day (priv->sel, all_day);
-	
-	e_date_edit_set_date (E_DATE_EDIT (priv->sel->start_date_edit), start_tt.year,
-			      start_tt.month, start_tt.day);
-	e_date_edit_set_time_of_day (E_DATE_EDIT (priv->sel->start_date_edit),
-				     start_tt.hour, start_tt.minute);
-
-	e_date_edit_set_date (E_DATE_EDIT (priv->sel->end_date_edit), end_tt.year,
-			      end_tt.month, end_tt.day);
-	e_date_edit_set_time_of_day (E_DATE_EDIT (priv->sel->end_date_edit),
-				     end_tt.hour, end_tt.minute);
-
-}
-
-		
-/* Fills the widgets with default values */
-static void
-clear_widgets (SchedulePage *spage)
-{
-	SchedulePagePrivate *priv;
-	
-	priv = spage->priv;
-}
-
-/* fill_widgets handler for the schedule page */
-static gboolean
-schedule_page_fill_widgets (CompEditorPage *page, ECalComponent *comp)
-{
-	SchedulePage *spage;
-	SchedulePagePrivate *priv;
-	ECalComponentDateTime start_date, end_date;
-	gboolean validated = TRUE;
-
-	spage = SCHEDULE_PAGE (page);
-	priv = spage->priv;
-
-	priv->updating = TRUE;
-
-	/* Clean the screen */
-	clear_widgets (spage);
-
-	/* Start and end times */
-	e_cal_component_get_dtstart (comp, &start_date);
-	e_cal_component_get_dtend (comp, &end_date);
-	if (!start_date.value)
-		validated = FALSE;
-	else if (!end_date.value)
-		validated = FALSE;
-	else
-		update_time (spage, &start_date, &end_date);
-	
-	e_cal_component_free_datetime (&start_date);
-	e_cal_component_free_datetime (&end_date);
-	
-	priv->updating = FALSE;
-
-	sensitize_widgets (spage);
-
-	return validated;
-}
-
-/* fill_component handler for the schedule page */
-static gboolean
-schedule_page_fill_component (CompEditorPage *page, ECalComponent *comp)
-{
-	SchedulePage *spage;
-	SchedulePagePrivate *priv;
-	
-	spage = SCHEDULE_PAGE (page);
-	priv = spage->priv;
-
-	return TRUE;
-}
-
-static void
-schedule_page_set_dates (CompEditorPage *page, CompEditorPageDates *dates)
-{
-	SchedulePage *spage;
-	SchedulePagePrivate *priv;
-	
-	spage = SCHEDULE_PAGE (page);
-	priv = spage->priv;
-
-	priv->updating = TRUE;
-	
-	update_time (spage, dates->start, dates->end);
-
-	priv->updating = FALSE;
-}
-
-
-
-/* Gets the widgets from the XML file and returns if they are all available. */
-static gboolean
-get_widgets (SchedulePage *spage)
-{
-	CompEditorPage *page = COMP_EDITOR_PAGE (spage);
-	SchedulePagePrivate *priv;
-	GSList *accel_groups;
-	GtkWidget *toplevel;
-
-	priv = spage->priv;
-
-#define GW(name) glade_xml_get_widget (priv->xml, name)
-
-	priv->main = GW ("schedule-page");
-	if (!priv->main)
-		return FALSE;
-
-	/* Get the GtkAccelGroup from the toplevel window, so we can install
-	   it when the notebook page is mapped. */
-	toplevel = gtk_widget_get_toplevel (priv->main);
-	accel_groups = gtk_accel_groups_from_object (G_OBJECT (toplevel));
-	if (accel_groups) {
-		page->accel_group = accel_groups->data;
-		gtk_accel_group_ref (page->accel_group);
-	}
-
-	gtk_widget_ref (priv->main);
-	gtk_container_remove (GTK_CONTAINER (priv->main->parent), priv->main);
-
-#undef GW
-
-	return TRUE;
-}
-
-static gboolean
-init_widgets (SchedulePage *spage) 
-{
-	SchedulePagePrivate *priv;
-
-	priv = spage->priv;
-
-	g_signal_connect (priv->sel, "changed", G_CALLBACK (times_changed_cb), spage);
-
-	return TRUE;
-}
-
-
-
-/**
- * schedule_page_construct:
- * @spage: An schedule page.
- * 
- * Constructs an schedule page by loading its Glade data.
- * 
- * Return value: The same object as @spage, or NULL if the widgets could not 
- * be created.
- **/
-SchedulePage *
-schedule_page_construct (SchedulePage *spage, EMeetingStore *ems)
-{
-	SchedulePagePrivate *priv;
-	
-	priv = spage->priv;
-
-	priv->xml = glade_xml_new (EVOLUTION_GLADEDIR 
-				   "/schedule-page.glade", NULL, NULL);
-	if (!priv->xml) {
-		g_message ("schedule_page_construct(): "
-			   "Could not load the Glade XML file!");
-		return NULL;
-	}
-
-	if (!get_widgets (spage)) {
-		g_message ("schedule_page_construct(): "
-			   "Could not find all widgets in the XML file!");
-		return NULL;
-	}
-
-	/* Model */
-	g_object_ref (ems);
-	priv->model = ems;
-	
-	/* Selector */
-	priv->sel = E_MEETING_TIME_SELECTOR (e_meeting_time_selector_new (ems));
-	e_meeting_time_selector_set_working_hours (priv->sel,
-						   calendar_config_get_day_start_hour (),
-						   calendar_config_get_day_start_minute (),
-						   calendar_config_get_day_end_hour (),
-						   calendar_config_get_day_end_minute ());
-	gtk_widget_show (GTK_WIDGET (priv->sel));
-	gtk_box_pack_start (GTK_BOX (priv->main), GTK_WIDGET (priv->sel), TRUE, TRUE, 6);
-
-	if (!init_widgets (spage)) {
-		g_message ("schedule_page_construct(): " 
-			   "Could not initialize the widgets!");
-		return NULL;
-	}
-
-	g_signal_connect_after (G_OBJECT (spage), "client_changed",
-				G_CALLBACK (client_changed_cb), NULL);
-	return spage;
-}
-
-/**
- * schedule_page_new:
- * 
- * Creates a new schedule page.
- * 
- * Return value: A newly-created schedule page, or NULL if the page could
- * not be created.
- **/
-SchedulePage *
-schedule_page_new (EMeetingStore *ems)
-{
-	SchedulePage *spage;
-
-	spage = g_object_new (TYPE_SCHEDULE_PAGE, NULL);
-	if (!schedule_page_construct (spage, ems)) {
-		g_object_unref (spage);
-		return NULL;
-	}
-
-	return spage;
-}
-
-static void
-times_changed_cb (GtkWidget *widget, gpointer data)
-{
-	SchedulePage *spage = data;
-	SchedulePagePrivate *priv;
-	CompEditorPageDates dates;
-	ECalComponentDateTime start_dt, end_dt;
-	struct icaltimetype start_tt = icaltime_null_time ();
-	struct icaltimetype end_tt = icaltime_null_time ();
-	
-	priv = spage->priv;
-
-	if (priv->updating)
-		return;
-	
-	e_date_edit_get_date (E_DATE_EDIT (priv->sel->start_date_edit),
-			      &start_tt.year,
-			      &start_tt.month,
-			      &start_tt.day);
-	e_date_edit_get_time_of_day (E_DATE_EDIT (priv->sel->start_date_edit),
-				     &start_tt.hour,
-				     &start_tt.minute);
-	e_date_edit_get_date (E_DATE_EDIT (priv->sel->end_date_edit),
-			      &end_tt.year,
-			      &end_tt.month,
-			      &end_tt.day);
-	e_date_edit_get_time_of_day (E_DATE_EDIT (priv->sel->end_date_edit),
-				     &end_tt.hour,
-				     &end_tt.minute);
-
-	start_dt.value = &start_tt;
-	end_dt.value = &end_tt;
-
-	if (e_date_edit_get_show_time (E_DATE_EDIT (priv->sel->start_date_edit))) {
-		/* We set the start and end to the same timezone. */
-		start_dt.tzid = icaltimezone_get_tzid (priv->zone);
-		end_dt.tzid = start_dt.tzid;
-	} else {
-		/* For All-Day Events, we set the timezone to NULL, and add
-		   1 day to DTEND. */
-		start_dt.value->is_date = TRUE;
-		start_dt.tzid = NULL;
-		end_dt.value->is_date = TRUE;
-		icaltime_adjust (&end_tt, 1, 0, 0, 0);
-		end_dt.tzid = NULL;
-	}
-
-	dates.start = &start_dt;
-	dates.end = &end_dt;	
-	dates.due = NULL;
-	dates.complete = NULL;
-
-	comp_editor_page_notify_dates_changed (COMP_EDITOR_PAGE (spage), &dates);
-	comp_editor_page_notify_changed (COMP_EDITOR_PAGE (spage));
-}
diff --git a/calendar/gui/dialogs/schedule-page.glade b/calendar/gui/dialogs/schedule-page.glade
deleted file mode 100644
index 2ef8a1d9f5..0000000000
--- a/calendar/gui/dialogs/schedule-page.glade
+++ /dev/null
@@ -1,24 +0,0 @@
-<?xml version="1.0" standalone="no"?> <!--*- mode: xml -*-->
-<!DOCTYPE glade-interface SYSTEM "http://glade.gnome.org/glade-2.0.dtd">
-
-<glade-interface>
-
-<widget class="GtkWindow" id="schedule-toplevel">
-  <property name="title" translatable="yes">window1</property>
-  <property name="type">GTK_WINDOW_TOPLEVEL</property>
-  <property name="window_position">GTK_WIN_POS_NONE</property>
-  <property name="modal">False</property>
-  <property name="resizable">True</property>
-  <property name="destroy_with_parent">False</property>
-
-  <child>
-    <widget class="GtkVBox" id="schedule-page">
-      <property name="border_width">12</property>
-      <property name="visible">True</property>
-      <property name="homogeneous">False</property>
-      <property name="spacing">6</property>
-    </widget>
-  </child>
-</widget>
-
-</glade-interface>
diff --git a/calendar/gui/dialogs/schedule-page.h b/calendar/gui/dialogs/schedule-page.h
deleted file mode 100644
index d4c7eafbdd..0000000000
--- a/calendar/gui/dialogs/schedule-page.h
+++ /dev/null
@@ -1,59 +0,0 @@
-/* Evolution calendar - Scheduling page
- *
- * Copyright (C) 2001 Ximian, Inc.
- *
- * Authors: JP Rosevear <jpr@ximian.com>
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of version 2 of the GNU General Public
- * License as published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public 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 SCHEDULE_PAGE_H
-#define SCHEDULE_PAGE_H
-
-#include "../e-meeting-store.h"
-#include "comp-editor-page.h"
-
-G_BEGIN_DECLS
-
-
-
-#define TYPE_SCHEDULE_PAGE            (schedule_page_get_type ())
-#define SCHEDULE_PAGE(obj)            (G_TYPE_CHECK_INSTANCE_CAST ((obj), TYPE_SCHEDULE_PAGE, SchedulePage))
-#define SCHEDULE_PAGE_CLASS(klass)    (G_TYPE_CHECK_CLASS_CAST ((klass), TYPE_SCHEDULE_PAGE, SchedulePageClass))
-#define IS_SCHEDULE_PAGE(obj)         (G_TYPE_CHECK_INSTANCE_TYPE ((obj), TYPE_SCHEDULE_PAGE))
-#define IS_SCHEDULE_PAGE_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((obj), TYPE_SCHEDULE_PAGE))
-
-typedef struct _SchedulePagePrivate SchedulePagePrivate;
-
-typedef struct {
-	CompEditorPage page;
-
-	/* Private data */
-	SchedulePagePrivate *priv;
-} SchedulePage;
-
-typedef struct {
-	CompEditorPageClass parent_class;
-} SchedulePageClass;
-
-
-GtkType      schedule_page_get_type  (void);
-SchedulePage *schedule_page_construct (SchedulePage *mpage, EMeetingStore *ems);
-SchedulePage *schedule_page_new       (EMeetingStore *ems);
-
-
-
-G_END_DECLS
-
-#endif
diff --git a/calendar/gui/dialogs/select-source-dialog.c b/calendar/gui/dialogs/select-source-dialog.c
deleted file mode 100644
index 408cb73b29..0000000000
--- a/calendar/gui/dialogs/select-source-dialog.c
+++ /dev/null
@@ -1,91 +0,0 @@
-/* Evolution calendar - Select source dialog
- *
- * Copyright (C) 2004 Novell, Inc.
- *
- * Author: Rodrigo Moya <rodrigo@ximian.com>
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of version 2 of the GNU General Public
- * License as published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307, USA.
- */
-
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
-
-#include <bonobo/bonobo-i18n.h>
-#include <gtk/gtkstock.h>
-#include <e-util/e-icon-factory.h>
-#include <libedataserverui/e-source-selector-dialog.h>
-#include "select-source-dialog.h"
-
-/**
- * select_source_dialog
- *
- * Implements dialog for allowing user to select a destination source.
- */
-ESource *
-select_source_dialog (GtkWindow *parent, ECalSourceType obj_type)
-{
-	GtkWidget *dialog;
-	ESourceList *source_list;
-	ESource *selected_source = NULL;
-	const char *gconf_key;
-	GConfClient *conf_client;
-	GList *icon_list = NULL;
-
-	if (obj_type == E_CAL_SOURCE_TYPE_EVENT)
-		gconf_key = "/apps/evolution/calendar/sources";
-	else if (obj_type == E_CAL_SOURCE_TYPE_TODO)
-		gconf_key = "/apps/evolution/tasks/sources";
-	else
-		return NULL;
-
-	conf_client = gconf_client_get_default ();
-	source_list = e_source_list_new_for_gconf (conf_client, gconf_key);
-
-	/* create the dialog */
-	dialog = e_source_selector_dialog_new (parent, source_list);
-
-	if (obj_type == E_CAL_SOURCE_TYPE_EVENT)
-		icon_list = e_icon_factory_get_icon_list ("stock_calendar");
-	else if (obj_type == E_CAL_SOURCE_TYPE_TODO)
-		icon_list = e_icon_factory_get_icon_list ("stock_todo");
-	
-	if (icon_list) {
-		gtk_window_set_icon_list (GTK_WINDOW (dialog), icon_list);
-		g_list_foreach (icon_list, (GFunc) g_object_unref, NULL);
-		g_list_free (icon_list);
-	}
-	
-	if (gtk_dialog_run (GTK_DIALOG (dialog)) == GTK_RESPONSE_OK) {
-		selected_source = e_source_selector_dialog_peek_primary_selection (E_SOURCE_SELECTOR_DIALOG (dialog));
-		if (selected_source) {
-			char *absolute_uri;
-
-			/* set the absolute URI on the source we keep around, since the group
-			   will be unrefed */
-			absolute_uri = e_source_build_absolute_uri (selected_source);
-			e_source_set_absolute_uri (selected_source, (const char *) absolute_uri);
-
-			g_object_ref (selected_source);
-			g_free (absolute_uri);
-		}
-	} else
-		selected_source = NULL;
-
-	g_object_unref (conf_client);
-	g_object_unref (source_list);
-	gtk_widget_destroy (dialog);
-
-	return selected_source;
-}
diff --git a/calendar/gui/dialogs/select-source-dialog.h b/calendar/gui/dialogs/select-source-dialog.h
deleted file mode 100644
index d0656395bb..0000000000
--- a/calendar/gui/dialogs/select-source-dialog.h
+++ /dev/null
@@ -1,30 +0,0 @@
-/* Evolution calendar - Select source dialog
- *
- * Copyright (C) 2004 Novell, Inc.
- *
- * Author: Rodrigo Moya <rodrigo@ximian.com>
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of version 2 of the GNU General Public
- * License as published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307, USA.
- */
-
-#ifndef SELECT_SOURCE_DIALOG_H
-#define SELECT_SOURCE_DIALOG_H
-
-#include <gtk/gtkwindow.h>
-#include <libedataserver/e-source.h>
-#include <libecal/e-cal.h>
-
-ESource *select_source_dialog (GtkWindow *parent, ECalSourceType type);
-
-#endif
diff --git a/calendar/gui/dialogs/send-comp.c b/calendar/gui/dialogs/send-comp.c
deleted file mode 100644
index c5269f1854..0000000000
--- a/calendar/gui/dialogs/send-comp.c
+++ /dev/null
@@ -1,104 +0,0 @@
-/* Evolution calendar - Send calendar component dialog
- *
- * Copyright (C) 2001 Ximian, Inc.
- *
- * Author: JP Rosevear <jpr@ximian.com>
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of version 2 of the GNU General Public
- * License as published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307, USA.
- */
-
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
-
-#include <gtk/gtkmessagedialog.h>
-#include "widgets/misc/e-error.h"
-#include "send-comp.h"
-
-
-
-/**
- * send_component_dialog:
- * 
- * Pops up a dialog box asking the user whether he wants to send a
- * iTip/iMip message
- * 
- * Return value: TRUE if the user clicked Yes, FALSE otherwise.
- **/
-gboolean
-send_component_dialog (GtkWindow *parent, ECal *client, ECalComponent *comp, gboolean new)
-{
-	ECalComponentVType vtype;
-	const char *id;
-	
-	if (e_cal_get_save_schedules (client))
-		return FALSE;
-	
-	vtype = e_cal_component_get_vtype (comp);
-
-	switch (vtype) {
-	case E_CAL_COMPONENT_EVENT:
-		if (new)
-			id = "calendar:prompt-meeting-invite";
-		else
-			id = "calendar:prompt-send-updated-meeting-info";
-		break;
-
-	case E_CAL_COMPONENT_TODO:
-		if (new)
-			id = "calendar:prompt-send-task";
-		else
-			id = "calendar:prompt-send-updated-task-info";
-		break;
-
-	default:
-		g_message ("send_component_dialog(): "
-			   "Cannot handle object of type %d", vtype);
-		return FALSE;
-	}
-	
-	if (e_error_run (parent, id, NULL) == GTK_RESPONSE_YES)
-		return TRUE;
-	else
-		return FALSE;
-}
-
-gboolean
-send_component_prompt_subject (GtkWindow *parent, ECal *client, ECalComponent *comp)
-{
-	ECalComponentVType vtype;
-	const char *id;
-	
-	vtype = e_cal_component_get_vtype (comp);
-
-	switch (vtype) {
-	case E_CAL_COMPONENT_EVENT:
-			id = "calendar:prompt-send-no-subject-calendar";
-		break;
-
-	case E_CAL_COMPONENT_TODO:
-			id = "calendar:prompt-send-no-subject-task";
-		break;
-
-	default:
-		g_message ("send_component_prompt_subject(): "
-			   "Cannot handle object of type %d", vtype);
-		return FALSE;
-	}
-	
-	if (e_error_run (parent, id, NULL) == GTK_RESPONSE_YES)
-		return TRUE;
-	else
-		return FALSE;
-}
diff --git a/calendar/gui/dialogs/send-comp.h b/calendar/gui/dialogs/send-comp.h
deleted file mode 100644
index 7e007f9edb..0000000000
--- a/calendar/gui/dialogs/send-comp.h
+++ /dev/null
@@ -1,32 +0,0 @@
-/* Evolution calendar - Send calendar component dialog
- *
- * Copyright (C) 2001 Ximian, Inc.
- *
- * Author: JP Rosevear <jpr@ximian.com>
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of version 2 of the GNU General Public
- * License as published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307, USA.
- */
-
-#ifndef SEND_COMP_H
-#define SEND_COMP_H
-
-#include <glib.h>
-#include <gtk/gtkwindow.h>
-#include <libecal/e-cal.h>
-#include <libecal/e-cal-component.h>
-
-gboolean send_component_dialog (GtkWindow *parent, ECal *client, ECalComponent *comp, gboolean new);
-gboolean send_component_prompt_subject (GtkWindow *parent, ECal *client, ECalComponent *comp);
-
-#endif
diff --git a/calendar/gui/dialogs/task-details-page.c b/calendar/gui/dialogs/task-details-page.c
deleted file mode 100644
index c030c97f31..0000000000
--- a/calendar/gui/dialogs/task-details-page.c
+++ /dev/null
@@ -1,830 +0,0 @@
-/* Evolution calendar - task details page
- *
- * Copyright (C) 2001 Ximian, Inc.
- *
- * Authors: Federico Mena-Quintero <federico@ximian.com>
- *          Miguel de Icaza <miguel@ximian.com>
- *          Seth Alves <alves@hungry.com>
- *          JP Rosevear <jpr@ximian.com>
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of version 2 of the GNU General Public
- * License as published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307, USA.
- */
-
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
-
-#include <gtk/gtksignal.h>
-#include <gtk/gtktogglebutton.h>
-#include <libgnome/gnome-i18n.h>
-#include <glade/glade.h>
-#include <widgets/misc/e-dateedit.h>
-#include <widgets/misc/e-url-entry.h>
-#include "e-util/e-dialog-widgets.h"
-#include "../calendar-config.h"
-#include "../e-timezone-entry.h"
-#include "comp-editor-util.h"
-#include "task-details-page.h"
-
-
-
-/* Private part of the TaskDetailsPage structure */
-struct _TaskDetailsPagePrivate {
-	/* Glade XML data */
-	GladeXML *xml;
-
-	/* Widgets from the Glade file */
-	GtkWidget *main;
-
-	GtkWidget *status;
-	GtkWidget *priority;
-	GtkWidget *percent_complete;
-
-	GtkWidget *date_completed_label;
-	GtkWidget *completed_date;
-
-	GtkWidget *url_label;
-	GtkWidget *url_entry;
-	GtkWidget *url;
-
-	gboolean updating;
-};
-
-/* Note that these two arrays must match. */
-static const int status_map[] = {
-	ICAL_STATUS_NONE,
-	ICAL_STATUS_INPROCESS,
-	ICAL_STATUS_COMPLETED,
-	ICAL_STATUS_CANCELLED,
-	-1
-};
-
-typedef enum {
-	PRIORITY_HIGH,
-	PRIORITY_NORMAL,
-	PRIORITY_LOW,
-	PRIORITY_UNDEFINED,
-} TaskEditorPriority;
-
-static const int priority_map[] = {
-	PRIORITY_HIGH,
-	PRIORITY_NORMAL,
-	PRIORITY_LOW,
-	PRIORITY_UNDEFINED,
-	-1
-};
-
-
-
-static void task_details_page_finalize (GObject *object);
-
-static GtkWidget *task_details_page_get_widget (CompEditorPage *page);
-static void task_details_page_focus_main_widget (CompEditorPage *page);
-static gboolean task_details_page_fill_widgets (CompEditorPage *page, ECalComponent *comp);
-static gboolean task_details_page_fill_component (CompEditorPage *page, ECalComponent *comp);
-static gboolean task_details_page_fill_timezones (CompEditorPage *page, GHashTable *timezones);
-
-G_DEFINE_TYPE (TaskDetailsPage, task_details_page, TYPE_COMP_EDITOR_PAGE);
-
-/* Class initialization function for the task page */
-static void
-task_details_page_class_init (TaskDetailsPageClass *class)
-{
-	CompEditorPageClass *editor_page_class;
-	GObjectClass *object_class;
-
-	editor_page_class = (CompEditorPageClass *) class;
-	object_class = (GObjectClass *) class;
-
-	editor_page_class->get_widget = task_details_page_get_widget;
-	editor_page_class->focus_main_widget = task_details_page_focus_main_widget;
-	editor_page_class->fill_widgets = task_details_page_fill_widgets;
-	editor_page_class->fill_component = task_details_page_fill_component;
-	editor_page_class->fill_timezones = task_details_page_fill_timezones;
-
-	object_class->finalize = task_details_page_finalize;
-}
-
-/* Object initialization function for the task page */
-static void
-task_details_page_init (TaskDetailsPage *tdpage)
-{
-	TaskDetailsPagePrivate *priv;
-
-	priv = g_new0 (TaskDetailsPagePrivate, 1);
-	tdpage->priv = priv;
-
-	priv->xml = NULL;
-
-	priv->main = NULL;
-
-	priv->status = NULL;
-	priv->priority = NULL;
-	priv->percent_complete = NULL;
-	
-	priv->date_completed_label = NULL;
-	priv->completed_date = NULL;
-
-	priv->url_label = NULL;
-	priv->url_entry = NULL;
-	priv->url = NULL;
-
-	priv->updating = FALSE;
-}
-
-/* Destroy handler for the task page */
-static void
-task_details_page_finalize (GObject *object)
-{
-	TaskDetailsPage *tdpage;
-	TaskDetailsPagePrivate *priv;
-
-	g_return_if_fail (object != NULL);
-	g_return_if_fail (IS_TASK_DETAILS_PAGE (object));
-
-	tdpage = TASK_DETAILS_PAGE (object);
-	priv = tdpage->priv;
-
-	if (priv->main)
-		gtk_widget_unref (priv->main);
-
-	if (priv->xml) {
-		g_object_unref (priv->xml);
-		priv->xml = NULL;
-	}
-
-	g_free (priv);
-	tdpage->priv = NULL;
-
-	if (G_OBJECT_CLASS (task_details_page_parent_class)->finalize)
-		(* G_OBJECT_CLASS (task_details_page_parent_class)->finalize) (object);
-}
-
-
-
-/* get_widget handler for the task page */
-static GtkWidget *
-task_details_page_get_widget (CompEditorPage *page)
-{
-	TaskDetailsPage *tdpage;
-	TaskDetailsPagePrivate *priv;
-
-	tdpage = TASK_DETAILS_PAGE (page);
-	priv = tdpage->priv;
-
-	return priv->main;
-}
-
-/* focus_main_widget handler for the task page */
-static void
-task_details_page_focus_main_widget (CompEditorPage *page)
-{
-	TaskDetailsPage *tdpage;
-	TaskDetailsPagePrivate *priv;
-
-	tdpage = TASK_DETAILS_PAGE (page);
-	priv = tdpage->priv;
-
-	gtk_widget_grab_focus (priv->status);
-}
-
-
-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;
-}
-
-/* Fills the widgets with default values */
-static void
-clear_widgets (TaskDetailsPage *tdpage)
-{
-	TaskDetailsPagePrivate *priv;
-
-	priv = tdpage->priv;
-
-	/* Date completed */
-	e_date_edit_set_time (E_DATE_EDIT (priv->completed_date), -1);
-
-	/* URL */
-	e_dialog_editable_set (priv->url, NULL);
-}
-
-static void
-sensitize_widgets (TaskDetailsPage *tdpage)
-{
-	gboolean read_only;
-	TaskDetailsPagePrivate *priv;
-	
-	priv = tdpage->priv;
-
-	if (!e_cal_is_read_only (COMP_EDITOR_PAGE (tdpage)->client, &read_only, NULL))
-		read_only = TRUE;
-	
-	gtk_widget_set_sensitive (priv->status, !read_only);
-	gtk_widget_set_sensitive (priv->priority, !read_only);
-	gtk_widget_set_sensitive (priv->percent_complete, !read_only);
-	gtk_widget_set_sensitive (priv->completed_date, !read_only);
-	gtk_widget_set_sensitive (priv->url_label, !read_only);
-	gtk_entry_set_editable (GTK_ENTRY (e_url_entry_get_entry (E_URL_ENTRY (priv->url_entry))), !read_only);
-}
-
-/* fill_widgets handler for the task page */
-static gboolean
-task_details_page_fill_widgets (CompEditorPage *page, ECalComponent *comp)
-{
-	TaskDetailsPage *tdpage;
-	TaskDetailsPagePrivate *priv;
-	int *priority_value, *percent = NULL;
-	TaskEditorPriority priority;
-	icalproperty_status status;
-	const char *url;
-	struct icaltimetype *completed = NULL;
-
-	tdpage = TASK_DETAILS_PAGE (page);
-	priv = tdpage->priv;
-
-	priv->updating = TRUE;
-	
-	/* Clean the screen */
-	clear_widgets (tdpage);
-	
-	/* Percent Complete. */
-	e_cal_component_get_percent (comp, &percent);
-	if (percent) {
-		e_dialog_spin_set (priv->percent_complete, *percent);
-	} else {
-		/* FIXME: Could check if task is completed and set 100%. */
-		e_dialog_spin_set (priv->percent_complete, 0);
-	}
-
-	/* Status. */
-	e_cal_component_get_status (comp, &status);
-	if (status == ICAL_STATUS_NONE || status == ICAL_STATUS_NEEDSACTION) {
-		/* Try to use the percent value. */
-		if (percent) {
-			if (*percent == 100)
-				status = ICAL_STATUS_COMPLETED;
-			else if (*percent > 0)
-				status = ICAL_STATUS_INPROCESS;
-			else
-				status = ICAL_STATUS_NONE;
-		} else
-			status = ICAL_STATUS_NONE;
-	}
-	e_dialog_option_menu_set (priv->status, status, status_map);
-
-	if (percent)
-		e_cal_component_free_percent (percent);
-
-	/* Completed Date. */
-	e_cal_component_get_completed (comp, &completed);
-	if (completed) {
-		icaltimezone *utc_zone, *zone;
-
-		/* Completed is in UTC, but that would confuse the user, so
-		   we convert it to local time. */
-		utc_zone = icaltimezone_get_utc_timezone ();
-		zone = calendar_config_get_icaltimezone ();
-
-		icaltimezone_convert_time (completed, utc_zone, zone);
-
-		e_date_edit_set_date (E_DATE_EDIT (priv->completed_date),
-				      completed->year, completed->month,
-				      completed->day);
-		e_date_edit_set_time_of_day (E_DATE_EDIT (priv->completed_date),
-					     completed->hour,
-					     completed->minute);
-
-		e_cal_component_free_icaltimetype (completed);
-	}
-
-	/* Priority. */
-	e_cal_component_get_priority (comp, &priority_value);
-	if (priority_value) {
-		priority = priority_value_to_index (*priority_value);
-		e_cal_component_free_priority (priority_value);
-	} else {
-		priority = PRIORITY_UNDEFINED;
-	}
-	e_dialog_option_menu_set (priv->priority, priority, priority_map);
-
-	/* URL */
-	e_cal_component_get_url (comp, &url);
-	e_dialog_editable_set (priv->url, url);
-	
-	priv->updating = FALSE;
-
-	sensitize_widgets (tdpage);
-
-	return TRUE;
-}
-
-/* fill_component handler for the task page */
-static gboolean
-task_details_page_fill_component (CompEditorPage *page, ECalComponent *comp)
-{
-	TaskDetailsPage *tdpage;
-	TaskDetailsPagePrivate *priv;
-	struct icaltimetype icalcomplete, icaltoday;
-	icalproperty_status status;
-	TaskEditorPriority priority;
-	int priority_value, percent;
-	char *url;
-	gboolean date_set;
-	icaltimezone *zone = calendar_config_get_icaltimezone ();
-	
-	tdpage = TASK_DETAILS_PAGE (page);
-	priv = tdpage->priv;
-
-	/* Percent Complete. */
-	percent = e_dialog_spin_get_int (priv->percent_complete);
-	e_cal_component_set_percent (comp, &percent);
-
-	/* Status. */
-	status = e_dialog_option_menu_get (priv->status, status_map);
-	e_cal_component_set_status (comp, status);
-
-	/* Priority. */
-	priority = e_dialog_option_menu_get (priv->priority, priority_map);
-	priority_value = priority_index_to_value (priority);
-	e_cal_component_set_priority (comp, &priority_value);
-
-	icalcomplete = icaltime_null_time ();
-
-	/* COMPLETED must be in UTC. */
-	icalcomplete.is_utc = 1;
-
-	/* Completed Date. */
-	if (!e_date_edit_date_is_valid (E_DATE_EDIT (priv->completed_date)) ||
-	    !e_date_edit_time_is_valid (E_DATE_EDIT (priv->completed_date))) {
-		comp_editor_page_display_validation_error (page, _("Completed date is wrong"), priv->completed_date);
-		return FALSE;
-	}
-
-	date_set = e_date_edit_get_date (E_DATE_EDIT (priv->completed_date),
-					 &icalcomplete.year,
-					 &icalcomplete.month,
-					 &icalcomplete.day);
-
-	e_date_edit_get_time_of_day (E_DATE_EDIT (priv->completed_date),
-				     &icalcomplete.hour,
-				     &icalcomplete.minute);
-
-	/* COMPLETED today or before */
-	icaltoday = icaltime_current_time_with_zone (zone);
-	icaltimezone_convert_time (&icaltoday, zone,
-				    icaltimezone_get_utc_timezone());
-
-	if (icaltime_compare_date_only (icalcomplete, icaltoday) > 0) { 
-		comp_editor_page_display_validation_error (page, _("Completed date is wrong"), priv->completed_date);
-		return FALSE;
-	}
-
-	if (date_set) {
-		/* COMPLETED must be in UTC, so we assume that the date in the
-		   dialog is in the current timezone, and we now convert it
-		   to UTC. FIXME: We should really use one timezone for the
-		   entire time the dialog is shown. Otherwise if the user
-		   changes the timezone, the COMPLETED date may get changed
-		   as well. */
-		icaltimezone_convert_time (&icalcomplete, zone,
-					   icaltimezone_get_utc_timezone ());
-		e_cal_component_set_completed (comp, &icalcomplete);
-	} else {
-		e_cal_component_set_completed (comp, NULL);
-	}
-
-	/* URL. */
-	url = e_dialog_editable_get (priv->url);
-	e_cal_component_set_url (comp, url);
-	if (url)
-		g_free (url);
-
-	return TRUE;
-}
-
-/* fill_timezones handler for the event page */
-static gboolean
-task_details_page_fill_timezones (CompEditorPage *page, GHashTable *timezones)
-{
-	TaskDetailsPage *tdpage;
-	TaskDetailsPagePrivate *priv;
-	icaltimezone *zone;
-
-	tdpage = TASK_DETAILS_PAGE (page);
-	priv = tdpage->priv;
-
-	/* add UTC timezone, which is the one used for the DATE-COMPLETED property */
-	zone = icaltimezone_get_utc_timezone ();
-	if (zone) {
-		if (!g_hash_table_lookup (timezones, icaltimezone_get_tzid (zone)))
-			g_hash_table_insert (timezones, icaltimezone_get_tzid (zone), zone);
-	}
-
-	return TRUE;
-}
-
-
-
-/* Gets the widgets from the XML file and returns if they are all available. */
-static gboolean
-get_widgets (TaskDetailsPage *tdpage)
-{
-	CompEditorPage *page = COMP_EDITOR_PAGE (tdpage);
-	TaskDetailsPagePrivate *priv;
-	GSList *accel_groups;
-	GtkWidget *toplevel;
-
-	priv = tdpage->priv;
-
-#define GW(name) glade_xml_get_widget (priv->xml, name)
-
-	priv->main = GW ("task-details-page");
-	if (!priv->main)
-		return FALSE;
-
-	/* Get the GtkAccelGroup from the toplevel window, so we can install
-	   it when the notebook page is mapped. */
-	toplevel = gtk_widget_get_toplevel (priv->main);
-	accel_groups = gtk_accel_groups_from_object (G_OBJECT (toplevel));
-	if (accel_groups) {
-		page->accel_group = accel_groups->data;
-		gtk_accel_group_ref (page->accel_group);
-	}
-
-	gtk_widget_ref (priv->main);
-	gtk_container_remove (GTK_CONTAINER (priv->main->parent), priv->main);
-
-	priv->status = GW ("status");
-	priv->priority = GW ("priority");
-	priv->percent_complete = GW ("percent-complete");
-
-	priv->date_completed_label = GW ("date_completed_label");
-
-	priv->completed_date = GW ("completed-date");
-	gtk_widget_show (priv->completed_date);
-
-	priv->url_label = GW ("url_label");
-
-	priv->url_entry = GW ("url_entry");
-	gtk_widget_show (priv->url_entry);
-	priv->url = e_url_entry_get_entry (E_URL_ENTRY (priv->url_entry));
-	atk_object_set_name (gtk_widget_get_accessible (priv->url), _("Web Page"));
-	
-#undef GW
-
-	return (priv->status
-		&& priv->priority
-		&& priv->percent_complete
-		&& priv->date_completed_label
-		&& priv->completed_date
-		&& priv->url_label
-		&& priv->url);
-}
-
-
-static void
-complete_date_changed (TaskDetailsPage *tdpage, time_t ctime, gboolean complete)
-{
-	TaskDetailsPagePrivate *priv;
-	CompEditorPageDates dates = {NULL, NULL, NULL, NULL};
-	icaltimezone *zone;
-	struct icaltimetype completed_tt = icaltime_null_time();
-
-	priv = tdpage->priv;
-
-	/* Get the current time in UTC. */
-	zone = icaltimezone_get_utc_timezone ();
-	completed_tt = icaltime_from_timet_with_zone (ctime, FALSE, zone);
-	completed_tt.is_utc = TRUE;
-
-	dates.start = NULL;
-	dates.end = NULL;
-	dates.due = NULL;	
-	if (complete)
-		dates.complete = &completed_tt;
-	
-	/* Notify upstream */
-	comp_editor_page_notify_dates_changed (COMP_EDITOR_PAGE (tdpage),
-					       &dates);
-}
-
-static void
-date_changed_cb (EDateEdit *dedit, gpointer data)
-{
-	TaskDetailsPage *tdpage;
-	TaskDetailsPagePrivate *priv;
-	CompEditorPageDates dates = {NULL, NULL, NULL, NULL};
-	struct icaltimetype completed_tt = icaltime_null_time ();
-	icalproperty_status status;
-	gboolean date_set;
-
-	tdpage = TASK_DETAILS_PAGE (data);
-	priv = tdpage->priv;
-
-	if (priv->updating)
-		return;
-
-	priv->updating = TRUE;
-
-	date_set = e_date_edit_get_date (E_DATE_EDIT (priv->completed_date),
-					 &completed_tt.year,
-					 &completed_tt.month,
-					 &completed_tt.day);
-	e_date_edit_get_time_of_day (E_DATE_EDIT (priv->completed_date),
-				     &completed_tt.hour,
-				     &completed_tt.minute);
-
-	status = e_dialog_option_menu_get (priv->status, status_map);
-
-	if (!date_set) {
-		completed_tt = icaltime_null_time ();
-		if (status == ICAL_STATUS_COMPLETED) {
-			e_dialog_option_menu_set (priv->status,
-						  ICAL_STATUS_NONE,
-						  status_map);
-			e_dialog_spin_set (priv->percent_complete, 0);
-		}
-	} else {
-		if (status != ICAL_STATUS_COMPLETED) {
-			e_dialog_option_menu_set (priv->status,
-						  ICAL_STATUS_COMPLETED,
-						  status_map);
-		}
-		e_dialog_spin_set (priv->percent_complete, 100);
-	}
-	
-	priv->updating = FALSE;
-
-	/* Notify upstream */
-	dates.complete = &completed_tt;
-	comp_editor_page_notify_dates_changed (COMP_EDITOR_PAGE (tdpage), &dates);
-}
-
-static void
-status_changed (GtkMenu	*menu, TaskDetailsPage *tdpage)
-{
-	TaskDetailsPagePrivate *priv;
-	icalproperty_status status;
-	time_t ctime = -1;
-	
-	priv = tdpage->priv;
-
-	if (priv->updating)
-		return;
-
-	priv->updating = TRUE;
-
-	status = e_dialog_option_menu_get (priv->status, status_map);
-	if (status == ICAL_STATUS_NONE) {
-		e_dialog_spin_set (priv->percent_complete, 0);
-		e_date_edit_set_time (E_DATE_EDIT (priv->completed_date), ctime);
-		complete_date_changed (tdpage, 0, FALSE);
-	} else if (status == ICAL_STATUS_INPROCESS) {
-		gint percent_complete = e_dialog_spin_get_int (priv->percent_complete);
-		if (percent_complete <= 0 || percent_complete >= 100)
-			e_dialog_spin_set (priv->percent_complete, 50);
-
-		e_date_edit_set_time (E_DATE_EDIT (priv->completed_date), ctime);
-		complete_date_changed (tdpage, 0, FALSE);
-	} else if (status == ICAL_STATUS_COMPLETED) {
-		e_dialog_spin_set (priv->percent_complete, 100);
-		ctime = time (NULL);
-		e_date_edit_set_time (E_DATE_EDIT (priv->completed_date), ctime);
-		complete_date_changed (tdpage, ctime, TRUE);
-	}
-
-	priv->updating = FALSE;
-
-	comp_editor_page_notify_changed (COMP_EDITOR_PAGE (tdpage));
-}
-
-static void
-percent_complete_changed (GtkAdjustment	*adj, TaskDetailsPage *tdpage)
-{
-	TaskDetailsPagePrivate *priv;
-	gint percent;
-	icalproperty_status status;
-	gboolean complete;
-	time_t ctime = -1;
-	
-	priv = tdpage->priv;
-
-	if (priv->updating)
-		return;
-	
-	priv->updating = TRUE;
-
-	percent = e_dialog_spin_get_int (priv->percent_complete);
-	if (percent == 100) {
-		complete = TRUE;
-		ctime = time (NULL);
-		status = ICAL_STATUS_COMPLETED;
-	} else {
-		complete = FALSE;
-
-		if (percent == 0)
-			status = ICAL_STATUS_NONE;
-		else
-			status = ICAL_STATUS_INPROCESS;
-	}
-
-	e_dialog_option_menu_set (priv->status, status, status_map);
-	e_date_edit_set_time (E_DATE_EDIT (priv->completed_date), ctime);
-	complete_date_changed (tdpage, ctime, complete);
-
-	priv->updating = FALSE;
-
-	comp_editor_page_notify_changed (COMP_EDITOR_PAGE (tdpage));
-}
-
-/* This is called when any field is changed; it notifies upstream. */
-static void
-field_changed_cb (GtkWidget *widget, gpointer data)
-{
-	TaskDetailsPage *tdpage;
-	TaskDetailsPagePrivate *priv;
-	
-	tdpage = TASK_DETAILS_PAGE (data);
-	priv = tdpage->priv;
-
-	if (!priv->updating)
-		comp_editor_page_notify_changed (COMP_EDITOR_PAGE (tdpage));
-}
-
-/* Hooks the widget signals */
-static void
-init_widgets (TaskDetailsPage *tdpage)
-{
-	TaskDetailsPagePrivate *priv;
-
-	priv = tdpage->priv;
-
-	/* Make sure the EDateEdit widgets use our timezones to get the
-	   current time. */
-	e_date_edit_set_get_time_callback (E_DATE_EDIT (priv->completed_date),
-					   (EDateEditGetTimeCallback) comp_editor_get_current_time,
-					   tdpage, NULL);
-
-	/* These are created by hand, so hook the mnemonics manually */
-	gtk_label_set_mnemonic_widget (GTK_LABEL (priv->date_completed_label), priv->completed_date);
-	gtk_label_set_mnemonic_widget (GTK_LABEL (priv->url_label), priv->url_entry);
-
-	/* Connect signals. The Status, Percent Complete & Date Completed
-	   properties are closely related so whenever one changes we may need
-	   to update the other 2. */
-	g_signal_connect((GTK_OPTION_MENU (priv->status)->menu),
-			    "deactivate",
-			    G_CALLBACK (status_changed), tdpage);
-
-	g_signal_connect((GTK_SPIN_BUTTON (priv->percent_complete)->adjustment),
-			    "value_changed",
-			    G_CALLBACK (percent_complete_changed), tdpage);
-
-	/* Priority */
-	g_signal_connect((GTK_OPTION_MENU (priv->priority)->menu),
-			    "deactivate",
-			    G_CALLBACK (field_changed_cb), tdpage);
-
-	/* Completed Date */
-	g_signal_connect((priv->completed_date), "changed",
-			    G_CALLBACK (date_changed_cb), tdpage);
-	g_signal_connect (priv->completed_date, "changed",
-			    G_CALLBACK (field_changed_cb), tdpage);
-
-	/* URL */
-	g_signal_connect((priv->url), "changed",
-			    G_CALLBACK (field_changed_cb), tdpage);
-}
-
-static void
-client_changed_cb (CompEditorPage *page, ECal *client, gpointer user_data)
-{
-	TaskDetailsPage *tdpage = TASK_DETAILS_PAGE (page);
-
-	sensitize_widgets (tdpage);
-}
-
-/**
- * task_details_page_construct:
- * @tdpage: An task details page.
- * 
- * Constructs an task page by loading its Glade data.
- * 
- * Return value: The same object as @tdpage, or NULL if the widgets could not 
- * be created.
- **/
-TaskDetailsPage *
-task_details_page_construct (TaskDetailsPage *tdpage)
-{
-	TaskDetailsPagePrivate *priv;
-
-	priv = tdpage->priv;
-
-	priv->xml = glade_xml_new (EVOLUTION_GLADEDIR 
-				   "/task-details-page.glade", NULL, NULL);
-	if (!priv->xml) {
-		g_message ("task_details_page_construct(): "
-			   "Could not load the Glade XML file!");
-		return NULL;
-	}
-
-	if (!get_widgets (tdpage)) {
-		g_message ("task_details_page_construct(): "
-			   "Could not find all widgets in the XML file!");
-		return NULL;
-	}
-
-	init_widgets (tdpage);
-
-	g_signal_connect_after (G_OBJECT (tdpage), "client_changed",
-				G_CALLBACK (client_changed_cb), NULL);
-
-	return tdpage;
-}
-
-/**
- * task_details_page_new:
- * 
- * Creates a new task details page.
- * 
- * Return value: A newly-created task details page, or NULL if the page could
- * not be created.
- **/
-TaskDetailsPage *
-task_details_page_new (void)
-{
-	TaskDetailsPage *tdpage;
-
-	tdpage = g_object_new (TYPE_TASK_DETAILS_PAGE, NULL);
-	if (!task_details_page_construct (tdpage)) {
-		g_object_unref (tdpage);
-		return NULL;
-	}
-
-	return tdpage;
-}
-
-GtkWidget *task_details_page_create_date_edit (void);
-
-GtkWidget *
-task_details_page_create_date_edit (void)
-{
-	GtkWidget *dedit;
-
-	dedit = comp_editor_new_date_edit (TRUE, TRUE, FALSE);
-	e_date_edit_set_allow_no_date_set (E_DATE_EDIT (dedit), TRUE);
-
-	return dedit;
-}
-
diff --git a/calendar/gui/dialogs/task-details-page.glade b/calendar/gui/dialogs/task-details-page.glade
deleted file mode 100644
index 7078f74d92..0000000000
--- a/calendar/gui/dialogs/task-details-page.glade
+++ /dev/null
@@ -1,463 +0,0 @@
-<?xml version="1.0" standalone="no"?> <!--*- mode: xml -*-->
-<!DOCTYPE glade-interface SYSTEM "http://glade.gnome.org/glade-2.0.dtd">
-
-<glade-interface>
-
-<widget class="GtkWindow" id="task-details-toplevel">
-  <property name="title" translatable="yes">window1</property>
-  <property name="type">GTK_WINDOW_TOPLEVEL</property>
-  <property name="window_position">GTK_WIN_POS_NONE</property>
-  <property name="modal">False</property>
-  <property name="resizable">True</property>
-  <property name="destroy_with_parent">False</property>
-  <property name="decorated">True</property>
-  <property name="skip_taskbar_hint">False</property>
-  <property name="skip_pager_hint">False</property>
-  <property name="type_hint">GDK_WINDOW_TYPE_HINT_NORMAL</property>
-  <property name="gravity">GDK_GRAVITY_NORTH_WEST</property>
-
-  <child>
-    <widget class="GtkVBox" id="task-details-page">
-      <property name="border_width">12</property>
-      <property name="visible">True</property>
-      <property name="homogeneous">False</property>
-      <property name="spacing">6</property>
-
-      <child>
-	<widget class="GtkLabel" id="label20">
-	  <property name="visible">True</property>
-	  <property name="label" translatable="yes">&lt;span weight=&quot;bold&quot;&gt;Status&lt;/span&gt;</property>
-	  <property name="use_underline">False</property>
-	  <property name="use_markup">True</property>
-	  <property name="justify">GTK_JUSTIFY_LEFT</property>
-	  <property name="wrap">False</property>
-	  <property name="selectable">False</property>
-	  <property name="xalign">0</property>
-	  <property name="yalign">0.5</property>
-	  <property name="xpad">0</property>
-	  <property name="ypad">0</property>
-	</widget>
-	<packing>
-	  <property name="padding">0</property>
-	  <property name="expand">False</property>
-	  <property name="fill">False</property>
-	</packing>
-      </child>
-
-      <child>
-	<widget class="GtkHBox" id="hbox2">
-	  <property name="visible">True</property>
-	  <property name="homogeneous">False</property>
-	  <property name="spacing">0</property>
-
-	  <child>
-	    <widget class="GtkLabel" id="label21">
-	      <property name="visible">True</property>
-	      <property name="label" translatable="yes"></property>
-	      <property name="use_underline">False</property>
-	      <property name="use_markup">False</property>
-	      <property name="justify">GTK_JUSTIFY_LEFT</property>
-	      <property name="wrap">False</property>
-	      <property name="selectable">False</property>
-	      <property name="xalign">0.5</property>
-	      <property name="yalign">0.5</property>
-	      <property name="xpad">12</property>
-	      <property name="ypad">0</property>
-	    </widget>
-	    <packing>
-	      <property name="padding">0</property>
-	      <property name="expand">False</property>
-	      <property name="fill">False</property>
-	    </packing>
-	  </child>
-
-	  <child>
-	    <widget class="GtkTable" id="table3">
-	      <property name="visible">True</property>
-	      <property name="n_rows">4</property>
-	      <property name="n_columns">2</property>
-	      <property name="homogeneous">False</property>
-	      <property name="row_spacing">6</property>
-	      <property name="column_spacing">12</property>
-
-	      <child>
-		<widget class="GtkLabel" id="label17">
-		  <property name="visible">True</property>
-		  <property name="label" translatable="yes">_Status:</property>
-		  <property name="use_underline">True</property>
-		  <property name="use_markup">False</property>
-		  <property name="justify">GTK_JUSTIFY_CENTER</property>
-		  <property name="wrap">False</property>
-		  <property name="selectable">False</property>
-		  <property name="xalign">0</property>
-		  <property name="yalign">0.5</property>
-		  <property name="xpad">0</property>
-		  <property name="ypad">0</property>
-		  <property name="mnemonic_widget">status</property>
-		</widget>
-		<packing>
-		  <property name="left_attach">0</property>
-		  <property name="right_attach">1</property>
-		  <property name="top_attach">0</property>
-		  <property name="bottom_attach">1</property>
-		  <property name="x_options">fill</property>
-		  <property name="y_options"></property>
-		</packing>
-	      </child>
-
-	      <child>
-		<widget class="GtkLabel" id="label19">
-		  <property name="visible">True</property>
-		  <property name="label" translatable="yes">P_ercent complete:</property>
-		  <property name="use_underline">True</property>
-		  <property name="use_markup">False</property>
-		  <property name="justify">GTK_JUSTIFY_CENTER</property>
-		  <property name="wrap">False</property>
-		  <property name="selectable">False</property>
-		  <property name="xalign">0</property>
-		  <property name="yalign">0.5</property>
-		  <property name="xpad">0</property>
-		  <property name="ypad">0</property>
-		  <property name="mnemonic_widget">percent-complete</property>
-		</widget>
-		<packing>
-		  <property name="left_attach">0</property>
-		  <property name="right_attach">1</property>
-		  <property name="top_attach">1</property>
-		  <property name="bottom_attach">2</property>
-		  <property name="x_options">fill</property>
-		  <property name="y_options"></property>
-		</packing>
-	      </child>
-
-	      <child>
-		<widget class="GtkLabel" id="label18">
-		  <property name="visible">True</property>
-		  <property name="label" translatable="yes">_Priority:</property>
-		  <property name="use_underline">True</property>
-		  <property name="use_markup">False</property>
-		  <property name="justify">GTK_JUSTIFY_CENTER</property>
-		  <property name="wrap">False</property>
-		  <property name="selectable">False</property>
-		  <property name="xalign">0</property>
-		  <property name="yalign">0.5</property>
-		  <property name="xpad">0</property>
-		  <property name="ypad">0</property>
-		  <property name="mnemonic_widget">priority</property>
-		</widget>
-		<packing>
-		  <property name="left_attach">0</property>
-		  <property name="right_attach">1</property>
-		  <property name="top_attach">2</property>
-		  <property name="bottom_attach">3</property>
-		  <property name="x_options">fill</property>
-		  <property name="y_options"></property>
-		</packing>
-	      </child>
-
-	      <child>
-		<widget class="GtkLabel" id="date_completed_label">
-		  <property name="visible">True</property>
-		  <property name="label" translatable="yes">_Date completed:</property>
-		  <property name="use_underline">True</property>
-		  <property name="use_markup">False</property>
-		  <property name="justify">GTK_JUSTIFY_CENTER</property>
-		  <property name="wrap">False</property>
-		  <property name="selectable">False</property>
-		  <property name="xalign">0</property>
-		  <property name="yalign">0.5</property>
-		  <property name="xpad">0</property>
-		  <property name="ypad">0</property>
-		</widget>
-		<packing>
-		  <property name="left_attach">0</property>
-		  <property name="right_attach">1</property>
-		  <property name="top_attach">3</property>
-		  <property name="bottom_attach">4</property>
-		  <property name="x_options">fill</property>
-		  <property name="y_options"></property>
-		</packing>
-	      </child>
-
-	      <child>
-		<widget class="GtkOptionMenu" id="priority">
-		  <property name="visible">True</property>
-		  <property name="can_focus">True</property>
-		  <property name="history">0</property>
-
-		  <child internal-child="menu">
-		    <widget class="GtkMenu" id="convertwidget7">
-		      <property name="visible">True</property>
-
-		      <child>
-			<widget class="GtkMenuItem" id="convertwidget8">
-			  <property name="visible">True</property>
-			  <property name="label" translatable="yes">High</property>
-			  <property name="use_underline">True</property>
-			</widget>
-		      </child>
-
-		      <child>
-			<widget class="GtkMenuItem" id="convertwidget9">
-			  <property name="visible">True</property>
-			  <property name="label" translatable="yes">Normal</property>
-			  <property name="use_underline">True</property>
-			</widget>
-		      </child>
-
-		      <child>
-			<widget class="GtkMenuItem" id="convertwidget10">
-			  <property name="visible">True</property>
-			  <property name="label" translatable="yes">Low</property>
-			  <property name="use_underline">True</property>
-			</widget>
-		      </child>
-
-		      <child>
-			<widget class="GtkMenuItem" id="convertwidget11">
-			  <property name="visible">True</property>
-			  <property name="label" translatable="yes">Undefined</property>
-			  <property name="use_underline">True</property>
-			</widget>
-		      </child>
-		    </widget>
-		  </child>
-		</widget>
-		<packing>
-		  <property name="left_attach">1</property>
-		  <property name="right_attach">2</property>
-		  <property name="top_attach">2</property>
-		  <property name="bottom_attach">3</property>
-		  <property name="x_options">fill</property>
-		  <property name="y_options"></property>
-		</packing>
-	      </child>
-
-	      <child>
-		<widget class="GtkOptionMenu" id="status">
-		  <property name="visible">True</property>
-		  <property name="can_focus">True</property>
-		  <property name="history">0</property>
-
-		  <child internal-child="menu">
-		    <widget class="GtkMenu" id="convertwidget1">
-		      <property name="visible">True</property>
-
-		      <child>
-			<widget class="GtkMenuItem" id="convertwidget2">
-			  <property name="visible">True</property>
-			  <property name="label" translatable="yes">Not Started</property>
-			  <property name="use_underline">True</property>
-			</widget>
-		      </child>
-
-		      <child>
-			<widget class="GtkMenuItem" id="convertwidget3">
-			  <property name="visible">True</property>
-			  <property name="label" translatable="yes">In Progress</property>
-			  <property name="use_underline">True</property>
-			</widget>
-		      </child>
-
-		      <child>
-			<widget class="GtkMenuItem" id="convertwidget5">
-			  <property name="visible">True</property>
-			  <property name="label" translatable="yes">Completed</property>
-			  <property name="use_underline">True</property>
-			</widget>
-		      </child>
-
-		      <child>
-			<widget class="GtkMenuItem" id="convertwidget6">
-			  <property name="visible">True</property>
-			  <property name="label" translatable="yes">Cancelled</property>
-			  <property name="use_underline">True</property>
-			</widget>
-		      </child>
-		    </widget>
-		  </child>
-		</widget>
-		<packing>
-		  <property name="left_attach">1</property>
-		  <property name="right_attach">2</property>
-		  <property name="top_attach">0</property>
-		  <property name="bottom_attach">1</property>
-		  <property name="x_options">fill</property>
-		  <property name="y_options"></property>
-		</packing>
-	      </child>
-
-	      <child>
-		<widget class="GtkSpinButton" id="percent-complete">
-		  <property name="visible">True</property>
-		  <property name="can_focus">True</property>
-		  <property name="climb_rate">1</property>
-		  <property name="digits">0</property>
-		  <property name="numeric">True</property>
-		  <property name="update_policy">GTK_UPDATE_ALWAYS</property>
-		  <property name="snap_to_ticks">False</property>
-		  <property name="wrap">False</property>
-		  <property name="adjustment">0 0 100 1 10 10</property>
-		</widget>
-		<packing>
-		  <property name="left_attach">1</property>
-		  <property name="right_attach">2</property>
-		  <property name="top_attach">1</property>
-		  <property name="bottom_attach">2</property>
-		  <property name="x_options">fill</property>
-		  <property name="y_options"></property>
-		</packing>
-	      </child>
-
-	      <child>
-		<widget class="Custom" id="completed-date">
-		  <property name="visible">True</property>
-		  <property name="creation_function">task_details_page_create_date_edit</property>
-		  <property name="int1">0</property>
-		  <property name="int2">0</property>
-		  <property name="last_modification_time">Fri, 01 Jun 2001 18:58:51 GMT</property>
-		  <accessibility>
-		    <atkrelation target="date_completed_label" type="labelled-by"/>
-		  </accessibility>
-		</widget>
-		<packing>
-		  <property name="left_attach">1</property>
-		  <property name="right_attach">2</property>
-		  <property name="top_attach">3</property>
-		  <property name="bottom_attach">4</property>
-		  <property name="x_options">fill</property>
-		  <property name="y_options"></property>
-		</packing>
-	      </child>
-	    </widget>
-	    <packing>
-	      <property name="padding">0</property>
-	      <property name="expand">True</property>
-	      <property name="fill">True</property>
-	    </packing>
-	  </child>
-	</widget>
-	<packing>
-	  <property name="padding">0</property>
-	  <property name="expand">False</property>
-	  <property name="fill">False</property>
-	</packing>
-      </child>
-
-      <child>
-	<widget class="GtkLabel" id="label22">
-	  <property name="visible">True</property>
-	  <property name="label" translatable="yes">&lt;span weight=&quot;bold&quot;&gt;Miscellaneous&lt;/span&gt;</property>
-	  <property name="use_underline">False</property>
-	  <property name="use_markup">True</property>
-	  <property name="justify">GTK_JUSTIFY_LEFT</property>
-	  <property name="wrap">False</property>
-	  <property name="selectable">False</property>
-	  <property name="xalign">0</property>
-	  <property name="yalign">0.5</property>
-	  <property name="xpad">0</property>
-	  <property name="ypad">0</property>
-	</widget>
-	<packing>
-	  <property name="padding">0</property>
-	  <property name="expand">False</property>
-	  <property name="fill">False</property>
-	</packing>
-      </child>
-
-      <child>
-	<widget class="GtkHBox" id="hbox3">
-	  <property name="visible">True</property>
-	  <property name="homogeneous">False</property>
-	  <property name="spacing">0</property>
-
-	  <child>
-	    <widget class="GtkLabel" id="label23">
-	      <property name="visible">True</property>
-	      <property name="label" translatable="yes"></property>
-	      <property name="use_underline">False</property>
-	      <property name="use_markup">False</property>
-	      <property name="justify">GTK_JUSTIFY_LEFT</property>
-	      <property name="wrap">False</property>
-	      <property name="selectable">False</property>
-	      <property name="xalign">0.5</property>
-	      <property name="yalign">0.5</property>
-	      <property name="xpad">12</property>
-	      <property name="ypad">0</property>
-	    </widget>
-	    <packing>
-	      <property name="padding">0</property>
-	      <property name="expand">False</property>
-	      <property name="fill">False</property>
-	    </packing>
-	  </child>
-
-	  <child>
-	    <widget class="GtkTable" id="table2">
-	      <property name="border_width">6</property>
-	      <property name="visible">True</property>
-	      <property name="n_rows">1</property>
-	      <property name="n_columns">2</property>
-	      <property name="homogeneous">False</property>
-	      <property name="row_spacing">6</property>
-	      <property name="column_spacing">6</property>
-
-	      <child>
-		<widget class="GtkLabel" id="url_label">
-		  <property name="visible">True</property>
-		  <property name="label" translatable="yes">_Web Page:</property>
-		  <property name="use_underline">True</property>
-		  <property name="use_markup">False</property>
-		  <property name="justify">GTK_JUSTIFY_CENTER</property>
-		  <property name="wrap">False</property>
-		  <property name="selectable">False</property>
-		  <property name="xalign">0</property>
-		  <property name="yalign">0.5</property>
-		  <property name="xpad">0</property>
-		  <property name="ypad">0</property>
-		</widget>
-		<packing>
-		  <property name="left_attach">0</property>
-		  <property name="right_attach">1</property>
-		  <property name="top_attach">0</property>
-		  <property name="bottom_attach">1</property>
-		  <property name="x_options">fill</property>
-		  <property name="y_options"></property>
-		</packing>
-	      </child>
-
-	      <child>
-		<widget class="Custom" id="url_entry">
-		  <property name="visible">True</property>
-		  <property name="creation_function">e_url_entry_new</property>
-		  <property name="int1">0</property>
-		  <property name="int2">0</property>
-		  <property name="last_modification_time">Fri, 08 Feb 2002 21:02:37 GMT</property>
-		</widget>
-		<packing>
-		  <property name="left_attach">1</property>
-		  <property name="right_attach">2</property>
-		  <property name="top_attach">0</property>
-		  <property name="bottom_attach">1</property>
-		  <property name="y_options">fill</property>
-		</packing>
-	      </child>
-	    </widget>
-	    <packing>
-	      <property name="padding">0</property>
-	      <property name="expand">True</property>
-	      <property name="fill">True</property>
-	    </packing>
-	  </child>
-	</widget>
-	<packing>
-	  <property name="padding">0</property>
-	  <property name="expand">True</property>
-	  <property name="fill">True</property>
-	</packing>
-      </child>
-    </widget>
-  </child>
-</widget>
-
-</glade-interface>
diff --git a/calendar/gui/dialogs/task-details-page.h b/calendar/gui/dialogs/task-details-page.h
deleted file mode 100644
index 98b6832bbf..0000000000
--- a/calendar/gui/dialogs/task-details-page.h
+++ /dev/null
@@ -1,61 +0,0 @@
-/* Evolution calendar - Main page of the task editor dialog
- *
- * Copyright (C) 2001 Ximian, Inc.
- *
- * Authors: Federico Mena-Quintero <federico@ximian.com>
- *          Miguel de Icaza <miguel@ximian.com>
- *          Seth Alves <alves@hungry.com>
- *          JP Rosevear <jpr@ximian.com>
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of version 2 of the GNU General Public
- * License as published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307, USA.
- */
-
-#ifndef TASK_DETAILS_PAGE_H
-#define TASK_DETAILS_PAGE_H
-
-#include "comp-editor-page.h"
-
-G_BEGIN_DECLS
-
-
-
-#define TYPE_TASK_DETAILS_PAGE            (task_details_page_get_type ())
-#define TASK_DETAILS_PAGE(obj)            (G_TYPE_CHECK_INSTANCE_CAST ((obj), TYPE_TASK_DETAILS_PAGE, TaskDetailsPage))
-#define TASK_DETAILS_PAGE_CLASS(klass)    (G_TYPE_CHECK_CLASS_CAST ((klass), TYPE_TASK_DETAILS_PAGE, TaskDetailsPageClass))
-#define IS_TASK_DETAILS_PAGE(obj)         (G_TYPE_CHECK_INSTANCE_TYPE ((obj), TYPE_TASK_DETAILS_PAGE))
-#define IS_TASK_DETAILS_PAGE_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((obj), TYPE_TASK_DETAILS_PAGE))
-
-typedef struct _TaskDetailsPagePrivate TaskDetailsPagePrivate;
-
-typedef struct {
-	CompEditorPage page;
-
-	/* Private data */
-	TaskDetailsPagePrivate *priv;
-} TaskDetailsPage;
-
-typedef struct {
-	CompEditorPageClass parent_class;
-} TaskDetailsPageClass;
-
-
-GtkType          task_details_page_get_type        (void);
-TaskDetailsPage *task_details_page_construct       (TaskDetailsPage *tdpage);
-TaskDetailsPage *task_details_page_new             (void);
-
-
-
-G_END_DECLS
-
-#endif
diff --git a/calendar/gui/dialogs/task-editor.c b/calendar/gui/dialogs/task-editor.c
deleted file mode 100644
index b28814f18e..0000000000
--- a/calendar/gui/dialogs/task-editor.c
+++ /dev/null
@@ -1,449 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-/* Evolution calendar - Task editor dialog
- *
- * Copyright (C) 2000 Ximian, Inc.
- * Copyright (C) 2001 Ximian, Inc.
- *
- * Authors: Miguel de Icaza <miguel@ximian.com>
- *          Federico Mena-Quintero <federico@ximian.com>
- *          Seth Alves <alves@hungry.com>
- *          JP Rosevear <jpr@ximian.com>
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of version 2 of the GNU General Public
- * License as published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307, USA.
- */
-
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
-
-#include <string.h>
-#include <glade/glade.h>
-#include <libgnome/gnome-i18n.h>
-
-#include "task-page.h"
-#include "task-details-page.h"
-#include "meeting-page.h"
-#include "cancel-comp.h"
-#include "task-editor.h"
-
-struct _TaskEditorPrivate {
-	TaskPage *task_page;
-	TaskDetailsPage *task_details_page;
-	MeetingPage *meet_page;
-
-	EMeetingStore *model;
-	
-	gboolean assignment_shown;
-	gboolean is_assigned;
-	gboolean updating;	
-};
-
-
-
-static void task_editor_set_e_cal (CompEditor *editor, ECal *client);
-static void task_editor_edit_comp (CompEditor *editor, ECalComponent *comp);
-static gboolean task_editor_send_comp (CompEditor *editor, ECalComponentItipMethod method);
-static void task_editor_finalize (GObject *object);
-
-static void assign_task_cmd (GtkWidget *widget, gpointer data);
-static void refresh_task_cmd (GtkWidget *widget, gpointer data);
-static void cancel_task_cmd (GtkWidget *widget, gpointer data);
-static void forward_cmd (GtkWidget *widget, gpointer data);
-
-static void model_row_change_insert_cb (GtkTreeModel *model, GtkTreePath *path, GtkTreeIter *iter, gpointer data);
-static void model_row_delete_cb (GtkTreeModel *model, GtkTreePath *path, gpointer data);
-
-G_DEFINE_TYPE (TaskEditor, task_editor, TYPE_COMP_EDITOR);
-
-/* Class initialization function for the event editor */
-static void
-task_editor_class_init (TaskEditorClass *klass)
-{
-	GObjectClass *object_class;
-	CompEditorClass *editor_class;
-
-	object_class = (GObjectClass *) klass;
-	editor_class = (CompEditorClass *) klass;
-
-	editor_class->set_e_cal = task_editor_set_e_cal;
-	editor_class->edit_comp = task_editor_edit_comp;
-	editor_class->send_comp = task_editor_send_comp;
-
-	object_class->finalize = task_editor_finalize;
-}
-
-static void
-init_widgets (TaskEditor *te)
-{
-	TaskEditorPrivate *priv;
-
-	priv = te->priv;
-
-	g_signal_connect((priv->model), "row_changed",
-			    G_CALLBACK (model_row_change_insert_cb), te);
-	g_signal_connect((priv->model), "row_inserted",
-			    G_CALLBACK (model_row_change_insert_cb), te);
-	g_signal_connect((priv->model), "row_deleted",
-			    G_CALLBACK (model_row_delete_cb), te);
-}
-
-static void
-client_changed_cb (CompEditorPage *page, ECal *client, gpointer user_data)
-{
-//	set_menu_sens (TASK_EDITOR (user_data));
-}
-
-/* Object initialization function for the task editor */
-static void
-task_editor_init (TaskEditor *te)
-{
-	TaskEditorPrivate *priv;
-	
-	priv = g_new0 (TaskEditorPrivate, 1);
-	te->priv = priv;
-
-	priv->model = E_MEETING_STORE (e_meeting_store_new ());
-	priv->assignment_shown = TRUE;
-	priv->updating = FALSE;	
-	priv->is_assigned = FALSE;
-
-	comp_editor_set_help_section (COMP_EDITOR (te), "usage-calendar-todo");
-}
-
-TaskEditor *
-task_editor_construct (TaskEditor *te, ECal *client, gboolean is_assigned)
-{
-	TaskEditorPrivate *priv;
-	
-	priv = te->priv;
-
-	priv->is_assigned = is_assigned;
-	priv->task_page = task_page_new ();
-	g_object_ref (priv->task_page);
-	gtk_object_sink (GTK_OBJECT (priv->task_page));
-	comp_editor_append_page (COMP_EDITOR (te), 
-				 COMP_EDITOR_PAGE (priv->task_page),
-				 _("Task"));
-	g_signal_connect (G_OBJECT (priv->task_page), "client_changed",
-			  G_CALLBACK (client_changed_cb), te);
-
-	priv->task_details_page = task_details_page_new ();
-	g_object_ref (priv->task_details_page);
-	gtk_object_sink (GTK_OBJECT (priv->task_details_page));
-	comp_editor_append_page (COMP_EDITOR (te),
-				 COMP_EDITOR_PAGE (priv->task_details_page),
-				 _("Status"));
-	if (priv->is_assigned) {
-		if (e_cal_get_static_capability (client, CAL_STATIC_CAPABILITY_REQ_SEND_OPTIONS))
-			task_page_show_options (priv->task_page);
-
-		comp_editor_set_group_item (COMP_EDITOR (te), TRUE);
-		priv->meet_page = meeting_page_new (priv->model, client);
-		g_object_ref (priv->meet_page);
-		gtk_object_sink (GTK_OBJECT (priv->meet_page));
-		comp_editor_append_page (COMP_EDITOR (te),
-					 COMP_EDITOR_PAGE (priv->meet_page),
-					 _("Assignment"));
-	}
-
-	comp_editor_set_e_cal (COMP_EDITOR (te), client);
-
-	init_widgets (te);
-
-	return te;
-}
-
-static void
-task_editor_set_e_cal (CompEditor *editor, ECal *client)
-{
-	TaskEditor *te;
-	TaskEditorPrivate *priv;
-
-	te = TASK_EDITOR (editor);
-	priv = te->priv;
-
-	e_meeting_store_set_e_cal (priv->model, client);
-
-	if (COMP_EDITOR_CLASS (task_editor_parent_class)->set_e_cal)
-		COMP_EDITOR_CLASS (task_editor_parent_class)->set_e_cal (editor, client);
-}
-
-static void
-task_editor_edit_comp (CompEditor *editor, ECalComponent *comp)
-{
-	TaskEditor *te;
-	TaskEditorPrivate *priv;
-	ECalComponentOrganizer organizer;
-	ECal *client;
-	GSList *attendees = NULL;
-	
-	te = TASK_EDITOR (editor);
-	priv = te->priv;
-
-	priv->updating = TRUE;
-
-	if (COMP_EDITOR_CLASS (task_editor_parent_class)->edit_comp)
-		COMP_EDITOR_CLASS (task_editor_parent_class)->edit_comp (editor, comp);
-
-	client = comp_editor_get_e_cal (COMP_EDITOR (editor));
-
-	/* Get meeting related stuff */
-	e_cal_component_get_organizer (comp, &organizer);
-	e_cal_component_get_attendee_list (comp, &attendees);
-	
-	/* Clear things up */
-	e_meeting_store_remove_all_attendees (priv->model);
-
-	if (attendees == NULL) {
-		comp_editor_remove_page (editor, COMP_EDITOR_PAGE (priv->meet_page));
-		priv->assignment_shown = FALSE;
-	} else {
-		GSList *l;
-		int row;
-		
-		task_page_hide_options (priv->task_page);		
-		if (!priv->assignment_shown)
-			comp_editor_append_page (COMP_EDITOR (te),
-						 COMP_EDITOR_PAGE (priv->meet_page),
-						 _("Assignment"));
-
-		for (l = attendees; l != NULL; l = l->next) {
-			ECalComponentAttendee *ca = l->data;
-			EMeetingAttendee *ia;
-
-			ia = E_MEETING_ATTENDEE (e_meeting_attendee_new_from_e_cal_component_attendee (ca));
-			/* If we aren't the organizer or the attendee is just delegating, don't allow editing */
-			if (!comp_editor_get_user_org (editor) || e_meeting_attendee_is_set_delto (ia))
- 				e_meeting_attendee_set_edit_level (ia,  E_MEETING_ATTENDEE_EDIT_NONE);
-  			e_meeting_store_add_attendee (priv->model, ia);			
-
-			g_object_unref(ia);
-		}
-
-		/* If we aren't the organizer we can still change our own status */
-		if (!comp_editor_get_user_org (editor)) {
-			EAccountList *accounts;
-			EAccount *account;
-			EIterator *it;
-
-			accounts = itip_addresses_get ();
-			for (it = e_list_get_iterator((EList *)accounts);e_iterator_is_valid(it);e_iterator_next(it)) {
-				EMeetingAttendee *ia;
-
-				account = (EAccount*)e_iterator_get(it);
-
-				ia = e_meeting_store_find_attendee (priv->model, account->id->address, &row);
-				if (ia != NULL)
-					e_meeting_attendee_set_edit_level (ia, E_MEETING_ATTENDEE_EDIT_STATUS);
-			}
-			g_object_unref(it);
-		} else if (e_cal_get_organizer_must_attend (client)) {
-			EMeetingAttendee *ia;
-
-			ia = e_meeting_store_find_attendee (priv->model, organizer.value, &row);
-			if (ia != NULL)
-				e_meeting_attendee_set_edit_level (ia, E_MEETING_ATTENDEE_EDIT_NONE);
-		}
-		
-		
-		comp_editor_set_group_item (COMP_EDITOR (te), TRUE);
-		priv->assignment_shown = TRUE;		
-	}
-	e_cal_component_free_attendee_list (attendees);
-
-	comp_editor_set_needs_send (COMP_EDITOR (te), priv->assignment_shown && itip_organizer_is_user (comp, client));
-
-	priv->updating = FALSE;
-}
-
-static gboolean
-task_editor_send_comp (CompEditor *editor, ECalComponentItipMethod method)
-{
-	TaskEditor *te = TASK_EDITOR (editor);
-	TaskEditorPrivate *priv;
-	ECalComponent *comp = NULL;
-
-	priv = te->priv;
-
-	/* Don't cancel more than once or when just publishing */
-	if (method == E_CAL_COMPONENT_METHOD_PUBLISH ||
-	    method == E_CAL_COMPONENT_METHOD_CANCEL)
-		goto parent;
-	
-	comp = meeting_page_get_cancel_comp (priv->meet_page);
-	if (comp != NULL) {
-		ECal *client;
-		gboolean result;
-		
-		client = e_meeting_store_get_e_cal (priv->model);
-		result = itip_send_comp (E_CAL_COMPONENT_METHOD_CANCEL, comp,
-				client, NULL, NULL);
-		g_object_unref (comp);
-
-		if (!result)
-			return FALSE;
-	}
-
- parent:
-	if (COMP_EDITOR_CLASS (task_editor_parent_class)->send_comp)
-		return COMP_EDITOR_CLASS (task_editor_parent_class)->send_comp (editor, method);
-
-	return FALSE;
-}
-
-/* Destroy handler for the event editor */
-static void
-task_editor_finalize (GObject *object)
-{
-	TaskEditor *te;
-	TaskEditorPrivate *priv;
-
-	g_return_if_fail (object != NULL);
-	g_return_if_fail (IS_TASK_EDITOR (object));
-
-	te = TASK_EDITOR (object);
-	priv = te->priv;
-
-	if (priv->task_page) {
-		g_object_unref (priv->task_page);
-		priv->task_page = NULL;
-	}
-
-	if (priv->task_details_page) {
-		g_object_unref (priv->task_details_page);
-		priv->task_details_page = NULL;
-	}
-	
-	if (priv->meet_page) {	
-		g_object_unref (priv->meet_page);
-		priv->meet_page = NULL;
-	}
-	
-	if (priv->model) {
-		g_object_unref (priv->model);
-		priv->model = NULL;
-	}
-	
-	g_free (priv);
-
-	if (G_OBJECT_CLASS (task_editor_parent_class)->finalize)
-		(* G_OBJECT_CLASS (task_editor_parent_class)->finalize) (object);
-}
-
-/**
- * task_editor_new:
- * @client: a ECal
- *
- * Creates a new event editor dialog.
- *
- * Return value: A newly-created event editor dialog, or NULL if the event
- * editor could not be created.
- **/
-TaskEditor *
-task_editor_new (ECal *client, gboolean is_assigned)
-{
-	TaskEditor *te;
-
-	te = g_object_new (TYPE_TASK_EDITOR, NULL);
-	return task_editor_construct (te, client, is_assigned);
-}
-
-static void
-show_assignment (TaskEditor *te)
-{
-	TaskEditorPrivate *priv;
-
-	priv = te->priv;
-
-	task_page_set_assignment (priv->task_page, TRUE);
-	if (!priv->assignment_shown) {
-		comp_editor_append_page (COMP_EDITOR (te),
-					 COMP_EDITOR_PAGE (priv->meet_page),
-					 _("Assignment"));
-		priv->assignment_shown = TRUE;
-
-		comp_editor_set_needs_send (COMP_EDITOR (te), priv->assignment_shown);
-		comp_editor_set_changed (COMP_EDITOR (te), FALSE);
-	}
-
-}
-
-void
-task_editor_show_assignment (TaskEditor *te)
-{
-	g_return_if_fail (te != NULL);
-	g_return_if_fail (IS_TASK_EDITOR (te));
-
-	show_assignment (te);
-}
-
-static void
-assign_task_cmd (GtkWidget *widget, gpointer data)
-{
-	TaskEditor *te = TASK_EDITOR (data);
-
-	show_assignment (te);
-}
-
-static void
-refresh_task_cmd (GtkWidget *widget, gpointer data)
-{
-	TaskEditor *te = TASK_EDITOR (data);
-
-	comp_editor_send_comp (COMP_EDITOR (te), E_CAL_COMPONENT_METHOD_REFRESH);
-}
-
-static void
-cancel_task_cmd (GtkWidget *widget, gpointer data)
-{
-	TaskEditor *te = TASK_EDITOR (data);
-	ECalComponent *comp;
-	
-	comp = comp_editor_get_current_comp (COMP_EDITOR (te));
-	if (cancel_component_dialog ((GtkWindow *) te,
-				     comp_editor_get_e_cal (COMP_EDITOR (te)), comp, FALSE)) {
-		comp_editor_send_comp (COMP_EDITOR (te), E_CAL_COMPONENT_METHOD_CANCEL);
-		comp_editor_delete_comp (COMP_EDITOR (te));
-	}
-}
-
-static void
-forward_cmd (GtkWidget *widget, gpointer data)
-{
-	TaskEditor *te = TASK_EDITOR (data);
-	
-	if (comp_editor_save_comp (COMP_EDITOR (te), TRUE))
-		comp_editor_send_comp (COMP_EDITOR (te), E_CAL_COMPONENT_METHOD_PUBLISH);
-}
-
-static void
-model_changed (TaskEditor *te)
-{
-	if (!te->priv->updating) {
-		comp_editor_set_changed (COMP_EDITOR (te), TRUE);
-		comp_editor_set_needs_send (COMP_EDITOR (te), TRUE);
-	}	
-}
-
-static void
-model_row_change_insert_cb (GtkTreeModel *model, GtkTreePath *path, GtkTreeIter *iter, gpointer data)
-{
-	model_changed (TASK_EDITOR (data));
-}
-
-static void
-model_row_delete_cb (GtkTreeModel *model, GtkTreePath *path, gpointer data)
-{
-	model_changed (TASK_EDITOR (data));
-}
diff --git a/calendar/gui/dialogs/task-editor.h b/calendar/gui/dialogs/task-editor.h
deleted file mode 100644
index d1b8b327d5..0000000000
--- a/calendar/gui/dialogs/task-editor.h
+++ /dev/null
@@ -1,61 +0,0 @@
-/* Evolution calendar - Task editor dialog
- *
- * Copyright (C) 2000 Ximian, Inc.
- * Copyright (C) 2001 Ximian, Inc.
- *
- * Authors: Miguel de Icaza <miguel@ximian.com>
- *          Federico Mena-Quintero <federico@ximian.com>
- *          Seth Alves <alves@hungry.com>
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of version 2 of the GNU General Public
- * License as published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public 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 "comp-editor.h"
-
-
-
-#define TYPE_TASK_EDITOR            (task_editor_get_type ())
-#define TASK_EDITOR(obj)            (G_TYPE_CHECK_INSTANCE_CAST ((obj), TYPE_TASK_EDITOR, TaskEditor))
-#define TASK_EDITOR_CLASS(klass)    (G_TYPE_CHECK_CLASS_CAST ((klass), TYPE_TASK_EDITOR,	\
-				      TaskEditorClass))
-#define IS_TASK_EDITOR(obj)         (G_TYPE_CHECK_INSTANCE_TYPE ((obj), TYPE_TASK_EDITOR))
-#define IS_TASK_EDITOR_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), TYPE_TASK_EDITOR))
-
-typedef struct _TaskEditor TaskEditor;
-typedef struct _TaskEditorClass TaskEditorClass;
-typedef struct _TaskEditorPrivate TaskEditorPrivate;
-
-struct _TaskEditor {
-	CompEditor parent;
-
-	/* Private data */
-	TaskEditorPrivate *priv;
-};
-
-struct _TaskEditorClass {
-	CompEditorClass parent_class;
-};
-
-GtkType     task_editor_get_type       (void);
-TaskEditor *task_editor_construct      (TaskEditor *te,
-					ECal  *client, gboolean is_assigned);
-TaskEditor *task_editor_new            (ECal  *client, gboolean is_assigned);
-void        task_editor_show_assignment(TaskEditor *te);
-
-
-#endif /* __TASK_EDITOR_H__ */
diff --git a/calendar/gui/dialogs/task-page.c b/calendar/gui/dialogs/task-page.c
deleted file mode 100644
index 04aca3ebba..0000000000
--- a/calendar/gui/dialogs/task-page.c
+++ /dev/null
@@ -1,1089 +0,0 @@
-/* Evolution calendar - Main page of the task editor dialog
- *
- * Copyright (C) 2001 Ximian, Inc.
- *
- * Authors: Federico Mena-Quintero <federico@ximian.com>
- *          Miguel de Icaza <miguel@ximian.com>
- *          Seth Alves <alves@hungry.com>
- *          JP Rosevear <jpr@ximian.com>
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of version 2 of the GNU General Public
- * License as published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307, USA.
- */
-
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
-
-#include <string.h>
-#include <gtk/gtksignal.h>
-#include <gtk/gtktextview.h>
-#include <gtk/gtktogglebutton.h>
-#include <gtk/gtkspinbutton.h>
-#include <gtk/gtkoptionmenu.h>
-#include <gtk/gtkmessagedialog.h>
-#include <libgnome/gnome-i18n.h>
-#include <glade/glade.h>
-#include <gal/widgets/e-categories.h>
-#include <libedataserverui/e-source-option-menu.h>
-#include <widgets/misc/e-dateedit.h>
-#include "common/authentication.h"
-#include "e-util/e-dialog-widgets.h"
-#include "e-util/e-categories-config.h"
-#include "../e-timezone-entry.h"
-#include "../calendar-config.h"
-#include "comp-editor.h"
-#include "comp-editor-util.h"
-#include "e-send-options-utils.h"
-#include "task-page.h"
-
-
-
-/* Private part of the TaskPage structure */
-struct _TaskPagePrivate {
-	/* Glade XML data */
-	GladeXML *xml;
-
-	/* Widgets from the Glade file */
-	GtkWidget *main;
-
-	GtkWidget *summary;
-	GtkWidget *summary_label;
-
-	GtkWidget *due_date;
-	GtkWidget *start_date;
-	GtkWidget *due_timezone;
-	GtkWidget *start_timezone;
-
-	GtkWidget *description;
-
-	GtkWidget *classification;
-
-	GtkWidget *categories_btn;
-	GtkWidget *categories;
-
-	GtkWidget *source_selector;
-	GtkWidget *sendoptions_frame;
-	GtkWidget *sendoptions_button;
-
-	gboolean updating;
-	gboolean sendoptions_shown;
-	gboolean is_assignment;
-
-	ESendOptionsDialog *sod;
-};
-
-static const int classification_map[] = {
-	E_CAL_COMPONENT_CLASS_PUBLIC,
-	E_CAL_COMPONENT_CLASS_PRIVATE,
-	E_CAL_COMPONENT_CLASS_CONFIDENTIAL,
-	-1
-};
-
-
-
-static void task_page_finalize (GObject *object);
-
-static GtkWidget *task_page_get_widget (CompEditorPage *page);
-static void task_page_focus_main_widget (CompEditorPage *page);
-static gboolean task_page_fill_widgets (CompEditorPage *page, ECalComponent *comp);
-static gboolean task_page_fill_component (CompEditorPage *page, ECalComponent *comp);
-static gboolean task_page_fill_timezones (CompEditorPage *page, GHashTable *timezones);
-static void task_page_set_summary (CompEditorPage *page, const char *summary);
-static void task_page_set_dates (CompEditorPage *page, CompEditorPageDates *dates);
-
-G_DEFINE_TYPE (TaskPage, task_page, TYPE_COMP_EDITOR_PAGE);
-
-/* Class initialization function for the task page */
-static void
-task_page_class_init (TaskPageClass *class)
-{
-	CompEditorPageClass *editor_page_class;
-	GObjectClass *object_class;
-
-	editor_page_class = (CompEditorPageClass *) class;
-	object_class = (GObjectClass *) class;
-
-	editor_page_class->get_widget = task_page_get_widget;
-	editor_page_class->focus_main_widget = task_page_focus_main_widget;
-	editor_page_class->fill_widgets = task_page_fill_widgets;
-	editor_page_class->fill_component = task_page_fill_component;
-	editor_page_class->fill_timezones = task_page_fill_timezones;
-	editor_page_class->set_summary = task_page_set_summary;
-	editor_page_class->set_dates = task_page_set_dates;
-
-	object_class->finalize = task_page_finalize;
-}
-
-/* Object initialization function for the task page */
-static void
-task_page_init (TaskPage *tpage)
-{
-	TaskPagePrivate *priv;
-
-	priv = g_new0 (TaskPagePrivate, 1);
-	tpage->priv = priv;
-
-	priv->xml = NULL;
-
-	priv->main = NULL;
-	priv->summary = NULL;
-	priv->summary_label = NULL;
-	priv->due_date = NULL;
-	priv->start_date = NULL;
-	priv->due_timezone = NULL;
-	priv->start_timezone = NULL;
-	priv->description = NULL;
-	priv->classification = NULL;
-	priv->categories_btn = NULL;
-	priv->categories = NULL;
-	priv->sendoptions_frame = NULL;
-	priv->sendoptions_button = NULL;
-	priv->sendoptions_shown = FALSE;
-	priv->sod = NULL;
-
-	priv->updating = FALSE;
-	priv->sendoptions_shown = FALSE;
-	priv->is_assignment = FALSE;
-}
-
-/* Destroy handler for the task page */
-static void
-task_page_finalize (GObject *object)
-{
-	TaskPage *tpage;
-	TaskPagePrivate *priv;
-
-	g_return_if_fail (object != NULL);
-	g_return_if_fail (IS_TASK_PAGE (object));
-
-	tpage = TASK_PAGE (object);
-	priv = tpage->priv;
-
-	if (priv->main)
-		gtk_widget_unref (priv->main);
-
-	if (priv->xml) {
-		g_object_unref (priv->xml);
-		priv->xml = NULL;
-	}
-	
-	if (priv->sod) {
-		g_object_unref (priv->sod);
-		priv->sod = NULL;
-	}
-	
-	g_free (priv);
-	tpage->priv = NULL;
-
-	if (G_OBJECT_CLASS (task_page_parent_class)->finalize)
-		(* G_OBJECT_CLASS (task_page_parent_class)->finalize) (object);
-}
-
-
-
-/* get_widget handler for the task page */
-static GtkWidget *
-task_page_get_widget (CompEditorPage *page)
-{
-	TaskPage *tpage;
-	TaskPagePrivate *priv;
-
-	tpage = TASK_PAGE (page);
-	priv = tpage->priv;
-
-	return priv->main;
-}
-
-/* focus_main_widget handler for the task page */
-static void
-task_page_focus_main_widget (CompEditorPage *page)
-{
-	TaskPage *tpage;
-	TaskPagePrivate *priv;
-
-	tpage = TASK_PAGE (page);
-	priv = tpage->priv;
-
-	gtk_widget_grab_focus (priv->summary);
-}
-
-/* Fills the widgets with default values */
-static void
-clear_widgets (TaskPage *tpage)
-{
-	TaskPagePrivate *priv;
-
-	priv = tpage->priv;
-
-	/* Summary, description */
-	e_dialog_editable_set (priv->summary, NULL);
-	gtk_text_buffer_set_text (gtk_text_view_get_buffer (GTK_TEXT_VIEW (priv->description)), "", 0);
-
-	/* Start, due times */
-	e_date_edit_set_time (E_DATE_EDIT (priv->start_date), 0);
-	e_date_edit_set_time (E_DATE_EDIT (priv->due_date), 0);
-
-	/* Classification */
-	e_dialog_option_menu_set (priv->classification, E_CAL_COMPONENT_CLASS_PRIVATE, classification_map);
-
-	/* Categories */
-	e_dialog_editable_set (priv->categories, NULL);
-}
-
-/* Decode the radio button group for classifications */
-static ECalComponentClassification
-classification_get (GtkWidget *widget)
-{
-	return e_dialog_option_menu_get (widget, classification_map);
-}
-
-static void
-sensitize_widgets (TaskPage *tpage)
-{
-	gboolean read_only;
-	TaskPagePrivate *priv;
-	
-	priv = tpage->priv;
-
-	if (!e_cal_is_read_only (COMP_EDITOR_PAGE (tpage)->client, &read_only, NULL))
-		read_only = TRUE;
-	
-	gtk_widget_set_sensitive (priv->summary_label, !read_only);
-	gtk_entry_set_editable (GTK_ENTRY (priv->summary), !read_only);
-	gtk_widget_set_sensitive (priv->due_date, !read_only);
-	gtk_widget_set_sensitive (priv->start_date, !read_only);
-	gtk_widget_set_sensitive (priv->due_timezone, !read_only);
-	gtk_widget_set_sensitive (priv->start_timezone, !read_only);
-	gtk_widget_set_sensitive (priv->description, !read_only);
-	gtk_widget_set_sensitive (priv->classification, !read_only);
-	gtk_widget_set_sensitive (priv->categories_btn, !read_only);
-	gtk_widget_set_sensitive (priv->sendoptions_button, !read_only);
-	gtk_entry_set_editable (GTK_ENTRY (priv->categories), !read_only);
-}
-void
-task_page_hide_options (TaskPage *page)
-{
-	g_return_if_fail (IS_TASK_PAGE (page));
-
-	gtk_widget_hide (page->priv->sendoptions_frame);
-
-	page->priv->sendoptions_shown = FALSE;
-	
-}
-void
-task_page_show_options (TaskPage *page)
-{
-	g_return_if_fail (IS_TASK_PAGE (page));
-	
-	gtk_widget_show (page->priv->sendoptions_frame);
-	page->priv->sendoptions_shown = TRUE;
-}
-
-void
-task_page_set_assignment (TaskPage *page, gboolean set)
-{
-	g_return_if_fail (IS_TASK_PAGE (page));
-
-	page->priv->is_assignment = set;
-}
-
-/* fill_widgets handler for the task page */
-static gboolean
-task_page_fill_widgets (CompEditorPage *page, ECalComponent *comp)
-{
-	TaskPage *tpage;
-	TaskPagePrivate *priv;
-	ECalComponentText text;
-	ECalComponentDateTime d;
-	ECalComponentClassification cl;
-	GSList *l;
-	icalcomponent *icalcomp;
-	const char *categories, *uid;
-	icaltimezone *zone, *default_zone;
-	ESource *source;
-
-	tpage = TASK_PAGE (page);
-	priv = tpage->priv;
-
-	priv->updating = TRUE;
-	
-	/* Clean the screen */
-	clear_widgets (tpage);
-
-        /* Summary, description(s) */
-	e_cal_component_get_summary (comp, &text);
-	e_dialog_editable_set (priv->summary, text.value);
-
-	e_cal_component_get_description_list (comp, &l);
-	if (l && l->data) {
-		ECalComponentText *dtext;
-		
-		dtext = l->data;
-		gtk_text_buffer_set_text (gtk_text_view_get_buffer (GTK_TEXT_VIEW (priv->description)),
-					  dtext->value ? dtext->value : "", -1);
-	} else {
-		gtk_text_buffer_set_text (gtk_text_view_get_buffer (GTK_TEXT_VIEW (priv->description)),
-					  "", 0);
-	}
-	e_cal_component_free_text_list (l);
-
-	default_zone = calendar_config_get_icaltimezone ();
-
-	/* Due Date. */
-	e_cal_component_get_due (comp, &d);
-	zone = NULL;
-	if (d.value) {
-		struct icaltimetype *due_tt = d.value;
-		e_date_edit_set_date (E_DATE_EDIT (priv->due_date),
-				      due_tt->year, due_tt->month,
-				      due_tt->day);
-		if (due_tt->is_date) {
-			e_date_edit_set_time_of_day (E_DATE_EDIT (priv->due_date),
-						     -1, -1);
-			zone = default_zone;
-		} else {
-			e_date_edit_set_time_of_day (E_DATE_EDIT (priv->due_date),
-						     due_tt->hour,
-						     due_tt->minute);
-		}
-	} else {
-		e_date_edit_set_time (E_DATE_EDIT (priv->due_date), -1);
-
-		/* If no time is set, we use the default timezone, so the
-		   user usually doesn't have to set this when they set the
-		   date. */
-		zone = default_zone;
-	}
-
-	/* Note that if we are creating a new task, the timezones may not be
-	   on the server, so we try to get the builtin timezone with the TZID
-	   first. */
-	if (!zone)
-		zone = icaltimezone_get_builtin_timezone_from_tzid (d.tzid);
-	if (!zone) {
-		if (!e_cal_get_timezone (page->client, d.tzid, &zone, NULL))
-			/* FIXME: Handle error better. */
-			g_warning ("Couldn't get timezone from server: %s",
-				   d.tzid ? d.tzid : "");
-	}
-	e_timezone_entry_set_timezone (E_TIMEZONE_ENTRY (priv->due_timezone),
-				       zone);
-
-	e_cal_component_free_datetime (&d);
-
-
-	/* Start Date. */
-	e_cal_component_get_dtstart (comp, &d);
-	zone = NULL;
-	if (d.value) {
-		struct icaltimetype *start_tt = d.value;
-		e_date_edit_set_date (E_DATE_EDIT (priv->start_date),
-				      start_tt->year, start_tt->month,
-				      start_tt->day);
-		if (start_tt->is_date) {
-			e_date_edit_set_time_of_day (E_DATE_EDIT (priv->start_date),
-						     -1, -1);
-			zone = default_zone;
-		} else {
-			e_date_edit_set_time_of_day (E_DATE_EDIT (priv->start_date),
-						     start_tt->hour,
-						     start_tt->minute);
-		}
-	} else {
-		e_date_edit_set_time (E_DATE_EDIT (priv->start_date), -1);
-
-		/* If no time is set, we use the default timezone, so the
-		   user usually doesn't have to set this when they set the
-		   date. */
-		zone = default_zone;
-	}
-
-	if (!zone)
-		zone = icaltimezone_get_builtin_timezone_from_tzid (d.tzid);
-	if (!zone) {
-		if (!e_cal_get_timezone (page->client, d.tzid, &zone, NULL))
-			/* FIXME: Handle error better. */
-			g_warning ("Couldn't get timezone from server: %s",
-				   d.tzid ? d.tzid : "");
-	}
-	e_timezone_entry_set_timezone (E_TIMEZONE_ENTRY (priv->start_timezone),
-				       zone);
-
-	e_cal_component_free_datetime (&d);
-
-	/* Classification. */
-	e_cal_component_get_classification (comp, &cl);
-
-	switch (cl) {
-	case E_CAL_COMPONENT_CLASS_PUBLIC:
-	case E_CAL_COMPONENT_CLASS_PRIVATE:
-	case E_CAL_COMPONENT_CLASS_CONFIDENTIAL:
-		break;
-	default:
-		/* default to PUBLIC */
-		cl = E_CAL_COMPONENT_CLASS_PUBLIC;
-                break;
-	}
-	e_dialog_option_menu_set (priv->classification, cl, classification_map);
-
-	e_cal_component_get_uid (comp, &uid);
-	if (e_cal_get_object (COMP_EDITOR_PAGE (tpage)->client, uid, NULL, &icalcomp, NULL)) {
-		icalcomponent_free (icalcomp);
-		task_page_hide_options (tpage);
-	}
-
-	/* Categories */
-	e_cal_component_get_categories (comp, &categories);
-	e_dialog_editable_set (priv->categories, categories);
-
-	/* Source */
-	source = e_cal_get_source (page->client);
-	e_source_option_menu_select (E_SOURCE_OPTION_MENU (priv->source_selector), source);
-
-	priv->updating = FALSE;
-
-	sensitize_widgets (tpage);
-
-	return TRUE;
-}
-
-/* fill_component handler for the task page */
-static gboolean
-task_page_fill_component (CompEditorPage *page, ECalComponent *comp)
-{
-	TaskPage *tpage;
-	TaskPagePrivate *priv;
-	ECalComponentDateTime date;
-	struct icaltimetype start_tt, due_tt;
-	char *cat, *str;
-	gboolean start_date_set, due_date_set, time_set;
-	GtkTextBuffer *text_buffer;
-	GtkTextIter text_iter_start, text_iter_end;
-	icaltimezone *start_zone = NULL;
-	icaltimezone *due_zone = NULL;
-
-	tpage = TASK_PAGE (page);
-	priv = tpage->priv;
-	text_buffer = gtk_text_view_get_buffer (GTK_TEXT_VIEW (priv->description));
-
-	/* Summary. */
-
-	str = e_dialog_editable_get (priv->summary);
-	if (!str || strlen (str) == 0)
-		e_cal_component_set_summary (comp, NULL);
-	else {
-		ECalComponentText text;
-
-		text.value = str;
-		text.altrep = NULL;
-
-		e_cal_component_set_summary (comp, &text);
-	}
-
-	if (str)
-		g_free (str);
-
-	/* Description */
-
-	gtk_text_buffer_get_start_iter (text_buffer, &text_iter_start);
-	gtk_text_buffer_get_end_iter   (text_buffer, &text_iter_end);
-	str = gtk_text_buffer_get_text (text_buffer, &text_iter_start, &text_iter_end, FALSE);
-
-	if (!str || strlen (str) == 0)
-		e_cal_component_set_description_list (comp, NULL);
-	else {
-		GSList l;
-		ECalComponentText text;
-
-		text.value = str;
-		text.altrep = NULL;
-		l.data = &text;
-		l.next = NULL;
-
-		e_cal_component_set_description_list (comp, &l);
-	}
-
-	if (str)
-		g_free (str);
-
-	/* Dates */
-
-	due_tt = icaltime_null_time ();
-
-	date.value = &due_tt;
-	date.tzid = NULL;
-
-	/* Due Date. */
-	if (!e_date_edit_date_is_valid (E_DATE_EDIT (priv->due_date)) ||
-	    !e_date_edit_time_is_valid (E_DATE_EDIT (priv->due_date))) {
-		comp_editor_page_display_validation_error (page, _("Due date is wrong"), priv->due_date);
-		return FALSE;
-	}
-
-	due_date_set = e_date_edit_get_date (E_DATE_EDIT (priv->due_date),
-					 &due_tt.year,
-					 &due_tt.month,
-					 &due_tt.day);
-	time_set = e_date_edit_get_time_of_day (E_DATE_EDIT (priv->due_date),
-						&due_tt.hour,
-						&due_tt.minute);
-	if (due_date_set) {
-		if (time_set) {
-			due_zone = e_timezone_entry_get_timezone (E_TIMEZONE_ENTRY (priv->due_timezone));
-			date.tzid = icaltimezone_get_tzid (due_zone);
-		} else {
-			due_tt.is_date = TRUE;
-			date.tzid = NULL;
-		}
-		e_cal_component_set_due (comp, &date);
-	} else {
-		e_cal_component_set_due (comp, NULL);
-	}
-
-	/* Start Date. */
-	if (!e_date_edit_date_is_valid (E_DATE_EDIT (priv->start_date)) ||
-	    !e_date_edit_time_is_valid (E_DATE_EDIT (priv->start_date))) {
-		comp_editor_page_display_validation_error (page, _("Start date is wrong"), priv->start_date);
-		return FALSE;
-	}
-
-	start_tt = icaltime_null_time ();
-	date.value = &start_tt;
-	start_date_set = e_date_edit_get_date (E_DATE_EDIT (priv->start_date),
-					 &start_tt.year,
-					 &start_tt.month,
-					 &start_tt.day);
-	time_set = e_date_edit_get_time_of_day (E_DATE_EDIT (priv->start_date),
-						&start_tt.hour,
-						&start_tt.minute);
-	if (start_date_set) {
-		if (time_set) {
-			start_zone = e_timezone_entry_get_timezone (E_TIMEZONE_ENTRY (priv->start_timezone));
-			date.tzid = icaltimezone_get_tzid (start_zone);
-		} else {
-			start_tt.is_date = TRUE;
-			date.tzid = NULL;
-		}
-		e_cal_component_set_dtstart (comp, &date);
-	} else {
-		e_cal_component_set_dtstart (comp, NULL);
-	}
-	
-	/* Classification. */
-	e_cal_component_set_classification (comp, classification_get (priv->classification));
-	
-	/* send options */
-	if (priv->sendoptions_shown && priv->sod) 
-		e_sendoptions_utils_fill_component (priv->sod, comp);
-
-	/* Categories */
-	cat = e_dialog_editable_get (priv->categories);
-	str = comp_editor_strip_categories (cat);
-	if (cat)
-		g_free (cat);
-
-	e_cal_component_set_categories (comp, str);
-
-	if (str)
-		g_free (str);
-
-	return TRUE;
-}
-
-/* fill_timezones handler for the event page */
-static gboolean
-task_page_fill_timezones (CompEditorPage *page, GHashTable *timezones)
-{
-	TaskPage *tpage;
-	TaskPagePrivate *priv;
-	icaltimezone *zone;
-
-	tpage = TASK_PAGE (page);
-	priv = tpage->priv;
-
-	/* add due date timezone */
-	zone = e_timezone_entry_get_timezone (E_TIMEZONE_ENTRY (priv->due_timezone));
-	if (zone) {
-		if (!g_hash_table_lookup (timezones, icaltimezone_get_tzid (zone)))
-			g_hash_table_insert (timezones, icaltimezone_get_tzid (zone), zone);
-	}
-
-	/* add start date timezone */
-	zone = e_timezone_entry_get_timezone (E_TIMEZONE_ENTRY (priv->start_timezone));
-	if (zone) {
-		if (!g_hash_table_lookup (timezones, icaltimezone_get_tzid (zone)))
-			g_hash_table_insert (timezones, icaltimezone_get_tzid (zone), zone);
-	}
-
-	return TRUE;
-}
-
-/* set_summary handler for the task page */
-static void
-task_page_set_summary (CompEditorPage *page, const char *summary)
-{
-	/* nothing */
-}
-
-static void
-task_page_set_dates (CompEditorPage *page, CompEditorPageDates *dates)
-{
-	TaskPage *tpage;
-	TaskPagePrivate *priv;
-
-	tpage = TASK_PAGE (page);
-	priv = tpage->priv;
-
-	if (priv->updating)
-	        return;
-
-	priv->updating = TRUE;
-
-	priv->updating = FALSE;
-}
-
-
-
-/* Gets the widgets from the XML file and returns if they are all available. */
-static gboolean
-get_widgets (TaskPage *tpage)
-{
-	CompEditorPage *page = COMP_EDITOR_PAGE (tpage);
-	TaskPagePrivate *priv;
-	GSList *accel_groups;
-	GtkWidget *toplevel;
-
-	priv = tpage->priv;
-
-#define GW(name) glade_xml_get_widget (priv->xml, name)
-
-	priv->main = GW ("task-page");
-	if (!priv->main)
-		return FALSE;
-
-	/* Get the GtkAccelGroup from the toplevel window, so we can install
-	   it when the notebook page is mapped. */
-	toplevel = gtk_widget_get_toplevel (priv->main);
-	accel_groups = gtk_accel_groups_from_object (G_OBJECT (toplevel));
-	if (accel_groups) {
-		page->accel_group = accel_groups->data;
-		gtk_accel_group_ref (page->accel_group);
-	}
-
-	gtk_widget_ref (priv->main);
-	gtk_container_remove (GTK_CONTAINER (priv->main->parent), priv->main);
-
-	priv->summary = GW ("summary");
-	priv->summary_label = GW ("summary-label");
-
-	/* Glade's visibility flag doesn't seem to work for custom widgets */
-	priv->due_date = GW ("due-date");
-	gtk_widget_show (priv->due_date);
-	priv->start_date = GW ("start-date");
-	gtk_widget_show (priv->start_date);
-
-	priv->due_timezone = GW ("due-timezone");
-	priv->start_timezone = GW ("start-timezone");
-
-	priv->description = GW ("description");
-
-	priv->classification = GW ("classification");
-
-	priv->categories_btn = GW ("categories-button");
-	priv->categories = GW ("categories");
-
-	priv->source_selector = GW ("source");
-	
-	priv->sendoptions_frame = GW ("send-options-frame");
-	priv->sendoptions_button = GW ("send-options-button");
-
-#undef GW
-
-	return (priv->summary
-		&& priv->summary_label
-		&& priv->due_date
-		&& priv->start_date
-		&& priv->due_timezone
-		&& priv->start_timezone
-		&& priv->classification
-		&& priv->description
-		&& priv->categories_btn
-		&& priv->categories
-		&& priv->sendoptions_frame
-		&& priv->sendoptions_button);
-}
-
-/* Callback used when the summary changes; we emit the notification signal. */
-static void
-summary_changed_cb (GtkEditable *editable, gpointer data)
-{
-	TaskPage *tpage;
-	TaskPagePrivate *priv;
-	gchar *summary;
-	
-	tpage = TASK_PAGE (data);
-	priv = tpage->priv;
-	
-	if (priv->updating)
-		return;
-	
-	summary = e_dialog_editable_get (GTK_WIDGET (editable));
-	comp_editor_page_notify_summary_changed (COMP_EDITOR_PAGE (tpage), 
-						 summary);
-	g_free (summary);
-}
-
-/* Callback used when the start or due date widgets change.  We notify the
- * other pages in the task editor, so they can update any labels. 
- */
-static void
-date_changed_cb (EDateEdit *dedit, gpointer data)
-{
-	TaskPage *tpage;
-	TaskPagePrivate *priv;
-	CompEditorPageDates dates;
-	gboolean date_set, time_set;
-	ECalComponentDateTime start_dt, due_dt;
-	struct icaltimetype start_tt = icaltime_null_time();
-	struct icaltimetype due_tt = icaltime_null_time();
-
-	tpage = TASK_PAGE (data);
-	priv = tpage->priv;
-
-	if (priv->updating)
-		return;
-
-	date_set = e_date_edit_get_date (E_DATE_EDIT (priv->start_date),
-					 &start_tt.year,
-					 &start_tt.month,
-					 &start_tt.day);
-	time_set = e_date_edit_get_time_of_day (E_DATE_EDIT (priv->start_date),
-						&start_tt.hour,
-						&start_tt.minute);
-	if (date_set) {
-		if (time_set) {
-			icaltimezone *zone = e_timezone_entry_get_timezone (E_TIMEZONE_ENTRY (priv->start_timezone));
-			start_dt.tzid = icaltimezone_get_tzid (zone);
-		} else {
-			start_tt.is_date = TRUE;
-			start_dt.tzid = NULL;
-		}
-	} else {
-		start_tt = icaltime_null_time ();
-		start_dt.tzid = NULL;
-	}
-
-	date_set = e_date_edit_get_date (E_DATE_EDIT (priv->due_date),
-					 &due_tt.year,
-					 &due_tt.month,
-					 &due_tt.day);
-	time_set = e_date_edit_get_time_of_day (E_DATE_EDIT (priv->due_date),
-						&due_tt.hour,
-						&due_tt.minute);
-	if (date_set) {
-		if (time_set) {
-			icaltimezone *zone = e_timezone_entry_get_timezone (E_TIMEZONE_ENTRY (priv->due_timezone));
-			due_dt.tzid = icaltimezone_get_tzid (zone);
-		} else {
-			due_tt.is_date = TRUE;
-			due_dt.tzid = NULL;
-		}
-	} else {
-		due_tt = icaltime_null_time ();
-		due_dt.tzid = NULL;
-	}
-
-	start_dt.value = &start_tt;
-	dates.start = &start_dt;
-	dates.end = NULL;
-	due_dt.value = &due_tt;
-	dates.due = &due_dt;
-	dates.complete = NULL;
-	
-	/* Notify upstream */
-	comp_editor_page_notify_dates_changed (COMP_EDITOR_PAGE (tpage),
-					       &dates);
-}
-
-/* Callback used when the categories button is clicked; we must bring up the
- * category list dialog.
- */
-static void
-categories_clicked_cb (GtkWidget *button, gpointer data)
-{
-	TaskPage *tpage;
-	TaskPagePrivate *priv;
-	GtkWidget *entry;
-
-	tpage = TASK_PAGE (data);
-	priv = tpage->priv;
-
-	entry = priv->categories;
-	e_categories_config_open_dialog_for_entry (GTK_ENTRY (entry));
-}
-
-/* This is called when any field is changed; it notifies upstream. */
-static void
-field_changed_cb (GtkWidget *widget, gpointer data)
-{
-	TaskPage *tpage;
-	TaskPagePrivate *priv;
-	
-	tpage = TASK_PAGE (data);
-	priv = tpage->priv;
-	
-	if (!priv->updating)
-		comp_editor_page_notify_changed (COMP_EDITOR_PAGE (tpage));
-}
-
-static void
-source_changed_cb (GtkWidget *widget, ESource *source, gpointer data)
-{
-	TaskPage *tpage;
-	TaskPagePrivate *priv;
-
-	tpage = TASK_PAGE (data);
-	priv = tpage->priv;
-
-	if (!priv->updating) {
-		ECal *client;
-
-		client = auth_new_cal_from_source (source, E_CAL_SOURCE_TYPE_TODO);
-		if (!client || !e_cal_open (client, FALSE, NULL)) {
-			GtkWidget *dialog;
-
-			if (client)
-				g_object_unref (client);
-
-			e_source_option_menu_select (E_SOURCE_OPTION_MENU (priv->source_selector),
-						     e_cal_get_source (COMP_EDITOR_PAGE (tpage)->client));
-
-			dialog = gtk_message_dialog_new (NULL, GTK_DIALOG_MODAL,
-							 GTK_MESSAGE_WARNING, GTK_BUTTONS_OK,
-							 _("Unable to open tasks in '%s'."),
-							 e_source_peek_name (source));
-			gtk_dialog_run (GTK_DIALOG (dialog));
-			gtk_widget_destroy (dialog);
-		} else {
-			comp_editor_notify_client_changed (
-				COMP_EDITOR (gtk_widget_get_toplevel (priv->main)),
-				client);
-			if (e_cal_get_static_capability (client, CAL_STATIC_CAPABILITY_REQ_SEND_OPTIONS) && priv->is_assignment)
-				task_page_show_options (tpage);
-			else
-				task_page_hide_options (tpage);
-
-
-			sensitize_widgets (tpage);
-		}
-	}
-}
-
-static void
-e_sendoptions_clicked_cb (GtkWidget *button, gpointer data)
-{
-	TaskPage *tpage;
-	TaskPagePrivate *priv;
-	GtkWidget *toplevel;
-	ESource *source;
-
-	tpage = TASK_PAGE (data);
-	priv = tpage->priv;
-	
-	if (!priv->sod) {
-		priv->sod = e_sendoptions_dialog_new ();
-		priv->sod->data->initialized = TRUE;
-		source = e_source_option_menu_peek_selected  (E_SOURCE_OPTION_MENU (priv->source_selector));
-		e_sendoptions_utils_set_default_data (priv->sod, source, "task");
-	}
-	
-	if (e_cal_get_static_capability (COMP_EDITOR_PAGE (tpage)->client, 
-					 CAL_STATIC_CAPABILITY_NO_GEN_OPTIONS)) {
-		e_sendoptions_set_need_general_options (priv->sod, FALSE);
-	}
-	
-	toplevel = gtk_widget_get_toplevel (priv->main);
-	e_sendoptions_dialog_run (priv->sod, toplevel, E_ITEM_TASK);
-}
-
-/* Hooks the widget signals */
-static gboolean
-init_widgets (TaskPage *tpage)
-{
-	TaskPagePrivate *priv;
-	GtkTextBuffer *text_buffer;
-	icaltimezone *zone;
-
-	priv = tpage->priv;
-
-	/* Make sure the EDateEdit widgets use our timezones to get the
-	   current time. */
-	e_date_edit_set_get_time_callback (E_DATE_EDIT (priv->start_date),
-					   (EDateEditGetTimeCallback) comp_editor_get_current_time,
-					   tpage, NULL);
-	e_date_edit_set_get_time_callback (E_DATE_EDIT (priv->due_date),
-					   (EDateEditGetTimeCallback) comp_editor_get_current_time,
-					   tpage, NULL);
-	
-	/* Summary */
-	g_signal_connect((priv->summary), "changed",
-			    G_CALLBACK (summary_changed_cb), tpage);
-
-	/* Description */
-	text_buffer = gtk_text_view_get_buffer (GTK_TEXT_VIEW (priv->description));
-
-	gtk_text_view_set_wrap_mode (GTK_TEXT_VIEW (priv->description), GTK_WRAP_WORD);
-
-	/* Dates */
-	g_signal_connect((priv->start_date), "changed",
-			    G_CALLBACK (date_changed_cb), tpage);
-	g_signal_connect((priv->due_date), "changed",
-			    G_CALLBACK (date_changed_cb), tpage);
-
-	/* Categories button */
-	g_signal_connect((priv->categories_btn), "clicked",
-			    G_CALLBACK (categories_clicked_cb), tpage);
-	
-	/* send options button */
-	g_signal_connect((priv->sendoptions_button), "clicked", 
-			    G_CALLBACK (e_sendoptions_clicked_cb), tpage);
-
-	/* Source selector */
-	g_signal_connect((priv->source_selector), "source_selected",
-			 G_CALLBACK (source_changed_cb), tpage);
-
-	/* Connect the default signal handler to use to make sure the "changed"
-	   field gets set whenever a field is changed. */
-
-	/* Belongs to priv->description */
-	g_signal_connect ((text_buffer), "changed",
-			  G_CALLBACK (field_changed_cb), tpage);
-
-	g_signal_connect((priv->summary), "changed",
-			    G_CALLBACK (field_changed_cb), tpage);
-	g_signal_connect (priv->start_date, "changed",
-			  G_CALLBACK (field_changed_cb), tpage);
-	g_signal_connect (priv->due_date, "changed",
-			  G_CALLBACK (field_changed_cb), tpage);
-	g_signal_connect((priv->due_timezone), "changed",
-			    G_CALLBACK (field_changed_cb), tpage);
-	g_signal_connect((priv->start_timezone), "changed",
-			    G_CALLBACK (field_changed_cb), tpage);
-	g_signal_connect((priv->classification), "changed",
-			    G_CALLBACK (field_changed_cb), tpage);
-	g_signal_connect((priv->categories), "changed",
-			    G_CALLBACK (field_changed_cb), tpage);
-
-	/* Set the default timezone, so the timezone entry may be hidden. */
-	zone = calendar_config_get_icaltimezone ();
-	e_timezone_entry_set_default_timezone (E_TIMEZONE_ENTRY (priv->start_timezone), zone);
-	e_timezone_entry_set_default_timezone (E_TIMEZONE_ENTRY (priv->due_timezone), zone);
-
-	return TRUE;
-}
-
-
-
-/**
- * task_page_construct:
- * @tpage: An task page.
- * 
- * Constructs an task page by loading its Glade data.
- * 
- * Return value: The same object as @tpage, or NULL if the widgets could not be
- * created.
- **/
-TaskPage *
-task_page_construct (TaskPage *tpage)
-{
-	TaskPagePrivate *priv;
-
-	priv = tpage->priv;
-
-	priv->xml = glade_xml_new (EVOLUTION_GLADEDIR "/task-page.glade",
-				   NULL, NULL);
-	if (!priv->xml) {
-		g_message ("task_page_construct(): "
-			   "Could not load the Glade XML file!");
-		return NULL;
-	}
-
-	if (!get_widgets (tpage)) {
-		g_message ("task_page_construct(): "
-			   "Could not find all widgets in the XML file!");
-		return NULL;
-	}
-
-	if (!init_widgets (tpage)) {
-		g_message ("task_page_construct(): " 
-			   "Could not initialize the widgets!");
-		return NULL;
-	}
-
-	return tpage;
-}
-
-/**
- * task_page_new:
- * 
- * Creates a new task page.
- * 
- * Return value: A newly-created task page, or NULL if the page could
- * not be created.
- **/
-TaskPage *
-task_page_new (void)
-{
-	TaskPage *tpage;
-
-	tpage = gtk_type_new (TYPE_TASK_PAGE);
-	if (!task_page_construct (tpage)) {
-		g_object_unref (tpage);
-		return NULL;
-	}
-
-	return tpage;
-}
-
-GtkWidget *task_page_create_date_edit (void);
-
-GtkWidget *
-task_page_create_date_edit (void)
-{
-	GtkWidget *dedit;
-
-	dedit = comp_editor_new_date_edit (TRUE, TRUE, TRUE);
-	e_date_edit_set_allow_no_date_set (E_DATE_EDIT (dedit), TRUE);
-
-	return dedit;
-}
-
-GtkWidget *task_page_create_source_option_menu (void);
-
-GtkWidget *
-task_page_create_source_option_menu (void)
-{
-	GtkWidget   *menu;
-	GConfClient *gconf_client;
-	ESourceList *source_list;
-
-	gconf_client = gconf_client_get_default ();
-	source_list = e_source_list_new_for_gconf (gconf_client, "/apps/evolution/tasks/sources");
-
-	menu = e_source_option_menu_new (source_list);
-	g_object_unref (source_list);
-
-	gtk_widget_show (menu);
-	return menu;
-}
diff --git a/calendar/gui/dialogs/task-page.glade b/calendar/gui/dialogs/task-page.glade
deleted file mode 100644
index 3415672ec2..0000000000
--- a/calendar/gui/dialogs/task-page.glade
+++ /dev/null
@@ -1,652 +0,0 @@
-<?xml version="1.0" standalone="no"?> <!--*- mode: xml -*-->
-<!DOCTYPE glade-interface SYSTEM "http://glade.gnome.org/glade-2.0.dtd">
-
-<glade-interface>
-
-<widget class="GtkWindow" id="task-toplevel">
-  <property name="title" translatable="yes">window1</property>
-  <property name="type">GTK_WINDOW_TOPLEVEL</property>
-  <property name="window_position">GTK_WIN_POS_NONE</property>
-  <property name="modal">False</property>
-  <property name="resizable">True</property>
-  <property name="destroy_with_parent">False</property>
-  <property name="decorated">True</property>
-  <property name="skip_taskbar_hint">False</property>
-  <property name="skip_pager_hint">False</property>
-  <property name="type_hint">GDK_WINDOW_TYPE_HINT_NORMAL</property>
-  <property name="gravity">GDK_GRAVITY_NORTH_WEST</property>
-
-  <child>
-    <widget class="GtkVBox" id="task-page">
-      <property name="border_width">12</property>
-      <property name="visible">True</property>
-      <property name="homogeneous">False</property>
-      <property name="spacing">6</property>
-
-      <child>
-	<widget class="GtkLabel" id="label21">
-	  <property name="visible">True</property>
-	  <property name="label" translatable="yes">&lt;b&gt;Basics&lt;/b&gt;</property>
-	  <property name="use_underline">False</property>
-	  <property name="use_markup">True</property>
-	  <property name="justify">GTK_JUSTIFY_LEFT</property>
-	  <property name="wrap">False</property>
-	  <property name="selectable">False</property>
-	  <property name="xalign">0</property>
-	  <property name="yalign">0.5</property>
-	  <property name="xpad">0</property>
-	  <property name="ypad">0</property>
-	</widget>
-	<packing>
-	  <property name="padding">0</property>
-	  <property name="expand">False</property>
-	  <property name="fill">False</property>
-	</packing>
-      </child>
-
-      <child>
-	<widget class="GtkHBox" id="hbox7">
-	  <property name="visible">True</property>
-	  <property name="homogeneous">False</property>
-	  <property name="spacing">0</property>
-
-	  <child>
-	    <widget class="GtkLabel" id="label22">
-	      <property name="visible">True</property>
-	      <property name="label" translatable="yes"></property>
-	      <property name="use_underline">False</property>
-	      <property name="use_markup">False</property>
-	      <property name="justify">GTK_JUSTIFY_LEFT</property>
-	      <property name="wrap">False</property>
-	      <property name="selectable">False</property>
-	      <property name="xalign">0.5</property>
-	      <property name="yalign">0.5</property>
-	      <property name="xpad">12</property>
-	      <property name="ypad">0</property>
-	    </widget>
-	    <packing>
-	      <property name="padding">0</property>
-	      <property name="expand">False</property>
-	      <property name="fill">False</property>
-	    </packing>
-	  </child>
-
-	  <child>
-	    <widget class="GtkTable" id="table3">
-	      <property name="visible">True</property>
-	      <property name="n_rows">4</property>
-	      <property name="n_columns">2</property>
-	      <property name="homogeneous">False</property>
-	      <property name="row_spacing">6</property>
-	      <property name="column_spacing">12</property>
-
-	      <child>
-		<widget class="GtkEntry" id="summary">
-		  <property name="visible">True</property>
-		  <property name="can_focus">True</property>
-		  <property name="editable">True</property>
-		  <property name="visibility">True</property>
-		  <property name="max_length">0</property>
-		  <property name="text" translatable="yes"></property>
-		  <property name="has_frame">True</property>
-		  <property name="invisible_char">*</property>
-		  <property name="activates_default">False</property>
-		</widget>
-		<packing>
-		  <property name="left_attach">1</property>
-		  <property name="right_attach">2</property>
-		  <property name="top_attach">0</property>
-		  <property name="bottom_attach">1</property>
-		  <property name="y_options"></property>
-		</packing>
-	      </child>
-
-	      <child>
-		<widget class="GtkLabel" id="summary-label">
-		  <property name="visible">True</property>
-		  <property name="label" translatable="yes">Su_mmary:</property>
-		  <property name="use_underline">True</property>
-		  <property name="use_markup">False</property>
-		  <property name="justify">GTK_JUSTIFY_CENTER</property>
-		  <property name="wrap">False</property>
-		  <property name="selectable">False</property>
-		  <property name="xalign">0</property>
-		  <property name="yalign">0.5</property>
-		  <property name="xpad">0</property>
-		  <property name="ypad">0</property>
-		  <property name="mnemonic_widget">summary</property>
-		</widget>
-		<packing>
-		  <property name="left_attach">0</property>
-		  <property name="right_attach">1</property>
-		  <property name="top_attach">0</property>
-		  <property name="bottom_attach">1</property>
-		  <property name="x_options">fill</property>
-		  <property name="y_options"></property>
-		</packing>
-	      </child>
-
-	      <child>
-		<widget class="GtkLabel" id="label100">
-		  <property name="visible">True</property>
-		  <property name="label" translatable="yes">Classi_fication:</property>
-		  <property name="use_underline">True</property>
-		  <property name="use_markup">False</property>
-		  <property name="justify">GTK_JUSTIFY_LEFT</property>
-		  <property name="wrap">False</property>
-		  <property name="selectable">False</property>
-		  <property name="xalign">0.5</property>
-		  <property name="yalign">0.5</property>
-		  <property name="xpad">0</property>
-		  <property name="ypad">0</property>
-		  <property name="mnemonic_widget">classification</property>
-		</widget>
-		<packing>
-		  <property name="left_attach">0</property>
-		  <property name="right_attach">1</property>
-		  <property name="top_attach">1</property>
-		  <property name="bottom_attach">2</property>
-		  <property name="x_options">fill</property>
-		  <property name="y_options"></property>
-		</packing>
-	      </child>
-
-	      <child>
-		<widget class="GtkHBox" id="hbox10">
-		  <property name="visible">True</property>
-		  <property name="homogeneous">False</property>
-		  <property name="spacing">0</property>
-
-		  <child>
-		    <widget class="GtkOptionMenu" id="classification">
-		      <property name="visible">True</property>
-		      <property name="can_focus">True</property>
-		      <property name="history">0</property>
-
-		      <child>
-			<widget class="GtkMenu" id="menu1">
-
-			  <child>
-			    <widget class="GtkMenuItem" id="public1">
-			      <property name="visible">True</property>
-			      <property name="label" translatable="yes">Public</property>
-			      <property name="use_underline">True</property>
-			    </widget>
-			  </child>
-
-			  <child>
-			    <widget class="GtkMenuItem" id="private1">
-			      <property name="visible">True</property>
-			      <property name="label" translatable="yes">Private</property>
-			      <property name="use_underline">True</property>
-			    </widget>
-			  </child>
-
-			  <child>
-			    <widget class="GtkMenuItem" id="confidential1">
-			      <property name="visible">True</property>
-			      <property name="label" translatable="yes">Confidential</property>
-			      <property name="use_underline">True</property>
-			    </widget>
-			  </child>
-			</widget>
-		      </child>
-		    </widget>
-		    <packing>
-		      <property name="padding">0</property>
-		      <property name="expand">True</property>
-		      <property name="fill">True</property>
-		    </packing>
-		  </child>
-
-		  <child>
-		    <widget class="GtkLabel" id="label23">
-		      <property name="visible">True</property>
-		      <property name="label" translatable="yes">_Group:</property>
-		      <property name="use_underline">True</property>
-		      <property name="use_markup">False</property>
-		      <property name="justify">GTK_JUSTIFY_LEFT</property>
-		      <property name="wrap">False</property>
-		      <property name="selectable">False</property>
-		      <property name="xalign">0.5</property>
-		      <property name="yalign">0.5</property>
-		      <property name="xpad">12</property>
-		      <property name="ypad">0</property>
-		      <property name="mnemonic_widget">source</property>
-		    </widget>
-		    <packing>
-		      <property name="padding">0</property>
-		      <property name="expand">False</property>
-		      <property name="fill">False</property>
-		    </packing>
-		  </child>
-
-		  <child>
-		    <widget class="Custom" id="source">
-		      <property name="visible">True</property>
-		      <property name="creation_function">task_page_create_source_option_menu</property>
-		      <property name="int1">0</property>
-		      <property name="int2">0</property>
-		      <property name="last_modification_time">Thu, 18 Dec 2003 01:58:48 GMT</property>
-		    </widget>
-		    <packing>
-		      <property name="padding">0</property>
-		      <property name="expand">True</property>
-		      <property name="fill">True</property>
-		    </packing>
-		  </child>
-		</widget>
-		<packing>
-		  <property name="left_attach">1</property>
-		  <property name="right_attach">2</property>
-		  <property name="top_attach">1</property>
-		  <property name="bottom_attach">2</property>
-		  <property name="x_options">fill</property>
-		  <property name="y_options">fill</property>
-		</packing>
-	      </child>
-
-	      <child>
-		<widget class="GtkButton" id="categories-button">
-		  <property name="visible">True</property>
-		  <property name="can_focus">True</property>
-		  <property name="label" translatable="yes">Ca_tegories...</property>
-		  <property name="use_underline">True</property>
-		  <property name="relief">GTK_RELIEF_NORMAL</property>
-		  <property name="focus_on_click">True</property>
-		</widget>
-		<packing>
-		  <property name="left_attach">0</property>
-		  <property name="right_attach">1</property>
-		  <property name="top_attach">2</property>
-		  <property name="bottom_attach">3</property>
-		  <property name="x_options">fill</property>
-		  <property name="y_options"></property>
-		</packing>
-	      </child>
-
-	      <child>
-		<widget class="GtkEntry" id="categories">
-		  <property name="visible">True</property>
-		  <property name="can_focus">True</property>
-		  <property name="editable">True</property>
-		  <property name="visibility">True</property>
-		  <property name="max_length">0</property>
-		  <property name="text" translatable="yes"></property>
-		  <property name="has_frame">True</property>
-		  <property name="invisible_char">*</property>
-		  <property name="activates_default">False</property>
-		  <accessibility>
-		    <atkproperty name="AtkObject::accessible_name" translatable="yes">Categories</atkproperty>
-		  </accessibility>
-		</widget>
-		<packing>
-		  <property name="left_attach">1</property>
-		  <property name="right_attach">2</property>
-		  <property name="top_attach">2</property>
-		  <property name="bottom_attach">3</property>
-		  <property name="y_options"></property>
-		</packing>
-	      </child>
-
-	      <child>
-		<widget class="GtkScrolledWindow" id="scrolledwindow1">
-		  <property name="visible">True</property>
-		  <property name="hscrollbar_policy">GTK_POLICY_AUTOMATIC</property>
-		  <property name="vscrollbar_policy">GTK_POLICY_AUTOMATIC</property>
-		  <property name="shadow_type">GTK_SHADOW_IN</property>
-		  <property name="window_placement">GTK_CORNER_TOP_LEFT</property>
-
-		  <child>
-		    <widget class="GtkTextView" id="description">
-		      <property name="visible">True</property>
-		      <property name="can_focus">True</property>
-		      <property name="editable">True</property>
-		      <property name="overwrite">False</property>
-		      <property name="accepts_tab">True</property>
-		      <property name="justification">GTK_JUSTIFY_LEFT</property>
-		      <property name="wrap_mode">GTK_WRAP_WORD</property>
-		      <property name="cursor_visible">True</property>
-		      <property name="pixels_above_lines">0</property>
-		      <property name="pixels_below_lines">0</property>
-		      <property name="pixels_inside_wrap">0</property>
-		      <property name="left_margin">0</property>
-		      <property name="right_margin">0</property>
-		      <property name="indent">0</property>
-		      <property name="text" translatable="yes"></property>
-		      <accessibility>
-			<atkproperty name="AtkObject::accessible_name" translatable="yes">Task Description</atkproperty>
-		      </accessibility>
-		    </widget>
-		  </child>
-		</widget>
-		<packing>
-		  <property name="left_attach">1</property>
-		  <property name="right_attach">2</property>
-		  <property name="top_attach">3</property>
-		  <property name="bottom_attach">4</property>
-		  <property name="x_options">expand|shrink|fill</property>
-		  <property name="y_options">expand|shrink|fill</property>
-		</packing>
-	      </child>
-
-	      <child>
-		<widget class="GtkLabel" id="label18">
-		  <property name="visible">True</property>
-		  <property name="label" translatable="yes">D_escription:</property>
-		  <property name="use_underline">True</property>
-		  <property name="use_markup">False</property>
-		  <property name="justify">GTK_JUSTIFY_CENTER</property>
-		  <property name="wrap">False</property>
-		  <property name="selectable">False</property>
-		  <property name="xalign">0</property>
-		  <property name="yalign">0</property>
-		  <property name="xpad">0</property>
-		  <property name="ypad">0</property>
-		  <property name="mnemonic_widget">description</property>
-		</widget>
-		<packing>
-		  <property name="left_attach">0</property>
-		  <property name="right_attach">1</property>
-		  <property name="top_attach">3</property>
-		  <property name="bottom_attach">4</property>
-		  <property name="x_options">fill</property>
-		  <property name="y_options">fill</property>
-		</packing>
-	      </child>
-	    </widget>
-	    <packing>
-	      <property name="padding">0</property>
-	      <property name="expand">True</property>
-	      <property name="fill">True</property>
-	    </packing>
-	  </child>
-	</widget>
-	<packing>
-	  <property name="padding">0</property>
-	  <property name="expand">True</property>
-	  <property name="fill">True</property>
-	</packing>
-      </child>
-
-      <child>
-	<widget class="GtkLabel" id="label24">
-	  <property name="visible">True</property>
-	  <property name="label" translatable="yes">&lt;b&gt;Date and Time&lt;/b&gt;</property>
-	  <property name="use_underline">False</property>
-	  <property name="use_markup">True</property>
-	  <property name="justify">GTK_JUSTIFY_LEFT</property>
-	  <property name="wrap">False</property>
-	  <property name="selectable">False</property>
-	  <property name="xalign">0</property>
-	  <property name="yalign">0.5</property>
-	  <property name="xpad">0</property>
-	  <property name="ypad">0</property>
-	</widget>
-	<packing>
-	  <property name="padding">0</property>
-	  <property name="expand">False</property>
-	  <property name="fill">False</property>
-	</packing>
-      </child>
-
-      <child>
-	<widget class="GtkHBox" id="hbox11">
-	  <property name="visible">True</property>
-	  <property name="homogeneous">False</property>
-	  <property name="spacing">0</property>
-
-	  <child>
-	    <widget class="GtkLabel" id="label25">
-	      <property name="visible">True</property>
-	      <property name="label" translatable="yes"></property>
-	      <property name="use_underline">False</property>
-	      <property name="use_markup">False</property>
-	      <property name="justify">GTK_JUSTIFY_LEFT</property>
-	      <property name="wrap">False</property>
-	      <property name="selectable">False</property>
-	      <property name="xalign">0.5</property>
-	      <property name="yalign">0.5</property>
-	      <property name="xpad">12</property>
-	      <property name="ypad">0</property>
-	    </widget>
-	    <packing>
-	      <property name="padding">0</property>
-	      <property name="expand">False</property>
-	      <property name="fill">False</property>
-	    </packing>
-	  </child>
-
-	  <child>
-	    <widget class="GtkTable" id="table4">
-	      <property name="visible">True</property>
-	      <property name="n_rows">2</property>
-	      <property name="n_columns">2</property>
-	      <property name="homogeneous">False</property>
-	      <property name="row_spacing">6</property>
-	      <property name="column_spacing">12</property>
-
-	      <child>
-		<widget class="GtkLabel" id="due-date-label">
-		  <property name="visible">True</property>
-		  <property name="label" translatable="yes">_Due date:</property>
-		  <property name="use_underline">True</property>
-		  <property name="use_markup">False</property>
-		  <property name="justify">GTK_JUSTIFY_CENTER</property>
-		  <property name="wrap">False</property>
-		  <property name="selectable">False</property>
-		  <property name="xalign">0</property>
-		  <property name="yalign">0.5</property>
-		  <property name="xpad">0</property>
-		  <property name="ypad">0</property>
-		  <property name="mnemonic_widget">due-date</property>
-		</widget>
-		<packing>
-		  <property name="left_attach">0</property>
-		  <property name="right_attach">1</property>
-		  <property name="top_attach">0</property>
-		  <property name="bottom_attach">1</property>
-		  <property name="x_options">fill</property>
-		  <property name="y_options"></property>
-		</packing>
-	      </child>
-
-	      <child>
-		<widget class="GtkLabel" id="start-date-label">
-		  <property name="visible">True</property>
-		  <property name="label" translatable="yes">Sta_rt date:</property>
-		  <property name="use_underline">True</property>
-		  <property name="use_markup">False</property>
-		  <property name="justify">GTK_JUSTIFY_CENTER</property>
-		  <property name="wrap">False</property>
-		  <property name="selectable">False</property>
-		  <property name="xalign">0</property>
-		  <property name="yalign">0.5</property>
-		  <property name="xpad">0</property>
-		  <property name="ypad">0</property>
-		  <property name="mnemonic_widget">start-date</property>
-		</widget>
-		<packing>
-		  <property name="left_attach">0</property>
-		  <property name="right_attach">1</property>
-		  <property name="top_attach">1</property>
-		  <property name="bottom_attach">2</property>
-		  <property name="x_options">fill</property>
-		  <property name="y_options"></property>
-		</packing>
-	      </child>
-
-	      <child>
-		<widget class="GtkHBox" id="hbox8">
-		  <property name="visible">True</property>
-		  <property name="homogeneous">False</property>
-		  <property name="spacing">0</property>
-
-		  <child>
-		    <widget class="Custom" id="due-date">
-		      <property name="visible">True</property>
-		      <property name="creation_function">task_page_create_date_edit</property>
-		      <property name="int1">0</property>
-		      <property name="int2">0</property>
-		      <property name="last_modification_time">Mon, 14 Jun 2004 18:16:07 GMT</property>
-		      <accessibility>
-			<atkrelation target="due-date-label" type="labelled-by"/>
-		      </accessibility>
-		    </widget>
-		    <packing>
-		      <property name="padding">0</property>
-		      <property name="expand">True</property>
-		      <property name="fill">True</property>
-		    </packing>
-		  </child>
-
-		  <child>
-		    <widget class="Custom" id="due-timezone">
-		      <property name="visible">True</property>
-		      <property name="creation_function">make_timezone_entry</property>
-		      <property name="int1">0</property>
-		      <property name="int2">0</property>
-		      <property name="last_modification_time">Tue, 19 Jun 2001 04:43:54 GMT</property>
-		    </widget>
-		    <packing>
-		      <property name="padding">0</property>
-		      <property name="expand">True</property>
-		      <property name="fill">True</property>
-		    </packing>
-		  </child>
-		</widget>
-		<packing>
-		  <property name="left_attach">1</property>
-		  <property name="right_attach">2</property>
-		  <property name="top_attach">0</property>
-		  <property name="bottom_attach">1</property>
-		  <property name="x_options">fill</property>
-		  <property name="y_options">fill</property>
-		</packing>
-	      </child>
-
-	      <child>
-		<widget class="GtkHBox" id="hbox9">
-		  <property name="visible">True</property>
-		  <property name="homogeneous">False</property>
-		  <property name="spacing">0</property>
-
-		  <child>
-		    <widget class="Custom" id="start-date">
-		      <property name="visible">True</property>
-		      <property name="creation_function">task_page_create_date_edit</property>
-		      <property name="int1">0</property>
-		      <property name="int2">0</property>
-		      <property name="last_modification_time">Mon, 14 Jun 2004 18:16:13 GMT</property>
-		      <accessibility>
-			<atkrelation target="start-date-label" type="labelled-by"/>
-		      </accessibility>
-		    </widget>
-		    <packing>
-		      <property name="padding">0</property>
-		      <property name="expand">True</property>
-		      <property name="fill">True</property>
-		    </packing>
-		  </child>
-
-		  <child>
-		    <widget class="Custom" id="start-timezone">
-		      <property name="visible">True</property>
-		      <property name="creation_function">make_timezone_entry</property>
-		      <property name="int1">0</property>
-		      <property name="int2">0</property>
-		      <property name="last_modification_time">Tue, 19 Jun 2001 04:43:46 GMT</property>
-		    </widget>
-		    <packing>
-		      <property name="padding">0</property>
-		      <property name="expand">True</property>
-		      <property name="fill">True</property>
-		    </packing>
-		  </child>
-		</widget>
-		<packing>
-		  <property name="left_attach">1</property>
-		  <property name="right_attach">2</property>
-		  <property name="top_attach">1</property>
-		  <property name="bottom_attach">2</property>
-		  <property name="x_options">fill</property>
-		  <property name="y_options">fill</property>
-		</packing>
-	      </child>
-	    </widget>
-	    <packing>
-	      <property name="padding">0</property>
-	      <property name="expand">True</property>
-	      <property name="fill">True</property>
-	    </packing>
-	  </child>
-	</widget>
-	<packing>
-	  <property name="padding">0</property>
-	  <property name="expand">False</property>
-	  <property name="fill">False</property>
-	</packing>
-      </child>
-
-      <child>
-	<widget class="GtkFrame" id="send-options-frame">
-	  <property name="label_xalign">0</property>
-	  <property name="label_yalign">0.5</property>
-	  <property name="shadow_type">GTK_SHADOW_NONE</property>
-
-	  <child>
-	    <widget class="GtkAlignment" id="alignment1">
-	      <property name="border_width">12</property>
-	      <property name="visible">True</property>
-	      <property name="xalign">0.5</property>
-	      <property name="yalign">0.5</property>
-	      <property name="xscale">0.11</property>
-	      <property name="yscale">1</property>
-	      <property name="top_padding">0</property>
-	      <property name="bottom_padding">0</property>
-	      <property name="left_padding">12</property>
-	      <property name="right_padding">0</property>
-
-	      <child>
-		<widget class="GtkButton" id="send-options-button">
-		  <property name="visible">True</property>
-		  <property name="can_focus">True</property>
-		  <property name="label" translatable="yes">Ad_vanced send options</property>
-		  <property name="use_underline">True</property>
-		  <property name="relief">GTK_RELIEF_NORMAL</property>
-		  <property name="focus_on_click">True</property>
-		</widget>
-	      </child>
-	    </widget>
-	  </child>
-
-	  <child>
-	    <widget class="GtkLabel" id="send-options-label">
-	      <property name="visible">True</property>
-	      <property name="label" translatable="yes">&lt;b&gt;Send Options&lt;/b&gt;</property>
-	      <property name="use_underline">False</property>
-	      <property name="use_markup">True</property>
-	      <property name="justify">GTK_JUSTIFY_LEFT</property>
-	      <property name="wrap">False</property>
-	      <property name="selectable">False</property>
-	      <property name="xalign">0.5</property>
-	      <property name="yalign">0.5</property>
-	      <property name="xpad">0</property>
-	      <property name="ypad">0</property>
-	    </widget>
-	    <packing>
-	      <property name="type">label_item</property>
-	    </packing>
-	  </child>
-	</widget>
-	<packing>
-	  <property name="padding">0</property>
-	  <property name="expand">True</property>
-	  <property name="fill">True</property>
-	</packing>
-      </child>
-    </widget>
-  </child>
-</widget>
-
-</glade-interface>
diff --git a/calendar/gui/dialogs/task-page.h b/calendar/gui/dialogs/task-page.h
deleted file mode 100644
index 9a061a141b..0000000000
--- a/calendar/gui/dialogs/task-page.h
+++ /dev/null
@@ -1,63 +0,0 @@
-/* Evolution calendar - Main page of the task editor dialog
- *
- * Copyright (C) 2001 Ximian, Inc.
- *
- * Authors: Federico Mena-Quintero <federico@ximian.com>
- *          Miguel de Icaza <miguel@ximian.com>
- *          Seth Alves <alves@hungry.com>
- *          JP Rosevear <jpr@ximian.com>
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of version 2 of the GNU General Public
- * License as published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307, USA.
- */
-
-#ifndef TASK_PAGE_H
-#define TASK_PAGE_H
-
-#include "comp-editor-page.h"
-
-G_BEGIN_DECLS
-
-
-
-#define TYPE_TASK_PAGE            (task_page_get_type ())
-#define TASK_PAGE(obj)            (G_TYPE_CHECK_INSTANCE_CAST ((obj), TYPE_TASK_PAGE, TaskPage))
-#define TASK_PAGE_CLASS(klass)    (G_TYPE_CHECK_CLASS_CAST ((klass), TYPE_TASK_PAGE, TaskPageClass))
-#define IS_TASK_PAGE(obj)         (G_TYPE_CHECK_INSTANCE_TYPE ((obj), TYPE_TASK_PAGE))
-#define IS_TASK_PAGE_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((obj), TYPE_TASK_PAGE))
-
-typedef struct _TaskPagePrivate TaskPagePrivate;
-
-typedef struct {
-	CompEditorPage page;
-
-	/* Private data */
-	TaskPagePrivate *priv;
-} TaskPage;
-
-typedef struct {
-	CompEditorPageClass parent_class;
-} TaskPageClass;
-
-GtkType   task_page_get_type  (void);
-TaskPage *task_page_construct (TaskPage *epage);
-TaskPage *task_page_new       (void);
-void task_page_show_options (TaskPage *page);
-void task_page_hide_options (TaskPage *page);
-void task_page_set_assignment (TaskPage *page, gboolean set);
-
-
-
-G_END_DECLS
-
-#endif
diff --git a/calendar/gui/dialogs/url-editor-dialog.c b/calendar/gui/dialogs/url-editor-dialog.c
deleted file mode 100644
index 1032c264ba..0000000000
--- a/calendar/gui/dialogs/url-editor-dialog.c
+++ /dev/null
@@ -1,385 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-
-/*
- * Author :
- *  Gary Ekker <gekker@novell.com>
- *
- * Copyright 2004 Ximian, Inc.
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of version 2 of the GNU General Public
- * License as published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
- * USA
- */
-
-/*
- * UrlEditorDialog - a GtkObject which handles a libglade-loaded dialog
- * to edit the calendar preference settings.
- */
-
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
-
-
-#include "cal-prefs-dialog.h"
-#include "url-editor-dialog.h"
-
-#include <gtk/gtk.h>
-#include <gtk/gtksignal.h>
-#include <gtk/gtkoptionmenu.h>
-#include <gtk/gtktogglebutton.h>
-#include <libgnomeui/gnome-color-picker.h>
-#include <libedataserverui/e-passwords.h>
-#include <glade/glade.h>
-#include <e-util/e-dialog-widgets.h>
-#include <e-util/e-icon-factory.h>
-#include <widgets/misc/e-dateedit.h>
-#include <stdlib.h>
-#include <string.h>
-
-static gboolean get_widgets (UrlDialogData *data);
-static void init_widgets (UrlDialogData *data);
-
-static void url_editor_dialog_fb_url_changed (GtkEntry *url_entry, void *data);
-static void url_editor_dialog_fb_daily_toggled (GtkWidget *button, void *data);
-static void url_editor_dialog_fb_url_activated (GtkEntry *url_entry, void *data);
-static void url_editor_dialog_fb_ok_enable (GtkWidget *widget, void *data);
-
-/**
- * url_editor_dialog_new:
- *
- * Creates a new #UrlEditorDialog.
- *
- * Return value: a new #UrlEditorDialog.
- **/
-gboolean
-url_editor_dialog_new (DialogData *dialog_data, EPublishUri *uri)
-{
-	int b;
-
-	UrlDialogData *url_dlg_data = g_new0 (UrlDialogData, 1);
-	url_dlg_data->xml = glade_xml_new (EVOLUTION_GLADEDIR "/url-editor-dialog.glade", NULL, NULL);
-	if (!url_dlg_data->xml) {
-		g_message ("url_editor_dialog_construct(): Could not load the Glade XML file!");
-		return FALSE;
-	}
-
-	if (!get_widgets (url_dlg_data)) {
-		g_message ("url_editor_dialog_construct(): Could not find all widgets in the XML file!");
-		return FALSE;
-	}
-	
-	url_dlg_data->url_dialog = (GtkWidget *) dialog_data;
-	url_dlg_data->url_data = uri;
-	
-	init_widgets (url_dlg_data);
-	
-	if (uri->location && uri->username) {
-		if (strlen(uri->location) != 0) {
-			gtk_entry_set_text (url_dlg_data->url_entry, 
-					    uri->location);
-		}
-		if (strlen(uri->username) != 0) {
-			gtk_entry_set_text (url_dlg_data->username_entry, 
-					    uri->username);
-		}
-	}
-	
-	uri->password = e_passwords_get_password ("Calendar", url_dlg_data->url_data->location);
-	
-	if (uri->password) {
-		if (strlen(uri->password) != 0) {
-			gtk_entry_set_text (url_dlg_data->password_entry, 
-					    uri->password);
-
-			e_dialog_toggle_set (url_dlg_data->remember_pw, TRUE);
-		} else {
-			e_dialog_toggle_set (url_dlg_data->remember_pw, FALSE);
-		}
-	}
-	
-	switch (uri->publish_freq) {
-		case URI_PUBLISH_DAILY:
-			e_dialog_radio_set (url_dlg_data->daily, 
-						URI_PUBLISH_DAILY, 
-						pub_frequency_type_map);
-			break;
-		case URI_PUBLISH_WEEKLY:
-			e_dialog_radio_set (url_dlg_data->daily, 
-						URI_PUBLISH_WEEKLY, 
-						pub_frequency_type_map);
-			break;
-		case URI_PUBLISH_USER:
-		default:
-			e_dialog_radio_set (url_dlg_data->daily, 
-						URI_PUBLISH_USER, 
-						pub_frequency_type_map);
-	}
-
-	dialog_data->url_editor=TRUE; 
-	dialog_data->url_editor_dlg = (GtkWidget *) url_dlg_data;
-	gtk_widget_set_sensitive ((GtkWidget *) url_dlg_data->ok, FALSE);
-	
-	b = gtk_dialog_run ((GtkDialog *) url_dlg_data->url_editor);
-	
-	if (b == GTK_RESPONSE_OK) {
-		if ((GtkEntry *) url_dlg_data->url_entry) {
-			url_editor_dialog_fb_url_activated (url_dlg_data->url_entry, url_dlg_data);
-			url_dlg_data->url_data->username = g_strdup (gtk_entry_get_text ((GtkEntry *) url_dlg_data->username_entry));
-			url_dlg_data->url_data->password = g_strdup (gtk_entry_get_text ((GtkEntry *) url_dlg_data->password_entry));
-			if (e_dialog_toggle_get (url_dlg_data->remember_pw)) {
-				e_passwords_add_password (url_dlg_data->url_data->location, url_dlg_data->url_data->password);
-				e_passwords_remember_password ("Calendar", url_dlg_data->url_data->location);				
-			} else {
-				e_passwords_forget_password ("Calendar", url_dlg_data->url_data->location);
-			}
-		}
-	}
-	
-	gtk_widget_destroy (url_dlg_data->url_editor);
-	g_object_unref (url_dlg_data->xml);
-	g_free (url_dlg_data);
-	url_dlg_data = NULL;
-	
-	return FALSE;
-}
-
-static gboolean
-get_widgets (UrlDialogData *data)
-{
-#define GW(name) glade_xml_get_widget (data->xml, name)
-
-	data->url_editor = GW ("url_editor");
-	data->calendar_list_label = GW ("calendar_list_label");
-	data->url_dialog = GW ("fb_dialog");
-	data->url_entry = GTK_ENTRY (GW ("url_entry"));
-	data->daily = GW ("daily");
-	data->weekly = GW ("weekly");
-	data->user_publish = GW ("user_publish");
-	data->scrolled_window =  GW ("scrolled_window");
-	data->username_entry = GTK_ENTRY (GW ("username_entry"));
-	data->password_entry = GTK_ENTRY (GW ("password_entry"));
-	data->remember_pw = GW ("remember_pw");
-	data->cancel = GW ("cancel");
-	data->ok = GW ("ok");
-
-#undef GW
-
-	return (data ->url_editor
-		&& data->calendar_list_label
-		&& data->url_entry
-		&& data->daily
-		&& data->weekly
-		&& data->user_publish
-		&& data->scrolled_window
-		&& data->username_entry
-		&& data->password_entry
-		&& data->remember_pw
-		&& data->cancel
-		&& data->ok);
-}
-
-static void
-selection_changed_callback (ESourceSelector *selector,
-			    void *data)
-{
-	UrlDialogData *url_dlg_data  = (UrlDialogData *) data;
-	GSList *selection = e_source_selector_get_selection (selector);
-	
-	if (selection != NULL) {
-		GSList *p, *l =  NULL;
-		
-		for (p = selection; p != NULL; p = p->next) {
-			ESource *source = E_SOURCE(p->data);
-			gchar* source_uid = g_strdup(e_source_peek_uid(source));
-			
-			l = g_slist_append (l, source_uid);
-		}
-		url_dlg_data->url_data->calendars = l;
-	}
-	
-	e_source_selector_free_selection (selection);
-	gtk_widget_set_sensitive ((GtkWidget *) url_dlg_data->ok, TRUE);
-}
-
-/* Connects any necessary signal handlers. */
-static void
-init_widgets (UrlDialogData *url_dlg_data)
-{
-	GtkWidget *selector;
-	ESourceList *source_list;
-	GConfClient *gconf_client;
-	GList *icon_list;
-	GSList *p;
-	
-	gtk_widget_ensure_style (url_dlg_data->url_editor);
-	gtk_container_set_border_width (GTK_CONTAINER (GTK_DIALOG (url_dlg_data->url_editor)->vbox), 0);
-	gtk_container_set_border_width (GTK_CONTAINER (GTK_DIALOG (url_dlg_data->url_editor)->action_area), 12);
-
-	g_signal_connect (url_dlg_data->url_entry, "changed", 
-			  G_CALLBACK (url_editor_dialog_fb_url_changed), 
-			  url_dlg_data);
-	
-	g_signal_connect (url_dlg_data->username_entry, "changed", 
-			  G_CALLBACK (url_editor_dialog_fb_ok_enable), 
-			  url_dlg_data);
-	
-	g_signal_connect (url_dlg_data->password_entry, "changed", 
-			  G_CALLBACK (url_editor_dialog_fb_ok_enable), 
-			  url_dlg_data);
-	
-	g_signal_connect (url_dlg_data->remember_pw, "toggled",
-			  G_CALLBACK (url_editor_dialog_fb_ok_enable),
-			  url_dlg_data);
-	
-	g_signal_connect (url_dlg_data->url_entry, "activate",
-			  G_CALLBACK (url_editor_dialog_fb_url_activated), 
-			  url_dlg_data);
-		  
-	g_signal_connect (url_dlg_data->daily, "toggled",
-			  G_CALLBACK (url_editor_dialog_fb_daily_toggled),
-			  url_dlg_data);
-	
-	g_signal_connect (url_dlg_data->weekly, "toggled",
-			  G_CALLBACK (url_editor_dialog_fb_daily_toggled),
-			  url_dlg_data);
-
-	g_signal_connect (url_dlg_data->user_publish, "toggled",
-			  G_CALLBACK (url_editor_dialog_fb_daily_toggled),
-			  url_dlg_data);
-
-
-	if (url_dlg_data->url_data->calendars) {
-		ESource *source;
-		
-		gconf_client = gconf_client_get_default ();
-		source_list = e_source_list_new_for_gconf (gconf_client, "/apps/evolution/calendar/sources");
-		selector = e_source_selector_new (source_list);
-		
-		p = url_dlg_data->url_data->calendars;
-		for (; p != NULL; p = p->next) {
-			gchar *source_uid;
-
-			source_uid = g_strdup (p->data);
-			source =  e_source_list_peek_source_by_uid (source_list, source_uid);			
-			e_source_selector_select_source ((ESourceSelector *)selector, source);
-			g_free (source_uid);
-		}
-	} else {
-		gconf_client = gconf_client_get_default ();
-		source_list = e_source_list_new_for_gconf (gconf_client, "/apps/evolution/calendar/sources");
-		selector = e_source_selector_new (source_list);
-	}
-	e_source_selector_show_selection ((ESourceSelector *) selector, TRUE);
-	g_signal_connect (selector, "selection_changed", 
-			  G_CALLBACK (selection_changed_callback), 
-			  url_dlg_data);
-
-	gtk_label_set_mnemonic_widget (GTK_LABEL (url_dlg_data->calendar_list_label),
-				       selector);
-	gtk_widget_show (selector);
-	gtk_container_add (GTK_CONTAINER (url_dlg_data->scrolled_window), 
-			   selector);
-
-	icon_list = e_icon_factory_get_icon_list ("stock_calendar");
-	if (icon_list) {
-		gtk_window_set_icon_list (GTK_WINDOW (url_dlg_data->url_editor), icon_list);
-		g_list_foreach (icon_list, (GFunc) g_object_unref, NULL);
-		g_list_free (icon_list);
-	}
-	
-	gtk_widget_show (url_dlg_data->scrolled_window);
-}
-
-static void
-url_editor_dialog_fb_daily_toggled (GtkWidget *button,
-				      void *data)
-{
-	UrlDialogData *url_dlg_data  = (UrlDialogData *) data;
-	enum publish_frequency frequency;
-	
-	frequency = e_dialog_radio_get (url_dlg_data->daily, 
-					pub_frequency_type_map);
-	url_dlg_data->url_data->publish_freq = frequency;
-	gtk_widget_set_sensitive ((GtkWidget *) url_dlg_data->ok, TRUE);
-}
-
-static gboolean
-is_valid_url (const gchar *url)
-{
-	const gchar *p = url;
-
-	if (strlen (url) == 0) {
-		return FALSE;
-	}
-	while (*p) {
-		if ((*p == '\\') || (*p == ' ')) {
-			return FALSE;
-		}
-		p++;
-	}
-	return TRUE;
-}
-
-static void
-url_editor_dialog_fb_url_activated (GtkEntry *url_entry, void *data)
-{
-	UrlDialogData *url_dlg_data = (UrlDialogData *) data;
-	
-	url_dlg_data->url_data->location = g_strdup (gtk_entry_get_text ((GtkEntry *) url_entry));
-}
-
-static void
-url_editor_dialog_fb_url_changed (GtkEntry *url_entry, void *data)
-{
-	UrlDialogData *url_dlg_data = (UrlDialogData *) data;
-	DialogData *url_dialog = (DialogData *) url_dlg_data->url_dialog;
-	
-	const gchar *entry_contents;
-	GtkListStore *model;
-	GtkTreeIter iter;
-	gboolean valid;
-
-	model = (GtkListStore *) gtk_tree_view_get_model (url_dialog->url_list);
-	
-	entry_contents = gtk_entry_get_text ((GtkEntry *) url_entry);
-	if (!is_valid_url (entry_contents)) {
-		gtk_widget_set_sensitive ((GtkWidget *) url_dlg_data->ok, FALSE);
-		return;
-	}
-	/* duplicate check */
-	valid = gtk_tree_model_get_iter_first ((GtkTreeModel *) model, &iter);
-	while (valid) {
-		gchar *url_name;
-		gtk_tree_model_get ((GtkTreeModel *) model, &iter, 
-				    URL_LIST_LOCATION_COLUMN, &url_name, 
-				    -1);
-
-		if (!strcasecmp (url_name, entry_contents)) {
-			gtk_widget_set_sensitive ((GtkWidget *) url_dlg_data->ok, FALSE);
-			return;
-		}
-		valid = gtk_tree_model_iter_next ((GtkTreeModel *) model, &iter);
-	}
-	/* valid and unique */
-	gtk_widget_set_sensitive (GTK_WIDGET (url_dlg_data->ok), TRUE);
-	gtk_widget_grab_default (GTK_WIDGET (url_dlg_data->ok));
-	gtk_entry_set_activates_default ((GtkEntry*) url_dlg_data->url_entry, 
-					TRUE);
-}
-
-static void url_editor_dialog_fb_ok_enable (GtkWidget *widget, void *data) {
-	UrlDialogData *url_dlg_data = (UrlDialogData *) data;
-	
-	gtk_widget_set_sensitive (GTK_WIDGET (url_dlg_data->ok), TRUE);
-}
diff --git a/calendar/gui/dialogs/url-editor-dialog.glade b/calendar/gui/dialogs/url-editor-dialog.glade
deleted file mode 100644
index 27ddf1bd08..0000000000
--- a/calendar/gui/dialogs/url-editor-dialog.glade
+++ /dev/null
@@ -1,551 +0,0 @@
-<?xml version="1.0" standalone="no"?> <!--*- mode: xml -*-->
-<!DOCTYPE glade-interface SYSTEM "http://glade.gnome.org/glade-2.0.dtd">
-
-<glade-interface>
-<requires lib="gnome"/>
-
-<widget class="GtkDialog" id="url_editor">
-  <property name="visible">True</property>
-  <property name="title" translatable="yes">Free/Busy Publishing Settings</property>
-  <property name="type">GTK_WINDOW_TOPLEVEL</property>
-  <property name="window_position">GTK_WIN_POS_CENTER_ON_PARENT</property>
-  <property name="modal">False</property>
-  <property name="default_width">380</property>
-  <property name="default_height">508</property>
-  <property name="resizable">True</property>
-  <property name="destroy_with_parent">False</property>
-  <property name="decorated">True</property>
-  <property name="skip_taskbar_hint">False</property>
-  <property name="skip_pager_hint">False</property>
-  <property name="type_hint">GDK_WINDOW_TYPE_HINT_DIALOG</property>
-  <property name="gravity">GDK_GRAVITY_NORTH_WEST</property>
-  <property name="has_separator">False</property>
-
-  <child internal-child="vbox">
-    <widget class="GtkVBox" id="dialog-vbox1">
-      <property name="visible">True</property>
-      <property name="homogeneous">False</property>
-      <property name="spacing">0</property>
-
-      <child internal-child="action_area">
-	<widget class="GtkHButtonBox" id="dialog-action_area1">
-	  <property name="visible">True</property>
-	  <property name="layout_style">GTK_BUTTONBOX_END</property>
-
-	  <child>
-	    <widget class="GtkButton" id="cancel">
-	      <property name="visible">True</property>
-	      <property name="can_default">True</property>
-	      <property name="has_default">True</property>
-	      <property name="can_focus">True</property>
-	      <property name="label">gtk-cancel</property>
-	      <property name="use_stock">True</property>
-	      <property name="relief">GTK_RELIEF_NORMAL</property>
-	      <property name="focus_on_click">True</property>
-	      <property name="response_id">-6</property>
-	    </widget>
-	  </child>
-
-	  <child>
-	    <widget class="GtkButton" id="ok">
-	      <property name="visible">True</property>
-	      <property name="sensitive">False</property>
-	      <property name="can_default">True</property>
-	      <property name="can_focus">True</property>
-	      <property name="label">gtk-ok</property>
-	      <property name="use_stock">True</property>
-	      <property name="relief">GTK_RELIEF_NORMAL</property>
-	      <property name="focus_on_click">True</property>
-	      <property name="response_id">-5</property>
-	    </widget>
-	  </child>
-	</widget>
-	<packing>
-	  <property name="padding">0</property>
-	  <property name="expand">False</property>
-	  <property name="fill">True</property>
-	  <property name="pack_type">GTK_PACK_END</property>
-	</packing>
-      </child>
-
-      <child>
-	<widget class="GtkVBox" id="vbox13">
-	  <property name="border_width">12</property>
-	  <property name="visible">True</property>
-	  <property name="homogeneous">False</property>
-	  <property name="spacing">12</property>
-
-	  <child>
-	    <widget class="GtkLabel" id="label26">
-	      <property name="visible">True</property>
-	      <property name="label" translatable="yes">&lt;b&gt;Publishing _Location&lt;/b&gt;</property>
-	      <property name="use_underline">True</property>
-	      <property name="use_markup">True</property>
-	      <property name="justify">GTK_JUSTIFY_LEFT</property>
-	      <property name="wrap">False</property>
-	      <property name="selectable">False</property>
-	      <property name="xalign">0</property>
-	      <property name="yalign">0.5</property>
-	      <property name="xpad">0</property>
-	      <property name="ypad">0</property>
-	      <property name="mnemonic_widget">url_entry</property>
-	    </widget>
-	    <packing>
-	      <property name="padding">0</property>
-	      <property name="expand">False</property>
-	      <property name="fill">False</property>
-	    </packing>
-	  </child>
-
-	  <child>
-	    <widget class="GtkHBox" id="hbox9">
-	      <property name="visible">True</property>
-	      <property name="homogeneous">False</property>
-	      <property name="spacing">12</property>
-
-	      <child>
-		<widget class="GtkLabel" id="label18">
-		  <property name="visible">True</property>
-		  <property name="label" translatable="yes"></property>
-		  <property name="use_underline">False</property>
-		  <property name="use_markup">True</property>
-		  <property name="justify">GTK_JUSTIFY_LEFT</property>
-		  <property name="wrap">False</property>
-		  <property name="selectable">False</property>
-		  <property name="xalign">0.5</property>
-		  <property name="yalign">0.5</property>
-		  <property name="xpad">0</property>
-		  <property name="ypad">0</property>
-		</widget>
-		<packing>
-		  <property name="padding">0</property>
-		  <property name="expand">False</property>
-		  <property name="fill">False</property>
-		</packing>
-	      </child>
-
-	      <child>
-		<widget class="GtkEntry" id="url_entry">
-		  <property name="visible">True</property>
-		  <property name="can_focus">True</property>
-		  <property name="editable">True</property>
-		  <property name="visibility">True</property>
-		  <property name="max_length">0</property>
-		  <property name="text" translatable="yes"></property>
-		  <property name="has_frame">True</property>
-		  <property name="invisible_char" translatable="yes">*</property>
-		  <property name="activates_default">False</property>
-		</widget>
-		<packing>
-		  <property name="padding">0</property>
-		  <property name="expand">True</property>
-		  <property name="fill">True</property>
-		</packing>
-	      </child>
-	    </widget>
-	    <packing>
-	      <property name="padding">0</property>
-	      <property name="expand">True</property>
-	      <property name="fill">True</property>
-	    </packing>
-	  </child>
-
-	  <child>
-	    <widget class="GtkLabel" id="label25">
-	      <property name="visible">True</property>
-	      <property name="label" translatable="yes">&lt;b&gt;Publishing Frequency&lt;/b&gt;</property>
-	      <property name="use_underline">False</property>
-	      <property name="use_markup">True</property>
-	      <property name="justify">GTK_JUSTIFY_LEFT</property>
-	      <property name="wrap">False</property>
-	      <property name="selectable">False</property>
-	      <property name="xalign">0</property>
-	      <property name="yalign">0.5</property>
-	      <property name="xpad">0</property>
-	      <property name="ypad">0</property>
-	    </widget>
-	    <packing>
-	      <property name="padding">0</property>
-	      <property name="expand">False</property>
-	      <property name="fill">False</property>
-	    </packing>
-	  </child>
-
-	  <child>
-	    <widget class="GtkHBox" id="hbox10">
-	      <property name="visible">True</property>
-	      <property name="homogeneous">False</property>
-	      <property name="spacing">12</property>
-
-	      <child>
-		<widget class="GtkLabel" id="label29">
-		  <property name="visible">True</property>
-		  <property name="label" translatable="yes"></property>
-		  <property name="use_underline">False</property>
-		  <property name="use_markup">False</property>
-		  <property name="justify">GTK_JUSTIFY_LEFT</property>
-		  <property name="wrap">False</property>
-		  <property name="selectable">False</property>
-		  <property name="xalign">0.5</property>
-		  <property name="yalign">0.5</property>
-		  <property name="xpad">0</property>
-		  <property name="ypad">0</property>
-		</widget>
-		<packing>
-		  <property name="padding">0</property>
-		  <property name="expand">False</property>
-		  <property name="fill">False</property>
-		</packing>
-	      </child>
-
-	      <child>
-		<widget class="GtkVBox" id="vbox12">
-		  <property name="visible">True</property>
-		  <property name="homogeneous">False</property>
-		  <property name="spacing">6</property>
-
-		  <child>
-		    <widget class="GtkRadioButton" id="daily">
-		      <property name="visible">True</property>
-		      <property name="can_focus">True</property>
-		      <property name="label" translatable="yes">_Daily</property>
-		      <property name="use_underline">True</property>
-		      <property name="relief">GTK_RELIEF_NORMAL</property>
-		      <property name="focus_on_click">True</property>
-		      <property name="active">False</property>
-		      <property name="inconsistent">False</property>
-		      <property name="draw_indicator">True</property>
-		    </widget>
-		    <packing>
-		      <property name="padding">0</property>
-		      <property name="expand">False</property>
-		      <property name="fill">False</property>
-		    </packing>
-		  </child>
-
-		  <child>
-		    <widget class="GtkRadioButton" id="weekly">
-		      <property name="visible">True</property>
-		      <property name="can_focus">True</property>
-		      <property name="label" translatable="yes">_Weekly</property>
-		      <property name="use_underline">True</property>
-		      <property name="relief">GTK_RELIEF_NORMAL</property>
-		      <property name="focus_on_click">True</property>
-		      <property name="active">False</property>
-		      <property name="inconsistent">False</property>
-		      <property name="draw_indicator">True</property>
-		      <property name="group">daily</property>
-		    </widget>
-		    <packing>
-		      <property name="padding">0</property>
-		      <property name="expand">False</property>
-		      <property name="fill">False</property>
-		    </packing>
-		  </child>
-
-		  <child>
-		    <widget class="GtkRadioButton" id="user_publish">
-		      <property name="visible">True</property>
-		      <property name="can_focus">True</property>
-		      <property name="label" translatable="yes">_Manual</property>
-		      <property name="use_underline">True</property>
-		      <property name="relief">GTK_RELIEF_NORMAL</property>
-		      <property name="focus_on_click">True</property>
-		      <property name="active">False</property>
-		      <property name="inconsistent">False</property>
-		      <property name="draw_indicator">True</property>
-		      <property name="group">daily</property>
-		    </widget>
-		    <packing>
-		      <property name="padding">0</property>
-		      <property name="expand">False</property>
-		      <property name="fill">False</property>
-		    </packing>
-		  </child>
-		</widget>
-		<packing>
-		  <property name="padding">0</property>
-		  <property name="expand">True</property>
-		  <property name="fill">True</property>
-		</packing>
-	      </child>
-	    </widget>
-	    <packing>
-	      <property name="padding">0</property>
-	      <property name="expand">True</property>
-	      <property name="fill">True</property>
-	    </packing>
-	  </child>
-
-	  <child>
-	    <widget class="GtkLabel" id="calendar_list_label">
-	      <property name="visible">True</property>
-	      <property name="label" translatable="yes">&lt;b&gt;Free/Busy C_alendars&lt;/b&gt;</property>
-	      <property name="use_underline">True</property>
-	      <property name="use_markup">True</property>
-	      <property name="justify">GTK_JUSTIFY_LEFT</property>
-	      <property name="wrap">False</property>
-	      <property name="selectable">False</property>
-	      <property name="xalign">0</property>
-	      <property name="yalign">0.5</property>
-	      <property name="xpad">0</property>
-	      <property name="ypad">0</property>
-	    </widget>
-	    <packing>
-	      <property name="padding">0</property>
-	      <property name="expand">False</property>
-	      <property name="fill">False</property>
-	    </packing>
-	  </child>
-
-	  <child>
-	    <widget class="GtkHBox" id="hbox11">
-	      <property name="visible">True</property>
-	      <property name="homogeneous">False</property>
-	      <property name="spacing">12</property>
-
-	      <child>
-		<widget class="GtkLabel" id="label30">
-		  <property name="visible">True</property>
-		  <property name="label" translatable="yes"></property>
-		  <property name="use_underline">False</property>
-		  <property name="use_markup">False</property>
-		  <property name="justify">GTK_JUSTIFY_LEFT</property>
-		  <property name="wrap">False</property>
-		  <property name="selectable">False</property>
-		  <property name="xalign">0.5</property>
-		  <property name="yalign">0.5</property>
-		  <property name="xpad">0</property>
-		  <property name="ypad">0</property>
-		</widget>
-		<packing>
-		  <property name="padding">0</property>
-		  <property name="expand">False</property>
-		  <property name="fill">False</property>
-		</packing>
-	      </child>
-
-	      <child>
-		<widget class="GtkScrolledWindow" id="scrolled_window">
-		  <property name="height_request">150</property>
-		  <property name="visible">True</property>
-		  <property name="can_focus">True</property>
-		  <property name="hscrollbar_policy">GTK_POLICY_AUTOMATIC</property>
-		  <property name="vscrollbar_policy">GTK_POLICY_AUTOMATIC</property>
-		  <property name="shadow_type">GTK_SHADOW_IN</property>
-		  <property name="window_placement">GTK_CORNER_TOP_LEFT</property>
-
-		  <child>
-		    <placeholder/>
-		  </child>
-		</widget>
-		<packing>
-		  <property name="padding">0</property>
-		  <property name="expand">True</property>
-		  <property name="fill">True</property>
-		</packing>
-	      </child>
-	    </widget>
-	    <packing>
-	      <property name="padding">0</property>
-	      <property name="expand">True</property>
-	      <property name="fill">True</property>
-	    </packing>
-	  </child>
-
-	  <child>
-	    <widget class="GtkLabel" id="label27">
-	      <property name="visible">True</property>
-	      <property name="label" translatable="yes">&lt;b&gt;Authentication&lt;/b&gt;</property>
-	      <property name="use_underline">False</property>
-	      <property name="use_markup">True</property>
-	      <property name="justify">GTK_JUSTIFY_LEFT</property>
-	      <property name="wrap">False</property>
-	      <property name="selectable">False</property>
-	      <property name="xalign">0</property>
-	      <property name="yalign">0.5</property>
-	      <property name="xpad">0</property>
-	      <property name="ypad">0</property>
-	    </widget>
-	    <packing>
-	      <property name="padding">0</property>
-	      <property name="expand">False</property>
-	      <property name="fill">False</property>
-	    </packing>
-	  </child>
-
-	  <child>
-	    <widget class="GtkHBox" id="hbox12">
-	      <property name="visible">True</property>
-	      <property name="homogeneous">False</property>
-	      <property name="spacing">12</property>
-
-	      <child>
-		<widget class="GtkLabel" id="label31">
-		  <property name="visible">True</property>
-		  <property name="label" translatable="yes"></property>
-		  <property name="use_underline">False</property>
-		  <property name="use_markup">False</property>
-		  <property name="justify">GTK_JUSTIFY_LEFT</property>
-		  <property name="wrap">False</property>
-		  <property name="selectable">False</property>
-		  <property name="xalign">0.5</property>
-		  <property name="yalign">0.5</property>
-		  <property name="xpad">0</property>
-		  <property name="ypad">0</property>
-		</widget>
-		<packing>
-		  <property name="padding">0</property>
-		  <property name="expand">False</property>
-		  <property name="fill">False</property>
-		</packing>
-	      </child>
-
-	      <child>
-		<widget class="GtkTable" id="table1">
-		  <property name="visible">True</property>
-		  <property name="n_rows">3</property>
-		  <property name="n_columns">2</property>
-		  <property name="homogeneous">False</property>
-		  <property name="row_spacing">6</property>
-		  <property name="column_spacing">12</property>
-
-		  <child>
-		    <widget class="GtkLabel" id="label13">
-		      <property name="visible">True</property>
-		      <property name="label" translatable="yes">_Username:</property>
-		      <property name="use_underline">True</property>
-		      <property name="use_markup">False</property>
-		      <property name="justify">GTK_JUSTIFY_LEFT</property>
-		      <property name="wrap">False</property>
-		      <property name="selectable">False</property>
-		      <property name="xalign">0</property>
-		      <property name="yalign">0.5</property>
-		      <property name="xpad">0</property>
-		      <property name="ypad">0</property>
-		      <property name="mnemonic_widget">username_entry</property>
-		    </widget>
-		    <packing>
-		      <property name="left_attach">0</property>
-		      <property name="right_attach">1</property>
-		      <property name="top_attach">0</property>
-		      <property name="bottom_attach">1</property>
-		      <property name="x_options">fill</property>
-		      <property name="y_options"></property>
-		    </packing>
-		  </child>
-
-		  <child>
-		    <widget class="GtkLabel" id="label14">
-		      <property name="visible">True</property>
-		      <property name="label" translatable="yes">_Password:</property>
-		      <property name="use_underline">True</property>
-		      <property name="use_markup">False</property>
-		      <property name="justify">GTK_JUSTIFY_LEFT</property>
-		      <property name="wrap">False</property>
-		      <property name="selectable">False</property>
-		      <property name="xalign">0</property>
-		      <property name="yalign">0.5</property>
-		      <property name="xpad">0</property>
-		      <property name="ypad">0</property>
-		      <property name="mnemonic_widget">password_entry</property>
-		    </widget>
-		    <packing>
-		      <property name="left_attach">0</property>
-		      <property name="right_attach">1</property>
-		      <property name="top_attach">1</property>
-		      <property name="bottom_attach">2</property>
-		      <property name="x_options">fill</property>
-		      <property name="y_options"></property>
-		    </packing>
-		  </child>
-
-		  <child>
-		    <widget class="GtkEntry" id="username_entry">
-		      <property name="visible">True</property>
-		      <property name="can_focus">True</property>
-		      <property name="editable">True</property>
-		      <property name="visibility">True</property>
-		      <property name="max_length">0</property>
-		      <property name="text" translatable="yes"></property>
-		      <property name="has_frame">True</property>
-		      <property name="invisible_char" translatable="yes">*</property>
-		      <property name="activates_default">False</property>
-		    </widget>
-		    <packing>
-		      <property name="left_attach">1</property>
-		      <property name="right_attach">2</property>
-		      <property name="top_attach">0</property>
-		      <property name="bottom_attach">1</property>
-		      <property name="y_options"></property>
-		    </packing>
-		  </child>
-
-		  <child>
-		    <widget class="GtkEntry" id="password_entry">
-		      <property name="visible">True</property>
-		      <property name="can_focus">True</property>
-		      <property name="editable">True</property>
-		      <property name="visibility">False</property>
-		      <property name="max_length">0</property>
-		      <property name="text" translatable="yes"></property>
-		      <property name="has_frame">True</property>
-		      <property name="invisible_char" translatable="yes">*</property>
-		      <property name="activates_default">False</property>
-		    </widget>
-		    <packing>
-		      <property name="left_attach">1</property>
-		      <property name="right_attach">2</property>
-		      <property name="top_attach">1</property>
-		      <property name="bottom_attach">2</property>
-		      <property name="y_options"></property>
-		    </packing>
-		  </child>
-
-		  <child>
-		    <widget class="GtkCheckButton" id="remember_pw">
-		      <property name="visible">True</property>
-		      <property name="can_focus">True</property>
-		      <property name="label" translatable="yes">_Remember password</property>
-		      <property name="use_underline">True</property>
-		      <property name="relief">GTK_RELIEF_NORMAL</property>
-		      <property name="focus_on_click">True</property>
-		      <property name="active">False</property>
-		      <property name="inconsistent">False</property>
-		      <property name="draw_indicator">True</property>
-		    </widget>
-		    <packing>
-		      <property name="left_attach">0</property>
-		      <property name="right_attach">2</property>
-		      <property name="top_attach">2</property>
-		      <property name="bottom_attach">3</property>
-		      <property name="x_options">fill</property>
-		      <property name="y_options"></property>
-		    </packing>
-		  </child>
-		</widget>
-		<packing>
-		  <property name="padding">0</property>
-		  <property name="expand">True</property>
-		  <property name="fill">True</property>
-		</packing>
-	      </child>
-	    </widget>
-	    <packing>
-	      <property name="padding">0</property>
-	      <property name="expand">True</property>
-	      <property name="fill">True</property>
-	    </packing>
-	  </child>
-	</widget>
-	<packing>
-	  <property name="padding">0</property>
-	  <property name="expand">True</property>
-	  <property name="fill">True</property>
-	</packing>
-      </child>
-    </widget>
-  </child>
-</widget>
-
-</glade-interface>
diff --git a/calendar/gui/dialogs/url-editor-dialog.h b/calendar/gui/dialogs/url-editor-dialog.h
deleted file mode 100644
index 877dc8a748..0000000000
--- a/calendar/gui/dialogs/url-editor-dialog.h
+++ /dev/null
@@ -1,69 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-
-/* 
- * Author : 
- *  Gary Ekker <gekker@novell.com>
- *
- * Copyright 2004, Ximian, Inc.
- *
- * This program is free software; you can redistribute it and/or 
- * modify it under the terms of version 2 of the GNU General Public 
- * License as published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
- * USA
- */
-
-/*
- * UrlEditorDialog - a GtkObject which handles a libglade-loaded dialog
- * to edit the calendar preference settings.
- */
-
-#ifndef _URL_EDITOR_DIALOG_H_
-#define _URL_EDITOR_DIALOG_H_
-
-G_BEGIN_DECLS
-
-#include <gtk/gtk.h>
-#include <glade/glade.h>
-
-#include "cal-prefs-dialog.h"
-#include <libedataserverui/e-source-selector.h>
-
-struct _UrlDialogData {
-	/* Glade XML data */
-	GladeXML *xml;
-	GtkWidget *url_editor;
-	GtkWidget *url_dialog;
-
-	GtkEntry *url_entry;
-	GtkWidget *daily;
-	GtkWidget *weekly;
-	GtkWidget *user_publish;
-	
-	GtkWidget *calendar_list_label;
-	GtkWidget *scrolled_window;
-	
-	GtkEntry *username_entry;
-	GtkEntry *password_entry;
-	GtkWidget *remember_pw;
-	
-	GtkWidget *cancel;
-	GtkWidget *ok;
-	EPublishUri *url_data;
-};
-typedef struct _UrlDialogData UrlDialogData;
-
-gboolean			
-url_editor_dialog_new (DialogData *dialog_data, EPublishUri *pub_uri);
-
-G_END_DECLS
-
-#endif /* _URL_EDITOR_DIALOG_H_ */
diff --git a/calendar/gui/e-alarm-list.c b/calendar/gui/e-alarm-list.c
deleted file mode 100644
index ff23cbeb2d..0000000000
--- a/calendar/gui/e-alarm-list.c
+++ /dev/null
@@ -1,670 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-
-/* EAlarmList - list of calendar alarms with GtkTreeModel interface.
- *
- * Copyright (C) 2003 Ximian, Inc.
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of version 2 of the GNU General Public
- * License as published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307, USA.
- *
- * Authors:  Hans Petter Jansson  <hpj@ximian.com>
- */
-
-#include <config.h>
-#include <string.h>
-#include <gtk/gtktreemodel.h>
-#include <gtk/gtksignal.h>
-#include <gtk/gtktreednd.h>
-#include <libgnome/gnome-i18n.h>
-#include <glib.h>
-#include <libecal/e-cal-time-util.h>
-#include <e-util/e-time-utils.h>
-#include "calendar-config.h"
-#include "e-alarm-list.h"
-
-#define G_LIST(x)                    ((GList *) x)
-#define E_ALARM_LIST_IS_SORTED(list) (E_ALARM_LIST (list)->sort_column_id != -2)
-#define IS_VALID_ITER(dt_list, iter) (iter!= NULL && iter->user_data != NULL && \
-                                      dt_list->stamp == iter->stamp)
-
-static GType column_types [E_ALARM_LIST_NUM_COLUMNS];
-
-static void         e_alarm_list_init            (EAlarmList         *file_list);
-static void         e_alarm_list_class_init      (EAlarmListClass    *class);
-static void         e_alarm_list_tree_model_init (GtkTreeModelIface  *iface);
-static void         e_alarm_list_finalize        (GObject            *object);
-static guint        e_alarm_list_get_flags       (GtkTreeModel       *tree_model);
-static gint         e_alarm_list_get_n_columns   (GtkTreeModel       *tree_model);
-static GType        e_alarm_list_get_column_type (GtkTreeModel       *tree_model,
-						  gint                index);
-static gboolean     e_alarm_list_get_iter        (GtkTreeModel       *tree_model,
-						  GtkTreeIter        *iter,
-						  GtkTreePath        *path);
-static GtkTreePath *e_alarm_list_get_path        (GtkTreeModel       *tree_model,
-						  GtkTreeIter        *iter);
-static void         e_alarm_list_get_value       (GtkTreeModel       *tree_model,
-						  GtkTreeIter        *iter,
-						  gint                column,
-						  GValue             *value);
-static gboolean     e_alarm_list_iter_next       (GtkTreeModel       *tree_model,
-						  GtkTreeIter        *iter);
-static gboolean     e_alarm_list_iter_children   (GtkTreeModel       *tree_model,
-						  GtkTreeIter        *iter,
-						  GtkTreeIter        *parent);
-static gboolean     e_alarm_list_iter_has_child  (GtkTreeModel       *tree_model,
-						  GtkTreeIter        *iter);
-static gint         e_alarm_list_iter_n_children (GtkTreeModel       *tree_model,
-						  GtkTreeIter        *iter);
-static gboolean     e_alarm_list_iter_nth_child  (GtkTreeModel       *tree_model,
-						  GtkTreeIter        *iter,
-						  GtkTreeIter        *parent,
-						  gint                n);
-static gboolean     e_alarm_list_iter_parent     (GtkTreeModel       *tree_model,
-						  GtkTreeIter        *iter,
-						  GtkTreeIter        *child);
-
-static GObjectClass *parent_class = NULL;
-
-GtkType
-e_alarm_list_get_type (void)
-{
-	static GType alarm_list_type = 0;
-
-	if (!alarm_list_type) {
-		static const GTypeInfo alarm_list_info =
-		{
-			sizeof (EAlarmListClass),
-			NULL,		/* base_init */
-			NULL,		/* base_finalize */
-			(GClassInitFunc) e_alarm_list_class_init,
-			NULL,		/* class_finalize */
-			NULL,		/* class_data */
-			sizeof (EAlarmList),
-			0,
-			(GInstanceInitFunc) e_alarm_list_init,
-		};
-
-		static const GInterfaceInfo tree_model_info =
-		{
-			(GInterfaceInitFunc) e_alarm_list_tree_model_init,
-			NULL,
-			NULL
-		};
-
-		column_types [E_ALARM_LIST_COLUMN_DESCRIPTION] = G_TYPE_STRING;
-
-		alarm_list_type = g_type_register_static (G_TYPE_OBJECT, "EAlarmList",
-							  &alarm_list_info, 0);
-		g_type_add_interface_static (alarm_list_type,
-					     GTK_TYPE_TREE_MODEL,
-					     &tree_model_info);
-	}
-
-	return alarm_list_type;
-}
-
-static void
-e_alarm_list_class_init (EAlarmListClass *class)
-{
-	GObjectClass *object_class;
-
-	parent_class = g_type_class_peek_parent (class);
-	object_class = (GObjectClass *) class;
-
-	object_class->finalize = e_alarm_list_finalize;
-}
-
-static void
-e_alarm_list_tree_model_init (GtkTreeModelIface *iface)
-{
-	iface->get_flags = e_alarm_list_get_flags;
-	iface->get_n_columns = e_alarm_list_get_n_columns;
-	iface->get_column_type = e_alarm_list_get_column_type;
-	iface->get_iter = e_alarm_list_get_iter;
-	iface->get_path = e_alarm_list_get_path;
-	iface->get_value = e_alarm_list_get_value;
-	iface->iter_next = e_alarm_list_iter_next;
-	iface->iter_children = e_alarm_list_iter_children;
-	iface->iter_has_child = e_alarm_list_iter_has_child;
-	iface->iter_n_children = e_alarm_list_iter_n_children;
-	iface->iter_nth_child = e_alarm_list_iter_nth_child;
-	iface->iter_parent = e_alarm_list_iter_parent;
-}
-
-static void
-e_alarm_list_init (EAlarmList *alarm_list)
-{
-	alarm_list->stamp         = g_random_int ();
-	alarm_list->columns_dirty = FALSE;
-	alarm_list->list          = NULL;
-}
-
-EAlarmList *
-e_alarm_list_new (void)
-{
-	EAlarmList *alarm_list;
-
-	alarm_list = E_ALARM_LIST (g_object_new (e_alarm_list_get_type (), NULL));
-
-	return alarm_list;
-}
-
-static void
-all_rows_deleted (EAlarmList *alarm_list)
-{
-	GtkTreePath *path;
-	gint         i;
-
-	if (!alarm_list->list)
-		return;
-
-	path = gtk_tree_path_new ();
-	i = g_list_length (alarm_list->list);
-	gtk_tree_path_append_index (path, i);
-
-	for ( ; i >= 0; i--) {
-		gtk_tree_model_row_deleted (GTK_TREE_MODEL (alarm_list), path);
-		gtk_tree_path_prev (path);
-	}
-
-	gtk_tree_path_free (path);
-}
-
-static void
-row_deleted (EAlarmList *alarm_list, gint n)
-{
-	GtkTreePath *path;
-
-	path = gtk_tree_path_new ();
-	gtk_tree_path_append_index (path, n);
-	gtk_tree_model_row_deleted (GTK_TREE_MODEL (alarm_list), path);
-	gtk_tree_path_free (path);
-}
-
-static void
-row_added (EAlarmList *alarm_list, gint n)
-{
-	GtkTreePath *path;
-	GtkTreeIter  iter;
-
-	path = gtk_tree_path_new ();
-	gtk_tree_path_append_index (path, n);
-
-	if (gtk_tree_model_get_iter (GTK_TREE_MODEL (alarm_list), &iter, path))
-		gtk_tree_model_row_inserted (GTK_TREE_MODEL (alarm_list), path, &iter);
-
-	gtk_tree_path_free (path);
-}
-
-static void
-row_updated (EAlarmList *alarm_list, gint n)
-{
-	GtkTreePath *path;
-	GtkTreeIter  iter;
-
-	path = gtk_tree_path_new ();
-	gtk_tree_path_append_index (path, n);
-
-	if (gtk_tree_model_get_iter (GTK_TREE_MODEL (alarm_list), &iter, path))
-		gtk_tree_model_row_changed (GTK_TREE_MODEL (alarm_list), path, &iter);
-
-	gtk_tree_path_free (path);
-}
-
-static void
-e_alarm_list_finalize (GObject *object)
-{
-	if (G_OBJECT_CLASS (parent_class)->finalize)
-		(* G_OBJECT_CLASS (parent_class)->finalize) (object);
-}
-
-/* Fulfill the GtkTreeModel requirements */
-static guint
-e_alarm_list_get_flags (GtkTreeModel *tree_model)
-{
-	g_return_val_if_fail (E_IS_ALARM_LIST (tree_model), 0);
-
-	return GTK_TREE_MODEL_LIST_ONLY;
-}
-
-static gint
-e_alarm_list_get_n_columns (GtkTreeModel *tree_model)
-{
-	EAlarmList *alarm_list = (EAlarmList *) tree_model;
-
-	g_return_val_if_fail (E_IS_ALARM_LIST (tree_model), 0);
-
-	alarm_list->columns_dirty = TRUE;
-	return E_ALARM_LIST_NUM_COLUMNS;
-}
-
-static GType
-e_alarm_list_get_column_type (GtkTreeModel *tree_model,
-			      gint          index)
-{
-	EAlarmList *alarm_list = (EAlarmList *) tree_model;
-
-	g_return_val_if_fail (E_IS_ALARM_LIST (tree_model), G_TYPE_INVALID);
-	g_return_val_if_fail (index < E_ALARM_LIST_NUM_COLUMNS &&
-			      index >= 0, G_TYPE_INVALID);
-
-	alarm_list->columns_dirty = TRUE;
-	return column_types [index];
-}
-
-const ECalComponentAlarm *
-e_alarm_list_get_alarm (EAlarmList *alarm_list, GtkTreeIter *iter)
-{
-	g_return_val_if_fail (IS_VALID_ITER (alarm_list, iter), NULL);
-
-	return G_LIST (iter->user_data)->data;
-}
-
-static void
-free_alarm (ECalComponentAlarm *alarm)
-{
-	e_cal_component_alarm_free (alarm);
-}
-
-static ECalComponentAlarm *
-copy_alarm (const ECalComponentAlarm *alarm)
-{
-	return e_cal_component_alarm_clone ((ECalComponentAlarm *) alarm);
-}
-
-void
-e_alarm_list_set_alarm (EAlarmList *alarm_list, GtkTreeIter *iter,
-			const ECalComponentAlarm *alarm)
-{
-	ECalComponentAlarm *alarm_old;
-
-	g_return_if_fail (IS_VALID_ITER (alarm_list, iter));
-
-	alarm_old = G_LIST (iter->user_data)->data;
-	free_alarm (alarm_old);
-	G_LIST (iter->user_data)->data = copy_alarm (alarm);
-	row_updated (alarm_list, g_list_position (alarm_list->list, G_LIST (iter->user_data)));
-}
-
-void
-e_alarm_list_append (EAlarmList *alarm_list, GtkTreeIter *iter,
-		     const ECalComponentAlarm *alarm)
-{
-	g_return_if_fail (alarm != NULL);
-
-	alarm_list->list = g_list_append (alarm_list->list, copy_alarm (alarm));
-	row_added (alarm_list, g_list_length (alarm_list->list) - 1);
-
-	if (iter) {
-		iter->user_data = g_list_last (alarm_list->list);
-		iter->stamp     = alarm_list->stamp;
-	}
-}
-
-void
-e_alarm_list_remove (EAlarmList *alarm_list, GtkTreeIter *iter)
-{
-	gint n;
-
-	g_return_if_fail (IS_VALID_ITER (alarm_list, iter));
-
-	n = g_list_position (alarm_list->list, G_LIST (iter->user_data));
-	free_alarm ((ECalComponentAlarm *) G_LIST (iter->user_data)->data);
-	alarm_list->list = g_list_delete_link (alarm_list->list, G_LIST (iter->user_data));
-	row_deleted (alarm_list, n);
-}
-
-void
-e_alarm_list_clear (EAlarmList *alarm_list)
-{
-	GList *l;
-
-	all_rows_deleted (alarm_list);
-
-	for (l = alarm_list->list; l; l = g_list_next (l)) {
-		free_alarm ((ECalComponentAlarm *) l->data);
-	}
-
-	g_list_free (alarm_list->list);
-	alarm_list->list = NULL;
-}
-
-static gboolean
-e_alarm_list_get_iter (GtkTreeModel *tree_model, GtkTreeIter *iter, GtkTreePath *path)
-{
-	EAlarmList *alarm_list = (EAlarmList *) tree_model;
-	GList      *l;
-	gint        i;
-
-	g_return_val_if_fail (E_IS_ALARM_LIST (tree_model), FALSE);
-	g_return_val_if_fail (gtk_tree_path_get_depth (path) > 0, FALSE);
-
-	if (!alarm_list->list)
-		return FALSE;
-
-	alarm_list->columns_dirty = TRUE;
-
-	i = gtk_tree_path_get_indices (path)[0];
-	l = g_list_nth (alarm_list->list, i);
-	if (!l)
-		return FALSE;
-
-	iter->user_data = l;
-	iter->stamp     = alarm_list->stamp;
-	return TRUE;
-}
-
-static GtkTreePath *
-e_alarm_list_get_path (GtkTreeModel *tree_model,
-		       GtkTreeIter  *iter)
-{
-	EAlarmList  *alarm_list = (EAlarmList *) tree_model;
-	GtkTreePath *retval;
-	GList       *l;
-
-	g_return_val_if_fail (E_IS_ALARM_LIST (tree_model), NULL);
-	g_return_val_if_fail (iter->stamp == E_ALARM_LIST (tree_model)->stamp, NULL);
-
-	l = iter->user_data;
-	retval = gtk_tree_path_new ();
-	gtk_tree_path_append_index (retval, g_list_position (alarm_list->list, l));
-	return retval;
-}
-
-/* Builds a string for the duration of the alarm.  If the duration is zero, returns NULL. */
-static char *
-get_alarm_duration_string (struct icaldurationtype *duration)
-{
-	GString *string = g_string_new (NULL);
-	char *ret;
-	gboolean have_something;
-
-	have_something = FALSE;
-
-	if (duration->days >= 1) {
-		g_string_sprintf (string, ngettext("%d day", "%d days", duration->days), duration->days);
-		have_something = TRUE;
-	}
-
-	if (duration->weeks >= 1) {
-		g_string_sprintf (string, ngettext("%d week","%d weeks", duration->weeks), duration->weeks);
-		have_something = TRUE;
-	}
-
-	if (duration->hours >= 1) {
-		g_string_sprintf (string, ngettext("%d hour", "%d hours", duration->hours), duration->hours);
-		have_something = TRUE;
-	}
-
-	if (duration->minutes >= 1) {
-		g_string_sprintf (string, ngettext("%d minute", "%d minutes", duration->minutes), duration->minutes);
-		have_something = TRUE;
-	}
-
-	if (duration->seconds >= 1) {
-		g_string_sprintf (string, ngettext("%d second", "%d seconds", duration->seconds), duration->seconds);
-		have_something = TRUE;
-	}
-
-	if (have_something) {
-		ret = string->str;
-		g_string_free (string, FALSE);
-		return ret;
-	} else {
-		g_string_free (string, TRUE);
-		return NULL;
-	}
-}
-
-static char *
-get_alarm_string (ECalComponentAlarm *alarm)
-{
-	ECalComponentAlarmAction action;
-	ECalComponentAlarmTrigger trigger;
-	char string[256];
-	char *base, *str = NULL, *dur;
-
-	string [0] = '\0';
-
-	e_cal_component_alarm_get_action (alarm, &action);
-	e_cal_component_alarm_get_trigger (alarm, &trigger);
-
-	switch (action) {
-	case E_CAL_COMPONENT_ALARM_AUDIO:
-		base = _("Play a sound");
-		break;
-
-	case E_CAL_COMPONENT_ALARM_DISPLAY:
-		base = _("Pop up an alert");
-		break;
-
-	case E_CAL_COMPONENT_ALARM_EMAIL:
-		base = _("Send an email");
-		break;
-
-	case E_CAL_COMPONENT_ALARM_PROCEDURE:
-		base = _("Run a program");
-		break;
-
-	case E_CAL_COMPONENT_ALARM_NONE:
-	case E_CAL_COMPONENT_ALARM_UNKNOWN:
-	default:
-		base = _("Unknown action to be performed");
-		break;
-	}
-
-	/* FIXME: This does not look like it will localize correctly. */
-
-	switch (trigger.type) {
-	case E_CAL_COMPONENT_ALARM_TRIGGER_RELATIVE_START:
-		dur = get_alarm_duration_string (&trigger.u.rel_duration);
-
-		if (dur) {
-			if (trigger.u.rel_duration.is_neg)
-				str = g_strdup_printf (_("%s %s before the start of the appointment"),
-						       base, dur);
-			else
-				str = g_strdup_printf (_("%s %s after the start of the appointment"),
-						       base, dur);
-
-			g_free (dur);
-		} else
-			str = g_strdup_printf (_("%s at the start of the appointment"), base);
-
-		break;
-
-	case E_CAL_COMPONENT_ALARM_TRIGGER_RELATIVE_END:
-		dur = get_alarm_duration_string (&trigger.u.rel_duration);
-
-		if (dur) {
-			if (trigger.u.rel_duration.is_neg)
-				str = g_strdup_printf (_("%s %s before the end of the appointment"),
-						       base, dur);
-			else
-				str = g_strdup_printf (_("%s %s after the end of the appointment"),
-						       base, dur);
-
-			g_free (dur);
-		} else
-			str = g_strdup_printf (_("%s at the end of the appointment"), base);
-
-		break;
-
-	case E_CAL_COMPONENT_ALARM_TRIGGER_ABSOLUTE: {
-		struct icaltimetype itt;
-		icaltimezone *utc_zone, *current_zone;
-		struct tm tm;
-		char buf[256];
-
-		/* Absolute triggers come in UTC, so convert them to the local timezone */
-
-		itt = trigger.u.abs_time;
-
-		utc_zone = icaltimezone_get_utc_timezone ();
-		current_zone = calendar_config_get_icaltimezone ();
-
-		tm = icaltimetype_to_tm_with_zone (&itt, utc_zone, current_zone);
-
-		e_time_format_date_and_time (&tm, calendar_config_get_24_hour_format (),
-					     FALSE, FALSE, buf, sizeof (buf));
-
-		str = g_strdup_printf (_("%s at %s"), base, buf);
-
-		break; }
-
-	case E_CAL_COMPONENT_ALARM_TRIGGER_NONE:
-	default:
-		str = g_strdup_printf (_("%s for an unknown trigger type"), base);
-		break;
-	}
-
-	return str;
-}
-
-static void
-e_alarm_list_get_value (GtkTreeModel *tree_model,
-			GtkTreeIter  *iter,
-			gint          column,
-			GValue       *value)
-{
-	EAlarmList        *alarm_list = E_ALARM_LIST (tree_model);
-	ECalComponentAlarm *alarm;
-	GList             *l;
-	const gchar       *str;
-
-	g_return_if_fail (E_IS_ALARM_LIST (tree_model));
-	g_return_if_fail (column < E_ALARM_LIST_NUM_COLUMNS);
-	g_return_if_fail (E_ALARM_LIST (tree_model)->stamp == iter->stamp);
-	g_return_if_fail (IS_VALID_ITER (alarm_list, iter));
-
-	g_value_init (value, column_types [column]);
-
-	if (!alarm_list->list)
-		return;
-
-	l        = iter->user_data;
-	alarm = l->data;
-
-	if (!alarm)
-		return;
-
-	switch (column) {
-		case E_ALARM_LIST_COLUMN_DESCRIPTION:
-			str = get_alarm_string (alarm);
-			g_value_set_string (value, str);
-			break;
-	}
-}
-
-static gboolean
-e_alarm_list_iter_next (GtkTreeModel  *tree_model,
-			GtkTreeIter   *iter)
-{
-	GList *l;
-
-	g_return_val_if_fail (E_IS_ALARM_LIST (tree_model), FALSE);
-	g_return_val_if_fail (IS_VALID_ITER (E_ALARM_LIST (tree_model), iter), FALSE);
-
-	if (!E_ALARM_LIST (tree_model)->list)
-		return FALSE;
-
-	l = iter->user_data;
-	l = g_list_next (l);
-	if (l) {
-		iter->user_data = l;
-		return TRUE;
-	}
-
-	return FALSE;
-}
-
-static gboolean
-e_alarm_list_iter_children (GtkTreeModel *tree_model,
-			    GtkTreeIter  *iter,
-			    GtkTreeIter  *parent)
-{
-	EAlarmList *alarm_list = E_ALARM_LIST (tree_model);
-
-	/* this is a list, nodes have no children */
-	if (parent)
-		return FALSE;
-
-	/* but if parent == NULL we return the list itself as children of the
-	 * "root" */
-
-	if (!alarm_list->list)
-		return FALSE;
-
-	iter->stamp     = E_ALARM_LIST (tree_model)->stamp;
-	iter->user_data = alarm_list->list;
-	return TRUE;
-}
-
-static gboolean
-e_alarm_list_iter_has_child (GtkTreeModel *tree_model,
-			     GtkTreeIter  *iter)
-{
-	g_return_val_if_fail (IS_VALID_ITER (E_ALARM_LIST (tree_model), iter), FALSE);
-	return FALSE;
-}
-
-static gint
-e_alarm_list_iter_n_children (GtkTreeModel *tree_model,
-			      GtkTreeIter  *iter)
-{
-	EAlarmList *alarm_list = E_ALARM_LIST (tree_model);
-
-	g_return_val_if_fail (E_IS_ALARM_LIST (tree_model), -1);
-
-	if (iter == NULL)
-		return g_list_length (alarm_list->list);
-
-	g_return_val_if_fail (E_ALARM_LIST (tree_model)->stamp == iter->stamp, -1);
-	return 0;
-}
-
-static gboolean
-e_alarm_list_iter_nth_child (GtkTreeModel *tree_model,
-			     GtkTreeIter  *iter,
-			     GtkTreeIter  *parent,
-			     gint          n)
-{
-	EAlarmList *alarm_list = E_ALARM_LIST (tree_model);
-
-	g_return_val_if_fail (E_IS_ALARM_LIST (tree_model), FALSE);
-
-	if (parent)
-		return FALSE;
-
-	if (alarm_list->list) {
-		GList *l;
-
-		l = g_list_nth (alarm_list->list, n);
-		if (!l)
-			return FALSE;
-
-		iter->stamp     = alarm_list->stamp;
-		iter->user_data = l;
-		return TRUE;
-	}
-
-	return FALSE;
-}
-
-static gboolean
-e_alarm_list_iter_parent (GtkTreeModel *tree_model,
-			  GtkTreeIter  *iter,
-			  GtkTreeIter  *child)
-{
-	return FALSE;
-}
diff --git a/calendar/gui/e-alarm-list.h b/calendar/gui/e-alarm-list.h
deleted file mode 100644
index 93cc8ac58a..0000000000
--- a/calendar/gui/e-alarm-list.h
+++ /dev/null
@@ -1,79 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-
-/* EAlarmList - list of calendar alarms with GtkTreeModel interface.
- *
- * Copyright (C) 2003 Ximian, Inc.
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of version 2 of the GNU General Public
- * License as published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307, USA.
- *
- * Authors:  Hans Petter Jansson  <hpj@ximian.com>
- */
-
-#ifndef E_ALARM_LIST_H
-#define E_ALARM_LIST_H
-
-#include <gtk/gtktreemodel.h>
-#include <libecal/e-cal-component.h>
-
-G_BEGIN_DECLS
-
-#define E_TYPE_ALARM_LIST            (e_alarm_list_get_type ())
-#define E_ALARM_LIST(obj)	         (GTK_CHECK_CAST ((obj), E_TYPE_ALARM_LIST, EAlarmList))
-#define E_ALARM_LIST_CLASS(klass)    (GTK_CHECK_CLASS_CAST ((klass), E_TYPE_ALARM_LIST, EAlarmListClass))
-#define E_IS_ALARM_LIST(obj)         (GTK_CHECK_TYPE ((obj), E_TYPE_ALARM_LIST))
-#define E_IS_ALARM_LIST_CLASS(klass) (GTK_CHECK_CLASS_TYPE ((klass), E_TYPE_ALARM_LIST))
-#define E_ALARM_LIST_GET_CLASS(obj)  (GTK_CHECK_GET_CLASS ((obj), E_TYPE_ALARM_LIST, EAlarmListClass))
-
-typedef struct _EAlarmList       EAlarmList;
-typedef struct _EAlarmListClass  EAlarmListClass;
-
-typedef enum
-{
-	E_ALARM_LIST_COLUMN_DESCRIPTION,
-
-	E_ALARM_LIST_NUM_COLUMNS
-}
-EAlarmListColumnType;
-
-struct _EAlarmList
-{
-	GObject  parent;
-
-	/* Private */
-
-	gint     stamp;
-	GList   *list;
-
-	guint    columns_dirty : 1;
-};
-
-struct _EAlarmListClass
-{
-	GObjectClass parent_class;
-};
-
-GtkType                  e_alarm_list_get_type  (void);
-EAlarmList              *e_alarm_list_new       (void);
-
-const ECalComponentAlarm *e_alarm_list_get_alarm (EAlarmList *alarm_list, GtkTreeIter *iter);
-void                     e_alarm_list_set_alarm (EAlarmList *alarm_list, GtkTreeIter *iter,
-						 const ECalComponentAlarm *datetime);
-void                     e_alarm_list_append    (EAlarmList *alarm_list, GtkTreeIter *iter,
-						 const ECalComponentAlarm *datetime);
-void                     e_alarm_list_remove    (EAlarmList *alarm_list, GtkTreeIter *iter);
-void                     e_alarm_list_clear     (EAlarmList *alarm_list);
-
-G_END_DECLS
-
-#endif  /* E_ALARM_LIST_H */
diff --git a/calendar/gui/e-cal-component-preview.c b/calendar/gui/e-cal-component-preview.c
deleted file mode 100644
index 0a4c777c67..0000000000
--- a/calendar/gui/e-cal-component-preview.c
+++ /dev/null
@@ -1,441 +0,0 @@
-/* -*- Mode: C; indent-tabs-mode: t; c-basic-offset: 8; tab-width: 8 -*- */
-/* e-tasks.c
- *
- * Copyright (C) 2001-2003  Ximian, Inc.
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of version 2 of the GNU General Public
- * License as published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * General Public License for more details.
- *
- * You should have received a copy of the GNU General Public
- * License along with this program; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
- *
- * Authors: Federico Mena Quintero <federico@ximian.com>
- *	    Damon Chaplin <damon@ximian.com>
- *          Rodrigo Moya <rodrigo@ximian.com>
- */
-
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
-
-#include <gnome.h>
-#include <gtk/gtk.h>
-#include <libgnomevfs/gnome-vfs-ops.h>
-#include <libedataserver/e-categories.h>
-#include <libecal/e-cal-time-util.h>
-#include <gtkhtml/gtkhtml.h>
-#include <gtkhtml/gtkhtml-stream.h>
-#include <e-util/e-time-utils.h>
-#include <e-util/e-categories-config.h>
-#include "calendar-config.h"
-#include "e-cal-component-preview.h"
-
-struct _ECalComponentPreviewPrivate {
-	GtkWidget *html;
-
-	icaltimezone *zone;
-};
-
-G_DEFINE_TYPE (ECalComponentPreview, e_cal_component_preview, GTK_TYPE_TABLE);
-
-static void
-on_link_clicked (GtkHTML *html, const char *url, gpointer data)
-{
-        GError *err = NULL;
-
-        gnome_url_show (url, &err);
-
-	if (err) {
-		g_warning ("gnome_url_show: %s", err->message);
-                g_error_free (err);
-        }
-}
-
-static void
-on_url_cb (GtkHTML *html, const char *url, gpointer data)
-{
-#if 0
-	char *msg;
-	ECalComponentPreview *preview = data;
-
-	if (url && *url) {
-		msg = g_strdup_printf (_("Click to open %s"), url);
-		e_calendar_table_set_status_message (e_tasks_get_calendar_table (tasks), msg);
-		g_free (msg);
-	} else
-		e_calendar_table_set_status_message (e_tasks_get_calendar_table (tasks), NULL);
-#endif
-}
-
-/* Callback used when the user selects a URL in the HTML widget */
-static void
-url_requested_cb (GtkHTML *html, const char *url, GtkHTMLStream *stream, gpointer data)
-{
-	if (!strncmp ("file:///", url, strlen ("file:///"))) {
-		GnomeVFSHandle *handle;
-		GnomeVFSResult result;
-		char buffer[4096];
-
-		if (gnome_vfs_open (&handle, url, GNOME_VFS_OPEN_READ) == GNOME_VFS_OK) {
-			do {
-				GnomeVFSFileSize bread;
-
-				result = gnome_vfs_read (handle, buffer, sizeof (buffer), &bread);
-				if (result == GNOME_VFS_OK)
-					gtk_html_stream_write (stream, buffer, bread);
-			} while (result == GNOME_VFS_OK);
-
-			gnome_vfs_close (handle);
-		}
-	}
-}
-
-/* Converts a time_t to a string, relative to the specified timezone */
-static char *
-timet_to_str_with_zone (ECalComponentDateTime *dt, ECal *ecal, icaltimezone *default_zone)
-{
-	struct icaltimetype itt;
-	icaltimezone *zone;
-        struct tm tm;
-        char buf[256];                                                                                              
-
-	if (dt->tzid) {
-		/* If we can't find the zone, we'll guess its "local" */
-		if (!e_cal_get_timezone (ecal, dt->tzid, &zone, NULL))
-			zone = NULL;
-	} else if (dt->value->is_utc) {
-		zone = icaltimezone_get_utc_timezone ();
-	} else {
-		zone = NULL;
-	}
-	
-	
-	itt = *dt->value;
-	if (zone)
-		icaltimezone_convert_time (&itt, zone, default_zone);
-        tm = icaltimetype_to_tm (&itt);
-                                                                                              
-        e_time_format_date_and_time (&tm, calendar_config_get_24_hour_format (),
-                                     FALSE, FALSE, buf, sizeof (buf));
-
-	return g_locale_to_utf8 (buf, -1, NULL, NULL, NULL);
-}
-
-static void
-write_html (GtkHTMLStream *stream, ECal *ecal, ECalComponent *comp, icaltimezone *default_zone)
-{
-	ECalComponentText text;
-	ECalComponentDateTime dt;
-	gchar *str;
-	GSList *l;
-	icalproperty_status status;
-	const char *location;
-	int *priority_value;
-
-	g_return_if_fail (E_IS_CAL_COMPONENT (comp));
-
-	/* write document header */
-	e_cal_component_get_summary (comp, &text);
-
-	if (text.value)
-		gtk_html_stream_printf (stream,
-					"<HTML><BODY><H1>%s</H1>",
-					text.value);
-	else
-		gtk_html_stream_printf (stream,
-					"<HTML><BODY><H1><I>%s</I></H1>",
-					_("Untitled"));
-
-
-	/* write icons for the categories */
-	e_cal_component_get_categories_list (comp, &l);
-	if (l) {
-		GSList *node;
-
-		for (node = l; node != NULL; node = node->next) {
-			const char *icon_file;
-
-			icon_file = e_categories_get_icon_file_for ((const char *) node->data);
-			if (icon_file) {
-				gtk_html_stream_printf (stream, "<IMG ALT=\"%s\" SRC=\"file://%s\">",
-							(const char *) node->data, icon_file);
-			}
-		}
-
-		e_cal_component_free_categories_list (l);
-
-		gtk_html_stream_printf (stream, "<BR><BR><BR>");
-	}
-
-	/* Start table */
-	gtk_html_stream_printf (stream, "<TABLE BORDER=\"0\" WIDTH=\"80%%\">"
-				"<TR><TD VALIGN=\"TOP\" ALIGN=\"RIGHT\" WIDTH=\"15%%\"></TD></TR>");	
-
-	/* write location */
-	e_cal_component_get_location (comp, &location);
-	if (location)
-		gtk_html_stream_printf (stream, "<TR><TD VALIGN=\"TOP\" ALIGN=\"RIGHT\" WIDTH=\"15%%\"><B>%s</B></TD><TD>%s</TD></TR>",
-					_("Summary:"), text.value);
-
-	/* write start date */
-	e_cal_component_get_dtstart (comp, &dt);
-	if (dt.value != NULL) {
-		str = timet_to_str_with_zone (&dt, ecal, default_zone);
-		gtk_html_stream_printf (stream, "<TR><TD VALIGN=\"TOP\" ALIGN=\"RIGHT\"><B>%s</B></TD><TD>%s</TD></TR>",
-					_("Start Date:"), str);
-
-		e_cal_component_free_datetime (&dt);
-		g_free (str);
-	}
-
-	/* write end date */
-	e_cal_component_get_dtend (comp, &dt);
-	if (dt.value != NULL) {
-		str = timet_to_str_with_zone (&dt, ecal, default_zone);
-		gtk_html_stream_printf (stream, "<TR><TD VALIGN=\"TOP\" ALIGN=\"RIGHT\"><B>%s</B></TD><TD>%s</TD></TR>",
-					_("Start Date:"), str);
-
-		e_cal_component_free_datetime (&dt);
-		g_free (str);
-	}
-	
-	/* write Due Date */
-	e_cal_component_get_due (comp, &dt);
-	if (dt.value != NULL) {
-		str = timet_to_str_with_zone (&dt, ecal, default_zone);
-		gtk_html_stream_printf (stream, "<TR><TD VALIGN=\"TOP\" ALIGN=\"RIGHT\"><B>%s</B></TD><TD>%s</TD></TR>",
-					_("Due Date:"), str);
-
-		e_cal_component_free_datetime (&dt);
-		g_free (str);
-	}
-	
-	/* write status */
-	gtk_html_stream_printf (stream, "<TR><TD VALIGN=\"TOP\" ALIGN=\"RIGHT\"><B>%s</B></TD>", _("Status:"));
-	e_cal_component_get_status (comp, &status);
-	switch (status) {
-	case ICAL_STATUS_INPROCESS :
-		str = g_strdup (_("In Progress"));
-		break;
-	case ICAL_STATUS_COMPLETED :
-		str = g_strdup (_("Completed"));
-		break;
-	case ICAL_STATUS_CANCELLED :
-		str = g_strdup (_("Cancelled"));
-		break;
-	case ICAL_STATUS_NONE :
-	default :
-		str = g_strdup (_("Not Started"));
-		break;
-	}
-
-	gtk_html_stream_printf (stream, "<TD>%s</TD></TR>", str);
-	g_free (str);
-
-	/* write priority */
-	e_cal_component_get_priority (comp, &priority_value);
-	if (priority_value && *priority_value != 0) {
-		gtk_html_stream_printf (stream, "<TR><TD VALIGN=\"TOP\" ALIGN=\"RIGHT\"><B>%s</B></TD>", _("Priority:"));
-		if (*priority_value <= 4)
-			str = g_strdup (_("High"));
-		else if (*priority_value == 5)
-			str = g_strdup (_("Normal"));
-		else
-			str = g_strdup (_("Low"));
-
-		gtk_html_stream_printf (stream, "<TD>%s</TD></TR>", str);
-
-		g_free (str);
-		e_cal_component_free_priority (priority_value);
-	}
-
-	/* write description and URL */
-	gtk_html_stream_printf (stream, "<TR><TD COLSPAN=\"2\"><HR></TD></TR>");
-
-	e_cal_component_get_description_list (comp, &l);
-	if (l) {
-		GSList *node;
-
-		gtk_html_stream_printf (stream, "<TR><TD VALIGN=\"TOP\" ALIGN=\"RIGHT\"><B>%s</B></TD>", _("Description:"));
-
-		gtk_html_stream_printf (stream, "<TD>");
-
-		for (node = l; node != NULL; node = node->next) {
-			gint i;
-			GString *str = g_string_new ("");;
-
-			text = * (ECalComponentText *) node->data;
-			for (i = 0; i < strlen (text.value ? text.value : 0); i++) {
-				if (text.value[i] == '\n')
-					str = g_string_append (str, "<BR>");
-				else if (text.value[i] == '<')
-					str = g_string_append (str, "&lt;");
-				else if (text.value[i] == '>')
-					str = g_string_append (str, "&gt;");
-				else
-					str = g_string_append_c (str, text.value[i]);
-			}
-
-			gtk_html_stream_printf (stream, str->str);
-			g_string_free (str, TRUE);
-		}
-
-		gtk_html_stream_printf (stream, "</TD></TR>");
-
-		e_cal_component_free_text_list (l);
-	}
-
-	/* URL */
-	e_cal_component_get_url (comp, (const char **) &str);
-	if (str) {
-		gtk_html_stream_printf (stream, "<TR><TD VALIGN=\"TOP\" ALIGN=\"RIGHT\"><B>%s</B></TD>", _("Web Page:"));
-		gtk_html_stream_printf (stream, "<TD><A HREF=\"%s\">%s</A></TD></TR>", str, str);
-	}
-	
-	gtk_html_stream_printf (stream, "</TABLE>");
-
-	/* close document */
-	gtk_html_stream_printf (stream, "</BODY></HTML>");
-}
-
-static void
-e_cal_component_preview_init (ECalComponentPreview *preview)
-{
-	ECalComponentPreviewPrivate *priv;
-	GtkWidget *scroll;
-	
-	priv = g_new0 (ECalComponentPreviewPrivate, 1);
-	preview->priv = priv;
-
-	priv->html = gtk_html_new ();
-	gtk_html_set_default_content_type (GTK_HTML (priv->html), "charset=utf-8");
-	gtk_html_load_empty (GTK_HTML (priv->html));
-
-	g_signal_connect (G_OBJECT (priv->html), "url_requested",
-			  G_CALLBACK (url_requested_cb), NULL);
-	g_signal_connect (G_OBJECT (priv->html), "link_clicked",
-			  G_CALLBACK (on_link_clicked), preview);
-	g_signal_connect (G_OBJECT (priv->html), "on_url",
-			  G_CALLBACK (on_url_cb), preview);
-
-	scroll = gtk_scrolled_window_new (NULL, NULL);
-	gtk_scrolled_window_set_policy (GTK_SCROLLED_WINDOW (scroll),
-					GTK_POLICY_AUTOMATIC,
-					GTK_POLICY_AUTOMATIC);
-	gtk_scrolled_window_set_shadow_type (GTK_SCROLLED_WINDOW (scroll), GTK_SHADOW_IN);
-
-	gtk_container_add (GTK_CONTAINER (scroll), priv->html);
-	gtk_container_add (GTK_CONTAINER (preview), scroll);
-	gtk_widget_show_all (scroll);
-	
-	priv->zone = icaltimezone_get_utc_timezone ();
-}
-
-static void
-e_cal_component_preview_destroy (GtkObject *object)
-{
-	ECalComponentPreview *preview;
-	ECalComponentPreviewPrivate *priv;
-
-	g_return_if_fail (object != NULL);
-	g_return_if_fail (E_IS_CAL_COMPONENT_PREVIEW (object));
-
-	preview = E_CAL_COMPONENT_PREVIEW (object);
-	priv = preview->priv;
-
-	if (priv) {
-
-		g_free (priv);
-		preview->priv = NULL;
-	}
-
-	if (GTK_OBJECT_CLASS (e_cal_component_preview_parent_class)->destroy)
-		(* GTK_OBJECT_CLASS (e_cal_component_preview_parent_class)->destroy) (object);
-}
-
-static void
-e_cal_component_preview_class_init (ECalComponentPreviewClass *klass)
-{
-	GtkObjectClass *object_class;
-	
-	object_class = (GtkObjectClass *) klass;
-	
-	object_class->destroy = e_cal_component_preview_destroy;
-}
-
-GtkWidget *
-e_cal_component_preview_new (void)
-{
-	ECalComponentPreview *preview;
-
-	preview = g_object_new (e_cal_component_preview_get_type (), NULL);
-
-	return GTK_WIDGET (preview);
-}
-
-icaltimezone *
-e_cal_component_preview_get_default_timezone (ECalComponentPreview *preview)
-{
-	ECalComponentPreviewPrivate *priv;
-	
-	g_return_val_if_fail (preview != NULL, NULL);
-	g_return_val_if_fail (E_IS_CAL_COMPONENT_PREVIEW (preview), NULL);
-
-	priv = preview->priv;
-
-	return priv->zone;
-}
-
-void
-e_cal_component_preview_set_default_timezone (ECalComponentPreview *preview, icaltimezone *zone)
-{
-	ECalComponentPreviewPrivate *priv;
-	
-	g_return_if_fail (preview != NULL);
-	g_return_if_fail (E_IS_CAL_COMPONENT_PREVIEW (preview));
-	g_return_if_fail (zone != NULL);
-
-	priv = preview->priv;
-	
-	priv->zone = zone;
-}
-
-void
-e_cal_component_preview_display (ECalComponentPreview *preview, ECal *ecal, ECalComponent *comp)
-{
-	ECalComponentPreviewPrivate *priv;
-	GtkHTMLStream *stream;
-
-	g_return_if_fail (preview != NULL);
-	g_return_if_fail (E_IS_CAL_COMPONENT_PREVIEW (preview));
-	g_return_if_fail (comp != NULL);
-	g_return_if_fail (E_IS_CAL_COMPONENT (comp));
-
-	priv = preview->priv;
-	
-	stream = gtk_html_begin (GTK_HTML (priv->html));	
-	write_html (stream, ecal, comp, priv->zone);
-	gtk_html_stream_close (stream, GTK_HTML_STREAM_OK);
-}
-
-void
-e_cal_component_preview_clear (ECalComponentPreview *preview)
-{
-	ECalComponentPreviewPrivate *priv;
-
-	g_return_if_fail (preview != NULL);
-	g_return_if_fail (E_IS_CAL_COMPONENT_PREVIEW (preview));
-	
-	priv = preview->priv;
-	
-	gtk_html_load_empty (GTK_HTML (priv->html));
-}
-
diff --git a/calendar/gui/e-cal-component-preview.h b/calendar/gui/e-cal-component-preview.h
deleted file mode 100644
index b2f02f813c..0000000000
--- a/calendar/gui/e-cal-component-preview.h
+++ /dev/null
@@ -1,65 +0,0 @@
-/* -*- Mode: C; indent-tabs-mode: t; c-basic-offset: 8; tab-width: 8 -*- */
-/* e-cal-component-preview.h
- *
- * Copyright (C) 2004  Novell, Inc.
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of version 2 of the GNU General Public
- * License as published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * General Public License for more details.
- *
- * You should have received a copy of the GNU General Public
- * License along with this program; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
- *
- * Authors: Federico Mena Quintero <federico@ximian.com>
- *	    Damon Chaplin <damon@ximian.com>
- */
-
-#ifndef _E_CAL_COMPONENT_PREVIEW_H_
-#define _E_CAL_COMPONENT_PREVIEW_H_
-
-#include <gtk/gtktable.h>
-#include <libecal/e-cal.h>
-
-#define E_TYPE_CAL_COMPONENT_PREVIEW            (e_cal_component_preview_get_type ())
-#define E_CAL_COMPONENT_PREVIEW(obj)            (GTK_CHECK_CAST ((obj), E_TYPE_CAL_COMPONENT_PREVIEW, ECalComponentPreview))
-#define E_CAL_COMPONENT_PREVIEW_CLASS(klass)    (GTK_CHECK_CAST_CLASS ((klass), E_TYPE_CAL_COMPONENT_PREVIEW, \
-				                 ECalComponentPreviewClass))
-#define E_IS_CAL_COMPONENT_PREVIEW(obj)         (GTK_CHECK_TYPE ((obj), E_TYPE_CAL_COMPONENT_PREVIEW))
-#define E_IS_CAL_COMPONENT_PREVIEW_CLASS(klass) (GTK_CHECK_CLASS_TYPE ((klass), E_TYPE_CAL_COMPONENT_PREVIEW))
-
-typedef struct _ECalComponentPreview ECalComponentPreview;
-typedef struct _ECalComponentPreviewClass ECalComponentPreviewClass;
-typedef struct _ECalComponentPreviewPrivate ECalComponentPreviewPrivate;
-
-struct _ECalComponentPreview {
-	GtkTable table;
-
-	/* Private data */
-	ECalComponentPreviewPrivate *priv;
-};
-
-struct _ECalComponentPreviewClass {
-	GtkTableClass parent_class;
-
-	/* Notification signals */
-	void (* selection_changed) (ECalComponentPreview *preview, int n_selected);
-};
-
-
-GtkType    e_cal_component_preview_get_type        (void);
-GtkWidget *e_cal_component_preview_new             (void);
-
-icaltimezone *e_cal_component_preview_get_default_timezone (ECalComponentPreview *preview);
-void e_cal_component_preview_set_default_timezone (ECalComponentPreview *preview, icaltimezone *zone);
-
-void e_cal_component_preview_display             (ECalComponentPreview *preview, ECal *ecal, ECalComponent *comp);
-void e_cal_component_preview_clear             (ECalComponentPreview *preview);
-
-#endif /* _E_CAL_COMPONENT_PREVIEW_H_ */
diff --git a/calendar/gui/e-cal-config.c b/calendar/gui/e-cal-config.c
deleted file mode 100644
index 81e818c806..0000000000
--- a/calendar/gui/e-cal-config.c
+++ /dev/null
@@ -1,190 +0,0 @@
-/*
- * Authors: David Trowbridge <trowbrds@cs.colorado.edu>
- *
- * Copyright (C) 2004 Novell, Inc (www.novell.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/gtkwidget.h>
-#include "e-cal-config.h"
-
-static GObjectClass *ecp_parent_class;
-static GObjectClass *ecph_parent_class;
-
-struct _ECalConfigPrivate {
-	guint source_changed_id;
-};
-
-#define _PRIVATE(o) (g_type_instance_get_private ((GTypeInstance *)o, e_cal_config_get_type ()))
-
-static void
-ecp_init (GObject *o)
-{
-}
-
-static void
-ecp_target_free (EConfig *ec, EConfigTarget *t)
-{
-	struct _ECalConfigPrivate *p = _PRIVATE (ec);
-
-	if (ec->target == t) {
-		switch (t->type) {
-		case EC_CONFIG_TARGET_SOURCE: {
-			ECalConfigTargetSource *s = (ECalConfigTargetSource *)t;
-
-			if (p->source_changed_id) {
-				g_signal_handler_disconnect (s->source, p->source_changed_id);
-				p->source_changed_id = 0;
-			}
-			break; }
-		}
-	}
-
-	switch (t->type) {
-	case EC_CONFIG_TARGET_SOURCE: {
-		ECalConfigTargetSource *s = (ECalConfigTargetSource *)t;
-		if (s->source)
-			g_object_unref (s->source);
-		break; }
-	}
-
-	((EConfigClass *) ecp_parent_class)->target_free (ec, t);
-}
-
-static void
-ecp_source_changed (struct _ESource *source, EConfig *ec)
-{
-	e_config_target_changed (ec, E_CONFIG_TARGET_CHANGED_STATE);
-}
-
-static void
-ecp_set_target (EConfig *ec, EConfigTarget *t)
-{
-	struct _ECalConfigPrivate *p = _PRIVATE(ec);
-
-	((EConfigClass *)ecp_parent_class)->set_target(ec, t);
-
-	if (t) {
-		switch (t->type) {
-		case EC_CONFIG_TARGET_SOURCE: {
-			ECalConfigTargetSource *s = (ECalConfigTargetSource *)t;
-
-			p->source_changed_id = g_signal_connect (s->source, "changed", G_CALLBACK (ecp_source_changed), ec);
-			break; }
-		}
-	}
-}
-
-static void
-ecp_class_init (GObjectClass *klass)
-{
-	((EConfigClass *)klass)->set_target = ecp_set_target;
-	((EConfigClass *)klass)->target_free = ecp_target_free;
-
-	g_type_class_add_private (klass, sizeof (struct _ECalConfigPrivate));
-}
-
-GType
-e_cal_config_get_type (void)
-{
-	static GType type = 0;
-
-	if (!type) {
-		static const GTypeInfo info = {
-			sizeof (ECalConfigClass),
-			NULL, NULL,
-			(GClassInitFunc) ecp_class_init,
-			NULL, NULL,
-			sizeof (ECalConfig), 0,
-			(GInstanceInitFunc) ecp_init
-		};
-
-		ecp_parent_class = g_type_class_ref (e_config_get_type ());
-		type = g_type_register_static (e_config_get_type (), "ECalConfig", &info, 0);
-	}
-
-	return type;
-}
-
-ECalConfig *
-e_cal_config_new (int type, const char *menuid)
-{
-	ECalConfig *ecp = g_object_new (e_cal_config_get_type(), 0);
-	e_config_construct (&ecp->config, type, menuid);
-	return ecp;
-}
-
-ECalConfigTargetSource *
-e_cal_config_target_new_source (ECalConfig *ecp, struct _ESource *source)
-{
-	ECalConfigTargetSource *t = e_config_target_new (&ecp->config, EC_CONFIG_TARGET_SOURCE, sizeof (*t));
-
-	t->source = source;
-	g_object_ref (source);
-
-	return t;
-}
-
-static const EConfigHookTargetMask ecph_no_masks[] = {
-	{ 0 }
-};
-
-static const EConfigHookTargetMap ecph_targets[] = {
-	{ "source", EC_CONFIG_TARGET_SOURCE, ecph_no_masks },
-	{ 0 },
-};
-
-static void
-ecph_class_init (EPluginHookClass *klass)
-{
-	int i;
-
-	klass->id = "org.gnome.evolution.calendar.config:1.0";
-
-	for (i = 0; ecph_targets[i].type; i++) {
-		g_print ("adding hook target '%s'\n", ecph_targets[i].type);
-		e_config_hook_class_add_target_map ((EConfigHookClass *)klass, &ecph_targets[i]);
-	}
-
-	((EConfigHookClass *)klass)->config_class = g_type_class_ref (e_cal_config_get_type ());
-}
-
-GType
-e_cal_config_hook_get_type (void)
-{
-	static GType type = 0;
-
-	if (!type) {
-		static const GTypeInfo info = {
-			sizeof (ECalConfigHookClass),
-			NULL, NULL,
-			(GClassInitFunc) ecph_class_init,
-			NULL, NULL,
-			sizeof (ECalConfigHook), 0,
-			(GInstanceInitFunc) NULL
-		};
-
-		ecph_parent_class = g_type_class_ref (e_config_hook_get_type ());
-		type = g_type_register_static (e_config_hook_get_type (), "ECalConfigHook", &info, 0);
-	}
-
-	return type;
-}
diff --git a/calendar/gui/e-cal-config.h b/calendar/gui/e-cal-config.h
deleted file mode 100644
index 93086dd8ce..0000000000
--- a/calendar/gui/e-cal-config.h
+++ /dev/null
@@ -1,83 +0,0 @@
-/*
- * Authors: David Trowbridge <trowbrds@cs.colorado.edu>
- *
- * Copyright (C) 2004 Novell, Inc (www.novell.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_CAL_CONFIG_H__
-#define __E_CAL_CONFIG_H__
-
-#include <glib-object.h>
-
-#include "e-util/e-config.h"
-
-#ifdef __cplusplus
-extern "C" {
-#pragma }
-#endif
-
-typedef struct _ECalConfig ECalConfig;
-typedef struct _ECalConfigClass ECalConfigClass;
-
-struct _ECalConfig {
-	EConfig config;
-};
-
-struct _ECalConfigClass {
-	EConfigClass config_class;
-};
-
-enum _e_cal_config_target_t {
-	EC_CONFIG_TARGET_SOURCE,
-};
-
-typedef struct _ECalConfigTargetSource ECalConfigTargetSource;
-
-struct _ECalConfigTargetSource {
-	EConfigTarget target;
-
-	struct _ESource *source;
-};
-
-typedef struct _EConfigItem ECalConfigItem;
-
-GType e_cal_config_get_type (void);
-ECalConfig *e_cal_config_new (int type, const char *menuid);
-
-ECalConfigTargetSource *e_cal_config_target_new_source (ECalConfig *ecp, struct _ESource *source);
-
-/* ********************************************************************** */
-
-typedef struct _ECalConfigHook ECalConfigHook;
-typedef struct _ECalConfigHookClass ECalConfigHookClass;
-
-struct _ECalConfigHook {
-	EConfigHook hook;
-};
-
-struct _ECalConfigHookClass {
-	EConfigHookClass hook_class;
-};
-
-GType e_cal_config_hook_get_type (void);
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif
diff --git a/calendar/gui/e-cal-event.c b/calendar/gui/e-cal-event.c
deleted file mode 100644
index f359f471fd..0000000000
--- a/calendar/gui/e-cal-event.c
+++ /dev/null
@@ -1,159 +0,0 @@
-/*
- * Authors: David Trowbridge <trowbrds@cs.colorado.edu>
- *
- * Copyright (C) 2005 Novell, Inc. (www.novell.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 "e-cal-event.h"
-
-static GObjectClass *ece_parent;
-
-static void
-ece_init (GObject *o)
-{
-}
-
-static void
-ece_finalize (GObject *o)
-{
-	((GObjectClass *) ece_parent)->finalize (o);
-}
-
-static void
-ece_target_free (EEvent *ev, EEventTarget *t)
-{
-	switch (t->type) {
-	case E_CAL_EVENT_TARGET_COMPONENT: {
-		ECalEventTargetComponent *s = (ECalEventTargetComponent *) t;
-		if (s->component)
-			g_object_unref (s->component);
-		break; }
-	}
-
-	((EEventClass *)ece_parent)->target_free (ev, t);
-}
-
-static void
-ece_class_init (GObjectClass *klass)
-{
-	klass->finalize = ece_finalize;
-	((EEventClass *)klass)->target_free = ece_target_free;
-}
-
-GType
-e_cal_event_get_type (void)
-{
-	static GType type = 0;
-
-	if (!type) {
-		static const GTypeInfo info = {
-			sizeof (ECalEventClass),
-			NULL, NULL,
-			(GClassInitFunc) ece_class_init,
-			NULL, NULL,
-			sizeof (ECalEvent), 0,
-			(GInstanceInitFunc) ece_init
-		};
-		ece_parent = g_type_class_ref (e_event_get_type ());
-		type = g_type_register_static (e_event_get_type (), "ECalEvent", &info, 0);
-	}
-
-	return type;
-}
-
-ECalEvent *
-e_cal_event_peek (void)
-{
-	static ECalEvent *e_cal_event = NULL;
-	if (!e_cal_event) {
-		e_cal_event = g_object_new (e_cal_event_get_type (), 0);
-		e_event_construct (&e_cal_event->event, "org.gnome.evolution.calendar.events");
-	}
-	return e_cal_event;
-}
-
-ECalEventTargetComponent *
-e_cal_event_target_new_component (ECalEvent *ece, struct _CalendarComponent *component, guint32 flags)
-{
-	ECalEventTargetComponent *t = e_event_target_new (&ece->event, E_CAL_EVENT_TARGET_COMPONENT, sizeof (*t));
-
-	t->component = g_object_ref (component);
-	t->target.mask = ~flags;
-
-	return t;
-}
-
-/* ********************************************************************** */
-
-static void *eceh_parent_class;
-
-static const EEventHookTargetMask eceh_component_masks[] = {
-	{ "migration", E_CAL_EVENT_COMPONENT_MIGRATION },
-	{ 0 },
-};
-
-static const EEventHookTargetMap eceh_targets[] = {
-	{ "component", E_CAL_EVENT_TARGET_COMPONENT, eceh_component_masks },
-	{ 0 },
-};
-
-static void
-eceh_finalize (GObject *o)
-{
-	((GObjectClass *) eceh_parent_class)->finalize (o);
-}
-
-static void
-eceh_class_init (EPluginHookClass *klass)
-{
-	int i;
-
-	((GObjectClass *)klass)->finalize = eceh_finalize;
-	((EPluginHookClass *)klass)->id = "org.gnome.evolution.calendar.events:1.0";
-
-	for (i = 0; eceh_targets[i].type; i++)
-		e_event_hook_class_add_target_map ((EEventHookClass *)klass, &eceh_targets[i]);
-
-	((EEventHookClass *)klass)->event = (EEvent *) e_cal_event_peek ();
-}
-
-GType
-e_cal_event_hook_get_type (void)
-{
-	static GType type = 0;
-
-	if (!type) {
-		static const GTypeInfo info = {
-			sizeof (ECalEventHookClass),
-			NULL, NULL,
-			(GClassInitFunc) eceh_class_init,
-			NULL, NULL,
-			sizeof (ECalEventHook), 0,
-			(GInstanceInitFunc) NULL,
-		};
-
-		eceh_parent_class = g_type_class_ref (e_event_hook_get_type ());
-		type = g_type_register_static (e_event_hook_get_type (), "ECalEventHook", &info, 0);
-	}
-
-	return type;
-}
diff --git a/calendar/gui/e-cal-event.h b/calendar/gui/e-cal-event.h
deleted file mode 100644
index 0a07288973..0000000000
--- a/calendar/gui/e-cal-event.h
+++ /dev/null
@@ -1,87 +0,0 @@
-/*
- * Authors: David Trowbridge <trowbrds@cs.colorado.edu>
- *
- * Copyright (C) 2005 Novell, Inc. (www.novell.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_CAL_EVENT_H__
-#define __E_CAL_EVENT_H__
-
-#include <glib-object.h>
-
-#include "e-util/e-event.h"
-
-#ifdef __cplusplus
-extern "C" {
-#pragma }
-#endif
-
-typedef struct _ECalEvent ECalEvent;
-typedef struct _ECalEventClass ECalEventClass;
-
-enum _e_cal_event_target_t {
-	E_CAL_EVENT_TARGET_COMPONENT,
-};
-
-/* Flags that describe TARGET_COMPONENT */
-enum {
-	E_CAL_EVENT_COMPONENT_MIGRATION = 1 << 0,
-};
-
-typedef struct _ECalEventTargetComponent ECalEventTargetComponent;
-
-struct _ECalEventTargetComponent {
-	EEventTarget target;
-
-	struct _CalendarComponent *component;
-};
-
-struct _ECalEvent {
-	EEvent event;
-
-	struct _ECalEventPrivate *priv;
-};
-
-struct _ECalEventClass {
-	EEventClass event_class;
-};
-
-GType                     e_cal_event_get_type (void);
-ECalEvent*                e_cal_event_peek (void);
-ECalEventTargetComponent* e_cal_event_target_new_component (ECalEvent *ece, struct _CalendarComponent *component, guint32 flags);
-
-/* ********************************************************************** */
-
-typedef struct _ECalEventHook ECalEventHook;
-typedef struct _ECalEventHookClass ECalEventHookClass;
-
-struct _ECalEventHook {
-	EEventHook hook;
-};
-
-struct _ECalEventHookClass {
-	EEventHookClass hook_class;
-};
-
-GType e_cal_event_hook_get_type (void);
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif /* __E_CAL_EVENT_H__ */
diff --git a/calendar/gui/e-cal-list-view-config.c b/calendar/gui/e-cal-list-view-config.c
deleted file mode 100644
index 51ebd58ed4..0000000000
--- a/calendar/gui/e-cal-list-view-config.c
+++ /dev/null
@@ -1,235 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-
-/* 
- * Author : 
- *  Rodrigo Moya <rodrigo@ximian.com>
- *
- * Copyright 2003, Ximian, Inc.
- *
- * This program is free software; you can redistribute it and/or 
- * modify it under the terms of version 2 of the GNU General Public 
- * License as published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
- * USA
- */
-
-#include "calendar-config.h"
-#include "e-cal-list-view-config.h"
-
-struct _ECalListViewConfigPrivate {
-	ECalListView *view;
-
-	GList *notifications;
-};
-
-/* Property IDs */
-enum props {
-	PROP_0,
-	PROP_VIEW,
-};
-
-G_DEFINE_TYPE (ECalListViewConfig, e_cal_list_view_config, G_TYPE_OBJECT);
-
-static void
-e_cal_list_view_config_set_property (GObject *object, guint property_id, const GValue *value, GParamSpec *pspec)
-{
-	ECalListViewConfig *view_config;
-	ECalListViewConfigPrivate *priv;
-
-	view_config = E_CAL_LIST_VIEW_CONFIG (object);
-	priv = view_config->priv;
-	
-	switch (property_id) {
-	case PROP_VIEW:
-		e_cal_list_view_config_set_view (view_config, g_value_get_object (value));
-		break;
-	default:
-		G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec);
-		break;
-	}
-}
-
-static void
-e_cal_list_view_config_get_property (GObject *object, guint property_id, GValue *value, GParamSpec *pspec)
-{
-	ECalListViewConfig *view_config;
-	ECalListViewConfigPrivate *priv;
-
-	view_config = E_CAL_LIST_VIEW_CONFIG (object);
-	priv = view_config->priv;
-	
-	switch (property_id) {
-	case PROP_VIEW:
-		g_value_set_object (value, e_cal_list_view_config_get_view (view_config));
-		break;
-	default:
-		G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec);
-		break;
-	}
-}
-
-static void
-e_cal_list_view_config_dispose (GObject *object)
-{
-	ECalListViewConfig *view_config = E_CAL_LIST_VIEW_CONFIG (object);
-	ECalListViewConfigPrivate *priv;
-	
-	priv = view_config->priv;
-
-	e_cal_list_view_config_set_view (view_config, NULL);
-	
-	if (G_OBJECT_CLASS (e_cal_list_view_config_parent_class)->dispose)
-		G_OBJECT_CLASS (e_cal_list_view_config_parent_class)->dispose (object);
-}
-
-static void
-e_cal_list_view_config_finalize (GObject *object)
-{
-	ECalListViewConfig *view_config = E_CAL_LIST_VIEW_CONFIG (object);
-	ECalListViewConfigPrivate *priv;
-	
-	priv = view_config->priv;
-
-	g_free (priv);
-	
-	if (G_OBJECT_CLASS (e_cal_list_view_config_parent_class)->finalize)
-		G_OBJECT_CLASS (e_cal_list_view_config_parent_class)->finalize (object);
-}
-
-static void
-e_cal_list_view_config_class_init (ECalListViewConfigClass *klass)
-{
-	GObjectClass *gobject_class = G_OBJECT_CLASS (klass);
-	GParamSpec *spec;
-	
-	/* Method override */
-	gobject_class->set_property = e_cal_list_view_config_set_property;
-	gobject_class->get_property = e_cal_list_view_config_get_property;
-	gobject_class->dispose = e_cal_list_view_config_dispose;
-	gobject_class->finalize = e_cal_list_view_config_finalize;
-
-	spec = g_param_spec_object ("view", NULL, NULL, e_cal_list_view_get_type (),
-				    G_PARAM_READABLE | G_PARAM_WRITABLE | G_PARAM_CONSTRUCT);
-	g_object_class_install_property (gobject_class, PROP_VIEW, spec);
-}
-
-static void
-e_cal_list_view_config_init (ECalListViewConfig *view_config)
-{
-	view_config->priv = g_new0 (ECalListViewConfigPrivate, 1);
-
-}
-
-ECalListViewConfig *
-e_cal_list_view_config_new (ECalListView *list_view)
-{
-	ECalListViewConfig *view_config;
-	
-	view_config = g_object_new (e_cal_list_view_config_get_type (), "view", list_view, NULL);
-
-	return view_config;
-}
-
-ECalListView *
-e_cal_list_view_config_get_view (ECalListViewConfig *view_config) 
-{
-	ECalListViewConfigPrivate *priv;
-
-	g_return_val_if_fail (view_config != NULL, NULL);
-	g_return_val_if_fail (E_IS_CAL_LIST_VIEW_CONFIG (view_config), NULL);
-
-	priv = view_config->priv;
-	
-	return priv->view;
-}
-
-static void
-set_timezone (ECalListView *list_view) 
-{
-	icaltimezone *zone;
-	
-	zone = calendar_config_get_icaltimezone ();	
-	e_calendar_view_set_timezone (E_CALENDAR_VIEW (list_view), zone);
-}
-
-static void
-timezone_changed_cb (GConfClient *client, guint id, GConfEntry *entry, gpointer data)
-{
-	ECalListViewConfig *view_config = data;
-	ECalListViewConfigPrivate *priv;
-	
-	priv = view_config->priv;
-	
-	set_timezone (priv->view);
-}
-
-static void
-set_twentyfour_hour (ECalListView *list_view) 
-{
-	gboolean use_24_hour;
-
-	use_24_hour = calendar_config_get_24_hour_format ();
-
-	e_calendar_view_set_use_24_hour_format (E_CALENDAR_VIEW (list_view), use_24_hour);
-}
-
-static void
-twentyfour_hour_changed_cb (GConfClient *client, guint id, GConfEntry *entry, gpointer data)
-{
-	ECalListViewConfig *view_config = data;
-	ECalListViewConfigPrivate *priv;
-	
-	priv = view_config->priv;
-	
-	set_twentyfour_hour (priv->view);
-}
-
-void
-e_cal_list_view_config_set_view (ECalListViewConfig *view_config, ECalListView *list_view) 
-{
-	ECalListViewConfigPrivate *priv;
-	guint not;
-	GList *l;
-	
-	g_return_if_fail (view_config != NULL);
-	g_return_if_fail (E_IS_CAL_LIST_VIEW_CONFIG (view_config));
-
-	priv = view_config->priv;
-	
-	if (priv->view) {
-		g_object_unref (priv->view);
-		priv->view = NULL;
-	}
-	
-	for (l = priv->notifications; l; l = l->next)
-		calendar_config_remove_notification (GPOINTER_TO_UINT (l->data));
-
-	g_list_free (priv->notifications);
-	priv->notifications = NULL;
-
-	/* If the new view is NULL, return right now */
-	if (!list_view)
-		return;
-	
-	priv->view = g_object_ref (list_view);
-
-	/* Time zone */
-	set_timezone (list_view);
-	
-	not = calendar_config_add_notification_timezone (timezone_changed_cb, view_config);
-	priv->notifications = g_list_prepend (priv->notifications, GUINT_TO_POINTER (not));
-
-	/* 24 Hour format */
-	set_twentyfour_hour (list_view);	
-
-	not = calendar_config_add_notification_24_hour_format (twentyfour_hour_changed_cb, view_config);
-	priv->notifications = g_list_prepend (priv->notifications, GUINT_TO_POINTER (not));
-}
diff --git a/calendar/gui/e-cal-list-view-config.h b/calendar/gui/e-cal-list-view-config.h
deleted file mode 100644
index d2f87c36b3..0000000000
--- a/calendar/gui/e-cal-list-view-config.h
+++ /dev/null
@@ -1,55 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-/* 
- * Author : 
- *  JP Rosevear <jpr@ximian.com>
- *
- * Copyright 2003, Ximian, Inc.
- *
- * This program is free software; you can redistribute it and/or 
- * modify it under the terms of version 2 of the GNU General Public 
- * License as published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
- * USA
- */
-
-#ifndef _E_CAL_LIST_VIEW_CONFIG_H_
-#define _E_CAL_LIST_VIEW_CONFIG_H_
-
-#include "e-cal-list-view.h"
-
-G_BEGIN_DECLS
-
-#define E_CAL_LIST_VIEW_CONFIG(obj)          GTK_CHECK_CAST (obj, e_cal_list_view_config_get_type (), ECalListViewConfig)
-#define E_CAL_LIST_VIEW_CONFIG_CLASS(klass)  GTK_CHECK_CLASS_CAST (klass, e_cal_list_view_config_get_type (), ECalListViewConfigClass)
-#define E_IS_CAL_LIST_VIEW_CONFIG(obj)       GTK_CHECK_TYPE (obj, e_cal_list_view_config_get_type ())
-        
-typedef struct _ECalListViewConfig        ECalListViewConfig;
-typedef struct _ECalListViewConfigClass   ECalListViewConfigClass;
-typedef struct _ECalListViewConfigPrivate ECalListViewConfigPrivate;
-
-struct _ECalListViewConfig {
-	GObject parent;
-
-	ECalListViewConfigPrivate *priv;
-};
-
-struct _ECalListViewConfigClass {
-	GObjectClass parent_class;
-};
-
-GType          e_cal_list_view_config_get_type (void);
-ECalListViewConfig *e_cal_list_view_config_new (ECalListView *list_view);
-ECalListView *e_cal_list_view_config_get_view (ECalListViewConfig *view_config);
-void e_cal_list_view_config_set_view (ECalListViewConfig *view_config, ECalListView *list_view);
-
-G_END_DECLS
-
-#endif
diff --git a/calendar/gui/e-cal-list-view.c b/calendar/gui/e-cal-list-view.c
deleted file mode 100644
index 6a5915c89c..0000000000
--- a/calendar/gui/e-cal-list-view.c
+++ /dev/null
@@ -1,562 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-
-/*
- * Authors:
- *  Hans Petter Jansson  <hpj@ximian.com>
- *
- * Copyright 2003, Ximian, Inc.
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of version 2 of the GNU General Public
- * License as published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
- * USA
- */
-
-/*
- * ECalListView - display calendar events in an ETable.
- */
-
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
-
-#include "e-cal-list-view.h"
-#include "ea-calendar.h"
-
-#include <math.h>
-#include <time.h>
-#include <sys/stat.h>
-#include <gdk/gdkkeysyms.h>
-#include <gdk/gdkx.h>
-#include <gtk/gtkdnd.h>
-#include <gtk/gtkmain.h>
-#include <gtk/gtksignal.h>
-#include <gtk/gtkvscrollbar.h>
-#include <gtk/gtkwindow.h>
-#include <gal/widgets/e-gui-utils.h>
-#include <gal/e-table/e-table-memory-store.h>
-#include <gal/e-table/e-cell-checkbox.h>
-#include <gal/e-table/e-cell-toggle.h>
-#include <gal/e-table/e-cell-text.h>
-#include <gal/e-table/e-cell-combo.h>
-#include <gal/widgets/e-popup-menu.h>
-#include <widgets/misc/e-cell-date-edit.h>
-#include <libgnome/gnome-i18n.h>
-#include <libgnome/gnome-exec.h>
-#include <libgnome/gnome-util.h>
-#include <e-util/e-categories-config.h>
-#include <e-util/e-dialog-utils.h>
-
-#include <libecal/e-cal-time-util.h>
-#include "e-cal-model-calendar.h"
-#include "e-cell-date-edit-text.h"
-#include "dialogs/delete-comp.h"
-#include "dialogs/delete-error.h"
-#include "dialogs/send-comp.h"
-#include "dialogs/cancel-comp.h"
-#include "dialogs/recur-comp.h"
-#include "comp-util.h"
-#include "itip-utils.h"
-#include "calendar-commands.h"
-#include "calendar-config.h"
-#include "goto.h"
-#include "misc.h"
-
-static void      e_cal_list_view_destroy                (GtkObject *object);
-
-static GList    *e_cal_list_view_get_selected_events    (ECalendarView *cal_view);
-static gboolean  e_cal_list_view_get_selected_time_range (ECalendarView *cal_view, time_t *start_time, time_t *end_time);
-static gboolean  e_cal_list_view_get_visible_time_range (ECalendarView *cal_view, time_t *start_time,
-							 time_t *end_time);
-
-static gboolean  e_cal_list_view_popup_menu             (GtkWidget *widget);
-
-static void      e_cal_list_view_show_popup_menu        (ECalListView *cal_list_view, gint row,
-							 GdkEvent *gdk_event);
-static gboolean  e_cal_list_view_on_table_double_click   (GtkWidget *table, gint row, gint col,
-							 GdkEvent *event, gpointer data);
-static gboolean  e_cal_list_view_on_table_right_click   (GtkWidget *table, gint row, gint col,
-							 GdkEvent *event, gpointer data);
-static void e_cal_list_view_cursor_change_cb (ETable *etable, gint row, gpointer data);
-
-G_DEFINE_TYPE (ECalListView, e_cal_list_view, E_TYPE_CALENDAR_VIEW);
-
-static void
-e_cal_list_view_class_init (ECalListViewClass *class)
-{
-	GtkObjectClass *object_class;
-	GtkWidgetClass *widget_class;
-	ECalendarViewClass *view_class;
-
-	object_class = (GtkObjectClass *) class;
-	widget_class = (GtkWidgetClass *) class;
-	view_class = (ECalendarViewClass *) class;
-
-	/* Method override */
-	object_class->destroy		= e_cal_list_view_destroy;
-
-	widget_class->popup_menu = e_cal_list_view_popup_menu;
-
-	view_class->get_selected_events = e_cal_list_view_get_selected_events;
-	view_class->get_selected_time_range = e_cal_list_view_get_selected_time_range;
-	view_class->get_visible_time_range = e_cal_list_view_get_visible_time_range;
-}
-
-static gint
-date_compare_cb (gconstpointer a, gconstpointer b)
-{
-	ECellDateEditValue *dv1 = (ECellDateEditValue *) a;
-	ECellDateEditValue *dv2 = (ECellDateEditValue *) b;
-	struct icaltimetype tt;
-
-	/* First check if either is NULL. NULL dates sort last. */
-	if (!dv1 || !dv2) {
-		if (dv1 == dv2)
-			return 0;
-		else if (dv1)
-			return -1;
-		else
-			return 1;
-	}
-
-	/* Copy the 2nd value and convert it to the same timezone as the
-	   first. */
-	tt = dv2->tt;
-
-	icaltimezone_convert_time (&tt, dv2->zone, dv1->zone);
-
-	/* Now we can compare them. */
-
-	return icaltime_compare (dv1->tt, tt);
-}
-
-static void
-e_cal_list_view_init (ECalListView *cal_list_view)
-{
-	cal_list_view->query = NULL;
-	cal_list_view->table_scrolled = NULL;
-	cal_list_view->cursor_event = NULL;
-	cal_list_view->set_table_id = 0;
-}
-
-/* Returns the current time, for the ECellDateEdit items. */
-static struct tm
-get_current_time_cb (ECellDateEdit *ecde, gpointer data)
-{
-	ECalListView *cal_list_view = data;
-	icaltimezone *zone;
-	struct tm tmp_tm = { 0 };
-	struct icaltimetype tt;
-
-	zone = e_calendar_view_get_timezone (E_CALENDAR_VIEW (cal_list_view));
-	tt = icaltime_from_timet_with_zone (time (NULL), FALSE, zone);
-
-	/* Now copy it to the struct tm and return it. */
-	tmp_tm.tm_year  = tt.year - 1900;
-	tmp_tm.tm_mon   = tt.month - 1;
-	tmp_tm.tm_mday  = tt.day;
-	tmp_tm.tm_hour  = tt.hour;
-	tmp_tm.tm_min   = tt.minute;
-	tmp_tm.tm_sec   = tt.second;
-	tmp_tm.tm_isdst = -1;
-
-	return tmp_tm;
-}
-
-void
-e_cal_list_view_load_state (ECalListView *cal_list_view, gchar *filename)
-{
-	struct stat st;
-
-	g_return_if_fail (cal_list_view != NULL);
-	g_return_if_fail (E_IS_CAL_LIST_VIEW (cal_list_view));
-	g_return_if_fail (filename != NULL);
-
-	if (stat (filename, &st) == 0 && st.st_size > 0 && S_ISREG (st.st_mode))
-		e_table_load_state (e_table_scrolled_get_table (cal_list_view->table_scrolled), filename);
-}
-
-void
-e_cal_list_view_save_state (ECalListView *cal_list_view, gchar *filename)
-{
-	g_return_if_fail (cal_list_view != NULL);
-	g_return_if_fail (E_IS_CAL_LIST_VIEW (cal_list_view));
-	g_return_if_fail (filename != NULL);
-
-	e_table_save_state (e_table_scrolled_get_table (cal_list_view->table_scrolled), filename);
-}
-
-static void
-setup_e_table (ECalListView *cal_list_view)
-{
-	ECalModelCalendar *model;
-	ETableExtras      *extras;
-	GList             *strings;
-	ECell             *cell, *popup_cell;
-	GnomeCanvas       *canvas;
-	GtkStyle          *style;
-
-	model = E_CAL_MODEL_CALENDAR (e_calendar_view_get_model (E_CALENDAR_VIEW (cal_list_view)));
-
-	/* Create the header columns */
-
-	extras = e_table_extras_new();
-
-	/* Normal string fields */
-
-	cell = e_cell_text_new (NULL, GTK_JUSTIFY_LEFT);
-	g_object_set (G_OBJECT (cell),
-		      "bg_color_column", E_CAL_MODEL_FIELD_COLOR,
-		      NULL);
-
-	e_table_extras_add_cell (extras, "calstring", cell);
-
-	/* Date fields */
-
-	cell = e_cell_date_edit_text_new (NULL, GTK_JUSTIFY_LEFT);
-	g_object_set (G_OBJECT (cell),
-		      "bg_color_column", E_CAL_MODEL_FIELD_COLOR,
-		      NULL);
-
-	popup_cell = e_cell_date_edit_new ();
-	e_cell_popup_set_child (E_CELL_POPUP (popup_cell), cell);
-	g_object_unref (cell);
-	e_table_extras_add_cell (extras, "dateedit", popup_cell);
-	cal_list_view->dates_cell = E_CELL_DATE_EDIT (popup_cell);
-
-	e_cell_date_edit_set_get_time_callback (E_CELL_DATE_EDIT (popup_cell),
-						get_current_time_cb,
-						cal_list_view, NULL);
-
-	/* Combo fields */
-
-	cell = e_cell_text_new (NULL, GTK_JUSTIFY_LEFT);
-	g_object_set (G_OBJECT (cell),
-		      "bg_color_column", E_CAL_MODEL_FIELD_COLOR,
-		      "editable", FALSE,
-		      NULL);
-
-	popup_cell = e_cell_combo_new ();
-	e_cell_popup_set_child (E_CELL_POPUP (popup_cell), cell);
-	g_object_unref (cell);
-
-	strings = NULL;
-	strings = g_list_append (strings, (char*) _("Public"));
-	strings = g_list_append (strings, (char*) _("Private"));
-	strings = g_list_append (strings, (char*) _("Confidential"));
-	e_cell_combo_set_popdown_strings (E_CELL_COMBO (popup_cell),
-					  strings);
-
-	e_table_extras_add_cell (extras, "classification", popup_cell);
-
-	/* Sorting */
-
-	e_table_extras_add_compare (extras, "date-compare",
-				    date_compare_cb);
-
-	/* Create table view */
-
-	cal_list_view->table_scrolled = E_TABLE_SCROLLED (
-		e_table_scrolled_new_from_spec_file (E_TABLE_MODEL (model),
-						     extras,
-						     EVOLUTION_ETSPECDIR "/e-cal-list-view.etspec",
-						     NULL));
-
-	/* Make sure text is readable on top of our color coding */
-
-	canvas = GNOME_CANVAS (e_table_scrolled_get_table (cal_list_view->table_scrolled)->table_canvas);
-	style = gtk_widget_get_style (GTK_WIDGET (canvas));
-
-	style->fg [GTK_STATE_SELECTED] = style->text [GTK_STATE_NORMAL];
-	style->fg [GTK_STATE_ACTIVE]   = style->text [GTK_STATE_NORMAL];
-	gtk_widget_set_style (GTK_WIDGET (canvas), style);
-
-	/* Connect signals */
-	g_signal_connect (e_table_scrolled_get_table (cal_list_view->table_scrolled),
-			  "double_click", G_CALLBACK (e_cal_list_view_on_table_double_click), cal_list_view);
-	g_signal_connect (e_table_scrolled_get_table (cal_list_view->table_scrolled),
-			  "right-click", G_CALLBACK (e_cal_list_view_on_table_right_click), cal_list_view);
-	g_signal_connect_after (e_table_scrolled_get_table (cal_list_view->table_scrolled), 
-				"cursor_change", G_CALLBACK (e_cal_list_view_cursor_change_cb), cal_list_view);
-
-	/* Attach and show widget */
-
-	gtk_table_attach (GTK_TABLE (cal_list_view), GTK_WIDGET (cal_list_view->table_scrolled),
-			  0, 2, 0, 2, GTK_EXPAND | GTK_FILL, GTK_EXPAND | GTK_FILL, 1, 1);
-	gtk_widget_show (GTK_WIDGET (cal_list_view->table_scrolled));
-}
-
-GtkWidget *
-e_cal_list_view_construct (ECalListView *cal_list_view)
-{
-	setup_e_table (cal_list_view);
-
-	return GTK_WIDGET (cal_list_view);
-}
-
-/**
- * e_cal_list_view_new:
- * @Returns: a new #ECalListView.
- *
- * Creates a new #ECalListView.
- **/
-GtkWidget *
-e_cal_list_view_new (void)
-{
-	ECalListView *cal_list_view;
-	ECalModel *model;
-	
-	model = E_CAL_MODEL (e_cal_model_calendar_new ());
-	e_cal_model_set_flags (model, E_CAL_MODEL_FLAGS_EXPAND_RECURRENCES);
-
-	cal_list_view = g_object_new (e_cal_list_view_get_type (), "model", model, NULL);
-	if (!e_cal_list_view_construct (cal_list_view)) {
-		g_message (G_STRLOC ": Could not construct the calendar list GUI");
-		g_object_unref (cal_list_view);
-		return NULL;
-	}
-
-	g_object_unref (model);
-
-	return GTK_WIDGET (cal_list_view);
-}
-
-static void
-e_cal_list_view_destroy (GtkObject *object)
-{
-	ECalListView *cal_list_view;
-
-	cal_list_view = E_CAL_LIST_VIEW (object);
-
-	if (cal_list_view->query) {
-		g_signal_handlers_disconnect_matched (cal_list_view->query, G_SIGNAL_MATCH_DATA,
-						      0, 0, NULL, NULL, cal_list_view);
-		g_object_unref (cal_list_view->query);
-		cal_list_view->query = NULL;
-	}
-
-	if (cal_list_view->set_table_id) {
-		g_source_remove (cal_list_view->set_table_id);
-		cal_list_view->set_table_id = 0;
-	}
-
-	if (cal_list_view->cursor_event) {
-		g_free (cal_list_view->cursor_event);
-		cal_list_view->cursor_event = NULL;
-	}
-
-	if (cal_list_view->table_scrolled) {
-		gtk_widget_destroy (GTK_WIDGET (cal_list_view->table_scrolled));
-		cal_list_view->table_scrolled = NULL;
-	}
-
-	GTK_OBJECT_CLASS (e_cal_list_view_parent_class)->destroy (object);
-}
-
-static void
-e_cal_list_view_show_popup_menu (ECalListView *cal_list_view, gint row, GdkEvent *gdk_event)
-{
-	GtkMenu *menu;
-
-	menu = e_calendar_view_create_popup_menu (E_CALENDAR_VIEW (cal_list_view));
-	gtk_menu_popup(menu, NULL, NULL, NULL, NULL, gdk_event?gdk_event->button.button:0, gdk_event?gdk_event->button.time:gtk_get_current_event_time());
-}
-
-static gboolean
-e_cal_list_view_popup_menu (GtkWidget *widget)
-{
-	ECalListView *cal_list_view = E_CAL_LIST_VIEW (widget);
-
-	e_cal_list_view_show_popup_menu (cal_list_view, -1, NULL);
-	return TRUE;
-}
-
-static gboolean 
-find_meeting (icalcomponent *icalcomp) 
-{
-	icalproperty *prop = NULL;
-
-	prop = icalcomponent_get_first_property (icalcomp, ICAL_ATTENDEE_PROPERTY);
-	
-	return prop ? TRUE: FALSE;
-}
-		
-
-static gboolean
-e_cal_list_view_on_table_double_click (GtkWidget *table, gint row, gint col, GdkEvent *event,
-				      gpointer data)
-{
-	ECalListView *cal_list_view = E_CAL_LIST_VIEW (data);
-	ECalModelComponent *comp_data;
-
-	comp_data = e_cal_model_get_component_at (e_calendar_view_get_model (E_CALENDAR_VIEW (cal_list_view)), row);
-	e_calendar_view_edit_appointment (E_CALENDAR_VIEW (cal_list_view), comp_data->client,
-					  comp_data->icalcomp, find_meeting (comp_data->icalcomp));	
-
-	return TRUE;
-}
-
-static gboolean
-e_cal_list_view_on_table_right_click (GtkWidget *table, gint row, gint col, GdkEvent *event,
-				      gpointer data)
-{
-	ECalListView *cal_list_view = E_CAL_LIST_VIEW (data);
-
-	e_cal_list_view_show_popup_menu (cal_list_view, row, event);
-	return TRUE;
-}
-
-static void
-e_cal_list_view_cursor_change_cb (ETable *etable, gint row, gpointer data)
-{
-	ECalListView *cal_list_view = E_CAL_LIST_VIEW (data);
-
-	g_signal_emit_by_name (cal_list_view, "selection_changed");
-}
-
-static gboolean
-e_cal_list_view_get_selected_time_range (ECalendarView *cal_view, time_t *start_time, time_t *end_time)
-{
-	GList *selected;
-	icaltimezone *zone;
-
-	selected = e_calendar_view_get_selected_events (cal_view);
-	if (selected) {
-		ECalendarViewEvent *event = (ECalendarViewEvent *) selected->data;
-		ECalComponentDateTime dtstart, dtend;
-		ECalComponent *comp;
-
-		comp = e_cal_component_new ();
-		e_cal_component_set_icalcomponent (comp, icalcomponent_new_clone (event->comp_data->icalcomp));
-		if (start_time) {
-			e_cal_component_get_dtstart (comp, &dtstart);
-			if (dtstart.tzid) {
-				zone = icalcomponent_get_timezone (e_cal_component_get_icalcomponent (comp), dtstart.tzid);
-			} else {
-				zone = NULL;
-			}
-			*start_time = icaltime_as_timet_with_zone (*dtstart.value, zone);
-			e_cal_component_free_datetime (&dtstart);
-		}
-		if (end_time) {
-			e_cal_component_get_dtend (comp, &dtend);
-			if (dtend.tzid) {
-				zone = icalcomponent_get_timezone (e_cal_component_get_icalcomponent (comp), dtend.tzid);
-			} else {
-				zone = NULL;
-			}
-			*end_time = icaltime_as_timet_with_zone (*dtend.value, zone);
-			e_cal_component_free_datetime (&dtend);
-		}
-
-		g_object_unref (comp);
-		g_list_free (selected);
-
-		return TRUE;
-	}
-
-	return FALSE;
-}
-
-static GList *
-e_cal_list_view_get_selected_events (ECalendarView *cal_view)
-{
-	GList *event_list = NULL;
-	gint   cursor_row;
-
-	if (E_CAL_LIST_VIEW (cal_view)->cursor_event) {
-		g_free (E_CAL_LIST_VIEW (cal_view)->cursor_event);
-		E_CAL_LIST_VIEW (cal_view)->cursor_event = NULL;
-	}
-
-	cursor_row = e_table_get_cursor_row (e_table_scrolled_get_table (E_CAL_LIST_VIEW (cal_view)->table_scrolled));
-
-	if (cursor_row >= 0) {
-		ECalendarViewEvent *event;
-
-		event = E_CAL_LIST_VIEW (cal_view)->cursor_event = g_new0 (ECalendarViewEvent, 1);
-		event->comp_data =
-			e_cal_model_get_component_at (e_calendar_view_get_model (cal_view),
-						      cursor_row);
-		event_list = g_list_prepend (event_list, event);
-	}
-
-	return event_list;
-}
-
-static void
-adjust_range (icaltimetype icaltime, time_t *earliest, time_t *latest, gboolean *set)
-{
-	time_t t;
-
-	if (!icaltime_is_valid_time (icaltime))
-		return;
-
-	t = icaltime_as_timet (icaltime);
-	*earliest = MIN (*earliest, t);
-	*latest   = MAX (*latest, t);
-
-	*set = TRUE;
-}
-
-/* NOTE: Time use for this function increases linearly with number of events. This is not
- * ideal, since it's used in a couple of places. We could probably be smarter about it,
- * and use do it less frequently... */
-static gboolean
-e_cal_list_view_get_visible_time_range (ECalendarView *cal_view, time_t *start_time, time_t *end_time)
-{
-	time_t   earliest = G_MAXINT, latest = 0;
-	gboolean set = FALSE;
-	gint     n_rows, i;
-
-	n_rows = e_table_model_row_count (E_TABLE_MODEL (e_calendar_view_get_model (cal_view)));
-
-	for (i = 0; i < n_rows; i++) {
-		ECalModelComponent *comp;
-		icalcomponent      *icalcomp;
-
-		comp = e_cal_model_get_component_at (e_calendar_view_get_model (cal_view), i);
-		if (!comp)
-			continue;
-
-		icalcomp = comp->icalcomp;
-		if (!icalcomp)
-			continue;
-
-		adjust_range (icalcomponent_get_dtstart (icalcomp), &earliest, &latest, &set);
-		adjust_range (icalcomponent_get_dtend (icalcomp), &earliest, &latest, &set);
-	}
-
-	if (set) {
-		*start_time = earliest;
-		*end_time   = latest;
-		return TRUE;
-	}
-
-	return FALSE;
-}
-
-gboolean
-e_cal_list_view_get_range_shown (ECalListView *cal_list_view, GDate *start_date, gint *days_shown)
-{
-	time_t  first, last;
-	GDate   end_date;
-
-	if (!e_cal_list_view_get_visible_time_range (E_CALENDAR_VIEW (cal_list_view), &first, &last))
-		return FALSE;
-
-	time_to_gdate_with_zone (start_date, first, e_calendar_view_get_timezone (E_CALENDAR_VIEW (cal_list_view)));
-	time_to_gdate_with_zone (&end_date, last, e_calendar_view_get_timezone (E_CALENDAR_VIEW (cal_list_view)));
-
-	*days_shown = g_date_days_between (start_date, &end_date);
-	return TRUE;
-}
diff --git a/calendar/gui/e-cal-list-view.etspec b/calendar/gui/e-cal-list-view.etspec
deleted file mode 100644
index 68cfbc9d22..0000000000
--- a/calendar/gui/e-cal-list-view.etspec
+++ /dev/null
@@ -1,14 +0,0 @@
-<ETableSpecification draw-grid="true" alternating-row-colors="true">
-  <ETableColumn model_col="5" _title="Start Date" expansion="2.0" minimum_width="10" resizable="true" cell="dateedit" compare="date-compare" priority="-2"/>
-  <ETableColumn model_col="10" _title="End Date" expansion="2.0" minimum_width="10" resizable="true" cell="dateedit" compare="date-compare" priority="-2"/>
-  <ETableColumn model_col="8" _title="Summary" expansion="3.0" minimum_width="10" resizable="true" cell="calstring" compare="string" priority="10"/>
-  <ETableColumn model_col="11" _title="Location" expansion="3.0" minimum_width="10" resizable="true" cell="calstring" compare="string" priority="10"/>
-  <ETableColumn model_col="0" _title="Categories" cell="calstring" compare="string" expansion="1.0" minimum_width="10" resizable="true" priority="-2"/>
-
-  <ETableState>
-    <column source="2"/>
-    <column source="0"/>
-    <column source="1"/>
-    <grouping></grouping>
-  </ETableState>
-</ETableSpecification>
diff --git a/calendar/gui/e-cal-list-view.h b/calendar/gui/e-cal-list-view.h
deleted file mode 100644
index eb7732625f..0000000000
--- a/calendar/gui/e-cal-list-view.h
+++ /dev/null
@@ -1,89 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-
-/* 
- * Authors: 
- *  Hans Petter Jansson  <hpj@ximian.com>
- *
- * Copyright 2003, Ximian, Inc.
- *
- * This program is free software; you can redistribute it and/or 
- * modify it under the terms of version 2 of the GNU General Public 
- * License as published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
- * USA
- */
-#ifndef _E_CAL_LIST_VIEW_H_
-#define _E_CAL_LIST_VIEW_H_
-
-#include <time.h>
-#include <gtk/gtktable.h>
-#include <gtk/gtktooltips.h>
-
-#include "e-calendar-view.h"
-#include "gnome-cal.h"
-
-G_BEGIN_DECLS
-
-/*
- * ECalListView - displays calendar events in an ETable.
- */
-
-#define E_CAL_LIST_VIEW(obj)          GTK_CHECK_CAST (obj, e_cal_list_view_get_type (), ECalListView)
-#define E_CAL_LIST_VIEW_CLASS(klass)  GTK_CHECK_CLASS_CAST (klass, e_cal_list_view_get_type (), ECalListViewClass)
-#define E_IS_CAL_LIST_VIEW(obj)       GTK_CHECK_TYPE (obj, e_cal_list_view_get_type ())
-
-
-typedef struct _ECalListView       ECalListView;
-typedef struct _ECalListViewClass  ECalListViewClass;
-
-struct _ECalListView
-{
-	ECalendarView cal_view;
-
-	/* The main display table */
-	ETableScrolled *table_scrolled;
-
-	/* S-expression for query and the query object */
-	ECalView *query;
-
-	/* The default category for new events */
-	gchar *default_category;
-
-	/* Date editing cell */
-	ECellDateEdit *dates_cell;
-
-	/* The last ECalendarViewEvent we returned from e_cal_list_view_get_selected_events(), to be freed */
-	ECalendarViewEvent *cursor_event;
-
-	/* Idle handler ID for setting a new ETableModel */
-	gint set_table_id;
-};
-
-struct _ECalListViewClass
-{
-	ECalendarViewClass parent_class;
-};
-
-
-GtkType	   e_cal_list_view_get_type		(void);
-GtkWidget *e_cal_list_view_construct            (ECalListView *cal_list_view);
-
-GtkWidget *e_cal_list_view_new			(void);
-void e_cal_list_view_load_state (ECalListView *cal_list_view, gchar *filename);
-void e_cal_list_view_save_state (ECalListView *cal_list_view, gchar *filename);
-
-gboolean   e_cal_list_view_get_range_shown      (ECalListView *cal_list_view, GDate *start_date,
-						 gint *days_shown);
-
-
-G_END_DECLS
-
-#endif /* _E_CAL_LIST_VIEW_H_ */
diff --git a/calendar/gui/e-cal-menu.c b/calendar/gui/e-cal-menu.c
deleted file mode 100644
index 499b90d11e..0000000000
--- a/calendar/gui/e-cal-menu.c
+++ /dev/null
@@ -1,288 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-/*
- *  Authors: Michael Zucchi <notzed@ximian.com>
- *
- *  Copyright 2004 Ximian, Inc. (www.ximian.com)
- *
- *  This program is free software; you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation; either version 2 of the License, or
- *  (at your option) any later version.
- *
- *  This program is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with this program; if not, write to the Free Software
- *  Foundation, Inc., 59 Temple Street #330, Boston, MA 02111-1307, USA.
- *
- */
-
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
-
-#include <string.h>
-#include <stdlib.h>
-
-#include <glib.h>
-
-#include "e-cal-menu.h"
-#include "gui/e-cal-model.h"
-#include "itip-utils.h"
-
-static void ecalm_standard_menu_factory(EMenu *emp, void *data);
-
-static GObjectClass *ecalm_parent;
-
-static void
-ecalm_init(GObject *o)
-{
-	/*ECalMenu *emp = (ECalMenu *)o; */
-}
-
-static void
-ecalm_finalise(GObject *o)
-{
-	((GObjectClass *)ecalm_parent)->finalize(o);
-}
-
-static void
-ecalm_target_free(EMenu *ep, EMenuTarget *t)
-{
-	switch (t->type) {
-	case E_CAL_MENU_TARGET_SELECT: {
-		ECalMenuTargetSelect *s = (ECalMenuTargetSelect *)t;
-		int i;
-
-		for (i=0;i<s->events->len;i++)
-			e_cal_model_free_component_data(s->events->pdata[i]);
-		g_ptr_array_free(s->events, TRUE);
-		g_object_unref(s->model);
-		break; }
-	}
-
-	((EMenuClass *)ecalm_parent)->target_free(ep, t);
-}
-
-static void
-ecalm_class_init(GObjectClass *klass)
-{
-	klass->finalize = ecalm_finalise;
-	((EMenuClass *)klass)->target_free = ecalm_target_free;
-
-	e_menu_class_add_factory((EMenuClass *)klass, NULL, (EMenuFactoryFunc)ecalm_standard_menu_factory, NULL);
-}
-
-GType
-e_cal_menu_get_type(void)
-{
-	static GType type = 0;
-
-	if (type == 0) {
-		static const GTypeInfo info = {
-			sizeof(ECalMenuClass),
-			NULL, NULL,
-			(GClassInitFunc)ecalm_class_init,
-			NULL, NULL,
-			sizeof(ECalMenu), 0,
-			(GInstanceInitFunc)ecalm_init
-		};
-		ecalm_parent = g_type_class_ref(e_menu_get_type());
-		type = g_type_register_static(e_menu_get_type(), "ECalMenu", &info, 0);
-	}
-
-	return type;
-}
-
-ECalMenu *e_cal_menu_new(const char *menuid)
-{
-	ECalMenu *emp = g_object_new(e_cal_menu_get_type(), 0);
-
-	e_menu_construct(&emp->menu, menuid);
-
-	return emp;
-}
-
-/**
- * e_cal_menu_target_new_select:
- * @folder: The selection will ref this for the life of it.
- * @folder_uri: 
- * @uids: The selection will free this when done with it.
- * 
- * Create a new selection popup target.
- * 
- * Return value: 
- **/
-ECalMenuTargetSelect *
-e_cal_menu_target_new_select(ECalMenu *eabp, struct _ECalModel *model, GPtrArray *events)
-{
-	ECalMenuTargetSelect *t = e_menu_target_new(&eabp->menu, E_CAL_MENU_TARGET_SELECT, sizeof(*t));
-	guint32 mask = ~0;
-	ECal *client;
-	gboolean read_only;
-
-	/* FIXME: This is duplicated in e-cal-popup */
-
-	t->model = model;
-	g_object_ref(t->model);
-	t->events = events;
-
-	if (t->events->len == 0) {
-		client = e_cal_model_get_default_client(t->model);
-	} else {
-		ECalModelComponent *comp_data = (ECalModelComponent *)t->events->pdata[0];
-
-		mask &= ~E_CAL_MENU_SELECT_ANY;
-		if (t->events->len == 1)
-			mask &= ~E_CAL_MENU_SELECT_ONE;
-		else
-			mask &= ~E_CAL_MENU_SELECT_MANY;
-
-		if (icalcomponent_get_first_property (comp_data->icalcomp, ICAL_URL_PROPERTY))
-			mask &= ~E_CAL_MENU_SELECT_HASURL;
-
-		if (e_cal_util_component_has_recurrences (comp_data->icalcomp))
-			mask &= ~E_CAL_MENU_SELECT_RECURRING;
-		else if (e_cal_util_component_is_instance (comp_data->icalcomp))
-			mask &= ~E_CAL_MENU_SELECT_RECURRING;
-		else
-			mask &= ~E_CAL_MENU_SELECT_NONRECURRING;
-
-		if (e_cal_util_component_is_instance (comp_data->icalcomp))
-			mask &= ~E_CAL_MENU_SELECT_INSTANCE;
-
-		if (e_cal_util_component_has_organizer (comp_data->icalcomp)) {
-			ECalComponent *comp;
-
-			comp = e_cal_component_new ();
-			e_cal_component_set_icalcomponent (comp, icalcomponent_new_clone (comp_data->icalcomp));
-			if (!itip_organizer_is_user (comp, comp_data->client))
-				mask &= ~E_CAL_MENU_SELECT_ORGANIZER;
-
-			g_object_unref (comp);
-		} else {
-			/* organiser is synonym for owner in this case */
-			mask &= ~(E_CAL_MENU_SELECT_ORGANIZER|E_CAL_MENU_SELECT_NOTMEETING);
-		}
-
-		client = comp_data->client;
-	}
-
-	if (client) {
-		e_cal_is_read_only(client, &read_only, NULL);
-		if (!read_only)
-			mask &= ~E_CAL_MENU_SELECT_EDITABLE;
-
-		if (!e_cal_get_static_capability (client, CAL_STATIC_CAPABILITY_NO_TASK_ASSIGNMENT)
-		    && !e_cal_get_static_capability (client, CAL_STATIC_CAPABILITY_NO_CONV_TO_ASSIGN_TASK))
-			mask &= ~E_CAL_MENU_SELECT_ASSIGNABLE;
-	}
-
-	/* This bit isn't implemented ... */
-	mask &= ~E_CAL_MENU_SELECT_NOTEDITING;
-
-	t->target.mask = mask;
-
-	return t;
-}
-
-static void
-ecalm_standard_menu_factory(EMenu *emp, void *data)
-{
-	/* noop */
-}
-
-/* ********************************************************************** */
-
-/* menu plugin handler */
-
-/*
-<e-plugin
-  class="org.gnome.mail.plugin.popup:1.0"
-  id="org.gnome.mail.plugin.popup.item:1.0"
-  type="shlib"
-  location="/opt/gnome2/lib/camel/1.0/libcamelimap.so"
-  name="imap"
-  description="IMAP4 and IMAP4v1 mail store">
-  <hook class="org.gnome.mail.popupMenu:1.0"
-        handler="HandlePopup">
-  <menu id="any" target="select">
-   <item
-    type="item|toggle|radio|image|submenu|bar"
-    active
-    path="foo/bar"
-    label="label"
-    icon="foo"
-    mask="select_one"
-    activate="ecalm_view_emacs"/>
-  </menu>
-  </extension>
-
-*/
-
-static void *ecalph_parent_class;
-#define ecalph ((ECalMenuHook *)eph)
-
-static const EMenuHookTargetMask ecalph_select_masks[] = {
-	{ "one", E_CAL_MENU_SELECT_ONE },
-	{ "many", E_CAL_MENU_SELECT_MANY },
-	{ "editable", E_CAL_MENU_SELECT_EDITABLE },
-	{ "recurring", E_CAL_MENU_SELECT_RECURRING },
-	{ "non-recurring", E_CAL_MENU_SELECT_NONRECURRING },
-	{ "instance", E_CAL_MENU_SELECT_INSTANCE },
-	{ "organizer", E_CAL_MENU_SELECT_ORGANIZER },
-	{ "not-editing", E_CAL_MENU_SELECT_NOTEDITING },
-	{ "not-meeting", E_CAL_MENU_SELECT_NOTMEETING },
-	{ "assignable", E_CAL_MENU_SELECT_ASSIGNABLE },
-	{ "hasurl", E_CAL_MENU_SELECT_HASURL },
-	{ 0 }
-};
-
-static const EMenuHookTargetMap ecalph_targets[] = {
-	{ "select", E_CAL_MENU_TARGET_SELECT, ecalph_select_masks },
-	{ 0 }
-};
-
-static void
-ecalph_finalise(GObject *o)
-{
-	/*EPluginHook *eph = (EPluginHook *)o;*/
-
-	((GObjectClass *)ecalph_parent_class)->finalize(o);
-}
-
-static void
-ecalph_class_init(EPluginHookClass *klass)
-{
-	int i;
-
-	((GObjectClass *)klass)->finalize = ecalph_finalise;
-	((EPluginHookClass *)klass)->id = "org.gnome.evolution.calendar.bonobomenu:1.0";
-
-	for (i=0;ecalph_targets[i].type;i++)
-		e_menu_hook_class_add_target_map((EMenuHookClass *)klass, &ecalph_targets[i]);
-
-	/* FIXME: leaks parent set class? */
-	((EMenuHookClass *)klass)->menu_class = g_type_class_ref(e_cal_menu_get_type());
-}
-
-GType
-e_cal_menu_hook_get_type(void)
-{
-	static GType type = 0;
-	
-	if (!type) {
-		static const GTypeInfo info = {
-			sizeof(ECalMenuHookClass), NULL, NULL, (GClassInitFunc) ecalph_class_init, NULL, NULL,
-			sizeof(ECalMenuHook), 0, (GInstanceInitFunc) NULL,
-		};
-
-		ecalph_parent_class = g_type_class_ref(e_menu_hook_get_type());
-		type = g_type_register_static(e_menu_hook_get_type(), "ECalMenuHook", &info, 0);
-	}
-	
-	return type;
-}
diff --git a/calendar/gui/e-cal-menu.h b/calendar/gui/e-cal-menu.h
deleted file mode 100644
index bb34a07ebd..0000000000
--- a/calendar/gui/e-cal-menu.h
+++ /dev/null
@@ -1,124 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*-
- *
- *  Authors: Michel Zucchi <notzed@ximian.com>
- *
- *  Copyright 2004 Novell Inc. (www.novell.com)
- *
- *  This program is free software; you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation; either version 2 of the License, or
- *  (at your option) any later version.
- *
- *  This program is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with this program; if not, write to the Free Software
- *  Foundation, Inc., 59 Temple Street #330, Boston, MA 02111-1307, USA.
- *
- */
-
-#ifndef __E_CAL_MENU_H__
-#define __E_CAL_MENU_H__
-
-#include <glib-object.h>
-
-#include "e-util/e-menu.h"
-
-#ifdef __cplusplus
-extern "C" {
-#pragma }
-#endif /* __cplusplus */
-
-typedef struct _ECalMenu ECalMenu;
-typedef struct _ECalMenuClass ECalMenuClass;
-
-/* Current target description */
-/* Types of popup tagets */
-enum _e_cal_menu_target_t {
-	E_CAL_MENU_TARGET_SELECT,
-};
-
-/**
- * enum _e_cal_menu_target_select_t - ECalPopupTargetSelect qualifiers.
- * 
- * @E_CAL_MENU_SELECT_ONE: Only one item is selected.
- * @E_CAL_MENU_SELECT_MANY: More than one item selected.
- * @E_CAL_MENU_SELECT_ANY: One or more items selected.
- * @E_CAL_MENU_SELECT_EDITABLE: The selection is editable.
- * @E_CAL_MENU_SELECT_RECURRING: Is a recurring event.
- * @E_CAL_MENU_SELECT_NONRECURRING: Is not a recurring event.
- * @E_CAL_MENU_SELECT_INSTANCE: This is an instance event.
- * @E_CAL_MENU_SELECT_ORGANIZER: The user is the organiser of the event.
- * @E_CAL_MENU_SELECT_NOTEDITING: The event is not being edited already.  Not implemented.
- * @E_CAL_MENU_SELECT_NOTMEETING: The event is not a meeting.
- * @E_CAL_MENU_SELECT_ASSIGNABLE: An assignable task.
- * @E_CAL_MENU_SELECT_HASURL: A task that contains a URL.
- **/
-enum _e_cal_menu_target_select_t {
-	E_CAL_MENU_SELECT_ONE = 1<<0,
-	E_CAL_MENU_SELECT_MANY = 1<<1,
-	E_CAL_MENU_SELECT_ANY = 1<<2,
-	E_CAL_MENU_SELECT_EDITABLE = 1<<3,
-	E_CAL_MENU_SELECT_RECURRING = 1<<4,
-	E_CAL_MENU_SELECT_NONRECURRING = 1<<5,
-	E_CAL_MENU_SELECT_INSTANCE = 1<<6,
-
-	E_CAL_MENU_SELECT_ORGANIZER = 1<<7,
-	E_CAL_MENU_SELECT_NOTEDITING = 1<<8,
-	E_CAL_MENU_SELECT_NOTMEETING = 1<<9,
-
-	E_CAL_MENU_SELECT_ASSIGNABLE = 1<<10,
-	E_CAL_MENU_SELECT_HASURL = 1<<11,
-};
-
-typedef struct _ECalMenuTargetSelect ECalMenuTargetSelect;
-
-struct _ECalMenuTargetSelect {
-	EMenuTarget target;
-
-	struct _ECalModel *model;
-	GPtrArray *events;
-};
-
-typedef struct _EMenuItem ECalMenuItem;
-
-/* The object */
-struct _ECalMenu {
-	EMenu menu;
-
-	struct _ECalMenuPrivate *priv;
-};
-
-struct _ECalMenuClass {
-	EMenuClass menu_class;
-};
-
-GType e_cal_menu_get_type(void);
-
-ECalMenu *e_cal_menu_new(const char *menuid);
-
-ECalMenuTargetSelect *e_cal_menu_target_new_select(ECalMenu *emp, struct _ECalModel *model, GPtrArray *events);
-
-/* ********************************************************************** */
-
-typedef struct _ECalMenuHook ECalMenuHook;
-typedef struct _ECalMenuHookClass ECalMenuHookClass;
-
-struct _ECalMenuHook {
-	EMenuHook hook;
-};
-
-struct _ECalMenuHookClass {
-	EMenuHookClass hook_class;
-};
-
-GType e_cal_menu_hook_get_type(void);
-
-#ifdef __cplusplus
-}
-#endif /* __cplusplus */
-
-#endif /* __E_CAL_MENU_H__ */
diff --git a/calendar/gui/e-cal-model-calendar.c b/calendar/gui/e-cal-model-calendar.c
deleted file mode 100644
index b64dce21c6..0000000000
--- a/calendar/gui/e-cal-model-calendar.c
+++ /dev/null
@@ -1,545 +0,0 @@
-/* Evolution calendar - Data model for ETable
- *
- * Copyright (C) 2004 Ximian, Inc.
- *
- * Authors: Rodrigo Moya <rodrigo@ximian.com>
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of version 2 of the GNU General Public
- * License as published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307, USA.
- */
-
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
-
-#include <string.h>
-#include <libgnome/gnome-i18n.h>
-#include "e-cal-model-calendar.h"
-#include "e-cell-date-edit-text.h"
-#include "itip-utils.h"
-#include "misc.h"
-#include "dialogs/recur-comp.h"
-#include "dialogs/send-comp.h"
-
-struct _ECalModelCalendarPrivate {
-};
-
-static void e_cal_model_calendar_finalize (GObject *object);
-static int ecmc_column_count (ETableModel *etm);
-static void *ecmc_value_at (ETableModel *etm, int col, int row);
-static void ecmc_set_value_at (ETableModel *etm, int col, int row, const void *value);
-static gboolean ecmc_is_cell_editable (ETableModel *etm, int col, int row);
-static void *ecmc_duplicate_value (ETableModel *etm, int col, const void *value);
-static void ecmc_free_value (ETableModel *etm, int col, void *value);
-static void *ecmc_initialize_value (ETableModel *etm, int col);
-static gboolean ecmc_value_is_empty (ETableModel *etm, int col, const void *value);
-static char *ecmc_value_to_string (ETableModel *etm, int col, const void *value);
-
-static void ecmc_fill_component_from_model (ECalModel *model, ECalModelComponent *comp_data,
-					    ETableModel *source_model, gint row);
-
-G_DEFINE_TYPE (ECalModelCalendar, e_cal_model_calendar, E_TYPE_CAL_MODEL);
-
-static void
-e_cal_model_calendar_class_init (ECalModelCalendarClass *klass)
-{
-	GObjectClass *object_class = G_OBJECT_CLASS (klass);
-	ETableModelClass *etm_class = E_TABLE_MODEL_CLASS (klass);
-	ECalModelClass *model_class = E_CAL_MODEL_CLASS (klass);
-
-	object_class->finalize = e_cal_model_calendar_finalize;
-
-	etm_class->column_count = ecmc_column_count;
-	etm_class->value_at = ecmc_value_at;
-	etm_class->set_value_at = ecmc_set_value_at;
-	etm_class->is_cell_editable = ecmc_is_cell_editable;
-	etm_class->duplicate_value = ecmc_duplicate_value;
-	etm_class->free_value = ecmc_free_value;
-	etm_class->initialize_value = ecmc_initialize_value;
-	etm_class->value_is_empty = ecmc_value_is_empty;
-	etm_class->value_to_string = ecmc_value_to_string;
-
-	model_class->fill_component_from_model = ecmc_fill_component_from_model;
-}
-
-static void
-e_cal_model_calendar_init (ECalModelCalendar *model)
-{
-	ECalModelCalendarPrivate *priv;
-
-	priv = g_new0 (ECalModelCalendarPrivate, 1);
-	model->priv = priv;
-
-	e_cal_model_set_component_kind (E_CAL_MODEL (model), ICAL_VEVENT_COMPONENT);
-}
-
-static void
-e_cal_model_calendar_finalize (GObject *object)
-{
-	ECalModelCalendarPrivate *priv;
-	ECalModelCalendar *model = (ECalModelCalendar *) object;
-
-	g_return_if_fail (E_IS_CAL_MODEL_CALENDAR (model));
-
-	priv = model->priv;
-	if (priv) {
-		g_free (priv);
-		model->priv = NULL;
-	}
-
-	if (G_OBJECT_CLASS (e_cal_model_calendar_parent_class)->finalize)
-		G_OBJECT_CLASS (e_cal_model_calendar_parent_class)->finalize (object);
-}
-
-/* ETableModel methods */
-static int
-ecmc_column_count (ETableModel *etm)
-{
-	return E_CAL_MODEL_CALENDAR_FIELD_LAST;
-}
-
-static ECellDateEditValue *
-get_dtend (ECalModelCalendar *model, ECalModelComponent *comp_data)
-{
-	struct icaltimetype tt_end;
-
-	if (!comp_data->dtend) {
-		icalproperty *prop;
-		icaltimezone *zone, *model_zone;
-		gboolean got_zone = FALSE;
-
-		prop = icalcomponent_get_first_property (comp_data->icalcomp, ICAL_DTEND_PROPERTY);
-		if (!prop)
-			return NULL;
-
-		tt_end = icalproperty_get_dtend (prop);
-
-		if (icaltime_get_tzid (tt_end)
-		    && e_cal_get_timezone (comp_data->client, icaltime_get_tzid (tt_end), &zone, NULL))
-			got_zone = TRUE;
-
-		if (e_cal_model_get_flags (E_CAL_MODEL (model)) & E_CAL_MODEL_FLAGS_EXPAND_RECURRENCES) {
-			if (got_zone) {
-				tt_end = icaltime_from_timet_with_zone (comp_data->instance_end, tt_end.is_date, zone);
-				if ((model_zone = e_cal_model_get_timezone (E_CAL_MODEL (model))))
-					icaltimezone_convert_time (&tt_end, zone, model_zone);
-			} else
-				tt_end = icaltime_from_timet (comp_data->instance_end, tt_end.is_date);
-		}
-
-		if (!icaltime_is_valid_time (tt_end) || icaltime_is_null_time (tt_end))
-			return NULL;
-
-		comp_data->dtend = g_new0 (ECellDateEditValue, 1);
-		comp_data->dtend->tt = tt_end;
-
-		if (got_zone)
-			comp_data->dtend->zone = zone;
-		else
-			comp_data->dtend->zone = NULL;
-	}
-
-	return comp_data->dtend;
-}
-
-static void *
-get_location (ECalModelComponent *comp_data)
-{
-	icalproperty *prop;
-
-	prop = icalcomponent_get_first_property (comp_data->icalcomp, ICAL_LOCATION_PROPERTY);
-	if (prop)
-		return (void *) icalproperty_get_location (prop);
-
-	return "";
-}
-
-static void *
-get_transparency (ECalModelComponent *comp_data)
-{
-	icalproperty *prop;
-
-	prop = icalcomponent_get_first_property (comp_data->icalcomp, ICAL_TRANSP_PROPERTY);
-	if (prop) {
-		icalproperty_transp transp;
-
-		transp = icalproperty_get_transp (prop);
-		if (transp == ICAL_TRANSP_TRANSPARENT ||
-		    transp == ICAL_TRANSP_TRANSPARENTNOCONFLICT)
-			return _("Free");
-		else if (transp == ICAL_TRANSP_OPAQUE ||
-			 transp == ICAL_TRANSP_OPAQUENOCONFLICT)
-			return _("Busy");
-	}
-
-	return NULL;
-}
-
-static void *
-ecmc_value_at (ETableModel *etm, int col, int row)
-{
-	ECalModelComponent *comp_data;
-	ECalModelCalendarPrivate *priv;
-	ECalModelCalendar *model = (ECalModelCalendar *) etm;
-
-	g_return_val_if_fail (E_IS_CAL_MODEL_CALENDAR (model), NULL);
-
-	priv = model->priv;
-
-	g_return_val_if_fail (col >= 0 && col < E_CAL_MODEL_CALENDAR_FIELD_LAST, NULL);
-	g_return_val_if_fail (row >= 0 && row < e_table_model_row_count (etm), NULL);
-
-	if (col < E_CAL_MODEL_FIELD_LAST)
-		return E_TABLE_MODEL_CLASS (e_cal_model_calendar_parent_class)->value_at (etm, col, row);
-
-	comp_data = e_cal_model_get_component_at (E_CAL_MODEL (model), row);
-	if (!comp_data)
-		return "";
-
-	switch (col) {
-	case E_CAL_MODEL_CALENDAR_FIELD_DTEND :
-		return get_dtend (model, comp_data);
-	case E_CAL_MODEL_CALENDAR_FIELD_LOCATION :
-		return get_location (comp_data);
-	case E_CAL_MODEL_CALENDAR_FIELD_TRANSPARENCY :
-		return get_transparency (comp_data);
-	}
-
-	return "";
-}
-
-static void
-set_dtend (ECalModelComponent *comp_data, const void *value)
-{
-	ECellDateEditValue *dv = (ECellDateEditValue *) value;
-	icalproperty *prop;
-	icalparameter *param;
-	const char *tzid;
-	
-	prop = icalcomponent_get_first_property (comp_data->icalcomp, ICAL_DTEND_PROPERTY);
-	if (prop)
-		param = icalproperty_get_first_parameter (prop, ICAL_TZID_PARAMETER);
-	else
-		param = NULL;
-
-	/* If we are setting the property to NULL (i.e. removing it), then
-	   we remove it if it exists. */
-	if (!dv) {
-		if (prop) {
-			icalcomponent_remove_property (comp_data->icalcomp, prop);
-			icalproperty_free (prop);
-		}
-
-		return;
-	}
-	
-	/* If the TZID is set to "UTC", we set the is_utc flag. */
-	tzid = dv->zone ? icaltimezone_get_tzid (dv->zone) : "UTC";
-	if (tzid && !strcmp (tzid, "UTC"))
-		dv->tt.is_utc = 1;
-	else
-		dv->tt.is_utc = 0;
-
-	if (prop) {
-		icalproperty_set_dtend (prop, dv->tt);
-	} else {
-		prop = icalproperty_new_dtend (dv->tt);
-		icalcomponent_add_property (comp_data->icalcomp, prop);
-	}
-
-	/* If the TZID is set to "UTC", we don't want to save the TZID. */
-	if (tzid && strcmp (tzid, "UTC")) {
-		if (param) {
-			icalparameter_set_tzid (param, (char *) tzid);
-		} else {
-			param = icalparameter_new_tzid ((char *) tzid);
-			icalproperty_add_parameter (prop, param);
-		}
-	} else if (param) {
-		icalproperty_remove_parameter (prop, ICAL_TZID_PARAMETER);
-	}
-}
-
-static void
-set_location (ECalModelComponent *comp_data, const void *value)
-{
-	icalproperty *prop;
-
-	prop = icalcomponent_get_first_property (comp_data->icalcomp, ICAL_LOCATION_PROPERTY);
-
-	if (string_is_empty (value)) {
-		if (prop) {
-			icalcomponent_remove_property (comp_data->icalcomp, prop);
-			icalproperty_free (prop);
-		}
-	} else {
-		if (prop)
-			icalproperty_set_location (prop, (const char *) value);
-		else {
-			prop = icalproperty_new_location ((const char *) value);
-			icalcomponent_add_property (comp_data->icalcomp, prop);
-		}
-	}
-}
-
-static void
-set_transparency (ECalModelComponent *comp_data, const void *value)
-{
-	icalproperty *prop;
-
-	prop = icalcomponent_get_first_property (comp_data->icalcomp, ICAL_TRANSP_PROPERTY);
-
-	if (string_is_empty (value)) {
-		if (prop) {
-			icalcomponent_remove_property (comp_data->icalcomp, prop);
-			icalproperty_free (prop);
-		}
-	} else {
-		icalproperty_transp transp;
-
-		if (!strcasecmp (value, "FREE"))
-			transp = ICAL_TRANSP_TRANSPARENT;
-		else if (!strcasecmp (value, "OPAQUE"))
-			transp = ICAL_TRANSP_OPAQUE;
-		else {
-			if (prop) {
-				icalcomponent_remove_property (comp_data->icalcomp, prop);
-				icalproperty_free (prop);
-			}
-
-			return;
-		}
-
-		if (prop)
-			icalproperty_set_transp (prop, transp);
-		else {
-			prop = icalproperty_new_transp (transp);
-			icalcomponent_add_property (comp_data->icalcomp, prop);
-		}
-	}
-}
-
-static void
-ecmc_set_value_at (ETableModel *etm, int col, int row, const void *value)
-{
-	ECalModelComponent *comp_data;
-	CalObjModType mod = CALOBJ_MOD_ALL;
-	ECalComponent *comp;
-	ECalModelCalendar *model = (ECalModelCalendar *) etm;
-
-	g_return_if_fail (E_IS_CAL_MODEL_CALENDAR (model));
-	g_return_if_fail (col >= 0 && col < E_CAL_MODEL_CALENDAR_FIELD_LAST);
-	g_return_if_fail (row >= 0 && row < e_table_model_row_count (etm));
-
-	if (col < E_CAL_MODEL_FIELD_LAST) {
-		E_TABLE_MODEL_CLASS (e_cal_model_calendar_parent_class)->set_value_at (etm, col, row, value);
-		return;
-	}
-
-	comp_data = e_cal_model_get_component_at (E_CAL_MODEL (model), row);
-	if (!comp_data)
-		return;
-
-	comp = e_cal_component_new ();
-	if (!e_cal_component_set_icalcomponent (comp, icalcomponent_new_clone (comp_data->icalcomp))) {
-		g_object_unref (comp);
-		return;
-	}
-
-	/* ask about mod type */
-	if (e_cal_component_is_instance (comp)) {
-		if (!recur_component_dialog (comp_data->client, comp, &mod, NULL)) {
-			g_object_unref (comp);
-			return;
-		}
-	}
-
-	switch (col) {
-	case E_CAL_MODEL_CALENDAR_FIELD_DTEND :
-		set_dtend (comp_data, value);
-		break;
-	case E_CAL_MODEL_CALENDAR_FIELD_LOCATION :
-		set_location (comp_data, value);
-		break;
-	case E_CAL_MODEL_CALENDAR_FIELD_TRANSPARENCY :
-		set_transparency (comp_data, value);
-		break;
-	}
-
-	if (e_cal_modify_object (comp_data->client, comp_data->icalcomp, CALOBJ_MOD_ALL, NULL)) {
-		if (itip_organizer_is_user (comp, comp_data->client) &&
-		    send_component_dialog (NULL, comp_data->client, comp, FALSE))
-			itip_send_comp (E_CAL_COMPONENT_METHOD_REQUEST, comp,
-					comp_data->client, NULL, NULL);
-	} else {
-		g_warning (G_STRLOC ": Could not modify the object!");
-		
-		/* FIXME Show error dialog */
-	}
-
-	g_object_unref (comp);
-}
-
-static gboolean
-ecmc_is_cell_editable (ETableModel *etm, int col, int row)
-{
-	ECalModelCalendar *model = (ECalModelCalendar *) etm;
-
-	g_return_val_if_fail (E_IS_CAL_MODEL_CALENDAR (model), FALSE);
-	g_return_val_if_fail (col >= 0 && col < E_CAL_MODEL_CALENDAR_FIELD_LAST, FALSE);
-	g_return_val_if_fail (row >= -1 || (row >= 0 && row < e_table_model_row_count (etm)), FALSE);
-
-	if (col < E_CAL_MODEL_FIELD_LAST)
-		return E_TABLE_MODEL_CLASS (e_cal_model_calendar_parent_class)->is_cell_editable (etm, col, row);
-
-	switch (col) {
-	case E_CAL_MODEL_CALENDAR_FIELD_DTEND :
-	case E_CAL_MODEL_CALENDAR_FIELD_LOCATION :
-	case E_CAL_MODEL_CALENDAR_FIELD_TRANSPARENCY :
-		return TRUE;
-	}
-
-	return FALSE;
-}
-
-static void *
-ecmc_duplicate_value (ETableModel *etm, int col, const void *value)
-{
-	g_return_val_if_fail (col >= 0 && col < E_CAL_MODEL_CALENDAR_FIELD_LAST, NULL);
-
-	if (col < E_CAL_MODEL_FIELD_LAST)
-		return E_TABLE_MODEL_CLASS (e_cal_model_calendar_parent_class)->duplicate_value (etm, col, value);
-
-	switch (col) {
-	case E_CAL_MODEL_CALENDAR_FIELD_DTEND :
-		if (value) {
-			ECellDateEditValue *dv, *orig_dv;
-
-			orig_dv = (ECellDateEditValue *) value;
-			dv = g_new0 (ECellDateEditValue, 1);
-			*dv = *orig_dv;
-
-			return dv;
-		}
-		break;
-	case E_CAL_MODEL_CALENDAR_FIELD_LOCATION :
-	case E_CAL_MODEL_CALENDAR_FIELD_TRANSPARENCY :
-		return g_strdup (value);
-	}
-
-	return NULL;
-}
-
-static void
-ecmc_free_value (ETableModel *etm, int col, void *value)
-{
-	g_return_if_fail (col >= 0 && col < E_CAL_MODEL_CALENDAR_FIELD_LAST);
-
-	if (col < E_CAL_MODEL_FIELD_LAST) {
-		E_TABLE_MODEL_CLASS (e_cal_model_calendar_parent_class)->free_value (etm, col, value);
-		return;
-	}
-
-	switch (col) {
-	case E_CAL_MODEL_CALENDAR_FIELD_DTEND :
-	case E_CAL_MODEL_CALENDAR_FIELD_LOCATION :
-	case E_CAL_MODEL_CALENDAR_FIELD_TRANSPARENCY :
-		if (value)
-			g_free (value);
-		break;
-	}
-}
-
-static void *
-ecmc_initialize_value (ETableModel *etm, int col)
-{
-	g_return_val_if_fail (col >= 0 && col < E_CAL_MODEL_CALENDAR_FIELD_LAST, NULL);
-
-	if (col < E_CAL_MODEL_FIELD_LAST)
-		return E_TABLE_MODEL_CLASS (e_cal_model_calendar_parent_class)->initialize_value (etm, col);
-
-	switch (col) {
-	case E_CAL_MODEL_CALENDAR_FIELD_DTEND :
-		return NULL;
-	case E_CAL_MODEL_CALENDAR_FIELD_LOCATION :
-	case E_CAL_MODEL_CALENDAR_FIELD_TRANSPARENCY :
-		return g_strdup ("");
-	}
-
-	return NULL;
-}
-
-static gboolean
-ecmc_value_is_empty (ETableModel *etm, int col, const void *value)
-{
-	g_return_val_if_fail (col >= 0 && col < E_CAL_MODEL_CALENDAR_FIELD_LAST, TRUE);
-
-	if (col < E_CAL_MODEL_FIELD_LAST)
-		return E_TABLE_MODEL_CLASS (e_cal_model_calendar_parent_class)->value_is_empty (etm, col, value);
-
-	switch (col) {
-	case E_CAL_MODEL_CALENDAR_FIELD_DTEND :
-		return value ? FALSE : TRUE;
-	case E_CAL_MODEL_CALENDAR_FIELD_LOCATION :
-	case E_CAL_MODEL_CALENDAR_FIELD_TRANSPARENCY :
-		return string_is_empty (value);
-	}
-
-	return TRUE;
-}
-
-static char *
-ecmc_value_to_string (ETableModel *etm, int col, const void *value)
-{
-	g_return_val_if_fail (col >= 0 && col < E_CAL_MODEL_CALENDAR_FIELD_LAST, g_strdup (""));
-
-	if (col < E_CAL_MODEL_FIELD_LAST)
-		return E_TABLE_MODEL_CLASS (e_cal_model_calendar_parent_class)->value_to_string (etm, col, value);
-
-	switch (col) {
-	case E_CAL_MODEL_CALENDAR_FIELD_DTEND :
-		return e_cal_model_date_value_to_string (E_CAL_MODEL (etm), value);
-	case E_CAL_MODEL_CALENDAR_FIELD_LOCATION :
-	case E_CAL_MODEL_CALENDAR_FIELD_TRANSPARENCY :
-		return g_strdup (value);
-	}
-
-	return g_strdup ("");
-}
-
-/* ECalModel class methods */
-
-static void
-ecmc_fill_component_from_model (ECalModel *model, ECalModelComponent *comp_data,
-				ETableModel *source_model, gint row)
-{
-	g_return_if_fail (E_IS_CAL_MODEL_CALENDAR (model));
-	g_return_if_fail (comp_data != NULL);
-	g_return_if_fail (E_IS_TABLE_MODEL (source_model));
-
-	set_dtend (comp_data,
-		   e_table_model_value_at (source_model, E_CAL_MODEL_CALENDAR_FIELD_DTEND, row));
-	set_location (comp_data,
-		      e_table_model_value_at (source_model, E_CAL_MODEL_CALENDAR_FIELD_LOCATION, row));
-	set_transparency (comp_data,
-			  e_table_model_value_at (source_model, E_CAL_MODEL_CALENDAR_FIELD_TRANSPARENCY, row));
-}
-
-/**
- * e_cal_model_calendar_new
- */
-ECalModelCalendar *
-e_cal_model_calendar_new (void)
-{
-	return g_object_new (E_TYPE_CAL_MODEL_CALENDAR, NULL);
-}
diff --git a/calendar/gui/e-cal-model-calendar.h b/calendar/gui/e-cal-model-calendar.h
deleted file mode 100644
index 450871c88f..0000000000
--- a/calendar/gui/e-cal-model-calendar.h
+++ /dev/null
@@ -1,60 +0,0 @@
-/* Evolution calendar - Data model for ETable
- *
- * Copyright (C) 2000 Ximian, Inc.
- * Copyright (C) 2000 Ximian, Inc.
- *
- * Authors: Rodrigo Moya <rodrigo@ximian.com>
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of version 2 of the GNU General Public
- * License as published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307, USA.
- */
-
-#ifndef E_CAL_MODEL_CALENDAR_H
-#define E_CAL_MODEL_CALENDAR_H
-
-#include "e-cal-model.h"
-
-G_BEGIN_DECLS
-
-#define E_TYPE_CAL_MODEL_CALENDAR            (e_cal_model_calendar_get_type ())
-#define E_CAL_MODEL_CALENDAR(obj)            (G_TYPE_CHECK_INSTANCE_CAST ((obj), E_TYPE_CAL_MODEL_CALENDAR, ECalModelCalendar))
-#define E_CAL_MODEL_CALENDAR_CLASS(klass)    (G_TYPE_CHECK_CLASS_CAST ((klass), E_TYPE_CAL_MODEL_CALENDAR, ECalModelCalendarClass))
-#define E_IS_CAL_MODEL_CALENDAR(obj)         (G_TYPE_CHECK_INSTANCE_TYPE ((obj), E_TYPE_CAL_MODEL_CALENDAR))
-#define E_IS_CAL_MODEL_CALENDAR_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), E_TYPE_CAL_MODEL_CALENDAR))
-
-typedef struct _ECalModelCalendarPrivate ECalModelCalendarPrivate;
-
-typedef enum {
-	/* If you add new items here or reorder them, you have to update the
-	   .etspec files for the tables using this model */
-	E_CAL_MODEL_CALENDAR_FIELD_DTEND = E_CAL_MODEL_FIELD_LAST,
-	E_CAL_MODEL_CALENDAR_FIELD_LOCATION,
-	E_CAL_MODEL_CALENDAR_FIELD_TRANSPARENCY,
-	E_CAL_MODEL_CALENDAR_FIELD_LAST
-} ECalModelCalendarField;
-
-typedef struct {
-	ECalModel model;
-	ECalModelCalendarPrivate *priv;
-} ECalModelCalendar;
-
-typedef struct {
-	ECalModelClass parent_class;
-} ECalModelCalendarClass;
-
-GType              e_cal_model_calendar_get_type (void);
-ECalModelCalendar *e_cal_model_calendar_new (void);
-
-G_END_DECLS
-
-#endif
diff --git a/calendar/gui/e-cal-model-tasks.c b/calendar/gui/e-cal-model-tasks.c
deleted file mode 100644
index 2ef9420788..0000000000
--- a/calendar/gui/e-cal-model-tasks.c
+++ /dev/null
@@ -1,1113 +0,0 @@
-/* Evolution calendar - Data model for ETable
- *
- * Copyright (C) 2004 Ximian, Inc.
- *
- * Authors: Rodrigo Moya <rodrigo@ximian.com>
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of version 2 of the GNU General Public
- * License as published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307, USA.
- */
-
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
-
-#include <math.h>
-#include <string.h>
-#include <gtk/gtkmessagedialog.h>
-#include <libgnome/gnome-i18n.h>
-#include "calendar-config.h"
-#include "e-cal-model-tasks.h"
-#include "e-cell-date-edit-text.h"
-#include "misc.h"
-
-struct _ECalModelTasksPrivate {
-};
-
-static void e_cal_model_tasks_finalize (GObject *object);
-
-static int ecmt_column_count (ETableModel *etm);
-static void *ecmt_value_at (ETableModel *etm, int col, int row);
-static void ecmt_set_value_at (ETableModel *etm, int col, int row, const void *value);
-static gboolean ecmt_is_cell_editable (ETableModel *etm, int col, int row);
-static void *ecmt_duplicate_value (ETableModel *etm, int col, const void *value);
-static void ecmt_free_value (ETableModel *etm, int col, void *value);
-static void *ecmt_initialize_value (ETableModel *etm, int col);
-static gboolean ecmt_value_is_empty (ETableModel *etm, int col, const void *value);
-static char *ecmt_value_to_string (ETableModel *etm, int col, const void *value);
-
-static const char *ecmt_get_color_for_component (ECalModel *model, ECalModelComponent *comp_data);
-static void ecmt_fill_component_from_model (ECalModel *model, ECalModelComponent *comp_data,
-					    ETableModel *source_model, gint row);
-
-G_DEFINE_TYPE (ECalModelTasks, e_cal_model_tasks, E_TYPE_CAL_MODEL);
-
-static void
-e_cal_model_tasks_class_init (ECalModelTasksClass *klass)
-{
-	GObjectClass *object_class = G_OBJECT_CLASS (klass);
-	ETableModelClass *etm_class = E_TABLE_MODEL_CLASS (klass);
-	ECalModelClass *model_class = E_CAL_MODEL_CLASS (klass);
-
-	object_class->finalize = e_cal_model_tasks_finalize;
-
-	etm_class->column_count = ecmt_column_count;
-	etm_class->value_at = ecmt_value_at;
-	etm_class->set_value_at = ecmt_set_value_at;
-	etm_class->is_cell_editable = ecmt_is_cell_editable;
-	etm_class->duplicate_value = ecmt_duplicate_value;
-	etm_class->free_value = ecmt_free_value;
-	etm_class->initialize_value = ecmt_initialize_value;
-	etm_class->value_is_empty = ecmt_value_is_empty;
-	etm_class->value_to_string = ecmt_value_to_string;
-
-	model_class->get_color_for_component = ecmt_get_color_for_component;
-	model_class->fill_component_from_model = ecmt_fill_component_from_model;
-}
-
-static void
-e_cal_model_tasks_init (ECalModelTasks *model)
-{
-	ECalModelTasksPrivate *priv;
-
-	priv = g_new0 (ECalModelTasksPrivate, 1);
-	model->priv = priv;
-
-	e_cal_model_set_component_kind (E_CAL_MODEL (model), ICAL_VTODO_COMPONENT);
-}
-
-static void
-e_cal_model_tasks_finalize (GObject *object)
-{
-	ECalModelTasksPrivate *priv;
-	ECalModelTasks *model = (ECalModelTasks *) object;
-
-	g_return_if_fail (E_IS_CAL_MODEL_TASKS (model));
-
-	priv = model->priv;
-	if (priv) {
-		g_free (priv);
-		model->priv = NULL;
-	}
-
-	if (G_OBJECT_CLASS (e_cal_model_tasks_parent_class)->finalize)
-		G_OBJECT_CLASS (e_cal_model_tasks_parent_class)->finalize (object);
-}
-
-/* ETableModel methods */
-static int
-ecmt_column_count (ETableModel *etm)
-{
-	return E_CAL_MODEL_TASKS_FIELD_LAST;
-}
-
-/* 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 server. */
-static void
-ensure_task_complete (ECalModelComponent *comp_data, time_t completed_date)
-{
-	icalproperty *prop;
-	gboolean set_completed = TRUE;
-
-	prop = icalcomponent_get_first_property (comp_data->icalcomp, ICAL_COMPLETED_PROPERTY);
-
-	/* Date Completed. */
-	if (completed_date == -1) {
-		if (prop)
-			set_completed = FALSE;
-	        else
-			completed_date = time (NULL);
-	}
-
-	if (set_completed) {
-		icaltimezone *utc_zone;
-		struct icaltimetype new_completed;
-
-		/* COMPLETED is stored in UTC. */
-		utc_zone = icaltimezone_get_utc_timezone ();
-		new_completed = icaltime_from_timet_with_zone (completed_date,
-							       FALSE,
-							       utc_zone);
-		if (prop)
-			icalproperty_set_completed (prop, new_completed);
-		else {
-			prop = icalproperty_new_completed (new_completed);
-			icalcomponent_add_property (comp_data->icalcomp, prop);
-		}
-	}
-
-	/* Percent. */
-	prop = icalcomponent_get_first_property (comp_data->icalcomp, ICAL_PERCENTCOMPLETE_PROPERTY);
-	if (!prop)
-		icalcomponent_add_property (comp_data->icalcomp, icalproperty_new_percentcomplete (100));
-	else
-		icalproperty_set_percentcomplete (prop, 100);
-
-	/* Status. */
-	prop = icalcomponent_get_first_property (comp_data->icalcomp, ICAL_STATUS_PROPERTY);
-	if (prop)
-		icalproperty_set_status (prop, ICAL_STATUS_COMPLETED);
-	else
-		icalcomponent_add_property (comp_data->icalcomp, icalproperty_new_status (ICAL_STATUS_COMPLETED));
-}
-
-static void
-ensure_task_partially_complete (ECalModelComponent *comp_data)
-{
-	icalproperty *prop;
-
-	/* Date Completed. */
-	prop = icalcomponent_get_first_property (comp_data->icalcomp, ICAL_COMPLETED_PROPERTY);
-	if (prop) {
-		icalcomponent_remove_property (comp_data->icalcomp, prop);
-		icalproperty_free (prop);
-	}
-
-	/* Percent. */
-	prop = icalcomponent_get_first_property (comp_data->icalcomp, ICAL_PERCENTCOMPLETE_PROPERTY);
-	if (!prop)
-		icalcomponent_add_property (comp_data->icalcomp, icalproperty_new_percentcomplete (50));
-	else if (icalproperty_get_percentcomplete (prop) == 0 || icalproperty_get_percentcomplete (prop) == 100)
-		icalproperty_set_percentcomplete (prop, 50);
-
-	/* Status. */
-	prop = icalcomponent_get_first_property (comp_data->icalcomp, ICAL_STATUS_PROPERTY);
-	if (prop)
-		icalproperty_set_status (prop, ICAL_STATUS_INPROCESS);
-	else
-		icalcomponent_add_property (comp_data->icalcomp, icalproperty_new_status (ICAL_STATUS_INPROCESS));
-}
-
-
-/* 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 (ECalModelComponent *comp_data)
-{
-	icalproperty *prop;
-
-	/* Date Completed. */
-	prop = icalcomponent_get_first_property (comp_data->icalcomp, ICAL_COMPLETED_PROPERTY);
-	if (prop) {
-		icalcomponent_remove_property (comp_data->icalcomp, prop);
-		icalproperty_free (prop);
-	}
-
-	/* Percent. */
-	prop = icalcomponent_get_first_property (comp_data->icalcomp, ICAL_PERCENTCOMPLETE_PROPERTY);
-	if (prop) {
-		icalcomponent_remove_property (comp_data->icalcomp, prop);
-		icalproperty_free (prop);
-	}
-
-	/* Status. */
-	prop = icalcomponent_get_first_property (comp_data->icalcomp, ICAL_STATUS_PROPERTY);
-	if (prop)
-		icalproperty_set_status (prop, ICAL_STATUS_NEEDSACTION);
-}
-
-static ECellDateEditValue *
-get_completed (ECalModelComponent *comp_data)
-{
-	struct icaltimetype tt_completed;
-
-	if (!comp_data->completed) {
-		icaltimezone *zone;
-		icalproperty *prop;
-
-		prop = icalcomponent_get_first_property (comp_data->icalcomp, ICAL_COMPLETED_PROPERTY);
-		if (!prop)
-			return NULL;
-
-		tt_completed = icalproperty_get_completed (prop);
-		if (!icaltime_is_valid_time (tt_completed) || icaltime_is_null_time (tt_completed))
-			return NULL;
-
-		comp_data->completed = g_new0 (ECellDateEditValue, 1);
-		comp_data->completed->tt = tt_completed;
-
-		if (icaltime_get_tzid (tt_completed)
-		    && e_cal_get_timezone (comp_data->client, icaltime_get_tzid (tt_completed), &zone, NULL)) 
-			comp_data->completed->zone = zone;
-		else
-			comp_data->completed->zone = NULL;
-	}
-
-	return comp_data->completed;
-}
-
-static ECellDateEditValue *
-get_due (ECalModelComponent *comp_data)
-{
-	struct icaltimetype tt_due;
-
-	if (!comp_data->due) {
-		icaltimezone *zone;
-		icalproperty *prop;
-
-		prop = icalcomponent_get_first_property (comp_data->icalcomp, ICAL_DUE_PROPERTY);
-		if (!prop)
-			return NULL;
-
-		tt_due = icalproperty_get_due (prop);
-		if (!icaltime_is_valid_time (tt_due) || icaltime_is_null_time (tt_due))
-			return NULL;
-
-		comp_data->due = g_new0 (ECellDateEditValue, 1);
-		comp_data->due->tt = tt_due;
-
-		if (icaltime_get_tzid (tt_due)
-		    && e_cal_get_timezone (comp_data->client, icaltime_get_tzid (tt_due), &zone, NULL)) 
-			comp_data->due->zone = zone;
-		else
-			comp_data->due->zone = NULL;
-	}
-
-	return comp_data->due;
-}
-
-static char *
-get_geo (ECalModelComponent *comp_data)
-{
-	icalproperty *prop;
-	struct icalgeotype geo;
-	static gchar buf[32];
-
-	prop = icalcomponent_get_first_property (comp_data->icalcomp, ICAL_GEO_PROPERTY);
-	if (prop) {
-		geo = icalproperty_get_geo (prop);
-		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"));
-		return buf;
-	}
-
-	return "";
-}
-
-static int
-get_percent (ECalModelComponent *comp_data)
-{
-	icalproperty *prop;
-
-	prop = icalcomponent_get_first_property (comp_data->icalcomp, ICAL_PERCENTCOMPLETE_PROPERTY);
-	if (prop)
-		return icalproperty_get_percentcomplete (prop);
-
-	return 0;
-}
-
-static char *
-get_priority (ECalModelComponent *comp_data)
-{
-	icalproperty *prop;
-
-	prop = icalcomponent_get_first_property (comp_data->icalcomp, ICAL_PRIORITY_PROPERTY);
-	if (prop)
-		return e_cal_util_priority_to_string (icalproperty_get_priority (prop));
-
-	return "";
-}
-
-static char *
-get_status (ECalModelComponent *comp_data)
-{
-	icalproperty *prop;
-
-	prop = icalcomponent_get_first_property (comp_data->icalcomp, ICAL_STATUS_PROPERTY);
-	if (prop) {
-		switch (icalproperty_get_status (prop)) {
-		case ICAL_STATUS_NONE:
-			return "";
-		case ICAL_STATUS_NEEDSACTION:
-			return _("Not Started");
-		case ICAL_STATUS_INPROCESS:
-			return _("In Progress");
-		case ICAL_STATUS_COMPLETED:
-			return _("Completed");
-		case ICAL_STATUS_CANCELLED:
-			return _("Cancelled");
-		default:
-			return "";
-		}
-	}
-
-	return "";
-}
-
-static char *
-get_url (ECalModelComponent *comp_data)
-{
-	icalproperty *prop;
-
-	prop = icalcomponent_get_first_property (comp_data->icalcomp, ICAL_URL_PROPERTY);
-	if (prop)
-		return (char *) icalproperty_get_url (prop);
-
-	return "";
-}
-
-static gboolean
-is_complete (ECalModelComponent *comp_data)
-{
-	icalproperty *prop;
-
-	prop = icalcomponent_get_first_property (comp_data->icalcomp, ICAL_COMPLETED_PROPERTY);
-	if (prop)
-		return TRUE;
-
-	prop = icalcomponent_get_first_property (comp_data->icalcomp, ICAL_PERCENTCOMPLETE_PROPERTY);
-	if (prop && icalproperty_get_percentcomplete (prop) == 100)
-		return TRUE;
-
-	prop = icalcomponent_get_first_property (comp_data->icalcomp, ICAL_STATUS_PROPERTY);
-	if (prop && icalproperty_get_status (prop) == ICAL_STATUS_COMPLETED)
-		return TRUE;
-	
-	return FALSE;
-}
-
-typedef enum {
-	E_CAL_MODEL_TASKS_DUE_NEVER,
-	E_CAL_MODEL_TASKS_DUE_FUTURE,
-	E_CAL_MODEL_TASKS_DUE_TODAY,
-	E_CAL_MODEL_TASKS_DUE_OVERDUE,
-	E_CAL_MODEL_TASKS_DUE_COMPLETE
-} ECalModelTasksDueStatus;
-
-
-static ECalModelTasksDueStatus
-get_due_status (ECalModelTasks *model, ECalModelComponent *comp_data)
-{
-	icalproperty *prop;
-
-	/* First, do we have a due date? */
-	prop = icalcomponent_get_first_property (comp_data->icalcomp, ICAL_DUE_PROPERTY);
-	if (!prop)
-		return E_CAL_MODEL_TASKS_DUE_NEVER;
-	else {
-		struct icaltimetype now_tt, due_tt;
-		icaltimezone *zone;
-
-		/* Second, is it already completed? */
-		if (is_complete (comp_data))
-			return E_CAL_MODEL_TASKS_DUE_COMPLETE;
-
-		/* Third, are we overdue as of right now? */
-		due_tt = icalproperty_get_due (prop);
-		if (due_tt.is_date) {
-			int cmp;
-			
-			now_tt = icaltime_current_time_with_zone (e_cal_model_get_timezone (E_CAL_MODEL (model)));
-			cmp = icaltime_compare_date_only (due_tt, now_tt);
-			
-			if (cmp < 0)
-				return E_CAL_MODEL_TASKS_DUE_OVERDUE;
-			else if (cmp == 0)
-				return E_CAL_MODEL_TASKS_DUE_TODAY;
-			else
-				return E_CAL_MODEL_TASKS_DUE_FUTURE;
-		} else {
-			/* Get the current time in the same timezone as the DUE date.*/
-			if (!e_cal_get_timezone (comp_data->client, icaltime_get_tzid (due_tt), &zone, NULL))
-				return E_CAL_MODEL_TASKS_DUE_FUTURE;
-			
-			now_tt = icaltime_current_time_with_zone (zone);
-
-			if (icaltime_compare (due_tt, now_tt) <= 0) 
-				return E_CAL_MODEL_TASKS_DUE_OVERDUE;
-			else
-				if (icaltime_compare_date_only (due_tt, now_tt) == 0)
-					return E_CAL_MODEL_TASKS_DUE_TODAY;
-				else
-					return E_CAL_MODEL_TASKS_DUE_FUTURE;
-		}
-	}
-
-	return E_CAL_MODEL_TASKS_DUE_NEVER;
-}
-
-static gboolean
-is_overdue (ECalModelTasks *model, ECalModelComponent *comp_data)
-{
-	switch (get_due_status (model, comp_data)) {
-	case E_CAL_MODEL_TASKS_DUE_NEVER:
-	case E_CAL_MODEL_TASKS_DUE_FUTURE:
-	case E_CAL_MODEL_TASKS_DUE_COMPLETE:
-		return FALSE;
-	case E_CAL_MODEL_TASKS_DUE_TODAY:
-	case E_CAL_MODEL_TASKS_DUE_OVERDUE:
-		return TRUE;
-	}
-
-	return FALSE;
-}
-
-static void *
-ecmt_value_at (ETableModel *etm, int col, int row)
-{
-	ECalModelTasksPrivate *priv;
-	ECalModelComponent *comp_data;
-	ECalModelTasks *model = (ECalModelTasks *) etm;
-
-	g_return_val_if_fail (E_IS_CAL_MODEL_TASKS (model), NULL);
-
-	priv = model->priv;
-
-	g_return_val_if_fail (col >= 0 && col < E_CAL_MODEL_TASKS_FIELD_LAST, NULL);
-	g_return_val_if_fail (row >= 0 && row < e_table_model_row_count (etm), NULL);
-
-	if (col < E_CAL_MODEL_FIELD_LAST)
-		return E_TABLE_MODEL_CLASS (e_cal_model_tasks_parent_class)->value_at (etm, col, row);
-
-	comp_data = e_cal_model_get_component_at (E_CAL_MODEL (model), row);
-	if (!comp_data)
-		return "";
-
-	switch (col) {
-	case E_CAL_MODEL_TASKS_FIELD_COMPLETED :
-		return get_completed (comp_data);
-	case E_CAL_MODEL_TASKS_FIELD_COMPLETE :
-		return GINT_TO_POINTER (is_complete (comp_data));
-	case E_CAL_MODEL_TASKS_FIELD_DUE :
-		return get_due (comp_data);
-	case E_CAL_MODEL_TASKS_FIELD_GEO :
-		return get_geo (comp_data);
-	case E_CAL_MODEL_TASKS_FIELD_OVERDUE :
-		return GINT_TO_POINTER (is_overdue (model, comp_data));
-	case E_CAL_MODEL_TASKS_FIELD_PERCENT :
-		return GINT_TO_POINTER (get_percent (comp_data));
-	case E_CAL_MODEL_TASKS_FIELD_PRIORITY :
-		return get_priority (comp_data);
-	case E_CAL_MODEL_TASKS_FIELD_STATUS :
-		return get_status (comp_data);
-	case E_CAL_MODEL_TASKS_FIELD_URL :
-		return get_url (comp_data);
-	}
-
-	return "";
-}
-
-static void
-set_completed (ECalModelTasks *model, ECalModelComponent *comp_data, const void *value)
-{
-	ECellDateEditValue *dv = (ECellDateEditValue *) value;
-
-	if (!dv)
-		ensure_task_not_complete (comp_data);
-	else {
-		time_t t;
-
-		if (dv->tt.is_date) {
-			/* if it's a date, it will be floating,
-			   but completed needs a date time value */
-			dv->tt.is_date = FALSE;
-			t = icaltime_as_timet_with_zone (dv->tt, e_cal_model_get_timezone (E_CAL_MODEL (model)));
-		} else {
-			/* we assume that COMPLETED is entered in the current timezone,
-			   even though it gets stored in UTC */
-			t = icaltime_as_timet_with_zone (dv->tt, dv->zone);
-		}
-
-		ensure_task_complete (comp_data, t);
-	}
-}
-
-static void
-set_complete (ECalModelComponent *comp_data, const void *value)
-{
-	gint state = GPOINTER_TO_INT (value);
-
-	if (state)
-		ensure_task_complete (comp_data, -1);
-	else
-		ensure_task_not_complete (comp_data);
-}
-
-static void
-set_due (ECalModelComponent *comp_data, const void *value)
-{
-	ECellDateEditValue *dv = (ECellDateEditValue *) value;
-	icalproperty *prop;
-	icalparameter *param;
-	const char *tzid;
-	
-	prop = icalcomponent_get_first_property (comp_data->icalcomp, ICAL_DUE_PROPERTY);
-	if (prop)
-		param = icalproperty_get_first_parameter (prop, ICAL_TZID_PARAMETER);
-	else
-		param = NULL;
-
-	/* If we are setting the property to NULL (i.e. removing it), then
-	   we remove it if it exists. */
-	if (!dv) {
-		if (prop) {
-			icalcomponent_remove_property (comp_data->icalcomp, prop);
-			icalproperty_free (prop);
-		}
-
-		return;
-	}
-	
-	/* If the TZID is set to "UTC", we set the is_utc flag. */
-	tzid = dv->zone ? icaltimezone_get_tzid (dv->zone) : "UTC";
-	if (tzid && !strcmp (tzid, "UTC"))
-		dv->tt.is_utc = 1;
-	else
-		dv->tt.is_utc = 0;
-
-	if (prop) {
-		icalproperty_set_due (prop, dv->tt);
-	} else {
-		prop = icalproperty_new_due (dv->tt);
-		icalcomponent_add_property (comp_data->icalcomp, prop);
-	}
-
-	/* If the TZID is set to "UTC", we don't want to save the TZID. */
-	if (tzid && strcmp (tzid, "UTC")) {
-		if (param) {
-			icalparameter_set_tzid (param, (char *) tzid);
-		} else {
-			param = icalparameter_new_tzid ((char *) tzid);
-			icalproperty_add_parameter (prop, param);
-		}
-	} else if (param) {
-		icalproperty_remove_parameter (prop, ICAL_TZID_PARAMETER);
-	}
-}
-
-/* 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 = gtk_message_dialog_new (NULL, 0, GTK_MESSAGE_ERROR, GTK_BUTTONS_OK,
-					 _("The geographical position must be entered "
-					   "in the format: \n\n45.436845,125.862501"));
-	gtk_widget_show (dialog);
-}
-
-static void
-set_geo (ECalModelComponent *comp_data, const char *value)
-{
-	double latitude, longitude;
-	int matched;
-	struct icalgeotype geo;
-	icalproperty *prop;
-
-	prop = icalcomponent_get_first_property (comp_data->icalcomp, ICAL_GEO_PROPERTY);
-
-	if (string_is_empty (value)) {
-		if (prop) {
-			icalcomponent_remove_property (comp_data->icalcomp, prop);
-			icalproperty_free (prop);
-		}
-	} else {
-		matched = sscanf (value, "%lg , %lg", &latitude, &longitude);
-		if (matched != 2)
-			show_geo_warning ();
-
-		geo.lat = latitude;
-		geo.lon = longitude;
-		if (prop)
-			icalproperty_set_geo (prop, geo);
-		else {
-			prop = icalproperty_new_geo (geo);
-			icalcomponent_add_property (comp_data->icalcomp, prop);
-		}
-			
-	}
-}
-
-static void
-set_status (ECalModelComponent *comp_data, const char *value)
-{
-	icalproperty_status status;
-	icalproperty *prop;
-
-	prop = icalcomponent_get_first_property (comp_data->icalcomp, ICAL_STATUS_PROPERTY);
-
-	/* an empty string is the same as 'None' */
-	if (!value[0] || !g_strcasecmp (value, _("None")))
-		status = ICAL_STATUS_NONE;
-	else if (!g_strcasecmp (value, _("Not Started")))
-		status = ICAL_STATUS_NEEDSACTION;
-	else if (!g_strcasecmp (value, _("In Progress")))
-		status = ICAL_STATUS_INPROCESS;
-	else if (!g_strcasecmp (value, _("Completed")))
-		status = ICAL_STATUS_COMPLETED;
-	else if (!g_strcasecmp (value, _("Cancelled")))
-		status = ICAL_STATUS_CANCELLED;
-	else {
-		g_warning ("Invalid status: %s\n", value);
-		return;
-	}
-
-	if (prop)
-		icalproperty_set_status (prop, status);
-	else {
-		prop = icalproperty_new_status (status);
-		icalcomponent_add_property (comp_data->icalcomp, prop);
-	}
-
-	switch (status) {
-	case ICAL_STATUS_NEEDSACTION:
-		ensure_task_not_complete (comp_data);
-		break;
-
-	case ICAL_STATUS_INPROCESS:
-		ensure_task_partially_complete (comp_data);
-		break;
-
-	case ICAL_STATUS_CANCELLED:
-		ensure_task_not_complete (comp_data);
-		break;
-
-	case ICAL_STATUS_COMPLETED:
-		ensure_task_complete (comp_data, -1);
-		break;		
-	default:
-		break;
-	}
-}
-
-static void
-set_percent (ECalModelComponent *comp_data, const void *value)
-{
-	icalproperty *prop;
-	gint percent = GPOINTER_TO_INT (value);
-
-	g_return_if_fail (percent >= -1);
-	g_return_if_fail (percent <= 100);
-
-	prop = icalcomponent_get_first_property (comp_data->icalcomp, ICAL_PERCENTCOMPLETE_PROPERTY);
-
-	/* A value of -1 means it isn't set */
-	if (percent == -1) {
-		if (prop) {
-			icalcomponent_remove_property (comp_data->icalcomp, prop);
-			icalproperty_free (prop);
-		}
-		ensure_task_not_complete (comp_data);
-	} else {
-		if (prop)
-			icalproperty_set_percentcomplete (prop, percent);
-		else {
-			prop = icalproperty_new_percentcomplete (percent);
-			icalcomponent_add_property (comp_data->icalcomp, prop);
-		}
-
-		if (percent == 100)
-			ensure_task_complete (comp_data, -1);
-		else {
-			prop = icalcomponent_get_first_property (comp_data->icalcomp, ICAL_COMPLETED_PROPERTY);
-			if (prop) {
-				icalcomponent_remove_property (comp_data->icalcomp, prop);
-				icalproperty_free (prop);
-			}
-			
-			if (percent > 0)
-				set_status (comp_data, _("In Progress"));
-		}
-	}
-	
-}
-
-static void
-set_priority (ECalModelComponent *comp_data, const char *value)
-{
-	icalproperty *prop;
-	int priority;
-
-	prop = icalcomponent_get_first_property (comp_data->icalcomp, ICAL_PRIORITY_PROPERTY);
-
-	priority = e_cal_util_priority_from_string (value);
-	if (priority == -1) {
-		g_warning ("Invalid priority");
-		priority = 0;
-	}
-
-	if (prop)
-		icalproperty_set_priority (prop, priority);
-	else {
-		prop = icalproperty_new_priority (priority);
-		icalcomponent_add_property (comp_data->icalcomp, prop);
-	}
-}
-
-static void
-set_url (ECalModelComponent *comp_data, const char *value)
-{
-	icalproperty *prop;
-
-	prop = icalcomponent_get_first_property (comp_data->icalcomp, ICAL_URL_PROPERTY);
-
-	if (string_is_empty (value)) {
-		if (prop) {
-			icalcomponent_remove_property (comp_data->icalcomp, prop);
-			icalproperty_free (prop);
-		}
-	} else {
-		if (prop)
-			icalproperty_set_url (prop, value);
-		else {
-			prop = icalproperty_new_url (value);
-			icalcomponent_add_property (comp_data->icalcomp, prop);
-		}
-	}
-}
-
-static void
-ecmt_set_value_at (ETableModel *etm, int col, int row, const void *value)
-{
-	ECalModelTasksPrivate *priv;
-	ECalModelComponent *comp_data;
-	ECalModelTasks *model = (ECalModelTasks *) etm;
-
-	g_return_if_fail (E_IS_CAL_MODEL_TASKS (model));
-
-	priv = model->priv;
-
-	g_return_if_fail (col >= 0 && col < E_CAL_MODEL_TASKS_FIELD_LAST);
-	g_return_if_fail (row >= 0 && row < e_table_model_row_count (etm));
-
-	if (col < E_CAL_MODEL_FIELD_LAST) {
-		E_TABLE_MODEL_CLASS (e_cal_model_tasks_parent_class)->set_value_at (etm, col, row, value);
-		return;
-	}
-
-	comp_data = e_cal_model_get_component_at (E_CAL_MODEL (model), row);
-	if (!comp_data)
-		return;
-
-	switch (col) {
-	case E_CAL_MODEL_TASKS_FIELD_COMPLETED :
-		set_completed (model, comp_data, value);
-		break;
-	case E_CAL_MODEL_TASKS_FIELD_COMPLETE :
-		set_complete (comp_data, value);
-		break;
-	case E_CAL_MODEL_TASKS_FIELD_DUE :
-		set_due (comp_data, value);
-		break;
-	case E_CAL_MODEL_TASKS_FIELD_GEO :
-		set_geo (comp_data, value);
-		break;
-	case E_CAL_MODEL_TASKS_FIELD_PERCENT :
-		set_percent (comp_data, value);
-		break;
-	case E_CAL_MODEL_TASKS_FIELD_PRIORITY :
-		set_priority (comp_data, value);
-		break;
-	case E_CAL_MODEL_TASKS_FIELD_STATUS :
-		set_status (comp_data, value);
-		break;
-	case E_CAL_MODEL_TASKS_FIELD_URL :
-		set_url (comp_data, value);
-		break;
-	}
-
-	/* FIXME ask about mod type */
-	if (!e_cal_modify_object (comp_data->client, comp_data->icalcomp, CALOBJ_MOD_ALL, NULL)) {
-		g_warning (G_STRLOC ": Could not modify the object!");
-		
-		/* FIXME Show error dialog */
-	}
-}
-
-static gboolean
-ecmt_is_cell_editable (ETableModel *etm, int col, int row)
-{
-	ECalModelTasksPrivate *priv;
-	ECalModelTasks *model = (ECalModelTasks *) etm;
-
-	g_return_val_if_fail (E_IS_CAL_MODEL_TASKS (model), FALSE);
-
-	priv = model->priv;
-
-	g_return_val_if_fail (col >= 0 && col < E_CAL_MODEL_TASKS_FIELD_LAST, FALSE);
-	g_return_val_if_fail (row >= -1 || (row >= 0 && row < e_table_model_row_count (etm)), FALSE);
-
-	if (col < E_CAL_MODEL_FIELD_LAST)
-		return E_TABLE_MODEL_CLASS (e_cal_model_tasks_parent_class)->is_cell_editable (etm, col, row);
-
-	switch (col) {
-	case E_CAL_MODEL_TASKS_FIELD_COMPLETED :
-	case E_CAL_MODEL_TASKS_FIELD_COMPLETE :
-	case E_CAL_MODEL_TASKS_FIELD_DUE :
-	case E_CAL_MODEL_TASKS_FIELD_GEO :
-	case E_CAL_MODEL_TASKS_FIELD_PERCENT :
-	case E_CAL_MODEL_TASKS_FIELD_PRIORITY :
-	case E_CAL_MODEL_TASKS_FIELD_STATUS :
-	case E_CAL_MODEL_TASKS_FIELD_URL :
-		return TRUE;
-	}
-
-	return FALSE;
-}
-
-static void *
-ecmt_duplicate_value (ETableModel *etm, int col, const void *value)
-{
-	g_return_val_if_fail (col >= 0 && col < E_CAL_MODEL_TASKS_FIELD_LAST, NULL);
-
-	if (col < E_CAL_MODEL_FIELD_LAST)
-		return E_TABLE_MODEL_CLASS (e_cal_model_tasks_parent_class)->duplicate_value (etm, col, value);
-
-	switch (col) {
-	case E_CAL_MODEL_TASKS_FIELD_GEO :
-	case E_CAL_MODEL_TASKS_FIELD_PRIORITY :
-	case E_CAL_MODEL_TASKS_FIELD_STATUS :
-	case E_CAL_MODEL_TASKS_FIELD_URL :
-		return g_strdup (value);
-	case E_CAL_MODEL_TASKS_FIELD_COMPLETED :
-	case E_CAL_MODEL_TASKS_FIELD_DUE :
-		if (value) {
-			ECellDateEditValue *dv, *orig_dv;
-
-			orig_dv = (ECellDateEditValue *) value;
-			dv = g_new0 (ECellDateEditValue, 1);
-			*dv = *orig_dv;
-
-			return dv;
-		}
-		break;
-
-	case E_CAL_MODEL_TASKS_FIELD_COMPLETE :
-	case E_CAL_MODEL_TASKS_FIELD_PERCENT :
-	case E_CAL_MODEL_TASKS_FIELD_OVERDUE :
-		return (void *) value;
-	}
-
-	return NULL;
-}
-
-static void
-ecmt_free_value (ETableModel *etm, int col, void *value)
-{
-	g_return_if_fail (col >= 0 && col < E_CAL_MODEL_TASKS_FIELD_LAST);
-	
-	if (col < E_CAL_MODEL_FIELD_LAST) {
-		E_TABLE_MODEL_CLASS (e_cal_model_tasks_parent_class)->free_value (etm, col, value);
-		return;
-	}
-
-	switch (col) {
-	case E_CAL_MODEL_TASKS_FIELD_COMPLETED :
-	case E_CAL_MODEL_TASKS_FIELD_DUE :
-	case E_CAL_MODEL_TASKS_FIELD_GEO :
-	case E_CAL_MODEL_TASKS_FIELD_PRIORITY :
-	case E_CAL_MODEL_TASKS_FIELD_STATUS :
-	case E_CAL_MODEL_TASKS_FIELD_URL :
-		if (value)
-			g_free (value);
-		break;
-	case E_CAL_MODEL_TASKS_FIELD_PERCENT :
-	case E_CAL_MODEL_TASKS_FIELD_COMPLETE :
-	case E_CAL_MODEL_TASKS_FIELD_OVERDUE :
-		break;
-	}
-}
-
-static void *
-ecmt_initialize_value (ETableModel *etm, int col)
-{
-	ECalModelTasks *model = (ECalModelTasks *) etm;
-
-	g_return_val_if_fail (E_IS_CAL_MODEL_TASKS (model), NULL);
-	g_return_val_if_fail (col >= 0 && col < E_CAL_MODEL_TASKS_FIELD_LAST, NULL);
-
-	if (col < E_CAL_MODEL_FIELD_LAST)
-		return E_TABLE_MODEL_CLASS (e_cal_model_tasks_parent_class)->initialize_value (etm, col);
-
-	switch (col) {
-	case E_CAL_MODEL_TASKS_FIELD_GEO :
-	case E_CAL_MODEL_TASKS_FIELD_PRIORITY :
-	case E_CAL_MODEL_TASKS_FIELD_STATUS :
-	case E_CAL_MODEL_TASKS_FIELD_URL :
-		return g_strdup ("");
-	case E_CAL_MODEL_TASKS_FIELD_COMPLETED :
-	case E_CAL_MODEL_TASKS_FIELD_DUE :
-	case E_CAL_MODEL_TASKS_FIELD_COMPLETE :
-	case E_CAL_MODEL_TASKS_FIELD_OVERDUE :
-		return NULL;
-	case E_CAL_MODEL_TASKS_FIELD_PERCENT :
-		return GINT_TO_POINTER (-1);
-	}
-
-	return NULL;
-}
-
-static gboolean
-ecmt_value_is_empty (ETableModel *etm, int col, const void *value)
-{
-	ECalModelTasksPrivate *priv;
-	ECalModelTasks *model = (ECalModelTasks *) etm;
-
-	g_return_val_if_fail (E_IS_CAL_MODEL_TASKS (model), TRUE);
-	g_return_val_if_fail (col >= 0 && col < E_CAL_MODEL_TASKS_FIELD_LAST, TRUE);
-
-	priv = model->priv;
-
-	if (col < E_CAL_MODEL_FIELD_LAST)
-		return E_TABLE_MODEL_CLASS (e_cal_model_tasks_parent_class)->value_is_empty (etm, col, value);
-
-	switch (col) {
-	case E_CAL_MODEL_TASKS_FIELD_GEO :
-	case E_CAL_MODEL_TASKS_FIELD_PRIORITY :
-	case E_CAL_MODEL_TASKS_FIELD_STATUS :
-	case E_CAL_MODEL_TASKS_FIELD_URL :
-		return string_is_empty (value);
-	case E_CAL_MODEL_TASKS_FIELD_COMPLETED :
-	case E_CAL_MODEL_TASKS_FIELD_DUE :
-		return value ? FALSE : TRUE;
-	case E_CAL_MODEL_TASKS_FIELD_PERCENT :
-		return (GPOINTER_TO_INT (value) < 0) ? TRUE : FALSE;
-	case E_CAL_MODEL_TASKS_FIELD_COMPLETE :
-	case E_CAL_MODEL_TASKS_FIELD_OVERDUE :
-		return TRUE;
-	}
-
-	return TRUE;
-}
-
-static char *
-ecmt_value_to_string (ETableModel *etm, int col, const void *value)
-{
-	ECalModelTasks *model = (ECalModelTasks *) etm;
-
-	g_return_val_if_fail (E_IS_CAL_MODEL_TASKS (model), g_strdup (""));
-	g_return_val_if_fail (col >= 0 && col < E_CAL_MODEL_TASKS_FIELD_LAST, g_strdup (""));
-
-	if (col < E_CAL_MODEL_FIELD_LAST)
-		return E_TABLE_MODEL_CLASS (e_cal_model_tasks_parent_class)->value_to_string (etm, col, value);
-
-	switch (col) {
-	case E_CAL_MODEL_TASKS_FIELD_GEO :
-	case E_CAL_MODEL_TASKS_FIELD_PRIORITY :
-	case E_CAL_MODEL_TASKS_FIELD_STATUS :
-	case E_CAL_MODEL_TASKS_FIELD_URL :
-		return g_strdup (value);
-	case E_CAL_MODEL_TASKS_FIELD_COMPLETED :
-	case E_CAL_MODEL_TASKS_FIELD_DUE :
-		return e_cal_model_date_value_to_string (E_CAL_MODEL (model), value);
-	case E_CAL_MODEL_TASKS_FIELD_COMPLETE :
-	case E_CAL_MODEL_TASKS_FIELD_OVERDUE :
-		return g_strdup (value ? _("Yes") : _("No"));
-	case E_CAL_MODEL_TASKS_FIELD_PERCENT :
-		if (GPOINTER_TO_INT (value) < 0)
-			return g_strdup ("N/A");
-		else
-			return g_strdup_printf ("%i%%", GPOINTER_TO_INT (value));
-	}
-
-	return g_strdup ("");
-}
-
-/* ECalModel class methods */
-
-static const char *
-ecmt_get_color_for_component (ECalModel *model, ECalModelComponent *comp_data)
-{
-	g_return_val_if_fail (E_IS_CAL_MODEL_TASKS (model), NULL);
-	g_return_val_if_fail (comp_data != NULL, NULL);
-
-	switch (get_due_status ((ECalModelTasks *) model, comp_data)) {
-	case E_CAL_MODEL_TASKS_DUE_TODAY:
-		return calendar_config_get_tasks_due_today_color ();
-	case E_CAL_MODEL_TASKS_DUE_OVERDUE:
-		return calendar_config_get_tasks_overdue_color ();
-	case E_CAL_MODEL_TASKS_DUE_NEVER:
-	case E_CAL_MODEL_TASKS_DUE_FUTURE:
-	case E_CAL_MODEL_TASKS_DUE_COMPLETE:
-		break;
-	}
-
-	return E_CAL_MODEL_CLASS (e_cal_model_tasks_parent_class)->get_color_for_component (model, comp_data);
-}
-
-static void
-ecmt_fill_component_from_model (ECalModel *model, ECalModelComponent *comp_data,
-				ETableModel *source_model, gint row)
-{
-	void *value;
-	
-	g_return_if_fail (E_IS_CAL_MODEL_TASKS (model));
-	g_return_if_fail (comp_data != NULL);
-	g_return_if_fail (E_IS_TABLE_MODEL (source_model));
-
-	/* This just makes sure if anything indicates completion, all
-	 * three fields do or if percent is 0, status is sane */
-
-	value = e_table_model_value_at (source_model, E_CAL_MODEL_TASKS_FIELD_COMPLETED, row);
-	set_completed ((ECalModelTasks *) model, comp_data, value);
-	if (!value) {
-		value = e_table_model_value_at (source_model, E_CAL_MODEL_TASKS_FIELD_PERCENT, row);
-		set_percent (comp_data, value);
-		if (GPOINTER_TO_INT (value) != 100 && GPOINTER_TO_INT (value) != 0)
-			set_status (comp_data, e_table_model_value_at (source_model, E_CAL_MODEL_TASKS_FIELD_STATUS, row));
-	}
-	
-	set_due (comp_data,
-		 e_table_model_value_at (source_model, E_CAL_MODEL_TASKS_FIELD_DUE, row));
-	set_geo (comp_data,
-		 e_table_model_value_at (source_model, E_CAL_MODEL_TASKS_FIELD_GEO, row));
-	set_priority (comp_data,
-		      e_table_model_value_at (source_model, E_CAL_MODEL_TASKS_FIELD_PRIORITY, row));
-	set_url (comp_data,
-		 e_table_model_value_at (source_model, E_CAL_MODEL_TASKS_FIELD_URL, row));
-}
-
-/**
- * e_cal_model_tasks_new
- */
-ECalModelTasks *
-e_cal_model_tasks_new (void)
-{
-	return g_object_new (E_TYPE_CAL_MODEL_TASKS, NULL);
-}
-
-/**
- * e_cal_model_tasks_mark_task_complete
- */
-void
-e_cal_model_tasks_mark_task_complete (ECalModelTasks *model, gint model_row)
-{
-	ECalModelTasksPrivate *priv;
-	ECalModelComponent *comp_data;
-
-	g_return_if_fail (E_IS_CAL_MODEL_TASKS (model));
-	g_return_if_fail (model_row >= 0 && model_row < e_table_model_row_count (E_TABLE_MODEL (model)));
-
-	priv = model->priv;
-
-	comp_data = e_cal_model_get_component_at (E_CAL_MODEL (model), model_row);
-	if (comp_data) {
-		e_table_model_pre_change (E_TABLE_MODEL (model));
-
-		ensure_task_complete (comp_data, -1);
-
-		e_table_model_row_changed (E_TABLE_MODEL (model), model_row);
-	}
-}
diff --git a/calendar/gui/e-cal-model-tasks.h b/calendar/gui/e-cal-model-tasks.h
deleted file mode 100644
index b7c5786ab4..0000000000
--- a/calendar/gui/e-cal-model-tasks.h
+++ /dev/null
@@ -1,68 +0,0 @@
-/* Evolution calendar - Data model for ETable
- *
- * Copyright (C) 2000 Ximian, Inc.
- * Copyright (C) 2000 Ximian, Inc.
- *
- * Authors: Rodrigo Moya <rodrigo@ximian.com>
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of version 2 of the GNU General Public
- * License as published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307, USA.
- */
-
-#ifndef E_CAL_MODEL_TASKS_H
-#define E_CAL_MODEL_TASKS_H
-
-#include "e-cal-model.h"
-
-G_BEGIN_DECLS
-
-#define E_TYPE_CAL_MODEL_TASKS            (e_cal_model_tasks_get_type ())
-#define E_CAL_MODEL_TASKS(obj)            (G_TYPE_CHECK_INSTANCE_CAST ((obj), E_TYPE_CAL_MODEL_TASKS, ECalModelTasks))
-#define E_CAL_MODEL_TASKS_CLASS(klass)    (G_TYPE_CHECK_CLASS_CAST ((klass), E_TYPE_CAL_MODEL_TASKS, ECalModelTasksClass))
-#define E_IS_CAL_MODEL_TASKS(obj)         (G_TYPE_CHECK_INSTANCE_TYPE ((obj), E_TYPE_CAL_MODEL_TASKS))
-#define E_IS_CAL_MODEL_TASKS_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), E_TYPE_CAL_MODEL_TASKS))
-
-typedef struct _ECalModelTasksPrivate ECalModelTasksPrivate;
-
-typedef enum {
-	/* If you add new items here or reorder them, you have to update the
-	   .etspec files for the tables using this model */
-	E_CAL_MODEL_TASKS_FIELD_COMPLETED = E_CAL_MODEL_FIELD_LAST,
-	E_CAL_MODEL_TASKS_FIELD_COMPLETE,
-	E_CAL_MODEL_TASKS_FIELD_DUE,
-	E_CAL_MODEL_TASKS_FIELD_GEO,
-	E_CAL_MODEL_TASKS_FIELD_OVERDUE,
-	E_CAL_MODEL_TASKS_FIELD_PERCENT,
-	E_CAL_MODEL_TASKS_FIELD_PRIORITY,
-	E_CAL_MODEL_TASKS_FIELD_STATUS,
-	E_CAL_MODEL_TASKS_FIELD_URL,
-	E_CAL_MODEL_TASKS_FIELD_LAST
-} ECalModelTasksField;
-
-typedef struct {
-	ECalModel model;
-	ECalModelTasksPrivate *priv;
-} ECalModelTasks;
-
-typedef struct {
-	ECalModelClass parent_class;
-} ECalModelTasksClass;
-
-GType           e_cal_model_tasks_get_type (void);
-ECalModelTasks *e_cal_model_tasks_new (void);
-
-void            e_cal_model_tasks_mark_task_complete (ECalModelTasks *model, gint model_row);
-
-G_END_DECLS
-
-#endif
diff --git a/calendar/gui/e-cal-model.c b/calendar/gui/e-cal-model.c
deleted file mode 100644
index f9e7de2003..0000000000
--- a/calendar/gui/e-cal-model.c
+++ /dev/null
@@ -1,2045 +0,0 @@
-/* Evolution calendar - Data model for ETable
- *
- * Copyright (C) 2004 Novell, Inc.
- *
- * Authors: Rodrigo Moya <rodrigo@ximian.com>
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of version 2 of the GNU General Public
- * License as published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307, USA.
- */
-
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
-
-#include <string.h>
-#include <glib/garray.h>
-#include <libgnome/gnome-i18n.h>
-#include <e-util/e-time-utils.h>
-#include <libecal/e-cal-time-util.h>
-#include "comp-util.h"
-#include "e-cal-model.h"
-#include "itip-utils.h"
-#include "misc.h"
-#include "e-calendar-marshal.h"
-
-typedef struct {
-	ECal *client;
-	ECalView *query;
-
-	gboolean do_query;
-} ECalModelClient;
-
-struct _ECalModelPrivate {
-	/* The list of clients we are managing. Each element is of type ECalModelClient */
-	GList *clients;
-
-	/* The default client in the list */
-	ECal *default_client;
-	
-	/* Array for storing the objects. Each element is of type ECalModelComponent */
-	GPtrArray *objects;
-
-	icalcomponent_kind kind;
-	ECalModelFlags flags;
-	icaltimezone *zone;
-
-	/* The time range to display */
-	time_t start;
-	time_t end;
-	
-	/* The search regular expression */
-	gchar *search_sexp;
-
-	/* The full regular expression, including time range */
-	gchar *full_sexp;
-
-	/* The default category */
-	gchar *default_category;
-
-	/* Addresses for determining icons */
-	EAccountList *accounts;
-
-	/* Whether we display dates in 24-hour format. */
-        gboolean use_24_hour_format;
-};
-
-static void e_cal_model_dispose (GObject *object);
-static void e_cal_model_finalize (GObject *object);
-
-static int ecm_column_count (ETableModel *etm);
-static int ecm_row_count (ETableModel *etm);
-static void *ecm_value_at (ETableModel *etm, int col, int row);
-static void ecm_set_value_at (ETableModel *etm, int col, int row, const void *value);
-static gboolean ecm_is_cell_editable (ETableModel *etm, int col, int row);
-static void ecm_append_row (ETableModel *etm, ETableModel *source, int row);
-static void *ecm_duplicate_value (ETableModel *etm, int col, const void *value);
-static void ecm_free_value (ETableModel *etm, int col, void *value);
-static void *ecm_initialize_value (ETableModel *etm, int col);
-static gboolean ecm_value_is_empty (ETableModel *etm, int col, const void *value);
-static char *ecm_value_to_string (ETableModel *etm, int col, const void *value);
-
-static const char *ecm_get_color_for_component (ECalModel *model, ECalModelComponent *comp_data);
-
-static ECalModelClient *add_new_client (ECalModel *model, ECal *client, gboolean do_query);
-static ECalModelClient *find_client_data (ECalModel *model, ECal *client);
-static void remove_client_objects (ECalModel *model, ECalModelClient *client_data);
-static void remove_client (ECalModel *model, ECalModelClient *client_data);
-
-/* Signal IDs */
-enum {
-	TIME_RANGE_CHANGED,
-	ROW_APPENDED,
-	LAST_SIGNAL
-};
-
-static guint signals[LAST_SIGNAL] = { 0 };
-
-G_DEFINE_TYPE (ECalModel, e_cal_model, E_TABLE_MODEL_TYPE);
-
-static void
-e_cal_model_class_init (ECalModelClass *klass)
-{
-	GObjectClass *object_class = G_OBJECT_CLASS (klass);
-	ETableModelClass *etm_class = E_TABLE_MODEL_CLASS (klass);
-
-	object_class->dispose = e_cal_model_dispose;
-	object_class->finalize = e_cal_model_finalize;
-
-	etm_class->column_count = ecm_column_count;
-	etm_class->row_count = ecm_row_count;
-	etm_class->value_at = ecm_value_at;
-	etm_class->set_value_at = ecm_set_value_at;
-	etm_class->is_cell_editable = ecm_is_cell_editable;
-	etm_class->append_row = ecm_append_row;
-	etm_class->duplicate_value = ecm_duplicate_value;
-	etm_class->free_value = ecm_free_value;
-	etm_class->initialize_value = ecm_initialize_value;
-	etm_class->value_is_empty = ecm_value_is_empty;
-	etm_class->value_to_string = ecm_value_to_string;
-
-	klass->get_color_for_component = ecm_get_color_for_component;
-	klass->fill_component_from_model = NULL;
-
-	signals[TIME_RANGE_CHANGED] =
-		g_signal_new ("time_range_changed",
-			      G_TYPE_FROM_CLASS (klass),
-			      G_SIGNAL_RUN_LAST,
-			      G_STRUCT_OFFSET (ECalModelClass, time_range_changed),
-			      NULL, NULL,
-			      e_calendar_marshal_VOID__LONG_LONG,
-			      G_TYPE_NONE, 2, G_TYPE_LONG, G_TYPE_LONG);	
-
-	signals[ROW_APPENDED] =
-		g_signal_new ("row_appended",
-			      G_TYPE_FROM_CLASS (klass),
-			      G_SIGNAL_RUN_LAST,
-			      G_STRUCT_OFFSET (ECalModelClass, row_appended),
-			      NULL, NULL,
-			      g_cclosure_marshal_VOID__VOID,
-			      G_TYPE_NONE, 0);
-}
-
-static void
-e_cal_model_init (ECalModel *model)
-{
-	ECalModelPrivate *priv;
-
-	priv = g_new0 (ECalModelPrivate, 1);
-	model->priv = priv;
-
-	/* match none by default */
-	priv->start = -1;
-	priv->end = -1;
-	priv->search_sexp = NULL;
-	priv->full_sexp = g_strdup ("#f");
-
-	priv->objects = g_ptr_array_new ();
-	priv->kind = ICAL_NO_COMPONENT;
-	priv->flags = 0;
-
-	priv->accounts = itip_addresses_get ();
-
-	priv->use_24_hour_format = TRUE;
-}
-
-static void
-clear_objects_array (ECalModelPrivate *priv)
-{
-	gint i;
-
-	for (i = 0; i < priv->objects->len; i++) {
-		ECalModelComponent *comp_data;
-
-		comp_data = g_ptr_array_index (priv->objects, i);
-		g_assert (comp_data != NULL);
-		e_cal_model_free_component_data (comp_data);
-	}
-
-	g_ptr_array_set_size (priv->objects, 0);
-}
-
-static void
-e_cal_model_dispose (GObject *object)
-{
-	ECalModelPrivate *priv;
-	ECalModel *model = (ECalModel *) object;
-
-	g_return_if_fail (E_IS_CAL_MODEL (model));
-
-	priv = model->priv;
-
-	if (priv->clients) {
-		while (priv->clients != NULL) {
-			ECalModelClient *client_data = (ECalModelClient *) priv->clients->data;
-			
-			g_signal_handlers_disconnect_matched (client_data->client, G_SIGNAL_MATCH_DATA,
-							      0, 0, NULL, NULL, model);
-			if (client_data->query)
-				g_signal_handlers_disconnect_matched (client_data->query, G_SIGNAL_MATCH_DATA,
-								      0, 0, NULL, NULL, model);
-			
-			priv->clients = g_list_remove (priv->clients, client_data);
-
-
-			g_object_unref (client_data->client);
-			if (client_data->query)
-				g_object_unref (client_data->query);
-			g_free (client_data);
-		}
-
-		priv->clients = NULL;
-	}
-
-	if (G_OBJECT_CLASS (e_cal_model_parent_class)->dispose)
-		G_OBJECT_CLASS (e_cal_model_parent_class)->dispose (object);
-}
-
-static void
-e_cal_model_finalize (GObject *object)
-{
-	ECalModelPrivate *priv;
-	ECalModel *model = (ECalModel *) object;
-
-	g_return_if_fail (E_IS_CAL_MODEL (model));
-
-	priv = model->priv;
-
-	g_free (priv->search_sexp);
-	g_free (priv->full_sexp);
-
-	g_free (priv->default_category);
-
-	clear_objects_array (priv);
-	g_ptr_array_free (priv->objects, FALSE);
-
-	g_free (priv);
-
-	if (G_OBJECT_CLASS (e_cal_model_parent_class)->finalize)
-		G_OBJECT_CLASS (e_cal_model_parent_class)->finalize (object);
-}
-
-/* ETableModel methods */
-
-static int
-ecm_column_count (ETableModel *etm)
-{
-	return E_CAL_MODEL_FIELD_LAST;
-}
-
-static int
-ecm_row_count (ETableModel *etm)
-{
-	ECalModelPrivate *priv;
-	ECalModel *model = (ECalModel *) etm;
-
-	g_return_val_if_fail (E_IS_CAL_MODEL (model), -1);
-
-	priv = model->priv;
-
-	return priv->objects->len;
-}
-
-static char *
-get_categories (ECalModelComponent *comp_data)
-{
-	icalproperty *prop;
-
-	prop = icalcomponent_get_first_property (comp_data->icalcomp, ICAL_CATEGORIES_PROPERTY);
-	if (prop)
-		return (char *) icalproperty_get_categories (prop);
-
-	return "";
-}
-
-static char *
-get_classification (ECalModelComponent *comp_data)
-{
-	icalproperty *prop;
-	icalproperty_class class;
-
-	prop = icalcomponent_get_first_property (comp_data->icalcomp, ICAL_CLASS_PROPERTY);
-
-	if (!prop)
-		return _("Public");
-
-	class = icalproperty_get_class (prop);
-
-	switch (class)
-	{
-	case ICAL_CLASS_PUBLIC:
-		return _("Public");
-	case ICAL_CLASS_PRIVATE:
-		return _("Private");
-	case ICAL_CLASS_CONFIDENTIAL:
-		return _("Confidential");
-	default:
-		return _("Unknown");
-	}
-
-	return _("Unknown");
-}
-
-static const char *
-get_color (ECalModel *model, ECalModelComponent *comp_data)
-{
-	g_return_val_if_fail (E_IS_CAL_MODEL (model), NULL);
-
-	return e_cal_model_get_color_for_component (model, comp_data);
-}
-
-static char *
-get_description (ECalModelComponent *comp_data)
-{
-	icalproperty *prop;
-	static GString *str = NULL;
-
-	if (str) {
-		g_string_free (str, TRUE);
-		str = NULL;
-	}
-	
-	prop = icalcomponent_get_first_property (comp_data->icalcomp, ICAL_DESCRIPTION_PROPERTY);
-	if (prop) {
-		str = g_string_new ("");
-		do {
-			str = g_string_append (str, icalproperty_get_description (prop));
-		} while ((prop = icalcomponent_get_next_property (comp_data->icalcomp, ICAL_DESCRIPTION_PROPERTY)));
-
-		return str->str;
-	}
-
-	return "";
-}
-
-static ECellDateEditValue*
-get_dtstart (ECalModel *model, ECalModelComponent *comp_data)
-{
-	ECalModelPrivate *priv;
-        struct icaltimetype tt_start;
-
-	priv = model->priv;
-
-	if (!comp_data->dtstart) {
-		icalproperty *prop;
-		icaltimezone *zone;
-		gboolean got_zone = FALSE;
-
-		prop = icalcomponent_get_first_property (comp_data->icalcomp, ICAL_DTSTART_PROPERTY);
-		if (!prop)
-			return NULL;
-
-		tt_start = icalproperty_get_dtstart (prop);
-
-		if (icaltime_get_tzid (tt_start)
-		    && e_cal_get_timezone (comp_data->client, icaltime_get_tzid (tt_start), &zone, NULL))
-			got_zone = TRUE;
-
-		if (e_cal_model_get_flags (model) & E_CAL_MODEL_FLAGS_EXPAND_RECURRENCES) {
-			if (got_zone) {
-				tt_start = icaltime_from_timet_with_zone (comp_data->instance_start, tt_start.is_date, zone);
-				if (priv->zone)
-					icaltimezone_convert_time (&tt_start, zone, priv->zone);
-			} else
-				tt_start = icaltime_from_timet (comp_data->instance_start, tt_start.is_date);
-		}
-
-		if (!icaltime_is_valid_time (tt_start) || icaltime_is_null_time (tt_start))
-			return NULL;
-
-		comp_data->dtstart = g_new0 (ECellDateEditValue, 1);
-		comp_data->dtstart->tt = tt_start;
-
-		if (got_zone)
-			comp_data->dtstart->zone = zone;
-		else
-			comp_data->dtstart->zone = NULL;
-	}
-
-	return comp_data->dtstart;
-}
-
-static char *
-get_summary (ECalModelComponent *comp_data)
-{
-	icalproperty *prop;
-
-	prop = icalcomponent_get_first_property (comp_data->icalcomp, ICAL_SUMMARY_PROPERTY);
-	if (prop)
-		return (char *) icalproperty_get_summary (prop);
-
-	return "";
-}
-
-static char *
-get_uid (ECalModelComponent *comp_data)
-{
-	return (char *) icalcomponent_get_uid (comp_data->icalcomp);
-}
-
-static void *
-ecm_value_at (ETableModel *etm, int col, int row)
-{
-	ECalModelPrivate *priv;
-	ECalModelComponent *comp_data;
-	ECalModel *model = (ECalModel *) etm;
-
-	g_return_val_if_fail (E_IS_CAL_MODEL (model), NULL);
-
-	priv = model->priv;
-
-	g_return_val_if_fail (col >= 0 && col < E_CAL_MODEL_FIELD_LAST, NULL);
-	g_return_val_if_fail (row >= 0 && row < priv->objects->len, NULL);
-
-	comp_data = g_ptr_array_index (priv->objects, row);
-	g_assert (comp_data != NULL);
-
-	switch (col) {
-	case E_CAL_MODEL_FIELD_CATEGORIES :
-		return get_categories (comp_data);
-	case E_CAL_MODEL_FIELD_CLASSIFICATION :
-		return get_classification (comp_data);
-	case E_CAL_MODEL_FIELD_COLOR :
-		return (void *) get_color (model, comp_data);
-	case E_CAL_MODEL_FIELD_COMPONENT :
-		return comp_data->icalcomp;
-	case E_CAL_MODEL_FIELD_DESCRIPTION :
-		return get_description (comp_data);
-	case E_CAL_MODEL_FIELD_DTSTART :
-		return (void *) get_dtstart (model, comp_data);
-	case E_CAL_MODEL_FIELD_HAS_ALARMS :
-		return GINT_TO_POINTER ((icalcomponent_get_first_component (comp_data->icalcomp,
-									    ICAL_VALARM_COMPONENT) != NULL));
-	case E_CAL_MODEL_FIELD_ICON :
-	{
-		ECalComponent *comp;
-		icalcomponent *icalcomp;
-		gint retval = 0;
-
-		comp = e_cal_component_new ();
-		icalcomp = icalcomponent_new_clone (comp_data->icalcomp);
-		if (e_cal_component_set_icalcomponent (comp, icalcomp)) {
-			if (e_cal_component_has_recurrences (comp))
-				retval = 1;
-			else if (itip_organizer_is_user (comp, comp_data->client))
-				retval = 3;
-			else {
-				GSList *attendees = NULL, *sl;
-
-				e_cal_component_get_attendee_list (comp, &attendees);
-				for (sl = attendees; sl != NULL; sl = sl->next) {
-					ECalComponentAttendee *ca = sl->data;
-					const char *text;
-
-					text = itip_strip_mailto (ca->value);
-					if (e_account_list_find (priv->accounts, E_ACCOUNT_FIND_ID_ADDRESS, text) != NULL) {
-						if (ca->delto != NULL)
-							retval = 3;
-						else
-							retval = 2;
-						break;
-					}
-				}
-
-				e_cal_component_free_attendee_list (attendees);
-			}
-		} else
-			icalcomponent_free (icalcomp);
-
-		g_object_unref (comp);
-
-		return GINT_TO_POINTER (retval);
-	}
-	case E_CAL_MODEL_FIELD_SUMMARY :
-		return get_summary (comp_data);
-	case E_CAL_MODEL_FIELD_UID :
-		return get_uid (comp_data);
-	}
-
-	return "";
-}
-
-static void
-set_categories (ECalModelComponent *comp_data, const char *value)
-{
-	icalproperty *prop;
-
-	prop = icalcomponent_get_first_property (comp_data->icalcomp, ICAL_CATEGORIES_PROPERTY);
-	if (!value || !(*value)) {
-		if (prop) {
-			icalcomponent_remove_property (comp_data->icalcomp, prop);
-			icalproperty_free (prop);
-		}
-	} else {
-		if (!prop) {
-			prop = icalproperty_new_categories (value);
-			icalcomponent_add_property (comp_data->icalcomp, prop);
-		} else
-			icalproperty_set_categories (prop, value);
-	}
-}
-
-static void
-set_classification (ECalModelComponent *comp_data, const char *value)
-{
-	icalproperty *prop;
-
-	prop = icalcomponent_get_first_property (comp_data->icalcomp, ICAL_CLASS_PROPERTY);
-	if (!value || !(*value)) {
-		if (prop) {
-			icalcomponent_remove_property (comp_data->icalcomp, prop);
-			icalproperty_free (prop);
-		}
-	} else {
-	  icalproperty_class ical_class;
-
-	  if (!strcasecmp (value, "PUBLIC"))
-	    ical_class = ICAL_CLASS_PUBLIC;
-	  else if (!strcasecmp (value, "PRIVATE"))
-	    ical_class = ICAL_CLASS_PRIVATE;
-	  else if (!strcasecmp (value, "CONFIDENTIAL"))
-	    ical_class = ICAL_CLASS_CONFIDENTIAL;
-	  else
-	    ical_class = ICAL_CLASS_NONE;
-
-		if (!prop) {
-			prop = icalproperty_new_class (ical_class);
-			icalcomponent_add_property (comp_data->icalcomp, prop);
-		} else
-			icalproperty_set_class (prop, ical_class);
-	}
-}
-
-static void
-set_description (ECalModelComponent *comp_data, const char *value)
-{
-	icalproperty *prop;
-
-	/* remove old description(s) */
-	prop = icalcomponent_get_first_property (comp_data->icalcomp, ICAL_DESCRIPTION_PROPERTY);
-	while (prop) {
-		icalproperty *next;
-
-		next = icalcomponent_get_next_property (comp_data->icalcomp, ICAL_DESCRIPTION_PROPERTY);
-
-		icalcomponent_remove_property (comp_data->icalcomp, prop);
-		icalproperty_free (prop);
-
-		prop = next;
-	}
-
-	/* now add the new description */
-	if (!value || !(*value))
-		return;
-
-	prop = icalproperty_new_description (value);
-	icalcomponent_add_property (comp_data->icalcomp, prop);
-}
-
-static void
-set_dtstart (ECalModel *model, ECalModelComponent *comp_data, const void *value)
-{
-	ECellDateEditValue *dv = (ECellDateEditValue *) value;
-	icalproperty *prop;
-	icalparameter *param;
-	const char *tzid;
-	
-	prop = icalcomponent_get_first_property (comp_data->icalcomp, ICAL_DTSTART_PROPERTY);
-	if (prop)
-		param = icalproperty_get_first_parameter (prop, ICAL_TZID_PARAMETER);
-	else
-		param = NULL;
-
-	/* If we are setting the property to NULL (i.e. removing it), then
-	   we remove it if it exists. */
-	if (!dv) {
-		if (prop) {
-			icalcomponent_remove_property (comp_data->icalcomp, prop);
-			icalproperty_free (prop);
-		}
-
-		return;
-	}
-	
-	/* If the TZID is set to "UTC", we set the is_utc flag. */
-	tzid = dv->zone ? icaltimezone_get_tzid (dv->zone) : "UTC";
-	if (tzid && !strcmp (tzid, "UTC"))
-		dv->tt.is_utc = 1;
-	else
-		dv->tt.is_utc = 0;
-
-	if (prop) {
-		icalproperty_set_dtstart (prop, dv->tt);
-	} else {
-		prop = icalproperty_new_dtstart (dv->tt);
-		icalcomponent_add_property (comp_data->icalcomp, prop);
-	}
-
-	/* If the TZID is set to "UTC", we don't want to save the TZID. */
-	if (tzid && strcmp (tzid, "UTC")) {
-		if (param) {
-			icalparameter_set_tzid (param, (char *) tzid);
-		} else {
-			param = icalparameter_new_tzid ((char *) tzid);
-			icalproperty_add_parameter (prop, param);
-		}
-	} else if (param) {
-		icalproperty_remove_parameter (prop, ICAL_TZID_PARAMETER);
-	}
-}
-
-static void
-set_summary (ECalModelComponent *comp_data, const char *value)
-{
-	icalproperty *prop;
-
-	prop = icalcomponent_get_first_property (comp_data->icalcomp, ICAL_SUMMARY_PROPERTY);
-
-	if (string_is_empty (value)) {
-		if (prop) {
-			icalcomponent_remove_property (comp_data->icalcomp, prop);
-			icalproperty_free (prop);
-		}
-	} else {
-		if (prop)
-			icalproperty_set_summary (prop, value);
-		else {
-			prop = icalproperty_new_summary (value);
-			icalcomponent_add_property (comp_data->icalcomp, prop);
-		}
-	}
-}
-
-static void
-ecm_set_value_at (ETableModel *etm, int col, int row, const void *value)
-{
-	ECalModelPrivate *priv;
-	ECalModelComponent *comp_data;
-	ECalModel *model = (ECalModel *) etm;
-
-	g_return_if_fail (E_IS_CAL_MODEL (model));
-
-	priv = model->priv;
-
-	g_return_if_fail (col >= 0 && col < E_CAL_MODEL_FIELD_LAST);
-	g_return_if_fail (row >= 0 && row < priv->objects->len);
-
-	comp_data = g_ptr_array_index (priv->objects, row);
-	g_assert (comp_data != NULL);
-
-	switch (col) {
-	case E_CAL_MODEL_FIELD_CATEGORIES :
-		set_categories (comp_data, value);
-		break;
-	case E_CAL_MODEL_FIELD_CLASSIFICATION :
-		set_classification (comp_data, value);
-		break;
-	case E_CAL_MODEL_FIELD_DESCRIPTION :
-		set_description (comp_data, value);
-		break;
-	case E_CAL_MODEL_FIELD_DTSTART :
-		set_dtstart (model, comp_data, value);
-		break;
-	case E_CAL_MODEL_FIELD_SUMMARY :
-		set_summary (comp_data, value);
-		break;
-	}
-
-	/* FIXME ask about mod type */
-	if (!e_cal_modify_object (comp_data->client, comp_data->icalcomp, CALOBJ_MOD_ALL, NULL)) {
-		g_warning (G_STRLOC ": Could not modify the object!");
-		
-		/* FIXME Show error dialog */
-	}
-}
-
-static gboolean
-ecm_is_cell_editable (ETableModel *etm, int col, int row)
-{
-	ECalModelPrivate *priv;
-	ECalModel *model = (ECalModel *) etm;
-
-	g_return_val_if_fail (E_IS_CAL_MODEL (model), FALSE);
-
-	priv = model->priv;
-
-	g_return_val_if_fail (col >= 0 && col <= E_CAL_MODEL_FIELD_LAST, FALSE);
-	g_return_val_if_fail (row >= -1 || (row >= 0 && row < priv->objects->len), FALSE);
-
-	switch (col) {
-	case E_CAL_MODEL_FIELD_CATEGORIES :
-	case E_CAL_MODEL_FIELD_CLASSIFICATION :
-	case E_CAL_MODEL_FIELD_DESCRIPTION :
-	case E_CAL_MODEL_FIELD_DTSTART :
-	case E_CAL_MODEL_FIELD_SUMMARY :
-		return TRUE;
-	}
-
-	return FALSE;
-}
-
-static void
-ecm_append_row (ETableModel *etm, ETableModel *source, int row)
-{
-	ECalModelClass *model_class;
-	ECalModelComponent comp_data;
-	ECalModel *model = (ECalModel *) etm;
-
-	g_return_if_fail (E_IS_CAL_MODEL (model));
-	g_return_if_fail (E_IS_TABLE_MODEL (source));
-
-	memset (&comp_data, 0, sizeof (ECalModelComponent));
-	comp_data.client = e_cal_model_get_default_client (model);
-
-	/* guard against saving before the calendar is open */
-	if (!(comp_data.client && e_cal_get_load_state (comp_data.client) == E_CAL_LOAD_LOADED))
-		return;
-
-	comp_data.icalcomp = e_cal_model_create_component_with_defaults (model);
-
-	/* set values for our fields */
-	set_categories (&comp_data, e_table_model_value_at (source, E_CAL_MODEL_FIELD_CATEGORIES, row));
-	set_classification (&comp_data, e_table_model_value_at (source, E_CAL_MODEL_FIELD_CLASSIFICATION, row));
-	set_description (&comp_data, e_table_model_value_at (source, E_CAL_MODEL_FIELD_DESCRIPTION, row));
-	set_dtstart (model, &comp_data, e_table_model_value_at (source, E_CAL_MODEL_FIELD_DTSTART, row));
-	set_summary (&comp_data, e_table_model_value_at (source, E_CAL_MODEL_FIELD_SUMMARY, row));
-
-	/* call the class' method for filling the component */
-	model_class = (ECalModelClass *) G_OBJECT_GET_CLASS (model);
-	if (model_class->fill_component_from_model != NULL) {
-		model_class->fill_component_from_model (model, &comp_data, source, row);
-	}
-
-	if (!e_cal_create_object (comp_data.client, comp_data.icalcomp, NULL, NULL)) {
-		g_warning (G_STRLOC ": Could not create the object!");
-
-		/* FIXME: show error dialog */
-		icalcomponent_free (comp_data.icalcomp);
-		return;
-	}
-
-	icalcomponent_free (comp_data.icalcomp);
-
-	g_signal_emit (G_OBJECT (model), signals[ROW_APPENDED], 0);	
-}
-
-static void *
-ecm_duplicate_value (ETableModel *etm, int col, const void *value)
-{
-	g_return_val_if_fail (col >= 0 && col < E_CAL_MODEL_FIELD_LAST, NULL);
-
-	switch (col) {
-	case E_CAL_MODEL_FIELD_CATEGORIES :
-	case E_CAL_MODEL_FIELD_CLASSIFICATION :
-	case E_CAL_MODEL_FIELD_SUMMARY :
-		return g_strdup (value);
-	case E_CAL_MODEL_FIELD_HAS_ALARMS :
-	case E_CAL_MODEL_FIELD_ICON :
-	case E_CAL_MODEL_FIELD_COLOR :
-		return (void *) value;
-	case E_CAL_MODEL_FIELD_COMPONENT :
-		return icalcomponent_new_clone ((icalcomponent *) value);
-	case E_CAL_MODEL_FIELD_DTSTART :
-		if (value) {
-			ECellDateEditValue *dv, *orig_dv;
-
-			orig_dv = (ECellDateEditValue *) value;
-			dv = g_new0 (ECellDateEditValue, 1);
-			*dv = *orig_dv;
-
-			return dv;
-		}
-		break;
-	}
-
-	return NULL;
-}
-
-static void
-ecm_free_value (ETableModel *etm, int col, void *value)
-{
-	g_return_if_fail (col >= 0 && col < E_CAL_MODEL_FIELD_LAST);
-
-	switch (col) {
-	case E_CAL_MODEL_FIELD_CATEGORIES :
-	case E_CAL_MODEL_FIELD_DESCRIPTION :
-	case E_CAL_MODEL_FIELD_SUMMARY :
-		if (value)
-			g_free (value);
-		break;
-	case E_CAL_MODEL_FIELD_CLASSIFICATION :
-	case E_CAL_MODEL_FIELD_HAS_ALARMS :
-	case E_CAL_MODEL_FIELD_ICON :
-	case E_CAL_MODEL_FIELD_COLOR :
-		break;
-	case E_CAL_MODEL_FIELD_DTSTART :
-		if (value)
-			g_free (value);
-		break;
-	case E_CAL_MODEL_FIELD_COMPONENT :
-		if (value)
-			icalcomponent_free ((icalcomponent *) value);
-		break;
-	}
-}
-
-static void *
-ecm_initialize_value (ETableModel *etm, int col)
-{
-	ECalModelPrivate *priv;
-	ECalModel *model = (ECalModel *) etm;
-
-	g_return_val_if_fail (E_IS_CAL_MODEL (model), NULL);
-	g_return_val_if_fail (col >= 0 && col < E_CAL_MODEL_FIELD_LAST, NULL);
-
-	priv = model->priv;
-
-	switch (col) {
-	case E_CAL_MODEL_FIELD_CATEGORIES :
-		return g_strdup (priv->default_category?priv->default_category:"");
-	case E_CAL_MODEL_FIELD_CLASSIFICATION :
-	case E_CAL_MODEL_FIELD_DESCRIPTION :
-	case E_CAL_MODEL_FIELD_SUMMARY :
-		return g_strdup ("");
-	case E_CAL_MODEL_FIELD_DTSTART :
-	case E_CAL_MODEL_FIELD_HAS_ALARMS :
-	case E_CAL_MODEL_FIELD_ICON :
-	case E_CAL_MODEL_FIELD_COLOR :
-	case E_CAL_MODEL_FIELD_COMPONENT :
-		return NULL;
-	}
-
-	return NULL;
-}
-
-static gboolean
-ecm_value_is_empty (ETableModel *etm, int col, const void *value)
-{
-	ECalModelPrivate *priv;
-	ECalModel *model = (ECalModel *) etm;
-
-	g_return_val_if_fail (E_IS_CAL_MODEL (model), TRUE);
-	g_return_val_if_fail (col >= 0 && col < E_CAL_MODEL_FIELD_LAST, TRUE);
-
-	priv = model->priv;
-
-	switch (col) {
-	case E_CAL_MODEL_FIELD_CATEGORIES :
-		/* This could be a hack or not.  If the categories field only
-		 * contains the default category, then it possibly means that
-		 * the user has not entered anything at all in the click-to-add;
-		 * the category is in the value because we put it there in
-		 * ecm_initialize_value().
-		 */
-		if (priv->default_category && value && strcmp (priv->default_category, value) == 0)
-			return TRUE;
-		else
-			return string_is_empty (value);
-	case E_CAL_MODEL_FIELD_CLASSIFICATION :
-	case E_CAL_MODEL_FIELD_DESCRIPTION :
-	case E_CAL_MODEL_FIELD_SUMMARY :
-		return string_is_empty (value);
-	case E_CAL_MODEL_FIELD_DTSTART :
-		return value ? FALSE : TRUE;
-	case E_CAL_MODEL_FIELD_HAS_ALARMS :
-	case E_CAL_MODEL_FIELD_ICON :
-	case E_CAL_MODEL_FIELD_COLOR :
-	case E_CAL_MODEL_FIELD_COMPONENT :
-		return TRUE;
-	}
-
-	return TRUE;
-}
-
-static char *
-ecm_value_to_string (ETableModel *etm, int col, const void *value)
-{
-	g_return_val_if_fail (col >= 0 && col < E_CAL_MODEL_FIELD_LAST, g_strdup (""));
-
-	switch (col) {
-	case E_CAL_MODEL_FIELD_CATEGORIES :
-	case E_CAL_MODEL_FIELD_CLASSIFICATION :
-	case E_CAL_MODEL_FIELD_DESCRIPTION :
-	case E_CAL_MODEL_FIELD_SUMMARY :
-		return g_strdup (value);
-	case E_CAL_MODEL_FIELD_DTSTART :
-		return e_cal_model_date_value_to_string (E_CAL_MODEL (etm), value);
-	case E_CAL_MODEL_FIELD_ICON :
-		if (GPOINTER_TO_INT (value) == 0)
-			return g_strdup (_("Normal"));
-		else if (GPOINTER_TO_INT (value) == 1)
-			return g_strdup (_("Recurring"));
-		else
-			return g_strdup (_("Assigned"));
-	case E_CAL_MODEL_FIELD_HAS_ALARMS :
-		return g_strdup (value ? _("Yes") : _("No"));
-	case E_CAL_MODEL_FIELD_COLOR :
-	case E_CAL_MODEL_FIELD_COMPONENT :
-		return g_strdup ("");
-	}
-
-	return g_strdup ("");
-}
-
-/* ECalModel class methods */
-
-typedef struct {
-	const gchar *color;
-	GList *uris;
-} AssignedColorData;
-
-static const char *
-ecm_get_color_for_component (ECalModel *model, ECalModelComponent *comp_data)
-{
-	ESource *source;
-	guint32 source_color;
-	ECalModelPrivate *priv;
-	gint i, first_empty = 0;
-	static AssignedColorData assigned_colors[] = {
-		{ "#BECEDD", NULL }, /* 190 206 221     Blue */
-		{ "#E2F0EF", NULL }, /* 226 240 239     Light Blue */
-		{ "#C6E2B7", NULL }, /* 198 226 183     Green */
-		{ "#E2F0D3", NULL }, /* 226 240 211     Light Green */
-		{ "#E2D4B7", NULL }, /* 226 212 183     Khaki */
-		{ "#EAEAC1", NULL }, /* 234 234 193     Light Khaki */
-		{ "#F0B8B7", NULL }, /* 240 184 183     Pink */
-		{ "#FED4D3", NULL }, /* 254 212 211     Light Pink */
-		{ "#E2C6E1", NULL }, /* 226 198 225     Purple */
-		{ "#F0E2EF", NULL }  /* 240 226 239     Light Purple */
-	};
-
-	g_return_val_if_fail (E_IS_CAL_MODEL (model), NULL);
-
-	priv = model->priv;
-             
-	source = e_cal_get_source (comp_data->client);
-	if (e_source_get_color (source, &source_color)) {
-		g_free (comp_data->color);
-		comp_data->color = g_strdup_printf ("#%06x", source_color & 0xffffff);
-		return comp_data->color;
-	}
-                                                                   
-	for (i = 0; i < G_N_ELEMENTS (assigned_colors); i++) {
-		GList *l;
-
-		if (assigned_colors[i].uris == NULL) {
-			first_empty = i;
-			continue;
-		}
-
-		for (l = assigned_colors[i].uris; l != NULL; l = l->next) {
-			if (!strcmp ((const char *) l->data,
-				     e_cal_get_uri (comp_data->client)))
-			{
-				return assigned_colors[i].color;
-			}
-		}
-	}
-
-	/* return the first unused color */
-	assigned_colors[first_empty].uris = g_list_append (assigned_colors[first_empty].uris,
-							   g_strdup (e_cal_get_uri (comp_data->client)));
-
-	return assigned_colors[first_empty].color;
-}
-
-/**
- * e_cal_model_get_component_kind
- */
-icalcomponent_kind
-e_cal_model_get_component_kind (ECalModel *model)
-{
-	ECalModelPrivate *priv;
-
-	g_return_val_if_fail (E_IS_CAL_MODEL (model), ICAL_NO_COMPONENT);
-
-	priv = model->priv;
-	return priv->kind;
-}
-
-/**
- * e_cal_model_set_component_kind
- */
-void
-e_cal_model_set_component_kind (ECalModel *model, icalcomponent_kind kind)
-{
-	ECalModelPrivate *priv;
-
-	g_return_if_fail (E_IS_CAL_MODEL (model));
-
-	priv = model->priv;
-	priv->kind = kind;
-}
-
-/**
- * e_cal_model_get_flags
- */
-ECalModelFlags
-e_cal_model_get_flags (ECalModel *model)
-{
-	ECalModelPrivate *priv;
-
-	g_return_val_if_fail (E_IS_CAL_MODEL (model), E_CAL_MODEL_FLAGS_INVALID);
-
-	priv = model->priv;
-	return priv->flags;
-}
-
-/**
- * e_cal_model_set_flags
- */
-void
-e_cal_model_set_flags (ECalModel *model, ECalModelFlags flags)
-{
-	ECalModelPrivate *priv;
-
-	g_return_if_fail (E_IS_CAL_MODEL (model));
-
-	priv = model->priv;
-	priv->flags = flags;
-}
-
-/**
- * e_cal_model_get_timezone
- */
-icaltimezone *
-e_cal_model_get_timezone (ECalModel *model)
-{
-	g_return_val_if_fail (E_IS_CAL_MODEL (model), NULL);
-	return model->priv->zone;
-}
-
-/**
- * e_cal_model_set_timezone
- */
-void
-e_cal_model_set_timezone (ECalModel *model, icaltimezone *zone)
-{
-	ECalModelPrivate *priv;
-	GList *l;
-	
-	g_return_if_fail (E_IS_CAL_MODEL (model));
-
-	priv = model->priv;
-	if (priv->zone != zone) {
-		e_table_model_pre_change (E_TABLE_MODEL (model));
-		priv->zone = zone;
-
-		for (l = priv->clients; l; l = l->next)
-			e_cal_set_default_timezone (((ECalModelClient *)l->data)->client, priv->zone, NULL);
-		
-		/* the timezone affects the times shown for date fields,
-		   so we need to redisplay everything */
-		e_table_model_changed (E_TABLE_MODEL (model));
-	}
-}
-
-/**
- * e_cal_model_set_default_category
- */
-void
-e_cal_model_set_default_category (ECalModel *model, const gchar *default_cat)
-{
-	g_return_if_fail (E_IS_CAL_MODEL (model));
-
-	if (model->priv->default_category)
-		g_free (model->priv->default_category);
-
-	model->priv->default_category = g_strdup (default_cat);
-}
-
-/**
- * e_cal_model_get_use_24_hour_format
- */
-gboolean
-e_cal_model_get_use_24_hour_format (ECalModel *model)
-{
-	g_return_val_if_fail (E_IS_CAL_MODEL (model), FALSE);
-
-	return model->priv->use_24_hour_format;
-}
-
-/**
- * e_cal_model_set_use_24_hour_format
- */
-void
-e_cal_model_set_use_24_hour_format (ECalModel *model, gboolean use24)
-{
-	g_return_if_fail (E_IS_CAL_MODEL (model));
-
-	if (model->priv->use_24_hour_format != use24) {
-                e_table_model_pre_change (E_TABLE_MODEL (model));
-                model->priv->use_24_hour_format = use24;
-                /* Get the views to redraw themselves. */
-                e_table_model_changed (E_TABLE_MODEL (model));
-        }
-}
-
-/**
- * e_cal_model_get_default_client
- */
-ECal *
-e_cal_model_get_default_client (ECalModel *model)
-{
-	ECalModelPrivate *priv;
-	ECalModelClient *client_data;
-
-	g_return_val_if_fail (model != NULL, NULL);
-	g_return_val_if_fail (E_IS_CAL_MODEL (model), NULL);
-	
-	priv = model->priv;
-
-	/* FIXME Should we force the client to be open? */
-
-	/* we always return a valid ECal, since we rely on it in many places */
-	if (priv->default_client)
-		return priv->default_client;
-
-	if (!priv->clients)
-		return NULL;
-
-	client_data = (ECalModelClient *) priv->clients->data;
-
-	return client_data ? client_data->client : NULL;
-}
-
-void
-e_cal_model_set_default_client (ECalModel *model, ECal *client)
-{
-	ECalModelPrivate *priv;
-	ECalModelClient *client_data;
-	
-	g_return_if_fail (model != NULL);
-	g_return_if_fail (E_IS_CAL_MODEL (model));
-	g_return_if_fail (client != NULL);
-	g_return_if_fail (E_IS_CAL (client));
-
-	priv = model->priv;
-
-	if (priv->default_client) {
-		ECalModelClient *client_data;
-		
-		client_data = find_client_data (model, priv->default_client);
-		g_assert (client_data);
-
-		if (!client_data->do_query)
-			remove_client (model, client_data);
-	}
-	
-	/* Make sure its in the model */
-	client_data = add_new_client (model, client, FALSE);
-
-	/* Store the default client */	
-	priv->default_client = client_data->client;	
-}
-
-/**
- * e_cal_model_get_client_list
- */
-GList *
-e_cal_model_get_client_list (ECalModel *model)
-{
-	GList *list = NULL, *l;
-
-	g_return_val_if_fail (E_IS_CAL_MODEL (model), NULL);
-
-	for (l = model->priv->clients; l != NULL; l = l->next) {
-		ECalModelClient *client_data = (ECalModelClient *) l->data;
-
-		list = g_list_append (list, client_data->client);
-	}
-
-	return list;
-}
-
-/**
- * e_cal_model_get_client_for_uri
- * @model: A calendar model.
- * @uri: Uri for the client to get.
- */
-ECal *
-e_cal_model_get_client_for_uri (ECalModel *model, const char *uri)
-{
-	GList *l;
-
-	g_return_val_if_fail (E_IS_CAL_MODEL (model), NULL);
-	g_return_val_if_fail (uri != NULL, NULL);
-
-	for (l = model->priv->clients; l != NULL; l = l->next) {
-		ECalModelClient *client_data = (ECalModelClient *) l->data;
-
-		if (!strcmp (uri, e_cal_get_uri (client_data->client)))
-			return client_data->client;
-	}
-
-	return NULL;
-}
-
-static ECalModelClient *
-find_client_data (ECalModel *model, ECal *client)
-{
-	ECalModelPrivate *priv;
-	GList *l;
-	
-	priv = model->priv;
-
-	for (l = priv->clients; l != NULL; l = l->next) {
-		ECalModelClient *client_data = (ECalModelClient *) l->data;
-
-		if (client_data->client == client)
-			return client_data;
-	}	
-
-	return NULL;
-}
-
-/* Pass NULL for the client if we just want to find based on uid */
-/* FIXME how do we prevent the same UID is different calendars? */
-static ECalModelComponent *
-search_by_uid_and_client (ECalModelPrivate *priv, ECal *client, const char *uid)
-{
-	gint i;
-
-	for (i = 0; i < priv->objects->len; i++) {
-		ECalModelComponent *comp_data = g_ptr_array_index (priv->objects, i);
-
-		if (comp_data) {
-			const char *tmp_uid;
-
-			tmp_uid = icalcomponent_get_uid (comp_data->icalcomp);
-			if (tmp_uid && *tmp_uid) {
-				if (comp_data->client == client && !strcmp (uid, tmp_uid))
-					return comp_data;
-			}
-		}
-	}
-
-	return NULL;
-}
-
-static gint
-get_position_in_array (GPtrArray *objects, gpointer item)
-{
-	gint i;
-
-	for (i = 0; i < objects->len; i++) {
-		if (g_ptr_array_index (objects, i) == item)
-			return i;
-	}
-
-	return -1;
-}
-
-typedef struct {
-	ECal *client;
-	ECalView *query;
-	ECalModel *model;
-	icalcomponent *icalcomp;
-} RecurrenceExpansionData;
-
-static gboolean
-add_instance_cb (ECalComponent *comp, time_t instance_start, time_t instance_end, gpointer user_data)
-{
-	ECalModelComponent *comp_data;
-	ECalModelPrivate *priv;
-	RecurrenceExpansionData *rdata = user_data;
-
-	priv = rdata->model->priv;
-
-	e_table_model_pre_change (E_TABLE_MODEL (rdata->model));
-
-	comp_data = g_new0 (ECalModelComponent, 1);
-	comp_data->client = g_object_ref (rdata->client);
-	comp_data->icalcomp = icalcomponent_new_clone (e_cal_component_get_icalcomponent (comp));
-	comp_data->instance_start = instance_start;
-	comp_data->instance_end = instance_end;
-	comp_data->dtstart = comp_data->dtend = comp_data->due = comp_data->completed = NULL;
-	comp_data->color = NULL;
-
-	g_ptr_array_add (priv->objects, comp_data);
-	e_table_model_row_inserted (E_TABLE_MODEL (rdata->model), priv->objects->len - 1);
-
-	return TRUE;
-}
-
-static void
-set_instance_times (ECalModelComponent *comp_data, icaltimezone *zone)
-{
-	struct icaltimetype recur_time, start_time, end_time, itt;
-
-	recur_time = icalcomponent_get_recurrenceid (comp_data->icalcomp);
-	start_time = icalcomponent_get_dtstart (comp_data->icalcomp);
-	end_time = icalcomponent_get_dtend (comp_data->icalcomp);
-
-	if (e_cal_util_component_is_instance (comp_data->icalcomp)) {
-		itt = icaltime_convert_to_zone (recur_time, icaltimezone_get_utc_timezone ());
-		comp_data->instance_start = icaltime_as_timet (itt);
-	} else {
-		comp_data->instance_start = icaltime_as_timet (start_time);
-	}
-
-	comp_data->instance_end = comp_data->instance_start +
-		(icaltime_as_timet (end_time) - icaltime_as_timet (start_time));
-}
-
-static void
-e_cal_view_objects_added_cb (ECalView *query, GList *objects, gpointer user_data)
-{
-	ECalModel *model = (ECalModel *) user_data;
-	ECalModelPrivate *priv;
-	GList *l;
-
-	priv = model->priv;
-
-	for (l = objects; l; l = l->next) {
-		ECalModelComponent *comp_data;
-
-		/* remove the components if they are already present and re-add them */
-		while ((comp_data = search_by_uid_and_client (priv, e_cal_view_get_client (query),
-							      icalcomponent_get_uid (l->data)))) {
-			int pos;
-
-			pos = get_position_in_array (priv->objects, comp_data);
-			e_table_model_row_deleted (E_TABLE_MODEL (model), pos);
-
-			g_ptr_array_remove (priv->objects, comp_data);
-			e_cal_model_free_component_data (comp_data);
-		}
-
-		if ((priv->flags & E_CAL_MODEL_FLAGS_EXPAND_RECURRENCES)) {
-			RecurrenceExpansionData rdata;
-
-			rdata.client = e_cal_view_get_client (query);
-			rdata.query = query;
-			rdata.model = model;
-			rdata.icalcomp = l->data;
-			e_cal_generate_instances_for_object (rdata.client, l->data,
-							     priv->start, priv->end,
-							     (ECalRecurInstanceFn) add_instance_cb,
-							     &rdata);
-		} else {
-			e_table_model_pre_change (E_TABLE_MODEL (model));
-
-			comp_data = g_new0 (ECalModelComponent, 1);
-			comp_data->client = g_object_ref (e_cal_view_get_client (query));
-			comp_data->icalcomp = icalcomponent_new_clone (l->data);
-			set_instance_times (comp_data, priv->zone);
-			comp_data->dtstart = comp_data->dtend = comp_data->due = comp_data->completed = NULL;
-			comp_data->color = NULL;
-
-			g_ptr_array_add (priv->objects, comp_data);
-			e_table_model_row_inserted (E_TABLE_MODEL (model), priv->objects->len - 1);
-		}
-	}
-}
-
-static void
-e_cal_view_objects_modified_cb (ECalView *query, GList *objects, gpointer user_data)
-{
-	ECalModelPrivate *priv;
-	ECalModel *model = (ECalModel *) user_data;
-	GList *l;
-	
-	priv = model->priv;
-
-	for (l = objects; l; l = l->next) {
-		ECalModelComponent *comp_data;
-
-		/* remove all recurrences and re-add them after generating them */
-		while ((comp_data = search_by_uid_and_client (priv, e_cal_view_get_client (query),
-							      icalcomponent_get_uid (l->data)))) {
-			int pos;
-
-			pos = get_position_in_array (priv->objects, comp_data);
-			e_table_model_row_deleted (E_TABLE_MODEL (model), pos);
-
-			g_ptr_array_remove (priv->objects, comp_data);
-			e_cal_model_free_component_data (comp_data);
-		}
-	}
-
-	/* now re-add all objects */
-	e_cal_view_objects_added_cb (query, objects, model);
-}
-
-static void
-e_cal_view_objects_removed_cb (ECalView *query, GList *uids, gpointer user_data)
-{
-	ECalModelPrivate *priv;
-	ECalModel *model = (ECalModel *) user_data;
-	GList *l;
-	
-	priv = model->priv;
-
-	for (l = uids; l; l = l->next) {
-		ECalModelComponent *comp_data;
-		int pos;
-
-		e_table_model_pre_change (E_TABLE_MODEL (model));
-		
-		/* make sure we remove all objects with this UID */
-		while ((comp_data = search_by_uid_and_client (priv, e_cal_view_get_client (query), l->data))) {
-			pos = get_position_in_array (priv->objects, comp_data);
-			e_table_model_row_deleted (E_TABLE_MODEL (model), pos);
-
-			g_ptr_array_remove (priv->objects, comp_data);
-			e_cal_model_free_component_data (comp_data);
-		}
-	}
-}
-
-static void
-e_cal_view_progress_cb (ECalView *query, const char *message, int percent, gpointer user_data)
-{
-	ECalModel *model = (ECalModel *) user_data;
-
-	g_return_if_fail (E_IS_CAL_MODEL (model));
-
-	/* FIXME Update status bar */
-}
-
-static void
-e_cal_view_done_cb (ECalView *query, ECalendarStatus status, gpointer user_data)
-{
- 	ECalModel *model = (ECalModel *) user_data;
-
-	g_return_if_fail (E_IS_CAL_MODEL (model));
-
-	/* FIXME Clear status bar */
-}
-
-static void
-update_e_cal_view_for_client (ECalModel *model, ECalModelClient *client_data)
-{
-	ECalModelPrivate *priv;
-
-	priv = model->priv;
-
-	/* Skip if this client has not finished loading yet */
-	if (e_cal_get_load_state (client_data->client) != E_CAL_LOAD_LOADED)
-		return;
-	
-	/* free the previous query, if any */
-	if (client_data->query) {
-		g_signal_handlers_disconnect_matched (client_data->query, G_SIGNAL_MATCH_DATA,
-						      0, 0, NULL, NULL, model);
-		g_object_unref (client_data->query);
-		client_data->query = NULL;
-	}
-
-	/* prepare the query */
-	g_assert (priv->full_sexp != NULL);
-
-	/* Don't create the new query if we won't use it */
-	if (!client_data->do_query)
-		return;
-	
-	if (!e_cal_get_query (client_data->client, priv->full_sexp, &client_data->query, NULL)) {
-		g_warning (G_STRLOC ": Unable to get query");
-
-		return;
-	}	
-
-	g_signal_connect (client_data->query, "objects_added", G_CALLBACK (e_cal_view_objects_added_cb), model);
-	g_signal_connect (client_data->query, "objects_modified", G_CALLBACK (e_cal_view_objects_modified_cb), model);
-	g_signal_connect (client_data->query, "objects_removed", G_CALLBACK (e_cal_view_objects_removed_cb), model);
-	g_signal_connect (client_data->query, "view_progress", G_CALLBACK (e_cal_view_progress_cb), model);
-	g_signal_connect (client_data->query, "view_done", G_CALLBACK (e_cal_view_done_cb), model);
-
-	e_cal_view_start (client_data->query);
-}
-
-static void
-backend_died_cb (ECal *client, gpointer user_data)
-{
-	ECalModel *model;
-
-	model = E_CAL_MODEL (user_data);
-
-	e_cal_model_remove_client (model, client);
-}
-
-static void
-cal_opened_cb (ECal *client, ECalendarStatus status, gpointer user_data)
-{
-	ECalModel *model = (ECalModel *) user_data;
-	ECalModelClient *client_data;
-
-	if (status != E_CALENDAR_STATUS_OK) {
-		e_cal_model_remove_client (model, client);
-
-		return;
-	}
-	
-	/* Stop listening for this calendar to be opened */
-	g_signal_handlers_disconnect_matched (client, G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, 0, 0, NULL, cal_opened_cb, model);
-
-	client_data = find_client_data (model, client);
-	g_assert (client_data);
-	
-	update_e_cal_view_for_client (model, client_data);
-}
-
-
-static ECalModelClient *
-add_new_client (ECalModel *model, ECal *client, gboolean do_query)
-{
-	ECalModelPrivate *priv;
-	ECalModelClient *client_data;
-	
-	priv = model->priv;
-
-	/* Look to see if we already have this client */
-	client_data = find_client_data (model, client);	
-	if (client_data) {
-		if (client_data->do_query)
-			return client_data;
-		else
-			client_data->do_query = do_query;
-		
-		goto load;
-	}
-	
-	client_data = g_new0 (ECalModelClient, 1);
-	client_data->client = g_object_ref (client);
-	client_data->query = NULL;
-	client_data->do_query = do_query;
-
-	priv->clients = g_list_append (priv->clients, client_data);
-
-	g_signal_connect (G_OBJECT (client_data->client), "backend_died",
-			  G_CALLBACK (backend_died_cb), model);
-
- load:
-	if (e_cal_get_load_state (client) == E_CAL_LOAD_LOADED) {
-		update_e_cal_view_for_client (model, client_data);
-	} else {
-		g_signal_connect (client, "cal_opened", G_CALLBACK (cal_opened_cb), model);
-		e_cal_open_async (client, TRUE);
-	}
-
-	return client_data;
-}
-
-/**
- * e_cal_model_add_client
- */
-void
-e_cal_model_add_client (ECalModel *model, ECal *client)
-{
-	ECalModelPrivate *priv;
-	ECalModelClient *client_data;
-	
-	g_return_if_fail (E_IS_CAL_MODEL (model));
-	g_return_if_fail (E_IS_CAL (client));
-
-	priv = model->priv;
-
-	client_data = add_new_client (model, client, TRUE);	
-}
-
-static void
-remove_client_objects (ECalModel *model, ECalModelClient *client_data)
-{
-	int i;
-	
-	/* remove all objects belonging to this client */
-	for (i = model->priv->objects->len; i > 0; i--) {
-		ECalModelComponent *comp_data = (ECalModelComponent *) g_ptr_array_index (model->priv->objects, i - 1);
-
-		g_assert (comp_data != NULL);
-
-		if (comp_data->client == client_data->client) {
-			e_table_model_pre_change (E_TABLE_MODEL (model));
-			e_table_model_row_deleted (E_TABLE_MODEL (model), i - 1);
-
-			g_ptr_array_remove (model->priv->objects, comp_data);
-			e_cal_model_free_component_data (comp_data);
-		}
-	}
-}
-
-static void
-remove_client (ECalModel *model, ECalModelClient *client_data)
-{
-	/* FIXME We might not want to disconnect the open signal for the default client */
-	g_signal_handlers_disconnect_matched (client_data->client, G_SIGNAL_MATCH_DATA, 0, 0, NULL, NULL, model);
-	if (client_data->query)
-		g_signal_handlers_disconnect_matched (client_data->query, G_SIGNAL_MATCH_DATA, 0, 0, NULL, NULL, model);
-
-	remove_client_objects (model, client_data);
-
-	/* If this is the default client and we were querying (so it
-	 * was also a source), keep it around but don't query it */
-	if (model->priv->default_client == client_data->client && client_data->do_query) {
-		client_data->do_query = FALSE;
-		
-		return;
-	}
-
-	/* Remove the client from the list */
-	model->priv->clients = g_list_remove (model->priv->clients, client_data);
-
-	/* free all remaining memory */
-	g_object_unref (client_data->client);
-	if (client_data->query)
-		g_object_unref (client_data->query);
-	g_free (client_data);
-}
-
-/**
- * e_cal_model_remove_client
- */
-void
-e_cal_model_remove_client (ECalModel *model, ECal *client)
-{
-	ECalModelPrivate *priv;
-	ECalModelClient *client_data;
-	
-	g_return_if_fail (E_IS_CAL_MODEL (model));
-	g_return_if_fail (E_IS_CAL (client));
-
-	priv = model->priv;
-
-	client_data = find_client_data (model, client);
-	if (client_data)
-		remove_client (model, client_data);
-}
-
-/**
- * e_cal_model_remove_all_clients
- */
-void
-e_cal_model_remove_all_clients (ECalModel *model)
-{
-	ECalModelPrivate *priv;
-
-	g_return_if_fail (E_IS_CAL_MODEL (model));
-
-	priv = model->priv;
-	while (priv->clients != NULL) {
-		ECalModelClient *client_data = (ECalModelClient *) priv->clients->data;
-		remove_client (model, client_data);
-	}
-}
-
-static void
-redo_queries (ECalModel *model)
-{
-	ECalModelPrivate *priv;
-	char *iso_start, *iso_end;
-	GList *l;
-	int len;
-	
-	priv = model->priv;
-
-	if (priv->full_sexp)
-		g_free (priv->full_sexp);
-
-	if (priv->start != -1 && priv->end != -1) {
-		iso_start = isodate_from_time_t (priv->start);
-		iso_end = isodate_from_time_t (priv->end);
-		
-		priv->full_sexp = g_strdup_printf ("(and (occur-in-time-range? (make-time \"%s\")"
-						   "                           (make-time \"%s\"))"
-						   "     %s)",
-						   iso_start, iso_end, 
-						   priv->search_sexp ? priv->search_sexp : "");
-	} else if (priv->search_sexp) {
-		priv->full_sexp = g_strdup (priv->search_sexp);
-	} else {
-		priv->full_sexp = g_strdup ("#f");
-	}	
-	
-	/* clean up the current contents */
-	e_table_model_pre_change (E_TABLE_MODEL (model));
-	len = priv->objects->len;
-	e_table_model_rows_deleted (E_TABLE_MODEL (model), 0, len);
-	clear_objects_array (priv);
-	
-	/* update the query for all clients */
-	for (l = priv->clients; l != NULL; l = l->next) {
-		ECalModelClient *client_data;
-		
-		client_data = (ECalModelClient *) l->data;
-		update_e_cal_view_for_client (model, client_data);
-	}
-}
-
-void
-e_cal_model_get_time_range (ECalModel *model, time_t *start, time_t *end)
-{
-	ECalModelPrivate *priv;
-	
-	g_return_if_fail (model != NULL);
-	g_return_if_fail (E_IS_CAL_MODEL (model));
-
-	priv = model->priv;
-	
-	if (start)
-		*start = priv->start;
-	
-	if (end)
-		*end = priv->end;
-}
-
-void
-e_cal_model_set_time_range (ECalModel *model, time_t start, time_t end)
-{
-	ECalModelPrivate *priv;
-	
-	g_return_if_fail (model != NULL);
-	g_return_if_fail (E_IS_CAL_MODEL (model));
-	g_return_if_fail (start >= 0 && end >= 0);
-	g_return_if_fail (start <= end);
-
-	priv = model->priv;
-
-	if (priv->start == start && priv->end == end)
-		return;
-	
-	priv->start = start;
-	priv->end = end;
-
-	g_signal_emit (G_OBJECT (model), signals[TIME_RANGE_CHANGED], 0, start, end);
-	redo_queries (model);
-}
-
-const char *
-e_cal_model_get_search_query (ECalModel *model)
-{
-	ECalModelPrivate *priv;
-	
-	g_return_val_if_fail (model != NULL, NULL);
-	g_return_val_if_fail (E_IS_CAL_MODEL (model), NULL);
-
-	priv = model->priv;
-	
-	return priv->search_sexp;
-}
-
-/**
- * e_cal_model_set_query
- */
-void
-e_cal_model_set_search_query (ECalModel *model, const char *sexp)
-{
-	ECalModelPrivate *priv;
-
-	g_return_if_fail (E_IS_CAL_MODEL (model));
-
-	priv = model->priv;
-
-	if (!strcmp (sexp ? sexp : "", priv->search_sexp ? priv->search_sexp : ""))
-		return;
-
-	if (priv->search_sexp)
-		g_free (priv->search_sexp);
-
-	priv->search_sexp = g_strdup (sexp);
-
-	redo_queries (model);
-}
-
-/**
- * e_cal_model_create_component_with_defaults
- */
-icalcomponent *
-e_cal_model_create_component_with_defaults (ECalModel *model)
-{
-	ECalModelPrivate *priv;
-	ECalComponent *comp;
-	icalcomponent *icalcomp;
-	ECal *client;
-
-	g_return_val_if_fail (E_IS_CAL_MODEL (model), NULL);
-
-	priv = model->priv;
-
-	g_return_val_if_fail (priv->clients != NULL, NULL);
-
-	client = e_cal_model_get_default_client (model);
-	if (!client)
-		return icalcomponent_new (priv->kind);
-
-	switch (priv->kind) {
-	case ICAL_VEVENT_COMPONENT :
-		comp = cal_comp_event_new_with_defaults (client);
-		break;
-	case ICAL_VTODO_COMPONENT :
-		comp = cal_comp_task_new_with_defaults (client);
-		break;
-	default:
-		return NULL;
-	}
-
-	if (!comp)
-		return icalcomponent_new (priv->kind);
-
-	icalcomp = icalcomponent_new_clone (e_cal_component_get_icalcomponent (comp));
-	g_object_unref (comp);
-
-	/* make sure the component has an UID */
-	if (!icalcomponent_get_uid (icalcomp)) {
-		char *uid;
-
-		uid = e_cal_component_gen_uid ();
-		icalcomponent_set_uid (icalcomp, uid);
-
-		g_free (uid);
-	}
-
-	return icalcomp;
-}
-
-/**
- * e_cal_model_get_color_for_component
- */
-const gchar *
-e_cal_model_get_color_for_component (ECalModel *model, ECalModelComponent *comp_data)
-{
-	ECalModelClass *model_class;
-	const gchar *color = NULL;
-
-	g_return_val_if_fail (E_IS_CAL_MODEL (model), NULL);
-	g_return_val_if_fail (comp_data != NULL, NULL);
-
-	model_class = (ECalModelClass *) G_OBJECT_GET_CLASS (model);
-	if (model_class->get_color_for_component != NULL)
-		color = model_class->get_color_for_component (model, comp_data);
-
-	if (!color)
-		color = ecm_get_color_for_component (model, comp_data);
-
-	return color;
-}
-
-/**
- * e_cal_model_get_rgb_color_for_component
- */
-gboolean
-e_cal_model_get_rgb_color_for_component (ECalModel *model, ECalModelComponent *comp_data, double *red, double *green, double *blue)
-{
-	GdkColor gdk_color;
-	const gchar *color;
-
-	color = e_cal_model_get_color_for_component (model, comp_data);
-	if (color && gdk_color_parse (color, &gdk_color)) {
-
-		if (red)
-			*red = ((double) gdk_color.red)/0xffff;
-		if (green)
-			*green = ((double) gdk_color.green)/0xffff;
-		if (blue)
-			*blue = ((double) gdk_color.blue)/0xffff;
-
-		return TRUE;
-	}
-
-	return FALSE;
-}
-
-/**
- * e_cal_model_get_component_at
- */
-ECalModelComponent *
-e_cal_model_get_component_at (ECalModel *model, gint row)
-{
-	ECalModelPrivate *priv;
-
-	g_return_val_if_fail (E_IS_CAL_MODEL (model), NULL);
-
-	priv = model->priv;
-
-	g_return_val_if_fail (row >= 0 && row < priv->objects->len, NULL);
-
-	return g_ptr_array_index (priv->objects, row);
-}
-
-ECalModelComponent *
-e_cal_model_get_component_for_uid  (ECalModel *model, const char *uid)
-{
-	ECalModelPrivate *priv;
-
-	g_return_val_if_fail (E_IS_CAL_MODEL (model), NULL);
-
-	priv = model->priv;
-
-	return search_by_uid_and_client (priv, NULL, uid);
-}
-
-/**
- * e_cal_model_date_value_to_string
- */
-gchar*
-e_cal_model_date_value_to_string (ECalModel *model, const void *value)
-{
-	ECalModelPrivate *priv;
-	ECellDateEditValue *dv = (ECellDateEditValue *) value;
-	struct icaltimetype tt;
-	struct tm tmp_tm;
-	char buffer[64];
-
-	g_return_val_if_fail (E_IS_CAL_MODEL (model), g_strdup (""));
-
-	priv = model->priv;
-
-	if (!dv)
-		return g_strdup ("");
-
-	/* We currently convert all the dates to the current timezone. */
-	tt = dv->tt;
-	icaltimezone_convert_time (&tt, dv->zone, priv->zone);
-
-	tmp_tm.tm_year = tt.year - 1900;
-	tmp_tm.tm_mon = tt.month - 1;
-	tmp_tm.tm_mday = tt.day;
-	tmp_tm.tm_hour = tt.hour;
-	tmp_tm.tm_min = tt.minute;
-	tmp_tm.tm_sec = tt.second;
-	tmp_tm.tm_isdst = -1;
-
-	tmp_tm.tm_wday = time_day_of_week (tt.day, tt.month - 1, tt.year);
-
-	memset (buffer, 0, sizeof (buffer));
-	e_time_format_date_and_time (&tmp_tm, priv->use_24_hour_format,
-				     TRUE, FALSE,
-				     buffer, sizeof (buffer));
-	return g_strdup (buffer);
-}
-
-static ECellDateEditValue *
-copy_ecdv (ECellDateEditValue *ecdv)
-{
-	ECellDateEditValue *new_ecdv;
-	
-	new_ecdv = g_new0 (ECellDateEditValue, 1);
-	new_ecdv->tt = ecdv ? ecdv->tt : icaltime_null_time ();
-	new_ecdv->zone = ecdv ? ecdv->zone : NULL;
-
-	return new_ecdv;
-}
-
-/**
- * e_cal_model_copy_component_data
- */
-ECalModelComponent *
-e_cal_model_copy_component_data (ECalModelComponent *comp_data)
-{
-	ECalModelComponent *new_data;
-
-	g_return_val_if_fail (comp_data != NULL, NULL);
-
-	new_data = g_new0 (ECalModelComponent, 1);
-
-	new_data->instance_start = comp_data->instance_start;
-	new_data->instance_end = comp_data->instance_end;
-	if (comp_data->icalcomp)
-		new_data->icalcomp = icalcomponent_new_clone (comp_data->icalcomp);
-	if (comp_data->client)
-		new_data->client = g_object_ref (comp_data->client);
-	if (comp_data->dtstart)
-		new_data->dtstart = copy_ecdv (comp_data->dtstart);
-	if (comp_data->dtend)
-		new_data->dtend = copy_ecdv (comp_data->dtend);
-	if (comp_data->due)
-		new_data->due = copy_ecdv (comp_data->due);
-	if (comp_data->completed)
-		new_data->completed = copy_ecdv (comp_data->completed);
-	if (comp_data->color)
-		new_data->color = g_strdup (comp_data->color);
-
-	return new_data;
-}
-
-/**
- * e_cal_model_free_component_data
- */
-void
-e_cal_model_free_component_data (ECalModelComponent *comp_data)
-{
-	g_return_if_fail (comp_data != NULL);
-
-	if (comp_data->client) {
-		g_object_unref (comp_data->client);
-		comp_data->client = NULL;
-	}
-	if (comp_data->icalcomp) {
-		icalcomponent_free (comp_data->icalcomp);
-		comp_data->icalcomp = NULL;
-	}
-	if (comp_data->dtstart) {
-		g_free (comp_data->dtstart);
-		comp_data->dtstart = NULL;
-	}
-	if (comp_data->dtend) {
-		g_free (comp_data->dtend);
-		comp_data->dtend = NULL;
-	}
-	if (comp_data->due) {
-		g_free (comp_data->due);
-		comp_data->due = NULL;
-	}
-	if (comp_data->completed) {
-		g_free (comp_data->completed);
-		comp_data->completed = NULL;
-	}
-	if (comp_data->color) {
-		g_free (comp_data->color);
-		comp_data->color = NULL;
-	}
-
-	g_free (comp_data);
-}
-
-/**
- * e_cal_model_generate_instances
- *
- * cb function is not called with cb_data, but with ECalModelGenerateInstancesData which contains cb_data
- */
-void
-e_cal_model_generate_instances (ECalModel *model, time_t start, time_t end,
-				ECalRecurInstanceFn cb, gpointer cb_data)
-{
-	ECalModelGenerateInstancesData mdata;
-	gint i, n;
-
-	n = e_table_model_row_count (E_TABLE_MODEL (model));
-	for (i = 0; i < n; i ++) {
-		ECalModelComponent *comp_data = e_cal_model_get_component_at (model, i);
-
-		mdata.comp_data = comp_data;
-		mdata.cb_data = cb_data;
-		e_cal_generate_instances_for_object (comp_data->client, comp_data->icalcomp, start, end, cb, &mdata);
-	}
-}
diff --git a/calendar/gui/e-cal-model.h b/calendar/gui/e-cal-model.h
deleted file mode 100644
index d5e2fc4960..0000000000
--- a/calendar/gui/e-cal-model.h
+++ /dev/null
@@ -1,158 +0,0 @@
-/* Evolution calendar - Data model for ETable
- *
- * Copyright (C) 2000 Ximian, Inc.
- * Copyright (C) 2000 Ximian, Inc.
- *
- * Authors: Rodrigo Moya <rodrigo@ximian.com>
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of version 2 of the GNU General Public
- * License as published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307, USA.
- */
-
-#ifndef E_CAL_MODEL_H
-#define E_CAL_MODEL_H
-
-#include <gal/e-table/e-table-model.h>
-#include <libecal/e-cal.h>
-#include "e-cell-date-edit-text.h"
-
-G_BEGIN_DECLS
-
-#define E_TYPE_CAL_MODEL            (e_cal_model_get_type ())
-#define E_CAL_MODEL(obj)            (G_TYPE_CHECK_INSTANCE_CAST ((obj), E_TYPE_CAL_MODEL, ECalModel))
-#define E_CAL_MODEL_CLASS(klass)    (G_TYPE_CHECK_CLASS_CAST ((klass), E_TYPE_CAL_MODEL, ECalModelClass))
-#define E_IS_CAL_MODEL(obj)         (G_TYPE_CHECK_INSTANCE_TYPE ((obj), E_TYPE_CAL_MODEL))
-#define E_IS_CAL_MODEL_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), E_TYPE_CAL_MODEL))
-
-typedef struct _ECalModelPrivate ECalModelPrivate;
-
-typedef enum {
-	/* If you add new items here or reorder them, you have to update the
-	   .etspec files for the tables using this model */
-	E_CAL_MODEL_FIELD_CATEGORIES,
-	E_CAL_MODEL_FIELD_CLASSIFICATION,
-	E_CAL_MODEL_FIELD_COLOR,            /* not a real field */
-	E_CAL_MODEL_FIELD_COMPONENT,        /* not a real field */
-	E_CAL_MODEL_FIELD_DESCRIPTION,
-	E_CAL_MODEL_FIELD_DTSTART,
-	E_CAL_MODEL_FIELD_HAS_ALARMS,       /* not a real field */
-	E_CAL_MODEL_FIELD_ICON,             /* not a real field */
-	E_CAL_MODEL_FIELD_SUMMARY,
-	E_CAL_MODEL_FIELD_UID,
-	E_CAL_MODEL_FIELD_LAST
-} ECalModelField;
-
-typedef enum {
-	E_CAL_MODEL_FLAGS_INVALID            = -1,
-	E_CAL_MODEL_FLAGS_EXPAND_RECURRENCES = 0x01
-} ECalModelFlags;
-
-typedef struct {
-	ECal *client;
-	icalcomponent *icalcomp;
-	time_t instance_start;
-	time_t instance_end;
-
-	/* private data */
-	ECellDateEditValue *dtstart;
-	ECellDateEditValue *dtend;
-	ECellDateEditValue *due;
-	ECellDateEditValue *completed;
-	gchar *color;
-} ECalModelComponent;
-
-typedef struct {
-	ECalModelComponent *comp_data;
-	gpointer cb_data;
-} ECalModelGenerateInstancesData;
-
-typedef struct _ECalModel {
-	ETableModel model;
-	ECalModelPrivate *priv;
-} ECalModel;
-
-typedef struct {
-	ETableModelClass parent_class;
-
-	/* virtual methods */
-	const gchar * (* get_color_for_component) (ECalModel *model, ECalModelComponent *comp_data);
-	void          (* fill_component_from_model) (ECalModel *model, ECalModelComponent *comp_data,
-						     ETableModel *source_model, gint row);
-
-	/* Signals */
-	void (* time_range_changed) (ECalModel *model, time_t start, time_t end);
-	void (* row_appended) (ECalModel *model);
-} ECalModelClass;
-
-GType               e_cal_model_get_type                       (void);
-icalcomponent_kind  e_cal_model_get_component_kind             (ECalModel           *model);
-void                e_cal_model_set_component_kind             (ECalModel           *model,
-								icalcomponent_kind   kind);
-ECalModelFlags      e_cal_model_get_flags                      (ECalModel           *model);
-void                e_cal_model_set_flags                      (ECalModel           *model,
-								ECalModelFlags       flags);
-icaltimezone       *e_cal_model_get_timezone                   (ECalModel           *model);
-void                e_cal_model_set_timezone                   (ECalModel           *model,
-								icaltimezone        *zone);
-void                e_cal_model_set_default_category           (ECalModel           *model,
-								const gchar         *default_cat);
-gboolean            e_cal_model_get_use_24_hour_format         (ECalModel           *model);
-void                e_cal_model_set_use_24_hour_format         (ECalModel           *model,
-								gboolean             use24);
-ECal               *e_cal_model_get_default_client             (ECalModel           *model);
-void                e_cal_model_set_default_client             (ECalModel           *model,
-								ECal                *client);
-GList              *e_cal_model_get_client_list                (ECalModel           *model);
-ECal               *e_cal_model_get_client_for_uri             (ECalModel           *model,
-								const char          *uri);
-void                e_cal_model_add_client                     (ECalModel           *model,
-								ECal                *client);
-void                e_cal_model_remove_client                  (ECalModel           *model,
-								ECal                *client);
-void                e_cal_model_remove_all_clients             (ECalModel           *model);
-void                e_cal_model_get_time_range                 (ECalModel           *model,
-								time_t              *start,
-								time_t              *end);
-void                e_cal_model_set_time_range                 (ECalModel           *model,
-								time_t               start,
-								time_t               end);
-const char         *e_cal_model_get_search_query               (ECalModel           *model);
-void                e_cal_model_set_search_query               (ECalModel           *model,
-								const gchar         *sexp);
-icalcomponent      *e_cal_model_create_component_with_defaults (ECalModel           *model);
-const gchar        *e_cal_model_get_color_for_component        (ECalModel           *model,
-								ECalModelComponent  *comp_data);
-gboolean            e_cal_model_get_rgb_color_for_component    (ECalModel           *model,
-								ECalModelComponent  *comp_data,
-								double              *red,
-								double              *green,
-								double              *blue);
-ECalModelComponent *e_cal_model_get_component_at               (ECalModel           *model,
-								gint                 row);
-ECalModelComponent *e_cal_model_get_component_for_uid          (ECalModel           *model,
-								const char          *uid);
-gchar              *e_cal_model_date_value_to_string           (ECalModel           *model,
-								const void          *value);
-ECalModelComponent *e_cal_model_copy_component_data            (ECalModelComponent  *comp_data);
-void                e_cal_model_free_component_data            (ECalModelComponent  *comp_data);
-void                e_cal_model_generate_instances             (ECalModel           *model,
-								time_t               start,
-								time_t               end,
-								ECalRecurInstanceFn  cb,
-								gpointer             cb_data);
-
-
-
-G_END_DECLS
-
-#endif
diff --git a/calendar/gui/e-cal-popup.c b/calendar/gui/e-cal-popup.c
deleted file mode 100644
index 00dd097b17..0000000000
--- a/calendar/gui/e-cal-popup.c
+++ /dev/null
@@ -1,337 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-/*
- *  Authors: Michael Zucchi <notzed@ximian.com>
- *
- *  Copyright 2004 Novell, Inc. (www.novell.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; version 2 of the License.
- *
- *  This program is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *
- *  You should have 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.
- *
- */
-
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
-
-#include <string.h>
-#include <stdlib.h>
-
-#include <glib.h>
-
-#include "e-cal-popup.h"
-#include <libedataserverui/e-source-selector.h>
-
-#include "gui/e-calendar-view.h"
-#include "gui/e-cal-model.h"
-#include "itip-utils.h"
-
-static GObjectClass *ecalp_parent;
-
-static void
-ecalp_init(GObject *o)
-{
-	/*ECalPopup *eabp = (ECalPopup *)o; */
-}
-
-static void
-ecalp_finalise(GObject *o)
-{
-	((GObjectClass *)ecalp_parent)->finalize(o);
-}
-
-static void
-ecalp_target_free(EPopup *ep, EPopupTarget *t)
-{
-	switch (t->type) {
-	case E_CAL_POPUP_TARGET_SELECT: {
-		ECalPopupTargetSelect *s = (ECalPopupTargetSelect *)t;
-		int i;
-
-		for (i=0;i<s->events->len;i++)
-			e_cal_model_free_component_data(s->events->pdata[i]);
-		g_ptr_array_free(s->events, TRUE);
-		g_object_unref(s->model);
-		break; }
-	case E_CAL_POPUP_TARGET_SOURCE: {
-		ECalPopupTargetSource *s = (ECalPopupTargetSource *)t;
-
-		g_object_unref(s->selector);
-		break; }
-	}
-
-	((EPopupClass *)ecalp_parent)->target_free(ep, t);
-}
-
-static void
-ecalp_class_init(GObjectClass *klass)
-{
-	klass->finalize = ecalp_finalise;
-	((EPopupClass *)klass)->target_free = ecalp_target_free;
-}
-
-GType
-e_cal_popup_get_type(void)
-{
-	static GType type = 0;
-
-	if (type == 0) {
-		static const GTypeInfo info = {
-			sizeof(ECalPopupClass),
-			NULL, NULL,
-			(GClassInitFunc)ecalp_class_init,
-			NULL, NULL,
-			sizeof(ECalPopup), 0,
-			(GInstanceInitFunc)ecalp_init
-		};
-		ecalp_parent = g_type_class_ref(e_popup_get_type());
-		type = g_type_register_static(e_popup_get_type(), "ECalPopup", &info, 0);
-	}
-
-	return type;
-}
-
-ECalPopup *e_cal_popup_new(const char *menuid)
-{
-	ECalPopup *eabp = g_object_new(e_cal_popup_get_type(), 0);
-
-	e_popup_construct(&eabp->popup, menuid);
-
-	return eabp;
-}
-
-/**
- * e_cal_popup_target_new_select:
- * @eabp:
- * @model: The calendar model.
- * @events: An array of pointers to ECalModelComponent items.  These
- * items must be copied.  They, and the @events array will be freed by
- * the popup menu automatically.
- * 
- * Create a new selection popup target.
- * 
- * Return value: 
- **/
-ECalPopupTargetSelect *
-e_cal_popup_target_new_select(ECalPopup *eabp, struct _ECalModel *model, GPtrArray *events)
-{
-	ECalPopupTargetSelect *t = e_popup_target_new(&eabp->popup, E_CAL_POPUP_TARGET_SELECT, sizeof(*t));
-	guint32 mask = ~0;
-	ECal *client;
-	gboolean read_only;
-
-	/* FIXME: This is duplicated in e-cal-menu */
-
-	t->model = model;
-	g_object_ref(t->model);
-	t->events = events;
-
-	if (t->events->len == 0) {
-		client = e_cal_model_get_default_client(t->model);
-	} else {
-		ECalModelComponent *comp_data = (ECalModelComponent *)t->events->pdata[0];
-
-		mask &= ~E_CAL_POPUP_SELECT_ANY;
-		if (t->events->len == 1)
-			mask &= ~E_CAL_POPUP_SELECT_ONE;
-		else
-			mask &= ~E_CAL_POPUP_SELECT_MANY;
-
-		if (icalcomponent_get_first_property (comp_data->icalcomp, ICAL_URL_PROPERTY))
-			mask &= ~E_CAL_POPUP_SELECT_HASURL;
-
-		if (e_cal_util_component_has_recurrences (comp_data->icalcomp))
-			mask &= ~E_CAL_POPUP_SELECT_RECURRING;
-		else if (e_cal_util_component_is_instance (comp_data->icalcomp))
-			mask &= ~E_CAL_POPUP_SELECT_RECURRING;
-		else
-			mask &= ~E_CAL_POPUP_SELECT_NONRECURRING;
-
-		if (e_cal_util_component_is_instance (comp_data->icalcomp))
-			mask &= ~E_CAL_POPUP_SELECT_INSTANCE;
-
-		if (e_cal_util_component_has_organizer (comp_data->icalcomp)) {
-			ECalComponent *comp;
-
-			comp = e_cal_component_new ();
-			e_cal_component_set_icalcomponent (comp, icalcomponent_new_clone (comp_data->icalcomp));
-			if (!itip_organizer_is_user (comp, comp_data->client))
-				mask &= ~E_CAL_POPUP_SELECT_ORGANIZER;
-
-			g_object_unref (comp);
-		} else {
-			/* organiser is synonym for owner in this case */
-			mask &= ~(E_CAL_POPUP_SELECT_ORGANIZER|E_CAL_POPUP_SELECT_NOTMEETING);
-		}
-
-		client = comp_data->client;
-	}
-
-	e_cal_is_read_only(client, &read_only, NULL);
-	if (!read_only)
-		mask &= ~E_CAL_POPUP_SELECT_EDITABLE;
-
-	if (!e_cal_get_static_capability (client, CAL_STATIC_CAPABILITY_NO_TASK_ASSIGNMENT)
-	    && !e_cal_get_static_capability (client, CAL_STATIC_CAPABILITY_NO_CONV_TO_ASSIGN_TASK))
-		mask &= ~E_CAL_POPUP_SELECT_ASSIGNABLE;
-
-	/* This bit isn't implemented ... */
-	mask &= ~E_CAL_POPUP_SELECT_NOTEDITING;
-
-	t->target.mask = mask;
-
-	return t;
-}
-
-ECalPopupTargetSource *
-e_cal_popup_target_new_source(ECalPopup *eabp, ESourceSelector *selector)
-{
-	ECalPopupTargetSource *t = e_popup_target_new(&eabp->popup, E_CAL_POPUP_TARGET_SOURCE, sizeof(*t));
-	guint32 mask = ~0;
-	const char *source_uri;
-	ESource *source;
-	const char *offline = NULL;
-
-	/* TODO: this is duplicated for addressbook too */
-
-	t->selector = selector;
-	g_object_ref(selector);
-
-	/* TODO: perhaps we need to copy this so it doesn't change during the lifecycle */
-	source = e_source_selector_peek_primary_selection(selector);
-	if (source)
-		mask &= ~E_CAL_POPUP_SOURCE_PRIMARY;
-
-	/* FIXME Gross hack, should have a property or something */
-	source_uri = e_source_peek_relative_uri(source);
-	if (source_uri && !strcmp("system", source_uri))
-		mask &= ~E_CAL_POPUP_SOURCE_SYSTEM;
-	else
-		mask &= ~E_CAL_POPUP_SOURCE_USER;
-
-
-	source = e_source_selector_peek_primary_selection (selector);
-	/* check for e_target_selector's offline_status property here */
-	offline = e_source_get_property (source, "offline");
-
-	if (offline  && strcmp (offline,"1") == 0) { 
-		/* set the menu item to Mark Offline - */
-		mask &= ~E_CAL_POPUP_SOURCE_NO_OFFLINE;
-	}
-	else {
-		mask &= ~E_CAL_POPUP_SOURCE_OFFLINE;
-	}
-
-	t->target.mask = mask;
-
-	return t;
-}
-
-/* ********************************************************************** */
-/* Popup menu plugin handler */
-
-/*
-<e-plugin
-  class="org.gnome.mail.plugin.popup:1.0"
-  id="org.gnome.mail.plugin.popup.iteab:1.0"
-  type="shlib"
-  location="/opt/gnome2/lib/camel/1.0/libcamelimap.so"
-  name="imap"
-  description="IMAP4 and IMAP4v1 mail store">
-  <hook class="org.gnome.mail.popupMenu:1.0"
-        handler="HandlePopup">
-  <menu id="any" target="select">
-   <iteab
-    type="iteab|toggle|radio|image|submenu|bar"
-    active
-    path="foo/bar"
-    label="label"
-    icon="foo"
-    mask="select_one"
-    activate="ecalp_view_eabacs"/>
-  </menu>
-  </extension>
-
-*/
-
-static void *ecalph_parent_class;
-#define ecalph ((ECalPopupHook *)eph)
-
-static const EPopupHookTargetMask ecalph_select_masks[] = {
-	{ "one", E_CAL_POPUP_SELECT_ONE },
-	{ "many", E_CAL_POPUP_SELECT_MANY },
-	{ "editable", E_CAL_POPUP_SELECT_EDITABLE },
-	{ "recurring", E_CAL_POPUP_SELECT_RECURRING },
-	{ "non-recurring", E_CAL_POPUP_SELECT_NONRECURRING },
-	{ "instance", E_CAL_POPUP_SELECT_INSTANCE },
-	{ "organizer", E_CAL_POPUP_SELECT_ORGANIZER },
-	{ "not-editing", E_CAL_POPUP_SELECT_NOTEDITING },
-	{ "not-meeting", E_CAL_POPUP_SELECT_NOTMEETING },
-	{ "assignable", E_CAL_POPUP_SELECT_ASSIGNABLE },
-	{ "hasurl", E_CAL_POPUP_SELECT_HASURL },
-	{ 0 }
-};
-
-static const EPopupHookTargetMask ecalph_source_masks[] = {
-	{ "primary", E_CAL_POPUP_SOURCE_PRIMARY },
-	{ "system", E_CAL_POPUP_SOURCE_SYSTEM },
-	{ "user", E_CAL_POPUP_SOURCE_USER },
-	{ "offline", E_CAL_POPUP_SOURCE_OFFLINE},
-	{ "no-offline", E_CAL_POPUP_SOURCE_NO_OFFLINE},	
-	{ 0 }
-};
-
-static const EPopupHookTargetMap ecalph_targets[] = {
-	{ "select", E_CAL_POPUP_TARGET_SELECT, ecalph_select_masks },
-	{ "source", E_CAL_POPUP_TARGET_SOURCE, ecalph_source_masks },
-	{ 0 }
-};
-
-static void
-ecalph_finalise(GObject *o)
-{
-	/*EPluginHook *eph = (EPluginHook *)o;*/
-
-	((GObjectClass *)ecalph_parent_class)->finalize(o);
-}
-
-static void
-ecalph_class_init(EPluginHookClass *klass)
-{
-	int i;
-
-	((GObjectClass *)klass)->finalize = ecalph_finalise;
-	((EPluginHookClass *)klass)->id = "org.gnome.evolution.calendar.popup:1.0";
-
-	for (i=0;ecalph_targets[i].type;i++)
-		e_popup_hook_class_add_target_map((EPopupHookClass *)klass, &ecalph_targets[i]);
-
-	((EPopupHookClass *)klass)->popup_class = g_type_class_ref(e_cal_popup_get_type());
-}
-
-GType
-e_cal_popup_hook_get_type(void)
-{
-	static GType type = 0;
-	
-	if (!type) {
-		static const GTypeInfo info = {
-			sizeof(ECalPopupHookClass), NULL, NULL, (GClassInitFunc) ecalph_class_init, NULL, NULL,
-			sizeof(ECalPopupHook), 0, (GInstanceInitFunc) NULL,
-		};
-
-		ecalph_parent_class = g_type_class_ref(e_popup_hook_get_type());
-		type = g_type_register_static(e_popup_hook_get_type(), "ECalPopupHook", &info, 0);
-	}
-	
-	return type;
-}
diff --git a/calendar/gui/e-cal-popup.h b/calendar/gui/e-cal-popup.h
deleted file mode 100644
index a5043b1726..0000000000
--- a/calendar/gui/e-cal-popup.h
+++ /dev/null
@@ -1,176 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-/*
- *  Authors: Michael Zucchi <notzed@ximian.com>
- *
- *  Copyright 2004 Novell, Inc. (www.novell.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; version 2 of the License.
- *
- *  This program is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with this program; if not, write to the Free Software
- *  Foundation, Inc., 59 Temple Street #330, Boston, MA 02111-1307, USA.
- *
- */
-
-#ifndef __E_CAL_POPUP_H__
-#define __E_CAL_POPUP_H__
-
-#include <glib-object.h>
-
-#include "e-util/e-popup.h"
-
-#ifdef __cplusplus
-extern "C" {
-#pragma }
-#endif /* __cplusplus */
-
-typedef struct _ECalPopup ECalPopup;
-typedef struct _ECalPopupClass ECalPopupClass;
-
-struct _ECalendarView;
-
-/**
- * enum _e_cal_popup_target_t - A list of mail popup target types.
- * 
- * @E_CAL_POPUP_TARGET_SELECT: A selection of cards
- * @E_CAL_POPUP_TARGET_SOURCE: A source selection.
- *
- * Defines the value of the targetid for all ECalPopup target types.
- **/
-enum _e_cal_popup_target_t {
-	E_CAL_POPUP_TARGET_SELECT,
-	E_CAL_POPUP_TARGET_SOURCE,
-};
-
-/**
- * enum _e_cal_popup_target_select_t - ECalPopupTargetSelect qualifiers.
- * 
- * @E_CAL_POPUP_SELECT_ONE: Only one item is selected.
- * @E_CAL_POPUP_SELECT_MANY: More than one item selected.
- * @E_CAL_POPUP_SELECT_ANY: One ore more items are selected.
- * @E_CAL_POPUP_SELECT_EDITABLE: The selection is editable.
- * @E_CAL_POPUP_SELECT_RECURRING: Is a recurring event.
- * @E_CAL_POPUP_SELECT_NONRECURRING: Is not a recurring event.
- * @E_CAL_POPUP_SELECT_INSTANCE: This is an instance event.
- * @E_CAL_POPUP_SELECT_ORGANIZER: The user is the organiser of the event.
- * @E_CAL_POPUP_SELECT_NOTEDITING: The event is not being edited already.  Not implemented.
- * @E_CAL_POPUP_SELECT_NOTMEETING: The event is not a meeting.
- * @E_CAL_POPUP_SELECT_ASSIGNABLE: An assignable task.
- * @E_CAL_POPUP_SELECT_HASURL: A task that contains a URL.
- **/
-enum _e_cal_popup_target_select_t {
-	E_CAL_POPUP_SELECT_ONE = 1<<0,
-	E_CAL_POPUP_SELECT_MANY = 1<<1,
-	E_CAL_POPUP_SELECT_ANY = 1<<2,
-	E_CAL_POPUP_SELECT_EDITABLE = 1<<3,
-	E_CAL_POPUP_SELECT_RECURRING = 1<<4,
-	E_CAL_POPUP_SELECT_NONRECURRING = 1<<5,
-	E_CAL_POPUP_SELECT_INSTANCE = 1<<6,
-
-	E_CAL_POPUP_SELECT_ORGANIZER = 1<<7,
-	E_CAL_POPUP_SELECT_NOTEDITING = 1<<8,
-	E_CAL_POPUP_SELECT_NOTMEETING = 1<<9,
-
-	E_CAL_POPUP_SELECT_ASSIGNABLE = 1<<10,
-	E_CAL_POPUP_SELECT_HASURL = 1<<11,
-};
-
-/**
- * enum _e_cal_popup_target_source_t - ECalPopupTargetSource qualifiers.
- * 
- * @E_CAL_POPUP_SOURCE_PRIMARY: Has a primary selection.
- * @E_CAL_POPUP_SOURCE_SYSTEM: Is a 'system' folder.
- * 
- **/
-enum _e_cal_popup_target_source_t {
-	E_CAL_POPUP_SOURCE_PRIMARY = 1<<0,
-	E_CAL_POPUP_SOURCE_SYSTEM = 1<<1,	/* system folder */
-	E_CAL_POPUP_SOURCE_USER = 1<<2, /* user folder (!system) */
-	E_CAL_POPUP_SOURCE_OFFLINE = 1 <<3,
-	E_CAL_POPUP_SOURCE_NO_OFFLINE = 1 <<4
-};
-
-typedef struct _ECalPopupTargetSelect ECalPopupTargetSelect;
-typedef struct _ECalPopupTargetSource ECalPopupTargetSource;
-
-/**
- * struct _ECalPopupTargetSelect - A list of address cards.
- * 
- * @target: Superclass.  target.widget is an ECalendarView.
- * @model: The ECalModel.
- * @events: The selected events.  These are ECalModelComponent's.
- *
- * Used to represent a selection of appointments as context for a popup
- * menu.
- *
- * TODO: For maximum re-usability references to the view could be removed
- * from this structure.
- **/
-struct _ECalPopupTargetSelect {
-	EPopupTarget target;
-
-	struct _ECalModel *model;
-	GPtrArray *events;
-};
-
-/**
- * struct _ECalPopupTargetSource - A source target.
- * 
- * @target: Superclass.
- * @selector: Selector holding the source selection.
- *
- * This target is used to represent a source selection.
- **/
-struct _ECalPopupTargetSource {
-	EPopupTarget target;
-
-	struct _ESourceSelector *selector;
-};
-
-typedef struct _EPopupItem ECalPopupItem;
-
-/* The object */
-struct _ECalPopup {
-	EPopup popup;
-
-	struct _ECalPopupPrivate *priv;
-};
-
-struct _ECalPopupClass {
-	EPopupClass popup_class;
-};
-
-GType e_cal_popup_get_type(void);
-
-ECalPopup *e_cal_popup_new(const char *menuid);
-
-ECalPopupTargetSelect *e_cal_popup_target_new_select(ECalPopup *eabp, struct _ECalModel *model, GPtrArray *events);
-ECalPopupTargetSource *e_cal_popup_target_new_source(ECalPopup *eabp, struct _ESourceSelector *selector);
-
-/* ********************************************************************** */
-
-typedef struct _ECalPopupHook ECalPopupHook;
-typedef struct _ECalPopupHookClass ECalPopupHookClass;
-
-struct _ECalPopupHook {
-	EPopupHook hook;
-};
-
-struct _ECalPopupHookClass {
-	EPopupHookClass hook_class;
-};
-
-GType e_cal_popup_hook_get_type(void);
-
-#ifdef __cplusplus
-}
-#endif /* __cplusplus */
-
-#endif /* __E_CAL_POPUP_H__ */
diff --git a/calendar/gui/e-calendar-marshal.list b/calendar/gui/e-calendar-marshal.list
deleted file mode 100644
index 942e8d03e7..0000000000
--- a/calendar/gui/e-calendar-marshal.list
+++ /dev/null
@@ -1,19 +0,0 @@
-NONE:INT
-NONE:POINTER
-NONE:OBJECT
-NONE:INT,STRING
-NONE:INT,BOOL
-NONE:INT,POINTER
-NONE:INT,OBJECT
-NONE:STRING,INT
-NONE:INT,INT
-NONE:ENUM,ENUM
-NONE:ENUM,STRING
-NONE:STRING,BOOL,INT,INT
-NONE:STRING,STRING
-NONE:STRING,STRING,STRING
-NONE:STRING,POINTER,POINTER
-NONE:POINTER,ENUM
-NONE:POINTER,STRING
-NONE:POINTER,POINTER
-NONE:LONG,LONG
diff --git a/calendar/gui/e-calendar-table-config.c b/calendar/gui/e-calendar-table-config.c
deleted file mode 100644
index ebe148b4fd..0000000000
--- a/calendar/gui/e-calendar-table-config.c
+++ /dev/null
@@ -1,251 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-/* 
- * Author : 
- *  JP Rosevear <jpr@ximian.com>
- *
- * Copyright 2003, Ximian, Inc.
- *
- * This program is free software; you can redistribute it and/or 
- * modify it under the terms of version 2 of the GNU General Public 
- * License as published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
- * USA
- */
-
-#include "calendar-config.h"
-#include "e-cell-date-edit-config.h"
-#include "e-calendar-table-config.h"
-
-struct _ECalendarTableConfigPrivate {
-	ECalendarTable *table;
-
-	ECellDateEditConfig *cell_config;
-	
-	GList *notifications;
-};
-
-/* Property IDs */
-enum props {
-	PROP_0,
-	PROP_TABLE
-};
-
-G_DEFINE_TYPE (ECalendarTableConfig, e_calendar_table_config, G_TYPE_OBJECT);
-
-static void
-e_calendar_table_config_set_property (GObject *object, guint property_id, const GValue *value, GParamSpec *pspec)
-{
-	ECalendarTableConfig *table_config;
-	ECalendarTableConfigPrivate *priv;
-
-	table_config = E_CALENDAR_TABLE_CONFIG (object);
-	priv = table_config->priv;
-	
-	switch (property_id) {
-	case PROP_TABLE:
-		e_calendar_table_config_set_table (table_config, g_value_get_object (value));
-		break;
-	default:
-		G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec);
-		break;
-	}
-}
-
-static void
-e_calendar_table_config_get_property (GObject *object, guint property_id, GValue *value, GParamSpec *pspec)
-{
-	ECalendarTableConfig *table_config;
-	ECalendarTableConfigPrivate *priv;
-
-	table_config = E_CALENDAR_TABLE_CONFIG (object);
-	priv = table_config->priv;
-	
-	switch (property_id) {
-	case PROP_TABLE:
-		g_value_set_object (value, e_calendar_table_config_get_table (table_config));
-		break;
-	default:
-		G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec);
-		break;
-	}
-}
-
-static void
-e_calendar_table_config_dispose (GObject *object)
-{
-	ECalendarTableConfig *table_config = E_CALENDAR_TABLE_CONFIG (object);
-	ECalendarTableConfigPrivate *priv;
-	
-	priv = table_config->priv;
-
-	e_calendar_table_config_set_table (table_config, NULL);
-	
-	if (G_OBJECT_CLASS (e_calendar_table_config_parent_class)->dispose)
-		G_OBJECT_CLASS (e_calendar_table_config_parent_class)->dispose (object);
-}
-
-static void
-e_calendar_table_config_finalize (GObject *object)
-{
-	ECalendarTableConfig *table_config = E_CALENDAR_TABLE_CONFIG (object);
-	ECalendarTableConfigPrivate *priv;
-	
-	priv = table_config->priv;
-
-	g_free (priv);
-	
-	if (G_OBJECT_CLASS (e_calendar_table_config_parent_class)->finalize)
-		G_OBJECT_CLASS (e_calendar_table_config_parent_class)->finalize (object);
-}
-
-static void
-e_calendar_table_config_class_init (ECalendarTableConfigClass *klass)
-{
-	GObjectClass *gobject_class = G_OBJECT_CLASS (klass);
-	GParamSpec *spec;
-	
-	/* Method override */
-	gobject_class->set_property = e_calendar_table_config_set_property;
-	gobject_class->get_property = e_calendar_table_config_get_property;
-	gobject_class->dispose = e_calendar_table_config_dispose;
-	gobject_class->finalize = e_calendar_table_config_finalize;
-
-	spec = g_param_spec_object ("table", NULL, NULL, e_calendar_table_get_type (),
-				    G_PARAM_READABLE | G_PARAM_WRITABLE | G_PARAM_CONSTRUCT);
-	g_object_class_install_property (gobject_class, PROP_TABLE, spec);
-}
-
-static void
-e_calendar_table_config_init (ECalendarTableConfig *table_config)
-{
-	table_config->priv = g_new0 (ECalendarTableConfigPrivate, 1);
-
-}
-
-ECalendarTableConfig *
-e_calendar_table_config_new (ECalendarTable *table)
-{
-	ECalendarTableConfig *table_config;
-	
-	table_config = g_object_new (e_calendar_table_config_get_type (), "table", table, NULL);
-
-	return table_config;
-}
-
-ECalendarTable *
-e_calendar_table_config_get_table (ECalendarTableConfig *table_config) 
-{
-	ECalendarTableConfigPrivate *priv;
-
-	g_return_val_if_fail (table_config != NULL, NULL);
-	g_return_val_if_fail (E_IS_CALENDAR_TABLE_CONFIG (table_config), NULL);
-
-	priv = table_config->priv;
-	
-	return priv->table;
-}
-
-static void
-set_timezone (ECalendarTable *table) 
-{
-	ECalModel *model;
-	icaltimezone *zone;
-	
-	zone = calendar_config_get_icaltimezone ();	
-	model = e_calendar_table_get_model (table);
-	if (model)
-		e_cal_model_set_timezone (model, zone);
-}
-
-static void
-timezone_changed_cb (GConfClient *client, guint id, GConfEntry *entry, gpointer data)
-{
-	ECalendarTableConfig *table_config = data;
-	ECalendarTableConfigPrivate *priv;
-	
-	priv = table_config->priv;
-	
-	set_timezone (priv->table);
-}
-
-static void
-set_twentyfour_hour (ECalendarTable *table) 
-{
-	ECalModel *model;
-	gboolean use_24_hour;
-
-	use_24_hour = calendar_config_get_24_hour_format ();
-
-	model = e_calendar_table_get_model (table);
-	if (model)
-		e_cal_model_set_use_24_hour_format (model, use_24_hour);
-}
-
-static void
-twentyfour_hour_changed_cb (GConfClient *client, guint id, GConfEntry *entry, gpointer data)
-{
-	ECalendarTableConfig *table_config = data;
-	ECalendarTableConfigPrivate *priv;
-	
-	priv = table_config->priv;
-	
-	set_twentyfour_hour (priv->table);
-}
-
-void
-e_calendar_table_config_set_table (ECalendarTableConfig *table_config, ECalendarTable *table) 
-{
-	ECalendarTableConfigPrivate *priv;
-	guint not;
-	GList *l;
-	
-	g_return_if_fail (table_config != NULL);
-	g_return_if_fail (E_IS_CALENDAR_TABLE_CONFIG (table_config));
-
-	priv = table_config->priv;
-	
-	if (priv->table) {
-		g_object_unref (priv->table);
-		priv->table = NULL;
-	}
-
-	if (priv->cell_config) {
-		g_object_unref (priv->cell_config);
-		priv->cell_config = NULL;
-	}
-	
-	for (l = priv->notifications; l; l = l->next)
-		calendar_config_remove_notification (GPOINTER_TO_UINT (l->data));
-
-	g_list_free (priv->notifications);
-	priv->notifications = NULL;
-
-	/* If the new view is NULL, return right now */
-	if (!table)
-		return;
-	
-	priv->table = g_object_ref (table);
-
-	/* Time zone */
-	set_timezone (table);
-	
-	not = calendar_config_add_notification_timezone (timezone_changed_cb, table_config);
-	priv->notifications = g_list_prepend (priv->notifications, GUINT_TO_POINTER (not));
-
-	/* 24 Hour format */
-	set_twentyfour_hour (table);	
-
-	not = calendar_config_add_notification_24_hour_format (twentyfour_hour_changed_cb, table_config);
-	priv->notifications = g_list_prepend (priv->notifications, GUINT_TO_POINTER (not));
-
-	/* Date cell */
-	priv->cell_config = e_cell_date_edit_config_new (table->dates_cell);
-}
diff --git a/calendar/gui/e-calendar-table-config.h b/calendar/gui/e-calendar-table-config.h
deleted file mode 100644
index 399f3254d1..0000000000
--- a/calendar/gui/e-calendar-table-config.h
+++ /dev/null
@@ -1,55 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-/* 
- * Author : 
- *  JP Rosevear <jpr@ximian.com>
- *
- * Copyright 2003, Ximian, Inc.
- *
- * This program is free software; you can redistribute it and/or 
- * modify it under the terms of version 2 of the GNU General Public 
- * License as published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
- * USA
- */
-
-#ifndef _E_CALENDAR_TABLE_CONFIG_H_
-#define _E_CALENDAR_TABLE_CONFIG_H_
-
-#include "e-calendar-table.h"
-
-G_BEGIN_DECLS
-
-#define E_CALENDAR_TABLE_CONFIG(obj)          GTK_CHECK_CAST (obj, e_calendar_table_config_get_type (), ECalendarTableConfig)
-#define E_CALENDAR_TABLE_CONFIG_CLASS(klass)  GTK_CHECK_CLASS_CAST (klass, e_calendar_table_config_get_type (), ECalendarTableConfigClass)
-#define E_IS_CALENDAR_TABLE_CONFIG(obj)       GTK_CHECK_TYPE (obj, e_calendar_table_config_get_type ())
-        
-typedef struct _ECalendarTableConfig        ECalendarTableConfig;
-typedef struct _ECalendarTableConfigClass   ECalendarTableConfigClass;
-typedef struct _ECalendarTableConfigPrivate ECalendarTableConfigPrivate;
-
-struct _ECalendarTableConfig {
-	GObject parent;
-
-	ECalendarTableConfigPrivate *priv;
-};
-
-struct _ECalendarTableConfigClass {
-	GObjectClass parent_class;
-};
-
-GType          e_calendar_table_config_get_type (void);
-ECalendarTableConfig *e_calendar_table_config_new (ECalendarTable *table);
-ECalendarTable *e_calendar_table_config_get_table (ECalendarTableConfig *view_config);
-void e_calendar_table_config_set_table (ECalendarTableConfig *view_config, ECalendarTable *table);
-
-G_END_DECLS
-
-#endif
diff --git a/calendar/gui/e-calendar-table.c b/calendar/gui/e-calendar-table.c
deleted file mode 100644
index a3d50bb475..0000000000
--- a/calendar/gui/e-calendar-table.c
+++ /dev/null
@@ -1,1371 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-
-/*
- * Authors :
- *  Damon Chaplin <damon@ximian.com>
- *  Rodrigo Moya <rodrigo@ximian.com>
- *
- * Copyright 2000, 2001, 2002, 2003 Novell, Inc.
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of version 2 of the GNU General Public
- * License as published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
- * USA
- */
-
-/*
- * ECalendarTable - displays the ECalComponent objects in a table (an ETable).
- * Used for calendar events and tasks.
- */
-
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
-
-#include <sys/stat.h>
-#include <unistd.h>
-#include <gnome.h>
-#include <gal/widgets/e-gui-utils.h>
-#include <gal/e-table/e-cell-checkbox.h>
-#include <gal/e-table/e-cell-toggle.h>
-#include <gal/e-table/e-cell-text.h>
-#include <gal/e-table/e-cell-combo.h>
-#include <e-util/e-dialog-utils.h>
-#include <widgets/misc/e-cell-date-edit.h>
-#include <widgets/misc/e-cell-percent.h>
-
-#include "calendar-component.h"
-#include "calendar-config.h"
-#include "dialogs/delete-comp.h"
-#include "dialogs/delete-error.h"
-#include "dialogs/task-editor.h"
-#include "e-cal-model-tasks.h"
-#include "e-calendar-table.h"
-#include "e-cell-date-edit-text.h"
-#include "e-comp-editor-registry.h"
-#include "print.h"
-#include <e-util/e-icon-factory.h>
-#include "e-cal-popup.h"
-
-extern ECompEditorRegistry *comp_editor_registry;
-
-static void e_calendar_table_class_init		(ECalendarTableClass *class);
-static void e_calendar_table_init		(ECalendarTable	*cal_table);
-static void e_calendar_table_destroy		(GtkObject	*object);
-
-static void e_calendar_table_on_double_click	(ETable		*table,
-						 gint		 row,
-						 gint		 col,
-						 GdkEvent	*event,
-						 ECalendarTable *cal_table);
-static gint e_calendar_table_show_popup_menu    (ETable *table,
-						 GdkEvent *gdk_event,
-						 ECalendarTable *cal_table);
-
-static gint e_calendar_table_on_right_click	(ETable		*table,
-						 gint		 row,
-						 gint		 col,
-						 GdkEvent       *event,
-						 ECalendarTable *cal_table);
-static gboolean e_calendar_table_on_popup_menu  (GtkWidget *widget,
-						 gpointer data);
-
-static gint e_calendar_table_on_key_press	(ETable		*table,
-						 gint		 row,
-						 gint		 col,
-						 GdkEventKey	*event,
-						 ECalendarTable *cal_table);
-
-static struct tm e_calendar_table_get_current_time (ECellDateEdit *ecde,
-						    gpointer data);
-static void mark_row_complete_cb (int model_row, gpointer data);
-static ECalModelComponent *get_selected_comp (ECalendarTable *cal_table);
-static void open_task (ECalendarTable *cal_table, ECalModelComponent *comp_data, gboolean assign);
-
-/* Signal IDs */
-enum {
-	USER_CREATED,
-	LAST_SIGNAL
-};
-
-static guint signals[LAST_SIGNAL] = { 0 };
-
-/* The icons to represent the task. */
-#define E_CALENDAR_MODEL_NUM_ICONS	4
-static const char* icon_names[E_CALENDAR_MODEL_NUM_ICONS] = {
-	"stock_task", "stock_task-recurring", "stock_task-assigned", "stock_task-assigned-to"
-};
-static GdkPixbuf* icon_pixbufs[E_CALENDAR_MODEL_NUM_ICONS] = { 0 };
-
-static GdkAtom clipboard_atom = GDK_NONE;
-
-G_DEFINE_TYPE (ECalendarTable, e_calendar_table, GTK_TYPE_TABLE);
-
-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;
-
-	signals[USER_CREATED] =
-		g_signal_new ("user_created",
-			      G_TYPE_FROM_CLASS (class),
-			      G_SIGNAL_RUN_LAST,
-			      G_STRUCT_OFFSET (ECalendarTableClass, user_created),
-			      NULL, NULL,
-			      g_cclosure_marshal_VOID__VOID,
-			      G_TYPE_NONE, 0);
-
-	/* clipboard atom */
-	if (!clipboard_atom)
-		clipboard_atom = gdk_atom_intern ("CLIPBOARD", FALSE);
-}
-
-/* Compares two priority values, which may not exist */
-static int
-compare_priorities (int *a, int *b)
-{
-	if (a && b) {
-		if (*a < *b)
-			return -1;
-		else if (*a > *b)
-			return 1;
-		else
-			return 0;
-	} else if (a)
-		return -1;
-	else if (b)
-		return 1;
-	else
-		return 0;
-}
-
-/* Comparison function for the task-sort column.  Sorts by due date and then by
- * priority.
- *
- * FIXME: Does this ever get called?? It doesn't seem to.
- * I specified that the table should be sorted by this column, but it still
- * never calls this function.
- * Also, this assumes it is passed pointers to ECalComponents, but I think it
- * may just be passed pointers to the 2 cell values.
- */
-static gint
-task_compare_cb (gconstpointer a, gconstpointer b)
-{
-	ECalComponent *ca, *cb;
-	ECalComponentDateTime due_a, due_b;
-	int *prio_a, *prio_b;
-	int retval;
-
-	ca = E_CAL_COMPONENT (a);
-	cb = E_CAL_COMPONENT (b);
-
-	e_cal_component_get_due (ca, &due_a);
-	e_cal_component_get_due (cb, &due_b);
-	e_cal_component_get_priority (ca, &prio_a);
-	e_cal_component_get_priority (cb, &prio_b);
-
-	if (due_a.value && due_b.value) {
-		int v;
-
-		/* FIXME: TIMEZONES. But currently we have no way to get the
-		   ECal, so we can't get the timezone. */
-		v = icaltime_compare (*due_a.value, *due_b.value);
-
-		if (v == 0)
-			retval = compare_priorities (prio_a, prio_b);
-		else
-			retval = v;
-	} else if (due_a.value)
-		retval = -1;
-	else if (due_b.value)
-		retval = 1;
-	else
-		retval = compare_priorities (prio_a, prio_b);
-
-	e_cal_component_free_datetime (&due_a);
-	e_cal_component_free_datetime (&due_b);
-
-	if (prio_a)
-		e_cal_component_free_priority (prio_a);
-
-	if (prio_b)
-		e_cal_component_free_priority (prio_b);
-
-	return retval;
-}
-
-static gint
-date_compare_cb (gconstpointer a, gconstpointer b)
-{
-	ECellDateEditValue *dv1 = (ECellDateEditValue *) a;
-	ECellDateEditValue *dv2 = (ECellDateEditValue *) b;
-	struct icaltimetype tt;
-
-	/* First check if either is NULL. NULL dates sort last. */
-	if (!dv1 || !dv2) {
-		if (dv1 == dv2)
-			return 0;
-		else if (dv1)
-			return -1;
-		else
-			return 1;
-	}
-
-	/* Copy the 2nd value and convert it to the same timezone as the
-	   first. */
-	tt = dv2->tt;
-
-	icaltimezone_convert_time (&tt, dv2->zone, dv1->zone);
-
-	/* Now we can compare them. */
-
-	return icaltime_compare (dv1->tt, tt);
-}
-
-static gint
-percent_compare_cb (gconstpointer a, gconstpointer b)
-{
-	int percent1 = GPOINTER_TO_INT (a);
-	int percent2 = GPOINTER_TO_INT (b);
-	int retval;
-
-	if (percent1 > percent2)
-		retval = 1;
-	else if (percent1 < percent2)
-		retval = -1;
-	else
-		retval = 0;
-
-	return retval;
-}
-
-static gint
-priority_compare_cb (gconstpointer a, gconstpointer b)
-{
-	int priority1, priority2;
-
-	priority1 = e_cal_util_priority_from_string ((const char*) a);
-	priority2 = e_cal_util_priority_from_string ((const char*) b);
-
-	/* We change undefined priorities so they appear after 'Low'. */
-	if (priority1 <= 0)
-		priority1 = 10;
-	if (priority2 <= 0)
-		priority2 = 10;
-
-	/* We'll just use the ordering of the priority values. */
-	if (priority1 < priority2)
-		return -1;
-	else if (priority1 > priority2)
-		return 1;
-	else
-		return 0;
-}
-
-static void
-row_appended_cb (ECalModel *model, ECalendarTable *cal_table) 
-{
-	g_signal_emit (cal_table, signals[USER_CREATED], 0);
-}
-
-static void
-e_calendar_table_init (ECalendarTable *cal_table)
-{
-	GtkWidget *table;
-	ETable *e_table;
-	ECell *cell, *popup_cell;
-	ETableExtras *extras;
-	gint i;
-	GdkPixbuf *pixbuf;
-	GList *strings;
-	AtkObject *a11y;
-
-	/* Create the model */
-
-	cal_table->model = (ECalModel *) e_cal_model_tasks_new ();
-	g_signal_connect (cal_table->model, "row_appended", G_CALLBACK (row_appended_cb), cal_table);
-
-	/* Create the header columns */
-
-	extras = e_table_extras_new();
-
-	/*
-	 * Normal string fields.
-	 */
-	cell = e_cell_text_new (NULL, GTK_JUSTIFY_LEFT);
-	g_object_set (G_OBJECT (cell),
-		      "strikeout_column", E_CAL_MODEL_TASKS_FIELD_COMPLETE,
-		      "bold_column", E_CAL_MODEL_TASKS_FIELD_OVERDUE,
-		      "bg_color_column", E_CAL_MODEL_FIELD_COLOR,
-		      NULL);
-
-	e_table_extras_add_cell (extras, "calstring", cell);
-
-
-	/*
-	 * Date fields.
-	 */
-	cell = e_cell_date_edit_text_new (NULL, GTK_JUSTIFY_LEFT);
-	g_object_set (G_OBJECT (cell),
-		      "strikeout_column", E_CAL_MODEL_TASKS_FIELD_COMPLETE,
-		      "bold_column", E_CAL_MODEL_TASKS_FIELD_OVERDUE,
-		      "bg_color_column", E_CAL_MODEL_FIELD_COLOR,
-		      NULL);
-
-	popup_cell = e_cell_date_edit_new ();
-	e_cell_popup_set_child (E_CELL_POPUP (popup_cell), cell);
-	g_object_unref (cell);
-	e_table_extras_add_cell (extras, "dateedit", popup_cell);
-	cal_table->dates_cell = E_CELL_DATE_EDIT (popup_cell);
-
-	e_cell_date_edit_set_get_time_callback (E_CELL_DATE_EDIT (popup_cell),
-						e_calendar_table_get_current_time,
-						cal_table, NULL);
-
-
-	/*
-	 * Combo fields.
-	 */
-
-	/* Classification field. */
-	cell = e_cell_text_new (NULL, GTK_JUSTIFY_LEFT);
-	g_object_set (G_OBJECT (cell),
-		      "strikeout_column", E_CAL_MODEL_TASKS_FIELD_COMPLETE,
-		      "bold_column", E_CAL_MODEL_TASKS_FIELD_OVERDUE,
-		      "bg_color_column", E_CAL_MODEL_FIELD_COLOR,
-		      "editable", FALSE,
-		      NULL);
-
-	popup_cell = e_cell_combo_new ();
-	e_cell_popup_set_child (E_CELL_POPUP (popup_cell), cell);
-	g_object_unref (cell);
-
-	strings = NULL;
-	strings = g_list_append (strings, (char*) _("Public"));
-	strings = g_list_append (strings, (char*) _("Private"));
-	strings = g_list_append (strings, (char*) _("Confidential"));
-	e_cell_combo_set_popdown_strings (E_CELL_COMBO (popup_cell),
-					  strings);
-
-	e_table_extras_add_cell (extras, "classification", popup_cell);
-
-	/* Priority field. */
-	cell = e_cell_text_new (NULL, GTK_JUSTIFY_LEFT);
-	g_object_set (G_OBJECT (cell),
-		      "strikeout_column", E_CAL_MODEL_TASKS_FIELD_COMPLETE,
-		      "bold_column", E_CAL_MODEL_TASKS_FIELD_OVERDUE,
-		      "bg_color_column", E_CAL_MODEL_FIELD_COLOR,
-		      "editable", FALSE,
-		      NULL);
-
-	popup_cell = e_cell_combo_new ();
-	e_cell_popup_set_child (E_CELL_POPUP (popup_cell), cell);
-	g_object_unref (cell);
-
-	strings = NULL;
-	strings = g_list_append (strings, (char*) _("High"));
-	strings = g_list_append (strings, (char*) _("Normal"));
-	strings = g_list_append (strings, (char*) _("Low"));
-	strings = g_list_append (strings, (char*) _("Undefined"));
-	e_cell_combo_set_popdown_strings (E_CELL_COMBO (popup_cell),
-					  strings);
-
-	e_table_extras_add_cell (extras, "priority", popup_cell);
-
-	/* Percent field. */
-	cell = e_cell_percent_new (NULL, GTK_JUSTIFY_LEFT);
-	g_object_set (G_OBJECT (cell),
-		      "strikeout_column", E_CAL_MODEL_TASKS_FIELD_COMPLETE,
-		      "bold_column", E_CAL_MODEL_TASKS_FIELD_OVERDUE,
-		      "bg_color_column", E_CAL_MODEL_FIELD_COLOR,
-		      NULL);
-
-	popup_cell = e_cell_combo_new ();
-	e_cell_popup_set_child (E_CELL_POPUP (popup_cell), cell);
-	g_object_unref (cell);
-
-	strings = NULL;
-	strings = g_list_append (strings, (char*) _("0%"));
-	strings = g_list_append (strings, (char*) _("10%"));
-	strings = g_list_append (strings, (char*) _("20%"));
-	strings = g_list_append (strings, (char*) _("30%"));
-	strings = g_list_append (strings, (char*) _("40%"));
-	strings = g_list_append (strings, (char*) _("50%"));
-	strings = g_list_append (strings, (char*) _("60%"));
-	strings = g_list_append (strings, (char*) _("70%"));
-	strings = g_list_append (strings, (char*) _("80%"));
-	strings = g_list_append (strings, (char*) _("90%"));
-	strings = g_list_append (strings, (char*) _("100%"));
-	e_cell_combo_set_popdown_strings (E_CELL_COMBO (popup_cell),
-					  strings);
-
-	e_table_extras_add_cell (extras, "percent", popup_cell);
-
-	/* Transparency field. */
-	cell = e_cell_text_new (NULL, GTK_JUSTIFY_LEFT);
-	g_object_set (G_OBJECT (cell),
-		      "strikeout_column", E_CAL_MODEL_TASKS_FIELD_COMPLETE,
-		      "bold_column", E_CAL_MODEL_TASKS_FIELD_OVERDUE,
-		      "bg_color_column", E_CAL_MODEL_FIELD_COLOR,
-		      "editable", FALSE,
-		      NULL);
-
-	popup_cell = e_cell_combo_new ();
-	e_cell_popup_set_child (E_CELL_POPUP (popup_cell), cell);
-	g_object_unref (cell);
-
-	strings = NULL;
-	strings = g_list_append (strings, (char*) _("Free"));
-	strings = g_list_append (strings, (char*) _("Busy"));
-	e_cell_combo_set_popdown_strings (E_CELL_COMBO (popup_cell),
-					  strings);
-
-	e_table_extras_add_cell (extras, "transparency", popup_cell);
-
-	/* Status field. */
-	cell = e_cell_text_new (NULL, GTK_JUSTIFY_LEFT);
-	g_object_set (G_OBJECT (cell),
-		      "strikeout_column", E_CAL_MODEL_TASKS_FIELD_COMPLETE,
-		      "bold_column", E_CAL_MODEL_TASKS_FIELD_OVERDUE,
-		      "bg_color_column", E_CAL_MODEL_FIELD_COLOR,
-		      "editable", FALSE,
-		      NULL);
-
-	popup_cell = e_cell_combo_new ();
-	e_cell_popup_set_child (E_CELL_POPUP (popup_cell), cell);
-	g_object_unref (cell);
-
-	strings = NULL;
-	strings = g_list_append (strings, (char*) _("Not Started"));
-	strings = g_list_append (strings, (char*) _("In Progress"));
-	strings = g_list_append (strings, (char*) _("Completed"));
-	strings = g_list_append (strings, (char*) _("Cancelled"));
-	e_cell_combo_set_popdown_strings (E_CELL_COMBO (popup_cell),
-					  strings);
-
-	e_table_extras_add_cell (extras, "calstatus", popup_cell);
-
-	/* Task sorting field */
-	/* FIXME: This column should not be displayed, but ETableExtras requires
-	 * its shit to be visible columns listed in the XML spec.
-	 */
-	e_table_extras_add_compare (extras, "task-sort", task_compare_cb);
-
-	e_table_extras_add_compare (extras, "date-compare",
-				    date_compare_cb);
-	e_table_extras_add_compare (extras, "percent-compare",
-				    percent_compare_cb);
-	e_table_extras_add_compare (extras, "priority-compare",
-				    priority_compare_cb);
-
-	/* Create pixmaps */
-
-	if (!icon_pixbufs[0])
-		for (i = 0; i < E_CALENDAR_MODEL_NUM_ICONS; i++) {
-			icon_pixbufs[i] = e_icon_factory_get_icon (icon_names[i], E_ICON_SIZE_LIST);
-		}
-
-	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 = e_icon_factory_get_icon ("stock_check-filled", E_ICON_SIZE_LIST);
-	e_table_extras_add_pixbuf(extras, "complete", pixbuf);
-	gdk_pixbuf_unref(pixbuf);
-
-	/* Create the table */
-
-	table = e_table_scrolled_new_from_spec_file (E_TABLE_MODEL (cal_table->model),
-						     extras,
-						     EVOLUTION_ETSPECDIR "/e-calendar-table.etspec",
-						     NULL);
-	/* FIXME: this causes a message from GLib about 'extras' having only a floating
-	   reference */
-	/* g_object_unref (extras); */
-
-	cal_table->etable = table;
-	gtk_table_attach (GTK_TABLE (cal_table), table, 0, 1, 0, 1,
-			  GTK_EXPAND | GTK_FILL, GTK_EXPAND | GTK_FILL, 0, 0);
-	gtk_widget_show (table);
-
-
-	e_table = e_table_scrolled_get_table (E_TABLE_SCROLLED (table));
-	g_signal_connect (e_table, "double_click", G_CALLBACK (e_calendar_table_on_double_click), cal_table);
-	g_signal_connect (e_table, "right_click", G_CALLBACK (e_calendar_table_on_right_click), cal_table);
-	g_signal_connect (e_table, "key_press", G_CALLBACK (e_calendar_table_on_key_press), cal_table);
-	g_signal_connect (e_table, "popup_menu", G_CALLBACK (e_calendar_table_on_popup_menu), cal_table);
-
-	a11y = gtk_widget_get_accessible (e_table);
-	if (a11y)
-		atk_object_set_name (a11y, _("Task 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 (g_object_new (e_calendar_table_get_type (), NULL));
-
-	return cal_table;
-}
-
-
-/**
- * e_calendar_table_get_model:
- * @cal_table: A calendar table.
- * 
- * Queries the calendar data model that a calendar table is using.
- * 
- * Return value: A calendar model.
- **/
-ECalModel *
-e_calendar_table_get_model (ECalendarTable *cal_table)
-{
-	g_return_val_if_fail (cal_table != NULL, NULL);
-	g_return_val_if_fail (E_IS_CALENDAR_TABLE (cal_table), NULL);
-
-	return cal_table->model;
-}
-
-
-static void
-e_calendar_table_destroy (GtkObject *object)
-{
-	ECalendarTable *cal_table;
-
-	cal_table = E_CALENDAR_TABLE (object);
-
-	if (cal_table->model) {
-		g_object_unref (cal_table->model);
-		cal_table->model = NULL;
-	}
-
-	GTK_OBJECT_CLASS (e_calendar_table_parent_class)->destroy (object);
-}
-
-/**
- * e_calendar_table_get_table:
- * @cal_table: A calendar table.
- * 
- * Queries the #ETable widget that the calendar table is using.
- * 
- * Return value: The #ETable widget that the calendar table uses to display its
- * data.
- **/
-ETable *
-e_calendar_table_get_table (ECalendarTable *cal_table)
-{
-	g_return_val_if_fail (cal_table != NULL, NULL);
-	g_return_val_if_fail (E_IS_CALENDAR_TABLE (cal_table), NULL);
-
-	return e_table_scrolled_get_table (E_TABLE_SCROLLED (cal_table->etable));
-}
-
-void
-e_calendar_table_open_selected (ECalendarTable *cal_table)
-{
-	ECalModelComponent *comp_data;
-	icalproperty *prop;
-
-	comp_data = get_selected_comp (cal_table);
-	prop = icalcomponent_get_first_property (comp_data->icalcomp, ICAL_ATTENDEE_PROPERTY);
-	if (comp_data != NULL)
-		open_task (cal_table, comp_data, prop ? TRUE : FALSE);
-}
-
-/**
- * e_calendar_table_complete_selected:
- * @cal_table: A calendar table
- * 
- * Marks the selected items as completed
- **/
-void
-e_calendar_table_complete_selected (ECalendarTable *cal_table)
-{
-	ETable *etable;
-
-	g_return_if_fail (cal_table != NULL);
-	g_return_if_fail (E_IS_CALENDAR_TABLE (cal_table));
-
-	etable = e_table_scrolled_get_table (E_TABLE_SCROLLED (cal_table->etable));
-	e_table_selected_row_foreach (etable, mark_row_complete_cb, cal_table);
-}
-
-/* Used from e_table_selected_row_foreach(); puts the selected row number in an
- * int pointed to by the closure data.
- */
-static void
-get_selected_row_cb (int model_row, gpointer data)
-{
-	int *row;
-
-	row = data;
-	*row = model_row;
-}
-
-/* Returns the component that is selected in the table; only works if there is
- * one and only one selected row.
- */
-static ECalModelComponent *
-get_selected_comp (ECalendarTable *cal_table)
-{
-	ETable *etable;
-	int row;
-
-	etable = e_table_scrolled_get_table (E_TABLE_SCROLLED (cal_table->etable));
-	if (e_table_selected_count (etable) != 1)
-		return NULL;
-
-	row = -1;
-	e_table_selected_row_foreach (etable,
-				      get_selected_row_cb,
-				      &row);
-	g_assert (row != -1);
-
-	return e_cal_model_get_component_at (cal_table->model, row);
-}
-
-struct get_selected_uids_closure {
-	ECalendarTable *cal_table;
-	GSList *objects;
-};
-
-/* Used from e_table_selected_row_foreach(), builds a list of the selected UIDs */
-static void
-add_uid_cb (int model_row, gpointer data)
-{
-	struct get_selected_uids_closure *closure;
-	ECalModelComponent *comp_data;
-
-	closure = data;
-
-	comp_data = e_cal_model_get_component_at (closure->cal_table->model, model_row);
-
-	closure->objects = g_slist_prepend (closure->objects, comp_data);
-}
-
-static GSList *
-get_selected_objects (ECalendarTable *cal_table)
-{
-	struct get_selected_uids_closure closure;
-	ETable *etable;
-
-	closure.cal_table = cal_table;
-	closure.objects = NULL;
-
-	etable = e_table_scrolled_get_table (E_TABLE_SCROLLED (cal_table->etable));
-	e_table_selected_row_foreach (etable, add_uid_cb, &closure);
-
-	return closure.objects;
-}
-
-/* Deletes all of the selected components in the table */
-static void
-delete_selected_components (ECalendarTable *cal_table)
-{
-	GSList *objs, *l;
-
-	objs = get_selected_objects (cal_table);
-
-	e_calendar_table_set_status_message (cal_table, _("Deleting selected objects"));
-
-	for (l = objs; l; l = l->next) {
-		ECalModelComponent *comp_data = (ECalModelComponent *) l->data;
-		GError *error = NULL;
-		
-		e_cal_remove_object (comp_data->client, 
-				     icalcomponent_get_uid (comp_data->icalcomp), &error);
-		delete_error_dialog (error, E_CAL_COMPONENT_TODO);
-		g_clear_error (&error);
-	}
-
-	e_calendar_table_set_status_message (cal_table, NULL);
-
-	g_slist_free (objs);
-}
-
-/**
- * e_calendar_table_delete_selected:
- * @cal_table: A calendar table.
- * 
- * Deletes the selected components in the table; asks the user first.
- **/
-void
-e_calendar_table_delete_selected (ECalendarTable *cal_table)
-{
-	ETable *etable;
-	int n_selected;
-	ECalModelComponent *comp_data;
-	ECalComponent *comp = NULL;
-
-	g_return_if_fail (cal_table != NULL);
-	g_return_if_fail (E_IS_CALENDAR_TABLE (cal_table));
-
-	etable = e_table_scrolled_get_table (E_TABLE_SCROLLED (cal_table->etable));
-
-	n_selected = e_table_selected_count (etable);
-	if (n_selected <= 0)
-		return;
-
-	if (n_selected == 1)
-		comp_data = get_selected_comp (cal_table);
-	else
-		comp_data = NULL;
-
-	/* FIXME: this may be something other than a TODO component */
-
-	if (comp_data) {
-		comp = e_cal_component_new ();
-		e_cal_component_set_icalcomponent (comp, icalcomponent_new_clone (comp_data->icalcomp));
-	}
-	
-	if (delete_component_dialog (comp, FALSE, n_selected, E_CAL_COMPONENT_TODO,
-				     GTK_WIDGET (cal_table)))
-		delete_selected_components (cal_table);
-
-	/* free memory */
-	if (comp)
-		g_object_unref (comp);
-}
-
-/**
- * e_calendar_table_get_selected:
- * @cal_table: 
- * 
- * Get the currently selected ECalModelComponent's on the table.
- * 
- * Return value: A GSList of the components, which should be
- * g_slist_free'd when finished with.
- **/
-GSList *
-e_calendar_table_get_selected (ECalendarTable *cal_table)
-{
-	return get_selected_objects(cal_table);
-}
-
-/**
- * e_calendar_table_cut_clipboard:
- * @cal_table: A calendar table.
- *
- * Cuts selected tasks in the given calendar table
- */
-void
-e_calendar_table_cut_clipboard (ECalendarTable *cal_table)
-{
-	g_return_if_fail (E_IS_CALENDAR_TABLE (cal_table));
-
-	e_calendar_table_copy_clipboard (cal_table);
-	delete_selected_components (cal_table);
-}
-
-/* callback for e_table_selected_row_foreach */
-static void
-copy_row_cb (int model_row, gpointer data)
-{
-	ECalendarTable *cal_table;
-	ECalModelComponent *comp_data;
-	gchar *comp_str;
-	icalcomponent *child;
-
-	cal_table = E_CALENDAR_TABLE (data);
-
-	g_return_if_fail (cal_table->tmp_vcal != NULL);
-
-	comp_data = e_cal_model_get_component_at (cal_table->model, model_row);
-	if (!comp_data)
-		return;
-
-	/* add timezones to the VCALENDAR component */
-	e_cal_util_add_timezones_from_component (cal_table->tmp_vcal, comp_data->icalcomp);
-
-	/* add the new component to the VCALENDAR component */
-	comp_str = icalcomponent_as_ical_string (comp_data->icalcomp);
-	child = icalparser_parse_string (comp_str);
-	if (child) {
-		icalcomponent_add_component (cal_table->tmp_vcal,
-					     icalcomponent_new_clone (child));
-		icalcomponent_free (child);
-	}
-}
-
-/**
- * e_calendar_table_copy_clipboard:
- * @cal_table: A calendar table.
- *
- * Copies selected tasks into the clipboard
- */
-void
-e_calendar_table_copy_clipboard (ECalendarTable *cal_table)
-{
-	ETable *etable;
-	char *comp_str;
-	
-	g_return_if_fail (E_IS_CALENDAR_TABLE (cal_table));
-
-	/* create temporary VCALENDAR object */
-	cal_table->tmp_vcal = e_cal_util_new_top_level ();
-
-	etable = e_table_scrolled_get_table (E_TABLE_SCROLLED (cal_table->etable));
-	e_table_selected_row_foreach (etable, copy_row_cb, cal_table);
-	comp_str = icalcomponent_as_ical_string (cal_table->tmp_vcal);
-	gtk_clipboard_set_text (gtk_widget_get_clipboard (GTK_WIDGET (cal_table), clipboard_atom),
-				(const char *) comp_str,
-				g_utf8_strlen (comp_str, -1));
-	
-	/* free memory */
-	icalcomponent_free (cal_table->tmp_vcal);
-	cal_table->tmp_vcal = NULL;
-}
-
-static void
-clipboard_get_text_cb (GtkClipboard *clipboard, const gchar *text, ECalendarTable *cal_table)
-{
-	icalcomponent *icalcomp;
-	char *uid;
-	ECalComponent *comp;
-	ECal *client;
-	icalcomponent_kind kind;
-
-	g_return_if_fail (E_IS_CALENDAR_TABLE (cal_table));
-
-	if (!text || !*text)
-		return;
-
-	icalcomp = icalparser_parse_string (text);
-	if (!icalcomp)
-		return;
-
-	/* check the type of the component */
-	kind = icalcomponent_isa (icalcomp);
-	if (kind != ICAL_VCALENDAR_COMPONENT &&
-	    kind != ICAL_VEVENT_COMPONENT &&
-	    kind != ICAL_VTODO_COMPONENT &&
-	    kind != ICAL_VJOURNAL_COMPONENT) {
-		return;
-	}
-
-	client = e_cal_model_get_default_client (cal_table->model);
-	
-	e_calendar_table_set_status_message (cal_table, _("Updating objects"));
-
-	if (kind == ICAL_VCALENDAR_COMPONENT) {
-		icalcomponent_kind child_kind;
-		icalcomponent *subcomp;
-		icalcomponent *vcal_comp;
-
-		vcal_comp = icalcomp;
-		subcomp = icalcomponent_get_first_component (
-			vcal_comp, ICAL_ANY_COMPONENT);
-		while (subcomp) {
-			child_kind = icalcomponent_isa (subcomp);
-			if (child_kind == ICAL_VEVENT_COMPONENT ||
-			    child_kind == ICAL_VTODO_COMPONENT ||
-			    child_kind == ICAL_VJOURNAL_COMPONENT) {
-				ECalComponent *tmp_comp;
-
-				uid = e_cal_component_gen_uid ();
-				tmp_comp = e_cal_component_new ();
-				e_cal_component_set_icalcomponent (
-					tmp_comp, icalcomponent_new_clone (subcomp));
-				e_cal_component_set_uid (tmp_comp, uid);
-				free (uid);
-
-				/* FIXME should we convert start/due/complete times? */
-				/* FIXME Error handling */
-				e_cal_create_object (client, e_cal_component_get_icalcomponent (tmp_comp), NULL, NULL);
-
-				g_object_unref (tmp_comp);
-			}
-			subcomp = icalcomponent_get_next_component (
-				vcal_comp, ICAL_ANY_COMPONENT);
-		}
-	}
-	else {
-		comp = e_cal_component_new ();
-		e_cal_component_set_icalcomponent (comp, icalcomp);
-		uid = e_cal_component_gen_uid ();
-		e_cal_component_set_uid (comp, (const char *) uid);
-		free (uid);
-
-		e_cal_create_object (client, e_cal_component_get_icalcomponent (comp), NULL, NULL);
-
-		g_object_unref (comp);
-	}
-
-	e_calendar_table_set_status_message (cal_table, NULL);
-}
-
-/**
- * e_calendar_table_paste_clipboard:
- * @cal_table: A calendar table.
- *
- * Pastes tasks currently in the clipboard into the given calendar table
- */
-void
-e_calendar_table_paste_clipboard (ECalendarTable *cal_table)
-{
-	g_return_if_fail (E_IS_CALENDAR_TABLE (cal_table));
-
-	gtk_clipboard_request_text (gtk_widget_get_clipboard (GTK_WIDGET (cal_table), clipboard_atom),
-				    (GtkClipboardTextReceivedFunc) clipboard_get_text_cb, cal_table);
-}
-
-/* Opens a task in the task editor */
-static void
-open_task (ECalendarTable *cal_table, ECalModelComponent *comp_data, gboolean assign)
-{
-	CompEditor *tedit;
-	const char *uid;
-	
-	uid = icalcomponent_get_uid (comp_data->icalcomp);
-
-	tedit = e_comp_editor_registry_find (comp_editor_registry, uid);
-	if (tedit == NULL) {
-		ECalComponent *comp;
-
-		tedit = COMP_EDITOR (task_editor_new (comp_data->client, assign));
-
-		comp = e_cal_component_new ();
-		e_cal_component_set_icalcomponent (comp, icalcomponent_new_clone (comp_data->icalcomp));
-		comp_editor_edit_comp (tedit, comp);
-		if (assign)
-			task_editor_show_assignment (TASK_EDITOR (tedit));
-		
-		e_comp_editor_registry_add (comp_editor_registry, tedit, FALSE);
-	}
-	
-	comp_editor_focus (tedit);
-}
-
-/* Opens the task in the specified row */
-static void
-open_task_by_row (ECalendarTable *cal_table, int row)
-{
-	ECalModelComponent *comp_data;
-	icalproperty *prop;
-
-	comp_data = e_cal_model_get_component_at (cal_table->model, row);
-	prop = icalcomponent_get_first_property (comp_data->icalcomp, ICAL_ATTENDEE_PROPERTY);
-	open_task (cal_table, comp_data, prop ? TRUE : FALSE);
-}
-
-static void
-e_calendar_table_on_double_click (ETable *table,
-				  gint row, 
-				  gint col,
-				  GdkEvent *event,
-				  ECalendarTable *cal_table)
-{
-	open_task_by_row (cal_table, row);
-}
-
-/* popup menu callbacks */
-
-static void
-e_calendar_table_on_open_task (EPopup *ep, EPopupItem *pitem, void *data)
-{
-	ECalendarTable *cal_table = data;
-	ECalModelComponent *comp_data;
-	icalproperty *prop;
-
-	comp_data = get_selected_comp (cal_table);
-	prop = icalcomponent_get_first_property (comp_data->icalcomp, ICAL_ATTENDEE_PROPERTY);
-	if (comp_data)
-		open_task (cal_table, comp_data, prop ? TRUE : FALSE);
-}
-
-static void
-e_calendar_table_on_save_as (EPopup *ep, EPopupItem *pitem, void *data)
-{
-	ECalendarTable *cal_table = data;
-	ECalModelComponent *comp_data;
-	char *filename;
-	char *ical_string;
-	FILE *file;
-
-	comp_data = get_selected_comp (cal_table);
-	if (comp_data == NULL)
-		return;
-	
-	filename = e_file_dialog_save (_("Save as..."));
-	if (filename == NULL)
-		return;
-	
-	ical_string = e_cal_get_component_as_string (comp_data->client, comp_data->icalcomp);
-	if (ical_string == NULL) {
-		g_warning ("Couldn't convert item to a string");
-		return;
-	}
-	
-	file = fopen (filename, "w");
-	if (file == NULL) {
-		g_warning ("Couldn't save item");
-		return;
-	}
-	
-	fprintf (file, ical_string);
-	g_free (ical_string);
-	fclose (file);
-}
-
-static void
-e_calendar_table_on_print_task (EPopup *ep, EPopupItem *pitem, void *data)
-{
-	ECalendarTable *cal_table = data;
-	ECalModelComponent *comp_data;
-	ECalComponent *comp;
-
-	comp_data = get_selected_comp (cal_table);
-	if (comp_data == NULL)
-		return;
-	
-	comp = e_cal_component_new ();
-	e_cal_component_set_icalcomponent (comp, icalcomponent_new_clone (comp_data->icalcomp));
-	print_comp (comp, comp_data->client, FALSE);
-
-	g_object_unref (comp);
-}
-
-static void
-e_calendar_table_on_cut (EPopup *ep, EPopupItem *pitem, void *data)
-{
-	ECalendarTable *cal_table = data;
-
-	e_calendar_table_cut_clipboard (cal_table);
-}
-
-static void
-e_calendar_table_on_copy (EPopup *ep, EPopupItem *pitem, void *data)
-{
-	ECalendarTable *cal_table = data;
-
-	e_calendar_table_copy_clipboard (cal_table);
-}
-
-static void
-e_calendar_table_on_paste (EPopup *ep, EPopupItem *pitem, void *data)
-{
-	ECalendarTable *cal_table = data;
-
-	e_calendar_table_paste_clipboard (cal_table);
-}
-
-static void
-e_calendar_table_on_assign (EPopup *ep, EPopupItem *pitem, void *data)
-{
-	ECalendarTable *cal_table = data;
-	ECalModelComponent *comp_data;
-
-	comp_data = get_selected_comp (cal_table);
-	if (comp_data)
-		open_task (cal_table, comp_data, TRUE);
-}
-
-static void
-e_calendar_table_on_forward (EPopup *ep, EPopupItem *pitem, void *data)
-{
-	ECalendarTable *cal_table = data;
-	ECalModelComponent *comp_data;
-
-	comp_data = get_selected_comp (cal_table);
-	if (comp_data) {
-		ECalComponent *comp;
-
-		comp = e_cal_component_new ();
-		e_cal_component_set_icalcomponent (comp, icalcomponent_new_clone (comp_data->icalcomp));
-		itip_send_comp (E_CAL_COMPONENT_METHOD_PUBLISH, comp, comp_data->client, NULL, NULL);
-
-		g_object_unref (comp);
-	}
-}
-
-/* Used from e_table_selected_row_foreach() */
-static void
-mark_row_complete_cb (int model_row, gpointer data)
-{
-	ECalendarTable *cal_table;
-
-	cal_table = E_CALENDAR_TABLE (data);
-	e_cal_model_tasks_mark_task_complete (E_CAL_MODEL_TASKS (cal_table->model), model_row);
-}
-
-/* Callback used for the "mark tasks as complete" menu item */
-static void
-mark_as_complete_cb (EPopup *ep, EPopupItem *pitem, void *data)
-{
-	ECalendarTable *cal_table = data;
-	ETable *etable;
-
-	etable = e_table_scrolled_get_table (E_TABLE_SCROLLED (cal_table->etable));
-	e_table_selected_row_foreach (etable, mark_row_complete_cb, cal_table);
-}
-
-/* Opens the URL of the task */
-static void
-open_url_cb (EPopup *ep, EPopupItem *pitem, void *data)
-{
-	ECalendarTable *cal_table = data;
-	ECalModelComponent *comp_data;
-	icalproperty *prop;
-
-	comp_data = get_selected_comp (cal_table);
-	if (!comp_data)
-		return;
-
-	prop = icalcomponent_get_first_property (comp_data->icalcomp, ICAL_URL_PROPERTY);
-	if (!prop)
-		return;
-
-	gnome_url_show (icalproperty_get_url (prop), NULL);
-}
-
-/* Callback for the "delete tasks" menu item */
-static void
-delete_cb (EPopup *ep, EPopupItem *pitem, void *data)
-{
-	ECalendarTable *cal_table = data;
-
-	e_calendar_table_delete_selected (cal_table);
-}
-
-static EPopupItem tasks_popup_items [] = {
-	{ E_POPUP_ITEM, "00.open", N_("_Open"), e_calendar_table_on_open_task, NULL, GTK_STOCK_OPEN, E_CAL_POPUP_SELECT_ONE },
-	{ E_POPUP_ITEM, "05.openweb", N_("Open _Web Page"), open_url_cb, NULL, NULL, E_CAL_POPUP_SELECT_ONE, E_CAL_POPUP_SELECT_HASURL },
-	{ E_POPUP_ITEM, "10.saveas", N_("_Save As..."), e_calendar_table_on_save_as, NULL, GTK_STOCK_SAVE_AS, E_CAL_POPUP_SELECT_ONE },
-	{ E_POPUP_ITEM, "20.print", N_("_Print..."), e_calendar_table_on_print_task, NULL, GTK_STOCK_PRINT, E_CAL_POPUP_SELECT_ONE },
-
-	{ E_POPUP_BAR, "30.bar" },
-	
-	{ E_POPUP_ITEM, "40.cut", N_("C_ut"), e_calendar_table_on_cut, NULL, GTK_STOCK_CUT, 0, E_CAL_POPUP_SELECT_EDITABLE },
-	{ E_POPUP_ITEM, "50.copy", N_("_Copy"), e_calendar_table_on_copy, NULL, GTK_STOCK_COPY, 0, 0 },
-	{ E_POPUP_ITEM, "60.paste", N_("_Paste"), e_calendar_table_on_paste, NULL, GTK_STOCK_PASTE, 0, E_CAL_POPUP_SELECT_EDITABLE },
-
-	{ E_POPUP_BAR, "70.bar" },
-
-	{ E_POPUP_ITEM, "80.assign", N_("_Assign Task"), e_calendar_table_on_assign, NULL, NULL, E_CAL_POPUP_SELECT_ONE, E_CAL_POPUP_SELECT_EDITABLE|E_CAL_POPUP_SELECT_ASSIGNABLE },
-	{ E_POPUP_ITEM, "90.forward", N_("_Forward as iCalendar"), e_calendar_table_on_forward, NULL, "stock_mail-forward", E_CAL_POPUP_SELECT_ONE },
-	{ E_POPUP_ITEM, "a0.markonecomplete", N_("_Mark as Complete"), mark_as_complete_cb, NULL, NULL, E_CAL_POPUP_SELECT_ONE, E_CAL_POPUP_SELECT_EDITABLE },
-	{ E_POPUP_ITEM, "b0.markmanycomplete", N_("_Mark Selected Tasks as Complete"), mark_as_complete_cb, NULL, NULL, E_CAL_POPUP_SELECT_MANY, E_CAL_POPUP_SELECT_EDITABLE },
-
-	{ E_POPUP_BAR, "c0.bar" },
-
-	{ E_POPUP_ITEM, "d0.delete", N_("_Delete"), delete_cb, NULL, GTK_STOCK_DELETE, E_CAL_POPUP_SELECT_ONE, E_CAL_POPUP_SELECT_EDITABLE },
-	{ E_POPUP_ITEM, "e0.deletemany", N_("_Delete Selected Tasks"), delete_cb, NULL, GTK_STOCK_DELETE, E_CAL_POPUP_SELECT_MANY, E_CAL_POPUP_SELECT_EDITABLE },
-};
-
-static void
-ect_popup_free(EPopup *ep, GSList *items, void *data)
-{
-	g_slist_free(items);
-}
-
-static gint
-e_calendar_table_show_popup_menu (ETable *table,
-				  GdkEvent *gdk_event,
-				  ECalendarTable *cal_table)
-{
-	GtkMenu *menu;
-	GSList *selection, *l, *menus = NULL;
-	GPtrArray *events;
-	ECalPopup *ep;
-	ECalPopupTargetSelect *t;
-	int i;
-
-	selection = get_selected_objects (cal_table);
-	if (!selection)
-		return TRUE;
-
-	/** @HookPoint-ECalPopup: Tasks Table Context Menu
-	 * @Id: org.gnome.evolution.tasks.table.popup
-	 * @Class: org.gnome.evolution.calendar.popup:1.0
-	 * @Target: ECalPopupTargetSelect
-	 *
-	 * The context menu on the tasks table.
-	 */
-	ep = e_cal_popup_new("org.gnome.evolution.tasks.table.popup");
-
-	events = g_ptr_array_new();
-	for (l=selection;l;l=g_slist_next(l))
-		g_ptr_array_add(events, e_cal_model_copy_component_data((ECalModelComponent *)l->data));
-	g_slist_free(selection);
-
-	t = e_cal_popup_target_new_select(ep, cal_table->model, events);
-	t->target.widget = (GtkWidget *)cal_table;
-
-	for (i=0;i<sizeof(tasks_popup_items)/sizeof(tasks_popup_items[0]);i++)
-		menus = g_slist_prepend(menus, &tasks_popup_items[i]);
-	e_popup_add_items((EPopup *)ep, menus, NULL, ect_popup_free, cal_table);
-
-	menu = e_popup_create_menu_once((EPopup *)ep, (EPopupTarget *)t, 0);
-
-	gtk_menu_popup(menu, NULL, NULL, NULL, NULL, gdk_event?gdk_event->button.button:0,
-		       gdk_event?gdk_event->button.time:gtk_get_current_event_time());
-
-	return TRUE;
-}
-
-static gint
-e_calendar_table_on_right_click (ETable *table,
-				 gint row,
-				 gint col,
-				 GdkEvent *event,
-				 ECalendarTable *cal_table)
-{
-	return e_calendar_table_show_popup_menu (table, event, cal_table);
-}
-
-static gboolean
-e_calendar_table_on_popup_menu (GtkWidget *widget, gpointer data)
-{
-	ETable *table = E_TABLE(widget);
-	g_return_val_if_fail(table, FALSE);
-
-	return e_calendar_table_show_popup_menu (table, NULL,
-						 E_CALENDAR_TABLE(data));
-}
-
-static gint
-e_calendar_table_on_key_press (ETable *table,
-			       gint row,
-			       gint col,
-			       GdkEventKey *event,
-			       ECalendarTable *cal_table)
-{
-	if (event->keyval == GDK_Delete) {
-		delete_cb (NULL, NULL, cal_table);
-		return TRUE;
-	} else if ((event->keyval == GDK_o)
-		   &&(event->state & GDK_CONTROL_MASK)) {
-		open_task_by_row (cal_table, row);
-		return TRUE;	
-	}
-
-	return FALSE;
-}
-
-/* Loads the state of the table (headers shown etc.) from the given file. */
-void
-e_calendar_table_load_state	(ECalendarTable *cal_table,
-				 gchar		*filename)
-{
-	struct stat st;
-
-	g_return_if_fail (E_IS_CALENDAR_TABLE (cal_table));
-
-	if (stat (filename, &st) == 0 && st.st_size > 0
-	    && S_ISREG (st.st_mode)) {
-		e_table_load_state (e_table_scrolled_get_table (E_TABLE_SCROLLED (cal_table->etable)), filename);
-	}
-}
-
-
-/* Saves the state of the table (headers shown etc.) to the given file. */
-void
-e_calendar_table_save_state (ECalendarTable	*cal_table,
-			     gchar		*filename)
-{
-	g_return_if_fail (E_IS_CALENDAR_TABLE (cal_table));
-
-	e_table_save_state (e_table_scrolled_get_table (E_TABLE_SCROLLED (cal_table->etable)),
-			    filename);
-}
-
-/* Returns the current time, for the ECellDateEdit items.
-   FIXME: Should probably use the timezone of the item rather than the
-   current timezone, though that may be difficult to get from here. */
-static struct tm
-e_calendar_table_get_current_time (ECellDateEdit *ecde, gpointer data)
-{
-	icaltimezone *zone;
-	struct tm tmp_tm = { 0 };
-	struct icaltimetype tt;
-
-	/* Get the current timezone. */
-	zone = calendar_config_get_icaltimezone ();
-
-	tt = icaltime_from_timet_with_zone (time (NULL), FALSE, zone);
-
-	/* Now copy it to the struct tm and return it. */
-	tmp_tm.tm_year  = tt.year - 1900;
-	tmp_tm.tm_mon   = tt.month - 1;
-	tmp_tm.tm_mday  = tt.day;
-	tmp_tm.tm_hour  = tt.hour;
-	tmp_tm.tm_min   = tt.minute;
-	tmp_tm.tm_sec   = tt.second;
-	tmp_tm.tm_isdst = -1;
-
-	return tmp_tm;
-}
-
-
-#ifdef TRANSLATORS_ONLY
-
-static char *test[] = {
-    N_("Click to add a task")
-};
-
-#endif
-
-/* Displays messages on the status bar */
-#define EVOLUTION_TASKS_PROGRESS_IMAGE "stock_todo"
-static GdkPixbuf *progress_icon = NULL;
-
-void
-e_calendar_table_set_activity_handler (ECalendarTable *cal_table, EActivityHandler *activity_handler)
-{
-	g_return_if_fail (E_IS_CALENDAR_TABLE (cal_table));
-
-	cal_table->activity_handler = activity_handler;
-}
-
-void
-e_calendar_table_set_status_message (ECalendarTable *cal_table, const gchar *message)
-{
-        g_return_if_fail (E_IS_CALENDAR_TABLE (cal_table));
-
-	if (!cal_table->activity_handler)
-		return;
-	
-        if (!message || !*message) {
-		if (cal_table->activity_id != 0) {
-			e_activity_handler_operation_finished (cal_table->activity_handler, cal_table->activity_id);
-			cal_table->activity_id = 0;
-		}
-        } else if (cal_table->activity_id == 0) {
-                char *client_id = g_strdup_printf ("%p", cal_table);
-		
-                if (progress_icon == NULL)
-                        progress_icon = e_icon_factory_get_icon (EVOLUTION_TASKS_PROGRESS_IMAGE, E_ICON_SIZE_STATUS);
-
-                cal_table->activity_id = e_activity_handler_operation_started (cal_table->activity_handler, client_id,
-									       progress_icon, message, TRUE);
-
-                g_free (client_id);
-        } else {
-                e_activity_handler_operation_progressing (cal_table->activity_handler, cal_table->activity_id, message, -1.0);
-	}
-}
diff --git a/calendar/gui/e-calendar-table.etspec b/calendar/gui/e-calendar-table.etspec
deleted file mode 100644
index ee8e151b7a..0000000000
--- a/calendar/gui/e-calendar-table.etspec
+++ /dev/null
@@ -1,20 +0,0 @@
-<ETableSpecification click-to-add="true" _click-to-add-message="Click to add a task" draw-grid="true">
-  <ETableColumn model_col= "5" _title="Start date" expansion="2.0" minimum_width="10" resizable="true" cell="dateedit" compare="date-compare" priority="-2"/>
-  <ETableColumn model_col="7" pixbuf="icon" _title="Type" expansion="1.0" minimum_width="16" resizable="false" cell="icon" compare="integer" priority="-4"/>
-  <ETableColumn model_col= "8" _title="Summary" expansion="3.0" minimum_width="10" resizable="true" cell="calstring" compare="string" priority="10"/>
-  <ETableColumn model_col= "10" _title="Completion date" expansion="2.0" minimum_width="10" resizable="true" cell="dateedit" compare="date-compare" priority="-2"/>
-  <ETableColumn model_col="11" pixbuf="complete" _title="Complete" expansion="1.0" minimum_width="16" resizable="false" cell="checkbox" compare="integer" priority="-4"/>
-  <ETableColumn model_col= "12" _title="Due date" expansion="2.0" minimum_width="10" resizable="true" cell="dateedit" compare="date-compare" priority="-2"/>
-  <ETableColumn model_col= "15" _title="% Complete" expansion="1.0" minimum_width="10" resizable="true" cell="percent" compare="percent-compare" priority="-3"/>
-  <ETableColumn model_col= "16" _title="Priority" expansion="1.0" minimum_width="10" resizable="true" cell="priority" compare="priority-compare" priority="-3"/>
-  <ETableColumn model_col="17" _title="Status" expansion="1.0" minimum_width="10" resizable="true" cell="calstatus" compare="string" priority="-1"/>
-  <ETableColumn model_col="19" _title="Task sort" cell="task-sort" compare="task-sort" priority="-4"/>
-  <ETableColumn model_col="0" _title="Categories" cell="calstring" compare="string" expansion="1.0" minimum_width="10" resizable="true" priority="-2"/>
-
-  <ETableState>
-    <column source="1"/>
-    <column source="4"/>
-    <column source= "2"/>
-    <grouping></grouping>
-  </ETableState>
-</ETableSpecification>
diff --git a/calendar/gui/e-calendar-table.h b/calendar/gui/e-calendar-table.h
deleted file mode 100644
index 48af37831a..0000000000
--- a/calendar/gui/e-calendar-table.h
+++ /dev/null
@@ -1,109 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-
-/* 
- * Author : 
- *  Damon Chaplin <damon@ximian.com>
- *
- * Copyright 2000, Ximian, Inc.
- * Copyright 2000, Ximian, Inc.
- *
- * This program is free software; you can redistribute it and/or 
- * modify it under the terms of version 2 of the GNU General Public 
- * License as published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
- * USA
- */
-#ifndef _E_CALENDAR_TABLE_H_
-#define _E_CALENDAR_TABLE_H_
-
-#include <gtk/gtktable.h>
-#include <gal/e-table/e-table-scrolled.h>
-#include <widgets/misc/e-cell-date-edit.h>
-#include "e-activity-handler.h"
-#include "e-cal-model.h"
-
-G_BEGIN_DECLS
-
-/*
- * ECalendarTable - displays the iCalendar objects in a table (an ETable).
- * Used for calendar events and tasks.
- */
-
-
-#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;
-
-	/* The model that we use */
-	ECalModel *model;
-
-	GtkWidget *etable;
-
-	/* The ECell used to view & edit dates. */
-	ECellDateEdit *dates_cell;
-
-	/* Fields used for cut/copy/paste */
-	icalcomponent *tmp_vcal;
-
-	/* Activity ID for the EActivityHandler (i.e. the status bar).  */
-	EActivityHandler *activity_handler;
-	guint activity_id;
-};
-
-struct _ECalendarTableClass {
-	GtkTableClass parent_class;
-
-	/* Notification signals */
-	void (* user_created) (ECalendarTable *cal_table);
-};
-
-
-GtkType	   e_calendar_table_get_type (void);
-GtkWidget* e_calendar_table_new	(void);
-
-ECalModel *e_calendar_table_get_model (ECalendarTable *cal_table);
-
-ETable    *e_calendar_table_get_table (ECalendarTable *cal_table);
-
-void       e_calendar_table_open_selected (ECalendarTable *cal_table);
-void       e_calendar_table_complete_selected (ECalendarTable *cal_table);
-void       e_calendar_table_delete_selected (ECalendarTable *cal_table);
-
-GSList    *e_calendar_table_get_selected (ECalendarTable *cal_table);
-
-/* Clipboard related functions */
-void       e_calendar_table_cut_clipboard       (ECalendarTable *cal_table);
-void       e_calendar_table_copy_clipboard      (ECalendarTable *cal_table);
-void       e_calendar_table_paste_clipboard     (ECalendarTable *cal_table);
-
-/* These load and save the state of the table (headers shown etc.) to/from
-   the given file. */
-void	   e_calendar_table_load_state		(ECalendarTable *cal_table,
-						 gchar		*filename);
-void	   e_calendar_table_save_state		(ECalendarTable *cal_table,
-						 gchar		*filename);
-
-void       e_calendar_table_set_activity_handler (ECalendarTable *cal_table,
-						  EActivityHandler *activity_handler);
-void       e_calendar_table_set_status_message (ECalendarTable *cal_table,
-						const gchar *message);
-
-G_END_DECLS
-
-#endif /* _E_CALENDAR_TABLE_H_ */
diff --git a/calendar/gui/e-calendar-view.c b/calendar/gui/e-calendar-view.c
deleted file mode 100644
index 4cd6f4ec2b..0000000000
--- a/calendar/gui/e-calendar-view.c
+++ /dev/null
@@ -1,1676 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-
-/* 
- * Author : 
- *  Rodrigo Moya <rodrigo@ximian.com>
- *
- * Copyright 2003, Ximian, Inc.
- *
- * This program is free software; you can redistribute it and/or 
- * modify it under the terms of version 2 of the GNU General Public 
- * License as published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
- * USA
- */
-
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
-
-#include <string.h>
-#include <time.h>
-#include <gtk/gtkimage.h>
-#include <gtk/gtkstock.h>
-#include <gdk/gdkkeysyms.h>
-#include <gtk/gtkbindings.h>
-#include <libgnome/gnome-i18n.h>
-#include <e-util/e-dialog-utils.h>
-#include <e-util/e-icon-factory.h>
-#include "e-calendar-marshal.h"
-#include <libecal/e-cal-time-util.h>
-#include <libecal/e-cal-component.h>
-
-#include "common/authentication.h"
-#include "calendar-commands.h"
-#include "calendar-component.h"
-#include "calendar-config.h"
-#include "comp-util.h"
-#include "e-cal-model-calendar.h"
-#include "e-calendar-view.h"
-#include "e-comp-editor-registry.h"
-#include "itip-utils.h"
-#include "e-pub-utils.h"
-#include "dialogs/delete-comp.h"
-#include "dialogs/delete-error.h"
-#include "dialogs/event-editor.h"
-#include "dialogs/send-comp.h"
-#include "dialogs/cancel-comp.h"
-#include "dialogs/recur-comp.h"
-#include "dialogs/select-source-dialog.h"
-#include "print.h"
-#include "goto.h"
-#include "ea-calendar.h"
-#include "e-cal-popup.h"
-
-/* Used for the status bar messages */
-#define EVOLUTION_CALENDAR_PROGRESS_IMAGE "stock_calendar"
-static GdkPixbuf *progress_icon = NULL;
-
-struct _ECalendarViewPrivate {
-	/* The GnomeCalendar we are associated to */
-	GnomeCalendar *calendar;
-
-	/* The calendar model we are monitoring */
-	ECalModel *model;
-
-	/* Current activity (for the EActivityHandler, i.e. the status bar).  */
-	EActivityHandler *activity_handler;
-	guint activity_id;
-
-	/* The default category */
-	char *default_category;
-};
-
-static void e_calendar_view_get_property (GObject *object, guint property_id, GValue *value, GParamSpec *pspec);
-static void e_calendar_view_set_property (GObject *object, guint property_id, const GValue *value, GParamSpec *pspec);
-static void e_calendar_view_destroy (GtkObject *object);
-
-static GdkAtom clipboard_atom = GDK_NONE;
-extern ECompEditorRegistry *comp_editor_registry;
-
-/* Property IDs */
-enum props {
-	PROP_0,
-	PROP_MODEL,
-};
-
-/* FIXME Why are we emitting these event signals here? Can't the model just be listened to? */
-/* Signal IDs */
-enum {
-	SELECTION_CHANGED,
-	SELECTED_TIME_CHANGED,
-	TIMEZONE_CHANGED,
-	EVENT_CHANGED,
-	EVENT_ADDED,
-	USER_CREATED,
-	OPEN_EVENT,
-	LAST_SIGNAL
-};
-
-static guint e_calendar_view_signals[LAST_SIGNAL] = { 0 };
-
-G_DEFINE_TYPE (ECalendarView, e_calendar_view, GTK_TYPE_TABLE);
-
-static void
-e_calendar_view_set_property (GObject *object, guint property_id, const GValue *value, GParamSpec *pspec)
-{
-	ECalendarView *cal_view;
-	ECalendarViewPrivate *priv;
-
-	cal_view = E_CALENDAR_VIEW (object);
-	priv = cal_view->priv;
-	
-	switch (property_id) {
-	case PROP_MODEL:
-		e_calendar_view_set_model (cal_view, E_CAL_MODEL (g_value_get_object (value)));
-		break;
-	default:
-		G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec);
-		break;
-	}
-}
-
-static void
-e_calendar_view_get_property (GObject *object, guint property_id, GValue *value, GParamSpec *pspec)
-{
-	ECalendarView *cal_view;
-	ECalendarViewPrivate *priv;
-
-	cal_view = E_CALENDAR_VIEW (object);
-	priv = cal_view->priv;
-
-	switch (property_id) {
-	case PROP_MODEL:
-		g_value_set_object (value, e_calendar_view_get_model (cal_view));
-		break;
-	default:
-		G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec);
-		break;
-	}
-}
-
-static void
-e_calendar_view_class_init (ECalendarViewClass *klass)
-{
-	GObjectClass *gobject_class = G_OBJECT_CLASS (klass);
-	GtkObjectClass *object_class = GTK_OBJECT_CLASS (klass);
-
-	GtkBindingSet *binding_set;
-
-	/* Method override */
-	gobject_class->set_property = e_calendar_view_set_property;
-	gobject_class->get_property = e_calendar_view_get_property;
-	object_class->destroy = e_calendar_view_destroy;
-
-	klass->selection_changed = NULL;
- 	klass->selected_time_changed = NULL;
-	klass->event_changed = NULL;
-	klass->event_added = NULL;
-	klass->user_created = NULL;
-
-	klass->get_selected_events = NULL;
-	klass->get_selected_time_range = NULL;
-	klass->set_selected_time_range = NULL;
-	klass->get_visible_time_range = NULL;
-	klass->update_query = NULL;
-	klass->open_event = e_calendar_view_open_event;
-
-	g_object_class_install_property (gobject_class, PROP_MODEL, 
-					 g_param_spec_object ("model", NULL, NULL, E_TYPE_CAL_MODEL,
-							      G_PARAM_READABLE | G_PARAM_WRITABLE));
-
-	/* Create class' signals */
-	e_calendar_view_signals[SELECTION_CHANGED] =
-		g_signal_new ("selection_changed",
-			      G_TYPE_FROM_CLASS (klass),
-			      G_SIGNAL_RUN_LAST,
-			      G_STRUCT_OFFSET (ECalendarViewClass, selection_changed),
-			      NULL, NULL,
-			      g_cclosure_marshal_VOID__VOID,
-			      G_TYPE_NONE, 0);
-	e_calendar_view_signals[SELECTED_TIME_CHANGED] =
-		g_signal_new ("selected_time_changed",
-			      G_TYPE_FROM_CLASS (klass),
-			      G_SIGNAL_RUN_LAST,
-			      G_STRUCT_OFFSET (ECalendarViewClass, selected_time_changed),
-			      NULL, NULL,
-			      g_cclosure_marshal_VOID__VOID,
-			      G_TYPE_NONE, 0);
-	e_calendar_view_signals[TIMEZONE_CHANGED] =
-		g_signal_new ("timezone_changed",
-			      G_TYPE_FROM_CLASS (klass),
-			      G_SIGNAL_RUN_LAST,
-			      G_STRUCT_OFFSET (ECalendarViewClass, timezone_changed),
-			      NULL, NULL,
-			      e_calendar_marshal_VOID__POINTER_POINTER,
-			      G_TYPE_NONE, 2, G_TYPE_POINTER, G_TYPE_POINTER);
-
-	e_calendar_view_signals[EVENT_CHANGED] =
-		g_signal_new ("event_changed",
-			      G_TYPE_FROM_CLASS (object_class),
-			      G_SIGNAL_RUN_FIRST | G_SIGNAL_ACTION,
-			      G_STRUCT_OFFSET (ECalendarViewClass, event_changed),
-			      NULL, NULL,
-			      g_cclosure_marshal_VOID__POINTER,
-			      G_TYPE_NONE, 1,
-			      G_TYPE_POINTER);
-
-	e_calendar_view_signals[EVENT_ADDED] =
-		g_signal_new ("event_added",
-			      G_TYPE_FROM_CLASS (object_class),
-			      G_SIGNAL_RUN_FIRST | G_SIGNAL_ACTION,
-			      G_STRUCT_OFFSET (ECalendarViewClass, event_added),
-			      NULL, NULL,
-			      g_cclosure_marshal_VOID__POINTER,
-			      G_TYPE_NONE, 1,
-			      G_TYPE_POINTER);
-
-	e_calendar_view_signals[USER_CREATED] =
-		g_signal_new ("user_created",
-			      G_TYPE_FROM_CLASS (klass),
-			      G_SIGNAL_RUN_LAST,
-			      G_STRUCT_OFFSET (ECalendarViewClass, user_created),
-			      NULL, NULL,
-			      g_cclosure_marshal_VOID__VOID,
-			      G_TYPE_NONE, 0);
-
-	e_calendar_view_signals[OPEN_EVENT] =
-		g_signal_new ("open_event",
-			      G_TYPE_FROM_CLASS (klass),
-			      G_SIGNAL_RUN_FIRST | G_SIGNAL_ACTION,
-			      G_STRUCT_OFFSET (ECalendarViewClass, open_event),
-			      NULL, NULL,
-			      g_cclosure_marshal_VOID__VOID,
-			      G_TYPE_NONE, 0);
-
-	/* clipboard atom */
-	if (!clipboard_atom)
-		clipboard_atom = gdk_atom_intern ("CLIPBOARD", FALSE);
-
-
-        /*
-         * Key bindings
-         */
-
-	binding_set = gtk_binding_set_by_class (klass);
-
-	gtk_binding_entry_add_signal (binding_set, GDK_o,
-                                      GDK_CONTROL_MASK,
-                                      "open_event", 0);
-       
-	/* init the accessibility support for e_day_view */
- 	e_cal_view_a11y_init ();
-}
-
-
-void
-e_calendar_view_add_event (ECalendarView *cal_view, ECal *client, time_t dtstart, 
-		      icaltimezone *default_zone, icalcomponent *icalcomp, gboolean in_top_canvas) 
-{
-	ECalComponent *comp;
-	struct icaltimetype itime, old_dtstart, old_dtend;
-	time_t tt_start, tt_end, new_dtstart;
-	struct icaldurationtype ic_dur, ic_oneday;
-	char *uid;
-	gint start_offset, end_offset;
-	gboolean all_day_event = FALSE;
-	GnomeCalendarViewType view_type;
-	ECalComponentDateTime dt;
-
-	start_offset = 0;
-	end_offset = 0;
-
-	old_dtstart = icalcomponent_get_dtstart (icalcomp);
-	tt_start = icaltime_as_timet (old_dtstart);
-	old_dtend = icalcomponent_get_dtend (icalcomp);
-	tt_end = icaltime_as_timet (old_dtend);
-	ic_dur = icaldurationtype_from_int (tt_end - tt_start);
-
-	if (icaldurationtype_as_int (ic_dur) > 60*60*24) {
-		/* This is a long event */
-		start_offset = old_dtstart.hour * 60 + old_dtstart.minute;
-		end_offset = old_dtstart.hour * 60 + old_dtend.minute;
-	}
-
-	ic_oneday = icaldurationtype_null_duration ();
-	ic_oneday.days = 1;
-
-	view_type = gnome_calendar_get_view (cal_view->priv->calendar);
-
-	switch (view_type) {
-	case GNOME_CAL_DAY_VIEW:
-	case GNOME_CAL_WORK_WEEK_VIEW:
-		if (start_offset == 0 && end_offset == 0 && in_top_canvas)
-			all_day_event = TRUE;
-		
-		if (all_day_event) {
-			ic_dur = ic_oneday;
-		} else if (icaldurationtype_as_int (ic_dur) >= 60*60*24
-				&& !in_top_canvas) {
-			/* copy & paste from top canvas to main canvas */
-			int time_divisions;
-
-			time_divisions = calendar_config_get_time_divisions ();
-			ic_dur = icaldurationtype_from_int (time_divisions * 60);
-		}
-		break;
-	case GNOME_CAL_WEEK_VIEW:
-	case GNOME_CAL_MONTH_VIEW:
-	case GNOME_CAL_LIST_VIEW:
-		if (old_dtstart.is_date && old_dtend.is_date
-			&& memcmp (&ic_dur, &ic_oneday, sizeof(ic_dur)) == 0)
-			all_day_event = TRUE;
-		break;
-	default:
-		g_assert_not_reached ();
-		return;
-	}
-	
-	if (in_top_canvas)
-		new_dtstart = dtstart + start_offset * 60;
-	else
-		new_dtstart = dtstart;
-
-	itime = icaltime_from_timet_with_zone (new_dtstart, FALSE, default_zone);
-	if (all_day_event)
-		itime.is_date = TRUE;
-	icalcomponent_set_dtstart (icalcomp, itime);
-
-	itime.is_date = FALSE;
-	itime = icaltime_add (itime, ic_dur);
-	if (all_day_event)
-		itime.is_date = TRUE;
-	icalcomponent_set_dtend (icalcomp, itime);
-
-	/* FIXME The new uid stuff can go away once we actually set it in the backend */
-	uid = e_cal_component_gen_uid ();
-	comp = e_cal_component_new ();
-	e_cal_component_set_icalcomponent (
-		comp, icalcomponent_new_clone (icalcomp));
-	e_cal_component_set_uid (comp, uid);
-	g_free (uid);
-
-	/* set the timezone properly */
-	dt.value = &itime;
-	e_cal_component_get_dtstart (comp, &dt);
-	dt.tzid = icaltimezone_get_tzid (default_zone);
-	e_cal_component_set_dtstart (comp, &dt);
-	e_cal_component_get_dtend (comp, &dt);
-	dt.tzid = icaltimezone_get_tzid (default_zone);
-	e_cal_component_set_dtend (comp, &dt);
-	e_cal_component_commit_sequence (comp);
-
-	/* FIXME Error handling */
-	uid = NULL;
-	if (e_cal_create_object (client, e_cal_component_get_icalcomponent (comp), &uid, NULL)) {
-		if (uid) {
-			e_cal_component_set_uid (comp, uid);
-			g_free (uid);
-		}
-
-		if (itip_organizer_is_user (comp, client) &&
-		    send_component_dialog ((GtkWindow *) gtk_widget_get_toplevel (GTK_WIDGET (cal_view)),
-					   client, comp, TRUE)) {
-			itip_send_comp (E_CAL_COMPONENT_METHOD_REQUEST, comp,
-				client, NULL, NULL);
-		}
-	} else {
-		g_message (G_STRLOC ": Could not create the object!");
-	}
-
-	g_object_unref (comp);
-}
-
-static void
-e_calendar_view_init (ECalendarView *cal_view)
-{
-	cal_view->priv = g_new0 (ECalendarViewPrivate, 1);
-
-	cal_view->priv->model = (ECalModel *) e_cal_model_calendar_new ();
-}
-
-static void
-e_calendar_view_destroy (GtkObject *object)
-{
-	ECalendarView *cal_view = (ECalendarView *) object;
-
-	g_return_if_fail (E_IS_CALENDAR_VIEW (cal_view));
-
-	if (cal_view->priv) {
-		if (cal_view->priv->model) {
-			g_signal_handlers_disconnect_matched (cal_view->priv->model,
-							      G_SIGNAL_MATCH_DATA,
-							      0, 0, NULL, NULL, cal_view);
-			g_object_unref (cal_view->priv->model);
-			cal_view->priv->model = NULL;
-		}
-
-		if (cal_view->priv->default_category) {
-			g_free (cal_view->priv->default_category);
-			cal_view->priv->default_category = NULL;
-		}
-
-		g_free (cal_view->priv);
-		cal_view->priv = NULL;
-	}
-
-	if (GTK_OBJECT_CLASS (e_calendar_view_parent_class)->destroy)
-		GTK_OBJECT_CLASS (e_calendar_view_parent_class)->destroy (object);
-}
-
-GnomeCalendar *
-e_calendar_view_get_calendar (ECalendarView *cal_view)
-{
-	g_return_val_if_fail (E_IS_CALENDAR_VIEW (cal_view), NULL);
-
-	return cal_view->priv->calendar;
-}
-
-void
-e_calendar_view_set_calendar (ECalendarView *cal_view, GnomeCalendar *calendar)
-{
-	g_return_if_fail (E_IS_CALENDAR_VIEW (cal_view));
-
-	cal_view->priv->calendar = calendar;
-}
-
-ECalModel *
-e_calendar_view_get_model (ECalendarView *cal_view)
-{
-	g_return_val_if_fail (E_IS_CALENDAR_VIEW (cal_view), NULL);
-
-	return cal_view->priv->model;
-}
-
-void
-e_calendar_view_set_model (ECalendarView *cal_view, ECalModel *model)
-{
-	g_return_if_fail (E_IS_CALENDAR_VIEW (cal_view));
-	g_return_if_fail (E_IS_CAL_MODEL (model));
-
-	if (cal_view->priv->model) {
-		g_signal_handlers_disconnect_matched (cal_view->priv->model, G_SIGNAL_MATCH_DATA,
-						      0, 0, 0, NULL, cal_view);
-		g_object_unref (cal_view->priv->model);
-	}
-
-	cal_view->priv->model = g_object_ref (model);
-	e_calendar_view_update_query (cal_view);
-}
-
-icaltimezone *
-e_calendar_view_get_timezone (ECalendarView *cal_view)
-{
-	g_return_val_if_fail (E_IS_CALENDAR_VIEW (cal_view), NULL);
-	return e_cal_model_get_timezone (cal_view->priv->model);
-}
-
-void
-e_calendar_view_set_timezone (ECalendarView *cal_view, icaltimezone *zone)
-{
-	icaltimezone *old_zone;
-
-	g_return_if_fail (E_IS_CALENDAR_VIEW (cal_view));
-
-	old_zone = e_cal_model_get_timezone (cal_view->priv->model);
-	if (old_zone == zone)
-		return;
-
-	e_cal_model_set_timezone (cal_view->priv->model, zone);
-	g_signal_emit (G_OBJECT (cal_view), e_calendar_view_signals[TIMEZONE_CHANGED], 0,
-		       old_zone, zone);
-}
-
-const char *
-e_calendar_view_get_default_category (ECalendarView *cal_view)
-{
-	g_return_val_if_fail (E_IS_CALENDAR_VIEW (cal_view), NULL);
-	return (const char *) cal_view->priv->default_category;
-}
-
-/**
- * e_calendar_view_set_default_category
- * @cal_view: A calendar view.
- * @category: Default category name or NULL for no category.
- *
- * Sets the default category that will be used when creating new calendar
- * components from the given calendar view.
- */
-void
-e_calendar_view_set_default_category (ECalendarView *cal_view, const char *category)
-{
-	g_return_if_fail (E_IS_CALENDAR_VIEW (cal_view));
-
-	if (cal_view->priv->default_category)
-		g_free (cal_view->priv->default_category);
-
-	cal_view->priv->default_category = g_strdup (category);
-}
-
-/**
- * e_calendar_view_get_use_24_hour_format:
- * @cal_view: A calendar view.
- *
- * Gets whether the view is using 24 hour times or not.
- *
- * Returns: the 24 hour setting.
- */
-gboolean
-e_calendar_view_get_use_24_hour_format (ECalendarView *cal_view)
-{
-	g_return_val_if_fail (E_IS_CALENDAR_VIEW (cal_view), FALSE);
-
-	return e_cal_model_get_use_24_hour_format (cal_view->priv->model);
-}
-
-/**
- * e_calendar_view_set_use_24_hour_format
- * @cal_view: A calendar view.
- * @use_24_hour: Whether to use 24 hour times or not.
- *
- * Sets the 12/24 hour times setting for the given view.
- */
-void
-e_calendar_view_set_use_24_hour_format (ECalendarView *cal_view, gboolean use_24_hour)
-{
-	g_return_if_fail (E_IS_CALENDAR_VIEW (cal_view));
-
-	e_cal_model_set_use_24_hour_format (cal_view->priv->model, use_24_hour);
-}
-
-void
-e_calendar_view_set_activity_handler (ECalendarView *cal_view, EActivityHandler *activity_handler)
-{
-	ECalendarViewPrivate *priv;
-	
-	g_return_if_fail (E_IS_CALENDAR_VIEW (cal_view));
-
-	priv = cal_view->priv;
-
-	priv->activity_handler = activity_handler;
-}
-
-void
-e_calendar_view_set_status_message (ECalendarView *cal_view, const gchar *message)
-{
-	ECalendarViewPrivate *priv;
-	
-	g_return_if_fail (E_IS_CALENDAR_VIEW (cal_view));
-
-	priv = cal_view->priv;
-
-	if (!priv->activity_handler)
-		return;
-	
-	if (!message || !*message) {
-		if (priv->activity_id != 0) {
-			e_activity_handler_operation_finished (priv->activity_handler, priv->activity_id);
-			priv->activity_id = 0;
-		}
-	} else if (priv->activity_id == 0) {
-		char *client_id = g_strdup_printf ("%p", cal_view);
-
-		if (progress_icon == NULL)
-			progress_icon = e_icon_factory_get_icon (EVOLUTION_CALENDAR_PROGRESS_IMAGE, E_ICON_SIZE_STATUS);
-
-		priv->activity_id = e_activity_handler_operation_started (priv->activity_handler, client_id, progress_icon, message, TRUE);
-
-		g_free (client_id);
-	} else {
-		e_activity_handler_operation_progressing (priv->activity_handler, priv->activity_id, message, -1.0);
-	}
-}
-
-GList *
-e_calendar_view_get_selected_events (ECalendarView *cal_view)
-{
-	g_return_val_if_fail (E_IS_CALENDAR_VIEW (cal_view), NULL);
-
-	if (E_CALENDAR_VIEW_CLASS (G_OBJECT_GET_CLASS (cal_view))->get_selected_events)
-		return E_CALENDAR_VIEW_CLASS (G_OBJECT_GET_CLASS (cal_view))->get_selected_events (cal_view);
-
-	return NULL;
-}
-
-gboolean
-e_calendar_view_get_selected_time_range (ECalendarView *cal_view, time_t *start_time, time_t *end_time)
-{
-	g_return_val_if_fail (E_IS_CALENDAR_VIEW (cal_view), FALSE);
-
-	if (E_CALENDAR_VIEW_CLASS (G_OBJECT_GET_CLASS (cal_view))->get_selected_time_range) {
-		return E_CALENDAR_VIEW_CLASS (G_OBJECT_GET_CLASS (cal_view))->get_selected_time_range (
-			cal_view, start_time, end_time);
-	}
-
-	return FALSE;
-}
-
-void
-e_calendar_view_set_selected_time_range (ECalendarView *cal_view, time_t start_time, time_t end_time)
-{
-	g_return_if_fail (E_IS_CALENDAR_VIEW (cal_view));
-
-	if (E_CALENDAR_VIEW_CLASS (G_OBJECT_GET_CLASS (cal_view))->set_selected_time_range) {
-		E_CALENDAR_VIEW_CLASS (G_OBJECT_GET_CLASS (cal_view))->set_selected_time_range (
-			cal_view, start_time, end_time);
-	}
-}
-
-gboolean
-e_calendar_view_get_visible_time_range (ECalendarView *cal_view, time_t *start_time, time_t *end_time)
-{
-	g_return_val_if_fail (E_IS_CALENDAR_VIEW (cal_view), FALSE);
-
-	if (E_CALENDAR_VIEW_CLASS (G_OBJECT_GET_CLASS (cal_view))->get_visible_time_range) {
-		return E_CALENDAR_VIEW_CLASS (G_OBJECT_GET_CLASS (cal_view))->get_visible_time_range (
-			cal_view, start_time, end_time);
-	}
-
-	return FALSE;
-}
-
-void
-e_calendar_view_update_query (ECalendarView *cal_view)
-{
-	g_return_if_fail (E_IS_CALENDAR_VIEW (cal_view));
-
-	if (E_CALENDAR_VIEW_CLASS (G_OBJECT_GET_CLASS (cal_view))->update_query) {
-		E_CALENDAR_VIEW_CLASS (G_OBJECT_GET_CLASS (cal_view))->update_query (cal_view);
-	}
-}
-
-void
-e_calendar_view_cut_clipboard (ECalendarView *cal_view)
-{
-	GList *selected, *l;
-	const char *uid;
-
-	g_return_if_fail (E_IS_CALENDAR_VIEW (cal_view));
-
-	selected = e_calendar_view_get_selected_events (cal_view);
-	if (!selected)
-		return;
-
-	e_calendar_view_set_status_message (cal_view, _("Deleting selected objects"));
-
-	e_calendar_view_copy_clipboard (cal_view);
-	for (l = selected; l != NULL; l = l->next) {
-		ECalComponent *comp;
-		ECalendarViewEvent *event = (ECalendarViewEvent *) l->data;
-		GError *error = NULL;
-		
-		if (!event)
-			continue;
-
-		comp = e_cal_component_new ();
-		e_cal_component_set_icalcomponent (comp, icalcomponent_new_clone (event->comp_data->icalcomp));
-
-		if (itip_organizer_is_user (comp, event->comp_data->client) 
-		    && cancel_component_dialog ((GtkWindow *) gtk_widget_get_toplevel (GTK_WIDGET (cal_view)),
-						event->comp_data->client, comp, TRUE))
-			itip_send_comp (E_CAL_COMPONENT_METHOD_CANCEL, comp,
-					event->comp_data->client, NULL, NULL);
-
-		e_cal_component_get_uid (comp, &uid);
-		e_cal_remove_object (event->comp_data->client, uid, &error);
-		delete_error_dialog (error, E_CAL_COMPONENT_EVENT);
-
-		g_clear_error (&error);
-		
-		g_object_unref (comp);
-	}
-
-	e_calendar_view_set_status_message (cal_view, NULL);
-
-	g_list_free (selected);
-}
-
-void
-e_calendar_view_copy_clipboard (ECalendarView *cal_view)
-{
-	GList *selected, *l;
-	gchar *comp_str;
-	icalcomponent *vcal_comp;
-	icalcomponent *new_icalcomp;
-	ECalendarViewEvent *event;
-
-	g_return_if_fail (E_IS_CALENDAR_VIEW (cal_view));
-
-	selected = e_calendar_view_get_selected_events (cal_view);
-	if (!selected)
-		return;
-
-	/* create top-level VCALENDAR component and add VTIMEZONE's */
-	vcal_comp = e_cal_util_new_top_level ();
-	for (l = selected; l != NULL; l = l->next) {
-		event = (ECalendarViewEvent *) l->data;
-
-		if (event)
-			e_cal_util_add_timezones_from_component (vcal_comp, event->comp_data->icalcomp);
-	}
-
-	for (l = selected; l != NULL; l = l->next) {
-		event = (ECalendarViewEvent *) l->data;
-
-		new_icalcomp = icalcomponent_new_clone (event->comp_data->icalcomp);
-		icalcomponent_add_component (vcal_comp, new_icalcomp);
-	}
-
-	/* copy the VCALENDAR to the clipboard */
-	comp_str = icalcomponent_as_ical_string (vcal_comp);
-	gtk_clipboard_set_text (gtk_widget_get_clipboard (GTK_WIDGET (cal_view), clipboard_atom),
-				(const gchar *) comp_str,
-				g_utf8_strlen (comp_str, -1));
-
-	/* free memory */
-	icalcomponent_free (vcal_comp);
-	g_list_free (selected);
-}
-
-static void
-clipboard_get_text_cb (GtkClipboard *clipboard, const gchar *text, ECalendarView *cal_view)
-{
-	icalcomponent *icalcomp;
-	icalcomponent_kind kind;
-	time_t selected_time_start, selected_time_end;
-	icaltimezone *default_zone;
-	ECal *client;
-	gboolean in_top_canvas;
-
-	g_return_if_fail (E_IS_CALENDAR_VIEW (cal_view));
-
-	if (!text || !*text)
-		return;
-
-	icalcomp = icalparser_parse_string ((const char *) text);
-	if (!icalcomp)
-		return;
-
-	default_zone = calendar_config_get_icaltimezone ();
-	client = e_cal_model_get_default_client (cal_view->priv->model);
-
-	/* check the type of the component */
-	/* FIXME An error dialog if we return? */
-	kind = icalcomponent_isa (icalcomp);
-	if (kind != ICAL_VCALENDAR_COMPONENT && kind != ICAL_VEVENT_COMPONENT)
-		return;
-
-	e_calendar_view_set_status_message (cal_view, _("Updating objects"));
-	e_calendar_view_get_selected_time_range (cal_view, &selected_time_start, &selected_time_end);
-
-	if ((selected_time_end - selected_time_start) == 60 * 60 * 24)
-		in_top_canvas = TRUE;
-	else
-		in_top_canvas = FALSE;
-
-	/* FIXME Timezone handling */
-	if (kind == ICAL_VCALENDAR_COMPONENT) {
-		icalcomponent_kind child_kind;
-		icalcomponent *subcomp;
-
-		subcomp = icalcomponent_get_first_component (icalcomp, ICAL_ANY_COMPONENT);
-		while (subcomp) {
-			child_kind = icalcomponent_isa (subcomp);
-			if (child_kind == ICAL_VEVENT_COMPONENT)
-				e_calendar_view_add_event (cal_view, client, selected_time_start, 
-							   default_zone, subcomp, in_top_canvas);
-			else if (child_kind == ICAL_VTIMEZONE_COMPONENT) {
-				icaltimezone *zone;
-
-				zone = icaltimezone_new ();
-				icaltimezone_set_component (zone, subcomp);
-				e_cal_add_timezone (client, zone, NULL);
-				
-				icaltimezone_free (zone, 1);
-			}
-			
-			subcomp = icalcomponent_get_next_component (
-				icalcomp, ICAL_ANY_COMPONENT);
-		}
-
-		icalcomponent_free (icalcomp);
-
-	} else {
-		e_calendar_view_add_event (cal_view, client, selected_time_start, default_zone, icalcomp, in_top_canvas);
-	}
-
-	e_calendar_view_set_status_message (cal_view, NULL);
-}
-
-void
-e_calendar_view_paste_clipboard (ECalendarView *cal_view)
-{
-	g_return_if_fail (E_IS_CALENDAR_VIEW (cal_view));
-
-	gtk_clipboard_request_text (gtk_widget_get_clipboard (GTK_WIDGET (cal_view), clipboard_atom),
-				    (GtkClipboardTextReceivedFunc) clipboard_get_text_cb, cal_view);
-}
-
-static void
-delete_event (ECalendarView *cal_view, ECalendarViewEvent *event)
-{
-	ECalComponent *comp;
-	ECalComponentVType vtype;
-
-	comp = e_cal_component_new ();
-	e_cal_component_set_icalcomponent (comp, icalcomponent_new_clone (event->comp_data->icalcomp));
-	vtype = e_cal_component_get_vtype (comp);
-
-	if (delete_component_dialog (comp, FALSE, 1, vtype, GTK_WIDGET (cal_view))) {
-		const char *uid;
-		GError *error = NULL;
-		
-		if (itip_organizer_is_user (comp, event->comp_data->client) 
-		    && cancel_component_dialog ((GtkWindow *) gtk_widget_get_toplevel (GTK_WIDGET (cal_view)),
-						event->comp_data->client,
-						comp, TRUE))
-			itip_send_comp (E_CAL_COMPONENT_METHOD_CANCEL, comp,
-					event->comp_data->client, NULL, NULL);
-
-		e_cal_component_get_uid (comp, &uid);
-		if (!uid || !*uid) {
-			g_object_unref (comp);
-			return;
-		}
-
-		e_cal_remove_object (event->comp_data->client, uid, &error);
-		delete_error_dialog (error, E_CAL_COMPONENT_EVENT);
-		g_clear_error (&error);
-	}
-
-	g_object_unref (comp);
-}
-
-void
-e_calendar_view_delete_selected_event (ECalendarView *cal_view)
-{
-	GList *selected;
-	ECalendarViewEvent *event;
-
-	selected = e_calendar_view_get_selected_events (cal_view);
-	if (!selected)
-		return;
-
-	event = (ECalendarViewEvent *) selected->data;
-	if (event)
-		delete_event (cal_view, event);
-
-	g_list_free (selected);
-}
-
-void
-e_calendar_view_delete_selected_events (ECalendarView *cal_view)
-{
-	GList *selected, *l;
-	ECalendarViewEvent *event;
-
-	selected = e_calendar_view_get_selected_events (cal_view);
-	if (!selected)
-		return;
-
-	for (l = selected; l != NULL; l = l->next) {
-		event = (ECalendarViewEvent *) l->data;
-		if (event)
-			delete_event (cal_view, event);
-	}
-
-	g_list_free (selected);
-}
-
-void
-e_calendar_view_delete_selected_occurrence (ECalendarView *cal_view)
-{
-	ECalendarViewEvent *event;
-	GList *selected;
-	const char *uid, *rid = NULL;
-	GError *error = NULL;
-	ECalComponent *comp;
-		
-	selected = e_calendar_view_get_selected_events (cal_view);
-	if (!selected)
-		return;
-
-	event = (ECalendarViewEvent *) selected->data;
-
-	comp = e_cal_component_new ();
-	e_cal_component_set_icalcomponent (comp, icalcomponent_new_clone (event->comp_data->icalcomp));
-	e_cal_component_get_uid (comp, &uid);
-	if (e_cal_component_is_instance (comp))
-		rid = e_cal_component_get_recurid_as_string (comp);
-	else {
-		ECalComponentDateTime dt;
-		icaltimezone *zone;
-
-		if (!e_cal_component_has_recurrences (comp)) {
-			g_object_unref (comp);
-			return;
-		}
-
-		/* get the RECUR-ID from the instance start date */
-		e_cal_component_get_dtstart (comp, &dt);
-		if (e_cal_get_timezone (event->comp_data->client, dt.tzid, &zone, NULL)) {
-			rid = icaltime_as_ical_string (
-				icaltime_from_timet_with_zone (event->comp_data->instance_start, TRUE, zone));
-		} else
-			rid = icaltime_as_ical_string (icaltime_from_timet (event->comp_data->instance_start, TRUE));
-
-		e_cal_component_free_datetime (&dt);
-	}
-
-	if (rid) {
-		if (delete_component_dialog (comp, FALSE, 1, e_cal_component_get_vtype (comp), GTK_WIDGET (cal_view))) {
-
-			if (itip_organizer_is_user (comp, event->comp_data->client)
-			    && cancel_component_dialog ((GtkWindow *) gtk_widget_get_toplevel (GTK_WIDGET (cal_view)),
-							event->comp_data->client,
-							comp, TRUE)) {
-				if (!e_cal_component_is_instance (comp)) {
-					ECalComponentRange range;
-
-					/* set the recurrence ID of the object we send */
-					range.type = E_CAL_COMPONENT_RANGE_SINGLE;
-					e_cal_component_get_dtstart (comp, &range.datetime);
-					range.datetime.value->is_date = 1;
-					e_cal_component_set_recurid (comp, &range);
-
-					e_cal_component_free_datetime (&range.datetime);
-				}
-				itip_send_comp (E_CAL_COMPONENT_METHOD_CANCEL, comp, event->comp_data->client, NULL, NULL);
-			}
-
-			e_cal_remove_object_with_mod (event->comp_data->client, uid, rid, CALOBJ_MOD_THIS, &error);
-			delete_error_dialog (error, E_CAL_COMPONENT_EVENT);
-			g_clear_error (&error);
-		}
-	}
-
-	/* free memory */
-	g_list_free (selected);
-	g_object_unref (comp);
-}
-
-static void
-on_new_appointment (EPopup *ep, EPopupItem *pitem, void *data)
-{
-	ECalendarView *cal_view = data;
-
-	e_calendar_view_new_appointment (cal_view);
-}
-
-static void
-on_new_event (EPopup *ep, EPopupItem *pitem, void *data)
-{
-	ECalendarView *cal_view = data;
-
-	e_calendar_view_new_appointment_full (cal_view, TRUE, FALSE);
-}
-
-static void
-on_new_meeting (EPopup *ep, EPopupItem *pitem, void *data)
-{
-	ECalendarView *cal_view = data;
-
-	e_calendar_view_new_appointment_full (cal_view, FALSE, TRUE);
-}
-
-static void
-on_new_task (EPopup *ep, EPopupItem *pitem, void *data)
-{
-	ECalendarView *cal_view = data;
-
-	gnome_calendar_new_task (cal_view->priv->calendar);
-}
-
-static void
-on_goto_date (EPopup *ep, EPopupItem *pitem, void *data)
-{
-	ECalendarView *cal_view = data;
-
-	goto_dialog (cal_view->priv->calendar);
-}
-
-static void
-on_goto_today (EPopup *ep, EPopupItem *pitem, void *data)
-{
-	ECalendarView *cal_view = data;
-
-	calendar_goto_today (cal_view->priv->calendar);
-}
-
-static void
-on_edit_appointment (EPopup *ep, EPopupItem *pitem, void *data)
-{
-	ECalendarView *cal_view = data;
-	GList *selected;
-
-	selected = e_calendar_view_get_selected_events (cal_view);
-	if (selected) {
-		ECalendarViewEvent *event = (ECalendarViewEvent *) selected->data;
-
-		if (event)
-			e_calendar_view_edit_appointment (cal_view, event->comp_data->client,
-						     event->comp_data->icalcomp, 
-						     icalcomponent_get_first_property(event->comp_data->icalcomp, ICAL_ATTENDEE_PROPERTY));
-
-		g_list_free (selected);
-	}
-}
-
-static void
-on_print (EPopup *ep, EPopupItem *pitem, void *data)
-{
-	ECalendarView *cal_view = data;
-	time_t start, end;
-	GnomeCalendarViewType view_type;
-	PrintView print_view;
-
-	e_calendar_view_get_visible_time_range (cal_view, &start, &end);
-	view_type = gnome_calendar_get_view (cal_view->priv->calendar);
-
-	switch (view_type) {
-	case GNOME_CAL_DAY_VIEW :
-		print_view = PRINT_VIEW_DAY;
-		break;
-
-	case GNOME_CAL_WORK_WEEK_VIEW :
-	case GNOME_CAL_WEEK_VIEW:
-		print_view = PRINT_VIEW_WEEK;
-		break;
-
-	case GNOME_CAL_MONTH_VIEW:
-		print_view = PRINT_VIEW_MONTH;
-		break;
-
-	default:
-		g_assert_not_reached ();
-		return;
-	}
-
-	print_calendar (cal_view->priv->calendar, FALSE, start, print_view);
-}
-
-static void
-on_save_as (EPopup *ep, EPopupItem *pitem, void *data)
-{
-	ECalendarView *cal_view = data;
-	GList *selected;
-	char *filename;
-	char *ical_string;
-	FILE *file;
-	ECalendarViewEvent *event;
-
-	selected = e_calendar_view_get_selected_events (cal_view);
-	if (!selected)
-		return;
-
-	filename = e_file_dialog_save (_("Save as..."));
-	if (filename == NULL)
-		return;
-	
-	event = (ECalendarViewEvent *) selected->data;
-	ical_string = e_cal_get_component_as_string (event->comp_data->client, event->comp_data->icalcomp);
-	if (ical_string == NULL) {
-		g_warning ("Couldn't convert item to a string");
-		return;
-	}
-	
-	file = fopen (filename, "w");
-	if (file == NULL) {
-		g_warning ("Couldn't save item");
-		return;
-	}
-	
-	fprintf (file, ical_string);
-	g_free (ical_string);
-	fclose (file);
-
-	g_list_free (selected);
-}
-
-static void
-on_print_event (EPopup *ep, EPopupItem *pitem, void *data)
-{
-	ECalendarView *cal_view = data;
-	GList *selected;
-	ECalendarViewEvent *event;
-	ECalComponent *comp;
-
-	selected = e_calendar_view_get_selected_events (cal_view);
-	if (!selected)
-		return;
-
-	event = (ECalendarViewEvent *) selected->data;
-
-	comp = e_cal_component_new ();
-	e_cal_component_set_icalcomponent (comp, icalcomponent_new_clone (event->comp_data->icalcomp));
-	print_comp (comp, event->comp_data->client, FALSE);
-
-	g_object_unref (comp);
-	g_list_free (selected);
-}
-
-static void
-transfer_item_to (ECalendarViewEvent *event, ECal *dest_client, gboolean remove_item)
-{
-	const char *uid;
-	char *new_uid;
-	icalcomponent *orig_icalcomp;
-	icalproperty *icalprop;
-	
-	uid = icalcomponent_get_uid (event->comp_data->icalcomp);
-
-	/* put the new object into the destination calendar */
-	if (e_cal_get_object (dest_client, uid, NULL, &orig_icalcomp, NULL)) {
-		icalcomponent_free (orig_icalcomp);
-		
-		
-		if (!e_cal_modify_object (dest_client, event->comp_data->icalcomp, CALOBJ_MOD_ALL, NULL))
-			return;
-	} else {
-		orig_icalcomp = icalcomponent_new_clone (event->comp_data->icalcomp);
-		
-		icalprop = icalproperty_new_x ("1");
-		icalproperty_set_x_name (icalprop, "X-EVOLUTION-MOVE-CALENDAR");
-		icalcomponent_add_property (orig_icalcomp, icalprop);
-
-		if (!remove_item) {
-			/* change the UID to avoid problems with duplicated UIDs */
-			new_uid = e_cal_component_gen_uid ();
-			icalcomponent_set_uid (orig_icalcomp, new_uid);
-
-			g_free (new_uid);
-		}
-
-		new_uid = NULL;
-		if (!e_cal_create_object (dest_client, orig_icalcomp, &new_uid, NULL)) {
-			icalcomponent_free (orig_icalcomp);
-			return;
-		}
-
-		if (new_uid)
-			g_free (new_uid);
-		icalcomponent_free (orig_icalcomp);
-	}
-
-	/* remove the item from the source calendar */
-	if (remove_item)
-		e_cal_remove_object (event->comp_data->client, uid, NULL);
-}
-
-static void
-transfer_selected_items (ECalendarView *cal_view, gboolean remove_item)
-{
-	GList *selected, *l;
-	ESource *destination_source;
-	ECal *dest_client;
-
-	selected = e_calendar_view_get_selected_events (cal_view);
-	if (!selected)
-		return;
-
-	/* prompt the user for destination source */
-	destination_source = select_source_dialog ((GtkWindow *) gtk_widget_get_toplevel (cal_view), E_CAL_SOURCE_TYPE_EVENT);
-	if (!destination_source)
-		return;
-
-	/* open the destination calendar */
-	dest_client = auth_new_cal_from_source (destination_source, E_CAL_SOURCE_TYPE_EVENT);
-	if (!dest_client || !e_cal_open (dest_client, FALSE, NULL)) {
-		if (dest_client)
-			g_object_unref (dest_client);
-		g_object_unref (destination_source);
-		return;
-	}
-
-	/* process all selected events */
-	if (remove_item)
-		e_calendar_view_set_status_message (cal_view, _("Moving items"));
-	else
-		e_calendar_view_set_status_message (cal_view, _("Copying items"));
-
-	for (l = selected; l != NULL; l = l->next)
-		transfer_item_to ((ECalendarViewEvent *) l->data, dest_client, remove_item);
-
-	e_calendar_view_set_status_message (cal_view, NULL);
-
-	/* free memory */
-	g_object_unref (destination_source);
-	g_object_unref (dest_client);
-	g_list_free (selected);
-}
-
-static void
-on_copy_to (EPopup *ep, EPopupItem *pitem, void *data)
-{
-	ECalendarView *cal_view = data;
-
-	transfer_selected_items (cal_view, FALSE);
-}
-
-static void
-on_move_to (EPopup *ep, EPopupItem *pitem, void *data)
-{
-	ECalendarView *cal_view = data;
-
-	transfer_selected_items (cal_view, TRUE);
-}
-
-static void
-on_meeting (EPopup *ep, EPopupItem *pitem, void *data)
-{
-	ECalendarView *cal_view = data;
-	GList *selected;
-
-	selected = e_calendar_view_get_selected_events (cal_view);
-	if (selected) {
-		ECalendarViewEvent *event = (ECalendarViewEvent *) selected->data;
-		e_calendar_view_edit_appointment (cal_view, event->comp_data->client, event->comp_data->icalcomp, TRUE);
-
-		g_list_free (selected);
-	}
-}
-
-static void
-on_forward (EPopup *ep, EPopupItem *pitem, void *data)
-{
-	ECalendarView *cal_view = data;
-	GList *selected;
-
-	selected = e_calendar_view_get_selected_events (cal_view);
-	if (selected) {
-		ECalComponent *comp;
-		ECalendarViewEvent *event = (ECalendarViewEvent *) selected->data;
-
-		comp = e_cal_component_new ();
-		e_cal_component_set_icalcomponent (comp, icalcomponent_new_clone (event->comp_data->icalcomp));
-		itip_send_comp (E_CAL_COMPONENT_METHOD_PUBLISH, comp, event->comp_data->client, NULL, NULL);
-
-		g_list_free (selected);
-		g_object_unref (comp);
-	}
-}
-
-static void
-on_publish (EPopup *ep, EPopupItem *pitem, void *data)
-{
-	e_pub_publish (TRUE);
-}
-
-static void
-on_delete_appointment (EPopup *ep, EPopupItem *pitem, void *data)
-{
-	ECalendarView *cal_view = data;
-
-	e_calendar_view_delete_selected_event (cal_view);
-}
-
-static void
-on_unrecur_appointment (EPopup *ep, EPopupItem *pitem, void *data)
-{
-	ECalendarView *cal_view = data;
-	ECalendarViewEvent *event;
-	ECalComponent *comp, *new_comp;
-	ECalComponentDateTime date;
-	struct icaltimetype itt;
-	GList *selected;
-	ECal *client;
-	char *new_uid;
-
-	selected = e_calendar_view_get_selected_events (cal_view);
-	if (!selected)
-		return;
-
-	event = (ECalendarViewEvent *) selected->data;
-	client = g_object_ref (event->comp_data->client);
-
-	date.value = &itt;
-	date.tzid = NULL;
-
-	/* For the recurring object, we add an exception to get rid of the
-	   instance. */
-
-	comp = e_cal_component_new ();
-	e_cal_component_set_icalcomponent (comp, icalcomponent_new_clone (event->comp_data->icalcomp));
-	e_cal_component_set_recurid (comp, NULL);
-	cal_comp_util_add_exdate (comp, event->comp_data->instance_start, e_calendar_view_get_timezone (cal_view));
-	e_cal_component_commit_sequence (comp);
-
-	/* 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 = e_cal_component_new ();
-	e_cal_component_set_icalcomponent (new_comp, icalcomponent_new_clone (event->comp_data->icalcomp));
-	new_uid = e_cal_component_gen_uid ();
-	e_cal_component_set_uid (new_comp, new_uid);
-	g_free (new_uid);
-	e_cal_component_set_recurid (new_comp, NULL);
-	e_cal_component_set_rdate_list (new_comp, NULL);
-	e_cal_component_set_rrule_list (new_comp, NULL);
-	e_cal_component_set_exdate_list (new_comp, NULL);
-	e_cal_component_set_exrule_list (new_comp, NULL);
-
-	date.value = &itt;
-	date.tzid = icaltimezone_get_tzid (e_calendar_view_get_timezone (cal_view));
-
-	*date.value = icaltime_from_timet_with_zone (event->comp_data->instance_start, FALSE,
-						     e_calendar_view_get_timezone (cal_view));
-	e_cal_component_set_dtstart (new_comp, &date);
-	*date.value = icaltime_from_timet_with_zone (event->comp_data->instance_end, FALSE,
-						     e_calendar_view_get_timezone (cal_view));
-	e_cal_component_set_dtend (new_comp, &date);
-	e_cal_component_commit_sequence (new_comp);
-
-	/* Now update both ECalComponents. Note that we do this last since at
-	 * present the updates happen synchronously so our event may disappear.
-	 */
-	if (!e_cal_modify_object (client, e_cal_component_get_icalcomponent (comp), CALOBJ_MOD_ALL, NULL))
-		g_message ("on_unrecur_appointment(): Could not update the object!");
-
-	g_object_unref (comp);
-
-	if (!e_cal_create_object (client, e_cal_component_get_icalcomponent (new_comp), &new_uid, NULL))
-		g_message ("on_unrecur_appointment(): Could not update the object!");
-	else
-		g_free (new_uid);
-
-	g_object_unref (new_comp);
-	g_object_unref (client);
-	g_list_free (selected);
-}
-
-static void
-on_delete_occurrence (EPopup *ep, EPopupItem *pitem, void *data)
-{
-	ECalendarView *cal_view = data;
-
-	e_calendar_view_delete_selected_occurrence (cal_view);
-}
-
-static void
-on_cut (EPopup *ep, EPopupItem *pitem, void *data)
-{
-	ECalendarView *cal_view = data;
-
-	e_calendar_view_cut_clipboard (cal_view);
-}
-
-static void
-on_copy (EPopup *ep, EPopupItem *pitem, void *data)
-{
-	ECalendarView *cal_view = data;
-
-	e_calendar_view_copy_clipboard (cal_view);
-}
-
-static void
-on_paste (EPopup *ep, EPopupItem *pitem, void *data)
-{
-	ECalendarView *cal_view = data;
-
-	e_calendar_view_paste_clipboard (cal_view);
-}
-
-static EPopupItem ecv_main_items [] = {
-	{ E_POPUP_ITEM, "00.new", N_("New _Appointment..."), on_new_appointment, NULL, "stock_new-appointment", 0, 0 },
-	{ E_POPUP_ITEM, "10.newallday", N_("New All Day _Event"), on_new_event, NULL, "stock_new-24h-appointment", 0, 0},
-	{ E_POPUP_ITEM, "20.meeting", N_("New Meeting"), on_new_meeting, NULL, "stock_new-meeting", 0, 0},
-	{ E_POPUP_ITEM, "30.task", N_("New Task"), on_new_task, NULL, "stock_task", 0, 0},
-
-	{ E_POPUP_BAR, "40."},
-	{ E_POPUP_ITEM, "40.print", N_("_Print..."), on_print, NULL, GTK_STOCK_PRINT, 0, 0 },
-
-	{ E_POPUP_BAR, "50." },
-	{ E_POPUP_ITEM, "50.paste", N_("_Paste"), on_paste, NULL, GTK_STOCK_PASTE, 0, E_CAL_POPUP_SELECT_EDITABLE },
-
-	{ E_POPUP_BAR, "60." },
-	/* FIXME: hook in this somehow */
-	{ E_POPUP_SUBMENU, "60.view", N_("Current View") },
-	
-	{ E_POPUP_ITEM, "61.today", N_("Select _Today"), on_goto_today, NULL, GTK_STOCK_HOME },
-	{ E_POPUP_ITEM, "62.todate", N_("_Select Date..."), on_goto_date, NULL, GTK_STOCK_JUMP_TO },
-
-	{ E_POPUP_BAR, "70." },
-
-	/* TODO: Why is this in a context menu when it applies globally? */
-	{ E_POPUP_ITEM, "70.publish", N_("_Publish Free/Busy Information"), on_publish, },
-};
-
-static EPopupItem ecv_child_items [] = {
-	{ E_POPUP_ITEM, "00.open", N_("_Open"), on_edit_appointment, NULL, GTK_STOCK_OPEN, 0, E_CAL_POPUP_SELECT_NOTEDITING },
-	{ E_POPUP_ITEM, "10.saveas", N_("_Save As..."), on_save_as, NULL, GTK_STOCK_SAVE_AS, 0, E_CAL_POPUP_SELECT_NOTEDITING },
-	{ E_POPUP_ITEM, "20.print", N_("_Print..."), on_print_event, NULL, GTK_STOCK_PRINT, 0, E_CAL_POPUP_SELECT_NOTEDITING },
-
-	{ E_POPUP_BAR, "30." },
-
-	{ E_POPUP_ITEM, "31.cut", N_("C_ut"), on_cut, NULL, GTK_STOCK_CUT, 0, E_CAL_POPUP_SELECT_NOTEDITING|E_CAL_POPUP_SELECT_EDITABLE|E_CAL_POPUP_SELECT_ORGANIZER },
-	{ E_POPUP_ITEM, "32.copy", N_("_Copy"), on_copy, NULL, GTK_STOCK_COPY, 0, E_CAL_POPUP_SELECT_NOTEDITING|E_CAL_POPUP_SELECT_ORGANIZER },
-	{ E_POPUP_ITEM, "33.paste", N_("_Paste"), on_paste, NULL, GTK_STOCK_PASTE, 0, E_CAL_POPUP_SELECT_EDITABLE },
-
-	{ E_POPUP_BAR, "40." },
-
-	{ E_POPUP_ITEM, "41.copyto", N_("Cop_y to Calendar..."), on_copy_to, NULL, NULL, 0, E_CAL_POPUP_SELECT_NOTEDITING },
-	{ E_POPUP_ITEM, "42.moveto", N_("Mo_ve to Calendar..."), on_move_to, NULL, NULL, 0, E_CAL_POPUP_SELECT_NOTEDITING | E_CAL_POPUP_SELECT_EDITABLE },
-	{ E_POPUP_ITEM, "43.schedule", N_("_Schedule Meeting..."), on_meeting, NULL, NULL, 0, E_CAL_POPUP_SELECT_NOTEDITING | E_CAL_POPUP_SELECT_EDITABLE | E_CAL_POPUP_SELECT_NOTMEETING },
-	{ E_POPUP_ITEM, "44.forward", N_("_Forward as iCalendar..."), on_forward, NULL, "stock_mail-forward", 0, E_CAL_POPUP_SELECT_NOTEDITING },
-
-	{ E_POPUP_BAR, "50." },
-
-	{ E_POPUP_ITEM, "51.delete", N_("_Delete"), on_delete_appointment, NULL, GTK_STOCK_DELETE, E_CAL_POPUP_SELECT_NONRECURRING, E_CAL_POPUP_SELECT_NOTEDITING | E_CAL_POPUP_SELECT_EDITABLE },
-	{ E_POPUP_ITEM, "52.move", N_("Make this Occurrence _Movable"), on_unrecur_appointment, NULL, NULL, E_CAL_POPUP_SELECT_RECURRING | E_CAL_POPUP_SELECT_INSTANCE, E_CAL_POPUP_SELECT_NOTEDITING | E_CAL_POPUP_SELECT_EDITABLE },
-	{ E_POPUP_ITEM, "53.delete", N_("Delete this _Occurrence"), on_delete_occurrence, NULL, GTK_STOCK_DELETE, E_CAL_POPUP_SELECT_RECURRING, E_CAL_POPUP_SELECT_NOTEDITING | E_CAL_POPUP_SELECT_EDITABLE },
-	{ E_POPUP_ITEM, "54.delete", N_("Delete _All Occurrences"), on_delete_appointment, NULL, GTK_STOCK_DELETE, E_CAL_POPUP_SELECT_RECURRING, E_CAL_POPUP_SELECT_NOTEDITING | E_CAL_POPUP_SELECT_EDITABLE },
-};
-
-static void
-ecv_popup_free (EPopup *ep, GSList *list, void *data)
-{
-	g_slist_free(list);
-}
-
-GtkMenu *
-e_calendar_view_create_popup_menu (ECalendarView *cal_view)
-{
-	ECalPopup *ep;
-	GSList *menus = NULL;
-	GList *selected, *l;
-	int i;
-	ECalPopupTargetSelect *t;
-	ECalModel *model;
-	GPtrArray *events;
-
-	g_return_val_if_fail (E_IS_CALENDAR_VIEW (cal_view), NULL);
-
-	/* We could do this using a factory on the ECalPopup class,
-	 * that way we would get called implicitly whenever a popup
-	 * menu was created rather than everyone having to call us.
-	 * We could also have a different menu id for each view */
-
-	/** @HookPoint-ECalPopup: Calendar Main View Context Menu
-	 * @Id: org.gnome.evolution.calendar.view.popup
-	 * @Class: org.gnome.evolution.calendar.popup:1.0
-	 * @Target: ECalPopupTargetSelect
-	 *
-	 * The context menu on the main calendar view.  This menu
-	 * applies to all view types.
-	 */
-	ep = e_cal_popup_new("org.gnome.evolution.calendar.view.popup");
-
-	model = e_calendar_view_get_model(cal_view);
-	events = g_ptr_array_new();
-	selected = e_calendar_view_get_selected_events(cal_view);
-	for (l=selected;l;l=g_list_next(l)) {
-		ECalendarViewEvent *event = l->data;
-
-		if (event)
-			g_ptr_array_add(events, e_cal_model_copy_component_data(event->comp_data));
-	}
-	g_list_free(selected);
-
-	t = e_cal_popup_target_new_select(ep, model, events);
-	t->target.widget = (GtkWidget *)cal_view;
-
-	if (t->events->len == 0) {
-		for (i=0;i<sizeof(ecv_main_items)/sizeof(ecv_main_items[0]);i++)
-			menus = g_slist_prepend(menus, &ecv_main_items[i]);
-
-		gnome_calendar_view_popup_factory(cal_view->priv->calendar, (EPopup *)ep, "60.view");
-	} else {
-		for (i=0;i<sizeof(ecv_child_items)/sizeof(ecv_child_items[0]);i++)
-			menus = g_slist_prepend(menus, &ecv_child_items[i]);
-	}
-
-	e_popup_add_items((EPopup *)ep, menus, NULL, ecv_popup_free, cal_view);
-
-	return e_popup_create_menu_once((EPopup *)ep, (EPopupTarget *)t, 0);
-}
-
-void 
-e_calendar_view_open_event (ECalendarView *cal_view)
-{
-	GList *selected;
-
-	selected = e_calendar_view_get_selected_events (cal_view);
-	if (selected) {
-		ECalendarViewEvent *event = (ECalendarViewEvent *) selected->data;
-
-		if (event)
-			e_calendar_view_edit_appointment (cal_view, event->comp_data->client,
-						     event->comp_data->icalcomp, FALSE);
-
-		g_list_free (selected);
-	}
-}
-
-/**
- * e_calendar_view_new_appointment_for
- * @cal_view: A calendar view.
- * @dtstart: A Unix time_t that marks the beginning of the appointment.
- * @dtend: A Unix time_t that marks the end of the appointment.
- * @all_day: If TRUE, the dtstart and dtend are expanded to cover
- * the entire day, and the event is set to TRANSPARENT.
- * @meeting: Whether the appointment is a meeting or not.
- *
- * Opens an event editor dialog for a new appointment.
- */
-void
-e_calendar_view_new_appointment_for (ECalendarView *cal_view,
-				     time_t dtstart, time_t dtend,
-				     gboolean all_day,
-				     gboolean meeting)
-{
-	ECalendarViewPrivate *priv;
-	struct icaltimetype itt;
-	ECalComponentDateTime dt;
-	ECalComponent *comp;
-	icalcomponent *icalcomp;
-	ECalComponentTransparency transparency;
-
-	g_return_if_fail (E_IS_CALENDAR_VIEW (cal_view));
-
-	priv = cal_view->priv;
-
-	dt.value = &itt;
-	if (all_day)
-		dt.tzid = NULL;
-	else
-		dt.tzid = icaltimezone_get_tzid (e_cal_model_get_timezone (cal_view->priv->model));
-
-	icalcomp = e_cal_model_create_component_with_defaults (priv->model);
-	comp = e_cal_component_new ();
-	e_cal_component_set_icalcomponent (comp, icalcomp);
-
-	/* DTSTART, DTEND */
-	itt = icaltime_from_timet_with_zone (dtstart, FALSE, e_cal_model_get_timezone (cal_view->priv->model));
-	if (all_day) {
-		itt.hour = itt.minute = itt.second = 0;
-		itt.is_date = TRUE;
-	}
-	e_cal_component_set_dtstart (comp, &dt);
-
-	itt = icaltime_from_timet_with_zone (dtend, FALSE, e_cal_model_get_timezone (cal_view->priv->model));
-	if (all_day) {
-		/* We round it up to the end of the day, unless it is
-		   already set to midnight */
-		if (itt.hour != 0 || itt.minute != 0 || itt.second != 0) {
-			icaltime_adjust (&itt, 1, 0, 0, 0);
-		}
-		itt.hour = itt.minute = itt.second = 0;
-		itt.is_date = TRUE;
-	}
-	e_cal_component_set_dtend (comp, &dt);
-
-	/* TRANSPARENCY */
-	transparency = all_day ? E_CAL_COMPONENT_TRANSP_TRANSPARENT
-		: E_CAL_COMPONENT_TRANSP_OPAQUE;
-	e_cal_component_set_transparency (comp, transparency);
-
-	/* CATEGORY */
-	e_cal_component_set_categories (comp, priv->default_category);
-
-	/* edit the object */
-	e_cal_component_commit_sequence (comp);
-
-	e_calendar_view_edit_appointment (cal_view,
-				     e_cal_model_get_default_client (priv->model),
-				     icalcomp, meeting);
-
-	g_object_unref (comp);
-}
-
-/**
- * e_calendar_view_new_appointment
- * @cal_view: A calendar view.
- *
- * 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 view.
- */
-void
-e_calendar_view_new_appointment_full (ECalendarView *cal_view, gboolean all_day, gboolean meeting)
-{
-	time_t dtstart, dtend;
-
-	g_return_if_fail (E_IS_CALENDAR_VIEW (cal_view));
-
-	if (!e_calendar_view_get_selected_time_range (cal_view, &dtstart, &dtend)) {
-		dtstart = time (NULL);
-		dtend = dtstart + 3600;
-	}
-	/* FIXME This is a rough hack to make sure "all day" is set for */
-	if ((dtend - dtstart) % (60 * 60 * 24) == 0)
-		all_day = TRUE;
-	
-	e_calendar_view_new_appointment_for (cal_view, dtstart, dtend, all_day, meeting);
-}
-
-void
-e_calendar_view_new_appointment (ECalendarView *cal_view)
-{
-	g_return_if_fail (E_IS_CALENDAR_VIEW (cal_view));
-
-	e_calendar_view_new_appointment_full (cal_view, FALSE, FALSE);
-}
-
-/**
- * e_calendar_view_edit_appointment
- * @cal_view: A calendar view.
- * @client: Calendar client.
- * @icalcomp: The object to be edited.
- * @meeting: Whether the appointment is a meeting or not.
- *
- * Opens an editor window to allow the user to edit the selected
- * object.
- */
-void
-e_calendar_view_edit_appointment (ECalendarView *cal_view,
-			     ECal *client,
-			     icalcomponent *icalcomp,
-			     gboolean meeting)
-{
-	ECalendarViewPrivate *priv;
-	CompEditor *ce;
-	const char *uid;
-	ECalComponent *comp;
-
-	g_return_if_fail (E_IS_CALENDAR_VIEW (cal_view));
-	g_return_if_fail (E_IS_CAL (client));
-	g_return_if_fail (icalcomp != NULL);
-
-	priv = cal_view->priv;
-
-	uid = icalcomponent_get_uid (icalcomp);
-
-	ce = e_comp_editor_registry_find (comp_editor_registry, uid);
-	if (!ce) {
-		EventEditor *ee;
-
-		ee = event_editor_new (client, meeting);
-		ce = COMP_EDITOR (ee);
-
-		comp = e_cal_component_new ();
-		e_cal_component_set_icalcomponent (comp, icalcomponent_new_clone (icalcomp));
-		comp_editor_edit_comp (ce, comp);
-		if (meeting)
-			event_editor_show_meeting (ee);
-
-		e_comp_editor_registry_add (comp_editor_registry, ce, FALSE);
-
-		g_object_unref (comp);
-	}
-
-	comp_editor_focus (ce);
-}
-
-void
-e_calendar_view_modify_and_send (ECalComponent *comp,
-				 ECal *client,
-				 CalObjModType mod,
-				 GtkWindow *toplevel,
-				 gboolean new)
-{
-	if (e_cal_modify_object (client, e_cal_component_get_icalcomponent (comp), mod, NULL)) {
-		if (itip_organizer_is_user (comp, client) &&
-		    send_component_dialog (toplevel, client, comp, new))
-			itip_send_comp (E_CAL_COMPONENT_METHOD_REQUEST, comp, client, NULL, NULL);
-	} else {
-		g_message (G_STRLOC ": Could not update the object!");
-	}
-}
diff --git a/calendar/gui/e-calendar-view.h b/calendar/gui/e-calendar-view.h
deleted file mode 100644
index 8335352976..0000000000
--- a/calendar/gui/e-calendar-view.h
+++ /dev/null
@@ -1,158 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-
-/* 
- * Author : 
- *  Rodrigo Moya <rodrigo@ximian.com>
- *
- * Copyright 2003, Ximian, Inc.
- *
- * This program is free software; you can redistribute it and/or 
- * modify it under the terms of version 2 of the GNU General Public 
- * License as published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
- * USA
- */
-#ifndef _E_CALENDAR_VIEW_H_
-#define _E_CALENDAR_VIEW_H_
-
-#include <libecal/e-cal.h>
-#include <gtk/gtktable.h>
-#include <gtk/gtkwindow.h>
-#include "e-cal-model.h"
-#include "gnome-cal.h"
-
-G_BEGIN_DECLS
-
-/*
- * EView - base widget class for the calendar views.
- */
-
-#define E_TYPE_CALENDAR_VIEW          (e_calendar_view_get_type ())
-#define E_CALENDAR_VIEW(obj)          GTK_CHECK_CAST (obj, e_calendar_view_get_type (), ECalendarView)
-#define E_CALENDAR_VIEW_CLASS(klass)  GTK_CHECK_CLASS_CAST (klass, e_calendar_view_get_type (), ECalendarViewClass)
-#define E_IS_CALENDAR_VIEW(obj)       GTK_CHECK_TYPE (obj, e_calendar_view_get_type ())
-
-typedef enum {
-	E_CALENDAR_VIEW_POS_OUTSIDE,
-	E_CALENDAR_VIEW_POS_NONE,
-	E_CALENDAR_VIEW_POS_EVENT,
-	E_CALENDAR_VIEW_POS_LEFT_EDGE,
-	E_CALENDAR_VIEW_POS_RIGHT_EDGE,
-	E_CALENDAR_VIEW_POS_TOP_EDGE,
-	E_CALENDAR_VIEW_POS_BOTTOM_EDGE
-} ECalendarViewPosition;
-
-typedef enum {
-	E_CAL_VIEW_MOVE_UP,
-	E_CAL_VIEW_MOVE_DOWN,
-	E_CAL_VIEW_MOVE_LEFT,
-	E_CAL_VIEW_MOVE_RIGHT
-} ECalViewMoveDirection;
-
-#define E_CALENDAR_VIEW_EVENT_FIELDS \
-        GnomeCanvasItem *canvas_item; \
-        ECalModelComponent *comp_data; \
-        time_t start; \
-        time_t end; \
-        guint16 start_minute; \
-        guint16 end_minute; \
-        guint different_timezone : 1;
-
-typedef struct {
-	E_CALENDAR_VIEW_EVENT_FIELDS
-} ECalendarViewEvent;
-        
-typedef struct _ECalendarView        ECalendarView;
-typedef struct _ECalendarViewClass   ECalendarViewClass;
-typedef struct _ECalendarViewPrivate ECalendarViewPrivate;
-
-struct _ECalendarView {
-	GtkTable table;
-	ECalendarViewPrivate *priv;
-};
-
-struct _ECalendarViewClass {
-	GtkTableClass parent_class;
-
-	/* Notification signals */
-	void (* selection_changed) (ECalendarView *cal_view);
-	void (* selected_time_changed) (ECalendarView *cal_view);
-	void (* timezone_changed) (ECalendarView *cal_view, icaltimezone *old_zone, icaltimezone *new_zone);
-	void (* event_changed) (ECalendarView *day_view, ECalendarViewEvent *event);
-	void (* event_added) (ECalendarView *day_view, ECalendarViewEvent *event);
-	void (* user_created) (ECalendarView *cal_view);
-
-	/* Virtual methods */
-	GList * (* get_selected_events) (ECalendarView *cal_view); /* a GList of ECalendarViewEvent's */
-	gboolean (* get_selected_time_range) (ECalendarView *cal_view, time_t *start_time, time_t *end_time);
-	void (* set_selected_time_range) (ECalendarView *cal_view, time_t start_time, time_t end_time);
-	gboolean (* get_visible_time_range) (ECalendarView *cal_view, time_t *start_time, time_t *end_time);
-	void (* update_query) (ECalendarView *cal_view);
-	void (* open_event) (ECalendarView *cal_view);
-};
-
-GType          e_calendar_view_get_type (void);
-
-GnomeCalendar *e_calendar_view_get_calendar (ECalendarView *cal_view);
-void           e_calendar_view_set_calendar (ECalendarView *cal_view, GnomeCalendar *calendar);
-ECalModel     *e_calendar_view_get_model (ECalendarView *cal_view);
-void           e_calendar_view_set_model (ECalendarView *cal_view, ECalModel *model);
-icaltimezone  *e_calendar_view_get_timezone (ECalendarView *cal_view);
-void           e_calendar_view_set_timezone (ECalendarView *cal_view, icaltimezone *zone);
-const char    *e_calendar_view_get_default_category (ECalendarView *cal_view);
-void           e_calendar_view_set_default_category (ECalendarView *cal_view, const char *category);
-gboolean       e_calendar_view_get_use_24_hour_format (ECalendarView *view);
-void           e_calendar_view_set_use_24_hour_format (ECalendarView *view, gboolean use_24_hour);
-
-void           e_calendar_view_set_activity_handler (ECalendarView *cal_view, EActivityHandler *activity_handler);
-void           e_calendar_view_set_status_message (ECalendarView *cal_view, const gchar *message);
-
-GList         *e_calendar_view_get_selected_events (ECalendarView *cal_view);
-gboolean       e_calendar_view_get_selected_time_range (ECalendarView *cal_view, time_t *start_time, time_t *end_time);
-void           e_calendar_view_set_selected_time_range (ECalendarView *cal_view, time_t start_time, time_t end_time);
-gboolean       e_calendar_view_get_visible_time_range (ECalendarView *cal_view, time_t *start_time, time_t *end_time);
-void           e_calendar_view_update_query (ECalendarView *cal_view);
-
-void           e_calendar_view_cut_clipboard (ECalendarView *cal_view);
-void           e_calendar_view_copy_clipboard (ECalendarView *cal_view);
-void           e_calendar_view_paste_clipboard (ECalendarView *cal_view);
-void           e_calendar_view_delete_selected_event (ECalendarView *cal_view);
-void           e_calendar_view_delete_selected_events (ECalendarView *cal_view);
-void           e_calendar_view_delete_selected_occurrence (ECalendarView *cal_view);
-
-GtkMenu       *e_calendar_view_create_popup_menu (ECalendarView *cal_view);
-
-void           e_calendar_view_add_event (ECalendarView *cal_view, ECal *client, time_t dtstart, 
-				     icaltimezone *default_zone, icalcomponent *icalcomp, gboolean in_top_canvas);
-void           e_calendar_view_new_appointment_for (ECalendarView *cal_view,
-						    time_t dtstart,
-						    time_t dtend,
-						    gboolean all_day,
-						    gboolean meeting);
-void           e_calendar_view_new_appointment_full (ECalendarView *cal_view,
-						     gboolean all_day,
-						     gboolean meeting);
-void           e_calendar_view_new_appointment (ECalendarView *cal_view);
-void           e_calendar_view_edit_appointment (ECalendarView *cal_view,
-					    ECal *client,
-					    icalcomponent *icalcomp,
-					    gboolean meeting);
-void           e_calendar_view_open_event (ECalendarView *cal_view);
-void           e_calendar_view_modify_and_send (ECalComponent *comp,
-					       ECal *client,
-					       CalObjModType mod,
-					       GtkWindow *toplevel,
-					       gboolean new);
-
-
-G_END_DECLS
-
-#endif
diff --git a/calendar/gui/e-cell-date-edit-config.c b/calendar/gui/e-cell-date-edit-config.c
deleted file mode 100644
index 0af909eb76..0000000000
--- a/calendar/gui/e-cell-date-edit-config.c
+++ /dev/null
@@ -1,328 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-/* 
- * Author : 
- *  JP Rosevear <jpr@ximian.com>
- *
- * Copyright 2003, Ximian, Inc.
- *
- * This program is free software; you can redistribute it and/or 
- * modify it under the terms of version 2 of the GNU General Public 
- * License as published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
- * USA
- */
-
-#include "calendar-config.h"
-#include "e-mini-calendar-config.h"
-#include "e-cell-date-edit-config.h"
-
-struct _ECellDateEditConfigPrivate {
-	ECellDateEdit *cell;
-
-	EMiniCalendarConfig *mini_config;
-	
-	GList *notifications;
-};
-
-/* Property IDs */
-enum props {
-	PROP_0,
-	PROP_CELL,
-};
-
-G_DEFINE_TYPE (ECellDateEditConfig, e_cell_date_edit_config, G_TYPE_OBJECT);
-
-static void
-e_cell_date_edit_config_set_property (GObject *object, guint property_id, const GValue *value, GParamSpec *pspec)
-{
-	ECellDateEditConfig *view_config;
-	ECellDateEditConfigPrivate *priv;
-
-	view_config = E_CELL_DATE_EDIT_CONFIG (object);
-	priv = view_config->priv;
-	
-	switch (property_id) {
-	case PROP_CELL:
-		e_cell_date_edit_config_set_cell (view_config, g_value_get_object (value));
-		break;
-	default:
-		G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec);
-		break;
-	}
-}
-
-static void
-e_cell_date_edit_config_get_property (GObject *object, guint property_id, GValue *value, GParamSpec *pspec)
-{
-	ECellDateEditConfig *view_config;
-	ECellDateEditConfigPrivate *priv;
-
-	view_config = E_CELL_DATE_EDIT_CONFIG (object);
-	priv = view_config->priv;
-	
-	switch (property_id) {
-	case PROP_CELL:
-		g_value_set_object (value, e_cell_date_edit_config_get_cell (view_config));
-		break;
-	default:
-		G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec);
-		break;
-	}
-}
-
-static void
-e_cell_date_edit_config_dispose (GObject *object)
-{
-	ECellDateEditConfig *view_config = E_CELL_DATE_EDIT_CONFIG (object);
-	ECellDateEditConfigPrivate *priv;
-	
-	priv = view_config->priv;
-
-	e_cell_date_edit_config_set_cell (view_config, NULL);
-	
-	if (G_OBJECT_CLASS (e_cell_date_edit_config_parent_class)->dispose)
-		G_OBJECT_CLASS (e_cell_date_edit_config_parent_class)->dispose (object);
-}
-
-static void
-e_cell_date_edit_config_finalize (GObject *object)
-{
-	ECellDateEditConfig *view_config = E_CELL_DATE_EDIT_CONFIG (object);
-	ECellDateEditConfigPrivate *priv;
-	
-	priv = view_config->priv;
-
-	g_free (priv);
-	
-	if (G_OBJECT_CLASS (e_cell_date_edit_config_parent_class)->finalize)
-		G_OBJECT_CLASS (e_cell_date_edit_config_parent_class)->finalize (object);
-}
-
-static void
-e_cell_date_edit_config_class_init (ECellDateEditConfigClass *klass)
-{
-	GObjectClass *gobject_class = G_OBJECT_CLASS (klass);
-	GParamSpec *spec;
-	
-	/* Method override */
-	gobject_class->set_property = e_cell_date_edit_config_set_property;
-	gobject_class->get_property = e_cell_date_edit_config_get_property;
-	gobject_class->dispose = e_cell_date_edit_config_dispose;
-	gobject_class->finalize = e_cell_date_edit_config_finalize;
-
-	spec = g_param_spec_object ("cell", NULL, NULL, e_cell_date_edit_get_type (),
-				    G_PARAM_READABLE | G_PARAM_WRITABLE | G_PARAM_CONSTRUCT);
-	g_object_class_install_property (gobject_class, PROP_CELL, spec);
-}
-
-static void
-e_cell_date_edit_config_init (ECellDateEditConfig *view_config)
-{
-	view_config->priv = g_new0 (ECellDateEditConfigPrivate, 1);
-
-}
-
-ECellDateEditConfig *
-e_cell_date_edit_config_new (ECellDateEdit *cell)
-{
-	ECellDateEditConfig *view_config;
-	
-	view_config = g_object_new (e_cell_date_edit_config_get_type (), "cell", cell, NULL);
-
-	return view_config;
-}
-
-ECellDateEdit *
-e_cell_date_edit_config_get_cell (ECellDateEditConfig *view_config) 
-{
-	ECellDateEditConfigPrivate *priv;
-
-	g_return_val_if_fail (view_config != NULL, NULL);
-	g_return_val_if_fail (E_IS_CELL_DATE_EDIT_CONFIG (view_config), NULL);
-
-	priv = view_config->priv;
-	
-	return priv->cell;
-}
-
-static void
-set_timezone (ECellDateEdit *cell) 
-{
-	ECellDateEditText *cell_text;
-	ECellPopup *cell_popup;
-	icaltimezone *zone;
-	
-	zone = calendar_config_get_icaltimezone ();
-
-	cell_popup = E_CELL_POPUP (cell);
-	cell_text = E_CELL_DATE_EDIT_TEXT (cell_popup->child);
-	e_cell_date_edit_text_set_timezone (cell_text, zone);
-}
-
-static void
-timezone_changed_cb (GConfClient *client, guint id, GConfEntry *entry, gpointer data)
-{
-	ECellDateEditConfig *view_config = data;
-	ECellDateEditConfigPrivate *priv;
-	
-	priv = view_config->priv;
-	
-	set_timezone (priv->cell);
-}
-
-static void
-set_twentyfour_hour (ECellDateEdit *cell) 
-{
-	ECellDateEditText *cell_text;
-	ECellPopup *cell_popup;
-	gboolean use_24_hour;
-
-	use_24_hour = calendar_config_get_24_hour_format ();
-
-	e_cell_date_edit_freeze (cell);
-	g_object_set (G_OBJECT (cell),
-		      "use_24_hour_format", use_24_hour,
-		      NULL);
-	e_cell_date_edit_thaw (cell);
-
-	cell_popup = E_CELL_POPUP (cell);
-	cell_text = E_CELL_DATE_EDIT_TEXT (cell_popup->child);
-	e_cell_date_edit_text_set_use_24_hour_format (cell_text, use_24_hour);
-}
-
-static void
-twentyfour_hour_changed_cb (GConfClient *client, guint id, GConfEntry *entry, gpointer data)
-{
-	ECellDateEditConfig *view_config = data;
-	ECellDateEditConfigPrivate *priv;
-	
-	priv = view_config->priv;
-	
-	set_twentyfour_hour (priv->cell);
-}
-
-static void
-set_range (ECellDateEdit *cell) 
-{
-	int start_hour, end_hour;
-
-	start_hour = calendar_config_get_day_start_hour ();
-	end_hour = calendar_config_get_day_end_hour ();
-
-	/* Round up the end hour. */
-	if (calendar_config_get_day_end_minute () != 0)
-		end_hour++;
-
-	/* Make sure the start hour is ok */
-	if (start_hour > end_hour)
-		start_hour = end_hour;
-
-      /* We use the default 0 - 24 now. */
-#if 0	
-	g_object_set (G_OBJECT (cell),
-		      "lower_hour", start_hour,
-		      "upper_hour", end_hour,
-		      NULL);
-#endif
-}
-
-static void
-day_start_hour_changed_cb (GConfClient *client, guint id, GConfEntry *entry, gpointer data)
-{
-	ECellDateEditConfig *view_config = data;
-	ECellDateEditConfigPrivate *priv;
-	
-	priv = view_config->priv;
-	
-	set_range (priv->cell);
-}
-
-static void
-day_end_hour_changed_cb (GConfClient *client, guint id, GConfEntry *entry, gpointer data)
-{
-	ECellDateEditConfig *view_config = data;
-	ECellDateEditConfigPrivate *priv;
-	
-	priv = view_config->priv;
-	
-	set_range (priv->cell);
-}
-
-static void
-day_end_minute_changed_cb (GConfClient *client, guint id, GConfEntry *entry, gpointer data)
-{
-	ECellDateEditConfig *view_config = data;
-	ECellDateEditConfigPrivate *priv;
-	
-	priv = view_config->priv;
-	
-	set_range (priv->cell);
-}
-
-void
-e_cell_date_edit_config_set_cell (ECellDateEditConfig *view_config, ECellDateEdit *cell) 
-{
-	ECellDateEditConfigPrivate *priv;
-	guint not;
-	GList *l;
-	
-	g_return_if_fail (view_config != NULL);
-	g_return_if_fail (E_IS_CELL_DATE_EDIT_CONFIG (view_config));
-
-	priv = view_config->priv;
-	
-	if (priv->cell) {
-		g_object_unref (priv->cell);
-		priv->cell = NULL;
-	}
-
-	if (priv->mini_config) {
-		g_object_unref (priv->mini_config);
-		priv->mini_config = NULL;
-	}
-	
-	for (l = priv->notifications; l; l = l->next)
-		calendar_config_remove_notification (GPOINTER_TO_UINT (l->data));
-
-	g_list_free (priv->notifications);
-	priv->notifications = NULL;
-
-	/* If the new view is NULL, return right now */
-	if (!cell)
-		return;
-	
-	priv->cell = g_object_ref (cell);
-
-	/* Time zone */
-	set_timezone (cell);
-	
-	not = calendar_config_add_notification_timezone (timezone_changed_cb, view_config);
-	priv->notifications = g_list_prepend (priv->notifications, GUINT_TO_POINTER (not));
-
-	/* 24 Hour format */
-	set_twentyfour_hour (cell);	
-
-	not = calendar_config_add_notification_24_hour_format (twentyfour_hour_changed_cb, view_config);
-	priv->notifications = g_list_prepend (priv->notifications, GUINT_TO_POINTER (not));
-
-	/* Popup time range */
-	set_range (cell);
-
-	not = calendar_config_add_notification_day_start_hour (day_start_hour_changed_cb, view_config);
-	priv->notifications = g_list_prepend (priv->notifications, GUINT_TO_POINTER (not));
-	not = calendar_config_add_notification_day_end_hour (day_end_hour_changed_cb, view_config);
-	priv->notifications = g_list_prepend (priv->notifications, GUINT_TO_POINTER (not));
-	not = calendar_config_add_notification_day_end_minute (day_end_minute_changed_cb, view_config);
-	priv->notifications = g_list_prepend (priv->notifications, GUINT_TO_POINTER (not));
-
-	/* The mini calendar */
-	priv->mini_config = e_mini_calendar_config_new (E_CALENDAR (cell->calendar));	
-}
diff --git a/calendar/gui/e-cell-date-edit-config.h b/calendar/gui/e-cell-date-edit-config.h
deleted file mode 100644
index 889e6440e3..0000000000
--- a/calendar/gui/e-cell-date-edit-config.h
+++ /dev/null
@@ -1,56 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-/* 
- * Author : 
- *  JP Rosevear <jpr@ximian.com>
- *
- * Copyright 2003, Ximian, Inc.
- *
- * This program is free software; you can redistribute it and/or 
- * modify it under the terms of version 2 of the GNU General Public 
- * License as published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
- * USA
- */
-
-#ifndef _E_CELL_DATE_EDIT_CONFIG_H_
-#define _E_CELL_DATE_EDIT_CONFIG_H_
-
-#include <widgets/misc/e-cell-date-edit.h>
-#include "e-cell-date-edit-text.h"
-
-G_BEGIN_DECLS
-
-#define E_CELL_DATE_EDIT_CONFIG(obj)          GTK_CHECK_CAST (obj, e_cell_date_edit_config_get_type (), ECellDateEditConfig)
-#define E_CELL_DATE_EDIT_CONFIG_CLASS(klass)  GTK_CHECK_CLASS_CAST (klass, e_cell_date_edit_config_get_type (), ECellDateEditConfigClass)
-#define E_IS_CELL_DATE_EDIT_CONFIG(obj)       GTK_CHECK_TYPE (obj, e_cell_date_edit_config_get_type ())
-        
-typedef struct _ECellDateEditConfig        ECellDateEditConfig;
-typedef struct _ECellDateEditConfigClass   ECellDateEditConfigClass;
-typedef struct _ECellDateEditConfigPrivate ECellDateEditConfigPrivate;
-
-struct _ECellDateEditConfig {
-	GObject parent;
-
-	ECellDateEditConfigPrivate *priv;
-};
-
-struct _ECellDateEditConfigClass {
-	GObjectClass parent_class;
-};
-
-GType          e_cell_date_edit_config_get_type (void);
-ECellDateEditConfig *e_cell_date_edit_config_new (ECellDateEdit *cell);
-ECellDateEdit *e_cell_date_edit_config_get_cell (ECellDateEditConfig *cell_config);
-void e_cell_date_edit_config_set_cell (ECellDateEditConfig *view_config, ECellDateEdit *cell);
-
-G_END_DECLS
-
-#endif
diff --git a/calendar/gui/e-cell-date-edit-text.c b/calendar/gui/e-cell-date-edit-text.c
deleted file mode 100644
index 635aaf0032..0000000000
--- a/calendar/gui/e-cell-date-edit-text.c
+++ /dev/null
@@ -1,224 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-
-/*
- * Author :
- *  Damon Chaplin <damon@ximian.com>
- *
- * Copyright 2001, Ximian, Inc.
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of version 2 of the GNU General Public
- * License as published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
- * USA
- */
-
-/*
- * ECellDateEditText - a subclass of ECellText used to show and edit the text
- * representation of the date, from a ECalComponentDateTime* model value.
- */
-
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
-
-#include <sys/time.h>
-#include <time.h>
-#include <unistd.h>
-#include <string.h>
-#include <libgnomeui/gnome-messagebox.h>
-#include <libgnomeui/gnome-stock-icons.h> 
-#include <libgnome/gnome-i18n.h>
-#include <gal/util/e-util.h>
-#include <e-util/e-time-utils.h>
-#include <libecal/e-cal-time-util.h>
-
-#include "e-cell-date-edit-text.h"
-
-G_DEFINE_TYPE (ECellDateEditText, e_cell_date_edit_text, E_CELL_TEXT_TYPE);
-
-void
-e_cell_date_edit_text_set_timezone (ECellDateEditText *ecd,
-				    icaltimezone *zone)
-{
-	g_return_if_fail (E_IS_CELL_DATE_EDIT_TEXT (ecd));
-
-	ecd->zone = zone;
-}
-
-
-void
-e_cell_date_edit_text_set_use_24_hour_format (ECellDateEditText *ecd,
-					      gboolean use_24_hour)
-{
-	g_return_if_fail (E_IS_CELL_DATE_EDIT_TEXT (ecd));
-
-	ecd->use_24_hour_format = use_24_hour;
-}
-
-
-static char *
-ecd_get_text (ECellText *cell, ETableModel *model, int col, int row)
-{
-	ECellDateEditText *ecd = E_CELL_DATE_EDIT_TEXT (cell);
-	ECellDateEditValue *dv = e_table_model_value_at (model, col, row);
-	struct tm tmp_tm;
-	char buffer[64];
-
-	if (!dv)
-		return g_strdup ("");
-
-	/* Note that although the property may be in a different
-	   timezone, we convert it to the current timezone to display
-	   it in the table. If the user actually edits the value,
-	   it will be set to the current timezone. See set_value(). */
-	tmp_tm = icaltimetype_to_tm_with_zone (&dv->tt, dv->zone, ecd->zone);
-
-	e_time_format_date_and_time (&tmp_tm, ecd->use_24_hour_format,
-				     !dv->tt.is_date, FALSE,
-				     buffer, sizeof (buffer));
-	return g_strdup (buffer);
-}
-
-
-static void
-ecd_free_text (ECellText *cell, char *text)
-{
-	g_free (text);
-}
-
-
-/* FIXME: We need to set the "transient_for" property for the dialog. */
-static void
-show_date_warning (ECellDateEditText *ecd)
-{
-	GtkWidget *dialog;
-	char buffer[64], message[256], *format;
-	time_t t;
-	struct tm *tmp_tm;
-
-	t = time (NULL);
-	/* We are only using this as an example, so the timezone doesn't
-	   matter. */
-	tmp_tm = localtime (&t);
-
-	if (ecd->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");
-
-	e_utf8_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);
-}
-
-
-static void
-ecd_set_value (ECellText *cell, ETableModel *model, int col, int row,
-	       const char *text)
-{
-	ECellDateEditText *ecd = E_CELL_DATE_EDIT_TEXT (cell);
-	ETimeParseStatus status;
-	struct tm tmp_tm;
-	ECellDateEditValue *value;
-	gboolean is_date = TRUE;
-
-	/* Try to parse just a date first. If the value is only a date, we
-	   use a DATE value. */
-	status = e_time_parse_date (text, &tmp_tm);
-	if (status == E_TIME_PARSE_INVALID) {
-		is_date = FALSE;
-		status = e_time_parse_date_and_time (text, &tmp_tm);
-
-		if (status == E_TIME_PARSE_INVALID) {
-			show_date_warning (ecd);
-			return;
-		}
-	}
-
-	if (status == E_TIME_PARSE_NONE) {
-		value = NULL;
-	} else {
-		ECellDateEditValue dv;
-
-		dv.tt = icaltime_null_time ();
-
-		dv.tt.year   = tmp_tm.tm_year + 1900;
-		dv.tt.month  = tmp_tm.tm_mon + 1;
-		dv.tt.day    = tmp_tm.tm_mday;
-		dv.tt.hour   = tmp_tm.tm_hour;
-		dv.tt.minute = tmp_tm.tm_min;
-		dv.tt.second = tmp_tm.tm_sec;
-		dv.tt.is_date = is_date;
-
-		/* FIXME: We assume it is being set to the current timezone.
-		   Is that OK? */
-		if (is_date) {
-			dv.zone = NULL;
-		} else {
-			dv.zone = ecd->zone;
-		}
-
-		value = &dv;
-	}
-
-	e_table_model_set_value_at (model, col, row, value);
-}
-
-
-static void
-e_cell_date_edit_text_class_init (ECellDateEditTextClass *ecdet)
-{
-	ECellTextClass *ectc = E_CELL_TEXT_CLASS (ecdet);
-
-	ectc->get_text  = ecd_get_text;
-	ectc->free_text = ecd_free_text;
-	ectc->set_value = ecd_set_value;
-}
-
-
-static void
-e_cell_date_edit_text_init (ECellDateEditText *ecd)
-{
-	ecd->zone = icaltimezone_get_utc_timezone ();
-	ecd->use_24_hour_format = TRUE;
-}
-
-
-/**
- * e_cell_date_edit_text_new:
- *
- * Creates a new ECell renderer that can be used to render and edit dates that
- * that come from the model.  The value returned from the model is
- * interpreted as being a ECalComponentDateTime*.
- *
- * Returns: an ECell object that can be used to render dates.
- */
-ECell *
-e_cell_date_edit_text_new (const char *fontname,
-			   GtkJustification justify)
-{
-	ECellDateEditText *ecd = g_object_new (e_cell_date_edit_text_get_type (), NULL);
-
-	e_cell_text_construct (E_CELL_TEXT (ecd), fontname, justify);
-      
-	return (ECell *) ecd;
-}
-
diff --git a/calendar/gui/e-cell-date-edit-text.h b/calendar/gui/e-cell-date-edit-text.h
deleted file mode 100644
index ab00c0b39c..0000000000
--- a/calendar/gui/e-cell-date-edit-text.h
+++ /dev/null
@@ -1,74 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-
-/*
- * Author :
- *  Damon Chaplin <damon@ximian.com>
- *
- * Copyright 2001, Ximian, Inc.
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of version 2 of the GNU General Public
- * License as published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
- * USA
- */
-
-/*
- * ECellDateEditText - a subclass of ECellText used to show and edit the text
- * representation of the date, from a ECalComponentDateTime* model value.
- */
-
-#ifndef _E_CELL_DATE_EDIT_TEXT_H_
-#define _E_CELL_DATE_EDIT_TEXT_H_
-
-#include <libical/ical.h>
-#include <gal/e-table/e-cell-text.h>
-
-G_BEGIN_DECLS
-
-#define E_CELL_DATE_EDIT_TEXT_TYPE        (e_cell_date_edit_text_get_type ())
-#define E_CELL_DATE_EDIT_TEXT(o)          (GTK_CHECK_CAST ((o), E_CELL_DATE_EDIT_TEXT_TYPE, ECellDateEditText))
-#define E_CELL_DATE_EDIT_TEXT_CLASS(k)    (GTK_CHECK_CLASS_CAST((k), E_CELL_DATE_EDIT_TEXT_TYPE, ECellDateEditTextClass))
-#define E_IS_CELL_DATE_EDIT_TEXT(o)       (GTK_CHECK_TYPE ((o), E_CELL_DATE_EDIT_TEXT_TYPE))
-#define E_IS_CELL_DATE_EDIT_TEXT_CLASS(k) (GTK_CHECK_CLASS_TYPE ((k), E_CELL_DATE_EDIT_TEXT_TYPE))
-
-typedef struct _ECellDateEditValue ECellDateEditValue;
-struct _ECellDateEditValue {
-	struct icaltimetype tt;
-	icaltimezone *zone;
-};
-
-typedef struct {
-	ECellText base;
-
-	/* The timezone to display the date in. */
-	icaltimezone *zone;
-
-	/* Whether to display in 24-hour format. */
-	gboolean use_24_hour_format;
-} ECellDateEditText;
-
-typedef struct {
-	ECellTextClass parent_class;
-} ECellDateEditTextClass;
-
-GtkType    e_cell_date_edit_text_get_type (void);
-ECell     *e_cell_date_edit_text_new      (const char *fontname,
-					   GtkJustification justify);
-
-
-void	   e_cell_date_edit_text_set_timezone (ECellDateEditText *ecd,
-					       icaltimezone *zone);
-void	   e_cell_date_edit_text_set_use_24_hour_format (ECellDateEditText *ecd,
-							 gboolean use_24_hour);
-G_END_DECLS
-
-#endif /* _E_CELL_DATE_EDIT_TEXT_H_ */
diff --git a/calendar/gui/e-comp-editor-registry.c b/calendar/gui/e-comp-editor-registry.c
deleted file mode 100644
index 1f679097bd..0000000000
--- a/calendar/gui/e-comp-editor-registry.c
+++ /dev/null
@@ -1,214 +0,0 @@
-/* -*- Mode: C; indent-tabs-mode: t; c-basic-offset: 8; tab-width: 8 -*- */
-/* e-comp-editor-registry.c
- *
- * Copyright (C) 2002  Ximian, Inc.
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of version 2 of the GNU General Public
- * License as published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * General Public License for more details.
- *
- * You should have received a copy of the GNU General Public
- * License along with this program; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
- *
- * Author: JP Rosevear
- */
-
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
-
-#include <gnome.h>
-#include "e-comp-editor-registry.h"
-
-struct _ECompEditorRegistryPrivate {
-	GHashTable *editors;
-};
-
-struct _ECompEditorRegistryData
-{
-	ECompEditorRegistry *registry;
-	CompEditor *editor;
-	char *uid;
-};
-
-typedef struct _ECompEditorRegistryData ECompEditorRegistryData;
-typedef struct _ECompEditorRegistryForeachData ECompEditorRegistryForeachData;
-
-static void editor_destroy_cb (gpointer data, GObject *where_object_was);
-
-G_DEFINE_TYPE (ECompEditorRegistry, e_comp_editor_registry, G_TYPE_OBJECT);
-
-static void
-registry_data_free (gpointer data)
-{
-	ECompEditorRegistryData *rdata = data;
-
-	if (rdata->editor)
-		g_object_weak_unref (G_OBJECT (rdata->editor), editor_destroy_cb, rdata);
-	g_free (rdata->uid);
-	g_free (rdata);
-}
-
-static void
-e_comp_editor_registry_dispose (GObject *obj)
-{
-	ECompEditorRegistry *reg;
-	ECompEditorRegistryPrivate *priv;
-
-	reg = E_COMP_EDITOR_REGISTRY (obj);
-	priv = reg->priv;
-	
-	if (priv->editors) {
-		g_hash_table_destroy (priv->editors);
-		priv->editors = NULL;
-	}
-
-	(* G_OBJECT_CLASS (e_comp_editor_registry_parent_class)->dispose) (obj);
-}
-
-static void
-e_comp_editor_registry_finalize (GObject *obj)
-{
-	ECompEditorRegistry *reg;
-	ECompEditorRegistryPrivate *priv;
-
-	reg = E_COMP_EDITOR_REGISTRY (obj);
-	priv = reg->priv;
-
-	g_free (priv);
-
-	(* G_OBJECT_CLASS (e_comp_editor_registry_parent_class)->finalize) (obj);
-}
-
-static void
-e_comp_editor_registry_class_init (ECompEditorRegistryClass *klass)
-{
-	GObjectClass *object_class;
-
-	object_class = G_OBJECT_CLASS (klass);
-
-	object_class->dispose = e_comp_editor_registry_dispose;
-	object_class->finalize = e_comp_editor_registry_finalize;
-}
-
-static void
-e_comp_editor_registry_init (ECompEditorRegistry *reg)
-{
-	ECompEditorRegistryPrivate *priv;
-
-	priv = g_new0 (ECompEditorRegistryPrivate, 1);
-
-	reg->priv = priv;
-	priv->editors = g_hash_table_new_full (g_str_hash, g_str_equal, g_free, registry_data_free);
-}
-
-GObject *
-e_comp_editor_registry_new (void)
-{
-	return g_object_new (E_TYPE_COMP_EDITOR_REGISTRY, NULL);
-}
-
-void
-e_comp_editor_registry_add (ECompEditorRegistry *reg, CompEditor *editor, gboolean remote)
-{
-	ECompEditorRegistryPrivate *priv;
-	ECompEditorRegistryData *rdata;
-	ECalComponent *comp;
-	const char *uid;
-	
-	g_return_if_fail (reg != NULL);
-	g_return_if_fail (E_IS_COMP_EDITOR_REGISTRY (reg));
-	g_return_if_fail (editor != NULL);
-	g_return_if_fail (IS_COMP_EDITOR (editor));
-
-	priv = reg->priv;
-	
-	comp = comp_editor_get_comp (editor);
-	e_cal_component_get_uid (comp, &uid);
-
-	rdata = g_new0 (ECompEditorRegistryData, 1);
-
-	rdata->registry = reg;
-	rdata->editor = editor;
-	rdata->uid = g_strdup (uid);
-
-	g_hash_table_insert (priv->editors, g_strdup (uid), rdata);
-
-	/* FIXME Need to know when uid on the editor changes (if the component changes locations) */
-	g_object_weak_ref (G_OBJECT (editor), editor_destroy_cb, rdata);
-}
-
-CompEditor *
-e_comp_editor_registry_find (ECompEditorRegistry *reg, const char *uid)
-{
-	ECompEditorRegistryPrivate *priv;
-	ECompEditorRegistryData *rdata;
-	
-	g_return_val_if_fail (reg != NULL, NULL);
-	g_return_val_if_fail (E_IS_COMP_EDITOR_REGISTRY (reg), NULL);
-	g_return_val_if_fail (uid != NULL, NULL);
-
-	priv = reg->priv;
-
-	rdata = g_hash_table_lookup (priv->editors, uid);
-	if (rdata != NULL)
-		return rdata->editor;
-	
-	return NULL;
-}
-
-static gboolean
-foreach_close_cb (gpointer key, gpointer value, gpointer data)
-{
-	ECompEditorRegistryData *rdata;
-
-	rdata = value;
-
-	g_signal_handlers_block_matched (rdata->editor, G_SIGNAL_MATCH_DATA, 0, 0, NULL, NULL, data);
-	
-	comp_editor_focus (rdata->editor);
-	if (!comp_editor_close (rdata->editor)) {
-		g_signal_handlers_unblock_matched (rdata->editor, G_SIGNAL_MATCH_DATA, 0, 0, NULL, NULL, data);
-		return FALSE;
-	}
-	
-	g_free (rdata->uid);
-	g_free (rdata);
-		
-	return TRUE;
-}
-
-gboolean
-e_comp_editor_registry_close_all (ECompEditorRegistry *reg)
-{
-	ECompEditorRegistryPrivate *priv;
-	
-	g_return_val_if_fail (reg != NULL, FALSE);
-	g_return_val_if_fail (E_IS_COMP_EDITOR_REGISTRY (reg), FALSE);
-
-	priv = reg->priv;
-
-	g_hash_table_foreach_remove (priv->editors, foreach_close_cb, reg);
-	if (g_hash_table_size (priv->editors) != 0)
-		return FALSE;
-	
-	return TRUE;
-}
-
-static void
-editor_destroy_cb (gpointer data, GObject *where_object_was) 
-{
-	ECompEditorRegistryData *rdata = data;
-
-	/* We null it out because its dead, so we won't try to weak
-	 * unref it in the hash destroyer */
-	rdata->editor = NULL;
-	g_hash_table_remove (rdata->registry->priv->editors, rdata->uid);
-}
diff --git a/calendar/gui/e-comp-editor-registry.h b/calendar/gui/e-comp-editor-registry.h
deleted file mode 100644
index 6ddf2f34e5..0000000000
--- a/calendar/gui/e-comp-editor-registry.h
+++ /dev/null
@@ -1,74 +0,0 @@
-/* -*- Mode: C; indent-tabs-mode: t; c-basic-offset: 8; tab-width: 8 -*- */
-/* e-comp-editor-registry.h
- *
- * Copyright (C) 2002  Ximian, Inc.
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of version 2 of the GNU General Public
- * License as published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * General Public License for more details.
- *
- * You should have received a copy of the GNU General Public
- * License along with this program; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
- *
- * Author: JP Rosevear
- */
-
-#ifndef _E_COMP_EDITOR_REGISTRY_H_
-#define _E_COMP_EDITOR_REGISTRY_H_
-
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
-
-#include <glib-object.h>
-#include <dialogs/comp-editor.h>
-
-G_BEGIN_DECLS
-
-#define E_TYPE_COMP_EDITOR_REGISTRY            (e_comp_editor_registry_get_type ())
-#define E_COMP_EDITOR_REGISTRY(obj)            (G_TYPE_CHECK_INSTANCE_CAST ((obj), E_TYPE_COMP_EDITOR_REGISTRY, ECompEditorRegistry))
-#define E_COMP_EDITOR_REGISTRY_CLASS(klass)    (G_TYPE_CHECK_CLASS_CAST ((klass), E_TYPE_COMP_EDITOR_REGISTRY, ECompEditorRegistryClass))
-#define E_IS_COMP_EDITOR_REGISTRY(obj)         (G_TYPE_CHECK_INSTANCE_TYPE ((obj), E_TYPE_COMP_EDITOR_REGISTRY))
-#define E_IS_COMP_EDITOR_REGISTRY_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), E_TYPE_COMP_EDITOR_REGISTRY))
-
-
-typedef struct _ECompEditorRegistry        ECompEditorRegistry;
-typedef struct _ECompEditorRegistryPrivate ECompEditorRegistryPrivate;
-typedef struct _ECompEditorRegistryClass   ECompEditorRegistryClass;
-
-struct _ECompEditorRegistry {
-	GObject parent;
-
-	ECompEditorRegistryPrivate *priv;
-};
-
-struct _ECompEditorRegistryClass {
-	GObjectClass parent_class;
-};
-
-typedef void (* ECompEditorRegistryForeachFn) (CompEditor *editor, gpointer data);
-
-
-
-
-GType     e_comp_editor_registry_get_type  (void);
-GObject  *e_comp_editor_registry_new       (void);
-void        e_comp_editor_registry_add       (ECompEditorRegistry *reg,
-					      CompEditor          *editor,
-					      gboolean             remote);
-CompEditor *e_comp_editor_registry_find      (ECompEditorRegistry *reg,
-					      const char          *uid);
-gboolean    e_comp_editor_registry_close_all (ECompEditorRegistry *reg);
-
-G_END_DECLS
-
-#endif /* _E_COMP_EDITOR_REGISTRY_H_ */
-
-
diff --git a/calendar/gui/e-date-edit-config.c b/calendar/gui/e-date-edit-config.c
deleted file mode 100644
index acc61bda61..0000000000
--- a/calendar/gui/e-date-edit-config.c
+++ /dev/null
@@ -1,264 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-/* 
- * Author : 
- *  JP Rosevear <jpr@ximian.com>
- *
- * Copyright 2003, Ximian, Inc.
- *
- * This program is free software; you can redistribute it and/or 
- * modify it under the terms of version 2 of the GNU General Public 
- * License as published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
- * USA
- */
-
-#include "calendar-config.h"
-#include "e-date-edit-config.h"
-
-struct _EDateEditConfigPrivate {
-	EDateEdit *edit;
-
-	GList *notifications;
-};
-
-/* Property IDs */
-enum props {
-	PROP_0,
-	PROP_EDIT,
-};
-
-G_DEFINE_TYPE (EDateEditConfig, e_date_edit_config, G_TYPE_OBJECT);
-
-static void
-e_date_edit_config_set_property (GObject *object, guint property_id, const GValue *value, GParamSpec *pspec)
-{
-	EDateEditConfig *edit_config;
-	EDateEditConfigPrivate *priv;
-
-	edit_config = E_DATE_EDIT_CONFIG (object);
-	priv = edit_config->priv;
-	
-	switch (property_id) {
-	case PROP_EDIT:
-		e_date_edit_config_set_edit (edit_config, g_value_get_object (value));
-		break;
-	default:
-		G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec);
-		break;
-	}
-}
-
-static void
-e_date_edit_config_get_property (GObject *object, guint property_id, GValue *value, GParamSpec *pspec)
-{
-	EDateEditConfig *edit_config;
-	EDateEditConfigPrivate *priv;
-
-	edit_config = E_DATE_EDIT_CONFIG (object);
-	priv = edit_config->priv;
-	
-	switch (property_id) {
-	case PROP_EDIT:
-		g_value_set_object (value, e_date_edit_config_get_edit (edit_config));
-		break;
-	default:
-		G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec);
-		break;
-	}
-}
-
-static void
-e_date_edit_config_dispose (GObject *object)
-{
-	EDateEditConfig *edit_config = E_DATE_EDIT_CONFIG (object);
-	EDateEditConfigPrivate *priv;
-	
-	priv = edit_config->priv;
-
-	e_date_edit_config_set_edit (edit_config, NULL);
-	
-	if (G_OBJECT_CLASS (e_date_edit_config_parent_class)->dispose)
-		G_OBJECT_CLASS (e_date_edit_config_parent_class)->dispose (object);
-}
-
-static void
-e_date_edit_config_finalize (GObject *object)
-{
-	EDateEditConfig *edit_config = E_DATE_EDIT_CONFIG (object);
-	EDateEditConfigPrivate *priv;
-	
-	priv = edit_config->priv;
-
-	g_free (priv);
-	
-	if (G_OBJECT_CLASS (e_date_edit_config_parent_class)->finalize)
-		G_OBJECT_CLASS (e_date_edit_config_parent_class)->finalize (object);
-}
-
-static void
-e_date_edit_config_class_init (EDateEditConfigClass *klass)
-{
-	GObjectClass *gobject_class = G_OBJECT_CLASS (klass);
-	GParamSpec *spec;
-	
-	/* Method override */
-	gobject_class->set_property = e_date_edit_config_set_property;
-	gobject_class->get_property = e_date_edit_config_get_property;
-	gobject_class->dispose = e_date_edit_config_dispose;
-	gobject_class->finalize = e_date_edit_config_finalize;
-
-	spec = g_param_spec_object ("edit", NULL, NULL, e_date_edit_get_type (),
-				    G_PARAM_READABLE | G_PARAM_WRITABLE | G_PARAM_CONSTRUCT);
-	g_object_class_install_property (gobject_class, PROP_EDIT, spec);
-}
-
-static void
-e_date_edit_config_init (EDateEditConfig *edit_config)
-{
-	edit_config->priv = g_new0 (EDateEditConfigPrivate, 1);
-
-}
-
-EDateEditConfig *
-e_date_edit_config_new (EDateEdit *date_edit)
-{
-	EDateEditConfig *edit_config;
-	
-	edit_config = g_object_new (e_date_edit_config_get_type (), "edit", date_edit, NULL);
-
-	return edit_config;
-}
-
-EDateEdit *
-e_date_edit_config_get_edit (EDateEditConfig *edit_config) 
-{
-	EDateEditConfigPrivate *priv;
-
-	g_return_val_if_fail (edit_config != NULL, NULL);
-	g_return_val_if_fail (E_IS_DATE_EDIT_CONFIG (edit_config), NULL);
-
-	priv = edit_config->priv;
-	
-	return priv->edit;
-}
-
-static void
-set_week_start (EDateEdit *date_edit) 
-{
-	int week_start_day;	
-
-	week_start_day = calendar_config_get_week_start_day ();
-
-	/* Convert it to 0 (Mon) to 6 (Sun), which is what we use. */
-	week_start_day = (week_start_day + 6) % 7;
-
-	e_date_edit_set_week_start_day (date_edit, week_start_day);
-}
-
-static void
-week_start_changed_cb (GConfClient *client, guint id, GConfEntry *entry, gpointer data)
-{
-	EDateEditConfig *edit_config = data;
-	EDateEditConfigPrivate *priv;
-	
-	priv = edit_config->priv;
-	
-	set_week_start (priv->edit);
-}
-
-static void
-set_twentyfour_hour (EDateEdit *date_edit) 
-{
-	gboolean use_24_hour;
-
-	use_24_hour = calendar_config_get_24_hour_format ();
-
-	e_date_edit_set_use_24_hour_format (date_edit, use_24_hour);
-}
-
-static void
-twentyfour_hour_changed_cb (GConfClient *client, guint id, GConfEntry *entry, gpointer data)
-{
-	EDateEditConfig *edit_config = data;
-	EDateEditConfigPrivate *priv;
-	
-	priv = edit_config->priv;
-	
-	set_twentyfour_hour (priv->edit);
-}
-
-static void
-set_dnav_show_week_no (EDateEdit *date_edit) 
-{
-	gboolean show_week_no;
-
-	show_week_no = calendar_config_get_dnav_show_week_no ();
-
-	e_date_edit_set_show_week_numbers (date_edit, show_week_no);
-}
-
-static void
-dnav_show_week_no_changed_cb (GConfClient *client, guint id, GConfEntry *entry, gpointer data)
-{
-	EDateEditConfig *edit_config = data;
-	EDateEditConfigPrivate *priv;
-	
-	priv = edit_config->priv;
-	
-	set_dnav_show_week_no (priv->edit);
-}
-void
-e_date_edit_config_set_edit (EDateEditConfig *edit_config, EDateEdit *date_edit) 
-{
-	EDateEditConfigPrivate *priv;
-	guint not;
-	GList *l;
-	
-	g_return_if_fail (edit_config != NULL);
-	g_return_if_fail (E_IS_DATE_EDIT_CONFIG (edit_config));
-
-	priv = edit_config->priv;
-	
-	if (priv->edit) {
-		g_object_unref (priv->edit);
-		priv->edit = NULL;
-	}
-	
-	for (l = priv->notifications; l; l = l->next)
-		calendar_config_remove_notification (GPOINTER_TO_UINT (l->data));
-
-	g_list_free (priv->notifications);
-	priv->notifications = NULL;
-
-	/* If the new edit is NULL, return right now */
-	if (!date_edit)
-		return;
-	
-	priv->edit = g_object_ref (date_edit);
-
-	/* Week start */
-	set_week_start (date_edit);	
-
-	not = calendar_config_add_notification_week_start_day (week_start_changed_cb, edit_config);
-	priv->notifications = g_list_prepend (priv->notifications, GUINT_TO_POINTER (not));
-
-	/* 24 Hour format */
-	set_twentyfour_hour (date_edit);	
-
-	not = calendar_config_add_notification_24_hour_format (twentyfour_hour_changed_cb, edit_config);
-	priv->notifications = g_list_prepend (priv->notifications, GUINT_TO_POINTER (not));
-
-	/* Show week numbers */
-	set_dnav_show_week_no (date_edit);
-
-	not = calendar_config_add_notification_dnav_show_week_no (dnav_show_week_no_changed_cb, edit_config);
-	priv->notifications = g_list_prepend (priv->notifications, GUINT_TO_POINTER (not));
-}
diff --git a/calendar/gui/e-date-edit-config.h b/calendar/gui/e-date-edit-config.h
deleted file mode 100644
index 0707666bff..0000000000
--- a/calendar/gui/e-date-edit-config.h
+++ /dev/null
@@ -1,55 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-/* 
- * Author : 
- *  JP Rosevear <jpr@ximian.com>
- *
- * Copyright 2003, Ximian, Inc.
- *
- * This program is free software; you can redistribute it and/or 
- * modify it under the terms of version 2 of the GNU General Public 
- * License as published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
- * USA
- */
-
-#ifndef _E_DATE_EDIT_CONFIG_H_
-#define _E_DATE_EDIT_CONFIG_H_
-
-#include <widgets/misc/e-dateedit.h>
-
-G_BEGIN_DECLS
-
-#define E_DATE_EDIT_CONFIG(obj)          GTK_CHECK_CAST (obj, e_date_edit_config_get_type (), EDateEditConfig)
-#define E_DATE_EDIT_CONFIG_CLASS(klass)  GTK_CHECK_CLASS_CAST (klass, e_date_edit_config_get_type (), EDateEditConfigClass)
-#define E_IS_DATE_EDIT_CONFIG(obj)       GTK_CHECK_TYPE (obj, e_date_edit_config_get_type ())
-        
-typedef struct _EDateEditConfig        EDateEditConfig;
-typedef struct _EDateEditConfigClass   EDateEditConfigClass;
-typedef struct _EDateEditConfigPrivate EDateEditConfigPrivate;
-
-struct _EDateEditConfig {
-	GObject parent;
-
-	EDateEditConfigPrivate *priv;
-};
-
-struct _EDateEditConfigClass {
-	GObjectClass parent_class;
-};
-
-GType          e_date_edit_config_get_type (void);
-EDateEditConfig *e_date_edit_config_new (EDateEdit *date_edit);
-EDateEdit *e_date_edit_config_get_edit (EDateEditConfig *edit_config);
-void e_date_edit_config_set_edit (EDateEditConfig *edit_config, EDateEdit *date_edit);
-
-G_END_DECLS
-
-#endif
diff --git a/calendar/gui/e-date-time-list.c b/calendar/gui/e-date-time-list.c
deleted file mode 100644
index 4ba4a4fcc4..0000000000
--- a/calendar/gui/e-date-time-list.c
+++ /dev/null
@@ -1,563 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-
-/* EDateTimeList - list of calendar dates/times with GtkTreeModel interface.
- *
- * Copyright (C) 2003 Ximian, Inc.
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of version 2 of the GNU General Public
- * License as published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307, USA.
- *
- * Authors:  Hans Petter Jansson  <hpj@ximian.com>
- */
-
-#include <string.h>
-#include <gtk/gtktreemodel.h>
-#include <gtk/gtksignal.h>
-#include <gtk/gtktreednd.h>
-#include <glib.h>
-#include <e-util/e-time-utils.h>
-#include "e-date-time-list.h"
-#include <libecal/e-cal-time-util.h>
-#include "calendar-config.h"
-
-#define G_LIST(x)                        ((GList *) x)
-#define E_DATE_TIME_LIST_IS_SORTED(list) (E_DATE_TIME_LIST (list)->sort_column_id != -2)
-#define IS_VALID_ITER(dt_list, iter)     (iter!= NULL && iter->user_data != NULL && \
-                                          dt_list->stamp == iter->stamp)
-
-static GType column_types [E_DATE_TIME_LIST_NUM_COLUMNS];
-
-static void         e_date_time_list_init            (EDateTimeList      *file_list);
-static void         e_date_time_list_class_init      (EDateTimeListClass *class);
-static void         e_date_time_list_tree_model_init (GtkTreeModelIface  *iface);
-static void         e_date_time_list_finalize        (GObject            *object);
-static guint        e_date_time_list_get_flags       (GtkTreeModel       *tree_model);
-static gint         e_date_time_list_get_n_columns   (GtkTreeModel       *tree_model);
-static GType        e_date_time_list_get_column_type (GtkTreeModel       *tree_model,
-						      gint                index);
-static gboolean     e_date_time_list_get_iter        (GtkTreeModel       *tree_model,
-						      GtkTreeIter        *iter,
-						      GtkTreePath        *path);
-static GtkTreePath *e_date_time_list_get_path        (GtkTreeModel       *tree_model,
-						      GtkTreeIter        *iter);
-static void         e_date_time_list_get_value       (GtkTreeModel       *tree_model,
-						      GtkTreeIter        *iter,
-						      gint                column,
-						      GValue             *value);
-static gboolean     e_date_time_list_iter_next       (GtkTreeModel       *tree_model,
-						      GtkTreeIter        *iter);
-static gboolean     e_date_time_list_iter_children   (GtkTreeModel       *tree_model,
-						      GtkTreeIter        *iter,
-						      GtkTreeIter        *parent);
-static gboolean     e_date_time_list_iter_has_child  (GtkTreeModel       *tree_model,
-						      GtkTreeIter        *iter);
-static gint         e_date_time_list_iter_n_children (GtkTreeModel       *tree_model,
-						      GtkTreeIter        *iter);
-static gboolean     e_date_time_list_iter_nth_child  (GtkTreeModel       *tree_model,
-						      GtkTreeIter        *iter,
-						      GtkTreeIter        *parent,
-						      gint                n);
-static gboolean     e_date_time_list_iter_parent     (GtkTreeModel       *tree_model,
-						      GtkTreeIter        *iter,
-						      GtkTreeIter        *child);
-
-static GObjectClass *parent_class = NULL;
-
-GtkType
-e_date_time_list_get_type (void)
-{
-	static GType date_time_list_type = 0;
-
-	if (!date_time_list_type) {
-		static const GTypeInfo date_time_list_info =
-		{
-			sizeof (EDateTimeListClass),
-			NULL,		/* base_init */
-			NULL,		/* base_finalize */
-			(GClassInitFunc) e_date_time_list_class_init,
-			NULL,		/* class_finalize */
-			NULL,		/* class_data */
-			sizeof (EDateTimeList),
-			0,
-			(GInstanceInitFunc) e_date_time_list_init,
-		};
-
-		static const GInterfaceInfo tree_model_info =
-		{
-			(GInterfaceInitFunc) e_date_time_list_tree_model_init,
-			NULL,
-			NULL
-		};
-
-		column_types [E_DATE_TIME_LIST_COLUMN_DESCRIPTION] = G_TYPE_STRING;
-
-		date_time_list_type = g_type_register_static (G_TYPE_OBJECT, "EDateTimeList",
-							      &date_time_list_info, 0);
-		g_type_add_interface_static (date_time_list_type,
-					     GTK_TYPE_TREE_MODEL,
-					     &tree_model_info);
-	}
-
-	return date_time_list_type;
-}
-
-static void
-e_date_time_list_class_init (EDateTimeListClass *class)
-{
-	GObjectClass *object_class;
-
-	parent_class = g_type_class_peek_parent (class);
-	object_class = (GObjectClass*) class;
-
-	object_class->finalize = e_date_time_list_finalize;
-}
-
-static void
-e_date_time_list_tree_model_init (GtkTreeModelIface *iface)
-{
-	iface->get_flags = e_date_time_list_get_flags;
-	iface->get_n_columns = e_date_time_list_get_n_columns;
-	iface->get_column_type = e_date_time_list_get_column_type;
-	iface->get_iter = e_date_time_list_get_iter;
-	iface->get_path = e_date_time_list_get_path;
-	iface->get_value = e_date_time_list_get_value;
-	iface->iter_next = e_date_time_list_iter_next;
-	iface->iter_children = e_date_time_list_iter_children;
-	iface->iter_has_child = e_date_time_list_iter_has_child;
-	iface->iter_n_children = e_date_time_list_iter_n_children;
-	iface->iter_nth_child = e_date_time_list_iter_nth_child;
-	iface->iter_parent = e_date_time_list_iter_parent;
-}
-
-static void
-e_date_time_list_init (EDateTimeList *date_time_list)
-{
-	date_time_list->stamp         = g_random_int ();
-	date_time_list->columns_dirty = FALSE;
-	date_time_list->list          = NULL;
-}
-
-EDateTimeList *
-e_date_time_list_new (void)
-{
-	EDateTimeList *date_time_list;
-
-	date_time_list = E_DATE_TIME_LIST (g_object_new (e_date_time_list_get_type (), NULL));
-
-	return date_time_list;
-}
-
-static void
-all_rows_deleted (EDateTimeList *date_time_list)
-{
-	GtkTreePath *path;
-	gint         i;
-
-	if (!date_time_list->list)
-		return;
-
-	path = gtk_tree_path_new ();
-	i = g_list_length (date_time_list->list);
-	gtk_tree_path_append_index (path, i);
-
-	for ( ; i >= 0; i--) {
-		gtk_tree_model_row_deleted (GTK_TREE_MODEL (date_time_list), path);
-		gtk_tree_path_prev (path);
-	}
-
-	gtk_tree_path_free (path);
-}
-
-static void
-row_deleted (EDateTimeList *date_time_list, gint n)
-{
-	GtkTreePath *path;
-
-	path = gtk_tree_path_new ();
-	gtk_tree_path_append_index (path, n);
-	gtk_tree_model_row_deleted (GTK_TREE_MODEL (date_time_list), path);
-	gtk_tree_path_free (path);
-}
-
-static void
-row_added (EDateTimeList *date_time_list, gint n)
-{
-	GtkTreePath *path;
-	GtkTreeIter  iter;
-
-	path = gtk_tree_path_new ();
-	gtk_tree_path_append_index (path, n);
-
-	if (gtk_tree_model_get_iter (GTK_TREE_MODEL (date_time_list), &iter, path))
-		gtk_tree_model_row_inserted (GTK_TREE_MODEL (date_time_list), path, &iter);
-
-	gtk_tree_path_free (path);
-}
-
-static void
-row_updated (EDateTimeList *date_time_list, gint n)
-{
-	GtkTreePath *path;
-	GtkTreeIter  iter;
-
-	path = gtk_tree_path_new ();
-	gtk_tree_path_append_index (path, n);
-
-	if (gtk_tree_model_get_iter (GTK_TREE_MODEL (date_time_list), &iter, path))
-		gtk_tree_model_row_changed (GTK_TREE_MODEL (date_time_list), path, &iter);
-
-	gtk_tree_path_free (path);
-}
-
-static void
-e_date_time_list_finalize (GObject *object)
-{
-	if (G_OBJECT_CLASS (parent_class)->finalize)
-		(* G_OBJECT_CLASS (parent_class)->finalize) (object);
-}
-
-/* Fulfill the GtkTreeModel requirements */
-static guint
-e_date_time_list_get_flags (GtkTreeModel *tree_model)
-{
-	g_return_val_if_fail (E_IS_DATE_TIME_LIST (tree_model), 0);
-
-	return GTK_TREE_MODEL_LIST_ONLY;
-}
-
-static gint
-e_date_time_list_get_n_columns (GtkTreeModel *tree_model)
-{
-	EDateTimeList *date_time_list = (EDateTimeList *) tree_model;
-
-	g_return_val_if_fail (E_IS_DATE_TIME_LIST (tree_model), 0);
-
-	date_time_list->columns_dirty = TRUE;
-	return E_DATE_TIME_LIST_NUM_COLUMNS;
-}
-
-static GType
-e_date_time_list_get_column_type (GtkTreeModel *tree_model,
-				  gint          index)
-{
-	EDateTimeList *date_time_list = (EDateTimeList *) tree_model;
-
-	g_return_val_if_fail (E_IS_DATE_TIME_LIST (tree_model), G_TYPE_INVALID);
-	g_return_val_if_fail (index < E_DATE_TIME_LIST_NUM_COLUMNS &&
-			      index >= 0, G_TYPE_INVALID);
-
-	date_time_list->columns_dirty = TRUE;
-	return column_types [index];
-}
-
-const ECalComponentDateTime *
-e_date_time_list_get_date_time (EDateTimeList *date_time_list, GtkTreeIter *iter)
-{
-	g_return_val_if_fail (IS_VALID_ITER (date_time_list, iter), NULL);
-
-	return G_LIST (iter->user_data)->data;
-}
-
-static void
-free_datetime (ECalComponentDateTime *datetime)
-{
-	g_free (datetime->value);
-	if (datetime->tzid)
-		g_free ((gchar *) datetime->tzid);
-	g_free (datetime);
-}
-
-static ECalComponentDateTime *
-copy_datetime (const ECalComponentDateTime *datetime)
-{
-	ECalComponentDateTime *datetime_copy;
-
-	datetime_copy = g_new0 (ECalComponentDateTime, 1);
-	datetime_copy->value  = g_new (struct icaltimetype, 1);
-	*datetime_copy->value = *datetime->value;
-
-	if (datetime->tzid)
-		datetime_copy->tzid = g_strdup (datetime->tzid);
-
-	return datetime_copy;
-}
-
-static gint
-compare_datetime (const ECalComponentDateTime *datetime1, const ECalComponentDateTime *datetime2)
-{
-	return icaltime_compare (*datetime1->value, *datetime2->value);
-}
-
-void
-e_date_time_list_set_date_time (EDateTimeList *date_time_list, GtkTreeIter *iter,
-				const ECalComponentDateTime *datetime)
-{
-	ECalComponentDateTime *datetime_old;
-
-	g_return_if_fail (IS_VALID_ITER (date_time_list, iter));
-
-	datetime_old = G_LIST (iter->user_data)->data;
-	free_datetime (datetime_old);
-	G_LIST (iter->user_data)->data = copy_datetime (datetime);
-	row_updated (date_time_list, g_list_position (date_time_list->list, G_LIST (iter->user_data)));
-}
-
-void
-e_date_time_list_append (EDateTimeList *date_time_list, GtkTreeIter *iter,
-			 const ECalComponentDateTime *datetime)
-{
-	g_return_if_fail (datetime != NULL);
-
-	if (g_list_find_custom (date_time_list->list, datetime, (GCompareFunc)compare_datetime) == NULL) {
-		date_time_list->list = g_list_append (date_time_list->list, copy_datetime (datetime));
-		row_added (date_time_list, g_list_length (date_time_list->list) - 1);
-	}
-
-	if (iter) {
-		iter->user_data = g_list_last (date_time_list->list);
-		iter->stamp     = date_time_list->stamp;
-	}
-}
-
-void
-e_date_time_list_remove (EDateTimeList *date_time_list, GtkTreeIter *iter)
-{
-	gint n;
-
-	g_return_if_fail (IS_VALID_ITER (date_time_list, iter));
-
-	n = g_list_position (date_time_list->list, G_LIST (iter->user_data));
-	free_datetime ((ECalComponentDateTime *) G_LIST (iter->user_data)->data);
-	date_time_list->list = g_list_delete_link (date_time_list->list, G_LIST (iter->user_data));
-	row_deleted (date_time_list, n);
-}
-
-void
-e_date_time_list_clear (EDateTimeList *date_time_list)
-{
-	GList *l;
-
-	all_rows_deleted (date_time_list);
-
-	for (l = date_time_list->list; l; l = g_list_next (l)) {
-		free_datetime ((ECalComponentDateTime *) l->data);
-	}
-
-	g_list_free (date_time_list->list);
-	date_time_list->list = NULL;
-}
-
-static gboolean
-e_date_time_list_get_iter (GtkTreeModel *tree_model, GtkTreeIter *iter, GtkTreePath *path)
-{
-	EDateTimeList *date_time_list = (EDateTimeList *) tree_model;
-	GList         *l;
-	gint           i;
-
-	g_return_val_if_fail (E_IS_DATE_TIME_LIST (tree_model), FALSE);
-	g_return_val_if_fail (gtk_tree_path_get_depth (path) > 0, FALSE);
-
-	if (!date_time_list->list)
-		return FALSE;
-
-	date_time_list->columns_dirty = TRUE;
-
-	i = gtk_tree_path_get_indices (path)[0];
-	l = g_list_nth (date_time_list->list, i);
-	if (!l)
-		return FALSE;
-
-	iter->user_data = l;
-	iter->stamp     = date_time_list->stamp;
-	return TRUE;
-}
-
-static GtkTreePath *
-e_date_time_list_get_path (GtkTreeModel *tree_model,
-			   GtkTreeIter  *iter)
-{
-	EDateTimeList *date_time_list = (EDateTimeList *) tree_model;
-	GtkTreePath   *retval;
-	GList         *l;
-
-	g_return_val_if_fail (E_IS_DATE_TIME_LIST (tree_model), NULL);
-	g_return_val_if_fail (iter->stamp == E_DATE_TIME_LIST (tree_model)->stamp, NULL);
-
-	l = iter->user_data;
-	retval = gtk_tree_path_new ();
-	gtk_tree_path_append_index (retval, g_list_position (date_time_list->list, l));
-	return retval;
-}
-
-/* Builds a static string out of an exception date */
-static char *
-get_exception_string (ECalComponentDateTime *dt)
-{
-	static char buf [256];
-	struct tm tmp_tm;
-
-	tmp_tm.tm_year  = dt->value->year - 1900;
-	tmp_tm.tm_mon   = dt->value->month - 1;
-	tmp_tm.tm_mday  = dt->value->day;
-	tmp_tm.tm_hour  = dt->value->hour;
-	tmp_tm.tm_min   = dt->value->minute;
-	tmp_tm.tm_sec   = dt->value->second;
-	tmp_tm.tm_isdst = -1;
-
-	tmp_tm.tm_wday = time_day_of_week (dt->value->day,
-					   dt->value->month - 1,
-					   dt->value->year);
-
-	e_time_format_date_and_time (&tmp_tm, calendar_config_get_24_hour_format (),
-				     FALSE, FALSE, buf, sizeof (buf));
-
-	return buf;
-}
-
-static void
-e_date_time_list_get_value (GtkTreeModel *tree_model,
-			    GtkTreeIter  *iter,
-			    gint          column,
-			    GValue       *value)
-{
-	EDateTimeList        *date_time_list = E_DATE_TIME_LIST (tree_model);
-	ECalComponentDateTime *datetime;
-	GList                *l;
-	const gchar          *str;
-
-	g_return_if_fail (E_IS_DATE_TIME_LIST (tree_model));
-	g_return_if_fail (column < E_DATE_TIME_LIST_NUM_COLUMNS);
-	g_return_if_fail (E_DATE_TIME_LIST (tree_model)->stamp == iter->stamp);
-	g_return_if_fail (IS_VALID_ITER (date_time_list, iter));
-
-	g_value_init (value, column_types [column]);
-
-	if (!date_time_list->list)
-		return;
-
-	l        = iter->user_data;
-	datetime = l->data;
-
-	if (!datetime)
-		return;
-
-	switch (column) {
-		case E_DATE_TIME_LIST_COLUMN_DESCRIPTION:
-			str = get_exception_string (datetime);
-			g_value_set_string (value, str);
-			break;
-	}
-}
-
-static gboolean
-e_date_time_list_iter_next (GtkTreeModel  *tree_model,
-			    GtkTreeIter   *iter)
-{
-	GList *l;
-
-	g_return_val_if_fail (E_IS_DATE_TIME_LIST (tree_model), FALSE);
-	g_return_val_if_fail (IS_VALID_ITER (E_DATE_TIME_LIST (tree_model), iter), FALSE);
-
-	if (!E_DATE_TIME_LIST (tree_model)->list)
-		return FALSE;
-
-	l = iter->user_data;
-	l = g_list_next (l);
-	if (l) {
-		iter->user_data = l;
-		return TRUE;
-	}
-
-	return FALSE;
-}
-
-static gboolean
-e_date_time_list_iter_children (GtkTreeModel *tree_model,
-				GtkTreeIter  *iter,
-				GtkTreeIter  *parent)
-{
-	EDateTimeList *date_time_list = E_DATE_TIME_LIST (tree_model);
-
-	/* this is a list, nodes have no children */
-	if (parent)
-		return FALSE;
-
-	/* but if parent == NULL we return the list itself as children of the
-	 * "root" */
-
-	if (!date_time_list->list)
-		return FALSE;
-
-	iter->stamp     = E_DATE_TIME_LIST (tree_model)->stamp;
-	iter->user_data = date_time_list->list;
-	return TRUE;
-}
-
-static gboolean
-e_date_time_list_iter_has_child (GtkTreeModel *tree_model,
-				 GtkTreeIter  *iter)
-{
-	g_return_val_if_fail (IS_VALID_ITER (E_DATE_TIME_LIST (tree_model), iter), FALSE);
-	return FALSE;
-}
-
-static gint
-e_date_time_list_iter_n_children (GtkTreeModel *tree_model,
-				  GtkTreeIter  *iter)
-{
-	EDateTimeList *date_time_list = E_DATE_TIME_LIST (tree_model);
-
-	g_return_val_if_fail (E_IS_DATE_TIME_LIST (tree_model), -1);
-
-	if (iter == NULL)
-		return g_list_length (date_time_list->list);
-
-	g_return_val_if_fail (E_DATE_TIME_LIST (tree_model)->stamp == iter->stamp, -1);
-	return 0;
-}
-
-static gboolean
-e_date_time_list_iter_nth_child (GtkTreeModel *tree_model,
-				 GtkTreeIter  *iter,
-				 GtkTreeIter  *parent,
-				 gint          n)
-{
-	EDateTimeList *date_time_list = E_DATE_TIME_LIST (tree_model);
-
-	g_return_val_if_fail (E_IS_DATE_TIME_LIST (tree_model), FALSE);
-
-	if (parent)
-		return FALSE;
-
-	if (date_time_list->list) {
-		GList *l;
-
-		l = g_list_nth (date_time_list->list, n);
-		if (!l)
-			return FALSE;
-
-		iter->stamp     = date_time_list->stamp;
-		iter->user_data = l;
-		return TRUE;
-	}
-
-	return FALSE;
-}
-
-static gboolean
-e_date_time_list_iter_parent (GtkTreeModel *tree_model,
-			      GtkTreeIter  *iter,
-			      GtkTreeIter  *child)
-{
-	return FALSE;
-}
diff --git a/calendar/gui/e-date-time-list.h b/calendar/gui/e-date-time-list.h
deleted file mode 100644
index 83b145c7c6..0000000000
--- a/calendar/gui/e-date-time-list.h
+++ /dev/null
@@ -1,83 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-
-/* EDateTimeList - list of calendar dates/times with GtkTreeModel interface.
- *
- * Copyright (C) 2003 Ximian, Inc.
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of version 2 of the GNU General Public
- * License as published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307, USA.
- *
- * Authors:  Hans Petter Jansson  <hpj@ximian.com>
- */
-
-#ifndef E_DATE_TIME_LIST_H
-#define E_DATE_TIME_LIST_H
-
-#include <gtk/gtktreemodel.h>
-#include <libecal/e-cal-component.h>
-
-G_BEGIN_DECLS
-
-#define E_TYPE_DATE_TIME_LIST            (e_date_time_list_get_type ())
-#define E_DATE_TIME_LIST(obj)	         (GTK_CHECK_CAST ((obj), E_TYPE_DATE_TIME_LIST, EDateTimeList))
-#define E_DATE_TIME_LIST_CLASS(klass)    (GTK_CHECK_CLASS_CAST ((klass), E_TYPE_DATE_TIME_LIST, EDateTimeListClass))
-#define E_IS_DATE_TIME_LIST(obj)         (GTK_CHECK_TYPE ((obj), E_TYPE_DATE_TIME_LIST))
-#define E_IS_DATE_TIME_LIST_CLASS(klass) (GTK_CHECK_CLASS_TYPE ((klass), E_TYPE_DATE_TIME_LIST))
-#define E_DATE_TIME_LIST_GET_CLASS(obj)  (GTK_CHECK_GET_CLASS ((obj), E_TYPE_DATE_TIME_LIST, EDateTimeListClass))
-
-typedef struct _EDateTimeList       EDateTimeList;
-typedef struct _EDateTimeListClass  EDateTimeListClass;
-
-typedef enum
-{
-	E_DATE_TIME_LIST_COLUMN_DESCRIPTION,
-
-	E_DATE_TIME_LIST_NUM_COLUMNS
-}
-EDateTimeListColumnType;
-
-struct _EDateTimeList
-{
-	GObject  parent;
-
-	/* Private */
-
-	gint     stamp;
-	GList   *list;
-
-	guint    columns_dirty : 1;
-};
-
-struct _EDateTimeListClass
-{
-	GObjectClass parent_class;
-};
-
-GtkType                     e_date_time_list_get_type         (void);
-EDateTimeList              *e_date_time_list_new              (void);
-
-const ECalComponentDateTime *e_date_time_list_get_date_time    (EDateTimeList *date_time_list,
-							       GtkTreeIter *iter);
-void                        e_date_time_list_set_date_time    (EDateTimeList *date_time_list,
-							       GtkTreeIter *iter,
-							       const ECalComponentDateTime *datetime);
-void                        e_date_time_list_append           (EDateTimeList *date_time_list,
-							       GtkTreeIter *iter,
-							       const ECalComponentDateTime *datetime);
-void                        e_date_time_list_remove           (EDateTimeList *date_time_list,
-							       GtkTreeIter *iter);
-void                        e_date_time_list_clear            (EDateTimeList *date_time_list);
-
-G_END_DECLS
-
-#endif  /* E_DATE_TIME_LIST_H */
diff --git a/calendar/gui/e-day-view-config.c b/calendar/gui/e-day-view-config.c
deleted file mode 100644
index 50d4d8eeea..0000000000
--- a/calendar/gui/e-day-view-config.c
+++ /dev/null
@@ -1,466 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-
-/* 
- * Author : 
- *  Rodrigo Moya <rodrigo@ximian.com>
- *
- * Copyright 2003, Ximian, Inc.
- *
- * This program is free software; you can redistribute it and/or 
- * modify it under the terms of version 2 of the GNU General Public 
- * License as published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
- * USA
- */
-
-#include "calendar-config.h"
-#include "e-day-view-config.h"
-
-struct _EDayViewConfigPrivate {
-	EDayView *view;
-
-	GList *notifications;
-};
-
-/* Property IDs */
-enum props {
-	PROP_0,
-	PROP_VIEW,
-};
-
-G_DEFINE_TYPE (EDayViewConfig, e_day_view_config, G_TYPE_OBJECT);
-
-static void
-e_day_view_config_set_property (GObject *object, guint property_id, const GValue *value, GParamSpec *pspec)
-{
-	EDayViewConfig *view_config;
-	EDayViewConfigPrivate *priv;
-
-	view_config = E_DAY_VIEW_CONFIG (object);
-	priv = view_config->priv;
-	
-	switch (property_id) {
-	case PROP_VIEW:
-		e_day_view_config_set_view (view_config, g_value_get_object (value));
-		break;
-	default:
-		G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec);
-		break;
-	}
-}
-
-static void
-e_day_view_config_get_property (GObject *object, guint property_id, GValue *value, GParamSpec *pspec)
-{
-	EDayViewConfig *view_config;
-	EDayViewConfigPrivate *priv;
-
-	view_config = E_DAY_VIEW_CONFIG (object);
-	priv = view_config->priv;
-	
-	switch (property_id) {
-	case PROP_VIEW:
-		g_value_set_object (value, e_day_view_config_get_view (view_config));
-		break;
-	default:
-		G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec);
-		break;
-	}
-}
-
-static void
-e_day_view_config_dispose (GObject *object)
-{
-	EDayViewConfig *view_config = E_DAY_VIEW_CONFIG (object);
-	EDayViewConfigPrivate *priv;
-	
-	priv = view_config->priv;
-
-	e_day_view_config_set_view (view_config, NULL);
-	
-	if (G_OBJECT_CLASS (e_day_view_config_parent_class)->dispose)
-		G_OBJECT_CLASS (e_day_view_config_parent_class)->dispose (object);
-}
-
-static void
-e_day_view_config_finalize (GObject *object)
-{
-	EDayViewConfig *view_config = E_DAY_VIEW_CONFIG (object);
-	EDayViewConfigPrivate *priv;
-	
-	priv = view_config->priv;
-
-	g_free (priv);
-	
-	if (G_OBJECT_CLASS (e_day_view_config_parent_class)->finalize)
-		G_OBJECT_CLASS (e_day_view_config_parent_class)->finalize (object);
-}
-
-static void
-e_day_view_config_class_init (EDayViewConfigClass *klass)
-{
-	GObjectClass *gobject_class = G_OBJECT_CLASS (klass);
-	GParamSpec *spec;
-	
-	/* Method override */
-	gobject_class->set_property = e_day_view_config_set_property;
-	gobject_class->get_property = e_day_view_config_get_property;
-	gobject_class->dispose = e_day_view_config_dispose;
-	gobject_class->finalize = e_day_view_config_finalize;
-
-	spec = g_param_spec_object ("view", NULL, NULL, e_day_view_get_type (),
-				    G_PARAM_READABLE | G_PARAM_WRITABLE | G_PARAM_CONSTRUCT);
-	g_object_class_install_property (gobject_class, PROP_VIEW, spec);
-}
-
-static void
-e_day_view_config_init (EDayViewConfig *view_config)
-{
-	view_config->priv = g_new0 (EDayViewConfigPrivate, 1);
-
-}
-
-EDayViewConfig *
-e_day_view_config_new (EDayView *day_view)
-{
-	EDayViewConfig *view_config;
-	
-	view_config = g_object_new (e_day_view_config_get_type (), "view", day_view, NULL);
-
-	return view_config;
-}
-
-EDayView *
-e_day_view_config_get_view (EDayViewConfig *view_config) 
-{
-	EDayViewConfigPrivate *priv;
-
-	g_return_val_if_fail (view_config != NULL, NULL);
-	g_return_val_if_fail (E_IS_DAY_VIEW_CONFIG (view_config), NULL);
-
-	priv = view_config->priv;
-	
-	return priv->view;
-}
-
-static void
-set_timezone (EDayView *day_view) 
-{
-	icaltimezone *zone;
-	
-	zone = calendar_config_get_icaltimezone ();	
-	e_calendar_view_set_timezone (E_CALENDAR_VIEW (day_view), zone);
-}
-
-static void
-timezone_changed_cb (GConfClient *client, guint id, GConfEntry *entry, gpointer data)
-{
-	EDayViewConfig *view_config = data;
-	EDayViewConfigPrivate *priv;
-	
-	priv = view_config->priv;
-	
-	set_timezone (priv->view);
-}
-
-static void
-set_week_start (EDayView *day_view) 
-{
-	int week_start_day;	
-
-	week_start_day = calendar_config_get_week_start_day ();
-
-	/* Convert it to 0 (Mon) to 6 (Sun), which is what we use. */
-	week_start_day = (week_start_day + 6) % 7;
-
-	e_day_view_set_week_start_day (day_view, week_start_day);
-}
-
-static void
-week_start_changed_cb (GConfClient *client, guint id, GConfEntry *entry, gpointer data)
-{
-	EDayViewConfig *view_config = data;
-	EDayViewConfigPrivate *priv;
-	
-	priv = view_config->priv;
-	
-	set_week_start (priv->view);
-}
-
-static void
-set_twentyfour_hour (EDayView *day_view) 
-{
-	gboolean use_24_hour;
-
-	use_24_hour = calendar_config_get_24_hour_format ();
-
-	e_calendar_view_set_use_24_hour_format (E_CALENDAR_VIEW (day_view), use_24_hour);
-
-	/* To redraw the times */
-	gtk_widget_queue_draw (day_view->time_canvas);
-}
-
-static void
-twentyfour_hour_changed_cb (GConfClient *client, guint id, GConfEntry *entry, gpointer data)
-{
-	EDayViewConfig *view_config = data;
-	EDayViewConfigPrivate *priv;
-	
-	priv = view_config->priv;
-	
-	set_twentyfour_hour (priv->view);
-}
-
-static void
-set_working_days (EDayView *day_view) 
-{
-	CalWeekdays working_days;	
-
-	working_days = calendar_config_get_working_days ();
-
-	e_day_view_set_working_days (day_view, working_days);
-}
-
-static void
-working_days_changed_cb (GConfClient *client, guint id, GConfEntry *entry, gpointer data)
-{
-	EDayViewConfig *view_config = data;
-	EDayViewConfigPrivate *priv;
-	
-	priv = view_config->priv;
-	
-	set_working_days (priv->view);
-}
-
-static void
-set_day_start_hour (EDayView *day_view) 
-{
-	int start_hour, start_minute, end_hour, end_minute;
-
-	e_day_view_get_working_day (day_view, &start_hour, &start_minute, &end_hour, &end_minute);
-	
-	start_hour = calendar_config_get_day_start_hour ();
-
-	e_day_view_set_working_day (day_view, start_hour, start_minute, end_hour, end_minute);
-}
-
-static void
-day_start_hour_changed_cb (GConfClient *client, guint id, GConfEntry *entry, gpointer data)
-{
-	EDayViewConfig *view_config = data;
-	EDayViewConfigPrivate *priv;
-	
-	priv = view_config->priv;
-	
-	set_day_start_hour (priv->view);
-}
-
-static void
-set_day_start_minute (EDayView *day_view) 
-{
-	int start_hour, start_minute, end_hour, end_minute;
-
-	e_day_view_get_working_day (day_view, &start_hour, &start_minute, &end_hour, &end_minute);
-	
-	start_minute = calendar_config_get_day_start_minute ();
-
-	e_day_view_set_working_day (day_view, start_hour, start_minute, end_hour, end_minute);
-}
-
-static void
-day_start_minute_changed_cb (GConfClient *client, guint id, GConfEntry *entry, gpointer data)
-{
-	EDayViewConfig *view_config = data;
-	EDayViewConfigPrivate *priv;
-	
-	priv = view_config->priv;
-	
-	set_day_start_minute (priv->view);
-}
-
-static void
-set_day_end_hour (EDayView *day_view) 
-{
-	int start_hour, start_minute, end_hour, end_minute;
-
-	e_day_view_get_working_day (day_view, &start_hour, &start_minute, &end_hour, &end_minute);
-	
-	end_hour = calendar_config_get_day_end_hour ();
-
-	e_day_view_set_working_day (day_view, start_hour, start_minute, end_hour, end_minute);
-}
-
-static void
-day_end_hour_changed_cb (GConfClient *client, guint id, GConfEntry *entry, gpointer data)
-{
-	EDayViewConfig *view_config = data;
-	EDayViewConfigPrivate *priv;
-	
-	priv = view_config->priv;
-	
-	set_day_end_hour (priv->view);
-}
-
-
-static void
-set_day_end_minute (EDayView *day_view) 
-{
-	int start_hour, start_minute, end_hour, end_minute;
-
-	e_day_view_get_working_day (day_view, &start_hour, &start_minute, &end_hour, &end_minute);
-	
-	end_minute = calendar_config_get_day_end_minute ();
-
-	e_day_view_set_working_day (day_view, start_hour, start_minute, end_hour, end_minute);
-}
-
-static void
-day_end_minute_changed_cb (GConfClient *client, guint id, GConfEntry *entry, gpointer data)
-{
-	EDayViewConfig *view_config = data;
-	EDayViewConfigPrivate *priv;
-	
-	priv = view_config->priv;
-	
-	set_day_end_minute (priv->view);
-}
-
-static void
-set_time_divisions (EDayView *day_view) 
-{
-	int time_divisions;	
-
-	time_divisions = calendar_config_get_time_divisions ();
-
-	e_day_view_set_mins_per_row (day_view, time_divisions);
-}
-
-static void
-time_divisions_changed_cb (GConfClient *client, guint id, GConfEntry *entry, gpointer data)
-{
-	EDayViewConfig *view_config = data;
-	EDayViewConfigPrivate *priv;
-	
-	priv = view_config->priv;
-	
-	set_time_divisions (priv->view);
-}
-
-static void
-set_show_event_end (EDayView *day_view) 
-{
-	gboolean show_event_end;
-
- 	show_event_end = calendar_config_get_show_event_end ();
-
-	e_day_view_set_show_event_end_times (day_view, show_event_end);
-}
-
-static void
-show_event_end_changed_cb (GConfClient *client, guint id, GConfEntry *entry, gpointer data)
-{
-	EDayViewConfig *view_config = data;
-	EDayViewConfigPrivate *priv;
-	
-	priv = view_config->priv;
-	
-	set_show_event_end (priv->view);
-}
-
-void
-e_day_view_config_set_view (EDayViewConfig *view_config, EDayView *day_view) 
-{
-	EDayViewConfigPrivate *priv;
-	guint not;
-	GList *l;
-	
-	g_return_if_fail (view_config != NULL);
-	g_return_if_fail (E_IS_DAY_VIEW_CONFIG (view_config));
-
-	priv = view_config->priv;
-	
-	if (priv->view) {
-		g_object_unref (priv->view);
-		priv->view = NULL;
-	}
-	
-	for (l = priv->notifications; l; l = l->next)
-		calendar_config_remove_notification (GPOINTER_TO_UINT (l->data));
-
-	g_list_free (priv->notifications);
-	priv->notifications = NULL;
-
-	/* If the new view is NULL, return right now */
-	if (!day_view)
-		return;
-	
-	priv->view = g_object_ref (day_view);
-
-	/* Time zone */
-	set_timezone (day_view);
-	
-	not = calendar_config_add_notification_timezone (timezone_changed_cb, view_config);
-	priv->notifications = g_list_prepend (priv->notifications, GUINT_TO_POINTER (not));
-
-	/* Week start */
-	set_week_start (day_view);	
-
-	not = calendar_config_add_notification_week_start_day (week_start_changed_cb, view_config);
-	priv->notifications = g_list_prepend (priv->notifications, GUINT_TO_POINTER (not));
-
-	/* 24 Hour format */
-	set_twentyfour_hour (day_view);	
-
-	not = calendar_config_add_notification_24_hour_format (twentyfour_hour_changed_cb, view_config);
-	priv->notifications = g_list_prepend (priv->notifications, GUINT_TO_POINTER (not));
-	
-	/* Working days */
-	set_working_days (day_view);
-
-	not = calendar_config_add_notification_working_days (working_days_changed_cb, view_config);
-	priv->notifications = g_list_prepend (priv->notifications, GUINT_TO_POINTER (not));
-
-	/* Day start hour */
-	set_day_start_hour (day_view);
-
-	not = calendar_config_add_notification_day_start_hour (day_start_hour_changed_cb, view_config);
-	priv->notifications = g_list_prepend (priv->notifications, GUINT_TO_POINTER (not));
-
-	/* Day start minute */
-	set_day_start_minute (day_view);
-
-	not = calendar_config_add_notification_day_start_minute (day_start_minute_changed_cb, view_config);
-	priv->notifications = g_list_prepend (priv->notifications, GUINT_TO_POINTER (not));
-
-	/* Day end hour */
-	set_day_end_hour (day_view);
-
-	not = calendar_config_add_notification_day_end_hour (day_end_hour_changed_cb, view_config);
-	priv->notifications = g_list_prepend (priv->notifications, GUINT_TO_POINTER (not));
-
-	/* Day start minute */
-	set_day_end_minute (day_view);
-
-	not = calendar_config_add_notification_day_end_minute (day_end_minute_changed_cb, view_config);
-	priv->notifications = g_list_prepend (priv->notifications, GUINT_TO_POINTER (not));
-
-	/* Time divisions */
-	set_time_divisions (day_view);
-
-	not = calendar_config_add_notification_time_divisions (time_divisions_changed_cb, view_config);
-	priv->notifications = g_list_prepend (priv->notifications, GUINT_TO_POINTER (not));
-
-	/* Showing event end */
-	set_show_event_end (day_view);
-
-	not = calendar_config_add_notification_show_event_end (show_event_end_changed_cb, view_config);
-	priv->notifications = g_list_prepend (priv->notifications, GUINT_TO_POINTER (not));
-}
diff --git a/calendar/gui/e-day-view-config.h b/calendar/gui/e-day-view-config.h
deleted file mode 100644
index 105cbb4f07..0000000000
--- a/calendar/gui/e-day-view-config.h
+++ /dev/null
@@ -1,55 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-/* 
- * Author : 
- *  JP Rosevear <jpr@ximian.com>
- *
- * Copyright 2003, Ximian, Inc.
- *
- * This program is free software; you can redistribute it and/or 
- * modify it under the terms of version 2 of the GNU General Public 
- * License as published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
- * USA
- */
-
-#ifndef _E_DAY_VIEW_CONFIG_H_
-#define _E_DAY_VIEW_CONFIG_H_
-
-#include "e-day-view.h"
-
-G_BEGIN_DECLS
-
-#define E_DAY_VIEW_CONFIG(obj)          GTK_CHECK_CAST (obj, e_day_view_config_get_type (), EDayViewConfig)
-#define E_DAY_VIEW_CONFIG_CLASS(klass)  GTK_CHECK_CLASS_CAST (klass, e_day_view_config_get_type (), EDayViewConfigClass)
-#define E_IS_DAY_VIEW_CONFIG(obj)       GTK_CHECK_TYPE (obj, e_day_view_config_get_type ())
-        
-typedef struct _EDayViewConfig        EDayViewConfig;
-typedef struct _EDayViewConfigClass   EDayViewConfigClass;
-typedef struct _EDayViewConfigPrivate EDayViewConfigPrivate;
-
-struct _EDayViewConfig {
-	GObject parent;
-
-	EDayViewConfigPrivate *priv;
-};
-
-struct _EDayViewConfigClass {
-	GObjectClass parent_class;
-};
-
-GType          e_day_view_config_get_type (void);
-EDayViewConfig *e_day_view_config_new (EDayView *day_view);
-EDayView *e_day_view_config_get_view (EDayViewConfig *view_config);
-void e_day_view_config_set_view (EDayViewConfig *view_config, EDayView *day_view);
-
-G_END_DECLS
-
-#endif
diff --git a/calendar/gui/e-day-view-layout.c b/calendar/gui/e-day-view-layout.c
deleted file mode 100644
index ba843b828c..0000000000
--- a/calendar/gui/e-day-view-layout.c
+++ /dev/null
@@ -1,352 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-
-/*
- * Author :
- *  Damon Chaplin <damon@ximian.com>
- *
- * Copyright 2001, Ximian, Inc.
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of version 2 of the GNU General Public
- * License as published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
- * USA
- */
-
-/*
- * Lays out events for the Day & Work-Week views of the calendar. It is also
- * used for printing.
- */
-
-#include <config.h>
-
-#include "e-day-view-layout.h"
-
-static void e_day_view_layout_long_event (EDayViewEvent	  *event,
-					  guint8	  *grid,
-					  gint		   days_shown,
-					  time_t	  *day_starts,
-					  gint		  *rows_in_top_display);
-
-static void e_day_view_layout_day_event (EDayViewEvent    *event,
-					 guint8	          *grid,
-					 guint16	  *group_starts,
-					 gint8	          *cols_per_row,
-					 gint	           rows,
-					 gint	           mins_per_row);
-static void e_day_view_expand_day_event (EDayViewEvent    *event,
-					 guint8	          *grid,
-					 gint8	          *cols_per_row,
-					 gint	           mins_per_row);
-static void e_day_view_recalc_cols_per_row (gint           rows,
-					    gint8	  *cols_per_row,
-					    guint16       *group_starts);
-
-
-void
-e_day_view_layout_long_events (GArray	   *events,
-			       gint	   days_shown,
-			       time_t	  *day_starts,
-			       gint	   *rows_in_top_display)
-{
-	EDayViewEvent *event;
-	gint event_num;
-	guint8 *grid;
-
-	/* This is a temporary 2-d grid which is used to place events.
-	   Each element is 0 if the position is empty, or 1 if occupied.
-	   We allocate the maximum size possible here, assuming that each
-	   event will need its own row. */
-	grid = g_new0 (guint8, events->len * E_DAY_VIEW_MAX_DAYS);
-
-	/* Reset the number of rows in the top display to 0. It will be
-	   updated as events are layed out below. */
-	*rows_in_top_display = 0;
-
-	/* Iterate over the events, finding which days they cover, and putting
-	   them in the first free row available. */
-	for (event_num = 0; event_num < events->len; event_num++) {
-		event = &g_array_index (events, EDayViewEvent, event_num);
-		e_day_view_layout_long_event (event, grid,
-					      days_shown, day_starts,
-					      rows_in_top_display);
-	}
-
-	/* Free the grid. */
-	g_free (grid);
-}
-
-
-static void
-e_day_view_layout_long_event (EDayViewEvent *event,
-			      guint8	   *grid,
-			      gint	    days_shown,
-			      time_t	   *day_starts,		
-			      gint	   *rows_in_top_display)
-{
-	gint start_day, end_day, free_row, day, row;
-
-	event->num_columns = 0;
-
-	if (!e_day_view_find_long_event_days (event,
-					      days_shown, day_starts,
-					      &start_day, &end_day))
-		return;
-
-	/* Try each row until we find a free one. */
-	row = 0;
-	do {
-		free_row = row;
-		for (day = start_day; day <= end_day; day++) {
-			if (grid[row * E_DAY_VIEW_MAX_DAYS + day]) {
-				free_row = -1;
-				break;
-			}
-		}
-		row++;
-	} while (free_row == -1);
-
-	event->start_row_or_col = free_row;
-	event->num_columns = 1;
-
-	/* Mark the cells as full. */
-	for (day = start_day; day <= end_day; day++) {
-		grid[free_row * E_DAY_VIEW_MAX_DAYS + day] = 1;
-	}
-
-	/* Update the number of rows in the top canvas if necessary. */
-	*rows_in_top_display = MAX (*rows_in_top_display, free_row + 1);
-}
-
-
-void
-e_day_view_layout_day_events (GArray	   *events,
-			      gint	    rows,
-			      gint	    mins_per_row,
-			      gint8	   *cols_per_row)
-{
-	EDayViewEvent *event;
-	gint row, event_num;
-	guint8 *grid;
-
-	/* This is a temporary array which keeps track of rows which are
-	   connected. When an appointment spans multiple rows then the number
-	   of columns in each of these rows must be the same (i.e. the maximum
-	   of all of them). Each element in the array corresponds to one row
-	   and contains the index of the first row in the group of connected
-	   rows. */
-	guint16 group_starts[12 * 24];
-
-	/* Reset the cols_per_row array, and initialize the connected rows so
-	   that all rows are not connected - each row is the start of a new
-	   group. */
-	for (row = 0; row < rows; row++) {
-		cols_per_row[row] = 0;
-		group_starts[row] = row;
-	}
-
-	/* This is a temporary 2-d grid which is used to place events.
-	   Each element is 0 if the position is empty, or 1 if occupied. */
-	grid = g_new0 (guint8, rows * E_DAY_VIEW_MAX_COLUMNS);
-
-
-	/* Iterate over the events, finding which rows they cover, and putting
-	   them in the first free column available. Increment the number of
-	   events in each of the rows it covers, and make sure they are all
-	   in one group. */
-	for (event_num = 0; event_num < events->len; event_num++) {
-		event = &g_array_index (events, EDayViewEvent, event_num);
-
-		e_day_view_layout_day_event (event, grid, group_starts,
-					     cols_per_row, rows, mins_per_row);
-	}
-
-	/* Recalculate the number of columns needed in each row. */
-	e_day_view_recalc_cols_per_row (rows, cols_per_row, group_starts);
-
-	/* Iterate over the events again, trying to expand events horizontally
-	   if there is enough space. */
-	for (event_num = 0; event_num < events->len; event_num++) {
-		event = &g_array_index (events, EDayViewEvent, event_num);
-		e_day_view_expand_day_event (event, grid, cols_per_row,
-					     mins_per_row);
-	}
-
-	/* Free the grid. */
-	g_free (grid);
-}
-
-
-/* Finds the first free position to place the event in.
-   Increments the number of events in each of the rows it covers, and makes
-   sure they are all in one group. */
-static void
-e_day_view_layout_day_event (EDayViewEvent *event,
-			     guint8	   *grid,
-			     guint16	   *group_starts,
-			     gint8	   *cols_per_row,
-			     gint	    rows,
-			     gint	    mins_per_row)
-{
-	gint start_row, end_row, free_col, col, row, group_start;
-
-	start_row = event->start_minute / mins_per_row;
-	end_row = (event->end_minute - 1) / mins_per_row;
-	if (end_row < start_row)
-		end_row = start_row;
-
-	event->num_columns = 0;
-
-	/* If the event can't currently be seen, just return. */
-	if (start_row >= rows || end_row < 0)
-		return;
-
-	/* Make sure we don't go outside the visible times. */
-	start_row = CLAMP (start_row, 0, rows - 1);
-	end_row = CLAMP (end_row, 0, rows - 1);
-
-	/* Try each column until we find a free one. */
-	for (col = 0; col < E_DAY_VIEW_MAX_COLUMNS; col++) {
-		free_col = col;
-		for (row = start_row; row <= end_row; row++) {
-			if (grid[row * E_DAY_VIEW_MAX_COLUMNS + col]) {
-				free_col = -1;
-				break;
-			}
-		}
-
-		if (free_col != -1)
-			break;
-	}
-
-	/* If we can't find space for the event, just return. */
-	if (free_col == -1)
-		return;
-
-	/* The event is assigned 1 col initially, but may be expanded later. */
-	event->start_row_or_col = free_col;
-	event->num_columns = 1;
-
-	/* Determine the start index of the group. */
-	group_start = group_starts[start_row];
-
-	/* Increment number of events in each of the rows the event covers.
-	   We use the cols_per_row array for this. It will be sorted out after
-	   all the events have been layed out. Also make sure all the rows that
-	   the event covers are in one group. */
-	for (row = start_row; row <= end_row; row++) {
-		grid[row * E_DAY_VIEW_MAX_COLUMNS + free_col] = 1;
-		cols_per_row[row]++;
-		group_starts[row] = group_start;
-	}
-
-	/* If any following rows should be in the same group, add them. */
-	for (row = end_row + 1; row < rows; row++) {
-		if (group_starts[row] > end_row)
-			break;
-		group_starts[row] = group_start;
-	}
-}
-
-
-/* For each group of rows, find the max number of events in all the
-   rows, and set the number of cols in each of the rows to that. */
-static void
-e_day_view_recalc_cols_per_row (gint      rows,
-				gint8	 *cols_per_row,
-				guint16  *group_starts)
-{
-	gint start_row = 0, row, next_start_row, max_events;
-
-	while (start_row < rows) {
-		max_events = 0;
-		for (row = start_row; row < rows && group_starts[row] == start_row; row++)
-			max_events = MAX (max_events, cols_per_row[row]);
-
-		next_start_row = row;
-
-		for (row = start_row; row < next_start_row; row++)
-			cols_per_row[row] = max_events;
-
-		start_row = next_start_row;
-	}
-}
-
-
-/* Expands the event horizontally to fill any free space. */
-static void
-e_day_view_expand_day_event (EDayViewEvent *event,
-			     guint8	   *grid,
-			     gint8	   *cols_per_row,
-			     gint	    mins_per_row)
-{
-	gint start_row, end_row, col, row;
-	gboolean clashed;
-
-	start_row = event->start_minute / mins_per_row;
-	end_row = (event->end_minute - 1) / mins_per_row;
-	if (end_row < start_row)
-		end_row = start_row;
-
-	/* Try each column until we find a free one. */
-	clashed = FALSE;
-	for (col = event->start_row_or_col + 1; col < cols_per_row[start_row]; col++) {
-		for (row = start_row; row <= end_row; row++) {
-			if (grid[row * E_DAY_VIEW_MAX_COLUMNS + col]) {
-				clashed = TRUE;
-				break;
-			}
-		}
-
-		if (clashed)
-			break;
-
-		event->num_columns++;
-	}
-}
-
-
-/* Find the start and end days for the event. */
-gboolean
-e_day_view_find_long_event_days (EDayViewEvent	*event,
-				 gint		 days_shown,
-				 time_t		*day_starts,		
-				 gint		*start_day_return,
-				 gint		*end_day_return)
-{
-	gint day, start_day, end_day;
-
-	start_day = -1;
-	end_day = -1;
-
-	for (day = 0; day < days_shown; day++) {
-		if (start_day == -1
-		    && event->start < day_starts[day + 1])
-			start_day = day;
-		if (event->end > day_starts[day])
-			end_day = day;
-	}
-
-	/* Sanity check. */
-	if (start_day < 0 || start_day >= days_shown
-	    || end_day < 0 || end_day >= days_shown
-	    || end_day < start_day) {
-		g_warning ("Invalid date range for event");
-		return FALSE;
-	}
-
-	*start_day_return = start_day;
-	*end_day_return = end_day;
-
-	return TRUE;
-}
-
-
diff --git a/calendar/gui/e-day-view-layout.h b/calendar/gui/e-day-view-layout.h
deleted file mode 100644
index 70d0dd6394..0000000000
--- a/calendar/gui/e-day-view-layout.h
+++ /dev/null
@@ -1,56 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-
-/* 
- * Author : 
- *  Damon Chaplin <damon@ximian.com>
- *
- * Copyright 2001, Ximian, Inc.
- *
- * This program is free software; you can redistribute it and/or 
- * modify it under the terms of version 2 of the GNU General Public 
- * License as published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
- * USA
- */
-#ifndef _E_DAY_VIEW_LAYOUT_H_
-#define _E_DAY_VIEW_LAYOUT_H_
-
-#include "e-day-view.h"
-
-#ifdef __cplusplus
-extern "C" {
-#endif /* __cplusplus */
-
-/* I've split these functions away from EDayView so we can use them for
-   printing. */
-
-void e_day_view_layout_long_events	(GArray	   *events,
-					 gint	    days_shown,
-					 time_t	   *day_starts,
-					 gint	   *rows_in_top_display);
-
-
-void e_day_view_layout_day_events	(GArray	   *events,
-					 gint	    rows,
-					 gint	    mins_per_row,
-					 gint8	   *cols_per_row);
-
-gboolean   e_day_view_find_long_event_days	(EDayViewEvent	*event,
-						 gint		 days_shown,
-						 time_t		*day_starts,
-						 gint		*start_day,
-						 gint		*end_day);
-
-#ifdef __cplusplus
-}
-#endif /* __cplusplus */
-
-#endif /* _E_DAY_VIEW_LAYOUT_H_ */
diff --git a/calendar/gui/e-day-view-main-item.c b/calendar/gui/e-day-view-main-item.c
deleted file mode 100644
index f384fdbd66..0000000000
--- a/calendar/gui/e-day-view-main-item.c
+++ /dev/null
@@ -1,823 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-
-/* 
- * Author : 
- *  Damon Chaplin <damon@ximian.com>
- *
- * Copyright 1999, Ximian, Inc.
- * Copyright 1999, Ximian, Inc.
- *
- * This program is free software; you can redistribute it and/or 
- * modify it under the terms of version 2 of the GNU General Public 
- * License as published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public 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.
- */
-
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
-
-#include "e-util/e-categories-config.h"
-#include "e-day-view-layout.h"
-#include "e-day-view-main-item.h"
-#include "ea-calendar.h"
-
-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);
-
-/* The arguments we take */
-enum {
-	ARG_0,
-	ARG_DAY_VIEW
-};
-
-G_DEFINE_TYPE (EDayViewMainItem, e_day_view_main_item, GNOME_TYPE_CANVAS_ITEM);
-
-static void
-e_day_view_main_item_class_init (EDayViewMainItemClass *class)
-{
-	GtkObjectClass  *object_class;
-	GnomeCanvasItemClass *item_class;
-
-	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;
-
-	/* init the accessibility support for e_day_view */
- 	e_day_view_main_item_a11y_init ();
-}
-
-
-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 (e_day_view_main_item_parent_class)->update)
-		(* GNOME_CANVAS_ITEM_CLASS (e_day_view_main_item_parent_class)->update) (item, affine, clip_path, flags);
-
-	/* The item covers the entire canvas area. */
-	item->x1 = 0;
-	item->y1 = 0;
-	item->x2 = INT_MAX;
-	item->y2 = INT_MAX;
-}
-
-
-/*
- * DRAWING ROUTINES - functions to paint the canvas item.
- */
-
-static void
-e_day_view_main_item_draw (GnomeCanvasItem *canvas_item, GdkDrawable *drawable,
-			   int x, int y, int width, int height)
-{
-	EDayViewMainItem *dvmitem;
-	EDayView *day_view;
-	GtkStyle *style;
-	GdkGC *gc;
-	gint row, row_y, grid_x1, grid_x2;
-	gint day, grid_y1, grid_y2;
-	gint work_day_start_y, work_day_end_y;
-	gint day_x, day_w, work_day;
-	gint start_row, end_row, rect_x, rect_y, rect_width, rect_height;
-	struct icaltimetype day_start_tt;
-	gint weekday;
-
-#if 0
-	g_print ("In e_day_view_main_item_draw %i,%i %ix%i\n",
-		 x, y, width, height);
-#endif
-	dvmitem = E_DAY_VIEW_MAIN_ITEM (canvas_item);
-	day_view = dvmitem->day_view;
-	g_return_if_fail (day_view != NULL);
-
-	style = gtk_widget_get_style (GTK_WIDGET (day_view));
-
-	/* Paint the background colors. */
-	gc = day_view->main_gc;
-	work_day_start_y = e_day_view_convert_time_to_position (day_view, day_view->work_day_start_hour, day_view->work_day_start_minute) - y;
-	work_day_end_y = e_day_view_convert_time_to_position (day_view, day_view->work_day_end_hour, day_view->work_day_end_minute) - y;
-
-	for (day = 0; day < day_view->days_shown; day++) {
-		day_start_tt = icaltime_from_timet_with_zone (day_view->day_starts[day], FALSE,
-							      e_calendar_view_get_timezone (E_CALENDAR_VIEW (day_view)));
-		weekday = icaltime_day_of_week (day_start_tt) - 1;
-		
-		work_day = day_view->working_days & (1 << weekday);
-
-		day_x = day_view->day_offsets[day] - x;
-		day_w = day_view->day_widths[day];
-
-		if (work_day) {
-			gdk_gc_set_foreground (gc, &day_view->colors[E_DAY_VIEW_COLOR_BG_NOT_WORKING]);
-			gdk_draw_rectangle (drawable, gc, TRUE,
-					    day_x, 0 - y,
-					    day_w, work_day_start_y - (0 - y));
-			gdk_gc_set_foreground (gc, &day_view->colors[E_DAY_VIEW_COLOR_BG_WORKING]);
-			gdk_draw_rectangle (drawable, gc, TRUE,
-					    day_x, work_day_start_y,
-					    day_w, work_day_end_y - work_day_start_y);
-			gdk_gc_set_foreground (gc, &day_view->colors[E_DAY_VIEW_COLOR_BG_NOT_WORKING]);
-			gdk_draw_rectangle (drawable, gc, TRUE,
-					    day_x, work_day_end_y,
-					    day_w, height - work_day_end_y);
-		} else {
-			gdk_gc_set_foreground (gc, &day_view->colors[E_DAY_VIEW_COLOR_BG_NOT_WORKING]);
-			gdk_draw_rectangle (drawable, gc, TRUE,
-					    day_x, 0,
-					    day_w, height);
-		}
-	}
-
-	/* Paint the selection background. */
-	if (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;
-
-			if (GTK_WIDGET_HAS_FOCUS(day_view))
-				gdk_gc_set_foreground (gc, &day_view->colors[E_DAY_VIEW_COLOR_BG_SELECTED]);
-			else
-				gdk_gc_set_foreground (gc, &day_view->colors[E_DAY_VIEW_COLOR_BG_SELECTED_UNFOCUSSED]);
-			gdk_draw_rectangle (drawable, gc, TRUE,
-					    rect_x, rect_y,
-					    rect_width, rect_height);
-		}
-	}
-
-	/* Drawing the horizontal grid lines. */
-	grid_x1 = day_view->day_offsets[0] - x;
-	grid_x2 = day_view->day_offsets[day_view->days_shown] - x;
-
-	gdk_gc_set_foreground (gc, &day_view->colors[E_DAY_VIEW_COLOR_BG_GRID]);
-	for (row = 0, row_y = 0 - y;
-	     row < day_view->rows && row_y < height;
-	     row++, row_y += day_view->row_height) {
-		if (row_y >= 0 && row_y < height)
-			gdk_draw_line (drawable, gc,
-				       grid_x1, row_y, grid_x2, row_y);
-	}
-
-	/* Draw the vertical bars down the left of each column. */
-	grid_y1 = 0;
-	grid_y2 = height;
-	for (day = 0; day < day_view->days_shown; day++) {
-		grid_x1 = day_view->day_offsets[day] - x;
-
-		/* Skip if it isn't visible. */
-		if (grid_x1 >= width || grid_x1 + E_DAY_VIEW_BAR_WIDTH <= 0)
-			continue;
-
-		gdk_draw_line (drawable, style->black_gc,
-			       grid_x1, grid_y1,
-			       grid_x1, grid_y2);
-		gdk_draw_line (drawable, style->black_gc,
-			       grid_x1 + E_DAY_VIEW_BAR_WIDTH - 1, grid_y1,
-			       grid_x1 + E_DAY_VIEW_BAR_WIDTH - 1, grid_y2);
-		gdk_draw_rectangle (drawable, style->white_gc, TRUE,
-			       grid_x1 + 1, grid_y1,
-			       E_DAY_VIEW_BAR_WIDTH - 2, grid_y2 - grid_y1);
-
-		/* Fill in the bars when the user is busy. */
-		e_day_view_main_item_draw_events_in_vbars (dvmitem, drawable,
-							   x, y,
-							   width, height,
-							   day);
-	}
-
-	/* Fill in the vertical bars corresponding to the busy times from the
-	   long events. */
-	e_day_view_main_item_draw_long_events_in_vbars (dvmitem, drawable,
-							x, y, width, height);
-
-	/* Draw the event borders and backgrounds, and the vertical bars
-	   down the left edges. */
-	for (day = 0; day < day_view->days_shown; day++) {
-		e_day_view_main_item_draw_day_events (dvmitem, drawable,
-						      x, y, width, height,
-						      day);
-	}
-}
-
-
-static void
-e_day_view_main_item_draw_events_in_vbars (EDayViewMainItem *dvmitem,
-					   GdkDrawable *drawable,
-					   int x, int y,
-					   int width, int height,
-					   gint day)
-{
-	EDayView *day_view;
-	EDayViewEvent *event;
-	GdkGC *gc;
-	gint grid_x, event_num, bar_y, bar_h;
-	ECalComponentTransparency transparency;
-
-	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++) {
-		ECalComponent *comp;
-
-		event = &g_array_index (day_view->events[day], EDayViewEvent,
-					event_num);
-
-		comp = e_cal_component_new ();
-		e_cal_component_set_icalcomponent (comp, icalcomponent_new_clone (event->comp_data->icalcomp));
-
-		/* If the event is TRANSPARENT, skip it. */
-		e_cal_component_get_transparency (comp, &transparency);
-		if (transparency == E_CAL_COMPONENT_TRANSP_TRANSPARENT)
-			continue;
-
-		/* 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);
-
-		g_object_unref (comp);
-	}
-}
-
-
-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;
-	ECalComponentTransparency transparency;
-
-	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++) {
-		ECalComponent *comp;
-
-		event = &g_array_index (day_view->long_events, EDayViewEvent,
-					event_num);
-
-		comp = e_cal_component_new ();
-		e_cal_component_set_icalcomponent (comp, icalcomponent_new_clone (event->comp_data->icalcomp));
-
-		/* If the event is TRANSPARENT, skip it. */
-		e_cal_component_get_transparency (comp, &transparency);
-		if (transparency == E_CAL_COMPONENT_TRANSP_TRANSPARENT)
-			continue;
-
-		if (!e_day_view_find_long_event_days (event,
-						      day_view->days_shown,
-						      day_view->day_starts,
-						      &start_day, &end_day))
-			continue;
-
-		for (day = start_day; day <= end_day; day++) {
-			grid_x = day_view->day_offsets[day] + 1 - x;
-
-			/* Skip if it isn't visible. */
-			if (grid_x >= width
-			    || grid_x + E_DAY_VIEW_BAR_WIDTH <= 0)
-				continue;
-
-			if (event->start <= day_view->day_starts[day]) {
-				bar_y1 = 0;
-			} else {
-				bar_y1 = event->start_minute * day_view->row_height / day_view->mins_per_row - y;
-			}
-
-			if (event->end >= day_view->day_starts[day + 1]) {
-				bar_y2 = height;
-			} else {
-				bar_y2 = event->end_minute * day_view->row_height / day_view->mins_per_row - y;
-			}
-
-			if (bar_y1 < height && bar_y2 > 0 && bar_y2 > bar_y1) {
-				gdk_draw_rectangle (drawable, gc, TRUE,
-						    grid_x, bar_y1,
-						    E_DAY_VIEW_BAR_WIDTH - 2,
-						    bar_y2 - bar_y1);
-			}
-		}
-
-
-		g_object_unref (comp);
-	}
-}
-
-
-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;
-	GdkColor bg_color;
-	ECalComponent *comp;
-	gint num_icons, icon_x, icon_y, icon_x_inc, icon_y_inc;
-	gint max_icon_w, max_icon_h;
-	gboolean draw_reminder_icon, draw_recurrence_icon, draw_timezone_icon, draw_meeting_icon;
-	gboolean draw_attach_icon;
-	GSList *categories_list, *elem;
-	ECalComponentTransparency transparency;
-
-	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;
-
-	/* 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 event 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. */
-
-	gdk_gc_set_foreground (gc, &day_view->colors[E_DAY_VIEW_COLOR_EVENT_BACKGROUND]);
-
-	if (gdk_color_parse (e_cal_model_get_color_for_component (e_calendar_view_get_model (E_CALENDAR_VIEW (day_view)), event->comp_data),
-			     &bg_color)) {
-		GdkColormap *colormap;
-
-		colormap = gtk_widget_get_colormap (GTK_WIDGET (day_view));
-		if (gdk_colormap_alloc_color (colormap, &bg_color, TRUE, TRUE))
-			gdk_gc_set_foreground (gc, &bg_color);
-	}
-
-#if 1
-	if (event->start_row_or_col == 0)
-		gdk_draw_rectangle (drawable, 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, gc, TRUE,
-				    item_x + 1, item_y + 1,
-				    MAX (item_w - 2, 0), item_h - 2);
-
-	gdk_gc_set_foreground (gc, &day_view->colors[E_DAY_VIEW_COLOR_EVENT_VBAR]);
-
-	/* Draw the right edge of the vertical bar. */
-	gdk_gc_set_foreground (gc, &day_view->colors[E_DAY_VIEW_COLOR_EVENT_BORDER]);
-	gdk_draw_line (drawable, 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_CALENDAR_VIEW_POS_NONE
-	    && day_view->resize_event_day == day
-	    && day_view->resize_event_num == event_num) {
-		if (day_view->resize_drag_pos == E_CALENDAR_VIEW_POS_TOP_EDGE)
-			bar_y1 = item_y + 1;
-		else if (day_view->resize_drag_pos == E_CALENDAR_VIEW_POS_BOTTOM_EDGE)
-			bar_y2 = item_y + item_h - 1;
-	}
-
-	comp = e_cal_component_new ();
-	e_cal_component_set_icalcomponent (comp, icalcomponent_new_clone (event->comp_data->icalcomp));
-
-	/* Only fill it in if the event isn't TRANSPARENT. */
-	e_cal_component_get_transparency (comp, &transparency);
-	if (transparency != E_CAL_COMPONENT_TRANSP_TRANSPARENT) {
-		gdk_gc_set_foreground (gc, &day_view->colors[E_DAY_VIEW_COLOR_EVENT_VBAR]);
-		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_gc_set_foreground (gc, &day_view->colors[E_DAY_VIEW_COLOR_EVENT_BORDER]);
-	gdk_draw_rectangle (drawable, gc, FALSE,
-			    item_x, item_y, MAX (item_w - 1, 0), item_h - 1);
-	gdk_gc_set_foreground (gc, &day_view->colors[E_DAY_VIEW_COLOR_EVENT_VBAR]);
-
-#if 0
-	/* Draw the horizontal bars above and beneath the event if it
-	   is currently being edited. */
-	if (day_view->editing_event_day == day
-	    && day_view->editing_event_num == event_num) {
-		gdk_draw_rectangle (drawable, gc, TRUE,
-				    item_x,
-				    item_y - E_DAY_VIEW_BAR_HEIGHT,
-				    item_w,
-				    E_DAY_VIEW_BAR_HEIGHT);
-		gdk_draw_rectangle (drawable, gc, TRUE,
-				    item_x, item_y + item_h,
-				    item_w, E_DAY_VIEW_BAR_HEIGHT);
-	}
-#endif
-
-	/* Draw the reminder & recurrence icons, if needed. */
-	num_icons = 0;
-	draw_reminder_icon = FALSE;
-	draw_recurrence_icon = FALSE;
-	draw_timezone_icon = FALSE;
-	draw_meeting_icon = FALSE;
-	draw_attach_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;
-
-	if (e_cal_component_has_alarms (comp)) {
-		draw_reminder_icon = TRUE;
-		num_icons++;
-	}
-
-	if (e_cal_component_has_recurrences (comp)) {
-		draw_recurrence_icon = TRUE;
-		num_icons++;
-	}
-	if (e_cal_component_has_attachments (comp)) {
-		draw_attach_icon = TRUE;
-		num_icons++;
-	}
-	/* If the DTSTART or DTEND are in a different timezone to our current
-	   timezone, we display the timezone icon. */
-	if (event->different_timezone) {
-		draw_timezone_icon = TRUE;
-		num_icons++;
-	}
-
-	if (e_cal_component_has_organizer (comp)) {
-		draw_meeting_icon = TRUE;
-		num_icons++;
-	}
-
-	e_cal_component_get_categories_list (comp, &categories_list);
-	for (elem = categories_list; elem; elem = elem->next) {
-		char *category;
-		GdkPixmap *pixmap = NULL;
-		GdkBitmap *mask = NULL;
-
-		category = (char *) elem->data;
-		if (e_categories_config_get_icon_for (category, &pixmap, &mask))
-			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_mask (gc, NULL);
-			gdk_draw_pixbuf (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),
-					 GDK_RGB_DITHER_NORMAL,
-					 0, 0);
-			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_mask (gc, NULL);
-			gdk_draw_pixbuf (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_RGB_DITHER_NORMAL,
-					 0, 0);
-			icon_x += icon_x_inc;
-			icon_y += icon_y_inc;
-		}
-		if (draw_attach_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_mask (gc, NULL);
-			gdk_draw_pixbuf (drawable, gc,
-					 day_view->attach_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_RGB_DITHER_NORMAL,
-					 0, 0);
-			icon_x += icon_x_inc;
-			icon_y += icon_y_inc;
-		}
-		if (draw_timezone_icon) {
-			max_icon_w = item_x + item_w - icon_x
-				- E_DAY_VIEW_EVENT_BORDER_WIDTH;
-			max_icon_h = item_y + item_h - icon_y
-				- E_DAY_VIEW_EVENT_BORDER_HEIGHT;
-
-			gdk_gc_set_clip_mask (gc, NULL);
-			gdk_draw_pixbuf (drawable, gc,
-					 day_view->timezone_icon,
-					 0, 0, icon_x, icon_y,
-					 MIN (E_DAY_VIEW_ICON_WIDTH,
-					      max_icon_w),
-					 MIN (E_DAY_VIEW_ICON_HEIGHT,
-					      max_icon_h),
-					 GDK_RGB_DITHER_NORMAL,
-					 0, 0);
-			icon_x += icon_x_inc;
-			icon_y += icon_y_inc;
-		}
-
-
-		if (draw_meeting_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_mask (gc, NULL);
-			gdk_draw_pixbuf (drawable, gc,
-					 day_view->meeting_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_RGB_DITHER_NORMAL,
-					 0, 0);
-			icon_x += icon_x_inc;
-			icon_y += icon_y_inc;
-		}
-
-		/* draw categories icons */
-		for (elem = categories_list; elem; elem = elem->next) {
-			char *category;
-			GdkPixmap *pixmap = NULL;
-			GdkBitmap *mask = NULL;
-
-			category = (char *) elem->data;
-			if (!e_categories_config_get_icon_for (category, &pixmap, &mask))
-				continue;
-
-			max_icon_w = item_x + item_w - icon_x
-				- E_DAY_VIEW_EVENT_BORDER_WIDTH;
-			max_icon_h = item_y + item_h - icon_y
-				- E_DAY_VIEW_EVENT_BORDER_HEIGHT;
-
-			gdk_gc_set_clip_origin (gc, icon_x, icon_y);
-			if (mask != NULL)
-				gdk_gc_set_clip_mask (gc, mask);
-			gdk_draw_pixmap (drawable, gc,
-					 pixmap,
-					 0, 0, icon_x, icon_y,
-					 MIN (E_DAY_VIEW_ICON_WIDTH,
-					      max_icon_w),
-					 MIN (E_DAY_VIEW_ICON_HEIGHT,
-					      max_icon_h));
-
-			gdk_pixmap_unref (pixmap);
-			if (mask != NULL)
-				gdk_bitmap_unref (mask);
-
-			icon_x += icon_x_inc;
-			icon_y += icon_y_inc;
-		}
-		
-		gdk_gc_set_clip_mask (gc, NULL);
-	}
-
-	/* free memory */
-	e_cal_component_free_categories_list (categories_list);
-	g_object_unref (comp);
-}
-
-
-/* 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 be7f130606..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@ximian.com>
- *
- * Copyright 1999, Ximian, Inc.
- * Copyright 1999, Ximian, Inc.
- *
- * This program is free software; you can redistribute it and/or 
- * modify it under the terms of version 2 of the GNU General Public 
- * License as published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public 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 db4b66e54b..0000000000
--- a/calendar/gui/e-day-view-time-item.c
+++ /dev/null
@@ -1,666 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-
-/* 
- * Author : 
- *  Damon Chaplin <damon@ximian.com>
- *
- * Copyright 1999, Ximian, Inc.
- * Copyright 1999, Ximian, Inc.
- *
- * This program is free software; you can redistribute it and/or 
- * modify it under the terms of version 2 of the GNU General Public 
- * License as published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public 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.
- */
-
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
-
-#include <string.h>
-#include <glib.h>
-#include <gtk/gtksignal.h>
-#include <gtk/gtkradiomenuitem.h>
-#include <gtk/gtkcheckmenuitem.h>
-#include <libgnome/gnome-i18n.h>
-#include <gal/widgets/e-gui-utils.h>
-#include "e-day-view-time-item.h"
-#include "calendar-config.h"
-
-
-/* The spacing between items in the time column. GRID_X_PAD is the space down
-   either side of the column, i.e. outside the main horizontal grid lines.
-   HOUR_L_PAD & HOUR_R_PAD are the spaces on the left & right side of the
-   big hour number (this is inside the horizontal grid lines).
-   MIN_X_PAD is the spacing either side of the minute number. The smaller
-   horizontal grid lines match with this.
-   60_MIN_X_PAD is the space either side of the HH:MM display used when
-   we are displaying 60 mins per row (inside the main grid lines).
-   LARGE_HOUR_Y_PAD is the offset of the large hour string from the top of the
-   row.
-   SMALL_FONT_Y_PAD is the offset of the small time/minute string from the top
-   of the row. */
-#define E_DVTMI_TIME_GRID_X_PAD		4
-#define E_DVTMI_HOUR_L_PAD		4
-#define E_DVTMI_HOUR_R_PAD		2
-#define E_DVTMI_MIN_X_PAD		2
-#define E_DVTMI_60_MIN_X_PAD		4
-#define E_DVTMI_LARGE_HOUR_Y_PAD	1
-#define E_DVTMI_SMALL_FONT_Y_PAD	1
-
-static void e_day_view_time_item_set_arg (GtkObject *o,
-					  GtkArg *arg,
-					  guint arg_id);
-
-static void e_day_view_time_item_update (GnomeCanvasItem *item,
-					 double *affine,
-					 ArtSVP *clip_path, int flags);
-static void e_day_view_time_item_draw (GnomeCanvasItem *item,
-				       GdkDrawable *drawable,
-				       int x, int y,
-				       int width, int height);
-static double e_day_view_time_item_point (GnomeCanvasItem *item,
-					  double x, double y,
-					  int cx, int cy,
-					  GnomeCanvasItem **actual_item);
-static gint e_day_view_time_item_event (GnomeCanvasItem *item,
-					GdkEvent *event);
-static void e_day_view_time_item_increment_time	(gint	*hour,
-						 gint	*minute,
-						 gint	 mins_per_row);
-static void e_day_view_time_item_show_popup_menu (EDayViewTimeItem *dvtmitem,
-						  GdkEvent *event);
-static void e_day_view_time_item_on_set_divisions (GtkWidget *item,
-						   EDayViewTimeItem *dvtmitem);
-static void e_day_view_time_item_on_button_press (EDayViewTimeItem *dvtmitem,
-						  GdkEvent *event);
-static void e_day_view_time_item_on_button_release (EDayViewTimeItem *dvtmitem,
-						    GdkEvent *event);
-static void e_day_view_time_item_on_motion_notify (EDayViewTimeItem *dvtmitem,
-						   GdkEvent *event);
-static gint e_day_view_time_item_convert_position_to_row (EDayViewTimeItem *dvtmitem,
-							  gint y);
-
-
-/* The arguments we take */
-enum {
-	ARG_0,
-	ARG_DAY_VIEW
-};
-
-G_DEFINE_TYPE (EDayViewTimeItem, e_day_view_time_item, GNOME_TYPE_CANVAS_ITEM);
-
-static void
-e_day_view_time_item_class_init (EDayViewTimeItemClass *class)
-{
-	GtkObjectClass  *object_class;
-	GnomeCanvasItemClass *item_class;
-
-	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 (e_day_view_time_item_parent_class)->update)
-		(* GNOME_CANVAS_ITEM_CLASS (e_day_view_time_item_parent_class)->update) (item, affine, clip_path, flags);
-
-	/* The item covers the entire canvas area. */
-	item->x1 = 0;
-	item->y1 = 0;
-	item->x2 = INT_MAX;
-	item->y2 = INT_MAX;
-}
-
-
-/* Returns the minimum width needed for the column, by adding up all the
-   maximum widths of the strings. The string widths are all calculated in
-   the style_set handlers of EDayView and EDayViewTimeCanvas. */
-gint
-e_day_view_time_item_get_column_width (EDayViewTimeItem *dvtmitem)
-{
-	EDayView *day_view;
-	GtkStyle *style;
-	gint digit, large_digit_width, max_large_digit_width = 0;
-	gint max_suffix_width, max_minute_or_suffix_width;
-	gint column_width_default, column_width_60_min_rows;
-	PangoContext *context;
-
-	day_view = dvtmitem->day_view;
-	g_return_val_if_fail (day_view != NULL, 0);
-
-	style = gtk_widget_get_style (GTK_WIDGET (day_view));
-	g_return_val_if_fail (style != NULL, 0);
-
-	context = gtk_widget_get_pango_context (GTK_WIDGET (day_view));
-
-	/* Find the maximum width a digit can have. FIXME: We could use pango's
-	 * approximation function, but I worry it won't be precise enough. Also
-	 * it needs a language tag that I don't know where to get. */
-	for (digit = '0'; digit <= '9'; digit++) {
-		PangoLayout *layout;
-		gchar digit_str [2];
-
-		digit_str [0] = digit;
-		digit_str [1] = '\0';
-
-		layout = gtk_widget_create_pango_layout (GTK_WIDGET (day_view), digit_str);
-		pango_layout_set_font_description (layout, day_view->large_font_desc);
-		pango_layout_get_pixel_size (layout, &large_digit_width, NULL);
-		g_object_unref (layout);
-
-		max_large_digit_width = MAX (max_large_digit_width,
-					     large_digit_width);
-	}
-
-	/* Calculate the width of each time column, using the maximum of the
-	   default format with large hour numbers, and the 60-min divisions
-	   format which uses small text. */
-	max_suffix_width = MAX (day_view->am_string_width,
-				day_view->pm_string_width);
-
-	max_minute_or_suffix_width = MAX (max_suffix_width,
-					  day_view->max_minute_width);
-
-	column_width_default = max_large_digit_width * 2
-		+ max_minute_or_suffix_width
-		+ E_DVTMI_MIN_X_PAD * 2
-		+ E_DVTMI_HOUR_L_PAD
-		+ E_DVTMI_HOUR_R_PAD
-		+ E_DVTMI_TIME_GRID_X_PAD * 2;
-
-	column_width_60_min_rows = day_view->max_small_hour_width
-		+ day_view->colon_width
-		+ max_minute_or_suffix_width
-		+ E_DVTMI_60_MIN_X_PAD * 2
-		+ E_DVTMI_TIME_GRID_X_PAD * 2;
-
-	dvtmitem->column_width = MAX (column_width_default,
-				      column_width_60_min_rows);
-
-	return dvtmitem->column_width;
-}
-
-
-/*
- * DRAWING ROUTINES - functions to paint the canvas item.
- */
-
-static void
-e_day_view_time_item_draw (GnomeCanvasItem *canvas_item,
-			   GdkDrawable	   *drawable,
-			   int		    x,
-			   int		    y,
-			   int		    width,
-			   int		    height)
-{
-	EDayView *day_view;
-	EDayViewTimeItem *dvtmitem;
-	GtkStyle *style;
-	GdkGC *fg_gc, *dark_gc;
-	gchar buffer[64], *suffix;
-	gint hour, display_hour, minute, row;
-	gint row_y, start_y, large_hour_y_offset, small_font_y_offset;
-	gint long_line_x1, long_line_x2, short_line_x1;
-	gint large_hour_x2, minute_x2;
-	gint hour_width, minute_width, suffix_width;
-	gint max_suffix_width, max_minute_or_suffix_width;
-	PangoLayout *layout;
-	PangoContext *context;
-	PangoFontDescription *small_font_desc;
-	PangoFontMetrics *large_font_metrics, *small_font_metrics;
-
-	dvtmitem = E_DAY_VIEW_TIME_ITEM (canvas_item);
-	day_view = dvtmitem->day_view;
-	g_return_if_fail (day_view != NULL);
-
-	style = gtk_widget_get_style (GTK_WIDGET (day_view));
-	small_font_desc = style->font_desc;
-
-	context = gtk_widget_get_pango_context (GTK_WIDGET (day_view));
-	large_font_metrics = pango_context_get_metrics (context, day_view->large_font_desc,
-							pango_context_get_language (context));
-	small_font_metrics = pango_context_get_metrics (context, small_font_desc,
-							pango_context_get_language (context));
-
-	fg_gc = style->fg_gc[GTK_STATE_NORMAL];
-	dark_gc = style->dark_gc[GTK_STATE_NORMAL];
-
-	/* The start and end of the long horizontal line between hours. */
-	long_line_x1 = E_DVTMI_TIME_GRID_X_PAD - x;
-	long_line_x2 = dvtmitem->column_width - E_DVTMI_TIME_GRID_X_PAD - x;
-
-	if (day_view->mins_per_row == 60) {
-		/* The right edge of the complete time string in 60-min
-		   divisions, e.g. "14:00" or "2 pm". */
-		minute_x2 = long_line_x2 - E_DVTMI_60_MIN_X_PAD;
-
-		/* These aren't used for 60-minute divisions, but we initialize
-		   them to keep gcc happy. */
-		short_line_x1 = 0;
-		large_hour_x2 = 0;
-	} else {
-		max_suffix_width = MAX (day_view->am_string_width,
-					day_view->pm_string_width);
-
-		max_minute_or_suffix_width = MAX (max_suffix_width,
-						  day_view->max_minute_width);
-
-		/* The start of the short horizontal line between the periods
-		   within each hour. */
-		short_line_x1 = long_line_x2 - E_DVTMI_MIN_X_PAD * 2
-			- max_minute_or_suffix_width;
-
-		/* The right edge of the large hour string. */
-		large_hour_x2 = short_line_x1 - E_DVTMI_HOUR_R_PAD;
-
-		/* The right edge of the minute part of the time. */
-		minute_x2 = long_line_x2 - E_DVTMI_MIN_X_PAD;
-	}
-
-	/* Start with the first hour & minute shown in the EDayView. */
-	hour = day_view->first_hour_shown;
-	minute = day_view->first_minute_shown;
-
-	/* The offset of the large hour string from the top of the row. */
-	large_hour_y_offset = E_DVTMI_LARGE_HOUR_Y_PAD;
-
-	/* The offset of the small time/minute string from top of row. */
-	small_font_y_offset = E_DVTMI_SMALL_FONT_Y_PAD;
-
-	/* Calculate the minimum y position of the first row we need to draw.
-	   This is normally one row height above the 0 position, but if we
-	   are using the large font we may have to go back a bit further. */
-	start_y = 0 - MAX (day_view->row_height,
-			   (pango_font_metrics_get_ascent (large_font_metrics) +
-			    pango_font_metrics_get_descent (large_font_metrics)) / PANGO_SCALE +
-			   E_DVTMI_LARGE_HOUR_Y_PAD);
-
-	/* Step through each row, drawing the times and the horizontal lines
-	   between them. */
-	for (row = 0, row_y = 0 - y;
-	     row < day_view->rows && row_y < height;
-	     row++, row_y += day_view->row_height) {
-
-		/* If the row is above the first row we want to draw just
-		   increment the time and skip to the next row. */
-		if (row_y < start_y) {
-			e_day_view_time_item_increment_time (&hour, &minute,
-							     day_view->mins_per_row);
-			continue;
-		}
-
-		/* Calculate the actual hour number to display. For 12-hour
-		   format we convert 0-23 to 12-11am/12-11pm. */
-		e_day_view_convert_time_to_display (day_view, hour,
-						    &display_hour,
-						    &suffix, &suffix_width);
-
-		if (day_view->mins_per_row == 60) {
-			/* 60 minute intervals - draw a long horizontal line
-			   between hours and display as one long string,
-			   e.g. "14:00" or "2 pm". */
-			gdk_draw_line (drawable, dark_gc,
-				       long_line_x1, row_y,
-				       long_line_x2, row_y);
-
-			if (e_calendar_view_get_use_24_hour_format (E_CALENDAR_VIEW (day_view))) {
-				g_snprintf (buffer, sizeof (buffer), "%i:%02i",
-					    display_hour, minute);
-			} else {
-				g_snprintf (buffer, sizeof (buffer), "%i %s",
-					    display_hour, suffix);
-			}
-
-			layout = gtk_widget_create_pango_layout (GTK_WIDGET (day_view), buffer);
-			pango_layout_get_pixel_size (layout, &minute_width, NULL);
-			gdk_draw_layout (drawable, fg_gc,
-					 minute_x2 - minute_width,
-					 row_y + small_font_y_offset,
-					 layout);
-			g_object_unref (layout);
-		} else {
-			/* 5/10/15/30 minute intervals. */
-
-			if (minute == 0) {
-				/* On the hour - draw a long horizontal line
-				   before the hour and display the hour in the
-				   large font. */
-				gdk_draw_line (drawable, dark_gc,
-					       long_line_x1, row_y,
-					       long_line_x2, row_y);
-
-				g_snprintf (buffer, sizeof (buffer), "%i",
-					    display_hour);
-
-				layout = gtk_widget_create_pango_layout (GTK_WIDGET (day_view), buffer);
-				pango_layout_set_font_description (layout, day_view->large_font_desc);
-				pango_layout_get_pixel_size (layout, &hour_width, NULL);
-				gdk_draw_layout (drawable, fg_gc,
-						 large_hour_x2 - hour_width,
-						 row_y + large_hour_y_offset,
-						 layout);
-				g_object_unref (layout);
-			} else {
-				/* Within the hour - draw a short line before
-				   the time. */
-				gdk_draw_line (drawable, dark_gc,
-					       short_line_x1, row_y,
-					       long_line_x2, row_y);
-			}
-
-			/* Normally we display the minute in each
-			   interval, but when using 30-minute intervals
-			   we don't display the '30'. */
-			if (day_view->mins_per_row != 30 || minute != 30) {
-				/* In 12-hour format we display 'am' or 'pm'
-				   instead of '00'. */
-				if (minute == 0
-				    && !e_calendar_view_get_use_24_hour_format (E_CALENDAR_VIEW (day_view))) {
-					strcpy (buffer, suffix);
-				} else {
-					g_snprintf (buffer, sizeof (buffer),
-						    "%02i", minute);
-				}
-
-				layout = gtk_widget_create_pango_layout (GTK_WIDGET (day_view), buffer);
-				pango_layout_get_pixel_size (layout, &minute_width, NULL);
-				gdk_draw_layout (drawable, fg_gc,
-						 minute_x2 - minute_width,
-						 row_y + small_font_y_offset,
-						 layout);
-				g_object_unref (layout);
-			}
-		}
-
-		e_day_view_time_item_increment_time (&hour, &minute,
-						     day_view->mins_per_row);
-	}
-
-	pango_font_metrics_unref (large_font_metrics);
-	pango_font_metrics_unref (small_font_metrics);
-}
-
-
-/* Increment the time by the 5/10/15/30/60 minute interval.
-   Note that mins_per_row is never > 60, so we never have to
-   worry about adding more than 60 minutes. */
-static void
-e_day_view_time_item_increment_time	(gint	*hour,
-					 gint	*minute,
-					 gint	 mins_per_row)
-{
-	*minute += mins_per_row;
-	if (*minute >= 60) {
-		*minute -= 60;
-		/* Currently we never wrap around to the next day, but
-		   we may do if we display extra timezones. */
-		*hour = (*hour + 1) % 24;
-	}
-}
-
-
-static double
-e_day_view_time_item_point (GnomeCanvasItem *item, double x, double y,
-			    int cx, int cy,
-			    GnomeCanvasItem **actual_item)
-{
-	*actual_item = item;
-	return 0.0;
-}
-
-
-static gint
-e_day_view_time_item_event (GnomeCanvasItem *item,
-			    GdkEvent *event)
-{
-	EDayViewTimeItem *dvtmitem;
-
-	dvtmitem = E_DAY_VIEW_TIME_ITEM (item);
-
-	switch (event->type) {
-	case GDK_BUTTON_PRESS:
-		if (event->button.button == 1) {
-			e_day_view_time_item_on_button_press (dvtmitem, event);
-		} else if (event->button.button == 3) {
-			e_day_view_time_item_show_popup_menu (dvtmitem, event);
-			return TRUE;
-		}
-		break;
-	case GDK_BUTTON_RELEASE:
-		if (event->button.button == 1)
-			e_day_view_time_item_on_button_release (dvtmitem,
-								event);
-		break;
-
-	case GDK_MOTION_NOTIFY:
-		e_day_view_time_item_on_motion_notify (dvtmitem, event);
-		break;
-
-	default:
-		break;
-	}
-
-	return FALSE;
-}
-
-
-static void
-e_day_view_time_item_show_popup_menu (EDayViewTimeItem *dvtmitem,
-				      GdkEvent *event)
-{
-	static gint divisions[] = { 60, 30, 15, 10, 5 };
-	EDayView *day_view;
-	gint num_divisions = sizeof (divisions) / sizeof (divisions[0]);
-	GtkWidget *menu, *item;
-	gchar buffer[256];
-	GSList *group = NULL;
-	gint current_divisions, i;
-
-	day_view = dvtmitem->day_view;
-	g_return_if_fail (day_view != NULL);
-
-	current_divisions = e_day_view_get_mins_per_row (day_view);
-
-	menu = gtk_menu_new ();
-
-	/* Make sure the menu is destroyed when it disappears. */
-	e_auto_kill_popup_menu_on_selection_done (GTK_MENU (menu));
-
-	for (i = 0; i < num_divisions; i++) {
-		g_snprintf (buffer, sizeof (buffer),
-			    _("%02i minute divisions"), divisions[i]);
-		item = gtk_radio_menu_item_new_with_label (group, buffer);
-		group = gtk_radio_menu_item_group (GTK_RADIO_MENU_ITEM (item));
-		gtk_widget_show (item);
-		gtk_menu_append (GTK_MENU (menu), item);
-
-		if (current_divisions == divisions[i])
-			gtk_check_menu_item_set_active (GTK_CHECK_MENU_ITEM (item), TRUE);
-
-		g_object_set_data (G_OBJECT (item), "divisions",
-				   GINT_TO_POINTER (divisions[i]));
-
-		g_signal_connect (item, "toggled",
-				  G_CALLBACK (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_get_active (GTK_CHECK_MENU_ITEM (item)))
-		return;
-
-	divisions = GPOINTER_TO_INT (g_object_get_data (G_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 f425363c98..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@ximian.com>
- *
- * Copyright 1999, Ximian, Inc.
- * Copyright 1999, Ximian, Inc.
- *
- * This program is free software; you can redistribute it and/or 
- * modify it under the terms of version 2 of the GNU General Public 
- * License as published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public 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 a733a7ec17..0000000000
--- a/calendar/gui/e-day-view-top-item.c
+++ /dev/null
@@ -1,728 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-
-/* 
- * Author : 
- *  Damon Chaplin <damon@ximian.com>
- *
- * Copyright 1999, Ximian, Inc.
- *
- * This program is free software; you can redistribute it and/or 
- * modify it under the terms of version 2 of the GNU General Public 
- * License as published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public 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.
- */
-
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
-
-#include <glib.h>
-#include <libgnome/gnome-i18n.h>
-#include "e-util/e-categories-config.h"
-#include <libecal/e-cal-time-util.h>
-#include "e-day-view-top-item.h"
-
-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,
-						 gint             event_num);
-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);
-
-
-/* The arguments we take */
-enum {
-	ARG_0,
-	ARG_DAY_VIEW
-};
-
-G_DEFINE_TYPE (EDayViewTopItem, e_day_view_top_item, GNOME_TYPE_CANVAS_ITEM);
-
-static void
-e_day_view_top_item_class_init (EDayViewTopItemClass *class)
-{
-	GtkObjectClass  *object_class;
-	GnomeCanvasItemClass *item_class;
-
-	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 (e_day_view_top_item_parent_class)->update)
-		(* GNOME_CANVAS_ITEM_CLASS (e_day_view_top_item_parent_class)->update) (item, affine, clip_path, flags);
-
-	/* The item covers the entire canvas area. */
-	item->x1 = 0;
-	item->y1 = 0;
-	item->x2 = INT_MAX;
-	item->y2 = INT_MAX;
-}
-
-
-/*
- * DRAWING ROUTINES - functions to paint the canvas item.
- */
-
-static void
-e_day_view_top_item_draw (GnomeCanvasItem *canvas_item,
-			  GdkDrawable	  *drawable,
-			  int		   x,
-			  int		   y,
-			  int		   width,
-			  int		   height)
-{
-	EDayViewTopItem *dvtitem;
-	EDayView *day_view;
-	GtkStyle *style;
-	GdkGC *gc, *fg_gc, *bg_gc, *light_gc, *dark_gc;
-	gchar buffer[128];
-	GdkRectangle clip_rect;
-	gint canvas_width, canvas_height, left_edge, day, date_width, date_x;
-	gint item_height, event_num;
-	PangoLayout *layout;
-
-#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_get_style (GTK_WIDGET (day_view));
-	gc = day_view->main_gc;
-	fg_gc = style->fg_gc[GTK_STATE_NORMAL];
-	bg_gc = style->bg_gc[GTK_STATE_NORMAL];
-	light_gc = style->light_gc[GTK_STATE_NORMAL];
-	dark_gc = style->dark_gc[GTK_STATE_NORMAL];
-	canvas_width = GTK_WIDGET (canvas_item->canvas)->allocation.width;
-	canvas_height = GTK_WIDGET (canvas_item->canvas)->allocation.height;
-	left_edge = 0;
-	item_height = day_view->top_row_height - E_DAY_VIEW_TOP_CANVAS_Y_GAP;
-
-	/* Draw the shadow around the dates. */
-	gdk_draw_line (drawable, light_gc,
-		       left_edge - x, 1 - y,
-		       canvas_width - 2 - x, 1 - y);
-	gdk_draw_line (drawable, light_gc,
-		       left_edge - x, 2 - y,
-		       left_edge - x, item_height - 2 - y);
-	gdk_draw_line (drawable, dark_gc,
-		       left_edge - x, item_height - 1 - y,
-		       canvas_width - 1 - x, item_height - 1 - y);
-	gdk_draw_line (drawable, dark_gc,
-		       canvas_width - 1 - x, 1 - y,
-		       canvas_width - 1 - x, item_height - 1 - y);
-
-	/* Draw the background for the dates. */
-	gdk_draw_rectangle (drawable, bg_gc, TRUE,
-			    left_edge + 2 - x, 2 - y,
-			    canvas_width - left_edge - 3,
-			    item_height - 3);
-
-	/* Clear the main area background. */
-	gdk_gc_set_foreground (gc, &day_view->colors[E_DAY_VIEW_COLOR_BG_TOP_CANVAS]);
-	gdk_draw_rectangle (drawable, gc, TRUE,
-			    left_edge - x, item_height - y,
-			    canvas_width - left_edge,
-			    canvas_height - item_height);
-
-	/* Draw the selection background. */
-	if (GTK_WIDGET_HAS_FOCUS (day_view)
-	    && day_view->selection_start_day != -1) {
-		gint start_col, end_col, rect_x, rect_y, rect_w, rect_h;
-
-		start_col = day_view->selection_start_day;
-		end_col = day_view->selection_end_day;
-
-		if (end_col > start_col
-		    || day_view->selection_start_row == -1
-		    || day_view->selection_end_row == -1) {
-			rect_x = day_view->day_offsets[start_col];
-			rect_y = item_height;
-			rect_w = day_view->day_offsets[end_col + 1] - rect_x;
-			rect_h = canvas_height - 1 - rect_y;
-
-			gdk_gc_set_foreground (gc, &day_view->colors[E_DAY_VIEW_COLOR_BG_TOP_CANVAS_SELECTED]);
-			gdk_draw_rectangle (drawable, gc, TRUE,
-					    rect_x - x, rect_y - y,
-					    rect_w, rect_h);
-		}
-	}
-
-	/* Draw the date. Set a clipping rectangle so we don't draw over the
-	   next day. */
-	for (day = 0; day < day_view->days_shown; day++) {
-		e_day_view_top_item_get_day_label (day_view, day,
-						   buffer, sizeof (buffer));
-		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);
-
-		layout = gtk_widget_create_pango_layout (GTK_WIDGET (day_view), buffer);
-		pango_layout_get_pixel_size (layout, &date_width, NULL);
-		date_x = day_view->day_offsets[day] + (day_view->day_widths[day] - date_width) / 2;
-
-		gdk_draw_layout (drawable, fg_gc,
-				 date_x - x,
-				 3 - y,
-				 layout);
-		g_object_unref (layout);
-
-		gdk_gc_set_clip_rectangle (fg_gc, NULL);
-
-		/* Draw the lines down the left and right of the date cols. */
-		if (day != 0) {
-			gdk_draw_line (drawable, light_gc,
-				       day_view->day_offsets[day] - x,
-				       4 - y,
-				       day_view->day_offsets[day] - x,
-				       item_height - 4 - y);
-
-			gdk_draw_line (drawable, dark_gc,
-				       day_view->day_offsets[day] - 1 - x,
-				       4 - y,
-				       day_view->day_offsets[day] - 1 - x,
-				       item_height - 4 - y);
-		}
-
-		/* Draw the lines between each column. */
-		if (day != 0) {
-			gdk_gc_set_foreground (gc, &day_view->colors[E_DAY_VIEW_COLOR_BG_TOP_CANVAS_GRID]);
-			gdk_draw_line (drawable, gc,
-				       day_view->day_offsets[day] - x,
-				       item_height - y,
-				       day_view->day_offsets[day] - x,
-				       canvas_height - y);
-		}
-	}
-
-	/* Draw the long events. */
-	for (event_num = 0; event_num < day_view->long_events->len;
-	     event_num++) {
-		e_day_view_top_item_draw_long_event (dvtitem, event_num,
-						     drawable,
-						     x, y, width, height);
-	}
-}
-
-
-/* This draws one event in the top canvas. */
-static void
-e_day_view_top_item_draw_long_event (EDayViewTopItem *dvtitem,
-				     gint	      event_num,
-				     GdkDrawable     *drawable,
-				     int	      x,
-				     int	      y,
-				     int	      width,
-				     int	      height)
-{
-	EDayView *day_view;
-	EDayViewEvent *event;
-	GtkStyle *style;
-	GdkGC *gc, *fg_gc, *bg_gc;
-	gint start_day, end_day;
-	gint item_x, item_y, item_w, item_h;
-	gint text_x, icon_x, icon_y, icon_x_inc;
-	ECalComponent *comp;
-	gchar buffer[16];
-	gint hour, display_hour, minute, offset, time_width, time_x;
-	gint min_end_time_x, suffix_width, max_icon_x;
-	gchar *suffix;
-	gboolean draw_start_triangle, draw_end_triangle;
-	GdkRectangle clip_rect;
-	GSList *categories_list, *elem;
-	PangoLayout *layout;
-	GdkColor bg_color;
-
-	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_get_style (GTK_WIDGET (day_view));
-	gc = day_view->main_gc;
-	fg_gc = style->fg_gc[GTK_STATE_NORMAL];
-	bg_gc = style->bg_gc[GTK_STATE_NORMAL];
-	comp = e_cal_component_new ();
-	e_cal_component_set_icalcomponent (comp, icalcomponent_new_clone (event->comp_data->icalcomp));
-
-	/* Draw the lines across the top & bottom of the entire event. */
-	gdk_gc_set_foreground (gc, &day_view->colors[E_DAY_VIEW_COLOR_LONG_EVENT_BORDER]);
-	gdk_draw_line (drawable, gc,
-		       item_x - x, item_y - y,
-		       item_x + item_w - 1 - x, item_y - y);
-	gdk_draw_line (drawable, gc,
-		       item_x - x, item_y + item_h - 1 - y,
-		       item_x + item_w - 1 - x, item_y + item_h - 1 - y);
-
-	/* Fill it in. */
-	if (gdk_color_parse (e_cal_model_get_color_for_component (e_calendar_view_get_model (E_CALENDAR_VIEW (day_view)),
-								  event->comp_data),
-			     &bg_color)) {
-		GdkColormap *colormap;
-
-		colormap = gtk_widget_get_colormap (GTK_WIDGET (day_view));
-		if (gdk_colormap_alloc_color (colormap, &bg_color, TRUE, TRUE))
-			gdk_gc_set_foreground (gc, &bg_color);
-		else
-			gdk_gc_set_foreground (gc, &day_view->colors[E_DAY_VIEW_COLOR_LONG_EVENT_BACKGROUND]);
-	} else
-		gdk_gc_set_foreground (gc, &day_view->colors[E_DAY_VIEW_COLOR_LONG_EVENT_BACKGROUND]);
-	gdk_draw_rectangle (drawable, gc, TRUE,
-			    item_x - x, item_y + 1 - y,
-			    item_w, item_h - 2);
-
-	/* When resizing we don't draw the triangles.*/
-	draw_start_triangle = TRUE;
-	draw_end_triangle = TRUE;
-	if (day_view->resize_drag_pos != E_CALENDAR_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_CALENDAR_VIEW_POS_LEFT_EDGE)
-			draw_start_triangle = FALSE;
-
-		if  (day_view->resize_drag_pos == E_CALENDAR_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, event_num);
-	} else {
-		gdk_gc_set_foreground (gc, &day_view->colors[E_DAY_VIEW_COLOR_LONG_EVENT_BORDER]);
-		gdk_draw_line (drawable, gc,
-			       item_x - x, item_y - y,
-			       item_x - x, item_y + item_h - 1 - y);
-	}
-
-	/* Similar for the event end. */
-	if (draw_end_triangle
-	    && event->end > day_view->day_starts[end_day + 1]) {
-		e_day_view_top_item_draw_triangle (dvtitem, drawable,
-						   item_x + item_w - 1 - x,
-						   item_y - y,
-						   E_DAY_VIEW_BAR_WIDTH,
-						   item_h, event_num);
-	} else {
-		gdk_gc_set_foreground (gc, &day_view->colors[E_DAY_VIEW_COLOR_LONG_EVENT_BORDER]);
-		gdk_draw_line (drawable, gc,
-			       item_x + item_w - 1 - x,
-			       item_y - y,
-			       item_x + item_w - 1 - x,
-			       item_y + item_h - 1 - y);
-	}
-
-	/* If we are editing the event we don't show the icons or the start
-	   & end times. */
-	if (day_view->editing_event_day == E_DAY_VIEW_LONG_EVENT
-	    && day_view->editing_event_num == event_num)
-		return;
-
-	/* Determine the position of the label, so we know where to place the
-	   icons. Note that since the top canvas never scrolls we don't need
-	   to take the scroll offset into account. It will always be 0. */
-	text_x = event->canvas_item->x1;
-
-	/* Draw the start & end times, if necessary. */
-	min_end_time_x = item_x + E_DAY_VIEW_LONG_EVENT_X_PAD - x;
-
-	time_width = e_day_view_get_time_string_width (day_view);
-
-	if (event->start > day_view->day_starts[start_day]) {
-		offset = day_view->first_hour_shown * 60
-			+ day_view->first_minute_shown + event->start_minute;
-		hour = offset / 60;
-		minute = offset % 60;
-		/* Calculate the actual hour number to display. For 12-hour
-		   format we convert 0-23 to 12-11am/12-11pm. */
-		e_day_view_convert_time_to_display (day_view, hour,
-						    &display_hour,
-						    &suffix, &suffix_width);
-		if (e_calendar_view_get_use_24_hour_format (E_CALENDAR_VIEW (day_view))) {
-			g_snprintf (buffer, sizeof (buffer), "%i:%02i",
-				    display_hour, minute);
-		} else {
-			g_snprintf (buffer, sizeof (buffer), "%i:%02i%s",
-				    display_hour, minute, suffix);
-		}
-
-		clip_rect.x = item_x - x;
-		clip_rect.y = item_y - y;
-		clip_rect.width = item_w - E_DAY_VIEW_LONG_EVENT_BORDER_WIDTH;
-		clip_rect.height = item_h;
-		gdk_gc_set_clip_rectangle (fg_gc, &clip_rect);
-
-		time_x = item_x + E_DAY_VIEW_LONG_EVENT_X_PAD - x;
-		if (display_hour < 10)
-			time_x += day_view->digit_width;
-
-		layout = gtk_widget_create_pango_layout (GTK_WIDGET (day_view), buffer);
-		gdk_draw_layout (drawable, fg_gc,
-				 time_x,
-				 item_y + E_DAY_VIEW_LONG_EVENT_BORDER_HEIGHT +
-				 E_DAY_VIEW_LONG_EVENT_Y_PAD - y,
-				 layout);
-		g_object_unref (layout);
-
-		gdk_gc_set_clip_rectangle (fg_gc, NULL);
-
-		min_end_time_x += time_width
-			+ E_DAY_VIEW_LONG_EVENT_TIME_X_PAD;
-	}
-
-	max_icon_x = item_x + item_w - E_DAY_VIEW_LONG_EVENT_X_PAD
-		- E_DAY_VIEW_ICON_WIDTH;
-
-	if (event->end < day_view->day_starts[end_day + 1]) {
-		offset = day_view->first_hour_shown * 60
-			+ day_view->first_minute_shown
-			+ event->end_minute;
-		hour = offset / 60;
-		minute = offset % 60;
-		time_x = item_x + item_w - E_DAY_VIEW_LONG_EVENT_X_PAD - time_width - E_DAY_VIEW_LONG_EVENT_TIME_X_PAD - x;
-
-		if (time_x >= min_end_time_x) {
-			/* Calculate the actual hour number to display. */
-			e_day_view_convert_time_to_display (day_view, hour,
-							    &display_hour,
-							    &suffix,
-							    &suffix_width);
-			if (e_calendar_view_get_use_24_hour_format (E_CALENDAR_VIEW (day_view))) {
-				g_snprintf (buffer, sizeof (buffer),
-					    "%i:%02i", display_hour, minute);
-			} else {
-				g_snprintf (buffer, sizeof (buffer),
-					    "%i:%02i%s", display_hour, minute,
-					    suffix);
-			}
-
-			if (display_hour < 10)
-				time_x += day_view->digit_width;
-
-			layout = gtk_widget_create_pango_layout (GTK_WIDGET (day_view), buffer);
-			gdk_draw_layout (drawable, fg_gc,
-					 time_x,
-					 item_y + E_DAY_VIEW_LONG_EVENT_Y_PAD + 1 - y,
-					 layout);
-			g_object_unref (layout);
-
-			max_icon_x -= time_width + E_DAY_VIEW_LONG_EVENT_TIME_X_PAD;
-		}
-	}
-
-	/* Draw the icons. */
-	icon_x_inc = E_DAY_VIEW_ICON_WIDTH + E_DAY_VIEW_ICON_X_PAD;
-	icon_x = text_x - E_DAY_VIEW_LONG_EVENT_ICON_R_PAD
-		- icon_x_inc - x;
-	icon_y = item_y + E_DAY_VIEW_LONG_EVENT_BORDER_HEIGHT
-		+ E_DAY_VIEW_ICON_Y_PAD - y;
-
-	if (icon_x <= max_icon_x && e_cal_component_has_recurrences (comp)) {
-		gdk_gc_set_clip_mask (gc, NULL);
-		gdk_draw_pixbuf (drawable, gc,
-				 day_view->recurrence_icon,
-				 0, 0, icon_x, icon_y,
-				 E_DAY_VIEW_ICON_WIDTH,
-				 E_DAY_VIEW_ICON_HEIGHT,
-				 GDK_RGB_DITHER_NORMAL,
-				 0, 0);
-		icon_x -= icon_x_inc;
-	}
-
-	if (icon_x <= max_icon_x && e_cal_component_has_attachments (comp)) {
-		gdk_gc_set_clip_mask (gc, NULL);
-		gdk_draw_pixbuf (drawable, gc,
-				 day_view->attach_icon,
-				 0, 0, icon_x, icon_y,
-				 E_DAY_VIEW_ICON_WIDTH,
-				 E_DAY_VIEW_ICON_HEIGHT,
-				 GDK_RGB_DITHER_NORMAL,
-				 0, 0);
-		icon_x -= icon_x_inc;
-	}
-	if (icon_x <= max_icon_x && e_cal_component_has_alarms (comp)) {
-		gdk_gc_set_clip_mask (gc, NULL);
-		gdk_draw_pixbuf (drawable, gc,
-				 day_view->reminder_icon,
-				 0, 0, icon_x, icon_y,
-				 E_DAY_VIEW_ICON_WIDTH,
-				 E_DAY_VIEW_ICON_HEIGHT,
-				 GDK_RGB_DITHER_NORMAL,
-				 0, 0);
-		icon_x -= icon_x_inc;
-	}
-
-	/* draw categories icons */
-	e_cal_component_get_categories_list (comp, &categories_list);
-	for (elem = categories_list; elem; elem = elem->next) {
-		char *category;
-		GdkPixmap *pixmap = NULL;
-		GdkBitmap *mask = NULL;
-
-		category = (char *) elem->data;
-		e_categories_config_get_icon_for (category, &pixmap, &mask);
-		if (pixmap == NULL)
-			continue;
-
-		if (icon_x <= max_icon_x) {
-			gdk_gc_set_clip_origin (gc, icon_x, icon_y);
-			if (mask != NULL)
-				gdk_gc_set_clip_mask (gc, mask);
-			gdk_draw_pixmap (drawable, gc,
-					 pixmap,
-					 0, 0, icon_x, icon_y,
-					 E_DAY_VIEW_ICON_WIDTH,
-					 E_DAY_VIEW_ICON_HEIGHT);
-			icon_x -= icon_x_inc;
-		}
-
-		gdk_pixmap_unref (pixmap);
-		if (mask != NULL)
-			gdk_bitmap_unref (mask);
-	}
-
-	e_cal_component_free_categories_list (categories_list);
-	g_object_unref (comp);
-
-	gdk_gc_set_clip_mask (gc, NULL);
-}
-
-
-/* This draws a little triangle to indicate that an event extends past
-   the days visible on screen. */
-static void
-e_day_view_top_item_draw_triangle (EDayViewTopItem *dvtitem,
-				   GdkDrawable	   *drawable,
-				   gint		    x,
-				   gint		    y,
-				   gint		    w,
-				   gint		    h,
-				   gint             event_num)
-{
-	EDayView *day_view;
-	EDayViewEvent *event;
-	GtkStyle *style;
-	GdkGC *gc;
-	GdkColor bg_color;
-	GdkPoint points[3];
-	gint c1, c2;
-
-	day_view = dvtitem->day_view;
-
-	style = GTK_WIDGET (day_view)->style;
-	gc = day_view->main_gc;
-
-	points[0].x = x;
-	points[0].y = y;
-	points[1].x = x + w;
-	points[1].y = y + (h / 2);
-	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--;
-
-	event = &g_array_index (day_view->long_events, EDayViewEvent,
-				event_num);
-
-	/* Fill it in. */
-	if (gdk_color_parse (e_cal_model_get_color_for_component (e_calendar_view_get_model (E_CALENDAR_VIEW (day_view)),
-								  event->comp_data),
-			     &bg_color)) {
-		GdkColormap *colormap;
-
-		colormap = gtk_widget_get_colormap (GTK_WIDGET (day_view));
-		if (gdk_colormap_alloc_color (colormap, &bg_color, TRUE, TRUE))
-			gdk_gc_set_foreground (gc, &bg_color);
-		else
-			gdk_gc_set_foreground (gc, &day_view->colors[E_DAY_VIEW_COLOR_LONG_EVENT_BACKGROUND]);
-	} else
-		gdk_gc_set_foreground (gc, &day_view->colors[E_DAY_VIEW_COLOR_LONG_EVENT_BACKGROUND]);
-
-	gdk_draw_polygon (drawable, gc, TRUE, points, 3);
-
-	gdk_gc_set_foreground (gc, &day_view->colors[E_DAY_VIEW_COLOR_LONG_EVENT_BORDER]);
-	gdk_draw_line (drawable, gc, x, y, x + w, c1);
-	gdk_draw_line (drawable, gc, x, y + h - 1, x + w, c2);
-}
-
-
-/* This is supposed to return the nearest item the the point and the distance.
-   Since we are the only item we just return ourself and 0 for the distance.
-   This is needed so that we get button/motion events. */
-static double
-e_day_view_top_item_point (GnomeCanvasItem *item, double x, double y,
-			   int cx, int cy,
-			   GnomeCanvasItem **actual_item)
-{
-	*actual_item = item;
-	return 0.0;
-}
-
-
-static gint
-e_day_view_top_item_event (GnomeCanvasItem *item, GdkEvent *event)
-{
-	EDayViewTopItem *dvtitem;
-
-	dvtitem = E_DAY_VIEW_TOP_ITEM (item);
-
-	switch (event->type) {
-	case GDK_BUTTON_PRESS:
-
-	case GDK_BUTTON_RELEASE:
-
-	case GDK_MOTION_NOTIFY:
-
-	default:
-		break;
-	}
-
-	return FALSE;
-}
-
-void
-e_day_view_top_item_get_day_label (EDayView *day_view, gint day,
-				   gchar *buffer, gint buffer_len)
-{
-	struct icaltimetype day_start_tt;
-	struct tm day_start = { 0 };
-	gchar *format;
-
-	day_start_tt = icaltime_from_timet_with_zone (day_view->day_starts[day],
-						      FALSE,
-						      e_calendar_view_get_timezone (E_CALENDAR_VIEW (day_view)));
-	day_start.tm_year = day_start_tt.year - 1900;
-	day_start.tm_mon = day_start_tt.month - 1;
-	day_start.tm_mday = day_start_tt.day;
-	day_start.tm_isdst = -1;
-
-	day_start.tm_wday = time_day_of_week (day_start_tt.day,
-					      day_start_tt.month - 1,
-					      day_start_tt.year);
-
-	if (day_view->date_format == E_DAY_VIEW_DATE_FULL)
-		/* strftime format %A = full weekday name, %d = day of month,
-		   %B = full month name. Don't use any other specifiers. */
-		format = _("%A %d %B");
-	else if (day_view->date_format == E_DAY_VIEW_DATE_ABBREVIATED)
-		/* strftime format %a = abbreviated weekday name, %d = day of month,
-		   %b = abbreviated month name. Don't use any other specifiers. */
-		format = _("%a %d %b");
-	else if (day_view->date_format == E_DAY_VIEW_DATE_NO_WEEKDAY)
-		/* strftime format %d = day of month, %b = abbreviated month name.
-		   Don't use any other specifiers. */
-		format = _("%d %b");
-	else
-		format = "%d";
-
-	e_utf8_strftime (buffer, buffer_len, format, &day_start);
-}
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 9b8342af99..0000000000
--- a/calendar/gui/e-day-view-top-item.h
+++ /dev/null
@@ -1,66 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-
-/* 
- * Author : 
- *  Damon Chaplin <damon@ximian.com>
- *
- * Copyright 1999, Ximian, Inc.
- * Copyright 1999, Ximian, Inc.
- *
- * This program is free software; you can redistribute it and/or 
- * modify it under the terms of version 2 of the GNU General Public 
- * License as published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public 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);
-void e_day_view_top_item_get_day_label (EDayView *day_view, gint day,
-					gchar *buffer, gint buffer_len);
-
-
-#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 c5af654028..0000000000
--- a/calendar/gui/e-day-view.c
+++ /dev/null
@@ -1,7505 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-
-/*
- * Authors :
- *  Damon Chaplin <damon@ximian.com>
- *  Rodrigo Moya <rodrigo@ximian.com>
- *
- * Copyright 1999-2003, Ximian, Inc.
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of version 2 of the GNU General Public
- * License as published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
- * USA
- */
-
-/*
- * EDayView - displays the Day & Work-Week views of the calendar.
- */
-
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
-
-#include "e-day-view.h"
-#include "ea-calendar.h"
-
-#include <math.h>
-#include <time.h>
-#include <gdk/gdkkeysyms.h>
-#include <gdk/gdkx.h>
-#include <gtk/gtkdnd.h>
-#include <gtk/gtkmain.h>
-#include <gtk/gtksignal.h>
-#include <gtk/gtkvscrollbar.h>
-#include <gtk/gtkwindow.h>
-#include <gal/e-text/e-text.h>
-#include <gal/widgets/e-canvas-utils.h>
-#include <gal/widgets/e-popup-menu.h>
-#include <gal/widgets/e-gui-utils.h>
-#include <gal/widgets/e-unicode.h>
-#include <libgnomecanvas/gnome-canvas-rect-ellipse.h>
-#include <libgnome/gnome-i18n.h>
-#include <libgnome/gnome-exec.h>
-#include <libgnome/gnome-util.h>
-#include <e-util/e-categories-config.h>
-#include <e-util/e-dialog-utils.h>
-
-#include <libecal/e-cal-time-util.h>
-#include "dialogs/delete-comp.h"
-#include "dialogs/delete-error.h"
-#include "dialogs/send-comp.h"
-#include "dialogs/cancel-comp.h"
-#include "dialogs/recur-comp.h"
-#include "print.h"
-#include "comp-util.h"
-#include "itip-utils.h"
-#include "calendar-commands.h"
-#include "calendar-config.h"
-#include "goto.h"
-#include "e-cal-model-calendar.h"
-#include "e-day-view-time-item.h"
-#include "e-day-view-top-item.h"
-#include "e-day-view-layout.h"
-#include "e-day-view-main-item.h"
-#include "misc.h"
-#include <e-util/e-icon-factory.h>
-
-/* 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_PTSIZE 18
-
-/* The offset from the top/bottom of the canvas before auto-scrolling starts.*/
-#define E_DAY_VIEW_AUTO_SCROLL_OFFSET	16
-
-/* The time between each auto-scroll, in milliseconds. */
-#define E_DAY_VIEW_AUTO_SCROLL_TIMEOUT	50
-
-/* The number of timeouts we skip before we start scrolling. */
-#define E_DAY_VIEW_AUTO_SCROLL_DELAY	5
-
-/* The number of pixels the mouse has to be moved with the button down before
-   we start a drag. */
-#define E_DAY_VIEW_DRAG_START_OFFSET	4
-
-/* The amount we scroll the main canvas when the Page Up/Down keys are pressed,
-   as a fraction of the page size. */
-#define E_DAY_VIEW_PAGE_STEP		0.5
-
-/* The amount we scroll the main canvas when the mouse wheel buttons are
-   pressed, as a fraction of the page size. */
-#define E_DAY_VIEW_WHEEL_MOUSE_STEP_SIZE	0.25
-
-/* The timeout before we do a layout, so we don't do a layout for each event
-   we get from the server. */
-#define E_DAY_VIEW_LAYOUT_TIMEOUT	100
-
-typedef struct {
-	EDayView *day_view;
-	ECalModelComponent *comp_data;
-} AddEventData;
-
-/* Drag and Drop stuff. */
-enum {
-	TARGET_CALENDAR_EVENT,
-	TARGET_VCALENDAR
-};
-static GtkTargetEntry target_table[] = {
-	{ "application/x-e-calendar-event",     0, TARGET_CALENDAR_EVENT },
-	{ "text/x-calendar",                    0, TARGET_VCALENDAR },
-	{ "text/calendar",                      0, TARGET_VCALENDAR }
-};
-static guint n_targets = sizeof(target_table) / sizeof(target_table[0]);
-
-static void e_day_view_destroy (GtkObject *object);
-static void e_day_view_realize (GtkWidget *widget);
-static void e_day_view_set_colors(EDayView *day_view, 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 gboolean e_day_view_key_press (GtkWidget *widget,
-				      GdkEventKey *event);
-static gboolean e_day_view_focus (GtkWidget *widget,
- 				  GtkDirectionType direction);
-static gboolean e_day_view_get_next_tab_event (EDayView *day_view,
-					       GtkDirectionType direction,
-					       gint *day, gint *event_num);
-static gboolean e_day_view_get_extreme_long_event (EDayView *day_view,
-						   gboolean first,
-						   gint *day_out,
-						   gint *event_num_out);
-static gboolean e_day_view_get_extreme_event (EDayView *day_view,
-					      gint start_day,
-					      gint end_day,
-					      gboolean first,
-					      gint *day_out,
-					      gint *event_num_out);
-static gboolean e_day_view_do_key_press (GtkWidget *widget,
-					 GdkEventKey *event);
-static gboolean e_day_view_popup_menu (GtkWidget *widget);
-static GList *e_day_view_get_selected_events (ECalendarView *cal_view);
-static gboolean e_day_view_get_selected_time_range (ECalendarView *cal_view, time_t *start_time, time_t *end_time);
-static void e_day_view_set_selected_time_range (ECalendarView *cal_view, time_t start_time, time_t end_time);
-static gboolean e_day_view_get_visible_time_range (ECalendarView *cal_view, time_t *start_time, time_t *end_time);
-static void e_day_view_update_query (EDayView *day_view);
-static void e_day_view_goto_start_of_work_day (EDayView *day_view);
-static void e_day_view_goto_end_of_work_day (EDayView *day_view);
-static void e_day_view_change_duration_to_start_of_work_day (EDayView *day_view);
-static void e_day_view_change_duration_to_end_of_work_day (EDayView *day_view);
-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_scroll	(EDayView	*day_view,
-				 gfloat		 pages_to_scroll);
-
-static gboolean e_day_view_check_if_new_event_fits (EDayView *day_view);
-
-static void e_day_view_on_canvas_realized (GtkWidget *widget,
-					   EDayView *day_view);
-
-static gboolean e_day_view_on_top_canvas_button_press (GtkWidget *widget,
-						       GdkEventButton *event,
-						       EDayView *day_view);
-static gboolean e_day_view_on_top_canvas_button_release (GtkWidget *widget,
-							 GdkEventButton *event,
-							 EDayView *day_view);
-static gboolean e_day_view_on_top_canvas_motion (GtkWidget *widget,
-						 GdkEventMotion *event,
-						 EDayView *day_view);
-
-static gboolean e_day_view_on_main_canvas_button_press (GtkWidget *widget,
-							GdkEventButton *event,
-							EDayView *day_view);
-static gboolean e_day_view_on_main_canvas_button_release (GtkWidget *widget,
-							  GdkEventButton *event,
-							  EDayView *day_view);
-static gboolean e_day_view_on_main_canvas_scroll (GtkWidget *widget,
-						  GdkEventScroll *scroll,
-						  EDayView *day_view);
-
-static gboolean e_day_view_on_time_canvas_scroll (GtkWidget *widget,
-						  GdkEventScroll *scroll,
-						  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,
-						       ECalendarViewPosition  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,
-						  ECalendarViewPosition pos,
-						  gint		  event_x,
-						  gint		  event_y);
-static void e_day_view_on_long_event_click (EDayView *day_view,
-					    gint event_num,
-					    GdkEventButton  *bevent,
-					    ECalendarViewPosition 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,
-				       ECalendarViewPosition 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_show_popup_menu (EDayView *day_view,
-					GdkEvent *gdk_event,
-					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 ECalendarViewPosition e_day_view_convert_position_in_top_canvas (EDayView *day_view,
-								   gint x,
-								   gint y,
-								   gint *day_return,
-								   gint *event_num_return);
-static ECalendarViewPosition 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_uid (EDayView *day_view,
-						ECal *client,
-						const gchar *uid,
-						const gchar *rid,
-						gint *day_return,
-						gint *event_num_return);
-
-typedef gboolean (* EDayViewForeachEventCallback) (EDayView *day_view,
-						   gint day,
-						   gint event_num,
-						   gpointer data);
-
-static void e_day_view_foreach_event		(EDayView	*day_view,
-						 EDayViewForeachEventCallback callback,
-						 gpointer	 data);
-static void e_day_view_foreach_event_with_uid (EDayView *day_view,
-					       const gchar *uid,
-					       EDayViewForeachEventCallback callback,
-					       gpointer data);
-
-static void e_day_view_free_events (EDayView *day_view);
-static void e_day_view_free_event_array (EDayView *day_view,
-					 GArray *array);
-static int e_day_view_add_event (ECalComponent *comp,
-				 time_t	  start,
-				 time_t	  end,
-				 gpointer data);
-static void e_day_view_update_event_label (EDayView *day_view,
-					   gint day,
-					   gint event_num);
-static void e_day_view_update_long_event_label (EDayView *day_view,
-						gint event_num);
-
-static void e_day_view_reshape_long_events (EDayView *day_view);
-static void e_day_view_reshape_long_event (EDayView *day_view,
-					   gint event_num);
-static void e_day_view_reshape_day_events (EDayView *day_view,
-					   gint day);
-static void e_day_view_reshape_day_event (EDayView *day_view,
-					  gint	day,
-					  gint	event_num);
-static void e_day_view_reshape_main_canvas_resize_bars (EDayView *day_view);
-static void e_day_view_reshape_resize_long_event_rect_item (EDayView *day_view);
-static void e_day_view_reshape_resize_rect_item (EDayView *day_view);
-
-static void e_day_view_ensure_events_sorted (EDayView *day_view);
-
-static void e_day_view_start_editing_event (EDayView *day_view,
-					    gint day,
-					    gint event_num,
-					    gchar *initial_text);
-static void e_day_view_stop_editing_event (EDayView *day_view);
-static gboolean e_day_view_on_text_item_event (GnomeCanvasItem *item,
-					       GdkEvent *event,
-					       EDayView *day_view);
-static gboolean e_day_view_event_move (ECalendarView *cal_view, ECalViewMoveDirection direction);
-static void e_day_view_change_event_time (EDayView *day_view, time_t start_dt,
-time_t end_dt);
-static void e_day_view_change_event_end_time_up (EDayView *day_view);
-static void e_day_view_change_event_end_time_down (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 EDayViewEvent* e_day_view_get_popup_menu_event (EDayView *day_view);
-
-static gboolean 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 gboolean e_day_view_on_main_canvas_drag_motion (GtkWidget      *widget,
-						       GdkDragContext *context,
-						       gint            x,
-						       gint            y,
-						       guint           time,
-						       EDayView	  *day_view);
-static void e_day_view_reshape_main_canvas_drag_item (EDayView *day_view);
-static void e_day_view_update_main_canvas_drag (EDayView *day_view,
-						gint row,
-						gint day);
-static void e_day_view_on_top_canvas_drag_leave (GtkWidget      *widget,
-						 GdkDragContext *context,
-						 guint           time,
-						 EDayView	     *day_view);
-static void e_day_view_on_main_canvas_drag_leave (GtkWidget      *widget,
-						  GdkDragContext *context,
-						  guint           time,
-						  EDayView	 *day_view);
-static void e_day_view_on_drag_begin (GtkWidget      *widget,
-				      GdkDragContext *context,
-				      EDayView	   *day_view);
-static void e_day_view_on_drag_end (GtkWidget      *widget,
-				    GdkDragContext *context,
-				    EDayView       *day_view);
-static void e_day_view_on_drag_data_get (GtkWidget          *widget,
-					 GdkDragContext     *context,
-					 GtkSelectionData   *selection_data,
-					 guint               info,
-					 guint               time,
-					 EDayView		*day_view);
-static void e_day_view_on_top_canvas_drag_data_received (GtkWidget	*widget,
-							 GdkDragContext *context,
-							 gint            x,
-							 gint            y,
-							 GtkSelectionData *data,
-							 guint           info,
-							 guint           time,
-							 EDayView	*day_view);
-static void e_day_view_on_main_canvas_drag_data_received (GtkWidget      *widget,
-							  GdkDragContext *context,
-							  gint            x,
-							  gint            y,
-							  GtkSelectionData *data,
-							  guint           info,
-							  guint           time,
-							  EDayView	 *day_view);
-
-static gboolean e_day_view_update_event_cb (EDayView *day_view,
-					    gint day,
-					    gint event_num,
-					    gpointer data);
-static gboolean e_day_view_remove_event_cb (EDayView *day_view,
-					    gint day,
-					    gint event_num,
-					    gpointer data);
-static void e_day_view_normalize_selection (EDayView *day_view);
-static gboolean e_day_view_set_show_times_cb	(EDayView	*day_view,
-						 gint		 day,
-						 gint		 event_num,
-						 gpointer	 data);
-static time_t e_day_view_find_work_week_start	(EDayView	*day_view,
-						 time_t		 start_time);
-static void e_day_view_recalc_work_week		(EDayView	*day_view);
-static void e_day_view_recalc_work_week_days_shown	(EDayView	*day_view);
-
-static void e_day_view_queue_layout (EDayView *day_view);
-static void e_day_view_cancel_layout (EDayView *day_view);
-static gboolean e_day_view_layout_timeout_cb (gpointer data);
-
-G_DEFINE_TYPE (EDayView, e_day_view, E_TYPE_CALENDAR_VIEW);
-
-static void
-e_day_view_class_init (EDayViewClass *class)
-{
-	GtkObjectClass *object_class;
-	GtkWidgetClass *widget_class;
-	ECalendarViewClass *view_class;
-
-	object_class = (GtkObjectClass *) class;
-	widget_class = (GtkWidgetClass *) class;
-	view_class = (ECalendarViewClass *) 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;
- 	widget_class->focus             = e_day_view_focus;
-	widget_class->popup_menu        = e_day_view_popup_menu;
-
-	view_class->get_selected_events = e_day_view_get_selected_events;
-	view_class->get_selected_time_range = e_day_view_get_selected_time_range;
-	view_class->set_selected_time_range = e_day_view_set_selected_time_range;
-	view_class->get_visible_time_range = e_day_view_get_visible_time_range;
-
-	/* init the accessibility support for e_day_view */
- 	e_day_view_a11y_init ();
-}
-
-static void
-time_range_changed_cb (ECalModel *model, time_t start_time, time_t end_time, gpointer user_data)
-{
-	EDayView *day_view = E_DAY_VIEW (user_data);
-	time_t lower;
-
-	g_return_if_fail (E_IS_DAY_VIEW (day_view));
-
-	/* Calculate the first day that should be shown, based on start_time
-	   and the days_shown setting. If we are showing 1 day it is just the
-	   start of the day given by start_time, otherwise it is the previous
-	   work-week start day. */
-	if (!day_view->work_week_view) {
-		lower = time_day_begin_with_zone (start_time, e_calendar_view_get_timezone (E_CALENDAR_VIEW (day_view)));
-	} else {
-		lower = e_day_view_find_work_week_start (day_view, start_time);
-	}
-		
-	/* See if we need to change the days shown. */
-	if (lower != day_view->lower)
-		e_day_view_recalc_day_starts (day_view, lower);
-
-	/* If we don't show the new selection, don't preserve it */
-	if (day_view->selection_start_day == -1 || day_view->days_shown <= day_view->selection_start_day)
-		e_day_view_set_selected_time_range (E_CALENDAR_VIEW (day_view), start_time, end_time);
-}
-
-
-static void
-process_component (EDayView *day_view, ECalModelComponent *comp_data)
-{
-	EDayViewEvent *event;
-	gint day, event_num;
-	const char *uid, *rid;
-	ECalComponent *comp;
-	AddEventData add_event_data;
-
-	/* If our time hasn't been set yet, just return. */
-	if (day_view->lower == 0 && day_view->upper == 0)
-		return;
-
-	comp = e_cal_component_new ();
-	if (!e_cal_component_set_icalcomponent (comp, icalcomponent_new_clone (comp_data->icalcomp))) {
-		g_object_unref (comp);
-
-		g_message (G_STRLOC ": Could not set icalcomponent on ECalComponent");
-		return;
-	}
-
-	e_cal_component_get_uid (comp, &uid);
-	if (e_cal_component_is_instance (comp))
-		rid = e_cal_component_get_recurid_as_string (comp);
-	else
-		rid = NULL;
-
-	/* Add the object */
-	add_event_data.day_view = day_view;
-	add_event_data.comp_data = comp_data;
-	e_day_view_add_event (comp, comp_data->instance_start, comp_data->instance_end, &add_event_data);
-
-	g_object_unref (comp);
-}
-
-static void
-update_row (EDayView *day_view, int row)
-{
-	ECalModelComponent *comp_data;
-	ECalModel *model;
-
-	e_day_view_stop_editing_event (day_view);
-
-	model = e_calendar_view_get_model (E_CALENDAR_VIEW (day_view));
-	comp_data = e_cal_model_get_component_at (model, row);
-	g_assert (comp_data != NULL);
-	process_component (day_view, comp_data);
-
-	gtk_widget_queue_draw (day_view->top_canvas);
-	gtk_widget_queue_draw (day_view->main_canvas);
-	e_day_view_queue_layout (day_view);
-}
-
-static void
-model_row_changed_cb (ETableModel *etm, int row, gpointer user_data)
-{
-	EDayView *day_view = E_DAY_VIEW (user_data);
-
-	update_row (day_view, row);
-}
-
-static void
-model_cell_changed_cb (ETableModel *etm, int col, int row, gpointer user_data)
-{
-	EDayView *day_view = E_DAY_VIEW (user_data);
-
-	update_row (day_view, row);
-}
-
-static void
-model_rows_inserted_cb (ETableModel *etm, int row, int count, gpointer user_data)
-{
-	EDayView *day_view = E_DAY_VIEW (user_data);
-	ECalModel *model;
-	int i;
-
-	e_day_view_stop_editing_event (day_view);
-
-	model = e_calendar_view_get_model (E_CALENDAR_VIEW (day_view));
-	for (i = 0; i < count; i++) {
-		ECalModelComponent *comp_data;
-
-		comp_data = e_cal_model_get_component_at (model, row + i);
-		g_assert (comp_data != NULL);
-		process_component (day_view, comp_data);
-	}
-
-	gtk_widget_queue_draw (day_view->top_canvas);
-	gtk_widget_queue_draw (day_view->main_canvas);
-	e_day_view_queue_layout (day_view);
-
-}
-
-static void
-model_rows_deleted_cb (ETableModel *etm, int row, int count, gpointer user_data)
-{
-	EDayView *day_view = E_DAY_VIEW (user_data);
-	int i;
-	
-	e_day_view_stop_editing_event (day_view);
-	
-	for (i = row + count; i > row; i--) {
-		gint day, event_num;
-		const char *uid, *rid = NULL;
-		ECalModelComponent *comp_data;
-
-		comp_data = e_cal_model_get_component_at (E_CAL_MODEL (etm), i - 1);
-		if (!comp_data)
-			continue;
-
-		uid = icalcomponent_get_uid (comp_data->icalcomp);
-		if (e_cal_util_component_is_instance (comp_data->icalcomp)) {
-			icalproperty *prop;
-
-			prop = icalcomponent_get_first_property (comp_data->icalcomp, ICAL_RECURRENCEID_PROPERTY);
-			if (prop)
-				rid = icaltime_as_ical_string (icalcomponent_get_recurrenceid (comp_data->icalcomp));
-		}
-
-		if (e_day_view_find_event_from_uid (day_view, comp_data->client, uid, rid, &day, &event_num))
-			e_day_view_remove_event_cb (day_view, day, event_num, NULL);
-	}
-	
-	gtk_widget_queue_draw (day_view->top_canvas);
-	gtk_widget_queue_draw (day_view->main_canvas);
-	e_day_view_queue_layout (day_view);
-}
-
-static void
-timezone_changed_cb (ECalendarView *cal_view, icaltimezone *old_zone,
-		     icaltimezone *new_zone, gpointer user_data)
-{
-	struct icaltimetype tt;
-	time_t lower;
-	EDayView *day_view = (EDayView *) cal_view;
-
-	g_return_if_fail (E_IS_DAY_VIEW (day_view));
-
-	/* If our time hasn't been set yet, just return. */
-	if (day_view->lower == 0 && day_view->upper == 0)
-		return;
-
-	/* Recalculate the new start of the first day. We just use exactly
-	   the same time, but with the new timezone. */
-	tt = icaltime_from_timet_with_zone (day_view->lower, FALSE,
-					    old_zone);
-
-	lower = icaltime_as_timet_with_zone (tt, new_zone);
-
-	e_day_view_recalc_day_starts (day_view, lower);
-	e_day_view_update_query (day_view);
-}
-
-static void
-e_day_view_init (EDayView *day_view)
-{
-	gint day;
-	GnomeCanvasGroup *canvas_group;
-	ECalModel *model;
-	
-	GTK_WIDGET_SET_FLAGS (day_view, GTK_CAN_FOCUS);
-
-	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->layout_timeout_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;
-
-	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->show_event_end_times = TRUE;
-	day_view->week_start_day = 0;
-	day_view->scroll_to_work_day = TRUE;
-
-	day_view->editing_event_day = -1;
-	day_view->editing_event_num = -1;
-
-	day_view->resize_event_num = -1;
-	day_view->resize_bars_event_day = -1;
-	day_view->resize_bars_event_num = -1;
-
-	day_view->last_edited_comp_string = NULL;
-
-	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_CALENDAR_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;
-
-	day_view->large_font_desc = NULL;
-
-	/* String to use in 12-hour time format for times in the morning. */
-	day_view->am_string = _("am");
-
-	/* String to use in 12-hour time format for times in the afternoon. */
-	day_view->pm_string = _("pm");
-
-
-	/*
-	 * Top Canvas
-	 */
-	day_view->top_canvas = e_canvas_new ();
-	gtk_table_attach (GTK_TABLE (day_view), day_view->top_canvas,
-			  1, 2, 0, 1, GTK_EXPAND | GTK_FILL, GTK_FILL, 0, 0);
-	gtk_widget_show (day_view->top_canvas);
-	g_signal_connect_after (day_view->top_canvas, "button_press_event",
-				G_CALLBACK (e_day_view_on_top_canvas_button_press), day_view);
-	g_signal_connect (day_view->top_canvas, "button_release_event",
-			  G_CALLBACK (e_day_view_on_top_canvas_button_release), day_view);
-	g_signal_connect (day_view->top_canvas, "motion_notify_event",
-			  G_CALLBACK (e_day_view_on_top_canvas_motion), day_view);
-	g_signal_connect (day_view->top_canvas, "drag_motion",
-			  G_CALLBACK (e_day_view_on_top_canvas_drag_motion), day_view);
-	g_signal_connect (day_view->top_canvas, "drag_leave",
-			  G_CALLBACK (e_day_view_on_top_canvas_drag_leave), day_view);
-
-	g_signal_connect (day_view->top_canvas, "drag_begin",
-			  G_CALLBACK (e_day_view_on_drag_begin), day_view);
-	g_signal_connect (day_view->top_canvas, "drag_end",
-			  G_CALLBACK (e_day_view_on_drag_end), day_view);
-	g_signal_connect (day_view->top_canvas, "drag_data_get",
-			  G_CALLBACK (e_day_view_on_drag_data_get), day_view);
-	g_signal_connect (day_view->top_canvas, "drag_data_received",
-			  G_CALLBACK (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(),
-				       "width_pixels", 1,
-				       NULL);
-	gnome_canvas_item_hide (day_view->resize_long_event_rect_item);
-
-	day_view->drag_long_event_rect_item =
-		gnome_canvas_item_new (canvas_group,
-				       gnome_canvas_rect_get_type (),
-				       "width_pixels", 1,
-				       NULL);
-	gnome_canvas_item_hide (day_view->drag_long_event_rect_item);
-
-	day_view->drag_long_event_item =
-		gnome_canvas_item_new (canvas_group,
-				       e_text_get_type (),
-				       "anchor", GTK_ANCHOR_NW,
-				       "line_wrap", TRUE,
-				       "clip", TRUE,
-				       "max_lines", 1,
-				       "editable", TRUE,
-				       "draw_background", FALSE,
-				       "fill_color_rgba", GNOME_CANVAS_COLOR(0, 0, 0),
-				       NULL);
-	gnome_canvas_item_hide (day_view->drag_long_event_item);
-
-	/*
-	 * Main Canvas
-	 */
-	day_view->main_canvas = e_canvas_new ();
-	gtk_table_attach (GTK_TABLE (day_view), day_view->main_canvas,
-			  1, 2, 1, 2,
-			  GTK_EXPAND | GTK_FILL, GTK_EXPAND | GTK_FILL, 0, 0);
-	gtk_widget_show (day_view->main_canvas);
-	g_signal_connect (day_view->main_canvas, "realize",
-			  G_CALLBACK (e_day_view_on_canvas_realized), day_view);
-
-	g_signal_connect (day_view->main_canvas,
-			  "button_press_event",
-			  G_CALLBACK (e_day_view_on_main_canvas_button_press),
-			  day_view);
-	g_signal_connect (day_view->main_canvas,
-			  "button_release_event",
-			  G_CALLBACK (e_day_view_on_main_canvas_button_release),
-			  day_view);
-	g_signal_connect (day_view->main_canvas,
-			  "scroll_event",
-			  G_CALLBACK (e_day_view_on_main_canvas_scroll),
-			  day_view);
-	g_signal_connect (day_view->main_canvas,
-			  "motion_notify_event",
-			  G_CALLBACK (e_day_view_on_main_canvas_motion),
-			  day_view);
-	g_signal_connect (day_view->main_canvas,
-			  "drag_motion",
-			  G_CALLBACK (e_day_view_on_main_canvas_drag_motion),
-			  day_view);
-	g_signal_connect (day_view->main_canvas,
-			  "drag_leave",
-			  G_CALLBACK (e_day_view_on_main_canvas_drag_leave),
-			  day_view);
-
-	g_signal_connect (day_view->main_canvas, "drag_begin",
-			  G_CALLBACK (e_day_view_on_drag_begin), day_view);
-	g_signal_connect (day_view->main_canvas, "drag_end",
-			  G_CALLBACK (e_day_view_on_drag_end), day_view);
-	g_signal_connect (day_view->main_canvas, "drag_data_get",
-			  G_CALLBACK (e_day_view_on_drag_data_get), day_view);
-	g_signal_connect (day_view->main_canvas, "drag_data_received",
-			  G_CALLBACK (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(),
-				       "width_pixels", 1,
-				       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(),
-				       "width_pixels", 1,
-				       NULL);
-	gnome_canvas_item_hide (day_view->resize_bar_item);
-
-	day_view->main_canvas_top_resize_bar_item =
-		gnome_canvas_item_new (canvas_group,
-				       gnome_canvas_rect_get_type (),
-				       "width_pixels", 1,
-				       NULL);
-	gnome_canvas_item_hide (day_view->main_canvas_top_resize_bar_item);
-
-	day_view->main_canvas_bottom_resize_bar_item =
-		gnome_canvas_item_new (canvas_group,
-				       gnome_canvas_rect_get_type (),
-				       "width_pixels", 1,
-				       NULL);
-	gnome_canvas_item_hide (day_view->main_canvas_bottom_resize_bar_item);
-
-
-	day_view->drag_rect_item =
-		gnome_canvas_item_new (canvas_group,
-				       gnome_canvas_rect_get_type (),
-				       "width_pixels", 1,
-				       NULL);
-	gnome_canvas_item_hide (day_view->drag_rect_item);
-
-	day_view->drag_bar_item =
-		gnome_canvas_item_new (canvas_group,
-				       gnome_canvas_rect_get_type (),
-				       "width_pixels", 1,
-				       NULL);
-	gnome_canvas_item_hide (day_view->drag_bar_item);
-
-	day_view->drag_item =
-		gnome_canvas_item_new (canvas_group,
-				       e_text_get_type (),
-				       "anchor", GTK_ANCHOR_NW,
-				       "line_wrap", TRUE,
-				       "clip", TRUE,
-				       "editable", TRUE,
-				       "draw_background", FALSE,
-				       "fill_color_rgba", GNOME_CANVAS_COLOR(0, 0, 0),
-				       NULL);
-	gnome_canvas_item_hide (day_view->drag_item);
-
-
-	/*
-	 * Times Canvas
-	 */
-	day_view->time_canvas = e_canvas_new ();
-	gtk_layout_set_vadjustment (GTK_LAYOUT (day_view->time_canvas),
-				    GTK_LAYOUT (day_view->main_canvas)->vadjustment);
-	gtk_table_attach (GTK_TABLE (day_view), day_view->time_canvas,
-			  0, 1, 1, 2,
-			  GTK_FILL, GTK_EXPAND | GTK_FILL, 0, 0);
-	gtk_widget_show (day_view->time_canvas);
-	g_signal_connect_after (day_view->time_canvas, "scroll_event",
-				G_CALLBACK (e_day_view_on_time_canvas_scroll), day_view);
-
-	canvas_group = GNOME_CANVAS_GROUP (GNOME_CANVAS (day_view->time_canvas)->root);
-
-	day_view->time_canvas_item =
-		gnome_canvas_item_new (canvas_group,
-				       e_day_view_time_item_get_type (),
-				       "EDayViewTimeItem::day_view", day_view,
-				       NULL);
-
-
-	/*
-	 * Scrollbar.
-	 */
-	day_view->vscrollbar = gtk_vscrollbar_new (GTK_LAYOUT (day_view->main_canvas)->vadjustment);
-	gtk_table_attach (GTK_TABLE (day_view), day_view->vscrollbar,
-			  2, 3, 1, 2, 0, GTK_EXPAND | GTK_FILL, 0, 0);
-	gtk_widget_show (day_view->vscrollbar);
-
-
-	/* Create the cursors. */
-	day_view->normal_cursor = gdk_cursor_new (GDK_LEFT_PTR);
-	day_view->move_cursor = gdk_cursor_new (GDK_FLEUR);
-	day_view->resize_width_cursor = gdk_cursor_new (GDK_SB_H_DOUBLE_ARROW);
-	day_view->resize_height_cursor = gdk_cursor_new (GDK_SB_V_DOUBLE_ARROW);
-	day_view->last_cursor_set_in_top_canvas = NULL;
-	day_view->last_cursor_set_in_main_canvas = NULL;
-
-	/* Set up the drop sites. */
-	gtk_drag_dest_set (day_view->top_canvas,
-			   GTK_DEST_DEFAULT_ALL,
-			   target_table, n_targets,
-			   GDK_ACTION_COPY | GDK_ACTION_MOVE | GDK_ACTION_ASK);
-	gtk_drag_dest_set (day_view->main_canvas,
-			   GTK_DEST_DEFAULT_ALL,
-			   target_table, n_targets,
-			   GDK_ACTION_COPY | GDK_ACTION_MOVE | GDK_ACTION_ASK);
-
-	/* Get the model */
-	model = e_calendar_view_get_model (E_CALENDAR_VIEW (day_view));
-
-	/* connect to ECalModel's signals */
-	g_signal_connect (G_OBJECT (model), "time_range_changed",
-			  G_CALLBACK (time_range_changed_cb), day_view);
-	g_signal_connect (G_OBJECT (model), "model_row_changed",
-			  G_CALLBACK (model_row_changed_cb), day_view);
-	g_signal_connect (G_OBJECT (model), "model_cell_changed",
-			  G_CALLBACK (model_cell_changed_cb), day_view);
-	g_signal_connect (G_OBJECT (model), "model_rows_inserted",
-			  G_CALLBACK (model_rows_inserted_cb), day_view);
-	g_signal_connect (G_OBJECT (model), "model_rows_deleted",
-			  G_CALLBACK (model_rows_deleted_cb), day_view);
-
-	/* connect to ECalendarView's signals */
-	g_signal_connect (G_OBJECT (day_view), "timezone_changed",
-			  G_CALLBACK (timezone_changed_cb), NULL);
-}
-
-
-/* Turn off the background of the canvas windows. This reduces flicker
-   considerably when scrolling. (Why isn't it in GnomeCanvas?). */
-static void
-e_day_view_on_canvas_realized (GtkWidget *widget,
-			       EDayView *day_view)
-{
-	gdk_window_set_back_pixmap (GTK_LAYOUT (widget)->bin_window,
-				    NULL, FALSE);
-}
-
-
-/**
- * e_day_view_new:
- * @Returns: a new #EDayView.
- *
- * Creates a new #EDayView.
- **/
-GtkWidget *
-e_day_view_new (void)
-{
-	GObject *day_view;
-
-	day_view = g_object_new (e_day_view_get_type (), NULL);
-	e_cal_model_set_flags (e_calendar_view_get_model (E_CALENDAR_VIEW (day_view)), E_CAL_MODEL_FLAGS_EXPAND_RECURRENCES);
-	
-	return GTK_WIDGET (day_view);
-}
-
-static void
-e_day_view_destroy (GtkObject *object)
-{
-	EDayView *day_view;
-	gint day;
-
-	day_view = E_DAY_VIEW (object);
-
-	e_day_view_cancel_layout (day_view);
-
-	e_day_view_stop_auto_scroll (day_view);
-
-	if (day_view->large_font_desc) {
-		pango_font_description_free (day_view->large_font_desc);
-		day_view->large_font_desc = NULL;
-	}
-
-	if (day_view->normal_cursor) {
-		gdk_cursor_unref (day_view->normal_cursor);
-		day_view->normal_cursor = NULL;
-	}
-	if (day_view->move_cursor) {
-		gdk_cursor_unref (day_view->move_cursor);
-		day_view->move_cursor = NULL;
-	}
-	if (day_view->resize_width_cursor) {
-		gdk_cursor_unref (day_view->resize_width_cursor);
-		day_view->resize_width_cursor = NULL;
-	}
-	if (day_view->resize_height_cursor) {
-		gdk_cursor_unref (day_view->resize_height_cursor);
-		day_view->resize_height_cursor = NULL;
-	}
-
-	if (day_view->long_events) {
-		e_day_view_free_events (day_view);
-		g_array_free (day_view->long_events, TRUE);
-		day_view->long_events = NULL;
-	}
-	
-	for (day = 0; day < E_DAY_VIEW_MAX_DAYS; day++) {
-		if (day_view->events[day]) {
-			g_array_free (day_view->events[day], TRUE);
-			day_view->events[day] = NULL;
-		}
-	}
-
-	GTK_OBJECT_CLASS (e_day_view_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 (e_day_view_parent_class)->realize)
-		(*GTK_WIDGET_CLASS (e_day_view_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. */
-	
-	e_day_view_set_colors(day_view, widget);
-	
-	gdk_gc_set_colormap (day_view->main_gc, colormap);
-
-	/* Create the pixmaps. */
-	day_view->reminder_icon = e_icon_factory_get_icon ("stock_bell", E_ICON_SIZE_MENU);
-	day_view->recurrence_icon = e_icon_factory_get_icon ("stock_refresh", E_ICON_SIZE_MENU);
-	day_view->timezone_icon = e_icon_factory_get_icon ("stock_timezone", E_ICON_SIZE_MENU);
-	day_view->meeting_icon = e_icon_factory_get_icon ("stock_people", E_ICON_SIZE_MENU);
-	day_view->attach_icon = e_icon_factory_get_icon ("stock_attach", E_ICON_SIZE_MENU); 
-
-
-	/* Set the canvas item colors. */
-	gnome_canvas_item_set (day_view->resize_long_event_rect_item,
-			       "fill_color_gdk", &day_view->colors[E_DAY_VIEW_COLOR_EVENT_BACKGROUND],
-			       "outline_color_gdk", &day_view->colors[E_DAY_VIEW_COLOR_EVENT_BORDER],
-			       NULL);
-
-	gnome_canvas_item_set (day_view->drag_long_event_rect_item,
-			       "fill_color_gdk", &day_view->colors[E_DAY_VIEW_COLOR_EVENT_BACKGROUND],
-			       "outline_color_gdk", &day_view->colors[E_DAY_VIEW_COLOR_EVENT_BORDER],
-			       NULL);
-
-
-	gnome_canvas_item_set (day_view->resize_rect_item,
-			       "fill_color_gdk", &day_view->colors[E_DAY_VIEW_COLOR_EVENT_BACKGROUND],
-			       "outline_color_gdk", &day_view->colors[E_DAY_VIEW_COLOR_EVENT_BORDER],
-			       NULL);
-
-	gnome_canvas_item_set (day_view->resize_bar_item,
-			       "fill_color_gdk", &day_view->colors[E_DAY_VIEW_COLOR_EVENT_VBAR],
-			       "outline_color_gdk", &day_view->colors[E_DAY_VIEW_COLOR_EVENT_BORDER],
-			       NULL);
-
-	gnome_canvas_item_set (day_view->main_canvas_top_resize_bar_item,
-			       "fill_color_gdk", &day_view->colors[E_DAY_VIEW_COLOR_EVENT_VBAR],
-			       "outline_color_gdk", &day_view->colors[E_DAY_VIEW_COLOR_EVENT_BORDER],
-			       NULL);
-
-	gnome_canvas_item_set (day_view->main_canvas_bottom_resize_bar_item,
-			       "fill_color_gdk", &day_view->colors[E_DAY_VIEW_COLOR_EVENT_VBAR],
-			       "outline_color_gdk", &day_view->colors[E_DAY_VIEW_COLOR_EVENT_BORDER],
-			       NULL);
-
-
-	gnome_canvas_item_set (day_view->drag_rect_item,
-			       "fill_color_gdk", &day_view->colors[E_DAY_VIEW_COLOR_EVENT_BACKGROUND],
-			       "outline_color_gdk", &day_view->colors[E_DAY_VIEW_COLOR_EVENT_BORDER],
-			       NULL);
-
-	gnome_canvas_item_set (day_view->drag_bar_item,
-			       "fill_color_gdk", &day_view->colors[E_DAY_VIEW_COLOR_EVENT_VBAR],
-			       "outline_color_gdk", &day_view->colors[E_DAY_VIEW_COLOR_EVENT_BORDER],
-			       NULL);
-}
-
-static void
-e_day_view_set_colors(EDayView *day_view, GtkWidget *widget)
-{
-	day_view->colors[E_DAY_VIEW_COLOR_BG_WORKING] = widget->style->base[GTK_STATE_NORMAL];
-	day_view->colors[E_DAY_VIEW_COLOR_BG_NOT_WORKING] = widget->style->bg[GTK_STATE_ACTIVE];
-	day_view->colors[E_DAY_VIEW_COLOR_BG_SELECTED] = widget->style->base[GTK_STATE_SELECTED];
-	day_view->colors[E_DAY_VIEW_COLOR_BG_SELECTED_UNFOCUSSED] = widget->style->bg[GTK_STATE_SELECTED];
-	day_view->colors[E_DAY_VIEW_COLOR_BG_GRID] = widget->style->dark[GTK_STATE_NORMAL];
-	day_view->colors[E_DAY_VIEW_COLOR_BG_TOP_CANVAS] = widget->style->dark[GTK_STATE_NORMAL];
-	day_view->colors[E_DAY_VIEW_COLOR_BG_TOP_CANVAS_SELECTED] = widget->style->bg[GTK_STATE_SELECTED];
-	day_view->colors[E_DAY_VIEW_COLOR_BG_TOP_CANVAS_GRID] = widget->style->light[GTK_STATE_NORMAL];
-	day_view->colors[E_DAY_VIEW_COLOR_EVENT_VBAR] = widget->style->base[GTK_STATE_SELECTED];
-	day_view->colors[E_DAY_VIEW_COLOR_EVENT_BACKGROUND] = widget->style->base[GTK_STATE_NORMAL];
-	day_view->colors[E_DAY_VIEW_COLOR_EVENT_BORDER] = widget->style->dark[GTK_STATE_NORMAL];
-	day_view->colors[E_DAY_VIEW_COLOR_LONG_EVENT_BACKGROUND] = widget->style->bg[GTK_STATE_ACTIVE];
-	day_view->colors[E_DAY_VIEW_COLOR_LONG_EVENT_BORDER] = widget->style->dark[GTK_STATE_NORMAL];
-}
-
-static void
-e_day_view_unrealize (GtkWidget *widget)
-{
-	EDayView *day_view;
-	GdkColormap *colormap;
-
-	day_view = E_DAY_VIEW (widget);
-
-	gdk_gc_unref (day_view->main_gc);
-	day_view->main_gc = NULL;
-
-	colormap = gtk_widget_get_colormap (widget);
-	gdk_colormap_free_colors (colormap, day_view->colors, E_DAY_VIEW_COLOR_LAST);
-
-	g_object_unref (day_view->reminder_icon);
-	day_view->reminder_icon = NULL;
-	g_object_unref (day_view->recurrence_icon);
-	day_view->recurrence_icon = NULL;
-	g_object_unref (day_view->timezone_icon);
-	day_view->timezone_icon = NULL;
-	g_object_unref (day_view->meeting_icon);
-	day_view->meeting_icon = NULL;
-	g_object_unref (day_view->attach_icon);
-	day_view->attach_icon = NULL;
-
-	if (GTK_WIDGET_CLASS (e_day_view_parent_class)->unrealize)
-		(*GTK_WIDGET_CLASS (e_day_view_parent_class)->unrealize)(widget);
-}
-
-
-static void
-e_day_view_style_set (GtkWidget *widget,
-		      GtkStyle  *previous_style)
-{
-	EDayView *day_view;
-	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;
-	PangoFontDescription *font_desc;
-	PangoContext *pango_context;
-	PangoFontMetrics *font_metrics;
-	PangoLayout *layout;
-	gint week_day, event_num;
-	EDayViewEvent *event;
-
-	if (GTK_WIDGET_CLASS (e_day_view_parent_class)->style_set)
-		(*GTK_WIDGET_CLASS (e_day_view_parent_class)->style_set)(widget, previous_style);
-
-	day_view = E_DAY_VIEW (widget);
-	e_day_view_set_colors(day_view, widget);
-
-	for (week_day = 0; week_day < E_DAY_VIEW_MAX_DAYS; week_day++){
-		for (event_num = 0; event_num < day_view->events[week_day]->len; event_num++) {
-			event = &g_array_index (day_view->events[week_day], EDayViewEvent, event_num);
-			if (event->canvas_item)
-				gnome_canvas_item_set (event->canvas_item,
-						"fill_color_gdk", &widget->style->text[GTK_STATE_NORMAL],
-						NULL);
-		}
-	}
-	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)
-			gnome_canvas_item_set (event->canvas_item,
-					"fill_color_gdk", &widget->style->text[GTK_STATE_NORMAL],
-					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);
-
-	/* Set up Pango prerequisites */
-	font_desc = gtk_widget_get_style (widget)->font_desc;
-	pango_context = gtk_widget_get_pango_context (widget);
-	font_metrics = pango_context_get_metrics (pango_context, font_desc,
-						  pango_context_get_language (pango_context));
-	layout = pango_layout_new (pango_context);
-
-	/* Create the large font. */
-	if (day_view->large_font_desc != NULL) 
-		pango_font_description_free (day_view->large_font_desc);
-
-	day_view->large_font_desc = pango_font_description_copy (font_desc);
-	pango_font_description_set_size (day_view->large_font_desc,
-					 E_DAY_VIEW_LARGE_FONT_PTSIZE * PANGO_SCALE);
-
-	/* Recalculate the height of each row based on the font size. */
-	day_view->row_height =
-		PANGO_PIXELS (pango_font_metrics_get_ascent (font_metrics)) +
-		PANGO_PIXELS (pango_font_metrics_get_descent (font_metrics)) +
-		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 =
-		PANGO_PIXELS (pango_font_metrics_get_ascent (font_metrics)) +
-		PANGO_PIXELS (pango_font_metrics_get_descent (font_metrics)) +
-		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;
-
-		e_utf8_strftime (buffer, sizeof (buffer), "%B", &date_tm);
-		pango_layout_set_text (layout, buffer, -1);
-		pango_layout_get_pixel_size (layout, &width, NULL);
-
-		if (width > longest_month_width) {
-			longest_month_width = width;
-			day_view->longest_month_name = month;
-		}
-
-		e_utf8_strftime (buffer, sizeof (buffer), "%b", &date_tm);
-		pango_layout_set_text (layout, buffer, -1);
-		pango_layout_get_pixel_size (layout, &width, NULL);
-
-		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;
-
-		e_utf8_strftime (buffer, sizeof (buffer), "%A", &date_tm);
-		pango_layout_set_text (layout, buffer, -1);
-		pango_layout_get_pixel_size (layout, &width, NULL);
-
-		if (width > longest_weekday_width) {
-			longest_weekday_width = width;
-			day_view->longest_weekday_name = day;
-		}
-
-		e_utf8_strftime (buffer, sizeof (buffer), "%a", &date_tm);
-		pango_layout_set_text (layout, buffer, -1);
-		pango_layout_get_pixel_size (layout, &width, NULL);
-
-		if (width > longest_abbreviated_weekday_width) {
-			longest_abbreviated_weekday_width = width;
-			day_view->longest_abbreviated_weekday_name = day;
-		}
-	}
-
-
-	/* Calculate the widths of all the time strings necessary. */
-	day_view->max_small_hour_width = 0;
-	max_large_hour_width = 0;
-	for (hour = 0; hour < 24; hour++) {
-		g_snprintf (buffer, sizeof (buffer), "%02i", hour);
-		pango_layout_set_text (layout, buffer, -1);
-		pango_layout_get_pixel_size (layout, &day_view->small_hour_widths [hour], NULL);
-
-		day_view->max_small_hour_width = MAX (day_view->max_small_hour_width, day_view->small_hour_widths[hour]);
-	}
-
-	max_minute_width = 0;
-	for (minute = 0, i = 0; minute < 60; minute += 5, i++) {
-		gint minute_width;
-
-		g_snprintf (buffer, sizeof (buffer), "%02i", minute);
-		pango_layout_set_text (layout, buffer, -1);
-		pango_layout_get_pixel_size (layout, &minute_width, NULL);
-
-		max_minute_width = MAX (max_minute_width, minute_width);
-	}
-	day_view->max_minute_width = max_minute_width;
-
-	pango_layout_set_text (layout, ":", 1);
-	pango_layout_get_pixel_size (layout, &day_view->colon_width, NULL);
-	pango_layout_set_text (layout, "0", 1);
-	pango_layout_get_pixel_size (layout, &day_view->digit_width, NULL);
-
-	pango_layout_set_text (layout, day_view->am_string, -1);
-	pango_layout_get_pixel_size (layout, &day_view->am_string_width, NULL);
-	pango_layout_set_text (layout, day_view->pm_string, -1);
-	pango_layout_get_pixel_size (layout, &day_view->pm_string_width, NULL);
-
-	/* 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);
-
-	g_object_unref (layout);
-	pango_font_metrics_unref (font_metrics);
-}
-
-
-/* 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 (e_day_view_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;
-	char buffer[128];
-	PangoFontDescription *font_desc;
-	PangoContext *pango_context;
-	PangoLayout *layout;
-	gint pango_width;
-
-	g_return_if_fail (((GtkWidget*)day_view)->style != NULL);
-
-	/* Set up Pango prerequisites */
-	font_desc = gtk_widget_get_style (GTK_WIDGET (day_view))->font_desc;
-	pango_context = gtk_widget_get_pango_context (GTK_WIDGET (day_view));
-	layout = pango_layout_new (pango_context);
-
-	/* 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. */
-	e_utf8_strftime (buffer, sizeof (buffer), _("%A %d %B"), &date_tm);
-	pango_layout_set_text (layout, buffer, -1);
-	pango_layout_get_pixel_size (layout, &pango_width, NULL);
-
-	if (pango_width < 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. */
-	e_utf8_strftime (buffer, sizeof (buffer), _("%a %d %b"), &date_tm);
-	pango_layout_set_text (layout, buffer, -1);
-	pango_layout_get_pixel_size (layout, &pango_width, NULL);
-
-	if (pango_width < 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. */
-	e_utf8_strftime (buffer, sizeof (buffer), _("%d %b"), &date_tm);
-	pango_layout_set_text (layout, buffer, -1);
-	pango_layout_get_pixel_size (layout, &pango_width, NULL);
-
-	if (pango_width < max_width)
-		day_view->date_format = E_DAY_VIEW_DATE_NO_WEEKDAY;
-	else
-		day_view->date_format = E_DAY_VIEW_DATE_SHORT;
-
-	g_object_unref (layout);
-}
-
-
-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;
-}
-
-static gboolean
-e_day_view_update_event_cb (EDayView *day_view,
-			    gint day,
-			    gint event_num,
-			    gpointer data)
-{
-	EDayViewEvent *event;
-	ECalModelComponent *comp_data;
-
-	comp_data = 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);
-	}
-
-	e_cal_model_free_component_data (event->comp_data);
-	event->comp_data = e_cal_model_copy_component_data (comp_data);
-
-	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);
-	}
-
-	g_signal_emit_by_name (G_OBJECT(day_view),
-			       "event_changed", event);
-
-	return TRUE;
-}
-
-
-/* This calls a given function for each event instance (in both views).
-   If the callback returns FALSE the iteration is stopped.
-   Note that it is safe for the callback to remove the event (since we
-   step backwards through the arrays). */
-static void
-e_day_view_foreach_event		(EDayView	*day_view,
-					 EDayViewForeachEventCallback callback,
-					 gpointer	 data)
-{
-	EDayViewEvent *event;
-	gint day, event_num;
-
-	for (day = 0; day < day_view->days_shown; day++) {
-		for (event_num = day_view->events[day]->len - 1;
-		     event_num >= 0;
-		     event_num--) {
-			event = &g_array_index (day_view->events[day],
-						EDayViewEvent, event_num);
-
-			if (!(*callback) (day_view, day, event_num, data))
-				return;
-		}
-	}
-
-	for (event_num = day_view->long_events->len - 1;
-	     event_num >= 0;
-	     event_num--) {
-		event = &g_array_index (day_view->long_events,
-					EDayViewEvent, event_num);
-
-		if (!(*callback) (day_view, E_DAY_VIEW_LONG_EVENT, event_num,
-				  data))
-			return;
-	}
-}
-
-
-/* This calls a given function for each event instance that matches the given
-   uid. If the callback returns FALSE the iteration is stopped.
-   Note that it is safe for the callback to remove the event (since we
-   step backwards through the arrays). */
-static void
-e_day_view_foreach_event_with_uid (EDayView *day_view,
-				   const gchar *uid,
-				   EDayViewForeachEventCallback callback,
-				   gpointer data)
-{
-	EDayViewEvent *event;
-	gint day, event_num;
-	const char *u;
-
-	for (day = 0; day < day_view->days_shown; day++) {
-		for (event_num = day_view->events[day]->len - 1;
-		     event_num >= 0;
-		     event_num--) {
-			event = &g_array_index (day_view->events[day],
-						EDayViewEvent, event_num);
-
-			u = icalcomponent_get_uid (event->comp_data->icalcomp);
-			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);
-
-		u = icalcomponent_get_uid (event->comp_data->icalcomp);
-		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 (!event)
-		return TRUE;
-
-	/* If we were editing this event, set editing_event_day to -1 so
-	   on_editing_stopped doesn't try to update the event. */
-	if (day_view->editing_event_num == event_num && day_view->editing_event_day == day) {
-		day_view->editing_event_num = -1;
-		day_view->editing_event_day = -1;
-	}
-
-	if (day_view->popup_event_num == event_num && day_view->popup_event_day == day) {
-		day_view->popup_event_num = -1;
-		day_view->popup_event_day = -1;
-	}
-
-	if (event->canvas_item)
-		gtk_object_destroy (GTK_OBJECT (event->canvas_item));
-
-	e_cal_model_free_component_data (event->comp_data);
-	event->comp_data = NULL;
-
-	if (day == E_DAY_VIEW_LONG_EVENT) {
-		g_array_remove_index (day_view->long_events, event_num);
-		day_view->long_events_need_layout = TRUE;
-	} else {
-		g_array_remove_index (day_view->events[day], event_num);
-		day_view->need_layout[day] = TRUE;
-	}
-	return TRUE;
-}
-
-
-/* This updates the text shown for an event. If the event start or end do not
-   lie on a row boundary, the time is displayed before the summary. */
-static void
-e_day_view_update_event_label (EDayView *day_view,
-			       gint day,
-			       gint event_num)
-{
-	EDayViewEvent *event;
-	char *text, *start_suffix, *end_suffix;
-	gboolean free_text = FALSE, editing_event = FALSE;
-	gint offset;
-	gint start_hour, start_display_hour, start_minute, start_suffix_width;
-	gint end_hour, end_display_hour, end_minute, end_suffix_width;
-	const gchar *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;
-
-	summary = icalcomponent_get_summary (event->comp_data->icalcomp);
-	text = summary ? (char *) summary : "";
-
-	if (day_view->editing_event_day == day
-	    && day_view->editing_event_num == event_num)
-		editing_event = TRUE;
-
-	if (!editing_event
-	    && (event->start_minute % day_view->mins_per_row != 0
-		|| (day_view->show_event_end_times
-		    && event->end_minute % day_view->mins_per_row != 0))) {
-		offset = day_view->first_hour_shown * 60
-			+ day_view->first_minute_shown;
-		start_minute = offset + event->start_minute;
-		end_minute = offset + event->end_minute;
-
-		start_hour = start_minute / 60;
-		start_minute = start_minute % 60;
-
-		end_hour = end_minute / 60;
-		end_minute = end_minute % 60;
-
-		e_day_view_convert_time_to_display (day_view, start_hour,
-						    &start_display_hour,
-						    &start_suffix,
-						    &start_suffix_width);
-		e_day_view_convert_time_to_display (day_view, end_hour,
-						    &end_display_hour,
-						    &end_suffix,
-						    &end_suffix_width);
-
-		if (e_calendar_view_get_use_24_hour_format (E_CALENDAR_VIEW (day_view))) {
-			if (day_view->show_event_end_times) {
-				/* 24 hour format with end time. */
-				text = g_strdup_printf
-					("%2i:%02i-%2i:%02i %s",
-					 start_display_hour, start_minute,
-					 end_display_hour, end_minute,
-					 text);
-			} else {
-				/* 24 hour format without end time. */
-				text = g_strdup_printf
-					("%2i:%02i %s",
-					 start_display_hour, start_minute,
-					 text);
-			}
-		} else {
-			if (day_view->show_event_end_times) {
-				/* 12 hour format with end time. */
-				text = g_strdup_printf
-					("%2i:%02i%s-%2i:%02i%s %s",
-					 start_display_hour, start_minute,
-					 start_suffix,
-					 end_display_hour, end_minute,
-					 end_suffix,
-					 text);
-			} else {
-				/* 12 hour format without end time. */
-				text = g_strdup_printf
-					("%2i:%02i%s %s",
-					 start_display_hour, start_minute,
-					 start_suffix,
-					 text);
-			}
-		}
-
-		free_text = TRUE;
-	}
-
-	gnome_canvas_item_set (event->canvas_item,
-			       "text", text,
-			       NULL);
-
-	if (free_text)
-		g_free (text);
-}
-
-
-static void
-e_day_view_update_long_event_label (EDayView *day_view,
-				    gint      event_num)
-{
-	EDayViewEvent *event;
-	const gchar *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;
-
-	summary = icalcomponent_get_summary (event->comp_data->icalcomp);
-	gnome_canvas_item_set (event->canvas_item,
-			       "text", summary ? summary : "",
-			       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. */
-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,
-				ECal *client,
-				const gchar *uid,
-				const gchar *rid,
-				gint *day_return,
-				gint *event_num_return)
-{
-	EDayViewEvent *event;
-	gint day, event_num;
-	const char *u, *r;
-
-	if (!uid)
-		return FALSE;
-
-	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->comp_data->client != client)
-				continue;
-
-			u = icalcomponent_get_uid (event->comp_data->icalcomp);
-			if (u && !strcmp (uid, u)) {
-				if (rid && *rid) {
-					r = icaltime_as_ical_string (icalcomponent_get_recurrenceid (event->comp_data->icalcomp));
-					if (!r || !*r)
-						continue;
-					if (strcmp (rid, r) != 0)
-						continue;
-				}
-
-				*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);
-
-		u = icalcomponent_get_uid (event->comp_data->icalcomp);
-		if (u && !strcmp (uid, u)) {
-			*day_return = E_DAY_VIEW_LONG_EVENT;
-			*event_num_return = event_num;
-			return TRUE;
-		}
-	}
-
-	return FALSE;
-}
-
-static void
-e_day_view_set_selected_time_range_in_top_visible	(EDayView	*day_view,
-							 time_t		 start_time,
-							 time_t		 end_time)
-{
-	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));
-
-	/* 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 (!start_in_grid)
-		start_col = 0;
-	if (!end_in_grid)
-		end_col = day_view->days_shown - 1;
-
-	if (start_row != day_view->selection_start_row
-	    || start_col != day_view->selection_start_day) {
-		need_redraw = TRUE;
-		day_view->selection_in_top_canvas = TRUE;
-		day_view->selection_start_row = -1;
-		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 = TRUE;
-		day_view->selection_end_row = -1;
-		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);
-	}
-}
-
-static void
-e_day_view_set_selected_time_range_visible	(EDayView	*day_view,
-						 time_t		 start_time,
-						 time_t		 end_time)
-{
-	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));
-
-	/* Set the selection. */
-	start_in_grid = e_day_view_convert_time_to_grid_position (day_view,
-								  start_time,
-								  &start_col,
-								  &start_row);
-	end_in_grid = e_day_view_convert_time_to_grid_position (day_view,
-								end_time - 60,
-								&end_col,
-								&end_row);
-
-	/* If either of the times isn't in the grid, or the selection covers
-	   an entire day, we set the selection to 1 row from the start of the
-	   working day, in the day corresponding to the start time. */
-	if (!start_in_grid || !end_in_grid
-	    || (start_row == 0 && end_row == day_view->rows - 1)) {
-		end_col = start_col;
-
-		start_row = e_day_view_convert_time_to_row (day_view, day_view->work_day_start_hour, day_view->work_day_start_minute);
-		start_row = CLAMP (start_row, 0, day_view->rows - 1);
-		end_row = start_row;
-	}
-
-	if (start_row != day_view->selection_start_row
-	    || start_col != day_view->selection_start_day) {
-		need_redraw = TRUE;
-		day_view->selection_in_top_canvas = FALSE;
-		day_view->selection_start_row = start_row;
-		day_view->selection_start_day = start_col;
-	}
-
-	if (end_row != day_view->selection_end_row
-	    || end_col != day_view->selection_end_day) {
-		need_redraw = TRUE;
-		day_view->selection_in_top_canvas = FALSE;
-		day_view->selection_end_row = end_row;
-		day_view->selection_end_day = end_col;
-	}
-
-	if (need_redraw) {
-		gtk_widget_queue_draw (day_view->top_canvas);
-		gtk_widget_queue_draw (day_view->main_canvas);
-	}
-}
-
-
-/* Finds the start of the working week which includes the given time. */
-static time_t
-e_day_view_find_work_week_start		(EDayView	*day_view,
-					 time_t		 start_time)
-{
-	GDate date;
-	gint weekday, day, i;
-	guint offset;
-	struct icaltimetype tt = icaltime_null_time ();
-
-	time_to_gdate_with_zone (&date, start_time, e_calendar_view_get_timezone (E_CALENDAR_VIEW (day_view)));
-
-	/* The start of the work-week is the first working day after the
-	   week start day. */
-
-	/* Get the weekday corresponding to start_time, 0 (Sun) to 6 (Sat). */
-	weekday = g_date_weekday (&date) % 7;
-
-	/* Calculate the first working day of the week, 0 (Sun) to 6 (Sat).
-	   It will automatically default to the week start day if no days
-	   are set as working days. */
-	day = (day_view->week_start_day + 1) % 7;
-	for (i = 0; i < 7; i++) {
-		if (day_view->working_days & (1 << day))
-			break;
-		day = (day + 1) % 7;
-	}
-
-	/* Calculate how many days we need to go back to the first workday. */
-	if (weekday < day) {
-		offset = (day - weekday) % 7;
-		g_date_add_days (&date, offset);
-	} else {
-		offset = (weekday - day) % 7;
-		g_date_subtract_days (&date, offset);
-	}
-
-	tt.year = g_date_year (&date);
-	tt.month = g_date_month (&date);
-	tt.day = g_date_day (&date);
-
-	return icaltime_as_timet_with_zone (tt, e_calendar_view_get_timezone (E_CALENDAR_VIEW (day_view)));
-}
-
-
-/* This sets the selected time range. 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. */
-static void
-e_day_view_set_selected_time_range	(ECalendarView	*cal_view,
-					 time_t		 start_time,
-					 time_t		 end_time)
-{
-	gint start_row, start_col, end_row, end_col;
-	gboolean need_redraw = FALSE, start_in_grid, end_in_grid;
-	EDayView *day_view = E_DAY_VIEW (cal_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. */
-static gboolean
-e_day_view_get_selected_time_range (ECalendarView *cal_view, time_t *start_time, time_t *end_time)
-{
-	gint start_col, start_row, end_col, end_row;
-	time_t start, end;
-	EDayView *day_view = E_DAY_VIEW (cal_view);
-
-	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;
-
-	return TRUE;
-}
-
-/* Gets the visible time range. Returns FALSE if no time range has been set. */
-static gboolean
-e_day_view_get_visible_time_range	(ECalendarView	*cal_view,
-					 time_t		*start_time,
-					 time_t		*end_time)
-{
-	EDayView *day_view = E_DAY_VIEW (cal_view);
-
-	/* If the date isn't set, return FALSE. */
-	if (day_view->lower == 0 && day_view->upper == 0)
-		return FALSE;
-
-	*start_time = day_view->day_starts[0];
-	*end_time = day_view->day_starts[day_view->days_shown];
-
-	return TRUE;
-}
-
-static void
-e_day_view_recalc_day_starts (EDayView *day_view,
-			      time_t start_time)
-{
-	gint day;
-
-	day_view->day_starts[0] = start_time;
-	for (day = 1; day <= day_view->days_shown; day++) {
-		day_view->day_starts[day] = time_add_day_with_zone (day_view->day_starts[day - 1], 1, e_calendar_view_get_timezone (E_CALENDAR_VIEW (day_view)));
-	}
-
-#if 0
-	for (day = 0; day <= day_view->days_shown; day++)
-		g_print ("Day Starts %i: %s", day, ctime (&day_view->day_starts[day]));
-#endif
-
-	day_view->lower = start_time;
-	day_view->upper = day_view->day_starts[day_view->days_shown];
-}
-
-
-/* Whether we are displaying a work-week, in which case the display always
-   starts on the first day of the working week. */
-gboolean
-e_day_view_get_work_week_view	(EDayView	*day_view)
-{
-	g_return_val_if_fail (E_IS_DAY_VIEW (day_view), FALSE);
-
-	return day_view->work_week_view;
-}
-
-
-void
-e_day_view_set_work_week_view	(EDayView	*day_view,
-				 gboolean	 work_week_view)
-{
-	g_return_if_fail (E_IS_DAY_VIEW (day_view));
-
-	if (day_view->work_week_view == work_week_view)
-		return;
-
-	day_view->work_week_view = work_week_view;
-
-	if (day_view->work_week_view)
-		e_day_view_recalc_work_week (day_view);
-}
-
-
-gint
-e_day_view_get_days_shown	(EDayView	*day_view)
-{
-	g_return_val_if_fail (E_IS_DAY_VIEW (day_view), -1);
-
-	return day_view->days_shown;
-}
-
-
-void
-e_day_view_set_days_shown	(EDayView	*day_view,
-				 gint		 days_shown)
-{
-	g_return_if_fail (E_IS_DAY_VIEW (day_view));
-	g_return_if_fail (days_shown >= 1);
-	g_return_if_fail (days_shown <= E_DAY_VIEW_MAX_DAYS);
-
-	if (day_view->days_shown == days_shown)
-		return;
-
-	day_view->days_shown = days_shown;
-
-	/* If the date isn't set, just return. */
-	if (day_view->lower == 0 && day_view->upper == 0)
-		return;
-
-	e_day_view_recalc_day_starts (day_view, day_view->lower);
-	e_day_view_recalc_cell_sizes (day_view);
-
-	e_day_view_update_query (day_view);
-}
-
-
-gint
-e_day_view_get_mins_per_row	(EDayView	*day_view)
-{
-	g_return_val_if_fail (E_IS_DAY_VIEW (day_view), -1);
-
-	return day_view->mins_per_row;
-}
-
-
-void
-e_day_view_set_mins_per_row	(EDayView	*day_view,
-				 gint		 mins_per_row)
-{
-	gint day;
-
-	g_return_if_fail (E_IS_DAY_VIEW (day_view));
-
-	if (mins_per_row != 5 && mins_per_row != 10 && mins_per_row != 15
-	    && mins_per_row != 30 && mins_per_row != 60) {
-		g_warning ("Invalid minutes per row setting");
-		return;
-	}
-
-	if (day_view->mins_per_row == mins_per_row)
-		return;
-
-	day_view->mins_per_row = mins_per_row;
-	e_day_view_recalc_num_rows (day_view);
-
-	/* If we aren't visible, we'll sort it out later. */
-	if (!GTK_WIDGET_VISIBLE (day_view))
-	    return;
-
-	for (day = 0; day < E_DAY_VIEW_MAX_DAYS; day++)
-		day_view->need_layout[day] = TRUE;
-
-	/* We need to update all the day event labels since the start & end
-	   times may or may not be on row boundaries any more. */
-	e_day_view_foreach_event (day_view,
-				  e_day_view_set_show_times_cb, NULL);
-
-	/* We must layout the events before updating the scroll region, since
-	   that will result in a redraw which would crash otherwise. */
-	e_day_view_check_layout (day_view);
-	gtk_widget_queue_draw (day_view->time_canvas);
-	gtk_widget_queue_draw (day_view->main_canvas);
-
-	e_day_view_update_scroll_regions (day_view);
-}
-
-
-/* This specifies the working days in the week. The value is a bitwise
-   combination of day flags. Defaults to Mon-Fri. */
-EDayViewDays
-e_day_view_get_working_days	(EDayView	*day_view)
-{
-	g_return_val_if_fail (E_IS_DAY_VIEW (day_view), 0);
-
-	return day_view->working_days;
-}
-
-
-void
-e_day_view_set_working_days	(EDayView	*day_view,
-				 EDayViewDays	 days)
-{
-	g_return_if_fail (E_IS_DAY_VIEW (day_view));
-
-	if (day_view->working_days == days)
-		return;
-
-	day_view->working_days = days;
-
-	if (day_view->work_week_view)
-		e_day_view_recalc_work_week (day_view);
-
-	/* We have to do this, as the new working days may have no effect on
-	   the days shown, but we still want the background color to change. */
-	gtk_widget_queue_draw (day_view->main_canvas);
-}
-
-
-static void
-e_day_view_recalc_work_week_days_shown	(EDayView	*day_view)
-{
-	gint first_day, last_day, i, days_shown;
-	gboolean has_working_days = FALSE;
-
-	/* Find the first working day in the week, 0 (Sun) to 6 (Sat). */
-	first_day = (day_view->week_start_day + 1) % 7;
-	for (i = 0; i < 7; i++) {
-		if (day_view->working_days & (1 << first_day)) {
-			has_working_days = TRUE;
-			break;
-		}
-		first_day = (first_day + 1) % 7;
-	}
-
-	if (has_working_days) {
-		/* Now find the last working day of the week, backwards. */
-		last_day = day_view->week_start_day % 7;
-		for (i = 0; i < 7; i++) {
-			if (day_view->working_days & (1 << last_day))
-				break;
-			last_day = (last_day + 6) % 7;
-		}
-		/* Now calculate the days we need to show to include all the
-		   working days in the week. Add 1 to make it inclusive. */
-		days_shown = (last_day + 7 - first_day) % 7 + 1;
-	} else {
-		/* If no working days are set, just use 7. */
-		days_shown = 7;
-	}
-
-	e_day_view_set_days_shown (day_view, days_shown);
-}
-
-
-/* The start and end time of the working day. This only affects the background
-   colors. */
-void
-e_day_view_get_working_day		(EDayView	*day_view,
-					 gint		*start_hour,
-					 gint		*start_minute,
-					 gint		*end_hour,
-					 gint		*end_minute)
-{
-	g_return_if_fail (E_IS_DAY_VIEW (day_view));
-
-	*start_hour = day_view->work_day_start_hour;
-	*start_minute = day_view->work_day_start_minute;
-	*end_hour = day_view->work_day_end_hour;
-	*end_minute = day_view->work_day_end_minute;
-}
-
-
-void
-e_day_view_set_working_day		(EDayView	*day_view,
-					 gint		 start_hour,
-					 gint		 start_minute,
-					 gint		 end_hour,
-					 gint		 end_minute)
-{
-	g_return_if_fail (E_IS_DAY_VIEW (day_view));
-
-	day_view->work_day_start_hour = start_hour;
-	day_view->work_day_start_minute = start_minute;
-	day_view->work_day_end_hour = end_hour;
-	day_view->work_day_end_minute = end_minute;
-
-	gtk_widget_queue_draw (day_view->main_canvas);
-}
-
-/* Whether we display event end times in the main canvas. */
-gboolean
-e_day_view_get_show_event_end_times	(EDayView	*day_view)
-{
-	g_return_val_if_fail (E_IS_DAY_VIEW (day_view), TRUE);
-
-	return day_view->show_event_end_times;
-}
-
-
-void
-e_day_view_set_show_event_end_times	(EDayView	*day_view,
-					 gboolean	 show)
-{
-	g_return_if_fail (E_IS_DAY_VIEW (day_view));
-
-	if (day_view->show_event_end_times != show) {
-		day_view->show_event_end_times = show;
-		e_day_view_foreach_event (day_view,
-					  e_day_view_set_show_times_cb, NULL);
-	}
-}
-
-/* This is a callback used to update all day event labels. */
-static gboolean
-e_day_view_set_show_times_cb		(EDayView	*day_view,
-					 gint		 day,
-					 gint		 event_num,
-					 gpointer	 data)
-{
-	if (day != E_DAY_VIEW_LONG_EVENT) {
-		e_day_view_update_event_label (day_view, day, event_num);
-	}
-
-	return TRUE;
-}
-
-
-/* The first day of the week, 0 (Monday) to 6 (Sunday). */
-gint
-e_day_view_get_week_start_day	(EDayView	*day_view)
-{
-	g_return_val_if_fail (E_IS_DAY_VIEW (day_view), 0);
-
-	return day_view->week_start_day;
-}
-
-
-void
-e_day_view_set_week_start_day	(EDayView	*day_view,
-				 gint		 week_start_day)
-{
-	g_return_if_fail (E_IS_DAY_VIEW (day_view));
-	g_return_if_fail (week_start_day >= 0);
-	g_return_if_fail (week_start_day < 7);
-
-	if (day_view->week_start_day == week_start_day)
-		return;
-
-	day_view->week_start_day = week_start_day;
-
-	if (day_view->work_week_view)
-		e_day_view_recalc_work_week (day_view);
-}
-
-static void
-e_day_view_recalc_work_week	(EDayView	*day_view)
-{		
-	time_t lower;
-
-	/* If we aren't showing the work week, just return. */
-	if (!day_view->work_week_view)
-		return;
-
-	e_day_view_recalc_work_week_days_shown	(day_view);
-	
-	/* If the date isn't set, just return. */
-	if (day_view->lower == 0 && day_view->upper == 0)
-		return;
-
-	lower = e_day_view_find_work_week_start (day_view, day_view->lower);
-	if (lower != day_view->lower) {
-		/* Reset the selection, as it may disappear. */
-		day_view->selection_start_day = -1;
-
-		e_day_view_recalc_day_starts (day_view, lower);
-		e_day_view_update_query (day_view);
-
-		/* This updates the date navigator. */
-		e_day_view_update_calendar_selection_time (day_view);
-	}
-}
-
-
-static gboolean
-e_day_view_update_scroll_regions (EDayView *day_view)
-{
-	gdouble old_x2, old_y2, new_x2, new_y2;
-	gboolean need_reshape = FALSE;
-
-	/* Set the scroll region of the time canvas to its allocated width,
-	   but with the height the same as the main canvas. */
-	gnome_canvas_get_scroll_region (GNOME_CANVAS (day_view->time_canvas),
-					NULL, NULL, &old_x2, &old_y2);
-	new_x2 = day_view->time_canvas->allocation.width - 1;
-	new_y2 = MAX (day_view->rows * day_view->row_height,
-		      day_view->main_canvas->allocation.height) - 1;
-	if (old_x2 != new_x2 || old_y2 != new_y2)
-		gnome_canvas_set_scroll_region (GNOME_CANVAS (day_view->time_canvas),
-						0, 0, new_x2, new_y2);
-
-	/* Set the scroll region of the main canvas to its allocated width,
-	   but with the height depending on the number of rows needed. */
-	gnome_canvas_get_scroll_region (GNOME_CANVAS (day_view->main_canvas),
-					NULL, NULL, &old_x2, &old_y2);
-	new_x2 = day_view->main_canvas->allocation.width - 1;
-	if (old_x2 != new_x2 || old_y2 != new_y2) {
-		need_reshape = TRUE;
-		gnome_canvas_set_scroll_region (GNOME_CANVAS (day_view->main_canvas),
-						0, 0, new_x2, new_y2);
-	}
-
-	return need_reshape;
-}
-
-
-/* This recalculates the number of rows to display, based on the time range
-   shown and the minutes per row. */
-static void
-e_day_view_recalc_num_rows	(EDayView	*day_view)
-{
-	gint hours, minutes, total_minutes;
-
-	hours = day_view->last_hour_shown - day_view->first_hour_shown;
-	/* This could be negative but it works out OK. */
-	minutes = day_view->last_minute_shown - day_view->first_minute_shown;
-	total_minutes = hours * 60 + minutes;
-	day_view->rows = total_minutes / day_view->mins_per_row;
-}
-
-
-/* Converts an hour and minute to a row in the canvas. Note that if we aren't
-   showing all 24 hours of the day, the returned row may be negative or
-   greater than day_view->rows. */
-gint
-e_day_view_convert_time_to_row	(EDayView	*day_view,
-				 gint		 hour,
-				 gint		 minute)
-{
-	gint total_minutes, start_minute, offset;
-
-	total_minutes = hour * 60 + minute;
-	start_minute = day_view->first_hour_shown * 60
-		+ day_view->first_minute_shown;
-	offset = total_minutes - start_minute;
-	if (offset < 0)
-		return -1;
-	else
-		return offset / day_view->mins_per_row;
-}
-
-
-/* Converts an hour and minute to a y coordinate in the canvas. */
-gint
-e_day_view_convert_time_to_position (EDayView	*day_view,
-				     gint	 hour,
-				     gint	 minute)
-{
-	gint total_minutes, start_minute, offset;
-
-	total_minutes = hour * 60 + minute;
-	start_minute = day_view->first_hour_shown * 60
-		+ day_view->first_minute_shown;
-	offset = total_minutes - start_minute;
-
-	return offset * day_view->row_height / day_view->mins_per_row;
-}
-
-
-static gboolean
-e_day_view_on_top_canvas_button_press (GtkWidget *widget,
-				       GdkEventButton *event,
-				       EDayView *day_view)
-{
-	gint event_x, event_y, day, event_num;
-	ECalendarViewPosition 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;
-
-	pos = e_day_view_convert_position_in_top_canvas (day_view,
-							 event_x, event_y,
-							 &day, &event_num);
-
-	if (pos == E_CALENDAR_VIEW_POS_OUTSIDE)
-		return FALSE;
-
-	if (pos != E_CALENDAR_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 (event->type == GDK_2BUTTON_PRESS) {
-			time_t dtstart, dtend;
-
-			e_day_view_get_selected_time_range ((ECalendarView *) day_view, &dtstart, &dtend);
-			e_calendar_view_new_appointment_for (E_CALENDAR_VIEW (day_view),
-							dtstart, dtend,
-							TRUE, FALSE);
-			return TRUE;
-		}
-
-		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));
-
-		if (day < day_view->selection_start_day || day > day_view->selection_end_day) {
-			e_day_view_start_selection (day_view, day, -1);
-			e_day_view_finish_selection (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, row, day, event_num;
-	ECalendarViewPosition pos;
-
-#if 0
-	g_print ("In e_day_view_on_main_canvas_button_press\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*) event,
-					      GTK_LAYOUT (widget)->bin_window,
-					      &event_x, &event_y))
-		return FALSE;
-
-	/* 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_CALENDAR_VIEW_POS_OUTSIDE)
-		return FALSE;
-
-	if (pos != E_CALENDAR_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 (event->type == GDK_2BUTTON_PRESS) {
-			time_t dtstart, dtend;
-
-			e_day_view_get_selected_time_range ((ECalendarView *) day_view, &dtstart, &dtend);
-			e_calendar_view_new_appointment_for (E_CALENDAR_VIEW (day_view),
-							dtstart, dtend,
-							FALSE, FALSE);
-			return TRUE;
-		}
-
-		if (!GTK_WIDGET_HAS_FOCUS (day_view) && !GTK_WIDGET_HAS_FOCUS (day_view->main_canvas))
-			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);
-			g_signal_emit_by_name (day_view, "selected_time_changed");
-		}
-	} else if (event->button == 3) {
-		if (!GTK_WIDGET_HAS_FOCUS (day_view))
-			gtk_widget_grab_focus (GTK_WIDGET (day_view));
-
-		
-		if ((day < day_view->selection_start_day || day > day_view->selection_end_day)
-		    || (day == day_view->selection_start_day && row < day_view->selection_start_row)
-		    || (day == day_view->selection_end_day && row > day_view->selection_end_row)) {
-			e_day_view_start_selection (day_view, day, row);
-			e_day_view_finish_selection (day_view);
-		}
-		
-		e_day_view_on_event_right_click (day_view, event, -1, -1);
-	}
-
-	return TRUE;
-}
-
-static gboolean
-e_day_view_on_main_canvas_scroll (GtkWidget *widget,
-				  GdkEventScroll *scroll,
-				  EDayView *day_view)
-{
-	switch (scroll->direction) {
-	case GDK_SCROLL_UP:
-		e_day_view_scroll (day_view, E_DAY_VIEW_WHEEL_MOUSE_STEP_SIZE);
-		return TRUE;
-	case GDK_SCROLL_DOWN:
-		e_day_view_scroll (day_view, -E_DAY_VIEW_WHEEL_MOUSE_STEP_SIZE);
-		return TRUE;
-	default:
-		break;
-	}
-
-	return FALSE;
-}
-
-
-static gboolean
-e_day_view_on_time_canvas_scroll (GtkWidget      *widget,
-				  GdkEventScroll *scroll,
-				  EDayView       *day_view)
-{
-	
-	switch (scroll->direction) {
-	case GDK_SCROLL_UP:
-		e_day_view_scroll (day_view, E_DAY_VIEW_WHEEL_MOUSE_STEP_SIZE);
-		return TRUE;
-	case GDK_SCROLL_DOWN:
-		e_day_view_scroll (day_view, -E_DAY_VIEW_WHEEL_MOUSE_STEP_SIZE);
-		return TRUE;
-	default:
-		break;
-	}
-
-	return FALSE;
-}
-
-static gboolean
-e_day_view_on_long_event_button_press (EDayView		*day_view,
-				       gint		 event_num,
-				       GdkEventButton	*event,
-				       ECalendarViewPosition  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);
-			gtk_signal_emit_stop_by_name (GTK_OBJECT (day_view->top_canvas),
-						      "button_press_event");
-			return TRUE;
-		}
-	} else if (event->button == 3) {
-		EDayViewEvent *e;
-
-		e = &g_array_index (day_view->long_events, EDayViewEvent, event_num);
-
-		if (!GTK_WIDGET_HAS_FOCUS (day_view))
-			gtk_widget_grab_focus (GTK_WIDGET (day_view));
-
-		e_day_view_set_selected_time_range_in_top_visible (day_view, e->start, e->end);
-			
-		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,
-				  ECalendarViewPosition 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);
-			gtk_signal_emit_stop_by_name (GTK_OBJECT (day_view->main_canvas),
-						      "button_press_event");
-			return TRUE;
-		}
-	} else if (event->button == 3) {
-		EDayViewEvent *e;
-
-		e = &g_array_index (day_view->events[day], EDayViewEvent, event_num);
-
-		if (!GTK_WIDGET_HAS_FOCUS (day_view))
-			gtk_widget_grab_focus (GTK_WIDGET (day_view));
-
-		e_day_view_set_selected_time_range_visible (day_view, e->start, e->end);
-	
-		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,
-				ECalendarViewPosition 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_CALENDAR_VIEW_POS_EVENT
-	    && E_TEXT (event->canvas_item)->editing)
-		return;
-
-	if ((e_cal_util_component_is_instance (event->comp_data->icalcomp) ||
-	     !e_cal_util_component_has_recurrences (event->comp_data->icalcomp))
-	    && (pos == E_CALENDAR_VIEW_POS_LEFT_EDGE
-		|| pos == E_CALENDAR_VIEW_POS_RIGHT_EDGE)) {
-		if (!e_day_view_find_long_event_days (event,
-						      day_view->days_shown,
-						      day_view->day_starts,
-						      &start_day, &end_day))
-			return;
-
-		/* Grab the keyboard focus, so the event being edited is saved
-		   and we can use the Escape key to abort the resize. */
-		if (!GTK_WIDGET_HAS_FOCUS (day_view))
-			gtk_widget_grab_focus (GTK_WIDGET (day_view));
-
-		if (gdk_pointer_grab (GTK_LAYOUT (day_view->top_canvas)->bin_window, FALSE,
-				      GDK_POINTER_MOTION_MASK
-				      | GDK_BUTTON_RELEASE_MASK,
-				      FALSE, NULL, bevent->time) == 0) {
-
-			day_view->resize_event_day = E_DAY_VIEW_LONG_EVENT;
-			day_view->resize_event_num = event_num;
-			day_view->resize_drag_pos = pos;
-			day_view->resize_start_row = start_day;
-			day_view->resize_end_row = end_day;
-
-			/* Create the edit rect if necessary. */
-			e_day_view_reshape_resize_long_event_rect_item (day_view);
-
-			/* Make sure the text item is on top. */
-			gnome_canvas_item_raise_to_top (day_view->resize_long_event_rect_item);
-
-			/* Raise the event's item, above the rect as well. */
-			gnome_canvas_item_raise_to_top (event->canvas_item);
-		}
-	} else if (e_day_view_get_long_event_position (day_view, event_num,
-						       &start_day, &end_day,
-						       &item_x, &item_y,
-						       &item_w, &item_h)) {
-		/* Remember the item clicked and the mouse position,
-		   so we can start a drag if the mouse moves. */
-		day_view->pressed_event_day = E_DAY_VIEW_LONG_EVENT;
-		day_view->pressed_event_num = event_num;
-
-		day_view->drag_event_x = event_x;
-		day_view->drag_event_y = event_y;
-
-		e_day_view_convert_position_in_top_canvas (day_view,
-							   event_x, event_y,
-							   &day, NULL);
-		day_view->drag_event_offset = day - start_day;
-	}
-}
-
-
-static void
-e_day_view_on_event_click (EDayView *day_view,
-			   gint day,
-			   gint event_num,
-			   GdkEventButton  *bevent,
-			   ECalendarViewPosition 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_CALENDAR_VIEW_POS_EVENT
-	    && E_TEXT (event->canvas_item)->editing)
-		return;
-
-	if ((e_cal_util_component_is_instance (event->comp_data->icalcomp) ||
-	     !e_cal_util_component_has_recurrences (event->comp_data->icalcomp))
-	    && (pos == E_CALENDAR_VIEW_POS_TOP_EDGE
-		|| pos == E_CALENDAR_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;
-			if (day_view->resize_end_row < day_view->resize_start_row)
-				day_view->resize_end_row = day_view->resize_start_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_CALENDAR_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_CALENDAR_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)
-{
-	EDayViewEvent *event;
-	icalproperty *attendee_prop = NULL;
-
-	if (day == -1)
-		event = &g_array_index (day_view->long_events, EDayViewEvent,
-					event_num);
-	else 
-		event = &g_array_index (day_view->events[day], EDayViewEvent,
-					event_num);
-
-	e_day_view_stop_editing_event (day_view);
-
-    
-	attendee_prop = icalcomponent_get_first_property (event->comp_data->icalcomp, ICAL_ATTENDEE_PROPERTY);
-	e_calendar_view_edit_appointment (E_CALENDAR_VIEW (day_view),
-				     event->comp_data->client, 
-				     event->comp_data->icalcomp, attendee_prop ? TRUE:FALSE);
-}
-
-static void
-popup_destroyed_cb (gpointer data, GObject *where_object_was)
-{
-	EDayView *day_view = data;
-
-	day_view->popup_event_day = -1;
-	day_view->popup_event_num = -1;	
-}
-	
-static void
-e_day_view_show_popup_menu (EDayView *day_view,
-			    GdkEvent *gdk_event,
-			    gint day,
-			    gint event_num)
-{
-	GtkMenu *popup;
-
-	day_view->popup_event_day = day;
-	day_view->popup_event_num = event_num;
-
-	popup = e_calendar_view_create_popup_menu (E_CALENDAR_VIEW (day_view));
-	g_object_weak_ref (G_OBJECT (popup), popup_destroyed_cb, day_view);
-	gtk_menu_popup (popup, NULL, NULL, NULL, NULL, gdk_event?gdk_event->button.button:0, gdk_event?gdk_event->button.time:gtk_get_current_event_time());
-}
-
-static gboolean
-e_day_view_popup_menu (GtkWidget *widget)
-{
-	EDayView *day_view = E_DAY_VIEW (widget);
-	e_day_view_show_popup_menu (day_view, NULL,
-				    day_view->editing_event_day,
-				    day_view->editing_event_num);
-	return TRUE;
-}
-
-/* Returns the currently-selected event, or NULL if none */
-static GList *
-e_day_view_get_selected_events (ECalendarView *cal_view)
-{
-	EDayViewEvent *event = NULL;
-	GList *list = NULL;
-	EDayView *day_view = (EDayView *) cal_view;
-
-	g_return_val_if_fail (E_IS_DAY_VIEW (day_view), NULL);
-
-	if (day_view->editing_event_num != -1) {
-		if (day_view->editing_event_day == E_DAY_VIEW_LONG_EVENT)
-			event = &g_array_index (day_view->long_events,
-						EDayViewEvent,
-						day_view->editing_event_num);
-		else
-			event = &g_array_index (day_view->events[day_view->editing_event_day],
-						EDayViewEvent,
-						day_view->editing_event_num);
-	} else if (day_view->popup_event_num != -1) {
-		if (day_view->popup_event_day == E_DAY_VIEW_LONG_EVENT)
-			event = &g_array_index (day_view->long_events,
-						EDayViewEvent,
-						day_view->popup_event_num);
-		else
-			event = &g_array_index (day_view->events[day_view->popup_event_day],
-						EDayViewEvent,
-						day_view->popup_event_num);
-	}
-
-	if (event)
-		list = g_list_append (list, event);
-
-	return list;
-}
-
-/* Restarts a query for the day view */
-static void
-e_day_view_update_query (EDayView *day_view)
-{
-	gint rows, r;
-
-	e_day_view_stop_editing_event (day_view);
-
-	gtk_widget_queue_draw (day_view->top_canvas);
-	gtk_widget_queue_draw (day_view->main_canvas);
-	e_day_view_free_events (day_view);
-	e_day_view_queue_layout (day_view);
-
-	rows = e_table_model_row_count (E_TABLE_MODEL (e_calendar_view_get_model (E_CALENDAR_VIEW (day_view))));
-	for (r = 0; r < rows; r++) {
-		ECalModelComponent *comp_data;
-
-		comp_data = e_cal_model_get_component_at (e_calendar_view_get_model (E_CALENDAR_VIEW (day_view)), r);
-		g_assert (comp_data != NULL);
-		process_component (day_view, comp_data);
-	}
-}
-
-static void
-e_day_view_on_event_right_click (EDayView *day_view,
-				 GdkEventButton *bevent,
-				 gint day,
-				 gint event_num)
-{
-	e_day_view_show_popup_menu (day_view, (GdkEvent*)bevent,
-				    day, event_num);
-}
-
-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_CALENDAR_VIEW_POS_NONE) {
-		gdk_pointer_ungrab (event->time);
-		e_day_view_finish_long_event_resize (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 gboolean
-e_day_view_on_main_canvas_button_release (GtkWidget *widget,
-					  GdkEventButton *event,
-					  EDayView *day_view)
-{
-#if 0
-	g_print ("In e_day_view_on_main_canvas_button_release\n");
-#endif
-
-	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_CALENDAR_VIEW_POS_NONE) {
-		gdk_pointer_ungrab (event->time);
-		e_day_view_finish_resize (day_view);
-		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;
-}
-
-
-void
-e_day_view_update_calendar_selection_time (EDayView *day_view)
-{
-	time_t start, end;
-	GnomeCalendar *calendar;
-
-	e_day_view_get_selected_time_range ((ECalendarView *) day_view, &start, &end);
-
-#if 0
-	g_print ("Start: %s", ctime (&start));
-	g_print ("End  : %s", ctime (&end));
-#endif
-
-#if 0
-	calendar = e_calendar_view_get_calendar (E_CALENDAR_VIEW (day_view));
-	if (calendar)
-		gnome_calendar_set_selected_time_range (calendar,
-							start, end);
-#endif
-}
-
-
-static gboolean
-e_day_view_on_top_canvas_motion (GtkWidget *widget,
-				 GdkEventMotion *mevent,
-				 EDayView *day_view)
-{
-	EDayViewEvent *event = NULL;
-	ECalendarViewPosition pos;
-	gint event_x, event_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;
-
-	canvas_x = event_x;
-	canvas_y = event_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_CALENDAR_VIEW_POS_NONE) {
-		if (pos != E_CALENDAR_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 (!e_cal_util_component_has_recurrences (event->comp_data->icalcomp)
-		    && (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 && !e_cal_util_component_has_recurrences (event->comp_data->icalcomp))  {
-			switch (pos) {
-			case E_CALENDAR_VIEW_POS_LEFT_EDGE:
-			case E_CALENDAR_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;
-	ECalendarViewPosition pos;
-	gint event_x, event_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;
-
-	canvas_x = event_x;
-	canvas_y = event_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_CALENDAR_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_CALENDAR_VIEW_POS_NONE) {
-		if (pos != E_CALENDAR_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 (!e_cal_util_component_has_recurrences (event->comp_data->icalcomp)
-		    && (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 && !e_cal_util_component_has_recurrences (event->comp_data->icalcomp)) {
-			switch (pos) {
-			case E_CALENDAR_VIEW_POS_LEFT_EDGE:
-				cursor = day_view->move_cursor;
-				break;
-			case E_CALENDAR_VIEW_POS_TOP_EDGE:
-			case E_CALENDAR_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_CALENDAR_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_CALENDAR_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;
-	ECalComponent *comp;
-	ECalComponentDateTime date;
-	struct icaltimetype itt;
-	time_t dt;
-	ECal *client;
-	CalObjModType mod = CALOBJ_MOD_ALL;
-	GtkWindow *toplevel;
-	int is_date;
-	
-	event_num = day_view->resize_event_num;
-	event = &g_array_index (day_view->long_events, EDayViewEvent,
-				event_num);
-
-	client = event->comp_data->client;
-
-	/* 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 = e_cal_component_new ();
-	e_cal_component_set_icalcomponent (comp, icalcomponent_new_clone (event->comp_data->icalcomp));
-
-	date.value = &itt;
-	date.tzid = NULL;
-
-	if (day_view->resize_drag_pos == E_CALENDAR_VIEW_POS_LEFT_EDGE) {
-		e_cal_component_get_dtstart (comp, &date);
-		is_date = date.value->is_date;
-		if (!is_date)
-			date.tzid = icaltimezone_get_tzid (e_calendar_view_get_timezone (E_CALENDAR_VIEW (day_view)));
-		dt = day_view->day_starts[day_view->resize_start_row];
-		*date.value = icaltime_from_timet_with_zone (dt, is_date,
-							     e_calendar_view_get_timezone (E_CALENDAR_VIEW (day_view)));
-		e_cal_component_set_dtstart (comp, &date);
-	} else {
-		e_cal_component_get_dtend (comp, &date);
-		is_date = date.value->is_date;
-		if (!is_date)
-			date.tzid = icaltimezone_get_tzid (e_calendar_view_get_timezone (E_CALENDAR_VIEW (day_view)));
-		dt = day_view->day_starts[day_view->resize_end_row + 1];
-		*date.value = icaltime_from_timet_with_zone (dt, is_date,
-							     e_calendar_view_get_timezone (E_CALENDAR_VIEW (day_view)));
-		e_cal_component_set_dtend (comp, &date);
-	}
-	
- 	if (e_cal_component_is_instance (comp)) {
- 		if (!recur_component_dialog (client, comp, &mod, NULL)) {
- 			gtk_widget_queue_draw (day_view->top_canvas);
-			goto out;
- 		}
-	}
-	
-	toplevel = GTK_WINDOW (gtk_widget_get_toplevel (GTK_WIDGET (day_view)));
-	
-	e_cal_component_commit_sequence (comp);
-	e_calendar_view_modify_and_send (comp, client, mod, toplevel, TRUE);
-	
- out:
- 	gnome_canvas_item_hide (day_view->resize_long_event_rect_item);
- 
- 	day_view->resize_drag_pos = E_CALENDAR_VIEW_POS_NONE;
-
-	g_object_unref (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;
-	ECalComponent *comp;
-	ECalComponentDateTime date;
-	struct icaltimetype itt;
-	time_t dt;
-	ECal *client;
-	CalObjModType mod = CALOBJ_MOD_ALL;
-	GtkWindow *toplevel;
-
-	day = day_view->resize_event_day;
-	event_num = day_view->resize_event_num;
-	event = &g_array_index (day_view->events[day], EDayViewEvent,
-				event_num);
-
-	client = event->comp_data->client;
-
-	/* 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 = e_cal_component_new ();
-	e_cal_component_set_icalcomponent (comp, icalcomponent_new_clone (event->comp_data->icalcomp));
-
-	date.value = &itt;
-	/* FIXME: Should probably keep the timezone of the original start
-	   and end times. */
-	date.tzid = icaltimezone_get_tzid (e_calendar_view_get_timezone (E_CALENDAR_VIEW (day_view)));
-
-	if (day_view->resize_drag_pos == E_CALENDAR_VIEW_POS_TOP_EDGE) {
-		dt = e_day_view_convert_grid_position_to_time (day_view, day, day_view->resize_start_row);
-		*date.value = icaltime_from_timet_with_zone (dt, FALSE,
-							     e_calendar_view_get_timezone (E_CALENDAR_VIEW (day_view)));
-		e_cal_component_set_dtstart (comp, &date);
-	} else {
-		dt = e_day_view_convert_grid_position_to_time (day_view, day, day_view->resize_end_row + 1);
-		*date.value = icaltime_from_timet_with_zone (dt, FALSE,
-							     e_calendar_view_get_timezone (E_CALENDAR_VIEW (day_view)));
-		e_cal_component_set_dtend (comp, &date);
-	}
-
-	e_cal_component_commit_sequence (comp);
-
-	if (day_view->last_edited_comp_string != NULL) {
-		g_free (day_view->last_edited_comp_string);
-		day_view->last_edited_comp_string = NULL;
-	}
-
-	day_view->last_edited_comp_string = e_cal_component_get_as_string (comp);
-
-	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_CALENDAR_VIEW_POS_NONE;
-
- 	if (e_cal_component_is_instance (comp)) {
- 		if (!recur_component_dialog (client, comp, &mod, NULL)) {
- 			gtk_widget_queue_draw (day_view->top_canvas);
-			goto out;
- 		}
-	}
-	
-	toplevel = GTK_WINDOW (gtk_widget_get_toplevel (GTK_WIDGET (day_view)));
-
-	e_cal_component_commit_sequence (comp);
-	e_calendar_view_modify_and_send (comp, client, mod, toplevel, TRUE);
-
- out:	
-	g_object_unref (comp);
-}
-
-
-static void
-e_day_view_abort_resize (EDayView *day_view,
-			 guint32 time)
-{
-	gint day, event_num;
-
-	if (day_view->resize_drag_pos == E_CALENDAR_VIEW_POS_NONE)
-		return;
-
-	day_view->resize_drag_pos = E_CALENDAR_VIEW_POS_NONE;
-	gdk_pointer_ungrab (time);
-
-	day = day_view->resize_event_day;
-	event_num = day_view->resize_event_num;
-
-	if (day == E_DAY_VIEW_LONG_EVENT) {
-		e_day_view_reshape_long_event (day_view, event_num);
-		gtk_widget_queue_draw (day_view->top_canvas);
-
-		day_view->last_cursor_set_in_top_canvas = day_view->normal_cursor;
-		gdk_window_set_cursor (day_view->top_canvas->window,
-				       day_view->normal_cursor);
-		gnome_canvas_item_hide (day_view->resize_long_event_rect_item);
-	} else {
-		e_day_view_reshape_day_event (day_view, day, event_num);
-		e_day_view_reshape_main_canvas_resize_bars (day_view);
-		gtk_widget_queue_draw (day_view->main_canvas);
-
-		day_view->last_cursor_set_in_main_canvas = day_view->normal_cursor;
-		gdk_window_set_cursor (day_view->main_canvas->window,
-				       day_view->normal_cursor);
-		gnome_canvas_item_hide (day_view->resize_rect_item);
-		gnome_canvas_item_hide (day_view->resize_bar_item);
-	}
-}
-
-
-static void
-e_day_view_free_events (EDayView *day_view)
-{
-	gint day;
-
-	/* Reset all our indices. */
-	day_view->editing_event_day = -1;
-	day_view->popup_event_day = -1;
-	day_view->resize_bars_event_day = -1;
-	day_view->resize_event_day = -1;
-	day_view->pressed_event_day = -1;
-	day_view->drag_event_day = -1;
-	day_view->editing_event_num = -1;
-	day_view->popup_event_num = -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));
-
-		e_cal_model_free_component_data (event->comp_data);
-	}
-
-	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 (ECalComponent *comp,
-		      time_t	  start,
-		      time_t	  end,
-		      gpointer	  data)
-
-{
-	EDayViewEvent event;
-	gint day, offset;
-	struct icaltimetype start_tt, end_tt;
-	AddEventData *add_event_data;
-
-	add_event_data = data;
-
-#if 0
-	g_print ("Day view lower: %s", ctime (&add_event_data->day_view->lower));
-	g_print ("Day view upper: %s", ctime (&add_event_data->day_view->upper));
-	g_print ("Event start: %s", ctime (&start));
-	g_print ("Event end  : %s\n", ctime (&end));
-#endif
-
-	/* Check that the event times are valid. */
-	g_return_val_if_fail (start <= end, TRUE);
-	g_return_val_if_fail (start < add_event_data->day_view->upper, TRUE);
-	g_return_val_if_fail (end > add_event_data->day_view->lower, TRUE);
-
-	start_tt = icaltime_from_timet_with_zone (start, FALSE,
-						  e_calendar_view_get_timezone (E_CALENDAR_VIEW (add_event_data->day_view)));
-	end_tt = icaltime_from_timet_with_zone (end, FALSE,
-						e_calendar_view_get_timezone (E_CALENDAR_VIEW (add_event_data->day_view)));
-
-	if (add_event_data->comp_data) {
-		event.comp_data = e_cal_model_copy_component_data (add_event_data->comp_data);
-	} else {
-		event.comp_data = g_new0 (ECalModelComponent, 1);
-
-		event.comp_data->client = g_object_ref (e_cal_model_get_default_client (e_calendar_view_get_model (E_CALENDAR_VIEW (add_event_data->day_view))));
-		e_cal_component_abort_sequence (comp);
-		event.comp_data->icalcomp = icalcomponent_new_clone (e_cal_component_get_icalcomponent (comp));
-	}
-
-	event.start = start;
-	event.end = end;
-	event.canvas_item = NULL;
-	event.comp_data->instance_start = start;
-	event.comp_data->instance_end = end;
-
-	/* Calculate the start & end minute, relative to the top of the
-	   display. */
-	offset = add_event_data->day_view->first_hour_shown * 60
-		+ add_event_data->day_view->first_minute_shown;
-	event.start_minute = start_tt.hour * 60 + start_tt.minute - offset;
-	event.end_minute = end_tt.hour * 60 + end_tt.minute - offset;
-
-	event.start_row_or_col = 0;
-	event.num_columns = 0;
-
-	event.different_timezone = FALSE;
-	if (!cal_comp_util_compare_event_timezones (comp,
-						    event.comp_data->client,
-						    e_calendar_view_get_timezone (E_CALENDAR_VIEW (add_event_data->day_view))))
-		event.different_timezone = TRUE;
-
-	/* Find out which array to add the event to. */
-	for (day = 0; day < add_event_data->day_view->days_shown; day++) {
-		if (start >= add_event_data->day_view->day_starts[day]
-		    && end <= add_event_data->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 == add_event_data->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 == add_event_data->day_view->day_starts[day])
-					break;
-
-				event.end_minute = 24 * 60;
-			}
-
-			g_array_append_val (add_event_data->day_view->events[day], event);
-			add_event_data->day_view->events_sorted[day] = FALSE;
-			add_event_data->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 (add_event_data->day_view->long_events, event);
-	add_event_data->day_view->long_events_sorted = FALSE;
-	add_event_data->day_view->long_events_need_layout = TRUE;
-	return TRUE;
-}
-
-
-/* This lays out the short (less than 1 day) events in the columns.
-   Any long events are simply skipped. */
-void
-e_day_view_check_layout (EDayView *day_view)
-{
-	gint day, rows_in_top_display, top_canvas_height, top_rows;
-
-	/* Don't bother if we aren't visible. */
-	if (!GTK_WIDGET_VISIBLE (day_view))
-	    return;
-
-	/* Make sure the events are sorted (by start and size). */
-	e_day_view_ensure_events_sorted (day_view);
-
-	for (day = 0; day < day_view->days_shown; day++) {
-		if (day_view->need_layout[day])
-			e_day_view_layout_day_events (day_view->events[day],
-						      day_view->rows,
-						      day_view->mins_per_row,
-						      day_view->cols_per_row[day]);
-
-		if (day_view->need_layout[day]
-		    || day_view->need_reshape[day]) {
-			e_day_view_reshape_day_events (day_view, day);
-
-			if (day_view->resize_bars_event_day == day)
-				e_day_view_reshape_main_canvas_resize_bars (day_view);
-		}
-
-		day_view->need_layout[day] = FALSE;
-		day_view->need_reshape[day] = FALSE;
-	}
-
-	if (day_view->long_events_need_layout) {
-		e_day_view_layout_long_events (day_view->long_events,
-					       day_view->days_shown,
-					       day_view->day_starts,
-					       &rows_in_top_display);
-
-		/* Set the height of the top canvas based on the row height
-		   and the number of rows needed (min 1 + 1 for the dates + 1
-		   space for DnD).*/
-		if (day_view->rows_in_top_display != rows_in_top_display) {
-			day_view->rows_in_top_display = rows_in_top_display;
-			top_rows = MAX (1, rows_in_top_display);
-			top_canvas_height = (top_rows + 2)
-				* day_view->top_row_height;
-			gtk_widget_set_usize (day_view->top_canvas, -1,
-					      top_canvas_height);
-		}
-	}
-
-
-	if (day_view->long_events_need_layout
-	    || day_view->long_events_need_reshape)
-		e_day_view_reshape_long_events (day_view);
-
-	day_view->long_events_need_layout = FALSE;
-	day_view->long_events_need_reshape = FALSE;
-}
-
-
-static void
-e_day_view_reshape_long_events (EDayView *day_view)
-{
-	EDayViewEvent *event;
-	gint event_num;
-
-	for (event_num = 0; event_num < day_view->long_events->len;
-	     event_num++) {
-		event = &g_array_index (day_view->long_events, EDayViewEvent,
-					event_num);
-
-		if (event->num_columns == 0) {
-			if (event->canvas_item) {
-				gtk_object_destroy (GTK_OBJECT (event->canvas_item));
-				event->canvas_item = NULL;
-			}
-		} else {
-			e_day_view_reshape_long_event (day_view, event_num);
-		}
-	}
-}
-
-
-static void
-e_day_view_reshape_long_event (EDayView *day_view,
-			       gint	 event_num)
-{
-	EDayViewEvent *event;
-	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;
-	ECalComponent *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;
-	PangoFontDescription *font_desc;
-	PangoContext *pango_context;
-	PangoLayout *layout;
-
-	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 = e_cal_component_new ();
-	e_cal_component_set_icalcomponent (comp, icalcomponent_new_clone (event->comp_data->icalcomp));
-
-	/* Set up Pango prerequisites */
-	font_desc = gtk_widget_get_style (GTK_WIDGET (day_view))->font_desc;
-	pango_context = gtk_widget_get_pango_context (GTK_WIDGET (day_view));
-	layout = pango_layout_new (pango_context);
-
-	if (day_view->resize_drag_pos != E_CALENDAR_VIEW_POS_NONE
-	    && day_view->resize_event_day == E_DAY_VIEW_LONG_EVENT
-	    && day_view->resize_event_num == event_num)
-		show_icons = FALSE;
-
-	if (day_view->editing_event_day == E_DAY_VIEW_LONG_EVENT
-	    && day_view->editing_event_num == event_num) {
-		show_icons = FALSE;
-		use_max_width = TRUE;
-	}
-
-	if (show_icons) {
-		GSList *categories_list, *elem;
-
-		if (e_cal_component_has_alarms (comp))
-			num_icons++;
-		if (e_cal_component_has_recurrences (comp))
-			num_icons++;
-		if (event->different_timezone)
-			num_icons++;
-		if (e_cal_component_has_organizer (comp))
-			num_icons++;
-		if (e_cal_component_has_attachments (comp))
-			num_icons++;
-		e_cal_component_get_categories_list (comp, &categories_list);
-		for (elem = categories_list; elem; elem = elem->next) {
-			char *category;
-			GdkPixmap *pixmap = NULL;
-			GdkBitmap *mask = NULL;
-
-			category = (char *) elem->data;
-			if (e_categories_config_get_icon_for (category, &pixmap, &mask))
-				num_icons++;
-		}
-		e_cal_component_free_categories_list (categories_list);
-	}
-
-	if (!event->canvas_item) {
-		GtkWidget *widget;
-
-		widget = (GtkWidget *)day_view;
-		event->canvas_item =
-			gnome_canvas_item_new (GNOME_CANVAS_GROUP (GNOME_CANVAS (day_view->top_canvas)->root),
-					       e_text_get_type (),
-					       "anchor", GTK_ANCHOR_NW,
-					       "clip", TRUE,
-					       "max_lines", 1,
-					       "editable", TRUE,
-					       "use_ellipsis", TRUE,
-					       "draw_background", FALSE,
-					       "fill_color_gdk", &widget->style->text[GTK_STATE_NORMAL],
-					       "im_context", E_CANVAS (day_view->top_canvas)->im_context,
-					       NULL);
-		g_signal_connect (event->canvas_item, "event",
-				  G_CALLBACK (e_day_view_on_text_item_event), day_view);
-		g_signal_emit_by_name (G_OBJECT(day_view),
-				       "event_added", event);
-
-		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 + E_DAY_VIEW_LONG_EVENT_ICON_R_PAD;
-	time_width = e_day_view_get_time_string_width (day_view);
-
-	if (use_max_width) {
-		text_x = item_x;
-		text_w = item_w;
-	} else {
-		/* Get the requested size of the label. */
-		g_object_get (G_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);
-			pango_layout_set_text (layout, text, line_len);
-			pango_layout_get_pixel_size (layout, &text_width, NULL);
-			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);
-
-	g_object_unref (layout);
-}
-
-
-/* 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++) {
-		EDayViewEvent *event;
-		gchar *current_comp_string;
-
-		e_day_view_reshape_day_event (day_view, day, event_num);
-		event = &g_array_index (day_view->events[day], EDayViewEvent, event_num);
-		current_comp_string = icalcomponent_as_ical_string (event->comp_data->icalcomp);
-		if (day_view->last_edited_comp_string == NULL)
-			continue;
-		if (strncmp (current_comp_string, day_view->last_edited_comp_string,50) == 0) {
-			e_canvas_item_grab_focus (event->canvas_item, TRUE);
-			g_free (day_view->last_edited_comp_string);
-			day_view-> last_edited_comp_string = NULL;
-		}
-	}
-}
-
-
-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;
-
-	event = &g_array_index (day_view->events[day], EDayViewEvent,
-				event_num);
-
-	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_CALENDAR_VIEW_POS_NONE
-		    || day_view->resize_event_day != day
-		    || day_view->resize_event_num != event_num) {
-			GSList *categories_list, *elem;
-			ECalComponent *comp;
-
-			comp = e_cal_component_new ();
-			e_cal_component_set_icalcomponent (comp, icalcomponent_new_clone (event->comp_data->icalcomp));
-
-			if (e_cal_component_has_alarms (comp))
-				num_icons++;
-			if (e_cal_component_has_recurrences (comp))
-				num_icons++;
-			if (e_cal_component_has_attachments (comp))
-				num_icons++;
-			if (event->different_timezone)
-				num_icons++;
-			if (e_cal_component_has_organizer (comp))
-				num_icons++;
-
-			e_cal_component_get_categories_list (comp, &categories_list);
-			for (elem = categories_list; elem; elem = elem->next) {
-				char *category;
-				GdkPixmap *pixmap = NULL;
-				GdkBitmap *mask = NULL;
-
-				category = (char *) elem->data;
-				if (e_categories_config_get_icon_for (category, &pixmap, &mask))
-					num_icons++;
-			}
-			e_cal_component_free_categories_list (categories_list);
-			g_object_unref(comp);
-		}
-
-		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) {
-			GtkWidget *widget;
-
-			widget = (GtkWidget *)day_view;
-			event->canvas_item =
-				gnome_canvas_item_new (GNOME_CANVAS_GROUP (GNOME_CANVAS (day_view->main_canvas)->root),
-						       e_text_get_type (),
-						       "anchor", GTK_ANCHOR_NW,
-						       "line_wrap", TRUE,
-						       "editable", TRUE,
-						       "clip", TRUE,
-						       "use_ellipsis", TRUE,
-						       "draw_background", FALSE,
-						       "fill_color_gdk", &widget->style->text[GTK_STATE_NORMAL],
-						       "im_context", E_CANVAS (day_view->main_canvas)->im_context,
-						       NULL);
-			g_signal_connect (event->canvas_item, "event",
-					  G_CALLBACK (e_day_view_on_text_item_event), day_view);
-			g_signal_emit_by_name (G_OBJECT(day_view),
-					       "event_added", event);
-
-			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) {
-		g_object_get (G_OBJECT (day_view->drag_rect_item),
-			      "x1", &x,
-			      "y1", &y,
-			      "x2", &w,
-			      "y2", &h,
-			      NULL);
-		w -= x;
-		x++;
-		h -= y;
-	} else if (day != -1
-		   && e_day_view_get_event_position (day_view, day, event_num,
-						     &item_x, &item_y,
-						     &item_w, &item_h)) {
-		x = item_x + E_DAY_VIEW_BAR_WIDTH;
-		y = item_y;
-		w = item_w - E_DAY_VIEW_BAR_WIDTH;
-		h = item_h;
-	} else {
-		gnome_canvas_item_hide (day_view->main_canvas_top_resize_bar_item);
-		gnome_canvas_item_hide (day_view->main_canvas_bottom_resize_bar_item);
-		return;
-	}
-
-	gnome_canvas_item_set (day_view->main_canvas_top_resize_bar_item,
-			       "x1", x - E_DAY_VIEW_BAR_WIDTH,
-			       "y1", y - E_DAY_VIEW_BAR_HEIGHT,
-			       "x2", x + w - 1,
-			       "y2", y - 1,
-			       NULL);
-	gnome_canvas_item_show (day_view->main_canvas_top_resize_bar_item);
-
-	gnome_canvas_item_set (day_view->main_canvas_bottom_resize_bar_item,
-			       "x1", x - E_DAY_VIEW_BAR_WIDTH,
-			       "y1", y + h,
-			       "x2", x + w - 1,
-			       "y2", y + h + E_DAY_VIEW_BAR_HEIGHT - 1,
-			       NULL);
-	gnome_canvas_item_show (day_view->main_canvas_bottom_resize_bar_item);
-}
-
-
-static void
-e_day_view_ensure_events_sorted (EDayView *day_view)
-{
-	gint day;
-
-	/* Sort the long events. */
-	if (!day_view->long_events_sorted) {
-		qsort (day_view->long_events->data,
-		       day_view->long_events->len,
-		       sizeof (EDayViewEvent),
-		       e_day_view_event_sort_func);
-		day_view->long_events_sorted = TRUE;
-	}
-
-	/* Sort the events for each day. */
-	for (day = 0; day < day_view->days_shown; day++) {
-		if (!day_view->events_sorted[day]) {
-			qsort (day_view->events[day]->data,
-			       day_view->events[day]->len,
-			       sizeof (EDayViewEvent),
-			       e_day_view_event_sort_func);
-			day_view->events_sorted[day] = TRUE;
-		}
-	}
-}
-
-
-gint
-e_day_view_event_sort_func (const void *arg1,
-			    const void *arg2)
-{
-	EDayViewEvent *event1, *event2;
-
-	event1 = (EDayViewEvent*) arg1;
-	event2 = (EDayViewEvent*) arg2;
-
-	if (event1->start < event2->start)
-		return -1;
-	if (event1->start > event2->start)
-		return 1;
-
-	if (event1->end > event2->end)
-		return -1;
-	if (event1->end < event2->end)
-		return 1;
-
-	return 0;
-}
-
-static gboolean
-e_day_view_do_key_press (GtkWidget *widget, GdkEventKey *event)
-{
-	EDayView *day_view;
-	icalcomponent *icalcomp;
-	ECal *ecal;
-	ECalModel *model;
-	ECalComponent *comp;
-	gint day, event_num;
-	gchar *initial_text;
-	guint keyval;
-	gboolean stop_emission;
-	time_t dtstart, dtend;
-	ECalComponentDateTime start_dt, end_dt;
-	struct icaltimetype start_tt, end_tt;
-        const char *uid;
-	AddEventData add_event_data;
-	gboolean read_only = TRUE;
-	
-	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_CALENDAR_VIEW_POS_NONE) {
-		if (keyval == GDK_Escape) {
-			e_day_view_abort_resize (day_view, event->time);
-		}
-		return FALSE;
-	}
-	
-	/* Alt + Arrow Keys to move a selected event through time lines */
-	if (((event->state & GDK_SHIFT_MASK) != GDK_SHIFT_MASK)
-		&&((event->state & GDK_CONTROL_MASK) != GDK_CONTROL_MASK)
-		&&((event->state & GDK_MOD1_MASK) == GDK_MOD1_MASK)) {
-		if (keyval == GDK_Up || keyval == GDK_KP_Up)
-			return e_day_view_event_move ((ECalendarView *) day_view, E_CAL_VIEW_MOVE_UP);
-		else if (keyval == GDK_Down || keyval == GDK_KP_Down)
-			return e_day_view_event_move ((ECalendarView *) day_view, E_CAL_VIEW_MOVE_DOWN);
-		else if (keyval == GDK_Left || keyval == GDK_KP_Left)
-			return e_day_view_event_move ((ECalendarView *) day_view, E_CAL_VIEW_MOVE_LEFT);
-		else if (keyval == GDK_Right || keyval == GDK_KP_Right)
-			return e_day_view_event_move ((ECalendarView *) day_view, E_CAL_VIEW_MOVE_RIGHT);
-	}
-
-	/*Go to the start/end of a work day*/	
-	if ((keyval == GDK_Home)
-	    		&&((event->state & GDK_SHIFT_MASK) != GDK_SHIFT_MASK)
-	    		&&((event->state & GDK_CONTROL_MASK) != GDK_CONTROL_MASK)
-	    		&&((event->state & GDK_MOD1_MASK) != GDK_MOD1_MASK)) {
-		e_day_view_goto_start_of_work_day (day_view);
-		return TRUE;
-	}
-	if ((keyval == GDK_End)
-	    &&((event->state & GDK_SHIFT_MASK) != GDK_SHIFT_MASK)
-	    &&((event->state & GDK_CONTROL_MASK) != GDK_CONTROL_MASK)
-	    &&((event->state & GDK_MOD1_MASK) != GDK_MOD1_MASK)) {
-		e_day_view_goto_end_of_work_day (day_view);
-		return TRUE;
-	}
-	
-	/* In DayView, Shift+Home/End, Change the duration to the time that begins/ends the current work day */	
-	if ((keyval == GDK_Home)
-	    &&((event->state & GDK_SHIFT_MASK) == GDK_SHIFT_MASK)
-	    &&((event->state & GDK_CONTROL_MASK) != GDK_CONTROL_MASK)
-	    &&((event->state & GDK_MOD1_MASK) != GDK_MOD1_MASK)) {
-		e_day_view_change_duration_to_start_of_work_day (day_view);
-		return TRUE;
-	}
-	if ((keyval == GDK_End)
-	    &&((event->state & GDK_SHIFT_MASK) == GDK_SHIFT_MASK)
-	    &&((event->state & GDK_CONTROL_MASK) != GDK_CONTROL_MASK)
-	    &&((event->state & GDK_MOD1_MASK) != GDK_MOD1_MASK)) {
-		e_day_view_change_duration_to_end_of_work_day (day_view);
-		return TRUE;
-	}
-
-	
-	/* 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 if (!(event->state & GDK_MOD1_MASK)) {
-		switch (keyval) {
-		case GDK_Up:
-			e_day_view_cursor_key_up (day_view, event);
-			break;
-		case GDK_Down:
-			e_day_view_cursor_key_down (day_view, event);
-			break;
-		case GDK_Left:
-			e_day_view_cursor_key_left (day_view, event);
-			break;
-		case GDK_Right:
-			e_day_view_cursor_key_right (day_view, event);
-			break;
-		case GDK_Page_Up:
-			e_day_view_scroll (day_view, E_DAY_VIEW_PAGE_STEP);
-			break;
-		case GDK_Page_Down:
-			e_day_view_scroll (day_view, -E_DAY_VIEW_PAGE_STEP);
-			break;
-		default:
-			stop_emission = FALSE;
-			break;
-		}
-	}
-	else
-		stop_emission = FALSE;
-	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;
-	}
-
-	/* Check if the client is read only */
-	model = e_calendar_view_get_model (E_CALENDAR_VIEW (day_view));
-	ecal = e_cal_model_get_default_client (model);
-	if (!e_cal_is_read_only (ecal, &read_only, NULL) || read_only)
-		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->state & (GDK_CONTROL_MASK | GDK_MOD1_MASK)))
-		   || (event->length == 0)
-		   || (keyval == GDK_Tab)) {
-		return FALSE;
-	} else
-		initial_text = e_utf8_from_gtk_event_key (widget, event->keyval, event->string);
-
-	/* Add a new event covering the selected range */	
-	icalcomp = e_cal_model_create_component_with_defaults (model);
-	if (!icalcomp)
-		return FALSE;
-	uid = icalcomponent_get_uid (icalcomp);
-
-	comp = e_cal_component_new ();
-	e_cal_component_set_icalcomponent (comp, icalcomp);
-
-	e_day_view_get_selected_time_range ((ECalendarView *) day_view, &dtstart, &dtend);
-
-	start_tt = icaltime_from_timet_with_zone (dtstart, FALSE,
-						  e_calendar_view_get_timezone (E_CALENDAR_VIEW (day_view)));
-
-	end_tt = icaltime_from_timet_with_zone (dtend, FALSE,
-						e_calendar_view_get_timezone (E_CALENDAR_VIEW (day_view)));
-
-	if (day_view->selection_in_top_canvas) {
-		start_dt.tzid = NULL;
-		start_tt.is_date = 1;
-		end_tt.is_date = 1;
-	} else {
-		start_dt.tzid = icaltimezone_get_tzid (e_calendar_view_get_timezone (E_CALENDAR_VIEW (day_view)));
-	}
-
-	start_dt.value = &start_tt;
-	end_dt.value = &end_tt;
-	end_dt.tzid = start_dt.tzid;
-	e_cal_component_set_dtstart (comp, &start_dt);
-	e_cal_component_set_dtend (comp, &end_dt);
-
-	e_cal_component_set_categories (
-		comp, e_calendar_view_get_default_category (E_CALENDAR_VIEW (day_view)));
-
-	/* We add the event locally and start editing it. We don't send it
-	   to the server until the user finishes editing it. */
-	add_event_data.day_view = day_view;
-	add_event_data.comp_data = NULL;
-	e_day_view_add_event (comp, dtstart, dtend, &add_event_data);
-	e_day_view_check_layout (day_view);
-	gtk_widget_queue_draw (day_view->top_canvas);
-	gtk_widget_queue_draw (day_view->main_canvas);
-
-	if (e_day_view_find_event_from_uid (day_view, ecal, uid, NULL, &day, &event_num)) {
-		e_day_view_start_editing_event (day_view, day, event_num,
-						initial_text);
-	} else {
-		g_warning ("Couldn't find event to start editing.\n");
-	}
-
-	if (initial_text)
-		g_free (initial_text);
-
-	g_object_unref (comp);
-
-	return TRUE;
-}
-
-static gboolean
-e_day_view_key_press (GtkWidget *widget, GdkEventKey *event)
-{
-	gboolean handled = FALSE;
-	handled = e_day_view_do_key_press (widget, event);
-
-	/* if not handled, try key bindings */
-	if (!handled)
-		handled = GTK_WIDGET_CLASS (e_day_view_parent_class)->key_press_event (widget, event);
-	return handled;
-}
-
-/* Select the time that begins a work day*/
-static void
-e_day_view_goto_start_of_work_day (EDayView *day_view)
-{
-	g_return_if_fail(day_view!=NULL);        
-
-	if (day_view->selection_in_top_canvas)
-		return;
-	else 
-		day_view->selection_start_row = 
-			e_day_view_convert_time_to_row (day_view, 
-							day_view->work_day_start_hour, 
-							day_view->work_day_start_minute);
-	day_view->selection_end_row = day_view->selection_start_row;
-
-	e_day_view_ensure_rows_visible (day_view,
-					day_view->selection_start_row,
-					day_view->selection_end_row);
-	
-	e_day_view_update_calendar_selection_time (day_view);
-	
-	gtk_widget_queue_draw (day_view->top_canvas);
-	gtk_widget_queue_draw (day_view->main_canvas);
-}
-
-
-/* Select the time that ends a work day*/
-static void
-e_day_view_goto_end_of_work_day (EDayView *day_view)
-{
-	if (day_view->selection_in_top_canvas)
-		return;
-	else
-		day_view->selection_start_row =
-			e_day_view_convert_time_to_row (day_view, 
-							day_view->work_day_end_hour-1, 
-							day_view->work_day_end_minute+30);
-	day_view->selection_end_row = day_view->selection_start_row;
-	
-	e_day_view_ensure_rows_visible (day_view,
-					day_view->selection_start_row,
-					day_view->selection_end_row);
-
-	e_day_view_update_calendar_selection_time (day_view);
-
-	gtk_widget_queue_draw (day_view->top_canvas);
-	gtk_widget_queue_draw (day_view->main_canvas);
-}
-
-/* Change the duration to the time that begins the current work day */
-static void
-e_day_view_change_duration_to_start_of_work_day (EDayView *day_view)
-{
-	g_return_if_fail(day_view != NULL);
-	
-	if (day_view->selection_in_top_canvas)
-		return;
-	else {
-		gint work_start_row,work_end_row,selection_start_row,selection_end_row;
-		
-		work_start_row =
-			e_day_view_convert_time_to_row (day_view, 
-							day_view->work_day_start_hour, 
-							day_view->work_day_start_minute);
-		work_end_row =
-			e_day_view_convert_time_to_row (day_view, 
-							day_view->work_day_end_hour - 1, 
-							day_view->work_day_end_minute + 30);
-		selection_start_row = day_view->selection_start_row;
-		selection_end_row = day_view->selection_end_row;
-		if (selection_start_row < work_start_row)
-			day_view->selection_end_row = work_start_row - 1;
-		else day_view->selection_start_row = work_start_row;
-	}
-	
-	e_day_view_ensure_rows_visible (day_view,
-					day_view->selection_start_row,
-					day_view->selection_end_row);
-
-	e_day_view_update_calendar_selection_time (day_view);
-
-	gtk_widget_queue_draw (day_view->top_canvas);
-	gtk_widget_queue_draw (day_view->main_canvas);
-}
-
-/* Change the duration to the time that ends the current work day */
-static void
-e_day_view_change_duration_to_end_of_work_day (EDayView *day_view)
-{
-	g_return_if_fail(day_view != NULL);
-    
-	if (day_view->selection_in_top_canvas)
-		return;
-	else { 
-		gint work_start_row,work_end_row,selection_start_row,selection_end_row;     
-		work_start_row =
-			e_day_view_convert_time_to_row (day_view, 
-							day_view->work_day_start_hour, 
-							day_view->work_day_start_minute);
-		work_end_row = e_day_view_convert_time_to_row (day_view, 
-							      day_view->work_day_end_hour-1, 
-							      day_view->work_day_end_minute+30);
-		selection_start_row = day_view->selection_start_row;
-		selection_end_row = day_view->selection_end_row;
-		if (selection_start_row <= work_end_row)
-			day_view->selection_end_row = work_end_row;
-		else {
-			day_view->selection_start_row = work_end_row + 1;
-			day_view->selection_end_row = selection_start_row;
-		}
-	}
-
-	e_day_view_ensure_rows_visible (day_view,
-					day_view->selection_start_row,
-					day_view->selection_end_row);
-	
-	e_day_view_update_calendar_selection_time (day_view);
-	
-	gtk_widget_queue_draw (day_view->top_canvas);
-	gtk_widget_queue_draw (day_view->main_canvas);
-}
-
-
-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 gboolean
-e_day_view_focus (GtkWidget *widget, GtkDirectionType direction)
-{
-	EDayView *day_view;
-	gint new_day;
-	gint new_event_num;
-	gint start_row, end_row;
-
-	g_return_val_if_fail (widget != NULL, FALSE);
-	g_return_val_if_fail (E_IS_DAY_VIEW (widget), FALSE);
-	day_view = E_DAY_VIEW (widget);
-
-	if (!e_day_view_get_next_tab_event (day_view, direction,
-					    &new_day, &new_event_num))
-		return FALSE;
-
-	if ((new_day == -1) && (new_event_num == -1)) {
-		/* focus should go to the day view widget itself
-		 */
-		gtk_widget_grab_focus (GTK_WIDGET(day_view));
-		return TRUE;
-	}
-
-	if (new_day != E_DAY_VIEW_LONG_EVENT && new_day != -1) {
-		if (e_day_view_get_event_rows (day_view, new_day,
-					       new_event_num,
-					       &start_row, &end_row))
-			/* ensure the event to be seen */
-			e_day_view_ensure_rows_visible (day_view,
-							start_row, end_row);
-	}
-	e_day_view_start_editing_event (day_view, new_day,
-					new_event_num, NULL);
-
-	return TRUE;
-}
-
-/**
- * e_day_view_get_extreme_event
- * @day_view: the day view widget operates on
- * @start_day, @end_day: range of search, both inclusive
- * @first: %TURE indicate to return the data for the first event in the range,
- *         %FALSE to return data for the last event in the range.
- * @day_out: out value, day of the event found. -1 for no event found.
- * @event_num_out: out value, event number of the event found.
- *                  -1 for no event found.
- *
- * Get day and event_num value for the first or last event found in the day range.
- *
- * Return value: %TRUE, if a event found.
- **/
-static gboolean
-e_day_view_get_extreme_event (EDayView *day_view, gint start_day,
-			      gint end_day, gboolean first,
-			      gint *day_out, gint *event_num_out)
-{
-	gint loop_day;
-
-	g_return_val_if_fail (day_view != NULL, FALSE);
-	g_return_val_if_fail (start_day >= 0, FALSE);
-	g_return_val_if_fail (end_day <= E_DAY_VIEW_LONG_EVENT, FALSE);
-	g_return_val_if_fail (day_out && event_num_out, FALSE);
-
-	if (start_day > end_day)
-		return FALSE;
-	if (first) {
-		for (loop_day = start_day; loop_day <= end_day; ++loop_day)
-			if (day_view->events[loop_day]->len > 0) {
-				*day_out = loop_day;
-				*event_num_out = 0;
-				return TRUE;
-			}
-	}
-	else {
-		for (loop_day = end_day; loop_day >= start_day; --loop_day)
-			if (day_view->events[loop_day]->len > 0) {
-				*day_out = loop_day;
-				*event_num_out =
-					day_view->events[loop_day]->len - 1;
-				return TRUE;
-			}
-	}
-	*day_out = -1;
-	*event_num_out = -1;
-	return FALSE;
-}
-
-/**
- * e_day_view_get_extreme_long_event
- * @day_view: the day view widget operates on
- * @first: %TURE indicate to return the data for the first event in the range,
- *         %FALSE to return data for the last event in the range.
- * @event_num_out: out value, event number of the event found.
- *                  -1 for no event found.
- *
- * Similar to e_day_view_get_extreme_event, but run for long events.
- *
- * Return value: %TRUE, if a event found.
- **/
-static gboolean
-e_day_view_get_extreme_long_event (EDayView *day_view, gboolean first,
-				   gint *day_out, gint *event_num_out)
-{
-	g_return_val_if_fail (day_view != NULL, FALSE);
-	g_return_val_if_fail (day_out && event_num_out, FALSE);
-
-	if (first && (day_view->long_events->len > 0)) {
-		*day_out = E_DAY_VIEW_LONG_EVENT;
-		*event_num_out = 0;
-		return TRUE;
-	}
-	if ((!first) && (day_view->long_events->len > 0)) {
-		*day_out = E_DAY_VIEW_LONG_EVENT;
-		*event_num_out = day_view->long_events->len - 1;
-		return TRUE;
-	}
-	*day_out = -1;
-	*event_num_out = -1;
-	return FALSE;
-}
-
-/**
- * e_day_view_get_next_tab_event
- * @day_view: the day view widget operates on
- * @direction: GTK_DIR_TAB_BACKWARD or GTK_DIR_TAB_FORWARD
- * @day_out: out value, day of the event found. -1 for no event found.
- * @event_num_out: out value, event number of the event found.
- *                  -1 for no event found.
- *
- * Decide on which event the focus should go next. 
- * if ((day_out == -1) && (event_num_out == -1)) is true, focus should go
- * to day_view widget itself.
- *
- * Return value: %TRUE, if a event found.
- **/
-static gboolean
-e_day_view_get_next_tab_event (EDayView *day_view, GtkDirectionType direction,
-			       gint *day_out, gint *event_num_out)
-{
-	gint new_day;
-	gint new_event_num;
-	gint days_shown;
-
-	g_return_val_if_fail (day_view != NULL, FALSE);
-	g_return_val_if_fail (day_out != NULL, FALSE);
-	g_return_val_if_fail (event_num_out != NULL, FALSE);
-
-	days_shown = e_day_view_get_days_shown(day_view);
-	*day_out = -1;
-	*event_num_out = -1;
-
-	g_return_val_if_fail (days_shown > 0, FALSE);
-
-	switch (direction) {
-	case GTK_DIR_TAB_BACKWARD:
-		new_event_num = day_view->editing_event_num - 1;
-		break;
-	case GTK_DIR_TAB_FORWARD:
-		new_event_num = day_view->editing_event_num + 1;
-		break;
-	default:
-		return FALSE;
-	}
-
-	new_day = day_view->editing_event_day;
-
-	/* not current editing event, set to first long event if there is one
-	 */
-	if (new_day == -1) {
-		if (direction == GTK_DIR_TAB_FORWARD) {
-			if (e_day_view_get_extreme_long_event (day_view, TRUE,
-							       day_out,
-							       event_num_out))
-				return TRUE;
-
-			/* no long event, set to first event if there is
-			 */
-			e_day_view_get_extreme_event (day_view, 0,
-						      days_shown - 1, TRUE,
-						      day_out, event_num_out);
-			/* go to event if found, or day view widget
-			 */
-			return TRUE;
-		}
-		else {
-			if (e_day_view_get_extreme_event (day_view, 0,
-							  days_shown - 1, FALSE,
-							  day_out, event_num_out))
-				return TRUE;
-
-			/* no event, set to last long event if there is
-			 */
-			e_day_view_get_extreme_long_event (day_view, FALSE,
-							   day_out,
-							   event_num_out);
-
-			/* go to long event if found, or day view widget
-			 */
-			return TRUE;
-		}
-	}
-	/* go backward from the first long event */
-	else if ((new_day == E_DAY_VIEW_LONG_EVENT) && (new_event_num < 0)) {
-		/* let focus go to day view widget in this case
-		 */
-		return TRUE;
-	}
-	/* go forward from the last long event */
-	else if ((new_day == E_DAY_VIEW_LONG_EVENT) &&
-		 (new_event_num >= day_view->long_events->len)) {
-		e_day_view_get_extreme_event (day_view, 0,
-					      days_shown - 1, TRUE,
-					      day_out, event_num_out);
-		/* go to the next main item event if found or day view widget
-		 */
-		return TRUE;
-	}
-
-	/* go backward from the first event in current editting day */
-	else if ((new_day < E_DAY_VIEW_LONG_EVENT) && (new_event_num < 0)) {
-		/* try to find a event from the previous day in days shown
-		 */
-		if (e_day_view_get_extreme_event (day_view, 0,
-						  new_day - 1, FALSE,
-						  day_out, event_num_out))
-			return TRUE;
-		/* try to find a long event
-		 */
-		e_day_view_get_extreme_long_event (day_view, FALSE,
-						   day_out, event_num_out);
-		/* go to a long event if found, or day view widget
-		 */
-		return TRUE;
-	}
-	/* go forward from the last event in current editting day */
-	else if ((new_day < E_DAY_VIEW_LONG_EVENT) &&
-		 (new_event_num >= day_view->events[new_day]->len)) {
-		/* try to find a event from the next day in days shown
-		 */
-		e_day_view_get_extreme_event (day_view, (new_day + 1),
-					      days_shown - 1, TRUE,
-					      day_out, event_num_out);
-		/* go to a event found, or day view widget
-		 */
-		return TRUE;
-	}
-	/* in the normal case
-	 */
-	*day_out = new_day;
-	*event_num_out = new_event_num;
-	return TRUE;
-}
-
-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);
-
-	g_signal_emit_by_name (day_view, "selected_time_changed");
-	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);
-
-	g_signal_emit_by_name (day_view, "selected_time_changed");
-	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 (e_calendar_view_get_calendar (E_CALENDAR_VIEW (day_view)));
-	} 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);
-	}
-	g_signal_emit_by_name (day_view, "selected_time_changed");
-}
-
-
-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 (e_calendar_view_get_calendar (E_CALENDAR_VIEW (day_view)));
-	} 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);
-	}
-	g_signal_emit_by_name (day_view, "selected_time_changed");
-}
-
-
-/* Scrolls the main canvas up or down. The pages_to_scroll argument
-   is multiplied with the adjustment's page size and added to the adjustment's
-   value, while ensuring we stay within the bounds. A positive value will
-   scroll the canvas down and a negative value will scroll it up. */
-static void
-e_day_view_scroll	(EDayView	*day_view,
-			 gfloat		 pages_to_scroll)
-{
-	GtkAdjustment *adj = GTK_LAYOUT (day_view->main_canvas)->vadjustment;
-	gfloat new_value;
-
-	new_value = adj->value - adj->page_size * pages_to_scroll;
-	new_value = CLAMP (new_value, adj->lower, adj->upper - adj->page_size);
-	gtk_adjustment_set_value (adj, new_value);
-}
-
-
-static gboolean
-e_day_view_check_if_new_event_fits (EDayView *day_view)
-{
-	gint day, start_row, end_row, row;
-
-	day = day_view->selection_start_day;
-	start_row = day_view->selection_start_row;
-	end_row = day_view->selection_end_row;
-
-	/* Long events always fit, since we keep adding rows to the top
-	   canvas. */
-	if (day != day_view->selection_end_day)
-		return TRUE;
-	if (start_row == 0 && end_row == day_view->rows)
-		return TRUE;
-
-	/* If any of the rows already have E_DAY_VIEW_MAX_COLUMNS columns,
-	   return FALSE. */
-	for (row = start_row; row <= end_row; row++) {
-		if (day_view->cols_per_row[day][row] >= E_DAY_VIEW_MAX_COLUMNS)
-			return FALSE;
-	}
-
-	return TRUE;
-}
-
-
-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;
-	gboolean read_only;
-
-#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 (!e_cal_is_read_only (event->comp_data->client, &read_only, NULL) || read_only)
-		return;
-
-	/* If the event is not shown, don't try to edit it. */
-	if (!event->canvas_item)
-		return;
-
-	/* We must grab the focus before setting the initial text, since
-	   grabbing the focus will result in a call to
-	   e_day_view_on_editing_started(), which will reset the text to get
-	   rid of the start and end times. */
-	e_canvas_item_grab_focus (event->canvas_item, TRUE);
-
-	if (initial_text) {
-		gnome_canvas_item_set (event->canvas_item,
-				       "text", initial_text,
-				       NULL);
-	}
-
-	/* Try to move the cursor to the end of the text. */
-	g_object_get (G_OBJECT (event->canvas_item),
-		      "event_processor", &event_processor,
-		      NULL);
-	if (event_processor) {
-		command.action = E_TEP_MOVE;
-		command.position = E_TEP_END_OF_BUFFER;
-		g_signal_emit_by_name (event_processor,
-				       "command", &command);
-	}
-}
-
-
-/* This stops the current edit. If accept is TRUE the event summary is updated,
-   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);
-}
-
-
-/* Cancels the current edition by resetting the appointment's text to its original value */
-static void
-cancel_editing (EDayView *day_view)
-{
-	int day, event_num;
-	EDayViewEvent *event;
-	const gchar *summary;
-
-	day = day_view->editing_event_day;
-	event_num = day_view->editing_event_num;
-
-	g_assert (day != -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);
-
-	/* Reset the text to what was in the component */
-
-	summary = icalcomponent_get_summary (event->comp_data->icalcomp);
-	g_object_set (G_OBJECT (event->canvas_item),
-		      "text", summary ? summary : "",
-		      NULL);
-
-	/* Stop editing */
-	e_day_view_stop_editing_event (day_view);
-}
-
-
-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) {
-			day_view->resize_event_num = -1;
-
-			/* 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;
-		} else if (event->key.keyval == GDK_Escape) {
-			cancel_editing (day_view);
-			gtk_signal_emit_stop_by_name (GTK_OBJECT (item), "event");
-			/* focus should go to day view when stop editing */
-			gtk_widget_grab_focus (GTK_WIDGET (day_view));
-			return TRUE;
-               } else if ((event->key.keyval == GDK_Up)
-                          && (event->key.state & GDK_SHIFT_MASK)
-                          && (event->key.state & GDK_CONTROL_MASK)
-                          && (event->key.state & GDK_MOD1_MASK)) {
-                       e_day_view_change_event_end_time_up (day_view);
-                       return TRUE;
-               } else if ((event->key.keyval == GDK_Down)
-                          && (event->key.state & GDK_SHIFT_MASK)
-                          && (event->key.state & GDK_CONTROL_MASK)
-                          && (event->key.state & GDK_MOD1_MASK)) {
-                       e_day_view_change_event_end_time_down (day_view);
-                       return TRUE;
-		}
-		break;
-	case GDK_2BUTTON_PRESS:
-#if 0
-		g_print ("Item got double-click\n");
-#endif
-		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 gboolean 
-e_day_view_event_move (ECalendarView *cal_view, ECalViewMoveDirection direction)
-{
-	EDayViewEvent *event;
-	EDayView *day_view;
-	gint day, event_num, resize_start_row, resize_end_row;
-	time_t start_dt, end_dt;
-	struct icaltimetype start_time, end_time;
-
-	day_view = E_DAY_VIEW (cal_view);
-	day = day_view->editing_event_day;
-	event_num = day_view->editing_event_num;
-
-	if ((day == -1) || (day == E_DAY_VIEW_LONG_EVENT))
-		return FALSE;
-
-	event = &g_array_index (day_view->events[day], EDayViewEvent,
-				event_num);
-	day_view->resize_event_day = day;
-	day_view->resize_event_num = event_num;
-	day_view->resize_bars_event_day = day;
-	day_view->resize_bars_event_num = event_num;
-	resize_start_row = event->start_minute / day_view->mins_per_row;
-	resize_end_row = (event->end_minute - 1) / day_view->mins_per_row;
-	if (resize_end_row < resize_start_row)
-		resize_end_row = resize_start_row;
-	
-	switch (direction) {
-	case E_CAL_VIEW_MOVE_UP:
-		if (resize_start_row <= 0)
-			return FALSE;
-		resize_start_row--;
-		resize_end_row--;
-		start_dt = e_day_view_convert_grid_position_to_time (day_view, day, resize_start_row);
-		end_dt = e_day_view_convert_grid_position_to_time (day_view, day, resize_end_row + 1);		
-		break;
-	case E_CAL_VIEW_MOVE_DOWN:
-		if (resize_end_row >= day_view->rows - 1)
-			return FALSE;
-		resize_start_row++;
-		resize_end_row++;
-		start_dt = e_day_view_convert_grid_position_to_time (day_view, day, resize_start_row);
-		end_dt = e_day_view_convert_grid_position_to_time (day_view, day, resize_end_row + 1);		
-		break;
-	case E_CAL_VIEW_MOVE_LEFT:
-		if (day <= 0) 
-			return TRUE;
-		start_dt = e_day_view_convert_grid_position_to_time (day_view, day, resize_start_row);
-		end_dt = e_day_view_convert_grid_position_to_time (day_view, day, resize_end_row + 1);
-		start_time = icaltime_from_timet (start_dt, 0);
-		end_time = icaltime_from_timet (end_dt, 0);
-		icaltime_adjust	(&start_time ,-1,0,0,0);
-		icaltime_adjust	(&end_time ,-1,0,0,0);	
-		start_dt = icaltime_as_timet (start_time);
-		end_dt = icaltime_as_timet (end_time);
-		break;
-	case E_CAL_VIEW_MOVE_RIGHT:
-		if (day + 1 >= day_view->days_shown)
-			return TRUE;
-		start_dt = e_day_view_convert_grid_position_to_time (day_view, day, resize_start_row);
-		end_dt = e_day_view_convert_grid_position_to_time (day_view, day, resize_end_row + 1);
-		start_time = icaltime_from_timet (start_dt, 0);
-		end_time = icaltime_from_timet (end_dt, 0);
-		icaltime_adjust	(&start_time ,1,0,0,0);
-		icaltime_adjust	(&end_time ,1,0,0,0);	
-		start_dt = icaltime_as_timet (start_time);
-		end_dt = icaltime_as_timet (end_time);
-		break;	
-	default:
-		return FALSE;
-	}
-	
-	e_day_view_change_event_time (day_view, start_dt, end_dt);
-	e_day_view_ensure_rows_visible (day_view, resize_start_row, resize_end_row);
-
-	return TRUE;
-}
-
-static void
-e_day_view_change_event_time (EDayView *day_view, time_t start_dt, time_t end_dt)
-{
-	EDayViewEvent *event;
-	gint day, event_num;
-	ECalComponent *comp;
-	ECalComponentDateTime date;
-	struct icaltimetype itt;
-	ECal *client;
-	CalObjModType mod = CALOBJ_MOD_ALL;
-	GtkWindow *toplevel;
-
-	day = day_view->editing_event_day;
-	event_num = day_view->editing_event_num;
-	event = &g_array_index (day_view->events[day], EDayViewEvent,
-				event_num);
-	client = event->comp_data->client;
-
-	/* 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 = e_cal_component_new ();
-	e_cal_component_set_icalcomponent (comp, icalcomponent_new_clone (event->comp_data->icalcomp));
-
-	date.value = &itt;
-	/* FIXME: Should probably keep the timezone of the original start
-	   and end times. */
-	date.tzid = icaltimezone_get_tzid (e_calendar_view_get_timezone (E_CALENDAR_VIEW (day_view)));
-	
-	*date.value = icaltime_from_timet_with_zone (start_dt, FALSE,
-						     e_calendar_view_get_timezone (E_CALENDAR_VIEW (day_view)));
-	e_cal_component_set_dtstart (comp, &date);
-	*date.value = icaltime_from_timet_with_zone (end_dt, FALSE,
-						     e_calendar_view_get_timezone (E_CALENDAR_VIEW (day_view)));
-	e_cal_component_set_dtend (comp, &date);
-
-	e_cal_component_commit_sequence (comp);
-	
-	if (day_view->last_edited_comp_string != NULL) {
-		g_free (day_view->last_edited_comp_string);
-		day_view->last_edited_comp_string = NULL;
-	}
-		
-	day_view->last_edited_comp_string = e_cal_component_get_as_string (comp);
-
-	gnome_canvas_item_hide (day_view->resize_rect_item);
-	gnome_canvas_item_hide (day_view->resize_bar_item);
-
-	day_view->resize_drag_pos = E_CALENDAR_VIEW_POS_NONE;
-
- 	if (e_cal_component_is_instance (comp)) {
- 		if (!recur_component_dialog (client, comp, &mod, NULL)) {
- 			gtk_widget_queue_draw (day_view->top_canvas);
-			goto out;
- 		}
-	}
-	
-	toplevel = GTK_WINDOW (gtk_widget_get_toplevel (GTK_WIDGET (day_view)));
-
-	e_cal_component_commit_sequence (comp);
-	e_calendar_view_modify_and_send (comp, client, mod, toplevel, TRUE);
-
-out:	
-	g_object_unref (comp);
-}
-
-static void 
-e_day_view_change_event_end_time_up (EDayView *day_view)
-{
-	EDayViewEvent *event;
-	gint day, event_num, resize_start_row, resize_end_row;
-
-	day = day_view->editing_event_day;
-	event_num = day_view->editing_event_num;
-	if ((day == -1) || (day == E_DAY_VIEW_LONG_EVENT))
-		return;
-	event = &g_array_index (day_view->events[day], EDayViewEvent,
-				event_num);
-	day_view->resize_event_day = day;
-	day_view->resize_event_num = event_num;
-	day_view->resize_bars_event_day = day;
-	day_view->resize_bars_event_num = event_num;
-	resize_start_row = event->start_minute / day_view->mins_per_row;
-	resize_end_row = (event->end_minute - 1) / day_view->mins_per_row;
-	if (resize_end_row < resize_start_row)
-		resize_end_row = resize_start_row;
-	if (resize_end_row == resize_start_row)
-		return;
-	day_view->resize_drag_pos = E_CALENDAR_VIEW_POS_BOTTOM_EDGE;
-	resize_end_row--;
-	day_view->resize_start_row = resize_start_row;
-	day_view->resize_end_row = resize_end_row;
-	e_day_view_finish_resize (day_view);
-	e_day_view_ensure_rows_visible (day_view, resize_start_row, resize_end_row);
-}
-
-
-static void 
-e_day_view_change_event_end_time_down (EDayView *day_view)
-{
-	EDayViewEvent *event;
-	gint day, event_num, resize_start_row, resize_end_row;
-	
-	day = day_view->editing_event_day;
-	event_num = day_view->editing_event_num;
-	if ((day == -1) || (day == E_DAY_VIEW_LONG_EVENT))
-		return;
-	event = &g_array_index (day_view->events[day], EDayViewEvent,
-				event_num);
-	day_view->resize_event_day = day;
-	day_view->resize_event_num = event_num;
-	day_view->resize_bars_event_day = day;
-	day_view->resize_bars_event_num = event_num;
-	resize_start_row = event->start_minute / day_view->mins_per_row;
-	resize_end_row = (event->end_minute - 1) / day_view->mins_per_row;
-	if (resize_end_row < resize_start_row)
-		resize_end_row = resize_start_row;
-	if (resize_end_row == day_view->rows -1)
-		return;
-	day_view->resize_drag_pos = E_CALENDAR_VIEW_POS_BOTTOM_EDGE;
-	resize_end_row++;
-	day_view->resize_start_row = resize_start_row;
-	day_view->resize_end_row = resize_end_row;
-	e_day_view_finish_resize (day_view);
-	e_day_view_ensure_rows_visible (day_view, resize_start_row, resize_end_row);
-}
-
-
-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);
-	}
-
-	g_signal_emit_by_name (day_view, "selection_changed");
-}
-
-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;
-	ECalComponentText summary;
-	ECalComponent *comp;
-	ECal *client;
-	gboolean on_server;
-	
-	/* 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;
-
-	g_object_set (event->canvas_item, "handle_popup", FALSE, NULL);
-	g_object_get (G_OBJECT (event->canvas_item),
-		      "text", &text,
-		      NULL);
-	g_assert (text != NULL);
-
-	comp = e_cal_component_new ();
-	e_cal_component_set_icalcomponent (comp, icalcomponent_new_clone (event->comp_data->icalcomp));
-
-	client = event->comp_data->client;
-	on_server = cal_comp_is_on_server (comp, client);
-	
-	if (string_is_empty (text) && !on_server) {
-		const char *uid;
-		
-		e_cal_component_get_uid (comp, &uid);
-		
-		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);
-		goto out;
-	}
-
-	/* Only update the summary if necessary. */
-	e_cal_component_get_summary (comp, &summary);
-	if (summary.value && !strcmp (text, summary.value)) {
-		if (day == E_DAY_VIEW_LONG_EVENT)
-			e_day_view_reshape_long_event (day_view, event_num);
-		else
-			e_day_view_update_event_label (day_view, day,
-						       event_num);
-	} else if (summary.value || !string_is_empty (text)) {
-		icalcomponent *icalcomp = e_cal_component_get_icalcomponent (comp);
-
-		summary.value = text;
-		summary.altrep = NULL;
-		e_cal_component_set_summary (comp, &summary);
-		e_cal_component_commit_sequence (comp);
-
-		if (!on_server) {
-			if (!e_cal_create_object (client, icalcomp, NULL, NULL))
-				g_message (G_STRLOC ": Could not create the object!");
-			else
-				g_signal_emit_by_name (day_view, "user_created");
-
-			/* we remove the object since we either got the update from the server or failed */
-			e_day_view_remove_event_cb (day_view, day, event_num, NULL);
-		} else {
-			CalObjModType mod = CALOBJ_MOD_ALL;
-			GtkWindow *toplevel;
-			if (e_cal_component_is_instance (comp)) {
-				if (!recur_component_dialog (client, comp, &mod, NULL)) {
-					goto out;
-				}
-			}
-			
-			/* FIXME When sending here, what exactly should we send? */
-			toplevel = GTK_WINDOW (gtk_widget_get_toplevel (GTK_WIDGET (day_view)));
-			e_calendar_view_modify_and_send (comp, client, mod, toplevel, FALSE);
-		}
-		
-	}
-
- out:
-
-	g_object_unref (comp);
-	g_free (text);
-
-	g_signal_emit_by_name (day_view, "selection_changed");
-}
-
-
-/* FIXME: It is possible that we may produce an invalid time due to daylight
-   saving times (i.e. when clocks go forward there is a range of time which
-   is not valid). I don't know the best way to handle daylight saving time. */
-static time_t
-e_day_view_convert_grid_position_to_time (EDayView *day_view,
-					  gint col,
-					  gint row)
-{
-	struct icaltimetype tt;
-	time_t val;
-	gint minutes;
-
-	/* Calulate the number of minutes since the start of the day. */
-	minutes = day_view->first_hour_shown * 60
-		+ day_view->first_minute_shown
-		+ row * day_view->mins_per_row;
-
-	/* A special case for midnight, where we can use the start of the
-	   next day. */
-	if (minutes == 60 * 24)
-		return day_view->day_starts[col + 1];
-
-	/* Create an icaltimetype and convert to a time_t. */
-	tt = icaltime_from_timet_with_zone (day_view->day_starts[col],
-					    FALSE, e_calendar_view_get_timezone (E_CALENDAR_VIEW (day_view)));
-	tt.hour = minutes / 60;
-	tt.minute = minutes % 60;
-	tt.second = 0;
-
-	val = icaltime_as_timet_with_zone (tt, e_calendar_view_get_timezone (E_CALENDAR_VIEW (day_view)));
-	return val;
-}
-
-
-static gboolean
-e_day_view_convert_time_to_grid_position (EDayView *day_view,
-					  time_t time,
-					  gint *col,
-					  gint *row)
-{
-	struct icaltimetype tt;
-	gint day, minutes;
-
-	*col = *row = 0;
-
-	if (time < day_view->lower || time >= day_view->upper)
-		return FALSE;
-
-	/* We can find the column easily using the day_starts array. */
-	for (day = 1; day <= day_view->days_shown; day++) {
-		if (time < day_view->day_starts[day]) {
-			*col = day - 1;
-			break;
-		}
-	}
-
-	/* To find the row we need to convert the time to an icaltimetype,
-	   calculate the offset in minutes from the top of the display and
-	   divide it by the mins per row setting. */
-	tt = icaltime_from_timet_with_zone (time, FALSE, e_calendar_view_get_timezone (E_CALENDAR_VIEW (day_view)));
-
-	minutes = tt.hour * 60 + tt.minute;
-	minutes -= day_view->first_hour_shown * 60 + day_view->first_minute_shown;
-
-	*row = minutes / day_view->mins_per_row;
-
-	if (*row < 0 || *row >= day_view->rows)
-		return FALSE;
-
-	return TRUE;
-}
-
-
-/* This starts or stops auto-scrolling when dragging a selection or resizing
-   an event. */
-void
-e_day_view_check_auto_scroll (EDayView *day_view,
-			      gint event_x,
-			      gint event_y)
-{
-	gint scroll_x, scroll_y;
-
-	gnome_canvas_get_scroll_offsets (GNOME_CANVAS (day_view->main_canvas),
-					 &scroll_x, &scroll_y);
-
-	event_x -= scroll_x;
-	event_y -= scroll_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;
-	ECalendarViewPosition 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. */
-
-		/* FIXME: Since GNOME 2.0 we can't do this, since the canvas
-		 * won't update when its's thawed. Is this a bug or should we
-		 * really be doing something else? Investigate. */
-#if 0
-		gtk_layout_freeze (GTK_LAYOUT (day_view->main_canvas));
-#endif
-
-		gnome_canvas_scroll_to (GNOME_CANVAS (day_view->main_canvas),
-					scroll_x, new_scroll_y);
-#if 0
-		gtk_layout_thaw (GTK_LAYOUT (day_view->main_canvas));
-#endif
-	}
-
-	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_CALENDAR_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_CALENDAR_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_rows (EDayView *day_view,
-			   gint day,
-			   gint event_num,
-			   gint *start_row_out,
-			   gint *end_row_out)
-{
-	gint start_row, end_row;
-	EDayViewEvent *event;
-
-	g_return_val_if_fail (day >= 0, FALSE);
-	g_return_val_if_fail (day < E_DAY_VIEW_LONG_EVENT, FALSE);
-	g_return_val_if_fail (event_num >= 0, FALSE);
-
-	event = &g_array_index (day_view->events[day], EDayViewEvent,
-				event_num);
-	start_row = event->start_minute / day_view->mins_per_row;
-	end_row = (event->end_minute - 1) / day_view->mins_per_row;
-	if (end_row < start_row)
-		end_row = start_row;
-
-	*start_row_out = start_row;
-	*end_row_out = end_row;
-	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;
-
-	e_day_view_get_event_rows(day_view, day, event_num, &start_row, &end_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_CALENDAR_VIEW_POS_NONE
-	    && day_view->resize_event_day == day
-	    && day_view->resize_event_num == event_num) {
-		if (day_view->resize_drag_pos == E_CALENDAR_VIEW_POS_TOP_EDGE)
-			start_row = day_view->resize_start_row;
-		else if (day_view->resize_drag_pos == E_CALENDAR_VIEW_POS_BOTTOM_EDGE)
-			end_row = day_view->resize_end_row;
-	}
-
-
-	*item_x = day_view->day_offsets[day]
-		+ day_view->day_widths[day] * start_col / cols_in_row;
-	*item_w = day_view->day_widths[day] * num_columns / cols_in_row
-		- E_DAY_VIEW_GAP_WIDTH;
-	*item_w = MAX (*item_w, 0);
-	*item_y = start_row * day_view->row_height;
-#if 0
-	*item_h = (end_row - start_row + 1) * day_view->row_height;
-#else
-	/* This makes the event end on the grid line of the next row,
-	   which maybe looks nicer if you have 2 events on consecutive rows. */
-	*item_h = (end_row - start_row + 1) * day_view->row_height + 1;
-#endif
-	return TRUE;
-}
-
-
-gboolean
-e_day_view_get_long_event_position	(EDayView	*day_view,
-					 gint		 event_num,
-					 gint		*start_day,
-					 gint		*end_day,
-					 gint		*item_x,
-					 gint		*item_y,
-					 gint		*item_w,
-					 gint		*item_h)
-{
-	EDayViewEvent *event;
-
-	event = &g_array_index (day_view->long_events, EDayViewEvent,
-				event_num);
-
-	/* If the event is flagged as not displayed, return FALSE. */
-	if (event->num_columns == 0)
-		return FALSE;
-
-	if (!e_day_view_find_long_event_days (event,
-					      day_view->days_shown,
-					      day_view->day_starts,
-					      start_day, end_day))
-		return FALSE;
-
-	/* If the event is being resize, use the resize position. */
-	if (day_view->resize_drag_pos != E_CALENDAR_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_CALENDAR_VIEW_POS_LEFT_EDGE)
-			*start_day = day_view->resize_start_row;
-		else if (day_view->resize_drag_pos == E_CALENDAR_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 ECalendarViewPosition
-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_CALENDAR_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_CALENDAR_VIEW_POS_OUTSIDE;
-
-	*day_return = day;
-
-	/* If only the grid position is wanted, return. */
-	if (event_num_return == NULL)
-		return E_CALENDAR_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_CALENDAR_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_CALENDAR_VIEW_POS_RIGHT_EDGE;
-
-		return E_CALENDAR_VIEW_POS_EVENT;
-	}
-
-	return E_CALENDAR_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 ECalendarViewPosition
-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;
-
-#if 0
-	g_print ("e_day_view_convert_position_in_main_canvas: (%d, %d)\n", x, y);
-#endif
-
-	*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_CALENDAR_VIEW_POS_OUTSIDE;
-
-	row = y / day_view->row_height;
-	if (row >= day_view->rows)
-		return E_CALENDAR_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_CALENDAR_VIEW_POS_OUTSIDE;
-
-	*day_return = day;
-	*row_return = row;
-
-	/* If only the grid position is wanted, return. */
-	if (event_num_return == NULL)
-		return E_CALENDAR_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_CALENDAR_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_CALENDAR_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_CALENDAR_VIEW_POS_LEFT_EDGE;
-
-		if (y < item_y + E_DAY_VIEW_EVENT_BORDER_HEIGHT
-		    + E_DAY_VIEW_EVENT_Y_PAD)
-			return E_CALENDAR_VIEW_POS_TOP_EDGE;
-
-		if (y >= item_y + item_h - E_DAY_VIEW_EVENT_BORDER_HEIGHT
-		    - E_DAY_VIEW_EVENT_Y_PAD)
-			return E_CALENDAR_VIEW_POS_BOTTOM_EDGE;
-
-		return E_CALENDAR_VIEW_POS_EVENT;
-	}
-
-	return E_CALENDAR_VIEW_POS_NONE;
-}
-
-
-static gboolean
-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)
-{
-	ECalendarViewPosition 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_CALENDAR_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;
-	gchar *text;
-
-	/* Calculate the event's position. If the event is in the same
-	   position we started in, we use the same columns. */
-	row = day_view->rows_in_top_display + 1;
-	num_days = 1;
-
-	if (day_view->drag_event_day == E_DAY_VIEW_LONG_EVENT) {
-		event = &g_array_index (day_view->long_events, EDayViewEvent,
-					day_view->drag_event_num);
-		row = event->start_row_or_col + 1;
-
-		if (!e_day_view_find_long_event_days (event,
-						      day_view->days_shown,
-						      day_view->day_starts,
-						      &start_day, &end_day))
-			return;
-
-		num_days = end_day - start_day + 1;
-
-		/* Make sure we don't go off the screen. */
-		day = MIN (day, day_view->days_shown - num_days);
-
-	} else if (day_view->drag_event_day != -1) {
-		event = &g_array_index (day_view->events[day_view->drag_event_day],
-					EDayViewEvent,
-					day_view->drag_event_num);
-	}
-
-	/* If the position hasn't changed, just return. */
-	if (day_view->drag_last_day == day
-	    && (day_view->drag_long_event_item->object.flags
-		& GNOME_CANVAS_ITEM_VISIBLE))
-		return;
-
-	day_view->drag_last_day = day;
-
-
-	item_x = day_view->day_offsets[day] + E_DAY_VIEW_BAR_WIDTH;
-	item_w = day_view->day_offsets[day + num_days] - item_x
-		- E_DAY_VIEW_GAP_WIDTH;
-	item_y = row * day_view->top_row_height;
-	item_h = day_view->top_row_height - E_DAY_VIEW_TOP_CANVAS_Y_GAP;
-
-
-	/* Set the positions of the event & associated items. */
-	gnome_canvas_item_set (day_view->drag_long_event_rect_item,
-			       "x1", item_x,
-			       "y1", item_y,
-			       "x2", item_x + item_w - 1,
-			       "y2", item_y + item_h - 1,
-			       NULL);
-
-	gnome_canvas_item_set (day_view->drag_long_event_item,
-			       "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)) {
-		const gchar *summary;
-
-		if (event) {
-			summary = icalcomponent_get_summary (event->comp_data->icalcomp);
-			text = g_strdup (summary);
-		} 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 gboolean
-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, day_view->drag_event_x, day_view->drag_event_y);
-
-	return TRUE;
-}
-
-
-static void
-e_day_view_reshape_main_canvas_drag_item (EDayView *day_view)
-{
-	ECalendarViewPosition 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_CALENDAR_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;
-	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;
-		if (end_row < start_row)
-			end_row = start_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);
-
-	gnome_canvas_item_set (day_view->drag_item,
-			       "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)) {
-		const gchar *summary;
-
-		if (event) {
-			summary = icalcomponent_get_summary (event->comp_data->icalcomp);
-			text = g_strdup (summary);
-		} 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;
-
-	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);
-
-	if (info == TARGET_CALENDAR_EVENT || info == TARGET_VCALENDAR) {
-		/* we will pass an icalcalendar component for both types */
-		char *comp_str;
-		icalcomponent *vcal;
-
-		vcal = e_cal_util_new_top_level ();
-		e_cal_util_add_timezones_from_component (vcal, event->comp_data->icalcomp);
-		icalcomponent_add_component (
-			vcal,
-			icalcomponent_new_clone (event->comp_data->icalcomp));
-
-		comp_str = icalcomponent_as_ical_string (vcal);
-		if (comp_str) {
-			gtk_selection_data_set (selection_data, selection_data->target,
-						8, comp_str, strlen (comp_str));
-		}
-
-		icalcomponent_free (vcal);
-	}
-}
-
-
-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;
-	ECalendarViewPosition pos;
-	gint day, start_day, end_day, num_days;
-	gint start_offset, end_offset;
-	ECalComponent *comp;
-	ECalComponentDateTime date;
-	struct icaltimetype itt;
-	time_t dt;
-	gboolean all_day_event;
-	ECal *client;
-	gboolean drag_from_same_window;
-
-	if (day_view->drag_event_day != -1)
-		drag_from_same_window = TRUE;
-	else
-		drag_from_same_window = FALSE;
-
-	client = e_cal_model_get_default_client (e_calendar_view_get_model (E_CALENDAR_VIEW (day_view)));
-
-	/* Note that we only support DnD within the EDayView at present. */
-	if ((data->length >= 0) && (data->format == 8)
-	    && (day_view->drag_event_day != -1)) {
-		/* We are dragging in the same window */
-
-		pos = e_day_view_convert_position_in_top_canvas (day_view,
-								 x, y, &day,
-								 NULL);
-		if (pos != E_CALENDAR_VIEW_POS_OUTSIDE) {
-			CalObjModType mod = CALOBJ_MOD_ALL;
-			GtkWindow *toplevel;
-
-			num_days = 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);
-				day -= day_view->drag_event_offset;
-				day = MAX (day, 0);
-
-				e_day_view_find_long_event_days (event,
-								 day_view->days_shown,
-								 day_view->day_starts,
-								 &start_day,
-								 &end_day);
-				num_days = end_day - start_day + 1;
-				/* Make sure we don't go off the screen. */
-				day = MIN (day, day_view->days_shown - num_days);
-
-				start_offset = event->start_minute;
-				end_offset = event->end_minute;
-			} else {
-				event = &g_array_index (day_view->events[day_view->drag_event_day],
-							EDayViewEvent,
-							day_view->drag_event_num);
-			}
-
-			client = event->comp_data->client;
-
-			/* We clone the event 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 = e_cal_component_new ();
-			e_cal_component_set_icalcomponent (comp, icalcomponent_new_clone (event->comp_data->icalcomp));
-
-			if (start_offset == 0 && end_offset == 0)
-				all_day_event = TRUE;
-			else
-				all_day_event = FALSE;
-
-			date.value = &itt;
-
-			dt = day_view->day_starts[day] + start_offset * 60;
-			itt = icaltime_from_timet_with_zone (dt, FALSE,
-							     e_calendar_view_get_timezone (E_CALENDAR_VIEW (day_view)));
-			if (all_day_event) {
-				itt.is_date = TRUE;
-				date.tzid = NULL;
-			} else {
-				/* FIXME: Should probably keep the timezone of
-				   the original start and end times. */
-				date.tzid = icaltimezone_get_tzid (e_calendar_view_get_timezone (E_CALENDAR_VIEW (day_view)));
-			}
-			e_cal_component_set_dtstart (comp, &date);
-
-			if (end_offset == 0)
-				dt = day_view->day_starts[day + num_days];
-			else
-				dt = day_view->day_starts[day + num_days - 1] + end_offset * 60;
-			itt = icaltime_from_timet_with_zone (dt, FALSE,
-							     e_calendar_view_get_timezone (E_CALENDAR_VIEW (day_view)));
-			if (all_day_event) {
-				itt.is_date = TRUE;
-				date.tzid = NULL;
-			} else {
-				/* FIXME: Should probably keep the timezone of
-				   the original start and end times. */
-				date.tzid = icaltimezone_get_tzid (e_calendar_view_get_timezone (E_CALENDAR_VIEW (day_view)));
-			}
-			e_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 (e_cal_component_is_instance (comp)) {
-				if (!recur_component_dialog (client, comp, &mod, NULL))
-					return;
-			}
-
-			toplevel = GTK_WINDOW (gtk_widget_get_toplevel (GTK_WIDGET (day_view)));
-			e_cal_component_commit_sequence (comp);
-	
-			e_calendar_view_modify_and_send (comp, client, mod, toplevel, FALSE);
-			
-			g_object_unref (comp);
-
-			return;
-		}
-	}
-
-	if ((data->length >= 0) && (data->format == 8) 
-		&& !drag_from_same_window) {
-		/* We are dragging between different window */
-
-		char *comp_str;
-		icalcomponent *icalcomp;
-		icalcomponent_kind kind;
-		time_t dtstart;
-		icaltimezone *default_zone;
-
-		pos = e_day_view_convert_position_in_top_canvas (day_view,
-								 x, y, &day,
-								 NULL);
-		if (pos == E_CALENDAR_VIEW_POS_OUTSIDE) 
-			goto error;
-
-		comp_str = (char *) data->data;
-		icalcomp = icalparser_parse_string ((const char *) comp_str);
-		if (!icalcomp)
-			goto error;
-
-		default_zone = calendar_config_get_icaltimezone ();
-
-		/* check the type of the component */
-		kind = icalcomponent_isa (icalcomp);
-		if (kind != ICAL_VCALENDAR_COMPONENT && kind != ICAL_VEVENT_COMPONENT)
-			goto error;
-
-		dtstart = day_view->day_starts[day];
-
-		if (kind == ICAL_VCALENDAR_COMPONENT) {
-			icalcomponent_kind child_kind;
-			icalcomponent *subcomp;
-
-			subcomp = icalcomponent_get_first_component (icalcomp, ICAL_ANY_COMPONENT);
-			while (subcomp) {
-				child_kind = icalcomponent_isa (subcomp);
-				if (child_kind == ICAL_VEVENT_COMPONENT)
-					e_calendar_view_add_event (E_CALENDAR_VIEW (day_view), client, dtstart, 
-								      default_zone, subcomp, TRUE);
-				else if (child_kind == ICAL_VTIMEZONE_COMPONENT) {
-					icaltimezone *zone;
-
-					zone = icaltimezone_new ();
-					icaltimezone_set_component (zone, subcomp);
-					e_cal_add_timezone (client, zone, NULL);
-				
-					icaltimezone_free (zone, 1);
-				}
-			
-				subcomp = icalcomponent_get_next_component (
-					icalcomp, ICAL_ANY_COMPONENT);
-			}
-
-			icalcomponent_free (icalcomp);
-
-		} else {
-			e_calendar_view_add_event (E_CALENDAR_VIEW (day_view), client, dtstart, default_zone, icalcomp, TRUE);
-		}
-	
-		gtk_drag_finish (context, TRUE, TRUE, time);
-		return;
-	}
-
-error:
-	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;
-	ECalendarViewPosition pos;
-	gint day, row, start_row, end_row, num_rows, scroll_x, scroll_y;
-	gint start_offset, end_offset;
-	ECalComponent *comp;
-	ECalComponentDateTime date;
-	struct icaltimetype itt;
-	time_t dt;
-	ECal *client;
-	gboolean drag_from_same_window;
-
-	if (day_view->drag_event_day != -1)
-		drag_from_same_window = TRUE;
-	else 
-		drag_from_same_window = FALSE;
-
-	client = e_cal_model_get_default_client (e_calendar_view_get_model (E_CALENDAR_VIEW (day_view)));
-
-	gnome_canvas_get_scroll_offsets (GNOME_CANVAS (widget),
-					 &scroll_x, &scroll_y);
-	x += scroll_x;
-	y += scroll_y;
-
-	/* Note that we only support DnD within the EDayView at present. */
-	if ((data->length >= 0) && (data->format == 8)
-	    && (day_view->drag_event_day != -1)) {
-		/* We are dragging in the same window */
-
-		pos = e_day_view_convert_position_in_main_canvas (day_view,
-								  x, y, &day,
-								  &row, NULL);
-		if (pos != E_CALENDAR_VIEW_POS_OUTSIDE) {
-			CalObjModType mod = CALOBJ_MOD_ALL;
-			GtkWindow *toplevel;
-
-			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 {
-				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;
-				if (end_row < start_row)
-					end_row = start_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;
-			}
-
-			client = event->comp_data->client;
-
-			/* 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 = e_cal_component_new ();
-			e_cal_component_set_icalcomponent (comp, icalcomponent_new_clone (event->comp_data->icalcomp));
-
-			date.value = &itt;
-			date.tzid = icaltimezone_get_tzid (e_calendar_view_get_timezone (E_CALENDAR_VIEW (day_view)));
-
-			dt = e_day_view_convert_grid_position_to_time (day_view, day, row) + start_offset * 60;
-			*date.value = icaltime_from_timet_with_zone (dt, FALSE,
-								     e_calendar_view_get_timezone (E_CALENDAR_VIEW (day_view)));
-			e_cal_component_set_dtstart (comp, &date);
-			dt = e_day_view_convert_grid_position_to_time (day_view, day, row + num_rows) - end_offset * 60;
-			*date.value = icaltime_from_timet_with_zone (dt, FALSE,
-								     e_calendar_view_get_timezone (E_CALENDAR_VIEW (day_view)));
-			e_cal_component_set_dtend (comp, &date);
-			e_cal_component_abort_sequence (comp);
-
-			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 (e_cal_component_is_instance (comp)) {
-				if (!recur_component_dialog (client, comp, &mod, NULL)) {
-					g_object_unref (comp);
-					return;
-				}
-			}
-
-			toplevel = GTK_WINDOW (gtk_widget_get_toplevel (GTK_WIDGET (day_view)));
-			e_cal_component_commit_sequence (comp);
-	
-			e_calendar_view_modify_and_send (comp, client, mod, toplevel, FALSE);
-
-			g_object_unref (comp);
-
-			return;
-		}
-	}
-
-	if ((data->length >= 0) && (data->format == 8) 
-		&& !drag_from_same_window) {
-		/* We are dragging between different window */
-
-		char *comp_str;
-		icalcomponent *icalcomp;
-		icalcomponent_kind kind;
-		time_t dtstart;
-		icaltimezone *default_zone;
-
-		pos = e_day_view_convert_position_in_main_canvas (day_view,
-								  x, y, &day,
-								  &row, NULL);
-		if (pos == E_CALENDAR_VIEW_POS_OUTSIDE) 
-			goto error;
-
-		comp_str = (char *) data->data;
-		icalcomp = icalparser_parse_string ((const char *) comp_str);
-		if (!icalcomp)
-			goto error;
-
-		default_zone = calendar_config_get_icaltimezone ();
-
-		/* check the type of the component */
-		kind = icalcomponent_isa (icalcomp);
-		if (kind != ICAL_VCALENDAR_COMPONENT && kind != ICAL_VEVENT_COMPONENT)
-			goto error;
-
-		dtstart = e_day_view_convert_grid_position_to_time (day_view, day, row);
-
-		if (kind == ICAL_VCALENDAR_COMPONENT) {
-			icalcomponent_kind child_kind;
-			icalcomponent *subcomp;
-
-			subcomp = icalcomponent_get_first_component (icalcomp, ICAL_ANY_COMPONENT);
-			while (subcomp) {
-				child_kind = icalcomponent_isa (subcomp);
-				if (child_kind == ICAL_VEVENT_COMPONENT)
-					e_calendar_view_add_event (E_CALENDAR_VIEW (day_view), client, dtstart, 
-								      default_zone, subcomp, FALSE);
-				else if (child_kind == ICAL_VTIMEZONE_COMPONENT) {
-					icaltimezone *zone;
-
-					zone = icaltimezone_new ();
-					icaltimezone_set_component (zone, subcomp);
-					e_cal_add_timezone (client, zone, NULL);
-				
-					icaltimezone_free (zone, 1);
-				}
-			
-				subcomp = icalcomponent_get_next_component (
-					icalcomp, ICAL_ANY_COMPONENT);
-			}
-
-			icalcomponent_free (icalcomp);
-
-		} else {
-			e_calendar_view_add_event (E_CALENDAR_VIEW (day_view), client, dtstart, default_zone, icalcomp, FALSE);
-		}
-
-		gtk_drag_finish (context, TRUE, TRUE, time);
-		return;
-	}
-
-error:
-	gtk_drag_finish (context, FALSE, FALSE, time);
-}
-
-
-/* Converts an hour from 0-23 to the preferred time format, and returns the
-   suffix to add and the width of it in the normal font. */
-void
-e_day_view_convert_time_to_display	(EDayView	*day_view,
-					 gint		 hour,
-					 gint		*display_hour,
-					 gchar	       **suffix,
-					 gint		*suffix_width)
-{
-	/* Calculate the actual hour number to display. For 12-hour
-	   format we convert 0-23 to 12-11am/12-11pm. */
-	*display_hour = hour;
-	if (e_calendar_view_get_use_24_hour_format (E_CALENDAR_VIEW (day_view))) {
-		*suffix = "";
-		*suffix_width = 0;
-	} else {
-		if (hour < 12) {
-			*suffix = day_view->am_string;
-			*suffix_width = day_view->am_string_width;
-		} else {
-			*display_hour -= 12;
-			*suffix = day_view->pm_string;
-			*suffix_width = day_view->pm_string_width;
-		}
-
-		/* 12-hour uses 12:00 rather than 0:00. */
-		if (*display_hour == 0)
-			*display_hour = 12;
-	}
-}
-
-
-gint
-e_day_view_get_time_string_width	(EDayView	*day_view)
-{
-	gint time_width;
-
-	time_width = day_view->digit_width * 4 + day_view->colon_width;
-
-	if (!e_calendar_view_get_use_24_hour_format (E_CALENDAR_VIEW (day_view)))
-		time_width += MAX (day_view->am_string_width,
-				   day_view->pm_string_width);
-
-	return time_width;
-}
-
-/* Queues a layout, unless one is already queued. */
-static void
-e_day_view_queue_layout (EDayView *day_view)
-{
-	if (day_view->layout_timeout_id == 0) {
-		day_view->layout_timeout_id = g_timeout_add (E_DAY_VIEW_LAYOUT_TIMEOUT, e_day_view_layout_timeout_cb, day_view);
-	}
-}
-
-
-/* Removes any queued layout. */
-static void
-e_day_view_cancel_layout (EDayView *day_view)
-{
-	if (day_view->layout_timeout_id != 0) {
-		gtk_timeout_remove (day_view->layout_timeout_id);
-		day_view->layout_timeout_id = 0;
-	}
-}
-
-
-static gboolean
-e_day_view_layout_timeout_cb (gpointer data)
-{
-	EDayView *day_view = E_DAY_VIEW (data);
-
-	gtk_widget_queue_draw (day_view->top_canvas);
-	gtk_widget_queue_draw (day_view->main_canvas);
-	e_day_view_check_layout (day_view);
-
-	day_view->layout_timeout_id = 0;
-	return FALSE;
-}
-
-
-/* Returns the number of selected events (0 or 1 at present). */
-gint
-e_day_view_get_num_events_selected (EDayView *day_view)
-{
-	g_return_val_if_fail (E_IS_DAY_VIEW (day_view), 0);
-
-	return (day_view->editing_event_day != -1) ? 1 : 0;
-}
-
-
diff --git a/calendar/gui/e-day-view.h b/calendar/gui/e-day-view.h
deleted file mode 100644
index 4c563e4dbd..0000000000
--- a/calendar/gui/e-day-view.h
+++ /dev/null
@@ -1,578 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-
-/* 
- * Author : 
- *  Damon Chaplin <damon@ximian.com>
- *
- * Copyright 1999, Ximian, Inc.
- * Copyright 1999, Ximian, Inc.
- *
- * This program is free software; you can redistribute it and/or 
- * modify it under the terms of version 2 of the GNU General Public 
- * License as published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public 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 <gtk/gtktooltips.h>
-#include <libgnomecanvas/gnome-canvas.h>
-
-#include "e-calendar-view.h"
-#include "gnome-cal.h"
-
-G_BEGIN_DECLS
-
-/*
- * 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		1
-#define E_DAY_VIEW_ICON_Y_PAD		1
-
-/* The space between the icons and the long event text. */
-#define E_DAY_VIEW_LONG_EVENT_ICON_R_PAD	1
-
-/* The size of the border around the event. */
-#define E_DAY_VIEW_EVENT_BORDER_WIDTH	1
-#define E_DAY_VIEW_EVENT_BORDER_HEIGHT	1
-
-/* The padding on each side of the event text. */
-#define E_DAY_VIEW_EVENT_X_PAD		2
-#define E_DAY_VIEW_EVENT_Y_PAD		1
-
-/* The padding on each side of the event text for events in the top canvas. */
-#define E_DAY_VIEW_LONG_EVENT_X_PAD	2
-#define E_DAY_VIEW_LONG_EVENT_Y_PAD	2
-
-/* The size of the border around the long events in the top canvas. */
-#define E_DAY_VIEW_LONG_EVENT_BORDER_WIDTH	1
-#define E_DAY_VIEW_LONG_EVENT_BORDER_HEIGHT	1
-
-/* The space between the time and the icon/text in the top canvas. */
-#define E_DAY_VIEW_LONG_EVENT_TIME_X_PAD	2
-
-/* The gap between rows in the top canvas. */
-#define E_DAY_VIEW_TOP_CANVAS_Y_GAP	2
-
-
-/* These are used to get/set the working days in the week. The bit-flags are
-   combined together. The bits must be from 0 (Sun) to 6 (Sat) to match the
-   day values used by localtime etc. */
-typedef enum
-{
-	E_DAY_VIEW_SUNDAY	= 1 << 0,
-	E_DAY_VIEW_MONDAY	= 1 << 1,
-	E_DAY_VIEW_TUESDAY	= 1 << 2,
-	E_DAY_VIEW_WEDNESDAY	= 1 << 3,
-	E_DAY_VIEW_THURSDAY	= 1 << 4,
-	E_DAY_VIEW_FRIDAY	= 1 << 5,
-	E_DAY_VIEW_SATURDAY	= 1 << 6
-} EDayViewDays;
-
-
-/* These are used to specify the type of an appointment. They match those
-   used in EMeetingTimeSelector. */
-typedef enum
-{
-	E_DAY_VIEW_BUSY_TENTATIVE	= 0,
-	E_DAY_VIEW_BUSY_OUT_OF_OFFICE	= 1,
-	E_DAY_VIEW_BUSY_BUSY		= 2,
-
-	E_DAY_VIEW_BUSY_LAST		= 3
-} EDayViewBusyType;
-
-/* This is used to specify the format used when displaying the dates.
-   The full format is like 'Thursday 12 September'. The abbreviated format is
-   like 'Thu 12 Sep'. The no weekday format is like '12 Sep'. The short format
-   is like '12'. The actual format used is determined in
-   e_day_view_recalc_cell_sizes(), once we know the font being used. */
-typedef enum
-{
-	E_DAY_VIEW_DATE_FULL,
-	E_DAY_VIEW_DATE_ABBREVIATED,
-	E_DAY_VIEW_DATE_NO_WEEKDAY,
-	E_DAY_VIEW_DATE_SHORT
-} EDayViewDateFormat;
-
-/* These index our colors array. */
-typedef enum
-{
-	E_DAY_VIEW_COLOR_BG_WORKING,
-	E_DAY_VIEW_COLOR_BG_NOT_WORKING,
-	E_DAY_VIEW_COLOR_BG_SELECTED,
-	E_DAY_VIEW_COLOR_BG_SELECTED_UNFOCUSSED,
-	E_DAY_VIEW_COLOR_BG_GRID,
-
-	E_DAY_VIEW_COLOR_BG_TOP_CANVAS,
-	E_DAY_VIEW_COLOR_BG_TOP_CANVAS_SELECTED,
-	E_DAY_VIEW_COLOR_BG_TOP_CANVAS_GRID,
-
-	E_DAY_VIEW_COLOR_EVENT_VBAR,
-	E_DAY_VIEW_COLOR_EVENT_BACKGROUND,
-	E_DAY_VIEW_COLOR_EVENT_BORDER,
-
-	E_DAY_VIEW_COLOR_LONG_EVENT_BACKGROUND,
-	E_DAY_VIEW_COLOR_LONG_EVENT_BORDER,
-
-	E_DAY_VIEW_COLOR_LAST
-} EDayViewColors;
-
-/* These specify which part of the selection we are dragging, if any. */
-typedef enum
-{
-	E_DAY_VIEW_DRAG_START,
-	E_DAY_VIEW_DRAG_END
-} EDayViewDragPosition;
-
-typedef struct _EDayViewEvent EDayViewEvent;
-struct _EDayViewEvent {
-	E_CALENDAR_VIEW_EVENT_FIELDS
-
-	/* For events in the main canvas, this contains the start column.
-	   For long events in the top canvas, this is its row. */
-	guint8 start_row_or_col;
-
-	/* For events in the main canvas, this is the number of columns that
-	   it covers. For long events this is set to 1 if the event is shown.
-	   For both types of events this is set to 0 if the event is not shown,
-	   i.e. it couldn't fit into the display. Currently long events are
-	   always shown as we just increase the height of the top canvas. */
-	guint8 num_columns;
-};
-
-
-#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
-{
-	ECalendarView cal_view;
-
-	/* 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;
-
-	/* S-expression for query and the query object */
-	ECalView *query;
-
-	/* The start and end of the days shown. */
-	time_t lower;
-	time_t upper;
-
-	/* Whether we are showing the work-week view. */
-	gboolean work_week_view;
-
-	/* The number of days we are showing. Usually 1 or 5, but can be up
-	   to E_DAY_VIEW_MAX_DAYS, e.g. when the user selects a range of
-	   days in the date navigator. */
-	gint days_shown;
-
-	/* The start of each day & an extra element to hold the last time. */
-	time_t day_starts[E_DAY_VIEW_MAX_DAYS + 1];
-
-	/* 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 the timeout function for doing a new layout. */
-	gint layout_timeout_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 show event end times in the main canvas. */
-	gboolean show_event_end_times;
-
-	/* The first day of the week, 0 (Monday) to 6 (Sunday). */
-	gint week_start_day;
-
-	/* This is set to TRUE when the widget is created, so it scrolls to
-	   the start of the working day when first shown. */
-	gboolean scroll_to_work_day;
-
-	/* This is the width & offset of each of the day columns in the
-	   display. */
-	gint day_widths[E_DAY_VIEW_MAX_DAYS];
-	gint day_offsets[E_DAY_VIEW_MAX_DAYS + 1];
-
-	/* An array holding the number of columns in each row, in each day.
-	   Note that there are a maximum of 12 * 24 rows (when a row is 5 mins)
-	   but we don't always have that many rows. */
-	guint8 cols_per_row[E_DAY_VIEW_MAX_DAYS][12 * 24];
-
-	/* Sizes of the various time strings. */
-	gint small_hour_widths[24];
-	gint max_small_hour_width;
-	gint max_minute_width;
-	gint colon_width;
-	gint digit_width;	/* Size of '0' character. */
-
-	/* This specifies how we are displaying the dates at the top. */
-	EDayViewDateFormat date_format;
-
-	/* These are the longest month & weekday names in the current font.
-	   Months are 0 to 11. Weekdays are 0 (Sun) to 6 (Sat). */
-	gint longest_month_name;
-	gint longest_abbreviated_month_name;
-	gint longest_weekday_name;
-	gint longest_abbreviated_weekday_name;
-
-	/* The large font used to display the hours. I don't think we need a
-	   fontset since we only display numbers. */
-	PangoFontDescription *large_font_desc;
-
-	/* The GC used for painting in different colors. */
-	GdkGC *main_gc;
-
-	/* The icons. */
-	GdkPixbuf *reminder_icon;
-	GdkPixbuf *recurrence_icon;
-	GdkPixbuf *timezone_icon;
-	GdkPixbuf *meeting_icon;
-	GdkPixbuf *attach_icon;
-
-	/* 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;
-	ECalendarViewPosition resize_drag_pos;
-	gint resize_start_row;
-	gint resize_end_row;
-
-	/* This is used to remember the last edited event. */
-	gchar *last_edited_comp_string;
-
-	/* This is the event the mouse button was pressed on. If the button
-	   is released we start editing it, but if the mouse is dragged we set
-	   this to -1. */
-	gint pressed_event_day;
-	gint pressed_event_num;
-
-	/* These are used when dragging events. If drag_event_day is not -1 we
-	   know that we are dragging one of the EDayView events around. */
-	gint drag_event_day;
-	gint drag_event_num;
-
-	/* The last mouse position when dragging, in the entire canvas. */
-	gint drag_event_x;
-	gint drag_event_y;
-
-	/* The offset of the mouse from the top of the event, in rows.
-	   In the top canvas this is the offset from the left, in days. */
-	gint drag_event_offset;
-
-	/* The last day & row dragged to, so we know when we need to update
-	   the dragged event's position. */
-	gint drag_last_day;
-	gint drag_last_row;
-
-	/* This is a GnomeCanvasRect which is placed around an item while it
-	   is being resized, so we can raise it above all other EText items. */
-	GnomeCanvasItem *drag_long_event_rect_item;
-	GnomeCanvasItem *drag_long_event_item;
-	GnomeCanvasItem *drag_rect_item;
-	GnomeCanvasItem *drag_bar_item;
-	GnomeCanvasItem *drag_item;
-
-	/* "am" and "pm" in the current locale, and their widths. */
-	gchar *am_string;
-	gchar *pm_string;
-	gint am_string_width;
-	gint pm_string_width;
-};
-
-struct _EDayViewClass
-{
-	ECalendarViewClass parent_class;
-};
-
-
-GtkType	   e_day_view_get_type			(void);
-GtkWidget* e_day_view_new			(void);
-
-/* 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 display event end times in the main canvas. */
-gboolean   e_day_view_get_show_event_end_times	(EDayView	*day_view);
-void	   e_day_view_set_show_event_end_times	(EDayView	*day_view,
-						 gboolean	 show);
-
-/* The first day of the week, 0 (Monday) to 6 (Sunday). */
-gint	   e_day_view_get_week_start_day	(EDayView	*day_view);
-void	   e_day_view_set_week_start_day	(EDayView	*day_view,
-						 gint		 week_start_day);
-
-void       e_day_view_delete_occurrence         (EDayView       *day_view);
-
-/* Returns the number of selected events (0 or 1 at present). */
-gint	   e_day_view_get_num_events_selected	(EDayView	*day_view);
-
-/*
- * Internal functions called by the associated canvas items.
- */
-void	   e_day_view_check_layout		(EDayView	*day_view);
-gint	   e_day_view_convert_time_to_row	(EDayView	*day_view,
-						 gint		 hour,
-						 gint		 minute);
-gint	   e_day_view_convert_time_to_position	(EDayView	*day_view,
-						 gint		 hour,
-						 gint		 minute);
-gboolean   e_day_view_get_event_rows            (EDayView *day_view,
-						 gint day,
-						 gint event_num,
-						 gint *start_row_out,
-						 gint *end_row_out);
-gboolean   e_day_view_get_event_position	(EDayView	*day_view,
-						 gint		 day,
-						 gint		 event_num,
-						 gint		*item_x,
-						 gint		*item_y,
-						 gint		*item_w,
-						 gint		*item_h);
-gboolean   e_day_view_get_long_event_position	(EDayView	*day_view,
-						 gint		 event_num,
-						 gint		*start_day,
-						 gint		*end_day,
-						 gint		*item_x,
-						 gint		*item_y,
-						 gint		*item_w,
-						 gint		*item_h);
-
-void	   e_day_view_start_selection		(EDayView	*day_view,
-						 gint		 day,
-						 gint		 row);
-void	   e_day_view_update_selection		(EDayView	*day_view,
-						 gint		 day,
-						 gint		 row);
-void	   e_day_view_finish_selection		(EDayView	*day_view);
-
-void	   e_day_view_check_auto_scroll		(EDayView	*day_view,
-						 gint		 event_x,
-						 gint		 event_y);
-void	   e_day_view_stop_auto_scroll		(EDayView	*day_view);
-
-void	   e_day_view_convert_time_to_display	(EDayView	*day_view,
-						 gint		 hour,
-						 gint		*display_hour,
-						 gchar	       **suffix,
-						 gint		*suffix_width);
-gint	   e_day_view_get_time_string_width	(EDayView	*day_view);
-
-
-gint	   e_day_view_event_sort_func		(const void	*arg1,
-						 const void	*arg2);
-
-gboolean e_day_view_find_event_from_item (EDayView *day_view,
- 					  GnomeCanvasItem *item,
- 					  gint *day_return,
- 					  gint *event_num_return);
-void e_day_view_update_calendar_selection_time (EDayView *day_view);
-void e_day_view_ensure_rows_visible (EDayView *day_view,
-				     gint start_row,
-				     gint end_row);
-
-
-G_END_DECLS
-
-#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 77116834a1..0000000000
--- a/calendar/gui/e-itip-control.c
+++ /dev/null
@@ -1,2517 +0,0 @@
-/* -*- Mode: C; indent-tabs-mode: t; c-basic-offset: 8; tab-width: 8 -*- */
-/* e-itip-control.c
- *
- * Copyright (C) 2001  Ximian, Inc.
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of version 2 of the GNU General Public
- * License as published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * General Public License for more details.
- *
- * You should have received a copy of the GNU General Public
- * License along with this program; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
- *
- * Author: JP Rosevear
- */
-
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
-
-#include <errno.h>
-#include <sys/types.h>
-#include <sys/stat.h>
-#include <fcntl.h>
-#include <unistd.h>
-#include <glib.h>
-#include <gtk/gtkmisc.h>
-#include <libgnome/gnome-i18n.h>
-#include <libgnome/gnome-util.h>
-#include <libgnomeui/gnome-stock-icons.h>
-#include <libgnomeui/gnome-uidefs.h>
-#include <libgnomeui/gnome-dialog.h>
-#include <libgnomeui/gnome-dialog-util.h>
-#include <bonobo/bonobo-object.h>
-#include <bonobo/bonobo-exception.h>
-#include <gtkhtml/gtkhtml.h>
-#include <gtkhtml/gtkhtml-embedded.h>
-#include <gtkhtml/gtkhtml-stream.h>
-#include <libedataserver/e-source-list.h>
-#include <libedataserverui/e-source-option-menu.h>
-#include <libical/ical.h>
-#include <libecal/e-cal-component.h>
-#include <libecal/e-cal-time-util.h>
-#include <libecal/e-cal.h>
-#include <e-util/e-time-utils.h>
-#include <e-util/e-dialog-widgets.h>
-#include <e-util/e-html-utils.h>
-#include "dialogs/delete-error.h"
-#include "calendar-config.h"
-#include "itip-utils.h"
-#include "e-itip-control.h"
-#include "common/authentication.h"
-#include <e-util/e-icon-factory.h>
-
-struct _EItipControlPrivate {
-	GtkWidget *html;
-
-	ESourceList *source_lists[E_CAL_SOURCE_TYPE_LAST];
-	GHashTable *ecals[E_CAL_SOURCE_TYPE_LAST];	
-
-	ECal *current_ecal;
-	ECalSourceType type;
-
-	char action;
-	gboolean rsvp;
-
-	GtkWidget *ok;
-	GtkWidget *hbox;
-	GtkWidget *vbox;
-	
-	char *vcalendar;
-	ECalComponent *comp;
-	icalcomponent *main_comp;
-	icalcomponent *ical_comp;
-	icalcomponent *top_level;
-	icalcompiter iter;
-	icalproperty_method method;
-
-	int current;
-	int total;
-
-	gchar *calendar_uid;
-
-	EAccountList *accounts;
-
-	gchar *from_address;
-	gchar *delegator_address;
-	gchar *delegator_name;
-	gchar *my_address;
-	gint   view_only;
-};
-
-#define ACTION_DATA "EItipControl:Action"
-
-/* HTML Strings */
-#define HTML_BODY_START "<body bgcolor=\"#ffffff\" text=\"#000000\" link=\"#336699\">"
-#define HTML_SEP        "<hr color=#336699 align=\"left\" width=450>"
-#define HTML_BODY_END   "</body>"
-#define HTML_FOOTER     "</html>"
-
-static void e_itip_control_destroy	(GtkObject               *obj);
-
-static void find_my_address (EItipControl *itip, icalcomponent *ical_comp, icalparameter_partstat *status);
-static void url_requested_cb (GtkHTML *html, const gchar *url, GtkHTMLStream *handle, gpointer data);
-static gboolean object_requested_cb (GtkHTML *html, GtkHTMLEmbedded *eb, gpointer data);
-static void ok_clicked_cb (GtkWidget *widget, gpointer data);
-
-G_DEFINE_TYPE (EItipControl, e_itip_control, GTK_TYPE_VBOX);
-
-static void
-e_itip_control_class_init (EItipControlClass *klass)
-{
-	GObjectClass *object_class;
-	GtkObjectClass *gtkobject_class;
-	
-	object_class = G_OBJECT_CLASS (klass);
-	gtkobject_class = GTK_OBJECT_CLASS (klass);
-	
-	gtkobject_class->destroy = e_itip_control_destroy;
-}
-
-static void
-set_ok_sens (EItipControl *itip)
-{
-	EItipControlPrivate *priv;
-	gboolean read_only = TRUE;
-	
-	priv = itip->priv;
-
-	if (!priv->ok)
-		return;
-	
-	if (priv->current_ecal)
-		e_cal_is_read_only (priv->current_ecal, &read_only, NULL);
-	
-	gtk_widget_set_sensitive (priv->ok, priv->current_ecal != NULL && !read_only);
-}
-
-static void
-cal_opened_cb (ECal *ecal, ECalendarStatus status, gpointer data)
-{
-	EItipControl *itip = data;
-	EItipControlPrivate *priv;
-	ESource *source;
-	ECalSourceType source_type;
-	icaltimezone *zone;
-
-	priv = itip->priv;
-
-	source_type = e_cal_get_source_type (ecal);
-	source = e_cal_get_source (ecal);
-	
-	g_signal_handlers_disconnect_matched (ecal, G_SIGNAL_MATCH_FUNC, 0, 0, NULL, cal_opened_cb, NULL);
-
-	if (status != E_CALENDAR_STATUS_OK) {
-		g_hash_table_remove (priv->ecals[source_type], e_source_peek_uid (source));
-
-		return;
-	}
-
-	zone = calendar_config_get_icaltimezone ();
-	e_cal_set_default_timezone (ecal, zone, NULL);
-
-	priv->current_ecal = ecal;
-	set_ok_sens (itip);
-}
-
-typedef void (* EItipControlOpenFunc) (ECal *ecal, ECalendarStatus status, gpointer data);
-
-static ECal *
-start_calendar_server (EItipControl *itip, ESource *source, ECalSourceType type, EItipControlOpenFunc func, gpointer data)
-{
-	EItipControlPrivate *priv;
-	ECal *ecal;
-
-	priv = itip->priv;
-	
-	ecal = g_hash_table_lookup (priv->ecals[type], e_source_peek_uid (source));
-	if (ecal) {
-		priv->current_ecal = ecal;
-		set_ok_sens (itip);
-		return ecal;		
-	}
-	
-	ecal = auth_new_cal_from_source (source, type);
-	g_signal_connect (G_OBJECT (ecal), "cal_opened", G_CALLBACK (func), data);
-
-	g_hash_table_insert (priv->ecals[type], g_strdup (e_source_peek_uid (source)), ecal);
-	
-	e_cal_open_async (ecal, TRUE);
-
-	return ecal;
-}
-
-static ECal *
-start_calendar_server_by_uid (EItipControl *itip, const char *uid, ECalSourceType type)
-{
-	EItipControlPrivate *priv;
-	int i;
-	
-	priv = itip->priv;
-
-	for (i = 0; i < E_CAL_SOURCE_TYPE_LAST; i++) {
-		ESource *source;
-
-		source = e_source_list_peek_source_by_uid (priv->source_lists[i], uid);
-		if (source)
-			return start_calendar_server (itip, source, type, cal_opened_cb, itip);
-	}
-	
-	return NULL;
-}
-
-typedef struct {
-	EItipControl *itip;	
-	char *uid;
-	int count;
-	gboolean show_selector;
-} EItipControlFindData;
-
-static void
-source_selected_cb (ESourceOptionMenu *esom, ESource *source, gpointer data)
-{
-	EItipControl *itip = data;
-	EItipControlPrivate *priv;
-	
-	priv = itip->priv;
-
-	if (priv->ok)
-		gtk_widget_set_sensitive (priv->ok, FALSE);
-
-	start_calendar_server (itip, source, priv->type, cal_opened_cb, itip);
-}
-
-static void
-find_cal_opened_cb (ECal *ecal, ECalendarStatus status, gpointer data)
-{
-	EItipControlFindData *fd = data;
-	EItipControlPrivate *priv;
-	ESource *source;
-	ECalSourceType source_type;
-	icalcomponent *icalcomp;
-	icaltimezone *zone;
-
-	source_type = e_cal_get_source_type (ecal);
-	source = e_cal_get_source (ecal);
-
-	priv = fd->itip->priv;
-	
-	fd->count--;
-	
-	g_signal_handlers_disconnect_matched (ecal, G_SIGNAL_MATCH_FUNC, 0, 0, NULL, find_cal_opened_cb, NULL);
-
-	if (status != E_CALENDAR_STATUS_OK) {
-		g_hash_table_remove (priv->ecals[source_type], e_source_peek_uid (source));
-
-		goto cleanup;
-	}
-
-	if (e_cal_get_object (ecal, fd->uid, NULL, &icalcomp, NULL)) {
-		icalcomponent_free (icalcomp);
-		
-		priv->current_ecal = ecal;
-		set_ok_sens (fd->itip);
-	}
-
-	zone = calendar_config_get_icaltimezone ();
-	e_cal_set_default_timezone (ecal, zone, NULL);
-
- cleanup:
-	if (fd->count == 0) {
-		if (fd->show_selector && !priv->current_ecal && priv->vbox) {
-			GtkWidget *esom;
-			ESource *source = NULL;
-			char *uid;
-
-			switch (priv->type) {
-			case E_CAL_SOURCE_TYPE_EVENT:
-				uid = calendar_config_get_primary_calendar ();
-				break;
-			case E_CAL_SOURCE_TYPE_TODO:
-				uid = calendar_config_get_primary_tasks ();
-				break;
-			default:
-				uid = NULL;
-				g_assert_not_reached ();
-			}	
-	
-			if (uid) {
-				source = e_source_list_peek_source_by_uid (priv->source_lists[priv->type], uid);
-				g_free (uid);
-			}
-
-			/* Try to create a default if there isn't one */
-			if (!source)
-				source = e_source_list_peek_source_any (priv->source_lists[priv->type]);
-
-			esom = e_source_option_menu_new (priv->source_lists[priv->type]);
-			g_signal_connect_object (esom, "source_selected",
-						 G_CALLBACK (source_selected_cb), 
-						 fd->itip, 0);
-
-			gtk_box_pack_start (GTK_BOX (priv->vbox), esom, FALSE, TRUE, 0);
-			gtk_widget_show (esom);
-
-			/* FIXME What if there is no source? */
-			if (source)
-				e_source_option_menu_select (E_SOURCE_OPTION_MENU (esom), source);
-		} else {
-			/* FIXME Display error message to user */
-		}
-		
-		g_free (fd->uid);
-		g_free (fd);
-	}
-}
-
-static void
-find_server (EItipControl *itip, ECalComponent *comp, gboolean show_selector)
-{
-	EItipControlPrivate *priv;
-	EItipControlFindData *fd = NULL;
-	GSList *groups, *l;
-	const char *uid;
-
-	priv = itip->priv;
-	
-	e_cal_component_get_uid (comp, &uid);
-
-	groups = e_source_list_peek_groups (priv->source_lists[priv->type]);
-	for (l = groups; l; l = l->next) {
-		ESourceGroup *group;
-		GSList *sources, *m;
-		
-		group = l->data;
-
-		sources = e_source_group_peek_sources (group);
-		for (m = sources; m; m = m->next) {
-			ESource *source;
-			ECal *ecal;
-			
-			source = m->data;
-			
-			if (!fd) {
-				fd = g_new0 (EItipControlFindData, 1);
-				fd->itip = itip;
-				fd->uid = g_strdup (uid);
-				fd->show_selector = show_selector;
-			}
-			fd->count++;
-
-			ecal = start_calendar_server (itip, source, priv->type, find_cal_opened_cb, fd);				
-		}		
-	}
-}
-
-static void
-cleanup_ecal (ECal *ecal) 
-{
-	/* Clean up any signals */
-	g_signal_handlers_disconnect_matched (ecal, G_SIGNAL_MATCH_FUNC, 0, 0, NULL, cal_opened_cb, NULL);
-	g_signal_handlers_disconnect_matched (ecal, G_SIGNAL_MATCH_FUNC, 0, 0, NULL, find_cal_opened_cb, NULL);
-	
-	g_object_unref (ecal);
-}
-
-static void
-html_destroyed (gpointer data)
-{
-	EItipControl *itip = data;
-	EItipControlPrivate *priv;
-	
-	priv = itip->priv;
-	
-	priv->html = NULL;
-}
-
-static void
-e_itip_control_init (EItipControl *itip)
-{
-	EItipControlPrivate *priv;
-	GtkWidget *scrolled_window;
-	int i;
-
-	priv = g_new0 (EItipControlPrivate, 1);
-	itip->priv = priv;
-
-	/* Addresses */
-	priv->accounts = itip_addresses_get ();
-
-	/* Source Lists */
-	for (i = 0; i < E_CAL_SOURCE_TYPE_LAST; i++)
-		priv->source_lists[i] = NULL;
-
-	priv->source_lists[E_CAL_SOURCE_TYPE_EVENT] = e_source_list_new_for_gconf_default ("/apps/evolution/calendar/sources");
-	priv->source_lists[E_CAL_SOURCE_TYPE_TODO] = e_source_list_new_for_gconf_default ("/apps/evolution/tasks/sources");
-	
-	/* Initialize the ecal hashes */
-	for (i = 0; i < E_CAL_SOURCE_TYPE_LAST; i++)
-		priv->ecals[i] = g_hash_table_new_full (g_str_hash, g_str_equal, g_free, cleanup_ecal);
-	priv->current_ecal = NULL;
-
-	/* Other fields to init */
-	priv->calendar_uid = NULL;
-	priv->from_address = NULL;
-	priv->delegator_address = NULL;
-	priv->delegator_name = NULL;
-	priv->my_address = NULL;
-	priv->view_only = 0;
-	
-	/* Html Widget */
-	priv->html = gtk_html_new ();
-	gtk_html_set_default_content_type (GTK_HTML (priv->html), 
-					   "text/html; charset=utf-8");
-	gtk_html_load_from_string (GTK_HTML (priv->html), " ", 1);
-	gtk_widget_show (priv->html);
-
-	scrolled_window = gtk_scrolled_window_new (NULL, NULL);
-	gtk_scrolled_window_set_policy (GTK_SCROLLED_WINDOW (scrolled_window),
-					GTK_POLICY_AUTOMATIC,
-					GTK_POLICY_AUTOMATIC);
-	gtk_widget_show (scrolled_window);
-
-	gtk_container_add (GTK_CONTAINER (scrolled_window), priv->html);
-	g_object_weak_ref (G_OBJECT (priv->html), (GWeakNotify)html_destroyed, itip);
-	gtk_widget_set_usize (scrolled_window, 600, 400);
-	gtk_box_pack_start (GTK_BOX (itip), scrolled_window, FALSE, FALSE, 6);
-
-	g_signal_connect (priv->html, "url_requested", G_CALLBACK (url_requested_cb), itip);
-	g_signal_connect (priv->html, "object_requested", G_CALLBACK (object_requested_cb), itip);
-	g_signal_connect (priv->html, "submit", G_CALLBACK (ok_clicked_cb), itip);
-}
-
-static void
-clean_up (EItipControl *itip)
-{
-	EItipControlPrivate *priv;
-
-	priv = itip->priv;
-	if (!priv)
-		return;
-
-	g_free (priv->vcalendar);
-	priv->vcalendar = NULL;
-
-	if (priv->comp) {
-		g_object_unref (priv->comp);
-		priv->comp = NULL;
-	}
-
-	if (priv->top_level) {
-		icalcomponent_free (priv->top_level);
-		priv->top_level = NULL;
-	}
-
-	if (priv->main_comp) {
-		icalcomponent_free (priv->main_comp);
-		priv->main_comp = NULL;
-	}
-	priv->ical_comp = NULL;
-
-	priv->current = 0;
-	priv->total = 0;
-
-	g_free (priv->calendar_uid);
-	priv->calendar_uid = NULL;
-
-	g_free (priv->from_address);
-	priv->from_address = NULL;
-	g_free (priv->delegator_address);
-	priv->delegator_address = NULL;
-	g_free (priv->delegator_name);
-	priv->delegator_name = NULL;
-	g_free (priv->my_address);
-	priv->my_address = NULL;
-}
-
-static void
-e_itip_control_destroy (GtkObject *obj)
-{
-	EItipControl *itip = E_ITIP_CONTROL (obj);
-	EItipControlPrivate *priv;
-	
-	priv = itip->priv;
-
-	if (priv) {
-		int i;
-
-		clean_up (itip);
-		
-		priv->accounts = NULL;
-		
-		for (i = 0; i < E_CAL_SOURCE_TYPE_LAST; i++) {
-			if (priv->ecals[i]) {
-				g_hash_table_destroy (priv->ecals[i]);
-				priv->ecals[i] = NULL;
-			}
-		}
-		
-		if (priv->html) {
-			g_signal_handlers_disconnect_matched (priv->html, G_SIGNAL_MATCH_DATA, 0, 0, NULL, NULL, itip);
-			g_object_weak_unref (G_OBJECT (priv->html), (GWeakNotify)html_destroyed, itip);
-		}
-		
-		g_free (priv);
-		itip->priv = NULL;
-	}
-	
-	(* GTK_OBJECT_CLASS (e_itip_control_parent_class)->destroy) (obj);
-}
-
-GtkWidget *
-e_itip_control_new (void)
-{
-	return g_object_new (E_TYPE_ITIP_CONTROL, NULL);
-}
-
-static void
-find_my_address (EItipControl *itip, icalcomponent *ical_comp, icalparameter_partstat *status)
-{
-	EItipControlPrivate *priv;
-	icalproperty *prop;
-	char *my_alt_address = NULL;
-	
-	priv = itip->priv;
-	
-	for (prop = icalcomponent_get_first_property (ical_comp, ICAL_ATTENDEE_PROPERTY);
-	     prop != NULL;
-	     prop = icalcomponent_get_next_property (ical_comp, ICAL_ATTENDEE_PROPERTY)) {
-		icalvalue *value;
-		icalparameter *param;
-		const char *attendee, *name;
-		char *attendee_clean, *name_clean;
-		EIterator *it;
-
-		value = icalproperty_get_value (prop);
-		if (value != NULL) {
-			attendee = icalvalue_get_string (value);
-			attendee_clean = g_strdup (itip_strip_mailto (attendee));
-			attendee_clean = g_strstrip (attendee_clean);
-		} else {
-			attendee = NULL;
-			attendee_clean = NULL;
-		}
-		
-		param = icalproperty_get_first_parameter (prop, ICAL_CN_PARAMETER);
-		if (param != NULL) {
-			name = icalparameter_get_cn (param);
-			name_clean = g_strdup (name);
-			name_clean = g_strstrip (name_clean);
-		} else {
-			name = NULL;
-			name_clean = NULL;
-		}
-
-		if (priv->delegator_address) {
-			char *delegator_clean;
-			
-			delegator_clean = g_strdup (itip_strip_mailto (attendee));
-			delegator_clean = g_strstrip (delegator_clean);
-			
-			/* If the mailer told us the address to use, use that */
-			if (delegator_clean != NULL
-			    && !g_ascii_strcasecmp (attendee_clean, delegator_clean)) {
-				priv->my_address = g_strdup (itip_strip_mailto (priv->delegator_address));
-				priv->my_address = g_strstrip (priv->my_address);
-
-				if (status) {
-					param = icalproperty_get_first_parameter (prop, ICAL_PARTSTAT_PARAMETER);
-					*status = param ? icalparameter_get_partstat (param) : ICAL_PARTSTAT_NEEDSACTION;
-				}
-			}
-
-			g_free (delegator_clean);
-		} else {
-			it = e_list_get_iterator((EList *)priv->accounts);
-			while (e_iterator_is_valid(it)) {
-				const EAccount *account = e_iterator_get(it);
-				
-				/* Check for a matching address */
-				if (attendee_clean != NULL
-				    && !g_ascii_strcasecmp (account->id->address, attendee_clean)) {
-					priv->my_address = g_strdup (account->id->address);
-					if (status) {
-						param = icalproperty_get_first_parameter (prop, ICAL_PARTSTAT_PARAMETER);
-						*status = param ? icalparameter_get_partstat (param) : ICAL_PARTSTAT_NEEDSACTION;
-					}
-					g_free (attendee_clean);
-					g_free (name_clean);
-					g_free (my_alt_address);
-					g_object_unref(it);
-					return;
-				}
-				
-				/* Check for a matching cname to fall back on */
-				if (name_clean != NULL 
-				    && !g_ascii_strcasecmp (account->id->name, name_clean))
-					my_alt_address = g_strdup (attendee_clean);
-				
-				e_iterator_next(it);
-			}
-			g_object_unref(it);
-		}
-		
-		g_free (attendee_clean);
-		g_free (name_clean);
-	}
-
-	priv->my_address = my_alt_address;
-	if (status)
-		*status = ICAL_PARTSTAT_NEEDSACTION;
-}
-
-static icalproperty *
-find_attendee (icalcomponent *ical_comp, const char *address)
-{
-	icalproperty *prop;
-
-	if (address == NULL)
-		return NULL;
-
-	for (prop = icalcomponent_get_first_property (ical_comp, ICAL_ATTENDEE_PROPERTY);
-	     prop != NULL;
-	     prop = icalcomponent_get_next_property (ical_comp, ICAL_ATTENDEE_PROPERTY)) {
-		icalvalue *value;
-		const char *attendee;
-		char *text;
-
-		value = icalproperty_get_value (prop);
-		if (!value)
-			continue;
-
-		attendee = icalvalue_get_string (value);
-
-		text = g_strdup (itip_strip_mailto (attendee));
-		text = g_strstrip (text);
-		if (!g_strcasecmp (address, text)) {
-			g_free (text);
-			break;
-		}
-		g_free (text);
-	}
-	
-	return prop;
-}
-
-static void
-write_label_piece (EItipControl *itip, ECalComponentDateTime *dt,
-		   char *buffer, int size,
-		   const char *stext, const char *etext,
-		   gboolean just_date)
-{
-	EItipControlPrivate *priv;
-	struct tm tmp_tm;
-	char time_buf[64];
-	icaltimezone *zone = NULL;
-	char *display_name;
-
-	priv = itip->priv;
-
-	/* UTC times get converted to the current timezone. This is done for
-	   the COMPLETED property, which is always in UTC, and also because
-	   Outlook sends simple events as UTC times. */
-	if (dt->value->is_utc) {
-		zone = calendar_config_get_icaltimezone ();
-		icaltimezone_convert_time (dt->value, icaltimezone_get_utc_timezone (), zone);
-	}
-
-	tmp_tm = icaltimetype_to_tm (dt->value);
-	if (just_date)
-		tmp_tm.tm_hour = tmp_tm.tm_min = tmp_tm.tm_sec = 0;
-
-	if (stext != NULL)
-		strcat (buffer, stext);
-
-	e_time_format_date_and_time (&tmp_tm,
-				     calendar_config_get_24_hour_format (),
-				     FALSE, FALSE,
-				     time_buf, sizeof (time_buf));
-	strcat (buffer, time_buf);
-
-	if (!dt->value->is_utc && dt->tzid) {
-		zone = icalcomponent_get_timezone (priv->top_level, dt->tzid);
-	}
-
-	/* Output timezone after time, e.g. " America/New_York". */
-	if (zone && !just_date) {
-		/* Note that this returns UTF-8, since all iCalendar data is
-		   UTF-8. But it probably is not translated. */
-		display_name = icaltimezone_get_display_name (zone);
-		if (display_name && *display_name) {
-			strcat (buffer, " <font size=-1>[");
-
-			/* We check if it is one of our builtin timezone names,
-			   in which case we call gettext to translate it. */
-			if (icaltimezone_get_builtin_timezone (display_name)) {
-				strcat (buffer, _(display_name));
-			} else {
-				strcat (buffer, display_name);
-			}
-			strcat (buffer, "]</font>");
-		}
-	}
-
-	if (etext != NULL)
-		strcat (buffer, etext);
-}
-
-static const char *
-nth (int n)
-{
-	if (n == -1)
-		return "last";
-	else if (n < 1 || n > 31)
-		return "?";
-	else
-		return e_cal_recur_nth[n];
-}
-
-static const char *dayname[] = {
-	N_("Sunday"),
-	N_("Monday"),
-	N_("Tuesday"),
-	N_("Wednesday"),
-	N_("Thursday"),
-	N_("Friday"),
-	N_("Saturday")
-};
-
-static inline char *
-get_dayname (struct icalrecurrencetype *r, int i)
-{
-	enum icalrecurrencetype_weekday day;
-
-	day = icalrecurrencetype_day_day_of_week (r->by_day[i]);
-	g_return_val_if_fail (day > 0 && day < 8, "?");
-
-	return _(dayname[day - 1]);
-}
-
-static void
-write_recurrence_piece (EItipControl *itip, ECalComponent *comp,
-			char *buffer, int size)
-{
-	GSList *rrules;
-	struct icalrecurrencetype *r;
-	int len, i;
-
-	strcpy (buffer, "<b>Recurring:</b> ");
-	len = strlen (buffer);
-	buffer += len;
-	size -= len;
-
-	if (!e_cal_component_has_simple_recurrence (comp)) {
-		strcpy (buffer, _("Yes. (Complex Recurrence)"));
-		return;
-	}
-
-	e_cal_component_get_rrule_list (comp, &rrules);
-	g_return_if_fail (rrules && !rrules->next);
-
-	r = rrules->data;
-
-	switch (r->freq) {
-	case ICAL_DAILY_RECURRENCE:
-		sprintf (buffer, ngettext("Every day", "Every %d days", r->interval), r->interval);
-		break;
-
-	case ICAL_WEEKLY_RECURRENCE:
-		if (r->by_day[0] == ICAL_RECURRENCE_ARRAY_MAX) {
-			sprintf (buffer, ngettext("Every week", "Every %d weeks", r->interval), r->interval);
-		} else {
-			sprintf (buffer, ngettext("Every week on ", "Every %d weeks on ", r->interval), r->interval);
-
-			for (i = 1; i < 8 && r->by_day[i] != ICAL_RECURRENCE_ARRAY_MAX; i++) {
-				if (i > 1)
-					strcat (buffer, ", ");
-				strcat (buffer, get_dayname (r, i - 1));
-			}
-			if (i > 1)
-				strcat (buffer, _(" and "));
-			strcat (buffer, get_dayname (r, i - 1));
-		}
-		break;
-
-	case ICAL_MONTHLY_RECURRENCE:
-		if (r->by_month_day[0] != ICAL_RECURRENCE_ARRAY_MAX) {
-			sprintf (buffer, _("The %s day of "),
-				 nth (r->by_month_day[0]));
-		} else {
-			int pos;
-
-			/* Outlook 2000 uses BYDAY=TU;BYSETPOS=2, and will not
-			   accept BYDAY=2TU. So we now use the same as Outlook
-			   by default. */
-
-			pos = icalrecurrencetype_day_position (r->by_day[0]);
-			if (pos == 0)
-				pos = r->by_set_pos[0];
-
-			sprintf (buffer, _("The %s %s of "),
-				 nth (pos), get_dayname (r, 0));
-		}
-
-		len = strlen (buffer);
-		buffer += len;
-		size -= len;
-		sprintf (buffer, ngettext("every month","every %d months", r->interval), r->interval);
-		break;
-
-	case ICAL_YEARLY_RECURRENCE:
-		sprintf (buffer, ngettext("Every year", "Every %d years", r->interval), r->interval);
-		break;
-
-	default:
-		g_assert_not_reached ();
-	}
-
-	len = strlen (buffer);
-	buffer += len;
-	size -= len;
-	if (r->count) {
-		sprintf (buffer, ngettext("a total of %d time", " a total of %d times", r->count), r->count);
-	} else if (!icaltime_is_null_time (r->until)) {
-		ECalComponentDateTime dt;
-
-		/* FIXME This should get the tzid id, not the whole zone */
-		dt.value = &r->until;
-		dt.tzid = icaltimezone_get_tzid ((icaltimezone *)r->until.zone);
-
-		write_label_piece (itip, &dt, buffer, size,
-				   _(", ending on "), NULL, TRUE);
-	}
-
-	strcat (buffer, "<br>");
-}
-
-static void
-set_date_label (EItipControl *itip, GtkHTML *html, GtkHTMLStream *html_stream,
-		ECalComponent *comp)
-{
-	EItipControlPrivate *priv;
-	ECalComponentDateTime datetime;
-	static char buffer[1024];
-	gchar *str;
-	gboolean wrote = FALSE, task_completed = FALSE;
-	ECalComponentVType type;
-
-	priv = itip->priv;
-
-	type = e_cal_component_get_vtype (comp);
-
-	buffer[0] = '\0';
-	e_cal_component_get_dtstart (comp, &datetime);
-	if (datetime.value) {
-		str = g_strdup_printf ("<b>%s:</b>", _("Starts"));
-		write_label_piece (itip, &datetime, buffer, 1024,
-				  str,
-				   "<br>", FALSE);
-		gtk_html_write (html, html_stream, buffer, strlen(buffer));
-		wrote = TRUE;
-		g_free (str);
-	}
-	e_cal_component_free_datetime (&datetime);
-
-	buffer[0] = '\0';
-	e_cal_component_get_dtend (comp, &datetime);
-	if (datetime.value){
-		str = g_strdup_printf ("<b>%s:</b>", _("Ends"));
-		write_label_piece (itip, &datetime, buffer, 1024, str, "<br>", FALSE);
-		gtk_html_write (html, html_stream, buffer, strlen (buffer));
-		wrote = TRUE;
-		g_free (str);
-	}
-	e_cal_component_free_datetime (&datetime);
-
-	buffer[0] = '\0';
-	if (e_cal_component_has_recurrences (comp)) {
-		write_recurrence_piece (itip, comp, buffer, 1024);
-		gtk_html_write (html, html_stream, buffer, strlen (buffer));
-		wrote = TRUE;
-	}
-
-	buffer[0] = '\0';
-	datetime.tzid = NULL;
-	e_cal_component_get_completed (comp, &datetime.value);
-	if (type == E_CAL_COMPONENT_TODO && datetime.value) {
-		/* Pass TRUE as is_utc, so it gets converted to the current
-		   timezone. */
-		str = g_strdup_printf ("<b>%s:</b>", _("Completed"));
-		datetime.value->is_utc = TRUE;
-		write_label_piece (itip, &datetime, buffer, 1024, str, "<br>", FALSE);
-		gtk_html_write (html, html_stream, buffer, strlen (buffer));
-		wrote = TRUE;
-		task_completed = TRUE;
-		g_free (str);
-	}
-	e_cal_component_free_datetime (&datetime);
-
-	buffer[0] = '\0';
-	e_cal_component_get_due (comp, &datetime);
-	if (type == E_CAL_COMPONENT_TODO && !task_completed && datetime.value) {
-		str = g_strdup_printf ("<b>%s:</b>", _("Due"));
-		write_label_piece (itip, &datetime, buffer, 1024, str, "<br>", FALSE);
-		gtk_html_write (html, html_stream, buffer, strlen (buffer));
-		wrote = TRUE;
-		g_free (str);
-	}
-
-	e_cal_component_free_datetime (&datetime);
-
-	if (wrote)
-		gtk_html_stream_printf (html_stream, "<br>");
-}
-
-static void
-set_message (GtkHTML *html, GtkHTMLStream *html_stream, const gchar *message, gboolean err)
-{
-	if (message == NULL)
-		return;
-
-
-	if (err) {
-		gtk_html_stream_printf (html_stream, "<b><font color=\"#ff0000\">%s</font></b><br><br>", message);
-	} else {
-		gtk_html_stream_printf (html_stream, "<b>%s</b><br><br>", message);
-	}
-}
-
-static void
-write_error_html (EItipControl *itip, const gchar *itip_err)
-{
-	EItipControlPrivate *priv;
-	GtkHTMLStream *html_stream;
-	gchar *filename;
-
-	priv = itip->priv;
-
-	/* Html widget */
-	html_stream = gtk_html_begin (GTK_HTML (priv->html));
-	gtk_html_stream_printf (html_stream,
-				"<html><head><title>%s</title></head>",
-				_("iCalendar Information"));
-
-	gtk_html_write (GTK_HTML (priv->html), html_stream,
-			HTML_BODY_START, strlen(HTML_BODY_START));
-
-	/* The table */
-	gtk_html_stream_printf (html_stream, "<table width=450 cellspacing=\"0\" cellpadding=\"4\" border=\"0\">");
-	/* The column for the image */
-	gtk_html_stream_printf (html_stream, "<tr><td width=48 align=\"center\" valign=\"top\" rowspan=\"8\">");
-	/* The image */
-	filename = e_icon_factory_get_icon_filename ("stock_new-meeting", E_ICON_SIZE_DIALOG);
-	gtk_html_stream_printf (html_stream, "<img src=\"%s\"></td>", filename);
-	g_free (filename);
-
-	gtk_html_stream_printf (html_stream, "<td align=\"left\" valign=\"top\">");
-
-	/* Title */
-	set_message (GTK_HTML (priv->html), html_stream, _("iCalendar Error"), TRUE);
-
-	/* Error */
-	gtk_html_write (GTK_HTML (priv->html), html_stream, itip_err, strlen(itip_err));
-
-	/* Clean up */
-	gtk_html_stream_printf (html_stream, "</td></tr></table>");
-
-	gtk_html_write (GTK_HTML (priv->html), html_stream,
-			HTML_BODY_END, strlen(HTML_BODY_END));
-	gtk_html_write (GTK_HTML (priv->html), html_stream,
-			HTML_FOOTER, strlen(HTML_FOOTER));
-
-	gtk_html_end (GTK_HTML (priv->html), html_stream, GTK_HTML_STREAM_OK);
-}
-
-static void
-write_html (EItipControl *itip, const gchar *itip_desc, const gchar *itip_title, const gchar *options)
-{
-	EItipControlPrivate *priv;
-	GtkHTMLStream *html_stream;
-	ECalComponentText text;
-	ECalComponentOrganizer organizer;
-	ECalComponentAttendee *attendee;
-	GSList *attendees, *l = NULL;
-	const char *string;
-	gchar *html;
-	const gchar *const_html;
-	gchar *filename;
-	gchar *str;
-
-	priv = itip->priv;
-
-	if (priv->html == NULL)
-		return;
-	
-	/* Html widget */
-	html_stream = gtk_html_begin (GTK_HTML (priv->html));
-	gtk_html_stream_printf (html_stream,
-				"<html><head><title>%s</title></head>",
-				_("iCalendar Information"));
-	gtk_html_write (GTK_HTML (priv->html), html_stream,
-			HTML_BODY_START, strlen(HTML_BODY_START));
-
-	/* The table */
-	const_html = "<table width=450 cellspacing=\"0\" cellpadding=\"4\" border=\"0\">";
-	gtk_html_write (GTK_HTML (priv->html), html_stream, const_html, strlen(const_html));
-
-	/* The column for the image */
-	const_html = "<tr><td width=48 align=\"center\" valign=\"top\" rowspan=\"8\">";
-	gtk_html_write (GTK_HTML (priv->html), html_stream, const_html, strlen(const_html));
-
-	/* The image */
-	filename = e_icon_factory_get_icon_filename ("stock_new-meeting", E_ICON_SIZE_DIALOG);
-	gtk_html_stream_printf (html_stream, "<img src=\"%s\"></td>", filename);
-	g_free (filename);
-
-	const_html = "<td align=\"left\" valign=\"top\">";
-	gtk_html_write (GTK_HTML (priv->html), html_stream, const_html, strlen(const_html));
-
-	switch (priv->method) {
-	case ICAL_METHOD_REFRESH:
-	case ICAL_METHOD_REPLY:
-		/* An attendee sent this */
-		e_cal_component_get_attendee_list (priv->comp, &attendees);
-		if (attendees != NULL) {
-			attendee = attendees->data;
-			html = g_strdup_printf (itip_desc,
-						attendee->cn ?
-						attendee->cn :
-						itip_strip_mailto (attendee->value));
-		} else {
-			html = g_strdup_printf (itip_desc, _("An unknown person"));
-		}
-		break;
-	case ICAL_METHOD_REQUEST:
-		/* The organizer sent this */
-		e_cal_component_get_organizer (priv->comp, &organizer);
-		if (priv->delegator_address != NULL) {
-			if (organizer.value != NULL)
-				html = g_strdup_printf (itip_desc,
-							organizer.cn ?
-							organizer.cn :
-							itip_strip_mailto (organizer.value),
-							priv->delegator_name ?
-							priv->delegator_name :
-					                priv->delegator_address);
-			else
-				html = g_strdup_printf (itip_desc, _("An unknown person"),
-							priv->delegator_name ?
-							priv->delegator_name :
-					                priv->delegator_address);
-		} else {
-			if (organizer.value != NULL)
-				html = g_strdup_printf (itip_desc,
-							organizer.cn ?
-							organizer.cn :
-							itip_strip_mailto (organizer.value));
-			else
-				html = g_strdup_printf (itip_desc, _("An unknown person"));
-		}
-		
-		break;
-		
-	case ICAL_METHOD_PUBLISH:
-	case ICAL_METHOD_ADD:
-	case ICAL_METHOD_CANCEL:
-	default:
-		/* The organizer sent this */
-		e_cal_component_get_organizer (priv->comp, &organizer);
-		if (organizer.value != NULL)
-			html = g_strdup_printf (itip_desc,
-						organizer.cn ?
-						organizer.cn :
-						itip_strip_mailto (organizer.value));
-		else
-			html = g_strdup_printf (itip_desc, _("An unknown person"));
-		break;
-	}
-	gtk_html_write (GTK_HTML (priv->html), html_stream, html, strlen(html));
-	g_free (html);
-
-	/* Describe what the user can do */
-	const_html = _("<br> Please review the following information, "
-			"and then select an action from the menu below.");
-	gtk_html_write (GTK_HTML (priv->html), html_stream, const_html, strlen(const_html));
-
-	/* Separator */
-	gtk_html_write (GTK_HTML (priv->html), html_stream, HTML_SEP, strlen (HTML_SEP));
-
-	/* Title */
-	set_message (GTK_HTML (priv->html), html_stream, itip_title, FALSE);
-
-	/* Date information */
-	set_date_label (itip, GTK_HTML (priv->html), html_stream, priv->comp);
-
-	/* Summary */
-	e_cal_component_get_summary (priv->comp, &text);
-	str = g_strdup_printf ("<i>%s:</i>", _("None"));
-
-	html = text.value ? e_text_to_html_full (text.value, E_TEXT_TO_HTML_CONVERT_NL, 0) : str;
-	gtk_html_stream_printf (html_stream, "<b>%s</b><br>%s<br><br>",
-				_("Summary:"), html);
-	g_free (str);
-	if (text.value)
-		g_free (html);
-	
-	/* Location */
-	e_cal_component_get_location (priv->comp, &string);
-	if (string != NULL) {
-		html = e_text_to_html_full (string, E_TEXT_TO_HTML_CONVERT_NL, 0);
-		gtk_html_stream_printf (html_stream, "<b>%s</b><br>%s<br><br>", 
-					_("Location:"), html);
-		g_free (html);
-	}
-	
-	/* Status */
-	if (priv->method == ICAL_METHOD_REPLY) {
-		GSList *alist;
-
-		e_cal_component_get_attendee_list (priv->comp, &alist);
-		
-		if (alist != NULL) {
-			ECalComponentAttendee *a = alist->data;
-
-			gtk_html_stream_printf (html_stream, "<b>%s</b><br>",
-						_("Status:"));
-			
-			switch (a->status) {
-			case ICAL_PARTSTAT_ACCEPTED:
-				gtk_html_stream_printf (html_stream, "%s<br><br>",
-							_("Accepted"));
-				break;
-			case ICAL_PARTSTAT_TENTATIVE:
-				gtk_html_stream_printf (html_stream, "%s<br><br>",
-							_("Tentatively Accepted"));
-				break;
-			case ICAL_PARTSTAT_DECLINED:
-				gtk_html_stream_printf (html_stream, "%s<br><br>",
-							_("Declined"));
-				break;
-			default:
-				gtk_html_stream_printf (html_stream, "%s<br><br>",
-							_("Unknown"));
-			}
-		}
-		
-		e_cal_component_free_attendee_list (alist);
-	}
-	
-	/* Description */
-	e_cal_component_get_description_list (priv->comp, &l);
-	if (l)
-		text = *((ECalComponentText *)l->data);
-
-	if (l && text.value) {
-		html = e_text_to_html_full (text.value, E_TEXT_TO_HTML_CONVERT_NL, 0);
-		gtk_html_stream_printf (html_stream, "<b>%s</b><br>%s",
-					_("Description:"), html);
-		g_free (html);
-	}
-	e_cal_component_free_text_list (l);
-
-	/* Separator */
-	gtk_html_write (GTK_HTML (priv->html), html_stream, HTML_SEP, strlen (HTML_SEP));
-
-	/* Options */
-	if (!e_itip_control_get_view_only (itip)) {
-		if (options != NULL) {
-			const_html = "</td></tr><tr><td valign=\"center\">";
-			gtk_html_write (GTK_HTML (priv->html), html_stream, const_html, strlen (const_html));
-			gtk_html_write (GTK_HTML (priv->html), html_stream, options, strlen (options));
-		}
-	}
-	
-	const_html = "</td></tr></table>";
-	gtk_html_write (GTK_HTML (priv->html), html_stream, const_html, strlen(const_html));
-
-	gtk_html_write (GTK_HTML (priv->html), html_stream,
-			HTML_BODY_END, strlen(HTML_BODY_END));
-	gtk_html_write (GTK_HTML (priv->html), html_stream,
-			HTML_FOOTER, strlen(HTML_FOOTER));
-
-	gtk_html_end (GTK_HTML (priv->html), html_stream, GTK_HTML_STREAM_OK);
-}
-
-
-static char*
-get_publish_options (void)
-{
-	return g_strdup_printf ("<object classid=\"itip:publish_options\"></object>");
-}
-
-static char*
-get_request_options (void)
-{
-	return g_strdup_printf ("<object classid=\"itip:request_options\"></object>");
-}
-
-static char*
-get_request_fb_options ()
-{
-	return g_strdup_printf ("<object classid=\"itip:freebusy_options\"></object>");
-}
-
-static char*
-get_reply_options ()
-{
-	return g_strdup_printf ("<object classid=\"itip:reply_options\"></object>");
-}
-
-static char*
-get_refresh_options ()
-{
-	return g_strdup_printf ("<object classid=\"itip:refresh_options\"></object>");
-}
-
-static char*
-get_cancel_options (gboolean found, icalcomponent_kind kind)
-{ 
-	if (!found) {
-		switch (kind) {
-		case ICAL_VEVENT_COMPONENT:
-			return g_strdup_printf ("<i>%s</i>", _("The meeting has been cancelled, however it could not be found in your calendars"));
-		case ICAL_VTODO_COMPONENT:
- 			return g_strdup_printf ("<i>%s</i>", _("The task has been cancelled, however it could not be found in your task lists"));
-		default:
-			g_assert_not_reached ();
-			return NULL;
-		}		
-	}
-
-	return g_strdup_printf ("<object classid=\"itip:cancel_options\"></object>");
-}
-
-
-static ECalComponent *
-get_real_item (EItipControl *itip) 
-{
-	EItipControlPrivate *priv;
-	ECalComponent *comp;
-	icalcomponent *icalcomp;
-	gboolean found = FALSE;
-	const char *uid;
-	
-	priv = itip->priv;
-
-	e_cal_component_get_uid (priv->comp, &uid);
-
-	found = e_cal_get_object (priv->current_ecal, uid, NULL, &icalcomp, NULL);
-	if (!found)
-		return NULL;
-
-	comp = e_cal_component_new ();
-	if (!e_cal_component_set_icalcomponent (comp, icalcomp)) {
-		g_object_unref (comp);
-		icalcomponent_free (icalcomp);
-		return NULL;
-	}
-
-	return comp;
-}
-
-static void
-adjust_item (EItipControl *itip, ECalComponent *comp)
-{
-	ECalComponent *real_comp;
-	
-	real_comp = get_real_item (itip);
-	if (real_comp != NULL) {
-		ECalComponentText text;
-		const char *string;
-		GSList *l;
-		
-		e_cal_component_get_summary (real_comp, &text);
-		e_cal_component_set_summary (comp, &text);
-		e_cal_component_get_location (real_comp, &string);
-		e_cal_component_set_location (comp, string);
-		e_cal_component_get_description_list (real_comp, &l);
-		e_cal_component_set_description_list (comp, l);
-		e_cal_component_free_text_list (l);
-		
-		g_object_unref (real_comp);
-	} else {
-		ECalComponentText text = {_("Unknown"), NULL};
-		
-		e_cal_component_set_summary (comp, &text);
-	}
-}
-
-static void
-show_current_event (EItipControl *itip)
-{
-	EItipControlPrivate *priv;
-	const gchar *itip_title, *itip_desc;
-	char *options;
-	gboolean show_selector = FALSE;
-	
-	priv = itip->priv;
-
-	priv->type = E_CAL_SOURCE_TYPE_EVENT;
-
-	switch (priv->method) {
-	case ICAL_METHOD_PUBLISH:
-		itip_desc = _("<b>%s</b> has published meeting information.");
-		itip_title = _("Meeting Information");
-		options = get_publish_options ();
-		show_selector = TRUE;
-		break;
-	case ICAL_METHOD_REQUEST:
-		if (priv->delegator_address != NULL)
-			itip_desc = _("<b>%s</b> requests the presence of %s at a meeting.");
-		else
-			itip_desc = _("<b>%s</b> requests your presence at a meeting.");
-		itip_title = _("Meeting Proposal");
-		options = get_request_options ();
-		show_selector = TRUE;
-		break;
-	case ICAL_METHOD_ADD:
-		/* FIXME Whats going on here? */
-		itip_desc = _("<b>%s</b> wishes to add to an existing meeting.");
-		itip_title = _("Meeting Update");
-		options = get_publish_options ();
-		break;
-	case ICAL_METHOD_REFRESH:
-		itip_desc = _("<b>%s</b> wishes to receive the latest meeting information.");
-		itip_title = _("Meeting Update Request");
-		options = get_refresh_options ();
-
-		/* Provide extra info, since its not in the component */
-		adjust_item (itip, priv->comp);
-		break;
-	case ICAL_METHOD_REPLY:
-		itip_desc = _("<b>%s</b> has replied to a meeting request.");
-		itip_title = _("Meeting Reply");
-		options = get_reply_options ();
-
-		/* Provide extra info, since might not be in the component */
-		adjust_item (itip, priv->comp);
-		break;
-	case ICAL_METHOD_CANCEL:
-		itip_desc = _("<b>%s</b> has cancelled a meeting.");
-		itip_title = _("Meeting Cancellation");
-		/* FIXME priv->current_ecal will always be NULL so the
-		 * user won't see an error message, the OK button will
-		 * just be de-sensitized */
-		options = get_cancel_options (TRUE, ICAL_VEVENT_COMPONENT);
-
-		/* Provide extra info, since might not be in the component */
-		adjust_item (itip, priv->comp);
-		break;
-	default:
-		itip_desc = _("<b>%s</b> has sent an unintelligible message.");
-		itip_title = _("Bad Meeting Message");
-		options = NULL;
-	}
-
-	write_html (itip, itip_desc, itip_title, options);
-	g_free (options);
-
-	if (priv->calendar_uid)
-		priv->current_ecal = start_calendar_server_by_uid (itip, priv->calendar_uid, priv->type);
-	else 
-		find_server (itip, priv->comp, show_selector);
-}
-
-static void
-show_current_todo (EItipControl *itip)
-{
-	EItipControlPrivate *priv;
-	const gchar *itip_title, *itip_desc;
-	char *options;
-	gboolean show_selector = FALSE;
-	
-	priv = itip->priv;
-
-	priv->type = E_CAL_SOURCE_TYPE_TODO;
-
-	switch (priv->method) {
-	case ICAL_METHOD_PUBLISH:
-		itip_desc = _("<b>%s</b> has published task information.");
-		itip_title = _("Task Information");
-		options = get_publish_options ();
-		show_selector = TRUE;
-		break;
-	case ICAL_METHOD_REQUEST:
-		/* FIXME Does this need to handle like events above? */
-		if (priv->delegator_address != NULL)
-			itip_desc = _("<b>%s</b> requests %s to perform a task.");
-		else
-			itip_desc = _("<b>%s</b> requests you perform a task.");
-		itip_title = _("Task Proposal");
-		options = get_request_options ();
-		show_selector = TRUE;
-		break;
-	case ICAL_METHOD_ADD:
-		/* FIXME Whats going on here? */
-		itip_desc = _("<b>%s</b> wishes to add to an existing task.");
-		itip_title = _("Task Update");
-		options = get_publish_options ();
-		break;
-	case ICAL_METHOD_REFRESH:
-		itip_desc = _("<b>%s</b> wishes to receive the latest task information.");
-		itip_title = _("Task Update Request");
-		options = get_refresh_options ();
-
-		/* Provide extra info, since its not in the component */
-		adjust_item (itip, priv->comp);
-		break;
-	case ICAL_METHOD_REPLY:
-		itip_desc = _("<b>%s</b> has replied to a task assignment.");
-		itip_title = _("Task Reply");
-		options = get_reply_options ();
-
-		/* Provide extra info, since might not be in the component */
-		adjust_item (itip, priv->comp);
-		break;
-	case ICAL_METHOD_CANCEL:
-		itip_desc = _("<b>%s</b> has cancelled a task.");
-		itip_title = _("Task Cancellation");
-		/* FIXME priv->current_ecal will always be NULL so the
-		 * user won't see an error message, the OK button will
-		 * just be de-sensitized */
-		options = get_cancel_options (TRUE, ICAL_VTODO_COMPONENT);
-
-		/* Provide extra info, since might not be in the component */
-		adjust_item (itip, priv->comp);
-		break;
-	default:
-		itip_desc = _("<b>%s</b> has sent an unintelligible message.");
-		itip_title = _("Bad Task Message");
-		options = NULL;
-	}
-
-	write_html (itip, itip_desc, itip_title, options);
-	g_free (options);
-
-	if (priv->calendar_uid)
-		priv->current_ecal = start_calendar_server_by_uid (itip, priv->calendar_uid, priv->type);
-	else 
-		find_server (itip, priv->comp, show_selector);
-}
-
-static void
-show_current_freebusy (EItipControl *itip)
-{
-	EItipControlPrivate *priv;
-	const gchar *itip_title, *itip_desc;
-	char *options;
-
-	priv = itip->priv;
-
-	switch (priv->method) {
-	case ICAL_METHOD_PUBLISH:
-		itip_desc = _("<b>%s</b> has published free/busy information.");
-		itip_title = _("Free/Busy Information");
-		options = NULL;
-		break;
-	case ICAL_METHOD_REQUEST:
-		itip_desc = _("<b>%s</b> requests your free/busy information.");
-		itip_title = _("Free/Busy Request");
-		options = get_request_fb_options ();
-		break;
-	case ICAL_METHOD_REPLY:
-		itip_desc = _("<b>%s</b> has replied to a free/busy request.");
-		itip_title = _("Free/Busy Reply");
-		options = NULL;
-		break;
-	default:
-		itip_desc = _("<b>%s</b> has sent an unintelligible message.");
-		itip_title = _("Bad Free/Busy Message");
-		options = NULL;
-	}
-
-	write_html (itip, itip_desc, itip_title, options);
-	g_free (options);
-}
-
-static icalcomponent *
-get_next (icalcompiter *iter)
-{
-	icalcomponent *ret = NULL;
-	icalcomponent_kind kind;
-
-	do {
-		icalcompiter_next (iter);
-		ret = icalcompiter_deref (iter);
-		if (ret == NULL)
-			break;
-		kind = icalcomponent_isa (ret);
-	} while (ret != NULL 
-		 && kind != ICAL_VEVENT_COMPONENT
-		 && kind != ICAL_VTODO_COMPONENT
-		 && kind != ICAL_VFREEBUSY_COMPONENT);
-
-	return ret;
-}
-
-static void
-show_current (EItipControl *itip)
-{
-	EItipControlPrivate *priv;
-	ECalComponentVType type;
-	icalcomponent *alarm_comp;
-	icalcompiter alarm_iter;
-	icalproperty *prop;
-
-	priv = itip->priv;
-
-	g_object_ref (itip);
-	
-	if (priv->comp)
-		g_object_unref (priv->comp);
-	priv->current_ecal = NULL;
-
-	/* Determine any delegate sections */
-	prop = icalcomponent_get_first_property (priv->ical_comp, ICAL_X_PROPERTY);
-	while (prop) {
-		const char *x_name, *x_val;
-
-		x_name = icalproperty_get_x_name (prop);
-		x_val = icalproperty_get_x (prop);
-
-		if (!strcmp (x_name, "X-EVOLUTION-DELEGATOR-CALENDAR-UID"))
-			e_itip_control_set_calendar_uid (itip, x_val);
-		else if (!strcmp (x_name, "X-EVOLUTION-DELEGATOR-CALENDAR-URI"))
-			g_warning (G_STRLOC ": X-EVOLUTION-DELEGATOR-CALENDAR-URI used");
-		else if (!strcmp (x_name, "X-EVOLUTION-DELEGATOR-ADDRESS"))
-			e_itip_control_set_delegator_address (itip, x_val);
-		else if (!strcmp (x_name, "X-EVOLUTION-DELEGATOR-NAME"))
-			e_itip_control_set_delegator_name (itip, x_val);
-
-		prop = icalcomponent_get_next_property (priv->ical_comp, ICAL_X_PROPERTY);
-	}
-	
-	/* Strip out alarms for security purposes */
-	alarm_iter = icalcomponent_begin_component (priv->ical_comp, ICAL_VALARM_COMPONENT);
-	while ((alarm_comp = icalcompiter_deref (&alarm_iter)) != NULL) {
-		icalcomponent_remove_component (priv->ical_comp, alarm_comp);
-		
-		icalcompiter_next (&alarm_iter);
-	}
-
-	priv->comp = e_cal_component_new ();
-	if (!e_cal_component_set_icalcomponent (priv->comp, priv->ical_comp)) {
-		write_error_html (itip, _("The message does not appear to be properly formed"));
-		g_object_unref (priv->comp);
-		priv->comp = NULL;
-		g_object_unref (itip);
-		return;
-	};
-
-	/* Add default reminder if the config says so */
-	if (calendar_config_get_use_default_reminder ()) {
-		ECalComponentAlarm *acomp;
-		int interval;
-		CalUnits units;
-		ECalComponentAlarmTrigger trigger;
-
-		interval = calendar_config_get_default_reminder_interval ();
-		units = calendar_config_get_default_reminder_units ();
-
-		acomp = e_cal_component_alarm_new ();
-
-		e_cal_component_alarm_set_action (acomp, E_CAL_COMPONENT_ALARM_DISPLAY);
-
-		trigger.type = E_CAL_COMPONENT_ALARM_TRIGGER_RELATIVE_START;
-		memset (&trigger.u.rel_duration, 0, sizeof (trigger.u.rel_duration));
-
-		trigger.u.rel_duration.is_neg = TRUE;
-
-		switch (units) {
-		case CAL_MINUTES:
-			trigger.u.rel_duration.minutes = interval;
-			break;
-		case CAL_HOURS:	
-			trigger.u.rel_duration.hours = interval;
-			break;
-		case CAL_DAYS:	
-			trigger.u.rel_duration.days = interval;
-			break;
-		default:
-			g_assert_not_reached ();
-		}
-
-		e_cal_component_alarm_set_trigger (acomp, trigger);
-		e_cal_component_add_alarm (priv->comp, acomp);
-
-		e_cal_component_alarm_free (acomp);
-	}
-
-	type = e_cal_component_get_vtype (priv->comp);
-
-	switch (type) {
-	case E_CAL_COMPONENT_EVENT:
-		show_current_event (itip);
-		break;
-	case E_CAL_COMPONENT_TODO:
-		show_current_todo (itip);
-		break;
-	case E_CAL_COMPONENT_FREEBUSY:
-		show_current_freebusy (itip);
-		break;
-	default:
-		write_error_html (itip, _("The message contains only unsupported requests."));
-	}
-
-	find_my_address (itip, priv->ical_comp, NULL);
-
-	g_object_unref (itip);
-}
-
-void
-e_itip_control_set_data (EItipControl *itip, const gchar *text)
-{
-	EItipControlPrivate *priv;
-	icalproperty *prop;
-	icalcomponent_kind kind = ICAL_NO_COMPONENT;
-	icalcomponent *tz_comp;
-	icalcompiter tz_iter;
-
-	priv = itip->priv;
-	if (priv == NULL)
-		return;
-
-	clean_up (itip);
-
-	if (text == NULL || *text == '\0') {
-		gtk_html_load_from_string (GTK_HTML (priv->html), " ", 1);
-		return;
-	}
-	
-	priv->vcalendar = g_strdup (text);
-	priv->top_level = e_cal_util_new_top_level ();
-
-	priv->main_comp = icalparser_parse_string (priv->vcalendar);
-	if (priv->main_comp == NULL) {
-		write_error_html (itip, _("The attachment does not contain a valid calendar message"));
-		return;
-	}
-
-	prop = icalcomponent_get_first_property (priv->main_comp, ICAL_METHOD_PROPERTY);
-	if (prop == NULL) {
-		priv->method = ICAL_METHOD_PUBLISH;
-	} else {
-		priv->method = icalproperty_get_method (prop);
-	}
-
-	tz_iter = icalcomponent_begin_component (priv->main_comp, ICAL_VTIMEZONE_COMPONENT);
-	while ((tz_comp = icalcompiter_deref (&tz_iter)) != NULL) {
-		icalcomponent *clone;
-
-		clone = icalcomponent_new_clone (tz_comp);
-		icalcomponent_add_component (priv->top_level, clone);
-
-		icalcompiter_next (&tz_iter);
-	}
-
-	priv->iter = icalcomponent_begin_component (priv->main_comp, ICAL_ANY_COMPONENT);
-	priv->ical_comp = icalcompiter_deref (&priv->iter);
-	if (priv->ical_comp != NULL) {
-		kind = icalcomponent_isa (priv->ical_comp);
-		if (kind != ICAL_VEVENT_COMPONENT
-		    && kind != ICAL_VTODO_COMPONENT
-		    && kind != ICAL_VFREEBUSY_COMPONENT)
-			priv->ical_comp = get_next (&priv->iter);
-	}
-
-	if (priv->ical_comp == NULL) {
-		write_error_html (itip, _("The attachment has no viewable calendar items"));		
-		return;
-	}
-
-	priv->total = icalcomponent_count_components (priv->main_comp, ICAL_VEVENT_COMPONENT);
-	priv->total += icalcomponent_count_components (priv->main_comp, ICAL_VTODO_COMPONENT);
-	priv->total += icalcomponent_count_components (priv->main_comp, ICAL_VFREEBUSY_COMPONENT);
-
-	if (priv->total > 0)
-		priv->current = 1;
-	else
-		priv->current = 0;
-
-	show_current (itip);
-}
-
-gchar *
-e_itip_control_get_data (EItipControl *itip)
-{
-	EItipControlPrivate *priv;
-
-	priv = itip->priv;
-
-	return g_strdup (priv->vcalendar);
-}
-
-gint
-e_itip_control_get_data_size (EItipControl *itip)
-{
-	EItipControlPrivate *priv;
-
-	priv = itip->priv;
-
-	if (priv->vcalendar == NULL)
-		return 0;
-
-	return strlen (priv->vcalendar);
-}
-
-void
-e_itip_control_set_from_address (EItipControl *itip, const gchar *address)
-{
-	EItipControlPrivate *priv;
-
-	priv = itip->priv;
-
-	if (priv->from_address)
-		g_free (priv->from_address);
-
-	priv->from_address = g_strdup (address);
-}
-
-const gchar *
-e_itip_control_get_from_address (EItipControl *itip)
-{
-	EItipControlPrivate *priv;
-
-	priv = itip->priv;
-
-	return priv->from_address;
-}
-
-void
-e_itip_control_set_view_only (EItipControl *itip, gint view_only)
-{
-	EItipControlPrivate *priv;
-
-	priv = itip->priv;
-
-	priv->view_only = view_only;
-}
-
-gint
-e_itip_control_get_view_only (EItipControl *itip)
-{
-	EItipControlPrivate *priv;
-
-	priv = itip->priv;
-
-	return priv->view_only;
-}
-
-
-void
-e_itip_control_set_delegator_address (EItipControl *itip, const gchar *address)
-{
-	EItipControlPrivate *priv;
-
-	priv = itip->priv;
-
-	if (priv->delegator_address)
-		g_free (priv->delegator_address);
-
-	priv->delegator_address = g_strdup (address);
-}
-
-const gchar *
-e_itip_control_get_delegator_address (EItipControl *itip)
-{
-	EItipControlPrivate *priv;
-
-	priv = itip->priv;
-
-	return priv->delegator_address;
-}
-
-
-void
-e_itip_control_set_delegator_name (EItipControl *itip, const gchar *name)
-{
-	EItipControlPrivate *priv;
-
-	priv = itip->priv;
-
-	if (priv->delegator_name)
-		g_free (priv->delegator_name);
-
-	priv->delegator_name = g_strdup (name);
-}
-
-const gchar *
-e_itip_control_get_delegator_name (EItipControl *itip)
-{
-	EItipControlPrivate *priv;
-
-	priv = itip->priv;
-
-	return priv->delegator_name;
-}
-
-void
-e_itip_control_set_calendar_uid (EItipControl *itip, const gchar *uri)
-{
-	EItipControlPrivate *priv;
-
-	priv = itip->priv;
-
-	if (priv->calendar_uid)
-		g_free (priv->calendar_uid);
-
-	priv->calendar_uid = g_strdup (uri);
-}
-
-const gchar *
-e_itip_control_get_calendar_uid (EItipControl *itip)
-{
-	EItipControlPrivate *priv;
-
-	priv = itip->priv;
-
-	return priv->calendar_uid;
-}
-
-
-static gboolean
-change_status (icalcomponent *ical_comp, const char *address, icalparameter_partstat status)
-{
-	icalproperty *prop;
-
-	prop = find_attendee (ical_comp, address);
-	if (prop) {
-		icalparameter *param;
-
-		icalproperty_remove_parameter (prop, ICAL_PARTSTAT_PARAMETER);
-		param = icalparameter_new_partstat (status);
-		icalproperty_add_parameter (prop, param);
-	} else {
-		icalparameter *param;
-		
-		if (address != NULL) {
-			prop = icalproperty_new_attendee (address);
-			icalcomponent_add_property (ical_comp, prop);
-
-			param = icalparameter_new_role (ICAL_ROLE_OPTPARTICIPANT);
-			icalproperty_add_parameter (prop, param);
-
-			param = icalparameter_new_partstat (status);
-			icalproperty_add_parameter (prop, param);
-		} else {
-			EAccount *a;
-
-			a = itip_addresses_get_default ();
-			
-			prop = icalproperty_new_attendee (a->id->address);
-			icalcomponent_add_property (ical_comp, prop);
-			
-			param = icalparameter_new_cn (a->id->name);
-			icalproperty_add_parameter (prop, param);	
-
-			param = icalparameter_new_role (ICAL_ROLE_REQPARTICIPANT);
-			icalproperty_add_parameter (prop, param);
-			
-			param = icalparameter_new_partstat (status);
-			icalproperty_add_parameter (prop, param);
-		}
-	}
-
-	return TRUE;
-}
-
-static void
-update_item (EItipControl *itip)
-{
-	EItipControlPrivate *priv;
-	struct icaltimetype stamp;
-	icalproperty *prop;
-	icalcomponent *clone;
-	GtkWidget *dialog;
-	GError *error = NULL;
-
-	priv = itip->priv;
-
-	/* Set X-MICROSOFT-CDO-REPLYTIME to record the time at which
-	 * the user accepted/declined the request. (Outlook ignores
-	 * SEQUENCE in REPLY reponses and instead requires that each
-	 * updated response have a later REPLYTIME than the previous
-	 * one.) This also ends up getting saved in our own copy of
-	 * the meeting, though there's currently no way to see that
-	 * information (unless it's being saved to an Exchange folder
-	 * and you then look at it in Outlook).
-	 */
-	stamp = icaltime_current_time_with_zone (icaltimezone_get_utc_timezone ());
-	prop = icalproperty_new_x (icaltime_as_ical_string (stamp));
-	icalproperty_set_x_name (prop, "X-MICROSOFT-CDO-REPLYTIME");
-	icalcomponent_add_property (priv->ical_comp, prop);
-
-	clone = icalcomponent_new_clone (priv->ical_comp);
-	icalcomponent_add_component (priv->top_level, clone);
-	icalcomponent_set_method (priv->top_level, priv->method);
-
-	if (!e_cal_receive_objects (priv->current_ecal, priv->top_level, &error)) {
-		dialog = gnome_warning_dialog (error->message);
-		g_error_free (error);
-	} else {
-		dialog = gnome_ok_dialog (_("Update complete\n"));
-	}
-	gnome_dialog_run_and_close (GNOME_DIALOG (dialog));
-
-	icalcomponent_remove_component (priv->top_level, clone);
-}
-
-static void
-update_attendee_status (EItipControl *itip)
-{
-	EItipControlPrivate *priv;
-	ECalComponent *comp = NULL;
-	icalcomponent *icalcomp = NULL;
-	const char *uid;
-	GtkWidget *dialog;
-	GError *error;
-	
-	priv = itip->priv;
-	
-	/* Obtain our version */
-	e_cal_component_get_uid (priv->comp, &uid);
-	if (e_cal_get_object (priv->current_ecal, uid, NULL, &icalcomp, NULL)) {
-		GSList *attendees;
-
-		comp = e_cal_component_new ();
-		if (!e_cal_component_set_icalcomponent (comp, icalcomp)) {
-			icalcomponent_free (icalcomp);
-
-			dialog = gnome_warning_dialog (_("Object is invalid and cannot be updated\n"));
-		} else {
-			e_cal_component_get_attendee_list (priv->comp, &attendees);
-			if (attendees != NULL) {
-				ECalComponentAttendee *a = attendees->data;
-				icalproperty *prop;
-
-				prop = find_attendee (icalcomp, itip_strip_mailto (a->value));
-
-				if (prop == NULL) {
-					dialog = gnome_question_dialog_modal (_("This response is not from a current "
-										"attendee.  Add as an attendee?"),
-									      NULL, NULL);
-					if (gnome_dialog_run_and_close (GNOME_DIALOG (dialog)) == GNOME_YES) {
-						change_status (icalcomp,
-							       itip_strip_mailto (a->value),
-							       a->status);
-						e_cal_component_rescan (comp);
-					} else {
-						goto cleanup;
-					}
-				} else if (a->status == ICAL_PARTSTAT_NONE || a->status == ICAL_PARTSTAT_X) {
-					dialog = gnome_warning_dialog (_("Attendee status could "
-									 "not be updated because "
-									 "of an invalid status!\n"));
-					goto cleanup;
-				} else {
-					change_status (icalcomp,
-						       itip_strip_mailto (a->value),
-						       a->status);
-					e_cal_component_rescan (comp);			
-				}
-			}
-		}
-
-		if (!e_cal_modify_object (priv->current_ecal, icalcomp, CALOBJ_MOD_ALL, &error)) {
-			dialog = gnome_warning_dialog (error->message);
-			g_error_free (error);
-		} else {
-			dialog = gnome_ok_dialog (_("Attendee status updated\n"));
-		}
-	} else {
-		dialog = gnome_warning_dialog (_("Attendee status can not be updated "
-						 "because the item no longer exists"));
-	}
-
- cleanup:
-	if (comp != NULL)
-		g_object_unref (comp);
-	gnome_dialog_run_and_close (GNOME_DIALOG (dialog));
-}
-
-static void
-remove_item (EItipControl *itip)
-{
-	EItipControlPrivate *priv;
-	const char *uid;
-	GtkWidget *dialog;
-	GError *error = NULL;
-	
-	priv = itip->priv;
-
-	/* FIXME Is this check necessary? */
-	if (!priv->current_ecal)
-		return;
-	
-	e_cal_component_get_uid (priv->comp, &uid);
-	e_cal_remove_object (priv->current_ecal, uid, &error);
-	if (!error || error->code == E_CALENDAR_STATUS_OBJECT_NOT_FOUND) {
-		dialog = gnome_ok_dialog (_("Removal Complete"));
-		gnome_dialog_run_and_close (GNOME_DIALOG (dialog));
-	} else {
-		delete_error_dialog (error, e_cal_component_get_vtype (priv->comp));
-	}
-	
-	g_clear_error (&error);
-}
-
-static void
-send_item (EItipControl *itip)
-{
-	EItipControlPrivate *priv;
-	ECalComponent *comp;
-	GtkWidget *dialog;
-
-	priv = itip->priv;
-
-	comp = get_real_item (itip);
-	
-	if (comp != NULL) {
-		itip_send_comp (E_CAL_COMPONENT_METHOD_REQUEST, comp, priv->current_ecal, NULL, NULL);
-		g_object_unref (comp);
-		dialog = gnome_ok_dialog (_("Item sent!\n"));
-	} else {
-		dialog = gnome_warning_dialog (_("The item could not be sent!\n"));
-	}
-	gnome_dialog_run_and_close (GNOME_DIALOG (dialog));
-}
-
-static void
-send_freebusy (EItipControl *itip)
-{
-	EItipControlPrivate *priv;
-	ECalComponentDateTime datetime;
-	time_t start, end;
-	GtkWidget *dialog;
-	GList *comp_list = NULL;
-	icaltimezone *zone;
-
-	priv = itip->priv;
-
-	e_cal_component_get_dtstart (priv->comp, &datetime);
-	if (datetime.tzid) {
-		zone = icalcomponent_get_timezone (priv->top_level,
-						   datetime.tzid);
-	} else {
-		zone = NULL;
-	}
-	start = icaltime_as_timet_with_zone (*datetime.value, zone);
-	e_cal_component_free_datetime (&datetime);
-
-	e_cal_component_get_dtend (priv->comp, &datetime);
-	if (datetime.tzid) {
-		zone = icalcomponent_get_timezone (priv->top_level,
-						   datetime.tzid);
-	} else {
-		zone = NULL;
-	}
-	end = icaltime_as_timet_with_zone (*datetime.value, zone);
-	e_cal_component_free_datetime (&datetime);
-
-	if (e_cal_get_free_busy (priv->current_ecal, NULL, start, end, &comp_list, NULL)) {
-		GList *l;
-
-		for (l = comp_list; l; l = l->next) {
-			ECalComponent *comp = E_CAL_COMPONENT (l->data);
-			itip_send_comp (E_CAL_COMPONENT_METHOD_REPLY, comp, priv->current_ecal, NULL, NULL);
-
-			g_object_unref (comp);
-		}
-		dialog = gnome_ok_dialog (_("Item sent!\n"));
-
-		g_list_free (comp_list);
-	} else {
-		dialog = gnome_warning_dialog (_("The item could not be sent!\n"));
-	}
-	gnome_dialog_run_and_close (GNOME_DIALOG (dialog));
-}
-
-static void
-url_requested_cb (GtkHTML *html, const gchar *url, GtkHTMLStream *handle, gpointer data)
-{	unsigned char buffer[4096];
-	int len, fd;
-
-	if ((fd = open (url, O_RDONLY)) == -1) {
-		g_warning ("%s", g_strerror (errno));
-		return;
-	}
-
-       	while ((len = read (fd, buffer, 4096)) > 0) {
-		gtk_html_write (html, handle, buffer, len);
-	}
-
-	if (len < 0) {
-		/* check to see if we stopped because of an error */
-		gtk_html_end (html, handle, GTK_HTML_STREAM_ERROR);
-		g_warning ("%s", g_strerror (errno));
-		return;
-	}
-	/* done with no errors */
-	gtk_html_end (html, handle, GTK_HTML_STREAM_OK);
-	close (fd);
-}
-
-static void
-option_activated_cb (GtkWidget *widget, gpointer data)
-{
-	EItipControl *itip = E_ITIP_CONTROL (data);	
-	EItipControlPrivate *priv;
-	
-	priv = itip->priv;
-
-	priv->action = GPOINTER_TO_INT (g_object_get_data (G_OBJECT (widget), ACTION_DATA));
-}
-
-static void
-add_option (EItipControl *itip, GtkWidget *menu, const char *text, char action) 
-{
-	GtkWidget *item;
-	
-	item = gtk_menu_item_new_with_label (text);
-	g_signal_connect (item, "activate", G_CALLBACK (option_activated_cb), itip);
-	g_object_set_data (G_OBJECT (item), ACTION_DATA, GINT_TO_POINTER ((int)action));
-	gtk_menu_shell_append (GTK_MENU_SHELL (menu), item);
-	gtk_widget_show (item);
-	
-}
-
-static void
-insert_boxes (GtkHTMLEmbedded *eb, EItipControl *itip)
-{
-	EItipControlPrivate *priv;
-	
-	priv = itip->priv;
-
-	priv->vbox = gtk_vbox_new (FALSE, 12);
-	g_object_add_weak_pointer (G_OBJECT (priv->vbox), ((gpointer *)&priv->vbox));	
-
-	gtk_container_add (GTK_CONTAINER (eb), priv->vbox);
-	gtk_widget_show (priv->vbox);
-
-	priv->hbox = gtk_hbox_new (FALSE, 6);
-	g_object_add_weak_pointer (G_OBJECT (priv->hbox), ((gpointer *)&priv->hbox));
-
-	gtk_box_pack_start (GTK_BOX (priv->vbox), priv->hbox, FALSE, TRUE, 0);
-	gtk_widget_show (priv->hbox);
-}
-
-static void
-insert_label (GtkWidget *hbox) 
-{
-	GtkWidget *label;
-	char *text;
-	
-	text = g_strdup_printf ("<b>%s</b>", _("Choose an action:"));
-	label = gtk_label_new (NULL);
-	gtk_label_set_markup (GTK_LABEL (label), text);
-	g_free (text);
-
-	gtk_box_pack_start (GTK_BOX (hbox), label, FALSE, TRUE, 0);
-	gtk_widget_show (label);	
-}
-
-static void
-rsvp_clicked_cb (GtkWidget *widget, gpointer data)
-{
-	EItipControl *itip = E_ITIP_CONTROL (data);	
-	EItipControlPrivate *priv;
-	
-	priv = itip->priv;
-
-	priv->rsvp = gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (widget));
-}
-
-static void
-insert_rsvp (GtkWidget *hbox, EItipControl *itip) 
-{
-	EItipControlPrivate *priv;
-	GtkWidget *btn;
-
-	priv = itip->priv;
-	
-	btn = gtk_check_button_new_with_label ("RSVP");
-	gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (btn), TRUE);
-	priv->rsvp = TRUE;
-
-	g_signal_connect (btn, "clicked", G_CALLBACK (rsvp_clicked_cb), itip);
-
-	gtk_box_pack_start (GTK_BOX (hbox), btn, FALSE, TRUE, 0);
-	gtk_widget_show (btn);	
-}
-
-static void
-insert_ok (GtkWidget *hbox, EItipControl *itip) 
-{
-	EItipControlPrivate *priv;
-	
-	priv = itip->priv;
-	
-	priv->ok = gtk_button_new_from_stock (GTK_STOCK_OK);
-	g_object_add_weak_pointer (G_OBJECT (priv->ok), ((gpointer *)&priv->ok));
-
-	g_signal_connect (priv->ok, "clicked", G_CALLBACK (ok_clicked_cb), itip);
-
-	set_ok_sens (itip);
-
-	gtk_box_pack_start (GTK_BOX (hbox), priv->ok, FALSE, TRUE, 0);
-	gtk_widget_show (priv->ok);	
-}
-
-static gboolean
-publish_options_object (EItipControl *itip, GtkHTML *html, GtkHTMLEmbedded *eb)
-{
-	EItipControlPrivate *priv;
-	GtkWidget *option, *menu;
-	
-	priv = itip->priv;
-
-	insert_boxes (eb, itip);
-	insert_label (priv->hbox);
-
-	option = gtk_option_menu_new ();
-	
-	menu = gtk_menu_new ();
-
-	add_option (itip, menu, _("Update"), 'U');
-	priv->action = 'U';
-	
-	gtk_option_menu_set_menu (GTK_OPTION_MENU (option), menu);
-
-	gtk_box_pack_start (GTK_BOX (priv->hbox), option, FALSE, TRUE, 0);
-	gtk_widget_show (option);
-
-	insert_ok (priv->hbox, itip);
-
-	return TRUE;
-}
-
-static gboolean
-request_options_object (EItipControl *itip, GtkHTML *html, GtkHTMLEmbedded *eb)
-{
-	EItipControlPrivate *priv;
-	GtkWidget *option, *menu;
-	
-	priv = itip->priv;
-
-	insert_boxes (eb, itip);
-	insert_label (priv->hbox);
-	
-	option = gtk_option_menu_new ();
-	
-	menu = gtk_menu_new ();
-
-	add_option (itip, menu, _("Accept"), 'A');
-	add_option (itip, menu, _("Tentatively accept"), 'T');
-	add_option (itip, menu, _("Decline"), 'D');
-	priv->action = 'A';
-	
-	gtk_option_menu_set_menu (GTK_OPTION_MENU (option), menu);
-
-	gtk_box_pack_start (GTK_BOX (priv->hbox), option, FALSE, TRUE, 0);
-	gtk_widget_show (option);
-
-	insert_rsvp (priv->hbox, itip);
-	insert_ok (priv->hbox, itip);
-
-	return TRUE;
-}
-
-static gboolean
-freebusy_options_object (EItipControl *itip, GtkHTML *html, GtkHTMLEmbedded *eb)
-{
-	EItipControlPrivate *priv;
-	GtkWidget *option, *menu;
-	
-	priv = itip->priv;
-
-	insert_boxes (eb, itip);
-	insert_label (priv->hbox);
-
-	option = gtk_option_menu_new ();
-	
-	menu = gtk_menu_new ();
-
-	add_option (itip, menu, _("Send Free/Busy Information"), 'F');
-	priv->action = 'F';
-	
-	gtk_option_menu_set_menu (GTK_OPTION_MENU (option), menu);
-
-	gtk_container_add (GTK_CONTAINER (priv->hbox), option);
-	gtk_widget_show (option);
-
-	insert_ok (priv->hbox, itip);
-
-	return TRUE;
-}
-
-static gboolean
-reply_options_object (EItipControl *itip, GtkHTML *html, GtkHTMLEmbedded *eb)
-{
-	EItipControlPrivate *priv;
-	GtkWidget *option, *menu;
-	
-	priv = itip->priv;
-
-	insert_boxes (eb, itip);
-	insert_label (priv->hbox);
-
-	option = gtk_option_menu_new ();
-	
-	menu = gtk_menu_new ();
-
-	add_option (itip, menu, _("Update respondent status"), 'R');
-	priv->action = 'R';
-	
-	gtk_option_menu_set_menu (GTK_OPTION_MENU (option), menu);
-
-	gtk_container_add (GTK_CONTAINER (priv->hbox), option);
-	gtk_widget_show (option);
-
-	insert_ok (priv->hbox, itip);
-
-	return TRUE;
-}
-
-static gboolean
-refresh_options_object (EItipControl *itip, GtkHTML *html, GtkHTMLEmbedded *eb)
-{
-	EItipControlPrivate *priv;
-	GtkWidget *option, *menu;
-	
-	priv = itip->priv;
-
-	insert_boxes (eb, itip);
-	insert_label (priv->hbox);
-
-	option = gtk_option_menu_new ();
-	
-	menu = gtk_menu_new ();
-
-	add_option (itip, menu, _("Send Latest Information"), 'S');
-	priv->action = 'R';
-	
-	gtk_option_menu_set_menu (GTK_OPTION_MENU (option), menu);
-
-	gtk_container_add (GTK_CONTAINER (priv->hbox), option);
-	gtk_widget_show (option);
-
-	insert_ok (priv->hbox, itip);
-
-	return TRUE;
-}
-
-static gboolean
-cancel_options_object (EItipControl *itip, GtkHTML *html, GtkHTMLEmbedded *eb)
-{
-	EItipControlPrivate *priv;
-	GtkWidget *option, *menu;
-	
-	priv = itip->priv;
-
-	insert_boxes (eb, itip);
-	insert_label (priv->hbox);
-
-	option = gtk_option_menu_new ();
-	
-	menu = gtk_menu_new ();
-
-	add_option (itip, menu, _("Cancel"), 'C');
-	priv->action = 'C';
-	
-	gtk_option_menu_set_menu (GTK_OPTION_MENU (option), menu);
-
-	gtk_container_add (GTK_CONTAINER (priv->hbox), option);
-	gtk_widget_show (option);
-
-	insert_ok (priv->hbox, itip);
-
-	return TRUE;
-}
-
-static gboolean
-object_requested_cb (GtkHTML *html, GtkHTMLEmbedded *eb, gpointer data) 
-{
-	EItipControl *itip = E_ITIP_CONTROL (data);
-
-	if (!strcmp (eb->classid, "itip:publish_options"))
-		return publish_options_object (itip, html, eb);
-	else if (!strcmp (eb->classid, "itip:request_options"))
-		return request_options_object (itip, html, eb);
-	else if (!strcmp (eb->classid, "itip:freebusy_options"))
-		return freebusy_options_object (itip, html, eb);
-	else if (!strcmp (eb->classid, "itip:reply_options"))
-		return reply_options_object (itip, html, eb);
-	else if (!strcmp (eb->classid, "itip:refresh_options"))
-		return refresh_options_object (itip, html, eb);
-	else if (!strcmp (eb->classid, "itip:cancel_options"))
-		return cancel_options_object (itip, html, eb);
-	
-	return FALSE;
-}
-
-static void
-ok_clicked_cb (GtkWidget *widget, gpointer data)
-{
-	EItipControl *itip = E_ITIP_CONTROL (data);
-	EItipControlPrivate *priv;
-	gboolean status = FALSE;
-
-	priv = itip->priv;
-
-	if (!priv->my_address && priv->current_ecal != NULL)
-		e_cal_get_cal_address (priv->current_ecal, &priv->my_address, NULL);
-
-	switch (priv->action) {
-	case 'U':
-		update_item (itip);
-		break;
-	case 'A':
-		status = change_status (priv->ical_comp, priv->my_address, 
-					ICAL_PARTSTAT_ACCEPTED);
-		if (status) {
-			e_cal_component_rescan (priv->comp);
-			update_item (itip);
-		}
-		break;
-	case 'T':
-		status = change_status (priv->ical_comp, priv->my_address,
-					ICAL_PARTSTAT_TENTATIVE);
-		if (status) {
-			e_cal_component_rescan (priv->comp);
-			update_item (itip);
-		}
-		break;
-	case 'D':
-		status = change_status (priv->ical_comp, priv->my_address,
-					ICAL_PARTSTAT_DECLINED);
-		if (status) {
-			e_cal_component_rescan (priv->comp);
-			update_item (itip);
-		}
-		break;
-	case 'F':
-		send_freebusy (itip);
-		break;
-	case 'R':
-		update_attendee_status (itip);
-		break;
-	case 'S':
-		send_item (itip);
-		break;
-	case 'C':
-		update_item (itip);
-		break;
-	}
-
-	if (e_cal_get_save_schedules (priv->current_ecal))
-		return;
-
-	if (priv->rsvp && status) {
-		ECalComponent *comp = NULL;
-		ECalComponentVType vtype;
-		icalcomponent *ical_comp;
-		icalproperty *prop;
-		icalvalue *value;
-		const char *attendee;
-		GSList *l, *list = NULL;
-		
-		comp = e_cal_component_clone (priv->comp);
-		if (comp == NULL)
-			return;
-		vtype = e_cal_component_get_vtype (comp);
-		
-		if (priv->my_address == NULL)
-			find_my_address (itip, priv->ical_comp, NULL);
-		g_assert (priv->my_address != NULL);
-		
-		ical_comp = e_cal_component_get_icalcomponent (comp);
-		
-		for (prop = icalcomponent_get_first_property (ical_comp, ICAL_ATTENDEE_PROPERTY);
-		     prop != NULL;
-		     prop = icalcomponent_get_next_property (ical_comp, ICAL_ATTENDEE_PROPERTY))
-		{
-			char *text;
-			
-			value = icalproperty_get_value (prop);
-			if (!value)
-				continue;
-			
-			attendee = icalvalue_get_string (value);
-			
-			text = g_strdup (itip_strip_mailto (attendee));
-			text = g_strstrip (text);
-			if (g_strcasecmp (priv->my_address, text))
-				list = g_slist_prepend (list, prop);
-			g_free (text);
-		}
-		
-		for (l = list; l; l = l->next) {
-			prop = l->data;
-			icalcomponent_remove_property (ical_comp, prop);
-			icalproperty_free (prop);
-		}
-		g_slist_free (list);
-		
-		e_cal_component_rescan (comp);
-		itip_send_comp (E_CAL_COMPONENT_METHOD_REPLY, comp, priv->current_ecal, priv->top_level, NULL);
-
-		g_object_unref (comp);
-	}
-}
diff --git a/calendar/gui/e-itip-control.glade b/calendar/gui/e-itip-control.glade
deleted file mode 100644
index 344bcdeced..0000000000
--- a/calendar/gui/e-itip-control.glade
+++ /dev/null
@@ -1,493 +0,0 @@
-<?xml version="1.0" standalone="no"?> <!--*- mode: xml -*-->
-<!DOCTYPE glade-interface SYSTEM "http://glade.gnome.org/glade-2.0.dtd" >
-
-<glade-interface>
-  <widget class="GtkWindow" id="window1">
-    <property name="visible">no</property>
-    <property name="title" translatable="yes">window1</property>
-    <property name="type">GTK_WINDOW_TOPLEVEL</property>
-    <property name="modal">no</property>
-    <property name="allow_shrink">no</property>
-    <property name="allow_grow">yes</property>
-    <property name="window-position">GTK_WIN_POS_NONE</property>
-
-    <child>
-      <widget class="GtkFrame" id="main_frame">
-        <property name="border_width">4</property>
-        <property name="label" translatable="yes">Calendar Message</property>
-        <property name="label_xalign">0</property>
-        <property name="shadow">GTK_SHADOW_ETCHED_IN</property>
-        <property name="visible">yes</property>
-
-        <child>
-          <widget class="GtkScrolledWindow" id="scrolledwindow1">
-            <property name="hscrollbar_policy">GTK_POLICY_NEVER</property>
-            <property name="vscrollbar_policy">GTK_POLICY_NEVER</property>
-            <property name="visible">yes</property>
-
-            <child>
-              <widget class="GtkViewport" id="viewport1">
-                <property name="shadow_type">GTK_SHADOW_NONE</property>
-                <property name="visible">yes</property>
-
-                <child>
-                  <widget class="GtkVBox" id="vbox1">
-                    <property name="homogeneous">no</property>
-                    <property name="spacing">0</property>
-                    <property name="visible">yes</property>
-
-                    <child>
-                      <widget class="GtkTable" id="table1">
-                        <property name="border_width">3</property>
-                        <property name="homogeneous">no</property>
-                        <property name="row_spacing">3</property>
-                        <property name="column_spacing">3</property>
-                        <property name="n-rows">4</property>
-                        <property name="n-columns">2</property>
-                        <property name="visible">yes</property>
-
-                        <child>
-                          <widget class="GtkEntry" id="organizer_entry">
-                            <property name="can_focus">yes</property>
-                            <property name="editable">no</property>
-                            <property name="text" translatable="yes"></property>
-                            <property name="max-length">0</property>
-                            <property name="visibility">yes</property>
-                            <property name="visible">yes</property>
-                          </widget>
-                          <packing>
-                            <property name="left_attach">1</property>
-                            <property name="right_attach">2</property>
-                            <property name="top_attach">0</property>
-                            <property name="bottom_attach">1</property>
-                            <property name="x_padding">0</property>
-                            <property name="y_padding">0</property>
-                            <property name="x_options">expand|fill</property>
-                            <property name="y_options"></property>
-                          </packing>
-                        </child>
-
-                        <child>
-                          <widget class="GtkEntry" id="summary_entry">
-                            <property name="can_focus">yes</property>
-                            <property name="editable">no</property>
-                            <property name="text" translatable="yes"></property>
-                            <property name="max-length">0</property>
-                            <property name="visibility">yes</property>
-                            <property name="visible">yes</property>
-                          </widget>
-                          <packing>
-                            <property name="left_attach">1</property>
-                            <property name="right_attach">2</property>
-                            <property name="top_attach">2</property>
-                            <property name="bottom_attach">3</property>
-                            <property name="x_padding">0</property>
-                            <property name="y_padding">0</property>
-                            <property name="x_options">expand|fill</property>
-                            <property name="y_options"></property>
-                          </packing>
-                        </child>
-
-                        <child>
-                          <widget class="GtkScrolledWindow" id="scrolledwindow2">
-                            <property name="hscrollbar_policy">GTK_POLICY_AUTOMATIC</property>
-                            <property name="vscrollbar_policy">GTK_POLICY_AUTOMATIC</property>
-                            <property name="shadow_type">GTK_SHADOW_IN</property>
-                            <property name="visible">yes</property>
-
-                            <child>
-                              <widget class="GtkTextView" id="description_box">
-                                <property name="can_focus">yes</property>
-                                <property name="editable">no</property>
-                                <property name="text" translatable="yes"></property>
-                                <property name="wrap_mode">GTK_WRAP_WORD</property>
-                                <property name="visible">yes</property>
-                              </widget>
-                            </child>
-
-                            <child internal-child="hscrollbar">
-                              <widget class="GtkHScrollbar" id="convertwidget3">
-                                <property name="update_policy">GTK_UPDATE_CONTINUOUS</property>
-                                <property name="visible">yes</property>
-                              </widget>
-                            </child>
-
-                            <child internal-child="vscrollbar">
-                              <widget class="GtkVScrollbar" id="convertwidget4">
-                                <property name="update_policy">GTK_UPDATE_CONTINUOUS</property>
-                                <property name="visible">yes</property>
-                              </widget>
-                            </child>
-                          </widget>
-                          <packing>
-                            <property name="left_attach">1</property>
-                            <property name="right_attach">2</property>
-                            <property name="top_attach">3</property>
-                            <property name="bottom_attach">4</property>
-                            <property name="x_padding">0</property>
-                            <property name="y_padding">0</property>
-                            <property name="x_options">fill</property>
-                            <property name="y_options">fill</property>
-                          </packing>
-                        </child>
-
-                        <child>
-                          <widget class="GtkAlignment" id="alignment1">
-                            <property name="xalign">0</property>
-                            <property name="yalign">0</property>
-                            <property name="xscale">1</property>
-                            <property name="yscale">1</property>
-                            <property name="visible">yes</property>
-
-                            <child>
-                              <widget class="GtkHBox" id="hbox1">
-                                <property name="homogeneous">no</property>
-                                <property name="spacing">0</property>
-                                <property name="visible">yes</property>
-
-                                <child>
-                                  <widget class="GtkLabel" id="dtstart_label">
-                                    <property name="label" translatable="yes">date-start</property>
-                                    <property name="justify">GTK_JUSTIFY_CENTER</property>
-                                    <property name="wrap">no</property>
-                                    <property name="xalign">0.5</property>
-                                    <property name="yalign">0</property>
-                                    <property name="xpad">0</property>
-                                    <property name="ypad">0</property>
-                                    <property name="visible">yes</property>
-                                  </widget>
-                                  <packing>
-                                    <property name="padding">0</property>
-                                    <property name="expand">no</property>
-                                    <property name="fill">no</property>
-                                  </packing>
-                                </child>
-
-                                <child>
-                                  <widget class="GtkLabel" id="label3">
-                                    <property name="label" translatable="yes">--to--</property>
-                                    <property name="justify">GTK_JUSTIFY_CENTER</property>
-                                    <property name="wrap">no</property>
-                                    <property name="xalign">0.5</property>
-                                    <property name="yalign">0</property>
-                                    <property name="xpad">19</property>
-                                    <property name="ypad">0</property>
-                                    <property name="visible">yes</property>
-                                  </widget>
-                                  <packing>
-                                    <property name="padding">0</property>
-                                    <property name="expand">no</property>
-                                    <property name="fill">no</property>
-                                  </packing>
-                                </child>
-
-                                <child>
-                                  <widget class="GtkLabel" id="dtend_label">
-                                    <property name="label" translatable="yes">date-end</property>
-                                    <property name="justify">GTK_JUSTIFY_CENTER</property>
-                                    <property name="wrap">no</property>
-                                    <property name="xalign">0.5</property>
-                                    <property name="yalign">0.5</property>
-                                    <property name="xpad">0</property>
-                                    <property name="ypad">0</property>
-                                    <property name="visible">yes</property>
-                                  </widget>
-                                  <packing>
-                                    <property name="padding">0</property>
-                                    <property name="expand">no</property>
-                                    <property name="fill">no</property>
-                                  </packing>
-                                </child>
-                              </widget>
-                            </child>
-                          </widget>
-                          <packing>
-                            <property name="left_attach">1</property>
-                            <property name="right_attach">2</property>
-                            <property name="top_attach">1</property>
-                            <property name="bottom_attach">2</property>
-                            <property name="x_padding">0</property>
-                            <property name="y_padding">0</property>
-                            <property name="x_options">expand|fill</property>
-                            <property name="y_options">fill</property>
-                          </packing>
-                        </child>
-
-                        <child>
-                          <widget class="GtkLabel" id="label6">
-                            <property name="label" translatable="yes">Organizer:</property>
-                            <property name="justify">GTK_JUSTIFY_LEFT</property>
-                            <property name="wrap">no</property>
-                            <property name="xalign">0</property>
-                            <property name="yalign">0.5</property>
-                            <property name="xpad">0</property>
-                            <property name="ypad">0</property>
-                            <property name="visible">yes</property>
-                          </widget>
-                          <packing>
-                            <property name="left_attach">0</property>
-                            <property name="right_attach">1</property>
-                            <property name="top_attach">0</property>
-                            <property name="bottom_attach">1</property>
-                            <property name="x_padding">0</property>
-                            <property name="y_padding">0</property>
-                            <property name="x_options">fill</property>
-                            <property name="y_options"></property>
-                          </packing>
-                        </child>
-
-                        <child>
-                          <widget class="GtkLabel" id="label7">
-                            <property name="label" translatable="yes">Date:</property>
-                            <property name="justify">GTK_JUSTIFY_LEFT</property>
-                            <property name="wrap">no</property>
-                            <property name="xalign">0</property>
-                            <property name="yalign">0</property>
-                            <property name="xpad">0</property>
-                            <property name="ypad">0</property>
-                            <property name="visible">yes</property>
-                          </widget>
-                          <packing>
-                            <property name="left_attach">0</property>
-                            <property name="right_attach">1</property>
-                            <property name="top_attach">1</property>
-                            <property name="bottom_attach">2</property>
-                            <property name="x_padding">0</property>
-                            <property name="y_padding">0</property>
-                            <property name="x_options">fill</property>
-                            <property name="y_options"></property>
-                          </packing>
-                        </child>
-
-                        <child>
-                          <widget class="GtkLabel" id="label8">
-                            <property name="label" translatable="yes">Summary:</property>
-                            <property name="justify">GTK_JUSTIFY_LEFT</property>
-                            <property name="wrap">no</property>
-                            <property name="xalign">0</property>
-                            <property name="yalign">0.5</property>
-                            <property name="xpad">0</property>
-                            <property name="ypad">0</property>
-                            <property name="visible">yes</property>
-                          </widget>
-                          <packing>
-                            <property name="left_attach">0</property>
-                            <property name="right_attach">1</property>
-                            <property name="top_attach">2</property>
-                            <property name="bottom_attach">3</property>
-                            <property name="x_padding">0</property>
-                            <property name="y_padding">0</property>
-                            <property name="x_options">fill</property>
-                            <property name="y_options"></property>
-                          </packing>
-                        </child>
-
-                        <child>
-                          <widget class="GtkLabel" id="label9">
-                            <property name="label" translatable="yes">Description:</property>
-                            <property name="justify">GTK_JUSTIFY_LEFT</property>
-                            <property name="wrap">no</property>
-                            <property name="xalign">0</property>
-                            <property name="yalign">0</property>
-                            <property name="xpad">0</property>
-                            <property name="ypad">0</property>
-                            <property name="visible">yes</property>
-                          </widget>
-                          <packing>
-                            <property name="left_attach">0</property>
-                            <property name="right_attach">1</property>
-                            <property name="top_attach">3</property>
-                            <property name="bottom_attach">4</property>
-                            <property name="x_padding">0</property>
-                            <property name="y_padding">0</property>
-                            <property name="x_options">fill</property>
-                            <property name="y_options">fill</property>
-                          </packing>
-                        </child>
-                      </widget>
-                      <packing>
-                        <property name="padding">6</property>
-                        <property name="expand">yes</property>
-                        <property name="fill">yes</property>
-                      </packing>
-                    </child>
-
-                    <child>
-                      <widget class="GtkLabel" id="label12">
-                        <property name="label" translatable="yes">Server Message:</property>
-                        <property name="justify">GTK_JUSTIFY_LEFT</property>
-                        <property name="wrap">no</property>
-                        <property name="xalign">7.45058e-09</property>
-                        <property name="yalign">0.5</property>
-                        <property name="xpad">3</property>
-                        <property name="ypad">0</property>
-                        <property name="visible">yes</property>
-                      </widget>
-                      <packing>
-                        <property name="padding">0</property>
-                        <property name="expand">no</property>
-                        <property name="fill">no</property>
-                      </packing>
-                    </child>
-
-                    <child>
-                      <widget class="GtkScrolledWindow" id="scrolledwindow3">
-                        <property name="border_width">3</property>
-                        <property name="hscrollbar_policy">GTK_POLICY_NEVER</property>
-                        <property name="vscrollbar_policy">GTK_POLICY_AUTOMATIC</property>
-                        <property name="shadow_type">GTK_SHADOW_IN</property>
-                        <property name="width-request">365</property>
-                        <property name="visible">yes</property>
-
-                        <child>
-                          <widget class="GtkTextView" id="message_text">
-                            <property name="can_focus">yes</property>
-                            <property name="editable">no</property>
-                            <property name="text" translatable="yes"></property>
-                            <property name="wrap_mode">GTK_WRAP_WORD</property>
-                            <property name="visible">yes</property>
-                          </widget>
-                        </child>
-
-                        <child internal-child="hscrollbar">
-                          <widget class="GtkHScrollbar" id="convertwidget5">
-                            <property name="update_policy">GTK_UPDATE_CONTINUOUS</property>
-                            <property name="visible">yes</property>
-                          </widget>
-                        </child>
-
-                        <child internal-child="vscrollbar">
-                          <widget class="GtkVScrollbar" id="convertwidget6">
-                            <property name="update_policy">GTK_UPDATE_CONTINUOUS</property>
-                            <property name="visible">yes</property>
-                          </widget>
-                        </child>
-                      </widget>
-                      <packing>
-                        <property name="padding">0</property>
-                        <property name="expand">yes</property>
-                        <property name="fill">no</property>
-                      </packing>
-                    </child>
-
-                    <child>
-                      <widget class="GtkHBox" id="button_box">
-                        <property name="border_width">3</property>
-                        <property name="homogeneous">no</property>
-                        <property name="spacing">0</property>
-                        <property name="height-request">30</property>
-                        <property name="visible">yes</property>
-
-                        <child>
-                          <placeholder />
-                        </child>
-                      </widget>
-                      <packing>
-                        <property name="padding">0</property>
-                        <property name="expand">no</property>
-                        <property name="fill">no</property>
-                      </packing>
-                    </child>
-                  </widget>
-                </child>
-              </widget>
-            </child>
-
-            <child internal-child="hscrollbar">
-              <widget class="GtkHScrollbar" id="convertwidget1">
-                <property name="update_policy">GTK_UPDATE_CONTINUOUS</property>
-                <property name="visible">yes</property>
-              </widget>
-            </child>
-
-            <child internal-child="vscrollbar">
-              <widget class="GtkVScrollbar" id="convertwidget2">
-                <property name="update_policy">GTK_UPDATE_CONTINUOUS</property>
-                <property name="visible">yes</property>
-              </widget>
-            </child>
-          </widget>
-        </child>
-      </widget>
-    </child>
-  </widget>
-  <widget class="GtkWindow" id="loading_window">
-    <property name="visible">no</property>
-    <property name="title" translatable="yes">Loading Calendar</property>
-    <property name="type">GTK_WINDOW_DIALOG</property>
-    <property name="modal">no</property>
-    <property name="allow_shrink">no</property>
-    <property name="allow_grow">yes</property>
-    <property name="window-position">GTK_WIN_POS_CENTER</property>
-
-    <child>
-      <widget class="GtkFrame" id="frame1">
-        <property name="border_width">4</property>
-        <property name="label" translatable="yes"></property>
-        <property name="label_xalign">0</property>
-        <property name="shadow">GTK_SHADOW_ETCHED_OUT</property>
-        <property name="visible">yes</property>
-
-        <child>
-          <widget class="GtkVBox" id="vbox2">
-            <property name="border_width">7</property>
-            <property name="homogeneous">no</property>
-            <property name="spacing">1</property>
-            <property name="visible">yes</property>
-
-            <child>
-              <widget class="GtkHBox" id="hbox2">
-                <property name="border_width">6</property>
-                <property name="homogeneous">no</property>
-                <property name="spacing">9</property>
-                <property name="visible">yes</property>
-
-                <child>
-                  <widget class="GtkLabel" id="label10">
-                    <property name="label" translatable="yes">Loading calendar...</property>
-                    <property name="justify">GTK_JUSTIFY_CENTER</property>
-                    <property name="wrap">no</property>
-                    <property name="xalign">0.5</property>
-                    <property name="yalign">0.5</property>
-                    <property name="xpad">0</property>
-                    <property name="ypad">0</property>
-                    <property name="visible">yes</property>
-                  </widget>
-                  <packing>
-                    <property name="padding">0</property>
-                    <property name="expand">no</property>
-                    <property name="fill">no</property>
-                  </packing>
-                </child>
-
-                <child>
-                  <widget class="GtkProgressBar" id="loading_progress">
-                    <property name="bar_style">GTK_PROGRESS_CONTINUOUS</property>
-                    <property name="orientation">GTK_PROGRESS_LEFT_TO_RIGHT</property>
-                    <property name="activity_mode">no</property>
-                    <property name="show_text">no</property>
-                    <property name="format" translatable="yes">%P %%</property>
-                    <property name="text_xalign">0.5</property>
-                    <property name="text_yalign">0.5</property>
-                    <property name="visible">yes</property>
-                    <property name="adjustment">0 0 100 1 10 10</property>
-                  </widget>
-                  <packing>
-                    <property name="padding">0</property>
-                    <property name="expand">no</property>
-                    <property name="fill">no</property>
-                  </packing>
-                </child>
-              </widget>
-              <packing>
-                <property name="padding">0</property>
-                <property name="expand">no</property>
-                <property name="fill">no</property>
-              </packing>
-            </child>
-          </widget>
-        </child>
-      </widget>
-    </child>
-  </widget>
-</glade-interface>
diff --git a/calendar/gui/e-itip-control.h b/calendar/gui/e-itip-control.h
deleted file mode 100644
index 1a1e3e6eb9..0000000000
--- a/calendar/gui/e-itip-control.h
+++ /dev/null
@@ -1,77 +0,0 @@
-/* -*- Mode: C; indent-tabs-mode: t; c-basic-offset: 8; tab-width: 8 -*- */
-/* e-itip-control.h
- *
- * Copyright (C) 2001  Ximian, Inc.
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of version 2 of the GNU General Public
- * License as published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * General Public License for more details.
- *
- * You should have received a copy of the GNU General Public
- * License along with this program; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
- *
- * Author: JP Rosevear
- */
-
-#ifndef _E_ITIP_CONTROL_H_
-#define _E_ITIP_CONTROL_H_
-
-#include <gtk/gtk.h>
-
-G_BEGIN_DECLS
-
-#define E_TYPE_ITIP_CONTROL			(e_itip_control_get_type ())
-#define E_ITIP_CONTROL(obj)			(GTK_CHECK_CAST ((obj), E_TYPE_ITIP_CONTROL, EItipControl))
-#define E_ITIP_CONTROL_CLASS(klass)		(GTK_CHECK_CLASS_CAST ((klass), E_TYPE_ITIP_CONTROL, EItipControlClass))
-#define E_IS_ITIP_CONTROL(obj)			(GTK_CHECK_TYPE ((obj), E_TYPE_ITIP_CONTROL))
-#define E_IS_ITIP_CONTROL_CLASS(klass)		(GTK_CHECK_CLASS_TYPE ((obj), E_TYPE_ITIP_CONTROL))
-
-
-typedef struct _EItipControl        EItipControl;
-typedef struct _EItipControlPrivate EItipControlPrivate;
-typedef struct _EItipControlClass   EItipControlClass;
-
-struct _EItipControl {
-	GtkVBox parent;
-
-	EItipControlPrivate *priv;
-};
-
-struct _EItipControlClass {
-	GtkVBoxClass parent_class;
-};
-
-
-
-GtkType      e_itip_control_get_type         (void);
-GtkWidget *  e_itip_control_new              (void);
-void         e_itip_control_set_data         (EItipControl *itip,
-					      const gchar  *text);
-gchar *      e_itip_control_get_data         (EItipControl *itip);
-gint         e_itip_control_get_data_size    (EItipControl *itip);
-void         e_itip_control_set_from_address (EItipControl *itip,
-					      const gchar  *address);
-const gchar *e_itip_control_get_from_address (EItipControl *itip);
-void         e_itip_control_set_view_only (EItipControl *itip, 
-					   gboolean view_only);
-gboolean     e_itip_control_get_view_only (EItipControl *itip);
-void         e_itip_control_set_delegator_address   (EItipControl *itip,
-						    const gchar  *address);
-const gchar *e_itip_control_get_delegator_address   (EItipControl *itip);
-void         e_itip_control_set_delegator_name   (EItipControl *itip,
-						 const gchar  *name);
-const gchar *e_itip_control_get_delegator_name   (EItipControl *itip);
-void         e_itip_control_set_calendar_uid (EItipControl *itip,
-					      const gchar  *uid);
-const gchar *e_itip_control_get_calendar_uid (EItipControl *itip);
-
-G_END_DECLS
-
-#endif /* _E_ITIP_CONTROL_H_ */
diff --git a/calendar/gui/e-meeting-attendee.c b/calendar/gui/e-meeting-attendee.c
deleted file mode 100644
index e66667fd0b..0000000000
--- a/calendar/gui/e-meeting-attendee.c
+++ /dev/null
@@ -1,992 +0,0 @@
-/* -*- Mode: C; indent-tabs-mode: t; c-basic-offset: 8; tab-width: 8 -*- */
-/* e-attendee.c
- *
- * Copyright (C) 2001  Ximian, Inc.
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of version 2 of the GNU General Public
- * License as published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * General Public License for more details.
- *
- * You should have received a copy of the GNU General Public
- * License along with this program; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
- *
- * Author: JP Rosevear
- */
-
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
-
-#include <stdlib.h>
-#include <gtk/gtk.h>
-#include "e-meeting-attendee.h"
-
-struct _EMeetingAttendeePrivate {
-	gchar *address;
-	gchar *member;
-
-	icalparameter_cutype cutype;
-	icalparameter_role role;
-
-	gboolean rsvp;
-
-	gchar *delto;
-	gchar *delfrom;
-
-	icalparameter_partstat status;
-	
-	gchar *sentby;
-	gchar *cn;
-	gchar *language;
-
-	EMeetingAttendeeEditLevel edit_level;
-
-	gboolean has_calendar_info;
-
-	GArray *busy_periods;
-	gboolean busy_periods_sorted;
-
-	EMeetingTime busy_periods_start;
-	EMeetingTime busy_periods_end;
-	gboolean start_busy_range_set;
-	gboolean end_busy_range_set;
-	
-	gint longest_period_in_days;
-};
-
-enum {
-	CHANGED,
-	LAST_SIGNAL
-};
-static guint signals[LAST_SIGNAL];
-
-static void e_meeting_attendee_finalize	(GObject *obj);
-
-G_DEFINE_TYPE (EMeetingAttendee, e_meeting_attendee, G_TYPE_OBJECT);
-
-static void
-e_meeting_attendee_class_init (EMeetingAttendeeClass *klass)
-{
-	GObjectClass *object_class;
-
-	object_class = G_OBJECT_CLASS (klass);
-
-	signals[CHANGED] =
-		g_signal_new ("changed",
-			      G_TYPE_FROM_CLASS (klass),
-			      G_SIGNAL_RUN_FIRST,
-			      G_STRUCT_OFFSET (EMeetingAttendeeClass, changed),
-			      NULL, NULL,
-			      g_cclosure_marshal_VOID__VOID,
-			      G_TYPE_NONE, 0);
-
-	object_class->finalize = e_meeting_attendee_finalize;
-}
-
-static gchar *
-string_test (gchar *string)
-{
-	return string != NULL ? string : g_strdup ("");
-}
-
-static gboolean
-string_is_set (gchar *string) 
-{
-	if (string != NULL && *string != '\0')
-		return TRUE;
-	
-	return FALSE;
-}
-
-static void
-notify_changed (EMeetingAttendee *ia) 
-{
-	g_signal_emit_by_name (G_OBJECT (ia), "changed");
-}
-
-static void
-e_meeting_attendee_init (EMeetingAttendee *ia)
-{
-	EMeetingAttendeePrivate *priv;
-
-	priv = g_new0 (EMeetingAttendeePrivate, 1);
-
-	ia->priv = priv;
-
-	priv->address = string_test (NULL);
-	priv->member = string_test (NULL);
-
-	priv->cutype = ICAL_CUTYPE_NONE;
-	priv->role = ICAL_ROLE_NONE;
-
-	priv->rsvp = FALSE;
-
-	priv->delto = string_test (NULL);
-	priv->delfrom = string_test (NULL);
-	
-	priv->status = ICAL_PARTSTAT_NONE;
-	
-	priv->sentby = string_test (NULL);
-	priv->cn = string_test (NULL);
-	priv->language = string_test (NULL);
-
-	priv->edit_level = E_MEETING_ATTENDEE_EDIT_FULL;
-	priv->has_calendar_info = FALSE;
-	
-	priv->busy_periods = g_array_new (FALSE, FALSE, sizeof (EMeetingFreeBusyPeriod));
-	priv->busy_periods_sorted = FALSE;
-
-	g_date_clear (&priv->busy_periods_start.date, 1);
-	priv->busy_periods_start.hour = 0;
-	priv->busy_periods_start.minute = 0;
-
-	g_date_clear (&priv->busy_periods_end.date, 1);
-	priv->busy_periods_end.hour = 0;
-	priv->busy_periods_end.minute = 0;
-
-	priv->start_busy_range_set = FALSE;
-	priv->end_busy_range_set = FALSE;
-	
-	priv->longest_period_in_days = 0;
-}
-
-
-static void
-e_meeting_attendee_finalize (GObject *obj)
-{
-	EMeetingAttendee *ia = E_MEETING_ATTENDEE (obj);
-	EMeetingAttendeePrivate *priv;
-
-	priv = ia->priv;
-
-	g_free (priv->address);
-	g_free (priv->member);
-
-	g_free (priv->delto);
-	g_free (priv->delfrom);
-
-	g_free (priv->sentby);
-	g_free (priv->cn);
-	g_free (priv->language);
-	
-	g_array_free (priv->busy_periods, TRUE);
-	
-	g_free (priv);
-
-	if (G_OBJECT_CLASS (e_meeting_attendee_parent_class)->finalize)
-		(* G_OBJECT_CLASS (e_meeting_attendee_parent_class)->finalize) (obj);
-}
-
-GObject *
-e_meeting_attendee_new (void)
-{
-	return g_object_new (E_TYPE_MEETING_ATTENDEE, NULL);
-}
-
-GObject *
-e_meeting_attendee_new_from_e_cal_component_attendee (ECalComponentAttendee *ca)
-{
-	EMeetingAttendee *ia;
-	
-	ia = E_MEETING_ATTENDEE (g_object_new (E_TYPE_MEETING_ATTENDEE, NULL));
-
-	e_meeting_attendee_set_address (ia, g_strdup (ca->value));
-	e_meeting_attendee_set_member (ia, g_strdup (ca->member));
-	e_meeting_attendee_set_cutype (ia, ca->cutype);
-	e_meeting_attendee_set_role (ia, ca->role);
-	e_meeting_attendee_set_status (ia, ca->status);
-	e_meeting_attendee_set_rsvp (ia, ca->rsvp);
-	e_meeting_attendee_set_delto (ia, g_strdup (ca->delto));
-	e_meeting_attendee_set_delfrom (ia, g_strdup (ca->delfrom));
-	e_meeting_attendee_set_sentby (ia, g_strdup (ca->sentby));
-	e_meeting_attendee_set_cn (ia, g_strdup (ca->cn));
-	e_meeting_attendee_set_language (ia, g_strdup (ca->language));
-	
-	return G_OBJECT (ia);
-}
-
-ECalComponentAttendee *
-e_meeting_attendee_as_e_cal_component_attendee (EMeetingAttendee *ia)
-{
-	EMeetingAttendeePrivate *priv;
-	ECalComponentAttendee *ca;
-
-	priv = ia->priv;
-	
-	ca = g_new0 (ECalComponentAttendee, 1);
-
-	ca->value = priv->address;
-	ca->member = string_is_set (priv->member) ? priv->member : NULL;
-	ca->cutype= priv->cutype;
-	ca->role = priv->role;
-	ca->status = priv->status;
-	ca->rsvp = priv->rsvp;
-	ca->delto = string_is_set (priv->delto) ? priv->delto : NULL;
-	ca->delfrom = string_is_set (priv->delfrom) ? priv->delfrom : NULL;
-	ca->sentby = string_is_set (priv->sentby) ? priv->sentby : NULL;
-	ca->cn = string_is_set (priv->cn) ? priv->cn : NULL;
-	ca->language = string_is_set (priv->language) ? priv->language : NULL;
-
-	return ca;
-}
-
-
-const gchar *
-e_meeting_attendee_get_address (EMeetingAttendee *ia)
-{
-	EMeetingAttendeePrivate *priv;
-	
-	priv = ia->priv;
-	
-	return priv->address;
-}
-
-void
-e_meeting_attendee_set_address (EMeetingAttendee *ia, gchar *address)
-{
-	EMeetingAttendeePrivate *priv;
-	
-	priv = ia->priv;
-	
-	if (priv->address != NULL)
-		g_free (priv->address);
-	
-	priv->address = string_test (address);
-
-	notify_changed (ia);
-}
-
-gboolean
-e_meeting_attendee_is_set_address (EMeetingAttendee *ia)
-{
-	EMeetingAttendeePrivate *priv;
-	
-	priv = ia->priv;
-	
-	return string_is_set (priv->address);
-}
-
-const gchar *
-e_meeting_attendee_get_member (EMeetingAttendee *ia)
-{
-	EMeetingAttendeePrivate *priv;
-	
-	priv = ia->priv;
-	
-	return priv->member;
-}
-
-void
-e_meeting_attendee_set_member (EMeetingAttendee *ia, gchar *member)
-{
-	EMeetingAttendeePrivate *priv;
-	
-	priv = ia->priv;
-	
-	if (priv->member != NULL)
-		g_free (priv->member);
-	
-	priv->member = string_test (member);
-
-	notify_changed (ia);
-}
-
-gboolean
-e_meeting_attendee_is_set_member (EMeetingAttendee *ia)
-{
-	EMeetingAttendeePrivate *priv;
-	
-	priv = ia->priv;
-
-	return string_is_set (priv->member);
-}
-
-icalparameter_cutype
-e_meeting_attendee_get_cutype (EMeetingAttendee *ia)
-{
-	EMeetingAttendeePrivate *priv;
-	
-	priv = ia->priv;
-	
-	return priv->cutype;
-}
-
-void 
-e_meeting_attendee_set_cutype (EMeetingAttendee *ia, icalparameter_cutype cutype)
-{
-	EMeetingAttendeePrivate *priv;
-	
-	priv = ia->priv;
-	
-	priv->cutype = cutype;
-
-	notify_changed (ia);
-}
-
-icalparameter_role
-e_meeting_attendee_get_role (EMeetingAttendee *ia)
-{
-	EMeetingAttendeePrivate *priv;
-	
-	priv = ia->priv;
-	
-	return priv->role;
-}
-
-void
-e_meeting_attendee_set_role (EMeetingAttendee *ia, icalparameter_role role)
-{
-	EMeetingAttendeePrivate *priv;
-	
-	priv = ia->priv;
-	
-	priv->role = role;
-
-	notify_changed (ia);
-}
-
-gboolean 
-e_meeting_attendee_get_rsvp (EMeetingAttendee *ia)
-{
-	EMeetingAttendeePrivate *priv;
-	
-	priv = ia->priv;
-	
-	return priv->rsvp;
-}
-
-void
-e_meeting_attendee_set_rsvp (EMeetingAttendee *ia, gboolean rsvp)
-{
-	EMeetingAttendeePrivate *priv;
-	
-	priv = ia->priv;
-	
-	priv->rsvp = rsvp;
-
-	notify_changed (ia);
-}
-
-const gchar *
-e_meeting_attendee_get_delto (EMeetingAttendee *ia)
-{
-	EMeetingAttendeePrivate *priv;
-	
-	priv = ia->priv;
-	
-	return priv->delto;
-}
-
-void
-e_meeting_attendee_set_delto (EMeetingAttendee *ia, gchar *delto)
-{
-	EMeetingAttendeePrivate *priv;
-	
-	priv = ia->priv;
-	
-	if (priv->delto != NULL)
-		g_free (priv->delto);
-	
-	priv->delto = string_test (delto);
-
-	notify_changed (ia);
-}
-
-gboolean
-e_meeting_attendee_is_set_delto (EMeetingAttendee *ia)
-{
-	EMeetingAttendeePrivate *priv;
-	
-	priv = ia->priv;
-
-	return string_is_set (priv->delto);
-}
-
-const gchar *
-e_meeting_attendee_get_delfrom (EMeetingAttendee *ia)
-{
-	EMeetingAttendeePrivate *priv;
-	
-	priv = ia->priv;
-	
-	return priv->delfrom;
-}
-
-void
-e_meeting_attendee_set_delfrom (EMeetingAttendee *ia, gchar *delfrom)
-{
-	EMeetingAttendeePrivate *priv;
-	
-	priv = ia->priv;
-	
-	if (priv->delfrom != NULL)
-		g_free (priv->delfrom);
-	
-	priv->delfrom = string_test (delfrom);
-
-	notify_changed (ia);
-}
-
-gboolean
-e_meeting_attendee_is_set_delfrom (EMeetingAttendee *ia)
-{
-	EMeetingAttendeePrivate *priv;
-	
-	priv = ia->priv;
-
-	return string_is_set (priv->delfrom);
-}
-
-icalparameter_partstat
-e_meeting_attendee_get_status (EMeetingAttendee *ia)
-{
-	EMeetingAttendeePrivate *priv;
-	
-	priv = ia->priv;
-	
-	return priv->status;
-}
-
-void
-e_meeting_attendee_set_status (EMeetingAttendee *ia, icalparameter_partstat status)
-{
-	EMeetingAttendeePrivate *priv;
-	
-	priv = ia->priv;
-	
-	priv->status = status;
-
-	notify_changed (ia);
-}
-
-const gchar *
-e_meeting_attendee_get_sentby (EMeetingAttendee *ia)
-{
-	EMeetingAttendeePrivate *priv;
-	
-	priv = ia->priv;
-	
-	return priv->sentby;
-}
-
-void
-e_meeting_attendee_set_sentby (EMeetingAttendee *ia, gchar *sentby)
-{
-	EMeetingAttendeePrivate *priv;
-	
-	priv = ia->priv;
-	
-	if (priv->sentby != NULL)
-		g_free (priv->sentby);
-	
-	priv->sentby = string_test (sentby);
-
-	notify_changed (ia);
-}
-
-gboolean
-e_meeting_attendee_is_set_sentby (EMeetingAttendee *ia)
-{
-	EMeetingAttendeePrivate *priv;
-	
-	priv = ia->priv;
-
-	return string_is_set (priv->sentby);
-}
-
-const gchar *
-e_meeting_attendee_get_cn (EMeetingAttendee *ia)
-{
-	EMeetingAttendeePrivate *priv;
-	
-	priv = ia->priv;
-	
-	return priv->cn;
-}
-
-void
-e_meeting_attendee_set_cn (EMeetingAttendee *ia, gchar *cn)
-{
-	EMeetingAttendeePrivate *priv;
-	
-	priv = ia->priv;
-	
-	if (priv->cn != NULL)
-		g_free (priv->cn);
-	
-	priv->cn = string_test (cn);
-
-	notify_changed (ia);
-}
-
-gboolean
-e_meeting_attendee_is_set_cn (EMeetingAttendee *ia)
-{
-	EMeetingAttendeePrivate *priv;
-	
-	priv = ia->priv;
-
-	return string_is_set (priv->cn);
-}
-
-const gchar *
-e_meeting_attendee_get_language (EMeetingAttendee *ia)
-{
-	EMeetingAttendeePrivate *priv;
-	
-	priv = ia->priv;
-	
-	return priv->language;
-}
-
-void
-e_meeting_attendee_set_language (EMeetingAttendee *ia, gchar *language)
-{
-	EMeetingAttendeePrivate *priv;
-	
-	priv = ia->priv;
-	
-	if (priv->language != NULL)
-		g_free (priv->language);
-	
-	priv->language = string_test (language);
-
-	notify_changed (ia);
-}
-
-gboolean
-e_meeting_attendee_is_set_language (EMeetingAttendee *ia)
-{
-	EMeetingAttendeePrivate *priv;
-	
-	priv = ia->priv;
-
-	return string_is_set (priv->language);
-}
-
-EMeetingAttendeeType
-e_meeting_attendee_get_atype (EMeetingAttendee *ia)
-{
-	EMeetingAttendeePrivate *priv;
-	
-	priv = ia->priv;
-
-	if (priv->cutype == ICAL_CUTYPE_ROOM
-	    || priv->cutype == ICAL_CUTYPE_RESOURCE)
-		return E_MEETING_ATTENDEE_RESOURCE;
-
-	if (priv->role == ICAL_ROLE_CHAIR
-	    || priv->role == ICAL_ROLE_REQPARTICIPANT)
-		return E_MEETING_ATTENDEE_REQUIRED_PERSON;
-	
-	return E_MEETING_ATTENDEE_OPTIONAL_PERSON;
-}
-
-
-EMeetingAttendeeEditLevel
-e_meeting_attendee_get_edit_level (EMeetingAttendee *ia)
-{
-	EMeetingAttendeePrivate *priv;
-	
-	g_return_val_if_fail (ia != NULL, E_MEETING_ATTENDEE_EDIT_NONE);
-	g_return_val_if_fail (E_IS_MEETING_ATTENDEE (ia), E_MEETING_ATTENDEE_EDIT_NONE);
-
-	priv = ia->priv;
-
-	return priv->edit_level;
-}
-
-void 
-e_meeting_attendee_set_edit_level (EMeetingAttendee *ia, EMeetingAttendeeEditLevel level)
-{
-	EMeetingAttendeePrivate *priv;
-	
-	g_return_if_fail (ia != NULL);
-	g_return_if_fail (E_IS_MEETING_ATTENDEE (ia));
-
-	priv = ia->priv;
-
-	priv->edit_level = level;
-}
-
-
-static gint
-compare_times (EMeetingTime *time1,
-	       EMeetingTime *time2)
-{
-	gint day_comparison;
-
-	day_comparison = g_date_compare (&time1->date,
-					 &time2->date);
-	if (day_comparison != 0)
-		return day_comparison;
-
-	if (time1->hour < time2->hour)
-		return -1;
-	if (time1->hour > time2->hour)
-		return 1;
-
-	if (time1->minute < time2->minute)
-		return -1;
-	if (time1->minute > time2->minute)
-		return 1;
-
-	/* The start times are exactly the same. */
-	return 0;
-}
-
-static gint
-compare_period_starts (const void *arg1,
-		       const void *arg2)
-{
-	EMeetingFreeBusyPeriod *period1, *period2;
-
-	period1 = (EMeetingFreeBusyPeriod *) arg1;
-	period2 = (EMeetingFreeBusyPeriod *) arg2;
-
-	return compare_times (&period1->start, &period2->start);
-}
-
-static void
-ensure_periods_sorted (EMeetingAttendee *ia)
-{
-	EMeetingAttendeePrivate *priv;
-	
-	priv = ia->priv;
-
-	if (priv->busy_periods_sorted)
-		return;
-
-	qsort (priv->busy_periods->data, priv->busy_periods->len,
-	       sizeof (EMeetingFreeBusyPeriod),
-	       compare_period_starts);
-
-	priv->busy_periods_sorted = TRUE;
-}
-
-gboolean
-e_meeting_attendee_get_has_calendar_info (EMeetingAttendee *ia)
-{
-	EMeetingAttendeePrivate *priv;
-	
-	priv = ia->priv;
-
-	return priv->has_calendar_info;
-}
-
-void
-e_meeting_attendee_set_has_calendar_info (EMeetingAttendee *ia, gboolean has_calendar_info)
-{
-	EMeetingAttendeePrivate *priv;
-	
-	priv = ia->priv;
-
-	priv->has_calendar_info = has_calendar_info;
-}
-
-const GArray *
-e_meeting_attendee_get_busy_periods (EMeetingAttendee *ia)
-{
-	EMeetingAttendeePrivate *priv;
-	
-	priv = ia->priv;
-
-	ensure_periods_sorted (ia);
-	
-	return priv->busy_periods;	
-}
-
-gint
-e_meeting_attendee_find_first_busy_period (EMeetingAttendee *ia, GDate *date)
-{
-	EMeetingAttendeePrivate *priv;
-	EMeetingFreeBusyPeriod *period;
-	gint lower, upper, middle = 0, cmp = 0;
-	GDate tmp_date;
-
-	priv = ia->priv;
-	
-	/* Make sure the busy periods have been sorted. */
-	ensure_periods_sorted (ia);
-
-	/* Calculate the first day which could have a busy period which
-	   continues onto our given date. */
-	tmp_date = *date;
-	g_date_subtract_days (&tmp_date, priv->longest_period_in_days);
-
-	/* We want the first busy period which starts on tmp_date. */
-	lower = 0;
-	upper = priv->busy_periods->len;
-
-	if (upper == 0)
-		return -1;
-
-	while (lower < upper) {
-		middle = (lower + upper) >> 1;
-	  
-		period = &g_array_index (priv->busy_periods,
-					 EMeetingFreeBusyPeriod, middle);
-
-		cmp = g_date_compare (&tmp_date, &period->start.date);
-	  
-		if (cmp == 0)
-			break;
-		else if (cmp < 0)
-			upper = middle;
-		else
-			lower = middle + 1;
-	}
-
-	/* There may be several busy periods on the same day so we step
-	   backwards to the first one. */
-	if (cmp == 0) {
-		while (middle > 0) {
-			period = &g_array_index (priv->busy_periods,
-						 EMeetingFreeBusyPeriod, middle - 1);
-			if (g_date_compare (&tmp_date, &period->start.date) != 0)
-				break;
-			middle--;
-		}
-	} else if (cmp > 0) {
-		/* This means we couldn't find a period on the given day, and
-		   the last one we looked at was before it, so if there are
-		   any more periods after this one we return it. */
-		middle++;
-		if (priv->busy_periods->len <= middle)
-			return -1;
-	}
-
-	return middle;
-}
-
-gboolean
-e_meeting_attendee_add_busy_period (EMeetingAttendee *ia, 
-				    gint start_year,
-				    gint start_month,
-				    gint start_day,
-				    gint start_hour,
-				    gint start_minute,
-				    gint end_year,
-				    gint end_month,
-				    gint end_day,
-				    gint end_hour,
-				    gint end_minute,
-				    EMeetingFreeBusyType busy_type)
-{
-	EMeetingAttendeePrivate *priv;
-	EMeetingFreeBusyPeriod period;
-	gint period_in_days;
-
-	g_return_val_if_fail (ia != NULL, FALSE);
-	g_return_val_if_fail (E_IS_MEETING_ATTENDEE (ia), FALSE);
-	g_return_val_if_fail (busy_type >= 0, FALSE);
-	g_return_val_if_fail (busy_type < E_MEETING_FREE_BUSY_LAST, FALSE);
-
-	priv = ia->priv;
-	
-	/* Check the dates are valid. */
-	if (!g_date_valid_dmy (start_day, start_month, start_year))
-		return FALSE;
-	if (!g_date_valid_dmy (end_day, end_month, end_year))
-		return FALSE;
-	if (start_hour < 0 || start_hour > 23)
-		return FALSE;
-	if (end_hour < 0 || end_hour > 23)
-		return FALSE;
-	if (start_minute < 0 || start_minute > 59)
-		return FALSE;
-	if (end_minute < 0 || end_minute > 59)
-		return FALSE;
-
-	g_date_clear (&period.start.date, 1);
-	g_date_clear (&period.end.date, 1);
-	g_date_set_dmy (&period.start.date, start_day, start_month, start_year);
-	g_date_set_dmy (&period.end.date, end_day, end_month, end_year);
-	period.start.hour = start_hour;
-	period.start.minute = start_minute;
-	period.end.hour = end_hour;
-	period.end.minute = end_minute;
-	period.busy_type = busy_type;
-
-	/* Check that the start time is before or equal to the end time. */
-	if (compare_times (&period.start, &period.end) > 0)
-		return FALSE;
-
-	/* If the busy range is not set elsewhere, track it as best we can */
-	if (!priv->start_busy_range_set) {
-		if (!g_date_valid (&priv->busy_periods_start.date)) {
-			priv->busy_periods_start.date = period.start.date;
-			priv->busy_periods_start.hour = period.start.hour;
-			priv->busy_periods_start.minute = period.start.minute;			
-		} else {
-			switch (g_date_compare (&period.start.date, &priv->busy_periods_start.date)) {
-			case -1:
-				priv->busy_periods_start.date = period.start.date;
-				priv->busy_periods_start.hour = period.start.hour;
-				priv->busy_periods_start.minute = period.start.minute;			
-				break;
-			case 0:
-				if (period.start.hour < priv->busy_periods_start.hour
-				    || (period.start.hour == priv->busy_periods_start.hour
-					&& period.start.minute < priv->busy_periods_start.minute)) {
-					priv->busy_periods_start.date = period.start.date;
-					priv->busy_periods_start.hour = period.start.hour;
-					priv->busy_periods_start.minute = period.start.minute;			
-					break;
-				}
-				break;
-			}
-		}
-	}
-	if (!priv->end_busy_range_set) {
-		if (!g_date_valid (&priv->busy_periods_end.date)) {
-			priv->busy_periods_end.date = period.end.date;
-			priv->busy_periods_end.hour = period.end.hour;
-			priv->busy_periods_end.minute = period.end.minute;			
-		} else {
-			switch (g_date_compare (&period.end.date, &priv->busy_periods_end.date)) {
-			case 0:
-				if (period.end.hour > priv->busy_periods_end.hour
-				    || (period.end.hour == priv->busy_periods_end.hour
-					&& period.end.minute > priv->busy_periods_end.minute)) {
-					priv->busy_periods_end.date = period.end.date;
-					priv->busy_periods_end.hour = period.end.hour;
-					priv->busy_periods_end.minute = period.end.minute;			
-					break;
-				}
-				break;
-			case 1:
-				priv->busy_periods_end.date = period.end.date;
-				priv->busy_periods_end.hour = period.end.hour;
-				priv->busy_periods_end.minute = period.end.minute;			
-				break;
-			}
-		}
-	}
-	
-	g_array_append_val (priv->busy_periods, period);
-	priv->has_calendar_info = TRUE;
-	priv->busy_periods_sorted = FALSE;
-
-	period_in_days = g_date_julian (&period.end.date) - g_date_julian (&period.start.date) + 1;
-	priv->longest_period_in_days = MAX (priv->longest_period_in_days, period_in_days);
-
-	return TRUE;
-}
-
-EMeetingTime
-e_meeting_attendee_get_start_busy_range (EMeetingAttendee *ia)
-{
-	EMeetingAttendeePrivate *priv;
-	
-	priv = ia->priv;
-
-	return priv->busy_periods_start;
-}
-
-EMeetingTime
-e_meeting_attendee_get_end_busy_range (EMeetingAttendee *ia)
-{
-	EMeetingAttendeePrivate *priv;
-	
-	priv = ia->priv;
-	
-	return priv->busy_periods_end;
-}
-
-gboolean
-e_meeting_attendee_set_start_busy_range (EMeetingAttendee *ia,
-					 gint start_year,
-					 gint start_month,
-					 gint start_day,
-					 gint start_hour,
-					 gint start_minute)
-{
-	EMeetingAttendeePrivate *priv;
-	
-	g_return_val_if_fail (E_IS_MEETING_ATTENDEE (ia), FALSE);
-
-	priv = ia->priv;
-	
-	/* Check the dates are valid. */
-	if (!g_date_valid_dmy (start_day, start_month, start_year))
-		return FALSE;
-	if (start_hour < 0 || start_hour > 23)
-		return FALSE;
-	if (start_minute < 0 || start_minute > 59)
-		return FALSE;
-
-	g_date_clear (&priv->busy_periods_start.date, 1);
-	g_date_set_dmy (&priv->busy_periods_start.date,
-			start_day, start_month, start_year);
-	priv->busy_periods_start.hour = start_hour;
-	priv->busy_periods_start.minute = start_minute;
-
-	priv->start_busy_range_set = TRUE;
-	
-	return TRUE;
-}
-
-gboolean
-e_meeting_attendee_set_end_busy_range (EMeetingAttendee *ia,
-				       gint end_year,
-				       gint end_month,
-				       gint end_day,
-				       gint end_hour,
-				       gint end_minute)
-{
-	EMeetingAttendeePrivate *priv;
-	
-	g_return_val_if_fail (E_IS_MEETING_ATTENDEE (ia), FALSE);
-
-	priv = ia->priv;
-	
-	/* Check the dates are valid. */
-	if (!g_date_valid_dmy (end_day, end_month, end_year))
-		return FALSE;
-	if (end_hour < 0 || end_hour > 23)
-		return FALSE;
-	if (end_minute < 0 || end_minute > 59)
-		return FALSE;
-
-	g_date_clear (&priv->busy_periods_end.date, 1);
-	g_date_set_dmy (&priv->busy_periods_end.date,
-			end_day, end_month, end_year);
-	priv->busy_periods_end.hour = end_hour;
-	priv->busy_periods_end.minute = end_minute;
-
-	priv->end_busy_range_set = TRUE;
-	
-	return TRUE;
-}
-
-/* Clears all busy times for the given attendee. */
-void
-e_meeting_attendee_clear_busy_periods (EMeetingAttendee *ia)
-{
-	EMeetingAttendeePrivate *priv;
-
-	g_return_if_fail (E_IS_MEETING_ATTENDEE (ia));
-
-	priv = ia->priv;
-	
-	g_array_set_size (priv->busy_periods, 0);
-	priv->busy_periods_sorted = TRUE;
-
-	g_date_clear (&priv->busy_periods_start.date, 1);
-	priv->busy_periods_start.hour = 0;
-	priv->busy_periods_start.minute = 0;
-
-	g_date_clear (&priv->busy_periods_end.date, 1);
-	priv->busy_periods_end.hour = 0;
-	priv->busy_periods_end.minute = 0;
-
-	priv->longest_period_in_days = 0;
-}
diff --git a/calendar/gui/e-meeting-attendee.h b/calendar/gui/e-meeting-attendee.h
deleted file mode 100644
index 42c5e13c2e..0000000000
--- a/calendar/gui/e-meeting-attendee.h
+++ /dev/null
@@ -1,172 +0,0 @@
-/* -*- Mode: C; indent-tabs-mode: t; c-basic-offset: 8; tab-width: 8 -*- */
-/* e-meeting_attendee.h
- *
- * Copyright (C) 2001  Ximian, Inc.
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of version 2 of the GNU General Public
- * License as published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * General Public License for more details.
- *
- * You should have received a copy of the GNU General Public
- * License along with this program; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
- *
- * Author: JP Rosevear
- */
-
-#ifndef _E_MEETING_ATTENDEE_H_
-#define _E_MEETING_ATTENDEE_H_
-
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
-
-#include <gtk/gtk.h>
-#include <libecal/e-cal-component.h>
-#include "e-meeting-types.h"
-
-#ifdef __cplusplus
-extern "C" {
-#pragma }
-#endif /* __cplusplus */
-
-#define E_TYPE_MEETING_ATTENDEE			(e_meeting_attendee_get_type ())
-#define E_MEETING_ATTENDEE(obj)			(G_TYPE_CHECK_INSTANCE_CAST ((obj), E_TYPE_MEETING_ATTENDEE, EMeetingAttendee))
-#define E_MEETING_ATTENDEE_CLASS(klass)		(G_TYPE_CHECK_CLASS_CAST ((klass), E_TYPE_MEETING_ATTENDEE, EMeetingAttendeeClass))
-#define E_IS_MEETING_ATTENDEE(obj)			(G_TYPE_CHECK_INSTANCE_TYPE ((obj), E_TYPE_MEETING_ATTENDEE))
-#define E_IS_MEETING_ATTENDEE_CLASS(klass)		(G_TYPE_CHECK_CLASS_TYPE ((obj), E_TYPE_MEETING_ATTENDEE))
-
-
-typedef struct _EMeetingAttendee         EMeetingAttendee;
-typedef struct _EMeetingAttendeePrivate  EMeetingAttendeePrivate;
-typedef struct _EMeetingAttendeeClass    EMeetingAttendeeClass;
-
-/* These specify the type of attendee. Either a person or a resource (e.g. a
-   meeting room). These are used for the Autopick options, where the user can
-   ask for a time when, for example, all people and one resource are free.
-   The default is E_MEETING_ATTENDEE_REQUIRED_PERSON. */
-typedef enum
-{
-	E_MEETING_ATTENDEE_REQUIRED_PERSON,
-	E_MEETING_ATTENDEE_OPTIONAL_PERSON,
-	E_MEETING_ATTENDEE_RESOURCE
-} EMeetingAttendeeType;
-
-typedef enum
-{
-	E_MEETING_ATTENDEE_EDIT_FULL,
-	E_MEETING_ATTENDEE_EDIT_STATUS,
-	E_MEETING_ATTENDEE_EDIT_NONE
-} EMeetingAttendeeEditLevel;
-
-struct _EMeetingAttendee {
-	GtkObject parent;
-
-	EMeetingAttendeePrivate *priv;
-};
-
-struct _EMeetingAttendeeClass {
-	GtkObjectClass parent_class;
-
-	void (* changed) (EMeetingAttendee *ia);
-};
-
-
-GType      e_meeting_attendee_get_type (void);
-GObject   *e_meeting_attendee_new      (void);
-GObject   *e_meeting_attendee_new_from_e_cal_component_attendee (ECalComponentAttendee *ca);
-
-ECalComponentAttendee *e_meeting_attendee_as_e_cal_component_attendee (EMeetingAttendee *ia);
-
-const gchar *e_meeting_attendee_get_address (EMeetingAttendee *ia);
-void e_meeting_attendee_set_address (EMeetingAttendee *ia, gchar *address);
-gboolean e_meeting_attendee_is_set_address (EMeetingAttendee *ia);
-
-const gchar *e_meeting_attendee_get_member (EMeetingAttendee *ia);
-void e_meeting_attendee_set_member (EMeetingAttendee *ia, gchar *member);
-gboolean e_meeting_attendee_is_set_member (EMeetingAttendee *ia);
-
-icalparameter_cutype e_meeting_attendee_get_cutype (EMeetingAttendee *ia);
-void e_meeting_attendee_set_cutype (EMeetingAttendee *ia, icalparameter_cutype cutype);
-
-icalparameter_role e_meeting_attendee_get_role (EMeetingAttendee *ia);
-void e_meeting_attendee_set_role (EMeetingAttendee *ia, icalparameter_role role);
-
-gboolean e_meeting_attendee_get_rsvp (EMeetingAttendee *ia);
-void e_meeting_attendee_set_rsvp (EMeetingAttendee *ia, gboolean rsvp);
-
-const gchar *e_meeting_attendee_get_delto (EMeetingAttendee *ia);
-void e_meeting_attendee_set_delto (EMeetingAttendee *ia, gchar *delto);
-gboolean e_meeting_attendee_is_set_delto (EMeetingAttendee *ia);
-
-const gchar *e_meeting_attendee_get_delfrom (EMeetingAttendee *ia);
-void e_meeting_attendee_set_delfrom (EMeetingAttendee *ia, gchar *delfrom);
-gboolean e_meeting_attendee_is_set_delfrom (EMeetingAttendee *ia);
-
-icalparameter_partstat e_meeting_attendee_get_status (EMeetingAttendee *ia);
-void e_meeting_attendee_set_status (EMeetingAttendee *ia, icalparameter_partstat status);
-
-const gchar *e_meeting_attendee_get_sentby (EMeetingAttendee *ia);
-void e_meeting_attendee_set_sentby (EMeetingAttendee *ia, gchar *sentby);
-gboolean e_meeting_attendee_is_set_sentby (EMeetingAttendee *ia);
-
-const gchar *e_meeting_attendee_get_cn (EMeetingAttendee *ia);
-void e_meeting_attendee_set_cn (EMeetingAttendee *ia, gchar *cn);
-gboolean e_meeting_attendee_is_set_cn (EMeetingAttendee *ia);
-
-const gchar *e_meeting_attendee_get_language (EMeetingAttendee *ia);
-void e_meeting_attendee_set_language (EMeetingAttendee *ia, gchar *language);
-gboolean e_meeting_attendee_is_set_language (EMeetingAttendee *ia);
-
-EMeetingAttendeeType e_meeting_attendee_get_atype (EMeetingAttendee *ia);
-
-EMeetingAttendeeEditLevel e_meeting_attendee_get_edit_level (EMeetingAttendee *ia);
-void e_meeting_attendee_set_edit_level (EMeetingAttendee *ia, EMeetingAttendeeEditLevel level);
-
-gboolean e_meeting_attendee_get_has_calendar_info (EMeetingAttendee *ia);
-void e_meeting_attendee_set_has_calendar_info (EMeetingAttendee *ia, gboolean has_calendar_info);
-
-const GArray *e_meeting_attendee_get_busy_periods (EMeetingAttendee *ia);
-gint e_meeting_attendee_find_first_busy_period (EMeetingAttendee *ia, GDate *date);
-gboolean e_meeting_attendee_add_busy_period (EMeetingAttendee *ia, 
-					gint start_year,
-					gint start_month,
-					gint start_day,
-					gint start_hour,
-					gint start_minute,
-					gint end_year,
-					gint end_month,
-					gint end_day,
-					gint end_hour,
-					gint end_minute,
-					EMeetingFreeBusyType busy_type);
-
-EMeetingTime e_meeting_attendee_get_start_busy_range (EMeetingAttendee *ia);
-EMeetingTime e_meeting_attendee_get_end_busy_range (EMeetingAttendee *ia);
-
-gboolean e_meeting_attendee_set_start_busy_range (EMeetingAttendee *ia,
-						  gint start_year,
-						  gint start_month,
-						  gint start_day,
-						  gint start_hour,
-						  gint start_minute);
-gboolean e_meeting_attendee_set_end_busy_range (EMeetingAttendee *ia,
-						gint end_year,
-						gint end_month,
-						gint end_day,
-						gint end_hour,
-						gint end_minute);
-
-void e_meeting_attendee_clear_busy_periods (EMeetingAttendee *ia);
-
-#ifdef __cplusplus
-}
-#endif /* __cplusplus */
-
-#endif /* _E_MEETING_ATTENDEE_H_ */
diff --git a/calendar/gui/e-meeting-list-view.c b/calendar/gui/e-meeting-list-view.c
deleted file mode 100644
index 088301fc92..0000000000
--- a/calendar/gui/e-meeting-list-view.c
+++ /dev/null
@@ -1,501 +0,0 @@
-/* 
- * e-meeting-list-view.c
- *
- * Authors: Mike Kestner  <mkestner@ximian.com>
- * 	    JP Rosevear  <jpr@ximian.com>
- *
- * Copyright (C) 2003  Ximian, Inc.
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of version 2 of the GNU General Public
- * License as published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * General Public License for more details.
- *
- * You should have received a copy of the GNU General Public
- * License along with this program; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
- */
-
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
-
-#include <string.h>
-#include <glib.h>
-#include <gtk/gtktreemodel.h>
-#include <bonobo/bonobo-control.h>
-#include <bonobo/bonobo-widget.h>
-#include <bonobo/bonobo-exception.h>
-#include <libgnome/gnome-i18n.h>
-#include <libgnome/gnome-util.h>
-#include <libgnomevfs/gnome-vfs.h>
-#include <libebook/e-book.h>
-#include <libebook/e-vcard.h>
-#include <libecal/e-cal-component.h>
-#include <libecal/e-cal-util.h>
-#include <libecal/e-cal-time-util.h>
-#include <libedataserverui/e-name-selector.h>
-#include "calendar-config.h"
-#include "e-meeting-list-view.h"
-#include <misc/e-cell-renderer-combo.h>
-#include <libebook/e-destination.h>
-#include "e-select-names-renderer.h"
-
-struct _EMeetingListViewPrivate {
-	EMeetingStore *store;
-
-	ENameSelector *name_selector;
-};
-
-#define BUF_SIZE 1024
-
-static void name_selector_dialog_close_cb (ENameSelectorDialog *dialog, gint response, gpointer data);
-
-static char *sections[] = {N_("Chair Persons"), 
-			   N_("Required Participants"), 
-			   N_("Optional Participants"), 
-			   N_("Resources"),
-			   NULL};
-static icalparameter_role roles[] = {ICAL_ROLE_CHAIR,
-				     ICAL_ROLE_REQPARTICIPANT,
-				     ICAL_ROLE_OPTPARTICIPANT,
-				     ICAL_ROLE_NONPARTICIPANT,
-				     ICAL_ROLE_NONE};
-
-G_DEFINE_TYPE (EMeetingListView, e_meeting_list_view, GTK_TYPE_TREE_VIEW);
-
-static void
-e_meeting_list_view_finalize (GObject *obj)
-{
-	EMeetingListView *view = E_MEETING_LIST_VIEW (obj);
-	EMeetingListViewPrivate *priv = view->priv;
-
-	if (priv->name_selector)
-		g_object_unref (priv->name_selector);
-
-	g_free (priv);
-
-	if (G_OBJECT_CLASS (e_meeting_list_view_parent_class)->finalize)
- 		(* G_OBJECT_CLASS (e_meeting_list_view_parent_class)->finalize) (obj);
-}
-
-static void
-e_meeting_list_view_class_init (EMeetingListViewClass *klass)
-{
-	GObjectClass *object_class;
-
-	object_class = G_OBJECT_CLASS (klass);
-
-	object_class->finalize = e_meeting_list_view_finalize;
-}
-
-
-static void
-add_section (ENameSelector *name_selector, const char *name)
-{
-	ENameSelectorModel *name_selector_model;
-
-	name_selector_model = e_name_selector_peek_model (name_selector);
-	e_name_selector_model_add_section (name_selector_model, name, gettext (name), NULL);
-}
-
-static void
-e_meeting_list_view_init (EMeetingListView *view)
-{
-	EMeetingListViewPrivate *priv;
-	ENameSelectorDialog *name_selector_dialog;
-	gint i;
-
-	priv = g_new0 (EMeetingListViewPrivate, 1);
-
-	view->priv = priv;
-
-	priv->name_selector = e_name_selector_new ();
-
-	for (i = 0; sections [i]; i++)
-		add_section (priv->name_selector, sections [i]);
-
-	name_selector_dialog = e_name_selector_peek_dialog (view->priv->name_selector);
-	gtk_window_set_title (GTK_WINDOW (name_selector_dialog), _("Required Participants"));
- 	g_signal_connect (name_selector_dialog, "response",
-			  G_CALLBACK (name_selector_dialog_close_cb), view);
-
-}
-
-static GList *
-get_type_strings ()
-{
-	GList *strings = NULL;
-
-	strings = g_list_append (strings, (char*) _("Individual"));
-        strings = g_list_append (strings, (char*) _("Group"));
-        strings = g_list_append (strings, (char*) _("Resource"));
-        strings = g_list_append (strings, (char*) _("Room"));
-        strings = g_list_append (strings, (char*) _("Unknown"));
-
-	return strings;
-}
-
-static GList *
-get_role_strings ()
-{
-	GList *strings = NULL;
-
-	strings = g_list_append (strings, (char*) _("Chair"));
-	strings = g_list_append (strings, (char*) _("Required Participant"));
-	strings = g_list_append (strings, (char*) _("Optional Participant"));
-	strings = g_list_append (strings, (char*) _("Non-Participant"));
-	strings = g_list_append (strings, (char*) _("Unknown"));
-
-	return strings;
-}
-
-static GList *
-get_rsvp_strings ()
-{
-	GList *strings = NULL;
-
-	strings = g_list_append (strings, (char*) _("Yes"));
-	strings = g_list_append (strings, (char*) _("No"));
-
-	return strings;
-}
-
-static GList *
-get_status_strings ()
-{
-	GList *strings = NULL;
-
-	strings = g_list_append (strings, (char*) _("Needs Action"));
-	strings = g_list_append (strings, (char*) _("Accepted"));
-	strings = g_list_append (strings, (char*) _("Declined"));
-	strings = g_list_append (strings, (char*) _("Tentative"));
-	strings = g_list_append (strings, (char*) _("Delegated"));
-
-	return strings;
-}
-
-static void
-value_edited (GtkTreeView *view, gint col, const gchar *path, const gchar *text)
-{
-	EMeetingStore *model = E_MEETING_STORE (gtk_tree_view_get_model (view));
-	GtkTreePath *treepath = gtk_tree_path_new_from_string (path);
-	int row = gtk_tree_path_get_indices (treepath)[0];
-       
-	e_meeting_store_set_value (model, row, col, text);
-	gtk_tree_path_free (treepath);
-}
-
-static void
-attendee_edited_cb (GtkCellRenderer *renderer, const gchar *path, GList *addresses, GList *names, GtkTreeView *view)
-{
-	EMeetingStore *model = E_MEETING_STORE (gtk_tree_view_get_model (view));
-	GtkTreePath *treepath = gtk_tree_path_new_from_string (path);
-	int row = gtk_tree_path_get_indices (treepath)[0];
-	EMeetingAttendee *existing_attendee;
-
-	existing_attendee = e_meeting_store_find_attendee_at_row (model, row);
-
-	if (g_list_length (addresses) > 1) {
-		EMeetingAttendee *attendee;
-		GList *l, *m;
-
-		for (l = addresses, m = names; l && m; l = l->next, m = m->next) {
-			char *name = m->data, *email = l->data;
-			
-			if (!((name && *name) || (email && *email)))
-				continue;
-			
-			if (e_meeting_store_find_attendee (model, email, NULL) != NULL)
-				continue;
-			
-			attendee = e_meeting_store_add_attendee_with_defaults (model);
-			e_meeting_attendee_set_address (attendee, g_strdup (l->data));
-			e_meeting_attendee_set_cn (attendee, g_strdup (m->data));
-			if (existing_attendee) {
-				/* FIXME Should we copy anything else? */
-				e_meeting_attendee_set_cutype (attendee, e_meeting_attendee_get_cutype (existing_attendee));
-				e_meeting_attendee_set_role (attendee, e_meeting_attendee_get_role (existing_attendee));
-				e_meeting_attendee_set_rsvp (attendee, e_meeting_attendee_get_rsvp (existing_attendee));
-				e_meeting_attendee_set_status (attendee, e_meeting_attendee_get_status (existing_attendee));
-			}
-		}
-
-		if (existing_attendee)
-			e_meeting_store_remove_attendee (model, existing_attendee);
-		
-	} else if (g_list_length (addresses) == 1) {
-		char *name = names->data, *email = addresses->data;
-		int existing_row;
-
-		if (!((name && *name) || (email && *email)) || ((e_meeting_store_find_attendee (model, email, &existing_row) != NULL) && existing_row != row)){
-			if (existing_attendee)
-				e_meeting_store_remove_attendee (model, existing_attendee);
-		} else {
-			value_edited (view, E_MEETING_STORE_ADDRESS_COL, path, email);
-			value_edited (view, E_MEETING_STORE_CN_COL, path, name);
-		}
-	} else {
-		if (existing_attendee)
-			e_meeting_store_remove_attendee (model, existing_attendee);
-	}
-
-	gtk_tree_path_free (treepath);
-}
-
-static void
-attendee_editing_canceled_cb (GtkCellRenderer *renderer, GtkTreeView *view) 
-{
-	EMeetingStore *model = E_MEETING_STORE (gtk_tree_view_get_model (view));
-	GtkTreePath *path;
-	EMeetingAttendee *existing_attendee;
-	int row;
-
-	/* This is for newly added attendees when the editing is cancelled */
-	gtk_tree_view_get_cursor (view, &path, NULL);
-	if (!path)
-		return;
-	
-	row = gtk_tree_path_get_indices (path)[0];
-	existing_attendee = e_meeting_store_find_attendee_at_row (model, row);
-	if (existing_attendee) {
-		if (!e_meeting_attendee_is_set_cn (existing_attendee) && !e_meeting_attendee_is_set_address (existing_attendee))
-			e_meeting_store_remove_attendee (model, existing_attendee);
-	}
-	
-	gtk_tree_path_free (path);
-}
-
-
-static void
-type_edited_cb (GtkCellRenderer *renderer, const gchar *path, const gchar *text, GtkTreeView *view)
-{
-	value_edited (view, E_MEETING_STORE_TYPE_COL, path, text);
-}
-
-static void
-role_edited_cb (GtkCellRenderer *renderer, const gchar *path, const gchar *text, GtkTreeView *view)
-{
-	value_edited (view, E_MEETING_STORE_ROLE_COL, path, text);
-}
-
-static void
-rsvp_edited_cb (GtkCellRenderer *renderer, const gchar *path, const gchar *text, GtkTreeView *view)
-{
-	value_edited (view, E_MEETING_STORE_RSVP_COL, path, text);
-}
-
-static void
-status_edited_cb (GtkCellRenderer *renderer, const gchar *path, const gchar *text, GtkTreeView *view)
-{
-	value_edited (view, E_MEETING_STORE_STATUS_COL, path, text);
-}
-
-static void
-build_table (GtkTreeView *view)
-{
-	GtkCellRenderer *renderer;
-	
-	gtk_tree_view_set_headers_visible (view, TRUE);
-	gtk_tree_view_set_rules_hint (view, TRUE);
-
-	renderer = e_select_names_renderer_new ();
-	g_object_set (G_OBJECT (renderer), "editable", TRUE, NULL);
-	gtk_tree_view_insert_column_with_attributes (view, -1, _("Attendee"), renderer,
-						     "text", E_MEETING_STORE_ATTENDEE_COL,
-						     "name", E_MEETING_STORE_CN_COL,
-						     "email", E_MEETING_STORE_ADDRESS_COL,
-						     "underline", E_MEETING_STORE_ATTENDEE_UNDERLINE_COL,
-						     NULL);
-	g_signal_connect (renderer, "cell_edited", G_CALLBACK (attendee_edited_cb), view);
-	g_signal_connect (renderer, "editing-canceled", G_CALLBACK (attendee_editing_canceled_cb), view);
-	
-	renderer = e_cell_renderer_combo_new ();
-	g_object_set (G_OBJECT (renderer), "list", get_type_strings (), "editable", TRUE, NULL);
-	gtk_tree_view_insert_column_with_attributes (view, -1, _("Type"), renderer,
-						     "text", E_MEETING_STORE_TYPE_COL,
-						     NULL);
-	g_signal_connect (renderer, "edited", G_CALLBACK (type_edited_cb), view);
-	
-	renderer = e_cell_renderer_combo_new ();
-	g_object_set (G_OBJECT (renderer), "list", get_role_strings (), "editable", TRUE, NULL);
-	gtk_tree_view_insert_column_with_attributes (view, -1, _("Role"), renderer,
-						     "text", E_MEETING_STORE_ROLE_COL,
-						     NULL);
-	g_signal_connect (renderer, "edited", G_CALLBACK (role_edited_cb), view);
-
-	renderer = e_cell_renderer_combo_new ();
-	g_object_set (G_OBJECT (renderer), "list", get_rsvp_strings (), "editable", TRUE, NULL);
-	gtk_tree_view_insert_column_with_attributes (view, -1, _("RSVP"), renderer,
-						     "text", E_MEETING_STORE_RSVP_COL,
-						     NULL);
-	g_signal_connect (renderer, "edited", G_CALLBACK (rsvp_edited_cb), view);
-
-	renderer = e_cell_renderer_combo_new ();
-	g_object_set (G_OBJECT (renderer), "list", get_status_strings (), "editable", TRUE, NULL);
-	gtk_tree_view_insert_column_with_attributes (view, -1, _("Status"), renderer,
-						     "text", E_MEETING_STORE_STATUS_COL,
-						     NULL);
-	g_signal_connect (renderer, "edited", G_CALLBACK (status_edited_cb), view);
-}
-
-EMeetingListView *
-e_meeting_list_view_new (EMeetingStore *store)
-{
-	EMeetingListView *view = g_object_new (E_TYPE_MEETING_LIST_VIEW, NULL);
-
-	if (view) {
-		view->priv->store = store;
-		gtk_tree_view_set_model (GTK_TREE_VIEW (view), GTK_TREE_MODEL (store));
-		build_table (GTK_TREE_VIEW (view));
-	}
-
-	return view;
-}
-
-void
-e_meeting_list_view_column_set_visible (EMeetingListView *view, const gchar *col_name, gboolean visible)
-{
-	GList *cols, *l;
-
-	cols = gtk_tree_view_get_columns (GTK_TREE_VIEW (view));
-
-	for (l = cols; l; l = l->next) {
-		GtkTreeViewColumn *col = (GtkTreeViewColumn *) l->data;
-
-		if (strcmp (gtk_tree_view_column_get_title (col), col_name) == 0) {
-			gtk_tree_view_column_set_visible (col, visible);
-			break;
-		}
-	}
-}
-
-void
-e_meeting_list_view_edit (EMeetingListView *emlv, EMeetingAttendee *attendee)
-{
-	EMeetingListViewPrivate *priv;
-	GtkTreePath *path;
-	GtkTreeViewColumn *focus_col;
-	
-	priv = emlv->priv;
-
-	g_return_if_fail (emlv != NULL);
-	g_return_if_fail (E_IS_MEETING_LIST_VIEW (emlv));
-	g_return_if_fail (attendee != NULL);
-
-	path = e_meeting_store_find_attendee_path (priv->store, attendee);
-	focus_col = gtk_tree_view_get_column (GTK_TREE_VIEW (emlv), 0);	
-	
-	if (path) {
-		gtk_tree_view_set_cursor (GTK_TREE_VIEW (emlv), path, focus_col, TRUE);
-
-		gtk_tree_path_free (path);
-	}	
-}
-
-static void
-process_section (EMeetingListView *view, GList *destinations, icalparameter_role role)
-{
-	EMeetingListViewPrivate *priv;
-	GList *l;
-
-	priv = view->priv;
-	for (l = destinations; l; l = g_list_next (l)) {
-		EDestination *destination = l->data;
-		const GList *list_dests, *l;
-		GList card_dest;
-
-		if (e_destination_is_evolution_list (destination)) {
-			list_dests = e_destination_list_get_dests (destination);
-		} else {
-			card_dest.next = NULL;
-			card_dest.prev = NULL;
-			card_dest.data = destination;
-			list_dests = &card_dest;
-		}		
-		
-		for (l = list_dests; l; l = l->next) {
-			EDestination *dest = l->data;
-			const char *name, *attendee = NULL;
-			char *attr = NULL;
-			
-			name = e_destination_get_name (dest);
-
-			/* Get the field as attendee from the backend */
-			if (e_cal_get_ldap_attribute (e_meeting_store_get_e_cal (priv->store),
-						      &attr, NULL)) {
-				/* FIXME this should be more general */
-				if (!g_ascii_strcasecmp (attr, "icscalendar")) {
-					EContact *contact;
-
-					/* FIXME: this does not work, have to use first
-					   e_destination_use_contact() */
-					contact = e_destination_get_contact (dest);
-					if (contact) {
-						attendee = e_contact_get (contact, E_CONTACT_FREEBUSY_URL);
-						if (!attendee)
-							attendee = e_contact_get (contact, E_CONTACT_CALENDAR_URI);
-					}
-				}
-			}
-
-			/* If we couldn't get the attendee prior, get the email address as the default */
-			if (attendee == NULL || *attendee == '\0') {
-				attendee = e_destination_get_email (dest);
-			}
-		
-			if (attendee == NULL || *attendee == '\0')
-				continue;
-		
-			if (e_meeting_store_find_attendee (priv->store, attendee, NULL) == NULL) {
-				EMeetingAttendee *ia = e_meeting_store_add_attendee_with_defaults (priv->store);
-
-				e_meeting_attendee_set_address (ia, g_strdup_printf ("MAILTO:%s", attendee));
-				e_meeting_attendee_set_role (ia, role);
-				if (role == ICAL_ROLE_NONPARTICIPANT)
-					e_meeting_attendee_set_cutype (ia, ICAL_CUTYPE_RESOURCE);
-				e_meeting_attendee_set_cn (ia, g_strdup (name));
-			}
-		}
-		
-	}
-}
-
-static void
-name_selector_dialog_close_cb (ENameSelectorDialog *dialog, gint response, gpointer data)
-{
-	EMeetingListView   *view = E_MEETING_LIST_VIEW (data);
-	ENameSelectorModel *name_selector_model;
-	int i;
-
-	name_selector_model = e_name_selector_peek_model (view->priv->name_selector);
-	
-	for (i = 0; sections[i] != NULL; i++) {
-		EDestinationStore *destination_store;
-		GList             *destinations;
-
-		e_name_selector_model_peek_section (name_selector_model, sections [i],
-						    NULL, &destination_store);
-		g_assert (destination_store);
-
-		destinations = e_destination_store_list_destinations (destination_store);
-		process_section (view, destinations, roles [i]);
-		g_list_free (destinations);
-	}
-
-	gtk_widget_hide (GTK_WIDGET (dialog));
-}
-
-void
-e_meeting_list_view_invite_others_dialog (EMeetingListView *view)
-{
-	ENameSelectorDialog *dialog;
-
-	dialog = e_name_selector_peek_dialog (view->priv->name_selector);
-	gtk_widget_show (GTK_WIDGET (dialog));
-}
diff --git a/calendar/gui/e-meeting-list-view.h b/calendar/gui/e-meeting-list-view.h
deleted file mode 100644
index 6fc433b82c..0000000000
--- a/calendar/gui/e-meeting-list-view.h
+++ /dev/null
@@ -1,64 +0,0 @@
-/* 
- * e-meeting-list-view.h
- *
- * Author: Mike Kestner <mkestner@ximian.com>
- *
- * Copyright (C) 2003  Ximian, Inc.
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of version 2 of the GNU General Public
- * License as published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * General Public License for more details.
- *
- * You should have received a copy of the GNU General Public
- * License along with this program; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
- */
-
-#ifndef _E_MEETING_LIST_VIEW_H_
-#define _E_MEETING_LIST_VIEW_H_
-
-#include <gtk/gtktreeview.h>
-#include "e-meeting-store.h"
-
-G_BEGIN_DECLS
-
-#define E_TYPE_MEETING_LIST_VIEW		(e_meeting_list_view_get_type ())
-#define E_MEETING_LIST_VIEW(obj)		(G_TYPE_CHECK_INSTANCE_CAST ((obj), E_TYPE_MEETING_LIST_VIEW, EMeetingListView))
-#define E_MEETING_LIST_VIEW_CLASS(klass)	(G_TYPE_CHECK_CLASS_CAST ((klass), E_TYPE_MEETING_LIST_VIEW, EMeetingListViewClass))
-#define E_IS_MEETING_LIST_VIEW(obj)		(G_TYPE_CHECK_INSTANCE_TYPE ((obj), E_TYPE_MEETING_LIST_VIEW))
-#define E_IS_MEETING_LIST_VIEW_CLASS(klass)	(G_TYPE_CHECK_CLASS_TYPE ((obj), E_TYPE_MEETING_LIST_VIEW))
-
-
-typedef struct _EMeetingListView        EMeetingListView;
-typedef struct _EMeetingListViewPrivate EMeetingListViewPrivate;
-typedef struct _EMeetingListViewClass   EMeetingListViewClass;
-
-struct _EMeetingListView {
-	GtkTreeView parent;
-
-	EMeetingListViewPrivate *priv;
-};
-
-struct _EMeetingListViewClass {
-	GtkTreeViewClass parent_class;
-};
-
-GType      e_meeting_list_view_get_type (void);
-
-EMeetingListView *e_meeting_list_view_new (EMeetingStore *store);
-
-void       e_meeting_list_view_column_set_visible (EMeetingListView *emlv, const gchar *col_name, gboolean visible);
-
-void       e_meeting_list_view_edit (EMeetingListView *emlv, EMeetingAttendee *attendee);
-
-void       e_meeting_list_view_invite_others_dialog (EMeetingListView *emlv);
-
-G_END_DECLS
-
-#endif
diff --git a/calendar/gui/e-meeting-store.c b/calendar/gui/e-meeting-store.c
deleted file mode 100644
index 7cbfbe2b79..0000000000
--- a/calendar/gui/e-meeting-store.c
+++ /dev/null
@@ -1,1537 +0,0 @@
-/* 
- * e-meeting-store.c
- *
- * Copyright (C) 2001-2003  Ximian, Inc.
- *
- * Authors: JP Rosevear  <jpr@ximian.com>
- * 	    Mike Kestner  <mkestner@ximian.com>
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of version 2 of the GNU General Public
- * License as published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * General Public License for more details.
- *
- * You should have received a copy of the GNU General Public
- * License along with this program; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
- */
-
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
-
-#include <glib.h>
-#include <libgnome/gnome-i18n.h>
-#include <libgnome/gnome-util.h>
-#include <libgnomevfs/gnome-vfs.h>
-#include <libebook/e-book.h>
-#include <libecal/e-cal-component.h>
-#include <libecal/e-cal-util.h>
-#include <libecal/e-cal-time-util.h>
-#include "calendar-config.h"
-#include "itip-utils.h"
-#include "e-meeting-utils.h"
-#include "e-meeting-attendee.h"
-#include "e-meeting-store.h"
-
-#define ROW_VALID(store, row) (row >= 0 && row < store->priv->attendees->len)
-
-struct _EMeetingStorePrivate {
-	GPtrArray *attendees;
-	gint stamp;
-
-	ECal *client;
-	icaltimezone *zone;
-	
-	char *fb_uri;
-
-	EBook *ebook;
-
-	GPtrArray *refresh_queue;
-	GHashTable *refresh_data;
-	GMutex *mutex;
-	guint refresh_idle_id;
-
-	guint callback_idle_id;
-	guint num_threads;
-	GAsyncQueue *async_queue;
-};
-
-#define BUF_SIZE 1024
-
-typedef struct _EMeetingStoreQueueData EMeetingStoreQueueData;
-struct _EMeetingStoreQueueData {
-	EMeetingStore *store;
-	EMeetingAttendee *attendee;
-
-	gboolean refreshing;
-	
-	EMeetingTime start;
-	EMeetingTime end;
-
-	char buffer[BUF_SIZE];
-	GString *string;
-	
-	GPtrArray *call_backs;
-	GPtrArray *data;
-};
-
-
-static GObjectClass *parent_class = NULL;
-
-static void start_async_read (GnomeVFSAsyncHandle *handle, GnomeVFSResult result, gpointer data);
-
-static void
-start_addressbook_server (EMeetingStore *store)
-{
-	store->priv->ebook = e_book_new_system_addressbook (NULL);
-	e_book_open (store->priv->ebook, FALSE, NULL);
-}
-
-static icalparameter_cutype
-text_to_type (const char *type)
-{
-	if (!g_strcasecmp (type, _("Individual")))
-		return ICAL_CUTYPE_INDIVIDUAL;
-	else if (!g_strcasecmp (type, _("Group")))
-		return ICAL_CUTYPE_GROUP;
-	else if (!g_strcasecmp (type, _("Resource")))
-		return ICAL_CUTYPE_RESOURCE;
-	else if (!g_strcasecmp (type, _("Room")))
-		return ICAL_CUTYPE_ROOM;
-	else
-		return ICAL_CUTYPE_NONE;
-}
-
-static char *
-type_to_text (icalparameter_cutype type)
-{
-	switch (type) {
-	case ICAL_CUTYPE_INDIVIDUAL:
-		return _("Individual");
-	case ICAL_CUTYPE_GROUP:
-		return _("Group");
-	case ICAL_CUTYPE_RESOURCE:
-		return _("Resource");
-	case ICAL_CUTYPE_ROOM:
-		return _("Room");
-	default:
-		return _("Unknown");
-	}
-
-	return NULL;
-
-}
-
-static icalparameter_role
-text_to_role (const char *role)
-{
-	if (!g_strcasecmp (role, _("Chair")))
-		return ICAL_ROLE_CHAIR;
-	else if (!g_strcasecmp (role, _("Required Participant")))
-		return ICAL_ROLE_REQPARTICIPANT;
-	else if (!g_strcasecmp (role, _("Optional Participant")))
-		return ICAL_ROLE_OPTPARTICIPANT;
-	else if (!g_strcasecmp (role, _("Non-Participant")))
-		return ICAL_ROLE_NONPARTICIPANT;
-	else
-		return ICAL_ROLE_NONE;
-}
-
-static char *
-role_to_text (icalparameter_role role) 
-{
-	switch (role) {
-	case ICAL_ROLE_CHAIR:
-		return _("Chair");
-	case ICAL_ROLE_REQPARTICIPANT:
-		return _("Required Participant");
-	case ICAL_ROLE_OPTPARTICIPANT:
-		return _("Optional Participant");
-	case ICAL_ROLE_NONPARTICIPANT:
-		return _("Non-Participant");
-	default:
-		return _("Unknown");
-	}
-
-	return NULL;
-}
-
-static gboolean
-text_to_boolean (const char *role)
-{
-	if (!g_strcasecmp (role, _("Yes")))
-		return TRUE;
-	else
-		return FALSE;
-}
-
-static char *
-boolean_to_text (gboolean b) 
-{
-	if (b)
-		return _("Yes");
-	else
-		return _("No");
-}
-
-static icalparameter_partstat
-text_to_partstat (const char *partstat)
-{
-	if (!g_strcasecmp (partstat, _("Needs Action")))
-		return ICAL_PARTSTAT_NEEDSACTION;
-	else if (!g_strcasecmp (partstat, _("Accepted")))
-		return ICAL_PARTSTAT_ACCEPTED;
-	else if (!g_strcasecmp (partstat, _("Declined")))
-		return ICAL_PARTSTAT_DECLINED;
-	else if (!g_strcasecmp (partstat, _("Tentative")))
-		return ICAL_PARTSTAT_TENTATIVE;
-	else if (!g_strcasecmp (partstat, _("Delegated")))
-		return ICAL_PARTSTAT_DELEGATED;
-	else if (!g_strcasecmp (partstat, _("Completed")))
-		return ICAL_PARTSTAT_COMPLETED;
-	else if (!g_strcasecmp (partstat, _("In Process")))
-		return ICAL_PARTSTAT_INPROCESS;
-	else
-		return ICAL_PARTSTAT_NONE;
-}
-
-static char *
-partstat_to_text (icalparameter_partstat partstat) 
-{
-	switch (partstat) {
-	case ICAL_PARTSTAT_NEEDSACTION:
-		return _("Needs Action");
-	case ICAL_PARTSTAT_ACCEPTED:
-		return _("Accepted");
-	case ICAL_PARTSTAT_DECLINED:
-		return _("Declined");
-	case ICAL_PARTSTAT_TENTATIVE:
-		return _("Tentative");
-	case ICAL_PARTSTAT_DELEGATED:
-		return _("Delegated");
-	case ICAL_PARTSTAT_COMPLETED:
-		return _("Completed");
-	case ICAL_PARTSTAT_INPROCESS:
-		return _("In Process");
-	case ICAL_PARTSTAT_NONE:
-	default:
-		return _("Unknown");
-	}
-
-	return NULL;
-}
-
-static GtkTreeModelFlags
-get_flags (GtkTreeModel *model)
-{
-	g_return_val_if_fail (E_IS_MEETING_STORE (model), 0);
-
-	return GTK_TREE_MODEL_ITERS_PERSIST | GTK_TREE_MODEL_LIST_ONLY;
-}
-
-static int
-get_n_columns (GtkTreeModel *model)
-{
-	g_return_val_if_fail (E_IS_MEETING_STORE (model), 0);
-
-	return E_MEETING_STORE_COLUMN_COUNT;
-}
-
-static GType
-get_column_type (GtkTreeModel *model, int col)
-{
-	g_return_val_if_fail (E_IS_MEETING_STORE (model), G_TYPE_INVALID);
-
-	switch (col) {
-	case E_MEETING_STORE_ADDRESS_COL:
-	case E_MEETING_STORE_MEMBER_COL:
-	case E_MEETING_STORE_TYPE_COL:
-	case E_MEETING_STORE_ROLE_COL:
-	case E_MEETING_STORE_RSVP_COL:
-	case E_MEETING_STORE_DELTO_COL:
-	case E_MEETING_STORE_DELFROM_COL:
-	case E_MEETING_STORE_STATUS_COL:
-	case E_MEETING_STORE_CN_COL:
-	case E_MEETING_STORE_LANGUAGE_COL:
-	case E_MEETING_STORE_ATTENDEE_COL:
-		return G_TYPE_STRING;
-	case E_MEETING_STORE_ATTENDEE_UNDERLINE_COL:
-		return PANGO_TYPE_UNDERLINE;
-	default:
-		return G_TYPE_INVALID;
-	}
-}
-
-static gboolean
-get_iter (GtkTreeModel *model, GtkTreeIter *iter, GtkTreePath *path)
-{
-	int row;
-
-	g_return_val_if_fail (E_IS_MEETING_STORE (model), FALSE);
-	g_return_val_if_fail (gtk_tree_path_get_depth (path) > 0, FALSE);
-
-	row = gtk_tree_path_get_indices (path) [0];
-
-	if (!ROW_VALID (E_MEETING_STORE (model), row))
-	       return FALSE;
-
-	iter->stamp = E_MEETING_STORE (model)->priv->stamp;
-	iter->user_data = GINT_TO_POINTER (row);
-
-	return TRUE;
-}
-
-static GtkTreePath *
-get_path (GtkTreeModel *model, GtkTreeIter *iter)
-{
-	int row;
-	GtkTreePath *result;
-
-	g_return_val_if_fail (E_IS_MEETING_STORE (model), NULL);
-	g_return_val_if_fail (iter->stamp == E_MEETING_STORE (model)->priv->stamp, NULL);
-
-	row = GPOINTER_TO_INT (iter->user_data);
-
-	g_return_val_if_fail (ROW_VALID (E_MEETING_STORE (model), row), NULL);
-
-	result = gtk_tree_path_new ();
-	gtk_tree_path_append_index (result, row);
-	return result;
-}
-	
-static void
-get_value (GtkTreeModel *model, GtkTreeIter *iter, int col, GValue *value)
-{
-	EMeetingStore *store;
-	EMeetingAttendee *attendee;
-	const gchar *cn;
-	int row;
-
-	g_return_if_fail (E_IS_MEETING_STORE (model));
-	g_return_if_fail (col >= 0 && col < E_MEETING_STORE_COLUMN_COUNT);
-
-	row = GPOINTER_TO_INT (iter->user_data);
-	store = E_MEETING_STORE (model);	
-
-	g_return_if_fail (iter->stamp == store->priv->stamp);
-	g_return_if_fail (ROW_VALID (E_MEETING_STORE (model), row));
-
-	attendee = g_ptr_array_index (store->priv->attendees, row);
-	
-	switch (col) {
-	case E_MEETING_STORE_ADDRESS_COL:
-		g_value_init (value, G_TYPE_STRING);
-		g_value_set_string (value, itip_strip_mailto (e_meeting_attendee_get_address (attendee)));
-		break;
-	case E_MEETING_STORE_MEMBER_COL:
-		g_value_init (value, G_TYPE_STRING);
-		g_value_set_string (value, e_meeting_attendee_get_member (attendee));
-		break;
-	case E_MEETING_STORE_TYPE_COL:
-		g_value_init (value, G_TYPE_STRING);
-		g_value_set_string (value, type_to_text (e_meeting_attendee_get_cutype (attendee)));
-		break;
-	case E_MEETING_STORE_ROLE_COL:
-		g_value_init (value, G_TYPE_STRING);
-		g_value_set_string (value, role_to_text (e_meeting_attendee_get_role (attendee)));
-		break;
-	case E_MEETING_STORE_RSVP_COL:
-		g_value_init (value, G_TYPE_STRING);
-		g_value_set_string (value, boolean_to_text (e_meeting_attendee_get_rsvp (attendee)));
-		break;
-	case E_MEETING_STORE_DELTO_COL:
-		g_value_init (value, G_TYPE_STRING);
-		g_value_set_string (value, itip_strip_mailto (e_meeting_attendee_get_delto (attendee)));
-		break;
-	case E_MEETING_STORE_DELFROM_COL:
-		g_value_init (value, G_TYPE_STRING);
-		g_value_set_string (value, itip_strip_mailto (e_meeting_attendee_get_delfrom (attendee)));
-		break;
-	case E_MEETING_STORE_STATUS_COL:
-		g_value_init (value, G_TYPE_STRING);
-		g_value_set_string (value, partstat_to_text (e_meeting_attendee_get_status (attendee)));
-		break;
-	case E_MEETING_STORE_CN_COL:
-		g_value_init (value, G_TYPE_STRING);
-		g_value_set_string (value, e_meeting_attendee_get_cn (attendee));
-		break;
-	case E_MEETING_STORE_LANGUAGE_COL:
-		g_value_init (value, G_TYPE_STRING);
-		g_value_set_string (value, e_meeting_attendee_get_language (attendee));
-		break;
-	case E_MEETING_STORE_ATTENDEE_COL:
-		g_value_init (value, G_TYPE_STRING);
-		cn = e_meeting_attendee_get_cn (attendee);
-		if (strcmp (cn, ""))
-			g_value_set_string (value, cn);
-		else
-			g_value_set_string (value, itip_strip_mailto (e_meeting_attendee_get_address (attendee)));
-		break;
-	case E_MEETING_STORE_ATTENDEE_UNDERLINE_COL:
-		cn = e_meeting_attendee_get_cn (attendee);
-		g_value_init (value, PANGO_TYPE_UNDERLINE);
-		g_value_set_enum (value, strcmp ("", cn) == 0 ? PANGO_UNDERLINE_NONE : PANGO_UNDERLINE_SINGLE);
-	}
-}
-
-static gboolean
-iter_next (GtkTreeModel *model, GtkTreeIter *iter)
-{
-	int row;
-
-	g_return_val_if_fail (E_IS_MEETING_STORE (model), FALSE);
-	g_return_val_if_fail (iter->stamp == E_MEETING_STORE (model)->priv->stamp, FALSE);
-
-	row = GPOINTER_TO_INT (iter->user_data) + 1;
-	iter->user_data = GINT_TO_POINTER (row);
-
-	return ROW_VALID (E_MEETING_STORE (model), row);
-}
-
-static gboolean
-iter_children (GtkTreeModel *model, GtkTreeIter *iter, GtkTreeIter *parent)
-{
-	EMeetingStore *store;
-
-	g_return_val_if_fail (E_IS_MEETING_STORE (model), FALSE);
-
-	store = E_MEETING_STORE (model);	
-
-	if (parent || store->priv->attendees->len <= 0)
-		return FALSE;
-
-	iter->stamp = store->priv->stamp;
-	iter->user_data = GINT_TO_POINTER (0);
-	
-	return TRUE;
-}
-
-static gboolean
-iter_has_child (GtkTreeModel *model, GtkTreeIter *iter)
-{
-	return FALSE;
-}
-
-static int
-iter_n_children (GtkTreeModel *model, GtkTreeIter *iter)
-{
-	g_return_val_if_fail (E_IS_MEETING_STORE (model), -1);
-	
-	if (!iter)
-		return E_MEETING_STORE (model)->priv->attendees->len;
-
-	g_return_val_if_fail (iter->stamp == E_MEETING_STORE (model)->priv->stamp, -1);
-
-	return 0;
-}
-
-static gboolean
-iter_nth_child (GtkTreeModel *model, GtkTreeIter *iter, GtkTreeIter *parent, int n)
-{
-	EMeetingStore *store;
-
-	g_return_val_if_fail (E_IS_MEETING_STORE (model), FALSE);
-
-	store = E_MEETING_STORE (model);	
-
-	if (parent || !ROW_VALID (store, n))
-		return FALSE;
-
-	iter->stamp = store->priv->stamp;
-	iter->user_data = GINT_TO_POINTER (n);
-
-	return TRUE;
-}
-
-static gboolean
-iter_parent (GtkTreeModel *model, GtkTreeIter *iter, GtkTreeIter *child)
-{
-	return FALSE;
-}
-
-static void
-ems_tree_model_init (GtkTreeModelIface *iface)
-{
-	iface->get_flags = get_flags;
-	iface->get_n_columns = get_n_columns;
-	iface->get_column_type = get_column_type;
-	iface->get_iter = get_iter;
-	iface->get_path = get_path;
-	iface->get_value = get_value;
-	iface->iter_next = iter_next;
-	iface->iter_children = iter_children;
-	iface->iter_has_child = iter_has_child;
-	iface->iter_n_children = iter_n_children;
-	iface->iter_nth_child = iter_nth_child;
-	iface->iter_parent = iter_parent;
-}
-
-void
-e_meeting_store_set_value (EMeetingStore *store, int row, int col, const gchar *val)
-{
-	icalparameter_cutype type;
-	EMeetingAttendee *attendee = g_ptr_array_index (store->priv->attendees, row);
-
-	switch (col) {
-	case E_MEETING_STORE_ADDRESS_COL:
-		if (val != NULL && *((char *)val))
-			e_meeting_attendee_set_address (attendee, g_strdup_printf ("MAILTO:%s", (char *) val));
-		break;
-	case E_MEETING_STORE_MEMBER_COL:
-		e_meeting_attendee_set_member (attendee, g_strdup (val));
-		break;
-	case E_MEETING_STORE_TYPE_COL:
-		type = text_to_type (val);
-		e_meeting_attendee_set_cutype (attendee, text_to_type (val));
-		if (type == ICAL_CUTYPE_RESOURCE) {
-			e_meeting_attendee_set_role (attendee, ICAL_ROLE_NONPARTICIPANT);
-		}		
-		break;
-	case E_MEETING_STORE_ROLE_COL:
-		e_meeting_attendee_set_role (attendee, text_to_role (val));
-		break;
-	case E_MEETING_STORE_RSVP_COL:
-		e_meeting_attendee_set_rsvp (attendee, text_to_boolean (val));
-		break;
-	case E_MEETING_STORE_DELTO_COL:
-		e_meeting_attendee_set_delto (attendee, g_strdup (val));
-		break;
-	case E_MEETING_STORE_DELFROM_COL:
-		e_meeting_attendee_set_delfrom (attendee, g_strdup (val));
-		break;
-	case E_MEETING_STORE_STATUS_COL:
-		e_meeting_attendee_set_status (attendee, text_to_partstat (val));
-		break;
-	case E_MEETING_STORE_CN_COL:
-		e_meeting_attendee_set_cn (attendee, g_strdup (val));
-		break;
-	case E_MEETING_STORE_LANGUAGE_COL:
-		e_meeting_attendee_set_language (attendee, g_strdup (val));
-		break;
-	}
-}
-
-static gboolean
-is_cell_editable (EMeetingStore *etm, int col, int row)
-{
-	EMeetingStore *store;
-	EMeetingStorePrivate *priv;
-	EMeetingAttendee *attendee;
-	EMeetingAttendeeEditLevel level;
-	
-	store = E_MEETING_STORE (etm);	
-	priv = store->priv;
-	
-	if (col == E_MEETING_STORE_DELTO_COL
-	    || col == E_MEETING_STORE_DELFROM_COL)
-		return FALSE;
-	
-	if (row == -1)
-		return TRUE;
-	if (row >= priv->attendees->len)
-		return TRUE;
-	
-	attendee = g_ptr_array_index (priv->attendees, row);
-	level = e_meeting_attendee_get_edit_level (attendee);
-
-	switch (level) {
-	case E_MEETING_ATTENDEE_EDIT_FULL:
-		return TRUE;
-	case E_MEETING_ATTENDEE_EDIT_STATUS:
-		return col == E_MEETING_STORE_STATUS_COL;
-	case E_MEETING_ATTENDEE_EDIT_NONE:
-		return FALSE;
-	}
-
-	return TRUE;
-}
-
-static void
-refresh_queue_remove (EMeetingStore *store, EMeetingAttendee *attendee) 
-{
-	EMeetingStorePrivate *priv;
-	EMeetingStoreQueueData *qdata;
-	
-	priv = store->priv;
-	
-	/* Free the queue data */
-	qdata = g_hash_table_lookup (priv->refresh_data, itip_strip_mailto (e_meeting_attendee_get_address (attendee)));
-	if (qdata) {
-		g_mutex_lock (priv->mutex);
-		g_hash_table_remove (priv->refresh_data, itip_strip_mailto (e_meeting_attendee_get_address (attendee)));
-		g_mutex_unlock (priv->mutex);
-		g_ptr_array_free (qdata->call_backs, TRUE);
-		g_ptr_array_free (qdata->data, TRUE);
-		g_free (qdata);
-	}
-
-	/* Unref the attendee */
-	g_ptr_array_remove (priv->refresh_queue, attendee);
-	g_object_unref (attendee);
-}
-
-static void
-ems_finalize (GObject *obj)
-{
-	EMeetingStore *store = E_MEETING_STORE (obj);
-	EMeetingStorePrivate *priv;
-	int i;
-	
-	priv = store->priv;
-
-	for (i = 0; i < priv->attendees->len; i++)
-		g_object_unref (g_ptr_array_index (priv->attendees, i));
-	g_ptr_array_free (priv->attendees, TRUE); 
-
-	if (priv->client != NULL)
-		g_object_unref (priv->client);
-
-	if (priv->ebook != NULL)
-		g_object_unref (priv->ebook);
-
- 	while (priv->refresh_queue->len > 0)
- 		refresh_queue_remove (store, g_ptr_array_index (priv->refresh_queue, 0));
- 	g_ptr_array_free (priv->refresh_queue, TRUE);
- 	g_hash_table_destroy (priv->refresh_data);
- 	
- 	if (priv->refresh_idle_id)
- 		g_source_remove (priv->refresh_idle_id);
-
- 	if (priv->callback_idle_id)
- 		g_source_remove (priv->callback_idle_id);
-
-	g_free (priv->fb_uri);
-
-	g_mutex_free (priv->mutex);
-
-	g_async_queue_unref (priv->async_queue);
- 		
-	g_free (priv);
-
-	if (G_OBJECT_CLASS (parent_class)->finalize)
- 		(* G_OBJECT_CLASS (parent_class)->finalize) (obj);
-}
-
-static void
-ems_class_init (GObjectClass *klass)
-{
-	parent_class = g_type_class_peek_parent (klass);
-
-	klass->finalize = ems_finalize;
-}
-
-
-static void
-ems_init (EMeetingStore *store)
-{
-	EMeetingStorePrivate *priv;
-
-	priv = g_new0 (EMeetingStorePrivate, 1);
-
-	store->priv = priv;
-
-	priv->attendees = g_ptr_array_new ();
-	
-	priv->zone = calendar_config_get_icaltimezone ();
-
-	priv->fb_uri = calendar_config_get_free_busy_template ();
-	
-	priv->refresh_queue = g_ptr_array_new ();
-	priv->refresh_data = g_hash_table_new (g_str_hash, g_str_equal);
-
-	priv->mutex = g_mutex_new ();
-
-	priv->async_queue = g_async_queue_new ();
-
-	start_addressbook_server (store);
-}
-
-GType
-e_meeting_store_get_type (void)
-{
-	static GType ems_type = 0;
-
-	if (!ems_type) {
-		static const GTypeInfo ems_info = {
-				sizeof (EMeetingStoreClass),
-				NULL,           /* base_init */
-				NULL,           /* base_finalize */
-				(GClassInitFunc) ems_class_init,
-				NULL,           /* class_finalize */
-				NULL,           /* class_data */
-				sizeof (EMeetingStore),
-				0,
-				(GInstanceInitFunc) ems_init };
-				                                                                                                
-		static const GInterfaceInfo tree_model_info = {
-				(GInterfaceInitFunc) ems_tree_model_init,
-				NULL,
-				NULL };
-					                                                                                              
-		ems_type = g_type_register_static (GTK_TYPE_LIST_STORE, 
-						   "EMeetingStore",
-						   &ems_info, 0);
- 
-		g_type_add_interface_static (ems_type, 
-					     GTK_TYPE_TREE_MODEL, 
-					     &tree_model_info);
-	}
-
-	return ems_type;
-}
-
-GObject *
-e_meeting_store_new (void)
-{
-	return g_object_new (E_TYPE_MEETING_STORE, NULL);
-}
-
-
-ECal *
-e_meeting_store_get_e_cal (EMeetingStore *store)
-{
-	return store->priv->client;
-}
-
-void
-e_meeting_store_set_e_cal (EMeetingStore *store, ECal *client)
-{
-	if (store->priv->client != NULL)
-		g_object_unref (store->priv->client);
-	
-	if (client != NULL)
-		g_object_ref (client);
-	store->priv->client = client;
-}
-
-icaltimezone *
-e_meeting_store_get_zone (EMeetingStore *store)
-{
-	g_return_val_if_fail (E_IS_MEETING_STORE (store), NULL);
-
-	return store->priv->zone;
-}
-
-void
-e_meeting_store_set_zone (EMeetingStore *store, icaltimezone *zone)
-{
-	g_return_if_fail (E_IS_MEETING_STORE (store));
-
-	store->priv->zone = zone;
-}
-
-gchar *
-e_meeting_store_get_fb_uri (EMeetingStore *store) 
-{
-	g_return_val_if_fail (E_IS_MEETING_STORE (store), NULL);
-
-	return g_strdup (store->priv->fb_uri);
-}
-
-void 
-e_meeting_store_set_fb_uri (EMeetingStore *store, const gchar *fb_uri)
-{
-	g_return_if_fail (E_IS_MEETING_STORE (store));
-
-	g_free (store->priv->fb_uri);
-	store->priv->fb_uri = g_strdup (fb_uri);
-}
-
-static void
-attendee_changed_cb (EMeetingAttendee *attendee, gpointer data)
-{
-	EMeetingStore *store = E_MEETING_STORE (data);
-	GtkTreePath *path;
-	GtkTreeIter iter;
-	gint row = -1, i;
-	                                                                           
-	for (i = 0; i < store->priv->attendees->len; i++) {
-		if (attendee == g_ptr_array_index (store->priv->attendees, i)) {
-			row = i;
-			break;
-		}
-	}
-	                                                                                  
-	if (row == -1)
-		return;
-
-	path = gtk_tree_path_new ();
-	gtk_tree_path_append_index (path, row);
-	get_iter (GTK_TREE_MODEL (store), &iter, path);
-	gtk_tree_model_row_changed (GTK_TREE_MODEL (store), path, &iter);
-	gtk_tree_path_free (path);
-}
-
-void
-e_meeting_store_add_attendee (EMeetingStore *store, EMeetingAttendee *attendee)
-{
-	GtkTreePath *path;
-	GtkTreeIter iter;
-
-	g_return_if_fail (E_IS_MEETING_STORE (store));
-
-	g_object_ref (attendee);
-	g_ptr_array_add (store->priv->attendees, attendee);
-
-	g_signal_connect (attendee, "changed", G_CALLBACK (attendee_changed_cb), store);
-
-	path = gtk_tree_path_new ();
-	gtk_tree_path_append_index (path, store->priv->attendees->len - 1);
-	get_iter (GTK_TREE_MODEL (store), &iter, path);
-	gtk_tree_model_row_inserted (GTK_TREE_MODEL (store), path, &iter);
-	gtk_tree_path_free (path);
-}
-
-EMeetingAttendee *
-e_meeting_store_add_attendee_with_defaults (EMeetingStore *store)
-{
-	EMeetingAttendee *attendee;
-	char *str;
-	
-	attendee = E_MEETING_ATTENDEE (e_meeting_attendee_new ());
-
-	e_meeting_attendee_set_address (attendee, g_strdup (""));
-	e_meeting_attendee_set_member (attendee, g_strdup (""));
-
-	str = g_strdup (_("Individual"));
-	e_meeting_attendee_set_cutype (attendee, text_to_type (str));
-	g_free (str);
-	str = g_strdup (_("Required Participant"));
-	e_meeting_attendee_set_role (attendee, text_to_role (str));
-	g_free (str);	
-	str = g_strdup (_("Yes"));
-	e_meeting_attendee_set_rsvp (attendee, text_to_boolean (str));
-	g_free (str);
-	
-	e_meeting_attendee_set_delto (attendee, g_strdup (""));
-	e_meeting_attendee_set_delfrom (attendee, g_strdup (""));
-
-	str = g_strdup (_("Needs Action"));
-	e_meeting_attendee_set_status (attendee, text_to_partstat (str));
-	g_free (str);
-
-	e_meeting_attendee_set_cn (attendee, g_strdup (""));
-	e_meeting_attendee_set_language (attendee, g_strdup ("en"));
-
-	e_meeting_store_add_attendee (store, attendee);
-
-	return attendee;
-}
-
-void
-e_meeting_store_remove_attendee (EMeetingStore *store, EMeetingAttendee *attendee)
-{
-	gint i, row = -1;
-	GtkTreePath *path;
-
-	for (i = 0; i < store->priv->attendees->len; i++) {
-		if (attendee == g_ptr_array_index (store->priv->attendees, i)) {
-			row = i;
-			break;
-		}
-	}	
-	
-	if (row != -1) {
-
-		g_ptr_array_remove_index (store->priv->attendees, row);		
-		g_object_unref (attendee);
-
-		path = gtk_tree_path_new ();
-		gtk_tree_path_append_index (path, row);
-		gtk_tree_model_row_deleted (GTK_TREE_MODEL (store), path);
-		gtk_tree_path_free (path);
-	}
-}
-
-void
-e_meeting_store_remove_all_attendees (EMeetingStore *store)
-{
-	gint i;
-	GtkTreePath *path = gtk_tree_path_new ();
-
-	gtk_tree_path_append_index (path, 0);
-
-	for (i = 0; i < store->priv->attendees->len; i++) {
-		EMeetingAttendee *attendee = g_ptr_array_index (store->priv->attendees, i);
-		g_object_unref (attendee);
-
-		gtk_tree_model_row_deleted (GTK_TREE_MODEL (store), path);
-		gtk_tree_path_next (path);
-	}
-
-	g_ptr_array_set_size (store->priv->attendees, 0);
-	gtk_tree_path_free (path);
-}
-
-EMeetingAttendee *
-e_meeting_store_find_attendee (EMeetingStore *store, const gchar *address, gint *row)
-{
-	EMeetingAttendee *attendee;
-	int i;
-	
-	if (address == NULL)
-		return NULL;
-	
-	for (i = 0; i < store->priv->attendees->len; i++) {
-		const gchar *attendee_address;
-		
-		attendee = g_ptr_array_index (store->priv->attendees, i);
-			
-		attendee_address = e_meeting_attendee_get_address (attendee);
-		if (attendee_address && !g_strcasecmp (itip_strip_mailto (attendee_address), itip_strip_mailto (address))) {
-			if (row != NULL)
-				*row = i;
-
-			return attendee;
-		}
-	}
-
-	return NULL;
-}
-
-EMeetingAttendee *
-e_meeting_store_find_attendee_at_row (EMeetingStore *store, gint row)
-{
-	g_return_val_if_fail (E_IS_MEETING_STORE (store), NULL);
-	g_return_val_if_fail (ROW_VALID (store, row), NULL);
-
-	return g_ptr_array_index (store->priv->attendees, row);
-}
-
-GtkTreePath *
-e_meeting_store_find_attendee_path (EMeetingStore *store, EMeetingAttendee *attendee)
-{
-	GtkTreePath *path;
-	gint row = -1, i;
-	                                                                           
-	for (i = 0; i < store->priv->attendees->len; i++) {
-		if (attendee == g_ptr_array_index (store->priv->attendees, i)) {
-			row = i;
-			break;
-		}
-	}
-	                                                                                  
-	if (row == -1)
-		return NULL;
-
-	path = gtk_tree_path_new ();
-	gtk_tree_path_append_index (path, row);
-
-	return path;	
-}
-
-gint 
-e_meeting_store_count_actual_attendees (EMeetingStore *store)
-{
-	g_return_val_if_fail (E_IS_MEETING_STORE (store), 0);
-
-	return store->priv->attendees->len;	
-}
-
-const GPtrArray *
-e_meeting_store_get_attendees (EMeetingStore *store)
-{
-	g_return_val_if_fail (E_IS_MEETING_STORE (store), NULL);
-
-	return store->priv->attendees;
-}
-
-static icaltimezone *
-find_zone (icalproperty *ip, icalcomponent *tz_top_level)
-{
-	icalparameter *param;
-	icalcomponent *sub_comp;
-	const char *tzid;
-	icalcompiter iter;
-
-	if (tz_top_level == NULL)
-		return NULL;
-	
-	param = icalproperty_get_first_parameter (ip, ICAL_TZID_PARAMETER);
-	if (param == NULL)
-		return NULL;
-	tzid = icalparameter_get_tzid (param);
-
-	iter = icalcomponent_begin_component (tz_top_level, ICAL_VTIMEZONE_COMPONENT);
-	while ((sub_comp = icalcompiter_deref (&iter)) != NULL) {
-		icalcomponent *clone;
-		icalproperty *prop;
-		const char *tz_tzid;
-
-		prop = icalcomponent_get_first_property (sub_comp, ICAL_TZID_PROPERTY);
-		tz_tzid = icalproperty_get_tzid (prop);
-		if (!strcmp (tzid, tz_tzid)) {
-			icaltimezone *zone;
-
-			zone = icaltimezone_new ();
-			clone = icalcomponent_new_clone (sub_comp);
-			icaltimezone_set_component (zone, clone);
-			
-			return zone;
-		}
-		
-		icalcompiter_next (&iter);
-	}
-
-	return NULL;
-}
-
-typedef struct {
-	EMeetingStoreRefreshCallback call_back;
-	gpointer *data;
-} QueueCbData;
-
-/* Process the callbacks in the main thread. Avoids widget redrawing issues. */
-static gboolean
-process_callbacks_main_thread (EMeetingStore *store)
-{
-	EMeetingStorePrivate *priv;
-	QueueCbData *aqueue_data;
-	gboolean threads_done = FALSE;
-
-	priv = store->priv;
-
-	g_mutex_lock (priv->mutex);
-	if (priv->num_threads == 0) {
-		threads_done = TRUE;
-		priv->callback_idle_id = 0;
-	}
-	g_mutex_unlock (priv->mutex);
-
-	while ((aqueue_data = g_async_queue_try_pop (priv->async_queue)) != NULL) {
-		aqueue_data->call_back (aqueue_data->data);
-
-		g_free (aqueue_data);
-	}
-
-		return !threads_done;
-}
-
-static void
-process_callbacks (EMeetingStoreQueueData *qdata) 
-{
-	EMeetingStore *store;
-	int i;
-
-	store = qdata->store;
-
-	for (i = 0; i < qdata->call_backs->len; i++) {
-		QueueCbData *aqueue_data = g_new0 (QueueCbData, 1);
-
-		aqueue_data->call_back = g_ptr_array_index (qdata->call_backs, i);
-		aqueue_data->data = g_ptr_array_index (qdata->data, i);
-
-		g_async_queue_push (store->priv->async_queue, aqueue_data);
-	}
-
-	g_mutex_lock (store->priv->mutex);
-	store->priv->num_threads--;
-	g_mutex_unlock (store->priv->mutex);
-
-	refresh_queue_remove (qdata->store, qdata->attendee);
-	g_async_queue_unref (store->priv->async_queue);
-	g_object_unref (store);
-}
-
-static void
-process_free_busy_comp (EMeetingAttendee *attendee,
-			icalcomponent *fb_comp,
-			icaltimezone *zone,
-			icalcomponent *tz_top_level)
-{
-	icalproperty *ip;
-	
-	ip = icalcomponent_get_first_property (fb_comp, ICAL_DTSTART_PROPERTY);
-	if (ip != NULL) {
-		struct icaltimetype dtstart;
-		icaltimezone *ds_zone;
-		
-		dtstart = icalproperty_get_dtstart (ip);
-		if (!dtstart.is_utc)
-			ds_zone = find_zone (ip, tz_top_level);
-		else
-			ds_zone = icaltimezone_get_utc_timezone ();
-		icaltimezone_convert_time (&dtstart, ds_zone, zone);
-		e_meeting_attendee_set_start_busy_range (attendee,
-							 dtstart.year,
-							 dtstart.month,
-							 dtstart.day,
-							 dtstart.hour,
-							 dtstart.minute);
-	}
-	
-	ip = icalcomponent_get_first_property (fb_comp, ICAL_DTEND_PROPERTY);
-	if (ip != NULL) {
-		struct icaltimetype dtend;
-		icaltimezone *de_zone;
-		
-		dtend = icalproperty_get_dtend (ip);
-		if (!dtend.is_utc)
-			de_zone = find_zone (ip, tz_top_level);
-		else
-			de_zone = icaltimezone_get_utc_timezone ();
-		icaltimezone_convert_time (&dtend, de_zone, zone);
-		e_meeting_attendee_set_end_busy_range (attendee,
-						       dtend.year,
-						       dtend.month,
-						       dtend.day,
-						       dtend.hour,
-						       dtend.minute);
-	}
-	
-	ip = icalcomponent_get_first_property (fb_comp, ICAL_FREEBUSY_PROPERTY);
-	while (ip != NULL) {
-		icalparameter *param;
-		struct icalperiodtype fb;
-		EMeetingFreeBusyType busy_type = E_MEETING_FREE_BUSY_LAST;
-		icalparameter_fbtype fbtype = ICAL_FBTYPE_BUSY;
-			
-		fb = icalproperty_get_freebusy (ip);
-		param = icalproperty_get_first_parameter (ip, ICAL_FBTYPE_PARAMETER);
-		if (param != NULL)
-			fbtype =  icalparameter_get_fbtype (param);
-			
-		switch (fbtype) {
-		case ICAL_FBTYPE_BUSY:
-			busy_type = E_MEETING_FREE_BUSY_BUSY;
-			break;
-
-		case ICAL_FBTYPE_BUSYUNAVAILABLE:
-			busy_type = E_MEETING_FREE_BUSY_OUT_OF_OFFICE;
-			break;
-
-		case ICAL_FBTYPE_BUSYTENTATIVE:
-			busy_type = E_MEETING_FREE_BUSY_TENTATIVE;
-			break;
-
-		default:
-			break;
-		}
-			
-		if (busy_type != E_MEETING_FREE_BUSY_LAST) {
-			icaltimezone *utc_zone = icaltimezone_get_utc_timezone ();
-
-			icaltimezone_convert_time (&fb.start, utc_zone, zone);
-			icaltimezone_convert_time (&fb.end, utc_zone, zone);
-			e_meeting_attendee_add_busy_period (attendee,
-							    fb.start.year,
-							    fb.start.month,
-							    fb.start.day,
-							    fb.start.hour,
-							    fb.start.minute,
-							    fb.end.year,
-							    fb.end.month,
-							    fb.end.day,
-							    fb.end.hour,
-							    fb.end.minute,
-							    busy_type);
-		}
-		
-		ip = icalcomponent_get_next_property (fb_comp, ICAL_FREEBUSY_PROPERTY);
-	}
-}
-
-static void
-process_free_busy (EMeetingStoreQueueData *qdata, char *text)
-{
- 	EMeetingStore *store = qdata->store;
- 	EMeetingStorePrivate *priv;
- 	EMeetingAttendee *attendee = qdata->attendee;
-	icalcomponent *main_comp;
-	icalcomponent_kind kind = ICAL_NO_COMPONENT;
-
-	priv = store->priv;
-
-	main_comp = icalparser_parse_string (text);
- 	if (main_comp == NULL) {
- 		process_callbacks (qdata);
-  		return;
- 	}
-
-	kind = icalcomponent_isa (main_comp);
-	if (kind == ICAL_VCALENDAR_COMPONENT) {	
-		icalcompiter iter;
-		icalcomponent *tz_top_level, *sub_comp;
-
-		tz_top_level = e_cal_util_new_top_level ();
-		
-		iter = icalcomponent_begin_component (main_comp, ICAL_VTIMEZONE_COMPONENT);
-		while ((sub_comp = icalcompiter_deref (&iter)) != NULL) {
-			icalcomponent *clone;
-			
-			clone = icalcomponent_new_clone (sub_comp);
-			icalcomponent_add_component (tz_top_level, clone);
-			
-			icalcompiter_next (&iter);
-		}
-
-		iter = icalcomponent_begin_component (main_comp, ICAL_VFREEBUSY_COMPONENT);
-		while ((sub_comp = icalcompiter_deref (&iter)) != NULL) {
-			process_free_busy_comp (attendee, sub_comp, priv->zone, tz_top_level);
-
-			icalcompiter_next (&iter);
-		}
-		icalcomponent_free (tz_top_level);
-	} else if (kind == ICAL_VFREEBUSY_COMPONENT) {
-		process_free_busy_comp (attendee, main_comp, priv->zone, NULL);
-	}
-	
-	icalcomponent_free (main_comp);
-
-	process_callbacks (qdata);
-}
-
-/* 
- * Replace all instances of from_value in string with to_value 
- * In the returned newly allocated string. 
-*/
-static gchar *
-replace_string (gchar *string, gchar *from_value, gchar *to_value)
-{
-	gchar *replaced;
-	gchar **split_uri;
-
-	split_uri = g_strsplit (string, from_value, 0);
-	replaced = g_strjoinv (to_value, split_uri);
-	g_strfreev (split_uri);
-
-	return replaced;
-}
-
-typedef struct {
-	ECal *client;
-	time_t startt;
-	time_t endt;
-	GList *users;
-	GList *fb_data;
-	char *fb_uri;
-	char *email;
-	EMeetingAttendee *attendee;
-	EMeetingStoreQueueData *qdata;
-} FreeBusyAsyncData;
-
-#define USER_SUB   "%u"
-#define DOMAIN_SUB "%d"
-
-static gboolean
-freebusy_async (gpointer data)
-{
-	FreeBusyAsyncData *fbd = data;
-	EMeetingAttendee *attendee = fbd->attendee;
-	gchar *default_fb_uri;
-
-	if (fbd->client) {
-		e_cal_get_free_busy (fbd->client, fbd->users, fbd->startt, fbd->endt, &(fbd->fb_data), NULL);
-
-		g_list_foreach (fbd->users, (GFunc)g_free, NULL);
-		g_list_free (fbd->users);
-
-		if (fbd->fb_data != NULL) {
-			ECalComponent *comp = fbd->fb_data->data;
-			char *comp_str;
-				
-			comp_str = e_cal_component_get_as_string (comp);
-			process_free_busy (fbd->qdata, comp_str);
-			g_free (comp_str);
-
-			return TRUE;
-		}
-	}
-
-	/* Look for fburl's of attendee with no free busy info on server */
-	if (!e_meeting_attendee_is_set_address (attendee)) {
-		process_callbacks (fbd->qdata);
-		return TRUE;
-	}
-
-	
-
-	/* Check for free busy info on the default server */
-	default_fb_uri = g_strdup (fbd->fb_uri);
-
-	if (default_fb_uri != NULL && !g_str_equal (default_fb_uri, "")) {
-		GnomeVFSAsyncHandle *handle;
-		gchar *tmp_fb_uri;
-		gchar **split_email;
-		
-		split_email = g_strsplit (fbd->email, "@", 2);
-
-		tmp_fb_uri = replace_string (default_fb_uri, USER_SUB, split_email[0]);
-		g_free (default_fb_uri);
-		default_fb_uri = replace_string (tmp_fb_uri, DOMAIN_SUB, split_email[1]);
-
-		gnome_vfs_async_open (&handle, default_fb_uri, GNOME_VFS_OPEN_READ, 
-				      GNOME_VFS_PRIORITY_DEFAULT, start_async_read, 
-				      fbd->qdata);
-		
-		g_free (tmp_fb_uri);
-		g_strfreev (split_email);
-		g_free (default_fb_uri);
-	} else {
-		process_callbacks (fbd->qdata);
-	}
-
-	return TRUE;
-
-
-}
-
-#undef USER_SUB
-#undef DOMAIN_SUB
-
-
-static gboolean
-refresh_busy_periods (gpointer data)
-{	
-	EMeetingStore *store = E_MEETING_STORE (data);
-	EMeetingStorePrivate *priv;
-	EMeetingAttendee *attendee = NULL;
-	EMeetingStoreQueueData *qdata = NULL;
-	int i;
-	GThread *thread;
-	GError *error = NULL;
-	FreeBusyAsyncData *fbd;
-	
-	priv = store->priv;
-
-	/* Check to see if there are any remaining attendees in the queue */
-	for (i = 0; i < priv->refresh_queue->len; i++) {
-		attendee = g_ptr_array_index (priv->refresh_queue, i);
-		g_assert (attendee != NULL);
-
-		qdata = g_hash_table_lookup (priv->refresh_data, itip_strip_mailto (e_meeting_attendee_get_address (attendee)));
-		if (!qdata)
-			continue;
-
-		if (!qdata->refreshing)
-			break;
-	}
-
-	/* The everything in the queue is being refreshed */
-	if (i >= priv->refresh_queue->len) {
-		priv->refresh_idle_id = 0;
-		return FALSE;
-	}
-	
-	/* Indicate we are trying to refresh it */
-	qdata->refreshing = TRUE;
-
-	/* We take a ref in case we get destroyed in the gui during a callback */
-	g_object_ref (qdata->store);
-	
-	fbd = g_new0 (FreeBusyAsyncData, 1);
-	fbd->client = priv->client;
-	fbd->attendee = attendee;
-	fbd->users = NULL;
-	fbd->fb_data = NULL;	
-	fbd->qdata = qdata;
-	fbd->fb_uri = priv->fb_uri;
-	fbd->email = g_strdup (itip_strip_mailto (e_meeting_attendee_get_address (attendee)));
-
-	/* Check the server for free busy data */	
-	if (priv->client) {
-		struct icaltimetype itt;
-				
-		itt = icaltime_null_time ();
-		itt.year = g_date_year (&qdata->start.date);
-		itt.month = g_date_month (&qdata->start.date);
-		itt.day = g_date_day (&qdata->start.date);
-		itt.hour = qdata->start.hour;
-		itt.minute = qdata->start.minute;
-		fbd->startt = icaltime_as_timet_with_zone (itt, priv->zone);
-
-		itt = icaltime_null_time ();
-		itt.year = g_date_year (&qdata->end.date);
-		itt.month = g_date_month (&qdata->end.date);
-		itt.day = g_date_day (&qdata->end.date);
-		itt.hour = qdata->end.hour;
-		itt.minute = qdata->end.minute;
-		fbd->endt = icaltime_as_timet_with_zone (itt, priv->zone);
-		fbd->qdata = qdata;
-
-		fbd->users = g_list_append (fbd->users, g_strdup (fbd->email));
-
-	}
-
-
-	g_async_queue_ref (priv->async_queue);
-
-	g_mutex_lock (store->priv->mutex);
-	store->priv->num_threads++;
-	g_mutex_unlock (store->priv->mutex);
-
-	thread = g_thread_create ((GThreadFunc) freebusy_async, fbd, FALSE, &error);
-	if (!thread) {
-		/* do clean up stuff here */
-		g_list_foreach (fbd->users, (GFunc)g_free, NULL);
-		g_list_free (fbd->users);
-		g_free (fbd->email);
-		priv->refresh_idle_id = 0;
-
-		g_async_queue_unref (priv->async_queue);
-
-		g_mutex_lock (store->priv->mutex);
-		store->priv->num_threads--;
-		g_mutex_unlock (store->priv->mutex);
-
-		return FALSE;
-	} else if (priv->callback_idle_id == 0) {
-		priv->callback_idle_id = g_idle_add (process_callbacks_main_thread, 
-						     store);
-	}
-	return TRUE;
-}
-		
-static void
-refresh_queue_add (EMeetingStore *store, int row,
-		   EMeetingTime *start,
-		   EMeetingTime *end,
-		   EMeetingStoreRefreshCallback call_back,
-		   gpointer data) 
-{
-	EMeetingStorePrivate *priv;
-	EMeetingAttendee *attendee;
-	EMeetingStoreQueueData *qdata;
-	int i;
-
-	priv = store->priv;
-
-	attendee = g_ptr_array_index (priv->attendees, row);
-	if ((attendee == NULL) || !strcmp (itip_strip_mailto (e_meeting_attendee_get_address (attendee)), ""))
-		return;
-
-	/* check the queue if the attendee is already in there*/
-	for (i = 0; i < priv->refresh_queue->len; i++) {
-		if (attendee == g_ptr_array_index (priv->refresh_queue, i))
-			return;		
-
-		if (!strcmp (e_meeting_attendee_get_address (attendee), e_meeting_attendee_get_address (g_ptr_array_index (priv->refresh_queue, i))))
-			return;
-	}
-
-	g_mutex_lock (priv->mutex);
-	qdata = g_hash_table_lookup (priv->refresh_data, itip_strip_mailto (e_meeting_attendee_get_address (attendee)));
-
-	if (qdata == NULL) {
-		qdata = g_new0 (EMeetingStoreQueueData, 1);
-
-		qdata->store = store;
-		qdata->attendee = attendee;
-		e_meeting_attendee_clear_busy_periods (attendee);
-		e_meeting_attendee_set_has_calendar_info (attendee, FALSE);
-
-	        qdata->start = *start;
-	        qdata->end = *end;
-		qdata->string = g_string_new (NULL);
-		qdata->call_backs = g_ptr_array_new ();
-		qdata->data = g_ptr_array_new ();
-		g_ptr_array_add (qdata->call_backs, call_back);
-		g_ptr_array_add (qdata->data, data);
-
-		g_hash_table_insert (priv->refresh_data, itip_strip_mailto (e_meeting_attendee_get_address (attendee)), qdata);
-	} else {
-		if (e_meeting_time_compare_times (start, &qdata->start) == -1)
-			qdata->start = *start;
-		if (e_meeting_time_compare_times (end, &qdata->end) == -1)
-			qdata->end = *end;
-		g_ptr_array_add (qdata->call_backs, call_back);
-		g_ptr_array_add (qdata->data, data);
-	}
-	g_mutex_unlock (priv->mutex);
-
-
-	g_object_ref (attendee);
-	g_ptr_array_add (priv->refresh_queue, attendee);
-
-	if (priv->refresh_idle_id == 0)
-		priv->refresh_idle_id = g_idle_add (refresh_busy_periods, store);
-}
-
-static void
-async_close (GnomeVFSAsyncHandle *handle,
-	     GnomeVFSResult result,
-	     gpointer data)
-{
-	EMeetingStoreQueueData *qdata = data;
-
-	process_free_busy (qdata, qdata->string->str);
-}
-
-static void
-async_read (GnomeVFSAsyncHandle *handle,
-	    GnomeVFSResult result,
-	    gpointer buffer,
-	    GnomeVFSFileSize requested,
-	    GnomeVFSFileSize read,
-	    gpointer data)
-{
-	EMeetingStoreQueueData *qdata = data;
-	GnomeVFSFileSize buf_size = BUF_SIZE - 1;
-
-	if (result != GNOME_VFS_OK && result != GNOME_VFS_ERROR_EOF) {
-		gnome_vfs_async_close (handle, async_close, qdata);
-		return;
-	}
-	
-	((char *)buffer)[read] = '\0';
-	qdata->string = g_string_append (qdata->string, buffer);
-	
-	if (result == GNOME_VFS_ERROR_EOF) {
-		gnome_vfs_async_close (handle, async_close, qdata);
-		return;
-	}
-
-	gnome_vfs_async_read (handle, qdata->buffer, buf_size, async_read, qdata);	
-}
-
-static void
-start_async_read (GnomeVFSAsyncHandle *handle,
-		  GnomeVFSResult result,
-		  gpointer data)
-{
-	EMeetingStoreQueueData *qdata = data;
-	GnomeVFSFileSize buf_size = BUF_SIZE - 1;
-
-	if (result != GNOME_VFS_OK) {
-		g_warning ("Unable to access free/busy url: %s",
-			   gnome_vfs_result_to_string (result));
-		process_callbacks (qdata);
-		return;
-	}
-
-	gnome_vfs_async_read (handle, qdata->buffer, buf_size, async_read, qdata);
-}
-
-void
-e_meeting_store_refresh_all_busy_periods (EMeetingStore *store,
-					  EMeetingTime *start,
-					  EMeetingTime *end,
-					  EMeetingStoreRefreshCallback call_back,
-					  gpointer data)
-{
-	int i;
-	
-	g_return_if_fail (E_IS_MEETING_STORE (store));
-	
-	for (i = 0; i < store->priv->attendees->len; i++)
-		refresh_queue_add (store, i, start, end, call_back, data);
-}
-
-void 
-e_meeting_store_refresh_busy_periods (EMeetingStore *store,
-				      int row,
-				      EMeetingTime *start,
-				      EMeetingTime *end,
-				      EMeetingStoreRefreshCallback call_back,
-				      gpointer data)
-{
-	g_return_if_fail (E_IS_MEETING_STORE (store));
-
-	refresh_queue_add (store, row, start, end, call_back, data);
-}
diff --git a/calendar/gui/e-meeting-store.h b/calendar/gui/e-meeting-store.h
deleted file mode 100644
index 8d18126422..0000000000
--- a/calendar/gui/e-meeting-store.h
+++ /dev/null
@@ -1,112 +0,0 @@
-/* 
- * e-meeting-store.h
- *
- * Copyright (C) 2003  Ximian, Inc.
- *
- * Author: Mike Kestner
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of version 2 of the GNU General Public
- * License as published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * General Public License for more details.
- *
- * You should have received a copy of the GNU General Public
- * License along with this program; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
- */
-
-#ifndef _E_MEETING_STORE_H_
-#define _E_MEETING_STORE_H_
-
-#include <gtk/gtkliststore.h>
-#include <libecal/e-cal.h>
-#include "e-meeting-attendee.h"
-
-G_BEGIN_DECLS
-
-#define E_TYPE_MEETING_STORE		(e_meeting_store_get_type ())
-#define E_MEETING_STORE(obj)		(G_TYPE_CHECK_INSTANCE_CAST ((obj), E_TYPE_MEETING_STORE, EMeetingStore))
-#define E_MEETING_STORE_CLASS(klass)	(G_TYPE_CHECK_CLASS_CAST ((klass), E_TYPE_MEETING_STORE, EMeetingStoreClass))
-#define E_IS_MEETING_STORE(obj)		(G_TYPE_CHECK_INSTANCE_TYPE ((obj), E_TYPE_MEETING_STORE))
-#define E_IS_MEETING_STORE_CLASS(klass)	(G_TYPE_CHECK_CLASS_TYPE ((obj), E_TYPE_MEETING_STORE))
-
-typedef struct _EMeetingStore        EMeetingStore;
-typedef struct _EMeetingStorePrivate EMeetingStorePrivate;
-typedef struct _EMeetingStoreClass   EMeetingStoreClass;
-
-typedef enum {
-	E_MEETING_STORE_ADDRESS_COL,
-	E_MEETING_STORE_MEMBER_COL,
-	E_MEETING_STORE_TYPE_COL,
-	E_MEETING_STORE_ROLE_COL,
-	E_MEETING_STORE_RSVP_COL,
-	E_MEETING_STORE_DELTO_COL,
-	E_MEETING_STORE_DELFROM_COL,
-	E_MEETING_STORE_STATUS_COL,
-	E_MEETING_STORE_CN_COL,
-	E_MEETING_STORE_LANGUAGE_COL,
-	E_MEETING_STORE_ATTENDEE_COL,
-	E_MEETING_STORE_ATTENDEE_UNDERLINE_COL,
-	E_MEETING_STORE_COLUMN_COUNT
-} EMeetingStoreColumns;
-
-struct _EMeetingStore {
-	GtkListStore parent;
-
-	EMeetingStorePrivate *priv;
-};
-
-struct _EMeetingStoreClass {
-	GtkListStoreClass parent_class;
-};
-
-typedef void	(* EMeetingStoreRefreshCallback) (gpointer data);
-
-GType    e_meeting_store_get_type (void);
-GObject *e_meeting_store_new      (void);
-
-void e_meeting_store_set_value (EMeetingStore *im, int row, int col, const gchar *val);
-
-ECal *e_meeting_store_get_e_cal (EMeetingStore *im);
-void e_meeting_store_set_e_cal (EMeetingStore *im, ECal *client);
-
-icaltimezone *e_meeting_store_get_zone (EMeetingStore *im);
-void e_meeting_store_set_zone (EMeetingStore *im, icaltimezone *zone);
-
-gchar *e_meeting_store_get_fb_uri (EMeetingStore *im);
-void e_meeting_store_set_fb_uri (EMeetingStore *im, const gchar *fb_uri);
-
-void e_meeting_store_add_attendee (EMeetingStore *im, EMeetingAttendee *ia);
-EMeetingAttendee *e_meeting_store_add_attendee_with_defaults (EMeetingStore *im);
-
-void e_meeting_store_remove_attendee (EMeetingStore *im, EMeetingAttendee *ia);
-void e_meeting_store_remove_all_attendees (EMeetingStore *im);
-
-EMeetingAttendee *e_meeting_store_find_attendee (EMeetingStore *im, const gchar *address, gint *row);
-EMeetingAttendee *e_meeting_store_find_attendee_at_row (EMeetingStore *im, gint row);
-GtkTreePath *e_meeting_store_find_attendee_path (EMeetingStore *store, EMeetingAttendee *attendee);
-
-gint e_meeting_store_count_actual_attendees (EMeetingStore *im);
-const GPtrArray *e_meeting_store_get_attendees (EMeetingStore *im);
-
-void e_meeting_store_refresh_all_busy_periods (EMeetingStore *im,
-					       EMeetingTime *start,
-					       EMeetingTime *end,
-					       EMeetingStoreRefreshCallback call_back,
-					       gpointer data);
-void e_meeting_store_refresh_busy_periods (EMeetingStore *im,
-					   int row,
-					   EMeetingTime *start,
-					   EMeetingTime *end,
-					   EMeetingStoreRefreshCallback call_back,
-					   gpointer data);
-
-
-G_END_DECLS
-
-#endif
diff --git a/calendar/gui/e-meeting-time-sel-item.c b/calendar/gui/e-meeting-time-sel-item.c
deleted file mode 100644
index 74d2931b5e..0000000000
--- a/calendar/gui/e-meeting-time-sel-item.c
+++ /dev/null
@@ -1,991 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-
-/* 
- * Author : 
- *  Damon Chaplin <damon@gtk.org>
- *
- * Copyright 1999, Ximian, Inc.
- *
- * This program is free software; you can redistribute it and/or 
- * modify it under the terms of version 2 of the GNU General Public 
- * License as published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
- * USA
- */
-
-/*
- * EMeetingTimeSelectorItem - A GnomeCanvasItem which is used for both the main
- * display canvas and the top display (with the dates, times & All Attendees).
- * I didn't make these separate GnomeCanvasItems since they share a lot of
- * code.
- */
-
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
-
-#include <time.h>
-#include <glib.h>
-#include <libgnome/gnome-i18n.h>
-#include "calendar-config.h"
-#include "e-meeting-time-sel-item.h"
-#include "e-meeting-time-sel.h"
-
-/* Initially the grid lines were drawn at the bottom of cells, but this didn't
-   line up well with the GtkEntry widgets, which in the default theme draw a
-   black shadow line across the top. So I've switched our code to draw the
-   lines across the top of cells. */
-#define E_MEETING_TIME_SELECTOR_DRAW_GRID_LINES_AT_BOTTOM 0
-
-static void e_meeting_time_selector_item_destroy (GtkObject *object);
-
-static void e_meeting_time_selector_item_set_arg (GtkObject *o, GtkArg *arg,
-						  guint arg_id);
-static void e_meeting_time_selector_item_realize (GnomeCanvasItem *item);
-static void e_meeting_time_selector_item_unrealize (GnomeCanvasItem *item);
-static void e_meeting_time_selector_item_update (GnomeCanvasItem *item,
-						 double *affine,
-						 ArtSVP *clip_path, int flags);
-static void e_meeting_time_selector_item_draw (GnomeCanvasItem *item,
-					       GdkDrawable *drawable,
-					       int x, int y,
-					       int width, int height);
-static double e_meeting_time_selector_item_point (GnomeCanvasItem *item,
-						  double x, double y,
-						  int cx, int cy,
-						  GnomeCanvasItem **actual_item);
-static gint e_meeting_time_selector_item_event (GnomeCanvasItem *item,
-						GdkEvent *event);
-static gint e_meeting_time_selector_item_button_press (EMeetingTimeSelectorItem *mts_item,
-						       GdkEvent *event);
-static gint e_meeting_time_selector_item_button_release (EMeetingTimeSelectorItem *mts_item,
-							 GdkEvent *event);
-static gint e_meeting_time_selector_item_motion_notify (EMeetingTimeSelectorItem *mts_item,
-							GdkEvent *event);
-
-static void e_meeting_time_selector_item_paint_day_top (EMeetingTimeSelectorItem *mts_item,
-							GdkDrawable *drawable,
-							GDate *date,
-							int x, int scroll_y,
-							int width, int height);
-static void e_meeting_time_selector_item_paint_all_attendees_busy_periods (EMeetingTimeSelectorItem *mts_item, GdkDrawable *drawable, GDate *date, int x, int y, int width, int height);
-static void e_meeting_time_selector_item_paint_day (EMeetingTimeSelectorItem *mts_item,
-						    GdkDrawable *drawable,
-						    GDate *date,
-						    int x, int scroll_y,
-						    int width, int height);
-static void e_meeting_time_selector_item_paint_busy_periods (EMeetingTimeSelectorItem *mts_item, GdkDrawable *drawable, GDate *date, int x, int scroll_y, int width, int height);
-static gint e_meeting_time_selector_item_find_first_busy_period (EMeetingTimeSelectorItem *mts_item, GDate *date, gint row);
-static void e_meeting_time_selector_item_paint_attendee_busy_periods (EMeetingTimeSelectorItem *mts_item, GdkDrawable *drawable, int row, int x, int y, int width, int first_period, EMeetingFreeBusyType busy_type);
-
-static EMeetingTimeSelectorPosition e_meeting_time_selector_item_get_drag_position (EMeetingTimeSelectorItem *mts_item, gint x, gint y);
-static gboolean e_meeting_time_selector_item_calculate_busy_range (EMeetingTimeSelector *mts,
-								   gint row,
-								   gint x,
-								   gint width,
-								   gint *start_x,
-								   gint *end_x);
-
-/* The arguments we take */
-enum {
-	ARG_0,
-	ARG_MEETING_TIME_SELECTOR
-};
-
-G_DEFINE_TYPE (EMeetingTimeSelectorItem, e_meeting_time_selector_item, GNOME_TYPE_CANVAS_ITEM);
-
-static void
-e_meeting_time_selector_item_class_init (EMeetingTimeSelectorItemClass *mts_item_class)
-{
-	GtkObjectClass  *object_class;
-	GnomeCanvasItemClass *item_class;
-
-	object_class = (GtkObjectClass *) mts_item_class;
-	item_class = (GnomeCanvasItemClass *) mts_item_class;
-
-	gtk_object_add_arg_type ("EMeetingTimeSelectorItem::meeting_time_selector",
-				 GTK_TYPE_POINTER, GTK_ARG_WRITABLE,
-				 ARG_MEETING_TIME_SELECTOR);
-
-	object_class->destroy = e_meeting_time_selector_item_destroy;
-	object_class->set_arg = e_meeting_time_selector_item_set_arg;
-
-	/* GnomeCanvasItem method overrides */
-	item_class->realize     = e_meeting_time_selector_item_realize;
-	item_class->unrealize   = e_meeting_time_selector_item_unrealize;
-	item_class->update      = e_meeting_time_selector_item_update;
-	item_class->draw        = e_meeting_time_selector_item_draw;
-	item_class->point       = e_meeting_time_selector_item_point;
-	item_class->event       = e_meeting_time_selector_item_event;
-}
-
-
-static void
-e_meeting_time_selector_item_init (EMeetingTimeSelectorItem *mts_item)
-{
-	GnomeCanvasItem *item = GNOME_CANVAS_ITEM (mts_item);
-	
-	mts_item->mts = NULL;
-
-	mts_item->main_gc = NULL;
-	mts_item->stipple_gc = NULL;
-
-	/* Create the cursors. */
-	mts_item->normal_cursor = gdk_cursor_new (GDK_LEFT_PTR);
-	mts_item->resize_cursor = gdk_cursor_new (GDK_SB_H_DOUBLE_ARROW);
-	mts_item->last_cursor_set = NULL;
-
-	item->x1 = 0;
-	item->y1 = 0;
-	item->x2 = 0;
-	item->y2 = 0;
-}
-
-
-static void
-e_meeting_time_selector_item_destroy (GtkObject *object)
-{
-	EMeetingTimeSelectorItem *mts_item;
-
-	mts_item = E_MEETING_TIME_SELECTOR_ITEM (object);
-
-	if (mts_item->normal_cursor) {
-		gdk_cursor_destroy (mts_item->normal_cursor);
-		mts_item->normal_cursor = NULL;
-	}
-	if (mts_item->resize_cursor) {
-		gdk_cursor_destroy (mts_item->resize_cursor);
-		mts_item->resize_cursor = NULL;
-	}
-	
-	if (GTK_OBJECT_CLASS (e_meeting_time_selector_item_parent_class)->destroy)
-		(*GTK_OBJECT_CLASS (e_meeting_time_selector_item_parent_class)->destroy)(object);
-}
-
-
-static void
-e_meeting_time_selector_item_set_arg (GtkObject *o, GtkArg *arg, guint arg_id)
-{
-	GnomeCanvasItem *item;
-	EMeetingTimeSelectorItem *mts_item;
-
-	item = GNOME_CANVAS_ITEM (o);
-	mts_item = E_MEETING_TIME_SELECTOR_ITEM (o);
-	
-	switch (arg_id){
-	case ARG_MEETING_TIME_SELECTOR:
-		mts_item->mts = GTK_VALUE_POINTER (*arg);
-		break;
-	}
-}
-
-
-static void
-e_meeting_time_selector_item_realize (GnomeCanvasItem *item)
-{
-	GnomeCanvas *canvas;
-	GdkWindow *window;
-	EMeetingTimeSelectorItem *mts_item;
-
-	if (GNOME_CANVAS_ITEM_CLASS (e_meeting_time_selector_item_parent_class)->realize)
-		(*GNOME_CANVAS_ITEM_CLASS (e_meeting_time_selector_item_parent_class)->realize)(item);
-
-	mts_item = E_MEETING_TIME_SELECTOR_ITEM (item);
-
-	canvas = item->canvas;
-	window = GTK_WIDGET (canvas)->window;
-
-	mts_item->main_gc = gdk_gc_new (window);
-	mts_item->stipple_gc = gdk_gc_new (window);
-}
-
-
-static void
-e_meeting_time_selector_item_unrealize (GnomeCanvasItem *item)
-{
-	EMeetingTimeSelectorItem *mts_item;
-
-	mts_item = E_MEETING_TIME_SELECTOR_ITEM (item);
-
-	gdk_gc_unref (mts_item->main_gc);
-	mts_item->main_gc = NULL;
-	gdk_gc_unref (mts_item->stipple_gc);
-	mts_item->stipple_gc = NULL;
-
-	if (GNOME_CANVAS_ITEM_CLASS (e_meeting_time_selector_item_parent_class)->unrealize)
-		(*GNOME_CANVAS_ITEM_CLASS (e_meeting_time_selector_item_parent_class)->unrealize)(item);
-}
-
-
-static void
-e_meeting_time_selector_item_update (GnomeCanvasItem *item, double *affine, ArtSVP *clip_path, int flags)
-{
-	if (GNOME_CANVAS_ITEM_CLASS (e_meeting_time_selector_item_parent_class)->update)
-		(* GNOME_CANVAS_ITEM_CLASS (e_meeting_time_selector_item_parent_class)->update) (item, affine, clip_path, flags);
-
-	/* The grid 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_meeting_time_selector_item_draw (GnomeCanvasItem *item, GdkDrawable *drawable, int x, int y, int width, int height)
-{
-	EMeetingTimeSelector *mts;
-	EMeetingTimeSelectorItem *mts_item;
-	EMeetingAttendee *ia;
-	gint day_x, meeting_start_x, meeting_end_x, bar_y, bar_height;
-	gint row, row_y, start_x, end_x;
-	GDate date, last_date, current_date;
-	gboolean is_display_top, show_meeting_time;
-	GdkGC *gc, *stipple_gc;
-
-	mts_item = E_MEETING_TIME_SELECTOR_ITEM (item);
-	mts = mts_item->mts;
-	g_return_if_fail (mts != NULL);
-	gc = mts_item->main_gc;
-	stipple_gc = mts_item->stipple_gc;
-
-	is_display_top = (GTK_WIDGET (item->canvas) == mts->display_top)
-		? TRUE : FALSE;
-
-	/* Calculate the first and last visible days and positions. */
-	e_meeting_time_selector_calculate_day_and_position (mts, x,
-							    &date, &day_x);
-	e_meeting_time_selector_calculate_day_and_position (mts, x + width,
-							    &last_date, NULL);
-
-	/* For the top display draw the 'All Attendees' row background. */
-	if (is_display_top) {
-		gdk_gc_set_foreground (gc, &mts->all_attendees_bg_color);
-		gdk_draw_rectangle (drawable, gc, TRUE,
-				    0, mts->row_height * 2 - y,
-				    width, mts->row_height);
-	} else {
-		gdk_gc_set_foreground (gc, &mts->bg_color);
-		gdk_draw_rectangle (drawable, gc, TRUE, 0, 0, width, height);
-	}
-
-	/* Calculate the x coordinates of the meeting time. */
-	show_meeting_time = e_meeting_time_selector_get_meeting_time_positions (mts, &meeting_start_x, &meeting_end_x);
-
-	/* Draw the meeting time background. */
-	if (show_meeting_time
-	    && (meeting_end_x - 1 >= x) && (meeting_start_x + 1 < x + width)
-	    && (meeting_end_x - meeting_start_x > 2)) {
-		gdk_gc_set_foreground (gc, &mts->meeting_time_bg_color);
-		if (is_display_top)
-			gdk_draw_rectangle (drawable, gc, TRUE,
-					    meeting_start_x + 1 - x, mts->row_height * 2 - y,
-					    meeting_end_x - meeting_start_x - 2, mts->row_height);
-		else
-			gdk_draw_rectangle (drawable, gc, TRUE,
-					    meeting_start_x + 1 - x, 0,
-					    meeting_end_x - meeting_start_x - 2, height);
-	}
-
-	/* For the main display draw the stipple background for attendee's
-	   that have no calendar information. */
-	if (!is_display_top) {
-		gdk_gc_set_foreground (gc, &mts->grid_color);
-		gdk_gc_set_foreground (stipple_gc, &mts->grid_color);
-		gdk_gc_set_background (stipple_gc, &mts->stipple_bg_color);
-		gdk_gc_set_stipple (stipple_gc, mts->stipple);
-		gnome_canvas_set_stipple_origin (item->canvas, stipple_gc);
-		gdk_gc_set_fill (stipple_gc, GDK_OPAQUE_STIPPLED);
-		row = y / mts->row_height;
-		row_y = row * mts->row_height - y;
-		while (row < e_meeting_store_count_actual_attendees (mts->model) && row_y < height) {
-			ia = e_meeting_store_find_attendee_at_row (mts->model, row);
-
-			if (e_meeting_attendee_get_has_calendar_info (ia)) {
-				if (e_meeting_time_selector_item_calculate_busy_range (mts, row, x, width, &start_x, &end_x)) {
-					if (start_x >= width || end_x <= 0) {
-						gdk_draw_rectangle (drawable, stipple_gc, TRUE, 0, row_y, width, mts->row_height);
-					} else {
-						if (start_x >= 0) {
-							gdk_draw_rectangle (drawable, stipple_gc, TRUE, 0, row_y, start_x, mts->row_height);
-							gdk_draw_line (drawable, gc, start_x, row_y, start_x, row_y + mts->row_height);
-						}
-						if (end_x <= width) {
-							gdk_draw_rectangle (drawable, stipple_gc, TRUE, end_x, row_y, width - end_x, mts->row_height);
-							gdk_draw_line (drawable, gc, end_x, row_y, end_x, row_y + mts->row_height);
-						}
-					}
-				}
-			} else {
-				gdk_draw_rectangle (drawable, stipple_gc, TRUE,
-						    0, row_y,
-						    width, mts->row_height);
-			}
-			row++;
-			row_y += mts->row_height;
-		}
-		gdk_gc_set_fill (gc, GDK_SOLID);
-	}
-
-	/* Now paint the visible days one by one. */
-	current_date = date;
-	for (;;) {
-		/* Currently we use the same GnomeCanvasItem class for the
-		   top display and the main display. We may use separate
-		   classes in future if necessary. */
-		if (is_display_top)
-			e_meeting_time_selector_item_paint_day_top (mts_item, drawable, &current_date, day_x, y, width, height);
-		else
-			e_meeting_time_selector_item_paint_day (mts_item, drawable, &current_date, day_x, y, width, height);
-
-		day_x += mts_item->mts->day_width;
-		if (g_date_compare (&current_date, &last_date) == 0)
-			break;
-		g_date_add_days (&current_date, 1);
-	}
-
-	/* Draw the busy periods. */
-	if (is_display_top)
-		e_meeting_time_selector_item_paint_all_attendees_busy_periods (mts_item, drawable, &date, x, y, width, height);
-	else
-		e_meeting_time_selector_item_paint_busy_periods (mts_item, drawable, &date, x, y, width, height);
-
-
-	/* Draw the currently-selected meeting time vertical bars. */
-	if (show_meeting_time) {
-		if (is_display_top) {
-			bar_y = mts->row_height * 2 - y;
-			bar_height = mts->row_height;
-		} else {
-			bar_y = 0;
-			bar_height = height;
-		}
-
-		gdk_gc_set_foreground (gc, &mts->grid_color);
-
-		if ((meeting_start_x + 2 >= x)
-		    && (meeting_start_x - 2 < x + width)) {
-			gdk_draw_rectangle (drawable, gc, TRUE,
-					    meeting_start_x - 2 - x, bar_y,
-					    5, bar_height);
-		}
-
-		if ((meeting_end_x + 2 >= x)
-		    && (meeting_end_x - 2 < x + width)) {
-			gdk_draw_rectangle (drawable, gc, TRUE,
-					    meeting_end_x - 2 - x, bar_y,
-					    5, bar_height);
-		}
-	}
-}
-
-
-static void
-e_meeting_time_selector_item_paint_day_top (EMeetingTimeSelectorItem *mts_item,
-					    GdkDrawable *drawable, GDate *date,
-					    int x, int scroll_y,
-					    int width, int height)
-{
-	EMeetingTimeSelector *mts;
-	GdkGC *gc;
-	gint y, grid_x;
-	gchar buffer[128], *format;
-	gint hour, hour_x, hour_y;
-	GdkRectangle clip_rect;
-	PangoLayout *layout;
-
-	mts = mts_item->mts;
-	gc = mts_item->main_gc;
-
-	gdk_gc_set_foreground (gc, &mts->grid_color);
-	layout = gtk_widget_create_pango_layout (GTK_WIDGET (mts), NULL);
-
-	/* Draw the horizontal lines. */
-	y = mts->row_height - 1 - scroll_y;
-	gdk_draw_line (drawable, gc, x, y, x + mts->day_width - 1, y);
-	gdk_gc_set_foreground (gc, &mts->grid_shadow_color);
-	gdk_draw_line (drawable, gc, x, y + 1, x + mts->day_width - 1, y + 1);
-	gdk_gc_set_foreground (gc, &mts->grid_color);
-	y += mts->row_height;
-	gdk_draw_line (drawable, gc, x, y, x + mts->day_width - 1, y);
-	y += mts->row_height;
-	gdk_draw_line (drawable, gc, x, y, x + mts->day_width - 1, y);
-
-	/* Draw the vertical grid lines. */
-	for (grid_x = mts->col_width - 1;
-	     grid_x < mts->day_width - mts->col_width;
-	     grid_x += mts->col_width) {
-		gdk_draw_line (drawable, gc,
-			       x + grid_x, mts->row_height * 2 - 4 - scroll_y,
-			       x + grid_x, height);
-	}
-	grid_x = mts->day_width - 2;
-	gdk_draw_line (drawable, gc, x + grid_x, 0, x + grid_x, height);
-	grid_x++;
-	gdk_draw_line (drawable, gc, x + grid_x, 0, x + grid_x, height);
-
-	/* Draw the date. Set a clipping rectangle so we don't draw over the
-	   next day. */
-	if (mts->date_format == E_MEETING_TIME_SELECTOR_DATE_FULL)
-		/* This is a strftime() format string %A = full weekday name,
-		   %B = full month name, %d = month day, %Y = full year. */
-		format = _("%A, %B %d, %Y");
-	else if (mts->date_format == E_MEETING_TIME_SELECTOR_DATE_ABBREVIATED_DAY)
-		/* This is a strftime() format string %a = abbreviated weekday
-		   name, %m = month number, %d = month day, %Y = full year. */
-		format = _("%a %m/%d/%Y");
-	else
-		/* This is a strftime() format string %m = month number,
-		   %d = month day, %Y = full year. */
-		format = _("%m/%d/%Y");
-
-	g_date_strftime (buffer, sizeof (buffer), format, date);
-
-	clip_rect.x = x;
-	clip_rect.y = -scroll_y;
-	clip_rect.width = mts->day_width - 2;
-	clip_rect.height = mts->row_height - 2;
-	gdk_gc_set_clip_rectangle (gc, &clip_rect);
-	pango_layout_set_text (layout, buffer, -1);
-	gdk_draw_layout (drawable, gc,
-			 x + 2,
-			 4 - scroll_y,
-			 layout);
-	gdk_gc_set_clip_rectangle (gc, NULL);
-
-	/* Draw the hours. */
-	hour = mts->first_hour_shown;
-	hour_x = x + 2;
-	hour_y = mts->row_height + 4 - scroll_y;
-	while (hour < mts->last_hour_shown) {
-		if (calendar_config_get_24_hour_format ())
-			pango_layout_set_text (layout, EMeetingTimeSelectorHours [hour], -1);
-		else
-			pango_layout_set_text (layout, EMeetingTimeSelectorHours12 [hour], -1);
-
-		gdk_draw_layout (drawable, gc,
-				 hour_x,
-				 hour_y,
-				 layout);
-
-		hour += mts->zoomed_out ? 3 : 1;
-		hour_x += mts->col_width;
-	}
-
-	g_object_unref (layout);
-}
-
-
-/* This paints the colored bars representing busy periods for the combined
-   list of attendees. For now we just paint the bars for each attendee of
-   each other. If we want to speed it up we could optimise it later. */
-static void
-e_meeting_time_selector_item_paint_all_attendees_busy_periods (EMeetingTimeSelectorItem *mts_item, GdkDrawable *drawable, GDate *date, int x, int scroll_y, int width, int height)
-{
-	EMeetingTimeSelector *mts;
-	EMeetingAttendee *ia;
-	EMeetingFreeBusyType busy_type;
-	gint row, y;
-	GdkGC *gc;
-	gint *first_periods;
-
-	mts = mts_item->mts;
-	gc = mts_item->main_gc;
-
-	/* Calculate the y coordinate to paint the row at in the drawable. */
-	y = 2 * mts->row_height - scroll_y - 1;
-
-	/* Get the first visible busy periods for all the attendees. */
-	first_periods = g_new (gint, e_meeting_store_count_actual_attendees (mts->model));
-	for (row = 0; row < e_meeting_store_count_actual_attendees (mts->model); row++) {
-		ia = e_meeting_store_find_attendee_at_row (mts->model, row);
-		first_periods[row] = e_meeting_time_selector_item_find_first_busy_period (mts_item, date, row);
-	}
-
-	for (busy_type = 0;
-	     busy_type < E_MEETING_FREE_BUSY_LAST;
-	     busy_type++) {
-		gdk_gc_set_foreground (gc, &mts->busy_colors[busy_type]);
-		for (row = 0; row < e_meeting_store_count_actual_attendees (mts->model); row++) {
-			if (first_periods[row] == -1)
-				continue;
-			e_meeting_time_selector_item_paint_attendee_busy_periods (mts_item, drawable, x, y, width, row, first_periods[row], busy_type);
-		}
-	}
-
-	g_free (first_periods);
-}
-
-
-static void
-e_meeting_time_selector_item_paint_day (EMeetingTimeSelectorItem *mts_item,
-					GdkDrawable *drawable, GDate *date,
-					int x, int scroll_y,
-					int width, int height)
-{
-	EMeetingTimeSelector *mts;
-	GdkGC *gc;
-	gint grid_x, grid_y, attendee_index, unused_y;
-
-	mts = mts_item->mts;
-	gc = mts_item->main_gc;
-
-	/* Draw the grid lines. The grid lines around unused rows are drawn in
-	   a different color. */
-
-	/* Draw the horizontal grid lines. */
-	attendee_index = scroll_y / mts->row_height;
-#if E_MEETING_TIME_SELECTOR_DRAW_GRID_LINES_AT_BOTTOM
-	for (grid_y = mts->row_height - 1 - (scroll_y % mts->row_height);
-#else
-	for (grid_y = - (scroll_y % mts->row_height);
-#endif
-	     grid_y < height;
-	     grid_y += mts->row_height)
-	  {
-		  if (attendee_index <= e_meeting_store_count_actual_attendees (mts->model)) {
-			  gdk_gc_set_foreground (gc, &mts->grid_color);
-			  gdk_draw_line (drawable, gc, 0, grid_y,
-					 width, grid_y);
-		  } else {
-			  gdk_gc_set_foreground (gc, &mts->grid_unused_color);
-			  gdk_draw_line (drawable, gc, 0, grid_y,
-					 width, grid_y);
-		  }
-		  attendee_index++;
-	  }
-
-	/* Draw the vertical grid lines. */
-	unused_y = (e_meeting_store_count_actual_attendees (mts->model) * mts->row_height) - scroll_y;
-	if (unused_y >= 0) {
-		gdk_gc_set_foreground (gc, &mts->grid_color);
-		for (grid_x = mts->col_width - 1;
-		     grid_x < mts->day_width - mts->col_width;
-		     grid_x += mts->col_width)
-			{
-				gdk_draw_line (drawable, gc,
-					       x + grid_x, 0,
-					       x + grid_x, unused_y - 1);
-			}
-		gdk_draw_rectangle (drawable, gc, TRUE,
-				    x + mts->day_width - 2, 0,
-				    2, unused_y);
-	}
-
-	if (unused_y < height) {
-		gdk_gc_set_foreground (gc, &mts->grid_unused_color);
-		for (grid_x = mts->col_width - 1;
-		     grid_x < mts->day_width - mts->col_width;
-		     grid_x += mts->col_width)
-			{
-				gdk_draw_line (drawable, gc,
-					       x + grid_x, unused_y,
-					       x + grid_x, height);
-			}
-		gdk_draw_rectangle (drawable, gc, TRUE,
-				    x + mts->day_width - 2, unused_y,
-				    2, height - unused_y);
-	}
-
-
-}
-
-
-/* This paints the colored bars representing busy periods for the individual
-   attendees. */
-static void
-e_meeting_time_selector_item_paint_busy_periods (EMeetingTimeSelectorItem *mts_item, GdkDrawable *drawable, GDate *date, int x, int scroll_y, int width, int height)
-{
-	EMeetingTimeSelector *mts;
-	EMeetingFreeBusyType busy_type;
-	gint row, y, first_period;
-	GdkGC *gc;
-
-	mts = mts_item->mts;
-	gc = mts_item->main_gc;
-
-	/* Calculate the first visible attendee row. */
-	row = scroll_y / mts->row_height;
-
-	/* Calculate the y coordinate to paint the row at in the drawable. */
-	y = row * mts->row_height - scroll_y;
-
-	/* Step through the attendees painting the busy periods. */
-	while (y < height && row < e_meeting_store_count_actual_attendees (mts->model)) {
-
-		/* Find the first visible busy period. */
-		first_period = e_meeting_time_selector_item_find_first_busy_period (mts_item, date, row);
-		if (first_period != -1) {
-			/* Paint the different types of busy periods, in
-			   reverse order of precedence, so the highest
-			   precedences are displayed. */
-			for (busy_type = 0;
-			     busy_type < E_MEETING_FREE_BUSY_LAST;
-			     busy_type++) {
-				gdk_gc_set_foreground (gc, &mts->busy_colors[busy_type]);
-				e_meeting_time_selector_item_paint_attendee_busy_periods (mts_item, drawable, x, y, width, row, first_period, busy_type);
-			}
-		}
-		y += mts->row_height;
-		row++;
-	}
-}
-
-
-/* This subtracts the attendees longest_period_in_days from the given date,
-   and does a binary search of the attendee's busy periods array to find the
-   first one which could possible end on the given day or later.
-   If none are found it returns -1. */
-static gint
-e_meeting_time_selector_item_find_first_busy_period (EMeetingTimeSelectorItem *mts_item, GDate *date, gint row)
-{
-	EMeetingTimeSelector *mts;
-	EMeetingAttendee *ia;
-	const GArray *busy_periods;
-	EMeetingFreeBusyPeriod *period;
-	gint period_num;
-
-	mts = mts_item->mts;
-
-	ia = e_meeting_store_find_attendee_at_row (mts->model, row);
-
-	period_num = e_meeting_attendee_find_first_busy_period (ia, date);
-	if (period_num == -1)
-		return -1;
-
-	/* Check if the period starts after the end of the current canvas
-	   scroll area. */
-	busy_periods = e_meeting_attendee_get_busy_periods (ia);
-	period = &g_array_index (busy_periods, EMeetingFreeBusyPeriod, period_num);
-	if (g_date_compare (&mts->last_date_shown, &period->start.date) < 0)
-		return -1;
-
-	return period_num;
-}
-
-
-/* This paints the visible busy periods for one attendee which are of a certain
-   busy type, e.g out of office. It is passed the index of the first visible
-   busy period of the attendee and continues until it runs off the screen. */
-static void
-e_meeting_time_selector_item_paint_attendee_busy_periods (EMeetingTimeSelectorItem *mts_item, GdkDrawable *drawable, int x, int y, int width, int row, int first_period, EMeetingFreeBusyType busy_type)
-{
-	EMeetingTimeSelector *mts;
-	EMeetingAttendee *ia;
- 	const GArray *busy_periods;
-	EMeetingFreeBusyPeriod *period;
-	GdkGC *gc;
-	gint period_num, x1, x2, x2_within_day, x2_within_col;
-
-	mts = mts_item->mts;
-	gc = mts_item->main_gc;
-
-	ia = e_meeting_store_find_attendee_at_row (mts->model, row);
-
-	busy_periods = e_meeting_attendee_get_busy_periods (ia);
-	for (period_num = first_period;
-	     period_num < busy_periods->len;
-	     period_num++) {
-		period = &g_array_index (busy_periods, EMeetingFreeBusyPeriod, period_num);
-
-		if (period->busy_type != busy_type)
-			continue;
-
-		/* Convert the period start and end times to x coordinates. */
-		x1 = e_meeting_time_selector_calculate_time_position (mts, &period->start);
-		/* If the period is off the right of the area being drawn, we
-		   are finished. */
-		if (x1 >= x + width)
-			return;
-
-		x2 = e_meeting_time_selector_calculate_time_position (mts, &period->end);
-		/* If the period is off the left edge of the area skip it. */
-		if (x2 <= x)
-			continue;
-
-		/* We paint from x1 to x2 - 1, so that for example a time
-		   from 5:00-6:00 is distinct from 6:00-7:00.
-		   We never finish on a grid line separating days, and we only
-		   ever paint on a normal vertical grid line if the period is
-		   only 1 pixel wide. */
-		x2_within_day = x2 % mts->day_width;
-		if (x2_within_day == 0) {
-			x2 -= 2;
-		} else if (x2_within_day == mts->day_width - 1) {
-			x2 -= 1;
-		} else {
-			x2_within_col = x2_within_day % mts->col_width;
-			if (x2_within_col == 0 && x2 > x1 + 1)
-				x2 -= 1;
-		}
-
-		/* Paint the rectangle. We leave a gap of 2 pixels at the
-		 top and bottom, remembering that the grid is painted along
-		 the top/bottom line of each row. */
-		if (x2 - x1 > 0) {
-#if E_MEETING_TIME_SELECTOR_DRAW_GRID_LINES_AT_BOTTOM
-			gdk_draw_rectangle (drawable, gc, TRUE,
-					    x1 - x, y + 2,
-					    x2 - x1, mts->row_height - 5);
-#else
-			gdk_draw_rectangle (drawable, gc, TRUE,
-					    x1 - x, y + 3,
-					    x2 - x1, mts->row_height - 5);
-#endif
-		}
-	}
-}
-
-
-/*
- * CANVAS ITEM ROUTINES - functions to be a GnomeCanvasItem.
- */
-
-/* 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_meeting_time_selector_item_point (GnomeCanvasItem *item, double x, double y,
-				    int cx, int cy,
-				    GnomeCanvasItem **actual_item)
-{
-	*actual_item = item;
-	return 0.0;
-}
-
-
-static gint
-e_meeting_time_selector_item_event (GnomeCanvasItem *item, GdkEvent *event)
-{
-	EMeetingTimeSelectorItem *mts_item;
-
-	mts_item = E_MEETING_TIME_SELECTOR_ITEM (item);
-
-	switch (event->type) {
-	case GDK_BUTTON_PRESS:
-		return e_meeting_time_selector_item_button_press (mts_item,
-								  event);
-	case GDK_BUTTON_RELEASE:
-		return e_meeting_time_selector_item_button_release (mts_item,
-								    event);
-	case GDK_MOTION_NOTIFY:
-		return e_meeting_time_selector_item_motion_notify (mts_item,
-								   event);
-	default:
-		break;
-	}
-
-	return FALSE;
-}
-
-
-/* This handles all button press events for the item. If the cursor is over
-   one of the meeting time vertical bars we start a drag. If not we set the
-   meeting time to the nearest half-hour interval.
-   Note that GnomeCanvas converts the event coords to world coords,
-   i.e. relative to the entire canvas scroll area. */
-static gint
-e_meeting_time_selector_item_button_press (EMeetingTimeSelectorItem *mts_item,
-					   GdkEvent *event)
-{
-	EMeetingTimeSelector *mts;
-	EMeetingTime start_time, end_time;
-	EMeetingTimeSelectorPosition position;
-	GDate *start_date, *end_date;
-	gint x, y;
-
-	mts = mts_item->mts;
-	x = (gint) event->button.x;
-	y = (gint) event->button.y;
-
-	/* Check if we are starting a drag of the vertical meeting time bars.*/
-	position = e_meeting_time_selector_item_get_drag_position (mts_item,
-								   x, y);
-	if (position != E_MEETING_TIME_SELECTOR_POS_NONE) {
-		if (gnome_canvas_item_grab (GNOME_CANVAS_ITEM (mts_item),
-					    GDK_POINTER_MOTION_MASK
-					    | GDK_BUTTON_RELEASE_MASK,
-					    mts_item->resize_cursor,
-					    event->button.time) == 0 /*Success*/) {
-			mts->dragging_position = position;
-			return TRUE;
-		}
-	}
-
-	/* Convert the x coordinate into a EMeetingTimeSelectorTime. */
-	e_meeting_time_selector_calculate_time (mts, x, &start_time);
-	start_date = &start_time.date;
-	end_date = &end_time.date;
-
-	/* Find the nearest half-hour or hour interval, depending on whether
-	   zoomed_out is set. */
-	if (!mts->all_day) {
-		if (mts->zoomed_out) {
-			start_time.minute = 0;
-			end_time = start_time;
-			end_time.hour += 1;
-		} else {
-			start_time.minute -= start_time.minute % 30;
-			end_time = start_time;
-			end_time.minute += 30;
-		}
-	} else {
-		start_time.hour = 0;
-		start_time.minute = 0;
-		end_time = start_time;
-		g_date_add_days (&end_time.date, 1);
-	}
-	
-	/* Fix any overflows. */
-	e_meeting_time_selector_fix_time_overflows (&end_time);
-
-	/* Set the new meeting time. */
-	e_meeting_time_selector_set_meeting_time (mts_item->mts,
-						  g_date_year (start_date),
-						  g_date_month (start_date),
-						  g_date_day (start_date),
-						  start_time.hour,
-						  start_time.minute,
-						  g_date_year (end_date),
-						  g_date_month (end_date),
-						  g_date_day (end_date),
-						  end_time.hour,
-						  end_time.minute);
-
-
-	return FALSE;
-}
-
-
-/* This handles all button release events for the item. If we were dragging,
-   we finish the drag. */
-static gint
-e_meeting_time_selector_item_button_release (EMeetingTimeSelectorItem *mts_item,
-					     GdkEvent *event)
-{
-	EMeetingTimeSelector *mts;
-
-	mts = mts_item->mts;
-
-	/* Reset any drag. */
-	if (mts->dragging_position != E_MEETING_TIME_SELECTOR_POS_NONE) {
-		mts->dragging_position = E_MEETING_TIME_SELECTOR_POS_NONE;
-		e_meeting_time_selector_remove_timeout (mts);
-		gnome_canvas_item_ungrab (GNOME_CANVAS_ITEM (mts_item),
-					  event->button.time);
-	}
-
-	return FALSE;
-}
-
-
-/* This handles all motion notify events for the item. If button1 is pressed
-   we check if a drag is in progress. If not, we set the cursor if we are over
-   the meeting time vertical bars. Note that GnomeCanvas doesn't use motion
-   hints, which may affect performance. */
-static gint
-e_meeting_time_selector_item_motion_notify (EMeetingTimeSelectorItem *mts_item,
-					    GdkEvent *event)
-{
-	EMeetingTimeSelector *mts;
-	EMeetingTimeSelectorPosition position;
-	GdkCursor *cursor;
-	gint x, y;
-
-	mts = mts_item->mts;
-	x = (gint) event->motion.x;
-	y = (gint) event->motion.y;
-
-	if (mts->dragging_position != E_MEETING_TIME_SELECTOR_POS_NONE) {
-		e_meeting_time_selector_drag_meeting_time (mts, x);
-		return TRUE;
-	}
-
-	position = e_meeting_time_selector_item_get_drag_position (mts_item,
-								   x, y);
-
-	/* Determine which cursor should be used. */
-	if (position == E_MEETING_TIME_SELECTOR_POS_NONE)
-		cursor = mts_item->normal_cursor;
-	else
-		cursor = mts_item->resize_cursor;
-
-	/* Only set the cursor if it is different to the last one we set. */
-	if (mts_item->last_cursor_set != cursor) {
-		mts_item->last_cursor_set = cursor;
-		gdk_window_set_cursor (GTK_WIDGET (GNOME_CANVAS_ITEM (mts_item)->canvas)->window, cursor);
-	}
-
-	return FALSE;
-}
-
-
-static EMeetingTimeSelectorPosition
-e_meeting_time_selector_item_get_drag_position (EMeetingTimeSelectorItem *mts_item,
-						gint x, gint y)
-{
-	EMeetingTimeSelector *mts;
-	gboolean is_display_top;
-	gint meeting_start_x, meeting_end_x;
-
-	mts = mts_item->mts;
-
-	is_display_top = (GTK_WIDGET (GNOME_CANVAS_ITEM (mts_item)->canvas) == mts->display_top) ? TRUE : FALSE;
-
-	if (is_display_top && y < mts->row_height * 2)
-		return E_MEETING_TIME_SELECTOR_POS_NONE;
-
-	if (!e_meeting_time_selector_get_meeting_time_positions (mts, &meeting_start_x, &meeting_end_x))
-		return E_MEETING_TIME_SELECTOR_POS_NONE;
-
-	if (x >= meeting_end_x - 2 && x <= meeting_end_x + 2)
-		return E_MEETING_TIME_SELECTOR_POS_END;
-
-	if (x >= meeting_start_x - 2 && x <= meeting_start_x + 2)
-		return E_MEETING_TIME_SELECTOR_POS_START;
-
-	return E_MEETING_TIME_SELECTOR_POS_NONE;
-}
-
-
-static gboolean
-e_meeting_time_selector_item_calculate_busy_range (EMeetingTimeSelector *mts,
-						   gint row,
-						   gint x,
-						   gint width,
-						   gint *start_x,
-						   gint *end_x)
-{
-	EMeetingAttendee *ia;
-	EMeetingTime busy_periods_start;
-	EMeetingTime busy_periods_end;
-	
-	ia = e_meeting_store_find_attendee_at_row (mts->model, row);
-	busy_periods_start = e_meeting_attendee_get_start_busy_range (ia);
-	busy_periods_end = e_meeting_attendee_get_end_busy_range (ia);
-	
-	*start_x = -1;
-	*end_x = -1;
-
-	if (!g_date_valid (&busy_periods_start.date)
-	    || !g_date_valid (&busy_periods_end.date))
-		return FALSE;
-
-	*start_x = e_meeting_time_selector_calculate_time_position (mts, &busy_periods_start) - x - 1;
-
-	*end_x = e_meeting_time_selector_calculate_time_position (mts, &busy_periods_end) - x;
-
-	return TRUE;
-}
diff --git a/calendar/gui/e-meeting-time-sel-item.h b/calendar/gui/e-meeting-time-sel-item.h
deleted file mode 100644
index 11b355dfa0..0000000000
--- a/calendar/gui/e-meeting-time-sel-item.h
+++ /dev/null
@@ -1,78 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-
-/* 
- * Author : 
- *  Damon Chaplin <damon@gtk.org>
- *
- * Copyright 1999, Ximian, Inc.
- *
- * This program is free software; you can redistribute it and/or 
- * modify it under the terms of version 2 of the GNU General Public 
- * License as published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
- * USA
- */
-
-/*
- * MeetingTimeSelectorItem - A GnomeCanvasItem which is used for both the main
- * display canvas and the top display (with the dates, times & All Attendees).
- * I didn't make these separate GnomeCanvasItems since they share a lot of
- * code.
- */
-
-#ifndef _E_MEETING_TIME_SELECTOR_ITEM_H_
-#define _E_MEETING_TIME_SELECTOR_ITEM_H_
-
-#include "e-meeting-time-sel.h"
-
-#ifdef __cplusplus
-extern "C" {
-#endif /* __cplusplus */
-
-
-#define E_MEETING_TIME_SELECTOR_ITEM(obj)          (GTK_CHECK_CAST((obj), e_meeting_time_selector_item_get_type (), EMeetingTimeSelectorItem))
-#define E_MEETING_TIME_SELECTOR_ITEM_CLASS(k)      (GTK_CHECK_CLASS_CAST ((k), e_meeting_time_selector_item_get_type (), EMeetingTimeSelectorItemClass))
-#define IS_E_MEETING_TIME_SELECTOR_ITEM(o)         (GTK_CHECK_TYPE((o), e_meeting_time_selector_item_get_type ()))
-
-
-typedef struct _EMeetingTimeSelectorItem       EMeetingTimeSelectorItem;
-typedef struct _EMeetingTimeSelectorItemClass  EMeetingTimeSelectorItemClass;
-
-struct _EMeetingTimeSelectorItem
-{
-	GnomeCanvasItem canvas_item;
-
-	/* The parent EMeetingTimeSelector widget. */
-	EMeetingTimeSelector *mts;
-
-	/* This GC is used for most of the drawing. The fg/bg colors are
-	   changed for each bit. */
-	GdkGC *main_gc;
-	GdkGC *stipple_gc;
-
-	/* The normal & resize cursors. */
-	GdkCursor *normal_cursor;
-	GdkCursor *resize_cursor;
-
-	/* This remembers the last cursor set on the window. */
-	GdkCursor *last_cursor_set;
-};
-
-
-struct _EMeetingTimeSelectorItemClass
-{
-	GnomeCanvasItemClass parent_class;
-};
-
-GtkType e_meeting_time_selector_item_get_type (void);
-
-
-#endif /* _E_MEETING_TIME_SELECTOR_ITEM_H_ */
diff --git a/calendar/gui/e-meeting-time-sel.c b/calendar/gui/e-meeting-time-sel.c
deleted file mode 100644
index 5f92ab6a63..0000000000
--- a/calendar/gui/e-meeting-time-sel.c
+++ /dev/null
@@ -1,2933 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-
-/* 
- * Authors : 
- *  Damon Chaplin <damon@gtk.org>
- *  Rodrigo Moya <rodrigo@novell.com>
- *
- * Copyright 1999, Ximian, Inc.
- * Copyright 2004, Novell, Inc.
- *
- * This program is free software; you can redistribute it and/or 
- * modify it under the terms of version 2 of the GNU General Public 
- * License as published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
- * USA
- */
-
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
-
-#include "e-meeting-time-sel.h"
-
-#include <stdlib.h>
-#include <stdio.h>
-#include <string.h>
-#include <time.h>
-#include <glib.h>
-#include <gdk/gdkkeysyms.h>
-#include <gtk/gtkalignment.h>
-#include <gtk/gtkarrow.h>
-#include <gtk/gtkbutton.h>
-#include <gtk/gtkdrawingarea.h>
-#include <gtk/gtkentry.h>
-#include <gtk/gtkfixed.h>
-#include <gtk/gtkhbox.h>
-#include <gtk/gtkhscrollbar.h>
-#include <gtk/gtkhseparator.h>
-#include <gtk/gtklabel.h>
-#include <gtk/gtkmenu.h>
-#include <gtk/gtkradiomenuitem.h>
-#include <gtk/gtksignal.h>
-#include <gtk/gtkvbox.h>
-#include <gtk/gtkvscrollbar.h>
-#include <libgnomeui/gnome-dateedit.h>
-#include <libgnome/gnome-i18n.h>
-#include <libgnomecanvas/gnome-canvas-widget.h>
-
-#include <gal/widgets/e-canvas.h>
-#include <gal/widgets/e-canvas-utils.h>
-
-#include <widgets/misc/e-dateedit.h>
-#include <e-util/e-gui-utils.h>
-
-#include "calendar-component.h"
-#include "calendar-config.h"
-#include "e-meeting-utils.h"
-#include "e-meeting-list-view.h"
-#include "e-meeting-time-sel-item.h"
-
-/* An array of hour strings for 24 hour time, "0:00" .. "23:00". */
-const gchar *EMeetingTimeSelectorHours[24] = {
-	"0:00", "1:00", "2:00", "3:00", "4:00", "5:00", "6:00", "7:00", 
-	"8:00", "9:00", "10:00", "11:00", "12:00", "13:00", "14:00", "15:00", 
-	"16:00", "17:00", "18:00", "19:00", "20:00", "21:00", "22:00", "23:00"
-};
-
-/* An array of hour strings for 12 hour time, "12:00am" .. "11:00pm". */
-const gchar *EMeetingTimeSelectorHours12[24] = {
-	"12:00am", "1:00am", "2:00am", "3:00am", "4:00am", "5:00am", "6:00am", 
-	"7:00am", "8:00am", "9:00am", "10:00am", "11:00am", "12:00pm", 
-	"1:00pm", "2:00pm", "3:00pm", "4:00pm", "5:00pm", "6:00pm", "7:00pm",
-	"8:00pm", "9:00pm", "10:00pm", "11:00pm"
-};
-
-/* The number of days shown in the entire canvas. */
-#define E_MEETING_TIME_SELECTOR_DAYS_SHOWN		365
-#define E_MEETING_TIME_SELECTOR_DAYS_START_BEFORE	 60
-#define E_MEETING_TIME_SELECTOR_FB_DAYS_BEFORE            7
-#define E_MEETING_TIME_SELECTOR_FB_DAYS_AFTER            28
-
-/* This is the number of pixels between the mouse has to move before the
-   scroll speed is incremented. */
-#define E_MEETING_TIME_SELECTOR_SCROLL_INCREMENT_WIDTH	10
-
-/* This is the maximum scrolling speed. */
-#define E_MEETING_TIME_SELECTOR_MAX_SCROLL_SPEED	4
-
-/* Signals */
-enum {
-	CHANGED,
-	LAST_SIGNAL
-};
-
-
-static gint mts_signals [LAST_SIGNAL] = { 0 };
-
-static void e_meeting_time_selector_destroy (GtkObject *object);
-static void e_meeting_time_selector_alloc_named_color (EMeetingTimeSelector * mts,
-						       const char *name, GdkColor *c);
-static void e_meeting_time_selector_add_key_color (EMeetingTimeSelector * mts,
-						   GtkWidget *hbox,
-						   gchar *label_text,
-						   GdkColor *color);
-static gint e_meeting_time_selector_expose_key_color (GtkWidget *darea,
-						      GdkEventExpose *event,
-						      GdkColor *color);
-static void e_meeting_time_selector_options_menu_detacher (GtkWidget *widget,
-							   GtkMenu   *menu);
-static void e_meeting_time_selector_autopick_menu_detacher (GtkWidget *widget,
-							    GtkMenu   *menu);
-static void e_meeting_time_selector_realize (GtkWidget *widget);
-static void e_meeting_time_selector_unrealize (GtkWidget *widget);
-static void e_meeting_time_selector_style_set (GtkWidget *widget,
-					       GtkStyle  *previous_style);
-static gint e_meeting_time_selector_expose_event (GtkWidget *widget,
-						  GdkEventExpose *event);
-static void e_meeting_time_selector_draw_shadow (EMeetingTimeSelector *mts);
-static void e_meeting_time_selector_hadjustment_changed (GtkAdjustment *adjustment,
-							 EMeetingTimeSelector *mts);
-static void e_meeting_time_selector_vadjustment_changed (GtkAdjustment *adjustment,
-							 EMeetingTimeSelector *mts);
-static void e_meeting_time_selector_on_canvas_realized (GtkWidget *widget,
-							EMeetingTimeSelector *mts);
-
-static void e_meeting_time_selector_on_options_button_clicked (GtkWidget *button,
-							       EMeetingTimeSelector *mts);
-static void e_meeting_time_selector_options_menu_position_callback (GtkMenu *menu,
-								    gint *x,
-								    gint *y,
-								    gboolean *push_in,
-								    gpointer user_data);
-static void e_meeting_time_selector_on_zoomed_out_toggled (GtkWidget *button,
-							   EMeetingTimeSelector *mts);
-static void e_meeting_time_selector_on_working_hours_toggled (GtkWidget *button,
-							      EMeetingTimeSelector *mts);
-static void e_meeting_time_selector_on_invite_others_button_clicked (GtkWidget *button,
-								     EMeetingTimeSelector *mts);
-static void e_meeting_time_selector_on_update_free_busy (GtkWidget *button,
-							 EMeetingTimeSelector *mts);
-static void e_meeting_time_selector_on_autopick_button_clicked (GtkWidget *button,
-								EMeetingTimeSelector *mts);
-static void e_meeting_time_selector_autopick_menu_position_callback (GtkMenu *menu,
-								     gint *x,
-								     gint *y,
-								     gboolean *push_in,
-								     gpointer user_data);
-static void e_meeting_time_selector_on_autopick_option_toggled (GtkWidget *button,
-								EMeetingTimeSelector *mts);
-static void e_meeting_time_selector_on_prev_button_clicked (GtkWidget *button,
-							    EMeetingTimeSelector *mts);
-static void e_meeting_time_selector_on_next_button_clicked (GtkWidget *button,
-							    EMeetingTimeSelector *mts);
-static void e_meeting_time_selector_autopick (EMeetingTimeSelector *mts,
-					      gboolean forward);
-static void e_meeting_time_selector_calculate_time_difference (EMeetingTime*start,
-							       EMeetingTime*end,
-							       gint *days,
-							       gint *hours,
-							       gint *minutes);
-static void e_meeting_time_selector_find_nearest_interval (EMeetingTimeSelector *mts,
-							   EMeetingTime*start_time,
-							   EMeetingTime*end_time,
-							   gint days, gint hours, gint mins);
-static void e_meeting_time_selector_find_nearest_interval_backward (EMeetingTimeSelector *mts,
-								    EMeetingTime *start_time,
-								    EMeetingTime *end_time,
-								    gint days, gint hours, gint mins);
-static void e_meeting_time_selector_adjust_time (EMeetingTime*mtstime,
-						 gint days, gint hours, gint minutes);
-static EMeetingFreeBusyPeriod* e_meeting_time_selector_find_time_clash (EMeetingTimeSelector *mts,
-									EMeetingAttendee *attendee,
-									EMeetingTime *start_time,
-									EMeetingTime *end_time);
-
-
-static void e_meeting_time_selector_recalc_grid (EMeetingTimeSelector *mts);
-static void e_meeting_time_selector_recalc_date_format (EMeetingTimeSelector *mts);
-static void e_meeting_time_selector_save_position (EMeetingTimeSelector *mts,
-						   EMeetingTime *mtstime);
-static void e_meeting_time_selector_restore_position (EMeetingTimeSelector *mts,
-						      EMeetingTime*mtstime);
-static void e_meeting_time_selector_on_start_time_changed (GtkWidget *widget,
-							   EMeetingTimeSelector *mts);
-static void e_meeting_time_selector_on_end_time_changed (GtkWidget *widget,
-							 EMeetingTimeSelector *mts);
-static void e_meeting_time_selector_update_date_popup_menus (EMeetingTimeSelector *mts);
-static void e_meeting_time_selector_on_canvas_size_allocate (GtkWidget *widget,
-							     GtkAllocation *allocation,
-							     EMeetingTimeSelector *mts);
-static void e_meeting_time_selector_update_main_canvas_scroll_region (EMeetingTimeSelector *mts);
-static gboolean e_meeting_time_selector_timeout_handler (gpointer data);
-static void e_meeting_time_selector_update_start_date_edit (EMeetingTimeSelector *mts);
-static void e_meeting_time_selector_update_end_date_edit (EMeetingTimeSelector *mts);
-static void e_meeting_time_selector_ensure_meeting_time_shown (EMeetingTimeSelector *mts);
-static void e_meeting_time_selector_update_dates_shown (EMeetingTimeSelector *mts);
-
-static void row_inserted_cb (GtkTreeModel *model, GtkTreePath *path, GtkTreeIter *iter, gpointer data);
-static void row_changed_cb (GtkTreeModel *model, GtkTreePath *path, GtkTreeIter *iter, gpointer data);
-static void row_deleted_cb (GtkTreeModel *model, GtkTreePath *path, gpointer data);
-
-static void free_busy_template_changed_cb (GConfClient *client, guint cnxn_id,
-					   GConfEntry *entry, gpointer user_data);
-
-G_DEFINE_TYPE (EMeetingTimeSelector, e_meeting_time_selector, GTK_TYPE_TABLE);
-
-static void
-e_meeting_time_selector_class_init (EMeetingTimeSelectorClass * klass)
-{
-	GtkObjectClass *object_class;
-	GtkWidgetClass *widget_class;
-
-	object_class = (GtkObjectClass *) klass;
-	widget_class = (GtkWidgetClass *) klass;
-
-	mts_signals [CHANGED] = 
-		gtk_signal_new ("changed", GTK_RUN_FIRST,
-				G_TYPE_FROM_CLASS (object_class),
-				GTK_SIGNAL_OFFSET (EMeetingTimeSelectorClass, 
-						   changed),
-				gtk_signal_default_marshaller,
-				GTK_TYPE_NONE, 0);
-
-	object_class->destroy = e_meeting_time_selector_destroy;
-
-	widget_class->realize      = e_meeting_time_selector_realize;
-	widget_class->unrealize    = e_meeting_time_selector_unrealize;
-	widget_class->style_set    = e_meeting_time_selector_style_set;
-	widget_class->expose_event = e_meeting_time_selector_expose_event;
-}
-
-
-static void
-e_meeting_time_selector_init (EMeetingTimeSelector * mts)
-{
-	/* The shadow is drawn in the border so it must be >= 2 pixels. */
-	gtk_container_set_border_width (GTK_CONTAINER (mts), 2);
-
-	mts->accel_group = gtk_accel_group_new ();
-
-	mts->working_hours_only = TRUE;
-	mts->day_start_hour = 9;
-	mts->day_start_minute = 0;
-	mts->day_end_hour = 18;
-	mts->day_end_minute = 0;
-	mts->zoomed_out = TRUE;
-	mts->dragging_position = E_MEETING_TIME_SELECTOR_POS_NONE;
-
-	mts->list_view = NULL;
-
-	mts->fb_uri_not = 
-		calendar_config_add_notification_free_busy_template ((GConfClientNotifyFunc) free_busy_template_changed_cb,
-								     mts);
-
-	mts->fb_refresh_not = 0;
-}
-
-
-void
-e_meeting_time_selector_construct (EMeetingTimeSelector * mts, EMeetingStore *ems)
-{
-	char *filename;
-	GtkWidget *hbox, *vbox, *separator, *label, *table, *sw;
-	GtkWidget *alignment, *child_hbox, *arrow, *menuitem;
-	GSList *group;
-	GdkVisual *visual;
-	GdkColormap *colormap;
-	guint accel_key;
-	time_t meeting_start_time;
-	struct tm *meeting_start_tm;
-	guchar stipple_bits[] = {
-		0x01, 0x02, 0x04, 0x08, 0x10, 0x20, 0x40, 0x80,
-	};
-	AtkObject *a11y_label, *a11y_date_edit;
-
-	/* The default meeting time is the nearest half-hour interval in the
-	   future, in working hours. */
-	meeting_start_time = time (NULL);
-	g_date_clear (&mts->meeting_start_time.date, 1);
-	g_date_set_time (&mts->meeting_start_time.date, meeting_start_time);
-	meeting_start_tm = localtime (&meeting_start_time);
-	mts->meeting_start_time.hour = meeting_start_tm->tm_hour;
-	mts->meeting_start_time.minute = meeting_start_tm->tm_min;
-
-	e_meeting_time_selector_find_nearest_interval (mts, &mts->meeting_start_time,
-						       &mts->meeting_end_time,
-						       0, 0, 30);
-
-	e_meeting_time_selector_update_dates_shown (mts);
-
-	mts->meeting_positions_valid = FALSE;
-
-	mts->row_height = 17;
-	mts->col_width = 55;
-	mts->day_width = 55 * 24 + 1;
-
-	mts->auto_scroll_timeout_id = 0;
-
-	vbox = gtk_vbox_new (FALSE, 0);
-	gtk_table_attach (GTK_TABLE (mts),
-			  vbox, 0, 1, 0, 2, GTK_EXPAND | GTK_FILL, GTK_FILL, 0, 0);
-	gtk_widget_show (vbox);
-
-	mts->attendees_vbox_spacer = gtk_vbox_new (FALSE, 0);
-	gtk_box_pack_start (GTK_BOX (vbox), mts->attendees_vbox_spacer, FALSE, FALSE, 0);
-	gtk_widget_show (mts->attendees_vbox_spacer);
-	
-	mts->attendees_vbox = gtk_vbox_new (FALSE, 0);
-	gtk_box_pack_start (GTK_BOX (vbox), mts->attendees_vbox, TRUE, TRUE, 0);
-	gtk_widget_show (mts->attendees_vbox);
-
-
-	/* build the etable */
-	filename = g_build_filename (calendar_component_peek_config_directory (calendar_component_peek ()),
-				     "config", "et-header-meeting-time-sel", NULL);
-	mts->model = ems;
-
-	if (mts->model)
-		g_object_ref (mts->model);
-
-	g_signal_connect (mts->model, "row_inserted", G_CALLBACK (row_inserted_cb), mts);
-	g_signal_connect (mts->model, "row_changed", G_CALLBACK (row_changed_cb), mts);
-	g_signal_connect (mts->model, "row_deleted", G_CALLBACK (row_deleted_cb), mts);
-
-	mts->list_view = e_meeting_list_view_new (mts->model);
-	e_meeting_list_view_column_set_visible (mts->list_view, "Role", FALSE);
-	e_meeting_list_view_column_set_visible (mts->list_view, "RSVP", FALSE);
-	gtk_widget_show (GTK_WIDGET (mts->list_view));
-
-	
-	sw = gtk_scrolled_window_new (NULL, NULL);
-	gtk_scrolled_window_set_policy (GTK_SCROLLED_WINDOW (sw), GTK_POLICY_NEVER, GTK_POLICY_AUTOMATIC);
-	gtk_scrolled_window_set_shadow_type (GTK_SCROLLED_WINDOW (sw), GTK_SHADOW_IN);
-	gtk_widget_set_child_visible (GTK_SCROLLED_WINDOW (sw)->vscrollbar, FALSE);
-	gtk_widget_show (sw);
-	gtk_container_add (GTK_CONTAINER (sw), GTK_WIDGET (mts->list_view));
-
-#if 0
-	/* FIXME: do we need sorting here */
-	g_signal_connect (real_table->sort_info, "sort_info_changed", G_CALLBACK (sort_info_changed_cb), mts);
-#endif
-
-	gtk_box_pack_start (GTK_BOX (mts->attendees_vbox), GTK_WIDGET (sw), TRUE, TRUE, 6);
-
-	/* The free/busy information */
-	mts->display_top = gnome_canvas_new ();
-	gtk_widget_set_usize (mts->display_top, -1, mts->row_height * 3);
-	gnome_canvas_set_scroll_region (GNOME_CANVAS (mts->display_top),
-					0, 0,
-					mts->day_width * E_MEETING_TIME_SELECTOR_DAYS_SHOWN,
-					mts->row_height * 3);
-	/* Add some horizontal padding for the shadow around the display. */
-	gtk_table_attach (GTK_TABLE (mts), mts->display_top,
-			  1, 4, 0, 1, GTK_EXPAND | GTK_FILL, 0, 0, 0);
-	gtk_widget_show (mts->display_top);
-	g_signal_connect (mts->display_top, "realize",
-			  G_CALLBACK (e_meeting_time_selector_on_canvas_realized), mts);
-
-	mts->display_main = gnome_canvas_new ();
-	e_meeting_time_selector_update_main_canvas_scroll_region (mts);
-	/* Add some horizontal padding for the shadow around the display. */
-	gtk_table_attach (GTK_TABLE (mts), mts->display_main,
-			  1, 4, 1, 2,
-			  GTK_EXPAND | GTK_FILL, GTK_EXPAND | GTK_FILL, 0, 0);
-	gtk_widget_show (mts->display_main);
-	g_signal_connect (mts->display_main, "realize",
-			  G_CALLBACK (e_meeting_time_selector_on_canvas_realized), mts);
-	g_signal_connect (mts->display_main, "size_allocate",
-			  G_CALLBACK (e_meeting_time_selector_on_canvas_size_allocate), mts);
-
-	gtk_scrolled_window_set_vadjustment (GTK_SCROLLED_WINDOW (sw), GTK_LAYOUT (mts->display_main)->vadjustment);
-
-	mts->hscrollbar = gtk_hscrollbar_new (GTK_LAYOUT (mts->display_main)->hadjustment);
-	GTK_LAYOUT (mts->display_main)->hadjustment->step_increment = mts->col_width;
-	gtk_table_attach (GTK_TABLE (mts), mts->hscrollbar,
-			  1, 4, 2, 3, GTK_EXPAND | GTK_FILL, 0, 0, 0);
-	gtk_widget_show (mts->hscrollbar);
-
-	mts->vscrollbar = gtk_vscrollbar_new (GTK_LAYOUT (mts->display_main)->vadjustment);
-	GTK_LAYOUT (mts->display_main)->vadjustment->step_increment = mts->row_height;
-	gtk_table_attach (GTK_TABLE (mts), mts->vscrollbar,
-			  4, 5, 1, 2, 0, GTK_EXPAND | GTK_FILL, 0, 0);
-	gtk_widget_show (mts->vscrollbar);
-
-	/* Create the item in the top canvas. */
-	gnome_canvas_item_new (GNOME_CANVAS_GROUP (GNOME_CANVAS (mts->display_top)->root),
-			       e_meeting_time_selector_item_get_type (),
-			       "EMeetingTimeSelectorItem::meeting_time_selector", mts,
-			       NULL);
-
-	/* Create the item in the main canvas. */
-	gnome_canvas_item_new (GNOME_CANVAS_GROUP (GNOME_CANVAS (mts->display_main)->root),
-			       e_meeting_time_selector_item_get_type (),
-			       "EMeetingTimeSelectorItem::meeting_time_selector", mts,
-			       NULL);
-
-	/* Create the hbox containing the color key. */
-	hbox = gtk_hbox_new (FALSE, 2);
-	gtk_table_attach (GTK_TABLE (mts), hbox,
-			  1, 4, 3, 4, GTK_FILL, 0, 0, 8);
-	gtk_widget_show (hbox);
-
-	e_meeting_time_selector_add_key_color (mts, hbox, _("Tentative"), &mts->busy_colors[E_MEETING_FREE_BUSY_TENTATIVE]);
-	e_meeting_time_selector_add_key_color (mts, hbox, _("Busy"), &mts->busy_colors[E_MEETING_FREE_BUSY_BUSY]);
-	e_meeting_time_selector_add_key_color (mts, hbox, _("Out of Office"), &mts->busy_colors[E_MEETING_FREE_BUSY_OUT_OF_OFFICE]);
-	e_meeting_time_selector_add_key_color (mts, hbox, _("No Information"),
-					       NULL);
-
-	separator = gtk_hseparator_new ();
-	gtk_table_attach (GTK_TABLE (mts), separator,
-			  0, 5, 4, 5, GTK_FILL, 0, 6, 6);
-	gtk_widget_show (separator);
-
-	/* Create the Invite Others & Options buttons on the left. */
-	hbox = gtk_hbox_new (FALSE, 4);
-	gtk_table_attach (GTK_TABLE (mts), hbox,
-			  0, 1, 3, 4, GTK_FILL, 0, 0, 0);
-	gtk_widget_show (hbox);
-
-	mts->add_attendees_button = e_button_new_with_stock_icon (_("Con_tacts..."), "gtk-jump-to");
-	gtk_box_pack_start (GTK_BOX (hbox), mts->add_attendees_button, TRUE, TRUE, 6);
-	gtk_widget_show (mts->add_attendees_button);
-	g_signal_connect (mts->add_attendees_button, "clicked",
-			  G_CALLBACK (e_meeting_time_selector_on_invite_others_button_clicked), mts);
-
-	mts->options_button = gtk_button_new ();
-	gtk_box_pack_start (GTK_BOX (hbox), mts->options_button, TRUE, TRUE, 6);
-	gtk_widget_show (mts->options_button);
-
-	g_signal_connect (mts->options_button, "clicked",
-			  G_CALLBACK (e_meeting_time_selector_on_options_button_clicked), mts);
-
-	child_hbox = gtk_hbox_new (FALSE, 2);
-	gtk_container_add (GTK_CONTAINER (mts->options_button), child_hbox);
-	gtk_widget_show (child_hbox);
-
-	label = gtk_label_new_with_mnemonic (_("O_ptions"));
-	accel_key = gtk_label_get_mnemonic_keyval (GTK_LABEL (label));
-	gtk_box_pack_start (GTK_BOX (child_hbox), label, TRUE, TRUE, 6);
-	gtk_widget_show (label);
-	gtk_widget_add_accelerator (mts->options_button, "clicked", mts->accel_group,
-				    accel_key, GDK_MOD1_MASK, 0);
-
-	arrow = gtk_arrow_new (GTK_ARROW_DOWN, GTK_SHADOW_NONE);
-	gtk_box_pack_start (GTK_BOX (child_hbox), arrow, FALSE, FALSE, 6);
-	gtk_widget_show (arrow);
-
-	/* Create the Options menu. */
-	mts->options_menu = gtk_menu_new ();
-	gtk_menu_attach_to_widget (GTK_MENU (mts->options_menu), mts->options_button,
-				   e_meeting_time_selector_options_menu_detacher);
-
-	menuitem = gtk_check_menu_item_new_with_label ("");
-	gtk_label_set_text_with_mnemonic (GTK_LABEL (GTK_BIN (menuitem)->child), _("Show _only working hours"));
-	gtk_menu_append (GTK_MENU (mts->options_menu), menuitem);
-	gtk_check_menu_item_set_active (GTK_CHECK_MENU_ITEM (menuitem),
-					mts->working_hours_only);
-
-	g_signal_connect (menuitem, "toggled",
-			  G_CALLBACK (e_meeting_time_selector_on_working_hours_toggled), mts);
-	gtk_widget_show (menuitem);
-
-	menuitem = gtk_check_menu_item_new_with_label ("");
-	gtk_label_set_text_with_mnemonic (GTK_LABEL (GTK_BIN (menuitem)->child), _("Show _zoomed out"));
-	gtk_menu_append (GTK_MENU (mts->options_menu), menuitem);
-	gtk_check_menu_item_set_active (GTK_CHECK_MENU_ITEM (menuitem),
-					mts->zoomed_out);
-
-	g_signal_connect (menuitem, "toggled",
-			  G_CALLBACK (e_meeting_time_selector_on_zoomed_out_toggled), mts);
-	gtk_widget_show (menuitem);
-
-	menuitem = gtk_menu_item_new ();
-	gtk_menu_append (GTK_MENU (mts->options_menu), menuitem);
-	gtk_widget_set_sensitive (menuitem, FALSE);
-	gtk_widget_show (menuitem);
-
-	menuitem = gtk_menu_item_new_with_label ("");
-	gtk_label_set_text_with_mnemonic (GTK_LABEL (GTK_BIN (menuitem)->child), _("_Update free/busy"));
-	gtk_menu_append (GTK_MENU (mts->options_menu), menuitem);
-
-	g_signal_connect (menuitem, "activate",
-			  G_CALLBACK (e_meeting_time_selector_on_update_free_busy), mts);
-	gtk_widget_show (menuitem);
-
-	/* Create the 3 AutoPick buttons on the left. */
-	hbox = gtk_hbox_new (FALSE, 0);
-	gtk_table_attach (GTK_TABLE (mts), hbox,
-			  0, 1, 5, 6, GTK_FILL, 0, 0, 0);
-	gtk_widget_show (hbox);
-
-	mts->autopick_down_button = gtk_button_new_with_label ("");
-	gtk_label_set_text_with_mnemonic (GTK_LABEL (GTK_BIN (mts->autopick_down_button)->child),
-					  _("_<<"));
-	accel_key = gtk_label_get_mnemonic_keyval (GTK_LABEL (GTK_BIN (mts->autopick_down_button)->child));
-	gtk_widget_add_accelerator (mts->autopick_down_button, "clicked", mts->accel_group,
-				    accel_key, GDK_MOD1_MASK | GDK_SHIFT_MASK, 0);
-	gtk_box_pack_start (GTK_BOX (hbox), mts->autopick_down_button, TRUE, TRUE, 6);
-	gtk_widget_show (mts->autopick_down_button);
-	g_signal_connect (mts->autopick_down_button, "clicked",
-			  G_CALLBACK (e_meeting_time_selector_on_prev_button_clicked), mts);
-
-	mts->autopick_button = gtk_button_new ();
-	gtk_box_pack_start (GTK_BOX (hbox), mts->autopick_button, TRUE, TRUE, 6);
-	gtk_widget_show (mts->autopick_button);
-
-	child_hbox = gtk_hbox_new (FALSE, 2);
-	gtk_container_add (GTK_CONTAINER (mts->autopick_button), child_hbox);
-	gtk_widget_show (child_hbox);
-
-	label = gtk_label_new ("");
-	gtk_label_set_text_with_mnemonic (GTK_LABEL (label), _("_Autopick"));
-	accel_key = gtk_label_get_mnemonic_keyval (GTK_LABEL (label));
-	gtk_box_pack_start (GTK_BOX (child_hbox), label, TRUE, TRUE, 6);
-	gtk_widget_show (label);
-	gtk_widget_add_accelerator (mts->autopick_button, "clicked", mts->accel_group,
-				    accel_key, GDK_MOD1_MASK, 0);
-	g_signal_connect (mts->autopick_button, "clicked",
-			  G_CALLBACK (e_meeting_time_selector_on_autopick_button_clicked), mts);
-
-	arrow = gtk_arrow_new (GTK_ARROW_DOWN, GTK_SHADOW_NONE);
-	gtk_box_pack_start (GTK_BOX (child_hbox), arrow, FALSE, FALSE, 6);
-	gtk_widget_show (arrow);
-
-	mts->autopick_up_button = gtk_button_new_with_label ("");
-	gtk_label_set_text_with_mnemonic (GTK_LABEL (GTK_BIN (mts->autopick_up_button)->child),
-					  _(">_>"));
-	accel_key = gtk_label_get_mnemonic_keyval (GTK_LABEL (GTK_BIN (mts->autopick_up_button)->child));
-	gtk_widget_add_accelerator (mts->autopick_up_button, "clicked", mts->accel_group,
-				    accel_key, GDK_MOD1_MASK | GDK_SHIFT_MASK, 0);
-	gtk_box_pack_start (GTK_BOX (hbox), mts->autopick_up_button, TRUE, TRUE, 6);
-	gtk_widget_show (mts->autopick_up_button);
-	g_signal_connect (mts->autopick_up_button, "clicked",
-			  G_CALLBACK (e_meeting_time_selector_on_next_button_clicked), mts);
-
-	/* Create the Autopick menu. */
-	mts->autopick_menu = gtk_menu_new ();
-	gtk_menu_attach_to_widget (GTK_MENU (mts->autopick_menu), mts->autopick_button,
-				   e_meeting_time_selector_autopick_menu_detacher);
-
-	menuitem = gtk_radio_menu_item_new_with_label (NULL, "");
-	mts->autopick_all_item = menuitem;
-	group = gtk_radio_menu_item_group (GTK_RADIO_MENU_ITEM (menuitem));
-	gtk_label_set_text_with_mnemonic (GTK_LABEL (GTK_BIN (menuitem)->child), _("_All people and resources"));
-	gtk_menu_append (GTK_MENU (mts->autopick_menu), menuitem);
-	g_signal_connect (menuitem, "toggled",
-			  G_CALLBACK (e_meeting_time_selector_on_autopick_option_toggled), mts);
-	gtk_widget_show (menuitem);
-
-	menuitem = gtk_radio_menu_item_new_with_label (group, "");
-	mts->autopick_all_people_one_resource_item = menuitem;
-	group = gtk_radio_menu_item_group (GTK_RADIO_MENU_ITEM (menuitem));
-	gtk_label_set_text_with_mnemonic (GTK_LABEL (GTK_BIN (menuitem)->child), _("All _people and one resource"));
-	gtk_menu_append (GTK_MENU (mts->autopick_menu), menuitem);
-	g_signal_connect (menuitem, "toggled",
-			  G_CALLBACK (e_meeting_time_selector_on_autopick_option_toggled), mts);
-	gtk_widget_show (menuitem);
-
-	menuitem = gtk_radio_menu_item_new_with_label (group, "");
-	mts->autopick_required_people_item = menuitem;
-	group = gtk_radio_menu_item_group (GTK_RADIO_MENU_ITEM (menuitem));
-	gtk_label_set_text_with_mnemonic (GTK_LABEL (GTK_BIN (menuitem)->child), _("_Required people"));
-	gtk_menu_append (GTK_MENU (mts->autopick_menu), menuitem);
-	g_signal_connect (menuitem, "activate",
-			  G_CALLBACK (e_meeting_time_selector_on_autopick_option_toggled), mts);
-	gtk_widget_show (menuitem);
-
-	menuitem = gtk_radio_menu_item_new_with_label (group, "");
-	mts->autopick_required_people_one_resource_item = menuitem;
-	group = gtk_radio_menu_item_group (GTK_RADIO_MENU_ITEM (menuitem));
-	gtk_label_set_text_with_mnemonic (GTK_LABEL (GTK_BIN (menuitem)->child), _("Required people and _one resource"));
-	gtk_menu_append (GTK_MENU (mts->autopick_menu), menuitem);
-	g_signal_connect (menuitem, "activate",
-			  G_CALLBACK (e_meeting_time_selector_on_autopick_option_toggled), mts);
-	gtk_widget_show (menuitem);
-
-	/* Create the date entry fields on the right. */
-	alignment = gtk_alignment_new (0.0, 0.5, 0, 0);
-	gtk_table_attach (GTK_TABLE (mts), alignment,
-			  1, 4, 5, 6, GTK_FILL, 0, 0, 0);
-	gtk_widget_show (alignment);
-
-	table = gtk_table_new (2, 2, FALSE);
-	gtk_table_set_row_spacings (GTK_TABLE (table), 4);
-	gtk_container_add (GTK_CONTAINER (alignment), table);
-	gtk_widget_show (table);
-
-	mts->start_date_edit = e_date_edit_new ();
-	gtk_label_set_mnemonic_widget (GTK_LABEL (label), mts->start_date_edit);
-	a11y_label = gtk_widget_get_accessible (label);
-	a11y_date_edit = gtk_widget_get_accessible (mts->start_date_edit);
-	if (a11y_label != NULL && a11y_date_edit != NULL) {
-		atk_object_add_relationship (a11y_date_edit,
-					ATK_RELATION_LABELLED_BY,
-					a11y_label);
-	}
-	e_date_edit_set_show_time (E_DATE_EDIT (mts->start_date_edit), TRUE);
-	e_date_edit_set_use_24_hour_format (E_DATE_EDIT (mts->start_date_edit),
-					    calendar_config_get_24_hour_format ());
-	
-	gtk_table_attach (GTK_TABLE (table), mts->start_date_edit,
-			  1, 2, 0, 1, GTK_FILL, 0, 0, 0);
-	gtk_widget_show (mts->start_date_edit);
-	g_signal_connect (mts->start_date_edit, "changed",
-			  G_CALLBACK (e_meeting_time_selector_on_start_time_changed), mts);
-
-	label = gtk_label_new_with_mnemonic (_("_Start time:"));
-	gtk_label_set_mnemonic_widget (GTK_LABEL (label), (mts->start_date_edit));
-
-	gtk_misc_set_alignment (GTK_MISC (label), 0.0, 0.5);
-	gtk_table_attach (GTK_TABLE (table), label,
-			  0, 1, 0, 1, GTK_FILL, 0, 4, 0);
-	gtk_widget_show (label);
-
-	mts->end_date_edit = e_date_edit_new ();
-	gtk_label_set_mnemonic_widget (GTK_LABEL (label), mts->end_date_edit);
-	a11y_label = gtk_widget_get_accessible (label);
-	a11y_date_edit = gtk_widget_get_accessible (mts->end_date_edit);
-	if (a11y_label != NULL && a11y_date_edit != NULL) {
-		atk_object_add_relationship (a11y_date_edit,
-					ATK_RELATION_LABELLED_BY,
-					a11y_label);
-	}
-	e_date_edit_set_show_time (E_DATE_EDIT (mts->end_date_edit), TRUE);
-	e_date_edit_set_use_24_hour_format (E_DATE_EDIT (mts->end_date_edit),
-					    calendar_config_get_24_hour_format ());
-
-	gtk_table_attach (GTK_TABLE (table), mts->end_date_edit,
-			  1, 2, 1, 2, GTK_FILL, 0, 0, 0);
-	gtk_widget_show (mts->end_date_edit);
-	g_signal_connect (mts->end_date_edit, "changed",
-			  G_CALLBACK (e_meeting_time_selector_on_end_time_changed), mts);
-
-	label = gtk_label_new_with_mnemonic (_("_End time:"));
-	gtk_label_set_mnemonic_widget (GTK_LABEL (label), (mts->end_date_edit));
-
-	gtk_misc_set_alignment (GTK_MISC (label), 0.0, 0.5);
-	gtk_table_attach (GTK_TABLE (table), label,
-			  0, 1, 1, 2, GTK_FILL, 0, 4, 0);
-	gtk_widget_show (label);
-
-	gtk_table_set_col_spacing (GTK_TABLE (mts), 0, 4);
-	gtk_table_set_row_spacing (GTK_TABLE (mts), 4, 12);
-
-	/* Allocate the colors. */
-	visual = gtk_widget_get_visual (GTK_WIDGET (mts));
-	colormap = gtk_widget_get_colormap (GTK_WIDGET (mts));
-	e_meeting_time_selector_alloc_named_color (mts, "gray75", &mts->bg_color);
-	e_meeting_time_selector_alloc_named_color (mts, "gray50", &mts->all_attendees_bg_color);
-	gdk_color_black (colormap, &mts->grid_color);
-	gdk_color_white (colormap, &mts->grid_shadow_color);
-	e_meeting_time_selector_alloc_named_color (mts, "gray50", &mts->grid_unused_color);
-	gdk_color_white (colormap, &mts->meeting_time_bg_color);
-	gdk_color_white (colormap, &mts->stipple_bg_color);
-	gdk_color_white (colormap, &mts->attendee_list_bg_color);
-
-	e_meeting_time_selector_alloc_named_color (mts, "LightSkyBlue2", &mts->busy_colors[E_MEETING_FREE_BUSY_TENTATIVE]);
-	e_meeting_time_selector_alloc_named_color (mts, "blue", &mts->busy_colors[E_MEETING_FREE_BUSY_BUSY]);
-	e_meeting_time_selector_alloc_named_color (mts, "HotPink3", &mts->busy_colors[E_MEETING_FREE_BUSY_OUT_OF_OFFICE]);
-
-	/* Create the stipple, for attendees with no data. */
-	mts->stipple = gdk_bitmap_create_from_data (NULL, (gchar*)stipple_bits,
-						    8, 8);
-
-	/* Connect handlers to the adjustments  scroll the other items. */
-	g_signal_connect (GTK_LAYOUT (mts->display_main)->hadjustment, "value_changed",
-			  G_CALLBACK (e_meeting_time_selector_hadjustment_changed), mts);
-	g_signal_connect (GTK_LAYOUT (mts->display_main)->vadjustment, "value_changed",
-			  G_CALLBACK (e_meeting_time_selector_vadjustment_changed), mts);
-	g_signal_connect (GTK_LAYOUT (mts->display_main)->vadjustment, "changed",
-			  G_CALLBACK (e_meeting_time_selector_vadjustment_changed), mts);
-
-	e_meeting_time_selector_recalc_grid (mts);
-	e_meeting_time_selector_ensure_meeting_time_shown (mts);
-	e_meeting_time_selector_update_start_date_edit (mts);
-	e_meeting_time_selector_update_end_date_edit (mts);	
-	e_meeting_time_selector_update_date_popup_menus (mts);
-
-	gtk_signal_emit (GTK_OBJECT (mts), mts_signals [CHANGED]);
-}
-
-
-/* This adds a color to the color key beneath the main display. If color is
-   NULL, it displays the No Info stipple instead. */
-static void
-e_meeting_time_selector_add_key_color (EMeetingTimeSelector * mts,
-				       GtkWidget *hbox,
-				       gchar *label_text, GdkColor *color)
-{
-	GtkWidget *child_hbox, *darea, *label;
-
-	child_hbox = gtk_hbox_new (FALSE, 4);
-	gtk_box_pack_start (GTK_BOX (hbox), child_hbox, TRUE, TRUE, 0);
-	gtk_widget_show (child_hbox);
-
-	darea = gtk_drawing_area_new ();
-	gtk_box_pack_start (GTK_BOX (child_hbox), darea, FALSE, FALSE, 0);
-	gtk_object_set_user_data (GTK_OBJECT (darea), mts);
-	gtk_widget_set_usize (darea, 14, 14);
-	gtk_widget_show (darea);
-
-	label = gtk_label_new (label_text);
-	gtk_misc_set_alignment (GTK_MISC (label), 0.0, 0.5);
-	gtk_box_pack_start (GTK_BOX (child_hbox), label, TRUE, TRUE, 6);
-	gtk_widget_show (label);
-
-	g_signal_connect (darea, "expose_event",
-			  G_CALLBACK (e_meeting_time_selector_expose_key_color),
-			  color);
-}
-
-static gint
-e_meeting_time_selector_expose_key_color (GtkWidget *darea,
-					  GdkEventExpose *event,
-					  GdkColor *color)
-{
-	EMeetingTimeSelector * mts;
-	GdkGC *gc;
-	gint width, height;
-
-	mts = gtk_object_get_user_data (GTK_OBJECT (darea));
-	gc = mts->color_key_gc;
-	width = darea->allocation.width;
-	height = darea->allocation.height;
-
-	gtk_draw_shadow (darea->style, darea->window, GTK_STATE_NORMAL,
-			 GTK_SHADOW_IN, 0, 0, width, height);
-
-	if (color) {
-		gdk_gc_set_foreground (gc, color);
-		gdk_draw_rectangle (darea->window, gc, TRUE, 1, 1,
-				    width - 2, height - 2);
-	} else {
-		gdk_gc_set_foreground (gc, &mts->grid_color);
-		gdk_gc_set_background (gc, &mts->stipple_bg_color);
-		gdk_gc_set_stipple (gc, mts->stipple);
-		gdk_gc_set_fill (gc, GDK_OPAQUE_STIPPLED);
-		gdk_draw_rectangle (darea->window, gc, TRUE, 1, 1,
-				    width - 2, height - 2);
-		gdk_gc_set_fill (gc, GDK_SOLID);
-	}
-
-	return TRUE;
-}
-
-
-static void
-e_meeting_time_selector_alloc_named_color (EMeetingTimeSelector * mts,
-					   const char *name, GdkColor *c)
-{
-	GdkColormap *colormap;
-	
-	g_return_if_fail (name != NULL);
-	g_return_if_fail (c != NULL);
-
-	gdk_color_parse (name, c);
-	colormap = gtk_widget_get_colormap (GTK_WIDGET (mts));
-	if (!gdk_colormap_alloc_color (colormap, c, TRUE, TRUE))
-		g_warning ("Failed to allocate color: %s\n", name);
-}
-
-
-static void
-e_meeting_time_selector_options_menu_detacher (GtkWidget *widget,
-					       GtkMenu   *menu)
-{
-	EMeetingTimeSelector *mts;
-
-	g_return_if_fail (widget != NULL);
-	g_return_if_fail (IS_E_MEETING_TIME_SELECTOR (widget));
-
-	mts = E_MEETING_TIME_SELECTOR (widget);
-	g_return_if_fail (mts->options_menu == (GtkWidget*) menu);
-
-	mts->options_menu = NULL;
-}
-
-
-static void
-e_meeting_time_selector_autopick_menu_detacher (GtkWidget *widget,
-						GtkMenu   *menu)
-{
-	EMeetingTimeSelector *mts;
-
-	g_return_if_fail (widget != NULL);
-	g_return_if_fail (IS_E_MEETING_TIME_SELECTOR (widget));
-
-	mts = E_MEETING_TIME_SELECTOR (widget);
-	g_return_if_fail (mts->autopick_menu == (GtkWidget*) menu);
-
-	mts->autopick_menu = NULL;
-}
-
-
-GtkWidget *
-e_meeting_time_selector_new (EMeetingStore *ems)
-{
-	GtkWidget *mts;
-
-	mts = GTK_WIDGET (g_object_new (e_meeting_time_selector_get_type (), NULL));
-
-	e_meeting_time_selector_construct (E_MEETING_TIME_SELECTOR (mts), ems);
-	
-	return mts;
-}
-
-
-static void
-e_meeting_time_selector_destroy (GtkObject *object)
-{
-	EMeetingTimeSelector *mts;
-
-	mts = E_MEETING_TIME_SELECTOR (object);
-
-	e_meeting_time_selector_remove_timeout (mts);
-	
-	if (mts->stipple) {
-		gdk_bitmap_unref (mts->stipple);
-		mts->stipple = NULL;
-	}
-	
-	if (mts->model) {
-		g_object_unref (mts->model);
-		mts->model = NULL;
-	}
-	
-	mts->display_top = NULL;
-	mts->display_main = NULL;
-
-	calendar_config_remove_notification (mts->fb_uri_not);
-
-	if (mts->fb_refresh_not != 0) {
-		g_source_remove (mts->fb_refresh_not);
-	}
-	
-	if (GTK_OBJECT_CLASS (e_meeting_time_selector_parent_class)->destroy)
-		(*GTK_OBJECT_CLASS (e_meeting_time_selector_parent_class)->destroy)(object);
-}
-
-
-static void
-e_meeting_time_selector_realize (GtkWidget *widget)
-{
-	EMeetingTimeSelector *mts;
-
-	if (GTK_WIDGET_CLASS (e_meeting_time_selector_parent_class)->realize)
-		(*GTK_WIDGET_CLASS (e_meeting_time_selector_parent_class)->realize)(widget);
-
-	mts = E_MEETING_TIME_SELECTOR (widget);
-
-	mts->color_key_gc = gdk_gc_new (widget->window);
-}
-
-
-static void
-e_meeting_time_selector_unrealize (GtkWidget *widget)
-{
-	EMeetingTimeSelector *mts;
-
-	mts = E_MEETING_TIME_SELECTOR (widget);
-
-	gdk_gc_unref (mts->color_key_gc);
-	mts->color_key_gc = NULL;
-
-	if (GTK_WIDGET_CLASS (e_meeting_time_selector_parent_class)->unrealize)
-		(*GTK_WIDGET_CLASS (e_meeting_time_selector_parent_class)->unrealize)(widget);
-}
-
-static int
-get_cell_height (GtkTreeView *tree)
-{
-	GtkTreeViewColumn *column;
-	int height = -1;
-
-	column = gtk_tree_view_get_column (tree, 0);
-	gtk_tree_view_column_cell_get_size (column, NULL,
-					    NULL, NULL,
-					    NULL, &height);
-	
-	return height;
-}
-
-static void
-e_meeting_time_selector_style_set (GtkWidget *widget,
-				   GtkStyle  *previous_style)
-{
-	EMeetingTimeSelector *mts;
-	EMeetingTime saved_time;
-	int hour, max_hour_width;
-	int maxheight;      
-	PangoFontDescription *font_desc;
-	PangoContext *pango_context;
-	PangoFontMetrics *font_metrics;
-	PangoLayout *layout;
-	GtkTreePath *path;
-	GdkRectangle cell_area;
-
-	if (GTK_WIDGET_CLASS (e_meeting_time_selector_parent_class)->style_set)
-		(*GTK_WIDGET_CLASS (e_meeting_time_selector_parent_class)->style_set)(widget, previous_style);
-
-	mts = E_MEETING_TIME_SELECTOR (widget);
-
-	/* Set up Pango prerequisites */
-	font_desc = gtk_widget_get_style (widget)->font_desc;
-	pango_context = gtk_widget_get_pango_context (widget);
-	font_metrics = pango_context_get_metrics (pango_context, font_desc,
-						  pango_context_get_language (pango_context));
-	layout = pango_layout_new (pango_context);
-	
-	/* Calculate the widths of the hour strings in the style's font. */
-	max_hour_width = 0;
-	for (hour = 0; hour < 24; hour++) {
-		if (calendar_config_get_24_hour_format ())
-			pango_layout_set_text (layout, EMeetingTimeSelectorHours [hour], -1);
-		else
-			pango_layout_set_text (layout, EMeetingTimeSelectorHours12 [hour], -1);
-
-		pango_layout_get_pixel_size (layout, &mts->hour_widths [hour], NULL);
-		max_hour_width = MAX (max_hour_width, mts->hour_widths[hour]);
-	}
-              
-	mts->row_height = get_cell_height (GTK_TREE_VIEW (mts->list_view));
-	mts->col_width = max_hour_width + 6;
-
-	e_meeting_time_selector_save_position (mts, &saved_time);
-	e_meeting_time_selector_recalc_grid (mts);
-	e_meeting_time_selector_restore_position (mts, &saved_time);
-              
-	gtk_widget_set_usize (mts->display_top, -1, mts->row_height * 3 + 4);
- 
-	/*
-	 * FIXME: I can't find a way to get the treeview header heights
-	 * other than the below but it isn't nice to realize that widget here
-	 *
-
-	gtk_widget_realize (mts->list_view);
-	gdk_window_get_position (gtk_tree_view_get_bin_window (GTK_TREE_VIEW (mts->list_view)),
-				 NULL, &maxheight);
-	gtk_widget_set_usize (mts->attendees_vbox_spacer, 1, mts->row_height * 3 - maxheight);
-
-	*/	
-
-	gtk_widget_set_usize (mts->attendees_vbox_spacer, 1, mts->row_height * 2 - 6);
-
-	GTK_LAYOUT (mts->display_main)->hadjustment->step_increment = mts->col_width;
-	GTK_LAYOUT (mts->display_main)->vadjustment->step_increment = mts->row_height;
-
-	g_object_unref (layout);
-	pango_font_metrics_unref (font_metrics);
-}
-
-/* This draws a shadow around the top display and main display. */
-static gint
-e_meeting_time_selector_expose_event (GtkWidget *widget,
-				      GdkEventExpose *event)
-{
-	EMeetingTimeSelector *mts;
-
-	mts = E_MEETING_TIME_SELECTOR (widget);
-
-	e_meeting_time_selector_draw_shadow (mts);
-
-	if (GTK_WIDGET_CLASS (e_meeting_time_selector_parent_class)->expose_event)
-		(*GTK_WIDGET_CLASS (e_meeting_time_selector_parent_class)->expose_event)(widget, event);
-
-	return FALSE;
-}
-
-static void
-e_meeting_time_selector_draw_shadow (EMeetingTimeSelector *mts)
-{
-	GtkWidget *widget;
-	gint x, y, w, h;
-
-	widget = GTK_WIDGET (mts);
-
-	/* Draw the shadow around the graphical displays. */
-	x = mts->display_top->allocation.x - 2;
-	y = mts->display_top->allocation.y - 2;
-	w = mts->display_top->allocation.width + 4;
-	h = mts->display_top->allocation.height + mts->display_main->allocation.height + 4;
-
-	gtk_draw_shadow (widget->style, widget->window, GTK_STATE_NORMAL,
-			 GTK_SHADOW_IN, x, y, w, h);
-}
-
-
-/* When the main canvas scrolls, we scroll the other canvases. */
-static void
-e_meeting_time_selector_hadjustment_changed (GtkAdjustment *adjustment,
-					     EMeetingTimeSelector *mts)
-{
-	GtkAdjustment *adj;
-
-	adj = GTK_LAYOUT (mts->display_top)->hadjustment;
-	if (adj->value != adjustment->value) {
-		adj->value = adjustment->value;
-		gtk_adjustment_value_changed (adj);
-	}
-}
-
-
-static void
-e_meeting_time_selector_vadjustment_changed (GtkAdjustment *adjustment,
-					     EMeetingTimeSelector *mts)
-{
-	GtkAdjustment *adj;
-
-	adj = gtk_tree_view_get_vadjustment (GTK_TREE_VIEW (mts->list_view));
-	if (adj->value != adjustment->value) {
-		adj->value = adjustment->value;
-		gtk_adjustment_value_changed (adj);
-	}
-}
-
-void
-e_meeting_time_selector_get_meeting_time (EMeetingTimeSelector *mts,
-					  gint *start_year,
-					  gint *start_month,
-					  gint *start_day,
-					  gint *start_hour,
-					  gint *start_minute,
-					  gint *end_year,
-					  gint *end_month,
-					  gint *end_day,
-					  gint *end_hour,
-					  gint *end_minute)
-{
-	*start_year = g_date_year (&mts->meeting_start_time.date);
-	*start_month = g_date_month (&mts->meeting_start_time.date);
-	*start_day = g_date_day (&mts->meeting_start_time.date);
-	*start_hour = mts->meeting_start_time.hour;
-	*start_minute = mts->meeting_start_time.minute;
-
-	*end_year = g_date_year (&mts->meeting_end_time.date);
-	*end_month = g_date_month (&mts->meeting_end_time.date);
-	*end_day = g_date_day (&mts->meeting_end_time.date);
-	*end_hour = mts->meeting_end_time.hour;
-	*end_minute = mts->meeting_end_time.minute;
-}
-
-
-gboolean
-e_meeting_time_selector_set_meeting_time (EMeetingTimeSelector *mts,
-					  gint start_year,
-					  gint start_month,
-					  gint start_day,
-					  gint start_hour,
-					  gint start_minute,
-					  gint end_year,
-					  gint end_month,
-					  gint end_day,
-					  gint end_hour,
-					  gint end_minute)
-{
-	g_return_val_if_fail (IS_E_MEETING_TIME_SELECTOR (mts), FALSE);
-
-	/* Check the dates are valid. */
-	if (!g_date_valid_dmy (start_day, start_month, start_year)
-	    || !g_date_valid_dmy (end_day, end_month, end_year)
-	    || start_hour < 0 || start_hour > 23
-	    || end_hour < 0 || end_hour > 23
-	    || start_minute < 0 || start_minute > 59
-	    || end_minute < 0 || end_minute > 59)
-		return FALSE;
-
-	g_date_set_dmy (&mts->meeting_start_time.date, start_day, start_month,
-			start_year);
-	mts->meeting_start_time.hour = start_hour;
-	mts->meeting_start_time.minute = start_minute;
-	g_date_set_dmy (&mts->meeting_end_time.date, end_day, end_month,
-			end_year);
-	mts->meeting_end_time.hour = end_hour;
-	mts->meeting_end_time.minute = end_minute;
-
-	mts->meeting_positions_valid = FALSE;
-
-	gtk_widget_queue_draw (mts->display_top);
-	gtk_widget_queue_draw (mts->display_main);
-
-	/* Set the times in the EDateEdit widgets. */
-	e_meeting_time_selector_update_start_date_edit (mts);
-	e_meeting_time_selector_update_end_date_edit (mts);
-
-	gtk_signal_emit (GTK_OBJECT (mts), mts_signals [CHANGED]);
-
-	return TRUE;
-}
-
-void
-e_meeting_time_selector_set_all_day (EMeetingTimeSelector *mts,
-				     gboolean all_day)
-{
-	EMeetingTime saved_time;
-
-	mts->all_day = all_day;
-	
-	e_date_edit_set_show_time (E_DATE_EDIT (mts->start_date_edit),
-				   !all_day);
-	e_date_edit_set_show_time (E_DATE_EDIT (mts->end_date_edit),
-				   !all_day);
-
-	e_meeting_time_selector_save_position (mts, &saved_time);
-	e_meeting_time_selector_recalc_grid (mts);
-	e_meeting_time_selector_restore_position (mts, &saved_time);
-
-	gtk_widget_queue_draw (mts->display_top);
-	gtk_widget_queue_draw (mts->display_main);
-	e_meeting_time_selector_update_date_popup_menus (mts);
-}
-
-
-void
-e_meeting_time_selector_set_working_hours_only (EMeetingTimeSelector *mts,
-						gboolean working_hours_only)
-{
-	EMeetingTime saved_time;
-
-	g_return_if_fail (IS_E_MEETING_TIME_SELECTOR (mts));
-
-	if (mts->working_hours_only == working_hours_only)
-		return;
-
-	mts->working_hours_only = working_hours_only;
-
-	e_meeting_time_selector_save_position (mts, &saved_time);
-	e_meeting_time_selector_recalc_grid (mts);
-	e_meeting_time_selector_restore_position (mts, &saved_time);
-
-	gtk_widget_queue_draw (mts->display_top);
-	gtk_widget_queue_draw (mts->display_main);
-	e_meeting_time_selector_update_date_popup_menus (mts);
-}
-
-
-void
-e_meeting_time_selector_set_working_hours (EMeetingTimeSelector *mts,
-					   gint day_start_hour,
-					   gint day_start_minute,
-					   gint day_end_hour,
-					   gint day_end_minute)
-{
-	EMeetingTime saved_time;
-
-	g_return_if_fail (IS_E_MEETING_TIME_SELECTOR (mts));
-
-	if (mts->day_start_hour == day_start_hour
-	    && mts->day_start_minute == day_start_minute
-	    && mts->day_end_hour == day_end_hour
-	    && mts->day_end_minute == day_end_minute)
-		return;
-
-	mts->day_start_hour = day_start_hour;
-	mts->day_start_minute = day_start_minute;
-
-	/* Make sure we always show atleast an hour */
-	if (day_start_hour * 60 + day_start_minute + 60 < day_end_hour * 60 + day_end_minute) {
-		mts->day_end_hour = day_end_hour;
-		mts->day_end_minute = day_end_minute;
-	} else {
-		mts->day_end_hour = day_start_hour + 1;
-		mts->day_end_minute = day_start_minute;
-	}
-	
-	e_meeting_time_selector_save_position (mts, &saved_time);
-	e_meeting_time_selector_recalc_grid (mts);
-	e_meeting_time_selector_restore_position (mts, &saved_time);
-
-	gtk_widget_queue_draw (mts->display_top);
-	gtk_widget_queue_draw (mts->display_main);
-	e_meeting_time_selector_update_date_popup_menus (mts);
-}
-
-
-void
-e_meeting_time_selector_set_zoomed_out (EMeetingTimeSelector *mts,
-					gboolean zoomed_out)
-{
-	EMeetingTime saved_time;
-
-	g_return_if_fail (IS_E_MEETING_TIME_SELECTOR (mts));
-
-	if (mts->zoomed_out == zoomed_out)
-		return;
-
-	mts->zoomed_out = zoomed_out;
-
-	e_meeting_time_selector_save_position (mts, &saved_time);
-	e_meeting_time_selector_recalc_grid (mts);
-	e_meeting_time_selector_restore_position (mts, &saved_time);
-
-	gtk_widget_queue_draw (mts->display_top);
-	gtk_widget_queue_draw (mts->display_main);
-}
-
-static void
-e_meeting_time_selector_refresh_cb (gpointer data) 
-{
-	EMeetingTimeSelector *mts = data;
-
-	if (mts->display_top != NULL)
-		gtk_widget_queue_draw (mts->display_top);
-	if (mts->display_main != NULL)
-		gtk_widget_queue_draw (mts->display_main);
-
-	gtk_object_unref (GTK_OBJECT (mts));
-}
-
-static void
-e_meeting_time_selector_refresh_free_busy (EMeetingTimeSelector *mts, int row, gboolean all)
-{
-	EMeetingTime start, end;
-	
-	start = mts->meeting_start_time;
-	g_date_subtract_days (&start.date, E_MEETING_TIME_SELECTOR_FB_DAYS_BEFORE);
-	start.hour = 0;
-	start.minute = 0;
-	end = mts->meeting_end_time;
-	g_date_add_days (&end.date, E_MEETING_TIME_SELECTOR_FB_DAYS_AFTER);
-	end.hour = 0;
-	end.minute = 0;	
-
-	/* Ref ourselves in case we are called back after destruction,
-	 * we can do this because we will get a call back even after
-	 * an error */
-	/* FIXME We should really have a mechanism to unqueue the
-	 * notification */
-	if (all) {
-		int i;
-		
-		for (i = 0; i < e_meeting_store_count_actual_attendees (mts->model); i++)
-			gtk_object_ref (GTK_OBJECT (mts));
-	} else {
-		gtk_object_ref (GTK_OBJECT (mts));
-	}
-	
-	if (all)
-		e_meeting_store_refresh_all_busy_periods (mts->model, &start, &end, 
-							  e_meeting_time_selector_refresh_cb, mts);
-	else
-		e_meeting_store_refresh_busy_periods (mts->model, row, &start, &end, 
-						      e_meeting_time_selector_refresh_cb, mts);
-}
-
-EMeetingTimeSelectorAutopickOption
-e_meeting_time_selector_get_autopick_option (EMeetingTimeSelector *mts)
-{
-	if (GTK_CHECK_MENU_ITEM (mts->autopick_all_item)->active)
-		return E_MEETING_TIME_SELECTOR_ALL_PEOPLE_AND_RESOURCES;
-	if (GTK_CHECK_MENU_ITEM (mts->autopick_all_people_one_resource_item)->active)
-		return E_MEETING_TIME_SELECTOR_ALL_PEOPLE_AND_ONE_RESOURCE;
-	if (GTK_CHECK_MENU_ITEM (mts->autopick_required_people_item)->active)
-		return E_MEETING_TIME_SELECTOR_REQUIRED_PEOPLE;
-	return E_MEETING_TIME_SELECTOR_REQUIRED_PEOPLE_AND_ONE_RESOURCE;
-}
-
-
-void
-e_meeting_time_selector_set_autopick_option (EMeetingTimeSelector *mts,
-					     EMeetingTimeSelectorAutopickOption autopick_option)
-{
-	g_return_if_fail (IS_E_MEETING_TIME_SELECTOR (mts));
-
-	switch (autopick_option) {
-	case E_MEETING_TIME_SELECTOR_ALL_PEOPLE_AND_RESOURCES:
-		gtk_check_menu_item_set_active (GTK_CHECK_MENU_ITEM (mts->autopick_all_item), TRUE);
-		break;
-	case E_MEETING_TIME_SELECTOR_ALL_PEOPLE_AND_ONE_RESOURCE:
-		gtk_check_menu_item_set_active (GTK_CHECK_MENU_ITEM (mts->autopick_all_people_one_resource_item), TRUE);
-		break;
-	case E_MEETING_TIME_SELECTOR_REQUIRED_PEOPLE:
-		gtk_check_menu_item_set_active (GTK_CHECK_MENU_ITEM (mts->autopick_required_people_item), TRUE);
-		break;
-	case E_MEETING_TIME_SELECTOR_REQUIRED_PEOPLE_AND_ONE_RESOURCE:
-		gtk_check_menu_item_set_active (GTK_CHECK_MENU_ITEM (mts->autopick_required_people_one_resource_item), TRUE);
-		break;
-	}
-}
-#if 0
-void
-e_meeting_time_selector_attendee_set_send_meeting_to (EMeetingTimeSelector *mts,
-						      gint row,
-						      gboolean send_meeting_to)
-{
-	EMeetingTimeSelectorAttendee *attendee;
-
-	g_return_if_fail (IS_E_MEETING_TIME_SELECTOR (mts));
-	g_return_if_fail (row >= 0);
-	g_return_if_fail (row < mts->attendees->len);
-
-	attendee = &g_array_index (mts->attendees,
-				   EMeetingTimeSelectorAttendee, row);
-	attendee->send_meeting_to = send_meeting_to;
-}
-#endif
-
-void
-e_meeting_time_selector_set_read_only (EMeetingTimeSelector *mts, gboolean read_only)
-{
-	g_return_if_fail (IS_E_MEETING_TIME_SELECTOR (mts));
-
-	gtk_widget_set_sensitive (GTK_WIDGET (mts->list_view), !read_only);
-	gtk_widget_set_sensitive (mts->display_main, !read_only);
-	gtk_widget_set_sensitive (mts->add_attendees_button, !read_only);
-	gtk_widget_set_sensitive (mts->autopick_down_button, !read_only);
-	gtk_widget_set_sensitive (mts->autopick_button, !read_only);
-	gtk_widget_set_sensitive (mts->autopick_up_button, !read_only);
-	gtk_widget_set_sensitive (mts->start_date_edit, !read_only);
-	gtk_widget_set_sensitive (mts->end_date_edit, !read_only);
-}
-
-/*
- * DEBUGGING ROUTINES - functions to output various bits of data.
- */
-
-#ifdef E_MEETING_TIME_SELECTOR_DEBUG
-
-/* Debugging function to dump information on all attendees. */
-void
-e_meeting_time_selector_dump (EMeetingTimeSelector *mts)
-{
-	EMeetingTimeSelectorAttendee *attendee;
-	EMeetingTimeSelectorPeriod *period;
-	gint row, period_num;
-	gchar buffer[128];
-
-	g_return_if_fail (IS_E_MEETING_TIME_SELECTOR (mts));
-
-	g_print ("\n\nAttendee Information:\n");
-
-	for (row = 0; row < mts->attendees->len; row++) {
-		attendee = &g_array_index (mts->attendees,
-					   EMeetingTimeSelectorAttendee, row);
-		g_print ("Attendee: %s\n", attendee->name);
-		g_print ("  Longest Busy Period: %i days\n",
-			 attendee->longest_period_in_days);
-
-		e_meeting_time_selector_attendee_ensure_periods_sorted (mts, attendee);
-#if 1
-		for (period_num = 0;
-		     period_num < attendee->busy_periods->len;
-		     period_num++) {
-			period = &g_array_index (attendee->busy_periods,
-						 EMeetingTimeSelectorPeriod,
-						 period_num);
-
-			/* These are just for debugging so don't need i18n. */
-			g_date_strftime (buffer, sizeof (buffer),
-					 "%A, %B %d, %Y", &period->start.date);
-			g_print ("  Start: %s %i:%02i\n", buffer,
-				 period->start.hour, period->start.minute);
-
-			g_date_strftime (buffer, sizeof (buffer),
-					 "%A, %B %d, %Y", &period->end.date);
-			g_print ("  End  : %s %i:%02i\n", buffer,
-				 period->end.hour, period->end.minute);
-		}
-#endif
-	}
-
-}
-
-
-/* This formats a EMeetingTimein a string and returns it.
-   Note that it uses a static buffer. */
-gchar*
-e_meeting_time_selector_dump_time (EMeetingTime*mtstime)
-{
-	static gchar buffer[128];
-
-	gchar buffer2[128];
-
-	/* This is just for debugging so doesn't need i18n. */
-	g_date_strftime (buffer, sizeof (buffer), "%A, %B %d, %Y",
-			 &mtstime->date);
-	sprintf (buffer2, " at %i:%02i", (gint) mtstime->hour,
-		 (gint) mtstime->minute);
-	strcat (buffer, buffer2);
-
-	return buffer;
-}
-
-
-/* This formats a GDate in a string and returns it.
-   Note that it uses a static buffer. */
-gchar*
-e_meeting_time_selector_dump_date (GDate *date)
-{
-	static gchar buffer[128];
-
-	/* This is just for debugging so doesn't need i18n. */
-	g_date_strftime (buffer, sizeof (buffer), "%A, %B %d, %Y", date);
-	return buffer;
-}
-
-#endif /* E_MEETING_TIME_SELECTOR_DEBUG */
-
-static void
-e_meeting_time_selector_on_invite_others_button_clicked (GtkWidget *button,
-							 EMeetingTimeSelector *mts)
-{
-	e_meeting_list_view_invite_others_dialog (mts->list_view);
-}
-
-
-static void
-e_meeting_time_selector_on_options_button_clicked (GtkWidget *button,
-						   EMeetingTimeSelector *mts)
-{
-	gtk_menu_popup (GTK_MENU (mts->options_menu), NULL, NULL,
-			e_meeting_time_selector_options_menu_position_callback,
-			mts, 1, GDK_CURRENT_TIME);
-}
-
-
-static void
-e_meeting_time_selector_options_menu_position_callback (GtkMenu *menu,
-							gint *x,
-							gint *y,
-							gboolean *push_in,
-							gpointer user_data)
-{
-	EMeetingTimeSelector *mts;
-	GtkRequisition menu_requisition;
-	gint max_x, max_y;
-
-	mts = E_MEETING_TIME_SELECTOR (user_data);
-
-	/* Calculate our preferred position. */
-	gdk_window_get_origin (mts->options_button->window, x, y);
-	*x += mts->options_button->allocation.x;
-	*y += mts->options_button->allocation.y + mts->options_button->allocation.height / 2 - 2;
-
-	/* Now make sure we are on the screen. */
-	gtk_widget_size_request (mts->options_menu, &menu_requisition);
-	max_x = MAX (0, gdk_screen_width () - menu_requisition.width);
-	max_y = MAX (0, gdk_screen_height () - menu_requisition.height);
-	*x = CLAMP (*x, 0, max_x);
-	*y = CLAMP (*y, 0, max_y);
-}
-
-static void
-e_meeting_time_selector_on_update_free_busy (GtkWidget *button,
-					     EMeetingTimeSelector *mts)
-{
-	/* Make sure the menu pops down, which doesn't happen by default if
-	   keyboard accelerators are used. */
-	if (GTK_WIDGET_VISIBLE (mts->options_menu))
-		gtk_menu_popdown (GTK_MENU (mts->options_menu));
-
-	e_meeting_time_selector_refresh_free_busy (mts, 0, TRUE);
-}
-
-
-static void
-e_meeting_time_selector_on_autopick_button_clicked (GtkWidget *button,
-						    EMeetingTimeSelector *mts)
-{
-	gtk_menu_popup (GTK_MENU (mts->autopick_menu), NULL, NULL,
-			e_meeting_time_selector_autopick_menu_position_callback,
-			mts, 1, GDK_CURRENT_TIME);
-}
-
-
-static void
-e_meeting_time_selector_autopick_menu_position_callback (GtkMenu *menu,
-							 gint *x,
-							 gint *y,
-							 gboolean *push_in,
-							 gpointer user_data)
-{
-	EMeetingTimeSelector *mts;
-	GtkRequisition menu_requisition;
-	gint max_x, max_y;
-
-	mts = E_MEETING_TIME_SELECTOR (user_data);
-
-	/* Calculate our preferred position. */
-	gdk_window_get_origin (mts->autopick_button->window, x, y);
-	*x += mts->autopick_button->allocation.x;
-	*y += mts->autopick_button->allocation.y + mts->autopick_button->allocation.height / 2 - 2;
-
-	/* Now make sure we are on the screen. */
-	gtk_widget_size_request (mts->autopick_menu, &menu_requisition);
-	max_x = MAX (0, gdk_screen_width () - menu_requisition.width);
-	max_y = MAX (0, gdk_screen_height () - menu_requisition.height);
-	*x = CLAMP (*x, 0, max_x);
-	*y = CLAMP (*y, 0, max_y);
-}
-
-
-static void
-e_meeting_time_selector_on_autopick_option_toggled (GtkWidget *button,
-						    EMeetingTimeSelector *mts)
-{
-	/* Make sure the menu pops down, which doesn't happen by default if
-	   keyboard accelerators are used. */
-	if (GTK_WIDGET_VISIBLE (mts->autopick_menu))
-		gtk_menu_popdown (GTK_MENU (mts->autopick_menu));
-}
-
-
-static void
-e_meeting_time_selector_on_prev_button_clicked (GtkWidget *button,
-						EMeetingTimeSelector *mts)
-{
-	e_meeting_time_selector_autopick (mts, FALSE);
-}
-
-
-static void
-e_meeting_time_selector_on_next_button_clicked (GtkWidget *button,
-						EMeetingTimeSelector *mts)
-{
-	e_meeting_time_selector_autopick (mts, TRUE);
-}
-
-
-/* This tries to find the previous or next meeting time for which all
-   attendees will be available. */
-static void
-e_meeting_time_selector_autopick (EMeetingTimeSelector *mts,
-				  gboolean forward)
-{
-	EMeetingTime start_time, end_time, *resource_free;
-	EMeetingAttendee *attendee;
-	EMeetingFreeBusyPeriod *period;
-	EMeetingTimeSelectorAutopickOption autopick_option;
-	gint duration_days, duration_hours, duration_minutes, row;
-	gboolean meeting_time_ok, skip_optional = FALSE;
-	gboolean need_one_resource = FALSE, found_resource;
-
-	/* Get the current meeting duration in days + hours + minutes. */
-	e_meeting_time_selector_calculate_time_difference (&mts->meeting_start_time, &mts->meeting_end_time, &duration_days, &duration_hours, &duration_minutes);
-	
-	/* Find the first appropriate start time. */
-	start_time = mts->meeting_start_time;
-	if (forward)
-		e_meeting_time_selector_find_nearest_interval (mts, &start_time, &end_time, duration_days, duration_hours, duration_minutes);
-	else
-		e_meeting_time_selector_find_nearest_interval_backward (mts, &start_time, &end_time, duration_days, duration_hours, duration_minutes);
-
-	/* Determine if we can skip optional people and if we only need one
-	   resource based on the autopick option. */
-	autopick_option = e_meeting_time_selector_get_autopick_option (mts);
-	if (autopick_option == E_MEETING_TIME_SELECTOR_REQUIRED_PEOPLE
-	    || autopick_option == E_MEETING_TIME_SELECTOR_REQUIRED_PEOPLE_AND_ONE_RESOURCE)
-		skip_optional = TRUE;
-	if (autopick_option == E_MEETING_TIME_SELECTOR_ALL_PEOPLE_AND_ONE_RESOURCE
-	    || autopick_option == E_MEETING_TIME_SELECTOR_REQUIRED_PEOPLE_AND_ONE_RESOURCE)
-		need_one_resource = TRUE;
-
-	/* Keep moving forward or backward until we find a possible meeting
-	   time. */
-	for (;;) {
-		meeting_time_ok = TRUE;
-		found_resource = FALSE;
-		resource_free = NULL;
-
-		/* Step through each attendee, checking if the meeting time
-		   intersects one of the attendees busy periods. */
-		for (row = 0; row <  e_meeting_store_count_actual_attendees (mts->model); row++) {
-			attendee = e_meeting_store_find_attendee_at_row (mts->model, row);
-
-			/* Skip optional people if they don't matter. */
-			if (skip_optional && e_meeting_attendee_get_atype (attendee) == E_MEETING_ATTENDEE_OPTIONAL_PERSON)
-				continue;
-
-			period = e_meeting_time_selector_find_time_clash (mts, attendee, &start_time, &end_time);
-
-			if (need_one_resource && e_meeting_attendee_get_atype (attendee) == E_MEETING_ATTENDEE_RESOURCE) {
-				if (period) {
-					/* We want to remember the closest
-					   prev/next time that one resource is
-					   available, in case we don't find any
-					   free resources. */
-					if (forward) {
-						if (!resource_free || e_meeting_time_compare_times (resource_free, &period->end) > 0)
-							resource_free = &period->end;
-					} else {
-						if (!resource_free || e_meeting_time_compare_times (resource_free, &period->start) < 0)
-							resource_free = &period->start;
-					}
-
-				} else {
-					found_resource = TRUE;
-				}
-			} else if (period) {
-				/* Skip the period which clashed. */
-				if (forward) {
-					start_time = period->end;
-				} else {
-					start_time = period->start;
-					e_meeting_time_selector_adjust_time (&start_time, -duration_days, -duration_hours, -duration_minutes);
-				}
-				meeting_time_ok = FALSE;
-				break;
-			}
-		}
-
-		/* Check that we found one resource if necessary. If not, skip
-		   to the closest time that a resource is free. Note that if
-		   there are no resources, resource_free will never get set,
-		   so we assume the meeting time is OK. */
-		if (meeting_time_ok && need_one_resource && !found_resource
-		    && resource_free) {
-			if (forward) {
-				start_time = *resource_free;
-			} else {
-				start_time = *resource_free;
-				e_meeting_time_selector_adjust_time (&start_time, -duration_days, -duration_hours, -duration_minutes);
-			}
-			meeting_time_ok = FALSE;
-		}
-
-		if (meeting_time_ok) {
-			mts->meeting_start_time = start_time;
-			mts->meeting_end_time = end_time;
-			mts->meeting_positions_valid = FALSE;
-			gtk_widget_queue_draw (mts->display_top);
-			gtk_widget_queue_draw (mts->display_main);
-
-			/* Make sure the time is shown. */
-			e_meeting_time_selector_ensure_meeting_time_shown (mts);
-
-			/* Set the times in the EDateEdit widgets. */
-			e_meeting_time_selector_update_start_date_edit (mts);
-			e_meeting_time_selector_update_end_date_edit (mts);
-
-			gtk_signal_emit (GTK_OBJECT (mts), mts_signals [CHANGED]);
-
-			return;
-		}
-
-		/* Move forward to the next possible interval. */
-		if (forward)
-			e_meeting_time_selector_find_nearest_interval (mts, &start_time, &end_time, duration_days, duration_hours, duration_minutes);
-		else
-			e_meeting_time_selector_find_nearest_interval_backward (mts, &start_time, &end_time, duration_days, duration_hours, duration_minutes);
-	}
-}
-
-
-static void
-e_meeting_time_selector_calculate_time_difference (EMeetingTime*start,
-						   EMeetingTime*end,
-						   gint *days,
-						   gint *hours,
-						   gint *minutes)
-{
-	*days = g_date_julian (&end->date) - g_date_julian (&start->date);
-	*hours = end->hour - start->hour;
-	*minutes = end->minute - start->minute;
-	if (*minutes < 0) {
-		*minutes += 60;
-		*hours = *hours - 1;
-	}
-	if (*hours < 0) {
-		*hours += 24;
-		*days = *days - 1;
-	}
-}
-
-
-/* This moves the given time forward to the next suitable start of a meeting.
-   If zoomed_out is set, this means every hour. If not every half-hour. */
-static void
-e_meeting_time_selector_find_nearest_interval (EMeetingTimeSelector *mts,
-					       EMeetingTime*start_time,
-					       EMeetingTime*end_time,
-					       gint days, gint hours, gint mins)
-{
-	gint minutes_shown;
-	gboolean set_to_start_of_working_day = FALSE;
-
-	if (!mts->all_day) {
-		if (mts->zoomed_out) {
-			start_time->hour++;
-			start_time->minute = 0;
-		} else {
-			start_time->minute += 30;
-			start_time->minute -= start_time->minute % 30;
-		}
-	} else {
-		g_date_add_days (&start_time->date, 1);
-		start_time->hour = 0;
-		start_time->minute = 0;	
-	}
-	e_meeting_time_selector_fix_time_overflows (start_time);
-	
-	*end_time = *start_time;
-	e_meeting_time_selector_adjust_time (end_time, days, hours, mins);
-
-	/* Check if the interval is less than a day as seen in the display.
-	   If it isn't we don't worry about the working day. */
-	if (!mts->working_hours_only || days > 0)
-		return;
-	minutes_shown = (mts->day_end_hour - mts->day_start_hour) * 60;
-	minutes_shown += mts->day_end_minute - mts->day_start_minute;
-	if (hours * 60 + mins > minutes_shown)
-		return;
-
-	/* If the meeting time finishes past the end of the working day, move
-	   onto the start of the next working day. If the meeting time starts
-	   before the working day, move it on as well. */
-	if (start_time->hour > mts->day_end_hour
-	    || (start_time->hour == mts->day_end_hour
-		&& start_time->minute > mts->day_end_minute)
-	    || end_time->hour > mts->day_end_hour
-	    || (end_time->hour == mts->day_end_hour
-		&& end_time->minute > mts->day_end_minute)) {
-		g_date_add_days (&start_time->date, 1);
-		set_to_start_of_working_day = TRUE;
-	} else if (start_time->hour < mts->day_start_hour
-		   || (start_time->hour == mts->day_start_hour
-		       && start_time->minute < mts->day_start_minute)) {
-		set_to_start_of_working_day = TRUE;
-	}
-
-	if (set_to_start_of_working_day) {
-		start_time->hour = mts->day_start_hour;
-		start_time->minute = mts->day_start_minute;
-
-		if (mts->zoomed_out) {
-			if (start_time->minute > 0) {
-				start_time->hour++;
-				start_time->minute = 0;
-			}
-		} else {
-			start_time->minute += 29;
-			start_time->minute -= start_time->minute % 30;
-		}
-		
-		e_meeting_time_selector_fix_time_overflows (start_time);
-
-		*end_time = *start_time;
-		e_meeting_time_selector_adjust_time (end_time, days, hours, mins);
-	}
-}
-
-
-/* This moves the given time backward to the next suitable start of a meeting.
-   If zoomed_out is set, this means every hour. If not every half-hour. */
-static void
-e_meeting_time_selector_find_nearest_interval_backward (EMeetingTimeSelector *mts,
-							EMeetingTime*start_time,
-							EMeetingTime*end_time,
-							gint days, gint hours, gint mins)
-{
-	gint new_hour, minutes_shown;
-	gboolean set_to_end_of_working_day = FALSE;
-
-	if (!mts->all_day) {
-		new_hour = start_time->hour;
-		if (mts->zoomed_out) {
-			if (start_time->minute == 0)
-				new_hour--;
-			start_time->minute = 0;
-		} else {
-			if (start_time->minute == 0) {
-				start_time->minute = 30;
-				new_hour--;
-			} else if (start_time->minute <= 30)
-				start_time->minute = 0;
-			else
-				start_time->minute = 30;
-		}
-		if (new_hour < 0) {
-			new_hour += 24;
-			g_date_subtract_days (&start_time->date, 1);
-		}
-		start_time->hour = new_hour;
-	} else {
-		g_date_subtract_days (&start_time->date, 1);
-		start_time->hour = 0;
-		start_time->minute = 0;	
-	}
-
-	*end_time = *start_time;
-	e_meeting_time_selector_adjust_time (end_time, days, hours, mins);
-
-	/* Check if the interval is less than a day as seen in the display.
-	   If it isn't we don't worry about the working day. */
-	if (!mts->working_hours_only || days > 0)
-		return;
-	minutes_shown = (mts->day_end_hour - mts->day_start_hour) * 60;
-	minutes_shown += mts->day_end_minute - mts->day_start_minute;
-	if (hours * 60 + mins > minutes_shown)
-		return;
-
-	/* If the meeting time finishes past the end of the working day, move
-	   back to the end of the working day. If the meeting time starts
-	   before the working day, move it back to the end of the previous
-	   working day. */
-	if (start_time->hour > mts->day_end_hour
-	    || (start_time->hour == mts->day_end_hour
-		&& start_time->minute > mts->day_end_minute)
-	    || end_time->hour > mts->day_end_hour
-	    || (end_time->hour == mts->day_end_hour
-		&& end_time->minute > mts->day_end_minute)) {
-		set_to_end_of_working_day = TRUE;
-	} else if (start_time->hour < mts->day_start_hour
-		   || (start_time->hour == mts->day_start_hour
-		       && start_time->minute < mts->day_start_minute)) {
-		g_date_subtract_days (&end_time->date, 1);
-		set_to_end_of_working_day = TRUE;
-	}
-
-	if (set_to_end_of_working_day) {
-		end_time->hour = mts->day_end_hour;
-		end_time->minute = mts->day_end_minute;
-		*start_time = *end_time;
-		e_meeting_time_selector_adjust_time (start_time, -days, -hours, -mins);
-
-		if (mts->zoomed_out) {
-			start_time->minute = 0;
-		} else {
-			start_time->minute -= start_time->minute % 30;
-		}
-		
-		*end_time = *start_time;
-		e_meeting_time_selector_adjust_time (end_time, days, hours, mins);
-	}
-}
-
-
-/* This adds on the given days, hours & minutes to a EMeetingTimeSelectorTime.
-   It is used to calculate the end of a period given a start & duration.
-   Days, hours & minutes can be negative, to move backwards, but they should
-   be within normal ranges, e.g. hours should be between -23 and 23. */
-static void
-e_meeting_time_selector_adjust_time (EMeetingTime*mtstime,
-				     gint days, gint hours, gint minutes)
-{
-	gint new_hours, new_minutes;
-
-	/* We have to handle negative values for hous and minutes here, since
-	   EMeetingTimeuses guint8s to store them. */
-	new_minutes = mtstime->minute + minutes;
-	if (new_minutes < 0) {
-		new_minutes += 60;
-		hours -= 1;
-	}
-
-	new_hours = mtstime->hour + hours;
-	if (new_hours < 0) {
-		new_hours += 24;
-		days -= 1;
-	}
-
-	g_date_add_days (&mtstime->date, days);
-	mtstime->hour = new_hours;
-	mtstime->minute = new_minutes;
-
-	e_meeting_time_selector_fix_time_overflows (mtstime);
-}
-
-
-/* This looks for any busy period of the given attendee which clashes with
-   the start and end time. It uses a binary search. */
-static EMeetingFreeBusyPeriod *
-e_meeting_time_selector_find_time_clash (EMeetingTimeSelector *mts,
-					 EMeetingAttendee *attendee,
-					 EMeetingTime*start_time,
-					 EMeetingTime*end_time)
-{
-	EMeetingFreeBusyPeriod *period;
-	const GArray *busy_periods;
-	gint period_num;
-
-	busy_periods = e_meeting_attendee_get_busy_periods (attendee);
-	period_num = e_meeting_attendee_find_first_busy_period (attendee, &start_time->date);
-
-	if (period_num == -1)
-		return NULL;
-
-	/* Step forward through the busy periods until we find a clash or we
-	   go past the end_time. */
-	while (period_num < busy_periods->len) {
-		period = &g_array_index (busy_periods,  EMeetingFreeBusyPeriod, period_num);
-
-		/* If the period starts at or after the end time, there is no
-		   clash and we are finished. The busy periods are sorted by
-		   their start times, so all the rest will be later. */
-		if (e_meeting_time_compare_times (&period->start, end_time) >= 0)
-			return NULL;
-
-		/* If the period ends after the start time, we have found a
-		   clash. From the above test we already know the busy period
-		   isn't completely after the meeting time. */
-		if (e_meeting_time_compare_times (&period->end, start_time) > 0)
-			return period;
-
-		period_num++;
-	}
-
-	return NULL;
-}
-
-static void
-e_meeting_time_selector_on_zoomed_out_toggled (GtkWidget *menuitem,
-					       EMeetingTimeSelector *mts)
-{
-	/* Make sure the menu pops down, which doesn't happen by default if
-	   keyboard accelerators are used. */
-	if (GTK_WIDGET_VISIBLE (mts->options_menu))
-		gtk_menu_popdown (GTK_MENU (mts->options_menu));
-
-	e_meeting_time_selector_set_zoomed_out (mts, GTK_CHECK_MENU_ITEM (menuitem)->active);
-	e_meeting_time_selector_ensure_meeting_time_shown (mts);
-}
-
-
-static void
-e_meeting_time_selector_on_working_hours_toggled (GtkWidget *menuitem,
-						  EMeetingTimeSelector *mts)
-{
-	/* Make sure the menu pops down, which doesn't happen by default if
-	   keyboard accelerators are used. */
-	if (GTK_WIDGET_VISIBLE (mts->options_menu))
-		gtk_menu_popdown (GTK_MENU (mts->options_menu));
-
-	e_meeting_time_selector_set_working_hours_only (mts, GTK_CHECK_MENU_ITEM (menuitem)->active);
-	e_meeting_time_selector_ensure_meeting_time_shown (mts);
-}
-
-
-/* This recalculates day_width, first_hour_shown and last_hour_shown. */
-static void
-e_meeting_time_selector_recalc_grid (EMeetingTimeSelector *mts)
-{
-	if (mts->working_hours_only) {
-		mts->first_hour_shown = mts->day_start_hour;
-		mts->last_hour_shown = mts->day_end_hour;
-		if (mts->day_end_minute != 0)
-			mts->last_hour_shown += 1;
-	} else {
-		mts->first_hour_shown = 0;
-		mts->last_hour_shown = 24;
-	}
-
-	/* In the brief view we use the nearest hours divisible by 3. */
-	if (mts->zoomed_out) {
-		mts->first_hour_shown -= mts->first_hour_shown % 3;
-		mts->last_hour_shown += 2;
-		mts->last_hour_shown -= mts->last_hour_shown % 3;
-	}
-
-	mts->day_width = mts->col_width	* (mts->last_hour_shown - mts->first_hour_shown);
-	if (mts->zoomed_out)
-		mts->day_width /= 3;
-
-	/* Add one pixel for the extra vertical grid line. */
-	mts->day_width++;
-
-	gnome_canvas_set_scroll_region (GNOME_CANVAS (mts->display_top),
-					0, 0,
-					mts->day_width * E_MEETING_TIME_SELECTOR_DAYS_SHOWN,
-					mts->row_height * 3);
-	e_meeting_time_selector_update_main_canvas_scroll_region (mts);
-
-	e_meeting_time_selector_recalc_date_format (mts);
-	mts->meeting_positions_valid = FALSE;
-}
-
-
-/* This saves the first visible time in the given EMeetingTimeSelectorTime. */
-static void
-e_meeting_time_selector_save_position (EMeetingTimeSelector *mts,
-				       EMeetingTime*mtstime)
-{
-	gint scroll_x, scroll_y;
-
-	gnome_canvas_get_scroll_offsets (GNOME_CANVAS (mts->display_main),
-					 &scroll_x, &scroll_y);
-	e_meeting_time_selector_calculate_time (mts, scroll_x, mtstime);
-}
-
-
-/* This restores a saved position. */
-static void
-e_meeting_time_selector_restore_position (EMeetingTimeSelector *mts,
-					  EMeetingTime*mtstime)
-{
-	gint scroll_x, scroll_y, new_scroll_x;
-
-	new_scroll_x = e_meeting_time_selector_calculate_time_position (mts,
-									mtstime);
-	gnome_canvas_get_scroll_offsets (GNOME_CANVAS (mts->display_main),
-					 &scroll_x, &scroll_y);
-	gnome_canvas_scroll_to (GNOME_CANVAS (mts->display_main),
-				new_scroll_x, scroll_y);
-}
-
-
-/* This returns the x pixel coords of the meeting time in the entire scroll
-   region. It recalculates them if they have been marked as invalid.
-   If it returns FALSE then no meeting time is set or the meeting time is
-   not visible in the current scroll area. */
-gboolean
-e_meeting_time_selector_get_meeting_time_positions (EMeetingTimeSelector *mts,
-						    gint *start_x,
-						    gint *end_x)
-{
-	if (mts->meeting_positions_valid) {
-		if (mts->meeting_positions_in_scroll_area) {
-			*start_x = mts->meeting_start_x;
-			*end_x = mts->meeting_end_x;
-			return TRUE;
-		} else {
-			return FALSE;
-		}
-	}
-
-	mts->meeting_positions_valid = TRUE;
-
-	/* Check if the days aren't in our current range. */
-	if (g_date_compare (&mts->meeting_start_time.date, &mts->last_date_shown) > 0
-	    || g_date_compare (&mts->meeting_end_time.date, &mts->first_date_shown) < 0) {
-		mts->meeting_positions_in_scroll_area = FALSE;
-		return FALSE;
-	}
-
-	mts->meeting_positions_in_scroll_area = TRUE;
-	*start_x = mts->meeting_start_x = e_meeting_time_selector_calculate_time_position (mts, &mts->meeting_start_time);
-	*end_x = mts->meeting_end_x = e_meeting_time_selector_calculate_time_position (mts, &mts->meeting_end_time);
-
-	return TRUE;
-}
-
-
-/* This recalculates the date format to used, by computing the width of the
-   longest date strings in the widget's font and seeing if they fit. */
-static void
-e_meeting_time_selector_recalc_date_format (EMeetingTimeSelector *mts)
-{
-	/* 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 };
-	GDate date;
-	gint max_date_width, longest_weekday_width, longest_month_width, width;
-	gint day, longest_weekday, month, longest_month;
-	gchar buffer[128];
-	PangoFontDescription *font_desc;
-	PangoContext *pango_context;
-	PangoLayout *layout;
-
-	/* Set up Pango prerequisites */
-	font_desc = gtk_widget_get_style (GTK_WIDGET (mts))->font_desc;
-	pango_context = gtk_widget_get_pango_context (GTK_WIDGET (mts));
-	layout = pango_layout_new (pango_context);
-
-	/* Calculate the maximum date width we can fit into the display. */
-	max_date_width = mts->day_width - 2;
-
-	/* Find the biggest full weekday name. We start on a particular
-	   Monday and go through seven days. */
-	g_date_clear (&date, 1);
-	g_date_set_dmy (&date, 3, 1, 2000);	/* Monday 3rd Jan 2000. */
-	longest_weekday_width = 0;
-	longest_weekday = G_DATE_MONDAY;
-	for (day = G_DATE_MONDAY; day <= G_DATE_SUNDAY; day++) {
-		g_date_strftime (buffer, sizeof (buffer), "%A", &date);
-		pango_layout_set_text (layout, buffer, -1);
-		pango_layout_get_pixel_size (layout, &width, NULL);
-		if (width > longest_weekday_width) {
-			longest_weekday = day;
-			longest_weekday_width = width;
-		}
-		g_date_add_days (&date, 1);
-	}
-
-	/* Now find the biggest month name. */
-	longest_month_width = 0;
-	longest_month = G_DATE_JANUARY;
-	for (month = G_DATE_JANUARY; month <= G_DATE_DECEMBER; month++) {
-		g_date_set_month (&date, month);
-		g_date_strftime (buffer, sizeof (buffer), "%B", &date);
-		pango_layout_set_text (layout, buffer, -1);
-		pango_layout_get_pixel_size (layout, &width, NULL);
-		if (width > longest_month_width) {
-			longest_month = month;
-			longest_month_width = width;
-		}
-	}
-
-	/* See if we can use the full date. We want to use a date with a
-	   month day > 20 and also the longest weekday. We use a
-	   pre-calculated array of days for each month and add on the
-	   weekday (which is 1 (Mon) to 7 (Sun). */
-	g_date_set_dmy (&date, days[longest_month - 1] + longest_weekday,
-			longest_month, 2000);
-	/* This is a strftime() format string %A = full weekday name,
-	   %B = full month name, %d = month day, %Y = full year. */
-	g_date_strftime (buffer, sizeof (buffer), _("%A, %B %d, %Y"), &date);
-
-#if 0
-	g_print ("longest_month: %i longest_weekday: %i date: %s\n",
-		 longest_month, longest_weekday, buffer);
-#endif
-
-	pango_layout_set_text (layout, buffer, -1);
-	pango_layout_get_pixel_size (layout, &width, NULL);
-	if (width < max_date_width) {
-		mts->date_format = E_MEETING_TIME_SELECTOR_DATE_FULL;
-		return;
-	}
-
-	/* Now try it with abbreviated weekday names. */
-	longest_weekday_width = 0;
-	longest_weekday = G_DATE_MONDAY;
-	g_date_set_dmy (&date, 3, 1, 2000);	/* Monday 3rd Jan 2000. */
-	for (day = G_DATE_MONDAY; day <= G_DATE_SUNDAY; day++) {
-		g_date_strftime (buffer, sizeof (buffer), "%a", &date);
-		pango_layout_set_text (layout, buffer, -1);
-		pango_layout_get_pixel_size (layout, &width, NULL);
-		if (width > longest_weekday_width) {
-			longest_weekday = day;
-			longest_weekday_width = width;
-		}
-		g_date_add_days (&date, 1);
-	}
-
-	g_date_set_dmy (&date, days[longest_month - 1] + longest_weekday,
-			longest_month, 2000);
-	/* This is a strftime() format string %a = abbreviated weekday name,
-	   %m = month number, %d = month day, %Y = full year. */
-	g_date_strftime (buffer, sizeof (buffer), _("%a %m/%d/%Y"), &date);
-
-#if 0
-	g_print ("longest_month: %i longest_weekday: %i date: %s\n",
-		 longest_month, longest_weekday, buffer);
-#endif
-
-	pango_layout_set_text (layout, buffer, -1);
-	pango_layout_get_pixel_size (layout, &width, NULL);
-	if (width < max_date_width)
-		mts->date_format = E_MEETING_TIME_SELECTOR_DATE_ABBREVIATED_DAY;
-	else
-		mts->date_format = E_MEETING_TIME_SELECTOR_DATE_SHORT;
-
-	g_object_unref (layout);
-}
-
-
-/* Turn off the background of the canvas windows. This reduces flicker
-   considerably when scrolling. (Why isn't it in GnomeCanvas?). */
-static void
-e_meeting_time_selector_on_canvas_realized (GtkWidget *widget,
-					    EMeetingTimeSelector *mts)
-{
-	gdk_window_set_back_pixmap (GTK_LAYOUT (widget)->bin_window,
-				    NULL, FALSE);
-}
-
-
-/* This is called when the meeting start time GnomeDateEdit is changed,
-   either via the "date_changed". "time_changed" or "activate" signals on one
-   of the GtkEntry widgets. So don't use the widget parameter since it may be
-   one of the child GtkEntry widgets. */
-static void
-e_meeting_time_selector_on_start_time_changed (GtkWidget *widget,
-					       EMeetingTimeSelector *mts)
-{
-	gint duration_days, duration_hours, duration_minutes;
-	EMeetingTime mtstime;
-	gint hour = 0, minute = 0;
-	time_t newtime;
-
-	/* Date */
-	newtime = e_date_edit_get_time (E_DATE_EDIT (mts->start_date_edit));
-	g_date_clear (&mtstime.date, 1);
-	g_date_set_time (&mtstime.date, newtime);
-
-	/* Time */
-	e_date_edit_get_time_of_day (E_DATE_EDIT (mts->start_date_edit), &hour, &minute);
-	mtstime.hour = hour;
-	mtstime.minute = minute;
-
-	/* If the time hasn't changed, just return. */
-	if (e_meeting_time_compare_times (&mtstime, &mts->meeting_start_time) == 0)
-		return;
-
-	/* Calculate the current meeting duration. */
-	e_meeting_time_selector_calculate_time_difference (&mts->meeting_start_time, &mts->meeting_end_time, &duration_days, &duration_hours, &duration_minutes);
-
-	/* Set the new start time. */
-	mts->meeting_start_time = mtstime;
-
-	/* Update the end time so the meeting duration stays the same. */
-	mts->meeting_end_time = mts->meeting_start_time;
-	e_meeting_time_selector_adjust_time (&mts->meeting_end_time, duration_days, duration_hours, duration_minutes);
-	e_meeting_time_selector_update_end_date_edit (mts);
-
-	mts->meeting_positions_valid = FALSE;
-	e_meeting_time_selector_ensure_meeting_time_shown (mts);
-	gtk_widget_queue_draw (mts->display_top);
-	gtk_widget_queue_draw (mts->display_main);
-
-	gtk_signal_emit (GTK_OBJECT (mts), mts_signals [CHANGED]);
-}
-
-
-/* This is called when the meeting end time GnomeDateEdit is changed,
-   either via the "date_changed", "time_changed" or "activate" signals on one
-   of the GtkEntry widgets. So don't use the widget parameter since it may be
-   one of the child GtkEntry widgets. */
-static void
-e_meeting_time_selector_on_end_time_changed (GtkWidget *widget,
-					     EMeetingTimeSelector *mts)
-{
-	EMeetingTime mtstime;
-	gint hour = 0, minute = 0;
-	time_t newtime;
-
-	/* Date */
-	newtime = e_date_edit_get_time (E_DATE_EDIT (mts->end_date_edit));
-	g_date_clear (&mtstime.date, 1);
-	g_date_set_time (&mtstime.date, newtime);
-	if (mts->all_day)
-		g_date_add_days (&mtstime.date, 1);
-
-	/* Time */
-	e_date_edit_get_time_of_day (E_DATE_EDIT (mts->end_date_edit), &hour, &minute);
-	mtstime.hour = hour;
-	mtstime.minute = minute;
-
-	/* If the time hasn't changed, just return. */
-	if (e_meeting_time_compare_times (&mtstime, &mts->meeting_end_time) == 0)
-		return;
-
-	/* Set the new end time. */
-	mts->meeting_end_time = mtstime;
-
-	/* If the start time is after the end time, set it to the same time. */
-	if (e_meeting_time_compare_times (&mtstime, &mts->meeting_start_time) <= 0) {
-		/* We set it first, before updating the widget, so the signal
-		   handler will just return. */
-		mts->meeting_start_time = mtstime;
-		if (mts->all_day)
-			g_date_subtract_days (&mts->meeting_start_time.date, 1);
-		e_meeting_time_selector_update_start_date_edit (mts);
-	}
-
-	mts->meeting_positions_valid = FALSE;
-	e_meeting_time_selector_ensure_meeting_time_shown (mts);
-	gtk_widget_queue_draw (mts->display_top);
-	gtk_widget_queue_draw (mts->display_main);
-
-	gtk_signal_emit (GTK_OBJECT (mts), mts_signals [CHANGED]);
-}
-
-
-/* This updates the ranges shown in the GnomeDateEdit popup menus, according
-   to working_hours_only etc. */
-static void
-e_meeting_time_selector_update_date_popup_menus (EMeetingTimeSelector *mts)
-{
-	EDateEdit *start_edit, *end_edit;
-	gint low_hour, high_hour;
-
-	start_edit = E_DATE_EDIT (mts->start_date_edit);
-	end_edit = E_DATE_EDIT (mts->end_date_edit);
-
-	if (mts->working_hours_only) {
-		low_hour = mts->day_start_hour;
-		high_hour = mts->day_end_hour;
-	} else {
-		low_hour = 0;
-		high_hour = 23;
-	}
-
-	e_date_edit_set_time_popup_range (start_edit, low_hour, high_hour);
-	e_date_edit_set_time_popup_range (end_edit, low_hour, high_hour);
-}
-
-
-static void
-e_meeting_time_selector_on_canvas_size_allocate (GtkWidget *widget,
-						 GtkAllocation *allocation,
-						 EMeetingTimeSelector *mts)
-{
-	e_meeting_time_selector_update_main_canvas_scroll_region (mts);
-
-	e_meeting_time_selector_ensure_meeting_time_shown (mts);
-}
-
-/* This updates the canvas scroll regions according to the number of attendees.
-   If the total height needed is less than the height of the canvas, we must
-   use the height of the canvas, or it causes problems. */
-static void
-e_meeting_time_selector_update_main_canvas_scroll_region (EMeetingTimeSelector *mts)
-{
-	gint height, canvas_height;
-
-	height = mts->row_height * (e_meeting_store_count_actual_attendees (mts->model) + 2);
-	canvas_height = GTK_WIDGET (mts->display_main)->allocation.height;
-
-	height = MAX (height,  canvas_height);
-
-	gnome_canvas_set_scroll_region (GNOME_CANVAS (mts->display_main),
-					0, 0,
-					mts->day_width * E_MEETING_TIME_SELECTOR_DAYS_SHOWN,
-					height);
-}
-
-
-/* This changes the meeting time based on the given x coordinate and whether
-   we are dragging the start or end bar. It returns the new position, which
-   will be swapped if the start bar is dragged past the end bar or vice versa.
-   It make sure the meeting time is never dragged outside the visible canvas
-   area. */
-void
-e_meeting_time_selector_drag_meeting_time (EMeetingTimeSelector *mts,
-					   gint x)
-{
-	EMeetingTime first_time, last_time, drag_time, *time_to_set;
-	gint scroll_x, scroll_y, canvas_width;
-	gboolean set_both_times = FALSE;
-
-	/* Get the x coords of visible part of the canvas. */
-	gnome_canvas_get_scroll_offsets (GNOME_CANVAS (mts->display_main),
-					 &scroll_x, &scroll_y);
-	canvas_width = mts->display_main->allocation.width;
-
-	/* Save the x coordinate for the timeout handler. */
-	mts->last_drag_x = (x < scroll_x) ? x - scroll_x
-		: x - scroll_x - canvas_width + 1;
-
-	/* Check if the mouse is off the edge of the canvas. */
-	if (x < scroll_x || x > scroll_x + canvas_width) {
-		/* If we haven't added a timeout function, add one. */
-		if (mts->auto_scroll_timeout_id == 0) {
-			mts->auto_scroll_timeout_id = g_timeout_add (60, e_meeting_time_selector_timeout_handler, mts);
-			mts->scroll_count = 0;
-
-			/* Call the handler to start scrolling now. */
-			e_meeting_time_selector_timeout_handler (mts);
-			return;
-		}
-	} else {
-		e_meeting_time_selector_remove_timeout (mts);
-	}
-
-	/* Calculate the minimum & maximum times we can use, based on the
-	   scroll offsets and whether zoomed_out is set. */
-	e_meeting_time_selector_calculate_time (mts, scroll_x, &first_time);
-	e_meeting_time_selector_calculate_time (mts, scroll_x + canvas_width - 1,
-						&last_time);
-	if (!mts->all_day) {
-		if (mts->zoomed_out) {
-			if (first_time.minute > 30)
-				first_time.hour++;
-			first_time.minute = 0;
-			last_time.minute = 0;
-		} else {
-			first_time.minute += 15;
-			first_time.minute -= first_time.minute % 30;
-			last_time.minute -= last_time.minute % 30;
-		}
-	} else {
-		if (first_time.hour > 0 || first_time.minute > 0)
-			g_date_add_days (&first_time.date, 1);
-		first_time.hour = 0;
-		first_time.minute = 0;
-		last_time.hour = 0;
-		last_time.minute = 0;
-	}
-	e_meeting_time_selector_fix_time_overflows (&first_time);
-	e_meeting_time_selector_fix_time_overflows (&last_time);
-
-	/* Calculate the time from x coordinate. */
-	e_meeting_time_selector_calculate_time (mts, x, &drag_time);
-
-	/* Calculate the nearest half-hour or hour, depending on whether
-	   zoomed_out is set. */
-	if (!mts->all_day) {
-		if (mts->zoomed_out) {
-			if (drag_time.minute > 30)
-				drag_time.hour++;
-			drag_time.minute = 0;
-		} else {
-			drag_time.minute += 15;
-			drag_time.minute -= drag_time.minute % 30;
-		}
-	} else {
-		if (drag_time.hour > 12)
-			g_date_add_days (&drag_time.date, 1);
-		drag_time.hour = 0;
-		drag_time.minute = 0;		
-	}
-	e_meeting_time_selector_fix_time_overflows (&drag_time);
-
-	/* Now make sure we are between first_time & last_time. */
-	if (e_meeting_time_compare_times (&drag_time, &first_time) < 0)
-		drag_time = first_time;
-	if (e_meeting_time_compare_times (&drag_time, &last_time) > 0)
-		drag_time = last_time;
-
-	/* Set the meeting start or end time to drag_time. */
-	if (mts->dragging_position == E_MEETING_TIME_SELECTOR_POS_START)
-		time_to_set = &mts->meeting_start_time;
-	else
-		time_to_set = &mts->meeting_end_time;
-
-	/* If the time is unchanged, just return. */
-	if (e_meeting_time_compare_times (time_to_set, &drag_time) == 0)
-		return;
-
-	/* Don't let an empty occur for all day events */
-	if (mts->all_day
-	    && mts->dragging_position == E_MEETING_TIME_SELECTOR_POS_START
-	    && e_meeting_time_compare_times (&mts->meeting_end_time, &drag_time) == 0)
-		return;
-	else if (mts->all_day
-		 && mts->dragging_position == E_MEETING_TIME_SELECTOR_POS_END
-		 && e_meeting_time_compare_times (&mts->meeting_start_time, &drag_time) == 0)
-		return;
-	
-	*time_to_set = drag_time;
-
-	/* Check if the start time and end time need to be switched. */
-	if (e_meeting_time_compare_times (&mts->meeting_start_time,
-					  &mts->meeting_end_time) > 0) {
-		drag_time = mts->meeting_start_time;
-		mts->meeting_start_time = mts->meeting_end_time;
-		mts->meeting_end_time = drag_time;
-
-		if (mts->dragging_position == E_MEETING_TIME_SELECTOR_POS_START)
-			mts->dragging_position = E_MEETING_TIME_SELECTOR_POS_END;
-		else
-			mts->dragging_position = E_MEETING_TIME_SELECTOR_POS_START;
-
-		set_both_times = TRUE;
-	}
-	
-
-	/* Mark the calculated positions as invalid. */
-	mts->meeting_positions_valid = FALSE;
-
-	/* Redraw the canvases. */
-	gtk_widget_queue_draw (mts->display_top);
-	gtk_widget_queue_draw (mts->display_main);
-
-	/* Set the times in the GnomeDateEdit widgets. */
-	if (set_both_times
-	    || mts->dragging_position == E_MEETING_TIME_SELECTOR_POS_START)
-		e_meeting_time_selector_update_start_date_edit (mts);
-
-	if (set_both_times
-	    || mts->dragging_position == E_MEETING_TIME_SELECTOR_POS_END)
-		e_meeting_time_selector_update_end_date_edit (mts);
-
-	if (set_both_times
-	    || mts->dragging_position == E_MEETING_TIME_SELECTOR_POS_END
-	    || mts->dragging_position == E_MEETING_TIME_SELECTOR_POS_START)
-		gtk_signal_emit (GTK_OBJECT (mts), mts_signals [CHANGED]);
-}
-
-
-/* This is the timeout function which handles auto-scrolling when the user is
-   dragging one of the meeting time vertical bars outside the left or right
-   edge of the canvas. */
-static gboolean
-e_meeting_time_selector_timeout_handler (gpointer data)
-{
-	EMeetingTimeSelector *mts;
-	EMeetingTime drag_time, *time_to_set;
-	gint scroll_x, max_scroll_x, scroll_y, canvas_width;
-	gint scroll_speed, scroll_offset;
-	gboolean set_both_times = FALSE;
-
-	mts = E_MEETING_TIME_SELECTOR (data);
-
-	GDK_THREADS_ENTER ();
-
-	/* Return if we don't need to scroll yet. */
-	if (mts->scroll_count-- > 0) {
-		GDK_THREADS_LEAVE ();
-		return TRUE;
-	}
-
-	/* Get the x coords of visible part of the canvas. */
-	gnome_canvas_get_scroll_offsets (GNOME_CANVAS (mts->display_main),
-					 &scroll_x, &scroll_y);
-	canvas_width = mts->display_main->allocation.width;
-
-	/* Calculate the scroll delay, between 0 and MAX_SCROLL_SPEED. */
-	scroll_speed = abs (mts->last_drag_x / E_MEETING_TIME_SELECTOR_SCROLL_INCREMENT_WIDTH);
-	scroll_speed = MIN (scroll_speed,
-			    E_MEETING_TIME_SELECTOR_MAX_SCROLL_SPEED);
-
-	/* Reset the scroll count. */
-	mts->scroll_count = E_MEETING_TIME_SELECTOR_MAX_SCROLL_SPEED - scroll_speed;
-
-	/* Calculate how much we need to scroll. */
-	if (mts->last_drag_x >= 0)
-		scroll_offset = mts->col_width;
-	else
-		scroll_offset = -mts->col_width;
-
-	scroll_x += scroll_offset;
-	max_scroll_x = (mts->day_width * E_MEETING_TIME_SELECTOR_DAYS_SHOWN)
-		- canvas_width;
-	scroll_x = CLAMP (scroll_x, 0, max_scroll_x);
-
-	/* Calculate the minimum or maximum visible time in the canvas, which
-	   we will now set the dragged time to. */
-	if (scroll_offset > 0) {
-		e_meeting_time_selector_calculate_time (mts,
-							scroll_x + canvas_width - 1,
-							&drag_time);
-		if (!mts->all_day) {
-			if (mts->zoomed_out) {
-				drag_time.minute = 0;
-			} else {
-				drag_time.minute -= drag_time.minute % 30;
-			}
-		} else {
-			drag_time.hour = 0;
-			drag_time.minute = 0;
-		}
-	} else {
-		e_meeting_time_selector_calculate_time (mts, scroll_x,
-							&drag_time);
-		if (!mts->all_day) {
-			if (mts->zoomed_out) {
-				if (drag_time.minute > 30)
-					drag_time.hour++;
-				drag_time.minute = 0;
-			} else {
-				drag_time.minute += 15;
-				drag_time.minute -= drag_time.minute % 30;
-			}
-		} else {
-			if (drag_time.hour > 0 || drag_time.minute > 0)
-				g_date_add_days (&drag_time.date, 1);
-			drag_time.hour = 0;
-			drag_time.minute = 0;
-		}
-	}
-	e_meeting_time_selector_fix_time_overflows (&drag_time);
-
-	/* Set the meeting start or end time to drag_time. */
-	if (mts->dragging_position == E_MEETING_TIME_SELECTOR_POS_START)
-		time_to_set = &mts->meeting_start_time;
-	else
-		time_to_set = &mts->meeting_end_time;
-
-	/* If the time is unchanged, just return. */
-	if (e_meeting_time_compare_times (time_to_set, &drag_time) == 0) {
-		GDK_THREADS_LEAVE ();
-		goto scroll;
-	}
-
-	/* Don't let an empty occur for all day events */
-	if (mts->all_day
-	    && mts->dragging_position == E_MEETING_TIME_SELECTOR_POS_START
-	    && e_meeting_time_compare_times (&mts->meeting_end_time, &drag_time) == 0)
-		goto scroll;
-	else if (mts->all_day
-		 && mts->dragging_position == E_MEETING_TIME_SELECTOR_POS_END
-		 && e_meeting_time_compare_times (&mts->meeting_start_time, &drag_time) == 0)
-		goto scroll;
-
-	*time_to_set = drag_time;
-
-	/* Check if the start time and end time need to be switched. */
-	if (e_meeting_time_compare_times (&mts->meeting_start_time, &mts->meeting_end_time) > 0) {
-		drag_time = mts->meeting_start_time;
-		mts->meeting_start_time = mts->meeting_end_time;
-		mts->meeting_end_time = drag_time;
-
-		if (mts->dragging_position == E_MEETING_TIME_SELECTOR_POS_START)
-			mts->dragging_position = E_MEETING_TIME_SELECTOR_POS_END;
-		else
-			mts->dragging_position = E_MEETING_TIME_SELECTOR_POS_START;
-
-		set_both_times = TRUE;
-	}
-
-	/* Mark the calculated positions as invalid. */
-	mts->meeting_positions_valid = FALSE;
-
-	/* Set the times in the GnomeDateEdit widgets. */
-	if (set_both_times
-	    || mts->dragging_position == E_MEETING_TIME_SELECTOR_POS_START)
-		e_meeting_time_selector_update_start_date_edit (mts);
-
-	if (set_both_times
-	    || mts->dragging_position == E_MEETING_TIME_SELECTOR_POS_END)
-		e_meeting_time_selector_update_end_date_edit (mts);
-
-	if (set_both_times
-	    || mts->dragging_position == E_MEETING_TIME_SELECTOR_POS_END
-	    || mts->dragging_position == E_MEETING_TIME_SELECTOR_POS_START)
-		gtk_signal_emit (GTK_OBJECT (mts), mts_signals [CHANGED]);
-
- scroll:
-	/* Redraw the canvases. We freeze and thaw the layouts so that they
-	   get redrawn completely. Otherwise the pixels get scrolled left or
-	   right which is not good for us (since our vertical bars have been
-	   moved) and causes flicker. */
-	gtk_layout_freeze (GTK_LAYOUT (mts->display_main));
-	gtk_layout_freeze (GTK_LAYOUT (mts->display_top));
-	gnome_canvas_scroll_to (GNOME_CANVAS (mts->display_main),
-				scroll_x, scroll_y);
-	gnome_canvas_scroll_to (GNOME_CANVAS (mts->display_top),
-				scroll_x, scroll_y);
-	gtk_layout_thaw (GTK_LAYOUT (mts->display_main));
-	gtk_layout_thaw (GTK_LAYOUT (mts->display_top));
-
-	GDK_THREADS_LEAVE ();
-	return TRUE;
-}
-
-
-/* This removes our auto-scroll timeout function, if we have one installed. */
-void
-e_meeting_time_selector_remove_timeout (EMeetingTimeSelector *mts)
-{
-	if (mts->auto_scroll_timeout_id) {
-		g_source_remove (mts->auto_scroll_timeout_id);
-		mts->auto_scroll_timeout_id = 0;
-	}
-}
-
-
-/* This updates the GnomeDateEdit widget displaying the meeting start time. */
-static void
-e_meeting_time_selector_update_start_date_edit (EMeetingTimeSelector *mts)
-{
-	e_date_edit_set_date_and_time_of_day (E_DATE_EDIT (mts->start_date_edit),
-					      g_date_year (&mts->meeting_start_time.date),
-					      g_date_month (&mts->meeting_start_time.date),
-					      g_date_day (&mts->meeting_start_time.date),
-					      mts->meeting_start_time.hour,
-					      mts->meeting_start_time.minute);
-}
-
-
-/* This updates the GnomeDateEdit widget displaying the meeting end time. */
-static void
-e_meeting_time_selector_update_end_date_edit (EMeetingTimeSelector *mts)
-{
-	GDate date;
-	
-	date = mts->meeting_end_time.date;
-	if (mts->all_day)
-		g_date_subtract_days (&date, 1);
-
-	e_date_edit_set_date_and_time_of_day (E_DATE_EDIT (mts->end_date_edit),
-					      g_date_year (&date),
-					      g_date_month (&date),
-					      g_date_day (&date),
-					      mts->meeting_end_time.hour,
-					      mts->meeting_end_time.minute);
-}
-
-
-/* This ensures that the meeting time is shown on screen, by scrolling the
-   canvas and possibly by changing the range of dates shown in the canvas. */
-static void
-e_meeting_time_selector_ensure_meeting_time_shown (EMeetingTimeSelector *mts)
-{
-	gint start_x, end_x, scroll_x, scroll_y, canvas_width;
-	gint new_scroll_x;
-	gboolean fits_in_canvas;
-
-	/* Check if we need to change the range of dates shown. */
-	if (g_date_compare (&mts->meeting_start_time.date,
-			    &mts->first_date_shown) < 0
-	    || g_date_compare (&mts->meeting_end_time.date,
-			       &mts->last_date_shown) > 0) {
-		e_meeting_time_selector_update_dates_shown (mts);
-		gtk_widget_queue_draw (mts->display_top);
-		gtk_widget_queue_draw (mts->display_main);
-	}
-
-	/* If all of the meeting time is visible, just return. */
-	e_meeting_time_selector_get_meeting_time_positions (mts, &start_x,
-							    &end_x);
-	gnome_canvas_get_scroll_offsets (GNOME_CANVAS (mts->display_main),
-					 &scroll_x, &scroll_y);
-	canvas_width = mts->display_main->allocation.width;
-	if (start_x > scroll_x && end_x <= scroll_x + canvas_width)
-		return;
-
-	fits_in_canvas = end_x - start_x < canvas_width ? TRUE : FALSE;
-
-	/* If the meeting is not entirely visible, either center it if it is
-	   smaller than the canvas, or show the start of it if it is big. */
-	if (fits_in_canvas) {
-		new_scroll_x = (start_x + end_x - canvas_width) / 2;
-	} else {
-		new_scroll_x = start_x;
-	}
-	gnome_canvas_scroll_to (GNOME_CANVAS (mts->display_main),
-				new_scroll_x, scroll_y);
-}
-
-
-/* This updates the range of dates shown in the canvas, to make sure that the
-   currently selected meeting time is in the range. */
-static void
-e_meeting_time_selector_update_dates_shown (EMeetingTimeSelector *mts)
-{
-	mts->first_date_shown = mts->meeting_start_time.date;
-	g_date_subtract_days (&mts->first_date_shown,
-			      E_MEETING_TIME_SELECTOR_DAYS_START_BEFORE);
-
-	mts->last_date_shown = mts->first_date_shown;
-	g_date_add_days (&mts->last_date_shown,
-			 E_MEETING_TIME_SELECTOR_DAYS_SHOWN - 1);
-}
-
-
-/* This checks if the time's hour is over 24 or its minute is over 60 and if
-   so it updates the day/hour appropriately. Note that hours and minutes are
-   stored in guint8's so they can't overflow by much. */
-void
-e_meeting_time_selector_fix_time_overflows (EMeetingTime*mtstime)
-{
-	gint hours_to_add, days_to_add;
-
-	hours_to_add = mtstime->minute / 60;
-	if (hours_to_add > 0) {
-		mtstime->minute -= hours_to_add * 60;
-		mtstime->hour += hours_to_add;
-	}
-
-	days_to_add = mtstime->hour / 24;
-	if (days_to_add > 0) {
-		mtstime->hour -= days_to_add * 24;
-		g_date_add_days (&mtstime->date, days_to_add);
-	}
-}
-
-/*
- * CONVERSION ROUTINES - functions to convert between different coordinate
- *			 spaces and dates.
- */
-
-/* This takes an x pixel coordinate within the entire canvas scroll region and
-   returns the date in which it falls. If day_position is not NULL it also
-   returns the x coordinate within the date, relative to the visible part of
-   the canvas. It is used when painting the days in the item_draw function.
-   Note that it must handle negative x coordinates in case we are dragging off
-   the edge of the canvas. */
-void
-e_meeting_time_selector_calculate_day_and_position (EMeetingTimeSelector *mts,
-						    gint x,
-						    GDate *date,
-						    gint *day_position)
-{
-	gint days_from_first_shown;
-
-	*date = mts->first_date_shown;
-
-	if (x >= 0) {
-		days_from_first_shown = x / mts->day_width;
-		g_date_add_days (date, days_from_first_shown);
-		if (day_position)
-			*day_position = - x % mts->day_width;
-	} else {
-		days_from_first_shown = -x / mts->day_width + 1;
-		g_date_subtract_days (date, days_from_first_shown);
-		if (day_position)
-			*day_position = -mts->day_width - x % mts->day_width;
-	}
-}
-
-
-/* This takes an x pixel coordinate within a day, and converts it to hours
-   and minutes, depending on working_hours_only and zoomed_out. */
-void
-e_meeting_time_selector_convert_day_position_to_hours_and_mins (EMeetingTimeSelector *mts, gint day_position, guint8 *hours, guint8 *minutes)
-{
-	if (mts->zoomed_out)
-		day_position *= 3;
-
-	/* Calculate the hours & minutes from the first displayed. */
-	*hours = day_position / mts->col_width;
-	*minutes = (day_position % mts->col_width) * 60 / mts->col_width;
-
-	/* Now add on the first hour shown. */
-	*hours += mts->first_hour_shown;
-}
-
-
-/* This takes an x pixel coordinate within the entire canvas scroll region and
-   returns the time in which it falls. Note that it won't be extremely
-   accurate since hours may only be a few pixels wide in the display.
-   With zoomed_out set each pixel may represent 5 minutes or more, depending
-   on how small the font is. */
-void
-e_meeting_time_selector_calculate_time (EMeetingTimeSelector *mts,
-					gint x,
-					EMeetingTime*time)
-{
-	gint day_position;
-
-	/* First get the day and the x position within the day. */
-	e_meeting_time_selector_calculate_day_and_position (mts, x, &time->date,
-							    NULL);
-
-	/* Now convert the day_position into an hour and minute. */
-	if (x >= 0)
-		day_position = x % mts->day_width;
-	else
-		day_position = mts->day_width + x % mts->day_width;
-
-	e_meeting_time_selector_convert_day_position_to_hours_and_mins (mts, day_position, &time->hour, &time->minute);
-}
-
-
-/* This takes a EMeetingTime and calculates the x pixel coordinate
-   within the entire canvas scroll region. It is used to draw the selected
-   meeting time and all the busy periods. */
-gint
-e_meeting_time_selector_calculate_time_position (EMeetingTimeSelector *mts,
-						 EMeetingTime *mtstime)
-{
-	gint x, date_offset, day_offset;
-
-	/* Calculate the number of days since the first date shown in the
-	   entire canvas scroll region. */
-	date_offset = g_date_julian (&mtstime->date) - g_date_julian (&mts->first_date_shown);
-
-	/* Calculate the x pixel coordinate of the start of the day. */
-	x = date_offset * mts->day_width;
-
-	/* Add on the hours and minutes, depending on whether zoomed_out and
-	   working_hours_only are set. */
-	day_offset = (mtstime->hour - mts->first_hour_shown) * 60
-		+ mtstime->minute;
-	/* The day width includes an extra vertical grid line so subtract 1. */
-	day_offset *= (mts->day_width - 1);
-	day_offset /= (mts->last_hour_shown - mts->first_hour_shown) * 60;
-
-	/* Clamp the day_offset in case the time isn't actually visible. */
-	x += CLAMP (day_offset, 0, mts->day_width);
-
-	return x;
-}
-
-static void
-row_inserted_cb (GtkTreeModel *model, GtkTreePath *path, GtkTreeIter *iter, gpointer data)
-{
-	EMeetingTimeSelector *mts = E_MEETING_TIME_SELECTOR (data);
-	int row = gtk_tree_path_get_indices (path) [0];
-	/* Update the scroll region. */
-	e_meeting_time_selector_update_main_canvas_scroll_region (mts);
-
-	/* Redraw */
-	gtk_widget_queue_draw (mts->display_top);
-	gtk_widget_queue_draw (mts->display_main);
-
-	/* Get the latest free/busy info */
-	e_meeting_time_selector_refresh_free_busy (mts, row, FALSE);
-}
-
-static void
-row_changed_cb (GtkTreeModel *model, GtkTreePath *path, GtkTreeIter *iter, gpointer data)
-{
-	EMeetingTimeSelector *mts = E_MEETING_TIME_SELECTOR (data);
-	int row = gtk_tree_path_get_indices (path) [0];
-
-	/* Get the latest free/busy info */
-	e_meeting_time_selector_refresh_free_busy (mts, row, FALSE);
-}
-
-static void
-row_deleted_cb (GtkTreeModel *model, GtkTreePath *path, gpointer data)
-{
-	EMeetingTimeSelector *mts = E_MEETING_TIME_SELECTOR (data);
-
-	/* Update the scroll region. */
-	e_meeting_time_selector_update_main_canvas_scroll_region (mts);
-
-	/* Redraw */
-	gtk_widget_queue_draw (mts->display_top);
-	gtk_widget_queue_draw (mts->display_main);
-}
-
-
-#define REFRESH_PAUSE 5000
-
-static gboolean
-free_busy_timeout_refresh (gpointer data)
-{
-	char *fb_uri;
-	
-	EMeetingTimeSelector *mts = E_MEETING_TIME_SELECTOR (data);
-
-	fb_uri = calendar_config_get_free_busy_template ();
-	e_meeting_store_set_fb_uri (mts->model, fb_uri);
-	g_free (fb_uri);
-	
-	/* Update all free/busy info, so we use the new template uri */
-	e_meeting_time_selector_refresh_free_busy (mts, 0, TRUE);
-
-	mts->fb_refresh_not = 0;
-	
-	return FALSE;
-}
-
-static void
-free_busy_template_changed_cb (GConfClient *client,
-			       guint cnxn_id,
-			       GConfEntry *entry,
-			       gpointer data)
-{
-	EMeetingTimeSelector *mts = E_MEETING_TIME_SELECTOR (data);
-
-	/* Wait REFRESH_PAUSE before refreshing, using the latest uri value */
-	if (mts->fb_refresh_not != 0) {
-		g_source_remove (mts->fb_refresh_not);		
-	}
-
-	mts->fb_refresh_not = g_timeout_add (REFRESH_PAUSE, 
-					     free_busy_timeout_refresh, 
-					     data);
-}
diff --git a/calendar/gui/e-meeting-time-sel.etspec b/calendar/gui/e-meeting-time-sel.etspec
deleted file mode 100644
index c0b5c721dd..0000000000
--- a/calendar/gui/e-meeting-time-sel.etspec
+++ /dev/null
@@ -1,19 +0,0 @@
-<ETableSpecification click-to-add="true" click-to-add-end="true" _click-to-add-message="Click here to add an attendee" draw-grid="true">
-  <ETableColumn model_col= "0" _title="Attendee" expansion="2.0" minimum_width="10" resizable="true" cell="string" compare="string"/>
-  <ETableColumn model_col= "1" _title="Member" expansion="2.0" minimum_width="10" resizable="true" cell="string" compare="string"/>
-  <ETableColumn model_col= "2" _title="Type" expansion="1.0" minimum_width="10" resizable="true" cell="typeedit" compare="string"/>
-  <ETableColumn model_col= "3" _title="Role" expansion="1.0" minimum_width="10" resizable="true" cell="roleedit" compare="string"/>
-  <ETableColumn model_col= "4" _title="RSVP" expansion="1.0" minimum_width="10" resizable="true" cell="rsvpedit" compare="string"/>
-  <ETableColumn model_col= "5" _title="Delegated To" expansion="2.0" minimum_width="10" resizable="true" cell="string" compare="string"/>
-  <ETableColumn model_col= "6" _title="Delegated From" expansion="2.0" minimum_width="10" resizable="true" cell="string" compare="string"/>
-  <ETableColumn model_col= "7" _title="Status" expansion="1.0" minimum_width="10" resizable="true" cell="statusedit" compare="string"/>
-  <ETableColumn model_col= "8" _title="Common Name" expansion="2.0" minimum_width="10" resizable="true" cell="string" compare="string"/>
-  <ETableColumn model_col= "9" _title="Language" expansion="2.0" minimum_width="10" resizable="true" cell="string" compare="string"/>
-
-  <ETableState>
-     <column source="0"/>
-     <column source="2"/>
-     <column source="7"/>
-     <grouping></grouping>
-  </ETableState>
-</ETableSpecification>
diff --git a/calendar/gui/e-meeting-time-sel.h b/calendar/gui/e-meeting-time-sel.h
deleted file mode 100644
index b3ff09f18f..0000000000
--- a/calendar/gui/e-meeting-time-sel.h
+++ /dev/null
@@ -1,392 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-
-/* 
- * Author : 
- *  Damon Chaplin <damon@gtk.org>
- *
- * Copyright 1999, Ximian, Inc.
- *
- * This program is free software; you can redistribute it and/or 
- * modify it under the terms of version 2 of the GNU General Public 
- * License as published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
- * USA
- */
-#ifndef _E_MEETING_TIME_SELECTOR_H_
-#define _E_MEETING_TIME_SELECTOR_H_
-
-#include <glib.h>
-#include <gtk/gtkaccelgroup.h>
-#include <gtk/gtktable.h>
-#include <gtk/gtkwidget.h>
-#include <libgnomecanvas/gnome-canvas.h>
-#include <gal/e-text/e-text.h>
-#include <gal/e-table/e-table-model.h>
-#include <gal/e-table/e-table.h>
-#include "e-meeting-store.h"
-#include "e-meeting-list-view.h"
-
-G_BEGIN_DECLS
-
-/*
- * EMeetingTimeSelector displays a list of attendees for a meeting and a
- * graphical summary of the times which they are free and busy, allowing the
- * user to select an appropriate time for a meeting.
- */
-
-/* Define this to include the debugging functions. */
-#undef E_MEETING_TIME_SELECTOR_DEBUG
-
-/* This is the width of the icon column in the attendees list. */
-#define E_MEETING_TIME_SELECTOR_ICON_COLUMN_WIDTH	24
-
-#define E_MEETING_TIME_SELECTOR_TEXT_Y_PAD		3
-#define E_MEETING_TIME_SELECTOR_TEXT_X_PAD		2
-
-
-/* This is used to specify the format used when displaying the dates.
-   The full format is like 'Sunday, September 12, 1999'. The abbreviated format
-   is like 'Sun 12/9/99'. The short format is like '12/9/99'. The actual
-   format used is determined in e_meeting_time_selector_style_set(), once we
-   know the font being used. */
-typedef enum
-{
-	E_MEETING_TIME_SELECTOR_DATE_FULL,
-	E_MEETING_TIME_SELECTOR_DATE_ABBREVIATED_DAY,
-	E_MEETING_TIME_SELECTOR_DATE_SHORT
-} EMeetingTimeSelectorDateFormat;
-
-
-/* This is used to specify a position regarding the vertical bars around the
-   current meeting time, so we know which one is being dragged. */
-typedef enum
-{
-	E_MEETING_TIME_SELECTOR_POS_NONE,
-	E_MEETING_TIME_SELECTOR_POS_START,
-	E_MEETING_TIME_SELECTOR_POS_END
-} EMeetingTimeSelectorPosition;
-
-
-/* This is used to specify the autopick option, which determines how we choose
-   the previous/next appropriate meeting time. */
-typedef enum
-{
-	E_MEETING_TIME_SELECTOR_ALL_PEOPLE_AND_RESOURCES,
-	E_MEETING_TIME_SELECTOR_ALL_PEOPLE_AND_ONE_RESOURCE,
-	E_MEETING_TIME_SELECTOR_REQUIRED_PEOPLE,
-	E_MEETING_TIME_SELECTOR_REQUIRED_PEOPLE_AND_ONE_RESOURCE
-} EMeetingTimeSelectorAutopickOption;
-
-/* An array of hour strings for 24 hour time, "0:00" .. "23:00". */
-extern const gchar *EMeetingTimeSelectorHours[24];
-/* An array of hour strings for 12 hour time, "12:00am" .. "11:00pm". */
-extern const gchar *EMeetingTimeSelectorHours12[24];
-
-
-#define E_MEETING_TIME_SELECTOR(obj)          GTK_CHECK_CAST (obj, e_meeting_time_selector_get_type (), EMeetingTimeSelector)
-#define E_MEETING_TIME_SELECTOR_CLASS(klass)  GTK_CHECK_CLASS_CAST (klass, e_meeting_time_selector_get_type (), EMeetingTimeSelectorClass)
-#define IS_E_MEETING_TIME_SELECTOR(obj)       GTK_CHECK_TYPE (obj, e_meeting_time_selector_get_type ())
-
-
-typedef struct _EMeetingTimeSelector       EMeetingTimeSelector;
-typedef struct _EMeetingTimeSelectorClass  EMeetingTimeSelectorClass;
-
-struct _EMeetingTimeSelector
-{
-	/* We subclass a GtkTable which makes it easy to add extra widgets
-	   if neccesary. */
-	GtkTable table;
-
-	/*
-	 * User Interface stuff - widgets, colors etc.
-	 */
-
-	/* This contains our keyboard accelerators, which need to be added to
-	   the toplevel window. */
-	GtkAccelGroup *accel_group;
-
-	/* The vbox in the top-left corner, containing the 'All Attendees'
-	   title bar packed at the end. Extra widgets can be added here
-	   with PACK_START if necessary. */
-	GtkWidget *attendees_vbox;
-	GtkWidget *attendees_vbox_spacer;
-	
-	/* The etable and model */
-	EMeetingStore *model;
-	EMeetingListView *list_view;
-	
-	/* The canvas displaying the dates, times, and the summary
-	   'All Attendees' free/busy display. */
-	GtkWidget *display_top;
-
-	/* The canvas containing the free/busy displays of individual
-	   attendees. This is separate from display_top since it also scrolls
-	   vertically. */
-	GtkWidget *display_main;
-
-	/* The 'Add attendees from addressbook' button */
-	GtkWidget *add_attendees_button;
-
-	/* This is the 'Options' button & menu. */
-	GtkWidget *options_button;
-	GtkWidget *options_menu;
-
-	/* This is the 'Autopick' button, menu & radio menu items. */
-	GtkWidget *autopick_down_button;
-	GtkWidget *autopick_button;
-	GtkWidget *autopick_up_button;
-	GtkWidget *autopick_menu;
-	GtkWidget *autopick_all_item;
-	GtkWidget *autopick_all_people_one_resource_item;
-	GtkWidget *autopick_required_people_item;
-	GtkWidget *autopick_required_people_one_resource_item;
-
-	/* The horizontal scrollbar which scrolls display_top & display_main.*/
-	GtkWidget *hscrollbar;
-
-	/* The vertical scrollbar which scrolls attendees & display_main. */
-	GtkWidget *vscrollbar;
-
-	/* The 2 EDateEdit widgets for the meeting start & end times. */
-	GtkWidget *start_date_edit;
-	GtkWidget *end_date_edit;
-
-	/* Colors. */
-	GdkColor bg_color;
-	GdkColor all_attendees_bg_color;
-	GdkColor meeting_time_bg_color;
-	GdkColor stipple_bg_color;
-	GdkColor attendee_list_bg_color;
-	GdkColor grid_color;
-	GdkColor grid_shadow_color;
-	GdkColor grid_unused_color;
-	GdkColor busy_colors[E_MEETING_FREE_BUSY_LAST];
-
-	/* The stipple used for attendees with no data. */
-	GdkPixmap *stipple;
-
-	/* GC for drawing the color key. */
-	GdkGC *color_key_gc;
-
-	/* Width of the hours strings (e.g. "1:00") in the current font. */
-	gint hour_widths[24];
-
-	/* Whether we are using the full, abbreviated or short date format. */
-	EMeetingTimeSelectorDateFormat date_format;
-
-	/*
-	 * Option Settings.
-	 */
-
-	/* True if we are selecting all day events */
-	gboolean all_day;
-	
-	/* If this is TRUE we only show hours between day_start_hour and
-	   day_end_hour, defaults to TRUE (9am-6pm). */
-	gboolean working_hours_only;
-	gint day_start_hour;
-	gint day_start_minute;
-	gint day_end_hour;
-	gint day_end_minute;
-
-	/* If TRUE, view is compressed, with one cell for every 3 hours rather
-	   than every hour. Defaults to FALSE. */
-	gboolean zoomed_out;
-
-
-	/*
-	 * Internal Data.
-	 */
-
-	/* These are the first & last dates shown in the current scroll area.
-	   We show E_MEETING_TIME_SELECTOR_DAYS_SHOWN days at a time. */
-	GDate first_date_shown;
-	GDate last_date_shown;
-
-	/* This is the current selection of the meeting time. */
-	EMeetingTime meeting_start_time;
-	EMeetingTime meeting_end_time;
-
-	/* These are the x pixel coordinates in the entire scroll region of
-	   the start and end times. Set to meeting_positions_valid to FALSE to
-	   invalidate. They will then be recomputed when needed. Always access
-	   with e_meeting_time_selector_get_meeting_time_positions(). */
-	gint meeting_positions_valid;
-	gint meeting_positions_in_scroll_area;
-	gint meeting_start_x;
-	gint meeting_end_x;
-
-	/* These are the width and height of the cells, including the grid
-	   lines which are displayed on the right and top or bottom of cells.*/
-	gint row_height;
-	gint col_width;
-
-	/* This is the width of a day in the display, which depends on
-	   col_width, working_hours_only and zoomed_out. */
-	gint day_width;
-
-	/* These are the first and last hour of each day we display, depending
-	   on working_hours_only and zoomed_out. */
-	gint first_hour_shown;
-	gint last_hour_shown;
-
-	/* The id of the source function for auto-scroll timeouts. */
-	guint auto_scroll_timeout_id;
-
-	/* This specifies if we are dragging one of the vertical bars around
-	   the meeting time. */
-	EMeetingTimeSelectorPosition dragging_position;
-
-	/* The last x coordinate of the mouse, relative to either the left or
-	   right edge of the canvas. Used in the auto_scroll_timeout function
-	   to determine which way to scroll and how fast. */
-	gint last_drag_x;
-
-	/* This is used to determine the delay between scrolls. */
-	gint scroll_count;
-
-	/* The notification function id for Free/Busy template uri changes */
-	guint fb_uri_not;
-
-	/* The notification function id for Free/Busy refreshes */
-	gboolean fb_refresh_not;
-};
-
-
-struct _EMeetingTimeSelectorClass
-{
-	GtkTableClass parent_class;
-
-	void (* changed) (EMeetingTimeSelector *mts);
-};
-
-
-/*
- * PUBLIC INTERFACE - note that this interface will probably change, when I
- * know where the data is coming from. This is mainly just for testing for now.
- */
-
-GtkType e_meeting_time_selector_get_type (void);
-GtkWidget* e_meeting_time_selector_new (EMeetingStore *ems);
-void e_meeting_time_selector_construct (EMeetingTimeSelector * mts, EMeetingStore *ems);
-
-/* This returns the currently selected meeting time.
-   Note that months are 1-12 and days are 1-31. The start time is guaranteed to
-   be before or equal to the end time. You may want to check if they are equal
-   if that if it is a problem. */
-void e_meeting_time_selector_get_meeting_time (EMeetingTimeSelector *mts,
-					       gint *start_year,
-					       gint *start_month,
-					       gint *start_day,
-					       gint *start_hour,
-					       gint *start_minute,
-					       gint *end_year,
-					       gint *end_month,
-					       gint *end_day,
-					       gint *end_hour,
-					       gint *end_minute);
-
-/* This sets the meeting time, returning TRUE if it is valid. */
-gboolean e_meeting_time_selector_set_meeting_time (EMeetingTimeSelector *mts,
-						   gint start_year,
-						   gint start_month,
-						   gint start_day,
-						   gint start_hour,
-						   gint start_minute,
-						   gint end_year,
-						   gint end_month,
-						   gint end_day,
-						   gint end_hour,
-						   gint end_minute);
-
-void e_meeting_time_selector_set_all_day (EMeetingTimeSelector *mts,
-					  gboolean all_day);
-void e_meeting_time_selector_set_working_hours_only (EMeetingTimeSelector *mts,
-						     gboolean working_hours_only);
-void e_meeting_time_selector_set_working_hours (EMeetingTimeSelector *mts,
-						gint day_start_hour,
-						gint day_start_minute,
-						gint day_end_hour,
-						gint day_end_minute);
-
-void e_meeting_time_selector_set_zoomed_out (EMeetingTimeSelector *mts,
-					     gboolean zoomed_out);
-
-EMeetingTimeSelectorAutopickOption e_meeting_time_selector_get_autopick_option (EMeetingTimeSelector *mts);
-void e_meeting_time_selector_set_autopick_option (EMeetingTimeSelector *mts,
-						  EMeetingTimeSelectorAutopickOption autopick_option);
-
-void e_meeting_time_selector_attendee_set_send_meeting_to (EMeetingTimeSelector *mts,
-							   gint row,
-							   gboolean send_meeting_to);
-
-void e_meeting_time_selector_set_read_only (EMeetingTimeSelector *mts, gboolean read_only);
-
-/* Clears all busy times for the given attendee. */
-void e_meeting_time_selector_attendee_clear_busy_periods (EMeetingTimeSelector *mts,
-							  gint row);
-/* Adds one busy time for the given attendee. */
-gboolean e_meeting_time_selector_attendee_add_busy_period (EMeetingTimeSelector *mts,
-							   gint row,
-							   gint start_year,
-							   gint start_month,
-							   gint start_day,
-							   gint start_hour,
-							   gint start_minute,
-							   gint end_year,
-							   gint end_month,
-							   gint end_day,
-							   gint end_hour,
-							   gint end_minute,
-							   EMeetingFreeBusyType busy_type);
-
-
-
-/*
- * INTERNAL ROUTINES - functions to communicate with the canvas items within
- *		       the EMeetingTimeSelector.
- */
-
-/* This returns the x pixel coordinates of the meeting start and end times,
-   in the entire canvas scroll area. If it returns FALSE, then the meeting
-   time isn't in the current scroll area (which shouldn't really happen). */
-gboolean e_meeting_time_selector_get_meeting_time_positions (EMeetingTimeSelector *mts,
-							     gint *start_x,
-							     gint *end_x);
-
-void e_meeting_time_selector_drag_meeting_time (EMeetingTimeSelector *mts,
-						gint x);
-
-void e_meeting_time_selector_remove_timeout (EMeetingTimeSelector *mts);
-
-void e_meeting_time_selector_fix_time_overflows (EMeetingTime*mtstime);
-
-void e_meeting_time_selector_calculate_day_and_position (EMeetingTimeSelector *mts,
-							 gint x,
-							 GDate *date,
-							 gint *day_position);
-void e_meeting_time_selector_convert_day_position_to_hours_and_mins (EMeetingTimeSelector *mts, gint day_position, guint8 *hours, guint8 *minutes);
-void e_meeting_time_selector_calculate_time (EMeetingTimeSelector *mts,
-					     gint x,
-					     EMeetingTime*time);
-gint e_meeting_time_selector_calculate_time_position (EMeetingTimeSelector *mts,
-						      EMeetingTime *mtstime);
-
-/* Debugging function to dump information on all attendees. */
-#ifdef E_MEETING_TIME_SELECTOR_DEBUG
-void e_meeting_time_selector_dump (EMeetingTimeSelector *mts);
-gchar* e_meeting_time_selector_dump_time (EMeetingTime*mtstime);
-gchar* e_meeting_time_selector_dump_date (GDate *date);
-#endif /* E_MEETING_TIME_SELECTOR_DEBUG */
-
-G_END_DECLS
-
-#endif /* _E_MEETING_TIME_SELECTOR_H_ */
diff --git a/calendar/gui/e-meeting-types.h b/calendar/gui/e-meeting-types.h
deleted file mode 100644
index ab330a6d40..0000000000
--- a/calendar/gui/e-meeting-types.h
+++ /dev/null
@@ -1,78 +0,0 @@
-/* -*- Mode: C; indent-tabs-mode: t; c-basic-offset: 8; tab-width: 8 -*- */
-/* itip-attendee.h
- *
- * Copyright (C) 2001  Ximian, Inc.
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of version 2 of the GNU General Public
- * License as published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * General Public License for more details.
- *
- * You should have received a copy of the GNU General Public
- * License along with this program; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
- *
- * Author: JP Rosevear
- */
-
-#ifndef _E_MEETING_TYPES_H_
-#define _E_MEETING_TYPES_H_
-
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
-
-#include <glib.h>
-#include "e-meeting-types.h"
-
-#ifdef __cplusplus
-extern "C" {
-#pragma }
-#endif /* __cplusplus */
-
-
-
-typedef struct _EMeetingTime               EMeetingTime;
-typedef struct _EMeetingFreeBusyPeriod     EMeetingFreeBusyPeriod;
-
-/* These are used to specify whether an attendee is free or busy at a
-   particular time. We'll probably replace this with a global calendar type.
-   These should be ordered in increasing order of preference. Higher precedence
-   busy periods will be painted over lower precedence ones. These are also
-   used as for loop counters, so they should start at 0 and be ordered. */
-typedef enum
-{
-	E_MEETING_FREE_BUSY_TENTATIVE       = 0,
-	E_MEETING_FREE_BUSY_OUT_OF_OFFICE	= 1,
-	E_MEETING_FREE_BUSY_BUSY		= 2,
-
-	E_MEETING_FREE_BUSY_LAST		= 3
-} EMeetingFreeBusyType;
-
-/* This is our representation of a time. We use a GDate to store the day,
-   and guint8s for the hours and minutes. */
-struct _EMeetingTime
-{
-	GDate	date;
-	guint8	hour;
-	guint8	minute;
-};
-
-/* This represents a busy period. */
-struct _EMeetingFreeBusyPeriod
-{
-	EMeetingTime start;
-	EMeetingTime end;
-	EMeetingFreeBusyType busy_type;
-};
-
-#ifdef __cplusplus
-}
-#endif /* __cplusplus */
-
-#endif /* _E_MEETING_TYPES_H_ */
diff --git a/calendar/gui/e-meeting-utils.c b/calendar/gui/e-meeting-utils.c
deleted file mode 100644
index 496bb8ebaa..0000000000
--- a/calendar/gui/e-meeting-utils.c
+++ /dev/null
@@ -1,52 +0,0 @@
-/* -*- Mode: C; indent-tabs-mode: t; c-basic-offset: 8; tab-width: 8 -*- */
-/* itip-model.c
- *
- * Copyright (C) 2001  Ximian, Inc.
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of version 2 of the GNU General Public
- * License as published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * General Public License for more details.
- *
- * You should have received a copy of the GNU General Public
- * License along with this program; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
- *
- * Author: JP Rosevear
- */
-
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
-
-#include "e-meeting-utils.h"
-
-gint
-e_meeting_time_compare_times (EMeetingTime*time1,
-			      EMeetingTime*time2)
-{
-	gint day_comparison;
-
-	day_comparison = g_date_compare (&time1->date,
-					 &time2->date);
-	if (day_comparison != 0)
-		return day_comparison;
-
-	if (time1->hour < time2->hour)
-		return -1;
-	if (time1->hour > time2->hour)
-		return 1;
-
-	if (time1->minute < time2->minute)
-		return -1;
-	if (time1->minute > time2->minute)
-		return 1;
-
-	/* The start times are exactly the same. */
-	return 0;
-}
diff --git a/calendar/gui/e-meeting-utils.h b/calendar/gui/e-meeting-utils.h
deleted file mode 100644
index 4c2798fcf0..0000000000
--- a/calendar/gui/e-meeting-utils.h
+++ /dev/null
@@ -1,49 +0,0 @@
-/* -*- Mode: C; indent-tabs-mode: t; c-basic-offset: 8; tab-width: 8 -*- */
-/* itip-attendee.h
- *
- * Copyright (C) 2001  Ximian, Inc.
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of version 2 of the GNU General Public
- * License as published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * General Public License for more details.
- *
- * You should have received a copy of the GNU General Public
- * License along with this program; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
- *
- * Author: JP Rosevear
- */
-
-#ifndef _E_MEETING_UTILS_H_
-#define _E_MEETING_UTILS_H_
-
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
-
-#include <glib.h>
-#include "e-meeting-types.h"
-
-#ifdef __cplusplus
-extern "C" {
-#pragma }
-#endif /* __cplusplus */
-
-
-
-gint e_meeting_time_compare_times (EMeetingTime *time1,
-				   EMeetingTime *time2);
-
-#ifdef __cplusplus
-}
-#endif /* __cplusplus */
-
-#endif /* _E_MEETING_UTILS_H_ */
-
-
diff --git a/calendar/gui/e-mini-calendar-config.c b/calendar/gui/e-mini-calendar-config.c
deleted file mode 100644
index 120f3dba84..0000000000
--- a/calendar/gui/e-mini-calendar-config.c
+++ /dev/null
@@ -1,242 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-/* 
- * Author : 
- *  JP Rosevear <jpr@ximian.com>
- *
- * Copyright 2003, Ximian, Inc.
- *
- * This program is free software; you can redistribute it and/or 
- * modify it under the terms of version 2 of the GNU General Public 
- * License as published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
- * USA
- */
-
-#include "calendar-config.h"
-#include "e-mini-calendar-config.h"
-
-struct _EMiniCalendarConfigPrivate {
-	ECalendar *mini_cal;
-
-	GList *notifications;
-};
-
-/* Property IDs */
-enum props {
-	PROP_0,
-	PROP_CALENDAR
-};
-
-G_DEFINE_TYPE (EMiniCalendarConfig, e_mini_calendar_config, G_TYPE_OBJECT);
-
-static void
-e_mini_calendar_config_set_property (GObject *object, guint property_id, const GValue *value, GParamSpec *pspec)
-{
-	EMiniCalendarConfig *mini_config;
-	EMiniCalendarConfigPrivate *priv;
-
-	mini_config = E_MINI_CALENDAR_CONFIG (object);
-	priv = mini_config->priv;
-	
-	switch (property_id) {
-	case PROP_CALENDAR:
-		e_mini_calendar_config_set_calendar (mini_config, g_value_get_object (value));
-		break;
-	default:
-		G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec);
-		break;
-	}
-}
-
-static void
-e_mini_calendar_config_get_property (GObject *object, guint property_id, GValue *value, GParamSpec *pspec)
-{
-	EMiniCalendarConfig *mini_config;
-	EMiniCalendarConfigPrivate *priv;
-
-	mini_config = E_MINI_CALENDAR_CONFIG (object);
-	priv = mini_config->priv;
-	
-	switch (property_id) {
-	case PROP_CALENDAR:
-		g_value_set_object (value, e_mini_calendar_config_get_calendar (mini_config));
-		break;
-	default:
-		G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec);
-		break;
-	}
-}
-
-static void
-e_mini_calendar_config_dispose (GObject *object)
-{
-	EMiniCalendarConfig *mini_config = E_MINI_CALENDAR_CONFIG (object);
-	EMiniCalendarConfigPrivate *priv;
-	
-	priv = mini_config->priv;
-
-	e_mini_calendar_config_set_calendar (mini_config, NULL);
-	
-	if (G_OBJECT_CLASS (e_mini_calendar_config_parent_class)->dispose)
-		G_OBJECT_CLASS (e_mini_calendar_config_parent_class)->dispose (object);
-}
-
-static void
-e_mini_calendar_config_finalize (GObject *object)
-{
-	EMiniCalendarConfig *mini_config = E_MINI_CALENDAR_CONFIG (object);
-	EMiniCalendarConfigPrivate *priv;
-	
-	priv = mini_config->priv;
-
-	g_free (priv);
-	
-	if (G_OBJECT_CLASS (e_mini_calendar_config_parent_class)->finalize)
-		G_OBJECT_CLASS (e_mini_calendar_config_parent_class)->finalize (object);
-}
-
-static void
-e_mini_calendar_config_class_init (EMiniCalendarConfigClass *klass)
-{
-	GObjectClass *gobject_class = G_OBJECT_CLASS (klass);
-	GParamSpec *spec;
-	
-	/* Method override */
-	gobject_class->set_property = e_mini_calendar_config_set_property;
-	gobject_class->get_property = e_mini_calendar_config_get_property;
-	gobject_class->dispose = e_mini_calendar_config_dispose;
-	gobject_class->finalize = e_mini_calendar_config_finalize;
-
-	spec = g_param_spec_object ("calendar", NULL, NULL, e_calendar_get_type (),
-				    G_PARAM_READABLE | G_PARAM_WRITABLE | G_PARAM_CONSTRUCT);
-	g_object_class_install_property (gobject_class, PROP_CALENDAR, spec);
-}
-
-static void
-e_mini_calendar_config_init (EMiniCalendarConfig *mini_config)
-{
-	mini_config->priv = g_new0 (EMiniCalendarConfigPrivate, 1);
-
-}
-
-EMiniCalendarConfig *
-e_mini_calendar_config_new (ECalendar *mini_cal)
-{
-	EMiniCalendarConfig *mini_config;
-	
-	mini_config = g_object_new (e_mini_calendar_config_get_type (), "calendar", mini_cal, NULL);
-
-	return mini_config;
-}
-
-ECalendar *
-e_mini_calendar_config_get_calendar (EMiniCalendarConfig *mini_config) 
-{
-	EMiniCalendarConfigPrivate *priv;
-
-	g_return_val_if_fail (mini_config != NULL, NULL);
-	g_return_val_if_fail (E_IS_MINI_CALENDAR_CONFIG (mini_config), NULL);
-
-	priv = mini_config->priv;
-	
-	return priv->mini_cal;
-}
-
-static void
-set_week_start (ECalendar *mini_cal) 
-{
-	int week_start_day;	
-
-	week_start_day = calendar_config_get_week_start_day ();
-
-	/* Convert it to 0 (Mon) to 6 (Sun), which is what we use. */
-	week_start_day = (week_start_day + 6) % 7;
-
-	gnome_canvas_item_set (GNOME_CANVAS_ITEM (mini_cal->calitem),
-			       "week_start_day", week_start_day,
-			       NULL);
-}
-
-static void
-week_start_changed_cb (GConfClient *client, guint id, GConfEntry *entry, gpointer data)
-{
-	EMiniCalendarConfig *mini_config = data;
-	EMiniCalendarConfigPrivate *priv;
-	
-	priv = mini_config->priv;
-	
-	set_week_start (priv->mini_cal);
-}
-
-static void
-set_dnav_show_week_no (ECalendar *mini_cal) 
-{
-	gboolean show_week_no;
-
-	show_week_no = calendar_config_get_dnav_show_week_no ();
-
-	gnome_canvas_item_set (GNOME_CANVAS_ITEM (mini_cal->calitem),
-			       "show_week_numbers", show_week_no,
-			       NULL);
-}
-
-static void
-dnav_show_week_no_changed_cb (GConfClient *client, guint id, GConfEntry *entry, gpointer data)
-{
-	EMiniCalendarConfig *mini_config = data;
-	EMiniCalendarConfigPrivate *priv;
-	
-	priv = mini_config->priv;
-	
-	set_dnav_show_week_no (priv->mini_cal);
-}
-
-void
-e_mini_calendar_config_set_calendar (EMiniCalendarConfig *mini_config, ECalendar *mini_cal) 
-{
-	EMiniCalendarConfigPrivate *priv;
-	guint not;
-	GList *l;
-	
-	g_return_if_fail (mini_config != NULL);
-	g_return_if_fail (E_IS_MINI_CALENDAR_CONFIG (mini_config));
-
-	priv = mini_config->priv;
-	
-	if (priv->mini_cal) {
-		g_object_unref (priv->mini_cal);
-		priv->mini_cal = NULL;
-	}
-	
-	for (l = priv->notifications; l; l = l->next)
-		calendar_config_remove_notification (GPOINTER_TO_UINT (l->data));
-
-	g_list_free (priv->notifications);
-	priv->notifications = NULL;
-
-	/* If the new view is NULL, return right now */
-	if (!mini_cal)
-		return;
-	
-	priv->mini_cal = g_object_ref (mini_cal);
-
-	/* Week start */
-	set_week_start (mini_cal);
-
-	not = calendar_config_add_notification_week_start_day (week_start_changed_cb, mini_config);
-	priv->notifications = g_list_prepend (priv->notifications, GUINT_TO_POINTER (not));
-
-	/* Show week numbers */
-	set_dnav_show_week_no (mini_cal);
-
-	not = calendar_config_add_notification_dnav_show_week_no (dnav_show_week_no_changed_cb, mini_config);
-	priv->notifications = g_list_prepend (priv->notifications, GUINT_TO_POINTER (not));
-}
diff --git a/calendar/gui/e-mini-calendar-config.h b/calendar/gui/e-mini-calendar-config.h
deleted file mode 100644
index 78b9cfd363..0000000000
--- a/calendar/gui/e-mini-calendar-config.h
+++ /dev/null
@@ -1,55 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-/* 
- * Author : 
- *  JP Rosevear <jpr@ximian.com>
- *
- * Copyright 2003, Ximian, Inc.
- *
- * This program is free software; you can redistribute it and/or 
- * modify it under the terms of version 2 of the GNU General Public 
- * License as published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
- * USA
- */
-
-#ifndef _E_MINI_CALENDAR_CONFIG_H_
-#define _E_MINI_CALENDAR_CONFIG_H_
-
-#include <widgets/misc/e-calendar.h>
-
-G_BEGIN_DECLS
-
-#define E_MINI_CALENDAR_CONFIG(obj)          GTK_CHECK_CAST (obj, e_mini_calendar_config_get_type (), EMiniCalendarConfig)
-#define E_MINI_CALENDAR_CONFIG_CLASS(klass)  GTK_CHECK_CLASS_CAST (klass, e_mini_calendar_config_get_type (), EMiniCalendarConfigClass)
-#define E_IS_MINI_CALENDAR_CONFIG(obj)       GTK_CHECK_TYPE (obj, e_mini_calendar_config_get_type ())
-        
-typedef struct _EMiniCalendarConfig        EMiniCalendarConfig;
-typedef struct _EMiniCalendarConfigClass   EMiniCalendarConfigClass;
-typedef struct _EMiniCalendarConfigPrivate EMiniCalendarConfigPrivate;
-
-struct _EMiniCalendarConfig {
-	GObject parent;
-
-	EMiniCalendarConfigPrivate *priv;
-};
-
-struct _EMiniCalendarConfigClass {
-	GObjectClass parent_class;
-};
-
-GType          e_mini_calendar_config_get_type (void);
-EMiniCalendarConfig *e_mini_calendar_config_new (ECalendar *mini_cal);
-ECalendar *e_mini_calendar_config_get_calendar (EMiniCalendarConfig *mini_config);
-void e_mini_calendar_config_set_calendar (EMiniCalendarConfig *mini_config, ECalendar *mini_cal);
-
-G_END_DECLS
-
-#endif
diff --git a/calendar/gui/e-pub-utils.c b/calendar/gui/e-pub-utils.c
deleted file mode 100644
index 90338dd1a6..0000000000
--- a/calendar/gui/e-pub-utils.c
+++ /dev/null
@@ -1,337 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-
-/* Evolution calendar Free/Busy utilities and types
- *
- * Copyright (C) 2004 Ximian, Inc.
- *
- * Author: Gary Ekker <gekker@novell.com>
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of version 2 of the GNU General Public
- * License as published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307, USA.
- */
-
-#include <string.h>
-#include <glib.h>
-#include <gconf/gconf.h>
-#include <gconf/gconf-client.h>
-#include <libedataserver/e-source.h>
-#include <libedataserver/e-source-list.h>
-#include <libedataserverui/e-passwords.h>
-#include <libecal/e-cal-time-util.h>
-#include <libgnome/gnome-i18n.h>
-#include "calendar-config.h"
-#include "common/authentication.h"
-#include "itip-utils.h"
-#include "e-pub-utils.h"
-
-void
-e_pub_uri_from_xml (EPublishUri *uri, const gchar *xml)
-{
-	xmlDocPtr doc;
-	xmlNodePtr root, p;
-	xmlChar *location, *enabled, *frequency;
-	xmlChar *username, *publish_time;
-	GSList *l = NULL;
-	
-	uri->location = NULL;
-	doc = xmlParseDoc ((char *)xml);
-	if (doc == NULL) {
-		uri->location = NULL;
-		return;
-	}
-	
-	root = doc->children;
-	if (strcmp (root->name, "uri") != 0) {
-		return;
-	}
-	location = xmlGetProp (root, "location");
-	enabled = xmlGetProp (root, "enabled");
-	frequency = xmlGetProp (root, "frequency");
-	username = xmlGetProp (root, "username");
-	publish_time = xmlGetProp (root, "publish_time");
-	
-	if (location != NULL)
-		uri->location = g_strdup (location);
-	if (enabled != NULL)
-		uri->enabled = atoi (enabled);
-	if (frequency != NULL)
-		uri->publish_freq = atoi (frequency);
-	if (username != NULL)
-		uri->username = g_strdup (username);
-	if (publish_time != NULL)
-		uri->last_pub_time = g_strdup (publish_time);
-	
-	uri->password = g_strdup ("");
-
-	for (p = root->children; p != NULL; p = p->next) {
-		xmlChar *uid = xmlGetProp (p, "uid");
-
-		l = g_slist_append (l, uid);
-	}	
-	uri->calendars = l;
-	
-	xmlFree(location);
-	xmlFree(enabled);
-	xmlFreeDoc(doc);
-	return;
-}
-
-gchar *
-e_pub_uri_to_xml (EPublishUri *uri)
-{
-	xmlDocPtr doc;
-	xmlNodePtr root;
-	gchar *enabled, *frequency;
-	GSList *cals = NULL;
-	xmlChar *xml_buffer;
-	char *returned_buffer;
-	int xml_buffer_size;
-
-	g_return_val_if_fail (uri != NULL, NULL);
-	g_return_val_if_fail (uri->location != NULL, NULL);
-
-	doc = xmlNewDoc ("1.0");
-
-	root = xmlNewDocNode (doc, NULL, "uri", NULL);
-	enabled = g_strdup_printf ("%d", uri->enabled);
-	frequency = g_strdup_printf ("%d", uri->publish_freq);
-	xmlSetProp (root, "location", uri->location);
-	xmlSetProp (root, "enabled", enabled);
-	xmlSetProp (root, "frequency", frequency);
-	xmlSetProp (root, "username", uri->username);
-	xmlSetProp (root, "publish_time", uri->last_pub_time);
-	
-	for (cals = uri->calendars; cals != NULL; cals = cals->next) {
-		xmlNodePtr node;
-		
-		node = xmlNewChild (root, NULL, "source", NULL);
-		xmlSetProp (node, "uid", cals->data);
-	}
-	xmlDocSetRootElement (doc, root);
-
-	xmlDocDumpMemory (doc, &xml_buffer, &xml_buffer_size);
-	xmlFreeDoc (doc);
-
-	returned_buffer = g_malloc (xml_buffer_size + 1);
-	memcpy (returned_buffer, xml_buffer, xml_buffer_size);
-	returned_buffer [xml_buffer_size] = '\0';
-	xmlFree (xml_buffer);
-	g_free (enabled);
-
-	return returned_buffer;
-}
-
-static gboolean 
-is_publish_time (EPublishUri *uri) {
-	icaltimezone *utc;
-	struct icaltimetype current_itt, adjust_itt;
-
-	if (!uri->last_pub_time) {
-		utc = icaltimezone_get_utc_timezone ();
-		current_itt = icaltime_current_time_with_zone (utc);		
-		uri->last_pub_time = g_strdup (icaltime_as_ical_string (current_itt));
-		return TRUE;
-		
-	} else {
-		if (strlen (uri->last_pub_time) == 0) {
-			uri->last_pub_time = g_strdup (icaltime_as_ical_string (current_itt));
-			return TRUE;
-		}
-		
-		utc = icaltimezone_get_utc_timezone ();
-		current_itt = icaltime_current_time_with_zone (utc);
-		adjust_itt = icaltime_from_string (uri->last_pub_time);
-		
-		switch (uri->publish_freq) {
-			case URI_PUBLISH_DAILY:
-				icaltime_adjust (&adjust_itt, 1, 0, 0, 0);
-				if (icaltime_compare_date_only (adjust_itt, current_itt ) < 0) {
-					uri->last_pub_time = g_strdup (icaltime_as_ical_string (current_itt));
-					return TRUE;
-				}
-				break;
-			case URI_PUBLISH_WEEKLY:
-				icaltime_adjust (&adjust_itt, 7, 0, 0, 0);
-				if (icaltime_compare_date_only (adjust_itt, current_itt ) < 0) {
-					uri->last_pub_time = g_strdup (icaltime_as_ical_string (current_itt));
-					return TRUE;
-				}
-				break;
-		}
-	}
-	
-	return FALSE;
-}
-
-static gboolean
-just_published (gchar *last_pub_time) {
-	icaltimezone *utc;
-	struct icaltimetype current_itt, adjust_itt;
-	
-	if (strlen (last_pub_time) != 0) {
-		utc = icaltimezone_get_utc_timezone ();
-		adjust_itt = icaltime_from_string (last_pub_time);
-		current_itt = icaltime_current_time_with_zone (utc);
-		icaltime_adjust (&adjust_itt, 0, 0, 0, 3);
-		if (icaltime_compare (adjust_itt, current_itt) < 0)
-			return TRUE;
-		else
-			return FALSE;
-	}
-
-	
-	return TRUE;
-}
-
-void
-e_pub_publish (gboolean publish) {
-	icaltimezone *utc;
-	time_t start = time (NULL), end;
-	GSList *uri_config_list, *l, *uri_list = NULL;
-	ESourceList *source_list;
-	GConfClient *gconf_client;
-	gboolean published = FALSE;
-	
-	gconf_client = gconf_client_get_default ();
-	source_list = e_source_list_new_for_gconf (gconf_client, "/apps/evolution/calendar/sources");
-	
-	utc = icaltimezone_get_utc_timezone ();	
-	start = time_day_begin_with_zone (start, utc);
-	end = time_add_week_with_zone (start, 6, utc);
-		
-	uri_config_list = calendar_config_get_free_busy ();
-
-	for (l = uri_config_list; l != NULL; l = l->next) {
-		GSList *p =NULL;
-		EPublishUri *uri;
-		ECalComponent *clone = NULL;
-		gboolean cloned = FALSE;
-		ECal *client = NULL;
-		char *prompt;
-		gboolean remember = FALSE;
-		gchar *password;
-
-		gchar *xml = (gchar *)l->data;
-		
-		uri = g_new0 (EPublishUri, 1);		
-		e_pub_uri_from_xml (uri, xml);
-		
-		/* kludge to safeguard against loop from gconf update */
-		if (!just_published (uri->last_pub_time))
-			return;
-		
-		/* TODO: make sure we're online */
-		/* skip this url if it isn't enabled or if it is manual */
-		if (!uri->enabled) {
-			uri_config_list = g_slist_next (uri_config_list);
-			continue;
-		}	
-		
-		if (!publish) {
-			/* a g_idle publish, make sure we are not set to user only */
-			if (uri->publish_freq == URI_PUBLISH_USER) {
-				uri_config_list = g_slist_next (uri_config_list);
-				continue;
-			}
-			
-			/* If not is it time to publish again? */
-			publish = is_publish_time (uri);
-				
-		}
-		
-		/* User published or config change */
-		if (publish) {
-			/* We still need to set the last_pub_time */
-			uri->last_pub_time = 0;
-			is_publish_time (uri);
-			
-			for (p = uri->calendars; p != NULL; p = p->next) {
-				GList *comp_list = NULL;
-				gchar *source_uid;
-				ESource * source;
-	
-				source_uid = g_strdup (p->data);
-				source =  e_source_list_peek_source_by_uid (source_list, source_uid);
-				if (source)
-					client = auth_new_cal_from_source (source, E_CAL_SOURCE_TYPE_EVENT);
-
-				if (!client) {
-					g_warning (G_STRLOC ": Could not publish Free/Busy: Calendar backend no longer exists");
-
-					continue;
-				}
-			
-				e_cal_open (client, TRUE, NULL);
-				
-				if (e_cal_get_free_busy ((ECal *) client, NULL,
-							 start, end, 
-							 &comp_list, NULL)) {
-					GList *l;
-	
-					for (l = comp_list; l; l = l->next) {
-						ECalComponent *comp = E_CAL_COMPONENT (l->data);
-					
-						cloned = itip_publish_begin (comp, (ECal *) client, cloned, &clone);
-						g_object_unref (comp);
-					}
-					g_list_free (comp_list);
-				}
-				
-				g_object_unref (client);
-			
-				g_free (source_uid);
-			}
-
-			/* add password to the uri */
-			password = e_passwords_get_password ("Calendar", 
-							     (gchar *)uri->location);
-			
-			if (!password) {
-				prompt = g_strdup_printf (_("Enter the password for %s"), (gchar *)uri->location);
-				password = e_passwords_ask_password (_("Enter password"), 
-								     "Calendar", (gchar *)uri->location, 
-								     prompt,
-								     E_PASSWORDS_REMEMBER_FOREVER|E_PASSWORDS_SECRET|E_PASSWORDS_ONLINE,
-								     &remember, NULL);
-
-				g_free (prompt);
-					
-				if (!password) {
-					g_slist_free (p);
-					continue;
-				}
-			}
-		
-			if (cloned && clone)
-				published = itip_publish_comp ((ECal *) client,
-						       uri->location,
-						       uri->username, 
-						       password, &clone);
-			
-			g_slist_free (p);
-		}
-		xml = e_pub_uri_to_xml (uri);
-		if (xml != NULL) {
-			uri_list = g_slist_append (uri_list, xml);
-		}
-		g_free (uri);
-	}
-	
-	if (published) {
-		/* Update gconf so we have the last_pub_time */
-		calendar_config_set_free_busy (uri_list);
-	}
-		
-	g_slist_free (uri_config_list);
-	g_slist_free (uri_list);
-}
diff --git a/calendar/gui/e-pub-utils.h b/calendar/gui/e-pub-utils.h
deleted file mode 100644
index 03dcd97c98..0000000000
--- a/calendar/gui/e-pub-utils.h
+++ /dev/null
@@ -1,62 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-
-/* Evolution calendar Free/Busy utilities and types
- *
- * Copyright (C) 2004 Ximian, Inc.
- *
- * Author: Gary Ekker <gekker@novell.com>
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of version 2 of the GNU General Public
- * License as published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307, USA.
- */
-
-#ifndef E_CAL_FB_UTIL_H
-#define E_CAL_FB_UTIL_H
-
-#include <glib.h>
-#include <libxml/tree.h>
-
-G_BEGIN_DECLS
-
-enum publish_frequency{
-	URI_PUBLISH_DAILY,
-	URI_PUBLISH_WEEKLY,
-	URI_PUBLISH_USER
-};
-
-static const int pub_frequency_type_map[] = {
-	URI_PUBLISH_DAILY,
-	URI_PUBLISH_WEEKLY,
-	URI_PUBLISH_USER,
-	-1
-};
-
-struct _EPublishUri {
-	gint enabled;
-	gchar *location;
-	gint publish_freq;
-	gchar *username;
-	gchar *password;
-	GSList *calendars;
-	gchar *last_pub_time;
-};
-
-typedef struct _EPublishUri EPublishUri;
-
-void e_pub_uri_from_xml (EPublishUri *uri, const gchar *xml);
-gchar  *e_pub_uri_to_xml (EPublishUri *uri);
-void e_pub_publish (gboolean publish) ;
-
-G_END_DECLS
-
-#endif
diff --git a/calendar/gui/e-select-names-editable.c b/calendar/gui/e-select-names-editable.c
deleted file mode 100644
index 10781150d1..0000000000
--- a/calendar/gui/e-select-names-editable.c
+++ /dev/null
@@ -1,236 +0,0 @@
-/*
- * e-select-names-editable.c
- *
- * Author: Mike Kestner  <mkestner@ximian.com>
- *
- * Copyright (C) 2003 Ximian Inc.
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of version 2 of the GNU General Public 
- * License as published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * General Public License for more details.
- *
- * You should have received a copy of the GNU General Public
- * License along with this program; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
- */
-
-#include <config.h>
-#include <gdk/gdkkeysyms.h>
-#include <gtk/gtkcelleditable.h>
-#include <libebook/e-destination.h>
-#include <libedataserverui/e-name-selector-entry.h>
-
-#include "e-select-names-editable.h"
-
-struct _ESelectNamesEditablePriv {
-	gint dummy;
-};
-
-static ENameSelectorEntryClass *parent_class;
-
-static void
-esne_cell_editable_init (GtkCellEditableIface *iface)
-{
-}
-
-static void
-esne_finalize (GObject *obj)
-{
-	ESelectNamesEditable *esne = (ESelectNamesEditable *) obj;
-
-	g_free (esne->priv);
-
-	if (G_OBJECT_CLASS (parent_class)->finalize)
-		G_OBJECT_CLASS (parent_class)->finalize (obj);
-}
-
-static void
-esne_init (ESelectNamesEditable *esne)
-{
-	esne->priv = g_new0 (ESelectNamesEditablePriv, 1);
-}
-
-static void
-esne_class_init (GObjectClass *klass)
-{
-	klass->finalize = esne_finalize;
-	
-	parent_class = E_NAME_SELECTOR_ENTRY_CLASS (g_type_class_peek_parent (klass));
-}
-
-GType
-e_select_names_editable_get_type (void)
-{
-	static GType esne_type = 0;
-	
-	if (!esne_type) {
-		static const GTypeInfo esne_info = {
-			sizeof (ESelectNamesEditableClass),
-			NULL,		/* base_init */
-			NULL,		/* base_finalize */
-			(GClassInitFunc) esne_class_init,
-			NULL,		/* class_finalize */
-			NULL,		/* class_data */
-			sizeof (ESelectNamesEditable),
-			0,              /* n_preallocs */
-			(GInstanceInitFunc) esne_init,
-		};
-
-		static const GInterfaceInfo cell_editable_info = {
-			(GInterfaceInitFunc) esne_cell_editable_init,
-			NULL, 
-			NULL 
-		};
-      
-		esne_type = g_type_register_static (E_TYPE_NAME_SELECTOR_ENTRY, "ESelectNamesEditable", &esne_info, 0);
-		
-		g_type_add_interface_static (esne_type, GTK_TYPE_CELL_EDITABLE, &cell_editable_info);
-	}
-	
-	return esne_type;
-}
-
-ESelectNamesEditable *
-e_select_names_editable_new ()
-{
-	ESelectNamesEditable *esne = g_object_new (E_TYPE_SELECT_NAMES_EDITABLE, NULL);
-
-	return esne;
-}
-
-gchar *
-e_select_names_editable_get_email (ESelectNamesEditable *esne)
-{
-	EDestinationStore *destination_store;
-	GList *destinations;
-	EDestination *destination;
-	gchar *result = NULL;
-
-	g_return_val_if_fail (E_SELECT_NAMES_EDITABLE (esne), NULL);
-
-	destination_store = e_name_selector_entry_peek_destination_store (E_NAME_SELECTOR_ENTRY (esne));
-	destinations = e_destination_store_list_destinations (destination_store);
-	if (!destinations)
-		return NULL;
-
-	destination = destinations->data;
-	result = g_strdup (e_destination_get_email (destination));
-	g_list_free (destinations);
-	return result;
-}
-
-GList *
-e_select_names_editable_get_emails (ESelectNamesEditable *esne)
-{
-	EDestinationStore *destination_store;
-	GList *destinations;
-	EDestination *destination;
-	GList *result = NULL;
-
-	g_return_val_if_fail (E_SELECT_NAMES_EDITABLE (esne), NULL);
-
-	destination_store = e_name_selector_entry_peek_destination_store (E_NAME_SELECTOR_ENTRY (esne));
-	destinations = e_destination_store_list_destinations (destination_store);
-	if (!destinations)
-		return NULL;
-
-	destination = destinations->data;
-	if (e_destination_is_evolution_list (destination)) {	
-		const GList *list_dests, *l;
-
-		list_dests = e_destination_list_get_dests (destination);
-		for (l = list_dests; l != NULL; l = g_list_next (l)) {
-			result = g_list_append (result, g_strdup (e_destination_get_email (l->data)));
-		}
-	} else {
-		result = g_list_append (result, g_strdup (e_destination_get_email (destination)));
-	}
-
-	g_list_free (destinations);
-
-	return result;
-}
-
-gchar *
-e_select_names_editable_get_name (ESelectNamesEditable *esne)
-{
-	EDestinationStore *destination_store;
-	GList *destinations;
-	EDestination *destination;
-	gchar *result = NULL;
-
-	g_return_val_if_fail (E_SELECT_NAMES_EDITABLE (esne), NULL);
-
-	destination_store = e_name_selector_entry_peek_destination_store (E_NAME_SELECTOR_ENTRY (esne));
-	destinations = e_destination_store_list_destinations (destination_store);
-	if (!destinations)
-		return NULL;
-
-	destination = destinations->data;
-	result = g_strdup (e_destination_get_name (destination));
-	g_list_free (destinations);
-	return result;
-}
-
-GList *
-e_select_names_editable_get_names (ESelectNamesEditable *esne)
-{
-	EDestinationStore *destination_store;
-	GList *destinations;
-	EDestination *destination;
-	GList *result = NULL;
-
-	g_return_val_if_fail (E_SELECT_NAMES_EDITABLE (esne), NULL);
-
-	destination_store = e_name_selector_entry_peek_destination_store (E_NAME_SELECTOR_ENTRY (esne));
-	destinations = e_destination_store_list_destinations (destination_store);
-	if (!destinations)
-		return NULL;
-
-	destination = destinations->data;	
-	if (e_destination_is_evolution_list (destination)) {
-		const GList *list_dests, *l;
-		
-		list_dests = e_destination_list_get_dests (destination);
-		for (l = list_dests; l != NULL; l = g_list_next (l)) {
-			result = g_list_append (result, g_strdup (e_destination_get_name (l->data)));
-		}
-	} else {
-		result = g_list_append (result, g_strdup (e_destination_get_name (destination)));
-	}
-
-	g_list_free (destinations);
-
-	return result;
-}
-
-void
-e_select_names_editable_set_address (ESelectNamesEditable *esne, const gchar *name, const gchar *email)
-{
-	EDestinationStore *destination_store;
-	GList *destinations;
-	EDestination *destination;
-
-	g_return_if_fail (E_IS_SELECT_NAMES_EDITABLE (esne));
-
-	destination_store = e_name_selector_entry_peek_destination_store (E_NAME_SELECTOR_ENTRY (esne));
-	destinations = e_destination_store_list_destinations (destination_store);
-
-	if (!destinations)
-		destination = e_destination_new ();
-	else
-		destination = g_object_ref (destinations->data);
-
-	e_destination_set_name (destination, name);
-	e_destination_set_email (destination, email);
-	
-	if (!destinations)
-		e_destination_store_append_destination (destination_store, destination);
-	g_object_unref (destination);
-}
diff --git a/calendar/gui/e-select-names-editable.h b/calendar/gui/e-select-names-editable.h
deleted file mode 100644
index 15c1908442..0000000000
--- a/calendar/gui/e-select-names-editable.h
+++ /dev/null
@@ -1,67 +0,0 @@
-/*
- * e-select-names-editable.h
- *
- * Author: Mike Kestner  <mkestner@ximian.com>
- *
- * Copyright (C) 2003 Ximian Inc.
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of version 2 of the GNU General Public 
- * License as published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * General Public License for more details.
- *
- * You should have received a copy of the GNU General Public
- * License along with this program; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
- */
-
-#ifndef __E_SELECT_NAMES_EDITABLE_H__
-#define __E_SELECT_NAMES_EDITABLE_H__
-
-#include <libedataserverui/e-name-selector-entry.h>
-
-G_BEGIN_DECLS
-
-#define E_TYPE_SELECT_NAMES_EDITABLE	     (e_select_names_editable_get_type ())
-#define E_SELECT_NAMES_EDITABLE(o)	     (G_TYPE_CHECK_INSTANCE_CAST ((o), E_TYPE_SELECT_NAMES_EDITABLE, ESelectNamesEditable))
-#define E_SELECT_NAMES_EDITABLE_CLASS(k)     (G_TYPE_CHECK_CLASS_CAST ((k), E_TYPE_SELECT_NAMES_EDITABLE, ESelectNamesEditableClass))
-#define E_IS_SELECT_NAMES_EDITABLE(o)	     (G_TYPE_CHECK_INSTANCE_TYPE ((o), E_TYPE_SELECT_NAMES_EDITABLE))
-#define E_IS_SELECT_NAMES_EDITABLE_CLASS(k)  (G_TYPE_CHECK_CLASS_TYPE ((o), E_TYPE_SELECT_NAMES_EDITABLE))
-#define E_SELECT_NAMES_EDITABLE_GET_CLASS(o) (G_TYPE_INSTANCE_GET_CLASS ((o), E_TYPE_SELECT_NAMES_EDITABLE, ESelectNamesEditableClass))
-
-typedef struct _ESelectNamesEditable      ESelectNamesEditable;
-typedef struct _ESelectNamesEditableClass ESelectNamesEditableClass;
-typedef struct _ESelectNamesEditablePriv  ESelectNamesEditablePriv;
-
-struct _ESelectNamesEditable
-{
-	ENameSelectorEntry parent;
-
-	ESelectNamesEditablePriv *priv;
-};
-
-struct _ESelectNamesEditableClass
-{
-	ENameSelectorEntryClass parent_class;
-};
-
-GType      e_select_names_editable_get_type (void);
-
-ESelectNamesEditable *e_select_names_editable_new (void);
-
-gchar *e_select_names_editable_get_email (ESelectNamesEditable *esne);
-GList *e_select_names_editable_get_emails (ESelectNamesEditable *esne);
-
-gchar *e_select_names_editable_get_name (ESelectNamesEditable *esne);
-GList *e_select_names_editable_get_names (ESelectNamesEditable *esne);
-
-void   e_select_names_editable_set_address (ESelectNamesEditable *esne, const gchar *name, const gchar *email);
-
-G_END_DECLS
-
-#endif /* __E_SELECT_NAMES_EDITABLE_H__ */
diff --git a/calendar/gui/e-select-names-renderer.c b/calendar/gui/e-select-names-renderer.c
deleted file mode 100644
index 2f119e2e6c..0000000000
--- a/calendar/gui/e-select-names-renderer.c
+++ /dev/null
@@ -1,213 +0,0 @@
-/*
- * e-select-names-renderer.c
- *
- * Author:  Mike Kestner  <mkestner@ximian.com>
- *
- * Copyright (C) 2003 Ximian Inc.
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of version 2 of the GNU General Public 
- * License as published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * General Public License for more details.
- *
- * You should have received a copy of the GNU General Public
- * License along with this program; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
- */
-
-#include <config.h>
-#include <gtk/gtkcellrenderertext.h>
-
-#include "e-calendar-marshal.h"
-
-#include "e-select-names-editable.h"
-#include "e-select-names-renderer.h"
-
-
-struct _ESelectNamesRendererPriv {
-	ESelectNamesEditable *editable;
-	gchar *path;
-
-	gchar *name;
-	gchar *email;
-};
-
-enum {
-	PROP_0,
-	PROP_NAME,
-	PROP_EMAIL
-};
-
-enum {
-	CELL_EDITED,
-	LAST_SIGNAL
-};
-
-static gint signals [LAST_SIGNAL];
-
-G_DEFINE_TYPE (ESelectNamesRenderer, e_select_names_renderer, GTK_TYPE_CELL_RENDERER_TEXT)
-
-static void
-e_select_names_renderer_editing_done (GtkCellEditable *editable, ESelectNamesRenderer *cell)
-{
-	GList *addresses = NULL, *names = NULL;
-
-	/* We don't need to listen for the focus out event any more */
-	g_signal_handlers_disconnect_matched (editable, G_SIGNAL_MATCH_DATA, 0, 0, NULL, NULL, cell);
-
-	if (GTK_ENTRY (editable)->editing_canceled) {
-		gtk_cell_renderer_editing_canceled (GTK_CELL_RENDERER (cell));		
-		goto cleanup;
-	}
-	
-	addresses = e_select_names_editable_get_emails (E_SELECT_NAMES_EDITABLE (editable));
-	names = e_select_names_editable_get_names (E_SELECT_NAMES_EDITABLE (editable));
- 
-	g_signal_emit (cell, signals [CELL_EDITED], 0, cell->priv->path, addresses, names);
-
-	g_list_foreach (addresses, (GFunc)g_free, NULL);
-	g_list_foreach (names, (GFunc)g_free, NULL);
-	g_list_free (addresses);
-	g_list_free (names);
-
- cleanup:
-	g_free (cell->priv->path);
-	cell->priv->path = NULL;
-	cell->priv->editable = NULL;
-}
-
-static gboolean
-e_select_names_renderer_focus_out_event (GtkWidget *entry, GdkEvent  *event, ESelectNamesRenderer *cell)
-{
-	e_select_names_renderer_editing_done (GTK_CELL_EDITABLE (cell->priv->editable), cell);
-
-	/* entry needs focus-out-event */
-	return FALSE;
-}
-
-static GtkCellEditable *
-e_select_names_renderer_start_editing (GtkCellRenderer *cell, GdkEvent *event, GtkWidget *widget, const gchar *path,
-		    GdkRectangle *bg_area, GdkRectangle *cell_area, GtkCellRendererState flags)
-{
-	ESelectNamesRenderer *sn_cell = E_SELECT_NAMES_RENDERER (cell);
-	GtkCellRendererText *text_cell = GTK_CELL_RENDERER_TEXT (cell);
-	ESelectNamesEditable *editable;
-	
-	if (!text_cell->editable)
-		return NULL;
-
-	editable = E_SELECT_NAMES_EDITABLE (e_select_names_editable_new ());
-	gtk_entry_set_has_frame (GTK_ENTRY (editable), FALSE);
-	gtk_entry_set_alignment (GTK_ENTRY (editable), cell->xalign);
-	if (sn_cell->priv->email && *sn_cell->priv->email) 
-		e_select_names_editable_set_address (editable, sn_cell->priv->name, sn_cell->priv->email);
-	gtk_widget_show (GTK_WIDGET (editable));
-
-	g_signal_connect (editable, "editing_done", G_CALLBACK (e_select_names_renderer_editing_done), sn_cell);
-	g_signal_connect (editable, "focus_out_event", G_CALLBACK (e_select_names_renderer_focus_out_event), sn_cell);
-
-	sn_cell->priv->editable = g_object_ref (editable);
-	sn_cell->priv->path = g_strdup (path);
-
-	return GTK_CELL_EDITABLE (editable);
-}
-
-static void
-e_select_names_renderer_get_property (GObject *object, guint prop_id, GValue *value, GParamSpec *pspec)
-{
-	ESelectNamesRenderer *esnr = E_SELECT_NAMES_RENDERER (object);
-
-	switch (prop_id) {
-	case PROP_NAME:
-		g_value_set_string (value, esnr->priv->name);
-		break;
-	case PROP_EMAIL:
-		g_value_set_string (value, esnr->priv->email);
-		break;
-	default:
-		break;
-	}
-}
-
-static void
-e_select_names_renderer_set_property (GObject *object, guint prop_id, const GValue *value, GParamSpec *pspec)
-{
-	ESelectNamesRenderer *esnr = E_SELECT_NAMES_RENDERER (object);
-
-	switch (prop_id) {
-	case PROP_NAME:
-		g_free (esnr->priv->name);
-		esnr->priv->name = g_strdup (g_value_get_string (value));
-		break;
-	case PROP_EMAIL:
-		g_free (esnr->priv->email);
-		esnr->priv->email = g_strdup (g_value_get_string (value));
-		break;
-	default:
-		break;
-	}
-}
-
-static void
-e_select_names_renderer_finalize (GObject *obj)
-{
-	ESelectNamesRenderer *cell = (ESelectNamesRenderer *) obj;
-
-	if (cell->priv->editable)
-		g_object_unref (cell->priv->editable);
-	cell->priv->editable = NULL;
-
-	g_free (cell->priv->path);
-	g_free (cell->priv->name);
-	g_free (cell->priv->email);
-	g_free (cell->priv);
-
-	if (G_OBJECT_CLASS (e_select_names_renderer_parent_class)->finalize)
-		G_OBJECT_CLASS (e_select_names_renderer_parent_class)->finalize (obj);
-}
-
-static void
-e_select_names_renderer_init (ESelectNamesRenderer *cell)
-{
-	cell->priv = g_new0 (ESelectNamesRendererPriv, 1);
-}
-
-static void
-e_select_names_renderer_class_init (ESelectNamesRendererClass *class)
-{
-	GtkCellRendererClass *cell_class = GTK_CELL_RENDERER_CLASS (class);
-	GObjectClass *obj_class = G_OBJECT_CLASS (class);
-	
-	obj_class->finalize = e_select_names_renderer_finalize;
-	obj_class->get_property = e_select_names_renderer_get_property;
-	obj_class->set_property = e_select_names_renderer_set_property;
-
-	cell_class->start_editing = e_select_names_renderer_start_editing;
-
-	g_object_class_install_property (obj_class, PROP_NAME,
-					 g_param_spec_string ("name", "Name", "Email name.", NULL, G_PARAM_READWRITE));
-
-	g_object_class_install_property (obj_class, PROP_EMAIL,
-					 g_param_spec_string ("email", "Email", "Email address.", NULL, G_PARAM_READWRITE));
-
-	signals [CELL_EDITED] = g_signal_new ("cell_edited",
-					      G_OBJECT_CLASS_TYPE (obj_class),
-					      G_SIGNAL_RUN_LAST,
-					      G_STRUCT_OFFSET (ESelectNamesRendererClass, cell_edited),
-					      NULL, NULL,
-					      e_calendar_marshal_VOID__STRING_POINTER_POINTER,
-					      G_TYPE_NONE, 3,
-					      G_TYPE_STRING, G_TYPE_POINTER, G_TYPE_POINTER);
-}
-
-GtkCellRenderer *
-e_select_names_renderer_new (void)
-{
-	return GTK_CELL_RENDERER (g_object_new (E_TYPE_SELECT_NAMES_RENDERER, NULL));
-}
-
diff --git a/calendar/gui/e-select-names-renderer.h b/calendar/gui/e-select-names-renderer.h
deleted file mode 100644
index 0d469e14a3..0000000000
--- a/calendar/gui/e-select-names-renderer.h
+++ /dev/null
@@ -1,63 +0,0 @@
-/*
- * e-select-names-renderer.h
- *
- * Author: Mike Kestner  <mkestner@ximian.com>
- *
- * Copyright (C) 2003 Ximian Inc.
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of version 2 of the GNU General Public 
- * License as published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * General Public License for more details.
- *
- * You should have received a copy of the GNU General Public
- * License along with this program; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
- */
-
-#ifndef __E_SELECT_NAMES_RENDERER_H__
-#define __E_SELECT_NAMES_RENDERER_H__
-
-#include <gtk/gtkcellrenderertext.h>
-
-G_BEGIN_DECLS
-
-#define E_TYPE_SELECT_NAMES_RENDERER	   (e_select_names_renderer_get_type ())
-#define E_SELECT_NAMES_RENDERER(o)	   (G_TYPE_CHECK_INSTANCE_CAST ((o), E_TYPE_SELECT_NAMES_RENDERER, ESelectNamesRenderer))
-#define E_SELECT_NAMES_RENDERER_CLASS(k)     (G_TYPE_CHECK_CLASS_CAST ((k), E_TYPE_SELECT_NAMES_RENDERER, ESelectNamesRendererClass))
-#define E_IS_SELECT_NAMES_RENDERER(o)	   (G_TYPE_CHECK_INSTANCE_TYPE ((o), E_TYPE_SELECT_NAMES_RENDERER))
-#define E_IS_SELECT_NAMES_RENDERER_CLASS(k)  (G_TYPE_CHECK_CLASS_TYPE ((o), E_TYPE_SELECT_NAMES_RENDERER))
-#define E_SELECT_NAMES_RENDERER_GET_CLASS(o) (G_TYPE_INSTANCE_GET_CLASS ((o), E_TYPE_SELECT_NAMES_RENDERER, ESelectNamesRendererClass))
-
-typedef struct _ESelectNamesRenderer      ESelectNamesRenderer;
-typedef struct _ESelectNamesRendererClass ESelectNamesRendererClass;
-typedef struct _ESelectNamesRendererPriv  ESelectNamesRendererPriv;
-
-struct _ESelectNamesRenderer
-{
-	GtkCellRendererText  parent;
-
-	ESelectNamesRendererPriv *priv;
-};
-
-struct _ESelectNamesRendererClass
-{
-	GtkCellRendererTextClass parent_class;
-
-	void (* cell_edited) (ESelectNamesRenderer *renderer, 
-			      const gchar *path, 
-			      GList *addresses, 
-			      GList *names);	
-};
-
-GType            e_select_names_renderer_get_type (void);
-GtkCellRenderer *e_select_names_renderer_new      (void);
-
-G_END_DECLS
-
-#endif /* __E_SELECT_NAMES_RENDERER_H__ */
diff --git a/calendar/gui/e-tasks.c b/calendar/gui/e-tasks.c
deleted file mode 100644
index 78ce565da1..0000000000
--- a/calendar/gui/e-tasks.c
+++ /dev/null
@@ -1,1301 +0,0 @@
-/* -*- Mode: C; indent-tabs-mode: t; c-basic-offset: 8; tab-width: 8 -*- */
-/* e-tasks.c
- *
- * Copyright (C) 2001-2003  Ximian, Inc.
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of version 2 of the GNU General Public
- * License as published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * General Public License for more details.
- *
- * You should have received a copy of the GNU General Public
- * License along with this program; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
- *
- * Authors: Federico Mena Quintero <federico@ximian.com>
- *	    Damon Chaplin <damon@ximian.com>
- *          Rodrigo Moya <rodrigo@ximian.com>
- */
-
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
-
-#include <gnome.h>
-#include <libgnomevfs/gnome-vfs-ops.h>
-#include <gal/e-table/e-table-scrolled.h>
-#include <gal/menus/gal-view-instance.h>
-#include <gal/menus/gal-view-factory-etable.h>
-#include <gal/menus/gal-view-etable.h>
-
-#include "widgets/misc/e-error.h"
-#include "e-util/e-categories-config.h"
-#include "e-util/e-config-listener.h"
-#include "e-util/e-time-utils.h"
-#include "shell/e-user-creatable-items-handler.h"
-#include <libedataserver/e-url.h>
-#include <libecal/e-cal-time-util.h>
-#include "widgets/menus/gal-view-menus.h"
-#include "dialogs/delete-error.h"
-#include "dialogs/task-editor.h"
-#include "e-calendar-marshal.h"
-#include "cal-search-bar.h"
-#include "calendar-config.h"
-#include "calendar-component.h"
-#include "comp-util.h"
-#include "e-calendar-table-config.h"
-#include "misc.h"
-#include "tasks-component.h"
-#include "e-cal-component-preview.h"
-#include "e-tasks.h"
-#include "common/authentication.h"
-
-
-/* Private part of the GnomeCalendar structure */
-struct _ETasksPrivate {
-	/* The task lists for display */
-	GHashTable *clients;
-	GList *clients_list;
-	ECal *default_client;
-
-	ECalView *query;
-	
-	EConfigListener *config_listener;
-
-	/* The ECalendarTable showing the tasks. */
-	GtkWidget   *tasks_view;
-	ECalendarTableConfig *tasks_view_config;
-	
-	/* Calendar search bar for tasks */
-	GtkWidget *search_bar;
-
-	/* Paned widget */
-	GtkWidget *paned;
-
-	/* The preview */
-	GtkWidget *preview;
-	
-	gchar *current_uid;
-	char *sexp;
-	guint update_timeout;
-	
-	/* View instance and the view menus handler */
-	GalViewInstance *view_instance;
-	GalViewMenus *view_menus;
-
-	GList *notifications;
-};
-
-static void setup_widgets (ETasks *tasks);
-static void e_tasks_destroy (GtkObject *object);
-static void update_view (ETasks *tasks);
-
-static void config_categories_changed_cb (EConfigListener *config_listener, const char *key, gpointer user_data);
-static void backend_error_cb (ECal *client, const char *message, gpointer data);
-
-/* Signal IDs */
-enum {
-	SELECTION_CHANGED,
-	SOURCE_ADDED,
-	SOURCE_REMOVED,
-	LAST_SIGNAL
-};
-
-enum DndTargetType {
-	TARGET_VCALENDAR
-};
-
-static GtkTargetEntry list_drag_types[] = {
-	{ "text/calendar",                0, TARGET_VCALENDAR },
-	{ "text/x-calendar",              0, TARGET_VCALENDAR }
-};
-static const int num_list_drag_types = sizeof (list_drag_types) / sizeof (list_drag_types[0]);
-
-static guint e_tasks_signals[LAST_SIGNAL] = { 0 };
-
-G_DEFINE_TYPE (ETasks, e_tasks, GTK_TYPE_TABLE)
-
-/* Callback used when the cursor changes in the table */
-static void
-table_cursor_change_cb (ETable *etable, int row, gpointer data)
-{
-	ETasks *tasks;
-	ETasksPrivate *priv;
-	ECalModel *model;
-	ECalModelComponent *comp_data;
-	ECalComponent *comp;
-	const char *uid;
-
-	int n_selected;
-
-	tasks = E_TASKS (data);
-	priv = tasks->priv;
-
-	n_selected = e_table_selected_count (etable);
-	
-	/* update the HTML widget */
-	if (n_selected != 1) {
-		e_cal_component_preview_clear (E_CAL_COMPONENT_PREVIEW (priv->preview));
-
-		return;
-	}
-	
-	model = e_calendar_table_get_model (E_CALENDAR_TABLE (priv->tasks_view));
-	
-	comp_data = e_cal_model_get_component_at (model, e_table_get_cursor_row (etable));
-	comp = e_cal_component_new ();
-	e_cal_component_set_icalcomponent (comp, icalcomponent_new_clone (comp_data->icalcomp));
-
-	e_cal_component_preview_display (E_CAL_COMPONENT_PREVIEW (priv->preview), comp_data->client, comp);
-	
-	e_cal_component_get_uid (comp, &uid);
-	if (priv->current_uid)
-		g_free (priv->current_uid);
-	priv->current_uid = g_strdup (uid);
-	
-	g_object_unref (comp);
-}
-
-/* Callback used when the selection changes in the table. */
-static void
-table_selection_change_cb (ETable *etable, gpointer data)
-{
-	ETasks *tasks;
-	int n_selected;
-
-	tasks = E_TASKS (data);
-
-	n_selected = e_table_selected_count (etable);
-	gtk_signal_emit (GTK_OBJECT (tasks), e_tasks_signals[SELECTION_CHANGED],
-			 n_selected);
-}
-
-static void
-user_created_cb (GtkWidget *view, ETasks *tasks)
-{
-	ETasksPrivate *priv;	
-	ECal *ecal;
-	ECalModel *model;
-	
-	priv = tasks->priv;
-
-	model = e_calendar_table_get_model (E_CALENDAR_TABLE (priv->tasks_view));
-	ecal = e_cal_model_get_default_client (model);
-
-	e_tasks_add_todo_source (tasks, e_cal_get_source (ecal));
-}
-
-/* Callback used when the sexp in the search bar changes */
-static void
-search_bar_sexp_changed_cb (CalSearchBar *cal_search, const char *sexp, gpointer data)
-{
-	ETasks *tasks;
-	ETasksPrivate *priv;
-
-	tasks = E_TASKS (data);
-	priv = tasks->priv;
-
-	if (priv->sexp)
-		g_free (priv->sexp);
-	
-	priv->sexp = g_strdup (sexp);
-	
-	update_view (tasks);
-}
-
-/* Callback used when the selected category in the search bar changes */
-static void
-search_bar_category_changed_cb (CalSearchBar *cal_search, const char *category, gpointer data)
-{
-	ETasks *tasks;
-	ETasksPrivate *priv;
-	ECalModel *model;
-
-	tasks = E_TASKS (data);
-	priv = tasks->priv;
-
-	model = e_calendar_table_get_model (E_CALENDAR_TABLE (priv->tasks_view));
-	e_cal_model_set_default_category (model, category);
-}
-
-static gboolean
-vpaned_resized_cb (GtkWidget *widget, GdkEventButton *event, ETasks *tasks)
-{
-	calendar_config_set_task_vpane_pos (gtk_paned_get_position (GTK_PANED (widget)));
-
-	return FALSE;
-}
-
-static void
-set_timezone (ETasks *tasks) 
-{
-	ETasksPrivate *priv;
-	icaltimezone *zone;
-	GList *l;
-	
-	priv = tasks->priv;
-	
-	zone = calendar_config_get_icaltimezone ();
-	for (l = priv->clients_list; l != NULL; l = l->next) {
-		ECal *client = l->data;
-
-		if (e_cal_get_load_state (client) == E_CAL_LOAD_LOADED)
-			/* FIXME Error checking */
-			e_cal_set_default_timezone (client, zone, NULL);
-	}
-
-	if (priv->default_client && e_cal_get_load_state (priv->default_client) == E_CAL_LOAD_LOADED)
-		/* FIXME Error checking */
-		e_cal_set_default_timezone (priv->default_client, zone, NULL);
-
-	if (priv->preview)
-		e_cal_component_preview_set_default_timezone (E_CAL_COMPONENT_PREVIEW (priv->preview), zone);
-}
-
-static void
-timezone_changed_cb (GConfClient *client, guint id, GConfEntry *entry, gpointer data)
-{
-	ETasks *tasks = data;
-	
-	set_timezone (tasks);
-}
-
-static void
-update_view (ETasks *tasks)
-{
-	ETasksPrivate *priv;
-	ECalModel *model;
-	char *real_sexp = NULL;
-	char *new_sexp = NULL;
-	
-	priv = tasks->priv;
-
-	model = e_calendar_table_get_model (E_CALENDAR_TABLE (priv->tasks_view));
-		
-	if ((new_sexp = calendar_config_get_hide_completed_tasks_sexp()) != NULL) {
-		real_sexp = g_strdup_printf ("(and %s %s)", new_sexp, priv->sexp);
-		e_cal_model_set_search_query (model, real_sexp);
-		g_free (new_sexp);
-		g_free (real_sexp);
-	} else
-		e_cal_model_set_search_query (model, priv->sexp);
-
-	e_cal_component_preview_clear (E_CAL_COMPONENT_PREVIEW (priv->preview));
-}
-
-static gboolean
-update_view_cb (ETasks *tasks)
-{	
-	update_view (tasks);
-
-	return TRUE;
-}
-
-static void
-config_hide_completed_tasks_changed_cb (GConfClient *client, guint id, GConfEntry *entry, gpointer data)
-{
-	update_view (data);
-}
-
-static void
-model_row_changed_cb (ETableModel *etm, int row, gpointer data)
-{
-	ETasks *tasks;
-	ETasksPrivate *priv;
-	ECalModelComponent *comp_data;
-
-	tasks = E_TASKS (data);
-	priv = tasks->priv;
-
-	if (priv->current_uid) {
-		const char *uid;
-
-		comp_data = e_cal_model_get_component_at (E_CAL_MODEL (etm), row);
-		if (comp_data) {
-			uid = icalcomponent_get_uid (comp_data->icalcomp);
-			if (!strcmp (uid ? uid : "", priv->current_uid)) {
-				ETable *etable;
-
-				etable = e_table_scrolled_get_table (
-					E_TABLE_SCROLLED (E_CALENDAR_TABLE (priv->tasks_view)->etable));
-				table_cursor_change_cb (etable, 0, tasks);
-			}
-		}
-	}
-}
-
-static void
-setup_config (ETasks *tasks)
-{
-	ETasksPrivate *priv;
-	guint not;
-
-	priv = tasks->priv;
-	
-	/* Timezone */
-	set_timezone (tasks);
-	
-	not = calendar_config_add_notification_timezone (timezone_changed_cb, tasks);
-	priv->notifications = g_list_prepend (priv->notifications, GUINT_TO_POINTER (not));
-	
-	not = calendar_config_add_notification_hide_completed_tasks (config_hide_completed_tasks_changed_cb, 
-							      tasks);
-	priv->notifications = g_list_prepend (priv->notifications, GUINT_TO_POINTER (not));
-	
-	not = calendar_config_add_notification_hide_completed_tasks_units (config_hide_completed_tasks_changed_cb, 
-							      tasks);
-	priv->notifications = g_list_prepend (priv->notifications, GUINT_TO_POINTER (not));
-	
-	not = calendar_config_add_notification_hide_completed_tasks_value (config_hide_completed_tasks_changed_cb, 
-							      tasks);
-	priv->notifications = g_list_prepend (priv->notifications, GUINT_TO_POINTER (not));	
-}
-
-static void
-table_drag_data_get (ETable             *table,
-		     int                 row,
-		     int                 col,
-		     GdkDragContext     *context,
-		     GtkSelectionData   *selection_data,
-		     guint               info,
-		     guint               time,
-		     ETasks             *tasks)
-{
-	ETasksPrivate *priv;
-	ECalModelComponent *comp_data;
-
-	priv = tasks->priv;
-
-	if (priv->current_uid) {
-		ECalModel *model;
-
-		model = e_calendar_table_get_model (E_CALENDAR_TABLE (priv->tasks_view));
-		comp_data = e_cal_model_get_component_at (model, row);
-
-		if (info == TARGET_VCALENDAR) {
-			/* we will pass an icalcalendar component for both types */
-			char *comp_str;
-			icalcomponent *vcal;
-		
-			vcal = e_cal_util_new_top_level ();
-			e_cal_util_add_timezones_from_component (vcal, comp_data->icalcomp);
-			icalcomponent_add_component (
-			        vcal,
-				icalcomponent_new_clone (comp_data->icalcomp));
-
-			comp_str = icalcomponent_as_ical_string (vcal);
-			if (comp_str) {
-				gtk_selection_data_set (selection_data, selection_data->target,
-							8, comp_str, strlen (comp_str));
-			}
-			icalcomponent_free (vcal);
-		}
-	}
-}
-
-/*
-static void
-table_drag_begin (ETable         *table,
-		  int             row,
-		  int             col,
-		  GdkDragContext *context,
-		  ETasks         *tasks)
-{
-
-}
-
-
-static void
-table_drag_end (ETable         *table,
-		int             row,
-		int             col,
-		GdkDragContext *context,
-		ETasks         *tasks)
-{
-
-}
-*/
-
-static void 
-table_drag_data_delete (ETable         *table,
-			int             row,
-			int             col,
-			GdkDragContext *context,
-			ETasks         *tasks)
-{
-	ETasksPrivate *priv;
-	ECalModelComponent *comp_data;
-	ECalModel *model;
-	gboolean read_only = TRUE;
-	
-	priv = tasks->priv;
-	
-	model = e_calendar_table_get_model (E_CALENDAR_TABLE (priv->tasks_view));
-	comp_data = e_cal_model_get_component_at (model, row);
-
-	e_cal_is_read_only (comp_data->client, &read_only, NULL);
-	if (read_only)
-		return;
-
-	e_cal_remove_object (comp_data->client, icalcomponent_get_uid (comp_data->icalcomp), NULL);
-}
-
-#define E_TASKS_TABLE_DEFAULT_STATE					\
-	"<?xml version=\"1.0\"?>"					\
-	"<ETableState>"							\
-	"<column source=\"13\"/>"					\
-	"<column source=\"14\"/>"					\
-	"<column source=\"9\"/>"					\
-	"<column source=\"5\"/>"					\
-	"<grouping/>"							\
-	"</ETableState>"
-
-static void
-pane_realized (GtkWidget *widget, ETasks *tasks)
-{
-	gtk_paned_set_position ((GtkPaned *)widget, calendar_config_get_task_vpane_pos ());
-}
-
-static void
-setup_widgets (ETasks *tasks)
-{
-	ETasksPrivate *priv;
-	ETable *etable;
-	ECalModel *model;
-
-	priv = tasks->priv;
-
-	priv->search_bar = cal_search_bar_new (CAL_SEARCH_TASKS_DEFAULT);
-	g_signal_connect (priv->search_bar, "sexp_changed",
-			  G_CALLBACK (search_bar_sexp_changed_cb), tasks);
-	g_signal_connect (priv->search_bar, "category_changed",
-			  G_CALLBACK (search_bar_category_changed_cb), tasks);
-	config_categories_changed_cb (priv->config_listener, "/apps/evolution/general/category_master_list", tasks);
-
-	gtk_table_attach (GTK_TABLE (tasks), priv->search_bar, 0, 1, 0, 1,
-			  GTK_EXPAND | GTK_FILL | GTK_SHRINK, 0, 0, 0);
-	gtk_widget_show (priv->search_bar);
-
-	/* add the paned widget for the task list and task detail areas */
-	priv->paned = gtk_vpaned_new ();
-	g_signal_connect (priv->paned, "realize", G_CALLBACK (pane_realized), tasks);
-
-	g_signal_connect (G_OBJECT (priv->paned), "button_release_event",
-			  G_CALLBACK (vpaned_resized_cb), tasks);
-	gtk_table_attach (GTK_TABLE (tasks), priv->paned, 0, 1, 1, 2,
-			  GTK_EXPAND | GTK_FILL, GTK_EXPAND | GTK_FILL, 0, 0);
-	gtk_widget_show (priv->paned);
-
-	/* create the task list */
-	priv->tasks_view = e_calendar_table_new ();
-	priv->tasks_view_config = e_calendar_table_config_new (E_CALENDAR_TABLE (priv->tasks_view));
-	
-	g_signal_connect (priv->tasks_view, "user_created", G_CALLBACK (user_created_cb), tasks);
-
-	etable = e_table_scrolled_get_table (
-		E_TABLE_SCROLLED (E_CALENDAR_TABLE (priv->tasks_view)->etable));
-	e_table_set_state (etable, E_TASKS_TABLE_DEFAULT_STATE);
-	gtk_paned_add1 (GTK_PANED (priv->paned), priv->tasks_view);
-	gtk_widget_show (priv->tasks_view);
-
-
-	e_table_drag_source_set (etable, GDK_BUTTON1_MASK,
-				 list_drag_types, num_list_drag_types,
-				 GDK_ACTION_MOVE|GDK_ACTION_COPY|GDK_ACTION_ASK);
-	
-	g_signal_connect (etable, "table_drag_data_get",
-			  G_CALLBACK(table_drag_data_get), tasks);
-	g_signal_connect (etable, "table_drag_data_delete",
-			  G_CALLBACK(table_drag_data_delete), tasks);
-
-	/*
-	e_table_drag_dest_set (e_table_scrolled_get_table (E_TABLE_SCROLLED (editor->table)),
-			       0, list_drag_types, num_list_drag_types, GDK_ACTION_LINK);
-
-	g_signal_connect (e_table_scrolled_get_table (E_TABLE_SCROLLED (editor->table)),
-			  "table_drag_motion", G_CALLBACK(table_drag_motion_cb), editor);
-	g_signal_connect (e_table_scrolled_get_table (E_TABLE_SCROLLED (editor->table)),
-			  "table_drag_drop", G_CALLBACK (table_drag_drop_cb), editor);
-	g_signal_connect (e_table_scrolled_get_table (E_TABLE_SCROLLED (editor->table)),
-			  "table_drag_data_received", G_CALLBACK(table_drag_data_received_cb), editor);
-	*/
-
-	g_signal_connect (etable, "cursor_change", G_CALLBACK (table_cursor_change_cb), tasks);
-	g_signal_connect (etable, "selection_change", G_CALLBACK (table_selection_change_cb), tasks);
-
-	/* Timeout check to hide completed items */
-	priv->update_timeout = g_timeout_add_full (G_PRIORITY_LOW, 60000, (GSourceFunc) update_view_cb, tasks, NULL);	
-
-	/* create the task detail */
-	priv->preview = e_cal_component_preview_new ();
-	e_cal_component_preview_set_default_timezone (E_CAL_COMPONENT_PREVIEW (priv->preview), calendar_config_get_icaltimezone ());	
-	gtk_paned_add2 (GTK_PANED (priv->paned), priv->preview);
-	gtk_widget_show (priv->preview);
-
-	model = e_calendar_table_get_model (E_CALENDAR_TABLE (priv->tasks_view));
-	g_signal_connect (G_OBJECT (model), "model_row_changed",
-			  G_CALLBACK (model_row_changed_cb), tasks);
-}
-
-/* Class initialization function for the gnome calendar */
-static void
-e_tasks_class_init (ETasksClass *class)
-{
-	GtkObjectClass *object_class;
-
-	object_class = (GtkObjectClass *) class;
-
-	e_tasks_signals[SELECTION_CHANGED] =
-		gtk_signal_new ("selection_changed",
-				GTK_RUN_LAST,
-				G_TYPE_FROM_CLASS (object_class), 
-				GTK_SIGNAL_OFFSET (ETasksClass, selection_changed),
-				gtk_marshal_NONE__INT,
-				GTK_TYPE_NONE, 1,
-				GTK_TYPE_INT);
-
-	e_tasks_signals[SOURCE_ADDED] =
-		g_signal_new ("source_added",
-			      G_TYPE_FROM_CLASS (object_class),
-			      G_SIGNAL_RUN_FIRST,
-			      G_STRUCT_OFFSET (ETasksClass, source_added),
-			      NULL, NULL,
-			      e_calendar_marshal_VOID__OBJECT,
-			      G_TYPE_NONE,
-			      1,
-			      G_TYPE_OBJECT);
-
-	e_tasks_signals[SOURCE_REMOVED] =
-		g_signal_new ("source_removed",
-			      G_TYPE_FROM_CLASS (object_class),
-			      G_SIGNAL_RUN_FIRST,
-			      G_STRUCT_OFFSET (ETasksClass, source_removed),
-			      NULL, NULL,
-			      e_calendar_marshal_VOID__OBJECT,
-			      G_TYPE_NONE,
-			      1,
-			      G_TYPE_OBJECT);
-
-	object_class->destroy = e_tasks_destroy;
-
-	class->selection_changed = NULL;
-	class->source_added = NULL;
-	class->source_removed = NULL;
-}
-
-
-static void
-config_categories_changed_cb (EConfigListener *config_listener, const char *key, gpointer user_data)
-{
-	GList *cat_list;
-	GPtrArray *cat_array;
-	ETasksPrivate *priv;
-	ETasks *tasks = user_data;
-
-	priv = tasks->priv;
-
-	cat_array = g_ptr_array_new ();
-	cat_list = e_categories_get_list ();
-	while (cat_list != NULL) {
-		if (e_categories_is_searchable ((const char *) cat_list->data))
-			g_ptr_array_add (cat_array, cat_list->data);
-		cat_list = g_list_remove (cat_list, cat_list->data);
-	}
-
-	cal_search_bar_set_categories (priv->search_bar, cat_array);
-
-	g_ptr_array_free (cat_array, TRUE);
-}
-
-/* Object initialization function for the gnome calendar */
-static void
-e_tasks_init (ETasks *tasks)
-{
-	ETasksPrivate *priv;
-	
-	priv = g_new0 (ETasksPrivate, 1);
-	tasks->priv = priv;
-
-	priv->config_listener = e_config_listener_new ();
-	g_signal_connect (priv->config_listener, "key_changed", G_CALLBACK (config_categories_changed_cb), tasks);
-
-	setup_config (tasks);
-	setup_widgets (tasks);
-
-	priv->clients = g_hash_table_new_full (g_str_hash, g_str_equal, g_free, g_object_unref);	
-	priv->query = NULL;
-	priv->view_instance = NULL;
-	priv->view_menus = NULL;
-	priv->current_uid = NULL;
-	priv->sexp = g_strdup ("#t");
-	priv->default_client = NULL;
-	update_view (tasks);
-}
-
-GtkWidget *
-e_tasks_new (void)
-{
-	ETasks *tasks;
-
-	tasks = g_object_new (e_tasks_get_type (), NULL);
-
-	return GTK_WIDGET (tasks);
-}
-
-
-void
-e_tasks_set_ui_component (ETasks *tasks,
-			  BonoboUIComponent *ui_component)
-{
-	g_return_if_fail (E_IS_TASKS (tasks));
-	g_return_if_fail (ui_component == NULL || BONOBO_IS_UI_COMPONENT (ui_component));
-
-	e_search_bar_set_ui_component (E_SEARCH_BAR (tasks->priv->search_bar), ui_component);
-}
-
-
-static void
-e_tasks_destroy (GtkObject *object)
-{
-	ETasks *tasks;
-	ETasksPrivate *priv;
-
-	g_return_if_fail (object != NULL);
-	g_return_if_fail (E_IS_TASKS (object));
-
-	tasks = E_TASKS (object);
-	priv = tasks->priv;
-
-	if (priv) {
-		GList *l;
-
-		/* unset the config listener */
-		if (priv->config_listener) {
-			g_signal_handlers_disconnect_matched (priv->config_listener,
-							      G_SIGNAL_MATCH_DATA,
-							      0, 0, NULL, NULL, tasks);
-			g_object_unref (priv->config_listener);
-			priv->config_listener = NULL;
-		}
-
-		/* disconnect from signals on all the clients */
-		for (l = priv->clients_list; l != NULL; l = l->next) {
-			g_signal_handlers_disconnect_matched (l->data, G_SIGNAL_MATCH_DATA,
-							      0, 0, NULL, NULL, tasks);
-		}
-
-		g_hash_table_destroy (priv->clients);
-		g_list_free (priv->clients_list);
-
-		if (priv->default_client)
-			g_object_unref (priv->default_client);
-		priv->default_client = NULL;
-
-		if (priv->current_uid) {
-			g_free (priv->current_uid);
-			priv->current_uid = NULL;
-		}
-	
-		if (priv->sexp) {
-			g_free (priv->sexp);
-			priv->sexp = NULL;
-		}
-
-		if (priv->update_timeout) {
-			g_source_remove (priv->update_timeout);
-			priv->update_timeout = 0;
-		}
-	
-		if (priv->tasks_view_config) {
-			g_object_unref (priv->tasks_view_config);
-			priv->tasks_view_config = NULL;
-		}
-		
-		for (l = priv->notifications; l; l = l->next)
-			calendar_config_remove_notification (GPOINTER_TO_UINT (l->data));
-		priv->notifications = NULL;
-
-		g_free (priv);
-		tasks->priv = NULL;
-	}
-
-	if (GTK_OBJECT_CLASS (e_tasks_parent_class)->destroy)
-		(* GTK_OBJECT_CLASS (e_tasks_parent_class)->destroy) (object);
-}
-
-static void
-set_status_message (ETasks *tasks, const char *message, ...)
-{
-	ETasksPrivate *priv;
-	va_list args;
-	char sz[2048], *msg_string = NULL;
-
-	if (message) {
-		va_start (args, message);
-		vsnprintf (sz, sizeof sz, message, args);
-		va_end (args);
-		msg_string = sz;
-	}
-
-	priv = tasks->priv;
-	
-	e_calendar_table_set_status_message (E_CALENDAR_TABLE (priv->tasks_view), msg_string);
-}
-
-/* Callback from the calendar client when an error occurs in the backend */
-static void
-backend_error_cb (ECal *client, const char *message, gpointer data)
-{
-	ETasks *tasks;
-	ETasksPrivate *priv;
-	char *errmsg;
-	char *urinopwd;
-
-	tasks = E_TASKS (data);
-	priv = tasks->priv;
-
-	urinopwd = get_uri_without_password (e_cal_get_uri (client));
-	errmsg = g_strdup_printf (_("Error on %s:\n %s"), urinopwd, message);
-	gnome_error_dialog_parented (errmsg, GTK_WINDOW (gtk_widget_get_toplevel (GTK_WIDGET (tasks))));
-	g_free (errmsg);
-	g_free (urinopwd);
-}
-
-/* Callback from the calendar client when the backend dies */
-static void
-backend_died_cb (ECal *client, gpointer data)
-{
-	ETasks *tasks;
-	ETasksPrivate *priv;
-	ESource *source;
-	
-	tasks = E_TASKS (data);
-	priv = tasks->priv;
-
-	source = g_object_ref (e_cal_get_source (client));
-
-	priv->clients_list = g_list_remove (priv->clients_list, client);
-	g_hash_table_remove (priv->clients,  e_source_peek_uid (source));
-
-	gtk_signal_emit (GTK_OBJECT (tasks), e_tasks_signals[SOURCE_REMOVED], source);
-
-	e_calendar_table_set_status_message (E_CALENDAR_TABLE (e_tasks_get_calendar_table (tasks)), NULL);
-	
-	e_error_run (GTK_WINDOW (gtk_widget_get_toplevel (GTK_WIDGET (tasks))),
-		     "calendar:tasks-crashed", NULL);
-	
-	g_object_unref (source);
-}
-
-/* Callback from the calendar client when the calendar is opened */
-static void
-client_cal_opened_cb (ECal *ecal, ECalendarStatus status, ETasks *tasks)
-{
-	ECalModel *model;
-	ESource *source;
-	ETasksPrivate *priv;
-
-	priv = tasks->priv;
-
-	source = e_cal_get_source (ecal);
-
-	switch (status) {
-	case E_CALENDAR_STATUS_OK :
-		g_signal_handlers_disconnect_matched (ecal, G_SIGNAL_MATCH_FUNC, 0, 0, NULL, client_cal_opened_cb, NULL);
-
-		set_status_message (tasks, _("Loading tasks"));
-		model = e_calendar_table_get_model (E_CALENDAR_TABLE (priv->tasks_view));
-		e_cal_model_add_client (model, ecal);
-
-		set_timezone (tasks);
-		set_status_message (tasks, NULL);
-		break;
-	case E_CALENDAR_STATUS_BUSY :
-		break;
-	case E_CALENDAR_STATUS_REPOSITORY_OFFLINE:
-		e_error_run (GTK_WINDOW (gtk_widget_get_toplevel (GTK_WIDGET (tasks))), "calendar:prompt-no-contents-offline-tasks", NULL);
-	default :
-		/* Make sure the source doesn't disappear on us */
-		g_object_ref (source);
-
-		priv->clients_list = g_list_remove (priv->clients_list, ecal);
-		g_signal_handlers_disconnect_matched (ecal, G_SIGNAL_MATCH_DATA,
-						      0, 0, NULL, NULL, tasks);
-
-		/* Do this last because it unrefs the client */
-		g_hash_table_remove (priv->clients,  e_source_peek_uid (source));
-
-		gtk_signal_emit (GTK_OBJECT (tasks), e_tasks_signals[SOURCE_REMOVED], source);
-
-		set_status_message (tasks, NULL);
-		g_object_unref (source);
-
-		break;
-	}
-}
-
-static void
-default_client_cal_opened_cb (ECal *ecal, ECalendarStatus status, ETasks *tasks)
-{
-	ECalModel *model;
-	ESource *source;
-	ETasksPrivate *priv;
-
-	priv = tasks->priv;
-
-	source = e_cal_get_source (ecal);
-
-	switch (status) {
-	case E_CALENDAR_STATUS_OK :
-		g_signal_handlers_disconnect_matched (ecal, G_SIGNAL_MATCH_FUNC, 0, 0, NULL, default_client_cal_opened_cb, NULL);
-		model = e_calendar_table_get_model (E_CALENDAR_TABLE (priv->tasks_view));
-		
-		set_timezone (tasks);
-		e_cal_model_set_default_client (model, ecal);
-		set_status_message (tasks, NULL);
-		break;
-	case E_CALENDAR_STATUS_BUSY:
-		break;
-	default :
-		/* Make sure the source doesn't disappear on us */
-		g_object_ref (source);
-
-		priv->clients_list = g_list_remove (priv->clients_list, ecal);
-		g_signal_handlers_disconnect_matched (ecal, G_SIGNAL_MATCH_DATA,
-						      0, 0, NULL, NULL, tasks);
-
-		/* Do this last because it unrefs the client */
-		g_hash_table_remove (priv->clients,  e_source_peek_uid (source));
-
-		gtk_signal_emit (GTK_OBJECT (tasks), e_tasks_signals[SOURCE_REMOVED], source);
-
-		set_status_message (tasks, NULL);
-		g_object_unref (priv->default_client);
-		priv->default_client = NULL;
-		g_object_unref (source);
-
-		break;
-	}
-}
-
-typedef void (*open_func) (ECal *, ECalendarStatus, ETasks *);
-
-static gboolean
-open_ecal (ETasks *tasks, ECal *cal, gboolean only_if_exists, open_func of)
-{
-	ETasksPrivate *priv;
-
-	priv = tasks->priv;
-	
-	set_status_message (tasks, _("Opening tasks at %s"), e_cal_get_uri (cal));
-
-	g_signal_connect (G_OBJECT (cal), "cal_opened", G_CALLBACK (of), tasks);
-	e_cal_open_async (cal, only_if_exists);
-
-	return TRUE;
-}
-
-void
-e_tasks_open_task			(ETasks		*tasks)
-{
-	ECalendarTable *cal_table;
-                                                                                
-	cal_table = e_tasks_get_calendar_table (tasks);
-	e_calendar_table_open_selected (cal_table);
-}
-
-void
-e_tasks_new_task			(ETasks		*tasks)
-{
-	ETasksPrivate *priv;
-	TaskEditor *tedit;
-	ECalComponent *comp;
-	const char *category;
-	ECal *ecal;
-	
-	g_return_if_fail (E_IS_TASKS (tasks));
-
-	priv = tasks->priv;
-
-	/* FIXME What to do about no default client */
-	ecal = e_tasks_get_default_client (tasks);
-	if (!ecal)
-		return;
-	
-	comp = cal_comp_task_new_with_defaults (ecal);
-
-	category = cal_search_bar_get_category (CAL_SEARCH_BAR (priv->search_bar));
-	e_cal_component_set_categories (comp, category);
-
-	tedit = task_editor_new (ecal, FALSE);
-	comp_editor_edit_comp (COMP_EDITOR (tedit), comp);
-	g_object_unref (comp);
-
-	comp_editor_focus (COMP_EDITOR (tedit));
-}
-
-gboolean
-e_tasks_add_todo_source (ETasks *tasks, ESource *source)
-{
-	ETasksPrivate *priv;
-	ECal *client;
-	const char *uid;
-
-	g_return_val_if_fail (tasks != NULL, FALSE);
-	g_return_val_if_fail (E_IS_TASKS (tasks), FALSE);
-	g_return_val_if_fail (E_IS_SOURCE (source), FALSE);
-
-	priv = tasks->priv;
-
-	uid = e_source_peek_uid (source);
-	client = g_hash_table_lookup (priv->clients, uid);
-	if (client) {
-		/* We already have it */
-
-		return TRUE;
-	} else {
-		ESource *default_source;
-		
-		if (priv->default_client) {
-			default_source = e_cal_get_source (priv->default_client);
-		
-			/* We don't have it but the default client is it */
-			if (!strcmp (e_source_peek_uid (default_source), uid))
-				client = g_object_ref (priv->default_client);
-		}
-
-		/* Create a new one */
-		if (!client) {
-			client = auth_new_cal_from_source (source, E_CAL_SOURCE_TYPE_TODO);
-			if (!client)
-				return FALSE;
-		}
-	}
-
-	g_signal_connect (G_OBJECT (client), "backend_error", G_CALLBACK (backend_error_cb), tasks);
-	g_signal_connect (G_OBJECT (client), "backend_died", G_CALLBACK (backend_died_cb), tasks);
-
-	/* add the client to internal structure */	
-	g_hash_table_insert (priv->clients, g_strdup (uid) , client);
-	priv->clients_list = g_list_prepend (priv->clients_list, client);
-
-	gtk_signal_emit (GTK_OBJECT (tasks), e_tasks_signals[SOURCE_ADDED], source);
-
-	open_ecal (tasks, client, FALSE, client_cal_opened_cb);
-
-	return TRUE;
-}
-
-gboolean
-e_tasks_remove_todo_source (ETasks *tasks, ESource *source)
-{
-	ETasksPrivate *priv;
-	ECal *client;
-	ECalModel *model;
-	const char *uid;
-
-	g_return_val_if_fail (tasks != NULL, FALSE);
-	g_return_val_if_fail (E_IS_TASKS (tasks), FALSE);
-	g_return_val_if_fail (E_IS_SOURCE (source), FALSE);
-
-	priv = tasks->priv;
-
-	uid = e_source_peek_uid (source);
-	client = g_hash_table_lookup (priv->clients, uid);
-	if (!client) 
-		return TRUE;
-	
-
-	priv->clients_list = g_list_remove (priv->clients_list, client);
-	g_signal_handlers_disconnect_matched (client, G_SIGNAL_MATCH_DATA,
-					      0, 0, NULL, NULL, tasks);	
-
-	model = e_calendar_table_get_model (E_CALENDAR_TABLE (priv->tasks_view));
-	e_cal_model_remove_client (model, client);
-
-	g_hash_table_remove (priv->clients, uid);
-       
-
-	gtk_signal_emit (GTK_OBJECT (tasks), e_tasks_signals[SOURCE_REMOVED], source);
-
-	return TRUE;
-}
-
-gboolean
-e_tasks_set_default_source (ETasks *tasks, ESource *source)
-{
-	ETasksPrivate *priv;
-	ECal *ecal;
-	
-	g_return_val_if_fail (tasks != NULL, FALSE);
-	g_return_val_if_fail (E_IS_TASKS (tasks), FALSE);
-	g_return_val_if_fail (E_IS_SOURCE (source), FALSE);
-
-	priv = tasks->priv;
-
-	ecal = g_hash_table_lookup (priv->clients, e_source_peek_uid (source));
-
-	if (priv->default_client)
-		g_object_unref (priv->default_client);
-
-	if (ecal) {
-		priv->default_client = g_object_ref (ecal);
-	} else {
-		priv->default_client = auth_new_cal_from_source (source, E_CAL_SOURCE_TYPE_TODO);
-		if (!priv->default_client)
-			return FALSE;
-	}
-
-	open_ecal (tasks, priv->default_client, FALSE, default_client_cal_opened_cb);
-
-	return TRUE;
-}
-
-ECal *
-e_tasks_get_default_client (ETasks *tasks)
-{
-	ETasksPrivate *priv;
-	
-	g_return_val_if_fail (tasks != NULL, NULL);
-	g_return_val_if_fail (E_IS_TASKS (tasks), NULL);
-
-	priv = tasks->priv;
-
-	return e_cal_model_get_default_client (e_calendar_table_get_model (E_CALENDAR_TABLE (priv->tasks_view)));	
-}
-
-/**
- * e_tasks_complete_selected:
- * @tasks: A tasks control widget
- * 
- * Marks the selected tasks complete
- **/
-void
-e_tasks_complete_selected (ETasks *tasks)
-{
-	ETasksPrivate *priv;
-	ECalendarTable *cal_table;
-
-	g_return_if_fail (tasks != NULL);
-	g_return_if_fail (E_IS_TASKS (tasks));
-
-	priv = tasks->priv;
-
-	cal_table = E_CALENDAR_TABLE (priv->tasks_view);
-
-	set_status_message (tasks, _("Completing tasks..."));
-	e_calendar_table_complete_selected (cal_table);
-	set_status_message (tasks, NULL);
-}
-
-/**
- * e_tasks_delete_selected:
- * @tasks: A tasks control widget.
- * 
- * Deletes the selected tasks in the task list.
- **/
-void
-e_tasks_delete_selected (ETasks *tasks)
-{
-	ETasksPrivate *priv;
-	ECalendarTable *cal_table;
-
-	g_return_if_fail (tasks != NULL);
-	g_return_if_fail (E_IS_TASKS (tasks));
-
-	priv = tasks->priv;
-
-	cal_table = E_CALENDAR_TABLE (priv->tasks_view);
-	set_status_message (tasks, _("Deleting selected objects..."));
-	e_calendar_table_delete_selected (cal_table);
-	set_status_message (tasks, NULL);
-
-	e_cal_component_preview_clear (E_CAL_COMPONENT_PREVIEW (priv->preview));
-}
-
-/**
- * e_tasks_expunge:
- * @tasks: A tasks control widget
- * 
- * Removes all tasks marked as completed
- **/
-void
-e_tasks_delete_completed (ETasks *tasks)
-{
-	ETasksPrivate *priv;
-	char *sexp;
-	GList *l;
-	
-	g_return_if_fail (tasks != NULL);
-	g_return_if_fail (E_IS_TASKS (tasks));
-
-	priv = tasks->priv;
-
-	sexp = g_strdup ("(is-completed?)");
-
-	set_status_message (tasks, _("Expunging"));	
-
-	for (l = priv->clients_list; l != NULL; l = l->next) {
-		ECal *client = l->data;
-		GList *objects, *m;
-		gboolean read_only = TRUE;
-		
-		e_cal_is_read_only (client, &read_only, NULL);
-		if (read_only)
-			continue;
-		
-		if (!e_cal_get_object_list (client, sexp, &objects, NULL)) {
-			g_warning (G_STRLOC ": Could not get the objects");
-			
-			continue;
-		}
-		
-		for (m = objects; m; m = m->next) {
-			/* FIXME Better error handling */
-			e_cal_remove_object (client, icalcomponent_get_uid (m->data), NULL);
-		}
-	}
-
-	set_status_message (tasks, NULL);
-
-	g_free (sexp);
-}
-
-/* Callback used from the view collection when we need to display a new view */
-static void
-display_view_cb (GalViewInstance *instance, GalView *view, gpointer data)
-{
-	ETasks *tasks;
-
-	tasks = E_TASKS (data);
-
-	if (GAL_IS_VIEW_ETABLE (view)) {
-		gal_view_etable_attach_table (GAL_VIEW_ETABLE (view), e_table_scrolled_get_table (E_TABLE_SCROLLED (E_CALENDAR_TABLE (tasks->priv->tasks_view)->etable)));
-	}
-
-	gtk_paned_set_position ((GtkPaned *)tasks->priv->paned, calendar_config_get_task_vpane_pos ());
-}
-
-/**
- * e_tasks_setup_view_menus:
- * @tasks: A tasks widget.
- * @uic: UI controller to use for the menus.
- * 
- * Sets up the #GalView menus for a tasks control.  This function should be
- * called from the Bonobo control activation callback for this tasks control.
- * Also, the menus should be discarded using e_tasks_discard_view_menus().
- **/
-void
-e_tasks_setup_view_menus (ETasks *tasks, BonoboUIComponent *uic)
-{
-	ETasksPrivate *priv;
-	GalViewFactory *factory;
-	ETableSpecification *spec;
-	char *dir;
-	static GalViewCollection *collection = NULL;
-
-	g_return_if_fail (tasks != NULL);
-	g_return_if_fail (E_IS_TASKS (tasks));
-	g_return_if_fail (uic != NULL);
-	g_return_if_fail (BONOBO_IS_UI_COMPONENT (uic));
-
-	priv = tasks->priv;
-
-	g_return_if_fail (priv->view_instance == NULL);
-
-	g_assert (priv->view_instance == NULL);
-	g_assert (priv->view_menus == NULL);
-
-	/* Create the view instance */
-
-	if (collection == NULL) {
-		collection = gal_view_collection_new ();
-
-		gal_view_collection_set_title (collection, _("Tasks"));
-
-		dir = g_build_filename (tasks_component_peek_base_directory (tasks_component_peek ()), 
-					"tasks", "views", NULL);		
-		gal_view_collection_set_storage_directories (collection,
-							     EVOLUTION_GALVIEWSDIR "/tasks/",
-							     dir);
-		g_free (dir);
-
-		/* Create the views */
-
-		spec = e_table_specification_new ();
-		e_table_specification_load_from_file (spec, 
-						      EVOLUTION_ETSPECDIR "/e-calendar-table.etspec");
-
-		factory = gal_view_factory_etable_new (spec);
-		g_object_unref (spec);
-		gal_view_collection_add_factory (collection, factory);
-		g_object_unref (factory);
-
-		/* Load the collection and create the menus */
-
-		gal_view_collection_load (collection);
-	}
-
-	priv->view_instance = gal_view_instance_new (collection, NULL);
-
-	priv->view_menus = gal_view_menus_new (priv->view_instance);
-	gal_view_menus_apply (priv->view_menus, uic, NULL);
-	g_signal_connect (priv->view_instance, "display_view", G_CALLBACK (display_view_cb), tasks);
-	display_view_cb (priv->view_instance, gal_view_instance_get_current_view (priv->view_instance), tasks);
-}
-
-/**
- * e_tasks_discard_view_menus:
- * @tasks: A tasks widget.
- * 
- * Discards the #GalView menus used by a tasks control.  This function should be
- * called from the Bonobo control deactivation callback for this tasks control.
- * The menus should have been set up with e_tasks_setup_view_menus().
- **/
-void
-e_tasks_discard_view_menus (ETasks *tasks)
-{
-	ETasksPrivate *priv;
-
-	g_return_if_fail (tasks != NULL);
-	g_return_if_fail (E_IS_TASKS (tasks));
-
-	priv = tasks->priv;
-
-	g_return_if_fail (priv->view_instance != NULL);
-
-	g_assert (priv->view_instance != NULL);
-	g_assert (priv->view_menus != NULL);
-
-	g_object_unref (priv->view_instance);
-	priv->view_instance = NULL;
-
-	g_object_unref (priv->view_menus);
-	priv->view_menus = NULL;
-}
-
-/**
- * e_tasks_get_calendar_table:
- * @tasks: A tasks widget.
- * 
- * Queries the #ECalendarTable contained in a tasks widget.
- * 
- * Return value: The #ECalendarTable that the tasks widget uses to display its
- * information.
- **/
-ECalendarTable *
-e_tasks_get_calendar_table (ETasks *tasks)
-{
-	ETasksPrivate *priv;
-
-	g_return_val_if_fail (tasks != NULL, NULL);
-	g_return_val_if_fail (E_IS_TASKS (tasks), NULL);
-
-	priv = tasks->priv;
-	return E_CALENDAR_TABLE (priv->tasks_view);
-}
diff --git a/calendar/gui/e-tasks.h b/calendar/gui/e-tasks.h
deleted file mode 100644
index 26a8c37984..0000000000
--- a/calendar/gui/e-tasks.h
+++ /dev/null
@@ -1,87 +0,0 @@
-/* -*- Mode: C; indent-tabs-mode: t; c-basic-offset: 8; tab-width: 8 -*- */
-/* e-tasks.h
- *
- * Copyright (C) 2001  Ximian, Inc.
- * Copyright (C) 2001  Ximian, Inc.
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of version 2 of the GNU General Public
- * License as published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * General Public License for more details.
- *
- * You should have received a copy of the GNU General Public
- * License along with this program; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
- *
- * Authors: Federico Mena Quintero <federico@ximian.com>
- *	    Damon Chaplin <damon@ximian.com>
- */
-
-#ifndef _E_TASKS_H_
-#define _E_TASKS_H_
-
-#include <bonobo/bonobo-ui-component.h>
-#include <gtk/gtktable.h>
-#include <libedataserver/e-source.h>
-#include <libecal/e-cal.h>
-#include "e-calendar-table.h"
-
-#define E_TYPE_TASKS            (e_tasks_get_type ())
-#define E_TASKS(obj)            (GTK_CHECK_CAST ((obj), E_TYPE_TASKS, ETasks))
-#define E_TASKS_CLASS(klass)    (GTK_CHECK_CAST_CLASS ((klass), E_TYPE_TASKS, \
-				 ETasksClass))
-#define E_IS_TASKS(obj)         (GTK_CHECK_TYPE ((obj), E_TYPE_TASKS))
-#define E_IS_TASKS_CLASS(klass) (GTK_CHECK_CLASS_TYPE ((klass), E_TYPE_TASKS))
-
-typedef struct _ETasks ETasks;
-typedef struct _ETasksClass ETasksClass;
-typedef struct _ETasksPrivate ETasksPrivate;
-
-struct _ETasks {
-	GtkTable table;
-
-	/* Private data */
-	ETasksPrivate *priv;
-};
-
-struct _ETasksClass {
-	GtkTableClass parent_class;
-
-	/* Notification signals */
-	void (* selection_changed) (ETasks *tasks, int n_selected);
-        void (* source_added)      (ETasks *tasks, ESource *source);
-        void (* source_removed)    (ETasks *tasks, ESource *source);
-};
-
-
-GtkType    e_tasks_get_type        (void);
-GtkWidget *e_tasks_construct       (ETasks *tasks);
-
-GtkWidget *e_tasks_new             (void);
-
-void       e_tasks_set_ui_component  (ETasks            *tasks,
-				      BonoboUIComponent *ui_component);
-
-gboolean   e_tasks_add_todo_source (ETasks *tasks, ESource *source);
-gboolean   e_tasks_remove_todo_source (ETasks *tasks, ESource *source);
-gboolean   e_tasks_set_default_source (ETasks *tasks, ESource *source);
-ECal      *e_tasks_get_default_client    (ETasks *tasks);
-
-void       e_tasks_open_task         (ETasks		*tasks);
-void       e_tasks_new_task          (ETasks            *tasks);
-void       e_tasks_complete_selected (ETasks            *tasks);
-void       e_tasks_delete_selected   (ETasks            *tasks);
-void       e_tasks_delete_completed  (ETasks            *tasks);
-
-
-void e_tasks_setup_view_menus (ETasks *tasks, BonoboUIComponent *uic);
-void e_tasks_discard_view_menus (ETasks *tasks);
-
-ECalendarTable *e_tasks_get_calendar_table (ETasks *tasks);
-
-#endif /* _E_TASKS_H_ */
diff --git a/calendar/gui/e-timezone-entry.c b/calendar/gui/e-timezone-entry.c
deleted file mode 100644
index 4004ae2cb8..0000000000
--- a/calendar/gui/e-timezone-entry.c
+++ /dev/null
@@ -1,344 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-
-/*
- * Author :
- *  Damon Chaplin <damon@ximian.com>
- *
- * Copyright 2001, Ximian, Inc.
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of version 2 of the GNU General Public
- * License as published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
- * USA
- */
-
-/*
- * ETimezoneEntry - a field for setting a timezone. It shows the timezone in
- * a GtkEntry with a '...' button beside it which shows a dialog for changing
- * the timezone. The dialog contains a map of the world with a point for each
- * timezone, and an option menu as an alternative way of selecting the
- * timezone.
- */
-
-#include <config.h>
-#include <gtk/gtkbutton.h>
-#include <gtk/gtkentry.h>
-#include <gtk/gtksignal.h>
-#include <gnome.h>
-#include <widgets/e-timezone-dialog/e-timezone-dialog.h>
-#include <libgnome/gnome-i18n.h>
-#include "e-timezone-entry.h"
-#include <e-util/e-icon-factory.h>
-
-struct _ETimezoneEntryPrivate {
-	/* The current timezone, set in e_timezone_entry_set_timezone()
-	   or from the timezone dialog. Note that we don't copy it or
-	   use a ref count - we assume it is never destroyed for the
-	   lifetime of this widget. */
-	icaltimezone *zone;
-
-	/* This can be set to the default timezone. If the current timezone
-	   setting in the ETimezoneEntry matches this, then the entry field
-	   is hidden. This makes the user interface simpler. */
-	icaltimezone *default_zone;
-
-	GtkWidget *entry;
-	GtkWidget *button;
-};
-
-
-enum {
-  CHANGED,
-  LAST_SIGNAL
-};
-
-static void e_timezone_entry_destroy	(GtkObject	*object);
-
-static gboolean e_timezone_entry_mnemonic_activate (GtkWidget *widget,
-                                                    gboolean   group_cycling);
-static gboolean e_timezone_entry_focus (GtkWidget *widget,
-					GtkDirectionType direction);
-static void on_entry_changed		(GtkEntry	*entry,
-					 ETimezoneEntry *tentry);
-static void on_button_clicked		(GtkWidget	*widget,
-					 ETimezoneEntry	*tentry);
-
-static void e_timezone_entry_set_entry  (ETimezoneEntry *tentry);
-
-
-static guint timezone_entry_signals[LAST_SIGNAL] = { 0 };
-
-G_DEFINE_TYPE (ETimezoneEntry, e_timezone_entry, GTK_TYPE_HBOX);
-
-static void
-e_timezone_entry_class_init		(ETimezoneEntryClass	*class)
-{
-	GtkObjectClass *object_class = (GtkObjectClass *) class;
-	GtkWidgetClass *widget_class = GTK_WIDGET_CLASS (class) ;
- 
-	object_class = (GtkObjectClass*) class;
-
-	widget_class->mnemonic_activate = e_timezone_entry_mnemonic_activate;
-	widget_class->focus = e_timezone_entry_focus;
-	timezone_entry_signals[CHANGED] =
-		gtk_signal_new ("changed",
-				GTK_RUN_LAST,
-				G_TYPE_FROM_CLASS (object_class),
-				GTK_SIGNAL_OFFSET (ETimezoneEntryClass,
-						   changed),
-				gtk_marshal_NONE__NONE,
-				GTK_TYPE_NONE, 0);
-
-
-	object_class->destroy		= e_timezone_entry_destroy;
-
-	class->changed = NULL;
-}
-
-
-static void
-e_timezone_entry_init		(ETimezoneEntry	*tentry)
-{
-	ETimezoneEntryPrivate *priv;
-	GtkWidget *gtk_image;
-	AtkObject *a11y;
-
-	tentry->priv = priv = g_new0 (ETimezoneEntryPrivate, 1);
-
-	priv->zone = NULL;
-	priv->default_zone = NULL;
-
-	priv->entry  = gtk_entry_new ();
-	gtk_entry_set_editable (GTK_ENTRY (priv->entry), FALSE);
-	/*gtk_widget_set_usize (priv->date_entry, 90, 0);*/
-	gtk_box_pack_start (GTK_BOX (tentry), priv->entry, TRUE, TRUE, 6);
-	gtk_widget_show (priv->entry);
-	g_signal_connect (priv->entry, "changed", G_CALLBACK (on_entry_changed), tentry);
-	
-	priv->button = gtk_button_new ();
-	g_signal_connect (priv->button, "clicked", G_CALLBACK (on_button_clicked), tentry);
-	gtk_box_pack_start (GTK_BOX (tentry), priv->button, FALSE, FALSE, 6);
-	gtk_widget_show (priv->button);
-	a11y = gtk_widget_get_accessible (priv->button);
-	if (a11y != NULL) {
-		atk_object_set_name (a11y, _("Timezone Button"));
-	}
-
-	gtk_image = e_icon_factory_get_image ("stock_timezone", E_ICON_SIZE_BUTTON);
-	gtk_container_add (GTK_CONTAINER (priv->button), gtk_image);
-	gtk_widget_show (gtk_image);
-}
-
-
-/**
- * e_timezone_entry_new:
- *
- * Description: Creates a new #ETimezoneEntry widget which can be used
- * to provide an easy to use way for entering dates and times.
- * 
- * Returns: a new #ETimezoneEntry widget.
- */
-GtkWidget *
-e_timezone_entry_new			(void)
-{
-	ETimezoneEntry *tentry;
-
-	tentry = g_object_new (e_timezone_entry_get_type (), NULL);
-
-	GTK_WIDGET_SET_FLAGS (GTK_WIDGET(tentry), GTK_CAN_FOCUS);
-
-	return GTK_WIDGET (tentry);
-}
-
-
-static void
-e_timezone_entry_destroy		(GtkObject	*object)
-{
-	ETimezoneEntry *tentry;
-	ETimezoneEntryPrivate *priv;
-
-	g_return_if_fail (E_IS_TIMEZONE_ENTRY (object));
-
-	tentry = E_TIMEZONE_ENTRY (object);
-	priv = tentry->priv;
-
-	g_free (tentry->priv);
-	tentry->priv = NULL;
-
-	if (GTK_OBJECT_CLASS (e_timezone_entry_parent_class)->destroy)
-		(* GTK_OBJECT_CLASS (e_timezone_entry_parent_class)->destroy) (object);
-}
-
-
-/* The arrow button beside the date field has been clicked, so we show the
-   popup with the ECalendar in. */
-static void
-on_button_clicked		(GtkWidget	*widget,
-				 ETimezoneEntry	*tentry)
-{
-	ETimezoneEntryPrivate *priv;
-	ETimezoneDialog *timezone_dialog;
-	GtkWidget *dialog;
-
-	priv = tentry->priv;
-
-	timezone_dialog = e_timezone_dialog_new ();
-
-	e_timezone_dialog_set_timezone (timezone_dialog, priv->zone);
-
-	dialog = e_timezone_dialog_get_toplevel (timezone_dialog);
-
-	if (gtk_dialog_run (GTK_DIALOG (dialog)) == GTK_RESPONSE_ACCEPT) {
-		priv->zone = e_timezone_dialog_get_timezone (timezone_dialog);
-		e_timezone_entry_set_entry (tentry);
-	}
-
-	g_object_unref (timezone_dialog);
-}
-
-
-static void
-on_entry_changed			(GtkEntry	*entry,
-					 ETimezoneEntry *tentry)
-{
-	gtk_signal_emit (GTK_OBJECT (tentry), timezone_entry_signals[CHANGED]);
-}
-
-
-icaltimezone*
-e_timezone_entry_get_timezone		(ETimezoneEntry	*tentry)
-{
-	ETimezoneEntryPrivate *priv;
-
-	g_return_val_if_fail (E_IS_TIMEZONE_ENTRY (tentry), NULL);
-
-	priv = tentry->priv;
-
-	return priv->zone;
-}
-
-
-void
-e_timezone_entry_set_timezone		(ETimezoneEntry	*tentry,
-					 icaltimezone	*zone)
-{
-	ETimezoneEntryPrivate *priv;
-
-	g_return_if_fail (E_IS_TIMEZONE_ENTRY (tentry));
-
-	priv = tentry->priv;
-
-	priv->zone = zone;
-
-	e_timezone_entry_set_entry (tentry);
-}
-
-
-/* Sets the default timezone. If the current timezone matches this, then the
-   entry field is hidden. This is useful since most people do not use timezones
-   so it makes the user interface simpler. */
-void
-e_timezone_entry_set_default_timezone	(ETimezoneEntry	*tentry,
-					 icaltimezone	*zone)
-{
-	ETimezoneEntryPrivate *priv;
-
-	g_return_if_fail (E_IS_TIMEZONE_ENTRY (tentry));
-
-	priv = tentry->priv;
-
-	priv->default_zone = zone;
-
-	e_timezone_entry_set_entry (tentry);
-}
-
-
-static void
-e_timezone_entry_set_entry (ETimezoneEntry *tentry)
-{
-	ETimezoneEntryPrivate *priv;
-	const char *display_name;
-	char *name_buffer;
-
-	priv = tentry->priv;
-
-	if (priv->zone) {
-		display_name = icaltimezone_get_display_name (priv->zone);
-
-		/* We check if it is one of our builtin timezone
-		   names, in which case we call gettext to translate
-		   it. If it isn't a builtin timezone name, we
-		   don't. */
-		if (icaltimezone_get_builtin_timezone (display_name))
-			display_name = _(display_name);
-	} else
-		display_name = "";
-
-	name_buffer = g_strdup (display_name);
-
-	gtk_entry_set_text (GTK_ENTRY (priv->entry), name_buffer);
-
-	if (!priv->default_zone || (priv->zone != priv->default_zone))
-		gtk_widget_show (priv->entry);
-	else
-		gtk_widget_hide (priv->entry);
-
-	g_free (name_buffer);
-}
-
-
-static gboolean
-e_timezone_entry_mnemonic_activate (GtkWidget *widget,
-                                    gboolean   group_cycling)
-{
-        GtkButton *button = NULL;
-                                                                                                
-        if (GTK_WIDGET_CAN_FOCUS (widget)) {
-                button = GTK_BUTTON (((ETimezoneEntryPrivate *) ((ETimezoneEntry *) widget)->priv)->button);
-                if (button != NULL)
-                        gtk_widget_grab_focus (GTK_WIDGET (button));
-        }
-                                                                                                
-        return TRUE;
-}
-
-static gboolean
-e_timezone_entry_focus (GtkWidget *widget, GtkDirectionType direction)
-{
-	ETimezoneEntry *tentry;
-
-	tentry = E_TIMEZONE_ENTRY (widget);
-
-	if (direction == GTK_DIR_TAB_FORWARD) {
-		if (GTK_WIDGET_HAS_FOCUS (tentry->priv->entry))
-			gtk_widget_grab_focus (tentry->priv->button);
-		else if (GTK_WIDGET_HAS_FOCUS (tentry->priv->button))
-			return FALSE;
-		else if (GTK_WIDGET_VISIBLE (tentry->priv->entry))
-			gtk_widget_grab_focus (tentry->priv->entry);
-		else
-			gtk_widget_grab_focus (tentry->priv->button);
-	} else if (direction == GTK_DIR_TAB_BACKWARD) {
-		if (GTK_WIDGET_HAS_FOCUS (tentry->priv->entry))
-			return FALSE;
-		else if (GTK_WIDGET_HAS_FOCUS (tentry->priv->button)) {
-			if (GTK_WIDGET_VISIBLE (tentry->priv->entry))
-				gtk_widget_grab_focus (tentry->priv->entry);
-			else
-				return FALSE;
-		} else
-			gtk_widget_grab_focus (tentry->priv->button);
-	} else
-		return FALSE;
-	return TRUE;
-}
-
diff --git a/calendar/gui/e-timezone-entry.h b/calendar/gui/e-timezone-entry.h
deleted file mode 100644
index 94a7df9efc..0000000000
--- a/calendar/gui/e-timezone-entry.h
+++ /dev/null
@@ -1,80 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-
-/*
- * Author :
- *  Damon Chaplin <damon@ximian.com>
- *
- * Copyright 2001, Ximian, Inc.
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of version 2 of the GNU General Public
- * License as published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
- * USA
- */
-
-/*
- * ETimezoneEntry - a field for setting a timezone. It shows the timezone in
- * a GtkEntry with a '...' button beside it which shows a dialog for changing
- * the timezone. The dialog contains a map of the world with a point for each
- * timezone, and an option menu as an alternative way of selecting the
- * timezone.
- */
-
-#ifndef __E_TIMEZONE_ENTRY_H_
-#define __E_TIMEZONE_ENTRY_H_ 
-
-#include <gtk/gtkhbox.h>
-#include <libecal/e-cal.h>
- 
-G_BEGIN_DECLS
-
-
-#define E_TYPE_TIMEZONE_ENTRY            (e_timezone_entry_get_type ())
-#define E_TIMEZONE_ENTRY(obj)            (GTK_CHECK_CAST ((obj), E_TYPE_TIMEZONE_ENTRY, ETimezoneEntry))
-#define E_TIMEZONE_ENTRY_CLASS(klass)    (GTK_CHECK_CLASS_CAST ((klass), E_TYPE_TIMEZONE_ENTRY, ETimezoneEntryClass))
-#define E_IS_TIMEZONE_ENTRY(obj)         (GTK_CHECK_TYPE ((obj), E_TYPE_TIMEZONE_ENTRY))
-#define E_IS_TIMEZONE_ENTRY_CLASS(klass) (GTK_CHECK_CLASS_TYPE ((klass), E_TYPE_TIMEZONE_ENTRY))
-
-
-typedef struct _ETimezoneEntry        ETimezoneEntry;
-typedef struct _ETimezoneEntryPrivate ETimezoneEntryPrivate;
-typedef struct _ETimezoneEntryClass   ETimezoneEntryClass;
-
-struct _ETimezoneEntry {
-	GtkHBox hbox;
-
-	/*< private >*/
-	ETimezoneEntryPrivate *priv;
-};
-
-struct _ETimezoneEntryClass {
-	GtkHBoxClass parent_class;
-
-	void (* changed)      (ETimezoneEntry    *tentry);
-};
-
-GType      e_timezone_entry_get_type		(void);
-GtkWidget* e_timezone_entry_new			(void);
-
-icaltimezone*   e_timezone_entry_get_timezone	(ETimezoneEntry	*tentry);
-void		e_timezone_entry_set_timezone	(ETimezoneEntry	*tentry,
-						 icaltimezone	*zone);
-
-/* Sets the default timezone. If the current timezone matches this, then the
-   entry field is hidden. This is useful since most people do not use timezones
-   so it makes the user interface simpler. */
-void	   e_timezone_entry_set_default_timezone(ETimezoneEntry	*tentry,
-						 icaltimezone	*zone);
-
-G_END_DECLS
-
-#endif /* __E_TIMEZONE_ENTRY_H_ */
diff --git a/calendar/gui/e-week-view-config.c b/calendar/gui/e-week-view-config.c
deleted file mode 100644
index e93f44373e..0000000000
--- a/calendar/gui/e-week-view-config.c
+++ /dev/null
@@ -1,320 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-
-/* 
- * Author : 
- *  Rodrigo Moya <rodrigo@ximian.com>
- *
- * Copyright 2003, Ximian, Inc.
- *
- * This program is free software; you can redistribute it and/or 
- * modify it under the terms of version 2 of the GNU General Public 
- * License as published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
- * USA
- */
-
-#include "calendar-config.h"
-#include "e-week-view-config.h"
-
-struct _EWeekViewConfigPrivate {
-	EWeekView *view;
-
-	GList *notifications;
-};
-
-/* Property IDs */
-enum props {
-	PROP_0,
-	PROP_VIEW,
-};
-
-G_DEFINE_TYPE (EWeekViewConfig, e_week_view_config, G_TYPE_OBJECT);
-
-static void
-e_week_view_config_set_property (GObject *object, guint property_id, const GValue *value, GParamSpec *pspec)
-{
-	EWeekViewConfig *view_config;
-	EWeekViewConfigPrivate *priv;
-
-	view_config = E_WEEK_VIEW_CONFIG (object);
-	priv = view_config->priv;
-	
-	switch (property_id) {
-	case PROP_VIEW:
-		e_week_view_config_set_view (view_config, g_value_get_object (value));
-		break;
-	default:
-		G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec);
-		break;
-	}
-}
-
-static void
-e_week_view_config_get_property (GObject *object, guint property_id, GValue *value, GParamSpec *pspec)
-{
-	EWeekViewConfig *view_config;
-	EWeekViewConfigPrivate *priv;
-
-	view_config = E_WEEK_VIEW_CONFIG (object);
-	priv = view_config->priv;
-	
-	switch (property_id) {
-	case PROP_VIEW:
-		g_value_set_object (value, e_week_view_config_get_view (view_config));
-		break;
-	default:
-		G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec);
-		break;
-	}
-}
-
-static void
-e_week_view_config_dispose (GObject *object)
-{
-	EWeekViewConfig *view_config = E_WEEK_VIEW_CONFIG (object);
-	EWeekViewConfigPrivate *priv;
-	
-	priv = view_config->priv;
-
-	e_week_view_config_set_view (view_config, NULL);
-	
-	if (G_OBJECT_CLASS (e_week_view_config_parent_class)->dispose)
-		G_OBJECT_CLASS (e_week_view_config_parent_class)->dispose (object);
-}
-
-static void
-e_week_view_config_finalize (GObject *object)
-{
-	EWeekViewConfig *view_config = E_WEEK_VIEW_CONFIG (object);
-	EWeekViewConfigPrivate *priv;
-	
-	priv = view_config->priv;
-
-	g_free (priv);
-	
-	if (G_OBJECT_CLASS (e_week_view_config_parent_class)->finalize)
-		G_OBJECT_CLASS (e_week_view_config_parent_class)->finalize (object);
-}
-
-static void
-e_week_view_config_class_init (EWeekViewConfigClass *klass)
-{
-	GObjectClass *gobject_class = G_OBJECT_CLASS (klass);
-	GParamSpec *spec;
-	
-	/* Method override */
-	gobject_class->set_property = e_week_view_config_set_property;
-	gobject_class->get_property = e_week_view_config_get_property;
-	gobject_class->dispose = e_week_view_config_dispose;
-	gobject_class->finalize = e_week_view_config_finalize;
-
-	spec = g_param_spec_object ("view", NULL, NULL, e_week_view_get_type (),
-				    G_PARAM_READABLE | G_PARAM_WRITABLE | G_PARAM_CONSTRUCT);
-	g_object_class_install_property (gobject_class, PROP_VIEW, spec);
-}
-
-static void
-e_week_view_config_init (EWeekViewConfig *view_config)
-{
-	view_config->priv = g_new0 (EWeekViewConfigPrivate, 1);
-
-}
-
-EWeekViewConfig *
-e_week_view_config_new (EWeekView *week_view)
-{
-	EWeekViewConfig *view_config;
-	
-	view_config = g_object_new (e_week_view_config_get_type (), "view", week_view, NULL);
-
-	return view_config;
-}
-
-EWeekView *
-e_week_view_config_get_view (EWeekViewConfig *view_config) 
-{
-	EWeekViewConfigPrivate *priv;
-
-	g_return_val_if_fail (view_config != NULL, NULL);
-	g_return_val_if_fail (E_IS_WEEK_VIEW_CONFIG (view_config), NULL);
-
-	priv = view_config->priv;
-	
-	return priv->view;
-}
-
-static void
-set_timezone (EWeekView *week_view) 
-{
-	icaltimezone *zone;
-	
-	zone = calendar_config_get_icaltimezone ();	
-	e_calendar_view_set_timezone (E_CALENDAR_VIEW (week_view), zone);
-}
-
-static void
-timezone_changed_cb (GConfClient *client, guint id, GConfEntry *entry, gpointer data)
-{
-	EWeekViewConfig *view_config = data;
-	EWeekViewConfigPrivate *priv;
-	
-	priv = view_config->priv;
-	
-	set_timezone (priv->view);
-}
-
-static void
-set_week_start (EWeekView *week_view) 
-{
-	int week_start_week;	
-
-	week_start_week = calendar_config_get_week_start_day ();
-
-	/* Convert it to 0 (Mon) to 6 (Sun), which is what we use. */
-	week_start_week = (week_start_week + 6) % 7;
-
-	e_week_view_set_week_start_day (week_view, week_start_week);
-}
-
-static void
-week_start_changed_cb (GConfClient *client, guint id, GConfEntry *entry, gpointer data)
-{
-	EWeekViewConfig *view_config = data;
-	EWeekViewConfigPrivate *priv;
-	
-	priv = view_config->priv;
-	
-	set_week_start (priv->view);
-}
-
-static void
-set_twentyfour_hour (EWeekView *week_view) 
-{
-	gboolean use_24_hour;
-
-	use_24_hour = calendar_config_get_24_hour_format ();
-
-	e_calendar_view_set_use_24_hour_format (E_CALENDAR_VIEW (week_view), use_24_hour);
-}
-
-static void
-twentyfour_hour_changed_cb (GConfClient *client, guint id, GConfEntry *entry, gpointer data)
-{
-	EWeekViewConfig *view_config = data;
-	EWeekViewConfigPrivate *priv;
-	
-	priv = view_config->priv;
-	
-	set_twentyfour_hour (priv->view);
-}
-
-static void
-set_show_event_end (EWeekView *week_view) 
-{
-	gboolean show_event_end;
-
- 	show_event_end = calendar_config_get_show_event_end ();
-
-	e_week_view_set_show_event_end_times (week_view, show_event_end);
-}
-
-static void
-show_event_end_changed_cb (GConfClient *client, guint id, GConfEntry *entry, gpointer data)
-{
-	EWeekViewConfig *view_config = data;
-	EWeekViewConfigPrivate *priv;
-	
-	priv = view_config->priv;
-	
-	set_show_event_end (priv->view);
-}
-
-static void
-set_compress_weekend (EWeekView *week_view) 
-{
-	gboolean compress_weekend;
-
- 	compress_weekend = calendar_config_get_compress_weekend ();
-
-	e_week_view_set_compress_weekend (week_view, compress_weekend);
-}
-
-static void
-compress_weekend_changed_cb (GConfClient *client, guint id, GConfEntry *entry, gpointer data)
-{
-	EWeekViewConfig *view_config = data;
-	EWeekViewConfigPrivate *priv;
-	
-	priv = view_config->priv;
-	
-	set_compress_weekend (priv->view);
-}
-
-void
-e_week_view_config_set_view (EWeekViewConfig *view_config, EWeekView *week_view) 
-{
-	EWeekViewConfigPrivate *priv;
-	guint not;
-	GList *l;
-	
-	g_return_if_fail (view_config != NULL);
-	g_return_if_fail (E_IS_WEEK_VIEW_CONFIG (view_config));
-
-	priv = view_config->priv;
-	
-	if (priv->view) {
-		g_object_unref (priv->view);
-		priv->view = NULL;
-	}
-	
-	for (l = priv->notifications; l; l = l->next)
-		calendar_config_remove_notification (GPOINTER_TO_UINT (l->data));
-
-	g_list_free (priv->notifications);
-	priv->notifications = NULL;
-
-	/* If the new view is NULL, return right now */
-	if (!week_view)
-		return;
-	
-	priv->view = g_object_ref (week_view);
-
-	/* Time zone */
-	set_timezone (week_view);
-	
-	not = calendar_config_add_notification_timezone (timezone_changed_cb, view_config);
-	priv->notifications = g_list_prepend (priv->notifications, GUINT_TO_POINTER (not));
-	
-	/* Week start */
-	set_week_start (week_view);	
-
-	not = calendar_config_add_notification_week_start_day (week_start_changed_cb, view_config);
-	priv->notifications = g_list_prepend (priv->notifications, GUINT_TO_POINTER (not));
-
-	/* 24 Hour format */
-	set_twentyfour_hour (week_view);	
-
-	not = calendar_config_add_notification_24_hour_format (twentyfour_hour_changed_cb, view_config);
-	priv->notifications = g_list_prepend (priv->notifications, GUINT_TO_POINTER (not));	
-
-	/* Show event end */
-	set_show_event_end (week_view);
-
-	not = calendar_config_add_notification_show_event_end (show_event_end_changed_cb, view_config);
-	priv->notifications = g_list_prepend (priv->notifications, GUINT_TO_POINTER (not));
-
-	/* Compress weekend */
-	set_compress_weekend (week_view);
-
-	not = calendar_config_add_notification_compress_weekend (compress_weekend_changed_cb, view_config);
-	priv->notifications = g_list_prepend (priv->notifications, GUINT_TO_POINTER (not));
-}
-
diff --git a/calendar/gui/e-week-view-config.h b/calendar/gui/e-week-view-config.h
deleted file mode 100644
index e37cb0cfc0..0000000000
--- a/calendar/gui/e-week-view-config.h
+++ /dev/null
@@ -1,55 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-/* 
- * Author : 
- *  JP Rosevear <jpr@ximian.com>
- *
- * Copyright 2003, Ximian, Inc.
- *
- * This program is free software; you can redistribute it and/or 
- * modify it under the terms of version 2 of the GNU General Public 
- * License as published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
- * USA
- */
-
-#ifndef _E_WEEK_VIEW_CONFIG_H_
-#define _E_WEEK_VIEW_CONFIG_H_
-
-#include "e-week-view.h"
-
-G_BEGIN_DECLS
-
-#define E_WEEK_VIEW_CONFIG(obj)          GTK_CHECK_CAST (obj, e_week_view_config_get_type (), EWeekViewConfig)
-#define E_WEEK_VIEW_CONFIG_CLASS(klass)  GTK_CHECK_CLASS_CAST (klass, e_week_view_config_get_type (), EWeekViewConfigClass)
-#define E_IS_WEEK_VIEW_CONFIG(obj)       GTK_CHECK_TYPE (obj, e_week_view_config_get_type ())
-        
-typedef struct _EWeekViewConfig        EWeekViewConfig;
-typedef struct _EWeekViewConfigClass   EWeekViewConfigClass;
-typedef struct _EWeekViewConfigPrivate EWeekViewConfigPrivate;
-
-struct _EWeekViewConfig {
-	GObject parent;
-
-	EWeekViewConfigPrivate *priv;
-};
-
-struct _EWeekViewConfigClass {
-	GObjectClass parent_class;
-};
-
-GType          e_week_view_config_get_type (void);
-EWeekViewConfig *e_week_view_config_new (EWeekView *week_view);
-EWeekView *e_week_view_config_get_view (EWeekViewConfig *view_config);
-void e_week_view_config_set_view (EWeekViewConfig *view_config, EWeekView *week_view);
-
-G_END_DECLS
-
-#endif
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 13e2d14142..0000000000
--- a/calendar/gui/e-week-view-event-item.c
+++ /dev/null
@@ -1,983 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-
-/* 
- * Author : 
- *  Damon Chaplin <damon@ximian.com>
- *
- * Copyright 1999, Ximian, Inc.
- * Copyright 2001, Ximian, Inc.
- *
- * This program is free software; you can redistribute it and/or 
- * modify it under the terms of version 2 of the GNU General Public 
- * License as published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public 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.
- */
-
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
-
-#include "e-util/e-categories-config.h"
-#include "e-week-view-event-item.h"
-
-#include <gtk/gtksignal.h>
-#include <gal/e-text/e-text.h>
-
-static void e_week_view_event_item_set_arg	(GtkObject	 *o,
-						 GtkArg		 *arg,
-						 guint		  arg_id);
-static void e_week_view_event_item_update	(GnomeCanvasItem *item,
-						 double		 *affine,
-						 ArtSVP		 *clip_path,
-						 int		  flags);
-static void e_week_view_event_item_draw		(GnomeCanvasItem *item,
-						 GdkDrawable	 *drawable,
-						 int		  x,
-						 int		  y,
-						 int		  width,
-						 int		  height);
-static void e_week_view_draw_time		(EWeekView	*week_view,
-						 GdkDrawable	*drawable,
-						 gint		 time_x,
-						 gint		 time_y,
-						 gint		 hour,
-						 gint		 minute);
-static void e_week_view_event_item_draw_icons	(EWeekViewEventItem *wveitem,
-						 GdkDrawable        *drawable,
-						 gint		     icon_x,
-						 gint		     icon_y,
-						 gint		     x2,
-						 gboolean	     right_align);
-static void e_week_view_event_item_draw_triangle (EWeekViewEventItem *wveitem,
-						  GdkDrawable	     *drawable,
-						  gint		      x,
-						  gint		      y,
-						  gint		      w,
-						  gint		      h);
-static double e_week_view_event_item_point	(GnomeCanvasItem *item,
-						 double		  x,
-						 double		  y,
-						 int		  cx,
-						 int		  cy,
-						 GnomeCanvasItem **actual_item);
-static gint e_week_view_event_item_event	(GnomeCanvasItem *item,
-						 GdkEvent	 *event);
-static gboolean e_week_view_event_item_button_press (EWeekViewEventItem *wveitem,
-						     GdkEvent		*event);
-static gboolean e_week_view_event_item_button_release (EWeekViewEventItem *wveitem,
-						       GdkEvent		  *event);
-static gboolean e_week_view_event_item_double_click (EWeekViewEventItem *wveitem,
-						     GdkEvent		*bevent);
-static ECalendarViewPosition e_week_view_event_item_get_position (EWeekViewEventItem *wveitem,
-							      gdouble x,
-							      gdouble y);
-
-
-/* The arguments we take */
-enum {
-	ARG_0,
-	ARG_EVENT_NUM,
-	ARG_SPAN_NUM
-};
-
-G_DEFINE_TYPE (EWeekViewEventItem, e_week_view_event_item, GNOME_TYPE_CANVAS_ITEM);
-
-static void
-e_week_view_event_item_class_init (EWeekViewEventItemClass *class)
-{
-	GtkObjectClass  *object_class;
-	GnomeCanvasItemClass *item_class;
-
-	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 (e_week_view_event_item_parent_class)->update)
-		(* GNOME_CANVAS_ITEM_CLASS (e_week_view_event_item_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 *gc;
-	gint x1, y1, x2, y2, time_x, time_y;
-	gint icon_x, icon_y, time_width, min_end_time_x, max_icon_x;
-	gint rect_x, rect_w, rect_x2;
-	gboolean one_day_event, editing_span = FALSE;
-	gint start_hour, start_minute, end_hour, end_minute;
-	gboolean draw_start, draw_end;
-	gboolean draw_start_triangle = FALSE, draw_end_triangle = FALSE;
-	GdkRectangle clip_rect;
-	GdkColor bg_color;
-
-#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;
-
-	g_return_if_fail(wveitem->event_num < week_view->events->len);
-
-	event = &g_array_index (week_view->events, EWeekViewEvent,
-				wveitem->event_num);
-
-	g_return_if_fail(event->spans_index + wveitem->span_num < week_view->spans->len);
-
-	span = &g_array_index (week_view->spans, EWeekViewEventSpan,
-			       event->spans_index + wveitem->span_num);
-
-	style = GTK_WIDGET (week_view)->style;
-	gc = week_view->main_gc;
-
-	x1 = canvas_item->x1 - x;
-	y1 = canvas_item->y1 - y;
-	x2 = canvas_item->x2 - x;
-	y2 = canvas_item->y2 - y;
-
-	if (x1 == x2 || y1 == y2)
-		return;
-
-	icon_x = 0;
-	icon_y = y1 + E_WEEK_VIEW_EVENT_BORDER_HEIGHT + E_WEEK_VIEW_ICON_Y_PAD;
-
-	/* Get the start & end times in 24-hour format. */
-	start_hour = event->start_minute / 60;
-	start_minute = event->start_minute % 60;
-	
-	/* Modulo 24 because a midnight end time will be '24' */
-	end_hour = (event->end_minute / 60) % 24;
-	end_minute = event->end_minute % 60;
-
-	time_y = y1 + E_WEEK_VIEW_EVENT_BORDER_HEIGHT
-		+ E_WEEK_VIEW_EVENT_TEXT_Y_PAD;
-
-	time_width = e_week_view_get_time_string_width (week_view);
-
-	one_day_event = e_week_view_is_one_day_event (week_view,
-						      wveitem->event_num);
-	if (one_day_event) {
-		time_x = x1 + E_WEEK_VIEW_EVENT_L_PAD + 1;
-		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;
-
-		if (gdk_color_parse (e_cal_model_get_color_for_component (e_calendar_view_get_model (E_CALENDAR_VIEW (week_view)),
-									  event->comp_data),
-				     &bg_color)) {
-			GdkColormap *colormap;
-
-			colormap = gtk_widget_get_colormap (GTK_WIDGET (week_view));
-			if (gdk_colormap_alloc_color (colormap, &bg_color, TRUE, TRUE))
-				gdk_gc_set_foreground (gc, &bg_color);
-			else
-				gdk_gc_set_foreground (gc, &week_view->colors[E_WEEK_VIEW_COLOR_EVENT_BACKGROUND]);
-		} else
-			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]);
-		gdk_draw_line (drawable, gc, rect_x,  y1 + 1, rect_x + rect_w, y1 + 1);
-		gdk_draw_line (drawable, gc, rect_x,  y2, rect_x + rect_w, y2);
-		gdk_draw_line (drawable, gc, rect_x, y1 + 1, rect_x, y1 + (y2 - (y1 + 1)));
-		gdk_draw_line (drawable, gc, rect_x + rect_w, y1 + 1, rect_x + rect_w, y1 + (y2 - (y1 + 1)));
-
-		/* Draw the start and end times, as required. */
-		switch (week_view->time_format) {
-		case E_WEEK_VIEW_TIME_BOTH_SMALL_MIN:
-		case E_WEEK_VIEW_TIME_BOTH:
-			draw_start = TRUE;
-			draw_end = TRUE;
-			break;
-
-		case E_WEEK_VIEW_TIME_START_SMALL_MIN:
-		case E_WEEK_VIEW_TIME_START:
-			draw_start = TRUE;
-			draw_end = FALSE;
-			break;
-
-		case E_WEEK_VIEW_TIME_NONE:
-			draw_start = FALSE;
-			draw_end = FALSE;
-			break;
-		default:
-			g_assert_not_reached();
-			draw_start = FALSE;
-			draw_end = FALSE;
-			break;
-		}
-
-		if (draw_start) {
-			e_week_view_draw_time (week_view, drawable,
-					       time_x, time_y,
-					       start_hour, start_minute);
-			time_x += time_width;
-		}
-
-		if (draw_end) {
-			time_x += E_WEEK_VIEW_EVENT_TIME_SPACING;
-			e_week_view_draw_time (week_view, drawable,
-					       time_x, time_y,
-					       end_hour, end_minute);
-			time_x += time_width;
-		}
-
-		icon_x = time_x;
-		if (draw_start)
-			icon_x += E_WEEK_VIEW_EVENT_TIME_X_PAD;
-
-		/* Draw the icons. */
-		e_week_view_event_item_draw_icons (wveitem, drawable,
-						   icon_x, icon_y,
-						   x2, FALSE);
-
-	} else {
-		rect_x = x1 + E_WEEK_VIEW_EVENT_L_PAD;
-		rect_w = x2 - x1 - E_WEEK_VIEW_EVENT_L_PAD
-			- E_WEEK_VIEW_EVENT_R_PAD + 1;
-
-		/* Draw the triangles at the start & end, if needed.
-		   They also use the first few pixels at the edge of the
-		   event so we update rect_x & rect_w so we don't draw over
-		   them. */
-		if (event->start < week_view->day_starts[span->start_day]) {
-			draw_start_triangle = TRUE;
-			rect_x += 2;
-			rect_w -= 2;
-		}
-
-		if (event->end > week_view->day_starts[span->start_day
-						      + span->num_days]) {
-			draw_end_triangle = TRUE;
-			rect_w -= 2;
-		}
-
-		if (gdk_color_parse (e_cal_model_get_color_for_component (e_calendar_view_get_model (E_CALENDAR_VIEW (week_view)),
-									  event->comp_data),
-				     &bg_color)) {
-			GdkColormap *colormap;
-
-			colormap = gtk_widget_get_colormap (GTK_WIDGET (week_view));
-			if (gdk_colormap_alloc_color (colormap, &bg_color, TRUE, TRUE))
-				gdk_gc_set_foreground (gc, &bg_color);
-			else
-				gdk_gc_set_foreground (gc, &week_view->colors[E_WEEK_VIEW_COLOR_EVENT_BACKGROUND]);
-		} else
-			gdk_gc_set_foreground (gc, &week_view->colors[E_WEEK_VIEW_COLOR_EVENT_BACKGROUND]);
-		gdk_draw_rectangle (drawable, gc, TRUE, rect_x, y1 + 1, rect_w, y2 - y1 - 1);
-
-		gdk_gc_set_foreground (gc, &week_view->colors[E_WEEK_VIEW_COLOR_EVENT_BORDER]);
-		rect_x2 = rect_x + rect_w - 1;
-		gdk_draw_line (drawable, gc, rect_x,  y1, rect_x2, y1);
-		gdk_draw_line (drawable, gc, rect_x,  y2, rect_x2, y2);
-
-		if (draw_start_triangle) {
-			e_week_view_event_item_draw_triangle (wveitem, drawable, x1 + E_WEEK_VIEW_EVENT_L_PAD + 2, y1, -3, y2 - y1 + 1);
-		} else {
-			gdk_draw_line (drawable, gc, rect_x,  y1, rect_x, y2);
-		}
-
-		if (draw_end_triangle) {
-			e_week_view_event_item_draw_triangle (wveitem, drawable, x2 - E_WEEK_VIEW_EVENT_R_PAD - 2, y1, 3, y2 - y1 + 1);
-		} else {
-			gdk_draw_line (drawable, gc, rect_x2, y1, rect_x2, y2);
-		}
-
-		if (span->text_item && E_TEXT (span->text_item)->editing)
-			editing_span = TRUE;
-
-		/* Draw the start & end times, if they are not on day
-		   boundaries. The start time would always be shown if it was
-		   needed, though it may be clipped as the window shrinks.
-		   The end time is only displayed if there is enough room.
-		   We calculate the minimum position for the end time, which
-		   depends on whether the start time is displayed. If the end
-		   time doesn't fit, then we don't draw it. */
-		min_end_time_x = x1 + E_WEEK_VIEW_EVENT_L_PAD
-			+ E_WEEK_VIEW_EVENT_BORDER_WIDTH
-			+ E_WEEK_VIEW_EVENT_EDGE_X_PAD;
-		if (!editing_span
-		    && event->start > week_view->day_starts[span->start_day]) {
-			time_x = x1 + E_WEEK_VIEW_EVENT_L_PAD
-				+ E_WEEK_VIEW_EVENT_BORDER_WIDTH
-				+ E_WEEK_VIEW_EVENT_EDGE_X_PAD;
-
-			clip_rect.x = x1;
-			clip_rect.y = y1;
-			clip_rect.width = x2 - x1 - E_WEEK_VIEW_EVENT_R_PAD
-				- E_WEEK_VIEW_EVENT_BORDER_WIDTH + 1;
-			clip_rect.height = y2 - y1 + 1;
-			gdk_gc_set_clip_rectangle (gc, &clip_rect);
-
-			gdk_gc_set_foreground (gc, &week_view->colors[E_WEEK_VIEW_COLOR_EVENT_TEXT]);
-
-			e_week_view_draw_time (week_view, drawable,
-					       time_x, time_y,
-					       start_hour, start_minute);
-
-			gdk_gc_set_clip_rectangle (gc, NULL);
-
-			/* We don't want the end time to be drawn over the
-			   start time, so we increase the minimum position. */
-			min_end_time_x += time_width
-				+ E_WEEK_VIEW_EVENT_TIME_X_PAD;
-		}
-
-		max_icon_x = x2 + 1 - E_WEEK_VIEW_EVENT_R_PAD
-			- E_WEEK_VIEW_EVENT_BORDER_WIDTH
-			- E_WEEK_VIEW_EVENT_EDGE_X_PAD;
-
-		if (!editing_span
-		    && event->end < week_view->day_starts[span->start_day
-							 + span->num_days]) {
-			/* Calculate where the end time should be displayed. */
-			time_x = x2 + 1 - E_WEEK_VIEW_EVENT_R_PAD
-				- E_WEEK_VIEW_EVENT_BORDER_WIDTH
-				- E_WEEK_VIEW_EVENT_EDGE_X_PAD
-				- time_width;
-
-			/* Draw the end time, if the position is greater than
-			   the minimum calculated above. */
-			if (time_x >= min_end_time_x) {
-				e_week_view_draw_time (week_view, drawable,
-						       time_x, time_y,
-						       end_hour, end_minute);
-				max_icon_x -= time_width
-					+ E_WEEK_VIEW_EVENT_TIME_X_PAD;
-			}
-		}
-
-		/* Draw the icons. */
-		if (span->text_item
-		    && (week_view->editing_event_num != wveitem->event_num
-			|| week_view->editing_span_num != wveitem->span_num)) {
-			icon_x = span->text_item->x1 - E_WEEK_VIEW_ICON_R_PAD - x;
-			e_week_view_event_item_draw_icons (wveitem, drawable,
-							   icon_x, icon_y,
-							   max_icon_x, TRUE);
-		}
-	}
-}
-
-
-static void
-e_week_view_draw_time	(EWeekView	*week_view,
-			 GdkDrawable	*drawable,
-			 gint		 time_x,
-			 gint		 time_y,
-			 gint		 hour,
-			 gint		 minute)
-{
-	GtkStyle *style;
-	GdkGC *gc;
-	gint hour_to_display, suffix_width;
-	gint time_y_normal_font, time_y_small_font;
-	gchar buffer[128], *suffix;
-	PangoLayout *layout;
-	PangoFontDescription *small_font_desc;
-
-	style = gtk_widget_get_style (GTK_WIDGET (week_view));
-	small_font_desc = week_view->small_font_desc;
-	gc = week_view->main_gc;
-
-	gdk_gc_set_foreground (gc, &week_view->colors[E_WEEK_VIEW_COLOR_EVENT_TEXT]);
-
-	layout = gtk_widget_create_pango_layout (GTK_WIDGET (week_view), NULL);
-
-	time_y_normal_font = time_y_small_font = time_y;
-	if (small_font_desc)
-		time_y_small_font = time_y;
-
-	e_week_view_convert_time_to_display (week_view, hour, &hour_to_display,
-					     &suffix, &suffix_width);
-
-	if (week_view->use_small_font && week_view->small_font_desc) {
-		g_snprintf (buffer, sizeof (buffer), "%2i:%02i",
-			    hour_to_display, minute);
-
-		/* Draw the hour. */
-		if (hour_to_display < 10) {
-			pango_layout_set_text (layout, buffer + 1, 1);
-			gdk_draw_layout (drawable, gc,
-					 time_x + week_view->digit_width,
-					 time_y_normal_font,
-					 layout);
-		} else {
-			pango_layout_set_text (layout, buffer, 2);
-			gdk_draw_layout (drawable, gc,
-					 time_x,
-					 time_y_normal_font,
-					 layout);
-		}
-
-		time_x += week_view->digit_width * 2;
-
-		/* Draw the start minute, in the small font. */
-		pango_layout_set_font_description (layout, week_view->small_font_desc);
-		pango_layout_set_text (layout, buffer + 3, 2);
-		gdk_draw_layout (drawable, gc,
-				 time_x,
-				 time_y_small_font,
-				 layout);
-
-		pango_layout_set_font_description (layout, style->font_desc);
-
-		time_x += week_view->small_digit_width * 2;
-
-		/* Draw the 'am'/'pm' suffix, if 12-hour format. */
-		if (!e_calendar_view_get_use_24_hour_format (E_CALENDAR_VIEW (week_view))) {
-			pango_layout_set_text (layout, suffix, -1);
-			gdk_draw_layout (drawable, gc,
-					 time_x,
-					 time_y_normal_font,
-					 layout);
-		}
-	} else {
-		/* Draw the start time in one go. */
-		g_snprintf (buffer, sizeof (buffer), "%2i:%02i%s",
-			    hour_to_display, minute, suffix);
-		if (hour_to_display < 10) {
-			pango_layout_set_text (layout, buffer + 1, -1);
-			gdk_draw_layout (drawable, gc,
-					 time_x + week_view->digit_width,
-					 time_y_normal_font,
-					 layout);
-		} else {
-			pango_layout_set_text (layout, buffer, -1);
-			gdk_draw_layout (drawable, gc,
-					 time_x,
-					 time_y_normal_font,
-					 layout);
-		}
-
-	}
-
-	g_object_unref (layout);
-}
-
-
-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;
-	ECalComponent *comp;
-	GdkGC *gc;
-	gint num_icons = 0, icon_x_inc;
-	gboolean draw_reminder_icon = FALSE, draw_recurrence_icon = FALSE;
-	gboolean draw_timezone_icon = FALSE, draw_attach_icon = FALSE;
-	GSList *categories_list, *elem;
-
-	week_view = E_WEEK_VIEW (GTK_WIDGET (GNOME_CANVAS_ITEM (wveitem)->canvas)->parent);
-
-	event = &g_array_index (week_view->events, EWeekViewEvent,
-				wveitem->event_num);
-	span = &g_array_index (week_view->spans, EWeekViewEventSpan,
-			       event->spans_index + wveitem->span_num);
-	comp = e_cal_component_new ();
-	e_cal_component_set_icalcomponent (comp, icalcomponent_new_clone (event->comp_data->icalcomp));
-
-	gc = week_view->main_gc;
-
-	if (e_cal_component_has_alarms (comp)) {
-		draw_reminder_icon = TRUE;
-		num_icons++;
-	}
-
-	if (e_cal_component_has_recurrences (comp)) {
-		draw_recurrence_icon = TRUE;
-		num_icons++;
-	}
-	
-	if (e_cal_component_has_attachments (comp)) {
-		draw_attach_icon = TRUE;
-		num_icons++;
-	}
-	
-	if (event->different_timezone) {
-		draw_timezone_icon = TRUE;
-		num_icons++;
-	}
-
-	e_cal_component_get_categories_list (comp, &categories_list);
-	for (elem = categories_list; elem; elem = elem->next) {
-		char *category;
-		GdkPixmap *pixmap = NULL;
-		GdkBitmap *mask = NULL;
-
-		category = (char *) elem->data;
-		if (e_categories_config_get_icon_for (category, &pixmap, &mask))
-			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_mask (gc, NULL);
-		gdk_draw_pixbuf (drawable, gc,
-				 week_view->reminder_icon,
-				 0, 0, icon_x, icon_y,
-				 E_WEEK_VIEW_ICON_WIDTH,
-				 E_WEEK_VIEW_ICON_HEIGHT,
-				 GDK_RGB_DITHER_NORMAL,
-				 0, 0);
-		icon_x += icon_x_inc;
-	}
-
-	if (draw_attach_icon && icon_x + E_WEEK_VIEW_ICON_WIDTH <= x2) {
-		gdk_gc_set_clip_mask (gc, NULL);
-		gdk_draw_pixbuf (drawable, gc,
-				 week_view->attach_icon,
-				 0, 0, icon_x, icon_y,
-				 E_WEEK_VIEW_ICON_WIDTH,
-				 E_WEEK_VIEW_ICON_HEIGHT,
-				 GDK_RGB_DITHER_NORMAL,
-				 0, 0);
-		icon_x += icon_x_inc;
-	}
-	
-	if (draw_recurrence_icon && icon_x + E_WEEK_VIEW_ICON_WIDTH <= x2) {
-		gdk_gc_set_clip_mask (gc, NULL);
-		gdk_draw_pixbuf (drawable, gc,
-				 week_view->recurrence_icon,
-				 0, 0, icon_x, icon_y,
-				 E_WEEK_VIEW_ICON_WIDTH,
-				 E_WEEK_VIEW_ICON_HEIGHT,
-				 GDK_RGB_DITHER_NORMAL,
-				 0, 0);
-		icon_x += icon_x_inc;
-	}
-
-	if (draw_timezone_icon && icon_x + E_WEEK_VIEW_ICON_WIDTH <= x2) {
-		gdk_gc_set_clip_mask (gc, NULL);
-		gdk_draw_pixbuf (drawable, gc,
-				 week_view->timezone_icon,
-				 0, 0, icon_x, icon_y,
-				 E_WEEK_VIEW_ICON_WIDTH,
-				 E_WEEK_VIEW_ICON_HEIGHT,
-				 GDK_RGB_DITHER_NORMAL,
-				 0, 0);
-		icon_x += icon_x_inc;
-	}
-
-	/* draw categories icons */
-	for (elem = categories_list; elem; elem = elem->next) {
-		char *category;
-		GdkPixmap *pixmap = NULL;
-		GdkBitmap *mask = NULL;
-
-		category = (char *) elem->data;
-		if (!e_categories_config_get_icon_for (category, &pixmap, &mask))
-			continue;
-
-		if (icon_x + E_WEEK_VIEW_ICON_WIDTH <= x2) {
-			gdk_gc_set_clip_origin (gc, icon_x, icon_y);
-			if (mask != NULL)
-				gdk_gc_set_clip_mask (gc, mask);
-			gdk_draw_pixmap (drawable, gc,
-					 pixmap,
-					 0, 0, icon_x, icon_y,
-					 E_WEEK_VIEW_ICON_WIDTH,
-					 E_WEEK_VIEW_ICON_HEIGHT);
-			icon_x += icon_x_inc;
-		}
-		gdk_pixmap_unref (pixmap);
-		if (mask != NULL)
-			gdk_bitmap_unref (mask);
-	}
-
-	e_cal_component_free_categories_list (categories_list);
-	g_object_unref(comp);
-
-	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;
-	EWeekViewEvent *event;
-	GdkGC *gc;
-	GdkColor bg_color;
-	GdkPoint points[3];
-	gint c1, c2;
-
-	week_view = E_WEEK_VIEW (GTK_WIDGET (GNOME_CANVAS_ITEM (wveitem)->canvas)->parent);
-
-	event = &g_array_index (week_view->events, EWeekViewEvent,
-				wveitem->event_num);
-
-	gc = week_view->main_gc;
-
-	points[0].x = x;
-	points[0].y = y;
-	points[1].x = x + w;
-	points[1].y = y + (h / 2);
-	points[2].x = x;
-	points[2].y = y + h - 1;
-
-	if (gdk_color_parse (e_cal_model_get_color_for_component (e_calendar_view_get_model (E_CALENDAR_VIEW (week_view)),
-								  event->comp_data),
-			     &bg_color)) {
-		GdkColormap *colormap;
-
-		colormap = gtk_widget_get_colormap (GTK_WIDGET (week_view));
-		if (gdk_colormap_alloc_color (colormap, &bg_color, TRUE, TRUE))
-			gdk_gc_set_foreground (gc, &bg_color);
-		else
-			gdk_gc_set_foreground (gc, &week_view->colors[E_WEEK_VIEW_COLOR_EVENT_BACKGROUND]);
-	} else
-		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_2BUTTON_PRESS:
-		return e_week_view_event_item_double_click (wveitem, event);
-	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;
-	ECalendarViewPosition 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_CALENDAR_VIEW_POS_NONE)
-		return FALSE;
-
-	if (bevent->button.button == 1) {
-		week_view->pressed_event_num = wveitem->event_num;
-		week_view->pressed_span_num = wveitem->span_num;
-
-		/* Ignore clicks on the event while editing. */
-		if (E_TEXT (span->text_item)->editing)
-			return FALSE;
-
-		/* Remember the item clicked and the mouse position,
-		   so we can start a drag if the mouse moves. */
-		week_view->drag_event_x = bevent->button.x;
-		week_view->drag_event_y = bevent->button.y;
-
-		/* FIXME: Remember the day offset from the start of the event.
-		 */
-
-		return TRUE;
-	} else if (bevent->button.button == 3) {
-		if (!GTK_WIDGET_HAS_FOCUS (week_view))
-			gtk_widget_grab_focus (GTK_WIDGET (week_view));
-
-		e_week_view_set_selected_time_range_visible (week_view, event->start, event->end);
-
-		e_week_view_show_popup_menu (week_view,
-					     (GdkEventButton*) bevent,
-					     wveitem->event_num);
-		gtk_signal_emit_stop_by_name (GTK_OBJECT (item->canvas),
-					      "button_press_event");
-
-		return TRUE;
-	}
-
-	return FALSE;
-}
-
-
-static gboolean
-e_week_view_event_item_button_release (EWeekViewEventItem *wveitem,
-				       GdkEvent		  *event)
-{
-	EWeekView *week_view;
-	GnomeCanvasItem *item;
-
-	item = GNOME_CANVAS_ITEM (wveitem);
-
-	week_view = E_WEEK_VIEW (GTK_WIDGET (item->canvas)->parent);
-	g_return_val_if_fail (E_IS_WEEK_VIEW (week_view), FALSE);
-
-#if 0
-	g_print ("In e_week_view_event_item_button_release\n");
-#endif
-
-	if (week_view->pressed_event_num != -1
-	    && week_view->pressed_event_num == wveitem->event_num
-	    && week_view->pressed_span_num == wveitem->span_num) {
-		e_week_view_start_editing_event (week_view,
-						 wveitem->event_num,
-						 wveitem->span_num,
-						 NULL);
-		week_view->pressed_event_num = -1;
-		return TRUE;
-	}
-
-	week_view->pressed_event_num = -1;
-
-	return FALSE;
-}
-
-
-static gboolean
-e_week_view_event_item_double_click (EWeekViewEventItem *wveitem,
-				     GdkEvent		*bevent)
-{
-	EWeekView *week_view;
-	EWeekViewEvent *event;
-	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);
-
-	e_week_view_stop_editing_event (week_view);
-
-	e_calendar_view_edit_appointment (E_CALENDAR_VIEW (week_view), event->comp_data->client, event->comp_data->icalcomp, FALSE);
-
-	return TRUE;
-}
-
-
-static ECalendarViewPosition
-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_CALENDAR_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_CALENDAR_VIEW_POS_NONE;
-
-	/* Support left/right edge for long events only. */
-	if (!e_week_view_is_one_day_event (week_view, wveitem->event_num)) {
-		if (x < item->x1 + E_WEEK_VIEW_EVENT_L_PAD
-		    + E_WEEK_VIEW_EVENT_BORDER_WIDTH
-		    + E_WEEK_VIEW_EVENT_EDGE_X_PAD)
-			return E_CALENDAR_VIEW_POS_LEFT_EDGE;
-
-		if (x >= item->x2 + 1 - E_WEEK_VIEW_EVENT_R_PAD
-		    - E_WEEK_VIEW_EVENT_BORDER_WIDTH
-		    - E_WEEK_VIEW_EVENT_EDGE_X_PAD)
-			return E_CALENDAR_VIEW_POS_RIGHT_EDGE;
-	}
-
-	return E_CALENDAR_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 20cace0132..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@ximian.com>
- *
- * Copyright 1999, Ximian, Inc.
- * Copyright 2001, Ximian, Inc.
- *
- * This program is free software; you can redistribute it and/or 
- * modify it under the terms of version 2 of the GNU General Public 
- * License as published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
- * USA
- */
-#ifndef _E_WEEK_VIEW_EVENT_ITEM_H_
-#define _E_WEEK_VIEW_EVENT_ITEM_H_
-
-#include "e-week-view.h"
-
-#ifdef __cplusplus
-extern "C" {
-#endif /* __cplusplus */
-
-/*
- * EWeekViewEventItem - displays the background, times and icons for an event
- * in the week/month views. A separate EText canvas item is used to display &
- * edit the text.
- */
-
-#define E_WEEK_VIEW_EVENT_ITEM(obj)     (GTK_CHECK_CAST((obj), \
-        e_week_view_event_item_get_type (), EWeekViewEventItem))
-#define E_WEEK_VIEW_EVENT_ITEM_CLASS(k) (GTK_CHECK_CLASS_CAST ((k),\
-	e_week_view_event_item_get_type ()))
-#define E_IS_WEEK_VIEW_EVENT_ITEM(o)    (GTK_CHECK_TYPE((o), \
-	e_week_view_event_item_get_type ()))
-
-typedef struct {
-	GnomeCanvasItem canvas_item;
-
-	/* The event index in the EWeekView events array. */
-	gint event_num;
-
-	/* The span index within the event. */
-	gint span_num;
-} EWeekViewEventItem;
-
-typedef struct {
-	GnomeCanvasItemClass parent_class;
-
-} EWeekViewEventItemClass;
-
-
-GtkType  e_week_view_event_item_get_type      (void);
-
-
-
-#ifdef __cplusplus
-}
-#endif /* __cplusplus */
-
-#endif /* _E_WEEK_VIEW_EVENT_ITEM_H_ */
diff --git a/calendar/gui/e-week-view-layout.c b/calendar/gui/e-week-view-layout.c
deleted file mode 100644
index 4ab1cf1fd9..0000000000
--- a/calendar/gui/e-week-view-layout.c
+++ /dev/null
@@ -1,425 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-
-/*
- * Author :
- *  Damon Chaplin <damon@ximian.com>
- *
- * Copyright 2001, Ximian, Inc.
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of version 2 of the GNU General Public
- * License as published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
- * USA
- */
-
-/*
- * Lays out events for the Week & Month views of the calendar. It is also
- * used for printing.
- */
-
-#include <config.h>
-
-#include "e-week-view-layout.h"
-
-
-static void e_week_view_layout_event	(EWeekViewEvent	*event,
-					 guint8		*grid,
-					 GArray		*spans,
-					 GArray		*old_spans,
-					 gboolean	 multi_week_view,
-					 gint		 weeks_shown,
-					 gboolean	 compress_weekend,
-					 gint		 start_weekday,
-					 time_t		*day_starts,
-					 gint		*rows_per_day);
-static gint e_week_view_find_day	(time_t		 time_to_find,
-					 gboolean	 include_midnight_in_prev_day,
-					 gint		 days_shown,
-					 time_t		*day_starts);
-static gint e_week_view_find_span_end	(gboolean	 multi_week_view,
-					 gboolean	 compress_weekend,
-					 gint		 display_start_day,
-					 gint		 day);
-
-
-GArray*
-e_week_view_layout_events	(GArray		*events,
-				 GArray		*old_spans,
-				 gboolean	 multi_week_view,
-				 gint		 weeks_shown,
-				 gboolean	 compress_weekend,
-				 gint		 start_weekday,
-				 time_t		*day_starts,
-				 gint		*rows_per_day)
-{
-	EWeekViewEvent *event;
-	EWeekViewEventSpan *span;
-	gint num_days, day, event_num, span_num;
-	guint8 *grid;
-	GArray *spans;
-
-	/* This is a temporary 2-d grid which is used to place events.
-	   Each element is 0 if the position is empty, or 1 if occupied.
-	   We allocate the maximum size possible here, assuming that each
-	   event will need its own row. */
-	grid = g_new0 (guint8, E_WEEK_VIEW_MAX_ROWS_PER_CELL * 7
-		       * E_WEEK_VIEW_MAX_WEEKS);
-
-	/* We create a new array of spans, which will replace the old one. */
-	spans = g_array_new (FALSE, FALSE, sizeof (EWeekViewEventSpan));
-
-	/* Clear the number of rows used per day. */
-	num_days = multi_week_view ? weeks_shown * 7 : 7;
-	for (day = 0; day < num_days; day++) {
-		rows_per_day[day] = 0;
-	}
-
-	/* Iterate over the events, finding which weeks they cover, and putting
-	   them in the first free row available. */
-	for (event_num = 0; event_num < events->len; event_num++) {
-		event = &g_array_index (events, EWeekViewEvent, event_num);
-		e_week_view_layout_event (event, grid, spans, old_spans,
-					  multi_week_view,
-					  weeks_shown, compress_weekend,
-					  start_weekday, day_starts,
-					  rows_per_day);
-	}
-
-	/* Free the grid. */
-	g_free (grid);
-
-	/* Destroy the old spans array, destroying any unused canvas items. */
-	if (old_spans) {
-		for (span_num = 0; span_num < old_spans->len; span_num++) {
-			span = &g_array_index (old_spans, EWeekViewEventSpan,
-					       span_num);
-			if (span->background_item)
-				gtk_object_destroy (GTK_OBJECT (span->background_item));
-			if (span->text_item)
-				gtk_object_destroy (GTK_OBJECT (span->text_item));
-		}
-		g_array_free (old_spans, TRUE);
-	}
-
-	return spans;
-}
-
-
-static void
-e_week_view_layout_event	(EWeekViewEvent	*event,
-				 guint8		*grid,
-				 GArray		*spans,
-				 GArray		*old_spans,
-				 gboolean	 multi_week_view,
-				 gint		 weeks_shown,
-				 gboolean	 compress_weekend,
-				 gint		 start_weekday,
-				 time_t		*day_starts,
-				 gint		*rows_per_day)
-{
-	gint start_day, end_day, span_start_day, span_end_day, rows_per_cell;
-	gint free_row, row, day, span_num, spans_index, num_spans, days_shown;
-	EWeekViewEventSpan span, *old_span;
-
-	days_shown = multi_week_view ? weeks_shown * 7 : 7;
-	start_day = e_week_view_find_day (event->start, FALSE, days_shown,
-					  day_starts);
-	end_day = e_week_view_find_day (event->end, TRUE, days_shown,
-					day_starts);
-	start_day = CLAMP (start_day, 0, days_shown - 1);
-	end_day = CLAMP (end_day, 0, days_shown - 1);
-
-#if 0
-	g_print ("In e_week_view_layout_event Start:%i End: %i\n",
-		 start_day, end_day);
-#endif
-
-	/* Iterate through each of the spans of the event, where each span
-	   is a sequence of 1 or more days displayed next to each other. */
-	span_start_day = start_day;
-	rows_per_cell = E_WEEK_VIEW_MAX_ROWS_PER_CELL;
-	span_num = 0;
-	spans_index = spans->len;
-	num_spans = 0;
-	while (span_start_day <= end_day) {
-		span_end_day = e_week_view_find_span_end (multi_week_view,
-							  compress_weekend,
-							  start_weekday,
-							  span_start_day);
-		span_end_day = MIN (span_end_day, end_day);
-#if 0
-		g_print ("  Span start:%i end:%i\n", span_start_day,
-			 span_end_day);
-#endif
-		/* Try each row until we find a free one or we fall off the
-		   bottom of the available rows. */
-		row = 0;
-		free_row = -1;
-		while (free_row == -1 && row < rows_per_cell) {
-			free_row = row;
-			for (day = span_start_day; day <= span_end_day;
-			     day++) {
-				if (grid[day * rows_per_cell + row]) {
-					free_row = -1;
-					break;
-				}
-			}
-			row++;
-		};
-
-		if (free_row != -1) {
-			/* Mark the cells as full. */
-			for (day = span_start_day; day <= span_end_day;
-			     day++) {
-				grid[day * rows_per_cell + free_row] = 1;
-				rows_per_day[day] = MAX (rows_per_day[day],
-							 free_row + 1);
-			}
-#if 0
-			g_print ("  Span start:%i end:%i row:%i\n",
-				 span_start_day, span_end_day, free_row);
-#endif
-			/* Add the span to the array, and try to reuse any
-			   canvas items from the old spans. */
-			span.start_day = span_start_day;
-			span.num_days = span_end_day - span_start_day + 1;
-			span.row = free_row;
-			span.background_item = NULL;
-			span.text_item = NULL;
-			if (event->num_spans > span_num) {
-				old_span = &g_array_index (old_spans, EWeekViewEventSpan, event->spans_index + span_num);
-				span.background_item = old_span->background_item;
-				span.text_item = old_span->text_item;
-				old_span->background_item = NULL;
-				old_span->text_item = NULL;
-			}
-
-			g_array_append_val (spans, span);
-			num_spans++;
-		}
-
-		span_start_day = span_end_day + 1;
-		span_num++;
-	}
-
-	/* Set the event's spans. */
-	event->spans_index = spans_index;
-	event->num_spans = num_spans;
-}
-
-
-/* Finds the day containing the given time.
-   If include_midnight_in_prev_day is TRUE then if the time exactly
-   matches the start of a day the previous day is returned. This is useful
-   when calculating the end day of an event. */
-static gint
-e_week_view_find_day		(time_t		 time_to_find,
-				 gboolean	 include_midnight_in_prev_day,
-				 gint		 days_shown,
-				 time_t		*day_starts)
-{
-	gint day;
-
-	if (time_to_find < day_starts[0])
-		return -1;
-	if (time_to_find > day_starts[days_shown])
-		return days_shown;
-
-	for (day = 1; day <= days_shown; day++) {
-		if (time_to_find <= day_starts[day]) {
-			if (time_to_find == day_starts[day]
-			    && !include_midnight_in_prev_day)
-				return day;
-			return day - 1;
-		}
-	}
-
-	g_assert_not_reached ();
-	return days_shown;
-}
-
-
-/* This returns the last possible day in the same span as the given day.
-   A span is all the days which are displayed next to each other from left to
-   right. In the week view all spans are only 1 day, since Tuesday is below
-   Monday rather than beside it etc. In the month view, if the weekends are not
-   compressed then each week is a span, otherwise we have to break a span up
-   on Saturday, use a separate span for Sunday, and start again on Monday. */
-static gint
-e_week_view_find_span_end	(gboolean	 multi_week_view,
-				 gboolean	 compress_weekend,
-				 gint		 display_start_day,
-				 gint		 day)
-{
-	gint week, col, sat_col, end_col;
-
-	if (multi_week_view) {
-		week = day / 7;
-		col = day % 7;
-
-		/* We default to the last column in the row. */
-		end_col = 6;
-
-		/* If the weekend is compressed we must end any spans on
-		   Saturday and Sunday. */
-		if (compress_weekend) {
-			sat_col = (5 + 7 - display_start_day) % 7;
-			if (col <= sat_col)
-				end_col = sat_col;
-			else if (col == sat_col + 1)
-				end_col = sat_col + 1;
-		}
-
-		return week * 7 + end_col;
-	} else {
-		return day;
-	}
-}
-
-
-void
-e_week_view_layout_get_day_position	(gint		 day,
-					 gboolean	 multi_week_view,
-					 gint		 weeks_shown,
-					 gint		 display_start_day,
-					 gboolean	 compress_weekend,
-					 gint		*day_x,
-					 gint		*day_y,
-					 gint		*rows)
-{
-	gint week, day_of_week, row, col, weekend_col, box, weekend_box;
-
-	*day_x = *day_y = *rows = 0;
-	g_return_if_fail (day >= 0);
-
-	if (multi_week_view) {
-		g_return_if_fail (day < weeks_shown * 7);
-
-		week = day / 7;
-		col = day % 7;
-		day_of_week = (display_start_day + day) % 7;
-		if (compress_weekend && day_of_week >= 5) {
-			/* In the compressed view Saturday is above Sunday and
-			   both have just one row as opposed to 2 for all the
-			   other days. */
-			if (day_of_week == 5) {
-				*day_y = week * 2;
-				*rows = 1;
-			} else {
-				*day_y = week * 2 + 1;
-				*rows = 1;
-				col--;
-			}
-			/* Both Saturday and Sunday are in the same column. */
-			*day_x = col;
-		} else {
-			/* If the weekend is compressed and the day is after
-			   the weekend we have to move back a column. */
-			if (compress_weekend) {
-				/* Calculate where the weekend column is.
-				   Note that 5 is Saturday. */
-				weekend_col = (5 + 7 - display_start_day) % 7;
-				if (col > weekend_col)
-					col--;
-			}
-
-			*day_y = week * 2;
-			*rows = 2;
-			*day_x = col;
-		}
-	} else {
-		g_return_if_fail (day < 7);
-
-		/* Calculate which box to place the day in, from 0-5.
-		   Note that in the week view the weekends are always
-		   compressed and share a box. */
-		box = day;
-		day_of_week = (display_start_day + day) % 7;
-		weekend_box = (5 + 7 - display_start_day) % 7;
-		if (box > weekend_box)
-			box--;
-
-		if (box < 3)
-			*day_x = 0;
-		else
-			*day_x = 1;
-
-		row = (box % 3) * 2;
-		if (day_of_week < 5) {
-			*day_y = row;
-			*rows = 2;
-		} else if (day_of_week == 5) {
-			/* Saturday. */
-			*day_y = row;
-			*rows = 1;
-
-		} else {
-			/* Sunday. */
-			*day_y = row + 1;
-			*rows = 1;
-		}
-	}
-}
-
-
-/* Returns TRUE if the event span is visible or FALSE if it isn't.
-   It also returns the number of days of the span that are visible.
-   Usually this can easily be determined by the start & end days and row of
-   the span, which are set in e_week_view_layout_event(). Though we need a
-   special case for the weekends when they are compressed, since the span may
-   not fit. */
-gboolean
-e_week_view_layout_get_span_position	(EWeekViewEvent *event,
-					 EWeekViewEventSpan *span,
-					 gint		 rows_per_cell,
-					 gint		 rows_per_compressed_cell,
-					 gint		 display_start_day,
-					 gboolean	 multi_week_view,
-					 gboolean	 compress_weekend,
-					 gint		*span_num_days)
-{
-	gint end_day_of_week;
-
-	if (span->row >= rows_per_cell)
-		return FALSE;
-
-	end_day_of_week = (display_start_day + span->start_day
-			   + span->num_days - 1) % 7;
-	*span_num_days = span->num_days;
-	/* Check if the row will not be visible in compressed cells. */
-	if (span->row >= rows_per_compressed_cell) {
-		if (multi_week_view) {
-			if (compress_weekend) {
-				/* If it ends on a Saturday and is 1 day long
-				   we skip it, else we shorten it. If it ends
-				   on a Sunday it must be 1 day long and we
-				   skip it. */
-				if (end_day_of_week == 5) {	   /* Sat */
-					if (*span_num_days == 1) {
-						return FALSE;
-					} else {
-						(*span_num_days)--;
-					}
-				} else if (end_day_of_week == 6) { /* Sun */
-					return FALSE;
-				}
-			}
-		} else {
-			/* All spans are 1 day long in the week view, so we
-			   just skip it. */
-			if (end_day_of_week > 4)
-				return FALSE;
-		}
-	}
-
-	return TRUE;
-}
diff --git a/calendar/gui/e-week-view-layout.h b/calendar/gui/e-week-view-layout.h
deleted file mode 100644
index 2c6d5a29d8..0000000000
--- a/calendar/gui/e-week-view-layout.h
+++ /dev/null
@@ -1,69 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-
-/* 
- * Author : 
- *  Damon Chaplin <damon@ximian.com>
- *
- * Copyright 2001, Ximian, Inc.
- *
- * This program is free software; you can redistribute it and/or 
- * modify it under the terms of version 2 of the GNU General Public 
- * License as published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
- * USA
- */
-#ifndef _E_WEEK_VIEW_LAYOUT_H_
-#define _E_WEEK_VIEW_LAYOUT_H_
-
-#include "e-week-view.h"
-
-#ifdef __cplusplus
-extern "C" {
-#endif /* __cplusplus */
-
-/* I've split these functions away from EWeekView so we can use them for
-   printing. */
-
-GArray* e_week_view_layout_events	(GArray		*events,
-					 GArray		*old_spans,
-					 gboolean	 multi_week_view,
-					 gint		 weeks_shown,
-					 gboolean	 compress_weekend,
-					 gint		 start_weekday,
-					 time_t		*day_starts,
-					 gint		*rows_per_day);
-
-/* Returns which 'cell' in the table the day appears in. Note that most days
-   have a height of 2 rows, but Sat/Sun are sometimes compressed so they have
-   a height of only 1 row. */
-void e_week_view_layout_get_day_position(gint		 day,
-					 gboolean	 multi_week_view,
-					 gint		 weeks_shown,
-					 gint		 display_start_day,
-					 gboolean	 compress_weekend,
-					 gint		*cell_x,
-					 gint		*cell_y,
-					 gint		*rows);
-
-gboolean e_week_view_layout_get_span_position (EWeekViewEvent *event,
-					       EWeekViewEventSpan *span,
-					       gint	 rows_per_cell,
-					       gint	 rows_per_compressed_cell,
-					       gint	 display_start_day,
-					       gboolean	 multi_week_view,
-					       gboolean	 compress_weekend,
-					       gint	*span_num_days);
-
-#ifdef __cplusplus
-}
-#endif /* __cplusplus */
-
-#endif /* _E_WEEK_VIEW_LAYOUT_H_ */
diff --git a/calendar/gui/e-week-view-main-item.c b/calendar/gui/e-week-view-main-item.c
deleted file mode 100644
index e33ec66e3f..0000000000
--- a/calendar/gui/e-week-view-main-item.c
+++ /dev/null
@@ -1,396 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-
-/* 
- * Author : 
- *  Damon Chaplin <damon@ximian.com>
- *
- * Copyright 1999, Ximian, Inc.
- *
- * This program is free software; you can redistribute it and/or 
- * modify it under the terms of version 2 of the GNU General Public 
- * License as published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public 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.
- */
-
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
-
-#include <glib.h>
-#include <libgnome/gnome-i18n.h>
-#include "e-week-view-main-item.h"
-#include "ea-calendar.h"
-
-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);
-
-/* The arguments we take */
-enum {
-	ARG_0,
-	ARG_WEEK_VIEW
-};
-
-G_DEFINE_TYPE (EWeekViewMainItem, e_week_view_main_item, GNOME_TYPE_CANVAS_ITEM);
-
-static void
-e_week_view_main_item_class_init (EWeekViewMainItemClass *class)
-{
-	GtkObjectClass  *object_class;
-	GnomeCanvasItemClass *item_class;
-
-	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;
-
-	/* init the accessibility support for e_week_view_main_item */
- 	e_week_view_main_item_a11y_init ();
-}
-
-
-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 (e_week_view_main_item_parent_class)->update)
-		(* GNOME_CANVAS_ITEM_CLASS (e_week_view_main_item_parent_class)->update) (item, affine, clip_path, flags);
-
-	/* The item covers the entire canvas area. */
-	item->x1 = 0;
-	item->y1 = 0;
-	item->x2 = INT_MAX;
-	item->y2 = INT_MAX;
-}
-
-
-/*
- * DRAWING ROUTINES - functions to paint the canvas item.
- */
-
-static void
-e_week_view_main_item_draw (GnomeCanvasItem  *canvas_item,
-			    GdkDrawable      *drawable,
-			    int		      x,
-			    int		      y,
-			    int		      width,
-			    int		      height)
-{
-	EWeekViewMainItem *wvmitem;
-	EWeekView *week_view;
-	GDate date;
-	gint num_days, day, day_x, day_y, day_w, day_h;
-
-#if 0
-	g_print ("In e_week_view_main_item_draw %i,%i %ix%i\n",
-		 x, y, width, height);
-#endif
-
-	wvmitem = E_WEEK_VIEW_MAIN_ITEM (canvas_item);
-	week_view = wvmitem->week_view;
-	g_return_if_fail (week_view != NULL);
-
-	/* Step through each of the days. */
-	date = week_view->first_day_shown;
-
-	/* If no date has been set, we just use Dec 1999/January 2000. */
-	if (!g_date_valid (&date))
-		g_date_set_dmy (&date, 27, 12, 1999);
-
-	num_days = week_view->multi_week_view ? week_view->weeks_shown * 7 : 7;
-	for (day = 0; day < num_days; day++) {
-		e_week_view_get_day_position (week_view, day,
-					      &day_x, &day_y,
-					      &day_w, &day_h);
-		/* Skip any days which are outside the area. */
-		if (day_x < x + width && day_x + day_w >= x
-		    && day_y < y + height && day_y + day_h >= y) {
-			e_week_view_main_item_draw_day (wvmitem, day, &date,
-							drawable,
-							day_x - x, day_y - y,
-							day_w, day_h);
-		}
-		g_date_add_days (&date, 1);
-	}
-}
-
-
-static void
-e_week_view_main_item_draw_day (EWeekViewMainItem *wvmitem,
-				gint		   day,
-				GDate		  *date,
-				GdkDrawable       *drawable,
-				gint		   x,
-				gint		   y,
-				gint		   width,
-				gint		   height)
-{
-	EWeekView *week_view;
-	GtkStyle *style;
-	GdkGC *gc;
-	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;
-	PangoFontDescription *font_desc;
-	PangoContext *pango_context;
-	PangoFontMetrics *font_metrics;
-	PangoLayout *layout;
-
-#if 0
-	g_print ("Drawing Day:%i at %i,%i\n", day, x, y);
-#endif
-	week_view = wvmitem->week_view;
-	style = gtk_widget_get_style (GTK_WIDGET (week_view));
-	gc = week_view->main_gc;
-
-	/* Set up Pango prerequisites */
-	font_desc = style->font_desc;
-	pango_context = gtk_widget_get_pango_context (GTK_WIDGET (week_view));
-	font_metrics = pango_context_get_metrics (pango_context, font_desc,
-						  pango_context_get_language (pango_context));
-
-	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 +
-		PANGO_PIXELS (pango_font_metrics_get_ascent (font_metrics)) +
-		PANGO_PIXELS (pango_font_metrics_get_descent (font_metrics)) +
-		E_WEEK_VIEW_DATE_LINE_T_PAD;
-
-	/* Draw the background of the day. In the month view odd months are
-	   one color and even months another, so you can easily see when each
-	   month starts (defaults are white for odd - January, March, ... and
-	   light gray for even). In the week view the background is always the
-	   same color, the color used for the odd months in the month view. */
-	if (week_view->multi_week_view && (month % 2 == 0))
-		bg_color = &week_view->colors[E_WEEK_VIEW_COLOR_EVEN_MONTHS];
-	else
-		bg_color = &week_view->colors[E_WEEK_VIEW_COLOR_ODD_MONTHS];
-
-	gdk_gc_set_foreground (gc, bg_color);
-	gdk_draw_rectangle (drawable, gc, TRUE, x, y, width, height);
-
-	/* Draw the lines on the right and bottom of the cell. The canvas is
-	   sized so that the lines on the right & bottom edges will be off the
-	   edge of the canvas, so we don't have to worry about them. */
-	right_edge = x + width - 1;
-	bottom_edge = y + height - 1;
-
-	gdk_gc_set_foreground (gc, &week_view->colors[E_WEEK_VIEW_COLOR_GRID]);
-	gdk_draw_line (drawable, gc,
-		       right_edge, y, right_edge, bottom_edge);
-	gdk_draw_line (drawable, gc,
-		       x, bottom_edge, right_edge, bottom_edge);
-
-	/* If the day is selected, draw the blue background. */
-	selected = TRUE;
-	if (week_view->selection_start_day == -1
-	    || week_view->selection_start_day > day
-	    || week_view->selection_end_day < day)
-		selected = FALSE;
-	if (selected) {
-		if (GTK_WIDGET_HAS_FOCUS (week_view))
-			gdk_gc_set_foreground (gc, &week_view->colors[E_WEEK_VIEW_COLOR_SELECTED]);
-		else
-			gdk_gc_set_foreground (gc, &week_view->colors[E_WEEK_VIEW_COLOR_SELECTED_UNFOCUSSED]);
-
-		if (week_view->multi_week_view) {
-			gdk_draw_rectangle (drawable, gc, TRUE,
-					    x + 2, y + 1,
-					    width - 5,
-					    E_WEEK_VIEW_DATE_T_PAD - 1 +
-					    PANGO_PIXELS (pango_font_metrics_get_ascent (font_metrics)) +
-					    PANGO_PIXELS (pango_font_metrics_get_descent (font_metrics)));
-		} else {
-			gdk_draw_rectangle (drawable, gc, TRUE,
-					    x + 2, y + 1,
-					    width - 5, line_y - y);
-		}
-	}
-	
-	/* Display the date in the top of the cell.
-	   In the week view, display the long format "10 January" in all cells,
-	   or abbreviate it to "10 Jan" or "10" if that doesn't fit.
-	   In the month view, only use the long format for the first cell and
-	   the 1st of each month, otherwise use "10". */
-	show_day_name = FALSE;
-	show_month_name = FALSE;
-	if (!week_view->multi_week_view) {
-		show_day_name = TRUE;
-		show_month_name = TRUE;
-	} else if (day == 0 || day_of_month == 1) {
-		show_month_name = TRUE;
-	}
-
-	/* Now find the longest form of the date that will fit. */
-	max_width = width - 4;
-	format_string = NULL;
-	if (show_day_name) {
-		if (week_view->max_day_width + week_view->digit_width * 2
-		    + week_view->space_width * 2
-		    + week_view->month_widths[month - 1] < max_width)
-			/* strftime format %A = full weekday name, %d = day of
-			   month, %B = full month name. You can change the
-			   order but don't change the specifiers or add
-			   anything. */
-			format_string = _("%A %d %B");
-		else if (week_view->max_abbr_day_width
-			 + week_view->digit_width * 2
-			 + week_view->space_width * 2
-			 + week_view->abbr_month_widths[month - 1] < max_width)
-			/* strftime format %a = abbreviated weekday name,
-			   %d = day of month, %b = abbreviated month name.
-			   You can change the order but don't change the
-			   specifiers or add anything. */
-			format_string = _("%a %d %b");
-	}
-	if (!format_string && show_month_name) {
-		if (week_view->digit_width * 2 + week_view->space_width
-		    + week_view->month_widths[month - 1] < max_width)
-			/* strftime format %d = day of month, %B = full
-			   month name. You can change the order but don't
-			   change the specifiers or add anything. */
-			format_string = _("%d %B");
-		else if (week_view->digit_width * 2 + week_view->space_width
-		    + week_view->abbr_month_widths[month - 1] < max_width)
-			/* strftime format %d = day of month, %b = abbreviated
-			   month name. You can change the order but don't
-			   change the specifiers or add anything. */
-			format_string = _("%d %b");
-	}
-
-	if (selected) {
-		gdk_gc_set_foreground (gc, &week_view->colors[E_WEEK_VIEW_COLOR_DATES_SELECTED]);
-	} else if (week_view->multi_week_view) {
-		struct icaltimetype tt;
-
-		/* Check if we are drawing today */		
-		tt = icaltime_from_timet_with_zone (time (NULL), FALSE,
-						    e_calendar_view_get_timezone (E_CALENDAR_VIEW (week_view)));
-		if (g_date_year (date) == tt.year 
-		    && g_date_month (date) == tt.month
-		    && g_date_day (date) == tt.day)
-			gdk_gc_set_foreground (gc, &week_view->colors[E_WEEK_VIEW_COLOR_TODAY]);
-		else
-			gdk_gc_set_foreground (gc, &week_view->colors[E_WEEK_VIEW_COLOR_DATES]);
-	} else {
-		gdk_gc_set_foreground (gc, &week_view->colors[E_WEEK_VIEW_COLOR_DATES]);
-	}
-
-	g_date_strftime (buffer, sizeof (buffer),
-			 format_string ? format_string : "%d", date);
-
-	layout = gtk_widget_create_pango_layout (GTK_WIDGET (week_view), buffer);
-	pango_layout_get_pixel_size (layout, &date_width, NULL);
-	date_x = x + width - date_width - E_WEEK_VIEW_DATE_R_PAD;
-	date_x = MAX (date_x, x + 1);
-
-	gdk_draw_layout (drawable, gc,
-			 date_x,
-			 y + E_WEEK_VIEW_DATE_T_PAD,
-			 layout);
-	g_object_unref (layout);
-
-	/* Draw the line under the date. */
-	if (!week_view->multi_week_view) {
-		gdk_gc_set_foreground (gc, &week_view->colors[E_WEEK_VIEW_COLOR_GRID]);
-		gdk_draw_line (drawable, gc,
-			       x + E_WEEK_VIEW_DATE_LINE_L_PAD, line_y,
-			       right_edge, line_y);
-	}
-
-	pango_font_metrics_unref (font_metrics);
-}
-
-
-
-
-/* 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 35740479da..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@ximian.com>
- *
- * Copyright 1999, Ximian, Inc.
- * Copyright 2001, Ximian, Inc.
- *
- * This program is free software; you can redistribute it and/or 
- * modify it under the terms of version 2 of the GNU General Public 
- * License as published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public 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 c688cb9025..0000000000
--- a/calendar/gui/e-week-view-titles-item.c
+++ /dev/null
@@ -1,289 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-
-/* 
- * Author : 
- *  Damon Chaplin <damon@ximian.com>
- *
- * Copyright 1999, Ximian, Inc.
- *
- * This program is free software; you can redistribute it and/or 
- * modify it under the terms of version 2 of the GNU General Public 
- * License as published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public 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.
- */
-
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
-
-#include <string.h>
-#include "e-week-view-titles-item.h"
-
-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);
-
-/* The arguments we take */
-enum {
-	ARG_0,
-	ARG_WEEK_VIEW
-};
-
-G_DEFINE_TYPE (EWeekViewTitlesItem, e_week_view_titles_item, GNOME_TYPE_CANVAS_ITEM);
-
-static void
-e_week_view_titles_item_class_init (EWeekViewTitlesItemClass *class)
-{
-	GtkObjectClass  *object_class;
-	GnomeCanvasItemClass *item_class;
-
-	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 (e_week_view_titles_item_parent_class)->update)
-		(* GNOME_CANVAS_ITEM_CLASS (e_week_view_titles_item_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;
-	gint canvas_width, canvas_height, col_width, col, date_width, date_x;
-	gchar buffer[128], *date_format;
-	GDate date;
-	GdkRectangle clip_rect;
-	gboolean long_format;
-	gint weekday;
-	PangoLayout *layout;
-
-#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_get_style (GTK_WIDGET (week_view));
-	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;
-	layout = gtk_widget_create_pango_layout (GTK_WIDGET (week_view), NULL);
-
-	/* Draw the shadow around the dates. */
-	gdk_draw_line (drawable, light_gc,
-		       1 - x, 1 - y,
-		       canvas_width - 2 - x, 1 - y);
-	gdk_draw_line (drawable, light_gc,
-		       1 - x, 2 - y,
-		       1 - x, canvas_height - 1 - y);
-
-	gdk_draw_rectangle (drawable, dark_gc, FALSE,
-			    0 - x, 0 - y,
-			    canvas_width - 1, canvas_height);
-
-	/* Determine the format to use. */
-	col_width = canvas_width / week_view->columns;
-	if (col_width > week_view->max_day_width + 2) {
-	  date_format = "%A";
-	  long_format = TRUE;
-	} else {
-	  date_format = "%a";
-	  long_format = FALSE;
-	}
-
-	/* Shift right one pixel to account for the shadow around the main
-	   canvas. */
-	x--;
-
-	/* Draw the date. Set a clipping rectangle so we don't draw over the
-	   next day. */
-	g_date_clear (&date, 1);
-	/* Note that 20th March 2000 is a Monday. We only care about the
-	   weekday. */
-	weekday = week_view->display_start_day;
-	g_date_set_dmy (&date, 20 + weekday, 3, 2000);
-	for (col = 0; col < week_view->columns; col++) {
-		if (weekday == 5 && week_view->compress_weekend) {
-			g_date_strftime (buffer, 128, "%a/", &date);
-			g_date_add_days (&date, 1);
-			g_date_strftime (buffer + strlen (buffer), 100,
-					 "%a", &date);
-		} else {
-			g_date_strftime (buffer, 128, date_format, &date);
-		}
-
-		clip_rect.x = week_view->col_offsets[col] - x;
-		clip_rect.y = 2 - y;
-		clip_rect.width = week_view->col_widths[col];
-		clip_rect.height = canvas_height - 2;
-		gdk_gc_set_clip_rectangle (fg_gc, &clip_rect);
-
-		if (weekday == 5 && week_view->compress_weekend)
-			date_width = week_view->abbr_day_widths[5]
-				+ week_view->slash_width
-				+ week_view->abbr_day_widths[6];
-		else if (long_format)
-			date_width = week_view->day_widths[weekday];
-		else
-			date_width = week_view->abbr_day_widths[weekday];
-
-		date_x = week_view->col_offsets[col]
-			+ (week_view->col_widths[col] - date_width) / 2;
-		date_x = MAX (date_x, week_view->col_offsets[col]);
-
-		pango_layout_set_text (layout, buffer, -1);
-		gdk_draw_layout (drawable, fg_gc,
-				 date_x - x,
-				 3 - y,
-				 layout);
-
-		gdk_gc_set_clip_rectangle (fg_gc, NULL);
-
-		/* Draw the lines down the left and right of the date cols. */
-		if (col != 0) {
-			gdk_draw_line (drawable, light_gc,
-				       week_view->col_offsets[col] - x,
-				       4 - y,
-				       week_view->col_offsets[col] - x,
-				       canvas_height - 4 - y);
-
-			gdk_draw_line (drawable, dark_gc,
-				       week_view->col_offsets[col] - 1 - x,
-				       4 - y,
-				       week_view->col_offsets[col] - 1 - x,
-				       canvas_height - 4 - y);
-		}
-
-		/* Draw the lines between each column. */
-		if (col != 0) {
-			gdk_draw_line (drawable, style->black_gc,
-				       week_view->col_offsets[col] - x,
-				       canvas_height - y,
-				       week_view->col_offsets[col] - x,
-				       canvas_height - y);
-		}
-
-		if (weekday == 5 && week_view->compress_weekend)
-			weekday += 2;
-		else
-			weekday++;
-
-		weekday = weekday % 7;
-
-		g_date_add_days (&date, 1);
-	}
-
-	g_object_unref (layout);
-}
-
-
-/* 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 77fed506c8..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@ximian.com>
- *
- * Copyright 1999, Ximian, Inc.
- * Copyright 2001, Ximian, Inc.
- *
- * This program is free software; you can redistribute it and/or 
- * modify it under the terms of version 2 of the GNU General Public 
- * License as published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public 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 684d278d84..0000000000
--- a/calendar/gui/e-week-view.c
+++ /dev/null
@@ -1,4081 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-
-/*
- * Authors :
- *  Damon Chaplin <damon@ximian.com>
- *  Rodrigo Moya <rodrigo@ximian.com>
- *
- * Copyright 1999, Ximian, Inc.
- * Copyright 2001, Ximian, Inc.
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of version 2 of the GNU General Public
- * License as published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public 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.
- */
-
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
-
-#include "e-week-view.h"
-#include "ea-calendar.h"
-
-#include <math.h>
-#include <gdk/gdkkeysyms.h>
-#include <gtk/gtkselection.h>
-#include <gtk/gtksignal.h>
-#include <gtk/gtkvscrollbar.h>
-#include <gtk/gtkwindow.h>
-#include <gtk/gtkmain.h>
-#include <libgnome/gnome-i18n.h>
-#include <libgnome/gnome-exec.h>
-#include <libgnome/gnome-util.h>
-#include <gdk-pixbuf/gdk-pixbuf.h>
-#include <libgnomecanvas/gnome-canvas-pixbuf.h>
-#include <gal/e-text/e-text.h>
-#include <gal/widgets/e-canvas-utils.h>
-#include <gal/widgets/e-gui-utils.h>
-#include <gal/widgets/e-unicode.h>
-#include <e-util/e-categories-config.h>
-#include <e-util/e-dialog-utils.h>
-#include "dialogs/delete-comp.h"
-#include "dialogs/delete-error.h"
-#include "dialogs/send-comp.h"
-#include "dialogs/cancel-comp.h"
-#include "dialogs/recur-comp.h"
-#include "comp-util.h"
-#include "itip-utils.h"
-#include <libecal/e-cal-time-util.h>
-#include "calendar-commands.h"
-#include "calendar-config.h"
-#include "print.h"
-#include "goto.h"
-#include "e-cal-model-calendar.h"
-#include "e-week-view-event-item.h"
-#include "e-week-view-layout.h"
-#include "e-week-view-main-item.h"
-#include "e-week-view-titles-item.h"
-#include "misc.h"
-#include <e-util/e-icon-factory.h>
-
-/* Images */
-#include "art/jump.xpm"
-
-#define E_WEEK_VIEW_SMALL_FONT_PTSIZE 7
-
-#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
-
-#define E_WEEK_VIEW_JUMP_BUTTON_NO_FOCUS -1
-
-/* The timeout before we do a layout, so we don't do a layout for each event
-   we get from the server. */
-#define E_WEEK_VIEW_LAYOUT_TIMEOUT	100
-
-typedef struct {
-	EWeekView *week_view;
-	ECalModelComponent *comp_data;
-} AddEventData;
-
-static void e_week_view_destroy (GtkObject *object);
-static void e_week_view_realize (GtkWidget *widget);
-static void e_week_view_set_colors(EWeekView *week_view, 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 gboolean e_week_view_get_next_tab_event (EWeekView *week_view,
-						GtkDirectionType direction,
-						gint current_event_num,
-						gint current_span_num,
-						gint *next_event_num,
-						gint *next_span_num);
-static gboolean e_week_view_focus (GtkWidget *widget,
-				   GtkDirectionType direction);
-static GList *e_week_view_get_selected_events (ECalendarView *cal_view);
-static gboolean e_week_view_get_selected_time_range (ECalendarView *cal_view, time_t *start_time, time_t *end_time);
-static void e_week_view_set_selected_time_range (ECalendarView *cal_view, time_t start_time, time_t end_time);
-static gboolean e_week_view_get_visible_time_range (ECalendarView *cal_view, time_t *start_time, time_t *end_time);
-static void e_week_view_update_query (EWeekView *week_view);
-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_scroll (GtkWidget *widget,
-				       GdkEventScroll *scroll,
-				       EWeekView *week_view);
-static gboolean e_week_view_on_motion (GtkWidget *widget,
-				       GdkEventMotion *event,
-				       EWeekView *week_view);
-static gint e_week_view_convert_position_to_day (EWeekView *week_view,
-						 gint x,
-						 gint y);
-static void e_week_view_update_selection (EWeekView *week_view,
-					  gint day);
-
-static void e_week_view_free_events (EWeekView *week_view);
-static gboolean e_week_view_add_event (ECalComponent *comp,
-				       time_t	  start,
-				       time_t	  end,
-				       gboolean prepend,
-				       gpointer	  data);
-static void e_week_view_check_layout (EWeekView *week_view);
-static void e_week_view_ensure_events_sorted (EWeekView *week_view);
-static void e_week_view_reshape_events (EWeekView *week_view);
-static void e_week_view_reshape_event_span (EWeekView *week_view,
-					    gint event_num,
-					    gint span_num);
-static void e_week_view_recalc_day_starts (EWeekView *week_view,
-					   time_t lower);
-static void e_week_view_on_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_uid (EWeekView	  *week_view,
-						 ECal             *client,
-						 const gchar	  *uid,
-						 const gchar      *rid,
-						 gint		  *event_num_return);
-typedef gboolean (* EWeekViewForeachEventCallback) (EWeekView *week_view,
-						    gint event_num,
-						    gpointer data);
-static void e_week_view_foreach_event (EWeekView *week_view, 
-				       EWeekViewForeachEventCallback callback,
-				       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_event_move (ECalendarView *cal_view, ECalViewMoveDirection direction);
-static gint e_week_view_get_day_offset_of_event (EWeekView *week_view, time_t event_time);
-static void e_week_view_scroll_a_step (EWeekView *week_view, ECalViewMoveDirection direction);
-static void e_week_view_change_event_time (EWeekView *week_view, time_t start_dt, time_t end_dt, gboolean is_all_day);
-static gboolean e_week_view_on_jump_button_event (GnomeCanvasItem *item,
-						  GdkEvent *event,
-						  EWeekView *week_view);
-static gboolean e_week_view_key_press (GtkWidget *widget, GdkEventKey *event);
-static gboolean e_week_view_do_key_press (GtkWidget *widget,
-					  GdkEventKey *event);
-static void e_week_view_move_selection_day (EWeekView *week_view, ECalViewMoveDirection direction);
-static gint e_week_view_get_adjust_days_for_move_up (EWeekView *week_view, gint
-current_day);
-static gint e_week_view_get_adjust_days_for_move_down (EWeekView *week_view,gint current_day);
-static gint e_week_view_get_adjust_days_for_move_left (EWeekView *week_view,gint current_day);
-static gint e_week_view_get_adjust_days_for_move_right (EWeekView *week_view,gint current_day);
-static gboolean e_week_view_popup_menu (GtkWidget *widget);
-
-static gboolean e_week_view_update_event_cb (EWeekView *week_view,
-					     gint event_num,
-					     gpointer data);
-static gboolean e_week_view_remove_event_cb (EWeekView *week_view,
-					     gint event_num,
-					     gpointer data);
-static gboolean e_week_view_recalc_display_start_day	(EWeekView	*week_view);
-
-static void e_week_view_queue_layout (EWeekView *week_view);
-static void e_week_view_cancel_layout (EWeekView *week_view);
-static gboolean e_week_view_layout_timeout_cb (gpointer data);
-
-G_DEFINE_TYPE (EWeekView, e_week_view, E_TYPE_CALENDAR_VIEW);
-
-static void
-e_week_view_class_init (EWeekViewClass *class)
-{
-	GtkObjectClass *object_class;
-	GtkWidgetClass *widget_class;
-	ECalendarViewClass *view_class;
-
-	object_class = (GtkObjectClass *) class;
-	widget_class = (GtkWidgetClass *) class;
-	view_class = (ECalendarViewClass *) 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->popup_menu        = e_week_view_popup_menu;
-	widget_class->expose_event	= e_week_view_expose_event;
-	widget_class->focus             = e_week_view_focus;
-
-	view_class->get_selected_events = e_week_view_get_selected_events;
-	view_class->get_selected_time_range = e_week_view_get_selected_time_range;
-	view_class->set_selected_time_range = e_week_view_set_selected_time_range;
-	view_class->get_visible_time_range = e_week_view_get_visible_time_range;
-
-	/* init the accessibility support for e_week_view */
-	e_week_view_a11y_init ();
-}
-
-static void
-time_range_changed_cb (ECalModel *model, time_t start_time, time_t end_time, gpointer user_data)
-{
-	EWeekView *week_view = E_WEEK_VIEW (user_data);
-	GDate date, base_date;
-	gint day_offset, weekday, week_start_offset;
-	gboolean update_adjustment_value = FALSE;
-
-	g_return_if_fail (E_IS_WEEK_VIEW (week_view));
-
-	time_to_gdate_with_zone (&date, start_time, e_calendar_view_get_timezone (E_CALENDAR_VIEW (week_view)));
-
-	/* Calculate the weekday of the given date, 0 = Mon. */
-	weekday = g_date_weekday (&date) - 1;
-	
-	/* Convert it to an offset from the start of the display. */
-	week_start_offset = (weekday + 7 - week_view->display_start_day) % 7;
-	
-	/* Set the day_offset to the result, so we move back to the
-	   start of the week. */
-	day_offset = week_start_offset;
-
-	/* Calculate the base date, i.e. the first day shown when the
-	   scrollbar adjustment value is 0. */
-	base_date = date;
-	g_date_subtract_days (&base_date, day_offset);
-
-	/* See if we need to update the base date. */
-	if (!g_date_valid (&week_view->base_date)
-	    || week_view->update_base_date) {
-		week_view->base_date = base_date;
-		update_adjustment_value = TRUE;
-	}
-	
-	/* See if we need to update the first day shown. */
-	if (!g_date_valid (&week_view->first_day_shown)
-	    || g_date_compare (&week_view->first_day_shown, &base_date)) {
-		week_view->first_day_shown = base_date;
-		start_time = time_add_day_with_zone (start_time, -day_offset,
-						     e_calendar_view_get_timezone (E_CALENDAR_VIEW (week_view)));
-		start_time = time_day_begin_with_zone (start_time,
-						       e_calendar_view_get_timezone (E_CALENDAR_VIEW (week_view)));
-		e_week_view_recalc_day_starts (week_view, start_time);
-	}
-
-	/* 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);
-
-	/* FIXME Preserve selection if possible */
-	if (week_view->selection_start_day == -1 || 
-	    (week_view->multi_week_view ? week_view->weeks_shown * 7 : 7) <= week_view->selection_start_day)
-		e_week_view_set_selected_time_range (E_CALENDAR_VIEW (week_view), start_time, start_time);
-}
-
-static void
-process_component (EWeekView *week_view, ECalModelComponent *comp_data)
-{
-	gint num_days;
-	ECalComponent *comp = NULL;
-	AddEventData add_event_data;
-	const char *uid, *rid;
-
-	/* If we don't have a valid date set yet, just return. */
-	if (!g_date_valid (&week_view->first_day_shown))
-		return;
-
-	comp = e_cal_component_new ();
-	if (!e_cal_component_set_icalcomponent (comp, icalcomponent_new_clone (comp_data->icalcomp))) {
-		g_object_unref (comp);
-
-		g_message (G_STRLOC ": Could not set icalcomponent on ECalComponent");
-		return;
-	}
-
-	e_cal_component_get_uid (comp, &uid);
-	if (e_cal_component_is_instance (comp))
-		rid = e_cal_component_get_recurid_as_string (comp);
-	else
-		rid = NULL;
-
-	/* Add the object */
-	num_days = week_view->multi_week_view ? week_view->weeks_shown * 7 : 7;
-
-	add_event_data.week_view = week_view;
-	add_event_data.comp_data = comp_data;
-	e_week_view_add_event (comp, comp_data->instance_start, comp_data->instance_end, FALSE, &add_event_data);
-
-	g_object_unref (comp);
-}
-
-static void
-update_row (EWeekView *week_view, int row)
-{
-	ECalModelComponent *comp_data;
-	ECalModel *model;
-
-	model = e_calendar_view_get_model (E_CALENDAR_VIEW (week_view));
-	comp_data = e_cal_model_get_component_at (model, row);
-	g_assert (comp_data != NULL);
-	process_component (week_view, comp_data);
-
-	gtk_widget_queue_draw (week_view->main_canvas);
-	e_week_view_queue_layout (week_view);
-}
-
-static void
-model_row_changed_cb (ETableModel *etm, int row, gpointer user_data)
-{
-	EWeekView *week_view = E_WEEK_VIEW (user_data);
-
-	update_row (week_view, row);
-}
-
-static void
-model_cell_changed_cb (ETableModel *etm, int col, int row, gpointer user_data)
-{
-	EWeekView *week_view = E_WEEK_VIEW (user_data);
-
-	update_row (week_view, row);
-}
-
-static void
-model_rows_inserted_cb (ETableModel *etm, int row, int count, gpointer user_data)
-{
-	EWeekView *week_view = E_WEEK_VIEW (user_data);
-	ECalModel *model;
-	int i;
-
-	model = e_calendar_view_get_model (E_CALENDAR_VIEW (week_view));
-
-	for (i = 0; i < count; i++) {
-		ECalModelComponent *comp_data;
-
-		comp_data = e_cal_model_get_component_at (model, row + i);
-		g_assert (comp_data != NULL);
-		process_component (week_view, comp_data);
-	}
-
-	gtk_widget_queue_draw (week_view->main_canvas);
-	e_week_view_queue_layout (week_view);
-}
-
-static void
-model_rows_deleted_cb (ETableModel *etm, int row, int count, gpointer user_data)
-{
-	EWeekView *week_view = E_WEEK_VIEW (user_data);
-	int i;
-	
-	/* FIXME Stop editing? */
-	
-	for (i = row + count; i > row; i--) {
-		gint event_num;
-		const char *uid, *rid = NULL;
-		ECalModelComponent *comp_data;
-
-		comp_data = e_cal_model_get_component_at (E_CAL_MODEL (etm), i - 1);
-		if (!comp_data)
-			continue;
-
-		uid = icalcomponent_get_uid (comp_data->icalcomp);
-		if (e_cal_util_component_is_instance (comp_data->icalcomp)) {
-			icalproperty *prop;
-
-			prop = icalcomponent_get_first_property (comp_data->icalcomp, ICAL_RECURRENCEID_PROPERTY);
-			if (prop)
-				rid = icaltime_as_ical_string (icalcomponent_get_recurrenceid (comp_data->icalcomp));
-		}
-
-		if (e_week_view_find_event_from_uid (week_view, comp_data->client, uid, rid, &event_num))
-			e_week_view_remove_event_cb (week_view, event_num, NULL);
-	}
-
-	gtk_widget_queue_draw (week_view->main_canvas);
-	e_week_view_queue_layout (week_view);
-}
-
-static void
-timezone_changed_cb (ECalendarView *cal_view, icaltimezone *old_zone,
-		     icaltimezone *new_zone, gpointer user_data)
-{
-	struct icaltimetype tt = icaltime_null_time ();
-	time_t lower;
-	EWeekView *week_view = (EWeekView *) cal_view;
-	
-	g_return_if_fail (E_IS_WEEK_VIEW (week_view));
-
-	/* If we don't have a valid date set yet, just return. */
-	if (!g_date_valid (&week_view->first_day_shown))
-		return;
-
-	/* Recalculate the new start of the first week. We just use exactly
-	   the same time, but with the new timezone. */
-	tt.year = g_date_year (&week_view->first_day_shown);
-	tt.month = g_date_month (&week_view->first_day_shown);
-	tt.day = g_date_day (&week_view->first_day_shown);
-
-	lower = icaltime_as_timet_with_zone (tt, new_zone);
-
-	e_week_view_recalc_day_starts (week_view, lower);
-	e_week_view_update_query (week_view);
-}
-
-static void
-e_week_view_init (EWeekView *week_view)
-{
-	GnomeCanvasGroup *canvas_group;
-	GtkObject *adjustment;
-	GdkPixbuf *pixbuf;
-	ECalModel *model;
-	gint i;
-
-	GTK_WIDGET_SET_FLAGS (week_view, GTK_CAN_FOCUS);
-
-	week_view->query = NULL;
-
-	week_view->events = g_array_new (FALSE, FALSE,
-					 sizeof (EWeekViewEvent));
-	week_view->events_sorted = TRUE;
-	week_view->events_need_layout = FALSE;
-	week_view->events_need_reshape = FALSE;
-
-	week_view->layout_timeout_id = 0;
-
-	week_view->spans = NULL;
-
-	week_view->multi_week_view = FALSE;
-	week_view->update_base_date = TRUE;
-	week_view->weeks_shown = 6;
-	week_view->rows = 6;
-	week_view->columns = 2;
-	week_view->compress_weekend = TRUE;
-	week_view->show_event_end_times = TRUE;
-	week_view->week_start_day = 0;		/* Monday. */
-	week_view->display_start_day = 0;	/* Monday. */
-
-	g_date_clear (&week_view->base_date, 1);
-	g_date_clear (&week_view->first_day_shown, 1);
-
-	week_view->row_height = 10;
-	week_view->rows_per_cell = 1;
-
-	week_view->selection_start_day = -1;
-	week_view->selection_drag_pos = E_WEEK_VIEW_DRAG_NONE;
-
-	week_view->pressed_event_num = -1;
-	week_view->editing_event_num = -1;
-
-	week_view->last_edited_comp_string = NULL;
-
-	week_view->main_gc = NULL;
-
-	/* Create the small font. */
-	week_view->use_small_font = TRUE;
-
-	week_view->small_font_desc =
-		pango_font_description_copy (gtk_widget_get_style (GTK_WIDGET (week_view))->font_desc);
-	pango_font_description_set_size (week_view->small_font_desc,
-					 E_WEEK_VIEW_SMALL_FONT_PTSIZE * PANGO_SCALE);
-
-	/* String to use in 12-hour time format for times in the morning. */
-	week_view->am_string = _("am");
-
-	/* String to use in 12-hour time format for times in the afternoon. */
-	week_view->pm_string = _("pm");
-
-
-	/*
-	 * Titles Canvas. Note that we don't show it is only shown in the
-	 * Month view.
-	 */
-	week_view->titles_canvas = e_canvas_new ();
-	gtk_table_attach (GTK_TABLE (week_view), week_view->titles_canvas,
-			  1, 2, 0, 1, GTK_EXPAND | GTK_FILL, GTK_FILL, 0, 0);
-
-	canvas_group = GNOME_CANVAS_GROUP (GNOME_CANVAS (week_view->titles_canvas)->root);
-
-	week_view->titles_canvas_item =
-		gnome_canvas_item_new (canvas_group,
-				       e_week_view_titles_item_get_type (),
-				       "EWeekViewTitlesItem::week_view", week_view,
-				       NULL);
-
-	/*
-	 * Main Canvas
-	 */
-	week_view->main_canvas = e_canvas_new ();
-	gtk_table_attach (GTK_TABLE (week_view), week_view->main_canvas,
-			  1, 2, 1, 2,
-			  GTK_EXPAND | GTK_FILL, GTK_EXPAND | GTK_FILL, 1, 1);
-	gtk_widget_show (week_view->main_canvas);
-
-	canvas_group = GNOME_CANVAS_GROUP (GNOME_CANVAS (week_view->main_canvas)->root);
-
-	week_view->main_canvas_item =
-		gnome_canvas_item_new (canvas_group,
-				       e_week_view_main_item_get_type (),
-				       "EWeekViewMainItem::week_view", week_view,
-				       NULL);
-
-	g_signal_connect_after (week_view->main_canvas, "button_press_event",
-				G_CALLBACK (e_week_view_on_button_press), week_view);
-	g_signal_connect (week_view->main_canvas, "button_release_event",
-			  G_CALLBACK (e_week_view_on_button_release), week_view);
-	g_signal_connect (week_view->main_canvas, "scroll_event",
-			  G_CALLBACK (e_week_view_on_scroll), week_view);
-	g_signal_connect (week_view->main_canvas, "motion_notify_event",
-			  G_CALLBACK (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);
-
-		g_signal_connect (week_view->jump_buttons[i], "event",
-				  G_CALLBACK (e_week_view_on_jump_button_event), week_view);
-	}
-	week_view->focused_jump_button = E_WEEK_VIEW_JUMP_BUTTON_NO_FOCUS;
-
-	gdk_pixbuf_unref (pixbuf);
-
-	/*
-	 * Scrollbar.
-	 */
-	adjustment = gtk_adjustment_new (0, -52, 52, 1, 1, 1);
-
-	week_view->vscrollbar = gtk_vscrollbar_new (GTK_ADJUSTMENT (adjustment));
-	gtk_table_attach (GTK_TABLE (week_view), week_view->vscrollbar,
-			  2, 3, 1, 2, 0, GTK_EXPAND | GTK_FILL, 0, 0);
-	gtk_widget_show (week_view->vscrollbar);
-
-	/* Create the cursors. */
-	week_view->normal_cursor = gdk_cursor_new (GDK_LEFT_PTR);
-	week_view->move_cursor = gdk_cursor_new (GDK_FLEUR);
-	week_view->resize_width_cursor = gdk_cursor_new (GDK_SB_H_DOUBLE_ARROW);
-	week_view->last_cursor_set = NULL;
-
-	/* Get the model */
-	model = e_calendar_view_get_model (E_CALENDAR_VIEW (week_view));
-	
-	/* connect to ECalModel's signals */
-	g_signal_connect (G_OBJECT (model), "time_range_changed",
-			  G_CALLBACK (time_range_changed_cb), week_view);
-	g_signal_connect (G_OBJECT (model), "model_row_changed",
-			  G_CALLBACK (model_row_changed_cb), week_view);
-	g_signal_connect (G_OBJECT (model), "model_cell_changed",
-			  G_CALLBACK (model_cell_changed_cb), week_view);
-	g_signal_connect (G_OBJECT (model), "model_rows_inserted",
-			  G_CALLBACK (model_rows_inserted_cb), week_view);
-	g_signal_connect (G_OBJECT (model), "model_rows_deleted",
-			  G_CALLBACK (model_rows_deleted_cb), week_view);
-
-	/* connect to ECalendarView's signals */
-	g_signal_connect (G_OBJECT (week_view), "timezone_changed",
-			  G_CALLBACK (timezone_changed_cb), 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 (g_object_new (e_week_view_get_type (), NULL));
-	e_cal_model_set_flags (e_calendar_view_get_model (E_CALENDAR_VIEW (week_view)), E_CAL_MODEL_FLAGS_EXPAND_RECURRENCES);
-	
-	return week_view;
-}
-
-
-static void
-e_week_view_destroy (GtkObject *object)
-{
-	EWeekView *week_view;
-
-	week_view = E_WEEK_VIEW (object);
-
-	e_week_view_cancel_layout (week_view);
-
-	if (week_view->events) {
-		e_week_view_free_events (week_view);
-		g_array_free (week_view->events, TRUE);
-		week_view->events = NULL;
-	}
-
-	if (week_view->query) {
-		g_signal_handlers_disconnect_matched (week_view->query, G_SIGNAL_MATCH_DATA,
-						      0, 0, NULL, NULL, week_view);
-		g_object_unref (week_view->query);
-		week_view->query = NULL;
-	}
-
-	if (week_view->small_font_desc) {
-		pango_font_description_free (week_view->small_font_desc);
-		week_view->small_font_desc = NULL;
-	}
-
-	if (week_view->normal_cursor) {
-		gdk_cursor_unref (week_view->normal_cursor);
-		week_view->normal_cursor = NULL;
-	}
-	if (week_view->move_cursor) {
-		gdk_cursor_unref (week_view->move_cursor);
-		week_view->move_cursor = NULL;
-	}
-	if (week_view->resize_width_cursor) {
-		gdk_cursor_unref (week_view->resize_width_cursor);
-		week_view->resize_width_cursor = NULL;
-	}
-
-	GTK_OBJECT_CLASS (e_week_view_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 (e_week_view_parent_class)->realize)
-		(*GTK_WIDGET_CLASS (e_week_view_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. */
-	e_week_view_set_colors(week_view, widget);
-	
-	gdk_gc_set_colormap (week_view->main_gc, colormap);
-
-	/* Create the pixmaps. */
-	week_view->reminder_icon = e_icon_factory_get_icon ("stock_bell", E_ICON_SIZE_MENU);
-	week_view->recurrence_icon = e_icon_factory_get_icon ("stock_refresh", E_ICON_SIZE_MENU);
-	week_view->timezone_icon = e_icon_factory_get_icon ("stock_timezone", E_ICON_SIZE_MENU);
-	week_view->attach_icon = e_icon_factory_get_icon ("stock_attach", E_ICON_SIZE_MENU);
-}
-
-static void
-e_week_view_set_colors(EWeekView *week_view, GtkWidget *widget)
-{
-	week_view->colors[E_WEEK_VIEW_COLOR_EVEN_MONTHS] = widget->style->base[GTK_STATE_INSENSITIVE];
-	week_view->colors[E_WEEK_VIEW_COLOR_ODD_MONTHS] = widget->style->base[GTK_STATE_NORMAL];
-	week_view->colors[E_WEEK_VIEW_COLOR_EVENT_BACKGROUND] = widget->style->base[GTK_STATE_NORMAL];
-	week_view->colors[E_WEEK_VIEW_COLOR_EVENT_BORDER] = widget->style->dark[GTK_STATE_NORMAL];
-	week_view->colors[E_WEEK_VIEW_COLOR_EVENT_TEXT] = widget->style->text[GTK_STATE_NORMAL];
-	week_view->colors[E_WEEK_VIEW_COLOR_GRID] = widget->style->dark[GTK_STATE_NORMAL];
-	week_view->colors[E_WEEK_VIEW_COLOR_SELECTED] = widget->style->base[GTK_STATE_SELECTED];
-	week_view->colors[E_WEEK_VIEW_COLOR_SELECTED_UNFOCUSSED] = widget->style->bg[GTK_STATE_SELECTED];
-	week_view->colors[E_WEEK_VIEW_COLOR_DATES] = widget->style->text[GTK_STATE_NORMAL];
-	week_view->colors[E_WEEK_VIEW_COLOR_DATES_SELECTED] = widget->style->text[GTK_STATE_SELECTED];
-	week_view->colors[E_WEEK_VIEW_COLOR_TODAY] = widget->style->base[GTK_STATE_SELECTED];
-}
-
-static void
-e_week_view_unrealize (GtkWidget *widget)
-{
-	EWeekView *week_view;
-	GdkColormap *colormap;
-
-	week_view = E_WEEK_VIEW (widget);
-
-	gdk_gc_unref (week_view->main_gc);
-	week_view->main_gc = NULL;
-
-	colormap = gtk_widget_get_colormap (widget);
-	gdk_colormap_free_colors (colormap, week_view->colors, E_WEEK_VIEW_COLOR_LAST);
-
-	g_object_unref (week_view->reminder_icon);
-	week_view->reminder_icon = NULL;
-	g_object_unref (week_view->recurrence_icon);
-	week_view->recurrence_icon = NULL;
-	g_object_unref (week_view->timezone_icon);
-	week_view->timezone_icon = NULL;
-	g_object_unref (week_view->attach_icon);
-	week_view->attach_icon = NULL;
-
-	if (GTK_WIDGET_CLASS (e_week_view_parent_class)->unrealize)
-		(*GTK_WIDGET_CLASS (e_week_view_parent_class)->unrealize)(widget);
-}
-
-static gint
-get_string_width (PangoLayout *layout, const gchar *string)
-{
-	gint width;
-
-	pango_layout_set_text (layout, string, -1);
-	pango_layout_get_pixel_size (layout, &width, NULL);
-	return width;
-}
-
-/* FIXME: This is also needed in e-day-view-time-item.c. We should probably use
- * pango's approximation function, but it needs a language tag. Find out how to
- * get one of those properly. */
-static gint
-get_digit_width (PangoLayout *layout)
-{
-	gint digit;
-	gint max_digit_width = 1;
-
-	for (digit = '0'; digit <= '9'; digit++) {
-		gchar digit_char;
-		gint  digit_width;
-
-		digit_char = digit;
-
-		pango_layout_set_text (layout, &digit_char, 1);
-		pango_layout_get_pixel_size (layout, &digit_width, NULL);
-
-		max_digit_width = MAX (max_digit_width, digit_width);
-	}
-
-	return max_digit_width;
-}
-
-static void
-e_week_view_style_set (GtkWidget *widget,
-		       GtkStyle  *previous_style)
-{
-	EWeekView *week_view;
-	GtkStyle *style;
-	gint day, day_width, max_day_width, max_abbr_day_width;
-	gint month, month_width, max_month_width, max_abbr_month_width;
-	gint span_num;
-	GDate date;
-	gchar buffer[128];
-	PangoFontDescription *font_desc;
-	PangoContext *pango_context;
-	PangoFontMetrics *font_metrics;
-	PangoLayout *layout;
-	EWeekViewEventSpan *span;
-
-	if (GTK_WIDGET_CLASS (e_week_view_parent_class)->style_set)
-		(*GTK_WIDGET_CLASS (e_week_view_parent_class)->style_set)(widget, previous_style);
-
-	week_view = E_WEEK_VIEW (widget);
-	style = gtk_widget_get_style (widget);
-
-	e_week_view_set_colors(week_view, widget);
-	if (week_view->spans) {
-		for (span_num = 0; span_num < week_view->spans->len;
-				span_num++) {
-			span = &g_array_index (week_view->spans,
-					EWeekViewEventSpan, span_num);
-			if (span->text_item){
-				gnome_canvas_item_set (span->text_item,
-						"fill_color_gdk", &widget->style->text[GTK_STATE_NORMAL],
-						NULL);
-			}
-		}
-	}
-
-	/* Set up Pango prerequisites */
-	font_desc = style->font_desc;
-	pango_context = gtk_widget_get_pango_context (widget);
-	font_metrics = pango_context_get_metrics (pango_context, font_desc,
-						  pango_context_get_language (pango_context));
-	layout = pango_layout_new (pango_context);
-
-	/* Recalculate the height of each row based on the font size. */
-	week_view->row_height = PANGO_PIXELS (pango_font_metrics_get_ascent (font_metrics)) +
-		PANGO_PIXELS (pango_font_metrics_get_descent (font_metrics)) +
-		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);
-
-	/* Check that the small font is smaller than the default font.
-	   If it isn't, we won't use it. */
-	if (week_view->small_font_desc) {
-		if (PANGO_PIXELS (pango_font_metrics_get_ascent (font_metrics)) +
-		    PANGO_PIXELS (pango_font_metrics_get_descent (font_metrics))
-		    <= E_WEEK_VIEW_SMALL_FONT_PTSIZE)
-			week_view->use_small_font = FALSE;
-	}
-
-	/* Set the height of the top canvas. */
-	gtk_widget_set_usize (week_view->titles_canvas, -1,
-			      PANGO_PIXELS (pango_font_metrics_get_ascent (font_metrics)) +
-			      PANGO_PIXELS (pango_font_metrics_get_descent (font_metrics)) + 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 = get_string_width (layout, 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 = get_string_width (layout, 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 = get_string_width (layout, 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 = get_string_width (layout, buffer);
-		week_view->abbr_month_widths[month] = month_width;
-		max_abbr_month_width = MAX (max_abbr_month_width, month_width);
-	}
-
-	week_view->space_width = get_string_width (layout, " ");
-	week_view->colon_width = get_string_width (layout, ":");
-	week_view->slash_width = get_string_width (layout, "/");
-	week_view->digit_width = get_digit_width (layout);
-	if (week_view->small_font_desc) {
-		pango_layout_set_font_description (layout, week_view->small_font_desc);
-		week_view->small_digit_width = get_digit_width (layout);
-		pango_layout_set_font_description (layout, style->font_desc);
-	}
-	week_view->max_day_width = max_day_width;
-	week_view->max_abbr_day_width = max_abbr_day_width;
-	week_view->max_month_width = max_month_width;
-	week_view->max_abbr_month_width = max_abbr_month_width;
-
-	week_view->am_string_width = get_string_width (layout,
-						       week_view->am_string);
-	week_view->pm_string_width = get_string_width (layout,
-						       week_view->pm_string);
-
-	g_object_unref (layout);
-	pango_font_metrics_unref (font_metrics);
-}
-
-
-/* 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 (e_week_view_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;
-	GtkStyle *style;
-	gint width, height, time_width;
-	PangoFontDescription *font_desc;
-	PangoContext *pango_context;
-	PangoFontMetrics *font_metrics;
-
-	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);
-	style = gtk_widget_get_style (widget);
-	if (!style)
-		return;
-	font_desc = style->font_desc;
-	if (!font_desc)
-		return;
-
-	pango_context = gtk_widget_get_pango_context (widget);
-	font_metrics = pango_context_get_metrics (pango_context, font_desc,
-						  pango_context_get_language (pango_context));
-
-
-	/* 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 +
-			+ PANGO_PIXELS (pango_font_metrics_get_ascent (font_metrics))
-			+ PANGO_PIXELS (pango_font_metrics_get_descent (font_metrics))
-			+ E_WEEK_VIEW_DATE_B_PAD;
-	} else {
-		week_view->events_y_offset = E_WEEK_VIEW_DATE_T_PAD
-			+ PANGO_PIXELS (pango_font_metrics_get_ascent (font_metrics))
-			+ PANGO_PIXELS (pango_font_metrics_get_descent (font_metrics))
-			+ E_WEEK_VIEW_DATE_LINE_T_PAD + 1
-			+ E_WEEK_VIEW_DATE_LINE_B_PAD;
-	}
-
-	height = week_view->row_heights[0];
-	week_view->rows_per_cell = (height * 2 - week_view->events_y_offset)
-		/ (week_view->row_height + E_WEEK_VIEW_EVENT_Y_SPACING);
-	week_view->rows_per_cell = MIN (week_view->rows_per_cell,
-					E_WEEK_VIEW_MAX_ROWS_PER_CELL);
-
-	week_view->rows_per_compressed_cell =
-		(height - week_view->events_y_offset)
-		/ (week_view->row_height + E_WEEK_VIEW_EVENT_Y_SPACING);
-	week_view->rows_per_compressed_cell = MIN (week_view->rows_per_compressed_cell,
-						   E_WEEK_VIEW_MAX_ROWS_PER_CELL);
-
-	/* Determine which time format to use, based on the width of the cells.
-	   We only allow the time to take up about half of the width. */
-	width = week_view->col_widths[0];
-
-	time_width = e_week_view_get_time_string_width (week_view);
-
-	week_view->time_format = E_WEEK_VIEW_TIME_NONE;
-	if (week_view->use_small_font && week_view->small_font_desc) {
-		if (week_view->show_event_end_times
-		    && width / 2 > time_width * 2 + E_WEEK_VIEW_EVENT_TIME_SPACING)
-			week_view->time_format = E_WEEK_VIEW_TIME_BOTH_SMALL_MIN;
-		else if (width / 2 > time_width)
-			week_view->time_format = E_WEEK_VIEW_TIME_START_SMALL_MIN;
-	} else {
-		if (week_view->show_event_end_times
-		    && width / 2 > time_width * 2 + E_WEEK_VIEW_EVENT_TIME_SPACING)
-			week_view->time_format = E_WEEK_VIEW_TIME_BOTH;
-		else if (width / 2 > time_width)
-			week_view->time_format = E_WEEK_VIEW_TIME_START;
-	}
-
-	pango_font_metrics_unref (font_metrics);
-}
-
-
-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 (e_week_view_parent_class)->expose_event)
-		(*GTK_WIDGET_CLASS (e_week_view_parent_class)->expose_event)(widget, event);
-
-	return FALSE;
-}
-
-/**
- * e_week_view_get_next_tab_event
- * @week_view: the week_view widget operate on
- * @direction: GTK_DIR_TAB_BACKWARD or GTK_DIR_TAB_FORWARD.
- * @current_event_num and @current_span_num: current status.
- * @next_event_num: the event number focus should go next.
- *                  -1 indicates focus should go to week_view widget.
- * @next_span_num: always return 0.
- **/
-static gboolean
-e_week_view_get_next_tab_event (EWeekView *week_view,
-				GtkDirectionType direction,
-				gint current_event_num,
-				gint current_span_num,
-				gint *next_event_num,
-				gint *next_span_num)
-{
-	gint event_num;
-
-	g_return_val_if_fail (week_view != NULL, FALSE);
-	g_return_val_if_fail (next_event_num != NULL, FALSE);
-	g_return_val_if_fail (next_span_num != NULL, FALSE);
-
-	if (week_view->events->len <= 0)
-		return FALSE;
-
-	/* we only tab through events not spans */
-	*next_span_num = 0;
-
-	switch (direction) {
-	case GTK_DIR_TAB_BACKWARD:
-		event_num = current_event_num - 1;
-		break;
-	case GTK_DIR_TAB_FORWARD:
-		event_num = current_event_num + 1;
-		break;
-	default:
-		return FALSE;
-	}
-
-	if (event_num == -1)
-		/* backward, out of event range, go to week view widget
-		 */
-		*next_event_num = -1;
-	else if (event_num < -1)
-		/* backward from week_view, go to the last event
-		 */
-		*next_event_num = week_view->events->len - 1;
-	else if (event_num >= week_view->events->len)
-		/* forward, out of event range, go to week view widget
-		 */
-		*next_event_num = -1;
-	else
-		*next_event_num = event_num;
-	return TRUE;
-}
-
-static gboolean
-e_week_view_focus (GtkWidget *widget, GtkDirectionType direction)
-{
-	EWeekView *week_view;
-	gint new_event_num;
-	gint new_span_num;
-	gint event_loop;
-	gboolean editable = FALSE;
-	static gint last_focus_event_num = -1, last_focus_span_num = -1;
-
-	g_return_val_if_fail (widget != NULL, FALSE);
-	g_return_val_if_fail (E_IS_WEEK_VIEW (widget), FALSE);
-
-	week_view = E_WEEK_VIEW (widget);
-
-	e_week_view_check_layout (week_view);
-
-	if (week_view->focused_jump_button == E_WEEK_VIEW_JUMP_BUTTON_NO_FOCUS) {
-		last_focus_event_num = week_view->editing_event_num;
-		last_focus_span_num = week_view->editing_span_num;
-	}
-
-	for (event_loop = 0; event_loop < week_view->events->len;
-	     ++event_loop) {
-		if (!e_week_view_get_next_tab_event (week_view, direction,
-						     last_focus_event_num,
-						     last_focus_span_num,
-						     &new_event_num,
-						     &new_span_num))
-			return FALSE;
-
-		if (new_event_num == -1) {
-			/* focus should go to week_view widget
-			 */
-			gtk_widget_grab_focus (widget);
-			return TRUE;
-		}
-
-		editable = e_week_view_start_editing_event (week_view,
-							    new_event_num,
-							    new_span_num,
-							    NULL);
-		last_focus_event_num = new_event_num;
-		last_focus_span_num = new_span_num;
-
-		if (editable)
-			break;
-		else {
-			/* check if we should go to the jump button */
-
-			EWeekViewEvent *event;
-			EWeekViewEventSpan *span;
-			gint current_day;
-
-			event = &g_array_index (week_view->events,
-						EWeekViewEvent,
-						new_event_num);
-			span = &g_array_index (week_view->spans,
-					       EWeekViewEventSpan,
-					       event->spans_index + new_span_num);
-			current_day = span->start_day;
-
-			if ((week_view->focused_jump_button != current_day) &&
-			    e_week_view_is_jump_button_visible(week_view, current_day)) {
-
-				/* focus go to the jump button */
-				e_week_view_stop_editing_event (week_view);
-				gnome_canvas_item_grab_focus (week_view->jump_buttons[current_day]);
-				return TRUE;
-			}
-		}
-	}
-	return editable;
-}
-
-/* Returns the currently-selected event, or NULL if none */
-static GList *
-e_week_view_get_selected_events (ECalendarView *cal_view)
-{
-	EWeekViewEvent *event = NULL;
-	GList *list = NULL;
-	EWeekView *week_view = (EWeekView *) cal_view;
-
-	g_return_val_if_fail (E_IS_WEEK_VIEW (week_view), NULL);
-
-	if (week_view->editing_event_num != -1) {
-		event = &g_array_index (week_view->events, EWeekViewEvent,
-					week_view->editing_event_num);
-	} else if (week_view->popup_event_num != -1) {
-		event = &g_array_index (week_view->events, EWeekViewEvent,
-					week_view->popup_event_num);
-	}
-
-	if (event)
-		list = g_list_prepend (list, event);
-
-	return list;
-}
-
-/* Restarts a query for the week view */
-static void
-e_week_view_update_query (EWeekView *week_view)
-{
-	gint rows, r;
-
-	gtk_widget_queue_draw (week_view->main_canvas);
-	e_week_view_free_events (week_view);
-	e_week_view_queue_layout (week_view);
-
-	rows = e_table_model_row_count (E_TABLE_MODEL (e_calendar_view_get_model (E_CALENDAR_VIEW (week_view))));
-	for (r = 0; r < rows; r++) {
-		ECalModelComponent *comp_data;
-
-		comp_data = e_cal_model_get_component_at (e_calendar_view_get_model (E_CALENDAR_VIEW (week_view)), r);
-		g_assert (comp_data != NULL);
-		process_component (week_view, comp_data);
-	}
-}
-
-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);
-}
-
-/* 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. */
-static void
-e_week_view_set_selected_time_range	(ECalendarView	*cal_view,
-					 time_t		 start_time,
-					 time_t		 end_time)
-{
-	GDate date, end_date;
-	gint num_days;
-	gboolean update_adjustment_value = FALSE;
-	EWeekView *week_view = E_WEEK_VIEW (cal_view);
-
-	g_return_if_fail (E_IS_WEEK_VIEW (week_view));
-
-	time_to_gdate_with_zone (&date, start_time, e_calendar_view_get_timezone (E_CALENDAR_VIEW (week_view)));
-
-	/* Set the selection to the given days. */
-	week_view->selection_start_day = g_date_julian (&date)
-		- g_date_julian (&week_view->base_date);
-	if (end_time == start_time
-	    || end_time <= time_add_day_with_zone (start_time, 1,
-						   e_calendar_view_get_timezone (E_CALENDAR_VIEW (week_view))))
-		week_view->selection_end_day = week_view->selection_start_day;
-	else {
-		time_to_gdate_with_zone (&end_date, end_time - 60, e_calendar_view_get_timezone (E_CALENDAR_VIEW (week_view)));
-		week_view->selection_end_day = g_date_julian (&end_date)
-			- g_date_julian (&week_view->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);
-}
-
-void
-e_week_view_set_selected_time_range_visible	(EWeekView	*week_view,
-						 time_t		 start_time,
-						 time_t		 end_time)
-{
-	GDate date, end_date;
-	gint num_days;
-
-	g_return_if_fail (E_IS_WEEK_VIEW (week_view));
-
-	time_to_gdate_with_zone (&date, start_time, e_calendar_view_get_timezone (E_CALENDAR_VIEW (week_view)));
-	
-	/* Set the selection to the given days. */
-	week_view->selection_start_day = g_date_julian (&date)
-		- g_date_julian (&week_view->first_day_shown);
-	if (end_time == start_time
-	    || end_time <= time_add_day_with_zone (start_time, 1,
-						   e_calendar_view_get_timezone (E_CALENDAR_VIEW (week_view))))
-		week_view->selection_end_day = week_view->selection_start_day;
-	else {
-		time_to_gdate_with_zone (&end_date, end_time - 60, e_calendar_view_get_timezone (E_CALENDAR_VIEW (week_view)));
-		week_view->selection_end_day = g_date_julian (&end_date)
-			- g_date_julian (&week_view->first_day_shown);
-	}
-
-	/* 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);
-
-	gtk_widget_queue_draw (week_view->main_canvas);
-}
-
-
-/* Returns the selected time range. */
-static gboolean
-e_week_view_get_selected_time_range	(ECalendarView	*cal_view,
-					 time_t		*start_time,
-					 time_t		*end_time)
-{
-	gint start_day, end_day;
-	EWeekView *week_view = E_WEEK_VIEW (cal_view);
-
-	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];
-
-	return  TRUE;
-}
-
-/* Gets the visible time range. Returns FALSE if no time range has been set. */
-static gboolean
-e_week_view_get_visible_time_range	(ECalendarView	*cal_view,
-					 time_t		*start_time,
-					 time_t		*end_time)
-{
-	gint num_days;
-	EWeekView *week_view = E_WEEK_VIEW (cal_view);
-
-	/* If we don't have a valid date set yet, return FALSE. */
-	if (!g_date_valid (&week_view->first_day_shown))
-		return FALSE;
-
-	num_days = week_view->multi_week_view ? week_view->weeks_shown * 7 : 7;
-	*start_time = week_view->day_starts[0];
-	*end_time = week_view->day_starts[num_days];
-
-	return TRUE;
-}
-
-
-/* Note that the returned date may be invalid if no date has been set yet. */
-void
-e_week_view_get_first_day_shown		(EWeekView	*week_view,
-					 GDate		*date)
-{
-	*date = week_view->first_day_shown;
-}
-
-
-/* This sets the first day shown in the view. It will be rounded down to the
-   nearest week. */
-void
-e_week_view_set_first_day_shown		(EWeekView	*week_view,
-					 GDate		*date)
-{
-	GDate base_date;
-	gint weekday, day_offset, num_days;
-	gboolean update_adjustment_value = FALSE;
-	guint32 old_selection_start_julian = 0, old_selection_end_julian = 0;
-	struct icaltimetype start_tt = icaltime_null_time ();
-	time_t start_time;
-
-	g_return_if_fail (E_IS_WEEK_VIEW (week_view));
-
-	/* Calculate the old selection range. */
-	if (week_view->selection_start_day != -1) {
-		old_selection_start_julian =
-			g_date_julian (&week_view->base_date)
-			+ week_view->selection_start_day;
-		old_selection_end_julian =
-			g_date_julian (&week_view->base_date)
-			+ week_view->selection_end_day;
-	}
-
-	/* Calculate the weekday of the given date, 0 = Mon. */
-	weekday = g_date_weekday (date) - 1;
-
-	/* Convert it to an offset from the start of the display. */
-	day_offset = (weekday + 7 - week_view->display_start_day) % 7;
-
-	/* Calculate the base date, i.e. the first day shown when the
-	   scrollbar adjustment value is 0. */
-	base_date = *date;
-	g_date_subtract_days (&base_date, day_offset);
-
-	/* See if we need to update the base date. */
-	if (!g_date_valid (&week_view->base_date)
-	    || g_date_compare (&week_view->base_date, &base_date)) {
-		week_view->base_date = base_date;
-		update_adjustment_value = TRUE;
-	}
-
-	/* See if we need to update the first day shown. */
-	if (!g_date_valid (&week_view->first_day_shown)
-	    || g_date_compare (&week_view->first_day_shown, &base_date)) {
-		week_view->first_day_shown = base_date;
-
-		start_tt.year = g_date_year (&base_date);
-		start_tt.month = g_date_month (&base_date);
-		start_tt.day = g_date_day (&base_date);
-
-		start_time = icaltime_as_timet_with_zone (start_tt,
-							  e_calendar_view_get_timezone (E_CALENDAR_VIEW (week_view)));
-
-		e_week_view_recalc_day_starts (week_view, start_time);
-		e_week_view_update_query (week_view);
-	}
-
-	/* Try to keep the previous selection, but if it is no longer shown
-	   just select the first day. */
-	if (week_view->selection_start_day != -1) {
-		week_view->selection_start_day = old_selection_start_julian
-			- g_date_julian (&base_date);
-		week_view->selection_end_day = old_selection_end_julian
-			- g_date_julian (&base_date);
-
-		/* Make sure the selection is valid. */
-		num_days = week_view->multi_week_view
-			? week_view->weeks_shown * 7 : 7;
-		num_days--;
-		week_view->selection_start_day =
-			CLAMP (week_view->selection_start_day, 0, num_days);
-		week_view->selection_end_day =
-			CLAMP (week_view->selection_end_day,
-			       week_view->selection_start_day,
-			       num_days);
-	}
-
-	/* Reset the adjustment value to 0 if the base address has changed.
-	   Note that we do this after updating first_day_shown so that our
-	   signal handler will not try to reload the events. */
-	if (update_adjustment_value)
-		gtk_adjustment_set_value (GTK_RANGE (week_view->vscrollbar)->adjustment, 0);
-
-	e_week_view_update_query (week_view);
-	gtk_widget_queue_draw (week_view->main_canvas);
-}
-
-
-/* Recalculates the time_t corresponding to the start of each day. */
-static void
-e_week_view_recalc_day_starts (EWeekView *week_view,
-			       time_t lower)
-{
-	gint num_days, day;
-	time_t tmp_time;
-
-	num_days = week_view->multi_week_view ? week_view->weeks_shown * 7 : 7;
-
-	tmp_time = lower;
-	week_view->day_starts[0] = tmp_time;
-	for (day = 1; day <= num_days; day++) {
-		tmp_time = time_add_day_with_zone (tmp_time, 1,
-						   e_calendar_view_get_timezone (E_CALENDAR_VIEW (week_view)));
-		week_view->day_starts[day] = tmp_time;
-	}
-}
-
-
-gboolean
-e_week_view_get_multi_week_view	(EWeekView	*week_view)
-{
-	g_return_val_if_fail (E_IS_WEEK_VIEW (week_view), FALSE);
-
-	return week_view->multi_week_view;
-}
-
-
-void
-e_week_view_set_multi_week_view	(EWeekView	*week_view,
-				 gboolean	 multi_week_view)
-{
-	GtkAdjustment *adjustment;
-	gint page_increment, page_size;
-
-	g_return_if_fail (E_IS_WEEK_VIEW (week_view));
-
-	if (week_view->multi_week_view == multi_week_view)
-		return;
-
-	week_view->multi_week_view = multi_week_view;
-
-	if (multi_week_view) {
-		gtk_widget_show (week_view->titles_canvas);
-		page_increment = 4;
-		page_size = 5;
-	} else {
-		gtk_widget_hide (week_view->titles_canvas);
-		page_increment = page_size = 1;
-	}
-
-	adjustment = GTK_RANGE (week_view->vscrollbar)->adjustment;
-	adjustment->page_increment = page_increment;
-	adjustment->page_size = page_size;
-	gtk_adjustment_changed (adjustment);
-
-	e_week_view_recalc_cell_sizes (week_view);
-
-	if (g_date_valid (&week_view->first_day_shown))
-		e_week_view_set_first_day_shown (week_view,
-						 &week_view->first_day_shown);
-}
-
-gboolean
-e_week_view_get_update_base_date (EWeekView *week_view)
-{
-	g_return_val_if_fail (E_IS_WEEK_VIEW (week_view), FALSE);
-
-	return week_view->update_base_date;
-}
-
-
-void
-e_week_view_set_update_base_date (EWeekView *week_view, gboolean update_base_date)
-{
-	g_return_if_fail (E_IS_WEEK_VIEW (week_view));
-
-	week_view->update_base_date = update_base_date;
-}
-
-gint
-e_week_view_get_weeks_shown	(EWeekView	*week_view)
-{
-	g_return_val_if_fail (E_IS_WEEK_VIEW (week_view), 1);
-
-	return week_view->weeks_shown;
-}
-
-
-void
-e_week_view_set_weeks_shown	(EWeekView	*week_view,
-				 gint		 weeks_shown)
-{
-	GtkAdjustment *adjustment;
-	gint page_increment, page_size;
-
-	g_return_if_fail (E_IS_WEEK_VIEW (week_view));
-
-	weeks_shown = MIN (weeks_shown, E_WEEK_VIEW_MAX_WEEKS);
-
-	if (week_view->weeks_shown == weeks_shown)
-		return;
-
-	week_view->weeks_shown = weeks_shown;
-
-	if (week_view->multi_week_view) {
-		page_increment = 4;
-		page_size = 5;
-
-		adjustment = GTK_RANGE (week_view->vscrollbar)->adjustment;
-		adjustment->page_increment = page_increment;
-		adjustment->page_size = page_size;
-		gtk_adjustment_changed (adjustment);
-
-		e_week_view_recalc_cell_sizes (week_view);
-
-		if (g_date_valid (&week_view->first_day_shown))
-			e_week_view_set_first_day_shown (week_view, &week_view->first_day_shown);
-
-		e_week_view_update_query (week_view);
-	}
-}
-
-
-gboolean
-e_week_view_get_compress_weekend	(EWeekView	*week_view)
-{
-	g_return_val_if_fail (E_IS_WEEK_VIEW (week_view), FALSE);
-
-	return week_view->compress_weekend;
-}
-
-
-void
-e_week_view_set_compress_weekend	(EWeekView	*week_view,
-					 gboolean	 compress)
-{
-	gboolean need_reload = FALSE;
-
-	g_return_if_fail (E_IS_WEEK_VIEW (week_view));
-
-	if (week_view->compress_weekend == compress)
-		return;
-
-	week_view->compress_weekend = compress;
-
-	/* The option only affects the month view. */
-	if (!week_view->multi_week_view)
-		return;
-
-	e_week_view_recalc_cell_sizes (week_view);
-
-	need_reload = e_week_view_recalc_display_start_day (week_view);
-
-	/* If the display_start_day has changed we need to recalculate the
-	   date range shown and reload all events, otherwise we only need to
-	   do a reshape. */
-	if (need_reload) {
-		/* Recalculate the days shown and reload if necessary. */
-		if (g_date_valid (&week_view->first_day_shown))
-			e_week_view_set_first_day_shown (week_view, &week_view->first_day_shown);
-	} else {
-		week_view->events_need_reshape = TRUE;
-		e_week_view_check_layout (week_view);
-	}
-
-	gtk_widget_queue_draw (week_view->titles_canvas);
-	gtk_widget_queue_draw (week_view->main_canvas);
-}
-
-/* Whether we display event end times. */
-gboolean
-e_week_view_get_show_event_end_times	(EWeekView	*week_view)
-{
-	g_return_val_if_fail (E_IS_WEEK_VIEW (week_view), TRUE);
-
-	return week_view->show_event_end_times;
-}
-
-
-void
-e_week_view_set_show_event_end_times	(EWeekView	*week_view,
-					 gboolean	 show)
-{
-	g_return_if_fail (E_IS_WEEK_VIEW (week_view));
-
-	if (week_view->show_event_end_times != show) {
-		week_view->show_event_end_times = show;
-		e_week_view_recalc_cell_sizes (week_view);
-		week_view->events_need_reshape = TRUE;
-		e_week_view_check_layout (week_view);
-	}
-}
-
-
-/* The first day of the week, 0 (Monday) to 6 (Sunday). */
-gint
-e_week_view_get_week_start_day	(EWeekView	*week_view)
-{
-	g_return_val_if_fail (E_IS_WEEK_VIEW (week_view), 0);
-
-	return week_view->week_start_day;
-}
-
-
-void
-e_week_view_set_week_start_day	(EWeekView	*week_view,
-				 gint		 week_start_day)
-{
-	g_return_if_fail (E_IS_WEEK_VIEW (week_view));
-	g_return_if_fail (week_start_day >= 0);
-	g_return_if_fail (week_start_day < 7);
-
-	if (week_view->week_start_day == week_start_day)
-		return;
-
-	week_view->week_start_day = week_start_day;
-
-	e_week_view_recalc_display_start_day (week_view);
-
-	/* Recalculate the days shown and reload if necessary. */
-	if (g_date_valid (&week_view->first_day_shown))
-		e_week_view_set_first_day_shown (week_view,
-						 &week_view->first_day_shown);
-
-	gtk_widget_queue_draw (week_view->titles_canvas);
-	gtk_widget_queue_draw (week_view->main_canvas);
-}
-
-static gboolean
-e_week_view_recalc_display_start_day	(EWeekView	*week_view)
-{
-	gint display_start_day;
-
-	/* The display start day defaults to week_start_day, but we have
-	   to use Saturday if the weekend is compressed and week_start_day
-	   is Sunday. */
-	display_start_day = week_view->week_start_day;
-
-	if (display_start_day == 6
-	    && (!week_view->multi_week_view || week_view->compress_weekend))
-		display_start_day = 5;
-
-	if (week_view->display_start_day != display_start_day) {
-		week_view->display_start_day = display_start_day;
-		return TRUE;
-	}
-
-	return FALSE;
-}
-
-
-static gboolean
-e_week_view_update_event_cb (EWeekView *week_view,
-			     gint event_num,
-			     gpointer data)
-{
-	EWeekViewEvent *event;
-	EWeekViewEventSpan *span;
-	gint span_num;
-	const gchar *text;
-	ECalModelComponent *comp_data;
-
-	comp_data = data;
-
-	event = &g_array_index (week_view->events, EWeekViewEvent, event_num);
-
-	e_cal_model_free_component_data (event->comp_data);
-	event->comp_data = e_cal_model_copy_component_data (comp_data);
-
-	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) {
-			text = icalcomponent_get_summary (comp_data->icalcomp);
-			gnome_canvas_item_set (span->text_item,
-					       "text", text ? text : "",
-					       NULL);	    
-
-			e_week_view_reshape_event_span (week_view, event_num,
-							span_num);
-		}
-	}
-	g_signal_emit_by_name (G_OBJECT(week_view),
-			       "event_changed", event);
-
-
-	return TRUE;
-}
-
-/* This calls a given function for each event instance 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 (EWeekView *week_view, 
-			   EWeekViewForeachEventCallback callback,
-			   gpointer data)
-{
-	EWeekViewEvent *event;
-	gint event_num;
-
-	for (event_num = week_view->events->len - 1;
-	     event_num >= 0;
-	     event_num--) {
-		event = &g_array_index (week_view->events, EWeekViewEvent, event_num);
-
-		if (!(*callback) (week_view, event_num, data))
-			return;
-	}
-}
-
-/* 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);
-
-		u = icalcomponent_get_uid (event->comp_data->icalcomp);
-		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 (!event)
-		return TRUE;
-
-	/* 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;
-
-	if (week_view->popup_event_num == event_num)
-		week_view->popup_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;
-		}
-	}
-
-	e_cal_model_free_component_data (event->comp_data);
-	event->comp_data = NULL;
-
-	g_array_remove_index (week_view->events, event_num);
-	week_view->events_need_layout = TRUE;
-
-	return TRUE;
-}
-
-
-void
-e_week_view_get_day_position	(EWeekView	*week_view,
-				 gint		 day,
-				 gint		*day_x,
-				 gint		*day_y,
-				 gint		*day_w,
-				 gint		*day_h)
-{
-	gint cell_x, cell_y, cell_h;
-
-	e_week_view_layout_get_day_position (day,
-					     week_view->multi_week_view,
-					     week_view->weeks_shown,
-					     week_view->display_start_day,
-					     week_view->compress_weekend,
-					     &cell_x, &cell_y, &cell_h);
-
-	*day_x = week_view->col_offsets[cell_x];
-	*day_y = week_view->row_offsets[cell_y];
-
-	*day_w = week_view->col_widths[cell_x];
-	*day_h = week_view->row_heights[cell_y];
-	if (cell_h == 2)
-		*day_h += week_view->row_heights[cell_y + 1];
-}
-
-
-/* Returns the bounding box for a span of an event. Usually this can easily
-   be determined by the start & end days and row of the span, which are set in
-   e_week_view_layout_event(). Though we need a special case for the weekends
-   when they are compressed, since the span may not fit.
-   The bounding box includes the entire width of the days in the view (but
-   not the vertical line down the right of the last day), though the displayed
-   event doesn't normally extend to the edges of the day.
-   It returns FALSE if the span isn't visible. */
-gboolean
-e_week_view_get_span_position	(EWeekView	*week_view,
-				 gint		 event_num,
-				 gint		 span_num,
-				 gint		*span_x,
-				 gint		*span_y,
-				 gint		*span_w)
-{
-	EWeekViewEvent *event;
-	EWeekViewEventSpan *span;
-	gint num_days;
-	gint start_x, start_y, start_w, start_h;
-	gint end_x, end_y, end_w, end_h;
-
-	g_return_val_if_fail (E_IS_WEEK_VIEW (week_view), FALSE);
-	g_return_val_if_fail (event_num < week_view->events->len, FALSE);
-
-	event = &g_array_index (week_view->events, EWeekViewEvent, event_num);
-
-	g_return_val_if_fail (span_num < event->num_spans, FALSE);
-
-	span = &g_array_index (week_view->spans, EWeekViewEventSpan,
-			       event->spans_index + span_num);
-
-	if (!e_week_view_layout_get_span_position (event, span,
-						   week_view->rows_per_cell,
-						   week_view->rows_per_compressed_cell,
-						   week_view->display_start_day,
-						   week_view->multi_week_view,
-						   week_view->compress_weekend,
-						   &num_days)) {
-		return FALSE;
-	}
-
-	e_week_view_get_day_position (week_view, span->start_day,
-				      &start_x, &start_y, &start_w, &start_h);
-	*span_y = start_y + week_view->events_y_offset
-		+ span->row * (week_view->row_height
-			       + E_WEEK_VIEW_EVENT_Y_SPACING);
-	if (num_days == 1) {
-		*span_x = start_x;
-		*span_w = start_w - 1;
-	} else {
-		e_week_view_get_day_position (week_view,
-					      span->start_day + num_days - 1,
-					      &end_x, &end_y, &end_w, &end_h);
-		*span_x = start_x;
-		*span_w = end_x + end_w - start_x - 1;
-	}
-
-	return TRUE;
-}
-
-
-
-static gboolean
-e_week_view_on_button_press (GtkWidget *widget,
-			     GdkEventButton *event,
-			     EWeekView *week_view)
-{
-	gint x, y, day;
-
-#if 0
-	g_print ("In e_week_view_on_button_press\n");
-	if (event->type == GDK_2BUTTON_PRESS)
-		g_print (" is a double-click\n");
-	if (week_view->pressed_event_num != -1)
-		g_print (" item is pressed\n");
-#endif
-
-	/* 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;
-
-	/* If an event is pressed just return. */
-	if (week_view->pressed_event_num != -1)
-		return FALSE;
-
-	if (event->button == 1 && event->type == GDK_2BUTTON_PRESS) {
-		e_calendar_view_new_appointment_full (E_CALENDAR_VIEW (week_view), TRUE, FALSE);
-		return TRUE;
-	}
-
-	if (event->button == 1) {
-		/* Start the selection drag. */
-		if (!GTK_WIDGET_HAS_FOCUS (week_view) &&  !GTK_WIDGET_HAS_FOCUS (week_view->main_canvas))
-			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;
-			g_signal_emit_by_name (week_view, "selected_time_changed");
-
-			/* 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));
-
-		if (day < week_view->selection_start_day || day > week_view->selection_end_day) {
-			week_view->selection_start_day = day;
-			week_view->selection_end_day = day;
-			week_view->selection_drag_pos = E_WEEK_VIEW_DRAG_NONE;
-
-			/* FIXME: Optimise? */
-			gtk_widget_queue_draw (week_view->main_canvas);
-		}
-		
-		e_week_view_show_popup_menu (week_view, event, -1);
-	}
-
-	return TRUE;
-}
-
-
-static gboolean
-e_week_view_on_button_release (GtkWidget *widget,
-			       GdkEventButton *event,
-			       EWeekView *week_view)
-{
-#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);
-	}
-
-	return FALSE;
-}
-
-static gboolean
-e_week_view_on_scroll (GtkWidget *widget,
-		       GdkEventScroll *scroll,
-		       EWeekView *week_view)
-{
-	GtkAdjustment *adj = GTK_RANGE (week_view->vscrollbar)->adjustment;
-	gfloat new_value;
-	
-	switch (scroll->direction){
-	case GDK_SCROLL_UP:
-		new_value = adj->value - adj->page_increment;
-		break;
-	case GDK_SCROLL_DOWN:
-		new_value = adj->value + adj->page_increment;
-		break;
-	default:
-		return FALSE;
-	}
-	
-	new_value = CLAMP (new_value, adj->lower, adj->upper - adj->page_size);
-	gtk_adjustment_set_value (adj, new_value);
-	
-	return TRUE;
-}
-
-
-static gboolean
-e_week_view_on_motion (GtkWidget *widget,
-		       GdkEventMotion *mevent,
-		       EWeekView *week_view)
-{
-	gint x, y, day;
-
-#if 0
-	g_print ("In e_week_view_on_motion\n");
-#endif
-
-	/* Convert the mouse position to a week & day. */
-	x = mevent->x;
-	y = mevent->y;
-	day = e_week_view_convert_position_to_day (week_view, x, y);
-	if (day == -1)
-		return FALSE;
-
-	if (week_view->selection_drag_pos != E_WEEK_VIEW_DRAG_NONE) {
-		e_week_view_update_selection (week_view, day);
-		return TRUE;
-	}
-
-	return FALSE;
-}
-
-
-/* Converts a position in the canvas window to a day offset from the first
-   day displayed. Returns -1 if the position is outside the grid. */
-static gint
-e_week_view_convert_position_to_day (EWeekView *week_view,
-				     gint x,
-				     gint y)
-{
-	gint col, row, grid_x = -1, grid_y = -1, week, day;
-	gint weekend_col, box, weekend_box;
-
-	/* First we convert it to a grid position. */
-	for (col = 0; col <= week_view->columns; col++) {
-		if (x < week_view->col_offsets[col]) {
-			grid_x = col - 1;
-			break;
-		}
-	}
-
-	for (row = 0; row <= week_view->rows; row++) {
-		if (y < week_view->row_offsets[row]) {
-			grid_y = row - 1;
-			break;
-		}
-	}
-
-	/* If the mouse is outside the grid return FALSE. */
-	if (grid_x == -1 || grid_y == -1)
-		return -1;
-
-	/* Now convert the grid position to a week and day. */
-	if (week_view->multi_week_view) {
-		week = grid_y / 2;
-		day = grid_x;
-
-		if (week_view->compress_weekend) {
-			weekend_col = (5 + 7 - week_view->display_start_day) % 7;
-			if (grid_x > weekend_col
-			    || (grid_x == weekend_col && grid_y % 2 == 1))
-				day++;
-		}
-	} else {
-		week = 0;
-
-		box = grid_x * 3 + grid_y / 2;
-		weekend_box = (5 + 7 - week_view->display_start_day) % 7;
-		day = box;
-		if (box > weekend_box
-		    ||( box == weekend_box && grid_y % 2 == 1))
-			day++;
-	}
-
-	return week * 7 + day;
-}
-
-
-static void
-e_week_view_update_selection (EWeekView *week_view,
-			      gint day)
-{
-	gint tmp_day;
-	gboolean need_redraw = FALSE;
-
-#if 0
-	g_print ("Updating selection %i,%i\n", week, day);
-#endif
-
-	if (week_view->selection_drag_pos == E_WEEK_VIEW_DRAG_START) {
-		if (day != week_view->selection_start_day) {
-			need_redraw = TRUE;
-			week_view->selection_start_day = day;
-		}
-	} else {
-		if (day != week_view->selection_end_day) {
-			need_redraw = TRUE;
-			week_view->selection_end_day = day;
-		}
-	}
-
-	/* Switch the drag position if necessary. */
-	if (week_view->selection_start_day > week_view->selection_end_day) {
-		tmp_day = week_view->selection_start_day;
-		week_view->selection_start_day = week_view->selection_end_day;
-		week_view->selection_end_day = tmp_day;
-		if (week_view->selection_drag_pos == E_WEEK_VIEW_DRAG_START)
-			week_view->selection_drag_pos = E_WEEK_VIEW_DRAG_END;
-		else
-			week_view->selection_drag_pos = E_WEEK_VIEW_DRAG_START;
-	}
-
-	/* FIXME: Optimise? */
-	if (need_redraw) {
-		gtk_widget_queue_draw (week_view->main_canvas);
-	}
-}
-
-
-static void
-e_week_view_free_events (EWeekView *week_view)
-{
-	EWeekViewEvent *event;
-	EWeekViewEventSpan *span;
-	gint event_num, span_num, num_days, day;
-
-	/* Reset all our indices. */
-	week_view->pressed_event_num = -1;
-	week_view->pressed_span_num = -1;
-	week_view->editing_event_num = -1;
-	week_view->editing_span_num = -1;
-	week_view->popup_event_num = -1;
-
-	for (event_num = 0; event_num < week_view->events->len; event_num++) {
-		event = &g_array_index (week_view->events, EWeekViewEvent,
-					event_num);
-		e_cal_model_free_component_data (event->comp_data);
-	}
-
-	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;
-	}
-
-	/* Hide all the jump buttons. */
-	for (day = 0; day < E_WEEK_VIEW_MAX_WEEKS * 7; day++) {
-		gnome_canvas_item_hide (week_view->jump_buttons[day]);
-	}
-}
-
-
-/* This adds one event to the view, adding it to the appropriate array. */
-static gboolean
-e_week_view_add_event (ECalComponent *comp,
-		       time_t	  start,
-		       time_t	  end,
-		       gboolean prepend,
-		       gpointer	  data)
-
-{
-	AddEventData *add_event_data;
-	EWeekViewEvent event;
-	gint num_days;
-	struct icaltimetype start_tt, end_tt;
-
-	add_event_data = data;
-
-	/* Check that the event times are valid. */
-	num_days = add_event_data->week_view->multi_week_view ? add_event_data->week_view->weeks_shown * 7 : 7;
-
-#if 0
-	g_print ("View start:%li end:%li  Event start:%li end:%li\n",
-		 add_event_data->week_view->day_starts[0], add_event_data->week_view->day_starts[num_days],
-		 start, end);
-#endif
-	g_return_val_if_fail (start <= end, TRUE);
-	g_return_val_if_fail (start < add_event_data->week_view->day_starts[num_days], TRUE);
-	g_return_val_if_fail (end > add_event_data->week_view->day_starts[0], TRUE);
-
-	start_tt = icaltime_from_timet_with_zone (start, FALSE,
-						  e_calendar_view_get_timezone (E_CALENDAR_VIEW (add_event_data->week_view)));
-	end_tt = icaltime_from_timet_with_zone (end, FALSE,
-						e_calendar_view_get_timezone (E_CALENDAR_VIEW (add_event_data->week_view)));
-
-	if (add_event_data->comp_data) {
-		event.comp_data = e_cal_model_copy_component_data (add_event_data->comp_data);
-	} else {
-		event.comp_data = g_new0 (ECalModelComponent, 1);
-
-		event.comp_data->client = g_object_ref (e_cal_model_get_default_client (e_calendar_view_get_model (E_CALENDAR_VIEW (add_event_data->week_view))));
-		e_cal_component_abort_sequence (comp);
-		event.comp_data->icalcomp = icalcomponent_new_clone (e_cal_component_get_icalcomponent (comp));
-	}
-	event.start = start;
-	event.end = end;
-	event.spans_index = 0;
-	event.num_spans = 0;
-	event.comp_data->instance_start = start;
-	event.comp_data->instance_end = end;
-
-	event.start_minute = start_tt.hour * 60 + start_tt.minute;
-	event.end_minute = end_tt.hour * 60 + end_tt.minute;
-	if (event.end_minute == 0 && start != end)
-		event.end_minute = 24 * 60;
-
-	event.different_timezone = FALSE;
-	if (!cal_comp_util_compare_event_timezones (
-		    comp,
-		    event.comp_data->client,
-		    e_calendar_view_get_timezone (E_CALENDAR_VIEW (add_event_data->week_view))))
-		event.different_timezone = TRUE;
-
-	if (prepend)
-		g_array_prepend_val (add_event_data->week_view->events, event);
-	else
-		g_array_append_val (add_event_data->week_view->events, event);
-	add_event_data->week_view->events_sorted = FALSE;
-	add_event_data->week_view->events_need_layout = TRUE;
-
-	return TRUE;
-}
-
-
-/* This lays out the events, or reshapes them, as necessary. */
-static void
-e_week_view_check_layout (EWeekView *week_view)
-{
-	/* Don't bother if we aren't visible. */
-	if (!GTK_WIDGET_VISIBLE (week_view))
-	    return;
-
-	/* Make sure the events are sorted (by start and size). */
-	e_week_view_ensure_events_sorted (week_view);
-
-	if (week_view->events_need_layout)
-		week_view->spans = e_week_view_layout_events
-			(week_view->events, week_view->spans,
-			 week_view->multi_week_view,
-			 week_view->weeks_shown,
-			 week_view->compress_weekend,
-			 week_view->display_start_day,
-			 week_view->day_starts,
-			 week_view->rows_per_day);
-
-	if (week_view->events_need_layout || week_view->events_need_reshape)
-		e_week_view_reshape_events (week_view);
-
-	week_view->events_need_layout = FALSE;
-	week_view->events_need_reshape = FALSE;
-}
-
-
-static void
-e_week_view_ensure_events_sorted (EWeekView *week_view)
-{
-	if (!week_view->events_sorted) {
-		qsort (week_view->events->data,
-		       week_view->events->len,
-		       sizeof (EWeekViewEvent),
-		       e_week_view_event_sort_func);
-		week_view->events_sorted = TRUE;
-	}
-}
-
-
-gint
-e_week_view_event_sort_func (const void *arg1,
-			     const void *arg2)
-{
-	EWeekViewEvent *event1, *event2;
-
-	event1 = (EWeekViewEvent*) arg1;
-	event2 = (EWeekViewEvent*) arg2;
-
-	if (event1->start < event2->start)
-		return -1;
-	if (event1->start > event2->start)
-		return 1;
-
-	if (event1->end > event2->end)
-		return -1;
-	if (event1->end < event2->end)
-		return 1;
-
-	return 0;
-}
-
-
-static void
-e_week_view_reshape_events (EWeekView *week_view)
-{
-	EWeekViewEvent *event;
-	gint event_num, span_num;
-	gint num_days, day, day_x, day_y, day_w, day_h, max_rows;
-	gboolean is_weekend;
-
-	for (event_num = 0; event_num < week_view->events->len; event_num++) {
-		event = &g_array_index (week_view->events, EWeekViewEvent,
-					event_num);
-		for (span_num = 0; span_num < event->num_spans; span_num++) {
-			gchar *current_comp_string;
-
-			e_week_view_reshape_event_span (week_view, event_num,
-							span_num);
-			current_comp_string = icalcomponent_as_ical_string (event->comp_data->icalcomp);
-			if (week_view->last_edited_comp_string == NULL)
-				continue;
-			if (strncmp (current_comp_string, week_view->last_edited_comp_string,50) == 0) {
-				EWeekViewEventSpan *span;
-				span = &g_array_index (week_view->spans, EWeekViewEventSpan, event->spans_index + span_num);
-				e_canvas_item_grab_focus (span->text_item, TRUE);
-				week_view->last_edited_comp_string = NULL;
-			}
-		}
-	}
-
-	/* Reshape the jump buttons and show/hide them as appropriate. */
-	num_days = week_view->multi_week_view ? week_view->weeks_shown * 7 : 7;
-	for (day = 0; day < num_days; day++) {
-
-		is_weekend = ((week_view->display_start_day + day) % 7 >= 5) ? TRUE : FALSE;
-		if (!is_weekend || (week_view->multi_week_view
-				    && !week_view->compress_weekend))
-			max_rows = week_view->rows_per_cell;
-		else
-			max_rows = week_view->rows_per_compressed_cell;
-
-		/* Determine whether the jump button should be shown. */
-		if (week_view->rows_per_day[day] <= max_rows) {
-			gnome_canvas_item_hide (week_view->jump_buttons[day]);
-		} else {
-			e_week_view_get_day_position (week_view, day,
-						      &day_x, &day_y,
-						      &day_w, &day_h);
-
-			gnome_canvas_item_set (week_view->jump_buttons[day],
-					       "GnomeCanvasPixbuf::x", (gdouble) (day_x + day_w - E_WEEK_VIEW_JUMP_BUTTON_X_PAD - E_WEEK_VIEW_JUMP_BUTTON_WIDTH),
-					       "GnomeCanvasPixbuf::y", (gdouble) (day_y + day_h - E_WEEK_VIEW_JUMP_BUTTON_Y_PAD - E_WEEK_VIEW_JUMP_BUTTON_HEIGHT),
-					       NULL);
-
-			gnome_canvas_item_show (week_view->jump_buttons[day]);
-			gnome_canvas_item_raise_to_top (week_view->jump_buttons[day]);
-		}
-	}
-
-	for (day = num_days; day < E_WEEK_VIEW_MAX_WEEKS * 7; day++) {
-		gnome_canvas_item_hide (week_view->jump_buttons[day]);
-	}
-}
-
-
-static void
-e_week_view_reshape_event_span (EWeekView *week_view,
-				gint event_num,
-				gint span_num)
-{
-	EWeekViewEvent *event;
-	EWeekViewEventSpan *span;
-	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;
-	ECalComponent *comp;
-	gdouble text_x, text_y, text_w, text_h;
-	gchar *text, *end_of_line;
-	gint line_len, text_width;
-	PangoFontDescription *font_desc;
-	PangoContext *pango_context;
-	PangoFontMetrics *font_metrics;
-	PangoLayout *layout;
-
-	event = &g_array_index (week_view->events, EWeekViewEvent, event_num);
-	span = &g_array_index (week_view->spans, EWeekViewEventSpan,
-			       event->spans_index + span_num);
-	comp = e_cal_component_new ();
-	e_cal_component_set_icalcomponent (comp, icalcomponent_new_clone (event->comp_data->icalcomp));
-
-	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;
-
-		g_object_unref (comp);
-		return;
-	}
-
-	/* Set up Pango prerequisites */
-	font_desc = gtk_widget_get_style (GTK_WIDGET (week_view))->font_desc;
-	pango_context = gtk_widget_get_pango_context (GTK_WIDGET (week_view));
-	font_metrics = pango_context_get_metrics (pango_context, font_desc,
-						  pango_context_get_language (pango_context));
-	layout = pango_layout_new (pango_context);
-
-	/* If we are editing a long event we don't show the icons and the EText
-	   item uses the maximum width available. */
-	if (!one_day_event && week_view->editing_event_num == event_num
-	    && week_view->editing_span_num == span_num) {
-		show_icons = FALSE;
-		use_max_width = TRUE;
-	}
-
-	/* Calculate how many icons we need to show. */
-	num_icons = 0;
-	if (show_icons) {
-		GSList *categories_list, *elem;
-
-		if (e_cal_component_has_alarms (comp))
-			num_icons++;
-		if (e_cal_component_has_recurrences (comp))
-			num_icons++;
-		if (e_cal_component_has_attachments (comp))
-			num_icons++;
-		if (event->different_timezone)
-			num_icons++;
-
-		e_cal_component_get_categories_list (comp, &categories_list);
-		for (elem = categories_list; elem; elem = elem->next) {
-			char *category;
-			GdkPixmap *pixmap = NULL;
-			GdkBitmap *mask = NULL;
-
-			category = (char *) elem->data;
-			if (e_categories_config_get_icon_for (category, &pixmap, &mask))
-				num_icons++;
-		}
-
-		e_cal_component_free_categories_list (categories_list);
-	}
-
-	/* Create the background canvas item if necessary. */
-	if (!span->background_item) {
-		span->background_item =
-			gnome_canvas_item_new (GNOME_CANVAS_GROUP (GNOME_CANVAS (week_view->main_canvas)->root),
-					       e_week_view_event_item_get_type (),
-					       NULL);
-	}
-
-	gnome_canvas_item_set (span->background_item,
-			       "event_num", event_num,
-			       "span_num", span_num,
-			       NULL);
-
-	/* Create the text item if necessary. */
-	if (!span->text_item) {
-		ECalComponentText text;
-		GtkWidget *widget;
-
-		widget = (GtkWidget *)week_view;
-		e_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 (),
-					       "anchor", GTK_ANCHOR_NW,
-					       "clip", TRUE,
-					       "max_lines", 1,
-					       "editable", TRUE,
-					       "text", text.value ? text.value : "",
-					       "use_ellipsis", TRUE,
-					       "fill_color_gdk", &widget->style->text[GTK_STATE_NORMAL],
-					       "im_context", E_CANVAS (week_view->main_canvas)->im_context,
-					       NULL);
-
-		g_signal_connect (span->text_item, "event",
-				  G_CALLBACK (e_week_view_on_text_item_event),
-				  week_view);
-		g_signal_emit_by_name (G_OBJECT(week_view),
-				       "event_added", event);
-
-	}
-
-	/* Calculate the position of the text item.
-	   For events < 1 day it starts after the times & icons and ends at the
-	   right edge of the span.
-	   For events >= 1 day we need to determine whether times are shown at
-	   the start and end of the span, then try to center the text item with
-	   the icons in the middle, but making sure we don't go over the times.
-	*/
-
-
-	/* Calculate the space necessary to display a time, e.g. "13:00". */
-	time_width = e_week_view_get_time_string_width (week_view);
-
-	/* Calculate the space needed for the icons. */
-	icons_width = (E_WEEK_VIEW_ICON_WIDTH + E_WEEK_VIEW_ICON_X_PAD)
-		* num_icons - E_WEEK_VIEW_ICON_X_PAD + E_WEEK_VIEW_ICON_R_PAD;
-
-	/* The y position and height are the same for both event types. */
-	text_y = span_y + E_WEEK_VIEW_EVENT_BORDER_HEIGHT
-		+ E_WEEK_VIEW_EVENT_TEXT_Y_PAD;
-
-	text_h =
-		PANGO_PIXELS (pango_font_metrics_get_ascent (font_metrics)) +
-		PANGO_PIXELS (pango_font_metrics_get_descent (font_metrics));
-
-	if (one_day_event) {
-		/* Note that 1-day events don't have a border. Although we
-		   still use the border height to position the events
-		   vertically so they still line up neatly (see above),
-		   we don't use the border width or edge padding at all. */
-		text_x = span_x	+ E_WEEK_VIEW_EVENT_L_PAD;
-
-		switch (week_view->time_format) {
-		case E_WEEK_VIEW_TIME_BOTH_SMALL_MIN:
-		case E_WEEK_VIEW_TIME_BOTH:
-			/* These have 2 time strings with a small space between
-			   them and some space before the EText item. */
-			text_x += time_width * 2
-				+ E_WEEK_VIEW_EVENT_TIME_SPACING
-				+ E_WEEK_VIEW_EVENT_TIME_X_PAD;
-			break;
-		case E_WEEK_VIEW_TIME_START_SMALL_MIN:
-		case E_WEEK_VIEW_TIME_START:
-			/* These have just 1 time string with some space
-			   before the EText item. */
-			text_x += time_width + E_WEEK_VIEW_EVENT_TIME_X_PAD;
-			break;
-		case E_WEEK_VIEW_TIME_NONE:
-			break;
-		}
-
-		/* The icons_width includes space on the right of the icons. */
-		text_x += icons_width;
-
-		/* The width of the EText item extends right to the edge of the
-		   event, just inside the border. */
-		text_w = span_x + span_w - E_WEEK_VIEW_EVENT_R_PAD - text_x;
-
-	} else {
-		if (use_max_width) {
-			/* When we are editing the event we use all the
-			   available width. */
-			text_x = span_x + E_WEEK_VIEW_EVENT_L_PAD
-				+ E_WEEK_VIEW_EVENT_BORDER_WIDTH
-				+ E_WEEK_VIEW_EVENT_EDGE_X_PAD;
-			text_w = span_x + span_w - E_WEEK_VIEW_EVENT_R_PAD
-				- E_WEEK_VIEW_EVENT_BORDER_WIDTH
-				- E_WEEK_VIEW_EVENT_EDGE_X_PAD - text_x;
-		} else {
-			/* Get the width of the text of the event. This is a
-			   bit of a hack. It would be better if EText could
-			   tell us this. */
-			g_object_get (G_OBJECT (span->text_item), "text", &text, NULL);
-			text_width = 0;
-			if (text) {
-				/* It should only have one line of text in it.
-				   I'm not sure we need this any more. */
-				end_of_line = strchr (text, '\n');
-				if (end_of_line)
-					line_len = end_of_line - text;
-				else
-					line_len = strlen (text);
-
-				pango_layout_set_text (layout, text, line_len);
-				pango_layout_get_pixel_size (layout, &text_width, NULL);
-				g_free (text);
-			}
-
-			/* Add on the width of the icons and find the default
-			   position, which centers the icons + text. */
-			width = text_width + icons_width;
-			text_x = span_x + (span_w - width) / 2;
-
-			/* Now calculate the left-most valid position, and make
-			   sure we don't go to the left of that. */
-			min_text_x = span_x + E_WEEK_VIEW_EVENT_L_PAD
-				+ E_WEEK_VIEW_EVENT_BORDER_WIDTH
-				+ E_WEEK_VIEW_EVENT_EDGE_X_PAD;
-			/* See if we will want to display the start time, and
-			   if so take that into account. */
-			if (event->start > week_view->day_starts[span->start_day])
-				min_text_x += time_width
-					+ E_WEEK_VIEW_EVENT_TIME_X_PAD;
-
-			/* Now make sure we don't go to the left of the minimum
-			   position. */
-			text_x = MAX (text_x, min_text_x);
-
-			/* Now calculate the largest valid width, using the
-			   calculated x position, and make sure we don't
-			   exceed that. */
-			max_text_w = span_x + span_w - E_WEEK_VIEW_EVENT_R_PAD
-				- E_WEEK_VIEW_EVENT_BORDER_WIDTH
-				- E_WEEK_VIEW_EVENT_EDGE_X_PAD - text_x;
-			if (event->end < week_view->day_starts[span->start_day
-							      + span->num_days])
-				max_text_w -= time_width
-					+ E_WEEK_VIEW_EVENT_TIME_X_PAD;
-
-			text_w = MIN (width, max_text_w);
-
-			/* Now take out the space for the icons. */
-			text_x += icons_width;
-			text_w -= icons_width;
-		}
-	}
-
-	/* Make sure we don't try to use a negative width. */
-	text_w = MAX (text_w, 0);
-
-	gnome_canvas_item_set (span->text_item,
-			       "clip_width", (gdouble) text_w,
-			       "clip_height", (gdouble) text_h,
-			       NULL);
-	e_canvas_item_move_absolute (span->text_item, text_x, text_y);
-
-	g_object_unref (comp);
-	g_object_unref (layout);
-	pango_font_metrics_unref (font_metrics);
-}
-
-gboolean
-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;
-	ECalModelComponent *comp_data;
-	gboolean read_only;
-	
-	/* 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 TRUE;
-
-	event = &g_array_index (week_view->events, EWeekViewEvent, event_num);
-	span = &g_array_index (week_view->spans, EWeekViewEventSpan,
-			       event->spans_index + span_num);
-
-	if (!e_cal_is_read_only (event->comp_data->client, &read_only, NULL) || read_only)
-		return FALSE;
-
-	/* If the event is not shown, don't try to edit it. */
-	if (!span->text_item)
-		return FALSE;
-
-	if (initial_text) {
-		gnome_canvas_item_set (span->text_item,
-				       "text", initial_text,
-				       NULL);
-	}
-
-	/* Save the comp_data value because we use that as our invariant */
-	comp_data = event->comp_data;
-	
-	e_canvas_item_grab_focus (span->text_item, TRUE);
-	
-	/* If the above focus caused things to redraw, then find the
-	 * the event and the span again */
-	if (event_num < week_view->events->len)
-		event = &g_array_index (week_view->events, EWeekViewEvent, event_num);
-	
-	if (event_num >= week_view->events->len || event->comp_data != comp_data) {
-		/* Unfocussing can cause a removal but not a new
-		 * addition so just run backwards through the
-		 * events */
-		for (event_num--; event_num >= 0; event_num--){
-			event = &g_array_index (week_view->events, EWeekViewEvent, event_num);
-			if (event->comp_data == comp_data)
-				break;
-		}
-		g_assert (event_num >= 0);		
-	}	
-	span = &g_array_index (week_view->spans, EWeekViewEventSpan,  event->spans_index + span_num);
-
-	/* Try to move the cursor to the end of the text. */
-	g_object_get (G_OBJECT (span->text_item), "event_processor", &event_processor, NULL);
-	if (event_processor) {
-		command.action = E_TEP_MOVE;
-		command.position = E_TEP_END_OF_BUFFER;
-		g_signal_emit_by_name (event_processor,
-				       "command", &command);
-	}
-	return TRUE;
-}
-
-
-/* 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);
-}
-
-
-/* Cancels the current edition by resetting the appointment's text to its original value */
-static void
-cancel_editing (EWeekView *week_view)
-{
-	int event_num, span_num;
-	EWeekViewEvent *event;
-	EWeekViewEventSpan *span;
-	const gchar *summary;
-
-	event_num = week_view->editing_event_num;
-	span_num = week_view->editing_span_num;
-
-	g_assert (event_num != -1);
-
-	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 text to what was in the component */
-
-	summary = icalcomponent_get_summary (event->comp_data->icalcomp);
-	g_object_set (G_OBJECT (span->text_item), "text", summary ? summary : "", NULL);
-
-	/* Stop editing */
-	e_week_view_stop_editing_event (week_view);
-}
-
-static gboolean
-e_week_view_on_text_item_event (GnomeCanvasItem *item,
-				GdkEvent *gdkevent,
-				EWeekView *week_view)
-{
-	EWeekViewEvent *event;
-	gint event_num, span_num;
-
-#if 0
-	g_print ("In e_week_view_on_text_item_event\n");
-#endif
-
-	switch (gdkevent->type) {
-	case GDK_KEY_PRESS:
-		if (gdkevent && gdkevent->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;
-		} else if (gdkevent->key.keyval == GDK_Escape) {
-			cancel_editing (week_view);
-			gtk_signal_emit_stop_by_name (GTK_OBJECT (item), "event");
-			/* focus should go to week view when stop editing */
-			gtk_widget_grab_focus (GTK_WIDGET (week_view));
-			return TRUE;
-		}
-		break;
-	case GDK_2BUTTON_PRESS:
-		if (!e_week_view_find_event_from_item (week_view, item,
-						       &event_num, &span_num))
-			return FALSE;
-
-		event = &g_array_index (week_view->events, EWeekViewEvent,
-					event_num);
-
-		e_calendar_view_edit_appointment (E_CALENDAR_VIEW (week_view),
-					     event->comp_data->client,
-					     event->comp_data->icalcomp, FALSE);
-
-		gtk_signal_emit_stop_by_name (GTK_OBJECT (item), "event");
-		return TRUE;
-	case GDK_BUTTON_PRESS:
-		if (!e_week_view_find_event_from_item (week_view, item,
-						       &event_num, &span_num))
-			return FALSE;
-
-		if (gdkevent->button.button == 3) {
-			EWeekViewEvent *e;
-
-			if (E_TEXT (item)->editing)
-				e_week_view_stop_editing_event (week_view);
-
-			e = &g_array_index (week_view->events, EWeekViewEvent, event_num);
-
-			if (!GTK_WIDGET_HAS_FOCUS (week_view))
-				gtk_widget_grab_focus (GTK_WIDGET (week_view));
-
-			e_week_view_set_selected_time_range_visible (week_view, e->start, e->end);
-
-			e_week_view_show_popup_menu (week_view,
-						     (GdkEventButton*) gdkevent,
-						     event_num);
-
-			gtk_signal_emit_stop_by_name (GTK_OBJECT (item->canvas),
-						      "button_press_event");
-			return TRUE;
-		}
-
-		if (gdkevent->button.button != 3) {
-			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 (gdkevent) {
-				week_view->drag_event_x = gdkevent->button.x;
-				week_view->drag_event_y = gdkevent->button.y;
-			} else
-				g_warning ("No GdkEvent");
-
-			/* FIXME: Remember the day offset from the start of
-			   the event, for DnD. */
-
-			return TRUE;
-		}
-		break;
-	case GDK_BUTTON_RELEASE:
-		if (!E_TEXT (item)->editing) {
-			/* This shouldn't ever happen. */
-			if (!e_week_view_find_event_from_item (week_view,
-							       item,
-							       &event_num,
-							       &span_num))
-				return FALSE;
-
-			if (week_view->pressed_event_num != -1
-			    && week_view->pressed_event_num == event_num
-			    && week_view->pressed_span_num == span_num) {
-				e_week_view_start_editing_event (week_view,
-								 event_num,
-								 span_num,
-								 NULL);
-				week_view->pressed_event_num = -1;
-			}
-
-			/* Stop the signal last or we will also stop any
-			   other events getting to the EText item. */
-			gtk_signal_emit_stop_by_name (GTK_OBJECT (item),
-						      "event");
-			return TRUE;
-		}
-		week_view->pressed_event_num = -1;
-		break;
-	case GDK_FOCUS_CHANGE:
-		if (gdkevent->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 gboolean e_week_view_event_move (ECalendarView *cal_view, ECalViewMoveDirection direction)
-{
-	EWeekViewEvent *event;
-	gint event_num, span_num, adjust_days, current_start_day, current_end_day;
-	time_t start_dt, end_dt;
-	struct icaltimetype start_time,end_time;
-	EWeekView *week_view = E_WEEK_VIEW (cal_view);
-	gboolean is_all_day = FALSE;
-
-	event_num = week_view->editing_event_num;
-	span_num = week_view->editing_span_num;
-	adjust_days = 0;
-
-	/* If no item is being edited, just return. */
-	if (event_num == -1)
-		return FALSE;
-
-	event = &g_array_index (week_view->events, EWeekViewEvent, event_num);
-
-	start_dt = event->start;
-	end_dt = event->end;
-	start_time = icalcomponent_get_dtstart (event->comp_data->icalcomp);
-	end_time = icalcomponent_get_dtend (event->comp_data->icalcomp);
-
-	if (start_time.is_date && end_time.is_date)
-		is_all_day = TRUE;
-
-	current_end_day = e_week_view_get_day_offset_of_event (week_view,end_dt); 
-
-	switch (direction) {
-	case E_CAL_VIEW_MOVE_UP:
-		adjust_days = e_week_view_get_adjust_days_for_move_up (week_view,current_end_day);
-		break;
-	case E_CAL_VIEW_MOVE_DOWN:
-		adjust_days = e_week_view_get_adjust_days_for_move_down (week_view,current_end_day);
-		break;
-	case E_CAL_VIEW_MOVE_LEFT:
-		adjust_days = e_week_view_get_adjust_days_for_move_left (week_view,current_end_day);
-		break;
-	case E_CAL_VIEW_MOVE_RIGHT:
-		adjust_days = e_week_view_get_adjust_days_for_move_right (week_view,current_end_day);
-		break;	
-	default:
-		break;
-	}
-	
-	icaltime_adjust	(&start_time ,adjust_days,0,0,0);
-	icaltime_adjust	(&end_time ,adjust_days,0,0,0);
-	start_dt = icaltime_as_timet_with_zone (start_time,
-		e_calendar_view_get_timezone (E_CALENDAR_VIEW (week_view)));
-	end_dt = icaltime_as_timet_with_zone (end_time,
-		e_calendar_view_get_timezone (E_CALENDAR_VIEW (week_view)));
-
-	current_start_day = e_week_view_get_day_offset_of_event (week_view,start_dt);
-	current_end_day = e_week_view_get_day_offset_of_event (week_view,end_dt);
-	if (is_all_day)
-		current_end_day--;
-
-	if (current_start_day < 0) {
-		return TRUE;
-	}
-	if (week_view->multi_week_view) {
-		if (current_end_day >= week_view->weeks_shown * 7) {
-			return TRUE;
-		}
-	}else {
-		if (current_end_day >= 7) {
-			return TRUE;
-		}
-	}
-	
-	e_week_view_change_event_time (week_view, start_dt, end_dt, is_all_day);
-	return TRUE;
-}
-
-static gint
-e_week_view_get_day_offset_of_event (EWeekView *week_view, time_t event_time)
-{
-	time_t first_day = week_view->day_starts[0];
-	
-	if (event_time - first_day < 0)
-		return -1;
-	else
-		return (event_time - first_day) / (24 * 60 * 60);
-}
-
-static void
-e_week_view_scroll_a_step (EWeekView *week_view, ECalViewMoveDirection direction)
-{
-	GtkAdjustment *adj = GTK_RANGE (week_view->vscrollbar)->adjustment;
-	gfloat new_value;
-	
-	switch (direction){
-	case E_CAL_VIEW_MOVE_UP:
-		new_value = adj->value - adj->step_increment;
-		break;
-	case E_CAL_VIEW_MOVE_DOWN:
-		new_value = adj->value + adj->step_increment;
-		break;
-	default:
-		return;
-	}
-	
-	new_value = CLAMP (new_value, adj->lower, adj->upper - adj->page_size);
-	gtk_adjustment_set_value (adj, new_value);
-}
-
-static void
-e_week_view_change_event_time (EWeekView *week_view, time_t start_dt, time_t end_dt, gboolean is_all_day)
-{
-	EWeekViewEvent *event;
-	gint event_num;
-	ECalComponent *comp;
-	ECalComponentDateTime date;
-	struct icaltimetype itt;
-	ECal *client;
-	CalObjModType mod = CALOBJ_MOD_ALL;
-	GtkWindow *toplevel;
-
-	event_num = week_view->editing_event_num;
-
-	/* If no item is being edited, just return. */
-	if (event_num == -1)
-		return;
-
-	event = &g_array_index (week_view->events, EWeekViewEvent, event_num);
-	client = event->comp_data->client;
-
-	/* 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 = e_cal_component_new ();
-	e_cal_component_set_icalcomponent (comp, icalcomponent_new_clone (event->comp_data->icalcomp));
-	date.value = &itt;
-	/* FIXME: Should probably keep the timezone of the original start
-	   and end times. */
-	date.tzid = icaltimezone_get_tzid (e_calendar_view_get_timezone (E_CALENDAR_VIEW (week_view)));
-	
-	*date.value = icaltime_from_timet_with_zone (start_dt, is_all_day,
-						     e_calendar_view_get_timezone (E_CALENDAR_VIEW (week_view)));
-	e_cal_component_set_dtstart (comp, &date);
-	*date.value = icaltime_from_timet_with_zone (end_dt, is_all_day,
-						     e_calendar_view_get_timezone (E_CALENDAR_VIEW (week_view)));
-	e_cal_component_set_dtend (comp, &date);
-
-	e_cal_component_commit_sequence (comp);
-	
-	if (week_view->last_edited_comp_string != NULL) {
-		g_free (week_view->last_edited_comp_string);
-		week_view->last_edited_comp_string = NULL;
-	}
-	
-	week_view->last_edited_comp_string = e_cal_component_get_as_string (comp);
-
-
- 	if (e_cal_component_is_instance (comp)) {
- 		if (!recur_component_dialog (client, comp, &mod, NULL)) {
- 			gtk_widget_queue_draw (week_view->main_canvas);
-			goto out;
- 		}
-	}
-	
-	toplevel = GTK_WINDOW (gtk_widget_get_toplevel (GTK_WIDGET (week_view)));
-
-	e_cal_component_commit_sequence (comp);
-	e_calendar_view_modify_and_send (comp, client, mod, toplevel, TRUE);
-
-out:	
-	g_object_unref (comp);
-}
-
-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);
-	}
-
-	g_signal_emit_by_name (week_view, "selection_changed");
-}
-
-
-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;
-	ECalComponent *comp;
-	ECalComponentText summary;
-	ECal *client;
-	const char *uid;
-	gboolean on_server;
-	
-	/* 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. */
-	uid = icalcomponent_get_uid (event->comp_data->icalcomp);
-	if (!uid)
-		return;
-
-	g_object_set (span->text_item, "handle_popup", FALSE, NULL);
-	g_object_get (G_OBJECT (span->text_item), "text", &text, NULL);
-	g_assert (text != NULL);
-
-	comp = e_cal_component_new ();
-	e_cal_component_set_icalcomponent (comp, icalcomponent_new_clone (event->comp_data->icalcomp));
-
-	client = event->comp_data->client;
-	on_server = cal_comp_is_on_server (comp, client);
-	
-	if (string_is_empty (text) && !on_server) {
-		const char *uid;
-		
-		e_cal_component_get_uid (comp, &uid);
-		
-		e_week_view_foreach_event_with_uid (week_view, uid,
-						    e_week_view_remove_event_cb, NULL);
-		gtk_widget_queue_draw (week_view->main_canvas);
-		e_week_view_check_layout (week_view);
-		goto out;
-	}
-
-	/* Only update the summary if necessary. */
-	e_cal_component_get_summary (comp, &summary);
-	if (summary.value && !strcmp (text, summary.value)) {
-		if (!e_week_view_is_one_day_event (week_view, event_num))
-			e_week_view_reshape_event_span (week_view, event_num,
-							span_num);
-	} else if (summary.value || !string_is_empty (text)) {
-		icalcomponent *icalcomp = e_cal_component_get_icalcomponent (comp);
-		
-		summary.value = text;
-		summary.altrep = NULL;
-		e_cal_component_set_summary (comp, &summary);
-		e_cal_component_commit_sequence (comp);
-		
-		if (!on_server) {
-			if (!e_cal_create_object (client, icalcomp, NULL, NULL))
-				g_message (G_STRLOC ": Could not create the object!");
-			else
-				g_signal_emit_by_name (week_view, "user_created");
-
-			/* we remove the object since we either got the update from the server or failed */
-			e_week_view_remove_event_cb (week_view, event_num, NULL);
-		} else {
-			CalObjModType mod = CALOBJ_MOD_ALL;
-			GtkWindow *toplevel;
-			
-			if (e_cal_component_is_instance (comp)) {
-				if (!recur_component_dialog (client, comp, &mod, NULL)) {
-					goto out;
-				}
-			}
-			
-			/* FIXME When sending here, what exactly should we send? */
-			toplevel = GTK_WINDOW (gtk_widget_get_toplevel (GTK_WIDGET (week_view)));
-			e_calendar_view_modify_and_send (comp, client, mod, toplevel, FALSE);
-		}
-	}
-
- out:
-
-	g_free (text);
-	g_object_unref (comp);
-
-	g_signal_emit_by_name (week_view, "selection_changed");
-}
-
-
-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,
-				 ECal             *client,
-				 const gchar	  *uid,
-				 const gchar      *rid,
-				 gint		  *event_num_return)
-{
-	EWeekViewEvent *event;
-	gint event_num, num_events;
-
-	*event_num_return = -1;
-	if (!uid)
-		return FALSE;
-
-	num_events = week_view->events->len;
-	for (event_num = 0; event_num < num_events; event_num++) {
-		const char *u, *r;
-
-		event = &g_array_index (week_view->events, EWeekViewEvent,
-					event_num);
-
-		if (event->comp_data->client != client)
-			continue;
-
-		u = icalcomponent_get_uid (event->comp_data->icalcomp);
-		if (u && !strcmp (uid, u)) {
-			if (rid && *rid) {
-				r = icaltime_as_ical_string (icalcomponent_get_recurrenceid (event->comp_data->icalcomp));
-				if (!r || !*r)
-					continue;
-				if (strcmp (rid, r) != 0)
-					continue;
-			}
-
-			*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 map_left[] = {0, 1, 2, 0, 1, 2, 2};
-static gint map_right[] = {3, 4, 5, 3, 4, 5, 6};
-
-static void
-e_week_view_do_cursor_key_up (EWeekView *week_view)
-{
-	if (week_view->selection_start_day <= 0)
-		return;
-	
-	week_view->selection_start_day--;
-	week_view->selection_end_day = week_view->selection_start_day;
-	g_signal_emit_by_name (week_view, "selected_time_changed");
-	gtk_widget_queue_draw (week_view->main_canvas);
-}
-
-static void
-e_week_view_do_cursor_key_down (EWeekView *week_view)
-{
-	if (week_view->selection_start_day == -1 ||
-		week_view->selection_start_day >= 6)
-		return;
-	
-	week_view->selection_start_day++;
-	week_view->selection_end_day = week_view->selection_start_day;
-	g_signal_emit_by_name (week_view, "selected_time_changed");
-	gtk_widget_queue_draw (week_view->main_canvas);
-}
-
-static void
-e_week_view_do_cursor_key_left (EWeekView *week_view)
-{
-	if (week_view->selection_start_day == -1)
-		return;
-	
-	week_view->selection_start_day = map_left[week_view->selection_start_day];
-	week_view->selection_end_day = week_view->selection_start_day;
-	g_signal_emit_by_name (week_view, "selected_time_changed");
-	gtk_widget_queue_draw (week_view->main_canvas);
-}
-
-static void
-e_week_view_do_cursor_key_right (EWeekView *week_view)
-{
-	if (week_view->selection_start_day == -1)
-		return;
-	
-	week_view->selection_start_day = map_right[week_view->selection_start_day];
-	week_view->selection_end_day = week_view->selection_start_day;
-	g_signal_emit_by_name (week_view, "selected_time_changed");
-	gtk_widget_queue_draw (week_view->main_canvas);
-}
-
-static void
-e_month_view_do_cursor_key_up (EWeekView *week_view)
-{
-	if (week_view->selection_start_day < 7)
-		return;
-	
-	week_view->selection_start_day -= 7;
-	week_view->selection_end_day = week_view->selection_start_day;
-	g_signal_emit_by_name (week_view, "selected_time_changed");
-	gtk_widget_queue_draw (week_view->main_canvas);
-}
-
-static void
-e_month_view_do_cursor_key_down (EWeekView *week_view)
-{
-	gint weeks_shown = e_week_view_get_weeks_shown (week_view);
-
-	if (week_view->selection_start_day == -1 ||
-		week_view->selection_start_day >= (weeks_shown - 1) * 7)
-		return;
-	
-	week_view->selection_start_day += 7;
-	week_view->selection_end_day = week_view->selection_start_day;
-	g_signal_emit_by_name (week_view, "selected_time_changed");
-	gtk_widget_queue_draw (week_view->main_canvas);
-}
-
-static void
-e_month_view_do_cursor_key_left (EWeekView *week_view)
-{
-	if (week_view->selection_start_day <= 0)
-		return;
-	
-	week_view->selection_start_day--;
-	week_view->selection_end_day = week_view->selection_start_day;
-	g_signal_emit_by_name (week_view, "selected_time_changed");
-	gtk_widget_queue_draw (week_view->main_canvas);
-}
-
-static void
-e_month_view_do_cursor_key_right (EWeekView *week_view)
-{
-	gint weeks_shown = e_week_view_get_weeks_shown (week_view);
-
-	if (week_view->selection_start_day == -1 ||
-		week_view->selection_start_day >= weeks_shown * 7 - 1)
-		return;
-	
-	week_view->selection_start_day++;
-	week_view->selection_end_day = week_view->selection_start_day;
-	g_signal_emit_by_name (week_view, "selected_time_changed");
-	gtk_widget_queue_draw (week_view->main_canvas);
-}
-
-static void
-e_week_view_cursor_key_up (EWeekView *week_view, GnomeCalendarViewType view_type)
-{
-	switch (view_type) {
-	case GNOME_CAL_WEEK_VIEW:
-		e_week_view_do_cursor_key_up (week_view);
-		break;
-	case GNOME_CAL_MONTH_VIEW:
-		e_month_view_do_cursor_key_up (week_view);
-		break;
-	default:
-		g_assert_not_reached ();
-	}
-}
-
-static void
-e_week_view_cursor_key_down (EWeekView *week_view, GnomeCalendarViewType view_type)
-{
-	switch (view_type) {
-	case GNOME_CAL_WEEK_VIEW:
-		e_week_view_do_cursor_key_down (week_view);
-		break;
-	case GNOME_CAL_MONTH_VIEW:
-		e_month_view_do_cursor_key_down (week_view);
-		break;
-	default:
-		g_assert_not_reached ();
-	}
-}
-
-static void
-e_week_view_cursor_key_left (EWeekView *week_view, GnomeCalendarViewType view_type)
-{
-	switch (view_type) {
-	case GNOME_CAL_WEEK_VIEW:
-		e_week_view_do_cursor_key_left (week_view);
-		break;
-	case GNOME_CAL_MONTH_VIEW:
-		e_month_view_do_cursor_key_left (week_view);
-		break;
-	default:
-		g_assert_not_reached ();
-	}
-}
-
-static void
-e_week_view_cursor_key_right (EWeekView *week_view, GnomeCalendarViewType view_type)
-{
-	switch (view_type) {
-	case GNOME_CAL_WEEK_VIEW:
-		e_week_view_do_cursor_key_right (week_view);
-		break;
-	case GNOME_CAL_MONTH_VIEW:
-		e_month_view_do_cursor_key_right (week_view);
-		break;
-	default:
-		g_assert_not_reached ();
-	}
-}
-
-static gboolean
-e_week_view_do_key_press (GtkWidget *widget, GdkEventKey *event)
-{
-	EWeekView *week_view;
-	ECal *ecal;
-	ECalModel *model;
-	ECalComponent *comp;
-	icalcomponent *icalcomp;
-	gint event_num;
-	gchar *initial_text;
-	ECalComponentDateTime date;
-	struct icaltimetype itt;
-	time_t dtstart, dtend;
-	const char *uid;
-	AddEventData add_event_data;
-	guint keyval;
-	gboolean read_only = TRUE;
-	gboolean stop_emission;
-	GnomeCalendarViewType view_type;
-	
-	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);
-	keyval = event->keyval;
-
-	/* The Escape key aborts a resize operation. */
-#if 0
-	if (week_view->resize_drag_pos != E_CALENDAR_VIEW_POS_NONE) {
-		if (event->keyval == GDK_Escape) {
-			e_week_view_abort_resize (week_view, event->time);
-		}
-		return FALSE;
-	}
-#endif
-
-	/* Handle the cursor keys for moving the selection */
-	view_type = gnome_calendar_get_view (e_calendar_view_get_calendar (E_CALENDAR_VIEW (week_view)));
-	stop_emission = FALSE;
-	if (!(event->state & GDK_SHIFT_MASK)
-		&& !(event->state & GDK_MOD1_MASK)) {
-		stop_emission = TRUE;
-		switch (keyval) {
-		case GDK_Up:
-			e_week_view_cursor_key_up (week_view, view_type);
-			break;
-		case GDK_Down:
-			e_week_view_cursor_key_down (week_view, view_type);
-			break;
-		case GDK_Left:
-			e_week_view_cursor_key_left (week_view, view_type);
-			break;
-		case GDK_Right:
-			e_week_view_cursor_key_right (week_view, view_type);
-			break;
-		default:
-			stop_emission = FALSE;
-			break;
-		}
-	}
-	if (stop_emission)
-		return TRUE;
-	
-	/*Navigation through days with arrow keys*/
-	if (((event->state & GDK_SHIFT_MASK) != GDK_SHIFT_MASK)
-		&&((event->state & GDK_CONTROL_MASK) != GDK_CONTROL_MASK)
-		&&((event->state & GDK_MOD1_MASK) == GDK_MOD1_MASK)) {
-		if (keyval == GDK_Up || keyval == GDK_KP_Up)
-			return e_week_view_event_move ((ECalendarView *) week_view, E_CAL_VIEW_MOVE_UP);
-		else if (keyval == GDK_Down || keyval == GDK_KP_Down)
-			return e_week_view_event_move ((ECalendarView *) week_view, E_CAL_VIEW_MOVE_DOWN);
-		else if (keyval == GDK_Left || keyval == GDK_KP_Left)
-			return e_week_view_event_move ((ECalendarView *) week_view, E_CAL_VIEW_MOVE_LEFT);
-		else if (keyval == GDK_Right || keyval == GDK_KP_Right)
-			return e_week_view_event_move ((ECalendarView *) week_view, E_CAL_VIEW_MOVE_RIGHT);
-	}
-	
-	if (week_view->selection_start_day == -1)
-		return FALSE;
-
-	/* Check if the client is read only */
-	model = e_calendar_view_get_model (E_CALENDAR_VIEW (week_view));
-	ecal = e_cal_model_get_default_client (model);
-	if (!e_cal_is_read_only (ecal, &read_only, NULL) || read_only)
-		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->state & (GDK_CONTROL_MASK | GDK_MOD1_MASK)))
-		   || (event->length == 0)
-		   || (event->keyval == GDK_Tab)) {
-		return FALSE;
-	} else
-		initial_text = e_utf8_from_gtk_event_key (widget, event->keyval, event->string);
-
-	/* Add a new event covering the selected range. */
-	icalcomp = e_cal_model_create_component_with_defaults (e_calendar_view_get_model (E_CALENDAR_VIEW (week_view)));
-	if (!icalcomp)
-		return FALSE;
-	uid = icalcomponent_get_uid (icalcomp);
-
-	comp = e_cal_component_new ();
-	e_cal_component_set_icalcomponent (comp, icalcomp);
-
-	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;
-
-	/* We use DATE values now, so we don't need the timezone. */
-	/*date.tzid = icaltimezone_get_tzid (e_calendar_view_get_timezone (E_CALENDAR_VIEW (week_view)));*/
-
-	*date.value = icaltime_from_timet_with_zone (dtstart, TRUE,
-						     e_calendar_view_get_timezone (E_CALENDAR_VIEW (week_view)));
-	e_cal_component_set_dtstart (comp, &date);
-
-	*date.value = icaltime_from_timet_with_zone (dtend, TRUE,
-						     e_calendar_view_get_timezone (E_CALENDAR_VIEW (week_view)));
-	e_cal_component_set_dtend (comp, &date);
-
-	e_cal_component_set_categories (
-		comp, e_calendar_view_get_default_category (E_CALENDAR_VIEW (week_view)));
-
-	/* We add the event locally and start editing it. We don't send it
-	   to the server until the user finishes editing it. */
-	add_event_data.week_view = week_view;
-	add_event_data.comp_data = NULL;
-	e_week_view_add_event (comp, dtstart, dtend, TRUE, &add_event_data);
-	e_week_view_check_layout (week_view);
-	gtk_widget_queue_draw (week_view->main_canvas);
-
-	if (e_week_view_find_event_from_uid (week_view, ecal, uid, NULL, &event_num)) {
-		EWeekViewEvent *event;
-		EWeekViewEventSpan *span;
-
-		event = &g_array_index (week_view->events, EWeekViewEvent,
-					event_num);
-		span = &g_array_index (week_view->spans, EWeekViewEventSpan,
-				       event->spans_index + 0);
-		
-		/* If the event can't be fit on the screen, don't try to edit it. */
-		if (!span->text_item) {
-			e_week_view_foreach_event_with_uid (week_view, uid,
-							    e_week_view_remove_event_cb, NULL);
-		} else {
-			e_week_view_start_editing_event (week_view, event_num, 0,
-							 initial_text);
-		}
-		
-	} else {
-		g_warning ("Couldn't find event to start editing.\n");
-	}
-
-	if (initial_text)
-		g_free (initial_text);
-
-	g_object_unref (comp);
-
-	return TRUE;
-}
-
-static void 
-e_week_view_move_selection_day (EWeekView *week_view, ECalViewMoveDirection direction)
-{
-	gint selection_start_day, selection_end_day;
- 
-	selection_start_day = week_view->selection_start_day;
-	selection_end_day = week_view->selection_end_day;
-
-	if (selection_start_day == -1) { 
-		selection_start_day = 0;	  
-		selection_end_day = 0;
-	}
-		
-       switch (direction) {
-       case E_CAL_VIEW_MOVE_UP:
-               selection_end_day += e_week_view_get_adjust_days_for_move_up (week_view,selection_end_day);
-               break;
-       case E_CAL_VIEW_MOVE_DOWN:
-               selection_end_day += e_week_view_get_adjust_days_for_move_down (week_view,selection_end_day);
-               break;
-       case E_CAL_VIEW_MOVE_LEFT:
-               selection_end_day += e_week_view_get_adjust_days_for_move_left (week_view,selection_end_day);
-               break;
-       case E_CAL_VIEW_MOVE_RIGHT:
-               selection_end_day += e_week_view_get_adjust_days_for_move_right (week_view,selection_end_day);
-               break;
-       default:
-               break;
-       }
-       if (selection_end_day < 0) {
-               e_week_view_scroll_a_step (week_view, E_CAL_VIEW_MOVE_UP);
-               selection_end_day +=7;
-       }
-       if (week_view->multi_week_view) {
-               if (selection_end_day >= week_view->weeks_shown * 7) {
-               e_week_view_scroll_a_step (week_view, E_CAL_VIEW_MOVE_DOWN);
-               selection_end_day -=7;
-               }
-       }else {
-               if (selection_end_day >= 7) {
-                       e_week_view_scroll_a_step (week_view, E_CAL_VIEW_MOVE_DOWN);
-                       selection_end_day -=7;
-               }
-       }
-
-	week_view->selection_start_day = selection_end_day;
-	week_view->selection_end_day = selection_end_day;
-
-	gtk_widget_queue_draw (week_view->main_canvas);
-	g_signal_emit_by_name (week_view, "selected_time_changed");
-}
-
-static gint
-e_week_view_get_adjust_days_for_move_up (EWeekView *week_view,gint current_day)
-{
-       if (week_view->multi_week_view)
-               return -7;
-       else
-               return 0;
-}
-
-static gint
-e_week_view_get_adjust_days_for_move_down (EWeekView *week_view,gint current_day)
-{
-       if (week_view->multi_week_view)
-               return 7;
-       else
-               return 0;
-}
-
-static gint
-e_week_view_get_adjust_days_for_move_left (EWeekView *week_view,gint current_day)
-{
-	return -1;
-}
-
-static gint
-e_week_view_get_adjust_days_for_move_right (EWeekView *week_view,gint current_day)
-{
-	return 1;
-}
-
-static gboolean
-e_week_view_key_press (GtkWidget *widget, GdkEventKey *event)
-{
-	gboolean handled = FALSE;
-	handled = e_week_view_do_key_press (widget, event);
-
-	/* if not handled, try key bindings */
-	if (!handled)
-		handled = GTK_WIDGET_CLASS (e_week_view_parent_class)->key_press_event (widget, event);
-	return handled;
-}
-
-static void
-popup_destroyed_cb (gpointer data, GObject *where_object_was)
-{
-	EWeekView *week_view = data;
-
-	week_view->popup_event_num = -1;
-}
-
-void
-e_week_view_show_popup_menu (EWeekView	     *week_view,
-			     GdkEventButton  *bevent,
-			     gint	      event_num)
-{
-	GtkMenu *popup;
-	
-	week_view->popup_event_num = event_num;
-
-	popup = e_calendar_view_create_popup_menu (E_CALENDAR_VIEW (week_view));
-	g_object_weak_ref (G_OBJECT (popup), popup_destroyed_cb, week_view);
-	gtk_menu_popup (popup, NULL, NULL, NULL, NULL, bevent?bevent->button:0, bevent?bevent->time:gtk_get_current_event_time());
-}
-
-static gboolean
-e_week_view_popup_menu (GtkWidget *widget)
-{
-	EWeekView *week_view = E_WEEK_VIEW (widget);
-	e_week_view_show_popup_menu (week_view, NULL,
-				     week_view->editing_event_num);
-	return TRUE;
-}
-
-void
-e_week_view_jump_to_button_item (EWeekView *week_view, GnomeCanvasItem *item)
-{
-	gint day;
-	GnomeCalendar *calendar;
-
-	for (day = 0; day < E_WEEK_VIEW_MAX_WEEKS * 7; ++day) {
-		if (item == week_view->jump_buttons[day]) {
-			calendar = e_calendar_view_get_calendar (E_CALENDAR_VIEW (week_view));
-			if (calendar)
-				gnome_calendar_dayjump
-					(calendar,
-					 week_view->day_starts[day]);
-			else
-				g_warning ("Calendar not set");
-			return;
-		}
-	}
-}
-
-static gboolean
-e_week_view_on_jump_button_event (GnomeCanvasItem *item,
-				  GdkEvent *event,
-				  EWeekView *week_view)
-{
-	gint day;
-
-	if (event->type == GDK_BUTTON_PRESS) {
-		e_week_view_jump_to_button_item (week_view, item);
-		return TRUE;
-	}
-	else if (event->type == GDK_KEY_PRESS) {
-		/* return, if Tab, Control or Alt is pressed */
-		if ((event->key.keyval == GDK_Tab) ||
-		    (event->key.state & (GDK_CONTROL_MASK | GDK_MOD1_MASK)))
-			return FALSE;
-		/* with a return key or a simple character (from 0x20 to 0xff),
-		 * jump to the day
-		 */
-		if ((event->key.keyval == GDK_Return) ||
-		    ((event->key.keyval >= 0x20) &&
-		     (event->key.keyval <= 0xFF))) {
-			e_week_view_jump_to_button_item (week_view, item);
-			return TRUE;
-		}
-	}
-	else if (event->type == GDK_FOCUS_CHANGE) {
-		GdkEventFocus *focus_event = (GdkEventFocus *)event;
-		GdkPixbuf *pixbuf = NULL;
-
-		for (day = 0; day < E_WEEK_VIEW_MAX_WEEKS * 7; day++) {
-			if (item == week_view->jump_buttons[day])
-				break;
-		}
-
-		if (focus_event->in) {
-			week_view->focused_jump_button = day;
-			pixbuf = gdk_pixbuf_new_from_xpm_data ((const char**) jump_xpm_focused);
-			gnome_canvas_item_set (week_view->jump_buttons[day],
-					       "GnomeCanvasPixbuf::pixbuf",
-					       pixbuf, NULL);
-		}
-		else {
-			week_view->focused_jump_button = E_WEEK_VIEW_JUMP_BUTTON_NO_FOCUS;
-			pixbuf = gdk_pixbuf_new_from_xpm_data ((const char**) jump_xpm);
-			gnome_canvas_item_set (week_view->jump_buttons[day],
-					       "GnomeCanvasPixbuf::pixbuf",
-					       pixbuf, NULL);
-		}
-		if (pixbuf)
-			gdk_pixbuf_unref (pixbuf);
-	}
-
-	return FALSE;
-}
-
-
-/* Converts an hour from 0-23 to the preferred time format, and returns the
-   suffix to add and the width of it in the normal font. */
-void
-e_week_view_convert_time_to_display	(EWeekView	*week_view,
-					 gint		 hour,
-					 gint		*display_hour,
-					 gchar	       **suffix,
-					 gint		*suffix_width)
-{
-	/* Calculate the actual hour number to display. For 12-hour
-	   format we convert 0-23 to 12-11am/12-11pm. */
-	*display_hour = hour;
-	if (e_calendar_view_get_use_24_hour_format (E_CALENDAR_VIEW (week_view))) {
-		*suffix = "";
-		*suffix_width = 0;
-	} else {
-		if (hour < 12) {
-			*suffix = week_view->am_string;
-			*suffix_width = week_view->am_string_width;
-		} else {
-			*display_hour -= 12;
-			*suffix = week_view->pm_string;
-			*suffix_width = week_view->pm_string_width;
-		}
-
-		/* 12-hour uses 12:00 rather than 0:00. */
-		if (*display_hour == 0)
-			*display_hour = 12;
-	}
-}
-
-
-gint
-e_week_view_get_time_string_width	(EWeekView	*week_view)
-{
-	gint time_width;
-
-	if (week_view->use_small_font && week_view->small_font_desc)
-		time_width = week_view->digit_width * 2
-			+ week_view->small_digit_width * 2;
-	else
-		time_width = week_view->digit_width * 4
-			+ week_view->colon_width;
-
-	if (!e_calendar_view_get_use_24_hour_format (E_CALENDAR_VIEW (week_view)))
-		time_width += MAX (week_view->am_string_width,
-				   week_view->pm_string_width);
-
-	return time_width;
-}
-
-/* Queues a layout, unless one is already queued. */
-static void
-e_week_view_queue_layout (EWeekView *week_view)
-{
-	if (week_view->layout_timeout_id == 0) {
-		week_view->layout_timeout_id = g_timeout_add (E_WEEK_VIEW_LAYOUT_TIMEOUT, e_week_view_layout_timeout_cb, week_view);
-	}
-}
-
-
-/* Removes any queued layout. */
-static void
-e_week_view_cancel_layout (EWeekView *week_view)
-{
-	if (week_view->layout_timeout_id != 0) {
-		gtk_timeout_remove (week_view->layout_timeout_id);
-		week_view->layout_timeout_id = 0;
-	}
-}
-
-
-static gboolean
-e_week_view_layout_timeout_cb (gpointer data)
-{
-	EWeekView *week_view = E_WEEK_VIEW (data);
-
-	gtk_widget_queue_draw (week_view->main_canvas);
-	e_week_view_check_layout (week_view);
-
-	week_view->layout_timeout_id = 0;
-	return FALSE;
-}
-
-
-/* Returns the number of selected events (0 or 1 at present). */
-gint
-e_week_view_get_num_events_selected (EWeekView *week_view)
-{
-	g_return_val_if_fail (E_IS_WEEK_VIEW (week_view), 0);
-
-	return (week_view->editing_event_num != -1) ? 1 : 0;
-}
-
-gboolean
-e_week_view_is_jump_button_visible (EWeekView *week_view, gint day)
-{
-	g_return_val_if_fail (E_IS_WEEK_VIEW (week_view), FALSE);
-
-	if ((day >= 0) && (day < E_WEEK_VIEW_MAX_WEEKS * 7))
-		return week_view->jump_buttons[day]->object.flags & GNOME_CANVAS_ITEM_VISIBLE;
-	return FALSE;
-}
diff --git a/calendar/gui/e-week-view.h b/calendar/gui/e-week-view.h
deleted file mode 100644
index 58ff08aa22..0000000000
--- a/calendar/gui/e-week-view.h
+++ /dev/null
@@ -1,444 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-
-/* 
- * Author : 
- *  Damon Chaplin <damon@ximian.com>
- *
- * Copyright 1999, Ximian, Inc.
- * Copyright 2001, Ximian, Inc.
- *
- * This program is free software; you can redistribute it and/or 
- * modify it under the terms of version 2 of the GNU General Public 
- * License as published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public 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 <libgnomecanvas/gnome-canvas.h>
-
-#include "e-calendar-view.h"
-#include "gnome-cal.h"
-
-#ifdef __cplusplus
-extern "C" {
-#endif /* __cplusplus */
-
-/*
- * EWeekView - displays the Week & Month views of the calendar.
- */
-
-/* The maximum number of weeks we show. 5 is usually enough for 1 month,
-   but we allow 6 for longer selections. */
-#define E_WEEK_VIEW_MAX_WEEKS		6
-
-/* The size of the reminder & recurrence icons, and padding around them.
-   X_PAD is the padding between icons. R_PAD is the padding on the right of
-   the last icon, before the event text. */
-#define E_WEEK_VIEW_ICON_WIDTH		16
-#define E_WEEK_VIEW_ICON_HEIGHT		16
-#define E_WEEK_VIEW_ICON_X_PAD		1
-#define E_WEEK_VIEW_ICON_Y_PAD		1
-#define E_WEEK_VIEW_ICON_R_PAD		8
-
-/* The space on the left & right outside of the event. (The triangle to
-   indicate the event continues is displayed in this space). */
-#define E_WEEK_VIEW_EVENT_L_PAD		2
-#define E_WEEK_VIEW_EVENT_R_PAD		2
-
-/* The vertical spacing between rows of events. */
-#define E_WEEK_VIEW_EVENT_Y_SPACING	1
-
-/* The size of the border around long events. */
-#define E_WEEK_VIEW_EVENT_BORDER_WIDTH	1
-#define E_WEEK_VIEW_EVENT_BORDER_HEIGHT	1
-
-/* The padding on the top and bottom of the event text. */
-#define E_WEEK_VIEW_EVENT_TEXT_Y_PAD	1
-
-/* The space between the start and end times. */
-#define E_WEEK_VIEW_EVENT_TIME_SPACING	2
-
-/* The space between the time and the event text or icons. */
-#define E_WEEK_VIEW_EVENT_TIME_X_PAD	8
-
-/* The space between the borders of long events and any text of icons. */
-#define E_WEEK_VIEW_EVENT_EDGE_X_PAD	2
-
-/* The padding above and on the right of the date string at the top of each
-   cell. */
-#define E_WEEK_VIEW_DATE_T_PAD		2
-#define E_WEEK_VIEW_DATE_R_PAD		4
-
-/* The padding above and below the line under the date string, in the Week
-   view, and also the space on the left of it. */
-#define E_WEEK_VIEW_DATE_LINE_T_PAD	1
-#define E_WEEK_VIEW_DATE_LINE_B_PAD	1
-#define E_WEEK_VIEW_DATE_LINE_L_PAD	10
-
-/* The padding below the date string in the Month view. */
-#define E_WEEK_VIEW_DATE_B_PAD		1
-
-/* We use a 7-bit field to store row numbers in EWeekViewEventSpan, so the
-   maximum number or rows we can allow is 127. It is very unlikely to be
-   reached anyway. */
-#define E_WEEK_VIEW_MAX_ROWS_PER_CELL	127
-
-/* These index our colors array. */
-typedef enum
-{
-	E_WEEK_VIEW_COLOR_EVEN_MONTHS,
-	E_WEEK_VIEW_COLOR_ODD_MONTHS,
-	E_WEEK_VIEW_COLOR_EVENT_BACKGROUND,
-	E_WEEK_VIEW_COLOR_EVENT_BORDER,
-	E_WEEK_VIEW_COLOR_EVENT_TEXT,
-	E_WEEK_VIEW_COLOR_GRID,
-	E_WEEK_VIEW_COLOR_SELECTED,
-	E_WEEK_VIEW_COLOR_SELECTED_UNFOCUSSED,
-	E_WEEK_VIEW_COLOR_DATES,
-	E_WEEK_VIEW_COLOR_DATES_SELECTED,
-	E_WEEK_VIEW_COLOR_TODAY,
-	
-	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;
-
-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 {
-	E_CALENDAR_VIEW_EVENT_FIELDS
-	gint spans_index;
-	guint8 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
-{
-	ECalendarView cal_view;
-
-	/* 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];
-	gint focused_jump_button;
-
-	GtkWidget *vscrollbar;
-
-	/* The query object */
-	ECalView *query;
-
-	/* The array of EWeekViewEvent elements. */
-	GArray *events;
-	gboolean events_sorted;
-	gboolean events_need_layout;
-	gboolean events_need_reshape;
-
-	/* The ID of the timeout function for doing a new layout. */
-	gint layout_timeout_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;
-
-	gboolean update_base_date;
-	
-	/* How many weeks we are showing. This is only relevant if
-	   display_month is TRUE. */
-	gint weeks_shown;
-
-	/* If Sat & Sun are compressed. Only applicable in month view, since
-	   they are always compressed into 1 cell in the week view. */
-	gboolean compress_weekend;
-
-	/* Whether we use show event end times. */
-	gboolean show_event_end_times;
-
-	/* The first day of the week, 0 (Monday) to 6 (Sunday). */
-	gint week_start_day;
-
-	/* The first day of the week we display, 0 (Monday) to 6 (Sunday).
-	   This will usually be week_start_day, but if the weekend is
-	   compressed, and week_start_day is Sunday we have to use Saturday. */
-	gint display_start_day;
-
-	/* The vertical offset of the events from the top of the cells. */
-	gint events_y_offset;
-
-	/* The height of the events, not including spacing between them. */
-	gint row_height;
-
-	/* The number of rows of events in each cell. */
-	gint rows_per_cell;
-	gint rows_per_compressed_cell;
-
-	/* The number of rows we have used for each day (i.e. each cell) */
-	gint rows_per_day[E_WEEK_VIEW_MAX_WEEKS * 7];
-
-	/* If the small font is used for displaying the minutes. */
-	gboolean use_small_font;
-
-	/* Small font to display the minutes. */
-	PangoFontDescription *small_font_desc;
-
-	/* 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. */
-	GdkPixbuf *reminder_icon;
-	GdkPixbuf *recurrence_icon;
-	GdkPixbuf *attach_icon;
-	GdkPixbuf *timezone_icon;
-
-	/* 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;
-
-	/* This is used to remember the last edited event. */
-	gchar *last_edited_comp_string;
-
-	/* The event that the context menu is for. */
-	gint popup_event_num;
-
-	/* The last mouse position when dragging, in the entire canvas. */
-	gint drag_event_x;
-	gint drag_event_y;
-
-	/* "am" and "pm" in the current locale, and their widths. */
-	gchar *am_string;
-	gchar *pm_string;
-	gint am_string_width;
-	gint pm_string_width;
-};
-
-struct _EWeekViewClass
-{
-	ECalendarViewClass parent_class;
-};
-
-
-GtkType	   e_week_view_get_type			(void);
-GtkWidget* e_week_view_new			(void);
-
-/* 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);
-
-/* 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_visible	(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);
-
-/* Whether to update the base date when the time range changes */
-gboolean e_week_view_get_update_base_date (EWeekView *week_view);
-void e_week_view_set_update_base_date (EWeekView *week_view, gboolean update_base_date);
-
-/* The number of weeks shown in the multi-week view. */
-gint	   e_week_view_get_weeks_shown		(EWeekView	*week_view);
-void	   e_week_view_set_weeks_shown		(EWeekView	*week_view,
-						 gint		 weeks_shown);
-
-/* Whether the weekend (Sat/Sun) should be compressed into 1 cell in the Month
-   view. In the Week view they are always compressed. */
-gboolean   e_week_view_get_compress_weekend	(EWeekView	*week_view);
-void       e_week_view_set_compress_weekend	(EWeekView	*week_view,
-						 gboolean	 compress);
-
-/* Whether we display event end times. */
-gboolean   e_week_view_get_show_event_end_times	(EWeekView	*week_view);
-void	   e_week_view_set_show_event_end_times	(EWeekView	*week_view,
-						 gboolean	 show);
-
-/* The first day of the week, 0 (Monday) to 6 (Sunday). */
-gint	   e_week_view_get_week_start_day	(EWeekView	*week_view);
-void	   e_week_view_set_week_start_day	(EWeekView	*week_view,
-						 gint		 week_start_day);
-
-void       e_week_view_delete_occurrence        (EWeekView      *week_view);
-
-/* Returns the number of selected events (0 or 1 at present). */
-gint	   e_week_view_get_num_events_selected	(EWeekView	*week_view);
-
-/*
- * Internal functions called by the associated canvas items.
- */
-void       e_week_view_get_day_position		(EWeekView	*week_view,
-						 gint		 day,
-						 gint		*day_x,
-						 gint		*day_y,
-						 gint		*day_w,
-						 gint		*day_h);
-gboolean   e_week_view_get_span_position	(EWeekView	*week_view,
-						 gint		 event_num,
-						 gint		 span_num,
-						 gint		*span_x,
-						 gint		*span_y,
-						 gint		*span_w);
-gboolean   e_week_view_is_one_day_event		(EWeekView	*week_view,
-						 gint		 event_num);
-gboolean   e_week_view_start_editing_event	(EWeekView	*week_view,
-						 gint		 event_num,
-						 gint		 span_num,
-						 gchar		*initial_text);
-void	   e_week_view_stop_editing_event	(EWeekView	*week_view);
-
-void	   e_week_view_show_popup_menu		(EWeekView	*week_view,
-						 GdkEventButton *event,
-						 gint		 event_num);
-
-void	   e_week_view_convert_time_to_display	(EWeekView	*week_view,
-						 gint		 hour,
-						 gint		*display_hour,
-						 gchar	       **suffix,
-						 gint		*suffix_width);
-gint	   e_week_view_get_time_string_width	(EWeekView	*week_view);
-
-gint	   e_week_view_event_sort_func		(const void	*arg1,
-						 const void	*arg2);
-
-gboolean e_week_view_find_event_from_item (EWeekView	  *week_view,
- 					   GnomeCanvasItem *item,
- 					   gint		  *event_num_return,
- 					   gint		  *span_num_return);
-
-gboolean e_week_view_is_jump_button_visible (EWeekView *week_view,
-					     gint day);
-void e_week_view_jump_to_button_item (EWeekView *week_view, GnomeCanvasItem *item);
-
-#ifdef __cplusplus
-}
-#endif /* __cplusplus */
-
-#endif /* _E_WEEK_VIEW_H_ */
diff --git a/calendar/gui/gnome-cal.c b/calendar/gui/gnome-cal.c
deleted file mode 100644
index c515dc36e9..0000000000
--- a/calendar/gui/gnome-cal.c
+++ /dev/null
@@ -1,3324 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-/* Evolution calendar - Main calendar view widget
- *
- * Copyright (C) 1998 The Free Software Foundation
- * Copyright (C) 2000 Ximian, Inc.
- * Copyright (C) 2001 Ximian, Inc.
- * Copyright (C) 2003 Novell, Inc
- *
- * Authors: Miguel de Icaza <miguel@ximian.com>
- *          Federico Mena-Quintero <federico@ximian.com>
- *          Seth Alves <alves@hungry.com>
- *          Rodrigo Moya <rodrigo@ximian.com>
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of version 2 of the GNU General Public
- * License as published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307, USA.
- */
-
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
-
-#include <unistd.h>
-#include <math.h>
-#include <signal.h>
-#include <sys/wait.h>
-#include <fcntl.h>
-#include <glib.h>
-#include <gdk/gdkkeysyms.h>
-#include <gtk/gtkbindings.h>
-#include <libgnome/gnome-i18n.h>
-#include <libgnome/gnome-util.h>
-#include <libgnomeui/gnome-dialog.h>
-#include <libgnomeui/gnome-dialog-util.h>
-#include <bonobo/bonobo-exception.h>
-#include <libedataserver/e-categories.h>
-#include <libedataserver/e-url.h>
-#include "e-util/e-config-listener.h"
-#include "shell/e-user-creatable-items-handler.h"
-#include <libecal/e-cal-time-util.h>
-#include <gal/menus/gal-view-factory-etable.h>
-#include <gal/menus/gal-view-etable.h>
-#include <gal/menus/gal-define-views-dialog.h>
-#include "widgets/menus/gal-view-menus.h"
-#include "widgets/misc/e-error.h"
-#include "e-comp-editor-registry.h"
-#include "dialogs/delete-error.h"
-#include "dialogs/event-editor.h"
-#include "dialogs/task-editor.h"
-#include "comp-util.h"
-#include "e-calendar-marshal.h"
-#include "e-cal-model-calendar.h"
-#include "e-day-view.h"
-#include "e-day-view-config.h"
-#include "e-day-view-time-item.h"
-#include "e-week-view.h"
-#include "e-week-view-config.h"
-#include "e-cal-list-view.h"
-#include "e-cal-list-view-config.h"
-#include "e-mini-calendar-config.h"
-#include "e-calendar-table-config.h"
-#include "evolution-calendar.h"
-#include "gnome-cal.h"
-#include "calendar-component.h"
-#include "cal-search-bar.h"
-#include "calendar-commands.h"
-#include "calendar-config.h"
-#include "calendar-view.h"
-#include "calendar-view-factory.h"
-#include "tag-calendar.h"
-#include "misc.h"
-#include "ea-calendar.h"
-#include "common/authentication.h"
-#include "e-cal-popup.h"
-#include "e-cal-menu.h"
-
-/* FIXME glib 2.4 and above has this */
-#ifndef G_MAXINT32
-#define G_MAXINT32	((gint32)  0x7fffffff)
-#endif
-
-
-
-/* Private part of the GnomeCalendar structure */
-struct _GnomeCalendarPrivate {
-	/* The clients for display */
-	
-	GHashTable *clients[E_CAL_SOURCE_TYPE_LAST];
-	GList *clients_list[E_CAL_SOURCE_TYPE_LAST];
-	ECal *default_client[E_CAL_SOURCE_TYPE_LAST];
-
-	EConfigListener *config_listener;
-
-	/*
-	 * Fields for the calendar view
-	 */
-
-	/* This is the last time explicitly selected by the user */
-	time_t base_view_time;
-	
-	/* Widgets */
-
-	GtkWidget   *search_bar;
-
-	GtkWidget   *hpane;
-	GtkWidget   *notebook;
-	GtkWidget   *vpane;
-
-	ECalendar   *date_navigator;
-	EMiniCalendarConfig *date_navigator_config;	
-	GtkWidget   *todo;
-	ECalendarTableConfig *todo_config;
-	
-	GtkWidget   *day_view;
-	GtkWidget   *work_week_view;
-	GtkWidget   *week_view;
-	GtkWidget   *month_view;
-	GtkWidget   *list_view;
-
-	/* Activity */
-	EActivityHandler *activity_handler;
-
-	/* plugin menu managers */
-	ECalMenu    *calendar_menu;
-	ECalMenu    *taskpad_menu;
-
-	/* Calendar query for the date navigator */
-	GList       *dn_queries; /* list of CalQueries */
-	char        *sexp;
-	char        *todo_sexp;
-	guint        update_timeout;
-	
-	/* 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. */
-	ECalendarView    *views[GNOME_CAL_LAST_VIEW];
-	GObject    *configs[GNOME_CAL_LAST_VIEW];
-	GnomeCalendarViewType current_view_type;
-	GList *notifications;
-	
-	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. */
-	gint	     hpane_pos;
-	gint	     vpane_pos;
-	gint	     hpane_pos_month_view;
-	gint	     vpane_pos_month_view;
-
-	/* The signal handler id for our GtkCalendar "day_selected" handler. */
-	guint	     day_selected_id;
-
-	/* View instance and menus for the control */
-	GalViewInstance *view_instance;
-	GalViewMenus *view_menus;
-
-	/* Our current week start */
-	int week_start;
-	
-	/* Our current timezone. */
-	icaltimezone *zone;
-
-	/* The dates currently shown. If they are -1 then we have no dates
-	   shown. We only use these to check if we need to emit a
-	   'dates-shown-changed' signal.*/
-	time_t visible_start;
-	time_t visible_end;
-	gboolean updating;
-};
-
-/* Signal IDs */
-
-enum {
-	DATES_SHOWN_CHANGED,
-	CALENDAR_SELECTION_CHANGED,
-	TASKPAD_SELECTION_CHANGED,
-	CALENDAR_FOCUS_CHANGE,
-	TASKPAD_FOCUS_CHANGE,
-	GOTO_DATE,
-	SOURCE_ADDED,
-	SOURCE_REMOVED,
-	LAST_SIGNAL
-};
-
-/* Used to indicate who has the focus within the calendar view */
-typedef enum {
-	FOCUS_CALENDAR,
-	FOCUS_TASKPAD,
-	FOCUS_OTHER
-} FocusLocation;
-
-static guint gnome_calendar_signals[LAST_SIGNAL];
-
-
-
-
-static void gnome_calendar_destroy (GtkObject *object);
-static void gnome_calendar_goto_date (GnomeCalendar *gcal,
-				      GnomeCalendarGotoDateType goto_date);
-
-static void gnome_calendar_set_pane_positions	(GnomeCalendar	*gcal);
-static void update_view_times (GnomeCalendar *gcal, time_t start_time);
-static void gnome_calendar_update_date_navigator (GnomeCalendar *gcal);
-
-static void gnome_calendar_hpane_realized (GtkWidget *w, GnomeCalendar *gcal);
-static void gnome_calendar_vpane_realized (GtkWidget *w, GnomeCalendar *gcal);
-static gboolean gnome_calendar_vpane_resized (GtkWidget *w, GdkEventButton *e, GnomeCalendar *gcal);
-static gboolean gnome_calendar_hpane_resized (GtkWidget *w, GdkEventButton *e, GnomeCalendar *gcal);
-
-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 void gnome_calendar_notify_dates_shown_changed (GnomeCalendar *gcal);
-
-static void update_query (GnomeCalendar *gcal);
-
-static void update_todo_view (GnomeCalendar *gcal);
-
-G_DEFINE_TYPE (GnomeCalendar, gnome_calendar, GTK_TYPE_VBOX);
-
-/* Class initialization function for the gnome calendar */
-static void
-gnome_calendar_class_init (GnomeCalendarClass *class)
-{
-	GtkObjectClass *object_class;
-	GtkBindingSet *binding_set;
-
-	object_class = (GtkObjectClass *) class;
-
-	gnome_calendar_signals[DATES_SHOWN_CHANGED] =
-		gtk_signal_new ("dates_shown_changed",
-				GTK_RUN_LAST,
-				G_TYPE_FROM_CLASS (object_class),
-				GTK_SIGNAL_OFFSET (GnomeCalendarClass,
-						   dates_shown_changed),
-				gtk_marshal_NONE__NONE,
-				GTK_TYPE_NONE, 0);
-
-	gnome_calendar_signals[CALENDAR_SELECTION_CHANGED] =
-		gtk_signal_new ("calendar_selection_changed",
-				GTK_RUN_LAST,
-				G_TYPE_FROM_CLASS (object_class),
-				GTK_SIGNAL_OFFSET (GnomeCalendarClass, calendar_selection_changed),
-				gtk_marshal_NONE__NONE,
-				GTK_TYPE_NONE, 0);
-
-	gnome_calendar_signals[TASKPAD_SELECTION_CHANGED] =
-		gtk_signal_new ("taskpad_selection_changed",
-				GTK_RUN_LAST,
-				G_TYPE_FROM_CLASS (object_class),
-				GTK_SIGNAL_OFFSET (GnomeCalendarClass, taskpad_selection_changed),
-				gtk_marshal_NONE__NONE,
-				GTK_TYPE_NONE, 0);
-
-	gnome_calendar_signals[CALENDAR_FOCUS_CHANGE] =
-		gtk_signal_new ("calendar_focus_change",
-				GTK_RUN_FIRST,
-				G_TYPE_FROM_CLASS (object_class),
-				GTK_SIGNAL_OFFSET (GnomeCalendarClass, calendar_focus_change),
-				gtk_marshal_NONE__BOOL,
-				GTK_TYPE_NONE, 1,
-				GTK_TYPE_BOOL);
-
-	gnome_calendar_signals[TASKPAD_FOCUS_CHANGE] =
-		gtk_signal_new ("taskpad_focus_change",
-				GTK_RUN_FIRST,
-				G_TYPE_FROM_CLASS (object_class),
-				GTK_SIGNAL_OFFSET (GnomeCalendarClass, taskpad_focus_change),
-				gtk_marshal_NONE__BOOL,
-				GTK_TYPE_NONE, 1,
-				GTK_TYPE_BOOL);
-
-	gnome_calendar_signals[SOURCE_ADDED] =
-		g_signal_new ("source_added",
-			      G_TYPE_FROM_CLASS (object_class),
-			      G_SIGNAL_RUN_FIRST,
-			      G_STRUCT_OFFSET (GnomeCalendarClass, source_added),
-			      NULL, NULL,
-			      e_calendar_marshal_VOID__INT_OBJECT,
-			      G_TYPE_NONE,
-			      2,
-			      G_TYPE_INT, G_TYPE_OBJECT);
-
-	gnome_calendar_signals[SOURCE_REMOVED] =
-		g_signal_new ("source_removed",
-			      G_TYPE_FROM_CLASS (object_class),
-			      G_SIGNAL_RUN_FIRST,
-			      G_STRUCT_OFFSET (GnomeCalendarClass, source_removed),
-			      NULL, NULL,
-			      e_calendar_marshal_VOID__INT_OBJECT,
-			      G_TYPE_NONE,
-			      2,
-			      G_TYPE_INT, G_TYPE_OBJECT);
-
-	gnome_calendar_signals[GOTO_DATE] =
-		g_signal_new ("goto_date",
-			      G_TYPE_FROM_CLASS (object_class),
-			      G_SIGNAL_RUN_FIRST | G_SIGNAL_ACTION,
-			      G_STRUCT_OFFSET (GnomeCalendarClass, goto_date),
-			      NULL, NULL,
-			      g_cclosure_marshal_VOID__INT,
-			      G_TYPE_NONE,
-			      1,
-			      G_TYPE_INT);
-
-	object_class->destroy = gnome_calendar_destroy;
-
-	class->dates_shown_changed = NULL;
-	class->calendar_selection_changed = NULL;
-	class->taskpad_selection_changed = NULL;
-	class->calendar_focus_change = NULL;
-	class->taskpad_focus_change = NULL;
-	class->source_added = NULL;
-	class->source_removed = NULL;
-	class->goto_date = gnome_calendar_goto_date;
-
-	/*
-	 * Key bindings
-	 */
-
-	binding_set = gtk_binding_set_by_class (class);
-
-	/* Alt+PageUp/PageDown, go to the first/last day of the month */
-	gtk_binding_entry_add_signal (binding_set, GDK_Page_Up,
-				      GDK_MOD1_MASK,
-				      "goto_date", 1,
-				      G_TYPE_ENUM,
-				      GNOME_CAL_GOTO_FIRST_DAY_OF_MONTH);
-	gtk_binding_entry_add_signal (binding_set, GDK_KP_Page_Up,
-				      GDK_MOD1_MASK,
-				      "goto_date", 1,
-				      G_TYPE_ENUM,
-				      GNOME_CAL_GOTO_FIRST_DAY_OF_MONTH);
-	gtk_binding_entry_add_signal (binding_set, GDK_Page_Down,
-				      GDK_MOD1_MASK,
-				      "goto_date", 1,
-				      G_TYPE_ENUM,
-				      GNOME_CAL_GOTO_LAST_DAY_OF_MONTH);
-	gtk_binding_entry_add_signal (binding_set, GDK_KP_Page_Down,
-				      GDK_MOD1_MASK,
-				      "goto_date", 1,
-				      G_TYPE_ENUM,
-				      GNOME_CAL_GOTO_LAST_DAY_OF_MONTH);
-
-	/* Alt+Home/End, go to the first/last day of the week */
-	gtk_binding_entry_add_signal (binding_set, GDK_Home,
-				      GDK_MOD1_MASK,
-				      "goto_date", 1,
-				      G_TYPE_ENUM,
-				      GNOME_CAL_GOTO_FIRST_DAY_OF_WEEK);
-	gtk_binding_entry_add_signal (binding_set, GDK_End,
-				      GDK_MOD1_MASK,
-				      "goto_date", 1,
-				      G_TYPE_ENUM,
-				      GNOME_CAL_GOTO_LAST_DAY_OF_WEEK);
-	gtk_binding_entry_add_signal (binding_set, GDK_KP_Home,
-				      GDK_MOD1_MASK,
-				      "goto_date", 1,
-				      G_TYPE_ENUM,
-				      GNOME_CAL_GOTO_FIRST_DAY_OF_WEEK);
-	gtk_binding_entry_add_signal (binding_set, GDK_KP_End,
-				      GDK_MOD1_MASK,
-				      "goto_date", 1,
-				      G_TYPE_ENUM,
-				      GNOME_CAL_GOTO_LAST_DAY_OF_WEEK);
-
-	/*Alt+Left/Right, go to the same day of the previous/next week*/
-	gtk_binding_entry_add_signal (binding_set,GDK_Left,
-				      GDK_MOD1_MASK,
-				      "goto_date",1,
-				      G_TYPE_ENUM,
-				      GNOME_CAL_GOTO_SAME_DAY_OF_PREVIOUS_WEEK);
-	gtk_binding_entry_add_signal (binding_set,GDK_KP_Left,
-				      GDK_MOD1_MASK,
-				      "goto_date",1,
-				      G_TYPE_ENUM,
-				      GNOME_CAL_GOTO_SAME_DAY_OF_PREVIOUS_WEEK);
-	gtk_binding_entry_add_signal (binding_set,GDK_Right,
-				      GDK_MOD1_MASK,
-				      "goto_date",1,
-				      G_TYPE_ENUM,
-				      GNOME_CAL_GOTO_SAME_DAY_OF_NEXT_WEEK);
-	gtk_binding_entry_add_signal (binding_set,GDK_KP_Right,
-				      GDK_MOD1_MASK,
-				      "goto_date",1,
-				      G_TYPE_ENUM,
-				      GNOME_CAL_GOTO_SAME_DAY_OF_NEXT_WEEK);
-	/* init the accessibility support for gnome_calendar */
-	gnome_calendar_a11y_init ();
-
-}
-
-/* Callback used when the calendar query reports of an updated object */
-static void
-dn_e_cal_view_objects_added_cb (ECalView *query, GList *objects, gpointer data)
-{
-	GnomeCalendar *gcal;
-	GnomeCalendarPrivate *priv;
-	GList *l;
-	
-	gcal = GNOME_CALENDAR (data);
-	priv = gcal->priv;
-
-	for (l = objects; l; l = l->next) {
-		ECalComponent *comp = NULL;
-
-		comp = e_cal_component_new ();
-		if (!e_cal_component_set_icalcomponent (comp, icalcomponent_new_clone (l->data))) {
-			g_object_unref (comp);
-			
-			continue;
-		}
-
-		tag_calendar_by_comp (priv->date_navigator, comp, e_cal_view_get_client (query), NULL,
-				      FALSE, TRUE);
-		g_object_unref (comp);
-	}
-}
-
-static void
-dn_e_cal_view_objects_modified_cb (ECalView *query, GList *objects, gpointer data)
-{
-	GnomeCalendar *gcal;
-	GnomeCalendarPrivate *priv;
-
-	gcal = GNOME_CALENDAR (data);
-	priv = gcal->priv;
-
-	/* We have to retag the whole thing: an event may change dates
-	 * and the tag_calendar_by_comp() below would not know how to
-	 * untag the old dates.
-	 */
-	update_query (gcal);
-}
-
-/* Callback used when the calendar query reports of a removed object */
-static void
-dn_e_cal_view_objects_removed_cb (ECalView *query, GList *uids, gpointer data)
-{
-	GnomeCalendar *gcal;
-
-	gcal = GNOME_CALENDAR (data);
-
-	/* Just retag the whole thing */
-	update_query (gcal);
-}
-
-/* Callback used when the calendar query is done */
-static void
-dn_e_cal_view_done_cb (ECalView *query, ECalendarStatus status, gpointer data)
-{
-	GnomeCalendar *gcal;
-
-	gcal = GNOME_CALENDAR (data);
-
-	/* FIXME Better error reporting */
-	if (status != E_CALENDAR_STATUS_OK)
-		g_warning (G_STRLOC ": Query did not successfully complete");
-}
-
-/* Returns the current view widget, an EDayView, EWeekView or ECalListView. */
-GtkWidget*
-gnome_calendar_get_current_view_widget (GnomeCalendar *gcal)
-{
-	GnomeCalendarPrivate *priv;
-
-	priv = gcal->priv;
-
-	return GTK_WIDGET (priv->views[priv->current_view_type]);
-}
-
-static void
-get_times_for_views (GnomeCalendar *gcal, GnomeCalendarViewType view_type, time_t *start_time, time_t *end_time)
-{
-	GnomeCalendarPrivate *priv;
-	int shown, display_start;
-	GDate date;
-	gint weekday, first_day, last_day, days_shown, i;
-	gboolean has_working_days = FALSE;
-	guint offset;
-	struct icaltimetype tt = icaltime_null_time ();
-	
-	priv = gcal->priv;
-	
-	switch (view_type) {
-	case GNOME_CAL_DAY_VIEW:
-		shown  = e_day_view_get_days_shown (E_DAY_VIEW (priv->views[view_type]));
-		*start_time = time_day_begin_with_zone (*start_time, priv->zone);
-		*end_time = time_add_day_with_zone (*start_time, shown, priv->zone);
-		break;
-	case GNOME_CAL_WORK_WEEK_VIEW:
-		/* FIXME Kind of gross, but it works */
-		time_to_gdate_with_zone (&date, *start_time, priv->zone);
-
-		/* The start of the work-week is the first working day after the
-		   week start day. */
-
-		/* Get the weekday corresponding to start_time, 0 (Sun) to 6 (Sat). */
-		weekday = g_date_weekday (&date) % 7;
-
-		/* Find the first working day in the week, 0 (Sun) to 6 (Sat). */
-		first_day = (E_DAY_VIEW (priv->views[view_type])->week_start_day + 1) % 7;
-		for (i = 0; i < 7; i++) {
-			if (E_DAY_VIEW (priv->views[view_type])->working_days & (1 << first_day)) {
-				has_working_days = TRUE;
-				break;
-			}
-			first_day = (first_day + 1) % 7;
-		}
-
-		if (has_working_days) {
-			/* Now find the last working day of the week, backwards. */
-			last_day = E_DAY_VIEW (priv->views[view_type])->week_start_day % 7;
-			for (i = 0; i < 7; i++) {
-				if (E_DAY_VIEW (priv->views[view_type])->working_days & (1 << last_day))
-					break;
-				last_day = (last_day + 6) % 7;
-			}
-			/* Now calculate the days we need to show to include all the
-			   working days in the week. Add 1 to make it inclusive. */
-			days_shown = (last_day + 7 - first_day) % 7 + 1;
-		} else {
-			/* If no working days are set, just use 7. */
-			days_shown = 7;
-		}
-
-		/* Calculate how many days we need to go back to the first workday. */
-		if (weekday < first_day) {
-			offset = (first_day - weekday) % 7;
-			g_date_add_days (&date, offset);
-		} else {
-			offset = (weekday - first_day) % 7;
-			g_date_subtract_days (&date, offset);
-		}
-
-		tt.year = g_date_year (&date);
-		tt.month = g_date_month (&date);
-		tt.day = g_date_day (&date);
-
-		*start_time = icaltime_as_timet_with_zone (tt, priv->zone);
-		*end_time = time_add_day_with_zone (*start_time, days_shown, priv->zone);
-		break;
-	case GNOME_CAL_WEEK_VIEW:
-		/* FIXME We should be using the same day of the week enum every where */
-		display_start = (E_WEEK_VIEW (priv->views[view_type])->display_start_day + 1) % 7;
-
-		*start_time = time_week_begin_with_zone (*start_time, display_start, priv->zone);
-		*end_time = time_add_week_with_zone (*start_time, 1, priv->zone);
-		break;
-	case GNOME_CAL_MONTH_VIEW:
-		shown = e_week_view_get_weeks_shown (E_WEEK_VIEW (priv->views[view_type]));
-		/* FIXME We should be using the same day of the week enum every where */
-		display_start = (E_WEEK_VIEW (priv->views[view_type])->display_start_day + 1) % 7;
-		
-		if (!priv->range_selected)
-			*start_time = time_month_begin_with_zone (*start_time, priv->zone);
-		*start_time = time_week_begin_with_zone (*start_time, display_start, priv->zone);
-		*end_time = time_add_week_with_zone (*start_time, shown, priv->zone);
-		break;
-	case GNOME_CAL_LIST_VIEW:
-		/* FIXME What to do here? */
-		*start_time = time_month_begin_with_zone (*start_time, priv->zone);
-		*end_time = time_add_month_with_zone (*start_time, 1, priv->zone);
-		break;		
-	default:
-		g_assert_not_reached ();
-		return;
-	}
-}
-
-/* Gets the focus location based on who is the focused widget within the
- * calendar view.
- */
-static FocusLocation
-get_focus_location (GnomeCalendar *gcal)
-{
-	GnomeCalendarPrivate *priv;
-	ETable *etable;
-
-	priv = gcal->priv;
-
-	etable = e_calendar_table_get_table (E_CALENDAR_TABLE (priv->todo));
-
-	if (GTK_WIDGET_HAS_FOCUS (etable->table_canvas))
-		return FOCUS_TASKPAD;
-	else {
-		GtkWidget *widget;
-		EDayView *dv;
-		EWeekView *wv;
-		ECalListView *lv;
-
-		widget = gnome_calendar_get_current_view_widget (gcal);
-
-		switch (priv->current_view_type) {
-		case GNOME_CAL_DAY_VIEW:
-		case GNOME_CAL_WORK_WEEK_VIEW:
-			dv = E_DAY_VIEW (widget);
-
-			if (GTK_WIDGET_HAS_FOCUS (dv->top_canvas)
-			    || GNOME_CANVAS (dv->top_canvas)->focused_item != NULL
-			    || GTK_WIDGET_HAS_FOCUS (dv->main_canvas)
-			    || GNOME_CANVAS (dv->main_canvas)->focused_item != NULL)
-				return FOCUS_CALENDAR;
-			else
-				return FOCUS_OTHER;
-
-		case GNOME_CAL_WEEK_VIEW:
-		case GNOME_CAL_MONTH_VIEW:
-			wv = E_WEEK_VIEW (widget);
-
-			if (GTK_WIDGET_HAS_FOCUS (wv->main_canvas)
-			    || GNOME_CANVAS (wv->main_canvas)->focused_item != NULL)
-				return FOCUS_CALENDAR;
-			else
-				return FOCUS_OTHER;
-
-		case GNOME_CAL_LIST_VIEW:
-			lv = E_CAL_LIST_VIEW (widget);
-
-			if (GTK_WIDGET_HAS_FOCUS (e_table_scrolled_get_table (lv->table_scrolled)))
-				return FOCUS_CALENDAR;
-			else
-				return FOCUS_OTHER;
-
-		default:
-			g_assert_not_reached ();
-			return FOCUS_OTHER;
-		}
-	}
-}
-
-/* Computes the range of time that the date navigator is showing */
-static void
-get_date_navigator_range (GnomeCalendar *gcal, time_t *start_time, time_t *end_time)
-{
-	GnomeCalendarPrivate *priv;
-	gint start_year, start_month, start_day;
-	gint end_year, end_month, end_day;
-	struct icaltimetype start_tt;
-	struct icaltimetype end_tt;
-
-	priv = gcal->priv;
-
-	start_tt = icaltime_null_time ();
-	end_tt = icaltime_null_time ();
-
-	if (!e_calendar_item_get_date_range (priv->date_navigator->calitem,
-					     &start_year, &start_month, &start_day,
-					     &end_year, &end_month, &end_day)) {
-		*start_time = -1;
-		*end_time = -1;
-		return;
-	}
-
-	start_tt.year = start_year;
-	start_tt.month = start_month + 1;
-	start_tt.day = start_day;
-
-	end_tt.year = end_year;
-	end_tt.month = end_month + 1;
-	end_tt.day = end_day;
-
-	icaltime_adjust (&end_tt, 1, 0, 0, 0);
-
-	*start_time = icaltime_as_timet_with_zone (start_tt, priv->zone);
-	*end_time = icaltime_as_timet_with_zone (end_tt, priv->zone);
-}
-
-/* Adjusts a given query sexp with the time range of the date navigator */
-static char *
-adjust_e_cal_view_sexp (GnomeCalendar *gcal, const char *sexp)
-{
-	time_t start_time, end_time;
-	char *start, *end;
-	char *new_sexp;
-
-	get_date_navigator_range (gcal, &start_time, &end_time);
-	if (start_time == -1 || end_time == -1)
-		return NULL;
-
-	start = isodate_from_time_t (start_time);
-	end = isodate_from_time_t (end_time);
-
-	new_sexp = g_strdup_printf ("(and (occur-in-time-range? (make-time \"%s\")"
-				    "                           (make-time \"%s\"))"
-				    "     %s)",
-				    start, end,
-				    sexp);
-
-
-	g_free (start);
-	g_free (end);
-
-	return new_sexp;
-}
-
-/* Restarts a query for the date navigator in the calendar */
-static void
-update_query (GnomeCalendar *gcal)
-{
-	GnomeCalendarPrivate *priv;
-	ECalView *old_query;
-	char *real_sexp;
-	GList *l;
-
-	priv = gcal->priv;
-
-	if (priv->updating == TRUE) {
-		return;
-	}
-	e_calendar_view_set_status_message (E_CALENDAR_VIEW (priv->week_view), _("Updating query"));
-	e_calendar_item_clear_marks (priv->date_navigator->calitem);
-
-	priv->updating = TRUE;
-	/* free the previous queries */
-	for (l = priv->dn_queries; l != NULL; l = l->next) {
-		old_query = l->data;
-
-		if (old_query) {
-			g_signal_handlers_disconnect_matched (old_query, G_SIGNAL_MATCH_DATA,
-							      0, 0, NULL, NULL, gcal);
-			g_object_unref (old_query);
-		}
-	}
-
-	g_list_free (priv->dn_queries);
-	priv->dn_queries = NULL;
-
-	g_assert (priv->sexp != NULL);
-
-	real_sexp = adjust_e_cal_view_sexp (gcal, priv->sexp);
-	if (!real_sexp) {
-		e_calendar_view_set_status_message (E_CALENDAR_VIEW (priv->week_view), NULL);
-		priv->updating = FALSE;
-		return; /* No time range is set, so don't start a query */
-	}
-
-	/* create queries for each loaded client */
-	for (l = priv->clients_list[E_CAL_SOURCE_TYPE_EVENT]; l != NULL; l = l->next) {
-		/* don't create queries for clients not loaded yet */
-		if (e_cal_get_load_state ((ECal *) l->data) != E_CAL_LOAD_LOADED)
-			continue;
-
-		old_query = NULL;
-		if (!e_cal_get_query ((ECal *) l->data, real_sexp, &old_query, NULL)) {
-			g_warning (G_STRLOC ": Could not create the query");
-
-			continue;
-		}
-
-		g_signal_connect (old_query, "objects_added",
-				  G_CALLBACK (dn_e_cal_view_objects_added_cb), gcal);
-		g_signal_connect (old_query, "objects_modified",
-				  G_CALLBACK (dn_e_cal_view_objects_modified_cb), gcal);
-		g_signal_connect (old_query, "objects_removed",
-				  G_CALLBACK (dn_e_cal_view_objects_removed_cb), gcal);
-		g_signal_connect (old_query, "view_done",
-				  G_CALLBACK (dn_e_cal_view_done_cb), gcal);
-
-		priv->dn_queries = g_list_append (priv->dn_queries, old_query);
-
-		e_cal_view_start (old_query);
-	}
-
-	/* free memory */
-	priv->updating = FALSE;
-	g_free (real_sexp);
-	e_calendar_view_set_status_message (E_CALENDAR_VIEW (priv->week_view), NULL);
-	update_todo_view (gcal);
-}
-
-static void
-set_search_query (GnomeCalendar *gcal, const char *sexp)
-{
-	GnomeCalendarPrivate *priv;
-	int i;
-
-	g_return_if_fail (gcal != NULL);
-	g_return_if_fail (GNOME_IS_CALENDAR (gcal));
-	g_return_if_fail (sexp != NULL);
-
-	priv = gcal->priv;
-
-	/* Set the query on the date navigator */
-
-	if (priv->sexp)
-		g_free (priv->sexp);
-
-	priv->sexp = g_strdup (sexp);
-
-	update_query (gcal);
-
-	/* Set the query on the views */
-	for (i = 0; i < GNOME_CAL_LAST_VIEW; i++)
-		e_cal_model_set_search_query (e_calendar_view_get_model (priv->views[i]), sexp);
-
-	/* Set the query on the task pad */
-	update_todo_view (gcal);
-}
-
-/* Returns the current time, for the ECalendarItem. */
-static struct tm
-get_current_time (ECalendarItem *calitem, gpointer data)
-{
-	GnomeCalendar *cal = data;
-	struct tm tmp_tm = { 0 };
-	struct icaltimetype tt;
-
-	g_return_val_if_fail (cal != NULL, tmp_tm);
-	g_return_val_if_fail (GNOME_IS_CALENDAR (cal), tmp_tm);
-
-	tt = icaltime_from_timet_with_zone (time (NULL), FALSE,
-					    cal->priv->zone);
-
-	/* Now copy it to the struct tm and return it. */
-	tmp_tm = icaltimetype_to_tm (&tt);
-
-	return tmp_tm;
-}
-
-/* Callback used when the sexp changes in the calendar search bar */
-static void
-search_bar_sexp_changed_cb (CalSearchBar *cal_search, const char *sexp, gpointer data)
-{
-	GnomeCalendar *gcal;
-
-	gcal = GNOME_CALENDAR (data);
-	set_search_query (gcal, sexp);
-}
-
-/* Callback used when the selected category in the search bar changes */
-static void
-search_bar_category_changed_cb (CalSearchBar *cal_search, const char *category, gpointer data)
-{
-	GnomeCalendar *gcal;
-	GnomeCalendarPrivate *priv;
-	ECalModel *model;
-	int i;
-
-	gcal = GNOME_CALENDAR (data);
-	priv = gcal->priv;
-
-	for (i = 0; i < GNOME_CAL_LAST_VIEW; i++) {
-		e_calendar_view_set_default_category (E_CALENDAR_VIEW (priv->views[i]),
-						 category);
-	}
-
-	model = e_calendar_table_get_model (E_CALENDAR_TABLE (priv->todo));
-	e_cal_model_set_default_category (model, category);
-}
-
-static void
-view_selection_changed_cb (GtkWidget *view, GnomeCalendar *gcal)
-{
-	gtk_signal_emit (GTK_OBJECT (gcal),
-			 gnome_calendar_signals[CALENDAR_SELECTION_CHANGED]);
-}
-
-static void
-user_created_cb (GtkWidget *view, GnomeCalendar *gcal)
-{
-	GnomeCalendarPrivate *priv;	
-	ECal *ecal;
-	ECalModel *model;
-	
-	priv = gcal->priv;	
-
-	model = e_calendar_view_get_model (priv->views[priv->current_view_type]);
-	ecal = e_cal_model_get_default_client (model);
-
-	gnome_calendar_add_source (gcal, E_CAL_SOURCE_TYPE_EVENT, e_cal_get_source (ecal));
-}
-
-
-/* Callback used when the taskpad receives a focus event.  We emit the
- * corresponding signal so that parents can change the menus as appropriate.
- */
-static gint
-table_canvas_focus_change_cb (GtkWidget *widget, GdkEventFocus *event, gpointer data)
-{
-	GnomeCalendar *gcal;
-
-	gcal = GNOME_CALENDAR (data);
-
-	gtk_signal_emit (GTK_OBJECT (gcal), gnome_calendar_signals [TASKPAD_FOCUS_CHANGE],
-			 event->in ? TRUE : FALSE);
-
-	return FALSE;
-}
-
-static gint
-calendar_focus_change_cb (GtkWidget *widget, GdkEventFocus *event, gpointer data)
-{
-	GnomeCalendar *gcal;
-
-	gcal = GNOME_CALENDAR (data);
-
-	gtk_signal_emit (GTK_OBJECT (gcal), gnome_calendar_signals [CALENDAR_FOCUS_CHANGE],
-			 event->in ? TRUE : FALSE);
-
-	return FALSE;
-}
-
-/* Connects to the focus change signals of a day view widget */
-static void
-connect_day_view_focus (GnomeCalendar *gcal, EDayView *dv)
-{
-	g_signal_connect_after (dv->top_canvas, "focus_in_event",
-			  G_CALLBACK (calendar_focus_change_cb), gcal);
-	g_signal_connect_after (dv->top_canvas, "focus_out_event",
-			  G_CALLBACK (calendar_focus_change_cb), gcal);
-
-	g_signal_connect_after (dv->main_canvas, "focus_in_event",
-			  G_CALLBACK (calendar_focus_change_cb), gcal);
-	g_signal_connect_after (dv->main_canvas, "focus_out_event",
-				G_CALLBACK (calendar_focus_change_cb), gcal);
-}
-
-/* Connects to the focus change signals of a week view widget */
-static void
-connect_week_view_focus (GnomeCalendar *gcal, EWeekView *wv)
-{
-	if (!E_IS_WEEK_VIEW (wv))
-		return;
-
-	g_signal_connect (wv->main_canvas, "focus_in_event",
-			  G_CALLBACK (calendar_focus_change_cb), gcal);
-	g_signal_connect (wv->main_canvas, "focus_out_event",
-			  G_CALLBACK (calendar_focus_change_cb), gcal);
-}
-
-static void
-connect_list_view_focus (GnomeCalendar *gcal, ECalListView *lv)
-{
-	ETable *etable;
-	
-	etable = e_table_scrolled_get_table (lv->table_scrolled);
-	
-	g_signal_connect (etable->table_canvas, "focus_in_event",
-			  G_CALLBACK (calendar_focus_change_cb), gcal);
-	g_signal_connect (etable->table_canvas, "focus_out_event",
-			  G_CALLBACK (calendar_focus_change_cb), gcal);
-}
-
-/* Callback used when the selection in the taskpad table changes.  We just proxy
- * the signal with our own one.
- */
-static void
-table_selection_change_cb (ETable *etable, gpointer data)
-{
-	GnomeCalendar *gcal;
-	int n_selected;
-
-	gcal = GNOME_CALENDAR (data);
-
-	n_selected = e_table_selected_count (etable);
-	gtk_signal_emit (GTK_OBJECT (gcal), gnome_calendar_signals[TASKPAD_SELECTION_CHANGED]);
-}
-
-static void
-set_week_start (GnomeCalendar *calendar)
-{
-	GnomeCalendarPrivate *priv;
-
-	priv = calendar->priv;
-	
-	priv->week_start = calendar_config_get_week_start_day ();
-
-	/* Only do this if views exist */
-	if (priv->day_view && priv->work_week_view && priv->week_view && priv->month_view && priv->list_view) {
-		update_view_times (calendar, priv->base_view_time);
-		gnome_calendar_update_date_navigator (calendar);
-		gnome_calendar_notify_dates_shown_changed (calendar);
-	}
-}
-
-static void
-week_start_changed_cb (GConfClient *client, guint id, GConfEntry *entry, gpointer data)
-{
-	GnomeCalendar *calendar = data;
-	
-	set_week_start (calendar);
-}
-
-static void
-set_working_days (GnomeCalendar *calendar)
-{
-	GnomeCalendarPrivate *priv;
-
-	priv = calendar->priv;
-	
-	/* Only do this if views exist */
-	if (priv->day_view && priv->work_week_view && priv->week_view && priv->month_view && priv->list_view) {
-		update_view_times (calendar, priv->base_view_time);
-		gnome_calendar_update_date_navigator (calendar);
-		gnome_calendar_notify_dates_shown_changed (calendar);
-	}
-}
-
-static void
-working_days_changed_cb (GConfClient *client, guint id, GConfEntry *entry, gpointer data)
-{
-	GnomeCalendar *calendar = data;
-	
-	set_working_days (calendar);
-}
-
-static void
-set_timezone (GnomeCalendar *calendar) 
-{
-	GnomeCalendarPrivate *priv;
-	int i;
-	
-	priv = calendar->priv;
-	
-	priv->zone = calendar_config_get_icaltimezone ();
-
-	for (i = 0; i < E_CAL_SOURCE_TYPE_LAST; i++) {
-		GList *l;
-
-		for (l = priv->clients_list[i]; l != NULL; l = l->next) {
-			ECal *client = l->data;
-			
-			if (e_cal_get_load_state (client) == E_CAL_LOAD_LOADED)
-				/* FIXME Error checking */
-				e_cal_set_default_timezone (client, priv->zone, NULL);
-		}
-
-		if (priv->default_client[i] 
-		    && e_cal_get_load_state (priv->default_client[i]) == E_CAL_LOAD_LOADED)
-			/* FIXME Error checking */
-			e_cal_set_default_timezone (priv->default_client[i], priv->zone, NULL);
-	}
-}
-
-static void
-timezone_changed_cb (GConfClient *client, guint id, GConfEntry *entry, gpointer data)
-{
-	GnomeCalendar *calendar = data;
-	
-	set_timezone (calendar);
-}
-
-static void
-update_todo_view (GnomeCalendar *gcal)
-{
-	GnomeCalendarPrivate *priv;
-	ECalModel *model;
-	char *sexp = NULL;
-	
-	priv = gcal->priv;
-	
-	/* Set the query on the task pad */
-	if (priv->todo_sexp) {
-		g_free (priv->todo_sexp);
-	}
-	
-	model = e_calendar_table_get_model (E_CALENDAR_TABLE (priv->todo));
-		
-	if ((sexp = calendar_config_get_hide_completed_tasks_sexp()) != NULL) {
-		priv->todo_sexp = g_strdup_printf ("(and %s %s)", sexp, priv->sexp);
-		e_cal_model_set_search_query (model, priv->todo_sexp);
-		g_free (sexp);
-	} else {
-		priv->todo_sexp = g_strdup (priv->sexp);
-		e_cal_model_set_search_query (model, priv->todo_sexp);
-	}
-	
-}
-
-static gboolean
-update_todo_view_cb (GnomeCalendar *gcal)
-{	
-	update_todo_view(gcal);
-
-	return TRUE;
-}
-
-static void
-config_hide_completed_tasks_changed_cb (GConfClient *client, guint id, GConfEntry *entry, gpointer data)
-{
-	update_todo_view (data);
-}
-
-static void
-setup_config (GnomeCalendar *calendar)
-{
-	GnomeCalendarPrivate *priv;
-	guint not;
-
-	priv = calendar->priv;
-
-	/* Week Start */
-	set_week_start (calendar);
-	not = calendar_config_add_notification_week_start_day (week_start_changed_cb, calendar);
-	priv->notifications = g_list_prepend (priv->notifications, GUINT_TO_POINTER (not));
-
-	/* Working Days */
-	set_working_days (calendar);
-	not = calendar_config_add_notification_working_days (working_days_changed_cb, calendar);
-	priv->notifications = g_list_prepend (priv->notifications, GUINT_TO_POINTER (not));
-
-	/* Timezone */
-	set_timezone (calendar);	
-	not = calendar_config_add_notification_timezone (timezone_changed_cb, calendar);
-	priv->notifications = g_list_prepend (priv->notifications, GUINT_TO_POINTER (not));
-
-	/* Hide completed tasks */
-	not = calendar_config_add_notification_hide_completed_tasks (config_hide_completed_tasks_changed_cb, 
-							      calendar);
-	priv->notifications = g_list_prepend (priv->notifications, GUINT_TO_POINTER (not));
-	
-	not = calendar_config_add_notification_hide_completed_tasks_units (config_hide_completed_tasks_changed_cb, 
-							      calendar);
-	priv->notifications = g_list_prepend (priv->notifications, GUINT_TO_POINTER (not));
-	
-	not = calendar_config_add_notification_hide_completed_tasks_value (config_hide_completed_tasks_changed_cb, 
-							      calendar);
-	priv->notifications = g_list_prepend (priv->notifications, GUINT_TO_POINTER (not));
-	
-	/* Pane positions */
-	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 ();
-}
-
-static void
-update_adjustment (GnomeCalendar *gcal, GtkAdjustment *adjustment, EWeekView *week_view) 
-{
-	GDate date;
-	gint week_offset;
-	struct icaltimetype start_tt = icaltime_null_time ();
-	time_t lower;
-	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;
-
-	/* Convert it to a time_t. */
-	start_tt.year = g_date_year (&date);
-	start_tt.month = g_date_month (&date);
-	start_tt.day = g_date_day (&date);
-
-	lower = icaltime_as_timet_with_zone (start_tt, gcal->priv->zone);
-
-	e_week_view_set_update_base_date (week_view, FALSE);
-	update_view_times (gcal, lower);
-	gnome_calendar_update_date_navigator (gcal);
-	gnome_calendar_notify_dates_shown_changed (gcal);
-	e_week_view_set_update_base_date (week_view, TRUE);
-}
-
-static void
-week_view_adjustment_changed_cb (GtkAdjustment *adjustment, GnomeCalendar *gcal) 
-{
-	update_adjustment (gcal, adjustment, E_WEEK_VIEW (gcal->priv->week_view));	
-}
-
-static void
-month_view_adjustment_changed_cb (GtkAdjustment *adjustment, GnomeCalendar *gcal) 
-{
-	update_adjustment (gcal, adjustment, E_WEEK_VIEW (gcal->priv->month_view));
-}
-
-static void
-config_categories_changed_cb (EConfigListener *config_listener, const char *key, gpointer user_data)
-{
-	GList *cat_list;
-	GPtrArray *cat_array;
-	GnomeCalendarPrivate *priv;
-	GnomeCalendar *gcal = user_data;
-
-	priv = gcal->priv;
-
-	cat_array = g_ptr_array_new ();
-	cat_list = e_categories_get_list ();
-	while (cat_list != NULL) {
-		if (e_categories_is_searchable ((const char *) cat_list->data))
-			g_ptr_array_add (cat_array, cat_list->data);
-		cat_list = g_list_remove (cat_list, cat_list->data);
-	}
-
-	cal_search_bar_set_categories (priv->search_bar, cat_array);
-
-	g_ptr_array_free (cat_array, TRUE);
-}
-
-static void
-setup_widgets (GnomeCalendar *gcal)
-{
-	GnomeCalendarPrivate *priv;
-	GtkWidget *w;
-	gchar *filename;
-	ETable *etable;
-	GtkAdjustment *adjustment;
-	int i;
-
-	priv = gcal->priv;
-
-	priv->search_bar = cal_search_bar_new (CAL_SEARCH_CALENDAR_DEFAULT);
-	g_signal_connect (priv->search_bar, "sexp_changed",
-			  G_CALLBACK (search_bar_sexp_changed_cb), gcal);
-	g_signal_connect (priv->search_bar, "category_changed",
-			  G_CALLBACK (search_bar_category_changed_cb), gcal);
-	config_categories_changed_cb (priv->config_listener, "/apps/evolution/general/category_master_list", gcal);
-
-	gtk_widget_show (priv->search_bar);
-	gtk_box_pack_start (GTK_BOX (gcal), priv->search_bar, FALSE, FALSE, 6);
-
-	/* The main HPaned, with the notebook of calendar views on the left
-	   and the ECalendar and ToDo list on the right. */
-	priv->hpane = gtk_hpaned_new ();
-	g_signal_connect_after(priv->hpane, "realize", 
-			       G_CALLBACK(gnome_calendar_hpane_realized), gcal);
-	g_signal_connect (priv->hpane, "button_release_event",
-			  G_CALLBACK (gnome_calendar_hpane_resized), gcal);
-	gtk_widget_show (priv->hpane);
-	gtk_box_pack_start (GTK_BOX (gcal), priv->hpane, TRUE, TRUE, 6);
-
-	/* 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);
-	gtk_paned_pack1 (GTK_PANED (priv->hpane), priv->notebook, FALSE, TRUE);
-
-	/* The VPaned widget, to contain the GtkCalendar & ToDo list. */
-	priv->vpane = gtk_vpaned_new ();
-	g_signal_connect_after (priv->vpane, "realize",
-				G_CALLBACK(gnome_calendar_vpane_realized), gcal);
-	g_signal_connect (priv->vpane, "button_release_event",
-			  G_CALLBACK (gnome_calendar_vpane_resized), gcal);
-	gtk_widget_show (priv->vpane);
-	gtk_paned_pack2 (GTK_PANED (priv->hpane), priv->vpane, TRUE, TRUE);
-
-	/* The ECalendar. */
-	w = e_calendar_new ();
-	priv->date_navigator = E_CALENDAR (w);
-	priv->date_navigator_config = e_mini_calendar_config_new (priv->date_navigator);
-	e_calendar_item_set_days_start_week_sel (priv->date_navigator->calitem, 9);
-	e_calendar_item_set_max_days_sel (priv->date_navigator->calitem, 42);
-	gtk_widget_show (w);
-	e_calendar_item_set_get_time_callback (priv->date_navigator->calitem,
-					       (ECalendarItemGetTimeCallback) get_current_time,
-					       gcal, NULL);
-
-	gtk_paned_pack1 (GTK_PANED (priv->vpane), w, FALSE, TRUE);	
-
-	g_signal_connect (priv->date_navigator->calitem, "selection_changed",
-			  G_CALLBACK (gnome_calendar_on_date_navigator_selection_changed), gcal);
-	g_signal_connect (priv->date_navigator->calitem, "date_range_changed",
-			  G_CALLBACK (gnome_calendar_on_date_navigator_date_range_changed), gcal);
-
-	/* The ToDo list. */
-	priv->todo = e_calendar_table_new ();
-	priv->todo_config = e_calendar_table_config_new (E_CALENDAR_TABLE (priv->todo));
-	gtk_paned_pack2 (GTK_PANED (priv->vpane), priv->todo, TRUE, TRUE);
-	gtk_widget_show (priv->todo);
-
-	filename = g_build_filename (calendar_component_peek_config_directory (calendar_component_peek ()),
-				     "TaskPad", NULL);
-	e_calendar_table_load_state (E_CALENDAR_TABLE (priv->todo), filename);
-	
-	update_todo_view (gcal);
-	g_free (filename);
-
-	etable = e_calendar_table_get_table (E_CALENDAR_TABLE (priv->todo));
-	g_signal_connect (etable->table_canvas, "focus_in_event",
-			  G_CALLBACK (table_canvas_focus_change_cb), gcal);
-	g_signal_connect (etable->table_canvas, "focus_out_event",
-			  G_CALLBACK (table_canvas_focus_change_cb), gcal);
-
-	g_signal_connect (etable, "selection_change",
-			  G_CALLBACK (table_selection_change_cb), gcal);
-
-	/* Timeout check to hide completed items */
-	priv->update_timeout = g_timeout_add_full (G_PRIORITY_LOW, 60000, (GSourceFunc) update_todo_view_cb, gcal, NULL);	
-
-	/* The Day View. */
-	priv->day_view = e_day_view_new ();
-	e_calendar_view_set_calendar (E_CALENDAR_VIEW (priv->day_view), gcal);
-	e_calendar_view_set_timezone (E_CALENDAR_VIEW (priv->day_view), priv->zone);
-	g_signal_connect (priv->day_view, "selection_changed",
-			  G_CALLBACK (view_selection_changed_cb), gcal);
-	connect_day_view_focus (gcal, E_DAY_VIEW (priv->day_view));
-
-	/* 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_calendar_view_set_calendar (E_CALENDAR_VIEW (priv->work_week_view), gcal);
-	e_calendar_view_set_timezone (E_CALENDAR_VIEW (priv->work_week_view), priv->zone);
-	connect_day_view_focus (gcal, E_DAY_VIEW (priv->work_week_view));
-
-	/* The Week View. */
-	priv->week_view = e_week_view_new ();
-	e_calendar_view_set_calendar (E_CALENDAR_VIEW (priv->week_view), gcal);
-	e_calendar_view_set_timezone (E_CALENDAR_VIEW (priv->week_view), priv->zone);
-	g_signal_connect (priv->week_view, "selection_changed",
-			  G_CALLBACK (view_selection_changed_cb), gcal);
-
-	connect_week_view_focus (gcal, E_WEEK_VIEW (priv->week_view));
-
-	adjustment = gtk_range_get_adjustment (GTK_RANGE (E_WEEK_VIEW (priv->week_view)->vscrollbar));
-	g_signal_connect (adjustment, "value_changed",
-			  G_CALLBACK (week_view_adjustment_changed_cb),
-			  gcal);
-	
-	/* The Month View. */
-	priv->month_view = e_week_view_new ();
-	e_calendar_view_set_calendar (E_CALENDAR_VIEW (priv->month_view), gcal);
-	e_calendar_view_set_timezone (E_CALENDAR_VIEW (priv->month_view), priv->zone);
-	e_week_view_set_multi_week_view (E_WEEK_VIEW (priv->month_view), TRUE);
-	e_week_view_set_weeks_shown (E_WEEK_VIEW (priv->month_view), 6);
-	g_signal_connect (priv->month_view, "selection_changed",
-			  G_CALLBACK (view_selection_changed_cb), gcal);
-
-	connect_week_view_focus (gcal, E_WEEK_VIEW (priv->month_view));
-
-	adjustment = gtk_range_get_adjustment (GTK_RANGE (E_WEEK_VIEW (priv->month_view)->vscrollbar));
-	g_signal_connect (adjustment, "value_changed",
-			  G_CALLBACK (month_view_adjustment_changed_cb),
-			  gcal);
-
-	/* The List View. */
-	priv->list_view = e_cal_list_view_new ();
-
-	e_calendar_view_set_calendar (E_CALENDAR_VIEW (priv->list_view), gcal);
-	e_calendar_view_set_timezone (E_CALENDAR_VIEW (priv->list_view), priv->zone);
-	g_signal_connect (priv->list_view, "selection_changed",
-			  G_CALLBACK (view_selection_changed_cb), gcal);
-
-	connect_list_view_focus (gcal, E_CAL_LIST_VIEW (priv->list_view));
-
-	priv->views[GNOME_CAL_DAY_VIEW] = E_CALENDAR_VIEW (priv->day_view);
-	priv->configs[GNOME_CAL_DAY_VIEW] = G_OBJECT (e_day_view_config_new (E_DAY_VIEW (priv->views[GNOME_CAL_DAY_VIEW])));
-	priv->views[GNOME_CAL_WORK_WEEK_VIEW] = E_CALENDAR_VIEW (priv->work_week_view);
-	priv->configs[GNOME_CAL_WORK_WEEK_VIEW] = G_OBJECT (e_day_view_config_new (E_DAY_VIEW (priv->views[GNOME_CAL_WORK_WEEK_VIEW])));
-	priv->views[GNOME_CAL_WEEK_VIEW] = E_CALENDAR_VIEW (priv->week_view);
-	priv->configs[GNOME_CAL_WEEK_VIEW] = G_OBJECT (e_week_view_config_new (E_WEEK_VIEW (priv->views[GNOME_CAL_WEEK_VIEW])));
-	priv->views[GNOME_CAL_MONTH_VIEW] = E_CALENDAR_VIEW (priv->month_view);
-	priv->configs[GNOME_CAL_MONTH_VIEW] = G_OBJECT (e_week_view_config_new (E_WEEK_VIEW (priv->views[GNOME_CAL_MONTH_VIEW])));
-	priv->views[GNOME_CAL_LIST_VIEW] = E_CALENDAR_VIEW (priv->list_view);
-	priv->configs[GNOME_CAL_LIST_VIEW] = G_OBJECT (e_cal_list_view_config_new (E_CAL_LIST_VIEW (priv->views[GNOME_CAL_LIST_VIEW])));
-
-	for (i = 0; i < GNOME_CAL_LAST_VIEW; i++) {
-		gtk_notebook_append_page (GTK_NOTEBOOK (priv->notebook),
-					  GTK_WIDGET (priv->views[i]), gtk_label_new (""));
-
-		g_signal_connect (priv->views[i], "user_created",
-				  G_CALLBACK (user_created_cb), gcal);
-
-		gtk_widget_show (GTK_WIDGET (priv->views[i]));
-	}
-
-	/* make sure we set the initial time ranges for the views */
-	update_view_times (gcal, time (NULL));
-	gnome_calendar_update_date_navigator (gcal);	
-}
-
-/* Object initialization function for the gnome calendar */
-static void
-gnome_calendar_init (GnomeCalendar *gcal)
-{
-	GnomeCalendarPrivate *priv;
-	int i;
-	
-	priv = g_new0 (GnomeCalendarPrivate, 1);
-	gcal->priv = priv;
-
-	for (i = 0; i < E_CAL_SOURCE_TYPE_LAST; i++)
-		priv->clients[i] = g_hash_table_new_full (g_str_hash, g_str_equal, g_free, g_object_unref);
-	
-	priv->config_listener = e_config_listener_new ();
-	g_signal_connect (priv->config_listener, "key_changed", G_CALLBACK (config_categories_changed_cb), gcal);
-
-	priv->current_view_type = GNOME_CAL_DAY_VIEW;
-	priv->range_selected = FALSE;
-
-	setup_config (gcal);
-	setup_widgets (gcal);
-
-	priv->calendar_menu = e_cal_menu_new("org.gnome.evolution.calendar.view");
-	priv->taskpad_menu = e_cal_menu_new("org.gnome.evolution.calendar.taskpad");
-
-	priv->dn_queries = NULL;	
-	priv->sexp = g_strdup ("#t"); /* Match all */
-	priv->todo_sexp = g_strdup ("#t");
-
-	priv->view_instance = NULL;
-	priv->view_menus = NULL;
-
-	priv->visible_start = -1;
-	priv->visible_end = -1;
-	priv->updating = FALSE;
-}
-
-static void
-gnome_calendar_destroy (GtkObject *object)
-{
-	GnomeCalendar *gcal;
-	GnomeCalendarPrivate *priv;
-	gchar *filename;
-
-	g_return_if_fail (object != NULL);
-	g_return_if_fail (GNOME_IS_CALENDAR (object));
-
-	gcal = GNOME_CALENDAR (object);
-	priv = gcal->priv;
-
-	if (priv) {
-		GList *l;
-		int i;
-
-		/* unset the config listener */
-		if (priv->config_listener) {
-			g_signal_handlers_disconnect_matched (priv->config_listener,
-							      G_SIGNAL_MATCH_DATA,
-							      0, 0, NULL, NULL, gcal);
-			g_object_unref (priv->config_listener);
-			priv->config_listener = NULL;
-		}
-
-		/* Clean up the clients */
-		for (i = 0; i < E_CAL_SOURCE_TYPE_LAST; i++) {
-			for (l = priv->clients_list[i]; l != NULL; l = l->next) {
-				g_signal_handlers_disconnect_matched (l->data, G_SIGNAL_MATCH_DATA,
-								      0, 0, NULL, NULL, gcal);
-			}
-
-			g_hash_table_destroy (priv->clients[i]);
-			g_list_free (priv->clients_list[i]);
-
-			priv->clients[i] = NULL;
-			priv->clients_list[i] = NULL;
-
-			if (priv->default_client[i]) {
-				g_signal_handlers_disconnect_matched (priv->default_client[i], 
-								      G_SIGNAL_MATCH_DATA,
-								      0, 0, NULL, NULL, gcal);
-				g_object_unref (priv->default_client[i]);
-			}		
-			priv->default_client[i] = NULL;
-		}
-
-		for (i = 0; i < GNOME_CAL_LAST_VIEW; i++) {
-			if (priv->configs[i])
-				g_object_unref (priv->configs[i]);
-			priv->configs[i] = NULL;
-		}
-		g_object_unref (priv->date_navigator_config);
-		g_object_unref (priv->todo_config);
-		
-		for (l = priv->notifications; l; l = l->next)
-			calendar_config_remove_notification (GPOINTER_TO_UINT (l->data));
-		g_list_free (priv->notifications);
-		priv->notifications = NULL;
-		
-		/* Save the TaskPad layout. */
-		filename = g_build_filename (calendar_component_peek_config_directory (calendar_component_peek ()),
-					     "TaskPad", NULL);
-		e_calendar_table_save_state (E_CALENDAR_TABLE (priv->todo), filename);
-		g_free (filename);
-
-		if (priv->dn_queries) {
-			for (l = priv->dn_queries; l != NULL; l = l->next) {
-				g_signal_handlers_disconnect_matched ((ECalView *) l->data, G_SIGNAL_MATCH_DATA,
-								      0, 0, NULL, NULL, gcal);
-				g_object_unref (l->data);
-			}
-
-			g_list_free (priv->dn_queries);
-			priv->dn_queries = NULL;
-		}
-
-		if (priv->sexp) {
-			g_free (priv->sexp);
-			priv->sexp = NULL;
-		}
-		
-		if (priv->todo_sexp) {
-			g_free (priv->todo_sexp);
-			priv->todo_sexp = NULL;
-		}
-
-		if (priv->update_timeout) {
-			g_source_remove (priv->update_timeout);
-			priv->update_timeout = 0;
-		}
-
-		if (priv->view_instance) {
-			g_object_unref (priv->view_instance);
-			priv->view_instance = NULL;
-		}
-
-		if (priv->view_menus) {
-			g_object_unref (priv->view_menus);
-			priv->view_menus = NULL;
-		}
-
-		if (priv->calendar_menu) {
-			g_object_unref (priv->calendar_menu);
-			priv->calendar_menu = NULL;
-		}
-
-		if (priv->taskpad_menu) {
-			g_object_unref (priv->taskpad_menu);
-			priv->taskpad_menu = NULL;
-		}
-
-		g_free (priv);
-		gcal->priv = NULL;
-	}
-	
-	if (GTK_OBJECT_CLASS (gnome_calendar_parent_class)->destroy)
-		(* GTK_OBJECT_CLASS (gnome_calendar_parent_class)->destroy) (object);
-}
-
-static void
-gnome_calendar_goto_date (GnomeCalendar *gcal,
-			  GnomeCalendarGotoDateType goto_date)
-{
-	GnomeCalendarPrivate *priv;
-	time_t	 new_time = 0; 
-	gboolean need_updating = FALSE;
-
-	g_return_if_fail (gcal != NULL);
-	g_return_if_fail (GNOME_IS_CALENDAR(gcal));
-
-	priv = gcal->priv;
-
-	switch (goto_date) {
-		/* GNOME_CAL_GOTO_TODAY and GNOME_CAL_GOTO_DATE are
-		   currently not used
-		*/
-	case GNOME_CAL_GOTO_TODAY:
-		break;
-	case GNOME_CAL_GOTO_DATE:
-		break;
-	case GNOME_CAL_GOTO_FIRST_DAY_OF_MONTH:
-		new_time = time_month_begin_with_zone (priv->base_view_time, priv->zone);
-		need_updating = TRUE;
-		break;
-	case GNOME_CAL_GOTO_LAST_DAY_OF_MONTH:
-		new_time = time_add_month_with_zone (priv->base_view_time, 1, priv->zone);
-		new_time = time_month_begin_with_zone (new_time, priv->zone);
-		new_time = time_add_day_with_zone (new_time, -1, priv->zone);
-		need_updating = TRUE;
-		break;
-	case GNOME_CAL_GOTO_FIRST_DAY_OF_WEEK:
-		new_time = time_week_begin_with_zone (priv->base_view_time, priv->week_start, priv->zone);
-		need_updating = TRUE;
-		break;
-	case GNOME_CAL_GOTO_LAST_DAY_OF_WEEK:
-		new_time = time_week_begin_with_zone (priv->base_view_time, priv->week_start, priv->zone);
-		if (priv->current_view_type == GNOME_CAL_DAY_VIEW ||
-		    priv->current_view_type == GNOME_CAL_WORK_WEEK_VIEW) {
-			/* FIXME Shouldn't hard code work week end */
-			/* goto Friday of this week */
-			new_time = time_add_day_with_zone (new_time, 4, priv->zone);
-		} else {
-			/* goto Sunday of this week */
-			/* FIXME Shouldn't hard code week end */
-			new_time = time_add_day_with_zone (new_time, 6, priv->zone);
-		}
-		need_updating = TRUE;
-		break;
-	case GNOME_CAL_GOTO_SAME_DAY_OF_PREVIOUS_WEEK:
-		new_time = time_add_week_with_zone (priv->base_view_time, -1, priv->zone);
-		need_updating = TRUE;
-		break;
-	case GNOME_CAL_GOTO_SAME_DAY_OF_NEXT_WEEK:
-		new_time = time_add_week_with_zone (priv->base_view_time, 1, priv->zone);
-		need_updating = TRUE;
-		break;
-	default:
-		break;
-	}
-
-	if (need_updating) {
-		update_view_times (gcal, new_time);
-		gnome_calendar_update_date_navigator (gcal);
-		gnome_calendar_notify_dates_shown_changed (gcal);
-	}
-}
-
-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;
-
-	update_view_times (gcal, new_time);
-	gnome_calendar_update_date_navigator (gcal);
-	gnome_calendar_notify_dates_shown_changed (gcal);
-}
-
-
-static void
-update_view_times (GnomeCalendar *gcal, time_t start_time)
-{
-	GnomeCalendarPrivate *priv;
-	int i;
-	
-	priv = gcal->priv;
-	
-	priv->base_view_time = start_time;
-
-	for (i = 0; i < GNOME_CAL_LAST_VIEW; i++) {
-		ECalModel *model;
-		time_t real_start_time = start_time;
-		time_t end_time;
-
-		model = e_calendar_view_get_model (priv->views[i]);
-		get_times_for_views (gcal, i, &real_start_time, &end_time);
-
- 		e_cal_model_set_time_range (model, real_start_time, end_time);
-	}
-}
-
-static void
-gnome_calendar_direction (GnomeCalendar *gcal, int direction)
-{
-	GnomeCalendarPrivate *priv;
-
-	priv = gcal->priv;
-
-	switch (priv->current_view_type) {
-	case GNOME_CAL_DAY_VIEW:
-		priv->base_view_time = time_add_day_with_zone (priv->base_view_time, direction, priv->zone);
-		break;
-	case GNOME_CAL_WORK_WEEK_VIEW:
-	case GNOME_CAL_WEEK_VIEW:
-		priv->base_view_time = time_add_week_with_zone (priv->base_view_time, direction, priv->zone);
-		break;
-	case GNOME_CAL_LIST_VIEW:
-		g_warning ("Using month view time interval for list view.");
-	case GNOME_CAL_MONTH_VIEW:
-		priv->base_view_time = time_add_month_with_zone (priv->base_view_time, direction, priv->zone);
-		break;
-	default:
-		g_assert_not_reached ();
-		return;
-	}
-
-	update_view_times (gcal, priv->base_view_time);
-	gnome_calendar_update_date_navigator (gcal);
-	gnome_calendar_notify_dates_shown_changed (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->base_view_time = time_day_begin_with_zone (time, priv->zone);
-
-	update_view_times (gcal, priv->base_view_time);
-	gnome_calendar_set_view (gcal, GNOME_CAL_DAY_VIEW);
-}
-
-static void
-focus_current_view (GnomeCalendar *gcal)
-{
-	GnomeCalendarPrivate *priv;
-
-	priv = gcal->priv;
-
-	gtk_widget_grab_focus (gnome_calendar_get_current_view_widget (gcal));
-}
-
-void
-gnome_calendar_goto_today (GnomeCalendar *gcal)
-{
-	g_return_if_fail (gcal != NULL);
-	g_return_if_fail (GNOME_IS_CALENDAR (gcal));
-
-	gnome_calendar_goto (gcal, time (NULL));
-	focus_current_view (gcal);
-}
-
-/**
- * gnome_calendar_get_view:
- * @gcal: A calendar.
- *
- * Queries the type of the view that is being shown in a calendar.
- *
- * Return value: Type of the view that is currently shown.
- **/
-GnomeCalendarViewType
-gnome_calendar_get_view (GnomeCalendar *gcal)
-{
-	GnomeCalendarPrivate *priv;
-
-	g_return_val_if_fail (gcal != NULL, GNOME_CAL_DAY_VIEW);
-	g_return_val_if_fail (GNOME_IS_CALENDAR (gcal), GNOME_CAL_DAY_VIEW);
-
-	priv = gcal->priv;
-	return priv->current_view_type;
-}
-
-static void
-set_view (GnomeCalendar *gcal, GnomeCalendarViewType view_type, gboolean range_selected)
-{
-	GnomeCalendarPrivate *priv;
-	const char *view_id;
-
-	g_return_if_fail (gcal != NULL);
-	g_return_if_fail (GNOME_IS_CALENDAR (gcal));
-
-	priv = gcal->priv;
-
-	switch (view_type) {
-	case GNOME_CAL_DAY_VIEW:
-		view_id = "Day_View";
-		break;
-
-	case GNOME_CAL_WORK_WEEK_VIEW:
-		view_id = "Work_Week_View";
-		break;
-
-	case GNOME_CAL_WEEK_VIEW:
-		view_id = "Week_View";
-		break;
-
-	case GNOME_CAL_MONTH_VIEW:
-		view_id = "Month_View";
-		break;
-
-	case GNOME_CAL_LIST_VIEW:
-		view_id = "List_View";
-		break;
-
-	default:
-		g_assert_not_reached ();
-		return;
-	}
-
-	priv->range_selected = range_selected;
-	priv->current_view_type = view_type;
-
-	gal_view_instance_set_current_view_id (priv->view_instance, view_id);
-	focus_current_view (gcal);
-}
-
-
-/**
- * gnome_calendar_set_view:
- * @gcal: A calendar.
- * @view_type: Type of view to show.
- *
- * Sets the view that should be shown in a calendar.  If @reset_range is true,
- * this function will automatically set the number of days or weeks shown in
- * the view; otherwise the last configuration will be kept.
- **/
-void
-gnome_calendar_set_view (GnomeCalendar *gcal, GnomeCalendarViewType view_type)
-{
-	g_return_if_fail (gcal != NULL);
-	g_return_if_fail (GNOME_IS_CALENDAR (gcal));
-
-	set_view (gcal, view_type, FALSE);
-}
-
-/* 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
-display_view (GnomeCalendar *gcal, GnomeCalendarViewType view_type, gboolean grab_focus)
-{
-	GnomeCalendarPrivate *priv;
-	gboolean preserve_day;
-
-	priv = gcal->priv;
-
-	preserve_day = FALSE;
-
-	switch (view_type) {
-	case GNOME_CAL_DAY_VIEW:
-		if (!priv->range_selected)
-			e_day_view_set_days_shown (E_DAY_VIEW (priv->day_view), 1);
-
-		break;
-
-	case GNOME_CAL_WORK_WEEK_VIEW:
-		preserve_day = TRUE;
-		break;
-
-	case GNOME_CAL_WEEK_VIEW:
-		preserve_day = TRUE;
-		break;
-
-	case GNOME_CAL_MONTH_VIEW:
-		if (!priv->range_selected)
-			e_week_view_set_weeks_shown (E_WEEK_VIEW (priv->month_view), 6);
-
-		preserve_day = TRUE;
-		break;
-
-	case GNOME_CAL_LIST_VIEW:
-		break;
-
-	default:
-		g_assert_not_reached ();
-		return;
-	}
-
-	priv->current_view_type = view_type;
-
-	gtk_notebook_set_page (GTK_NOTEBOOK (priv->notebook), (int) view_type);
-
-	if (grab_focus)
-		focus_current_view (gcal);
-
-	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. */
-	g_object_set (G_OBJECT (priv->date_navigator->calitem),
-		      "preserve_day_when_moving", preserve_day,
-		      NULL);
-}
-
-/* Callback used when the view collection asks us to display a particular view */
-static void
-display_view_cb (GalViewInstance *view_instance, GalView *view, gpointer data)
-{
-	GnomeCalendar *gcal;
-	GnomeCalendarPrivate *priv;
-	CalendarView *cal_view;
-	GnomeCalendarViewType view_type;
-	
-	gcal = GNOME_CALENDAR (data);
-	priv = gcal->priv;
-	
-	if (GAL_IS_VIEW_ETABLE(view)) {
-		ETable *table;
-		
-		view_type = GNOME_CAL_LIST_VIEW;
-		
-		table = e_table_scrolled_get_table (E_CAL_LIST_VIEW (priv->list_view)->table_scrolled);
-		gal_view_etable_attach_table (GAL_VIEW_ETABLE (view), table);
-	} else if (IS_CALENDAR_VIEW (view)) {
-		cal_view = CALENDAR_VIEW (view);
-		
-		view_type = calendar_view_get_view_type (cal_view);
-	} else {
-		g_error (G_STRLOC ": Unknown type of view for GnomeCalendar");
-		return;
-	}
-
-	
-	display_view (gcal, view_type, TRUE);
-	gnome_calendar_update_date_navigator (gcal);
-	gnome_calendar_notify_dates_shown_changed (gcal);
-}
-
-/**
- * gnome_calendar_setup_view_menus:
- * @gcal: A calendar.
- * @uic: UI controller to use for the menus.
- * 
- * Sets up the #GalView menus for a calendar.  This function should be called
- * from the Bonobo control activation callback for this calendar.  Also, the
- * menus should be discarded using gnome_calendar_discard_view_menus().
- **/
-void
-gnome_calendar_setup_view_menus (GnomeCalendar *gcal, BonoboUIComponent *uic)
-{
-	GnomeCalendarPrivate *priv;
-	char *path;
-	CalendarViewFactory *factory;
-	GalViewFactory *gal_factory;
-	static GalViewCollection *collection = NULL;
-
-	g_return_if_fail (gcal != NULL);
-	g_return_if_fail (GNOME_IS_CALENDAR (gcal));
-	g_return_if_fail (uic != NULL);
-	g_return_if_fail (BONOBO_IS_UI_COMPONENT (uic));
-
-	priv = gcal->priv;
-
-	g_assert (priv->view_instance == NULL);
-	g_assert (priv->view_menus == NULL);
-
-	/* Create the view instance */
-	if (collection == NULL) {
-		ETableSpecification *spec;
-
-		collection = gal_view_collection_new ();
-
-		gal_view_collection_set_title (collection, _("Calendar"));
-
-		path = g_build_filename (calendar_component_peek_base_directory (calendar_component_peek ()), 
-					 "calendar", "views", NULL);
-		gal_view_collection_set_storage_directories (collection,
-							     EVOLUTION_GALVIEWSDIR "/calendar/",
-							     path);
-		g_free (path);
-
-		/* Create the views */
-
-		factory = calendar_view_factory_new (GNOME_CAL_DAY_VIEW);
-		gal_view_collection_add_factory (collection, GAL_VIEW_FACTORY (factory));
-		g_object_unref (factory);
-
-		factory = calendar_view_factory_new (GNOME_CAL_WORK_WEEK_VIEW);
-		gal_view_collection_add_factory (collection, GAL_VIEW_FACTORY (factory));
-		g_object_unref (factory);
-
-		factory = calendar_view_factory_new (GNOME_CAL_WEEK_VIEW);
-		gal_view_collection_add_factory (collection, GAL_VIEW_FACTORY (factory));
-		g_object_unref (factory);
-
-		factory = calendar_view_factory_new (GNOME_CAL_MONTH_VIEW);
-		gal_view_collection_add_factory (collection, GAL_VIEW_FACTORY (factory));
-		g_object_unref (factory);
-
-		spec = e_table_specification_new ();
-		e_table_specification_load_from_file (spec, EVOLUTION_ETSPECDIR "/e-cal-list-view.etspec");
-		gal_factory = gal_view_factory_etable_new (spec);
-		g_object_unref (spec);
-		gal_view_collection_add_factory (collection, GAL_VIEW_FACTORY (gal_factory));
-		g_object_unref (gal_factory);
-
-		/* Load the collection and create the menus */
-
-		gal_view_collection_load (collection);
-
-	}
-
-	priv->view_instance = gal_view_instance_new (collection, NULL);
-	priv->view_menus = gal_view_menus_new (priv->view_instance);
-	gal_view_menus_apply (priv->view_menus, uic, NULL);
-
-	g_signal_connect (priv->view_instance, "display_view", G_CALLBACK (display_view_cb), gcal);
-	display_view_cb (priv->view_instance, gal_view_instance_get_current_view (priv->view_instance), gcal);
-}
-
-/**
- * gnome_calendar_discard_view_menus:
- * @gcal: A calendar.
- * 
- * Discards the #GalView menus used by a calendar.  This function should be
- * called from the Bonobo control deactivation callback for this calendar.  The
- * menus should have been set up with gnome_calendar_setup_view_menus().
- **/
-void
-gnome_calendar_discard_view_menus (GnomeCalendar *gcal)
-{
-	GnomeCalendarPrivate *priv;
-
-	g_return_if_fail (gcal != NULL);
-
-	priv = gcal->priv;
-
-	g_assert (priv->view_instance != NULL);
-	g_assert (priv->view_menus != NULL);
-
-	g_object_unref (priv->view_instance);
-	priv->view_instance = NULL;
-
-	g_object_unref (priv->view_menus);
-	priv->view_menus = NULL;
-}
-
-/* This is copied/moved from gal-view-instance, only the calendar uses this for a popup menu */
-static void
-gc_set_view(EPopup *ep, EPopupItem *pitem, void *data)
-{
-	GnomeCalendar *gcal = data;
-
-	if (pitem->type & E_POPUP_ACTIVE)
-		gal_view_instance_set_current_view_id(gcal->priv->view_instance, (char *)pitem->user_data);
-}
-
-static void
-gc_save_custom_view(EPopup *ep, EPopupItem *pitem, void *data)
-{
-	GnomeCalendar *gcal = data;
-
-	gal_view_instance_save_as(gcal->priv->view_instance);
-}
-
-static void
-gc_define_views_response(GtkWidget *d, int id, GnomeCalendar *gcal)
-{
-	if (id == GTK_RESPONSE_OK)
-		gal_view_collection_save(gcal->priv->view_instance->collection);
-
-	gtk_widget_destroy(d);
-}
-
-static void
-gc_define_views(EPopup *ep, EPopupItem *pitem, void *data)
-{
-	GnomeCalendar *gcal = data;
-	GtkWidget *dialog = gal_define_views_dialog_new(gcal->priv->view_instance->collection);
-
-	g_signal_connect(dialog, "response", G_CALLBACK(gc_define_views_response), data);
-	gtk_widget_show(dialog);
-}
-
-static EPopupItem gc_popups[] = {
-	/* Code generates the path to fit */
-	{ E_POPUP_BAR, NULL },
-	{ E_POPUP_RADIO|E_POPUP_ACTIVE, NULL, N_("Custom View"), },
-	{ E_POPUP_ITEM, NULL, N_("Save Custom View"), gc_save_custom_view },
-
-	/* index == 3, when we have non-custom view */
-
-	{ E_POPUP_BAR, NULL },
-	{ E_POPUP_ITEM, NULL, N_("Define Views..."), gc_define_views },
-};
-
-static void
-gc_popup_free (EPopup *ep, GSList *list, void *data)
-{
-	while (list) {
-		GSList *n = list->next;
-		EPopupItem *pitem = list->data;
-
-		g_free(pitem->path);
-		g_free(pitem->label);
-		g_free(pitem->user_data);
-		g_free(pitem);
-		g_slist_free_1(list);
-		list = n;
-	}
-}
-
-static void
-gc_popup_free_static (EPopup *ep, GSList *list, void *data)
-{
-	while (list) {
-		GSList *n = list->next;
-		EPopupItem *pitem = list->data;
-
-		g_free(pitem->path);
-		g_free(pitem);
-		g_slist_free_1(list);
-		list = n;
-	}
-}
-
-void
-gnome_calendar_view_popup_factory (GnomeCalendar *gcal, EPopup *ep, const char *prefix)
-{
-	GnomeCalendarPrivate *priv;
-	int length;
-	int i;
-	gboolean found = FALSE;
-	char *id;
-	GSList *menus = NULL;
-	EPopupItem *pitem;
-
-	g_return_if_fail (gcal != NULL);
-	g_return_if_fail (GNOME_IS_CALENDAR (gcal));
-	g_return_if_fail (prefix != NULL);
-
-	priv = gcal->priv;
-
-	g_return_if_fail (priv->view_instance != NULL);
-
-	length = gal_view_collection_get_count(priv->view_instance->collection);
-	id = gal_view_instance_get_current_view_id (priv->view_instance);
-
-	for (i = 0; i < length; i++) {
-		GalViewCollectionItem *item = gal_view_collection_get_view_item(priv->view_instance->collection, i);
-
-		pitem = g_malloc0(sizeof(*pitem));
-		pitem->type = E_POPUP_RADIO;
-		pitem->path = g_strdup_printf("%s/%02d.item", prefix, i);
-		pitem->label = g_strdup(item->title);
-		pitem->activate = gc_set_view;
-		pitem->user_data = g_strdup(item->id);
-
-		if (!found && id && !strcmp (id, item->id)) {
-			found = TRUE;
-			pitem->type |= E_POPUP_ACTIVE;
-		}
-
-		menus = g_slist_prepend(menus, pitem);
-	}
-
-	if (menus)
-		e_popup_add_items(ep, menus, NULL, gc_popup_free, gcal);
-
-	menus = NULL;
-	for (i = found?3:0; i<sizeof(gc_popups)/sizeof(gc_popups[0]);i++) {
-		pitem = g_malloc0(sizeof(*pitem));
-		memcpy(pitem, &gc_popups[i], sizeof(*pitem));
-		pitem->path = g_strdup_printf("%s/%02d.item", prefix, i+length);
-		menus = g_slist_prepend(menus, pitem);
-	}
-
-	e_popup_add_items(ep, menus, NULL, gc_popup_free_static, gcal);
-}
-
-static void
-gnome_calendar_set_pane_positions	(GnomeCalendar	*gcal)
-{
-	GnomeCalendarPrivate *priv;
-
-	priv = gcal->priv;
-
-	if (priv->current_view_type == GNOME_CAL_MONTH_VIEW && !priv->range_selected) {
-		gtk_paned_set_position (GTK_PANED (priv->hpane), priv->hpane_pos_month_view);
-		gtk_paned_set_position (GTK_PANED (priv->vpane), priv->vpane_pos_month_view);
-	} else {
-		gtk_paned_set_position (GTK_PANED (priv->hpane), priv->hpane_pos);
-		gtk_paned_set_position (GTK_PANED (priv->vpane), priv->vpane_pos);
-	}
-}
-
-static void
-client_cal_opened_cb (ECal *ecal, ECalendarStatus status, GnomeCalendar *gcal)
-{
-	GnomeCalendarPrivate *priv;
-	ECalSourceType source_type;
-	ESource *source;
-	char *msg;
-	int i;
-
-	priv = gcal->priv;
-
-	source_type = e_cal_get_source_type (ecal);
-	source = e_cal_get_source (ecal);
-
-	switch (source_type) {
-	case E_CAL_SOURCE_TYPE_EVENT:
-		e_calendar_view_set_status_message (E_CALENDAR_VIEW (priv->week_view), NULL);
-		break;
-	case E_CAL_SOURCE_TYPE_TODO:
-		e_calendar_table_set_status_message (E_CALENDAR_TABLE (priv->todo), NULL);
-		break;
-	default:
-		break;
-	}
-	switch (status) {
-	case E_CALENDAR_STATUS_OK:
-		break;
-	case E_CALENDAR_STATUS_BUSY:
-		e_cal_open_async (ecal, FALSE);
-		return;
-	case E_CALENDAR_STATUS_INVALID_SERVER_VERSION:
-		e_error_run (NULL, "calendar:server-version", NULL);
-		status = E_CALENDAR_STATUS_OK;
-		break;
-	case E_CALENDAR_STATUS_REPOSITORY_OFFLINE:
-		if (source_type == E_CAL_SOURCE_TYPE_EVENT)
-			e_error_run (GTK_WINDOW (gtk_widget_get_toplevel (GTK_WIDGET (gcal))), 
-				"calendar:prompt-no-contents-offline-calendar", NULL);
-	default:
-		/* Make sure the source doesn't disappear on us */
-		g_object_ref (source);
-
-		priv->clients_list[source_type] = g_list_remove (priv->clients_list[source_type], ecal);
-		g_hash_table_remove (priv->clients[source_type], e_source_peek_uid (source));
-
-		gtk_signal_emit (GTK_OBJECT (gcal), gnome_calendar_signals[SOURCE_REMOVED], source_type, source);
-		g_object_unref (source);
-
-		return;
-	}
-
-	g_signal_handlers_disconnect_matched (ecal, G_SIGNAL_MATCH_FUNC, 0, 0, NULL, client_cal_opened_cb, NULL);
-
-	e_cal_set_default_timezone (ecal, priv->zone, NULL);
-
-	switch (source_type) {
-	case E_CAL_SOURCE_TYPE_EVENT :
-		msg = g_strdup_printf (_("Loading appointments at %s"), e_cal_get_uri (ecal));
-		e_calendar_view_set_status_message (E_CALENDAR_VIEW (priv->week_view), msg);
-		g_free (msg);
-
-		/* add client to the views */
-		for (i = 0; i < GNOME_CAL_LAST_VIEW; i++) {
-			ECalModel *model;
-	
-			model = e_calendar_view_get_model (priv->views[i]);
-			e_cal_model_add_client (model, ecal);
-		}
-
-		/* update date navigator query */
-		update_query (gcal);
-
-		e_calendar_view_set_status_message (E_CALENDAR_VIEW (priv->week_view), NULL);
-		break;
-		
-	case E_CAL_SOURCE_TYPE_TODO :
-		msg = g_strdup_printf (_("Loading tasks at %s"), e_cal_get_uri (ecal));
-		e_calendar_table_set_status_message (E_CALENDAR_TABLE (priv->todo), msg);
-		g_free (msg);
-
-		e_cal_model_add_client (e_calendar_table_get_model (E_CALENDAR_TABLE (priv->todo)), ecal);
-
-		e_calendar_table_set_status_message (E_CALENDAR_TABLE (priv->todo), NULL);
-		break;
-		
-	default:
-		g_assert_not_reached ();
-		return;
-	}
-}
-
-static void
-default_client_cal_opened_cb (ECal *ecal, ECalendarStatus status, GnomeCalendar *gcal)
-{
-	GnomeCalendarPrivate *priv;
-	ECalSourceType source_type;
-	ESource *source;
-	int i;
-
-	priv = gcal->priv;
-
-	source_type = e_cal_get_source_type (ecal);
-	source = e_cal_get_source (ecal);
-
-	switch (source_type) {
-	case E_CAL_SOURCE_TYPE_EVENT:
-		e_calendar_view_set_status_message (E_CALENDAR_VIEW (priv->week_view), NULL);
-		break;		
-	case E_CAL_SOURCE_TYPE_TODO:
-		e_calendar_table_set_status_message (E_CALENDAR_TABLE (priv->todo), NULL);
-		break;
-	default:
-		break;
-	}
-	
-	switch (status) {
-	case E_CALENDAR_STATUS_OK:
-		break;
-	case E_CALENDAR_STATUS_BUSY:
-		e_cal_open_async (ecal, FALSE);
-		return;
-	case E_CALENDAR_STATUS_INVALID_SERVER_VERSION :
-		e_error_run (NULL, "calendar:server-version", NULL);
-		status = E_CALENDAR_STATUS_OK;
-	default:	
-		/* Make sure the source doesn't disappear on us */
-		g_object_ref (source);
-
-		/* FIXME should we do this to prevent multiple error dialogs? */
-		priv->clients_list[source_type] = g_list_remove (priv->clients_list[source_type], ecal);
-		g_hash_table_remove (priv->clients[source_type], e_source_peek_uid (source));
-
-		/* FIXME Is there a better way to handle this? */
-		g_object_unref (priv->default_client[source_type]);
-		priv->default_client[source_type] = NULL;
-
-		gtk_signal_emit (GTK_OBJECT (gcal), gnome_calendar_signals[SOURCE_REMOVED], source_type, source);
-		g_object_unref (source);
-
-		return;
-	}
-
-	g_signal_handlers_disconnect_matched (ecal, G_SIGNAL_MATCH_FUNC, 0, 0, NULL, default_client_cal_opened_cb, NULL);
-
-	e_cal_set_default_timezone (ecal, priv->zone, NULL);
-	
-	switch (source_type) {
-	case E_CAL_SOURCE_TYPE_EVENT:
-		for (i = 0; i < GNOME_CAL_LAST_VIEW; i++) {
-			e_cal_model_set_default_client (
-				e_calendar_view_get_model (E_CALENDAR_VIEW (priv->views[i])),
-				ecal);
-		}
-		break;
-
-	case E_CAL_SOURCE_TYPE_TODO:
-		e_cal_model_set_default_client (e_calendar_table_get_model (E_CALENDAR_TABLE (priv->todo)), ecal);
-		break;
-
-	default:
-		break;
-        }
-}
-
-typedef void (*open_func) (ECal *, ECalendarStatus, GnomeCalendar *);
-
-static gboolean
-open_ecal (GnomeCalendar *gcal, ECal *cal, gboolean only_if_exists, open_func of)
-{
-	GnomeCalendarPrivate *priv;
-	char *msg;
-
-	priv = gcal->priv;
-
-	msg = g_strdup_printf (_("Opening %s"), e_cal_get_uri (cal));
-	switch (e_cal_get_source_type (cal)) {
-	case E_CAL_SOURCE_TYPE_EVENT :
-		e_calendar_view_set_status_message (E_CALENDAR_VIEW (priv->week_view), msg);
-		break;
-	case E_CAL_SOURCE_TYPE_TODO :
-		e_calendar_table_set_status_message (E_CALENDAR_TABLE (priv->todo), msg);
-		break;
-	default:
-		g_assert_not_reached ();
-		break;
-	}
-
-	g_free (msg);
-
-	g_signal_connect (G_OBJECT (cal), "cal_opened", G_CALLBACK (of), gcal);
-	e_cal_open_async (cal, only_if_exists);
-
-	return TRUE;
-}
-
-/* Callback when we get an error message from the backend */
-static void
-backend_error_cb (ECal *client, const char *message, gpointer data)
-{
-	GnomeCalendar *gcal;
-	GnomeCalendarPrivate *priv;
-	char *errmsg;
-	char *uristr;
-
-	gcal = GNOME_CALENDAR (data);
-	priv = gcal->priv;
-
-	uristr = get_uri_without_password (e_cal_get_uri (client));
-	errmsg = g_strdup_printf (_("Error on %s:\n %s"), uristr, message);
-	gnome_error_dialog_parented (errmsg, GTK_WINDOW (gtk_widget_get_toplevel (GTK_WIDGET (gcal))));
-	g_free (errmsg);
-	g_free (uristr);
-}
-
-/* Callback when the backend dies */
-static void
-backend_died_cb (ECal *ecal, gpointer data)
-{
-	GnomeCalendar *gcal;
-	GnomeCalendarPrivate *priv;
-	ECalSourceType source_type;
-	ESource *source;
-	const char *id;
-
-	gcal = GNOME_CALENDAR (data);
-	priv = gcal->priv;
-
-	/* FIXME What about default sources? */
-
-	/* Make sure the source doesn't go away on us since we use it below */
-	source_type = e_cal_get_source_type (ecal);
-	source = g_object_ref (e_cal_get_source (ecal));	
-		
-	priv->clients_list[source_type] = g_list_remove (priv->clients_list[source_type], ecal);
-	g_hash_table_remove (priv->clients[source_type], e_source_peek_uid (source));
-
-	switch (source_type) {
-	case E_CAL_SOURCE_TYPE_EVENT:		
-		id = "calendar:calendar-crashed";
-		
-		e_calendar_view_set_status_message (E_CALENDAR_VIEW (priv->week_view), NULL);
-
-		gtk_signal_emit (GTK_OBJECT (gcal), gnome_calendar_signals[SOURCE_REMOVED], source_type, source);
-		break;
-
-	case E_CAL_SOURCE_TYPE_TODO:
-		id = "calendar:tasks-crashed";
-		
-		e_calendar_table_set_status_message (E_CALENDAR_TABLE (priv->todo), NULL);
-
-		gtk_signal_emit (GTK_OBJECT (gcal), gnome_calendar_signals[SOURCE_REMOVED], source_type, source);
-		break;
-
-	default:
-		g_assert_not_reached ();
-		return;
-	}
-
-	g_object_unref (source);
-	
-	e_error_run (GTK_WINDOW (gtk_widget_get_toplevel (GTK_WIDGET (gcal))), id, NULL);
-}
-
-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;
-
-	return GTK_WIDGET (gcal);
-}
-
-GtkWidget *
-gnome_calendar_new (void)
-{
-	GnomeCalendar *gcal;
-
-	gcal = g_object_new (gnome_calendar_get_type (), NULL);
-
-	if (!gnome_calendar_construct (gcal)) {
-		g_message (G_STRLOC ": Could not construct the calendar GUI");
-		g_object_unref (gcal);
-		return NULL;
-	}
-
-	return GTK_WIDGET (gcal);
-}
-
-void 
-gnome_calendar_set_activity_handler (GnomeCalendar *cal, EActivityHandler *activity_handler)
-{
-	GnomeCalendarPrivate *priv;
-	int i;
-	
-	g_return_if_fail (cal != NULL);
-	g_return_if_fail (GNOME_IS_CALENDAR (cal));
-
-	priv = cal->priv;
-
-	priv->activity_handler = activity_handler;
-	
-	for (i = 0; i < GNOME_CAL_LAST_VIEW; i++)
-		e_calendar_view_set_activity_handler (priv->views[i], activity_handler);
-	
-	e_calendar_table_set_activity_handler (E_CALENDAR_TABLE (priv->todo), activity_handler);
-}
-
-void
-gnome_calendar_set_ui_component (GnomeCalendar *gcal,
-				 BonoboUIComponent *ui_component)
-{
-	g_return_if_fail (GNOME_IS_CALENDAR (gcal));
-	g_return_if_fail (ui_component == NULL || BONOBO_IS_UI_COMPONENT (ui_component));
-
-	e_search_bar_set_ui_component (E_SEARCH_BAR (gcal->priv->search_bar), ui_component);
-}
-
-/**
- * gnome_calendar_get_calendar_model:
- * @gcal: A calendar view.
- *
- * Queries the calendar model object that a calendar view is using.
- *
- * Return value: A calendar client interface object.
- **/
-ECalModel *
-gnome_calendar_get_calendar_model (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 e_calendar_view_get_model (priv->views[priv->current_view_type]);
-}
-
-/**
- * gnome_calendar_get_default_client
- */
-ECal *
-gnome_calendar_get_default_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 e_cal_model_get_default_client (e_calendar_view_get_model (gcal->priv->views[priv->current_view_type]));
-}
-
-/**
- * gnome_calendar_add_source:
- * @gcal: A GnomeCalendar.
- * @source: #ESource to add to the calendar views.
- *
- * Adds the given calendar source to the calendar views.
- *
- * Returns: TRUE if successful, FALSE if error.
- */
-gboolean
-gnome_calendar_add_source (GnomeCalendar *gcal, ECalSourceType source_type, ESource *source)
-{
-	GnomeCalendarPrivate *priv;
-	ECal *client;
-	
-	g_return_val_if_fail (gcal != NULL, FALSE);
-	g_return_val_if_fail (GNOME_IS_CALENDAR (gcal), FALSE);
-	g_return_val_if_fail (E_IS_SOURCE (source), FALSE);
-
-	priv = gcal->priv;
-
-	client = g_hash_table_lookup (priv->clients[source_type], e_source_peek_uid (source));
-	if (client) {
-		/* We already have it */
-
-		return TRUE;
-	} else {
-		ESource *default_source;
-		
-		if (priv->default_client[source_type]) {
-			default_source = e_cal_get_source (priv->default_client[source_type]);
-
-			g_message ("Check if default client matches (%s %s)", e_source_peek_uid (default_source), e_source_peek_uid (source));
-			/* We don't have it but the default client is it */
-			if (!strcmp (e_source_peek_uid (default_source), e_source_peek_uid (source)))
-				client = g_object_ref (priv->default_client[source_type]);
-		}
-
-		/* Create a new one */		
-		if (!client) {
-			client = auth_new_cal_from_source (source, source_type);
-			if (!client)
-				return FALSE;
-		}
-	}
-	
-	g_signal_connect (G_OBJECT (client), "backend_error", G_CALLBACK (backend_error_cb), gcal);
-	g_signal_connect (G_OBJECT (client), "backend_died", G_CALLBACK (backend_died_cb), gcal);
-
-	/* add the client to internal structure */
-	g_hash_table_insert (priv->clients[source_type], g_strdup (e_source_peek_uid (source)), client);
-	priv->clients_list[source_type] = g_list_prepend (priv->clients_list[source_type], client);
-
-	gtk_signal_emit (GTK_OBJECT (gcal), gnome_calendar_signals[SOURCE_ADDED], source_type, source);
-
-	open_ecal (gcal, client, FALSE, client_cal_opened_cb);
-
-	return TRUE;
-}
-
-/**
- * gnome_calendar_remove_source
- * @gcal: A #GnomeCalendar.
- * @source: #ESource to be removed from the clients.
- *
- * Removes the given source from the list of clients being shown by the
- * calendar views.
- *
- * Returns: TRUE if successful, FALSE otherwise.
- */
-gboolean
-gnome_calendar_remove_source (GnomeCalendar *gcal, ECalSourceType source_type, ESource *source)
-{
-	gboolean result;
-	
-	g_return_val_if_fail (gcal != NULL, FALSE);
-	g_return_val_if_fail (GNOME_IS_CALENDAR (gcal), FALSE);
-	g_return_val_if_fail (E_IS_SOURCE (source), FALSE);
-
-	result = gnome_calendar_remove_source_by_uid (gcal, source_type, e_source_peek_uid (source));
-	if (result)
-		gtk_signal_emit (GTK_OBJECT (gcal), gnome_calendar_signals[SOURCE_REMOVED], source_type, source);
-
-	return result;
-}
-
-gboolean
-gnome_calendar_remove_source_by_uid (GnomeCalendar *gcal, ECalSourceType source_type, const char *uid)
-{
-	GnomeCalendarPrivate *priv;
-	ECal *client;
-	ECalModel *model;
-	int i;
-	GList *l;
-
-	g_return_val_if_fail (gcal != NULL, FALSE);
-	g_return_val_if_fail (GNOME_IS_CALENDAR (gcal), FALSE);
-	g_return_val_if_fail (uid != NULL, FALSE);
-
-	priv = gcal->priv;
-
-	client = g_hash_table_lookup (priv->clients[source_type], uid);
-	if (!client)
-		return TRUE;
-
-	priv->clients_list[source_type] = g_list_remove (priv->clients_list[source_type], client);
-	g_signal_handlers_disconnect_matched (client, G_SIGNAL_MATCH_DATA,
-					      0, 0, NULL, NULL, gcal);	
-
-	switch (source_type) {
-	case E_CAL_SOURCE_TYPE_EVENT:
-		/* remove the query for this client */
-		for (l = priv->dn_queries; l != NULL; l = l->next) {
-			ECalView *query = l->data;
-
-			if (query && (client == e_cal_view_get_client (query))) {
-				g_signal_handlers_disconnect_matched (query, G_SIGNAL_MATCH_DATA,
-								      0, 0, NULL, NULL, gcal);
-				priv->dn_queries = g_list_remove (priv->dn_queries, query);
-				g_object_unref (query);
-				break;
-			}
-		}
-
-		for (i = 0; i < GNOME_CAL_LAST_VIEW; i++) {
-			model = e_calendar_view_get_model (priv->views[i]);
-			e_cal_model_remove_client (model, client);
-		}
-
-		/* update date navigator query */
-		update_query (gcal);
-		break;
-		
-	case E_CAL_SOURCE_TYPE_TODO:
-		model = e_calendar_table_get_model (E_CALENDAR_TABLE (priv->todo));
-		e_cal_model_remove_client (model, client);
-		break;
-		
-	default:
-		g_assert_not_reached ();
-		break;
-	}
-	
-	g_hash_table_remove (priv->clients[source_type], uid);
-
-	return TRUE;
-}
-
-/**
- * gnome_calendar_set_default_source:
- * @gcal: A calendar view
- * @source: The #ESource to use as default
- * 
- * Set the default uri on the given calendar view, the default uri
- * will be used as the default when creating events in the view.
-
- * 
- * Return value: TRUE if the uri was already added and is set, FALSE
- * otherwise
- **/
-gboolean
-gnome_calendar_set_default_source (GnomeCalendar *gcal, ECalSourceType source_type, ESource *source)
-{
-	GnomeCalendarPrivate *priv;
-	ECal *client;
-	
-	g_return_val_if_fail (gcal != NULL, FALSE);
-	g_return_val_if_fail (GNOME_IS_CALENDAR (gcal), FALSE);
-	g_return_val_if_fail (E_IS_SOURCE (source), FALSE);
-
-	priv = gcal->priv;
-
-	client = g_hash_table_lookup (priv->clients[source_type], e_source_peek_uid (source));
-
-	if (priv->default_client[source_type])
-		g_object_unref (priv->default_client[source_type]);
-
-	if (client) {
-		priv->default_client[source_type] = g_object_ref (client);
-	} else {
-		priv->default_client[source_type] = auth_new_cal_from_source (source, source_type);
-		if (!priv->default_client[source_type])
-			return FALSE;
-	}
-
-	open_ecal (gcal, priv->default_client[source_type], FALSE, default_client_cal_opened_cb);
-
-	return TRUE;
-}
-
-void
-gnome_calendar_set_selected_time_range (GnomeCalendar *gcal,
-					time_t	       start_time,
-					time_t	       end_time)
-{
-	GnomeCalendarPrivate *priv;
-
-	priv = gcal->priv;
-
-	update_view_times (gcal, start_time);
-	gnome_calendar_update_date_navigator (gcal);
-	gnome_calendar_notify_dates_shown_changed (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;
-	ECalModel *model;
-	
-	g_return_if_fail (gcal != NULL);
-	g_return_if_fail (GNOME_IS_CALENDAR (gcal));
-
-	priv = gcal->priv;
-
-	model = e_calendar_view_get_model (priv->views[priv->current_view_type]);
-	e_cal_model_get_time_range (model, start_time, end_time);
-}
-
-/**
- * gnome_calendar_new_task:
- * @gcal: An Evolution calendar.
- *
- * Opens a task editor dialog for a new task.
- **/
-void
-gnome_calendar_new_task		(GnomeCalendar *gcal)
-{
-	GnomeCalendarPrivate *priv;
-	ECal *ecal;
-	ECalModel *model;
-	TaskEditor *tedit;
-	ECalComponent *comp;
-	icalcomponent *icalcomp;
-	const char *category;
-	
-	g_return_if_fail (gcal != NULL);
-	g_return_if_fail (GNOME_IS_CALENDAR (gcal));
-
-	priv = gcal->priv;
-
-	model = e_calendar_table_get_model (E_CALENDAR_TABLE (priv->todo));
-	ecal = e_cal_model_get_default_client (model);
-	if (!ecal)
-		return;
-	
-	tedit = task_editor_new (ecal, FALSE);
-
-	icalcomp = e_cal_model_create_component_with_defaults (model);
-	comp = e_cal_component_new ();
-	e_cal_component_set_icalcomponent (comp, icalcomp);
-
-	category = cal_search_bar_get_category (CAL_SEARCH_BAR (priv->search_bar));
-	e_cal_component_set_categories (comp, category);
-
-	comp_editor_edit_comp (COMP_EDITOR (tedit), comp);
-	g_object_unref (comp);
-
-	comp_editor_focus (COMP_EDITOR (tedit));
-}
-
-
-/* Returns the selected time range for the current view. Note that this may be
-   different from the fields in the GnomeCalendar, since the view may clip
-   this or choose a more appropriate time. */
-void
-gnome_calendar_get_current_time_range (GnomeCalendar *gcal,
-				       time_t	 *start_time,
-				       time_t	 *end_time)
-{
-	GnomeCalendarPrivate *priv;
-
-	priv = gcal->priv;
-
-	e_calendar_view_get_selected_time_range (E_CALENDAR_VIEW (gnome_calendar_get_current_view_widget (gcal)),
-					    start_time, end_time);
-}
-
-
-/* Gets the visible time range for the current view. Returns FALSE if no
-   time range has been set yet. */
-gboolean
-gnome_calendar_get_visible_time_range (GnomeCalendar *gcal,
-				       time_t	 *start_time,
-				       time_t	 *end_time)
-{
-	GnomeCalendarPrivate *priv;
-	gboolean retval = FALSE;
-
-	g_return_val_if_fail (GNOME_IS_CALENDAR (gcal), FALSE);
-
-	priv = gcal->priv;
-
-	retval = e_calendar_view_get_visible_time_range (E_CALENDAR_VIEW (gnome_calendar_get_current_view_widget (gcal)),
-						    start_time, end_time);
-
-	return retval;
-}
-
-/* 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;
-	ECalModel *model;
-	time_t start, end;
-	GDate start_date, end_date;
-
-	priv = gcal->priv;
-
-	/* If the ECalendar isn't visible, we just return. */
-	if (!GTK_WIDGET_VISIBLE (priv->date_navigator))
-		return;
-
-	model = e_calendar_view_get_model (priv->views[priv->current_view_type]);
-	e_cal_model_get_time_range (model, &start, &end);
-	
-	time_to_gdate_with_zone (&start_date, start, priv->zone);
-	if (priv->current_view_type == GNOME_CAL_MONTH_VIEW) {
-		EWeekView *week_view = E_WEEK_VIEW (priv->views[priv->current_view_type]);
-
-		if (priv->week_start == 0 
-		    && (!week_view->multi_week_view || week_view->compress_weekend))
-			g_date_add_days (&start_date, 1);
-	}
-	time_to_gdate_with_zone (&end_date, end, priv->zone);
-	g_date_subtract_days (&end_date, 1);
-	
-	e_calendar_item_set_selection (priv->date_navigator->calitem,
-				       &start_date, &end_date);
-}
-
-static void
-gnome_calendar_on_date_navigator_selection_changed (ECalendarItem *calitem, GnomeCalendar *gcal)
-{
-	GnomeCalendarPrivate *priv;
-	GnomeCalendarViewType view_type;
-	ECalModel *model;
-	GDate start_date, end_date, new_start_date, new_end_date;
-	gint new_days_shown;
-	gboolean starts_on_week_start_day;
-	time_t new_time, start, end;
-	struct icaltimetype tt;
-
-	priv = gcal->priv;
-	
-	starts_on_week_start_day = FALSE;
-
-	model = e_calendar_view_get_model (priv->views[priv->current_view_type]);
-	e_cal_model_get_time_range (model, &start, &end);
-	
-	time_to_gdate_with_zone (&start_date, start, priv->zone);
-	if (priv->current_view_type == GNOME_CAL_MONTH_VIEW) {
-		EWeekView *week_view = E_WEEK_VIEW (priv->views[priv->current_view_type]);
-
-		if (priv->week_start == 0 && (!week_view->multi_week_view || week_view->compress_weekend))
-			g_date_add_days (&start_date, 1);
-	}
-	time_to_gdate_with_zone (&end_date, end, priv->zone);
-	g_date_subtract_days (&end_date, 1);
-
-	e_calendar_item_get_selection (calitem, &new_start_date, &new_end_date);
-
-	/* If the selection hasn't changed just return. */
-	if (!g_date_compare (&start_date, &new_start_date)
-	    && !g_date_compare (&end_date, &new_end_date))
-		return;
-	
-	new_days_shown = g_date_julian (&new_end_date) - g_date_julian (&new_start_date) + 1;
-
-	/* If a complete week is selected we show the Week view.
-	   Note that if weekends are compressed and the week start day is set
-	   to Sunday we don't actually show complete weeks in the Week view,
-	   so this may need tweaking. */
-	if (g_date_weekday (&new_start_date) % 7 == priv->week_start)
-		starts_on_week_start_day = TRUE;
-
-	/* Update selection to be in the new time range */
-	tt = icaltime_null_time ();
-	tt.year = g_date_year (&new_start_date);
-	tt.month  = g_date_month (&new_start_date);
-	tt.day = g_date_day (&new_start_date);
-	new_time = icaltime_as_timet_with_zone (tt, priv->zone);
-	
-	/* Switch views as appropriate, and change the number of days or weeks
-	   shown. */
-	if (new_days_shown > 9) {
-		/* FIXME Gross hack so that the view times are updated properly */
-		priv->range_selected = TRUE;
-
-		e_week_view_set_weeks_shown (E_WEEK_VIEW (priv->month_view),
-					     (new_days_shown + 6) / 7);
-		view_type = GNOME_CAL_MONTH_VIEW;
-	} else if (new_days_shown == 7 && starts_on_week_start_day) {
-		view_type = GNOME_CAL_WEEK_VIEW;
-	} else {		
-		e_day_view_set_days_shown (E_DAY_VIEW (priv->day_view), new_days_shown);
-		
-		if (new_days_shown == 5 && starts_on_week_start_day 
-		    && priv->current_view_type == GNOME_CAL_WORK_WEEK_VIEW)
-			view_type = GNOME_CAL_WORK_WEEK_VIEW;
-		else
-			view_type = GNOME_CAL_DAY_VIEW;
-	}
-
-	/* Make the views display things properly */
-	update_view_times (gcal, new_time);
-
-	set_view (gcal, view_type, TRUE);
-	gnome_calendar_notify_dates_shown_changed (gcal);
-}
-
-static void
-gnome_calendar_on_date_navigator_date_range_changed (ECalendarItem *calitem, GnomeCalendar *gcal)
-{
-	update_query (gcal);
-}
-
-static void
-gnome_calendar_hpane_realized (GtkWidget *w, GnomeCalendar *gcal)
-{
-	GnomeCalendarPrivate *priv;
-
-	priv = gcal->priv;
-
-	if (priv->current_view_type == GNOME_CAL_MONTH_VIEW && !priv->range_selected) {
-		gtk_paned_set_position (GTK_PANED (priv->hpane), priv->hpane_pos_month_view);
-	} else {
-		gtk_paned_set_position (GTK_PANED (priv->hpane), priv->hpane_pos);
-	}
-}
-
-static void
-gnome_calendar_vpane_realized (GtkWidget *w, GnomeCalendar *gcal)
-{
-	GnomeCalendarPrivate *priv;
-
-	priv = gcal->priv;
-
-	if (priv->current_view_type == GNOME_CAL_MONTH_VIEW && !priv->range_selected) {
-		gtk_paned_set_position (GTK_PANED (priv->vpane), priv->vpane_pos_month_view);
-	} else {
-		gtk_paned_set_position (GTK_PANED (priv->vpane), priv->vpane_pos);
-	}
-}
-
-static gboolean
-gnome_calendar_vpane_resized (GtkWidget *w, GdkEventButton *e, GnomeCalendar *gcal)
-{
-	GnomeCalendarPrivate *priv;
-
-	priv = gcal->priv;
-
-	if (priv->current_view_type == GNOME_CAL_MONTH_VIEW && !priv->range_selected) {
-		priv->vpane_pos_month_view = gtk_paned_get_position (GTK_PANED (priv->vpane));
-		calendar_config_set_month_vpane_pos (priv->vpane_pos_month_view);
-	} else {
-		priv->vpane_pos = gtk_paned_get_position (GTK_PANED (priv->vpane));
-		calendar_config_set_vpane_pos (priv->vpane_pos);
-	}
-
-	return FALSE;
-}
-
-static gboolean
-gnome_calendar_hpane_resized (GtkWidget *w, GdkEventButton *e, GnomeCalendar *gcal)
-{
-	GnomeCalendarPrivate *priv;
-	gint times_width;
-
-	priv = gcal->priv;
-
-	if (priv->current_view_type == GNOME_CAL_MONTH_VIEW && !priv->range_selected) {
-		priv->hpane_pos_month_view = gtk_paned_get_position (GTK_PANED (priv->hpane));
-		calendar_config_set_month_hpane_pos (priv->hpane_pos_month_view);
-	} else {
-		priv->hpane_pos = gtk_paned_get_position (GTK_PANED (priv->hpane));
-		calendar_config_set_hpane_pos (priv->hpane_pos);
-	}
-
-	/* adjust the size of the EDayView's time column */
-	times_width = e_day_view_time_item_get_column_width (
-		E_DAY_VIEW_TIME_ITEM (E_DAY_VIEW (priv->day_view)->time_canvas_item));
-	if (times_width < priv->hpane_pos - 20)
-		gtk_widget_set_usize (E_DAY_VIEW (priv->day_view)->time_canvas, times_width, -1);
-	else
-		gtk_widget_set_usize (E_DAY_VIEW (priv->day_view)->time_canvas, priv->hpane_pos - 20, -1);
-	
-	
-	return FALSE;
-}
-
-void
-gnome_calendar_cut_clipboard (GnomeCalendar *gcal)
-{
-	GnomeCalendarPrivate *priv;
-	FocusLocation location;
-
-	priv = gcal->priv;
-
-	location = get_focus_location (gcal);
-
-	if (location == FOCUS_CALENDAR) {
-		e_calendar_view_cut_clipboard (E_CALENDAR_VIEW (gnome_calendar_get_current_view_widget (gcal)));
-	} else if (location == FOCUS_TASKPAD)
-		e_calendar_table_cut_clipboard (E_CALENDAR_TABLE (priv->todo));
-}
-
-void
-gnome_calendar_copy_clipboard (GnomeCalendar *gcal)
-{
-	GnomeCalendarPrivate *priv;
-	FocusLocation location;
-
-	priv = gcal->priv;
-
-	location = get_focus_location (gcal);
-
-	if (location == FOCUS_CALENDAR) {
-		e_calendar_view_copy_clipboard (E_CALENDAR_VIEW (gnome_calendar_get_current_view_widget (gcal)));
-	} else if (location == FOCUS_TASKPAD)
-		e_calendar_table_copy_clipboard (E_CALENDAR_TABLE (priv->todo));
-}
-
-void
-gnome_calendar_paste_clipboard (GnomeCalendar *gcal)
-{
-	GnomeCalendarPrivate *priv;
-	FocusLocation location;
-
-	priv = gcal->priv;
-
-	location = get_focus_location (gcal);
-
-	if (location == FOCUS_CALENDAR) {
-		e_calendar_view_paste_clipboard (E_CALENDAR_VIEW (gnome_calendar_get_current_view_widget (gcal)));
-	} else if (location == FOCUS_TASKPAD)
-		e_calendar_table_paste_clipboard (E_CALENDAR_TABLE (priv->todo));
-}
-
-
-/* Get the current timezone. */
-icaltimezone*
-gnome_calendar_get_timezone	(GnomeCalendar	*gcal)
-{
-	g_return_val_if_fail (gcal != NULL, NULL);
-	g_return_val_if_fail (GNOME_IS_CALENDAR (gcal), NULL);
-
-	return gcal->priv->zone;
-}
-
-
-static void
-gnome_calendar_notify_dates_shown_changed (GnomeCalendar *gcal)
-{
-	GnomeCalendarPrivate *priv;
-	time_t start_time, end_time;
-
-	g_return_if_fail (GNOME_IS_CALENDAR (gcal));
-
-	priv = gcal->priv;
-
-	/* If no time range is set yet, just return. */
-	if (!gnome_calendar_get_visible_time_range (gcal, &start_time,
-						    &end_time))
-		return;
-
-	/* We check if the visible date range has changed, and only emit the
-	   signal if it has. (This makes sure we only change the folder title
-	   bar label in the shell when we need to.) */
-	if (priv->visible_start != start_time
-	    || priv->visible_end != end_time) {
-		priv->visible_start = start_time;
-		priv->visible_end = end_time;
-
-		gtk_signal_emit (GTK_OBJECT (gcal),
-				 gnome_calendar_signals[DATES_SHOWN_CHANGED]);
-	}
-}
-
-
-/* Returns the number of selected events (0 or 1 at present). */
-gint
-gnome_calendar_get_num_events_selected (GnomeCalendar *gcal)
-{
-	GtkWidget *view;
-	gint retval = 0;
-
-	g_return_val_if_fail (GNOME_IS_CALENDAR (gcal), 0);
-
-	view = gnome_calendar_get_current_view_widget (gcal);
-	if (E_IS_DAY_VIEW (view))
-		retval = e_day_view_get_num_events_selected (E_DAY_VIEW (view));
-	else
-		retval = e_week_view_get_num_events_selected (E_WEEK_VIEW (view));
-
-	return retval;
-}
-
-/**
- * gnome_calendar_get_num_tasks_selected:
- * @gcal: A calendar view.
- * 
- * Queries the number of tasks that are currently selected in the task pad of a
- * calendar view.
- * 
- * Return value: Number of selected tasks.
- **/
-gint
-gnome_calendar_get_num_tasks_selected (GnomeCalendar *gcal)
-{
-	GnomeCalendarPrivate *priv;
-	ETable *etable;
-
-	g_return_val_if_fail (gcal != NULL, -1);
-	g_return_val_if_fail (GNOME_IS_CALENDAR (gcal), -1);
-
-	priv = gcal->priv;
-
-	etable = e_calendar_table_get_table (E_CALENDAR_TABLE (priv->todo));
-	return e_table_selected_count (etable);
-}
-
-
-void
-gnome_calendar_delete_selection		(GnomeCalendar  *gcal)
-{
-	GnomeCalendarPrivate *priv;
-	FocusLocation location;
-	GtkWidget *view;
-
-	g_return_if_fail (GNOME_IS_CALENDAR (gcal));
-
-	priv = gcal->priv;
-
-	location = get_focus_location (gcal);
-
-	if (location == FOCUS_CALENDAR) {
-		view = gnome_calendar_get_current_view_widget (gcal);
-
-		e_calendar_view_delete_selected_events (E_CALENDAR_VIEW (view));
-	} else if (location == FOCUS_TASKPAD)
-		e_calendar_table_delete_selected (E_CALENDAR_TABLE (priv->todo));
-}
-
-void
-gnome_calendar_delete_selected_occurrence (GnomeCalendar *gcal)
-{
-	GnomeCalendarPrivate *priv;
-	FocusLocation location;
-	GtkWidget *view;
-
-	g_return_if_fail (GNOME_IS_CALENDAR (gcal));
-
-	priv = gcal->priv;
-
-	location = get_focus_location (gcal);
-
-	if (location == FOCUS_CALENDAR) {
-
-		view = gnome_calendar_get_current_view_widget (gcal);
-		e_calendar_view_delete_selected_occurrence (E_CALENDAR_VIEW (view));
-	}
-}
-
-static gboolean
-check_instance_cb (ECalComponent *comp,
-		   time_t instance_start,
-		   time_t instance_end,
-		   gpointer data)
-{
-	gboolean *remove = data;
-
-	*remove = FALSE;
-
-	return FALSE;
-}
-
-void
-gnome_calendar_purge (GnomeCalendar *gcal, time_t older_than)
-{
-	GnomeCalendarPrivate *priv;
-	char *sexp, *start, *end;
-	GList *l;
-
-	g_return_if_fail (GNOME_IS_CALENDAR (gcal));
-
-	priv = gcal->priv;
-
-	start = isodate_from_time_t (0);
-	end = isodate_from_time_t (older_than);
-	sexp = g_strdup_printf ("(occur-in-time-range? (make-time \"%s\")"
-				"                      (make-time \"%s\"))",
-				start, end);
-
-	e_calendar_view_set_status_message (E_CALENDAR_VIEW (priv->week_view), _("Purging"));
-
-	/* FIXME Confirm expunge */
-	for (l = priv->clients_list[E_CAL_SOURCE_TYPE_EVENT]; l != NULL; l = l->next) {
-		ECal *client = l->data;
-		GList *objects, *m;
-		gboolean read_only;
-		
-		if (!e_cal_is_read_only (client, &read_only, NULL) || read_only)
-			continue;
-		
-		if (!e_cal_get_object_list (client, sexp, &objects, NULL)) {
-			g_warning (G_STRLOC ": Could not get the objects");
-			
-			continue;
-		}
-		
-		for (m = objects; m; m = m->next) {
-			gboolean remove = TRUE;
-
-			/* FIXME write occur-before and occur-after
-			 * sexp funcs so we don't have to use the max
-			 * int */
-			e_cal_generate_instances_for_object (client, m->data,
-							     older_than, G_MAXINT32,
-							     (ECalRecurInstanceFn) check_instance_cb,
-							     &remove);
-
-			/* FIXME Better error handling */
-			if (remove)
-				e_cal_remove_object (client, icalcomponent_get_uid (m->data), NULL);
-		}
-	}
-
-	e_calendar_view_set_status_message (E_CALENDAR_VIEW (priv->week_view), NULL);
-
-	g_free (sexp);
-	g_free (start);
-	g_free (end);
-
-}
-
-ECalendarTable*
-gnome_calendar_get_task_pad	(GnomeCalendar *gcal)
-{
-	g_return_val_if_fail (GNOME_IS_CALENDAR (gcal), NULL);
-
-	return E_CALENDAR_TABLE (gcal->priv->todo);
-}
-
-GtkWidget *
-gnome_calendar_get_e_calendar_widget (GnomeCalendar *gcal)
-{
- 	g_return_val_if_fail (GNOME_IS_CALENDAR (gcal), NULL);
- 
- 	return GTK_WIDGET(gcal->priv->date_navigator);
-}
- 
-GtkWidget *
-gnome_calendar_get_search_bar_widget (GnomeCalendar *gcal)
-{
- 	g_return_val_if_fail (GNOME_IS_CALENDAR (gcal), NULL);
- 
- 	return GTK_WIDGET(gcal->priv->search_bar);
-}
-
-GtkWidget *
-gnome_calendar_get_view_notebook_widget (GnomeCalendar *gcal)
-{
- 	g_return_val_if_fail (GNOME_IS_CALENDAR (gcal), NULL);
- 
- 	return GTK_WIDGET(gcal->priv->notebook);
-}
-
-ECalMenu *gnome_calendar_get_taskpad_menu (GnomeCalendar *gcal)
-{
- 	g_return_val_if_fail (GNOME_IS_CALENDAR (gcal), NULL);
- 
- 	return gcal->priv->taskpad_menu;
-}
-
-ECalMenu *gnome_calendar_get_calendar_menu (GnomeCalendar *gcal)
-{
- 	g_return_val_if_fail (GNOME_IS_CALENDAR (gcal), NULL);
- 
- 	return gcal->priv->calendar_menu;
-}
diff --git a/calendar/gui/gnome-cal.h b/calendar/gui/gnome-cal.h
deleted file mode 100644
index 756a9ade84..0000000000
--- a/calendar/gui/gnome-cal.h
+++ /dev/null
@@ -1,192 +0,0 @@
-/* Evolution calendar - Main calendar view widget
- *
- * Copyright (C) 1998 The Free Software Foundation
- * Copyright (C) 2000 Ximian, Inc.
- * Copyright (C) 2001 Ximian, Inc.
- *
- * Authors: Miguel de Icaza <miguel@ximian.com>
- *          Federico Mena-Quintero <federico@ximian.com>
- *          Seth Alves <alves@hungry.com>
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of version 2 of the GNU General Public
- * License as published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307, USA.
- */
-
-#ifndef GNOME_CALENDAR_APP_H
-#define GNOME_CALENDAR_APP_H
-
-#include <time.h>
-#include <gtk/gtkvbox.h>
-#include <bonobo/bonobo-ui-component.h>
-#include <widgets/misc/e-calendar.h>
-#include <libecal/e-cal.h>
-
-#include "e-calendar-table.h"
-
-G_BEGIN_DECLS
-
-
-
-struct _EPopup;
-
-#define GNOME_TYPE_CALENDAR            (gnome_calendar_get_type ())
-#define GNOME_CALENDAR(obj)            (GTK_CHECK_CAST ((obj), GNOME_TYPE_CALENDAR, GnomeCalendar))
-#define GNOME_CALENDAR_CLASS(klass)    (GTK_CHECK_CAST_CLASS ((klass), GNOME_TYPE_CALENDAR,	\
-					GnomeCalendarClass))
-#define GNOME_IS_CALENDAR(obj)         (GTK_CHECK_TYPE ((obj), GNOME_TYPE_CALENDAR))
-#define GNOME_IS_CALENDAR_CLASS(klass) (GTK_CHECK_CLASS_TYPE ((klass), GNOME_TYPE_CALENDAR))
-
-typedef struct _GnomeCalendar GnomeCalendar;
-typedef struct _GnomeCalendarClass GnomeCalendarClass;
-typedef struct _GnomeCalendarPrivate GnomeCalendarPrivate;
-
-/* View types */
-typedef enum {
-	GNOME_CAL_DAY_VIEW,
-	GNOME_CAL_WORK_WEEK_VIEW,
-	GNOME_CAL_WEEK_VIEW,
-	GNOME_CAL_MONTH_VIEW,
-	GNOME_CAL_LIST_VIEW,
-	GNOME_CAL_LAST_VIEW
-} GnomeCalendarViewType;
-
-typedef enum {
-	GNOME_CAL_GOTO_TODAY,
-	GNOME_CAL_GOTO_DATE,
-	GNOME_CAL_GOTO_FIRST_DAY_OF_MONTH,
-	GNOME_CAL_GOTO_LAST_DAY_OF_MONTH,
-	GNOME_CAL_GOTO_FIRST_DAY_OF_WEEK,
-	GNOME_CAL_GOTO_LAST_DAY_OF_WEEK,
-	GNOME_CAL_GOTO_SAME_DAY_OF_PREVIOUS_WEEK,
-	GNOME_CAL_GOTO_SAME_DAY_OF_NEXT_WEEK
-} GnomeCalendarGotoDateType;
-
-struct _GnomeCalendar {
-	GtkVBox vbox;
-
-	/* Private data */
-	GnomeCalendarPrivate *priv;
-};
-
-struct _GnomeCalendarClass {
-	GtkVBoxClass parent_class;
-
-	/* Notification signals */
-	void (* dates_shown_changed)    (GnomeCalendar *gcal);
-
-	void (* calendar_selection_changed) (GnomeCalendar *gcal);
-	void (* taskpad_selection_changed) (GnomeCalendar *gcal);
-
-	void (* calendar_focus_change)  (GnomeCalendar *gcal, gboolean in);
-	void (* taskpad_focus_change)   (GnomeCalendar *gcal, gboolean in);
-
-        void (* source_added)           (GnomeCalendar *gcal, ECalSourceType source_type, ESource *source);
-        void (* source_removed)         (GnomeCalendar *gcal, ECalSourceType source_type, ESource *source);
-
-	/* Action signals */
-        void (* goto_date)              (GnomeCalendar *gcal, GnomeCalendarGotoDateType date);
-};
-
-
-GtkType    gnome_calendar_get_type         	(void);
-GtkWidget *gnome_calendar_construct		(GnomeCalendar *gcal);
-
-GtkWidget *gnome_calendar_new			(void);
-
-void gnome_calendar_set_activity_handler (GnomeCalendar *cal, EActivityHandler *activity_handler);
-void gnome_calendar_set_ui_component (GnomeCalendar *cal, BonoboUIComponent *ui_component);
-
-ECalendarTable *gnome_calendar_get_task_pad	(GnomeCalendar *gcal);
-
-ECalModel *gnome_calendar_get_calendar_model    (GnomeCalendar *gcal);
-ECal *gnome_calendar_get_default_client    (GnomeCalendar *gcal);
-
-gboolean   gnome_calendar_add_source      (GnomeCalendar *gcal, ECalSourceType source_type, ESource *source);
-gboolean   gnome_calendar_remove_source   (GnomeCalendar *gcal, ECalSourceType source_type, ESource *source);
-gboolean   gnome_calendar_remove_source_by_uid   (GnomeCalendar *gcal, ECalSourceType source_type, const char *uid);
-gboolean   gnome_calendar_set_default_source (GnomeCalendar *gcal, ECalSourceType source_type, ESource *source);
-
-void       gnome_calendar_next             	(GnomeCalendar *gcal);
-void       gnome_calendar_previous         	(GnomeCalendar *gcal);
-void       gnome_calendar_goto             	(GnomeCalendar *gcal,
-						 time_t new_time);
-void       gnome_calendar_dayjump          	(GnomeCalendar *gcal,
-						 time_t time);
-/* Jumps to the current day */
-void       gnome_calendar_goto_today            (GnomeCalendar *gcal);
-
-GnomeCalendarViewType gnome_calendar_get_view (GnomeCalendar *gcal);
-void gnome_calendar_set_view (GnomeCalendar *gcal, GnomeCalendarViewType view_type);
-
-GtkWidget *gnome_calendar_get_current_view_widget (GnomeCalendar *gcal);
-
-ECalendarTable *gnome_calendar_get_task_pad	(GnomeCalendar *gcal);
-GtkWidget *gnome_calendar_get_e_calendar_widget (GnomeCalendar *gcal); 
-GtkWidget *gnome_calendar_get_search_bar_widget (GnomeCalendar *gcal);
-GtkWidget *gnome_calendar_get_view_notebook_widget (GnomeCalendar *gcal);
-
-struct _ECalMenu *gnome_calendar_get_taskpad_menu (GnomeCalendar *gcal);
-struct _ECalMenu *gnome_calendar_get_calendar_menu (GnomeCalendar *gcal);
-
-void gnome_calendar_setup_view_menus (GnomeCalendar *gcal, BonoboUIComponent *uic);
-void gnome_calendar_discard_view_menus (GnomeCalendar *gcal);
-
-void gnome_calendar_view_popup_factory (GnomeCalendar *gcal, struct _EPopup *ep, const char *prefix);
-
-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_new_task		(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);
-
-/* Gets the visible time range for the current view. Returns FALSE if no
-   time range has been set yet. */
-gboolean   gnome_calendar_get_visible_time_range (GnomeCalendar *gcal,
-						  time_t	 *start_time,
-						  time_t	 *end_time);
-
-/* Returns the number of selected events (0 or 1 at present). */
-gint	   gnome_calendar_get_num_events_selected (GnomeCalendar *gcal);
-
-/* Returns the number of selected tasks */
-gint       gnome_calendar_get_num_tasks_selected (GnomeCalendar *gcal);
-
-/* Get the current timezone. */
-icaltimezone *gnome_calendar_get_timezone	(GnomeCalendar	*gcal);
-
-
-/* Clipboard operations */
-void       gnome_calendar_cut_clipboard         (GnomeCalendar  *gcal);
-void       gnome_calendar_copy_clipboard        (GnomeCalendar  *gcal);
-void       gnome_calendar_paste_clipboard       (GnomeCalendar  *gcal);
-
-void       gnome_calendar_delete_selection	(GnomeCalendar  *gcal);
-void       gnome_calendar_delete_selected_occurrence (GnomeCalendar *gcal);
-void       gnome_calendar_purge                 (GnomeCalendar  *gcal,
-						 time_t older_than);
-
-
-
-G_END_DECLS
-
-#endif
diff --git a/calendar/gui/gnome-calendar-conduit.png b/calendar/gui/gnome-calendar-conduit.png
deleted file mode 100644
index e867ba90b2..0000000000
--- a/calendar/gui/gnome-calendar-conduit.png
+++ /dev/null
diff --git a/calendar/gui/goto-dialog.glade b/calendar/gui/goto-dialog.glade
deleted file mode 100644
index f976fe5214..0000000000
--- a/calendar/gui/goto-dialog.glade
+++ /dev/null
@@ -1,225 +0,0 @@
-<?xml version="1.0" standalone="no"?> <!--*- mode: xml -*-->
-<!DOCTYPE glade-interface SYSTEM "http://glade.gnome.org/glade-2.0.dtd">
-
-<glade-interface>
-
-<widget class="GtkDialog" id="goto-dialog">
-  <property name="title" translatable="yes">Select Date</property>
-  <property name="type">GTK_WINDOW_TOPLEVEL</property>
-  <property name="window_position">GTK_WIN_POS_NONE</property>
-  <property name="modal">False</property>
-  <property name="resizable">True</property>
-  <property name="destroy_with_parent">False</property>
-  <property name="has_separator">True</property>
-
-  <child internal-child="vbox">
-    <widget class="GtkVBox" id="dialog-vbox1">
-      <property name="visible">True</property>
-      <property name="homogeneous">False</property>
-      <property name="spacing">8</property>
-
-      <child internal-child="action_area">
-	<widget class="GtkHButtonBox" id="dialog-action_area1">
-	  <property name="visible">True</property>
-	  <property name="layout_style">GTK_BUTTONBOX_END</property>
-
-	  <child>
-	    <widget class="GtkButton" id="button4">
-	      <property name="visible">True</property>
-	      <property name="can_default">True</property>
-	      <property name="can_focus">True</property>
-	      <property name="label" translatable="yes">_Select Today</property>
-	      <property name="use_underline">True</property>
-	      <property name="relief">GTK_RELIEF_NORMAL</property>
-	      <property name="response_id">0</property>
-	    </widget>
-	  </child>
-
-	  <child>
-	    <widget class="GtkButton" id="button5">
-	      <property name="visible">True</property>
-	      <property name="can_default">True</property>
-	      <property name="can_focus">True</property>
-	      <property name="label">gtk-cancel</property>
-	      <property name="use_stock">True</property>
-	      <property name="relief">GTK_RELIEF_NORMAL</property>
-	      <property name="response_id">-6</property>
-	    </widget>
-	  </child>
-	</widget>
-	<packing>
-	  <property name="padding">0</property>
-	  <property name="expand">False</property>
-	  <property name="fill">True</property>
-	  <property name="pack_type">GTK_PACK_END</property>
-	</packing>
-      </child>
-
-      <child>
-	<widget class="GtkVBox" id="vbox">
-	  <property name="visible">True</property>
-	  <property name="homogeneous">False</property>
-	  <property name="spacing">4</property>
-
-	  <child>
-	    <widget class="GtkHBox" id="hbox12">
-	      <property name="visible">True</property>
-	      <property name="homogeneous">True</property>
-	      <property name="spacing">4</property>
-
-	      <child>
-		<widget class="GtkOptionMenu" id="month">
-		  <property name="visible">True</property>
-		  <property name="can_focus">True</property>
-		  <property name="history">0</property>
-
-		  <child internal-child="menu">
-		    <widget class="GtkMenu" id="convertwidget1">
-		      <property name="visible">True</property>
-
-		      <child>
-			<widget class="GtkMenuItem" id="convertwidget2">
-			  <property name="visible">True</property>
-			  <property name="label" translatable="yes">January</property>
-			  <property name="use_underline">True</property>
-			</widget>
-		      </child>
-
-		      <child>
-			<widget class="GtkMenuItem" id="convertwidget3">
-			  <property name="visible">True</property>
-			  <property name="label" translatable="yes">February</property>
-			  <property name="use_underline">True</property>
-			</widget>
-		      </child>
-
-		      <child>
-			<widget class="GtkMenuItem" id="convertwidget4">
-			  <property name="visible">True</property>
-			  <property name="label" translatable="yes">March</property>
-			  <property name="use_underline">True</property>
-			</widget>
-		      </child>
-
-		      <child>
-			<widget class="GtkMenuItem" id="convertwidget5">
-			  <property name="visible">True</property>
-			  <property name="label" translatable="yes">April</property>
-			  <property name="use_underline">True</property>
-			</widget>
-		      </child>
-
-		      <child>
-			<widget class="GtkMenuItem" id="convertwidget6">
-			  <property name="visible">True</property>
-			  <property name="label" translatable="yes">May</property>
-			  <property name="use_underline">True</property>
-			</widget>
-		      </child>
-
-		      <child>
-			<widget class="GtkMenuItem" id="convertwidget7">
-			  <property name="visible">True</property>
-			  <property name="label" translatable="yes">June</property>
-			  <property name="use_underline">True</property>
-			</widget>
-		      </child>
-
-		      <child>
-			<widget class="GtkMenuItem" id="convertwidget8">
-			  <property name="visible">True</property>
-			  <property name="label" translatable="yes">July</property>
-			  <property name="use_underline">True</property>
-			</widget>
-		      </child>
-
-		      <child>
-			<widget class="GtkMenuItem" id="convertwidget9">
-			  <property name="visible">True</property>
-			  <property name="label" translatable="yes">August</property>
-			  <property name="use_underline">True</property>
-			</widget>
-		      </child>
-
-		      <child>
-			<widget class="GtkMenuItem" id="convertwidget10">
-			  <property name="visible">True</property>
-			  <property name="label" translatable="yes">September</property>
-			  <property name="use_underline">True</property>
-			</widget>
-		      </child>
-
-		      <child>
-			<widget class="GtkMenuItem" id="convertwidget11">
-			  <property name="visible">True</property>
-			  <property name="label" translatable="yes">October</property>
-			  <property name="use_underline">True</property>
-			</widget>
-		      </child>
-
-		      <child>
-			<widget class="GtkMenuItem" id="convertwidget12">
-			  <property name="visible">True</property>
-			  <property name="label" translatable="yes">November</property>
-			  <property name="use_underline">True</property>
-			</widget>
-		      </child>
-
-		      <child>
-			<widget class="GtkMenuItem" id="convertwidget13">
-			  <property name="visible">True</property>
-			  <property name="label" translatable="yes">December</property>
-			  <property name="use_underline">True</property>
-			</widget>
-		      </child>
-		    </widget>
-		  </child>
-		</widget>
-		<packing>
-		  <property name="padding">0</property>
-		  <property name="expand">False</property>
-		  <property name="fill">False</property>
-		</packing>
-	      </child>
-
-	      <child>
-		<widget class="GtkSpinButton" id="year">
-		  <property name="visible">True</property>
-		  <property name="can_focus">True</property>
-		  <property name="climb_rate">1</property>
-		  <property name="digits">0</property>
-		  <property name="numeric">True</property>
-		  <property name="update_policy">GTK_UPDATE_IF_VALID</property>
-		  <property name="snap_to_ticks">False</property>
-		  <property name="wrap">False</property>
-		  <property name="adjustment">1969 1969 2038 1 5 10</property>
-		</widget>
-		<packing>
-		  <property name="padding">0</property>
-		  <property name="expand">True</property>
-		  <property name="fill">True</property>
-		</packing>
-	      </child>
-	    </widget>
-	    <packing>
-	      <property name="padding">0</property>
-	      <property name="expand">True</property>
-	      <property name="fill">True</property>
-	    </packing>
-	  </child>
-
-	  <child>
-	    <placeholder/>
-	  </child>
-	</widget>
-	<packing>
-	  <property name="padding">0</property>
-	  <property name="expand">True</property>
-	  <property name="fill">True</property>
-	</packing>
-      </child>
-    </widget>
-  </child>
-</widget>
-
-</glade-interface>
diff --git a/calendar/gui/goto.c b/calendar/gui/goto.c
deleted file mode 100644
index 89d37455ca..0000000000
--- a/calendar/gui/goto.c
+++ /dev/null
@@ -1,264 +0,0 @@
-/* Go to date dialog for Evolution
- *
- * Copyright (C) 1998 Red Hat, Inc.
- * Copyright (C) 2000 Ximian, Inc.
- * Copyright (C) 2001 Ximian, Inc.
- *
- * Authors: Federico Mena <federico@ximian.com>
- *          JP Rosevear <jpr@ximian.com>
- */
-
-#include <config.h>
-#include <gtk/gtkmenu.h>
-#include <gtk/gtkoptionmenu.h>
-#include <gtk/gtksignal.h>
-#include <gtk/gtkspinbutton.h>
-#include <gtk/gtktogglebutton.h>
-#include <gtk/gtkwindow.h>
-#include <gtk/gtkdialog.h>
-#include <libgnomeui/gnome-dialog.h>
-#include <glade/glade.h>
-#include "calendar-commands.h"
-#include "calendar-config.h"
-#include "tag-calendar.h"
-#include "goto.h"
-
-typedef struct 
-{
-	GladeXML *xml;
-	GtkWidget *dialog;	
-
-	GtkWidget *month;
-	GtkWidget *year;
-	ECalendar *ecal;
-	GtkWidget *vbox;
-
-	GnomeCalendar *gcal;
-	gint year_val;
-	gint month_val;
-	gint day_val;
-	
-} GoToDialog;
-
-GoToDialog *dlg = NULL;
-
-/* Callback used when the year adjustment is changed */
-static void
-year_changed (GtkAdjustment *adj, gpointer data)
-{
-	GoToDialog *dlg = data;
-
-	dlg->year_val = gtk_spin_button_get_value_as_int (GTK_SPIN_BUTTON (dlg->year));
-	e_calendar_item_set_first_month (dlg->ecal->calitem, dlg->year_val, dlg->month_val);
-}
-
-/* Callback used when a month button is toggled */
-static void
-month_changed (GtkToggleButton *toggle, gpointer data)
-{
-	GoToDialog *dlg = data;
-	GtkWidget *menu, *active;
-	
-	menu = gtk_option_menu_get_menu (GTK_OPTION_MENU (dlg->month));
-	active = gtk_menu_get_active (GTK_MENU (menu));
-	dlg->month_val = g_list_index (GTK_MENU_SHELL (menu)->children, active);
-
-	e_calendar_item_set_first_month (dlg->ecal->calitem, dlg->year_val, dlg->month_val);
-}
-
-static void
-ecal_date_range_changed (ECalendarItem *calitem, gpointer user_data)
-{
-	GoToDialog *dlg = user_data;
-	ECal *client;
-	
-	client = gnome_calendar_get_default_client (dlg->gcal);
-	if (client)
-		tag_calendar_by_client (dlg->ecal, client);
-}
-
-/* Event handler for day groups in the month item.  A button press makes the calendar jump to the
- * selected day and destroys the Go-to dialog box.
- */
-static void
-ecal_event (ECalendarItem *calitem, gpointer user_data)
-{
-	GoToDialog *dlg = user_data;
-	GDate start_date, end_date;
-	struct icaltimetype tt = icaltime_null_time ();
-	time_t et;
-	
-	e_calendar_item_get_selection (calitem, &start_date, &end_date);
-
-	tt.year = g_date_year (&start_date);
-	tt.month = g_date_month (&start_date);
-	tt.day = g_date_day (&start_date);
-
-	et = icaltime_as_timet_with_zone (tt, gnome_calendar_get_timezone (dlg->gcal));
-
-	gnome_calendar_goto (dlg->gcal, et);
-
-	gtk_dialog_response (GTK_DIALOG (dlg->dialog), GTK_RESPONSE_NONE);
-	/* gnome_dialog_close (GNOME_DIALOG (dlg->dialog)); */
-}
-
-/* Returns the current time, for the ECalendarItem. */
-static struct tm
-get_current_time (ECalendarItem *calitem, gpointer data)
-{
-	icaltimezone *zone;
-	struct tm tmp_tm = { 0 };
-	struct icaltimetype tt;
-
-	/* Get the current timezone. */
-	zone = calendar_config_get_icaltimezone ();
-
-	tt = icaltime_from_timet_with_zone (time (NULL), FALSE, zone);
-
-	/* Now copy it to the struct tm and return it. */
-	tmp_tm.tm_year  = tt.year - 1900;
-	tmp_tm.tm_mon   = tt.month - 1;
-	tmp_tm.tm_mday  = tt.day;
-	tmp_tm.tm_hour  = tt.hour;
-	tmp_tm.tm_min   = tt.minute;
-	tmp_tm.tm_sec   = tt.second;
-	tmp_tm.tm_isdst = -1;
-
-	return tmp_tm;
-}
-
-/* Creates the ecalendar */
-static void
-create_ecal (GoToDialog *dlg)
-{
-	ECalendarItem *calitem;
-	
-	dlg->ecal = E_CALENDAR (e_calendar_new ());
-	calitem = dlg->ecal->calitem;
-	
-	gnome_canvas_item_set (GNOME_CANVAS_ITEM (calitem),
-			"move_selection_when_moving", FALSE,
-			NULL);
-	e_calendar_item_set_display_popup (calitem, FALSE);
-	gtk_widget_show (GTK_WIDGET (dlg->ecal));
-	gtk_box_pack_start (GTK_BOX (dlg->vbox), GTK_WIDGET (dlg->ecal), TRUE, TRUE, 0);
-
-	e_calendar_item_set_first_month (calitem, dlg->year_val, dlg->month_val);
-	e_calendar_item_set_get_time_callback (calitem,
-					       get_current_time,
-					       dlg, NULL);
-	
-	ecal_date_range_changed (calitem, dlg);
-}
-
-static void
-goto_today (GoToDialog *dlg)
-{
-	gnome_calendar_goto_today (dlg->gcal);
-}
-
-/* Gets the widgets from the XML file and returns if they are all available. */
-static gboolean
-get_widgets (GoToDialog *dlg)
-{
-#define GW(name) glade_xml_get_widget (dlg->xml, name)
-
-	dlg->dialog = GW ("goto-dialog");
-
-	dlg->month = GW ("month");
-	dlg->year = GW ("year");
-	dlg->vbox = GW ("vbox");
-
-#undef GW
-
-	return (dlg->dialog
-		&& dlg->month
-		&& dlg->year
-		&& dlg->vbox);
-}
-
-static void
-goto_dialog_init_widgets (GoToDialog *dlg) 
-{
-	GtkWidget *menu;
-	GtkAdjustment *adj;
-	GList *l;
-	
-	menu = gtk_option_menu_get_menu (GTK_OPTION_MENU (dlg->month));
-	for (l = GTK_MENU_SHELL (menu)->children; l != NULL; l = l->next)
-		g_signal_connect (menu, "selection_done", G_CALLBACK (month_changed), dlg);
-
-	adj = gtk_spin_button_get_adjustment (GTK_SPIN_BUTTON (dlg->year));
-	g_signal_connect (adj, "value_changed", G_CALLBACK (year_changed), dlg);
-
-	g_signal_connect (dlg->ecal->calitem, "date_range_changed", G_CALLBACK (ecal_date_range_changed), dlg);
-	g_signal_connect (dlg->ecal->calitem, "selection_changed", G_CALLBACK (ecal_event), dlg);
-}
-
-/* Creates a "goto date" dialog and runs it */
-void
-goto_dialog (GnomeCalendar *gcal)
-{
-	GtkWidget *menu;
-	time_t start_time;
-	struct icaltimetype tt;
-	int b;
-
-	if (dlg) {
-		return;
-	}
-		
-	dlg = g_new0 (GoToDialog, 1);
-	
-	/* Load the content widgets */
-	dlg->xml = glade_xml_new (EVOLUTION_GLADEDIR "/goto-dialog.glade", NULL, NULL);
-	if (!dlg->xml) {
-		g_message ("goto_dialog(): Could not load the Glade XML file!");
-		g_free (dlg);
-		return;
-	}
-
-	if (!get_widgets (dlg)) {
-		g_message ("goto_dialog(): Could not find all widgets in the XML file!");
-		g_free (dlg);
-		return;
-	}
-	dlg->gcal = gcal;
-
-	gnome_calendar_get_selected_time_range (dlg->gcal, &start_time, NULL);
-	tt = icaltime_from_timet_with_zone (start_time, FALSE, gnome_calendar_get_timezone (gcal));
-	dlg->year_val = tt.year;
-	dlg->month_val = tt.month - 1;
-	dlg->day_val = tt.day;
-
-	menu = gtk_option_menu_get_menu (GTK_OPTION_MENU (dlg->month));
-	gtk_option_menu_set_history (GTK_OPTION_MENU (dlg->month), dlg->month_val);
-	gtk_spin_button_set_value (GTK_SPIN_BUTTON (dlg->year), dlg->year_val);
-	
-	create_ecal (dlg);
-
-	goto_dialog_init_widgets (dlg);
-
-	gtk_window_set_transient_for (GTK_WINDOW (dlg->dialog),
-				      GTK_WINDOW (gtk_widget_get_toplevel (GTK_WIDGET (gcal))));
-
-	/* set initial selection to current day */
-
-	dlg->ecal->calitem->selection_set = TRUE;
-	dlg->ecal->calitem->selection_start_month_offset = 0;
-	dlg->ecal->calitem->selection_start_day = tt.day;
-	dlg->ecal->calitem->selection_end_month_offset = 0;
-	dlg->ecal->calitem->selection_end_day = tt.day;
-
-	gnome_canvas_item_grab_focus (GNOME_CANVAS_ITEM (dlg->ecal->calitem));
-
-	b = gtk_dialog_run (GTK_DIALOG (dlg->dialog));
-	gtk_widget_destroy (dlg->dialog);
-
-	if (b == 0)
-		goto_today (dlg);
-
-	g_object_unref (dlg->xml);
-	g_free (dlg);
-	dlg = NULL;
-}
diff --git a/calendar/gui/goto.h b/calendar/gui/goto.h
deleted file mode 100644
index 9ecfeeeb83..0000000000
--- a/calendar/gui/goto.h
+++ /dev/null
@@ -1,31 +0,0 @@
-/* Evolution calendar - Go To Date dialog
- *
- * Copyright (C) 1998 Red Hat, Inc.
- * Copyright (C) 2000 Ximian, Inc.
- * Copyright (C) 2001 Ximian, Inc.
- *
- * Authors: Federico Mena <federico@ximian.com>
- *          JP Rosevear <jpr@ximian.com>
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of version 2 of the GNU General Public
- * License as published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307, USA.
- */
-
-#ifndef GOTO_DIALOG_H
-#define GOTO_DIALOG_H
-
-#include "gnome-cal.h"
-
-void goto_dialog (GnomeCalendar *gcal);
-
-#endif
diff --git a/calendar/gui/itip-bonobo-control.c b/calendar/gui/itip-bonobo-control.c
deleted file mode 100644
index 391bc1f73d..0000000000
--- a/calendar/gui/itip-bonobo-control.c
+++ /dev/null
@@ -1,265 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-/* Evolution calendar - Control for displaying iTIP mail messages
- *
- * Copyright (C) 2000 Ximian, Inc.
- * Copyright (C) 2000 Ximian, Inc.
- *
- * Author: Jesse Pavel <jpavel@ximian.com>
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of version 2 of the GNU General Public
- * License as published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public 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 <glib.h>
-#include <gtk/gtkobject.h>
-#include <gtk/gtkwidget.h>
-#include <bonobo/bonobo-generic-factory.h>
-#include <bonobo/bonobo-control.h>
-#include <bonobo/bonobo-property-bag.h>
-#include <bonobo/bonobo-persist-stream.h>
-#include <bonobo/bonobo-stream-client.h>
-#include <bonobo/bonobo-context.h>
-#include <bonobo/bonobo-exception.h>
-#include <libical/ical.h>
-
-#include "e-itip-control.h"
-#include "itip-bonobo-control.h"
-
-extern gchar *evolution_dir;
-
-enum E_ITIP_BONOBO_ARGS {
-	FROM_ADDRESS_ARG_ID,
-	VIEW_ONLY_ARG_ID
-};
-
-/*
- * Bonobo::PersistStream
- *
- * These two functions implement the Bonobo::PersistStream load and
- * save methods which allow data to be loaded into and out of the
- * BonoboObject.
- */
-
-static char *
-stream_read (Bonobo_Stream stream)
-{
-	Bonobo_Stream_iobuf *buffer;
-	CORBA_Environment ev;
-	gchar *data = NULL;
-	gint length = 0;
-
-	CORBA_exception_init (&ev);
-	do {
-#define READ_CHUNK_SIZE 65536
-		Bonobo_Stream_read (stream, READ_CHUNK_SIZE,
-				    &buffer, &ev);
-
-		if (BONOBO_EX (&ev)) {
-			CORBA_exception_free (&ev);
-			return NULL;
-		}
-
-		if (buffer->_length <= 0)
-			break;
-
-		data = g_realloc (data, length + buffer->_length + 1);
-		memcpy (data + length, buffer->_buffer, buffer->_length);
-		length += buffer->_length;
-		data[length] = '\0';
-		
-		CORBA_free (buffer);
-#undef READ_CHUNK_SIZE
-	} while (1);
-	
-	CORBA_free (buffer);
-	CORBA_exception_free (&ev);
-
-	if (data == NULL)
-		data = g_strdup("");
-
-	return data;
-} /* stream_read */
-
-/*
- * This function implements the Bonobo::PersistStream:load method.
- */
-typedef struct {
-	EItipControl *itip;
-	char *text;
-} idle_data;
-
-static gboolean
-set_data_idle_cb (gpointer data) 
-{	
-	idle_data *id = data;
-	
-	e_itip_control_set_data (id->itip, id->text);
-	g_object_unref (id->itip);
-	g_free (id->text);
-	g_free (id);
-	
-	return FALSE;
-}
-
-static void
-pstream_load (BonoboPersistStream *ps, const Bonobo_Stream stream,
-	      Bonobo_Persist_ContentType type, void *data,
-	      CORBA_Environment *ev)
-{
-	EItipControl *itip = data;
-	idle_data *id;
-	
-	if (type && g_strcasecmp (type, "text/calendar") != 0 &&	    
-	    g_strcasecmp (type, "text/x-calendar") != 0) {
-		bonobo_exception_set (ev, ex_Bonobo_Persist_WrongDataType);
-		return;
-	}
-
-	id = g_new0 (idle_data, 1);
-	if ((id->text = stream_read (stream)) == NULL) {
-		bonobo_exception_set (ev, ex_Bonobo_Persist_FileNotFound);
-		g_free (id);
-		return;
-	}
-	g_object_ref (itip);
-	id->itip = itip;
-	
-	g_idle_add (set_data_idle_cb, id);
-}
-/*
- * This function implements the Bonobo::PersistStream:save method.
- */
-static void
-pstream_save (BonoboPersistStream *ps, const Bonobo_Stream stream,
-	      Bonobo_Persist_ContentType type, void *data,
-	      CORBA_Environment *ev)
-{
-	EItipControl *itip = data;
-	gchar *text;
-	gint len;
-
-	if (type && g_strcasecmp (type, "text/calendar") != 0 &&	    
-	    g_strcasecmp (type, "text/x-calendar") != 0) {	    
-		bonobo_exception_set (ev, ex_Bonobo_Persist_WrongDataType);
-		return;
-	}
-
-	text = e_itip_control_get_data (itip);
-	len = e_itip_control_get_data_size (itip);
-
-	bonobo_stream_client_write (stream, text, len, ev);
-	g_free (text);
-} /* pstream_save */
-
-/* static CORBA_long */
-/* pstream_get_max_size (BonoboPersistStream *ps, void *data, */
-/* 		      CORBA_Environment *ev) */
-/* { */
-/* 	EItipControl *itip = data; */
-/* 	gint len; */
-	
-/* 	len = e_itip_control_get_data_size (itip); */
-	
-/*   	if (len > 0) */
-/* 		return len; */
-
-/* 	return 0L; */
-/* } */
-
-static Bonobo_Persist_ContentTypeList *
-pstream_get_content_types (BonoboPersistStream *ps, void *closure,
-			   CORBA_Environment *ev)
-{
-	return bonobo_persist_generate_content_types (2, "text/calendar", "text/x-calendar");
-}
-
-static void
-get_prop (BonoboPropertyBag *bag, 
-	   BonoboArg *arg,
-	   guint arg_id, 	      
-	   CORBA_Environment *ev,
-	   gpointer user_data)
-{
-	EItipControl *itip = user_data;
-
-	switch (arg_id) {
-	case FROM_ADDRESS_ARG_ID:
-		BONOBO_ARG_SET_STRING (arg, e_itip_control_get_from_address (itip));
-		break;
-	case VIEW_ONLY_ARG_ID:
-		BONOBO_ARG_SET_INT (arg, e_itip_control_get_view_only (itip));
-		break;
-	}
-}
-
-static void
-set_prop ( BonoboPropertyBag *bag, 
-	   const BonoboArg *arg,
-	   guint arg_id, 
-	   CORBA_Environment *ev,
-	   gpointer user_data)
-{
-	EItipControl *itip = user_data;
-
-	switch (arg_id) {
-	case FROM_ADDRESS_ARG_ID:
-		e_itip_control_set_from_address (itip, BONOBO_ARG_GET_STRING (arg));
-		break;
-	case VIEW_ONLY_ARG_ID:
-		e_itip_control_set_view_only (itip, BONOBO_ARG_GET_INT (arg));
-		break;
-	}
-}
-
-
-BonoboControl *
-itip_bonobo_control_new (void)
-{
-	BonoboControl *control;
-	BonoboPropertyBag *prop_bag;
-	BonoboPersistStream *stream;
-	GtkWidget *itip;
-
-	itip = e_itip_control_new ();
-	gtk_widget_show (itip);
-	control = bonobo_control_new (itip);
-	
-	/* create a property bag */
-	prop_bag = bonobo_property_bag_new (get_prop, set_prop, itip);
-	bonobo_property_bag_add (prop_bag, "from_address", FROM_ADDRESS_ARG_ID, BONOBO_ARG_STRING, NULL,
-				 "from_address", 0 );
-	bonobo_property_bag_add (prop_bag, "view_only", VIEW_ONLY_ARG_ID, BONOBO_ARG_INT, NULL,
-				 "view_only", 0 );
-
-	bonobo_control_set_properties (control, bonobo_object_corba_objref (BONOBO_OBJECT (prop_bag)), NULL);
-	bonobo_object_unref (BONOBO_OBJECT (prop_bag));
-
-	bonobo_control_set_automerge (control, TRUE);
-
-	stream = bonobo_persist_stream_new (pstream_load, pstream_save,
-					    pstream_get_content_types,
-					    "OAFIID:GNOME_Evolution_Calendar_iTip_Control:" BASE_VERSION,
-					    itip);
-
-	if (stream == NULL) {
-		bonobo_object_unref (BONOBO_OBJECT (control));
-		return NULL;
-	}
-
-	bonobo_object_add_interface (BONOBO_OBJECT (control),
-				     BONOBO_OBJECT (stream));
-
-	return control;
-}
diff --git a/calendar/gui/itip-bonobo-control.h b/calendar/gui/itip-bonobo-control.h
deleted file mode 100644
index 11b33e6602..0000000000
--- a/calendar/gui/itip-bonobo-control.h
+++ /dev/null
@@ -1,31 +0,0 @@
-/* Evolution calendar - Control for displaying iTIP mail messages
- *
- * Copyright (C) 2000 Ximian, Inc.
- * Copyright (C) 2000 Ximian, Inc.
- *
- * Authors: 
- *   Jesse Pavel <jpavel@ximian.com>
- *   JP Rosevear <jpr@ximian.com>
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of version 2 of the GNU General Public
- * License as published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307, USA.
- */
-
-#ifndef __ITIP_CONTROL_FACTORY_H__
-#define __ITIP_CONTROL_FACTORY_H__
-
-#include <bonobo/bonobo-control.h>
-
-BonoboControl *itip_bonobo_control_new (void);
-
-#endif /* __ITIP_CONTROL_H__ */
diff --git a/calendar/gui/itip-utils.c b/calendar/gui/itip-utils.c
deleted file mode 100644
index 9cbdc6a438..0000000000
--- a/calendar/gui/itip-utils.c
+++ /dev/null
@@ -1,1260 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-/*
- * Authors:
- *  JP Rosevear <jpr@ximian.com>
- *
- * Copyright 2001, Ximian, Inc.
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of version 2 of the GNU General Public
- * License as published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public 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/bonobo-exception.h>
-#include <bonobo/bonobo-object.h>
-#include <bonobo/bonobo-moniker-util.h>
-#include <libgnome/gnome-i18n.h>
-#include <gtk/gtkmessagedialog.h>
-#include <gtk/gtkwidget.h>
-#include <libical/ical.h>
-#include <Evolution-Composer.h>
-#include <e-util/e-dialog-utils.h>
-#include <e-util/e-time-utils.h>
-#include <libecal/e-cal-time-util.h>
-#include <libecal/e-cal-util.h>
-#include <libsoup/soup-session-async.h>
-#include <libsoup/soup-message.h>
-#include <libsoup/soup-uri.h>
-#include "calendar-config.h"
-#include "itip-utils.h"
-#include "dialogs/cal-attachment.h"
-
-#define GNOME_EVOLUTION_COMPOSER_OAFIID "OAFIID:GNOME_Evolution_Mail_Composer:" BASE_VERSION
-
-static gchar *itip_methods[] = {
-	"PUBLISH",
-	"REQUEST",
-	"REPLY",
-	"ADD",
-	"CANCEL",
-	"RERESH",
-	"COUNTER",
-	"DECLINECOUNTER"
-};
-
-static icalproperty_method itip_methods_enum[] = {
-    ICAL_METHOD_PUBLISH,
-    ICAL_METHOD_REQUEST,
-    ICAL_METHOD_REPLY,
-    ICAL_METHOD_ADD,
-    ICAL_METHOD_CANCEL,
-    ICAL_METHOD_REFRESH,
-    ICAL_METHOD_COUNTER,
-    ICAL_METHOD_DECLINECOUNTER,
-};
-
-static EAccountList *accounts = NULL;
-
-EAccountList *
-itip_addresses_get (void)
-{
-	if (accounts == NULL) {
-		GConfClient *gconf_client = gconf_client_get_default ();
-		accounts = e_account_list_new (gconf_client);
-		g_object_unref (gconf_client);
-	}
-
-	return accounts;
-}
-
-EAccount *
-itip_addresses_get_default (void)
-{
-	return (EAccount *)e_account_list_get_default(itip_addresses_get());
-}
-
-gboolean
-itip_organizer_is_user (ECalComponent *comp, ECal *client)
-{
-	ECalComponentOrganizer organizer;
-	const char *strip;
-	gboolean user_org = FALSE;
-	
-	if (!e_cal_component_has_organizer (comp))
-		return FALSE;
-
-	e_cal_component_get_organizer (comp, &organizer);
-	if (organizer.value != NULL) {
-
-  		strip = itip_strip_mailto (organizer.value);
-  
- 		if (e_cal_get_static_capability (client, CAL_STATIC_CAPABILITY_ORGANIZER_NOT_EMAIL_ADDRESS)) { 
- 			char *email;
- 			
-  			if (e_cal_get_cal_address (client, &email, NULL) && !g_strcasecmp (email, strip)) {
-				g_free (email);
-				
- 				return TRUE;
-			}
-			
- 			return FALSE;
- 		}
- 	
-		user_org = e_account_list_find(itip_addresses_get(), E_ACCOUNT_FIND_ID_ADDRESS, strip) != NULL;
-	}
-
-	return user_org;
-}
-
-gboolean
-itip_sentby_is_user (ECalComponent *comp)
-{
-	ECalComponentOrganizer organizer;
-	const char *strip;
-	gboolean user_sentby = FALSE;
-	
-	if (!e_cal_component_has_organizer (comp))
-		return FALSE;
-
-	e_cal_component_get_organizer (comp, &organizer);
-	if (organizer.sentby != NULL) {
-		strip = itip_strip_mailto (organizer.sentby);
-		user_sentby = e_account_list_find(itip_addresses_get(), E_ACCOUNT_FIND_ID_ADDRESS, strip) != NULL;
-	}
-
-	return user_sentby;
-}
-				 
-const gchar *
-itip_strip_mailto (const gchar *address) 
-{
-	if (address == NULL)
-		return NULL;
-	
-	if (!g_strncasecmp (address, "mailto:", 7))
-		address += 7;
-
-	return address;
-}
-
-static char *
-get_label (struct icaltimetype *tt)
-{
-        char buffer[1000];
-        struct tm tmp_tm;
-
-	tmp_tm = icaltimetype_to_tm (tt);
-        e_time_format_date_and_time (&tmp_tm,
-                                     calendar_config_get_24_hour_format (),
-                                     FALSE, FALSE,
-                                     buffer, 1000);
-
-        return g_strdup (buffer);
-}
-
-typedef struct {
-	GHashTable *tzids;
-	icalcomponent *icomp;	
-	ECal *client;
-	icalcomponent *zones;
-} ItipUtilTZData;
-
-
-static void
-foreach_tzid_callback (icalparameter *param, gpointer data)
-{
-	ItipUtilTZData *tz_data = data;	
-	const char *tzid;
-	icaltimezone *zone = NULL;
-	icalcomponent *vtimezone_comp;
-
-	/* Get the TZID string from the parameter. */
-	tzid = icalparameter_get_tzid (param);
-	if (!tzid || g_hash_table_lookup (tz_data->tzids, tzid))
-		return;
-
-	/* Look for the timezone */
-	if (tz_data->zones != NULL)
-		zone = icalcomponent_get_timezone (tz_data->zones, tzid);
-	if (zone == NULL)
-		zone = icaltimezone_get_builtin_timezone_from_tzid (tzid);
-	if (zone == NULL && tz_data->client != NULL)		
-		e_cal_get_timezone (tz_data->client, tzid, &zone, NULL);
-	if (zone == NULL)
-		return;
-
-	/* Convert it to a string and add it to the hash. */
-	vtimezone_comp = icaltimezone_get_component (zone);
-	if (!vtimezone_comp)
-		return;
-
-	icalcomponent_add_component (tz_data->icomp, icalcomponent_new_clone (vtimezone_comp));
-	g_hash_table_insert (tz_data->tzids, (char *)tzid, (char *)tzid);	
-}
-
-static icalcomponent *
-comp_toplevel_with_zones (ECalComponentItipMethod method, ECalComponent *comp, ECal *client, icalcomponent *zones)
-{
-	icalcomponent *top_level, *icomp;
-	icalproperty *prop;
-	icalvalue *value;
-	ItipUtilTZData tz_data;
-
-	top_level = e_cal_util_new_top_level ();
-
-	prop = icalproperty_new (ICAL_METHOD_PROPERTY);
-	value = icalvalue_new_method (itip_methods_enum[method]);
-	icalproperty_set_value (prop, value);
-	icalcomponent_add_property (top_level, prop);
-
-	icomp = e_cal_component_get_icalcomponent (comp);
-	icomp = icalcomponent_new_clone (icomp);
-	
-	tz_data.tzids = g_hash_table_new (g_str_hash, g_str_equal);
-	tz_data.icomp = top_level;
-	tz_data.client = client;
-	tz_data.zones = zones;
-	icalcomponent_foreach_tzid (icomp, foreach_tzid_callback, &tz_data);
-	g_hash_table_destroy (tz_data.tzids);
-
-	icalcomponent_add_component (top_level, icomp);
-
-	return top_level;
-}
-
-static gboolean
-users_has_attendee (GList *users, const char *address)
-{
-	GList *l;
-
-	for (l = users; l != NULL; l = l->next) {
-		if (!g_strcasecmp (address, l->data))
-			return TRUE;
-	}
-
-	return FALSE;
-}
-
-static CORBA_char *
-comp_from (ECalComponentItipMethod method, ECalComponent *comp)
-{
-	ECalComponentOrganizer organizer;
-	ECalComponentAttendee *attendee;
-	GSList *attendees;
-	CORBA_char *str;
-	
-	switch (method) {
-	case E_CAL_COMPONENT_METHOD_PUBLISH:
-		return CORBA_string_dup ("");
-		
-	case E_CAL_COMPONENT_METHOD_REQUEST:
-	case E_CAL_COMPONENT_METHOD_CANCEL:
-	case E_CAL_COMPONENT_METHOD_ADD:
-		e_cal_component_get_organizer (comp, &organizer);
-		if (organizer.value == NULL) {
-			e_notice (NULL, GTK_MESSAGE_ERROR,
-				  _("An organizer must be set."));
-			return NULL;
-		}
-
-		return CORBA_string_dup (itip_strip_mailto (organizer.value));
-
-	default:
-		if (!e_cal_component_has_attendees (comp))
-			return CORBA_string_dup ("");
-
-		e_cal_component_get_attendee_list (comp, &attendees);
-		attendee = attendees->data;
-		str = CORBA_string_dup (attendee->value ? itip_strip_mailto (attendee->value) : "");
-		e_cal_component_free_attendee_list (attendees);
-
-		return str;
-	}
-}
-
-static GNOME_Evolution_Composer_RecipientList *
-comp_to_list (ECalComponentItipMethod method, ECalComponent *comp, GList *users)
-{
-	GNOME_Evolution_Composer_RecipientList *to_list;
-	GNOME_Evolution_Composer_Recipient *recipient;
-	ECalComponentOrganizer organizer;
-	GSList *attendees, *l;
-	gint len;
-
-	switch (method) {
-	case E_CAL_COMPONENT_METHOD_REQUEST:
-	case E_CAL_COMPONENT_METHOD_CANCEL:
-		e_cal_component_get_attendee_list (comp, &attendees);
-		len = g_slist_length (attendees);
-		if (len <= 0) {
-			e_notice (NULL, GTK_MESSAGE_ERROR,
-				  _("At least one attendee is necessary"));
-			e_cal_component_free_attendee_list (attendees);
-			return NULL;
-		}
-		
-		to_list = GNOME_Evolution_Composer_RecipientList__alloc ();
-		to_list->_maximum = len;
-		to_list->_length = 0;
-		to_list->_buffer = CORBA_sequence_GNOME_Evolution_Composer_Recipient_allocbuf (len);
-
-		e_cal_component_get_organizer (comp, &organizer);
-		if (organizer.value == NULL) {
-			e_notice (NULL, GTK_MESSAGE_ERROR,
-				  _("An organizer must be set."));
-			return NULL;
-		}
-
-		for (l = attendees; l != NULL; l = l->next) {
-			ECalComponentAttendee *att = l->data;
-
-			if (users_has_attendee (users, att->value))
-				continue;
-			else if (!g_strcasecmp (att->value, organizer.value))
-				continue;
-			
-			recipient = &(to_list->_buffer[to_list->_length]);
-			if (att->cn)
-				recipient->name = CORBA_string_dup (att->cn);
-			else
-				recipient->name = CORBA_string_dup ("");
-			recipient->address = CORBA_string_dup (itip_strip_mailto (att->value));
-			
-			to_list->_length++;
-		}
-		e_cal_component_free_attendee_list (attendees);
-		break;
-
-	case E_CAL_COMPONENT_METHOD_REPLY:
-	case E_CAL_COMPONENT_METHOD_ADD:
-	case E_CAL_COMPONENT_METHOD_REFRESH:
-	case E_CAL_COMPONENT_METHOD_COUNTER:
-	case E_CAL_COMPONENT_METHOD_DECLINECOUNTER:
-		e_cal_component_get_organizer (comp, &organizer);
-		if (organizer.value == NULL) {
-			e_notice (NULL, GTK_MESSAGE_ERROR,
-				  _("An organizer must be set."));
-			return NULL;
-		}
-		
-		len = 1;
-
-		to_list = GNOME_Evolution_Composer_RecipientList__alloc ();
-		to_list->_maximum = len;
-		to_list->_length = len;
-		to_list->_buffer = CORBA_sequence_GNOME_Evolution_Composer_Recipient_allocbuf (len);
-		recipient = &(to_list->_buffer[0]);
-
-		if (organizer.cn != NULL)
-			recipient->name = CORBA_string_dup (organizer.cn);
-		else
-			recipient->name = CORBA_string_dup ("");
-		recipient->address = CORBA_string_dup (itip_strip_mailto (organizer.value));
-		break;
-
-	default:
-		to_list = GNOME_Evolution_Composer_RecipientList__alloc ();
-		to_list->_maximum = to_list->_length = 0;
-		break;
-	}
-	CORBA_sequence_set_release (to_list, TRUE);
-
-	return to_list;	
-}
-	
-static CORBA_char *
-comp_subject (ECalComponentItipMethod method, ECalComponent *comp)
-{
-	ECalComponentText caltext;
-	const char *description, *prefix = NULL;
-	GSList *alist;
-	CORBA_char *subject;
-
-	e_cal_component_get_summary (comp, &caltext);
-	if (caltext.value != NULL)	
-		description = caltext.value;
-	else {
-		switch (e_cal_component_get_vtype (comp)) {
-		case E_CAL_COMPONENT_EVENT:
-			description = _("Event information");
-		case E_CAL_COMPONENT_TODO:
-			description = _("Task information");
-		case E_CAL_COMPONENT_JOURNAL:
-			description = _("Journal information");
-		case E_CAL_COMPONENT_FREEBUSY:
-			description = _("Free/Busy information");
-		default:
-			description = _("Calendar information");
-		}
-	}
-
-	switch (method) {
-	case E_CAL_COMPONENT_METHOD_PUBLISH:
-	case E_CAL_COMPONENT_METHOD_REQUEST:
-		/* FIXME: If this is an update to a previous
-		 * PUBLISH or REQUEST, then
-			prefix = U_("Updated");
-		 */
-		break;
-
-	case E_CAL_COMPONENT_METHOD_REPLY:
-		e_cal_component_get_attendee_list (comp, &alist);
-		if (alist != NULL) {
-			ECalComponentAttendee *a = alist->data;
-
-			switch (a->status) {
-			case ICAL_PARTSTAT_ACCEPTED:
-				prefix = _("Accepted");
-				break;
-			case ICAL_PARTSTAT_TENTATIVE:
-				prefix = _("Tentatively Accepted");
-				break;
-			case ICAL_PARTSTAT_DECLINED:
-				prefix = _("Declined");
-				break;
-			default:
-				break;
-			}
-			e_cal_component_free_attendee_list (alist);
-		}
-		break;
-
-	case E_CAL_COMPONENT_METHOD_ADD:
-		prefix = _("Updated");
-		break;
-
-	case E_CAL_COMPONENT_METHOD_CANCEL:
-		prefix = _("Cancel");
-		break;
-
-	case E_CAL_COMPONENT_METHOD_REFRESH:
-		prefix = _("Refresh");
-		break;
-
-	case E_CAL_COMPONENT_METHOD_COUNTER:
-		prefix = _("Counter-proposal");
-		break;
-
-	case E_CAL_COMPONENT_METHOD_DECLINECOUNTER:
-		prefix = _("Declined");
-		break;
-
-	default:
-		break;
-	}
-
-	if (prefix) {
-		subject = CORBA_string_alloc (strlen (description) +
-					      strlen (prefix) + 3);
-		sprintf (subject, "%s: %s", prefix, description);
-	} else
-		subject = CORBA_string_dup (description);
-
-	return subject;
-}
-
-static CORBA_char *
-comp_content_type (ECalComponent *comp, ECalComponentItipMethod method)
-{
-	char tmp[256];	
-
-	sprintf (tmp, "text/calendar; name=\"%s\"; charset=utf-8; METHOD=%s",
-		 e_cal_component_get_vtype (comp) == E_CAL_COMPONENT_FREEBUSY ?
-		 "freebusy.ifb" : "calendar.ics", itip_methods[method]);
-	return CORBA_string_dup (tmp);
-
-}
-
-static CORBA_char *
-comp_filename (ECalComponent *comp)
-{
-        switch (e_cal_component_get_vtype (comp)) {
-        case E_CAL_COMPONENT_FREEBUSY:
-                return CORBA_string_dup ("freebusy.ifb");
-        default:
-                return CORBA_string_dup ("calendar.ics");
-        }
-}
-
-static CORBA_char *
-comp_description (ECalComponent *comp)
-{
-        CORBA_char *description;
-        ECalComponentDateTime dt;
-        char *start = NULL, *end = NULL;
-
-        switch (e_cal_component_get_vtype (comp)) {
-        case E_CAL_COMPONENT_EVENT:
-                return CORBA_string_dup (_("Event information"));
-        case E_CAL_COMPONENT_TODO:
-                return CORBA_string_dup (_("Task information"));
-        case E_CAL_COMPONENT_JOURNAL:
-                return CORBA_string_dup (_("Journal information"));
-        case E_CAL_COMPONENT_FREEBUSY:
-                e_cal_component_get_dtstart (comp, &dt);
-                if (dt.value)
-                        start = get_label (dt.value);
-		e_cal_component_free_datetime (&dt);
-
-		e_cal_component_get_dtend (comp, &dt);
-		if (dt.value)
-			end = get_label (dt.value);
-		e_cal_component_free_datetime (&dt);
-
-                if (start != NULL && end != NULL) {
-                        char *tmp;
-                        tmp = g_strdup_printf (_("Free/Busy information (%s to %s)"), start, end);
-                        description = CORBA_string_dup (tmp);
-                        g_free (tmp);
-                } else {
-                        description = CORBA_string_dup (_("Free/Busy information"));
-                }
-                g_free (start);
-                g_free (end);
-                return description;
-        default:
-                return CORBA_string_dup (_("iCalendar information"));
-        }
-}
-
-static gboolean
-comp_server_send (ECalComponentItipMethod method, ECalComponent *comp, ECal *client, 
-		  icalcomponent *zones, GList **users)
-{
-	icalcomponent *top_level, *returned_icalcomp = NULL;
-	gboolean retval = TRUE;
-	GError *error = NULL;
-	
-	top_level = comp_toplevel_with_zones (method, comp, client, zones);
-	if (!e_cal_send_objects (client, top_level, users, &returned_icalcomp, &error)) {
-		/* FIXME Really need a book problem status code */
-		if (error->code != E_CALENDAR_STATUS_OK) {
-			/* FIXME Better error message */
-			e_notice (NULL, GTK_MESSAGE_ERROR, "Unable to book");
-			
-			retval = FALSE;
-		}
-	}
-
-	g_clear_error (&error);
-
-	if (returned_icalcomp)
-		icalcomponent_free (returned_icalcomp);
-	icalcomponent_free (top_level);
-
-	return retval;
-}
-
-static gboolean
-comp_limit_attendees (ECalComponent *comp) 
-{
-	icalcomponent *icomp;
-	icalproperty *prop;
-	gboolean found = FALSE, match = FALSE;
-	GSList *l, *list = NULL;
-
-	icomp = e_cal_component_get_icalcomponent (comp);
-
-	for (prop = icalcomponent_get_first_property (icomp, ICAL_ATTENDEE_PROPERTY);
-	     prop != NULL;
-	     prop = icalcomponent_get_next_property (icomp, ICAL_ATTENDEE_PROPERTY))
-	{
-		icalvalue *value;
-		const char *attendee;
-		char *text;
-
-		/* If we've already found something, just erase the rest */
-		if (found) {
-			list = g_slist_prepend (list, prop);
-			continue;
-		}
-		
-		value = icalproperty_get_value (prop);
-		if (!value)
-			continue;
-
-		attendee = icalvalue_get_string (value);
-
-		text = g_strdup (itip_strip_mailto (attendee));
-		text = g_strstrip (text);
-		found = match = e_account_list_find(itip_addresses_get(), E_ACCOUNT_FIND_ID_ADDRESS, text) != NULL;
-		g_free (text);
-		
-		if (!match)
-			list = g_slist_prepend (list, prop);
-		match = FALSE;
-	}
-
-	for (l = list; l != NULL; l = l->next) {
-		prop = l->data;
-
-		icalcomponent_remove_property (icomp, prop);
-		icalproperty_free (prop);
-	}
-	g_slist_free (list);
-
-	return found;
-}
-
-static void
-comp_sentby (ECalComponent *comp, ECal *client)
-{
-	ECalComponentOrganizer organizer;
-	
-	e_cal_component_get_organizer (comp, &organizer);
-	if (!organizer.value) {
-		EAccount *a = itip_addresses_get_default ();
-
-		organizer.value = g_strdup_printf ("MAILTO:%s", a->id->address);
-		organizer.sentby = NULL;
-		organizer.cn = a->id->name;
-		organizer.language = NULL;
-		
-		e_cal_component_set_organizer (comp, &organizer);
-		g_free ((char *) organizer.value);
-		
-		return;
-	}
-
-	if (!itip_organizer_is_user (comp, client) && !itip_sentby_is_user (comp)) {
-		EAccount *a = itip_addresses_get_default ();
-		
-		organizer.value = g_strdup (organizer.value);
-		organizer.sentby = g_strdup_printf ("MAILTO:%s", a->id->address);
-		organizer.cn = g_strdup (organizer.cn);
-		organizer.language = g_strdup (organizer.language);
-		
-		e_cal_component_set_organizer (comp, &organizer);
-
-		g_free ((char *)organizer.value);
-		g_free ((char *)organizer.sentby);
-		g_free ((char *)organizer.cn);
-		g_free ((char *)organizer.language);
-	}
-}
-static ECalComponent *
-comp_minimal (ECalComponent *comp, gboolean attendee)
-{
-	ECalComponent *clone;
-	icalcomponent *icomp, *icomp_clone;
-	icalproperty *prop;
-	ECalComponentOrganizer organizer;
-	const char *uid;
-	GSList *comments;
-	struct icaltimetype itt;
-	ECalComponentRange recur_id;
-	
-	clone = e_cal_component_new ();
-	e_cal_component_set_new_vtype (clone, e_cal_component_get_vtype (comp));
-
-	if (attendee) {
-		GSList *attendees;
-		
-		e_cal_component_get_attendee_list (comp, &attendees);
-		e_cal_component_set_attendee_list (clone, attendees);
-
-		if (!comp_limit_attendees (clone)) {
-			e_notice (NULL, GTK_MESSAGE_ERROR,
-				  _("You must be an attendee of the event."));
-			goto error;
-		}
-	}
-	
-	itt = icaltime_from_timet_with_zone (time (NULL), FALSE,
-					     icaltimezone_get_utc_timezone ());
-	e_cal_component_set_dtstamp (clone, &itt);
-
-	e_cal_component_get_organizer (comp, &organizer);
-	if (organizer.value == NULL)
-		goto error;
-	e_cal_component_set_organizer (clone, &organizer);
-
-	e_cal_component_get_uid (comp, &uid);
-	e_cal_component_set_uid (clone, uid);
-
-	e_cal_component_get_comment_list (comp, &comments);
-	if (g_slist_length (comments) <= 1) {
-		e_cal_component_set_comment_list (clone, comments);
-	} else {
-		GSList *l = comments;
-		
-		comments = g_slist_remove_link (comments, l);
-		e_cal_component_set_comment_list (clone, l);
-		e_cal_component_free_text_list (l);
-	}
-	e_cal_component_free_text_list (comments);
-	
-	e_cal_component_get_recurid (comp, &recur_id);
-	if (recur_id.datetime.value != NULL)
-		e_cal_component_set_recurid (clone, &recur_id);
-	
-	icomp = e_cal_component_get_icalcomponent (comp);
-	icomp_clone = e_cal_component_get_icalcomponent (clone);
-	for (prop = icalcomponent_get_first_property (icomp, ICAL_X_PROPERTY);
-	     prop != NULL;
-	     prop = icalcomponent_get_next_property (icomp, ICAL_X_PROPERTY))
-	{
-		icalproperty *p;
-		
-		p = icalproperty_new_clone (prop);
-		icalcomponent_add_property (icomp_clone, p);
-	}
-
-	e_cal_component_rescan (clone);
-	
-	return clone;
-
- error:
-	g_object_unref (clone);
-	return NULL;
-}
-
-static ECalComponent *
-comp_compliant (ECalComponentItipMethod method, ECalComponent *comp, ECal *client, icalcomponent *zones)
-{
-	ECalComponent *clone, *temp_clone;
-	struct icaltimetype itt;
-	
-	clone = e_cal_component_clone (comp);
-	itt = icaltime_from_timet_with_zone (time (NULL), FALSE,
-					     icaltimezone_get_utc_timezone ());
-	e_cal_component_set_dtstamp (clone, &itt);
-
-	/* Make UNTIL date a datetime in a simple recurrence */
-	if (e_cal_component_has_recurrences (clone)
-	    && e_cal_component_has_simple_recurrence (clone)) {
-		GSList *rrule_list;
-		struct icalrecurrencetype *r;
-		
-		e_cal_component_get_rrule_list (clone, &rrule_list);
-		r = rrule_list->data;
-
-		if (!icaltime_is_null_time (r->until) && r->until.is_date) {
-			ECalComponentDateTime dt;
-			icaltimezone *from_zone = NULL, *to_zone;
-			
-			e_cal_component_get_dtstart (clone, &dt);
-
-			if (dt.value->is_date) {
-				from_zone = calendar_config_get_icaltimezone ();
-			} else if (dt.tzid == NULL) {
-				from_zone = icaltimezone_get_utc_timezone ();
-			} else {
-				if (zones != NULL)
-					from_zone = icalcomponent_get_timezone (zones, dt.tzid);
-				if (from_zone == NULL)
-					from_zone = icaltimezone_get_builtin_timezone_from_tzid (dt.tzid);
-				if (from_zone == NULL && client != NULL)
-					/* FIXME Error checking */
-					e_cal_get_timezone (client, dt.tzid, &from_zone, NULL);
-			}
-			
-			to_zone = icaltimezone_get_utc_timezone ();
-
-			r->until.hour = dt.value->hour;
-			r->until.minute = dt.value->minute;
-			r->until.second = dt.value->second;
-			r->until.is_date = FALSE;
-			
-			icaltimezone_convert_time (&r->until, from_zone, to_zone);
-			r->until.is_utc = TRUE;
-
-			e_cal_component_set_rrule_list (clone, rrule_list);
-			e_cal_component_abort_sequence (clone);
-		}
-
-		e_cal_component_free_recur_list (rrule_list);
-	}
-	
-	/* We delete incoming alarms anyhow, and this helps with outlook */
-	e_cal_component_remove_all_alarms (clone);
-
-	/* Strip X-LIC-ERROR stuff */
-	e_cal_component_strip_errors (clone);
-	
-	/* Comply with itip spec */
-	switch (method) {
-	case E_CAL_COMPONENT_METHOD_PUBLISH:
-		comp_sentby (clone, client);
-		e_cal_component_set_attendee_list (clone, NULL);
-		break;
-	case E_CAL_COMPONENT_METHOD_REQUEST:
-		comp_sentby (clone, client);
-		break;
-	case E_CAL_COMPONENT_METHOD_CANCEL:
-		comp_sentby (clone, client);
-		break;	
-	case E_CAL_COMPONENT_METHOD_REPLY:
-		break;
-	case E_CAL_COMPONENT_METHOD_ADD:
-		break;
-	case E_CAL_COMPONENT_METHOD_REFRESH:
-		/* Need to remove almost everything */
-		temp_clone = comp_minimal (clone, TRUE);
-		g_object_unref (clone);
-		clone = temp_clone;
-		break;
-	case E_CAL_COMPONENT_METHOD_COUNTER:
-		break;
-	case E_CAL_COMPONENT_METHOD_DECLINECOUNTER:
-		/* Need to remove almost everything */
-		temp_clone = comp_minimal (clone, FALSE);
-		g_object_unref (clone);
-		clone = temp_clone;
-		break;
-	default:
-		break;
-	}
-
-	return clone;
-}
-
-static gboolean
-append_cal_attachments (GNOME_Evolution_Composer composer_server, ECalComponent
-		*comp, GSList *attach_list)
-{
-	CORBA_char *content_type = NULL, *filename = NULL, *description = NULL;
-	CORBA_Environment ev;
-	GNOME_Evolution_Composer_AttachmentData *attach_data = NULL;
-	struct CalMimeAttach *mime_attach;
-	GSList *l;
-	gboolean retval = TRUE;
-
-	CORBA_exception_init (&ev);
-
-	for (l = attach_list; l ; l = l->next) {
-		mime_attach = (struct CalMimeAttach *) l->data;
-		
-		filename = CORBA_string_dup (mime_attach->filename);
-		content_type = CORBA_string_dup	(mime_attach->content_type);
-		description = CORBA_string_dup (mime_attach->description);
-		
-		attach_data = GNOME_Evolution_Composer_AttachmentData__alloc ();
-		attach_data->_length = mime_attach->length;
-		attach_data->_maximum = attach_data->_length;	
-		attach_data->_buffer = CORBA_sequence_CORBA_char_allocbuf (attach_data->_length);
-		memcpy (attach_data->_buffer, mime_attach->encoded_data, attach_data->_length);
-
-		GNOME_Evolution_Composer_attachData (composer_server,
-						     content_type, filename, description,
-						     TRUE, attach_data,
-						     &ev);
-		if (BONOBO_EX (&ev)) {
-			g_warning ("Unable to add attachments in composer");
-			retval = FALSE;
-		}
-
-		CORBA_exception_free (&ev);
-		if (content_type != NULL)
-			CORBA_free (content_type);
-		if (filename != NULL)
-			CORBA_free (filename);
-		if (description != NULL)
-			CORBA_free (description);
-		if (attach_data != NULL) {
-			CORBA_free (attach_data->_buffer);
-			CORBA_free (attach_data);
-		}
-		g_free (mime_attach->filename);
-		g_free (mime_attach->content_type);
-		g_free (mime_attach->description);
-		g_free (mime_attach->encoded_data);
-	}
-	
-	return retval;
-}
-
-gboolean
-itip_send_comp (ECalComponentItipMethod method, ECalComponent *send_comp,
-		ECal *client, icalcomponent *zones, GSList *attachments_list)
-{
-	GNOME_Evolution_Composer composer_server;
-	ECalComponent *comp = NULL;
-	icalcomponent *top_level = NULL;
-	GList *users = NULL;
-	GNOME_Evolution_Composer_RecipientList *to_list = NULL;
-	GNOME_Evolution_Composer_RecipientList *cc_list = NULL;
-	GNOME_Evolution_Composer_RecipientList *bcc_list = NULL;
-	CORBA_char *subject = NULL, *body = NULL, *content_type = NULL;
-	CORBA_char *from = NULL, *filename = NULL, *description = NULL;
-	GNOME_Evolution_Composer_AttachmentData *attach_data = NULL;
-	char *ical_string;
-	CORBA_Environment ev;
-	gboolean retval = FALSE;
-	
-	CORBA_exception_init (&ev);
-
-	/* Give the server a chance to manipulate the comp */
-	if (method != E_CAL_COMPONENT_METHOD_PUBLISH && !e_cal_get_save_schedules (client)) {
-		if (!comp_server_send (method, send_comp, client, zones, &users))
-			goto cleanup;
-	}
-	
-	/* Tidy up the comp */
-	comp = comp_compliant (method, send_comp, client, zones);
-	if (comp == NULL)
-		goto cleanup;
-
-	/* Recipients */
-	to_list = comp_to_list (method, comp, users);
-	if (method != E_CAL_COMPONENT_METHOD_PUBLISH) {
-		if (to_list == NULL || to_list->_length == 0) {
-			/* We sent them all via the server */
-			retval = TRUE;
-			goto cleanup;
-		} else if (to_list == NULL || to_list->_length == 0) {
-			/* if we don't have recipients, return */
-			retval = FALSE;
-			goto cleanup;
-		}
-	}
-
-	cc_list = GNOME_Evolution_Composer_RecipientList__alloc ();
-	cc_list->_maximum = cc_list->_length = 0;
-	bcc_list = GNOME_Evolution_Composer_RecipientList__alloc ();
-	bcc_list->_maximum = bcc_list->_length = 0;
-	
-	/* Subject information */
-	subject = comp_subject (method, comp);
-	
-	/* From address */
-	from = comp_from (method, comp);
-
-	/* Obtain an object reference for the Composer. */
-	composer_server = bonobo_activation_activate_from_id (GNOME_EVOLUTION_COMPOSER_OAFIID, 0, NULL, &ev);
-	if (BONOBO_EX (&ev)) {
-		g_warning ("Could not activate composer: %s", bonobo_exception_get_text (&ev));
-		CORBA_exception_free (&ev);
-		return FALSE;
-	}
-
-	/* Set recipients, subject */
-	GNOME_Evolution_Composer_setHeaders (composer_server, from, to_list, cc_list, bcc_list, subject, &ev);
-	if (BONOBO_EX (&ev)) {
-		g_warning ("Unable to set composer headers while sending iTip message: %s",
-			   bonobo_exception_get_text (&ev));
-		goto cleanup;
-	}
-
-
-	/* Content type */
-	content_type = comp_content_type (comp, method);
-
-	top_level = comp_toplevel_with_zones (method, comp, client, zones);
-	ical_string = icalcomponent_as_ical_string (top_level);
-
-	if (e_cal_component_get_vtype (comp) == E_CAL_COMPONENT_EVENT) {
-		GNOME_Evolution_Composer_setBody (composer_server, ical_string, content_type, &ev);
-	} else {
-		GNOME_Evolution_Composer_setMultipartType (composer_server, GNOME_Evolution_Composer_MIXED, &ev);
-		if (BONOBO_EX (&ev)) {
-			g_warning ("Unable to set multipart type while sending iTip message");
-			goto cleanup;
-		}
-
-		filename = comp_filename (comp);
-		description = comp_description (comp);
-
-		GNOME_Evolution_Composer_setBody (composer_server, description, "text/plain", &ev);
-		if (BONOBO_EX (&ev)) {
-			g_warning ("Unable to set body text while sending iTip message");
-			goto cleanup;
-		}
-
-		attach_data = GNOME_Evolution_Composer_AttachmentData__alloc ();
-		attach_data->_length = strlen (ical_string);
-		attach_data->_maximum = attach_data->_length;	
-		attach_data->_buffer = CORBA_sequence_CORBA_char_allocbuf (attach_data->_length);
-		memcpy (attach_data->_buffer, ical_string, attach_data->_length);
-
-		GNOME_Evolution_Composer_attachData (composer_server,
-						     content_type, filename, description,
-						     TRUE, attach_data,
-						     &ev);
-	}
-		
-	if (BONOBO_EX (&ev)) {
-		g_warning ("Unable to place iTip message in composer");
-		goto cleanup;
-	}
-
-	if (attachments_list) {
-		if (append_cal_attachments (composer_server, comp, attachments_list))
-			retval = TRUE;
-	}
-
-	if (method == E_CAL_COMPONENT_METHOD_PUBLISH) {
-		GNOME_Evolution_Composer_show (composer_server, &ev);
-		if (BONOBO_EX (&ev))
-			g_warning ("Unable to show the composer while sending iTip message");
-		else
-			retval = TRUE;
-	} else {		
-		GNOME_Evolution_Composer_send (composer_server, &ev);
-		if (BONOBO_EX (&ev))
-			g_warning ("Unable to send iTip message");
-		else
-			retval = TRUE;
-	}
-	
- cleanup:
-	CORBA_exception_free (&ev);
-
-	if (comp != NULL)
-		g_object_unref (comp);
-	if (top_level != NULL)
-		icalcomponent_free (top_level);
-
-	if (users) {
-		g_list_foreach (users, (GFunc) g_free, NULL);
-		g_list_free (users);
-	}
-	
-	if (to_list != NULL)
-		CORBA_free (to_list);
-	if (cc_list != NULL)
-		CORBA_free (cc_list);
-	if (bcc_list != NULL)
-		CORBA_free (bcc_list);
-
-	if (from != NULL)
-		CORBA_free (from);
-	if (subject != NULL)
-		CORBA_free (subject);
-	if (body != NULL)
-		CORBA_free (body);
-	if (content_type != NULL)
-		CORBA_free (content_type);
-	if (filename != NULL)
-		CORBA_free (filename);
-	if (description != NULL)
-		CORBA_free (description);
-	if (attach_data != NULL) {
-		CORBA_free (attach_data->_buffer);
-		CORBA_free (attach_data);
-	}
-
-	return retval;
-}
-
-gboolean
-itip_publish_begin (ECalComponent *pub_comp, ECal *client, 
-		    gboolean cloned, ECalComponent **clone)
-{
-	icalcomponent *icomp =NULL, *icomp_clone = NULL;
-	icalproperty *prop;
-		
-	if (e_cal_component_get_vtype (pub_comp) == E_CAL_COMPONENT_FREEBUSY) {
-				
-		if (!cloned) {
-			*clone = e_cal_component_clone (pub_comp);
-			cloned = TRUE;
-		} else {
-			
-			icomp = e_cal_component_get_icalcomponent (pub_comp);
-			icomp_clone = e_cal_component_get_icalcomponent (*clone);
-			for (prop = icalcomponent_get_first_property (icomp,
-						      ICAL_FREEBUSY_PROPERTY);
-	     			prop != NULL;
-	     			prop = icalcomponent_get_next_property (icomp, 
-						       ICAL_FREEBUSY_PROPERTY))
-			{
-				icalproperty *p;
-		
-				p = icalproperty_new_clone (prop);
-				icalcomponent_add_property (icomp_clone, p);
-			}
-		}		
-	}
-
-	return TRUE;
-}
-
-static void
-fb_sort (struct icalperiodtype *ipt, int fb_count)
-{
-	int i,j;
-	
-	if (ipt == NULL || fb_count == 0)
-		return;
-	
-	for (i = 0; i < fb_count-1; i++) {
-		for (j = i+1; j < fb_count; j++) {
-			struct icalperiodtype temp;
-				
-			if (icaltime_compare (ipt[i].start, ipt[j].start) < 0)
-				continue;
-			
-			if (icaltime_compare (ipt[i].start, ipt[j].start) == 0){
-				if (icaltime_compare (ipt[i].end, 
-						     ipt[j].start) < 0)
-					continue;
-			}
-			temp = ipt[i];
-			ipt[i] = ipt[j];
-			ipt[j] = temp;
-		}
-	}
-}
-
-static icalcomponent *
-comp_fb_normalize (icalcomponent *icomp)
-{
-	icalcomponent *iclone;
-	icalproperty *prop, *p;
-	const char *uid,  *comment;
-	struct icaltimetype itt;
-	int fb_count, i = 0, j;
-	struct icalperiodtype *ipt;
-	
-	iclone = icalcomponent_new (ICAL_VFREEBUSY_COMPONENT);
-	
-	prop = icalcomponent_get_first_property (icomp, 
-						 ICAL_ORGANIZER_PROPERTY);
-	if (prop) {
-		p = icalproperty_new_clone (prop);
-		icalcomponent_add_property (iclone, p);
-	}
-	
-	itt = icalcomponent_get_dtstart (icomp);
-	icalcomponent_set_dtstart (iclone, itt);
-	
-	itt = icalcomponent_get_dtend (icomp);
-	icalcomponent_set_dtend (iclone, itt);
-	
-	fb_count =  icalcomponent_count_properties (icomp, 
-						    ICAL_FREEBUSY_PROPERTY);
-	ipt = g_new0 (struct icalperiodtype, fb_count+1);
-	
-	for (prop = icalcomponent_get_first_property (icomp, 
-						      ICAL_FREEBUSY_PROPERTY);
-		prop != NULL;
-		prop = icalcomponent_get_next_property (icomp, 
-							ICAL_FREEBUSY_PROPERTY))
-	{
-		ipt[i] = icalproperty_get_freebusy (prop);
-		i++;
-	}
-	
-	fb_sort (ipt, fb_count);
-	
-	for (j = 0; j <= fb_count-1; j++) {
-		icalparameter *param;
-		
-		prop = icalproperty_new_freebusy (ipt[j]);
-		param = icalparameter_new_fbtype (ICAL_FBTYPE_BUSY);
-		icalproperty_add_parameter (prop, param);
-		icalcomponent_add_property (iclone, prop);
-	}
-	g_free (ipt);
-	
-	/* Should I strip this RFC 2446 says there must not be a UID
-		if the METHOD is PUBLISH?? */
-	uid = icalcomponent_get_uid (icomp);
-	if (uid)
-		icalcomponent_set_uid (iclone, uid);
-
-	itt = icaltime_from_timet_with_zone (time (NULL), FALSE,
-					     icaltimezone_get_utc_timezone ());
-	icalcomponent_set_dtstamp (iclone, itt);	
-	
-	prop = icalcomponent_get_first_property (icomp, ICAL_URL_PROPERTY);
-	if (prop) {
-		p = icalproperty_new_clone (prop);
-		icalcomponent_add_property (iclone, p);
-	}
-	
-	comment =  icalcomponent_get_comment (icomp);
-	if (comment)
-		icalcomponent_set_comment (iclone, comment);
-
-	for (prop = icalcomponent_get_first_property (icomp, ICAL_X_PROPERTY);
-	     prop != NULL;
-	     prop = icalcomponent_get_next_property (icomp, ICAL_X_PROPERTY))
-	{		
-		p = icalproperty_new_clone (prop);
-		icalcomponent_add_property (iclone, p);
-	}
-	
-	return iclone;
-
-	g_object_unref (iclone);
-	return NULL;
-}
-
-gboolean
-itip_publish_comp (ECal *client, gchar *uri, gchar *username, 
-		   gchar *password, ECalComponent **pub_comp)
-{
-	icalcomponent *toplevel = NULL, *icalcomp = NULL;
-	icalcomponent *icomp = NULL;
-	SoupSession *session;
-	SoupMessage *msg;
-	SoupUri *real_uri;
-	char *ical_string;
-	
-	toplevel = e_cal_util_new_top_level ();
-	icalcomponent_set_method (toplevel, ICAL_METHOD_PUBLISH);
-	
-	e_cal_component_set_url (*pub_comp, uri);
-	
-	icalcomp = e_cal_component_get_icalcomponent (*pub_comp);
-	
-	icomp = comp_fb_normalize (icalcomp);	
-
-	icalcomponent_add_component (toplevel, icomp);
-	ical_string = icalcomponent_as_ical_string (toplevel);
-
-	/* Publish the component */
-	session = soup_session_async_new ();
-
-	real_uri = soup_uri_new (uri);
-	if (!real_uri || !real_uri->host) {
-		g_warning (G_STRLOC ": Invalid URL: %s", uri);
-		g_object_unref (session);
-		return FALSE;
-	}
-	
-	real_uri->user = g_strdup (username);
-	real_uri->passwd = g_strdup (password);
-		
-	/* build the SOAP message */
-	msg = soup_message_new_from_uri (SOUP_METHOD_PUT, real_uri);
-	if (!msg) {
-		g_warning (G_STRLOC ": Could not build SOAP message");
-		g_object_unref (session);
-		return FALSE;
-	}
-	soup_message_set_flags (msg, SOUP_MESSAGE_NO_REDIRECT);	
-	soup_message_set_request (msg, "text/calendar", SOUP_BUFFER_USER_OWNED,
-				  ical_string, strlen (ical_string));
-	
-	/* send message to server */
-	soup_session_send_message (session, msg);
-	if (!SOUP_STATUS_IS_SUCCESSFUL (msg->status_code)) {
-		g_warning(G_STRLOC ": Could not publish Free/Busy: %d: %s", 
-			  msg->status_code, 
-			  soup_status_get_phrase (msg->status_code));
-		g_object_unref (session);
-		return FALSE;
-	}
-	
-	soup_uri_free (real_uri);
-	g_object_unref (session);
-	
-	return TRUE;
-}
diff --git a/calendar/gui/itip-utils.h b/calendar/gui/itip-utils.h
deleted file mode 100644
index bfbd4ab6fc..0000000000
--- a/calendar/gui/itip-utils.h
+++ /dev/null
@@ -1,40 +0,0 @@
-
-#ifndef ITIP_UTILS_HEADER
-#define ITIP_UTILS_HEADER
-
-#include <libical/ical.h>
-#include <string.h>
-#include <glib.h>
-#include <libecal/e-cal.h>
-#include <libecal/e-cal-component.h>
-#include <e-util/e-account-list.h>
-
-typedef enum {
-	E_CAL_COMPONENT_METHOD_PUBLISH,
-	E_CAL_COMPONENT_METHOD_REQUEST,
-	E_CAL_COMPONENT_METHOD_REPLY,
-	E_CAL_COMPONENT_METHOD_ADD,
-	E_CAL_COMPONENT_METHOD_CANCEL,
-	E_CAL_COMPONENT_METHOD_REFRESH,
-	E_CAL_COMPONENT_METHOD_COUNTER,
-	E_CAL_COMPONENT_METHOD_DECLINECOUNTER
-} ECalComponentItipMethod;
-
-EAccountList *itip_addresses_get (void);
-EAccount *itip_addresses_get_default (void);
-
-gboolean itip_organizer_is_user (ECalComponent *comp, ECal *client);
-gboolean itip_sentby_is_user (ECalComponent *comp);
-
-const gchar *itip_strip_mailto (const gchar *address);
-
-gboolean itip_send_comp (ECalComponentItipMethod method, ECalComponent *comp,
-			 ECal *client, icalcomponent *zones, GSList *attachments_list);
-
-gboolean itip_publish_comp (ECal *client, gchar* uri, gchar* username, 
-			    gchar* password, ECalComponent **pub_comp);
-
-gboolean itip_publish_begin (ECalComponent *pub_comp, ECal *client, 
-			     gboolean cloned, ECalComponent **clone);
-
-#endif
diff --git a/calendar/gui/main.c b/calendar/gui/main.c
deleted file mode 100644
index b1b5cfdd77..0000000000
--- a/calendar/gui/main.c
+++ /dev/null
@@ -1,185 +0,0 @@
-/* -*- Mode: C; indent-tabs-mode: t; c-basic-offset: 8; tab-width: 8 -*- */
-/* main.c
- *
- * Copyright (C) 2000, 2001, 2002, 2003  Ximian, Inc.
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of version 2 of the GNU General Public
- * License as published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * General Public License for more details.
- *
- * You should have received a copy of the GNU General Public
- * License along with this program; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
- *
- * Author: Ettore Perazzoli
- */
-
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
-
-#include <glib.h>
-#include <libgnome/gnome-i18n.h>
-#include <libgnome/gnome-init.h>
-#include <libgnomevfs/gnome-vfs-init.h>
-#include <glade/glade.h>
-
-#include <bonobo/bonobo-main.h>
-#include <bonobo/bonobo-shlib-factory.h>
-#include <bonobo/bonobo-exception.h>
-
-#include "dialogs/cal-prefs-dialog.h"
-#include "calendar-commands.h"
-#include "calendar-config.h"
-#include "calendar-component.h"
-#include "e-comp-editor-registry.h"
-#include "comp-editor-factory.h"
-#include "control-factory.h"
-#include "itip-bonobo-control.h"
-#include "tasks-control.h"
-#include "tasks-component.h"
-
-#include <e-util/e-plugin.h>
-#include "e-cal-config.h"
-#include "e-cal-popup.h"
-#include "e-cal-menu.h"
-#include "e-cal-event.h"
-
-#define FACTORY_ID "OAFIID:GNOME_Evolution_Calendar_Factory:" BASE_VERSION
-
-#define CALENDAR_COMPONENT_ID  "OAFIID:GNOME_Evolution_Calendar_Component:" BASE_VERSION
-#define TASKS_COMPONENT_ID     "OAFIID:GNOME_Evolution_Tasks_Component:" BASE_VERSION
-#define ITIP_CONTROL_ID        "OAFIID:GNOME_Evolution_Calendar_iTip_Control:" BASE_VERSION
-#define CONFIG_CONTROL_ID      "OAFIID:GNOME_Evolution_Calendar_ConfigControl:" BASE_VERSION
-#define COMP_EDITOR_FACTORY_ID "OAFIID:GNOME_Evolution_Calendar_CompEditorFactory:" BASE_VERSION
-
-ECompEditorRegistry *comp_editor_registry = NULL;
-
-/* The component editor factory */
-static CompEditorFactory *comp_editor_factory = NULL;
-
-
-/* Factory function for the calendar component factory; just creates and
- * references a singleton service object.
- */
-static BonoboObject *
-comp_editor_factory_fn (void)
-{
-	if (!comp_editor_factory) {
-		comp_editor_factory = comp_editor_factory_new ();
-		if (!comp_editor_factory)
-			return NULL;
-	}
-
-	bonobo_object_ref (BONOBO_OBJECT (comp_editor_factory));
-	return BONOBO_OBJECT (comp_editor_factory);
-}
-
-
-/* Does a simple activation and unreffing of the alarm notification service so
- * that the daemon will be launched if it is not running yet.
- */
-static gboolean
-launch_alarm_daemon_cb (gpointer data)
-{
-	CORBA_Environment ev;
-	CORBA_Object an;
-	guint *idle_id = (guint *) data;
-
-	/* remove the idle function */
-	g_source_remove (*idle_id);
-	g_free (idle_id);
-
-	/* activate the alarm daemon */
-	CORBA_exception_init (&ev);
-	an = bonobo_activation_activate_from_id ("OAFIID:GNOME_Evolution_Calendar_AlarmNotify:" BASE_VERSION, 0, NULL, &ev);
-
-	if (BONOBO_EX (&ev)) {
-		g_message ("launch_alarm_daemon_cb(): %s", bonobo_exception_get_text (&ev));
-		CORBA_exception_free (&ev);
-		return FALSE;
-	}
-	CORBA_exception_free (&ev);
-
-	/* Just get rid of it; what we are interested in is that it gets launched */
-
-	CORBA_exception_init (&ev);
-	bonobo_object_release_unref (an, &ev);
-	if (BONOBO_EX (&ev))
-		g_message ("add_alarms(): Could not unref the alarm notification service");
-
-	CORBA_exception_free (&ev);
-
-	return FALSE;
-}
-
-static void
-launch_alarm_daemon (void)
-{
-	guint *idle_id;
-
-	idle_id = g_new0 (guint, 1);
-	*idle_id = g_idle_add ((GSourceFunc) launch_alarm_daemon_cb, idle_id);
-}
-
-static void
-initialize (void)
-{
-	comp_editor_registry = E_COMP_EDITOR_REGISTRY (e_comp_editor_registry_new ());
-	
-#if 0
-	itip_control_factory_init ();
-	component_editor_factory_init ();
-#endif
-
-	launch_alarm_daemon ();
-	
-	/* Initialize Calendar Publishing */
-	calendar_component_init_publishing ();
-
-	/* Initialize plugin system */
-	e_plugin_hook_register_type (e_cal_popup_hook_get_type());
-	e_plugin_hook_register_type (e_cal_menu_hook_get_type());
-	e_plugin_hook_register_type (e_cal_config_hook_get_type ());
-	e_plugin_hook_register_type (e_cal_event_hook_get_type ());
-}
-
-
-static BonoboObject *
-factory (BonoboGenericFactory *factory,
-	 const char *component_id,
-	 void *closure)
-{
-	static gboolean initialized = FALSE;
-
-	if (! initialized) {
-		initialize ();
-		initialized = TRUE;
-	}
-
-	if (strcmp (component_id, CALENDAR_COMPONENT_ID) == 0) {
-		BonoboObject *object = BONOBO_OBJECT (calendar_component_peek ());
-		bonobo_object_ref (object);
-		return object;
-	} else if (strcmp (component_id, TASKS_COMPONENT_ID) == 0) {
-		BonoboObject *object = BONOBO_OBJECT (tasks_component_peek ());
-		bonobo_object_ref (object);
-		return object;
-	} else if (strcmp (component_id, ITIP_CONTROL_ID) == 0)
-		return BONOBO_OBJECT (itip_bonobo_control_new ());
-	else if (strcmp (component_id, CONFIG_CONTROL_ID) == 0)
-		return BONOBO_OBJECT (cal_prefs_dialog_new ());
-	else if (strcmp (component_id, COMP_EDITOR_FACTORY_ID) == 0)
-		return BONOBO_OBJECT (comp_editor_factory_fn ());
-
-	g_warning (FACTORY_ID ": Don't know what to do with %s", component_id);
-	return NULL;
-}
-
-BONOBO_ACTIVATION_SHLIB_FACTORY (FACTORY_ID, "Evolution Calendar component factory", factory, NULL)
diff --git a/calendar/gui/migration.c b/calendar/gui/migration.c
deleted file mode 100644
index fb8f0b2f8c..0000000000
--- a/calendar/gui/migration.c
+++ /dev/null
@@ -1,996 +0,0 @@
-/* -*- Mode: C; indent-tabs-mode: t; c-basic-offset: 8; tab-width: 8 -*- */
-/* calendar-component.c
- *
- * Copyright (C) 2003  Ximian, Inc
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of version 2 of the GNU General Public
- * License as published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * General Public License for more details.
- *
- * You should have received a copy of the GNU General Public
- * License along with this program; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
- *
- * Author: Rodrigo Moya <rodrigo@ximian.com>
- */
-
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
-
-#include <string.h>
-#include <sys/types.h>
-#include <sys/stat.h>
-#include <unistd.h>
-#include <dirent.h>
-#include <fcntl.h>
-#include <errno.h>
-
-#include <bonobo/bonobo-i18n.h>
-#include <libgnomevfs/gnome-vfs-uri.h>
-#include <libgnomevfs/gnome-vfs-xfer.h>
-#include <gtk/gtkwidget.h>
-#include <gtk/gtkvbox.h>
-#include <gtk/gtkmain.h>
-#include <gtk/gtklabel.h>
-#include <gtk/gtkprogressbar.h>
-#include <libecal/e-cal.h>
-#include <e-util/e-bconf-map.h>
-#include <e-util/e-folder-map.h>
-#include <libedataserver/e-dbhash.h>
-#include <libedataserver/e-xml-hash-utils.h>
-#include "calendar-config.h"
-#include "calendar-config-keys.h"
-#include "e-cal-event.h"
-#include "migration.h"
-
-static e_gconf_map_t calendar_display_map[] = {
-	/* /Calendar/Display */
-	{ "Timezone", "calendar/display/timezone", E_GCONF_MAP_STRING },
-	{ "Use24HourFormat", "calendar/display/use_24hour_format", E_GCONF_MAP_BOOL },
-	{ "WeekStartDay", "calendar/display/week_start_day", E_GCONF_MAP_INT },
-	{ "DayStartHour", "calendar/display/day_start_hour", E_GCONF_MAP_INT },
-	{ "DayStartMinute", "calendar/display/day_start_minute", E_GCONF_MAP_INT },
-	{ "DayEndHour", "calendar/display/day_end_hour", E_GCONF_MAP_INT },
-	{ "DayEndMinute", "calendar/display/day_end_minute", E_GCONF_MAP_INT },
-	{ "TimeDivisions", "calendar/display/time_divisions", E_GCONF_MAP_INT },
-	{ "View", "calendar/display/default_view", E_GCONF_MAP_INT },
-	{ "HPanePosition", "calendar/display/hpane_position", E_GCONF_MAP_FLOAT },
-	{ "VPanePosition", "calendar/display/vpane_position", E_GCONF_MAP_FLOAT },
-	{ "MonthHPanePosition", "calendar/display/month_hpane_position", E_GCONF_MAP_FLOAT },
-	{ "MonthVPanePosition", "calendar/display/month_vpane_position", E_GCONF_MAP_FLOAT },
-	{ "CompressWeekend", "calendar/display/compress_weekend", E_GCONF_MAP_BOOL },
-	{ "ShowEventEndTime", "calendar/display/show_event_end", E_GCONF_MAP_BOOL },
-	{ "WorkingDays", "calendar/display/working_days", E_GCONF_MAP_INT },
-	{ 0 },
-};
-
-static e_gconf_map_t calendar_tasks_map[] = {
-	/* /Calendar/Tasks */
-	{ "HideCompletedTasks", "calendar/tasks/hide_completed", E_GCONF_MAP_BOOL },
-	{ "HideCompletedTasksUnits", "calendar/tasks/hide_completed_units", E_GCONF_MAP_STRING },
-	{ "HideCompletedTasksValue", "calendar/tasks/hide_completed_value", E_GCONF_MAP_INT },
-	{ 0 },
-};
-
-static e_gconf_map_t calendar_tasks_colours_map[] = {
-	/* /Calendar/Tasks/Colors */
-	{ "TasksDueToday", "calendar/tasks/colors/due_today", E_GCONF_MAP_STRING },
-	{ "TasksOverDue", "calendar/tasks/colors/overdue", E_GCONF_MAP_STRING },
-	{ "TasksDueToday", "calendar/tasks/colors/due_today", E_GCONF_MAP_STRING },
-	{ 0 },
-};
-
-static e_gconf_map_t calendar_other_map[] = {
-	/* /Calendar/Other */
-	{ "ConfirmDelete", "calendar/prompts/confirm_delete", E_GCONF_MAP_BOOL },
-	{ "ConfirmExpunge", "calendar/prompts/confirm_expunge", E_GCONF_MAP_BOOL },
-	{ "UseDefaultReminder", "calendar/other/use_default_reminder", E_GCONF_MAP_BOOL },
-	{ "DefaultReminderInterval", "calendar/other/default_reminder_interval", E_GCONF_MAP_INT },
-	{ "DefaultReminderUnits", "calendar/other/default_reminder_units", E_GCONF_MAP_STRING },
-	{ 0 },
-};
-
-static e_gconf_map_t calendar_datenavigator_map[] = {
-	/* /Calendar/DateNavigator */
-	{ "ShowWeekNumbers", "calendar/date_navigator/show_week_numbers", E_GCONF_MAP_BOOL },
-	{ 0 },
-};
-
-static e_gconf_map_t calendar_alarmnotify_map[] = {
-	/* /Calendar/AlarmNotify */
-	{ "LastNotificationTime", "calendar/notify/last_notification_time", E_GCONF_MAP_INT },
-	{ "CalendarToLoad%i", "calendar/notify/calendars", E_GCONF_MAP_STRING|E_GCONF_MAP_LIST },
-	{ "BlessedProgram%i", "calendar/notify/programs", E_GCONF_MAP_STRING|E_GCONF_MAP_LIST },
-	{ 0 },
-};
-
-e_gconf_map_list_t calendar_remap_list[] = {
-
-	{ "/Calendar/Display", calendar_display_map },
-	{ "/Calendar/Other/Map", calendar_other_map },
-	{ "/Calendar/DateNavigator", calendar_datenavigator_map },
-	{ "/Calendar/AlarmNotify", calendar_alarmnotify_map },
-
-	{ 0 },
-};
-
-e_gconf_map_list_t task_remap_list[] = {
-
-	{ "/Calendar/Tasks", calendar_tasks_map },
-	{ "/Calendar/Tasks/Colors", calendar_tasks_colours_map },
-
-	{ 0 },
-};
-
-static GtkWidget *window;
-static GtkLabel *label;
-static GtkProgressBar *progress;
-
-static void
-setup_progress_dialog (gboolean tasks)
-{
-	GtkWidget *vbox, *hbox, *w;
-	
-	window = gtk_window_new (GTK_WINDOW_TOPLEVEL);
-	gtk_window_set_title ((GtkWindow *) window, _("Migrating..."));
-	gtk_window_set_modal ((GtkWindow *) window, TRUE);
-	gtk_container_set_border_width ((GtkContainer *) window, 6);
-	
-	vbox = gtk_vbox_new (FALSE, 6);
-	gtk_widget_show (vbox);
-	gtk_container_add ((GtkContainer *) window, vbox);
-	
-	if (tasks)
-		w = gtk_label_new (_("The location and hierarchy of the Evolution task "
-				     "folders has changed since Evolution 1.x.\n\nPlease be "
-				     "patient while Evolution migrates your folders..."));
-	else
-		w = gtk_label_new (_("The location and hierarchy of the Evolution calendar "
-				     "folders has changed since Evolution 1.x.\n\nPlease be "
-				     "patient while Evolution migrates your folders..."));
-
-	gtk_label_set_line_wrap ((GtkLabel *) w, TRUE);
-	gtk_widget_show (w);
-	gtk_box_pack_start_defaults ((GtkBox *) vbox, w);
-	
-	hbox = gtk_hbox_new (FALSE, 6);
-	gtk_widget_show (hbox);
-	gtk_box_pack_start_defaults ((GtkBox *) vbox, hbox);
-	
-	label = (GtkLabel *) gtk_label_new ("");
-	gtk_widget_show ((GtkWidget *) label);
-	gtk_box_pack_start_defaults ((GtkBox *) hbox, (GtkWidget *) label);
-	
-	progress = (GtkProgressBar *) gtk_progress_bar_new ();
-	gtk_widget_show ((GtkWidget *) progress);
-	gtk_box_pack_start_defaults ((GtkBox *) hbox, (GtkWidget *) progress);
-	
-	gtk_widget_show (window);
-}
-
-static void
-dialog_close (void)
-{
-	gtk_widget_destroy ((GtkWidget *) window);
-}
-
-static void
-dialog_set_folder_name (const char *folder_name)
-{
-	char *text;
-	
-	text = g_strdup_printf (_("Migrating `%s':"), folder_name);
-	gtk_label_set_text (label, text);
-	g_free (text);
-	
-	gtk_progress_bar_set_fraction (progress, 0.0);
-	
-	while (gtk_events_pending ())
-		gtk_main_iteration ();
-}
-
-static void
-dialog_set_progress (double percent)
-{
-	char text[5];
-	
-	snprintf (text, sizeof (text), "%d%%", (int) (percent * 100.0f));
-	
-	gtk_progress_bar_set_fraction (progress, percent);
-	gtk_progress_bar_set_text (progress, text);
-	
-	while (gtk_events_pending ())
-		gtk_main_iteration ();
-}
-
-static gboolean
-check_for_conflict (ESourceGroup *group, char *name)
-{
-	GSList *sources;
-	GSList *s;
-
-	sources = e_source_group_peek_sources (group);
-
-	for (s = sources; s; s = s->next) {
-		ESource *source = E_SOURCE (s->data);
-
-		if (!strcmp (e_source_peek_name (source), name))
-			return TRUE;
-	}
-
-	return FALSE;
-}
-
-static char *
-get_source_name (ESourceGroup *group, const char *path)
-{
-	char **p = g_strsplit (path, "/", 0);
-	int i, j, starting_index;
-	int num_elements;
-	gboolean conflict;
-	GString *s = g_string_new ("");
-
-	for (i = 0; p[i]; i ++) ;
-
-	num_elements = i;
-	i--;
-
-	/* p[i] is now the last path element */
-
-	/* check if it conflicts */
-	starting_index = i;
-	do {
-		g_string_assign (s, "");
-		for (j = starting_index; j < num_elements; j += 2) {
-			if (j != starting_index)
-				g_string_append_c (s, '_');
-			g_string_append (s, p[j]);
-		}
-
-		conflict = check_for_conflict (group, s->str);
-
-
-		/* if there was a conflict back up 2 levels (skipping the /subfolder/ element) */
-		if (conflict)
-			starting_index -= 2;
-
-		/* we always break out if we can't go any further,
-		   regardless of whether or not we conflict. */
-		if (starting_index < 0)
-			break;
-
-	} while (conflict);
-
-	return g_string_free (s, FALSE);
-}
-
-static gboolean
-migrate_ical (ECal *old_ecal, ECal *new_ecal)
-{
-	GList *l, *objects;
-	int num_added = 0;
-	int num_objects;
-	gboolean retval = TRUE;
-	
-	/* both ecals are loaded, start the actual migration */
-	if (!e_cal_get_object_list (old_ecal, "#t", &objects, NULL))
-		return FALSE;
-
-	num_objects = g_list_length (objects);
-	for (l = objects; l; l = l->next) {
-		icalcomponent *ical_comp = l->data;
-		GError *error = NULL;
-
-		if (!e_cal_create_object (new_ecal, ical_comp, NULL, &error)) {
-			g_warning ("Migration of object failed: %s", error->message);
-			retval = FALSE;
-		}
-		
-		g_clear_error (&error);
-
-		num_added ++;
-		dialog_set_progress ((double)num_added / num_objects);
-	}
-
-	return retval;
-}
-
-static gboolean
-migrate_ical_folder_to_source (char *old_path, ESource *new_source, ECalSourceType type)
-{
-	ECal *old_ecal = NULL, *new_ecal = NULL;
-	ESource *old_source;
-	ESourceGroup *group;
-	char *old_uri = g_strdup_printf ("file://%s", old_path);
-	GError *error = NULL;
-	gboolean retval = FALSE;
-	
-	group = e_source_group_new ("", old_uri);
-	old_source = e_source_new ("", "");
-	e_source_group_add_source (group, old_source, -1);
-
-	dialog_set_folder_name (e_source_peek_name (new_source));
-
-	if (!(old_ecal = e_cal_new (old_source, type))) {
-		g_warning ("could not find a backend for '%s'", e_source_get_uri (old_source));
-		goto finish;
-	}
-	if (!e_cal_open (old_ecal, TRUE, &error)) {
-		g_warning ("failed to load source ecal for migration: '%s' (%s)", error->message,
-			   e_source_get_uri (old_source));
-		goto finish;
-	}
-
-	if (!(new_ecal = e_cal_new (new_source, type))) {
-		g_warning ("could not find a backend for '%s'", e_source_get_uri (new_source));
-		goto finish;
-	}
-	if (!e_cal_open (new_ecal, FALSE, &error)) {
-		g_warning ("failed to load destination ecal for migration: '%s' (%s)", error->message,
-			   e_source_get_uri (new_source));
-		goto finish;
-	}
-
-	retval = migrate_ical (old_ecal, new_ecal);
-
-finish:
-	g_clear_error (&error);
-	if (old_ecal)
-		g_object_unref (old_ecal);
-	g_object_unref (group);
-	if (new_ecal)
-		g_object_unref (new_ecal);
-	g_free (old_uri);
-
-	return retval;	
-}
-
-static gboolean
-migrate_ical_folder (char *old_path, ESourceGroup *dest_group, char *source_name, ECalSourceType type)
-{
-	ESource *new_source;
-	gboolean retval;
-	
-	new_source = e_source_new (source_name, source_name);
-	e_source_set_relative_uri (new_source, e_source_peek_uid (new_source));
-	e_source_group_add_source (dest_group, new_source, -1);
-
-	retval = migrate_ical_folder_to_source (old_path, new_source, type);
-
-	g_object_unref (new_source);
-
-	return retval;
-}
-
-
-#define WEBCAL_BASE_URI "webcal://"
-#define CONTACTS_BASE_URI "contacts://"
-#define BAD_CONTACTS_BASE_URI "contact://"
-#define PERSONAL_RELATIVE_URI "system"
-
-static ESourceGroup *
-create_calendar_contact_source (ESourceList *source_list)
-{
-	ESourceGroup *group;
-	ESource *source;
-	
-	/* Create the contacts group */
-	group = e_source_group_new (_("Contacts"), CONTACTS_BASE_URI);
-	e_source_list_add_group (source_list, group, -1);
-
-	source = e_source_new (_("Birthdays & Anniversaries"), "/");
-	e_source_group_add_source (group, source, -1);
-	g_object_unref (source);
-
-	e_source_set_color (source, 0xFED4D3);
-	e_source_group_set_readonly (group, TRUE);
-
-	return group;
-}
-
-static void
-create_calendar_sources (CalendarComponent *component,
-			 ESourceList   *source_list,
-			 ESourceGroup **on_this_computer,
-			 ESource **personal_source,
-			 ESourceGroup **on_the_web,
-			 ESourceGroup **contacts)
-{
-	GSList *groups;
-	ESourceGroup *group;
-	char *base_uri, *base_uri_proto;
-
-	*on_this_computer = NULL;
-	*on_the_web = NULL;
-	*contacts = NULL;
-	*personal_source = NULL;
-
-	base_uri = g_build_filename (calendar_component_peek_base_directory (component),
-				     "/calendar/local/",
-				     NULL);
-
-	base_uri_proto = g_strconcat ("file://", base_uri, NULL);
-
-	groups = e_source_list_peek_groups (source_list);
-	if (groups) {
-		/* groups are already there, we need to search for things... */
-		GSList *g;
-
-		for (g = groups; g; g = g->next) {
-
-			group = E_SOURCE_GROUP (g->data);
-
-			if (!strcmp (BAD_CONTACTS_BASE_URI, e_source_group_peek_base_uri (group)))
-				e_source_group_set_base_uri (group, CONTACTS_BASE_URI);
-
-			if (!strcmp (base_uri, e_source_group_peek_base_uri (group)))
-				e_source_group_set_base_uri (group, base_uri_proto);
-
-			if (!*on_this_computer && !strcmp (base_uri_proto, e_source_group_peek_base_uri (group)))
-				*on_this_computer = g_object_ref (group);
-			else if (!*on_the_web && !strcmp (WEBCAL_BASE_URI, e_source_group_peek_base_uri (group)))
-				*on_the_web = g_object_ref (group);
-			else if (!*contacts && !strcmp (CONTACTS_BASE_URI, e_source_group_peek_base_uri (group)))
-				*contacts = g_object_ref (group);
-		}
-	}
-
-	if (*on_this_computer) {
-		/* make sure "Personal" shows up as a source under
-		   this group */
-		GSList *sources = e_source_group_peek_sources (*on_this_computer);
-		GSList *s;
-		for (s = sources; s; s = s->next) {
-			ESource *source = E_SOURCE (s->data);
-			if (!strcmp (PERSONAL_RELATIVE_URI, e_source_peek_relative_uri (source))) {
-				*personal_source = g_object_ref (source);
-				break;
-			}
-		}
-	} else {
-		/* create the local source group */
-		group = e_source_group_new (_("On This Computer"), base_uri_proto);
-		e_source_list_add_group (source_list, group, -1);
-
-		*on_this_computer = group;
-	}
-
-	if (!*personal_source) {
-		/* Create the default Person calendar */
-		ESource *source = e_source_new (_("Personal"), PERSONAL_RELATIVE_URI);
-		e_source_group_add_source (*on_this_computer, source, -1);
-		
-		if (!calendar_config_get_primary_calendar () && !calendar_config_get_calendars_selected ()) {
-			GSList selected;
-
-			calendar_config_set_primary_calendar (e_source_peek_uid (source));
-
-			selected.data = (gpointer)e_source_peek_uid (source);
-			selected.next = NULL;
-			calendar_config_set_calendars_selected (&selected);
-		}
-		
-		e_source_set_color (source, 0xBECEDD);
-		*personal_source = source;
-	}
-
-	if (!*on_the_web) {
-		/* Create the Webcal source group */
-		group = e_source_group_new (_("On The Web"), WEBCAL_BASE_URI);
-		e_source_list_add_group (source_list, group, -1);
-
-		*on_the_web = group;
-	}
-
-	if (!*contacts) {
-		group = create_calendar_contact_source (source_list);
-
-		*contacts = group;
-	}
-	
-	g_free (base_uri_proto);
-	g_free (base_uri);
-}
-
-static void
-create_task_sources (TasksComponent *component,
-		     ESourceList   *source_list,
-		     ESourceGroup **on_this_computer,
-		     ESourceGroup **on_the_web,
-		     ESource **personal_source)
-{
-	GSList *groups;
-	ESourceGroup *group;
-	char *base_uri, *base_uri_proto;
-
-	*on_this_computer = NULL;
-	*on_the_web = NULL;
-	*personal_source = NULL;
-	
-	base_uri = g_build_filename (tasks_component_peek_base_directory (component),
-				     "tasks", "local", NULL);
-
-	base_uri_proto = g_strconcat ("file://", base_uri, NULL);
-
-	groups = e_source_list_peek_groups (source_list);
-	if (groups) {
-		/* groups are already there, we need to search for things... */
-		GSList *g;
-
-		for (g = groups; g; g = g->next) {
-
-			group = E_SOURCE_GROUP (g->data);
-
-			if (!*on_this_computer && !strcmp (base_uri_proto, e_source_group_peek_base_uri (group)))
-				*on_this_computer = g_object_ref (group);
-			else if (!*on_the_web && !strcmp (WEBCAL_BASE_URI, e_source_group_peek_base_uri (group)))
-				*on_the_web = g_object_ref (group);
-		}
-	}
-
-	if (*on_this_computer) {
-		/* make sure "Personal" shows up as a source under
-		   this group */
-		GSList *sources = e_source_group_peek_sources (*on_this_computer);
-		GSList *s;
-		for (s = sources; s; s = s->next) {
-			ESource *source = E_SOURCE (s->data);
-			if (!strcmp (PERSONAL_RELATIVE_URI, e_source_peek_relative_uri (source))) {
-				*personal_source = g_object_ref (source);
-				break;
-			}
-		}
-	} else {
-		/* create the local source group */
-		group = e_source_group_new (_("On This Computer"), base_uri_proto);
-		e_source_list_add_group (source_list, group, -1);
-
-		*on_this_computer = group;
-	}
-
-	if (!*personal_source) {
-		/* Create the default Person task list */
-		ESource *source = e_source_new (_("Personal"), PERSONAL_RELATIVE_URI);
-		e_source_group_add_source (*on_this_computer, source, -1);
-
-		if (!calendar_config_get_primary_tasks () && !calendar_config_get_tasks_selected ()) {
-			GSList selected;
-
-			calendar_config_set_primary_tasks (e_source_peek_uid (source));
-
-			selected.data = (gpointer)e_source_peek_uid (source);
-			selected.next = NULL;
-			calendar_config_set_tasks_selected (&selected);
-		}
-
-		e_source_set_color (source, 0xBECEDD);
-		*personal_source = source;
-	}
-
-	if (!*on_the_web) {
-		/* Create the Webcal source group */
-		group = e_source_group_new (_("On The Web"), WEBCAL_BASE_URI);
-		e_source_list_add_group (source_list, group, -1);
-
-		*on_the_web = group;
-	}
-
-	g_free (base_uri_proto);
-	g_free (base_uri);
-}
-
-static void
-migrate_pilot_db_key (const char *key, gpointer user_data)
-{
-	EXmlHash *xmlhash = user_data;
-	
-	e_xmlhash_add (xmlhash, key, "");
-}
-
-static void
-migrate_pilot_data (const char *component, const char *conduit, const char *old_path, const char *new_path)
-{
-	char *changelog, *map;
-	struct dirent *dent;
-	const char *ext;
-	char *filename;
-	DIR *dir;
-	
-	if (!(dir = opendir (old_path)))
-		return;
-	
-	map = g_alloca (12 + strlen (conduit));
-	sprintf (map, "pilot-map-%s-", conduit);
-	
-	changelog = g_alloca (24 + strlen (conduit));
-	sprintf (changelog, "pilot-sync-evolution-%s-", conduit);
-	
-	while ((dent = readdir (dir))) {
-		if (!strncmp (dent->d_name, map, strlen (map)) &&
-		    ((ext = strrchr (dent->d_name, '.')) && !strcmp (ext, ".xml"))) {
-			/* pilot map file - src and dest file formats are identical */
-			unsigned char inbuf[4096];
-			size_t nread, nwritten;
-			int fd0, fd1;
-			ssize_t n;
-			
-			filename = g_build_filename (old_path, dent->d_name, NULL);
-			if ((fd0 = open (filename, O_RDONLY)) == -1) {
-				g_free (filename);
-				continue;
-			}
-			
-			g_free (filename);
-			filename = g_build_filename (new_path, dent->d_name, NULL);
-			if ((fd1 = open (filename, O_WRONLY | O_CREAT | O_TRUNC, 0666)) == -1) {
-				g_free (filename);
-				close (fd0);
-				continue;
-			}
-			
-			do {
-				do {
-					n = read (fd0, inbuf, sizeof (inbuf));
-				} while (n == -1 && errno == EINTR);
-				
-				if (n < 1)
-					break;
-				
-				nread = n;
-				nwritten = 0;
-				do {
-					do {
-						n = write (fd1, inbuf + nwritten, nread - nwritten);
-					} while (n == -1 && errno == EINTR);
-					
-					if (n > 0)
-						nwritten += n;
-				} while (nwritten < nread && n != -1);
-				
-				if (n == -1)
-					break;
-			} while (1);
-			
-			if (n != -1)
-				n = fsync (fd1);
-			
-			if (n == -1) {
-				g_warning ("Failed to migrate %s: %s", dent->d_name, strerror (errno));
-				unlink (filename);
-			}
-			
-			close (fd0);
-			close (fd1);
-			g_free (filename);
-		} else if (!strncmp (dent->d_name, changelog, strlen (changelog)) &&
-			   ((ext = strrchr (dent->d_name, '.')) && !strcmp (ext, ".db"))) {
-			/* src and dest formats differ, src format is db3 while dest format is xml */
-			EXmlHash *xmlhash;
-			EDbHash *dbhash;
-			struct stat st;
-			
-			filename = g_build_filename (old_path, dent->d_name, NULL);
-			if (stat (filename, &st) == -1) {
-				g_free (filename);
-				continue;
-			}
-			
-			dbhash = e_dbhash_new (filename);
-			g_free (filename);
-			
-			filename = g_strdup_printf ("%s/%s.ics-%s", new_path, component, dent->d_name);
-			if (stat (filename, &st) != -1)
-				unlink (filename);
-			xmlhash = e_xmlhash_new (filename);
-			g_free (filename);
-			
-			e_dbhash_foreach_key (dbhash, migrate_pilot_db_key, xmlhash);
-			
-			e_dbhash_destroy (dbhash);
-			
-			e_xmlhash_write (xmlhash);
-			e_xmlhash_destroy (xmlhash);
-		}
-	}
-	
-	closedir (dir);
-}
-
-gboolean
-migrate_calendars (CalendarComponent *component, int major, int minor, int revision, GError **err)
-{
-	ESourceGroup *on_this_computer = NULL, *on_the_web = NULL, *contacts = NULL;
-	ESource *personal_source = NULL;
-	ECalEvent *ece;
-	ECalEventTargetComponent *target;
-	gboolean retval = FALSE;
-
-	/* we call this unconditionally now - create_groups either
-	   creates the groups/sources or it finds the necessary
-	   groups/sources. */
-	create_calendar_sources (component, calendar_component_peek_source_list (component), &on_this_computer, &personal_source, &on_the_web, &contacts);
-
-	if (major == 1) {
-		xmlDocPtr config_doc = NULL;
-		char *conf_file;
-		struct stat st;
-
-		conf_file = g_build_filename (g_get_home_dir (), "evolution", "config.xmldb", NULL);
-		if (lstat (conf_file, &st) == 0 && S_ISREG (st.st_mode)) 
-			config_doc = xmlParseFile (conf_file);
-		g_free (conf_file);
-		
-		if (config_doc && minor <= 2) {
-			GConfClient *gconf;	
-			int res = 0;
-			
-			/* move bonobo config to gconf */
-			gconf = gconf_client_get_default ();
-			
-			res = e_bconf_import (gconf, config_doc, calendar_remap_list);
-			
-			g_object_unref (gconf);
-			
-			xmlFreeDoc(config_doc);
-
-			if (res != 0) {
-				/* FIXME: set proper domain/code */
-				g_set_error(err, 0, 0, _("Unable to migrate old settings from evolution/config.xmldb"));
-				goto fail;
-			}
-		}
-
-		if (minor <= 4) {
-			GSList *migration_dirs, *l;
-			char *path, *local_cal_folder;
-
-			setup_progress_dialog (FALSE);
-
-			path = g_build_filename (g_get_home_dir (), "evolution", "local", NULL);
-			migration_dirs = e_folder_map_local_folders (path, "calendar");
-			local_cal_folder = g_build_filename (path, "Calendar", NULL);
-			g_free (path);
-
-			if (personal_source)
-				migrate_ical_folder_to_source (local_cal_folder, personal_source, E_CAL_SOURCE_TYPE_EVENT);
-
-			for (l = migration_dirs; l; l = l->next) {
-				char *source_name;
-			
-				if (personal_source && !strcmp ((char*)l->data, local_cal_folder))
-					continue;
-
-				source_name = get_source_name (on_this_computer, (char*)l->data);
-
-				if (!migrate_ical_folder (l->data, on_this_computer, source_name, E_CAL_SOURCE_TYPE_EVENT)) {
-					/* FIXME: domain/code */
-					g_set_error(err, 0, 0, _("Unable to migrate calendar `%s'"), source_name);
-					g_free(source_name);
-					goto fail;
-				}
-				
-				g_free (source_name);
-			}
-			
-			g_free (local_cal_folder);
-
-			dialog_close ();
-		}
-
-		if (minor <= 4 || (minor == 5 && revision < 5)) {
-			GConfClient *gconf;	
-			GConfValue *gconf_val;
-			int i;
-			const char *keys[] = {
-				CALENDAR_CONFIG_HPANE_POS,
-				CALENDAR_CONFIG_VPANE_POS,
-				CALENDAR_CONFIG_MONTH_HPANE_POS,
-				CALENDAR_CONFIG_MONTH_VPANE_POS,
-				NULL
-			};
-			
-			gconf = gconf_client_get_default ();
-			
-			for (i = 0; keys[i]; i++) {
-				gconf_val = gconf_client_get (gconf, keys[i], NULL);
-				if (gconf_val) {
-					if (gconf_val->type != GCONF_VALUE_INT)
-						gconf_client_unset (gconf, keys[i], NULL);
-					gconf_value_free (gconf_val);
-				}
-			}
-			
-			g_object_unref (gconf);
-		}
-		
-		if (minor < 5 || (minor == 5 && revision <= 10)) {
-			char *old_path, *new_path;
-			
-			old_path = g_build_filename (g_get_home_dir (), "evolution", "local", "Calendar", NULL);
-			new_path = g_build_filename (calendar_component_peek_base_directory (component),
-						     "calendar", "local", "system", NULL);
-			migrate_pilot_data ("calendar", "calendar", old_path, new_path);
-			g_free (new_path);
-			g_free (old_path);
-		}
-
-		/* we only need to do this next step if people ran
-		   older versions of 1.5.  We need to clear out the
-		   absolute URI's that were assigned to ESources
-		   during one phase of development, as they take
-		   precedent over relative uris (but aren't updated
-		   when editing an ESource). */
-		if (minor == 5 && revision <= 11) {
-			GSList *g;
-			for (g = e_source_list_peek_groups (calendar_component_peek_source_list (component)); g; g = g->next) {
-				ESourceGroup *group = g->data;
-				GSList *s;
-
-				for (s = e_source_group_peek_sources (group); s; s = s->next) {
-					ESource *source = s->data;
-					e_source_set_absolute_uri (source, NULL);
-				}
-			}
-		}
-
-	}
-
-	e_source_list_sync (calendar_component_peek_source_list (component), NULL);
-
-	/** @Event: component.migration
-	 * @Title: Migration step in component initialization
-	 * @Target: ECalEventTargetComponent
-	 * 
-	 * component.migration is emitted during the calendar component
-	 * initialization process. This allows new calendar backend types
-	 * to be distributed as an e-d-s backend and a plugin without
-	 * reaching their grubby little fingers into migration.c
-	 */
-	/* Fire off migration event */
-	ece = e_cal_event_peek ();
-	target = e_cal_event_target_new_component (ece, calendar_component_peek (), 0);
-	e_event_emit ((EEvent *) ece, "component.migration", (EEventTarget *) target);
-
-	retval = TRUE;
-fail:
-	if (on_this_computer)
-		g_object_unref (on_this_computer);
-	if (on_the_web)
-		g_object_unref (on_the_web);
-	if (contacts)
-		g_object_unref (contacts);
-	if (personal_source)
-		g_object_unref (personal_source);
-
-	return retval;
-}
-
-gboolean
-migrate_tasks (TasksComponent *component, int major, int minor, int revision, GError **err)
-{
-	ESourceGroup *on_this_computer = NULL;
-	ESourceGroup *on_the_web = NULL;
-	ESource *personal_source = NULL;
-	gboolean retval = FALSE;
-
-	/* we call this unconditionally now - create_groups either
-	   creates the groups/sources or it finds the necessary
-	   groups/sources. */
-	create_task_sources (component, tasks_component_peek_source_list (component), &on_this_computer, &on_the_web, &personal_source);
-	
-	if (major == 1) {
-		xmlDocPtr config_doc = NULL;
-		char *conf_file;
-		struct stat st;
-
-		conf_file = g_build_filename (g_get_home_dir (), "evolution", "config.xmldb", NULL);
-		if (lstat (conf_file, &st) == 0 && S_ISREG (st.st_mode)) 
-			config_doc = xmlParseFile (conf_file);
-		g_free (conf_file);
-		
-		if (config_doc && minor <= 2) {
-			GConfClient *gconf;	
-			int res = 0;
-			
-			/* move bonobo config to gconf */
-			gconf = gconf_client_get_default ();
-			
-			res = e_bconf_import (gconf, config_doc, task_remap_list);
-			
-			g_object_unref (gconf);
-			
-			xmlFreeDoc(config_doc);
-
-			if (res != 0) {
-				g_set_error(err, 0, 0, _("Unable to migrate old settings from evolution/config.xmldb"));
-				goto fail;
-			}
-		}
-
-		if (minor <= 4) {
-			GSList *migration_dirs, *l;
-			char *path, *local_task_folder;
-			
-			setup_progress_dialog (TRUE);
-			
-			path = g_build_filename (g_get_home_dir (), "evolution", "local", NULL);
-			migration_dirs = e_folder_map_local_folders (path, "tasks");
-			local_task_folder = g_build_filename (path, "Tasks", NULL);
-			g_free (path);
-
-			if (personal_source)
-				migrate_ical_folder_to_source (local_task_folder, personal_source, E_CAL_SOURCE_TYPE_TODO);
-
-			for (l = migration_dirs; l; l = l->next) {
-				char *source_name;
-			
-				if (personal_source && !strcmp ((char*)l->data, local_task_folder))
-					continue;
-
-				source_name = get_source_name (on_this_computer, (char*)l->data);
-
-				if (!migrate_ical_folder (l->data, on_this_computer, source_name, E_CAL_SOURCE_TYPE_TODO)) {
-					/* FIXME: domain/code */
-					g_set_error(err, 0, 0, _("Unable to migrate tasks `%s'"), source_name);
-					g_free(source_name);
-					goto fail;
-				}
-				
-				g_free (source_name);
-			}
-			
-			g_free (local_task_folder);
-
-			dialog_close ();
-		}
-		
-		if (minor < 5 || (minor == 5 && revision <= 10)) {
-			char *old_path, *new_path;
-			
-			old_path = g_build_filename (g_get_home_dir (), "evolution", "local", "Tasks", NULL);
-			new_path = g_build_filename (tasks_component_peek_base_directory (component),
-						     "tasks", "local", "system", NULL);
-			migrate_pilot_data ("tasks", "todo", old_path, new_path);
-			g_free (new_path);
-			g_free (old_path);
-		}
-
-		/* we only need to do this next step if people ran
-		   older versions of 1.5.  We need to clear out the
-		   absolute URI's that were assigned to ESources
-		   during one phase of development, as they take
-		   precedent over relative uris (but aren't updated
-		   when editing an ESource). */
-		if (minor == 5 && revision <= 11) {
-			GSList *g;
-			for (g = e_source_list_peek_groups (tasks_component_peek_source_list (component)); g; g = g->next) {
-				ESourceGroup *group = g->data;
-				GSList *s;
-
-				for (s = e_source_group_peek_sources (group); s; s = s->next) {
-					ESource *source = s->data;
-					e_source_set_absolute_uri (source, NULL);
-				}
-			}
-		}
-	}
-
-	e_source_list_sync (tasks_component_peek_source_list (component), NULL);
-	retval = TRUE;
-fail:
-	if (on_this_computer)
-		g_object_unref (on_this_computer);
-	if (on_the_web)
-		g_object_unref (on_the_web);
-	if (personal_source)
-		g_object_unref (personal_source);
-	
-        return retval;
-}
diff --git a/calendar/gui/migration.h b/calendar/gui/migration.h
deleted file mode 100644
index 1092e30c14..0000000000
--- a/calendar/gui/migration.h
+++ /dev/null
@@ -1,35 +0,0 @@
-/* -*- Mode: C; indent-tabs-mode: t; c-basic-offset: 8; tab-width: 8 -*- */
-/* calendar-component.c
- *
- * Copyright (C) 2003  Ximian, Inc
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of version 2 of the GNU General Public
- * License as published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * General Public License for more details.
- *
- * You should have received a copy of the GNU General Public
- * License along with this program; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
- *
- * Author: Rodrigo Moya <rodrigo@ximian.com>
- */
-
-#ifndef MIGRATION_H
-#define MIGRATION_H
-
-#include <libedataserver/e-source-group.h>
-#include "calendar-component.h"
-#include "tasks-component.h"
-
-struct _GError;
-
-gboolean migrate_calendars (CalendarComponent *component, int major, int minor, int revision, struct _GError **err);
-gboolean migrate_tasks (TasksComponent *component, int major, int minor, int revision, struct _GError **err);
-
-#endif
diff --git a/calendar/gui/misc.c b/calendar/gui/misc.c
deleted file mode 100644
index 332283172b..0000000000
--- a/calendar/gui/misc.c
+++ /dev/null
@@ -1,80 +0,0 @@
-/* Evolution calendar - Miscellaneous utility functions
- *
- * Copyright (C) 2001 Ximian, Inc.
- *
- * Authors: Federico Mena-Quintero <federico@ximian.com>
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of version 2 of the GNU General Public
- * License as published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * General Public License for more details.
- *
- * You should have received a copy of the GNU General Public
- * License along with this program; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
- */
-
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
-
-#include <ctype.h>
-#include <libedataserver/e-url.h>
-#include "misc.h"
-
-
-
-/**
- * string_is_empty:
- * @value: A string.
- * 
- * Returns whether a string is NULL, the empty string, or completely made up of
- * whitespace characters.
- * 
- * Return value: TRUE if the string is empty, FALSE otherwise.
- **/
-gboolean
-string_is_empty (const char *value)
-{
-	const char *p;
-	gboolean empty;
-
-	empty = TRUE;
-
-	if (value) {
-		p = value;
-		while (*p) {
-			if (!isspace ((unsigned char) *p)) {
-				empty = FALSE;
-				break;
-			}
-			p++;
-		}
-	}
-	return empty;
-
-}
-
-/**
- * get_uri_without_password
- */
-char *
-get_uri_without_password (const char *full_uri)
-{
-	EUri *uri;
-	char *uristr;
-
-	uri = e_uri_new (full_uri);
-	if (!uri)
-		return NULL;
-
-	uristr = e_uri_to_string (uri, FALSE);
-	e_uri_free (uri);
-
-	return uristr;
- }
diff --git a/calendar/gui/misc.h b/calendar/gui/misc.h
deleted file mode 100644
index d32739f9f5..0000000000
--- a/calendar/gui/misc.h
+++ /dev/null
@@ -1,30 +0,0 @@
-/* Evolution calendar - Miscellaneous utility functions
- *
- * Copyright (C) 2001 Ximian, Inc.
- *
- * Authors: Federico Mena-Quintero <federico@ximian.com>
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of version 2 of the GNU General Public
- * License as published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * General Public License for more details.
- *
- * You should have received a copy of the GNU General Public
- * License along with this program; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
- */
-
-#ifndef MISC_H
-#define MISC_H
-
-#include <glib.h>
-
-gboolean string_is_empty (const char *value);
-char    *get_uri_without_password (const char *uri);
-
-#endif
diff --git a/calendar/gui/print.c b/calendar/gui/print.c
deleted file mode 100644
index fceb6c06ef..0000000000
--- a/calendar/gui/print.c
+++ /dev/null
@@ -1,2800 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-
-/* Evolution calendar - Print support
- *
- * Copyright (C) 2000 Ximian, Inc.
- *
- * Authors: Michael Zucchi <notzed@ximian.com>
- *          Federico Mena-Quintero <federico@ximian.com>
- *	    Damon Chaplin <damon@ximian.com>
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of version 2 of the GNU General Public
- * License as published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307, USA.
- */
-
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
-
-#include <sys/stat.h>
-#include <sys/time.h>
-#include <math.h>
-#include <string.h>
-#include <time.h>
-#include <glib.h>
-#include <gtk/gtkradiobutton.h>
-#include <libgnome/gnome-i18n.h>
-#include <libgnomeui/gnome-dialog.h>
-#include <libgnomeui/gnome-uidefs.h>
-#include <libgnomeui/gnome-stock-icons.h>
-#include <libgnomeprint/gnome-print.h>
-#include <libgnomeprint/gnome-print-paper.h>
-#include <libgnomeprint/gnome-print-job.h>
-#include <libgnomeprintui/gnome-print-job-preview.h>
-#include <libgnomeprintui/gnome-print-paper-selector.h>
-#include <libgnomeprintui/gnome-print-preview.h>
-#include <libgnomeprintui/gnome-print-dialog.h>
-#include <gal/util/e-util.h>
-#include <e-util/e-dialog-widgets.h>
-#include <e-util/e-time-utils.h>
-#include <e-util/e-print.h>
-#include <libecal/e-cal-time-util.h>
-#include "calendar-commands.h"
-#include "calendar-config.h"
-#include "e-cal-model.h"
-#include "e-day-view.h"
-#include "e-day-view-layout.h"
-#include "e-week-view.h"
-#include "e-week-view-layout.h"
-#include "gnome-cal.h"
-#include "print.h"
-
-
-
-/*
- * Note that most dimensions are in points (1/72 of an inch) since that is
- * what gnome-print uses.
- */
-
-/* GtkHTML prints using a fixed margin. It has code to get the margins from
- * gnome-print keys, but it's commented out. The corresponding code here
- * doesn't seem to work either (getting zero margins), so we adopt
- * gtkhtml's cheat. */
-
-#define TEMP_MARGIN .05
-
-/* The fonts to use */
-#define REGULAR_FONT "Sans Regular"
-#define BOLD_FONT    "Sans Bold"
-
-/* The font size to use for normal text. */
-#define DAY_NORMAL_FONT_SIZE	12
-#define WEEK_NORMAL_FONT_SIZE	12
-#define MONTH_NORMAL_FONT_SIZE	8
-
-/* The height of the header bar across the top of the Day, Week & Month views,
-   which contains the dates shown and the 2 small calendar months. */
-#define HEADER_HEIGHT		80
-
-/* The width of the small calendar months, the space from the right edge of
-   the header rectangle, and the space between the months. */
-#define SMALL_MONTH_WIDTH	80
-#define SMALL_MONTH_PAD		4
-#define SMALL_MONTH_SPACING	12
-
-/* The minimum number of rows we leave space for for the long events in the
-   day view. */
-#define DAY_VIEW_MIN_ROWS_IN_TOP_DISPLAY	2
-
-/* The row height for long events in the day view. */
-#define DAY_VIEW_ROW_HEIGHT		20
-
-/* The minutes per row in the day view printout. */
-#define DAY_VIEW_MINS_PER_ROW		30
-
-#define DAY_VIEW_ROWS			((60 / DAY_VIEW_MINS_PER_ROW) * 24)
-
-/* The width of the column with all the times in it. */
-#define DAY_VIEW_TIME_COLUMN_WIDTH	36
-
-/* The space on the right of each event. */
-#define DAY_VIEW_EVENT_X_PAD		8
-
-/* Allowance for small errors in floating point comparisons. */
-#define EPSILON			0.01
-
-/* The weird month of September 1752, where 3 Sep through 13 Sep were
-   eliminated due to the Gregorian reformation. */
-static const int sept_1752[42] = {
-	 0,  0,  1,  2, 14, 15, 16,
-	17, 18, 19, 20, 21, 22, 23,
-	24, 25, 26, 27, 28, 29, 30,
-	 0,  0,  0,  0,  0,  0,  0,
-	 0,  0,  0,  0,  0,  0,  0,
-	 0,  0,  0,  0,  0,  0,  0
-};
-#define SEPT_1752_START 2		/* Start day within month */
-#define SEPT_1752_END 20		/* End day within month */
-
-
-struct pdinfo
-{
-	gint days_shown;
-	time_t day_starts[E_DAY_VIEW_MAX_DAYS + 1];
-
-	GArray *long_events;
-	GArray *events[E_DAY_VIEW_MAX_DAYS];
-
-	gint start_hour;
-	gint end_hour;
-	gint start_minute_offset;
-	gint end_minute_offset;
-	gint rows;
-	gint mins_per_row;
-	gint8 cols_per_row[DAY_VIEW_ROWS];
-	gboolean use_24_hour_format;
-};
-
-struct psinfo
-{
-	gint days_shown;
-	time_t day_starts[E_WEEK_VIEW_MAX_WEEKS * 7 + 1];
-
-	GArray *events;
-
-	int rows_per_cell;
-	int rows_per_compressed_cell;
-	int display_start_weekday;
-	gboolean multi_week_view;
-	int weeks_shown;
-	int month;
-	gboolean compress_weekend;
-	gboolean use_24_hour_format;
-	double row_height;
-	double header_row_height;
-};
-
-struct ptinfo
-{
-	GList *todos;
-};
-
-struct einfo
-{
-	char *text;
-	time_t start;
-	time_t end;
-	int count;
-};
-
-/* Convenience function to help the transition to timezone functions.
-   It converts a time_t to a struct tm. */
-static struct tm*
-convert_timet_to_struct_tm (time_t time, icaltimezone *zone)
-{
-	static struct tm my_tm;
-	struct icaltimetype tt;
-
-	/* Convert it to an icaltimetype. */
-	tt = icaltime_from_timet_with_zone (time, FALSE, zone);
-
-	/* Fill in the struct tm. */
-	my_tm.tm_year = tt.year - 1900;
-	my_tm.tm_mon = tt.month - 1;
-	my_tm.tm_mday = tt.day;
-	my_tm.tm_hour = tt.hour;
-	my_tm.tm_min = tt.minute;
-	my_tm.tm_sec = tt.second;
-	my_tm.tm_isdst = tt.is_daylight;
-
-	my_tm.tm_wday = time_day_of_week (tt.day, tt.month - 1, tt.year);
-
-	return &my_tm;
-}
-
-
-/* Fills the 42-element days array with the day numbers for the specified month.  Slots outside the
- * bounds of the month are filled with zeros.  The starting and ending indexes of the days are
- * returned in the start and end arguments.
- */
-static void
-build_month (int month, int year, int *days, int *start, int *end)
-{
-	int i;
-	int d_month, d_week, week_start_day;
-
-	/* Note that months are zero-based, so September is month 8 */
-
-	if ((year == 1752) && (month == 8)) {
-		memcpy (days, sept_1752, 42 * sizeof (int));
-
-		if (start)
-			*start = SEPT_1752_START;
-
-		if (end)
-			*end = SEPT_1752_END;
-
-		return;
-	}
-
-	for (i = 0; i < 42; i++)
-		days[i] = 0;
-
-	d_month = time_days_in_month (year, month);
-	/* Get the start weekday in the month, 0=Sun to 6=Sat. */
-	d_week = time_day_of_week (1, month, year);
-
-	/* Get the configuration setting specifying which weekday we put on
-	   the left column, 0=Sun to 6=Sat. */
-	week_start_day = calendar_config_get_week_start_day ();
-
-	/* Figure out which square we want to put the 1 in. */
-	d_week = (d_week + 7 - week_start_day) % 7;
-
-	for (i = 0; i < d_month; i++)
-		days[d_week + i] = i + 1;
-
-	if (start)
-		*start = d_week;
-
-	if (end)
-		*end = d_week + d_month - 1;
-}
-
-static GnomeFont *
-get_font_for_size (double h, GnomeFontWeight weight, gboolean italic)
-{
-	GnomeFontFace *face;
-	GnomeFont *font;
-	double asc, desc, size;
-	gchar *font_name;
-
-	if (weight <= GNOME_FONT_BOOK)
-		font_name = REGULAR_FONT;
-	else
-		font_name = BOLD_FONT;
-
-	if (italic)
-		font_name = g_strconcat (font_name, " Italic", NULL);
-
-	/* This function is broken in gnome-print (it doesn't find a suitable face).
-	 * face = gnome_font_face_find_closest_from_weight_slant (DEFAULT_FONT, weight, italic); */
-	face = gnome_font_face_find (font_name);
-
-	asc = gnome_font_face_get_ascender (face);
-	desc = abs (gnome_font_face_get_descender (face));
-	size = h * 1000 / (asc + desc);
-
-	/* This function is broken in gnome-print (it doesn't find a suitable font).
-	 * font = gnome_font_find_closest_from_weight_slant (DEFAULT_FONT, weight, italic, size); */
-	font = gnome_font_find_closest (font_name, size);
-
-	g_object_unref (face);
-	if (italic)
-		g_free (font_name);
-	return font;
-}
-
-enum align_box {
-	ALIGN_LEFT=1,
-	ALIGN_RIGHT,
-	ALIGN_CENTER,
-	ALIGN_BORDER= 1<<8
-};
-
-
-/* Prints a rectangle, with or without a border, filled or outline, and
-   possibly with triangular arrows at one or both horizontal edges.
-   width      = width of border, -ve means no border.
-   red,green,blue = bgcolor to fill,   -ve means no fill.
-   left_triangle_width, right_triangle_width = width from edge of rectangle to
-          point of triangle, or -ve for no triangle. */
-static void
-print_border_with_triangles (GnomePrintContext *pc,
-			     double l, double r, double t, double b,
-			     double width, double red, double green, double blue,
-			     double left_triangle_width,
-			     double right_triangle_width)
-{
-	gnome_print_gsave (pc);
-
-	/* Fill in the interior of the rectangle, if desired. */
-	if (red >= -EPSILON && green >= -EPSILON && blue >= -EPSILON) {
-		gnome_print_moveto (pc, l, t);
-		if (left_triangle_width > 0.0)
-			gnome_print_lineto (pc, l - left_triangle_width,
-					    (t + b) / 2);
-		gnome_print_lineto (pc, l, b);
-		gnome_print_lineto (pc, r, b);
-		if (right_triangle_width > 0.0)
-			gnome_print_lineto (pc, r + right_triangle_width,
-					    (t + b) / 2);
-		gnome_print_lineto (pc, r, t);
-		gnome_print_closepath (pc);
-		gnome_print_setrgbcolor (pc, red, green, blue);
-		gnome_print_fill (pc);
-	}
-
-	/* Draw the outline, if desired. */
-	if (width >= -EPSILON) {
-		gnome_print_moveto (pc, l, t);
-		if (left_triangle_width > 0.0)
-			gnome_print_lineto (pc, l - left_triangle_width,
-					    (t + b) / 2);
-		gnome_print_lineto (pc, l, b);
-		gnome_print_lineto (pc, r, b);
-		if (right_triangle_width > 0.0)
-			gnome_print_lineto (pc, r + right_triangle_width,
-					    (t + b) / 2);
-		gnome_print_lineto (pc, r, t);
-		gnome_print_closepath (pc);
-		gnome_print_setrgbcolor (pc, 0, 0, 0);
-		gnome_print_setlinewidth (pc, width);
-		gnome_print_stroke (pc);
-	}
-
-	gnome_print_grestore (pc);
-}
-
-
-/* Prints a rectangle, with or without a border, and filled or outline.
-   width      = width of border, -ve means no border.
-   fillcolor = shade of fill,   -ve means no fill. */
-static void
-print_border_rgb (GnomePrintContext *pc,
-	      double l, double r, double t, double b,
-	      double width, double red, double green, double blue)
-{
-	print_border_with_triangles (pc, l, r, t, b, width, red, green, blue, -1.0, -1.0);
-}
-
-static void
-print_border (GnomePrintContext *pc,
-	      double l, double r, double t, double b,
-	      double width, double fillcolor)
-{
-	print_border_rgb (pc, l, r, t, b, width, fillcolor, fillcolor, fillcolor);
-}
-
-static void
-print_rectangle (GnomePrintContext *pc,
-		 double l, double r, double t, double b,
-		 double red, double green, double blue)
-{
-	gnome_print_gsave (pc);
-
-	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_closepath (pc);
-	gnome_print_setrgbcolor (pc, red, green, blue);
-	gnome_print_fill (pc);
-
-	gnome_print_grestore (pc);
-}
-
-/* Prints 1 line of aligned text in a box. It is centered vertically, and
-   the horizontal alignment can be either ALIGN_LEFT, ALIGN_RIGHT, or
-   ALIGN_CENTER. */
-static void
-print_text(GnomePrintContext *pc, GnomeFont *font, const char *text,
-	   enum align_box align, double l, double r, double t, double b)
-{
-	double w, x, y;
-
-	gnome_print_gsave (pc);
-
-	w = gnome_font_get_width_utf8 (font, text);
-
-	switch (align & 3) {
-	case ALIGN_LEFT:
-	default:
-		x = l;
-		break;
-	case ALIGN_RIGHT:
-		x = r - w;
-		break;
-	case ALIGN_CENTER:
-		x = l + ((r - l) - w) / 2;
-		break;
-	}
-
-	/* Make sure we don't go off the left edge. */
-	x = MAX (l, x);
-
-	/* Now calculate the baseline. */
-	y = t - gnome_font_get_ascender (font);
-	
-	/* Set a clipping rectangle. */
-	gnome_print_moveto (pc, l, t);
-	gnome_print_lineto (pc, r, t);
-	gnome_print_lineto (pc, r, b);
-	gnome_print_lineto (pc, l, b);
-	gnome_print_closepath (pc);
-	gnome_print_clip (pc);
-
-	gnome_print_newpath (pc);
-	gnome_print_moveto (pc, x, y);
-	gnome_print_setfont (pc, font);
-	gnome_print_setrgbcolor (pc, 0, 0, 0);
-	gnome_print_show (pc, text);
-
-	gnome_print_grestore (pc);
-}
-
-/* gets/frees the font for you, as a book font */
-static void
-print_text_size(GnomePrintContext *pc, const char *text,
-		     enum align_box align, double l, double r, double t, double b)
-{
-	GnomeFont *font;
-
-	font = get_font_for_size (t - b, GNOME_FONT_BOOK, FALSE);
-	print_text(pc, font, text, align, l, r, t, b);
-	g_object_unref (font);
-}
-
-/* gets/frees the font for you, as a bold font */
-static void
-print_text_size_bold(GnomePrintContext *pc, const char *text,
-		     enum align_box align, double l, double r, double t, double b)
-{
-	GnomeFont *font;
-
-	font = get_font_for_size (t - b, GNOME_FONT_BOLD, FALSE);
-	print_text(pc, font, text, align, l, r, t, b);
-	g_object_unref (font);
-}
-
-static void
-titled_box (GnomePrintContext *pc, const char *text, GnomeFont *font,
-	    enum align_box align, double *l, double *r, double *t, double *b,
-	    double linewidth)
-{
-	double size;
-
-	size = gnome_font_get_size (font);
-
-	if (align & ALIGN_BORDER) {
-		print_border (pc, *l, *r, *t, *t - size * 1.4,
-			      linewidth, 0.9);
-		print_border (pc, *l, *r, *t - size * 1.4, *b,
-			      linewidth, -1.0);
-
-		*l += 2;
-		*r -= 2;
-		*b += 2;
-	}
-
-	print_text (pc, font, text, align, *l, *r, *t, *t - size * 1.4);
-	*t -= size * 1.4;
-}
-
-enum datefmt {
-	DATE_MONTH	= 1 << 0,
-	DATE_DAY	= 1 << 1,
-	DATE_DAYNAME	= 1 << 2,
-	DATE_YEAR	= 1 << 3
-};
-
-static char *days[] = {
-	N_("1st"), N_("2nd"), N_("3rd"), N_("4th"), N_("5th"),
-	N_("6th"), N_("7th"), N_("8th"), N_("9th"), N_("10th"),
-	N_("11th"), N_("12th"), N_("13th"), N_("14th"), N_("15th"),
-	N_("16th"), N_("17th"), N_("18th"), N_("19th"), N_("20th"),
-	N_("21st"), N_("22nd"), N_("23rd"), N_("24th"), N_("25th"),
-	N_("26th"), N_("27th"), N_("28th"), N_("29th"),	N_("30th"),
-	N_("31st")
-};
-
-/*
-  format the date 'nicely' and consistently for various headers
-*/
-static char *
-format_date(time_t time, int flags, char *buffer, int bufflen)
-{
-	icaltimezone *zone = calendar_config_get_icaltimezone ();
-	char fmt[64];
-	struct tm tm;
-
-	tm = *convert_timet_to_struct_tm (time, zone);
-
-	fmt[0] = 0;
-	if (flags & DATE_DAYNAME) {
-		strcat(fmt, "%A");
-	}
-	if (flags & DATE_DAY) {
-		if (flags & DATE_DAYNAME)
-			strcat(fmt, " ");
-		strcat(fmt, gettext(days[tm.tm_mday-1]));
-	}
-	if (flags & DATE_MONTH) {
-		if (flags & (DATE_DAY|DATE_DAYNAME))
-			strcat(fmt, " ");
-		strcat(fmt, "%B");
-		if ((flags & (DATE_DAY|DATE_YEAR)) == (DATE_DAY|DATE_YEAR))
-			strcat(fmt, ",");
-	}
-	if (flags & DATE_YEAR) {
-		if (flags & (DATE_DAY|DATE_DAYNAME|DATE_MONTH))
-			strcat(fmt, " ");
-		strcat(fmt, "%Y");
-	}
-	e_utf8_strftime(buffer, bufflen, fmt, &tm);
-	buffer[bufflen - 1] = '\0';
-
-	return buffer;
-}
-
-static gboolean 
-instance_cb (ECalComponent *comp, time_t instance_start, time_t instance_end, gpointer data)
-{
-	
-	gboolean *found = ((ECalModelGenerateInstancesData *) data)->cb_data;
-	
-	*found = TRUE;
-	
-	return FALSE;
-}
-
-
-/*
-  print out the month small, embolden any days with events.
-*/
-static void
-print_month_small (GnomePrintContext *pc, GnomeCalendar *gcal, time_t month,
-		   double left, double right, double top, double bottom,
-		   int titleflags, time_t greystart, time_t greyend,
-		   int bordertitle)
-{
-	icaltimezone *zone = calendar_config_get_icaltimezone ();
-	ECal *client;
-	GnomeFont *font, *font_bold, *font_normal;
-	time_t now, next;
-	int x, y;
-	int days[42];
-	int day, weekday, week_start_day;
-	char buf[100];
-	struct tm tm;
-	double font_size, max_font_size;
-	double header_size, col_width, row_height, text_xpad, w;
-	double cell_top, cell_bottom, cell_left, cell_right, text_right;
-	char *daynames[] = { N_("Su"), N_("Mo"), N_("Tu"), N_("We"),
-			     N_("Th"), N_("Fr"), N_("Sa") };
-
-	/* Print the title, e.g. 'June 2001', in the top 16% of the area. */
-	format_date (month, titleflags, buf, 100);
-	header_size = (top - bottom) * 0.16;
-	font = get_font_for_size (header_size, GNOME_FONT_BOLD, FALSE);
-	if (bordertitle) {
-		print_border (pc, left, right, top, top - header_size,
-			      1.0, 0.9);
-	}
-	print_text (pc, font, buf, ALIGN_CENTER, left, right,
-		    top, top - header_size);
-	g_object_unref (font);
-
-	top -= header_size;
-
-	client = gnome_calendar_get_default_client (gcal);
-
-	col_width = (right - left) / 7;
-
-	/* The top row with the day abbreviations gets an extra bit of
-	   vertical space around it. */
-	row_height = (top - bottom) / 7.4;
-
-	/* First we need to calculate a reasonable font size. We start with a
-	   rough guess of just under the height of each row. */
-	font_size = row_height;
-
-	/* Check that it isn't going to be too wide. The characters are about
-	   twice as high as they are wide, but we need to fit two characters
-	   into each cell, so we don't want to go over col_width. */
-	max_font_size = col_width * 0.65;
-
-	font_size = row_height;
-
-	/* get month days */
-	tm = *convert_timet_to_struct_tm (month, zone);
-	build_month (tm.tm_mon, tm.tm_year + 1900, days, 0, 0);
-
-	font_normal = get_font_for_size (font_size, GNOME_FONT_BOOK, FALSE);
-	font_bold = get_font_for_size (font_size, GNOME_FONT_BOLD, FALSE);
-
-	/* Get a reasonable estimate of the largest number we will need,
-	   and use it to calculate the offset from the right edge of the
-	   cell that we should put the numbers. */
-	w = gnome_font_get_width_utf8 (font_bold, "23");
-	text_xpad = (col_width - w) / 2;
-
-	gnome_print_setrgbcolor (pc, 0, 0, 0);
-
-	/* Print the abbreviated day names across the top in bold. */
-	week_start_day = calendar_config_get_week_start_day ();
-	weekday = week_start_day;
-	for (x = 0; x < 7; x++) {
-		print_text (pc, font_bold, _(daynames[weekday]), ALIGN_CENTER,
-			    left + x * col_width, left + (x + 1) * col_width,
-			    top, top - row_height * 1.4);
-		weekday = (weekday + 1) % 7;
-	}
-
-	top -= row_height * 1.4;
-
-	now = time_month_begin_with_zone (month, zone);
-	for (y = 0; y < 6; y++) {
-
-		cell_top = top - y * row_height;
-		cell_bottom = cell_top - row_height;
-
-		for (x = 0; x < 7; x++) {
-
-			cell_left = left + x * col_width;
-			/* We add a 0.05 to make sure the cells meet up with
-			   each other. Otherwise you sometimes get lines
-			   between them which looks bad. Maybe I'm not using
-			   coords in the way gnome-print expects. */
-			cell_right = cell_left + col_width + 0.05;
-			text_right = cell_right - text_xpad;
-
-			day = days[y * 7 + x];
-			if (day != 0) {
-				gboolean found = FALSE;
-
-				sprintf (buf, "%d", day);
-
-				/* this is a slow messy way to do this ... but easy ... */
-				e_cal_model_generate_instances (gnome_calendar_get_calendar_model (gcal), now, 
-								time_day_end_with_zone (now, zone),
-								instance_cb, &found);
-				
-				font = found ? font_bold : font_normal;
-
-				next = time_add_day_with_zone (now, 1, zone);
-				if ((now >= greystart && now < greyend)
-				    || (greystart >= now && greystart < next)) {
-					print_border (pc,
-						      cell_left, cell_right,
-						      cell_top, cell_bottom,
-						      -1.0, 0.75);
-				}
-				print_text (pc, font, buf, ALIGN_RIGHT,
-					    cell_left, text_right,
-					    cell_top, cell_bottom);
-
-				now = next;
-			}
-		}
-	}
-	g_object_unref (font_normal);
-	g_object_unref (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;
-
-			dump=0;
-			if (g_utf8_validate (p, strlen(p), NULL)) {
-				width+=gnome_font_get_glyph_width(font, gnome_font_lookup_default (font, c));
-				if (width>maxwidth) {
-					o--;
-					p--;
-					dump=1;
-				}
-			}
-		}
-		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_utf8_sized(font, outbuffer, o-wordstart);
-			o=outbuffer+(o-wordstart);
-			wordstart = outbuffer;
-			top -= gnome_font_get_size (font);
-			if (top<bottom) {
-				/* too much to fit, drop the rest */
-				g_free(outbuffer);
-				return top;
-			}
-			if (first) {
-				left += indent;
-				maxwidth -= indent;
-				first=0;
-			}
-		}
-		p++;
-	}
-	if (dump==0) {
-		*o=0;
-		gnome_print_moveto(pc, left, top);
-		gnome_print_show(pc, outbuffer);
-		top -= gnome_font_get_size (font);
-	}
-	g_free(outbuffer);
-
-	return top;
-}
-
-
-/* Draw the borders, lines, and times down the left of the day view. */
-static void
-print_day_background (GnomePrintContext *pc, GnomeCalendar *gcal,
-		      time_t whence, struct pdinfo *pdi,
-		      double left, double right, double top, double bottom)
-{
-	GnomeFont *font_hour, *font_minute;
-	double yinc, y;
-	double width = DAY_VIEW_TIME_COLUMN_WIDTH;
-	double font_size, max_font_size, hour_font_size, minute_font_size;
-	char buf[20];
-	const char *minute;
-	gboolean use_24_hour;
-	int i, hour, row;
-
-	/* Fill the time column in light-gray. */
-	print_border (pc, left, left + width, top, bottom, -1.0, 0.9);
-
-	/* Draw the border around the entire view. */
-	gnome_print_setrgbcolor (pc, 0, 0, 0);
-	print_border (pc, left, right, top, bottom, 1.0, -1.0);
-
-	/* Draw the vertical line on the right of the time column. */
-	gnome_print_setlinewidth (pc, 0.0);
-	gnome_print_moveto (pc, left + width, bottom);
-	gnome_print_lineto (pc, left + width, top);
-	gnome_print_stroke (pc);
-
-	/* Calculate the row height. */
-	yinc = (top - bottom) / (pdi->end_hour - pdi->start_hour);
-
-        /* Get the 2 fonts we need. */
-	font_size = yinc * 0.6;
-	max_font_size = width * 0.5;
-	hour_font_size = MIN (font_size, max_font_size);
-	font_hour = get_font_for_size (hour_font_size, GNOME_FONT_BOLD, FALSE);
-
-	font_size = yinc * 0.33;
-	max_font_size = width * 0.25;
-	minute_font_size = MIN (font_size, max_font_size);
-	font_minute = get_font_for_size (minute_font_size, GNOME_FONT_BOLD, FALSE);
-
-	use_24_hour = calendar_config_get_24_hour_format ();
-
-	row = 0;
-	for (i = pdi->start_hour; i < pdi->end_hour; i++) {
-		y = top - yinc * (row + 1);
-		gnome_print_setrgbcolor (pc, 0, 0, 0);
-
-		if (use_24_hour) {
-			hour = i;
-			minute = "00";
-		} else {
-			if (i < 12)
-				minute = _("am");
-			else
-				minute = _("pm");
-
-			hour = i % 12;
-			if (hour == 0)
-				hour = 12;
-		}
-
-		/* the hour label/minute */
-		sprintf (buf, "%d", hour);
-		print_text (pc, font_hour, buf, ALIGN_RIGHT,
-			    left, left + width * 0.58,
-			    y + yinc - 4, y + yinc - 4 - hour_font_size);
-		print_text (pc, font_minute, minute, ALIGN_RIGHT,
-			    left, left + width - 3,
-			    y + yinc - 3, y + yinc - 3 - minute_font_size);
-
-		/* Draw the horizontal line between hours, across the entire
-		   width of the day view. */
-		gnome_print_moveto (pc, left, y);
-		gnome_print_lineto (pc, right, y);
-		gnome_print_stroke (pc);
-
-		/* Draw the horizontal line for the 1/2-hours, across the
-		   entire width except for part of the time column. */
-		gnome_print_moveto (pc, left + width * 0.6, y + yinc / 2);
-		gnome_print_lineto (pc, right, y + yinc / 2);
-		gnome_print_stroke (pc);
-
-		row++;
-	}
-
-	g_object_unref (font_hour);
-	g_object_unref (font_minute);
-}
-
-
-/* This adds one event to the view, adding it to the appropriate array. */
-static gint
-print_day_add_event (ECalModelComponent *comp_data,
-		     time_t	    start,
-		     time_t	    end,
-		     gint	    days_shown,
-		     time_t	   *day_starts,
-		     GArray	   *long_events,
-		     GArray	  **events)
-
-{
-	icaltimezone *zone = calendar_config_get_icaltimezone ();
-	EDayViewEvent event;
-	gint day, offset;
-	struct icaltimetype start_tt, end_tt;
-
-#if 0
-	g_print ("Day view lower: %s", ctime (&day_starts[0]));
-	g_print ("Day view upper: %s", ctime (&day_starts[days_shown]));
-	g_print ("Event start: %s", ctime (&start));
-	g_print ("Event end  : %s\n", ctime (&end));
-#endif
-
-	/* Check that the event times are valid. */
-	g_return_val_if_fail (start <= end, -1);
-	g_return_val_if_fail (start < day_starts[days_shown], -1);
-	g_return_val_if_fail (end > day_starts[0], -1);
-
-	start_tt = icaltime_from_timet_with_zone (start, FALSE, zone);
-	end_tt = icaltime_from_timet_with_zone (end, FALSE, zone);
-
-	event.comp_data = comp_data;
-	event.start = start;
-	event.end = end;
-	event.canvas_item = NULL;
-
-	/* Calculate the start & end minute, relative to the top of the
-	   display. */
-	/*offset = day_view->first_hour_shown * 60
-	  + day_view->first_minute_shown;*/
-	offset = 0;
-	event.start_minute = start_tt.hour * 60 + start_tt.minute - offset;
-	event.end_minute = end_tt.hour * 60 + end_tt.minute - offset;
-
-	event.start_row_or_col = 0;
-	event.num_columns = 0;
-
-	/* Find out which array to add the event to. */
-	for (day = 0; day < days_shown; day++) {
-		if (start >= day_starts[day] && end <= day_starts[day + 1]) {
-
-			/* Special case for when the appointment ends at
-			   midnight, i.e. the start of the next day. */
-			if (end == day_starts[day + 1]) {
-
-				/* If the event last the entire day, then we
-				   skip it here so it gets added to the top
-				   canvas. */
-				if (start == day_starts[day])
-				    break;
-
-				event.end_minute = 24 * 60;
-			}
-
-			g_array_append_val (events[day], event);
-			return day;
-		}
-	}
-
-	/* The event wasn't within one day so it must be a long event,
-	   i.e. shown in the top canvas. */
-	g_array_append_val (long_events, event);
-	return E_DAY_VIEW_LONG_EVENT;
-}
-
-
-static gboolean
-print_day_details_cb (ECalComponent *comp, time_t istart, time_t iend,
-		      gpointer data)
-{
-	ECalModelGenerateInstancesData *mdata = (ECalModelGenerateInstancesData *) data;
-	struct pdinfo *pdi = (struct pdinfo *) mdata->cb_data;
-
-	print_day_add_event (mdata->comp_data, istart, iend,
-			     pdi->days_shown, pdi->day_starts,
-			     pdi->long_events, pdi->events);
-
-	return TRUE;
-}
-
-
-static void
-free_event_array (GArray *array)
-{
-	EDayViewEvent *event;
-	gint event_num;
-
-	for (event_num = 0; event_num < array->len; event_num++) {
-		event = &g_array_index (array, EDayViewEvent, event_num);
-		if (event->canvas_item)
-			gtk_object_destroy (GTK_OBJECT (event->canvas_item));
-	}
-
-	g_array_set_size (array, 0);
-}
-
-
-static void
-print_day_long_event (GnomePrintContext *pc, GnomeFont *font,
-		      double left, double right, double top, double bottom,
-		      double row_height, EDayViewEvent *event,
-		      struct pdinfo *pdi, ECalModel *model)
-{
-	const gchar *summary;
-	double x1, x2, y1, y2;
-	double left_triangle_width = -1.0, right_triangle_width = -1.0;
-	char *text;
-	char buffer[32];
-	struct tm date_tm;
-	double red, green, blue;
-
-	/* If the event starts before the first day being printed, draw a
-	   triangle. (Note that I am assuming we are just showing 1 day at
-	   the moment.) */
-	if (event->start < pdi->day_starts[0])
-		left_triangle_width = 4;
-
-	/* If the event ends after the last day being printed, draw a
-	   triangle. */
-	if (event->end > pdi->day_starts[1])
-		right_triangle_width = 4;
-
-	x1 = left + 10;
-	x2 = right - 10;
-	y1 = top - event->start_row_or_col * row_height - 4;
-	y2 = y1 - row_height + 4;
-	red = green = blue = 0.95;
-	e_cal_model_get_rgb_color_for_component (model, event->comp_data, &red, &green, &blue);
-	print_border_with_triangles (pc, x1, x2, y1, y2, 0.5, red, green, blue,
-				     left_triangle_width,
-				     right_triangle_width);
-
-	/* If the event starts after the first day being printed, we need to
-	   print the start time. */
-	if (event->start > pdi->day_starts[0]) {
-		date_tm.tm_year = 2001;
-		date_tm.tm_mon = 0;
-		date_tm.tm_mday = 1;
-		date_tm.tm_hour = event->start_minute / 60;
-		date_tm.tm_min = event->start_minute % 60;
-		date_tm.tm_sec = 0;
-		date_tm.tm_isdst = -1;
-
-		e_time_format_time (&date_tm, pdi->use_24_hour_format, FALSE,
-				    buffer, sizeof (buffer));
-
-		x1 += 4;
-		print_text (pc, font, buffer, ALIGN_LEFT, x1, x2, y1, y2);
-		x1 += gnome_font_get_width_utf8 (font, buffer);
-	}
-
-	/* If the event ends before the end of the last day being printed,
-	   we need to print the end time. */
-	if (event->end < pdi->day_starts[1]) {
-		date_tm.tm_year = 2001;
-		date_tm.tm_mon = 0;
-		date_tm.tm_mday = 1;
-		date_tm.tm_hour = event->end_minute / 60;
-		date_tm.tm_min = event->end_minute % 60;
-		date_tm.tm_sec = 0;
-		date_tm.tm_isdst = -1;
-
-		e_time_format_time (&date_tm, pdi->use_24_hour_format, FALSE,
-				    buffer, sizeof (buffer));
-
-		x2 -= 4;
-		print_text (pc, font, buffer, ALIGN_RIGHT, x1, x2, y1, y2);
-		x2 -= gnome_font_get_width_utf8 (font, buffer);
-	}
-
-	/* Print the text. */
-	summary = icalcomponent_get_summary (event->comp_data->icalcomp);
-	text = summary ? (char*) summary : "";
-
-	x1 += 4;
-	x2 -= 4;
-	print_text (pc, font, text, ALIGN_CENTER, x1, x2, y1, y2);
-}
-
-
-static void
-print_day_event (GnomePrintContext *pc, GnomeFont *font,
-		 double left, double right, double top, double bottom,
-		 EDayViewEvent *event, struct pdinfo *pdi, ECalModel *model)
-{
-	const gchar *summary;
-	double x1, x2, y1, y2, col_width, row_height;
-	int start_offset, end_offset, start_row, end_row;
-	char *text, start_buffer[32], end_buffer[32];
-	gboolean display_times = FALSE, free_text = FALSE;
-	struct tm date_tm;
-	double red, green, blue;
-
-	if ((event->start_minute >= pdi->end_minute_offset)
-	    || (event->end_minute <= pdi->start_minute_offset))
-		return;
-
-	start_offset = event->start_minute - pdi->start_minute_offset;
-	end_offset = event->end_minute - pdi->start_minute_offset;
-
-	start_row = start_offset / pdi->mins_per_row;
-	start_row = MAX (0, start_row);
-	end_row = (end_offset - 1) / pdi->mins_per_row;
-	end_row = MIN (pdi->rows - 1, end_row);
-	col_width = (right - left) / pdi->cols_per_row[event->start_minute / pdi->mins_per_row];
-
-	if (start_offset != start_row * pdi->mins_per_row
-	    || end_offset != (end_row + 1) * pdi->mins_per_row)
-		display_times = TRUE;
-
-	x1 = left + event->start_row_or_col * col_width;
-	x2 = x1 + event->num_columns * col_width - DAY_VIEW_EVENT_X_PAD;
-
-	row_height = (top - bottom) / pdi->rows;
-	y1 = top - start_row * row_height;
-	y2 = top - (end_row + 1) * row_height;
-
-#if 0
-	g_print ("Event: %g,%g %g,%g\n  row_height: %g start_row: %i top: %g rows: %i\n",
-		 x1, y1, x2, y2, row_height, start_row, top, pdi->rows);
-#endif
-
-	red = green = blue = 0.95;
-	e_cal_model_get_rgb_color_for_component (model, event->comp_data, &red, &green, &blue);
-	print_border_rgb (pc, x1, x2, y1, y2, 1.0, red, green, blue);
-
-	summary = icalcomponent_get_summary (event->comp_data->icalcomp);
-	text = summary ? (char*) summary : "";
-
-
-	if (display_times) {
-		date_tm.tm_year = 2001;
-		date_tm.tm_mon = 0;
-		date_tm.tm_mday = 1;
-		date_tm.tm_hour = event->start_minute / 60;
-		date_tm.tm_min = event->start_minute % 60;
-		date_tm.tm_sec = 0;
-		date_tm.tm_isdst = -1;
-
-		e_time_format_time (&date_tm, pdi->use_24_hour_format, FALSE,
-				    start_buffer, sizeof (start_buffer));
-
-		date_tm.tm_hour = event->end_minute / 60;
-		date_tm.tm_min = event->end_minute % 60;
-
-		e_time_format_time (&date_tm, pdi->use_24_hour_format, FALSE,
-				    end_buffer, sizeof (end_buffer));
-
-		text = g_strdup_printf ("%s - %s %s ", start_buffer,
-					end_buffer, text);
-
-		free_text = TRUE;
-	}
-
-	bound_text (pc, font, text, x1 + 2, x2 - 2, y1, y2, 0);
-
-	if (free_text)
-		g_free (text);
-}
-
-
-static void
-print_day_details (GnomePrintContext *pc, GnomeCalendar *gcal, time_t whence,
-		   double left, double right, double top, double bottom)
-{
-	icaltimezone *zone = calendar_config_get_icaltimezone ();
-	EDayViewEvent *event;
-	GnomeFont *font;
-	time_t start, end;
-	struct pdinfo pdi;
-	gint rows_in_top_display, i;
-	double font_size, max_font_size;
-	ECalModel *model = gnome_calendar_get_calendar_model (gcal);
-
-	start = time_day_begin_with_zone (whence, zone);
-	end = time_day_end_with_zone (start, zone);
-
-	pdi.days_shown = 1;
-	pdi.day_starts[0] = start;
-	pdi.day_starts[1] = end;
-	pdi.long_events = g_array_new (FALSE, FALSE, sizeof (EDayViewEvent));
-	pdi.events[0] = g_array_new (FALSE, FALSE, sizeof (EDayViewEvent));
-	pdi.start_hour = calendar_config_get_day_start_hour ();
-	pdi.end_hour = calendar_config_get_day_end_hour ();
-	if (calendar_config_get_day_end_minute () != 0)
-		pdi.end_hour++;
-	pdi.rows = (pdi.end_hour - pdi.start_hour) * 2;
-	pdi.mins_per_row = 30;
-	pdi.start_minute_offset = pdi.start_hour * 60;
-	pdi.end_minute_offset = pdi.end_hour * 60;
-	pdi.use_24_hour_format = calendar_config_get_24_hour_format ();
-
-	/* Get the events from the server. */
-	e_cal_model_generate_instances (model, start, end, print_day_details_cb, &pdi);
-	qsort (pdi.long_events->data, pdi.long_events->len,
-	       sizeof (EDayViewEvent), e_day_view_event_sort_func);
-	qsort (pdi.events[0]->data, pdi.events[0]->len,
-	       sizeof (EDayViewEvent), e_day_view_event_sort_func);
-
-	/* Also print events outside of work hours */
-	if (pdi.events[0]->len > 0) {
-		icaltimezone *zone = calendar_config_get_icaltimezone ();
-		struct icaltimetype tt;
-
-		event = &g_array_index (pdi.events[0], EDayViewEvent, 0);		
-		tt = icaltime_from_timet_with_zone (event->start, FALSE, zone);
-		if (tt.hour < pdi.start_hour)
-			pdi.start_hour = tt.hour;
-		pdi.start_minute_offset = pdi.start_hour * 60;
-
-		event = &g_array_index (pdi.events[0], EDayViewEvent, pdi.events[0]->len - 1);
-		tt = icaltime_from_timet_with_zone (event->end, FALSE, zone);
-		if (tt.hour > pdi.end_hour || tt.hour == 0) {
-			pdi.end_hour = tt.hour ? tt.hour : 24;
-			if (tt.minute > 0)
-				pdi.end_hour++;
-		}
-		pdi.end_minute_offset = pdi.end_hour * 60;
-
-		pdi.rows = (pdi.end_hour - pdi.start_hour) * 2;
-	}
-	
-	/* Lay them out the long events, across the top of the page. */
-	e_day_view_layout_long_events (pdi.long_events, pdi.days_shown,
-				       pdi.day_starts, &rows_in_top_display);
-
-	/* Print the long events. */
-	font = get_font_for_size (12, GNOME_FONT_BOOK, FALSE);
-	for (i = 0; i < pdi.long_events->len; i++) {
-		event = &g_array_index (pdi.long_events, EDayViewEvent, i);
-		print_day_long_event (pc, font, left, right, top, bottom,
-				      DAY_VIEW_ROW_HEIGHT, event, &pdi, model);
-	}
-	g_object_unref (font);
-
-	/* We always leave space for DAY_VIEW_MIN_ROWS_IN_TOP_DISPLAY in the
-	   top display, but we may have more rows than that, in which case
-	   the main display area will be compressed. */
-	rows_in_top_display = MAX (rows_in_top_display,
-				   DAY_VIEW_MIN_ROWS_IN_TOP_DISPLAY);
-
-	/* Draw the border around the long events. */
-	gnome_print_setrgbcolor (pc, 0, 0, 0);
-	print_border (pc, left, right,
-		      top, top - rows_in_top_display * DAY_VIEW_ROW_HEIGHT - 4,
-		      1.0, -1.0);
-
-	/* Adjust the area containing the main display. */
-	top -= rows_in_top_display * DAY_VIEW_ROW_HEIGHT + 4;
-
-	/* Draw the borders, lines, and times down the left. */
-	print_day_background (pc, gcal, whence, &pdi,
-			      left, right, top, bottom);
-
-	/* Now adjust to get rid of the time column. */
-	left += DAY_VIEW_TIME_COLUMN_WIDTH;
-
-	/* Lay out the short events, within the day. */
-	e_day_view_layout_day_events (pdi.events[0], DAY_VIEW_ROWS,
-				      DAY_VIEW_MINS_PER_ROW, pdi.cols_per_row);
-
-	/* Print the short events. */
-	max_font_size = ((top - bottom) / pdi.rows) - 4;
-	font_size = MIN (DAY_NORMAL_FONT_SIZE, max_font_size);
-	font = get_font_for_size (font_size, GNOME_FONT_BOOK, FALSE);
-	for (i = 0; i < pdi.events[0]->len; i++) {
-		event = &g_array_index (pdi.events[0], EDayViewEvent, i);
-		print_day_event (pc, font, left, right, top, bottom,
-				 event, &pdi, model);
-	}
-	g_object_unref (font);
-
-	/* Free everything. */
-	free_event_array (pdi.long_events);
-	g_array_free (pdi.long_events, TRUE);
-	free_event_array (pdi.events[0]);
-	g_array_free (pdi.events[0], TRUE);
-}
-
-/* Returns TRUE if the event is a one-day event (i.e. not a long event). */
-static gboolean
-print_is_one_day_week_event (EWeekViewEvent *event,
-			     EWeekViewEventSpan *span,
-			     time_t *day_starts)
-{
-	if (event->start == day_starts[span->start_day]
-	    && event->end == day_starts[span->start_day + 1])
-		return FALSE;
-
-	if (span->num_days == 1
-	    && event->start >= day_starts[span->start_day]
-	    && event->end <= day_starts[span->start_day + 1])
-		return TRUE;
-
-	return FALSE;
-}
-
-
-static void
-print_week_long_event (GnomePrintContext *pc, GnomeFont *font,
-		       struct psinfo *psi,
-		       double x1, double x2, double y1, double y2,
-		       EWeekViewEvent *event, EWeekViewEventSpan *span,
-		       char *text, double red, double green, double blue)
-{
-	double left_triangle_width = -1.0, right_triangle_width = -1.0;
-	struct tm date_tm;
-	char buffer[32];
-
-	/* If the event starts before the first day of the span, draw a
-	   triangle to indicate it continues. */
-	if (event->start < psi->day_starts[span->start_day])
-		left_triangle_width = 4;
-
-	/* If the event ends after the last day of the span, draw a
-	   triangle. */
-	if (event->end > psi->day_starts[span->start_day + span->num_days])
-		right_triangle_width = 4;
-
-	print_border_with_triangles (pc, x1, x2, y1, y2, 0.5, red, green, blue,
-				     left_triangle_width,
-				     right_triangle_width);
-
-	/* If the event starts after the first day being printed, we need to
-	   print the start time. */
-	if (event->start > psi->day_starts[span->start_day]) {
-		date_tm.tm_year = 2001;
-		date_tm.tm_mon = 0;
-		date_tm.tm_mday = 1;
-		date_tm.tm_hour = event->start_minute / 60;
-		date_tm.tm_min = event->start_minute % 60;
-		date_tm.tm_sec = 0;
-		date_tm.tm_isdst = -1;
-
-		e_time_format_time (&date_tm, psi->use_24_hour_format, FALSE,
-				    buffer, sizeof (buffer));
-
-		x1 += 4;
-		print_text_size (pc, buffer, ALIGN_LEFT, x1, x2, y1, y2);
-		x1 += gnome_font_get_width_utf8 (font, buffer);
-	}
-
-	/* If the event ends before the end of the last day being printed,
-	   we need to print the end time. */
-	if (event->end < psi->day_starts[span->start_day + span->num_days]) {
-		date_tm.tm_year = 2001;
-		date_tm.tm_mon = 0;
-		date_tm.tm_mday = 1;
-		date_tm.tm_hour = event->end_minute / 60;
-		date_tm.tm_min = event->end_minute % 60;
-		date_tm.tm_sec = 0;
-		date_tm.tm_isdst = -1;
-
-		e_time_format_time (&date_tm, psi->use_24_hour_format, FALSE,
-				    buffer, sizeof (buffer));
-
-		x2 -= 4;
-		print_text_size (pc, buffer, ALIGN_RIGHT, x1, x2, y1, y2);
-		x2 -= gnome_font_get_width_utf8 (font, buffer);
-	}
-
-	x1 += 4;
-	x2 -= 4;
-	print_text_size (pc, text, ALIGN_CENTER, x1, x2, y1, y2);
-}
-
-
-static void
-print_week_day_event (GnomePrintContext *pc, GnomeFont *font,
-		      struct psinfo *psi,
-		      double x1, double x2, double y1, double y2,
-		      EWeekViewEvent *event, EWeekViewEventSpan *span,
-		      char *text, double red, double green, double blue)
-{
-	struct tm date_tm;
-	char buffer[32];
-
-	date_tm.tm_year = 2001;
-	date_tm.tm_mon = 0;
-	date_tm.tm_mday = 1;
-	date_tm.tm_hour = event->start_minute / 60;
-	date_tm.tm_min = event->start_minute % 60;
-	date_tm.tm_sec = 0;
-	date_tm.tm_isdst = -1;
-
-	e_time_format_time (&date_tm, psi->use_24_hour_format, FALSE,
-			    buffer, sizeof (buffer));
-
-	print_rectangle (pc, x1, x2, y1, y2, red, green, blue);
-	print_text_size (pc, buffer, ALIGN_LEFT, x1, x2, y1, y2);
-	x1 += gnome_font_get_width_utf8 (font, buffer) + 4;
-	print_text_size (pc, text, ALIGN_LEFT, x1, x2, y1, y2);
-}
-
-
-static void
-print_week_event (GnomePrintContext *pc, GnomeFont *font,
-		  struct psinfo *psi,
-		  double left, double top,
-		  double cell_width, double cell_height,
-		  ECalModel *model,
-		  EWeekViewEvent *event, GArray *spans)
-{
-	EWeekViewEventSpan *span;
-	gint span_num;
-	const gchar *summary;
-	char *text;
-	int num_days, start_x, start_y, start_h, end_x, end_y, end_h;
-	double x1, x2, y1, y2;
-	double red, green, blue;
-
-	summary = icalcomponent_get_summary (event->comp_data->icalcomp);
-	text = summary ? (char*) summary : "";
-
-	for (span_num = 0; span_num < event->num_spans; span_num++) {
-		span = &g_array_index (spans, EWeekViewEventSpan,
-				       event->spans_index + span_num);
-
-		if (e_week_view_layout_get_span_position
-		    (event, span,
-		     psi->rows_per_cell,
-		     psi->rows_per_compressed_cell,
-		     psi->display_start_weekday,
-		     psi->multi_week_view,
-		     psi->compress_weekend,
-		     &num_days)) {
-
-			e_week_view_layout_get_day_position
-				(span->start_day,
-				 psi->multi_week_view,
-				 psi->weeks_shown,
-				 psi->display_start_weekday,
-				 psi->compress_weekend,
-				 &start_x, &start_y, &start_h);
-
-			if (num_days == 1) {
-				end_x = start_x;
-				end_y = start_y;
-				end_h = start_h;
-			} else {
-				e_week_view_layout_get_day_position
-					(span->start_day + num_days - 1,
-					 psi->multi_week_view,
-					 psi->weeks_shown,
-					 psi->display_start_weekday,
-					 psi->compress_weekend,
-					 &end_x, &end_y, &end_h);
-			}
-
-			x1 = left + start_x * cell_width + 6;
-			x2 = left + (end_x + 1) * cell_width - 6;
-			y1 = top - start_y * cell_height
-				- psi->header_row_height
-				- span->row * psi->row_height;
-			y2 = y1 - psi->row_height * 0.9;
-
-			red = .9;
-			green = .9;
-			blue = .9;
-			e_cal_model_get_rgb_color_for_component (model, event->comp_data, &red, &green, &blue);
-			if (print_is_one_day_week_event (event, span,
-							 psi->day_starts)) {
-				print_week_day_event (pc, font, psi,
-						      x1, x2, y1, y2,
-						      event, span, text, red, green, blue);
-			} else {
-				print_week_long_event (pc, font, psi,
-						       x1, x2, y1, y2,
-						       event, span, text, red, green, blue);
-			}
-		}
-	}
-}
-
-
-static void
-print_week_view_background (GnomePrintContext *pc, GnomeFont *font,
-			    struct psinfo *psi,
-			    double left, double top,
-			    double cell_width, double cell_height)
-{
-	icaltimezone *zone = calendar_config_get_icaltimezone ();
-	int day, day_x, day_y, day_h;
-	double x1, x2, y1, y2, font_size, fillcolor;
-	struct tm tm;
-	char *format_string, buffer[128];
-
-	font_size = gnome_font_get_size (font);
-
-	for (day = 0; day < psi->days_shown; day++) {
-		e_week_view_layout_get_day_position
-			(day, psi->multi_week_view, psi->weeks_shown,
-			 psi->display_start_weekday, psi->compress_weekend,
-			 &day_x, &day_y, &day_h);
-
-		x1 = left + day_x * cell_width;
-		x2 = left + (day_x + 1) * cell_width;
-		y1 = top - day_y * cell_height;
-		y2 = y1 - day_h * cell_height;
-
-		tm = *convert_timet_to_struct_tm (psi->day_starts[day], zone);
-
-		/* In the month view we draw a grey background for the end
-		   of the previous month and the start of the following. */
-		fillcolor = -1.0;
-		if (psi->multi_week_view && (tm.tm_mon != psi->month))
-			fillcolor = 0.9;
-
-		print_border (pc, x1, x2, y1, y2, 1.0, fillcolor);
-
-		if (psi->multi_week_view) {
-			if (tm.tm_mday == 1)
-				format_string = _("%d %B");
-			else
-				format_string = "%d";
-		} else {
-			gnome_print_moveto (pc, x1 + 0.1 * cell_width,
-					    y1 - psi->header_row_height + 3);
-			gnome_print_lineto (pc, x2,
-					    y1 - psi->header_row_height + 3);
-			gnome_print_setrgbcolor (pc, 0, 0, 0);
-			gnome_print_setlinewidth (pc, 0.5);
-			gnome_print_stroke (pc);
-
-			/* strftime format %A = full weekday name, %d = day of
-			   month, %B = full month name. You can change the
-			   order but don't change the specifiers or add
-			   anything. */
-			format_string = _("%A %d %B");
-
-		}
-
-		e_utf8_strftime (buffer, sizeof (buffer), format_string, &tm);
-		print_text_size (pc, buffer, ALIGN_RIGHT,
-				 x1, x2 - 4, y1 - 2, y1 - 2 - font_size);
-	}
-}
-
-/* This adds one event to the view, adding it to the appropriate array. */
-static gboolean
-print_week_summary_cb (ECalComponent *comp,
-		       time_t	  start,
-		       time_t	  end,
-		       gpointer	  data)
-
-{
- 	icaltimezone *zone = calendar_config_get_icaltimezone ();
- 	EWeekViewEvent event;
- 	struct icaltimetype start_tt, end_tt;
-	ECalModelGenerateInstancesData *mdata = (ECalModelGenerateInstancesData *) data;
- 	struct psinfo *psi = (struct psinfo *) mdata->cb_data;
-
- 	/* Check that the event times are valid. */
-
-#if 0
-	g_print ("View start:%li end:%li  Event start:%li end:%li\n",
-		 psi->day_starts[0], psi->day_starts[psi->days_shown],
-		 start, end);
-#endif
-
- 	g_return_val_if_fail (start <= end, TRUE);
- 	g_return_val_if_fail (start < psi->day_starts[psi->days_shown], TRUE);
- 	g_return_val_if_fail (end > psi->day_starts[0], TRUE);
-
- 	start_tt = icaltime_from_timet_with_zone (start, FALSE, zone);
- 	end_tt = icaltime_from_timet_with_zone (end, FALSE, zone);
-
-	event.comp_data = e_cal_model_copy_component_data (mdata->comp_data);
-
-	event.start = start;
-	event.end = end;
-	event.spans_index = 0;
-	event.num_spans = 0;
-
-	event.start_minute = start_tt.hour * 60 + start_tt.minute;
-	event.end_minute = end_tt.hour * 60 + end_tt.minute;
-	if (event.end_minute == 0 && start != end)
-		event.end_minute = 24 * 60;
-
-	g_array_append_val (psi->events, event);
-
-	return TRUE;
-}
-
-static void
-print_week_summary (GnomePrintContext *pc, GnomeCalendar *gcal,
-		    time_t whence, gboolean multi_week_view, int weeks_shown,
-		    int month, double font_size,
-		    double left, double right, double top, double bottom)
-{
-	icaltimezone *zone = calendar_config_get_icaltimezone ();
-	EWeekViewEvent *event;
-	struct psinfo psi;
-	time_t day_start;
-	gint rows_per_day[E_WEEK_VIEW_MAX_WEEKS * 7], day, event_num;
-	GArray *spans;
-	GnomeFont *font;
-	double cell_width, cell_height;
-	ECalModel *model = gnome_calendar_get_calendar_model (gcal);
-
-	psi.days_shown = weeks_shown * 7;
-	psi.events = g_array_new (FALSE, FALSE, sizeof (EWeekViewEvent));
-	psi.multi_week_view = multi_week_view;
-	psi.weeks_shown = weeks_shown;
-	psi.month = month;
-
-	/* Get a few config settings. */
-	if (multi_week_view)
-		psi.compress_weekend = calendar_config_get_compress_weekend ();
-	else
-		psi.compress_weekend = TRUE;
-	psi.use_24_hour_format = calendar_config_get_24_hour_format ();
-
-	/* We convert this from (0 = Sun, 6 = Sat) to (0 = Mon, 6 = Sun). */
-	psi.display_start_weekday = calendar_config_get_week_start_day ();
-	psi.display_start_weekday = (psi.display_start_weekday + 6) % 7;
-
-	/* If weekends are compressed then we can't start on a Sunday. */
-	if (psi.compress_weekend && psi.display_start_weekday == 6)
-		psi.display_start_weekday = 5;
-
-	day_start = time_day_begin_with_zone (whence, zone);
-	for (day = 0; day <= psi.days_shown; day++) {
-		psi.day_starts[day] = day_start;
-		day_start = time_add_day_with_zone (day_start, 1, zone);
-	}
-
-	/* Get the events from the server. */
-	e_cal_model_generate_instances (model,
-					psi.day_starts[0], psi.day_starts[psi.days_shown],
-					print_week_summary_cb, &psi);
-	qsort (psi.events->data, psi.events->len,
-	       sizeof (EWeekViewEvent), e_week_view_event_sort_func);
-
-	/* Layout the events. */
-	spans = e_week_view_layout_events (psi.events, NULL,
-					   psi.multi_week_view,
-					   psi.weeks_shown,
-					   psi.compress_weekend,
-					   psi.display_start_weekday,
-					   psi.day_starts, rows_per_day);
-
-	/* Calculate the size of the cells. */
-	if (multi_week_view) {
-		cell_width = (right - left) / (psi.compress_weekend ? 6 : 7);
-		cell_height = (top - bottom) / (weeks_shown * 2);
-	} else {
-		cell_width = (right - left) / 2;
-		cell_height = (top - bottom) / 6;
-	}
-
-	/* Calculate the row height, using the normal font and with room for
-	   space or a rectangle around it. */
-	psi.row_height = font_size * 1.2;
-	psi.header_row_height = font_size * 1.5;
-
-	/* Calculate how many rows we can fit into each type of cell. */
-	psi.rows_per_cell = ((cell_height * 2) - psi.header_row_height)
-		/ psi.row_height;
-	psi.rows_per_compressed_cell = (cell_height - psi.header_row_height)
-		/ psi.row_height;
-
-	font = get_font_for_size (font_size, GNOME_FONT_BOOK, FALSE);
-
-	/* Draw the grid and the day names/numbers. */
-	print_week_view_background (pc, font, &psi, left, top,
-				    cell_width, cell_height);
-
-	/* Print the events. */
-	for (event_num = 0; event_num < psi.events->len; event_num++) {
-		event = &g_array_index (psi.events, EWeekViewEvent, event_num);
-		print_week_event (pc, font, &psi, left, top,
-				  cell_width, cell_height, model, event, spans);
-	}
-
-	g_object_unref (font);
-
-	/* Free everything. */
-	for (event_num = 0; event_num < psi.events->len; event_num++) {
-		event = &g_array_index (psi.events, EWeekViewEvent, event_num);
-	}
-	g_array_free (psi.events, TRUE);
-	g_array_free (spans, TRUE);
-}
-
-
-static void
-print_year_summary (GnomePrintContext *pc, GnomeCalendar *gcal, time_t whence,
-		    double left, double right, double top, double bottom,
-		    int morerows)
-{
-	icaltimezone *zone = calendar_config_get_icaltimezone ();
-	double row_height, col_width, l, r, t, b;
-	time_t now;
-	int col, row, rows, cols;
-
-	l = left;
-	t = top;
-
-	/* If morerows is set we do 4 rows and 3 columns instead of 3 rows and
-	   4 columns. This is useful if we switch paper orientation. */
-	if (morerows) {
-		rows = 4;
-		cols = 3;
-	} else {
-		rows = 3;
-		cols = 4;
-	}
-
-	row_height = (top - bottom) / rows;
-	col_width = (right - left) / cols;
-	r = l + col_width;
-	b = top - row_height;
-	now = time_year_begin_with_zone (whence, zone);
-
-	for (row = 0; row < rows; row++) {
-		t = top - row_height * row;
-		b = t - row_height;
-		for (col = 0; col < cols; col++) {
-			l = left + col_width * col;
-			r = l + col_width;
-			print_month_small (pc, gcal, now,
-					   l + 8, r - 8, t - 8, b + 8,
-					   DATE_MONTH, 0, 0, TRUE);
-			now = time_add_month_with_zone (now, 1, zone);
-		}
-	}
-}
-
-static void
-print_month_summary (GnomePrintContext *pc, GnomeCalendar *gcal, time_t whence,
-		     double left, double right, double top, double bottom)
-{
-	icaltimezone *zone = calendar_config_get_icaltimezone ();
-	time_t date;
-	struct tm tm;
-	struct icaltimetype tt;
-	char buffer[100];
-	GnomeFont *font;
-	gboolean compress_weekend;
-	int columns, col, weekday, len, month;
-	double font_size, cell_width, x1, x2, y1, y2;
-
-	weekday = calendar_config_get_week_start_day ();
-	compress_weekend = calendar_config_get_compress_weekend ();
-
-	/* Remember which month we want. */
-	tt = icaltime_from_timet_with_zone (whence, FALSE, zone);
-	month = tt.month - 1;
-
-	/* Find the start of the month, and then the start of the week on
-	   or before that day. */
-	date = time_month_begin_with_zone (whence, zone);
-	date = time_week_begin_with_zone (date, weekday, zone);
-
-	/* If weekends are compressed then we can't start on a Sunday. */
-	if (compress_weekend && weekday == 0)
-		date = time_add_day_with_zone (date, -1, zone);
-
-	/* do day names ... */
-
-	/* We are only interested in outputting the weekday here, but we want
-	   to be able to step through the week without worrying about
-	   overflows making strftime choke, so we move near to the start of
-	   the month. */
-	tm = *convert_timet_to_struct_tm (date, zone);
-	tm.tm_mday = (tm.tm_mday % 7) + 7;
-
-	font = get_font_for_size (MONTH_NORMAL_FONT_SIZE, GNOME_FONT_BOLD, FALSE);
-	font_size = gnome_font_get_size (font);
-	gnome_print_setfont (pc, font);
-
-	columns = compress_weekend ? 6 : 7;
-	cell_width = (right - left) / columns;
-	y1 = top;
-	y2 = top - font_size * 1.5;
-
-	for (col = 0; col < columns; col++) {
-		if (tm.tm_wday == 6 && compress_weekend) {
-			e_utf8_strftime (buffer, sizeof (buffer), "%a/", &tm);
-			len = strlen (buffer);
-			tm.tm_mday++;
-			tm.tm_wday = (tm.tm_wday + 1) % 7;
-			e_utf8_strftime (buffer + len, sizeof (buffer) - len,
-				  "%a", &tm);
-		} else {
-			e_utf8_strftime (buffer, sizeof (buffer), "%A", &tm);
-		}
-
-		x1 = left + cell_width * col;
-		x2 = x1 + cell_width;
-
-		print_border (pc, x1, x2, y1, y2, 1.0, -1.0);
-		print_text_size (pc, buffer, ALIGN_CENTER, x1, x2, y1, y2);
-
-		tm.tm_mday++;
-		tm.tm_wday = (tm.tm_wday + 1) % 7;
-	}
-	g_object_unref (font);
-
-	top = y2;
-	print_week_summary (pc, gcal, date, TRUE, 6, month,
-			    MONTH_NORMAL_FONT_SIZE,
-			    left, right, top, bottom);
-}
-
-
-static void
-print_todo_details (GnomePrintContext *pc, GnomeCalendar *gcal,
-		    time_t start, time_t end,
-		    double left, double right, double top, double bottom)
-{
-	ECal *client;
-	GnomeFont *font_summary;
-	double y, yend, x, xend;
-	struct icaltimetype *tt;
-	ECalendarTable *task_pad;
-	ETable *table;
-	ECalModel *model;
-	gint rows, row;
-
-	/* We get the tasks directly from the TaskPad ETable. This means we
-	   get them filtered & sorted for free. */
-	task_pad = gnome_calendar_get_task_pad (gcal);
-	table = e_calendar_table_get_table (task_pad);
-	model = e_calendar_table_get_model (task_pad);
-	client = e_cal_model_get_default_client (model);
-
-	font_summary = get_font_for_size (10, GNOME_FONT_BOOK, FALSE);
-
-	gnome_print_setrgbcolor (pc, 0, 0, 0);
-	gnome_print_setlinewidth (pc, 0.0);
-
-	titled_box (pc, _("Tasks"), font_summary, ALIGN_CENTER | ALIGN_BORDER,
-		    &left, &right, &top, &bottom, 1.0);
-
-	y = top - 3;
-	yend = bottom - 2;
-
-	rows = e_table_model_row_count (E_TABLE_MODEL (model));
-	for (row = 0; row < rows; row++) {
-		ECalModelComponent *comp_data;
-		ECalComponent *comp;
-		ECalComponentText summary;
-		int model_row;
-
-		model_row = e_table_view_to_model_row (table, row);
-		comp_data = e_cal_model_get_component_at (model, model_row);
-		if (!comp_data)
-			continue;
-
-		comp = e_cal_component_new ();
-		e_cal_component_set_icalcomponent (comp, icalcomponent_new_clone (comp_data->icalcomp));
-
-		e_cal_component_get_summary (comp, &summary);
-		if (!summary.value) {
-			g_object_unref (comp);
-			continue;
-		}
-
-		x = left;
-		xend = right - 2;
-
-		if (y < bottom)
-			break;
-
-		/* Print the box to put the tick in. */
-		print_border (pc, x + 2, x + 8, y - 3, y - 11, 0.1, -1.0);
-
-		/* If the task is complete, print a tick in the box. */
-		e_cal_component_get_completed (comp, &tt);
-		if (tt) {
-			e_cal_component_free_icaltimetype (tt);
-
-			gnome_print_setrgbcolor (pc, 0, 0, 0);
-			gnome_print_setlinewidth (pc, 1.0);
-			gnome_print_moveto (pc, x + 3, y - 8);
-			gnome_print_lineto (pc, x + 5, y - 10);
-			gnome_print_lineto (pc, x + 7, y - 3.5);
-			gnome_print_stroke (pc);
-		}
-
-		y = bound_text (pc, font_summary, summary.value,
-				x + 10, xend, y, yend, 0);
-		y += gnome_font_get_size (font_summary) - 6;
-		gnome_print_moveto (pc, x, y);
-		gnome_print_lineto (pc, xend, y);
-		gnome_print_stroke (pc);
-		y -= 3;
-
-		g_object_unref (comp);
-	}
-
-	g_object_unref (font_summary);
-}
-
-
-/* Value for the PrintView enum */
-static const int print_view_map[] = {
-	PRINT_VIEW_DAY,
-	PRINT_VIEW_WEEK,
-	PRINT_VIEW_MONTH,
-	PRINT_VIEW_YEAR,
-	-1
-};
-
-/* Creates the range selector widget for printing a calendar */
-static GtkWidget *
-range_selector_new (GtkWidget *dialog, time_t at, int *view)
-{
-	icaltimezone *zone = calendar_config_get_icaltimezone ();
-	GtkWidget *box;
-	GtkWidget *radio;
-	GSList *group;
-	char text[1024];
-	char str1[512];
-	char str2[512];
-	struct tm tm;
-	time_t week_begin, week_end;
-	struct tm week_begin_tm, week_end_tm;
-	gint week_start_day;
-
-	box = gtk_vbox_new (FALSE, GNOME_PAD_SMALL);
-
-	tm = *convert_timet_to_struct_tm (at, zone);
-
-	/* Day */
-
-	e_utf8_strftime (text, sizeof (text), _("Selected day (%a %b %d %Y)"), &tm);
-	radio = gtk_radio_button_new_with_label (NULL, text);
-	group = gtk_radio_button_group (GTK_RADIO_BUTTON (radio));
-	gtk_box_pack_start (GTK_BOX (box), radio, FALSE, FALSE, 0);
-
-	/* Week */
-
-	week_start_day = calendar_config_get_week_start_day ();
-	week_begin = time_week_begin_with_zone (at, week_start_day, zone);
-	/* If the week starts on a Sunday, we have to show the Saturday first,
-	   since the weekend is compressed. If the original date passed in was
-	   a Saturday, we need to move on to the next Saturday, else we move
-	   back to the last one. */
-	if (week_start_day == 0) {
-		if (tm.tm_wday == 6)
-			week_begin = time_add_day_with_zone (week_begin, 6, zone);
-		else
-			week_begin = time_add_day_with_zone (week_begin, -1, zone);
-	}
-	week_end = time_add_day_with_zone (week_begin, 6, zone);
-
-	week_begin_tm = *convert_timet_to_struct_tm (week_begin, zone);
-	week_end_tm = *convert_timet_to_struct_tm (week_end, zone);
-
-	if (week_begin_tm.tm_mon == week_end_tm.tm_mon) {
-		e_utf8_strftime (str1, sizeof (str1), _("%a %b %d"), &week_begin_tm);
-		e_utf8_strftime (str2, sizeof (str2), _("%a %d %Y"), &week_end_tm);
-	} else {
-		if (week_begin_tm.tm_year == week_end_tm.tm_year) {
-			e_utf8_strftime (str1, sizeof (str1), _("%a %b %d"), &week_begin_tm);
-			e_utf8_strftime (str2, sizeof (str2), _("%a %b %d %Y"), &week_end_tm);
-		} else {
-			e_utf8_strftime (str1, sizeof (str1), _("%a %b %d %Y"), &week_begin_tm);
-			e_utf8_strftime (str2, sizeof (str2), _("%a %b %d %Y"), &week_end_tm);
-		}
-	}
-
-	g_snprintf (text, sizeof (text), _("Selected 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 */
-
-	e_utf8_strftime (text, sizeof (text), _("Selected 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 */
-
-	e_utf8_strftime (text, sizeof (text), _("Selected year (%Y)"), &tm);
-	radio = gtk_radio_button_new_with_label (group, text);
-	group = gtk_radio_button_group (GTK_RADIO_BUTTON (radio));
-	gtk_box_pack_start (GTK_BOX (box), radio, FALSE, FALSE, 0);
-
-	/* Select default */
-
-	e_dialog_widget_hook_value (dialog, radio, view, (gpointer) print_view_map);
-
-	gtk_widget_show_all (box);
-	return box;
-}
-
-
-static void
-print_day_view (GnomePrintContext *pc, GnomeCalendar *gcal, time_t date,
-		double left, double right, double top, double bottom)
-{
-	icaltimezone *zone = calendar_config_get_icaltimezone ();
-	int i, days = 1;
-	double todo, header, l;
-	char buf[100];
-
-	for (i = 0; i < days; i++) {
-		todo = (right - left) * 0.75 + left;
-		header = top - HEADER_HEIGHT;
-
-		gnome_print_beginpage (pc, NULL);
-
-		/* Print the main view with all the events in. */
-		print_day_details (pc, gcal, date,
-				   left, todo - 2.0, header, bottom);
-
-		/* Print the TaskPad down the right. */
-		print_todo_details (pc, gcal, 0, INT_MAX,
-				    todo, right, header, bottom);
-
-		/* Print the filled border around the header. */
-		print_border (pc, left, right, top, header + 2.0, 1.0, 0.9);
-
-		/* Print the 2 mini calendar-months. */
-		l = right - SMALL_MONTH_PAD - SMALL_MONTH_WIDTH * 2
-			- SMALL_MONTH_SPACING;
-		print_month_small (pc, gcal, date,
-				   l, l + SMALL_MONTH_WIDTH,
-				   top - 4, header + 4,
-				   DATE_MONTH | DATE_YEAR, date, date, FALSE);
-
-		l += SMALL_MONTH_SPACING + SMALL_MONTH_WIDTH;
-		print_month_small (pc, gcal,
-				   time_add_month_with_zone (date, 1, zone),
-				   l, l + SMALL_MONTH_WIDTH,
-				   top - 4, header + 4,
-				   DATE_MONTH | DATE_YEAR, 0, 0, FALSE);
-
-		/* Print the date, e.g. '8th May, 2001'. */
-		format_date (date, DATE_DAY | DATE_MONTH | DATE_YEAR,
-			     buf, 100);
-		print_text_size_bold (pc, buf, ALIGN_LEFT,
-				      left + 4, todo, top - 4, top - 4 - 24);
-
-		/* Print the day, e.g. 'Tuesday'. */
-		format_date (date, DATE_DAYNAME, buf, 100);
-		print_text_size_bold (pc, buf, ALIGN_LEFT,
-				 left + 4, todo, top - 32, top - 32 - 18);
-
-		gnome_print_showpage (pc);
-		date = time_add_day_with_zone (date, 1, zone);
-	}
-}
-
-
-static void
-print_week_view (GnomePrintContext *pc, GnomeCalendar *gcal, time_t date,
-		 double left, double right, double top, double bottom)
-{
-	icaltimezone *zone = calendar_config_get_icaltimezone ();
-	double header, l;
-	char buf[100];
-	time_t when;
-	gint week_start_day;
-	struct tm tm;
-
-	header = top - HEADER_HEIGHT;
-
-	gnome_print_beginpage (pc, NULL);
-
-	tm = *convert_timet_to_struct_tm (date, zone);
-	week_start_day = calendar_config_get_week_start_day ();
-	when = time_week_begin_with_zone (date, week_start_day, zone);
-	/* If the week starts on a Sunday, we have to show the Saturday first,
-	   since the weekend is compressed. */
-	if (week_start_day == 0) {
-		if (tm.tm_wday == 6)
-			when = time_add_day_with_zone (when, 6, zone);
-		else
-			when = time_add_day_with_zone (when, -1, zone);
-	}
-
-	/* Print the main week view. */
-	print_week_summary (pc, gcal, when, FALSE, 1, 0,
-			    WEEK_NORMAL_FONT_SIZE,
-			    left, right, header, bottom);
-
-	/* Print the border around the main view. */
-	print_border (pc, left, right, header, bottom, 1.0, -1.0);
-
-	/* Print the border around the header area. */
-	print_border (pc, left, right, top, header + 2.0, 1.0, 0.9);
-
-	/* Print the 2 mini calendar-months. */
-	l = right - SMALL_MONTH_PAD - SMALL_MONTH_WIDTH * 2
-		- SMALL_MONTH_SPACING;
-	print_month_small (pc, gcal, when,
-			   l, l + SMALL_MONTH_WIDTH,
-			   top - 4, header + 4,
-			   DATE_MONTH | DATE_YEAR, when,
-			   time_add_week_with_zone (when, 1, zone), FALSE);
-
-	l += SMALL_MONTH_SPACING + SMALL_MONTH_WIDTH;
-	print_month_small (pc, gcal,
-			   time_add_month_with_zone (when, 1, zone),
-			   l, l + SMALL_MONTH_WIDTH,
-			   top - 4, header + 4,
-			   DATE_MONTH | DATE_YEAR, when,
-			   time_add_week_with_zone (when, 1, zone), FALSE);
-
-	/* Print the start day of the week, e.g. '7th May 2001'. */
-	format_date (when, DATE_DAY | DATE_MONTH | DATE_YEAR, buf, 100);
-	print_text_size_bold (pc, buf, ALIGN_LEFT,
-			      left + 3, right, top - 4, top - 4 - 24);
-	
-	/* Print the end day of the week, e.g. '13th May 2001'. */
-	when = time_add_day_with_zone (when, 6, zone);
-	format_date (when, DATE_DAY | DATE_MONTH | DATE_YEAR, buf, 100);
-	print_text_size_bold (pc, buf, ALIGN_LEFT,
-			      left + 3, right, top - 24 - 3, top - 24 - 3 - 24);
-
-	gnome_print_showpage (pc);
-}
-
-
-static void
-print_month_view (GnomePrintContext *pc, GnomeCalendar *gcal, time_t date,
-		  double left, double right, double top, double bottom)
-{
-	icaltimezone *zone = calendar_config_get_icaltimezone ();
-	double header;
-	char buf[100];
-
-	header = top - HEADER_HEIGHT;
-
-	gnome_print_beginpage (pc, NULL);
-
-	/* Print the main month view. */
-	print_month_summary (pc, gcal, date, left, right, header, bottom);
-
-	/* Print the border around the header. */
-	print_border (pc, left, right, top, header, 1.0, 0.9);
-
-	/* Print the 2 mini calendar-months. */
-	print_month_small (pc, gcal,
-			   time_add_month_with_zone (date, 1, zone),
-			   right - (right - left) / 7 + 2, right - 8,
-			   top - 4, header,
-			   DATE_MONTH | DATE_YEAR, 0, 0, FALSE);
-	print_month_small (pc, gcal,
-			   time_add_month_with_zone (date, -1, zone),
-			   left + 8, left + (right - left) / 7 - 2,
-			   top - 4, header,
-			   DATE_MONTH | DATE_YEAR, 0, 0, FALSE);
-
-	/* Print the month, e.g. 'May 2001'. */
-	format_date (date, DATE_MONTH | DATE_YEAR, buf, 100);
-	print_text_size_bold (pc, buf, ALIGN_CENTER,
-			      left + 3, right - 3, top - 3, top - 3 - 24);
-
-	gnome_print_showpage (pc);
-}
-
-
-static void
-print_year_view (GnomePrintContext *pc, GnomeCalendar *gcal, time_t date,
-		 double left, double right, double top, double bottom)
-{
-	char buf[100];
-
-	gnome_print_beginpage (pc, NULL);
-
-	print_year_summary (pc, gcal, date, left, right, top - 50, bottom,
-			    TRUE);
-
-	/* centered title */
-	format_date (date, DATE_YEAR, buf, 100);
-	print_text_size_bold (pc, buf, ALIGN_CENTER,
-			      left+3, right, top-3, top - 27);
-
-	gnome_print_showpage (pc);
-}
-
-static void
-write_label_piece (time_t t, char *buffer, int size, char *stext, char *etext)
-{
-	icaltimezone *zone = calendar_config_get_icaltimezone ();
-	struct tm *tmp_tm;
-	int len;
-
-	tmp_tm = convert_timet_to_struct_tm (t, zone);
-
-	if (stext != NULL)
-		strcat (buffer, stext);
-
-	len = strlen (buffer);
-	e_time_format_date_and_time (tmp_tm,
-				     calendar_config_get_24_hour_format (),
-				     FALSE, FALSE,
-				     &buffer[len], size - len);
-	if (etext != NULL)
-		strcat (buffer, etext);
-}
-
-static icaltimezone*
-get_zone_from_tzid (ECal *client, const char *tzid)
-{
-	icaltimezone *zone;
-
-	/* Note that the timezones may not be on the server, so we try to get
-	   the builtin timezone with the TZID first. */
-	zone = icaltimezone_get_builtin_timezone_from_tzid (tzid);
-	if (!zone) {
-		if (!e_cal_get_timezone (client, tzid, &zone, NULL)) 
-			/* FIXME: Handle error better. */
-			g_warning ("Couldn't get timezone from server: %s",
-				   tzid ? tzid : "");
-	}
-
-	return zone;
-}
-
-static void
-print_date_label (GnomePrintContext *pc, ECalComponent *comp, ECal *client,
-		  double left, double right, double top, double bottom)
-{
-	icaltimezone *start_zone, *end_zone, *due_zone, *completed_zone;
-	ECalComponentDateTime datetime;
-	time_t start = 0, end = 0, complete = 0, due = 0;
-	static char buffer[1024];
-
-	e_cal_component_get_dtstart (comp, &datetime);
-	if (datetime.value) {
-		start_zone = get_zone_from_tzid (client, datetime.tzid);
-		if (!start_zone || datetime.value->is_date)
-			start_zone = calendar_config_get_icaltimezone ();
-		start = icaltime_as_timet_with_zone (*datetime.value,
-						     start_zone);
-	}
-	e_cal_component_free_datetime (&datetime);
-
-	e_cal_component_get_dtend (comp, &datetime);
-	if (datetime.value) {
-		end_zone = get_zone_from_tzid (client, datetime.tzid);
-		if (!end_zone || datetime.value->is_date)
-			end_zone = calendar_config_get_icaltimezone ();
-		end = icaltime_as_timet_with_zone (*datetime.value,
-						   end_zone);
-	}
-	e_cal_component_free_datetime (&datetime);
-
-	e_cal_component_get_due (comp, &datetime);
-	if (datetime.value) {
-		due_zone = get_zone_from_tzid (client, datetime.tzid);
-		if (!due_zone || datetime.value->is_date)
-			due_zone = calendar_config_get_icaltimezone ();
-		due = icaltime_as_timet_with_zone (*datetime.value,
-						   due_zone);
-	}
-	e_cal_component_free_datetime (&datetime);
-
-	e_cal_component_get_completed (comp, &datetime.value);
-	if (datetime.value) {
-		completed_zone = icaltimezone_get_utc_timezone ();
-		complete = icaltime_as_timet_with_zone (*datetime.value,
-							completed_zone);
-		e_cal_component_free_icaltimetype (datetime.value);
-	}
-
-	buffer[0] = '\0';
-
-	if (start > 0)
-		write_label_piece (start, buffer, 1024, NULL, NULL);
-
-	if (end > 0 && start > 0)
-		write_label_piece (end, buffer, 1024, _(" to "), NULL);
-
-	if (complete > 0) {
-		if (start > 0)
-			write_label_piece (complete, buffer, 1024, _(" (Completed "), ")");
-		else
-			write_label_piece (complete, buffer, 1024, _("Completed "), NULL);
-	}
-
-	if (due > 0 && complete == 0) {
-		if (start > 0)
-			write_label_piece (due, buffer, 1024, _(" (Due "), ")");
-		else
-			write_label_piece (due, buffer, 1024, _("Due "), NULL);
-	}
-
-	print_text_size_bold (pc, buffer, ALIGN_LEFT,
-			      left, right, top, top - 15);
-}
-
-static void
-print_comp_item (GnomePrintContext *pc, ECalComponent *comp, ECal *client,
-		 double left, double right, double top, double bottom)
-{
-	GnomeFont *font;
-	ECalComponentVType vtype;
-	ECalComponentText text;
-	GSList *desc, *l;
-	const char *title, *categories, *location;
-	char *categories_string, *location_string, *summary_string;
-	GSList *contact_list, *elem;
-	gint header_size;
-
-	vtype = e_cal_component_get_vtype (comp);
-
-	/* We should only be asked to print VEVENTs or VTODOs. */
-	if (vtype == E_CAL_COMPONENT_EVENT)
-		title = _("Appointment");
-	else if (vtype == E_CAL_COMPONENT_TODO)
-		title = _("Task");
-	else
-		return;
-
-	gnome_print_beginpage (pc, NULL);
-
-	/* Print the title in a box at the top of the page. */
-	font = get_font_for_size (18, GNOME_FONT_BOLD, FALSE);
-	header_size = 50;
-	print_border (pc, left, right, top, top - header_size,
-		      1.0, 0.9);
-	print_text (pc, font, title, ALIGN_CENTER, left, right,
-		    top - header_size * 0.1, top - header_size);
-	g_object_unref (font);
-
-	top -= header_size + 10;
-
-	/* Summary */
-	font = get_font_for_size (18, GNOME_FONT_BOLD, FALSE);
-	e_cal_component_get_summary (comp, &text);
-	summary_string = g_strdup_printf (_("Summary: %s"), text.value);
-	top = bound_text (pc, font, summary_string, left, right,
-			  top - 3, bottom, 0);
-	g_free (summary_string);
-
-	/* Location */
-	e_cal_component_get_location (comp, &location);
-	if (location && location[0]) {
-		location_string = g_strdup_printf (_("Location: %s"),
-						   location);
-		top = bound_text (pc, font, location_string, left, right,
-				  top - 3, bottom, 0);
-		g_free (location_string);
-	}
-	g_object_unref (font);
-
-	/* Date information */
-	print_date_label (pc, comp, client, left, right, top-3, top - 15);
-	top -= 20;
-
-	font = get_font_for_size (12, GNOME_FONT_BOOK, FALSE);
-
-	/* For a VTODO we print the Status, Priority, % Complete and URL. */
-	if (vtype == E_CAL_COMPONENT_TODO) {
-		icalproperty_status status;
-		const char *status_string = NULL;
-		int *percent;
-		int *priority;
-		const char *url;
-
-		/* Status */
-		e_cal_component_get_status (comp, &status);
-		if (status != ICAL_STATUS_NONE) {
-			switch (status) {
-			case ICAL_STATUS_NEEDSACTION:
-				status_string = _("Not Started");
-				break;
-			case ICAL_STATUS_INPROCESS:
-				status_string = _("In Progress");
-				break;
-			case ICAL_STATUS_COMPLETED:
-				status_string = _("Completed");
-				break;
-			case ICAL_STATUS_CANCELLED:
-				status_string = _("Cancelled");
-				break;
-			default:
-				break;
-			}
-
-			if (status_string) {
-				char *text = g_strdup_printf (_("Status: %s"),
-							      status_string);
-				top = bound_text (pc, font, text,
-						  left, right, top, bottom, 0);
-				top += gnome_font_get_size (font) - 6;
-				g_free (text);
-			}
-		}
-
-		/* Priority */
-		e_cal_component_get_priority (comp, &priority);
-		if (priority && *priority >= 0) {
-			char *priority_string, *text;
-
-			priority_string = e_cal_util_priority_to_string (*priority);
-			e_cal_component_free_priority (priority);
-
-			text = g_strdup_printf (_("Priority: %s"), priority_string);
-			top = bound_text (pc, font, text,
-					  left, right, top, bottom, 0);
-			top += gnome_font_get_size (font) - 6;
-			g_free (text);
-		}
-
-		/* Percent Complete */
-		e_cal_component_get_percent (comp, &percent);
-		if (percent) {
-			char *percent_string;
-
-			percent_string = g_strdup_printf (_("Percent Complete: %i"), *percent);
-			e_cal_component_free_percent (percent);
-
-			top = bound_text (pc, font, percent_string,
-					  left, right, top, bottom, 0);
-			top += gnome_font_get_size (font) - 6;
-		}
-
-
-		/* URL */
-		e_cal_component_get_url (comp, &url);
-		if (url && url[0]) {
-			char *url_string = g_strdup_printf (_("URL: %s"),
-							    url);
-
-			top = bound_text (pc, font, url_string,
-					  left, right, top, bottom, 0);
-			top += gnome_font_get_size (font) - 6;
-
-			g_free (url_string);
-		}
-	}
-
-	/* Categories */
-	e_cal_component_get_categories (comp, &categories);
-	if (categories && categories[0]) {
-		categories_string = g_strdup_printf (_("Categories: %s"),
-						     categories);
-		top = bound_text (pc, font, categories_string,
-				  left, right, top, bottom, 0);
-		top += gnome_font_get_size (font) - 6;
-		g_free (categories_string);
-	}
-
-	/* Contacts */
-	e_cal_component_get_contact_list (comp, &contact_list);
-	if (contact_list) {
-		GString *contacts = g_string_new (_("Contacts: "));
-		for (elem = contact_list; elem; elem = elem->next) {
-			ECalComponentText *t = elem->data;
-			/* Put a comma between contacts. */
-			if (elem != contact_list)
-				g_string_append (contacts, ", ");
-			g_string_append (contacts, t->value);
-		}
-		e_cal_component_free_text_list (contact_list);
-
-		top = bound_text (pc, font, contacts->str,
-				  left, right, top, bottom, 0);
-		top += gnome_font_get_size (font) - 6;
-
-		g_string_free (contacts, TRUE);
-	}
-
-	top -= 16;
-
-	/* Description */
-	e_cal_component_get_description_list (comp, &desc);
-	for (l = desc; l != NULL; l = l->next) {
-		ECalComponentText *text = l->data;
-
-		if (text->value != NULL)
-			top = bound_text (pc, font, text->value, left, right, top-3, bottom, 0);
-	}
-	e_cal_component_free_text_list (desc);
-	g_object_unref (font);
-
-	gnome_print_showpage (pc);
-}
-
-void
-print_calendar (GnomeCalendar *gcal, gboolean preview, time_t date,
-		PrintView default_view)
-{
-	GnomePrintConfig *print_config;
-	GnomePrintJob *gpm;
-	GnomePrintContext *pc;
-	double l, r, t, b;
-	char *old_orientation;
-	
-	g_return_if_fail (gcal != NULL);
-	g_return_if_fail (GNOME_IS_CALENDAR (gcal));
-
-	print_config = e_print_load_config ();
-
-	/* Don't save the orientation if we guessed it to be nice to the user */
-	old_orientation = gnome_print_config_get (print_config, GNOME_PRINT_KEY_PAGE_ORIENTATION);
-	if (default_view == PRINT_VIEW_MONTH) {
-		if (old_orientation && !strcmp (old_orientation, "R90")) {
-			g_free (old_orientation);
-			old_orientation = NULL;
-		}
-		    
-		gnome_print_config_set (print_config, GNOME_PRINT_KEY_PAGE_ORIENTATION, "R90");
-	}
-
-	if (!preview) {
-		GtkWidget *gpd;
-		GtkWidget *range;
-		int view;
-
-		gpd = e_print_get_dialog_with_config (_("Print"), GNOME_PRINT_DIALOG_COPIES | GNOME_PRINT_DIALOG_RANGE, print_config);
-
-		view = (int) default_view;
-		range = range_selector_new (gpd, date, &view);
-		gnome_print_dialog_construct_range_custom (GNOME_PRINT_DIALOG (gpd), range);
-
-		gtk_dialog_set_default_response (GTK_DIALOG (gpd),
-						 GNOME_PRINT_DIALOG_RESPONSE_PRINT);
-
-		/* Run dialog */
-
-		switch (gtk_dialog_run (GTK_DIALOG (gpd))) {
-		case GNOME_PRINT_DIALOG_RESPONSE_PRINT:
-			break;
-
-		case GNOME_PRINT_DIALOG_RESPONSE_PREVIEW:
-			preview = TRUE;
-			break;
-
-		case -1:
-			return;
-
-		default:
-			gtk_widget_destroy (gpd);
-			return;
-		}
-
-		e_dialog_get_values (gpd);
-		default_view = (PrintView) view;
-
-		gtk_widget_destroy (gpd);
-	}
-
-	gpm = gnome_print_job_new (print_config);
-
-	pc = gnome_print_job_get_context (gpm);
-	gnome_print_config_get_page_size (print_config, &r, &t);
-
-	/* See top of source for an explanation of this */
-
-	/* gnome_print_config_get_double (print_config, GNOME_PRINT_KEY_PAGE_MARGIN_TOP, &temp_d);
-	 * t -= temp_d;
-	 * gnome_print_config_get_double (print_config, GNOME_PRINT_KEY_PAGE_MARGIN_RIGHT, &temp_d);
-	 * r -= temp_d;
-	 * gnome_print_config_get_double (print_config, GNOME_PRINT_KEY_PAGE_MARGIN_BOTTOM, &b);
-	 * gnome_print_config_get_double (print_config, GNOME_PRINT_KEY_PAGE_MARGIN_LEFT, &l);
-	 * b = l = TEMP_MARGIN; */
-	
-	b = t * TEMP_MARGIN;
-	l = r * TEMP_MARGIN;
-	t *= (1.0 - TEMP_MARGIN);
-	r *= (1.0 - TEMP_MARGIN);
-
-	/* depending on the view, do a different output */
-	switch (default_view) {
-	case PRINT_VIEW_DAY:
-		print_day_view (pc, gcal, date, l, r, t, b);
-		break;
-	case PRINT_VIEW_WEEK:
-		print_week_view (pc, gcal, date, l, r, t, b);
-		break;
-	case PRINT_VIEW_MONTH:
-		print_month_view (pc, gcal, date, l, r, t, b);
-		break;
-	case PRINT_VIEW_YEAR:
-		print_year_view (pc, gcal, date, l, r, t, b);
-		break;
-	default:
-		g_assert_not_reached ();
-	}
-
-	gnome_print_job_close (gpm);
-
-	if (preview) {
-		GtkWidget *gpmp;
-
-		gpmp = gnome_print_job_preview_new (gpm, _("Print Preview"));
-		gtk_widget_show (gpmp);
-	} else {
-		gnome_print_job_print (gpm);
-	}
-
-	/* Don't save the orientation if we guessed it to be nice to the user */
-	if (old_orientation) {
-		gnome_print_config_set (print_config, GNOME_PRINT_KEY_PAGE_ORIENTATION, old_orientation);
-		
-		e_print_save_config (print_config);
-		g_free (old_orientation);
-	}
-
-	g_object_unref (print_config);
-	g_object_unref (gpm);
-}
-
-
-void
-print_comp (ECalComponent *comp, ECal *client, gboolean preview)
-{
-	GnomePrintConfig *print_config;
-	GnomePrintJob *gpm;
-	GnomePrintContext *pc;
-	double l, r, t, b;
-
-	g_return_if_fail (comp != NULL);
-	g_return_if_fail (E_IS_CAL_COMPONENT (comp));
-
-	print_config = e_print_load_config ();
-
-	if (!preview) {
-		GtkWidget *gpd;
-
-		gpd = e_print_get_dialog_with_config (_("Print Item"), GNOME_PRINT_DIALOG_COPIES, print_config);
-
-		gtk_dialog_set_default_response (GTK_DIALOG (gpd),
-						 GNOME_PRINT_DIALOG_RESPONSE_PRINT);
-
-		/* Run dialog */
-
-		switch (gtk_dialog_run (GTK_DIALOG (gpd))) {
-		case GNOME_PRINT_DIALOG_RESPONSE_PRINT:
-			break;
-
-		case GNOME_PRINT_DIALOG_RESPONSE_PREVIEW:
-			preview = TRUE;
-			break;
-
-		case -1:
-			return;
-
-		default:
-			gtk_widget_destroy (gpd);
-			return;
-		}
-
-		e_dialog_get_values (gpd);
-		gtk_widget_destroy (gpd);
-	}
-
-	gpm = gnome_print_job_new (print_config);
-
-	pc = gnome_print_job_get_context (gpm);
-	gnome_print_config_get_page_size (print_config, &r, &t);
-
-	/* See top of source for an explanation of this */
-
-	/* gnome_print_config_get_double (print_config, GNOME_PRINT_KEY_PAGE_MARGIN_TOP, &temp_d);
-	 * t -= temp_d;
-	 * gnome_print_config_get_double (print_config, GNOME_PRINT_KEY_PAGE_MARGIN_RIGHT, &temp_d);
-	 * r -= temp_d;
-	 * gnome_print_config_get_double (print_config, GNOME_PRINT_KEY_PAGE_MARGIN_BOTTOM, &b);
-	 * gnome_print_config_get_double (print_config, GNOME_PRINT_KEY_PAGE_MARGIN_LEFT, &l);
-	 * b = l = TEMP_MARGIN; */
-
-	b = t * TEMP_MARGIN;
-	l = r * TEMP_MARGIN;
-	t *= (1.0 - TEMP_MARGIN);
-	r *= (1.0 - TEMP_MARGIN);
-
-	print_comp_item (pc, comp, client, l, r, t, b);
-	gnome_print_job_close (gpm);
-
-	if (preview) {
-		GtkWidget *gpmp;
-
-		gpmp = gnome_print_job_preview_new (gpm, _("Print Preview"));
-		gtk_widget_show (gpmp);
-	} else {
-		gnome_print_job_print (gpm);
-	}
-
-	g_object_unref (print_config);
-	g_object_unref (gpm);
-}
-
-static void
-print_title (GnomePrintContext *pc, const char *title,
-	     double page_width, double page_height)
-{
-	GnomeFont *font;
-	double w, x, y;
-
-	font = gnome_font_find_closest ("Sans Bold", 18);
-
-	w = gnome_font_get_width_utf8 (font, title);
-
-	x = (page_width - w) / 2;
-	y = page_height - gnome_font_get_ascender (font);
-
-	gnome_print_moveto (pc, x, y);
-	gnome_print_setfont (pc, font);
-	gnome_print_setrgbcolor (pc, 0, 0, 0);
-	gnome_print_show (pc, title);
-
-	g_object_unref (font);
-}
-
-void
-print_table (ETable *etable, const char *dialog_title, const char *print_header, gboolean preview)
-{
-	EPrintable *printable;
-	GnomePrintConfig *print_config;
-	GnomePrintContext *pc;
-	GnomePrintJob *gpm;
-	double l, r, t, b, page_width, page_height, left_margin, bottom_margin;
-
-	print_config = e_print_load_config ();
-
-	printable = e_table_get_printable (etable);
-	g_object_ref (printable);
-	gtk_object_sink (GTK_OBJECT (printable));
-	e_printable_reset (printable);
-
-	if (!preview) {
-		GtkWidget *gpd;
-
-		gpd = e_print_get_dialog_with_config (dialog_title, GNOME_PRINT_DIALOG_COPIES, print_config);
-
-		gtk_dialog_set_default_response (GTK_DIALOG (gpd),
-						 GNOME_PRINT_DIALOG_RESPONSE_PRINT);
-
-		/* Run dialog */
-
-		switch (gtk_dialog_run (GTK_DIALOG (gpd))) {
-		case GNOME_PRINT_DIALOG_RESPONSE_PRINT:
-			break;
-
-		case GNOME_PRINT_DIALOG_RESPONSE_PREVIEW:
-			preview = TRUE;
-			break;
-
-		case -1:
-			return;
-
-		default:
-			gtk_widget_destroy (gpd);
-			return;
-		}
-
-		e_dialog_get_values (gpd);
-
-		gtk_widget_destroy (gpd);
-	}
-
-	gpm = gnome_print_job_new (print_config);
-
-	pc = gnome_print_job_get_context (gpm);
-
-	gnome_print_config_get_page_size (print_config, &r, &t);
-
-	/* See top of source for an explanation of this */
-
-#if 0
-	gnome_print_config_get_double (print_config, GNOME_PRINT_KEY_PAGE_MARGIN_TOP, &temp_d);
-	t -= temp_d;
-	gnome_print_config_get_double (print_config, GNOME_PRINT_KEY_PAGE_MARGIN_RIGHT, &temp_d);
-	r -= temp_d;
-	gnome_print_config_get_double (print_config, GNOME_PRINT_KEY_PAGE_MARGIN_BOTTOM, &b);
-	gnome_print_config_get_double (print_config, GNOME_PRINT_KEY_PAGE_MARGIN_LEFT, &l);
-#endif
-
-	b = t * TEMP_MARGIN;
-	l = r * TEMP_MARGIN;
-	t *= (1.0 - TEMP_MARGIN);
-	r *= (1.0 - TEMP_MARGIN);
-
-	page_width = r - l;
-	page_height = t - b;
-	left_margin = l;
-	bottom_margin = b;
-
-	do {
-		gnome_print_beginpage (pc, "Tasks");
-		gnome_print_gsave (pc);
-
-		gnome_print_translate (pc, left_margin, bottom_margin);
-
-		print_title (pc, print_header, page_width, page_height);
-
-		if (e_printable_data_left (printable))
-			e_printable_print_page (printable, pc,
-						page_width, page_height - 24, TRUE);
-
-		gnome_print_grestore (pc);
-		gnome_print_showpage (pc);
-	} while (e_printable_data_left (printable));
-
-	gnome_print_job_close (gpm);
-
-	if (preview) {
-		GtkWidget *gpmp;
-		gpmp = gnome_print_job_preview_new (gpm, _("Print Preview"));
-		gtk_widget_show (gpmp);
-	} else {
-		gnome_print_job_print (gpm);
-	}
-
-	g_object_unref (print_config);
-	g_object_unref (gpm);
-	g_object_unref (printable);
-}
diff --git a/calendar/gui/print.h b/calendar/gui/print.h
deleted file mode 100644
index d706125e6c..0000000000
--- a/calendar/gui/print.h
+++ /dev/null
@@ -1,43 +0,0 @@
-/* Evolution calendar - Print support
- *
- * Copyright (C) 2000 Ximian, Inc.
- *
- * Authors: Michael Zucchi <notzed@ximian.com>
- *          Federico Mena-Quintero <federico@ximian.com>
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of version 2 of the GNU General Public
- * License as published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public 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,
-	PRINT_VIEW_LIST
-} PrintView;
-
-void print_calendar (GnomeCalendar *gcal, gboolean preview, time_t at, PrintView default_view);
-void print_comp (ECalComponent *comp, ECal *client, gboolean preview);
-void print_table (ETable *etable, const char *dialog_title, const char *print_header, gboolean preview);
-
-
-
-#endif
diff --git a/calendar/gui/tag-calendar.c b/calendar/gui/tag-calendar.c
deleted file mode 100644
index 0ec8c959e2..0000000000
--- a/calendar/gui/tag-calendar.c
+++ /dev/null
@@ -1,226 +0,0 @@
-/* Evolution calendar - Utilities for tagging ECalendar widgets
- *
- * Copyright (C) 2000 Ximian, Inc.
- *
- * Authors: Damon Chaplin <damon@ximian.com>
- *          Federico Mena-Quintero <federico@ximian.com>
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of version 2 of the GNU General Public
- * License as published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public 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 <libecal/e-cal-time-util.h>
-#include "calendar-config.h"
-#include "tag-calendar.h"
-
-
-
-struct calendar_tag_closure {
-	ECalendarItem *calitem;
-	icaltimezone *zone;
-	time_t start_time;
-	time_t end_time;
-
-	gboolean skip_transparent_events;
-};
-
-/* Clears all the tags in a calendar and fills a closure structure with the
- * necessary information for iterating over occurrences.
- * Returns FALSE if the calendar has no dates shown.
- */
-static gboolean
-prepare_tag (ECalendar *ecal, struct calendar_tag_closure *c, icaltimezone *zone, gboolean clear_first)
-{
-	gint start_year, start_month, start_day;
-	gint end_year, end_month, end_day;
-	struct icaltimetype start_tt = icaltime_null_time ();
-	struct icaltimetype end_tt = icaltime_null_time ();
-
-	if (clear_first)
-		e_calendar_item_clear_marks (ecal->calitem);
-
-	if (!e_calendar_item_get_date_range (ecal->calitem,
-					     &start_year, &start_month,
-					     &start_day,
-					     &end_year, &end_month, &end_day))
-	    return FALSE;
-
-	start_tt.year = start_year;
-	start_tt.month = start_month + 1;
-	start_tt.day = start_day;
-
-	end_tt.year = end_year;
-	end_tt.month = end_month + 1;
-	end_tt.day = end_day;
-
-	icaltime_adjust (&end_tt, 1, 0, 0, 0);
-
-	c->calitem = ecal->calitem;
-
-	if (zone) {
-		c->zone = zone;
-	} else {
-		c->zone = calendar_config_get_icaltimezone ();
-	}
-	
-	c->start_time = icaltime_as_timet_with_zone (start_tt, c->zone);
-	c->end_time = icaltime_as_timet_with_zone (end_tt, c->zone);
-
-	return TRUE;
-}
-
-/* Marks the specified range in an ECalendar; called from e_cal_generate_instances() */
-static gboolean
-tag_calendar_cb (ECalComponent *comp,
-		 time_t istart,
-		 time_t iend,
-		 gpointer data)
-{
-	struct calendar_tag_closure *c = data;
-	struct icaltimetype start_tt, end_tt;
-	ECalComponentTransparency transparency;
-
-	/* If we are skipping TRANSPARENT events, return if the event is
-	   transparent. */
-	if (c->skip_transparent_events) {
-		e_cal_component_get_transparency (comp, &transparency);
-		if (transparency == E_CAL_COMPONENT_TRANSP_TRANSPARENT)
-			return TRUE;
-	}
-
-	start_tt = icaltime_from_timet_with_zone (istart, FALSE, c->zone);
-	end_tt = icaltime_from_timet_with_zone (iend - 1, FALSE, c->zone);
-	e_calendar_item_mark_days (c->calitem,
-				   start_tt.year, start_tt.month - 1,
-				   start_tt.day,
-				   end_tt.year, end_tt.month - 1,
-				   end_tt.day,
-				   E_CALENDAR_ITEM_MARK_BOLD);
-
-	return TRUE;
-}
-
-/**
- * tag_calendar_by_client:
- * @ecal: Calendar widget to tag.
- * @client: A calendar client object.
- * 
- * Tags an #ECalendar widget with the events that occur in its current time
- * range.  The occurrences are extracted from the specified calendar @client.
- **/
-void
-tag_calendar_by_client (ECalendar *ecal, ECal *client)
-{
-	struct calendar_tag_closure c;
-
-	g_return_if_fail (ecal != NULL);
-	g_return_if_fail (E_IS_CALENDAR (ecal));
-	g_return_if_fail (client != NULL);
-	g_return_if_fail (E_IS_CAL (client));
-
-	/* If the ECalendar isn't visible, we just return. */
-	if (!GTK_WIDGET_VISIBLE (ecal))
-		return;
-
-	if (e_cal_get_load_state (client) != E_CAL_LOAD_LOADED)
-		return;
-
-	if (!prepare_tag (ecal, &c, NULL, TRUE))
-		return;
-
-	c.skip_transparent_events = TRUE;
-
-#if 0
-	g_print ("DateNavigator generating instances\n");
-#endif
-	e_cal_generate_instances (client, c.start_time, c.end_time,
-				  tag_calendar_cb, &c);
-}
-
-/* Resolves TZIDs for the recurrence generator, for when the comp is not on
-   the server. We need to try to use builtin timezones first, as they may not
-   be added to the server yet. */
-static icaltimezone*
-resolve_tzid_cb (const char *tzid, gpointer data)
-{
-	ECal *client;
-	icaltimezone *zone = NULL;
-
-	g_return_val_if_fail (data != NULL, NULL);
-	g_return_val_if_fail (E_IS_CAL (data), NULL);
-	
-	client = E_CAL (data);
-
-	/* Try to find the builtin timezone first. */
-	zone = icaltimezone_get_builtin_timezone_from_tzid (tzid);
-
-	if (!zone) {
-		/* FIXME: Handle errors. */
-		e_cal_get_timezone (client, tzid, &zone, NULL);
-	}
-
-	return zone;
-}
-
-/**
- * tag_calendar_by_comp:
- * @ecal: Calendar widget to tag.
- * @comp: A calendar component object.
- * @clear_first: Whether the #ECalendar should be cleared of any marks first.
- * 
- * Tags an #ECalendar widget with any occurrences of a specific calendar
- * component that occur within the calendar's current time range.
- * Note that TRANSPARENT events are also tagged here.
- *
- * If comp_is_on_server is FALSE, it will try to resolve TZIDs using builtin
- * timezones first, before querying the server, since the timezones may not
- * have been added to the calendar on the server yet.
- **/
-void
-tag_calendar_by_comp (ECalendar *ecal, ECalComponent *comp, ECal *client, icaltimezone *display_zone, 
-		      gboolean clear_first, gboolean comp_is_on_server)
-{
-	struct calendar_tag_closure c;
-
-	g_return_if_fail (ecal != NULL);
-	g_return_if_fail (E_IS_CALENDAR (ecal));
-	g_return_if_fail (comp != NULL);
-	g_return_if_fail (E_IS_CAL_COMPONENT (comp));
-
-	/* If the ECalendar isn't visible, we just return. */
-	if (!GTK_WIDGET_VISIBLE (ecal))
-		return;
-
-	if (!prepare_tag (ecal, &c, display_zone, clear_first))
-		return;
-
-	c.skip_transparent_events = FALSE;
-
-#if 0
-	g_print ("DateNavigator generating instances\n");
-#endif
-	if (comp_is_on_server) {
-		e_cal_generate_instances_for_object (client, e_cal_component_get_icalcomponent (comp),
-						     c.start_time, c.end_time,
-						     tag_calendar_cb, &c);
-	} else {
-		e_cal_recur_generate_instances (comp, c.start_time, c.end_time,
-						tag_calendar_cb, &c,
-						resolve_tzid_cb,
-						client, c.zone);
-	}
-}
diff --git a/calendar/gui/tag-calendar.h b/calendar/gui/tag-calendar.h
deleted file mode 100644
index d31d675543..0000000000
--- a/calendar/gui/tag-calendar.h
+++ /dev/null
@@ -1,33 +0,0 @@
-/* Evolution calendar - Utilities for tagging ECalendar widgets
- *
- * Copyright (C) 2000 Ximian, Inc.
- *
- * Authors: Damon Chaplin <damon@ximian.com>
- *          Federico Mena-Quintero <federico@ximian.com>
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of version 2 of the GNU General Public
- * License as published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307, USA.
- */
-
-#ifndef TAG_CALENDAR_H
-#define TAG_CALENDAR_H
-
-#include <widgets/misc/e-calendar.h>
-#include <libecal/e-cal.h>
-
-void tag_calendar_by_client (ECalendar *ecal, ECal *client);
-void tag_calendar_by_comp (ECalendar *ecal, ECalComponent *comp,
-			   ECal *client, icaltimezone *display_zone,
-			   gboolean clear_first, gboolean comp_is_on_server);
-
-#endif
diff --git a/calendar/gui/tasks-component.c b/calendar/gui/tasks-component.c
deleted file mode 100644
index 74ef16bd61..0000000000
--- a/calendar/gui/tasks-component.c
+++ /dev/null
@@ -1,1331 +0,0 @@
-/* -*- Mode: C; indent-tabs-mode: t; c-basic-offset: 8; tab-width: 8 -*- */
-/* tasks-component.c
- *
- * Copyright (C) 2003  Novell, Inc.
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of version 2 of the GNU General Public
- * License as published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * General Public License for more details.
- *
- * You should have received a copy of the GNU General Public
- * License along with this program; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
- *
- * Author: Rodrigo Moya <rodrigo@ximian.com>
- */
-
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
-
-#include <errno.h>
-#include <string.h>
-#include <bonobo/bonobo-control.h>
-#include <bonobo/bonobo-i18n.h>
-#include <bonobo/bonobo-exception.h>
-#include <gconf/gconf-client.h>
-#include <libecal/e-cal.h>
-#include <libedataserverui/e-source-selector.h>
-#include <shell/e-user-creatable-items-handler.h>
-#include "e-cal-model.h"
-#include "e-tasks.h"
-#include "tasks-component.h"
-#include "tasks-control.h"
-#include "e-comp-editor-registry.h"
-#include "migration.h"
-#include "comp-util.h"
-#include "calendar-config.h"
-#include "e-cal-popup.h"
-#include "common/authentication.h"
-#include "dialogs/calendar-setup.h"
-#include "dialogs/comp-editor.h"
-#include "dialogs/copy-source-dialog.h"
-#include "dialogs/task-editor.h"
-#include "widgets/misc/e-info-label.h"
-#include "widgets/misc/e-error.h"
-#include "e-util/e-icon-factory.h"
-
-#define CREATE_TASK_ID               "task"
-#define CREATE_TASK_ASSIGNED_ID      "task-assigned"
-#define CREATE_TASK_LIST_ID          "task-list"
-
-enum DndTargetType {
-	DND_TARGET_TYPE_CALENDAR_LIST,
-};
-#define CALENDAR_TYPE "text/calendar"
-#define XCALENDAR_TYPE "text/x-calendar"
-#define WEB_BASE_URI "webcal://"
-#define PERSONAL_RELATIVE_URI "system"
-
-static GtkTargetEntry drag_types[] = {
-	{ CALENDAR_TYPE, 0, DND_TARGET_TYPE_CALENDAR_LIST },
-	{ XCALENDAR_TYPE, 0, DND_TARGET_TYPE_CALENDAR_LIST }
-};
-static gint num_drag_types = sizeof(drag_types) / sizeof(drag_types[0]);
-
-#define PARENT_TYPE bonobo_object_get_type ()
-
-static BonoboObjectClass *parent_class = NULL;
-
-/* Tasks should have their own registry */
-extern ECompEditorRegistry *comp_editor_registry;
-
-
-typedef struct 
-{
-	ESourceList *source_list;
-	
-	GSList *source_selection;
-	
-	ETasks *tasks;
-	ETable *table;
-	ETableModel *model;
-
-	EInfoLabel *info_label;
-	GtkWidget *source_selector;
-	
-	BonoboControl *view_control;
-	BonoboControl *sidebar_control;
-	BonoboControl *statusbar_control;
-
-	GList *notifications;
-
-	EUserCreatableItemsHandler *creatable_items_handler;
-
-	EActivityHandler *activity_handler;
-} TasksComponentView;
-
-struct _TasksComponentPrivate {
-	char *base_directory;
-	char *config_directory;
-
-	ESourceList *source_list;
-	GSList *source_selection;
-
-	GList *views;
-	
-	ECal *create_ecal;
-	
-	GList *notifications;
-};
-
-static void
-ensure_sources (TasksComponent *component)
-{
-	GSList *groups;
-	ESourceList *source_list;
-	ESourceGroup *group;
-	ESourceGroup *on_this_computer;
-	ESourceGroup *on_the_web;
-	ESource *personal_source;
-	char *base_uri, *base_uri_proto;
-
-	on_this_computer = NULL;
-	on_the_web = NULL;
-	personal_source = NULL;
-
-	if (!e_cal_get_sources (&source_list, E_CAL_SOURCE_TYPE_TODO, NULL)) {
-		g_warning ("Could not get addressbook source list from GConf!");
-		return;
-	}
-
-	base_uri = g_build_filename (tasks_component_peek_base_directory (component),
-				     "tasks", "local",
-				     NULL);
-
-	base_uri_proto = g_strconcat ("file://", base_uri, NULL);
-
-	groups = e_source_list_peek_groups (source_list);
-	if (groups) {
-		/* groups are already there, we need to search for things... */
-		GSList *g;
-
-		for (g = groups; g; g = g->next) {
-
-			group = E_SOURCE_GROUP (g->data);
-
-			/* compare only file:// part. If user home dir name changes we do not want to create 
-			   one more group  */
-
-			if (!on_this_computer && !strncmp (base_uri_proto, e_source_group_peek_base_uri (group), 7))
-				on_this_computer = group;
-			else if (!on_the_web && !strcmp (WEB_BASE_URI, e_source_group_peek_base_uri (group)))
-				on_the_web = group;
-		}
-	}
-
-	if (on_this_computer) {
-		/* make sure "Personal" shows up as a source under
-		   this group */
-		GSList *sources = e_source_group_peek_sources (on_this_computer);
-		GSList *s;
-		for (s = sources; s; s = s->next) {
-			ESource *source = E_SOURCE (s->data);
-			if (!strcmp (PERSONAL_RELATIVE_URI, e_source_peek_relative_uri (source))) {
-				personal_source = source;
-				break;
-			}
-		}
-		/* Make sure we have the correct base uri. This can change when user's
-		   homedir name changes */
-		if (strcmp (base_uri_proto, e_source_group_peek_base_uri (on_this_computer))) {
-		    e_source_group_set_base_uri (on_this_computer, base_uri_proto);
-
-		    /* *sigh* . We shouldn't  need this sync call here as set_base_uri
-		       call results in synching to gconf, but that happens in idle loop
-		       and too late to prevent user seeing "Can not Open ... because of invalid uri" error.*/
-		    e_source_list_sync (source_list,NULL);
-		}
-	}
-	else {
-		/* create the local source group */
-		group = e_source_group_new (_("On This Computer"), base_uri_proto);
-		e_source_list_add_group (source_list, group, -1);
-
-		on_this_computer = group;
-	}
-
-	if (!personal_source) {
-		/* Create the default Person addressbook */
-		ESource *source = e_source_new (_("Personal"), PERSONAL_RELATIVE_URI);
-		e_source_group_add_source (on_this_computer, source, -1);
-
-		if (!calendar_config_get_primary_tasks () && !calendar_config_get_tasks_selected ()) {
-			GSList selected;
-
-			calendar_config_set_primary_tasks (e_source_peek_uid (source));
-
-			selected.data = (gpointer)e_source_peek_uid (source);
-			selected.next = NULL;
-			calendar_config_set_tasks_selected (&selected);
-		}
-
-		e_source_set_color (source, 0xBECEDD);
-		personal_source = source;
-	}
-
-	if (!on_the_web) {
-		/* Create the LDAP source group */
-		group = e_source_group_new (_("On The Web"), WEB_BASE_URI);
-		e_source_list_add_group (source_list, group, -1);
-
-		on_the_web = group;
-	}
-
-	component->priv->source_list = source_list;
-	g_free (base_uri_proto);
-	g_free (base_uri);
-}
-
-/* Utility functions.  */
-/* FIXME Some of these are duplicated from calendar-component.c */
-static gboolean
-is_in_selection (GSList *selection, ESource *source)
-{
-	GSList *l;
-	
-	for (l = selection; l; l = l->next) {
-		ESource *selected_source = l->data;
-		
-		if (!strcmp (e_source_peek_uid (selected_source), e_source_peek_uid (source)))
-			return TRUE;
-	}
-
-	return FALSE;
-}
-
-static gboolean
-is_in_uids (GSList *uids, ESource *source)
-{
-	GSList *l;
-	
-	for (l = uids; l; l = l->next) {
-		const char *uid = l->data;
-		
-		if (!strcmp (uid, e_source_peek_uid (source)))
-			return TRUE;
-	}
-
-	return FALSE;
-}
-
-static void
-update_uris_for_selection (TasksComponentView *component_view)
-{
-	GSList *selection, *l, *uids_selected = NULL;
-	
-	selection = e_source_selector_get_selection (E_SOURCE_SELECTOR (component_view->source_selector));
-	
-	for (l = component_view->source_selection; l; l = l->next) {
-		ESource *old_selected_source = l->data;
-
-		if (!is_in_selection (selection, old_selected_source))
-			e_tasks_remove_todo_source (component_view->tasks, old_selected_source);
-	}	
-	
-	for (l = selection; l; l = l->next) {
-		ESource *selected_source = l->data;
-		
-		e_tasks_add_todo_source (component_view->tasks, selected_source);
-		uids_selected = g_slist_append (uids_selected, (char *)e_source_peek_uid (selected_source));
-	}
-
-	e_source_selector_free_selection (component_view->source_selection);
-	component_view->source_selection = selection;
-
-	/* Save the selection for next time we start up */
-	calendar_config_set_tasks_selected (uids_selected);
-	g_slist_free (uids_selected);
-}
-
-static void
-update_uri_for_primary_selection (TasksComponentView *component_view)
-{
-	ESource *source;
-	ECalendarTable *cal_table;
-	ETable *etable;
-
-	source = e_source_selector_peek_primary_selection (E_SOURCE_SELECTOR (component_view->source_selector));
-	if (!source)
-		return;
-
-	/* Set the default */
-	e_tasks_set_default_source (component_view->tasks, source);
-
-	cal_table = e_tasks_get_calendar_table (component_view->tasks);
-	etable = e_calendar_table_get_table (cal_table);
-
-	tasks_control_sensitize_commands (component_view->view_control, component_view->tasks, e_table_selected_count (etable));
-	
-	/* Save the selection for next time we start up */
-	calendar_config_set_primary_tasks (e_source_peek_uid (source));
-}
-
-static void
-update_selection (TasksComponentView *component_view)
-{
-	GSList *selection, *uids_selected, *l;
-
-	/* Get the selection in gconf */
-	uids_selected = calendar_config_get_tasks_selected ();
-
-	/* Remove any that aren't there any more */
-	selection = e_source_selector_get_selection (E_SOURCE_SELECTOR (component_view->source_selector));
-
-	for (l = selection; l; l = l->next) {
-		ESource *source = l->data;
-
-		if (!is_in_uids (uids_selected, source)) 
-			e_source_selector_unselect_source (E_SOURCE_SELECTOR (component_view->source_selector), source);
-	}
-	
-	e_source_selector_free_selection (selection);
-
-	/* Make sure the whole selection is there */
-	for (l = uids_selected; l; l = l->next) {
-		char *uid = l->data;
-		ESource *source;
-
-		source = e_source_list_peek_source_by_uid (component_view->source_list, uid);
-		if (source) 
-			e_source_selector_select_source (E_SOURCE_SELECTOR (component_view->source_selector), source);
-		
-		g_free (uid);
-	}
-	g_slist_free (uids_selected);
-}
-
-static void
-update_primary_selection (TasksComponentView *component_view)
-{
-	ESource *source = NULL;
-	char *uid;
-
-	uid = calendar_config_get_primary_tasks ();
-	if (uid) {
-		source = e_source_list_peek_source_by_uid (component_view->source_list, uid);
-		g_free (uid);
-	}
-	
-	if (source) {
-		e_source_selector_set_primary_selection (E_SOURCE_SELECTOR (component_view->source_selector), source);
-	} else {
-		/* Try to create a default if there isn't one */
-		source = e_source_list_peek_source_any (component_view->source_list);
-		if (source)
-			e_source_selector_set_primary_selection (E_SOURCE_SELECTOR (component_view->source_selector), source);
-	}
-}
-
-/* Callbacks.  */
-static void
-copy_task_list_cb (EPopup *ep, EPopupItem *pitem, void *data)
-{
-	TasksComponentView *component_view = data;
-	ESource *selected_source;
-	
-	selected_source = e_source_selector_peek_primary_selection (E_SOURCE_SELECTOR (component_view->source_selector));
-	if (!selected_source)
-		return;
-
-	copy_source_dialog (GTK_WINDOW (gtk_widget_get_toplevel(ep->target->widget)), selected_source, E_CAL_SOURCE_TYPE_TODO);
-}
-
-static void
-delete_task_list_cb (EPopup *ep, EPopupItem *pitem, void *data)
-{
-	TasksComponentView *component_view = data;
-	ESource *selected_source;
-	ECal *cal;
-	char *uri;
-
-	selected_source = e_source_selector_peek_primary_selection (E_SOURCE_SELECTOR (component_view->source_selector));
-	if (!selected_source)
-		return;
-
-	if (e_error_run((GtkWindow *)gtk_widget_get_toplevel(ep->target->widget),
-			"calendar:prompt-delete-task-list", e_source_peek_name(selected_source)) != GTK_RESPONSE_YES)
-		return;
-
-	/* first, ask the backend to remove the task list */
-	uri = e_source_get_uri (selected_source);
-	cal = e_cal_model_get_client_for_uri (
-		e_calendar_table_get_model (E_CALENDAR_TABLE (e_tasks_get_calendar_table (component_view->tasks))),
-		uri);
-	if (!cal)
-		cal = e_cal_new_from_uri (uri, E_CAL_SOURCE_TYPE_TODO);
-	g_free (uri);
-	if (cal) {
-		if (e_cal_remove (cal, NULL)) {
-			if (e_source_selector_source_is_selected (E_SOURCE_SELECTOR (component_view->source_selector),
-								  selected_source)) {
-				e_tasks_remove_todo_source (component_view->tasks, selected_source);
-				e_source_selector_unselect_source (E_SOURCE_SELECTOR (component_view->source_selector),
-								   selected_source);
-			}
-			
-			e_source_group_remove_source (e_source_peek_group (selected_source), selected_source);
-			e_source_list_sync (component_view->source_list, NULL);
-		}
-	}
-}
-
-static void
-new_task_list_cb (EPopup *ep, EPopupItem *pitem, void *data)
-{
-	calendar_setup_new_task_list (GTK_WINDOW (gtk_widget_get_toplevel(ep->target->widget)));
-}
-
-static void
-edit_task_list_cb (EPopup *ep, EPopupItem *pitem, void *data)
-{
-	TasksComponentView *component_view = data;
-	ESource *selected_source;
-
-	selected_source = e_source_selector_peek_primary_selection (E_SOURCE_SELECTOR (component_view->source_selector));
-	if (!selected_source)
-		return;
-
-	calendar_setup_edit_task_list (GTK_WINDOW (gtk_widget_get_toplevel(ep->target->widget)), selected_source);
-}
-
-static EPopupItem etc_source_popups[] = {
-	{ E_POPUP_ITEM, "10.new", N_("New Task List"), new_task_list_cb, NULL, "stock_todo", 0, 0 },
-	{ E_POPUP_ITEM, "15.copy", N_("Copy"), copy_task_list_cb, NULL, "stock_folder-copy", 0, E_CAL_POPUP_SOURCE_PRIMARY },
-	{ E_POPUP_ITEM, "20.delete", N_("Delete"), delete_task_list_cb, NULL, "stock_delete", 0, E_CAL_POPUP_SOURCE_USER|E_CAL_POPUP_SOURCE_PRIMARY },
-	{ E_POPUP_ITEM, "30.properties", N_("Properties..."), edit_task_list_cb, NULL, "stock_folder-properties", 0, E_CAL_POPUP_SOURCE_PRIMARY },
-};
-
-static void
-etc_source_popup_free(EPopup *ep, GSList *list, void *data)
-{
-	g_slist_free(list);
-}
-
-static gboolean
-popup_event_cb(ESourceSelector *selector, ESource *insource, GdkEventButton *event, TasksComponentView *component_view)
-{
-	ECalPopup *ep;
-	ECalPopupTargetSource *t;
-	GSList *menus = NULL;
-	int i;
-	GtkMenu *menu;
-
-	/** @HookPoint-ECalPopup: Tasks Source Selector Context Menu
-	 * @Id: org.gnome.evolution.tasks.source.popup
-	 * @Class: org.gnome.evolution.calendar.popup:1.0
-	 * @Target: ECalPopupTargetSource
-	 *
-	 * The context menu on the source selector in the tasks window.
-	 */
-	ep = e_cal_popup_new("org.gnome.evolution.tasks.source.popup");
-	t = e_cal_popup_target_new_source(ep, selector);
-	t->target.widget = (GtkWidget *)component_view->tasks;
-
-	for (i=0;i<sizeof(etc_source_popups)/sizeof(etc_source_popups[0]);i++)
-		menus = g_slist_prepend(menus, &etc_source_popups[i]);
-
-	e_popup_add_items((EPopup *)ep, menus, NULL,etc_source_popup_free, component_view);
-
-	menu = e_popup_create_menu_once((EPopup *)ep, (EPopupTarget *)t, 0);
-	gtk_menu_popup(menu, NULL, NULL, NULL, NULL, event?event->button:0, event?event->time:gtk_get_current_event_time());
-
-	return TRUE;
-}
-
-static void
-source_selection_changed_cb (ESourceSelector *selector, TasksComponentView *component_view)
-{
-	update_uris_for_selection (component_view);
-}
-
-static void
-primary_source_selection_changed_cb (ESourceSelector *selector, TasksComponentView *component_view)
-{
-	update_uri_for_primary_selection (component_view);
-}
-
-static void
-source_added_cb (ETasks *tasks, ESource *source, TasksComponentView *component_view)
-{
-	e_source_selector_select_source (E_SOURCE_SELECTOR (component_view->source_selector), source);
-}
-
-static void
-source_removed_cb (ETasks *tasks, ESource *source, TasksComponentView *component_view)
-{
-	e_source_selector_unselect_source (E_SOURCE_SELECTOR (component_view->source_selector), source);
-}
-
-static void
-set_info (TasksComponentView *component_view)
-{
-	GString *message = g_string_new ("");
-	int rows, selected_rows;
-	
-	rows = e_table_model_row_count (component_view->model);
-	selected_rows =  e_table_selected_count (component_view->table);
-
-	g_string_append_printf(message, ngettext("%d task", "%d tasks", rows), rows);
-	if (selected_rows > 0)
-		g_string_append_printf(message, ngettext(", %d selected", ", %d selected", selected_rows), selected_rows);
-
-	e_info_label_set_info (component_view->info_label, _("Tasks"), message->str);
-
-	g_string_free (message, TRUE);
-}
-
-static void
-table_selection_change_cb (ETableModel *etm, TasksComponentView *component_view)
-{
-	set_info (component_view);
-}
-
-static void
-model_changed_cb (ETableModel *etm, TasksComponentView *component_view)
-{
-	set_info (component_view);
-}
-
-static void
-model_rows_inserted_cb (ETableModel *etm, int row, int count, TasksComponentView *component_view)
-{
-	set_info (component_view);
-}
-
-static void
-model_rows_deleted_cb (ETableModel *etm, int row, int count, TasksComponentView *component_view)
-{
-	set_info (component_view);
-}
-
-/* Evolution::Component CORBA methods */
-
-static void
-impl_upgradeFromVersion (PortableServer_Servant servant,
-			 CORBA_short major,
-			 CORBA_short minor,
-			 CORBA_short revision,
-			 CORBA_Environment *ev)
-{
-	GError *err = NULL;
-	TasksComponent *component = TASKS_COMPONENT (bonobo_object_from_servant (servant));
-
-	if (!migrate_tasks(component, major, minor, revision, &err)) {
-		GNOME_Evolution_Component_UpgradeFailed *failedex;
-
-		failedex = GNOME_Evolution_Component_UpgradeFailed__alloc();
-		failedex->what = CORBA_string_dup(_("Failed upgrading tasks."));
-		failedex->why = CORBA_string_dup(err->message);
-		CORBA_exception_set(ev, CORBA_USER_EXCEPTION, ex_GNOME_Evolution_Component_UpgradeFailed, failedex);
-	}
-
-	if (err)
-		g_error_free(err);
-}
-
-static gboolean
-selector_tree_drag_drop (GtkWidget *widget, 
-			 GdkDragContext *context, 
-			 int x, 
-			 int y, 
-			 guint time, 
-			 CalendarComponent *component)
-{
-	GtkTreeViewColumn *column;
-	int cell_x;
-	int cell_y;
-	GtkTreePath *path;
-	GtkTreeModel *model;
-	GtkTreeIter iter;
-	gpointer data;
-	
-	if (!gtk_tree_view_get_path_at_pos  (GTK_TREE_VIEW (widget), x, y, &path, 
-					     &column, &cell_x, &cell_y))
-		return FALSE;
-	
-	
-	model = gtk_tree_view_get_model (GTK_TREE_VIEW (widget));
-
-	if (!gtk_tree_model_get_iter (model, &iter, path)) {
-		gtk_tree_path_free (path);
-		return FALSE;
-	}
-
-	gtk_tree_model_get (model, &iter, 0, &data, -1);
-	
-	if (E_IS_SOURCE_GROUP (data)) {
-		g_object_unref (data);
-		gtk_tree_path_free (path);
-		return FALSE;
-	}
-	
-	gtk_tree_path_free (path);
-	return TRUE;
-}
-	
-static gboolean
-selector_tree_drag_motion (GtkWidget *widget,
-			   GdkDragContext *context,
-			   int x,
-			   int y,
-			   guint time,
-			   gpointer user_data)
-{
-	GtkTreePath *path = NULL;
-	gpointer data = NULL;
-	GtkTreeViewDropPosition pos;
-	GtkTreeModel *model;
-	GtkTreeIter iter;
-	GdkDragAction action = GDK_ACTION_DEFAULT;
-	
-	if (!gtk_tree_view_get_dest_row_at_pos (GTK_TREE_VIEW (widget),
-						x, y, &path, &pos))
-		goto finish;
-	
-	model = gtk_tree_view_get_model (GTK_TREE_VIEW (widget));
-	
-	if (!gtk_tree_model_get_iter (model, &iter, path))
-		goto finish;
-	
-	gtk_tree_model_get (model, &iter, 0, &data, -1);
-
-	if (E_IS_SOURCE_GROUP (data) || e_source_get_readonly (data))
-		goto finish;
-	
-	gtk_tree_view_set_drag_dest_row(GTK_TREE_VIEW (widget), path, GTK_TREE_VIEW_DROP_INTO_OR_BEFORE);
-	action = context->suggested_action;
-
- finish:
-	if (path)
-		gtk_tree_path_free (path);
-	if (data)
-		g_object_unref (data);
-
-	gdk_drag_status (context, action, time);
-	return TRUE;
-}
-
-static gboolean
-update_single_object (ECal *client, icalcomponent *icalcomp)
-{
-	char *uid;
-	icalcomponent *tmp_icalcomp;
-
-	uid = (char *) icalcomponent_get_uid (icalcomp);
-	
-	if (e_cal_get_object (client, uid, NULL, &tmp_icalcomp, NULL))
-		return e_cal_modify_object (client, icalcomp, CALOBJ_MOD_ALL, NULL);
-
-	return e_cal_create_object (client, icalcomp, &uid, NULL);	
-}
-
-static gboolean
-update_objects (ECal *client, icalcomponent *icalcomp)
-{
-	icalcomponent *subcomp;
-	icalcomponent_kind kind;
-
-	kind = icalcomponent_isa (icalcomp);
-	if (kind == ICAL_VTODO_COMPONENT || kind == ICAL_VEVENT_COMPONENT)
-		return update_single_object (client, icalcomp);
-	else if (kind != ICAL_VCALENDAR_COMPONENT)
-		return FALSE;
-
-	subcomp = icalcomponent_get_first_component (icalcomp, ICAL_ANY_COMPONENT);
-	while (subcomp) {
-		gboolean success;
-		
-		kind = icalcomponent_isa (subcomp);
-		if (kind == ICAL_VTIMEZONE_COMPONENT) {
-			icaltimezone *zone;
-
-			zone = icaltimezone_new ();
-			icaltimezone_set_component (zone, subcomp);
-
-			success = e_cal_add_timezone (client, zone, NULL);
-			icaltimezone_free (zone, 1);
-			if (!success)
-				return success;
-		} else if (kind == ICAL_VTODO_COMPONENT ||
-			   kind == ICAL_VEVENT_COMPONENT) {
-			success = update_single_object (client, subcomp);
-			if (!success)
-				return success;
-		}
-
-		subcomp = icalcomponent_get_next_component (icalcomp, ICAL_ANY_COMPONENT);
-	}
-
-	return TRUE;
-}
-
-static void
-selector_tree_drag_data_received (GtkWidget *widget, 
-				  GdkDragContext *context, 
-				  gint x, 
-				  gint y, 
-				  GtkSelectionData *data,
-				  guint info,
-				  guint time,
-				  gpointer user_data)
-{
-	GtkTreePath *path = NULL;
-	GtkTreeViewDropPosition pos;
-	gpointer source = NULL;
-	GtkTreeModel *model;
-	GtkTreeIter iter;
-	gboolean success = FALSE;
-	icalcomponent *icalcomp = NULL;
-	ECal *client = NULL;
-
-	if (!gtk_tree_view_get_dest_row_at_pos (GTK_TREE_VIEW (widget),
-						x, y, &path, &pos))
-		goto finish;
-	
-	model = gtk_tree_view_get_model (GTK_TREE_VIEW (widget));
-	
-	if (!gtk_tree_model_get_iter (model, &iter, path))
-		goto finish;
-       
-	
-	gtk_tree_model_get (model, &iter, 0, &source, -1);
-
-	if (E_IS_SOURCE_GROUP (source) || e_source_get_readonly (source))
-		goto finish;
-
-	icalcomp = icalparser_parse_string (data->data);
-	
-	if (icalcomp) {
-		char * uid;
-
-		/* FIXME deal with GDK_ACTION_ASK */
-		if (context->action == GDK_ACTION_COPY) {
-			uid = e_cal_component_gen_uid ();
-			icalcomponent_set_uid (icalcomp, uid);
-		}
-
-		client = auth_new_cal_from_source (source, 
-						   E_CAL_SOURCE_TYPE_TODO);
-		
-		if (client) {
-			if (e_cal_open (client, TRUE, NULL)) {
-				success = TRUE;
-				update_objects (client, icalcomp);
-			}
-			
-			g_object_unref (client);
-		}
-		
-		icalcomponent_free (icalcomp);
-	}
-
- finish:
-	if (source)
-		g_object_unref (source);
-	if (path)
-		gtk_tree_path_free (path);
-
-	gtk_drag_finish (context, success, context->action == GDK_ACTION_MOVE, time);
-}	
-
-static void
-selector_tree_drag_leave (GtkWidget *widget, GdkDragContext *context, guint time, gpointer data)
-{
-	gtk_tree_view_set_drag_dest_row(GTK_TREE_VIEW (widget), 
-					NULL, GTK_TREE_VIEW_DROP_BEFORE);
-}
-
-
-static void
-control_activate_cb (BonoboControl *control, gboolean activate, gpointer data)
-{
-	TasksComponentView *component_view = data;
-
-	if (activate) {
-		BonoboUIComponent *uic;
-		uic = bonobo_control_get_ui_component (component_view->view_control);
-		
-		e_user_creatable_items_handler_activate (component_view->creatable_items_handler, uic);
-	}	
-}
-
-static void
-config_create_ecal_changed_cb (GConfClient *client, guint id, GConfEntry *entry, gpointer data)
-{	
-	TasksComponent *component = data;
-	TasksComponentPrivate *priv;
-	
-	priv = component->priv;
-
-	g_object_unref (priv->create_ecal);
-	priv->create_ecal = NULL;
-	
-	priv->notifications = g_list_remove (priv->notifications, GUINT_TO_POINTER (id));
-}
-
-static ECal *
-setup_create_ecal (TasksComponent *component, TasksComponentView *component_view) 
-{
-	TasksComponentPrivate *priv;
-	ESource *source = NULL;
-	char *uid;
-	guint not;
-	
-	priv = component->priv;
-
-	if (component_view) {
-		ECal *default_ecal;
-
-		default_ecal = e_tasks_get_default_client (component_view->tasks);
-		if (default_ecal)
-			return default_ecal;
-	}
-	
-	if (priv->create_ecal)
-		return priv->create_ecal; 
-	
-	/* Get the current primary calendar, or try to set one if it doesn't already exist */		
-	uid = calendar_config_get_primary_tasks ();
-	if (uid) {
-		source = e_source_list_peek_source_by_uid (priv->source_list, uid);
-		g_free (uid);
-
-		priv->create_ecal = auth_new_cal_from_source (source, E_CAL_SOURCE_TYPE_TODO);
-	} 
-
-	if (!priv->create_ecal) {
-		/* Try to create a default if there isn't one */
-		source = e_source_list_peek_source_any (priv->source_list);
-		if (source)
-			priv->create_ecal = auth_new_cal_from_source (source, E_CAL_SOURCE_TYPE_TODO);
-	}
-		
-	if (priv->create_ecal) {
-		icaltimezone *zone;
-
-		if (!e_cal_open (priv->create_ecal, FALSE, NULL)) {
-			GtkWidget *dialog;
-			
-			dialog = gtk_message_dialog_new (NULL, GTK_DIALOG_MODAL,
-							 GTK_MESSAGE_WARNING, GTK_BUTTONS_OK,
-							 _("Unable to open the task list '%s' for creating events and meetings"), 
-							   e_source_peek_name (source));
-			gtk_dialog_run (GTK_DIALOG (dialog));
-			gtk_widget_destroy (dialog);
-
-			return NULL;
-		}
-
-		zone = calendar_config_get_icaltimezone ();
-		e_cal_set_default_timezone (priv->create_ecal, zone, NULL);
-	} else {
-		GtkWidget *dialog;
-			
-		dialog = gtk_message_dialog_new (NULL, GTK_DIALOG_MODAL,
-						 GTK_MESSAGE_WARNING, GTK_BUTTONS_OK,
-						 _("There is no calendar available for creating tasks"));
-		gtk_dialog_run (GTK_DIALOG (dialog));
-		gtk_widget_destroy (dialog);
-
-		return NULL;
-	}		
-
-	/* Handle the fact it may change on us */
-	not = calendar_config_add_notification_primary_tasks (config_create_ecal_changed_cb, 
-							      component);
-	priv->notifications = g_list_prepend (priv->notifications, GUINT_TO_POINTER (not));
-
-	/* Save the primary source for use elsewhere */
-	calendar_config_set_primary_tasks (e_source_peek_uid (source));
-
-	return priv->create_ecal ;
-}
-
-static gboolean
-create_new_todo (TasksComponent *task_component, gboolean is_assigned, TasksComponentView *component_view)
-{
-	ECal *ecal;
-	TasksComponentPrivate *priv;
-	ECalComponent *comp;
-	TaskEditor *editor;
-	
-	priv = task_component->priv;
-	
-	ecal = setup_create_ecal (task_component, component_view);
-	if (!ecal)
-		return FALSE;
-
-	editor = task_editor_new (ecal, is_assigned);
-	comp = cal_comp_task_new_with_defaults (ecal);
-
-	comp_editor_edit_comp (COMP_EDITOR (editor), comp);
-	if (is_assigned)
-		task_editor_show_assignment (editor);
-	comp_editor_focus (COMP_EDITOR (editor));
-
-	e_comp_editor_registry_add (comp_editor_registry, COMP_EDITOR (editor), TRUE);
-
-	return TRUE;
-}
-
-static void
-create_local_item_cb (EUserCreatableItemsHandler *handler, const char *item_type_name, void *data)
-{
-	TasksComponent *tasks_component = data;
-	TasksComponentPrivate *priv;
-	TasksComponentView *component_view = NULL;
-	GList *l;
-	
-	priv = tasks_component->priv;
-	
-	for (l = priv->views; l; l = l->next) {
-		component_view = l->data;
-
-		if (component_view->creatable_items_handler == handler)
-			break;
-		
-		component_view = NULL;
-	}
-	
-	if (strcmp (item_type_name, CREATE_TASK_ID) == 0) {
-		create_new_todo (tasks_component, FALSE, component_view);
-	} else if (strcmp (item_type_name, CREATE_TASK_ASSIGNED_ID) == 0) {
-		create_new_todo (tasks_component, TRUE, component_view);
-	} else if (strcmp (item_type_name, CREATE_TASK_LIST_ID) == 0) {
-		calendar_setup_new_task_list (GTK_WINDOW (gtk_widget_get_toplevel (GTK_WIDGET (component_view->tasks))));
-	}
-}
-
-static TasksComponentView *
-create_component_view (TasksComponent *tasks_component)
-{
-	TasksComponentPrivate *priv;
-	TasksComponentView *component_view;
-	GtkWidget *selector_scrolled_window, *vbox;
-	GtkWidget *statusbar_widget;
-	AtkObject *a11y;
-	
-	priv = tasks_component->priv;
-
-	/* Create the calendar component view */
-	component_view = g_new0 (TasksComponentView, 1);
-	
-	/* Add the source lists */
-	component_view->source_list = g_object_ref (priv->source_list);
-	
-	/* Create sidebar selector */
-	component_view->source_selector = e_source_selector_new (tasks_component->priv->source_list);
-	e_source_selector_set_select_new ((ESourceSelector *)component_view->source_selector, TRUE);
-	a11y = gtk_widget_get_accessible (GTK_WIDGET (component_view->source_selector));
-	atk_object_set_name (a11y, _("Task Source Selector"));
-
-	g_signal_connect (component_view->source_selector, "drag-motion", G_CALLBACK (selector_tree_drag_motion), 
-			  tasks_component);
-	g_signal_connect (component_view->source_selector, "drag-leave", G_CALLBACK (selector_tree_drag_leave), 
-			  tasks_component);
-	g_signal_connect (component_view->source_selector, "drag-drop", G_CALLBACK (selector_tree_drag_drop), 
-			  tasks_component);
-	g_signal_connect (component_view->source_selector, "drag-data-received", 
-			  G_CALLBACK (selector_tree_drag_data_received), tasks_component);
-
-	gtk_drag_dest_set(component_view->source_selector, GTK_DEST_DEFAULT_ALL, drag_types,
-			  num_drag_types, GDK_ACTION_COPY | GDK_ACTION_MOVE);
-
-	gtk_widget_show (component_view->source_selector);
-
-	selector_scrolled_window = gtk_scrolled_window_new (NULL, NULL);
-	gtk_container_add (GTK_CONTAINER (selector_scrolled_window), component_view->source_selector);
-	gtk_scrolled_window_set_policy (GTK_SCROLLED_WINDOW (selector_scrolled_window),
-					GTK_POLICY_AUTOMATIC, GTK_POLICY_AUTOMATIC);
-	gtk_scrolled_window_set_shadow_type (GTK_SCROLLED_WINDOW (selector_scrolled_window),
-					     GTK_SHADOW_IN);
-	gtk_widget_show (selector_scrolled_window);
-
-	component_view->info_label = (EInfoLabel *)e_info_label_new("stock_task");
-	e_info_label_set_info(component_view->info_label, _("Tasks"), "");
-	gtk_widget_show (GTK_WIDGET (component_view->info_label));
-
-	vbox = gtk_vbox_new(FALSE, 0);
-	gtk_box_pack_start(GTK_BOX (vbox), GTK_WIDGET (component_view->info_label), FALSE, TRUE, 0);
-	gtk_box_pack_start(GTK_BOX (vbox), selector_scrolled_window, TRUE, TRUE, 0);
-	gtk_widget_show (vbox);
-
-	component_view->sidebar_control = bonobo_control_new (vbox);
-
-	/* Create main view */
-	component_view->view_control = tasks_control_new ();
-	if (!component_view->view_control) {
-		/* FIXME free memory */
-
-		return NULL;
-	}
-
-	component_view->tasks = (ETasks *) bonobo_control_get_widget (component_view->view_control);
-	component_view->table = e_calendar_table_get_table (e_tasks_get_calendar_table (component_view->tasks));
-	component_view->model = E_TABLE_MODEL (e_calendar_table_get_model (e_tasks_get_calendar_table (component_view->tasks)));
-
-	/* This signal is thrown if backends die - we update the selector */
-	g_signal_connect (component_view->tasks, "source_added", 
-			  G_CALLBACK (source_added_cb), component_view);
-	g_signal_connect (component_view->tasks, "source_removed", 
-			  G_CALLBACK (source_removed_cb), component_view);
-
-	/* Create status bar */
-	statusbar_widget = e_task_bar_new ();
-	component_view->activity_handler = e_activity_handler_new ();
-	e_activity_handler_attach_task_bar (component_view->activity_handler, E_TASK_BAR (statusbar_widget));
-	gtk_widget_show (statusbar_widget);
-
-	component_view->statusbar_control = bonobo_control_new (statusbar_widget);
-	
-	e_calendar_table_set_activity_handler (e_tasks_get_calendar_table (component_view->tasks), component_view->activity_handler);
-	
-	/* connect after setting the initial selections, or we'll get unwanted calls
-	   to calendar_control_sensitize_calendar_commands */
-	g_signal_connect (component_view->source_selector, "selection_changed",
-			  G_CALLBACK (source_selection_changed_cb), component_view);
-	g_signal_connect (component_view->source_selector, "primary_selection_changed",
-			  G_CALLBACK (primary_source_selection_changed_cb), component_view);
-	g_signal_connect (component_view->source_selector, "popup_event",
-			  G_CALLBACK (popup_event_cb), component_view);
-
-	/* Set up the "new" item handler */
-	component_view->creatable_items_handler = e_user_creatable_items_handler_new ("tasks", create_local_item_cb, tasks_component);
-	g_signal_connect (component_view->view_control, "activate", G_CALLBACK (control_activate_cb), component_view);
-
-	/* We use this to update the component information */
-	set_info (component_view);
-	g_signal_connect (component_view->table, "selection_change",
-			  G_CALLBACK (table_selection_change_cb), component_view);
-	g_signal_connect (component_view->model, "model_changed", 
-			  G_CALLBACK (model_changed_cb), component_view);
-	g_signal_connect (component_view->model, "model_rows_inserted",
-			  G_CALLBACK (model_rows_inserted_cb), component_view);
-	g_signal_connect (component_view->model, "model_rows_deleted",
-			  G_CALLBACK (model_rows_deleted_cb), component_view);
-
-	/* Load the selection from the last run */
-	update_selection (component_view);	
-	update_primary_selection (component_view);
-
-	return component_view;
-}
-
-static void
-destroy_component_view (TasksComponentView *component_view)
-{	
-	GList *l;
-	
-	if (component_view->source_list)
-		g_object_unref (component_view->source_list);
-
-	if (component_view->source_selection)
-		e_source_selector_free_selection (component_view->source_selection);
-	
-	for (l = component_view->notifications; l; l = l->next)
-		calendar_config_remove_notification (GPOINTER_TO_UINT (l->data));
-	g_list_free (component_view->notifications);
-
-	if (component_view->creatable_items_handler)
-		g_object_unref (component_view->creatable_items_handler);
-
-	if (component_view->activity_handler)
-		g_object_unref (component_view->activity_handler);
-
-	g_free (component_view);
-}
-
-static void
-view_destroyed_cb (gpointer data, GObject *where_the_object_was)
-{
-	TasksComponent *tasks_component = data;
-	TasksComponentPrivate *priv;
-	GList *l;
-	
-	priv = tasks_component->priv;
-
-	for (l = priv->views; l; l = l->next) {
-		TasksComponentView *component_view = l->data;
-		
-		if (G_OBJECT (component_view->view_control) == where_the_object_was) {
-			priv->views = g_list_remove (priv->views, component_view);
-			destroy_component_view (component_view);
-
-			break;
-		}
-	}
-}
-
-static void
-impl_createControls (PortableServer_Servant servant,
-		     Bonobo_Control *corba_sidebar_control,
-		     Bonobo_Control *corba_view_control,
-		     Bonobo_Control *corba_statusbar_control,
-		     CORBA_Environment *ev)
-{
-	TasksComponent *component = TASKS_COMPONENT (bonobo_object_from_servant (servant));
-	TasksComponentPrivate *priv;
-	TasksComponentView *component_view;
-	
-	priv = component->priv;
-
-	/* Create the calendar component view */
-	component_view = create_component_view (component);
-	if (!component_view) {
-		/* FIXME Should we describe the problem in a control? */
-		bonobo_exception_set (ev, ex_GNOME_Evolution_Component_Failed);
-
-		return;
-	}
-
-	g_object_weak_ref (G_OBJECT (component_view->view_control), view_destroyed_cb, component);
-	priv->views = g_list_append (priv->views, component_view);
-	
-	/* Return the controls */
-	*corba_sidebar_control = CORBA_Object_duplicate (BONOBO_OBJREF (component_view->sidebar_control), ev);
-	*corba_view_control = CORBA_Object_duplicate (BONOBO_OBJREF (component_view->view_control), ev);
-	*corba_statusbar_control = CORBA_Object_duplicate (BONOBO_OBJREF (component_view->statusbar_control), ev);
-}
-
-static GNOME_Evolution_CreatableItemTypeList *
-impl__get_userCreatableItems (PortableServer_Servant servant,
-			      CORBA_Environment *ev)
-{
-	GNOME_Evolution_CreatableItemTypeList *list = GNOME_Evolution_CreatableItemTypeList__alloc ();
-
-	list->_length  = 3;
-	list->_maximum = list->_length;
-	list->_buffer  = GNOME_Evolution_CreatableItemTypeList_allocbuf (list->_length);
-
-	CORBA_sequence_set_release (list, FALSE);
-
-	list->_buffer[0].id = CREATE_TASK_ID;
-	list->_buffer[0].description = _("New task");
-	list->_buffer[0].menuDescription = _("_Task");
-	list->_buffer[0].tooltip = _("Create a new task");
-	list->_buffer[0].menuShortcut = 't';
-	list->_buffer[0].iconName = "stock_task";
-	list->_buffer[0].type = GNOME_Evolution_CREATABLE_OBJECT;
-
-	list->_buffer[1].id = CREATE_TASK_ASSIGNED_ID;
-	list->_buffer[1].description = _("New assigned task");
-	list->_buffer[1].menuDescription = _("Assigne_d Task");
-	list->_buffer[1].tooltip = _("Create a new assigned task");
-	list->_buffer[1].menuShortcut = 'd';
-	list->_buffer[1].iconName = "stock_task";
-	list->_buffer[1].type = GNOME_Evolution_CREATABLE_OBJECT;
-
-	list->_buffer[2].id = CREATE_TASK_LIST_ID;
-	list->_buffer[2].description = _("New task list");
-	list->_buffer[2].menuDescription = _("Task l_ist");
-	list->_buffer[2].tooltip = _("Create a new task list");
-	list->_buffer[2].menuShortcut = 'i';
-	list->_buffer[2].iconName = "stock_todo";
-	list->_buffer[2].type = GNOME_Evolution_CREATABLE_FOLDER;
-
-	return list;
-}
-
-static void
-impl_requestCreateItem (PortableServer_Servant servant,
-			const CORBA_char *item_type_name,
-			CORBA_Environment *ev)
-{
-	TasksComponent *tasks_component = TASKS_COMPONENT (bonobo_object_from_servant (servant));
-	TasksComponentPrivate *priv;
-	
-	priv = tasks_component->priv;	
-	
-	if (strcmp (item_type_name, CREATE_TASK_ID) == 0) {
-		if (!create_new_todo (tasks_component, FALSE, NULL))
-			bonobo_exception_set (ev, ex_GNOME_Evolution_Component_Failed);
-	} else if (strcmp (item_type_name, CREATE_TASK_ASSIGNED_ID) == 0) {
-		if (!create_new_todo (tasks_component, TRUE, NULL))
-			bonobo_exception_set (ev, ex_GNOME_Evolution_Component_Failed);
-	} else if (strcmp (item_type_name, CREATE_TASK_LIST_ID) == 0) {
-		/* FIXME Should we use the last opened window? */
-		calendar_setup_new_task_list (NULL);
-	} else {
-		bonobo_exception_set (ev, ex_GNOME_Evolution_Component_UnknownType);
-	}
-}
-
-/* GObject methods.  */
-
-static void
-impl_dispose (GObject *object)
-{
-	TasksComponent *tasks_component = TASKS_COMPONENT (object);
-	TasksComponentPrivate *priv = tasks_component->priv;
-	GList *l;
-	
-	if (priv->source_list != NULL) {
-		g_object_unref (priv->source_list);
-		priv->source_list = NULL;
-	}
-	if (priv->source_selection != NULL) {
-		e_source_selector_free_selection (priv->source_selection);
-		priv->source_selection = NULL;
-	}
-
-	if (priv->create_ecal) {
-		g_object_unref (priv->create_ecal);
-		priv->create_ecal = NULL;
-	}
-
-	for (l = priv->views; l; l = l->next) {
-		TasksComponentView *component_view = l->data;
-	
-		g_object_weak_unref (G_OBJECT (component_view->view_control), view_destroyed_cb, tasks_component);
-	}
-	g_list_free (priv->views);
-	priv->views = NULL;
-
-	for (l = priv->notifications; l; l = l->next)
-		calendar_config_remove_notification (GPOINTER_TO_UINT (l->data));
-	g_list_free (priv->notifications);
-	priv->notifications = NULL;
-
-	(* G_OBJECT_CLASS (parent_class)->dispose) (object);
-}
-
-static void
-impl_finalize (GObject *object)
-{
-	TasksComponentPrivate *priv = TASKS_COMPONENT (object)->priv;
-	GList *l;
-	
-	for (l = priv->views; l; l = l->next) {
-		TasksComponentView *component_view = l->data;
-		
-		destroy_component_view (component_view);
-	}
-	g_list_free (priv->views);
-
-	g_free (priv->base_directory);
-	g_free (priv->config_directory);
-	g_free (priv);
-
-	(* G_OBJECT_CLASS (parent_class)->finalize) (object);
-}
-
-static void
-tasks_component_class_init (TasksComponentClass *klass)
-{
-	POA_GNOME_Evolution_Component__epv *epv = &klass->epv;
-	GObjectClass *object_class = G_OBJECT_CLASS (klass);
-
-	parent_class = g_type_class_peek_parent (klass);
-
-	epv->upgradeFromVersion      = impl_upgradeFromVersion;
-	epv->createControls          = impl_createControls;
-	epv->_get_userCreatableItems = impl__get_userCreatableItems;
-	epv->requestCreateItem       = impl_requestCreateItem;
-
-	object_class->dispose = impl_dispose;
-	object_class->finalize = impl_finalize;
-}
-
-static void
-tasks_component_init (TasksComponent *component, TasksComponentClass *klass)
-{
-	TasksComponentPrivate *priv;
-
-	priv = g_new0 (TasksComponentPrivate, 1);
-
-	priv->base_directory = g_build_filename (g_get_home_dir (), ".evolution", NULL);
-	priv->config_directory = g_build_filename (g_get_home_dir (),
-						   ".evolution", "tasks", "config",
-						   NULL);
-	
-	component->priv = priv;
-	ensure_sources (component);
-}
-
-/* Public API */
-
-TasksComponent *
-tasks_component_peek (void)
-{
-	static TasksComponent *component = NULL;
-
-	if (component == NULL) {
-		component = g_object_new (tasks_component_get_type (), NULL);
-
-		if (e_mkdir_hier (component->priv->config_directory, 0777) != 0) {
-			g_warning (G_STRLOC ": Cannot create directory %s: %s",
-				   component->priv->config_directory, g_strerror (errno));
-			g_object_unref (component);
-			component = NULL;
-		}
-	}
-
-	return component;
-}
-
-const char *
-tasks_component_peek_base_directory (TasksComponent *component)
-{
-	return component->priv->base_directory;
-}
-
-const char *
-tasks_component_peek_config_directory (TasksComponent *component)
-{
-	return component->priv->config_directory;
-}
-
-ESourceList *
-tasks_component_peek_source_list (TasksComponent *component)
-{
-	return component->priv->source_list;	
-}
-
-BONOBO_TYPE_FUNC_FULL (TasksComponent, GNOME_Evolution_Component, PARENT_TYPE, tasks_component)
diff --git a/calendar/gui/tasks-component.h b/calendar/gui/tasks-component.h
deleted file mode 100644
index b5050f3840..0000000000
--- a/calendar/gui/tasks-component.h
+++ /dev/null
@@ -1,63 +0,0 @@
-/* -*- Mode: C; indent-tabs-mode: t; c-basic-offset: 8; tab-width: 8 -*- */
-/* tasks-component.h
- *
- * Copyright (C) 2003  Novell, Inc.
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of version 2 of the GNU General Public
- * License as published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * General Public License for more details.
- *
- * You should have received a copy of the GNU General Public
- * License along with this program; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
- *
- * Author: Rodrigo Moya <rodrigo@ximian.com>
- */
-
-#ifndef _TASKS_COMPONENT_H_
-#define _TASKS_COMPONENT_H_
-
-#include <bonobo/bonobo-object.h>
-#include <libedataserver/e-source-list.h>
-#include <widgets/misc/e-activity-handler.h>
-#include "Evolution.h"
-
-
-#define TASKS_TYPE_COMPONENT			(tasks_component_get_type ())
-#define TASKS_COMPONENT(obj)			(G_TYPE_CHECK_INSTANCE_CAST ((obj), TASKS_TYPE_COMPONENT, TasksComponent))
-#define TASKS_COMPONENT_CLASS(klass)		(G_TYPE_CHECK_CLASS_CAST ((klass), TASKS_TYPE_COMPONENT, TasksComponentClass))
-#define TASKS_IS_COMPONENT(obj)			(G_TYPE_CHECK_INSTANCE_TYPE ((obj), TASKS_TYPE_COMPONENT))
-#define TASKS_IS_COMPONENT_CLASS(klass)		(G_TYPE_CHECK_CLASS_TYPE ((obj), TASKS_TYPE_COMPONENT))
-
-
-typedef struct _TasksComponent        TasksComponent;
-typedef struct _TasksComponentPrivate TasksComponentPrivate;
-typedef struct _TasksComponentClass   TasksComponentClass;
-
-struct _TasksComponent {
-	BonoboObject parent;
-
-	TasksComponentPrivate *priv;
-};
-
-struct _TasksComponentClass {
-	BonoboObjectClass parent_class;
-
-	POA_GNOME_Evolution_Component__epv epv;
-};
-
-
-GType             tasks_component_get_type  (void);
-TasksComponent   *tasks_component_peek  (void);
-
-const char       *tasks_component_peek_base_directory (TasksComponent *component);
-const char       *tasks_component_peek_config_directory (TasksComponent *component);
-ESourceList      *tasks_component_peek_source_list (TasksComponent *component);
-
-#endif /* _TASKS_COMPONENT_H_ */
diff --git a/calendar/gui/tasks-control.c b/calendar/gui/tasks-control.c
deleted file mode 100644
index e3f3358e9f..0000000000
--- a/calendar/gui/tasks-control.c
+++ /dev/null
@@ -1,435 +0,0 @@
-/* -*- Mode: C; indent-tabs-mode: t; c-basic-offset: 8; tab-width: 8 -*- */
-/* tasks-control.c
- *
- * Copyright (C) 2000, 2001, 2002, 2003  Ximian, Inc.
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of version 2 of the GNU General Public
- * License as published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * General Public License for more details.
- *
- * You should have received a copy of the GNU General Public
- * License along with this program; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
- *
- * Authors: Damon Chaplin <damon@ximian.com>
- *	    Ettore Perazzoli
- */
-
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
-
-#include <gtk/gtksignal.h>
-#include <gtk/gtklabel.h>
-#include <gtk/gtkcheckbutton.h>
-#include <gtk/gtkmessagedialog.h>
-#include <libgnome/gnome-i18n.h>
-#include <libgnome/gnome-util.h>
-#include <libgnomeui/gnome-dialog.h>
-#include <libgnomeui/gnome-dialog-util.h>
-#include <libgnomeui/gnome-stock-icons.h>
-#include <libgnomeprint/gnome-print.h>
-#include <libgnomeprint/gnome-print-paper.h>
-#include <libgnomeprint/gnome-print-job.h>
-#include <libgnomeprintui/gnome-print-job-preview.h>
-#include <libgnomeprintui/gnome-print-paper-selector.h>
-#include <libgnomeprintui/gnome-print-preview.h>
-#include <libgnomeprintui/gnome-print-dialog.h>
-#include <bonobo/bonobo-control.h>
-#include <bonobo/bonobo-ui-util.h>
-#include <e-util/e-dialog-utils.h>
-#include <e-util/e-print.h>
-#include "dialogs/cal-prefs-dialog.h"
-#include "calendar-config.h"
-#include "calendar-commands.h"
-#include "e-tasks.h"
-#include "e-calendar-table.h"
-#include "print.h"
-#include "tasks-control.h"
-#include "evolution-shell-component-utils.h"
-
-#define FIXED_MARGIN                            .05
-
-
-static void tasks_control_activate_cb		(BonoboControl		*control,
-						 gboolean		 activate,
-						 gpointer		 user_data);
-static void tasks_control_open_task_cmd		(BonoboUIComponent	*uic,
-						 gpointer		 data,
-						 const char		*path);
-static void tasks_control_new_task_cmd		(BonoboUIComponent	*uic,
-						 gpointer		 data,
-						 const char		*path);
-static void tasks_control_cut_cmd               (BonoboUIComponent      *uic,
-						 gpointer                data,
-						 const gchar            *path);
-static void tasks_control_copy_cmd              (BonoboUIComponent      *uic,
-						 gpointer                data,
-						 const gchar            *path);
-static void tasks_control_paste_cmd             (BonoboUIComponent      *uic,
-						 gpointer                data,
-						 const gchar            *path);
-static void tasks_control_delete_cmd		(BonoboUIComponent	*uic,
-						 gpointer		 data,
-						 const char		*path);
-static void tasks_control_complete_cmd		(BonoboUIComponent	*uic,
-						 gpointer		 data,
-						 const char		*path);
-static void tasks_control_purge_cmd		(BonoboUIComponent	*uic,
-						 gpointer		 data,
-						 const char		*path);
-static void tasks_control_print_cmd		(BonoboUIComponent	*uic,
-						 gpointer		 data,
-						 const char		*path);
-static void tasks_control_print_preview_cmd	(BonoboUIComponent	*uic,
-						 gpointer		 data,
-						 const char		*path);
-
-
-BonoboControl *
-tasks_control_new (void)
-{
-	BonoboControl *control;
-	GtkWidget *tasks;
-
-	tasks = e_tasks_new ();
-	if (!tasks)
-		return NULL;
-	gtk_widget_show (tasks);
-
-	control = bonobo_control_new (tasks);
-	if (!control) {
-		gtk_widget_destroy (tasks);
-		g_message ("control_factory_fn(): could not create the control!");
-		return NULL;
-	}
-
-	g_signal_connect (control, "activate", G_CALLBACK (tasks_control_activate_cb), tasks);
-
-	return control;
-}
-
-
-static void
-tasks_control_activate_cb		(BonoboControl		*control,
-					 gboolean		 activate,
-					 gpointer		 user_data)
-{
-	ETasks *tasks;
-
-	tasks = E_TASKS (user_data);
-
-	if (activate)
-		tasks_control_activate (control, tasks);
-	else
-		tasks_control_deactivate (control, tasks);
-}
-
-/* Sensitizes the UI Component menu/toolbar commands based on the number of
- * selected tasks.
- */
-void
-tasks_control_sensitize_commands (BonoboControl *control, ETasks *tasks, int n_selected)
-{
-	BonoboUIComponent *uic;
-	gboolean read_only = TRUE;
-	ECal *ecal;
-	ECalModel *model;
-
-	uic = bonobo_control_get_ui_component (control);
-	g_assert (uic != NULL);
-
-	if (bonobo_ui_component_get_container (uic) == CORBA_OBJECT_NIL)
-		return;
-
-	model = e_calendar_table_get_model (e_tasks_get_calendar_table (tasks));
-	ecal = e_cal_model_get_default_client (model);
-	if (ecal)
-		e_cal_is_read_only (ecal, &read_only, NULL);
-
-	bonobo_ui_component_set_prop (uic, "/commands/TasksOpenTask", "sensitive",
-				      n_selected != 1 ? "0" : "1",
-				      NULL);
-	bonobo_ui_component_set_prop (uic, "/commands/TasksCut", "sensitive",
-				      n_selected == 0 || read_only ? "0" : "1",
-				      NULL);
-	bonobo_ui_component_set_prop (uic, "/commands/TasksCopy", "sensitive",
-				      n_selected == 0 ? "0" : "1",
-				      NULL);
-	bonobo_ui_component_set_prop (uic, "/commands/TasksPaste", "sensitive",
-				      read_only ? "0" : "1",
-				      NULL);
-	bonobo_ui_component_set_prop (uic, "/commands/TasksDelete", "sensitive",
-				      n_selected == 0 || read_only ? "0" : "1",
-				      NULL);
-	bonobo_ui_component_set_prop (uic, "/commands/TasksMarkComplete", "sensitive",
-				      n_selected == 0 || read_only ? "0" : "1",
-				      NULL);
-	bonobo_ui_component_set_prop (uic, "/commands/TasksPurge", "sensitive",
-				      read_only ? "0" : "1",
-				      NULL);
-}
-
-/* Callback used when the selection in the table changes */
-static void
-selection_changed_cb (ETasks *tasks, int n_selected, gpointer data)
-{
-	BonoboControl *control;
-
-	control = BONOBO_CONTROL (data);
-
-	tasks_control_sensitize_commands (control, tasks, n_selected);
-}
-
-static BonoboUIVerb verbs [] = {
-	BONOBO_UI_VERB ("TasksOpenTask", tasks_control_open_task_cmd),
-	BONOBO_UI_VERB ("TasksNewTask", tasks_control_new_task_cmd),
-	BONOBO_UI_VERB ("TasksCut", tasks_control_cut_cmd),
-	BONOBO_UI_VERB ("TasksCopy", tasks_control_copy_cmd),
-	BONOBO_UI_VERB ("TasksPaste", tasks_control_paste_cmd),
-	BONOBO_UI_VERB ("TasksDelete", tasks_control_delete_cmd),
-	BONOBO_UI_VERB ("TasksMarkComplete", tasks_control_complete_cmd),
-	BONOBO_UI_VERB ("TasksPurge", tasks_control_purge_cmd),
-	BONOBO_UI_VERB ("TasksPrint", tasks_control_print_cmd),
-	BONOBO_UI_VERB ("TasksPrintPreview", tasks_control_print_preview_cmd),
-
-	BONOBO_UI_VERB_END
-};
-
-void
-tasks_control_activate (BonoboControl *control, ETasks *tasks)
-{
-	Bonobo_UIContainer remote_uih;
-	BonoboUIComponent *uic;
-	int n_selected;
-	ECalendarTable *cal_table;
-	ETable *etable;
-
-	uic = bonobo_control_get_ui_component (control);
-	g_assert (uic != NULL);
-
-	remote_uih = bonobo_control_get_remote_ui_container (control, NULL);
-	bonobo_ui_component_set_container (uic, remote_uih, NULL);
-	bonobo_object_release_unref (remote_uih, NULL);
-
-	e_tasks_set_ui_component (tasks, uic);
-
-	bonobo_ui_component_add_verb_list_with_data (uic, verbs, tasks);
-
-	bonobo_ui_component_freeze (uic, NULL);
-
-	bonobo_ui_util_set_ui (uic, PREFIX,
-			       EVOLUTION_UIDIR "/evolution-tasks.xml",
-			       "evolution-tasks",
-			       NULL);
-
-	e_tasks_setup_view_menus (tasks, uic);
-
-	/* Signals from the tasks widget; also sensitize the menu items as appropriate */
-
-	g_signal_connect (tasks, "selection_changed", G_CALLBACK (selection_changed_cb), control);
-
-	cal_table = e_tasks_get_calendar_table (tasks);
-	etable = e_calendar_table_get_table (cal_table);
-	n_selected = e_table_selected_count (etable);
-
-	tasks_control_sensitize_commands (control, tasks, n_selected);
-
-	bonobo_ui_component_thaw (uic, NULL);
-
-	/* Show the dialog for setting the timezone if the user hasn't chosen
-	   a default timezone already. This is done in the startup wizard now,
-	   so we don't do it here. */
-#if 0
-	calendar_config_check_timezone_set ();
-#endif
-}
-
-
-void
-tasks_control_deactivate (BonoboControl *control, ETasks *tasks)
-{
-	BonoboUIComponent *uic = bonobo_control_get_ui_component (control);
-
-	g_assert (uic != NULL);
-
-	e_tasks_set_ui_component (tasks, NULL);
-
-	e_tasks_discard_view_menus (tasks);
-
-	/* Stop monitoring the "selection_changed" signal */
-	g_signal_handlers_disconnect_matched (tasks, G_SIGNAL_MATCH_DATA, 0, 0, NULL, NULL, control);
-
-	bonobo_ui_component_rm (uic, "/", NULL);
- 	bonobo_ui_component_unset_container (uic, NULL);
-}
-
-static void tasks_control_open_task_cmd		(BonoboUIComponent	*uic,
-						 gpointer		 data,
-						 const char		*path)
-{
-	ETasks *tasks;
-
-	tasks = E_TASKS (data);
-	e_tasks_open_task (tasks);
-}
-
-static void
-tasks_control_new_task_cmd		(BonoboUIComponent	*uic,
-					 gpointer		 data,
-					 const char		*path)
-{
-	ETasks *tasks;
-
-	tasks = E_TASKS (data);
-	e_tasks_new_task (tasks);
-}
-
-static void
-tasks_control_cut_cmd                   (BonoboUIComponent      *uic,
-					 gpointer                data,
-					 const char             *path)
-{
-	ETasks *tasks;
-	ECalendarTable *cal_table;
-
-	tasks = E_TASKS (data);
-	cal_table = e_tasks_get_calendar_table (tasks);
-	e_calendar_table_cut_clipboard (cal_table);
-}
-
-static void
-tasks_control_copy_cmd                  (BonoboUIComponent      *uic,
-					 gpointer                data,
-					 const char             *path)
-{
-	ETasks *tasks;
-	ECalendarTable *cal_table;
-
-	tasks = E_TASKS (data);
-	cal_table = e_tasks_get_calendar_table (tasks);
-	e_calendar_table_copy_clipboard (cal_table);
-}
-
-static void
-tasks_control_paste_cmd                 (BonoboUIComponent      *uic,
-					 gpointer                data,
-					 const char             *path)
-{
-	ETasks *tasks;
-	ECalendarTable *cal_table;
-
-	tasks = E_TASKS (data);
-	cal_table = e_tasks_get_calendar_table (tasks);
-	e_calendar_table_paste_clipboard (cal_table);
-}
-
-static void
-tasks_control_delete_cmd		(BonoboUIComponent	*uic,
-					 gpointer		 data,
-					 const char		*path)
-{
-	ETasks *tasks;
-
-	tasks = E_TASKS (data);
-	e_tasks_delete_selected (tasks);
-}
-
-static void
-tasks_control_complete_cmd		(BonoboUIComponent	*uic,
-					 gpointer		 data,
-					 const char		*path)
-{
-	ETasks *tasks;
-
-	tasks = E_TASKS (data);
-	e_tasks_complete_selected (tasks);
-}
-
-static gboolean
-confirm_purge (ETasks *tasks)
-{
-	GtkWidget *dialog, *checkbox, *parent;
-	int button;
-	
-	if (!calendar_config_get_confirm_purge ())
-		return TRUE;
-
-	parent = gtk_widget_get_toplevel (GTK_WIDGET (tasks));
-	dialog = gtk_message_dialog_new (
-		(GtkWindow *)parent,
-		GTK_DIALOG_DESTROY_WITH_PARENT,
-		GTK_MESSAGE_WARNING,
-		GTK_BUTTONS_YES_NO,
-		_("This operation will permanently erase all tasks marked as completed. If you continue, you will not be able to recover these tasks.\n\nReally erase these tasks?"));
-	gtk_dialog_set_default_response (GTK_DIALOG (dialog), GTK_RESPONSE_NO);
-
-	checkbox = gtk_check_button_new_with_label (_("Do not ask me again."));
-	gtk_widget_show (checkbox);
-	gtk_box_pack_start (GTK_BOX (GTK_DIALOG (dialog)->vbox), checkbox, TRUE, TRUE, 6);
-	
-	button = gtk_dialog_run (GTK_DIALOG (dialog));	
-	if (button == GTK_RESPONSE_YES && gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (checkbox)))
-		calendar_config_set_confirm_purge (FALSE);
-	gtk_widget_destroy (dialog);
-	
-	return button == GTK_RESPONSE_YES ? TRUE : FALSE;
-}
-
-static void
-tasks_control_purge_cmd	(BonoboUIComponent	*uic,
-			 gpointer		 data,
-			 const char		*path)
-{
-	ETasks *tasks;
-
-	tasks = E_TASKS (data);
-	
-	if (confirm_purge (tasks))
-	    e_tasks_delete_completed (tasks);
-}
-
-
-static void
-print_tasks (ETasks *tasks, gboolean preview)
-{
-	ECalendarTable *cal_table;
-	ETable *etable;
-
-	cal_table = e_tasks_get_calendar_table (tasks);
-	etable = e_calendar_table_get_table (E_CALENDAR_TABLE (cal_table));
-
-	print_table (etable, _("Print Tasks"), _("Tasks"), preview);
-}
-
-/* File/Print callback */
-static void
-tasks_control_print_cmd (BonoboUIComponent *uic,
-			 gpointer data,
-			 const char *path)
-{
-	ETasks *tasks;
-
-	tasks = E_TASKS (data);
-
-	print_tasks (tasks, FALSE);
-}
-
-static void
-tasks_control_print_preview_cmd (BonoboUIComponent *uic,
-				 gpointer data,
-				 const char *path)
-{
-	ETasks *tasks;
-
-	tasks = E_TASKS (data);
-
-	print_tasks (tasks, TRUE);
-}
-
diff --git a/calendar/gui/tasks-control.h b/calendar/gui/tasks-control.h
deleted file mode 100644
index 97938ec613..0000000000
--- a/calendar/gui/tasks-control.h
+++ /dev/null
@@ -1,34 +0,0 @@
-/* -*- Mode: C; indent-tabs-mode: t; c-basic-offset: 8; tab-width: 8 -*- */
-/* tasks-control.h
- *
- * Copyright (C) 2000, 2001, 2002, 2003  Ximian, Inc.
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of version 2 of the GNU General Public
- * License as published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * General Public License for more details.
- *
- * You should have received a copy of the GNU General Public
- * License along with this program; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
- *
- * Authors: Federico Mena Quintero <federico@ximian.com>
- *	    Damon Chaplin <damon@ximian.com>
- */
-
-#ifndef _TASKS_CONTROL_H_
-#define _TASKS_CONTROL_H_
-
-#include "e-tasks.h"
-
-BonoboControl *tasks_control_new                (void);
-void           tasks_control_activate           (BonoboControl *control, ETasks *tasks);
-void           tasks_control_deactivate         (BonoboControl *control, ETasks *tasks);
-void           tasks_control_sensitize_commands (BonoboControl *control, ETasks *tasks, int n_selected);
-
-#endif /* _TASKS_CONTROL_H_ */
diff --git a/calendar/gui/weekday-picker.c b/calendar/gui/weekday-picker.c
deleted file mode 100644
index 7a7e8ad85f..0000000000
--- a/calendar/gui/weekday-picker.c
+++ /dev/null
@@ -1,651 +0,0 @@
-/* Evolution calendar - Week day picker widget
- *
- * Copyright (C) 2000 Ximian, Inc.
- *
- * Author: Federico Mena-Quintero <federico@ximian.com>
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of version 2 of the GNU General Public
- * License as published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307, USA.
- */
-
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
-
-#include <string.h>
-#include <gtk/gtksignal.h>
-#include <gdk/gdkkeysyms.h>
-#include <libgnome/gnome-i18n.h>
-#include <libgnomecanvas/gnome-canvas-rect-ellipse.h>
-#include <libgnomecanvas/gnome-canvas-text.h>
-#include "weekday-picker.h"
-
-
-
-#define PADDING 2
-
-/* Private part of the WeekdayPicker structure */
-struct _WeekdayPickerPrivate {
-	/* Selected days; see weekday_picker_set_days() */
-	guint8 day_mask;
-
-	/* Blocked days; these cannot be modified */
-	guint8 blocked_day_mask;
-
-	/* Day that defines the start of the week; 0 = Sunday, ..., 6 = Saturday */
-	int week_start_day;
-
-	/* Current keyboard focus day */
-	int focus_day;
-
-	/* Metrics */
-	int font_ascent, font_descent;
-	int max_letter_width;
-
-	/* Components */
-	GnomeCanvasItem *boxes[7];
-	GnomeCanvasItem *labels[7];
-};
-
-
-
-/* Signal IDs */
-enum {
-	CHANGED,
-	LAST_SIGNAL
-};
-
-static void weekday_picker_class_init (WeekdayPickerClass *class);
-static void weekday_picker_init (WeekdayPicker *wp);
-static void weekday_picker_destroy (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 gboolean weekday_picker_focus (GtkWidget *widget, GtkDirectionType direction);
-static void colorize_items (WeekdayPicker *wp);
-
-static guint wp_signals[LAST_SIGNAL];
-
-G_DEFINE_TYPE (WeekdayPicker, weekday_picker, GNOME_TYPE_CANVAS);
-
-/* 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;
-
-	wp_signals[CHANGED] =
-		gtk_signal_new ("changed",
-				GTK_RUN_FIRST,
-				G_TYPE_FROM_CLASS (object_class),
-				GTK_SIGNAL_OFFSET (WeekdayPickerClass, changed),
-				gtk_marshal_NONE__NONE,
-				GTK_TYPE_NONE, 0);
-
-	object_class->destroy = weekday_picker_destroy;
-
-	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;
-	widget_class->focus = weekday_picker_focus;
-
-	class->changed = NULL;
-}
-
-static void 
-day_clicked (WeekdayPicker *wp, int index)
-{
-	WeekdayPickerPrivate *priv = wp->priv;
-	guint8 day_mask;
-
-	if (priv->blocked_day_mask & (0x1 << index))
-		return;
-
-	if (priv->day_mask & (0x1 << index))
-		day_mask = priv->day_mask & ~(0x1 << index);
-	else
-		day_mask = priv->day_mask | (0x1 << index);
-
-	weekday_picker_set_days (wp, day_mask);
-}
-
-static gint
-handle_key_press_event (WeekdayPicker *wp, GdkEvent *event)
-{
-	WeekdayPickerPrivate *priv = wp->priv;
-	guint keyval = event->key.keyval;
-
-	if (priv->focus_day == -1)
-		priv->focus_day = priv->week_start_day;
-
-	switch (keyval) {
-		case GDK_Up:
-		case GDK_Right:
-			priv->focus_day += 1;
-			break;
-		case GDK_Down:
-		case GDK_Left:
-			priv->focus_day -= 1;
-			break;
-		case GDK_space:
-		case GDK_Return:
-			day_clicked (wp, priv->focus_day);
-			return TRUE;
-		default:
-			return FALSE;
-	}
-
-	if (priv->focus_day > 6)
-		priv->focus_day = 0;
-	if (priv->focus_day < 0)
-		priv->focus_day = 6;
-
-	colorize_items (wp);
-	gnome_canvas_item_grab_focus (priv->boxes[priv->focus_day]);
-	return TRUE;
-}
-
-/* Event handler for the day items */
-static gint
-day_event_cb (GnomeCanvasItem *item, GdkEvent *event, gpointer data)
-{
-	WeekdayPicker *wp;
-	WeekdayPickerPrivate *priv;
-	int i;
-
-	wp = WEEKDAY_PICKER (data);
-	priv = wp->priv;
-
-	if (event->type == GDK_KEY_PRESS)
-		return handle_key_press_event(wp, event);
-
-	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);
-
-	i += priv->week_start_day;
-	if (i >= 7)
-		i -= 7;
-
-	priv->focus_day = i;
-	gnome_canvas_item_grab_focus (priv->boxes[i]);
-	day_clicked (wp, i);
-	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);
-		g_signal_connect (priv->boxes[i], "event", G_CALLBACK (day_event_cb), wp);
-
-		priv->labels[i] = gnome_canvas_item_new (parent,
-							 GNOME_TYPE_CANVAS_TEXT,
-							 NULL);
-		g_signal_connect (priv->labels[i], "event", G_CALLBACK (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);
-	priv->focus_day = -1;
-}
-
-/* Finalize handler for the weekday picker */
-static void
-weekday_picker_destroy (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 (weekday_picker_parent_class)->destroy)
-		(* GTK_OBJECT_CLASS (weekday_picker_parent_class)->destroy) (object);
-}
-
-static void
-colorize_items (WeekdayPicker *wp)
-{
-	WeekdayPickerPrivate *priv;
-	GdkColor *outline, *focus_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)];
-	focus_outline = &GTK_WIDGET (wp)->style->bg[GTK_WIDGET_STATE (wp)];
-
-	fill = &GTK_WIDGET (wp)->style->base[GTK_WIDGET_STATE (wp)];
-	text_fill = &GTK_WIDGET (wp)->style->fg[GTK_WIDGET_STATE (wp)];
-
-	sel_fill = &GTK_WIDGET (wp)->style->bg[GTK_STATE_SELECTED];
-	sel_text_fill = &GTK_WIDGET (wp)->style->fg[GTK_STATE_SELECTED];
-
-	for (i = 0; i < 7; i++) {
-		int day;
-		GdkColor *f, *t, *o;
-
-		day = i + priv->week_start_day;
-		if (day >= 7)
-			day -= 7;
-
-		if (priv->day_mask & (0x1 << day)) {
-			f = sel_fill;
-			t = sel_text_fill;
-		} else {
-			f = fill;
-			t = text_fill;
-		}
-
-		if (day == priv->focus_day)
-			o = focus_outline;
-		else
-			o = outline;
-
-		gnome_canvas_item_set (priv->boxes[i],
-				       "fill_color_gdk", f,
-				       "outline_color_gdk", o,
-				       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 char *
-get_day_text (int day_index)
-{
-	/* The first letter of each day of the week starting with Sunday */
-	const char *str = _("SMTWTFS");
-	char *day;
-	int char_size = 0;
-
-	day = g_utf8_offset_to_pointer (str, day_index);
-
-	/* we use strlen because we actually want to count bytes */
-	if (day_index == 6)
-		char_size = strlen (day); 
-	else
-		char_size = strlen (day) - strlen (g_utf8_find_next_char (day, NULL));
-
-	return g_strndup (day, char_size);
-}
-
-static void
-configure_items (WeekdayPicker *wp)
-{
-	WeekdayPickerPrivate *priv;
-	int width, height;
-	int box_width;
-	int i;
-
-	priv = wp->priv;
-
-	width = GTK_WIDGET (wp)->allocation.width;
-	height = GTK_WIDGET (wp)->allocation.height;
-
-	box_width = (width - 1) / 7;
-
-	for (i = 0; i < 7; i++) {
-		char *c;
-		int day;
-
-		day = i + priv->week_start_day;
-		if (day >= 7)
-			day -= 7;
-
-		gnome_canvas_item_set (priv->boxes[i],
-				       "x1", (double) (i * box_width),
-				       "y1", (double) 0,
-				       "x2", (double) ((i + 1) * box_width),
-				       "y2", (double) (height - 1),
-				       "width_pixels", 0,
-				       NULL);
-
-		c = get_day_text (day);
-		gnome_canvas_item_set (priv->labels[i],
-				       "text", c,
-#if 0
-				       "font_gdk", gtk_style_get_font (gtk_widget_get_style (GTK_WIDGET (wp))),
-#endif
-				       "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 (weekday_picker_parent_class)->realize)
-		(* GTK_WIDGET_CLASS (weekday_picker_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 (weekday_picker_parent_class)->size_allocate)
-		(* GTK_WIDGET_CLASS (weekday_picker_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;
-	int i;
-	PangoFontDescription *font_desc;
-	PangoContext *pango_context;
-	PangoFontMetrics *font_metrics;
-	PangoLayout *layout;
-
-	wp = WEEKDAY_PICKER (widget);
-	priv = wp->priv;
-
-	/* Set up Pango prerequisites */
-	font_desc = gtk_widget_get_style (widget)->font_desc;
-	pango_context = gtk_widget_get_pango_context (widget);
-	font_metrics = pango_context_get_metrics (pango_context, font_desc,
-						  pango_context_get_language (pango_context));
-	layout = pango_layout_new (pango_context);
-
-	priv->font_ascent = PANGO_PIXELS (pango_font_metrics_get_ascent (font_metrics));
-	priv->font_descent = PANGO_PIXELS (pango_font_metrics_get_descent (font_metrics));
-
-	max_width = 0;
-
-	for (i = 0; i < 7; i++) {
-		char *c;
-		int w;
-
-		c = get_day_text (i);
-		pango_layout_set_text (layout, c, strlen (c));
-		pango_layout_get_pixel_size (layout, &w, NULL);
-		g_free (c);
-		
-		if (w > max_width)
-			max_width = w;
-	}
-
-	priv->max_letter_width = max_width;
-
-	configure_items (wp);
-	g_object_unref (layout);
-	pango_font_metrics_unref (font_metrics);
-
-	if (GTK_WIDGET_CLASS (weekday_picker_parent_class)->style_set)
-		(* GTK_WIDGET_CLASS (weekday_picker_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 g_object_new (TYPE_WEEKDAY_PICKER, NULL);
-}
-
-/**
- * weekday_picker_set_days:
- * @wp: A weekday picker.
- * @day_mask: Bitmask with the days to be selected.
- * 
- * Sets the days that are selected in a weekday picker.  In the @day_mask,
- * Sunday is bit 0, Monday is bit 1, etc.
- **/
-void
-weekday_picker_set_days (WeekdayPicker *wp, guint8 day_mask)
-{
-	WeekdayPickerPrivate *priv;
-
-	g_return_if_fail (wp != NULL);
-	g_return_if_fail (IS_WEEKDAY_PICKER (wp));
-
-	priv = wp->priv;
-
-	priv->day_mask = day_mask;
-	colorize_items (wp);
-
-	gtk_signal_emit (GTK_OBJECT (wp), wp_signals[CHANGED]);
-}
-
-/**
- * weekday_picker_get_days:
- * @wp: A weekday picker.
- * 
- * Queries the days that are selected in a weekday picker.
- * 
- * Return value: Bit mask of selected days.  Sunday is bit 0, Monday is bit 1,
- * etc.
- **/
-guint8
-weekday_picker_get_days (WeekdayPicker *wp)
-{
-	WeekdayPickerPrivate *priv;
-
-	g_return_val_if_fail (wp != NULL, 0);
-	g_return_val_if_fail (IS_WEEKDAY_PICKER (wp), 0);
-
-	priv = wp->priv;
-	return priv->day_mask;
-}
-
-/**
- * weekday_picker_set_blocked_days:
- * @wp: A weekday picker.
- * @blocked_day_mask: Bitmask with the days to be blocked.
- * 
- * Sets the days that the weekday picker will prevent from being modified by the
- * user.  The @blocked_day_mask is specified in the same way as in
- * weekday_picker_set_days().
- **/
-void
-weekday_picker_set_blocked_days (WeekdayPicker *wp, guint8 blocked_day_mask)
-{
-	WeekdayPickerPrivate *priv;
-
-	g_return_if_fail (wp != NULL);
-	g_return_if_fail (IS_WEEKDAY_PICKER (wp));
-
-	priv = wp->priv;
-	priv->blocked_day_mask = blocked_day_mask;
-}
-
-/**
- * weekday_picker_get_blocked_days:
- * @wp: A weekday picker.
- * 
- * Queries the set of days that the weekday picker prevents from being modified
- * by the user.
- * 
- * Return value: Bit mask of blocked days, with the same format as that returned
- * by weekday_picker_get_days().
- **/
-guint
-weekday_picker_get_blocked_days (WeekdayPicker *wp)
-{
-	WeekdayPickerPrivate *priv;
-
-	g_return_val_if_fail (wp != NULL, 0);
-	g_return_val_if_fail (IS_WEEKDAY_PICKER (wp), 0);
-
-	priv = wp->priv;
-	return priv->blocked_day_mask;
-}
-
-/**
- * weekday_picker_set_week_start_day:
- * @wp: A weekday picker.
- * @week_start_day: Index of the day that defines the start of the week; 0 is
- * Sunday, 1 is Monday, etc.
- * 
- * Sets the day that defines the start of the week for a weekday picker.
- **/
-void
-weekday_picker_set_week_start_day (WeekdayPicker *wp, int week_start_day)
-{
-	WeekdayPickerPrivate *priv;
-
-	g_return_if_fail (wp != NULL);
-	g_return_if_fail (IS_WEEKDAY_PICKER (wp));
-	g_return_if_fail (week_start_day >= 0 && week_start_day < 7);
-
-	priv = wp->priv;
-	priv->week_start_day = week_start_day;
-
-	configure_items (wp);
-}
-
-/**
- * weekday_picker_get_week_start_day:
- * @wp: A weekday picker.
- * 
- * Queries the day that defines the start of the week in a weekday picker.
- * 
- * Return value: Index of the day that defines the start of the week.  See
- * weekday_picker_set_week_start_day() to see how this is represented.
- **/
-int
-weekday_picker_get_week_start_day (WeekdayPicker *wp)
-{
-	WeekdayPickerPrivate *priv;
-
-	g_return_val_if_fail (wp != NULL, -1);
-	g_return_val_if_fail (IS_WEEKDAY_PICKER (wp), -1);
-
-	priv = wp->priv;
-	return priv->week_start_day;
-}
-
-/*  focus handler for weekday picker */
-static gboolean
-weekday_picker_focus (GtkWidget *widget, GtkDirectionType direction)
-{
-	WeekdayPicker *wp;
-	WeekdayPickerPrivate *priv;
-
-	g_return_val_if_fail (widget != NULL, FALSE);
-	g_return_val_if_fail (IS_WEEKDAY_PICKER (widget), FALSE);
-	wp = WEEKDAY_PICKER (widget);
-	priv = wp->priv;
-
-	if (!GTK_WIDGET_CAN_FOCUS (widget))
-		return FALSE;
-
-	if (GTK_WIDGET_HAS_FOCUS (widget)) {
-		priv->focus_day = -1;
-		colorize_items (wp);
-		return FALSE;
-	}
-
-	priv->focus_day = priv->week_start_day;
-	gnome_canvas_item_grab_focus (priv->boxes[priv->focus_day]);
-	colorize_items (wp);
-
-	return TRUE;
-}
diff --git a/calendar/gui/weekday-picker.h b/calendar/gui/weekday-picker.h
deleted file mode 100644
index 67a72f9ebd..0000000000
--- a/calendar/gui/weekday-picker.h
+++ /dev/null
@@ -1,71 +0,0 @@
-/* Evolution calendar - Week day picker widget
- *
- * Copyright (C) 2000 Ximian, Inc.
- *
- * Author: Federico Mena-Quintero <federico@ximian.com>
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of version 2 of the GNU General Public
- * License as published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public 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 <libgnomecanvas/gnome-canvas.h>
-
-G_BEGIN_DECLS
-
-
-
-#define TYPE_WEEKDAY_PICKER            (weekday_picker_get_type ())
-#define WEEKDAY_PICKER(obj)            (GTK_CHECK_CAST ((obj), TYPE_WEEKDAY_PICKER, WeekdayPicker))
-#define WEEKDAY_PICKER_CLASS(klass)    (GTK_CHECK_CLASS_CAST ((klass), TYPE_WEEKDAY_PICKER,	\
-					WeekdayPickerClass))
-#define IS_WEEKDAY_PICKER(obj)         (GTK_CHECK_TYPE ((obj), TYPE_WEEKDAY_PICKER))
-#define IS_WEEKDAY_PICKER_CLASS(klass) (GTK_CHECK_CLASS_TYPE ((klass), TYPE_WEEKDAY_PICKER))
-
-typedef struct _WeekdayPicker WeekdayPicker;
-typedef struct _WeekdayPickerClass WeekdayPickerClass;
-typedef struct _WeekdayPickerPrivate WeekdayPickerPrivate;
-
-struct _WeekdayPicker {
-	GnomeCanvas canvas;
-
-	/* Private data */
-	WeekdayPickerPrivate *priv;
-};
-
-struct _WeekdayPickerClass {
-	GnomeCanvasClass parent_class;
-
-	void (* changed) (WeekdayPicker *wp);
-};
-
-GtkType weekday_picker_get_type (void);
-
-GtkWidget *weekday_picker_new (void);
-
-void weekday_picker_set_days (WeekdayPicker *wp, guint8 day_mask);
-guint8 weekday_picker_get_days (WeekdayPicker *wp);
-
-void weekday_picker_set_blocked_days (WeekdayPicker *wp, guint8 blocked_day_mask);
-guint weekday_picker_get_blocked_days (WeekdayPicker *wp);
-
-void weekday_picker_set_week_start_day (WeekdayPicker *wp, int week_start_day);
-int weekday_picker_get_week_start_day (WeekdayPicker *wp);
-
-
-
-G_END_DECLS
-
-#endif
diff --git a/calendar/idl/.cvsignore b/calendar/idl/.cvsignore
deleted file mode 100644
index b840c21800..0000000000
--- a/calendar/idl/.cvsignore
+++ /dev/null
@@ -1,2 +0,0 @@
-Makefile.in
-Makefile
-\ No newline at end of file
diff --git a/calendar/idl/Makefile.am b/calendar/idl/Makefile.am
deleted file mode 100644
index dd866141fc..0000000000
--- a/calendar/idl/Makefile.am
+++ /dev/null
@@ -1,5 +0,0 @@
-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 48f7281ab3..0000000000
--- a/calendar/idl/evolution-calendar.idl
+++ /dev/null
@@ -1,52 +0,0 @@
-/* Evolution calendar interface
- *
- * Copyright (C) 2000 Eskil Heyn Olsen
- * Copyright (C) 2000 Ximian, Inc.
- * Copyright (C) 2000 Ximian, Inc.
- *
- * Authors: Eskil Heyn Olsen <deity@eskil.dk>
- *          Federico Mena-Quintero <federico@ximian.com>
- */
-
-#ifndef _EVOLUTION_CALENDAR_IDL_
-#define _EVOLUTION_CALENDAR_IDL_
-
-#include <Bonobo.idl>
-#include <Evolution-DataServer-Calendar.idl>
-
-module GNOME {
-module Evolution {
-
-module Calendar {
-	/* Factory to centralize calendar component editor dialogs */
-	interface CompEditorFactory : Bonobo::Unknown {
-		exception InvalidURI {};
-		exception BackendContactError {};
-		exception UnsupportedType {};
-
-		typedef long CompEditorMode;
-		const CompEditorMode EDITOR_MODE_EVENT        = 1 << 0;
-		const CompEditorMode EDITOR_MODE_ALLDAY_EVENT = 1 << 1;
-		const CompEditorMode EDITOR_MODE_MEETING      = 1 << 2;
-		const CompEditorMode EDITOR_MODE_TODO         = 1 << 3;
-
-		/* Loads a calendar and opens an editor for the specified object */
-		/* FIXME Its nasty to use CompEditorMode to pass event/todo source type
-		   but it saves adding yet another corba type - only MODE_EVENT or 
-		   MODE_TODO should be passed here */
-		void editExisting (in string uri, in CalObjUID uid, in CompEditorMode mode)
-			raises (InvalidURI, BackendContactError);
-
-		/* Loads a calendar and creates a new component of the specified type */
-		void editNew (in string uri, in CompEditorMode mode)
-			raises (InvalidURI, BackendContactError, UnsupportedType);
-	};
-
-	interface AlarmNotify : Bonobo::Unknown {
-	};
-};
-
-};
-};
-
-#endif
diff --git a/calendar/importers/.cvsignore b/calendar/importers/.cvsignore
deleted file mode 100644
index 99d6030704..0000000000
--- a/calendar/importers/.cvsignore
+++ /dev/null
@@ -1,6 +0,0 @@
-.deps
-.libs
-Makefile
-Makefile.in
-evolution-calendar-importer
-GNOME_Evolution_Calendar_Importer*.server
diff --git a/calendar/importers/GNOME_Evolution_Calendar_Importer.server.in.in b/calendar/importers/GNOME_Evolution_Calendar_Importer.server.in.in
deleted file mode 100644
index 810905fbfa..0000000000
--- a/calendar/importers/GNOME_Evolution_Calendar_Importer.server.in.in
+++ /dev/null
@@ -1,54 +0,0 @@
-<oaf_info>
-
-<oaf_server iid="OAFIID:GNOME_Evolution_Calendar_ImporterFactory:@VERSION@"
-	    type="shlib"
-	    location="@IMPORTERSDIR@/libevolution-calendar-importers.so">
-
-	<oaf_attribute name="repo_ids" type="stringv">
-		<item value="IDL:GNOME/ObjectFactory:1.0"/>
-	</oaf_attribute>
-	<oaf_attribute name="name" type="string"
-                       _value="Evolution iCalendar importer"/>
-</oaf_server>
-
-<oaf_server iid="OAFIID:GNOME_Evolution_Calendar_iCalendar_Importer:@VERSION@"
-	    type="factory"
-	    location="OAFIID:GNOME_Evolution_Calendar_ImporterFactory:@VERSION@">
-
-	<oaf_attribute name="repo_ids" type="stringv">
-		<item value="IDL:GNOME/Evolution/Importer:@VERSION@"/>
-	</oaf_attribute>
-	<oaf_attribute name="evolution:menu_name" type="string"
-                       _value="iCalendar files (.ics)"/>
-        <oaf_attribute name="name" type="string"
-                       _value="Evolution iCalendar importer"/>
-
-</oaf_server>
-
-<oaf_server iid="OAFIID:GNOME_Evolution_Calendar_vCalendar_Importer:@VERSION@"
-	    type="factory"
-	    location="OAFIID:GNOME_Evolution_Calendar_ImporterFactory:@VERSION@">
-
-	<oaf_attribute name="repo_ids" type="stringv">
-		<item value="IDL:GNOME/Evolution/Importer:@VERSION@"/>
-	</oaf_attribute>
-	<oaf_attribute name="evolution:menu_name" type="string"
-                       _value="vCalendar files (.vcf)"/>
-        <oaf_attribute name="name" type="string"
-                       _value="Evolution vCalendar importer"/>
-
-</oaf_server>
-
-<oaf_server iid="OAFIID:GNOME_Evolution_Gnome_Calendar_Intelligent_Importer:@VERSION@"
-	    type="factory"
-	    location="OAFIID:GNOME_Evolution_Calendar_ImporterFactory:@VERSION@">
-
-	<oaf_attribute name="repo_ids" type="stringv">
-		<item value="IDL:GNOME/Evolution/IntelligentImporter:@VERSION@"/>
-	</oaf_attribute>
-
-        <oaf_attribute name="name" type="string"
-                       _value="Evolution Calendar intelligent importer"/>
-
-</oaf_server>
-</oaf_info>
diff --git a/calendar/importers/Makefile.am b/calendar/importers/Makefile.am
deleted file mode 100644
index 369ce70c75..0000000000
--- a/calendar/importers/Makefile.am
+++ /dev/null
@@ -1,40 +0,0 @@
-importersdir = $(privlibdir)/evolution-calendar-importers
-
-importers_LTLIBRARIES = libevolution-calendar-importers.la
-
-INCLUDES = 						\
-	-DEVOLUTION_LOCALEDIR=\""$(localedir)"\"	\
-	-DEVOLUTION_SOUNDDIR=\""$(soundsdir)"\"		\
-	-DG_LOG_DOMAIN=\"Evolution-Importer\"		\
-	-I$(top_srcdir)					\
-	-I$(top_builddir)/shell				\
-	-I$(top_srcdir)/shell				\
-	-I$(top_srcdir)/calendar			\
-	-I$(top_builddir)/calendar			\
-	$(EVOLUTION_CALENDAR_CFLAGS)
-
-libevolution_calendar_importers_la_SOURCES = \
-	evolution-calendar-importer.h	     \
-	icalendar-importer.c		     \
-	main.c
-
-libevolution_calendar_importers_la_LDFLAGS = -avoid-version -module
-
-libevolution_calendar_importers_la_LIBADD = \
-	$(top_builddir)/shell/importer/libevolution-importer.la 	\
-	$(top_builddir)/e-util/libeutil.la 				\
-	$(top_builddir)/calendar/common/libevolution-calendarprivate.la	\
-	$(IMPORTERS_LIBS)
-
-server_in_files = GNOME_Evolution_Calendar_Importer.server.in.in
-server_DATA = $(server_in_files:.server.in.in=_$(BASE_VERSION).server)
-@EVO_SERVER_RULE@
-@INTLTOOL_SERVER_RULE@
-
-BUILT_SOURCES = $(server_DATA)
-CLEANFILES = $(BUILT_SOURCES)
-
-EXTRA_DIST = $(server_in_files)
-
-dist-hook:
-	cd $(distdir); rm -f $(BUILT_SOURCES)
diff --git a/calendar/importers/evolution-calendar-importer.h b/calendar/importers/evolution-calendar-importer.h
deleted file mode 100644
index 0691ee2cab..0000000000
--- a/calendar/importers/evolution-calendar-importer.h
+++ /dev/null
@@ -1,37 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-/* Evolution calendar importer component
- *
- * Authors: Rodrigo Moya <rodrigo@ximian.com>
- *
- * Copyright (C) 2001  Ximian, Inc.
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of version 2 of the GNU General Public
- * License as published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * General Public License for more details.
- *
- * You should have received a copy of the GNU General Public
- * License along with this program; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
- */
-
-#ifndef EVOLUTION_CALENDAR_IMPORTER_H
-#define EVOLUTION_CALENDAR_IMPORTER_H
-
-#include <bonobo/bonobo-object.h>
-
-G_BEGIN_DECLS
-
-BonoboObject *ical_importer_new (void);
-BonoboObject *vcal_importer_new (void);
-
-BonoboObject *gnome_calendar_importer_new (void);
-
-G_END_DECLS
-
-#endif
diff --git a/calendar/importers/icalendar-importer.c b/calendar/importers/icalendar-importer.c
deleted file mode 100644
index 2e17d39f59..0000000000
--- a/calendar/importers/icalendar-importer.c
+++ /dev/null
@@ -1,738 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-/* Evolution calendar importer component
- *
- * Authors: Rodrigo Moya <rodrigo@ximian.com>
- *
- * Copyright (C) 2001  Ximian, Inc.
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of version 2 of the GNU General Public
- * License as published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * General Public License for more details.
- *
- * You should have received a copy of the GNU General Public
- * License along with this program; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
- */
-
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
-
-#include <string.h>
-#include <unistd.h>
-#include <sys/types.h>
-#include <fcntl.h>
-#include <gtk/gtkcheckbutton.h>
-#include <gtk/gtkhbox.h>
-#include <gtk/gtkvbox.h>
-#include <gtk/gtkmain.h>
-#include <gtk/gtklabel.h>
-#include <gtk/gtkradiobutton.h>
-#include <gtk/gtknotebook.h>
-#include <libgnome/gnome-util.h>
-#include <libgnome/gnome-i18n.h>
-#include <bonobo/bonobo-control.h>
-#include <bonobo/bonobo-exception.h>
-#include <libecal/e-cal.h>
-#include <libedataserverui/e-source-selector.h>
-#include <importer/evolution-importer.h>
-#include <importer/evolution-intelligent-importer.h>
-#include <importer/GNOME_Evolution_Importer.h>
-#include <libical/icalvcal.h>
-#include <e-util/e-dialog-widgets.h>
-#include "evolution-calendar-importer.h"
-#include "common/authentication.h"
-
-/* We timeout after 2 minutes, when opening the folders. */
-#define IMPORTER_TIMEOUT_SECONDS 120
-
-
-typedef struct {
-	EvolutionImporter *importer;
-
-	GtkWidget *nb;
-	
-	ESource *primary;
-	ESourceSelector *selectors[E_CAL_SOURCE_TYPE_LAST];
-
-	ECal *client;
-	ECalSourceType source_type;
-
-	icalcomponent *icalcomp;
-} ICalImporter;
-
-typedef struct {
-	gboolean do_calendar;
-	gboolean do_tasks;
-} ICalIntelligentImporter;
-
-static const int import_type_map[] = {
-	E_CAL_SOURCE_TYPE_EVENT,
-	E_CAL_SOURCE_TYPE_TODO,
-	-1
-};
-
-static const char *import_type_strings[] = {
-	N_("Appointments and Meetings"),
-	N_("Tasks"),
-	NULL
-};
-
-
-/*
- * Functions shared by iCalendar & vCalendar importer.
- */
-
-static void
-importer_destroy_cb (gpointer user_data)
-{
-	ICalImporter *ici = (ICalImporter *) user_data;
-	
-	g_return_if_fail (ici != NULL);
-	
-	if (ici->client)
-		g_object_unref (ici->client);
-	
-	if (ici->icalcomp != NULL) {
-		icalcomponent_free (ici->icalcomp);
-		ici->icalcomp = NULL;
-	}
-
-	g_free (ici);
-}
-
-/* This removes all components except VEVENTs and VTIMEZONEs from the toplevel */
-static void
-prepare_events (icalcomponent *icalcomp, GList **vtodos)
-{
-	icalcomponent *subcomp;
-	icalcompiter iter;
-
-	if (vtodos)
-		*vtodos = NULL;
-	
-	iter = icalcomponent_begin_component (icalcomp, ICAL_ANY_COMPONENT);
-	while ((subcomp = icalcompiter_deref (&iter)) != NULL) {
-		icalcomponent_kind child_kind = icalcomponent_isa (subcomp);
-		if (child_kind != ICAL_VEVENT_COMPONENT
-		    && child_kind != ICAL_VTIMEZONE_COMPONENT) {
-
-			icalcompiter_next (&iter);
-
-			icalcomponent_remove_component (icalcomp, subcomp);
-			if (child_kind == ICAL_VTODO_COMPONENT && vtodos)
-				*vtodos = g_list_prepend (*vtodos, subcomp);
-			else
-                                icalcomponent_free (subcomp);
-		}
-
-		icalcompiter_next (&iter);
-	}
-}
-
-
-/* This removes all components except VTODOs and VTIMEZONEs from the toplevel
-   icalcomponent, and adds the given list of VTODO components. The list is
-   freed afterwards. */
-static void
-prepare_tasks (icalcomponent *icalcomp, GList *vtodos)
-{
-	icalcomponent *subcomp;
-	GList *elem;
-	icalcompiter iter;
-
-	iter = icalcomponent_begin_component (icalcomp, ICAL_ANY_COMPONENT);
-	while ((subcomp = icalcompiter_deref (&iter)) != NULL) {
-		icalcomponent_kind child_kind = icalcomponent_isa (subcomp);
-		if (child_kind != ICAL_VTODO_COMPONENT
-		    && child_kind != ICAL_VTIMEZONE_COMPONENT) {
-			icalcompiter_next (&iter);
-			icalcomponent_remove_component (icalcomp, subcomp);
-			icalcomponent_free (subcomp);
-		}
-
-		icalcompiter_next (&iter);
-	}
-
-	for (elem = vtodos; elem; elem = elem->next) {
-		icalcomponent_add_component (icalcomp, elem->data);
-	}
-	g_list_free (vtodos);
-}
-
-static gboolean
-update_single_object (ECal *client, icalcomponent *icalcomp)
-{
-	char *uid;
-	icalcomponent *tmp_icalcomp;
-
-	uid = (char *) icalcomponent_get_uid (icalcomp);
-
-	/* FIXME Shouldn't we check for RIDs here? */
-	/* FIXME Should we always create a new UID? */
-	if (uid && e_cal_get_object (client, uid, NULL, &tmp_icalcomp, NULL))
-		return e_cal_modify_object (client, icalcomp, CALOBJ_MOD_ALL, NULL);
-
-	return e_cal_create_object (client, icalcomp, &uid, NULL);	
-}
-
-static gboolean
-update_objects (ECal *client, icalcomponent *icalcomp)
-{
-	icalcomponent *subcomp;
-	icalcomponent_kind kind;
-	icalcomponent *vcal;
-	GError *error = NULL;
-	gboolean success = TRUE;
-
-	kind = icalcomponent_isa (icalcomp);
-	if (kind == ICAL_VTODO_COMPONENT || kind == ICAL_VEVENT_COMPONENT) {
-		vcal = e_cal_util_new_top_level ();
-		if (icalcomponent_get_method (icalcomp) == ICAL_METHOD_CANCEL)
-			icalcomponent_set_method (vcal, ICAL_METHOD_CANCEL);
-		else
-			icalcomponent_set_method (vcal, ICAL_METHOD_PUBLISH);
-		icalcomponent_add_component (vcal, icalcomponent_new_clone (icalcomp));
-	} else if (kind == ICAL_VCALENDAR_COMPONENT) {
-		vcal = icalcomponent_new_clone (icalcomp);
-		if (!icalcomponent_get_first_property (vcal, ICAL_METHOD_PROPERTY))
-			icalcomponent_set_method (vcal, ICAL_METHOD_PUBLISH);
-	} else
-		return FALSE;
-
-	if (!e_cal_receive_objects (client, vcal, NULL))
-		success = FALSE;
-
-	icalcomponent_free (vcal);
-
-	return success;
-}
-
-static void
-button_toggled_cb (GtkWidget *widget, gpointer data)
-{
-	ICalImporter *ici = data;
-
-	ici->source_type = e_dialog_radio_get (widget, import_type_map);
-	gtk_notebook_set_current_page (GTK_NOTEBOOK (ici->nb), ici->source_type);
-
-	/* If we switched pages we have a new primary source */
-	if (ici->primary)
-		g_object_unref (ici->primary);
-	ici->primary = g_object_ref (e_source_selector_peek_primary_selection (ici->selectors[ici->source_type]));
-}
-
-static void
-primary_selection_changed_cb (ESourceSelector *selector, gpointer data)
-{
-	ICalImporter *ici = data;
-
-	if (ici->primary)
-		g_object_unref (ici->primary);
-	ici->primary = g_object_ref (e_source_selector_peek_primary_selection (selector));
-}
-
-static void
-create_control_fn (EvolutionImporter *importer, Bonobo_Control *control, void *closure)
-{
-	ICalImporter *ici = (ICalImporter *) closure;
-	GtkWidget *vbox, *hbox, *rb = NULL;
-	GSList *group = NULL;
-	ESourceList *source_list;	
-	int i;
-	
-	vbox = gtk_vbox_new (FALSE, FALSE);
-	
-	hbox = gtk_hbox_new (FALSE, FALSE);
-	gtk_box_pack_start (GTK_BOX (vbox), hbox, FALSE, TRUE, 6);
-
-	/* Type of icalendar items */
-	for (i = 0; import_type_map[i] != -1; i++) {
-		rb = gtk_radio_button_new_with_label (group, import_type_strings[i]);
-		gtk_box_pack_start (GTK_BOX (hbox), rb, FALSE, FALSE, 6);
-		g_signal_connect (G_OBJECT (rb), "toggled", G_CALLBACK (button_toggled_cb), ici);
-		if (!group)
-			group = gtk_radio_button_get_group (GTK_RADIO_BUTTON (rb));
-	}
-	e_dialog_radio_set (rb, import_type_map[0], import_type_map);
-	
-	/* The source selector notebook */
-	ici->nb = gtk_notebook_new ();
-	gtk_notebook_set_show_tabs (GTK_NOTEBOOK (ici->nb), FALSE);
-	gtk_container_add (GTK_CONTAINER (vbox), ici->nb);
-	
-	/* The source selectors */
-	for (i = 0; import_type_map[i] != -1; i++) {
-		GtkWidget *selector;
-		ESource *primary;
-
-		/* FIXME Better error handling */
-		if (!e_cal_get_sources (&source_list, import_type_map[i], NULL))
-			return;		
-
-		selector = e_source_selector_new (source_list);
-		e_source_selector_show_selection (E_SOURCE_SELECTOR (selector), FALSE);
-		gtk_notebook_append_page (GTK_NOTEBOOK (ici->nb), selector, NULL);
-
-		/* FIXME What if no sources? */
-		primary = e_source_list_peek_source_any (source_list);
-		e_source_selector_set_primary_selection (E_SOURCE_SELECTOR (selector), primary);
-		if (!ici->primary)
-			ici->primary = g_object_ref (primary);
-		g_object_unref (source_list);
-		
-		g_signal_connect (G_OBJECT (selector), "primary_selection_changed",
-				  G_CALLBACK (primary_selection_changed_cb), ici);
-		
-		ici->selectors[import_type_map[i]] = E_SOURCE_SELECTOR (selector);
-	}
-
-	gtk_widget_show_all (vbox);
-	
-	*control = BONOBO_OBJREF (bonobo_control_new (vbox));
-}
-
-static void
-process_item_fn (EvolutionImporter *importer,
-		 CORBA_Object listener,
-		 void *closure,
-		 CORBA_Environment *ev)
-{
-	ECalLoadState state;
-	ICalImporter *ici = (ICalImporter *) closure;
-	GNOME_Evolution_ImporterListener_ImporterResult result;
-	
-	result = GNOME_Evolution_ImporterListener_OK;
-
-	g_return_if_fail (ici != NULL);
-	g_return_if_fail (ici->icalcomp != NULL);
-
-	state = e_cal_get_load_state (ici->client);
-	if (state == E_CAL_LOAD_LOADING) {
-		GNOME_Evolution_ImporterListener_notifyResult (
-			listener,
-			GNOME_Evolution_ImporterListener_BUSY,
-			TRUE, ev);
-		return;
-	} else if (state != E_CAL_LOAD_LOADED) {
-		GNOME_Evolution_ImporterListener_notifyResult (
-			listener,
-			GNOME_Evolution_ImporterListener_UNSUPPORTED_OPERATION,
-			FALSE, ev);
-		return;
-	}
-
-	switch (ici->source_type) {
-	case E_CAL_SOURCE_TYPE_EVENT:
-		prepare_events (ici->icalcomp, NULL);
-		if (!update_objects (ici->client, ici->icalcomp))
-			result = GNOME_Evolution_ImporterListener_BAD_DATA;
-		break;
-	case E_CAL_SOURCE_TYPE_TODO:
-		prepare_tasks (ici->icalcomp, NULL);
-		if (!update_objects (ici->client, ici->icalcomp))
-			result = GNOME_Evolution_ImporterListener_BAD_DATA;
-		break;
-	default:
-		g_assert_not_reached ();
-	}
-
-	GNOME_Evolution_ImporterListener_notifyResult (listener, result, FALSE, ev);
-}
-
-
-/*
- * iCalendar importer functions.
- */
-
-static gboolean
-support_format_fn (EvolutionImporter *importer,
-		   const char *filename,
-		   void *closure)
-{
-	char *contents ;
-	icalcomponent *icalcomp;
-	gboolean ret = FALSE;
-
-	if (g_file_get_contents (filename, &contents, NULL, NULL)) {
-		/* parse the file */
-		icalcomp = icalparser_parse_string (contents);
-		g_free (contents);
-
-		if (icalcomp) {
-			if (icalcomponent_is_valid (icalcomp))
-				ret = TRUE;
-			else 
-				ret = FALSE;
-			icalcomponent_free (icalcomp);
-		}
-	}
-
-	return ret;
-}
-
-static gboolean
-load_file_fn (EvolutionImporter *importer,
-	      const char *filename,
-	      void *closure)
-{
-	char *contents;
-	gboolean ret = FALSE;
-	ICalImporter *ici = (ICalImporter *) closure;
-
-	g_return_val_if_fail (ici != NULL, FALSE);
-
-	if (g_file_get_contents (filename, &contents, NULL, NULL)) {
-		icalcomponent *icalcomp;
-
-		/* parse the file */
-		icalcomp = icalparser_parse_string (contents);
-		g_free (contents);
-		
-		if (icalcomp) {
-			/* create the neccessary ECal */
-			if (ici->client)
-				g_object_unref (ici->client);
-			ici->client = auth_new_cal_from_source (ici->primary, ici->source_type);
-
-			if (ici->client) {
-				if (e_cal_open (ici->client, TRUE, NULL)) {
-					ici->icalcomp = icalcomp;
-					ret = TRUE;
-				}
-			}
-		}
-	}
-
-	return ret;
-}
-
-BonoboObject *
-ical_importer_new (void)
-{
-	ICalImporter *ici;
-	
-	ici = g_new0 (ICalImporter, 1);
-
-	ici->client = NULL;
-	ici->icalcomp = NULL;
-	ici->importer = evolution_importer_new (create_control_fn,
-						support_format_fn,
-						load_file_fn,
-						process_item_fn,
-						NULL,
-						ici);
-
-	g_object_weak_ref (G_OBJECT (ici->importer), (GWeakNotify) importer_destroy_cb, ici);
-
-	return BONOBO_OBJECT (ici->importer);
-}
-
-
-
-/*
- * vCalendar importer functions.
- */
-
-static gboolean
-vcal_support_format_fn (EvolutionImporter *importer,
-			const char *filename,
-			void *closure)
-{
-	char *contents;
-	gboolean ret = FALSE;
-
-	if (g_file_get_contents (filename, &contents, NULL, NULL)) {
-		VObject *vcal;
-
-		/* parse the file */
-		vcal = Parse_MIME (contents, strlen (contents));
-		g_free (contents);
-
-		if (vcal) {
-			icalcomponent *icalcomp;
-
-			icalcomp = icalvcal_convert (vcal);
-		
-			if (icalcomp) {
-				icalcomponent_free (icalcomp);
-				ret = TRUE;
-			}
-
-			cleanVObject (vcal);
-		}
-	}
-
-	return ret;
-}
-
-/* This tries to load in a vCalendar file and convert it to an icalcomponent.
-   It returns NULL on failure. */
-static icalcomponent*
-load_vcalendar_file (const char *filename)
-{
-	icalvcal_defaults defaults = { 0 };
-	icalcomponent *icalcomp = NULL;
-	char *contents;
-
-	defaults.alarm_audio_url = "file://" EVOLUTION_SOUNDDIR "/default_alarm.wav";
-	defaults.alarm_audio_fmttype = "audio/x-wav";
-	defaults.alarm_description = (char*) _("Reminder!!");
-
-	if (g_file_get_contents (filename, &contents, NULL, NULL)) {
-		VObject *vcal;
-
-		/* parse the file */
-		vcal = Parse_MIME (contents, strlen (contents));
-		g_free (contents);
-
-		if (vcal) {
-			icalcomp = icalvcal_convert_with_defaults (vcal,
-								   &defaults);
-			cleanVObject (vcal);
-		}
-	}
-
-	return icalcomp;
-}
-
-static gboolean
-vcal_load_file_fn (EvolutionImporter *importer,
-		   const char *filename,
-		   void *closure)
-{
-	gboolean ret = FALSE;
-	ICalImporter *ici = (ICalImporter *) closure;
-	icalcomponent *icalcomp;
-
-	g_return_val_if_fail (ici != NULL, FALSE);
-
-	icalcomp = load_vcalendar_file (filename);
-	if (icalcomp) {
-		/* create the neccessary ECal */
-		if (ici->client)
-			g_object_unref (ici->client);
-		ici->client = auth_new_cal_from_source (ici->primary, ici->source_type);
-		
-		if (ici->client) {
-			if (e_cal_open (ici->client, TRUE, NULL)) {
-				ici->icalcomp = icalcomp;
-				ret = TRUE;
-			}
-		}
-	}
-
-	return ret;
-}
-
-BonoboObject *
-vcal_importer_new (void)
-{
-	ICalImporter *ici;
-
-	ici = g_new0 (ICalImporter, 1);
-	ici->icalcomp = NULL;
-	ici->importer = evolution_importer_new (create_control_fn,
-						vcal_support_format_fn,
-						vcal_load_file_fn,
-						process_item_fn,
-						NULL,
-						ici);
-
-	g_object_weak_ref (G_OBJECT (ici->importer), (GWeakNotify) importer_destroy_cb, ici);
-
-	return BONOBO_OBJECT (ici->importer);
-}
-
-
-
-
-
-
-static void
-gnome_calendar_importer_destroy_cb (gpointer user_data)
-{
-	ICalIntelligentImporter *ici = (ICalIntelligentImporter *) user_data;
-
-	g_return_if_fail (ici != NULL);
-
-	g_free (ici);
-}
-
-
-
-static gboolean
-gnome_calendar_can_import_fn (EvolutionIntelligentImporter *ii,
-			      void *closure)
-{
-	char *filename;
-	gboolean gnome_calendar_exists;
-
-	filename = gnome_util_home_file ("user-cal.vcf");
-	gnome_calendar_exists = g_file_exists (filename);
-	g_free (filename);
-
-	return gnome_calendar_exists;
-}
-
-
-static void
-gnome_calendar_import_data_fn (EvolutionIntelligentImporter *ii,
-			       void *closure)
-{
-	ICalIntelligentImporter *ici = closure;
-	icalcomponent *icalcomp = NULL;
-	char *filename;
-	GList *vtodos;
-	ECal *calendar_client = NULL, *tasks_client = NULL;
-	int t;
-
-	/* If neither is selected, just return. */
-	if (!ici->do_calendar && !ici->do_tasks) {
-		return;
-	}
-
-	/* Try to open the default calendar & tasks folders. */
-	if (ici->do_calendar) {
-		calendar_client = auth_new_cal_from_default (E_CAL_SOURCE_TYPE_EVENT);
-			goto out;
-	}
-
-	if (ici->do_tasks) {
-		tasks_client = auth_new_cal_from_default (E_CAL_SOURCE_TYPE_TODO);
-		if (!tasks_client)
-			goto out;
-	}
-
-	/* Load the Gnome Calendar file and convert to iCalendar. */
-	filename = gnome_util_home_file ("user-cal.vcf");
-	icalcomp = load_vcalendar_file (filename);
-	g_free (filename);
-
-	/* If we couldn't load the file, just return. FIXME: Error message? */
-	if (!icalcomp)
-		goto out;
-
-	/*
-	 * Import the calendar events into the default calendar folder.
-	 */
-	prepare_events (icalcomp, &vtodos);
-
-	/* Wait for client to finish opening the calendar & tasks folders. */
-	for (t = 0; t < IMPORTER_TIMEOUT_SECONDS; t++) {
-		ECalLoadState calendar_state, tasks_state;
-
-		calendar_state = tasks_state = E_CAL_LOAD_LOADED;
-
-		/* We need this so the ECal gets notified that the
-		   folder is opened, via Corba. */
-		while (gtk_events_pending ())
-			gtk_main_iteration ();
-
-		if (ici->do_calendar)
-			calendar_state = e_cal_get_load_state (calendar_client);
-
-		if (ici->do_tasks)
-			tasks_state = e_cal_get_load_state (tasks_client);
-
-		if (calendar_state == E_CAL_LOAD_LOADED
-		    && tasks_state == E_CAL_LOAD_LOADED)
-			break;
-
-		sleep (1);
-	}
-
-	/* If we timed out, just return. */
-	if (t == IMPORTER_TIMEOUT_SECONDS)
-		goto out;
-
-	/* Import the calendar events. */
-	/* FIXME: What do intelligent importers do about errors? */
-	if (ici->do_calendar)
-		update_objects (calendar_client, icalcomp);
-
-
-	/*
-	 * Import the tasks into the default tasks folder.
-	 */
-	prepare_tasks (icalcomp, vtodos);
-	if (ici->do_tasks)
-		update_objects (tasks_client, icalcomp);
-
- out:
-	if (icalcomp)
-		icalcomponent_free (icalcomp);
-	if (calendar_client)
-		g_object_unref (calendar_client);
-	if (tasks_client)
-		g_object_unref (tasks_client);
-}
-
-
-/* Fun with aggregation */
-static void
-checkbox_toggle_cb (GtkToggleButton *tb,
-		    gboolean *do_item)
-{
-	*do_item = gtk_toggle_button_get_active (tb);
-}
-
-static BonoboControl *
-create_checkboxes_control (ICalIntelligentImporter *ici)
-{
-	GtkWidget *hbox, *calendar_checkbox, *tasks_checkbox;
-	BonoboControl *control;
-
-	hbox = gtk_hbox_new (FALSE, 2);
-
-	calendar_checkbox = gtk_check_button_new_with_label (_("Calendar Events"));
-	g_signal_connect (G_OBJECT (calendar_checkbox), "toggled",
-			  G_CALLBACK (checkbox_toggle_cb),
-			  &ici->do_calendar);
-	gtk_box_pack_start (GTK_BOX (hbox), calendar_checkbox,
-			    FALSE, FALSE, 0);
-
-	tasks_checkbox = gtk_check_button_new_with_label (_("Tasks"));
-	g_signal_connect (G_OBJECT (tasks_checkbox), "toggled",
-			  G_CALLBACK (checkbox_toggle_cb),
-			  &ici->do_tasks);
-	gtk_box_pack_start (GTK_BOX (hbox), tasks_checkbox,
-			    FALSE, FALSE, 0);
-
-	gtk_widget_show_all (hbox);
-	control = bonobo_control_new (hbox);
-	return control;
-}
-
-BonoboObject *
-gnome_calendar_importer_new (void)
-{
-	EvolutionIntelligentImporter *importer;
-	ICalIntelligentImporter *ici;
-	BonoboControl *control;
-	char *message = N_("Evolution has found Gnome Calendar files.\n"
-			   "Would you like to import them into Evolution?");
-
-	ici = g_new0 (ICalIntelligentImporter, 1);
-
-	importer = evolution_intelligent_importer_new (gnome_calendar_can_import_fn,
-						       gnome_calendar_import_data_fn,
-						       _("Gnome Calendar"),
-						       _(message),
-						       ici);
-
-
-	g_object_weak_ref (G_OBJECT (importer), (GWeakNotify) gnome_calendar_importer_destroy_cb, ici);
-
-	control = create_checkboxes_control (ici);
-	bonobo_object_add_interface (BONOBO_OBJECT (importer),
-				     BONOBO_OBJECT (control));
-
-	return BONOBO_OBJECT (importer);
-}
diff --git a/calendar/importers/main.c b/calendar/importers/main.c
deleted file mode 100644
index d19f98a271..0000000000
--- a/calendar/importers/main.c
+++ /dev/null
@@ -1,56 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-/* Evolution calendar importer component
- *
- * Authors: Rodrigo Moya <rodrigo@ximian.com>
- *
- * Copyright (C) 2001  Ximian, Inc.
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of version 2 of the GNU General Public
- * License as published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * General Public License for more details.
- *
- * You should have received a copy of the GNU General Public
- * License along with this program; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
- */
-
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
-#include <string.h>
-#include <bonobo/bonobo-shlib-factory.h>
-#include <bonobo/bonobo-context.h>
-#include <bonobo/bonobo-main.h>
-#include "evolution-calendar-importer.h"
-
-#define IMPORTER_FACTORY_ID   "OAFIID:GNOME_Evolution_Calendar_ImporterFactory:" BASE_VERSION
-#define ICALENDAR_IMPORTER_ID "OAFIID:GNOME_Evolution_Calendar_iCalendar_Importer:" BASE_VERSION
-#define VCALENDAR_IMPORTER_ID "OAFIID:GNOME_Evolution_Calendar_vCalendar_Importer:" BASE_VERSION
-#define GNOME_CALENDAR_IMPORTER_ID "OAFIID:GNOME_Evolution_Gnome_Calendar_Intelligent_Importer:" BASE_VERSION
-
-static BonoboObject *
-importer_factory_fn (BonoboGenericFactory *factory, const char *id, void *closure)
-{
-	BonoboObject *object = NULL;
-
-	g_return_val_if_fail (id != NULL, NULL);
-
-	if (!strcmp (id, ICALENDAR_IMPORTER_ID))
-		object = ical_importer_new ();
-	else if (!strcmp (id, VCALENDAR_IMPORTER_ID))
-		object = vcal_importer_new ();
-	else if (!strcmp (id, GNOME_CALENDAR_IMPORTER_ID))
-		object = gnome_calendar_importer_new ();
-	else
-		g_warning ("Component not supported by this factory");
-
-	return object;
-}
-
-BONOBO_ACTIVATION_SHLIB_FACTORY (IMPORTER_FACTORY_ID, "Evolution Calendar importer factory", importer_factory_fn, NULL)
diff --git a/calendar/zones.h b/calendar/zones.h
deleted file mode 100644
index 5b482255f0..0000000000
--- a/calendar/zones.h
+++ /dev/null
@@ -1,387 +0,0 @@
-/*
- * These are the timezone names from the Olson timezone data.
- * We only place them here so gettext picks them up for translation.
- * Don't include in any C files.
- */
-
-N_("Africa/Abidjan");
-N_("Africa/Accra");
-N_("Africa/Addis_Ababa");
-N_("Africa/Algiers");
-N_("Africa/Asmera");
-N_("Africa/Bamako");
-N_("Africa/Bangui");
-N_("Africa/Banjul");
-N_("Africa/Bissau");
-N_("Africa/Blantyre");
-N_("Africa/Brazzaville");
-N_("Africa/Bujumbura");
-N_("Africa/Cairo");
-N_("Africa/Casablanca");
-N_("Africa/Ceuta");
-N_("Africa/Conakry");
-N_("Africa/Dakar");
-N_("Africa/Dar_es_Salaam");
-N_("Africa/Djibouti");
-N_("Africa/Douala");
-N_("Africa/El_Aaiun");
-N_("Africa/Freetown");
-N_("Africa/Gaborone");
-N_("Africa/Harare");
-N_("Africa/Johannesburg");
-N_("Africa/Kampala");
-N_("Africa/Khartoum");
-N_("Africa/Kigali");
-N_("Africa/Kinshasa");
-N_("Africa/Lagos");
-N_("Africa/Libreville");
-N_("Africa/Lome");
-N_("Africa/Luanda");
-N_("Africa/Lubumbashi");
-N_("Africa/Lusaka");
-N_("Africa/Malabo");
-N_("Africa/Maputo");
-N_("Africa/Maseru");
-N_("Africa/Mbabane");
-N_("Africa/Mogadishu");
-N_("Africa/Monrovia");
-N_("Africa/Nairobi");
-N_("Africa/Ndjamena");
-N_("Africa/Niamey");
-N_("Africa/Nouakchott");
-N_("Africa/Ouagadougou");
-N_("Africa/Porto-Novo");
-N_("Africa/Sao_Tome");
-N_("Africa/Timbuktu");
-N_("Africa/Tripoli");
-N_("Africa/Tunis");
-N_("Africa/Windhoek");
-N_("America/Adak");
-N_("America/Anchorage");
-N_("America/Anguilla");
-N_("America/Antigua");
-N_("America/Araguaina");
-N_("America/Aruba");
-N_("America/Asuncion");
-N_("America/Barbados");
-N_("America/Belem");
-N_("America/Belize");
-N_("America/Boa_Vista");
-N_("America/Bogota");
-N_("America/Boise");
-N_("America/Buenos_Aires");
-N_("America/Cambridge_Bay");
-N_("America/Cancun");
-N_("America/Caracas");
-N_("America/Catamarca");
-N_("America/Cayenne");
-N_("America/Cayman");
-N_("America/Chicago");
-N_("America/Chihuahua");
-N_("America/Cordoba");
-N_("America/Costa_Rica");
-N_("America/Cuiaba");
-N_("America/Curacao");
-N_("America/Danmarkshavn");
-N_("America/Dawson");
-N_("America/Dawson_Creek");
-N_("America/Denver");
-N_("America/Detroit");
-N_("America/Dominica");
-N_("America/Edmonton");
-N_("America/Eirunepe");
-N_("America/El_Salvador");
-N_("America/Fortaleza");
-N_("America/Glace_Bay");
-N_("America/Godthab");
-N_("America/Goose_Bay");
-N_("America/Grand_Turk");
-N_("America/Grenada");
-N_("America/Guadeloupe");
-N_("America/Guatemala");
-N_("America/Guayaquil");
-N_("America/Guyana");
-N_("America/Halifax");
-N_("America/Havana");
-N_("America/Hermosillo");
-N_("America/Indiana/Indianapolis");
-N_("America/Indiana/Knox");
-N_("America/Indiana/Marengo");
-N_("America/Indiana/Vevay");
-N_("America/Indianapolis");
-N_("America/Inuvik");
-N_("America/Iqaluit");
-N_("America/Jamaica");
-N_("America/Jujuy");
-N_("America/Juneau");
-N_("America/Kentucky/Louisville");
-N_("America/Kentucky/Monticello");
-N_("America/La_Paz");
-N_("America/Lima");
-N_("America/Los_Angeles");
-N_("America/Louisville");
-N_("America/Maceio");
-N_("America/Managua");
-N_("America/Manaus");
-N_("America/Martinique");
-N_("America/Mazatlan");
-N_("America/Mendoza");
-N_("America/Menominee");
-N_("America/Merida");
-N_("America/Mexico_City");
-N_("America/Miquelon");
-N_("America/Monterrey");
-N_("America/Montevideo");
-N_("America/Montreal");
-N_("America/Montserrat");
-N_("America/Nassau");
-N_("America/New_York");
-N_("America/Nipigon");
-N_("America/Nome");
-N_("America/Noronha");
-N_("America/North_Dakota/Center");
-N_("America/Panama");
-N_("America/Pangnirtung");
-N_("America/Paramaribo");
-N_("America/Phoenix");
-N_("America/Port-au-Prince");
-N_("America/Port_of_Spain");
-N_("America/Porto_Velho");
-N_("America/Puerto_Rico");
-N_("America/Rainy_River");
-N_("America/Rankin_Inlet");
-N_("America/Recife");
-N_("America/Regina");
-N_("America/Rio_Branco");
-N_("America/Rosario");
-N_("America/Santiago");
-N_("America/Santo_Domingo");
-N_("America/Sao_Paulo");
-N_("America/Scoresbysund");
-N_("America/Shiprock");
-N_("America/St_Johns");
-N_("America/St_Kitts");
-N_("America/St_Lucia");
-N_("America/St_Thomas");
-N_("America/St_Vincent");
-N_("America/Swift_Current");
-N_("America/Tegucigalpa");
-N_("America/Thule");
-N_("America/Thunder_Bay");
-N_("America/Tijuana");
-N_("America/Tortola");
-N_("America/Vancouver");
-N_("America/Whitehorse");
-N_("America/Winnipeg");
-N_("America/Yakutat");
-N_("America/Yellowknife");
-N_("Antarctica/Casey");
-N_("Antarctica/Davis");
-N_("Antarctica/DumontDUrville");
-N_("Antarctica/Mawson");
-N_("Antarctica/McMurdo");
-N_("Antarctica/Palmer");
-N_("Antarctica/South_Pole");
-N_("Antarctica/Syowa");
-N_("Antarctica/Vostok");
-N_("Arctic/Longyearbyen");
-N_("Asia/Aden");
-N_("Asia/Almaty");
-N_("Asia/Amman");
-N_("Asia/Anadyr");
-N_("Asia/Aqtau");
-N_("Asia/Aqtobe");
-N_("Asia/Ashgabat");
-N_("Asia/Baghdad");
-N_("Asia/Bahrain");
-N_("Asia/Baku");
-N_("Asia/Bangkok");
-N_("Asia/Beirut");
-N_("Asia/Bishkek");
-N_("Asia/Brunei");
-N_("Asia/Calcutta");
-N_("Asia/Choibalsan");
-N_("Asia/Chongqing");
-N_("Asia/Colombo");
-N_("Asia/Damascus");
-N_("Asia/Dhaka");
-N_("Asia/Dili");
-N_("Asia/Dubai");
-N_("Asia/Dushanbe");
-N_("Asia/Gaza");
-N_("Asia/Harbin");
-N_("Asia/Hong_Kong");
-N_("Asia/Hovd");
-N_("Asia/Irkutsk");
-N_("Asia/Istanbul");
-N_("Asia/Jakarta");
-N_("Asia/Jayapura");
-N_("Asia/Jerusalem");
-N_("Asia/Kabul");
-N_("Asia/Kamchatka");
-N_("Asia/Karachi");
-N_("Asia/Kashgar");
-N_("Asia/Katmandu");
-N_("Asia/Krasnoyarsk");
-N_("Asia/Kuala_Lumpur");
-N_("Asia/Kuching");
-N_("Asia/Kuwait");
-N_("Asia/Macao");
-N_("Asia/Macau");
-N_("Asia/Magadan");
-N_("Asia/Makassar");
-N_("Asia/Manila");
-N_("Asia/Muscat");
-N_("Asia/Nicosia");
-N_("Asia/Novosibirsk");
-N_("Asia/Omsk");
-N_("Asia/Oral");
-N_("Asia/Phnom_Penh");
-N_("Asia/Pontianak");
-N_("Asia/Pyongyang");
-N_("Asia/Qatar");
-N_("Asia/Qyzylorda");
-N_("Asia/Rangoon");
-N_("Asia/Riyadh");
-N_("Asia/Saigon");
-N_("Asia/Sakhalin");
-N_("Asia/Samarkand");
-N_("Asia/Seoul");
-N_("Asia/Shanghai");
-N_("Asia/Singapore");
-N_("Asia/Taipei");
-N_("Asia/Tashkent");
-N_("Asia/Tbilisi");
-N_("Asia/Tehran");
-N_("Asia/Thimphu");
-N_("Asia/Tokyo");
-N_("Asia/Ujung_Pandang");
-N_("Asia/Ulaanbaatar");
-N_("Asia/Urumqi");
-N_("Asia/Vientiane");
-N_("Asia/Vladivostok");
-N_("Asia/Yakutsk");
-N_("Asia/Yekaterinburg");
-N_("Asia/Yerevan");
-N_("Atlantic/Azores");
-N_("Atlantic/Bermuda");
-N_("Atlantic/Canary");
-N_("Atlantic/Cape_Verde");
-N_("Atlantic/Faeroe");
-N_("Atlantic/Jan_Mayen");
-N_("Atlantic/Madeira");
-N_("Atlantic/Reykjavik");
-N_("Atlantic/South_Georgia");
-N_("Atlantic/St_Helena");
-N_("Atlantic/Stanley");
-N_("Australia/Adelaide");
-N_("Australia/Brisbane");
-N_("Australia/Broken_Hill");
-N_("Australia/Darwin");
-N_("Australia/Hobart");
-N_("Australia/Lindeman");
-N_("Australia/Lord_Howe");
-N_("Australia/Melbourne");
-N_("Australia/Perth");
-N_("Australia/Sydney");
-N_("Europe/Amsterdam");
-N_("Europe/Andorra");
-N_("Europe/Athens");
-N_("Europe/Belfast");
-N_("Europe/Belgrade");
-N_("Europe/Berlin");
-N_("Europe/Bratislava");
-N_("Europe/Brussels");
-N_("Europe/Bucharest");
-N_("Europe/Budapest");
-N_("Europe/Chisinau");
-N_("Europe/Copenhagen");
-N_("Europe/Dublin");
-N_("Europe/Gibraltar");
-N_("Europe/Helsinki");
-N_("Europe/Istanbul");
-N_("Europe/Kaliningrad");
-N_("Europe/Kiev");
-N_("Europe/Lisbon");
-N_("Europe/Ljubljana");
-N_("Europe/London");
-N_("Europe/Luxembourg");
-N_("Europe/Madrid");
-N_("Europe/Malta");
-N_("Europe/Minsk");
-N_("Europe/Monaco");
-N_("Europe/Moscow");
-N_("Europe/Nicosia");
-N_("Europe/Oslo");
-N_("Europe/Paris");
-N_("Europe/Prague");
-N_("Europe/Riga");
-N_("Europe/Rome");
-N_("Europe/Samara");
-N_("Europe/San_Marino");
-N_("Europe/Sarajevo");
-N_("Europe/Simferopol");
-N_("Europe/Skopje");
-N_("Europe/Sofia");
-N_("Europe/Stockholm");
-N_("Europe/Tallinn");
-N_("Europe/Tirane");
-N_("Europe/Uzhgorod");
-N_("Europe/Vaduz");
-N_("Europe/Vatican");
-N_("Europe/Vienna");
-N_("Europe/Vilnius");
-N_("Europe/Warsaw");
-N_("Europe/Zagreb");
-N_("Europe/Zaporozhye");
-N_("Europe/Zurich");
-N_("Indian/Antananarivo");
-N_("Indian/Chagos");
-N_("Indian/Christmas");
-N_("Indian/Cocos");
-N_("Indian/Comoro");
-N_("Indian/Kerguelen");
-N_("Indian/Mahe");
-N_("Indian/Maldives");
-N_("Indian/Mauritius");
-N_("Indian/Mayotte");
-N_("Indian/Reunion");
-N_("Pacific/Apia");
-N_("Pacific/Auckland");
-N_("Pacific/Chatham");
-N_("Pacific/Easter");
-N_("Pacific/Efate");
-N_("Pacific/Enderbury");
-N_("Pacific/Fakaofo");
-N_("Pacific/Fiji");
-N_("Pacific/Funafuti");
-N_("Pacific/Galapagos");
-N_("Pacific/Gambier");
-N_("Pacific/Guadalcanal");
-N_("Pacific/Guam");
-N_("Pacific/Honolulu");
-N_("Pacific/Johnston");
-N_("Pacific/Kiritimati");
-N_("Pacific/Kosrae");
-N_("Pacific/Kwajalein");
-N_("Pacific/Majuro");
-N_("Pacific/Marquesas");
-N_("Pacific/Midway");
-N_("Pacific/Nauru");
-N_("Pacific/Niue");
-N_("Pacific/Norfolk");
-N_("Pacific/Noumea");
-N_("Pacific/Pago_Pago");
-N_("Pacific/Palau");
-N_("Pacific/Pitcairn");
-N_("Pacific/Ponape");
-N_("Pacific/Port_Moresby");
-N_("Pacific/Rarotonga");
-N_("Pacific/Saipan");
-N_("Pacific/Tahiti");
-N_("Pacific/Tarawa");
-N_("Pacific/Tongatapu");
-N_("Pacific/Truk");
-N_("Pacific/Wake");
-N_("Pacific/Wallis");
-N_("Pacific/Yap");
diff --git a/composer/.cvsignore b/composer/.cvsignore
deleted file mode 100644
index 06374ed96d..0000000000
--- a/composer/.cvsignore
+++ /dev/null
@@ -1,17 +0,0 @@
-*.la
-*.lo
-.deps
-.libs
-Composer-common.c
-Composer-skels.c
-Composer-stubs.c
-Composer.h
-Editor-common.c
-Editor-skels.c
-Editor-stubs.c
-Editor.h
-Makefile
-Makefile.in
-mail-composer-errors.xml
-composer-marshal.c
-composer-marshal.h
diff --git a/composer/ChangeLog b/composer/ChangeLog
deleted file mode 100644
index cc65235821..0000000000
--- a/composer/ChangeLog
+++ /dev/null
@@ -1,1109 +0,0 @@
-2005-03-16  Not Zed  <NotZed@Ximian.com>
-
-	** See bug #73347
-
-	* mail-composer-errors.xml: set the default for auto-recover.
-
-2005-03-15  Hans Petter Jansson  <hpj@novell.com>
-
-	* e-msg-composer.c (setup_cut_copy_paste): Set up c/c/p for To: Cc:
-	Bcc: and Post To: entries too.
-
-2005-03-03  Not Zed  <NotZed@Ximian.com>
-
-	** See bug #66592
-
-	* e-msg-composer.c (e_msg_composer_get_message_draft): set the uid
-	for the x-evolution-account, not the account name, which can
-	change.
-	(e_msg_composer_new_with_message): find the account by uid first,
-	fallback to name search.
-
-2005-03-02  Not Zed  <NotZed@Ximian.com>
-
-	** See bug #66592
-
-	* e-msg-composer.c (e_msg_composer_new_with_message): scan all
-	x-evolution-postto headers.  This makes post-to drafts work
-	properly.
-	(e_msg_composer_new_with_message): change for XEvolution removal.
-
-	* e-msg-composer-hdrs.c (set_pair_visibility): track visibility
-	ourselves.
-	(e_msg_composer_hdrs_to_message_internal): dont use the visibility
-	mask to determine what headers to add, use the actually shown
-	list.  Add back the x-evolution-postto headers.
-
-2005-02-15  Jeffrey Stedfast  <fejj@novell.com>
-
-	* e-msg-composer-select-file.c (select_attach_response): Fix
-	previous patch for the !USE_GTKFILECHOOSER case.
-
-2005-02-16  Harry Lu  <harry.lu@sun.com>
-
-	Add a11y name for attachment button and bars
-
-	* e-msg-composer-attachment-bar.c:
-	(e_msg_composer_attachment_bar_new):
-	* e-msg-composer.c: (create_composer):
-
-2005-02-10  Not Zed  <NotZed@Ximian.com>
-
-	** See bug #66126.
-
-	* e-msg-composer-attachment-bar.c (destroy): destroy async file
-	requesters.
-	(add_from_user_response, add_from_user): use async file
-	requesters.
-
-	* e-msg-composer.c (save): don't fallback to saveas if the
-	filename is null.
-	(saveas, saveas_response): new functions for async file
-	requesters.
-	(menu_file_save_cb): call saveas if we have no filename.
-	(menu_file_save_as_cb): call saveas.
-	(menu_file_open_cb, file_open_response): change for async file
-	loading (which doesn't appear to be used anymore).
-	(destroy): destroy async requesters.
-
-	* e-msg-composer-select-file.c (get_selector): make it no longer
-	modal, no longer show the window.
-	(select_file_response, e_msg_composer_select_file): make it async.
-	(select_attach_response, e_msg_composer_select_file_attachments):
-	same.
-
-2005-01-24  Hans Petter Jansson  <hpj@novell.com>
-
-	* e-msg-composer-hdrs.c (create_addressbook_entry): Set pointers to the
-	contact editor creation functions in the entries, so they can pop up
-	said editors.
-
-2005-01-12  Not Zed  <NotZed@Ximian.com>
-
-	* e-msg-composer.c (destroy): initialise composer before using it.
-	sigh.
-
-2005-01-05  Not Zed  <NotZed@Ximian.com>
-
-	* e-msg-composer.c (d): turn off debug, setup g private instance
-	data structure.
-	(setup_ui): activate the composer plugin menu.
-	(destroy): clean up the composer plugin menu.
-	(class_init, init): init private instance data & plugin menu.
-
-2004-12-24  JP Rosevear  <jpr@novell.com>
-
-	* e-msg-composer.c (setup_signatures_menu): kill warnings
-	(map_default_cb): the to entry widget is now just a gtk entry at
-	its core, so check for text that way
-
-2004-12-23  Hans Petter Jansson  <hpj@novell.com>
-
-	* Makefile.am (selectnamesdir)
-	(IDL_GENERATED)
-	(INCLUDES): Remove select-names from here.
-
-	* Composer.idl: Remove Evolution-Addressbook-SelectNames.idl include.
-
-2004-12-22  Hans Petter Jansson  <hpj@novell.com>
-
-	* e-msg-composer-hdrs.c (addressbook_dialog_response)
-	(setup_corba)
-	(setup_name_selector)
-	(address_button_clicked_cb)
-	(addressbook_entry_changed)
-	(create_addressbook_entry)
-	(destroy)
-	(e_msg_composer_hdrs_new)
-	(destinations_to_name_selector_entry)
-	(e_msg_composer_hdrs_set_to)
-	(e_msg_composer_hdrs_set_cc)
-	(e_msg_composer_hdrs_set_bcc)
-	(destination_list_to_destv)
-	(e_msg_composer_hdrs_get_to)
-	(e_msg_composer_hdrs_get_cc)
-	(e_msg_composer_hdrs_get_bcc): Adapt to new ENameSelector.
-
-2004-12-17  Not Zed  <NotZed@Ximian.com>
-
-	* e-msg-composer-attachment-bar.c (emcab_popup): 
-
-	* e-msg-composer.c (drag_data_received): 
-
-2004-12-08  Hans Petter Jansson  <hpj@novell.com>
-
-	* e-msg-composer-hdrs.h: Include <libebook/e-destination.h> from
-	evolution-data-server.
-
-2004-12-07  Not Zed  <NotZed@Ximian.com>
-
-	* e-msg-composer.c: include camel-cipher-context.h so we build if
-	nss isn't available.
-
-2004-11-26  JP Rosevear  <jpr@novell.com>
-
-	* e-msg-composer.c (create_composer): get image from icon factory
-	directly
-
-2004-11-15  Not Zed  <NotZed@Ximian.com>
-
-	* e-msg-composer.c (handle_multipart_encrypted): remove the old
-	camel_multipart_encrypted api.
-
-2004-10-28  Not Zed  <NotZed@Ximian.com>
-
-	* e-msg-composer.c (drag_data_received): fix the popup id.
-
-	* e-msg-composer-attachment-bar.c (emcab_popup): added popup doco.
-
-2004-10-27  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* e-msg-composer.c (composer_key_pressed): Close on Esc.
-	(create_composer): Connect to the key-press-event signal.
-
-2004-10-26  mengjie yu  <meng-jie.yu@sun.com>
-	
-	fix for bugzilla #44876
-
-	* e-msg-composer-hdrs.c (header_new_recipient, create_headers):
-	add access key for Reply_to, From, Subject, To, Cc, Bcc, Post_to
-
-	* e-msg-composer.c (setup_signatures_menu): Add accesss key for
-	Signature.
-
-2004-10-19  JP Rosevear  <jpr@novell.com>
-
-	* e-msg-composer.c, e-msg-composer-attachment-bar.c: convert to
-	org.gnome hook names
-
-2004-10-08  Jeffrey Stedfast  <fejj@novell.com>
-
-	* e-msg-composer.c (build_message): g_strdup() the gpg/smime keys
-	into the recipients list or else we end up free'ing them later
-	when we shouldn't. Fixes bug #66703
-
-2004-10-06  Not Zed  <NotZed@Ximian.com>
-
-	* e-msg-composer.c (drag_data_received): 
-	* e-msg-composer-attachment-bar.c (emcab_popup): e-popup api changes.
-
-2004-10-01  JP Rosevear  <jpr@novell.com>
-
-	* e-msg-composer.c: uses GTKHTML_API_VERSION for the bonobo server
-	look up
-
-2004-10-01  Not Zed  <NotZed@Ximian.com>
-
-	* e-msg-composer.c (create_composer): enable ask drop action and
-	hook onto drag motion.
-	(drag_motion): implement.
-	(drop_action): do the work here now.
-	(drag_data_received): popup a menu if the action is ask.
-	(drop_popup_copy, drop_popup_move, drop_popup_cancel):
-	(drop_popup_free): Popup callbacks.
-
-2004-09-30  Kjartan Maraas  <kmaraas@gnome.org>
-
-	* e-msg-composer.c: (autosave_manager_start),
-	(autosave_manager_stop), (create_composer): Use non-deprecated
-	functions.
-
-2004-08-17  Michael Meeks  <michael@ximian.com>
-
-	* e-msg-composer.c (handle_mailto): handle 'attachment' as
-	well, as per Mozilla's mangling, and the new desktop-launch spec.
-	[ this was approved months ago, but somehow never got committed ]
-	** See bug #65592
-
-2004-09-08  Not Zed  <NotZed@Ximian.com>
-
-        ** See bug #64454.
-
-	* mail-composer-errors.xml: add accelerators to modified message
-	dialogue.
-
-2004-08-13  Radek Doulik  <rodo@ximian.com>
-
-	* e-msg-composer.c (e_msg_composer_show_sig_file): set paragraph
-	style to normal to avoid signature landing in PRE paragraph
-
-2004-07-29  Carlos Garnacho Parro  <carlosg@gnome.org>
-
-	* e-msg-composer-select-file.[ch]: Optionally use GtkFileChooser
-	if compiled against Gtk+ >= 2.4.0. (e_msg_composer_select_file):
-	added save_mode parameter
-
-	* e-msg-composer.c: use the modified e_msg_composer_select_file()
-	function
-
-2004-07-28  Not Zed  <NotZed@Ximian.com>
-
-	* e-msg-composer.c: Fixes for api changes in mail/ for 61940.
-
-2004-07-23  Radek Doulik  <rodo@ximian.com>
-
-	* listener.c: removed unused static variable listener_vepv
-
-	* added len parameter to set_editor_text,
-	e_msg_composer_set_body_text, e_msg_composer_set_pending_body. it
-	allows us to send whole buffer (even if it contains \0 in the
-	middle) to gtkhtml editor.
-
-2004-07-22  Radek Doulik  <rodo@ximian.com>
-
-	* e-msg-composer.c (set_editor_text): removed body content +
-	signature html concatenating and call e_msg_composer_show_sig_file
-	instead
-
-	Fixes #59490
-
-2004-07-20  Not Zed  <NotZed@Ximian.com>
-
-	* e-msg-composer-attachment.c: include config.h.  See #61395.
-
-2004-09-04  Not Zed  <NotZed@Ximian.com>
-
-	* e-msg-composer-*.c: include gnome-i18n.h if required.
-
-2004-08-30  Not Zed  <NotZed@Ximian.com>
-
-	* e-msg-composer-attachment-bar.c (emcab_popup): em-popup based
-	popup menu to replace the gnome one.
-	(popup_menu_event): use new func above.
-	(button_press_event): ", some cleanup.
-
-2004-06-18  Not Zed  <NotZed@Ximian.com>
-
-	** Fix for #60387.
-
-	* mail-composer-errors.xml: added an error for failing to retrieve
-	to-be-attached messages.
-
-	* e-msg-composer.c (message_rfc822_dnd): remove this, we only want
-	to treat it as a real rfc822 message, not a berkeley mailbox.
-	(drag_data_received): handle the rfc822 type here, and also the
-	new x-uid-list type.
-	(attach_message): helper set a description on attached messages.
-
-2004-06-16  Not Zed  <NotZed@Ximian.com>
-
-	* e-msg-composer.c (e_msg_composer_guess_mime_type): clean up the
-	code slightly.
-
-	* evolution-composer.c (impl_Composer_set_headers): Fix all the
-	strn?casecmp calls.
-
-	* e-msg-composer.c (from_changed_cb, drag_data_received) 
-	(is_special_header, e_msg_composer_new_with_message) 
-	(handle_mailto, e_msg_composer_new_from_url): as above.
-
-	* e-msg-composer-attachment.c (e_msg_composer_attachment_new): as
-	above.
-
-	* e-msg-composer.c (drag_data_received): handle comments in uri
-	lists.
-
-2004-06-14  Jeffrey Stedfast  <fejj@novell.com>
-
-	* e-msg-composer.c (create_composer): Don't connect to the
-	key_pressed_event.
-	(composer_key_pressed): Removed. We don't want to close the
-	compose on Escape. To do so would violate the HIG.
-
-2004-06-07  Dan Winship  <danw@novell.com>
-
-	* e-msg-composer.c (pixcache): s/stock_save_as/stock_save-as/
-
-2004-06-04  Jeffrey Stedfast  <fejj@novell.com>
-
-	* e-msg-composer.c (create_composer): Use e_error_run() instead of
-	the e_activation_error_dialog() stuff that no longer exists.
-
-2004-06-03  Radek Doulik  <rodo@ximian.com>
-
-	* e-msg-composer.c (e_msg_composer_show_sig_file): always insert
-	new paragraph for signature
-
-	Fixes #37601
-
-2004-05-27  Jeffrey Stedfast  <fejj@novell.com>
-
-	* mail-composer-errors.xml: s/${0}/{0}/g
-
-2004-05-27  Rodney Dawes  <dobey@novell.com>
-
-	* Makefile.am (EXTRA_DIST): Add $(error_i18n)
-
-2004-05-25  Not Zed  <NotZed@Ximian.com>
-
-	* e-msg-composer.c (pixcache[]): use e-icon-factory sizes.
-
-	* e-msg-composer-attachment-bar.c (update): if we have a cached
-	icon, use it, don't just ignore it!  #58831.
-
-2004-05-19  JP Rosevear  <jpr@novell.com>
-
-	* Makefile.am: don't dist the error .h file
-
-2004-05-18  Not Zed  <NotZed@Ximian.com>
-
-	* mail-composer-errors.xml: set the default for exit-unsaved to
-	save, as in 1.4.  #57995.
-
-	* e-msg-composer-hdrs.c (post_browser_clicked_cb): fix for folder
-	selector api change.
-
-2004-05-12  Not Zed  <NotZed@Ximian.com>
-
-	* mail-composer-errors.xml.h: add for translators.
-
-	* mail-composer-errors.xml: renamed from xml.in file.
-
-	* Makefile.am: Fix for i18n build stuff.
-
-2004-05-11  Jeffrey Stedfast  <fejj@novell.com>
-
-	* e-msg-composer.c (build_message): Use CAMEL_EXCEPTION_SYSTEM
-	instead of '1', also don't use camel_exception_setv() if we aren't
-	using the printf-style arguments. Just use camel_exception_set() -
-	safer anyway, since then we don't have to worry about translated
-	strings containing printf-style formatters that could break stuff.
-
-2004-05-08  Enver ALTIN <enver.altin@frontsite.com.tr>
-
-	* e-msg-composer.c: Fixing parts of #53466.
-
-2004-05-03  Not Zed  <NotZed@Ximian.com>
-
-	* e-msg-composer.c: header cleanups.
-
-2004-04-28  Not Zed  <NotZed@Ximian.com>
-
-	** Changed error messages to EError.
-
-2004-04-27  Not Zed  <NotZed@Ximian.com>
-
-	* e-msg-composer-attachment-bar.c (update): duh, pass the string
-	not the content type to the warning message.  And derrr, print it
-	for the actual error case, not the ok case.  Fixes #57680.
-
-2004-04-26  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* e-msg-composer.c (autosave_load_draft): Only unlink the original
-	autosave draft file if we are successful in saving a new copy,
-	otherwise don't unlink the file. Fixes bug #57540.
-
-2004-04-23  Not Zed  <NotZed@Ximian.com>
-
-	* e-msg-composer-attachment-bar.c (update): fallback to stock
-	unknown if we can't ifnd the icon.  #56717.
-
-2004-04-19  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* e-msg-composer.c (create_composer): Use the E_ICON_SIZE enums
-	rather than specifying an absolute pixel size.
-
-2004-04-19  Michael Terry  <mike@mterry.name>
-
-	* e-msg-composer.c: Update the composer to use the icon theme via
-	the EIconFactory object in e-util
-
-2004-04-15  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* e-msg-composer-attachment-bar.c (attach_to_multipart): Same idea
-	here as with build_mesage(), don't convert th gconf charset
-	setting to the iconv name before setting it on the mime part.
-
-	* e-msg-composer.c (best_charset): Now returns a malloc'd string
-	bufefr containing the charset that has NOT been converted to the
-	iconv name. This is important in order to avoid using the iconv
-	charset name which may or may not necessarily be the IANA blessed
-	name.
-	(composer_get_default_charset_setting): Changed to always return
-	the actual value in the settings (eg. don't return the iconv
-	name).
-	(build_message): Updated for changes to best_charset(). Set the
-	actual charset name as the charset param and then get the
-	iconv_charset from that. Use iconv_charset everywhere else.
-	(get_file_content): Updated for changes to
-	get_default_charset_setting().
-	(setup_ui): Same.
-
-2004-04-13  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* e-msg-composer.c (get_file_content): To be on the safe side
-	(even though the real bug behind bug #51924 can't happen here),
-	protect against adding a NULL charset filter tot he filtered
-	stream.
-
-2004-04-13  Larry Ewing  <lewing@ximian.com>
-
-	* e-msg-composer.c (drag_data_received): accept text/calendar
-	drops.
-
-2004-04-09  Chris Toshok  <toshok@ximian.com>
-
-	* e-msg-composer-hdrs.c (set_recipients_from_destv):
-	EABDestination -> EDestination.
-	(e_msg_composer_hdrs_to_message_internal): same.
-	(e_msg_composer_hdrs_set_to): same.
-	(e_msg_composer_hdrs_set_cc): same.
-	(e_msg_composer_hdrs_set_bcc): same.
-	(e_msg_composer_hdrs_get_to): same.
-	(e_msg_composer_hdrs_get_cc): same.
-	(e_msg_composer_hdrs_get_bcc): same.
-	(e_msg_composer_hdrs_get_recipients): same.
-
-	* e-msg-composer-hdrs.h: convert prototypes such that
-	EABDestination -> EDestination.
-
-	* e-msg-composer.h: convert prototypes such that EABDestination ->
-	EDestination.
-
-	* e-msg-composer.c (destination_list_to_vector_sized): new
-	function, ripped from EABDestination, as this code is the only
-	consumer.
-	(destination_list_to_vector): same.
-	(update_auto_recipients): EABDestination -> EDestination.
-	(e_msg_composer_new_with_message): same.
-	(add_recipients): same.
-	(handle_mailto): same.
-	(e_msg_composer_set_headers): same.
-	(e_msg_composer_get_recipients): same.
-	(e_msg_composer_get_to): same.
-	(e_msg_composer_get_cc): same.
-	(e_msg_composer_get_bcc): same.
-
-	* evolution-composer.c (corba_recipientlist_to_destv):
-	EABDestination -> EDestination.
-	(impl_Composer_set_headers): same.
-
-2004-04-07  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* e-msg-composer.c (sig_select_item): Reversed the logic for
-	setting the signature menu to "None" (only set it to "None" if a
-	signature *isn't* set, doh!)
-	(prepare_signatures_menu): Removed. Combined with
-	setup_signature_menu().
-
-2004-04-06  Radek Doulik  <rodo@ximian.com>
-
-	* e-msg-composer.c (prepare_signatures_menu): added empty hbox so
-	that we have 12pxs between account setting and signature setting
-	(set_editor_text): added pad_signature parameter to tell if we
-	want to pad signature with <BR> (used when creating new mail, in
-	other cases we don't want to pad the signature)
-
-	Fixes #42866
-
-2004-04-02  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* e-msg-composer.c (set_editor_text): Revert Radek's last change
-	to fix bug #56381.
-
-2004-04-01  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* e-msg-composer.c (get_signature_html): Fixed some breakage I
-	introduced in the changes below.
-
-2004-04-01  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* e-msg-composer.c: Updated to use the new signature APIs.
-	(signature_added): _()ify the "Autogenerated" signature name.
-
-2004-03-31  Not Zed  <NotZed@Ximian.com>
-
-	* *.[ch]: Fixed missing headers now mail/* doesn't include gtk/*,
-	camel/*, and gnome/* for you.
-
-2004-03-29  Radek Doulik  <rodo@ximian.com>
-
-	* e-msg-composer.c (set_editor_text): do not add <br> between text
-	and signature
-
-2004-03-22  Radek Doulik  <rodo@ximian.com>
-
-	* e-msg-composer.c (disable_editor): do not set editor
-	insensitive, use editable-off command instead
-
-	Fixes #55049
-
-2004-03-22  Not Zed  <NotZed@Ximian.com>
-
-	* e-msg-composer-hdrs.c (post_browser_clicked_cb): exclude
-	non-viable folder targets for selection, related to #55089.
-
-2004-03-18  Radek Doulik  <rodo@ximian.com>
-
-	* listener.c (impl_event): delete event: if empty paragraph has
-	signature == 1 then set it to 0
-
-	Fixes #55735 (be sure to update gtkhtml as well)
-
-2004-03-17  Bill Zhu  <bill.zhu@sun.com>
-
-	* e-msg_composer-attachment-bar.c: If we select multi-attachments, the
-	"properities" menu item in popup icon context menu will be disabled.
-
-	Fixes bug #55299
-	
-2004-03-07  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* e-msg-composer.c (do_exit): If the subject is empty, use
-	_("Untitled Message") as the subject instead.
-
-2004-03-05  Jeffrey Stedfast  <fejj@ximian.com>
-
-	Fixes bug #55202
-
-	* e-msg-composer.c (add_recipients): No longer takes a decode
-	argument (handle_mailto is the only function that calls it, and
-	the decode value always has to be TRUE for mailto).
-	(handle_mailto): Updated.
-
-2004-02-27  Bruce Tao <bruce.tao@sun.com>
-
-	* e-msg-composer-attachment-bar.c: add a key-press event handler, 
-	with which a little modification to Paolo Borelli's patch.
-	 <pborelli@katamail.com> When one attachment is deleted, the 
-	icon right after the last deleted one will be focused.
-
-2004-02-26  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* e-msg-composer.c (set_editor_text): Add a <br> tag between the
-	message text and the signature text (makes it nicer looking and
-	also fixes bug #53747.
-
-2004-02-17  Radek Doulik  <rodo@ximian.com>
-
-	* e-msg-composer.c (e_msg_composer_unrealize): renamed from unmap
-
-2004-02-13  Radek Doulik  <rodo@ximian.com>
-
-	* e-msg-composer.c (create_composer): get default composer size
-	from gconf, hook to unrealize event and save size to gconf
-	(e_msg_composer_unmap): new handler, saves composer window size
-
-2004-02-06  Rodney Dawes  <dobey@ximian.com>
-
-	* e-msg-composer-attachment-bar.c: add accel and icon for
-	the "remove" item in the popup menu.
-	Patch from Paolo Borelli  <pborelli@katamail.com>
-
-2004-02-03  Chris Toshok  <toshok@ximian.com>
-
-	* e-msg-composer.c (e_msg_composer_guess_mime_type): use
-	FORCE_SLOW_MIME_TYPE so gnome-vfs actually sniffs the file
-	contents before coming up with a mime type.
-
-2004-02-03  Dan Winship  <danw@ximian.com>
-
-	* Makefile.am (INCLUDES): add widgets/misc
-
-2004-02-02  Not Zed  <NotZed@Ximian.com>
-
-	* evolution-composer.c (impl_Composer_set_body): use
-	g_ascii_strcasecmp rather than strcasecmp.
-
-	** See bug #53506, again.
-
-	* e-msg-composer.c (set_editor_text): Add an argument to make
-	adding the signature optional.  Also fix a memleak with the sig
-	content.
-	(e_msg_composer_new_with_type, e_msg_composer_flush_pending_body)
-	(handle_mailto, e_msg_composer_set_body_text)
-	(e_msg_composer_set_body): Fixed callers for above change
-	appropriately.
-
-2004-01-29  Not Zed  <NotZed@Ximian.com>
-
-	* e-msg-composer.c (e_msg_composer_new_with_type): reverted
-	radek's patch below, it was already fixed (#53176).  Changed the
-	init order though, set_editor_signature only sets the current one,
-	it doen'st insert it.
-
-	** See bug #53506.
-	
-	* e-msg-composer-hdrs.c (e_msg_composer_hdrs_set_post_to_list):
-	use a GString to build the result.
-	(e_msg_composer_hdrs_set_post_to_base): same here.
-	(e_msg_composer_hdrs_set_post_to_base): dont bother copying the
-	post_to string.
-	(e_msg_composer_hdrs_get_post_to): change the relative-url test to
-	":/" rather than "://", so that mbox url's work.
-
-2004-01-27  Radek Doulik  <rodo@ximian.com>
-
-	* e-msg-composer.c (e_msg_composer_new_with_type): set body text
-	after setting composer's signature, so that signature is shown
-
-	Fixes #53367
-
-2004-01-28  Not Zed  <NotZed@Ximian.com>
-
-	** See Bug #53176, probably fixes others too.
-
-	* e-msg-composer.c (set_editor_text): When we set the text, always
-	add the signature implictly.  Means we don't have to set it
-	manually and break changing the file, or hit any races.
-	(e_msg_composer_set_body_text): dont call show_sig_file here.
-
-2004-01-14  Not Zed  <NotZed@Ximian.com>
-
-	** See Bug #20017.
-
-	* e-msg-composer.c (create_composer): set the composer to
-	unchanged after all setup, some setup (from_changed_cb) will mark
-	it changed.
-	(create_composer): remove a warning.
-
-	** See Bug #52794.
-	
-	(e_msg_composer_get_message_draft): save sign/encrypt settings to
-	X-Evolution-Format header.
-	(e_msg_composer_new_with_message): restore sign/encrypt settings
-	from X-Evolution-Format header.
-	(e_msg_composer_set_pgp_sign, e_msg_composer_set_pgp_encrypt)
-	(e_msg_composer_set_smime_sign, e_msg_composer_set_smime_encrypt):
-	Set composer changed if it did.
-
-2004-01-12  JP Rosevear  <jpr@ximian.com>
-
-	* e-msg-composer-hdrs.c (e_msg_composer_hdrs_set_post_to): fix
-	compilation error
-
-2004-01-12  Meilof Veeningen  <meilof@wanadoo.nl>
-
-	* e-msg-composer.[ch]: added "View To", "View Post To" menu items,
-	made it possible to see both at the same time, new
-	e_msg_composer_new_with_type, only visibility info of headers if
-	in the visible mask.
-
-	* e-msg-composer.[ch]: replaced folder selection button by entry
-	with selection button next to it, enabled multiple folder selection,
-	made it possible to see both To and PostTo fields, disabled
-	setting the "X-Evolution-PostTo" header.
-
-2004-01-09  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* e-msg-composer.c (autosave_manager_query_load_orphans):
-	s/unsaved files/unsaved messages/ as per bug #45407.
-
-2004-01-08  Not Zed  <NotZed@Ximian.com>
-
-	* e-msg-composer.c (set_editor_signature): add an assertion for no
-	account set.  Discovered from bug #50786.
-
-2004-01-07  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* e-msg-composer.c (create_composer): Remove the 6-pixel border
-	around the main window. That just looked ugly.
-
-2004-01-07  JP Rosevear <jpr@ximian.com>
-
-	* Makefile.am: missed this - remove disable deprecated flag
-
-2003-12-04  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* e-msg-composer-hdrs.c (create_headers): Unifdef out the post-to
-	code and fix it to use the new folder selection button.
-	(e_msg_composer_hdrs_set_post_to): Same.
-	(e_msg_composer_hdrs_get_post_to): Same.
-
-2003-12-03  Ettore Perazzoli  <ettore@ximian.com>
-
-	* e-msg-composer-hdrs.c: Do not #include
-	<evolution-folder-selector-button.h>.
-	(e_msg_composer_hdrs_set_post_to): #if 0 out for now.
-	(e_msg_composer_hdrs_get_post_to): Likewise.
-
-2003-12-02  ERDI Gergo  <cactus@cactus.rulez.org>
-
-	* e-msg-composer.c: Implemented #127527: the attachment bar is
-	packed inside an EExpander
-
-2003-12-01  Rodney Dawes  <dobey@ximian.com>
-
-	* e-msg-composer-hdrs.h: Use BASE_VERSION for repo_ids and OAFIIDs
-
-2003-11-11  Radek Doulik  <rodo@ximian.com>
-
-	* e-msg-composer.c (e_msg_composer_set_autosaved): new method to
-	wrap autosaved flag setting
-	(e_msg_composer_unset_autosaved): ditto
-	(e_msg_composer_is_autosaved): new method, says if composer was
-	autosaved only
-	(autosave_save_draft): unset changed so that we don't autosave all
-	the time when anything else than gtkhtml control changed
-
-2003-11-06  Radek Doulik  <rodo@ximian.com>
-
-	* e-msg-composer.c (autosave_save_draft): call gtkhtml's saved
-	command to clean is-saved flag, set composer's autosaved flag
-	(do_exit): complain if last save was just autosave
-	(e_msg_composer_unset_changed): reset autosaved flag
-	(save): reset autosaved flag
-
-	* e-msg-composer.h: added autosaved flag, it tells whether last
-	save was autosave or regular save, when changed flag is reset the
-	autosaved one is reset too
-
-2003-11-30  Ettore Perazzoli  <ettore@ximian.com>
-
-	* e-msg-composer-hdrs.c (create_headers): #if 0 the "post to"
-	stuff for now (it requires the global_shell_client and the
-	evolution_folder_selector_button which we don't have anymore).
-
-2003-11-26  Chris Toshok  <toshok@ximian.com>
-
-	* e-msg-composer.c (build_message): switch from just checking
-	SMIME_SUPPORTED to checking both HAVE_NSS and SMIME_SUPPORTED.
-
-2003-11-26  JP Rosevear  <jpr@ximian.com>
-
-	* Makefile.am: turn on deprecated gtk widgets
-
-2003-11-03  Not Zed  <NotZed@Ximian.com>
-
-	* e-msg-composer.c (build_message): changed to use ciphercontext
-	directly to sign the message, no multipart-signed usage.
-	(build_message): do the same for multipart/encryption for gpg encrypting.
-
-2003-11-03  Ettore Perazzoli  <ettore@ximian.com>
-
-	* e-msg-composer-hdrs.h (SELECT_NAMES_OAFIID): Append "_2".
-
-2003-10-31  Not Zed  <NotZed@Ximian.com>
-
-	* e-msg-composer.c (build_message): fix for e-account smime info
-	changes.  Also enforce having a signing certificate set in
-	preferences before doing any signing.
-	(from_changed_cb): handle smime sign/encrypt default for account
-	(create_composer): force a from-changed when we start, to properly
-	setup signing options.
-
-2003-10-30  Not Zed  <NotZed@Ximian.com>
-
-	* e-msg-composer.c: Turn on SMIME_SUPPORTED.
-	(build_message): move some of the security code around, and fix
-	up smime code.
-
-2003-10-08  Chris Toshok  <toshok@ximian.com>
-
-	* evolution-composer.c (corba_recipientlist_to_destv): EDestination =>
-	EABDestination, and e_destination => eab_destination.
-	(impl_Composer_set_headers): same.
-
-	* e-msg-composer.c (update_auto_recipients): EDestination =>
-	EABDestination, and e_destination => eab_destination.
-	(e_msg_composer_new_with_message): same.
-	(add_recipients): same.
-	(handle_mailto): same.
-	(e_msg_composer_set_headers): same.
-	(e_msg_composer_get_recipients): same.
-	(e_msg_composer_get_to): same.
-	(e_msg_composer_get_cc): same.
-	(e_msg_composer_get_bcc): same.
-
-	* e-msg-composer.h: EDestination => EABDestination, and
-	e_destination => eab_destination.
-
-	* e-msg-composer-hdrs.c (set_recipients_from_destv): EDestination
-	=> EABDestination, and e_destination => eab_destination.
-	(e_msg_composer_hdrs_to_message_internal): same.
-	(e_msg_composer_hdrs_set_to): same.
-	(e_msg_composer_hdrs_set_cc): same.
-	(e_msg_composer_hdrs_set_bcc): same.
-	(e_msg_composer_hdrs_get_to): same.
-	(e_msg_composer_hdrs_get_cc): same.
-	(e_msg_composer_hdrs_get_bcc): same.
-	(e_msg_composer_hdrs_get_recipients): same.
-
-	* e-msg-composer-hdrs.h: EDestination => EABDestination, and
-	e_destination => eab_destination.
-
-2003-09-26  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* e-msg-composer.c (save): Don't blindly claim that the file
-	exists and then ask the user if he/she would like to overwrite
-	it. First check that the file even exists, if not - then we've got
-	a different error. Fixes bug #48759.
-
-	* e-msg-composer-select-file.c (e_msg_composer_select_file): Use
-	the proper selector title, otherwise it says "Attach files" when
-	we are trying to save a message.
-
-2003-09-24  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* e-msg-composer-attachment-bar.c (get_default_charset): Same as
-	below.
-
-	* e-msg-composer.c (composer_get_default_charset_setting): Handle
-	empty-string as the charset value gotten from gconf as this can
-	happen. Partial fix for bug #47638.
-
-2003-09-13  Charles Zhang  <charles.zhang@sun.com>
-
-	* e-msg-composer-attachment-bar.c (remove_attachment): Add some
-	assertion. Send Close response signal to the properties dialog
-	while removeing an attachment.
-	* e-msg-composer-attachment-bar.c (remove_selected): Fix a re-
-	remove-attachment bug. [#48466]
-
-2003-09-18  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* e-msg-composer-attachment-bar.c: updated for
-	CamelTransferEncoding namespace changes
-
-	* e-msg-composer.c: updated for CamelTransferEncoding namespace
-	changes
-
-2003-09-18  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* e-msg-composer-attachment-bar.c:
-	* e-msg-composer-attachment.c:
-	* e-msg-composer.c: Updated for namespace changes in Camel.
-
-2003-09-17  Not Zed  <NotZed@Ximian.com>
-
-	** Merge in mail-refactor-2-branch
-
-2003-09-15  Ettore Perazzoli  <ettore@ximian.com>
-
-	* e-msg-composer-hdrs.c (header_new_recipient): Make the entry
-	non-focusable again.  The right fix for A11Y is to add
-	accelerators.
-
-2003-09-11  Federico Mena Quintero  <federico@ximian.com>
-
-	* e-msg-composer.h (EMsgComposer): Added an entry_uic field for a
-	BonoboUIComponent for the non-control entries (e.g. the Subject
-	line).
-
-	* e-msg-composer.c (create_composer): Set autoactivate to true on
-	the HTML control's BonoboControlFrame.
-	(setup_ui): Create the composer->entry_uic.
-	(destroy): Free the composer->entry_uic.
-	(entry_verbs): New array of verbs for the non-control entries.
-	Moved the Edit* verbs to here, as they should not be part of the
-	main set.
-	(composer_entry_focus_in_event_cb): Load
-	evolution-composer-entries.xml here for the non-control entries' UI.
-	(composer_entry_focus_out_event_cb): Remove the menu items.
-
-2003-09-10  Not Zed  <NotZed@Ximian.com>
-
-	* listener.c (impl_event): We want to use decode to stream for
-	attachment parts.
-
-2003-09-08  Not Zed  <NotZed@Ximian.com>
-
-	* e-msg-composer.c (autosave_load_draft): ugh, direct linking to
-	evolution-mail suckage.  Should these callbacks just be handled
-	internally?
-	(handle_multipart_encrypted, handle_multipart_signed)
-	(handle_multipart_alternative, handle_multipart)
-	(e_msg_composer_new_with_message): Use new em_utils stuff for
-	message formatting.
-
-2003-08-22  Antonio Xu  <antonio.xu@sun.com>
-
-	* e-msg-composer-attachment.c (): Connect response signal to
-	attachment properties dialog, fix bug #47950.
-
-2003-08-21  Antonio Xu  <antonio.xu@sun.com>
-
-	* Makefile.am (INCLUDES): add EVOLUTION_IMAGESDIR define
-	* e-msg-composer.c (create_composer): use EVOLUTION_IMAGESDIR
-	and composer icon name to get the path of composer icon.
-	[#47781]
-
-2003-08-19  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* Original patch from David Woodhouse, but modified a bit by me.
-
-	* e-msg-composer.c (handle_mailto): Fix insertion of arbitrary
-	headers from mailto: links. Ignore From: and Reply-To: headers.
-
-2003-08-13  Lorenzo Gil Sanchez  <lgs@sicem.biz>
-
-	* e-msg-composer-hdrs.c (account_removed_cb): fixed an insulting
-	error message. Fixes bug #47413.
-
-2003-08-13  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* e-msg-composer-attachment-bar.c (update): This needs to use
-	camel_data_wrapper_decode_to_stream() rather than
-	write_to_stream(). Also simplify a bit - no sense looping to load
-	the pixbuf data into the gdk-pixbuf loader 4K at a time when we
-	have the whole thing in a memory buffer already. Once done, unref
-	the stream instead of closing it so we don't leak.
-	(attach_to_multipart): Use decode_to_stream().
-
-	* e-msg-composer-attachment.c (e_msg_composer_attachment_new):
-	Avoid constructing thwe data-wrapper from the stream twice for
-	message/rfc822 parts.
-
-2003-07-16  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* e-msg-composer-attachment-bar.c (attach_to_multipart): don't set
-	the rawtext bit anymore.
-
-	* e-msg-composer.c (build_message): Convert the plain part's
-	content stream from UTF-8 to whatever charset we want.
-
-2003-07-31  Antonio Xu  <antonio.xu@sun.com>
-
-	* e-msg-composer.c (drag_data_received): add the drop type of
-	mozilla browser link to make composer support to handle mozilla
-	DnD data.  [#47131]
-
-2003-07-28  Antonio Xu <antonio.xu@sun.com>
-
-	* e-msg-composer-attachment-bar.c  (update): add
-	gdk_pixbuf_loader_close to close pix buffer loading.  [#45908]
-
-2003-07-25  Larry Ewing  <lewing@ximian.com>
-
-	* e-msg-composer.c (GNOME_GTKHTML_EDITOR_CONTROL_ID): require the
-	new composer control version.
-
-2003-07-17  Michel Daenzer  <michel@daenzer.net>
-
-	* e-msg-composer.c (autosave_manager_query_load_orphans): Set
-	default answer of dialog to 'yes' to try and prevent autosaved
-	messages from getting lost accidentally.
-
-2003-07-23  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* e-msg-composer-attachment-bar.c (attach_to_multipart): Revert my
-	previous changes here too.
-
-	* e-msg-composer.c (build_message): Revert my previous changes.
-
-2003-07-23  Dan Winship  <danw@ximian.com>
-
-	* bad-icon.xpm: Remove this. It was only used by e-icon-list,
-	which is no longer there.
-
-	* composer-marshal.list: Likewise
-
-	* Makefile.am: Update
-
-2003-07-21  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* e-msg-composer.c (build_message): Init charset to NULL.
-
-2003-07-21  Dan Winship  <danw@ximian.com>
-
-	* e-msg-composer.c (build_message): Make this work again.
-
-2003-07-17  Maxx Cao  <maxx.cao@sun.com>
-
-	** For bug #46013
-
-	* e-msg-composer-hdrs.c (header_new_recipient): To/cc/bcc buttons
-	made focusable.
-
-2003-07-16  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* e-msg-composer-attachment-bar.c (attach_to_multipart): don't set
-	the rawtext bit anymore.
-
-	* e-msg-composer.c (build_message): Convert the plain part's
-	content stream from UTF-8 to whatever charset we want.
-
-2003-07-16  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* e-msg-composer-attachment-bar.c (popup_menu_event): Fix warnings
-	and other breakage introduced by Maxx.
-
-2002-07-14  Maxx Cao  <maxx.cao@sun.com>
-
-	** For bug #45826
-
-	* e-msg-composer-attachment-bar.c (class_init): connect the 
-	"popup_menu" signal, so that S-F10 keybinding will work.
-	(popup_menu_event): funcion added to handle "popup_menu" (S-F10 key).
-	(popup_menu_placement_callback): function added to place the popup 
-	menu to the center of attachment icon, in case it is activated by 
-	keyboard.
-	
-2003-07-07  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* e-msg-composer.c (e_msg_composer_new_with_message): Updated to
-	use camel_strcase_hash/equal.
-
-2003-07-01  Dan Winship  <danw@ximian.com>
-
-	* e-msg-composer-attachment-bar.c (pixbuf_for_mime_type): Gone.
-	(update): Use e_icon_for_mime_type instead.
-
-	* Makefile.am (INCLUDES): remove EVOLUTION_IMAGESDIR define
-
-2003-06-25  Antonio Xu  <antonio.xu@sun.com>
-
-	* e-msg-composer.c (handle_mailto): Change file url to absolute
-	path. Fixes bug #44065.
-
-2003-07-01  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* e-msg-composer.c (autosave_load_draft): Connect to the
-	save-draft signal too. Fixes bug #45531.
-
-2003-06-27  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* e-msg-composer.c (build_message): Set the rawtext bits for the
-	'plain' and 'html' data wrappers to FALSE.
-
-2003-06-19  Larry Ewing  <lewing@ximian.com>
-
-	* listener.c (insert_paragraph_after): free the return value.
-	(impl_event): free the return value.
-
-2003-06-17  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* e-msg-composer.c (best_encoding): Use e_iconv_open/close so that
-	we get charset aliasing for free. Fixes bug #44991.
-
-2003-06-16  Jeffrey Stedfast  <fejj@ximian.com>
-
-	Fixes bug #44139.
-
-	* e-msg-composer-hdrs.c (attach_couple): Set the vertical and
-	horizontal padding to 3 always.
-	(create_from_optionmenu): Change the hbox spacing to 6 pixels.
-
-	* e-msg-composer.c (create_composer): Set the border width around
-	the composer's vbox to HIG specification and make the box_spacing
-	6 pixels as well.
-
-2003-06-10  Larry Ewing  <lewing@ximian.com>
-
-	* e-msg-composer-hdrs.c (e_msg_composer_hdrs_and_string_free):
-	free the structure as well.
-
-2003-06-09  Larry Ewing  <lewing@ximian.com>
-
-	* listener.c (insert_paragraph_before): free the return values.
-
-2003-05-21  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* e-msg-composer.c (composer_get_default_charset_setting): Same as
-	the rest.
-	(setup_ui): We didn't even seem to be using the gconf client
-	here. Removed.
-	(e_msg_composer_load_config): Unref the gconf client after we're
-	finished.
-	(e_msg_composer_new): Same.
-	(e_msg_composer_new_post): Here too.
-	(e_msg_composer_set_view_from): And here.
-	(e_msg_composer_set_view_replyto): And here.
-	(e_msg_composer_set_view_cc): Here too.
-	(e_msg_composer_set_view_bcc): Again here.
-
-	* e-msg-composer-hdrs.c (create_from_optionmenu): Same as below.
-	(e_msg_composer_hdrs_set_from_account): Here too.
-
-	* e-msg-composer-attachment-bar.c (get_default_charset): Unref the
-	gconf client.
diff --git a/composer/ChangeLog.pre-1-4 b/composer/ChangeLog.pre-1-4
deleted file mode 100644
index 58f0eebec1..0000000000
--- a/composer/ChangeLog.pre-1-4
+++ /dev/null
@@ -1,4037 +0,0 @@
-2003-05-20  Larry Ewing  <lewing@ximian.com>
-
-	* e-msg-composer.c (composer_settings_update): set the various
-	bonobo properties that are composer preferences.
-	(create_composer): add notification of gconf changes.
-	(destroy): disconnect notification.
-
-	* e-msg-composer.h: keep the gcond notify handler id.
-
-2003-05-15  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* e-msg-composer-attachment.c (e_msg_composer_attachment_edit):
-	Don't connect to the focus-out-event in order to update the
-	mime-type. Simply don't update the mime-type ever. Fixes bug
-	#42798.
-
-2003-04-28  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* e-msg-composer.c (autosave_manager_query_load_orphans): Change
-	the "would you like to recover unsaved drafts?" dialog a QUESTION
-	dialog rather than an ERROR dialog. Fixes bug #42024.
-
-2003-04-25  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* e-msg-composer-attachment-bar.c (pixbuf_for_mime_type): If we
-	fail to load the icon that gnome_vfs_get_icon() gave us, the
-	default back to gnome-unknown.png. This is the only POSSIBLE way
-	for Anna to be getting a NULL pixbuf if she has gnome-unknown.png
-	that I can see. Should fix bug #41513.
-
-2003-04-23  Not Zed  <NotZed@Ximian.com>
-
-	* e-msg-composer.c (map_default_cb): removed debug printfs.
-
-2003-04-22  Radek Doulik  <rodo@ximian.com>
-
-	* e-msg-composer.c (add_attachments_handle_mime_part): added
-	related argument, TRUE means that container of mime_part is
-	multipart/related
-	(add_attachments_handle_mime_part): add images as inline when
-	related is TRUE
-	(add_attachments_from_multipart): pass related to
-	add_attachments_handle_mime_part
-
-2003-04-21  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* e-msg-composer.c (add_attachments_handle_mime_part): Don't ever
-	attach non-inlined text or message parts. Reverts a prior fix.
-
-2003-04-21  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* e-msg-composer-attachment.glade: Change the order of the
-	ok/cancel buttons.
-
-2003-04-19  Chris Toshok  <toshok@ximian.com>
-
-	[ fixes #40694 ]
-	* e-msg-composer-hdrs.c (create_addressbook_entry): this can't
-	hurt - set the frame to autoactivate so if by some chance the
-	widget is focused the control will end up being activated.
-
-	* e-msg-composer.c (map_default_cb): activate the To: control
-	instead of focusing the widget.
-
-2003-04-18  Rodney Dawes  <dobey@ximian.com>
-
-	* Makefile.am:
-	* e-msg-composer.c:
-	Use PREFIX instead of EVOLUTION_DATADIR for bonobo_ui_util_set_ui ().
-	Fixes bug #21499.
-	
-2003-04-14  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* e-msg-composer-attachment.c (file_name_focus_out_cb): Return
-	FALSE so the signal gets propogated further up the chain. Fixes
-	bug #41238.
-	(e_msg_composer_attachment_edit): The focus-out-event signal name
-	changed (although the old name still works...for now?).
-
-2003-04-11  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* e-msg-composer-attachment.glade: Updated to comply with the
-	HIG. Fixes bug #41239 and bug #41241.
-
-2003-04-09  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* e-msg-composer.c (composer_get_default_charset_setting): Use
-	e_iconv_locale_charset() instead of e_iconv_locale_name(), dunno
-	what I was thinking. locale_name() doesn't even exist.
-	(setup_ui): Don't free the default_charset, it's a const char*.
-
-	* e-msg-composer-attachment-bar.c (get_default_charset): Same.
-
-2003-04-09  Chris Toshok  <toshok@ximian.com>
-
-	* e-msg-composer.c (setup_ui): fix build, it's
-	composer_get_default_charset_setting.
-
-2003-04-09  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* e-msg-composer.c (composer_get_default_charset_setting): Same as
-	with attachment-bar's get_default_charset().
-	(setup_ui): Instead of pulling the default charset from gconf,
-	call our helper function above.
-
-	* e-msg-composer-attachment-bar.c (get_default_charset): If gconf
-	returns a NULL string, default back to the locale charset.
-
-2003-04-08  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* e-msg-composer.c (map_default_cb): Added some debug printfs.
-	(create_composer): Call map_default_cb directly instead of having
-	it in a "map" callback. Ettore says we shouldn't be doing this
-	*shrug*. Still doesn't work tho.
-
-2003-04-07  Chris Toshok  <toshok@ximian.com>
-
-	[ fixes bug #39763 ]
-	* e-msg-composer.c (setup_cut_copy_paste): remove the
-	control_entry_focus_{in,out}_event_cb signal stuff.
-	(control_entry_focus_in_event_cb): nuke
-	(control_entry_focus_in_event_cb): same.
-
-	* e-msg-composer-hdrs.c (create_addressbook_entry): pass the
-	contain to bonobo_widget_new_control_from_objref when creating the
-	entries.
-
-2003-04-04  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* e-msg-composer.c (autosave_save_draft): If the composer isn't
-	'dirty', then don't autosave the draft (no need to). Fixes bug
-	#40764.
-
-2003-04-03  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* e-msg-composer.c (menu_edit_select_all_cb): Add a select-all
-	callback and verb.
-	(composer_entry_focus_in_event_cb): Set our bonobo-ui verbs.
-
-2003-04-02  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* e-msg-composer-select-file.c (e_msg_composer_select_file): Guard
-	against the filesel's selection being NULL. Fixes bug #40679.
-
-2003-04-01  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* e-msg-composer.c (composer_entry_focus_in_event_cb): Keep track
-	of which entry widget has focus.
-	(composer_entry_focus_out_event_cb): Same.
-	(control_entry_focus_in_event_cb): Same idea, but since this is in
-	another component, tell that component that its widget has focus
-	so it can merge bonoboui cut/copy/paste (and anything else) menus.
-	(control_entry_focus_out_event_cb): Same.
-	(setup_cut_copy_paste): Connect to the focus-in and focus-out
-	events for all the entry widgets and the html editor.
-	(menu_edit_cut_cb): New callback function since the composer will
-	now own the Cut/Copy/Paste menu items sometimes (depending on
-	which widget is in focus... confused yet? good).
-
-	* e-msg-composer-hdrs.c (from_changed): Update the Reply-To entry
-	to be a normal GtkEntry.
-	(create_headers): Same.
-	(e_msg_composer_hdrs_set_reply_to): Here too.
-	(e_msg_composer_hdrs_get_reply_to): And finally here.
-
-2003-04-01  Not Zed  <NotZed@Ximian.com>
-
-	** See bug #40300 & probably others.
-
-	* e-msg-composer.c (autosave_manager_query_load_orphans): make the
-	composer arg a parent arg, its only used parent the dialogue.
-	Fix caller casts.
-	(e_msg_composer_check_autosave): new function, checks for
-	autosave files, and recovers them per user instructions.
-
-2003-03-31  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* e-msg-composer-attachment.glade: Convert to libglade-2's format.
-
-	* e-msg-composer.c (set_editor_signature): E_MSG_COMPOSER_HDRS
-	(composer->hdrs)->account->id can never be NULL anymore.
-
-2003-03-25  Dan Winship  <danw@ximian.com>
-
-	* e-msg-composer.c: Update for e_notice move
-
-2003-03-20  Jeffrey Stedfast  <fejj@ximian.com>
-
-	Fixes for bug #39813
-
-	* e-msg-composer.c (composer_finalise): Don't unregister the
-	signature event handler here.
-	(destroy): Unregister it here instead.
-
-2003-03-19  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* e-msg-composer.c (add_attachments_handle_mime_part): Change the
-	logic to attach text parts when appropriate.
-	(map_default_cb): Grab the focus of the To entry widget. Fixes bug
-	#39800. Fixes another #warning too.
-
-2003-03-18  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* e-msg-composer.c (do_exit): e_msg_composer_hdrs_get_subject()
-	now returns const so don't g_free() it :-)
-	(map_default_cb): Same as above. Also, the subject entry no longer
-	derives from GnomeCanvas so eliminate the now unneeded casting to
-	grab the focus of the subject widget.
-	(e_msg_composer_get_subject): Return a const char * now.
-
-	* e-msg-composer-hdrs.c (create_headers): Make the subject entry
-	into a GtkEntry so we don't have to worry about i18n and other
-	EEntry bugs anymore. Fixes numerous bugs (including #39924).
-	(e_msg_composer_hdrs_set_subject): Use gtk_entry_set_text().
-	(e_msg_composer_hdrs_to_message_internal):
-	e_msg_composer_hdrs_get_subject() now returns const.
-	(e_msg_composer_hdrs_get_subject): Return a const char *.
-	(entry_changed): e_msg_composer_hdrs_get_subject() now returns
-	const.
-
-2003-03-13  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* e-msg-composer.c (create_composer): Default the composer's title
-	to "Create a message". Fixes bug #39696.
-
-2003-03-11  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* e-msg-composer-attachment-bar.c: Use GnomeIconList instead of
-	EIconList so we don't have to maintain an exact copy/paste of
-	GnomeIconList ourselves. I don't udnerstand why we ever did.
-
-	* e-icon-list.[c,h]: Removed.
-
-2003-03-11  Not Zed  <NotZed@Ximian.com>
-
-	* evolution-composer.c (evolution_composer_new): add
-	send_cb/save_draft_cb arguments.
-	(impl_Composer_send): use the local send_cb.
-	(evolution_composer_init): dont init send, save-draft signals
-	here.
-	(evolution_composer_new): init signals here, fix params to
-	composer_construct().
-	(evolution_composer_factory_init): remove, part of mailer now.
-	(factory_fn): same.
-	(finalise): disconnect from callbacks first.
-
-	* evolution-composer.h: add send_cb/save_draft_cb to composer object.
-
-2003-03-10  Not Zed  <NotZed@Ximian.com>
-
-	* evolution-composer.c (finalise): from destroy.
-	(evolution_composer_class_init): gtkobject->gobject stuff.
-	(evolution_composer_new): remove old redundant stuff.
-
-2003-03-04  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* e-msg-composer.c (composer_get_default_charset_setting): Don't
-	allow the returned charset to be NULL.
-	(get_file_content): Make sure there is buffered data before trying
-	to convert it to UTF-8.
-
-2003-03-04  Not Zed  <NotZed@Ximian.com>
-
-	* e-msg-composer-hdrs.c (destroy): disconnect any signal handlers
-	on the accounts object.  For bug #37873.
-
-2003-02-25  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* e-msg-composer.c: Same as below.
-
-	* e-msg-composer-attachment-bar.c: Go back to using
-	e_iconv_charset_name().
-
-2003-02-24  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* e-msg-composer.c (drag_data_received): Make sure the url is !=
-	NULL? I can't think of anything else in this code that could
-	possibly cause bug #38382.
-
-	* e-msg-composer-attachment-bar.c (pixbuf_for_mime_type): Fixed a
-	memory leak.
-
-2003-02-22  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* e-msg-composer.c (e_msg_composer_set_send_html): Don't save the
-	HTML format setting to gconf. This option menu is meant for a
-	per-essage setting (ie. once the composer closes, the next
-	composer will again use the default and not what the user chose
-	last time).
-
-2003-02-21  Dan Winship  <danw@ximian.com>
-
-	* Makefile.am: build libcomposer as a shared library so it can be
-	linked into libevolution-mail.so without portability problems
-
-2003-02-20  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* e-msg-composer.c (composer_get_default_charset_setting): Same as
-	below.
-
-	* e-msg-composer-attachment-bar.c (get_default_charset): Use
-	camel_charset_canonical_name() rather than e_iconv_charset_name()
-	as the latter will be removed shortly.
-
-2003-02-18  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* e-msg-composer-hdrs.c (e_msg_composer_hdrs_set_from_account):
-	default_account is now a string value, not an int.
-	(create_from_optionmenu): Same.
-	(header_new_recipient): Use g_signal_connect_data() instead of the
-	now deprecated gtk_signal_connect_full().
-
-2003-02-06  Dan Winship  <danw@ximian.com>
-
-	* Makefile.am: clean up
-
-	* e-msg-composer.c (autosave_manager_query_load_orphans): #include
-	string.h
-	(menu_file_send_cb): s/gtk_signal_emit/g_signal_emit/
-
-	* e-msg-composer-attachment.c: #include string.h
-	(e_msg_composer_attachment_edit): s/E_GLADEDIR/EVOLUTION_GLADEDIR
-
-	* e-msg-composer-attachment-bar.c: #include string.h
-	(pixbuf_for_mime_type): s/ICONSDIR/IMAGESDIR/
-
-	* e-msg-composer-hdrs.c: #include string.h
-
-	* e-msg-composer-select-file.c (run_selector): Remove unused var
-
-	* evolution-composer.c: #include string.h
-	(evolution_composer_init): Remove unused var
-
-	* listener.c: #include string.h
-	(listener_new): Remove unused var
-
-2003-02-05  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* e-msg-composer.c (e_msg_composer_new_from_url): Split out the
-	mailto handling code from here so we can use it in the drag-n-drop
-	code too.
-	(drag_data_received): If we find a mailto: url in the
-	text/uri-list drop, pass that off to handle_mailto() so it can
-	fill in the fields for us.
-
-2003-02-03  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* e-msg-composer-attachment.c: Just use
-	gnome_vfs_get_mime_type_from_name().
-
-2003-02-01  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* e-msg-composer-attachment.c (update_mime_type): Give
-	gnome_vfs_get_uri_from_local_path a full path.
-
-2003-01-27  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* e-msg-composer.c (e_msg_composer_new_from_url): If the subject
-	or body components of the mailto url are not in UTF-8, convert
-	them to UTF-8.
-
-	* e-msg-composer-attachment.c (update_mime_type): Fixed a #warning
-	by converting the filename into a uri before passing it into
-	gnome_vfs_get_mime_type() since that function really needs a uri.
-
-2003-01-22  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* e-msg-composer-hdrs.c (init): Get the list of accounts here and
-	ref the account-list.
-	(destroy): Unref the accounts list here.
-	(create_from_optionmenu): Connect to the added/changed/removed
-	account-list signals here.
-	(account_added_cb): New callback function that adds the newly
-	added account to the from-dropdown menu.
-	(account_changed_cb): New callback that changes the label for the
-	account that got changed in the dropdown menu.
-	(account_removed_cb): Removes the account from the from dropdown
-	menu.
-
-2003-01-24  Ettore Perazzoli  <ettore@ximian.com>
-
-	* Makefile.am (iconsdir): Remove, this is now defined in
-	configure.in.
-
-2003-01-23  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* e-msg-composer.c (e_msg_composer_load_config): Load the view
-	menu states from gconf.
-	(e_msg_composer_set_send_html): Save the setting via gconf instead
-	of bonobo-config.
-	(e_msg_composer_set_view_from): Same.
-	(e_msg_composer_set_view_replyto): Here too.
-	(e_msg_composer_set_view_cc): Again here.
-	(e_msg_composer_set_view_bcc): And finally here.
-	(setup_ui): Fixed a #warning - use gconf instead of bonobo-conf.
-	(destroy): No need to sync/destroy the bonobo-conf db, we don't
-	use it anymore.
-
-2003-01-16  Ettore Perazzoli  <ettore@ximian.com>
-
-	* e-msg-composer.c (setup_ui): Get evolution-message-composer.xml
-	from EVOLUTION_UI_DIRECTORY.
-
-	* Makefile.am (gladedir): Version it using $(BASE_VERSION).
-	(iconsdir): Likewise.
-	(libcomposerincludedir): Removed.
-
-2003-01-17  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* evolution-composer.c (impl_Composer_set_headers): Updated to use
-	EAccountList and iterators.
-	(evolution_composer_init): Updated to use EAccount.
-
-	* e-msg-composer.c (from_changed_cb): Updated to use the EAccount
-	object.
-	(e_msg_composer_new_with_message): Same.
-	(e_msg_composer_get_preferred_account): Updated to return an
-	EAccount object.
-	(set_editor_signature): Updated to use an EAccountIdentity pointer.
-	(get_signature_html): Same.
-
-	* e-msg-composer-hdrs.c (create_from_optionmenu): Updated to use
-	EAccount and EAccountList foo.
-	(destroy): Same here.
-	(e_msg_composer_hdrs_set_from_account): Here too.
-	(e_msg_composer_hdrs_get_from): Updated.
-
-2003-01-16  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* e-msg-composer.c (signature_cb): mail_config_get_signature_list
-	now returns a GSList.
-	(setup_signatures_menu): Same.
-	(set_signature_gui): Here too.
-
-2003-01-14  Ettore Perazzoli  <ettore@ximian.com>
-
-	* e-msg-composer.c (do_exit): Make dialog HIG compliant
-	[Discard/Cancel/Save].
-
-2003-01-09  Chris Toshok  <toshok@ximian.com>
-
-	* e-msg-composer-hdrs.c (e_msg_composer_hdrs_set_to): don't pass
-	NULL to bonobo_widget_set_property.
-	(e_msg_composer_hdrs_set_cc): same.
-	(e_msg_composer_hdrs_set_bcc): same.
-
-2003-01-09  Chris Toshok  <toshok@ximian.com>
-
-	* e-msg-composer-hdrs.c (e_msg_composer_hdrs_new): need to
-	ref/sink "new" so that the g_object_unref doesn't spew a warning.
-
-2003-01-08  Ettore Perazzoli  <ettore@ximian.com>
-
-	* Makefile.am: Icons are now in $(datadir)/evolution/images
-	instead of $(datadir)/images/evolution.
-
-2003-01-08  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* e-msg-composer-hdrs.c (create_from_optionmenu): Use gconf to get
-	the default account index.
-	(e_msg_composer_hdrs_set_from_account): Same.
-
-2003-01-07  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* e-msg-composer-attachment-bar.c (get_default_charset): New
-	convenience function.
-	(attach_to_multipart): Use get_default_charset().
-
-	* e-msg-composer.c (composer_get_default_charset): Convenience
-	function.
-	(get_file_content): Use the convenience function to get the
-	default charset setting.
-	(best_charset): Same.
-	(e_msg_composer_new): Use gconf to get the send_html setting.
-	(e_msg_composer_new_post): Same.
-
-2003-01-06  Dan Winship  <danw@ximian.com>
-
-	* Makefile.am: Remove idldir definition. (It's defined in
-	configure.in now)
-
-2002-12-16  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* e-msg-composer.c (get_signature_html): Use camel_text_to_html().
-	(e_msg_composer_new_from_url): Same.
-
-	* evolution-composer.c (impl_Composer_set_body): Use
-	camel_text_to_html().
-
-2002-12-07  Jeffrey Stedfast  <fejj@ximian.com>
-
-	Fix for bug #33295
-
-	* e-msg-composer-attachment.c: Change the parent_class to a
-	GObjectClass pointer instead of a GtkObjectClass pointer.
-	(e_msg_composer_attachment_edit): Ref the attachment object so
-	that if the attachment is removed while it is still being edited,
-	the attachment object will still exist and therefor foil the
-	user's attempt to make Evolution crash when they close the
-	properties dialog for this attachment.
-	(close_cb): Unref the attachment object.
-
-2002-12-03  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* e-msg-composer.c (message_rfc822_dnd): Get rid of the unused
-	exception variable.
-
-2002-11-27  Not Zed  <NotZed@Ximian.com>
-
-	* e-msg-composer.c (save): removed warning about e_notice.  its
-	used too much, its here to stay.
-
-	* *.[ch]: run fix.sh over everything.
-
-2002-12-01  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* e-msg-composer.c: s/g_str[n]casecmp/str[n]casecmp
-
-2002-11-26  Not Zed  <NotZed@Ximian.com>
-
-	* e-msg-composer.c (composer_finalise): properly chain finalise.
-
-2002-11-25  Not Zed  <NotZed@Ximian.com>
-
-	* e-msg-composer-attachment-bar.c (init): Remove the window size
-	setting.
-	(e_msg_composer_attachment_bar_new): Move the window size setting
-	here.  Also set icon width based on 15 approximate characters, so
-	the icon text is more readable.
-
-2002-11-22  Not Zed  <NotZed@Ximian.com>
-
-	* e-msg-composer-select-file.c: rewrote most of this.  Just use
-	gtkfileselection directly, no e-file-selector, much
-	smaller/simpler.
-
-2002-11-21  Not Zed  <NotZed@Ximian.com>
-
-	* e-msg-composer-attachment-bar.c (remove_attachment): fix
-	g_signal_emit params, detail in wrong spot.
-	(add_common): Same.
-
-	* e-icon-list.c (icon_new_from_pixbuf): remove the
-	'use_broken_event_handling' set.
-	(emit_select): Add detail to signal emit.
-	(text_changed): Same.
-
-	* e-msg-composer.c (subject_changed_cb): Duh!  dont free subject &
-	simplify logic a little.
-
-2002-11-20  Not Zed  <NotZed@Ximian.com>
-
-	* e-msg-composer-hdrs.c (entry_changed): duh, emit the signal
-	using an initialised value(!).
-
-2002-11-19  Radek Doulik  <rodo@ximian.com>
-
-	* e-msg-composer.c (e_msg_composer_get_sig_file_content): use
-	CAMEL_MIME_FILTER_TOHTML_PRESERVE_8BIT flag
-
-2002-11-19  Not Zed  <NotZed@Ximian.com>
-
-	* e-msg-composer-attachment-bar.c (add_from_file): dont unref
-	after destroy. duh.
-
-	* e-msg-composer-hdrs.c (e_msg_composer_hdrs_set_to): Add type
-	code to set_property call.
-	(e_msg_composer_hdrs_set_cc): "
-	(e_msg_composer_hdrs_set_bcc): "
-	(e_msg_composer_hdrs_get_to): Do the same for get_property calls.
-	(init): ref/sink the tooltip object.
-	(e_msg_composer_hdrs_get_type): fix return type.
-
-	* e-msg-composer.c (GNOME_GTKHTML_EDITOR_CONTROL_ID): we want
-	version 3.0 not 1.1.
-	(create_composer): Add type code to set property call.
-	(autosave_manager_query_load_orphans): my bad, we dont unref
-	dialog's once we've destroyed 'em.
-	(build_message): "
-	(get_file_content): "
-	(save): "
-	(do_exit): "
-	(composer_dispose): moved the autosave shutdown here.
-
-2002-11-18  Not Zed  <NotZed@Ximian.com>
-
-	* e-msg-composer.c (create_composer): Remove check for
-	gtk_main_level().  as far as i can tell it serves no real purpose,
-	and i think gtkmain is now redundant.
-	(e_msg_composer_new_with_message): Same here.
-	(destroy): moved some stuff into finalise, and made destroy
-	mulitcall safe.
-
-2002-11-13  Ettore Perazzoli  <ettore@ximian.com>
-
-	* listener.h: Removed {BEGIN,END}_GNOME_DECLS.
-
-	* e-msg-composer-select-file.c: Do not #include
-	<libgnome/gnome-defs.h>.
-	* e-msg-composer.c: Likewise.
-	* listener.h: Likewise.
-
-2002-11-13  Not Zed  <NotZed@Ximian.com>
-
-	* e-msg-composer.c (setup_ui): bonobo api changes.
-
-	* e-icon-list.c (e_icon_list_new): Use the right object_new method.
-
-	* e-icon-list.h: get rid of BEGIN/END_GNOME_DECLS stuff.
-
-2002-11-11  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* e-msg-composer-attachment-bar.c: Remove some unused ehaders and
-	ones that cause compilation failures (such as gnome-defs.h).
-
-	* e-icon-list.h: Same.
-
-2002-11-08  Not Zed  <NotZed@Ximian.com>
-
-	* listener.c: Fix bonobo object setup.
-
-	* e-msg-composer-hdrs.c: Remove oaf stuff, fix destroy to be
-	multi-call safe.
-
-	* e-msg-composer-attachment.c (e_msg_composer_attachment_new):
-	Remove utf8 from locale conversions, & glib api changes.
-	(ok_cb): "
-
-	* e-msg-composer-attachment-bar.c (add_from_file): gtk message
-	dialog.
-	(pixbuf_for_mime_type): glib,gnome-vfs api changes.
-	(init): Estimate the icon_height based on the pango font
-	description size, this is probably not correct.
-	(properties_cb): 
-	(remove_cb): Changed signature for gnomeui callbacks.
-	(popup_icon_context_menu): 
-	(popup_context_menu): popup_menu api change
-	(destroy): Protect from multiple calls.
-	(e_msg_composer_attachment_bar_new): Remove push/pop
-	visual/colormap stuff.
-
-	* composer-marshal.list: The list of marshallers used by the
-	composer.
-
-	* Makefile.am (composer-marshal.h): Added composer marshal builder.
-
-	* evolution-composer.c (class_init): bonobo object epv setup change.
-	(factory_fn): Fix changes to factory callback.
-
-	* e-icon-list.c: (icon_get_height): Use bounding box to calc
-	height.
-	(icon_event): drop gtk_selection_extended.
-	(e_icon_list_remove): "
-	(select_icon): 
-	(unselect_icon): "
-
-	* e-msg-composer.c (autosave_save_draft): Dup fd rather than poke
-	camel_stream_fd's data.  Also, use camel_stream_close() rather
-	than flush.
-	(autosave_manager_query_load_orphans): Port to gtk dialog.
-	(autosave_query_cb): Removed, redundant.
-	(save): Port to gtkdialog.
-	(prepare_engine): Fix bonobo-object-client code.
-	(get_file_content): gtk dialog
-	(do_exit): gtk dialog.
-	(setup_signatures_menu): dump gtkutf8 stuff.
-	(marshal_NONE__NONE_INT): What WAS jeff thinking?  Removed :)
-	(class_init): g object setup.
-	(e_msg_composer_get_type): "
-	(create_composer): remove bonobo_window_construct, use create
-	property instead.  g_signal stuff.  bonobo stuff.
-	(is_special_header): Use ascii_strncasecmp
-	(e_msg_composer_set_pending_body): gtk->g_object_get/set_data.
-	(e_msg_composer_set_body): use ascii_strncasecmp
-	(e_msg_composer_add_inline_image_from_mime_part): make cid const.
-	(autosave_manager_register): 
-	(autosave_manager_unregister): Use g_path_get_basename() & account
-	for differences.
-	(composer_shutdown): rename to finalise/etc.
-	(class_init): Use object:finalize instead of shutdown.
-	(e_msg_composer_set_body): Use _() rather than U_().
-	(build_message): gtk dialog.
-
-2002-11-06  Not Zed  <NotZed@Ximian.com>
-
-	* e-msg-composer-attachment-bar.c (pixbuf_for_mime_type): Add
-	error return to gdk_pixbuf_new_from_file().
-
-2002-11-01  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* e-msg-composer.c (e_msg_composer_new_from_url): Add support for
-	an attach option in the mailto: url.
-
-2002-10-29  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* e-msg-composer.c (e_msg_composer_new_with_message): Make sure to
-	save References and In-Reply-To headers. Fixes bug #32932.
-
-2002-10-26  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* e-msg-composer-attachment-bar.c (attach_to_multipart): Don't set
-	the charset param on text parts nor tha rawtext bit on the content
-	if a charset for the part is already specified.
-
-2002-10-25  Ettore Perazzoli  <ettore@ximian.com>
-
-	* e-msg-composer-attachment-bar.c (size_to_string): Return NULL
-	instead of the empty string if the size is less than one K.
-	(update): Only put the size if size_to_string() doesn't return
-	NULL.  [#32751]
-
-2002-10-18  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* e-msg-composer-hdrs.c (create_from_optionmenu): Only add the
-	account address to the list of addresses if it is non-NULL. Fixes
-	bug #32446 although it shouldn't ever happen anyway (an account
-	address is not allowed to be NULL).
-
-2002-10-16  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* e-msg-composer-attachment.c (e_msg_composer_attachment_new): We
-	need to treat message/rfc822 streams differently. Fixes bug
-	#32378.
-
-2002-10-16  Not Zed  <NotZed@Ximian.com>
-
-	* e-msg-composer-select-file.c (select_file_internal): Mark the
-	file selector modal.  Quick fix for bug #32256.
-
-2002-10-04  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* e-msg-composer-attachment-bar.c (attach_to_multipart): Set
-	content->rawtext to TRUE for text parts because the content is in
-	its raw form (since we didn't know the charset when we created
-	it). Also only write out the content-object to discover the best
-	encoding, we don't want to include the headers of the MIME
-	part. Second half of the fix for bug #31655.
-
-2002-10-02  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* e-msg-composer.c (get_file_content): Don't create a new file if
-	the file doesn't exist.
-
-2002-10-01  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* e-msg-composer.c (build_message): If the user hits cancel when
-	signing/encrypting, don't continue constructing the message,
-	instead abort (and just don't pop up a dialog).
-
-2002-10-01  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* e-msg-composer.c (build_message): When signing/encrypting a
-	part, if a USER_CANCEL occurs, re-use the part otherwise unref it
-	and replace it with the new part.
-
-2002-09-30  Aaron Weber  <aaron@ximian.com>
-
-	* evolution-composer.c (evolution_composer_factory_init): adjust
-	string on line 391
-
-	* e-msg-composer.c (create_composer): adjust string on 2872
-
-2002-09-27  Dan Winship  <danw@ximian.com>
-
-	* Evolution-Composer.idl (setHeaders): let the caller set the
-	"From" account too (by name or address).
-
-	* evolution-composer.c (impl_Composer_set_headers): Update for
-	that.
-
-2002-09-27  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* e-msg-composer.c (build_message): Don't reuse the part that
-	we've signed and/or encrypted, create a new part container
-	instead. Fixes bug #31379.
-
-2002-09-25  Dan Winship  <danw@ximian.com>
-
-	* e-msg-composer-hdrs.c (create_headers): Use "mail/*" for the
-	allowed_types for the posting folder selector.
-
-2002-09-24  Dan Winship  <danw@ximian.com>
-
-	* e-msg-composer-hdrs.c (create_from_optionmenu): Only append the
-	account name to the end of the From menu item if the email address
-	is not unique. (That was added for people who have multiple
-	accounts with the same email address but different transports. The
-	rest of us don't need to be reminded of the account name, and
-	having it there can make the window very wide.)
-
-2002-09-24  Zbigniew Chyla  <cyba@gnome.pl>
-
-	* e-msg-composer-attachment-bar.c (size_to_string):
-	Don't mark empty string with _().
-
-2002-09-23  Ettore Perazzoli  <ettore@ximian.com>
-
-	* e-icon-list.c (icon_new_from_pixbuf): Removed a #warning.
-
-	* e-msg-composer-attachment-bar.c (size_to_string): Don't use dots
-	here so we don't get funny wrapping from GnomeIconList.  [#236]
-
-2002-09-22  Dan Winship  <danw@ximian.com>
-
-	* e-msg-composer.c (save): Fix non-ANSI switch statement
-
-2002-09-19  Radek Doulik  <rodo@ximian.com>
-
-	* e-msg-composer.c (signature_cb): allow to select last 2 menu
-	items
-
-2002-09-17  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* e-msg-composer.c (add_attachments_from_multipart): Handle
-	multipart/signed and multipart/encrypted parts in a more expected
-	way. Fixes bug #28453.
-
-2002-09-15  Kjartan Maraas  <kmaraas@gnome.org>
-
-	* e-msg-composer.c: Mark a string for translation.
-
-2002-09-05  Ettore Perazzoli  <ettore@ximian.com>
-
-	* e-msg-composer.c (composer_key_pressed): Don't chain the event
-	handler here -- that's just wrong!  Also stop emission of the
-	signal when we catch Escape.
-
-2002-09-04  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* e-msg-composer.c (create_composer): Make it so that the composer
-	will close when the user hits Escape.
-
-2002-08-27  Radek Doulik  <rodo@ximian.com>
-
-	* e-msg-composer.c (signature_cb): removed "Set as default" menu item
-
-2002-08-26  Peter Williams  <peterw@ximian.com>
-
-	* e-msg-composer.c (handle_multipart): Oops, we were overwriting
-	'multipart' with our child multipart. Fixes 29399.
-	(handle_multipart_alternative): Here too.
-
-2002-08-22  Jeffrey Stedfast  <fejj@ximian.com>
-
-	Fixes bug #29016
-
-	* e-msg-composer.c (e_msg_composer_new_with_message): If the
-	X-Evolution-PostTo header exists, then treat this message composer
-	as a PostTo composer rather than a mail composer.
-
-	* e-msg-composer-hdrs.c (e_msg_composer_hdrs_to_message_internal):
-	Set the X-Evolution-PostTo header if that is the mdoe we are in.
-
-2002-08-16  Dan Winship  <danw@ximian.com>
-
-	* e-msg-composer-hdrs.c (create_headers): Use an
-	EvolutionFolderSelectorButton instead of a label to indicate the
-	posting destination. #27920.
-	(e_msg_composer_hdrs_set_post_to): Use
-	evolution_folder_button_set_uri.
-	(e_msg_composer_hdrs_get_post_to): Use
-	evolution_folder_button_get_folder.
-
-2002-08-14  Dan Winship  <danw@ximian.com>
-
-	* e-msg-composer.c (from_changed_cb): Don't turn on pgp signing if
-	this is an iMIP message and pgp_no_imip_sign is set.
-	(e_msg_composer_set_body): If setting a text/calendar body and
-	pgp_no_imip_sign is true, turn off signing.
-
-2002-08-13  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* e-msg-composer.c (do_exit): Make the warning dialog display the
-	message subject so that it is more clear which composer the dialog
-	is referring to. Fixes bug #25467.
-
-2002-08-12  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* e-msg-composer-select-file.c (create_file_selection): Set the
-	file-selection window icon. Fixes the mailer part of bug #7368.
-
-	* e-msg-composer-attachment.c (e_msg_composer_attachment_new):
-	Don't call new_from_mime_part() since that function now does some
-	copying of the mime part rather than simply reffing it.
-	(e_msg_composer_attachment_new_from_mime_part): Make a copy of the
-	MIME part so that if the message that this part belongs to gets
-	deleted from the the remote store, the composer will still have a
-	copy of it. Fixes bug #20308.
-
-2002-07-31  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* e-msg-composer.c (e_msg_composer_new_with_message): Parse the
-	auto-cc/bcc recipients and then later when parsing the cc/bcc
-	recipients into EDestination objects, if the address is an
-	auto-*cc address, then set auto_recipient to TRUE on that
-	EDestination. This fixes bug #28339.
-
-2002-07-29  Radek Doulik  <rodo@ximian.com>
-
-	* e-msg-composer.c (encode_signature_name): new helper function
-	(decode_signature_name): new helper function
-	(get_signature_html): use encode_signature_name
-	(set_signature_gui): use decode_signature_name
-
-2002-07-26  Radek Doulik  <rodo@ximian.com>
-
-	* e-msg-composer.c (do_exit): don't assert on default, when ESC is
-	pressed, the dialog is closed as well and we get button number -1
-	(set_signature_gui): new helper method to set signature from draft
-	message
-	(e_msg_composer_new_with_message): use set_signature_gui
-
-2002-07-26  Ettore Perazzoli  <ettore@ximian.com>
-
-	* e-msg-composer-attachment-bar.c (pixbuf_for_mime_type):
-	Special-case message/digest, multipart/digest and message/rfc822
-	and give them a nice icon.  [#9786]
-
-	* Makefile.am (INCLUDES): Add -D for EVOLUTION_ICONSDIR.
-
-2002-07-24  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* e-msg-composer-hdrs.c (create_headers): Create the Post-To
-	header.
-	(headers_set_visibility): Possibly show the Post-To header.
-	(attach_headers): Attach the Post-To header.
-	(e_msg_composer_hdrs_set_post_to): Set the text for the Post-To
-	header.
-	(e_msg_composer_hdrs_get_post_to_label): Return the label widget
-	for this header pair.
-	(e_msg_composer_hdrs_set_visible_mask): New function to set the
-	visible mask (so we can disallow certain headers to be shown).
-	(e_msg_composer_hdrs_new): Save the visible mask argument.
-	(setup_headers): To: does not always have to be visible anymore.
-	(e_msg_composer_hdrs_get_post_to): New function to get the url for
-	the Post-To folder.
-
-	* e-msg-composer.c (e_msg_composer_get_visible_flags): Set the
-	Post-To bit when it is supposed to be visible.
-	(e_msg_composer_new_post): Set the visible_mask to only allow the
-	headers needed for Posting.
-
-2002-07-25  Dan Winship  <danw@ximian.com>
-
-	* e-msg-composer.c (e_msg_composer_set_body): Fix spelling.
-
-2002-07-23  Radek Doulik  <rodo@ximian.com>
-
-	* e-msg-composer.c (autosave_run): restart automanager to avoid
-	multiple dialog apearing
-
-2002-07-23  Not Zed  <NotZed@Ximian.com>
-
-	* Applied patch below.
-
-2002-07-19  Christian Kreibich <christian@whoop.org>
-
-	* e.msg-composer.c (get_signature_html): Test for the signature
-	delimiter not only at the beginning of a signature file, but also
-	inside the signature.
-
-2002-07-23  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* e-msg-composer.c (e_msg_composer_set_view_bcc): Reverted some
-	code that got committed by accident.
-	(e_msg_composer_set_view_cc): Same.
-	(e_msg_composer_set_view_replyto): Here too.
-	(e_msg_composer_set_view_from): And here.
-
-2002-07-22  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* e-msg-composer.c: Removed a lot of extra g_return_if_fail's that
-	we don't need (if we are going to check if the pointer is a a
-	composer widget using the gtk type-check macros, then there is no
-	need to first check that it isn't NULL).
-	(get_file_content): Signatures are now supposed to be in UTF-8 and
-	not the user's locale charset, so we must first read in the
-	content, then check that it is valid UTF-8. If it isn't, then we
-	need to try to convert it to UTF-8.
-
-2002-07-22  Radek Doulik  <rodo@ximian.com>
-
-	* e-msg-composer.c: removed Insert File menu item
-
-2002-07-19  Not Zed  <NotZed@Ximian.com>
-
-	* e-msg-composer-hdrs.c (e_msg_composer_hdrs_to_message_internal):
-	This should use address_encode, since its an rfc822 address, not
-	address_format which is for display.
-
-2002-07-17  Radek Doulik  <rodo@ximian.com>
-
-	* e-msg-composer.c (save): use "saved" gtkhtml command
-	(e_msg_composer_is_dirty): use "is-saved" gtkhtml command
-
-2002-07-16  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* e-msg-composer.c (e_msg_composer_set_headers): Set the
-	from-account last so that auto-cc/bcc recipients don't get
-	overwritten when setting the cc/bcc recipient fields.
-
-2002-07-16  Peter Williams  <peterw@ximian.com>
-
-	* e-msg-composer.c (create_composer): Instead of doing this with a
-	weakref, do it by connecting to the destroy signal. The weakref was
-	not getting notified in certain conditions that I could never really
-	pin down, and this caused problems at exit.
-
-	* e-msg-composer-hdrs.c (create_headers): Reorder to create reply_to
-	before from, because create_from_optionmenu causes from_changed to
-	be called, which expects reply_to.entry to exist.
-
-2002-07-15  Radek Doulik  <rodo@ximian.com>
-
-	* e-msg-composer.c (build_message): added save_html_object_data
-	parameter, use gtkhtml command to save object data when wanted
-
-2002-07-08  Peter Williams  <peterw@ximian.com>
-
-	* Makefile.am (INCLUDES): Fix cflags for ebook header namespacing.
-
-2002-07-05  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* evolution-composer.c (init): Don't connect to the postpone
-	signal, but do connect to the save-draft signal.
-	(evolution_composer_factory_init): No longer takes a postpone_cb
-	argument, but does now take a save_draft_cb argument.
-
-	* e-msg-composer.c (menu_file_send_later_cb): Removed.
-	(class_init): Removed the POSTPONE signal.
-	(setup_ui): Don't need to swap the Send/SendLater tooltips and
-	accels anymore, since SendLater no longer exists.
-
-2002-06-26  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* e-msg-composer.c (build_message): Use the new
-	CamelMultipartEncrypted class to do our encryption work for us. We
-	also need to always get the user's userid before encrypting since
-	pgp/gpg need that.
-	(e_msg_composer_new_with_message): Handle multipart/signed and
-	multipart/encrypted parts by adding the (decrypted) content and
-	setting the composer to pgp sign/encrypt the message when the user
-	re-sends it.
-
-2002-06-25  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* e-msg-composer.c (build_message): Use
-	mail_crypto_get_pgp_cipher_context() so that the PGP/GPG decision
-	is done for us.
-
-2002-06-21  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* e-msg-composer.c (build_message): Use the new gpg cipher context
-	rather than the old pgp context.
-
-2002-06-19  Radek Doulik  <rodo@ximian.com>
-
-	* e-msg-composer.c (get_signature_html): don't convert text to
-	html twice
-
-2002-06-10  Radek Doulik  <rodo@ximian.com>
-
-	* e-msg-composer.c (signature_cb): added "Set as default" menu
-	item
-
-	* e-msg-composer-hdrs.c (e_msg_composer_hdrs_get_from_omenu): new
-	method
-	(e_msg_composer_hdrs_set_from_account): use
-	e_msg_composer_hdrs_get_from_omenu
-
-2002-06-07  Radek Doulik  <rodo@ximian.com>
-
-	* e-msg-composer.c (get_signature_html): use new script signature
-	interface
-
-2002-06-06  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* e-msg-composer-hdrs.c (e_msg_composer_hdrs_set_from_account):
-	Agh, priv->from.entry is no longer a GtkOptionMenu - it is an hbox
-	containing the GtkOptionMenu.
-
-	* e-msg-composer.c (setup_ui): Remove the customize toolbar thingy
-	since Michael said that this would fix bug #17952.
-
-	* e-msg-composer-hdrs.c (e_msg_composer_hdrs_set_from_account):
-	Clean up the logic in this. For one, we don't need to do strstr
-	using the account address (wtf??).
-
-2002-06-05  Radek Doulik  <rodo@ximian.com>
-
-	* e-msg-composer-hdrs.c (create_from_optionmenu): put option menu
-	to hbox to make space for signatures menu
-	(e_msg_composer_hdrs_get_from_hbox): new helper function
-
-	* e-msg-composer.c: moved signatures from menu to option menu next
-	to From:
-
-2002-06-03  Not Zed  <NotZed@Ximian.com>
-
-	* e-msg-composer.c (build_message): Properly handle user
-	cancellation for signing/encrypting, just dont sign but create
-	anyway.
-	(e_msg_composer_get_subject): Wrapper function to get the subject
-	from the header object.
-	(e_msg_composer_get_to):
-	(e_msg_composer_get_cc):
-	(e_msg_composer_get_bcc): Same for the destination types.
-
-2002-06-03  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* e-msg-composer.c (e_msg_composer_guess_mime_type): Allocate a
-	new FileInfo struct here rather than using and unref it when we're
-	finished with it.
-
-2002-05-30  Not Zed  <NotZed@Ximian.com>
-
-	* e-msg-composer.c (build_message): Changes for multipart/signed
-	api changes.
-
-2002-05-16  Ettore Perazzoli  <ettore@ximian.com>
-
-	* e-msg-composer.c: New local `all_composers'; keeps a list of all
-	the composer windows created.  Changed type of `parent_class' to
-	BonoboWindowClass *.
-	(do_exit): Cleaned up a bit.  Raise the composer window before
-	showing the message box dialog.
-	(exit_dialog_cb): Removed.
-	(e_msg_composer_request_close_all): New.
-	(create_composer): Add the composer to the all_composers list and
-	weakref it.
-	(msg_composer_destroy_notify): GtkDestroyNotify function for the
-	composer's weakref; remove the composer from the all_composers
-	list.
-
-2002-05-15  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* e-msg-composer-attachment.c (e_msg_composer_attachment_new):
-	Just use g_basename.
-
-2002-04-26  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* e-msg-composer.c (build_message): Check for empty-string pgp-key
-	ids and don't use them.
-
-2002-04-16  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* e-msg-composer-hdrs.c (destroy): Unref the priv->tooltips object
-	here.
-
-	* e-msg-composer-attachment-bar.c (destroy): Free the priv struct.
-
-	* e-msg-composer.c (set_editor_signature): We don't need a 'name'?
-	So don't strdup it.
-
-2002-04-12  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* e-msg-composer-hdrs.c (from_changed): Change the Reply-To header
-	contents.
-	(e_msg_composer_hdrs_set_reply_to): The Reply-To entry was an
-	EEntry, not a bonobo control so fix this to set the text using
-	e_entry_set_text.
-	(e_msg_composer_hdrs_get_reply_to): Use e_entry_get_text here for
-	the same reason.
-
-2002-04-08  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* e-msg-composer.c (set_editor_text): No need to query for the
-	persist-stream interface here, just re-use
-	composer->persist_stream_interface - this might improve the speed
-	at which a reply action brings up the composer.
-
-2002-04-09  Not Zed  <NotZed@Ximian.com>
-
-	* e-msg-composer-hdrs.c (set_recipients_from_destv): Use decode
-	rather than unformat - the e_destination was changed (long time
-	ago) to rfc2047 encode the addresses, so we should decode
-	likewise.  Should fix #16158.
-
-	* e-msg-composer.c (next_word): g_utf8_next_char never returns
-	NULL, it just skips to the next character.  So like normal string
-	code, we just check for a nul explicitly.  Fixes a bug found while
-	checking #16158.
-
-2002-04-05  Jeffrey Stedfast  <fejj@ximian.com>
-
-	Fixes bug #3980.
-
-	* e-msg-composer-hdrs.c (e_msg_composer_hdrs_set_cc): If a Cc list
-	is set to something non-empty, make sure to show the Cc widgets.
-	(e_msg_composer_hdrs_set_bcc): Same but for Bcc.
-	(e_msg_composer_hdrs_set_reply_to): And here.
-
-2002-03-28  Christopher James Lahey  <clahey@ximian.com>
-
-	* e-msg-composer-select-file.c: Switch to using EFileSelection
-	here instead of GtkFileSelection.
-
-2002-03-27  Larry Ewing  <lewing@ximian.com>
-
-	* Makefile.am: fix for the changes to GTKHTML_DATADIR that include
-	the release number.
-
-2002-03-18  Dan Winship  <danw@ximian.com>
-
-	* Evolution-Composer.idl, evolution-composer.c
-	(impl_Composer_show): "Forward as iCalendar" uses set_body, so we
-	can't make the composer un-showable after doing that. So get rid
-	of the "cannot show" exception.
-
-	* e-msg-composer.c (e_msg_composer_set_body): Prepare the composer
-	to be shown in its weird state: Put an explanatory message in the
-	body, then call disable_editor.
-	(disable_editor): Common editor-disabling code - makes the editor
-	and attachment bar insensitive and disables any menu items that
-	could be used to modify them.
-	(e_msg_composer_new_redirect): Use disable_editor here now.
-	
-2002-03-15  Radek Doulik  <rodo@ximian.com>
-
-	* e-msg-composer.c: use gtkhtml editor API version 1.1
-
-2002-03-11  Dan Winship  <danw@ximian.com>
-
-	* listener.c (impl_event): Remove the extremely verbose printf
-	here.
-
-2002-03-07  Radek Doulik  <rodo@ximian.com>
-
-	* e-msg-composer.c (destroy): ops, unregister and not register new
-	one sig_event_client
-
-2002-03-04  Dan Winship  <danw@ximian.com>
-
-	* e-msg-composer.c (build_message): Fix a dumb bug in previous
-	commit that broke iMIP containing 8-bit data.
-
-2002-02-25  Dan Winship  <danw@ximian.com>
-
-	Mailer side of 14705.
-	
-	* Evolution-Composer.idl (setBody): Change setBodyText to setBody
-	and take a MIME type as well.
-	(show): Add an exception.
-
-	* evolution-composer.c (impl_Composer_set_body, etc): Update for
-	IDL change. While I'm here, fix this to DTRT with both plaintext
-	and HTML bodies. (It claimed to take plain text before, but then
-	passed it to the composer as HTML.)
-	(impl_Composer_show): Raise an exception if setBody has been
-	called, since the composer window will not display the real data
-	in that case.
-
-	* e-msg-composer.c (e_msg_composer_set_body): interface for
-	impl_Composer_set_body.
-	(build_message): If e_msg_composer_set_body has been called, use
-	the body and MIME type supplied to it rather than the contents of
-	the HTML editor.
-
-2002-02-14  Radek Doulik  <rodo@ximian.com>
-
-	* e-msg-composer.c (delete_old_signature): don't insert paragraph
-	here, also delete paragraph where signature was
-	(e_msg_composer_show_sig_file): test if we are in empty document
-	and if so, insert new paragraph for signature
-
-2002-02-12  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* e-msg-composer.c (e_msg_composer_flush_pending_body): Use
-	set_editor_text()
-	(e_msg_composer_new_from_url): Same.
-	(e_msg_composer_set_body_text): Re-Show the signature.
-
-2002-02-12  Radek Doulik  <rodo@ximian.com>
-
-	* e-msg-composer.c (e_msg_composer_is_dirty): reflect gtkhtml API
-	change
-
-2002-02-11  Radek Doulik  <rodo@ximian.com>
-
-	* e-msg-composer.c (e_msg_composer_drop_editor_undo): new method,
-	drops undo in editor and resets dirty flag in editor
-	(do_exit): remove TRUE from condition as dirty flag in editor
-	should work now
-	(e_msg_composer_is_dirty): use new editor API for dirty flag
-
-2002-02-01  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* e-msg-composer.c (update_auto_recipients): Update the
-	auto-cc/bcc recipients in the composer header fields to match the
-	ones chosen in the account configuration.
-
-2002-01-31  Radek Doulik  <rodo@ximian.com>
-
-	* e-msg-composer.c (e_msg_composer_ignore): new method, tells
-	composer to ignore all word in str string
-	(next_word): helper function to get next word from s, saves rest
-	of s to sr
-
-2002-01-29  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* e-msg-composer.c (build_message): If we are in redirect mode,
-	use the original message and set the resent-* headers using
-	e_msg_composer_hdrs_to_redirect() and then return.
-	(destroy): Unref the redirected message if it exists.
-
-	* e-msg-composer-hdrs.c (e_msg_composer_hdrs_to_redirect): New
-	function for a composer in redirect mode.
-
-2002-01-27  Ettore Perazzoli  <ettore@ximian.com>
-
-	* Makefile.am: Use GNOME_FULL_CFLAGS.
-
-2002-01-10  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* e-msg-composer.c (get_file_content): Rewrote to use CamelStreams
-	and also convert the file contents to UTF-8 (assums the file
-	charset is the same charset that the composer is set to).
-	(menu_file_insert_file_cb): Pass the composer into
-	get_file_content().
-	(e_msg_composer_get_sig_file_content): Pass NULL as the composer
-	argument.
-
-2002-01-09  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* e-msg-composer.c (class_init): Fixed the setup of the
-	"save-draft" signal so that it would actually work.
-
-2002-01-08  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* e-msg-composer.c (is_special_header): Greatly simplified. No
-	need to have a list of headers to not accept - we can just refuse
-	all headers that are not X-* headers (other than X-Evolution
-	headers).
-
-2002-01-07  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* e-msg-composer.c (e_msg_composer_get_message_draft): Set the
-	X-Evolution-Format header to text/plain if that is the editing
-	mode we are really in. This fixes bug #11499.
-
-2002-01-04  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* e-msg-composer.c (e_msg_composer_new_from_url): A few minor
-	fixes to make it more compliant with rfc2368. Should now be fully
-	rfc compliant as far as I can tell.
-
-2002-01-03  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* e-msg-composer-attachment.c (e_msg_composer_attachment_edit):
-	Only connect to the parent's destroy/hide signals while the
-	attachment editor dialog is "alive".
-
-2001-12-21  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* e-msg-composer-select-file.c (composer_hide_cb): Only cancel the
-	selection dialog if it is currently in use, otherwise we'll get an
-	extra gtk_main_quit and the mailer will exit :-(
-
-2001-12-17  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* e-msg-composer.c (read_file_content): Don't block forever if we
-	are reading a fifo with no data.
-
-2001-12-14  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* e-msg-composer.c (class_init): Setup the SAVE_DRAFT signal.
-	(menu_file_save_draft_cb): Emit the SAVE_DRAFT signal.
-	(exit_dialog_cb): Same here.
-	(save_draft): Removed. This code is now a signal that
-	mail-callbacks will connect to.
-
-2001-12-11  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* e-msg-composer-attachment.c (e_msg_composer_attachment_edit):
-	Attach to the parent widget's destroy signal - when that gets
-	destroyed, we need to cancel the editor dialog too. Also connect
-	to our parent window's "hide" signal so that when the composer
-	gets hidden (ie, it's being sent), we also close the dialogs.
-
-	* e-msg-composer.c (init): Default composer->enable_autosave to
-	TRUE.
-
-2001-12-11  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* e-msg-composer-select-file.c (confirm): If multiple-selection is
-	enabled but nothing is slected, fall back to using the filename in
-	the entry box as the "selected" file.
-	(create_file_selection): If the composer gets hidden (ie it's
-	being "sent") then cancel the file selection dialog.
-
-2001-12-11  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* e-msg-composer-select-file.c
-	(file_selection_info_destroy_notify): If the widget is non-NULL,
-	then gtk_widget_destroy that bad boy...
-
-2001-12-10  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* e-msg-composer-attachment-bar.c (add_from_user):
-	select_file_attachments now returns a GPtrArray so handle that and
-	loop until we've added all the attachment files.
-
-	* e-msg-composer-select-file.c (confirm): Add an evil kludge to
-	get a list of filenames from the GtkFileSelection widget based on
-	the label in the history option menu item and the base filenames
-	of the selected items in the filename clist.
-	(create_file_selection): Setup the clist to allow multiple
-	selection.
-	(file_selection_info_destroy_notify): Destroy the GPtrArray
-	containing the list of xselected files.
-	(select_file_internal): Return a GPtrArray of files instead of a
-	char *.
-
-2001-12-10  Jon Trowbridge  <trow@ximian.com>
-
-	* e-msg-composer.c (get_file_content): Only execute an executable
-	sig file if a magic environment variable is set.
-
-2001-12-06  Jon Trowbridge  <trow@ximian.com>
-
-	* e-msg-composer.c (executed_file_output): Added.  Executes the
-	given file and returns its output as a string.
-	(get_file_content): Stats the file to see if it is executable.
-	If it is, execute it and return the string.  If not, just read
-	the file and return the contents.
-
-2001-11-30  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* e-msg-composer.c (setup_ui): Change the FileSend tooltip the be
-	the same as the FileSendLater tooltip if we are in offline mode.
-
-2001-11-11  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* e-msg-composer.c (drag_data_received): Allow drag & drop for
-	vcards.
-
-2001-11-30  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* e-msg-composer.c (setup_ui): Change the FileSend tooltip the be
-	the same as the FileSendLater tooltip if we are in offline mode.
-
-2001-11-14  Larry Ewing  <lewing@ximian.com>
-
-	* e-msg-composer.c (create_composer): popup failure dialog if we
-	cannot get a valid editor_engine.
-	(prepare_engine): make the checks robust and make sure that we
-	unset the engine if any part fails. 
-
-2001-11-02  Radek Doulik  <rodo@ximian.com>
-
-	* e-msg-composer.c (add_inlined_images): use hash table to
-	eliminate duplicates
-
-2001-11-02    <NotZed@Ximian.com>
-
-	* e-msg-composer.c (e_msg_composer_set_enable_autosave): New
-	function, enable/disable autosave for the composer temporarily.
-	(autosave_run_foreach_cb): Only save if we have enable autosave
-	turned on.  In other cases we want to save it regardless.
-
-2001-10-30  Dan Winship  <danw@ximian.com>
-
-	* e-msg-composer.c (build_message): Add back the "remove
-	Content-Disposition when sending itip" hack.
-
-	* Evolution-Composer.idl (setMultipartType): New.
-
-	* evolution-composer.c (impl_Composer_set_multipart_type): Allow
-	caller to specify a multipart/alternative rather than
-	multipart/mixed.
-
-	* e-msg-composer.c (build_message): Revert yesterday's changes.
-	Add new ones for sending multipart/alternative.
-
-2001-10-30  Larry Ewing  <lewing@ximian.com>
-
-	* e-msg-composer.h: add dirty prototype.
-
-	* e-msg-composer.c: add dirty implementation.
-
-2001-10-30  Radek Doulik  <rodo@ximian.com>
-
-	* listener.c (insert_paragraph_before): new helper function,
-	extracted
-	(insert_paragraph_after): ditto
-	(impl_event): process command_before and command_after, use new
-	functions
-	(clear_signature): reset style to be sure
-	(reply_indent): ditto
-
-2001-10-30  Dan Winship  <danw@ximian.com>
-
-	* e-msg-composer.c (build_message): Remove Content-Disposition in
-	the no_body case. (More kludging around Outlook iCalendar
-	brokenness.)
-
-2001-10-29  Ettore Perazzoli  <ettore@ximian.com>
-
-	* e-msg-composer.c (setup_ui): Put the charset encoding submenu in
-	the EncodingPlaceholder.
-
-2001-10-29  Dan Winship  <danw@ximian.com>
-
-	* evolution-composer.c (init): Set the (new) "no_body" flag on the
-	composer.
-	(impl_Composer_set_body_text): And unset it here.
-	(unset_no_body): And here (called if/when the composer is
-	realized).
-
-	* e-msg-composer.c (build_message): If the composer has the
-	"no_body" flag set, and a single attachment, promote that
-	attachment to be the message body.
-
-2001-10-30  Radek Doulik  <rodo@ximian.com>
-
-	* listener.c (reply_indent): simplified, requires new gtkhtml
-
-2001-10-29  Larry Ewing  <lewing@ximian.com>
-
-	* e-msg-composer.h: add GList to hold the current images.
-
-	* listener.c (resolve_image_url): keep track of the images that
-	the editor is currently uses in current_images as well as storing
-	the images in the hash.
-
-	* e-msg-composer.c (clear_current_images): clear the list of
-	images actually in the message.
-	(add_inlined_images): use the current image list rather than the
-	hash tables.
-	(build_message): clear the current image list when appropriate.
-	(init): initialize current_images.
-	
-2001-10-24  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* e-msg-composer.c (add_attachments_from_multipart): New function
-	that replaces handle_multpart() and handle_multipart_alternative()
-	for add_message_attachments().
-	(e_msg_composer_add_message_attachments): Call
-	add_attachments_from_multipart().
-	(handle_multipart_alternative): Now only used by
-	new_with_message() and is really only designed to work well with
-	messages generated by Evolution (ie for editing Drafts and such).
-	(handle_multipart): Same.
-	(e_msg_composer_new_with_message): No longer calls
-	add_message_attachments() because we can't ever have this fail and
-	the logic in add_message_attachments() is impossible
-	logic. Instead do like what we used to do before the addition of
-	add_message_attachments() came along.
-
-2001-10-24  Larry Ewing  <lewing@ximian.com>
-
-	* e-msg-composer.c
-	(e_msg_composer_add_inline_image_from_mime_part): rework this so
-	that we don't end up freeing the cid then reading from it.
-
-2001-10-22  Jon Trowbridge  <trow@ximian.com>
-
-	* e-msg-composer-hdrs.c (create_from_optionmenu): Check that
-	account->id->address != NULL.
-
-2001-10-21  Dan Winship  <danw@ximian.com>
-
-	Make inline images used for replies not show up as
-	attachments. Also, I think this should make replies to HTML
-	messages containing inline images referenced via Content-Location
-	work, but that's not tested.
-
-	* e-msg-composer.c (various): Keep two hash tables of inline image
-	data: one mapping from cid: URLs to CamelMimeParts for all
-	attachments, the other mapping from file: and Content-Location
-	urls to CamelMimeParts (for those inline images that came from a
-	file or have a Content-Location).
-	(add_inlined_images): Simplify. Most of this code is in
-	e_msg_composer_add_inline_image_from_file() now.
-	(e_msg_composer_add_message_attachments, handle_multipart): Change
-	"attach_all" arg to "just_inlines". If it is set, call
-	e_msg_composer_add_inline_image_from_mime_part on any attachment
-	with a Content-Id or Content-Location.
-	(e_msg_composer_add_inline_image_from_file): Create a mime part
-	from a file and add it to the inline images hash.
-	(e_msg_composer_add_inline_image_from_mime_part): Add a mime part
-	directly to the inline images hash.
-
-	* listener.c (resolve_image_url): If asked to resolve a file: URL
-	that isn't in the inline images hash, call
-	e_msg_composer_add_inline_image_from_file to get a cid for it.
-	(impl_event): Look up the URL in the inline_images and
-	inline_images_by_url hashes.
-
-	* e-msg-composer-attachment-bar.c
-	(e_msg_composer_attachment_bar_find_message): Gone. No longer
-	used.
-
-2001-10-19  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* e-msg-composer.c (handle_multipart): Now takes a 'attach_all'
-	argument. If !attach_all, then only attach the attachment if the
-	part has a content-id, otherwise we can safely assume that nothing
-	references it thus we don't need to attach it.
-	(e_msg_composer_add_message_attachments): Now takes a 'attach_all'
-	argument that overrides the "only attach attachments if they have
-	a content-id header" behavior.
-	(e_msg_composer_new_with_message): Pass TRUE as the attach_all
-	argument to add_message_attachments.
-
-2001-10-18  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* e-msg-composer.c (best_encoding): Don't use a
-	g_return_val_if_fail after iconv_open, this is a valid error
-	condition and so should use check it for real.
-
-	* e-msg-composer-attachment-bar.c (attach_to_multipart): Correctly
-	set the charset parameter and use camel's bestenc filter to
-	determine which content transfer encoding to use.
-
-2001-10-15  Larry Ewing  <lewing@ximian.com>
-
-	* e-msg-composer.c (e_msg_composer_add_message_attachments):
-	s/apply/flush/.
-	(e_msg_composer_flush_pending_body): renamed from apply now takes
-	apply as an argument.
-	(e_msg_composer_show_sig_file): s/g_assert/g_return_if_fail/
-	warnings make for less painful bugs than crashes.
-	(set_editor_text): s/g_assert/g_return_if_fail/
-
-2001-10-13  Dan Winship  <danw@ximian.com>
-
-	* e-msg-composer.c (autosave_manager_unregister): Don't pop up an
-	"unable to retrieve message" if the composer never finished
-	initializing.
-	(init): Don't call autosave_manager_register here: wait until the
-	end of create_composer.
-	(create_composer): Remove the distinction between this and
-	e_msg_composer_construct since there's no need for the latter. Use
-	e_activation_failure_dialog if either the selectnames component or
-	the gtkhtml editor fails.
-
-	* e-msg-composer-hdrs.c (setup_corba): Don't g_warn if the oaf
-	activation fails. create_composer() will tell the user.
-
-2001-10-11  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* listener.c (impl_event): Deleted declaration of len.
-
-	* e-msg-composer.c (e_msg_composer_add_message_attachments): Take
-	a settext argument.
-	(e_msg_composer_new_with_message): Updated to pass the settext argument.
-
-2001-10-10  Jon Trowbridge  <trow@ximian.com>
-
-	* e-msg-composer-hdrs.c (e_msg_composer_hdrs_set_from_account):
-	Check for either a matching account name, or for a matching e-mail
-	address embedded in the passed-in string. (Fixes half of bug
-	#3255)
-	(destroy): Call bonobo_object_release_unref on corba_select_names,
-	not CORBA_Object_release.  Otherwise we leak stuff all over the
-	place. (Bug #11878)
-
-	* e-msg-composer.c (e_msg_composer_new_with_message): If our message
-	doesn't contain an X-Evolution-Account header, pass in the From
-	header as the account name.  (Fixes the other half of #3255)
-
-2001-10-10  Larry Ewing  <lewing@ximian.com>
-
-	* e-msg-composer.h: add prototype.
-
-	* e-msg-composer.c (e_msg_composer_add_message_attachments): new
-	function to copy attachments from the a message to a composer.
-	(e_msg_composer_set_pending_body): make simple function to
-	abstract this.
-	(e_msg_composer_apply_pending_body): apply the pending body to
-	the composer.
-	(e_msg_composer_new_with_message): use
-	e_msg_composer_add_message_attachments to copy attachments.
-
-2001-10-09  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* e-msg-composer-attachment-bar.c (add_from_file): If the
-	attachment fails, report the error to the user.
-
-	* e-msg-composer-attachment.c (e_msg_composer_attachment_new): Now
-	takes a CamelException argument.
-
-	* e-msg-composer.c (setup_ui): Pass /menu/Edit as the menu path to
-	e_charset_picker thingy.
-
-2001-10-05  Larry Ewing  <lewing@ximian.com>
-
-	* e-msg-composer-attachment-bar.c
-	(e_msg_composer_attachment_bar_find_message): fix cut&pasteo.
-
-	* e-msg-composer-attachment.c (e_msg_composer_attachment_new):
-	remove unused variable.
-
-	* e-msg-composer-attachment-bar.c
-	(e_msg_composer_attachment_bar_find_message): generalize this to
-	lookup content locations as well.
-
-	* e-msg-composer-attachment-bar.h: change prototype to match the
-	new function.
-
-	* listener.c (impl_event): handle the url_requested event, look up
-	parts in the attachment part and feed them down the stream if it
-	is found.
-
-	* e-msg-composer.c (handle_multipart_alternative): delay setting
-	the body text.
-	(handle_multipart): delay setting body text
-	(e_msg_composer_new_with_message): set the body text from the
-	object data.  Doing this ensures that we will have the attachments
-	processed before we try to look them up.
-
-2001-10-04  Larry Ewing  <lewing@ximian.com>
-
-	* e-msg-composer-attachment-bar.c 
-	(e_msg_composer_attachment_bar_find_content_id): change to return
-	a CamelMimePart.
-
-	* e-msg-composer-attachment-bar.h: update prototype.
-	
-	* e-msg-composer-attachment-bar.c
-	(e_msg_composer_attachment_bar_find_content_id): look up an
-	attachment by it's content id.
-
-	* e-msg-composer-attachment-bar.h: add prototype for
-	e_msg_composer_attachment_bar_find_content_id.
-
-2001-10-03  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* e-msg-composer.c (autosave_save_draft): Make sure to unref the
-	message object so we don't leak it or any references to
-	attachments (child mime parts).
-
-	* e-msg-composer-attachment.c (e_msg_composer_attachment_new):
-	Unref the mime part after passing it along to new_from_mime_part.
-
-2001-10-02  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* e-msg-composer.c (save_draft): Pass an empty flags argument to
-	mail_get_folder.
-
-2001-10-02  Ettore Perazzoli  <ettore@ximian.com>
-
-	* e-msg-composer.c (setup_ui): Use
-	`bonobo_ui_component_new_default()', not
-	`bonobo_ui_component_new()'.
-
-2001-09-27  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* e-msg-composer-attachment.c (e_msg_composer_attachment_new):
-	Don't set Content-Ids on these parts since they are not contained
-	within a multipart/related - this fixes bug #10032.
-
-2001-09-26  Jon Trowbridge  <trow@ximian.com>
-
-	* e-msg-composer.c (e_msg_composer_new_from_url): Fixes glitch in
-	mailto: url parsing that caused it to fail when recipient names
-	contained commas. (Bug #10796)
-
-2001-09-20  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* e-msg-composer.c (save_draft): Update to reflect changes to
-	mail_get_folder.
-
-2001-09-20  Iain Holmes  <iain@ximian.com>
-
-	* e-msg-composer.c (get_file_content): Open the file with O_CREAT so
-	that if it doesn't exist, it's created. Never return a NULL as this
-	could potentially crash on Solaris.
-
-2001-09-18  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* e-msg-composer.c (build_message): Attach an X-Evolution-Format
-	header so if people re-edit a message in say their Sent folder, we
-	will preserve format preferences.
-	(e_msg_composer_get_message_draft): Don't attach
-	X-Evolution-Format headers here since it is now done in
-	build_message().
-	(e_msg_composer_new_with_message): Make sure to remove *all*
-	X-Evolution headers by using the mail-tools functions.
-
-2001-09-16  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* e-msg-composer-attachment-bar.c (update): Don't
-	gtk_object_destroy() the pixbuf loader, unref it instead.
-
-	* e-msg-composer-hdrs.c (destroy): Don't forget to free the
-	private structure.
-
-2001-09-14  Ettore Perazzoli  <ettore@ximian.com>
-
-	[Automake 1.5 fixes pointed out by Richard Boulton
-	<richard@tartarus.org>, as per #9258.]
-
-	* Makefile.am (CLEANFILES): Set directly with `=' instead of `+='.
-
-2001-09-13  Larry Ewing  <lewing@ximian.com>
-
-	* e-msg-composer.c (map_default_cb): free the text values we get
-	from the property bag and release the property bag properly.
-
-2001-09-12  JP Rosevear  <jpr@ximian.com>
-
-	* evolution-composer.c (corba_recipientlist_to_destv): null
-	terminate the destination vector
-
-2001-09-10  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* evolution-composer.c (init): Don't call new_with_sig_file, it no
-	longer exists.
-
-	* e-msg-composer.c (setup_ui): Make sure that the session is
-	non-NULL.
-	(menu_file_send_cb): And here too.
-	(e_msg_composer_new_with_sig_file): Removed.
-
-2001-09-10  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* e-msg-composer.c (build_message): Wrap the S/MIME code in ifdef
-	SMIME_SUPPORTED which isn't defined but by some later version will
-	be.
-	(setup_ui): And again here.
-
-2001-09-09  Maciej Stachowiak  <mjs@noisehavoc.org>
-
-	* Makefile.am: Add VFS_CFLAGS so things don't break when the
-	gnome-vfs headers move.
-
-2001-09-08  Jon Trowbridge  <trow@ximian.com>
-
-	* evolution-composer.c (corba_recipientlist_to_destv): Originally
-	was corba_recipientlist_to_glist.
-	(impl_Composer_set_headers): Use corba_recipientlist_to_destv, new
-	destination-based api.
-
-	* e-msg-composer.c (build_message): Get rid of that 'sending'
-	stuff.  That was a bad idea.
-	(e_msg_composer_new_with_message): Apply the revised api and work
-	with vectors of destinations rather than just lists.
-	(e_msg_composer_get_recipients): Added.  Returns the full set of
-	recipient destinations in a vector.
-
-	* e-msg-composer-hdrs.c: Removed free_destv function.  We use
-	e_destination_freev instead.
-	(e_msg_composer_hdrs_get_to): Changed to return a vector of
-	EDestinations.  This function now works.
-	(e_msg_composer_hdrs_get_cc): Ditto.
-	(e_msg_composer_hdrs_get_bcc): Ditto.
-	(e_msg_composer_hdrs_get_recipients): Added.  Returns a vector of
-	EDestinations that is the union of the to, cc and bcc lines.
-	(e_msg_composer_hdrs_set_to): Changed to take a vector of
-	EDestinations, rather than a GList.
-	(e_msg_composer_hdrs_set_cc): Ditto.
-	(e_msg_composer_hdrs_set_bcc): Ditto.
-	(e_msg_composer_hdrs_to_message): Use our new, improved API, rather
-	than a bunch of poking around in BonoboPropertyBags, etc.
-
-2001-09-07  Dan Winship  <danw@ximian.com>
-
-	* e-msg-composer-hdrs.c (set_recipients_from_destv): Remove some
-	debugging messages that don't check for NULL strings and crash
-	Solaris.
-
-2001-09-06  Dan Winship  <danw@ximian.com>
-
-	* e-msg-composer.c (save): Have to specify a mode when using
-	O_CREAT.
-	(handle_multipart_alternative, handle_multipart,
-	e_msg_composer_new_with_message): Update for mail_get_message_body
-	change.
-
-2001-09-05  Ettore Perazzoli  <ettore@ximian.com>
-
-	* e-msg-composer.c (autosave_manager_query_load_orphans):
-	s/Evolution/Ximian Evolution/.
-	(do_exit): Set the title to be "Warning: Modified Message".
-
-2001-08-29  Jon Trowbridge  <trow@ximian.com>
-
-	* e-msg-composer.c (e_msg_composer_get_message_draft): Pass
-	in FALSE as the 'sending' arg to e_msg_composer_get_message.
-	(build_message): Added a 'sending' arg, which is passed to
-	e_msg_composer_get_message.
-	(e_msg_composer_get_message): Added a 'sending' arg,
-	which gets passed directly on to build_message.
-
-	* e-msg-composer-hdrs.c (e_msg_composer_hdrs_to_message): Added
-	a "sending" arg, which should be TRUE if the message is being
-	sent now (rather than being autosaved, etc.).  The address
-	use scores are only updated when sending. (Bug #8332)
-	Removed obsolete (#if 0/#endif-ed) code.
-
-2001-08-22  Jon Trowbridge  <trow@ximian.com>
-
-	* e-msg-composer-hdrs.c (set_recipients_from_destv): Added.  Try
-	to properly handle contact lists in which the addresses of the
-	list members should be hidden.
-	(e_msg_composer_hdrs_to_message): Changed to extract the
-	destination data from the entries and pass it along to
-	set_recipients_from_destv.
-
-2001-08-22  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* e-msg-composer.c (save): When reporting an error, use
-	my_file_name instead of file_name since file_name can be NULL.
-
-2001-08-21  Ettore Perazzoli  <ettore@ximian.com>
-
-	* e-msg-composer.c (autosave_manager_query_load_orphans):
-	s/attempt recovery/try to recover them/.
-
-2001-08-19  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* e-msg-composer.c (save_draft): Reset the "changed" state to
-	FALSE after a successful save.
-
-2001-08-17  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* e-msg-composer.c (show_attachments): Toggle the
-	View->Attachments menu item. This fixes bug #6107.
-
-2001-07-12  Peter Williams  <peterw@ximian.com>
-
-	* e-msg-composer.c (map_default_cb): New function. Figure out
-	which widget gets the default and assign it. Harder to do than
-	it sounds.
-	(e_msg_composer_construct): Hook map_default_cb up to the "map"
-	signal.
-	(set_focus_to_editor): Removed.
-	(set_focus_to_editor_idle): Removed.
-	
-2001-08-10  Jon Trowbridge  <trow@ximian.com>
-
-	* e-msg-composer-hdrs.c (set_recipients): Removed comment about
-	the need to resolve nicknames properly, because we now do that.
-
-2001-08-09  Radek Doulik  <rodo@ximian.com>
-
-	* e-msg-composer.c (set_focus_to_editor): new helper function,
-	just setup idle callback to grab focus
-	(set_focus_to_editor_idle): grab focus for editor, before we have
-	better solution, it run grab-focus command on editor control
-	(e_msg_composer_construct): call prepare_engine here, set focus to
-	editor
-
-2001-08-10  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* e-msg-composer.c (autosave_manager_query_load_orphans): Don't
-	forget to closedir() when we finish with dir.
-
-2001-08-09  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* e-msg-composer.c (from_changed_cb): Set the smime/pgp
-	always-sign options when here so it updates when the user changes
-	his/her identity.
-
-2001-08-08  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* e-msg-composer.c (e_msg_composer_get_message_draft): Set the
-	PGP/MIME and S/MIME options to FALSE before getting the message
-	draft and restore the values afterward.
-
-2001-08-06  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* e-msg-composer.c (add_inlined_image): Use g_basename().
-	(setup_ui): Get the default charset from the mail config db.
-
-2001-08-06  Radek Doulik  <rodo@ximian.com>
-
-	* listener.c (impl_event): handle delete event
-
-2001-07-31  Peter Williams  <peterw@ximian.com>
-
-	* e-msg-composer.c (setup_ui): Set the config path for the composer so
-	that the customize toolbar command works.
-
-2001-07-31  Jason Leach  <jleach@ximian.com>
-
-	* e-msg-composer.c: Use Tuomas' and Jakub's new (and beautiful)
-	icons for Send and Send Later in the toolbar and menus.
-
-2001-07-30  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* e-msg-composer.c (message_rfc822_dnd): Properly add the
-	message/rfc822 part.
-
-2001-07-27  Jason Leach  <jleach@ximian.com>
-
-	* e-msg-composer.c (get_signature_html): "-- \n" is 4 chars long,
-	so when checking if it's already in the sig, strncmp should check
-	4 chars, not 3.
-
-2001-07-26  Peter Williams  <peterw@ximian.com>
-
-	* e-msg-composer.c (get_signature_html): Correct our manually inserted
-	signature dash thingie (it was missing the space).
-
-2001-07-26  Jon Trowbridge  <trow@ximian.com>
-
-	* e-msg-composer-hdrs.c (set_recipients): Get "destinations",
-	rather than "text" from the entry_widget.  (The getters/setters in
-	the control have been made more symmetric.)
-
-2001-07-18  Jason Leach  <jleach@ximian.com>
-
-	* e-msg-composer-hdrs.c (create_from_optionmenu): Update to the
-	new way of finding the default account.
-
-2001-07-18  Iain Holmes  <iain@ximian.com>
-
-	* e-msg-composer.c (do_exit): Use a messagebox.
-
-2001-07-17  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* e-msg-composer.c (drag_data_received): Correctly handle
-	text/uri-list's that contain more than a single file reference.
-
-2001-07-12  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* e-msg-composer.c (menu_changed_charset_cb): Removed a warning
-	that I don't need anymore. This code is working wonderfully ;-)
-
-2001-07-10  Kjartan Maraas  <kmaraas@gnome.org>
-
-	* e-msg-composer.c: Fix typo. s/sesiion/session/
-	
-2001-07-09  Larry Ewing  <lewing@ximian.com>
-
-	* e-msg-composer.c (autosave_manager_query_load_orphans): Only ask
-	once about recovery, assume if they want to recover one file they
-	want to recover all of them.
-
-2001-07-09  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* e-msg-composer.c (e_msg_composer_new_with_message): Use
-	camel_internet_address_format_address rather than
-	camel_address_encode since we want display-friendly addresses.
-
-2001-07-09  Iain Holmes  <iain@ximian.com>
-
-	* e-msg-composer-select-file.c (file_selection_info_destroy_notify):
-	Unref the file selection dialog when the data is destroyed.
-
-2001-07-09  Dan Winship  <danw@ximian.com>
-
-	* e-msg-composer.c (composer_shutdown): Do the
-	autosave_manager_unregister at shutdown time instead of destroy
-	time (by which point the contents of the window, including the
-	remote editor control, will have already been destroyed).
-
-2001-07-09  Zbigniew Chyla  <cyba@gnome.pl>
-
-	* e-msg-composer-select-file.c: Added missing #include <config.h> to
-	make translations working.
-
-2001-07-07  Jon Trowbridge  <trow@ximian.com>
-
-	* e-msg-composer-hdrs.c (set_recipients): Make sure that our
-	destination string (dest_str) is not the empty string before we
-	try to use it.
-
-2001-07-06  Larry Ewing  <lewing@ximian.com>
-
-	* e-msg-composer.c (autosave_manager_new): add missing static.
-	(best_encoding): make sure we don't try to call iconv_open with a
-	NULL tocode.
-	(autosave_manager_query_load_orphans): remove zero length orphans
-	so that they don't clutter things up.
-
-2001-07-06  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* e-msg-composer-attachment.c (e_msg_composer_attachment_new):
-	Convert the filename string to UTF8 before setting it on the
-	CamelMimePart because that code expects it to be in UTF8.
-
-2001-07-06  Larry Ewing  <lewing@ximian.com>
-
-	* e-msg-composer.c (autosave_manager_query_load_orphans): only ask
-	if there are actually contents in the file.  Asking about an
-	emptry fil is not very useful.
-	(autosave_load_draft): add some sanity chacks.
-	(autosave_run_foreach_cb): remove debugging warning.
-	(autosave_manager_new): add a missing static.
-
-2001-07-06  Larry Ewing  <lewing@ximian.com>
-
-	* e-msg-composer.c (autosave_manager_unregister): make sure we
-	only remove the file if we think we saved it properly.
-	(autosave_manager_stop): make sure we set the timeout back to 0 so
-	that we will restart next time since we stop the timer when there
-	are no active composers.
-	(destroy): move this to the beginning of the destroy process.
-	(autosave_save_draft): add a return value indicating success.
-	(autosave_manager_register): go ahead and ask next time.
-
-2001-07-05  Larry Ewing  <lewing@ximian.com>
-
-	* e-msg-composer.c: add ask argment.
-	(autosave_manager_query_load_orphans): move the load loop out of
-	the dir reading loop.
-	(autosave_manager_new): move initialization out or register.
-	(autosave_manager_register): protect against recursion with ask.
-	(init): call new, this still needs to be moved.
-
-2001-07-05  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* e-msg-composer.c (save): Play the "File exists, overwrite?"
-	game.
-	(autosave_run_foreach_cb): Change the return val from a gboolean
-	to void.
-
-2001-07-04  Larry Ewing  <lewing@ximian.com>
-
-	* e-msg-composer.c (autosave_load_draft): attach send and postpone
-	handlers. and be more tolerant of errors.
-
-2001-07-03  Larry Ewing  <lewing@ximian.com>
-
-	* e-msg-composer.c (autosave_save_draft): make sure we seek to the
-	begining.
-
-	* e-msg-composer.h: remove the timer id.
-
-	* e-msg-composer.c: use autosave manager.
-	(autosave_save_draft): moved initialization to
-	autosave_init_file. Only save the buffer if we get a valid
-	message.
-	(autosave_load_draft): unlink the old file, we own it now. and
-	unref the stream when we are done with it.
-	(autosave_is_owned): check if we own the file, this needs to be
-	extended to check for other valid processes.
-	(autosave_query_load_orphans): make this search through the
-	managers list as it walks the dir.
-	(autosave_query_load_orphans): make sure we use the full path.
-	(autosave_run_foreach_cb): timeout foreach handler.
-	(autosave_run): the timeout function.
-	(autosave_start): start timer.
-	(autosave_stop): stop timer.
-	(autosave_register): register a composer with the autosave manager.
-	(autosave_unregister): unregister a composer.
-	(destroy): unregister the composer, everything is okay.
-	(init): register the composer.
-
-2001-07-02  Larry Ewing  <lewing@ximian.com>
-
-	* e-msg-composer.h: add autosave members.
-	
-	* e-msg-composer.c (autosave_query_load_orphans): query the user to
-	check if they want to load any orphans we've found.
-	(autosave_query_cb): the dialog callback.
-	(autosave_is_orphan): test if if a particular file is orphaned.
-	(autosave_load_draft): load a message from an autosave file.
-	(autosave_save_draft): save the current buffer to the autosave file.
-
-2001-07-02  Christopher James Lahey  <clahey@ximian.com>
-
-	* Makefile.am (INCLUDES): Added $(BONOBO_CONF_CFLAGS).
-
-2001-07-02  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* e-msg-composer-attachment-bar.c (attach_to_multipart): Set the
-	user-chosen charset.
-
-	* e-msg-composer.c (menu_change_charset_cb): New callback function
-	to get the user-set charset.
-	(init): Set the charset to NULL.
-	(best_charset): Take a default_charset param that holds the value
-	the user set for this particular message using the menu.
-	(destroy): Free the charset.
-
-2001-07-02  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* e-msg-composer.c (setup_ui): Construct an e-charset-picker
-	bonobo-ui menu.
-	(menu_change_charset_cb): 
-
-2001-06-30  Jon Trowbridge  <trow@ximian.com>
-
-	* e-msg-composer-hdrs.c (set_recipients): Touch all of our
-	EDestinations before we unref them, updating the last-use records
-	in the addressbook.
-
-2001-06-29  Larry Ewing  <lewing@ximian.com>
-
-	* e-msg-composer.c (e_msg_composer_show_sig_file): remove now
-	invalid argument in the documentation.
-
-2001-06-28  Radek Doulik  <rodo@ximian.com>
-
-	* e-msg-composer.c: removed obsolete e_msg_composer_get_sig_file
-
-	* e-msg-composer.h: removed sig_file field from EMsgComposer
-
-	* e-msg-composer.c (e_msg_composer_get_sig_file_content): exported
-	(get_file_content): make it const safe
-	(e_msg_composer_get_sig_file_content): refactored, don't try to be
-	clever about signature filename, as it's exact now
-	(get_signature_html): use has_html_signature flag
-	(e_msg_composer_show_sig_file): renamed from
-	e_msg_composer_set_sig_file, removed sig_file parameter as it's
-	obsolete now
-	(e_msg_composer_new_with_sig_file): removed obsolete parameters
-
-2001-06-27  Larry Ewing  <lewing@ximian.com>
-
-	* e-msg-composer.c (menu_file_insert_file_cb): make hook this up.
-	(get_sig_file_content): use get_file_content.
-	(get_file_content): make this usable for both insertion and
-	signatures.
-	(read_file_content): added helper function to read file.
-
-2001-06-27  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* e-msg-composer.c: Added a pixcache array for special pixmaps to
-	use in the composer.
-	(setup_ui): Set the pixcache.
-
-2001-06-21  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* e-msg-composer.c (menu_file_send_cb): Emit the POSTPONE signal
-	if we are offline.
-	(setup_ui): If we are offline, change the Control+Enter accel to
-	be on the SendLater menu item.
-
-2001-06-20  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* e-msg-composer.c (save_draft): Save the formatting preference
-	for this message draft using a X-Evolution-Format header.
-	(e_msg_composer_new_with_message): Restore the format editing
-	preference and also remove any other X-Evolution-* headers that we
-	may have set.
-
-2001-06-20  Dave Camp  <dave@ximian.com>
-
-	* Evolution-Composer.idl: Changed attachData to accept a sequence of
-	chars rather than a string.
-
-	* evolution-composer.c (impl_Composer_attach_data): Changed the 'data'
-	argument to a GNOME_Evolution_Composer_AttachmentData, and pass
-	data->_buffer and data->_length to camel_mime_part_set_content().
-
-2001-06-19  JP Rosevear  <jpr@ximian.com>
-
-	* evolution-composer.c (impl_Composer_send): send the message
-
-	* Evolution-Composer.idl: add a "send" method to send a message
-	without showing the editor
-
-2001-06-19  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* e-msg-composer.c (e_msg_composer_construct): Don't define the
-	drop_types here.
-	(drag_data_received): Implement message/rfc822 dnd drop type
-	handling.
-
-2001-06-12  Dan Winship  <danw@ximian.com>
-
-	* e-msg-composer-attachment.glade: Replace the disposition option
-	menu with a checkbox.
-
-	* e-msg-composer-select-file.c
-	(e_msg_composer_select_file_attachment): New function to select a
-	file to attach. Adds a "suggest inline disposition" checkbox.
-
-	* e-msg-composer-attachment.c (e_msg_composer_attachment_new): Add
-	a disposition argument rather than always defaulting to
-	"attachment".
-	(struct _DialogData, ok_cb, e_msg_composer_attachment_edit):
-	Update for optionmenu->checkbox change for disposition.
-
-	* e-msg-composer-attachment-bar.c (add_from_file): Add a
-	disposition argument.
-	(add_from_user): Use e_msg_composer_select_file_attachment, pass
-	chosen disposition to add_from_file.
-	(e_msg_composer_attachment_bar_attach): Pass "attachment" to
-	add_from_file for the disposition.
-
-2001-06-11  Dan Winship  <danw@ximian.com>
-
-	* e-msg-composer.c (best_charset): Fix again... don't leave
-	*encoding uninitialized in the US-ASCII case.
-
-2001-06-11  Jon Trowbridge  <trow@ximian.com>
-
-	* e-msg-composer.c (e_msg_composer_construct): Rearranged
-	gtk_widget_show()s a bit to fix Bug#3204.  The composer is now
-	(like the rest of Evo) properly network transparent.
-
-2001-06-08  Jon Trowbridge  <trow@ximian.com>
-
-	* e-msg-composer.c (save_draft): When saving a draft, attach
-	information about the From: identity via X-Evolution-Account.
-	This lets us select the correct identity when we edit it later.
-	(e_msg_composer_new_with_message): If the message we are editting
-	is tagged with an account (via X-Evolution-Account), make sure
-	that the composer chooses that account's identity by default.
-
-2001-06-08  Dan Winship  <danw@ximian.com>
-
-	* e-msg-composer.c (best_charset): Don't use the default charset
-	if the message is US-ASCII.
-
-2001-06-07  Radek Doulik  <rodo@ximian.com>
-
-	* e-msg-composer.c (e_msg_composer_new_with_sig_file): just set
-	sig_file field, but don't actualy insert signature, it will be
-	done by format menu item callback
-	(e_msg_composer_set_body_text): don't set signature here
-
-2001-06-01  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* e-msg-composer.c (build_message): If user is trying to sign
-	his/her message, try first to use the key that they might have
-	provided in their account settings. If that was never set, default
-	to their email address. Also respect their config option to
-	encrypt-to-self.
-
-2001-05-31  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* e-msg-composer.c (build_message): Oops. Fix a few compile problems.
-
-2001-05-31  Christopher James Lahey  <clahey@ximian.com>
-
-	* Makefile.am (HTML_EDITOR_GENERATED): Use GTKHTML_DATADIR here.
-
-2001-05-31  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* e-msg-composer.c (build_message): Fixed up the S/MIME
-	signing/encrypting code to work with the new API.
-
-2001-05-31  Dan Winship  <danw@ximian.com>
-
-	* e-msg-composer.c (best_encoding): Add a missing iconv_close
-
-2001-05-30  Dan Winship  <danw@ximian.com>
-
-	* e-msg-composer.c (build_message): Use the config-specified
-	default character set (which in turn defaults to the locale
-	character set) as the default for encoding non-US-ASCII messages,
-	assuming it works. Fall back to camel_charset_best() if it fails.
-	Also, pick the Content-Transfer-Encoding based on how the data
-	looks in the destination charset, not in UTF8.
-
-	While I was here, I also refactored a bunch and tried to reduce
-	redundant code. There are still too many places that set the
-	transfer-encoding on the plaintext part though... Also, I think
-	some more cleanliness could happen if the sign/encrypt interfaces
-	returned CamelMultiparts instead of CamelMimeParts.
-
-2001-05-28  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* e-msg-composer-attachment-bar.c (update): Use
-	e_utf8_to_gtk_string() on the description of the attachment since
-	camel stores these as utf-8 strings.
-
-2001-05-28  Jason Leach  <jleach@ximian.com>
-
-	* Makefile.am (INCLUDES): srcdir != builddir fix.
-
-2001-05-24  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* e-msg-composer.c (e_msg_composer_new_with_message): Populate the
-	extra_hdr_* arrays with any non-special-case headers.
-	(is_special_header): New convenience function to determine if a
-	header is a "special" header or not.
-
-2001-05-24  Radek Doulik  <rodo@ximian.com>
-
-	* e-msg-composer.c (menu_edit_delete_all_cb): new callback
-	(menu_edit_delete_all_cb): set orig to 0 too
-	(menu_edit_delete_all_cb): be more careful about text color and
-	style
-
-2001-05-23  Radek Doulik  <rodo@ximian.com>
-
-	* e-msg-composer.c (e_msg_composer_set_sig_file): set orig to 0
-
-2001-05-18  Jon Trowbridge  <trow@ximian.com>
-
-	* e-msg-composer-hdrs.c (set_recipients): Properly unserialize the
-	string returned by the "text" property of the bonobo control,
-	convert it into EDestinations, and use them to get the e-mail
-	addresses of our recipients.
-
-2001-05-17  Dan Winship  <danw@ximian.com>
-
-	* e-msg-composer.c (save_draft): Draft messages should be marked
-	read.
-
-2001-05-16  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* e-msg-composer.c (build_message): Added S/MIME sign/encrypt code.
-	(init): Initalize smime_sign/encrypt.
-	(e_msg_composer_get_smime_encrypt): new
-	(e_msg_composer_set_smime_encrypt): new
-	(e_msg_composer_get_smime_sign): new
-	(e_msg_composer_set_smime_sign): new
-	(menu_security_smime_sign_cb): new
-	(menu_security_smime_encrypt_cb): new
-	(setup_ui): Setup the UI for S/MIME stuff.
-
-2001-05-10  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* e-msg-composer.c (build_message): If we are creating a message
-	with only a single part (ie no attachments and we will not be
-	signing/encrypting the part) then `part = CAMEL_MIME_PART(message)` 
-	otherwise create a new MIME part and set it's content-object as the 
-	message's content-object at a later date.
-
-2001-05-09  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* e-msg-composer.c (add_inlined_image): Don't wrap content-id with
-	brackets here as it is now done internally in camel.
-
-2001-05-03  Radek Doulik  <rodo@ximian.com>
-
-	* e-msg-composer.c (get_signature_html): put signature in 100%
-	width table
-	(delete_old_signature): look only for first flow with signature == 1
-	(e_msg_composer_new): don't insert <BR>
-	(e_msg_composer_new_with_sig_file): ditto
-	(delete_old_signature): don't delete whole signature paragraph,
-	but just it's content
-	(delete_old_signature): if signature isn't found, insert new empty
-	paragraph to end of document for new signature
-	(e_msg_composer_set_sig_file): delete signature always
-	(e_msg_composer_set_sig_file): don't place signature to the end of
-	document, but place it where previous one was (if there wasn't
-	then new one is appended to the document)
-
-2001-05-02  Radek Doulik  <rodo@ximian.com>
-
-	* listener.c (impl_event): do automagic indenting only when
-	in_signature_insert is FALSE
-
-	* e-msg-composer.c (e_msg_composer_set_sig_file): do indent-zero
-	before signature inserting
-	(e_msg_composer_set_sig_file): use in_signature_insert flag
-
-2001-05-01  Radek Doulik  <rodo@ximian.com>
-
-	* listener.c (impl_event): set signature to 0 in newly created
-	empty paragraphs
-	(clear_signature): new helper function
-
-2001-04-26  Dan Winship  <danw@ximian.com>
-
-	* Makefile.am (INCLUDES): Remove UNICODE_CFLAGS
-
-2001-04-25  Radek Doulik  <rodo@ximian.com>
-
-	* e-msg-composer.c (e_msg_composer_set_send_html): block/unblock
-	redraw
-
-	* listener.c (impl_event): reflect object data type change
-
-	* e-msg-composer.c (get_sig_file_content): renamed from
-	get_signature
-	(get_signature_html): new helper function, uses
-	get_sig_file_content
-	(set_editor_text): removed signature parameters
-	(from_changed_cb): new signal handler, sets signature by identity
-	change
-	(delete_old_signature): new function, deletes old signature from
-	the document
-	(e_msg_composer_set_sig_file): new method, set's signature
-	filename
-	(e_msg_composer_mark_text_orig): removed (obsolete)
-
-	* e-msg-composer-hdrs.c: added signal FROM_CHANGED
-
-2001-04-21  Duncan Mak  <duncan@ximian.com>
-
-	* e-msg-composer.c (e_msg_composer_construct): Set window_icon to
-	"compose-message.png" for the composer window.
-
-	Did #include <libgnomeui/gnome-window-icon.h> so we could use
-	gnome_window_icon_set_from_file() here.
-
-2001-04-17  Radek Doulik  <rodo@ximian.com>
-
-	* listener.c (reply_indent): more auto-indentation magic
-
-2001-04-12  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* e-msg-composer.c (build_message): Use the mail-crypto pgp-mime
-	wrappers.
-	(build_message): s/CAMEL_PGP_HASH_TYPE_SHA1/CAMEL_CIPHER_HASH_SHA1
-
-2001-04-11  Dan Winship  <danw@ximian.com>
-
-	* e-msg-composer-select-file.c (create_file_selection): Fix
-	previous.
-
-2001-04-11  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* e-msg-composer-select-file.c (create_file_selection): Set the
-	default filename to the user's homedir.
-
-2001-04-04  Kjartan Maraas  <kmaraas@gnome.org>
-
-	* e-msg-composer-attachment.c: Fix headers.
-	* e-msg-composer-hdrs.c: Same here.
-	
-2001-03-29  Kjartan Maraas  <kmaraas@gnome.org>
-
-	* e-icon-list.c: Replace #include <gtk/gtk.h>
-	* e-msg-composer-attachment-bar.c: Replace #include <gnome.h>
-	* e-msg-composer-attachment-bar.h: Remove #include <gnome.h>
-	* e-msg-composer-attachment.c: Remove #include <gnome.h>
-	* e-msg-composer-attachment.h: Same here.
-	* e-msg-composer-hdrs.c: Replace #include <gnome.h> and <bonobo.h>
-	* e-msg-composer-hdrs.h: Replace #include <gnome.h>
-	* e-msg-composer-file.c: #include <gtk/gtkmain.h>, <gtk/gtksignal.h>
-	* e-msg-composer.c: Replace #include <bonobo.h>, <gnome.h>
-	* e-msg-composer.h: Replace #include <gnome.h> and <bonobo.h>
-	* evolution-composer.c: Replace #include <bonobo.h>
-	* listener.c: Same here.
-	
-2001-03-28  Dan Winship  <danw@ximian.com>
-
-	* e-msg-composer.c (save_draft): Use the drafts folder specified
-	by the account, if possible. Also, fix the setting of "send_html"
-	after saving the draft in case the user plans to keep editting...
-
-2001-03-27  Larry Ewing  <lewing@ximian.com>
-
-	* e-msg-composer.c (e_msg_composer_set_send_html): set the
-	FormatHTML property on the editor to let it know the mode.
-	(e_msg_composer_construct): set the property at construct time.
-
-2001-03-26  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* e-msg-composer-attachment.c (e_msg_composer_attachment_new): Set
-	the mime part content-id.
-
-2001-03-19  Radek Doulik  <rodo@ximian.com>
-
-	* listener.c (reply_indent): set default text color
-
-2001-03-17  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* e-msg-composer-hdrs.c (e_msg_composer_hdrs_get_reply_to): Make
-	sure the reply_to text is non-NULL before trying to pass it off to
-	the address parser.
-
-2001-03-13  Dan Winship  <danw@ximian.com>
-
-	* e-msg-composer-attachment.c (update_mime_type): Use
-	gnome_vfs_mime_type_from_name rather than gnome_vfs_mime_info,
-	since the entered filename doesn't have to be a real file on disk.
-	Deal with it returning NULL too.	
-	(e_msg_composer_attachment_edit): Select the right item in the
-	inline/attachment menu.
-
-	* e-msg-composer-hdrs.c: s/Pair/EMsgComposerHdrPair/. Namespace!
-
-2001-03-12  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* e-msg-composer.h: Added view_replyto member.
-
-	* e-msg-composer.c (e_msg_composer_get_visible_flags): Find out if
-	we want to view the Reply-To header.
-	(e_msg_composer_set_view_replyto): A new function to set the state
-	of the replyto header.
-	(menu_view_replyto_cb): Callback for setting the ReplyTo state.
-	(set_config): Make static.
-	(setup_ui): Setup the ReplyTo bonobo stuff.
-	(load_from_property_bag): More defaults for the ReplyTo, yay.
-	(load_from_gnome_config): Again...
-	(e_msg_composer_get_view_bcc): Implemented.
-	(e_msg_composer_get_view_cc): Implemented.
-	(e_msg_composer_get_view_from): Implemented.
-	(e_msg_composer_get_view_replyto): Implemented.
-
-	* e-msg-composer-hdrs.c (e_msg_composer_hdrs_get_reply_to_entry):
-	New function, yay.
-	(e_msg_composer_hdrs_get_reply_to): Another new function.
-	(e_msg_composer_hdrs_set_reply_to): Yet another new function...
-	(create_headers): Create the reply-to header.
-	(attach_headers): Attach the reply_to.
-	(headers_set_visibility): Set the reply_to visibility.
-	(e_msg_composer_hdrs_to_message): Set the message's reply-to here
-	based on the user-set reply-to header.
-
-2001-03-06  Miguel de Icaza  <miguel@ximian.com>
-
-	* e-msg-composer.c (set_config): New function.  Used to store
-	integer values into the configuration engine.  Handles the case of
-	Bonobo-conf being installed, or falls back to gnome_config.
-
-	* e-msg-composer-hdrs.c (add_header): Renamed to be
-	header_new_recipient().  Now we take care of the other cases in
-	create_headers, which is a lot nicer now.
-	
-	(create_optionmenu): Removed extra "name" argument which was not
-	being used anyways (the only arg passed was From:).
-	(init): Removed all the redundant NULL initialization by using
-	nice g_new0
-	
-	(create_headers): New function, much cleaner. 
-
-	Use of Pair structure everywhere instead of individual widgets to
-	keep track of which ones are visible and which ones are not.
-	
-	* e-msg-composer.c (setup_ui): Handle ViewFrom and ViewBCC
-	commands. 
-	(menu_view_bcc_cb, menu_view_from_cb): New functions that
-	implement the features described.
-
-	(menu_format_html_cb): Removed unrequired test, as
-	e_msg_composer_set_send_html already optimizes the case of the
-	state being the same.
-	(menu_security_pgp_encrypt_cb): Remove redundant code.
-	(menu_security_pgp_sign_cb): ditto.
-
-2001-03-02  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* e-icon-list.c (icon_new_from_pixbuf): Added a comment reminding
-	us that we should probably not force a particular font in the icon
-	caption.
-
-2001-02-27  Dan Winship  <danw@ximian.com>
-
-	* evolution-composer.c (factory_fn): If
-	!mail_config_is_configured(), give an error and return NULL.
-
-2001-02-22  Ettore Perazzoli  <ettore@ximian.com>
-
-	* Makefile.am (INCLUDES): Add `-I$(top_srcdir)/shell'.
-
-2001-02-21  Not Zed  <NotZed@Ximian.com>
-
-	* e-msg-composer.c (menu_file_save_draft_cb):
-	(exit_dialog_cb):  Use mail_append_mail to save to drafts instead
-	of custom thread handler.
-
-2001-02-19  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* e-msg-composer.c (build_message): Handle exceptions a little
-	nicer and pop up a nice GnomeDialog with the error message - also,
-	don't return a CamelMimeMessage if it fails to sign/decrypt
-	because we want to let the user decide what to do based on the
-	error message he/she gets.
-
-2001-02-15  Dan Winship  <danw@ximian.com>
-
-	* e-msg-composer-hdrs.c (e_msg_composer_hdrs_set_from_account): If
-	@account_name is NULL, pick the default account rather than giving
-	a g_warning.
-
-	* e-msg-composer.c (e_msg_composer_set_headers): Note in the
-	doc comment that @from can be NULL if you want the default account
-	(since there is code that expects this).
-
-2001-02-13  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* evolution-composer.c (corba_recipientlist_to_glist): Use the
-	camel-internet-address code to format the address rather than
-	doing it the broken way.
-
-2001-02-10  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* evolution-composer.c (impl_Composer_set_headers): Updated. We
-	might want to change the corba interface for this to allow setting
-	the from-address as well.
-
-	* e-msg-composer.c (e_msg_composer_new_with_message): Updated.
-	(e_msg_composer_set_headers): Now takes a 'From' argument so that
-	we can try to pre-determine the account the user will want to send
-	from.
-
-2001-02-11  Gediminas Paulauskas <menesis@delfi.lt>
-
-	* e-msg-composer-attachment.glade.h: removed.
-	* e-msg-composer-attachment.glade: do not write strings to above.
-	* Makefile.am: don't include glade.h in EXTRA_DIST.
-	
-2001-02-10  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* e-msg-composer-attachment-bar.c (attach_to_multipart):
-	multipart/* is another mime type we DO NOT want to encode ;-)
-
-2001-02-06  Christopher James Lahey  <clahey@ximian.com>
-
-	* e-msg-composer-hdrs.c (address_button_clicked_cb, add_header):
-	Set the default argument to
-	GNOME_Evolution_Addressbook_SelectNames_activateDialog correctly.
-
-2001-01-30  Larry Ewing  <lewing@ximian.com>
-
-	* e-msg-composer-hdrs.c (create_optionmenu): make sure we convert
-	from utf-8 before creating the option menu items.
-
-2001-01-25  Jason Leach  <jasonleach@usa.net>
-
-        (Moving the flag for has_changed from the Hdrs to the Composer
-	 itself. Providing public methods to set/unset a composer as
-	 changed. Adding attachments now flags the composer as changed)
-	
-	* e-msg-composer.c (e_msg_composer_unset_changed): New function.
-	(e_msg_composer_set_changed): New function.
-
-	* e-msg-composer.c (hdrs_changed_cb): Callback to the new signal,
-	uses the new composer_set_changed.
-	(attachment_bar_changed_cb): Add a call to the new
-	composer_set_changed.
-	
-	* e-msg-composer-hdrs.c (class_init): New signal "hdrs_changed" to
-	tell the parent composer that any of the headers have changed.
-	(addressbook_entry_changed): emit the new signal here.
-	(entry_changed): And here.
-
-2001-01-24  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* e-msg-composer.c (menu_security_pgp_encrypt_cb): New callback.
-	(menu_security_pgp_sign_cb): Another new callback.
-	(setup_ui): Added initialization for the PGP sign and encrypt
-	bonobo menu items.
-	(e_msg_composer_set_pgp_encrypt): Change the Bonobo UI name to
-	SecurityPGPEncrypt.
-	(e_msg_composer_set_pgp_sign): Change the Bonobo UI name to
-	SecurityPGPSign.
-
-2001-01-21  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* e-msg-composer.c (build_message): Fixed some memory leaks
-	dealing with content-type temp strings. Also implemented code to
-	sign and/or encrypt the message if the user has specified that it
-	should.
-
-2001-01-20  Jason Leach  <jasonleach@usa.net>
-
-	(Fix #1222: doing File->New->Mail Message doesn't include .sig)
-	
-	* evolution-composer.c (init): Get the users account information,
-	see if they've specified a sig file, if they do, create a composer
-	with that sig.
-
-2001-01-19  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* e-msg-composer-hdrs.c (create_optionmenu): Use "Full Name
-	<address>" for the label in the menu rather than the account
-	name. Specify the account name only if it's not the same as the
-	address.
-
-2001-01-19  Jason Leach  <jasonleach@usa.net>
-
-	* e-msg-composer-hdrs.c (create_addressbook_entry): Listen for
-	property bag changes to "entry_changed" on here, which means on
-	the To, Cc, and Bcc entries.
-	(addressbook_entry_changed): New function that gets called when
-	"entry_changed" property is changed (to TRUE).
-
-2001-01-18  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* e-msg-composer.c (build_message): Updated to reflect changes to
-	e_msg_composer_hdrs_get_from().
-
-	* e-msg-composer-hdrs.c (set_recipients): Don't do anymore utf8
-	conversions, the widget already does this (or should unless there
-	is brokenness).
-	(e_msg_composer_hdrs_get_from): Return a CamelInternetAddress like
-	we should.
-	(e_msg_composer_hdrs_to_message): Update to reflect changes made
-	the the above function.
-
-2001-01-12  Miguel de Icaza  <miguel@gnu.org>
-
-	* Makefile.am: Make the composer a standard library, not a libtool
-	one.  Nobody ever uses it as a shared library and it is not
-	installed. 
-
-2001-01-17  Jason Leach  <jasonleach@usa.net>
-
-	(Bug #1192: Set the Composer window title to something useful)
-	
-	* e-msg-composer.c (e_msg_composer_construct): Connect up the new
-	signal here.
-	(subject_changed_cb): Set the composer window title to the subject
-	as it's changed, or if it goes blank make it the default "Compose
-	a message".
-
-	* e-msg-composer-hdrs.c (class_init): Create a new signal
-	"subject_changed".
-	(entry_changed): Emit the signal here when the subject entry is
-	changed.
-	
-2001-01-17  Iain Holmes  <iain@ximian.com>
-
-	* e-msg-composer-attachment.c (e_msg_composer_attachment_edit):
-	Get the option menu from the XML file.
-	(ok_cb): Set the attachment disposition depending on the option
-	menu results.
-	(option_menu_get_history): Really should have been in GTK at some
-	point.
-
-	* e-msg-composer-attachment.glade: Add the option menu.
-
-2001-01-17  Michael Meeks  <michael@helixcode.com>
-
-	* evolution-composer.c (enum_objects): comment out for now
-	to ease compat issues.
-	(evolution_composer_construct): pass in NULL for the item
-	handler enum_objects fn + calm warning.
-
-2001-01-17  JP Rosevear  <jpr@ximian.com>
-
-	* e-msg-composer.c (e_msg_composer_new_with_message): Use the 
-	to/cc/bcc addresses insted of just the to.
-
-2001-01-17  Federico Mena Quintero  <federico@ximian.com>
-
-	* e-icon-list.[ch]: Ximianified email addresses.
-
-2001-01-16  Radek Doulik  <rodo@helixcode.com>
-
-	* e-msg-composer.c (e_msg_composer_mark_text_orig): publicate
-	mark_orig_text
-	(set_editor_text): don't call mark_orig_text, let it for reply
-
-2001-01-15  Jason Leach  <jasonleach@usa.net>
-
-	(Plug leaking the subject string on each message sent)
-	
-	* e-msg-composer-hdrs.c (e_msg_composer_hdrs_get_subject): Don't
-	strdup before returning the subject, it's already been strdup'd
-	from the gtk_object_get().
-
-2001-01-13  Jason Leach  <jasonleach@usa.net>
-
-	(Fix Bug #1083: Composer IDLs not getting installed)
-	
-	* Makefile.am: add @idl and @idl_DATA vars.
-
-2001-01-12  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* e-msg-composer-hdrs.c (create_optionmenu): Oops. Make sure to
-	attach the item to the menu ;-)
-
-2001-01-12  Jeffrey Stedfast  <fejj@helixcode.com>
-
-	* e-msg-composer.c (build_message): Call set_from_account which
-	means we no longer have to do all the crap involved in formatting
-	strings into an internet-address.
-	(e_msg_composer_get_preferred_account): New access function.
-
-	* e-msg-composer-hdrs.c (add_header): case COMBOBOX has changed to
-	OPTIOMENU.
-	(create_optionmenu): Update to use an optionmenu of accounts.
-	(from_changed): New callback for the From optionmenu.
-	(setup_headers): s/COMBOBOX/OPTIONMENU
-	(init): Set the account and from_options to NULL.
-	(e_msg_composer_hdrs_get_from): Updated.
-	(destroy): free the from_options.
-	(e_msg_composer_hdrs_set_from_address): Renamed from set_from
-	because it no longer takes a string arg but rather an account arg.
-
-2001-01-12  Miguel de Icaza  <miguel@ximian.com>
-
-	* e-msg-composer-hdrs.c (add_header): Only attach to "changed" if
-	the widget is an EEntry.  The HEADER_COMBOBOX and the
-	HEADER_ADDRBOOK are a ComboBox and a remote Bonobo control
-	respectively. 
-
-	* evolution-composer.c (get_object): Move getObject functionality
-	here from e-msg-composer.c
-
-2001-01-11  Miguel de Icaza  <miguel@ximian.com>
-
-	* e-msg-composer-hdrs.c (create_dropdown_entry): Only set the
-	popdown strings if we have anything to popdown.
-
-2001-01-10  Miguel de Icaza  <miguel@helixcode.com>
-
-	* evolution-composer.c (evolution_composer_construct): Add an
-	ItemContainer Bonobo interface to allow client applications to
-	locate the Message Composer component.
-
-2001-01-11  Jeffrey Stedfast  <fejj@helixcode.com>
-
-	* e-msg-composer.c (menu_file_save_draft_cb): New callback to save
-	draft. Fixes bug #1045.
-
-2001-01-10  Miguel de Icaza  <miguel@helixcode.com>
-
-	* e-msg-composer.c: Removed more UNSAFE stuff.  Maybe we should
-	kill this macro, and have people that want these broken things
-	define their own macros.
-	(setup_item_container): Add an ItemContainer bonobo interface to
-	handle options to the window component.
-
-2001-01-08  Jeffrey Stedfast  <fejj@helixcode.com>
-
-	* e-msg-composer-hdrs.c (create_dropdown_entry): Updated for new
-	config code - this time it works!
-
-2001-01-08  Jeffrey Stedfast  <fejj@helixcode.com>
-
-	* e-msg-composer-hdrs.c (create_dropdown_entry): Reverted back to
-	old config code temporarily until I get the new config code
-	working 100%.
-
-2001-01-07  Jeffrey Stedfast  <fejj@helixcode.com>
-
-	* e-msg-composer-hdrs.c (create_dropdown_entry): Updated to
-	reflect changes to the mail-config API.
-
-2001-01-05  Radek Doulik  <rodo@helixcode.com>
-
-	* listener.c (impl_event): disable indenting for now, it crashes
-	editor
-
-2001-01-03  Jeffrey Stedfast  <fejj@helixcode.com>
-
-	* e-msg-composer.c (do_exit): If the headers have changed, then
-	continue with the prompt else just destroy the window.
-
-	* e-msg-composer-hdrs.c (init): Initialize has_changed to FALSE.
-	(entry_changed): New callback to set the value of has_changed.
-	(add_header): Attach the "changed" signal.
-
-2001-01-02  Dan Winship  <danw@helixcode.com>
-
-	* e-msg-composer-attachment.c (e_msg_composer_attachment_edit): 
-	* e-msg-composer-attachment-bar.c (update): Use
-	header_content_type_simple, not header_content_type_format.
-
-	* e-msg-composer-hdrs.c (create_dropdown_entry): Call
-	e_utf8_to_gtk_string on the combobox strings.
-
-2000-12-28  Dan Winship  <danw@helixcode.com>
-
-	* e-msg-composer.c (handle_multipart_alternative,
-	handle_multipart, e_msg_composer_new_with_message): Use
-	CamelContentType instead of GMimeContentField.
-
-	* e-msg-composer-attachment.c (e_msg_composer_attachment_edit): 
-	* e-msg-composer-attachment-bar.c (update, attach_to_multipart):
-	Use CamelContentType, and use the header_content_type_* functions
-	rather than operating on the structure by hand.
-
-2000-12-15  Jeffrey Stedfast  <fejj@helixcode.com>
-
-	* e-msg-composer.c (e_msg_composer_get_pgp_encrypt): New function
-	to get whether or not to encrypt the message.
-	(e_msg_composer_set_pgp_encrypt): New function to set encryption.
-	(e_msg_composer_get_pgp_sign): New function to get whether or not
-	to sign the message.
-	(e_msg_composer_set_pgp_sign): New function to set pgp_sign.
-	(init): Initialize pgp_sign and pgp_encrypt to FALSE.
-
-2000-12-14  Christopher James Lahey  <clahey@helixcode.com>
-
-	* e-msg-composer-hdrs.c (add_header): Made it so that carriage
-	return doesn't insert a newline in the subject entry.
-
-2000-12-12  Jeffrey Stedfast  <fejj@helixcode.com>
-
-	* e-msg-composer-hdrs.c (set_entry): Don't convert the utf-8
-	string to a gtkstring because the widget expects to get a utf-8
-	string.
-
-2000-12-12  Dan Winship  <danw@helixcode.com>
-
-	* Makefile.am (EXTRA_DIST): Add $(IDLS). (From campd.)
-
-2000-12-07  Radek Doulik  <rodo@helixcode.com>
-
-	* e-msg-composer.c (prepare_engine): added warnings
-	(prepare_engine): updated to IDL:GNOME/GtkHTML/Editor/Engine:1.0
-
-	* Makefile.am: renamed HTMLEditor* to Editor*, added Editor-common.c:
-	$(HTML_EDITOR_GENERATED) rule
-
-2000-12-05  Jeffrey Stedfast  <fejj@helixcode.com>
-
-	* e-msg-composer.c (add_recipients): Use camel to construct the
-	list of recipients rather than just strchr(recips, ',') which is
-	very prone to errors.
-
-2000-11-03  Iain Holmes  <iain@helixcode.com>
-
-	* e-msg-composer-attachment-bar.c (update): Pass NULL
-	instead of icon_name to the e_icon_list_append_pixbuf
-	function.
-	(init) Take the font size into account when setting the
-	height of the bar.
-
-2000-11-02  Iain Holmes  <iain@helixcode.com>
-
-	* e-msg-composer-attachment-bar.c (update): Use the 
-	pixbuf_for_mime_type function to get the icon.
-	(pixbuf_for_mime_type): Functino that searches nautilus/
-	and mc/ for icon files.
-
-2000-11-15  Radek Doulik  <rodo@helixcode.com>
-
-	* e-msg-composer.c (prepare_engine): update namespace
-
-	* updates for HTMLEditor API changes
-
-	* e-msg-composer.c: added #include <libgnomevfs/gnome-vfs.h>
-
-	* e-msg-composer.h: e_msg_composer_guess_mime_type renamed and
-	moved mime_guess_type_from_file_name from camel as it uses VFS
-
-2000-11-14  Radek Doulik  <rodo@helixcode.com>
-
-	* listener.c (reply_indent): rename command to runCommand
-
-	* e-msg-composer.c: updated to HTMLEditor API changes
-
-	* listener.c: updated to HTMLEditor API changes
-
-2000-11-13  Radek Doulik  <rodo@helixcode.com>
-
-	* listener.c (reply_indent): extracted function, does reply
-	indentation, use updated editor engine api
-
-2000-11-10  Michael Meeks  <michael@helixcode.com>
-
-	* Makefile.am ($(HTML_EDITOR_GENERATED)): rearrnace
-	includes.
-
-2000-11-10  Larry Ewing  <lewing@helixcode.com>
-
-	* e-msg-composer.c (build_message): set the HTML charset to utf-8
-	for all the html message parts.
-	(build_message): make sure we set the proper encoding on the html
-	part now that it may contain utf-8 characters
-
-2000-11-08  Radek Doulik  <rodo@helixcode.com>
-
-	* e-msg-composer.c (e_msg_composer_clear_inlined_table): new
-	function
-	(destroy): use e_msg_composer_clear_inlined_table, destroy
-	inlined_images hash table
-	(get_signature): added in_html arg, it tells if we should use HTML
-	signature
-	(set_editor_text): try to use HTML signature
-	(e_msg_composer_new_with_sig_file): added send_html arg to be able
-	to use HTML signature
-
-	* listener.c (resolve_image_url): don't add inlined images to
-	attachement bar
-
-	* e-msg-composer.c (add_inlined_images): new function, adds
-	inlined images to multipart
-	(add_inlined_image): helper function, adds one image to multipart
-	(build_message): store HTML messages with inlined images to
-	multipart/related
-
-	* e-msg-composer-attachment-bar.c (add_from_file): removed
-	content_id arg
-	(e_msg_composer_attachment_bar_attach): likewise
-
-	* e-msg-composer-attachment.c (e_msg_composer_attachment_new):
-	removed content_id arg
-
-2000-11-06  Not Zed  <NotZed@HelixCode.com>
-
-	* e-msg-composer-hdrs.c (e_msg_composer_hdrs_to_message): Changed
-	for message api changes.  Use camel_address_unformat to convert
-	the editable->usable.
-	(set_recipients): Same.  Now we set the recipients as
-	camel_internet_address's.  Fixed a memleak indirectly.
-	(decode_addresses): Removed, no longer needed.
-	(create_dropdown_entry): We dont want to use _encode(), we want to
-	_format, as we are displaying the result.  We can use the static
-	function too to avoid the object creation, and the memory leak!
-	(set_entry): Convert the args to gtk-safe characters, since the
-	entry doesn't understand utf8.
-	(set_recipients): And likewise do the reverse when retrieving the
-	contents of the widget.
-
-2000-11-06  Larry Ewing  <lewing@helixcode.com>
-
-        * e-msg-composer.c (build_message): set the content type on the
-        plain part of outgoing messages.
-        (best_content): a helper function to get the best content type for
-        the attachment.  This should probably use the helper functions in
-        the future.
-
-2000-11-06  Kjartan Maraas  <kmaraas@gnome.org>
-
-	* e-msg-composer-attachment.c: Added #include <config.h>
-	* e-msg-composer-hdrs.c: s/_HAVE_CONFIG_H/HAVE_CONFIG_H for
-	working i18n.
-	
-2000-11-04  Radek Doulik  <rodo@helixcode.com>
-
-	* e-msg-composer-attachment.c (e_msg_composer_attachment_new): fix
-	test for regular file to !S_ISREG (statbuf.st_mode)
-
-	* listener.c (resolve_image_url): use inline images hash table
-
-	* e-msg-composer.c (init): create inlined images hash table
-	(destroy): destroy it
-	(clear_inline_images): helper function, used from
-	g_hash_table_foreach_remove to destroy one inline image record
-
-	* e-msg-composer.h: added hash table with inlined images url ->
-	cid info
-
-2000-11-03  Radek Doulik  <rodo@helixcode.com>
-
-	* listener.c (impl_event): updated for API changed
-	implemented image_url event
-	(resolve_image_url): new helper function, attaches image to mail
-	and returns new (resolved) url pointing to mime component
-
-	* e-msg-composer-attachment.c (e_msg_composer_attachment_new):
-	added conponent_id parameter
-
-	* e-msg-composer-attachment-bar.c
-	(e_msg_composer_attachment_bar_attach): added parameter content_id
-	(add_from_file): likewise
-
-2000-11-03  Jeffrey Stedfast  <fejj@helixcode.com>
-
-	* e-msg-composer-attachment.c (e_msg_composer_attachment_new):
-	Don't allow attaching anything but regular files.
-
-2000-11-03  Federico Mena Quintero  <federico@helixcode.com>
-
-	* Makefile.am: Clean the idl-generated files properly.
-
-2000-11-02  Peter Williams  <peterw@helixcode.com>
-
-	* e-msg-composer-attachment-bar.c (attach_to_multipart): CamelStreamMem
-	steals our byte array; we can't destroy the byte array explicitly, and
-	we must unref the stream only when done using the array.
-
-2000-11-01  Jeffrey Stedfast  <fejj@helixcode.com>
-
-	* e-msg-composer.c (e_msg_composer_new_with_message): Don't create
-	the To, Cc, and Bcc lists based only on the address, use both the
-	name and address and camel_address_encode() them.
-
-2000-11-01  Jeffrey Stedfast  <fejj@helixcode.com>
-
-	* e-msg-composer-attachment-bar.c (attach_to_multipart): Fix the
-	CTE kludge, calculate the best mime transfer encoding for the mime
-	part and use that. Include e-msg-composer-select-file.h
-
-2000-10-31  Radek Doulik  <rodo@helixcode.com>
-
-	* e-msg-composer.c (prepare_engine): new function, tries prepare
-	editor engine
-	(mark_orig_text): marks original text in editor
-	(set_editor_text): call mark_orig_text
-	(create_composer): call prepare_engine
-
-	* Makefile.am (IDL_GENERATED): added HTMLEditor generated files to
-	IDL_GENERATED
-	($(IDL_GENERATED)): generate also files from HTMLEditor.idl
-	(libcomposer_la_SOURCES): added listener.[ch]
-
-	* e-msg-composer.h: added editor_engine and editor_listener to
-	EMsgComposer
-
-	* listener.[ch]: new files, implementation of HTMLEditor::Listener
-
-2000-10-27  Ettore Perazzoli  <ettore@helixcode.com>
-
-	* Makefile.am ($(IDL_GENERATED)): Get `Composer.idl' from
-	`$(srcdir)' so that it builds with builddir != srcdir.
-
-2000-10-27  Jeffrey Stedfast  <fejj@helixcode.com>
-
-	* e-msg-composer.c (e_msg_composer_new_with_message): Fixed my
-	not-quite-right logic so that we don't accidently set the body
-	contents using a plain text attachment instead of the actual body
-	of the message :-)
-
-2000-10-25  Jeffrey Stedfast  <fejj@helixcode.com>
-
-	* e-msg-composer.c (e_msg_composer_new_with_message): Populate the
-	composer with any attachments.
-
-2000-10-25  Iain Holmes  <iain@helixcode.com>
-
-	* e-msg-composer-select-file.c (create_file_selection): Set the
-	wmclass and wmclass_name for the file selectors so that Sawfish
-	doesn't make the dialogs the same size as the parent.
-
-2000-10-25  Dan Winship  <danw@helixcode.com>
-
-	* evolution-composer.c (init): Attach send/postpone signal
-	handlers to the EMsgComposer.
-	(evolution_composer_factory_init): Take send/postpone signal
-	handlers as arguments.
-
-2000-10-23  Dan Winship  <danw@helixcode.com>
-
-	* e-msg-composer.c, e-msg-composer-attachment-bar.c: add some
-	missing _()s.
-
-	* e-msg-composer-address-dialog.*, e-msg-composer-address-entry.*:
-	Old cruft. Remove.
-
-	* Makefile.am: Update for removed files.
-
-	* e-msg-composer-hdrs.c: Remove e-msg-composer-address-entry.h
-	include.
-
-	* e-msg-composer.c: Remove e-msg-composer-address-dialog.h include
-	
-2000-10-23  Ariel Rios   <ariel@arcavia.com>
-
-	* e-msg-composer-hdrs.c: Include Composer.h
-	instead of volution-Addressbook-SelectNames.h
-
-2000-10-22  Dan Winship  <danw@helixcode.com>
-
-	* .cvsignore: No, don't ignore Evolution-Addressbook-SelectNames*.
-	They're not supposed to be there any more. 
-
-2000-10-22  Ettore Perazzoli  <ettore@helixcode.com>
-
-	* e-msg-composer-attachment-bar.c (attach_cb): Removed.
-	(add_from_user): Use `e_msg_composer_select_file()' instead of
-	doing the file selector widget magic by yourself.
-
-2000-10-20  Jeffrey Stedfast  <fejj@helixcode.com>
-
-	* .cvsignore: Ignore Evolution-Addressbook-SelectNames*
-
-2000-10-20  Dan Winship  <danw@helixcode.com>
-
-	* Evolution-Composer.idl: Evolution::Composer interface
-
-	* evolution-composer.[ch]: Implementation and factory. So
-	entirely not tested.
-
-	* Makefile.am (libcomposer_la_SOURCES): Add
-	evolution-composer.[ch]
-	(IDLS): Update this for Evolution-Composer.idl / Composer.idl
-
-	* main.c: Removed. (Old, dead code)
-
-2000-10-19  Ettore Perazzoli  <ettore@helixcode.com>
-
-	* Makefile.am (glade_data): Add `e-msg-composer-attachment.glade'.
-	(glade_messages): New.
-	(EXTRA_DIST): Add `$(glade_messages)'.
-
-2000-10-19  Michael Meeks  <michael@helixcode.com>
-
-	* e-msg-composer.c (create_menubar_file, create_menubar_edit),
-	(create_menubar_format, create_menubar_view, create_menubar): kill.
-	(create_toolbar): die.
-	(setup_ui): impl.
-	(e_msg_composer_construct): hook in.
-	(menu_format_html_cb): update.
-	(menu_view_attachments_activate_cb): ditto.
-	(destroy): upd.
-	(e_msg_composer_construct): upd.
-	(e_msg_composer_set_send_html): upd.
-
-2000-10-16  Iain Holmes  <iain@helixcode.com>
-
-	* e-msg-composer-hdrs.c (init): Don't need the ID anymore.
-
-2000-10-17  Jeffrey Stedfast  <fejj@helixcode.com>
-
-	* e-msg-composer.c (e_msg_composer_new_with_message): If the body
-	text was NULL, then don't bother turning it into HTML (besides, it
-	causes a nasty segfault).
-
-2000-10-15  Dan Winship  <danw@helixcode.com>
-
-	* Makefile.am: Move CPPFLAGS flags to INCLUDES to avoid bashing
-	any CPPFLAGS set at configure time.
-
-2000-10-14  Jeffrey Stedfast  <fejj@helixcode.com>
-
-	* e-msg-composer-attachment.c (set_entry): If the entry widget is
-	NULL, obviously we can't set any text on it.
-
-2000-10-14  Iain Holmes  <iain@helixcode.com>
-
-	* e-msg-composer-hdrs.c (init): Create a unique-ish id for this set
-	of headers, so that only one select-names dialog will be created for
-	a given set of headers.
-	(address_button_clicked_cb): Pass the unique-ish id to the activate
-	dialog command.
-
-2000-10-13  Larry Ewing  <lewing@helixcode.com>
-
-	* e-msg-composer.c (build_message): stop using format_text,
-	gtkhtml handles this now.
-	(format_text): function removed.
-
-2000-10-10  Iain Holmes  <iain@helixcode.com>
-
-	* e-icon-list.c: Allow NULL pixbufs, and load the "broken" image
-
-	* e-msg-composer-attachment-bar.c (update): If the image isn't 
-	found load the default text/plain icon.
-
-2000-10-02  Jeffrey Stedfast  <fejj@helixcode.com>
-
-	* e-msg-composer.c (build_message): If the body of the message has
-	8-bit chars, set the Content-Transfer-Encoding type to the best
-	encoding.
-
-2000-10-02  Dan Winship  <danw@helixcode.com>
-
-	* e-icon-list.c: fix #include of gnome-canvas-pixbuf.h
-
-2000-10-02  Iain Holmes  <iain@helixcode.com>
-
-	* e-msg-composer-attachment-bar.c: If the description of an attachment
-	is a blank string, revert to displaying the filename.
-
-2000-10-01  Iain Holmes  <iain@helixcode.com>
-
-	* e-icon-list.c: If you try to add an icon from a file that doesn't
-	exist put a "Broken icon" image.
-
-	* bad-icon.xpm: Broken icon image.
-
-2000-10-01  Iain Holmes  <iain@helixcode.com>
-
-	* e-msg-composer-attachment-bar.[ch] (update): If the attachment is
-	an image, then make a thumbnail for it.
-	Base the attachment bar on e-icon-list instead of gnome-icon-list.
-
-	* e-icon-list.[ch]: New files. These are modified versions of 
-	gnome-icon-list from gnome-libs HEAD that uses gdk-pixbuf instead
-	of the evil Imlib.
-
-	* e-msg-composer-attachment.[ch]: Add a pixbuf_cache member, to
-	save us having to generate a thumbnail for the attachment every
-	time the bar changes.
-	
-	* e-msg-composer.c (e_msg_composer_construct): Add dnd support for
-	files. Drag a file to the composer to add it as an attachment.
-
-2000-09-28  Jeffrey Stedfast  <fejj@helixcode.com>
-
-	* e-msg-composer.c (build_message): Check to see if the body has
-	8bit chars, if so - set the Content-Transfer-Encoding to 8bit.
-	Addresses Bugzilla bug #652.
-
-2000-09-25  Dan Winship  <danw@helixcode.com>
-
-	* e-msg-composer-hdrs.c (setup_headers): fix typo in tooltip.
-	* e-msg-composer.c (create_menubar_file): fix accelerator for
-	"Save as" to be different from "Save". (Both problems pointed out
-	by menthos@menthos.com.)
-
-2000-09-24  Jeffrey Stedfast  <fejj@helixcode.com>
-
-	* e-msg-composer.c (get_signature): Updated to handle FIFO
-	streams.
-
-2000-09-19  Dan Winship  <danw@helixcode.com>
-
-	* e-msg-composer.c (e_msg_composer_construct): Don't g_error out
-	if the html-editor-control fails.
-	(create_composer): New internal function to create and construct a
-	msg_composer and pop up an error message if it fails.
-	(e_msg_composer_new, e_msg_composer_new_with_sig_file,
-	e_msg_composer_new_with_message, e_msg_composer_new_from_url): Use
-	create_composer, return if it fails, change return type to
-	EMsgComposer *.
-
-2000-09-18  Dan Winship  <danw@helixcode.com>
-
-	* e-msg-composer-attachment.c (get_mime_type): Use
-	gnome_vfs_get_file_info.
-
-	* e-msg-composer-attachment-bar.c (update): Use gnome_vfs_mime
-	functions, not old gnome_mime.
-
-2000-09-18  Christopher James Lahey  <clahey@helixcode.com>
-
-	* Makefile.am: Added $(EXTRA_GNOME_CFLAGS) and
-	$(EXTRA_GNOME_LIBS).  Removed unneeded libraries.
-
-	* e-msg-composer-address-dialog.c, e-msg-composer-address-entry.c,
-	e-msg-composer-attachment.c, e-msg-composer-hdrs.c,
-	e-msg-composer.c: Fixed the #include lines to deal properly with
-	gal.
-
-2000-09-12  Michael Meeks  <michael@helixcode.com>
-
-	* e-msg-composer.c: Update for new UI handler.
-
-2000-09-12  Larry Ewing  <lewing@helixcode.com>
-
-	* e-msg-composer-attachment-bar.c (add_common): add a make sure
-	the attachment isn't NULL.  A more complete fix coming soon.
-
-2000-09-12  Ettore Perazzoli  <ettore@helixcode.com>
-
-	* Makefile.am ($(IDL_GENERATED)): Add space after `-I'.
-
-2000-09-05  Ettore Perazzoli  <ettore@helixcode.com>
-
-	* e-msg-composer.c (create_menubar_format): Accelerate the
-	`Format' menu with an `o' instead of an `f' [the `f' is already
-	taken by the "File" menu].
-
-2000-09-04  Jeffrey Stedfast  <fejj@helixcode.com>
-
-	* e-msg-composer.c (e_msg_composer_new_with_sig_file): Applied
-	Jesse's patch that sets the composer's sig_file
-
-2000-09-02  Lauris Kaplinski  <lauris@helixcode.com>
-
-	* e-msg-composer-address-dialog.c: Use e_utf8 wrappers
-
-2000-09-01  Jeffrey Stedfast  <fejj@helixcode.com>
-
-	* e-msg-composer.c (e_msg_composer_get_sig_file): This needs to
-	return a const char * and not a char *, because we're not actually
-	allocating memory here.
-	(create_menubar_file): Changed "Send" to "Send Now" and added
-	"Send Later"
-	(menu_file_send_later_cb): New callback that emits the POSTPONE
-	signal (equivalent to "Send Later"
-
-2000-08-28  Jeffrey Stedfast  <fejj@helixcode.com>
-
-	* e-msg-composer.c (e_msg_composer_new_with_message): Always
-	request to import the HTML version if at all possible so that we
-	maintain formatting and other nifty stuff :-)
-
-2000-08-28  Jeffrey Stedfast  <fejj@helixcode.com>
-	
-	* e-msg-composer-hdrs.c (e_msg_composer_hdrs_to_message): Set the
-	"From" address in the CamelMimeMessage. Also updated to use
-	get_subject to both make our lives easier and prepare for using UTF8
-	(e_msg_composer_hdrs_get_subject): Updated to behave similarly to
-	get_from and return allocated memory (it will have to return
-	allocated memory once it's converted to use UTF8 anyways)
-
-	* e-msg-composer.c (setup_save_draft): Always set
-	composer->send_html = TRUE so that formatting is preserved.
-
-2000-08-24  Lauris Kaplinski  <lauris@helixcode.com>
-
-	* e-msg-composer-address-entry.c: Use e_utf8 wrappers
-
-	* e-msg-composer-attachment.c: Use e_utf8 wrappers
-
-	* e-msg-composer-hdrs.c: Use e_utf8 wrappers
-	
-2000-08-24  Peter Williams  <peterw@helixcode.com>
-
-	* Makefile.am (INCLUDES): Add builddir/shell so we can
-	get Evolution.h
-
-2000-08-12  Michael Meeks  <michael@helixcode.com>
-
-	* e-msg-composer.c (get_text): get_text not get_txt.
-
-2000-08-11  JP Rosevear  <jpr@helixcode.com>
-
-	* e-msg-composer.c (e_msg_composer_new_with_message): Use
-	new config accessors
-
-2000-08-10  Dan Winship  <danw@helixcode.com>
-
-	* e-msg-composer.c: Remove unneeded e-setup.h include
-
-2000-08-10  Jeffrey Stedfast  <fejj@helixcode.com>
-
-	* e-msg-composer.c (exit_dialog_cb): Made async
-
-2000-08-10  Peter Williams  <peterw@helixcode.com>
-
-	* e-msg-composer.c (do_exit): Temporarily disable draft saving
-	while we figure out how to work around Zucchi's new append_message.
-
-2000-08-10  Jeffrey Stedfast  <fejj@helixcode.com>
-
-	* e-msg-composer-hdrs.c (e_msg_composer_hdrs_get_from): Return the
-	text in GtkCombo->entry
-
-2000-08-09  Jeffrey Stedfast  <fejj@helixcode.com>
-
-	* e-msg-composer-hdrs.c (create_dropdown_entry): Fixed the GList
-	identity stuff, should now display all configured identities.
-
-2000-08-09  Christopher James Lahey  <clahey@helixcode.com>
-
-	* e-msg-composer-address-dialog.c: Fixed some warnings.
-
-	* e-msg-composer-hdrs.c: Switched the composer to use an EEntry
-	for the subject field.
-
-	* e-msg-composer.c: Changed the non scaling objects in this vbox
-	to be FALSE, FALSE instead of FALSE, TRUE.
-
-2000-08-09  Jeffrey Stedfast  <fejj@helixcode.com>
-
-	* e-msg-composer-hdrs.c (add_header): Modified to allow dropdown
-	entry-boxes as well (for headers like From:)
-	(setup_headers): Modified to use the correct enum type.
-	(create_dropdown_entry): New convenience function to add a
-	drop-down combo box and fill it in with identities
-	(init): Set from_entry to NULL
-	(e_msg_composer_hdrs_get_from): New convenience function to get
-	the text in the From widget in the composer
-	(e_msg_composer_hdrs_set_from): New convenience function to set
-	the From header in the composer
-
-2000-08-08  JP Rosevear  <jpr@helixcode.com>
-
-	* Makefile.am: Fix build by allowing includes for e-table dir
-
-2000-08-07  Jeffrey Stedfast  <fejj@helixcode.com>
-
-	* e-msg-composer-attachment-bar.c (attach_to_multipart):
-	s/strcasecmp/g_strcasecmp
-
-	* e-msg-composer.c: s/strncasecmp/g_strncasecmp - this will help
-	later with building on different platforms :-)
-
-2000-08-07  Jeffrey Stedfast  <fejj@helixcode.com>
-
-	* e-msg-composer.c (e_msg_composer_new_with_message): Added code
-	to set the body text based on the CamelMimeMessage.
-	(set_editor_text): Use lowercase html tags...
-
-2000-08-07  Jeffrey Stedfast  <fejj@helixcode.com>
-
-	* e-msg-composer.c (do_exit): Prompt the user to save their
-	composition in Drafts.
-	(set_editor_text): Uhm, use "-- \n" not "--\n" because the space
-	is called for in the standard
-	(e_msg_composer_new_with_message): New convenience function that
-	takes a CamelMimeMessage as an argument. This will be useful when
-	we code the ability to resume the editing of a message draft (like
-	in the Drafts folder).
-
-2000-08-01  JP Rosevear  <jpr@helixcode.com>
-
-	* e-msg-composer.h: Constify param
-
-	* e-msg-composer.c (get_signature): Constify param
-	(set_editor_text): ditto
-	(e_msg_composer_new_with_sig_file): ditto
-
-2000-08-01  Peter Williams  <peterw@helixcode.com>
-
-	* e-msg-composer.c (set_editor_text): sizeof("--\") !=
-	strlen("--\n"), breaking the test for the signature prefix.
-
-2000-07-28  JP Rosevear  <jpr@helixcode.com>
-
-	* e-msg-composer.c (e_msg_composer_new_with_sig_file): New
-	function to create composer with sig file set.
-	(e_msg_composer_get_sig_file): New function to get sig file
-	(e_msg_composer_set_sig_file): New function to set sig file
-
-2000-07-25  Michael Meeks  <michael@helixcode.com>
-
-	* e-msg-composer.c (get_text): add textual exception printout.
-	(set_editor_text): close pre tags & check for pre-existing
-	sig separator.
-
-2000-07-25  Peter Williams  <peterw@helixcode.com>
-
-	* e-msg-composer.c (menu_file_insert_file_cb): Mark this function
-	as FIXME because we're waiting for the HTML Editor Control to
-	support paste commands. Also some updates for when that happens.
-
-2000-07-24  Dan Winship  <danw@helixcode.com>
-
-	* e-msg-composer.c: Remove GOAD support.
-	(create_editor): Try to give a more helpful error message when
-	failing to load the editor control.
-
-2000-07-23  Ettore Perazzoli  <ettore@helixcode.com>
-
-	* e-msg-composer.c (menu_format_html_cb): New callback for the
-	"Send HTML" menu toggle item.
-	(create_menubar_format): New.
-	(create_menubar): Call it.
-	(create_menubar_options): Removed.
-	(init): Initialize `send_html' and `attachment_bar_visible' to
-	FALSE.
-	(get_signature): Add `void' to the declaration.  This is C, not
-	C++.
-	(menu_file_close_cb): Renamed from `exit_cb'.
-	(menu_file_send_cb): Renamed from `send_cb'.
-	(menu_file_save_as_cb): Renamed from `save_as_cb'.
-	(menu_file_save_cb): Renamed from `save_cb'.
-	(menu_file_open_cb): Renamed from `open_cb'.
-	(menu_file_add_attachment_cb): Renamed from `add_attachment_cb'.
-	(menu_file_insert_file_cb): Renamed from `insert_file_cb'.
-	(e_msg_composer_set_send_html): New.
-	(build_message): Use the `send_html' flag instead of peeking the
-	`msg_format' gnome-config value directly.
-
-	* e-msg-composer.h: New member `send_html' in `EMsgComposer'.
-
-2000-07-23  Ettore Perazzoli  <ettore@helixcode.com>
-
-	* e-msg-composer.c: Changed to use BonoboUIHandler stuff directly
-	instead of translating from GnomeUIInfo.
-	(create_menubar_file): New.
-	(create_menubar_edit): New.
-	(create_menubar_view): New.
-	(create_menubar_options): New.
-	(create_menubar): Use these functions to set up the menu bar.
-	(create_toolbar): Use BonoboUIHandler directly instead of
-	converting from GnomeUIInfo.
-	(toolbar_view_attachments_clicked_cb): Removed.
-	(address_dialog_cb): Removed.
-	(address_dialog_destroy_cb): Removed.
-	(address_dialog_apply_cb): Removed.
-	(setup_address_dialog): Removed.
-
-2000-07-12  Peter Williams  <peterw@helixcode.com>
-
-	* e-msg-composer.c: (view_tree) Make the "View Attachments" item
-	a toggleitem ... so that it can be toggled...
-	(menu_view_attachments_activate_cb): Treat the widget correctly
-	and toggle correctly.
-
-2000-07-10  Ettore Perazzoli  <ettore@helixcode.com>
-
-	* e-msg-composer.c (exit_cb): Use it.
-	(delete_event): New, handler for the "delete_event" signal.
-
-2000-07-09  Dan Winship  <danw@helixcode.com>
-
-	* e-msg-composer.c (set_editor_text): Don't load "" into the
-	editor, because it will cause the editor component to g_warning.
-
-2000-07-09  Christopher James Lahey  <clahey@helixcode.com>
-
-	* e-msg-composer-hdrs.c: Removed the extra frame here.
-
-2000-07-08  Dan Winship  <danw@helixcode.com>
-
-	* e-msg-composer.c (create_menubar): Create an empty "Edit" menu
-	for the editor control to insert itself into.
-
-2000-07-08  Jeffrey Stedfast  <fejj@helixcode.com>
-
-	* .cvsignore: Ignore dynamically created source files
-
-2000-07-08  Ettore Perazzoli  <ettore@helixcode.com>
-
-	* e-msg-composer-hdrs.c (set_entry): New.
-	(e_msg_composer_hdrs_set_to): Use it.
-	(e_msg_composer_hdrs_set_cc): Likewise
-	(e_msg_composer_hdrs_set_bcc): Likewise.
-	(e_msg_composer_hdrs_get_to): Replace implementation with a
-	`g_assert_not_reached()'.
-	(e_msg_composer_hdrs_get_cc): Likewise.
-	(e_msg_composer_hdrs_get_bcc): Likewise.
-
-	* e-msg-composer.c: Get rid of cut/copy/paste/undo as they
-	duplicate the editor toolbar and cannot be made to work for all
-	the widgets anyway.
-
-2000-07-08  Ettore Perazzoli  <ettore@helixcode.com>
-
-	* e-msg-composer-hdrs.c: New member `corba_select_names' in
-	`EMsgComposerHdrsPrivate'.
-	(destroy): If not `CORBA_OBJECT_NIL', release.
-	(init): Init to `CORBA_OBJECT_NIL'.
-	(setup_corba): New.
-	(e_msg_composer_hdrs_new): Call it.
-	(add_entry): Create the entries by using the ::SelectNames
-	interface.
-	(address_button_clicked_cb): Activate the dialog through the
-	::SelectNames interface.
-
-2000-06-29  Jeffrey Stedfast  <fejj@helixcode.com>
-
-	* e-msg-composer.c: Changed "Exit" to "Close" in the File menu.
-	This is a little more intuitive as it does not suggest exiting
-	the application, just says "close this window".
-
-2000-06-26  Christopher James Lahey  <clahey@helixcode.com>
-
-	* Makefile.am: Added e-msg-composer-select-file.h for make
-	distcheck.
-
-2000-06-26  Ettore Perazzoli  <ettore@helixcode.com>
-
-	* e-msg-composer.c
-	(load): New.
-	(open_cb): Use it.
-	(save): New function.
-	(save_cb): Implemented by using it.
-	(save_as_cb): Likewise.
-
-2000-06-17  Ettore Perazzoli  <ettore@helixcode.com>
-
-	* e-msg-composer.c (e_msg_composer_construct): I18N the title bar.
-
-	* Makefile.am (libcomposerinclude_HEADERS): Removed.  Move all the
-	`.h' files into `libcomposer_la_SOURCES' so that they get
-	distributed, but not installed.
-
-	* e-msg-composer.c (open_cb): New; implement the `Open' command.
-	(save_as_cb): New; implement the `Save as' command.
-	(init): Initialize the `persist_file_interface' and
-	`persist_stream_interface' members to NULL.
-	(destroy): Release the PersistStream and PersistFile interfaces.
-	(e_msg_composer_construct): Query the PersistFile and
-	PersistStream interfaces on the control and save them in the
-	`persist_file_interface' and `persist_stream_interface' members.
-	(get_text): Renamed from `get_editor_text'.  Get a
-	@persist_stream_interface instead of querying it a the control.
-	(build_message): Return NULL if `persist_stream_interface' is nil.
-
-	* e-msg-composer.h: New member `persist_file_interface' in
-	`EMsgComposer'.
-
-	* e-msg-composer-select-file.c: New.
-	* e-msg-composer-select-file.h: New.
-
-	* e-msg-composer.c (e_msg_composer_construct): Make the `To:'
-	entry grab the keyboard focus.
-
-	* e-msg-composer-hdrs.c (e_msg_composer_hdrs_get_to_entry): New.
-	(e_msg_composer_hdrs_get_cc_entry): New.
-	(e_msg_composer_hdrs_get_bcc_entry): New.
-	(e_msg_composer_hdrs_get_subject_entry): New.
-
-	* e-msg-composer.c (e_msg_composer_construct): Set the scroll
-	frame's shadow type to `GTK_SHADOW_IN'.
-	(format_text): Initialize `tabbing' to zero to shut down the
-	compiler.
-
-2000-06-14  Dan Winship  <danw@helixcode.com>
-
-	* e-msg-composer-attachment-bar.c (add_from_user): keep the
-	GtkFileSelection around between calls so we start up in the same
-	directory we ended up in last time around. (Also fixes a big
-	memory leak in that the code was already keeping the
-	GtkFileSelection around, it just wasn't remembering to reuse it.)
-
-	* e-msg-composer.c (format_text): Don't line-wrap lines that start
-	with ">".
-
-2000-06-12  Dan Winship  <danw@helixcode.com>
-
-	* e-msg-composer.c (format_text): If a paragraph starts with TABs,
-	indent the whole paragraph to that tab level.
-
-2000-06-12  Ettore Perazzoli  <ettore@helixcode.com>
-
-	* e-msg-composer.c: Make the `attachment_scroll_frame' an
-	`EScrollFrame'.
-	(exit_cb): I18N the quit message.
-
-	* e-msg-composer.h: `attachment_scrolled_window' renamed to
-	`attachment_scroll_frame'.
-
-2000-06-12  Dan Winship  <danw@helixcode.com>
-
-	* e-msg-composer.c (format_text): Don't break on non-breaking
-	spaces, don't keep non-breaking spaces that fall after a line
-	wrap, and translate non-breaking spaces to regular ones after
-	wrapping.
-
-2000-06-05  Dan Winship  <danw@helixcode.com>
-
-	* e-msg-composer.c (e_msg_composer_attach): New convenience
-	function.
-
-	* e-msg-composer-attachment.c: Store a CamelMimePart rather than
-	filename/description/mime_type info. Also record whether we were
-	told or guessed the MIME type.
-	(e_msg_composer_attachment_new_from_mime_part): New constructor.
-	(e_msg_composer_attachment_edit): Remove the "browse" button. (If
-	the user wants to change the actual file that the attachment is
-	based on, he should delete the attachment and create a new one...)
-	Remove the "Apply" button, because it's not all that useful. Make
-	the MIME type only track the filename if it was guessed rather
-	than being provided.
-
-	* e-msg-composer-attachment.glade: Remove "browse" and "apply"
-	buttons. Make filename editable.
-
-	* e-msg-composer-attachment-bar.c (sort): Removed. Send the
-	attachments in the order the user attached them in.
-	(text_changed): Removed, since we weren't enabling the relevant
-	GnomeIconList functionality that would have used this.
-	(update): Don't print the size if it's 0.
-	(attach_to_multipart, etc): adjust for EMsgComposerAttachment
-	changes.
-	(attach_to_multipart): Use 7bit encoding for message/ subparts.
-	(e_msg_composer_attachment_bar_attach_mime_part): New convenience
-	function.
-	
-
-2000-06-02  Christopher James Lahey  <clahey@helixcode.com>
-
-	* e-msg-composer.c: Added the ability to save plain text mail.
-
-2000-05-29  Dan Winship  <danw@helixcode.com>
-
-	* e-msg-composer.c (get_editor_text): add a "format" argument so
-	we can fetch different kinds of text.
-	(format_text): New function to do line wrapping on plain text.
-	(build_message): Build multipart/alternative messages rather than
-	HTML-only ones. Yay. We don't suck (as much) any more!
-
-2000-05-28  Dan Winship  <danw@helixcode.com>
-
-	* e-msg-composer.c: #include <errno.h>
-
-2000-05-26  Dan Winship  <danw@helixcode.com>
-
-	* e-msg-composer.c (get_editor_text, set_editor_text): Update for
-	PersistStream changes
-	(build_message): Update for CamelMultipart changes.
-
-	* e-msg-composer.c (get_signature): routine to read the user's
-	signature file.
-	(set_editor_text): If the user has configured a signature, append
-	it to the set text.
-	(e_msg_composer_new): Call set_editor_text with "" to load the
-	signature (if any).
-	
-2000-05-25  Not Zed  <NotZed@HelixCode.com>
-
-	* e-msg-composer.c (build_message): Use camel_data_wrapper_new
-	instead of camel_simple_data_wrapper_new.
-
-2000-05-17  Dan Winship  <danw@helixcode.com>
-
-	* e-msg-composer.c (build_message): Use
-	camel_simple_data_wrapper_new rather than camel_data_wrapper_new.
-
-2000-05-13  Valek Filippov  <frob@df.ru>
-
-	* e-msg-composer-attachment.glade: save translatable strings
-	* e-msg-composer-attachment.glade.h: file with strings
-	* e-msg-composer-address-dialog.glade: save translatable strings
-	* e-msg-composer-address-dialog.glade.h: file with strings
-
-2000-05-12  Dan Winship  <danw@helixcode.com>
-
-	* e-msg-composer.c (get_editor_text): NUL-terminate the data
-	extracted from the BonoboStream.
-
-2000-05-10  Dan Winship  <danw@helixcode.com>
-
-	* e-msg-composer-attachment-bar.c (attach_to_multipart): deal with
-	Content-Transfer-Encoding a little bit at least.
-
-2000-05-07  Mathieu Lacage <mathieu@gnu.org>
-
-	* e-msg-composer.c (create_editor): remove FIXME and hardcoded 
-	string. You can write mails with OAF now.
-	
-2000-05-07  Dan Winship  <danw@helixcode.com>
-
-	* e-msg-composer.c (build_message): unref content, etc. after
-	attaching it to message.
-
-	* e-msg-composer-attachment-bar.c (attach_to_multipart): unref
-	part after attaching it.
-
-2000-05-06  Christopher James Lahey  <clahey@helixcode.com>
-
-	* e-msg-composer-hdrs.c: Turned off focus in the To, Cc, and Bcc
-	buttons.
-
-2000-05-02  Matt Loper  <matt@helixcode.com>
-
-	* Makefile.am: set G_LOG_DOMAIN.
-
-2000-04-28  Dan Winship  <danw@helixcode.com>
-
-	* e-msg-composer-hdrs.c (set_recipients): Update (minimally) for
-	Camel recipient changes.
-
-2000-04-27  Dan Winship  <danw@helixcode.com>
-
-	* e-msg-composer.c (e_msg_composer_new_from_url): New routine, to
-	process mailto URLs.
-
-2000-04-26  Dan Winship  <danw@helixcode.com>
-
-	* e-msg-composer.c (build_message): Only generate a multipart
-	message if there are attachments. Otherwise generate a single
-	part.
-
-	* Update for CamelMimeBodyPart -> CamelMimePart
-
-2000-04-26  Dan Winship  <danw@helixcode.com>
-
-	* e-msg-composer-attachment-bar.c (attach_to_multipart): add a
-	s/SIMPLE_// that notzed missed. Update to use
-	camel_mime_part_set_content.
-	* e-msg-composer.c (build_message): remove a now-unused variable.
-	Update for camel_mime_part_set_content.
-
-2000-04-26  NotZed  <NotZed@HelixCode.com>
-
-	* e-msg-composer.c (build_message): Use camel_mime_part_set_text()
-	to set the text rather than messing with data wrappers.
-
-	* e-msg-composer-attachment-bar.c (attach_to_multipart): Change
-	for new camel-stream interfaces.
-	(attach_to_multipart): Also set base64 encoding by default.
-
-2000-04-25  Radek Doulik  <rodo@helixcode.com>
-
-	* e-msg-composer.c (create_editor): use uih here
-	(e_msg_composer_construct): create menubar/toolbar before creating
-	editor control
-
-2000-04-23  Dan Winship  <danw@helixcode.com>
-
-	* Makefile.am: build libcomposer static and don't install it.
-
-	* e-msg-composer-attachment-bar.c (attach_to_multipart): This was
-	only half-implemented. Finish it, mostly.
-
-2000-04-22  Dan Winship  <danw@helixcode.com>
-
-	* e-msg-composer.c (e_msg_composer_add_header): new function to
-	make the composer record additional headers it should output.
-	(In-Reply-To), etc.
-	(build_message): output them
-
-2000-04-21  Dan Winship  <danw@helixcode.com>
-
-	* e-msg-composer.c (e_msg_composer_set_headers): 
-	(e_msg_composer_set_body_text): new functions
-	(exit_cb): Connect "Exit" menu item finally.
-
-	* e-msg-composer-hdrs.c: const poisoning
-	(e_msg_composer_hdrs_set_subject): 
-	(e_msg_composer_hdrs_get_subject): new functions
-
-	* e-msg-composer-address-entry.c: const poisoning
-
-2000-04-20  Dan Winship  <danw@helixcode.com>
-
-	* e-msg-composer.c (get_editor_text, set_editor_text): new
-	functions to get and set the contents of the HTML editor via
-	Bonobo::PersistStream.
-	(build_message): use get_editor_text. This works again.
-
-2000-04-17  Dan Winship  <danw@helixcode.com>
-
-	* e-msg-composer.c (build_message): Change
-	camel_mime_message_new_with_session to camel_mime_message_new
-
-2000-03-17  bertrand  <bertrand@helixcode.com>
-
-	* e-msg-composer.c (create_menubar): Pass the composer as the data
-	for the menubar callbacks.
-
-2000-03-12  Matt Loper  <matt@helixcode.com>
-
-	* Makefile.am: Modified to make the composer into a library, to be
-	used by the mail component.
-
-2000-03-07  Ettore Perazzoli  <ettore@helixcode.com>
-
-	* e-msg-composer.c (create_toolbar): Pass the composer as the data
-	for the toolbar callbacks.
-	(e_msg_composer_construct): Connect the "changed" signal of the
-	attachment bar to `attachment_bar_changed()'.
-	(attachment_bar_changed): Renamed to `attachment_bar_changed_cb'.
-
-2000-03-02  Ettore Perazzoli  <ettore@helixcode.com>
-
-	* e-msg-composer.c (e_msg_composer_new): Precondition:
-	gtk_main_level() greater than zero.
-	(e_msg_composer_construct): Likewise.
-	(create_menus): New function.  Set up menus through
-	BonoboUIHandler.
-	(e_msg_composer_construct): Use it.
-
-	* main.c (main): Initialize Bonobo.
-
-	* e-msg-composer.c (init): Initialize `uih' and `editor' to NULL.
-	Do not init `text' and `text_scrolled_window' anymore.
-	(destroy): Unref `uih'.
-	(e_msg_composer_construct): Create a new BonoboUIHandler and put
-	it into `uih'.
-	(create_editor): New helper function.
-	(e_msg_composer_construct): Use it to set up the editor.
-
-	* e-msg-composer.h: New member `uih' in `EMsgComposer'.  Removed
-	members `text', `text_scrolled_window'.  New member `editor'.
-
-	* Makefile.am (INCLUDES): Add `$(BONOBO_GNOME_CFLAGS)'.
-	(evolution_msg_composer_LDADD): Add `$(BONOBO_GNOME_LIBS)'.
-
-	* e-msg-composer.c (glade_connect): Removed.
-	(setup_signals): Removed.
-	(e_msg_composer_construct): Do not use libglade to set the toolbar
-	and menubar up.
-	(destroy): Removed libglade stuff.
-	(init): Likewise.
-
-	* e-msg-composer.h: Removed `menubar_gui', `toolbar_gui',
-	`appbar_gui'.
-
-	* e-msg-composer.glade: Removed.
-
-2000-01-12  bertrand  <bertrand@helixcode.com>
-
-	* Makefile.am (evolution_msg_composer_LDADD): 
-	use $(EXTRA_GNOME_LIBS_THREADS) to link with gthread
-
-1999-11-17  Ettore Perazzoli  <ettore@gnu.org>
-
-	* Makefile.am: New Makefile to compile the message composer
-	executable.
-
-	* main.c: New file.
-
-	* e-msg-composer-hdrs.c (e_msg_composer_hdrs_to_message): Use
-	`CAMEL_RECIPIENT*' macros instead of the old `RECIPIENT*' ones
-	that do not exist anymore.
-
-	* e-msg-composer-address-dialog.c
-	(e_msg_composer_address_dialog_construct): Use `E_GLADEDIR'
-	instead of `E_GUIDIR'.
-	* e-msg-composer-attachment.c (e_msg_composer_attachment_edit):
-	Likewise.
-	* e-msg-composer.c (e_msg_composer_construct): Likewise.
-
-(See `$(top_srcdir)/widgets/ChangeLog' for previous changes to the
-message composer.)
diff --git a/composer/Composer.idl b/composer/Composer.idl
deleted file mode 100644
index 0f2e47e517..0000000000
--- a/composer/Composer.idl
+++ /dev/null
@@ -1,3 +0,0 @@
-/* -*- Mode: IDL; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-
-#include <Evolution-Composer.idl>
diff --git a/composer/Evolution-Composer.idl b/composer/Evolution-Composer.idl
deleted file mode 100644
index 5dc62a3317..0000000000
--- a/composer/Evolution-Composer.idl
+++ /dev/null
@@ -1,141 +0,0 @@
-/* -*- Mode: IDL; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-/*
- * Evolution-Composer.idl: Mail composer interfaces for Evolution
- *
- * Author:
- *   Dan Winship <danw@ximian.com>
- * 
- * (C) 2000 Ximian, Inc.
- */
-
-#include <Bonobo.idl>
-
-module GNOME {
-module Evolution {
-	
-	interface Composer : Bonobo::Unknown {
-		struct Recipient {
-			string name;	/* UTF-8 */
-			string address;
-		};
-		typedef sequence<Recipient> RecipientList;
-
-		typedef sequence<char> AttachmentData;
-
-		enum MultipartType {
-			MIXED,
-			ALTERNATIVE
-		};
-
-		/**
-		 * setHeaders:
-		 * @from: the "From" account or address
-		 * @to: the "To" recipients
-		 * @cc: the "CC" recipients
-		 * @bcc: the "Bcc" recipients
-		 * @subject: the subject of the message
-		 *
-		 * Sets the composer headers. Any of @to, @cc, and
-		 * @bcc may be an empty list, and @subject may be an
-		 * empty string. If @from is empty or invalid, the
-		 * default account will be used. Otherwise is
-		 * specifies an account name or email address to send
-		 * from.
-		 **/
-		void setHeaders (in string from, in RecipientList to,
-				 in RecipientList cc, in RecipientList bcc,
-				 in string subject);
-
-		/**
-		 * setMultipartType:
-		 * @type: a multipart subtype
-		 *
-		 * Sets the kind of multipart message that is being
-		 * created.
-		 *
-		 * If @type is MIXED (the default), setBody()
-		 * will create the body, and attachMIME() and
-		 * attachData() will create attachments.
-		 *
-		 * If @type is ALTERNATIVE, setBody() will create
-		 * text/plain alternative, and each following
-		 * attachMIME() or attachData() call will create
-		 * another alternative.
-		 *
-		 * Other values of @type are not currently supported,
-		 * although "related" probably should be.
-		 **/
-		void setMultipartType (in MultipartType type);
-
-		/**
-		 * setBody:
-		 * @body: the body
-		 * @mime_type: the MIME type of @body
-		 *
-		 * Sets the body of the composer to @body. If
-		 * @mime_type is something other than "text/plain" or
-		 * "text/html", the composer will not be editable
-		 * and it will not attempt to assign a non-UTF8
-		 * character set to the data. However, @mime_type may
-		 * include parameters in that case.
-		 **/
-		void setBody (in string body, in string mime_type);
-
-		/**
-		 * attachMIME:
-		 * @data: the attachment data
-		 *
-		 * This adds an attachment to the composer. @data
-		 * should be a fully-formed MIME body part.
-		 **/
-		exception CouldNotParse {};
-		void attachMIME (in string data)
-			raises (CouldNotParse);
-
-		/**
-		 * attachData:
-		 * @content_type: the Content-Type header
-		 * @filename: the suggested filename, or ""
-		 * @description: a description of the data, or ""
-		 * @show_inline: whether the attachment should be
-		 * displayed inline or not.
-		 * @data: the raw attachment data
-		 *
-		 * This adds @data as an attachment, using the provided
-		 * information to generate MIME headers. @content_type
-		 * may contain just a MIME content type, or it may
-		 * contain a complete Content-Type header. @filename
-		 * is a filename for the Content-Disposition header
-		 * @description (if not "") provides the
-		 * Content-Description, and @show_inline determines if the
-		 * Content-Disposition is "inline" or "attachment".
-		 *
-		 * If you need to specify headers or values other than
-		 * what this function can do, you will need to generate
-		 * all of the MIME headers yourself and use
-		 * add_attachment ().
-		 **/
-		void attachData (in string content_type,
-				 in string filename,
-				 in string description,
-				 in boolean show_inline,
-				 in AttachmentData data);
-
-		/**
-		 * show:
-		 *
-		 * Shows the composer and lets the user edit things
-		 * and send the message.
-		 **/
-		void show ();
-
-
-		/**
-		 * send:
-		 *
-		 * Send the message without showing the user the composer
-		 **/
-		void send ();
-	};
-};
-};
diff --git a/composer/Makefile.am b/composer/Makefile.am
deleted file mode 100644
index 4d536dc95e..0000000000
--- a/composer/Makefile.am
+++ /dev/null
@@ -1,93 +0,0 @@
-## CORBA stuff
-
-IDLS =				\
-	Evolution-Composer.idl	\
-	Composer.idl
-
-IDL_GENERATED =			\
-	Composer.h		\
-	Composer-common.c	\
-	Composer-skels.c	\
-	Composer-stubs.c
-
-HTML_EDITOR_GENERATED =		\
-	Editor.h		\
-	Editor-common.c	\
-	Editor-skels.c	\
-	Editor-stubs.c
-
-$(IDL_GENERATED): $(IDLS)
-	$(ORBIT_IDL) -I $(srcdir) -I $(datadir)/idl $(IDL_INCLUDES) \
-		$(srcdir)/Composer.idl
-
-Editor-commmon.c: $(GTKHTML_DATADIR)/Editor.idl
-
-$(HTML_EDITOR_GENERATED): $(GTKHTML_DATADIR)/Editor.idl
-	$(ORBIT_IDL) -I $(srcdir) $(IDL_INCLUDES) -I $(GTKHTML_DATADIR)/gtkhtml $(GTKHTML_DATADIR)/Editor.idl
-
-##
-
-error_DATA = mail-composer-errors.xml
-error_i18n = $(error_DATA:.xml=.xml.h)
-errordir = $(privdatadir)/errors
-%.xml.h: %.xml
-	$(top_builddir)/e-util/e-error-tool $^
-
-idl_DATA = $(IDLS)
-
-glade_DATA =					\
-	e-msg-composer-attachment.glade
-
-noinst_LTLIBRARIES = libcomposer.la
-
-INCLUDES =								\
-	-I$(top_srcdir)							\
-	-I$(top_builddir)						\
-	-I$(top_srcdir)/widgets						\
-	-I$(top_builddir)/widgets					\
-	-I$(top_srcdir)/widgets/misc					\
-	-I$(top_builddir)/widgets/misc					\
-	-I$(top_srcdir)/camel					 	\
-	-I$(top_builddir)/camel					 	\
-	-I$(top_srcdir)/addressbook/backend				\
-	-I$(top_builddir)/addressbook/backend				\
-	-I$(top_builddir)/shell						\
-	-I$(top_srcdir)/shell						\
-	-DEVOLUTION_DATADIR=\"$(datadir)\"				\
-	-DEVOLUTION_IMAGESDIR=\"$(imagesdir)\"                          \
-	-DEVOLUTION_UIDIR=\"$(evolutionuidir)\"				\
-	-DEVOLUTION_GLADEDIR=\"$(gladedir)\"				\
-	-DPREFIX=\"$(prefix)\"						\
-	-DG_LOG_DOMAIN=\"composer\"					\
-	$(EVOLUTION_MAIL_CFLAGS)
-
-libcomposer_la_SOURCES = 			\
-	$(IDL_GENERATED)			\
-	$(HTML_EDITOR_GENERATED)		\
-	e-msg-composer-attachment-bar.c		\
-	e-msg-composer-attachment-bar.h		\
-	e-msg-composer-attachment.c		\
-	e-msg-composer-attachment.h		\
-	e-msg-composer-hdrs.c			\
-	e-msg-composer-hdrs.h			\
-	e-msg-composer-select-file.c		\
-	e-msg-composer-select-file.h		\
-	e-msg-composer.c			\
-	e-msg-composer.h			\
-	evolution-composer.c			\
-	evolution-composer.h			\
-	listener.c				\
-	listener.h
-
-EXTRA_DIST =					\
-	$(error_DATA)				\
-	$(error_i18n)				\
-	$(glade_DATA)				\
-	$(IDLS)					\
-	ChangeLog.pre-1-4
-
-BUILT_SOURCES = $(IDL_GENERATED) $(HTML_EDITOR_GENERATED) $(error_i18n)
-CLEANFILES = $(BUILT_SOURCES)
-
-dist-hook:
-	cd $(distdir); rm -f $(BUILT_SOURCES)
diff --git a/composer/bad-icon.xpm b/composer/bad-icon.xpm
deleted file mode 100644
index 0a9cac23cd..0000000000
--- a/composer/bad-icon.xpm
+++ /dev/null
@@ -1,53 +0,0 @@
-/* XPM */
-static char * bad_icon_xpm[] = {
-"48 48 2 1",
-" 	g None",
-".	g #000000",
-"................................................",
-".                                              .",
-".                                              .",
-".                                              .",
-".                                              .",
-".                                              .",
-".                                              .",
-".                                              .",
-".                                              .",
-".        .                              .      .",
-".         .                            .       .",
-".          .                          .        .",
-".           .                        .         .",
-".            .                      .          .",
-".             .                    .           .",
-".              .                  .            .",
-".               .                .             .",
-".                .              .              .",
-".                 .            .               .",
-".                  .          .                .",
-".                   .        .                 .",
-".                    .      .                  .",
-".                     .    .                   .",
-".                      .  .                    .",
-".                       ..                     .",
-".                       ..                     .",
-".                      .  .                    .",
-".                     .    .                   .",
-".                    .      .                  .",
-".                   .        .                 .",
-".                  .          .                .",
-".                 .            .               .",
-".                .              .              .",
-".               .                .             .",
-".              .                  .            .",
-".             .                    .           .",
-".            .                      .          .",
-".           .                        .         .",
-".          .                          .        .",
-".         .                            .       .",
-".        .                              .      .",
-".                                              .",
-".                                              .",
-".                                              .",
-".                                              .",
-".                                              .",
-".                                              .",
-"................................................"};
diff --git a/composer/e-msg-composer-attachment-bar.c b/composer/e-msg-composer-attachment-bar.c
deleted file mode 100644
index 8a7b4357f4..0000000000
--- a/composer/e-msg-composer-attachment-bar.c
+++ /dev/null
@@ -1,852 +0,0 @@
-/* -*- Mode: C; indent-tabs-mode: t; c-basic-offset: 8; tab-width: 8 -*- */
-/*
- *  Authors: Ettore Perazzoli <ettore@ximian.com>
- *           Jeffrey Stedfast <fejj@ximian.com>
- *
- *  Copyright 1999-2002 Ximian, Inc. (www.ximian.com)
- *
- *  This program is free software; you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation; either version 2 of the License, or
- *  (at your option) any later version.
- *
- *  This program is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with this program; if not, write to the Free Software
- *  Foundation, Inc., 59 Temple Street #330, Boston, MA 02111-1307, USA.
- *
- */
-
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
-
-#include <string.h>
-#include <gtk/gtk.h>
-#include <glade/glade.h>
-#include <gconf/gconf.h>
-#include <gconf/gconf-client.h>
-#include <gdk/gdkkeysyms.h>
-#include <libgnomevfs/gnome-vfs-mime-handlers.h>
-#include <libgnome/gnome-i18n.h>
-
-#include "e-msg-composer.h"
-#include "e-msg-composer-select-file.h"
-#include "e-msg-composer-attachment.h"
-#include "e-msg-composer-attachment-bar.h"
-
-#include <libedataserver/e-iconv.h>
-
-#include <camel/camel-data-wrapper.h>
-#include <camel/camel-stream-fs.h>
-#include <camel/camel-stream-null.h>
-#include <camel/camel-stream-mem.h>
-#include <camel/camel-stream-filter.h>
-#include <camel/camel-mime-filter-bestenc.h>
-#include <camel/camel-mime-part.h>
-
-#include "e-util/e-gui-utils.h"
-#include "e-util/e-icon-factory.h"
-#include "widgets/misc/e-error.h"
-#include "mail/em-popup.h"
-
-#define ICON_WIDTH 64
-#define ICON_SEPARATORS " /-_"
-#define ICON_SPACING 2
-#define ICON_ROW_SPACING ICON_SPACING
-#define ICON_COL_SPACING ICON_SPACING
-#define ICON_BORDER 2
-#define ICON_TEXT_SPACING 2
-
-
-static GnomeIconListClass *parent_class = NULL;
-
-struct _EMsgComposerAttachmentBarPrivate {
-	GtkWidget *attach;	/* attachment file dialogue, if active */
-
-	GList *attachments;
-	guint num_attachments;
-};
-
-
-enum {
-	CHANGED,
-	LAST_SIGNAL
-};
-
-static guint signals[LAST_SIGNAL] = { 0 };
-
-
-static void update (EMsgComposerAttachmentBar *bar);
-
-
-static char *
-size_to_string (gulong size)
-{
-	char *size_string;
-	
-	/* FIXME: The following should probably go into a separate module, as
-           we might have to do the same thing in other places as well.  Also,
-	   I am not sure this will be OK for all the languages.  */
-	
-	if (size < 1e3L) {
-		size_string = NULL;
-	} else {
-		gdouble displayed_size;
-		
-		if (size < 1e6L) {
-			displayed_size = (gdouble) size / 1.0e3;
-			size_string = g_strdup_printf (_("%.0fK"), displayed_size);
-		} else if (size < 1e9L) {
-			displayed_size = (gdouble) size / 1.0e6;
-			size_string = g_strdup_printf (_("%.0fM"), displayed_size);
-		} else {
-			displayed_size = (gdouble) size / 1.0e9;
-			size_string = g_strdup_printf (_("%.0fG"), displayed_size);
-		}
-	}
-	
-	return size_string;
-}
-
-/* Attachment handling functions.  */
-
-static void
-free_attachment_list (EMsgComposerAttachmentBar *bar)
-{
-	EMsgComposerAttachmentBarPrivate *priv;
-	GList *p;
-	
-	priv = bar->priv;
-	
-	for (p = priv->attachments; p != NULL; p = p->next)
-		g_object_unref (p->data);
-	
-	priv->attachments = NULL;
-}
-
-static void
-attachment_changed_cb (EMsgComposerAttachment *attachment,
-		       gpointer data)
-{
-	update (E_MSG_COMPOSER_ATTACHMENT_BAR (data));
-}
-
-static void
-add_common (EMsgComposerAttachmentBar *bar,
-	    EMsgComposerAttachment *attachment)
-{
-	g_return_if_fail (attachment != NULL);
-	
-	g_signal_connect (attachment, "changed",
-			  G_CALLBACK (attachment_changed_cb),
-			  bar);
-	
-	bar->priv->attachments = g_list_append (bar->priv->attachments,
-						attachment);
-	bar->priv->num_attachments++;
-	
-	update (bar);
-	
-	g_signal_emit (bar, signals[CHANGED], 0);
-}
-
-static void
-add_from_mime_part (EMsgComposerAttachmentBar *bar,
-		    CamelMimePart *part)
-{
-	add_common (bar, e_msg_composer_attachment_new_from_mime_part (part));
-}
-
-static void
-add_from_file (EMsgComposerAttachmentBar *bar,
-	       const char *file_name,
-	       const char *disposition)
-{
-	EMsgComposerAttachment *attachment;
-	CamelException ex;
-	
-	camel_exception_init (&ex);
-	attachment = e_msg_composer_attachment_new (file_name, disposition, &ex);
-	if (attachment) {
-		add_common (bar, attachment);
-	} else {
-		e_error_run((GtkWindow *)gtk_widget_get_toplevel((GtkWidget *)bar), "mail-composer:no-attach",
-			    file_name, camel_exception_get_description(&ex), NULL);
-		camel_exception_clear (&ex);
-	}
-}
-
-static void
-remove_attachment (EMsgComposerAttachmentBar *bar,
-		   EMsgComposerAttachment *attachment)
-{
-	g_return_if_fail (E_IS_MSG_COMPOSER_ATTACHMENT_BAR (bar));
-	g_return_if_fail (g_list_find (bar->priv->attachments, attachment) != NULL);
-
-	bar->priv->attachments = g_list_remove (bar->priv->attachments,
-						attachment);
-	bar->priv->num_attachments--;
-	if (attachment->editor_gui != NULL) {
-		GtkWidget *dialog = glade_xml_get_widget (attachment->editor_gui, "dialog");
-		g_signal_emit_by_name (dialog, "response", GTK_RESPONSE_CLOSE);
-	}
-	
-	g_object_unref(attachment);
-	
-	g_signal_emit (bar, signals[CHANGED], 0);
-}
-
-
-/* Icon list contents handling.  */
-
-static void
-update (EMsgComposerAttachmentBar *bar)
-{
-	EMsgComposerAttachmentBarPrivate *priv;
-	GnomeIconList *icon_list;
-	GList *p;
-	
-	priv = bar->priv;
-	icon_list = GNOME_ICON_LIST (bar);
-	
-	gnome_icon_list_freeze (icon_list);
-	
-	gnome_icon_list_clear (icon_list);
-	
-	/* FIXME could be faster, but we don't care.  */
-	for (p = priv->attachments; p != NULL; p = p->next) {
-		EMsgComposerAttachment *attachment;
-		CamelContentType *content_type;
-		char *size_string, *label;
-		GdkPixbuf *pixbuf;
-		const char *desc;
-		
-		attachment = p->data;
-		content_type = camel_mime_part_get_content_type (attachment->body);
-		/* Get the image out of the attachment 
-		   and create a thumbnail for it */
-		pixbuf = attachment->pixbuf_cache;
-		if (pixbuf) {
-			g_object_ref(pixbuf);
-		} else if (camel_content_type_is(content_type, "image", "*")) {
-			CamelDataWrapper *wrapper;
-			CamelStreamMem *mstream;
-			GdkPixbufLoader *loader;
-			gboolean error = TRUE;
-			
-			wrapper = camel_medium_get_content_object (CAMEL_MEDIUM (attachment->body));
-			mstream = (CamelStreamMem *) camel_stream_mem_new ();
-			
-			camel_data_wrapper_decode_to_stream (wrapper, (CamelStream *) mstream);
-			
-			/* Stream image into pixbuf loader */
-			loader = gdk_pixbuf_loader_new ();
-			error = !gdk_pixbuf_loader_write (loader, mstream->buffer->data, mstream->buffer->len, NULL);
-			gdk_pixbuf_loader_close (loader, NULL);
-			
-			if (!error) {
-				int ratio, width, height;
-				
-				/* Shrink pixbuf */
-				pixbuf = gdk_pixbuf_loader_get_pixbuf (loader);
-				width = gdk_pixbuf_get_width (pixbuf);
-				height = gdk_pixbuf_get_height (pixbuf);
-				if (width >= height) {
-					if (width > 48) {
-						ratio = width / 48;
-						width = 48;
-						height = height / ratio;
-					}
-				} else {
-					if (height > 48) {
-						ratio = height / 48;
-						height = 48;
-						width = width / ratio;
-					}
-				}
-				
-				attachment->pixbuf_cache = gdk_pixbuf_scale_simple 
-					(pixbuf,
-					 width,
-					 height,
-					 GDK_INTERP_BILINEAR);
-				pixbuf = attachment->pixbuf_cache;
-				g_object_ref(pixbuf);
-			} else {
-				pixbuf = NULL;
-				g_warning ("GdkPixbufLoader Error");
-			}
-			
-			/* Destroy everything */
-			g_object_unref (loader);
-			camel_object_unref (mstream);
-		}
-		
-		desc = camel_mime_part_get_description (attachment->body);
-		if (!desc || *desc == '\0')
-			desc = camel_mime_part_get_filename (attachment->body);
-		
-		if (!desc)
-			desc = _("attachment");
-		
-		if (attachment->size
-		    && (size_string = size_to_string (attachment->size))) {
-			label = g_strdup_printf ("%s (%s)", desc, size_string);
-			g_free (size_string);
-		} else
-			label = g_strdup (desc);
-		
-		if (pixbuf == NULL) {
-			char *mime_type;
-			
-			mime_type = camel_content_type_simple (content_type);
-			pixbuf = e_icon_for_mime_type (mime_type, 48);
-			if (pixbuf == NULL) {
-				g_warning("cannot find icon for mime type %s (installation problem?)", mime_type);
-				/* stock_attach would be better, but its fugly scaled up */
-				pixbuf = e_icon_factory_get_icon("stock_unknown", E_ICON_SIZE_DIALOG);
-			}
-			g_free (mime_type);
-		}
-
-		if (pixbuf) {
-			gnome_icon_list_append_pixbuf (icon_list, pixbuf, NULL, label);
-			g_object_unref(pixbuf);
-		}
-		
-		g_free (label);
-	}
-	
-	gnome_icon_list_thaw (icon_list);
-}
-
-static void
-remove_selected (EMsgComposerAttachmentBar *bar)
-{
-	GnomeIconList *icon_list;
-	EMsgComposerAttachment *attachment;
-	GList *attachment_list, *p;
-	int num = 0, left, dlen;
-	
-	icon_list = GNOME_ICON_LIST (bar);
-	
-	/* Weee!  I am especially proud of this piece of cheesy code: it is
-           truly awful.  But unless one attaches a huge number of files, it
-           will not be as greedy as intended.  FIXME of course.  */
-	
-	attachment_list = NULL;
-	p = gnome_icon_list_get_selection (icon_list);
-	dlen = g_list_length (p);
-	for ( ; p != NULL; p = p->next) {
-		num = GPOINTER_TO_INT (p->data);
-		attachment = E_MSG_COMPOSER_ATTACHMENT (g_list_nth_data (bar->priv->attachments, num));
-
-		/* We need to check if there are duplicated index in the return list of 
-		   gnome_icon_list_get_selection() because of gnome bugzilla bug #122356.
-		   FIXME in the future. */
-
-		if (g_list_find (attachment_list, attachment) == NULL) {
-			attachment_list = g_list_prepend (attachment_list, attachment);
-		}
-	}
-	
-	for (p = attachment_list; p != NULL; p = p->next)
-		remove_attachment (bar, E_MSG_COMPOSER_ATTACHMENT (p->data));
-	
-	g_list_free (attachment_list);
-	
-	update (bar);
-	
-	left = gnome_icon_list_get_num_icons (icon_list);
-	num = num - dlen + 1;
-	if (left > 0)
-		gnome_icon_list_focus_icon (icon_list, left > num ? num : left - 1);
-}
-
-static void
-edit_selected (EMsgComposerAttachmentBar *bar)
-{
-	GnomeIconList *icon_list;
-	GList *selection, *attach;
-	int num;
-	
-	icon_list = GNOME_ICON_LIST (bar);
-	
-	selection = gnome_icon_list_get_selection (icon_list);
-	if (selection) {
-		num = GPOINTER_TO_INT (selection->data);
-		attach = g_list_nth (bar->priv->attachments, num);
-		if (attach)
-			e_msg_composer_attachment_edit ((EMsgComposerAttachment *)attach->data, GTK_WIDGET (bar));
-	}
-}
-
-/* "Attach" dialog.  */
-static void
-add_from_user_response(EMsgComposer *composer, GSList *names, int is_inline)
-{
-	while (names) {
-		add_from_file((EMsgComposerAttachmentBar *)composer->attachment_bar, names->data, is_inline ? "inline" : "attachment");
-		names = g_slist_next(names);
-	}
-}
-
-static void
-add_from_user (EMsgComposerAttachmentBar *bar)
-{
-	EMsgComposer *composer;
-	
-	composer = E_MSG_COMPOSER (gtk_widget_get_toplevel (GTK_WIDGET (bar)));
-	e_msg_composer_select_file_attachments(composer, &bar->priv->attach, add_from_user_response);
-}
-
-
-/* Callbacks.  */
-
-static void
-emcab_add(EPopup *ep, EPopupItem *item, void *data)
-{
-	EMsgComposerAttachmentBar *bar = data;
-
-	add_from_user(bar);
-}
-
-static void
-emcab_properties(EPopup *ep, EPopupItem *item, void *data)
-{
-	EMsgComposerAttachmentBar *bar = data;
-	
-	edit_selected(bar);
-}
-
-static void
-emcab_remove(EPopup *ep, EPopupItem *item, void *data)
-{
-	EMsgComposerAttachmentBar *bar = data;
-
-	remove_selected(bar);
-}
-
-/* Popup menu handling.  */
-static EPopupItem emcab_popups[] = {
-	{ E_POPUP_ITEM, "10.attach", N_("_Remove"), emcab_remove, NULL, GTK_STOCK_REMOVE, EM_POPUP_ATTACHMENTS_MANY },
-	{ E_POPUP_ITEM, "20.attach", N_("_Properties"), emcab_properties, NULL, GTK_STOCK_PROPERTIES, EM_POPUP_ATTACHMENTS_ONE },
-	{ E_POPUP_BAR, "30.attach.00", NULL, NULL, NULL, NULL, EM_POPUP_ATTACHMENTS_MANY|EM_POPUP_ATTACHMENTS_ONE },
-	{ E_POPUP_ITEM, "30.attach.01", N_("_Add attachment..."), emcab_add, NULL, GTK_STOCK_ADD, 0 },
-};
-
-static void
-emcab_popup_position(GtkMenu *menu, int *x, int *y, gboolean *push_in, gpointer user_data)
-{
-	EMsgComposerAttachmentBar *bar = user_data;
-	GnomeIconList *icon_list = user_data;
-	GList *selection;
-	GnomeCanvasPixbuf *image;
-	
-	gdk_window_get_origin (((GtkWidget*) bar)->window, x, y);
-	
-	selection = gnome_icon_list_get_selection (icon_list);
-	if (selection == NULL)
-		return;
-	
-	image = gnome_icon_list_get_icon_pixbuf_item (icon_list, (gint)selection->data);
-	if (image == NULL)
-		return;
-	
-	/* Put menu to the center of icon. */
-	*x += (int)(image->item.x1 + image->item.x2) / 2;
-	*y += (int)(image->item.y1 + image->item.y2) / 2;
-}
-
-static void
-emcab_popups_free(EPopup *ep, GSList *l, void *data)
-{
-	g_slist_free(l);
-}
-
-/* if id != -1, then use it as an index for target of the popup */
-static void
-emcab_popup(EMsgComposerAttachmentBar *bar, GdkEventButton *event, int id)
-{
-	GList *p;
-	GSList *attachments = NULL, *menus = NULL;
-	int i;
-	EMPopup *emp;
-	EMPopupTargetAttachments *t;
-	GtkMenu *menu;
-	EMsgComposerAttachment *attachment;
-
-	/* We need to check if there are duplicated index in the return list of 
-	   gnome_icon_list_get_selection() because of gnome bugzilla bug #122356.
-	   FIXME in the future. */
-
-	if (id == -1
-	    || (attachment = g_list_nth_data(bar->priv->attachments, id)) == NULL) {
-		p = gnome_icon_list_get_selection((GnomeIconList *)bar);
-		for ( ; p != NULL; p = p->next) {
-			int num = GPOINTER_TO_INT(p->data);
-			EMsgComposerAttachment *attachment = g_list_nth_data(bar->priv->attachments, num);
-			
-			if (attachment && g_slist_find(attachments, attachment) == NULL) {
-				g_object_ref(attachment);
-				attachments = g_slist_prepend(attachments, attachment);
-			}
-		}
-		attachments = g_slist_reverse(attachments);
-	} else {
-		g_object_ref(attachment);
-		attachments = g_slist_prepend(attachments, attachment);
-	}
-
-	for (i=0;i<sizeof(emcab_popups)/sizeof(emcab_popups[0]);i++)
-		menus = g_slist_prepend(menus, &emcab_popups[i]);
-
-	/** @HookPoint-EMPopup: Composer Attachment Bar Context Menu
-	 * @Id: org.gnome.evolution.mail.composer.attachmentbar.popup
-	 * @Class: org.gnome.evolution.mail.popup:1.0
-	 * @Target: EMPopupTargetAttachments
-	 *
-	 * This is the context menu on the composer attachment bar.
-	 */
-	emp = em_popup_new("org.gnome.evolution.mail.composer.attachmentbar.popup");
-	e_popup_add_items((EPopup *)emp, menus, NULL,emcab_popups_free, bar);
-	t = em_popup_target_new_attachments(emp, attachments);
-	t->target.widget = (GtkWidget *)bar;
-	menu = e_popup_create_menu_once((EPopup *)emp, (EPopupTarget *)t, 0);
-
-	if (event == NULL)
-		gtk_menu_popup(menu, NULL, NULL, emcab_popup_position, bar, 0, gtk_get_current_event_time());
-	else
-		gtk_menu_popup(menu, NULL, NULL, NULL, NULL, event->button, event->time);
-}
-
-/* GtkObject methods.  */
-
-static void
-destroy (GtkObject *object)
-{
-	EMsgComposerAttachmentBar *bar;
-	
-	bar = E_MSG_COMPOSER_ATTACHMENT_BAR (object);
-	
-	if (bar->priv) {
-		free_attachment_list (bar);
-
-		if (bar->priv->attach)
-			gtk_widget_destroy(bar->priv->attach);
-
-		g_free (bar->priv);
-		bar->priv = NULL;
-	}
-	
-	if (GTK_OBJECT_CLASS (parent_class)->destroy != NULL)
-		(* GTK_OBJECT_CLASS (parent_class)->destroy) (object);
-}
-
-/* GtkWidget methods.  */
-
-static gboolean 
-popup_menu_event (GtkWidget *widget)
-{
-	emcab_popup((EMsgComposerAttachmentBar *)widget, NULL, -1);
-	return TRUE;
-}
-
-
-static int
-button_press_event (GtkWidget *widget, GdkEventButton *event)
-{
-	EMsgComposerAttachmentBar *bar = (EMsgComposerAttachmentBar *)widget;
-	GnomeIconList *icon_list = GNOME_ICON_LIST(widget);
-	int icon_number;
-	
-	if (event->button != 3)
-		return GTK_WIDGET_CLASS (parent_class)->button_press_event (widget, event);
-	
-	icon_number = gnome_icon_list_get_icon_at (icon_list, event->x, event->y);
-	if (icon_number >= 0) {
-		gnome_icon_list_unselect_all(icon_list);
-		gnome_icon_list_select_icon (icon_list, icon_number);
-	}
-
-	emcab_popup(bar, event, icon_number);
-	
-	return TRUE;
-}
-
-static gint
-key_press_event(GtkWidget *widget, GdkEventKey *event)
-{
-        EMsgComposerAttachmentBar *bar = E_MSG_COMPOSER_ATTACHMENT_BAR(widget);
-
-        if (event->keyval == GDK_Delete) {
-                remove_selected (bar);
-                return TRUE;
-        }
-                                                                                
-        return GTK_WIDGET_CLASS (parent_class)->key_press_event (widget, event);
-}
-
-
-/* Initialization.  */
-
-static void
-class_init (EMsgComposerAttachmentBarClass *klass)
-{
-	GtkObjectClass *object_class;
-	GtkWidgetClass *widget_class;
-	GnomeIconListClass *icon_list_class;
-	
-	object_class = GTK_OBJECT_CLASS (klass);
-	widget_class = GTK_WIDGET_CLASS (klass);
-	icon_list_class = GNOME_ICON_LIST_CLASS (klass);
-	
-	parent_class = g_type_class_ref (gnome_icon_list_get_type ());
-	
-	object_class->destroy = destroy;
-	
-	widget_class->button_press_event = button_press_event;
-	widget_class->popup_menu = popup_menu_event;
-	widget_class->key_press_event = key_press_event;
-
-	
-	/* Setup signals.  */
-	
-	signals[CHANGED] =
-		g_signal_new ("changed",
-			      E_TYPE_MSG_COMPOSER_ATTACHMENT_BAR,
-			      G_SIGNAL_RUN_LAST,
-			      G_STRUCT_OFFSET (EMsgComposerAttachmentBarClass, changed),
-			      NULL, NULL,
-			      g_cclosure_marshal_VOID__VOID,
-			      G_TYPE_NONE, 0);
-}
-
-static void
-init (EMsgComposerAttachmentBar *bar)
-{
-	EMsgComposerAttachmentBarPrivate *priv;
-	
-	priv = g_new (EMsgComposerAttachmentBarPrivate, 1);
-	
-	priv->attach = NULL;
-	priv->attachments = NULL;
-	priv->num_attachments = 0;
-	
-	bar->priv = priv;
-}
-
-
-GType
-e_msg_composer_attachment_bar_get_type (void)
-{
-	static GType type = 0;
-	
-	if (type == 0) {
-		static const GTypeInfo info = {
-			sizeof (EMsgComposerAttachmentBarClass),
-			NULL, NULL,
-			(GClassInitFunc) class_init,
-			NULL, NULL,
-			sizeof (EMsgComposerAttachmentBar),
-			0,
-			(GInstanceInitFunc) init,
-		};
-		
-		type = g_type_register_static (GNOME_TYPE_ICON_LIST, "EMsgComposerAttachmentBar", &info, 0);
-	}
-	
-	return type;
-}
-
-GtkWidget *
-e_msg_composer_attachment_bar_new (GtkAdjustment *adj)
-{
-	EMsgComposerAttachmentBar *new;
-	GnomeIconList *icon_list;
-	int width, height, icon_width, window_height;
-	PangoFontMetrics *metrics;
-	PangoContext *context;
-	
-	new = g_object_new (e_msg_composer_attachment_bar_get_type (), NULL);
-	
-	icon_list = GNOME_ICON_LIST (new);
-	
-	context = gtk_widget_get_pango_context ((GtkWidget *) new);
-	metrics = pango_context_get_metrics (context, ((GtkWidget *) new)->style->font_desc, pango_context_get_language (context));
-	width = PANGO_PIXELS (pango_font_metrics_get_approximate_char_width (metrics)) * 15;
-	/* This should be *2, but the icon list creates too much space above ... */
-	height = PANGO_PIXELS (pango_font_metrics_get_ascent (metrics) + pango_font_metrics_get_descent (metrics)) * 3;
-	pango_font_metrics_unref (metrics);
-	
-	icon_width = ICON_WIDTH + ICON_SPACING + ICON_BORDER + ICON_TEXT_SPACING;
-	icon_width = MAX (icon_width, width);
-	
-	gnome_icon_list_construct (icon_list, icon_width, adj, 0);
-	
-	window_height = ICON_WIDTH + ICON_SPACING + ICON_BORDER + ICON_TEXT_SPACING + height;
-	gtk_widget_set_size_request (GTK_WIDGET (new), icon_width * 4, window_height);
-	
-	gnome_icon_list_set_separators (icon_list, ICON_SEPARATORS);
-	gnome_icon_list_set_row_spacing (icon_list, ICON_ROW_SPACING);
-	gnome_icon_list_set_col_spacing (icon_list, ICON_COL_SPACING);
-	gnome_icon_list_set_icon_border (icon_list, ICON_BORDER);
-	gnome_icon_list_set_text_spacing (icon_list, ICON_TEXT_SPACING);
-	gnome_icon_list_set_selection_mode (icon_list, GTK_SELECTION_MULTIPLE);
-
-	atk_object_set_name (gtk_widget_get_accessible (GTK_WIDGET (new)), 
-			_("Attachment Bar"));
-	
-	return GTK_WIDGET (new);
-}
-
-static char *
-get_default_charset (void)
-{
-	GConfClient *gconf;
-	const char *locale;
-	char *charset;
-	
-	gconf = gconf_client_get_default ();
-	charset = gconf_client_get_string (gconf, "/apps/evolution/mail/composer/charset", NULL);
-	
-	if (!charset || charset[0] == '\0') {
-		g_free (charset);
-		charset = gconf_client_get_string (gconf, "/apps/evolution/mail/format/charset", NULL);
-		if (charset && charset[0] == '\0') {
-			g_free (charset);
-			charset = NULL;
-		}
-	}
-	
-	g_object_unref (gconf);
-	
-	if (!charset && (locale = e_iconv_locale_charset ()))
-		charset = g_strdup (locale);
-	
-	return charset ? charset : g_strdup ("us-ascii");
-}
-
-static void
-attach_to_multipart (CamelMultipart *multipart,
-		     EMsgComposerAttachment *attachment,
-		     const char *default_charset)
-{
-	CamelContentType *content_type;
-	CamelDataWrapper *content;
-	
-	content_type = camel_mime_part_get_content_type (attachment->body);
-	content = camel_medium_get_content_object (CAMEL_MEDIUM (attachment->body));
-	
-	if (!CAMEL_IS_MULTIPART (content)) {
-		if (camel_content_type_is (content_type, "text", "*")) {
-			CamelTransferEncoding encoding;
-			CamelStreamFilter *filter_stream;
-			CamelMimeFilterBestenc *bestenc;
-			CamelStream *stream;
-			const char *charset;
-			char *buf = NULL;
-			char *type;
-			
-			charset = camel_content_type_param (content_type, "charset");
-			
-			stream = camel_stream_null_new ();
-			filter_stream = camel_stream_filter_new_with_stream (stream);
-			bestenc = camel_mime_filter_bestenc_new (CAMEL_BESTENC_GET_ENCODING);
-			camel_stream_filter_add (filter_stream, CAMEL_MIME_FILTER (bestenc));
-			camel_object_unref (stream);
-			
-			camel_data_wrapper_decode_to_stream (content, CAMEL_STREAM (filter_stream));
-			camel_object_unref (filter_stream);
-			
-			encoding = camel_mime_filter_bestenc_get_best_encoding (bestenc, CAMEL_BESTENC_8BIT);
-			camel_mime_part_set_encoding (attachment->body, encoding);
-			
-			if (encoding == CAMEL_TRANSFER_ENCODING_7BIT) {
-				/* the text fits within us-ascii so this is safe */
-				/* FIXME: check that this isn't iso-2022-jp? */
-				default_charset = "us-ascii";
-			} else if (!charset) {
-				if (!default_charset)
-					default_charset = buf = get_default_charset ();
-				
-				/* FIXME: We should really check that this fits within the
-                                   default_charset and if not find one that does and/or
-				   allow the user to specify? */
-			}
-			
-			if (!charset) {
-				/* looks kinda nasty, but this is how ya have to do it */
-				camel_content_type_set_param (content_type, "charset", default_charset);
-				type = camel_content_type_format (content_type);
-				camel_mime_part_set_content_type (attachment->body, type);
-				g_free (type);
-				g_free (buf);
-			}
-			
-			camel_object_unref (bestenc);
-		} else if (!CAMEL_IS_MIME_MESSAGE (content)) {
-			camel_mime_part_set_encoding (attachment->body, CAMEL_TRANSFER_ENCODING_BASE64);
-		}
-	}
-	
-	camel_multipart_add_part (multipart, attachment->body);
-}
-
-void
-e_msg_composer_attachment_bar_to_multipart (EMsgComposerAttachmentBar *bar,
-					    CamelMultipart *multipart,
-					    const char *default_charset)
-{
-	EMsgComposerAttachmentBarPrivate *priv;
-	GList *p;
-	
-	g_return_if_fail (E_IS_MSG_COMPOSER_ATTACHMENT_BAR (bar));
-	g_return_if_fail (CAMEL_IS_MULTIPART (multipart));
-	
-	priv = bar->priv;
-	
-	for (p = priv->attachments; p != NULL; p = p->next) {
-		EMsgComposerAttachment *attachment;
-		
-		attachment = E_MSG_COMPOSER_ATTACHMENT (p->data);
-		attach_to_multipart (multipart, attachment, default_charset);
-	}
-}
-
-
-guint
-e_msg_composer_attachment_bar_get_num_attachments (EMsgComposerAttachmentBar *bar)
-{
-	g_return_val_if_fail (bar != NULL, 0);
-	g_return_val_if_fail (E_IS_MSG_COMPOSER_ATTACHMENT_BAR (bar), 0);
-	
-	return bar->priv->num_attachments;
-}
-
-
-void
-e_msg_composer_attachment_bar_attach (EMsgComposerAttachmentBar *bar,
-				      const gchar *file_name)
-{
-	g_return_if_fail (E_IS_MSG_COMPOSER_ATTACHMENT_BAR (bar));
-	
-	if (file_name == NULL)
-		add_from_user (bar);
-	else
-		add_from_file (bar, file_name, "attachment");
-}
-
-void
-e_msg_composer_attachment_bar_attach_mime_part (EMsgComposerAttachmentBar *bar,
-						CamelMimePart *part)
-{
-	g_return_if_fail (E_IS_MSG_COMPOSER_ATTACHMENT_BAR (bar));
-	
-	add_from_mime_part (bar, part);
-}
diff --git a/composer/e-msg-composer-attachment-bar.h b/composer/e-msg-composer-attachment-bar.h
deleted file mode 100644
index a43b466633..0000000000
--- a/composer/e-msg-composer-attachment-bar.h
+++ /dev/null
@@ -1,77 +0,0 @@
-/* -*- Mode: C; indent-tabs-mode: t; c-basic-offset: 8; tab-width: 8 -*- */
-/* msg-composer-attachment-bar.h
- *
- * Copyright (C) 1999  Ximian, Inc.
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of version 2 of the GNU General Public
- * published by the Free Software Foundation; either version 2 of the
- * License as published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * General Public License for more details.
- *
- * You should have received a copy of the GNU General Public
- * 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_MSG_COMPOSER_ATTACHMENT_BAR_H__
-#define __E_MSG_COMPOSER_ATTACHMENT_BAR_H__
-
-#include <libgnomeui/gnome-icon-list.h>
-
-#include <camel/camel-multipart.h>
-
-#ifdef __cplusplus
-extern "C" {
-#pragma }
-#endif /* __cplusplus */
-
-#define E_TYPE_MSG_COMPOSER_ATTACHMENT_BAR \
-	(e_msg_composer_attachment_bar_get_type ())
-#define E_MSG_COMPOSER_ATTACHMENT_BAR(obj) \
-	(G_TYPE_CHECK_INSTANCE_CAST ((obj), E_TYPE_MSG_COMPOSER_ATTACHMENT_BAR, EMsgComposerAttachmentBar))
-#define E_MSG_COMPOSER_ATTACHMENT_BAR_CLASS(klass) \
-	(G_TYPE_CHECK_CLASS_CAST ((klass), E_TYPE_MSG_COMPOSER_ATTACHMENT_BAR, EMsgComposerAttachmentBarClass))
-#define E_IS_MSG_COMPOSER_ATTACHMENT_BAR(obj) \
-	(G_TYPE_CHECK_INSTANCE_TYPE ((obj), E_TYPE_MSG_COMPOSER_ATTACHMENT_BAR))
-#define E_IS_MSG_COMPOSER_ATTACHMENT_BAR_CLASS(klass) \
-	(G_TYPE_CHECK_CLASS_TYPE ((obj), E_TYPE_MSG_COMPOSER_ATTACHMENT_BAR))
-
-typedef struct _EMsgComposerAttachmentBar EMsgComposerAttachmentBar;
-typedef struct _EMsgComposerAttachmentBarClass EMsgComposerAttachmentBarClass;
-typedef struct _EMsgComposerAttachmentBarPrivate EMsgComposerAttachmentBarPrivate;
-
-struct _EMsgComposerAttachmentBar {
-	GnomeIconList parent;
-	
-	EMsgComposerAttachmentBarPrivate *priv;
-};
-
-struct _EMsgComposerAttachmentBarClass {
-	GnomeIconListClass parent_class;
-	
-	void (* changed) (EMsgComposerAttachmentBar *bar);
-};
-
-
-GtkType e_msg_composer_attachment_bar_get_type (void);
-
-GtkWidget *e_msg_composer_attachment_bar_new (GtkAdjustment *adj);
-void e_msg_composer_attachment_bar_to_multipart (EMsgComposerAttachmentBar *bar, CamelMultipart *multipart,
-						 const char *default_charset);
-guint e_msg_composer_attachment_bar_get_num_attachments (EMsgComposerAttachmentBar *bar);
-void e_msg_composer_attachment_bar_attach (EMsgComposerAttachmentBar *bar, const char *file_name);
-void e_msg_composer_attachment_bar_attach_mime_part (EMsgComposerAttachmentBar *bar, CamelMimePart *part);
-
-#ifdef __cplusplus
-}
-#endif /* __cplusplus */
-
-#endif /* __E_MSG_COMPOSER_ATTACHMENT_BAR_H__ */
diff --git a/composer/e-msg-composer-attachment.c b/composer/e-msg-composer-attachment.c
deleted file mode 100644
index f4f173cee2..0000000000
--- a/composer/e-msg-composer-attachment.c
+++ /dev/null
@@ -1,463 +0,0 @@
-/* -*- Mode: C; indent-tabs-mode: t; c-basic-offset: 8; tab-width: 8 -*- */
-/*
- *  Authors: Ettore Perazzoli <ettore@ximian.com>
- *           Jeffrey Stedfast <fejj@ximian.com>
- *
- *  Copyright 1999-2002 Ximian, Inc. (www.ximian.com)
- *
- *  This program is free software; you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation; either version 2 of the License, or
- *  (at your option) any later version.
- *
- *  This program is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with this program; if not, write to the Free Software
- *  Foundation, Inc., 59 Temple Street #330, Boston, MA 02111-1307, USA.
- *
- */
-
-
-/* This is the object representing an email attachment.  It is implemented as a
-   GObject to make it easier for the application to handle it.  For example,
-   the "changed" signal is emitted whenever something changes in the
-   attachment.  Also, this contains the code to let users edit the
-   attachment manually. */
-
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
-
-#include <sys/stat.h>
-#include <string.h>
-#include <errno.h>
-
-#include <camel/camel.h>
-#include <gtk/gtknotebook.h>
-#include <gtk/gtktogglebutton.h>
-#include <gtk/gtkdialog.h>
-#include <libgnomevfs/gnome-vfs-mime.h>
-#include <libgnome/gnome-i18n.h>
-
-#include "e-util/e-mktemp.h"
-
-#include "e-msg-composer.h"
-#include "e-msg-composer-attachment.h"
-
-
-enum {
-	CHANGED,
-	LAST_SIGNAL
-};
-static guint signals[LAST_SIGNAL] = { 0 };
-
-static GObjectClass *parent_class = NULL;
-
-
-static void
-changed (EMsgComposerAttachment *attachment)
-{
-	g_signal_emit (attachment, signals[CHANGED], 0);
-}
-
-
-/* GtkObject methods.  */
-
-static void
-finalise(GObject *object)
-{
-	EMsgComposerAttachment *attachment;
-	
-	attachment = E_MSG_COMPOSER_ATTACHMENT (object);
-	
-	camel_object_unref (attachment->body);
-	if (attachment->pixbuf_cache != NULL)
-		g_object_unref (attachment->pixbuf_cache);
-	
-        G_OBJECT_CLASS (parent_class)->finalize (object);
-}
-
-
-/* Signals.  */
-
-static void
-real_changed (EMsgComposerAttachment *msg_composer_attachment)
-{
-	g_return_if_fail (E_IS_MSG_COMPOSER_ATTACHMENT (msg_composer_attachment));
-}
-
-
-static void
-class_init (EMsgComposerAttachmentClass *klass)
-{
-	GObjectClass *object_class;
-	
-	object_class = (GObjectClass*) klass;
-	parent_class = g_type_class_ref (G_TYPE_OBJECT);
-	
-	object_class->finalize = finalise;
-	klass->changed = real_changed;
-	
-	signals[CHANGED] = g_signal_new ("changed",
-					 E_TYPE_MSG_COMPOSER_ATTACHMENT,
-					 G_SIGNAL_RUN_FIRST,
-					 G_STRUCT_OFFSET (EMsgComposerAttachmentClass, changed),
-					 NULL,
-					 NULL,
-					 g_cclosure_marshal_VOID__VOID,
-					 G_TYPE_NONE, 0);
-}
-
-static void
-init (EMsgComposerAttachment *msg_composer_attachment)
-{
-	msg_composer_attachment->editor_gui = NULL;
-	msg_composer_attachment->body = NULL;
-	msg_composer_attachment->size = 0;
-	msg_composer_attachment->pixbuf_cache = NULL;
-}
-
-GType
-e_msg_composer_attachment_get_type (void)
-{
-	static GType type = 0;
-	
-	if (type == 0) {
-		static const GTypeInfo info = {
-			sizeof (EMsgComposerAttachmentClass),
-			NULL,
-			NULL,
-			(GClassInitFunc) class_init,
-			NULL,
-			NULL,
-			sizeof (EMsgComposerAttachment),
-			0,
-			(GInstanceInitFunc) init,
-		};
-		
-		type = g_type_register_static (G_TYPE_OBJECT, "EMsgComposerAttachment", &info, 0);
-	}
-	
-	return type;
-}
-
-
-/**
- * e_msg_composer_attachment_new:
- * @file_name: filename to attach
- * @disposition: Content-Disposition of the attachment
- * @ex: exception
- *
- * Return value: the new attachment, or %NULL on error
- **/
-EMsgComposerAttachment *
-e_msg_composer_attachment_new (const char *file_name,
-			       const char *disposition,
-			       CamelException *ex)
-{
-	EMsgComposerAttachment *new;
-	CamelMimePart *part;
-	CamelDataWrapper *wrapper;
-	CamelStream *stream;
-	struct stat statbuf;
-	char *mime_type;
-	char *filename;
-	
-	g_return_val_if_fail (file_name != NULL, NULL);
-	
-	if (stat (file_name, &statbuf) < 0) {
-		camel_exception_setv (ex, CAMEL_EXCEPTION_SYSTEM,
-				      _("Cannot attach file %s: %s"),
-				      file_name, g_strerror (errno));
-		return NULL;
-	}
-	
-	/* return if it's not a regular file */
-	if (!S_ISREG (statbuf.st_mode)) {
-		camel_exception_setv (ex, CAMEL_EXCEPTION_SYSTEM,
-				      _("Cannot attach file %s: not a regular file"),
-				      file_name);
-		return NULL;
-	}
-	
-	stream = camel_stream_fs_new_with_name (file_name, O_RDONLY, 0);
-	if (!stream) {
-		camel_exception_setv (ex, CAMEL_EXCEPTION_SYSTEM,
-				      _("Cannot attach file %s: %s"),
-				      file_name, g_strerror (errno));
-		return NULL;
-	}
-	
-	mime_type = e_msg_composer_guess_mime_type (file_name);
-	if (mime_type) {
-		if (!g_ascii_strcasecmp (mime_type, "message/rfc822")) {
-			wrapper = (CamelDataWrapper *) camel_mime_message_new ();
-		} else {
-			wrapper = camel_data_wrapper_new ();
-		}
-		
-		camel_data_wrapper_construct_from_stream (wrapper, stream);
-		camel_data_wrapper_set_mime_type (wrapper, mime_type);
-		g_free (mime_type);
-	} else {
-		wrapper = camel_data_wrapper_new ();
-		camel_data_wrapper_construct_from_stream (wrapper, stream);
-		camel_data_wrapper_set_mime_type (wrapper, "application/octet-stream");
-	}
-	
-	camel_object_unref (stream);
-	
-	part = camel_mime_part_new ();
-	camel_medium_set_content_object (CAMEL_MEDIUM (part), wrapper);
-	camel_object_unref (wrapper);
-	
-	camel_mime_part_set_disposition (part, disposition);
-	filename = g_path_get_basename (file_name);
-	camel_mime_part_set_filename (part, filename);
-	g_free (filename);
-	
-#if 0
-	/* Note: Outlook 2002 is broken with respect to Content-Ids on
-           non-multipart/related parts, so as an interoperability
-           workaround, don't set a Content-Id on these parts. Fixes
-           bug #10032 */
-	/* set the Content-Id */
-	content_id = camel_header_msgid_generate ();
-	camel_mime_part_set_content_id (part, content_id);
-	g_free (content_id);
-#endif
-	
-	new = g_object_new (E_TYPE_MSG_COMPOSER_ATTACHMENT, NULL);
-	new->editor_gui = NULL;
-	new->body = part;
-	new->size = statbuf.st_size;
-	new->guessed_type = TRUE;
-	
-	return new;
-}
-
-
-/**
- * e_msg_composer_attachment_new_from_mime_part:
- * @part: a CamelMimePart
- * 
- * Return value: a new EMsgComposerAttachment based on the mime part
- **/
-EMsgComposerAttachment *
-e_msg_composer_attachment_new_from_mime_part (CamelMimePart *part)
-{
-	EMsgComposerAttachment *new;
-	CamelMimePart *mime_part;
-	CamelStream *stream;
-	
-	g_return_val_if_fail (CAMEL_IS_MIME_PART (part), NULL);
-	
-	stream = camel_stream_mem_new ();
-	if (camel_data_wrapper_write_to_stream (CAMEL_DATA_WRAPPER (part), stream) == -1) {
-		camel_object_unref (stream);
-		return NULL;
-	}
-	
-	camel_stream_reset (stream);
-	mime_part = camel_mime_part_new ();
-	
-	if (camel_data_wrapper_construct_from_stream (CAMEL_DATA_WRAPPER (mime_part), stream) == -1) {
-		camel_object_unref (mime_part);
-		camel_object_unref (stream);
-		return NULL;
-	}
-	
-	camel_object_unref (stream);
-	
-	new = g_object_new (E_TYPE_MSG_COMPOSER_ATTACHMENT, NULL);
-	new->editor_gui = NULL;
-	new->body = mime_part;
-	new->guessed_type = FALSE;
-	new->size = 0;
-	
-	return new;
-}
-
-
-/* The attachment property dialog.  */
-
-typedef struct {
-	GtkWidget *dialog;
-	GtkEntry *file_name_entry;
-	GtkEntry *description_entry;
-	GtkEntry *mime_type_entry;
-	GtkToggleButton *disposition_checkbox;
-	EMsgComposerAttachment *attachment;
-} DialogData;
-
-static void
-destroy_dialog_data (DialogData *data)
-{
-	g_free (data);
-}
-
-/*
- * fixme: I am converting EVERYTHING to/from UTF-8, although mime types
- * are in ASCII. This is not strictly necessary, but we want to be
- * consistent and possibly check for errors somewhere.
- */
-
-static void
-set_entry (GladeXML *xml, const char *widget_name, const char *value)
-{
-	GtkEntry *entry;
-	
-	entry = GTK_ENTRY (glade_xml_get_widget (xml, widget_name));
-	if (entry == NULL)
-		g_warning ("Entry for `%s' not found.", widget_name);
-	else
-		gtk_entry_set_text (entry, value ? value : "");
-}
-
-static void
-connect_widget (GladeXML *gui, const char *name, const char *signal_name,
-		GCallback func, gpointer data)
-{
-	GtkWidget *widget;
-	
-	widget = glade_xml_get_widget (gui, name);
-	g_signal_connect (widget, signal_name, func, data);
-}
-
-static void
-close_cb (GtkWidget *widget, gpointer data)
-{
-	EMsgComposerAttachment *attachment;
-	DialogData *dialog_data;
-	
-	dialog_data = (DialogData *) data;
-	attachment = dialog_data->attachment;
-	
-	gtk_widget_destroy (dialog_data->dialog);
-	g_object_unref (attachment->editor_gui);
-	attachment->editor_gui = NULL;
-	
-	g_object_unref (attachment);
-	
-	destroy_dialog_data (dialog_data);
-}
-
-static void
-ok_cb (GtkWidget *widget, gpointer data)
-{
-	DialogData *dialog_data;
-	EMsgComposerAttachment *attachment;
-	const char *str;
-	
-	dialog_data = (DialogData *) data;
-	attachment = dialog_data->attachment;
-	
-	str = gtk_entry_get_text (dialog_data->file_name_entry);
-	camel_mime_part_set_filename (attachment->body, str);
-	
-	str = gtk_entry_get_text (dialog_data->description_entry);
-	camel_mime_part_set_description (attachment->body, str);
-	
-	str = gtk_entry_get_text (dialog_data->mime_type_entry);
-	camel_mime_part_set_content_type (attachment->body, str);
-	
-	camel_data_wrapper_set_mime_type(camel_medium_get_content_object(CAMEL_MEDIUM (attachment->body)), str);
-	
-	switch (gtk_toggle_button_get_active (dialog_data->disposition_checkbox)) {
-	case 0:
-		camel_mime_part_set_disposition (attachment->body, "attachment");
-		break;
-	case 1:
-		camel_mime_part_set_disposition (attachment->body, "inline");
-		break;
-	default:
-		/* Hmmmm? */
-		break;
-	}
-	
-	changed (attachment);
-	close_cb (widget, data);
-}
-
-static void
-response_cb (GtkWidget *widget, gint response, gpointer data)
-{
-	if (response == GTK_RESPONSE_OK)
-		ok_cb (widget, data);
-	else
-		close_cb (widget, data);
-}
-
-void
-e_msg_composer_attachment_edit (EMsgComposerAttachment *attachment, GtkWidget *parent)
-{
-	CamelContentType *content_type;
-	const char *disposition;
-	DialogData *dialog_data;
-	GladeXML *editor_gui;
-	char *type;
-	
-	g_return_if_fail (attachment != NULL);
-	g_return_if_fail (E_IS_MSG_COMPOSER_ATTACHMENT (attachment));
-	
-	if (attachment->editor_gui != NULL) {
-		GtkWidget *window;
-		
-		window = glade_xml_get_widget (attachment->editor_gui,
-					       "dialog");
-		gdk_window_show (window->window);
-		return;
-	}
-	
-	editor_gui = glade_xml_new (EVOLUTION_GLADEDIR "/e-msg-composer-attachment.glade",
-				    NULL, NULL);
-	if (editor_gui == NULL) {
-		g_warning ("Cannot load `e-msg-composer-attachment.glade'");
-		return;
-	}
-	
-	attachment->editor_gui = editor_gui;
-	
-	gtk_window_set_transient_for
-		(GTK_WINDOW (glade_xml_get_widget (editor_gui, "dialog")),
-		 GTK_WINDOW (gtk_widget_get_toplevel (parent)));
-	
-	dialog_data = g_new (DialogData, 1);
-	g_object_ref (attachment);
-	dialog_data->attachment = attachment;
-	dialog_data->dialog = glade_xml_get_widget (editor_gui, "dialog");
-	dialog_data->file_name_entry = GTK_ENTRY (
-		glade_xml_get_widget (editor_gui, "file_name_entry"));
-	dialog_data->description_entry = GTK_ENTRY (
-		glade_xml_get_widget (editor_gui, "description_entry"));
-	dialog_data->mime_type_entry = GTK_ENTRY (
-		glade_xml_get_widget (editor_gui, "mime_type_entry"));
-	dialog_data->disposition_checkbox = GTK_TOGGLE_BUTTON (
-		glade_xml_get_widget (editor_gui, "disposition_checkbox"));
-	
-	set_entry (editor_gui, "file_name_entry",
-		   camel_mime_part_get_filename (attachment->body));
-	set_entry (editor_gui, "description_entry",
-		   camel_mime_part_get_description (attachment->body));
-	content_type = camel_mime_part_get_content_type (attachment->body);
-	type = camel_content_type_simple (content_type);
-	set_entry (editor_gui, "mime_type_entry", type);
-	g_free (type);
-	
-	disposition = camel_mime_part_get_disposition (attachment->body);
-	gtk_toggle_button_set_active (dialog_data->disposition_checkbox,
-				      disposition && !g_ascii_strcasecmp (disposition, "inline"));
-	
-	connect_widget (editor_gui, "dialog", "response", (GCallback)response_cb, dialog_data);
-#warning "signal connect while alive"	
-	/* make sure that when the composer gets hidden/closed that our windows also close */
-	parent = gtk_widget_get_toplevel (parent);
-	gtk_signal_connect_while_alive (GTK_OBJECT (parent), "destroy", (GCallback)close_cb, dialog_data,
-					GTK_OBJECT (dialog_data->dialog));
-	gtk_signal_connect_while_alive (GTK_OBJECT (parent), "hide", (GCallback)close_cb, dialog_data,
-					GTK_OBJECT (dialog_data->dialog));
-}
diff --git a/composer/e-msg-composer-attachment.glade b/composer/e-msg-composer-attachment.glade
deleted file mode 100644
index dc228eef70..0000000000
--- a/composer/e-msg-composer-attachment.glade
+++ /dev/null
@@ -1,237 +0,0 @@
-<?xml version="1.0" standalone="no"?> <!--*- mode: xml -*-->
-<!DOCTYPE glade-interface SYSTEM "http://glade.gnome.org/glade-2.0.dtd">
-
-<glade-interface>
-
-<widget class="GtkDialog" id="dialog">
-  <property name="border_width">6</property>
-  <property name="visible">True</property>
-  <property name="title" translatable="yes">Attachment Properties</property>
-  <property name="type">GTK_WINDOW_TOPLEVEL</property>
-  <property name="window_position">GTK_WIN_POS_NONE</property>
-  <property name="modal">False</property>
-  <property name="resizable">True</property>
-  <property name="destroy_with_parent">False</property>
-  <property name="has_separator">True</property>
-
-  <child internal-child="vbox">
-    <widget class="GtkVBox" id="dialog-vbox1">
-      <property name="visible">True</property>
-      <property name="homogeneous">False</property>
-      <property name="spacing">6</property>
-
-      <child internal-child="action_area">
-	<widget class="GtkHButtonBox" id="dialog-action_area1">
-	  <property name="visible">True</property>
-	  <property name="layout_style">GTK_BUTTONBOX_END</property>
-
-	  <child>
-	    <widget class="GtkButton" id="close_button">
-	      <property name="visible">True</property>
-	      <property name="can_default">True</property>
-	      <property name="has_default">True</property>
-	      <property name="can_focus">True</property>
-	      <property name="label">gtk-cancel</property>
-	      <property name="use_stock">True</property>
-	      <property name="relief">GTK_RELIEF_NORMAL</property>
-	      <property name="response_id">-6</property>
-	    </widget>
-	  </child>
-
-	  <child>
-	    <widget class="GtkButton" id="ok_button">
-	      <property name="visible">True</property>
-	      <property name="can_default">True</property>
-	      <property name="can_focus">True</property>
-	      <property name="label">gtk-ok</property>
-	      <property name="use_stock">True</property>
-	      <property name="relief">GTK_RELIEF_NORMAL</property>
-	      <property name="response_id">-5</property>
-	    </widget>
-	  </child>
-	</widget>
-	<packing>
-	  <property name="padding">0</property>
-	  <property name="expand">False</property>
-	  <property name="fill">True</property>
-	  <property name="pack_type">GTK_PACK_END</property>
-	</packing>
-      </child>
-
-      <child>
-	<widget class="GtkTable" id="table1">
-	  <property name="visible">True</property>
-	  <property name="n_rows">4</property>
-	  <property name="n_columns">2</property>
-	  <property name="homogeneous">False</property>
-	  <property name="row_spacing">6</property>
-	  <property name="column_spacing">6</property>
-
-	  <child>
-	    <widget class="GtkEntry" id="description_entry">
-	      <property name="visible">True</property>
-	      <property name="can_focus">True</property>
-	      <property name="editable">True</property>
-	      <property name="visibility">True</property>
-	      <property name="max_length">0</property>
-	      <property name="text" translatable="yes"></property>
-	      <property name="has_frame">True</property>
-	      <property name="invisible_char" translatable="yes">*</property>
-	      <property name="activates_default">False</property>
-	    </widget>
-	    <packing>
-	      <property name="left_attach">1</property>
-	      <property name="right_attach">2</property>
-	      <property name="top_attach">1</property>
-	      <property name="bottom_attach">2</property>
-	      <property name="y_options"></property>
-	    </packing>
-	  </child>
-
-	  <child>
-	    <widget class="GtkEntry" id="mime_type_entry">
-	      <property name="visible">True</property>
-	      <property name="sensitive">False</property>
-	      <property name="can_focus">True</property>
-	      <property name="editable">False</property>
-	      <property name="visibility">True</property>
-	      <property name="max_length">0</property>
-	      <property name="text" translatable="yes"></property>
-	      <property name="has_frame">True</property>
-	      <property name="invisible_char" translatable="yes">*</property>
-	      <property name="activates_default">False</property>
-	    </widget>
-	    <packing>
-	      <property name="left_attach">1</property>
-	      <property name="right_attach">2</property>
-	      <property name="top_attach">2</property>
-	      <property name="bottom_attach">3</property>
-	      <property name="y_options"></property>
-	    </packing>
-	  </child>
-
-	  <child>
-	    <widget class="GtkLabel" id="mime_label">
-	      <property name="visible">True</property>
-	      <property name="label" translatable="yes">MIME type:</property>
-	      <property name="use_underline">False</property>
-	      <property name="use_markup">False</property>
-	      <property name="justify">GTK_JUSTIFY_LEFT</property>
-	      <property name="wrap">False</property>
-	      <property name="selectable">False</property>
-	      <property name="xalign">1</property>
-	      <property name="yalign">0.5</property>
-	      <property name="xpad">0</property>
-	      <property name="ypad">0</property>
-	    </widget>
-	    <packing>
-	      <property name="left_attach">0</property>
-	      <property name="right_attach">1</property>
-	      <property name="top_attach">2</property>
-	      <property name="bottom_attach">3</property>
-	      <property name="x_options">fill</property>
-	      <property name="y_options"></property>
-	    </packing>
-	  </child>
-
-	  <child>
-	    <widget class="GtkLabel" id="description_label">
-	      <property name="visible">True</property>
-	      <property name="label" translatable="yes">Description:</property>
-	      <property name="use_underline">False</property>
-	      <property name="use_markup">False</property>
-	      <property name="justify">GTK_JUSTIFY_CENTER</property>
-	      <property name="wrap">False</property>
-	      <property name="selectable">False</property>
-	      <property name="xalign">1</property>
-	      <property name="yalign">0.5</property>
-	      <property name="xpad">0</property>
-	      <property name="ypad">0</property>
-	    </widget>
-	    <packing>
-	      <property name="left_attach">0</property>
-	      <property name="right_attach">1</property>
-	      <property name="top_attach">1</property>
-	      <property name="bottom_attach">2</property>
-	      <property name="x_options">fill</property>
-	      <property name="y_options"></property>
-	    </packing>
-	  </child>
-
-	  <child>
-	    <widget class="GtkLabel" id="filename_label">
-	      <property name="visible">True</property>
-	      <property name="label" translatable="yes">File name:</property>
-	      <property name="use_underline">False</property>
-	      <property name="use_markup">False</property>
-	      <property name="justify">GTK_JUSTIFY_CENTER</property>
-	      <property name="wrap">False</property>
-	      <property name="selectable">False</property>
-	      <property name="xalign">1</property>
-	      <property name="yalign">0.5</property>
-	      <property name="xpad">0</property>
-	      <property name="ypad">0</property>
-	    </widget>
-	    <packing>
-	      <property name="left_attach">0</property>
-	      <property name="right_attach">1</property>
-	      <property name="top_attach">0</property>
-	      <property name="bottom_attach">1</property>
-	      <property name="x_options">fill</property>
-	      <property name="y_options"></property>
-	    </packing>
-	  </child>
-
-	  <child>
-	    <widget class="GtkEntry" id="file_name_entry">
-	      <property name="visible">True</property>
-	      <property name="can_focus">True</property>
-	      <property name="editable">True</property>
-	      <property name="visibility">True</property>
-	      <property name="max_length">0</property>
-	      <property name="text" translatable="yes"></property>
-	      <property name="has_frame">True</property>
-	      <property name="invisible_char" translatable="yes">*</property>
-	      <property name="activates_default">False</property>
-	    </widget>
-	    <packing>
-	      <property name="left_attach">1</property>
-	      <property name="right_attach">2</property>
-	      <property name="top_attach">0</property>
-	      <property name="bottom_attach">1</property>
-	      <property name="y_options"></property>
-	    </packing>
-	  </child>
-
-	  <child>
-	    <widget class="GtkCheckButton" id="disposition_checkbox">
-	      <property name="visible">True</property>
-	      <property name="can_focus">True</property>
-	      <property name="label" translatable="yes">Suggest automatic display of attachment</property>
-	      <property name="use_underline">True</property>
-	      <property name="relief">GTK_RELIEF_NORMAL</property>
-	      <property name="active">False</property>
-	      <property name="inconsistent">False</property>
-	      <property name="draw_indicator">True</property>
-	    </widget>
-	    <packing>
-	      <property name="left_attach">0</property>
-	      <property name="right_attach">2</property>
-	      <property name="top_attach">3</property>
-	      <property name="bottom_attach">4</property>
-	      <property name="x_options">fill</property>
-	      <property name="y_options"></property>
-	    </packing>
-	  </child>
-	</widget>
-	<packing>
-	  <property name="padding">0</property>
-	  <property name="expand">True</property>
-	  <property name="fill">True</property>
-	</packing>
-      </child>
-    </widget>
-  </child>
-</widget>
-
-</glade-interface>
diff --git a/composer/e-msg-composer-attachment.h b/composer/e-msg-composer-attachment.h
deleted file mode 100644
index caef6ebc58..0000000000
--- a/composer/e-msg-composer-attachment.h
+++ /dev/null
@@ -1,77 +0,0 @@
-/* -*- Mode: C; indent-tabs-mode: t; c-basic-offset: 8; tab-width: 8 -*- */
-/* e-msg-composer-attachment.h
- *
- * Copyright (C) 1999  Ximian, Inc.
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of version 2 of the GNU General Public
- * published by the Free Software Foundation; either version 2 of the
- * License as published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * General Public License for more details.
- *
- * You should have received a copy of the GNU General Public
- * 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_MSG_COMPOSER_ATTACHMENT_H__
-#define __E_MSG_COMPOSER_ATTACHMENT_H__
-
-#include <gdk-pixbuf/gdk-pixbuf.h>
-#include <glade/glade-xml.h>
-#include <camel/camel-mime-part.h>
-#include <camel/camel-exception.h>
-
-#ifdef __cplusplus
-extern "C" {
-#pragma }
-#endif /* __cplusplus */
-
-#define E_TYPE_MSG_COMPOSER_ATTACHMENT			(e_msg_composer_attachment_get_type ())
-#define E_MSG_COMPOSER_ATTACHMENT(obj)			(G_TYPE_CHECK_INSTANCE_CAST ((obj), E_TYPE_MSG_COMPOSER_ATTACHMENT, EMsgComposerAttachment))
-#define E_MSG_COMPOSER_ATTACHMENT_CLASS(klass)		(G_TYPE_CHECK_CLASS_CAST ((klass), E_TYPE_MSG_COMPOSER_ATTACHMENT, EMsgComposerAttachmentClass))
-#define E_IS_MSG_COMPOSER_ATTACHMENT(obj)		(G_TYPE_CHECK_INSTANCE_TYPE ((obj), E_TYPE_MSG_COMPOSER_ATTACHMENT))
-#define E_IS_MSG_COMPOSER_ATTACHMENT_CLASS(klass)	(G_TYPE_CHECK_CLASS_TYPE ((obj), E_TYPE_MSG_COMPOSER_ATTACHMENT))
-
-
-typedef struct _EMsgComposerAttachment       EMsgComposerAttachment;
-typedef struct _EMsgComposerAttachmentClass  EMsgComposerAttachmentClass;
-
-struct _EMsgComposerAttachment {
-	GObject parent;
-
-	GladeXML *editor_gui;
-
-	CamelMimePart *body;
-	gboolean guessed_type;
-	gulong size;
-
-	GdkPixbuf *pixbuf_cache;
-};
-
-struct _EMsgComposerAttachmentClass {
-	GObjectClass parent_class;
-
-	void (*changed)	(EMsgComposerAttachment *msg_composer_attachment);
-};
-
-
-GType e_msg_composer_attachment_get_type (void);
-EMsgComposerAttachment *e_msg_composer_attachment_new (const char *file_name,
-						       const char *disposition,
-						       CamelException *ex);
-EMsgComposerAttachment *e_msg_composer_attachment_new_from_mime_part (CamelMimePart *part);
-void e_msg_composer_attachment_edit (EMsgComposerAttachment *attachment,
-				     GtkWidget *parent);
-
-#ifdef __cplusplus
-}
-#endif /* __cplusplus */
-
-#endif /* __E_MSG_COMPOSER_ATTACHMENT_H__ */
diff --git a/composer/e-msg-composer-hdrs.c b/composer/e-msg-composer-hdrs.c
deleted file mode 100644
index b5c6ee7d56..0000000000
--- a/composer/e-msg-composer-hdrs.c
+++ /dev/null
@@ -1,1633 +0,0 @@
-/* -*- Mode: C; indent-tabs-mode: t; c-basic-offset: 8; tab-width: 8 -*- */
-/* msg-composer-hdrs.c
- *
- * Copyright (C) 1999 Ximian, Inc.
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of version 2 of the GNU General Public
- * published by the Free Software Foundation; either version 2 of the
- * License as published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * General Public License for more details.
- *
- * You should have received a copy of the GNU General Public
- * 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 <string.h>
-
-#include <bonobo/bonobo-control.h>
-#include <bonobo/bonobo-widget.h>
-
-#include <gtk/gtkmenuitem.h>
-#include <gtk/gtkoptionmenu.h>
-#include <gtk/gtktooltips.h>
-#include <libgnomeui/gnome-uidefs.h>
-#include <libgnome/gnome-i18n.h>
-#include <libedataserverui/e-name-selector.h>
-
-#include "Composer.h"
-
-#include <gtk/gtkmenuitem.h>
-#include <gtk/gtkoptionmenu.h>
-#include <gtk/gtktooltips.h>
-#include <gtk/gtkentry.h>
-#include <gtk/gtklabel.h>
-#include <gtk/gtkhbox.h>
-#include <gtk/gtkmessagedialog.h>
-
-#include <gconf/gconf.h>
-#include <gconf/gconf-client.h>
-
-#include <gal/e-text/e-entry.h>
-
-#include "widgets/misc/e-error.h"
-
-#include <camel/camel.h>
-#include "e-msg-composer-hdrs.h"
-#include "mail/mail-config.h"
-/*#include "mail/em-folder-selection-button.h"*/
-#include "mail/em-folder-selector.h"
-#include "mail/mail-component.h"
-#include "mail/em-folder-tree.h"
-
-/* TEMPORARY KLUDGE */
-#include "addressbook/gui/contact-editor/e-contact-editor.h"
-#include "addressbook/gui/contact-list-editor/e-contact-list-editor.h"
-
-
-
-/* Indexes in the GtkTable assigned to various items */
-
-#define LINE_FROM    0
-#define LINE_REPLYTO 1
-#define LINE_TO      2
-#define LINE_CC      3
-#define LINE_BCC     4
-#define LINE_POSTTO  5
-#define LINE_SUBJECT 6
-
-
-typedef struct {
-	GtkWidget *label;
-	GtkWidget *entry;
-	int visible:1;
-} EMsgComposerHdrPair;
-
-struct _EMsgComposerHdrsPrivate {
-	ENameSelector *name_selector;
-	
-	/* ui component */
-	BonoboUIComponent *uic;
-	
-	/* The tooltips.  */
-	GtkTooltips *tooltips;
-	
-	EAccountList *accounts;
-	GSList *from_options;
-	
-	gboolean post_custom;
-	
-	/* Standard headers.  */
-	EMsgComposerHdrPair from, reply_to, to, cc, bcc, post_to, subject;
-};
-
-
-static GtkTableClass *parent_class = NULL;
-
-enum {
-	SHOW_ADDRESS_DIALOG,
-	SUBJECT_CHANGED,
-	HDRS_CHANGED,
-	FROM_CHANGED,
-	LAST_SIGNAL
-};
-
-static int signals[LAST_SIGNAL];
-
-
-static void
-addressbook_dialog_response (ENameSelectorDialog *name_selector_dialog, gint response, gpointer user_data)
-{
-	EMsgComposerHdrs *hdrs = E_MSG_COMPOSER_HDRS (user_data);
-
-	gtk_widget_hide (GTK_WIDGET (name_selector_dialog));
-}
-
-static void
-setup_name_selector (EMsgComposerHdrs *hdrs)
-{
-	EMsgComposerHdrsPrivate *priv;
-	ENameSelectorDialog *name_selector_dialog;
-	
-	priv = hdrs->priv;
-	
-	g_assert (priv->name_selector == NULL);
-
-	priv->name_selector = e_name_selector_new ();
-	name_selector_dialog = e_name_selector_peek_dialog (priv->name_selector);
-	g_signal_connect (name_selector_dialog, "response",
-			  G_CALLBACK (addressbook_dialog_response), hdrs);
-}
-
-typedef struct {
-	EMsgComposerHdrs *hdrs;
-	char *string;
-} EMsgComposerHdrsAndString;
-
-static void
-e_msg_composer_hdrs_and_string_free (EMsgComposerHdrsAndString *emchas)
-{
-	if (emchas->hdrs)
-		g_object_unref (emchas->hdrs);
-	g_free (emchas->string);
-	g_free (emchas);
-}
-
-static EMsgComposerHdrsAndString *
-e_msg_composer_hdrs_and_string_create (EMsgComposerHdrs *hdrs, const char *string)
-{
-	EMsgComposerHdrsAndString *emchas;
-	
-	emchas = g_new (EMsgComposerHdrsAndString, 1);
-	emchas->hdrs = hdrs;
-	emchas->string = g_strdup (string);
-	if (emchas->hdrs)
-		g_object_ref (emchas->hdrs);
-	
-	return emchas;
-}
-
-static void
-address_button_clicked_cb (GtkButton *button, gpointer data)
-{
-	EMsgComposerHdrsAndString *emchas;
-	EMsgComposerHdrs *hdrs;
-	EMsgComposerHdrsPrivate *priv;
-	ENameSelectorDialog *name_selector_dialog;
-	
-	emchas = data;
-	hdrs = emchas->hdrs;
-	priv = hdrs->priv;
-
-	name_selector_dialog = e_name_selector_peek_dialog (priv->name_selector);
-	gtk_widget_show (GTK_WIDGET (name_selector_dialog));
-}
-
-static void
-from_changed (GtkWidget *item, gpointer data)
-{
-	EMsgComposerHdrs *hdrs = E_MSG_COMPOSER_HDRS (data);
-	const char *reply_to;
-	GList *post_items = NULL;
-	
-	/* this will retrieve items relative to the previous account */
-	if (!hdrs->priv->post_custom)
-		post_items = e_msg_composer_hdrs_get_post_to(hdrs);
-	
-	hdrs->account = g_object_get_data ((GObject *) item, "account");
-	
-	/* we do this rather than calling e_msg_composer_hdrs_set_reply_to()
-	   because we don't want to change the visibility of the header */
-	reply_to = hdrs->account->id->reply_to;
-	gtk_entry_set_text (GTK_ENTRY (hdrs->priv->reply_to.entry), reply_to ? reply_to : "");
-	
-	/* folders should be made relative to the new from */
-	if (!hdrs->priv->post_custom) {
-		e_msg_composer_hdrs_set_post_to_list (hdrs, post_items);
-		g_list_foreach (post_items, (GFunc)g_free, NULL);
-		g_list_free(post_items);
-	}
-	
-	g_signal_emit (hdrs, signals [FROM_CHANGED], 0);
-}
-
-static void
-account_added_cb (EAccountList *accounts, EAccount *account, EMsgComposerHdrs *hdrs)
-{
-	GtkWidget *item, *menu, *omenu, *toplevel;
-	char *label;
-	
-	omenu = e_msg_composer_hdrs_get_from_omenu (hdrs);
-	menu = gtk_option_menu_get_menu (GTK_OPTION_MENU (omenu));
-	
-	label = g_strdup_printf ("%s <%s>", account->id->name, account->id->address);
-	item = gtk_menu_item_new_with_label (label);
-	gtk_widget_show (item);
-	g_free (label);
-	
-	g_object_ref (account);
-	g_object_set_data ((GObject *) item, "account", account);
-	g_signal_connect (item, "activate", G_CALLBACK (from_changed), hdrs);
-	
-	/* this is so we can later set which one we want */
-	hdrs->priv->from_options = g_slist_append (hdrs->priv->from_options, item);
-	
-	gtk_menu_shell_append (GTK_MENU_SHELL (menu), item);
-	
-	toplevel = gtk_widget_get_toplevel ((GtkWidget *) hdrs);
-	gtk_widget_set_sensitive (toplevel, TRUE);
-}
-
-static void
-account_changed_cb (EAccountList *accounts, EAccount *account, EMsgComposerHdrs *hdrs)
-{
-	GtkWidget *item, *label;
-	EAccount *acnt;
-	GSList *node;
-	char *text;
-	
-	node = hdrs->priv->from_options;
-	while (node != NULL) {
-		item = node->data;
-		acnt = g_object_get_data ((GObject *) item, "account");
-		if (acnt == account) {
-			text = g_strdup_printf ("%s <%s>", account->id->name, account->id->address);
-			label = gtk_bin_get_child ((GtkBin *) item);
-			gtk_label_set_text ((GtkLabel *) label, text);
-			g_free (text);
-			break;
-		}
-		
-		node = node->next;
-	}
-}
-
-static void
-account_removed_cb (EAccountList *accounts, EAccount *account, EMsgComposerHdrs *hdrs)
-{
-	struct _EMsgComposerHdrsPrivate *priv = hdrs->priv;
-	GtkWidget *item, *omenu, *toplevel;
-	EAccount *acnt;
-	GSList *node;
-	
-	node = priv->from_options;
-	while (node != NULL) {
-		item = node->data;
-		acnt = g_object_get_data ((GObject *) item, "account");
-		if (acnt == account) {
-			if (hdrs->account == account)
-				hdrs->account = NULL;
-			
-			priv->from_options = g_slist_remove_link (priv->from_options, node);
-			g_slist_free_1 (node);
-			g_object_unref (account);
-			gtk_widget_destroy (item);
-			break;
-		}
-		
-		node = node->next;
-	}
-	
-	if (hdrs->account == NULL) {
-		if (priv->from_options) {
-			/* the previously selected account was removed,
-			   default the new selection to the first account in
-			   the menu list */
-			omenu = e_msg_composer_hdrs_get_from_omenu (hdrs);
-			
-			item = priv->from_options->data;
-			gtk_option_menu_set_history (GTK_OPTION_MENU (omenu), 0);
-			g_signal_emit_by_name (item, "activate", hdrs);
-		} else {
-			toplevel = gtk_widget_get_toplevel ((GtkWidget *) hdrs);
-			gtk_widget_set_sensitive (toplevel, FALSE);
-			
-			/* FIXME: this should offer a 'configure account' button, can we do that? */
-			e_error_run((GtkWindow *)toplevel, "mail-composer:all-accounts-deleted", NULL);
-		}
-	}
-}
-
-static GtkWidget *
-create_from_optionmenu (EMsgComposerHdrs *hdrs)
-{
-	struct _EMsgComposerHdrsPrivate *priv = hdrs->priv;
-	GtkWidget *hbox, *omenu, *menu, *item, *first = NULL;
-	int i = 0, history = 0, m, matches;
-	GPtrArray *addresses;
-	GConfClient *gconf;
-	EAccount *account;
-	EIterator *iter;
-	char *uid;
-	
-	omenu = gtk_option_menu_new ();
-	menu = gtk_menu_new ();
-	
-	gconf = gconf_client_get_default ();
-	uid = gconf_client_get_string (gconf, "/apps/evolution/mail/default_account", NULL);
-	g_object_unref (gconf);
-	
-	/* Make list of account email addresses */
-	addresses = g_ptr_array_new ();
-	iter = e_list_get_iterator ((EList *) priv->accounts);
-	while (e_iterator_is_valid (iter)) {
-		account = (EAccount *) e_iterator_get (iter);
-		
-		if (account->id->address)
-			g_ptr_array_add (addresses, account->id->address);
-		
-		e_iterator_next (iter);
-	}
-	
-	e_iterator_reset (iter);
-	
-	while (e_iterator_is_valid (iter)) {
-		char *label;
-		
-		account = (EAccount *) e_iterator_get (iter);
-		
-		/* this should never ever fail */
-		if (!account || !account->name || !account->id) {
-			g_assert_not_reached ();
-			continue;
-		}
-		
-		if (account->id->address && *account->id->address) {
-			/* If the account has a unique email address, just
-			 * show that. Otherwise include the account name.
-			 */
-			for (m = matches = 0; m < addresses->len; m++) {
-				if (!strcmp (account->id->address, addresses->pdata[m]))
-					matches++;
-			}
-			
-			if (matches > 1)
-				label = g_strdup_printf ("%s <%s> (%s)", account->id->name,
-							 account->id->address, account->name);
-			else
-				label = g_strdup_printf ("%s <%s>", account->id->name, account->id->address);
-			
-			item = gtk_menu_item_new_with_label (label);
-			g_free (label);
-			
-			g_object_ref (account);
-			g_object_set_data ((GObject *) item, "account", account);
-			g_signal_connect (item, "activate", G_CALLBACK (from_changed), hdrs);
-			
-			if (uid && !strcmp (account->uid, uid)) {
-				first = item;
-				history = i;
-			}
-			
-			/* this is so we can later set which one we want */
-			hdrs->priv->from_options = g_slist_append (hdrs->priv->from_options, item);
-			
-			gtk_menu_shell_append (GTK_MENU_SHELL (menu), item);
-			gtk_widget_show (item);
-			i++;
-		}
-		
-		e_iterator_next (iter);
-	}
-	
-	g_free (uid);
-	g_object_unref (iter);
-	
-	g_ptr_array_free (addresses, TRUE);
-	
-	gtk_option_menu_set_menu (GTK_OPTION_MENU (omenu), menu);
-	
-	if (first) {
-		gtk_option_menu_set_history (GTK_OPTION_MENU (omenu), history);
-		g_signal_emit_by_name (first, "activate", hdrs);
-	}
-	
-	hbox = gtk_hbox_new (FALSE, 6);
-	gtk_box_pack_start_defaults (GTK_BOX (hbox), omenu);
-	gtk_widget_show (omenu);
-	gtk_widget_show (hbox);
-	
-	g_object_set_data ((GObject *) hbox, "from_menu", omenu);
-	
-	/* listen for changes to the account list so we can auto-update the from menu */
-	g_signal_connect (priv->accounts, "account-added", G_CALLBACK (account_added_cb), hdrs);
-	g_signal_connect (priv->accounts, "account-changed", G_CALLBACK (account_changed_cb), hdrs);
-	g_signal_connect (priv->accounts, "account-removed", G_CALLBACK (account_removed_cb), hdrs);
-	
-	return hbox;
-}
-
-static void
-addressbook_entry_changed (GtkWidget *entry,
-			   gpointer   user_data)
-{
-	EMsgComposerHdrs *hdrs = E_MSG_COMPOSER_HDRS (user_data);
-	
-	g_signal_emit (hdrs, signals[HDRS_CHANGED], 0);
-}
-
-static GtkWidget *
-create_addressbook_entry (EMsgComposerHdrs *hdrs, const char *name)
-{
-	EMsgComposerHdrsPrivate *priv;
-	ENameSelectorModel *name_selector_model;
-	ENameSelectorEntry *name_selector_entry;
-	
-	priv = hdrs->priv;
-
-	name_selector_model = e_name_selector_peek_model (priv->name_selector);
-	e_name_selector_model_add_section (name_selector_model, name, name, NULL);
-
-	name_selector_entry = e_name_selector_peek_section_entry (priv->name_selector, name);
-	g_signal_connect (name_selector_entry, "changed",
-			  G_CALLBACK (addressbook_entry_changed), hdrs);
-
-	e_name_selector_entry_set_contact_editor_func (name_selector_entry, e_contact_editor_new);
-	e_name_selector_entry_set_contact_list_editor_func (name_selector_entry, e_contact_list_editor_new);
-
-	return GTK_WIDGET (name_selector_entry);
-
-#if 0
-
-	CORBA_exception_init (&ev);
-	
-	GNOME_Evolution_Addressbook_SelectNames_addSection (
-		corba_select_names, name, name, &ev);
-	if (ev._major != CORBA_NO_EXCEPTION) {
-		CORBA_exception_free (&ev);
-		return NULL;
-	}
-	
-	corba_control =
-		GNOME_Evolution_Addressbook_SelectNames_getEntryBySection (
-			corba_select_names, name, &ev);
-	
-	if (ev._major != CORBA_NO_EXCEPTION) {
-		CORBA_exception_free (&ev);
-		return NULL;
-	}
-	
-	CORBA_exception_free (&ev);
-	
-	control_widget = bonobo_widget_new_control_from_objref (
-			corba_control, bonobo_ui_component_get_container (priv->uic));
-	
-	cf = bonobo_widget_get_control_frame (BONOBO_WIDGET (control_widget));
-	pb = bonobo_control_frame_get_control_property_bag (cf, NULL);
-	
-	bonobo_control_frame_set_autoactivate (cf, TRUE);
-
-	bonobo_event_source_client_add_listener (
-		pb, addressbook_entry_changed,
-		"Bonobo/Property:change:entry_changed",
-		NULL, hdrs);
-
-       	return control_widget;
-#endif
-}
-
-static void
-post_browser_response (EMFolderSelector *emfs, int response, EMsgComposerHdrs *hdrs)
-{
-	if (response == GTK_RESPONSE_OK) {
-		GList *uris = em_folder_selector_get_selected_uris (emfs);
-		e_msg_composer_hdrs_set_post_to_list (hdrs, uris);
-		hdrs->priv->post_custom = FALSE;
-		g_list_foreach (uris, (GFunc) g_free, NULL);
-		g_list_free (uris);
-	}
-	
-	gtk_widget_destroy ((GtkWidget *) emfs);
-}
-
-static void
-post_browser_clicked_cb (GtkButton *button, EMsgComposerHdrs *hdrs)
-{
-	EMFolderTreeModel *model;
-	EMFolderTree *emft;
-	GtkWidget *dialog;
-	GList *post_items;
-	
-	model = mail_component_peek_tree_model (mail_component_peek ());
-	emft = (EMFolderTree *) em_folder_tree_new_with_model (model);
-	em_folder_tree_set_multiselect (emft, TRUE);
-	em_folder_tree_set_excluded(emft, EMFT_EXCLUDE_NOSELECT|EMFT_EXCLUDE_VIRTUAL|EMFT_EXCLUDE_VTRASH);
-
-	dialog = em_folder_selector_new (emft, EM_FOLDER_SELECTOR_CAN_CREATE,
-	                                 _("Posting destination"),
-	                                 _("Choose folders to post the message to."), NULL);
-	
-	post_items = e_msg_composer_hdrs_get_post_to (hdrs);	
-	em_folder_selector_set_selected_list ((EMFolderSelector *) dialog, post_items);
-	g_list_foreach (post_items, (GFunc) g_free, NULL);
-	g_list_free (post_items);
-	
-	g_signal_connect (dialog, "response", G_CALLBACK (post_browser_response), hdrs);
-	gtk_widget_show (dialog);
-}
-
-static void
-post_entry_changed_cb (GtkButton *button, EMsgComposerHdrs *hdrs)
-{
-	hdrs->priv->post_custom = TRUE;
-}
-
-static EMsgComposerHdrPair 
-header_new_recipient (EMsgComposerHdrs *hdrs, const char *name, const char *tip)
-{
-	EMsgComposerHdrsPrivate *priv;
-	EMsgComposerHdrPair ret;
-	
-	priv = hdrs->priv;
-	
-	ret.label = gtk_button_new_with_mnemonic (name);
-	GTK_OBJECT_UNSET_FLAGS (ret.label, GTK_CAN_FOCUS);
-	g_signal_connect_data (ret.label, "clicked",
-			       G_CALLBACK (address_button_clicked_cb),
-			       e_msg_composer_hdrs_and_string_create (hdrs, name),
-			       (GClosureNotify) e_msg_composer_hdrs_and_string_free,
-			       0);
-	
-	gtk_tooltips_set_tip (hdrs->priv->tooltips, ret.label,
-			      _("Click here for the address book"),
-			      NULL);
-	
-	ret.entry = create_addressbook_entry (hdrs, name);
-	
-	return ret;
-}
-
-static void
-entry_changed (GtkWidget *entry, EMsgComposerHdrs *hdrs)
-{
-	const char *subject;
-	
-	subject = e_msg_composer_hdrs_get_subject (hdrs);
-	g_signal_emit (hdrs, signals[SUBJECT_CHANGED], 0, subject);
-	g_signal_emit (hdrs, signals[HDRS_CHANGED], 0);
-}
-
-static void
-create_headers (EMsgComposerHdrs *hdrs)
-{
-	EMsgComposerHdrsPrivate *priv = hdrs->priv;
-	AtkObject *a11y;	
-	/*
-	 * Reply-To:
-	 *
-	 * Create this before we call create_from_optionmenu,
-	 * because that causes from_changed to be called, which
-	 * expects the reply_to fields to be initialized.
-	 */
-	priv->reply_to.label = gtk_label_new_with_mnemonic (_("_Reply-To:"));
-	priv->reply_to.entry = gtk_entry_new ();
-	gtk_label_set_mnemonic_widget (priv->reply_to.label, priv->reply_to.entry);
-	
-	/*
-	 * From
-	 */
-	priv->from.label = gtk_label_new_with_mnemonic (_("Fr_om:"));
-	priv->from.entry = create_from_optionmenu (hdrs);
-	gtk_label_set_mnemonic_widget (priv->from.label, e_msg_composer_hdrs_get_from_omenu (hdrs));
-	
-	/*
-	 * Subject
-	 */
-	priv->subject.label = gtk_label_new_with_mnemonic (_("S_ubject:"));
-	priv->subject.entry = gtk_entry_new ();
-	gtk_label_set_mnemonic_widget (priv->subject.label, priv->subject.entry);
-	g_signal_connect (priv->subject.entry, "changed",
-			  G_CALLBACK (entry_changed), hdrs);
-
-	/*
-	 * To, CC, and Bcc
-	 */
-	priv->to = header_new_recipient (
-		hdrs, _("_To:"),
-		_("Enter the recipients of the message"));
-	
-	priv->cc = header_new_recipient (
-		hdrs, _("_Cc:"),
-		_("Enter the addresses that will receive a carbon copy of the message"));
-	
-	priv->bcc = header_new_recipient (
-		hdrs, _("_Bcc:"),
-		 _("Enter the addresses that will receive a carbon copy of "
-		   "the message without appearing in the recipient list of "
-		   "the message."));
-
-	/*
-	 * Post-To
-	 */
-	priv->post_to.label = gtk_button_new_with_mnemonic (_("_Post To:"));
-	GTK_OBJECT_UNSET_FLAGS (priv->post_to.label, GTK_CAN_FOCUS);
-	g_signal_connect (priv->post_to.label, "clicked",
-			  G_CALLBACK (post_browser_clicked_cb), hdrs);
-	gtk_tooltips_set_tip (hdrs->priv->tooltips, priv->post_to.label,
-			      _("Click here to select folders to post to"),
-			      NULL);
-	
-	priv->post_to.entry = gtk_entry_new ();
-	a11y = gtk_widget_get_accessible (priv->post_to.entry);
-	if (a11y != NULL) {
-		atk_object_set_name (a11y, _("Post To:"));	
-	}
-	g_signal_connect(priv->post_to.entry, "changed",
-			 G_CALLBACK (post_entry_changed_cb), hdrs);
-}
-
-static void
-attach_couple (EMsgComposerHdrs *hdrs, EMsgComposerHdrPair *pair, int line)
-{
-	gtk_table_attach (GTK_TABLE (hdrs),
-			  pair->label, 0, 1,
-			  line, line + 1,
-			  GTK_FILL, GTK_FILL, 3, 3);
-	
-	gtk_table_attach (GTK_TABLE (hdrs),
-			  pair->entry, 1, 2,
-			  line, line + 1,
-			  GTK_FILL | GTK_EXPAND, 0, 3, 3);
-}
-
-static void
-attach_headers (EMsgComposerHdrs *hdrs)
-{
-	EMsgComposerHdrsPrivate *p = hdrs->priv;
-	
-	attach_couple (hdrs, &p->from, LINE_FROM);
-	attach_couple (hdrs, &p->reply_to, LINE_REPLYTO);
-	attach_couple (hdrs, &p->to, LINE_TO);
-	attach_couple (hdrs, &p->cc, LINE_CC);
-	attach_couple (hdrs, &p->bcc, LINE_BCC);
-	attach_couple (hdrs, &p->post_to, LINE_POSTTO);
-	attach_couple (hdrs, &p->subject, LINE_SUBJECT);
-}
-
-static void
-set_pair_visibility (EMsgComposerHdrs *h, EMsgComposerHdrPair *pair, int visible)
-{
-	if (visible /*& h->visible_mask*/) {
-		gtk_widget_show (pair->label);
-		gtk_widget_show (pair->entry);
-	} else {
-		gtk_widget_hide (pair->label);
-		gtk_widget_hide (pair->entry);
-	}
-
-	pair->visible = TRUE;
-}
-
-static void
-headers_set_visibility (EMsgComposerHdrs *h, int visible_flags)
-{
-	EMsgComposerHdrsPrivate *p = h->priv;
-	
-	/* To is always visible if we're not doing Post-To */
-	if (!(h->visible_mask & E_MSG_COMPOSER_VISIBLE_POSTTO))
-		visible_flags |= E_MSG_COMPOSER_VISIBLE_TO;
-	else
-		visible_flags |= E_MSG_COMPOSER_VISIBLE_POSTTO;
-	
-	set_pair_visibility (h, &p->from, visible_flags & E_MSG_COMPOSER_VISIBLE_FROM);
-	set_pair_visibility (h, &p->reply_to, visible_flags & E_MSG_COMPOSER_VISIBLE_REPLYTO);
-	set_pair_visibility (h, &p->to, visible_flags & E_MSG_COMPOSER_VISIBLE_TO);
-	set_pair_visibility (h, &p->cc, visible_flags & E_MSG_COMPOSER_VISIBLE_CC);
-	set_pair_visibility (h, &p->bcc, visible_flags & E_MSG_COMPOSER_VISIBLE_BCC);
-	set_pair_visibility (h, &p->post_to, visible_flags & E_MSG_COMPOSER_VISIBLE_POSTTO);
-	set_pair_visibility (h, &p->subject, visible_flags & E_MSG_COMPOSER_VISIBLE_SUBJECT);
-}
-
-static void
-headers_set_sensitivity (EMsgComposerHdrs *h)
-{
-	/* these ones are always on */
-	bonobo_ui_component_set_prop (
-		h->priv->uic, "/commands/ViewTo", "sensitive",
-		h->visible_mask & E_MSG_COMPOSER_VISIBLE_TO ? "0" : "1", NULL);
-	
-	bonobo_ui_component_set_prop (
-		h->priv->uic, "/commands/ViewPostTo", "sensitive",
-		h->visible_mask & E_MSG_COMPOSER_VISIBLE_POSTTO ? "0" : "1", NULL);
-}
-
-void
-e_msg_composer_hdrs_set_visible_mask (EMsgComposerHdrs *hdrs, int visible_mask)
-{
-	g_return_if_fail (E_IS_MSG_COMPOSER_HDRS (hdrs));
-	
-	hdrs->visible_mask = visible_mask;
-	headers_set_sensitivity (hdrs);
-}
-
-void
-e_msg_composer_hdrs_set_visible (EMsgComposerHdrs *hdrs, int visible_flags)
-{
-	g_return_if_fail (E_IS_MSG_COMPOSER_HDRS (hdrs));
-	
-	headers_set_visibility (hdrs, visible_flags);
-	gtk_widget_queue_resize (GTK_WIDGET (hdrs));
-}
-
-static void
-setup_headers (EMsgComposerHdrs *hdrs, int visible_flags)
-{
-	create_headers (hdrs);
-	attach_headers (hdrs);
-	
-	headers_set_sensitivity (hdrs);
-	headers_set_visibility (hdrs, visible_flags);
-}
-
-
-/* GtkObject methods.  */
-
-static void
-destroy (GtkObject *object)
-{
-	EMsgComposerHdrs *hdrs;
-	EMsgComposerHdrsPrivate *priv;
-	GSList *l, *n;
-	
-	hdrs = E_MSG_COMPOSER_HDRS (object);
-	priv = hdrs->priv;
-	
-	if (priv) {
-		if (priv->name_selector != NULL) {
-			g_object_unref (priv->name_selector);
-			priv->name_selector = NULL;
-		}
-
-		if (priv->tooltips) {
-			gtk_object_destroy (GTK_OBJECT (priv->tooltips));
-			g_object_unref (priv->tooltips);
-			priv->tooltips = NULL;
-		}
-		
-		if (priv->accounts) {
-			g_signal_handlers_disconnect_matched(priv->accounts, G_SIGNAL_MATCH_DATA, 0, 0, NULL, NULL, hdrs);
-			g_object_unref (priv->accounts);
-			priv->accounts = NULL;
-		}
-		
-		l = priv->from_options;
-		while (l) {
-			EAccount *account;
-			GtkWidget *item = l->data;
-			
-			account = g_object_get_data ((GObject *) item, "account");
-			g_object_unref (account);
-			
-			n = l->next;
-			g_slist_free_1 (l);
-			l = n;
-		}
-		
-		priv->from_options = NULL;
-		
-		g_free (priv);
-		hdrs->priv = NULL;
-	}
-	
-	if (GTK_OBJECT_CLASS (parent_class)->destroy != NULL)
-		(* GTK_OBJECT_CLASS (parent_class)->destroy) (object);
-}
-
-
-static void
-class_init (EMsgComposerHdrsClass *class)
-{
-	GtkObjectClass *object_class;
-	
-	object_class = GTK_OBJECT_CLASS (class);
-	object_class->destroy = destroy;
-	
-	parent_class = g_type_class_ref (gtk_table_get_type ());
-	
-	signals[SHOW_ADDRESS_DIALOG] =
-		g_signal_new ("show_address_dialog",
-			      E_TYPE_MSG_COMPOSER_HDRS,
-			      G_SIGNAL_RUN_LAST,
-			      G_STRUCT_OFFSET(EMsgComposerHdrsClass, show_address_dialog),
-			      NULL, NULL,
-			      g_cclosure_marshal_VOID__VOID,
-			      G_TYPE_NONE, 0);
-	
-	signals[SUBJECT_CHANGED] =
-		g_signal_new ("subject_changed",
-			      E_TYPE_MSG_COMPOSER_HDRS,
-			      G_SIGNAL_RUN_LAST,
-			      G_STRUCT_OFFSET(EMsgComposerHdrsClass, subject_changed),
-			      NULL, NULL,
-			      g_cclosure_marshal_VOID__STRING,
-			      G_TYPE_NONE,
-			      1, G_TYPE_STRING);
-	
-	signals[HDRS_CHANGED] =
-		g_signal_new ("hdrs_changed",
-			      E_TYPE_MSG_COMPOSER_HDRS,
-			      G_SIGNAL_RUN_LAST,
-			      G_STRUCT_OFFSET(EMsgComposerHdrsClass, hdrs_changed),
-			      NULL, NULL,
-			      g_cclosure_marshal_VOID__VOID,
-			      G_TYPE_NONE, 0);
-	
-	signals[FROM_CHANGED] =
-		g_signal_new ("from_changed",
-			      E_TYPE_MSG_COMPOSER_HDRS,
-			      G_SIGNAL_RUN_LAST,
-			      G_STRUCT_OFFSET(EMsgComposerHdrsClass, from_changed),
-			      NULL, NULL,
-			      g_cclosure_marshal_VOID__VOID,
-			      G_TYPE_NONE, 0);
-}
-
-static void
-init (EMsgComposerHdrs *hdrs)
-{
-	EMsgComposerHdrsPrivate *priv;
-	
-	priv = g_new0 (EMsgComposerHdrsPrivate, 1);
-	
-	priv->tooltips = gtk_tooltips_new ();
-	g_object_ref (priv->tooltips);
-	gtk_object_sink ((GtkObject *) priv->tooltips);
-	
-	priv->accounts = mail_config_get_accounts ();
-	g_object_ref (priv->accounts);
-
-	priv->post_custom = FALSE;
-	
-	hdrs->priv = priv;
-}
-
-
-GType
-e_msg_composer_hdrs_get_type (void)
-{
-	static GType type = 0;
-	
-	if (type == 0) {
-		static const GTypeInfo info = {
-			sizeof (EMsgComposerHdrsClass),
-			NULL,
-			NULL,
-			(GClassInitFunc) class_init,
-			NULL,
-			NULL,
-			sizeof (EMsgComposerHdrs),
-			0,
-			(GInstanceInitFunc) init,
-		};
-		
-		type = g_type_register_static (gtk_table_get_type (), "EMsgComposerHdrs", &info, 0);
-	}
-	
-	return type;
-}
-
-GtkWidget *
-e_msg_composer_hdrs_new (BonoboUIComponent *uic, int visible_mask, int visible_flags)
-{
-	EMsgComposerHdrs *new;
-	EMsgComposerHdrsPrivate *priv;
-	
-	new = g_object_new (e_msg_composer_hdrs_get_type (), NULL);
-	priv = new->priv;
-	priv->uic = uic;
-
-	g_object_ref (new);
-	gtk_object_sink (GTK_OBJECT (new));
-
-	setup_name_selector (new);
-	
-	new->visible_mask = visible_mask;
-	
-	setup_headers (new, visible_flags);
-	
-	return GTK_WIDGET (new);
-}
-
-static void
-set_recipients_from_destv (CamelMimeMessage *msg,
-			   EDestination **to_destv,
-			   EDestination **cc_destv,
-			   EDestination **bcc_destv,
-			   gboolean redirect)
-{
-	CamelInternetAddress *to_addr;
-	CamelInternetAddress *cc_addr;
-	CamelInternetAddress *bcc_addr;
-	CamelInternetAddress *target;
-	const char *text_addr, *header;
-	gboolean seen_hidden_list = FALSE;
-	int i;
-	
-	to_addr  = camel_internet_address_new ();
-	cc_addr  = camel_internet_address_new ();
-	bcc_addr = camel_internet_address_new ();
-	
-	if (to_destv) {
-		for (i = 0; to_destv[i] != NULL; ++i) {
-			text_addr = e_destination_get_address (to_destv[i]);
-			
-			if (text_addr && *text_addr) {
-				target = to_addr;
-				if (e_destination_is_evolution_list (to_destv[i])
-				    && !e_destination_list_show_addresses (to_destv[i])) {
-					target = bcc_addr;
-					seen_hidden_list = TRUE;
-				}
-				
-				camel_address_decode (CAMEL_ADDRESS (target), text_addr);
-			}
-		}
-	}
-	
-	if (cc_destv) {
-		for (i = 0; cc_destv[i] != NULL; ++i) {
-			text_addr = e_destination_get_address (cc_destv[i]);
-			if (text_addr && *text_addr) {
-				target = cc_addr;
-				if (e_destination_is_evolution_list (cc_destv[i])
-				    && !e_destination_list_show_addresses (cc_destv[i])) {
-					target = bcc_addr;
-					seen_hidden_list = TRUE;
-				}
-				
-				camel_address_decode (CAMEL_ADDRESS (target), text_addr);
-			}
-		}
-	}
-	
-	if (bcc_destv) {
-		for (i = 0; bcc_destv[i] != NULL; ++i) {
-			text_addr = e_destination_get_address (bcc_destv[i]);
-			if (text_addr && *text_addr) {				
-				camel_address_decode (CAMEL_ADDRESS (bcc_addr), text_addr);
-			}
-		}
-	}
-	
-	header = redirect ? CAMEL_RECIPIENT_TYPE_RESENT_TO : CAMEL_RECIPIENT_TYPE_TO;
-	if (camel_address_length (CAMEL_ADDRESS (to_addr)) > 0) {
-		camel_mime_message_set_recipients (msg, header, to_addr);
-	} else if (seen_hidden_list) {
-		camel_medium_set_header (CAMEL_MEDIUM (msg), header, "Undisclosed-Recipient:;");
-	}
-	
-	header = redirect ? CAMEL_RECIPIENT_TYPE_RESENT_CC : CAMEL_RECIPIENT_TYPE_CC;
-	if (camel_address_length (CAMEL_ADDRESS (cc_addr)) > 0) {
-		camel_mime_message_set_recipients (msg, header, cc_addr);
-	}
-	
-	header = redirect ? CAMEL_RECIPIENT_TYPE_RESENT_BCC : CAMEL_RECIPIENT_TYPE_BCC;
-	if (camel_address_length (CAMEL_ADDRESS (bcc_addr)) > 0) {
-		camel_mime_message_set_recipients (msg, header, bcc_addr);
-	}
-	
-	camel_object_unref (to_addr);
-	camel_object_unref (cc_addr);
-	camel_object_unref (bcc_addr);
-}
-
-static void
-e_msg_composer_hdrs_to_message_internal (EMsgComposerHdrs *hdrs,
-					 CamelMimeMessage *msg,
-					 gboolean redirect)
-{
-	EDestination **to_destv, **cc_destv, **bcc_destv;
-	CamelInternetAddress *addr;
-	const char *subject;
-	char *header;
-
-	g_return_if_fail (E_IS_MSG_COMPOSER_HDRS (hdrs));
-	g_return_if_fail (CAMEL_IS_MIME_MESSAGE (msg));
-	
-	subject = e_msg_composer_hdrs_get_subject (hdrs);
-	camel_mime_message_set_subject (msg, subject);
-	
-	addr = e_msg_composer_hdrs_get_from (hdrs);
-	if (redirect) {
-		header = camel_address_encode (CAMEL_ADDRESS (addr));
-		camel_medium_set_header (CAMEL_MEDIUM (msg), "Resent-From", header);
-		g_free (header);
-	} else {
-		camel_mime_message_set_from (msg, addr);
-	}
-	camel_object_unref (addr);
-	
- 	addr = e_msg_composer_hdrs_get_reply_to (hdrs);
-	if (addr) {
-		camel_mime_message_set_reply_to (msg, addr);
-		camel_object_unref (addr);
-	}
-	
-	if (hdrs->priv->to.visible || hdrs->priv->cc.visible || hdrs->priv->bcc.visible) {
-		to_destv  = e_msg_composer_hdrs_get_to (hdrs);
-		cc_destv  = e_msg_composer_hdrs_get_cc (hdrs);
-		bcc_destv = e_msg_composer_hdrs_get_bcc (hdrs);
-		
-		/* Attach destinations to the message. */
-		
-		set_recipients_from_destv (msg, to_destv, cc_destv, bcc_destv, redirect);
-		
-		e_destination_freev (to_destv);
-		e_destination_freev (cc_destv);
-		e_destination_freev (bcc_destv);
-	}
-	
-	if (hdrs->priv->post_to.visible) {
-		GList *post, *l;
-
-		camel_medium_remove_header((CamelMedium *)msg, "X-Evolution-PostTo");
-		post = e_msg_composer_hdrs_get_post_to(hdrs);
-		for (l=post;l;l=g_list_next(l)) {
-			camel_medium_add_header((CamelMedium *)msg, "X-Evolution-PostTo", l->data);
-			g_free(l->data);
-		}
-		g_list_free(post);
-	}
-}
-
-
-void
-e_msg_composer_hdrs_to_message (EMsgComposerHdrs *hdrs,
-				CamelMimeMessage *msg)
-{
-	e_msg_composer_hdrs_to_message_internal (hdrs, msg, FALSE);
-}
-
-
-void
-e_msg_composer_hdrs_to_redirect (EMsgComposerHdrs *hdrs,
-				 CamelMimeMessage *msg)
-{
-	e_msg_composer_hdrs_to_message_internal (hdrs, msg, TRUE);
-}
-
-
-/* FIXME: yea, this could be better... but it's doubtful it'll be used much */
-void
-e_msg_composer_hdrs_set_from_account (EMsgComposerHdrs *hdrs,
-				      const char *account_name)
-{
-	GtkOptionMenu *omenu;
-	GConfClient *gconf;
-	GtkWidget *item;
-	char *uid = NULL;
-	GSList *l;
-	int i = 0;
-	
-	g_return_if_fail (E_IS_MSG_COMPOSER_HDRS (hdrs));
-	
-	omenu = GTK_OPTION_MENU (e_msg_composer_hdrs_get_from_omenu (hdrs));
-	
-	if (!account_name) {
-		gconf = gconf_client_get_default ();
-		uid = gconf_client_get_string (gconf, "/apps/evolution/mail/default_account", NULL);
-		g_object_unref (gconf);
-	}
-	
-	/* find the item that represents the account and activate it */
-	l = hdrs->priv->from_options;
-	while (l) {
-		EAccount *account;
-		item = l->data;
-		
-		account = g_object_get_data ((GObject *) item, "account");
-		if (account_name) {
-			if (account->name && !strcmp (account_name, account->name)) {
-				/* set the correct optionlist item */
-				gtk_option_menu_set_history (omenu, i);
-				g_signal_emit_by_name (item, "activate", hdrs);
-				g_free (uid);
-				
-				return;
-			}
-		} else if (uid && !strcmp (account->uid, uid)) {
-			/* set the default optionlist item */
-			gtk_option_menu_set_history (omenu, i);
-			g_signal_emit_by_name (item, "activate", hdrs);
-			g_free (uid);
-			
-			return;
-		}
-		
-		l = l->next;
-		i++;
-	}
-	
-	g_free (uid);
-}
-
-void
-e_msg_composer_hdrs_set_reply_to (EMsgComposerHdrs *hdrs,
-				  const char *reply_to)
-{
-	g_return_if_fail (E_IS_MSG_COMPOSER_HDRS (hdrs));
-	
-	gtk_entry_set_text (GTK_ENTRY (hdrs->priv->reply_to.entry), reply_to ? reply_to : "");
-	
-	if (reply_to && *reply_to)
-		set_pair_visibility (hdrs, &hdrs->priv->cc, TRUE);
-}
-
-static void
-destinations_to_name_selector_entry (ENameSelectorEntry *name_selector_entry, EDestination **destv)
-{
-	EDestinationStore *destination_store;
-	GList *destinations;
-	GList *l;
-	gint i;
-
-	/* First clear the store */
-	destination_store = e_name_selector_entry_peek_destination_store (name_selector_entry);
-	destinations = e_destination_store_list_destinations (destination_store);
-
-	for (l = destinations; l; l = g_list_next (l)) {
-		EDestination *destination = l->data;
-		e_destination_store_remove_destination (destination_store, destination);
-	}
-
-	g_list_free (destinations);
-
-	if (!destv)
-		return;
-
-	for (i = 0; destv [i]; i++)
-		e_destination_store_append_destination (destination_store, destv [i]);
-}
-
-void
-e_msg_composer_hdrs_set_to (EMsgComposerHdrs *hdrs,
-			    EDestination **to_destv)
-{
-	char *str;
-	
-	g_return_if_fail (E_IS_MSG_COMPOSER_HDRS (hdrs));
-
-	destinations_to_name_selector_entry (E_NAME_SELECTOR_ENTRY (hdrs->priv->to.entry), to_destv);
-}
-
-void
-e_msg_composer_hdrs_set_cc (EMsgComposerHdrs *hdrs,
-			    EDestination **cc_destv)
-{
-	char *str;
-	
-	g_return_if_fail (E_IS_MSG_COMPOSER_HDRS (hdrs));
-
-	destinations_to_name_selector_entry (E_NAME_SELECTOR_ENTRY (hdrs->priv->cc.entry), cc_destv);
-	
-	if (cc_destv && *cc_destv)
-		set_pair_visibility (hdrs, &hdrs->priv->cc, TRUE);
-}
-
-void
-e_msg_composer_hdrs_set_bcc (EMsgComposerHdrs *hdrs,
-			     EDestination **bcc_destv)
-{
-	char *str;
-	
-	g_return_if_fail (E_IS_MSG_COMPOSER_HDRS (hdrs));
-
-	destinations_to_name_selector_entry (E_NAME_SELECTOR_ENTRY (hdrs->priv->bcc.entry), bcc_destv);
-	
-	if (bcc_destv && *bcc_destv)
-		set_pair_visibility (hdrs, &hdrs->priv->bcc, TRUE);
-}
-
-
-void
-e_msg_composer_hdrs_set_post_to (EMsgComposerHdrs *hdrs,
-				 const char *post_to)
-{
-	GList *list;
-	
-	g_return_if_fail (E_IS_MSG_COMPOSER_HDRS (hdrs));
-	g_return_if_fail (post_to != NULL);
-	
-	list = g_list_append (NULL, g_strdup (post_to));
-	
-	e_msg_composer_hdrs_set_post_to_list (hdrs, list);
-	
-	g_free (list->data);
-	g_list_free (list);
-}
-
-static GList *
-newsgroups_list_split (const char *list)
-{
-	GList *lst = NULL;
-	char *tmp;	
-	char **items, **cur_ptr;
-	
-	cur_ptr = items = g_strsplit (list, ",", 0);
-	
-	while ((tmp = *cur_ptr) != NULL) {
-		g_strstrip (tmp);
-		
-		if (tmp[0])
-			lst = g_list_append (lst, g_strdup (tmp));
-		
-		cur_ptr++;
-	}
-	
-	g_strfreev (items);
-	
-	return lst;
-}
-
-static char *
-get_account_store_url (EMsgComposerHdrs *hdrs)
-{
-	CamelURL *url;
-	char *ret = NULL;
-	
-	if (hdrs->account->source && hdrs->account->source->url) {
-		url = camel_url_new (hdrs->account->source->url, NULL);
-		ret = camel_url_to_string (url, CAMEL_URL_HIDE_ALL);
-		camel_url_free (url);
-	}
-	
-	return ret;
-}                                            
-
-static char *
-folder_name_to_string (EMsgComposerHdrs *hdrs, const char *uri)
-{
-	char *storeurl = get_account_store_url (hdrs);
-	int len;
-	
-	if (storeurl) {
-		len = strlen (storeurl);
-		
-		if (g_ascii_strncasecmp (uri, storeurl, len) == 0) {
-			g_free (storeurl);
-			return g_strdup (uri + len);
-		}
-		
-		g_free (storeurl);
-	}
-	
-	return g_strdup (uri);
-}
-
-void
-e_msg_composer_hdrs_set_post_to_list (EMsgComposerHdrs *hdrs, GList *urls)
-{
-	GString *caption;
-	char *tmp;
-	gboolean post_custom;
-	
-	if (hdrs->priv->post_to.entry == NULL)
-		return;
-
-	caption = g_string_new("");
-	while (urls) {
-		tmp = folder_name_to_string(hdrs, (char *)urls->data);
-		if (tmp) {
-			if (caption->len)
-				g_string_append(caption, ", ");
-			g_string_append(caption, tmp);
-		}
-		
-		urls = g_list_next (urls);
-	}
-	
-	post_custom = hdrs->priv->post_custom;
-	gtk_entry_set_text(GTK_ENTRY(hdrs->priv->post_to.entry), caption->str);
-	hdrs->priv->post_custom = post_custom;
-
-	g_string_free(caption, TRUE);
-}
-
-void
-e_msg_composer_hdrs_set_post_to_base (EMsgComposerHdrs *hdrs, const char *base, const char *post_to)
-{
-	GList *lst, *curlist;
-	char *tmp, *tmp2;
-	gboolean post_custom;
-	GString *caption;
-	
-	/* split to newsgroup names */
-	lst = newsgroups_list_split(post_to);
-	curlist = lst;
-	
-	caption = g_string_new("");
-	while (curlist) {
-		/* FIXME: this doens't handle all folder names properly */
-		tmp2 = g_strdup_printf ("%s/%s", base, (char *)curlist->data);
-		tmp = folder_name_to_string (hdrs, tmp2);
-		g_free (tmp2);
-		if (tmp) {
-			if (caption->len)
-				g_string_append(caption, ", ");
-			g_string_append(caption, tmp);
-		}
-		curlist = g_list_next(curlist);
-	}
-	
-	post_custom = hdrs->priv->post_custom;
-	gtk_entry_set_text(GTK_ENTRY(hdrs->priv->post_to.entry), caption->str);
-	hdrs->priv->post_custom = post_custom;
-
-	g_string_free(caption, TRUE);
-        g_list_foreach(lst, (GFunc)g_free, NULL);
-	g_list_free(lst);
-}
-
-void
-e_msg_composer_hdrs_set_subject (EMsgComposerHdrs *hdrs,
-				 const char *subject)
-{
-	g_return_if_fail (E_IS_MSG_COMPOSER_HDRS (hdrs));
-	g_return_if_fail (subject != NULL);
-	
-	gtk_entry_set_text ((GtkEntry *) hdrs->priv->subject.entry, subject);
-}
-
-
-CamelInternetAddress *
-e_msg_composer_hdrs_get_from (EMsgComposerHdrs *hdrs)
-{
-	CamelInternetAddress *addr;
-	EAccount *account;
-	
-	g_return_val_if_fail (E_IS_MSG_COMPOSER_HDRS (hdrs), NULL);
-	
-	if (!(account = hdrs->account)) {
-		/* FIXME: perhaps we should try the default account? */
-		return NULL;
-	}
-	
-	addr = camel_internet_address_new ();
-	camel_internet_address_add (addr, account->id->name, account->id->address);
-	
-	return addr;
-}
-
-CamelInternetAddress *
-e_msg_composer_hdrs_get_reply_to (EMsgComposerHdrs *hdrs)
-{
-	CamelInternetAddress *addr;
-	const char *reply_to;
-	
-	g_return_val_if_fail (E_IS_MSG_COMPOSER_HDRS (hdrs), NULL);
-	
-	reply_to = gtk_entry_get_text (GTK_ENTRY (hdrs->priv->reply_to.entry));
-	
-	if (!reply_to || *reply_to == '\0')
-		return NULL;
-	
-	addr = camel_internet_address_new ();
-	if (camel_address_unformat (CAMEL_ADDRESS (addr), reply_to) == -1) {
-		camel_object_unref (CAMEL_OBJECT (addr));
-		return NULL;
-	}
-	
-	return addr;
-}
-
-static EDestination **
-destination_list_to_destv (GList *destinations)
-{
-	EDestination **destv;
-	GList *l;
-	gint   n, i;
-
-	n = g_list_length (destinations);
-
-	destv = g_new0 (EDestination *, n + 1);
-
-	for (i = 0, l = destinations; l; i++, l = g_list_next (l)) {
-		EDestination *destination = l->data;
-
-		/* Need to ref, as users expect to own it */
-		g_object_ref (destination);
-		destv [i] = l->data;
-	}
-
-	return destv;
-}
-
-EDestination **
-e_msg_composer_hdrs_get_to (EMsgComposerHdrs *hdrs)
-{
-	char *str = NULL;
-	EDestinationStore *destination_store;
-	GList *destinations;
-	EDestination **destv = NULL;
-	
-	g_return_val_if_fail (E_IS_MSG_COMPOSER_HDRS (hdrs), NULL);
-
-	destination_store = e_name_selector_entry_peek_destination_store (E_NAME_SELECTOR_ENTRY (
-		 hdrs->priv->to.entry));
-	destinations = e_destination_store_list_destinations (destination_store);
-
-	destv = destination_list_to_destv (destinations);
-
-	g_list_free (destinations);
-	return destv;
-}
-
-EDestination **
-e_msg_composer_hdrs_get_cc (EMsgComposerHdrs *hdrs)
-{
-	char *str = NULL;
-	EDestinationStore *destination_store;
-	GList *destinations;
-	EDestination **destv = NULL;
-	
-	g_return_val_if_fail (E_IS_MSG_COMPOSER_HDRS (hdrs), NULL);
-
-	destination_store = e_name_selector_entry_peek_destination_store (E_NAME_SELECTOR_ENTRY (
-		 hdrs->priv->cc.entry));
-	destinations = e_destination_store_list_destinations (destination_store);
-
-	destv = destination_list_to_destv (destinations);
-
-	g_list_free (destinations);
-	return destv;
-}
-
-EDestination **
-e_msg_composer_hdrs_get_bcc (EMsgComposerHdrs *hdrs)
-{
-	char *str = NULL;
-	EDestinationStore *destination_store;
-	GList *destinations;
-	EDestination **destv = NULL;
-	
-	g_return_val_if_fail (E_IS_MSG_COMPOSER_HDRS (hdrs), NULL);
-
-	destination_store = e_name_selector_entry_peek_destination_store (E_NAME_SELECTOR_ENTRY (
-		 hdrs->priv->bcc.entry));
-	destinations = e_destination_store_list_destinations (destination_store);
-
-	destv = destination_list_to_destv (destinations);
-
-	g_list_free (destinations);
-	return destv;
-}
-
-EDestination **
-e_msg_composer_hdrs_get_recipients (EMsgComposerHdrs *hdrs)
-{
-	EDestination **to_destv;
-	EDestination **cc_destv;
-	EDestination **bcc_destv;
-	EDestination **recip_destv;
-	int i, j, n;
-	
-	g_return_val_if_fail (E_IS_MSG_COMPOSER_HDRS (hdrs), NULL);
-	
-	to_destv  = e_msg_composer_hdrs_get_to (hdrs);
-	cc_destv  = e_msg_composer_hdrs_get_cc (hdrs);
-	bcc_destv = e_msg_composer_hdrs_get_bcc (hdrs);
-	
-	n = 0;
-	
-	for (i = 0; to_destv && to_destv[i] != NULL; i++, n++);
-	for (i = 0; cc_destv && cc_destv[i] != NULL; i++, n++);
-	for (i = 0; bcc_destv && bcc_destv[i] != NULL; i++, n++);
-	
-	if (n == 0)
-		return NULL;
-	
-	recip_destv = g_new (EDestination *, n + 1);
-	
-	j = 0;
-	
-	for (i = 0; to_destv && to_destv[i] != NULL; i++, j++)
-		recip_destv[j] = to_destv[i];
-	for (i = 0; cc_destv && cc_destv[i] != NULL; i++, j++)
-		recip_destv[j] = cc_destv[i];
-	for (i = 0; bcc_destv && bcc_destv[i] != NULL; i++, j++)
-		recip_destv[j] = bcc_destv[i];
-	
-	g_assert (j == n);
-	recip_destv[j] = NULL;
-	
-	g_free (to_destv);
-	g_free (cc_destv);
-	g_free (bcc_destv);
-	
-	return recip_destv;
-}
-
-
-GList *
-e_msg_composer_hdrs_get_post_to (EMsgComposerHdrs *hdrs)
-{
-	GList *uris, *cur;
-	char *storeurl = NULL, *tmp;
-	
-	g_return_val_if_fail (E_IS_MSG_COMPOSER_HDRS (hdrs), NULL);
-	
-	if (hdrs->priv->post_to.entry == NULL)
-		return NULL;
-	
-	tmp = g_strdup (gtk_entry_get_text (GTK_ENTRY (hdrs->priv->post_to.entry)));
-	uris = newsgroups_list_split (tmp);
-	g_free (tmp);
-	
-	cur = uris;
-	while (cur) {
-		/* FIXME: this is a bit of a hack, should use camelurl's etc */
-		if (strstr ((char *) cur->data, ":/") == NULL) {
-			/* relative folder name: convert to absolute */
-			if (!storeurl)
-				storeurl = get_account_store_url (hdrs);
-			if (!storeurl)
-				break;
-			tmp = g_strconcat (storeurl, cur->data, NULL);
-			g_free (cur->data);
-			cur->data = tmp;
-		}
-		
-		cur = cur->next;
-	}
-	
-	g_free (storeurl);
-	
-	return uris;
-}
-
-
-const char *
-e_msg_composer_hdrs_get_subject (EMsgComposerHdrs *hdrs)
-{
-	g_return_val_if_fail (E_IS_MSG_COMPOSER_HDRS (hdrs), NULL);
-	
-	return gtk_entry_get_text ((GtkEntry *) hdrs->priv->subject.entry);
-}
-
-
-GtkWidget *
-e_msg_composer_hdrs_get_reply_to_entry (EMsgComposerHdrs *hdrs)
-{
-	g_return_val_if_fail (E_IS_MSG_COMPOSER_HDRS (hdrs), NULL);
-	
-	return hdrs->priv->reply_to.entry;
-}
-
-GtkWidget *
-e_msg_composer_hdrs_get_to_entry (EMsgComposerHdrs *hdrs)
-{
-	g_return_val_if_fail (E_IS_MSG_COMPOSER_HDRS (hdrs), NULL);
-	
-	return hdrs->priv->to.entry;
-}
-
-GtkWidget *
-e_msg_composer_hdrs_get_cc_entry (EMsgComposerHdrs *hdrs)
-{
-	g_return_val_if_fail (E_IS_MSG_COMPOSER_HDRS (hdrs), NULL);
-	
-	return hdrs->priv->cc.entry;
-}
-
-GtkWidget *
-e_msg_composer_hdrs_get_bcc_entry (EMsgComposerHdrs *hdrs)
-{
-	g_return_val_if_fail (E_IS_MSG_COMPOSER_HDRS (hdrs), NULL);
-	
-	return hdrs->priv->bcc.entry;
-}
-
-GtkWidget *
-e_msg_composer_hdrs_get_post_to_label (EMsgComposerHdrs *hdrs)
-{
-	g_return_val_if_fail (E_IS_MSG_COMPOSER_HDRS (hdrs), NULL);
-	
-	return hdrs->priv->post_to.entry;
-}
-
-GtkWidget *
-e_msg_composer_hdrs_get_subject_entry (EMsgComposerHdrs *hdrs)
-{
-	g_return_val_if_fail (E_IS_MSG_COMPOSER_HDRS (hdrs), NULL);
-	
-	return hdrs->priv->subject.entry;
-}
-
-GtkWidget *
-e_msg_composer_hdrs_get_from_hbox (EMsgComposerHdrs *hdrs)
-{
-	g_return_val_if_fail (E_IS_MSG_COMPOSER_HDRS (hdrs), NULL);
-	
-	return hdrs->priv->from.entry;
-}
-
-GtkWidget *
-e_msg_composer_hdrs_get_from_omenu (EMsgComposerHdrs *hdrs)
-{
-	g_return_val_if_fail (E_IS_MSG_COMPOSER_HDRS (hdrs), NULL);
-	
-	return GTK_WIDGET (g_object_get_data ((GObject *) hdrs->priv->from.entry, "from_menu"));
-}
diff --git a/composer/e-msg-composer-hdrs.h b/composer/e-msg-composer-hdrs.h
deleted file mode 100644
index 843b06526d..0000000000
--- a/composer/e-msg-composer-hdrs.h
+++ /dev/null
@@ -1,155 +0,0 @@
-/* -*- Mode: C; indent-tabs-mode: t; c-basic-offset: 8; tab-width: 8 -*- */
-/* msg-composer-hdrs.h
- *
- * Copyright (C) 1999 Ximian, Inc.
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of version 2 of the GNU General Public
- * published by the Free Software Foundation; either version 2 of the
- * License as published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * General Public License for more details.
- *
- * You should have received a copy of the GNU General Public
- * 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_MSG_COMPOSER_HDRS_H__
-#define ___E_MSG_COMPOSER_HDRS_H__
-
-#include <gtk/gtktable.h>
-
-#include <bonobo/bonobo-ui-component.h>
-
-#include <e-util/e-account.h>
-#include <camel/camel-mime-message.h>
-#include <libebook/e-destination.h>
-
-#ifdef __cplusplus
-extern "C" {
-#pragma }
-#endif /* __cplusplus */
-
-#define E_TYPE_MSG_COMPOSER_HDRS		(e_msg_composer_hdrs_get_type ())
-#define E_MSG_COMPOSER_HDRS(obj)		(G_TYPE_CHECK_INSTANCE_CAST ((obj), E_TYPE_MSG_COMPOSER_HDRS, EMsgComposerHdrs))
-#define E_MSG_COMPOSER_HDRS_CLASS(klass)	(G_TYPE_CHECK_CLASS_CAST ((klass), E_TYPE_MSG_COMPOSER_HDRS, EMsgComposerHdrsClass))
-#define E_IS_MSG_COMPOSER_HDRS(obj)		(G_TYPE_CHECK_INSTANCE_TYPE ((obj), E_TYPE_MSG_COMPOSER_HDRS))
-#define E_IS_MSG_COMPOSER_HDRS_CLASS(klass)	(G_TYPE_CHECK_CLASS_TYPE ((obj), E_TYPE_MSG_COMPOSER_HDRS))
-
-
-typedef struct _EMsgComposerHdrs        EMsgComposerHdrs;
-typedef struct _EMsgComposerHdrsClass   EMsgComposerHdrsClass;
-typedef struct _EMsgComposerHdrsPrivate EMsgComposerHdrsPrivate;
-
-struct _EMsgComposerHdrs {
-	GtkTable parent;
-	
-	EMsgComposerHdrsPrivate *priv;
-	
-	EAccount *account;
-	
-	guint32 visible_mask;
-	
-	gboolean has_changed;
-};
-
-struct _EMsgComposerHdrsClass {
-	GtkTableClass parent_class;
-
-	void (* show_address_dialog) (EMsgComposerHdrs *hdrs);
-
-	void (* subject_changed) (EMsgComposerHdrs *hdrs, gchar *subject);
-
-	void (* hdrs_changed) (EMsgComposerHdrs *hdrs);
-
-	void (* from_changed) (EMsgComposerHdrs *hdrs);
-};
-
-typedef enum {
-	E_MSG_COMPOSER_VISIBLE_FROM       = (1 << 0),
-	E_MSG_COMPOSER_VISIBLE_REPLYTO    = (1 << 1),
-	E_MSG_COMPOSER_VISIBLE_TO         = (1 << 2),
-	E_MSG_COMPOSER_VISIBLE_CC         = (1 << 3),
-	E_MSG_COMPOSER_VISIBLE_BCC        = (1 << 4),
-	E_MSG_COMPOSER_VISIBLE_POSTTO     = (1 << 5),  /* for posting to folders */
-	E_MSG_COMPOSER_VISIBLE_SUBJECT    = (1 << 7)
-} EMsgComposerHeaderVisibleFlags;
-
-#define E_MSG_COMPOSER_VISIBLE_MASK_SENDER     (E_MSG_COMPOSER_VISIBLE_FROM | E_MSG_COMPOSER_VISIBLE_REPLYTO)
-#define E_MSG_COMPOSER_VISIBLE_MASK_BASIC      (E_MSG_COMPOSER_VISIBLE_MASK_SENDER | E_MSG_COMPOSER_VISIBLE_SUBJECT)
-#define E_MSG_COMPOSER_VISIBLE_MASK_RECIPIENTS (E_MSG_COMPOSER_VISIBLE_TO | E_MSG_COMPOSER_VISIBLE_CC | E_MSG_COMPOSER_VISIBLE_BCC)
-
-#define E_MSG_COMPOSER_VISIBLE_MASK_MAIL (E_MSG_COMPOSER_VISIBLE_MASK_BASIC | E_MSG_COMPOSER_VISIBLE_MASK_RECIPIENTS)
-#define E_MSG_COMPOSER_VISIBLE_MASK_POST (E_MSG_COMPOSER_VISIBLE_MASK_BASIC | E_MSG_COMPOSER_VISIBLE_POSTTO)
-
-
-GtkType     e_msg_composer_hdrs_get_type           (void);
-GtkWidget  *e_msg_composer_hdrs_new                (BonoboUIComponent *uic, int visible_mask, int visible_flags);
-
-void        e_msg_composer_hdrs_to_message         (EMsgComposerHdrs *hdrs,
-						    CamelMimeMessage *msg);
-
-void        e_msg_composer_hdrs_to_redirect        (EMsgComposerHdrs *hdrs,
-						    CamelMimeMessage *msg);
-
-
-void        e_msg_composer_hdrs_set_from_account   (EMsgComposerHdrs *hdrs,
-						    const char *account_name);
-void        e_msg_composer_hdrs_set_reply_to       (EMsgComposerHdrs *hdrs,
-						    const char *reply_to);
-void        e_msg_composer_hdrs_set_to             (EMsgComposerHdrs *hdrs,
-						    EDestination    **to_destv);
-void        e_msg_composer_hdrs_set_cc             (EMsgComposerHdrs *hdrs,
-						    EDestination    **cc_destv);
-void        e_msg_composer_hdrs_set_bcc            (EMsgComposerHdrs *hdrs,
-						    EDestination    **bcc_destv);
-void        e_msg_composer_hdrs_set_post_to        (EMsgComposerHdrs *hdrs,
-						    const char       *post_to);
-void        e_msg_composer_hdrs_set_post_to_list   (EMsgComposerHdrs *hdrs,
-						    GList *urls);
-void        e_msg_composer_hdrs_set_post_to_base   (EMsgComposerHdrs *hdrs,
-					            const char       *base,
-						    const char       *post_to);
-void        e_msg_composer_hdrs_set_subject        (EMsgComposerHdrs *hdrs,
-						    const char       *subject);
-
-CamelInternetAddress *e_msg_composer_hdrs_get_from (EMsgComposerHdrs *hdrs);
-CamelInternetAddress *e_msg_composer_hdrs_get_reply_to (EMsgComposerHdrs *hdrs);
-
-EDestination **e_msg_composer_hdrs_get_to          (EMsgComposerHdrs *hdrs);
-EDestination **e_msg_composer_hdrs_get_cc          (EMsgComposerHdrs *hdrs);
-EDestination **e_msg_composer_hdrs_get_bcc         (EMsgComposerHdrs *hdrs);
-EDestination **e_msg_composer_hdrs_get_recipients  (EMsgComposerHdrs *hdrs);
-const char    *e_msg_composer_hdrs_get_subject     (EMsgComposerHdrs *hdrs);
-
-/* list of gchar* uris; this data is to be freed by the caller */
-GList         *e_msg_composer_hdrs_get_post_to     (EMsgComposerHdrs *hdrs);
-
-GtkWidget  *e_msg_composer_hdrs_get_from_hbox      (EMsgComposerHdrs *hdrs);
-GtkWidget  *e_msg_composer_hdrs_get_from_omenu     (EMsgComposerHdrs *hdrs);
-GtkWidget  *e_msg_composer_hdrs_get_reply_to_entry (EMsgComposerHdrs *hdrs);
-GtkWidget  *e_msg_composer_hdrs_get_to_entry       (EMsgComposerHdrs *hdrs);
-GtkWidget  *e_msg_composer_hdrs_get_cc_entry       (EMsgComposerHdrs *hdrs);
-GtkWidget  *e_msg_composer_hdrs_get_bcc_entry      (EMsgComposerHdrs *hdrs);
-GtkWidget  *e_msg_composer_hdrs_get_post_to_label  (EMsgComposerHdrs *hdrs);
-GtkWidget  *e_msg_composer_hdrs_get_subject_entry  (EMsgComposerHdrs *hdrs);
-
-void        e_msg_composer_hdrs_set_visible_mask   (EMsgComposerHdrs *hdrs,
-						    int visible_mask);
-void        e_msg_composer_hdrs_set_visible        (EMsgComposerHdrs *hdrs,
-						    int visible_flags);
-
-#ifdef _cplusplus
-}
-#endif /* _cplusplus */
-
-
-#endif /* __E_MSG_COMPOSER_HDRS_H__ */
diff --git a/composer/e-msg-composer-select-file.c b/composer/e-msg-composer-select-file.c
deleted file mode 100644
index e93c39dcd2..0000000000
--- a/composer/e-msg-composer-select-file.c
+++ /dev/null
@@ -1,236 +0,0 @@
-/* -*- Mode: C; indent-tabs-mode: t; c-basic-offset: 8; tab-width: 8 -*- */
-/*
- *  Authors: Ettore Perazzoli <ettore@ximian.com>
- *           Jeffrey Stedfast <fejj@ximian.com>
- *	     Michael Zucchi <notzed@ximian.com>
- *
- *  Copyright 2002 Ximian, Inc. (www.ximian.com)
- *
- *  This program is free software; you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation; either version 2 of the License, or
- *  (at your option) any later version.
- *
- *  This program is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with this program; if not, write to the Free Software
- *  Foundation, Inc., 59 Temple Street #330, Boston, MA 02111-1307, USA.
- *
- */
-
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
-
-#include <gtk/gtkbox.h>
-#include <gtk/gtkcheckbutton.h>
-#include <gtk/gtkmain.h>
-#include <gtk/gtksignal.h>
-#include <gtk/gtkversion.h>
-
-#ifdef USE_GTKFILECHOOSER
-#include <gtk/gtkfilechooser.h>
-#include <gtk/gtkfilechooserdialog.h>
-#include <gtk/gtkstock.h>
-#else
-#include <gtk/gtkfilesel.h>
-#endif
-
-#include <libgnomeui/gnome-uidefs.h>
-#include <libgnome/gnome-i18n.h>
-
-#include "e-msg-composer-select-file.h"
-#include <e-util/e-icon-factory.h>
-
-enum {
-	SELECTOR_MODE_MULTI    = (1 << 0),
-	SELECTOR_MODE_SAVE     = (1 << 1),
-	SELECTOR_SHOW_INLINE = 1<<2
-};
-
-/* this is a mess */
-
-static GtkWidget*
-get_selector(struct _EMsgComposer *composer, const char *title, guint32 flags)
-{
-	GtkWidget *selection;
-	GtkWidget *showinline = NULL;
-	char *path;
-	GList *icon_list;
-	
-	path = g_object_get_data ((GObject *) composer, "attach_path");
-	
-#ifdef USE_GTKFILECHOOSER
-	if (flags & SELECTOR_MODE_SAVE)
-		selection = gtk_file_chooser_dialog_new (title,
-							 NULL,
-							 GTK_FILE_CHOOSER_ACTION_SAVE,
-							 GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL,
-							 GTK_STOCK_SAVE, GTK_RESPONSE_OK,
-							 NULL);
-	else
-		selection = gtk_file_chooser_dialog_new (title,
-							 NULL,
-							 GTK_FILE_CHOOSER_ACTION_OPEN,
-							 GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL,
-							 GTK_STOCK_OPEN, GTK_RESPONSE_OK,
-							 NULL);
-	
-	gtk_dialog_set_default_response (GTK_DIALOG (selection), GTK_RESPONSE_OK);
-	
-	if ((flags & SELECTOR_MODE_SAVE) == 0)
-		gtk_file_chooser_set_select_multiple ((GtkFileChooser *) selection, (flags & SELECTOR_MODE_MULTI));
-	
-	/* restore last path used */
-	if (!path)
-		gtk_file_chooser_set_current_folder (GTK_FILE_CHOOSER (selection), g_get_home_dir ());
-	else
-		gtk_file_chooser_set_current_folder (GTK_FILE_CHOOSER (selection), path);
-	
-        if (flags & SELECTOR_SHOW_INLINE) {
-		showinline = gtk_check_button_new_with_label (_("Suggest automatic display of attachment"));
-		gtk_widget_show (showinline);
-		gtk_file_chooser_set_extra_widget (GTK_FILE_CHOOSER (selection), showinline);
-		g_object_set_data((GObject *)selection, "show-inline", showinline);
-        }
-#else
-	selection = gtk_file_selection_new (title);
-	
-	gtk_file_selection_set_select_multiple ((GtkFileSelection *) selection, (flags & SELECTOR_MODE_MULTI));
-	
-	/* restore last path used */
-	if (!path) {
-		path = g_strdup_printf ("%s/", g_get_home_dir ());
-		gtk_file_selection_set_filename (GTK_FILE_SELECTION (selection), path);
-		g_free (path);
-	} else {
-		gtk_file_selection_set_filename (GTK_FILE_SELECTION (selection), path);
-	}
-	
-        if (flags & SELECTOR_SHOW_INLINE) {
-		showinline = gtk_check_button_new_with_label (_("Suggest automatic display of attachment"));
-		gtk_widget_show (showinline);
-		gtk_box_pack_end (GTK_BOX (GTK_FILE_SELECTION (selection)->main_vbox), showinline, FALSE, FALSE, 4);
-		g_object_set_data((GObject *)selection, "show-inline", showinline);
-	}
-#endif
-	
-	gtk_window_set_transient_for ((GtkWindow *) selection, (GtkWindow *) composer);
-	gtk_window_set_wmclass ((GtkWindow *) selection, "fileselection", "Evolution:composer");
-	gtk_window_set_modal ((GtkWindow *) selection, FALSE);
-	
-	icon_list = e_icon_factory_get_icon_list ("stock_mail-compose");
-	if (icon_list) {
-		gtk_window_set_icon_list (GTK_WINDOW (selection), icon_list);
-		g_list_foreach (icon_list, (GFunc) g_object_unref, NULL);
-		g_list_free (icon_list);
-	}
-	
-	return selection;
-}
-
-static void
-select_file_response(GtkWidget *selector, guint response, struct _EMsgComposer *composer)
-{
-	if (response == GTK_RESPONSE_OK) {
-		const char *name;
-		char *path;
-		EMsgComposerSelectFileFunc func = g_object_get_data((GObject *)selector, "callback");
-
-#ifdef USE_GTKFILECHOOSER
-		name = gtk_file_chooser_get_filename (GTK_FILE_CHOOSER (selector));
-		path = g_path_get_dirname (gtk_file_chooser_get_filename (GTK_FILE_CHOOSER (selector)));
-#else
-		name = gtk_file_selection_get_filename (GTK_FILE_SELECTION (selector));
-		path = g_path_get_dirname (gtk_file_selection_get_filename (GTK_FILE_SELECTION (selector)));
-#endif
-		g_object_set_data_full ((GObject *) composer, "attach_path", path, g_free);
-
-		func(composer, name);
-	}
-
-	gtk_widget_destroy(selector);
-}
-
-/**
- * e_msg_composer_select_file:
- * @composer: a composer
- * @w: widget pointer, so same dialog is not re-shown
- * @func: callback invoked if the user selected a file
- * @title: the title for the file selection dialog box
- * @save: whether the file selection box should be shown in save mode or not
- *
- * This pops up a file selection dialog box with the given title
- * and allows the user to select a single file.
- *
- **/
-void e_msg_composer_select_file(struct _EMsgComposer *composer, GtkWidget **w, EMsgComposerSelectFileFunc func, const char *title, int save)
-{
-	if (*w) {
-		gtk_window_present((GtkWindow *)*w);			
-		return;
-	}
-
-	*w = get_selector (composer, title, save ? SELECTOR_MODE_SAVE : 0);
-	g_signal_connect(*w, "response", G_CALLBACK(select_file_response), composer);
-	g_signal_connect(*w, "destroy", G_CALLBACK(gtk_widget_destroyed), w);
-	g_object_set_data((GObject *)*w, "callback", func);
-	gtk_widget_show(*w);
-}
-
-
-static void
-select_attach_response(GtkWidget *selector, guint response, struct _EMsgComposer *composer)
-{
-	if (response == GTK_RESPONSE_OK) {
-		GSList *names;
-		EMsgComposerSelectAttachFunc func = g_object_get_data((GObject *)selector, "callback");
-		GtkToggleButton *showinline = g_object_get_data((GObject *)selector, "show-inline");
-		char *path;
-
-#ifdef USE_GTKFILECHOOSER
-		names = gtk_file_chooser_get_filenames (GTK_FILE_CHOOSER (selector));
-		path = g_path_get_dirname (gtk_file_chooser_get_filename (GTK_FILE_CHOOSER (selector)));
-#else
-		char **files;
-		int i;
-		
-		names = NULL;
-		if ((files = gtk_file_selection_get_selections (GTK_FILE_SELECTION (selector)))) {
-			for (i = 0; files[i]; i++)
-				names = g_slist_prepend(names, files[i]);
-			
-			g_free (files);
-			names = g_slist_reverse(names);
-		}
-
-		path = g_path_get_dirname (gtk_file_selection_get_filename (GTK_FILE_SELECTION (selector)));		
-#endif
-		g_object_set_data_full ((GObject *) composer, "attach_path", path, g_free);
-
-		func(composer, names, gtk_toggle_button_get_active(showinline));
-
-		g_slist_foreach(names, (GFunc)g_free, NULL);
-		g_slist_free(names);
-	}
-
-	gtk_widget_destroy(selector);
-}
-
-void e_msg_composer_select_file_attachments(struct _EMsgComposer *composer, GtkWidget **w, EMsgComposerSelectAttachFunc func)
-{
-	if (*w) {
-		gtk_window_present((GtkWindow *)*w);			
-		return;
-	}
-
-	*w = get_selector (composer, _("Attach file(s)"), SELECTOR_MODE_MULTI|SELECTOR_SHOW_INLINE);
-	g_signal_connect(*w, "response", G_CALLBACK(select_attach_response), composer);
-	g_signal_connect(*w, "destroy", G_CALLBACK(gtk_widget_destroyed), w);
-	g_object_set_data((GObject *)*w, "callback", func);
-	gtk_widget_show(*w);
-}
diff --git a/composer/e-msg-composer-select-file.h b/composer/e-msg-composer-select-file.h
deleted file mode 100644
index 76535b9d91..0000000000
--- a/composer/e-msg-composer-select-file.h
+++ /dev/null
@@ -1,36 +0,0 @@
-/* -*- Mode: C; indent-tabs-mode: t; c-basic-offset: 8; tab-width: 8 -*- */
-/* e-msg-composer-select-file.c
- *
- * Copyright (C) 2000 Ximian, Inc.
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of version 2 of the GNU General Public
- * published by the Free Software Foundation; either version 2 of the
- * License as published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * General Public License for more details.
- *
- * You should have received a copy of the GNU General Public
- * 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_MSG_COMPOSER_SELECT_FILE_H
-#define E_MSG_COMPOSER_SELECT_FILE_H
-
-
-struct _EMsgComposer;
-
-typedef void (*EMsgComposerSelectFileFunc)(struct _EMsgComposer *composer, const char *filename);
-typedef void (*EMsgComposerSelectAttachFunc)(struct _EMsgComposer *composer, GSList *names, int inline);
-
-void e_msg_composer_select_file(struct _EMsgComposer *composer, GtkWidget **w, EMsgComposerSelectFileFunc func, const char *title, int save);
-void e_msg_composer_select_file_attachments(struct _EMsgComposer *composer, GtkWidget **, EMsgComposerSelectAttachFunc func);
-
-#endif /* E_MSG_COMPOSER_SELECT_FILE_H */
diff --git a/composer/e-msg-composer.c b/composer/e-msg-composer.c
deleted file mode 100644
index a1d1cc12c4..0000000000
--- a/composer/e-msg-composer.c
+++ /dev/null
@@ -1,5671 +0,0 @@
-/* -*- Mode: C; indent-tabs-mode: t; c-basic-offset: 8; tab-width: 8 -*- */
-/* e-msg-composer.c
- *
- * Copyright (C) 1999-2003 Ximian, Inc. (www.ximian.com)
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of version 2 of the GNU General Public
- * published by the Free Software Foundation; either version 2 of the
- * License as published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * General Public License for more details.
- *
- * You should have received a copy of the GNU General Public
- * License along with this program; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
- *
- * Authors:
- *   Ettore Perazzoli (ettore@ximian.com)
- *   Jeffrey Stedfast (fejj@ximian.com)
- *   Miguel de Icaza  (miguel@ximian.com)
- *   Radek Doulik     (rodo@ximian.com)
- * 
- */
-
-/*
-
-   TODO
-
-   - Somehow users should be able to see if any file(s) are attached even when
-     the attachment bar is not shown.
-
-   Should use EventSources to keep track of global changes made to configuration
-   values.  Right now it ignores the problem olympically. Miguel.
-*/
-
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
-
-#define SMIME_SUPPORTED 1
-
-#include <string.h>
-#include <stdlib.h>
-#include <dirent.h>
-#include <sys/time.h>
-#include <sys/types.h>
-#include <sys/stat.h>
-#include <sys/wait.h>
-#include <fcntl.h>
-#include <unistd.h>
-#include <errno.h>
-#include <ctype.h>
-
-#include <gtk/gtkoptionmenu.h>
-#include <gtk/gtkscrolledwindow.h>
-#include <gtk/gtkmain.h>
-#include <gtk/gtkmenuitem.h>
-#include <gtk/gtklabel.h>
-#include <gtk/gtkstock.h>
-#include <gtk/gtkdnd.h>
-#include <gtk/gtkvbox.h>
-#include <gtk/gtkhbox.h>
-#include <gtk/gtkimage.h>
-
-#include <gconf/gconf.h>
-#include <gconf/gconf-client.h>
-
-#include <libgnome/gnome-exec.h>
-#include <libgnome/gnome-i18n.h>
-#include <libgnomeui/gnome-uidefs.h>
-#include <libgnomeui/gnome-window-icon.h>
-
-#include <bonobo/bonobo-exception.h>
-#include <bonobo/bonobo-moniker-util.h>
-#include <bonobo/bonobo-stream-memory.h>
-#include <bonobo/bonobo-ui-util.h>
-#include <bonobo/bonobo-widget.h>
-
-#include <libgnomevfs/gnome-vfs.h>
-
-#include <gtkhtml/htmlselection.h>
-
-#include <glade/glade.h>
-
-#include <libedataserver/e-iconv.h>
-#include <gal/e-text/e-entry.h>
-
-#include "e-util/e-dialog-utils.h"
-#include "e-util/e-signature-list.h"
-#include "widgets/misc/e-charset-picker.h"
-#include "widgets/misc/e-expander.h"
-#include "widgets/misc/e-error.h"
-
-#include <camel/camel-session.h>
-#include <camel/camel-charset-map.h>
-#include <camel/camel-stream-filter.h>
-#include <camel/camel-mime-filter-charset.h>
-#include <camel/camel-stream-mem.h>
-#include <camel/camel-stream-fs.h>
-#include <camel/camel-mime-filter-tohtml.h>
-#include <camel/camel-multipart-signed.h>
-#include <camel/camel-multipart-encrypted.h>
-#include <camel/camel-string-utils.h>
-#include <camel/camel-cipher-context.h>
-#if defined (HAVE_NSS) && defined (SMIME_SUPPORTED)
-#include <camel/camel-smime-context.h>
-#endif
-
-#include "mail/em-utils.h"
-#include "mail/em-composer-utils.h"
-#include "mail/mail-config.h"
-#include "mail/mail-crypto.h"
-#include "mail/mail-tools.h"
-#include "mail/mail-ops.h"
-#include "mail/mail-mt.h"
-#include "mail/mail-session.h"
-#include "mail/em-popup.h"
-#include "mail/em-menu.h"
-
-#include "e-msg-composer.h"
-#include "e-msg-composer-attachment-bar.h"
-#include "e-msg-composer-hdrs.h"
-#include "e-msg-composer-select-file.h"
-
-#include "evolution-shell-component-utils.h"
-#include <e-util/e-icon-factory.h>
-
-#include "Editor.h"
-#include "listener.h"
-
-#define GNOME_GTKHTML_EDITOR_CONTROL_ID "OAFIID:GNOME_GtkHTML_Editor:" GTKHTML_API_VERSION
-
-#define d(x)
-
-#define _PRIVATE(o) (g_type_instance_get_private ((GTypeInstance *)o, e_msg_composer_get_type()))
-
-typedef struct _EMsgComposerPrivate {
-	EMMenu *menu;
-
-	GtkWidget *saveas;	/* saveas async file requester */
-	GtkWidget *load;	/* same for load - not used */
-} EMsgComposerPrivate;
-
-enum {
-	SEND,
-	SAVE_DRAFT,
-	LAST_SIGNAL
-};
-
-static guint signals[LAST_SIGNAL] = { 0 };
-
-enum {
-	DND_TYPE_MESSAGE_RFC822,
-	DND_TYPE_X_UID_LIST,
-	DND_TYPE_TEXT_URI_LIST,
-	DND_TYPE_NETSCAPE_URL,
-	DND_TYPE_TEXT_VCARD,
-	DND_TYPE_TEXT_CALENDAR,
-};
-
-static GtkTargetEntry drop_types[] = {
-	{ "message/rfc822", 0, DND_TYPE_MESSAGE_RFC822 },
-	{ "x-uid-list", 0, DND_TYPE_X_UID_LIST },
-	{ "text/uri-list", 0, DND_TYPE_TEXT_URI_LIST },
-	{ "_NETSCAPE_URL", 0, DND_TYPE_NETSCAPE_URL },
-	{ "text/x-vcard", 0, DND_TYPE_TEXT_VCARD },
-	{ "text/calendar", 0, DND_TYPE_TEXT_CALENDAR },
-};
-
-#define num_drop_types (sizeof (drop_types) / sizeof (drop_types[0]))
-
-static struct {
-	char *target;
-	GdkAtom atom;
-	guint32 actions;
-} drag_info[] = {
-	{ "message/rfc822", 0, GDK_ACTION_COPY },
-	{ "x-uid-list", 0, GDK_ACTION_ASK|GDK_ACTION_MOVE|GDK_ACTION_COPY },
-	{ "text/uri-list", 0, GDK_ACTION_COPY },
-	{ "_NETSCAPE_URL", 0, GDK_ACTION_COPY },
-	{ "text/x-vcard", 0, GDK_ACTION_COPY },
-	{ "text/calendar", 0, GDK_ACTION_COPY },
-};
-
-static const char *emc_draft_format_names[] = { "pgp-sign", "pgp-encrypt", "smime-sign", "smime-encrypt" };
-
-
-/* The parent class.  */
-static BonoboWindowClass *parent_class = NULL;
-
-/* All the composer windows open, for bookkeeping purposes.  */
-static GSList *all_composers = NULL;
-
-
-/* local prototypes */
-static GList *add_recipients (GList *list, const char *recips);
-
-static void handle_mailto (EMsgComposer *composer, const char *mailto);
-
-/* used by e_msg_composer_add_message_attachments() */
-static void add_attachments_from_multipart (EMsgComposer *composer, CamelMultipart *multipart,
-					    gboolean just_inlines, int depth);
-
-/* used by e_msg_composer_new_with_message() */
-static void handle_multipart (EMsgComposer *composer, CamelMultipart *multipart, int depth);
-static void handle_multipart_alternative (EMsgComposer *composer, CamelMultipart *multipart, int depth);
-static void handle_multipart_encrypted (EMsgComposer *composer, CamelMultipart *multipart, int depth);
-static void handle_multipart_signed (EMsgComposer *composer, CamelMultipart *multipart, int depth);
-
-static void set_editor_signature (EMsgComposer *composer);
-
-
-static EDestination**
-destination_list_to_vector_sized (GList *list, int n)
-{
-	EDestination **destv;
-	int i = 0;
-	
-	if (n == -1)
-		n = g_list_length (list);
-	
-	if (n == 0)
-		return NULL;
-	
-	destv = g_new (EDestination *, n + 1);
-	while (list != NULL && i < n) {
-		destv[i] = E_DESTINATION (list->data);
-		list->data = NULL;
-		i++;
-		list = g_list_next (list);
-	}
-	destv[i] = NULL;
-	
-	return destv;
-}
-
-static EDestination**
-destination_list_to_vector (GList *list)
-{
-	return destination_list_to_vector_sized (list, -1);
-}
-
-static GByteArray *
-get_text (Bonobo_PersistStream persist, char *format)
-{
-	BonoboStream *stream;
-	BonoboStreamMem *stream_mem;
-	CORBA_Environment ev;
-	GByteArray *text;
-	
-	CORBA_exception_init (&ev);
-	
-	stream = bonobo_stream_mem_create (NULL, 0, FALSE, TRUE);
-	Bonobo_PersistStream_save (persist, (Bonobo_Stream)bonobo_object_corba_objref (BONOBO_OBJECT (stream)),
-				   format, &ev);
-	if (ev._major != CORBA_NO_EXCEPTION) {
-		g_warning ("Exception getting mail '%s'",
-			   bonobo_exception_get_text (&ev));
-		return NULL;
-	}
-	
-	CORBA_exception_free (&ev);
-	
-	stream_mem = BONOBO_STREAM_MEM (stream);
-	text = g_byte_array_new ();
-	g_byte_array_append (text, stream_mem->buffer, stream_mem->pos);
-	bonobo_object_unref (BONOBO_OBJECT (stream));
-	
-	return text;
-}
-
-#define LINE_LEN 72
-
-static CamelTransferEncoding
-best_encoding (GByteArray *buf, const char *charset)
-{
-	char *in, *out, outbuf[256], *ch;
-	size_t inlen, outlen;
-	int status, count = 0;
-	iconv_t cd;
-	
-	if (!charset)
-		return -1;
-	
-	cd = e_iconv_open (charset, "utf-8");
-	if (cd == (iconv_t) -1)
-		return -1;
-	
-	in = buf->data;
-	inlen = buf->len;
-	do {
-		out = outbuf;
-		outlen = sizeof (outbuf);
-		status = e_iconv (cd, (const char **) &in, &inlen, &out, &outlen);
-		for (ch = out - 1; ch >= outbuf; ch--) {
-			if ((unsigned char)*ch > 127)
-				count++;
-		}
-	} while (status == (size_t) -1 && errno == E2BIG);
-	e_iconv_close (cd);
-	
-	if (status == (size_t) -1)
-		return -1;
-	
-	if (count == 0)
-		return CAMEL_TRANSFER_ENCODING_7BIT;
-	else if (count <= buf->len * 0.17)
-		return CAMEL_TRANSFER_ENCODING_QUOTEDPRINTABLE;
-	else
-		return CAMEL_TRANSFER_ENCODING_BASE64;
-}
-
-static char *
-composer_get_default_charset_setting (void)
-{
-	GConfClient *gconf;
-	const char *locale;
-	char *charset;
-	
-	gconf = gconf_client_get_default ();
-	charset = gconf_client_get_string (gconf, "/apps/evolution/mail/composer/charset", NULL);
-	
-	if (!charset || charset[0] == '\0') {
-		g_free (charset);
-		charset = gconf_client_get_string (gconf, "/apps/evolution/mail/format/charset", NULL);
-		if (charset && charset[0] == '\0') {
-			g_free (charset);
-			charset = NULL;
-		}
-	}
-	
-	g_object_unref (gconf);
-	
-	if (!charset && (locale = e_iconv_locale_charset ()))
-		charset = g_strdup (locale);
-	
-	return charset ? charset : g_strdup ("us-ascii");
-}
-
-static char *
-best_charset (GByteArray *buf, const char *default_charset, CamelTransferEncoding *encoding)
-{
-	char *charset;
-	
-	/* First try US-ASCII */
-	*encoding = best_encoding (buf, "US-ASCII");
-	if (*encoding == CAMEL_TRANSFER_ENCODING_7BIT)
-		return NULL;
-	
-	/* Next try the user-specified charset for this message */
-	*encoding = best_encoding (buf, default_charset);
-	if (*encoding != -1)
-		return g_strdup (default_charset);
-	
-	/* Now try the user's default charset from the mail config */
-	charset = composer_get_default_charset_setting ();
-	*encoding = best_encoding (buf, charset);
-	if (*encoding != -1)
-		return charset;
-	
-	/* Try to find something that will work */
-	if (!(charset = (char *) camel_charset_best (buf->data, buf->len))) {
-		*encoding = CAMEL_TRANSFER_ENCODING_7BIT;
-		return NULL;
-	}
-	
-	*encoding = best_encoding (buf, charset);
-	
-	return g_strdup (charset);
-}
-
-static gboolean
-clear_inline_images (gpointer key, gpointer value, gpointer user_data)
-{
-	g_free (key);
-	camel_object_unref (value);
-
-	return TRUE;
-}
-
-static void
-clear_current_images (EMsgComposer *composer)
-{
-	g_list_free (composer->current_images);
-	composer->current_images = NULL;
-}
-
-static gboolean
-clear_url (gpointer key, gpointer value, gpointer user_data)
-{
-	g_free (key);
-
-	return TRUE;
-}
-
-void
-e_msg_composer_clear_inlined_table (EMsgComposer *composer)
-{
-	g_hash_table_foreach_remove (composer->inline_images, clear_inline_images, NULL);
-	g_hash_table_foreach_remove (composer->inline_images_by_url, clear_url, NULL);
-}
-
-static void
-add_inlined_images (EMsgComposer *composer, CamelMultipart *multipart)
-{
-	GList *d = composer->current_images;
-	GHashTable *added;
-
-	added = g_hash_table_new (g_direct_hash, g_direct_equal);
-	while (d) {
-		CamelMimePart *part = d->data;
-
-		if (!g_hash_table_lookup (added, part)) {
-			camel_multipart_add_part (multipart, part);
-			g_hash_table_insert (added, part, part);
-		}
-		d = d->next;
-	}
-	g_hash_table_destroy (added);
-}
-
-/* This functions builds a CamelMimeMessage for the message that the user has
- * composed in `composer'.
- */
-static CamelMimeMessage *
-build_message (EMsgComposer *composer, gboolean save_html_object_data)
-{
-	EMsgComposerAttachmentBar *attachment_bar =
-		E_MSG_COMPOSER_ATTACHMENT_BAR (composer->attachment_bar);
-	EMsgComposerHdrs *hdrs = E_MSG_COMPOSER_HDRS (composer->hdrs);
-	CamelDataWrapper *plain, *html, *current;
-	CamelTransferEncoding plain_encoding;
-	const char *iconv_charset = NULL;
-	GPtrArray *recipients = NULL;
-	CamelMultipart *body = NULL;
-	CamelContentType *type;
-	CamelMimeMessage *new;
-	CamelStream *stream;
-	CamelMimePart *part;
-	CamelException ex;
-	GByteArray *data;
-	char *charset;
-	int i;
-	
-	if (composer->persist_stream_interface == CORBA_OBJECT_NIL)
-		return NULL;
-	
-	/* evil kludgy hack for Redirect */
-	if (composer->redirect) {
-		e_msg_composer_hdrs_to_redirect (hdrs, composer->redirect);
-		camel_object_ref (composer->redirect);
-		return composer->redirect;
-	}
-	
-	new = camel_mime_message_new ();
-	e_msg_composer_hdrs_to_message (hdrs, new);
-	for (i = 0; i < composer->extra_hdr_names->len; i++) {
-		camel_medium_add_header (CAMEL_MEDIUM (new),
-					 composer->extra_hdr_names->pdata[i],
-					 composer->extra_hdr_values->pdata[i]);
-	}
-	
-	if (composer->mime_body) {
-		plain_encoding = CAMEL_TRANSFER_ENCODING_7BIT;
-		for (i = 0; composer->mime_body[i]; i++) {
-			if ((unsigned char) composer->mime_body[i] > 127) {
-				plain_encoding = CAMEL_TRANSFER_ENCODING_QUOTEDPRINTABLE;
-				break;
-			}
-		}
-		data = g_byte_array_new ();
-		g_byte_array_append (data, composer->mime_body, strlen (composer->mime_body));
-		type = camel_content_type_decode (composer->mime_type);
-	} else {
-		data = get_text (composer->persist_stream_interface, "text/plain");
-		if (!data) {
-			/* The component has probably died */
-			camel_object_unref (CAMEL_OBJECT (new));
-			return NULL;
-		}
-		
-		/* FIXME: we may want to do better than this... */
-		charset = best_charset (data, composer->charset, &plain_encoding);
-		type = camel_content_type_new ("text", "plain");
-		if ((charset = best_charset (data, composer->charset, &plain_encoding))) {
-			camel_content_type_set_param (type, "charset", charset);
-			iconv_charset = e_iconv_charset_name (charset);
-			g_free (charset);
-		}
-	}
-	
-	stream = camel_stream_mem_new_with_byte_array (data);
-	
-	/* convert the stream to the appropriate charset */
-	if (iconv_charset && g_ascii_strcasecmp (iconv_charset, "UTF-8") != 0) {
-		CamelStreamFilter *filter_stream;
-		CamelMimeFilterCharset *filter;
-		
-		filter_stream = camel_stream_filter_new_with_stream (stream);
-		camel_object_unref (stream);
-		
-		stream = (CamelStream *) filter_stream;
-		filter = camel_mime_filter_charset_new_convert ("UTF-8", iconv_charset);
-		camel_stream_filter_add (filter_stream, (CamelMimeFilter *) filter);
-		camel_object_unref (filter);
-	}
-	
-	/* construct the content object */
-	plain = camel_data_wrapper_new ();
-	camel_data_wrapper_construct_from_stream (plain, stream);
-	camel_object_unref (stream);
-	
-	camel_data_wrapper_set_mime_type_field (plain, type);
-	camel_content_type_unref (type);
-	
-	if (composer->send_html) {
-		CORBA_Environment ev;
-		clear_current_images (composer);
-		
-		if (save_html_object_data) {
-			CORBA_exception_init (&ev);
-			GNOME_GtkHTML_Editor_Engine_runCommand (composer->editor_engine, "save-data-on", &ev);
-		}
-		data = get_text (composer->persist_stream_interface, "text/html");		
-		if (save_html_object_data) {
-			GNOME_GtkHTML_Editor_Engine_runCommand (composer->editor_engine, "save-data-off", &ev);
-			CORBA_exception_free (&ev);
-		}
-		
-		if (!data) {
-			/* The component has probably died */
-			camel_object_unref (new);
-			camel_object_unref (plain);
-			return NULL;
-		}
-		
-		html = camel_data_wrapper_new ();
-		
-		stream = camel_stream_mem_new_with_byte_array (data);
-		camel_data_wrapper_construct_from_stream (html, stream);
-		camel_object_unref (stream);
-		camel_data_wrapper_set_mime_type (html, "text/html; charset=utf-8");
-		
-		/* Build the multipart/alternative */
-		body = camel_multipart_new ();
-		camel_data_wrapper_set_mime_type (CAMEL_DATA_WRAPPER (body),
-						  "multipart/alternative");
-		camel_multipart_set_boundary (body, NULL);
-		
-		part = camel_mime_part_new ();
-		camel_medium_set_content_object (CAMEL_MEDIUM (part), plain);
-		camel_object_unref (plain);
-		camel_mime_part_set_encoding (part, plain_encoding);
-		camel_multipart_add_part (body, part);
-		camel_object_unref (part);
-		
-		part = camel_mime_part_new ();
-		camel_medium_set_content_object (CAMEL_MEDIUM (part), html);
-		camel_object_unref (html);
-		camel_multipart_add_part (body, part);
-		camel_object_unref (part);
-		
-		/* If there are inlined images, construct a
-		 * multipart/related containing the
-		 * multipart/alternative and the images.
-		 */
-		if (composer->current_images) {
-			CamelMultipart *html_with_images;
-			
-			html_with_images = camel_multipart_new ();
-			camel_data_wrapper_set_mime_type (
-				CAMEL_DATA_WRAPPER (html_with_images),
-				"multipart/related; type=\"multipart/alternative\"");
-			camel_multipart_set_boundary (html_with_images, NULL);
-			
-			part = camel_mime_part_new ();
-			camel_medium_set_content_object (CAMEL_MEDIUM (part), CAMEL_DATA_WRAPPER (body));
-			camel_object_unref (body);
-			camel_multipart_add_part (html_with_images, part);
-			camel_object_unref (part);
-			
-			add_inlined_images (composer, html_with_images);
-			clear_current_images (composer);
-			
-			current = CAMEL_DATA_WRAPPER (html_with_images);
-		} else
-			current = CAMEL_DATA_WRAPPER (body);
-	} else
-		current = plain;
-	
-	if (e_msg_composer_attachment_bar_get_num_attachments (attachment_bar)) {
-		CamelMultipart *multipart = camel_multipart_new ();
-		
-		if (composer->is_alternative) {
-			camel_data_wrapper_set_mime_type (CAMEL_DATA_WRAPPER (multipart),
-							  "multipart/alternative");
-		}
-		
-		/* Generate a random boundary. */
-		camel_multipart_set_boundary (multipart, NULL);
-		
-		part = camel_mime_part_new ();
-		camel_medium_set_content_object (CAMEL_MEDIUM (part), current);
-		if (current == plain)
-			camel_mime_part_set_encoding (part, plain_encoding);
-		camel_object_unref (current);
-		camel_multipart_add_part (multipart, part);
-		camel_object_unref (part);
-		
-		e_msg_composer_attachment_bar_to_multipart (attachment_bar, multipart, composer->charset);
-		
-		if (composer->is_alternative) {
-			int i;
-			
-			for (i = camel_multipart_get_number (multipart); i > 1; i--) {
-				part = camel_multipart_get_part (multipart, i - 1);
-				camel_medium_remove_header (CAMEL_MEDIUM (part), "Content-Disposition");
-			}
-		}
-		
-		current = CAMEL_DATA_WRAPPER (multipart);
-	}
-	
-	camel_exception_init (&ex);
-
-	/* Setup working recipient list if we're encrypting */
-	if (composer->pgp_encrypt
-#if defined (HAVE_NSS) && defined (SMIME_SUPPORTED)
-	    || composer->smime_encrypt
-#endif
-		) {
-		int i, j;
-		const char *types[] = { CAMEL_RECIPIENT_TYPE_TO, CAMEL_RECIPIENT_TYPE_CC, CAMEL_RECIPIENT_TYPE_BCC };
-
-		recipients = g_ptr_array_new();
-		for (i=0; i < sizeof(types)/sizeof(types[0]); i++) {
-			const CamelInternetAddress *addr;
-			const char *address;
-
-			addr = camel_mime_message_get_recipients(new, types[i]);
-			for (j=0;camel_internet_address_get(addr, j, NULL, &address); j++)
-				g_ptr_array_add(recipients, g_strdup (address));
-
-		}
-	}
-	
-	if (composer->pgp_sign || composer->pgp_encrypt) {
-		const char *pgp_userid;
-		CamelInternetAddress *from = NULL;
-		CamelCipherContext *cipher;
-
-		part = camel_mime_part_new ();
-		camel_medium_set_content_object (CAMEL_MEDIUM (part), current);
-		if (current == plain)
-			camel_mime_part_set_encoding (part, plain_encoding);
-		camel_object_unref (current);
-
-		if (hdrs->account && hdrs->account->pgp_key && *hdrs->account->pgp_key) {
-			pgp_userid = hdrs->account->pgp_key;
-		} else {
-			from = e_msg_composer_hdrs_get_from(hdrs);
-			camel_internet_address_get(from, 0, NULL, &pgp_userid);
-		}
-		
-		if (composer->pgp_sign) {
-			CamelMimePart *npart = camel_mime_part_new();
-
-			cipher = mail_crypto_get_pgp_cipher_context(hdrs->account);
-			camel_cipher_sign(cipher, pgp_userid, CAMEL_CIPHER_HASH_SHA1, part, npart, &ex);
-			camel_object_unref(cipher);
-			
-			if (camel_exception_is_set(&ex)) {
-				camel_object_unref(npart);
-				goto exception;
-			}
-
-			camel_object_unref(part);
-			part = npart;
-		}
-		
-		if (composer->pgp_encrypt) {
-			CamelMimePart *npart = camel_mime_part_new();
-
-			/* check to see if we should encrypt to self, NB gets removed immediately after use */
-			if (hdrs->account && hdrs->account->pgp_encrypt_to_self && pgp_userid)
-				g_ptr_array_add (recipients, g_strdup (pgp_userid));
-
-			cipher = mail_crypto_get_pgp_cipher_context (hdrs->account);
-			camel_cipher_encrypt(cipher, pgp_userid, recipients, part, npart, &ex);
-			camel_object_unref (cipher);
-
-			if (hdrs->account && hdrs->account->pgp_encrypt_to_self && pgp_userid)
-				g_ptr_array_set_size(recipients, recipients->len - 1);
-
-			if (camel_exception_is_set (&ex)) {
-				camel_object_unref(npart);
-				goto exception;
-			}
-
-			camel_object_unref (part);
-			part = npart;
-		}
-
-		if (from)
-			camel_object_unref (from);	
-	
-		current = camel_medium_get_content_object (CAMEL_MEDIUM (part));
-		camel_object_ref (current);
-		camel_object_unref (part);
-	}
-	
-#if defined (HAVE_NSS) && defined (SMIME_SUPPORTED)
-	if (composer->smime_sign || composer->smime_encrypt) {
-		CamelInternetAddress *from = NULL;
-		CamelCipherContext *cipher;
-
-		part = camel_mime_part_new();
-		camel_medium_set_content_object((CamelMedium *)part, current);
-		if (current == plain)
-			camel_mime_part_set_encoding(part, plain_encoding);
-		camel_object_unref(current);
-
-		if (composer->smime_sign
-		    && (hdrs->account == NULL || hdrs->account->smime_sign_key == NULL || hdrs->account->smime_sign_key[0] == 0)) {
-			camel_exception_set (&ex, CAMEL_EXCEPTION_SYSTEM,
-					     _("Cannot sign outgoing message: No signing certificate set for this account"));
-			goto exception;
-		}
-		
-		if (composer->smime_encrypt
-		    && (hdrs->account == NULL || hdrs->account->smime_sign_key == NULL || hdrs->account->smime_sign_key[0] == 0)) {
-			camel_exception_set (&ex, CAMEL_EXCEPTION_SYSTEM,
-					     _("Cannot encrypt outgoing message: No encryption certificate set for this account"));
-			goto exception;
-		}
-
-		if (composer->smime_sign) {
-			CamelMimePart *npart = camel_mime_part_new();
-
-			cipher = camel_smime_context_new(session);
-
-			/* if we're also encrypting, envelope-sign rather than clear-sign */
-			if (composer->smime_encrypt) {
-				camel_smime_context_set_sign_mode((CamelSMIMEContext *)cipher, CAMEL_SMIME_SIGN_ENVELOPED);
-				camel_smime_context_set_encrypt_key((CamelSMIMEContext *)cipher, TRUE, hdrs->account->smime_encrypt_key);
-			} else if (hdrs->account && hdrs->account->smime_encrypt_key && *hdrs->account->smime_encrypt_key) {
-				camel_smime_context_set_encrypt_key((CamelSMIMEContext *)cipher, TRUE, hdrs->account->smime_encrypt_key);
-			}
-
-			camel_cipher_sign(cipher, hdrs->account->smime_sign_key, CAMEL_CIPHER_HASH_SHA1, part, npart, &ex);
-			camel_object_unref(cipher);
-			
-			if (camel_exception_is_set(&ex)) {
-				camel_object_unref(npart);
-				goto exception;
-			}
-
-			camel_object_unref(part);
-			part = npart;
-		}
-	
-		if (composer->smime_encrypt) {
-			/* check to see if we should encrypt to self, NB removed after use */
-			if (hdrs->account->smime_encrypt_to_self)
-				g_ptr_array_add(recipients, g_strdup (hdrs->account->smime_encrypt_key));
-
-			cipher = camel_smime_context_new(session);
-			camel_smime_context_set_encrypt_key((CamelSMIMEContext *)cipher, TRUE, hdrs->account->smime_encrypt_key);
-
-			camel_cipher_encrypt(cipher, NULL, recipients, part, (CamelMimePart *)new, &ex);
-			camel_object_unref(cipher);
-
-			if (camel_exception_is_set(&ex))
-				goto exception;
-
-			if (hdrs->account->smime_encrypt_to_self)
-				g_ptr_array_set_size(recipients, recipients->len - 1);
-		}
-
-		if (from)
-			camel_object_unref(from);
-
-		/* we replaced the message directly, we don't want to do reparenting foo */
-		if (composer->smime_encrypt) {
-			camel_object_unref(part);
-			goto skip_content;
-		} else {
-			current = camel_medium_get_content_object((CamelMedium *)part);
-			camel_object_ref(current);
-			camel_object_unref(part);
-		}
-	}
-#endif /* HAVE_NSS */
-
-	camel_medium_set_content_object (CAMEL_MEDIUM (new), current);
-	if (current == plain)
-		camel_mime_part_set_encoding (CAMEL_MIME_PART (new), plain_encoding);
-	camel_object_unref (current);
-
-skip_content:
-
-	if (recipients) {
-		for (i=0; i<recipients->len; i++)
-			g_free(recipients->pdata[i]);
-		g_ptr_array_free(recipients, TRUE);
-	}
-
-	/* Attach whether this message was written in HTML */
-	camel_medium_set_header (CAMEL_MEDIUM (new), "X-Evolution-Format",
-				 composer->send_html ? "text/html" : "text/plain");
-	
-	return new;
-	
- exception:
-	
-	if (part != CAMEL_MIME_PART (new))
-		camel_object_unref (part);
-	
-	camel_object_unref (new);
-	
-	if (ex.id != CAMEL_EXCEPTION_USER_CANCEL) {
-		e_error_run((GtkWindow *)composer, "mail-composer:no-build-message",
-			    camel_exception_get_description(&ex), NULL);
-	}
-
-	camel_exception_clear (&ex);
-
-	if (recipients) {
-		for (i=0; i<recipients->len; i++)
-			g_free(recipients->pdata[i]);
-		g_ptr_array_free(recipients, TRUE);
-	}
-	
-	return NULL;
-}
-
-
-static char *
-get_file_content (EMsgComposer *composer, const char *file_name, gboolean want_html, guint flags, gboolean warn)
-{
-	CamelStreamFilter *filtered_stream;
-	CamelStreamMem *memstream;
-	CamelMimeFilter *html, *charenc;
-	CamelStream *stream;
-	GByteArray *buffer;
-	char *charset;
-	char *content;
-	int fd;
-	
-	fd = open (file_name, O_RDONLY);
-	if (fd == -1) {
-		if (warn)
-			e_error_run((GtkWindow *)composer, "mail-composer:no-sig-file",
-				    file_name, g_strerror(errno), NULL);
-		return g_strdup ("");
-	}
-	
-	stream = camel_stream_fs_new_with_fd (fd);
-	
-	if (want_html) {
-		filtered_stream = camel_stream_filter_new_with_stream (stream);
-		camel_object_unref (stream);
-		
-		html = camel_mime_filter_tohtml_new (flags, 0);
-		camel_stream_filter_add (filtered_stream, html);
-		camel_object_unref (html);
-		
-		stream = (CamelStream *) filtered_stream;
-	}
-	
-	memstream = (CamelStreamMem *) camel_stream_mem_new ();
-	buffer = g_byte_array_new ();
-	camel_stream_mem_set_byte_array (memstream, buffer);
-	
-	camel_stream_write_to_stream (stream, (CamelStream *) memstream);
-	camel_object_unref (stream);
-	
-	/* The newer signature UI saves signatures in UTF-8, but we still need to check that
-	   the signature is valid UTF-8 because it is possible that the user imported a
-	   signature file that is in his/her locale charset. If it's not in UTF-8 and not in
-	   the charset the composer is in (or their default mail charset) then fuck it,
-	   there's nothing we can do. */
-	if (buffer->len && !g_utf8_validate (buffer->data, buffer->len, NULL)) {
-		stream = (CamelStream *) memstream;
-		memstream = (CamelStreamMem *) camel_stream_mem_new ();
-		camel_stream_mem_set_byte_array (memstream, g_byte_array_new ());
-		
-		filtered_stream = camel_stream_filter_new_with_stream (stream);
-		camel_object_unref (stream);
-		
-		charset = composer && composer->charset ? composer->charset : NULL;
-		charset = charset ? g_strdup (charset) : composer_get_default_charset_setting ();
-		if ((charenc = (CamelMimeFilter *) camel_mime_filter_charset_new_convert (charset, "UTF-8"))) {
-			camel_stream_filter_add (filtered_stream, charenc);
-			camel_object_unref (charenc);
-		}
-		
-		g_free (charset);
-		
-		camel_stream_write_to_stream ((CamelStream *) filtered_stream, (CamelStream *) memstream);
-		camel_object_unref (filtered_stream);
-		g_byte_array_free (buffer, TRUE);
-		
-		buffer = memstream->buffer;
-	}
-	
-	camel_object_unref (memstream);
-	
-	g_byte_array_append (buffer, "", 1);
-	content = buffer->data;
-	g_byte_array_free (buffer, FALSE);
-	
-	return content;
-}
-
-char *
-e_msg_composer_get_sig_file_content (const char *sigfile, gboolean in_html)
-{
-	if (!sigfile || !*sigfile) {
-		return NULL;
-	}
-	
-	return get_file_content (NULL, sigfile, !in_html,
-				 CAMEL_MIME_FILTER_TOHTML_PRESERVE_8BIT |
-				 CAMEL_MIME_FILTER_TOHTML_CONVERT_URLS |
-				 CAMEL_MIME_FILTER_TOHTML_CONVERT_ADDRESSES |
-				 CAMEL_MIME_FILTER_TOHTML_CONVERT_SPACES,
-				 FALSE);
-}
-
-static void
-prepare_engine (EMsgComposer *composer)
-{
-	CORBA_Environment ev;
-	
-	g_return_if_fail (E_IS_MSG_COMPOSER (composer));
-	
-	/* printf ("prepare_engine\n"); */
-	
-	CORBA_exception_init (&ev);
-	composer->editor_engine = (GNOME_GtkHTML_Editor_Engine) Bonobo_Unknown_queryInterface
-		(bonobo_widget_get_objref (BONOBO_WIDGET (composer->editor)), "IDL:GNOME/GtkHTML/Editor/Engine:1.0", &ev);
-	if ((composer->editor_engine != CORBA_OBJECT_NIL) && (ev._major == CORBA_NO_EXCEPTION)) {
-		
-		/* printf ("trying set listener\n"); */
-		composer->editor_listener = BONOBO_OBJECT (listener_new (composer));
-		if (composer->editor_listener != NULL)
-			GNOME_GtkHTML_Editor_Engine__set_listener (composer->editor_engine,
-								   (GNOME_GtkHTML_Editor_Listener)
-								   bonobo_object_dup_ref
-								   (bonobo_object_corba_objref (composer->editor_listener),
-								    &ev),
-								   &ev);
-		
-		if ((ev._major != CORBA_NO_EXCEPTION) || (composer->editor_listener == NULL)) {
-			CORBA_Environment err_ev;
-
-			CORBA_exception_init (&err_ev);
-			
-			Bonobo_Unknown_unref (composer->editor_engine, &err_ev);
-			CORBA_Object_release (composer->editor_engine, &err_ev);
-
-			CORBA_exception_free (&err_ev);
-
-			composer->editor_engine = CORBA_OBJECT_NIL;
-			g_warning ("Can't establish Editor Listener\n");
-		}
-	} else {
-		composer->editor_engine = CORBA_OBJECT_NIL;
-		g_warning ("Can't get Editor Engine\n");
-	}
-
-	CORBA_exception_free (&ev);
-}
-
-static char *
-encode_signature_name (const char *name)
-{
-	const char *s;
-	char *ename, *e;
-	int len = 0;
-
-	s = name;
-	while (*s) {
-		len ++;
-		if (*s == '"' || *s == '.' || *s == '=')
-			len ++;
-		s ++;
-	}
-
-	ename = g_new (gchar, len + 1);
-
-	s = name;
-	e = ename;
-	while (*s) {
-		if (*s == '"') {
-			*e = '.';
-			e ++;
-			*e = '1';
-			e ++;
-		} else if (*s == '=') {
-			*e = '.';
-			e ++;
-			*e = '2';
-			e ++;
-		} else {
-			*e = *s;
-			e ++;
-		}
-		if (*s == '.') {
-			*e = '.';
-			e ++;
-		}
-		s ++;
-	}
-	*e = 0;
-	
-	return ename;
-}
-
-static char *
-decode_signature_name (const char *name)
-{
-	const char *s;
-	char *dname, *d;
-	int len = 0;
-
-	s = name;
-	while (*s) {
-		len ++;
-		if (*s == '.') {
-			s ++;
-			if (!*s || !(*s == '.' || *s == '1' || *s == '2'))
-				return NULL;
-		}
-		s ++;
-	}
-
-	dname = g_new (char, len + 1);
-
-	s = name;
-	d = dname;
-	while (*s) {
-		if (*s == '.') {
-			s ++;
-			if (!*s || !(*s == '.' || *s == '1' || *s == '2')) {
-				g_free (dname);
-				return NULL;
-			}
-			if (*s == '1')
-				*d = '"';
-			else if (*s == '2')
-				*d = '=';
-			else
-				*d = '.';
-		} else
-			*d = *s;
-		d ++;
-		s ++;
-	}
-	*d = 0;
-
-	return dname;
-}
-
-#define CONVERT_SPACES CAMEL_MIME_FILTER_TOHTML_CONVERT_SPACES
-
-static char *
-get_signature_html (EMsgComposer *composer)
-{
-	char *text = NULL, *html = NULL;
-	gboolean format_html;
-	
-	if (!composer->signature)
-		return NULL;
-	
-	if (!composer->signature->autogen) {
-		if (!composer->signature->filename)
-			return NULL;
-		
-		format_html = composer->signature->html;
-		
-		if (composer->signature->script) {
-			text = mail_config_signature_run_script (composer->signature->filename);
-		} else {
-			text = e_msg_composer_get_sig_file_content (composer->signature->filename, format_html);
-		}
-	} else {
-		EAccountIdentity *id;
-		char *organization;
-		char *address;
-		char *name;
-		
-		id = E_MSG_COMPOSER_HDRS (composer->hdrs)->account->id;
-		address = id->address ? camel_text_to_html (id->address, CONVERT_SPACES, 0) : NULL;
-		name = id->name ? camel_text_to_html (id->name, CONVERT_SPACES, 0) : NULL;
-		organization = id->organization ? camel_text_to_html (id->organization, CONVERT_SPACES, 0) : NULL;
-		
-		text = g_strdup_printf ("-- <BR>%s%s%s%s%s%s%s%s",
-					name ? name : "",
-					(address && *address) ? " &lt;<A HREF=\"mailto:" : "",
-					address ? address : "",
-					(address && *address) ? "\">" : "",
-					address ? address : "",
-					(address && *address) ? "</A>&gt;" : "",
-					(organization && *organization) ? "<BR>" : "",
-					organization ? organization : "");
-		g_free (address);
-		g_free (name);
-		g_free (organization);
-		format_html = TRUE;
-	}
-	
-	/* printf ("text: %s\n", text); */
-	if (text) {
-		char *encoded_uid = NULL;
-		
-		if (composer->signature)
-			encoded_uid = encode_signature_name (composer->signature->uid);
-		
-		/* The signature dash convention ("-- \n") is specified in the
-		 * "Son of RFC 1036": http://www.chemie.fu-berlin.de/outerspace/netnews/son-of-1036.html,
-		 * section 4.3.2.
-		 */
-		html = g_strdup_printf ("<!--+GtkHTML:<DATA class=\"ClueFlow\" key=\"signature\" value=\"1\">-->"
-					"<!--+GtkHTML:<DATA class=\"ClueFlow\" key=\"signature_name\" value=\"uid:%s\">-->"
-					"<TABLE WIDTH=\"100%%\" CELLSPACING=\"0\" CELLPADDING=\"0\"><TR><TD>"
-					"%s%s%s%s"
-					"</TD></TR></TABLE>",
-				        encoded_uid ? encoded_uid : "",
-					format_html ? "" : "<PRE>\n",
-					format_html || (!strncmp ("-- \n", text, 4) || strstr(text, "\n-- \n")) ? "" : "-- \n",
-					text,
-					format_html ? "" : "</PRE>\n");
-		g_free (text);
-		g_free (encoded_uid);
-		text = html;
-	}
-	
-	return text;
-}
-
-static void
-set_editor_text(EMsgComposer *composer, const char *text, ssize_t len, int set_signature, int pad_signature)
-{
-	Bonobo_PersistStream persist;
-	BonoboStream *stream;
-	BonoboWidget *editor;
-	CORBA_Environment ev;
-	Bonobo_Unknown object;
-
-	g_return_if_fail (composer->persist_stream_interface != CORBA_OBJECT_NIL);
-	
-	persist = composer->persist_stream_interface;
-	
-	editor = BONOBO_WIDGET (composer->editor);
-	
-	CORBA_exception_init (&ev);
-
-	if (len == -1)
-		len = strlen (text);
-
-	stream = bonobo_stream_mem_create (text, len, TRUE, FALSE);
-	object = bonobo_object_corba_objref (BONOBO_OBJECT (stream));
-	Bonobo_PersistStream_load (persist, (Bonobo_Stream) object, "text/html", &ev);
-	if (ev._major != CORBA_NO_EXCEPTION) {
-		/* FIXME. Some error message. */
-		bonobo_object_unref (BONOBO_OBJECT (stream));
-		CORBA_exception_free (&ev);
-		return;
-	}
-	
-	CORBA_exception_free (&ev);
-	
-	bonobo_object_unref (BONOBO_OBJECT (stream));
-
-	if (set_signature)
-		e_msg_composer_show_sig_file (composer);
-}
-
-/* Commands.  */
-
-static void
-show_attachments (EMsgComposer *composer,
-		  gboolean show)
-{
-	e_expander_set_expanded (E_EXPANDER (composer->attachment_expander), show);
-}
-
-static void
-save (EMsgComposer *composer, const char *filename)
-{
-	CORBA_Environment ev;
-	int fd;
-	
-	/* check to see if we already have the file and that we can create it */
-	if ((fd = open (filename, O_RDONLY | O_CREAT | O_EXCL, 0777)) == -1) {
-		int resp, errnosav = errno;
-		struct stat st;
-		
-		if (stat (filename, &st) == 0 && S_ISREG (st.st_mode)) {
-			resp = e_error_run((GtkWindow *)composer, E_ERROR_ASK_FILE_EXISTS_OVERWRITE, filename, NULL);
-			if (resp != GTK_RESPONSE_OK)
-				return;
-		} else {
-			e_error_run((GtkWindow *)composer, E_ERROR_NO_SAVE_FILE, filename, g_strerror(errnosav));
-			return;
-		}
-	} else
-		close (fd);
-	
-	CORBA_exception_init (&ev);
-	
-	Bonobo_PersistFile_save (composer->persist_file_interface, filename, &ev);
-	
-	if (ev._major != CORBA_NO_EXCEPTION) {
-		e_error_run((GtkWindow *)composer, E_ERROR_NO_SAVE_FILE,
-			    filename, _("Unknown reason"));
-	} else {
-		GNOME_GtkHTML_Editor_Engine_runCommand (composer->editor_engine, "saved", &ev);
-		e_msg_composer_unset_autosaved (composer);
-	}
-	CORBA_exception_free (&ev);
-}
-
-static void
-saveas_response(EMsgComposer *composer, const char *name)
-{
-	save(composer, name);
-}
-
-static void
-saveas(EMsgComposer *composer)
-{
-	EMsgComposerPrivate *p = _PRIVATE(composer);
-
-	e_msg_composer_select_file (composer, &p->saveas, saveas_response, _("Save as..."), TRUE);
-}
-
-static void
-load (EMsgComposer *composer, const char *file_name)
-{
-	CORBA_Environment ev;
-	
-	CORBA_exception_init (&ev);
-	
-	Bonobo_PersistFile_load (composer->persist_file_interface, file_name, &ev);
-	
-	if (ev._major != CORBA_NO_EXCEPTION)
-		e_error_run((GtkWindow *)composer, E_ERROR_NO_LOAD_FILE,
-			    file_name, _("Unknown reason"), NULL);
-	
-	CORBA_exception_free (&ev);
-}
-
-#define AUTOSAVE_SEED ".evolution-composer.autosave-XXXXXX"
-#define AUTOSAVE_INTERVAL 60000
-
-typedef struct _AutosaveManager AutosaveManager;
-struct _AutosaveManager {
-	GHashTable *table;
-	guint id;
-	gboolean ask;
-};
-
-static AutosaveManager *am = NULL;
-static void autosave_manager_start (AutosaveManager *am);
-static void autosave_manager_stop (AutosaveManager *am);
-
-static gboolean
-autosave_save_draft (EMsgComposer *composer)
-{
-	CamelMimeMessage *message;
-	CamelStream *stream;
-	char *file;
-	int fd, camelfd;
-	gboolean success = TRUE;
-	
-	if (!e_msg_composer_is_dirty (composer))
-		return TRUE;
-
-	fd = composer->autosave_fd;
-	file = composer->autosave_file;
-	
-	if (fd == -1) {
-		/* This code is odd, the fd is opened elsewhere but a failure is ignored */
-		e_error_run((GtkWindow *)composer, "mail-composer:no-autosave",
-			    file, _("Could not open file"), NULL);
-		return FALSE;
-	}
-	
-	message = e_msg_composer_get_message_draft (composer);
-	
-	if (message == NULL) {
-		e_error_run((GtkWindow *)composer, "mail-composer:no-autosave",
-			    file, _("Unable to retrieve message from editor"), NULL);
-		return FALSE;
-	}
-	
-	if (lseek (fd, (off_t)0, SEEK_SET) == -1
-	    || ftruncate (fd, (off_t)0) == -1
-	    || (camelfd = dup(fd)) == -1) {
-		camel_object_unref (message);
-		e_error_run((GtkWindow *)composer, "mail-composer:no-autosave",
-			    file, g_strerror(errno), NULL);
-		return FALSE;
-	}
-	
-	/* this does an lseek so we don't have to */
-	stream = camel_stream_fs_new_with_fd (camelfd);
-	if (camel_data_wrapper_write_to_stream (CAMEL_DATA_WRAPPER (message), stream) == -1
-	    || camel_stream_close (CAMEL_STREAM (stream)) == -1) {
-		e_error_run((GtkWindow *)composer, "mail-composer:no-autosave",
-			    file, g_strerror(errno), NULL);
-		success = FALSE;
-	} else {
-		CORBA_Environment ev;
-		CORBA_exception_init (&ev);
-		GNOME_GtkHTML_Editor_Engine_runCommand (composer->editor_engine, "saved", &ev);
-		CORBA_exception_free (&ev);
-		e_msg_composer_unset_changed (composer);
-		e_msg_composer_set_autosaved (composer);
-	}
-	
-	camel_object_unref (stream);
-	
-	camel_object_unref (message);
-	
-	return success;
-}
-
-static EMsgComposer * 
-autosave_load_draft (const char *filename)
-{
-	CamelStream *stream;
-	CamelMimeMessage *msg;
-	EMsgComposer *composer;
-	
-	g_return_val_if_fail (filename != NULL, NULL);
-	
-	g_warning ("autosave load filename = \"%s\"", filename);
-	
-	if (!(stream = camel_stream_fs_new_with_name (filename, O_RDONLY, 0)))
-		return NULL;
-	
-	msg = camel_mime_message_new ();
-	camel_data_wrapper_construct_from_stream (CAMEL_DATA_WRAPPER (msg), stream);
-	camel_object_unref (stream);
-	
-	composer = e_msg_composer_new_with_message (msg);
-	if (composer) {
-		if (autosave_save_draft (composer))
-			unlink (filename);
-		
-		g_signal_connect (GTK_OBJECT (composer), "send",
-				  G_CALLBACK (em_utils_composer_send_cb), NULL);
-		
-		g_signal_connect (GTK_OBJECT (composer), "save-draft",
-				  G_CALLBACK (em_utils_composer_save_draft_cb), NULL);
-		
-		gtk_widget_show (GTK_WIDGET (composer));
-	}
-	
-	return composer;
-}
-
-static gboolean
-autosave_is_owned (AutosaveManager *am, const char *file)
-{
-        return g_hash_table_lookup (am->table, file) != NULL;
-}
-
-static void
-autosave_manager_query_load_orphans (AutosaveManager *am, GtkWindow *parent)
-{
-	DIR *dir;
-	struct dirent *d;
-	GSList *match = NULL;
-	gint len = strlen (AUTOSAVE_SEED);
-	gint load = FALSE;
-	
-	dir = opendir (g_get_home_dir());
-	if (!dir) {
-		return;
-	}
-	
-	while ((d = readdir (dir))) {
-		if ((!strncmp (d->d_name, AUTOSAVE_SEED, len - 6))
-		    && (strlen (d->d_name) == len)
-		    && (!autosave_is_owned (am, d->d_name))) {
-			char *filename =  g_strdup_printf ("%s/%s", g_get_home_dir(), d->d_name);
-			struct stat st;
-		
-			/*
-			 * check if the file has any length,  It is a valid case if it doesn't 
-			 * so we simply don't ask then.
-			 */
-			if (stat (filename, &st) == -1 || st.st_size == 0) {
-				unlink (filename);
-				g_free (filename);
-				continue;
-			}
-			match = g_slist_prepend (match, filename);				
-		}
-	}
-	
-	closedir (dir);
-	
-	if (match != NULL)
-		load = e_error_run(parent, "mail-composer:recover-autosave", NULL) == GTK_RESPONSE_YES;
-	
-	while (match != NULL) {
-		GSList *next = match->next;
-		char *filename = match->data;
-		EMsgComposer *composer;
-		
-		if (load) { 
-			composer = autosave_load_draft (filename);
-		} else {
-			unlink (filename);
-		}
-			
-		g_free (filename);
-		g_slist_free_1 (match);
-		match = next;
-	}			
-}
-
-static void
-autosave_run_foreach_cb (gpointer key, gpointer value, gpointer data)
-{
-	EMsgComposer *composer = E_MSG_COMPOSER (value);
-	
-	if (composer->enable_autosave)
-		autosave_save_draft (composer);
-}
-
-static gint
-autosave_run (gpointer data)
-{
-	AutosaveManager *am = data;
-	
-	g_hash_table_foreach (am->table, (GHFunc)autosave_run_foreach_cb, am);
-
-	autosave_manager_stop (am);
-	autosave_manager_start (am);
-	
-	return FALSE;
-}
-
-static gboolean
-autosave_init_file (EMsgComposer *composer)
-{
-	if (composer->autosave_file == NULL) {
-		composer->autosave_file = g_strdup_printf ("%s/%s", g_get_home_dir(), AUTOSAVE_SEED);
-		composer->autosave_fd = mkstemp (composer->autosave_file);
-		return TRUE;
-	}
-	return FALSE;
-}
-
-static void
-autosave_manager_start (AutosaveManager *am)
-{
-	if (am->id == 0)
-		am->id = g_timeout_add (AUTOSAVE_INTERVAL, autosave_run, am);
-}
-
-static void
-autosave_manager_stop (AutosaveManager *am)
-{
-	if (am->id) {
-		g_source_remove (am->id);
-		am->id = 0;
-	}
-}
-
-static AutosaveManager *
-autosave_manager_new ()
-{
-	AutosaveManager *am;
-	
-	am = g_new (AutosaveManager, 1);
-	am->table = g_hash_table_new (g_str_hash, g_str_equal);
-	am->id = 0;
-	am->ask = TRUE;
-	
-	return am;
-}
-
-static void
-autosave_manager_register (AutosaveManager *am, EMsgComposer *composer) 
-{
-	char *key;
-	
-	g_return_if_fail (composer != NULL);
-	
-	if (autosave_init_file (composer)) {
-		key = g_path_get_basename (composer->autosave_file);
-		g_hash_table_insert (am->table, key, composer);
-		if (am->ask) {
-			/* keep recursion out of our bedrooms. */
-			am->ask = FALSE;
-			autosave_manager_query_load_orphans (am, (GtkWindow *)composer);
-			am->ask = TRUE;
-		}
-	}
-	autosave_manager_start (am);
-}
-
-static void
-autosave_manager_unregister (AutosaveManager *am, EMsgComposer *composer) 
-{
-	char *key, *oldkey;
-	void *olddata;
-
-	if (!composer->autosave_file)
-		return;
-
-	key = g_path_get_basename(composer->autosave_file);
-	if (g_hash_table_lookup_extended(am->table, key, (void **)&oldkey, &olddata)) {
-		g_hash_table_remove(am->table, oldkey);
-		g_free(oldkey);
-		g_free(key);
-	}
-	
-	/* only remove the file if we can successfully save it */
-	/* FIXME this test could probably be more efficient */
-	if (autosave_save_draft (composer))
-		unlink (composer->autosave_file);
-	
-	close (composer->autosave_fd);
-	g_free (composer->autosave_file);
-	composer->autosave_file = NULL;
-	
-	if (g_hash_table_size (am->table) == 0)
-		autosave_manager_stop (am);
-}
-
-static void
-menu_file_save_draft_cb (BonoboUIComponent *uic, void *data, const char *path)
-{
-	g_signal_emit (data, signals[SAVE_DRAFT], 0, FALSE);
-	e_msg_composer_unset_changed (E_MSG_COMPOSER (data));
-	e_msg_composer_unset_autosaved (E_MSG_COMPOSER (data));
-}
-
-/* Exit dialog.  (Displays a "Save composition to 'Drafts' before exiting?" warning before actually exiting.)  */
-
-static void
-do_exit (EMsgComposer *composer)
-{
-	const char *subject;
-	int button;
-	
-	if (!e_msg_composer_is_dirty (composer) && !e_msg_composer_is_autosaved (composer)) {
-		gtk_widget_destroy (GTK_WIDGET (composer));
-		return;
-	}
-	
-	gdk_window_raise (GTK_WIDGET (composer)->window);
-	
-	subject = e_msg_composer_hdrs_get_subject (E_MSG_COMPOSER_HDRS (composer->hdrs));
-
-	button = e_error_run((GtkWindow *)composer, "mail-composer:exit-unsaved",
-			     subject && subject[0] ? subject : _("Untitled Message"), NULL);
-
-	switch (button) {
-	case GTK_RESPONSE_YES:
-		/* Save */
-		g_signal_emit (GTK_OBJECT (composer), signals[SAVE_DRAFT], 0, TRUE);
-		e_msg_composer_unset_changed (composer);
-		e_msg_composer_unset_autosaved (composer);
-		break;
-	case GTK_RESPONSE_NO:
-		/* Don't save */
-		gtk_widget_destroy (GTK_WIDGET (composer));
-		break;
-	case GTK_RESPONSE_CANCEL:
-		break;
-	}
-}
-
-/* Menu callbacks.  */
-static void
-file_open_response(EMsgComposer *composer, const char *name)
-{
-	load (composer, name);
-}
-
-static void
-menu_file_open_cb (BonoboUIComponent *uic,
-		   void *data,
-		   const char *path)
-{
-	EMsgComposerPrivate *p = _PRIVATE(data);
-
-	/* NB: This function is never used anymore */
-
-	e_msg_composer_select_file(E_MSG_COMPOSER (data), &p->load, file_open_response, _("Open File"), FALSE);
-}
-
-static void
-menu_file_save_cb (BonoboUIComponent *uic,
-		   void *data,
-		   const char *path)
-{
-	EMsgComposer *composer;
-	CORBA_char *file_name;
-	CORBA_Environment ev;
-	
-	composer = E_MSG_COMPOSER (data);
-	
-	CORBA_exception_init (&ev);
-	
-	file_name = Bonobo_PersistFile_getCurrentFile (composer->persist_file_interface, &ev);
-	
-	if (ev._major != CORBA_NO_EXCEPTION) {
-		saveas (composer);
-	} else {
-		save (composer, file_name);
-		CORBA_free (file_name);
-	}
-      	CORBA_exception_free (&ev);
-}
-
-static void
-menu_file_save_as_cb (BonoboUIComponent *uic,
-		      void *data,
-		      const char *path)
-{
-	saveas (E_MSG_COMPOSER(data));
-}
-
-static void
-menu_file_send_cb (BonoboUIComponent *uic,
-		   void *data,
-		   const char *path)
-{
-	g_signal_emit (GTK_OBJECT (data), signals[SEND], 0);
-}
-
-static void
-menu_file_close_cb (BonoboUIComponent *uic,
-		    void *data,
-		    const char *path)
-{
-	EMsgComposer *composer;
-	
-	composer = E_MSG_COMPOSER (data);
-	do_exit (composer);
-}
-	
-static void
-menu_file_add_attachment_cb (BonoboUIComponent *uic,
-			     void *data,
-			     const char *path)
-{
-	EMsgComposer *composer;
-	
-	composer = E_MSG_COMPOSER (data);
-	
-	e_msg_composer_attachment_bar_attach
-		(E_MSG_COMPOSER_ATTACHMENT_BAR (composer->attachment_bar),
-		 NULL);
-}
-
-static void
-menu_edit_cut_cb (BonoboUIComponent *uic, void *data, const char *path)
-{
-	EMsgComposer *composer = data;
-	
-	g_return_if_fail (composer->focused_entry != NULL);
-	
-	if (GTK_IS_ENTRY (composer->focused_entry)) {
-		gtk_editable_cut_clipboard (GTK_EDITABLE (composer->focused_entry));
-	} else {
-		/* happy happy joy joy, an EEntry. */
-		g_assert_not_reached ();
-	}
-}
-
-static void
-menu_edit_copy_cb (BonoboUIComponent *uic, void *data, const char *path)
-{
-	EMsgComposer *composer = data;
-	
-	g_return_if_fail (composer->focused_entry != NULL);
-	
-	if (GTK_IS_ENTRY (composer->focused_entry)) {
-		gtk_editable_copy_clipboard (GTK_EDITABLE (composer->focused_entry));
-	} else {
-		/* happy happy joy joy, an EEntry. */
-		g_assert_not_reached ();
-	}
-}
-
-static void
-menu_edit_paste_cb (BonoboUIComponent *uic, void *data, const char *path)
-{
-	EMsgComposer *composer = data;
-	
-	g_return_if_fail (composer->focused_entry != NULL);
-	
-	if (GTK_IS_ENTRY (composer->focused_entry)) {
-		gtk_editable_paste_clipboard (GTK_EDITABLE (composer->focused_entry));
-	} else {
-		/* happy happy joy joy, an EEntry. */
-		g_assert_not_reached ();
-	}
-}
-
-static void
-menu_edit_select_all_cb (BonoboUIComponent *uic, void *data, const char *path)
-{
-	EMsgComposer *composer = data;
-	
-	g_return_if_fail (composer->focused_entry != NULL);
-	
-	if (GTK_IS_ENTRY (composer->focused_entry)) {
-		gtk_editable_set_position (GTK_EDITABLE (composer->focused_entry), -1);
-		gtk_editable_select_region (GTK_EDITABLE (composer->focused_entry), 0, -1);
-	} else {
-		/* happy happy joy joy, an EEntry. */
-		g_assert_not_reached ();
-	}
-}
-
-static void
-menu_edit_delete_all_cb (BonoboUIComponent *uic, void *data, const char *path)
-{
-	CORBA_Environment ev;
-	EMsgComposer *composer;
-	
-	composer = E_MSG_COMPOSER (data);
-	CORBA_exception_init (&ev);
-	
-	GNOME_GtkHTML_Editor_Engine_undoBegin (composer->editor_engine, "Delete all but signature", "Undelete all", &ev);
-	GNOME_GtkHTML_Editor_Engine_freeze (composer->editor_engine, &ev);
-	GNOME_GtkHTML_Editor_Engine_runCommand (composer->editor_engine, "disable-selection", &ev);
-	GNOME_GtkHTML_Editor_Engine_runCommand (composer->editor_engine, "text-default-color", &ev);
-	GNOME_GtkHTML_Editor_Engine_runCommand (composer->editor_engine, "bold-off", &ev);
-	GNOME_GtkHTML_Editor_Engine_runCommand (composer->editor_engine, "italic-off", &ev);
-	GNOME_GtkHTML_Editor_Engine_runCommand (composer->editor_engine, "underline-off", &ev);
-	GNOME_GtkHTML_Editor_Engine_runCommand (composer->editor_engine, "strikeout-off", &ev);
-	GNOME_GtkHTML_Editor_Engine_runCommand (composer->editor_engine, "select-all", &ev);
-	GNOME_GtkHTML_Editor_Engine_runCommand (composer->editor_engine, "delete", &ev);
-	GNOME_GtkHTML_Editor_Engine_setParagraphData (composer->editor_engine, "signature", "0", &ev);
-	GNOME_GtkHTML_Editor_Engine_setParagraphData (composer->editor_engine, "orig", "0", &ev);
-	e_msg_composer_show_sig_file (composer);
-	GNOME_GtkHTML_Editor_Engine_runCommand (composer->editor_engine, "style-normal", &ev);
-	GNOME_GtkHTML_Editor_Engine_thaw (composer->editor_engine, &ev);
-	GNOME_GtkHTML_Editor_Engine_undoEnd (composer->editor_engine, &ev);
-	
-	CORBA_exception_free (&ev);
-	/* printf ("delete all\n"); */
-}
-
-static void
-menu_view_attachments_activate_cb (BonoboUIComponent           *component,
-				   const char                  *path,
-				   Bonobo_UIComponent_EventType type,
-				   const char                  *state,
-				   gpointer                     user_data)
-
-{
-	gboolean new_state;
-	
-	if (type != Bonobo_UIComponent_STATE_CHANGED)
-		return;
-	
-	new_state = atoi (state);
-	
-	e_msg_composer_show_attachments (E_MSG_COMPOSER (user_data), new_state);
-}
-
-static void
-menu_format_html_cb (BonoboUIComponent           *component,
-		     const char                  *path,
-		     Bonobo_UIComponent_EventType type,
-		     const char                  *state,
-		     gpointer                     user_data)
-
-{
-	if (type != Bonobo_UIComponent_STATE_CHANGED)
-		return;
-	
-	e_msg_composer_set_send_html (E_MSG_COMPOSER (user_data), atoi (state));
-}
-
-static void
-menu_security_pgp_sign_cb (BonoboUIComponent           *component,
-			   const char                  *path,
-			   Bonobo_UIComponent_EventType type,
-			   const char                  *state,
-			   gpointer                     composer)
-
-{
-	if (type != Bonobo_UIComponent_STATE_CHANGED)
-		return;
-	
-	e_msg_composer_set_pgp_sign (E_MSG_COMPOSER (composer), atoi (state));
-}
-
-static void
-menu_security_pgp_encrypt_cb (BonoboUIComponent           *component,
-			      const char                  *path,
-			      Bonobo_UIComponent_EventType type,
-			      const char                  *state,
-			      gpointer                     composer)
-
-{
-	if (type != Bonobo_UIComponent_STATE_CHANGED)
-		return;
-	
-	e_msg_composer_set_pgp_encrypt (E_MSG_COMPOSER (composer), atoi (state));
-}
-
-static void
-menu_security_smime_sign_cb (BonoboUIComponent           *component,
-			     const char                  *path,
-			     Bonobo_UIComponent_EventType type,
-			     const char                  *state,
-			     gpointer                     composer)
-
-{
-	if (type != Bonobo_UIComponent_STATE_CHANGED)
-		return;
-	
-	e_msg_composer_set_smime_sign (E_MSG_COMPOSER (composer), atoi (state));
-}
-
-static void
-menu_security_smime_encrypt_cb (BonoboUIComponent           *component,
-				const char                  *path,
-				Bonobo_UIComponent_EventType type,
-				const char                  *state,
-				gpointer                     composer)
-
-{
-	if (type != Bonobo_UIComponent_STATE_CHANGED)
-		return;
-	
-	e_msg_composer_set_smime_encrypt (E_MSG_COMPOSER (composer), atoi (state));
-}
-
-
-static void
-menu_view_from_cb (BonoboUIComponent           *component,
-		   const char                  *path,
-		   Bonobo_UIComponent_EventType type,
-		   const char                  *state,
-		   gpointer                     user_data)
-{
-	if (type != Bonobo_UIComponent_STATE_CHANGED)
-		return;
-	
-	e_msg_composer_set_view_from (E_MSG_COMPOSER (user_data), atoi (state));
-}
-
-static void
-menu_view_replyto_cb (BonoboUIComponent           *component,
-		      const char                  *path,
-		      Bonobo_UIComponent_EventType type,
-		      const char                  *state,
-		      gpointer                     user_data)
-{
-	if (type != Bonobo_UIComponent_STATE_CHANGED)
-		return;
-	
-	e_msg_composer_set_view_replyto (E_MSG_COMPOSER (user_data), atoi (state));
-}
-
-static void
-menu_view_to_cb (BonoboUIComponent           *component,
-		      const char                  *path,
-		      Bonobo_UIComponent_EventType type,
-		      const char                  *state,
-		      gpointer                     user_data)
-{
-	if (type != Bonobo_UIComponent_STATE_CHANGED)
-		return;
-	
-	e_msg_composer_set_view_to (E_MSG_COMPOSER (user_data), atoi (state));
-}
-
-static void
-menu_view_postto_cb (BonoboUIComponent           *component,
-		      const char                  *path,
-		      Bonobo_UIComponent_EventType type,
-		      const char                  *state,
-		      gpointer                     user_data)
-{
-	if (type != Bonobo_UIComponent_STATE_CHANGED)
-		return;
-	
-	e_msg_composer_set_view_postto (E_MSG_COMPOSER (user_data), atoi (state));
-}
-
-static void
-menu_view_cc_cb (BonoboUIComponent           *component,
-		 const char                  *path,
-		 Bonobo_UIComponent_EventType type,
-		 const char                  *state,
-		 gpointer                     user_data)
-{
-	if (type != Bonobo_UIComponent_STATE_CHANGED)
-		return;
-	
-	e_msg_composer_set_view_cc (E_MSG_COMPOSER (user_data), atoi (state));
-}
-
-static void
-menu_view_bcc_cb (BonoboUIComponent           *component,
-		  const char                  *path,
-		  Bonobo_UIComponent_EventType type,
-		  const char                  *state,
-		  gpointer                     user_data)
-{
-	if (type != Bonobo_UIComponent_STATE_CHANGED)
-		return;
-	
-	e_msg_composer_set_view_bcc (E_MSG_COMPOSER (user_data), atoi (state));
-}
-
-static void
-menu_changed_charset_cb (BonoboUIComponent           *component,
-			 const char                  *path,
-			 Bonobo_UIComponent_EventType type,
-			 const char                  *state,
-			 gpointer                     user_data)
-{
-	if (type != Bonobo_UIComponent_STATE_CHANGED)
-		return;
-	
-	if (atoi (state)) {
-		/* Charset menu names are "Charset-%s" where %s is the charset name */
-		g_free (E_MSG_COMPOSER (user_data)->charset);
-		E_MSG_COMPOSER (user_data)->charset = g_strdup (path + strlen ("Charset-"));
-	}
-}
-
-
-static BonoboUIVerb verbs [] = {
-
-	BONOBO_UI_VERB ("FileOpen", menu_file_open_cb),
-	BONOBO_UI_VERB ("FileSave", menu_file_save_cb),
-	BONOBO_UI_VERB ("FileSaveAs", menu_file_save_as_cb),
-	BONOBO_UI_VERB ("FileSaveDraft", menu_file_save_draft_cb),
-	BONOBO_UI_VERB ("FileClose", menu_file_close_cb),
-	
-	BONOBO_UI_VERB ("FileAttach", menu_file_add_attachment_cb),
-	
-	BONOBO_UI_VERB ("FileSend", menu_file_send_cb),
-	
-	BONOBO_UI_VERB ("DeleteAll", menu_edit_delete_all_cb),
-	
-	BONOBO_UI_VERB_END
-};
-
-static EPixmap pixcache [] = {
-	E_PIXMAP ("/Toolbar/FileAttach", "stock_attach", E_ICON_SIZE_LARGE_TOOLBAR),
-	E_PIXMAP ("/Toolbar/FileSend", "stock_mail-send", E_ICON_SIZE_LARGE_TOOLBAR),
-	
-/*	E_PIXMAP ("/menu/Insert/FileAttach", "stock_attach", E_ICON_SIZE_LARGE_TOOLBAR), */
-	E_PIXMAP ("/commands/FileSend", "stock_mail-send", E_ICON_SIZE_MENU),
-	E_PIXMAP ("/commands/FileSave", "stock_save", E_ICON_SIZE_MENU),
-	E_PIXMAP ("/commands/FileSaveAs", "stock_save-as", E_ICON_SIZE_MENU),
-	
-	E_PIXMAP_END
-};
-
-
-static void
-signature_activate_cb (GtkWidget *menu, EMsgComposer *composer)
-{
-	GtkWidget *active;
-	ESignature *sig;
-	
-	active = gtk_menu_get_active (GTK_MENU (menu));
-	sig = g_object_get_data ((GObject *) active, "sig");
-	
-	if (composer->signature != sig) {
-		composer->signature = sig;
-		e_msg_composer_show_sig_file (composer);
-	}
-}
-
-static void
-signature_added (ESignatureList *signatures, ESignature *sig, EMsgComposer *composer)
-{
-	GtkWidget *menu, *item;
-	
-	menu = gtk_option_menu_get_menu (composer->sig_menu);
-	
-	if (sig->autogen)
-		item = gtk_menu_item_new_with_label (_("Autogenerated"));
-	else
-		item = gtk_menu_item_new_with_label (sig->name);
-	g_object_set_data ((GObject *) item, "sig", sig);
-	gtk_widget_show (item);
-	
-	gtk_menu_shell_append (GTK_MENU_SHELL (menu), item);
-}
-
-static void
-signature_removed (ESignatureList *signatures, ESignature *sig, EMsgComposer *composer)
-{
-	GtkWidget *menu;
-	ESignature *cur;
-	GList *items;
-	
-	if (composer->signature == sig) {
-		composer->signature = NULL;
-		e_msg_composer_show_sig_file (composer);
-	}
-	
-	menu = gtk_option_menu_get_menu (composer->sig_menu);
-	items = GTK_MENU_SHELL (menu)->children;
-	while (items != NULL) {
-		cur = g_object_get_data (items->data, "sig");
-		if (cur == sig) {
-			gtk_widget_destroy (items->data);
-			break;
-		}
-		items = items->next;
-	}
-}
-
-static void
-menu_item_set_label (GtkMenuItem *item, const char *label)
-{
-	GtkWidget *widget;
-	
-	widget = gtk_bin_get_child ((GtkBin *) item);
-	if (GTK_IS_LABEL (widget))
-		gtk_label_set_text ((GtkLabel *) widget, label);
-}
-
-static void
-signature_changed (ESignatureList *signatures, ESignature *sig, EMsgComposer *composer)
-{
-	GtkWidget *menu;
-	ESignature *cur;
-	GList *items;
-	
-	menu = gtk_option_menu_get_menu (composer->sig_menu);
-	items = GTK_MENU_SHELL (menu)->children;
-	while (items != NULL) {
-		cur = g_object_get_data (items->data, "sig");
-		if (cur == sig) {
-			menu_item_set_label (items->data, sig->name);
-			break;
-		}
-		items = items->next;
-	}
-}
-
-static void
-sig_select_item (EMsgComposer *composer)
-{
-	ESignature *cur;
-	GtkWidget *menu;
-	GList *items;
-	int i = 0;
-	
-	if (!composer->signature) {
-		gtk_option_menu_set_history (composer->sig_menu, 0);
-		return;
-	}
-	
-	menu = gtk_option_menu_get_menu (composer->sig_menu);
-	items = GTK_MENU_SHELL (menu)->children;
-	while (items != NULL) {
-		cur = g_object_get_data ((GObject *) items->data, "sig");
-		if (cur == composer->signature) {
-			gtk_option_menu_set_history (composer->sig_menu, i);
-			return;
-		}
-		items = items->next;
-		i++;
-	}
-}
-
-static void
-setup_signatures_menu (EMsgComposer *composer)
-{
-	GtkWidget *hbox, *hspace, *label;
-	ESignatureList *signatures;
-	GtkWidget *menu, *item;
-	ESignature *sig;
-	EIterator *it;
-	
-	hbox = e_msg_composer_hdrs_get_from_hbox (E_MSG_COMPOSER_HDRS (composer->hdrs));
-
-	label = gtk_label_new_with_mnemonic (_("Si_gnature:"));
-	gtk_widget_show (label);
-
-	composer->sig_menu = (GtkOptionMenu *) gtk_option_menu_new ();
-
-	gtk_label_set_mnemonic_widget ((GtkLabel *) label, (GtkWidget *)composer->sig_menu);
-
-	gtk_box_pack_end_defaults (GTK_BOX (hbox), (GtkWidget *) composer->sig_menu);
-	gtk_box_pack_end (GTK_BOX (hbox), label, FALSE, TRUE, 0);
-	hspace = gtk_hbox_new (FALSE, 0);
-	gtk_widget_show (hspace);
-	gtk_box_pack_start (GTK_BOX (hbox), hspace, FALSE, FALSE, 0);
-	
-	menu = gtk_menu_new ();
-	gtk_widget_show (menu);
-	gtk_option_menu_set_menu (composer->sig_menu, menu);
-	
-	item = gtk_menu_item_new_with_label (_("None"));
-	gtk_widget_show (item);
-	
-	gtk_menu_shell_append (GTK_MENU_SHELL (menu), item);
-	
-	signatures = mail_config_get_signatures ();
-	it = e_list_get_iterator ((EList *) signatures);
-	
-	while (e_iterator_is_valid (it)) {
-		sig = (ESignature *) e_iterator_get (it);
-		signature_added (signatures, sig, composer);
-		e_iterator_next (it);
-	}
-	
-	g_object_unref (it);
-	
-	g_signal_connect (menu, "selection-done", G_CALLBACK (signature_activate_cb), composer);
-
-	gtk_widget_show ((GtkWidget *) composer->sig_menu);
-	
-	composer->sig_added_id = g_signal_connect (signatures, "signature-added", G_CALLBACK (signature_added), composer);
-	composer->sig_removed_id = g_signal_connect (signatures, "signature-removed", G_CALLBACK (signature_removed), composer);
-	composer->sig_changed_id = g_signal_connect (signatures, "signature-changed", G_CALLBACK (signature_changed), composer);
-}
-
-static void
-setup_ui (EMsgComposer *composer)
-{
-	EMMenuTargetWidget *target;
-	EMsgComposerPrivate *p = _PRIVATE(composer);
-	BonoboUIContainer *container;
-	gboolean hide_smime;
-	char *charset;
-	
-	container = bonobo_window_get_ui_container (BONOBO_WINDOW (composer));
-	
-	composer->uic = bonobo_ui_component_new_default ();
-	/* FIXME: handle bonobo exceptions */
-	bonobo_ui_component_set_container (composer->uic, bonobo_object_corba_objref (BONOBO_OBJECT (container)), NULL);
-	
-	bonobo_ui_component_add_verb_list_with_data (composer->uic, verbs, composer);
-	
-	bonobo_ui_component_freeze (composer->uic, NULL);
-	
-	bonobo_ui_util_set_ui (composer->uic, PREFIX,
-			       EVOLUTION_UIDIR "/evolution-message-composer.xml",
-			       "evolution-message-composer", NULL);
-	
-	e_pixmaps_update (composer->uic, pixcache);
-	
-	/* Populate the Charset Encoding menu and default it to whatever the user
-	   chose as his default charset in the mailer */
-	charset = composer_get_default_charset_setting ();
-	e_charset_picker_bonobo_ui_populate (composer->uic, "/menu/Edit/EncodingPlaceholder",
-					     charset,
-					     menu_changed_charset_cb,
-					     composer);
-	g_free (charset);
-	
-	/* Format -> HTML */
-	bonobo_ui_component_set_prop (
-		composer->uic, "/commands/FormatHtml",
-		"state", composer->send_html ? "1" : "0", NULL);
-	bonobo_ui_component_add_listener (
-		composer->uic, "FormatHtml",
-		menu_format_html_cb, composer);
-	
-	/* View/From */
-	bonobo_ui_component_set_prop (
-		composer->uic, "/commands/ViewFrom",
-		"state", composer->view_from ? "1" : "0", NULL);
-	bonobo_ui_component_add_listener (
-		composer->uic, "ViewFrom",
-		menu_view_from_cb, composer);
-	
-	/* View/ReplyTo */
-	bonobo_ui_component_set_prop (
-		composer->uic, "/commands/ViewReplyTo",
-		"state", composer->view_replyto ? "1" : "0", NULL);
-	bonobo_ui_component_add_listener (
-		composer->uic, "ViewReplyTo",
-		menu_view_replyto_cb, composer);
-	
-	/* View/To */
-	bonobo_ui_component_set_prop (
-		composer->uic, "/commands/ViewTo",
-		"state", composer->view_to ? "1" : "0", NULL);
-	bonobo_ui_component_add_listener (
-		composer->uic, "ViewTo",
-		menu_view_to_cb, composer);
-	
-	/* View/PostTo */
-	bonobo_ui_component_set_prop (
-		composer->uic, "/commands/ViewPostTo",
-		"state", composer->view_postto ? "1" : "0", NULL);
-	bonobo_ui_component_add_listener (
-		composer->uic, "ViewPostTo",
-		menu_view_postto_cb, composer);
-	
-	/* View/CC */
-	bonobo_ui_component_set_prop (
-		composer->uic, "/commands/ViewCC",
-		"state", composer->view_cc ? "1" : "0", NULL);
-	bonobo_ui_component_add_listener (
-		composer->uic, "ViewCC",
-		menu_view_cc_cb, composer);
-	
-	/* View/BCC */
-	bonobo_ui_component_set_prop (
-		composer->uic, "/commands/ViewBCC",
-		"state", composer->view_bcc ? "1" : "0", NULL);
-	bonobo_ui_component_add_listener (
-		composer->uic, "ViewBCC",
-		menu_view_bcc_cb, composer);
-	
-	/* Security -> PGP Sign */
-	bonobo_ui_component_set_prop (
-		composer->uic, "/commands/SecurityPGPSign",
-		"state", composer->pgp_sign ? "1" : "0", NULL);
-	
-	bonobo_ui_component_add_listener (
-		composer->uic, "SecurityPGPSign",
-		menu_security_pgp_sign_cb, composer);
-	
-	/* Security -> PGP Encrypt */
-	bonobo_ui_component_set_prop (
-		composer->uic, "/commands/SecurityPGPEncrypt",
-		"state", composer->pgp_encrypt ? "1" : "0", NULL);
-	
-	bonobo_ui_component_add_listener (
-		composer->uic, "SecurityPGPEncrypt",
-		menu_security_pgp_encrypt_cb, composer);
-	
-#if defined(HAVE_NSS) && defined(SMIME_SUPPORTED)
-	hide_smime = FALSE;
-#else
-	hide_smime = TRUE;
-#endif
-	
-	/* Security -> S/MIME Sign */
-	bonobo_ui_component_set_prop (
-		composer->uic, "/commands/SecuritySMimeSign",
-		"state", composer->smime_sign ? "1" : "0", NULL);
-	bonobo_ui_component_set_prop (
-		composer->uic, "/commands/SecuritySMimeSign",
-		"hidden", hide_smime ? "1" : "0", NULL);
-	
-	bonobo_ui_component_add_listener (
-		composer->uic, "SecuritySMimeSign",
-		menu_security_smime_sign_cb, composer);
-	
-	/* Security -> S/MIME Encrypt */
-	bonobo_ui_component_set_prop (
-		composer->uic, "/commands/SecuritySMimeEncrypt",
-		"state", composer->smime_encrypt ? "1" : "0", NULL);
-	bonobo_ui_component_set_prop (
-		composer->uic, "/commands/SecuritySMimeEncrypt",
-		"hidden", hide_smime ? "1" : "0", NULL);
-	
-	bonobo_ui_component_add_listener (
-		composer->uic, "SecuritySMimeEncrypt",
-		menu_security_smime_encrypt_cb, composer);
-	
-	/* View -> Attachments */
-	bonobo_ui_component_add_listener (
-		composer->uic, "ViewAttach",
-		menu_view_attachments_activate_cb, composer);
-	
-	bonobo_ui_component_thaw (composer->uic, NULL);
-
-	/* Create the UIComponent for the non-control entries */
-
-	composer->entry_uic = bonobo_ui_component_new_default ();
-
-	/* Setup main menu plugin mechanism */
-	target = em_menu_target_new_widget(p->menu, (GtkWidget *)composer);
-	e_menu_update_target((EMenu *)p->menu, target);
-	e_menu_activate((EMenu *)p->menu, composer->uic, TRUE);
-}
-
-
-/* Miscellaneous callbacks.  */
-
-static void
-attachment_bar_changed_cb (EMsgComposerAttachmentBar *bar,
-			   void *data)
-{
-	EMsgComposer *composer = E_MSG_COMPOSER (data);
-
-	guint attachment_num = e_msg_composer_attachment_bar_get_num_attachments (
-		E_MSG_COMPOSER_ATTACHMENT_BAR (composer->attachment_bar));
-	if (attachment_num) {
-		gchar *num_text = g_strdup_printf (
-			ngettext ("<b>%d</b> File Attached", "<b>%d</b> Files Attached", attachment_num),
-			attachment_num);
-		gtk_label_set_markup (GTK_LABEL (composer->attachment_expander_num),
-				      num_text);
-		g_free (num_text);
-
-		gtk_widget_show (composer->attachment_expander_icon);
-		
-	} else {
-		gtk_label_set_text (GTK_LABEL (composer->attachment_expander_num), "");
-		gtk_widget_hide (composer->attachment_expander_icon);
-	}
-	
-	
-	/* Mark the composer as changed so it prompts about unsaved
-           changes on close */
-	e_msg_composer_set_changed (composer);
-}
-
-static void
-attachment_expander_activate_cb (EExpander *expander,
-				 void      *data)
-{
-	EMsgComposer *composer = E_MSG_COMPOSER (data);
-	gboolean show = e_expander_get_expanded (expander);
-	
-	/* Update the expander label */
-	if (show)
-		gtk_label_set_text_with_mnemonic (GTK_LABEL (composer->attachment_expander_label),
-						  _("Hide _Attachment Bar (drop attachments here)"));
-	else
-		gtk_label_set_text_with_mnemonic (GTK_LABEL (composer->attachment_expander_label),
-						  _("Show _Attachment Bar (drop attachments here)"));
-	
-	/* Update the GUI.  */
-	bonobo_ui_component_set_prop (
-		composer->uic, "/commands/ViewAttach",
-		"state", show ? "1" : "0", NULL);
-}
-
-static void
-subject_changed_cb (EMsgComposerHdrs *hdrs,
-		    gchar *subject,
-		    void *data)
-{
-	EMsgComposer *composer;
-	
-	composer = E_MSG_COMPOSER (data);
-	
-	gtk_window_set_title (GTK_WINDOW (composer), subject[0] ? subject : _("Compose a message"));
-}
-
-static void
-hdrs_changed_cb (EMsgComposerHdrs *hdrs,
-		 void *data)
-{
-	EMsgComposer *composer;
-	
-	composer = E_MSG_COMPOSER (data);
-	
-	/* Mark the composer as changed so it prompts about unsaved changes on close */
-	e_msg_composer_set_changed (composer);
-}
-
-enum {
-	UPDATE_AUTO_CC,
-	UPDATE_AUTO_BCC,
-};
-
-static void
-update_auto_recipients (EMsgComposerHdrs *hdrs, int mode, const char *auto_addrs)
-{
-	EDestination *dest, **destv = NULL;
-	CamelInternetAddress *iaddr;
-	GList *list, *tail, *node;
-	int i, n = 0;
-	
-	tail = list = NULL;
-	
-	if (auto_addrs) {
-		iaddr = camel_internet_address_new ();
-		if (camel_address_decode (CAMEL_ADDRESS (iaddr), auto_addrs) != -1) {
-			for (i = 0; i < camel_address_length (CAMEL_ADDRESS (iaddr)); i++) {
-				const char *name, *addr;
-				
-				if (!camel_internet_address_get (iaddr, i, &name, &addr))
-					continue;
-				
-				dest = e_destination_new ();
-				e_destination_set_auto_recipient (dest, TRUE);
-				
-				if (name)
-					e_destination_set_name (dest, name);
-				
-				if (addr)
-					e_destination_set_email (dest, addr);
-				
-				node = g_list_alloc ();
-				node->data = dest;
-				node->next = NULL;
-				
-				if (tail) {
-					node->prev = tail;
-					tail->next = node;
-				} else {
-					node->prev = NULL;
-					list = node;
-				}
-				
-				tail = node;
-				n++;
-			}
-		}
-		
-		camel_object_unref (iaddr);
-	}
-	
-	switch (mode) {
-	case UPDATE_AUTO_CC:
-		destv = e_msg_composer_hdrs_get_cc (hdrs);
-		break;
-	case UPDATE_AUTO_BCC:
-		destv = e_msg_composer_hdrs_get_bcc (hdrs);
-		break;
-	default:
-		g_assert_not_reached ();
-	}
-	
-	if (destv) {
-		for (i = 0; destv[i]; i++) {
-			if (!e_destination_is_auto_recipient (destv[i])) {
-				node = g_list_alloc ();
-				node->data = e_destination_copy (destv[i]);
-				node->next = NULL;
-				
-				if (tail) {
-					node->prev = tail;
-					tail->next = node;
-				} else {
-					node->prev = NULL;
-					list = node;
-				}
-				
-				tail = node;
-				n++;
-			}
-		}
-		
-		e_destination_freev (destv);
-	}
-	
-	destv = destination_list_to_vector_sized (list, n);
-	g_list_free (list);
-	
-	switch (mode) {
-	case UPDATE_AUTO_CC:
-		e_msg_composer_hdrs_set_cc (hdrs, destv);
-		break;
-	case UPDATE_AUTO_BCC:
-		e_msg_composer_hdrs_set_bcc (hdrs, destv);
-		break;
-	default:
-		g_assert_not_reached ();
-	}
-	
-	e_destination_freev (destv);
-}
-
-static void
-from_changed_cb (EMsgComposerHdrs *hdrs, void *data)
-{
-	EMsgComposer *composer;
-	
-	composer = E_MSG_COMPOSER (data);
-	
-	if (hdrs->account) {
-		EAccount *account = hdrs->account;
-		
-		e_msg_composer_set_pgp_sign (composer,
-					     account->pgp_always_sign &&
-					     (!account->pgp_no_imip_sign || !composer->mime_type ||
-					      g_ascii_strncasecmp (composer->mime_type, "text/calendar", 13) != 0));
-		e_msg_composer_set_smime_sign (composer, account->smime_sign_default);
-		e_msg_composer_set_smime_encrypt (composer, account->smime_encrypt_default);
-		update_auto_recipients (hdrs, UPDATE_AUTO_CC, account->always_cc ? account->cc_addrs : NULL);
-		update_auto_recipients (hdrs, UPDATE_AUTO_BCC, account->always_bcc ? account->bcc_addrs : NULL);
-	} else {
-		update_auto_recipients (hdrs, UPDATE_AUTO_CC, NULL);
-		update_auto_recipients (hdrs, UPDATE_AUTO_BCC, NULL);
-	}
-	
-	set_editor_signature (composer);
-	e_msg_composer_show_sig_file (composer);
-}
-
-
-/* GObject methods.  */
-
-static void
-composer_finalise (GObject *object)
-{
-	EMsgComposer *composer;
-
-	composer = E_MSG_COMPOSER (object);
-	
-	if (composer->extra_hdr_names) {
-		int i;
-		
-		for (i = 0; i < composer->extra_hdr_names->len; i++) {
-			g_free (composer->extra_hdr_names->pdata[i]);
-			g_free (composer->extra_hdr_values->pdata[i]);
-		}
-		g_ptr_array_free (composer->extra_hdr_names, TRUE);
-		g_ptr_array_free (composer->extra_hdr_values, TRUE);
-	}
-	
-	e_msg_composer_clear_inlined_table (composer);
-	g_hash_table_destroy (composer->inline_images);
-	g_hash_table_destroy (composer->inline_images_by_url);
-	
-	g_free (composer->charset);
-	g_free (composer->mime_type);
-	g_free (composer->mime_body);
-	
-	if (composer->redirect)
-		camel_object_unref (composer->redirect);
-	
-	if (G_OBJECT_CLASS (parent_class)->finalize != NULL)
-		(* G_OBJECT_CLASS (parent_class)->finalize) (object);
-}
-
-static void
-composer_dispose(GObject *object)
-{
-	/* When destroy() is called, the contents of the window
-	 * (including the remote editor control) will already have
-	 * been destroyed, so we have to do this here.
-	 */
-	autosave_manager_unregister (am, E_MSG_COMPOSER (object));
-	if (G_OBJECT_CLASS (parent_class)->dispose != NULL)
-		(* G_OBJECT_CLASS (parent_class)->dispose) (object);
-}
-
-/* GtkObject methods */
-static void
-destroy (GtkObject *object)
-{
-	EMsgComposer *composer = (EMsgComposer *)object;
-	CORBA_Environment ev;
-	ESignatureList *signatures;
-	EMsgComposerPrivate *p = _PRIVATE(composer);
-
-	CORBA_exception_init (&ev);
-
-	if (p->menu) {
-		e_menu_update_target((EMenu *)p->menu, NULL);
-		g_object_unref(p->menu);
-		p->menu = NULL;
-	}
-
-	if (p->load) {
-		gtk_widget_destroy(p->load);
-		p->load = NULL;
-	}
-
-	if (p->saveas) {
-		gtk_widget_destroy(p->saveas);
-		p->saveas = NULL;
-	}
-
-	if (composer->uic) {
-		bonobo_object_unref (BONOBO_OBJECT (composer->uic));
-		composer->uic = NULL;
-	}
-
-	if (composer->entry_uic) {
-		bonobo_object_unref (BONOBO_OBJECT (composer->entry_uic));
-		composer->entry_uic = NULL;
-	}
-	
-	/* FIXME?  I assume the Bonobo widget will get destroyed
-           normally?  */
-	if (composer->address_dialog != NULL) {
-		gtk_widget_destroy (composer->address_dialog);
-		composer->address_dialog = NULL;
-	}
-	if (composer->hdrs != NULL) {
-		gtk_widget_destroy (composer->hdrs);
-		composer->hdrs = NULL;
-	}
-	
-	if (composer->notify_id) {
-		GConfClient *gconf = gconf_client_get_default ();
-		gconf_client_notify_remove (gconf, composer->notify_id);
-		composer->notify_id = 0;
-		g_object_unref (gconf);
-	}		
-
-	if (composer->persist_stream_interface != CORBA_OBJECT_NIL) {
-		Bonobo_Unknown_unref (composer->persist_stream_interface, &ev);
-		CORBA_Object_release (composer->persist_stream_interface, &ev);
-		composer->persist_stream_interface = CORBA_OBJECT_NIL;
-	}
-	
-	if (composer->persist_file_interface != CORBA_OBJECT_NIL) {
-		Bonobo_Unknown_unref (composer->persist_file_interface, &ev);
-		CORBA_Object_release (composer->persist_file_interface, &ev);
-		composer->persist_file_interface = CORBA_OBJECT_NIL;
-	}
-	
-	if (composer->editor_engine != CORBA_OBJECT_NIL) {
-		Bonobo_Unknown_unref (composer->editor_engine, &ev);
-		CORBA_Object_release (composer->editor_engine, &ev);
-		composer->editor_engine = CORBA_OBJECT_NIL;
-	}
-	
-	CORBA_exception_free (&ev);
-	
-	if (composer->editor_listener) {
-		bonobo_object_unref (composer->editor_listener);
-		composer->editor_listener = NULL;
-	}
-	
-	signatures = mail_config_get_signatures ();
-	
-	if (composer->sig_added_id != 0) {
-		g_signal_handler_disconnect (signatures, composer->sig_added_id);
-		composer->sig_added_id = 0;
-	}
-	
-	if (composer->sig_removed_id != 0) {
-		g_signal_handler_disconnect (signatures, composer->sig_removed_id);
-		composer->sig_removed_id = 0;
-	}
-	
-	if (composer->sig_changed_id != 0) {
-		g_signal_handler_disconnect (signatures, composer->sig_changed_id);
-		composer->sig_changed_id = 0;
-	}
-
-	if (GTK_OBJECT_CLASS (parent_class)->destroy != NULL)
-		(* GTK_OBJECT_CLASS (parent_class)->destroy) (object);
-}
-
-
-/* GtkWidget methods.  */
-
-static int
-delete_event (GtkWidget *widget,
-	      GdkEventAny *event)
-{
-	do_exit (E_MSG_COMPOSER (widget));
-	
-	return TRUE;
-}
-
-static void
-attach_message(EMsgComposer *composer, CamelMimeMessage *msg)
-{
-	CamelMimePart *mime_part;
-	const char *subject;
-
-	mime_part = camel_mime_part_new();
-	camel_mime_part_set_disposition(mime_part, "inline");
-	subject = camel_mime_message_get_subject(msg);
-	if (subject) {
-		char *desc = g_strdup_printf(_("Attached message - %s"), subject);
-
-		camel_mime_part_set_description(mime_part, desc);
-		g_free(desc);
-	} else
-		camel_mime_part_set_description(mime_part, _("Attached message"));
-
-	camel_medium_set_content_object((CamelMedium *)mime_part, (CamelDataWrapper *)msg);
-	camel_mime_part_set_content_type(mime_part, "message/rfc822");
-	e_msg_composer_attachment_bar_attach_mime_part(E_MSG_COMPOSER_ATTACHMENT_BAR(composer->attachment_bar), mime_part);
-	camel_object_unref(mime_part);
-}
-
-struct _drop_data {
-	EMsgComposer *composer;
-
-	GdkDragContext *context;
-	/* Only selection->data and selection->length are valid */
-	GtkSelectionData *selection;
-
-	guint32 action;
-	guint info;
-	guint time;
-
-	unsigned int move:1;
-	unsigned int moved:1;
-	unsigned int aborted:1;
-};
-
-static void
-drop_action(EMsgComposer *composer, GdkDragContext *context, guint32 action, GtkSelectionData *selection, guint info, guint time)
-{
-	char *tmp, *str, **urls;
-	CamelMimePart *mime_part;
-	CamelStream *stream;
-	CamelURL *url;
-	CamelMimeMessage *msg;
-	char *content_type;
-	int i, success=FALSE, delete=FALSE;
-
-	switch (info) {
-	case DND_TYPE_MESSAGE_RFC822:
-		d(printf ("dropping a message/rfc822\n"));
-		/* write the message(s) out to a CamelStream so we can use it */
-		stream = camel_stream_mem_new ();
-		camel_stream_write (stream, selection->data, selection->length);
-		camel_stream_reset (stream);
-		
-		msg = camel_mime_message_new ();
-		if (camel_data_wrapper_construct_from_stream((CamelDataWrapper *)msg, stream) != -1) {
-			attach_message(composer, msg);
-			success = TRUE;
-			delete = action == GDK_ACTION_MOVE;
-		}
-
-		camel_object_unref(msg);
-		camel_object_unref(stream);
-		break;
-	case DND_TYPE_TEXT_URI_LIST:
-	case DND_TYPE_NETSCAPE_URL:
-		d(printf ("dropping a text/uri-list\n"));
-		tmp = g_strndup (selection->data, selection->length);
-		urls = g_strsplit (tmp, "\n", 0);
-		g_free (tmp);
-		
-		for (i = 0; urls[i] != NULL; i++) {
-			str = g_strstrip (urls[i]);
-			if (urls[i][0] == '#') {
-				g_free(str);
-				continue;
-			}
-
-			if (!g_ascii_strncasecmp (str, "mailto:", 7)) {
-				handle_mailto (composer, str);
-				g_free (str);
-			} else {
-				url = camel_url_new (str, NULL);
-				g_free (str);
-
-				if (url == NULL)
-					continue;
-
-				if (!g_ascii_strcasecmp (url->protocol, "file"))
-					e_msg_composer_attachment_bar_attach
-						(E_MSG_COMPOSER_ATTACHMENT_BAR (composer->attachment_bar),
-					 	url->path);
-
-				camel_url_free (url);
-			}
-		}
-		
-		g_free (urls);
-		success = TRUE;
-		break;
-	case DND_TYPE_TEXT_VCARD:
-	case DND_TYPE_TEXT_CALENDAR:
-		content_type = gdk_atom_name (selection->type);
-		d(printf ("dropping a %s\n", content_type));
-		
-		mime_part = camel_mime_part_new ();
-		camel_mime_part_set_content (mime_part, selection->data, selection->length, content_type);
-		camel_mime_part_set_disposition (mime_part, "inline");
-		
-		e_msg_composer_attachment_bar_attach_mime_part
-			(E_MSG_COMPOSER_ATTACHMENT_BAR (composer->attachment_bar),
-			 mime_part);
-		
-		camel_object_unref (mime_part);
-		g_free (content_type);
-
-		success = TRUE;
-		break;
-	case DND_TYPE_X_UID_LIST: {
-		GPtrArray *uids;
-		char *inptr, *inend;
-		CamelFolder *folder;
-		CamelException ex = CAMEL_EXCEPTION_INITIALISER;
-
-		/* NB: This all runs synchronously, could be very slow/hang/block the ui */
-
-		uids = g_ptr_array_new();
-
-		inptr = selection->data;
-		inend = selection->data + selection->length;
-		while (inptr < inend) {
-			char *start = inptr;
-
-			while (inptr < inend && *inptr)
-				inptr++;
-
-			if (start > (char *)selection->data)
-				g_ptr_array_add(uids, g_strndup(start, inptr-start));
-
-			inptr++;
-		}
-
-		if (uids->len > 0) {
-			folder = mail_tool_uri_to_folder(selection->data, 0, &ex);
-			if (folder) {
-				if (uids->len == 1) {
-					msg = camel_folder_get_message(folder, uids->pdata[0], &ex);
-					if (msg == NULL)
-						goto fail;
-					attach_message(composer, msg);
-				} else {
-					CamelMultipart *mp = camel_multipart_new();
-					char *desc;
-
-					camel_data_wrapper_set_mime_type((CamelDataWrapper *)mp, "multipart/digest");
-					camel_multipart_set_boundary(mp, NULL);
-					for (i=0;i<uids->len;i++) {
-						msg = camel_folder_get_message(folder, uids->pdata[i], &ex);
-						if (msg) {
-							mime_part = camel_mime_part_new();
-							camel_mime_part_set_disposition(mime_part, "inline");
-							camel_medium_set_content_object((CamelMedium *)mime_part, (CamelDataWrapper *)msg);
-							camel_mime_part_set_content_type(mime_part, "message/rfc822");
-							camel_multipart_add_part(mp, mime_part);
-							camel_object_unref(mime_part);
-							camel_object_unref(msg);
-						} else {
-							camel_object_unref(mp);
-							goto fail;
-						}
-					}
-					mime_part = camel_mime_part_new();
-					camel_medium_set_content_object((CamelMedium *)mime_part, (CamelDataWrapper *)mp);
-					/* translators, this count will always be >1 */
-					desc = g_strdup_printf(ngettext("Attached message", "%d attached messages", uids->len), uids->len);
-					camel_mime_part_set_description(mime_part, desc);
-					g_free(desc);
-					e_msg_composer_attachment_bar_attach_mime_part(E_MSG_COMPOSER_ATTACHMENT_BAR(composer->attachment_bar), mime_part);
-					camel_object_unref(mime_part);
-					camel_object_unref(mp);
-				}
-				success = TRUE;
-				delete = action == GDK_ACTION_MOVE;
-			fail:
-				if (camel_exception_is_set(&ex)) {
-					char *name;
-
-					camel_object_get(folder, NULL, CAMEL_FOLDER_NAME, &name, NULL);
-					e_error_run((GtkWindow *)composer, "mail-composer:attach-nomessages",
-						    name?name:(char *)selection->data, camel_exception_get_description(&ex), NULL);
-					camel_object_free(folder, CAMEL_FOLDER_NAME, name);
-				}
-				camel_object_unref(folder);
-			} else {
-				e_error_run((GtkWindow *)composer, "mail-composer:attach-nomessages",
-					    selection->data, camel_exception_get_description(&ex), NULL);
-			}
-
-			camel_exception_clear(&ex);
-		}
-
-		g_ptr_array_free(uids, TRUE);
-
-		break; }
-	default:
-		d(printf ("dropping an unknown\n"));
-		break;
-	}
-
-	printf("Drag finished, success %d delete %d\n", success, delete);
-
-	gtk_drag_finish(context, success, delete, time);
-}
-
-static void
-drop_popup_copy(EPopup *ep, EPopupItem *item, void *data)
-{
-	struct _drop_data *m = data;
-	drop_action(m->composer, m->context, GDK_ACTION_COPY, m->selection, m->info, m->time);
-}
-
-static void
-drop_popup_move(EPopup *ep, EPopupItem *item, void *data)
-{
-	struct _drop_data *m = data;
-	drop_action(m->composer, m->context, GDK_ACTION_MOVE, m->selection, m->info, m->time);
-}
-
-static void
-drop_popup_cancel(EPopup *ep, EPopupItem *item, void *data)
-{
-	struct _drop_data *m = data;
-	gtk_drag_finish(m->context, FALSE, FALSE, m->time);
-}
-
-static EPopupItem drop_popup_menu[] = {
-	{ E_POPUP_ITEM, "00.emc.02", N_("_Copy"), drop_popup_copy, NULL, "stock_mail-copy", 0 },
-	{ E_POPUP_ITEM, "00.emc.03", N_("_Move"), drop_popup_move, NULL, "stock_mail-move", 0 },
-	{ E_POPUP_BAR, "10.emc" },
-	{ E_POPUP_ITEM, "99.emc.00", N_("Cancel _Drag"), drop_popup_cancel, NULL, NULL, 0 },
-};
-
-static void
-drop_popup_free(EPopup *ep, GSList *items, void *data)
-{
-	struct _drop_data *m = data;
-
-	g_slist_free(items);
-
-	g_object_unref(m->context);
-	g_object_unref(m->composer);
-	g_free(m->selection->data);
-	g_free(m->selection);
-	g_free(m);
-}
-
-static void
-drag_data_received (EMsgComposer *composer, GdkDragContext *context,
-		    int x, int y, GtkSelectionData *selection,
-		    guint info, guint time)
-{
-	if (selection->data == NULL || selection->length == -1)
-		return;
-
-	if (context->action == GDK_ACTION_ASK) {
-		EMPopup *emp;
-		GSList *menus = NULL;
-		GtkMenu *menu;
-		int i;
-		struct _drop_data *m;
-
-		m = g_malloc0(sizeof(*m));
-		m->context = context;
-		g_object_ref(context);
-		m->composer = composer;
-		g_object_ref(composer);
-		m->action = context->action;
-		m->info = info;
-		m->time = time;
-		m->selection = g_malloc0(sizeof(*m->selection));
-		m->selection->data = g_malloc(selection->length);
-		memcpy(m->selection->data, selection->data, selection->length);
-		m->selection->length = selection->length;
-
-		emp = em_popup_new("org.gnome.evolution.mail.composer.popup.drop");
-		for (i=0;i<sizeof(drop_popup_menu)/sizeof(drop_popup_menu[0]);i++)
-			menus = g_slist_append(menus, &drop_popup_menu[i]);
-
-		e_popup_add_items((EPopup *)emp, menus, NULL, drop_popup_free, m);
-		menu = e_popup_create_menu_once((EPopup *)emp, NULL, 0);
-		gtk_menu_popup(menu, NULL, NULL, NULL, NULL, 0, time);
-	} else {
-		drop_action(composer, context, context->action, selection, info, time);
-	}
-}
-
-static gboolean
-drag_motion(GObject *o, GdkDragContext *context, gint x, gint y, guint time, EMsgComposer *composer)
-{
-	GList *targets;
-	GdkDragAction action, actions = 0;
-
-	for (targets = context->targets; targets; targets = targets->next) {
-		int i;
-
-		for (i=0;i<sizeof(drag_info)/sizeof(drag_info[0]);i++)
-			if (targets->data == (void *)drag_info[i].atom)
-				actions |= drag_info[i].actions;
-	}
-
-	actions &= context->actions;
-	action = context->suggested_action;
-	/* we default to copy */
-	if (action == GDK_ACTION_ASK && (actions & (GDK_ACTION_MOVE|GDK_ACTION_COPY)) != (GDK_ACTION_MOVE|GDK_ACTION_COPY))
-		action = GDK_ACTION_COPY;
-
-	gdk_drag_status(context, action, time);
-
-	return action != 0;
-}
-
-static void
-class_init (EMsgComposerClass *klass)
-{
-	GtkObjectClass *object_class;
-	GtkWidgetClass *widget_class;
-	GObjectClass *gobject_class;
-	int i;
-
-	for (i=0;i<sizeof(drag_info)/sizeof(drag_info[0]);i++)
-		drag_info[i].atom = gdk_atom_intern(drag_info[i].target, FALSE);
-
-	gobject_class = G_OBJECT_CLASS(klass);
-	object_class = GTK_OBJECT_CLASS (klass);
-	widget_class = GTK_WIDGET_CLASS (klass);
-
-	g_type_class_add_private(gobject_class, sizeof(struct _EMsgComposerPrivate));
-	
-	gobject_class->finalize = composer_finalise;
-	gobject_class->dispose = composer_dispose;
-	object_class->destroy = destroy;
-	widget_class->delete_event = delete_event;
-	
-	parent_class = g_type_class_ref(bonobo_window_get_type ());
-	
-	signals[SEND] =
-		g_signal_new ("send",
-			      E_TYPE_MSG_COMPOSER,
-			      G_SIGNAL_RUN_LAST,
-			      G_STRUCT_OFFSET (EMsgComposerClass, send),
-			      NULL, NULL,
-			      g_cclosure_marshal_VOID__VOID,
-			      G_TYPE_NONE, 0);
-	
-	signals[SAVE_DRAFT] =
-		g_signal_new ("save-draft",
-			      E_TYPE_MSG_COMPOSER,
-			      G_SIGNAL_RUN_LAST,
-			      G_STRUCT_OFFSET (EMsgComposerClass, save_draft),
-			      NULL, NULL,
-			      g_cclosure_marshal_VOID__BOOLEAN,
-			      G_TYPE_NONE,
-			      1, G_TYPE_BOOLEAN);
-}
-
-static void
-init (EMsgComposer *composer)
-{
-	EMsgComposerPrivate *p = _PRIVATE(composer);
-
-	composer->uic                      = NULL;
-	
-	composer->hdrs                     = NULL;
-	composer->extra_hdr_names          = g_ptr_array_new ();
-	composer->extra_hdr_values         = g_ptr_array_new ();
-	
-	composer->focused_entry            = NULL;
-	
-	composer->editor                   = NULL;
-	
-	composer->address_dialog           = NULL;
-	
-	composer->attachment_bar           = NULL;
-	composer->attachment_scrolled_window = NULL;
-	
-	composer->persist_file_interface   = CORBA_OBJECT_NIL;
-	composer->persist_stream_interface = CORBA_OBJECT_NIL;
-	
-	composer->editor_engine            = CORBA_OBJECT_NIL;
-	composer->inline_images            = g_hash_table_new (g_str_hash, g_str_equal);
-	composer->inline_images_by_url     = g_hash_table_new (g_str_hash, g_str_equal);
-	composer->current_images           = NULL;
-	
-	composer->attachment_bar_visible   = FALSE;
-	composer->send_html                = FALSE;
-	composer->pgp_sign                 = FALSE;
-	composer->pgp_encrypt              = FALSE;
-	composer->smime_sign               = FALSE;
-	composer->smime_encrypt            = FALSE;
-	
-	composer->has_changed              = FALSE;
-	composer->autosaved                = FALSE;
-	
-	composer->redirect                 = FALSE;
-	
-	composer->charset                  = NULL;
-	
-	composer->enable_autosave          = TRUE;
-	composer->autosave_file            = NULL;
-	composer->autosave_fd              = -1;
-
-	/** @HookPoint-EMMenu: Main Mail Menu
-	 * @Id: org.gnome.evolution.mail.composer
-	 * @Class: org.gnome.evolution.mail.bonobomenu:1.0
-	 * @Target: EMMenuTargetWidget
-	 *
-	 * The main menu of the composer window.  The widget of the
-	 * target will point to the EMsgComposer object.
-	 */
-	p->menu = em_menu_new("org.gnome.evolution.mail.composer");
-}
-
-
-GtkType
-e_msg_composer_get_type (void)
-{
-	static GType type = 0;
-	
-	if (type == 0) {
-		static const GTypeInfo info = {
-			sizeof (EMsgComposerClass),
-			NULL, NULL,
-			(GClassInitFunc) class_init,
-			NULL, NULL,
-			sizeof (EMsgComposer),
-			0,
-			(GInstanceInitFunc) init,
-		};
-		
-		type = g_type_register_static (bonobo_window_get_type (), "EMsgComposer", &info, 0);
-	}
-	
-	return type;
-}
-
-static void
-e_msg_composer_load_config (EMsgComposer *composer, int visible_mask)
-{
-	GConfClient *gconf;
-	
-	gconf = gconf_client_get_default ();
-	
-	composer->view_from = gconf_client_get_bool (
-		gconf, "/apps/evolution/mail/composer/view/From", NULL);
-	composer->view_replyto = gconf_client_get_bool (
-		gconf, "/apps/evolution/mail/composer/view/ReplyTo", NULL);
-	composer->view_to = gconf_client_get_bool (
-		gconf, "/apps/evolution/mail/composer/view/To", NULL);
-	composer->view_postto = gconf_client_get_bool (
-		gconf, "/apps/evolution/mail/composer/view/PostTo", NULL);
-	composer->view_cc = gconf_client_get_bool ( 
-		gconf, "/apps/evolution/mail/composer/view/Cc", NULL);
-	composer->view_bcc = gconf_client_get_bool (
-		gconf, "/apps/evolution/mail/composer/view/Bcc", NULL);
-	composer->view_subject = gconf_client_get_bool (
-		gconf, "/apps/evolution/mail/composer/view/Subject", NULL);
-	
-	/* if we're mailing, you cannot disable to so it should appear checked */
-	if (visible_mask & E_MSG_COMPOSER_VISIBLE_TO)
-		composer->view_to = TRUE;
-	else
-		composer->view_to = FALSE;
-	
-	/* ditto for post-to */
-	if (visible_mask & E_MSG_COMPOSER_VISIBLE_POSTTO)
-		composer->view_postto = TRUE;
-	else
-		composer->view_postto = FALSE;
-	
-	/* we set these to false initially if we're posting */
-	if (!(visible_mask & E_MSG_COMPOSER_VISIBLE_CC))
-		composer->view_cc = FALSE;
-	
-	if (!(visible_mask & E_MSG_COMPOSER_VISIBLE_BCC))
-		composer->view_bcc = FALSE;
-	
-	g_object_unref (gconf);
-}
-
-static int
-e_msg_composer_get_visible_flags (EMsgComposer *composer)
-{
-	int flags = 0;
-	
-	if (composer->view_from)
-		flags |= E_MSG_COMPOSER_VISIBLE_FROM;
-	if (composer->view_replyto)
-		flags |= E_MSG_COMPOSER_VISIBLE_REPLYTO;
-	if (composer->view_to)
-		flags |= E_MSG_COMPOSER_VISIBLE_TO;
-	if (composer->view_postto)
-		flags |= E_MSG_COMPOSER_VISIBLE_POSTTO;
-	if (composer->view_cc)
-		flags |= E_MSG_COMPOSER_VISIBLE_CC;
-	if (composer->view_bcc)
-		flags |= E_MSG_COMPOSER_VISIBLE_BCC;
-	if (composer->view_subject)
-		flags |= E_MSG_COMPOSER_VISIBLE_SUBJECT;
-	
-	/*
-	 * Until we have a GUI way, lets make sure that
-	 * even if the user screws up, we will do the right
-	 * thing (screws up == edit the config file manually
-	 * and screw up).
-	 */
-	flags |= E_MSG_COMPOSER_VISIBLE_SUBJECT;	
-	return flags;
-}
-
-
-static void
-map_default_cb (EMsgComposer *composer, gpointer user_data)
-{
-	GtkWidget *widget;
-	CORBA_Environment ev;
-	const char *subject;
-	const char *text;
-
-	/* If the 'To:' field is empty, focus it */	
-
-	widget = e_msg_composer_hdrs_get_to_entry (E_MSG_COMPOSER_HDRS (composer->hdrs));
-	text = gtk_entry_get_text (GTK_ENTRY (widget));
-	
-	if (!text || text[0] == '\0') {
-		gtk_widget_grab_focus (widget);
-		
-		return;
-	}
-	
-	/* If not, check the subject field */
-	
-	subject = e_msg_composer_hdrs_get_subject (E_MSG_COMPOSER_HDRS (composer->hdrs));
-	
-	if (!subject || subject[0] == '\0') {
-		widget = e_msg_composer_hdrs_get_subject_entry (E_MSG_COMPOSER_HDRS (composer->hdrs));
-		gtk_widget_grab_focus (widget);
-		return;
-	}
-	
-	/* Jump to the editor as a last resort. */
-	
-	CORBA_exception_init (&ev);
-	GNOME_GtkHTML_Editor_Engine_runCommand (composer->editor_engine, "grab-focus", &ev);
-	CORBA_exception_free (&ev);
-}
-
-static void
-msg_composer_destroy_notify (void *data)
-{
-	EMsgComposer *composer = E_MSG_COMPOSER (data);
-	
-	all_composers = g_slist_remove (all_composers, composer);
-}
-
-static int
-composer_key_pressed (EMsgComposer *composer, GdkEventKey *event, void *user_data)
-{
-	if (event->keyval == GDK_Escape) {
-		do_exit (composer);
-		g_signal_stop_emission_by_name (composer, "key-press-event");
-		return TRUE;
-	}
-	
-	return FALSE;
-}
-
-
-/* Verbs for non-control entries */
-static BonoboUIVerb entry_verbs [] = {
-	BONOBO_UI_VERB ("EditCut", menu_edit_cut_cb),
-	BONOBO_UI_VERB ("EditCopy", menu_edit_copy_cb),
-	BONOBO_UI_VERB ("EditPaste", menu_edit_paste_cb),
-	BONOBO_UI_VERB ("EditSelectAll", menu_edit_select_all_cb),
-	BONOBO_UI_VERB_END
-};
-
-/* All this snot is so that Cut/Copy/Paste work. */
-static gboolean
-composer_entry_focus_in_event_cb (GtkWidget *widget, GdkEventFocus *event, gpointer user_data)
-{
-	EMsgComposer *composer = user_data;
-	BonoboUIContainer *container;
-
-	composer->focused_entry = widget;
-
-	container = bonobo_window_get_ui_container (BONOBO_WINDOW (composer));
-	bonobo_ui_component_set_container (composer->entry_uic, bonobo_object_corba_objref (BONOBO_OBJECT (container)), NULL);
-
-	bonobo_ui_component_add_verb_list_with_data (composer->entry_uic, entry_verbs, composer);
-
-	bonobo_ui_component_freeze (composer->entry_uic, NULL);
-
-	bonobo_ui_util_set_ui (composer->entry_uic, PREFIX,
-			       EVOLUTION_UIDIR "/evolution-composer-entries.xml",
-			       "evolution-composer-entries", NULL);
-	
-	bonobo_ui_component_thaw (composer->entry_uic, NULL);
-	
-	return FALSE;
-}
-
-static gboolean
-composer_entry_focus_out_event_cb (GtkWidget *widget, GdkEventFocus *event, gpointer user_data)
-{
-	EMsgComposer *composer = user_data;
-	
-	g_assert (composer->focused_entry == widget);
-	composer->focused_entry = NULL;
-
-	bonobo_ui_component_unset_container (composer->entry_uic, NULL);
-	
-	return FALSE;
-}
-
-static void
-setup_cut_copy_paste (EMsgComposer *composer)
-{
-	EMsgComposerHdrs *hdrs;
-	GtkWidget *entry;
-	
-	hdrs = (EMsgComposerHdrs *) composer->hdrs;
-	
-	entry = e_msg_composer_hdrs_get_subject_entry (hdrs);
-	g_signal_connect (entry, "focus_in_event", G_CALLBACK (composer_entry_focus_in_event_cb), composer);
-	g_signal_connect (entry, "focus_out_event", G_CALLBACK (composer_entry_focus_out_event_cb), composer);
-	
-	entry = e_msg_composer_hdrs_get_reply_to_entry (hdrs);
-	g_signal_connect (entry, "focus_in_event", G_CALLBACK (composer_entry_focus_in_event_cb), composer);
-	g_signal_connect (entry, "focus_out_event", G_CALLBACK (composer_entry_focus_out_event_cb), composer);
-
-	entry = e_msg_composer_hdrs_get_to_entry (hdrs);
-	g_signal_connect (entry, "focus_in_event", G_CALLBACK (composer_entry_focus_in_event_cb), composer);
-	g_signal_connect (entry, "focus_out_event", G_CALLBACK (composer_entry_focus_out_event_cb), composer);
-
-	entry = e_msg_composer_hdrs_get_cc_entry (hdrs);
-	g_signal_connect (entry, "focus_in_event", G_CALLBACK (composer_entry_focus_in_event_cb), composer);
-	g_signal_connect (entry, "focus_out_event", G_CALLBACK (composer_entry_focus_out_event_cb), composer);
-
-	entry = e_msg_composer_hdrs_get_bcc_entry (hdrs);
-	g_signal_connect (entry, "focus_in_event", G_CALLBACK (composer_entry_focus_in_event_cb), composer);
-	g_signal_connect (entry, "focus_out_event", G_CALLBACK (composer_entry_focus_out_event_cb), composer);
-
-	entry = e_msg_composer_hdrs_get_post_to_label (hdrs);
-	g_signal_connect (entry, "focus_in_event", G_CALLBACK (composer_entry_focus_in_event_cb), composer);
-	g_signal_connect (entry, "focus_out_event", G_CALLBACK (composer_entry_focus_out_event_cb), composer);
-}
-
-static void
-composer_settings_update (GConfClient *gconf, guint cnxn_id, GConfEntry *entry, gpointer data)
-{
-	gboolean bool;
-	EMsgComposer *composer = data;
-
-	bool = gconf_client_get_bool (gconf, "/apps/evolution/mail/composer/magic_smileys", NULL);
-	bonobo_widget_set_property (BONOBO_WIDGET (composer->editor),
-				    "MagicSmileys", TC_CORBA_boolean, bool,
-				    NULL);
-
-	bool = gconf_client_get_bool (gconf, "/apps/evolution/mail/composer/magic_links", NULL);
-	bonobo_widget_set_property (BONOBO_WIDGET (composer->editor),
-				    "MagicLinks", TC_CORBA_boolean, bool,
-				    NULL);
-
-	bool = gconf_client_get_bool (gconf, "/apps/evolution/mail/composer/inline_spelling", NULL);
-	bonobo_widget_set_property (BONOBO_WIDGET (composer->editor),
-				   "InlineSpelling", TC_CORBA_boolean, bool,
-				   NULL);
-}
-
-static void
-e_msg_composer_unrealize (GtkWidget *widget, gpointer data)
-{
-	EMsgComposer *composer = E_MSG_COMPOSER (widget);
-	GConfClient *gconf;
-	int width, height;
-
-	gtk_window_get_size (GTK_WINDOW (composer), &width, &height);
-
-	gconf = gconf_client_get_default ();
-	gconf_client_set_int (gconf, "/apps/evolution/mail/composer/width", width, NULL);
-	gconf_client_set_int (gconf, "/apps/evolution/mail/composer/height", height, NULL);
-	g_object_unref (gconf);
-}
-
-static EMsgComposer *
-create_composer (int visible_mask)
-{
-	EMsgComposer *composer;
-	GtkWidget *vbox, *expander_hbox;
-	Bonobo_Unknown editor_server;
-	CORBA_Environment ev;
-	GConfClient *gconf;
-	int vis;
-	GList *icon_list;
-	BonoboControlFrame *control_frame;
-	
-	composer = g_object_new (E_TYPE_MSG_COMPOSER, "win_name", _("Compose a message"), NULL);
-	gtk_window_set_title ((GtkWindow *) composer, _("Compose a message"));
-	
-	all_composers = g_slist_prepend (all_composers, composer);
-	
-	g_signal_connect (composer, "key-press-event",
-			  G_CALLBACK (composer_key_pressed),
-			  NULL);
-	
-	g_signal_connect (composer, "destroy",
-			  G_CALLBACK (msg_composer_destroy_notify),
-			  NULL);
-
-	icon_list = e_icon_factory_get_icon_list ("stock_mail-compose");
-	if (icon_list) {
-		gtk_window_set_icon_list (GTK_WINDOW (composer), icon_list);
-		g_list_foreach (icon_list, (GFunc) g_object_unref, NULL);
-		g_list_free (icon_list);
-	}
-
-	/* DND support */
-	gtk_drag_dest_set (GTK_WIDGET (composer), GTK_DEST_DEFAULT_ALL,  drop_types, num_drop_types, GDK_ACTION_COPY|GDK_ACTION_ASK|GDK_ACTION_MOVE);
-	g_signal_connect(composer, "drag_data_received", G_CALLBACK (drag_data_received), NULL);
-	g_signal_connect(composer, "drag-motion", G_CALLBACK(drag_motion), composer);
-	e_msg_composer_load_config (composer, visible_mask);
-	
-	setup_ui (composer);
-	
-	vbox = gtk_vbox_new (FALSE, 0);
-	
-	vis = e_msg_composer_get_visible_flags (composer);
-	composer->hdrs = e_msg_composer_hdrs_new (composer->uic, visible_mask, vis);
-	if (!composer->hdrs) {
-		e_error_run (GTK_WINDOW (composer), "mail-composer:no-address-control", NULL);
-		gtk_object_destroy (GTK_OBJECT (composer));
-		return NULL;
-	}
-	
-	gtk_box_set_spacing (GTK_BOX (vbox), 6);
-	gtk_box_pack_start (GTK_BOX (vbox), composer->hdrs, FALSE, FALSE, 0);
-	g_signal_connect (composer->hdrs, "subject_changed",
-			  G_CALLBACK (subject_changed_cb), composer);
-	g_signal_connect (composer->hdrs, "hdrs_changed",
-			  G_CALLBACK (hdrs_changed_cb), composer);
-	g_signal_connect (composer->hdrs, "from_changed",
-			  G_CALLBACK (from_changed_cb), composer);
-	gtk_widget_show (composer->hdrs);
-	
-	setup_signatures_menu (composer);
-
-	from_changed_cb((EMsgComposerHdrs *)composer->hdrs, composer);
-
-	/* Editor component.  */
-	composer->editor = bonobo_widget_new_control (
-		GNOME_GTKHTML_EDITOR_CONTROL_ID,
-		bonobo_ui_component_get_container (composer->uic));
-	if (!composer->editor) {
-		e_error_run (GTK_WINDOW (composer), "mail-composer:no-editor-control", NULL);
-		gtk_object_destroy (GTK_OBJECT (composer));
-		return NULL;
-	}
-
-	control_frame = bonobo_widget_get_control_frame (BONOBO_WIDGET (composer->editor));
-	bonobo_control_frame_set_autoactivate (control_frame, TRUE);
-	
-	/* let the editor know which mode we are in */
-	bonobo_widget_set_property (BONOBO_WIDGET (composer->editor), 
-				    "FormatHTML", TC_CORBA_boolean, composer->send_html,
-				    NULL);
-	
-	gconf = gconf_client_get_default ();
-	composer_settings_update (gconf, 0, NULL, composer);
-	gconf_client_add_dir (gconf, "/apps/evolution/mail/composer", GCONF_CLIENT_PRELOAD_ONELEVEL, NULL);
-	composer->notify_id = gconf_client_notify_add (gconf, "/apps/evolution/mail/composer",
-						       composer_settings_update, composer, NULL, NULL);
-	gtk_window_set_default_size (GTK_WINDOW (composer),
-				     gconf_client_get_int (gconf, "/apps/evolution/mail/composer/width", NULL),
-				     gconf_client_get_int (gconf, "/apps/evolution/mail/composer/height", NULL));
-	g_signal_connect (composer, "unrealize", G_CALLBACK (e_msg_composer_unrealize), NULL);
-	g_object_unref (gconf);
-	
-	editor_server = bonobo_widget_get_objref (BONOBO_WIDGET (composer->editor));
-	
-	/* FIXME: handle exceptions */
-	CORBA_exception_init (&ev);
-	composer->persist_file_interface
-		= Bonobo_Unknown_queryInterface (editor_server, "IDL:Bonobo/PersistFile:1.0", &ev);
-	composer->persist_stream_interface
-		= Bonobo_Unknown_queryInterface (editor_server, "IDL:Bonobo/PersistStream:1.0", &ev);
-	CORBA_exception_free (&ev);
-	
-	gtk_box_pack_start (GTK_BOX (vbox), composer->editor, TRUE, TRUE, 0);
-	
-	/* Attachment editor, wrapped into an EScrollFrame.  It's
-           hidden in an EExpander. */
-	
-	composer->attachment_scrolled_window = gtk_scrolled_window_new (NULL, NULL);
-	gtk_scrolled_window_set_shadow_type (GTK_SCROLLED_WINDOW (composer->attachment_scrolled_window),
-					     GTK_SHADOW_IN);
-	gtk_scrolled_window_set_policy (GTK_SCROLLED_WINDOW (composer->attachment_scrolled_window),
-					GTK_POLICY_AUTOMATIC, GTK_POLICY_AUTOMATIC);
-	
-	composer->attachment_bar = e_msg_composer_attachment_bar_new (NULL);
-	GTK_WIDGET_SET_FLAGS (composer->attachment_bar, GTK_CAN_FOCUS);
-	gtk_container_add (GTK_CONTAINER (composer->attachment_scrolled_window),
-			   composer->attachment_bar);
-	gtk_widget_show (composer->attachment_bar);
-	g_signal_connect (composer->attachment_bar, "changed",
-			  G_CALLBACK (attachment_bar_changed_cb), composer);
-
-	composer->attachment_expander_label =
-		gtk_label_new_with_mnemonic (_("Show _Attachment Bar (drop attachments here)"));
-	composer->attachment_expander_num = gtk_label_new ("");
-	gtk_label_set_use_markup (GTK_LABEL (composer->attachment_expander_num), TRUE);
-	gtk_misc_set_alignment (GTK_MISC (composer->attachment_expander_label), 0.0, 0.5);
-	gtk_misc_set_alignment (GTK_MISC (composer->attachment_expander_num), 1.0, 0.5);
-	expander_hbox = gtk_hbox_new (FALSE, 0);
-	
-	composer->attachment_expander_icon = e_icon_factory_get_image ("stock_attach", E_ICON_SIZE_MENU);
-	gtk_misc_set_alignment (GTK_MISC (composer->attachment_expander_icon), 1, 0.5);
-	gtk_widget_set_size_request (composer->attachment_expander_icon, 100, -1);
-
-	gtk_box_pack_start (GTK_BOX (expander_hbox), composer->attachment_expander_label,
-			    TRUE, TRUE, 0);
-	gtk_box_pack_start (GTK_BOX (expander_hbox), composer->attachment_expander_icon,
-			    TRUE, TRUE, 0);
-	gtk_box_pack_start (GTK_BOX (expander_hbox), composer->attachment_expander_num,
-			    TRUE, TRUE, 0);
-	gtk_widget_show_all (expander_hbox);
-	gtk_widget_hide (composer->attachment_expander_icon);
-
-	composer->attachment_expander = e_expander_new ("");	
-	e_expander_set_label_widget (E_EXPANDER (composer->attachment_expander), expander_hbox);
-	atk_object_set_name (gtk_widget_get_accessible (composer->attachment_expander), _("Attachment Button: Press space key to toggle attachment bar"));
-	
-	gtk_container_add (GTK_CONTAINER (composer->attachment_expander),
-			   composer->attachment_scrolled_window);
-	gtk_box_pack_start (GTK_BOX (vbox), composer->attachment_expander,
-			    FALSE, FALSE, GNOME_PAD_SMALL);
-	gtk_widget_show (composer->attachment_expander);
-	g_signal_connect_after (composer->attachment_expander, "activate",
-				G_CALLBACK (attachment_expander_activate_cb), composer);
-	
-	bonobo_window_set_contents (BONOBO_WINDOW (composer), vbox);
-	gtk_widget_show (vbox);
-	
-	/* If we show this widget earlier, we lose network transparency. i.e. the
-	   component appears on the machine evo is running on, ignoring any DISPLAY
-	   variable. */
-	gtk_widget_show (composer->editor);
-	
-	e_msg_composer_show_attachments (composer, FALSE);
-	prepare_engine (composer);
-	if (composer->editor_engine == CORBA_OBJECT_NIL) {
-		e_error_run (GTK_WINDOW (composer), "mail-composer:no-editor-control", NULL);
-		gtk_object_destroy (GTK_OBJECT (composer));
-		return NULL;
-	}
-	
-	setup_cut_copy_paste (composer);
-
-	g_signal_connect (composer, "map", (GCallback) map_default_cb, NULL);
-	
-	if (am == NULL)
-		am = autosave_manager_new ();
-	
-	autosave_manager_register (am, composer);
-
-	composer->has_changed = FALSE;
-	
-	return composer;
-}
-
-static void
-set_editor_signature (EMsgComposer *composer)
-{
-	EAccountIdentity *id;
-	
-	g_return_if_fail (E_MSG_COMPOSER_HDRS (composer->hdrs)->account != NULL);
-	
-	id = E_MSG_COMPOSER_HDRS (composer->hdrs)->account->id;
-	if (id->sig_uid)
-		composer->signature = mail_config_get_signature_by_uid (id->sig_uid);
-	else
-		composer->signature = NULL;
-	
-	sig_select_item (composer);
-}
-
-/**
- * e_msg_composer_new_with_type:
- *
- * Create a new message composer widget. The type can be
- * E_MSG_COMPOSER_MAIL, E_MSG_COMPOSER_POST or E_MSG_COMPOSER_MAIL_POST.
- *
- * Return value: A pointer to the newly created widget
- **/
-
-EMsgComposer *
-e_msg_composer_new_with_type (int type)
-{
-	gboolean send_html;
-	GConfClient *gconf;
-	EMsgComposer *new;
-
-	gconf = gconf_client_get_default ();
-	send_html = gconf_client_get_bool (gconf, "/apps/evolution/mail/composer/send_html", NULL);
-	g_object_unref (gconf);
-
-	switch (type) {
-	case E_MSG_COMPOSER_MAIL:
-		new = create_composer (E_MSG_COMPOSER_VISIBLE_MASK_MAIL);
-		break;
-	case E_MSG_COMPOSER_POST:
-		new = create_composer (E_MSG_COMPOSER_VISIBLE_MASK_POST);
-		break;
-	default:
-		new = create_composer (E_MSG_COMPOSER_VISIBLE_MASK_MAIL | E_MSG_COMPOSER_VISIBLE_MASK_POST);
-	}
-
-	if (new) {
-		e_msg_composer_set_send_html (new, send_html);
-		set_editor_signature (new);
-		set_editor_text (new, "", 0, TRUE, TRUE);
-	}
-
-	return new;
-}
-
-/**
- * e_msg_composer_new:
- *
- * Create a new message composer widget.
- * 
- * Return value: A pointer to the newly created widget
- **/
-EMsgComposer *
-e_msg_composer_new (void)
-{
-	return e_msg_composer_new_with_type (E_MSG_COMPOSER_MAIL);
-}
-
-static gboolean
-is_special_header (const char *hdr_name)
-{
-	/* Note: a header is a "special header" if it has any meaning:
-	   1. it's not a X-* header or
-	   2. it's an X-Evolution* header
-	*/
-	if (g_ascii_strncasecmp (hdr_name, "X-", 2))
-		return TRUE;
-	
-	if (!g_ascii_strncasecmp (hdr_name, "X-Evolution", 11))
-		return TRUE;
-	
-	/* we can keep all other X-* headers */
-	
-	return FALSE;
-}
-
-static void
-e_msg_composer_set_pending_body (EMsgComposer *composer, char *text, ssize_t len)
-{
-	char *old;
-	
-	old = g_object_get_data ((GObject *) composer, "body:text");
-        g_free (old);
-	g_object_set_data ((GObject *) composer, "body:text", text);
-	g_object_set_data ((GObject *) composer, "body:len", GSIZE_TO_POINTER (len));
-}
-
-static void
-e_msg_composer_flush_pending_body (EMsgComposer *composer, gboolean apply)
-{
-        char *body;
-	ssize_t len;
-	
-	body = g_object_get_data ((GObject *) composer, "body:text");
-	len = GPOINTER_TO_SIZE (g_object_get_data ((GObject *) composer, "body:len"));
-	if (body) {
-		if (apply) 
-			set_editor_text (composer, body, len, FALSE, FALSE);
-		
-		g_object_set_data ((GObject *) composer, "body:text", NULL);
-		g_free (body);
-	}
-}	
-
-static void
-add_attachments_handle_mime_part (EMsgComposer *composer, CamelMimePart *mime_part, 
-				  gboolean just_inlines, gboolean related, int depth)
-{
-	CamelContentType *content_type;
-	CamelDataWrapper *wrapper;
-	
-	content_type = camel_mime_part_get_content_type (mime_part);
-	wrapper = camel_medium_get_content_object (CAMEL_MEDIUM (mime_part));
-	
-	if (CAMEL_IS_MULTIPART (wrapper)) {
-		/* another layer of multipartness... */
-		add_attachments_from_multipart (composer, (CamelMultipart *) wrapper, just_inlines, depth + 1);
-	} else if (just_inlines) {
-		if (camel_mime_part_get_content_id (mime_part) ||
-		    camel_mime_part_get_content_location (mime_part))
-			e_msg_composer_add_inline_image_from_mime_part (composer, mime_part);
-	} else if (CAMEL_IS_MIME_MESSAGE (wrapper)) {
-		/* do nothing */
-	} else if (related && camel_content_type_is (content_type, "image", "*")) {
-		e_msg_composer_add_inline_image_from_mime_part (composer, mime_part);
-	} else {
-		if (camel_content_type_is (content_type, "text", "*")) {
-			/* do nothing */
-		} else {
-			e_msg_composer_attach (composer, mime_part);
-		}
-	}
-}
-
-static void
-add_attachments_from_multipart (EMsgComposer *composer, CamelMultipart *multipart,
-				gboolean just_inlines, int depth)
-{
-	/* find appropriate message attachments to add to the composer */
-	CamelMimePart *mime_part;
-	gboolean related;
-	int i, nparts;
-	
-	related = camel_content_type_is (CAMEL_DATA_WRAPPER (multipart)->mime_type, "multipart", "related");
-		
-	if (CAMEL_IS_MULTIPART_SIGNED (multipart)) {
-		mime_part = camel_multipart_get_part (multipart, CAMEL_MULTIPART_SIGNED_CONTENT);
-		add_attachments_handle_mime_part (composer, mime_part, just_inlines, related, depth);
-	} else if (CAMEL_IS_MULTIPART_ENCRYPTED (multipart)) {
-		/* what should we do in this case? */
-	} else {
-		nparts = camel_multipart_get_number (multipart);
-
-		for (i = 0; i < nparts; i++) {
-			mime_part = camel_multipart_get_part (multipart, i);
-			add_attachments_handle_mime_part (composer, mime_part, just_inlines, related, depth);
-		}
-	}
-}
-
-
-/**
- * e_msg_composer_add_message_attachments:
- * @composer: the composer to add the attachments to.
- * @message: the source message to copy the attachments from.
- * @just_inlines: whether to attach all attachments or just add
- * inline images.
- *
- * Walk through all the mime parts in @message and add them to the composer
- * specified in @composer.
- */
-void
-e_msg_composer_add_message_attachments (EMsgComposer *composer, CamelMimeMessage *message,
-					gboolean just_inlines)
-{
-	CamelDataWrapper *wrapper;
-	
-	wrapper = camel_medium_get_content_object (CAMEL_MEDIUM (message));
-	if (!CAMEL_IS_MULTIPART (wrapper))
-		return;
-	
-	/* there must be attachments... */
-	add_attachments_from_multipart (composer, (CamelMultipart *) wrapper, just_inlines, 0);
-}
-
-
-static void
-handle_multipart_signed (EMsgComposer *composer, CamelMultipart *multipart, int depth)
-{
-	CamelContentType *content_type;
-	CamelDataWrapper *content;
-	CamelMimePart *mime_part;
-	
-	/* FIXME: make sure this isn't an s/mime signed part?? */
-	e_msg_composer_set_pgp_sign (composer, TRUE);
-	
-	mime_part = camel_multipart_get_part (multipart, CAMEL_MULTIPART_SIGNED_CONTENT);
-	content_type = camel_mime_part_get_content_type (mime_part);
-	
-	content = camel_medium_get_content_object (CAMEL_MEDIUM (mime_part));
-	
-	if (CAMEL_IS_MULTIPART (content)) {
-		multipart = CAMEL_MULTIPART (content);
-		
-		/* Note: depth is preserved here because we're not
-                   counting multipart/signed as a multipart, instead
-                   we want to treat the content part as our mime part
-                   here. */
-		
-		if (CAMEL_IS_MULTIPART_SIGNED (content)) {
-			/* handle the signed content and configure the composer to sign outgoing messages */
-			handle_multipart_signed (composer, multipart, depth);
-		} else if (CAMEL_IS_MULTIPART_ENCRYPTED (content)) {
-			/* decrypt the encrypted content and configure the composer to encrypt outgoing messages */
-			handle_multipart_encrypted (composer, multipart, depth);
-		} else if (camel_content_type_is (content_type, "multipart", "alternative")) {
-			/* this contains the text/plain and text/html versions of the message body */
-			handle_multipart_alternative (composer, multipart, depth);
-		} else {
-			/* there must be attachments... */
-			handle_multipart (composer, multipart, depth);
-		}
-	} else if (camel_content_type_is (content_type, "text", "*")) {
-		ssize_t len;
-		char *html;
-
-		html = em_utils_part_to_html (mime_part, &len, NULL);
-		e_msg_composer_set_pending_body (composer, html, len);
-	} else {
-		e_msg_composer_attach (composer, mime_part);
-	}
-}
-
-static void
-handle_multipart_encrypted (EMsgComposer *composer, CamelMultipart *multipart, int depth)
-{
-	CamelContentType *content_type;
-	CamelCipherContext *cipher;
-	CamelDataWrapper *content;
-	CamelMimePart *mime_part;
-	CamelException ex;
-	CamelCipherValidity *valid;
-
-	/* FIXME: make sure this is a PGP/MIME encrypted part?? */
-	e_msg_composer_set_pgp_encrypt (composer, TRUE);
-	
-	camel_exception_init (&ex);
-	cipher = mail_crypto_get_pgp_cipher_context (NULL);
-	mime_part = camel_mime_part_new();
-	valid = camel_cipher_decrypt(cipher, (CamelMimePart *)multipart, mime_part, &ex);
-	camel_object_unref(cipher);
-	camel_exception_clear (&ex);
-	if (valid == NULL)
-		return;	
-	camel_cipher_validity_free(valid);
-	
-	content_type = camel_mime_part_get_content_type (mime_part);
-	
-	content = camel_medium_get_content_object (CAMEL_MEDIUM (mime_part));
-	
-	if (CAMEL_IS_MULTIPART (content)) {
-		multipart = CAMEL_MULTIPART (content);
-		
-		/* Note: depth is preserved here because we're not
-                   counting multipart/encrypted as a multipart, instead
-                   we want to treat the content part as our mime part
-                   here. */
-		
-		if (CAMEL_IS_MULTIPART_SIGNED (content)) {
-			/* handle the signed content and configure the composer to sign outgoing messages */
-			handle_multipart_signed (composer, multipart, depth);
-		} else if (CAMEL_IS_MULTIPART_ENCRYPTED (content)) {
-			/* decrypt the encrypted content and configure the composer to encrypt outgoing messages */
-			handle_multipart_encrypted (composer, multipart, depth);
-		} else if (camel_content_type_is (content_type, "multipart", "alternative")) {
-			/* this contains the text/plain and text/html versions of the message body */
-			handle_multipart_alternative (composer, multipart, depth);
-		} else {
-			/* there must be attachments... */
-			handle_multipart (composer, multipart, depth);
-		}
-	} else if (camel_content_type_is (content_type, "text", "*")) {
-		ssize_t len;
-		char *html;
-
-		html = em_utils_part_to_html (mime_part, &len, NULL);
-		e_msg_composer_set_pending_body (composer, html, len);
-	} else {
-		e_msg_composer_attach (composer, mime_part);
-	}
-	
-	camel_object_unref (mime_part);
-}
-
-static void
-handle_multipart_alternative (EMsgComposer *composer, CamelMultipart *multipart, int depth)
-{
-	/* Find the text/html part and set the composer body to it's contents */
-	CamelMimePart *text_part = NULL;
-	int i, nparts;
-	
-	nparts = camel_multipart_get_number (multipart);
-	
-	for (i = 0; i < nparts; i++) {
-		CamelContentType *content_type;
-		CamelDataWrapper *content;
-		CamelMimePart *mime_part;
-		
-		mime_part = camel_multipart_get_part (multipart, i);
-		content_type = camel_mime_part_get_content_type (mime_part);
-		content = camel_medium_get_content_object (CAMEL_MEDIUM (mime_part));
-		
-		if (CAMEL_IS_MULTIPART (content)) {
-			CamelMultipart *mp;
-			
-			mp = CAMEL_MULTIPART (content);
-			
-			if (CAMEL_IS_MULTIPART_SIGNED (content)) {
-				/* handle the signed content and configure the composer to sign outgoing messages */
-				handle_multipart_signed (composer, mp, depth + 1);
-			} else if (CAMEL_IS_MULTIPART_ENCRYPTED (content)) {
-				/* decrypt the encrypted content and configure the composer to encrypt outgoing messages */
-				handle_multipart_encrypted (composer, mp, depth + 1);
-			} else {
-				/* depth doesn't matter so long as we don't pass 0 */
-				handle_multipart (composer, mp, depth + 1);
-			}
-		} else if (camel_content_type_is (content_type, "text", "html")) {
-			/* text/html is preferable, so once we find it we're done... */
-			text_part = mime_part;
-			break;
-		} else if (camel_content_type_is (content_type, "text", "*")) {
-			/* anyt text part not text/html is second rate so the first
-			   text part we find isn't necessarily the one we'll use. */
-			if (!text_part)
-				text_part = mime_part;
-		} else {
-			e_msg_composer_attach (composer, mime_part);
-		}
-	}
-	
-	if (text_part) {
-		ssize_t len;
-		char *html;
-
-		html = em_utils_part_to_html(text_part, &len, NULL);
-		e_msg_composer_set_pending_body(composer, html, len);
-	}
-}
-
-static void
-handle_multipart (EMsgComposer *composer, CamelMultipart *multipart, int depth)
-{
-	int i, nparts;
-	
-	nparts = camel_multipart_get_number (multipart);
-	
-	for (i = 0; i < nparts; i++) {
-		CamelContentType *content_type;
-		CamelDataWrapper *content;
-		CamelMimePart *mime_part;
-
-		mime_part = camel_multipart_get_part (multipart, i);
-		content_type = camel_mime_part_get_content_type (mime_part);
-		content = camel_medium_get_content_object (CAMEL_MEDIUM (mime_part));
-		
-		if (CAMEL_IS_MULTIPART (content)) {
-			CamelMultipart *mp;
-			
-			mp = CAMEL_MULTIPART (content);
-			
-			if (CAMEL_IS_MULTIPART_SIGNED (content)) {
-				/* handle the signed content and configure the composer to sign outgoing messages */
-				handle_multipart_signed (composer, mp, depth + 1);
-			} else if (CAMEL_IS_MULTIPART_ENCRYPTED (content)) {
-				/* decrypt the encrypted content and configure the composer to encrypt outgoing messages */
-				handle_multipart_encrypted (composer, mp, depth + 1);
-			} else if (camel_content_type_is (content_type, "multipart", "alternative")) {
-				handle_multipart_alternative (composer, mp, depth + 1);
-			} else {
-				/* depth doesn't matter so long as we don't pass 0 */
-				handle_multipart (composer, mp, depth + 1);
-			}
-		} else if (depth == 0 && i == 0) {
-			ssize_t len;
-			char *html;
-
-			/* Since the first part is not multipart/alternative, then this must be the body */
-			html = em_utils_part_to_html(mime_part, &len, NULL);
-			e_msg_composer_set_pending_body(composer, html, len);
-		} else if (camel_mime_part_get_content_id (mime_part) ||
-			   camel_mime_part_get_content_location (mime_part)) {
-			/* special in-line attachment */
-			e_msg_composer_add_inline_image_from_mime_part (composer, mime_part);
-		} else {
-			/* normal attachment */
-			e_msg_composer_attach (composer, mime_part);
-		}
-	}
-}
-
-static void
-set_signature_gui (EMsgComposer *composer)
-{
-	CORBA_Environment ev;
-	
-	composer->signature = NULL;
-	
-	CORBA_exception_init (&ev);
-	if (GNOME_GtkHTML_Editor_Engine_searchByData (composer->editor_engine, 1, "ClueFlow", "signature", "1", &ev)) {
-		char *name, *str = NULL;
-		
-		str = GNOME_GtkHTML_Editor_Engine_getParagraphData (composer->editor_engine, "signature_name", &ev);
-		if (ev._major == CORBA_NO_EXCEPTION && str) {
-			if (!strncmp (str, "uid:", 4)) {
-				name = decode_signature_name (str + 4);
-				composer->signature = mail_config_get_signature_by_uid (name);
-				g_free (name);
-			} else if (!strncmp (str, "name:", 5)) {
-				name = decode_signature_name (str + 4);
-				composer->signature = mail_config_get_signature_by_name (name);
-				g_free (name);
-			}
-		}
-		
-		sig_select_item (composer);
-	}
-	CORBA_exception_free (&ev);
-}
-
-
-static void
-auto_recip_free (gpointer key, gpointer value, gpointer user_data)
-{
-	g_free (key);
-}
-
-/**
- * e_msg_composer_new_with_message:
- * @message: The message to use as the source
- * 
- * Create a new message composer widget.
- *
- * Note: Designed to work only for messages constructed using Evolution.
- *
- * Return value: A pointer to the newly created widget
- **/
-EMsgComposer *
-e_msg_composer_new_with_message (CamelMimeMessage *message)
-{
-	const CamelInternetAddress *to, *cc, *bcc;
-	GList *To = NULL, *Cc = NULL, *Bcc = NULL, *postto = NULL;
-	const char *format, *subject;
-	EDestination **Tov, **Ccv, **Bccv;
-	GHashTable *auto_cc, *auto_bcc;
-	CamelContentType *content_type;
-	struct _camel_header_raw *headers;
-	CamelDataWrapper *content;
-	EAccount *account = NULL;
-	char *account_name;
-	EMsgComposer *new;
-	struct _camel_header_raw *xev;
-	int len, i;
-	
-	for (headers = CAMEL_MIME_PART (message)->headers;headers;headers = headers->next) {
-		if (!strcmp(headers->name, "X-Evolution-PostTo"))
-			postto = g_list_append(postto, g_strstrip(g_strdup(headers->value)));
-	}
-
-	new = create_composer (postto ? E_MSG_COMPOSER_VISIBLE_MASK_POST : E_MSG_COMPOSER_VISIBLE_MASK_MAIL);
-	if (!new) {
-		g_list_foreach(postto, (GFunc)g_free, NULL);
-		g_list_free(postto);
-		return NULL;
-	}
-	
-	if (postto) {
-		e_msg_composer_hdrs_set_post_to_list(E_MSG_COMPOSER_HDRS (new->hdrs), postto);
-		g_list_foreach(postto, (GFunc)g_free, NULL);
-		g_list_free(postto);
-		postto = NULL;
-	}
-	
-	/* Restore the Account preference */
-	account_name = (char *) camel_medium_get_header (CAMEL_MEDIUM (message), "X-Evolution-Account");
-	if (account_name) {
-		account_name = g_strdup (account_name);
-		g_strstrip (account_name);
-		
-		if ((account = mail_config_get_account_by_uid(account_name)) == NULL)
-			/* 'old' setting */
-			account = mail_config_get_account_by_name(account_name);
-	}
-	
-	if (postto == NULL) {
-		auto_cc = g_hash_table_new (camel_strcase_hash, camel_strcase_equal);
-		auto_bcc = g_hash_table_new (camel_strcase_hash, camel_strcase_equal);
-		
-		if (account) {
-			CamelInternetAddress *iaddr;
-			
-			/* hash our auto-recipients for this account */
-			if (account->always_cc) {
-				iaddr = camel_internet_address_new ();
-				if (camel_address_decode (CAMEL_ADDRESS (iaddr), account->cc_addrs) != -1) {
-					for (i = 0; i < camel_address_length (CAMEL_ADDRESS (iaddr)); i++) {
-						const char *name, *addr;
-						
-						if (!camel_internet_address_get (iaddr, i, &name, &addr))
-							continue;
-						
-						g_hash_table_insert (auto_cc, g_strdup (addr), GINT_TO_POINTER (TRUE));
-					}
-				}
-				camel_object_unref (iaddr);
-			}
-			
-			if (account->always_bcc) {
-				iaddr = camel_internet_address_new ();
-				if (camel_address_decode (CAMEL_ADDRESS (iaddr), account->bcc_addrs) != -1) {
-					for (i = 0; i < camel_address_length (CAMEL_ADDRESS (iaddr)); i++) {
-						const char *name, *addr;
-						
-						if (!camel_internet_address_get (iaddr, i, &name, &addr))
-							continue;
-						
-						g_hash_table_insert (auto_bcc, g_strdup (addr), GINT_TO_POINTER (TRUE));
-					}
-				}
-				camel_object_unref (iaddr);
-			}
-		}
-		
-		to = camel_mime_message_get_recipients (message, CAMEL_RECIPIENT_TYPE_TO);
-		cc = camel_mime_message_get_recipients (message, CAMEL_RECIPIENT_TYPE_CC);
-		bcc = camel_mime_message_get_recipients (message, CAMEL_RECIPIENT_TYPE_BCC);
-		
-		len = CAMEL_ADDRESS (to)->addresses->len;
-		for (i = 0; i < len; i++) {
-			const char *name, *addr;
-			
-			if (camel_internet_address_get (to, i, &name, &addr)) {
-				EDestination *dest = e_destination_new ();
-				e_destination_set_name (dest, name);
-				e_destination_set_email (dest, addr);
-				To = g_list_append (To, dest);
-			}
-		}
-		Tov = destination_list_to_vector (To);
-		g_list_free (To);
-		
-		len = CAMEL_ADDRESS (cc)->addresses->len;
-		for (i = 0; i < len; i++) {
-			const char *name, *addr;
-			
-			if (camel_internet_address_get (cc, i, &name, &addr)) {
-				EDestination *dest = e_destination_new ();
-				e_destination_set_name (dest, name);
-				e_destination_set_email (dest, addr);
-				
-				if (g_hash_table_lookup (auto_cc, addr))
-					e_destination_set_auto_recipient (dest, TRUE);
-				
-				Cc = g_list_append (Cc, dest);
-			}
-		}
-		
-		Ccv = destination_list_to_vector (Cc);
-		g_hash_table_foreach (auto_cc, auto_recip_free, NULL);
-		g_hash_table_destroy (auto_cc);
-		g_list_free (Cc);
-		
-		len = CAMEL_ADDRESS (bcc)->addresses->len;
-		for (i = 0; i < len; i++) {
-			const char *name, *addr;
-			
-			if (camel_internet_address_get (bcc, i, &name, &addr)) {
-				EDestination *dest = e_destination_new ();
-				e_destination_set_name (dest, name);
-				e_destination_set_email (dest, addr);
-				
-				if (g_hash_table_lookup (auto_bcc, addr))
-					e_destination_set_auto_recipient (dest, TRUE);
-				
-				Bcc = g_list_append (Bcc, dest);
-			}
-		}
-		
-		Bccv = destination_list_to_vector (Bcc);
-		g_hash_table_foreach (auto_bcc, auto_recip_free, NULL);
-		g_hash_table_destroy (auto_bcc);
-		g_list_free (Bcc);
-	} else {
-		Tov = NULL;
-		Ccv = NULL;
-		Bccv = NULL;
-	}
-	
-	subject = camel_mime_message_get_subject (message);
-	
-	e_msg_composer_set_headers (new, account_name, Tov, Ccv, Bccv, subject);
-	
-	g_free (account_name);
-	
-	e_destination_freev (Tov);
-	e_destination_freev (Ccv);
-	e_destination_freev (Bccv);
-	
-	/* Restore the format editing preference */
-	format = camel_medium_get_header (CAMEL_MEDIUM (message), "X-Evolution-Format");
-	if (format) {
-		char **flags;
-
-		while (*format && camel_mime_is_lwsp(*format))
-			format++;
-
-		flags = g_strsplit(format, ", ", 0);
-		for (i=0;flags[i];i++) {
-			printf("restoring draft flag '%s'\n", flags[i]);
-
-			if (g_ascii_strcasecmp(flags[i], "text/html") == 0)
-				e_msg_composer_set_send_html (new, TRUE);
-			else if (g_ascii_strcasecmp(flags[i], "text/plain") == 0)
-				e_msg_composer_set_send_html (new, FALSE);
-			else if (g_ascii_strcasecmp(flags[i], "pgp-sign") == 0)
-				e_msg_composer_set_pgp_sign(new, TRUE);
-			else if (g_ascii_strcasecmp(flags[i], "pgp-encrypt") == 0)
-				e_msg_composer_set_pgp_encrypt(new, TRUE);
-			else if (g_ascii_strcasecmp(flags[i], "smime-sign") == 0)
-				e_msg_composer_set_smime_sign(new, TRUE);
-			else if (g_ascii_strcasecmp(flags[i], "smime-encrypt") == 0)
-				e_msg_composer_set_smime_encrypt(new, TRUE);
-		}
-		g_strfreev(flags);
-	}
-	
-	/* Remove any other X-Evolution-* headers that may have been set */
-	xev = mail_tool_remove_xevolution_headers (message);
-	camel_header_raw_clear(&xev);
-	
-	/* set extra headers */
-	headers = CAMEL_MIME_PART (message)->headers;
-	while (headers) {
-		if (!is_special_header (headers->name) ||
-		    !g_ascii_strcasecmp (headers->name, "References") ||
-		    !g_ascii_strcasecmp (headers->name, "In-Reply-To")) {
-			g_ptr_array_add (new->extra_hdr_names, g_strdup (headers->name));
-			g_ptr_array_add (new->extra_hdr_values, g_strdup (headers->value));
-		}
-		
-		headers = headers->next;
-	}
-	
-	/* Restore the attachments and body text */
-	content = camel_medium_get_content_object (CAMEL_MEDIUM (message));
-	if (CAMEL_IS_MULTIPART (content)) {
-		CamelMultipart *multipart;
-		
-		multipart = CAMEL_MULTIPART (content);
-		content_type = camel_mime_part_get_content_type (CAMEL_MIME_PART (message));
-		
-		if (CAMEL_IS_MULTIPART_SIGNED (content)) {
-			/* handle the signed content and configure the composer to sign outgoing messages */
-			handle_multipart_signed (new, multipart, 0);
-		} else if (CAMEL_IS_MULTIPART_ENCRYPTED (content)) {
-			/* decrypt the encrypted content and configure the composer to encrypt outgoing messages */
-			handle_multipart_encrypted (new, multipart, 0);
-		} else if (camel_content_type_is (content_type, "multipart", "alternative")) {
-			/* this contains the text/plain and text/html versions of the message body */
-			handle_multipart_alternative (new, multipart, 0);
-		} else {
-			/* there must be attachments... */
-			handle_multipart (new, multipart, 0);
-		}
-	} else {
-		ssize_t len;
-		char *html;
-
-		html = em_utils_part_to_html((CamelMimePart *)message, &len, NULL);
-		e_msg_composer_set_pending_body(new, html, len);
-	}
-	
-	/* We wait until now to set the body text because we need to ensure that
-	 * the attachment bar has all the attachments, before we request them.
-	 */	
-	e_msg_composer_flush_pending_body (new, TRUE);
-	
-	set_signature_gui (new);
-	
-	return new;
-}
-
-static void
-disable_editor (EMsgComposer *composer)
-{
-	CORBA_Environment ev;
-
-	CORBA_exception_init (&ev);
-	GNOME_GtkHTML_Editor_Engine_runCommand (composer->editor_engine, "editable-off", &ev);
-	CORBA_exception_free (&ev);
-	
-	gtk_widget_set_sensitive (composer->attachment_bar, FALSE);
-	
-	bonobo_ui_component_set_prop (composer->uic, "/menu/Edit", "sensitive", "0", NULL);
-	bonobo_ui_component_set_prop (composer->uic, "/menu/Format", "sensitive", "0", NULL);
-	bonobo_ui_component_set_prop (composer->uic, "/menu/Insert", "sensitive", "0", NULL);
-}
-
-/**
- * e_msg_composer_new_redirect:
- * @message: The message to use as the source
- * 
- * Create a new message composer widget.
- *
- * Return value: A pointer to the newly created widget
- **/
-EMsgComposer *
-e_msg_composer_new_redirect (CamelMimeMessage *message, const char *resent_from)
-{
-	EMsgComposer *composer;
-	const char *subject;
-	
-	g_return_val_if_fail (CAMEL_IS_MIME_MESSAGE (message), NULL);
-	
-	composer = e_msg_composer_new_with_message (message);
-	subject = camel_mime_message_get_subject (message);
-	
-	composer->redirect = message;
-	camel_object_ref (message);
-	
-	e_msg_composer_set_headers (composer, resent_from, NULL, NULL, NULL, subject);
-	
-	disable_editor (composer);
-	
-	return composer;
-}
-
-
-static GList *
-add_recipients (GList *list, const char *recips)
-{
-	CamelInternetAddress *cia;
-	const char *name, *addr;
-	int num, i;
-	
-	cia = camel_internet_address_new ();
-	num = camel_address_decode (CAMEL_ADDRESS (cia), recips);
-	
-	for (i = 0; i < num; i++) {
-		if (camel_internet_address_get (cia, i, &name, &addr)) {
-			EDestination *dest = e_destination_new ();
-			e_destination_set_name (dest, name);
-			e_destination_set_email (dest, addr);
-			
-			list = g_list_append (list, dest);
-		}
-	}
-	
-	return list;
-}
-
-static void
-handle_mailto (EMsgComposer *composer, const char *mailto)
-{
-	EMsgComposerHdrs *hdrs;
-	GList *to = NULL, *cc = NULL, *bcc = NULL;
-	EDestination **tov, **ccv, **bccv;
-	char *subject = NULL, *body = NULL;
-	char *header, *content, *buf;
-	size_t nread, nwritten;
-	const char *p;
-	int len, clen;
-	CamelURL *url;
-	
-	buf = g_strdup (mailto);
-	
-	/* Parse recipients (everything after ':' until '?' or eos). */
-	p = buf + 7;
-	len = strcspn (p, "?");
-	if (len) {
-		content = g_strndup (p, len);
-		camel_url_decode (content);
-		to = add_recipients (to, content);
-		g_free (content);
-	}
-	
-	p += len;
-	if (*p == '?') {
-		p++;
-		
-		while (*p) {
-			len = strcspn (p, "=&");
-			
-			/* If it's malformed, give up. */
-			if (p[len] != '=')
-				break;
-			
-			header = (char *) p;
-			header[len] = '\0';
-			p += len + 1;
-			
-			clen = strcspn (p, "&");
-			
-			content = g_strndup (p, clen);
-			camel_url_decode (content);
-			
-			if (!g_ascii_strcasecmp (header, "to")) {
-				to = add_recipients (to, content);
-			} else if (!g_ascii_strcasecmp (header, "cc")) {
-				cc = add_recipients (cc, content);
-			} else if (!g_ascii_strcasecmp (header, "bcc")) {
-				bcc = add_recipients (bcc, content);
-			} else if (!g_ascii_strcasecmp (header, "subject")) {
-				g_free (subject);
-				if (g_utf8_validate (content, -1, NULL)) {
-					subject = content;
-					content = NULL;
-				} else {
-					subject = g_locale_to_utf8 (content, clen, &nread,
-								    &nwritten, NULL);
-					if (subject) {
-						subject = g_realloc (subject, nwritten + 1);
-						subject[nwritten] = '\0';
-					}
-				}
-			} else if (!g_ascii_strcasecmp (header, "body")) {
-				g_free (body);
-				if (g_utf8_validate (content, -1, NULL)) {
-					body = content;
-					content = NULL;
-				} else {
-					body = g_locale_to_utf8 (content, clen, &nread,
-								 &nwritten, NULL);
-					if (body) {
-						body = g_realloc (body, nwritten + 1);
-						body[nwritten] = '\0';
-					}
-				}
-			} else if (!g_ascii_strcasecmp (header, "attach") ||
-				   !g_ascii_strcasecmp (header, "attachment")) {
-				/* Change file url to absolute path */
-				if (!g_ascii_strncasecmp (content, "file:", 5)) {
-					url = camel_url_new (content, NULL);
-					e_msg_composer_attachment_bar_attach (E_MSG_COMPOSER_ATTACHMENT_BAR (composer->attachment_bar),
-									      url->path);
-					camel_url_free (url);
-				} else {
-					e_msg_composer_attachment_bar_attach (E_MSG_COMPOSER_ATTACHMENT_BAR (composer->attachment_bar),
-									      content);
-				}
-			} else if (!g_ascii_strcasecmp (header, "from")) {
-				/* Ignore */
-			} else if (!g_ascii_strcasecmp (header, "reply-to")) {
-				/* ignore */
-			} else {
-				/* add an arbitrary header? */
-				e_msg_composer_add_header (composer, header, content);
-			}
-			
-			g_free (content);
-			
-			p += clen;
-			if (*p == '&') {
-				p++;
-				if (!strcmp (p, "amp;"))
-					p += 4;
-			}
-		}
-	}
-	
-	g_free (buf);
-	
-	tov  = destination_list_to_vector (to);
-	ccv  = destination_list_to_vector (cc);
-	bccv = destination_list_to_vector (bcc);
-	
-	g_list_free (to);
-	g_list_free (cc);
-	g_list_free (bcc);
-	
-	hdrs = E_MSG_COMPOSER_HDRS (composer->hdrs);
-	
-	e_msg_composer_hdrs_set_to (hdrs, tov);
-	e_msg_composer_hdrs_set_cc (hdrs, ccv);
-	e_msg_composer_hdrs_set_bcc (hdrs, bccv);
-	
-	e_destination_freev (tov);
-	e_destination_freev (ccv);
-	e_destination_freev (bccv);
-	
-	if (subject) {
-		e_msg_composer_hdrs_set_subject (hdrs, subject);
-		g_free (subject);
-	}
-	
-	if (body) {
-		char *htmlbody;
-		
-		htmlbody = camel_text_to_html (body, CAMEL_MIME_FILTER_TOHTML_PRE, 0);
-		set_editor_text (composer, htmlbody, -1, FALSE, FALSE);
-		g_free (htmlbody);
-	}
-}
-
-/**
- * e_msg_composer_new_from_url:
- * @url: a mailto URL
- *
- * Create a new message composer widget, and fill in fields as
- * defined by the provided URL.
- **/
-EMsgComposer *
-e_msg_composer_new_from_url (const char *url)
-{
-	EMsgComposer *composer;
-	
-	g_return_val_if_fail (g_ascii_strncasecmp (url, "mailto:", 7) == 0, NULL);
-	
-	composer = e_msg_composer_new ();
-	if (!composer)
-		return NULL;
-	
-	handle_mailto (composer, url);
-	
-	return composer;
-}
-
-
-/**
- * e_msg_composer_show_attachments:
- * @composer: A message composer widget
- * @show: A boolean specifying whether the attachment bar should be shown or
- * not
- * 
- * If @show is %FALSE, hide the attachment bar.  Otherwise, show it.
- **/
-void
-e_msg_composer_show_attachments (EMsgComposer *composer,
-				 gboolean show)
-{
-	g_return_if_fail (E_IS_MSG_COMPOSER (composer));
-	
-	show_attachments (composer, show);
-}
-
-
-/**
- * e_msg_composer_set_headers:
- * @composer: a composer object
- * @from: the name of the account the user will send from,
- * or %NULL for the default account
- * @to: the values for the "To" header
- * @cc: the values for the "Cc" header
- * @bcc: the values for the "Bcc" header
- * @subject: the value for the "Subject" header
- *
- * Sets the headers in the composer to the given values.
- **/
-void 
-e_msg_composer_set_headers (EMsgComposer *composer,
-			    const char *from,
-			    EDestination **to,
-			    EDestination **cc,
-			    EDestination **bcc,
-			    const char *subject)
-{
-	EMsgComposerHdrs *hdrs;
-	
-	g_return_if_fail (E_IS_MSG_COMPOSER (composer));
-	
-	hdrs = E_MSG_COMPOSER_HDRS (composer->hdrs);
-	
-	e_msg_composer_hdrs_set_to (hdrs, to);
-	e_msg_composer_hdrs_set_cc (hdrs, cc);
-	e_msg_composer_hdrs_set_bcc (hdrs, bcc);
-	e_msg_composer_hdrs_set_subject (hdrs, subject);
-	e_msg_composer_hdrs_set_from_account (hdrs, from);
-}
-
-
-/**
- * e_msg_composer_set_body_text:
- * @composer: a composer object
- * @text: the HTML text to initialize the editor with
- *
- * Loads the given HTML text into the editor.
- **/
-void
-e_msg_composer_set_body_text (EMsgComposer *composer, const char *text, ssize_t len)
-{
-	g_return_if_fail (E_IS_MSG_COMPOSER (composer));
-	
-	set_editor_text (composer, text, len, TRUE, text == "");
-}
-
-/**
- * e_msg_composer_set_body:
- * @composer: a composer object
- * @body: the data to initialize the composer with
- * @mime_type: the MIME type of data
- *
- * Loads the given data into the composer as the message body.
- * This function should only be used by the CORBA composer factory.
- **/
-void
-e_msg_composer_set_body (EMsgComposer *composer, const char *body,
-			 const char *mime_type)
-{
-	g_return_if_fail (E_IS_MSG_COMPOSER (composer));
-	
-	set_editor_text (composer, _("<b>(The composer contains a non-text message body, which cannot be edited.)<b>"), -1, FALSE, FALSE);
-	e_msg_composer_set_send_html (composer, FALSE);
-	disable_editor (composer);
-	
-	g_free (composer->mime_body);
-	composer->mime_body = g_strdup (body);
-	g_free (composer->mime_type);
-	composer->mime_type = g_strdup (mime_type);
-
-	if (g_ascii_strncasecmp (composer->mime_type, "text/calendar", 13) == 0) {
-		EMsgComposerHdrs *hdrs = E_MSG_COMPOSER_HDRS (composer->hdrs);
-		if (hdrs->account && hdrs->account->pgp_no_imip_sign)
-			e_msg_composer_set_pgp_sign (composer, FALSE);
-	}
-}
-
-
-/**
- * e_msg_composer_add_header:
- * @composer: a composer object
- * @name: the header name
- * @value: the header value
- *
- * Adds a header with @name and @value to the message. This header
- * may not be displayed by the composer, but will be included in
- * the message it outputs.
- **/
-void
-e_msg_composer_add_header (EMsgComposer *composer, const char *name,
-			   const char *value)
-{
-	g_return_if_fail (E_IS_MSG_COMPOSER (composer));
-	g_return_if_fail (name != NULL);
-	g_return_if_fail (value != NULL);
-	
-	g_ptr_array_add (composer->extra_hdr_names, g_strdup (name));
-	g_ptr_array_add (composer->extra_hdr_values, g_strdup (value));
-}
-
-
-/**
- * e_msg_composer_attach:
- * @composer: a composer object
- * @attachment: the CamelMimePart to attach
- *
- * Attaches @attachment to the message being composed in the composer.
- **/
-void
-e_msg_composer_attach (EMsgComposer *composer, CamelMimePart *attachment)
-{
-	EMsgComposerAttachmentBar *bar;
-	
-	g_return_if_fail (E_IS_MSG_COMPOSER (composer));
-	g_return_if_fail (CAMEL_IS_MIME_PART (attachment));
-	
-	bar = E_MSG_COMPOSER_ATTACHMENT_BAR (composer->attachment_bar);
-	e_msg_composer_attachment_bar_attach_mime_part (bar, attachment);
-}
-
-
-/**
- * e_msg_composer_add_inline_image_from_file:
- * @composer: a composer object
- * @file_name: the name of the file containing the image
- *
- * This reads in the image in @file_name and adds it to @composer
- * as an inline image, to be wrapped in a multipart/related.
- *
- * Return value: the newly-created CamelMimePart (which must be reffed
- * if the caller wants to keep its own reference), or %NULL on error.
- **/
-CamelMimePart *
-e_msg_composer_add_inline_image_from_file (EMsgComposer *composer,
-					   const char *file_name)
-{
-	char *mime_type, *cid, *url, *name;
-	CamelStream *stream;
-	CamelDataWrapper *wrapper;
-	CamelMimePart *part;
-	struct stat statbuf;
-	
-	/* check for regular file */
-	if (stat (file_name, &statbuf) < 0 || !S_ISREG (statbuf.st_mode))
-		return NULL;
-	
-	stream = camel_stream_fs_new_with_name (file_name, O_RDONLY, 0);
-	if (!stream)
-		return NULL;
-	
-	wrapper = camel_data_wrapper_new ();
-	camel_data_wrapper_construct_from_stream (wrapper, stream);
-	camel_object_unref (CAMEL_OBJECT (stream));
-	
-	mime_type = e_msg_composer_guess_mime_type (file_name);
-	camel_data_wrapper_set_mime_type (wrapper, mime_type ? mime_type : "application/octet-stream");
-	g_free (mime_type);
-	
-	part = camel_mime_part_new ();
-	camel_medium_set_content_object (CAMEL_MEDIUM (part), wrapper);
-	camel_object_unref (wrapper);
-	
-	cid = camel_header_msgid_generate ();
-	camel_mime_part_set_content_id (part, cid);
-	name = g_path_get_basename(file_name);
-	camel_mime_part_set_filename (part, name);
-	g_free(name);
-	camel_mime_part_set_encoding (part, CAMEL_TRANSFER_ENCODING_BASE64);
-	
-	url = g_strdup_printf ("file:%s", file_name);
-	g_hash_table_insert (composer->inline_images_by_url, url, part);
-	
-	url = g_strdup_printf ("cid:%s", cid);
-	g_hash_table_insert (composer->inline_images, url, part);
-	g_free (cid);
-	
-	return part;
-}	
-
-
-/**
- * e_msg_composer_add_inline_image_from_mime_part:
- * @composer: a composer object
- * @part: a CamelMimePart containing image data
- *
- * This adds the mime part @part to @composer as an inline image, to
- * be wrapped in a multipart/related.
- **/
-void
-e_msg_composer_add_inline_image_from_mime_part (EMsgComposer  *composer,
-						CamelMimePart *part)
-{
-	char *url;
-	const char *location, *cid;
-
-	cid = camel_mime_part_get_content_id (part);
-	if (!cid) {
-		camel_mime_part_set_content_id (part, NULL);
-		cid = camel_mime_part_get_content_id (part);
-	}
-	
-	url = g_strdup_printf ("cid:%s", cid);
-	g_hash_table_insert (composer->inline_images, url, part);
-	camel_object_ref (part);
-	
-	location = camel_mime_part_get_content_location (part);
-	if (location) {
-		g_hash_table_insert (composer->inline_images_by_url,
-				     g_strdup (location), part);
-	}
-}
-
-
-/**
- * e_msg_composer_get_message:
- * @composer: A message composer widget
- * 
- * Retrieve the message edited by the user as a CamelMimeMessage.  The
- * CamelMimeMessage object is created on the fly; subsequent calls to this
- * function will always create new objects from scratch.
- * 
- * Return value: A pointer to the new CamelMimeMessage object
- **/
-CamelMimeMessage *
-e_msg_composer_get_message (EMsgComposer *composer, gboolean save_html_object_data)
-{
-	g_return_val_if_fail (E_IS_MSG_COMPOSER (composer), NULL);
-	
-	return build_message (composer, save_html_object_data);
-}
-
-CamelMimeMessage *
-e_msg_composer_get_message_draft (EMsgComposer *composer)
-{
-	CamelMimeMessage *msg;
-	EAccount *account;
-	gboolean old_flags[4];
-	gboolean old_send_html;
-	GString *flags;
-	int i;
-
-	/* always save drafts as HTML to preserve formatting */
-	old_send_html = composer->send_html;
-	composer->send_html = TRUE;
-	old_flags[0] = composer->pgp_sign;
-	composer->pgp_sign = FALSE;
-	old_flags[1] = composer->pgp_encrypt;
-	composer->pgp_encrypt = FALSE;
-	old_flags[2] = composer->smime_sign;
-	composer->smime_sign = FALSE;
-	old_flags[3] = composer->smime_encrypt;
-	composer->smime_encrypt = FALSE;
-	
-	msg = e_msg_composer_get_message (composer, TRUE);
-	
-	composer->send_html = old_send_html;
-	composer->pgp_sign = old_flags[0];
-	composer->pgp_encrypt = old_flags[1];
-	composer->smime_sign = old_flags[2];
-	composer->smime_encrypt = old_flags[3];
-	
-	/* Attach account info to the draft. */
-	account = e_msg_composer_get_preferred_account (composer);
-	if (account && account->name)
-		camel_medium_set_header (CAMEL_MEDIUM (msg), "X-Evolution-Account", account->uid);
-	
-	/* build_message() set this to text/html since we set composer->send_html to
-	   TRUE before calling e_msg_composer_get_message() */
-	if (!composer->send_html)
-		flags = g_string_new("text/plain");
-	else
-		flags = g_string_new("text/html");
-
-	/* This should probably only save the setting if it is
-	 * different from the from-account default? */
-	for (i=0;i<4;i++) {
-		if (old_flags[i])
-			g_string_append_printf(flags, ", %s", emc_draft_format_names[i]);
-	}
-
-	camel_medium_set_header (CAMEL_MEDIUM (msg), "X-Evolution-Format", flags->str);
-	g_string_free(flags, TRUE);
-
-	return msg;
-}
-
-
-static void
-delete_old_signature (EMsgComposer *composer)
-{
-	CORBA_Environment ev;
-	
-	/* printf ("delete_old_signature\n"); */
-	CORBA_exception_init (&ev);
-	GNOME_GtkHTML_Editor_Engine_runCommand (composer->editor_engine, "cursor-bod", &ev);
-	if (GNOME_GtkHTML_Editor_Engine_searchByData (composer->editor_engine, 1, "ClueFlow", "signature", "1", &ev)) {
-		/* printf ("found\n"); */
-		GNOME_GtkHTML_Editor_Engine_runCommand (composer->editor_engine, "select-paragraph", &ev);
-		GNOME_GtkHTML_Editor_Engine_runCommand (composer->editor_engine, "delete", &ev);
-		/* selection-move-right doesn't succeed means that we are already on the end of document */
-		/* if (!rv)
-		   break; */
-		GNOME_GtkHTML_Editor_Engine_setParagraphData (composer->editor_engine, "signature", "0", &ev);
-		GNOME_GtkHTML_Editor_Engine_runCommand (composer->editor_engine, "delete-back", &ev);
-	}
-	CORBA_exception_free (&ev);
-}
-
-
-/**
- * e_msg_composer_show_sig:
- * @composer: A message composer widget
- * 
- * Set a signature
- **/
-void
-e_msg_composer_show_sig_file (EMsgComposer *composer)
-{
-	CORBA_Environment ev;
-	char *html;
-	
-	g_return_if_fail (E_IS_MSG_COMPOSER (composer));
-	
-	/* printf ("e_msg_composer_show_sig_file\n"); */
-	/* printf ("set sig '%s' '%s'\n", sig_file, composer->sig_file); */
-	
-	composer->in_signature_insert = TRUE;
-	CORBA_exception_init (&ev);
-	GNOME_GtkHTML_Editor_Engine_freeze (composer->editor_engine, &ev);
-	GNOME_GtkHTML_Editor_Engine_runCommand (composer->editor_engine, "cursor-position-save", &ev);
-	GNOME_GtkHTML_Editor_Engine_undoBegin (composer->editor_engine, "Set signature", "Reset signature", &ev);
-	
-	delete_old_signature (composer);
-	html = get_signature_html (composer);
-	if (html) {
-		GNOME_GtkHTML_Editor_Engine_runCommand (composer->editor_engine, "insert-paragraph", &ev);
-		if (!GNOME_GtkHTML_Editor_Engine_runCommand (composer->editor_engine, "cursor-backward", &ev))
-			GNOME_GtkHTML_Editor_Engine_runCommand (composer->editor_engine, "insert-paragraph", &ev);
-		else
-			GNOME_GtkHTML_Editor_Engine_runCommand (composer->editor_engine, "cursor-forward", &ev);
-		/* printf ("insert %s\n", html); */
-		GNOME_GtkHTML_Editor_Engine_setParagraphData (composer->editor_engine, "orig", "0", &ev);
-		GNOME_GtkHTML_Editor_Engine_runCommand (composer->editor_engine, "indent-zero", &ev);
-		GNOME_GtkHTML_Editor_Engine_runCommand (composer->editor_engine, "style-normal", &ev);
-		GNOME_GtkHTML_Editor_Engine_insertHTML (composer->editor_engine, html, &ev);
-		g_free (html);
-	}
-	
-	GNOME_GtkHTML_Editor_Engine_undoEnd (composer->editor_engine, &ev);
-	GNOME_GtkHTML_Editor_Engine_runCommand (composer->editor_engine, "cursor-position-restore", &ev);
-	GNOME_GtkHTML_Editor_Engine_thaw (composer->editor_engine, &ev);
-	CORBA_exception_free (&ev);
-	composer->in_signature_insert = FALSE;
-	
-	/* printf ("e_msg_composer_show_sig_file end\n"); */
-}
-
-
-/**
- * e_msg_composer_set_send_html:
- * @composer: A message composer widget
- * @send_html: Whether the composer should have the "Send HTML" flag set
- * 
- * Set the status of the "Send HTML" toggle item.  The user can override it.
- **/
-void
-e_msg_composer_set_send_html (EMsgComposer *composer,
-			      gboolean send_html)
-{
-	CORBA_Environment ev;
-	
-	g_return_if_fail (E_IS_MSG_COMPOSER (composer));
-	
-	if (composer->send_html && send_html)
-		return;
-	
-	if (!composer->send_html && !send_html)
-		return;
-	
-	composer->send_html = send_html;
-	
-	CORBA_exception_init (&ev);
-	GNOME_GtkHTML_Editor_Engine_runCommand (composer->editor_engine, "block-redraw", &ev);
-	CORBA_exception_free (&ev);
-	
-	bonobo_ui_component_set_prop (composer->uic, "/commands/FormatHtml",
-				      "state", composer->send_html ? "1" : "0", NULL);
-	
-	/* let the editor know which mode we are in */
-	bonobo_widget_set_property (BONOBO_WIDGET (composer->editor),
-				    "FormatHTML", TC_CORBA_boolean,
-				    composer->send_html, NULL);
-	
-	CORBA_exception_init (&ev);
-	GNOME_GtkHTML_Editor_Engine_runCommand (composer->editor_engine, "unblock-redraw", &ev);
-	CORBA_exception_free (&ev);
-}
-
-
-/**
- * e_msg_composer_get_send_html:
- * @composer: A message composer widget
- * 
- * Get the status of the "Send HTML mail" flag.
- * 
- * Return value: The status of the "Send HTML mail" flag.
- **/
-gboolean
-e_msg_composer_get_send_html (EMsgComposer *composer)
-{
-	g_return_val_if_fail (E_IS_MSG_COMPOSER (composer), FALSE);
-	
-	return composer->send_html;
-}
-
-
-/**
- * e_msg_composer_get_preferred_account:
- * @composer: composer
- *
- * Returns the user-specified account (from field).
- */
-EAccount *
-e_msg_composer_get_preferred_account (EMsgComposer *composer)
-{
-	EMsgComposerHdrs *hdrs;
-	
-	g_return_val_if_fail (E_IS_MSG_COMPOSER (composer), NULL);
-	
-	hdrs = E_MSG_COMPOSER_HDRS (composer->hdrs);
-	
-	return hdrs->account;
-}
-
-
-/**
- * e_msg_composer_set_pgp_sign:
- * @composer: A message composer widget
- * @send_html: Whether the composer should have the "PGP Sign" flag set
- * 
- * Set the status of the "PGP Sign" toggle item.  The user can override it.
- **/
-void
-e_msg_composer_set_pgp_sign (EMsgComposer *composer, gboolean pgp_sign)
-{
-	g_return_if_fail (E_IS_MSG_COMPOSER (composer));
-	
-	if (composer->pgp_sign && pgp_sign)
-		return;
-	if (!composer->pgp_sign && !pgp_sign)
-		return;
-	
-	composer->pgp_sign = pgp_sign;
-	e_msg_composer_set_changed (composer);
-	
-	bonobo_ui_component_set_prop (composer->uic, "/commands/SecurityPGPSign",
-				      "state", composer->pgp_sign ? "1" : "0", NULL);
-}
-
-
-/**
- * e_msg_composer_get_pgp_sign:
- * @composer: A message composer widget
- * 
- * Get the status of the "PGP Sign" flag.
- * 
- * Return value: The status of the "PGP Sign" flag.
- **/
-gboolean
-e_msg_composer_get_pgp_sign (EMsgComposer *composer)
-{
-	g_return_val_if_fail (E_IS_MSG_COMPOSER (composer), FALSE);
-	
-	return composer->pgp_sign;
-}
-
-
-/**
- * e_msg_composer_set_pgp_encrypt:
- * @composer: A message composer widget
- * @send_html: Whether the composer should have the "PGP Encrypt" flag set
- * 
- * Set the status of the "PGP Encrypt" toggle item.  The user can override it.
- **/
-void
-e_msg_composer_set_pgp_encrypt (EMsgComposer *composer, gboolean pgp_encrypt)
-{
-	g_return_if_fail (E_IS_MSG_COMPOSER (composer));
-	
-	if (composer->pgp_encrypt && pgp_encrypt)
-		return;
-	if (!composer->pgp_encrypt && !pgp_encrypt)
-		return;
-	
-	composer->pgp_encrypt = pgp_encrypt;
-	e_msg_composer_set_changed (composer);
-	
-	bonobo_ui_component_set_prop (composer->uic, "/commands/SecurityPGPEncrypt",
-				      "state", composer->pgp_encrypt ? "1" : "0", NULL);
-}
-
-
-/**
- * e_msg_composer_get_pgp_encrypt:
- * @composer: A message composer widget
- * 
- * Get the status of the "PGP Encrypt" flag.
- * 
- * Return value: The status of the "PGP Encrypt" flag.
- **/
-gboolean
-e_msg_composer_get_pgp_encrypt (EMsgComposer *composer)
-{
-	g_return_val_if_fail (E_IS_MSG_COMPOSER (composer), FALSE);
-	
-	return composer->pgp_encrypt;
-}
-
-
-/**
- * e_msg_composer_set_smime_sign:
- * @composer: A message composer widget
- * @send_html: Whether the composer should have the "S/MIME Sign" flag set
- * 
- * Set the status of the "S/MIME Sign" toggle item.  The user can override it.
- **/
-void
-e_msg_composer_set_smime_sign (EMsgComposer *composer, gboolean smime_sign)
-{
-	g_return_if_fail (E_IS_MSG_COMPOSER (composer));
-	
-	if (composer->smime_sign && smime_sign)
-		return;
-	if (!composer->smime_sign && !smime_sign)
-		return;
-	
-	composer->smime_sign = smime_sign;	
-	e_msg_composer_set_changed (composer);
-
-	bonobo_ui_component_set_prop (composer->uic, "/commands/SecuritySMimeSign",
-				      "state", composer->smime_sign ? "1" : "0", NULL);
-}
-
-
-/**
- * e_msg_composer_get_smime_sign:
- * @composer: A message composer widget
- * 
- * Get the status of the "S/MIME Sign" flag.
- * 
- * Return value: The status of the "S/MIME Sign" flag.
- **/
-gboolean
-e_msg_composer_get_smime_sign (EMsgComposer *composer)
-{
-	g_return_val_if_fail (E_IS_MSG_COMPOSER (composer), FALSE);
-	
-	return composer->smime_sign;
-}
-
-
-/**
- * e_msg_composer_set_smime_encrypt:
- * @composer: A message composer widget
- * @send_html: Whether the composer should have the "S/MIME Encrypt" flag set
- * 
- * Set the status of the "S/MIME Encrypt" toggle item.  The user can override it.
- **/
-void
-e_msg_composer_set_smime_encrypt (EMsgComposer *composer, gboolean smime_encrypt)
-{
-	g_return_if_fail (E_IS_MSG_COMPOSER (composer));
-	
-	if (composer->smime_encrypt && smime_encrypt)
-		return;
-	if (!composer->smime_encrypt && !smime_encrypt)
-		return;
-	
-	composer->smime_encrypt = smime_encrypt;
-	e_msg_composer_set_changed (composer);
-	
-	bonobo_ui_component_set_prop (composer->uic, "/commands/SecuritySMimeEncrypt",
-				      "state", composer->smime_encrypt ? "1" : "0", NULL);
-}
-
-
-/**
- * e_msg_composer_get_smime_encrypt:
- * @composer: A message composer widget
- * 
- * Get the status of the "S/MIME Encrypt" flag.
- * 
- * Return value: The status of the "S/MIME Encrypt" flag.
- **/
-gboolean
-e_msg_composer_get_smime_encrypt (EMsgComposer *composer)
-{
-	g_return_val_if_fail (E_IS_MSG_COMPOSER (composer), FALSE);
-	
-	return composer->smime_encrypt;
-}
-
-
-/**
- * e_msg_composer_get_view_from:
- * @composer: A message composer widget
- * 
- * Get the status of the "View From header" flag.
- * 
- * Return value: The status of the "View From header" flag.
- **/
-gboolean
-e_msg_composer_get_view_from (EMsgComposer *composer)
-{
-	g_return_val_if_fail (E_IS_MSG_COMPOSER (composer), FALSE);
-	
-	return composer->view_from;
-}
-
-
-/**
- * e_msg_composer_set_view_from:
- * @composer: A message composer widget
- * @state: whether to show or hide the From selector
- *
- * Controls the state of the From selector
- */
-void
-e_msg_composer_set_view_from (EMsgComposer *composer, gboolean view_from)
-{
-	GConfClient *gconf;
-	
-	g_return_if_fail (E_IS_MSG_COMPOSER (composer));
-	
-	if ((composer->view_from && view_from) ||
-	    (!composer->view_from && !view_from))
-		return;
-	
-	composer->view_from = view_from;
-	bonobo_ui_component_set_prop (composer->uic, "/commands/ViewFrom",
-				      "state", composer->view_from ? "1" : "0", NULL);
-	
-	gconf = gconf_client_get_default ();
-	gconf_client_set_bool (gconf, "/apps/evolution/mail/composer/view/From", view_from, NULL);
-	g_object_unref (gconf);
-	
-	e_msg_composer_hdrs_set_visible (E_MSG_COMPOSER_HDRS (composer->hdrs),
-					 e_msg_composer_get_visible_flags (composer));
-}
-
-
-/**
- * e_msg_composer_get_view_replyto:
- * @composer: A message composer widget
- *
- * Get the status of the "View Reply-To header" flag.
- *
- * Return value: The status of the "View Reply-To header" flag.
- **/
-gboolean
-e_msg_composer_get_view_replyto (EMsgComposer *composer)
-{
-	g_return_val_if_fail (E_IS_MSG_COMPOSER (composer), FALSE);
-	
-	return composer->view_replyto;
-}
-
-
-/**
- * e_msg_composer_set_view_replyto:
- * @composer: A message composer widget
- * @state: whether to show or hide the Reply-To selector
- *
- * Controls the state of the Reply-To selector
- */
-void
-e_msg_composer_set_view_replyto (EMsgComposer *composer, gboolean view_replyto)
-{
-	GConfClient *gconf;
-	
-	g_return_if_fail (E_IS_MSG_COMPOSER (composer));
-	
-	if ((composer->view_replyto && view_replyto) ||
-	    (!composer->view_replyto && !view_replyto))
-		return;
-	
-	composer->view_replyto = view_replyto;
-	bonobo_ui_component_set_prop (composer->uic, "/commands/ViewReplyTo",
-				      "state", composer->view_replyto ? "1" : "0", NULL);
-	
-	/* we do this /only/ if the fields is in the visible_mask */
-	gconf = gconf_client_get_default ();
-	gconf_client_set_bool (gconf, "/apps/evolution/mail/composer/view/ReplyTo", view_replyto, NULL);
-	g_object_unref (gconf);
-	
-	e_msg_composer_hdrs_set_visible (E_MSG_COMPOSER_HDRS (composer->hdrs),
-					 e_msg_composer_get_visible_flags (composer));
-}
-
-
-/**
- * e_msg_composer_get_view_to:
- * @composer: A message composer widget
- *
- * Get the status of the "View To header" flag.
- *
- * Return value: The status of the "View To header" flag.
- **/
-gboolean
-e_msg_composer_get_view_to (EMsgComposer *composer)
-{
-	g_return_val_if_fail (E_IS_MSG_COMPOSER (composer), FALSE);
-	
-	return composer->view_to;
-}
-
-
-/**
- * e_msg_composer_set_view_to:
- * @composer: A message composer widget
- * @state: whether to show or hide the To selector
- *
- * Controls the state of the To selector
- */
-void
-e_msg_composer_set_view_to (EMsgComposer *composer, gboolean view_to)
-{
-	GConfClient *gconf;
-	
-	g_return_if_fail (E_IS_MSG_COMPOSER (composer));
-	
-	if ((composer->view_to && view_to) ||
-	    (!composer->view_to && !view_to))
-		return;
-	
-	composer->view_to = view_to;
-	bonobo_ui_component_set_prop (composer->uic, "/commands/ViewTo",
-				      "state", composer->view_to ? "1" : "0", NULL);
-	
-	if ((E_MSG_COMPOSER_HDRS(composer->hdrs))->visible_mask & E_MSG_COMPOSER_VISIBLE_TO) {
-		gconf = gconf_client_get_default ();
-		gconf_client_set_bool (gconf, "/apps/evolution/mail/composer/view/To", view_to, NULL);
-		g_object_unref (gconf);
-	}
-	
-	e_msg_composer_hdrs_set_visible (E_MSG_COMPOSER_HDRS (composer->hdrs),
-					 e_msg_composer_get_visible_flags (composer));
-}
-
-
-
-/**
- * e_msg_composer_get_view_postto:
- * @composer: A message composer widget
- *
- * Get the status of the "View PostTo header" flag.
- *
- * Return value: The status of the "View PostTo header" flag.
- **/
-gboolean
-e_msg_composer_get_view_postto (EMsgComposer *composer)
-{
-	g_return_val_if_fail (E_IS_MSG_COMPOSER (composer), FALSE);
-	
-	return composer->view_postto;
-}
-
-
-/**
- * e_msg_composer_set_view_postto:
- * @composer: A message composer widget
- * @state: whether to show or hide the PostTo selector
- *
- * Controls the state of the PostTo selector
- */
-void
-e_msg_composer_set_view_postto (EMsgComposer *composer, gboolean view_postto)
-{
-	GConfClient *gconf;
-	
-	g_return_if_fail (E_IS_MSG_COMPOSER (composer));
-	
-	if ((composer->view_postto && view_postto) ||
-	    (!composer->view_postto && !view_postto))
-		return;
-	
-	composer->view_postto = view_postto;
-	bonobo_ui_component_set_prop (composer->uic, "/commands/ViewPostTo",
-				      "state", composer->view_postto ? "1" : "0", NULL);
-	
-	if ((E_MSG_COMPOSER_HDRS(composer->hdrs))->visible_mask & E_MSG_COMPOSER_VISIBLE_POSTTO) {
-		gconf = gconf_client_get_default ();
-		gconf_client_set_bool (gconf, "/apps/evolution/mail/composer/view/PostTo", view_postto, NULL);
-		g_object_unref (gconf);
-	}
-	
-	e_msg_composer_hdrs_set_visible (E_MSG_COMPOSER_HDRS (composer->hdrs),
-					 e_msg_composer_get_visible_flags (composer));
-}
-
-
-
-/**
- * e_msg_composer_get_view_cc:
- * @composer: A message composer widget
- * 
- * Get the status of the "View CC header" flag.
- * 
- * Return value: The status of the "View CC header" flag.
- **/
-gboolean
-e_msg_composer_get_view_cc (EMsgComposer *composer)
-{
-	g_return_val_if_fail (E_IS_MSG_COMPOSER (composer), FALSE);
-	
-	return composer->view_cc;
-}
-
-
-/**
- * e_msg_composer_set_view_cc:
- * @composer: A message composer widget
- * @state: whether to show or hide the cc view
- *
- * Controls the state of the CC display
- */
-void
-e_msg_composer_set_view_cc (EMsgComposer *composer, gboolean view_cc)
-{
-	GConfClient *gconf;
-	
-	g_return_if_fail (E_IS_MSG_COMPOSER (composer));
-	
-	if ((composer->view_cc && view_cc) ||
-	    (!composer->view_cc && !view_cc))
-		return;
-	
-	composer->view_cc = view_cc;
-	bonobo_ui_component_set_prop (composer->uic, "/commands/ViewCC",
-				      "state", composer->view_cc ? "1" : "0", NULL);
-	
-	if ((E_MSG_COMPOSER_HDRS (composer->hdrs))->visible_mask & E_MSG_COMPOSER_VISIBLE_CC) {
-		gconf = gconf_client_get_default ();
-		gconf_client_set_bool (gconf, "/apps/evolution/mail/composer/view/Cc", view_cc, NULL);
-		g_object_unref (gconf);
-	}
-	
-	e_msg_composer_hdrs_set_visible (E_MSG_COMPOSER_HDRS (composer->hdrs),
-					 e_msg_composer_get_visible_flags (composer));
-}
-
-
-/**
- * e_msg_composer_get_view_bcc:
- * @composer: A message composer widget
- * 
- * Get the status of the "View BCC header" flag.
- * 
- * Return value: The status of the "View BCC header" flag.
- **/
-gboolean
-e_msg_composer_get_view_bcc (EMsgComposer *composer)
-{
-	g_return_val_if_fail (E_IS_MSG_COMPOSER (composer), FALSE);
-	
-	return composer->view_bcc;
-}
-
-
-/**
- * e_msg_composer_set_view_bcc:
- * @composer: A message composer widget
- * @state: whether to show or hide the bcc view
- *
- * Controls the state of the BCC display
- */
-void
-e_msg_composer_set_view_bcc (EMsgComposer *composer, gboolean view_bcc)
-{
-	GConfClient *gconf;
-	
-	g_return_if_fail (E_IS_MSG_COMPOSER (composer));
-	
-	if ((composer->view_bcc && view_bcc) ||
-	    (!composer->view_bcc && !view_bcc))
-		return;
-	
-	composer->view_bcc = view_bcc;
-	bonobo_ui_component_set_prop (composer->uic, "/commands/ViewBCC",
-				      "state", composer->view_bcc ? "1" : "0", NULL);
-	
-	if ((E_MSG_COMPOSER_HDRS (composer->hdrs))->visible_mask & E_MSG_COMPOSER_VISIBLE_BCC) {
-		gconf = gconf_client_get_default ();
-		gconf_client_set_bool (gconf, "/apps/evolution/mail/composer/view/Bcc", view_bcc, NULL);
-		g_object_unref (gconf);
-	}
-	
-	e_msg_composer_hdrs_set_visible (E_MSG_COMPOSER_HDRS (composer->hdrs),
-					 e_msg_composer_get_visible_flags (composer));
-}
-
-
-EDestination **
-e_msg_composer_get_recipients (EMsgComposer *composer)
-{
-	g_return_val_if_fail (E_IS_MSG_COMPOSER (composer), NULL);
-
-	return composer->hdrs ? e_msg_composer_hdrs_get_recipients (E_MSG_COMPOSER_HDRS (composer->hdrs)) : NULL;
-}
-
-EDestination **
-e_msg_composer_get_to (EMsgComposer *composer)
-{
-	g_return_val_if_fail (E_IS_MSG_COMPOSER (composer), NULL);
-	
-	return composer->hdrs ? e_msg_composer_hdrs_get_to (E_MSG_COMPOSER_HDRS (composer->hdrs)) : NULL;
-}
-
-EDestination **
-e_msg_composer_get_cc (EMsgComposer *composer)
-{
-	g_return_val_if_fail (E_IS_MSG_COMPOSER (composer), NULL);
-	
-	return composer->hdrs ? e_msg_composer_hdrs_get_cc (E_MSG_COMPOSER_HDRS (composer->hdrs)) : NULL;
-}
-
-EDestination **
-e_msg_composer_get_bcc (EMsgComposer *composer)
-{
-	g_return_val_if_fail (E_IS_MSG_COMPOSER (composer), NULL);
-	
-	return composer->hdrs ? e_msg_composer_hdrs_get_bcc (E_MSG_COMPOSER_HDRS (composer->hdrs)) : NULL;
-}
-
-const char *
-e_msg_composer_get_subject (EMsgComposer *composer)
-{
-	g_return_val_if_fail (E_IS_MSG_COMPOSER (composer), NULL);
-	
-	return composer->hdrs ? e_msg_composer_hdrs_get_subject (E_MSG_COMPOSER_HDRS (composer->hdrs)) : NULL;
-}
-
-
-/**
- * e_msg_composer_guess_mime_type:
- * @file_name: filename
- *
- * Returns the guessed mime type of the file given by #file_name.
- **/
-char *
-e_msg_composer_guess_mime_type (const char *file_name)
-{
-	GnomeVFSFileInfo *info;
-	GnomeVFSResult result;
-	char *type = NULL;
-
-	info = gnome_vfs_file_info_new ();
-	result = gnome_vfs_get_file_info (file_name, info,
-					  GNOME_VFS_FILE_INFO_GET_MIME_TYPE |
-					  GNOME_VFS_FILE_INFO_FORCE_SLOW_MIME_TYPE |
-					  GNOME_VFS_FILE_INFO_FOLLOW_LINKS);
-	if (result == GNOME_VFS_OK)
-		type = g_strdup (gnome_vfs_file_info_get_mime_type (info));
-
-	gnome_vfs_file_info_unref (info);
-
-	return type;
-}
-
-
-/**
- * e_msg_composer_set_changed:
- * @composer: An EMsgComposer object.
- *
- * Mark the composer as changed, so before the composer gets destroyed
- * the user will be prompted about unsaved changes.
- **/
-void
-e_msg_composer_set_changed (EMsgComposer *composer)
-{
-	g_return_if_fail (E_IS_MSG_COMPOSER (composer));
-	
-	composer->has_changed = TRUE;
-}
-
-
-/**
- * e_msg_composer_unset_changed:
- * @composer: An EMsgComposer object.
- *
- * Mark the composer as unchanged, so no prompt about unsaved changes
- * will appear before destroying the composer.
- **/
-void
-e_msg_composer_unset_changed (EMsgComposer *composer)
-{
-	g_return_if_fail (E_IS_MSG_COMPOSER (composer));
-	
-	composer->has_changed = FALSE;
-}
-
-gboolean
-e_msg_composer_is_dirty (EMsgComposer *composer)
-{
-	CORBA_Environment ev;
-	gboolean rv;
-	
-	CORBA_exception_init (&ev);
-	rv = composer->has_changed
-		|| (GNOME_GtkHTML_Editor_Engine_hasUndo (composer->editor_engine, &ev) &&
-		    !GNOME_GtkHTML_Editor_Engine_runCommand (composer->editor_engine, "is-saved", &ev));
-	CORBA_exception_free (&ev);
-
-	return rv;
-}
-
-/**
- * e_msg_composer_set_autosaved:
- * @composer: An EMsgComposer object.
- *
- * Mark the composer as autosaved, so before the composer gets destroyed
- * the user will be prompted about unsaved changes.
- **/
-void
-e_msg_composer_set_autosaved (EMsgComposer *composer)
-{
-	g_return_if_fail (E_IS_MSG_COMPOSER (composer));
-
-	composer->autosaved = TRUE;
-}
-
-
-/**
- * e_msg_composer_unset_autosaved:
- * @composer: An EMsgComposer object.
- *
- * Mark the composer as unautosaved, so no prompt about unsaved changes
- * will appear before destroying the composer.
- **/
-void
-e_msg_composer_unset_autosaved (EMsgComposer *composer)
-{
-	g_return_if_fail (E_IS_MSG_COMPOSER (composer));
-	
-	composer->autosaved = FALSE;
-}
-
-gboolean
-e_msg_composer_is_autosaved (EMsgComposer *composer)
-{
-	g_return_val_if_fail (E_IS_MSG_COMPOSER (composer), FALSE);
-
-	return composer->autosaved;
-}
-
-void
-e_msg_composer_set_enable_autosave  (EMsgComposer *composer, gboolean enabled)
-{
-	g_return_if_fail (E_IS_MSG_COMPOSER (composer));
-	
-	composer->enable_autosave = enabled;
-}
-
-static char *
-next_word (const char *s, const char **sr)
-{
-	if (!s || !*s)
-		return NULL;
-	else {
-		const char *begin;
-		gunichar uc;
-		gboolean cited;
-		
-		do {
-			begin = s;
-			cited = FALSE;
-			uc = g_utf8_get_char (s);
-			if (uc == 0)
-				return NULL;
-			s  = g_utf8_next_char (s);
-		} while (!html_selection_spell_word (uc, &cited) && !cited && s);
-		
-		/* we are at beginning of word */
-		if (s && *s) {
-			gboolean cited_end;
-			
-			cited_end = FALSE;
-			uc = g_utf8_get_char (s);
-			
-			/* go to end of word */
-			while (html_selection_spell_word (uc, &cited_end) || (!cited && cited_end)) {
-				cited_end = FALSE;
-				s  = g_utf8_next_char (s);
-				uc = g_utf8_get_char (s);
-				if (uc == 0)
-					break;
-			}
-			*sr = s;
-			return s ? g_strndup (begin, s - begin) : g_strdup (begin);
-		} else
-			return NULL;
-	}
-}
-
-
-void
-e_msg_composer_ignore (EMsgComposer *composer, const char *str)
-{
-	CORBA_Environment ev;
-	char *word;
-	
-	if (!str)
-		return;
-	
-	CORBA_exception_init (&ev);
-	while ((word = next_word (str, &str))) {
-		/* printf ("ignore word %s\n", word); */
-		GNOME_GtkHTML_Editor_Engine_ignoreWord (composer->editor_engine, word, &ev);
-		g_free (word);
-	}
-	CORBA_exception_free (&ev);
-}
-
-
-void
-e_msg_composer_drop_editor_undo (EMsgComposer *composer)
-{
-	CORBA_Environment ev;
-	
-	CORBA_exception_init (&ev);
-	GNOME_GtkHTML_Editor_Engine_dropUndo (composer->editor_engine, &ev);
-	CORBA_exception_free (&ev);
-}
-
-
-gboolean
-e_msg_composer_request_close_all (void)
-{
-	GSList *p, *pnext;
-
-	for (p = all_composers; p != NULL; p = pnext) {
-		pnext = p->next;
-		do_exit (E_MSG_COMPOSER (p->data));
-	}
-
-	if (all_composers == NULL)
-		return TRUE;
-	else
-		return FALSE;
-}
-
-void
-e_msg_composer_check_autosave(GtkWindow *parent)
-{
-	if (am == NULL)
-		am = autosave_manager_new();
-
-	if (am->ask) {
-		am->ask = FALSE;
-		autosave_manager_query_load_orphans (am, parent);
-		am->ask = TRUE;
-	}
-}
diff --git a/composer/e-msg-composer.h b/composer/e-msg-composer.h
deleted file mode 100644
index 06e139d9b2..0000000000
--- a/composer/e-msg-composer.h
+++ /dev/null
@@ -1,244 +0,0 @@
-/* -*- Mode: C; indent-tabs-mode: t; c-basic-offset: 8; tab-width: 8 -*- */
-/* e-msg-composer.h
- *
- * Copyright (C) 1999, 2000  Ximian, Inc.
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of version 2 of the GNU General Public
- * published by the Free Software Foundation; either version 2 of the
- * License as published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * General Public License for more details.
- *
- * You should have received a copy of the GNU General Public
- * 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_MSG_COMPOSER_H__
-#define ___E_MSG_COMPOSER_H__
-
-typedef struct _EMsgComposer       EMsgComposer;
-typedef struct _EMsgComposerClass  EMsgComposerClass;
-
-#include <bonobo/bonobo-window.h>
-#include <bonobo/bonobo-ui-component.h>
-
-#include "e-msg-composer-attachment-bar.h"
-#include "e-msg-composer-hdrs.h"
-#include "Editor.h"
-
-#ifdef __cplusplus
-extern "C" {
-#pragma }
-#endif /* __cplusplus */
-
-
-#define E_TYPE_MSG_COMPOSER	       (e_msg_composer_get_type ())
-#define E_MSG_COMPOSER(obj)	       (G_TYPE_CHECK_INSTANCE_CAST ((obj), E_TYPE_MSG_COMPOSER, EMsgComposer))
-#define E_MSG_COMPOSER_CLASS(klass)    (G_TYPE_CHECK_CLASS_CAST ((klass), E_TYPE_MSG_COMPOSER, EMsgComposerClass))
-#define E_IS_MSG_COMPOSER(obj)	       (G_TYPE_CHECK_INSTANCE_TYPE ((obj), E_TYPE_MSG_COMPOSER))
-#define E_IS_MSG_COMPOSER_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((obj), E_TYPE_MSG_COMPOSER))
-
-
-
-struct _EMsgComposer {
-	BonoboWindow parent;
-	
-	/* Main UIComponent */
-	BonoboUIComponent *uic;
-
-	/* UIComponent for the non-control GtkEntries */
-	BonoboUIComponent *entry_uic;
-	
-	GtkWidget *hdrs;
-	GPtrArray *extra_hdr_names, *extra_hdr_values;
-	
-	GtkWidget *focused_entry;
-	
-	GtkWidget *editor;
-	
-	GtkWidget *attachment_bar;
-	GtkWidget *attachment_scrolled_window;
-	GtkWidget *attachment_expander;
-	GtkWidget *attachment_expander_label;
-	GtkWidget *attachment_expander_icon;
-	GtkWidget *attachment_expander_num;
-	
-	GtkWidget *address_dialog;
-	
-	Bonobo_PersistFile       persist_file_interface;
-	Bonobo_PersistStream     persist_stream_interface;
-	GNOME_GtkHTML_Editor_Engine  editor_engine;
-	BonoboObject            *editor_listener;
-	GHashTable              *inline_images, *inline_images_by_url;
-	GList                   *current_images;
-	
-	char *mime_type, *mime_body, *charset;
-	
-	char *autosave_file;
-        int   autosave_fd;
-	guint32 enable_autosave        : 1;
-	
-	guint32 attachment_bar_visible : 1;
-	guint32 send_html              : 1;
-	guint32 is_alternative         : 1;
-	guint32 pgp_sign               : 1;
-	guint32 pgp_encrypt            : 1;
-	guint32 smime_sign             : 1;
-	guint32 smime_encrypt          : 1;
-	guint32 view_from              : 1;
-	guint32 view_replyto           : 1;
-	guint32 view_to                : 1;
-	guint32 view_postto            : 1;
-	guint32 view_bcc               : 1;
-	guint32 view_cc                : 1;
-	guint32 view_subject           : 1;
-	guint32 has_changed            : 1;
-	guint32 autosaved              : 1;
-	
-	guint32 mode_post              : 1;
-	
-	guint32 in_signature_insert    : 1;
-	
-	struct _ESignature *signature;
-	struct _GtkOptionMenu *sig_menu;
-	guint sig_added_id;
-	guint sig_removed_id;
-	guint sig_changed_id;
-	
-	CamelMimeMessage *redirect;
-	
-	guint notify_id;
-};
-
-struct _EMsgComposerClass {
-	BonoboWindowClass parent_class;
-	
-	void (* send) (EMsgComposer *composer);
-	void (* save_draft) (EMsgComposer *composer, int quit);
-};
-
-
-GtkType                  e_msg_composer_get_type                         (void);
-
-EMsgComposer            *e_msg_composer_new                              (void);
-
-#define E_MSG_COMPOSER_MAIL 1
-#define E_MSG_COMPOSER_POST 2
-#define E_MSG_COMPOSER_MAIL_POST E_MSG_COMPOSER_MAIL|E_MSG_COMPOSER_POST
-
-EMsgComposer            *e_msg_composer_new_with_type                    (int type);
-
-EMsgComposer            *e_msg_composer_new_with_message                 (CamelMimeMessage  *msg);
-EMsgComposer            *e_msg_composer_new_from_url                     (const char        *url);
-EMsgComposer            *e_msg_composer_new_redirect                     (CamelMimeMessage  *message,
-									  const char        *resent_from);
-
-void                     e_msg_composer_show_attachments                 (EMsgComposer      *composer,
-									  gboolean           show);
-void                     e_msg_composer_set_headers                      (EMsgComposer      *composer,
-									  const char        *from,
-									  EDestination     **to,
-									  EDestination     **cc,
-									  EDestination     **bcc,
-									  const char        *subject);
-void                     e_msg_composer_set_body_text                    (EMsgComposer      *composer,
-									  const char        *text,
-									  ssize_t            len);
-void                     e_msg_composer_set_body                         (EMsgComposer      *composer,
-									  const char        *body,
-									  const char        *mime_type);
-void                     e_msg_composer_add_header                       (EMsgComposer      *composer,
-									  const char        *name,
-									  const char        *value);
-void                     e_msg_composer_attach                           (EMsgComposer      *composer,
-									  CamelMimePart     *attachment);
-CamelMimePart           *e_msg_composer_add_inline_image_from_file       (EMsgComposer      *composer,
-									  const char        *filename);
-void                     e_msg_composer_add_inline_image_from_mime_part  (EMsgComposer      *composer,
-									  CamelMimePart     *part);
-CamelMimeMessage        *e_msg_composer_get_message                      (EMsgComposer      *composer,
-									  gboolean           save_html_object_data);
-CamelMimeMessage        *e_msg_composer_get_message_draft                (EMsgComposer      *composer);
-void                     e_msg_composer_show_sig_file                    (EMsgComposer      *composer);
-gboolean                 e_msg_composer_get_send_html                    (EMsgComposer      *composer);
-void                     e_msg_composer_set_send_html                    (EMsgComposer      *composer,
-									  gboolean           send_html);
-
-gboolean                 e_msg_composer_get_view_from                    (EMsgComposer      *composer);
-void                     e_msg_composer_set_view_from                    (EMsgComposer      *composer,
-									  gboolean           view_from);
-gboolean                 e_msg_composer_get_view_to                      (EMsgComposer      *composer);
-void                     e_msg_composer_set_view_to                      (EMsgComposer      *composer,
-									  gboolean           view_replyto);
-gboolean                 e_msg_composer_get_view_replyto                 (EMsgComposer      *composer);
-void                     e_msg_composer_set_view_replyto                 (EMsgComposer      *composer,
-									  gboolean           view_replyto);
-gboolean                 e_msg_composer_get_view_postto                  (EMsgComposer      *composer);
-void                     e_msg_composer_set_view_postto                  (EMsgComposer      *composer,
-									  gboolean           view_replyto);
-gboolean                 e_msg_composer_get_view_cc                      (EMsgComposer      *composer);
-void                     e_msg_composer_set_view_cc                      (EMsgComposer      *composer,
-									  gboolean           view_cc);
-gboolean                 e_msg_composer_get_view_bcc                     (EMsgComposer      *composer);
-void                     e_msg_composer_set_view_bcc                     (EMsgComposer      *composer,
-									  gboolean           view_bcc);
-
-EDestination           **e_msg_composer_get_recipients                   (EMsgComposer *composer);
-EDestination           **e_msg_composer_get_to                           (EMsgComposer *composer);
-EDestination           **e_msg_composer_get_cc                           (EMsgComposer *composer);
-EDestination           **e_msg_composer_get_bcc                          (EMsgComposer *composer);
-const char              *e_msg_composer_get_subject                      (EMsgComposer *composer);
-
-EAccount                *e_msg_composer_get_preferred_account            (EMsgComposer      *composer);
-void                     e_msg_composer_clear_inlined_table              (EMsgComposer      *composer);
-char                    *e_msg_composer_guess_mime_type                  (const char        *file_name);
-void                     e_msg_composer_set_changed                      (EMsgComposer      *composer);
-void                     e_msg_composer_unset_changed                    (EMsgComposer      *composer);
-gboolean                 e_msg_composer_is_dirty                         (EMsgComposer      *composer);
-void                     e_msg_composer_set_autosaved                    (EMsgComposer      *composer);
-void                     e_msg_composer_unset_autosaved                  (EMsgComposer      *composer);
-gboolean                 e_msg_composer_is_autosaved                     (EMsgComposer      *composer);
-void                     e_msg_composer_set_enable_autosave              (EMsgComposer      *composer,
-									  gboolean           enabled);
-
-/* PGP */
-void                     e_msg_composer_set_pgp_sign                     (EMsgComposer      *composer,
-									  gboolean           pgp_sign);
-gboolean                 e_msg_composer_get_pgp_sign                     (EMsgComposer      *composer);
-void                     e_msg_composer_set_pgp_encrypt                  (EMsgComposer      *composer,
-									  gboolean           pgp_encrypt);
-gboolean                 e_msg_composer_get_pgp_encrypt                  (EMsgComposer      *composer);
-
-/* S/MIME */
-void                     e_msg_composer_set_smime_sign                   (EMsgComposer      *composer,
-									  gboolean           smime_sign);
-gboolean                 e_msg_composer_get_smime_sign                   (EMsgComposer      *composer);
-void                     e_msg_composer_set_smime_encrypt                (EMsgComposer      *composer,
-									  gboolean           smime_encrypt);
-gboolean                 e_msg_composer_get_smime_encrypt                (EMsgComposer      *composer);
-char                    *e_msg_composer_get_sig_file_content             (const char        *sigfile,
-									  gboolean           in_html);
-void                     e_msg_composer_add_message_attachments          (EMsgComposer      *composer,
-									  CamelMimeMessage  *message,
-									  gboolean           just_inlines);
-void                     e_msg_composer_ignore                           (EMsgComposer      *composer,
-									  const char        *str);
-void                     e_msg_composer_drop_editor_undo                 (EMsgComposer      *composer);
-
-gboolean                 e_msg_composer_request_close_all                (void);
-void			 e_msg_composer_check_autosave			 (GtkWindow *parent);
-
-#ifdef __cplusplus
-}
-#endif /* __cplusplus */
-
-#endif /* ___E_MSG_COMPOSER_H__ */
diff --git a/composer/evolution-composer.c b/composer/evolution-composer.c
deleted file mode 100644
index 10ed5b922e..0000000000
--- a/composer/evolution-composer.c
+++ /dev/null
@@ -1,399 +0,0 @@
-/* -*- Mode: C; indent-tabs-mode: t; c-basic-offset: 8; tab-width: 8 -*- */
-/* evolution-composer.c
- *
- * Copyright (C) 2000  Ximian, Inc.
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of version 2 of the GNU General Public
- * published by the Free Software Foundation; either version 2 of the
- * License as published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * General Public License for more details.
- *
- * You should have received a copy of the GNU General Public
- * 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: Dan Winship <danw@ximian.com>
- */
-
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
-
-#include <string.h>
-#include <gtk/gtksignal.h>
-#include <bonobo/bonobo-item-handler.h>
-#include <bonobo/bonobo-generic-factory.h>
-#include <gal/util/e-util.h>
-#include <gal/widgets/e-gui-utils.h>
-#include "evolution-composer.h"
-#include "mail/mail-config.h"
-#include "e-util/e-account-list.h"
-#include <camel/camel-mime-filter-tohtml.h>
-#include <camel/camel-stream-mem.h>
-
-#define PARENT_TYPE BONOBO_OBJECT_TYPE
-static BonoboObjectClass *parent_class = NULL;
-
-struct _EvolutionComposerPrivate {
-	int send_id;
-	int save_draft_id;
-
-	void (*send_cb) (EMsgComposer *, gpointer);
-	void (*save_draft_cb) (EMsgComposer *, int, gpointer);
-};
-
-/* CORBA interface implementation.  */
-static EDestination **
-corba_recipientlist_to_destv (const GNOME_Evolution_Composer_RecipientList *cl)
-{
-	GNOME_Evolution_Composer_Recipient *recip;
-	EDestination **destv;
-	int i;
-
-	if (cl->_length == 0)
-		return NULL;
-
-	destv = g_new (EDestination *, cl->_length+1);
-
-	for (i = 0; i < cl->_length; ++i) {
-		recip = &(cl->_buffer[i]);
-
-		destv[i] = e_destination_new ();
-
-		if (*recip->name)
-			e_destination_set_name (destv[i], recip->name);
-		e_destination_set_email (destv[i], recip->address);
-		
-	}
-	destv[cl->_length] = NULL;
-
-	return destv;
-}
-
-static void
-impl_Composer_set_headers (PortableServer_Servant servant,
-			   const CORBA_char *from,
-			   const GNOME_Evolution_Composer_RecipientList *to,
-			   const GNOME_Evolution_Composer_RecipientList *cc,
-			   const GNOME_Evolution_Composer_RecipientList *bcc,
-			   const CORBA_char *subject,
-			   CORBA_Environment *ev)
-{
-	BonoboObject *bonobo_object;
-	EvolutionComposer *composer;
-	EDestination **tov, **ccv, **bccv;
-	EAccountList *accounts;
-	EAccount *account;
-	EIterator *iter;
-	int found = 0;
-	
-	bonobo_object = bonobo_object_from_servant (servant);
-	composer = EVOLUTION_COMPOSER (bonobo_object);
-	
-	account = mail_config_get_account_by_name (from);
-	if (!account) {
-		accounts = mail_config_get_accounts ();
-		iter = e_list_get_iterator ((EList *) accounts);
-		while (e_iterator_is_valid (iter)) {
-			account = (EAccount *) e_iterator_get (iter);
-			
-			if (!g_ascii_strcasecmp (account->id->address, from)) {
-				found = TRUE;
-				break;
-			}
-			
-			e_iterator_next (iter);
-		}
-		
-		g_object_unref (iter);
-		
-		if (!found)
-			account = mail_config_get_default_account ();
-	}
-	
-	tov  = corba_recipientlist_to_destv (to);
-	ccv  = corba_recipientlist_to_destv (cc);
-	bccv = corba_recipientlist_to_destv (bcc);
-	
-	e_msg_composer_set_headers (composer->composer, account->name,
-				    tov, ccv, bccv, subject);
-	
-	e_destination_freev (tov);
-	e_destination_freev (ccv);
-	e_destination_freev (bccv);
-}
-
-static void
-impl_Composer_set_multipart_type (PortableServer_Servant servant,
-				  GNOME_Evolution_Composer_MultipartType type,
-				  CORBA_Environment *ev)
-{
-	BonoboObject *bonobo_object;
-	EvolutionComposer *composer;
-
-	bonobo_object = bonobo_object_from_servant (servant);
-	composer = EVOLUTION_COMPOSER (bonobo_object);
-
-	if (type == GNOME_Evolution_Composer_ALTERNATIVE) {
-		composer->composer->is_alternative = TRUE;
-		composer->composer->send_html = FALSE;
-	}
-}
-
-static void
-impl_Composer_set_body (PortableServer_Servant servant,
-			const CORBA_char *body,
-			const CORBA_char *mime_type,
-			CORBA_Environment *ev)
-{
-	BonoboObject *bonobo_object;
-	EvolutionComposer *composer;
-
-	bonobo_object = bonobo_object_from_servant (servant);
-	composer = EVOLUTION_COMPOSER (bonobo_object);
-
-	if (!g_ascii_strcasecmp (mime_type, "text/plain")) {
-		char *htmlbody = camel_text_to_html (body, CAMEL_MIME_FILTER_TOHTML_PRE, 0);
-		
-		e_msg_composer_set_body_text (composer->composer, htmlbody, -1);
-		g_free (htmlbody);
-	} else if (!g_ascii_strcasecmp (mime_type, "text/html"))
-		e_msg_composer_set_body_text (composer->composer, body, -1);
-	else
-		e_msg_composer_set_body (composer->composer, body, mime_type);
-}
-
-static void
-impl_Composer_attach_MIME (PortableServer_Servant servant,
-			   const CORBA_char *data,
-			   CORBA_Environment *ev)
-{
-	BonoboObject *bonobo_object;
-	EvolutionComposer *composer;
-	CamelMimePart *attachment;
-	CamelStream *mem_stream;
-	int status;
-
-	bonobo_object = bonobo_object_from_servant (servant);
-	composer = EVOLUTION_COMPOSER (bonobo_object);
-
-	mem_stream = camel_stream_mem_new_with_buffer (data, strlen (data));
-	attachment = camel_mime_part_new ();
-	status = camel_data_wrapper_construct_from_stream (
-		CAMEL_DATA_WRAPPER (attachment), mem_stream);
-	camel_object_unref (mem_stream);
-
-	if (status == -1) {
-		CORBA_exception_set (ev, CORBA_USER_EXCEPTION,
-				     ex_GNOME_Evolution_Composer_CouldNotParse,
-				     NULL);
-		return;
-	}
-
-	e_msg_composer_attach (composer->composer, attachment);
-	camel_object_unref (CAMEL_OBJECT (attachment));
-}
-
-static void
-impl_Composer_attach_data (PortableServer_Servant servant,
-			   const CORBA_char *content_type,
-			   const CORBA_char *filename,
-			   const CORBA_char *description,
-			   const CORBA_boolean show_inline,
-			   const GNOME_Evolution_Composer_AttachmentData *data,
-			   CORBA_Environment *ev)
-{
-	BonoboObject *bonobo_object;
-	EvolutionComposer *composer;
-	CamelMimePart *attachment;
-
-	bonobo_object = bonobo_object_from_servant (servant);
-	composer = EVOLUTION_COMPOSER (bonobo_object);
-
-	attachment = camel_mime_part_new ();
-	camel_mime_part_set_content (attachment, data->_buffer, data->_length,
-				     content_type);
-
-	if (*filename)
-		camel_mime_part_set_filename (attachment, filename);
-	if (*description)
-		camel_mime_part_set_description (attachment, description);
-	camel_mime_part_set_disposition (attachment, show_inline ?
-					 "inline" : "attachment");
-
-	e_msg_composer_attach (composer->composer, attachment);
-	camel_object_unref (attachment);
-}
-
-static void
-impl_Composer_show (PortableServer_Servant servant,
-		    CORBA_Environment *ev)
-{
-	BonoboObject *bonobo_object;
-	EvolutionComposer *composer;
-
-	bonobo_object = bonobo_object_from_servant (servant);
-	composer = EVOLUTION_COMPOSER (bonobo_object);
-
-	gtk_widget_show (GTK_WIDGET (composer->composer));
-}
-
-static void
-impl_Composer_send (PortableServer_Servant servant,
-		    CORBA_Environment *ev)
-{
-	BonoboObject *bonobo_object;
-	EvolutionComposer *composer;
-
-	bonobo_object = bonobo_object_from_servant (servant);
-	composer = EVOLUTION_COMPOSER (bonobo_object);
-
-	composer->priv->send_cb (composer->composer, NULL);
-}
-
-POA_GNOME_Evolution_Composer__epv *
-evolution_composer_get_epv (void)
-{
-	POA_GNOME_Evolution_Composer__epv *epv;
-
-	epv = g_new0 (POA_GNOME_Evolution_Composer__epv, 1);
-	epv->setHeaders       = impl_Composer_set_headers;
-	epv->setMultipartType = impl_Composer_set_multipart_type;
-	epv->setBody          = impl_Composer_set_body;
-	epv->attachMIME       = impl_Composer_attach_MIME;
-	epv->attachData       = impl_Composer_attach_data;
-	epv->show             = impl_Composer_show;
-	epv->send             = impl_Composer_send;
-
-	return epv;
-}
-
-
-/* GObject stuff */
-
-static void
-finalise (GObject *object)
-{
-	EvolutionComposer *composer = EVOLUTION_COMPOSER (object);
-	struct _EvolutionComposerPrivate *p = composer->priv;
-
-	g_signal_handler_disconnect(composer->composer, p->send_id);
-	g_signal_handler_disconnect(composer->composer, p->save_draft_id);
-	g_free(p);
-
-	if (composer->composer) {
-		g_object_unref(composer->composer);
-		composer->composer = NULL;
-	}
-
-	G_OBJECT_CLASS (parent_class)->finalize (object);
-}
-
-static void
-evolution_composer_class_init (EvolutionComposerClass *klass)
-{
-	GObjectClass *object_class;
-	POA_GNOME_Evolution_Composer__epv *epv;
-
-	object_class = G_OBJECT_CLASS (klass);
-	object_class->finalize = finalise;
-
-	parent_class = g_type_class_ref(bonobo_object_get_type ());
-
-	epv = &klass->epv;
-
-	epv->setHeaders       = impl_Composer_set_headers;
-	epv->setMultipartType = impl_Composer_set_multipart_type;
-	epv->setBody          = impl_Composer_set_body;
-	epv->attachMIME       = impl_Composer_attach_MIME;
-	epv->attachData       = impl_Composer_attach_data;
-	epv->show             = impl_Composer_show;
-	epv->send             = impl_Composer_send;
-}
-
-static void
-evolution_composer_init (EvolutionComposer *composer)
-{
-	EAccount *account;
-	
-	account = mail_config_get_default_account ();
-	composer->composer = e_msg_composer_new ();
-	composer->priv = g_malloc0(sizeof(*composer->priv));
-}
-
-#if 0
-static Bonobo_ItemContainer_ObjectNames *
-enum_objects (BonoboItemHandler *handler, gpointer data, CORBA_Environment *ev)
-{
-}
-#endif
-
-static Bonobo_Unknown 
-get_object (BonoboItemHandler *h, const char *item_name, gboolean only_if_exists,
-	    gpointer data, CORBA_Environment *ev)
-{
-	EvolutionComposer *composer = data;
-	GSList *options, *l;
-	
-	options = bonobo_item_option_parse (item_name);
-	for (l = options; l; l = l->next){
-		BonoboItemOption *option = l->data;
-
-		if (strcmp (option->key, "visible") == 0){
-			gboolean show = 1;
-			
-			if (option->value)
-				show = atoi (option->value);
-
-			if (show)
-				gtk_widget_show (GTK_WIDGET (composer->composer));
-			else
-				gtk_widget_hide (GTK_WIDGET (composer->composer));
-		}
-	}
-	return bonobo_object_dup_ref (
-		BONOBO_OBJECT (composer)->corba_objref, ev);
-}
-
-void
-evolution_composer_construct (EvolutionComposer *composer,
-			      GNOME_Evolution_Composer corba_object)
-{
-	BonoboObject *item_handler;
-	
-	g_return_if_fail (composer != NULL);
-	g_return_if_fail (EVOLUTION_IS_COMPOSER (composer));
-	g_return_if_fail (corba_object != CORBA_OBJECT_NIL);
-
-	/*bonobo_object_construct (BONOBO_OBJECT (composer), corba_object);*/
-
-	item_handler = BONOBO_OBJECT (
-		bonobo_item_handler_new (NULL, get_object, composer));
-	bonobo_object_add_interface (BONOBO_OBJECT (composer), BONOBO_OBJECT (item_handler));
-}
-
-EvolutionComposer *
-evolution_composer_new (void (*send) (EMsgComposer *, gpointer),
-			void (*save_draft) (EMsgComposer *, int, gpointer))
-{
-	EvolutionComposer *new;
-	struct _EvolutionComposerPrivate *p;
-
-	new = g_object_new(EVOLUTION_TYPE_COMPOSER, NULL);
-	evolution_composer_construct (new, bonobo_object_corba_objref((BonoboObject *)new));
-	p = new->priv;
-	p->send_cb = send;
-	p->save_draft_cb = save_draft;
-	p->send_id = g_signal_connect (new->composer, "send", G_CALLBACK (send), NULL);
-	p->save_draft_id = g_signal_connect (new->composer, "save-draft", G_CALLBACK (save_draft), NULL);
-
-	return new;
-}
-
-BONOBO_TYPE_FUNC_FULL(EvolutionComposer, GNOME_Evolution_Composer, BONOBO_TYPE_OBJECT, evolution_composer)
diff --git a/composer/evolution-composer.h b/composer/evolution-composer.h
deleted file mode 100644
index 8928801583..0000000000
--- a/composer/evolution-composer.h
+++ /dev/null
@@ -1,75 +0,0 @@
-/* -*- Mode: C; indent-tabs-mode: t; c-basic-offset: 8; tab-width: 8 -*- */
-/* evolution-composer.h
- *
- * Copyright (C) 2000  Ximian, Inc.
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of version 2 of the GNU General Public
- * published by the Free Software Foundation; either version 2 of the
- * License as published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * General Public License for more details.
- *
- * You should have received a copy of the GNU General Public
- * 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: Dan Winship
- */
-
-#ifndef __EVOLUTION_COMPOSER_H__
-#define __EVOLUTION_COMPOSER_H__
-
-#include <bonobo/bonobo-object.h>
-
-#include "Composer.h"
-#include "e-msg-composer.h"
-
-#ifdef __cplusplus
-extern "C" {
-#pragma }
-#endif /* __cplusplus */
-
-#define EVOLUTION_TYPE_COMPOSER            (evolution_composer_get_type ())
-#define EVOLUTION_COMPOSER(obj)            (G_TYPE_CHECK_INSTANCE_CAST ((obj), EVOLUTION_TYPE_COMPOSER, EvolutionComposer))
-#define EVOLUTION_COMPOSER_CLASS(klass)    (G_TYPE_CHECK_CLASS_CAST ((klass), EVOLUTION_TYPE_COMPOSER, EvolutionComposerClass))
-#define EVOLUTION_IS_COMPOSER(obj)         (G_TYPE_CHECK_INSTANCE_TYPE ((obj), EVOLUTION_TYPE_COMPOSER))
-#define EVOLUTION_IS_COMPOSER_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((obj), EVOLUTION_TYPE_COMPOSER))
-
-typedef struct _EvolutionComposer        EvolutionComposer;
-typedef struct _EvolutionComposerClass   EvolutionComposerClass;
-
-struct _EvolutionComposer {
-	BonoboObject parent;
-
-	struct _EvolutionComposerPrivate *priv;
-
-	EMsgComposer *composer;
-};
-
-struct _EvolutionComposerClass {
-	BonoboObjectClass parent_class;
-
-	POA_GNOME_Evolution_Composer__epv epv;
-};
-
-POA_GNOME_Evolution_Composer__epv *evolution_composer_get_epv            (void);
-
-GtkType            evolution_composer_get_type     (void);
-void               evolution_composer_construct    (EvolutionComposer *,
-						    GNOME_Evolution_Composer);
-EvolutionComposer *evolution_composer_new          (void (*send_cb) (EMsgComposer *, gpointer),
-						    void (*save_draft_cb) (EMsgComposer *, int, gpointer));
-
-void               evolution_composer_factory_init (void (*send) (EMsgComposer *, gpointer),
-						    void (*save_draft) (EMsgComposer *, int, gpointer));
-
-#ifdef __cplusplus
-}
-#endif /* __cplusplus */
-
-#endif /* __EVOLUTION_COMPOSER_H__ */
diff --git a/composer/listener.c b/composer/listener.c
deleted file mode 100644
index 2eb78cc8cc..0000000000
--- a/composer/listener.c
+++ /dev/null
@@ -1,282 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-/*  This file is part of gnome-spell bonobo component
-
-    Copyright (C) 2000 Ximian, Inc.
-    Authors:           Radek Doulik <rodo@ximian.com>
-
-    This program is free software; you can redistribute it and/or
-    modify it under the terms of version 2 of the GNU General Public
-    License as published by the Free Software Foundation.
- 
-    This program is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-    General Public License for more details.
- 
-    You should have received a copy of the GNU General Public
-    License along with this program; if not, write to the
-    Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-    Boston, MA 02111-1307, USA.
-*/
-
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
-
-#include <string.h>
-#include <bonobo/bonobo-arg.h>
-#include <bonobo/bonobo-object.h>
-#include <bonobo/bonobo-stream-client.h>
-#include <camel/camel-stream-mem.h>
-
-#include "listener.h"
-
-static BonoboObjectClass *listener_parent_class;
-
-inline static EditorListener *
-listener_from_servant (PortableServer_Servant servant)
-{
-	return EDITOR_LISTENER (bonobo_object_from_servant (servant));
-}
-
-static CORBA_any *
-get_any_null ()
-{
-	CORBA_any *rv;
-
-	rv = CORBA_any__alloc ();
-	rv->_type = TC_null;
-
-	return rv;
-}
-
-static gchar *
-resolve_image_url (EditorListener *l, gchar *url)
-{
-	CamelMimePart *part;
-	const char *cid;
-
-	part = g_hash_table_lookup (l->composer->inline_images_by_url, url);
-	if (!part && !strncmp (url, "file:", 5)) {
-		part = e_msg_composer_add_inline_image_from_file (l->composer,
-								  url + 5);
-	}
-	if (!part && !strncmp (url, "cid:", 4)) {
-		part = g_hash_table_lookup (l->composer->inline_images, url);
-	}
-	if (!part)
-		return NULL;
-
-	l->composer->current_images  = g_list_prepend (l->composer->current_images, part);
-
-	cid = camel_mime_part_get_content_id (part);
-	if (!cid)
-		return NULL;
-
-	return g_strconcat ("cid:", cid, NULL);
-}
-
-static void
-reply_indent (EditorListener *l, CORBA_Environment * ev)
-{
-	if (!GNOME_GtkHTML_Editor_Engine_isParagraphEmpty (l->composer->editor_engine, ev)) {
-		if (GNOME_GtkHTML_Editor_Engine_isPreviousParagraphEmpty (l->composer->editor_engine, ev))
-			GNOME_GtkHTML_Editor_Engine_runCommand (l->composer->editor_engine, "cursor-backward", ev);
-		else {
-			GNOME_GtkHTML_Editor_Engine_runCommand (l->composer->editor_engine, "text-default-color", ev);
-			GNOME_GtkHTML_Editor_Engine_runCommand (l->composer->editor_engine, "italic-off", ev);
-			GNOME_GtkHTML_Editor_Engine_runCommand (l->composer->editor_engine, "insert-paragraph", ev);
-			return;
-		}
-	}
-
-	GNOME_GtkHTML_Editor_Engine_runCommand (l->composer->editor_engine, "style-normal", ev);
-	GNOME_GtkHTML_Editor_Engine_runCommand (l->composer->editor_engine, "indent-zero", ev);
-	GNOME_GtkHTML_Editor_Engine_runCommand (l->composer->editor_engine, "text-default-color", ev);
-	GNOME_GtkHTML_Editor_Engine_runCommand (l->composer->editor_engine, "italic-off", ev);
-}
-
-static void
-clear_signature (GNOME_GtkHTML_Editor_Engine e, CORBA_Environment * ev)
-{
-	if (GNOME_GtkHTML_Editor_Engine_isParagraphEmpty (e, ev))
-		GNOME_GtkHTML_Editor_Engine_setParagraphData (e, "signature", "0", ev);
-	else if (GNOME_GtkHTML_Editor_Engine_isPreviousParagraphEmpty (e, ev)
-		 && GNOME_GtkHTML_Editor_Engine_runCommand (e, "cursor-backward", ev)) {
-		GNOME_GtkHTML_Editor_Engine_setParagraphData (e, "signature", "0", ev);
-		GNOME_GtkHTML_Editor_Engine_runCommand (e, "cursor-forward", ev);
-	}
-	GNOME_GtkHTML_Editor_Engine_runCommand (e, "text-default-color", ev);
-	GNOME_GtkHTML_Editor_Engine_runCommand (e, "italic-off", ev);
-}
-
-static void
-insert_paragraph_before (EditorListener *l, CORBA_Environment * ev)
-{
-	if (!l->composer->in_signature_insert) {
-		CORBA_char *orig, *signature;
-		gboolean changed = FALSE;
-		/* FIXME check for insert-paragraph command */
-
-		orig = GNOME_GtkHTML_Editor_Engine_getParagraphData (l->composer->editor_engine, "orig", ev);
-		if (ev->_major == CORBA_NO_EXCEPTION) {
-			if (orig && *orig == '1') {
-				GNOME_GtkHTML_Editor_Engine_runCommand (l->composer->editor_engine, "text-default-color", ev);
-				GNOME_GtkHTML_Editor_Engine_runCommand (l->composer->editor_engine, "italic-off", ev);
-				changed = TRUE;
-			}
-			CORBA_free (orig);
-		}
-		if (!changed) {
-			signature = GNOME_GtkHTML_Editor_Engine_getParagraphData (l->composer->editor_engine, "signature", ev);
-			if (ev->_major == CORBA_NO_EXCEPTION) {
-				if (signature && *signature == '1') {
-					GNOME_GtkHTML_Editor_Engine_runCommand (l->composer->editor_engine, "text-default-color",
-										ev);
-					GNOME_GtkHTML_Editor_Engine_runCommand (l->composer->editor_engine, "italic-off", ev);
-				}
-				CORBA_free (signature);
-			}
-		}
-	}
-}
-
-static void
-insert_paragraph_after (EditorListener *l, CORBA_Environment * ev)
-{
-	if (!l->composer->in_signature_insert) {
-		CORBA_char *orig, *signature;
-		/* FIXME check for insert-paragraph command */
-		GNOME_GtkHTML_Editor_Engine_runCommand (l->composer->editor_engine, "text-default-color", ev);
-		GNOME_GtkHTML_Editor_Engine_runCommand (l->composer->editor_engine, "italic-off", ev);
-
-		orig = GNOME_GtkHTML_Editor_Engine_getParagraphData (l->composer->editor_engine, "orig", ev);
-		if (ev->_major == CORBA_NO_EXCEPTION) {
-			if (orig && *orig == '1')
-				reply_indent (l, ev);
-			GNOME_GtkHTML_Editor_Engine_setParagraphData (l->composer->editor_engine, "orig", "0", ev);
-			CORBA_free (orig);
-		}
-		signature = GNOME_GtkHTML_Editor_Engine_getParagraphData (l->composer->editor_engine, "signature", ev);
-		if (ev->_major == CORBA_NO_EXCEPTION) {
-			if (signature && *signature == '1')
-				clear_signature (l->composer->editor_engine, ev);
-			CORBA_free (signature);
-		}
-	}
-}
-
-static CORBA_any *
-impl_event (PortableServer_Servant _servant,
-	    const CORBA_char * name, const CORBA_any * arg,
-	    CORBA_Environment * ev)
-{
-	EditorListener *l = listener_from_servant (_servant);
-	CORBA_any  *rv = NULL;
-	gchar *command;
-
-	if (!strcmp (name, "command_before")) {
-		command = BONOBO_ARG_GET_STRING (arg);
-		if (!strcmp (command, "insert-paragraph")) {
-			insert_paragraph_before (l, ev);
-		}
-	} else if (!strcmp (name, "command_after")) {
-		command = BONOBO_ARG_GET_STRING (arg);
-		if (!strcmp (command, "insert-paragraph")) {
-			insert_paragraph_after (l, ev);
-		}
-	} else if (!strcmp (name, "image_url")) {
-		gchar *url;
-
-		if ((url = resolve_image_url (l, BONOBO_ARG_GET_STRING (arg)))) {
-			rv = bonobo_arg_new (BONOBO_ARG_STRING);
-			BONOBO_ARG_SET_STRING (rv, url);
-			/* printf ("new url: %s\n", url); */
-			g_free (url);
-		}
-	} else if (!strcmp (name, "delete")) {
-		if (GNOME_GtkHTML_Editor_Engine_isParagraphEmpty (l->composer->editor_engine, ev)) {
-			CORBA_char *orig;
-			CORBA_char *signature;
-		
-			orig = GNOME_GtkHTML_Editor_Engine_getParagraphData (l->composer->editor_engine, "orig", ev);
-			if (ev->_major == CORBA_NO_EXCEPTION) {
-				if (orig && *orig == '1') {
-					GNOME_GtkHTML_Editor_Engine_setParagraphData (l->composer->editor_engine, "orig", "0", ev);
-
-					GNOME_GtkHTML_Editor_Engine_runCommand (l->composer->editor_engine, "indent-zero", ev);
-					GNOME_GtkHTML_Editor_Engine_runCommand (l->composer->editor_engine, "style-normal", ev);
-					GNOME_GtkHTML_Editor_Engine_runCommand (l->composer->editor_engine, "text-default-color", ev);
-					GNOME_GtkHTML_Editor_Engine_runCommand (l->composer->editor_engine, "italic-off", ev);
-					GNOME_GtkHTML_Editor_Engine_runCommand (l->composer->editor_engine, "insert-paragraph", ev);
-					GNOME_GtkHTML_Editor_Engine_runCommand (l->composer->editor_engine, "delete-back", ev);
-				}
-				CORBA_free (orig);
-			}
-			signature = GNOME_GtkHTML_Editor_Engine_getParagraphData (l->composer->editor_engine, "signature", ev);
-			if (ev->_major == CORBA_NO_EXCEPTION) {
-				if (signature && *signature == '1')
-					GNOME_GtkHTML_Editor_Engine_setParagraphData (l->composer->editor_engine, "signature", "0", ev);
-				CORBA_free (signature);
-			}
-		}
-	} else if (!strcmp (name, "url_requested")) {
-		GNOME_GtkHTML_Editor_URLRequestEvent *e;
-		CamelMimePart *part;
-		GByteArray *ba;
-		CamelStream *cstream;
-		CamelDataWrapper *wrapper;
-
-		e = (GNOME_GtkHTML_Editor_URLRequestEvent *)arg->_value;
-
-		if (!e->url || e->stream == CORBA_OBJECT_NIL)
-			return get_any_null ();
-
-		part = g_hash_table_lookup (l->composer->inline_images_by_url, e->url);
-		if (!part)
-			part = g_hash_table_lookup (l->composer->inline_images, e->url);
-		if (!part)
-			return get_any_null ();
-
-		/* Write the data to a CamelStreamMem... */
-		ba = g_byte_array_new ();
-		cstream = camel_stream_mem_new_with_byte_array (ba);
-		wrapper = camel_medium_get_content_object (CAMEL_MEDIUM (part));
-		camel_data_wrapper_decode_to_stream (wrapper, cstream);
-
-		bonobo_stream_client_write (e->stream, ba->data, ba->len, ev);
-
-		camel_object_unref (cstream);
-	}
-
-	return rv ? rv : get_any_null ();
-}
-
-static void
-listener_class_init (EditorListenerClass *klass)
-{
-	POA_GNOME_GtkHTML_Editor_Listener__epv *epv;
-
-	listener_parent_class = g_type_class_ref(bonobo_object_get_type ());
-
-	epv = &klass->epv;
-	epv->event = impl_event;
-}
-
-static void
-listener_init(EditorListener *object)
-{
-}
-
-BONOBO_TYPE_FUNC_FULL(EditorListener, GNOME_GtkHTML_Editor_Listener, BONOBO_TYPE_OBJECT, listener);
-
-EditorListener *
-listener_new (EMsgComposer *composer)
-{
-	EditorListener *listener;
-
-	listener = g_object_new (EDITOR_LISTENER_TYPE, NULL);
-	listener->composer = composer;
-	
-	return listener;
-}
diff --git a/composer/listener.h b/composer/listener.h
deleted file mode 100644
index d238583453..0000000000
--- a/composer/listener.h
+++ /dev/null
@@ -1,51 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-/*  This file is part of gnome-spell bonobo component
-
-    Copyright (C) 2000 Ximian, Inc.
-    Authors:           Radek Doulik <rodo@ximian.com>
-
-    This program is free software; you can redistribute it and/or
-    modify it under the terms of version 2 of the GNU General Public
-    License as published by the Free Software Foundation.
- 
-    This program is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-    General Public License for more details.
- 
-    You should have received a copy of the GNU General Public
-    License along with this program; if not, write to the
-    Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-    Boston, MA 02111-1307, USA.
-*/
-
-#ifndef LISTENER_H_
-#define LISTENER_H_
-
-#include <bonobo/bonobo-object.h>
-#include "Editor.h"
-#include "e-msg-composer.h"
-
-#define EDITOR_LISTENER_TYPE        (listener_get_type ())
-#define EDITOR_LISTENER(o)          (G_TYPE_CHECK_INSTANCE_CAST ((o), EDITOR_LISTENER_TYPE, EditorListener))
-#define EDITOR_LISTENER_CLASS(k)    (G_TYPE_CHECK_CLASS_CAST ((k), EDITOR_LISTENER_TYPE, EditorListenerClass))
-#define IS_EDITOR_LISTENER(o)       (G_TYPE_CHECK_INSTANCE_TYPE ((o), EDITOR_LISTENER_TYPE))
-#define IS_EDITOR_LISTENER_CLASS(k) (G_TYPE_CHECK_CLASS_TYPE ((k), EDITOR_LISTENER_TYPE))
-
-typedef struct {
-	BonoboObject parent;
-	EMsgComposer *composer;
-} EditorListener;
-
-typedef struct {
-	BonoboObjectClass parent_class;
-
-	POA_GNOME_GtkHTML_Editor_Listener__epv epv;
-} EditorListenerClass;
-
-GtkType                                 listener_get_type   (void);
-EditorListener                         *listener_construct  (EditorListener                *listener,
-									GNOME_GtkHTML_Editor_Listener  corba_listener);
-EditorListener                         *listener_new        (EMsgComposer                  *composer);
-
-#endif /* LISTENER_H_ */
diff --git a/composer/mail-composer-errors.xml b/composer/mail-composer-errors.xml
deleted file mode 100644
index 25018074dd..0000000000
--- a/composer/mail-composer-errors.xml
+++ /dev/null
@@ -1,72 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<error-list domain="mail-composer">
-
- <error id="no-attach" type="error" modal="true">
-  <primary>You cannot attach the file `{0}' to this message.</primary>
-  <secondary>{1}</secondary>
- </error>
-
- <error id="attach-notfile" type="warning">
-  <primary>The file `{0}' is not a regular file and cannot be sent in a message.</primary>
- </error>
-
- <error id="attach-directory">
-  <primary>Directories can not be attached to Messages.</primary>
-  <secondary>To attach the contents of this directory, either attach the files in this directory individually, or create an archive of the directory and attach it.</secondary>
- </error>
-
- <error id="attach-nomessages" type="error">
-  <primary>Could not retrieve messages to attach from {0}.</primary>
-  <secondary>Because &quot;{1}&quot;.</secondary>
- </error>
-
- <error id="recover-autosave" type="question" default="GTK_RESPONSE_YES">
-  <title>Unfinished messages found</title>
-  <primary>Do you want to recover unfinished messages?</primary>
-  <secondary>Evolution quit unexpectedly while you were composing a new message. Recovering the message will allow you to continue where you left off.</secondary>
-  <button label="Don't Recover" response="GTK_RESPONSE_CANCEL"/>
-  <button label="Recover" response="GTK_RESPONSE_YES"/>
- </error>
-
- <error id="no-autosave" type="error">
-  <primary>Could not save to autosave file &quot;{0}&quot;.</primary>
-  <secondary>Error saving to autosave because &quot;{1}&quot;.</secondary>
- </error>
-
- <error id="exit-unsaved" modal="true" type="warning" default="GTK_RESPONSE_YES">
-  <title>Warning: Modified Message</title>
-  <primary>Are you sure you want to discard the message, titled '{0}', you are composing?</primary>
-  <secondary>Closing this composer window will discard the message permanently, unless you choose to save the message in your Drafts folder. This will allow you to continue the message at a later date.</secondary>
-  <button label="_Discard Changes" response="GTK_RESPONSE_NO"/>
-  <button stock="gtk-cancel" response="GTK_RESPONSE_CANCEL"/>
-  <button label="_Save Message" response="GTK_RESPONSE_YES"/>
- </error>
-
- <error id="no-build-message" type="error" modal="true">
-  <primary>Could not create message.</primary>
-  <secondary>Because &quot;{0}&quot;, you may need to select different mail options.</secondary>
- </error>
-
- <error id="no-sig-file" type="warning" modal="true">
-  <primary>Could not read signature file &quot;{0}&quot;.</primary>
-  <secondary>Because &quot;{1}&quot;.</secondary>
- </error>
-
- <error id="all-accounts-deleted" type="warning" modal="true">
-  <primary>All accounts have been removed.</primary>
-  <secondary>You need to configure an account before you can compose mail.</secondary>
- </error>
-
- <error id="no-address-control" type="error" modal="true">
-  <primary>Could not create composer window.</primary>
-  <secondary>Unable to activate the address selector control.</secondary>
- </error>
-
- <error id="no-editor-control" type="error" modal="true">
-  <primary>Could not create composer window.</primary>
-  <secondary>Unable to activate the HTML editor control.
-
-Please make sure that you have the correct version of gtkhtml and libgtkhtml installed.</secondary>
- </error>
-
-</error-list>
diff --git a/composer/mail-composer-errors.xml.h b/composer/mail-composer-errors.xml.h
deleted file mode 100644
index 30f0005258..0000000000
--- a/composer/mail-composer-errors.xml.h
+++ /dev/null
@@ -1,56 +0,0 @@
-/* mail-composer:no-attach primary */
-char *s = N_("You cannot attach the file `{0}' to this message.");
-/* mail-composer:no-attach secondary */
-char *s = N_("{1}");
-/* mail-composer:attach-notfile primary */
-char *s = N_("The file `{0}' is not a regular file and cannot be sent in a message.");
-/* mail-composer:attach-directory primary */
-char *s = N_("Directories can not be attached to Messages.");
-/* mail-composer:attach-directory secondary */
-char *s = N_("To attach the contents of this directory, either attach the files in this directory individually, or create an archive of the directory and attach it.");
-/* mail-composer:attach-nomessages primary */
-char *s = N_("Could not retrieve messages to attach from {0}.");
-/* mail-composer:attach-nomessages secondary */
-char *s = N_("Because \"{1}\".");
-/* mail-composer:recover-autosave title */
-char *s = N_("Unfinished messages found");
-/* mail-composer:recover-autosave primary */
-char *s = N_("Do you want to recover unfinished messages?");
-/* mail-composer:recover-autosave secondary */
-char *s = N_("Evolution quit unexpectedly while you were composing a new message. Recovering the message will allow you to continue where you left off.");
-char *s = N_("Don't Recover");
-char *s = N_("Recover");
-/* mail-composer:no-autosave primary */
-char *s = N_("Could not save to autosave file \"{0}\".");
-/* mail-composer:no-autosave secondary */
-char *s = N_("Error saving to autosave because \"{1}\".");
-/* mail-composer:exit-unsaved title */
-char *s = N_("Warning: Modified Message");
-/* mail-composer:exit-unsaved primary */
-char *s = N_("Are you sure you want to discard the message, titled '{0}', you are composing?");
-/* mail-composer:exit-unsaved secondary */
-char *s = N_("Closing this composer window will discard the message permanently, unless you choose to save the message in your Drafts folder. This will allow you to continue the message at a later date.");
-char *s = N_("_Discard Changes");
-char *s = N_("_Save Message");
-/* mail-composer:no-build-message primary */
-char *s = N_("Could not create message.");
-/* mail-composer:no-build-message secondary */
-char *s = N_("Because \"{0}\", you may need to select different mail options.");
-/* mail-composer:no-sig-file primary */
-char *s = N_("Could not read signature file \"{0}\".");
-/* mail-composer:no-sig-file secondary */
-char *s = N_("Because \"{1}\".");
-/* mail-composer:all-accounts-deleted primary */
-char *s = N_("All accounts have been removed.");
-/* mail-composer:all-accounts-deleted secondary */
-char *s = N_("You need to configure an account before you can compose mail.");
-/* mail-composer:no-address-control primary */
-char *s = N_("Could not create composer window.");
-/* mail-composer:no-address-control secondary */
-char *s = N_("Unable to activate the address selector control.");
-/* mail-composer:no-editor-control primary */
-char *s = N_("Could not create composer window.");
-/* mail-composer:no-editor-control secondary */
-char *s = N_("Unable to activate the HTML editor control.\n"
-	"\n"
-	"Please make sure that you have the correct version of gtkhtml and libgtkhtml installed.");
diff --git a/configure.in b/configure.in
deleted file mode 100644
index 2bb4952fbf..0000000000
--- a/configure.in
+++ /dev/null
@@ -1,1637 +0,0 @@
-# Process this file with autoconf to produce a configure script.
-AC_PREREQ(2.52)
-
-AC_INIT(evolution, 2.2.0, http://bugzilla.ximian.com/enter_bug.cgi?product=Evolution)
-AC_CONFIG_SRCDIR(README)
-AM_INIT_AUTOMAKE(AC_PACKAGE_NAME, AC_PACKAGE_VERSION)
-
-AM_CONFIG_HEADER(config.h)
-
-AC_CANONICAL_HOST
-AC_DEFINE_UNQUOTED(VERSION_COMMENT, "", [Define if you want a comment appended to the version number])
-
-dnl Put the ACLOCAL flags in the Makefile
-ACLOCAL="$ACLOCAL $ACLOCAL_FLAGS"
-
-dnl Initialize maintainer mode
-AM_MAINTAINER_MODE
-
-dnl *************************************************************************************************
-dnl Base Version
-dnl
-dnl This is for api/versioning tracking for things like bonobo .server files
-dnl
-dnl This should always be the major/minor of the stable version or stable version to be
-dnl *************************************************************************************************
-BASE_VERSION=2.2
-AC_SUBST(BASE_VERSION)
-AC_DEFINE_UNQUOTED(BASE_VERSION, "$BASE_VERSION", [Base version (Major.Minor)])
-
-dnl *************************************************************************************************
-dnl Upgrade Revision
-dnl
-dnl This is for triggering migration calls between varying versions.
-dnl
-dnl This should be reset to 0 whenever BASE_VERSION changes
-dnl *************************************************************************************************
-UPGRADE_REVISION=1
-AC_SUBST(UPGRADE_REVISION)
-AC_DEFINE_UNQUOTED(UPGRADE_REVISION, "$UPGRADE_REVISION", [The number of times we've upgraded since the BASE_VERSION release])
-
-dnl *************************************************************************************************
-dnl Development mode
-dnl 
-dnl The controls whether things like the development warning in shell/main.c are displayed.
-dnl
-dnl This should be set to 0 for stable releases and 1 for unstable releases
-dnl *************************************************************************************************
-AC_DEFINE(DEVELOPMENT, 1, [If we are in development mode or not])
-AC_SUBST(DEVELOPMENT)
-
-AC_ISC_POSIX
-AC_PROG_CC
-AC_PROG_CPP
-AC_C_INLINE
-AM_PROG_LEX
-AC_PROG_YACC
-case $YACC in
-*yacc*)
-	AC_MSG_ERROR(You need bison to build Evolution)
-	;;
-esac
-AC_STDC_HEADERS
-AC_ARG_PROGRAM
-AC_PROG_INSTALL
-AC_PROG_LN_S
-AC_PROG_MAKE_SET
-
-dnl  Test whether jw is installed
-AC_PATH_PROG(JW,jw,no)
-if test x$JW = xno; then
-  HAVE_JW="no"
-else
-  HAVE_JW="yes"
-fi
-AM_CONDITIONAL(HAVE_JW, test "x$HAVE_JW" = "xyes")
-AC_SUBST(HAVE_JW)
-
-dnl I18N stuff
-AC_PROG_INTLTOOL([0.30])
-
-ALL_LINGUAS="am ar az be bg bs ca cs cy da de el en_AU en_CA en_GB es et eu fa fi fr ga gl gu he hr hu is it ja ko lt lv mn ms nb ne nl nn no pa pl pt pt_BR ro ru sk sl sq sr sr@Latn sv tr uk vi wa zh_CN zh_TW"
-AM_GLIB_GNU_GETTEXT
-
-GETTEXT_PACKAGE=evolution-2.2
-AC_SUBST(GETTEXT_PACKAGE)
-AC_DEFINE_UNQUOTED(GETTEXT_PACKAGE, "$GETTEXT_PACKAGE", [Package name for gettext])
-
-localedir='$(prefix)/$(DATADIRNAME)/locale'
-AC_SUBST(localedir)
-
-dnl Initialize libtool
-AM_DISABLE_STATIC
-AM_PROG_LIBTOOL
-
-dnl alloca()
-AC_CHECK_HEADERS(alloca.h)
-
-dnl check for socklen_t (in Unix98)
-AC_MSG_CHECKING(for socklen_t)
-AC_TRY_COMPILE([#include <sys/types.h>
-#include <sys/socket.h>
-socklen_t x;
-],[],[AC_MSG_RESULT(yes)],[
-AC_TRY_COMPILE([#include <sys/types.h>
-#include <sys/socket.h>
-int accept (int, struct sockaddr *, size_t *);
-],[],[
-AC_MSG_RESULT(size_t)
-AC_DEFINE(socklen_t,size_t,[Define to appropriate type if socklen_t is not defined])], [
-AC_MSG_RESULT(int)
-AC_DEFINE(socklen_t,int)])])
-
-dnl
-dnl Purify support
-dnl
-EVO_PURIFY_SUPPORT
-
-dnl **************
-dnl Test Component
-dnl **************
-AC_ARG_ENABLE(test-component, [  --enable-test-component=[no/yes]      Enable test component.],enable_test_comp="$enableval",enable_test_comp=no)
-AM_CONDITIONAL(ENABLE_TEST_COMPONENT, test "x$enable_test_comp" = "xyes")
-
-dnl
-dnl system mail stuff (tbd?)
-dnl
-AC_PATH_PROG(SENDMAIL, sendmail, /usr/sbin/sendmail, /usr/sbin:/usr/lib)
-AC_DEFINE_UNQUOTED(SENDMAIL_PATH, "$SENDMAIL", [Path to a sendmail binary, or equivalent])
-
-AC_MSG_CHECKING(system mail directory)
-if test -d /var/mail -a '!' -h /var/mail ; then
-	system_mail_dir=/var/mail
-else
-	system_mail_dir=/var/spool/mail
-fi
-AC_DEFINE_UNQUOTED(SYSTEM_MAIL_DIR, "$system_mail_dir", [Directory local mail is delivered to])
-
-case `ls -ld $system_mail_dir 2>&1 | awk '{print $1;}'` in
-d??????rw?)
-	CAMEL_LOCK_HELPER_USER=""
-	CAMEL_LOCK_HELPER_GROUP=""
-	system_mail_perm="world writable"
-	;;
-
-d???rw????)
-	CAMEL_LOCK_HELPER_USER=""
-	CAMEL_LOCK_HELPER_GROUP=`ls -ld $system_mail_dir 2>&1 | awk '{print $4;}'`
-	system_mail_perm="writable by group $CAMEL_LOCK_HELPER_GROUP"
-	;;
-
-drw???????)
-	CAMEL_LOCK_HELPER_USER=`ls -ld $system_mail_dir 2>&1 | awk '{print $3;}'`
-	CAMEL_LOCK_HELPER_GROUP=""
-	system_mail_perm="writable by user $CAMEL_LOCK_HELPER_USER"
-	;;
-
-*)
-	CAMEL_LOCK_HELPER_USER=""
-	CAMEL_LOCK_HELPER_GROUP=""
-	system_mail_perm="???"
-	;;
-esac
-
-AC_MSG_RESULT([$system_mail_dir, $system_mail_perm])
-AC_SUBST(CAMEL_LOCK_HELPER_USER)
-AC_SUBST(CAMEL_LOCK_HELPER_GROUP)
-
-
-dnl ***************
-dnl Timezone checks
-dnl ***************
-AC_CACHE_CHECK(for tm_gmtoff in struct tm, ac_cv_struct_tm_gmtoff,
-	AC_TRY_COMPILE([
-		#include <time.h>
-		], [
-		struct tm tm;
-		tm.tm_gmtoff = 1;
-		], ac_cv_struct_tm_gmtoff=yes, ac_cv_struct_tm_gmtoff=no))
-if test $ac_cv_struct_tm_gmtoff = yes; then
-	AC_DEFINE(HAVE_TM_GMTOFF, 1, [Define if struct tm has a tm_gmtoff member])
-else
-	AC_CACHE_CHECK(for timezone variable, ac_cv_var_timezone,
-		AC_TRY_COMPILE([
-			#include <time.h>
-		], [
-			timezone = 1;
-		], ac_cv_var_timezone=yes, ac_cv_var_timezone=no))
-	if test $ac_cv_var_timezone = yes; then
-		AC_DEFINE(HAVE_TIMEZONE, 1, [Define if libc defines a timezone variable])
-		AC_CACHE_CHECK(for altzone variable, ac_cv_var_altzone,
-			AC_TRY_COMPILE([
-				#include <time.h>
-			], [
-				altzone = 1;
-			], ac_cv_var_altzone=yes, ac_cv_var_altzone=no))
-		if test $ac_cv_var_altzone = yes; then
-			AC_DEFINE(HAVE_ALTZONE, 1, [Define if libc defines an altzone variable])
-		fi
-	else
-		AC_ERROR(unable to find a way to determine timezone)
-	fi
-fi
-
-
-AC_CHECK_FUNCS(mkstemp mkdtemp isblank)
-
-dnl **************************************************
-dnl ctime_r prototype
-dnl **************************************************
-
-AC_CACHE_CHECK([if ctime_r wants three arguments], ac_cv_ctime_r_three_args,
-[
-	AC_TRY_COMPILE([
-		#include <time.h>
-	],[
-		char *buf;
-		time_t date;
-		ctime_r (&date, buf, 100);
-	],[
-		ac_cv_ctime_r_three_args=yes
-	],[
-		ac_cv_ctime_r_three_args=no
-	])
-])
-	
-if test x"$ac_cv_ctime_r_three_args" = xyes ; then
-	AC_DEFINE(CTIME_R_THREE_ARGS, 1, [Solaris-style ctime_r])
-fi
-
-dnl **************************************************
-dnl gethostbyname_r prototype
-dnl **************************************************
-
-AC_CHECK_FUNCS(gethostbyname_r,[
-AC_CACHE_CHECK([if gethostbyname_r wants five arguments], ac_cv_gethostbyname_r_five_args,
-[
-	AC_TRY_COMPILE([
-		#include "confdefs.h"
-		#include <sys/types.h>
-		#include <sys/socket.h>
-		#include <netinet/in.h>
-		#include <netdb.h>
-
-		#define BUFSIZE (sizeof(struct hostent)+10)
-	],[
-		struct hostent hent;
-		char buffer[BUFSIZE];
-		int bufsize=BUFSIZE;
-		int h_errno;
-
-		(void)gethostbyname_r ("www.ximian.com", &hent, buffer, bufsize, &h_errno);
-	],[
-		ac_cv_gethostbyname_r_five_args=yes
-	],[
-		ac_cv_gethostbyname_r_five_args=no
-	])
-])])
-	
-if test "x$ac_cv_gethostbyname_r_five_args" = "xyes" ; then
-	AC_DEFINE(GETHOSTBYNAME_R_FIVE_ARGS, 1, [Solaris-style gethostbyname_r])
-fi
-
-dnl **************************************************
-dnl gethostbyaddr_r prototype
-dnl **************************************************
-
-AC_CHECK_FUNCS(gethostbyaddr_r,[
-AC_CACHE_CHECK([if gethostbyaddr_r wants seven arguments], ac_cv_gethostbyaddr_r_seven_args,
-[
-	AC_TRY_COMPILE([
-		#include "confdefs.h"
-		#include <sys/types.h>
-		#include <sys/socket.h>
-		#include <netinet/in.h>
-		#include <netdb.h>
-
-		#define BUFSIZE (sizeof(struct hostent)+10)
-	],[
-		struct hostent hent;
-		char buffer[BUFSIZE];
-		int bufsize=BUFSIZE;
-		int h_errno;
-
-		(void)gethostbyaddr_r ("www.ximian.com", 14, AF_INET, &hent, buffer, bufsize, &h_errno);
-	],[
-		ac_cv_gethostbyaddr_r_seven_args=yes
-	],[
-		ac_cv_gethostbyaddr_r_seven_args=no
-	])
-])])
-	
-if test "x$ac_cv_gethostbyaddr_r_seven_args" = "xyes" ; then
-	AC_DEFINE(GETHOSTBYADDR_R_SEVEN_ARGS, 1, [Solaris-style gethostbyaddr_r])
-fi
-
-dnl **************************************************
-dnl stat(v)fs location/type
-dnl **************************************************
-
-AC_CHECK_HEADERS(sys/statvfs.h)
-AC_CHECK_FUNCS(statvfs)
-AC_CHECK_HEADERS(sys/param.h)
-AC_CHECK_HEADERS(sys/mount.h)
-AC_CHECK_FUNCS(statfs)
-
-dnl **************************************************
-dnl * Gnome Icon Theme
-dnl **************************************************
-PKG_CHECK_MODULES(GIT, gnome-icon-theme >= 1.2.0)
-
-dnl **************************************************
-dnl * Accessibility support
-dnl **************************************************
-PKG_CHECK_MODULES(A11Y, atk)
-AC_SUBST(A11Y_CFLAGS)
-AC_SUBST(A11Y_LIBS)
-
-dnl **************************************************
-dnl * IPv6 support and getaddrinfo calls
-dnl **************************************************
-AC_CACHE_CHECK([if system supports getaddrinfo and getnameinfo], have_addrinfo,
-[
-	AC_TRY_COMPILE([
-		#include "confdefs.h"
-		#include <sys/types.h>
-		#include <sys/socket.h>
-		#include <netinet/in.h>
-		#include <netdb.h>
-
-	],[
-		struct addrinfo hints, *res;
-		struct sockaddr_in6 sin6;
-		int af = AF_INET6;
-		char host[NI_MAXHOST];
-		char serv[NI_MAXSERV];
-
-		getaddrinfo ("www.ximian.com", NULL, &hints, &res);
-		freeaddrinfo (res);
-		getnameinfo((struct sockaddr *)&sin6, sizeof(sin6), host, sizeof(host), serv, sizeof(serv), 0);
-	],[
-		have_addrinfo=yes
-	],[
-		have_addrinfo=no
-	])
-])
-
-if test x"$have_addrinfo" = "xno" ; then
-   AC_DEFINE(NEED_ADDRINFO,1,[Enable getaddrinfo emulation])
-   if test x"$enable_ipv6" = "xyes" ; then
-      AC_ERROR(system doesn't support necessary interfaces for ipv6 support)
-   fi
-   msg_ipv6=no
-else
-   AC_ARG_ENABLE(ipv6, [  --enable-ipv6=[no/yes]      Enable support for resolving IPv6 addresses.],,enable_ipv6=yes)
-   if test x"$enable_ipv6" = "xyes"; then
-        msg_ipv6=yes
-	AC_DEFINE(ENABLE_IPv6,1,[Enable IPv6 support])
-	AC_TRY_COMPILE([
-		#include "confdefs.h"
-		#include <sys/types.h>
-		#include <sys/socket.h>
-		#include <netinet/in.h>
-		#include <netdb.h>
-
-	],[
-		struct addrinfo hints;
-		
-		hints.ai_flags = AI_ADDRCONFIG;
-	],[
-		AC_DEFINE(HAVE_AI_ADDRCONFIG,1,[Define if the system defines the AI_ADDRCONFIG flag for getaddrinfo])
-	])
-   else
-	msg_ipv6=no
-   fi
-fi
-
-AM_CONDITIONAL(ENABLE_IPv6, test "x$enable_ipv6" = "xyes")
-
-dnl **************************************************
-dnl LDAP support.
-dnl **************************************************
-EVO_LDAP_CHECK(no)
-case $with_openldap in
-no)
-	msg_ldap=no
-	;;
-*)
-	case $with_static_ldap in
-	yes)
-		msg_ldap="yes (static)"
-		;;
-	*)
-		msg_ldap="yes (dynamic)"
-		;;
-	esac
-esac
-
-dnl **************************************************
-dnl NNTP support.
-dnl **************************************************
-AC_ARG_ENABLE(nntp, 
-[  --enable-nntp=[no/yes]      Build Usenet news (NNTP) backend],,enable_nntp=yes)
-if test "x$enable_nntp" = "xyes"; then
-	AC_DEFINE(ENABLE_NNTP,1,[Build NNTP backend])
-	msg_nntp=yes
-else
-	msg_nntp=no
-fi
-AM_CONDITIONAL(ENABLE_NNTP, test x$enable_nntp = xyes)
-
-dnl **************************************************
-dnl New IMAP code support.
-dnl **************************************************
-AC_ARG_ENABLE(imapp, 
-[  --enable-imapp=[no/yes]      Attempt to compile alternative, incomplete, very unsupported IMAPv4r1 code],,enable_imapp=no)
-if test "x$enable_imapp" = "xyes"; then
-	AC_DEFINE(ENABLE_IMAPP,1,[Really don't try this at home])
-	msg_imapp=yes
-else
-	msg_imapp=no
-fi
-AM_CONDITIONAL(ENABLE_IMAPP, test x$enable_imapp = xyes)
-
-dnl **************************************************
-dnl New IMAP code support.
-dnl **************************************************
-AC_ARG_ENABLE(imap4, 
-[  --enable-imap4=[no/yes]      Attempt to compile yet another, incomplete, very unsupported IMAPv4r1 implementation],,enable_imap4="yes")
-if test "x$enable_imap4" = "xyes"; then
-	AC_DEFINE(ENABLE_IMAP4,1,[Really don't try this at home])
-	msg_imap4=yes
-else
-	msg_imap4=no
-fi
-AM_CONDITIONAL(ENABLE_IMAP4, test x$enable_imap4 = xyes)
-
-dnl **************************************************
-dnl * Posix thread support
-dnl **************************************************
-
-dnl GLIB_CONFIG=${GLIB_CONFIG-glib-config}
-dnl GNOME_PTHREAD_CHECK
-
-dnl if test "x$PTHREAD_LIB" = "x" ; then
-dnl 	AC_MSG_ERROR([POSIX threads are currently required for Evolution])
-dnl fi
-
-dnl
-dnl Notice that this is a hack, and we wont be able to use this forever, but
-dnl at least for some time
-dnl
-
-EVO_PTHREAD_CHECK
-
-THREADS_LIBS="$PTHREAD_LIB"
-THREADS_CFLAGS="$PTHREAD_CFLAGS"
-
-AC_SUBST(THREADS_LIBS)
-AC_SUBST(THREADS_CFLAGS)
-AC_DEFINE(ENABLE_THREADS,1,[Required])
-
-
-dnl **************************************************
-dnl * File locking
-dnl **************************************************
-
-AC_ARG_ENABLE(dot-locking, 
-[  --enable-dot-locking=[yes/no] Enable support for locking mail files with dot locking],,enable_dot_locking=yes)
-if test "x$enable_dot_locking" = "xyes"; then
-  AC_DEFINE(USE_DOT,1,[Define to use dot locking for mbox files])
-  msg_dot=yes
-else
-  msg_dot=no	
-fi
-
-AC_ARG_ENABLE(file-locking, 
-[  --enable-file-locking=[fcntl/flock/no] Enable support for locking mail files with file locking],,enable_file_locking=fcntl)
-if test "x$enable_file_locking" = "xfcntl"; then
-  AC_DEFINE(USE_FCNTL,1,[Define to use fcntl locking for mbox files])
-  msg_file=fcntl
-else
-  if test "x$enable_file_locking" = "xflock"; then
-    AC_DEFINE(USE_FLOCK,1,[Define to use flock locking for mbox files])
-    msg_file=flock
-  else
-    msg_file=no	
-  fi
-fi
-
-
-dnl **************************************************
-dnl * sendmail operation
-dnl **************************************************
-
-AC_MSG_CHECKING(for SunOS broken spool format)
-if test "x$host_os" = "xsunos" ; then
-   with_broken_spool="yes"
-fi
-
-AC_ARG_WITH(broken-spool, 
-[  --with-broken-spool=[yes/no] Using SunOS/Solaris sendmail which has a broken spool format],,with_broken_spool=${with_broken_spool:=no})
-
-if test "x$with_broken_spool" = "xyes"; then
-  AC_DEFINE(HAVE_BROKEN_SPOOL,1,[Define if mail delivered to the system mail directory is in broken Content-Length format])
-fi
-
-AC_MSG_RESULT($with_broken_spool)
-
-
-dnl *********
-dnl Libraries
-dnl *********
-
-PKG_CHECK_MODULES(GTKHTML, libgtkhtml-3.8)
-AC_SUBST(GTKHTML_CFLAGS)
-AC_SUBST(GTKHTML_LIBS)
-GTKHTML_DATADIR=`$PKG_CONFIG --variable gtkhtml_datadir libgtkhtml-3.8`
-AC_SUBST(GTKHTML_DATADIR)
-GTKHTML_API_VERSION=`$PKG_CONFIG --variable gtkhtml_apiversion libgtkhtml-3.8`
-AC_DEFINE_UNQUOTED(GTKHTML_API_VERSION, "$GTKHTML_API_VERSION", [The gtkhtml api version])
-
-
-
-
-dnl ******************************
-dnl Pilot checking
-dnl ******************************
-AC_ARG_ENABLE(pilot-conduits, 
-[  --enable-pilot-conduits=[no/yes] Enable support for building pilot conduits.],,enable_pilot_conduits=no)
-if test "x$enable_pilot_conduits" = "xyes"; then
-	PKG_CHECK_MODULES(GNOME_PILOT, gnome-pilot-2.0)
-
-	CFLAGS_save="$CFLAGS"
-	CFLAGS="$CFLAGS $GNOME_PILOT_CFLAGS"
-	LDFLAGS_save="$LDFLAGS"
-	LDFLAGS="$LDFLAGS $GNOME_PILOT_LIBS"
-
-	AC_CACHE_CHECK([if pilot-link handles UTF-8 conversions], ac_cv_pilot_link_utf8, AC_TRY_RUN([
-
-#include <stdlib.h>
-#include <string.h>
-#include <pi-util.h>
-
-int main (int argc, char **argv)
-{
-	const char *utf8 = "\x66\x66\x66\x66\x66\x66\x66\xC2\xA9";
-	size_t utf8_real_len = strlen (utf8);
-	char *pstring;	
-
-	if (convert_ToPilotChar ("UTF-8", utf8, utf8_real_len, &pstring) == -1)
-		exit (1);
-
-	exit (0);
-}
-], ac_cv_pilot_link_utf8=yes, ac_cv_pilot_link_utf8=no, ac_cv_pilot_link_utf8=no))
-
-	CFLAGS="$CFLAGS_save"
-	LDFLAGS="$LDFLAGS_save"
-
-	if test "$ac_cv_pilot_link_utf8" = no; then
-		AC_MSG_ERROR(evolution requires pilot-link to have working UTF-8 conversion routines)
-	fi
-fi
-AM_CONDITIONAL(ENABLE_PILOT_CONDUITS, test "x$enable_pilot_conduits" = "xyes")
-if test x$enable_pilot_conduits = xyes; then
-   msg_pilot=yes
-else
-   msg_pilot=no
-fi
-AC_SUBST(GNOME_PILOT_CFLAGS)
-AC_SUBST(GNOME_PILOT_LIBS)
-
-dnl ********
-dnl Kerberos
-dnl ********
-AC_ARG_WITH(krb5, [  --with-krb5=DIR      Location of Kerberos 5 install dir], with_krb5="$withval", with_krb5="no")
-AC_ARG_WITH(krb5-libs, [  --with-krb5-libs=DIR Location of Kerberos 5 libraries], with_krb5_libs="$withval", with_krb5_libs="$with_krb5/lib")
-AC_ARG_WITH(krb5-includes, [  --with-krb5-includes=DIR Location of Kerberos 5 headers], with_krb5_includes="$withval", with_krb5_includes="")
-AC_ARG_WITH(krb4, [  --with-krb4=DIR      Location of Kerberos 4 install dir], with_krb4="$withval", with_krb4="no")
-AC_ARG_WITH(krb4-libs, [  --with-krb4-libs=DIR Location of Kerberos 4 libraries], with_krb4_libs="$withval", with_krb4_libs="$with_krb4/lib")
-AC_ARG_WITH(krb4-includes, [  --with-krb4-includes=DIR Location of Kerberos 4 headers], with_krb4_includes="$withval", with_krb4_includes="")
-
-
-msg_krb5="no"
-if test "x${with_krb5}" != "xno"; then
-	LDFLAGS_save="$LDFLAGS"
-	
-	mitlibs="-lkrb5 -lk5crypto -lcom_err -lgssapi_krb5"
-	heimlibs="-lkrb5 -lcrypto -lasn1 -lcom_err -lroken -lgssapi"
-	AC_CACHE_CHECK([for Kerberos 5], ac_cv_lib_kerberos5,
-	[
-		LDFLAGS="$LDFLAGS -L$with_krb5_libs $mitlibs"
-		AC_TRY_LINK_FUNC(krb5_init_context, ac_cv_lib_kerberos5="$mitlibs",
-		[
-			LDFLAGS="$LDFLAGS_save -L$with_krb5_libs $heimlibs"
-			AC_TRY_LINK_FUNC(krb5_init_context, ac_cv_lib_kerberos5="$heimlibs", ac_cv_lib_kerberos5="no")
-		])
-		LDFLAGS="$LDFLAGS_save"
-	])
-	if test "$ac_cv_lib_kerberos5" != "no"; then
-		AC_DEFINE(HAVE_KRB5,1,[Define if you have Krb5])
-		if test "$ac_cv_lib_kerberos5" = "$mitlibs"; then
-			AC_DEFINE(HAVE_MIT_KRB5,1,[Define if you have MIT Krb5])
-			if test -z "$with_krb5_includes"; then
-				KRB5_CFLAGS="-I$with_krb5/include"
-			else
-				KRB5_CFLAGS="-I$with_krb5_includes"
-			fi
-			msg_krb5="yes (MIT)"
-		else
-			AC_DEFINE(HAVE_HEIMDAL_KRB5,1,[Define if you have Heimdal])
-			if test -z "$with_krb5_includes"; then
-				KRB5_CFLAGS="-I$with_krb5/include/heimdal"
-			else
-				KRB5_CFLAGS="-I$with_krb5_includes"
-			fi
-			msg_krb5="yes (Heimdal)"
-		fi
-		KRB5_LDFLAGS="-L$with_krb5_libs $ac_cv_lib_kerberos5"
-	fi
-else
-	AC_MSG_CHECKING(for Kerberos 5)
-	AC_MSG_RESULT($with_krb5)
-fi
-
-AC_CHECK_HEADER([et/com_err.h],[AC_DEFINE([HAVE_ET_COM_ERR_H], 1, [Have et/comm_err.h])])
-AC_CHECK_HEADER([com_err.h],[AC_DEFINE([HAVE_COM_ERR_H], 1, [Have comm_err.h])])
-
-msg_krb4="no"
-if test "x${with_krb4}" != "xno"; then
-	LDFLAGS_save="$LDFLAGS"
-	AC_CACHE_CHECK(for Kerberos 4, ac_cv_lib_kerberos4,
-	[
-		ac_cv_lib_kerberos4="no"
-
-		mitcompatlibs="-lkrb4 -ldes425 -lkrb5 -lk5crypto -lcom_err"
-		# Look for MIT krb5 compat krb4
-		LDFLAGS="$LDFLAGS -L$with_krb4_libs $mitcompatlibs"
-		AC_TRY_LINK_FUNC(krb_mk_req, ac_cv_lib_kerberos4="$mitcompatlibs")
-		
-		if test "$ac_cv_lib_kerberos4" = "no"; then
-			# Look for KTH krb4
-			LDFLAGS="$LDFLAGS_save -L$with_krb4_libs -lkrb -lcrypto -lcom_err -lroken"
-			AC_TRY_LINK_FUNC(krb_mk_req, ac_cv_lib_kerberos4="-lkrb -lcrypto -lcom_err -lroken")
-		fi
-		if test "$ac_cv_lib_kerberos4" = "no"; then
-			# Look for old MIT krb4
-			LDFLAGS="$LDFLAGS_save -L$with_krb4_libs -lkrb"
-			AC_TRY_LINK_FUNC(krb_mk_req, ac_cv_lib_kerberos4="-lkrb",
-			[
-				LDFLAGS="$LDFLAGS -ldes"
-				AC_TRY_LINK_FUNC(krb_mk_req, ac_cv_lib_kerberos4="-lkrb -ldes")
-			])
-		fi
-	])
-	LDFLAGS="$LDFLAGS_save"
-	if test "$ac_cv_lib_kerberos4" != "no"; then
-		AC_DEFINE(HAVE_KRB4,1,[Define if you have Krb4])
-		msg_krb4="yes"
-
-		if test -z "$with_krb4_includes"; then
-			if test -f "$with_krb4/include/krb.h" -o -f "$with_krb4/include/port-sockets.h"; then
-				KRB4_CFLAGS="-I$with_krb4/include"
-			fi
-			if test -d "$with_krb4/include/kerberosIV"; then
-				KRB4_CFLAGS="$KRB4_CFLAGS -I$with_krb4/include/kerberosIV"
-			fi
-		else
-			KRB4_CFLAGS="-I$with_krb4_includes"
-		fi
-		KRB4_LDFLAGS="-L$with_krb4_libs $ac_cv_lib_kerberos4"
-		
-		CFLAGS_save="$CFLAGS"
-		CFLAGS="$CFLAGS $KRB4_CFLAGS"
-		AC_TRY_COMPILE([#include "krb.h"
-		int krb_sendauth;
-		],[return 0],[AC_DEFINE(NEED_KRB_SENDAUTH_PROTO,1,[Need krb_sendauth proto])],)
-		CFLAGS="$CFLAGS_save"
-	fi
-else
-	AC_MSG_CHECKING(for Kerberos 4)
-	AC_MSG_RESULT(${with_krb4})
-fi
-
-AC_SUBST(KRB5_CFLAGS)
-AC_SUBST(KRB5_LDFLAGS)
-AC_SUBST(KRB4_CFLAGS)
-AC_SUBST(KRB4_LDFLAGS)
-
-dnl Mono hooks
-
-AC_ARG_ENABLE(mono, [  --enable-mono=[yes,no]        Add Mono embedded hooks.],
-	enable_mono="$enableval", enable_mono="no")
-
-if test "x${enable_mono}" = "xyes"; then
-	AC_DEFINE(ENABLE_MONO,1,[Define if Mono embedding should be enabled])
-	mono_package="mono"
-fi
-AM_CONDITIONAL(ENABLE_MONO, test x$enable_mono = xyes)
-
-dnl ********************************************************************************
-dnl security extension support (SSL and S/MIME)
-dnl
-dnl The following voodoo does detection of mozilla libraries (nspr and nss) 
-dnl needed by Camel (SSL and S/MIME).
-dnl
-dnl The Evolution security extensions are only built if these libraries are found
-dnl ********************************************************************************
-msg_ssl="no"
-msg_smime="no"
-
-dnl these 2 enable's are inverses of each other
-AC_ARG_ENABLE(nss, [  --enable-nss=[yes,no,static]        Attempt to use Mozilla libnss for SSL support.],
-	enable_nss="$enableval", enable_nss="yes")
-
-AC_ARG_ENABLE(smime, [ --enable-smime=[yes,no]            Attempt to use Mozilla libnss for SMIME support (this requires --enable-nss)],
-	enable_smime="$enableval", enable_smime="yes")
-
-dnl ***********************************************************************************************************
-dnl OpenSSL is no longer available. DO NOT USE IT!!! The OpenSSL camel code is known to have security problems, 
-dnl it doesn't work, it doesn't build, it is never tested, and to top it all off, it is not GPL compatable.
-dnl ***********************************************************************************************************
-dnl
-dnl AC_ARG_ENABLE(openssl, [  --enable-openssl=[no,yes]        Attempt to use OpenSSL for SSL support.],
-dnl 	enable_openssl="$enableval", enable_openssl="no")
-dnl 
-dnl if test "x${enable_openssl}" = "xyes"; then
-dnl User wants to override nss with OpenSSL
-dnl 	enable_nss="no"
-dnl 	AC_MSG_WARN([OpenSSL enabled, disabling NSS.])
-dnl fi
-
-AC_ARG_WITH(nspr-includes, [  --with-nspr-includes=PREFIX	Location of Mozilla nspr4 includes.],
-	with_nspr_includes="$withval")
-
-AC_ARG_WITH(nspr-libs, [  --with-nspr-libs=PREFIX       	Location of Mozilla nspr4 libs.],
-	with_nspr_libs="$withval")
-
-AC_ARG_WITH(nss-includes, [  --with-nss-includes=PREFIX 	Location of Mozilla nss3 includes.],
-	with_nss_includes="$withval")
-
-AC_ARG_WITH(nss-libs, [  --with-nss-libs=PREFIX         	Location of Mozilla nss3 libs.],
-	with_nss_libs="$withval")
-
-if test "x${enable_nss}" = "xyes" || test "x${enable_nss}" = "xstatic"; then
-	if test -n "${with_nspr_includes}" || test -n "${with_nspr_libs}" || test -n "${with_nss_includes}" || test -n "${with_nss_libs}" || test "x${enable_nss}" = "xstatic"; then
-dnl If the user specifies --with-foo or --enable-nss=static, then we have to do this manually
-		check_manually="yes"
-	else
-		check_manually="no"
-	fi
-	
-	if test "x${check_manually}" = "xno" && `$PKG_CONFIG --exists mozilla-nss`; then
-		PKG_CHECK_MODULES(NSS, mozilla-nss, have_nss="yes")
-		if test "x${have_nss}" = "xyes"; then
-			msg_ssl="yes (Mozilla NSS)"
-			if test "x$enable_smime" = "xyes"; then
-				AC_DEFINE(ENABLE_SMIME,1,[Define if SMIME should be enabled])
-				msg_smime="yes (Mozilla NSS)"
-			fi				    
-			mozilla_nspr="mozilla-nspr"
-			mozilla_nss="mozilla-nss"
-			AC_DEFINE(HAVE_NSS,1,[Define if you have NSS])
-			AC_DEFINE(HAVE_SSL,1,[Define if you have a supported SSL library])
-			MANUAL_NSPR_CFLAGS=""
-			MANUAL_NSPR_LIBS=""
-			MANUAL_NSS_CFLAGS=""
-			MANUAL_NSS_LIBS=""
-		else
-			check_manually="yes"
-		fi
-	fi
-	
-	if test "x${check_manually}" = "xyes"; then
-		mozilla_nss=""
-		have_nspr_includes="no"
-		if test "x${with_nspr_includes}" != "xno"; then
-			CPPFLAGS_save="$CPPFLAGS"
-			
-			AC_MSG_CHECKING(for Mozilla nspr4 includes in $with_nspr_includes)
-			AC_MSG_RESULT("")
-			
-			CPPFLAGS="$CPPFLAGS -I$with_nspr_includes"
-			AC_CHECK_HEADERS(nspr.h prio.h, [ moz_nspr_includes="yes" ])
-			CPPFLAGS="$CPPFLAGS_save"
-			
-			if test "x{$moz_nspr_includes}" != "xno" -a "x{$moz_nspr_includes}" != "x" ; then
-				have_nspr_includes="yes"
-				MANUAL_NSPR_CFLAGS="-I$with_nspr_includes"
-			fi
-		else
-			AC_MSG_CHECKING(for Mozilla nspr4 includes)
-			AC_MSG_RESULT(no)
-		fi
-		
-		have_nspr_libs="no"
-		if test "x${with_nspr_libs}" != "xno" -a "x${have_nspr_includes}" != "xno"; then
-			CFLAGS_save="$CFLAGS"
-			LDFLAGS_save="$LDFLAGS"
-			
-			if test "$enable_nss" = "static"; then
-				if test -z "${with_nspr_libs}"; then
-					AC_MSG_ERROR([Static linkage requested, but path to nspr libraries not set.]
-[Please specify the path to libnspr4.a]
-[Example: --with-nspr-libs=/usr/lib])
-       				else
-	       				nsprlibs="-ldl $with_nspr_libs/libplc4.a $with_nspr_libs/libplds4.a $with_nspr_libs/libnspr4.a $PTHREAD_LIB"
-				fi
-			else
-				nsprlibs="-ldl -lplc4 -lplds4 -lnspr4 $PTHREAD_LIB"
-			fi
-			
-			AC_CACHE_CHECK([for Mozilla nspr libraries], moz_nspr_libs,
-			[
-		       		LIBS_save="$LIBS"
-				CFLAGS="$CFLAGS $MANUAL_NSPR_CFLAGS"
-				
-				if test "x${with_nspr_libs}" != "x"; then
-		       			LIBS="$nsprlibs"
-		       			LDFLAGS="$LDFLAGS -L$with_nspr_libs"
-				else
-		       			LIBS="$nsprlibs"
-		       			LDFLAGS="$LDFLAGS"
-				fi
-				
-				AC_TRY_LINK_FUNC(PR_Init, moz_nspr_libs="yes", moz_nspr_libs="no")
-				CFLAGS="$CFLAGS_save"
-				LDFLAGS="$LDFLAGS_save"
-	 			LIBS="$LIBS_save"
-			])
-			if test "x$moz_nspr_libs" != "xno"; then
-				have_nspr_libs="yes"
-				MANUAL_NSPR_LIBS="-L$with_nspr_libs $nsprlibs"
-			else
-				MANUAL_NSPR_CLFAGS=""
-			fi
-		else
-			AC_MSG_CHECKING(for Mozilla nspr4 libraries)
-			AC_MSG_RESULT(no)
-		fi
-		
-		if test "x${with_nss_includes}" != "xno" -a "x${have_nspr_libs}" != "xno"; then
-			CPPFLAGS_save="$CPPFLAGS"
-			
-			AC_MSG_CHECKING(for Mozilla nss3 includes in $with_nss_includes)
-			AC_MSG_RESULT("")
-			
-			if test "x${with_nspr_includes}" != "x"; then
-				CPPFLAGS="$CPPFLAGS -I$with_nspr_includes -I$with_nss_includes"
-			else
-				CPPFLAGS="$CPPFLAGS -I$with_nss_includes"
-			fi
-			
-			AC_CHECK_HEADERS(nss.h ssl.h smime.h,
-				[ have_nss_includes="yes" ], 
-				[ have_nss_includes="no" ])
-			
-			CPPFLAGS="$CPPFLAGS_save"
-			
-			if test "x${have_nss_includes}" = "xyes"; then	
-				have_nss_includes="yes"
-				MANUAL_NSS_CFLAGS="-I$with_nss_includes"
-			else
-				MANUAL_NSPR_CFLAGS=""
-				MANUAL_NSPR_LIBS=""
-			fi
-		else
-			AC_MSG_CHECKING(for Mozilla nss3 includes)
-			AC_MSG_RESULT(no)
-		fi
-		
-		if test "x${with_nss_libs}" != "xno" -a "x${have_nss_includes}" != "xno"; then
-			LDFLAGS_save="$LDFLAGS"
-			
-			if test "$enable_nss" = "static"; then
-		    		if test -z "${with_nss_libs}"; then
-					AC_MSG_ERROR([Static linkage requested, but path to nss libraries not set.]
-[Please specify the path to libnss3.a]
-[Example: --with-nspr-libs=/usr/lib/mozilla])
-				else
-					nsslibs="-ldb1 $with_nss_libs/libnssckfw.a $with_nss_libs/libasn1.a $with_nss_libs/libcrmf.a $with_nss_libs/libswfci.a $with_nss_libs/libjar.a $with_nss_libs/libpkcs12.a $with_nss_libs/libpkcs7.a $with_nss_libs/libpki1.a $with_nss_libs/libsmime.a $with_nss_libs/libssl.a $with_nss_libs/libnss.a $with_nss_libs/libpk11wrap.a $with_nss_libs/libsoftokn.a $with_nss_libs/libfreebl.a $with_nss_libs/libnsspki.a $with_nss_libs/libnssdev.a $with_nss_libs/libcryptohi.a $with_nss_libs/libcerthi.a $with_nss_libs/libcertdb.a $with_nss_libs/libsecutil.a $with_nss_libs/libnssb.a"
-					case "$host" in
-						*solaris*)
-						nsslibs="$nsslibs $with_nss_libs/libfreebl.a"
-					;;
-					esac
-				fi
-			else
-		 		nsslibs="-lssl3 -lsmime3 -lnss3 -lsoftokn3"
-	 		fi	
-			
-			AC_CACHE_CHECK([for Mozilla nss libraries], moz_nss_libs,
-			[
-	 			LIBS_save="$LIBS"
-				LDFLAGS="$LDFLAGS -L$with_nspr_libs $nsprlibs -L$with_nss_libs $nsslibs"
-		      		LIBS="$nsslibs $nsprlibs"
-				AC_TRY_LINK_FUNC(NSS_Init, moz_nss_libs="yes", moz_nss_libs="no")
-				if test "$moz_nss_libs" = no; then
-					nsslibs="-lssl3 -lsmime3 -lnss3 -lsoftokn3"
-					LDFLAGS="$LDFLAGS -L$with_nspr_libs $nsprlibs -L$with_nss_libs $nsslibs"
-					AC_TRY_LINK_FUNC(NSS_Init, moz_nss_libs="yes", moz_nss_libs="no")	
-				fi
-				LDFLAGS="$LDFLAGS_save"
-	 			LIBS="$LIBS_save"
-			])
-			if test "$moz_nss_libs" != no; then
-				AC_DEFINE(HAVE_NSS)
-				AC_DEFINE(HAVE_SSL)
-				if test "$enable_nss" = "static"; then
-					msg_ssl="yes (Mozilla NSS:static)"
-		 		else
-					msg_ssl="yes (Mozilla NSS)"
-				fi # static_nss
-				if test "$enable_smime" = "yes"; then
-					AC_DEFINE(ENABLE_SMIME,1,[Define if SMIME should be enabled])
-					msg_smime="yes (Mozilla NSS)"
-				fi
-				MANUAL_NSS_LIBS="-L$with_nss_libs $nsslibs"
-			else
-				MANUAL_NSS_CFLAGS=""
-				MANUAL_NSPR_CFLAGS=""
-				MANUAL_NSPR_LIBS=""
-			fi
-		else
-			AC_MSG_CHECKING(for Mozilla nss libraries)
-			AC_MSG_RESULT(no)
-		fi
-		
-		MANUAL_NSS_CFLAGS="$MANUAL_NSPR_CFLAGS $MANUAL_NSS_CFLAGS"
-		MANUAL_NSS_LIBS="$MANUAL_NSPR_LIBS $MANUAL_NSS_LIBS"
-	fi
-fi
-
-AM_CONDITIONAL(ENABLE_SMIME, test "x$msg_smime" != "xno")
-
-AC_SUBST(MANUAL_NSPR_CFLAGS)
-AC_SUBST(MANUAL_NSPR_LIBS)
-AC_SUBST(MANUAL_NSS_CFLAGS)
-AC_SUBST(MANUAL_NSS_LIBS)
-
-dnl ******************
-dnl CDE dtappintegrate
-dnl ******************
-
-AC_ARG_WITH(cde-path, [  --with-cde-path=PATH   Location of CDE installation],
-	    [with_cde_path="$withval"])
-if test -z "$with_cde_path"; then
-	with_cde_path="/usr/dt"
-fi
-
-AC_MSG_CHECKING(for dtappintegrate)
-if test -x "$with_cde_path/bin/dtappintegrate" ; then
-	DTAPPINTEGRATE="$with_cde_path/bin/dtappintegrate"
-else
-	DTAPPINTEGRATE="no"
-fi
-AC_MSG_RESULT([$DTAPPINTEGRATE])
-
-AC_SUBST(DTAPPINTEGRATE)
-AM_CONDITIONAL(HAVE_DTAPPINTEGRATE, test "x$DTAPPINTEGRATE" != "xno")
-
-dnl *****************
-dnl killall or pkill?
-dnl *****************
-
-AC_MSG_CHECKING(for command to kill processes)
-
-if test `uname -s` = "SunOS" ; then
-	KILL_PROCESS_CMD="pkill";
-else
-	KILL_PROCESS_CMD="killall";
-fi
-
-KILL_PROCESS_CMD=`which $KILL_PROCESS_CMD`
-if test -z "$KILL_PROCESS_CMD" ; then
-	AC_MSG_RESULT(none)
-else
-	AC_MSG_RESULT($KILL_PROCESS_CMD)
-	AC_DEFINE_UNQUOTED([KILL_PROCESS_CMD], "$KILL_PROCESS_CMD", [Command to kill processes by name])
-fi
-
-dnl ******************************
-dnl OpenSSL
-dnl ******************************
-
-dnl only continue detecting OpenSSL if we haven't already found all of the
-dnl Mozilla libnss includes/libraries and if user actually wants ssl support
-dnl if test "$msg_ssl" = "no" -a "x${enable_openssl}" != "xno"; then
-dnl 	AC_ARG_WITH(openssl-includes, [  --with-openssl-includes=PREFIX     Location of OpenSSL includes.],
-dnl 		with_openssl_includes="$withval", with_openssl_includes="/usr/include")
-dnl 	have_openssl_includes="no"
-dnl 	if test "x${with_openssl_includes}" != "xno"; then
-dnl 		CPPFLAGS_save="$CPPFLAGS"
-dnl 		
-dnl 		AC_MSG_CHECKING(for OpenSSL includes)
-dnl 		AC_MSG_RESULT("")
-dnl 		
-dnl 		CPPFLAGS="$CPPFLAGS -I$with_openssl_includes"
-dnl 		AC_CHECK_HEADERS(openssl/ssl.h openssl/x509.h, [ openssl_includes="yes" ])
-dnl 		CPPFLAGS="$CPPFLAGS_save"
-dnl 		
-dnl 		if test "x{$openssl_includes}" != "xno" -a "x{$openssl_includes}" != "x"; then
-dnl 			have_openssl_includes="yes"
-dnl 			OPENSSL_CFLAGS="-I$with_openssl_includes"
-dnl 		else
-dnl 			OPENSSL_CFLAGS=""
-dnl 		fi
-dnl 	else
-dnl 		AC_MSG_CHECKING(for OpenSSL includes)
-dnl 		AC_MSG_RESULT(no)
-dnl 	fi
-dnl 	
-dnl 	AC_ARG_WITH(openssl-libs, [  --with-openssl-libs=PREFIX     	Location of OpenSSL libs.],
-dnl 		with_openssl_libs="$withval")
-dnl 	if test "x${with_openssl_libs}" != "xno" -a "x${have_openssl_includes}" != "xno"; then
-dnl 		LDFLAGS_save="$LDFLAGS"
-dnl 	
-dnl 		case $with_openssl_libs in
-dnl 		""|-L*) ;;
-dnl 		*) with_openssl_libs="-L$with_openssl_libs" ;;
-dnl 		esac
-dnl 	
-dnl 		AC_CHECK_LIB(dl, dlopen, DL_LDFLAGS="-ldl", DL_LDFLAGS="")
-dnl 		AC_CACHE_CHECK([for OpenSSL libraries], openssl_libs,
-dnl 		[
-dnl 			LDFLAGS="$LDFLAGS $with_openssl_libs -lssl -lcrypto $DL_LDFLAGS"
-dnl 			AC_TRY_LINK_FUNC(SSL_read, openssl_libs="yes", openssl_libs="no")
-dnl 			LDFLAGS="$LDFLAGS_save"
-dnl 		])
-dnl 		if test "x${openssl_libs}" != "xno"; then
-dnl 			AC_DEFINE(HAVE_OPENSSL,1,[Define if you have OpenSSL])
-dnl 			AC_DEFINE(HAVE_SSL)
-dnl 			msg_ssl="yes (OpenSSL)"
-dnl 			OPENSSL_LDFLAGS="$with_openssl_libs -lssl -lcrypto $DL_LDFLAGS"
-dnl 		else
-dnl 			OPENSSL_CFLAGS=""
-dnl 			OPENSSL_LDFLAGS=""
-dnl 		fi
-dnl 	else
-dnl 		AC_MSG_CHECKING(for OpenSSL libraries)
-dnl 		AC_MSG_RESULT(no)
-dnl 	fi
-dnl else
-dnl 	OPENSSL_CFLAGS=""
-dnl 	OPENSSL_LDFLAGS=""
-dnl 
-dnl 
-dnl AC_SUBST(OPENSSL_CFLAGS)
-dnl AC_SUBST(OPENSSL_LDFLAGS)
-
-dnl *******************
-dnl GObject marshalling
-dnl *******************
-AM_PATH_GLIB_2_0
-
-dnl We use AC_SUBST_FILE because AC_SUBST won't deal with newlines
-EVO_MARSHAL_RULE=$srcdir/marshal.mk
-AC_SUBST_FILE(EVO_MARSHAL_RULE)
-
-dnl *************************
-dnl CFLAGS and LIBS and stuff
-dnl *************************
-
-GNOME_COMPILE_WARNINGS(yes)
-CFLAGS="$CFLAGS $WARN_CFLAGS"
-case $CFLAGS in
-*-Wall*)
-	# Turn off the annoying "comparison between signed and unsigned"
-	# warning in gcc 3.3
-	CFLAGS="$CFLAGS -Wno-sign-compare"
-	;;
-esac
-
-AM_PATH_ORBIT2(2.9.8)
-
-AC_MSG_CHECKING(for CORBA include paths)
-IDL_INCLUDES="-I "`pkg-config --variable=idldir libbonobo-2.0`" -I "`pkg-config --variable=idldir bonobo-activation-2.0`" -I "`pkg-config --variable=idldir evolution-data-server-1.2`
-AC_MSG_RESULT($IDL_INCLUDES)
-AC_SUBST(IDL_INCLUDES)
-
-dnl Utility macro to set compiler flags for a specific lib.
-AC_DEFUN(EVO_SET_COMPILE_FLAGS, [
-	deps="$2"
-	extra_cflags="$3"
-	extra_libs="$4"
-	PKG_CHECK_MODULES(EVOLUTION, $deps)
-	$1_CFLAGS="$EVOLUTION_CFLAGS \$(WERROR) $extra_cflags"
-	$1_LIBS="$EVOLUTION_LIBS $extra_libs"
-])
-
-dnl enable USE_GTKFILECHOOSER if gtk version is > 2.4.0
-AC_ARG_ENABLE(file-chooser, [  --enable-file-chooser    Enable the usage of the GtkFileChooser in place of the GtkFileSelection dialog], enable_file_chooser="$enableval", enable_file_chooser="yes")
-if test "x$enable_file_chooser" = "xyes"; then
-  if pkg-config --atleast-version=2.4.0 gtk+-2.0; then
-    AC_DEFINE(USE_GTKFILECHOOSER,1,[Use new GtkFileChooser])
-  fi
-fi
-
-dnl --- Required version numbers
-
-GAL_REQUIRED=2.4.0
-GAL_PACKAGE=2.4
-GTKHTML_REQUIRED=3.7.0
-GTKHTML_PACKAGE=3.8
-EDS_REQUIRED=1.2.0
-EDS_PACKAGE=1.2
-BONOBOUI_REQUIRED=2.4.2
-GNOME_VFS_REQUIRED=2.4
-
-AC_SUBST(GAL_REQUIRED)
-AC_SUBST(GAL_PACKAGE)
-AC_SUBST(GTKHTML_REQUIRED)
-AC_SUBST(GTKHTML_PACKAGE)
-AC_SUBST(EDS_REQUIRED)
-AC_SUBST(EDS_PACKAGE)
-AC_SUBST(BONOBOUI_REQUIRED)
-AC_SUBST(GNOME_VFS_REQUIRED)
-
-dnl --- Flags to get all the GNOME stuff
-
-FULL_GNOME_DEPS="glib-2.0 libbonoboui-2.0 >= $BONOBOUI_REQUIRED gnome-vfs-2.0 >= $GNOME_VFS_REQUIRED libgnomeui-2.0 libglade-2.0 libgnomecanvas-2.0 libxml-2.0 gconf-2.0 gal-$GAL_PACKAGE >= $GAL_REQUIRED"
-
-EVO_SET_COMPILE_FLAGS(GNOME_FULL, $FULL_GNOME_DEPS)
-AC_SUBST(GNOME_FULL_CFLAGS)
-AC_SUBST(GNOME_FULL_LIBS)
-
-CPPFLAGS_save="$CPPFLAGS"
-CPPFLAGS="$CPPFLAGS `$PKG_CONFIG --cflags-only-I libgnomeui-2.0`"
-AC_CHECK_HEADERS(libgnomeui/gnome-icon-lookup.h)
-AC_CHECK_HEADERS(libgnomeui/gnome-thumbnail.h)
-CPPFLAGS="$CPPFLAGS_save"
-
-dnl --- Flags for the various libraries we build
-
-EVO_SET_COMPILE_FLAGS(CAMEL, camel-provider-$EDS_PACKAGE)
-AC_SUBST(CAMEL_CFLAGS)
-AC_SUBST(CAMEL_LIBS)
-
-EVO_SET_COMPILE_FLAGS(CAMEL_GROUPWISE, camel-provider-$EDS_PACKAGE libedataserver-$EDS_PACKAGE libegroupwise-$EDS_PACKAGE >= $EDS_REQUIRED)
-AC_SUBST(CAMEL_GROUPWISE_CFLAGS)
-AC_SUBST(CAMEL_GROUPWISE_LIBS)
-
-if test "x$mozilla_nss" != "x"; then
-   EVO_SET_COMPILE_FLAGS(MOZILLA_NSS, $mozilla_nss)
-   MOZILLA_L_DIR=`pkg-config --libs-only-L $mozilla_nss`
-else
-	if test "x$MOZILLA_MANUAL_LIBS" != "x"; then
-	   MOZILLA_L_DIR="-L$with_nss_lib"
-	fi
-fi
-
-EVO_SET_COMPILE_FLAGS(CERT_UI, glib-2.0 gobject-2.0 gthread-2.0,
-                      $MANUAL_NSS_CFLAGS $MOZILLA_NSS_CFLAGS,
-	              $MOZILLA_L_DIR $MANUAL_NSS_LIBS $MOZILLA_NSS_LIBS)
-AC_SUBST(CERT_UI_CFLAGS)
-AC_SUBST(CERT_UI_LIBS)
-
-EVO_SET_COMPILE_FLAGS(E_NAME, libgnomeui-2.0 libbonoboui-2.0 >= $BONOBOUI_REQUIRED gal-$GAL_PACKAGE >= $GAL_REQUIRED)
-AC_SUBST(E_NAME_CFLAGS)
-AC_SUBST(E_NAME_LIBS)
-
-EVO_SET_COMPILE_FLAGS(E_UTIL, gthread-2.0 gconf-2.0 libxml-2.0 libbonoboui-2.0 >= $BONOBOUI_REQUIRED libglade-2.0 gal-$GAL_PACKAGE >= $GAL_REQUIRED libgnomeui-2.0 libgnome-2.0 libgnomecanvas-2.0 libgnomeprintui-2.2 libedataserver-$EDS_PACKAGE libedataserverui-$EDS_PACKAGE >= $EDS_REQUIRED $mozilla_nspr $mono_package, $THREADS_CFLAGS $MANUAL_NSPR_CFLAGS, $THREADS_LIBS $MANUAL_NSPR_LIBS)
-AC_SUBST(E_UTIL_CFLAGS)
-AC_SUBST(E_UTIL_LIBS)
-
-EVO_SET_COMPILE_FLAGS(TZDIALOG, libecal-$EDS_PACKAGE >= $EDS_REQUIRED, $GNOME_FULL_CFLAGS, $GNOME_FULL_LIBS)
-AC_SUBST(TZDIALOG_CFLAGS)
-AC_SUBST(TZDIALOG_LIBS)
-
-EVO_SET_COMPILE_FLAGS(E_WIDGETS, glib-2.0 libbonoboui-2.0 >= $BONOBOUI_REQUIRED gnome-vfs-2.0 libgnomeui-2.0 libglade-2.0 libgnomecanvas-2.0 libxml-2.0 gconf-2.0 gal-$GAL_PACKAGE >= $GAL_REQUIRED libedataserverui-$EDS_PACKAGE)
-AC_SUBST(E_WIDGETS_CFLAGS)
-AC_SUBST(E_WIDGETS_LIBS)
- 
-EVO_SET_COMPILE_FLAGS(IMPORTERS, camel-$EDS_PACKAGE gconf-2.0 libglade-2.0 libbonoboui-2.0 >= $BONOBOUI_REQUIRED libgnomeui-2.0 libebook-$EDS_PACKAGE >= $EDS_REQUIRED)
-AC_SUBST(IMPORTERS_CFLAGS)
author	glarkin <glarkin@FreeBSD.org>	2012-05-19 08:23:40 +0800
committer	glarkin <glarkin@FreeBSD.org>	2012-05-19 08:23:40 +0800
commit	23dc2e78ac2d76aae2a4beda7389b1d214e9aa4f (patch)
tree	c7a910e80266d61b4dcd1911a35673db211b5742
parent	31f85282136555ebd314474757fe8a767798f4e3 (diff)
download	freebsd-ports-gnome-23dc2e78ac2d76aae2a4beda7389b1d214e9aa4f.tar.gz freebsd-ports-gnome-23dc2e78ac2d76aae2a4beda7389b1d214e9aa4f.tar.zst freebsd-ports-gnome-23dc2e78ac2d76aae2a4beda7389b1d214e9aa4f.zip